merge XFree86 RC2 (4.3.99.902) from vendor branch

author: Kaleb Keithley <kaleb@freedesktop.org> 2003-12-20 00:28:31 +0000
committer: Kaleb Keithley <kaleb@freedesktop.org> 2003-12-20 00:28:31 +0000
commit: e97c634593dd171a05aa0fa5a35d218dcc3ecfb0 (patch)
tree: e0de50ad82b9890959a1a65d81a654935a1291bb
parent: 4b75c7f6358b28978b05ffa4b73853d936454f50 (diff)
46 files changed, 3583 insertions, 345 deletions
diff --git a/Xext/security.c b/Xext/security.c
index 568138e36..bd52be407 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
 /* $Xorg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
 /*
 
@@ -24,12 +25,13 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.16 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.17 2003/12/04 16:59:35 tsi Exp $ */
 
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "windowstr.h"
 #include "inputstr.h"
+#include "scrnintstr.h"
 #include "gcstruct.h"
 #include "colormapst.h"
 #include "propertyst.h"
diff --git a/Xext/shm.c b/Xext/shm.c
index 2ed8699f0..6c3664476 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -1,5 +1,5 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/shm.c,v 3.40 2003/11/17 22:20:27 dawes Exp $ */
-/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.40 2003/11/17 22:20:27 dawes Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/shm.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.42 2003/12/18 10:15:24 alanh Exp $ *
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/Xprint/attributes.c b/Xprint/attributes.c
index ec60f3032..08d77a551 100644
--- a/Xprint/attributes.c
+++ b/Xprint/attributes.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: attributes.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */
 /* $Xorg: attributes.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */
 /*
 (c) Copyright 1996 Hewlett-Packard Company
@@ -44,7 +45,7 @@ copyright holders.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/attributes.c,v 1.20 2003/10/29 22:11:54 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/attributes.c,v 1.21 2003/12/19 02:05:38 dawes Exp $ */
 
 #include <X11/Xproto.h>
 #include <string.h>
@@ -52,7 +53,7 @@ copyright holders.
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <pwd.h>
-#if defined(sun) && defined(SVR4)
+#if (defined(sun) && defined(SVR4)) || (defined(SCO))
 #include <wchar.h>
 #endif
 
diff --git a/dix/globals.c b/dix/globals.c
index 1ec71aac1..293c61bd5 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.12 2003/11/10 18:21:46 tsi Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.13 2003/12/03 17:11:29 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.13 2003/12/03 17:11:29 tsi Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -147,5 +148,3 @@ int	argcGlobal;
 char	**argvGlobal;
 
 DDXPointRec dixScreenOrigins[MAXSCREENS];
-
-volatile ScreenPtr currentRegionScreen;
diff --git a/fb/fbcompose.c b/fb/fbcompose.c
index dd030d927..14960aa5f 100644
--- a/fb/fbcompose.c
+++ b/fb/fbcompose.c
@@ -1,5 +1,6 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17 2003/11/03 05:11:00 tsi Exp $
+ * $XdotOrg: xc/programs/Xserver/fb/fbcompose.c,v 1.18 2003/12/04 17:15:12 tsi Exp $
+ * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.18 2003/12/04 17:15:12 tsi Exp $
  *
  * Copyright � 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -2424,6 +2425,8 @@ fbStore_external (FbCompositeOperand *op, CARD32 value)
     (*op[2].store) (&op[2], value & 0xff000000);
 }
 
