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 | 7484bdff3da66b691c2234716d2fbbd41c9794b4 (patch) | |
| tree | f25543547907461299ec9c22e1c2d57f51ebf2af | |
| parent | 026c1803e1d219b4e56c8a0d9f04eb60d7d2ac8f (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/alp_driver.c | 2 | ||||
| -rw-r--r-- | src/cir_driver.c | 11 | ||||
| -rw-r--r-- | src/lg_driver.c | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/alp_driver.c b/src/alp_driver.c index 547c983..d20507e 100644 --- a/src/alp_driver.c +++ b/src/alp_driver.c @@ -238,7 +238,7 @@ static XF86ModuleVersionInfo alpVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, ALP_MAJOR_VERSION, ALP_MINOR_VERSION, ALP_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, diff --git a/src/cir_driver.c b/src/cir_driver.c index e8a80e5..8febbad 100644 --- a/src/cir_driver.c +++ b/src/cir_driver.c @@ -143,7 +143,7 @@ static XF86ModuleVersionInfo cirVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, CIR_MAJOR_VERSION, CIR_MINOR_VERSION, CIR_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, @@ -218,7 +218,6 @@ CIRProbe(DriverPtr drv, int flags) int numDevSections; int numUsed; Bool foundScreen = FALSE; - ScrnInfoPtr (*subProbe)(int entity); ScrnInfoPtr pScrn; #ifdef CIR_DEBUG @@ -275,6 +274,7 @@ CIRProbe(DriverPtr drv, int flags) they should be handled in this driver (as opposed to their own driver). */ pPci = xf86GetPciInfoForEntity(usedChips[i]); + pScrn = NULL; if (pPci && (pPci->chipType == PCI_CHIP_GD5462 || pPci->chipType == PCI_CHIP_GD5464 || pPci->chipType == PCI_CHIP_GD5464BD || @@ -286,7 +286,7 @@ CIRProbe(DriverPtr drv, int flags) xf86LoaderReqSymLists(lgSymbols, NULL); lg_loaded = TRUE; } - subProbe = LgProbe; + pScrn = LgProbe(usedChips[i]); } else { if (!alp_loaded) { if (!xf86LoadDrvSubModule(drv, "cirrus_alpine")) @@ -294,11 +294,10 @@ CIRProbe(DriverPtr drv, int flags) xf86LoaderReqSymLists(alpSymbols, NULL); alp_loaded = TRUE; } - subProbe = AlpProbe; + pScrn = AlpProbe(usedChips[i]); } - pScrn = NULL; - if ((pScrn = subProbe(usedChips[i]))) { + if (pScrn) { foundScreen = TRUE; /* Fill in what we can of the ScrnInfoRec */ pScrn->driverVersion = VERSION; diff --git a/src/lg_driver.c b/src/lg_driver.c index 507f5d1..da6d208 100644 --- a/src/lg_driver.c +++ b/src/lg_driver.c @@ -246,7 +246,7 @@ static XF86ModuleVersionInfo lgVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, LG_MAJOR_VERSION, LG_MINOR_VERSION, LG_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, |