diff options
Diffstat (limited to 'driver/xf86-video-sisusb/src')
23 files changed, 18 insertions, 97 deletions
diff --git a/driver/xf86-video-sisusb/src/sisusb.h b/driver/xf86-video-sisusb/src/sisusb.h index 0eb17d006..b5bb3adc2 100644 --- a/driver/xf86-video-sisusb/src/sisusb.h +++ b/driver/xf86-video-sisusb/src/sisusb.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb.h,v 1.16 2006/04/07 21:10:49 ajax Exp $ */ /* * Main global data and definitions * @@ -41,6 +39,7 @@ #include <stdio.h> #include <string.h> #include <math.h> +#include <sys/ioctl.h> #define SISUSBDRIVERVERSIONYEAR 5 #define SISUSBDRIVERVERSIONMONTH 9 @@ -70,9 +69,9 @@ #define SISUSB_NAME "SISUSB" #define SISUSB_DRIVER_NAME "sisusb" -#define SISUSB_MAJOR_VERSION 0 -#define SISUSB_MINOR_VERSION 8 -#define SISUSB_PATCHLEVEL 1 +#define SISUSB_MAJOR_VERSION PACKAGE_VERSION_MAJOR +#define SISUSB_MINOR_VERSION PACKAGE_VERSION_MINOR +#define SISUSB_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL #define SISUSB_CURRENT_VERSION ((SISUSB_MAJOR_VERSION << 16) | \ (SISUSB_MINOR_VERSION << 8) | \ SISUSB_PATCHLEVEL) @@ -96,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 @@ -110,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 @@ -150,7 +149,7 @@ #undef SISGAMMARAMP #ifdef XORG_VERSION_CURRENT -#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) +#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0) #define SISGAMMARAMP /* Driver can set gamma ramp; requires additional symbols in xf86sym.h */ #endif #endif diff --git a/driver/xf86-video-sisusb/src/sisusb_accel.c b/driver/xf86-video-sisusb/src/sisusb_accel.c index f5da5c13d..d9c066552 100644 --- a/driver/xf86-video-sisusb/src/sisusb_accel.c +++ b/driver/xf86-video-sisusb/src/sisusb_accel.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_accel.c,v 1.6 2005/07/11 02:30:00 ajax Exp $ */ /* * 2D Acceleration for SiS 315/USB - not functional! * diff --git a/driver/xf86-video-sisusb/src/sisusb_accel.h b/driver/xf86-video-sisusb/src/sisusb_accel.h index d6acd3664..da02aafeb 100644 --- a/driver/xf86-video-sisusb/src/sisusb_accel.h +++ b/driver/xf86-video-sisusb/src/sisusb_accel.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_accel.h,v 1.4 2005/07/09 02:50:34 twini Exp $ */ /* * 2D Acceleration for SiS 315/USB * Definitions for the SIS engine communication. diff --git a/driver/xf86-video-sisusb/src/sisusb_cursor.c b/driver/xf86-video-sisusb/src/sisusb_cursor.c index f697a08bf..b5b362937 100644 --- a/driver/xf86-video-sisusb/src/sisusb_cursor.c +++ b/driver/xf86-video-sisusb/src/sisusb_cursor.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_cursor.c,v 1.7 2005/09/28 18:59:22 twini Exp $ */ /* * SiS 315/USB hardware cursor handling * @@ -168,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 @@ -281,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/driver/xf86-video-sisusb/src/sisusb_cursor.h b/driver/xf86-video-sisusb/src/sisusb_cursor.h index a2938dba1..a1848143a 100644 --- a/driver/xf86-video-sisusb/src/sisusb_cursor.h +++ b/driver/xf86-video-sisusb/src/sisusb_cursor.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_cursor.h,v 1.3 2005/07/09 02:50:34 twini Exp $ */ /* * SiSUSB hardware cursor handling definitions * diff --git a/driver/xf86-video-sisusb/src/sisusb_dac.c b/driver/xf86-video-sisusb/src/sisusb_dac.c index 3cbda84ec..5e3eb7f21 100644 --- a/driver/xf86-video-sisusb/src/sisusb_dac.c +++ b/driver/xf86-video-sisusb/src/sisusb_dac.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_dac.c,v 1.6 2005/08/15 22:57:51 twini Exp $ */ /* * DAC helper functions (Save/Restore, MemClk, etc) * diff --git a/driver/xf86-video-sisusb/src/sisusb_dac.h b/driver/xf86-video-sisusb/src/sisusb_dac.h index fa796880e..462e5712d 100644 --- a/driver/xf86-video-sisusb/src/sisusb_dac.h +++ b/driver/xf86-video-sisusb/src/sisusb_dac.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_dac.h,v 1.4 2005/07/09 03:02:56 twini Exp $ */ /* * DAC helper functions (Save/Restore, MemClk, etc) * Definitions and prototypes diff --git a/driver/xf86-video-sisusb/src/sisusb_driver.c b/driver/xf86-video-sisusb/src/sisusb_driver.c index 03570b46a..290764d0b 100644 --- a/driver/xf86-video-sisusb/src/sisusb_driver.c +++ b/driver/xf86-video-sisusb/src/sisusb_driver.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_driver.c,v 1.16 2005/09/28 18:48:30 twini Exp $ */ /* * SiSUSB driver main code * @@ -45,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" @@ -484,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; } @@ -509,7 +501,7 @@ SiSUSB_SiSFB_Lock(ScrnInfoPtr pScrn, Bool lock) if(!pSiSUSB->sisfbfound) return; if(!pSiSUSB->sisfb_havelock) return; - if((fd = open(pSiSUSB->sisfbdevname, 'r')) != -1) { + if((fd = open(pSiSUSB->sisfbdevname, O_RDONLY)) != -1) { parm = lock ? 1 : 0; ioctl(fd, SISUSBFB_SET_LOCK, &parm); close(fd); @@ -831,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"); @@ -932,7 +924,7 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags) sprintf(name, "/dev/fb/%1d", i-8); } - if((fd = open(name, 'r')) != -1) { + if((fd = open(name, O_RDONLY)) != -1) { Bool gotit = FALSE; @@ -2003,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/driver/xf86-video-sisusb/src/sisusb_driver.h b/driver/xf86-video-sisusb/src/sisusb_driver.h index a03c045a1..c4bc1dd8b 100644 --- a/driver/xf86-video-sisusb/src/sisusb_driver.h +++ b/driver/xf86-video-sisusb/src/sisusb_driver.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_driver.h,v 1.8 2005/07/09 03:02:56 twini Exp $ */ /* * Global data and definitions * @@ -85,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/driver/xf86-video-sisusb/src/sisusb_init.c b/driver/xf86-video-sisusb/src/sisusb_init.c index 6e8808e29..ba44431d1 100644 --- a/driver/xf86-video-sisusb/src/sisusb_init.c +++ b/driver/xf86-video-sisusb/src/sisusb_init.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_init.c,v 1.8 2005/07/11 02:30:00 ajax Exp $ */ /* * Mode initializing code (CRT1 section) for SiS315/USB * (Universal module for Linux kernel framebuffer and X.org/XFree86 4.x) diff --git a/driver/xf86-video-sisusb/src/sisusb_init.h b/driver/xf86-video-sisusb/src/sisusb_init.h index a1e5b27a1..79b133128 100644 --- a/driver/xf86-video-sisusb/src/sisusb_init.h +++ b/driver/xf86-video-sisusb/src/sisusb_init.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_init.h,v 1.6 2005/07/09 02:50:34 twini Exp $ */ /* * Data and prototypes for init.c * diff --git a/driver/xf86-video-sisusb/src/sisusb_opt.c b/driver/xf86-video-sisusb/src/sisusb_opt.c index 8ed42a5d8..d4612b00e 100644 --- a/driver/xf86-video-sisusb/src/sisusb_opt.c +++ b/driver/xf86-video-sisusb/src/sisusb_opt.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_opt.c,v 1.7 2005/10/27 18:27:19 twini Exp $ */ /* * SiSUSB driver option evaluation * @@ -289,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; @@ -345,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/driver/xf86-video-sisusb/src/sisusb_osdef.h b/driver/xf86-video-sisusb/src/sisusb_osdef.h index 23b4e014c..2d938ad93 100644 --- a/driver/xf86-video-sisusb/src/sisusb_osdef.h +++ b/driver/xf86-video-sisusb/src/sisusb_osdef.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_osdef.h,v 1.5 2005/07/09 02:50:34 twini Exp $ */ /* * OS depending defines * diff --git a/driver/xf86-video-sisusb/src/sisusb_regs.h b/driver/xf86-video-sisusb/src/sisusb_regs.h index 4dc4f9102..064132c27 100644 --- a/driver/xf86-video-sisusb/src/sisusb_regs.h +++ b/driver/xf86-video-sisusb/src/sisusb_regs.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_regs.h,v 1.5 2005/07/09 02:50:34 twini Exp $ */ /* * Register access macros and register definitions * diff --git a/driver/xf86-video-sisusb/src/sisusb_setup.c b/driver/xf86-video-sisusb/src/sisusb_setup.c index 2b12f9d0f..67fc96395 100644 --- a/driver/xf86-video-sisusb/src/sisusb_setup.c +++ b/driver/xf86-video-sisusb/src/sisusb_setup.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_setup.c,v 1.4 2005/07/11 02:30:00 ajax Exp $ */ /* * Basic hardware and memory detection * diff --git a/driver/xf86-video-sisusb/src/sisusb_shadow.c b/driver/xf86-video-sisusb/src/sisusb_shadow.c index 982a6683c..e04caddd5 100644 --- a/driver/xf86-video-sisusb/src/sisusb_shadow.c +++ b/driver/xf86-video-sisusb/src/sisusb_shadow.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_shadow.c,v 1.5 2005/07/11 02:30:00 ajax Exp $ */ /* * SiS USB driver shadow framebuffer handling * diff --git a/driver/xf86-video-sisusb/src/sisusb_struct.h b/driver/xf86-video-sisusb/src/sisusb_struct.h index 86a180c4d..2858f5648 100644 --- a/driver/xf86-video-sisusb/src/sisusb_struct.h +++ b/driver/xf86-video-sisusb/src/sisusb_struct.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_struct.h,v 1.4 2005/07/09 02:50:34 twini Exp $ */ /* * General structure definitions for universal mode switching modules * diff --git a/driver/xf86-video-sisusb/src/sisusb_types.h b/driver/xf86-video-sisusb/src/sisusb_types.h index 6ee413fbb..04c7a7a09 100644 --- a/driver/xf86-video-sisusb/src/sisusb_types.h +++ b/driver/xf86-video-sisusb/src/sisusb_types.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_types.h,v 1.7 2005/08/15 22:57:51 twini Exp $ */ /* * General type definitions for universal mode switching modules * @@ -95,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, diff --git a/driver/xf86-video-sisusb/src/sisusb_utility.c b/driver/xf86-video-sisusb/src/sisusb_utility.c index 7df9da277..8c03d63e7 100644 --- a/driver/xf86-video-sisusb/src/sisusb_utility.c +++ b/driver/xf86-video-sisusb/src/sisusb_utility.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_utility.c,v 1.8 2005/09/16 13:52:16 twini Exp $ */ /* * SiSUSB driver utility interface & routines * @@ -40,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" @@ -247,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); @@ -268,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 * ***********************************/ diff --git a/driver/xf86-video-sisusb/src/sisusb_vga.c b/driver/xf86-video-sisusb/src/sisusb_vga.c index 64b984328..404a2b1e0 100644 --- a/driver/xf86-video-sisusb/src/sisusb_vga.c +++ b/driver/xf86-video-sisusb/src/sisusb_vga.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_vga.c,v 1.5 2005/07/11 02:30:00 ajax Exp $ */ /* * Mode setup and basic video bridge detection * diff --git a/driver/xf86-video-sisusb/src/sisusb_video.c b/driver/xf86-video-sisusb/src/sisusb_video.c index e0d05a530..bc469b034 100644 --- a/driver/xf86-video-sisusb/src/sisusb_video.c +++ b/driver/xf86-video-sisusb/src/sisusb_video.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_video.c,v 1.9 2006/04/07 23:15:17 aplattner Exp $ */ /* * Xv driver for SiS 315 USB * @@ -563,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) { @@ -1656,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)) || diff --git a/driver/xf86-video-sisusb/src/sisusb_video.h b/driver/xf86-video-sisusb/src/sisusb_video.h index 90b09b42f..9dafbafe4 100644 --- a/driver/xf86-video-sisusb/src/sisusb_video.h +++ b/driver/xf86-video-sisusb/src/sisusb_video.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_video.h,v 1.3 2005/07/09 02:50:34 twini Exp $ */ /* * Xv driver for SiS 315 USB * diff --git a/driver/xf86-video-sisusb/src/sisusb_videostr.h b/driver/xf86-video-sisusb/src/sisusb_videostr.h index 3eb165c7e..3d82911b7 100644 --- a/driver/xf86-video-sisusb/src/sisusb_videostr.h +++ b/driver/xf86-video-sisusb/src/sisusb_videostr.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_videostr.h,v 1.3 2005/07/09 02:50:34 twini Exp $ */ /* * Xv driver for SiS 315 USB * |