frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://gsap7@git.freedesktop.org/git/xorg/xserver

This commit is contained in:
George Sapountzis 2006-08-12 21:58:33 +03:00
parent 37943e2f1a 984babe86b
commit a815b9b990
6 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dix/devices.c
View File

@ -667,13 +667,7 @@ InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc)
if (!feedc) if (!feedc)
return FALSE; return FALSE;
feedc->CtrlProc = controlProc; feedc->CtrlProc = controlProc;
#ifdef sgi
feedc->ctrl.num = 1;
feedc->ctrl.den = 1;
feedc->ctrl.threshold = 1;
#else
feedc->ctrl = defaultPointerControl; feedc->ctrl = defaultPointerControl;
#endif
feedc->ctrl.id = 0; feedc->ctrl.id = 0;
if ( (feedc->next = dev->ptrfeed) ) if ( (feedc->next = dev->ptrfeed) )
feedc->ctrl.id = dev->ptrfeed->ctrl.id + 1; feedc->ctrl.id = dev->ptrfeed->ctrl.id + 1;

2
hw/xfree86/common/xf86Bus.c
View File

@ -3018,7 +3018,7 @@ static void
CheckGenericGA() CheckGenericGA()
{ {
/* This needs to be changed for multiple domains */ /* This needs to be changed for multiple domains */
#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__ia64__) #if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__arm__) && !defined(__s390__)
IOADDRESS GenericIOBase = VGAHW_GET_IOBASE(); IOADDRESS GenericIOBase = VGAHW_GET_IOBASE();
CARD8 CurrentValue, TestValue; CARD8 CurrentValue, TestValue;

16
hw/xfree86/os-support/linux/lnx_video.c
View File

@ -464,7 +464,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
Base,realBase,alignOff); Base,realBase,alignOff);
#endif #endif
#if defined(__ia64__) #if defined(__ia64__) || defined(__arm__) || defined(__s390__)
#ifndef MAP_WRITECOMBINED #ifndef MAP_WRITECOMBINED
#define MAP_WRITECOMBINED 0x00010000 #define MAP_WRITECOMBINED 0x00010000
#endif #endif
@ -594,7 +594,7 @@ xf86DisableIO(void)
#if defined(__powerpc__) #if defined(__powerpc__)
munmap(ioBase, 0x20000); munmap(ioBase, 0x20000);
ioBase = NULL; ioBase = NULL;
#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) #elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__)
iopl(0); iopl(0);
ioperm(0, 1024, 0); ioperm(0, 1024, 0);
#endif #endif
@ -613,12 +613,12 @@ xf86DisableIO(void)
_X_EXPORT Bool _X_EXPORT Bool
xf86DisableInterrupts() xf86DisableInterrupts()
{ {
#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) #if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__)
if (!ExtendedEnabled) if (!ExtendedEnabled)
if (iopl(3) || ioperm(0, 1024, 1)) if (iopl(3) || ioperm(0, 1024, 1))
return (FALSE); return (FALSE);
#endif #endif
#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) #if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) || defined(__s390__)
#else #else
# ifdef __GNUC__ # ifdef __GNUC__
# if defined(__ia64__) # if defined(__ia64__)
@ -632,7 +632,7 @@ xf86DisableInterrupts()
asm("cli"); asm("cli");
# endif # endif
#endif #endif
#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) #if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__)
if (!ExtendedEnabled) { if (!ExtendedEnabled) {
iopl(0); iopl(0);
ioperm(0, 1024, 0); ioperm(0, 1024, 0);
@ -645,12 +645,12 @@ xf86DisableInterrupts()
_X_EXPORT void _X_EXPORT void
xf86EnableInterrupts() xf86EnableInterrupts()
{ {
#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) #if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__)
if (!ExtendedEnabled) if (!ExtendedEnabled)
if (iopl(3) || ioperm(0, 1024, 1)) if (iopl(3) || ioperm(0, 1024, 1))
return; return;
#endif #endif
#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) #if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) || defined(__s390__)
#else #else
# ifdef __GNUC__ # ifdef __GNUC__
# if defined(__ia64__) # if defined(__ia64__)
@ -664,7 +664,7 @@ xf86EnableInterrupts()
asm("sti"); asm("sti");
# endif # endif
#endif #endif
#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) #if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__)
if (!ExtendedEnabled) { if (!ExtendedEnabled) {
iopl(0); iopl(0);
ioperm(0, 1024, 0); ioperm(0, 1024, 0);

2
hw/xfree86/vgahw/vgaHW.h
View File

@ -175,7 +175,7 @@ typedef struct _vgaHWRec {
#define BITS_PER_GUN 6 #define BITS_PER_GUN 6
#define COLORMAP_SIZE 256 #define COLORMAP_SIZE 256
#if defined(__powerpc__) #if defined(__powerpc__) || defined(__arm__) || defined(__s390__)
#define DACDelay(hw) /* No legacy VGA support */ #define DACDelay(hw) /* No legacy VGA support */
#else #else
#define DACDelay(hw) \ #define DACDelay(hw) \

7
os/utils.c
View File

@ -271,10 +271,6 @@ long Memory_fail = 0;
#include <stdlib.h> /* for random() */ #include <stdlib.h> /* for random() */
#endif #endif
#ifdef sgi
int userdefinedfontpath = 0;
#endif /* sgi */
char *dev_tty_from_init = NULL; /* since we need to parse it anyway */ char *dev_tty_from_init = NULL; /* since we need to parse it anyway */
OsSigHandlerPtr OsSigHandlerPtr
@ -843,9 +839,6 @@ ProcessCommandLine(int argc, char *argv[])
{ {
if(++i < argc) if(++i < argc)
{ {
#ifdef sgi
userdefinedfontpath = 1;
#endif /* sgi */
defaultFontPath = argv[i]; defaultFontPath = argv[i];
} }
else else

4
xkb/xkbPrKeyEv.c
View File

@ -150,11 +150,7 @@ unsigned ndx;
break; break;
default: default:
ErrorF("unknown key behavior 0x%04x\n",behavior.type); ErrorF("unknown key behavior 0x%04x\n",behavior.type);
#if defined(MetroLink)
return;
#else
break; break;
#endif
} }
} }
XkbHandleActions(keybd,keybd,xE,count); XkbHandleActions(keybd,keybd,xE,count);