[devel-pBIOSInfo_remove_pVia_entries]

- Remove following entries from pBIOSInfo which are duplicated from pVia:
    Chipset, ChipRev, FBBase, IsSecondary, HasSecondary, I2C_Port1,
    I2C_Port2, DDC1, DDC2.
- Move MemClk to pVia, move retrieval to PreInit.
- Move FirstInit to pVia, move clearing memory to WriteMode.
- Move SAMM and GpioI2c to pVIA, remove I2CDevPtr dev.
- Stop DecideOverlaySupport from checking memory bandwidth itself, move to
    pVia->MemClk instead.
- Remove handful of unused pVia entries.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/via_driver.h b/src/via_driver.h
index e99c027..ec74ab7 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -202,6 +202,7 @@ typedef struct _VIA {
     int                 Bpp, Bpl;
     unsigned            PlaneMask;
 
+    Bool                FirstInit;
     unsigned long       videoRambytes;
     int                 videoRamKbytes;
     int                 FBFreeStart;
@@ -222,18 +223,13 @@ typedef struct _VIA {
     unsigned char*      MapBaseDense;
     unsigned char*      FBBase;
     unsigned char*      FBStart;
-    
+    CARD8               MemClk;
+
     /* Private memory pool management */
     int			SWOVUsed[MEM_BLOCKS]; /* Free map for SWOV pool */
     unsigned long	SWOVPool;	/* Base of SWOV pool */
     unsigned long	SWOVSize;	/* Size of SWOV blocks */
 
-    Bool                PrimaryVidMapped;
-    int                 dacSpeedBpp;
-    int                 minClock, maxClock;
-    int                 MCLK, REFCLK, LCDclk;
-    double              refclk_fact;
-
     /* Here are all the Options */
     Bool                VQEnable;
     Bool                pci_burst;
@@ -287,10 +283,14 @@ typedef struct _VIA {
     I2CBusPtr           pI2CBus3;    /* the bus now accessed as gpioi2c */
     xf86MonPtr          DDC1;
     xf86MonPtr          DDC2;
+    GpioI2cRec          GpioI2c; /* should be weened off, but we have no info,
+				    no hardware that this code is known to 
+				    work with (properly) */
 
     /* MHS */
     Bool                IsSecondary;
     Bool                HasSecondary;
+    Bool                SAMM;
 
     /* Capture de-interlace Mode */
     CARD32              Cap0_Deinterlace;