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

Predicate usage of xf86OSPM functions on #ifdef XF86PM. 

Remove needless include of ../input/mouse/mouse.h.
This commit is contained in:
Daniel Stone 2005-07-03 09:39:54 +00:00
parent 0bb669638f
commit a107f59951
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/common/xf86Events.c
View File

@ -173,7 +173,9 @@ extern fd_set EnabledDevices;
#if defined(XQUEUE) #if defined(XQUEUE)
extern void xf86XqueRequest(void); extern void xf86XqueRequest(void);
#endif #endif
#ifdef XF86PM
extern void (*xf86OSPMClose)(void); extern void (*xf86OSPMClose)(void);
#endif
static void xf86VTSwitch(void); static void xf86VTSwitch(void);
@ -1448,9 +1450,11 @@ xf86VTSwitch()
xf86UnblockSIGIO(prevSIGIO); xf86UnblockSIGIO(prevSIGIO);
} else { } else {
#ifdef XF86PM
if (xf86OSPMClose) if (xf86OSPMClose)
xf86OSPMClose(); xf86OSPMClose();
xf86OSPMClose = NULL; xf86OSPMClose = NULL;
#endif
for (i = 0; i < xf86NumScreens; i++) { for (i = 0; i < xf86NumScreens; i++) {
/* /*
@ -1472,7 +1476,9 @@ xf86VTSwitch()
if (!xf86VTSwitchTo()) return; if (!xf86VTSwitchTo()) return;
prevSIGIO = xf86BlockSIGIO(); prevSIGIO = xf86BlockSIGIO();
#ifdef XF86PM
xf86OSPMClose = xf86OSPMOpen(); xf86OSPMClose = xf86OSPMOpen();
#endif
if (xorgHWAccess) if (xorgHWAccess)
xf86EnableIO(); xf86EnableIO();

8
hw/xfree86/common/xf86Init.c
View File

@ -114,7 +114,9 @@ static void xf86RunVtInit(void);
extern void os2ServerVideoAccess(); extern void os2ServerVideoAccess();
#endif #endif
#ifdef XF86PM
void (*xf86OSPMClose)(void) = NULL; void (*xf86OSPMClose)(void) = NULL;
#endif
#ifdef XFree86LOADER #ifdef XFree86LOADER
static char *baseModules[] = { static char *baseModules[] = {
@ -259,7 +261,9 @@ PostConfigInit(void)
#endif #endif
} }
#ifdef XF86PM
xf86OSPMClose = xf86OSPMOpen(); xf86OSPMClose = xf86OSPMOpen();
#endif
/* Run an external VT Init program if specified in the config file */ /* Run an external VT Init program if specified in the config file */
xf86RunVtInit(); xf86RunVtInit();
@ -831,6 +835,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
*/ */
xf86OpenConsole(); xf86OpenConsole();
#ifdef XF86PM
/* /*
should we reopen it here? We need to deal with an already opened should we reopen it here? We need to deal with an already opened
device. We could leave this to the OS layer. For now we simply device. We could leave this to the OS layer. For now we simply
@ -840,6 +845,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
xf86OSPMClose(); xf86OSPMClose();
if ((xf86OSPMClose = xf86OSPMOpen()) != NULL) if ((xf86OSPMClose = xf86OSPMOpen()) != NULL)
xf86MsgVerb(X_INFO, 3, "APM registered successfully\n"); xf86MsgVerb(X_INFO, 3, "APM registered successfully\n");
#endif
/* Make sure full I/O access is enabled */ /* Make sure full I/O access is enabled */
if (xorgHWAccess) if (xorgHWAccess)
@ -1216,9 +1222,11 @@ ddxGiveUp()
{ {
int i; int i;
#ifdef XF86PM
if (xf86OSPMClose) if (xf86OSPMClose)
xf86OSPMClose(); xf86OSPMClose();
xf86OSPMClose = NULL; xf86OSPMClose = NULL;
#endif
xf86AccessLeaveState(); xf86AccessLeaveState();

1
hw/xfree86/common/xf86MiscExt.c
View File

@ -62,7 +62,6 @@
#endif #endif
#include "xf86OSmouse.h" #include "xf86OSmouse.h"
#include "../input/mouse/mouse.h"
#ifdef DEBUG #ifdef DEBUG
# define DEBUG_P(x) ErrorF(x"\n"); # define DEBUG_P(x) ErrorF(x"\n");