andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Initial experimental support for AMD64 builds on Solaris 10 x86. Improved

Browse Source 
support for 64-bit SPARC builds on Solaris as well.
This commit is contained in:
Alan Coopersmith 2005-05-21 07:46:38 +00:00
parent ef4401ff8a
commit a8a61bbe22
10 changed files with 339 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/os-support/bus/Pci.h
View File

@ -326,7 +326,7 @@
# if !defined(__FreeBSD__)
# define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge
# endif
#elif defined(__amd64__)
#elif defined(__amd64__) || defined(__amd64)
# if defined(__FreeBSD__)
# define ARCH_PCI_INIT freebsdPciInit
# else

73
hw/xfree86/os-support/solaris/solaris-amd64.S Normal file
View File

@ -0,0 +1,73 @@
/ Copyright 2005 Sun Microsystems, Inc. All rights reserved.
/
/ Permission is hereby granted, free of charge, to any person obtaining a
/ copy of this software and associated documentation files (the
/ "Software"), to deal in the Software without restriction, including
/ without limitation the rights to use, copy, modify, merge, publish,
/ distribute, and/or sell copies of the Software, and to permit persons
/ to whom the Software is furnished to do so, provided that the above
/ copyright notice(s) and this permission notice appear in all copies of
/ the Software and that both the above copyright notice(s) and this
/ permission notice appear in supporting documentation.
/
/ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
/ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
/ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
/ OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
/ HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
/ INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
/ FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
/ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
/ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
/
/ Except as contained in this notice, the name of a copyright holder
/ shall not be used in advertising or otherwise to promote the sale, use
/ or other dealings in this Software without prior written authorization
/ of the copyright holder.
#ifdef INLINE_ASM
#define FUNCTION_START(f,n) .inline f,n
#define FUNCTION_END(f) .end
#else
#define _ASM
#include <sys/asm_linkage.h>
#define FUNCTION_START(f,n) ENTRY(f)
#define FUNCTION_END(f) SET_SIZE(f)
#endif
FUNCTION_START(inb,4)
movq %rdi, %rdx
xorq %rax, %rax
inb (%dx)
FUNCTION_END(inb)
FUNCTION_START(inw,4)
movq %rdi, %rdx
xorq %rax, %rax
inw (%dx)
FUNCTION_END(inw)
FUNCTION_START(inl,4)
movq %rdi, %rdx
xorq %rax, %rax
inl (%dx)
FUNCTION_END(inl)
FUNCTION_START(outb,8)
movq %rdi, %rdx
movq %rsi, %rax
outb (%dx)
FUNCTION_END(outb)
FUNCTION_START(outw,8)
movq %rdi, %rdx
movq %rsi, %rax
outw (%dx)
FUNCTION_END(outw)
FUNCTION_START(outl,8)
movq %rdi, %rdx
movq %rsi, %rax
outl (%dx)
FUNCTION_END(outl)

