modified: ChangeLog

	modified:   configure.ac
	modified:   src/ast.h
	modified:   src/ast_2dtool.h
	modified:   src/ast_accel.c
	modified:   src/ast_cursor.c
	modified:   src/ast_driver.c
	modified:   src/ast_mode.c
	modified:   src/ast_mode.h
	modified:   src/ast_vgatool.c

1 files changed, 12 insertions, 0 deletions

diff --git a/src/ast.h b/src/ast.h
index a4574ea..e7376c6 100644
--- a/src/ast.h
+++ b/src/ast.h
@@ -27,6 +27,7 @@
 #define	Accel_2D
 /* #define MMIO_2D */
 #define HWC
+/* #define PATCH_ABI_VERSION */
 
 /* Vendor & Device Info */
 #ifndef PCI_VENDOR_AST
@@ -37,6 +38,12 @@
 #define PCI_CHIP_AST2000		0x2000		
 #endif
 
+typedef enum _CHIP_ID {
+    VGALegacy,
+    AST2000,
+    AST2100	
+} CHIP_ID;
+
 /* AST REC Info */
 #define AST_NAME 			"AST"
 #define AST_DRIVER_NAME 		"ast"
@@ -54,6 +61,9 @@
 #define CMD_QUEUE_GUARD_BAND    	0x00000020
 #define DEFAULT_HWC_NUM			0x00000002
 
+/* Patch Info */
+#define ABI_VIDEODRV_VERSION_PATCH	SET_ABI_VERSION(0, 5)
+
 /* Data Type Definition */
 typedef INT32  		LONG;
 typedef CARD8   	UCHAR;
@@ -132,6 +142,8 @@ typedef struct _ASTRec {
 
     CloseScreenProcPtr CloseScreen;
     ScreenBlockHandlerProcPtr BlockHandler;
+
+    UCHAR		jChipType;
              
     Bool 		noAccel;
     Bool 		noHWC;