diff options
| -rw-r--r-- | src/atiident.c | 55 | ||||
| -rw-r--r-- | src/atiident.h | 12 | ||||
| -rw-r--r-- | src/atipreinit.c | 19 | ||||
| -rw-r--r-- | src/atistruct.h | 4 |
4 files changed, 3 insertions, 87 deletions
diff --git a/src/atiident.c b/src/atiident.c index 14bd9663..cffa8170 100644 --- a/src/atiident.c +++ b/src/atiident.c @@ -32,20 +32,6 @@ #include "r128_probe.h" #include "radeon_probe.h" -const char *ATIChipsetNames[] = -{ - "ati", - "mach64", - "rage128", - "radeon" -}; - -static SymTabRec ATIPublicChipsetNames[] = -{ - {ATI_CHIPSET_ATI, "ati"}, - {-1, NULL} -}; - /* * ATIIdentify -- * @@ -57,45 +43,8 @@ ATIIdentify int flags ) { - xf86PrintChipsets(ATI_NAME, - (NumberOf(ATIPublicChipsetNames) <= 2) ? - "ATI driver (version " ATI_VERSION_NAME ") for chipset" : - "ATI driver (version " ATI_VERSION_NAME ") for chipsets", - ATIPublicChipsetNames); + xf86Msg(X_INFO, "%s: %s\n", ATI_NAME, + "ATI driver (version " ATI_VERSION_NAME ") for chipset: mach64"); R128Identify(flags); RADEONIdentify(flags); } - -/* - * ATIIdentProbe -- - * - * This function determines if the user specified a chipset name acceptable to - * the driver. It returns an ATIChipsetType or -1. - */ -int -ATIIdentProbe -( - const char *ChipsetName -) -{ - int Chipset; - - static SymTabRec SpecificNames[] = - { - {ATI_CHIPSET_MACH64, "mach64"}, - {ATI_CHIPSET_RAGE128, "rage128"}, - {ATI_CHIPSET_RADEON, "radeon"}, - {-1, NULL} - }; - - /* If no Chipset specification, default to "ati" */ - if (!ChipsetName || !*ChipsetName) - return ATI_CHIPSET_ATI; - - Chipset = xf86StringToToken(ATIPublicChipsetNames, ChipsetName); - if (Chipset != -1) - return Chipset; - - /* Check for some other chipset names */ - return xf86StringToToken(SpecificNames, ChipsetName); -} diff --git a/src/atiident.h b/src/atiident.h index ca488c9d..38699ec6 100644 --- a/src/atiident.h +++ b/src/atiident.h @@ -23,18 +23,6 @@ #ifndef ___ATIIDENT_H___ #define ___ATIIDENT_H___ 1 -typedef enum -{ - ATI_CHIPSET_ATI, - ATI_CHIPSET_MACH64, - ATI_CHIPSET_RAGE128, - ATI_CHIPSET_RADEON, - ATI_CHIPSET_MAX /* Must be last */ -} ATIChipsetType; - -extern const char *ATIChipsetNames[]; - extern void ATIIdentify(int); -extern int ATIIdentProbe(const char *); #endif /* ___ATIIDENT_H___ */ diff --git a/src/atipreinit.c b/src/atipreinit.c index 5d80d276..b9111fc3 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -236,23 +236,6 @@ ATIPreInit if (!(flags & PROBE_DETECT)) { - xf86DrvMsg(pScreenInfo->scrnIndex, - pATI->Chipset ? X_CONFIG : X_DEFAULT, - "Chipset: \"%s\".\n", ATIChipsetNames[pATI->Chipset]); - - /* Promote chipset specification */ - switch (pATI->Chipset) - { - case ATI_CHIPSET_MACH64: - case ATI_CHIPSET_RAGE128: - case ATI_CHIPSET_RADEON: - pATI->Chipset = ATI_CHIPSET_ATI; - break; - - default: - break; - } - /* Set monitor */ pScreenInfo->monitor = pScreenInfo->confScreen->monitor; @@ -2539,7 +2522,7 @@ ATIPreInit ATII2CPreInit(pScreenInfo, pATI); if (!pScreenInfo->chipset || !*pScreenInfo->chipset) - pScreenInfo->chipset = (char *)ATIChipsetNames[0]; + pScreenInfo->chipset = "mach64"; ATILock(pATI); ATIPrintNoiseIfRequested(pATI, BIOS, BIOSSize); diff --git a/src/atistruct.h b/src/atistruct.h index 430b565d..e50cbb58 100644 --- a/src/atistruct.h +++ b/src/atistruct.h @@ -211,10 +211,6 @@ typedef struct _Mach64ContextRegs3D */ typedef struct _ATIRec { - /* - * Definitions related to XF86Config "Chipset" specifications. - */ - CARD8 Chipset; #ifndef AVOID_CPIO |