24
hw/xfree86/os-support/solaris/sun_init.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c,v 1.6 2002/06/06 13:49:34 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c,v 1.5 2001/11/25 13:51:24 tsi Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
@ -22,10 +22,14 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*/
/* $XdotOrg: $ */
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_OSlib.h"
#if defined(__i386) || defined(__x86)
# include <sys/kd.h>
#endif
static Bool KeepTty = FALSE;
static Bool Protect0 = FALSE;
@ -34,7 +38,11 @@ static int VTnum = -1;
static int xf86StartVT = -1;
#endif
#if defined(__SOL8__) || !defined(__i386)
static char fb_dev[PATH_MAX] = "/dev/fb";
#else
static char fb_dev[PATH_MAX] = "/dev/console";
#endif
void
xf86OpenConsole(void)
@ -162,12 +170,15 @@ xf86OpenConsole(void)
if (ioctl(xf86Info.consoleFd, VT_SETMODE, &VT) < 0)
FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed\n");
#endif
#ifdef KDSETMODE
if (ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS) < 0)
FatalError("xf86OpenConsole: KDSETMODE KD_GRAPHICS failed\n");
#endif
}
else /* serverGeneration != 1 */
{
#ifdef HAS_USL_VTS
/*
* Now re-get the VT
*/
@ -200,7 +211,7 @@ xf86CloseConsole(void)
int tmp;
#endif
#ifndef i386
#if !defined(i386) && !defined(__x86)
if (!xf86DoProbe && !xf86DoConfigure) {
int fd;
@ -245,6 +256,11 @@ xf86CloseConsole(void)
#endif
#ifdef KDSETMODE
/* Reset the display back to text mode */
ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);
#endif
#ifdef HAS_USL_VTS
/*
@ -261,8 +277,6 @@ xf86CloseConsole(void)
* Did the whole thing similarly to the way linux does it
*/
/* Reset the display back to text mode */
ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);
if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) != -1)
{
VT.mode = VT_AUTO; /* Set default vt handling */

2
hw/xfree86/os-support/solaris/sun_kbdEv.c
View File

@ -114,7 +114,7 @@ static OsTimerPtr sunTimer = NULL;
#define KEY_Execute 0x83
static unsigned char map[256] = {
#if defined(i386) || defined(__i386) || defined(__i386__)
#if defined(i386) || defined(__i386) || defined(__i386__) || defined(__x86)
KEY_NOTUSED, /* 0 */
KEY_Tilde, /* 1 */
KEY_1, /* 2 */

243
hw/xfree86/os-support/solaris/sun_mouse.c
View File

@ -1,4 +1,5 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_mouse.c,v 1.4 2002/01/25 21:56:21 tsi Exp $ */
/* $XdotOrg$ */
/*
* Copyright 1999-2001 The XFree86 Project, Inc. All Rights Reserved.
*
@ -24,16 +25,53 @@
* dealings in this Software without prior written authorization from the
* XFree86 Project.
*/
/* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, and/or sell copies of the Software, and to permit persons
* to whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
* OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
* INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale, use
* or other dealings in this Software without prior written authorization
* of the copyright holder.
*/
#include "xf86.h"
#include "xf86_OSlib.h"
#include "xf86OSmouse.h"
#if defined(__SOL8__) || !defined(i386)
#if defined(__SOL8__) || !defined(__i386)
#include "xisb.h"
#include "mipointer.h"
#include <sys/stropts.h>
#include <sys/vuid_event.h>
#include <sys/msio.h>
/* Wheel mouse support in VUID drivers in Solaris 9 updates & Solaris 10 */
#ifdef WHEEL_DEVID /* Defined in vuid_event.h if VUID wheel support present */
# define HAVE_VUID_WHEEL
#endif
#ifdef HAVE_VUID_WHEEL
# include <sys/vuid_wheel.h>
#endif
/* Names of protocols that are handled internally here. */
@ -42,21 +80,71 @@ static const char *internalNames[] = {
NULL
};
static const char *solarisMouseDevs[] = {
/* Device file: Protocol: */
"/dev/mouse", "VUID", /* USB or SPARC */
#if defined(__i386) || defined(__x86)
"/dev/kdmouse", "PS/2", /* PS/2 */
#endif
NULL
};
typedef struct _VuidMseRec {
Firm_event event;
unsigned char *buffer;
char *strmod;
} VuidMseRec, *VuidMsePtr;
static int vuidMouseProc(DeviceIntPtr pPointer, int what);
static void vuidReadInput(InputInfoPtr pInfo);
/*
* Initialize and enable the mouse wheel, if present.
*
* Returns 1 if mouse wheel was successfully enabled.
* Returns 0 if an error occurred or if there is no mouse wheel.
*/
static int
vuidMouseWheelInit(InputInfoPtr pInfo)
{
#ifdef HAVE_VUID_WHEEL
wheel_state wstate;
int nwheel = -1;
wstate.vers = VUID_WHEEL_STATE_VERS;
wstate.id = 0;
wstate.stateflags = -1;
if (ioctl(pInfo->fd, VUIDGWHEELCOUNT, &nwheel) != 0)
return (0);
if (ioctl(pInfo->fd, VUIDGWHEELSTATE, &wstate) != 0) {
xf86Msg(X_WARNING, "%s: couldn't get wheel state\n", pInfo->name);
return (0);
}
wstate.stateflags |= VUID_WHEEL_STATE_ENABLED;
if (ioctl(pInfo->fd, VUIDSWHEELSTATE, &wstate) != 0) {
xf86Msg(X_WARNING, "%s: couldn't enable wheel\n", pInfo->name);
return (0);
}
return (1);
#else
return (0);
#endif
}
/* This function is called when the protocol is "VUID". */
static Bool
vuidPreInit(InputInfoPtr pInfo, const char *protocol, int flags)
{
MouseDevPtr pMse = pInfo->private;
VuidMsePtr pVuidMse;
int buttons;
pVuidMse = xalloc(sizeof(VuidMseRec));
if (pVuidMse == NULL) {
@ -84,7 +172,40 @@ vuidPreInit(InputInfoPtr pInfo, const char *protocol, int flags)
return FALSE;
}
}
pVuidMse->buffer = (unsigned char *)&pVuidMse->event;
pVuidMse->strmod = xf86SetStrOption(pInfo->options, "StreamsModule", NULL);
if (pVuidMse->strmod &&
(ioctl(pInfo->fd, I_PUSH, pVuidMse->strmod) == -1)) {
xf86Msg(X_ERROR,
"%s: cannot push module '%s' onto mouse device: %s\n",
pInfo->name, pVuidMse->strmod, strerror(errno));
xf86CloseSerial(pInfo->fd);
pInfo->fd = -1;
xfree(pVuidMse);
xfree(pMse);
return FALSE;
}
buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
if (buttons == 0) {
if(ioctl(pInfo->fd, MSIOBUTTONS, &buttons) == 0) {
pInfo->conf_idev->commonOptions =
xf86ReplaceIntOption(pInfo->conf_idev->commonOptions,
"Buttons", buttons);
xf86Msg(X_INFO, "%s: Setting Buttons option to \"%d\"\n",
pInfo->name, buttons);
}
}
if (pVuidMse->strmod &&
(ioctl(pInfo->fd, I_POP, pVuidMse->strmod) == -1)) {
xf86Msg(X_WARNING,
"%s: cannot pop module '%s' off mouse device: %s\n",
pInfo->name, pVuidMse->strmod, strerror(errno));
}
xf86CloseSerial(pInfo->fd);
pInfo->fd = -1;
@ -112,6 +233,7 @@ vuidReadInput(InputInfoPtr pInfo)
unsigned int n;
int c;
unsigned char *pBuf;
int wmask;
pMse = pInfo->private;
pVuidMse = pMse->mousePriv;
@ -154,7 +276,15 @@ vuidReadInput(InputInfoPtr pInfo)
dy -= delta;
break;
}
}
#ifdef HAVE_VUID_WHEEL
else if (vuid_in_range(VUID_WHEEL, pVuidMse->event.id)) {
if (vuid_id_offset(pVuidMse->event.id) == 0)
dz -= VUID_WHEEL_GETDELTA(pVuidMse->event.value);
else
dw -= VUID_WHEEL_GETDELTA(pVuidMse->event.value);
}
#endif
n = 0;
if ((c = XisbRead(pMse->buffer)) >= 0) {
@ -219,9 +349,20 @@ vuidMouseProc(DeviceIntPtr pPointer, int what)
pInfo->fd = -1;
} else {
int fmt = VUID_FIRM_EVENT;
ioctl(pInfo->fd, VUIDSFORMAT, &fmt);
xf86FlushInput(pInfo->fd);
AddEnabledDevice(pInfo->fd);
if (pVuidMse->strmod &&
(ioctl(pInfo->fd, I_PUSH, pVuidMse->strmod) == -1)) {
xf86Msg(X_ERROR,
"%s: cannot push module '%s' onto mouse device: %s\n",
pInfo->name, pVuidMse->strmod, strerror(errno));
xf86CloseSerial(pInfo->fd);
pInfo->fd = -1;
} else {
ioctl(pInfo->fd, VUIDSFORMAT, &fmt);
vuidMouseWheelInit(pInfo);
xf86FlushInput(pInfo->fd);
AddEnabledDevice(pInfo->fd);
}
}
}
pMse->lastButtons = 0;
@ -237,6 +378,12 @@ vuidMouseProc(DeviceIntPtr pPointer, int what)
XisbFree(pMse->buffer);
pMse->buffer = NULL;
}
if (pVuidMse->strmod &&
(ioctl(pInfo->fd, I_POP, pVuidMse->strmod) == -1)) {
xf86Msg(X_WARNING,
"%s: cannot pop module '%s' off mouse device: %s\n",
pInfo->name, pVuidMse->strmod, strerror(errno));
}
xf86CloseSerial(pInfo->fd);
pInfo->fd = -1;
}
@ -278,21 +425,98 @@ CheckProtocol(const char *protocol)
static const char *
DefaultProtocol(void)
{
return "VUID";
return "Auto";
}
static Bool
solarisMouseAutoProbe(InputInfoPtr pInfo, const char **protocol,
const char **device)
{
const char **pdev, **pproto, *dev = NULL;
int fd = -1;
Bool found;
for (pdev = solarisMouseDevs; *pdev; pdev += 2) {
pproto = pdev + 1;
if ((*protocol != NULL) && (strcmp(*protocol, "Auto") != 0) &&
(*pproto != NULL) && (strcmp(*pproto, *protocol) != 0)) {
continue;
}
if ((*device != NULL) && (strcmp(*device, *pdev) != 0)) {
continue;
}
SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
if (fd == -1) {
#ifdef DEBUG
ErrorF("Cannot open %s (%s)\n", pdev, strerror(errno));
#endif
} else {
found = TRUE;
if ((*pproto != NULL) && (strcmp(*pproto, "VUID") == 0)) {
int i;
if (ioctl(fd, VUIDGFORMAT, &i) < 0) {
found = FALSE;
}
}
close(fd);
if (found == TRUE) {
if (*pproto != NULL) {
*protocol = *pproto;
}
*device = *pdev;
return TRUE;
}
}
}
return FALSE;
}
static const char *
SetupAuto(InputInfoPtr pInfo, int *protoPara)
{
return DefaultProtocol();
const char *pdev = NULL;
const char *pproto = NULL;
MouseDevPtr pMse = pInfo->private;
if (pInfo->fd == -1) {
/* probe to find device/protocol to use */
if (solarisMouseAutoProbe(pInfo, &pproto, &pdev) != FALSE) {
/* Set the Device option. */
pInfo->conf_idev->commonOptions =
xf86AddNewOption(pInfo->conf_idev->commonOptions, "Device", pdev);
xf86Msg(X_INFO, "%s: Setting Device option to \"%s\"\n",
pInfo->name, pdev);
}
} else if (pMse->protocolID == PROT_AUTO) {
pdev = xf86CheckStrOption(pInfo->conf_idev->commonOptions,
"Device", NULL);
solarisMouseAutoProbe(pInfo, &pproto, &pdev);
}
return pproto;
}
#else /* __SOL8__ || !i386 */
static const char *
FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
{
const char *pdev = NULL;
const char *pproto = protocol;
if (solarisMouseAutoProbe(pInfo, &pproto, &pdev) != FALSE) {
/* Set the Device option. */
pInfo->conf_idev->commonOptions =
xf86AddNewOption(pInfo->conf_idev->commonOptions, "Device", pdev);
xf86Msg(X_INFO, "%s: Setting Device option to \"%s\"\n",
pInfo->name, pdev);
}
return pdev;
}
#else /* __SOL8__ || !__i386 */
#undef MSE_MISC
#define MSE_MISC 0
#endif /* !__SOL8__ && i386 */
#endif /* !__SOL8__ && __i386 */
static int
SupportedInterfaces(void)
@ -310,12 +534,13 @@ xf86OSMouseInit(int flags)
if (!p)
return NULL;
p->SupportedInterfaces = SupportedInterfaces;
#if defined(__SOL8__) || !defined(i386)
#if defined(__SOL8__) || !defined(__i386)
p->BuiltinNames = BuiltinNames;
p->CheckProtocol = CheckProtocol;
p->PreInit = sunMousePreInit;
p->DefaultProtocol = DefaultProtocol;
p->SetupAuto = SetupAuto;
p->FindDevice = FindDevice;
#endif
return p;
}

