diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2007-03-24 19:53:02 +0200 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2007-03-24 21:20:39 +0200 |
| commit | aa8f5b02ebc9be60df48722588261627d6a457e8 (patch) | |
| tree | d8651de2813299fe7925a89bd295cf4d0b73bd7b | |
| parent | 39e896a1e688ea2d2d21f88c1c5d34c5810aac1c (diff) | |
[mach64] Use Mach64Chipsets[] instead of ATIChipNames[].
atimisc is PCI-only now, we can get the chip name with xf86TokenToString().
| -rw-r--r-- | src/atimach64probe.c | 2 | ||||
| -rw-r--r-- | src/atimach64probe.h | 2 | ||||
| -rw-r--r-- | src/atipreinit.c | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/atimach64probe.c b/src/atimach64probe.c index 043cad9b..c5330cc7 100644 --- a/src/atimach64probe.c +++ b/src/atimach64probe.c @@ -38,7 +38,7 @@ #include "atiadjust.h" #include "ativalid.h" -static SymTabRec +SymTabRec Mach64Chipsets[] = { {ATI_CHIP_88800GXC, "ATI 88800GX-C"}, {ATI_CHIP_88800GXD, "ATI 88800GX-D"}, diff --git a/src/atimach64probe.h b/src/atimach64probe.h index fa9e713a..65ced985 100644 --- a/src/atimach64probe.h +++ b/src/atimach64probe.h @@ -25,6 +25,8 @@ #include "xf86str.h" +extern SymTabRec Mach64Chipsets[]; + extern const OptionInfoRec * Mach64AvailableOptions(int, int); extern void Mach64Identify(int); extern Bool Mach64Probe(DriverPtr, int); diff --git a/src/atipreinit.c b/src/atipreinit.c index 7f0c4b26..d960e88f 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -41,6 +41,7 @@ #include "atimach64.h" #include "atimach64accel.h" #include "atimach64io.h" +#include "atimach64probe.h" #include "atimode.h" #include "atioption.h" #include "atipreinit.h" @@ -982,7 +983,8 @@ ATIPreInit /* Report what was found */ xf86DrvMsg(pScreenInfo->scrnIndex, X_PROBED, - "%s graphics controller detected.\n", ATIChipNames[pATI->Chip]); + "%s graphics controller detected.\n", + xf86TokenToString(Mach64Chipsets, pATI->Chip)); { Message = Buffer + snprintf(Buffer, SizeOf(Buffer), "Chip type %04X", |