Copied definitions of chipset tags from savage_regs.h in the 2D driver.

1 files changed, 35 insertions, 1 deletions

diff --git a/xc/lib/GL/mesa/src/drv/savage/savage_init.h b/xc/lib/GL/mesa/src/drv/savage/savage_init.h
index 4f594616a..c55c62df9 100755
--- a/xc/lib/GL/mesa/src/drv/savage/savage_init.h
+++ b/xc/lib/GL/mesa/src/drv/savage/savage_init.h
@@ -121,7 +121,41 @@ extern void savageXMesaSetFrontClipRects( savageContextPtr imesa );
    LOCK_HARDWARE( imesa );			\
    savageRegetLockQuiescent( imesa );		\
 } while(0)
-     
+
+/* The following definitions are copied from savage_regs.h in the XFree86
+ * driver. They are unlikely to change. If they do we need to keep them in
+ * sync. */
+
+#define S3_SAVAGE3D_SERIES(chip)  ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX))
+
+#define S3_SAVAGE4_SERIES(chip)  ((chip==S3_SAVAGE4)            \
+                                  || (chip==S3_PROSAVAGE)       \
+                                  || (chip==S3_TWISTER)         \
+                                  || (chip==S3_PROSAVAGEDDR))
+
+#define	S3_SAVAGE_MOBILE_SERIES(chip)	((chip==S3_SAVAGE_MX) || (chip==S3_SUPERSAVAGE))
+
+#define S3_SAVAGE_SERIES(chip)    ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE2000))
+
+#define S3_MOBILE_TWISTER_SERIES(chip)   ((chip==S3_TWISTER)    \
+                                          ||(chip==S3_PROSAVAGEDDR))
+
+/* Chip tags.  These are used to group the adapters into 
+ * related families.
+ */
+
+enum S3CHIPTAGS {
+    S3_UNKNOWN = 0,
+    S3_SAVAGE3D,
+    S3_SAVAGE_MX,
+    S3_SAVAGE4,
+    S3_PROSAVAGE,
+    S3_TWISTER,
+    S3_PROSAVAGEDDR,
+    S3_SUPERSAVAGE,
+    S3_SAVAGE2000,
+    S3_LAST
+};
 
 #endif
 #endif