diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:33:58 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:33:58 +0000 |
| commit | 71bac678b6c1164a2fde3f3a13d15e9a594fc235 (patch) | |
| tree | 9b99388914cf3a0afbc827554e27f213e4606cf6 | |
| parent | e99714dbe88348d9c73d140723f376dff509e329 (diff) | |
Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_2-MERGECYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGECYGWIN
| -rw-r--r-- | src/fbdev.c | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/src/fbdev.c b/src/fbdev.c index f531a19..b6b3f3f 100644 --- a/src/fbdev.c +++ b/src/fbdev.c @@ -137,7 +137,9 @@ static const char *shadowSymbols[] = { "shadowInit", "shadowSetup", "shadowUpdatePacked", + "shadowUpdatePackedWeak", "shadowUpdateRotatePacked", + "shadowUpdateRotatePackedWeak", NULL }; @@ -158,20 +160,23 @@ static const char *fbdevHWSymbols[] = { "fbdevHWUnmapVidmem", /* colormap */ - "fbdevHWLoadpalette", + "fbdevHWLoadPalette", + "fbdevHWLoadPaletteWeak", /* ScrnInfo hooks */ - "fbdevHWAdjustFrame", - "fbdevHWEnterVT", - "fbdevHWLeaveVT", + "fbdevHWAdjustFrameWeak", + "fbdevHWEnterVTWeak", + "fbdevHWLeaveVTWeak", "fbdevHWModeInit", "fbdevHWRestore", "fbdevHWSave", "fbdevHWSaveScreen", - "fbdevHWSwitchMode", - "fbdevHWValidMode", + "fbdevHWSaveScreenWeak", + "fbdevHWSwitchModeWeak", + "fbdevHWValidModeWeak", "fbdevHWDPMSSet", + "fbdevHWDPMSSetWeak", NULL }; @@ -186,7 +191,7 @@ static XF86ModuleVersionInfo FBDevVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, FBDEV_MAJOR_VERSION, FBDEV_MINOR_VERSION, 0, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, @@ -354,11 +359,11 @@ FBDevProbe(DriverPtr drv, int flags) pScrn->Probe = FBDevProbe; pScrn->PreInit = FBDevPreInit; pScrn->ScreenInit = FBDevScreenInit; - pScrn->SwitchMode = fbdevHWSwitchMode; - pScrn->AdjustFrame = fbdevHWAdjustFrame; - pScrn->EnterVT = fbdevHWEnterVT; - pScrn->LeaveVT = fbdevHWLeaveVT; - pScrn->ValidMode = fbdevHWValidMode; + pScrn->SwitchMode = fbdevHWSwitchModeWeak(); + pScrn->AdjustFrame = fbdevHWAdjustFrameWeak(); + pScrn->EnterVT = fbdevHWEnterVTWeak(); + pScrn->LeaveVT = fbdevHWLeaveVTWeak(); + pScrn->ValidMode = fbdevHWValidModeWeak(); xf86DrvMsg(pScrn->scrnIndex, X_INFO, "using %s\n", dev ? dev : "default device"); @@ -782,7 +787,8 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if (fPtr->shadowFB && (!shadowSetup(pScreen) || !shadowAdd(pScreen, NULL, - fPtr->rotate ? shadowUpdateRotatePacked : shadowUpdatePacked, + fPtr->rotate ? shadowUpdateRotatePackedWeak() + : shadowUpdatePackedWeak(), FBDevWindowLinear, fPtr->rotate, NULL)) ) { xf86DrvMsg(scrnIndex, X_ERROR, "Shadow framebuffer initialization failed.\n"); @@ -842,12 +848,13 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) return FALSE; } flags = CMAP_PALETTED_TRUECOLOR; - if(!xf86HandleColormaps(pScreen, 256, 8, fbdevHWLoadPalette, NULL, flags)) + if(!xf86HandleColormaps(pScreen, 256, 8, fbdevHWLoadPaletteWeak(), + NULL, flags)) return FALSE; - xf86DPMSInit(pScreen, fbdevHWDPMSSet, 0); + xf86DPMSInit(pScreen, fbdevHWDPMSSetWeak(), 0); - pScreen->SaveScreen = fbdevHWSaveScreen; + pScreen->SaveScreen = fbdevHWSaveScreenWeak(); /* Wrap the current CloseScreen function */ fPtr->CloseScreen = pScreen->CloseScreen; |