diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:01 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:01 +0000 |
| commit | 63a8325d05d7102df909ca19c112be149e4ecbe0 (patch) | |
| tree | e74c051fe6a300feb685654b6b8e203b46125584 | |
| parent | c2355efd16563476f734081e4d51b47ab094cde5 (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/imstt_driver.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/imstt_driver.c b/src/imstt_driver.c index 8ce2876..a8b870d 100644 --- a/src/imstt_driver.c +++ b/src/imstt_driver.c @@ -160,20 +160,20 @@ static const char *xaaSymbols[] = { static const char *fbdevHWSymbols[] = { - "fbdevHWAdjustFrame", - "fbdevHWEnterVT", + "fbdevHWAdjustFrameWeak", + "fbdevHWEnterVTWeak", "fbdevHWGetVidmem", "fbdevHWInit", - "fbdevHWLeaveVT", - "fbdevHWLoadPalette", + "fbdevHWLeaveVTWeak", + "fbdevHWLoadPaletteWeak", "fbdevHWMapVidmem", "fbdevHWModeInit", "fbdevHWSave", - "fbdevHWSwitchMode", + "fbdevHWSwitchModeWeak", "fbdevHWUnmapMMIO", "fbdevHWUnmapVidmem", "fbdevHWUseBuildinMode", - "fbdevHWValidMode", + "fbdevHWValidModeWeak", NULL }; @@ -192,7 +192,7 @@ static XF86ModuleVersionInfo IMSTTVersRec = { MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, @@ -417,11 +417,11 @@ static Bool IMSTTPreInit(ScrnInfoPtr pScrn, int flags) xf86LoaderReqSymLists(fbdevHWSymbols, NULL); if (!fbdevHWInit(pScrn, iptr->PciInfo, NULL)) return FALSE; - 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(); } if (pScrn->numEntities > 1) { @@ -441,6 +441,9 @@ static Bool IMSTTPreInit(ScrnInfoPtr pScrn, int flags) xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr); + pScrn->memPhysBase = iptr->PciInfo->memBase[0]; + pScrn->fbOffset = 0; + if (pEnt->device->chipset && *pEnt->device->chipset) { pScrn->chipset = pEnt->device->chipset; iptr->Chipset = xf86StringToToken(IMSTTChipsets, pScrn->chipset); @@ -830,7 +833,7 @@ static Bool IMSTTScreenInit(int scrnIndex, ScreenPtr pScreen, if (!miCreateDefColormap(pScreen)) return FALSE; - if (!xf86HandleColormaps(pScreen, 256, 8, fbdevHWLoadPalette, + if (!xf86HandleColormaps(pScreen, 256, 8, fbdevHWLoadPaletteWeak(), NULL, CMAP_PALETTED_TRUECOLOR)) return FALSE; |