[devel-naming_VTpciid] Rework naming scheme once again. It is clear that

    there is no distinct VT naming structure for the unichromes themselves.
    Sometimes the northbridge VT name was used, sometimes the number after
    VT is the plain pci-id. Now we start using pci-id all the way, so that
    the amount of confusion is kept at the absolute minimum.

10 files changed, 138 insertions, 138 deletions

diff --git a/man/via.man b/man/via.man
index 3d05919..d876591 100644
--- a/man/via.man
+++ b/man/via.man
@@ -20,12 +20,12 @@ The
 driver supports the following devices:
 .nf
     VT3122:  CLE266 (CastleRock).
-    VT3205:  KM400, KM400A, KN400 (Unichrome).
-    VT3204:  K8M800, K8N800, K8N800A (Unichrome Pro, aka Pro B).
-    VT3259:  CN400, PM800, PM880, PN800, P4M800 (Unichrome Pro A).
-    VT3314:  VN800, P4M800Pro (Unichrome Pro ...).
+    VT7205:  KM400, KM400A, KN400, P4M800 (Unichrome).
+    VT3108:  K8M800, K8N800, K8N800A (Unichrome Pro, aka Pro B).
+    VT3118:  CN400, PM800, PM880, PN800 (Unichrome Pro A).
+    VT3344:  VN800, P4M800Pro (Unichrome Pro ...).
 .PP
-VT3204, VT3259 and VT3314 support is still limited.
+VT3108, VT3118 and VT3344 support is still limited.
 .PP
 This driver is being developed at http://unichrome.sourceforge.net/.
 It is not endorsed or supported by VIA Technologies. For support, refer
diff --git a/src/via_bandwidth.c b/src/via_bandwidth.c
index 2191189..bda4915 100644
--- a/src/via_bandwidth.c
+++ b/src/via_bandwidth.c
@@ -87,7 +87,7 @@ static ViaExpireNumberTable VT3122CExpireNumber[] = {
     { 800, 600,32,0x03,0xA}, {   0,   0, 0,   0,  0}
 };
 
