Module Name: xsrc
Committed By: mrg
Date: Thu Jul 9 03:45:19 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-cirrus/dist/src: lg_driver.c
Log Message:
merge xf86-video-cirrus-1.3.1
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c
diff -u xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c:1.2 xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c:1.3
--- xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c:1.2 Wed Jun 10 01:54:49 2009
+++ xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c Thu Jul 9 03:45:19 2009
@@ -45,6 +45,9 @@
/* All drivers initialising the SW cursor need this */
#include "mipointer.h"
+/* need this for inputInfo */
+#include "inputstr.h"
+
/* All drivers implementing backing store need this */
#include "mibstore.h"
@@ -163,80 +166,6 @@
/* 32 */ { 160, 256, 320, 416, 512, 640, 832, 1024, 1280, 1664, 0 }
};
-/*
- * List of symbols from other modules that this module references. This
- * list is used to tell the loader that it is OK for symbols here to be
- * unresolved providing that it hasn't been told that they haven't been
- * told that they are essential via a call to xf86LoaderReqSymbols() or
- * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
- * unresolved symbols that are not required.
- */
-
-static const char *vgahwSymbols[] = {
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWHandleColormaps",
- "vgaHWInit",
- "vgaHWLock",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreen",
- "vgaHWUnlock",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbScreenInit",
- "fbPictureInit",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-#define LGuseI2C 1
-
-static const char *ddcSymbols[] = {
- "xf86PrintEDID",
-#if LGuseI2C
- "xf86DoEDID_DDC2",
-#endif
- "xf86SetDDCproperties",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-
-static const char *int10Symbols[] = {
- "xf86FreeInt10",
- "xf86InitInt10",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
#ifdef XFree86LOADER
#define LG_MAJOR_VERSION 1
@@ -276,9 +205,6 @@
if (!setupDone) {
setupDone = TRUE;
- LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols,
- ramdacSymbols, ddcSymbols, i2cSymbols,
- int10Symbols, NULL);
}
return (pointer)1;
}
@@ -432,8 +358,6 @@
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
/*
* Allocate a vgaHWRec
*/
@@ -465,7 +389,6 @@
if (xf86LoadSubModule(pScrn, "int10")) {
xf86Int10InfoPtr int10InfoPtr;
- xf86LoaderReqSymLists(int10Symbols, NULL);
int10InfoPtr = xf86InitInt10(pCir->pEnt->index);
@@ -668,14 +591,12 @@
LgFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ddcSymbols, NULL);
#if LGuseI2C
if (!xf86LoadSubModule(pScrn, "i2c")) {
LgFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(i2cSymbols, NULL);
#endif
/* Read and print the monitor DDC information */
@@ -868,7 +789,6 @@
LgFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
break;
}
@@ -878,7 +798,6 @@
LgFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
/* Load ramdac if needed */
@@ -887,7 +806,6 @@
LgFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
if (pCir->shadowFB) {
@@ -895,7 +813,6 @@
LgFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
return TRUE;