12
hw/xfree86/os-support/solaris/sun_vid.c
View File

@ -23,7 +23,7 @@
*
*/
#ifdef i386
#if defined(i386) || defined(__x86)
#define _NEED_SYSI86
#endif
#include "xf86.h"
@ -143,14 +143,14 @@ xf86UnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)
/* I/O Permissions section */
/***************************************************************************/
#ifdef i386
#if defined(i386) || defined(__x86)
static Bool ExtendedEnabled = FALSE;
#endif
Bool
xf86EnableIO(void)
{
#ifdef i386
#if defined(i386) || defined(__x86)
if (ExtendedEnabled)
return TRUE;
@ -166,7 +166,7 @@ xf86EnableIO(void)
void
xf86DisableIO(void)
{
#ifdef i386
#if defined(i386) || defined(__x86)
if(!ExtendedEnabled)
return;
@ -183,7 +183,7 @@ xf86DisableIO(void)
Bool xf86DisableInterrupts(void)
{
#ifdef i386
#if defined(i386) || defined(__x86)
if (!ExtendedEnabled && (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0))
return FALSE;
@ -202,7 +202,7 @@ Bool xf86DisableInterrupts(void)
void xf86EnableInterrupts(void)
{
#ifdef i386
#if defined(i386) || defined(__x86)
if (!ExtendedEnabled && (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0))
return;

2
hw/xfree86/os-support/xf86_OSlib.h
View File

@ -248,7 +248,7 @@ typedef signed long xf86ssize_t;
#if defined(__SOL8__) || (defined(sun) && !defined(i386))
# include <sys/mman.h>
# include <errno.h>
# ifdef i386
# if defined(i386) || defined(__x86)
# include <sys/sysi86.h>
# endif
# include <sys/psw.h>

2
hw/xfree86/utils/xorgconfig/xorgconfig.c
View File

@ -640,7 +640,7 @@ mouse_configuration(void) {
config_emulate3buttons = 0;
printf("\n");
#if (defined(sun) && defined(__i386))
#if (defined(sun) && (defined(__i386) || defined(__x86)))
/* SPARC & USB mice (VUID or AUTO protocols) default to /dev/mouse,
but PS/2 mice default to /dev/kdmouse */
if ((config_mousetype != M_AUTO) && (config_mousetype != M_VUID)) {

3
include/servermd.h
View File

@ -46,6 +46,7 @@ SOFTWARE.
******************************************************************/
/* $Xorg: servermd.h,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */
/* $XdotOrg: $ */
#ifndef SERVERMD_H
#define SERVERMD_H 1
@ -389,7 +390,7 @@ SOFTWARE.
#endif /* ia64 */
#if defined(__amd64__) || defined(amd64)
#if defined(__amd64__) || defined(amd64) || defined(__amd64)
# define IMAGE_BYTE_ORDER LSBFirst
# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)

2
mi/micoord.h
View File

@ -50,7 +50,7 @@
defined(__i386__) || defined(i386) || \
defined(__ia64__) || defined(ia64) || \
defined(__s390x__) || defined(__s390__) || \
defined(__amd64__) || defined(amd64)
defined(__amd64__) || defined(amd64) || defined(__amd64)
#define GetHighWord(x) (((int) (x)) >> 16)
#else
#define GetHighWord(x) (((int) (x)) / 65536)