-static ViaExpireNumberTable VT3205ExpireNumber[]={
+static ViaExpireNumberTable VT7205ExpireNumber[]={
     {1280,1024,32,0x03,0x3}, {1280,1024,32,0x04,0x9}, {1280, 768,32,0x03,0x3},
     {1280, 768,32,0x04,0x9}, {1400,1050,32,0x03,0x3}, {1400,1050,32,0x04,0x9},
     {1600,1200,32,0x03,0x4}, {1600,1200,32,0x04,0xA}, {   0,   0, 0,   0,  0}
@@ -170,7 +170,7 @@ ViaSetPrimaryFIFO(ScrnInfoPtr pScrn, DisplayModePtr mode)
 	    ViaSetPrimaryExpireNumber(pScrn, mode, VT3122AExpireNumber);
 	}
 	break;
-    case VT3205:
+    case VT7205:
         if (pVia->HasSecondary) {  /* SAMM or DuoView case */
             if ((mode->HDisplay >= 1600) &&
                 (pVia->MemClk <= VIA_MEM_DDR200)) {
@@ -192,9 +192,9 @@ ViaSetPrimaryFIFO(ScrnInfoPtr pScrn, DisplayModePtr mode)
 	hwp->writeSeq(hwp, 0x18, 0x57); /* 23 */
 
 	/* originally when setting secondary */
-	ViaSetPrimaryExpireNumber(pScrn, mode, VT3205ExpireNumber);
+	ViaSetPrimaryExpireNumber(pScrn, mode, VT7205ExpireNumber);
 	break;
-    case VT3204:
+    case VT3108:
 	hwp->writeSeq(hwp, 0x17, 0xBF); /* 384/2 - 1 = 191 (orig via comment: 384/8) */
 	ViaSeqMask(hwp, 0x16, 0x92, 0xBF); /* 328/4 = 82 = 0x52*/
 	ViaSeqMask(hwp, 0x18, 0x8a, 0xBF); /* 74 */
@@ -204,7 +204,7 @@ ViaSetPrimaryFIFO(ScrnInfoPtr pScrn, DisplayModePtr mode)
 	else
 	    ViaSeqMask(hwp, 0x22, 0x00, 0x1F); /* 128/4 = overflow = 0 */
 	break;
-    case VT3259:
+    case VT3118:
 	hwp->writeSeq(hwp, 0x17, 0x5F); /* 95 */
 	ViaSeqMask(hwp, 0x16, 0x20, 0xBF); /* 32 */
 	ViaSeqMask(hwp, 0x18, 0x10, 0xBF); /* 16 */
@@ -257,7 +257,7 @@ ViaSetSecondaryFIFO(ScrnInfoPtr pScrn, DisplayModePtr mode)
 	    }
         }
 	break;
-    case VT3205:
+    case VT7205:
 	if ((mode->HDisplay >= 1600) && (pVia->MemClk <= VIA_MEM_DDR200)) {
 	    ViaCrtcMask(hwp, 0x6A, 0x20, 0x20);
 	    hwp->writeCrtc(hwp, 0x68, 0xEB); /* depth: 14, threshold: 11 */
@@ -276,7 +276,7 @@ ViaSetSecondaryFIFO(ScrnInfoPtr pScrn, DisplayModePtr mode)
 	   hwp->writeCrtc(hwp, 0x68, 0x67); /* depth: 6, threshold: 7 */
 	}
 	break;
-    case VT3204:
+    case VT3108:
 	/* depth: (384 /8 -1 -1) = 46 = 0x2E */
 	ViaCrtcMask(hwp, 0x68, 0xE0, 0xF0);
 	ViaCrtcMask(hwp, 0x94, 0x00, 0x80);
@@ -295,7 +295,7 @@ ViaSetSecondaryFIFO(ScrnInfoPtr pScrn, DisplayModePtr mode)
 	else
 	    ViaCrtcMask(hwp, 0x94, 0x20, 0x7F); /* 128/4 */
 	break;
-    case VT3259:
+    case VT3118:
 	/* depth: 12 - 1 = 0x0B */
 	ViaCrtcMask(hwp, 0x68, 0xB0, 0xF0);
 	ViaCrtcMask(hwp, 0x94, 0x00, 0x80);
diff --git a/src/via_dri.c b/src/via_dri.c
index 6fa6dce..a421eb3 100644
--- a/src/via_dri.c
+++ b/src/via_dri.c
@@ -165,7 +165,7 @@ VIADRIRingBufferInit(ScrnInfoPtr pScrn)
 	 * Info frome code-snippet on DRI-DEVEL list; Erdi Chen.
 	 */
 
-        if (pVia->Chipset == VT3259)
+        if (pVia->Chipset == VT3118)
 	    pVIADRI->reg_pause_addr = 0x40c;
         else
 	    pVIADRI->reg_pause_addr = 0x418;
diff --git a/src/via_driver.c b/src/via_driver.c
index 3c5e0c1..c4b9975 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -99,10 +99,10 @@ _X_EXPORT DriverRec VIA =
 
 static SymTabRec VIAChipsets[] = {
     {VT3122,  "VT3122"},
-    {VT3205,  "VT3205"},
-    {VT3204,  "VT3204"},
-    {VT3259,  "VT3259"},
-    {VT3314,  "VT3314"},
+    {VT7205,  "VT7205"},
+    {VT3108,  "VT3108"},
+    {VT3118,  "VT3118"},
+    {VT3344,  "VT3344"},
     {-1,      NULL }
 };
 
@@ -110,10 +110,10 @@ static SymTabRec VIAChipsets[] = {
 static PciChipsets VIAPciChipsets[] = {
     /* {VT3022,   PCI_CHIP_VT3022,   RES_SHARED_VGA}, */
     {VT3122,  PCI_CHIP_VT3122,  RES_SHARED_VGA},
-    {VT3205,  PCI_CHIP_VT3205,  RES_SHARED_VGA},
-    {VT3204,  PCI_CHIP_VT3204,  RES_SHARED_VGA},
-    {VT3259,  PCI_CHIP_VT3259,  RES_SHARED_VGA},
-    {VT3314,  PCI_CHIP_VT3314,  RES_SHARED_VGA},
+    {VT7205,  PCI_CHIP_VT7205,  RES_SHARED_VGA},
+    {VT3108,  PCI_CHIP_VT3108,  RES_SHARED_VGA},
+    {VT3118,  PCI_CHIP_VT3118,  RES_SHARED_VGA},
+    {VT3344,  PCI_CHIP_VT3344,  RES_SHARED_VGA},
     {-1,      -1,               RES_UNDEFINED}
 };
 
@@ -459,10 +459,10 @@ VIAIdentify(int flags)
 {
     xf86Msg(X_INFO, "VIA: driver for the VIA Unichrome integrated graphics devices.\n");
     xf86Msg(X_INFO, "    VT3122: CLE266 (CastleRock).\n");
-    xf86Msg(X_INFO, "    VT3205: KM400, KM400A, KN400 (Unichrome).\n");
-    xf86Msg(X_INFO, "    VT3204: K8M800, K8N800, K8N800A (Unichrome Pro, aka Pro B).\n");
-    xf86Msg(X_INFO, "    VT3259: CN400, PM800, PM880, PN800, P4M800 (Unichrome Pro A).\n");
-    xf86Msg(X_INFO, "    VT3314: VN800, P4M800Pro (Unichrome Pro ...).\n");
+    xf86Msg(X_INFO, "    VT7205: KM400, KM400A, KN400, P4M800 (Unichrome).\n");
+    xf86Msg(X_INFO, "    VT3108: K8M800, K8N800, K8N800A (Unichrome Pro, aka Pro B).\n");
+    xf86Msg(X_INFO, "    VT3118: CN400, PM800, PM880, PN800 (Unichrome Pro A).\n");
+    xf86Msg(X_INFO, "    VT3344: VN800, P4M800Pro (Unichrome Pro ...).\n");
 }
 
 
@@ -538,7 +538,7 @@ static Bool VIAProbe(DriverPtr drv, int flags)
             /* Secondary needs a lot of work, this is just the tip of the iceberg.
              * And... erm... sharable? -- Luc */
             /* CLE266 card support Dual-Head, mark the entity as sharable*/
-            if (pEnt->chipset == VT3122 || pEnt->chipset == VT3205) {
+            if (pEnt->chipset == VT3122 || pEnt->chipset == VT7205) {
                 static int instance = 0;
                 DevUnion* pPriv;
 
@@ -1195,9 +1195,9 @@ static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags)
     xf86DrvMsg(pScrn->scrnIndex, from, "Chipset: \"%s\"\n", pScrn->chipset);
 
     switch (pVia->Chipset) {
-    case VT3204:
-    case VT3259:
-    case VT3314:
+    case VT3108:
+    case VT3118:
+    case VT3344:
 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Support for %s is limited at"
                    " this time.\n", pScrn->chipset);
         break;
@@ -1342,9 +1342,9 @@ static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags)
 	return FALSE;
     }
 
-    if (pBIOSInfo->PanelActive && ((pVia->Chipset == VT3204) || 
-                                   (pVia->Chipset == VT3259) ||
-                                   (pVia->Chipset == VT3314)))
+    if (pBIOSInfo->PanelActive && ((pVia->Chipset == VT3108) || 
+                                   (pVia->Chipset == VT3118) ||
+                                   (pVia->Chipset == VT3344)))
 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
                    "Panel on %s is currently not supported.\n", pScrn->chipset);
 
