79 lines
2.0 KiB
Diff
79 lines
2.0 KiB
Diff
|
diff -up xf86-video-vmware-10.16.0/src/vmware.c.abi xf86-video-vmware-10.16.0/src/vmware.c
|
||
|
|
--- xf86-video-vmware-10.16.0/src/vmware.c.abi 2009-06-23 10:44:26.000000000 +1000
|
||
|
|
+++ xf86-video-vmware-10.16.0/src/vmware.c 2009-06-23 10:44:46.000000000 +1000
|
||
|
|
@@ -140,38 +140,6 @@ static PciChipsets VMWAREPciChipsets[] =
|
||
|
|
{ -1, -1, RES_UNDEFINED }
|
||
|
|
};
|
||
|
|
|
||
|
|
-static const char *vgahwSymbols[] = {
|
||
|
|
- "vgaHWGetHWRec",
|
||
|
|
- "vgaHWGetIOBase",
|
||
|
|
- "vgaHWGetIndex",
|
||
|
|
- "vgaHWInit",
|
||
|
|
- "vgaHWProtect",
|
||
|
|
- "vgaHWRestore",
|
||
|
|
- "vgaHWSave",
|
||
|
|
- "vgaHWSaveScreen",
|
||
|
|
- "vgaHWUnlock",
|
||
|
|
- NULL
|
||
|
|
-};
|
||
|
|
-
|
||
|
|
-static const char *fbSymbols[] = {
|
||
|
|
- "fbCreateDefColormap",
|
||
|
|
- "fbPictureInit",
|
||
|
|
- "fbScreenInit",
|
||
|
|
- NULL
|
||
|
|
-};
|
||
|
|
-
|
||
|
|
-static const char *ramdacSymbols[] = {
|
||
|
|
- "xf86CreateCursorInfoRec",
|
||
|
|
- "xf86DestroyCursorInfoRec",
|
||
|
|
- "xf86InitCursor",
|
||
|
|
- NULL
|
||
|
|
-};
|
||
|
|
-
|
||
|
|
-static const char *shadowfbSymbols[] = {
|
||
|
|
- "ShadowFBInit2",
|
||
|
|
- NULL
|
||
|
|
-};
|
||
|
|
-
|
||
|
|
#ifdef XFree86LOADER
|
||
|
|
static XF86ModuleVersionInfo vmwareVersRec = {
|
||
|
|
"vmware",
|
||
|
|
@@ -634,8 +602,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
|
||
|
|
return FALSE;
|
||
|
|
}
|
||
|
|
|
||
|
|
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
|
||
|
|
-
|
||
|
|
if (!vgaHWGetHWRec(pScrn)) {
|
||
|
|
return FALSE;
|
||
|
|
}
|
||
|
|
@@ -971,15 +937,12 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
|
||
|
|
VMWAREFreeRec(pScrn);
|
||
|
|
return FALSE;
|
||
|
|
}
|
||
|
|
- xf86LoaderReqSymLists(fbSymbols, shadowfbSymbols, NULL);
|
||
|
|
-
|
||
|
|
/* Need ramdac for hwcursor */
|
||
|
|
if (pVMWARE->hwCursor) {
|
||
|
|
if (!xf86LoadSubModule(pScrn, "ramdac")) {
|
||
|
|
VMWAREFreeRec(pScrn);
|
||
|
|
return FALSE;
|
||
|
|
}
|
||
|
|
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
|
||
|
|
}
|
||
|
|
|
||
|
|
/* Initialise VMWARE_CTRL extension. */
|
||
|
|
@@ -1892,10 +1855,6 @@ vmwareSetup(pointer module, pointer opts
|
||
|
|
if (!setupDone) {
|
||
|
|
setupDone = TRUE;
|
||
|
|
xf86AddDriver(&VMWARE, module, VMWARE_DRIVER_FUNC);
|
||
|
|
-
|
||
|
|
- LoaderRefSymLists(vgahwSymbols, fbSymbols, ramdacSymbols,
|
||
|
|
- shadowfbSymbols, NULL);
|
||
|
|
-
|
||
|
|
return (pointer)1;
|
||
|
|
}
|
||
|
|
if (errmaj) {
|