XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_901xf86-4_3_99_16

1 files changed, 8 insertions, 9 deletions

diff --git a/src/smi.h b/src/smi.h
index 6fb2ee0..ffbf8a0 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -26,7 +26,7 @@ Silicon Motion shall not be used in advertising or otherwise to promote the
 sale, use or other dealings in this Software without prior written
 authorization from the XFree86 Project and Silicon Motion.
 */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi.h,v 1.12 2003/01/12 03:55:49 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi.h,v 1.14 2003/10/08 11:13:01 eich Exp $ */
 
 #ifndef _SMI_H
 #define _SMI_H
@@ -64,10 +64,8 @@ authorization from the XFree86 Project and Silicon Motion.
 #include "xf86int10.h"
 #include "vbe.h"
 
-#ifdef XvExtension
-#	include "xf86xv.h"
-#	include "Xv.h"
-#endif
+#include "xf86xv.h"
+#include "Xv.h"
 
 /******************************************************************************/
 /*			D E F I N I T I O N S				      */
@@ -104,6 +102,7 @@ typedef struct
 			DPR44;
 	CARD32	VPR00, VPR0C, VPR10;
 	CARD32	CPR00;
+	CARD32	FPR00_, FPR0C_, FPR10_;
 
 } SMIRegRec, *SMIRegPtr;
 
@@ -147,6 +146,7 @@ typedef struct
 	CARD8 *			DPRBase;	/* Base of DPR registers */
 	CARD8 *			VPRBase;	/* Base of VPR registers */
 	CARD8 *			CPRBase;	/* Base of CPR registers */
+    CARD8 *			FPRBase;    /* Base of FPR registers - for 0730 chipset */
 	CARD8 *			DataPortBase;	/* Base of data port */
 	int			DataPortSize;	/* Size of data port */
 	CARD8 *			IOBase;		/* Base of MMIO VGA ports */
@@ -241,17 +241,15 @@ typedef struct
 
 	void (*PointerMoved)(int index, int x, int y);
 
-#ifdef XvExtension
 	int			videoKey;	/* Video chroma key */
 	Bool			ByteSwap;	/* Byte swap for ZV port */
-    Bool        interlaced;   /* True: Interlaced Video */
+	Bool			interlaced;	/* True: Interlaced Video */
 	/* XvExtension */
 	XF86VideoAdaptorPtr	ptrAdaptor;	/* Pointer to VideoAdapter
 						   structure */
 	void (*BlockHandler)(int i, pointer blockData, pointer pTimeout,
 						 pointer pReadMask);
-    GCPtr videoGC;
-#endif
+	GCPtr			videoGC;
 	OptionInfoPtr		Options;
         CARD8 DACmask;
 } SMIRec, *SMIPtr;
@@ -355,6 +353,7 @@ Bool SMI_DGAInit(ScreenPtr pScrn);
 /* smi_shadow.c */
 void SMI_PointerMoved(int index, int x, int y);
 void SMI_RefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
+void SMI_RefreshArea730(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
 
 /* smi_video.c */
 void SMI_InitVideo(ScreenPtr pScreen);