qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to xf86-video-sisusb 0.9.3

Browse Source
This commit is contained in:
matthieu 2009-11-22 17:56:41 +00:00
parent a8596e56ea
commit 7ee5b3111c
3 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
driver/xf86-video-sisusb/configure.ac
View File

@ -22,7 +22,7 @@
AC_PREREQ(2.57) AC_PREREQ(2.57)
AC_INIT([xf86-video-sisusb], AC_INIT([xf86-video-sisusb],
0.9.1, 0.9.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sisusb) xf86-video-sisusb)
@ -57,6 +57,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages # Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
HAVE_XEXTPROTO_71="no")
AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
sdkdir=$(pkg-config --variable=sdkdir xorg-server) sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries. # Checks for libraries.

1
driver/xf86-video-sisusb/src/sisusb.h
View File

@ -83,7 +83,6 @@
#include "compiler.h" #include "compiler.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#include "xf86_OSproc.h" #include "xf86_OSproc.h"
#include "xf86Resources.h"
#include "xf86.h" #include "xf86.h"
#include "xf86Cursor.h" #include "xf86Cursor.h"
#include "xf86cmap.h" #include "xf86cmap.h"

34
driver/xf86-video-sisusb/src/sisusb_driver.c
View File

@ -35,7 +35,6 @@
#include "sisusb.h" #include "sisusb.h"
#include "xf86RAC.h"
#include "dixstruct.h" #include "dixstruct.h"
#include "shadowfb.h" #include "shadowfb.h"
#include "fb.h" #include "fb.h"
@ -51,8 +50,13 @@
#include "globals.h" #include "globals.h"
#ifdef HAVE_XEXTPROTO_71
#include <X11/extensions/dpmsconst.h>
#else
#define DPMS_SERVER #define DPMS_SERVER
#include <X11/extensions/dpms.h> #include <X11/extensions/dpms.h>
#endif
/* /*
* This is intentionally screen-independent. It indicates the binding * This is intentionally screen-independent. It indicates the binding
@ -90,24 +94,6 @@ static SymTabRec SISUSBChipsets[] = {
{ -1, NULL } { -1, NULL }
}; };
static const char *fbSymbols[] = {
"fbPictureInit",
"fbScreenInit",
NULL
};
static const char *shadowSymbols[] = {
"ShadowFBInit",
NULL
};
static const char *ramdacSymbols[] = {
"xf86CreateCursorInfoRec",
"xf86DestroyCursorInfoRec",
"xf86InitCursor",
NULL
};
#ifdef XFree86LOADER #ifdef XFree86LOADER
static MODULESETUPPROTO(sisusbSetup); static MODULESETUPPROTO(sisusbSetup);
@ -143,7 +129,6 @@ sisusbSetup(pointer module, pointer opts, int *errmaj, int *errmin)
if(!setupDone) { if(!setupDone) {
setupDone = TRUE; setupDone = TRUE;
xf86AddDriver(&SISUSB, module, SISUSB_HaveDriverFuncs); xf86AddDriver(&SISUSB, module, SISUSB_HaveDriverFuncs);
LoaderRefSymLists(fbSymbols, shadowSymbols, ramdacSymbols, NULL);
return (pointer)TRUE; return (pointer)TRUE;
} }
@ -862,11 +847,6 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags)
pScrn->chipset, pSiSUSB->sisusbversion, pSiSUSB->sisusbrevision, pScrn->chipset, pSiSUSB->sisusbversion, pSiSUSB->sisusbrevision,
pSiSUSB->sisusbpatchlevel); pSiSUSB->sisusbpatchlevel);
/* Operations for which memory access is required */
/* USB2VGA: We never need memory or i/o access */
pScrn->racMemFlags = 0;
pScrn->racIoFlags = 0;
/* Load ramdac module */ /* Load ramdac module */
if(!xf86LoadSubModule(pScrn, "ramdac")) { if(!xf86LoadSubModule(pScrn, "ramdac")) {
SISUSBErrorLog(pScrn, "Could not load ramdac module\n"); SISUSBErrorLog(pScrn, "Could not load ramdac module\n");
@ -874,8 +854,6 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE; return FALSE;
} }
xf86LoaderReqSymLists(ramdacSymbols, NULL);
/* Set pScrn->monitor */ /* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor; pScrn->monitor = pScrn->confScreen->monitor;
@ -1444,7 +1422,6 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags)
SISUSBFreeRec(pScrn); SISUSBFreeRec(pScrn);
return FALSE; return FALSE;
} }
xf86LoaderReqSymLists(fbSymbols, NULL);
/* Load shadowfb (if needed) */ /* Load shadowfb (if needed) */
if(pSiSUSB->ShadowFB) { if(pSiSUSB->ShadowFB) {
@ -1454,7 +1431,6 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags)
SISUSBFreeRec(pScrn); SISUSBFreeRec(pScrn);
return FALSE; return FALSE;
} }
xf86LoaderReqSymLists(shadowSymbols, NULL);
} }
pSiSUSB->UseVESA = 0; pSiSUSB->UseVESA = 0;