summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/hw/xfree86/drivers/ati/atiident.c
diff options
context:
space:
mode:
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/ati/atiident.c')
-rw-r--r--xc/programs/Xserver/hw/xfree86/drivers/ati/atiident.c25
1 files changed, 23 insertions, 2 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/atiident.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/atiident.c
index 03fc99102..d0f334fce 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/atiident.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/atiident.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiident.c,v 1.5 2000/02/18 12:19:22 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiident.c,v 1.6 2000/08/04 21:07:14 tsi Exp $ */
/*
* Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
*
@@ -28,18 +28,29 @@
const char *ATIChipsetNames[] =
{
"ati",
+
+#ifndef AVOID_CPIO
+
"ativga",
"ibmvga",
"ibm8514",
"vgawonder",
"mach8",
"mach32",
- "mach64"
+
+#endif /* AVOID_CPIO */
+
+ "mach64",
+ "rage128",
+ "radeon"
};
static SymTabRec ATIPublicChipsetNames[] =
{
{ATI_CHIPSET_ATI, "ati"},
+
+#ifndef AVOID_CPIO
+
{ATI_CHIPSET_ATIVGA, "ativga"},
#ifdef __MAYBE_NOT__
{ATI_CHIPSET_IBMVGA, "ibmvga"},
@@ -47,6 +58,9 @@ static SymTabRec ATIPublicChipsetNames[] =
#ifdef __NOT_YET__
{ATI_CHIPSET_IBM8514, "ibm8514"},
#endif
+
+#endif /* AVOID_CPIO */
+
{-1, NULL}
};
@@ -82,13 +96,20 @@ ATIIdentProbe
static SymTabRec SpecificNames[] =
{
+
+#ifndef AVOID_CPIO
+
{ATI_CHIPSET_VGAWONDER, "vgawonder"},
#ifdef __NOT_YET__
{ATI_CHIPSET_MACH8, "mach8"},
#endif
{ATI_CHIPSET_MACH32, "mach32"},
+
+#endif /* AVOID_CPIO */
+
{ATI_CHIPSET_MACH64, "mach64"},
{ATI_CHIPSET_RAGE128, "rage128"},
+ {ATI_CHIPSET_RADEON, "radeon"},
{-1, NULL}
};