@@ -1378,7 +1378,7 @@ static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags)
      * VT3122A: primary AdjustFrame only is able to use 24bits, so we are
      * limited to 12x11bits; 4080x2048 (~2:1), 3344x2508 (4:3) or 2896x2896
      * (1:1). 
-     * Test VT3122Cx, VT3205, VT3205A, VT3204, VT3259, VT3314 please.
+     * Test VT3122Cx, VT7205, VT7205A, VT3108, VT3118, VT3344 please.
      *
      * We should be able to limit the memory available for a mode to 32MB,
      * yet xf86ValidateModes (or miScanLineWidth) fails to catch this properly
diff --git a/src/via_id.c b/src/via_id.c
index 8ede5f0..952ba17 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -46,31 +46,31 @@
  * Soltek SL-B6A-F1000 (Qbic IQ3601 | C3 1Ghz onboard)
  * + loads of semi-embedded devices.
  *
- * VT3205:
+ * VT7205:
  * ECS KM400-M
  * ECS KM400-M2
  * ECS KM400A-M2
  * FIC K7M-400
  * PcChips M851G
  * PcChips M851AG
- * Soltek SL-B7C-FGR (Qbic EQ3704 | VT3205A)
+ * Soltek SL-B7C-FGR (Qbic EQ3704 | VT7205A)
  * Soyo SY-K7VMP
  * Soyo SY-K7VMP2
  *
- * VT3204:
+ * VT3108:
  * Abit KV8-MAX3
  * Abit KV8
- * Biostar Ideq 210V (or VT3205A?)
+ * Biostar Ideq 210V (or VT7205A?)
  * Biostar M7VIZ
  * Chaintech MK8M800
- * Epox EP-8KMM5I (or VT3205A?)
+ * Epox EP-8KMM5I (or VT7205A?)
  * FIC K8M-800M
  * Packard Bell Easynote B35x0 (?== B3 800??)
  * PcChips M861G
  * Soltek SL-B9C-FGR (Qbic EQ3802-300P)
  * Soltek SL-K8M800I-R
  *
- * VT3259:
+ * VT3118:
  * Biostar Ideq 210M
  * FIC P4M800
  * FIC P4M-800M
