diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-07-20 04:20:17 +0300 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2008-07-20 04:20:17 +0300 |
| commit | bfb07a5de1c396d8fd9c26da2266c4721ee929b8 (patch) | |
| tree | 734f0f3c8eafe375ab89769d690fd6d18cbf9ace | |
| parent | 84fd65c57a33a03d494582aceb13356d19a87b82 (diff) | |
Remove XFree86-Misc (PassMessage) support
HandleMessage/PassMessage from XFree86-Misc was cunningly implemented as
just returning BadMatch, given that it's (presumably) been replaced by
SISCTRL. Remove it.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/sisusb_driver.c | 8 | ||||
| -rw-r--r-- | src/sisusb_driver.h | 4 | ||||
| -rw-r--r-- | src/sisusb_utility.c | 19 |
4 files changed, 1 insertions, 31 deletions
diff --git a/configure.ac b/configure.ac index 9eaf057..1c5ac16 100644 --- a/configure.ac +++ b/configure.ac @@ -53,7 +53,6 @@ XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto) XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(RENDER, renderproto) XORG_DRIVER_CHECK_EXT(XV, videoproto) -XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto) XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c index ec7fe81..2cc526f 100644 --- a/src/sisusb_driver.c +++ b/src/sisusb_driver.c @@ -43,8 +43,6 @@ #include "mibank.h" #include "mipointer.h" #include "mibstore.h" -#define _XF86MISC_SERVER_ -#include <X11/extensions/xf86misc.h> #include "sisusb_regs.h" #include "sisusb_dac.h" @@ -482,11 +480,7 @@ SISUSBProbe(DriverPtr drv, int flags) pScrn->LeaveVT = SISUSBLeaveVT; pScrn->FreeScreen = SISUSBFreeScreen; pScrn->ValidMode = SISUSBValidMode; -#ifdef X_XF86MiscPassMessage - if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) { - pScrn->HandleMessage = SISUSBHandleMessage; - } -#endif + foundScreen = TRUE; } diff --git a/src/sisusb_driver.h b/src/sisusb_driver.h index eb7d9e0..c4bc1dd 100644 --- a/src/sisusb_driver.h +++ b/src/sisusb_driver.h @@ -83,10 +83,6 @@ static Bool SISUSBDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer p); #endif /* Optional functions */ -#ifdef X_XF86MiscPassMessage -extern int SISUSBHandleMessage(int scrnIndex, const char *msgtype, - const char *msgval, char **retmsg); -#endif static void SISUSBFreeScreen(int scrnIndex, int flags); static ModeStatus SISUSBValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags); diff --git a/src/sisusb_utility.c b/src/sisusb_utility.c index 07477db..8c03d63 100644 --- a/src/sisusb_utility.c +++ b/src/sisusb_utility.c @@ -38,8 +38,6 @@ #define NEED_EVENTS #include <X11/X.h> #include "dixstruct.h" -#define _XF86MISC_SERVER_ -#include <X11/extensions/xf86misc.h> #include "sisusb_videostr.h" @@ -245,10 +243,6 @@ typedef struct { int (*HandleSiSDirectCommand[SISCTRL_MAX_SCREENS])(xSiSCtrlCommandReply *); } xSiSCtrlScreenTable; -#ifdef X_XF86MiscPassMessage -int SISUSBHandleMessage(int scrnIndex, const char *msgtype, - const char *msgval, char **retmsg); -#endif void SiSUSBCtrlExtInit(ScrnInfoPtr pScrn); void SiSUSBCtrlExtUnregister(SISUSBPtr pSiSUSB, int index); @@ -266,19 +260,6 @@ extern void SISUSBSetPortDefaults(ScrnInfoPtr pScrn, SISUSBPortPrivPtr pPriv); #endif /* SIS_GLOBAL_ENABLEXV */ /*********************************** - * MessageHandler interface * - * (unused now; use extension) * - ***********************************/ - -#ifdef X_XF86MiscPassMessage -int -SISUSBHandleMessage(int scrnIndex, const char *msgtype, const char *msgval, char **retmsg) -{ - return BadMatch; -} -#endif - -/*********************************** * SiSCtrl extension interface * ***********************************/ |