diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2007-03-23 22:12:48 +0200 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2007-03-23 23:27:39 +0200 |
| commit | 9cd175d9cd4ed710fccb303664c77519ecaf1e21 (patch) | |
| tree | 26cd672168c945ff6b325ac8f81a361105026cb3 /src/radeon_probe.c | |
| parent | d7a8cd0e476034796fc38e25a28cd28d05ea4a13 (diff) | |
Fold FillIn() back to Probe().
Diffstat (limited to 'src/radeon_probe.c')
| -rw-r--r-- | src/radeon_probe.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/radeon_probe.c b/src/radeon_probe.c index 4ff11ea..d7ff643 100644 --- a/src/radeon_probe.c +++ b/src/radeon_probe.c @@ -40,7 +40,6 @@ * Modified by Marc Aurele La France <tsi@xfree86.org> for ATI driver merge. */ -#include "atimodule.h" #include "ativersion.h" #include "radeon_probe.h" @@ -285,8 +284,22 @@ RADEONProbe(DriverPtr drv, int flags) if ((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i], RADEONPciChipsets, 0, 0, 0, 0, 0))) { + pScrn->driverVersion = RADEON_VERSION_CURRENT; + pScrn->driverName = RADEON_DRIVER_NAME; + pScrn->name = RADEON_NAME; pScrn->Probe = RADEONProbe; - RADEONFillInScreenInfo(pScrn); + pScrn->PreInit = RADEONPreInit; + pScrn->ScreenInit = RADEONScreenInit; + pScrn->SwitchMode = RADEONSwitchMode; +#ifdef X_XF86MiscPassMessage + pScrn->HandleMessage = RADEONHandleMessage; +#endif + pScrn->AdjustFrame = RADEONAdjustFrame; + pScrn->EnterVT = RADEONEnterVT; + pScrn->LeaveVT = RADEONLeaveVT; + pScrn->FreeScreen = RADEONFreeScreen; + pScrn->ValidMode = RADEONValidMode; + foundScreen = TRUE; } |