@@ -99,63 +99,63 @@ static struct ViaCardIdStruct ViaCardId[] = {
        PcChips 789CG */
     {"VIA EPIA M/MII/...",                    VT3122, 0x1106, 0x3122, VIA_DEVICE_CRT | VIA_DEVICE_TV},
     {"Element Computers Helium 2100",         VT3122, 0x1558, 0x200A, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
-    /* VT3205 */
-    {"Acer Aspire 135x",                      VT3205, 0x1025, 0x0033, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
-    {"Asustek A7V8X-MX",                      VT3205, 0x1043, 0x80ED, VIA_DEVICE_CRT},
-    {"Asustek A7V8X-LA",                      VT3205, 0x1043, 0x80F9, VIA_DEVICE_CRT},
-    {"Asustek A7V8X-MX SE/A7V400-MX",         VT3205, 0x1043, 0x8118, VIA_DEVICE_CRT},
-    {"Asustek Terminator A7VT",               VT3205, 0x1043, 0x813E, VIA_DEVICE_CRT},
-    {"Mitac 8375X",                           VT3205, 0x1071, 0x8375, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV}, /* aka UMAX 585T */
-    {"Soltek SL-75MIV2",                      VT3205, 0x1106, 0x0000, VIA_DEVICE_CRT}, /* VIA/0x0000 */
-    {"Soltek SL-B7C-FGR",                     VT3205, 0x1106, 0x3205, VIA_DEVICE_CRT | VIA_DEVICE_TV},
-    {"Biostar iDEQ 200V/Chaintech 7VIF4",     VT3205, 0x1106, 0x7205, VIA_DEVICE_CRT}, /* VIA/VT3205 -- 2 distinct devices */
-    {"Shuttle FX43",                          VT3205, 0x1297, 0xF643, VIA_DEVICE_CRT | VIA_DEVICE_TV},
-    {"Giga-byte 7VM400(A)M",                  VT3205, 0x1458, 0xD000, VIA_DEVICE_CRT}, /* 7VM400M, GA-7VM400AM */
-    {"MSI KM4(A)M-V",                         VT3205, 0x1462, 0x7061, VIA_DEVICE_CRT}, /* aka "DFI KM400-MLV" */
-    {"MSI KM4(A)M-L",                         VT3205, 0x1462, 0x7348, VIA_DEVICE_CRT},
-    {"Abit VA-10 (1)",                        VT3205, 0x147B, 0x140B, VIA_DEVICE_CRT},
-    {"Abit VA-10 (2)",                        VT3205, 0x147B, 0x140C, VIA_DEVICE_CRT},
-    {"Abit VA-20",                            VT3205, 0x147B, 0x1411, VIA_DEVICE_CRT},
-    {"Averatec 322x",                         VT3205, 0x14FF, 0x030D, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
-    {"FIC K7M-400A",                          VT3205, 0x1509, 0x9233, VIA_DEVICE_CRT},
-    {"Uniwill 755CI",                         VT3205, 0x1584, 0x800A, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV}, /* aka "Gericom hummer advance", "Maxdata M-Book 1200X" */
-    {"Epox EP-8KMM3I",                        VT3205, 0x1695, 0x9023, VIA_DEVICE_CRT},
-    {"ASRock Inc. K7VM2/3/4",                 VT3205, 0x1849, 0x7205, VIA_DEVICE_CRT},
-    {"Soyo K7VME",                            VT3205, 0xA723, 0x10FD, VIA_DEVICE_CRT},
-    /* VT3204 */
-    {"ECS 536",                               VT3204, 0x1019, 0x0F60, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
-    {"ECS K8M800-M2",                         VT3204, 0x1019, 0x1828, VIA_DEVICE_CRT},
-    {"Acer Aspire 136x",                      VT3204, 0x1025, 0x006E, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
-    {"Asustek K8V-MX",                        VT3204, 0x1043, 0x8129, VIA_DEVICE_CRT},
-    {"Mitac 8399",                            VT3204, 0x1071, 0x8399, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV}, /* aka "pogolinux konabook 3100" */
-    {"Mitac 8889",                            VT3204, 0x1071, 0x8889, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
-    {"DFI K8M800-MLVF",                       VT3204, 0x1106, 0x3108, VIA_DEVICE_CRT}, /* VIA/VT3204 -- ??? PciInfo Alignment issue ??? */
-    {"Shuttle FX83",                          VT3204, 0x1297, 0xF683, VIA_DEVICE_CRT | VIA_DEVICE_TV},
-    {"Sharp Actius AL27",                     VT3204, 0x13BD, 0x1044, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
-    {"Giga-byte GA-K8VM800M",                 VT3204, 0x1458, 0xD000, VIA_DEVICE_CRT},
-    {"MSI K8M Neo-V",                         VT3204, 0x1462, 0x0320, VIA_DEVICE_CRT},
-    {"MSI K8MM-V",                            VT3204, 0x1462, 0x7142, VIA_DEVICE_CRT},
-    {"MSI K8MM3-V",                           VT3204, 0x1462, 0x7181, VIA_DEVICE_CRT},
-    {"MSI K8MM-ILSR",                         VT3204, 0x1462, 0x7410, VIA_DEVICE_CRT},
-    {"Abit KV-80",                            VT3204, 0x147B, 0x1419, VIA_DEVICE_CRT},
-    {"Averatec 3270",                         VT3204, 0x14FF, 0x0315, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
-    {"Averatec 54xx",                         VT3204, 0x1509, 0x3930, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
-    {"FIC K8M-800M",                          VT3204, 0x1509, 0x6001, VIA_DEVICE_CRT},
-    {"Biostar K8VGA-M",                       VT3204, 0x1565, 0x1203, VIA_DEVICE_CRT},
-    {"Packard Bell Easynote E6116/E63xx",     VT3204, 0x1631, 0xC008, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
-    {"Packard Bell Easynote B3 800/B3340",    VT3204, 0x1631, 0xC009, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
-    {"Asrock K8Upgrade-VM800",                VT3204, 0x1849, 0x3108, VIA_DEVICE_CRT},
-    /* VT3259 */
-    {"ECS PM800-M2",                          VT3259, 0x1106, 0x3118, VIA_DEVICE_CRT}, /* VIA/VT3259 */
-    {"Mitac 8666",                            VT3259, 0x1071, 0x8666, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
-    {"Biostar P4VMA-M",                       VT3259, 0x1565, 0x1202, VIA_DEVICE_CRT},
-    {"Fujitsu/Siemens Amilo Pro V2010",       VT3259, 0x1734, 0x1078, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
-    {"Asrock P4VM8",                          VT3259, 0x1849, 0x3118, VIA_DEVICE_CRT},
-    {"Chaintech MPM800",                      VT3259, 0x270F, 0x7671, VIA_DEVICE_CRT},
-    /* VT3314 */
-    {"Biostar P4M80-M4",                      VT3314, 0x1565, 0x1202, VIA_DEVICE_CRT},
-    {"Fujitsu/Siemens Amilo Pro V2030",       VT3314, 0x1734, 0x109B, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
-    {"Asrock Inc. P4VM800",                   VT3314, 0x1849, 0x3344, VIA_DEVICE_CRT},
+    /* VT7205 */
+    {"Acer Aspire 135x",                      VT7205, 0x1025, 0x0033, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
+    {"Asustek A7V8X-MX",                      VT7205, 0x1043, 0x80ED, VIA_DEVICE_CRT},
+    {"Asustek A7V8X-LA",                      VT7205, 0x1043, 0x80F9, VIA_DEVICE_CRT},
+    {"Asustek A7V8X-MX SE/A7V400-MX",         VT7205, 0x1043, 0x8118, VIA_DEVICE_CRT},
+    {"Asustek Terminator A7VT",               VT7205, 0x1043, 0x813E, VIA_DEVICE_CRT},
+    {"Mitac 8375X",                           VT7205, 0x1071, 0x8375, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV}, /* aka UMAX 585T */
+    {"Soltek SL-75MIV2",                      VT7205, 0x1106, 0x0000, VIA_DEVICE_CRT}, /* VIA/0x0000 */
+    {"Soltek SL-B7C-FGR",                     VT7205, 0x1106, 0x3205, VIA_DEVICE_CRT | VIA_DEVICE_TV},
+    {"Biostar iDEQ 200V/Chaintech 7VIF4",     VT7205, 0x1106, 0x7205, VIA_DEVICE_CRT}, /* VIA/VT7205 -- 2 distinct devices */
+    {"Shuttle FX43",                          VT7205, 0x1297, 0xF643, VIA_DEVICE_CRT | VIA_DEVICE_TV},
+    {"Giga-byte 7VM400(A)M",                  VT7205, 0x1458, 0xD000, VIA_DEVICE_CRT}, /* 7VM400M, GA-7VM400AM */
+    {"MSI KM4(A)M-V",                         VT7205, 0x1462, 0x7061, VIA_DEVICE_CRT}, /* aka "DFI KM400-MLV" */
+    {"MSI KM4(A)M-L",                         VT7205, 0x1462, 0x7348, VIA_DEVICE_CRT},
+    {"Abit VA-10 (1)",                        VT7205, 0x147B, 0x140B, VIA_DEVICE_CRT},
+    {"Abit VA-10 (2)",                        VT7205, 0x147B, 0x140C, VIA_DEVICE_CRT},
+    {"Abit VA-20",                            VT7205, 0x147B, 0x1411, VIA_DEVICE_CRT},
+    {"Averatec 322x",                         VT7205, 0x14FF, 0x030D, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+    {"FIC K7M-400A",                          VT7205, 0x1509, 0x9233, VIA_DEVICE_CRT},
+    {"Uniwill 755CI",                         VT7205, 0x1584, 0x800A, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV}, /* aka "Gericom hummer advance", "Maxdata M-Book 1200X" */
+    {"Epox EP-8KMM3I",                        VT7205, 0x1695, 0x9023, VIA_DEVICE_CRT},
+    {"ASRock Inc. K7VM2/3/4",                 VT7205, 0x1849, 0x7205, VIA_DEVICE_CRT},
+    {"Soyo K7VME",                            VT7205, 0xA723, 0x10FD, VIA_DEVICE_CRT},
+    /* VT3108 */
+    {"ECS 536",                               VT3108, 0x1019, 0x0F60, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
+    {"ECS K8M800-M2",                         VT3108, 0x1019, 0x1828, VIA_DEVICE_CRT},
+    {"Acer Aspire 136x",                      VT3108, 0x1025, 0x006E, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
+    {"Asustek K8V-MX",                        VT3108, 0x1043, 0x8129, VIA_DEVICE_CRT},
+    {"Mitac 8399",                            VT3108, 0x1071, 0x8399, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV}, /* aka "pogolinux konabook 3100" */
+    {"Mitac 8889",                            VT3108, 0x1071, 0x8889, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
+    {"DFI K8M800-MLVF",                       VT3108, 0x1106, 0x3108, VIA_DEVICE_CRT}, /* VIA/VT3108 -- ??? PciInfo Alignment issue ??? */
+    {"Shuttle FX83",                          VT3108, 0x1297, 0xF683, VIA_DEVICE_CRT | VIA_DEVICE_TV},
+    {"Sharp Actius AL27",                     VT3108, 0x13BD, 0x1044, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+    {"Giga-byte GA-K8VM800M",                 VT3108, 0x1458, 0xD000, VIA_DEVICE_CRT},
+    {"MSI K8M Neo-V",                         VT3108, 0x1462, 0x0320, VIA_DEVICE_CRT},
+    {"MSI K8MM-V",                            VT3108, 0x1462, 0x7142, VIA_DEVICE_CRT},
+    {"MSI K8MM3-V",                           VT3108, 0x1462, 0x7181, VIA_DEVICE_CRT},
+    {"MSI K8MM-ILSR",                         VT3108, 0x1462, 0x7410, VIA_DEVICE_CRT},
+    {"Abit KV-80",                            VT3108, 0x147B, 0x1419, VIA_DEVICE_CRT},
+    {"Averatec 3270",                         VT3108, 0x14FF, 0x0315, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+    {"Averatec 54xx",                         VT3108, 0x1509, 0x3930, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+    {"FIC K8M-800M",                          VT3108, 0x1509, 0x6001, VIA_DEVICE_CRT},
+    {"Biostar K8VGA-M",                       VT3108, 0x1565, 0x1203, VIA_DEVICE_CRT},
+    {"Packard Bell Easynote E6116/E63xx",     VT3108, 0x1631, 0xC008, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
+    {"Packard Bell Easynote B3 800/B3340",    VT3108, 0x1631, 0xC009, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+    {"Asrock K8Upgrade-VM800",                VT3108, 0x1849, 0x3108, VIA_DEVICE_CRT},
+    /* VT3118 */
+    {"ECS PM800-M2",                          VT3118, 0x1106, 0x3118, VIA_DEVICE_CRT}, /* VIA/VT3118 */
+    {"Mitac 8666",                            VT3118, 0x1071, 0x8666, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
+    {"Biostar P4VMA-M",                       VT3118, 0x1565, 0x1202, VIA_DEVICE_CRT},
+    {"Fujitsu/Siemens Amilo Pro V2010",       VT3118, 0x1734, 0x1078, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
+    {"Asrock P4VM8",                          VT3118, 0x1849, 0x3118, VIA_DEVICE_CRT},
+    {"Chaintech MPM800",                      VT3118, 0x270F, 0x7671, VIA_DEVICE_CRT},
+    /* VT3344 */
+    {"Biostar P4M80-M4",                      VT3344, 0x1565, 0x1202, VIA_DEVICE_CRT},
+    {"Fujitsu/Siemens Amilo Pro V2030",       VT3344, 0x1734, 0x109B, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+    {"Asrock Inc. P4VM800",                   VT3344, 0x1849, 0x3344, VIA_DEVICE_CRT},
     /* keep this */
     {NULL,                                    VIA_UNKNOWN, 0x0000, 0x0000, VIA_DEVICE_NONE}
 };
diff --git a/src/via_id.h b/src/via_id.h
index 1680f66..3197dd5 100644
--- a/src/via_id.h
+++ b/src/via_id.h
@@ -33,10 +33,10 @@
 enum VIACHIPTAGS {
     VIA_UNKNOWN = 0,
     VT3122, /* CLE266 */
-    VT3205, /* KM400 */
-    VT3204, /* K8M800 */
-    VT3259, /* PM800, CN400, PM880, P4M800, whatever. */
-    VT3314, /* P4M800Pro and [CV]N[6789]00, VIA is still making up its mind */
+    VT7205, /* KM400, P4M800 */
+    VT3108, /* K8M800 */
+    VT3118, /* PM800, CN400, PM880, whatever. */
+    VT3344, /* P4M800Pro and [CV]N[6789]00, VIA is still making up its mind */
     VIA_LAST
 };
 
@@ -55,10 +55,10 @@ enum VIACHIPTAGS {
  */
 /* #define PCI_CHIP_VT3022  0x3022 */ /* CLE266??? */
 #define PCI_CHIP_VT3122  0x3122
-#define PCI_CHIP_VT3205  0x7205
-#define PCI_CHIP_VT3204  0x3108
-#define PCI_CHIP_VT3259  0x3118
-#define PCI_CHIP_VT3314  0x3344
+#define PCI_CHIP_VT7205  0x7205
+#define PCI_CHIP_VT3108  0x3108
+#define PCI_CHIP_VT3118  0x3118
+#define PCI_CHIP_VT3344  0x3344
 
 /*
  * There is also quite some conflicting information on the
diff --git a/src/via_mode.c b/src/via_mode.c
index 6644e72..b661042 100644
--- a/src/via_mode.c
+++ b/src/via_mode.c
@@ -754,16 +754,16 @@ ViaGetMemoryBandwidth(ScrnInfoPtr pScrn)
 	    return ViaBandwidthTable[VIA_BW_VT3122A].Bandwidth[pVia->MemClk];
 	else
 	    return ViaBandwidthTable[VIA_BW_VT3122C].Bandwidth[pVia->MemClk];
-    case VT3205:
+    case VT7205:
         /* 0x84 is earliest public device, 0x80 is more likely though */
 	if (pVia->ChipRev < 0x84)
-	    return ViaBandwidthTable[VIA_BW_VT3205].Bandwidth[pVia->MemClk];
+	    return ViaBandwidthTable[VIA_BW_VT7205].Bandwidth[pVia->MemClk];
 	else
-	    return ViaBandwidthTable[VIA_BW_VT3205A].Bandwidth[pVia->MemClk];
-    case VT3204:
-	return ViaBandwidthTable[VIA_BW_VT3204].Bandwidth[pVia->MemClk];
-    case VT3259:
-	return ViaBandwidthTable[VIA_BW_VT3259].Bandwidth[pVia->MemClk];
+	    return ViaBandwidthTable[VIA_BW_VT7205A].Bandwidth[pVia->MemClk];
+    case VT3108:
+	return ViaBandwidthTable[VIA_BW_VT3108].Bandwidth[pVia->MemClk];
+    case VT3118:
+	return ViaBandwidthTable[VIA_BW_VT3118].Bandwidth[pVia->MemClk];
     default:
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "ViaBandwidthAllowed: Unknown Chipset.\n");
 	return VIA_BW_MIN;
@@ -997,7 +997,7 @@ ViaSetPrimaryDotclock(ScrnInfoPtr pScrn, CARD32 clock)
 
     ViaDebug(hwp->pScrn->scrnIndex, "%s to 0x%lX\n", __FUNCTION__, clock);
 
-    if ((pVia->Chipset == VT3122) || (pVia->Chipset == VT3205)) {
+    if ((pVia->Chipset == VT3122) || (pVia->Chipset == VT7205)) {
 	hwp->writeSeq(hwp, 0x46, clock >> 8);
 	hwp->writeSeq(hwp, 0x47, clock & 0xFF);
     } else { /* unichrome pro */
@@ -1021,7 +1021,7 @@ ViaSetSecondaryDotclock(ScrnInfoPtr pScrn, CARD32 clock)
 
     ViaDebug(hwp->pScrn->scrnIndex, "%s to 0x%lX\n", __FUNCTION__, clock);
 
-    if ((pVia->Chipset == VT3122) || (pVia->Chipset == VT3205)) {
+    if ((pVia->Chipset == VT3122) || (pVia->Chipset == VT7205)) {
 	hwp->writeSeq(hwp, 0x44, clock >> 8);
 	hwp->writeSeq(hwp, 0x45, clock & 0xFF);
     } else { /* unichrome pro */
@@ -1513,7 +1513,7 @@ ViaModeDotClockTranslate(ScrnInfoPtr pScrn, DisplayModePtr mode)
 
     for (i = 0; ViaDotClocks[i].DotClock; i++)
 	if (ViaDotClocks[i].DotClock == mode->Clock) {
-	    if ((pVia->Chipset == VT3122) || (pVia->Chipset == VT3205))
+	    if ((pVia->Chipset == VT3122) || (pVia->Chipset == VT7205))
 		return ViaDotClocks[i].UniChrome;
 	    else
 		return ViaDotClocks[i].UniChromePro;	
@@ -1545,7 +1545,7 @@ ViaModePrimary(ScrnInfoPtr pScrn, DisplayModePtr mode)
     ViaModePrimaryVGA(pScrn, mode);
     pBIOSInfo->Clock = ViaModeDotClockTranslate(pScrn, mode);
 
-    /* Don't do this before the Sequencer is set: locks up VT3205 and VT3204 */
+    /* Don't do this before the Sequencer is set: locks up VT7205 and VT3108 */
     if (pVia->FirstInit)
 	memset(pVia->FBBase, 0x00, pVia->videoRambytes);
     
diff --git a/src/via_mode.h b/src/via_mode.h
index 8789121..1e4e303 100644
--- a/src/via_mode.h
+++ b/src/via_mode.h
@@ -36,10 +36,10 @@
 /* index to table */
 #define VIA_BW_VT3122A  0
 #define VIA_BW_VT3122C  1
-#define VIA_BW_VT3205   2
-#define VIA_BW_VT3205A  3
-#define VIA_BW_VT3204   4
-#define VIA_BW_VT3259   5
+#define VIA_BW_VT7205   2
+#define VIA_BW_VT7205A  3
+#define VIA_BW_VT3108   4
+#define VIA_BW_VT3118   5
 #define VIA_BW_ALL      6
 
 /*
@@ -52,10 +52,10 @@ static struct {
 } ViaBandwidthTable[VIA_BW_ALL] = {
     { VIA_BW_VT3122A, { 394000000,  461000000, VIA_BW_MIN, VIA_BW_MIN } },
     { VIA_BW_VT3122C, { 394000000,  461000000, VIA_BW_MIN, VIA_BW_MIN } },
-    { VIA_BW_VT3205,  { 394000000,  461000000,  461000000, VIA_BW_MIN } },
-    { VIA_BW_VT3205A, { 394000000,  461000000,  461000000,  461000000 } },
-    { VIA_BW_VT3204,  { 394000000,  461000000,  461000000,  461000000 } },
-    { VIA_BW_VT3259,  { 394000000,  461000000,  461000000,  461000000 } }
+    { VIA_BW_VT7205,  { 394000000,  461000000,  461000000, VIA_BW_MIN } },
+    { VIA_BW_VT7205A, { 394000000,  461000000,  461000000,  461000000 } },
+    { VIA_BW_VT3108,  { 394000000,  461000000,  461000000,  461000000 } },
+    { VIA_BW_VT3118,  { 394000000,  461000000,  461000000,  461000000 } }
 };
     
 /*
diff --git a/src/via_video.c b/src/via_video.c
index 08f8a96..d15813f 100644
--- a/src/via_video.c
+++ b/src/via_video.c
@@ -886,8 +886,8 @@ viaGetPortAttribute(ScrnInfoPtr pScrn, Atom attribute, INT32 *value, pointer dat
  *   Decide if the mode support video overlay. This depends on the bandwidth
  *   of the mode and the type of RAM available.
  */
-#define SINGLE_3205_100 0.41
-#define SINGLE_3205_133 0.70
+#define SINGLE_7205_100 0.41
+#define SINGLE_7205_133 0.70
 
 #define VIDEO_BPP 2
 
@@ -935,22 +935,22 @@ ViaSwovBandwidth(ScrnInfoPtr pScrn)
 	switch(pVia->MemClk) {
 	case VIA_MEM_DDR200:
 	    mClock = 100;
-	    memEfficiency = (float)SINGLE_3205_100;
+	    memEfficiency = (float)SINGLE_7205_100;
             break;
 	case VIA_MEM_DDR266:
 	    mClock = 133;
-	    memEfficiency = (float)SINGLE_3205_133;
+	    memEfficiency = (float)SINGLE_7205_133;
             break;
 	case VIA_MEM_DDR333:
 	    mClock = 166;
-	    memEfficiency = (float)SINGLE_3205_133;
+	    memEfficiency = (float)SINGLE_7205_133;
             break;
 	default:
 	    /*Unknow DRAM Type*/
 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s: Unhandled RAM type.\n",
                        __FUNCTION__);
 	    mClock = 166;
-	    memEfficiency = (float)SINGLE_3205_133;
+	    memEfficiency = (float)SINGLE_7205_133;
             break;
 	}
 
@@ -1223,12 +1223,12 @@ ViaSwovFIFO(VIAPtr pVia, struct ViaSwov *Swov)
             Swov->Video->Video3Control |= V3_EXPIRE_NUM;
         }
         break;
-    case VT3205:
-    case VT3204:
+    case VT7205:
+    case VT3108:
         depth = 32;
         prethreshold = 29;
         threshold = 29;
-        Swov->Video->Video3Control |= V3_EXPIRE_NUM_3205;
+        Swov->Video->Video3Control |= V3_EXPIRE_NUM_7205;
         break;
     default:
         depth = 1;
@@ -2190,19 +2190,19 @@ ViaSwovInit(ScrnInfoPtr pScrn)
             Swov->HQVDoubleInit = FALSE;
         }
         break;
-    case VT3205:
+    case VT7205:
         Swov->ThreeHQVBuffer = TRUE;
         Swov->HQVFetchByteUnit = FALSE;
         Swov->HQVDisablePatch = TRUE;
         Swov->HQVDoubleInit = FALSE;
         break;
-    case VT3204:
+    case VT3108:
         Swov->ThreeHQVBuffer = TRUE;
         Swov->HQVFetchByteUnit = FALSE;
         Swov->HQVDisablePatch = TRUE;
         Swov->HQVDoubleInit = FALSE;
         break;
-    case VT3259:
+    case VT3118:
         Swov->ThreeHQVBuffer = TRUE;
         Swov->HQVFetchByteUnit = FALSE;
         Swov->HQVDisablePatch = FALSE;
diff --git a/src/via_videoregs.h b/src/via_videoregs.h
index 211cf55..2d0159c 100644
--- a/src/via_videoregs.h
+++ b/src/via_videoregs.h
@@ -187,8 +187,8 @@ struct ViaVideoRegs {
 #       define V3_COLORSPACE_SIGN      0x00000080
 #       define V3_EXPIRE_NUM           0x00040000
 #       define V3_EXPIRE_NUM_F         0x000f0000
-#       define V3_EXPIRE_NUM_3204      0x00100000
-#       define V3_EXPIRE_NUM_3205      0x00080000
+#       define V3_EXPIRE_NUM_3108      0x00100000
+#       define V3_EXPIRE_NUM_7205      0x00080000
 #       define V3_BOB_ENABLE           0x00400000
 #       define V3_FIELD_BASE           0x00000000
 #       define V3_FRAME_BASE           0x01000000