README | 20 ++++++++++++++++++++ configure.ac | 1 - man/sisusb.man | 2 +- src/sisusb.h | 5 +++-- src/sisusb_cursor.c | 4 ++-- src/sisusb_driver.c | 12 +++--------- src/sisusb_driver.h | 4 ---- src/sisusb_opt.c | 4 ++-- src/sisusb_types.h | 5 ----- src/sisusb_utility.c | 19 ------------------- src/sisusb_video.c | 4 ++-- 11 files changed, 33 insertions(+), 47 deletions(-)
New commits: commit 74c729bc4a94319dd27b927deeaffb807e696bfe Author: Alan Coopersmith <[email protected]> Date: Fri Jan 30 21:00:47 2009 -0800 Add README with pointers to mailing list, bugzilla & git repos diff --git a/README b/README new file mode 100644 index 0000000..b64c87d --- /dev/null +++ b/README @@ -0,0 +1,20 @@ +xf86-video-sisusb - SiS Net2280-based USB video driver for the Xorg X server + +Please submit bugs & patches to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/driver/xf86-video-sisusb + + http://cgit.freedesktop.org/xorg/driver/xf86-video-sisusb + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage commit e9585015180a1c835ef43a99073b74fe9f7a0245 Author: Alan Coopersmith <[email protected]> Date: Fri Jan 9 16:34:14 2009 -0800 Remove xorgconfig & xorgcfg from See Also list in man page diff --git a/man/sisusb.man b/man/sisusb.man index 4710b91..7817cb5 100644 --- a/man/sisusb.man +++ b/man/sisusb.man @@ -82,7 +82,7 @@ for device reconnection). none. .SH "SEE ALSO" #ifdef __xservername__ -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), sis(__drivermansuffix__) +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), sis(__drivermansuffix__) #else XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__), sis(__drivermansuffix__) #endif commit 382f1c431ac0ccdec0e07f18c07efcf44459d2cb Author: Adam Jackson <[email protected]> Date: Tue Aug 19 13:32:34 2008 -0400 Really compile fix this time I mean it. diff --git a/src/sisusb_cursor.c b/src/sisusb_cursor.c index 1de1554..b5b3629 100644 --- a/src/sisusb_cursor.c +++ b/src/sisusb_cursor.c @@ -166,7 +166,7 @@ SiSUSBUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs) return TRUE; } -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0,0) +#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0) #ifdef ARGB_CURSOR #ifdef SIS_ARGB_CURSOR static Bool @@ -279,7 +279,7 @@ SiSUSBHWCursorInit(ScreenPtr pScreen) infoPtr->SetCursorColors = SiSUSBSetCursorColors; infoPtr->LoadCursorImage = SiSUSBLoadCursorImage; infoPtr->UseHWCursor = SiSUSBUseHWCursor; -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0,0) +#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0) #ifdef ARGB_CURSOR #ifdef SIS_ARGB_CURSOR if(pSiSUSB->OptUseColorCursor) { diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c index 2cc526f..290764d 100644 --- a/src/sisusb_driver.c +++ b/src/sisusb_driver.c @@ -823,7 +823,7 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags) } #endif #else -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0,0) +#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0) if(xf86GetVersion() != XF86_VERSION_CURRENT) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "This driver binary is not compiled for this version of " SISUSBMYSERVERNAME "\n"); @@ -1995,7 +1995,7 @@ SISUSBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) pSiSUSB->xv_sisdirectunlocked = 0; #ifdef SIS_GLOBAL_ENABLEXV -#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,0,0)) || (defined(XvExtension)) +#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,0)) || (defined(XvExtension)) if(!pSiSUSB->NoXvideo) { SISUSBInitVideo(pScreen); } diff --git a/src/sisusb_opt.c b/src/sisusb_opt.c index 491d1ce..d4612b0 100644 --- a/src/sisusb_opt.c +++ b/src/sisusb_opt.c @@ -287,7 +287,7 @@ SiSUSBOptions(ScrnInfoPtr pScrn) pSiSUSB->HideHWCursor = FALSE; pSiSUSB->HWCursorIsVisible = FALSE; -#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) +#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0) pSiSUSB->OptUseColorCursor = 0; #else pSiSUSB->OptUseColorCursor = 1; @@ -343,7 +343,7 @@ SiSUSBOptions(ScrnInfoPtr pScrn) * Enable/disable color hardware cursor * */ -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0,0) +#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0) #ifdef ARGB_CURSOR #ifdef SIS_ARGB_CURSOR if(pSiSUSB->HWCursor) { diff --git a/src/sisusb_video.c b/src/sisusb_video.c index 13db9c3..bc469b0 100644 --- a/src/sisusb_video.c +++ b/src/sisusb_video.c @@ -561,7 +561,7 @@ SISUSBSetupImageVideo(ScreenPtr pScreen) } #ifdef SIS_ENABLEXV -#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,3,0) +#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,3) static Bool RegionsEqual(RegionPtr A, RegionPtr B) { @@ -1654,7 +1654,7 @@ SISUSBPutImage( /* update cliplist */ if(pPriv->autopaintColorKey && (pPriv->grabbedByV4L || -#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,3,0) +#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,3) (!RegionsEqual(&pPriv->clip, clipBoxes)) || #else (!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) || commit 39ec8cff7a3bcea4aa87b176e9c8d75af55de6f8 Author: Adam Jackson <[email protected]> Date: Tue Aug 19 10:22:21 2008 -0400 Build fix. diff --git a/src/sisusb.h b/src/sisusb.h index 3852819..b5bb3ad 100644 --- a/src/sisusb.h +++ b/src/sisusb.h @@ -109,7 +109,7 @@ #define SISUSBMYSERVERNAME "XFree86" #endif -#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,0,0)) || (defined(XvExtension)) +#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,0)) || (defined(XvExtension)) #include "xf86xv.h" #include <X11/extensions/Xv.h> #endif commit a92ba1876d63464e85cea00a6f5e70800465cb41 Author: Adam Jackson <[email protected]> Date: Fri Aug 15 14:27:14 2008 -0400 Build fix. diff --git a/src/sisusb.h b/src/sisusb.h index 36f9f3a..3852819 100644 --- a/src/sisusb.h +++ b/src/sisusb.h @@ -95,7 +95,7 @@ #include "xorgVersion.h" #define SISUSBMYSERVERNAME "X.org" #ifndef XF86_VERSION_NUMERIC -#define XF86_VERSION_NUMERIC(major,minor,patch,snap,dummy) \ +#define XF86_VERSION_NUMERIC(major,minor,patch,snap) \ (((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap) #define XF86_VERSION_CURRENT XF86_VERSION_NUMERIC(4,3,99,902) #endif diff --git a/src/sisusb_types.h b/src/sisusb_types.h index 04d9ff9..04c7a7a 100644 --- a/src/sisusb_types.h +++ b/src/sisusb_types.h @@ -93,12 +93,7 @@ typedef unsigned char BOOLEAN; #define SISIOMEMTYPE -#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,0,0,0) -typedef unsigned long IOADDRESS; -typedef unsigned long SISIOADDRESS; -#else typedef IOADDRESS SISIOADDRESS; -#endif typedef enum _SIS_CHIP_TYPE { SIS_VGALegacy = 0, commit bfb07a5de1c396d8fd9c26da2266c4721ee929b8 Author: Daniel Stone <[email protected]> Date: Sun Jul 20 04:20:17 2008 +0300 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. 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 * ***********************************/ commit 84fd65c57a33a03d494582aceb13356d19a87b82 Author: Julien Cristau <[email protected]> Date: Fri Jun 6 12:48:37 2008 +0200 Add missing include for ioctl() diff --git a/src/sisusb.h b/src/sisusb.h index b5126f6..36f9f3a 100644 --- a/src/sisusb.h +++ b/src/sisusb.h @@ -39,6 +39,7 @@ #include <stdio.h> #include <string.h> #include <math.h> +#include <sys/ioctl.h> #define SISUSBDRIVERVERSIONYEAR 5 #define SISUSBDRIVERVERSIONMONTH 9 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