+#define dummyScreen screenInfo.screens[0]
+
 CARD32
 fbFetch_transform (FbCompositeOperand *op)
 {
@@ -2445,7 +2448,7 @@ fbFetch_transform (FbCompositeOperand *op)
     case PictFilterNearest:
 	y = xFixedToInt (v.vector[1]) + op->u.transform.top_y;
 	x = xFixedToInt (v.vector[0]) + op->u.transform.left_x;
-	if (POINT_IN_REGION (0, op->clip, x, y, &box))
+	if (POINT_IN_REGION (dummyScreen, op->clip, x, y, &box))
 	{
 	    (*op[1].set) (&op[1], x, y);
 	    bits = (*op[1].fetch) (&op[1]);
@@ -2469,7 +2472,7 @@ fbFetch_transform (FbCompositeOperand *op)
 	    xerr = xFixed1 - xFixedFrac (v.vector[0]);
 	    for (x = minx; x <= maxx; x++)
 	    {
-		if (POINT_IN_REGION (0, op->clip, x, y, &box))
+		if (POINT_IN_REGION (dummyScreen, op->clip, x, y, &box))
 		{
 		    (*op[1].set) (&op[1], x, y);
 		    bits = (*op[1].fetch) (&op[1]);
@@ -2527,7 +2530,7 @@ fbFetcha_transform (FbCompositeOperand *op)
     case PictFilterNearest:
 	y = xFixedToInt (v.vector[1]) + op->u.transform.left_x;
 	x = xFixedToInt (v.vector[0]) + op->u.transform.top_y;
-	if (POINT_IN_REGION (0, op->clip, x, y, &box))
+	if (POINT_IN_REGION (dummyScreen, op->clip, x, y, &box))
 	{
 	    (*op[1].set) (&op[1], x, y);
 	    bits = (*op[1].fetcha) (&op[1]);
@@ -2551,7 +2554,7 @@ fbFetcha_transform (FbCompositeOperand *op)
 	    xerr = xFixed1 - xFixedFrac (v.vector[0]);
 	    for (x = minx; x <= maxx; x++)
 	    {
-		if (POINT_IN_REGION (0, op->clip, x, y, &box))
+		if (POINT_IN_REGION (dummyScreen, op->clip, x, y, &box))
 		{
 		    (*op[1].set) (&op[1], x, y);
 		    bits = (*op[1].fetcha) (&op[1]);
diff --git a/fb/fbgc.c b/fb/fbgc.c
index 28c58a673..c3935a5b3 100644
--- a/fb/fbgc.c
+++ b/fb/fbgc.c
@@ -21,7 +21,8 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.12 2001/05/29 04:54:09 keithp Exp $ */
+/* $XdotOrg: xc/programs/Xserver/fb/fbgc.c,v 1.15 2003/12/18 15:25:41 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.15 2003/12/18 15:25:41 alanh Exp $ */
 
 #include "fb.h"
 #ifdef IN_MODULE
@@ -253,17 +254,19 @@ fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
     }
     if (changes & GCStipple)
     {
-	if (pGC->stipple &&
-	    (FbEvenStip (pGC->stipple->drawable.width,
-			 pDrawable->bitsPerPixel) ||
-	     fbCanEvenStipple (pGC->stipple, pDrawable->bitsPerPixel)))
-	{
-	    pPriv->evenStipple = TRUE;
+	pPriv->evenStipple = FALSE;
+
+	if (pGC->stipple) {
+
+	    /* can we do an even stipple ?? */
+	    if (FbEvenStip (pGC->stipple->drawable.width,
+						pDrawable->bitsPerPixel) &&
+	       (fbCanEvenStipple (pGC->stipple, pDrawable->bitsPerPixel)))
+	   	pPriv->evenStipple = TRUE;
+
 	    if (pGC->stipple->drawable.width * pDrawable->bitsPerPixel < FB_UNIT)
 		fbPadPixmap (pGC->stipple);
 	}
-	else
-	    pPriv->evenStipple = FALSE;
     }
     /*
      * Recompute reduced rop values
diff --git a/fb/fbglyph.c b/fb/fbglyph.c
index f8f2179d5..9f61b6bec 100644
--- a/fb/fbglyph.c
+++ b/fb/fbglyph.c
@@ -1,5 +1,6 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.12 2001/09/07 15:16:00 keithp Exp $
+ * $XdotOrg: xc/programs/Xserver/fb/fbglyph.c,v 1.13 2003/12/04 17:15:12 tsi Exp $
+ * $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.13 2003/12/04 17:15:12 tsi Exp $
  *
  * Copyright � 1998 Keith Packard
  *
@@ -25,6 +26,8 @@
 #include "fb.h"
 #include	"fontstruct.h"
 #include	"dixfontstr.h"
+
+#define dummyScreen screenInfo.screens[0]
       
 Bool
 fbGlyphIn (RegionPtr	pRegion,
@@ -34,7 +37,7 @@ fbGlyphIn (RegionPtr	pRegion,
 	   int		height)
 {
     BoxRec  box;
-    BoxPtr  pExtents = REGION_EXTENTS (0, pRegion);
+    BoxPtr  pExtents = REGION_EXTENTS (dummyScreen, pRegion);
 
     /*
      * Check extents by hand to avoid 16 bit overflows
@@ -51,7 +54,7 @@ fbGlyphIn (RegionPtr	pRegion,
     box.x2 = x + width;
     box.y1 = y;
     box.y2 = y + height;
-    return RECT_IN_REGION (0, pRegion, &box) == rgnIN;
+    return RECT_IN_REGION (dummyScreen, pRegion, &box) == rgnIN;
 }
 
 #ifdef FB_24BIT
diff --git a/hw/darwin/bundle/Dutch.lproj/Credits.rtf b/hw/darwin/bundle/Dutch.lproj/Credits.rtf
index 3cd250116..7d9a594e6 100644
--- a/hw/darwin/bundle/Dutch.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Dutch.lproj/Credits.rtf
@@ -1,11 +1,41 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww5160\viewh4480\viewkind0
+\vieww9000\viewh9000\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f2\i Portuguese localization
+\f1\i0 \
+Michael Oland\
+     
+\f2\i New XDarwin icon
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 XonX Contributors to XFree86 4.2:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
diff --git a/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/classes.nib
index ba1e3a206..77f345a4e 100644
--- a/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/classes.nib
+++ b/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/classes.nib
@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }
diff --git a/hw/darwin/bundle/English.lproj/Credits.rtf b/hw/darwin/bundle/English.lproj/Credits.rtf
index 7d9a594e6..32c64f026 100644
--- a/hw/darwin/bundle/English.lproj/Credits.rtf
+++ b/hw/darwin/bundle/English.lproj/Credits.rtf
@@ -2,7 +2,7 @@
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww9000\viewh9000\viewkind0
+\vieww5160\viewh6300\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
 \f0\b\fs24 \cf0 Contributors to XFree86 4.4:
diff --git a/hw/darwin/bundle/French.lproj/Credits.rtf b/hw/darwin/bundle/French.lproj/Credits.rtf
index 5e52d1177..66c1bdae0 100644
--- a/hw/darwin/bundle/French.lproj/Credits.rtf
+++ b/hw/darwin/bundle/French.lproj/Credits.rtf
@@ -1,11 +1,40 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
 \vieww5160\viewh4480\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 Participants \'88 XonX pour XFree86 4.2 :
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f2\i Portuguese localization
+\f1\i0 \
+Michael Oland\
+     
+\f2\i New XDarwin icon
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+
+\f0\b \cf0 \
+Participants \'88 XonX pour XFree86 4.2 :
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
diff --git a/hw/darwin/bundle/French.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/French.lproj/MainMenu.nib/classes.nib
index ba1e3a206..77f345a4e 100644
--- a/hw/darwin/bundle/French.lproj/MainMenu.nib/classes.nib
+++ b/hw/darwin/bundle/French.lproj/MainMenu.nib/classes.nib
@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }
diff --git a/hw/darwin/bundle/German.lproj/Credits.rtf b/hw/darwin/bundle/German.lproj/Credits.rtf
index 3cd250116..32c64f026 100644
--- a/hw/darwin/bundle/German.lproj/Credits.rtf
+++ b/hw/darwin/bundle/German.lproj/Credits.rtf
@@ -1,11 +1,41 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww5160\viewh4480\viewkind0
+\vieww5160\viewh6300\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f2\i Portuguese localization
+\f1\i0 \
+Michael Oland\
+     
+\f2\i New XDarwin icon
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 XonX Contributors to XFree86 4.2:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
diff --git a/hw/darwin/bundle/German.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/German.lproj/MainMenu.nib/classes.nib
index ba1e3a206..77f345a4e 100644
--- a/hw/darwin/bundle/German.lproj/MainMenu.nib/classes.nib
+++ b/hw/darwin/bundle/German.lproj/MainMenu.nib/classes.nib
@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }
diff --git a/hw/darwin/bundle/Japanese.lproj/Credits.rtf b/hw/darwin/bundle/Japanese.lproj/Credits.rtf
index 6b1f82d8a..a7d24c2a6 100644
--- a/hw/darwin/bundle/Japanese.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Japanese.lproj/Credits.rtf
@@ -1,11 +1,43 @@
-{\rtf1\mac\ansicpg10001\cocoartf100
+{\rtf1\mac\ansicpg10001\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 \f3\fnil\fcharset78 HiraKakuPro-W3;}
 {\colortbl;\red255\green255\blue255;}
 \vieww13980\viewh11160\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper
+\f2\i \
+
+\f3\i0    \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'41\'83\'4e\'83\'5a\'83\'89\'83\'8c\'81\'5b\'83\'56\'83\'87\'83\'93 \'82\'a8\'82\'e6\'82\'d1 Apple-WM \'8a\'67\'92\'a3
+\f1 \
+Torrey T. Lyons\
+     
+\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b\
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f3 \'83\'7c\'83\'8b\'83\'67\'83\'4b\'83\'8b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
+Michael Oland\
+     
+\f3 \'90\'56\'82\'b5\'82\'a2
+\f1 XDarwin 
+\f3 \'83\'41\'83\'43\'83\'52\'83\'93
+\f1 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 XonX Contributors to XFree86 4.2:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
diff --git a/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/classes.nib
index ba1e3a206..77f345a4e 100644
--- a/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/classes.nib
+++ b/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/classes.nib
@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }
diff --git a/hw/darwin/bundle/Portuguese.lproj/Credits.rtf b/hw/darwin/bundle/Portuguese.lproj/Credits.rtf
index cbf13779f..56a287ca5 100644
--- a/hw/darwin/bundle/Portuguese.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Portuguese.lproj/Credits.rtf
@@ -1,20 +1,40 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww5340\viewh4520\viewkind0
+\vieww5140\viewh4980\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 Contribuidores do XonX ao XFree86 4.2.99.x:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Contribuidores do XonX ao XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200
 \cf0 Fabr\'92cio Luis de Castro
 \f0\b \
-     
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0      
 \f2\i\b0 Localiza\'8d\'8bo para o Portugu\'90s\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\i0\b \cf0 \
+\f1\i0 \cf0 Michael Oland\
+     
+\f2\i New XDarwin icon
+\f0\i0\b \
+\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Contribuidores do XonX ao XFree86 4.2:
 \f1\b0 \
diff --git a/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/classes.nib
index ba1e3a206..77f345a4e 100644
--- a/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/classes.nib
+++ b/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/classes.nib
@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }
diff --git a/hw/darwin/bundle/Spanish.lproj/Credits.rtf b/hw/darwin/bundle/Spanish.lproj/Credits.rtf
index 3cd250116..32c64f026 100644
--- a/hw/darwin/bundle/Spanish.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Spanish.lproj/Credits.rtf
@@ -1,11 +1,41 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww5160\viewh4480\viewkind0
+\vieww5160\viewh6300\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f2\i Portuguese localization
+\f1\i0 \
+Michael Oland\
+     
+\f2\i New XDarwin icon
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 XonX Contributors to XFree86 4.2:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
diff --git a/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/classes.nib
index ba1e3a206..77f345a4e 100644
--- a/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/classes.nib
+++ b/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/classes.nib
@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }
diff --git a/hw/darwin/bundle/Swedish.lproj/Credits.rtf b/hw/darwin/bundle/Swedish.lproj/Credits.rtf
index 3cd250116..32c64f026 100644
--- a/hw/darwin/bundle/Swedish.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Swedish.lproj/Credits.rtf
@@ -1,11 +1,41 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww5160\viewh4480\viewkind0
+\vieww5160\viewh6300\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f2\i Portuguese localization
+\f1\i0 \
+Michael Oland\
+     
+\f2\i New XDarwin icon
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 XonX Contributors to XFree86 4.2:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
diff --git a/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/classes.nib
index ba1e3a206..77f345a4e 100644
--- a/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/classes.nib
+++ b/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/classes.nib
@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }
diff --git a/hw/darwin/bundle/ko.lproj/Credits.rtf b/hw/darwin/bundle/ko.lproj/Credits.rtf
index 3cd250116..32c64f026 100644
--- a/hw/darwin/bundle/ko.lproj/Credits.rtf
+++ b/hw/darwin/bundle/ko.lproj/Credits.rtf
@@ -1,11 +1,41 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww5160\viewh4480\viewkind0
+\vieww5160\viewh6300\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f2\i Portuguese localization
+\f1\i0 \
+Michael Oland\
+     
+\f2\i New XDarwin icon
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 XonX Contributors to XFree86 4.2:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
diff --git a/hw/darwin/bundle/ko.lproj/MainMenu.nib/classes.nib b/hw/darwin/bundle/ko.lproj/MainMenu.nib/classes.nib
index ba1e3a206..77f345a4e 100644
--- a/hw/darwin/bundle/ko.lproj/MainMenu.nib/classes.nib
+++ b/hw/darwin/bundle/ko.lproj/MainMenu.nib/classes.nib
@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }
diff --git a/hw/darwin/iokit/xfIOKit.c b/hw/darwin/iokit/xfIOKit.c
index 6b4bd75c2..eae6f7a49 100644
--- a/hw/darwin/iokit/xfIOKit.c
+++ b/hw/darwin/iokit/xfIOKit.c
@@ -33,7 +33,8 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2003/10/16 23:50:09 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.3 2003/12/09 04:42:36 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.3 2003/12/09 04:42:36 torrey Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
@@ -516,8 +517,7 @@ static Bool SetupFBandHID(
     dfb->bitsPerComponent = pixelInfo.bitsPerComponent;
 
     // allocate shadow framebuffer
-    iokitScreen->shadowPtr = shadowAlloc(dfb->width, dfb->height,
-                                         dfb->bitsPerPixel);
+    iokitScreen->shadowPtr = xalloc(dfb->pitch * dfb->height);
     dfb->framebuffer = iokitScreen->shadowPtr;
 
     // Note: Darwin kIORGBDirectPixels = X TrueColor, not DirectColor
diff --git a/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj b/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj
index 2ce83f438..1e71fb3a4 100644
--- a/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj
+++ b/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj
@@ -334,7 +334,7 @@
 	<key>CFBundleExecutable</key>
 	<string>XDarwin</string>
 	<key>CFBundleGetInfoString</key>
-	<string>XDarwin 1.3b4, ©2001-2003 XFree86 Project, Inc.</string>
+	<string>XDarwin 1.3.0, ©2001-2003 XFree86 Project, Inc.</string>
 	<key>CFBundleIconFile</key>
 	<string>XDarwin.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -346,7 +346,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>XDarwin 1.3b4</string>
+	<string>XDarwin 1.3.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/hw/darwin/quartz/cr/crFrame.m b/hw/darwin/quartz/cr/crFrame.m
index bd42baef1..8845d0ddf 100644
--- a/hw/darwin/quartz/cr/crFrame.m
+++ b/hw/darwin/quartz/cr/crFrame.m
@@ -27,8 +27,8 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.7 2003/11/27 01:53:39 torrey Exp $ */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.7 2003/11/27 01:53:39 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.1.4.1 2003/12/06 13:24:23 kaleb Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.8 2003/12/05 07:00:10 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "cr.h"
@@ -207,7 +207,7 @@ CRReshapeFrame(RootlessFrameID wid, RegionPtr pShape)
 
     if (pShape != NULL) {
         // Calculate the region outside the new shape.
-        REGION_INVERSE(NULL, pShape, pShape, &localBox);
+        miInverse(pShape, pShape, &localBox);
     }
 
     // If window is currently shaped we need to undo the previous shape.
diff --git a/hw/darwin/quartz/fullscreen/fullscreen.c b/hw/darwin/quartz/fullscreen/fullscreen.c
index dfbc63d7a..057c7cbaa 100644
--- a/hw/darwin/quartz/fullscreen/fullscreen.c
+++ b/hw/darwin/quartz/fullscreen/fullscreen.c
@@ -25,8 +25,8 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.3 2003/11/27 01:59:53 torrey Exp $ */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.3 2003/11/27 01:59:53 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.1.4.1 2003/12/06 13:24:23 kaleb Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.4 2003/12/09 04:41:27 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "darwin.h"
@@ -462,8 +462,6 @@ static void FSShadowUpdate(
     int pitch = dfb->pitch;
     int bpp = dfb->bitsPerPixel/8;
 
-ErrorF("FSShadowUpdate: %i\n", quartzServerVisible);
-
     // Don't update if the X server is not visible
     if (!quartzServerVisible)
         return;
@@ -503,7 +501,6 @@ static Bool FSSetupScreen(
     FSScreenPtr fsDisplayInfo = FULLSCREEN_PRIV(pScreen);
     CGDirectDisplayID cgID = fsDisplayInfo->displayID;
 
-ErrorF("FSSetupScreen\n");
     // Initialize shadow framebuffer support
     if (! shadowInit(pScreen, FSShadowUpdate, NULL)) {
         ErrorF("Failed to initalize shadow framebuffer for screen %i.\n",
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index bf9fbeee2..a9951e705 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.104 2003/11/03 05:11:01 tsi Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.105 2003/12/18 21:56:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.105 2003/12/18 21:56:37 dawes Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
  *
@@ -1613,7 +1614,17 @@ extern void outl(unsigned port, unsigned val);
 /* entry points for Mmio memory access routines */
 extern int (*xf86ReadMmio8)(void *, unsigned long);
 extern int (*xf86ReadMmio16)(void *, unsigned long);
+#  ifndef STANDALONE_MMIO
 extern int (*xf86ReadMmio32)(void *, unsigned long);
+#  else
+/* Some DRI 3D drivers need MMIO_IN32. */
+static __inline__ int
+xf86ReadMmio32(void *Base, unsigned long Offset)
+{
+	__asm__ __volatile__("mb"  : : : "memory");
+	return *(volatile CARD32*)((unsigned long)Base+(Offset));
+}
+#  endif
 extern void (*xf86WriteMmio8)(int, void *, unsigned long);
 extern void (*xf86WriteMmio16)(int, void *, unsigned long);
 extern void (*xf86WriteMmio32)(int, void *, unsigned long);
@@ -1629,7 +1640,11 @@ extern void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int);
 /* Changed to kill noise generated by gcc's -Wcast-align */
 #  define MMIO_IN8(base, offset) (*xf86ReadMmio8)(base, offset)
 #  define MMIO_IN16(base, offset) (*xf86ReadMmio16)(base, offset)
-#  define MMIO_IN32(base, offset) (*xf86ReadMmio32)(base, offset)
+#  ifndef STANDALONE_MMIO
+#   define MMIO_IN32(base, offset) (*xf86ReadMmio32)(base, offset)
+#  else
+#   define MMIO_IN32(base, offset) xf86ReadMmio32(base, offset)
+#  endif
 
 #  if defined (JENSEN_SUPPORT)
 #   define MMIO_OUT32(base, offset, val) \
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 7c773fee6..159d3de71 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -12,26 +12,43 @@
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
+ *  1. Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions, and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above
+ *     copyright notice, this list of conditions and the following
+ *     disclaimer in the documentation and/or other materials provided
+ *     with the distribution.
  * 
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) 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 copyright holder(s) and author(s).
+ *  3. The end-user documentation included with the redistribution,
+ *     if any, must include the following acknowledgment: "This product
+ *     includes software developed by X-Oz Technologies
+ *     (http://www.x-oz.com/)."  Alternately, this acknowledgment may
+ *     appear in the software itself, if and wherever such third-party
+ *     acknowledgments normally appear.
+ *
+ *  4. Except as contained in this notice, the name of X-Oz
+ *     Technologies shall not be used in advertising or otherwise to
+ *     promote the sale, use or other dealings in this Software without
+ *     prior written authorization from X-Oz Technologies.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL X-OZ TECHNOLOGIES OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
  * Author: David Dawes <dawes@XFree86.Org>.
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86AutoConfig.c,v 1.2 2003/11/03 05:11:01 tsi Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86AutoConfig.c,v 1.3 2003/12/12 00:39:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86AutoConfig.c,v 1.3 2003/12/12 00:39:16 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86Parser.h"
diff --git a/hw/xfree86/common/xf86Date.h b/hw/xfree86/common/xf86Date.h
index dd48d8371..b3e645723 100644
--- a/hw/xfree86/common/xf86Date.h
+++ b/hw/xfree86/common/xf86Date.h
@@ -1,5 +1,5 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.53 2003/12/03 05:02:25 dawes Exp $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.53 2003/12/03 05:02:25 dawes Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.1.4.2 2003/12/06 13:24:23 kaleb Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.54 2003/12/19 04:52:10 dawes Exp $ */
 /*
  * Copyright (c) 2003 by The XFree86 Project, Inc.
  *
@@ -29,6 +29,6 @@
 
 #ifndef XF86_DATE
 
-#define XF86_DATE	" 2 December 2003"
+#define XF86_DATE	"18 December 2003"
 
 #endif
diff --git a/hw/xfree86/common/xf86Version.h b/hw/xfree86/common/xf86Version.h
index dc8b1a011..d40fcdaed 100644
--- a/hw/xfree86/common/xf86Version.h
+++ b/hw/xfree86/common/xf86Version.h
@@ -1,5 +1,5 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.565 2003/12/03 05:06:00 dawes Exp $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.565 2003/12/03 05:06:00 dawes Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.1.4.3 2003/12/06 13:24:23 kaleb Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.566 2003/12/19 04:52:11 dawes Exp $ */
 
 /*
  * Copyright (c) 1994-2003 by The XFree86 Project, Inc.
@@ -33,7 +33,7 @@
 #define XF86_VERSION_MAJOR	4
 #define XF86_VERSION_MINOR	3
 #define XF86_VERSION_PATCH	99
-#define XF86_VERSION_SNAP	901
+#define XF86_VERSION_SNAP	902
 
 /* This has five arguments for compatibilty reasons */
 #define XF86_VERSION_NUMERIC(major,minor,patch,snap,dummy) \
@@ -59,4 +59,4 @@
 #endif
 
 /* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */
-/* $XdotOrg: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.1.4.3 2003/12/06 13:24:23 kaleb Exp $ */
diff --git a/hw/xfree86/doc/changelogs/CHANGELOG b/hw/xfree86/doc/changelogs/CHANGELOG
index 9833a0813..3e6f9d210 100644
--- a/hw/xfree86/doc/changelogs/CHANGELOG
+++ b/hw/xfree86/doc/changelogs/CHANGELOG
@@ -1,5 +1,70 @@
-XFree86 4.3.99.902 (xx December 2003)
-
+XFree86 4.3.99.903 (xx December 2003)
+
+XFree86 4.3.99.902 (18 December 2003)
+ 672. Fixes for xterm (Thomas Dickey):
+      - Add a limit-check in selection to fix a bug in triple-clicking
+        (Bugzilla #981)
+      - add -v/-version/-h/-help options to uxterm (Debian #223926)
+ 671. Updates for SCO support (Bugzilla #994, Kean Johnston).
+ 670. Don't build the Aiptek driver unless HasLinuxInput is set
+      (Bugzilla #972, Andrew Aitchison).
+ 669. A new fixed version of the zh_CN.UTF-8 locale file (Bugzilla #991,
+      James Su).
+ 668. Fix locale.dir/locale.alias bugs that break the zh_CN.GB2312 locale
+      (Bugzilla #990, James Su).
+ 667. Fixes and updates for XKB keyboard maps:
+      - Add to 'us' keymap backslash key that can be rewritten in other layouts
+        (Bugzilla #976, B�rre Gaup).
+      - Fix some keys in Georgian latin keymap (Bugzilla #985, Vano Beridze).
+      - Add Korean keymap (Jungshik Shin).
+      - Add French variant of 'dvorak' keymap (Josselin Mouette).
+      - Fix wrong key type in the 'keymap without special keys' (Ivan Pascal).
+ 666. Via driver updates:
+       - Fix pixmap caches and Xv. The blitter has a 2048 pixel limit so we
+         must constrain the pixmap cache.
+       - Rip out all the memory allocator garbage and put it in one place.
+       - Allow optional use of AlanH's new linear allocator (not yet heavily
+         tested).
+       - Fix allocation bugs that this clean up made visible.
+       - Add missing I2C symbols.
+       - Some small formatting/other cleanups.
+      (Alan Cox).
+ 665. Fix a problem with distinguishing unassigned characters in the FreeType
+      backend (Bugzilla #975, Roland Mainz, Chisato Yamauchi).
+ 664. Update Japanese localization of XDarwin GUI (Toshimitsu Tanaka).
+ 663. Fix setjmp-related build issues on Solaris 2.5.1/x86 (Lindsay Haigh).
+ 662. Xdm, xf86cfg, mkfontscale and fonttosfnt fixes for platforms without
+      snprintf() (Lindsay Haigh).
+ 661. Update Brazilian keyboard map (Ricardo Y. Igarashi).
+ 660. Fix a bug in the fbgc.c code that caused the even stipple code path to
+      be used instead of the odd stipple path. Basically causing glitches in
+      rendering or no rendering at all. (Alan Hourihane).
+ 659. Fix XDarwin crash in IOKit mode for certain screen resolutions
+      (Torrey T. Lyons).
+ 658. DRI update - update the SiS DRI driver from DRI trunk (Eric Anholt).
+ 657. Fix mouse wheel code again for PowerPC (#5990, Rene Rebe).
+ 656. Fix sparc asm glapi initialisation in libGL when using indirect rendering
+      (GLX) (Bugzilla #923, Ferris McCormick).
+ 655. Disable the OPTGX1SubsequentHorVertLine() function in the NSC Geode
+      GX1 driver to due problems falling back to the FillRectSolid function.
+      (Alan Hourihane, See Bugzilla #841 for reasons).
+ 654. Add sun.unicode.india-0.enc (Bugzilla #939, JungShik Shin, Roland Mainz).
+ 653. Fix an x86emu crash for a BIOS that references the FS (or GS) register
+      (Sergey Babkin).
+ 652. Install the DRM kernel module source under ProjectRoot/src (David Dawes).
+ 651. Update XKB registry file rules/xfree86.xml (Sergey Oudaltsov).
+ 650. Fix '-nolisten tcp' when building with IPv6 disabled (Bugzilla #651,
+      Andrew Bevitt).
+ 649. Add some missing dead-key compose sequences for Vietnamese (#5981,
+      Le Hong Boi).
+ 648. Fix a problem with the v4l driver not seeing all the tv-norms
+      available under the bttv driver with the Linux 2.6.0-test11 kernel
+      (#5976, Marco Antonio Alvarez).
+ 647. Build fix after recent REGION_* changes (Part of #5983, Oswald
+      Buddenhagen, and #5984, Alexander Stohr).
+ 646. Fix for XKB map 'altwin' to avoid one keysym to more than one modifier
+      mapping (Ivan Pascal).
+ 
 XFree86 4.3.99.901 ( 2 December 2003)
  645. Update xterm's checking of modifiers to match change 635, and handle
       the case of keys like Meta_L being in more than one modifier.  This
@@ -18326,7 +18391,7 @@ XFree86 3.0a (28 April 1994)
 XFree86 3.0 (26 April 1994)
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3014 2003/12/03 05:05:57 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3043 2003/12/19 04:52:08 dawes Exp $
 
 
 
diff --git a/hw/xfree86/getconfig/getconfig b/hw/xfree86/getconfig/getconfig
index d2acc9bb8..8cbb18e2e 100644
--- a/hw/xfree86/getconfig/getconfig
+++ b/hw/xfree86/getconfig/getconfig
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+# $XdotOrg: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.sh,v 1.2 2003/09/20 01:45:57 dawes Exp $
 # $DHD: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.sh,v 1.2 2003/09/20 01:45:57 dawes Exp $
 
 #
@@ -14,26 +15,42 @@
 # and/or sell copies of the Software, and to permit persons to whom the
 # Software is furnished to do so, subject to the following conditions:
 # 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions, and the following disclaimer.
+#
+#  2. Redistributions in binary form must reproduce the above
+#     copyright notice, this list of conditions and the following
+#     disclaimer in the documentation and/or other materials provided
+#     with the distribution.
 # 
-# Except as contained in this notice, the name of the copyright holder(s)
-# and author(s) 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 copyright holder(s) and author(s).
+#  3. The end-user documentation included with the redistribution,
+#     if any, must include the following acknowledgment: "This product
+#     includes software developed by X-Oz Technologies
+#     (http://www.x-oz.com/)."  Alternately, this acknowledgment may
+#     appear in the software itself, if and wherever such third-party
+#     acknowledgments normally appear.
+#
+#  4. Except as contained in this notice, the name of X-Oz
+#     Technologies shall not be used in advertising or otherwise to
+#     promote the sale, use or other dealings in this Software without
+#     prior written authorization from X-Oz Technologies.
+#
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL X-OZ TECHNOLOGIES OR ITS CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+# OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # 
 # Author: David Dawes <dawes@XFree86.Org>.
 #
 
-# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.sh,v 1.1 2003/10/08 14:58:29 dawes Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.sh,v 1.2 2003/12/12 00:39:16 dawes Exp $
 
 # A simple wrapper to execute the real getconfig program.  So long as perl
 # is in $PATH, we don't need to know where it is this way.
diff --git a/hw/xfree86/getconfig/getconfig.pl b/hw/xfree86/getconfig/getconfig.pl
index fcfd7d057..7ff0b2b6d 100644
--- a/hw/xfree86/getconfig/getconfig.pl
+++ b/hw/xfree86/getconfig/getconfig.pl
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 
+# $XdotOrg: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.pl,v 1.13 2003/09/23 05:12:07 dawes Exp $
 # $DHD: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.pl,v 1.13 2003/09/23 05:12:07 dawes Exp $
 
 #
@@ -14,26 +15,42 @@
 # and/or sell copies of the Software, and to permit persons to whom the
 # Software is furnished to do so, subject to the following conditions:
 # 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions, and the following disclaimer.
+#
+#  2. Redistributions in binary form must reproduce the above
+#     copyright notice, this list of conditions and the following
+#     disclaimer in the documentation and/or other materials provided
+#     with the distribution.
 # 
-# Except as contained in this notice, the name of the copyright holder(s)
-# and author(s) 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 copyright holder(s) and author(s).
+#  3. The end-user documentation included with the redistribution,
+#     if any, must include the following acknowledgment: "This product
+#     includes software developed by X-Oz Technologies
+#     (http://www.x-oz.com/)."  Alternately, this acknowledgment may
+#     appear in the software itself, if and wherever such third-party
+#     acknowledgments normally appear.
+#
+#  4. Except as contained in this notice, the name of X-Oz
+#     Technologies shall not be used in advertising or otherwise to
+#     promote the sale, use or other dealings in this Software without
+#     prior written authorization from X-Oz Technologies.
+#
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL X-OZ TECHNOLOGIES OR ITS CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+# OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # 
 # Author: David Dawes <dawes@XFree86.Org>.
 #
 
-# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.pl,v 1.1 2003/10/08 14:58:29 dawes Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.pl,v 1.2 2003/12/12 00:39:16 dawes Exp $
 
 #
 # This script takes PCI id information, compares it against an ordered list
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 20a83e9f9..558533f4d 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -1,5 +1,6 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.1.4.2 2003/12/06 13:24:26 kaleb Exp $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.62 2003/11/25 05:26:38 dawes Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.1.4.3 2003/12/18 19:29:14 kaleb Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.63 2003/12/03
+ * 17:11:29 tsi Exp $ */
 
 /*
  * Copyright 1995-1998 by Metro Link, Inc.
@@ -206,7 +207,6 @@ LOOKUP dixLookupTab[] = {
     SYMVAR(DPMSEnabledSwitch)
     SYMVAR(DPMSDisabledSwitch)
     SYMVAR(defaultDPMSEnabled)
-    SYMVAR(currentRegionScreen)
     /* bigreq */
     SYMVAR(maxBigRequestSize)
 #ifdef XV
diff --git a/hw/xfree86/os-support/bus/zx1PCI.c b/hw/xfree86/os-support/bus/zx1PCI.c
index b5a483560..31556b5b9 100644
--- a/hw/xfree86/os-support/bus/zx1PCI.c
+++ b/hw/xfree86/os-support/bus/zx1PCI.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c,v 1.5 2003/11/06 18:38:14 tsi Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c,v 1.6 2003/12/11 17:11:39 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c,v 1.6 2003/12/11 17:11:39 tsi Exp $ */
 /*
  * Copyright (C) 2002-2003 The XFree86 Project, Inc.  All Rights Reserved.
  *
@@ -445,13 +446,13 @@ xf86PreScanZX1(void)
     resRange range;
     unsigned long mapSize = xf86getpagesize();
     unsigned long tmp, base, ioaaddr;
-    unsigned long flagsd = 0, based = 0, lastd = 0, maskd = 0, routed = 0;
-    unsigned long flags0 = 0, base0 = 0, last0 = 0, mask0 = 0, route0 = 0;
-    unsigned long flags1 = 0, base1 = 0, last1 = 0, mask1 = 0, route1 = 0;
-    unsigned long flags2 = 0, base2 = 0, last2 = 0, mask2 = 0, route2 = 0;
-    unsigned long flags3 = 0, base3 = 0, last3 = 0, mask3 = 0, route3 = 0;
-    unsigned long flagsg = 0, baseg = 0, lastg = 0, maskg = 0, routeg = 0;
-    unsigned long flagsl = 0, basel = 0, lastl = 0;
+    unsigned long flagsd, based, lastd, maskd, routed;
+    unsigned long flags0, base0, last0, mask0, route0;
+    unsigned long flags1, base1, last1, mask1, route1;
+    unsigned long flags2, base2, last2, mask2, route2;
+    unsigned long flags3, base3, last3, mask3, route3;
+    unsigned long flagsg, baseg, lastg, maskg, routeg;
+    unsigned long flagsl, basel, lastl;
     int i, rope;
 
     /* Map mio registers (minimum 8k) */
@@ -461,7 +462,7 @@ xf86PreScanZX1(void)
     if (!(pZX1mio = xf86MapVidMem(-1, VIDMEM_MMIO, MIO_BASE, mapSize)))
 	return FALSE;
 
-    /* Look for ZX1's SBA and IOC */
+    /* Look for ZX1's SBA and IOC */	/* XXX What about Dino? */
     if ((MIO_LONG(MIO_FUNCTION0 + PCI_ID_REG) !=
 	 DEVID(VENDOR_HP, CHIP_ZX1_SBA)) ||
 	(MIO_LONG(MIO_FUNCTION1 + PCI_ID_REG) !=
@@ -589,6 +590,14 @@ xf86PreScanZX1(void)
      * ones.
      */
 
+    flagsd = 0; based = 0; lastd = 0; maskd = 0; routed = 0;
+    flags0 = 0; base0 = 0; last0 = 0; mask0 = 0; route0 = 0;
+    flags1 = 0; base1 = 0; last1 = 0; mask1 = 0; route1 = 0;
+    flags2 = 0; base2 = 0; last2 = 0; mask2 = 0; route2 = 0;
+    flags3 = 0; base3 = 0; last3 = 0; mask3 = 0; route3 = 0;
+    flagsg = 0; baseg = 0; lastg = 0; maskg = 0; routeg = 0;
+    flagsl = 0; basel = 0; lastl = 0;
+
     if ((tmp = MIO_QUAD(IOS_DIST_BASE)) & RANGE_ENABLE) {
 	flagsd = RANGE_ENABLE;
 	maskd = MIO_QUAD(IOS_DIST_MASK);
@@ -909,9 +918,11 @@ xf86PostScanZX1(void)
     ppPCI = ppPCI2 = xf86scanpci(0);	/* Recursion is only apparent */
     while ((pPCI = *ppPCI2++)) {
 	switch (pPCI->pci_device_vendor) {
-	case DEVID(VENDOR_HP, CHIP_ZX1_SBA):
-	case DEVID(VENDOR_HP, CHIP_ZX1_IOC):
-	case DEVID(VENDOR_HP, CHIP_ZX1_LBA):
+	case DEVID(VENDOR_HP, CHIP_ELROY):
+	case DEVID(VENDOR_HP, CHIP_ZX1_SBA):	/* Pluto function 0 */
+	case DEVID(VENDOR_HP, CHIP_ZX1_IOC):	/* Pluto function 1 */
+	case DEVID(VENDOR_HP, CHIP_ZX1_LBA):	/* Mercury */
+	case DEVID(VENDOR_HP, CHIP_ZX1_AGP8):	/* QuickSilver */
 	    xfree(pPCI);		/* Remove it */
 	    continue;
 
diff --git a/hw/xfree86/os-support/xf86_libc.h b/hw/xfree86/os-support/xf86_libc.h
index c6b8c1743..6eb4573f4 100644
--- a/hw/xfree86/os-support/xf86_libc.h
+++ b/hw/xfree86/os-support/xf86_libc.h
@@ -1,5 +1,5 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 3.62 2003/12/02 22:29:23 dawes Exp $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 3.62 2003/12/02 22:29:23 dawes Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 1.1.4.2 2003/12/06 13:24:26 kaleb Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 3.63 2003/12/08 21:46:55 alanh Exp $ */
 /*
  * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
  *
@@ -46,6 +46,7 @@
 #define XF86_LIBC_H 1
 
 #include "Xfuncs.h"
+#include <stddef.h>
 
 /*
  * The first set of definitions are required both for modules and
diff --git a/hw/xfree86/scanpci/extrapci.ids b/hw/xfree86/scanpci/extrapci.ids
index 32d96cec8..a4369e8c1 100644
--- a/hw/xfree86/scanpci/extrapci.ids
+++ b/hw/xfree86/scanpci/extrapci.ids
@@ -14,7 +14,8 @@
 #	changes/additions that aren't XFree86-specific to the pciids
 #	project (http://pciids.sf.net/).
 #
-#	$XFree86: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.10 2003/10/30 15:29:32 tsi Exp $
+#	$XdotOrg: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.12 2003/12/18 16:29:18 dawes Exp $
+#	$XFree86: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.12 2003/12/18 16:29:18 dawes Exp $
 #
 
 # Vendors, devices and subsystems. Please keep sorted.
@@ -39,6 +40,23 @@
 	0002	"
 		C  0401
 
-126f	"
-	0730	SM731 Cougar3DR
-	
+# Some NVIDIA cards that are not in the master pci.ids file yet.
+10de	"
+	0314	GeForce FX 5600SE
+	031a	GeForce FX Go5600
+	031b	GeForce FX Go5650
+	031c	Quadro FX Go700
+	0323	GeForce FX 5200SE
+	0324	GeForce FX Go5200
+	0325	GeForce FX Go5250
+	0328	GeForce FX Go5200 32M/64M
+	0329	GeForce FX 5200 (Mac)
+	032a	Quadro NVS 280 PCI
+	032c	GeForce FX Go5300
+	032d	GeForce FX Go5100
+	0332	GeForce FX 5900XT
+	0333	GeForce FX 5950 Ultra
+	0341	GeForce FX 5700 Ultra
+	0342	GeForce FX 5700
+	034e	Quadro FX 1100
+
diff --git a/hw/xfree86/scanpci/pci.ids b/hw/xfree86/scanpci/pci.ids
index 0d6a460f3..eec9d74cc 100644
--- a/hw/xfree86/scanpci/pci.ids
+++ b/hw/xfree86/scanpci/pci.ids
@@ -7,7 +7,7 @@
 #	so if you have anything to contribute, please visit the home page or
 #	send a diff -u against the most recent pci.ids to pci-ids@ucw.cz.
 #
-#	Daily snapshot on Wed 2003-05-14 10:00:04
+#	Daily snapshot on Thu 2003-12-18 11:00:05
 #
 
 # Vendors, devices and subsystems. Please keep sorted.
@@ -118,6 +118,8 @@
 		0e11 7004  Embedded Ultra Wide SCSI Controller
 		1092 8760  FirePort 40 Dual SCSI Controller
 		1de1 3904  DC390F Ultra Wide SCSI Controller
+		4c53 1000  CC7/CR7/CP7/VC7/VP7/VR7 mainboard
+		4c53 1050  CT7 mainboard
 	0010  53c895
 		0e11 4040  Integrated Array Controller
 		0e11 4048  Integrated Array Controller
@@ -126,6 +128,9 @@
 	0020  53c1010 Ultra3 SCSI Adapter
 		1de1 1020  DC-390U3W
 	0021  53c1010 66MHz  Ultra3 SCSI Adapter
+		4c53 1080  CT8 mainboard
+		4c53 1300  P017 mezzanine (32-bit PMC)
+		4c53 1310  P017 mezzanine (64-bit PMC)
 	0030  53c1030 PCI-X Fusion-MPT Dual Ultra320 SCSI
 		1028 1010  LSI U320 SCSI Controller
 	0040  53c1035
@@ -162,15 +167,12 @@
 	9100  INI-9100/9100W SCSI Host
 1002  ATI Technologies Inc
 	4136  Radeon IGP 320 M
-# New support forthcoming in XFree86 4.3.0
 	4144  Radeon R300 AD [Radeon 9500 Pro]
-# New support forthcoming in XFree86 4.3.0
 	4145  Radeon R300 AE [Radeon 9500 Pro]
-# New support forthcoming in XFree86 4.3.0
 	4146  Radeon R300 AF [Radeon 9500 Pro]
-# Update:  Oops, AF was a typo above for 4147, should be AG
 	4147  Radeon R300 AG [FireGL Z1/X1]
 	4158  68800AX [Mach32]
+	4164  Radeon R300 Secondary (DVI) output
 	4242  Radeon R200 BB [Radeon All in Wonder 8500DV]
 		1002 02aa  Radeon 8500 AIW DV Edition
 	4336  Radeon Mobility U1
@@ -225,6 +227,7 @@
 		1002 0008  Rage XL
 		1002 4752  Rage XL
 		1002 8008  Rage XL
+		1028 00ce  PowerEdge 1400
 		1028 00d1  PowerEdge 2550
 	4753  Rage XC
 		1002 4753  Rage XC
@@ -268,6 +271,7 @@
 	4c44  3D Rage LT Pro AGP-66
 	4c45  Rage Mobility M3 AGP
 	4c46  Rage Mobility M3 AGP 2x
+		1028 00b1  Latitude C600
 	4c47  3D Rage LT-G 215LG
 	4c49  3D Rage LT Pro
 		1002 0004  Rage LT Pro
@@ -276,8 +280,10 @@
 		1002 4c49  Rage LT Pro
 	4c4d  Rage Mobility P/M AGP 2x
 		0e11 b111  Armada M700
+		0e11 b160  Armada E500
 		1002 0084  Xpert 98 AGP 2X (Mobility)
 		1014 0154  ThinkPad A20m
+		1028 00aa  Latitude CPt
 	4c4e  Rage Mobility L AGP 2x
 	4c50  3D Rage LT Pro
 		1002 4c50  Rage LT Pro
@@ -289,32 +295,29 @@
 		1014 0517  ThinkPad T30
 		1028 00e6  Radeon Mobility M7 LW (Dell Inspiron 8100)
 		144d c006  Radeon Mobility M7 LW in vpr Matrix 170B4
-# Update:  More correct labelling for this FireGL chipset
 	4c58  Radeon RV200 LX [Mobility FireGL 7800 M7]
 	4c59  Radeon Mobility M6 LY
 		1014 0235  ThinkPad A30p (2653-64G)
 		1014 0239  ThinkPad X22/X23/X24
 		104d 80e7  VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP
 	4c5a  Radeon Mobility M6 LZ
-# Update:  Add M9 to product name
 	4c64  Radeon R250 Ld [Radeon Mobility 9000 M9]
-# Update:  Add M9 to product name
 	4c65  Radeon R250 Le [Radeon Mobility 9000 M9]
-# Update:  Add M9 to product name
 	4c66  Radeon R250 Lf [Radeon Mobility 9000 M9]
-# Update:  Add M9 to product name
 	4c67  Radeon R250 Lg [Radeon Mobility 9000 M9]
+# Secondary chip to the Lf
+	4c6e  Radeon R250 Ln [Radeon Mobility 9000 M9] [Secondary]
 	4d46  Rage Mobility M4 AGP
 	4d4c  Rage Mobility M4 AGP
 	4e44  Radeon R300 ND [Radeon 9700 Pro]
 	4e45  Radeon R300 NE [Radeon 9500 Pro]
 		1002 0002  Radeon R300 NE [Radeon 9500 Pro]
 	4e46  Radeon R300 NF [Radeon 9700]
-# Update:  This is FireGL X1, not Radeon 9700
 	4e47  Radeon R300 NG [FireGL X1]
 	4e48  Radeon R350 [Radeon 9800]
 	4e64  Radeon R300 [Radeon 9700 Pro] (Secondary)
 	4e65  Radeon R300 [Radeon 9500 Pro] (Secondary)
+		1002 0003  Radeon R300 NE [Radeon 9500 Pro]
 	4e66  Radeon R300 [Radeon 9700] (Secondary)
 	4e67  Radeon R300 [FireGL X1] (Secondary)
 	4e68  Radeon R350 [Radeon 9800] (Secondary)
@@ -354,7 +357,6 @@
 	5056  Rage 128 PV/PRO TMDS
 	5057  Rage 128 PW/PRO AGP 2x TMDS
 	5058  Rage 128 PX/PRO AGP 4x TMDS
-# Update: This same chip is used in all 32Mb and 64Mb SDR/DDR orig Radeons, and is now known as 7200
 	5144  Radeon R100 QD [Radeon 7200]
 		1002 0008  Radeon 7000/Radeon VE
 		1002 0009  Radeon 7000/Radeon
@@ -385,11 +387,8 @@
 		1002 013a  Radeon 8500
 		148c 2026  R200 QL [Radeon 8500 Evil Master II Multi Display Edition]
 		174b 7149  Radeon R200 QL [Sapphire Radeon 8500 LE]
-# New: Radeon 9100 is basically a Radeon 8500LE branded as 9100 by Sapphire
 	514d  Radeon R200 QM [Radeon 9100]
-# New: Radeon 8500LE chip
 	514e  Radeon R200 QN [Radeon 8500LE]
-# New: Radeon 8500LE chip
 	514f  Radeon R200 QO [Radeon 8500LE]
 	5157  Radeon RV200 QW [Radeon 7500]
 		1002 013a  Radeon 7500
@@ -401,7 +400,6 @@
 		174b 7161  Radeon RV200 QW [Radeon 7500 LE]
 		17af 0202  RV200 QW [Excalibur Radeon 7500LE]
 	5158  Radeon RV200 QX [Radeon 7500]
-# Update: More correct name
 	5159  Radeon RV100 QY [Radeon 7000/VE]
 		1002 000a  Radeon 7000/Radeon VE
 		1002 000b  Radeon 7000
@@ -414,13 +412,12 @@
 		148c 2023  RV100 QY [Radeon 7000 Evil Master Multi-Display]
 		174b 7112  RV100 QY [Sapphire Radeon VE 7000]
 		1787 0202  RV100 QY [Excalibur Radeon 7000]
-# Update: More correct name
 	515a  Radeon RV100 QZ [Radeon 7000/VE]
 	5168  Radeon R200 Qh
 	5169  Radeon R200 Qi
 	516a  Radeon R200 Qj
 	516b  Radeon R200 Qk
-# new: This one is not in ATI documentation, but is in XFree86 source code
+# This one is not in ATI documentation, but is in XFree86 source code
 	516c  Radeon R200 Ql
 	5245  Rage 128 RE/SG
 		1002 0008  Xpert 128
@@ -472,8 +469,10 @@
 		1002 5654  Mach64VT Reference
 	5655  264VT3 [Mach64 VT3]
 	5656  264VT4 [Mach64 VT4]
+	5961  Radeon RV280 [Radeon 9200]
 	700f  PCI Bridge [IGP 320M]
 	7010  PCI Bridge [IGP 340M]
+	cab0  AGP Bridge [IGP 320M]
 	cab2  RS200/RS200M AGP Bridge [IGP 340M]
 1003  ULSI Systems
 	0201  US201
@@ -528,7 +527,14 @@
 	0011  NS87560 National PCI System I/O
 	0012  USB Controller
 	0020  DP83815 (MacPhyter) Ethernet Controller
+		1385 f311  FA311 / FA312 (FA311 with WoL HW)
 	0022  DP83820 10/100/1000 Ethernet Controller
+	0028  CS5535 Host bridge
+	002b  CS5535 ISA bridge
+	002d  CS5535 IDE
+	002e  CS5535 Audio
+	002f  CS5535 USB
+	0030  CS5535 Video
 	0500  SCx200 Bridge
 	0501  SCx200 SMI
 	0502  SCx200 IDE
@@ -630,7 +636,9 @@
 		0e11 4051  Integrated Smart Array
 		0e11 4058  Integrated Smart Array
 		103c 10c2  Hewlett-Packard NetRAID-4M
-		12d9 000a  VoIP PCI Gateway
+		12d9 000a  IP Telephony card
+		4c53 1050  CT7 mainboard
+		4c53 1051  CE7 mainboard
 		9005 0365  Adaptec 5400S
 		9005 1364  Dell PowerEdge RAID Controller 2
 		9005 1365  Dell PowerEdge RAID Controller 2
@@ -695,14 +703,17 @@
 	001b  GXT-150P
 	001c  Carrera
 	001d  82G2675
-	0020  MCA
+	0020  GXT1000 Graphics Adapter
 	0022  IBM27-82351
 	002d  Python
-	002e  ServeRAID Controller
+# [official name in AIX 5]
+	002e  SCSI RAID Adapter [ServeRAID]
 		1014 002e  ServeRAID-3x
 		1014 022e  ServeRAID-4H
+	0031  2 Port Serial Adapter
 	0036  Miami
 	003a  CPU to PCI Bridge
+	003c  GXT250P/GXT255P Graphics Adapter
 	003e  16/4 Token ring UTP/STP controller
 		1014 003e  Token-Ring Adapter
 		1014 00cd  Token-Ring Adapter + Wake-On-LAN
@@ -720,23 +731,30 @@
 	004f  ATM Controller (14104f00)
 	0050  ATM Controller (14105000)
 	0053  25 MBit ATM Controller
+	0054  GXT500P/GXT550P Graphics Adapter
 	0057  MPEG PCI Bridge
 	005c  i82557B 10/100
+	005e  GXT800P Graphics Adapter
 	007c  ATM Controller (14107c00)
 	007d  3780IDSP [MWave]
+	008e  GXT3000P Graphics Adapter
 	0090  GXT 3000P
 		1014 008e  GXT-3000P
+	0091  SSA Adapter
 	0095  20H2999 PCI Docking Bridge
 	0096  Chukar chipset SCSI controller
 		1014 0097  iSeries 2778 DASD IOA
 		1014 0098  iSeries 2763 DASD IOA
 		1014 0099  iSeries 2748 DASD IOA
+	009f  PCI 4758 Cryptographic Accelerator
 	00a5  ATM Controller (1410a500)
 	00a6  ATM 155MBPS MM Controller (1410a600)
 	00b7  256-bit Graphics Rasterizer [Fire GL1]
+	00b8  GXT2000P Graphics Adapter
 	00be  ATM 622MBPS Controller (1410be00)
 	00dc  Advanced Systems Management Adapter (ASMA)
 	00fc  CPC710 Dual Bridge and Memory Controller (PCI-64)
+	0104  Gigabit Ethernet-SX Adapter
 	0105  CPC710 Dual Bridge and Memory Controller (PCI-32)
 	010f  Remote Supervisor Adapter (RSA)
 	0142  Yotta Video Compositor Input
@@ -744,6 +762,14 @@
 	0144  Yotta Video Compositor Output
 		1014 0145  Yotta Output Controller (ytout)
 	0156  405GP PLB to PCI Bridge
+	015e  622Mbps ATM PCI Adapter
+	0160  64bit/66MHz PCI ATM 155 MMF
+	016e  GXT4000P Graphics Adapter
+	0170  GXT6000P Graphics Adapter
+	017d  GXT300P Graphics Adapter
+	0180  Snipe chipset SCSI controller
+		1014 0241  iSeries 2757 DASD IOA
+		1014 0264  Quad Channel PCI-X U320 SCSI RAID Adapter (2780)
 	01a7  PCI-X to PCI-X Bridge
 	01bd  ServeRAID Controller
 		1014 01be  ServeRAID-4M
@@ -753,6 +779,19 @@
 		1014 022e  ServeRAID-4H
 		1014 0258  ServeRAID-5i
 		1014 0259  ServeRAID-5i
+	01c1  64bit/66MHz PCI ATM 155 UTP
+	01e6  Cryptographic Accelerator
+	01ff  10/100 Mbps Ethernet
+	0219  Multiport Serial Adapter
+		1014 021a  Dual RVX
+		1014 0251  Internal Modem/RVX
+		1014 0252  Quad Internal Modem
+	021b  GXT6500P Graphics Adapter
+	021c  GXT4500P Graphics Adapter
+	0233  GXT135P Graphics Adapter
+	0266  PCI-X Dual Channel SCSI
+	0268  Gigabit Ethernet-SX Adapter (PCI-X)
+	0269  10/100/1000 Base-TX Ethernet Adapter (PCI-X)
 	0302  XA-32 chipset [Summit]
 	ffff  MPIC-2 interrupt controller
 1015  LSI Logic Corp of Canada
@@ -815,9 +854,16 @@
 		1259 2454  AT-2450v4 10Mb Ethernet Adapter
 		1259 2700  AT-2700TX 10/100 Fast Ethernet
 		1259 2701  AT-2700FX 100Mb Ethernet
+		4c53 1000  CC7/CR7/CP7/VC7/VP7/VR7 mainboard
+		4c53 1010  CP5/CR6 mainboard
+		4c53 1020  VR6 mainboard
+		4c53 1030  PC5 mainboard
+		4c53 1040  CL7 mainboard
+		4c53 1060  PC7 mainboard
 	2001  79c978 [HomePNA]
 		1092 0a78  Multimedia Home Network Adapter
 		1668 0299  ActionLink Home Network Adapter
+	2003  Am 1771 MBW [Alchemy]
 	2020  53c974 [PCscsi]
 	2040  79c974
 	3000  ELanSC520 Microcontroller
@@ -862,6 +908,7 @@
 	746b  AMD-8111 ACPI
 	746d  AMD-8111 AC97 Audio
 	746e  AMD-8111 MC97 Modem
+	756b  AMD-8111 ACPI
 1023  Trident Microsystems
 	0194  82C194
 	2000  4DWave DX
@@ -1130,6 +1177,12 @@
 	00b8  F64310
 	00c0  F69000 HiQVideo
 		102c 00c0  F69000 HiQVideo
+		4c53 1000  CC7/CR7/CP7/VC7/VP7/VR7 mainboard
+		4c53 1010  CP5/CR6 mainboard
+		4c53 1020  VR6 mainboard
+		4c53 1030  PC5 mainboard
+		4c53 1050  CT7 mainboard
+		4c53 1051  CE7 mainboard
 	00d0  F65545
 	00d8  F65545
 	00dc  F65548
@@ -1141,6 +1194,11 @@
 	00f4  F68554 HiQVision
 	00f5  F68555
 	0c30  F69030
+		4c53 1000  CC7/CR7/CP7/VC7/VP7/VR7 mainboard
+		4c53 1050  CT7 mainboard
+		4c53 1051  CE7 mainboard
+# C5C project cancelled
+		4c53 1080  CT8 mainboard
 102d  Wyse Technology Inc.
 	50dc  3328 Audio
 102e  Olivetti Advanced Technology
@@ -1156,6 +1214,7 @@
 	6057  MiroVideo DC10/DC30+
 1032  Compaq
 1033  NEC Corporation
+	0000  Vr4181A USB Host or Function Control Unit
 	0001  PCI to 486-like bus Bridge
 	0002  PCI to VL98 Bridge
 	0003  ATM Controller
@@ -1196,9 +1255,11 @@
 	00a6  VRC5477 AC97
 	00cd  IEEE 1394 [OrangeLink] Host Controller
 		12ee 8011  Root hub
+	00df  Vr4131
 	00e0  USB 2.0
 		12ee 7001  Root hub
 		1799 0002  Root Hub
+	00f3  uPD6113x Multimedia Decoder/Processor [EMMA2]
 1034  Framatome Connectors USA Inc.
 1035  Comp. & Comm. Research Lab
 1036  Future Domain Corp.
@@ -1243,9 +1304,11 @@
 	0735  735 Host
 	0740  740 Host
 	0745  745 Host
+	0746  746 Host
 	0755  SiS 755 Host Bridge
 	0900  SiS900 10/100 Ethernet
 		1039 0900  SiS900 10/100 Ethernet Adapter
+		1043 8035  CUSI-FX motherboard
 	0961  SiS961 [MuTIOL Media IO]
 	0962  SiS962 [MuTIOL Media IO]
 	3602  83C602
@@ -1257,6 +1320,7 @@
 	5513  5513 [IDE]
 		1019 0970  P6STP-FL motherboard
 		1039 5513  SiS5513 EIDE Controller (A,B step)
+		1043 8035  CUSI-FX motherboard
 	5517  5517
 	5571  5571
 	5581  5581 Pentium Chipset
@@ -1270,6 +1334,7 @@
 	6236  6236 3D-AGP
 	6300  SiS630 GUI Accelerator+3D
 		1019 0970  P6STP-FL motherboard
+		1043 8035  CUSI-FX motherboard
 	6306  SiS530 3D PCI/AGP
 		1039 6306  SiS530,620 GUI Accelerator+3D
 	6325  SiS650/651/M650/740 PCI/AGP VGA Display Adapter
@@ -1312,6 +1377,7 @@
 		15c5 0111  SiS PCI Audio Accelerator
 		270f a171  SiS PCI Audio Accelerator
 		a0a0 0022  SiS PCI Audio Accelerator
+	7019  SiS7019 Audio Accelerator
 103a  Seiko Epson Corporation
 103b  Tatung Co. of America
 103c  Hewlett-Packard Company
@@ -1372,6 +1438,7 @@
 1043  Asustek Computer, Inc.
 	0675  ISDNLink P-IN100-ST-D
 	4021  v7100 Combo Deluxe [GeForce2 MX + TV tuner]
+	4057  v8200 GeForce 3
 1044  Distributed Processing Technology
 	1012  Domino RAID Engine
 	a400  SmartCache/Raid I-IV Controller
@@ -1433,7 +1500,7 @@
 	c832  82C832
 	c861  82C861
 	c895  82C895
-	c935  EV1935 ECTIVA MachOne PCI Audio
+	c935  EV1935 ECTIVA MachOne PCIAudio
 	d568  82C825 [Firebridge 2]
 	d721  IDE [FireStar]
 1046  IPC Corporation, Ltd.
@@ -1443,16 +1510,24 @@
 	1000  QuickStep 1000
 	3000  QuickStep 3000
 1049  Fountain Technologies, Inc.
-104a  SGS Thomson Microelectronics
+# # nee SGS Thomson Microelectronics
+104a  STMicroelectronics
 	0008  STG 2000X
 	0009  STG 1764X
 	0010  STG4000 [3D Prophet Kyro Series]
+	0209  STPC Consumer/Industrial North- and Southbridge
+	020a  STPC Atlas/ConsumerS/Consumer IIA Northbridge
 # From <http://gatekeeper.dec.com/pub/BSD/FreeBSD/FreeBSD-stable/src/share/misc/pci_vendors>
 	0210  STPC Atlas ISA Bridge
+	021a  STPC Consumer S Southbridge
+	021b  STPC Consumer IIA Southbridge
+	0500  ST70137 [Unicorn] ADSL DMT Transceiver
+	0564  STPC Client Northbridge
 	0981  DEC-Tulip compatible 10/100 Ethernet
 	1746  STG 1764X
 	2774  DEC-Tulip compatible 10/100 Ethernet
 	3520  MPEG-II decoder card
+	55cc  STPC Client Southbridge
 104b  BusLogic
 	0140  BT-946C (old) [multimaster  01]
 	1040  BT-946C (BA80C30) [MultiMaster 10]
@@ -1505,7 +1580,11 @@
 	8026  TSB43AB21 IEEE-1394a-2000 Controller (PHY/Link)
 	8027  PCI4451 IEEE-1394 Controller
 		1028 00e6  PCI4451 IEEE-1394 Controller (Dell Inspiron 8100)
+	8029  PCI4510 IEEE-1394 Controller
 	8400  ACX 100 22Mbps Wireless Interface
+	8401  ACX 100 22Mbps Wireless Interface
+# OK, this info is almost useless as is, but at least it's known that it's a wireless card. More info requested from reporter (whi
+	9000  Wireless Interface (of unknown type)
 	a001  TDC1570
 	a100  TDC1561
 	a102  TNETA1575 HyperSAR Plus w/PCI Host i/f & UTOPIA i/f
@@ -1523,6 +1602,7 @@
 	ac1b  PCI1450
 		0e11 b113  Armada M700
 	ac1c  PCI1225
+		0e11 b121  Armada E500
 	ac1d  PCI1251A
 	ac1e  PCI1211
 	ac1f  PCI1251B
@@ -1536,9 +1616,11 @@
 	ac41  PCI4410 PC card Cardbus Controller
 	ac42  PCI4451 PC card Cardbus Controller
 		1028 00e6  PCI4451 PC card CardBus Controller (Dell Inspiron 8100)
+	ac44  PCI4510 PC card Cardbus Controller
 	ac50  PCI1410 PC card Cardbus Controller
 	ac51  PCI1420
 		1014 023b  ThinkPad T23 (2647-4MG)
+		1028 00b1  Latitude C600
 		10cf 1095  Lifebook C6155
 		e4bf 1000  CP2-2-HIPHOP
 	ac52  PCI1451 PC card Cardbus Controller
@@ -1627,6 +1709,7 @@
 	0d38  20263
 		105a 4d39  Fasttrak66
 	1275  20275
+	3318  PDC20318 (SATA150 TX4)
 	3376  PDC20376
 		1043 809e  A7V8X motherboard
 	4d30  20267
@@ -1649,6 +1732,7 @@
 	6269  PDC20271
 		105a 6269  FastTrak TX2/TX2000
 	6621  PDC20621 [SX4000] 4 Channel IDE RAID Controller
+	6629  PDC20619 FastTrak TX4000 RAID
 	7275  PDC20277
 105b  Foxconn International, Inc.
 105c  Wipro Infotech Limited
@@ -1735,6 +1819,7 @@
 	0002  DAC960PD
 	0010  DAC960PX
 	0050  AcceleRAID 352/170/160 support Device
+	b166  Gemstone chipset SCSI controller
 	ba55  eXtremeRAID 1100 support Device
 	ba56  eXtremeRAID 2000/3000 support Device
 106a  Aten Research Inc
@@ -1962,6 +2047,8 @@
 	1190  PCI-MIO-16E-4
 	1330  PCI-6031E
 	1350  PCI-6071E
+	17d0  PCI-6503
+	2410  PCI-6733
 	2a60  PCI-6023E
 	b001  IMAQ-PCI-1408
 	b011  IMAQ-PXI-1408
@@ -2229,6 +2316,7 @@
 		d84d 4078  EX-4078 2S(16C552) RS-232+1P
 	9054  PCI <-> IOBus Bridge
 		10b5 2455  Wessex Techology PHIL-PCI
+		10b5 2696  Innes Corp AM Radcap card
 		12d9 0002  PCI Prosody Card rev 1.5
 	9060  9060
 	906d  9060SD
@@ -2238,6 +2326,7 @@
 		10b5 9080  9080 [real subsystem ID not set]
 		129d 0002  Aculab PCI Prosidy card
 		12d9 0002  PCI Prosody Card
+	bb04  B&B 3PCIOSD1A Isolated PCI Serial
 10b6  Madge Networks
 	0001  Smart 16/4 PCI Ringnode
 	0002  Smart 16/4 PCI Ringnode Mk2
@@ -2269,6 +2358,7 @@
 	1006  MINI PCI type 3B Data Fax Modem
 	1007  Mini PCI 56k Winmodem
 		10b7 615c  Mini PCI 56K Modem
+	1700  3c940 1000Base?
 	3390  3c339 TokenLink Velocity
 	3590  3c359 TokenLink Velocity XL
 		10b7 3590  TokenLink Velocity XL Adapter (3C359/359B)
@@ -2301,6 +2391,7 @@
 		10b7 656b  3CCFEM656 10/100 LAN+56K Modem CardBus
 	6564  3CCFEM656 [id 6564] Cyclone CardBus
 	7646  3cSOHO100-TX Hurricane
+	7770  3CRWE777 PCI(PLX) Wireless Adaptor [Airconnect]
 	7940  3c803 FDDILink UTP Controller
 	7980  3c804 FDDILink SAS Controller
 	7990  3c805 FDDILink DAS Controller
@@ -2341,7 +2432,8 @@
 	9058  3c905B-Combo [Deluxe Etherlink XL 10/100]
 	905a  3c905B-FX [Fast Etherlink XL FX 10/100]
 	9200  3c905C-TX/TX-M [Tornado]
-		1028 0095  Integrated 3C905C-TX Fast Etherlink for PC Management NIC
+		1028 0095  3C920 Integrated Fast Ethernet Controller
+		1028 0097  3C920 Integrated Fast Ethernet Controller
 		10b7 1000  3C905C-TX Fast Etherlink for PC Management NIC
 		10b7 7000  10/100 Mini PCI Ethernet Adapter
 	9201  3C920B-EMB Integrated Fast Ethernet Controller
@@ -2524,7 +2616,10 @@
 10c9  Dataexpert Corporation
 10ca  Fujitsu Microelectr., Inc.
 10cb  Omron Corporation
-10cc  Mentor ARC Inc
+# nee Mentor ARC Inc
+10cc  Mai Logic Incorporated
+	0660  Articia S Host Bridge
+	0661  Articia S PCI Bridge
 10cd  Advanced System Products, Inc
 	1100  ASC1100
 	1200  ASC1200 [(abp940) Fast SCSI-II]
@@ -2533,9 +2628,9 @@
 	2300  ABP940-UW
 	2500  ABP940-U2W
 10ce  Radius
-10cf  Citicorp TTI
+# nee Citicorp TTI
+10cf  Fujitsu Limited.
 	2001  mb86605
-10d0  Fujitsu Limited
 10d1  FuturePlus Systems Corp.
 10d2  Molex Incorporated
 10d3  Jabil Circuit Inc
@@ -2644,9 +2739,21 @@
 		1043 0c11  A7N8X Mainboard
 	006a  nForce2 AC97 Audio Controler (MCP)
 	006b  nForce MultiMedia audio [Via VT82C686B]
+	006c  nForce2 External PCI Bridge
+	006d  nForce2 PCI Bridge
 	006e  nForce2 FireWire (IEEE 1394) Controller
 	00a0  NV5 [Aladdin TNT2]
 		14af 5810  Maxi Gamer Xentor
+	00d0  nForce3 LPC Bridge
+	00d1  nForce3 Host Bridge
+	00d2  nForce3 AGP Bridge
+	00d4  nForce3 SMBus
+	00d5  nForce3 IDE
+	00d6  nForce3 Ethernet
+	00d7  nForce3 USB 1.1
+	00d8  nForce3 USB 2.0
+	00da  nForce3 Audio
+	00dd  nForce3 PCI Bridge
 	0100  NV10 [GeForce 256 SDR]
 		1043 0200  AGP-V6600 SGRAM
 		1043 0201  AGP-V6600 SDRAM
@@ -2658,6 +2765,7 @@
 		1043 0202  AGP-V6800 DDR
 		1043 400a  AGP-V6800 DDR SGRAM
 		1043 400b  AGP-V6800 DDR SDRAM
+		107d 2822  WinFast GeForce 256
 		1102 102e  CT6971 GeForce 256 DDR
 		14af 5021  3D Prophet DDR-DVI
 	0103  NV10GL [Quadro]
@@ -2696,12 +2804,14 @@
 	017b  NV17GL [Quadro4 550 XGL]
 	017c  NV17GL [Quadro4 550 GoGL]
 	0181  NV18 [GeForce4 MX 440 AGP 8x]
+		1043 806f  V9180 Magic
+		1462 8880  MS-StarForce GeForce4 MX 440 with AGP8X
 	0182  NV18 [GeForce4 MX 440SE AGP 8x]
 	0183  NV18 [GeForce4 MX 420 AGP 8x]
 	0188  NV18GL [Quadro4 580 XGL]
-	018a  NV18GL [Quadro4 NVS]
+	018a  NV18GL [Quadro4 NVS AGP 8x]
 	018b  NV18GL [Quadro4 380 XGL]
-	01a0  NV15 [GeForce2 - nForce GPU]
+	01a0  NVCrush11 [GeForce2 MX Integrated Graphics]
 	01a4  nForce CPU bridge
 	01ab  nForce 420 Memory Controller (DDR)
 	01ac  nForce 220/420 Memory Controller
@@ -2715,7 +2825,14 @@
 	01c1  Intel 537 [nForce MC97 Modem]
 	01c2  nForce USB Controller
 	01c3  nForce Ethernet Controller
+	01e0  nForce2 AGP (different version?)
 	01e8  nForce2 AGP
+	01ea  nForce2 Memory Controller 0
+	01eb  nForce2 Memory Controller 1
+	01ec  nForce2 Memory Controller 2
+	01ed  nForce2 Memory Controller 3
+	01ee  nForce2 Memory Controller 4
+	01ef  nForce2 Memory Controller 5
 	01f0  NV18 [GeForce4 MX - nForce GPU]
 	0200  NV20 [GeForce3]
 		1043 402f  AGP-V8200 DDR
@@ -2736,6 +2853,7 @@
 	0280  NV28 [GeForce4 Ti 4800]
 	0281  NV28 [GeForce4 Ti 4200 AGP 8x]
 	0282  NV28 [GeForce4 Ti 4800 SE]
+	0286  NV28 [GeForce4 Ti 4200 Go AGP 8x]
 	0288  NV28GL [Quadro4 980 XGL]
 	0289  NV28GL [Quadro4 780 XGL]
 	0300  NV30 [GeForce FX]
@@ -2743,6 +2861,14 @@
 	0302  NV30 [GeForce FX 5800]
 	0308  NV30GL [Quadro FX 2000]
 	0309  NV30GL [Quadro FX 1000]
+	0311  NV31 [GeForce FX 5600 Ultra]
+	0312  NV31 [GeForce FX 5600]
+	0321  NV34 [GeForce FX 5200 Ultra]
+	0322  NV34 [GeForce FX 5200]
+	032b  NV34GL [Quadro FX 500]
+	0330  NV35 [GeForce FX 5900 Ultra]
+	0331  NV35 [GeForce FX 5900]
+	0338  NV35GL [Quadro FX 3000]
 10df  Emulex Corporation
 	1ae5  LP6000 Fibre Channel Host Adapter
 	f085  LP850 Fibre Channel Adapter
@@ -2789,6 +2915,7 @@
 	811a  PCI-IEEE1355-DS-DE Interface
 	8170  S5933 [Matchmaker] (Chipset Development Tool)
 	82db  AJA HDNTV HD SDI Framestore
+	8851  S5933 on Innes Corp FM Radio Capture card
 10e9  Alps Electric Co., Ltd.
 10ea  Intergraphics Systems
 	1680  IGA-1680
@@ -2848,6 +2975,7 @@
 	3fc3  RME Digi96/8 Pad
 	3fc4  RME Digi9652 (Hammerfall)
 	3fc5  RME Hammerfall DSP
+	8381  Ellips Santos Frame Grabber
 10ef  Racore Computer Products, Inc.
 	8154  M815x Token Ring Adapter
 10f0  Peritek Corporation
@@ -2946,6 +3074,7 @@
 		1043 808c  A7V8X motherboard
 		1106 0571  VT82C586/B/VT82C686/A/B/VT8233/A/C/VT8235 PIPC Bus Master IDE
 		1179 0001  Magnia Z310
+		1297 f641  FX41 motherboard
 		1458 5002  GA-7VAX Mainboard
 	0576  VT82C576 3V [Apollo Master]
 	0585  VT82C585VP [Apollo VP1/VPX]
@@ -2988,6 +3117,7 @@
 		1019 0985  P6VXA Motherboard
 		1043 808c  A7V8X motherboard
 		1179 0001  Magnia Z310
+		1458 5004  GA-7VAX Mainboard
 	3040  VT82C586B ACPI
 	3043  VT86C100A [Rhine]
 		10bd 0000  VT86C100A Fast Ethernet Adapter
@@ -3012,6 +3142,7 @@
 		15dd 7609  Onboard Audio
 	3059  VT8233/A/8235 AC97 Audio Controller
 		1043 8095  A7V8X Motherboard (Realtek ALC650 codec)
+		1297 c160  FX41 motherboard (Realtek ALC650 codec)
 		1458 a002  GA-7VAX Onboard Audio (Realtek ALC650)
 	3065  VT6102 [Rhine-II]
 		1106 0102  VT6102 [Rhine II] Embeded Ethernet Controller on VT8235
@@ -3030,11 +3161,13 @@
 	3103  VT8615 Host Bridge
 	3104  USB 2.0
 		1043 808c  A7V8X motherboard
+		1297 f641  FX41 motherboard
 		1458 5004  GA-7VAX Mainboard
 	3106  VT6105 [Rhine-III]
 	3109  VT8233C PCI to ISA Bridge
 	3112  VT8361 [KLE133] Host Bridge
 	3116  VT8375 [KM266/KL266] Host Bridge
+		1297 f641  FX41 motherboard
 # found on EPIA M6000/9000 mainboard
 	3122  VT8623 [Apollo CLE266] integrated CastleRock graphics
 # found on EPIA M6000/9000 mainboard
@@ -3047,6 +3180,7 @@
 	3168  VT8374 P4X400 Host Controller/AGP Bridge
 	3177  VT8235 ISA Bridge
 		1043 808c  A7V8X motherboard
+		1297 f641  FX41 motherboard
 		1458 5001  GA-7VAX Mainboard
 	3189  VT8377 [KT400 AGP] Host Bridge
 		1043 807f  A7V8X motherboard
@@ -3073,6 +3207,7 @@
 	b103  VT8615 AGP Bridge
 	b112  VT8361 [KLE133] AGP Bridge
 	b168  VT8235 PCI Bridge
+	b198  VT8237 PCI Bridge
 1107  Stratus Computers
 	0576  VIA VT82C570MV [Apollo] (Wrong vendor ID!)
 1108  Proteon, Inc.
@@ -3096,6 +3231,7 @@
 	007c  FSC Remote Service Controller, shared memory device
 	007d  FSC Remote Service Controller, SMIC device
 	2102  DSCC4 WAN adapter
+	4021  SIMATIC NET CP 5512 (Profibus and MPI Cardbus Adapter)
 	4942  FPGA I-Bus Tracer for MBD
 	6120  SZB6120
 110b  Chromatic Research Inc.
@@ -3265,7 +3401,9 @@
 	1562  USB 2.0 Host Controller
 	3400  SmartPCI56(UCB1500) 56K Modem
 	7130  SAA7130 Video Broadcast Decoder
+		5168 0138  LiveView FlyVideo 2000
 	7133  SAA7133 Audio+video broadcast decoder
+		5168 0138  LifeView FlyVideo 3000
 # PCI audio and video broadcast decoder (http://www.semiconductors.philips.com/pip/saa7134hl)
 	7134  SAA7134
 	7135  SAA7135 Audio+video broadcast decoder
@@ -3287,24 +3425,59 @@
 	b921  EiconCard P92
 	b922  EiconCard P92
 	b923  EiconCard P92
-	e001  DIVA 20PRO
-		1133 e001  DIVA Pro 2.0 S/T
-	e002  DIVA 20
-		1133 e002  DIVA 2.0 S/T
-	e003  DIVA 20PRO_U
-		1133 e003  DIVA Pro 2.0 U
-	e004  DIVA 20_U
-		1133 e004  DIVA 2.0 U
-	e005  DIVA LOW
-		1133 e005  DIVA 2.01 S/T
-	e00b  DIVA 2.02
-	e010  DIVA Server BRI-2M
-		1133 e010  DIVA Server BRI-2M
-	e012  DIVA Server BRI-8M
-		1133 e012  DIVA Server BRI-8M
-	e014  DIVA Server PRI-30M
-		1133 e014  DIVA Server PRI-30M
-	e018  DIVA Server BRI-2M/-2F
+	e001  Diva Pro 2.0 S/T
+	e002  Diva 2.0 S/T PCI
+	e003  Diva Pro 2.0 U
+	e004  Diva 2.0 U PCI
+	e005  Diva 2.01 S/T PCI
+	e006  Diva CT S/T PCI
+	e007  Diva CT U PCI
+	e008  Diva CT Lite S/T PCI
+	e009  Diva CT Lite U PCI
+	e00a  Diva ISDN+V.90 PCI
+	e00b  Diva 2.02 PCI S/T
+	e00c  Diva 2.02 PCI U
+	e00d  Diva ISDN Pro 3.0 PCI
+	e00e  Diva ISDN+CT S/T PCI Rev 2
+	e010  Diva Server BRI-2M PCI
+		110a 0021  Fujitsu Siemens ISDN S0
+		8001 0014  Diva Server BRI-2M PCI Cornet NQ
+	e011  Diva Server BRI S/T Rev 2
+	e012  Diva Server 4BRI-8M PCI
+		8001 0014  Diva Server 4BRI-8M PCI Cornet NQ
+	e013  Diva Server 4BRI-8M Rev 2
+		8001 0014  Diva Server 4BRI-8M Cornet NQ 2
+	e014  Diva Server PRI-30M PCI
+		0008 0100  Diva Server PRI-30M PCI
+		8001 0014  Diva Server PRI-30M PCI Cornet NQ
+	e015  DIVA Server PRI-30M 2.0
+		8001 0014  Diva Server PRI Cornet NQ 2
+	e016  Diva Server Voice 4BRI PCI
+		8001 0014  Diva Server PRI Cornet NQ
+	e017  Diva Server Voice 4BRI PCI Rev 2
+		8001 0014  Diva Server Voice 4BRI PCI Cornet NQ 2
+	e018  Diva Server BRI 2M Revision 2
+		8001 0014  Diva Server BRI 2M Cornet NQ 2
+	e019  Diva Server Voice PRI PCI Rev 2
+		8001 0014  Diva Server Voice PRI PCI Cornet NQ 2
+	e01a  Diva Server 2FX
+	e01b  Diva Server BRI-2M Voice Revision 2
+		8001 0014  Diva Server BRI-2M Voice Cornet NQ 2
+	e01c  Diva Server PRI Rev 3.0
+		1133 1c01  Diva Server PRI/E1/T1-8 Rev 3.0
+		1133 1c02  Diva Server PRI/T1-24 Rev 3.0
+		1133 1c03  Diva Server PRI/E1-30 Rev 3.0
+		1133 1c04  Diva Server V-PRI/E1/T1 Rev 3.0
+		1133 1c05  Diva Server V-PRI/T1-24 Rev 3.0
+		1133 1c06  Diva Server V-PRI/E1-30 Rev 3.0
+		1133 1c07  Diva Server PRI/E1/T1-8 Cornet NQ 3
+		1133 1c08  Diva Server PRI/T1-24 Cornet NQ 3
+		1133 1c09  Diva Server PRI/E1-30 Cornet NQ 3
+		1133 1c0a  Diva Server V-PRI/E1/T1 Cornet NQ 3
+		1133 1c0b  Diva Server V-PRI/T1-24 Cornet NQ 3
+		1133 1c0c  Diva Server V-PRI/E1-30 Cornet NQ 3
+	e01e  Diva Server 2PRI
+	e020  Diva Server 4PRI
 1134  Mercury Computer Systems
 	0001  Raceway Bridge
 1135  Fuji Xerox Co Ltd
@@ -3527,14 +3700,20 @@
 	0017  GCNB-LE Host Bridge
 	0200  OSB4 South Bridge
 	0201  CSB5 South Bridge
+		4c53 1080  CT8 mainboard
 	0203  CSB6 South Bridge
 	0211  OSB4 IDE Controller
 	0212  CSB5 IDE Controller
+		4c53 1080  CT8 mainboard
 	0213  CSB6 RAID/IDE Controller
 	0220  OSB4/CSB5 OHCI USB Controller
+		4c53 1080  CT8 mainboard
 	0221  CSB6 OHCI USB Controller
 	0225  GCLE Host Bridge
+# cancelled
+		4c53 1080  CT8 mainboard
 	0227  GCLE-2 Host Bridge
+		4c53 1080  CT8 mainboard
 1167  Mutoh Industries Inc
 1168  Thine Electronics Inc
 1169  Centre for Development of Advanced Computing
@@ -3816,6 +3995,7 @@
 	044e  LT WinModem
 	044f  V90 WildWire Modem
 	0450  LT WinModem
+		1033 80a8  Versa Note Vxi
 		144f 4005  Magnia SG20
 	0451  LT WinModem
 	0452  LT WinModem
@@ -4123,6 +4303,8 @@
 		1242 6562  FCX2-6562 Dual Channel PCI-X Fibre Channel Adapter
 		1242 656a  FCX-6562 PCI-X Fibre Channel Adapter
 	4643  FCI-1063 Fibre Channel Adapter
+	6562  FCX2-6562 Dual Channel PCI-X Fibre Channel Adapter
+	656a  FCX-6562 PCI-X Fibre Channel Adapter
 1243  Delphax
 1244  AVM Audiovisuelles MKTG & Computer System GmbH
 	0700  B1 ISDN
@@ -4183,7 +4365,7 @@
 		1014 0166  ES1969 SOLO-1 AudioDrive on IBM Aptiva Mainboard
 		125d 8888  Solo-1 Audio Adapter
 	1978  ES1978 Maestro 2E
-		0e11 b112  Armada M700
+		0e11 b112  Armada M700/E500
 		1033 803c  ES1978 Maestro-2E Audiodrive
 		1033 8058  ES1978 Maestro-2E Audiodrive
 		1092 4000  Monster Sound MX400
@@ -4194,6 +4376,7 @@
 	1989  ESS Modem
 		125d 1989  ESS Modem
 	1998  ES1983S Maestro-3i PCI Audio Accelerator
+		1028 00b1  Latitude C600
 		1028 00e6  ES1983S Maestro-3i (Dell Inspiron 8100)
 	1999  ES1983S Maestro-3i PCI Modem Accelerator
 	199a  ES1983S Maestro-3i PCI Audio Accelerator
@@ -4244,6 +4427,7 @@
 	0710  SM710 LynxEM
 	0712  SM712 LynxEM+
 	0720  SM720 Lynx3DM
+	0730  SM731 Cougar3DR
 	0810  SM810 LynxE
 	0811  SM811 LynxE
 	0820  SM820 Lynx3D
@@ -4532,7 +4716,7 @@
 12b6  Natural Microsystems
 12b7  Cognex Modular Vision Systems Div. - Acumen Inc.
 12b8  Korg
-12b9  US Robotics/3Com
+12b9  5610 56K FaxModem
 	1006  WinModem
 		12b9 005c  USR 56k Internal Voice WinModem (Model 3472)
 		12b9 005e  USR 56k Internal WinModem (Models 662975)
@@ -4628,6 +4812,7 @@
 12dc  Symicron Computer Communication Ltd.
 12dd  Management Graphics
 12de  Rainbow Technologies
+	0200  CryptoSwift CS200
 12df  SBS Technologies Inc
 12e0  Chase Research
 	0010  ST16C654 Quad UART
@@ -4826,6 +5011,10 @@
 132d  Integrated Silicon Solution, Inc.
 1330  MMC Networks
 1331  Radisys Corp.
+	8200  82600 Host Bridge
+	8201  82600 IDE
+	8202  82600 USB
+	8210  82600 PCI Bridge
 1332  Micro Memory
 	5415  MM-5415CN PCI Memory Module with Battery Backup
 	5425  MM-5425CN PCI 64/66 Memory Module with Battery Backup
@@ -4854,6 +5043,7 @@
 134c  Chori Joho System Co. Ltd
 134d  PCTel Inc
 	7890  HSP MicroModem 56
+		134d 0001  PCT789 adapter
 	7891  HSP MicroModem 56
 		134d 0001  HSP MicroModem 56
 	7892  HSP MicroModem 56
@@ -4913,6 +5103,7 @@
 1369  Digigram
 136a  High Soft Tech
 136b  Kawasaki Steel Corporation
+	ff01  KL5A72002 Motion JPEG
 136c  Adtek System Science Co Ltd
 136d  Gigalabs Inc
 136f  Applied Magic Inc
@@ -5025,7 +5216,10 @@
 13be  Miroku Jyoho Service Co. Ltd
 13bf  Sharewave Inc
 13c0  Microgate Corporation
-	0010  SyncLink WAN Adapter
+	0010  SyncLink Adapter v1
+	0020  SyncLink SCC Adapter
+	0030  SyncLink Multiport Adapter
+	0210  SyncLink Adapter v2
 13c1  3ware Inc
 	1000  3ware ATA-RAID
 	1001  3ware 7000-series ATA-RAID
@@ -5097,6 +5291,7 @@
 		13f6 0101  CMI8338-031 PCI Audio Device
 	0111  CM8738
 		1019 0970  P6STP-FL motherboard
+		1043 8035  CUSI-FX motherboard
 		1043 8077  CMI8738 6-channel audio controller
 		1043 80e2  CMI8738 6ch-MX
 		13f6 0111  CMI8738/C3DX PCI Audio Device
@@ -5171,6 +5366,8 @@
 141e  Fanuc Ltd
 141f  Visiontech Ltd
 1420  Psion Dacom plc
+	8002  Gold Card NetGlobal 56k+10/100Mb CardBus (Ethernet part)
+	8003  Gold Card NetGlobal 56k+10/100Mb CardBus (Modem part)
 1421  Ads Technologies Inc
 1422  Ygrec Systems Co Ltd
 1423  Custom Technology Corp.
@@ -5515,6 +5712,7 @@
 	4212  BCM4212 v.90 56k modem
 	4301  BCM4301 802.11b
 	4320  BCM94306 802.11g
+		1737 4320  WPC54G
 	4401  BCM4401 100Base-T
 		1043 80a8  A7V8X motherboard
 	4402  BCM4402 Integrated 10/100BaseT
@@ -5682,7 +5880,9 @@
 14f9  AG COMMUNICATIONS
 14fa  WANDEL & GOCHERMANN
 14fb  TRANSAS MARINE (UK) Ltd
-14fc  QUADRICS Supercomputers World
+14fc  Quadrics Ltd
+	0000  QsNet Elan3 Network Adapter
+	0001  QsNetII Elan4 Network Adapter
 14fd  JAPAN Computer Industry Inc
 14fe  ARCHTEK TELECOM Corp
 14ff  TWINHEAD INTERNATIONAL Corp
@@ -6110,7 +6310,11 @@
 3388  Hint Corp
 	0013  HiNT HC4 PCI to ISDN bridge, Multimedia audio controller
 	0014  HiNT HC4 PCI to ISDN bridge, Network controller
-	0021  HB1-SE33 PCI-PCI Bridge
+	0020  HB6 Universal PCI-PCI bridge (transparent mode)
+	0021  HB6 Universal PCI-PCI bridge (non-transparent mode)
+		4c53 1050  CT7 mainboard
+		4c53 1080  CT8 mainboard
+		4c53 3010  PPCI mezzanine (32-bit PMC)
 	101a  E.Band [AudioTrak Inca88]
 	101b  E.Band [AudioTrak Inca88]
 	8011  VXPro II Chipset
diff --git a/hw/xfree86/scanpci/xf86PciStdIds.h b/hw/xfree86/scanpci/xf86PciStdIds.h
index ff8f3d14a..2def7da9a 100644
--- a/hw/xfree86/scanpci/xf86PciStdIds.h
+++ b/hw/xfree86/scanpci/xf86PciStdIds.h
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86PciStdIds.h,v 1.14 2003/10/30 15:26:34 tsi Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/scanpci/xf86PciStdIds.h,v 1.15 2003/12/18 16:32:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86PciStdIds.h,v 1.15 2003/12/18 16:32:45 dawes Exp $ */
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT
@@ -171,6 +172,12 @@ static const char pci_subsys_1000_000f_1092_8760[] = "FirePort 40 Dual SCSI Cont
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1000_000f_1de1_3904[] = "DC390F Ultra Wide SCSI Controller";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_000f_4c53_1000[] = "CC7/CR7/CP7/VC7/VP7/VR7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_000f_4c53_1050[] = "CT7 mainboard";
+#endif
 static const char pci_device_1000_0010[] = "53c895";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -189,6 +196,15 @@ static const char pci_device_1000_0020[] = "53c1010 Ultra3 SCSI Adapter";
 static const char pci_subsys_1000_0020_1de1_1020[] = "DC-390U3W";
 #endif
 static const char pci_device_1000_0021[] = "53c1010 66MHz  Ultra3 SCSI Adapter";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0021_4c53_1080[] = "CT8 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0021_4c53_1300[] = "P017 mezzanine (32-bit PMC)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0021_4c53_1310[] = "P017 mezzanine (64-bit PMC)";
+#endif
 static const char pci_device_1000_0030[] = "53c1030 PCI-X Fusion-MPT Dual Ultra320 SCSI";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -259,6 +275,7 @@ static const char pci_device_1002_4145[] = "Radeon R300 AE [Radeon 9500 Pro]";
 static const char pci_device_1002_4146[] = "Radeon R300 AF [Radeon 9500 Pro]";
 static const char pci_device_1002_4147[] = "Radeon R300 AG [FireGL Z1/X1]";
 static const char pci_device_1002_4158[] = "68800AX [Mach32]";
+static const char pci_device_1002_4164[] = "Radeon R300 Secondary (DVI) output";
 static const char pci_device_1002_4242[] = "Radeon R200 BB [Radeon All in Wonder 8500DV]";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_4242_1002_02aa[] = "Radeon 8500 AIW DV Edition";
@@ -386,6 +403,9 @@ static const char pci_subsys_1002_4752_1002_4752[] = "Rage XL";
 static const char pci_subsys_1002_4752_1002_8008[] = "Rage XL";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_4752_1028_00ce[] = "PowerEdge 1400";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_4752_1028_00d1[] = "PowerEdge 2550";
 #endif
 static const char pci_device_1002_4753[] = "Rage XC";
@@ -477,6 +497,9 @@ static const char pci_subsys_1002_4c42_1028_0085[] = "Rage 3D LT Pro";
 static const char pci_device_1002_4c44[] = "3D Rage LT Pro AGP-66";
 static const char pci_device_1002_4c45[] = "Rage Mobility M3 AGP";
 static const char pci_device_1002_4c46[] = "Rage Mobility M3 AGP 2x";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_4c46_1028_00b1[] = "Latitude C600";
+#endif
 static const char pci_device_1002_4c47[] = "3D Rage LT-G 215LG";
 static const char pci_device_1002_4c49[] = "3D Rage LT Pro";
 #ifdef INIT_SUBSYS_INFO
@@ -496,11 +519,17 @@ static const char pci_device_1002_4c4d[] = "Rage Mobility P/M AGP 2x";
 static const char pci_subsys_1002_4c4d_0e11_b111[] = "Armada M700";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_4c4d_0e11_b160[] = "Armada E500";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_4c4d_1002_0084[] = "Xpert 98 AGP 2X (Mobility)";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_4c4d_1014_0154[] = "ThinkPad A20m";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_4c4d_1028_00aa[] = "Latitude CPt";
+#endif
 static const char pci_device_1002_4c4e[] = "Rage Mobility L AGP 2x";
 static const char pci_device_1002_4c50[] = "3D Rage LT Pro";
 #ifdef INIT_SUBSYS_INFO
@@ -536,6 +565,7 @@ static const char pci_device_1002_4c64[] = "Radeon R250 Ld [Radeon Mobility 9000
 static const char pci_device_1002_4c65[] = "Radeon R250 Le [Radeon Mobility 9000 M9]";
 static const char pci_device_1002_4c66[] = "Radeon R250 Lf [Radeon Mobility 9000 M9]";
 static const char pci_device_1002_4c67[] = "Radeon R250 Lg [Radeon Mobility 9000 M9]";
+static const char pci_device_1002_4c6e[] = "Radeon R250 Ln [Radeon Mobility 9000 M9] [Secondary]";
 static const char pci_device_1002_4d46[] = "Rage Mobility M4 AGP";
 static const char pci_device_1002_4d4c[] = "Rage Mobility M4 AGP";
 static const char pci_device_1002_4e44[] = "Radeon R300 ND [Radeon 9700 Pro]";
@@ -548,6 +578,9 @@ static const char pci_device_1002_4e47[] = "Radeon R300 NG [FireGL X1]";
 static const char pci_device_1002_4e48[] = "Radeon R350 [Radeon 9800]";
 static const char pci_device_1002_4e64[] = "Radeon R300 [Radeon 9700 Pro] (Secondary)";
 static const char pci_device_1002_4e65[] = "Radeon R300 [Radeon 9500 Pro] (Secondary)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_4e65_1002_0003[] = "Radeon R300 NE [Radeon 9500 Pro]";
+#endif
 static const char pci_device_1002_4e66[] = "Radeon R300 [Radeon 9700] (Secondary)";
 static const char pci_device_1002_4e67[] = "Radeon R300 [FireGL X1] (Secondary)";
 static const char pci_device_1002_4e68[] = "Radeon R350 [Radeon 9800] (Secondary)";
@@ -856,8 +889,10 @@ static const char pci_subsys_1002_5654_1002_5654[] = "Mach64VT Reference";
 #endif
 static const char pci_device_1002_5655[] = "264VT3 [Mach64 VT3]";
 static const char pci_device_1002_5656[] = "264VT4 [Mach64 VT4]";
+static const char pci_device_1002_5961[] = "Radeon RV280 [Radeon 9200]";
 static const char pci_device_1002_700f[] = "PCI Bridge [IGP 320M]";
 static const char pci_device_1002_7010[] = "PCI Bridge [IGP 340M]";
+static const char pci_device_1002_cab0[] = "AGP Bridge [IGP 320M]";
 static const char pci_device_1002_cab2[] = "RS200/RS200M AGP Bridge [IGP 340M]";
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1003[] = "ULSI Systems";
@@ -942,7 +977,16 @@ static const char pci_device_100b_000f[] = "FireWire Controller";
 static const char pci_device_100b_0011[] = "NS87560 National PCI System I/O";
 static const char pci_device_100b_0012[] = "USB Controller";
 static const char pci_device_100b_0020[] = "DP83815 (MacPhyter) Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_100b_0020_1385_f311[] = "FA311 / FA312 (FA311 with WoL HW)";
+#endif
 static const char pci_device_100b_0022[] = "DP83820 10/100/1000 Ethernet Controller";
+static const char pci_device_100b_0028[] = "CS5535 Host bridge";
+static const char pci_device_100b_002b[] = "CS5535 ISA bridge";
+static const char pci_device_100b_002d[] = "CS5535 IDE";
+static const char pci_device_100b_002e[] = "CS5535 Audio";
+static const char pci_device_100b_002f[] = "CS5535 USB";
+static const char pci_device_100b_0030[] = "CS5535 Video";
 static const char pci_device_100b_0500[] = "SCx200 Bridge";
 static const char pci_device_100b_0501[] = "SCx200 SMI";
 static const char pci_device_100b_0502[] = "SCx200 IDE";
@@ -1159,7 +1203,13 @@ static const char pci_subsys_1011_0046_0e11_4058[] = "Integrated Smart Array";
 static const char pci_subsys_1011_0046_103c_10c2[] = "Hewlett-Packard NetRAID-4M";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1011_0046_12d9_000a[] = "VoIP PCI Gateway";
+static const char pci_subsys_1011_0046_12d9_000a[] = "IP Telephony card";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1011_0046_4c53_1050[] = "CT7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1011_0046_4c53_1051[] = "CE7 mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1011_0046_9005_0365[] = "Adaptec 5400S";
@@ -1272,18 +1322,20 @@ static const char pci_device_1014_0018[] = "TR Auto LANstreamer";
 static const char pci_device_1014_001b[] = "GXT-150P";
 static const char pci_device_1014_001c[] = "Carrera";
 static const char pci_device_1014_001d[] = "82G2675";
-static const char pci_device_1014_0020[] = "MCA";
+static const char pci_device_1014_0020[] = "GXT1000 Graphics Adapter";
 static const char pci_device_1014_0022[] = "IBM27-82351";
 static const char pci_device_1014_002d[] = "Python";
-static const char pci_device_1014_002e[] = "ServeRAID Controller";
+static const char pci_device_1014_002e[] = "SCSI RAID Adapter [ServeRAID]";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1014_002e_1014_002e[] = "ServeRAID-3x";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1014_002e_1014_022e[] = "ServeRAID-4H";
 #endif
+static const char pci_device_1014_0031[] = "2 Port Serial Adapter";
 static const char pci_device_1014_0036[] = "Miami";
 static const char pci_device_1014_003a[] = "CPU to PCI Bridge";
+static const char pci_device_1014_003c[] = "GXT250P/GXT255P Graphics Adapter";
 static const char pci_device_1014_003e[] = "16/4 Token ring UTP/STP controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1014_003e_1014_003e[] = "Token-Ring Adapter";
@@ -1315,14 +1367,18 @@ static const char pci_device_1014_004e[] = "ATM Controller (14104e00)";
 static const char pci_device_1014_004f[] = "ATM Controller (14104f00)";
 static const char pci_device_1014_0050[] = "ATM Controller (14105000)";
 static const char pci_device_1014_0053[] = "25 MBit ATM Controller";
+static const char pci_device_1014_0054[] = "GXT500P/GXT550P Graphics Adapter";
 static const char pci_device_1014_0057[] = "MPEG PCI Bridge";
 static const char pci_device_1014_005c[] = "i82557B 10/100";
+static const char pci_device_1014_005e[] = "GXT800P Graphics Adapter";
 static const char pci_device_1014_007c[] = "ATM Controller (14107c00)";
 static const char pci_device_1014_007d[] = "3780IDSP [MWave]";
+static const char pci_device_1014_008e[] = "GXT3000P Graphics Adapter";
 static const char pci_device_1014_0090[] = "GXT 3000P";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1014_0090_1014_008e[] = "GXT-3000P";
 #endif
+static const char pci_device_1014_0091[] = "SSA Adapter";
 static const char pci_device_1014_0095[] = "20H2999 PCI Docking Bridge";
 static const char pci_device_1014_0096[] = "Chukar chipset SCSI controller";
 #ifdef INIT_SUBSYS_INFO
@@ -1334,12 +1390,15 @@ static const char pci_subsys_1014_0096_1014_0098[] = "iSeries 2763 DASD IOA";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1014_0096_1014_0099[] = "iSeries 2748 DASD IOA";
 #endif
+static const char pci_device_1014_009f[] = "PCI 4758 Cryptographic Accelerator";
 static const char pci_device_1014_00a5[] = "ATM Controller (1410a500)";
 static const char pci_device_1014_00a6[] = "ATM 155MBPS MM Controller (1410a600)";
 static const char pci_device_1014_00b7[] = "256-bit Graphics Rasterizer [Fire GL1]";
+static const char pci_device_1014_00b8[] = "GXT2000P Graphics Adapter";
 static const char pci_device_1014_00be[] = "ATM 622MBPS Controller (1410be00)";
 static const char pci_device_1014_00dc[] = "Advanced Systems Management Adapter (ASMA)";
 static const char pci_device_1014_00fc[] = "CPC710 Dual Bridge and Memory Controller (PCI-64)";
+static const char pci_device_1014_0104[] = "Gigabit Ethernet-SX Adapter";
 static const char pci_device_1014_0105[] = "CPC710 Dual Bridge and Memory Controller (PCI-32)";
 static const char pci_device_1014_010f[] = "Remote Supervisor Adapter (RSA)";
 static const char pci_device_1014_0142[] = "Yotta Video Compositor Input";
@@ -1351,6 +1410,18 @@ static const char pci_device_1014_0144[] = "Yotta Video Compositor Output";
 static const char pci_subsys_1014_0144_1014_0145[] = "Yotta Output Controller (ytout)";
 #endif
 static const char pci_device_1014_0156[] = "405GP PLB to PCI Bridge";
+static const char pci_device_1014_015e[] = "622Mbps ATM PCI Adapter";
+static const char pci_device_1014_0160[] = "64bit/66MHz PCI ATM 155 MMF";
+static const char pci_device_1014_016e[] = "GXT4000P Graphics Adapter";
+static const char pci_device_1014_0170[] = "GXT6000P Graphics Adapter";
+static const char pci_device_1014_017d[] = "GXT300P Graphics Adapter";
+static const char pci_device_1014_0180[] = "Snipe chipset SCSI controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1014_0180_1014_0241[] = "iSeries 2757 DASD IOA";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1014_0180_1014_0264[] = "Quad Channel PCI-X U320 SCSI RAID Adapter (2780)";
+#endif
 static const char pci_device_1014_01a7[] = "PCI-X to PCI-X Bridge";
 static const char pci_device_1014_01bd[] = "ServeRAID Controller";
 #ifdef INIT_SUBSYS_INFO
@@ -1374,6 +1445,25 @@ static const char pci_subsys_1014_01bd_1014_0258[] = "ServeRAID-5i";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1014_01bd_1014_0259[] = "ServeRAID-5i";
 #endif
+static const char pci_device_1014_01c1[] = "64bit/66MHz PCI ATM 155 UTP";
+static const char pci_device_1014_01e6[] = "Cryptographic Accelerator";
+static const char pci_device_1014_01ff[] = "10/100 Mbps Ethernet";
+static const char pci_device_1014_0219[] = "Multiport Serial Adapter";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1014_0219_1014_021a[] = "Dual RVX";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1014_0219_1014_0251[] = "Internal Modem/RVX";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1014_0219_1014_0252[] = "Quad Internal Modem";
+#endif
+static const char pci_device_1014_021b[] = "GXT6500P Graphics Adapter";
+static const char pci_device_1014_021c[] = "GXT4500P Graphics Adapter";
+static const char pci_device_1014_0233[] = "GXT135P Graphics Adapter";
+static const char pci_device_1014_0266[] = "PCI-X Dual Channel SCSI";
+static const char pci_device_1014_0268[] = "Gigabit Ethernet-SX Adapter (PCI-X)";
+static const char pci_device_1014_0269[] = "10/100/1000 Base-TX Ethernet Adapter (PCI-X)";
 static const char pci_device_1014_0302[] = "XA-32 chipset [Summit]";
 static const char pci_device_1014_ffff[] = "MPIC-2 interrupt controller";
 #endif
@@ -1509,6 +1599,24 @@ static const char pci_subsys_1022_2000_1259_2700[] = "AT-2700TX 10/100 Fast Ethe
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1022_2000_1259_2701[] = "AT-2700FX 100Mb Ethernet";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1022_2000_4c53_1000[] = "CC7/CR7/CP7/VC7/VP7/VR7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1022_2000_4c53_1010[] = "CP5/CR6 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1022_2000_4c53_1020[] = "VR6 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1022_2000_4c53_1030[] = "PC5 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1022_2000_4c53_1040[] = "CL7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1022_2000_4c53_1060[] = "PC7 mainboard";
+#endif
 static const char pci_device_1022_2001[] = "79c978 [HomePNA]";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1022_2001_1092_0a78[] = "Multimedia Home Network Adapter";
@@ -1516,6 +1624,7 @@ static const char pci_subsys_1022_2001_1092_0a78[] = "Multimedia Home Network Ad
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1022_2001_1668_0299[] = "ActionLink Home Network Adapter";
 #endif
+static const char pci_device_1022_2003[] = "Am 1771 MBW [Alchemy]";
 static const char pci_device_1022_2020[] = "53c974 [PCscsi]";
 static const char pci_device_1022_2040[] = "79c974";
 static const char pci_device_1022_3000[] = "ELanSC520 Microcontroller";
@@ -1564,6 +1673,7 @@ static const char pci_device_1022_746a[] = "AMD-8111 SMBus 2.0";
 static const char pci_device_1022_746b[] = "AMD-8111 ACPI";
 static const char pci_device_1022_746d[] = "AMD-8111 AC97 Audio";
 static const char pci_device_1022_746e[] = "AMD-8111 MC97 Modem";
+static const char pci_device_1022_756b[] = "AMD-8111 ACPI";
 static const char pci_vendor_1023[] = "Trident Microsystems";
 static const char pci_device_1023_0194[] = "82C194";
 static const char pci_device_1023_2000[] = "4DWave DX";
@@ -2097,6 +2207,24 @@ static const char pci_device_102c_00c0[] = "F69000 HiQVideo";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_102c_00c0_102c_00c0[] = "F69000 HiQVideo";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_102c_00c0_4c53_1000[] = "CC7/CR7/CP7/VC7/VP7/VR7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_102c_00c0_4c53_1010[] = "CP5/CR6 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_102c_00c0_4c53_1020[] = "VR6 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_102c_00c0_4c53_1030[] = "PC5 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_102c_00c0_4c53_1050[] = "CT7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_102c_00c0_4c53_1051[] = "CE7 mainboard";
+#endif
 static const char pci_device_102c_00d0[] = "F65545";
 static const char pci_device_102c_00d8[] = "F65545";
 static const char pci_device_102c_00dc[] = "F65548";
@@ -2110,6 +2238,18 @@ static const char pci_device_102c_00f0[] = "F68554";
 static const char pci_device_102c_00f4[] = "F68554 HiQVision";
 static const char pci_device_102c_00f5[] = "F68555";
 static const char pci_device_102c_0c30[] = "F69030";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_102c_0c30_4c53_1000[] = "CC7/CR7/CP7/VC7/VP7/VR7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_102c_0c30_4c53_1050[] = "CT7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_102c_0c30_4c53_1051[] = "CE7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_102c_0c30_4c53_1080[] = "CT8 mainboard";
+#endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_102d[] = "Wyse Technology Inc.";
 static const char pci_device_102d_50dc[] = "3328 Audio";
@@ -2137,6 +2277,7 @@ static const char pci_device_1031_6057[] = "MiroVideo DC10/DC30+";
 static const char pci_vendor_1032[] = "Compaq";
 #endif
 static const char pci_vendor_1033[] = "NEC Corporation";
+static const char pci_device_1033_0000[] = "Vr4181A USB Host or Function Control Unit";
 static const char pci_device_1033_0001[] = "PCI to 486-like bus Bridge";
 static const char pci_device_1033_0002[] = "PCI to VL98 Bridge";
 static const char pci_device_1033_0003[] = "ATM Controller";
@@ -2203,6 +2344,7 @@ static const char pci_device_1033_00cd[] = "IEEE 1394 [OrangeLink] Host Controll
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1033_00cd_12ee_8011[] = "Root hub";
 #endif
+static const char pci_device_1033_00df[] = "Vr4131";
 static const char pci_device_1033_00e0[] = "USB 2.0";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1033_00e0_12ee_7001[] = "Root hub";
@@ -2210,6 +2352,7 @@ static const char pci_subsys_1033_00e0_12ee_7001[] = "Root hub";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1033_00e0_1799_0002[] = "Root Hub";
 #endif
+static const char pci_device_1033_00f3[] = "uPD6113x Multimedia Decoder/Processor [EMMA2]";
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1034[] = "Framatome Connectors USA Inc.";
 #endif
@@ -2267,11 +2410,15 @@ static const char pci_device_1039_0733[] = "733 Host";
 static const char pci_device_1039_0735[] = "735 Host";
 static const char pci_device_1039_0740[] = "740 Host";
 static const char pci_device_1039_0745[] = "745 Host";
+static const char pci_device_1039_0746[] = "746 Host";
 static const char pci_device_1039_0755[] = "SiS 755 Host Bridge";
 static const char pci_device_1039_0900[] = "SiS900 10/100 Ethernet";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1039_0900_1039_0900[] = "SiS900 10/100 Ethernet Adapter";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1039_0900_1043_8035[] = "CUSI-FX motherboard";
+#endif
 static const char pci_device_1039_0961[] = "SiS961 [MuTIOL Media IO]";
 static const char pci_device_1039_0962[] = "SiS962 [MuTIOL Media IO]";
 static const char pci_device_1039_3602[] = "83C602";
@@ -2287,6 +2434,9 @@ static const char pci_subsys_1039_5513_1019_0970[] = "P6STP-FL motherboard";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1039_5513_1039_5513[] = "SiS5513 EIDE Controller (A,B step)";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1039_5513_1043_8035[] = "CUSI-FX motherboard";
+#endif
 static const char pci_device_1039_5517[] = "5517";
 static const char pci_device_1039_5571[] = "5571";
 static const char pci_device_1039_5581[] = "5581 Pentium Chipset";
@@ -2302,6 +2452,9 @@ static const char pci_device_1039_6300[] = "SiS630 GUI Accelerator+3D";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1039_6300_1019_0970[] = "P6STP-FL motherboard";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1039_6300_1043_8035[] = "CUSI-FX motherboard";
+#endif
 static const char pci_device_1039_6306[] = "SiS530 3D PCI/AGP";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1039_6306_1039_6306[] = "SiS530,620 GUI Accelerator+3D";
@@ -2408,6 +2561,7 @@ static const char pci_subsys_1039_7018_270f_a171[] = "SiS PCI Audio Accelerator"
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1039_7018_a0a0_0022[] = "SiS PCI Audio Accelerator";
 #endif
+static const char pci_device_1039_7019[] = "SiS7019 Audio Accelerator";
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_103a[] = "Seiko Epson Corporation";
 #endif
@@ -2516,6 +2670,7 @@ static const char pci_device_1042_3020[] = "Samurai_IDE";
 static const char pci_vendor_1043[] = "Asustek Computer, Inc.";
 static const char pci_device_1043_0675[] = "ISDNLink P-IN100-ST-D";
 static const char pci_device_1043_4021[] = "v7100 Combo Deluxe [GeForce2 MX + TV tuner]";
+static const char pci_device_1043_4057[] = "v8200 GeForce 3";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1044[] = "Distributed Processing Technology";
@@ -2651,7 +2806,7 @@ static const char pci_device_1045_c825[] = "82C825 [Firebridge 2]";
 static const char pci_device_1045_c832[] = "82C832";
 static const char pci_device_1045_c861[] = "82C861";
 static const char pci_device_1045_c895[] = "82C895";
-static const char pci_device_1045_c935[] = "EV1935 ECTIVA MachOne PCI Audio";
+static const char pci_device_1045_c935[] = "EV1935 ECTIVA MachOne PCIAudio";
 static const char pci_device_1045_d568[] = "82C825 [Firebridge 2]";
 static const char pci_device_1045_d721[] = "IDE [FireStar]";
 #endif
@@ -2670,15 +2825,22 @@ static const char pci_device_1048_3000[] = "QuickStep 3000";
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1049[] = "Fountain Technologies, Inc.";
 #endif
-static const char pci_vendor_104a[] = "SGS Thomson Microelectronics";
+static const char pci_vendor_104a[] = "STMicroelectronics";
 static const char pci_device_104a_0008[] = "STG 2000X";
 static const char pci_device_104a_0009[] = "STG 1764X";
 static const char pci_device_104a_0010[] = "STG4000 [3D Prophet Kyro Series]";
+static const char pci_device_104a_0209[] = "STPC Consumer/Industrial North- and Southbridge";
+static const char pci_device_104a_020a[] = "STPC Atlas/ConsumerS/Consumer IIA Northbridge";
 static const char pci_device_104a_0210[] = "STPC Atlas ISA Bridge";
+static const char pci_device_104a_021a[] = "STPC Consumer S Southbridge";
+static const char pci_device_104a_021b[] = "STPC Consumer IIA Southbridge";
+static const char pci_device_104a_0500[] = "ST70137 [Unicorn] ADSL DMT Transceiver";
+static const char pci_device_104a_0564[] = "STPC Client Northbridge";
 static const char pci_device_104a_0981[] = "DEC-Tulip compatible 10/100 Ethernet";
 static const char pci_device_104a_1746[] = "STG 1764X";
 static const char pci_device_104a_2774[] = "DEC-Tulip compatible 10/100 Ethernet";
 static const char pci_device_104a_3520[] = "MPEG-II decoder card";
+static const char pci_device_104a_55cc[] = "STPC Client Southbridge";
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_104b[] = "BusLogic";
 static const char pci_device_104b_0140[] = "BT-946C (old) [multimaster  01]";
@@ -2793,7 +2955,10 @@ static const char pci_device_104c_8027[] = "PCI4451 IEEE-1394 Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_104c_8027_1028_00e6[] = "PCI4451 IEEE-1394 Controller (Dell Inspiron 8100)";
 #endif
+static const char pci_device_104c_8029[] = "PCI4510 IEEE-1394 Controller";
 static const char pci_device_104c_8400[] = "ACX 100 22Mbps Wireless Interface";
+static const char pci_device_104c_8401[] = "ACX 100 22Mbps Wireless Interface";
+static const char pci_device_104c_9000[] = "Wireless Interface (of unknown type)";
 static const char pci_device_104c_a001[] = "TDC1570";
 static const char pci_device_104c_a100[] = "TDC1561";
 static const char pci_device_104c_a102[] = "TNETA1575 HyperSAR Plus w/PCI Host i/f & UTOPIA i/f";
@@ -2813,6 +2978,9 @@ static const char pci_device_104c_ac1b[] = "PCI1450";
 static const char pci_subsys_104c_ac1b_0e11_b113[] = "Armada M700";
 #endif
 static const char pci_device_104c_ac1c[] = "PCI1225";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_104c_ac1c_0e11_b121[] = "Armada E500";
+#endif
 static const char pci_device_104c_ac1d[] = "PCI1251A";
 static const char pci_device_104c_ac1e[] = "PCI1211";
 static const char pci_device_104c_ac1f[] = "PCI1251B";
@@ -2828,12 +2996,16 @@ static const char pci_device_104c_ac42[] = "PCI4451 PC card Cardbus Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_104c_ac42_1028_00e6[] = "PCI4451 PC card CardBus Controller (Dell Inspiron 8100)";
 #endif
+static const char pci_device_104c_ac44[] = "PCI4510 PC card Cardbus Controller";
 static const char pci_device_104c_ac50[] = "PCI1410 PC card Cardbus Controller";
 static const char pci_device_104c_ac51[] = "PCI1420";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_104c_ac51_1014_023b[] = "ThinkPad T23 (2647-4MG)";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_104c_ac51_1028_00b1[] = "Latitude C600";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_104c_ac51_10cf_1095[] = "Lifebook C6155";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -2991,6 +3163,7 @@ static const char pci_device_105a_0d38[] = "20263";
 static const char pci_subsys_105a_0d38_105a_4d39[] = "Fasttrak66";
 #endif
 static const char pci_device_105a_1275[] = "20275";
+static const char pci_device_105a_3318[] = "PDC20318 (SATA150 TX4)";
 static const char pci_device_105a_3376[] = "PDC20376";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_105a_3376_1043_809e[] = "A7V8X motherboard";
@@ -3035,6 +3208,7 @@ static const char pci_device_105a_6269[] = "PDC20271";
 static const char pci_subsys_105a_6269_105a_6269[] = "FastTrak TX2/TX2000";
 #endif
 static const char pci_device_105a_6621[] = "PDC20621 [SX4000] 4 Channel IDE RAID Controller";
+static const char pci_device_105a_6629[] = "PDC20619 FastTrak TX4000 RAID";
 static const char pci_device_105a_7275[] = "PDC20277";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -3209,6 +3383,7 @@ static const char pci_device_1069_0001[] = "DAC960P";
 static const char pci_device_1069_0002[] = "DAC960PD";
 static const char pci_device_1069_0010[] = "DAC960PX";
 static const char pci_device_1069_0050[] = "AcceleRAID 352/170/160 support Device";
+static const char pci_device_1069_b166[] = "Gemstone chipset SCSI controller";
 static const char pci_device_1069_ba55[] = "eXtremeRAID 1100 support Device";
 static const char pci_device_1069_ba56[] = "eXtremeRAID 2000/3000 support Device";
 #endif
@@ -3551,6 +3726,8 @@ static const char pci_device_1093_1180[] = "PCI-MIO-16E-1";
 static const char pci_device_1093_1190[] = "PCI-MIO-16E-4";
 static const char pci_device_1093_1330[] = "PCI-6031E";
 static const char pci_device_1093_1350[] = "PCI-6071E";
+static const char pci_device_1093_17d0[] = "PCI-6503";
+static const char pci_device_1093_2410[] = "PCI-6733";
 static const char pci_device_1093_2a60[] = "PCI-6023E";
 static const char pci_device_1093_b001[] = "IMAQ-PCI-1408";
 static const char pci_device_1093_b011[] = "IMAQ-PXI-1408";
@@ -4167,6 +4344,9 @@ static const char pci_device_10b5_9054[] = "PCI <-> IOBus Bridge";
 static const char pci_subsys_10b5_9054_10b5_2455[] = "Wessex Techology PHIL-PCI";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10b5_9054_10b5_2696[] = "Innes Corp AM Radcap card";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10b5_9054_12d9_0002[] = "PCI Prosody Card rev 1.5";
 #endif
 static const char pci_device_10b5_9060[] = "9060";
@@ -4185,6 +4365,7 @@ static const char pci_subsys_10b5_9080_129d_0002[] = "Aculab PCI Prosidy card";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10b5_9080_12d9_0002[] = "PCI Prosody Card";
 #endif
+static const char pci_device_10b5_bb04[] = "B&B 3PCIOSD1A Isolated PCI Serial";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_10b6[] = "Madge Networks";
@@ -4248,6 +4429,7 @@ static const char pci_device_10b7_1007[] = "Mini PCI 56k Winmodem";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10b7_1007_10b7_615c[] = "Mini PCI 56K Modem";
 #endif
+static const char pci_device_10b7_1700[] = "3c940 1000Base?";
 static const char pci_device_10b7_3390[] = "3c339 TokenLink Velocity";
 static const char pci_device_10b7_3590[] = "3c359 TokenLink Velocity XL";
 #ifdef INIT_SUBSYS_INFO
@@ -4300,6 +4482,7 @@ static const char pci_subsys_10b7_6563_10b7_656b[] = "3CCFEM656 10/100 LAN+56K M
 #endif
 static const char pci_device_10b7_6564[] = "3CCFEM656 [id 6564] Cyclone CardBus";
 static const char pci_device_10b7_7646[] = "3cSOHO100-TX Hurricane";
+static const char pci_device_10b7_7770[] = "3CRWE777 PCI(PLX) Wireless Adaptor [Airconnect]";
 static const char pci_device_10b7_7940[] = "3c803 FDDILink UTP Controller";
 static const char pci_device_10b7_7980[] = "3c804 FDDILink SAS Controller";
 static const char pci_device_10b7_7990[] = "3c805 FDDILink DAS Controller";
@@ -4428,7 +4611,12 @@ static const char pci_device_10b7_905a[] = "3c905B-FX [Fast Etherlink XL FX 10/1
 static const char pci_device_10b7_9200[] = "3c905C-TX/TX-M [Tornado]";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_10b7_9200_1028_0095[] = "Integrated 3C905C-TX Fast Etherlink for PC Management NIC";
+static const char pci_subsys_10b7_9200_1028_0095[] = "3C920 Integrated Fast Ethernet Controller";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10b7_9200_1028_0097[] = "3C920 Integrated Fast Ethernet Controller";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 #ifdef INIT_SUBSYS_INFO
@@ -4783,7 +4971,9 @@ static const char pci_vendor_10ca[] = "Fujitsu Microelectr., Inc.";
 static const char pci_vendor_10cb[] = "Omron Corporation";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
-static const char pci_vendor_10cc[] = "Mentor ARC Inc";
+static const char pci_vendor_10cc[] = "Mai Logic Incorporated";
+static const char pci_device_10cc_0660[] = "Articia S Host Bridge";
+static const char pci_device_10cc_0661[] = "Articia S PCI Bridge";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_10cd[] = "Advanced System Products, Inc";
@@ -4800,13 +4990,10 @@ static const char pci_device_10cd_2500[] = "ABP940-U2W";
 static const char pci_vendor_10ce[] = "Radius";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
-static const char pci_vendor_10cf[] = "Citicorp TTI";
+static const char pci_vendor_10cf[] = "Fujitsu Limited.";
 static const char pci_device_10cf_2001[] = "mb86605";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
-static const char pci_vendor_10d0[] = "Fujitsu Limited";
-#endif
-#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_10d1[] = "FuturePlus Systems Corp.";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -5066,11 +5253,23 @@ static const char pci_subsys_10de_0068_1043_0c11[] = "A7N8X Mainboard";
 #endif
 static const char pci_device_10de_006a[] = "nForce2 AC97 Audio Controler (MCP)";
 static const char pci_device_10de_006b[] = "nForce MultiMedia audio [Via VT82C686B]";
+static const char pci_device_10de_006c[] = "nForce2 External PCI Bridge";
+static const char pci_device_10de_006d[] = "nForce2 PCI Bridge";
 static const char pci_device_10de_006e[] = "nForce2 FireWire (IEEE 1394) Controller";
 static const char pci_device_10de_00a0[] = "NV5 [Aladdin TNT2]";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10de_00a0_14af_5810[] = "Maxi Gamer Xentor";
 #endif
+static const char pci_device_10de_00d0[] = "nForce3 LPC Bridge";
+static const char pci_device_10de_00d1[] = "nForce3 Host Bridge";
+static const char pci_device_10de_00d2[] = "nForce3 AGP Bridge";
+static const char pci_device_10de_00d4[] = "nForce3 SMBus";
+static const char pci_device_10de_00d5[] = "nForce3 IDE";
+static const char pci_device_10de_00d6[] = "nForce3 Ethernet";
+static const char pci_device_10de_00d7[] = "nForce3 USB 1.1";
+static const char pci_device_10de_00d8[] = "nForce3 USB 2.0";
+static const char pci_device_10de_00da[] = "nForce3 Audio";
+static const char pci_device_10de_00dd[] = "nForce3 PCI Bridge";
 static const char pci_device_10de_0100[] = "NV10 [GeForce 256 SDR]";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10de_0100_1043_0200[] = "AGP-V6600 SGRAM";
@@ -5101,6 +5300,9 @@ static const char pci_subsys_10de_0101_1043_400a[] = "AGP-V6800 DDR SGRAM";
 static const char pci_subsys_10de_0101_1043_400b[] = "AGP-V6800 DDR SDRAM";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10de_0101_107d_2822[] = "WinFast GeForce 256";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10de_0101_1102_102e[] = "CT6971 GeForce 256 DDR";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -5170,12 +5372,18 @@ static const char pci_device_10de_017a[] = "NV17GL [Quadro4 200/400 NVS]";
 static const char pci_device_10de_017b[] = "NV17GL [Quadro4 550 XGL]";
 static const char pci_device_10de_017c[] = "NV17GL [Quadro4 550 GoGL]";
 static const char pci_device_10de_0181[] = "NV18 [GeForce4 MX 440 AGP 8x]";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10de_0181_1043_806f[] = "V9180 Magic";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10de_0181_1462_8880[] = "MS-StarForce GeForce4 MX 440 with AGP8X";
+#endif
 static const char pci_device_10de_0182[] = "NV18 [GeForce4 MX 440SE AGP 8x]";
 static const char pci_device_10de_0183[] = "NV18 [GeForce4 MX 420 AGP 8x]";
 static const char pci_device_10de_0188[] = "NV18GL [Quadro4 580 XGL]";
-static const char pci_device_10de_018a[] = "NV18GL [Quadro4 NVS]";
+static const char pci_device_10de_018a[] = "NV18GL [Quadro4 NVS AGP 8x]";
 static const char pci_device_10de_018b[] = "NV18GL [Quadro4 380 XGL]";
-static const char pci_device_10de_01a0[] = "NV15 [GeForce2 - nForce GPU]";
+static const char pci_device_10de_01a0[] = "NVCrush11 [GeForce2 MX Integrated Graphics]";
 static const char pci_device_10de_01a4[] = "nForce CPU bridge";
 static const char pci_device_10de_01ab[] = "nForce 420 Memory Controller (DDR)";
 static const char pci_device_10de_01ac[] = "nForce 220/420 Memory Controller";
@@ -5189,7 +5397,14 @@ static const char pci_device_10de_01bc[] = "nForce IDE";
 static const char pci_device_10de_01c1[] = "Intel 537 [nForce MC97 Modem]";
 static const char pci_device_10de_01c2[] = "nForce USB Controller";
 static const char pci_device_10de_01c3[] = "nForce Ethernet Controller";
+static const char pci_device_10de_01e0[] = "nForce2 AGP (different version?)";
 static const char pci_device_10de_01e8[] = "nForce2 AGP";
+static const char pci_device_10de_01ea[] = "nForce2 Memory Controller 0";
+static const char pci_device_10de_01eb[] = "nForce2 Memory Controller 1";
+static const char pci_device_10de_01ec[] = "nForce2 Memory Controller 2";
+static const char pci_device_10de_01ed[] = "nForce2 Memory Controller 3";
+static const char pci_device_10de_01ee[] = "nForce2 Memory Controller 4";
+static const char pci_device_10de_01ef[] = "nForce2 Memory Controller 5";
 static const char pci_device_10de_01f0[] = "NV18 [GeForce4 MX - nForce GPU]";
 static const char pci_device_10de_0200[] = "NV20 [GeForce3]";
 #ifdef INIT_SUBSYS_INFO
@@ -5220,6 +5435,7 @@ static const char pci_device_10de_025b[] = "NV25GL [Quadro4 700 XGL]";
 static const char pci_device_10de_0280[] = "NV28 [GeForce4 Ti 4800]";
 static const char pci_device_10de_0281[] = "NV28 [GeForce4 Ti 4200 AGP 8x]";
 static const char pci_device_10de_0282[] = "NV28 [GeForce4 Ti 4800 SE]";
+static const char pci_device_10de_0286[] = "NV28 [GeForce4 Ti 4200 Go AGP 8x]";
 static const char pci_device_10de_0288[] = "NV28GL [Quadro4 980 XGL]";
 static const char pci_device_10de_0289[] = "NV28GL [Quadro4 780 XGL]";
 static const char pci_device_10de_0300[] = "NV30 [GeForce FX]";
@@ -5227,6 +5443,31 @@ static const char pci_device_10de_0301[] = "NV30 [GeForce FX 5800 Ultra]";
 static const char pci_device_10de_0302[] = "NV30 [GeForce FX 5800]";
 static const char pci_device_10de_0308[] = "NV30GL [Quadro FX 2000]";
 static const char pci_device_10de_0309[] = "NV30GL [Quadro FX 1000]";
+static const char pci_device_10de_0311[] = "NV31 [GeForce FX 5600 Ultra]";
+static const char pci_device_10de_0312[] = "NV31 [GeForce FX 5600]";
+static const char pci_device_10de_0314[] = "GeForce FX 5600SE";
+static const char pci_device_10de_031a[] = "GeForce FX Go5600";
+static const char pci_device_10de_031b[] = "GeForce FX Go5650";
+static const char pci_device_10de_031c[] = "Quadro FX Go700";
+static const char pci_device_10de_0321[] = "NV34 [GeForce FX 5200 Ultra]";
+static const char pci_device_10de_0322[] = "NV34 [GeForce FX 5200]";
+static const char pci_device_10de_0323[] = "GeForce FX 5200SE";
+static const char pci_device_10de_0324[] = "GeForce FX Go5200";
+static const char pci_device_10de_0325[] = "GeForce FX Go5250";
+static const char pci_device_10de_0328[] = "GeForce FX Go5200 32M/64M";
+static const char pci_device_10de_0329[] = "GeForce FX 5200 (Mac)";
+static const char pci_device_10de_032a[] = "Quadro NVS 280 PCI";
+static const char pci_device_10de_032b[] = "NV34GL [Quadro FX 500]";
+static const char pci_device_10de_032c[] = "GeForce FX Go5300";
+static const char pci_device_10de_032d[] = "GeForce FX Go5100";
+static const char pci_device_10de_0330[] = "NV35 [GeForce FX 5900 Ultra]";
+static const char pci_device_10de_0331[] = "NV35 [GeForce FX 5900]";
+static const char pci_device_10de_0332[] = "GeForce FX 5900XT";
+static const char pci_device_10de_0333[] = "GeForce FX 5950 Ultra";
+static const char pci_device_10de_0338[] = "NV35GL [Quadro FX 3000]";
+static const char pci_device_10de_0341[] = "GeForce FX 5700 Ultra";
+static const char pci_device_10de_0342[] = "GeForce FX 5700";
+static const char pci_device_10de_034e[] = "Quadro FX 1100";
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_10df[] = "Emulex Corporation";
 static const char pci_device_10df_1ae5[] = "LP6000 Fibre Channel Host Adapter";
@@ -5292,6 +5533,7 @@ static const char pci_device_10e8_80da[] = "PCI-9812";
 static const char pci_device_10e8_811a[] = "PCI-IEEE1355-DS-DE Interface";
 static const char pci_device_10e8_8170[] = "S5933 [Matchmaker] (Chipset Development Tool)";
 static const char pci_device_10e8_82db[] = "AJA HDNTV HD SDI Framestore";
+static const char pci_device_10e8_8851[] = "S5933 on Innes Corp FM Radio Capture card";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_10e9[] = "Alps Electric Co., Ltd.";
@@ -5425,6 +5667,7 @@ static const char pci_device_10ee_3fc2[] = "RME Digi96/8 Pro";
 static const char pci_device_10ee_3fc3[] = "RME Digi96/8 Pad";
 static const char pci_device_10ee_3fc4[] = "RME Digi9652 (Hammerfall)";
 static const char pci_device_10ee_3fc5[] = "RME Hammerfall DSP";
+static const char pci_device_10ee_8381[] = "Ellips Santos Frame Grabber";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_10ef[] = "Racore Computer Products, Inc.";
@@ -5635,6 +5878,9 @@ static const char pci_subsys_1106_0571_1106_0571[] = "VT82C586/B/VT82C686/A/B/VT
 static const char pci_subsys_1106_0571_1179_0001[] = "Magnia Z310";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1106_0571_1297_f641[] = "FX41 motherboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1106_0571_1458_5002[] = "GA-7VAX Mainboard";
 #endif
 static const char pci_device_1106_0576[] = "VT82C576 3V [Apollo Master]";
@@ -5720,6 +5966,9 @@ static const char pci_subsys_1106_3038_1043_808c[] = "A7V8X motherboard";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1106_3038_1179_0001[] = "Magnia Z310";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1106_3038_1458_5004[] = "GA-7VAX Mainboard";
+#endif
 static const char pci_device_1106_3040[] = "VT82C586B ACPI";
 static const char pci_device_1106_3043[] = "VT86C100A [Rhine]";
 #ifdef INIT_SUBSYS_INFO
@@ -5779,6 +6028,9 @@ static const char pci_device_1106_3059[] = "VT8233/A/8235 AC97 Audio Controller"
 static const char pci_subsys_1106_3059_1043_8095[] = "A7V8X Motherboard (Realtek ALC650 codec)";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1106_3059_1297_c160[] = "FX41 motherboard (Realtek ALC650 codec)";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1106_3059_1458_a002[] = "GA-7VAX Onboard Audio (Realtek ALC650)";
 #endif
 static const char pci_device_1106_3065[] = "VT6102 [Rhine-II]";
@@ -5815,12 +6067,18 @@ static const char pci_device_1106_3104[] = "USB 2.0";
 static const char pci_subsys_1106_3104_1043_808c[] = "A7V8X motherboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1106_3104_1297_f641[] = "FX41 motherboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1106_3104_1458_5004[] = "GA-7VAX Mainboard";
 #endif
 static const char pci_device_1106_3106[] = "VT6105 [Rhine-III]";
 static const char pci_device_1106_3109[] = "VT8233C PCI to ISA Bridge";
 static const char pci_device_1106_3112[] = "VT8361 [KLE133] Host Bridge";
 static const char pci_device_1106_3116[] = "VT8375 [KM266/KL266] Host Bridge";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1106_3116_1297_f641[] = "FX41 motherboard";
+#endif
 static const char pci_device_1106_3122[] = "VT8623 [Apollo CLE266] integrated CastleRock graphics";
 static const char pci_device_1106_3123[] = "VT8623 [Apollo CLE266]";
 static const char pci_device_1106_3128[] = "VT8753 [P4X266 AGP]";
@@ -5834,6 +6092,9 @@ static const char pci_device_1106_3177[] = "VT8235 ISA Bridge";
 static const char pci_subsys_1106_3177_1043_808c[] = "A7V8X motherboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1106_3177_1297_f641[] = "FX41 motherboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1106_3177_1458_5001[] = "GA-7VAX Mainboard";
 #endif
 static const char pci_device_1106_3189[] = "VT8377 [KT400 AGP] Host Bridge";
@@ -5867,6 +6128,7 @@ static const char pci_device_1106_b102[] = "VT8362 AGP Bridge";
 static const char pci_device_1106_b103[] = "VT8615 AGP Bridge";
 static const char pci_device_1106_b112[] = "VT8361 [KLE133] AGP Bridge";
 static const char pci_device_1106_b168[] = "VT8235 PCI Bridge";
+static const char pci_device_1106_b198[] = "VT8237 PCI Bridge";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1107[] = "Stratus Computers";
@@ -5898,6 +6160,7 @@ static const char pci_device_110a_007b[] = "FSC Remote Service Controller, mailb
 static const char pci_device_110a_007c[] = "FSC Remote Service Controller, shared memory device";
 static const char pci_device_110a_007d[] = "FSC Remote Service Controller, SMIC device";
 static const char pci_device_110a_2102[] = "DSCC4 WAN adapter";
+static const char pci_device_110a_4021[] = "SIMATIC NET CP 5512 (Profibus and MPI Cardbus Adapter)";
 static const char pci_device_110a_4942[] = "FPGA I-Bus Tracer for MBD";
 static const char pci_device_110a_6120[] = "SZB6120";
 #endif
@@ -6172,7 +6435,13 @@ static const char pci_device_1131_1561[] = "USB 1.1 Host Controller";
 static const char pci_device_1131_1562[] = "USB 2.0 Host Controller";
 static const char pci_device_1131_3400[] = "SmartPCI56(UCB1500) 56K Modem";
 static const char pci_device_1131_7130[] = "SAA7130 Video Broadcast Decoder";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1131_7130_5168_0138[] = "LiveView FlyVideo 2000";
+#endif
 static const char pci_device_1131_7133[] = "SAA7133 Audio+video broadcast decoder";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1131_7133_5168_0138[] = "LifeView FlyVideo 3000";
+#endif
 static const char pci_device_1131_7134[] = "SAA7134";
 static const char pci_device_1131_7135[] = "SAA7135 Audio+video broadcast decoder";
 static const char pci_device_1131_7145[] = "SAA7145";
@@ -6203,40 +6472,107 @@ static const char pci_device_1133_7944[] = "EiconCard S94";
 static const char pci_device_1133_b921[] = "EiconCard P92";
 static const char pci_device_1133_b922[] = "EiconCard P92";
 static const char pci_device_1133_b923[] = "EiconCard P92";
-static const char pci_device_1133_e001[] = "DIVA 20PRO";
+static const char pci_device_1133_e001[] = "Diva Pro 2.0 S/T";
+static const char pci_device_1133_e002[] = "Diva 2.0 S/T PCI";
+static const char pci_device_1133_e003[] = "Diva Pro 2.0 U";
+static const char pci_device_1133_e004[] = "Diva 2.0 U PCI";
+static const char pci_device_1133_e005[] = "Diva 2.01 S/T PCI";
+static const char pci_device_1133_e006[] = "Diva CT S/T PCI";
+static const char pci_device_1133_e007[] = "Diva CT U PCI";
+static const char pci_device_1133_e008[] = "Diva CT Lite S/T PCI";
+static const char pci_device_1133_e009[] = "Diva CT Lite U PCI";
+static const char pci_device_1133_e00a[] = "Diva ISDN+V.90 PCI";
+static const char pci_device_1133_e00b[] = "Diva 2.02 PCI S/T";
+static const char pci_device_1133_e00c[] = "Diva 2.02 PCI U";
+static const char pci_device_1133_e00d[] = "Diva ISDN Pro 3.0 PCI";
+static const char pci_device_1133_e00e[] = "Diva ISDN+CT S/T PCI Rev 2";
+static const char pci_device_1133_e010[] = "Diva Server BRI-2M PCI";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1133_e010_110a_0021[] = "Fujitsu Siemens ISDN S0";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1133_e010_8001_0014[] = "Diva Server BRI-2M PCI Cornet NQ";
+#endif
+static const char pci_device_1133_e011[] = "Diva Server BRI S/T Rev 2";
+static const char pci_device_1133_e012[] = "Diva Server 4BRI-8M PCI";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1133_e012_8001_0014[] = "Diva Server 4BRI-8M PCI Cornet NQ";
+#endif
+static const char pci_device_1133_e013[] = "Diva Server 4BRI-8M Rev 2";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1133_e013_8001_0014[] = "Diva Server 4BRI-8M Cornet NQ 2";
+#endif
+static const char pci_device_1133_e014[] = "Diva Server PRI-30M PCI";
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1133_e001_1133_e001[] = "DIVA Pro 2.0 S/T";
+static const char pci_subsys_1133_e014_0008_0100[] = "Diva Server PRI-30M PCI";
 #endif
-static const char pci_device_1133_e002[] = "DIVA 20";
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1133_e002_1133_e002[] = "DIVA 2.0 S/T";
+static const char pci_subsys_1133_e014_8001_0014[] = "Diva Server PRI-30M PCI Cornet NQ";
 #endif
-static const char pci_device_1133_e003[] = "DIVA 20PRO_U";
+static const char pci_device_1133_e015[] = "DIVA Server PRI-30M 2.0";
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1133_e003_1133_e003[] = "DIVA Pro 2.0 U";
+static const char pci_subsys_1133_e015_8001_0014[] = "Diva Server PRI Cornet NQ 2";
 #endif
-static const char pci_device_1133_e004[] = "DIVA 20_U";
+static const char pci_device_1133_e016[] = "Diva Server Voice 4BRI PCI";
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1133_e004_1133_e004[] = "DIVA 2.0 U";
+static const char pci_subsys_1133_e016_8001_0014[] = "Diva Server PRI Cornet NQ";
 #endif
-static const char pci_device_1133_e005[] = "DIVA LOW";
+static const char pci_device_1133_e017[] = "Diva Server Voice 4BRI PCI Rev 2";
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1133_e005_1133_e005[] = "DIVA 2.01 S/T";
+static const char pci_subsys_1133_e017_8001_0014[] = "Diva Server Voice 4BRI PCI Cornet NQ 2";
 #endif
-static const char pci_device_1133_e00b[] = "DIVA 2.02";
-static const char pci_device_1133_e010[] = "DIVA Server BRI-2M";
+static const char pci_device_1133_e018[] = "Diva Server BRI 2M Revision 2";
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1133_e010_1133_e010[] = "DIVA Server BRI-2M";
+static const char pci_subsys_1133_e018_8001_0014[] = "Diva Server BRI 2M Cornet NQ 2";
 #endif
-static const char pci_device_1133_e012[] = "DIVA Server BRI-8M";
+static const char pci_device_1133_e019[] = "Diva Server Voice PRI PCI Rev 2";
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1133_e012_1133_e012[] = "DIVA Server BRI-8M";
+static const char pci_subsys_1133_e019_8001_0014[] = "Diva Server Voice PRI PCI Cornet NQ 2";
 #endif
-static const char pci_device_1133_e014[] = "DIVA Server PRI-30M";
+static const char pci_device_1133_e01a[] = "Diva Server 2FX";
+static const char pci_device_1133_e01b[] = "Diva Server BRI-2M Voice Revision 2";
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1133_e014_1133_e014[] = "DIVA Server PRI-30M";
+static const char pci_subsys_1133_e01b_8001_0014[] = "Diva Server BRI-2M Voice Cornet NQ 2";
 #endif
-static const char pci_device_1133_e018[] = "DIVA Server BRI-2M/-2F";
+static const char pci_device_1133_e01c[] = "Diva Server PRI Rev 3.0";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1133_e01c_1133_1c01[] = "Diva Server PRI/E1/T1-8 Rev 3.0";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1133_e01c_1133_1c02[] = "Diva Server PRI/T1-24 Rev 3.0";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1133_e01c_1133_1c03[] = "Diva Server PRI/E1-30 Rev 3.0";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1133_e01c_1133_1c04[] = "Diva Server V-PRI/E1/T1 Rev 3.0";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1133_e01c_1133_1c05[] = "Diva Server V-PRI/T1-24 Rev 3.0";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1133_e01c_1133_1c06[] = "Diva Server V-PRI/E1-30 Rev 3.0";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1133_e01c_1133_1c07[] = "Diva Server PRI/E1/T1-8 Cornet NQ 3";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1133_e01c_1133_1c08[] = "Diva Server PRI/T1-24 Cornet NQ 3";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1133_e01c_1133_1c09[] = "Diva Server PRI/E1-30 Cornet NQ 3";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1133_e01c_1133_1c0a[] = "Diva Server V-PRI/E1/T1 Cornet NQ 3";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1133_e01c_1133_1c0b[] = "Diva Server V-PRI/T1-24 Cornet NQ 3";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1133_e01c_1133_1c0c[] = "Diva Server V-PRI/E1-30 Cornet NQ 3";
+#endif
+static const char pci_device_1133_e01e[] = "Diva Server 2PRI";
+static const char pci_device_1133_e020[] = "Diva Server 4PRI";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1134[] = "Mercury Computer Systems";
@@ -6709,14 +7045,29 @@ static const char pci_device_1166_0016[] = "CMIC-GC Host Bridge";
 static const char pci_device_1166_0017[] = "GCNB-LE Host Bridge";
 static const char pci_device_1166_0200[] = "OSB4 South Bridge";
 static const char pci_device_1166_0201[] = "CSB5 South Bridge";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1166_0201_4c53_1080[] = "CT8 mainboard";
+#endif
 static const char pci_device_1166_0203[] = "CSB6 South Bridge";
 static const char pci_device_1166_0211[] = "OSB4 IDE Controller";
 static const char pci_device_1166_0212[] = "CSB5 IDE Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1166_0212_4c53_1080[] = "CT8 mainboard";
+#endif
 static const char pci_device_1166_0213[] = "CSB6 RAID/IDE Controller";
 static const char pci_device_1166_0220[] = "OSB4/CSB5 OHCI USB Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1166_0220_4c53_1080[] = "CT8 mainboard";
+#endif
 static const char pci_device_1166_0221[] = "CSB6 OHCI USB Controller";
 static const char pci_device_1166_0225[] = "GCLE Host Bridge";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1166_0225_4c53_1080[] = "CT8 mainboard";
+#endif
 static const char pci_device_1166_0227[] = "GCLE-2 Host Bridge";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1166_0227_4c53_1080[] = "CT8 mainboard";
+#endif
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1167[] = "Mutoh Industries Inc";
@@ -7368,6 +7719,11 @@ static const char pci_device_11c1_044d[] = "LT WinModem";
 static const char pci_device_11c1_044e[] = "LT WinModem";
 static const char pci_device_11c1_044f[] = "V90 WildWire Modem";
 static const char pci_device_11c1_0450[] = "LT WinModem";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_11c1_0450_1033_80a8[] = "Versa Note Vxi";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_11c1_0450_144f_4005[] = "Magnia SG20";
 #endif
@@ -8053,6 +8409,8 @@ static const char pci_subsys_1242_1560_1242_6562[] = "FCX2-6562 Dual Channel PCI
 static const char pci_subsys_1242_1560_1242_656a[] = "FCX-6562 PCI-X Fibre Channel Adapter";
 #endif
 static const char pci_device_1242_4643[] = "FCI-1063 Fibre Channel Adapter";
+static const char pci_device_1242_6562[] = "FCX2-6562 Dual Channel PCI-X Fibre Channel Adapter";
+static const char pci_device_1242_656a[] = "FCX-6562 PCI-X Fibre Channel Adapter";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1243[] = "Delphax";
@@ -8183,7 +8541,7 @@ static const char pci_subsys_125d_1969_125d_8888[] = "Solo-1 Audio Adapter";
 static const char pci_device_125d_1978[] = "ES1978 Maestro 2E";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_125d_1978_0e11_b112[] = "Armada M700";
+static const char pci_subsys_125d_1978_0e11_b112[] = "Armada M700/E500";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 #endif
@@ -8220,6 +8578,11 @@ static const char pci_subsys_125d_1989_125d_1989[] = "ESS Modem";
 static const char pci_device_125d_1998[] = "ES1983S Maestro-3i PCI Audio Accelerator";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_125d_1998_1028_00b1[] = "Latitude C600";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_125d_1998_1028_00e6[] = "ES1983S Maestro-3i (Dell Inspiron 8100)";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -9135,7 +9498,7 @@ static const char pci_vendor_12b7[] = "Cognex Modular Vision Systems Div. - Acum
 static const char pci_vendor_12b8[] = "Korg";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
-static const char pci_vendor_12b9[] = "US Robotics/3Com";
+static const char pci_vendor_12b9[] = "5610 56K FaxModem";
 static const char pci_device_12b9_1006[] = "WinModem";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_12b9_1006_12b9_005c[] = "USR 56k Internal Voice WinModem (Model 3472)";
@@ -9371,6 +9734,7 @@ static const char pci_vendor_12dd[] = "Management Graphics";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_12de[] = "Rainbow Technologies";
+static const char pci_device_12de_0200[] = "CryptoSwift CS200";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_12df[] = "SBS Technologies Inc";
@@ -9813,6 +10177,10 @@ static const char pci_vendor_1330[] = "MMC Networks";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1331[] = "Radisys Corp.";
+static const char pci_device_1331_8200[] = "82600 Host Bridge";
+static const char pci_device_1331_8201[] = "82600 IDE";
+static const char pci_device_1331_8202[] = "82600 USB";
+static const char pci_device_1331_8210[] = "82600 PCI Bridge";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1332[] = "Micro Memory";
@@ -9887,6 +10255,9 @@ static const char pci_vendor_134c[] = "Chori Joho System Co. Ltd";
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_134d[] = "PCTel Inc";
 static const char pci_device_134d_7890[] = "HSP MicroModem 56";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_134d_7890_134d_0001[] = "PCT789 adapter";
+#endif
 static const char pci_device_134d_7891[] = "HSP MicroModem 56";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_134d_7891_134d_0001[] = "HSP MicroModem 56";
@@ -10002,6 +10373,7 @@ static const char pci_vendor_136a[] = "High Soft Tech";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_136b[] = "Kawasaki Steel Corporation";
+static const char pci_device_136b_ff01[] = "KL5A72002 Motion JPEG";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_136c[] = "Adtek System Science Co Ltd";
@@ -10286,7 +10658,10 @@ static const char pci_vendor_13bf[] = "Sharewave Inc";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_13c0[] = "Microgate Corporation";
-static const char pci_device_13c0_0010[] = "SyncLink WAN Adapter";
+static const char pci_device_13c0_0010[] = "SyncLink Adapter v1";
+static const char pci_device_13c0_0020[] = "SyncLink SCC Adapter";
+static const char pci_device_13c0_0030[] = "SyncLink Multiport Adapter";
+static const char pci_device_13c0_0210[] = "SyncLink Adapter v2";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_13c1[] = "3ware Inc";
@@ -10474,6 +10849,9 @@ static const char pci_device_13f6_0111[] = "CM8738";
 static const char pci_subsys_13f6_0111_1019_0970[] = "P6STP-FL motherboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_13f6_0111_1043_8035[] = "CUSI-FX motherboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_13f6_0111_1043_8077[] = "CMI8738 6-channel audio controller";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -10645,6 +11023,8 @@ static const char pci_vendor_141f[] = "Visiontech Ltd";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1420[] = "Psion Dacom plc";
+static const char pci_device_1420_8002[] = "Gold Card NetGlobal 56k+10/100Mb CardBus (Ethernet part)";
+static const char pci_device_1420_8003[] = "Gold Card NetGlobal 56k+10/100Mb CardBus (Modem part)";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1421[] = "Ads Technologies Inc";
@@ -11561,6 +11941,9 @@ static const char pci_device_14e4_4211[] = "BCM4211 iLine10 HomePNA 2.0 + V.90 5
 static const char pci_device_14e4_4212[] = "BCM4212 v.90 56k modem";
 static const char pci_device_14e4_4301[] = "BCM4301 802.11b";
 static const char pci_device_14e4_4320[] = "BCM94306 802.11g";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14e4_4320_1737_4320[] = "WPC54G";
+#endif
 static const char pci_device_14e4_4401[] = "BCM4401 100Base-T";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_14e4_4401_1043_80a8[] = "A7V8X motherboard";
@@ -11910,7 +12293,9 @@ static const char pci_vendor_14fa[] = "WANDEL & GOCHERMANN";
 static const char pci_vendor_14fb[] = "TRANSAS MARINE (UK) Ltd";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
-static const char pci_vendor_14fc[] = "QUADRICS Supercomputers World";
+static const char pci_vendor_14fc[] = "Quadrics Ltd";
+static const char pci_device_14fc_0000[] = "QsNet Elan3 Network Adapter";
+static const char pci_device_14fc_0001[] = "QsNetII Elan4 Network Adapter";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_14fd[] = "JAPAN Computer Industry Inc";
@@ -12992,7 +13377,17 @@ static const char pci_vendor_3142[] = "Post Impression Systems.";
 static const char pci_vendor_3388[] = "Hint Corp";
 static const char pci_device_3388_0013[] = "HiNT HC4 PCI to ISDN bridge, Multimedia audio controller";
 static const char pci_device_3388_0014[] = "HiNT HC4 PCI to ISDN bridge, Network controller";
-static const char pci_device_3388_0021[] = "HB1-SE33 PCI-PCI Bridge";
+static const char pci_device_3388_0020[] = "HB6 Universal PCI-PCI bridge (transparent mode)";
+static const char pci_device_3388_0021[] = "HB6 Universal PCI-PCI bridge (non-transparent mode)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_3388_0021_4c53_1050[] = "CT7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_3388_0021_4c53_1080[] = "CT8 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_3388_0021_4c53_3010[] = "PPCI mezzanine (32-bit PMC)";
+#endif
 static const char pci_device_3388_101a[] = "E.Band [AudioTrak Inca88]";
 static const char pci_device_3388_101b[] = "E.Band [AudioTrak Inca88]";
 static const char pci_device_3388_8011[] = "VXPro II Chipset";
@@ -15378,6 +15773,14 @@ static const pciSubsystemInfo pci_ss_info_1000_000f_1de1_3904 =
 	{0x1de1, 0x3904, pci_subsys_1000_000f_1de1_3904, 0};
 #undef pci_ss_info_1de1_3904
 #define pci_ss_info_1de1_3904 pci_ss_info_1000_000f_1de1_3904
+static const pciSubsystemInfo pci_ss_info_1000_000f_4c53_1000 =
+	{0x4c53, 0x1000, pci_subsys_1000_000f_4c53_1000, 0};
+#undef pci_ss_info_4c53_1000
+#define pci_ss_info_4c53_1000 pci_ss_info_1000_000f_4c53_1000
+static const pciSubsystemInfo pci_ss_info_1000_000f_4c53_1050 =
+	{0x4c53, 0x1050, pci_subsys_1000_000f_4c53_1050, 0};
+#undef pci_ss_info_4c53_1050
+#define pci_ss_info_4c53_1050 pci_ss_info_1000_000f_4c53_1050
 #endif
 static const pciSubsystemInfo pci_ss_info_1000_0010_0e11_4040 =
 	{0x0e11, 0x4040, pci_subsys_1000_0010_0e11_4040, 0};
@@ -15394,6 +15797,18 @@ static const pciSubsystemInfo pci_ss_info_1000_0020_1de1_1020 =
 	{0x1de1, 0x1020, pci_subsys_1000_0020_1de1_1020, 0};
 #undef pci_ss_info_1de1_1020
 #define pci_ss_info_1de1_1020 pci_ss_info_1000_0020_1de1_1020
+static const pciSubsystemInfo pci_ss_info_1000_0021_4c53_1080 =
+	{0x4c53, 0x1080, pci_subsys_1000_0021_4c53_1080, 0};
+#undef pci_ss_info_4c53_1080
+#define pci_ss_info_4c53_1080 pci_ss_info_1000_0021_4c53_1080
+static const pciSubsystemInfo pci_ss_info_1000_0021_4c53_1300 =
+	{0x4c53, 0x1300, pci_subsys_1000_0021_4c53_1300, 0};
+#undef pci_ss_info_4c53_1300
+#define pci_ss_info_4c53_1300 pci_ss_info_1000_0021_4c53_1300
+static const pciSubsystemInfo pci_ss_info_1000_0021_4c53_1310 =
+	{0x4c53, 0x1310, pci_subsys_1000_0021_4c53_1310, 0};
+#undef pci_ss_info_4c53_1310
+#define pci_ss_info_4c53_1310 pci_ss_info_1000_0021_4c53_1310
 #endif
 static const pciSubsystemInfo pci_ss_info_1000_0030_1028_1010 =
 	{0x1028, 0x1010, pci_subsys_1000_0030_1028_1010, 0};
@@ -15579,6 +15994,10 @@ static const pciSubsystemInfo pci_ss_info_1002_4752_1002_8008 =
 	{0x1002, 0x8008, pci_subsys_1002_4752_1002_8008, 0};
 #undef pci_ss_info_1002_8008
 #define pci_ss_info_1002_8008 pci_ss_info_1002_4752_1002_8008
+static const pciSubsystemInfo pci_ss_info_1002_4752_1028_00ce =
+	{0x1028, 0x00ce, pci_subsys_1002_4752_1028_00ce, 0};
+#undef pci_ss_info_1028_00ce
+#define pci_ss_info_1028_00ce pci_ss_info_1002_4752_1028_00ce
 static const pciSubsystemInfo pci_ss_info_1002_4752_1028_00d1 =
 	{0x1028, 0x00d1, pci_subsys_1002_4752_1028_00d1, 0};
 #undef pci_ss_info_1028_00d1
@@ -15679,6 +16098,10 @@ static const pciSubsystemInfo pci_ss_info_1002_4c42_1028_0085 =
 	{0x1028, 0x0085, pci_subsys_1002_4c42_1028_0085, 0};
 #undef pci_ss_info_1028_0085
 #define pci_ss_info_1028_0085 pci_ss_info_1002_4c42_1028_0085
+static const pciSubsystemInfo pci_ss_info_1002_4c46_1028_00b1 =
+	{0x1028, 0x00b1, pci_subsys_1002_4c46_1028_00b1, 0};
+#undef pci_ss_info_1028_00b1
+#define pci_ss_info_1028_00b1 pci_ss_info_1002_4c46_1028_00b1
 static const pciSubsystemInfo pci_ss_info_1002_4c49_1002_0004 =
 	{0x1002, 0x0004, pci_subsys_1002_4c49_1002_0004, 0};
 #undef pci_ss_info_1002_0004
@@ -15699,6 +16122,10 @@ static const pciSubsystemInfo pci_ss_info_1002_4c4d_0e11_b111 =
 	{0x0e11, 0xb111, pci_subsys_1002_4c4d_0e11_b111, 0};
 #undef pci_ss_info_0e11_b111
 #define pci_ss_info_0e11_b111 pci_ss_info_1002_4c4d_0e11_b111
+static const pciSubsystemInfo pci_ss_info_1002_4c4d_0e11_b160 =
+	{0x0e11, 0xb160, pci_subsys_1002_4c4d_0e11_b160, 0};
+#undef pci_ss_info_0e11_b160
+#define pci_ss_info_0e11_b160 pci_ss_info_1002_4c4d_0e11_b160
 static const pciSubsystemInfo pci_ss_info_1002_4c4d_1002_0084 =
 	{0x1002, 0x0084, pci_subsys_1002_4c4d_1002_0084, 0};
 #undef pci_ss_info_1002_0084
@@ -15707,6 +16134,10 @@ static const pciSubsystemInfo pci_ss_info_1002_4c4d_1014_0154 =
 	{0x1014, 0x0154, pci_subsys_1002_4c4d_1014_0154, 0};
 #undef pci_ss_info_1014_0154
 #define pci_ss_info_1014_0154 pci_ss_info_1002_4c4d_1014_0154
+static const pciSubsystemInfo pci_ss_info_1002_4c4d_1028_00aa =
+	{0x1028, 0x00aa, pci_subsys_1002_4c4d_1028_00aa, 0};
+#undef pci_ss_info_1028_00aa
+#define pci_ss_info_1028_00aa pci_ss_info_1002_4c4d_1028_00aa
 static const pciSubsystemInfo pci_ss_info_1002_4c50_1002_4c50 =
 	{0x1002, 0x4c50, pci_subsys_1002_4c50_1002_4c50, 0};
 #undef pci_ss_info_1002_4c50
@@ -15739,6 +16170,10 @@ static const pciSubsystemInfo pci_ss_info_1002_4e45_1002_0002 =
 	{0x1002, 0x0002, pci_subsys_1002_4e45_1002_0002, 0};
 #undef pci_ss_info_1002_0002
 #define pci_ss_info_1002_0002 pci_ss_info_1002_4e45_1002_0002
+static const pciSubsystemInfo pci_ss_info_1002_4e65_1002_0003 =
+	{0x1002, 0x0003, pci_subsys_1002_4e65_1002_0003, 0};
+#undef pci_ss_info_1002_0003
+#define pci_ss_info_1002_0003 pci_ss_info_1002_4e65_1002_0003
 static const pciSubsystemInfo pci_ss_info_1002_5044_1002_0028 =
 	{0x1002, 0x0028, pci_subsys_1002_5044_1002_0028, 0};
 #undef pci_ss_info_1002_0028
@@ -16093,6 +16528,10 @@ static const pciSubsystemInfo pci_ss_info_1004_0306_1483_5022 =
 #undef pci_ss_info_1483_5022
 #define pci_ss_info_1483_5022 pci_ss_info_1004_0306_1483_5022
 #endif
+static const pciSubsystemInfo pci_ss_info_100b_0020_1385_f311 =
+	{0x1385, 0xf311, pci_subsys_100b_0020_1385_f311, 0};
+#undef pci_ss_info_1385_f311
+#define pci_ss_info_1385_f311 pci_ss_info_100b_0020_1385_f311
 static const pciSubsystemInfo pci_ss_info_1011_0009_1025_0310 =
 	{0x1025, 0x0310, pci_subsys_1011_0009_1025_0310, 0};
 #undef pci_ss_info_1025_0310
@@ -16321,6 +16760,14 @@ static const pciSubsystemInfo pci_ss_info_1011_0046_12d9_000a =
 	{0x12d9, 0x000a, pci_subsys_1011_0046_12d9_000a, 0};
 #undef pci_ss_info_12d9_000a
 #define pci_ss_info_12d9_000a pci_ss_info_1011_0046_12d9_000a
+static const pciSubsystemInfo pci_ss_info_1011_0046_4c53_1050 =
+	{0x4c53, 0x1050, pci_subsys_1011_0046_4c53_1050, 0};
+#undef pci_ss_info_4c53_1050
+#define pci_ss_info_4c53_1050 pci_ss_info_1011_0046_4c53_1050
+static const pciSubsystemInfo pci_ss_info_1011_0046_4c53_1051 =
+	{0x4c53, 0x1051, pci_subsys_1011_0046_4c53_1051, 0};
+#undef pci_ss_info_4c53_1051
+#define pci_ss_info_4c53_1051 pci_ss_info_1011_0046_4c53_1051
 static const pciSubsystemInfo pci_ss_info_1011_0046_9005_0365 =
 	{0x9005, 0x0365, pci_subsys_1011_0046_9005_0365, 0};
 #undef pci_ss_info_9005_0365
@@ -16470,6 +16917,14 @@ static const pciSubsystemInfo pci_ss_info_1014_0144_1014_0145 =
 	{0x1014, 0x0145, pci_subsys_1014_0144_1014_0145, 0};
 #undef pci_ss_info_1014_0145
 #define pci_ss_info_1014_0145 pci_ss_info_1014_0144_1014_0145
+static const pciSubsystemInfo pci_ss_info_1014_0180_1014_0241 =
+	{0x1014, 0x0241, pci_subsys_1014_0180_1014_0241, 0};
+#undef pci_ss_info_1014_0241
+#define pci_ss_info_1014_0241 pci_ss_info_1014_0180_1014_0241
+static const pciSubsystemInfo pci_ss_info_1014_0180_1014_0264 =
+	{0x1014, 0x0264, pci_subsys_1014_0180_1014_0264, 0};
+#undef pci_ss_info_1014_0264
+#define pci_ss_info_1014_0264 pci_ss_info_1014_0180_1014_0264
 static const pciSubsystemInfo pci_ss_info_1014_01bd_1014_01be =
 	{0x1014, 0x01be, pci_subsys_1014_01bd_1014_01be, 0};
 #undef pci_ss_info_1014_01be
@@ -16498,6 +16953,18 @@ static const pciSubsystemInfo pci_ss_info_1014_01bd_1014_0259 =
 	{0x1014, 0x0259, pci_subsys_1014_01bd_1014_0259, 0};
 #undef pci_ss_info_1014_0259
 #define pci_ss_info_1014_0259 pci_ss_info_1014_01bd_1014_0259
+static const pciSubsystemInfo pci_ss_info_1014_0219_1014_021a =
+	{0x1014, 0x021a, pci_subsys_1014_0219_1014_021a, 0};
+#undef pci_ss_info_1014_021a
+#define pci_ss_info_1014_021a pci_ss_info_1014_0219_1014_021a
+static const pciSubsystemInfo pci_ss_info_1014_0219_1014_0251 =
+	{0x1014, 0x0251, pci_subsys_1014_0219_1014_0251, 0};
+#undef pci_ss_info_1014_0251
+#define pci_ss_info_1014_0251 pci_ss_info_1014_0219_1014_0251
+static const pciSubsystemInfo pci_ss_info_1014_0219_1014_0252 =
+	{0x1014, 0x0252, pci_subsys_1014_0219_1014_0252, 0};
+#undef pci_ss_info_1014_0252
+#define pci_ss_info_1014_0252 pci_ss_info_1014_0219_1014_0252
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_101e_1960_101e_0471 =
@@ -16589,6 +17056,30 @@ static const pciSubsystemInfo pci_ss_info_1022_2000_1259_2701 =
 	{0x1259, 0x2701, pci_subsys_1022_2000_1259_2701, 0};
 #undef pci_ss_info_1259_2701
 #define pci_ss_info_1259_2701 pci_ss_info_1022_2000_1259_2701
+static const pciSubsystemInfo pci_ss_info_1022_2000_4c53_1000 =
+	{0x4c53, 0x1000, pci_subsys_1022_2000_4c53_1000, 0};
+#undef pci_ss_info_4c53_1000
+#define pci_ss_info_4c53_1000 pci_ss_info_1022_2000_4c53_1000
+static const pciSubsystemInfo pci_ss_info_1022_2000_4c53_1010 =
+	{0x4c53, 0x1010, pci_subsys_1022_2000_4c53_1010, 0};
+#undef pci_ss_info_4c53_1010
+#define pci_ss_info_4c53_1010 pci_ss_info_1022_2000_4c53_1010
+static const pciSubsystemInfo pci_ss_info_1022_2000_4c53_1020 =
+	{0x4c53, 0x1020, pci_subsys_1022_2000_4c53_1020, 0};
+#undef pci_ss_info_4c53_1020
+#define pci_ss_info_4c53_1020 pci_ss_info_1022_2000_4c53_1020
+static const pciSubsystemInfo pci_ss_info_1022_2000_4c53_1030 =
+	{0x4c53, 0x1030, pci_subsys_1022_2000_4c53_1030, 0};
+#undef pci_ss_info_4c53_1030
+#define pci_ss_info_4c53_1030 pci_ss_info_1022_2000_4c53_1030
+static const pciSubsystemInfo pci_ss_info_1022_2000_4c53_1040 =
+	{0x4c53, 0x1040, pci_subsys_1022_2000_4c53_1040, 0};
+#undef pci_ss_info_4c53_1040
+#define pci_ss_info_4c53_1040 pci_ss_info_1022_2000_4c53_1040
+static const pciSubsystemInfo pci_ss_info_1022_2000_4c53_1060 =
+	{0x4c53, 0x1060, pci_subsys_1022_2000_4c53_1060, 0};
+#undef pci_ss_info_4c53_1060
+#define pci_ss_info_4c53_1060 pci_ss_info_1022_2000_4c53_1060
 static const pciSubsystemInfo pci_ss_info_1022_2001_1092_0a78 =
 	{0x1092, 0x0a78, pci_subsys_1022_2001_1092_0a78, 0};
 #undef pci_ss_info_1092_0a78
@@ -17125,10 +17616,50 @@ static const pciSubsystemInfo pci_ss_info_102c_00c0_102c_00c0 =
 	{0x102c, 0x00c0, pci_subsys_102c_00c0_102c_00c0, 0};
 #undef pci_ss_info_102c_00c0
 #define pci_ss_info_102c_00c0 pci_ss_info_102c_00c0_102c_00c0
+static const pciSubsystemInfo pci_ss_info_102c_00c0_4c53_1000 =
+	{0x4c53, 0x1000, pci_subsys_102c_00c0_4c53_1000, 0};
+#undef pci_ss_info_4c53_1000
+#define pci_ss_info_4c53_1000 pci_ss_info_102c_00c0_4c53_1000
+static const pciSubsystemInfo pci_ss_info_102c_00c0_4c53_1010 =
+	{0x4c53, 0x1010, pci_subsys_102c_00c0_4c53_1010, 0};
+#undef pci_ss_info_4c53_1010
+#define pci_ss_info_4c53_1010 pci_ss_info_102c_00c0_4c53_1010
+static const pciSubsystemInfo pci_ss_info_102c_00c0_4c53_1020 =
+	{0x4c53, 0x1020, pci_subsys_102c_00c0_4c53_1020, 0};
+#undef pci_ss_info_4c53_1020
+#define pci_ss_info_4c53_1020 pci_ss_info_102c_00c0_4c53_1020
+static const pciSubsystemInfo pci_ss_info_102c_00c0_4c53_1030 =
+	{0x4c53, 0x1030, pci_subsys_102c_00c0_4c53_1030, 0};
+#undef pci_ss_info_4c53_1030
+#define pci_ss_info_4c53_1030 pci_ss_info_102c_00c0_4c53_1030
+static const pciSubsystemInfo pci_ss_info_102c_00c0_4c53_1050 =
+	{0x4c53, 0x1050, pci_subsys_102c_00c0_4c53_1050, 0};
+#undef pci_ss_info_4c53_1050
+#define pci_ss_info_4c53_1050 pci_ss_info_102c_00c0_4c53_1050
+static const pciSubsystemInfo pci_ss_info_102c_00c0_4c53_1051 =
+	{0x4c53, 0x1051, pci_subsys_102c_00c0_4c53_1051, 0};
+#undef pci_ss_info_4c53_1051
+#define pci_ss_info_4c53_1051 pci_ss_info_102c_00c0_4c53_1051
 static const pciSubsystemInfo pci_ss_info_102c_00e5_0e11_b049 =
 	{0x0e11, 0xb049, pci_subsys_102c_00e5_0e11_b049, 0};
 #undef pci_ss_info_0e11_b049
 #define pci_ss_info_0e11_b049 pci_ss_info_102c_00e5_0e11_b049
+static const pciSubsystemInfo pci_ss_info_102c_0c30_4c53_1000 =
+	{0x4c53, 0x1000, pci_subsys_102c_0c30_4c53_1000, 0};
+#undef pci_ss_info_4c53_1000
+#define pci_ss_info_4c53_1000 pci_ss_info_102c_0c30_4c53_1000
+static const pciSubsystemInfo pci_ss_info_102c_0c30_4c53_1050 =
+	{0x4c53, 0x1050, pci_subsys_102c_0c30_4c53_1050, 0};
+#undef pci_ss_info_4c53_1050
+#define pci_ss_info_4c53_1050 pci_ss_info_102c_0c30_4c53_1050
+static const pciSubsystemInfo pci_ss_info_102c_0c30_4c53_1051 =
+	{0x4c53, 0x1051, pci_subsys_102c_0c30_4c53_1051, 0};
+#undef pci_ss_info_4c53_1051
+#define pci_ss_info_4c53_1051 pci_ss_info_102c_0c30_4c53_1051
+static const pciSubsystemInfo pci_ss_info_102c_0c30_4c53_1080 =
+	{0x4c53, 0x1080, pci_subsys_102c_0c30_4c53_1080, 0};
+#undef pci_ss_info_4c53_1080
+#define pci_ss_info_4c53_1080 pci_ss_info_102c_0c30_4c53_1080
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_102f_0020_102f_00f8 =
 	{0x102f, 0x00f8, pci_subsys_102f_0020_102f_00f8, 0};
@@ -17207,6 +17738,10 @@ static const pciSubsystemInfo pci_ss_info_1039_0900_1039_0900 =
 	{0x1039, 0x0900, pci_subsys_1039_0900_1039_0900, 0};
 #undef pci_ss_info_1039_0900
 #define pci_ss_info_1039_0900 pci_ss_info_1039_0900_1039_0900
+static const pciSubsystemInfo pci_ss_info_1039_0900_1043_8035 =
+	{0x1043, 0x8035, pci_subsys_1039_0900_1043_8035, 0};
+#undef pci_ss_info_1043_8035
+#define pci_ss_info_1043_8035 pci_ss_info_1039_0900_1043_8035
 static const pciSubsystemInfo pci_ss_info_1039_5513_1019_0970 =
 	{0x1019, 0x0970, pci_subsys_1039_5513_1019_0970, 0};
 #undef pci_ss_info_1019_0970
@@ -17215,10 +17750,18 @@ static const pciSubsystemInfo pci_ss_info_1039_5513_1039_5513 =
 	{0x1039, 0x5513, pci_subsys_1039_5513_1039_5513, 0};
 #undef pci_ss_info_1039_5513
 #define pci_ss_info_1039_5513 pci_ss_info_1039_5513_1039_5513
+static const pciSubsystemInfo pci_ss_info_1039_5513_1043_8035 =
+	{0x1043, 0x8035, pci_subsys_1039_5513_1043_8035, 0};
+#undef pci_ss_info_1043_8035
+#define pci_ss_info_1043_8035 pci_ss_info_1039_5513_1043_8035
 static const pciSubsystemInfo pci_ss_info_1039_6300_1019_0970 =
 	{0x1019, 0x0970, pci_subsys_1039_6300_1019_0970, 0};
 #undef pci_ss_info_1019_0970
 #define pci_ss_info_1019_0970 pci_ss_info_1039_6300_1019_0970
+static const pciSubsystemInfo pci_ss_info_1039_6300_1043_8035 =
+	{0x1043, 0x8035, pci_subsys_1039_6300_1043_8035, 0};
+#undef pci_ss_info_1043_8035
+#define pci_ss_info_1043_8035 pci_ss_info_1039_6300_1043_8035
 static const pciSubsystemInfo pci_ss_info_1039_6306_1039_6306 =
 	{0x1039, 0x6306, pci_subsys_1039_6306_1039_6306, 0};
 #undef pci_ss_info_1039_6306
@@ -17677,6 +18220,10 @@ static const pciSubsystemInfo pci_ss_info_104c_ac1b_0e11_b113 =
 	{0x0e11, 0xb113, pci_subsys_104c_ac1b_0e11_b113, 0};
 #undef pci_ss_info_0e11_b113
 #define pci_ss_info_0e11_b113 pci_ss_info_104c_ac1b_0e11_b113
+static const pciSubsystemInfo pci_ss_info_104c_ac1c_0e11_b121 =
+	{0x0e11, 0xb121, pci_subsys_104c_ac1c_0e11_b121, 0};
+#undef pci_ss_info_0e11_b121
+#define pci_ss_info_0e11_b121 pci_ss_info_104c_ac1c_0e11_b121
 static const pciSubsystemInfo pci_ss_info_104c_ac42_1028_00e6 =
 	{0x1028, 0x00e6, pci_subsys_104c_ac42_1028_00e6, 0};
 #undef pci_ss_info_1028_00e6
@@ -17685,6 +18232,10 @@ static const pciSubsystemInfo pci_ss_info_104c_ac51_1014_023b =
 	{0x1014, 0x023b, pci_subsys_104c_ac51_1014_023b, 0};
 #undef pci_ss_info_1014_023b
 #define pci_ss_info_1014_023b pci_ss_info_104c_ac51_1014_023b
+static const pciSubsystemInfo pci_ss_info_104c_ac51_1028_00b1 =
+	{0x1028, 0x00b1, pci_subsys_104c_ac51_1028_00b1, 0};
+#undef pci_ss_info_1028_00b1
+#define pci_ss_info_1028_00b1 pci_ss_info_104c_ac51_1028_00b1
 static const pciSubsystemInfo pci_ss_info_104c_ac51_10cf_1095 =
 	{0x10cf, 0x1095, pci_subsys_104c_ac51_10cf_1095, 0};
 #undef pci_ss_info_10cf_1095
@@ -18606,6 +19157,10 @@ static const pciSubsystemInfo pci_ss_info_10b5_9054_10b5_2455 =
 	{0x10b5, 0x2455, pci_subsys_10b5_9054_10b5_2455, 0};
 #undef pci_ss_info_10b5_2455
 #define pci_ss_info_10b5_2455 pci_ss_info_10b5_9054_10b5_2455
+static const pciSubsystemInfo pci_ss_info_10b5_9054_10b5_2696 =
+	{0x10b5, 0x2696, pci_subsys_10b5_9054_10b5_2696, 0};
+#undef pci_ss_info_10b5_2696
+#define pci_ss_info_10b5_2696 pci_ss_info_10b5_9054_10b5_2696
 static const pciSubsystemInfo pci_ss_info_10b5_9054_12d9_0002 =
 	{0x12d9, 0x0002, pci_subsys_10b5_9054_12d9_0002, 0};
 #undef pci_ss_info_12d9_0002
@@ -18862,6 +19417,12 @@ static const pciSubsystemInfo pci_ss_info_10b7_9200_1028_0095 =
 #undef pci_ss_info_1028_0095
 #define pci_ss_info_1028_0095 pci_ss_info_10b7_9200_1028_0095
 #ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_10b7_9200_1028_0097 =
+	{0x1028, 0x0097, pci_subsys_10b7_9200_1028_0097, 0};
+#undef pci_ss_info_1028_0097
+#define pci_ss_info_1028_0097 pci_ss_info_10b7_9200_1028_0097
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_10b7_9200_10b7_1000 =
 	{0x10b7, 0x1000, pci_subsys_10b7_9200_10b7_1000, 0};
 #undef pci_ss_info_10b7_1000
@@ -19431,6 +19992,10 @@ static const pciSubsystemInfo pci_ss_info_10de_0101_1043_400b =
 	{0x1043, 0x400b, pci_subsys_10de_0101_1043_400b, 0};
 #undef pci_ss_info_1043_400b
 #define pci_ss_info_1043_400b pci_ss_info_10de_0101_1043_400b
+static const pciSubsystemInfo pci_ss_info_10de_0101_107d_2822 =
+	{0x107d, 0x2822, pci_subsys_10de_0101_107d_2822, 0};
+#undef pci_ss_info_107d_2822
+#define pci_ss_info_107d_2822 pci_ss_info_10de_0101_107d_2822
 static const pciSubsystemInfo pci_ss_info_10de_0101_1102_102e =
 	{0x1102, 0x102e, pci_subsys_10de_0101_1102_102e, 0};
 #undef pci_ss_info_1102_102e
@@ -19495,6 +20060,14 @@ static const pciSubsystemInfo pci_ss_info_10de_0171_147b_8f00 =
 	{0x147b, 0x8f00, pci_subsys_10de_0171_147b_8f00, 0};
 #undef pci_ss_info_147b_8f00
 #define pci_ss_info_147b_8f00 pci_ss_info_10de_0171_147b_8f00
+static const pciSubsystemInfo pci_ss_info_10de_0181_1043_806f =
+	{0x1043, 0x806f, pci_subsys_10de_0181_1043_806f, 0};
+#undef pci_ss_info_1043_806f
+#define pci_ss_info_1043_806f pci_ss_info_10de_0181_1043_806f
+static const pciSubsystemInfo pci_ss_info_10de_0181_1462_8880 =
+	{0x1462, 0x8880, pci_subsys_10de_0181_1462_8880, 0};
+#undef pci_ss_info_1462_8880
+#define pci_ss_info_1462_8880 pci_ss_info_10de_0181_1462_8880
 static const pciSubsystemInfo pci_ss_info_10de_0200_1043_402f =
 	{0x1043, 0x402f, pci_subsys_10de_0200_1043_402f, 0};
 #undef pci_ss_info_1043_402f
@@ -19784,6 +20357,10 @@ static const pciSubsystemInfo pci_ss_info_1106_0571_1179_0001 =
 	{0x1179, 0x0001, pci_subsys_1106_0571_1179_0001, 0};
 #undef pci_ss_info_1179_0001
 #define pci_ss_info_1179_0001 pci_ss_info_1106_0571_1179_0001
+static const pciSubsystemInfo pci_ss_info_1106_0571_1297_f641 =
+	{0x1297, 0xf641, pci_subsys_1106_0571_1297_f641, 0};
+#undef pci_ss_info_1297_f641
+#define pci_ss_info_1297_f641 pci_ss_info_1106_0571_1297_f641
 static const pciSubsystemInfo pci_ss_info_1106_0571_1458_5002 =
 	{0x1458, 0x5002, pci_subsys_1106_0571_1458_5002, 0};
 #undef pci_ss_info_1458_5002
@@ -19872,6 +20449,10 @@ static const pciSubsystemInfo pci_ss_info_1106_3038_1179_0001 =
 	{0x1179, 0x0001, pci_subsys_1106_3038_1179_0001, 0};
 #undef pci_ss_info_1179_0001
 #define pci_ss_info_1179_0001 pci_ss_info_1106_3038_1179_0001
+static const pciSubsystemInfo pci_ss_info_1106_3038_1458_5004 =
+	{0x1458, 0x5004, pci_subsys_1106_3038_1458_5004, 0};
+#undef pci_ss_info_1458_5004
+#define pci_ss_info_1458_5004 pci_ss_info_1106_3038_1458_5004
 static const pciSubsystemInfo pci_ss_info_1106_3043_10bd_0000 =
 	{0x10bd, 0x0000, pci_subsys_1106_3043_10bd_0000, 0};
 #undef pci_ss_info_10bd_0000
@@ -19938,6 +20519,10 @@ static const pciSubsystemInfo pci_ss_info_1106_3059_1043_8095 =
 	{0x1043, 0x8095, pci_subsys_1106_3059_1043_8095, 0};
 #undef pci_ss_info_1043_8095
 #define pci_ss_info_1043_8095 pci_ss_info_1106_3059_1043_8095
+static const pciSubsystemInfo pci_ss_info_1106_3059_1297_c160 =
+	{0x1297, 0xc160, pci_subsys_1106_3059_1297_c160, 0};
+#undef pci_ss_info_1297_c160
+#define pci_ss_info_1297_c160 pci_ss_info_1106_3059_1297_c160
 static const pciSubsystemInfo pci_ss_info_1106_3059_1458_a002 =
 	{0x1458, 0xa002, pci_subsys_1106_3059_1458_a002, 0};
 #undef pci_ss_info_1458_a002
@@ -19974,14 +20559,26 @@ static const pciSubsystemInfo pci_ss_info_1106_3104_1043_808c =
 	{0x1043, 0x808c, pci_subsys_1106_3104_1043_808c, 0};
 #undef pci_ss_info_1043_808c
 #define pci_ss_info_1043_808c pci_ss_info_1106_3104_1043_808c
+static const pciSubsystemInfo pci_ss_info_1106_3104_1297_f641 =
+	{0x1297, 0xf641, pci_subsys_1106_3104_1297_f641, 0};
+#undef pci_ss_info_1297_f641
+#define pci_ss_info_1297_f641 pci_ss_info_1106_3104_1297_f641
 static const pciSubsystemInfo pci_ss_info_1106_3104_1458_5004 =
 	{0x1458, 0x5004, pci_subsys_1106_3104_1458_5004, 0};
 #undef pci_ss_info_1458_5004
 #define pci_ss_info_1458_5004 pci_ss_info_1106_3104_1458_5004
+static const pciSubsystemInfo pci_ss_info_1106_3116_1297_f641 =
+	{0x1297, 0xf641, pci_subsys_1106_3116_1297_f641, 0};
+#undef pci_ss_info_1297_f641
+#define pci_ss_info_1297_f641 pci_ss_info_1106_3116_1297_f641
 static const pciSubsystemInfo pci_ss_info_1106_3177_1043_808c =
 	{0x1043, 0x808c, pci_subsys_1106_3177_1043_808c, 0};
 #undef pci_ss_info_1043_808c
 #define pci_ss_info_1043_808c pci_ss_info_1106_3177_1043_808c
+static const pciSubsystemInfo pci_ss_info_1106_3177_1297_f641 =
+	{0x1297, 0xf641, pci_subsys_1106_3177_1297_f641, 0};
+#undef pci_ss_info_1297_f641
+#define pci_ss_info_1297_f641 pci_ss_info_1106_3177_1297_f641
 static const pciSubsystemInfo pci_ss_info_1106_3177_1458_5001 =
 	{0x1458, 0x5001, pci_subsys_1106_3177_1458_5001, 0};
 #undef pci_ss_info_1458_5001
@@ -20064,6 +20661,14 @@ static const pciSubsystemInfo pci_ss_info_1127_0400_1127_0400 =
 #define pci_ss_info_1127_0400 pci_ss_info_1127_0400_1127_0400
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_1131_7130_5168_0138 =
+	{0x5168, 0x0138, pci_subsys_1131_7130_5168_0138, 0};
+#undef pci_ss_info_5168_0138
+#define pci_ss_info_5168_0138 pci_ss_info_1131_7130_5168_0138
+static const pciSubsystemInfo pci_ss_info_1131_7133_5168_0138 =
+	{0x5168, 0x0138, pci_subsys_1131_7133_5168_0138, 0};
+#undef pci_ss_info_5168_0138
+#define pci_ss_info_5168_0138 pci_ss_info_1131_7133_5168_0138
 static const pciSubsystemInfo pci_ss_info_1131_7146_114b_2003 =
 	{0x114b, 0x2003, pci_subsys_1131_7146_114b_2003, 0};
 #undef pci_ss_info_114b_2003
@@ -20078,38 +20683,102 @@ static const pciSubsystemInfo pci_ss_info_1131_7146_11bd_000a =
 #define pci_ss_info_11bd_000a pci_ss_info_1131_7146_11bd_000a
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
-static const pciSubsystemInfo pci_ss_info_1133_e001_1133_e001 =
-	{0x1133, 0xe001, pci_subsys_1133_e001_1133_e001, 0};
-#undef pci_ss_info_1133_e001
-#define pci_ss_info_1133_e001 pci_ss_info_1133_e001_1133_e001
-static const pciSubsystemInfo pci_ss_info_1133_e002_1133_e002 =
-	{0x1133, 0xe002, pci_subsys_1133_e002_1133_e002, 0};
-#undef pci_ss_info_1133_e002
-#define pci_ss_info_1133_e002 pci_ss_info_1133_e002_1133_e002
-static const pciSubsystemInfo pci_ss_info_1133_e003_1133_e003 =
-	{0x1133, 0xe003, pci_subsys_1133_e003_1133_e003, 0};
-#undef pci_ss_info_1133_e003
-#define pci_ss_info_1133_e003 pci_ss_info_1133_e003_1133_e003
-static const pciSubsystemInfo pci_ss_info_1133_e004_1133_e004 =
-	{0x1133, 0xe004, pci_subsys_1133_e004_1133_e004, 0};
-#undef pci_ss_info_1133_e004
-#define pci_ss_info_1133_e004 pci_ss_info_1133_e004_1133_e004
-static const pciSubsystemInfo pci_ss_info_1133_e005_1133_e005 =
-	{0x1133, 0xe005, pci_subsys_1133_e005_1133_e005, 0};
-#undef pci_ss_info_1133_e005
-#define pci_ss_info_1133_e005 pci_ss_info_1133_e005_1133_e005
-static const pciSubsystemInfo pci_ss_info_1133_e010_1133_e010 =
-	{0x1133, 0xe010, pci_subsys_1133_e010_1133_e010, 0};
-#undef pci_ss_info_1133_e010
-#define pci_ss_info_1133_e010 pci_ss_info_1133_e010_1133_e010
-static const pciSubsystemInfo pci_ss_info_1133_e012_1133_e012 =
-	{0x1133, 0xe012, pci_subsys_1133_e012_1133_e012, 0};
-#undef pci_ss_info_1133_e012
-#define pci_ss_info_1133_e012 pci_ss_info_1133_e012_1133_e012
-static const pciSubsystemInfo pci_ss_info_1133_e014_1133_e014 =
-	{0x1133, 0xe014, pci_subsys_1133_e014_1133_e014, 0};
-#undef pci_ss_info_1133_e014
-#define pci_ss_info_1133_e014 pci_ss_info_1133_e014_1133_e014
+static const pciSubsystemInfo pci_ss_info_1133_e010_110a_0021 =
+	{0x110a, 0x0021, pci_subsys_1133_e010_110a_0021, 0};
+#undef pci_ss_info_110a_0021
+#define pci_ss_info_110a_0021 pci_ss_info_1133_e010_110a_0021
+static const pciSubsystemInfo pci_ss_info_1133_e010_8001_0014 =
+	{0x8001, 0x0014, pci_subsys_1133_e010_8001_0014, 0};
+#undef pci_ss_info_8001_0014
+#define pci_ss_info_8001_0014 pci_ss_info_1133_e010_8001_0014
+static const pciSubsystemInfo pci_ss_info_1133_e012_8001_0014 =
+	{0x8001, 0x0014, pci_subsys_1133_e012_8001_0014, 0};
+#undef pci_ss_info_8001_0014
+#define pci_ss_info_8001_0014 pci_ss_info_1133_e012_8001_0014
+static const pciSubsystemInfo pci_ss_info_1133_e013_8001_0014 =
+	{0x8001, 0x0014, pci_subsys_1133_e013_8001_0014, 0};
+#undef pci_ss_info_8001_0014
+#define pci_ss_info_8001_0014 pci_ss_info_1133_e013_8001_0014
+static const pciSubsystemInfo pci_ss_info_1133_e014_0008_0100 =
+	{0x0008, 0x0100, pci_subsys_1133_e014_0008_0100, 0};
+#undef pci_ss_info_0008_0100
+#define pci_ss_info_0008_0100 pci_ss_info_1133_e014_0008_0100
+static const pciSubsystemInfo pci_ss_info_1133_e014_8001_0014 =
+	{0x8001, 0x0014, pci_subsys_1133_e014_8001_0014, 0};
+#undef pci_ss_info_8001_0014
+#define pci_ss_info_8001_0014 pci_ss_info_1133_e014_8001_0014
+static const pciSubsystemInfo pci_ss_info_1133_e015_8001_0014 =
+	{0x8001, 0x0014, pci_subsys_1133_e015_8001_0014, 0};
+#undef pci_ss_info_8001_0014
+#define pci_ss_info_8001_0014 pci_ss_info_1133_e015_8001_0014
+static const pciSubsystemInfo pci_ss_info_1133_e016_8001_0014 =
+	{0x8001, 0x0014, pci_subsys_1133_e016_8001_0014, 0};
+#undef pci_ss_info_8001_0014
+#define pci_ss_info_8001_0014 pci_ss_info_1133_e016_8001_0014
+static const pciSubsystemInfo pci_ss_info_1133_e017_8001_0014 =
+	{0x8001, 0x0014, pci_subsys_1133_e017_8001_0014, 0};
+#undef pci_ss_info_8001_0014
+#define pci_ss_info_8001_0014 pci_ss_info_1133_e017_8001_0014
+static const pciSubsystemInfo pci_ss_info_1133_e018_8001_0014 =
+	{0x8001, 0x0014, pci_subsys_1133_e018_8001_0014, 0};
+#undef pci_ss_info_8001_0014
+#define pci_ss_info_8001_0014 pci_ss_info_1133_e018_8001_0014
+static const pciSubsystemInfo pci_ss_info_1133_e019_8001_0014 =
+	{0x8001, 0x0014, pci_subsys_1133_e019_8001_0014, 0};
+#undef pci_ss_info_8001_0014
+#define pci_ss_info_8001_0014 pci_ss_info_1133_e019_8001_0014
+static const pciSubsystemInfo pci_ss_info_1133_e01b_8001_0014 =
+	{0x8001, 0x0014, pci_subsys_1133_e01b_8001_0014, 0};
+#undef pci_ss_info_8001_0014
+#define pci_ss_info_8001_0014 pci_ss_info_1133_e01b_8001_0014
+static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c01 =
+	{0x1133, 0x1c01, pci_subsys_1133_e01c_1133_1c01, 0};
+#undef pci_ss_info_1133_1c01
+#define pci_ss_info_1133_1c01 pci_ss_info_1133_e01c_1133_1c01
+static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c02 =
+	{0x1133, 0x1c02, pci_subsys_1133_e01c_1133_1c02, 0};
+#undef pci_ss_info_1133_1c02
+#define pci_ss_info_1133_1c02 pci_ss_info_1133_e01c_1133_1c02
+static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c03 =
+	{0x1133, 0x1c03, pci_subsys_1133_e01c_1133_1c03, 0};
+#undef pci_ss_info_1133_1c03
+#define pci_ss_info_1133_1c03 pci_ss_info_1133_e01c_1133_1c03
+static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c04 =
+	{0x1133, 0x1c04, pci_subsys_1133_e01c_1133_1c04, 0};
+#undef pci_ss_info_1133_1c04
+#define pci_ss_info_1133_1c04 pci_ss_info_1133_e01c_1133_1c04
+static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c05 =
+	{0x1133, 0x1c05, pci_subsys_1133_e01c_1133_1c05, 0};
+#undef pci_ss_info_1133_1c05
+#define pci_ss_info_1133_1c05 pci_ss_info_1133_e01c_1133_1c05
+static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c06 =
+	{0x1133, 0x1c06, pci_subsys_1133_e01c_1133_1c06, 0};
+#undef pci_ss_info_1133_1c06
+#define pci_ss_info_1133_1c06 pci_ss_info_1133_e01c_1133_1c06
+static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c07 =
+	{0x1133, 0x1c07, pci_subsys_1133_e01c_1133_1c07, 0};
+#undef pci_ss_info_1133_1c07
+#define pci_ss_info_1133_1c07 pci_ss_info_1133_e01c_1133_1c07
+static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c08 =
+	{0x1133, 0x1c08, pci_subsys_1133_e01c_1133_1c08, 0};
+#undef pci_ss_info_1133_1c08
+#define pci_ss_info_1133_1c08 pci_ss_info_1133_e01c_1133_1c08
+static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c09 =
+	{0x1133, 0x1c09, pci_subsys_1133_e01c_1133_1c09, 0};
+#undef pci_ss_info_1133_1c09
+#define pci_ss_info_1133_1c09 pci_ss_info_1133_e01c_1133_1c09
+static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c0a =
+	{0x1133, 0x1c0a, pci_subsys_1133_e01c_1133_1c0a, 0};
+#undef pci_ss_info_1133_1c0a
+#define pci_ss_info_1133_1c0a pci_ss_info_1133_e01c_1133_1c0a
+static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c0b =
+	{0x1133, 0x1c0b, pci_subsys_1133_e01c_1133_1c0b, 0};
+#undef pci_ss_info_1133_1c0b
+#define pci_ss_info_1133_1c0b pci_ss_info_1133_e01c_1133_1c0b
+static const pciSubsystemInfo pci_ss_info_1133_e01c_1133_1c0c =
+	{0x1133, 0x1c0c, pci_subsys_1133_e01c_1133_1c0c, 0};
+#undef pci_ss_info_1133_1c0c
+#define pci_ss_info_1133_1c0c pci_ss_info_1133_e01c_1133_1c0c
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 #endif
@@ -20410,6 +21079,28 @@ static const pciSubsystemInfo pci_ss_info_1163_2000_1092_2000 =
 #undef pci_ss_info_1092_2000
 #define pci_ss_info_1092_2000 pci_ss_info_1163_2000_1092_2000
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_1166_0201_4c53_1080 =
+	{0x4c53, 0x1080, pci_subsys_1166_0201_4c53_1080, 0};
+#undef pci_ss_info_4c53_1080
+#define pci_ss_info_4c53_1080 pci_ss_info_1166_0201_4c53_1080
+static const pciSubsystemInfo pci_ss_info_1166_0212_4c53_1080 =
+	{0x4c53, 0x1080, pci_subsys_1166_0212_4c53_1080, 0};
+#undef pci_ss_info_4c53_1080
+#define pci_ss_info_4c53_1080 pci_ss_info_1166_0212_4c53_1080
+static const pciSubsystemInfo pci_ss_info_1166_0220_4c53_1080 =
+	{0x4c53, 0x1080, pci_subsys_1166_0220_4c53_1080, 0};
+#undef pci_ss_info_4c53_1080
+#define pci_ss_info_4c53_1080 pci_ss_info_1166_0220_4c53_1080
+static const pciSubsystemInfo pci_ss_info_1166_0225_4c53_1080 =
+	{0x4c53, 0x1080, pci_subsys_1166_0225_4c53_1080, 0};
+#undef pci_ss_info_4c53_1080
+#define pci_ss_info_4c53_1080 pci_ss_info_1166_0225_4c53_1080
+static const pciSubsystemInfo pci_ss_info_1166_0227_4c53_1080 =
+	{0x4c53, 0x1080, pci_subsys_1166_0227_4c53_1080, 0};
+#undef pci_ss_info_4c53_1080
+#define pci_ss_info_4c53_1080 pci_ss_info_1166_0227_4c53_1080
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_1179_0d01_1179_0001 =
 	{0x1179, 0x0001, pci_subsys_1179_0d01_1179_0001, 0};
 #undef pci_ss_info_1179_0001
@@ -20780,6 +21471,12 @@ static const pciSubsystemInfo pci_ss_info_11c1_044a_144f_1005 =
 	{0x144f, 0x1005, pci_subsys_11c1_044a_144f_1005, 0};
 #undef pci_ss_info_144f_1005
 #define pci_ss_info_144f_1005 pci_ss_info_11c1_044a_144f_1005
+#endif
+static const pciSubsystemInfo pci_ss_info_11c1_0450_1033_80a8 =
+	{0x1033, 0x80a8, pci_subsys_11c1_0450_1033_80a8, 0};
+#undef pci_ss_info_1033_80a8
+#define pci_ss_info_1033_80a8 pci_ss_info_11c1_0450_1033_80a8
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_11c1_0450_144f_4005 =
 	{0x144f, 0x4005, pci_subsys_11c1_0450_144f_4005, 0};
 #undef pci_ss_info_144f_4005
@@ -21119,6 +21816,12 @@ static const pciSubsystemInfo pci_ss_info_125d_1989_125d_1989 =
 #undef pci_ss_info_125d_1989
 #define pci_ss_info_125d_1989 pci_ss_info_125d_1989_125d_1989
 #endif
+static const pciSubsystemInfo pci_ss_info_125d_1998_1028_00b1 =
+	{0x1028, 0x00b1, pci_subsys_125d_1998_1028_00b1, 0};
+#undef pci_ss_info_1028_00b1
+#define pci_ss_info_1028_00b1 pci_ss_info_125d_1998_1028_00b1
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
 static const pciSubsystemInfo pci_ss_info_125d_1998_1028_00e6 =
 	{0x1028, 0x00e6, pci_subsys_125d_1998_1028_00e6, 0};
 #undef pci_ss_info_1028_00e6
@@ -22166,6 +22869,10 @@ static const pciSubsystemInfo pci_ss_info_131f_2030_131f_2030 =
 #define pci_ss_info_131f_2030 pci_ss_info_131f_2030_131f_2030
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_134d_7890_134d_0001 =
+	{0x134d, 0x0001, pci_subsys_134d_7890_134d_0001, 0};
+#undef pci_ss_info_134d_0001
+#define pci_ss_info_134d_0001 pci_ss_info_134d_7890_134d_0001
 static const pciSubsystemInfo pci_ss_info_134d_7891_134d_0001 =
 	{0x134d, 0x0001, pci_subsys_134d_7891_134d_0001, 0};
 #undef pci_ss_info_134d_0001
@@ -22206,6 +22913,10 @@ static const pciSubsystemInfo pci_ss_info_13f6_0111_1019_0970 =
 	{0x1019, 0x0970, pci_subsys_13f6_0111_1019_0970, 0};
 #undef pci_ss_info_1019_0970
 #define pci_ss_info_1019_0970 pci_ss_info_13f6_0111_1019_0970
+static const pciSubsystemInfo pci_ss_info_13f6_0111_1043_8035 =
+	{0x1043, 0x8035, pci_subsys_13f6_0111_1043_8035, 0};
+#undef pci_ss_info_1043_8035
+#define pci_ss_info_1043_8035 pci_ss_info_13f6_0111_1043_8035
 static const pciSubsystemInfo pci_ss_info_13f6_0111_1043_8077 =
 	{0x1043, 0x8077, pci_subsys_13f6_0111_1043_8077, 0};
 #undef pci_ss_info_1043_8077
@@ -22570,6 +23281,10 @@ static const pciSubsystemInfo pci_ss_info_14e4_16c7_14e4_000a =
 	{0x14e4, 0x000a, pci_subsys_14e4_16c7_14e4_000a, 0};
 #undef pci_ss_info_14e4_000a
 #define pci_ss_info_14e4_000a pci_ss_info_14e4_16c7_14e4_000a
+static const pciSubsystemInfo pci_ss_info_14e4_4320_1737_4320 =
+	{0x1737, 0x4320, pci_subsys_14e4_4320_1737_4320, 0};
+#undef pci_ss_info_1737_4320
+#define pci_ss_info_1737_4320 pci_ss_info_14e4_4320_1737_4320
 static const pciSubsystemInfo pci_ss_info_14e4_4401_1043_80a8 =
 	{0x1043, 0x80a8, pci_subsys_14e4_4401_1043_80a8, 0};
 #undef pci_ss_info_1043_80a8
@@ -22864,6 +23579,18 @@ static const pciSubsystemInfo pci_ss_info_1813_4100_16be_0002 =
 #define pci_ss_info_16be_0002 pci_ss_info_1813_4100_16be_0002
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_3388_0021_4c53_1050 =
+	{0x4c53, 0x1050, pci_subsys_3388_0021_4c53_1050, 0};
+#undef pci_ss_info_4c53_1050
+#define pci_ss_info_4c53_1050 pci_ss_info_3388_0021_4c53_1050
+static const pciSubsystemInfo pci_ss_info_3388_0021_4c53_1080 =
+	{0x4c53, 0x1080, pci_subsys_3388_0021_4c53_1080, 0};
+#undef pci_ss_info_4c53_1080
+#define pci_ss_info_4c53_1080 pci_ss_info_3388_0021_4c53_1080
+static const pciSubsystemInfo pci_ss_info_3388_0021_4c53_3010 =
+	{0x4c53, 0x3010, pci_subsys_3388_0021_4c53_3010, 0};
+#undef pci_ss_info_4c53_3010
+#define pci_ss_info_4c53_3010 pci_ss_info_3388_0021_4c53_3010
 static const pciSubsystemInfo pci_ss_info_3388_8011_3388_8011 =
 	{0x3388, 0x8011, pci_subsys_3388_8011_3388_8011, 0};
 #undef pci_ss_info_3388_8011
@@ -24918,6 +25645,8 @@ static const pciSubsystemInfo *pci_ss_list_1000_000f[] = {
 	&pci_ss_info_1000_000f_0e11_7004,
 	&pci_ss_info_1000_000f_1092_8760,
 	&pci_ss_info_1000_000f_1de1_3904,
+	&pci_ss_info_1000_000f_4c53_1000,
+	&pci_ss_info_1000_000f_4c53_1050,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_1000_0010[] = {
@@ -24931,7 +25660,12 @@ static const pciSubsystemInfo *pci_ss_list_1000_0020[] = {
 	&pci_ss_info_1000_0020_1de1_1020,
 	NULL
 };
-#define pci_ss_list_1000_0021 NULL
+static const pciSubsystemInfo *pci_ss_list_1000_0021[] = {
+	&pci_ss_info_1000_0021_4c53_1080,
+	&pci_ss_info_1000_0021_4c53_1300,
+	&pci_ss_info_1000_0021_4c53_1310,
+	NULL
+};
 static const pciSubsystemInfo *pci_ss_list_1000_0030[] = {
 	&pci_ss_info_1000_0030_1028_1010,
 	NULL
@@ -24980,6 +25714,7 @@ static const pciSubsystemInfo *pci_ss_list_1000_1960[] = {
 #define pci_ss_list_1002_4146 NULL
 #define pci_ss_list_1002_4147 NULL
 #define pci_ss_list_1002_4158 NULL
+#define pci_ss_list_1002_4164 NULL
 static const pciSubsystemInfo *pci_ss_list_1002_4242[] = {
 	&pci_ss_info_1002_4242_1002_02aa,
 	NULL
@@ -25050,6 +25785,7 @@ static const pciSubsystemInfo *pci_ss_list_1002_4752[] = {
 	&pci_ss_info_1002_4752_1002_0008,
 	&pci_ss_info_1002_4752_1002_4752,
 	&pci_ss_info_1002_4752_1002_8008,
+	&pci_ss_info_1002_4752_1028_00ce,
 	&pci_ss_info_1002_4752_1028_00d1,
 	NULL
 };
@@ -25105,7 +25841,10 @@ static const pciSubsystemInfo *pci_ss_list_1002_4c42[] = {
 };
 #define pci_ss_list_1002_4c44 NULL
 #define pci_ss_list_1002_4c45 NULL
-#define pci_ss_list_1002_4c46 NULL
+static const pciSubsystemInfo *pci_ss_list_1002_4c46[] = {
+	&pci_ss_info_1002_4c46_1028_00b1,
+	NULL
+};
 #define pci_ss_list_1002_4c47 NULL
 static const pciSubsystemInfo *pci_ss_list_1002_4c49[] = {
 	&pci_ss_info_1002_4c49_1002_0004,
@@ -25116,8 +25855,10 @@ static const pciSubsystemInfo *pci_ss_list_1002_4c49[] = {
 };
 static const pciSubsystemInfo *pci_ss_list_1002_4c4d[] = {
 	&pci_ss_info_1002_4c4d_0e11_b111,
+	&pci_ss_info_1002_4c4d_0e11_b160,
 	&pci_ss_info_1002_4c4d_1002_0084,
 	&pci_ss_info_1002_4c4d_1014_0154,
+	&pci_ss_info_1002_4c4d_1028_00aa,
 	NULL
 };
 #define pci_ss_list_1002_4c4e NULL
@@ -25147,6 +25888,7 @@ static const pciSubsystemInfo *pci_ss_list_1002_4c59[] = {
 #define pci_ss_list_1002_4c65 NULL
 #define pci_ss_list_1002_4c66 NULL
 #define pci_ss_list_1002_4c67 NULL
+#define pci_ss_list_1002_4c6e NULL
 #define pci_ss_list_1002_4d46 NULL
 #define pci_ss_list_1002_4d4c NULL
 #define pci_ss_list_1002_4e44 NULL
@@ -25158,7 +25900,10 @@ static const pciSubsystemInfo *pci_ss_list_1002_4e45[] = {
 #define pci_ss_list_1002_4e47 NULL
 #define pci_ss_list_1002_4e48 NULL
 #define pci_ss_list_1002_4e64 NULL
-#define pci_ss_list_1002_4e65 NULL
+static const pciSubsystemInfo *pci_ss_list_1002_4e65[] = {
+	&pci_ss_info_1002_4e65_1002_0003,
+	NULL
+};
 #define pci_ss_list_1002_4e66 NULL
 #define pci_ss_list_1002_4e67 NULL
 #define pci_ss_list_1002_4e68 NULL
@@ -25343,8 +26088,10 @@ static const pciSubsystemInfo *pci_ss_list_1002_5654[] = {
 };
 #define pci_ss_list_1002_5655 NULL
 #define pci_ss_list_1002_5656 NULL
+#define pci_ss_list_1002_5961 NULL
 #define pci_ss_list_1002_700f NULL
 #define pci_ss_list_1002_7010 NULL
+#define pci_ss_list_1002_cab0 NULL
 #define pci_ss_list_1002_cab2 NULL
 #define pci_ss_list_1003_0201 NULL
 #define pci_ss_list_1004_0005 NULL
@@ -25398,8 +26145,17 @@ static const pciSubsystemInfo *pci_ss_list_1004_0306[] = {
 #define pci_ss_list_100b_000f NULL
 #define pci_ss_list_100b_0011 NULL
 #define pci_ss_list_100b_0012 NULL
-#define pci_ss_list_100b_0020 NULL
+static const pciSubsystemInfo *pci_ss_list_100b_0020[] = {
+	&pci_ss_info_100b_0020_1385_f311,
+	NULL
+};
 #define pci_ss_list_100b_0022 NULL
+#define pci_ss_list_100b_0028 NULL
+#define pci_ss_list_100b_002b NULL
+#define pci_ss_list_100b_002d NULL
+#define pci_ss_list_100b_002e NULL
+#define pci_ss_list_100b_002f NULL
+#define pci_ss_list_100b_0030 NULL
 #define pci_ss_list_100b_0500 NULL
 #define pci_ss_list_100b_0501 NULL
 #define pci_ss_list_100b_0502 NULL
@@ -25505,6 +26261,8 @@ static const pciSubsystemInfo *pci_ss_list_1011_0046[] = {
 	&pci_ss_info_1011_0046_0e11_4058,
 	&pci_ss_info_1011_0046_103c_10c2,
 	&pci_ss_info_1011_0046_12d9_000a,
+	&pci_ss_info_1011_0046_4c53_1050,
+	&pci_ss_info_1011_0046_4c53_1051,
 	&pci_ss_info_1011_0046_9005_0365,
 	&pci_ss_info_1011_0046_9005_1364,
 	&pci_ss_info_1011_0046_9005_1365,
@@ -25589,8 +26347,10 @@ static const pciSubsystemInfo *pci_ss_list_1014_002e[] = {
 	&pci_ss_info_1014_002e_1014_022e,
 	NULL
 };
+#define pci_ss_list_1014_0031 NULL
 #define pci_ss_list_1014_0036 NULL
 #define pci_ss_list_1014_003a NULL
+#define pci_ss_list_1014_003c NULL
 static const pciSubsystemInfo *pci_ss_list_1014_003e[] = {
 	&pci_ss_info_1014_003e_1014_003e,
 	&pci_ss_info_1014_003e_1014_00cd,
@@ -25610,14 +26370,18 @@ static const pciSubsystemInfo *pci_ss_list_1014_003e[] = {
 #define pci_ss_list_1014_004f NULL
 #define pci_ss_list_1014_0050 NULL
 #define pci_ss_list_1014_0053 NULL
+#define pci_ss_list_1014_0054 NULL
 #define pci_ss_list_1014_0057 NULL
 #define pci_ss_list_1014_005c NULL
+#define pci_ss_list_1014_005e NULL
 #define pci_ss_list_1014_007c NULL
 #define pci_ss_list_1014_007d NULL
+#define pci_ss_list_1014_008e NULL
 static const pciSubsystemInfo *pci_ss_list_1014_0090[] = {
 	&pci_ss_info_1014_0090_1014_008e,
 	NULL
 };
+#define pci_ss_list_1014_0091 NULL
 #define pci_ss_list_1014_0095 NULL
 static const pciSubsystemInfo *pci_ss_list_1014_0096[] = {
 	&pci_ss_info_1014_0096_1014_0097,
@@ -25625,12 +26389,15 @@ static const pciSubsystemInfo *pci_ss_list_1014_0096[] = {
 	&pci_ss_info_1014_0096_1014_0099,
 	NULL
 };
+#define pci_ss_list_1014_009f NULL
 #define pci_ss_list_1014_00a5 NULL
 #define pci_ss_list_1014_00a6 NULL
 #define pci_ss_list_1014_00b7 NULL
+#define pci_ss_list_1014_00b8 NULL
 #define pci_ss_list_1014_00be NULL
 #define pci_ss_list_1014_00dc NULL
 #define pci_ss_list_1014_00fc NULL
+#define pci_ss_list_1014_0104 NULL
 #define pci_ss_list_1014_0105 NULL
 #define pci_ss_list_1014_010f NULL
 static const pciSubsystemInfo *pci_ss_list_1014_0142[] = {
@@ -25642,6 +26409,16 @@ static const pciSubsystemInfo *pci_ss_list_1014_0144[] = {
 	NULL
 };
 #define pci_ss_list_1014_0156 NULL
+#define pci_ss_list_1014_015e NULL
+#define pci_ss_list_1014_0160 NULL
+#define pci_ss_list_1014_016e NULL
+#define pci_ss_list_1014_0170 NULL
+#define pci_ss_list_1014_017d NULL
+static const pciSubsystemInfo *pci_ss_list_1014_0180[] = {
+	&pci_ss_info_1014_0180_1014_0241,
+	&pci_ss_info_1014_0180_1014_0264,
+	NULL
+};
 #define pci_ss_list_1014_01a7 NULL
 static const pciSubsystemInfo *pci_ss_list_1014_01bd[] = {
 	&pci_ss_info_1014_01bd_1014_01be,
@@ -25653,6 +26430,21 @@ static const pciSubsystemInfo *pci_ss_list_1014_01bd[] = {
 	&pci_ss_info_1014_01bd_1014_0259,
 	NULL
 };
+#define pci_ss_list_1014_01c1 NULL
+#define pci_ss_list_1014_01e6 NULL
+#define pci_ss_list_1014_01ff NULL
+static const pciSubsystemInfo *pci_ss_list_1014_0219[] = {
+	&pci_ss_info_1014_0219_1014_021a,
+	&pci_ss_info_1014_0219_1014_0251,
+	&pci_ss_info_1014_0219_1014_0252,
+	NULL
+};
+#define pci_ss_list_1014_021b NULL
+#define pci_ss_list_1014_021c NULL
+#define pci_ss_list_1014_0233 NULL
+#define pci_ss_list_1014_0266 NULL
+#define pci_ss_list_1014_0268 NULL
+#define pci_ss_list_1014_0269 NULL
 #define pci_ss_list_1014_0302 NULL
 #define pci_ss_list_1014_ffff NULL
 #endif
@@ -25709,6 +26501,12 @@ static const pciSubsystemInfo *pci_ss_list_1022_2000[] = {
 	&pci_ss_info_1022_2000_1259_2454,
 	&pci_ss_info_1022_2000_1259_2700,
 	&pci_ss_info_1022_2000_1259_2701,
+	&pci_ss_info_1022_2000_4c53_1000,
+	&pci_ss_info_1022_2000_4c53_1010,
+	&pci_ss_info_1022_2000_4c53_1020,
+	&pci_ss_info_1022_2000_4c53_1030,
+	&pci_ss_info_1022_2000_4c53_1040,
+	&pci_ss_info_1022_2000_4c53_1060,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_1022_2001[] = {
@@ -25716,6 +26514,7 @@ static const pciSubsystemInfo *pci_ss_list_1022_2001[] = {
 	&pci_ss_info_1022_2001_1668_0299,
 	NULL
 };
+#define pci_ss_list_1022_2003 NULL
 #define pci_ss_list_1022_2020 NULL
 #define pci_ss_list_1022_2040 NULL
 #define pci_ss_list_1022_3000 NULL
@@ -25764,6 +26563,7 @@ static const pciSubsystemInfo *pci_ss_list_1022_7443[] = {
 #define pci_ss_list_1022_746b NULL
 #define pci_ss_list_1022_746d NULL
 #define pci_ss_list_1022_746e NULL
+#define pci_ss_list_1022_756b NULL
 #define pci_ss_list_1023_0194 NULL
 #define pci_ss_list_1023_2000 NULL
 #define pci_ss_list_1023_2001 NULL
@@ -26075,6 +26875,12 @@ static const pciSubsystemInfo *pci_ss_list_102b_2527[] = {
 #define pci_ss_list_102c_00b8 NULL
 static const pciSubsystemInfo *pci_ss_list_102c_00c0[] = {
 	&pci_ss_info_102c_00c0_102c_00c0,
+	&pci_ss_info_102c_00c0_4c53_1000,
+	&pci_ss_info_102c_00c0_4c53_1010,
+	&pci_ss_info_102c_00c0_4c53_1020,
+	&pci_ss_info_102c_00c0_4c53_1030,
+	&pci_ss_info_102c_00c0_4c53_1050,
+	&pci_ss_info_102c_00c0_4c53_1051,
 	NULL
 };
 #define pci_ss_list_102c_00d0 NULL
@@ -26089,7 +26895,13 @@ static const pciSubsystemInfo *pci_ss_list_102c_00e5[] = {
 #define pci_ss_list_102c_00f0 NULL
 #define pci_ss_list_102c_00f4 NULL
 #define pci_ss_list_102c_00f5 NULL
-#define pci_ss_list_102c_0c30 NULL
+static const pciSubsystemInfo *pci_ss_list_102c_0c30[] = {
+	&pci_ss_info_102c_0c30_4c53_1000,
+	&pci_ss_info_102c_0c30_4c53_1050,
+	&pci_ss_info_102c_0c30_4c53_1051,
+	&pci_ss_info_102c_0c30_4c53_1080,
+	NULL
+};
 #define pci_ss_list_102d_50dc NULL
 #define pci_ss_list_102f_0009 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -26102,6 +26914,7 @@ static const pciSubsystemInfo *pci_ss_list_102f_0020[] = {
 #define pci_ss_list_1031_5607 NULL
 #define pci_ss_list_1031_5631 NULL
 #define pci_ss_list_1031_6057 NULL
+#define pci_ss_list_1033_0000 NULL
 #define pci_ss_list_1033_0001 NULL
 #define pci_ss_list_1033_0002 NULL
 #define pci_ss_list_1033_0003 NULL
@@ -26150,11 +26963,13 @@ static const pciSubsystemInfo *pci_ss_list_1033_00cd[] = {
 	&pci_ss_info_1033_00cd_12ee_8011,
 	NULL
 };
+#define pci_ss_list_1033_00df NULL
 static const pciSubsystemInfo *pci_ss_list_1033_00e0[] = {
 	&pci_ss_info_1033_00e0_12ee_7001,
 	&pci_ss_info_1033_00e0_1799_0002,
 	NULL
 };
+#define pci_ss_list_1033_00f3 NULL
 #define pci_ss_list_1036_0000 NULL
 #define pci_ss_list_1039_0001 NULL
 #define pci_ss_list_1039_0002 NULL
@@ -26196,9 +27011,11 @@ static const pciSubsystemInfo *pci_ss_list_1039_0300[] = {
 #define pci_ss_list_1039_0735 NULL
 #define pci_ss_list_1039_0740 NULL
 #define pci_ss_list_1039_0745 NULL
+#define pci_ss_list_1039_0746 NULL
 #define pci_ss_list_1039_0755 NULL
 static const pciSubsystemInfo *pci_ss_list_1039_0900[] = {
 	&pci_ss_info_1039_0900_1039_0900,
+	&pci_ss_info_1039_0900_1043_8035,
 	NULL
 };
 #define pci_ss_list_1039_0961 NULL
@@ -26212,6 +27029,7 @@ static const pciSubsystemInfo *pci_ss_list_1039_0900[] = {
 static const pciSubsystemInfo *pci_ss_list_1039_5513[] = {
 	&pci_ss_info_1039_5513_1019_0970,
 	&pci_ss_info_1039_5513_1039_5513,
+	&pci_ss_info_1039_5513_1043_8035,
 	NULL
 };
 #define pci_ss_list_1039_5517 NULL
@@ -26227,6 +27045,7 @@ static const pciSubsystemInfo *pci_ss_list_1039_5513[] = {
 #define pci_ss_list_1039_6236 NULL
 static const pciSubsystemInfo *pci_ss_list_1039_6300[] = {
 	&pci_ss_info_1039_6300_1019_0970,
+	&pci_ss_info_1039_6300_1043_8035,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_1039_6306[] = {
@@ -26283,6 +27102,7 @@ static const pciSubsystemInfo *pci_ss_list_1039_7018[] = {
 	&pci_ss_info_1039_7018_a0a0_0022,
 	NULL
 };
+#define pci_ss_list_1039_7019 NULL
 #define pci_ss_list_103c_1005 NULL
 #define pci_ss_list_103c_1006 NULL
 #define pci_ss_list_103c_1008 NULL
@@ -26343,6 +27163,7 @@ static const pciSubsystemInfo *pci_ss_list_103c_1048[] = {
 #define pci_ss_list_1042_3020 NULL
 #define pci_ss_list_1043_0675 NULL
 #define pci_ss_list_1043_4021 NULL
+#define pci_ss_list_1043_4057 NULL
 #define pci_ss_list_1044_1012 NULL
 #define pci_ss_list_1044_a400 NULL
 #define pci_ss_list_1044_a500 NULL
@@ -26415,11 +27236,18 @@ static const pciSubsystemInfo *pci_ss_list_1044_a501[] = {
 #define pci_ss_list_104a_0008 NULL
 #define pci_ss_list_104a_0009 NULL
 #define pci_ss_list_104a_0010 NULL
+#define pci_ss_list_104a_0209 NULL
+#define pci_ss_list_104a_020a NULL
 #define pci_ss_list_104a_0210 NULL
+#define pci_ss_list_104a_021a NULL
+#define pci_ss_list_104a_021b NULL
+#define pci_ss_list_104a_0500 NULL
+#define pci_ss_list_104a_0564 NULL
 #define pci_ss_list_104a_0981 NULL
 #define pci_ss_list_104a_1746 NULL
 #define pci_ss_list_104a_2774 NULL
 #define pci_ss_list_104a_3520 NULL
+#define pci_ss_list_104a_55cc NULL
 #define pci_ss_list_104b_0140 NULL
 #define pci_ss_list_104b_1040 NULL
 #define pci_ss_list_104b_8130 NULL
@@ -26482,7 +27310,10 @@ static const pciSubsystemInfo *pci_ss_list_104c_8027[] = {
 	&pci_ss_info_104c_8027_1028_00e6,
 	NULL
 };
+#define pci_ss_list_104c_8029 NULL
 #define pci_ss_list_104c_8400 NULL
+#define pci_ss_list_104c_8401 NULL
+#define pci_ss_list_104c_9000 NULL
 #define pci_ss_list_104c_a001 NULL
 #define pci_ss_list_104c_a100 NULL
 #define pci_ss_list_104c_a102 NULL
@@ -26501,7 +27332,10 @@ static const pciSubsystemInfo *pci_ss_list_104c_ac1b[] = {
 	&pci_ss_info_104c_ac1b_0e11_b113,
 	NULL
 };
-#define pci_ss_list_104c_ac1c NULL
+static const pciSubsystemInfo *pci_ss_list_104c_ac1c[] = {
+	&pci_ss_info_104c_ac1c_0e11_b121,
+	NULL
+};
 #define pci_ss_list_104c_ac1d NULL
 #define pci_ss_list_104c_ac1e NULL
 #define pci_ss_list_104c_ac1f NULL
@@ -26517,9 +27351,11 @@ static const pciSubsystemInfo *pci_ss_list_104c_ac42[] = {
 	&pci_ss_info_104c_ac42_1028_00e6,
 	NULL
 };
+#define pci_ss_list_104c_ac44 NULL
 #define pci_ss_list_104c_ac50 NULL
 static const pciSubsystemInfo *pci_ss_list_104c_ac51[] = {
 	&pci_ss_info_104c_ac51_1014_023b,
+	&pci_ss_info_104c_ac51_1028_00b1,
 	&pci_ss_info_104c_ac51_10cf_1095,
 	&pci_ss_info_104c_ac51_e4bf_1000,
 	NULL
@@ -26610,6 +27446,7 @@ static const pciSubsystemInfo *pci_ss_list_105a_0d38[] = {
 	NULL
 };
 #define pci_ss_list_105a_1275 NULL
+#define pci_ss_list_105a_3318 NULL
 static const pciSubsystemInfo *pci_ss_list_105a_3376[] = {
 	&pci_ss_info_105a_3376_1043_809e,
 	NULL
@@ -26648,6 +27485,7 @@ static const pciSubsystemInfo *pci_ss_list_105a_6269[] = {
 	NULL
 };
 #define pci_ss_list_105a_6621 NULL
+#define pci_ss_list_105a_6629 NULL
 #define pci_ss_list_105a_7275 NULL
 #endif
 #define pci_ss_list_105d_2309 NULL
@@ -26726,6 +27564,7 @@ static const pciSubsystemInfo *pci_ss_list_105d_5348[] = {
 #define pci_ss_list_1069_0002 NULL
 #define pci_ss_list_1069_0010 NULL
 #define pci_ss_list_1069_0050 NULL
+#define pci_ss_list_1069_b166 NULL
 #define pci_ss_list_1069_ba55 NULL
 #define pci_ss_list_1069_ba56 NULL
 #define pci_ss_list_106b_0001 NULL
@@ -26949,6 +27788,8 @@ static const pciSubsystemInfo *pci_ss_list_108d_0019[] = {
 #define pci_ss_list_1093_1190 NULL
 #define pci_ss_list_1093_1330 NULL
 #define pci_ss_list_1093_1350 NULL
+#define pci_ss_list_1093_17d0 NULL
+#define pci_ss_list_1093_2410 NULL
 #define pci_ss_list_1093_2a60 NULL
 #define pci_ss_list_1093_b001 NULL
 #define pci_ss_list_1093_b011 NULL
@@ -27215,6 +28056,7 @@ static const pciSubsystemInfo *pci_ss_list_10b5_9050[] = {
 };
 static const pciSubsystemInfo *pci_ss_list_10b5_9054[] = {
 	&pci_ss_info_10b5_9054_10b5_2455,
+	&pci_ss_info_10b5_9054_10b5_2696,
 	&pci_ss_info_10b5_9054_12d9_0002,
 	NULL
 };
@@ -27230,6 +28072,7 @@ static const pciSubsystemInfo *pci_ss_list_10b5_9080[] = {
 	&pci_ss_info_10b5_9080_12d9_0002,
 	NULL
 };
+#define pci_ss_list_10b5_bb04 NULL
 #endif
 #define pci_ss_list_10b6_0001 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -27281,6 +28124,7 @@ static const pciSubsystemInfo *pci_ss_list_10b7_1007[] = {
 	&pci_ss_info_10b7_1007_10b7_615c,
 	NULL
 };
+#define pci_ss_list_10b7_1700 NULL
 #define pci_ss_list_10b7_3390 NULL
 static const pciSubsystemInfo *pci_ss_list_10b7_3590[] = {
 	&pci_ss_info_10b7_3590_10b7_3590,
@@ -27333,6 +28177,7 @@ static const pciSubsystemInfo *pci_ss_list_10b7_6563[] = {
 };
 #define pci_ss_list_10b7_6564 NULL
 #define pci_ss_list_10b7_7646 NULL
+#define pci_ss_list_10b7_7770 NULL
 #define pci_ss_list_10b7_7940 NULL
 #define pci_ss_list_10b7_7980 NULL
 #define pci_ss_list_10b7_7990 NULL
@@ -27380,6 +28225,7 @@ static const pciSubsystemInfo *pci_ss_list_10b7_9055[] = {
 #define pci_ss_list_10b7_905a NULL
 static const pciSubsystemInfo *pci_ss_list_10b7_9200[] = {
 	&pci_ss_info_10b7_9200_1028_0095,
+	&pci_ss_info_10b7_9200_1028_0097,
 	&pci_ss_info_10b7_9200_10b7_1000,
 	&pci_ss_info_10b7_9200_10b7_7000,
 	NULL
@@ -27583,6 +28429,8 @@ static const pciSubsystemInfo *pci_ss_list_10c8_8005[] = {
 };
 #define pci_ss_list_10c8_8006 NULL
 #define pci_ss_list_10c8_8016 NULL
+#define pci_ss_list_10cc_0660 NULL
+#define pci_ss_list_10cc_0661 NULL
 #define pci_ss_list_10cd_1100 NULL
 #define pci_ss_list_10cd_1200 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -27708,11 +28556,23 @@ static const pciSubsystemInfo *pci_ss_list_10de_0068[] = {
 };
 #define pci_ss_list_10de_006a NULL
 #define pci_ss_list_10de_006b NULL
+#define pci_ss_list_10de_006c NULL
+#define pci_ss_list_10de_006d NULL
 #define pci_ss_list_10de_006e NULL
 static const pciSubsystemInfo *pci_ss_list_10de_00a0[] = {
 	&pci_ss_info_10de_00a0_14af_5810,
 	NULL
 };
+#define pci_ss_list_10de_00d0 NULL
+#define pci_ss_list_10de_00d1 NULL
+#define pci_ss_list_10de_00d2 NULL
+#define pci_ss_list_10de_00d4 NULL
+#define pci_ss_list_10de_00d5 NULL
+#define pci_ss_list_10de_00d6 NULL
+#define pci_ss_list_10de_00d7 NULL
+#define pci_ss_list_10de_00d8 NULL
+#define pci_ss_list_10de_00da NULL
+#define pci_ss_list_10de_00dd NULL
 static const pciSubsystemInfo *pci_ss_list_10de_0100[] = {
 	&pci_ss_info_10de_0100_1043_0200,
 	&pci_ss_info_10de_0100_1043_0201,
@@ -27726,6 +28586,7 @@ static const pciSubsystemInfo *pci_ss_list_10de_0101[] = {
 	&pci_ss_info_10de_0101_1043_0202,
 	&pci_ss_info_10de_0101_1043_400a,
 	&pci_ss_info_10de_0101_1043_400b,
+	&pci_ss_info_10de_0101_107d_2822,
 	&pci_ss_info_10de_0101_1102_102e,
 	&pci_ss_info_10de_0101_14af_5021,
 	NULL
@@ -27775,7 +28636,11 @@ static const pciSubsystemInfo *pci_ss_list_10de_0171[] = {
 #define pci_ss_list_10de_017a NULL
 #define pci_ss_list_10de_017b NULL
 #define pci_ss_list_10de_017c NULL
-#define pci_ss_list_10de_0181 NULL
+static const pciSubsystemInfo *pci_ss_list_10de_0181[] = {
+	&pci_ss_info_10de_0181_1043_806f,
+	&pci_ss_info_10de_0181_1462_8880,
+	NULL
+};
 #define pci_ss_list_10de_0182 NULL
 #define pci_ss_list_10de_0183 NULL
 #define pci_ss_list_10de_0188 NULL
@@ -27795,7 +28660,14 @@ static const pciSubsystemInfo *pci_ss_list_10de_0171[] = {
 #define pci_ss_list_10de_01c1 NULL
 #define pci_ss_list_10de_01c2 NULL
 #define pci_ss_list_10de_01c3 NULL
+#define pci_ss_list_10de_01e0 NULL
 #define pci_ss_list_10de_01e8 NULL
+#define pci_ss_list_10de_01ea NULL
+#define pci_ss_list_10de_01eb NULL
+#define pci_ss_list_10de_01ec NULL
+#define pci_ss_list_10de_01ed NULL
+#define pci_ss_list_10de_01ee NULL
+#define pci_ss_list_10de_01ef NULL
 #define pci_ss_list_10de_01f0 NULL
 static const pciSubsystemInfo *pci_ss_list_10de_0200[] = {
 	&pci_ss_info_10de_0200_1043_402f,
@@ -27822,6 +28694,7 @@ static const pciSubsystemInfo *pci_ss_list_10de_0253[] = {
 #define pci_ss_list_10de_0280 NULL
 #define pci_ss_list_10de_0281 NULL
 #define pci_ss_list_10de_0282 NULL
+#define pci_ss_list_10de_0286 NULL
 #define pci_ss_list_10de_0288 NULL
 #define pci_ss_list_10de_0289 NULL
 #define pci_ss_list_10de_0300 NULL
@@ -27829,6 +28702,31 @@ static const pciSubsystemInfo *pci_ss_list_10de_0253[] = {
 #define pci_ss_list_10de_0302 NULL
 #define pci_ss_list_10de_0308 NULL
 #define pci_ss_list_10de_0309 NULL
+#define pci_ss_list_10de_0311 NULL
+#define pci_ss_list_10de_0312 NULL
+#define pci_ss_list_10de_0314 NULL
+#define pci_ss_list_10de_031a NULL
+#define pci_ss_list_10de_031b NULL
+#define pci_ss_list_10de_031c NULL
+#define pci_ss_list_10de_0321 NULL
+#define pci_ss_list_10de_0322 NULL
+#define pci_ss_list_10de_0323 NULL
+#define pci_ss_list_10de_0324 NULL
+#define pci_ss_list_10de_0325 NULL
+#define pci_ss_list_10de_0328 NULL
+#define pci_ss_list_10de_0329 NULL
+#define pci_ss_list_10de_032a NULL
+#define pci_ss_list_10de_032b NULL
+#define pci_ss_list_10de_032c NULL
+#define pci_ss_list_10de_032d NULL
+#define pci_ss_list_10de_0330 NULL
+#define pci_ss_list_10de_0331 NULL
+#define pci_ss_list_10de_0332 NULL
+#define pci_ss_list_10de_0333 NULL
+#define pci_ss_list_10de_0338 NULL
+#define pci_ss_list_10de_0341 NULL
+#define pci_ss_list_10de_0342 NULL
+#define pci_ss_list_10de_034e NULL
 #define pci_ss_list_10df_1ae5 NULL
 #define pci_ss_list_10df_f085 NULL
 #define pci_ss_list_10df_f095 NULL
@@ -27869,6 +28767,7 @@ static const pciSubsystemInfo *pci_ss_list_10e1_0391[] = {
 #define pci_ss_list_10e8_811a NULL
 #define pci_ss_list_10e8_8170 NULL
 #define pci_ss_list_10e8_82db NULL
+#define pci_ss_list_10e8_8851 NULL
 #define pci_ss_list_10ea_1680 NULL
 #define pci_ss_list_10ea_1682 NULL
 #define pci_ss_list_10ea_1683 NULL
@@ -27934,6 +28833,7 @@ static const pciSubsystemInfo *pci_ss_list_10ec_8169[] = {
 #define pci_ss_list_10ee_3fc3 NULL
 #define pci_ss_list_10ee_3fc4 NULL
 #define pci_ss_list_10ee_3fc5 NULL
+#define pci_ss_list_10ee_8381 NULL
 #define pci_ss_list_10ef_8154 NULL
 #define pci_ss_list_10f5_a001 NULL
 #define pci_ss_list_10fa_000c NULL
@@ -28024,6 +28924,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_0571[] = {
 	&pci_ss_info_1106_0571_1043_808c,
 	&pci_ss_info_1106_0571_1106_0571,
 	&pci_ss_info_1106_0571_1179_0001,
+	&pci_ss_info_1106_0571_1297_f641,
 	&pci_ss_info_1106_0571_1458_5002,
 	NULL
 };
@@ -28078,6 +28979,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_3038[] = {
 	&pci_ss_info_1106_3038_1019_0985,
 	&pci_ss_info_1106_3038_1043_808c,
 	&pci_ss_info_1106_3038_1179_0001,
+	&pci_ss_info_1106_3038_1458_5004,
 	NULL
 };
 #define pci_ss_list_1106_3040 NULL
@@ -28110,6 +29012,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_3058[] = {
 };
 static const pciSubsystemInfo *pci_ss_list_1106_3059[] = {
 	&pci_ss_info_1106_3059_1043_8095,
+	&pci_ss_info_1106_3059_1297_c160,
 	&pci_ss_info_1106_3059_1458_a002,
 	NULL
 };
@@ -28136,13 +29039,17 @@ static const pciSubsystemInfo *pci_ss_list_1106_3099[] = {
 #define pci_ss_list_1106_3103 NULL
 static const pciSubsystemInfo *pci_ss_list_1106_3104[] = {
 	&pci_ss_info_1106_3104_1043_808c,
+	&pci_ss_info_1106_3104_1297_f641,
 	&pci_ss_info_1106_3104_1458_5004,
 	NULL
 };
 #define pci_ss_list_1106_3106 NULL
 #define pci_ss_list_1106_3109 NULL
 #define pci_ss_list_1106_3112 NULL
-#define pci_ss_list_1106_3116 NULL
+static const pciSubsystemInfo *pci_ss_list_1106_3116[] = {
+	&pci_ss_info_1106_3116_1297_f641,
+	NULL
+};
 #define pci_ss_list_1106_3122 NULL
 #define pci_ss_list_1106_3123 NULL
 #define pci_ss_list_1106_3128 NULL
@@ -28153,6 +29060,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_3104[] = {
 #define pci_ss_list_1106_3168 NULL
 static const pciSubsystemInfo *pci_ss_list_1106_3177[] = {
 	&pci_ss_info_1106_3177_1043_808c,
+	&pci_ss_info_1106_3177_1297_f641,
 	&pci_ss_info_1106_3177_1458_5001,
 	NULL
 };
@@ -28185,6 +29093,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_8598[] = {
 #define pci_ss_list_1106_b103 NULL
 #define pci_ss_list_1106_b112 NULL
 #define pci_ss_list_1106_b168 NULL
+#define pci_ss_list_1106_b198 NULL
 #endif
 #define pci_ss_list_1107_0576 NULL
 #define pci_ss_list_1108_0100 NULL
@@ -28205,6 +29114,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_8598[] = {
 #define pci_ss_list_110a_007c NULL
 #define pci_ss_list_110a_007d NULL
 #define pci_ss_list_110a_2102 NULL
+#define pci_ss_list_110a_4021 NULL
 #define pci_ss_list_110a_4942 NULL
 #define pci_ss_list_110a_6120 NULL
 #define pci_ss_list_110b_0001 NULL
@@ -28354,12 +29264,18 @@ static const pciSubsystemInfo *pci_ss_list_1127_0400[] = {
 #define pci_ss_list_1131_1561 NULL
 #define pci_ss_list_1131_1562 NULL
 #define pci_ss_list_1131_3400 NULL
-#define pci_ss_list_1131_7130 NULL
-#define pci_ss_list_1131_7133 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_1131_7130[] = {
+	&pci_ss_info_1131_7130_5168_0138,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_1131_7133[] = {
+	&pci_ss_info_1131_7133_5168_0138,
+	NULL
+};
 #define pci_ss_list_1131_7134 NULL
 #define pci_ss_list_1131_7135 NULL
 #define pci_ss_list_1131_7145 NULL
-#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_1131_7146[] = {
 	&pci_ss_info_1131_7146_114b_2003,
 	&pci_ss_info_1131_7146_11bd_0006,
@@ -28378,41 +29294,82 @@ static const pciSubsystemInfo *pci_ss_list_1131_7146[] = {
 #define pci_ss_list_1133_b921 NULL
 #define pci_ss_list_1133_b922 NULL
 #define pci_ss_list_1133_b923 NULL
+#define pci_ss_list_1133_e001 NULL
+#define pci_ss_list_1133_e002 NULL
+#define pci_ss_list_1133_e003 NULL
+#define pci_ss_list_1133_e004 NULL
+#define pci_ss_list_1133_e005 NULL
+#define pci_ss_list_1133_e006 NULL
+#define pci_ss_list_1133_e007 NULL
+#define pci_ss_list_1133_e008 NULL
+#define pci_ss_list_1133_e009 NULL
+#define pci_ss_list_1133_e00a NULL
+#define pci_ss_list_1133_e00b NULL
+#define pci_ss_list_1133_e00c NULL
+#define pci_ss_list_1133_e00d NULL
+#define pci_ss_list_1133_e00e NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
-static const pciSubsystemInfo *pci_ss_list_1133_e001[] = {
-	&pci_ss_info_1133_e001_1133_e001,
+static const pciSubsystemInfo *pci_ss_list_1133_e010[] = {
+	&pci_ss_info_1133_e010_110a_0021,
+	&pci_ss_info_1133_e010_8001_0014,
 	NULL
 };
-static const pciSubsystemInfo *pci_ss_list_1133_e002[] = {
-	&pci_ss_info_1133_e002_1133_e002,
+#define pci_ss_list_1133_e011 NULL
+static const pciSubsystemInfo *pci_ss_list_1133_e012[] = {
+	&pci_ss_info_1133_e012_8001_0014,
 	NULL
 };
-static const pciSubsystemInfo *pci_ss_list_1133_e003[] = {
-	&pci_ss_info_1133_e003_1133_e003,
+static const pciSubsystemInfo *pci_ss_list_1133_e013[] = {
+	&pci_ss_info_1133_e013_8001_0014,
 	NULL
 };
-static const pciSubsystemInfo *pci_ss_list_1133_e004[] = {
-	&pci_ss_info_1133_e004_1133_e004,
+static const pciSubsystemInfo *pci_ss_list_1133_e014[] = {
+	&pci_ss_info_1133_e014_0008_0100,
+	&pci_ss_info_1133_e014_8001_0014,
 	NULL
 };
-static const pciSubsystemInfo *pci_ss_list_1133_e005[] = {
-	&pci_ss_info_1133_e005_1133_e005,
+static const pciSubsystemInfo *pci_ss_list_1133_e015[] = {
+	&pci_ss_info_1133_e015_8001_0014,
 	NULL
 };
-#define pci_ss_list_1133_e00b NULL
-static const pciSubsystemInfo *pci_ss_list_1133_e010[] = {
-	&pci_ss_info_1133_e010_1133_e010,
+static const pciSubsystemInfo *pci_ss_list_1133_e016[] = {
+	&pci_ss_info_1133_e016_8001_0014,
 	NULL
 };
-static const pciSubsystemInfo *pci_ss_list_1133_e012[] = {
-	&pci_ss_info_1133_e012_1133_e012,
+static const pciSubsystemInfo *pci_ss_list_1133_e017[] = {
+	&pci_ss_info_1133_e017_8001_0014,
 	NULL
 };
-static const pciSubsystemInfo *pci_ss_list_1133_e014[] = {
-	&pci_ss_info_1133_e014_1133_e014,
+static const pciSubsystemInfo *pci_ss_list_1133_e018[] = {
+	&pci_ss_info_1133_e018_8001_0014,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_1133_e019[] = {
+	&pci_ss_info_1133_e019_8001_0014,
+	NULL
+};
+#define pci_ss_list_1133_e01a NULL
+static const pciSubsystemInfo *pci_ss_list_1133_e01b[] = {
+	&pci_ss_info_1133_e01b_8001_0014,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_1133_e01c[] = {
+	&pci_ss_info_1133_e01c_1133_1c01,
+	&pci_ss_info_1133_e01c_1133_1c02,
+	&pci_ss_info_1133_e01c_1133_1c03,
+	&pci_ss_info_1133_e01c_1133_1c04,
+	&pci_ss_info_1133_e01c_1133_1c05,
+	&pci_ss_info_1133_e01c_1133_1c06,
+	&pci_ss_info_1133_e01c_1133_1c07,
+	&pci_ss_info_1133_e01c_1133_1c08,
+	&pci_ss_info_1133_e01c_1133_1c09,
+	&pci_ss_info_1133_e01c_1133_1c0a,
+	&pci_ss_info_1133_e01c_1133_1c0b,
+	&pci_ss_info_1133_e01c_1133_1c0c,
 	NULL
 };
-#define pci_ss_list_1133_e018 NULL
+#define pci_ss_list_1133_e01e NULL
+#define pci_ss_list_1133_e020 NULL
 #endif
 #define pci_ss_list_1134_0001 NULL
 #define pci_ss_list_1135_0001 NULL
@@ -28614,15 +29571,32 @@ static const pciSubsystemInfo *pci_ss_list_1163_2000[] = {
 #define pci_ss_list_1166_0016 NULL
 #define pci_ss_list_1166_0017 NULL
 #define pci_ss_list_1166_0200 NULL
-#define pci_ss_list_1166_0201 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_1166_0201[] = {
+	&pci_ss_info_1166_0201_4c53_1080,
+	NULL
+};
 #define pci_ss_list_1166_0203 NULL
 #define pci_ss_list_1166_0211 NULL
-#define pci_ss_list_1166_0212 NULL
+static const pciSubsystemInfo *pci_ss_list_1166_0212[] = {
+	&pci_ss_info_1166_0212_4c53_1080,
+	NULL
+};
 #define pci_ss_list_1166_0213 NULL
-#define pci_ss_list_1166_0220 NULL
+static const pciSubsystemInfo *pci_ss_list_1166_0220[] = {
+	&pci_ss_info_1166_0220_4c53_1080,
+	NULL
+};
 #define pci_ss_list_1166_0221 NULL
-#define pci_ss_list_1166_0225 NULL
-#define pci_ss_list_1166_0227 NULL
+static const pciSubsystemInfo *pci_ss_list_1166_0225[] = {
+	&pci_ss_info_1166_0225_4c53_1080,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_1166_0227[] = {
+	&pci_ss_info_1166_0227_4c53_1080,
+	NULL
+};
+#endif
 #define pci_ss_list_116a_6100 NULL
 #define pci_ss_list_116a_6800 NULL
 #define pci_ss_list_116a_7100 NULL
@@ -28857,6 +29831,7 @@ static const pciSubsystemInfo *pci_ss_list_11c1_044a[] = {
 #define pci_ss_list_11c1_044e NULL
 #define pci_ss_list_11c1_044f NULL
 static const pciSubsystemInfo *pci_ss_list_11c1_0450[] = {
+	&pci_ss_info_11c1_0450_1033_80a8,
 	&pci_ss_info_11c1_0450_144f_4005,
 	NULL
 };
@@ -29087,6 +30062,8 @@ static const pciSubsystemInfo *pci_ss_list_1242_1560[] = {
 	NULL
 };
 #define pci_ss_list_1242_4643 NULL
+#define pci_ss_list_1242_6562 NULL
+#define pci_ss_list_1242_656a NULL
 #endif
 #define pci_ss_list_1244_0700 NULL
 #define pci_ss_list_1244_0800 NULL
@@ -29152,6 +30129,7 @@ static const pciSubsystemInfo *pci_ss_list_125d_1989[] = {
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_125d_1998[] = {
+	&pci_ss_info_125d_1998_1028_00b1,
 	&pci_ss_info_125d_1998_1028_00e6,
 	NULL
 };
@@ -29533,6 +30511,7 @@ static const pciSubsystemInfo *pci_ss_list_12d2_0018[] = {
 #define pci_ss_list_12d4_0200 NULL
 #define pci_ss_list_12d9_0002 NULL
 #define pci_ss_list_12d9_0004 NULL
+#define pci_ss_list_12de_0200 NULL
 #define pci_ss_list_12e0_0010 NULL
 #define pci_ss_list_12e0_0020 NULL
 #define pci_ss_list_12e0_0030 NULL
@@ -29673,12 +30652,19 @@ static const pciSubsystemInfo *pci_ss_list_131f_2030[] = {
 #define pci_ss_list_131f_2061 NULL
 #define pci_ss_list_131f_2062 NULL
 #endif
+#define pci_ss_list_1331_8200 NULL
+#define pci_ss_list_1331_8201 NULL
+#define pci_ss_list_1331_8202 NULL
+#define pci_ss_list_1331_8210 NULL
 #define pci_ss_list_1332_5415 NULL
 #define pci_ss_list_1332_5425 NULL
 #define pci_ss_list_134a_0001 NULL
 #define pci_ss_list_134a_0002 NULL
-#define pci_ss_list_134d_7890 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_134d_7890[] = {
+	&pci_ss_info_134d_7890_134d_0001,
+	NULL
+};
 static const pciSubsystemInfo *pci_ss_list_134d_7891[] = {
 	&pci_ss_info_134d_7891_134d_0001,
 	NULL
@@ -29714,6 +30700,7 @@ static const pciSubsystemInfo *pci_ss_list_134d_7891[] = {
 #define pci_ss_list_135e_7402 NULL
 #define pci_ss_list_135e_7801 NULL
 #define pci_ss_list_135e_8001 NULL
+#define pci_ss_list_136b_ff01 NULL
 #define pci_ss_list_1385_4100 NULL
 #define pci_ss_list_1385_4105 NULL
 #define pci_ss_list_1385_620a NULL
@@ -29752,6 +30739,9 @@ static const pciSubsystemInfo *pci_ss_list_1397_2bd0[] = {
 #define pci_ss_list_13a3_0018 NULL
 #define pci_ss_list_13a8_0158 NULL
 #define pci_ss_list_13c0_0010 NULL
+#define pci_ss_list_13c0_0020 NULL
+#define pci_ss_list_13c0_0030 NULL
+#define pci_ss_list_13c0_0210 NULL
 #define pci_ss_list_13c1_1000 NULL
 #define pci_ss_list_13c1_1001 NULL
 #define pci_ss_list_13c1_1002 NULL
@@ -29777,6 +30767,7 @@ static const pciSubsystemInfo *pci_ss_list_13f6_0101[] = {
 };
 static const pciSubsystemInfo *pci_ss_list_13f6_0111[] = {
 	&pci_ss_info_13f6_0111_1019_0970,
+	&pci_ss_info_13f6_0111_1043_8035,
 	&pci_ss_info_13f6_0111_1043_8077,
 	&pci_ss_info_13f6_0111_1043_80e2,
 	&pci_ss_info_13f6_0111_13f6_0111,
@@ -29819,6 +30810,8 @@ static const pciSubsystemInfo *pci_ss_list_1415_9511[] = {
 };
 #define pci_ss_list_1415_9521 NULL
 #endif
+#define pci_ss_list_1420_8002 NULL
+#define pci_ss_list_1420_8003 NULL
 #define pci_ss_list_144a_7296 NULL
 #define pci_ss_list_144a_7432 NULL
 #define pci_ss_list_144a_7433 NULL
@@ -29992,7 +30985,10 @@ static const pciSubsystemInfo *pci_ss_list_14e4_16c7[] = {
 #define pci_ss_list_14e4_4211 NULL
 #define pci_ss_list_14e4_4212 NULL
 #define pci_ss_list_14e4_4301 NULL
-#define pci_ss_list_14e4_4320 NULL
+static const pciSubsystemInfo *pci_ss_list_14e4_4320[] = {
+	&pci_ss_info_14e4_4320_1737_4320,
+	NULL
+};
 static const pciSubsystemInfo *pci_ss_list_14e4_4401[] = {
 	&pci_ss_info_14e4_4401_1043_80a8,
 	NULL
@@ -30166,6 +31162,8 @@ static const pciSubsystemInfo *pci_ss_list_14f1_2f00[] = {
 };
 #define pci_ss_list_14f1_8234 NULL
 #endif
+#define pci_ss_list_14fc_0000 NULL
+#define pci_ss_list_14fc_0001 NULL
 #define pci_ss_list_1507_0001 NULL
 #define pci_ss_list_1507_0002 NULL
 #define pci_ss_list_1507_0003 NULL
@@ -30291,10 +31289,16 @@ static const pciSubsystemInfo *pci_ss_list_1813_4100[] = {
 #define pci_ss_list_2348_2010 NULL
 #define pci_ss_list_3388_0013 NULL
 #define pci_ss_list_3388_0014 NULL
-#define pci_ss_list_3388_0021 NULL
+#define pci_ss_list_3388_0020 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_3388_0021[] = {
+	&pci_ss_info_3388_0021_4c53_1050,
+	&pci_ss_info_3388_0021_4c53_1080,
+	&pci_ss_info_3388_0021_4c53_3010,
+	NULL
+};
 #define pci_ss_list_3388_101a NULL
 #define pci_ss_list_3388_101b NULL
-#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_3388_8011[] = {
 	&pci_ss_info_3388_8011_3388_8011,
 	NULL
@@ -31696,6 +32700,7 @@ static const pciSubsystemInfo *pci_ss_list_0e11[] = {
 	&pci_ss_info_0e11_b112,
 	&pci_ss_info_0e11_b113,
 	&pci_ss_info_0e11_b114,
+	&pci_ss_info_0e11_b121,
 	&pci_ss_info_0e11_b123,
 	&pci_ss_info_0e11_b126,
 	&pci_ss_info_0e11_b134,
@@ -31703,6 +32708,7 @@ static const pciSubsystemInfo *pci_ss_list_0e11[] = {
 	&pci_ss_info_0e11_b144,
 	&pci_ss_info_0e11_b14d,
 	&pci_ss_info_0e11_b15a,
+	&pci_ss_info_0e11_b160,
 	&pci_ss_info_0e11_b163,
 	&pci_ss_info_0e11_b164,
 	&pci_ss_info_0e11_b16e,
@@ -31884,6 +32890,7 @@ static const pciSubsystemInfo *pci_ss_list_1014[] = {
 	&pci_ss_info_1014_0209,
 	&pci_ss_info_1014_020e,
 	&pci_ss_info_1014_0217,
+	&pci_ss_info_1014_021a,
 	&pci_ss_info_1014_021d,
 	&pci_ss_info_1014_0220,
 	&pci_ss_info_1014_0222,
@@ -31896,10 +32903,14 @@ static const pciSubsystemInfo *pci_ss_list_1014[] = {
 	&pci_ss_info_1014_023a,
 	&pci_ss_info_1014_023b,
 	&pci_ss_info_1014_023d,
+	&pci_ss_info_1014_0241,
 	&pci_ss_info_1014_0244,
 	&pci_ss_info_1014_0245,
+	&pci_ss_info_1014_0251,
+	&pci_ss_info_1014_0252,
 	&pci_ss_info_1014_0258,
 	&pci_ss_info_1014_0259,
+	&pci_ss_info_1014_0264,
 	&pci_ss_info_1014_0265,
 	&pci_ss_info_1014_0267,
 	&pci_ss_info_1014_026a,
@@ -32025,7 +33036,10 @@ static const pciSubsystemInfo *pci_ss_list_1028[] = {
 	&pci_ss_info_1028_0098,
 	&pci_ss_info_1028_0099,
 	&pci_ss_info_1028_009b,
+	&pci_ss_info_1028_00aa,
+	&pci_ss_info_1028_00b1,
 	&pci_ss_info_1028_00c5,
+	&pci_ss_info_1028_00ce,
 	&pci_ss_info_1028_00d0,
 	&pci_ss_info_1028_00d1,
 	&pci_ss_info_1028_00d9,
@@ -32185,6 +33199,7 @@ static const pciSubsystemInfo *pci_ss_list_1033[] = {
 	&pci_ss_info_1033_806a,
 	&pci_ss_info_1033_8077,
 	&pci_ss_info_1033_809d,
+	&pci_ss_info_1033_80a8,
 	&pci_ss_info_1033_80ac,
 	&pci_ss_info_1033_80bc,
 	NULL
@@ -32283,6 +33298,7 @@ static const pciSubsystemInfo *pci_ss_list_1043[] = {
 	&pci_ss_info_1043_8027,
 	&pci_ss_info_1043_802c,
 	&pci_ss_info_1043_8033,
+	&pci_ss_info_1043_8035,
 	&pci_ss_info_1043_803e,
 	&pci_ss_info_1043_8040,
 	&pci_ss_info_1043_8042,
@@ -32290,6 +33306,7 @@ static const pciSubsystemInfo *pci_ss_list_1043[] = {
 	&pci_ss_info_1043_8052,
 	&pci_ss_info_1043_8053,
 	&pci_ss_info_1043_8064,
+	&pci_ss_info_1043_806f,
 	&pci_ss_info_1043_8077,
 	&pci_ss_info_1043_807f,
 	&pci_ss_info_1043_808c,
@@ -32533,6 +33550,7 @@ static const pciSubsystemInfo *pci_ss_list_107b[] = {
 static const pciSubsystemInfo *pci_ss_list_107d[] = {
 	&pci_ss_info_107d_2633,
 	&pci_ss_info_107d_2720,
+	&pci_ss_info_107d_2822,
 	&pci_ss_info_107d_2840,
 	&pci_ss_info_107d_2896,
 	&pci_ss_info_107d_5330,
@@ -32752,6 +33770,7 @@ static const pciSubsystemInfo *pci_ss_list_10b5[] = {
 	&pci_ss_info_10b5_2036,
 	&pci_ss_info_10b5_2273,
 	&pci_ss_info_10b5_2455,
+	&pci_ss_info_10b5_2696,
 	&pci_ss_info_10b5_9050,
 	&pci_ss_info_10b5_9080,
 	NULL
@@ -32915,7 +33934,6 @@ static const pciSubsystemInfo *pci_ss_list_10cf[] = {
 	NULL
 };
 #endif
-#define pci_ss_list_10d0 NULL
 #define pci_ss_list_10d1 NULL
 #define pci_ss_list_10d2 NULL
 #define pci_ss_list_10d3 NULL
@@ -33088,6 +34106,7 @@ static const pciSubsystemInfo *pci_ss_list_1109[] = {
 static const pciSubsystemInfo *pci_ss_list_110a[] = {
 	&pci_ss_info_110a_0018,
 	&pci_ss_info_110a_001e,
+	&pci_ss_info_110a_0021,
 	&pci_ss_info_110a_0032,
 	&pci_ss_info_110a_8005,
 	NULL
@@ -33181,14 +34200,18 @@ static const pciSubsystemInfo *pci_ss_list_1127[] = {
 #define pci_ss_list_1132 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_1133[] = {
-	&pci_ss_info_1133_e001,
-	&pci_ss_info_1133_e002,
-	&pci_ss_info_1133_e003,
-	&pci_ss_info_1133_e004,
-	&pci_ss_info_1133_e005,
-	&pci_ss_info_1133_e010,
-	&pci_ss_info_1133_e012,
-	&pci_ss_info_1133_e014,
+	&pci_ss_info_1133_1c01,
+	&pci_ss_info_1133_1c02,
+	&pci_ss_info_1133_1c03,
+	&pci_ss_info_1133_1c04,
+	&pci_ss_info_1133_1c05,
+	&pci_ss_info_1133_1c06,
+	&pci_ss_info_1133_1c07,
+	&pci_ss_info_1133_1c08,
+	&pci_ss_info_1133_1c09,
+	&pci_ss_info_1133_1c0a,
+	&pci_ss_info_1133_1c0b,
+	&pci_ss_info_1133_1c0c,
 	NULL
 };
 #endif
@@ -33884,7 +34907,13 @@ static const pciSubsystemInfo *pci_ss_list_1282[] = {
 #define pci_ss_list_1294 NULL
 #define pci_ss_list_1295 NULL
 #define pci_ss_list_1296 NULL
-#define pci_ss_list_1297 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_1297[] = {
+	&pci_ss_info_1297_c160,
+	&pci_ss_info_1297_f641,
+	NULL
+};
+#endif
 #define pci_ss_list_1298 NULL
 #define pci_ss_list_1299 NULL
 #define pci_ss_list_129a NULL
@@ -34218,6 +35247,7 @@ static const pciSubsystemInfo *pci_ss_list_1385[] = {
 	&pci_ss_info_1385_1100,
 	&pci_ss_info_1385_2100,
 	&pci_ss_info_1385_f004,
+	&pci_ss_info_1385_f311,
 	NULL
 };
 #endif
@@ -34717,6 +35747,7 @@ static const pciSubsystemInfo *pci_ss_list_1462[] = {
 	&pci_ss_info_1462_8808,
 	&pci_ss_info_1462_8817,
 	&pci_ss_info_1462_8831,
+	&pci_ss_info_1462_8880,
 	NULL
 };
 #endif
@@ -35462,6 +36493,7 @@ static const pciSubsystemInfo *pci_ss_list_172a[] = {
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_1737[] = {
 	&pci_ss_info_1737_3874,
+	&pci_ss_info_1737_4320,
 	NULL
 };
 #endif
@@ -35618,7 +36650,23 @@ static const pciSubsystemInfo *pci_ss_list_4a14[] = {
 #endif
 #define pci_ss_list_4b10 NULL
 #define pci_ss_list_4c48 NULL
-#define pci_ss_list_4c53 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_4c53[] = {
+	&pci_ss_info_4c53_1000,
+	&pci_ss_info_4c53_1010,
+	&pci_ss_info_4c53_1020,
+	&pci_ss_info_4c53_1030,
+	&pci_ss_info_4c53_1040,
+	&pci_ss_info_4c53_1050,
+	&pci_ss_info_4c53_1051,
+	&pci_ss_info_4c53_1060,
+	&pci_ss_info_4c53_1080,
+	&pci_ss_info_4c53_1300,
+	&pci_ss_info_4c53_1310,
+	&pci_ss_info_4c53_3010,
+	NULL
+};
+#endif
 #define pci_ss_list_4ca1 NULL
 #define pci_ss_list_4d51 NULL
 #define pci_ss_list_4d54 NULL
@@ -35634,7 +36682,12 @@ static const pciSubsystemInfo *pci_ss_list_5053[] = {
 #define pci_ss_list_5136 NULL
 #define pci_ss_list_5143 NULL
 #define pci_ss_list_5145 NULL
-#define pci_ss_list_5168 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_5168[] = {
+	&pci_ss_info_5168_0138,
+	NULL
+};
+#endif
 #define pci_ss_list_5301 NULL
 static const pciSubsystemInfo *pci_ss_list_5333[] = {
 	&pci_ss_info_5333_8100,
@@ -36980,6 +38033,15 @@ static const pciDeviceInfo pci_dev_info_1002_4158 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_4164 = {
+	0x4164, pci_device_1002_4164,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4164,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_4242 = {
 	0x4242, pci_device_1002_4242,
 #ifdef INIT_SUBSYS_INFO
@@ -37448,6 +38510,15 @@ static const pciDeviceInfo pci_dev_info_1002_4c67 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_4c6e = {
+	0x4c6e, pci_device_1002_4c6e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4c6e,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_4d46 = {
 	0x4d46, pci_device_1002_4d46,
 #ifdef INIT_SUBSYS_INFO
@@ -38168,6 +39239,15 @@ static const pciDeviceInfo pci_dev_info_1002_5656 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_5961 = {
+	0x5961, pci_device_1002_5961,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_5961,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_700f = {
 	0x700f, pci_device_1002_700f,
 #ifdef INIT_SUBSYS_INFO
@@ -38186,6 +39266,15 @@ static const pciDeviceInfo pci_dev_info_1002_7010 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_cab0 = {
+	0xcab0, pci_device_1002_cab0,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_cab0,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_cab2 = {
 	0xcab2, pci_device_1002_cab2,
 #ifdef INIT_SUBSYS_INFO
@@ -38532,6 +39621,60 @@ static const pciDeviceInfo pci_dev_info_100b_0022 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_100b_0028 = {
+	0x0028, pci_device_100b_0028,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_100b_0028,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_100b_002b = {
+	0x002b, pci_device_100b_002b,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_100b_002b,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_100b_002d = {
+	0x002d, pci_device_100b_002d,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_100b_002d,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_100b_002e = {
+	0x002e, pci_device_100b_002e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_100b_002e,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_100b_002f = {
+	0x002f, pci_device_100b_002f,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_100b_002f,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_100b_0030 = {
+	0x0030, pci_device_100b_0030,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_100b_0030,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_100b_0500 = {
 	0x0500, pci_device_100b_0500,
 #ifdef INIT_SUBSYS_INFO
@@ -39280,6 +40423,15 @@ static const pciDeviceInfo pci_dev_info_1014_002e = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1014_0031 = {
+	0x0031, pci_device_1014_0031,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_0031,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1014_0036 = {
 	0x0036, pci_device_1014_0036,
 #ifdef INIT_SUBSYS_INFO
@@ -39298,6 +40450,15 @@ static const pciDeviceInfo pci_dev_info_1014_003a = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1014_003c = {
+	0x003c, pci_device_1014_003c,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_003c,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1014_003e = {
 	0x003e, pci_device_1014_003e,
 #ifdef INIT_SUBSYS_INFO
@@ -39388,6 +40549,15 @@ static const pciDeviceInfo pci_dev_info_1014_0053 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1014_0054 = {
+	0x0054, pci_device_1014_0054,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_0054,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1014_0057 = {
 	0x0057, pci_device_1014_0057,
 #ifdef INIT_SUBSYS_INFO
@@ -39406,6 +40576,15 @@ static const pciDeviceInfo pci_dev_info_1014_005c = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1014_005e = {
+	0x005e, pci_device_1014_005e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_005e,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1014_007c = {
 	0x007c, pci_device_1014_007c,
 #ifdef INIT_SUBSYS_INFO
@@ -39424,6 +40603,15 @@ static const pciDeviceInfo pci_dev_info_1014_007d = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1014_008e = {
+	0x008e, pci_device_1014_008e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_008e,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1014_0090 = {
 	0x0090, pci_device_1014_0090,
 #ifdef INIT_SUBSYS_INFO
@@ -39433,6 +40621,15 @@ static const pciDeviceInfo pci_dev_info_1014_0090 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1014_0091 = {
+	0x0091, pci_device_1014_0091,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_0091,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1014_0095 = {
 	0x0095, pci_device_1014_0095,
 #ifdef INIT_SUBSYS_INFO
@@ -39451,6 +40648,15 @@ static const pciDeviceInfo pci_dev_info_1014_0096 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1014_009f = {
+	0x009f, pci_device_1014_009f,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_009f,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1014_00a5 = {
 	0x00a5, pci_device_1014_00a5,
 #ifdef INIT_SUBSYS_INFO
@@ -39478,6 +40684,15 @@ static const pciDeviceInfo pci_dev_info_1014_00b7 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1014_00b8 = {
+	0x00b8, pci_device_1014_00b8,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_00b8,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1014_00be = {
 	0x00be, pci_device_1014_00be,
 #ifdef INIT_SUBSYS_INFO
@@ -39505,6 +40720,15 @@ static const pciDeviceInfo pci_dev_info_1014_00fc = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1014_0104 = {
+	0x0104, pci_device_1014_0104,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_0104,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1014_0105 = {
 	0x0105, pci_device_1014_0105,
 #ifdef INIT_SUBSYS_INFO
@@ -39550,6 +40774,60 @@ static const pciDeviceInfo pci_dev_info_1014_0156 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1014_015e = {
+	0x015e, pci_device_1014_015e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_015e,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1014_0160 = {
+	0x0160, pci_device_1014_0160,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_0160,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1014_016e = {
+	0x016e, pci_device_1014_016e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_016e,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1014_0170 = {
+	0x0170, pci_device_1014_0170,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_0170,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1014_017d = {
+	0x017d, pci_device_1014_017d,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_017d,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1014_0180 = {
+	0x0180, pci_device_1014_0180,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_0180,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1014_01a7 = {
 	0x01a7, pci_device_1014_01a7,
 #ifdef INIT_SUBSYS_INFO
@@ -39568,6 +40846,96 @@ static const pciDeviceInfo pci_dev_info_1014_01bd = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1014_01c1 = {
+	0x01c1, pci_device_1014_01c1,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_01c1,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1014_01e6 = {
+	0x01e6, pci_device_1014_01e6,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_01e6,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1014_01ff = {
+	0x01ff, pci_device_1014_01ff,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_01ff,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1014_0219 = {
+	0x0219, pci_device_1014_0219,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_0219,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1014_021b = {
+	0x021b, pci_device_1014_021b,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_021b,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1014_021c = {
+	0x021c, pci_device_1014_021c,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_021c,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1014_0233 = {
+	0x0233, pci_device_1014_0233,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_0233,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1014_0266 = {
+	0x0266, pci_device_1014_0266,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_0266,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1014_0268 = {
+	0x0268, pci_device_1014_0268,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_0268,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1014_0269 = {
+	0x0269, pci_device_1014_0269,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_0269,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1014_0302 = {
 	0x0302, pci_device_1014_0302,
 #ifdef INIT_SUBSYS_INFO
@@ -39847,6 +41215,15 @@ static const pciDeviceInfo pci_dev_info_1022_2001 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1022_2003 = {
+	0x2003, pci_device_1022_2003,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1022_2003,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1022_2020 = {
 	0x2020, pci_device_1022_2020,
 #ifdef INIT_SUBSYS_INFO
@@ -40225,6 +41602,15 @@ static const pciDeviceInfo pci_dev_info_1022_746e = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1022_756b = {
+	0x756b, pci_device_1022_756b,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1022_756b,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1023_0194 = {
 	0x0194, pci_device_1023_0194,
 #ifdef INIT_SUBSYS_INFO
@@ -41545,6 +42931,15 @@ static const pciDeviceInfo pci_dev_info_1031_6057 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1033_0000 = {
+	0x0000, pci_device_1033_0000,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1033_0000,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1033_0001 = {
 	0x0001, pci_device_1033_0001,
 #ifdef INIT_SUBSYS_INFO
@@ -41788,6 +43183,15 @@ static const pciDeviceInfo pci_dev_info_1033_00cd = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1033_00df = {
+	0x00df, pci_device_1033_00df,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1033_00df,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1033_00e0 = {
 	0x00e0, pci_device_1033_00e0,
 #ifdef INIT_SUBSYS_INFO
@@ -41797,6 +43201,15 @@ static const pciDeviceInfo pci_dev_info_1033_00e0 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1033_00f3 = {
+	0x00f3, pci_device_1033_00f3,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1033_00f3,
+#else
+	NULL,
+#endif
+	0
+};
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_1036_0000 = {
 	0x0000, pci_device_1036_0000,
@@ -42114,6 +43527,15 @@ static const pciDeviceInfo pci_dev_info_1039_0745 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1039_0746 = {
+	0x0746, pci_device_1039_0746,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_0746,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1039_0755 = {
 	0x0755, pci_device_1039_0755,
 #ifdef INIT_SUBSYS_INFO
@@ -42411,6 +43833,15 @@ static const pciDeviceInfo pci_dev_info_1039_7018 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1039_7019 = {
+	0x7019, pci_device_1039_7019,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_7019,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_103c_1005 = {
 	0x1005, pci_device_103c_1005,
 #ifdef INIT_SUBSYS_INFO
@@ -42738,6 +44169,15 @@ static const pciDeviceInfo pci_dev_info_1043_4021 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1043_4057 = {
+	0x4057, pci_device_1043_4057,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1043_4057,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_1044_1012 = {
@@ -43042,6 +44482,24 @@ static const pciDeviceInfo pci_dev_info_104a_0010 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_104a_0209 = {
+	0x0209, pci_device_104a_0209,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_104a_0209,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_104a_020a = {
+	0x020a, pci_device_104a_020a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_104a_020a,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_104a_0210 = {
 	0x0210, pci_device_104a_0210,
 #ifdef INIT_SUBSYS_INFO
@@ -43051,6 +44509,42 @@ static const pciDeviceInfo pci_dev_info_104a_0210 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_104a_021a = {
+	0x021a, pci_device_104a_021a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_104a_021a,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_104a_021b = {
+	0x021b, pci_device_104a_021b,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_104a_021b,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_104a_0500 = {
+	0x0500, pci_device_104a_0500,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_104a_0500,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_104a_0564 = {
+	0x0564, pci_device_104a_0564,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_104a_0564,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_104a_0981 = {
 	0x0981, pci_device_104a_0981,
 #ifdef INIT_SUBSYS_INFO
@@ -43087,6 +44581,15 @@ static const pciDeviceInfo pci_dev_info_104a_3520 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_104a_55cc = {
+	0x55cc, pci_device_104a_55cc,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_104a_55cc,
+#else
+	NULL,
+#endif
+	0
+};
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_104b_0140 = {
 	0x0140, pci_device_104b_0140,
@@ -43269,6 +44772,15 @@ static const pciDeviceInfo pci_dev_info_104c_8027 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_104c_8029 = {
+	0x8029, pci_device_104c_8029,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_104c_8029,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_104c_8400 = {
 	0x8400, pci_device_104c_8400,
 #ifdef INIT_SUBSYS_INFO
@@ -43278,6 +44790,24 @@ static const pciDeviceInfo pci_dev_info_104c_8400 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_104c_8401 = {
+	0x8401, pci_device_104c_8401,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_104c_8401,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_104c_9000 = {
+	0x9000, pci_device_104c_9000,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_104c_9000,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_104c_a001 = {
 	0xa001, pci_device_104c_a001,
 #ifdef INIT_SUBSYS_INFO
@@ -43530,6 +45060,15 @@ static const pciDeviceInfo pci_dev_info_104c_ac42 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_104c_ac44 = {
+	0xac44, pci_device_104c_ac44,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_104c_ac44,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_104c_ac50 = {
 	0xac50, pci_device_104c_ac50,
 #ifdef INIT_SUBSYS_INFO
@@ -43985,6 +45524,15 @@ static const pciDeviceInfo pci_dev_info_105a_1275 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_105a_3318 = {
+	0x3318, pci_device_105a_3318,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_105a_3318,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_105a_3376 = {
 	0x3376, pci_device_105a_3376,
 #ifdef INIT_SUBSYS_INFO
@@ -44084,6 +45632,15 @@ static const pciDeviceInfo pci_dev_info_105a_6621 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_105a_6629 = {
+	0x6629, pci_device_105a_6629,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_105a_6629,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_105a_7275 = {
 	0x7275, pci_device_105a_7275,
 #ifdef INIT_SUBSYS_INFO
@@ -44463,6 +46020,15 @@ static const pciDeviceInfo pci_dev_info_1069_0050 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1069_b166 = {
+	0xb166, pci_device_1069_b166,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1069_b166,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1069_ba55 = {
 	0xba55, pci_device_1069_ba55,
 #ifdef INIT_SUBSYS_INFO
@@ -45978,6 +47544,24 @@ static const pciDeviceInfo pci_dev_info_1093_1350 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1093_17d0 = {
+	0x17d0, pci_device_1093_17d0,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1093_17d0,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1093_2410 = {
+	0x2410, pci_device_1093_2410,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1093_2410,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1093_2a60 = {
 	0x2a60, pci_device_1093_2a60,
 #ifdef INIT_SUBSYS_INFO
@@ -46880,6 +48464,15 @@ static const pciDeviceInfo pci_dev_info_10b5_9080 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10b5_bb04 = {
+	0xbb04, pci_device_10b5_bb04,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10b5_bb04,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_10b6_0001 = {
@@ -47028,6 +48621,15 @@ static const pciDeviceInfo pci_dev_info_10b7_1007 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10b7_1700 = {
+	0x1700, pci_device_10b7_1700,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10b7_1700,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10b7_3390 = {
 	0x3390, pci_device_10b7_3390,
 #ifdef INIT_SUBSYS_INFO
@@ -47226,6 +48828,15 @@ static const pciDeviceInfo pci_dev_info_10b7_7646 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10b7_7770 = {
+	0x7770, pci_device_10b7_7770,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10b7_7770,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10b7_7940 = {
 	0x7940, pci_device_10b7_7940,
 #ifdef INIT_SUBSYS_INFO
@@ -48237,6 +49848,26 @@ static const pciDeviceInfo pci_dev_info_10c8_8016 = {
 	0
 };
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_10cc_0660 = {
+	0x0660, pci_device_10cc_0660,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10cc_0660,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10cc_0661 = {
+	0x0661, pci_device_10cc_0661,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10cc_0661,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_10cd_1100 = {
 	0x1100, pci_device_10cd_1100,
 #ifdef INIT_SUBSYS_INFO
@@ -48579,6 +50210,24 @@ static const pciDeviceInfo pci_dev_info_10de_006b = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_006c = {
+	0x006c, pci_device_10de_006c,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_006c,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_006d = {
+	0x006d, pci_device_10de_006d,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_006d,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10de_006e = {
 	0x006e, pci_device_10de_006e,
 #ifdef INIT_SUBSYS_INFO
@@ -48597,6 +50246,96 @@ static const pciDeviceInfo pci_dev_info_10de_00a0 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_00d0 = {
+	0x00d0, pci_device_10de_00d0,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_00d0,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_00d1 = {
+	0x00d1, pci_device_10de_00d1,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_00d1,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_00d2 = {
+	0x00d2, pci_device_10de_00d2,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_00d2,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_00d4 = {
+	0x00d4, pci_device_10de_00d4,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_00d4,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_00d5 = {
+	0x00d5, pci_device_10de_00d5,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_00d5,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_00d6 = {
+	0x00d6, pci_device_10de_00d6,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_00d6,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_00d7 = {
+	0x00d7, pci_device_10de_00d7,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_00d7,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_00d8 = {
+	0x00d8, pci_device_10de_00d8,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_00d8,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_00da = {
+	0x00da, pci_device_10de_00da,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_00da,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_00dd = {
+	0x00dd, pci_device_10de_00dd,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_00dd,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10de_0100 = {
 	0x0100, pci_device_10de_0100,
 #ifdef INIT_SUBSYS_INFO
@@ -48984,6 +50723,15 @@ static const pciDeviceInfo pci_dev_info_10de_01c3 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_01e0 = {
+	0x01e0, pci_device_10de_01e0,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_01e0,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10de_01e8 = {
 	0x01e8, pci_device_10de_01e8,
 #ifdef INIT_SUBSYS_INFO
@@ -48993,6 +50741,60 @@ static const pciDeviceInfo pci_dev_info_10de_01e8 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_01ea = {
+	0x01ea, pci_device_10de_01ea,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_01ea,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_01eb = {
+	0x01eb, pci_device_10de_01eb,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_01eb,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_01ec = {
+	0x01ec, pci_device_10de_01ec,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_01ec,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_01ed = {
+	0x01ed, pci_device_10de_01ed,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_01ed,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_01ee = {
+	0x01ee, pci_device_10de_01ee,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_01ee,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_01ef = {
+	0x01ef, pci_device_10de_01ef,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_01ef,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10de_01f0 = {
 	0x01f0, pci_device_10de_01f0,
 #ifdef INIT_SUBSYS_INFO
@@ -49128,6 +50930,15 @@ static const pciDeviceInfo pci_dev_info_10de_0282 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_0286 = {
+	0x0286, pci_device_10de_0286,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0286,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10de_0288 = {
 	0x0288, pci_device_10de_0288,
 #ifdef INIT_SUBSYS_INFO
@@ -49191,6 +51002,231 @@ static const pciDeviceInfo pci_dev_info_10de_0309 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_0311 = {
+	0x0311, pci_device_10de_0311,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0311,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0312 = {
+	0x0312, pci_device_10de_0312,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0312,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0314 = {
+	0x0314, pci_device_10de_0314,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0314,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_031a = {
+	0x031a, pci_device_10de_031a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_031a,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_031b = {
+	0x031b, pci_device_10de_031b,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_031b,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_031c = {
+	0x031c, pci_device_10de_031c,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_031c,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0321 = {
+	0x0321, pci_device_10de_0321,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0321,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0322 = {
+	0x0322, pci_device_10de_0322,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0322,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0323 = {
+	0x0323, pci_device_10de_0323,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0323,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0324 = {
+	0x0324, pci_device_10de_0324,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0324,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0325 = {
+	0x0325, pci_device_10de_0325,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0325,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0328 = {
+	0x0328, pci_device_10de_0328,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0328,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0329 = {
+	0x0329, pci_device_10de_0329,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0329,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_032a = {
+	0x032a, pci_device_10de_032a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_032a,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_032b = {
+	0x032b, pci_device_10de_032b,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_032b,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_032c = {
+	0x032c, pci_device_10de_032c,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_032c,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_032d = {
+	0x032d, pci_device_10de_032d,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_032d,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0330 = {
+	0x0330, pci_device_10de_0330,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0330,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0331 = {
+	0x0331, pci_device_10de_0331,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0331,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0332 = {
+	0x0332, pci_device_10de_0332,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0332,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0333 = {
+	0x0333, pci_device_10de_0333,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0333,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0338 = {
+	0x0338, pci_device_10de_0338,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0338,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0341 = {
+	0x0341, pci_device_10de_0341,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0341,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0342 = {
+	0x0342, pci_device_10de_0342,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0342,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_034e = {
+	0x034e, pci_device_10de_034e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_034e,
+#else
+	NULL,
+#endif
+	0
+};
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_10df_1ae5 = {
 	0x1ae5, pci_device_10df_1ae5,
@@ -49513,6 +51549,15 @@ static const pciDeviceInfo pci_dev_info_10e8_82db = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10e8_8851 = {
+	0x8851, pci_device_10e8_8851,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10e8_8851,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 static const pciDeviceInfo pci_dev_info_10ea_1680 = {
 	0x1680, pci_device_10ea_1680,
@@ -49728,6 +51773,15 @@ static const pciDeviceInfo pci_dev_info_10ee_3fc5 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10ee_8381 = {
+	0x8381, pci_device_10ee_8381,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10ee_8381,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_10ef_8154 = {
@@ -50738,6 +52792,15 @@ static const pciDeviceInfo pci_dev_info_1106_b168 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1106_b198 = {
+	0xb198, pci_device_1106_b198,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1106_b198,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_1107_0576 = {
@@ -50917,6 +52980,15 @@ static const pciDeviceInfo pci_dev_info_110a_2102 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_110a_4021 = {
+	0x4021, pci_device_110a_4021,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_110a_4021,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_110a_4942 = {
 	0x4942, pci_device_110a_4942,
 #ifdef INIT_SUBSYS_INFO
@@ -52180,6 +54252,51 @@ static const pciDeviceInfo pci_dev_info_1133_e005 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1133_e006 = {
+	0xe006, pci_device_1133_e006,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e006,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1133_e007 = {
+	0xe007, pci_device_1133_e007,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e007,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1133_e008 = {
+	0xe008, pci_device_1133_e008,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e008,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1133_e009 = {
+	0xe009, pci_device_1133_e009,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e009,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1133_e00a = {
+	0xe00a, pci_device_1133_e00a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e00a,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1133_e00b = {
 	0xe00b, pci_device_1133_e00b,
 #ifdef INIT_SUBSYS_INFO
@@ -52189,6 +54306,33 @@ static const pciDeviceInfo pci_dev_info_1133_e00b = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1133_e00c = {
+	0xe00c, pci_device_1133_e00c,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e00c,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1133_e00d = {
+	0xe00d, pci_device_1133_e00d,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e00d,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1133_e00e = {
+	0xe00e, pci_device_1133_e00e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e00e,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1133_e010 = {
 	0xe010, pci_device_1133_e010,
 #ifdef INIT_SUBSYS_INFO
@@ -52198,6 +54342,15 @@ static const pciDeviceInfo pci_dev_info_1133_e010 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1133_e011 = {
+	0xe011, pci_device_1133_e011,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e011,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1133_e012 = {
 	0xe012, pci_device_1133_e012,
 #ifdef INIT_SUBSYS_INFO
@@ -52207,6 +54360,15 @@ static const pciDeviceInfo pci_dev_info_1133_e012 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1133_e013 = {
+	0xe013, pci_device_1133_e013,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e013,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1133_e014 = {
 	0xe014, pci_device_1133_e014,
 #ifdef INIT_SUBSYS_INFO
@@ -52216,6 +54378,33 @@ static const pciDeviceInfo pci_dev_info_1133_e014 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1133_e015 = {
+	0xe015, pci_device_1133_e015,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e015,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1133_e016 = {
+	0xe016, pci_device_1133_e016,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e016,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1133_e017 = {
+	0xe017, pci_device_1133_e017,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e017,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1133_e018 = {
 	0xe018, pci_device_1133_e018,
 #ifdef INIT_SUBSYS_INFO
@@ -52225,6 +54414,60 @@ static const pciDeviceInfo pci_dev_info_1133_e018 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1133_e019 = {
+	0xe019, pci_device_1133_e019,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e019,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1133_e01a = {
+	0xe01a, pci_device_1133_e01a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e01a,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1133_e01b = {
+	0xe01b, pci_device_1133_e01b,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e01b,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1133_e01c = {
+	0xe01c, pci_device_1133_e01c,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e01c,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1133_e01e = {
+	0xe01e, pci_device_1133_e01e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e01e,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1133_e020 = {
+	0xe020, pci_device_1133_e020,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1133_e020,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_1134_0001 = {
@@ -55326,6 +57569,24 @@ static const pciDeviceInfo pci_dev_info_1242_4643 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1242_6562 = {
+	0x6562, pci_device_1242_6562,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1242_6562,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1242_656a = {
+	0x656a, pci_device_1242_656a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1242_656a,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_1244_0700 = {
@@ -56609,6 +58870,17 @@ static const pciDeviceInfo pci_dev_info_12d9_0004 = {
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_12de_0200 = {
+	0x0200, pci_device_12de_0200,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_12de_0200,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_12e0_0010 = {
 	0x0010, pci_device_12e0_0010,
 #ifdef INIT_SUBSYS_INFO
@@ -57437,6 +59709,44 @@ static const pciDeviceInfo pci_dev_info_131f_2062 = {
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_1331_8200 = {
+	0x8200, pci_device_1331_8200,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1331_8200,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1331_8201 = {
+	0x8201, pci_device_1331_8201,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1331_8201,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1331_8202 = {
+	0x8202, pci_device_1331_8202,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1331_8202,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1331_8210 = {
+	0x8210, pci_device_1331_8210,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1331_8210,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_1332_5415 = {
 	0x5415, pci_device_1332_5415,
 #ifdef INIT_SUBSYS_INFO
@@ -57773,6 +60083,17 @@ static const pciDeviceInfo pci_dev_info_135e_8001 = {
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_136b_ff01 = {
+	0xff01, pci_device_136b_ff01,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_136b_ff01,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_1385_4100 = {
 	0x4100, pci_device_1385_4100,
 #ifdef INIT_SUBSYS_INFO
@@ -58032,6 +60353,33 @@ static const pciDeviceInfo pci_dev_info_13c0_0010 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_13c0_0020 = {
+	0x0020, pci_device_13c0_0020,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_13c0_0020,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_13c0_0030 = {
+	0x0030, pci_device_13c0_0030,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_13c0_0030,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_13c0_0210 = {
+	0x0210, pci_device_13c0_0210,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_13c0_0210,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_13c1_1000 = {
@@ -58393,6 +60741,26 @@ static const pciDeviceInfo pci_dev_info_1415_9521 = {
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_1420_8002 = {
+	0x8002, pci_device_1420_8002,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1420_8002,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1420_8003 = {
+	0x8003, pci_device_1420_8003,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1420_8003,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_144a_7296 = {
 	0x7296, pci_device_144a_7296,
 #ifdef INIT_SUBSYS_INFO
@@ -59973,6 +62341,26 @@ static const pciDeviceInfo pci_dev_info_14f1_8234 = {
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_14fc_0000 = {
+	0x0000, pci_device_14fc_0000,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_14fc_0000,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_14fc_0001 = {
+	0x0001, pci_device_14fc_0001,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_14fc_0001,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_1507_0001 = {
 	0x0001, pci_device_1507_0001,
 #ifdef INIT_SUBSYS_INFO
@@ -60909,6 +63297,15 @@ static const pciDeviceInfo pci_dev_info_3388_0014 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_3388_0020 = {
+	0x0020, pci_device_3388_0020,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_3388_0020,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_3388_0021 = {
 	0x0021, pci_device_3388_0021,
 #ifdef INIT_SUBSYS_INFO
@@ -66348,6 +68745,7 @@ static const pciDeviceInfo *pci_dev_list_1002[] = {
 	&pci_dev_info_1002_4146,
 	&pci_dev_info_1002_4147,
 	&pci_dev_info_1002_4158,
+	&pci_dev_info_1002_4164,
 	&pci_dev_info_1002_4242,
 	&pci_dev_info_1002_4336,
 	&pci_dev_info_1002_4337,
@@ -66400,6 +68798,7 @@ static const pciDeviceInfo *pci_dev_list_1002[] = {
 	&pci_dev_info_1002_4c65,
 	&pci_dev_info_1002_4c66,
 	&pci_dev_info_1002_4c67,
+	&pci_dev_info_1002_4c6e,
 	&pci_dev_info_1002_4d46,
 	&pci_dev_info_1002_4d4c,
 	&pci_dev_info_1002_4e44,
@@ -66480,8 +68879,10 @@ static const pciDeviceInfo *pci_dev_list_1002[] = {
 	&pci_dev_info_1002_5654,
 	&pci_dev_info_1002_5655,
 	&pci_dev_info_1002_5656,
+	&pci_dev_info_1002_5961,
 	&pci_dev_info_1002_700f,
 	&pci_dev_info_1002_7010,
+	&pci_dev_info_1002_cab0,
 	&pci_dev_info_1002_cab2,
 	NULL
 };
@@ -66540,6 +68941,12 @@ static const pciDeviceInfo *pci_dev_list_100b[] = {
 	&pci_dev_info_100b_0012,
 	&pci_dev_info_100b_0020,
 	&pci_dev_info_100b_0022,
+	&pci_dev_info_100b_0028,
+	&pci_dev_info_100b_002b,
+	&pci_dev_info_100b_002d,
+	&pci_dev_info_100b_002e,
+	&pci_dev_info_100b_002f,
+	&pci_dev_info_100b_0030,
 	&pci_dev_info_100b_0500,
 	&pci_dev_info_100b_0501,
 	&pci_dev_info_100b_0502,
@@ -66642,8 +69049,10 @@ static const pciDeviceInfo *pci_dev_list_1014[] = {
 	&pci_dev_info_1014_0022,
 	&pci_dev_info_1014_002d,
 	&pci_dev_info_1014_002e,
+	&pci_dev_info_1014_0031,
 	&pci_dev_info_1014_0036,
 	&pci_dev_info_1014_003a,
+	&pci_dev_info_1014_003c,
 	&pci_dev_info_1014_003e,
 	&pci_dev_info_1014_0045,
 	&pci_dev_info_1014_0046,
@@ -66654,26 +69063,49 @@ static const pciDeviceInfo *pci_dev_list_1014[] = {
 	&pci_dev_info_1014_004f,
 	&pci_dev_info_1014_0050,
 	&pci_dev_info_1014_0053,
+	&pci_dev_info_1014_0054,
 	&pci_dev_info_1014_0057,
 	&pci_dev_info_1014_005c,
+	&pci_dev_info_1014_005e,
 	&pci_dev_info_1014_007c,
 	&pci_dev_info_1014_007d,
+	&pci_dev_info_1014_008e,
 	&pci_dev_info_1014_0090,
+	&pci_dev_info_1014_0091,
 	&pci_dev_info_1014_0095,
 	&pci_dev_info_1014_0096,
+	&pci_dev_info_1014_009f,
 	&pci_dev_info_1014_00a5,
 	&pci_dev_info_1014_00a6,
 	&pci_dev_info_1014_00b7,
+	&pci_dev_info_1014_00b8,
 	&pci_dev_info_1014_00be,
 	&pci_dev_info_1014_00dc,
 	&pci_dev_info_1014_00fc,
+	&pci_dev_info_1014_0104,
 	&pci_dev_info_1014_0105,
 	&pci_dev_info_1014_010f,
 	&pci_dev_info_1014_0142,
 	&pci_dev_info_1014_0144,
 	&pci_dev_info_1014_0156,
+	&pci_dev_info_1014_015e,
+	&pci_dev_info_1014_0160,
+	&pci_dev_info_1014_016e,
+	&pci_dev_info_1014_0170,
+	&pci_dev_info_1014_017d,
+	&pci_dev_info_1014_0180,
 	&pci_dev_info_1014_01a7,
 	&pci_dev_info_1014_01bd,
+	&pci_dev_info_1014_01c1,
+	&pci_dev_info_1014_01e6,
+	&pci_dev_info_1014_01ff,
+	&pci_dev_info_1014_0219,
+	&pci_dev_info_1014_021b,
+	&pci_dev_info_1014_021c,
+	&pci_dev_info_1014_0233,
+	&pci_dev_info_1014_0266,
+	&pci_dev_info_1014_0268,
+	&pci_dev_info_1014_0269,
 	&pci_dev_info_1014_0302,
 	&pci_dev_info_1014_ffff,
 	NULL
@@ -66736,6 +69168,7 @@ static const pciDeviceInfo *pci_dev_list_1022[] = {
 	&pci_dev_info_1022_1103,
 	&pci_dev_info_1022_2000,
 	&pci_dev_info_1022_2001,
+	&pci_dev_info_1022_2003,
 	&pci_dev_info_1022_2020,
 	&pci_dev_info_1022_2040,
 	&pci_dev_info_1022_3000,
@@ -66778,6 +69211,7 @@ static const pciDeviceInfo *pci_dev_list_1022[] = {
 	&pci_dev_info_1022_746b,
 	&pci_dev_info_1022_746d,
 	&pci_dev_info_1022_746e,
+	&pci_dev_info_1022_756b,
 	NULL
 };
 static const pciDeviceInfo *pci_dev_list_1023[] = {
@@ -66965,6 +69399,7 @@ static const pciDeviceInfo *pci_dev_list_1031[] = {
 };
 #define pci_dev_list_1032 NULL
 static const pciDeviceInfo *pci_dev_list_1033[] = {
+	&pci_dev_info_1033_0000,
 	&pci_dev_info_1033_0001,
 	&pci_dev_info_1033_0002,
 	&pci_dev_info_1033_0003,
@@ -66992,7 +69427,9 @@ static const pciDeviceInfo *pci_dev_list_1033[] = {
 	&pci_dev_info_1033_009b,
 	&pci_dev_info_1033_00a6,
 	&pci_dev_info_1033_00cd,
+	&pci_dev_info_1033_00df,
 	&pci_dev_info_1033_00e0,
+	&pci_dev_info_1033_00f3,
 	NULL
 };
 #define pci_dev_list_1034 NULL
@@ -67040,6 +69477,7 @@ static const pciDeviceInfo *pci_dev_list_1039[] = {
 	&pci_dev_info_1039_0735,
 	&pci_dev_info_1039_0740,
 	&pci_dev_info_1039_0745,
+	&pci_dev_info_1039_0746,
 	&pci_dev_info_1039_0755,
 	&pci_dev_info_1039_0900,
 	&pci_dev_info_1039_0961,
@@ -67073,6 +69511,7 @@ static const pciDeviceInfo *pci_dev_list_1039[] = {
 	&pci_dev_info_1039_7013,
 	&pci_dev_info_1039_7016,
 	&pci_dev_info_1039_7018,
+	&pci_dev_info_1039_7019,
 	NULL
 };
 #define pci_dev_list_103a NULL
@@ -67127,6 +69566,7 @@ static const pciDeviceInfo *pci_dev_list_1042[] = {
 static const pciDeviceInfo *pci_dev_list_1043[] = {
 	&pci_dev_info_1043_0675,
 	&pci_dev_info_1043_4021,
+	&pci_dev_info_1043_4057,
 	NULL
 };
 #endif
@@ -67182,11 +69622,18 @@ static const pciDeviceInfo *pci_dev_list_104a[] = {
 	&pci_dev_info_104a_0008,
 	&pci_dev_info_104a_0009,
 	&pci_dev_info_104a_0010,
+	&pci_dev_info_104a_0209,
+	&pci_dev_info_104a_020a,
 	&pci_dev_info_104a_0210,
+	&pci_dev_info_104a_021a,
+	&pci_dev_info_104a_021b,
+	&pci_dev_info_104a_0500,
+	&pci_dev_info_104a_0564,
 	&pci_dev_info_104a_0981,
 	&pci_dev_info_104a_1746,
 	&pci_dev_info_104a_2774,
 	&pci_dev_info_104a_3520,
+	&pci_dev_info_104a_55cc,
 	NULL
 };
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -67215,7 +69662,10 @@ static const pciDeviceInfo *pci_dev_list_104c[] = {
 	&pci_dev_info_104c_8024,
 	&pci_dev_info_104c_8026,
 	&pci_dev_info_104c_8027,
+	&pci_dev_info_104c_8029,
 	&pci_dev_info_104c_8400,
+	&pci_dev_info_104c_8401,
+	&pci_dev_info_104c_9000,
 	&pci_dev_info_104c_a001,
 	&pci_dev_info_104c_a100,
 	&pci_dev_info_104c_a102,
@@ -67244,6 +69694,7 @@ static const pciDeviceInfo *pci_dev_list_104c[] = {
 	&pci_dev_info_104c_ac40,
 	&pci_dev_info_104c_ac41,
 	&pci_dev_info_104c_ac42,
+	&pci_dev_info_104c_ac44,
 	&pci_dev_info_104c_ac50,
 	&pci_dev_info_104c_ac51,
 	&pci_dev_info_104c_ac52,
@@ -67325,6 +69776,7 @@ static const pciDeviceInfo *pci_dev_list_105a[] = {
 	&pci_dev_info_105a_0d30,
 	&pci_dev_info_105a_0d38,
 	&pci_dev_info_105a_1275,
+	&pci_dev_info_105a_3318,
 	&pci_dev_info_105a_3376,
 	&pci_dev_info_105a_4d30,
 	&pci_dev_info_105a_4d33,
@@ -67336,6 +69788,7 @@ static const pciDeviceInfo *pci_dev_list_105a[] = {
 	&pci_dev_info_105a_6268,
 	&pci_dev_info_105a_6269,
 	&pci_dev_info_105a_6621,
+	&pci_dev_info_105a_6629,
 	&pci_dev_info_105a_7275,
 	NULL
 };
@@ -67414,6 +69867,7 @@ static const pciDeviceInfo *pci_dev_list_1069[] = {
 	&pci_dev_info_1069_0002,
 	&pci_dev_info_1069_0010,
 	&pci_dev_info_1069_0050,
+	&pci_dev_info_1069_b166,
 	&pci_dev_info_1069_ba55,
 	&pci_dev_info_1069_ba56,
 	NULL
@@ -67686,6 +70140,8 @@ static const pciDeviceInfo *pci_dev_list_1093[] = {
 	&pci_dev_info_1093_1190,
 	&pci_dev_info_1093_1330,
 	&pci_dev_info_1093_1350,
+	&pci_dev_info_1093_17d0,
+	&pci_dev_info_1093_2410,
 	&pci_dev_info_1093_2a60,
 	&pci_dev_info_1093_b001,
 	&pci_dev_info_1093_b011,
@@ -67860,6 +70316,7 @@ static const pciDeviceInfo *pci_dev_list_10b5[] = {
 	&pci_dev_info_10b5_906d,
 	&pci_dev_info_10b5_906e,
 	&pci_dev_info_10b5_9080,
+	&pci_dev_info_10b5_bb04,
 	NULL
 };
 #endif
@@ -67886,6 +70343,7 @@ static const pciDeviceInfo *pci_dev_list_10b7[] = {
 	&pci_dev_info_10b7_0910,
 	&pci_dev_info_10b7_1006,
 	&pci_dev_info_10b7_1007,
+	&pci_dev_info_10b7_1700,
 	&pci_dev_info_10b7_3390,
 	&pci_dev_info_10b7_3590,
 	&pci_dev_info_10b7_4500,
@@ -67908,6 +70366,7 @@ static const pciDeviceInfo *pci_dev_list_10b7[] = {
 	&pci_dev_info_10b7_6563,
 	&pci_dev_info_10b7_6564,
 	&pci_dev_info_10b7_7646,
+	&pci_dev_info_10b7_7770,
 	&pci_dev_info_10b7_7940,
 	&pci_dev_info_10b7_7980,
 	&pci_dev_info_10b7_7990,
@@ -68064,7 +70523,13 @@ static const pciDeviceInfo *pci_dev_list_10c8[] = {
 #define pci_dev_list_10c9 NULL
 #define pci_dev_list_10ca NULL
 #define pci_dev_list_10cb NULL
-#define pci_dev_list_10cc NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_10cc[] = {
+	&pci_dev_info_10cc_0660,
+	&pci_dev_info_10cc_0661,
+	NULL
+};
+#endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_10cd[] = {
 	&pci_dev_info_10cd_1100,
@@ -68082,7 +70547,6 @@ static const pciDeviceInfo *pci_dev_list_10cf[] = {
 	NULL
 };
 #endif
-#define pci_dev_list_10d0 NULL
 #define pci_dev_list_10d1 NULL
 #define pci_dev_list_10d2 NULL
 #define pci_dev_list_10d3 NULL
@@ -68140,8 +70604,20 @@ static const pciDeviceInfo *pci_dev_list_10de[] = {
 	&pci_dev_info_10de_0068,
 	&pci_dev_info_10de_006a,
 	&pci_dev_info_10de_006b,
+	&pci_dev_info_10de_006c,
+	&pci_dev_info_10de_006d,
 	&pci_dev_info_10de_006e,
 	&pci_dev_info_10de_00a0,
+	&pci_dev_info_10de_00d0,
+	&pci_dev_info_10de_00d1,
+	&pci_dev_info_10de_00d2,
+	&pci_dev_info_10de_00d4,
+	&pci_dev_info_10de_00d5,
+	&pci_dev_info_10de_00d6,
+	&pci_dev_info_10de_00d7,
+	&pci_dev_info_10de_00d8,
+	&pci_dev_info_10de_00da,
+	&pci_dev_info_10de_00dd,
 	&pci_dev_info_10de_0100,
 	&pci_dev_info_10de_0101,
 	&pci_dev_info_10de_0103,
@@ -68185,7 +70661,14 @@ static const pciDeviceInfo *pci_dev_list_10de[] = {
 	&pci_dev_info_10de_01c1,
 	&pci_dev_info_10de_01c2,
 	&pci_dev_info_10de_01c3,
+	&pci_dev_info_10de_01e0,
 	&pci_dev_info_10de_01e8,
+	&pci_dev_info_10de_01ea,
+	&pci_dev_info_10de_01eb,
+	&pci_dev_info_10de_01ec,
+	&pci_dev_info_10de_01ed,
+	&pci_dev_info_10de_01ee,
+	&pci_dev_info_10de_01ef,
 	&pci_dev_info_10de_01f0,
 	&pci_dev_info_10de_0200,
 	&pci_dev_info_10de_0201,
@@ -68201,6 +70684,7 @@ static const pciDeviceInfo *pci_dev_list_10de[] = {
 	&pci_dev_info_10de_0280,
 	&pci_dev_info_10de_0281,
 	&pci_dev_info_10de_0282,
+	&pci_dev_info_10de_0286,
 	&pci_dev_info_10de_0288,
 	&pci_dev_info_10de_0289,
 	&pci_dev_info_10de_0300,
@@ -68208,6 +70692,31 @@ static const pciDeviceInfo *pci_dev_list_10de[] = {
 	&pci_dev_info_10de_0302,
 	&pci_dev_info_10de_0308,
 	&pci_dev_info_10de_0309,
+	&pci_dev_info_10de_0311,
+	&pci_dev_info_10de_0312,
+	&pci_dev_info_10de_0314,
+	&pci_dev_info_10de_031a,
+	&pci_dev_info_10de_031b,
+	&pci_dev_info_10de_031c,
+	&pci_dev_info_10de_0321,
+	&pci_dev_info_10de_0322,
+	&pci_dev_info_10de_0323,
+	&pci_dev_info_10de_0324,
+	&pci_dev_info_10de_0325,
+	&pci_dev_info_10de_0328,
+	&pci_dev_info_10de_0329,
+	&pci_dev_info_10de_032a,
+	&pci_dev_info_10de_032b,
+	&pci_dev_info_10de_032c,
+	&pci_dev_info_10de_032d,
+	&pci_dev_info_10de_0330,
+	&pci_dev_info_10de_0331,
+	&pci_dev_info_10de_0332,
+	&pci_dev_info_10de_0333,
+	&pci_dev_info_10de_0338,
+	&pci_dev_info_10de_0341,
+	&pci_dev_info_10de_0342,
+	&pci_dev_info_10de_034e,
 	NULL
 };
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -68270,6 +70779,7 @@ static const pciDeviceInfo *pci_dev_list_10e8[] = {
 	&pci_dev_info_10e8_811a,
 	&pci_dev_info_10e8_8170,
 	&pci_dev_info_10e8_82db,
+	&pci_dev_info_10e8_8851,
 	NULL
 };
 #endif
@@ -68317,6 +70827,7 @@ static const pciDeviceInfo *pci_dev_list_10ee[] = {
 	&pci_dev_info_10ee_3fc3,
 	&pci_dev_info_10ee_3fc4,
 	&pci_dev_info_10ee_3fc5,
+	&pci_dev_info_10ee_8381,
 	NULL
 };
 #endif
@@ -68491,6 +71002,7 @@ static const pciDeviceInfo *pci_dev_list_1106[] = {
 	&pci_dev_info_1106_b103,
 	&pci_dev_info_1106_b112,
 	&pci_dev_info_1106_b168,
+	&pci_dev_info_1106_b198,
 	NULL
 };
 #endif
@@ -68530,6 +71042,7 @@ static const pciDeviceInfo *pci_dev_list_110a[] = {
 	&pci_dev_info_110a_007c,
 	&pci_dev_info_110a_007d,
 	&pci_dev_info_110a_2102,
+	&pci_dev_info_110a_4021,
 	&pci_dev_info_110a_4942,
 	&pci_dev_info_110a_6120,
 	NULL
@@ -68767,11 +71280,30 @@ static const pciDeviceInfo *pci_dev_list_1133[] = {
 	&pci_dev_info_1133_e003,
 	&pci_dev_info_1133_e004,
 	&pci_dev_info_1133_e005,
+	&pci_dev_info_1133_e006,
+	&pci_dev_info_1133_e007,
+	&pci_dev_info_1133_e008,
+	&pci_dev_info_1133_e009,
+	&pci_dev_info_1133_e00a,
 	&pci_dev_info_1133_e00b,
+	&pci_dev_info_1133_e00c,
+	&pci_dev_info_1133_e00d,
+	&pci_dev_info_1133_e00e,
 	&pci_dev_info_1133_e010,
+	&pci_dev_info_1133_e011,
 	&pci_dev_info_1133_e012,
+	&pci_dev_info_1133_e013,
 	&pci_dev_info_1133_e014,
+	&pci_dev_info_1133_e015,
+	&pci_dev_info_1133_e016,
+	&pci_dev_info_1133_e017,
 	&pci_dev_info_1133_e018,
+	&pci_dev_info_1133_e019,
+	&pci_dev_info_1133_e01a,
+	&pci_dev_info_1133_e01b,
+	&pci_dev_info_1133_e01c,
+	&pci_dev_info_1133_e01e,
+	&pci_dev_info_1133_e020,
 	NULL
 };
 #endif
@@ -69621,6 +72153,8 @@ static const pciDeviceInfo *pci_dev_list_123f[] = {
 static const pciDeviceInfo *pci_dev_list_1242[] = {
 	&pci_dev_info_1242_1560,
 	&pci_dev_info_1242_4643,
+	&pci_dev_info_1242_6562,
+	&pci_dev_info_1242_656a,
 	NULL
 };
 #endif
@@ -70049,7 +72583,12 @@ static const pciDeviceInfo *pci_dev_list_12d9[] = {
 #define pci_dev_list_12db NULL
 #define pci_dev_list_12dc NULL
 #define pci_dev_list_12dd NULL
-#define pci_dev_list_12de NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_12de[] = {
+	&pci_dev_info_12de_0200,
+	NULL
+};
+#endif
 #define pci_dev_list_12df NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_12e0[] = {
@@ -70251,7 +72790,15 @@ static const pciDeviceInfo *pci_dev_list_131f[] = {
 #define pci_dev_list_132c NULL
 #define pci_dev_list_132d NULL
 #define pci_dev_list_1330 NULL
-#define pci_dev_list_1331 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_1331[] = {
+	&pci_dev_info_1331_8200,
+	&pci_dev_info_1331_8201,
+	&pci_dev_info_1331_8202,
+	&pci_dev_info_1331_8210,
+	NULL
+};
+#endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_1332[] = {
 	&pci_dev_info_1332_5415,
@@ -70361,7 +72908,12 @@ static const pciDeviceInfo *pci_dev_list_135e[] = {
 #define pci_dev_list_1368 NULL
 #define pci_dev_list_1369 NULL
 #define pci_dev_list_136a NULL
-#define pci_dev_list_136b NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_136b[] = {
+	&pci_dev_info_136b_ff01,
+	NULL
+};
+#endif
 #define pci_dev_list_136c NULL
 #define pci_dev_list_136d NULL
 #define pci_dev_list_136f NULL
@@ -70505,6 +73057,9 @@ static const pciDeviceInfo *pci_dev_list_13a8[] = {
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_13c0[] = {
 	&pci_dev_info_13c0_0010,
+	&pci_dev_info_13c0_0020,
+	&pci_dev_info_13c0_0030,
+	&pci_dev_info_13c0_0210,
 	NULL
 };
 #endif
@@ -70691,7 +73246,13 @@ static const pciDeviceInfo *pci_dev_list_1415[] = {
 #define pci_dev_list_141d NULL
 #define pci_dev_list_141e NULL
 #define pci_dev_list_141f NULL
-#define pci_dev_list_1420 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_1420[] = {
+	&pci_dev_info_1420_8002,
+	&pci_dev_info_1420_8003,
+	NULL
+};
+#endif
 #define pci_dev_list_1421 NULL
 #define pci_dev_list_1422 NULL
 #define pci_dev_list_1423 NULL
@@ -71144,7 +73705,13 @@ static const pciDeviceInfo *pci_dev_list_14f1[] = {
 #define pci_dev_list_14f9 NULL
 #define pci_dev_list_14fa NULL
 #define pci_dev_list_14fb NULL
-#define pci_dev_list_14fc NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_14fc[] = {
+	&pci_dev_info_14fc_0000,
+	&pci_dev_info_14fc_0001,
+	NULL
+};
+#endif
 #define pci_dev_list_14fd NULL
 #define pci_dev_list_14fe NULL
 #define pci_dev_list_14ff NULL
@@ -71706,6 +74273,7 @@ static const pciDeviceInfo *pci_dev_list_2348[] = {
 static const pciDeviceInfo *pci_dev_list_3388[] = {
 	&pci_dev_info_3388_0013,
 	&pci_dev_info_3388_0014,
+	&pci_dev_info_3388_0020,
 	&pci_dev_info_3388_0021,
 	&pci_dev_info_3388_101a,
 	&pci_dev_info_3388_101b,
@@ -73130,9 +75698,6 @@ static const pciVendorInfo pciVendorInfoList[] = {
 	{0x10cf, pci_vendor_10cf, pci_dev_list_10cf},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
-	{0x10d0, pci_vendor_10d0, pci_dev_list_10d0},
-#endif
-#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x10d1, pci_vendor_10d1, pci_dev_list_10d1},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -78066,9 +80631,6 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = {
 	{0x10cf, pci_vendor_10cf, pci_ss_list_10cf},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
-	{0x10d0, pci_vendor_10d0, pci_ss_list_10d0},
-#endif
-#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x10d1, pci_vendor_10d1, pci_ss_list_10d1},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
diff --git a/hw/xfree86/utils/xorgcfg/config.h b/hw/xfree86/utils/xorgcfg/config.h
index 6d1193a3d..0853b67fa 100644
--- a/hw/xfree86/utils/xorgcfg/config.h
+++ b/hw/xfree86/utils/xorgcfg/config.h
@@ -26,12 +26,14 @@
  *
  * Author: Paulo C�sar Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.17 2003/06/10 17:03:55 dawes Exp $
+ * $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.18 2003/12/19 02:05:38 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.18 2003/12/19 02:05:38 dawes Exp $
  */
 
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <X11/Xmu/SysUtil.h>
+#include <X11/Xos.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <dirent.h>
diff --git a/hw/xfree86/utils/xorgcfg/loader.c b/hw/xfree86/utils/xorgcfg/loader.c
index ddfa2903f..71ac17d80 100644
--- a/hw/xfree86/utils/xorgcfg/loader.c
+++ b/hw/xfree86/utils/xorgcfg/loader.c
@@ -26,7 +26,8 @@
  *
  * Author: Paulo C�sar Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.19 2002/06/06 21:03:32 paulo Exp $
+ * $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.20 2003/12/17 17:45:33 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.20 2003/12/17 17:45:33 dawes Exp $
  */
 
 #include "config.h"
@@ -35,12 +36,19 @@
 #include "loader.h"
 #include "stubs.h"
 #include <X11/Xresource.h>
+#include <X11/Xos.h>
 
 #ifdef USE_MODULES
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#if defined(X_POSIX_C_SOURCE)
+#define _POSIX_C_SOURCE X_POSIX_C_SOURCE
 #include <setjmp.h>
+#undef _POSIX_C_SOURCE
+#else
+#include <setjmp.h>
+#endif
 #include <signal.h>
 #include <ctype.h>
 
diff --git a/hw/xfree86/x86emu/decode.c b/hw/xfree86/x86emu/decode.c
index 110be9848..711c8dc83 100644
--- a/hw/xfree86/x86emu/decode.c
+++ b/hw/xfree86/x86emu/decode.c
@@ -37,7 +37,8 @@
 *
 ****************************************************************************/
 
-/* $XFree86: xc/extras/x86emu/src/x86emu/decode.c,v 1.11 2002/07/23 20:20:43 tsi Exp $ */
+/* $XdotOrg: xc/extras/x86emu/src/x86emu/decode.c,v 1.12 2003/12/05 19:23:23 dawes Exp $ */
+/* $XFree86: xc/extras/x86emu/src/x86emu/decode.c,v 1.12 2003/12/05 19:23:23 dawes Exp $ */
 
 #include "x86emu/x86emui.h"
 
@@ -699,7 +700,11 @@ u16* decode_rm_seg_register(
 		DECODE_PRINTF("DS");
 		return &M.x86.R_DS;
 	  case 4:
+		DECODE_PRINTF("FS");
+		return &M.x86.R_FS;
 	  case 5:
+		DECODE_PRINTF("GS");
+		return &M.x86.R_GS;
 	  case 6:
 	  case 7:
 		DECODE_PRINTF("ILLEGAL SEGREG");
diff --git a/include/regionstr.h b/include/regionstr.h
index c100d9bdb..b7a05eaca 100644
--- a/include/regionstr.h
+++ b/include/regionstr.h
@@ -1,4 +1,4 @@
-/* $XdotOrg: regionstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
+/* $XdotOrg: xc/programs/Xserver/include/regionstr.h,v 1.1.4.6 2003/12/06 13:24:29 kaleb Exp $ */
 /* $Xorg: regionstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /***********************************************************
 
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.12 2003/11/29 02:29:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.13 2003/12/03 17:11:29 tsi Exp $ */
 
 #ifndef REGIONSTRUCT_H
 #define REGIONSTRUCT_H
@@ -168,18 +168,8 @@ extern RegDataRec miBrokenData;
 
 #else /* !NEED_SCREEN_REGIONS */
 
-/* Reference _pScreen macro argument and possibly check its type */
-#undef REGION_SCREEN
-extern volatile ScreenPtr currentRegionScreen;
-#if defined(NDEBUG) && !defined(DEBUG) && !defined(BUILDDEBUG)
-
-# define REGION_SCREEN(_pScreen_) (void)(_pScreen_)
-
-#else
-
-# define REGION_SCREEN(_pScreen_) (void)(currentRegionScreen = (_pScreen_))
-
-#endif
+/* Reference _pScreen macro argument and check its type */
+#define REGION_SCREEN(_pScreen_) (void)((_pScreen_)->myNum)
 
 #define REGION_CREATE(_pScreen, _rect, _size) \
     (REGION_SCREEN(_pScreen), miRegionCreate(_rect, _size))
@@ -257,8 +247,8 @@ extern volatile ScreenPtr currentRegionScreen;
 #define REGION_INIT(_pScreen, _pReg, _rect, _size) \
 { \
     REGION_SCREEN(_pScreen); \
-	(_pReg)->extents = *(_rect); \
-	(_pReg)->data = (RegDataPtr)NULL; \
+    (_pReg)->extents = *(_rect); \
+    (_pReg)->data = (RegDataPtr)NULL; \
 }
 
 #define REGION_UNINIT(_pScreen, _pReg) \
diff --git a/mi/miarc.c b/mi/miarc.c
index 832a056c3..70b9fde04 100644
--- a/mi/miarc.c
+++ b/mi/miarc.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.14 2003/10/29 22:57:48 tsi Exp $ */
+/* $XdotOrg: xc/programs/Xserver/mi/miarc.c,v 3.15 2003/12/06 18:46:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.15 2003/12/06 18:46:28 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -1702,6 +1703,8 @@ miGetArcPts(
 
     poly[cpt].x = (xc + x0);
     poly[cpt].y = (yc + y0);
+    poly[cpt + 1].x = (xc + x1);
+    poly[cpt + 1].y = (yc + y1);
 
     for(i = 2; i < count; i++)
     {
author	Kaleb Keithley <kaleb@freedesktop.org>	2003-12-20 00:28:31 +0000
committer	Kaleb Keithley <kaleb@freedesktop.org>	2003-12-20 00:28:31 +0000
commit	e97c634593dd171a05aa0fa5a35d218dcc3ecfb0 (patch)
tree	e0de50ad82b9890959a1a65d81a654935a1291bb
parent	4b75c7f6358b28978b05ffa4b73853d936454f50 (diff)