[devel-revise_pciids_and_revisions]

- Aggregated all information i could find in comments in via_reg.h.
- (Re)Defined pci-ids. Altered symtab strings. Added commented
    HAVE_K8M800/PM800. Created warnings for when either is used.
- Reviewed CLE266 revisions. Created CLE266_REV_IS_[A/C]X to handle this
    cleanly. Removed pBIOSInfo->A2 and the related option. Added
    doublecheck for Ax/Cx found in fb code. Replaced DispatchVGARevisionID
    with new define. Added comments where only the revision is checked and
    not the chipset.
- removed VIAvfInitHWDiff to VIAVidHWDiffInit and moved into via_swov.c,
    removed via_hwdiff.c. Renamed VIAHW to HWDiff, removed unused entries,
    added PM800.
- Removed K8M800/K8N800 from manpage, only detection is really implemented.

1 files changed, 2 insertions, 48 deletions

diff --git a/src/via_driver.h b/src/via_driver.h
index d62cbb9..1e5ec48 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -66,6 +66,7 @@
 #include "via_priv.h"
 /* #include "ginfo.h" */
 #include "via_privioctl.h"
+#include "via_swov.h"
 
 #ifdef XF86DRI
 #define _XF86DRI_SERVER_
@@ -155,50 +156,6 @@ typedef struct __viaVideoControl {
   Bool  MPEGOnScreen1;   /* True: MPEG On Screen1 ; False: MPEG On Screen0 */
 } VIAVideoControlRec, VIAVideoControlPtr;
 
-/*For Video HW Difference */
-#define VIA_REVISION_CLEC0        0x10
-#define VIA_REVISION_CLEC1        0x11
-#define VIA_REVISION_CLECX        0x10
-
-#define VID_HWDIFF_TRUE           0x00000001
-#define VID_HWDIFF_FALSE          0x00000000
-
-/*
- *	Video HW Difference Structure
- */
-
-typedef struct __VIAHWRec
-{
-    unsigned long dwThreeHQVBuffer;		/* Use Three HQV Buffers*/
-    unsigned long dwV3SrcHeightSetting;		/* Set Video Source Width and Height*/
-    unsigned long dwSupportExtendFIFO;		/* Support Extand FIFO*/
-    unsigned long dwHQVFetchByteUnit;		/* HQV Fetch Count unit is byte*/
-    unsigned long dwHQVInitPatch;		/* Initialize HQV Engine 2 times*/
-    unsigned long dwSupportV3Gamma;		/* Support V3 Gamma */
-    unsigned long dwUpdFlip;			/* Set HQV3D0[15] to flip video*/
-    unsigned long dwHQVDisablePatch;		/* Change Video Engine Clock setting for HQV disable bug*/
-    unsigned long dwSUBFlip;			/* Set HQV3D0[15] to flip video for sub-picture blending*/
-    unsigned long dwNeedV3Prefetch;		/* V3 pre-fetch function for K8*/
-    unsigned long dwNeedV4Prefetch;		/* V4 pre-fetch function for K8*/
-    unsigned long dwUseSystemMemory;		/* Use system memory for DXVA compressed data buffers*/
-    unsigned long dwExpandVerPatch;		/* Patch video HW bug in expand SIM mode or same display path*/
-    unsigned long dwExpandVerHorPatch;		/* Patch video HW bug in expand SAMM mode or same display path*/
-    unsigned long dwV3ExpireNumTune;		/* Change V3 expire number setting for V3 bandwidth issue*/
-    unsigned long dwV3FIFOThresholdTune;	/* Change V3 FIFO, Threshold and Pre-threshold setting for V3 bandwidth issue*/
-    unsigned long dwCheckHQVFIFOEmpty;          /* HW Flip path, need to check HQV FIFO status */
-    unsigned long dwUseMPEGAGP;                 /* Use MPEG AGP function*/
-    unsigned long dwV3FIFOPatch;                /* For CLE V3 FIFO Bug (srcWidth <= 8)*/
-    unsigned long dwSupportTwoColorKey;         /* Support two color key*/
-    unsigned long dwCxColorSpace;               /* CLE_Cx ColorSpace*/
-} VIAHWRec;
-
-/*Wait Function Structure and Flag*/
-typedef struct _WaitHWINFO
-{
-    unsigned char *	pjVideo;		/* MMIO Address Info*/
-    unsigned long	dwVideoFlag;		/* Video Flag*/
-}WaitHWINFO, * LPWaitHWINFO;
-
 /* VIA Tuners */
 typedef struct
 {
@@ -393,7 +350,7 @@ typedef struct _VIA {
     /* Video */
     swovRec		swov;
     VIAVideoControlRec  Video;
-    VIAHWRec		ViaHW;
+    VIAHWDiff		HWDiff;
     unsigned long	dwV1, dwV3;
     unsigned long	OverlaySupported;
     unsigned long	dwFrameNum;
@@ -441,9 +398,6 @@ typedef struct
 void VIAAdjustFrame(int scrnIndex, int y, int x, int flags);
 Bool VIASwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
 
-/* In HwDiff.c */
-void VIAvfInitHWDiff(VIAPtr pVia );
-
 /* In via_cursor.c. */
 Bool VIAHWCursorInit(ScreenPtr pScreen);
 void VIAShowCursor(ScrnInfoPtr);