xserver: Branch 'XACE-SELINUX' - 39 commits

Eamon Walsh ewalsh at kemper.freedesktop.org
Thu Oct 12 04:16:26 EEST 2006


 GL/symlink-mesa.sh                             |  381 -
 Xext/xselinux.c                                |   40 
 configure.ac                                   |   10 
 fb/Makefile.am                                 |   12 
 fb/fb.h                                        |  118 
 fb/fb24_32.c                                   |   74 
 fb/fballpriv.c                                 |    5 
 fb/fbarc.c                                     |    1 
 fb/fbbits.c                                    |   16 
 fb/fbbits.h                                    |   35 
 fb/fbblt.c                                     |  138 
 fb/fbbltone.c                                  |   96 
 fb/fbcompose.c                                 |  663 +-
 fb/fbcopy.c                                    |   10 
 fb/fbedge.c                                    |   16 
 fb/fbedgeimp.h                                 |   10 
 fb/fbfill.c                                    |   13 
 fb/fbgc.c                                      |   13 
 fb/fbgetsp.c                                   |    2 
 fb/fbglyph.c                                   |   18 
 fb/fbimage.c                                   |    6 
 fb/fbpict.c                                    |  109 
 fb/fbpict.h                                    |   29 
 fb/fbpixmap.c                                  |   12 
 fb/fbpoint.c                                   |    7 
 fb/fbpseudocolor.c                             |    6 
 fb/fbpush.c                                    |    7 
 fb/fbscreen.c                                  |   40 
 fb/fbseg.c                                     |   28 
 fb/fbsetsp.c                                   |    1 
 fb/fbsolid.c                                   |   42 
 fb/fbstipple.c                                 |    6 
 fb/fbtile.c                                    |    6 
 fb/fbtrap.c                                    |    4 
 fb/fbwindow.c                                  |    8 
 fb/wfbrename.h                                 |  198 
 hw/dmx/Makefile.am                             |    4 
 hw/dmx/dmxcmap.c                               |   19 
 hw/dmx/dmxcursor.c                             |    4 
 hw/xfree86/Makefile.am                         |    6 
 hw/xfree86/dixmods/Makefile.am                 |    6 
 hw/xfree86/dixmods/fbmodule.c                  |    6 
 hw/xfree86/dri/dri.c                           |   22 
 hw/xfree86/os-support/bus/linuxPci.c           |    4 
 hw/xfree86/os-support/drm/xf86drm.c            |   16 
 hw/xfree86/os-support/xf86drm.h                |    3 
 hw/xfree86/parser/scan.c                       |  123 
 hw/xfree86/rac/Makefile.am                     |    2 
 hw/xfree86/scanpci/extrapci.ids                |    7 
 hw/xfree86/scanpci/pci.ids                     | 1031 ++-
 hw/xfree86/scanpci/pciid2c.pl                  |    3 
 hw/xfree86/scanpci/xf86PciStdIds.h             | 6958 +++++++++++++++++++++++--
 hw/xprint/etc/Xsession.d/92xprint-xpserverlist |    8 
 hw/xprint/etc/Xsession.d/Makefile.am           |    3 
 xkb/ddxList.c                                  |    2 
 xkb/xkbUtils.c                                 |    8 
 56 files changed, 8833 insertions(+), 1582 deletions(-)

New commits:
diff-tree 4b53a5e4b147ab748b28dffc1d330b7148d8efa6 (from parents)
Merge: 23f6f08b7b5c9a4297fd223d232a7e9f45376550 042d4a407d0eca9131d0420b0b9189559aac326d
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Wed Oct 11 20:50:31 2006 -0400

    Merge branch 'master' into my-XACE-SELINUX

diff-tree 042d4a407d0eca9131d0420b0b9189559aac326d (from 1b94c117e0f294ef2f89bf24d45ba7a8e45efe35)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Oct 9 16:32:11 2006 -0700

    Bug #8459: Don't forget to include AM_CFLAGS in libfb_la_CFLAGS on non-MMX platforms.
    
    Reported by Edgar Toernig.

diff --git a/fb/Makefile.am b/fb/Makefile.am
index 9a56b93..1649669 100644
--- a/fb/Makefile.am
+++ b/fb/Makefile.am
@@ -10,8 +10,10 @@ if XORG
 sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h wfbrename.h
 endif
 
+libfb_la_CFLAGS = $(AM_CFLAGS)
+
 if MMX_CAPABLE
-libfb_la_CFLAGS = $(AM_CFLAGS) -DUSE_MMX
+libfb_la_CFLAGS += -DUSE_MMX
 
 libfbmmx_la_CFLAGS =				\
 	$(DIX_CFLAGS)				\
diff-tree 1b94c117e0f294ef2f89bf24d45ba7a8e45efe35 (from 6776c0f0e9677a65ec36ceef9618ff701b99596c)
Author: Matthias Hopf <mhopf at suse.de>
Date:   Tue Oct 10 19:37:22 2006 +0200

    Fixing probably long-standing bug in domain support.

diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
index c6dad1f..7d220d0 100644
--- a/hw/xfree86/os-support/bus/linuxPci.c
+++ b/hw/xfree86/os-support/bus/linuxPci.c
@@ -498,7 +498,7 @@ xf86GetPciDomain(PCITAG Tag)
     pPCI = xf86GetPciHostConfigFromTag(Tag);
 
     if (pPCI && (result = PCI_DOM_FROM_BUS(pPCI->busnum)))
-	return result;
+	return result + 1;
 
     if (!pPCI || pPCI->fakeDevice)
 	return 1;		/* Domain 0 is reserved */
diff-tree 6776c0f0e9677a65ec36ceef9618ff701b99596c (from 4c342246300e06bdf5c9c62cc1d2f6aa57a524db)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Mon Oct 9 17:24:37 2006 -0700

    Use bash on Solaris to run symlink-mesa.sh
    
    symlink-mesa.sh won't run with Solaris Bourne Shell (/bin/sh) so explicitly
    run it with /usr/bin/bash instead
    (cherry picked from cde68728860179dc84e615ccb378ce992513fd62 commit)

diff --git a/configure.ac b/configure.ac
index 43480c7..7222106 100644
--- a/configure.ac
+++ b/configure.ac
@@ -582,7 +582,12 @@ if test "x$GLX" = xyes && ! test "x$MESA
 	AC_DEFINE(GLXEXT, 1, [Build GLX extension])
 	GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la'
 	test -d GL || mkdir GL
-        $srcdir/GL/symlink-mesa.sh $MESA_SOURCE GL/
+	case $host_os in
+	  solaris*) 	
+		SYMLINK_MESA="/usr/bin/bash $srcdir/GL/symlink-mesa.sh"	;;
+	  *)	SYMLINK_MESA=$srcdir/GL/symlink-mesa.sh ;;
+	esac
+	$SYMLINK_MESA $MESA_SOURCE GL/
 	if test $? -ne 0; then
 		AC_MSG_ERROR([Failed to link Mesa source tree.  Please specify a proper path to Mesa sources, or disable GLX.])
 	fi
diff-tree 4c342246300e06bdf5c9c62cc1d2f6aa57a524db (from parents)
Merge: 8382234a7f318057de66490299d63807cefb5201 49a70c8570b03aff8239324a2474918a6fbc52a0
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Fri Oct 6 18:01:13 2006 -0700

    Merge branch 'XACE-modular'

diff-tree 23f6f08b7b5c9a4297fd223d232a7e9f45376550 (from df351f1efbcc95f94c719fcf993c480155c511e9)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Thu Oct 5 16:07:26 2006 -0400

    Improve error handling, messages during initialization.

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index df19e5d..2f960d1 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1211,7 +1211,7 @@ CALLBACK(XSELinuxWindowInit)
     if (HAVESTATE(rec->client)) {
 	rc = avc_sid_to_context(SID(rec->client), &ctx);
 	if (rc < 0)
-	    FatalError("Failed to get security context!\n");
+	    FatalError("XSELinux: Failed to get security context!\n");
 	rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8,
 				  PropModeReplace, strlen(ctx), ctx, FALSE);
 	freecon(ctx);
@@ -1220,7 +1220,7 @@ CALLBACK(XSELinuxWindowInit)
 	rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8,
 				  PropModeReplace, 10, "UNLABELED!", FALSE);
     if (rc != Success)
-	FatalError("Failed to set context property on window!\n");
+	FatalError("XSELinux: Failed to set context property on window!\n");
 } /* XSELinuxWindowInit */
 
 static char *XSELinuxKeywords[] = {
@@ -1859,13 +1859,13 @@ XSELinuxExtensionInit(INITARGS)
 
     if (!is_selinux_enabled())
     {
-        ErrorF("SELinux Extension failed to load: SELinux not enabled\n");
+        ErrorF("XSELinux: Extension failed to load: SELinux not enabled\n");
         return;
     }
 
     if (avc_init("xserver", NULL, &alc, NULL, NULL) < 0)
     {
-	FatalError("couldn't initialize SELinux userspace AVC\n");
+	FatalError("XSELinux: Couldn't initialize SELinux userspace AVC\n");
     }
 
     if (!AddCallback(&ClientStateCallback, XSELinuxClientState, NULL))
@@ -1874,10 +1874,10 @@ XSELinuxExtensionInit(INITARGS)
     /* Create atoms for doing window labeling */
     atom_ctx = MakeAtom("_SELINUX_CONTEXT", 16, 1);
     if (atom_ctx == BAD_RESOURCE)
-	return;
+	FatalError("XSELinux: Failed to create atom\n");
     atom_client_ctx = MakeAtom("_SELINUX_CLIENT_CONTEXT", 23, 1);
     if (atom_client_ctx == BAD_RESOURCE)
-	return;
+	FatalError("XSELinux: Failed to create atom\n");
 
     /* Load the config file.  If this fails, shut down the server,
      * since an unknown security status is worse than no security.
diff-tree df351f1efbcc95f94c719fcf993c480155c511e9 (from 75e0cc41b201b9ceb2615e7cec0dd5b4c136b343)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Wed Oct 4 16:23:35 2006 -0400

    Experimental window property holding security context.

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 5a6d2ef..df19e5d 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -35,6 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
 #endif
 
 #include <X11/X.h>
+#include <X11/Xatom.h>
 #include <X11/Xproto.h>
 #include <X11/Xfuncproto.h>
 #include "dixstruct.h"
@@ -120,6 +121,10 @@ static char **extensionTypes = NULL;
 static int extensionTypesCount = 0;
 static char *XSELinuxExtensionTypeDefault = NULL;
 
+/* Atoms for SELinux window labeling properties */
+Atom atom_ctx;
+Atom atom_client_ctx;
+
 /* security context for non-local clients */
 static char *XSELinuxNonlocalContextDefault = NULL;
 
@@ -1196,6 +1201,28 @@ CALLBACK(XSELinuxClientState)
     }
 } /* XSELinuxClientState */
 
+/* Labeling callbacks */
+CALLBACK(XSELinuxWindowInit)
+{
+    XaceWindowRec *rec = (XaceWindowRec*)calldata;
+    security_context_t ctx;
+    int rc;
+
+    if (HAVESTATE(rec->client)) {
+	rc = avc_sid_to_context(SID(rec->client), &ctx);
+	if (rc < 0)
+	    FatalError("Failed to get security context!\n");
+	rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8,
+				  PropModeReplace, strlen(ctx), ctx, FALSE);
+	freecon(ctx);
+    } 
+    else
+	rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8,
+				  PropModeReplace, 10, "UNLABELED!", FALSE);
+    if (rc != Success)
+	FatalError("Failed to set context property on window!\n");
+} /* XSELinuxWindowInit */
+
 static char *XSELinuxKeywords[] = {
 #define XSELinuxKeywordComment 0
     "#",
@@ -1844,6 +1871,14 @@ XSELinuxExtensionInit(INITARGS)
     if (!AddCallback(&ClientStateCallback, XSELinuxClientState, NULL))
 	return;
 
+    /* Create atoms for doing window labeling */
+    atom_ctx = MakeAtom("_SELINUX_CONTEXT", 16, 1);
+    if (atom_ctx == BAD_RESOURCE)
+	return;
+    atom_client_ctx = MakeAtom("_SELINUX_CLIENT_CONTEXT", 23, 1);
+    if (atom_client_ctx == BAD_RESOURCE)
+	return;
+
     /* Load the config file.  If this fails, shut down the server,
      * since an unknown security status is worse than no security.
      *
@@ -1873,6 +1908,7 @@ XSELinuxExtensionInit(INITARGS)
     XaceRegisterCallback(XACE_BACKGRND_ACCESS, XSELinuxBackgrnd, NULL);
     XaceRegisterCallback(XACE_DRAWABLE_ACCESS, XSELinuxDrawable, NULL);
     XaceRegisterCallback(XACE_PROPERTY_ACCESS, XSELinuxProperty, NULL);
+    XaceRegisterCallback(XACE_WINDOW_INIT, XSELinuxWindowInit, NULL);
     /* XaceRegisterCallback(XACE_DECLARE_EXT_SECURE, XSELinuxDeclare, NULL);
     XaceRegisterCallback(XACE_DEVICE_ACCESS, XSELinuxDevice, NULL); */
 
diff-tree 8382234a7f318057de66490299d63807cefb5201 (from 96edf7b853c1045d12d957a2957a11879100a2de)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Oct 3 17:49:48 2006 -0700

    Update pci.ids to Tue 2006-10-03 daily snapshot

diff --git a/hw/xfree86/scanpci/extrapci.ids b/hw/xfree86/scanpci/extrapci.ids
index 81d08dc..08e7af9 100644
--- a/hw/xfree86/scanpci/extrapci.ids
+++ b/hw/xfree86/scanpci/extrapci.ids
@@ -11,11 +11,9 @@
 #	specified for a device (see the syntax description below).
 #
 #	Don't make gratuitous changes, and please send back
-#	changes/additions that aren't XFree86-specific to the pciids
+#	changes/additions that aren't X-specific to the pciids
 #	project (http://pciids.sf.net/).
 #
-#	$XdotOrg: xserver/xorg/hw/xfree86/scanpci/extrapci.ids,v 1.6 2005/09/19 18:54:05 alanc Exp $
-#	$XFree86: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.11 2003/12/18 16:22:27 dawes Exp $
 #
 
 # Vendors, devices and subsystems. Please keep sorted.
@@ -39,10 +37,7 @@
 
 # Some NVIDIA cards that are not in the master pci.ids file yet.
 10de	"
-	0046	NV40 [GeForce 6800 GT]
-	0048	GeForce 6800 XT
 	0147	GeForce 6700 XL
 	0160	GeForce 6500
-	0163	GeForce 6200 LE
 	0169	GeForce 6250
 
diff --git a/hw/xfree86/scanpci/pci.ids b/hw/xfree86/scanpci/pci.ids
index 9c704bb..c6f5653 100644
--- a/hw/xfree86/scanpci/pci.ids
+++ b/hw/xfree86/scanpci/pci.ids
@@ -11,7 +11,7 @@
 #	This file can be distributed under either the GNU General Public License
 #	(version 2 or higher) or the 3-clause BSD License.
 #
-#	Daily snapshot on Fri 2006-05-19 01:05:03
+#	Daily snapshot on Tue 2006-10-03 01:05:01
 #
 
 # Vendors, devices and subsystems. Please keep sorted.
@@ -56,11 +56,15 @@
 045e  Microsoft
 	006e  MN-510 802.11b wireless USB paddle
 	00c2  MN-710 wireless USB paddle
+0482  Kyocera
 04cf  Myson Century, Inc
 	8818  CS8818 USB2.0-to-ATAPI Bridge Controller with Embedded PHY
 050d  Belkin
+	001a  FSD7000 802.11g PCI Wireless card
 	0109  F5U409-CU USB/Serial Portable Adapter
 	7050  F5D7050 802.11g Wireless USB Adapter
+05a9  OmniVision
+	8519  OV519 series
 05e3  CyberDoor
 	0701  CBD516
 066f  Sigmatel Inc.
@@ -72,12 +76,13 @@
 	1703  ISDN Adapter (PCI Bus, DV, W)
 	1704  ISDN Adapter (PCI Bus, D, C)
 067b  Prolific Technology, Inc.
+	2303  PL-2303 USB-to-Serial Converter
 	3507  PL-3507 Hi-Speed USB & IEEE 1394 Combo to IDE Bridge Controller
-# Found on Sapphire Radeon X700 (www.saphiretech.com)
 0721  Sapphire, Inc.
 07e2  ELMEG Communication Systems GmbH
 # Wrong ID used in subsystem ID of VIA USB controllers.
 0925  VIA Technologies, Inc. (Wrong ID)
+093a  PixArt Imaging Inc.
 09c1  Arris
 	0704  CM 200E Cable Modem
 0a89  BREA Technologies Inc
@@ -88,8 +93,12 @@
 	0405  Rhino R8FXX
 	0505  Rhino R24FXX
 	0506  Rhino R2T1
+	0605  Rhino R2T1
+	0705  Rhino R24FXS
 0b49  ASCII Corporation
 	064f  Trance Vibrator
+0ccd  TerraTec Electronic GmbH
+	0038  Cinergy T^2 DVB-T Receiver
 0e11  Compaq Computer Corporation
 	0001  PCI to EISA Bridge
 	0002  PCI to ISA Bridge
@@ -193,7 +202,6 @@
 		0e11 4082  Smart Array 532
 		0e11 4083  Smart Array 5312
 	b1a4  NC7131 Gigabit Server Adapter
-# HP Memory Hot-Plug Controller
 	b200  Memory Hot-Plug Controller
 	b203  Integrated Lights Out Controller
 	b204  Integrated Lights Out  Processor
@@ -201,6 +209,7 @@
 	f150  NetFlex-3/P ThunderLAN 2.3
 0e21  Cowon Systems, Inc.
 0e55  HaSoTec GmbH
+0eac  SHF Communication Technologies AG
 # Formerly NCR
 1000  LSI Logic / Symbios Logic
 	0001  53c810
@@ -213,14 +222,14 @@
 	0006  53c860
 		1000 1000  LSI53C860E PCI to Ultra SCSI I/O Processor
 	000a  53c1510
+		0e11 b143  Integrated Dual Channel Wide Ultra2 SCSI Controller
 		1000 1000  LSI53C1510 PCI to Dual Channel Wide Ultra2 SCSI Controller (Nonintelligent mode)
 	000b  53C896/897
 		0e11 6004  EOB003 Series SCSI host adapter
 		1000 1000  LSI53C896/7 PCI to Dual Channel Ultra2 SCSI Multifunction Controller
 		1000 1010  LSI22910 PCI to Dual Channel Ultra2 SCSI host adapter
 		1000 1020  LSI21002 PCI to Dual Channel Ultra2 SCSI host adapter
-# multifunction PCI card: Dual U2W SCSI, dual 10/100TX, graphics
-		13e9 1000  6221L-4U
+		13e9 1000  6221L-4U (Dual U2W SCSI, dual 10/100TX, graphics)
 	000c  53c895
 		1000 1010  LSI8951U PCI to Ultra2 SCSI host adapter
 		1000 1020  LSI8952U PCI to Ultra2 SCSI host adapter
@@ -233,6 +242,8 @@
 		1000 1010  LSI22801 PCI to Dual Channel Ultra SCSI host adapter
 		1000 1020  LSI22802 PCI to Dual Channel Ultra SCSI host adapter
 		1092 8760  FirePort 40 Dual SCSI Controller
+		1775 10d0  V5D Single Board Computer Wide Ultra SCSI
+		1775 10d1  V5D Single Board Computer Ultra SCSI
 		1de1 3904  DC390F/U Ultra Wide SCSI Adapter
 		4c53 1000  CC7/CR7/CP7/VC7/VP7/VR7 mainboard
 		4c53 1050  CT7 mainboard
@@ -246,10 +257,13 @@
 		1000 1000  LSI53C875A PCI to Ultra SCSI Controller
 	0020  53c1010 Ultra3 SCSI Adapter
 		1000 1000  LSI53C1010-33 PCI to Dual Channel Ultra160 SCSI Controller
+		107b 1040  Server Onboard 53C1010-33
 		1de1 1020  DC-390U3W
 	0021  53c1010 66MHz  Ultra3 SCSI Adapter
 		1000 1000  LSI53C1000/1000R/1010R/1010-66 PCI to Ultra160 SCSI Controller
 		1000 1010  Asus TR-DLS onboard 53C1010-66
+		103c 1330  Ultra160 SCSI [A7059A]
+		103c 1340  Ultra160 SCSI [A7060A]
 		124b 1070  PMC-USCSI3
 		4c53 1080  CT8 mainboard
 		4c53 1300  P017 mezzanine (32-bit PMC)
@@ -261,6 +275,7 @@
 		1028 016c  PowerEdge 1850 MPT Fusion SCSI/RAID (Perc 4)
 		1028 0183  PowerEdge 1800
 		1028 1010  LSI U320 SCSI Controller
+		103c 12c5  Ultra320 SCSI [A7173A]
 		124b 1170  PMC-USCSI320
 		1734 1052  Primergy RX300 S2
 	0031  53c1030ZC PCI-X Fusion-MPT Dual Ultra320 SCSI
@@ -278,7 +293,11 @@
 	005a  SAS1066E PCI-Express Fusion-MPT SAS
 	005c  SAS1064A PCI-X Fusion-MPT SAS
 	005e  SAS1066 PCI-X Fusion-MPT SAS
-	0060  SAS1078 PCI-X Fusion-MPT SAS
+	0060  MegaRAID SAS 1078
+		1028 1f0a  PERC 6/E Adapter RAID Controller
+		1028 1f0b  PERC 6/i Adapter RAID Controller
+		1028 1f0c  PERC 6/i Integrated RAID Controller
+		1028 1f0d  PERC 6/i Enhanced RAID Controller
 	0062  SAS1078 PCI-Express Fusion-MPT SAS
 		1000 0062  SAS1078 PCI-Express Fusion-MPT SAS
 	008f  53c875J
@@ -306,6 +325,26 @@
 		8086 3008  MegaRAID RAID Controller SRCS28X
 		8086 3431  MegaRAID RAID Controller Alief SROMBU42E
 		8086 3499  MegaRAID RAID Controller Harwich SROMBU42E
+	0411  MegaRAID SAS
+		1000 1001  MegaRAID SAS 8408E
+		1000 1002  MegaRAID SAS 8480E
+		1000 1003  MegaRAID SAS 8344ELP
+		1000 1004  MegaRAID SAS 8308ELP
+		1000 100c  MegaRAID SATA 300-12E
+		1000 100d  MegaRAID SATA 300-16E
+		1000 2004  MegaRAID SATA 300-8ELP
+		1000 2005  MegaRAID SATA 300-4ELP
+		1033 8287  MegaRAID SAS PCI Express ROMB
+		1054 3016  MegaRAID SAS RoMB Server
+		1734 1081  MegaRAID SAS PCI Express ROMB
+		1734 10a3  MegaRAID SAS PCI Express ROMB
+		8086 1001  SRCSAS18E RAID Controller
+		8086 1003  SRCSAS144E RAID Controller
+		8086 3500  SROMBSAS18E RAID Controller
+		8086 3501  SROMBSAS18E RAID Controller
+		8086 3504  SROMBSAS18E RAID Controller
+	0413  MegaRAID SAS Verde ZCR
+		1000 1005  MegaRAID SAS 8300XLP
 	0621  FC909 Fibre Channel Adapter
 	0622  FC929 Fibre Channel Adapter
 		1000 1020  44929 O Dual Fibre Channel card
@@ -390,6 +429,7 @@
 		174b 7c29  Sapphire Radeon 9600XT
 		1787 4002  Radeon 9600 XT
 	4153  RV350 AS [Radeon 9550]
+		1043 010c  A9550GE/TD
 		1462 932c  865PE Neo2-V (MS-6788) mainboard
 	4154  RV350 AT [Fire GL T2]
 	4155  RV350 AU [Fire GL T2]
@@ -417,7 +457,8 @@
 		1043 c01b  A9600XT/TD (Secondary)
 		174b 7c28  Sapphire Radeon 9600XT (Secondary)
 		1787 4003  Radeon 9600 XT (Secondary)
-	4173  RV350 ?? [Radeon 9550] (Secondary)
+	4173  RV350 AS [Radeon 9550] (Secondary)
+		1043 010d  A9550GE/TD (Secondary)
 	4237  Radeon 7000 IGP
 	4242  R200 BB [Radeon All in Wonder 8500DV]
 		1002 02aa  Radeon 8500 AIW DV Edition
@@ -537,8 +578,9 @@
 		1028 00ce  PowerEdge 1400
 		1028 00d1  PowerEdge 2550
 		1028 00d9  PowerEdge 2500
-		1028 0134  Poweredge SC600
+		1028 0134  PowerEdge 600SC
 		103c 10e1  NetServer Rage XL
+		107b 6400  6400 Server
 		1734 007a  Primergy RX300
 		8086 3411  SDS2 Mainboard
 		8086 3427  S875WP1-E mainboard
@@ -567,7 +609,6 @@
 		10f1 0002  RV250 If [Tachyon G9000 PRO]
 		148c 2039  RV250 If [Radeon 9000 Pro "Evil Commando"]
 		1509 9a00  RV250 If [Radeon 9000 "AT009"]
-# New subdevice - 3D Prophet 9000 PCI by Hercules. AGP version probably would have same ID, so not specified.
 		1681 0040  RV250 If [3D prophet 9000]
 		174b 7176  RV250 If [Sapphire Radeon 9000 Pro]
 		174b 7192  RV250 If [Radeon 9000 "Atlantis"]
@@ -648,7 +689,7 @@
 	4c5a  Radeon Mobility M6 LZ
 	4c64  Radeon R250 Ld [Radeon Mobility 9000 M9]
 	4c65  Radeon R250 Le [Radeon Mobility 9000 M9]
-	4c66  Radeon R250 [Radeon Mobility 9200]
+	4c66  Radeon R250 [Mobility FireGL 9000]
 	4c67  Radeon R250 Lg [Radeon Mobility 9000 M9]
 # Secondary chip to the Lf
 	4c6e  Radeon R250 Ln [Radeon Mobility 9000 M9] [Secondary]
@@ -786,12 +827,14 @@
 		1014 029a  Remote Supervisor Adapter II (RSA2)
 		1014 02c8  IBM eServer xSeries server mainboard
 		1028 019a  PowerEdge SC1425
+		103c 1292  Radeon 7000
 		1458 4002  RV100 QY [RADEON 7000 PRO MAYA AV Series]
 		148c 2003  RV100 QY [Radeon 7000 Multi-Display Edition]
 		148c 2023  RV100 QY [Radeon 7000 Evil Master Multi-Display]
 		174b 7112  RV100 QY [Sapphire Radeon VE 7000]
 		174b 7c28  Sapphire Radeon VE 7000 DDR
 		1787 0202  RV100 QY [Excalibur Radeon 7000]
+		17ee 1001  Radeon 7000 64MB DDR + DVI
 	515a  Radeon RV100 QZ [Radeon 7000/VE]
 	515e  ES1000
 	515f  ES1000
@@ -860,9 +903,11 @@
 	5551  R423 UQ [FireGL V7200 (PCIE)]
 	5552  R423 UR [FireGL V5100 (PCIE)]
 	5554  R423 UT [FireGL V7100 (PCIE)]
+	5569  R423 UI [Radeon X800PRO (PCIE)] Secondary
 	556b  Radeon R423 UK (PCIE) [X800 SE] (Secondary)
 	556d  R430 [Radeon X800 XL] (PCIe) Secondary
 	556f  R430 [Radeon X800 (PCIE) Secondary]
+	5571  R423GL-SE ATI FIREGL V5100 PCI-EX Secondary
 	564a  M26 [Mobility FireGL V5000]
 	564b  M26 [Mobility FireGL V5000]
 	564f  M26 [Radeon Mobility X700 XL] (PCIE)
@@ -922,6 +967,7 @@
 	5969  ES1000
 	5974  RS482 [Radeon Xpress 200]
 	5975  RS482 [Radeon Xpress 200M]
+	5a33  Radeon Xpress 200 Host Bridge
 	5a34  RS480 PCI-X Root Port
 # Comes in pair with 5a3f
 	5a36  RS480 PCI Bridge
@@ -988,14 +1034,24 @@
 	700f  PCI Bridge [IGP 320M]
 	7010  PCI Bridge [IGP 340M]
 	7100  R520 [Radeon X1800]
+	7102  M58 [Radeon Mobility X1800]
+	7103  M58 [Mobility FireGL V7200]
+	7104  R520 GL ATI FireGL V7200 Primary
 	7105  R520 [FireGL]
+	7106  M58 [Mobility FireGL V7100]
+	7108  M58 [Radeon Mobility X1800]
 	7109  R520 [Radeon X1800]
 		1002 0322  All-in-Wonder X1800XL
 		1002 0d02  Radeon X1800 CrossFire Edition
+	710a  R520 [Radeon X1800]
+	710b  R520 [Radeon X1800]
+	710c  R520 [Radeon X1800]
 	7120  R520 [Radeon X1800] (Secondary)
+	7124  R520 GL ATI FireGL V7200 Secondary
 	7129  R520 [Radeon X1800] (Secondary)
 		1002 0323  All-in-Wonder X1800XL (Secondary)
 		1002 0d03  Radeon X1800 CrossFire Edition (Secondary)
+	7140  RV515 [Radeon X1600]
 	7142  RV515 [Radeon X1300]
 		1002 0322  All-in-Wonder 2006 PCI-E Edition
 	7145  Radeon Mobility X1400
@@ -1005,16 +1061,48 @@
 	714a  M52 [ATI Mobility Radeon X1300]
 	714b  M52 [ATI Mobility Radeon X1300]
 	714c  M52 [ATI Mobility Radeon X1300]
+	714d  RV515 [Radeon X1300]
+	714e  RV515 [Radeon X1300]
+	7152  RV515 GL ATI FireGL V3300 Primary
+	715e  RV515 [Radeon X1300]
 	7162  RV515 [Radeon X1300] (Secondary)
 		1002 0323  All-in-Wonder 2006 PCI-E Edition (Secondary)
 	7166  RV515 [Radeon X1300] (Secondary)
 		1002 0323  All-in-Wonder 2006 PCI-E Edition (Secondary)
+	7172  RV515 GL ATI FireGL V3300 Secondary
+	7180  RV516 Radeon X1300 Series Primary
+	7181  RV516 XT Radeon X1600 Series Primary
+	71a0  RV516 Radeon X1300 Series Secondary
+	71a1  RV516 XT Radeon X1600 Series Secondary
 	71c0  RV530 [Radeon X1600]
 	71c2  RV530 [Radeon X1600]
 	71c4  M56GL [ATI Mobility FireGL V5200]
+		17aa 2007  ThinkPad T60p
 	71c5  M56P [Radeon Mobility X1600]
+	71c6  RV530LE [Radeon X1600]
+	71ce  RV530LE [Radeon X1600]
+	71d5  M66-P ATI Mobility Radeon X1700
+	71d6  M66-XT ATI Mobility Radeon X1700
+	71de  RV530LE [Radeon X1600]
 	71e0  RV530 [Radeon X1600] (Secondary)
 	71e2  RV530 [Radeon X1600] (Secondary)
+	7240  R580 [Radeon X1900]
+	7241  R580 [Radeon X1900]
+	7242  R580 [Radeon X1900]
+	7243  R580 [Radeon X1900]
+	7244  R580 [Radeon X1900]
+	7245  R580 [Radeon X1900]
+	7246  R580 [Radeon X1900]
+	7247  R580 [Radeon X1900]
+	7248  R580 [Radeon X1900]
+	7249  R580 [Radeon X1900 XT] Primary
+	724a  R580 [Radeon X1900]
+	724b  R580 [Radeon X1900]
+	724c  R580 [Radeon X1900]
+	724d  R580 [Radeon X1900]
+	724e  R580 [FireGL V7300/V7350] Primary (PCIE)
+	7269  R580 [Radeon X1900 XT] Secondary
+	726e  R580 [FireGL V7300/V7350] Secondary (PCIE)
 	7833  Radeon 9100 IGP Host Bridge
 	7834  Radeon 9100 PRO IGP
 	7835  Radeon Mobility 9200 IGP
@@ -1154,6 +1242,7 @@
 		1025 0315  ALN315 Fast Ethernet
 		1033 800c  PC-9821-CS01 100BASE-TX Interface Card
 		1033 800d  PC-9821NR-B06 100BASE-TX Interface Card
+		103c 125a  10/100Base-TX (PCI) [A5506B]
 		108d 0016  Rapidfire 2327 10/100 Ethernet
 		108d 0017  GoCard 2250 Ethernet 10/100 Cardbus
 		10b8 2005  SMC8032DT Extreme Ethernet 10/100
@@ -1181,6 +1270,9 @@
 		1385 2100  FA510
 		1395 0001  10/100 Ethernet CardBus PC Card
 		13d1 ab01  EtherFast 10/100 Cardbus (PCMPC200)
+		1498 000a  TPMC880-10 10/100Base-T and 10Base2 PMC Ethernet Adapter
+		1498 000b  TPMC880-11 Single 10/100Base-T PMC Ethernet Adapter
+		1498 000c  TPMC880-12 Single 10Base2 PMC Ethernet Adapter
 		14cb 0100  LNDL-100N 100Base-TX Ethernet PC Card
 		8086 0001  EtherExpress PRO/100 Mobile CardBus 32
 	001a  Farallon PN9000SX Gigabit Ethernet
@@ -1197,7 +1289,7 @@
 		0e11 4050  Integrated Smart Array
 		0e11 4051  Integrated Smart Array
 		0e11 4058  Integrated Smart Array
-		103c 10c2  Hewlett-Packard NetRAID-4M
+		103c 10c2  NetRAID-4M
 		12d9 000a  IP Telephony card
 		4c53 1050  CT7 mainboard
 		4c53 1051  CE7 mainboard
@@ -1241,12 +1333,14 @@
 	4400  CD 4400
 	6001  CS 4610/11 [CrystalClear SoundFusion Audio Accelerator]
 		1014 1010  CS4610 SoundFusion Audio Accelerator
-	6003  CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator]
+	6003  CS 4614/22/24/30 [CrystalClear SoundFusion Audio Accelerator]
 		1013 4280  Crystal SoundFusion PCI Audio Accelerator
 		1014 0153  ThinkPad A20m
+		153b 112e  DMX XFire 1024
 		153b 1136  SiXPack 5.1+
 		1681 0050  Game Theater XP
 		1681 a011  Fortissimo III 7.1
+		5053 3357  Santa Cruz
 	6004  CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator]
 	6005  Crystal CS4281 PCI Audio
 		1013 4281  Crystal CS4281 PCI Audio
@@ -1272,7 +1366,6 @@
 	0020  GXT1000 Graphics Adapter
 	0022  IBM27-82351
 	002d  Python
-# [official name in AIX 5]
 	002e  SCSI RAID Adapter [ServeRAID]
 		1014 002e  ServeRAID-3x
 		1014 022e  ServeRAID-4H
@@ -1302,6 +1395,7 @@
 	0053  25 MBit ATM Controller
 	0054  GXT500P/GXT550P Graphics Adapter
 	0057  MPEG PCI Bridge
+	0058  SSA Adapter [Advanced SerialRAID/X]
 	005c  i82557B 10/100
 	005e  GXT800P Graphics Adapter
 	007c  ATM Controller (14107c00)
@@ -1374,6 +1468,7 @@
 		1014 02c1  PCI-X DDR 3Gb SAS Adapter (572A/572C)
 		1014 02c2  PCI-X DDR 3Gb SAS RAID Adapter (572B/571D)
 	0302  Winnipeg PCI-X Host Bridge
+	0308  CalIOC2 PCI-E Root Port
 	0314  ZISC 036 Neural accelerator card
 	3022  QLA3022 Network Adapter
 	4022  QLA3022 Network Adapter
@@ -1448,6 +1543,7 @@
 		1259 2701  AT-2700FX 100Mb Ethernet
 		1259 2702  AT-2700FTX 10/100 Mb Fiber/Copper Fast Ethernet
 		1259 2703  AT-2701FX
+		1259 2704  AT-2701FTX 10/100 Mb Fiber/Copper Fast Ethernet
 		4c53 1000  CC7/CR7/CP7/VC7/VP7/VR7 mainboard
 		4c53 1010  CP5/CR6 mainboard
 		4c53 1020  VR6 mainboard
@@ -1583,6 +1679,7 @@
 	9930  CyberBlade/XPm
 1024  Zenith Data Systems
 1025  Acer Incorporated [ALI]
+	0090  BCM440x 100Base-TX Fast Ethernet
 	1435  M1435
 	1445  M1445
 	1449  M1449
@@ -1666,7 +1763,7 @@
 		1028 016f  PowerEdge Expandable RAID Controller 4e/Di
 		1028 0170  PowerEdge Expandable RAID Controller 4e/Di
 	0014  Remote Access Card 4 Daughter Card SMIC interface
-	0015  PowerEdge Expandable RAID controller 5
+	0015  PowerEdge Expandable RAID controller 5i
 1029  Siemens Nixdorf IS
 102a  LSI Logic
 	0000  HYDRA
@@ -1827,6 +1924,9 @@
 		102b 2538  Parhelia APVe
 		102b 3007  QID Low-profile PCIe
 	4536  VIA Framegrabber
+	4cdc  Morphis Vision System Jpeg2000
+	4fc5  Morphis Vision System
+	5e10  Morphis Vision System Aux/IO
 	6573  Shark 10/100 Multiport SwitchNIC
 102c  Chips and Technologies
 	00b8  F64310
@@ -1939,6 +2039,7 @@
 	00f3  uPD6113x Multimedia Decoder/Processor [EMMA2]
 	010c  VR7701
 	0125  uPD720400 PCI Express - PCI/PCI-X Bridge
+	013a  Dual Tuner/MPEG Encoder
 1034  Framatome Connectors USA Inc.
 1035  Comp. & Comm. Research Lab
 1036  Future Domain Corp.
@@ -1959,6 +2060,7 @@
 	0180  RAID bus controller 180 SATA/PATA  [SiS]
 	0181  SATA
 	0182  182 SATA/RAID Controller
+	0186  AHCI Controller (0106)
 	0190  190 Gigabit Ethernet Adapter
 	0191  191 Gigabit Ethernet Adapter
 	0200  5597/5598/6326 VGA
@@ -1990,6 +2092,7 @@
 	0655  655 Host
 	0660  660 Host
 	0661  661FX/M661FX/M661MX Host
+	0662  662 Host
 	0730  730 Host
 	0733  733 Host
 	0735  735 Host
@@ -2009,6 +2112,13 @@
 	0963  SiS963 [MuTIOL Media IO]
 	0964  SiS964 [MuTIOL Media IO]
 	0965  SiS965 [MuTIOL Media IO]
+	0966  SiS966 [MuTIOL Media IO]
+	0968  SiS968 [MuTIOL Media IO]
+	1180  SATA Controller / IDE mode
+	1182  SATA Controller / RAID mode
+	1183  SATA Controller / IDE mode
+	1184  AHCI Controller / RAID mode
+	1185  AHCI IDE Controller (0106)
 	3602  83C602
 	5107  5107
 	5300  SiS540 PCI Display Adapter
@@ -2043,8 +2153,10 @@
 		1092 4910  SpeedStar A70
 		1092 4920  SpeedStar A70
 		1569 6326  SiS6326 GUI Accelerator
-	6330  661/741/760/761 PCI/AGP VGA Display Adapter
+	6330  661/741/760 PCI/AGP or 662/761Gx PCIE VGA Display Adapter
 		1039 6330  [M]661xX/[M]741[GX]/[M]760 PCI/AGP VGA Adapter
+	6350  770/670 PCIE VGA Display Adapter
+	6351  771/671 PCIE VGA Display Adapter
 	7001  USB 1.0 Controller
 		1019 0a14  K7S5A motherboard
 		1039 7000  Onboard USB Controller
@@ -2082,6 +2194,7 @@
 		270f a171  SiS PCI Audio Accelerator
 		a0a0 0022  SiS PCI Audio Accelerator
 	7019  SiS7019 Audio Accelerator
+	7502  Azalia Audio Controller
 103a  Seiko Epson Corporation
 103b  Tatung Co. of America
 103c  Hewlett-Packard Company
@@ -2128,19 +2241,29 @@
 	121c  NetServer PCI COM Port Decoder
 	1229  zx1 System Bus Adapter
 	122a  zx1 I/O Controller
-	122e  zx1 Local Bus Adapter
+	122e  PCI-X Local Bus Adapter
+	127b  sx1000 System Bus Adapter
 	127c  sx1000 I/O Controller
 	1290  Auxiliary Diva Serial Port
 	1291  Auxiliary Diva Serial Port
 	12b4  zx1 QuickSilver AGP8x Local Bus Adapter
+	12eb  sx2000 System Bus Adapter
+	12ec  sx2000 I/O Controller
+	12ee  PCI-X 2.0 Local Bus Adapter
 	12f8  Broadcom BCM4306 802.11b/g Wireless LAN
 	12fa  BCM4306 802.11b/g Wireless LAN Controller
 	2910  E2910A PCIBus Exerciser
 	2925  E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer
 	3080  Pavilion ze2028ea
 	3085  Realtek RTL8139/8139C/8139C+
-	3220  Hewlett-Packard Smart Array P600
-	3230  Hewlett-Packard Smart Array Controller
+	3220  Smart Array P600
+		103c 3225  3 Gb/s SAS RAID
+	3230  Smart Array Controller
+	4030  zx2 System Bus Adapter
+	4031  zx2 I/O Controller
+	4037  PCIe Local Bus Adapter
+	403b  PCIe Root Port
+	60e8  NetRAID-2M : ZX1/M (OEM AMI MegaRAID 493)
 103e  Solliday Engineering
 103f  Synopsys/Logic Modeling Group
 1040  Accelgraphics Inc.
@@ -2161,12 +2284,14 @@
 	4021  v7100 Combo Deluxe [GeForce2 MX + TV tuner]
 	4057  v8200 GeForce 3
 	8043  v8240 PAL 128M [P4T] Motherboard
+	8047  v8420 Deluxe [GeForce4 Ti4200]
 	807b  v9280/TD [Geforce4 TI4200 8X With TV-Out and DVI]
 	8095  A7N8X Motherboard nForce2 AC97 Audio
 	80ac  A7N8X Motherboard nForce2 AGP/Memory
 	80bb  v9180 Magic/T [GeForce4 MX440 AGP 8x 64MB TV-out]
 	80c5  nForce3 chipset motherboard [SK8N]
 	80df  v9520 Magic/T
+	815a  A8N-SLI Motherboard nForce4 SATA
 	8187  802.11a/b/g Wireless LAN Card
 	8188  Tiger Hybrid TV Capture Device
 1044  Adaptec (formerly DPT)
@@ -2245,7 +2370,7 @@
 	8901  Gloria XL
 		1048 0935  GLoria XL (Virge)
 1049  Fountain Technologies, Inc.
-# # nee SGS Thomson Microelectronics
+# nee SGS Thomson Microelectronics
 104a  STMicroelectronics
 	0008  STG 2000X
 	0009  STG 1764X
@@ -2256,6 +2381,7 @@
 	021a  STPC Consumer S Southbridge
 	021b  STPC Consumer IIA Southbridge
 	0500  ST70137 [Unicorn] ADSL DMT Transceiver
+		104a 0500  BeWAN ADSL PCI st
 	0564  STPC Client Northbridge
 	0981  21x4x DEC-Tulip compatible 10/100 Ethernet
 	1746  STG 1764X
@@ -2310,6 +2436,7 @@
 		e4bf 1010  CF2-1-CYMBAL
 	8020  TSB12LV26 IEEE-1394 Controller (Link)
 		11bd 000f  Studio DV500-1394
+		11bd 001c  Excalibur 4.1
 	8021  TSB43AA22 IEEE-1394 Controller (PHY/Link Integrated)
 		104d 80df  Vaio PCG-FX403
 		104d 80e7  VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP
@@ -2332,7 +2459,7 @@
 		1071 8160  MIM2900
 	802b  PCI7410,7510,7610 OHCI-Lynx Controller
 		1028 0139  Latitude D400
-		1028 014e  PCI7410,7510,7610 OHCI-Lynx Controller (Dell Latitude D800)
+		1028 014e  PCI7410,7510,7610 OHCI-Lynx Controller (Latitude D800)
 	802e  PCI7x20 1394a-2000 OHCI Two-Port PHY/Link-Layer Controller
 	8031  PCIxx21/x515 Cardbus Controller
 		1025 0080  Aspire 5024WLMi
@@ -2346,28 +2473,35 @@
 		1025 0080  Aspire 5024WLMi
 		103c 099c  NX6110/NC6120
 		103c 308b  MX6125
-	8034  PCI6411, PCI6421, PCI6611, PCI6621, PCI7411, PCI7421, PCI7611, PCI7621 Secure Digital (SD) Controller
+	8034  PCI6411/6421/6611/6621/7411/7421/7611/7621 Secure Digital Controller
 		1025 0080  Aspire 5024WLMi
 		103c 099c  NX6110/NC6120
 		103c 308b  MX6125
-	8035  PCI6411, PCI6421, PCI6611, PCI6621, PCI7411, PCI7421, PCI7611, PCI7621 Smart Card Controller (SMC)
+	8035  PCI6411/6421/6611/6621/7411/7421/7611/7621 Smart Card Controller
 		103c 099c  NX6110/NC6120
 	8036  PCI6515 Cardbus Controller
 	8038  PCI6515 SmartCard Controller
 	8039  PCIxx12 Cardbus Controller
+		103c 309f  nx9420
+	803a  PCIxx12 OHCI Compliant IEEE 1394 Host Controller
+		103c 309f  nx9420
 	803b  5-in-1 Multimedia Card Reader (SD/MMC/MS/MS PRO/xD)
+		103c 309f  nx9420
+	803c  PCIxx12 SDA Standard Compliant SD Host Controller
+		103c 309f  nx9420
+	803d  PCIxx12 GemCore based SmartCard controller
+		103c 309f  nx9420
 	8201  PCI1620 Firmware Loading Function
 	8204  PCI7410,7510,7610 PCI Firmware Loading Function
 		1028 0139  Latitude D400
 		1028 014e  Latitude D800
-	8231  XIO2000(A)/XIO2200 PCI Express-to-PCI Bridge
-	8235  XIO2200 IEEE-1394a-2000 Controller (PHY/Link)
+	8231  XIO2000(A)/XIO2200(A) PCI Express-to-PCI Bridge
+	8235  XIO2200(A) IEEE-1394a-2000 Controller (PHY/Link)
 	8400  ACX 100 22Mbps Wireless Interface
 		1186 3b00  DWL-650+ PC Card cardbus 22Mbs Wireless Adapter [AirPlus]
 		1186 3b01  DWL-520+ 22Mbps PCI Wireless Adapter
 		16ab 8501  WL-8305 IEEE802.11b+ Wireless LAN PCI Adapter
 	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.
 	9000  Wireless Interface (of unknown type)
 	9065  TMS320DM642
 	9066  ACX 111 54Mbps Wireless Interface
@@ -2412,7 +2546,7 @@
 	ac40  PCI4450 PC card Cardbus Controller
 	ac41  PCI4410 PC card Cardbus Controller
 	ac42  PCI4451 PC card Cardbus Controller
-		1028 00e6  PCI4451 PC card CardBus Controller (Dell Inspiron 8100)
+		1028 00e6  PCI4451 PC card CardBus Controller (Inspiron 8100)
 	ac44  PCI4510 PC card Cardbus Controller
 		1028 0163  Latitude D505
 		1028 0196  Inspiron 5160
@@ -2439,10 +2573,13 @@
 	ac52  PCI1451 PC card Cardbus Controller
 	ac53  PCI1421 PC card Cardbus Controller
 	ac54  PCI1620 PC Card Controller
+		103c 08b0  tc1100 tablet
 	ac55  PCI1520 PC card Cardbus Controller
 		1014 0512  ThinkPad T30/T40
 	ac56  PCI1510 PC card Cardbus Controller
+		1014 0512  Thinkpad R50e model 1634
 		1014 0528  ThinkPad R40e (2684-HVG) Cardbus Controller
+		17aa 2012  Thinkpad R60e model 0657
 	ac60  PCI2040 PCI to DSP Bridge Controller
 		175c 5100  ASI51xx Audio Adapter
 		175c 6100  ASI61xx Audio Adapter
@@ -2450,7 +2587,7 @@
 		175c 8800  ASI88xx Audio Adapter
 	ac8d  PCI 7620
 	ac8e  PCI7420 CardBus Controller
-	ac8f  PCI7420/PCI7620 Dual Socket CardBus and Smart Card Cont. w/ 1394a-2000 OHCI Two-Port  PHY/Link-Layer Cont. and SD/MS-Pro Sockets
+	ac8f  PCI7420/7620 Combo CardBus, 1394a-2000 OHCI and SD/MS-Pro Controller
 	fe00  FireWire Host Controller
 	fe03  12C01A FireWire Host Controller
 104d  Sony Corporation
@@ -2506,6 +2643,7 @@
 	0006  MPC8245 [Unity]
 	0008  MPC8540
 	0009  MPC8560
+	0012  MPC8548 [PowerQUICC III]
 	0100  MC145575 [HFC-PCI]
 	0431  KTI829c 100VG
 	1801  DSP56301 Digital Signal Processor
@@ -2535,6 +2673,7 @@
 		ecc0 0072  Mona rev.2
 	18c0  MPC8265A/8266/8272
 	18c1  MPC8271/MPC8272
+	3055  SM56 Data Fax Modem
 	3410  DSP56361 Digital Signal Processor
 		ecc0 0050  Gina24 rev.0
 		ecc0 0051  Gina24 rev.1
@@ -2606,6 +2745,7 @@
 	3d18  PDC20518/PDC40518 (SATAII 150 TX4)
 	3d73  PDC40775 (SATA 300 TX2plus)
 	3d75  PDC20575 (SATAII150 TX2plus)
+	4302  80333 [SuperTrak EX4350]
 	4d30  PDC20267 (FastTrak100/Ultra100)
 		105a 4d33  Ultra100
 		105a 4d39  FastTrak100
@@ -2636,6 +2776,8 @@
 	6629  PDC20619 (FastTrak TX4000)
 	7275  PDC20277 (SBFastTrak133 Lite)
 	8002  SATAII150 SX8
+	8350  80333 [SuperTrak EX8350/EX16350], 80331 [SuperTrak EX8300/EX16300]
+	c350  80333 [SuperTrak EX12350]
 105b  Foxconn International, Inc.
 105c  Wipro Infotech Limited
 105d  Number 9 Computer Company
@@ -2871,8 +3013,12 @@
 		1077 0002  QLA2200
 	2300  QLA2300 64-bit Fibre Channel Adapter
 	2312  QLA2312 Fibre Channel Adapter
+		103c 0131  2Gb Fibre Channel - Single port [A7538A]
+		103c 12ba  2Gb Fibre Channel - Dual port [A6826A]
 	2322  QLA2322 Fibre Channel Adapter
 	2422  QLA2422 Fibre Channel Adapter
+		103c 12d7  4Gb Fibre Channel [AB379A]
+		103c 12dd  4Gb Fibre Channel [AB429A]
 	2432  QLA2432 Fibre Channel Adapter
 	3010  QLA3010 Network Adapter
 	3022  QLA3022 Network Adapter
@@ -3269,8 +3415,6 @@
 	4002  TIO-CE PCI Express Port
 	8001  O2 1394
 	8002  G-net NT
-	8010  Broadcom e-net [SGI IO9/IO10 BaseIO]
-	8018  Broadcom e-net [SGI A330 Server BaseIO]
 10aa  ACC Microelectronics
 	0000  ACCM 2188
 10ab  Digicom
@@ -3336,7 +3480,7 @@
 		10b5 2273  SH ARC-PCI SOHARD ARCNET card
 		10b5 2431  Alpermann+Velte PCL PCI D: Timecode Reader Board
 		10b5 2905  Alpermann+Velte PCI TS: Time Synchronisation Board
-		10b5 9050  MP9050
+		10b5 9050  PCI-I04 PCI Passive PC/CAN Interface
 		1498 0362  TPMC866 8 Channel Serial Card
 		1522 0001  RockForce 4 Port V.90 Data/Fax/Voice Modem
 		1522 0002  RockForce 2 Port V.90 Data/Fax/Voice Modem
@@ -3391,11 +3535,18 @@
 	9080  9080
 		103c 10eb  (Agilent) E2777B 83K Series Optical Communication Interface
 		103c 10ec  (Agilent) E6978-66442 PCI CIC
+		10b5 1123  Sectra KK631 encryption board
 		10b5 9080  9080 [real subsystem ID not set]
 		129d 0002  Aculab PCI Prosidy card
 		12d9 0002  PCI Prosody Card
 		12df 4422  4422PCI ["Do-All" Telemetry Data Aquisition System]
+		1517 000b  ECSG-1R3ADC-PMC Clock synthesizer
+	9656  PCI <-> IOBus Bridge
+		1517 000f  ECDR-GC314-PMC Receiver
+		1885 0700  Tsunami FPGA PMC with Altera Stratix S40
+		1885 0701  Tsunami FPGA PMC with Altera Stratix S30
 	bb04  B&B 3PCIOSD1A Isolated PCI Serial
+	c001  CronyxOmega-PCI (8-port RS232)
 10b6  Madge Networks
 	0001  Smart 16/4 PCI Ringnode
 	0002  Smart 16/4 PCI Ringnode Mk2
@@ -3486,6 +3637,8 @@
 	900a  3c900B-FL 10base-FL [Cyclone]
 	9050  3c905 100BaseTX [Boomerang]
 	9051  3c905 100BaseT4 [Boomerang]
+	9054  3C905B-TX Fast Etherlink XL PCI
+		10b7 9054  3C905B-TX Fast Etherlink XL PCI
 	9055  3c905B 100BaseTX [Cyclone]
 		1028 0080  3C905B Fast Etherlink XL 10/100
 		1028 0081  3C905B Fast Etherlink XL 10/100
@@ -3631,6 +3784,7 @@
 		1014 053d  ThinkPad R40e (2684-HVG) builtin IDE
 		103c 0024  Pavilion ze4400 builtin IDE
 		1043 8053  A7A266 Motherboard IDE
+		1849 5229  ASRock 939Dual-SATA2 Motherboard IDE (PATA)
 	5235  M5225
 	5237  USB 1.1 Controller
 		1014 0540  ThinkPad R40e (2684-HVG) builtin USB
@@ -3648,7 +3802,7 @@
 	5251  M5251 P1394 OHCI 1.0 Controller
 	5253  M5253 P1394 OHCI 1.1 Controller
 	5261  M5261 Ethernet Controller
-	5263  M5263 Ethernet Controller
+	5263  ULi 1689,1573 integrated ethernet.
 	5281  ALi M5281 Serial ATA / RAID Host Controller
 	5287  ULi 5287 SATA
 	5288  ULi M5288 SATA
@@ -3751,6 +3905,7 @@
 	1200  ASC1200 [(abp940) Fast SCSI-II]
 	1300  ABP940-U / ABP960-U
 		10cd 1310  ASC1300 SCSI Adapter
+		1195 1320  Ultra-SCSI CardBus PC Card REX CB31
 	2300  ABP940-UW
 	2500  ABP940-U2W
 10ce  Radius
@@ -3892,9 +4047,12 @@
 	0043  NV40.3
 	0044  NV40 [GeForce 6800 XT]
 	0045  NV40 [GeForce 6800 GT]
+	0046  NV40 [GeForce 6800 GT]
 	0047  NV40 [GeForce 6800 GS]
 		1682 2109  GeForce 6800 GS
+	0048  NV40 [GeForce 6800 XT]
 	0049  NV40GL
+	004d  NV40GL [Quadro FX 4000]
 	004e  NV40GL [Quadro FX 4000]
 	0050  CK804 ISA Bridge
 		1043 815a  K8N4-E Mainboard
@@ -4004,6 +4162,7 @@
 	00c9  NV41.9 [GeForce Go 6800 Ultra]
 	00cc  NV41 [Quadro FX Go1400]
 	00cd  NV41 [Quadro FX 3450/4000 SDI]
+		10de 029b  wx4300 Workstation
 	00ce  NV41GL [Quadro FX 1400]
 	00d0  nForce3 LPC Bridge
 	00d1  nForce3 Host Bridge
@@ -4022,8 +4181,10 @@
 		147b 1c0b  NF8 Mainboard
 	00e0  nForce3 250Gb LPC Bridge
 		10de 0c11  Winfast NF3250K8AA
+		1462 7030  K8N Neo-FSR v2.0
 		147b 1c0b  NF8 Mainboard
 	00e1  nForce3 250Gb Host Bridge
+		1462 7030  K8N Neo-FSR v2.0
 		147b 1c0b  NF8 Mainboard
 	00e2  nForce3 250Gb AGP Host to PCI Bridge
 	00e3  CK8S Serial ATA Controller (v2.5)
@@ -4031,16 +4192,20 @@
 		147b 1c0b  NF8 Mainboard
 	00e4  nForce 250Gb PCI System Management
 		105b 0c43  Winfast NF3250K8AA
+		1462 7030  K8N Neo-FSR v2.0
 		147b 1c0b  NF8 Mainboard
 	00e5  CK8S Parallel ATA Controller (v2.5)
 		105b 0c43  Winfast NF3250K8AA
+		1462 7030  K8N Neo-FSR v2.0
 		147b 1c0b  NF8 Mainboard
 	00e6  CK8S Ethernet Controller
 	00e7  CK8S USB Controller
 		105b 0c43  Winfast NF3250K8AA
+		1462 7030  K8N Neo-FSR v2.0
 		147b 1c0b  NF8 Mainboard
 	00e8  nForce3 EHCI USB 2.0 Controller
 		105b 0c43  Winfast NF3250K8AA
+		1462 7030  K8N Neo-FSR v2.0
 		147b 1c0b  NF8 Mainboard
 	00ea  nForce3 250Gb AC'97 Audio Controller
 		105b 0c43  Winfast NF3250K8AA
@@ -4057,6 +4222,7 @@
 	00f4  NV43 [GeForce 6600 LE]
 	00f5  G70 [GeForce 7800 GS]
 	00f6  NV43 [GeForce 6600 GS]
+		1682 217e  XFX GeForce 6800 XTreme 256MB DDR3 AGP
 	00f8  NV45GL [Quadro FX 3400/4400]
 	00f9  NV40 [GeForce 6800 Ultra/GeForce 6800 GT]
 		1682 2120  GEFORCE 6800 GT PCI-E
@@ -4118,6 +4284,7 @@
 	0149  NV43 [GeForce Go 6600 GT]
 	014a  Quadro NVS 440
 	014c  Quadro FX 550
+	014d  NV18GL [Quadro FX 550]
 	014e  NV43GL [Quadro FX 540]
 	014f  NV43 [GeForce 6200]
 	0150  NV15 [GeForce2 GTS/Pro]
@@ -4126,6 +4293,7 @@
 		1048 0c52  Gladiac-64
 		107d 2840  WinFast GeForce2 GTS with TV output
 		107d 2842  WinFast GeForce 2 Pro
+		10de 002e  GeForce2 GTS
 		1462 8831  Creative GeForce2 Pro
 	0151  NV15DDR [GeForce2 Ti]
 		1043 405f  V7700Ti
@@ -4133,8 +4301,9 @@
 	0152  NV15BR [GeForce2 Ultra, Bladerunner]
 		1048 0c56  GLADIAC Ultra
 	0153  NV15GL [Quadro2 Pro]
-	0161  GeForce 6200 TurboCache(TM)
-	0162  NV43 [GeForce 6200 SE]
+	0161  NV44 [GeForce 6200 TurboCache(TM)]
+	0162  NV44 [GeForce 6200 SE TurboCache (TM)]
+	0163  NV44 [GeForce 6200 LE]
 	0164  NV44 [GeForce Go 6200]
 	0165  NV44 [Quadro NVS 285]
 	0166  NV43 [GeForce Go 6400]
@@ -4153,6 +4322,7 @@
 	0174  NV17 [GeForce4 440 Go]
 	0175  NV17 [GeForce4 420 Go]
 	0176  NV17 [GeForce4 420 Go 32M]
+		103c 08b0  tc1100 tablet
 		4c53 1090  Cx9 / Vx9 mainboard
 	0177  NV17 [GeForce4 460 Go]
 	0178  NV17GL [Quadro4 550 XGL]
@@ -4163,6 +4333,7 @@
 	017c  NV17GL [Quadro4 500 GoGL]
 	017d  NV17 [GeForce4 410 Go 16M]
 	0181  NV18 [GeForce4 MX 440 AGP 8x]
+		1043 8063  GeForce4 MX 440 AGP 8X
 		1043 806f  V9180 Magic
 		1462 8880  MS-StarForce GeForce4 MX 440 with AGP8X
 		1462 8900  MS-8890 GeForce 4 MX440 AGP8X
@@ -4194,6 +4365,8 @@
 	01c2  nForce USB Controller
 	01c3  nForce Ethernet Controller
 	01d1  GeForce 7300 LE
+		1462 0345  7300LE PCI Express Graphics Adapter
+	01d6  GeForce Go 7200
 	01d7  Quadro NVS 110M / GeForce Go 7300
 	01d8  GeForce Go 7400
 	01da  Quadro NVS 110M
@@ -4229,7 +4402,7 @@
 	0212  NV40 [GeForce 6800 LE]
 	0215  NV40 [GeForce 6800 GT]
 	0218  NV40 [GeForce 6800 XT]
-	0221  NV43 [GeForce 6200]
+	0221  NV44A [GeForce 6200]
 	0240  C51PV [GeForce 6150]
 		1462 7207  K8NGM2 series
 	0241  C51 PCI Express Bridge
@@ -4299,11 +4472,15 @@
 	028c  NV28GLM [Quadro4 700 GoGL]
 	0290  GeForce 7900 GTX
 	0291  GeForce 7900 GT
+	0292  GeForce 7900 GS
+	0298  GeForce Go 7900 GS
+	0299  GeForce Go 7900 GTX
 	029a  G71 [Quadro FX 2500M]
 	029b  G71 [Quadro FX 1500M]
 	029c  Quadro FX 5500
 	029d  Quadro FX 3500
 	029e  Quadro FX 1500
+	029f  Quadro FX 4500 X2
 # Xbox Graphics Processing Unit (Integrated). GeForce3 derivative (NV20 < NV2A < NV25).
 	02a0  NV2A [XGPU]
 	02e1  GeForce 7600 GS
@@ -4398,19 +4575,60 @@
 	0368  MCP55 SMBus
 	0369  MCP55 Memory Controller
 	036a  MCP55 Memory Controller
+	036b  MCP55 SMU
 	036c  MCP55 USB Controller
 	036d  MCP55 USB Controller
 	036e  MCP55 IDE
+	0370  MCP55 PCI bridge
 	0371  MCP55 High Definition Audio
 	0372  MCP55 Ethernet
 	0373  MCP55 Ethernet
+	0374  MCP55 PCI Express bridge
+	0375  MCP55 PCI Express bridge
+	0376  MCP55 PCI Express bridge
+	0377  MCP55 PCI Express bridge
+	0378  MCP55 PCI Express bridge
 	037a  MCP55 Memory Controller
 	037e  MCP55 SATA Controller
 	037f  MCP55 SATA Controller
 	0391  G70 [GeForce 7600 GT]
 	0392  G70 [GeForce 7600 GS]
+		1462 0622  NX7600GS-T2D256EH
+	0393  G70 [GeForce 7300 GT]
 	0398  G70 [GeForce Go 7600]
 	039e  Quadro FX 560
+	03a0  C55 Host Bridge
+	03a1  C55 Host Bridge
+	03a2  C55 Host Bridge
+	03a3  C55 Host Bridge
+	03a4  C55 Host Bridge
+	03a5  C55 Host Bridge
+	03a6  C55 Host Bridge
+	03a7  C55 Host Bridge
+	03a8  C55 Memory Controller
+	03a9  C55 Memory Controller
+	03aa  C55 Memory Controller
+	03ab  C55 Memory Controller
+	03ac  C55 Memory Controller
+	03ad  C55 Memory Controller
+	03ae  C55 Memory Controller
+	03af  C55 Memory Controller
+	03b0  C55 Memory Controller
+	03b1  C55 Memory Controller
+	03b2  C55 Memory Controller
+	03b3  C55 Memory Controller
+	03b4  C55 Memory Controller
+	03b5  C55 Memory Controller
+	03b6  C55 Memory Controller
+	03b7  C55 PCI Express bridge
+	03b8  C55 PCI Express bridge
+	03b9  C55 PCI Express bridge
+	03ba  C55 Memory Controller
+	03bb  C55 PCI Express bridge
+	03d0  GeForce 6100 nForce 430
+	03d1  GeForce 6100 nForce 405
+	03d2  GeForce 6100 nForce 400
+	03d5  GeForce 6100 nForce 420
 	03e0  MCP61 LPC Bridge
 	03e1  MCP61 LPC Bridge
 	03e2  MCP61 LPC Bridge
@@ -4419,6 +4637,8 @@
 	03e5  MCP61 Ethernet
 	03e6  MCP61 Ethernet
 	03e7  MCP61 SATA Controller
+	03e8  MCP61 PCI Express bridge
+	03e9  MCP61 PCI Express bridge
 	03ea  MCP61 Memory Controller
 	03eb  MCP61 SMBus
 	03ec  MCP61 IDE
@@ -4427,9 +4647,42 @@
 	03f0  MCP61 High Definition Audio
 	03f1  MCP61 USB Controller
 	03f2  MCP61 USB Controller
+	03f3  MCP61 PCI bridge
+	03f4  MCP61 SMU
 	03f5  MCP61 Memory Controller
 	03f6  MCP61 SATA Controller
 	03f7  MCP61 SATA Controller
+	0440  MCP65 LPC Bridge
+	0441  MCP65 LPC Bridge
+	0442  MCP65 LPC Bridge
+	0443  MCP65 LPC Bridge
+	0444  MCP65 Memory Controller
+	0445  MCP65 Memory Controller
+	0446  MCP65 SMBus
+	0447  MCP65 SMU
+	0448  MCP65 IDE
+	0449  MCP65 PCI bridge
+	044a  MCP65 High Definition Audio
+	044b  MCP65 High Definition Audio
+	044c  MCP65 AHCI Controller
+	044d  MCP65 AHCI Controller
+	044e  MCP65 AHCI Controller
+	044f  MCP65 AHCI Controller
+	0450  MCP65 Ethernet
+	0451  MCP65 Ethernet
+	0452  MCP65 Ethernet
+	0453  MCP65 Ethernet
+	0454  MCP65 USB Controller
+	0455  MCP65 USB Controller
+	0456  MCP65 USB Controller
+	0457  MCP65 USB Controller
+	0458  MCP65 PCI Express bridge
+	0459  MCP65 PCI Express bridge
+	045a  MCP65 PCI Express bridge
+	045c  MCP65 SATA Controller
+	045d  MCP65 SATA Controller
+	045e  MCP65 SATA Controller
+	045f  MCP65 SATA Controller
 10df  Emulex Corporation
 	1ae5  LP6000 Fibre Channel Host Adapter
 	f085  LP850 Fibre Channel Host Adapter
@@ -4475,11 +4728,13 @@
 10e2  Aptix Corporation
 10e3  Tundra Semiconductor Corp.
 	0000  CA91C042 [Universe]
+	0108  Tsi108 Host Bridge for Single PowerPC
 	0148  Tsi148 [Tempe]
 	0860  CA91C860 [QSpan]
 	0862  CA91C862A [QSpan-II]
 	8260  CA91L8200B [Dual PCI PowerSpan II]
 	8261  CA91L8260B [Single PCI PowerSpan II]
+	a108  Tsi109 Host Bridge for Dual PowerPC
 10e4  Tandem Computers
 	8029  Realtek 8029 Network Card
 10e5  Micro Industries Corporation
@@ -4502,7 +4757,6 @@
 	811a  PCI-IEEE1355-DS-DE Interface
 	814c  Fastcom ESCC-PCI (Commtech, Inc.)
 	8170  S5933 [Matchmaker] (Chipset Development Tool)
-# sold with Roper Scientifc(Photometrics) CoolSnap HQ camera
 	81e6  Multimedia video controller
 	8291  Fastcom 232/8-PCI (Commtech, Inc.)
 	82c4  Fastcom 422/4-PCI (Commtech, Inc.)
@@ -4530,6 +4784,8 @@
 	8111  Twist3 Frame Grabber
 10ec  Realtek Semiconductor Co., Ltd.
 	0139  Zonet Zen3200
+	0883  High Definition Audio
+		1025 1605  TravelMate 5600 series
 	8029  RTL-8029(AS)
 		10b8 2011  EZ-Card (SMC1208)
 		10ec 8029  RTL-8029(AS)
@@ -4538,6 +4794,7 @@
 		1259 2400  AT-2400
 	8129  RTL-8129
 		10ec 8129  RT8129 Fast Ethernet Adapter
+	8136  RTL8101E PCI Express Fast Ethernet controller
 	8138  RT8139 (B/C) Cardbus Fast Ethernet Adapter
 		10ec 8138  RT8139 (B/C) Fast Ethernet Adapter
 	8139  RTL-8139/8139C/8139C+
@@ -4575,6 +4832,8 @@
 		8e2e 7000  KF-230TX
 		8e2e 7100  KF-230TX/2
 		a0a0 0007  ALN-325C
+	8167  RTL-8169SC Gigabit Ethernet
+	8168  RTL8111/8168B PCI Express Gigabit Ethernet controller
 	8169  RTL-8169 Gigabit Ethernet
 		1025 0079  Aspire 5024WLMi
 		1259 c107  CG-LAPCIGT
@@ -4629,6 +4888,7 @@
 1100  Jazz Multimedia
 1101  Initio Corporation
 	1060  INI-A100U2W
+	1622  INI-1623 PCI SATA-II Controller
 	9100  INI-9100/9100W
 	9400  INI-940
 	9401  INI-950
@@ -4661,6 +4921,9 @@
 		1102 0058  SB0090 Audigy Player/OEM
 		1102 1007  SB0240 Audigy 2 Platinum 6.1
 		1102 2002  SB Audigy 2 ZS (SB0350)
+	0005  SB X-Fi
+		1102 0021  X-Fi Platinum
+		1102 1003  X-Fi XtremeMusic
 	0006  [SB Live! Value] EMU10k1X
 	0007  SB Audigy LS
 		1102 0007  SBLive! 24bit
@@ -4901,7 +5164,7 @@
 		1019 0a81  L7VTA v1.0 Motherboard (KT400-8235)
 		1043 8095  A7V8X Motherboard (Realtek ALC650 codec)
 		1043 80a1  A7V8X-X Motherboard
-		1043 80b0  A7V600/K8V Deluxe motherboard (ADI AD1980 codec [SoundMAX])
+		1043 80b0  A7V600/K8V-X/K8V Deluxe motherboard (ADI AD1980 codec [SoundMAX])
 		1043 812a  A8V Deluxe motherboard (Realtek ALC850 codec)
 		1106 3059  L7VMM2 Motherboard
 		1106 4161  K7VT2 motherboard
@@ -5384,10 +5647,18 @@
 		185b c100  VideoMate TV
 		5168 0306  LifeView FlyDVB-T DUO
 		5168 0319  LifeView FlyDVB Trio
+		5168 0502  LifeView FlyDVB-T Duo CardBus
+		5168 0520  LifeView FlyDVB Trio CardBus
+		5168 1502  LifeView FlyTV CardBus
+		5168 2502  LifeView FlyDVB-T CardBus
+		5168 2520  LifeView FlyDVB-S Duo CardBus
+		5168 3502  LifeView FlyDVB-T Hybrid CardBus
+		5168 3520  LifeView FlyDVB Trio N CardBus
 	7134  SAA7134/SAA7135HL Video Broadcast Decoder
 		1019 4cb4  Elitegroup ECS TVP3XP FM1216 Tuner Card(PAL-BG,FM)
 		1043 0210  Digimatrix TV
 		1043 4840  ASUS TV-FM 7134
+		1043 4842  TV-FM 7134
 		1131 2004  EUROPA V3 reference design
 		1131 4e85  SKNet Monster TV
 		1131 6752  EMPRESS
@@ -5415,7 +5686,6 @@
 		1131 4f56  KNC1 DVB-S Budget
 		1131 4f60  Fujitsu-Siemens Activy DVB-S Budget Rev AL
 		1131 4f61  Activy DVB-S Budget Rev GR
-# It has an LSI companion chip.
 		1131 5f61  Activy DVB-T Budget
 		114b 2003  DVRaptor Video Edit/Capture Card
 		11bd 0006  DV500 Overlay
@@ -5440,6 +5710,7 @@
 		13c2 1102  Technotrend/Hauppauge DVB card rev2.1
 		153b 1156  Terratec Cynergy 1200C
 	9730  SAA9730 Integrated Multimedia and Peripheral Controller
+		1131 0000  Integrated Multimedia and Peripheral Controller
 1132  Mitel Corp.
 1133  Eicon Networks Corporation
 	7901  EiconCard S90
@@ -5778,11 +6049,15 @@
 	0017  GCNB-LE Host Bridge
 	0036  HT1000 PCI/PCI-X bridge
 	0101  CIOB-X2 PCI-X I/O Bridge
+	0103  EPB PCI-Express to PCI-X Bridge
 	0104  HT1000 PCI/PCI-X bridge
 	0110  CIOB-E I/O Bridge with Gigabit Ethernet
 	0130  HT2000 PCI-X bridge
 	0132  HT2000 PCI-Express bridge
 		1166 0132  HT2000 PCI-Express bridge
+	0140  HT2100 PCI-Express Bridge
+	0141  HT2100 PCI-Express Bridge
+	0142  HT2100 PCI-Express Bridge
 	0200  OSB4 South Bridge
 	0201  CSB5 South Bridge
 		4c53 1080  CT8 mainboard
@@ -5793,6 +6068,7 @@
 	0212  CSB5 IDE Controller
 		4c53 1080  CT8 mainboard
 	0213  CSB6 RAID/IDE Controller
+		1028 4134  PowerEdge 600SC
 		1028 c134  Poweredge SC600
 		1734 1012  Primergy RX300
 	0214  HT1000 Legacy IDE controller
@@ -5931,6 +6207,7 @@
 		1186 1301  DFE-530TX+ 10/100 Ethernet Adapter
 		1186 1303  DFE-528TX 10/100 Fast Ethernet PCI Adapter
 	1340  DFE-690TXD CardBus PC Card
+	1405  DFE-520TX Fast Ethernet PCI Adapter
 	1541  DFE-680TXD CardBus PC Card
 	1561  DRP-32TXD Cardbus PC Card
 	2027  AirPlus Xtreme G DWL-G520 Adapter
@@ -5949,6 +6226,8 @@
 	3a63  AirXpert DWL-AG660 Wireless Cardbus Adapter
 	4000  DL2000-based Gigabit Ethernet
 	4300  DGE-528T Gigabit Ethernet Adapter
+# There are at least 3 revisions of this adapter; 4800 is board revision A1 as far as I can tell, revision B1 is 4c00.
+	4800  DGE-530T Gigabit Ethernet Adapter (rev 11)
 	4b01  DGE-530T Gigabit Ethernet Adapter (rev 11)
 	4c00  Gigabit Ethernet Adapter
 		1186 4c00  DGE-530T Gigabit Ethernet Adapter
@@ -6172,6 +6451,7 @@
 	6081  MV88SX6081 8-port SATA II PCI-X Controller
 	6460  MV64360/64361/64362 System Controller
 	6480  MV64460/64461/64462 System Controller
+	6485  MV64460/64461/64462 System Controller, Revision B
 	f003  GT-64010 Primary Image Piranha Image Generator
 11ac  Canon Information Systems Research Aust.
 11ad  Lite-On Communications Inc
@@ -6340,6 +6620,7 @@
 	ab30  Hermes2 Mini-PCI WaveLAN a/b/g
 		14cd 2012  Hermes2 Mini-PCI WaveLAN a/b/g
 	ed00  ET-131x PCI-E Ethernet Controller
+	ed01  ET-131x PCI-E Ethernet Controller
 11c2  Sand Microelectronics
 11c3  NEC Corporation
 11c4  Document Technologies, Inc
@@ -6518,6 +6799,7 @@
 1215  Interware Co., Ltd
 1216  Purup Prepress A/S
 1217  O2 Micro, Inc.
+	00f7  Firewire (IEEE 1394)
 	6729  OZ6729
 	673a  OZ6730
 	6832  OZ6832/6833 CardBus Controller
@@ -6536,7 +6818,10 @@
 	7112  OZ711EC1/M1 SmartCardBus/MemoryCardBus Controller
 	7113  OZ711EC1 SmartCardBus Controller
 	7114  OZ711M1/MC1 4-in-1 MemoryCardBus Controller
+	7120  Integrated MMC/SD Controller
+	7130  Integrated MS/xD Controller
 	7134  OZ711MP1/MS1 MemoryCardBus Controller
+	7135  Cardbus bridge
 	71e2  OZ711E2 SmartCardBus Controller
 	7212  OZ711M2 4-in-1 MemoryCardBus Controller
 	7213  OZ6933E CardBus Controller
@@ -6720,6 +7005,7 @@
 1259  Allied Telesyn International
 	2560  AT-2560 Fast Ethernet Adapter (i82557B)
 	a117  RTL81xx Fast Ethernet
+	a11e  RTL81xx Fast Ethernet
 	a120  21x4x DEC-Tulip compatible 10/100 Ethernet
 125a  ABB Power Systems
 125b  Asix Electronics Corporation
@@ -6792,6 +7078,7 @@
 		1113 ee08  SMC2835W V3 EU Wireless Cardbus Adapter
 		1186 3202  DWL-G650 A1 Wireless Adapter
 		1259 c104  CG-WLCB54GT Wireless Adapter
+		1260 0000  WG511 Wireless Adapter
 		1385 4800  WG511 Wireless Adapter
 		16a5 1605  ALLNET ALL0271 Wireless PCI Adapter
 		17cf 0014  XG-600 and clones Wireless Adapter
@@ -7410,17 +7697,17 @@
 1312  Acuity Imaging, Inc
 1313  Yaskawa Electric Co.
 1316  Teradyne Inc
-1317  Linksys
+1317  ADMtek
 	0981  21x4x DEC-Tulip compatible 10/100 Ethernet
 	0985  NC100 Network Everywhere Fast Ethernet 10/100
 		1734 100c  Scenic N300 ADMtek AN983 10/100 Mbps PCI Adapter
 	1985  21x4x DEC-Tulip compatible 10/100 Ethernet
 	2850  HSP MicroModem 56
-	5120  ADMtek ADM5120 OpenGate System-on-Chip
-	8201  ADMtek ADM8211 802.11b Wireless Interface
+	5120  ADM5120 OpenGate System-on-Chip
+	8201  ADM8211 802.11b Wireless Interface
 		10b8 2635  SMC2635W 802.11b (11Mbps) wireless lan pcmcia (cardbus) card
 		1317 8201  SMC2635W 802.11b (11mbps) wireless lan pcmcia (cardbus) card
-	8211  ADMtek ADM8211 802.11b Wireless Interface
+	8211  ADM8211 802.11b Wireless Interface
 	9511  21x4x DEC-Tulip compatible 10/100 Ethernet
 1318  Packet Engines Inc.
 	0911  GNIC-II PCI Gigabit Ethernet [Hamachi]
@@ -7588,6 +7875,7 @@
 	0204  GPS170PCI GPS Receiver
 	0301  TCR510PCI IRIG Timecode Reader
 	0302  TCR167PCI IRIG Timecode Reader
+	0303  TCR511PCI IRIG Timecode Reader
 1361  Soliton Systems K.K.
 1362  Fujifacom Corporation
 1363  Phoenix Technology Ltd
@@ -7598,6 +7886,10 @@
 1368  Skyware Corporation
 1369  Digigram
 136a  High Soft Tech
+	0004  HST Saphir VII mini PCI
+	0007  HST Saphir III E MultiLink 4
+	0008  HST Saphir III E MultiLink 8
+	000a  HST Saphir III E MultiLink 2
 136b  Kawasaki Steel Corporation
 	ff01  KL5A72002 Motion JPEG
 136c  Adtek System Science Co Ltd
@@ -7682,6 +7974,10 @@
 	630a  GA630 Gigabit Ethernet
 	6b00  WG311v3 54 Mbps Wireless PCI Adapter
 	6d00  WPNT511 RangeMax 240 Mbps Wireless PC Card
+	7b00  WN511B RangeMax Next 280 Mbps Wireless PC Card
+	7c00  WN511T RangeMax Next 300 Mbps Wireless PC Card
+	7d00  WN311B RangeMax Next 270 Mbps Wireless PCI Adapter
+	7e00  WN311T RangeMax Next 300 Mbps Wireless PCI Adapter
 	f004  FA310TX
 1386  Video Domain Technologies
 1387  Systran Corp
@@ -7879,7 +8175,16 @@
 13fd  Micro Science Inc
 13fe  Advantech Co. Ltd
 	1240  PCI-1240 4-channel stepper motor controller card
-	1600  PCI-1612 4-port RS-232/422/485 PCI communication card
+	1600  PCI-16xx series PCI multiport serial board (function 0)
+# This board has two PCI functions, appears as two PCI devices
+		1601 0002  PCI-1601 2-port unisolated RS-422/485
+# This board has two PCI functions, appears as two PCI devices
+		1602 0002  PCI-1602 2-port isolated RS-422/485
+		1612 0004  PCI-1612 4-port RS-232/422/485
+	16ff  PCI-16xx series PCI multiport serial board (function 1: RX/TX steering CPLD)
+		1601 0000  PCI-1601 2-port unisolated RS-422/485 PCI communications card
+		1602 0000  PCI-1602 2-port isolated RS-422/485
+		1612 0000  PCI-1612 4-port RS-232/422/485
 	1733  PCI-1733 32-channel isolated digital input card
 	1752  PCI-1752
 	1754  PCI-1754
@@ -7962,7 +8267,12 @@
 1414  Microsoft Corporation
 1415  Oxford Semiconductor Ltd
 	8403  VScom 011H-EP1 1 port parallel adaptor
-	9501  OX16PCI954 (Quad 16950 UART) function 0
+	9500  OX16PCI954 (Quad 16950 UART) function 0 (Disabled)
+	9501  OX16PCI954 (Quad 16950 UART) function 0 (Uart)
+		12c4 0201  Titan/cPCI (2 port)
+		12c4 0202  Titan/cPCI (4 port)
+		12c4 0203  Titan/cPCI (8 port)
+		12c4 0210  Titan/104-Plus (8 port, p1-4)
 		131f 2050  CyberPro (4-port)
 # Model IO1085, Part No: JJ-P46012
 		131f 2051  CyberSerial 4S Plus
@@ -7971,9 +8281,13 @@
 	950a  EXSYS EX-41092 Dual 16950 Serial adapter
 	950b  OXCB950 Cardbus 16950 UART
 	9510  OX16PCI954 (Quad 16950 UART) function 1 (Disabled)
-	9511  OX16PCI954 (Quad 16950 UART) function 1
+		12c4 0200  Titan/cPCI (Unused)
+	9511  OX16PCI954 (Quad 16950 UART) function 1 (8bit bus)
+		12c4 0211  Titan/104-Plus (8 port, p5-8)
 		15ed 2000  MCCR Serial p4-7 of 8
 		15ed 2001  MCCR Serial p4-15 of 16
+	9512  OX16PCI954 (Quad 16950 UART) function 1 (32bit bus)
+	9513  OX16PCI954 (Quad 16950 UART) function 1 (parallel port)
 	9521  OX16PCI952 (Dual 16950 UART)
 	9523  OX16PCI952 Integrated Parallel Port
 1416  Multiwave Innovation pte Ltd
@@ -8013,6 +8327,13 @@
 1433  Eltec Elektronik GmbH
 # Nee Real Time Devices US Inc.
 1435  RTD Embedded Technologies, Inc.
+	4520  PCI4520
+	6020  SPM6020
+	6030  SPM6030
+	6420  SPM186420
+	6430  SPM176430
+	7520  DM7520
+	7820  DM7820
 1436  CIS Technology Inc
 1437  Nissin Inc Co
 1438  Atmel-dream
@@ -8074,7 +8395,6 @@
 	f436  AVerTV Hybrid+FM
 1462  Micro-Star International Co., Ltd.
 	5501  nVidia NV15DDR [GeForce2 Ti]
-# MSI CB54G Wireless PC Card that seems to use the Broadcom 4306 Chipset
 	6819  Broadcom Corporation BCM4306 802.11b/g Wireless LAN Controller [MSI CB54G]
 	6825  PCI Card wireless 11g [PC54G]
 	6834  RaLink RT2500 802.11g [PC54G2]
@@ -8146,6 +8466,7 @@
 1498  TEWS Datentechnik GmBH
 	0330  TPMC816 2 Channel CAN bus controller.
 	0385  TPMC901 Extended CAN bus with 2/4/6 CAN controller
+	21cc  TCP460 CompactPCI 16 Channel Serial Interface RS232/RS422
 	21cd  TCP461 CompactPCI 8 Channel Serial Interface RS232/RS422
 	30c8  TPCI200
 1499  EMTEC CO., Ltd
@@ -8204,13 +8525,16 @@
 14ba  INTERNIX Inc.
 14bb  SEMTECH Corporation
 14bc  Globespan Semiconductor Inc.
+	d002  Pulsar [PCI ADSL Card]
+	d00f  Pulsar [PCI ADSL Card]
 14bd  CARDIO Control N.V.
 14be  L3 Communications
 14bf  SPIDER Communications Inc.
 14c0  COMPAL Electronics Inc
 14c1  MYRICOM Inc.
-	0008  Myri-10G Dual-Protocol Interconnect
+	0008  Myri-10G Dual-Protocol NIC (10G-PCIE-8A)
 	8043  Myrinet 2000 Scalable Cluster Interconnect
+		103c 1240  Myrinet M2L-PCI64/2-3.0 LANai 7.4 (HP OEM)
 14c2  DTK Computer
 14c3  MEDIATEK Corp.
 14c4  IWASAKI Information Systems Co Ltd
@@ -8287,6 +8611,7 @@
 	0811  Sentry5 External Interface Core
 	0816  BCM3302 Sentry5 MIPS32 CPU
 	1600  NetXtreme BCM5752 Gigabit Ethernet PCI Express
+		107b 5048  E4500 Onboard
 	1601  NetXtreme BCM5752M Gigabit Ethernet PCI Express
 	1644  NetXtreme BCM5700 Gigabit Ethernet
 		1014 0277  Broadcom Vigil B5700 1000Base-T
@@ -8349,19 +8674,26 @@
 		0e11 00cf  NC7772 Gigabit Server Adapter (PCI-X, 10,100,1000-T)
 		0e11 00d0  NC7782 Gigabit Server Adapter (PCI-X, 10,100,1000-T)
 		0e11 00d1  NC7783 Gigabit Server Adapter (PCI-X, 10,100,1000-T)
+		10a9 8013  Dual Port Gigabit Ethernet (PCI-X,Copper)
+		10a9 8018  Dual Port Gigabit Ethernet (A330)
+		10a9 801a  Dual Port Gigabit Ethernet (IA-blade)
+		10a9 801b  Quad Port Gigabit Ethernet (PCI-E,Copper)
 		10b7 2000  3C998-T Dual Port 10/100/1000 PCI-X
 		10b7 3000  3C999-T Quad Port 10/100/1000 PCI-X
 		1166 1648  NetXtreme CIOB-E 1000Base-T
 		1734 100b  Primergy RX300
 	164a  NetXtreme II BCM5706 Gigabit Ethernet
+		103c 3070  NC380T PCI Express Dual Port Multifunction Gigabit Server Adapter
 		103c 3101  NC370T MultifuNCtion Gigabit Server Adapter
 	164c  NetXtreme II BCM5708 Gigabit Ethernet
+		103c 7037  NC373T PCI Express Multifunction Gigabit Server Adapter
+		103c 7038  NC373i Integrated Multifunction Gigabit Server Adapter
 	164d  NetXtreme BCM5702FE Gigabit Ethernet
 	1653  NetXtreme BCM5705 Gigabit Ethernet
 		0e11 00e3  NC7761 Gigabit Server Adapter
 	1654  NetXtreme BCM5705_2 Gigabit Ethernet
 		0e11 00e3  NC7761 Gigabit Server Adapter
-		103c 3100  NC1020 HP ProLiant Gigabit Server Adapter 32 PCI
+		103c 3100  NC1020 ProLiant Gigabit Server Adapter 32 PCI
 		103c 3226  NC150T 4-port Gigabit Combo Switch & Adapter
 	1659  NetXtreme BCM5721 Gigabit Ethernet PCI Express
 		1014 02c6  eServer xSeries server mainboard
@@ -8390,16 +8722,20 @@
 		103c 3006  DC7100 SFF(DX878AV)
 		1734 105d  Scenic W620
 	1678  NetXtreme BCM5715 Gigabit Ethernet
-	1679  NetXtreme 5715S Gigabit Ethernet
+	1679  NetXtreme BCM5715S Gigabit Ethernet
+		103c 1707  NC326m PCIe Dual Port Adapter
+		103c 170c  NC325m PCIe Quad Port Adapter
 		103c 703c  NC326i PCIe Dual Port Gigabit Server Adapter
 	167a  NetXtreme BCM5754 Gigabit Ethernet PCI Express
 	167b  NetXtreme BCM5755 Gigabit Ethernet PCI Express
 	167d  NetXtreme BCM5751M Gigabit Ethernet PCI Express
+		17aa 2081  Thinkpad R60e model 0657
 	167e  NetXtreme BCM5751F Fast Ethernet PCI Express
 	1693  NetLink BCM5787M Gigabit Ethernet PCI Express
 	1696  NetXtreme BCM5782 Gigabit Ethernet
-		103c 12bc  HP d530 CMT (DG746A)
+		103c 12bc  d530 CMT (DG746A)
 		14e4 000d  NetXtreme BCM5782 1000Base-T
+	169a  NetLink BCM5786 Gigabit Ethernet PCI Express
 	169b  NetLink BCM5787 Gigabit Ethernet PCI Express
 	169c  NetXtreme BCM5788 Gigabit Ethernet
 		103c 308b  MX6125
@@ -8417,10 +8753,15 @@
 		14e4 000b  NetXtreme BCM5703 1000Base-T
 		14e4 800a  NetXtreme BCM5703 1000Base-T
 	16a8  NetXtreme BCM5704S Gigabit Ethernet
+		10a9 8014  Dual Port Gigabit Ethernet (PCI-X,Fiber)
+		10a9 801c  Quad Port Gigabit Ethernet (PCI-E,Fiber)
 		10b7 2001  3C998-SX Dual Port 1000-SX PCI-X
 	16aa  NetXtreme II BCM5706S Gigabit Ethernet
 		103c 3102  NC370F MultifuNCtion Gigabit Server Adapter
 	16ac  NetXtreme II BCM5708S Gigabit Ethernet
+		103c 1706  NC373m Multifunction Gigabit Server Adapter
+		103c 703b  NC373i Integrated Multifunction Gigabit Server Adapter
+		103c 703d  NC373F PCI Express Multifunction Gigabit Server Adapter
 	16c6  NetXtreme BCM5702A3 Gigabit Ethernet
 		10b7 1100  3C1000B-T 10/100/1000 PCI
 		14e4 000c  BCM5702 1000Base-T
@@ -8455,6 +8796,7 @@
 	4306  BCM4307 Ethernet Controller
 	4307  BCM4307 802.11b Wireless LAN Controller
 	4310  BCM4310 Chipcommon I/OController
+	4311  Dell Wireless 1390 WLAN Mini-PCI Card
 	4312  BCM4310 UART
 	4313  BCM4310 Ethernet Controller
 	4315  BCM4310 USB Controller
@@ -8467,7 +8809,7 @@
 		14e4 4318  WPC54G version 3 [Wireless-G Notebook Adapter] 802.11g Wireless Lan Controller
 		16ec 0119  U.S.Robotics Wireless MAXg PC Card
 		1737 0048  WPC54G-EU version 3 [Wireless-G Notebook Adapter]
-	4319  Dell Wireless 1470 DualBand WLAN
+	4319  BCM4311 [AirForce 54g] 802.11a/b/g PCI Express Transceiver
 	4320  BCM4306 802.11b/g Wireless LAN Controller
 		1028 0001  TrueMobile 1300 WLAN Mini-PCI Card
 		1028 0003  Wireless 1350 WLAN Mini-PCI Card
@@ -8492,9 +8834,10 @@
 	4325  BCM43xG 802.11b/g
 		1414 0003  Wireless Notebook Adapter MN-720
 		1414 0004  Wireless PCI Adapter MN-730
-# probably this is a correct ID...
 	4326  BCM4307 Chipcommon I/O Controller?
+	4329  BCM43XG
 	4401  BCM4401 100Base-T
+		103c 08b0  tc1100 tablet
 		1043 80a8  A7V8X motherboard
 	4402  BCM4402 Integrated 10/100BaseT
 	4403  BCM4402 V.90 56k Modem
@@ -8924,6 +9267,7 @@
 1540  PROVIDEO MULTIMEDIA Co Ltd
 1541  MACHONE Communications
 1542  Concurrent Computer Corporation
+	9260  RCIM-II Real-Time Clock & Interrupt Module
 1543  SILICON Laboratories
 	3052  Intel 537 [Winmodem]
 	4c22  Si3036 MC'97 DAA
@@ -9215,6 +9559,7 @@
 1677  Bernecker + Rainer
 	104e  5LS172.6 B&R Dual CAN Interface Card
 	12d7  5LS172.61 B&R Dual CAN Interface Card
+	20ad  5ACPCI.MFIO-K01 Profibus DP / K-Feldbus / COM
 167b  ZyDAS Technology Corp.
 	2102  ZyDAS ZD1202
 		187e 3406  ZyAIR B-122 CardBus 11Mbs Wireless LAN Card
@@ -9245,12 +9590,15 @@
 		1385 4d00  Netgear WG311T Wireless PCI Adapter
 		1458 e911  Gigabyte GN-WIAG02
 		14b7 0a60  8482-WD ORiNOCO 11a/b/g Wireless PCI Adapter
+		1668 1026  IBM HighRate 11 a/b/g Wireless CardBus Adapter
 		168c 0013  AirPlus XtremeG DWL-G650 Wireless PCMCIA Adapter
 		168c 1025  DWL-G650B2 Wireless CardBus Adapter
-		168c 1027  Netgate NL-3054CB ARIES b/g CardBus Adapter
+		168c 1027  Engenius NL-3054CB ARIES b/g CardBus Adapter
+		168c 1042  Ubiquiti Networks SuperRange a/b/g Cardbus Adapter
 		168c 2026  Netgate 5354MP ARIES a(108Mb turbo)/b/g MiniPCI Adapter
-		168c 2041  Netgate 5354MP Plus ARIES2 b/g MiniPCI Adapter
-		168c 2042  Netgate 5354MP Plus ARIES2 a/b/g MiniPCI Adapter
+		168c 2041  Engenius 5354MP Plus ARIES2 b/g MiniPCI Adapter
+		168c 2042  Engenius 5354MP Plus ARIES2 a/b/g MiniPCI Adapter
+		168c 2051  TRENDnet TEW-443PI Wireless PCI Adapter
 		16ab 7302  Trust Speedshare Turbo Pro Wireless PCI Adapter
 		185f 2012  Wistron NeWeb WLAN a+b+g model CB9
 	001a  AR5005G 802.11abg NIC
@@ -9260,14 +9608,16 @@
 		1186 3a16  D-Link AirPlus G DWL-G510 Wireless PCI Adapter(rev.B)
 		1186 3a23  D-Link AirPlus G DWL-G520+A Wireless PCI Adapter
 		1186 3a24  D-Link AirPlus G DWL-G650+A Wireless Cardbus Adapter
+		168c 001a  Belkin FD7000
 		168c 1052  TP-Link TL-WN510G Wireless CardBus Adapter
 	001b  AR5006X 802.11abg NIC
 		1186 3a19  D-Link AirPremier AG DWL-AG660 Wireless Cardbus Adapter
 		1186 3a22  D-Link AirPremier AG DWL-AG530 Wireless PCI Adapter
-		168c 2062  EnGenius EMP-8602 (400mw)
-		168c 2063  EnGenius EMP-8602 (400mw)
+		168c 2062  EnGenius EMP-8602 (400mw) or Compex WLM54AG (SuperAG)
+		168c 2063  EnGenius EMP-8602 (400mw) or Compex WLM54AG
 	0020  AR5005VL 802.11bg Wireless NIC
 	1014  AR5212 802.11abg NIC
+		1014 058a  ThinkPad 11a/b/g Wireless LAN Mini Express Adapter (AR5BXB6)
 1695  EPoX Computer Co., Ltd.
 169c  Netcell Corporation
 	0044  Revolution Storage Processing Card
@@ -9296,9 +9646,12 @@
 16df  PIKA Technologies Inc.
 16e3  European Space Agency
 	1e0f  LEON2FT Processor
+16e5  Intellon Corp.
+	6000  INT6000 Ethernet-to-Powerline Bridge [HomePlug AV]
 16ec  U.S. Robotics
 	00ff  USR997900 10/100 Mbps PCI Network Card
 	0116  USR997902 10/100/1000 Mbps PCI Network Card
+	2f00  USR5660A (USR265660A, USR5660A-BP) 56K PCI Faxmodem
 	3685  Wireless Access PCI Adapter Model 022415
 16ed  Sycron N. V.
 	1001  UMIO communication card
@@ -9394,9 +9747,20 @@
 	1260  ARC-1260 16-Port PCI-Express to SATA RAID Controller
 17d5  S2io Inc.
 	5831  Xframe 10 Gigabit Ethernet PCI-X
-		103c 12d5  HP PCI-X 133MHz 10GbE SR Fiber
+		103c 12d5  PCI-X 133MHz 10GbE SR Fiber
+		10a9 8020  Single Port 10 Gigabit Ethernet (PCI-X, Fiber)
+		10a9 8024  Single Port 10 Gigabit Ethernet (PCI-X, Fiber)
 	5832  Xframe II 10Gbps Ethernet
+		10a9 8021  Single Port 10 Gigabit Ethernet II (PCI-X, Fiber)
+17db  Cray Inc
 17de  KWorld Computer Co. Ltd.
+17e4  Sectra AB
+	0001  KK671 Cardbus encryption board
+	0002  KK672 Cardbus encryption board
+17e6  Entropic Communications Inc.
+	0010  EN2010 [c.Link] MoCA Network Controller (Coax, PCI interface)
+	0011  EN2010 [c.Link] MoCA Network Controller (Coax, MPEG interface)
+	0021  EN2210 [c.Link] MoCA Network Controller (Coax)
 17ee  Connect Components Ltd
 17f2  Albatron Corp.
 17fe  Linksys, A Division of Cisco Systems
@@ -9449,7 +9813,9 @@
 	08a7  MVC100 DVI
 	08a8  MVC101 SDI
 	08a9  MVC102 DVI+Audio
+	08b0  MVC200-DC
 1849  ASRock Incorporation
+184a  Thales Computers
 1851  Microtune, Inc.
 1852  Anritsu Corp.
 1853  SMSC Automotive Infotainment System Group
@@ -9467,6 +9833,7 @@
 187e  ZyXEL Communication Corporation
 	3403  ZyAir G-110 802.11g
 	340e  M-302 802.11g XtremeMIMO
+1885  Avvida Systems Inc.
 1888  Varisys Ltd
 	0301  VMFX1 FPGA PMC module
 	0601  VSM2 dual PMC carrier
@@ -9479,7 +9846,8 @@
 18a1  Astute Networks Inc.
 18ac  DViCO Corporation
 	d500  FusionHDTV 5
-	d810  FusionHDTV 3 Gold
+	d800  FusionHDTV 3 Gold
+	d810  FusionHDTV 3 Gold-Q
 	d820  FusionHDTV 3 Gold-T
 18b8  Ammasso
 	b001  AMSO 1100 iWARP/RDMA Gigabit Ethernet Coprocessor
@@ -9511,6 +9879,10 @@
 		18ec d002  COMBO-4SFP
 		18ec d003  COMBO-4SFPRO
 		18ec d004  COMBO-2XFP
+18f6  NextIO
+	1000  [Nexsis] Switch Virtual P2P PCIe Bridge
+	1050  [Nexsis] Switch Virtual P2P PCI Bridge
+	2000  [Nexsis] Switch Integrated Mgmt. Endpoint
 18f7  Commtech, Inc.
 	0001  Fastcom ESCC-PCI-335
 	0002  Fastcom 422/4-PCI-335
@@ -9523,6 +9895,7 @@
 1923  Sangoma Technologies Corp.
 	0040  A200/Remora FXO/FXS Analog AFT card
 	0100  A104d QUAD T1/E1 AFT card
+	0300  A101 single-port T1/E1
 	0400  A104u Quad T1/E1 AFT
 1924  Level 5 Networks Inc.
 192e  TransDimension
@@ -9530,7 +9903,14 @@
 	000c  Qualcomm MSM6275 UMTS chip
 1942  ClearSpeed Technology plc
 	e511  CSX600 Advance Accelerator Board
+194a  DapTechnology B.V.
+	1111  FireSpy3850
+	1112  FireSpy450b
+	1113  FireSpy450bT
+	1114  FireSpy850
+	1115  FireSpy850bT
 1957  Freescale Semiconductor Inc
+	0012  MPC8548 [PowerQUICC III]
 	0080  MPC8349E
 	0081  MPC8349
 	0082  MPC8347E TBGA
@@ -9542,6 +9922,8 @@
 1958  Faster Technology, LLC.
 1966  Orad Hi-Tec Systems
 	1975  DVG64 family
+1969  Attansic Technology Corp.
+	1048  L1 Gigabit Ethernet Adapter
 196a  Sensory Networks Inc.
 	0101  NodalCore C-1000 Content Classification Accelerator
 	0102  NodalCore C-2000 Content Classification Accelerator
@@ -9564,12 +9946,19 @@
 	0520  4135 HFT Interface Controller
 19d4  Quixant Limited
 19e2  Vector Informatik GmbH
+19e7  NET (Network Equipment Technologies)
+	1001  STIX DSP Card
+	1002  STIX - 1 Port T1/E1 Card
+	1003  STIX - 2 Port T1/E1 Card
+	1004  STIX - 4 Port T1/E1 Card
+	1005  STIX - 4 Port FXS Card
 1a03  ASPEED Technology, Inc.
 	2000  AST2000
 1a08  Sierra semiconductor
 	0000  SC15064
 1a1d  GFaI e.V.
 1a29  Fortinet, Inc.
+1a51  Hectronic AB
 1b13  Jaton Corp
 1c1c  Symphony
 	0001  82C101
@@ -9608,6 +9997,7 @@
 	0014  HiNT HC4 PCI to ISDN bridge, Network controller
 	0020  HB6 Universal PCI-PCI bridge (transparent mode)
 	0021  HB6 Universal PCI-PCI bridge (non-transparent mode)
+		1775 ce90  CE9
 		4c53 1050  CT7 mainboard
 		4c53 1080  CT8 mainboard
 		4c53 1090  Cx9 mainboard
@@ -9716,8 +10106,11 @@
 		0070 e817  WinTV PVR 500 (2nd unit)
 		0070 ff92  WiNTV PVR-550
 		0270 0801  WinTV PVR 150
+		10fc d038  GV-MVP/RX2W (1st unit)
+		10fc d039  GV-MVP/RX2W (2nd unit)
 		12ab fff3  MPG600
 		12ab ffff  MPG600
+		1461 c019  UltraTV 1500 MCE
 		9005 0092  VideOh! AVC-2010
 		9005 0093  VideOh! AVC-2410
 	0803  iTVC15 MPEG-2 Encoder
@@ -9726,7 +10119,6 @@
 		0070 4800  WinTV PVR-350 (V1)
 		12ab 0000  MPG160
 		1461 a3ce  M179
-# video capture card
 		1461 a3cf  M179
 4468  Bridgeport machines
 4594  Cogetec Informatique Inc
@@ -9945,6 +10337,7 @@
 7063  pcHDTV
 	2000  HD-2000
 	3000  HD-3000
+	5500  HD5500 HDTV
 7604  O.N. Electronic Co Ltd.
 7bde  MIDAC Corporation
 7fed  PowerTV
@@ -10043,7 +10436,7 @@
 		1028 011c  PRO/1000 XT Network Connection
 		8086 1107  PRO/1000 XT Server Adapter
 		8086 2107  PRO/1000 XT Server Adapter
-		8086 2110  PRO/1000 XT Server Adapter
+		8086 2110  PRO/1000 XT Desktop Adapter
 		8086 3108  PRO/1000 XT Network Connection
 	1009  82544EI Gigabit Ethernet Controller (Fiber)
 		1014 0268  iSeries Gigabit Ethernet Adapter
@@ -10062,8 +10455,8 @@
 		1014 0265  PRO/1000 MT Network Connection
 		1014 0267  PRO/1000 MT Network Connection
 		1014 026a  PRO/1000 MT Network Connection
-		1024 0134  Poweredge SC600
 		1028 002e  Optiplex GX260
+		1028 0134  PowerEdge 600SC
 		1028 0151  PRO/1000 MT Network Connection
 		107b 8920  PRO/1000 MT Desktop Adapter
 		8086 001e  PRO/1000 MT Desktop Adapter
@@ -10083,8 +10476,8 @@
 		4c53 1080  CT8 mainboard
 		4c53 10a0  CA3/CR3 mainboard
 		8086 1011  PRO/1000 MT Dual Port Server Adapter
-		8086 1012  Primergy RX300
-		8086 101a  PRO/1000 MT Dual Port Network Adapter
+		8086 1012  PRO/1000 MT Dual Port Server Adapter
+		8086 101a  PRO/1000 MT Dual Port Network Connection
 		8086 3424  SE7501HG2 Mainboard
 	1011  82545EM Gigabit Ethernet Controller (Fiber)
 		1014 0268  iSeries Gigabit Ethernet Adapter
@@ -10093,21 +10486,24 @@
 	1012  82546EB Gigabit Ethernet Controller (Fiber)
 		0e11 00dc  NC6170 Gigabit Server Adapter
 		8086 1012  PRO/1000 MF Dual Port Server Adapter
-	1013  82541EI Gigabit Ethernet Controller (Copper)
+	1013  82541EI Gigabit Ethernet Controller
 		8086 0013  PRO/1000 MT Network Connection
-		8086 1013  IBM ThinkCentre Network Card
+		8086 1013  PRO/1000 MT Network Connection
 		8086 1113  PRO/1000 MT Desktop Adapter
 	1014  82541ER Gigabit Ethernet Controller
+		8086 0014  PRO/1000 MT Desktop Connection
+		8086 1014  PRO/1000 MT Network Connection
 	1015  82540EM Gigabit Ethernet Controller (LOM)
-	1016  82540EP Gigabit Ethernet Controller (LOM)
+		8086 1015  PRO/1000 MT Mobile Connection
+	1016  82540EP Gigabit Ethernet Controller (Mobile)
 		1014 052c  PRO/1000 MT Mobile Connection
 		1179 0001  PRO/1000 MT Mobile Connection
 		8086 1016  PRO/1000 MT Mobile Connection
-	1017  82540EP Gigabit Ethernet Controller (LOM)
+	1017  82540EP Gigabit Ethernet Controller
 		8086 1017  PR0/1000 MT Desktop Connection
 	1018  82541EI Gigabit Ethernet Controller
-		8086 1018  PRO/1000 MT Desktop Adapter
-	1019  82547EI Gigabit Ethernet Controller (LOM)
+		8086 1018  PRO/1000 MT Mobile Connection
+	1019  82547EI Gigabit Ethernet Controller
 		1458 1019  GA-8IPE1000 Pro2 motherboard (865PE)
 		1458 e000  Intel Gigabit Ethernet (Kenai II)
 		8086 1019  PRO/1000 CT Desktop Connection
@@ -10115,6 +10511,7 @@
 		8086 302c  Intel 82865G Mainboard (D865GBF)
 		8086 3427  S875WP1-E mainboard
 	101a  82547EI Gigabit Ethernet Controller (Mobile)
+		8086 101a  PRO/1000 CT Mobile Connection
 	101d  82546EB Gigabit Ethernet Controller
 		8086 1000  PRO/1000 MT Quad Port Server Adapter
 	101e  82540EP Gigabit Ethernet Controller (Mobile)
@@ -10126,6 +10523,7 @@
 		8086 1000  PRO/1000 MT Server Connection
 		8086 1001  PRO/1000 MT Server Adapter
 		8086 1002  PRO/1000 MT Server Adapter
+		8086 1003  PRO/1000 GT Server Adapter
 		8086 1026  PRO/1000 MT Server Connection
 	1027  82545GM Gigabit Ethernet Controller
 		103c 3103  NC310F PCI-X Gigabit Server Adapter
@@ -10134,7 +10532,7 @@
 		8086 1003  PRO/1000 MF Server Adapter(LX)
 		8086 1027  PRO/1000 MF Server Adapter
 	1028  82545GM Gigabit Ethernet Controller
-		8086 1028  PRO/1000 MB Server Adapter
+		8086 1028  PRO/1000 MB Server Connection
 	1029  82559 Ethernet Controller
 	1030  82559 InBusiness 10/100
 	1031  82801CAM (ICH3) PRO/100 VE (LOM) Ethernet Controller
@@ -10150,7 +10548,7 @@
 	1032  82801CAM (ICH3) PRO/100 VE Ethernet Controller
 	1033  82801CAM (ICH3) PRO/100 VM (LOM) Ethernet Controller
 	1034  82801CAM (ICH3) PRO/100 VM Ethernet Controller
-	1035  82801CAM (ICH3)/82562EH (LOM)  Ethernet Controller
+	1035  82801CAM (ICH3)/82562EH (LOM) Ethernet Controller
 	1036  82801CAM (ICH3) 82562EH Ethernet Controller
 	1037  82801CAM (ICH3) Chipset Ethernet Controller
 	1038  82801CAM (ICH3) PRO/100 VM (KM) Ethernet Controller
@@ -10161,15 +10559,21 @@
 	103b  82801DB PRO/100 VM (LOM) Ethernet Controller
 	103c  82801DB PRO/100 VM (CNR) Ethernet Controller
 	103d  82801DB PRO/100 VE (MOB) Ethernet Controller
+		1014 0522  Thinkpad R50e model 1634
 	103e  82801DB PRO/100 VM (MOB) Ethernet Controller
 	1040  536EP Data Fax Modem
 		16be 1040  V.9X DSP Data Fax Modem
 	1043  PRO/Wireless LAN 2100 3B Mini PCI Adapter
+		103c 08b0  tc1100 tablet
 		8086 2527  MIM2000/Centrino
 	1048  PRO/10GbE LR Server Adapter
 		8086 a01f  PRO/10GbE LR Server Adapter
 		8086 a11f  PRO/10GbE LR Server Adapter
-	104b  Ethernet Controller
+	1049  82566MM Gigabit Network Connection
+	104a  82566DM Gigabit Network Connection
+	104b  82566DC Gigabit Network Connection
+	104c  82562V 10/100 Network Connection
+	104d  82566MC Gigabit Network Connection
 	1050  82562EZ 10/100 Ethernet Controller
 		1462 728c  865PE Neo2 (MS-6728)
 		1462 758c  MS-6758 (875P Neo)
@@ -10180,10 +10584,24 @@
 	1052  PRO/100 VM Network Connection
 	1053  PRO/100 VM Network Connection
 	1059  82551QM Ethernet Controller
+	105b  82546GB Gigabit Ethernet Controller (Copper)
 	105e  82571EB Gigabit Ethernet Controller
+		103c 7044  NC360T PCI Express Dual Port Gigabit Server Adapter
 		1775 6003  Telum GE-QT
+		8086 005e  PRO/1000 PT Dual Port Server Connection
+		8086 105e  PRO/1000 PT Dual Port Network Connection
+		8086 115e  PRO/1000 PT Dual Port Server Adapter
+		8086 116e  PRO/1000 PT Dual Port Server Adapter
+		8086 125e  PRO/1000 PT Dual Port Server Adapter
+		8086 135e  PRO/1000 PT Dual Port Server Adapter
 	105f  82571EB Gigabit Ethernet Controller
+		8086 115f  PRO/1000 PF Dual Port Server Adapter
+		8086 116f  PRO/1000 PF Dual Port Server Adapter
+		8086 125f  PRO/1000 PF Dual Port Server Adapter
+		8086 135f  PRO/1000 PF Dual Port Server Adapter
 	1060  82571EB Gigabit Ethernet Controller
+		8086 0060  PRO/1000 PB Dual Port Server Connection
+		8086 1060  PRO/1000 PB Dual Port Server Connection
 	1064  82562ET/EZ/GT/GZ - PRO/100 VE (LOM) Ethernet Controller
 		1043 80f8  P5GD1-VW Mainboard
 	1065  82562ET/EZ/GT/GZ - PRO/100 VE Ethernet Controller
@@ -10197,61 +10615,74 @@
 		1028 0165  PowerEdge 750
 		8086 0075  PRO/1000 CT Network Connection
 		8086 1075  PRO/1000 CT Network Connection
-	1076  82541GI/PI Gigabit Ethernet Controller
+	1076  82541GI Gigabit Ethernet Controller
 		1028 0165  PowerEdge 750
 		1028 019a  PowerEdge SC1425
 		8086 0076  PRO/1000 MT Network Connection
 		8086 1076  PRO/1000 MT Network Connection
 		8086 1176  PRO/1000 MT Desktop Adapter
-		8086 1276  PRO/1000 MT Desktop Adapter
+		8086 1276  PRO/1000 MT Network Adapter
 	1077  82541GI Gigabit Ethernet Controller
 		1179 0001  PRO/1000 MT Mobile Connection
 		8086 0077  PRO/1000 MT Mobile Connection
 		8086 1077  PRO/1000 MT Mobile Connection
-	1078  82541EI Gigabit Ethernet Controller
-		8086 1078  PRO/1000 MT Network Connection
+	1078  82541ER Gigabit Ethernet Controller
+		8086 1078  82541ER-based Network Connection
 	1079  82546GB Gigabit Ethernet Controller
-		103c 12a6  HP Dual Port 1000Base-T [A9900A]
-		103c 12cf  HP Core Dual Port 1000Base-T [AB352A]
+		103c 12a6  Dual Port 1000Base-T [A9900A]
+		103c 12cf  Core Dual Port 1000Base-T [AB352A]
+		1775 10d0  V5D Single Board Computer Gigabit Ethernet
+		1775 ce90  CE9
 		1fc1 0027  Niagara 2261 Failover NIC
 		4c53 1090  Cx9 / Vx9 mainboard
 		4c53 10b0  CL9 mainboard
 		8086 0079  PRO/1000 MT Dual Port Network Connection
 		8086 1079  PRO/1000 MT Dual Port Network Connection
-		8086 1179  PRO/1000 MT Dual Port Network Connection
+		8086 1179  PRO/1000 MT Dual Port Server Adapter
 		8086 117a  PRO/1000 MT Dual Port Server Adapter
 	107a  82546GB Gigabit Ethernet Controller
-		103c 12a8  HP Dual Port 1000base-SX [A9899A]
+		103c 12a8  Dual Port 1000base-SX [A9899A]
 		8086 107a  PRO/1000 MF Dual Port Server Adapter
 		8086 127a  PRO/1000 MF Dual Port Server Adapter
 	107b  82546GB Gigabit Ethernet Controller
 		8086 007b  PRO/1000 MB Dual Port Server Connection
 		8086 107b  PRO/1000 MB Dual Port Server Connection
 	107c  82541PI Gigabit Ethernet Controller
-	107d  82572EI Gigabit Ethernet Controller
-	107e  82572EI Gigabit Ethernet Controller
+		8086 1376  PRO/1000 GT Desktop Adapter
+		8086 1476  PRO/1000 GT Desktop Adapter
+	107d  82572EI Gigabit Ethernet Controller (Copper)
+		8086 1082  PRO/1000 PT Server Adapter
+		8086 1092  PRO/1000 PT Server Adapter
+	107e  82572EI Gigabit Ethernet Controller (Fiber)
+		8086 1084  PRO/1000 PF Server Adapter
+		8086 1094  PRO/1000 PF Server Adapter
 	107f  82572EI Gigabit Ethernet Controller
 	1080  FA82537EP 56K V.92 Data/Fax Modem PCI
-	1081  Enterprise Southbridge LAN Copper
-	1082  Enterprise Southbridge LAN fiber
-	1083  Enterprise Southbridge LAN SERDES
-	1084  Enterprise Southbridge IDE Redirection
-	1085  Enterprise Southbridge Serial Port Redirection
-	1086  Enterprise Southbridge IPMI/KCS0
-	1087  Enterprise Southbridge UHCI Redirection
-	1089  Enterprise Southbridge BT
-	108a  82546EB Gigabit Ethernet Controller
+	1081  631xESB/632xESB LAN Controller Copper
+	1082  631xESB/632xESB LAN Controller fiber
+	1083  631xESB/632xESB LAN Controller SERDES
+	1084  631xESB/632xESB IDE Redirection
+	1085  631xESB/632xESB Serial Port Redirection
+	1086  631xESB/632xESB IPMI/KCS0
+	1087  631xESB/632xESB UHCI Redirection
+	1089  631xESB/632xESB BT
+	108a  82546GB Gigabit Ethernet Controller
+		8086 108a  PRO/1000 P Dual Port Server Adapter
+		8086 118a  PRO/1000 P Dual Port Server Adapter
 	108b  82573V Gigabit Ethernet Controller (Copper)
 	108c  82573E Gigabit Ethernet Controller (Copper)
 	108e  82573E KCS (Active Management)
-	108f  Intel(R) Active Management Technology - SOL
-	1092  Intel(R) PRO/100 VE Network Connection
-	1096  PRO/1000 EB Network Connection with I/O Acceleration
-	1097  Enterprise Southbridge DPT LAN fiber
-	1098  PRO/1000 EB Backplane Connection with I/O Acceleration
-	1099  82546GB Quad Port Server Adapter
+	108f  Active Management Technology - SOL
+	1092  PRO/100 VE Network Connection
+	1096  80003ES2LAN Gigabit Ethernet Controller (Copper)
+	1097  631xESB/632xESB DPT LAN Controller (Fiber)
+	1098  80003ES2LAN Gigabit Ethernet Controller (Serdes)
+	1099  82546GB Gigabit Ethernet Controller (Copper)
+		8086 1099  PRO/1000 GT Quad Port Server Adapter
 	109a  82573L Gigabit Ethernet Controller
+		17aa 2001  ThinkPad T60
 		17aa 207e  Thinkpad X60s
+		8086 109a  PRO/1000 PL Network Connection
 	109b  82546GB PRO/1000 GF Quad Port Server Adapter
 	10a0  82571EB PRO/1000 AT Quad Port Bypass Adapter
 	10a1  82571EB PRO/1000 AF Quad Port Bypass Adapter
@@ -10259,8 +10690,15 @@
 	10b2  82573V PRO/1000 PM Network Connection
 	10b3  82573E PRO/1000 PM Network Connection
 	10b4  82573L PRO/1000 PL Network Connection
-	10b5  82546GB PRO/1000 GT Quad Port Server Adapter
+	10b5  82546GB Gigabit Ethernet Controller (Copper)
 		103c 3109  NC340T PCI-X Quad-port Gigabit Server Adapter
+		8086 1099  PRO/1000 GT Quad Port Server Adapter
+		8086 1199  PRO/1000 GT Quad Port Server Adapter
+	10b9  82572EI Gigabit Ethernet Controller (Copper)
+		8086 1083  PRO/1000 PT Desktop Adapter
+		8086 1093  PRO/1000 PT Desktop Adapter
+	10ba  80003ES2LAN Gigabit Ethernet Controller (Copper)
+	10bb  80003ES2LAN Gigabit Ethernet Controller (Serdes)
 	1107  PRO/1000 MF Server Adapter (LX)
 	1130  82815 815 Chipset Host Bridge and Memory Controller Hub
 		1025 1016  Travelmate 612 TX
@@ -10278,7 +10716,7 @@
 	1161  82806AA PCI64 Hub Advanced Programmable Interrupt Controller
 		8086 1161  82806AA PCI64 Hub APIC
 	1162  Xscale 80200 Big Endian Companion Chip
-	1200  Intel IXP1200 Network Processor
+	1200  IXP1200 Network Processor
 		172a 0000  AEP SSL Accelerator
 	1209  8255xER/82551IT Fast Ethernet Controller
 		4c53 1050  CT7 mainboard
@@ -10361,6 +10799,7 @@
 		144d 2501  SEM-2000 MiniPCI LAN Adapter
 		144d 2502  SEM-2100IL MiniPCI LAN Adapter
 		1668 1100  EtherExpress PRO/100B (TX) (MiniPCI Ethernet+Modem)
+		1775 ce90  CE9
 		4c53 1080  CT8 mainboard
 		4c53 10e0  PSL09 PrPMC
 		8086 0001  EtherExpress PRO/100B (TX)
@@ -10458,8 +10897,7 @@
 	123b  82380PB PCI to PCI Docking Bridge
 	123c  82380AB (MISA) Mobile PCI-to-ISA Bridge
 	123d  683053 Programmable Interrupt Device
-# in" hidden" mode
-	123e  82466GX (IHPC) Integrated Hot-Plug Controller
+	123e  82466GX (IHPC) Integrated Hot-Plug Controller (hidden mode)
 	123f  82466GX Integrated Hot-Plug Controller (IHPC)
 	1240  82752 (752) AGP Graphics Accelerator
 	124b  82380FB (MPCI2) Mobile Docking Controller
@@ -10484,10 +10922,10 @@
 		1028 0467  PowerEdge Expandable RAID Controller 2/DC
 		1028 1111  PowerEdge Expandable RAID Controller 2/SC
 		103c 03a2  MegaRAID
-		103c 10c6  MegaRAID 438, HP NetRAID-3Si
-		103c 10c7  MegaRAID T5, Integrated HP NetRAID
-		103c 10cc  MegaRAID, Integrated HP NetRAID
-		103c 10cd  HP NetRAID-1Si
+		103c 10c6  MegaRAID 438, NetRAID-3Si
+		103c 10c7  MegaRAID T5, Integrated NetRAID
+		103c 10cc  MegaRAID, Integrated NetRAID
+		103c 10cd  NetRAID-1Si
 		105a 0000  SuperTrak
 		105a 2168  SuperTrak Pro
 		105a 5168  SuperTrak66/100
@@ -10506,7 +10944,7 @@
 	1a30  82845 845 (Brookdale) Chipset Host Bridge
 		1028 010e  Optiplex GX240
 	1a31  82845 845 (Brookdale) Chipset AGP Bridge
-	1a38  Server DMA Engine
+	1a38  5000 Series Chipset DMA Engine
 	1a48  PRO/10GbE SR Server Adapter
 	2410  82801AA ISA Bridge (LPC)
 	2411  82801AA IDE
@@ -10534,6 +10972,7 @@
 	2442  82801BA/BAM USB (Hub #1)
 		1014 01c6  Netvista A40/A40p
 		1025 1016  Travelmate 612 TX
+		1028 00c7  Dimension 8100
 		1028 010e  Optiplex GX240
 		1043 8027  TUSL2-C Mainboard
 		104d 80df  Vaio PCG-FX403
@@ -10543,6 +10982,7 @@
 	2443  82801BA/BAM SMBus
 		1014 01c6  Netvista A40/A40p
 		1025 1016  Travelmate 612 TX
+		1028 00c7  Dimension 8100
 		1028 010e  Optiplex GX240
 		1043 8027  TUSL2-C Mainboard
 		104d 80df  Vaio PCG-FX403
@@ -10551,6 +10991,7 @@
 		8086 4557  D815EGEW Mainboard
 	2444  82801BA/BAM USB (Hub #2)
 		1025 1016  Travelmate 612 TX
+		1028 00c7  Dimension 8100
 		1028 010e  Optiplex GX240
 		1043 8027  TUSL2-C Mainboard
 		104d 80df  Vaio PCG-FX403
@@ -10606,6 +11047,7 @@
 		104d 80df  Vaio PCG-FX403
 	244b  82801BA IDE U100
 		1014 01c6  Netvista A40/A40p
+		1028 00c7  Dimension 8100
 		1028 010e  Optiplex GX240
 		1043 8027  TUSL2-C Mainboard
 		147b 0507  TH7II-RAID
@@ -10678,12 +11120,14 @@
 	24c1  82801DBL (ICH4-L) IDE Controller
 	24c2  82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #1
 		1014 0267  NetVista A30p
+		1014 052d  Thinkpad R50e model 1634
 		1025 005a  TravelMate 290
 		1028 0126  Optiplex GX260
 		1028 0163  Latitude D505
 		1028 0196  Inspiron 5160
 		103c 088c  NC8000 laptop
 		103c 0890  NC6000 laptop
+		103c 08b0  tc1100 tablet
 		1071 8160  MIM2000
 		1462 5800  845PE Max (MS-6580)
 		1509 2990  Averatec 5110H laptop
@@ -10693,10 +11137,12 @@
 		8086 4541  Latitude D400
 	24c3  82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) SMBus Controller
 		1014 0267  NetVista A30p
+		1014 052d  Thinkpad R50e model 1634
 		1025 005a  TravelMate 290
 		1028 0126  Optiplex GX260
 		103c 088c  NC8000 laptop
 		103c 0890  NC6000 laptop
+		103c 08b0  tc1100 tablet
 		1071 8160  MIM2000
 		1458 24c2  GA-8PE667 Ultra
 		1462 5800  845PE Max (MS-6580)
@@ -10705,12 +11151,14 @@
 		4c53 1090  Cx9 / Vx9 mainboard
 	24c4  82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #2
 		1014 0267  NetVista A30p
+		1014 052d  Thinkpad R50e model 1634
 		1025 005a  TravelMate 290
 		1028 0126  Optiplex GX260
 		1028 0163  Latitude D505
 		1028 0196  Inspiron 5160
 		103c 088c  NC8000 laptop
 		103c 0890  NC6000 laptop
+		103c 08b0  tc1100 tablet
 		1071 8160  MIM2000
 		1462 5800  845PE Max (MS-6580)
 		1509 2990  Averatec 5110H
@@ -10720,32 +11168,38 @@
 	24c5  82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Audio Controller
 		0e11 00b8  Analog Devices Inc. codec [SoundMAX]
 		1014 0267  NetVista A30p
+		1014 055f  Thinkpad R50e model 1634
 		1025 005a  TravelMate 290
 		1028 0139  Latitude D400
 		1028 0163  Latitude D505
 		1028 0196  Inspiron 5160
 		103c 088c  NC8000 laptop
 		103c 0890  NC6000 laptop
+		103c 08b0  tc1100 tablet
 		1071 8160  MIM2000
 		1458 a002  GA-8PE667 Ultra
 		1462 5800  845PE Max (MS-6580)
 		1734 1005  D1451 (SCENIC N300, i845GV) Sigmatel STAC9750T
 		1734 1055  Amilo M1420
 	24c6  82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller
+		1014 0559  Thinkpad R50e model 1634
 		1025 003c  Aspire 2001WLCi (Compal CL50 motherboard) implementation
 		1025 005a  TravelMate 290
 		1028 0196  Inspiron 5160
 		103c 088c  NC8000 laptop
 		103c 0890  NC6000 laptop
+		103c 08b0  tc1100 tablet
 		1071 8160  MIM2000
 	24c7  82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #3
 		1014 0267  NetVista A30p
+		1014 052d  Thinkpad R50e model 1634
 		1025 005a  TravelMate 290
 		1028 0126  Optiplex GX260
 		1028 0163  Latitude D505
 		1028 0196  Inspiron 5160
 		103c 088c  NC8000 laptop
 		103c 0890  NC6000 laptop
+		103c 08b0  tc1100 tablet
 		1071 8160  MIM2000
 		1462 5800  845PE Max (MS-6580)
 		1509 2990  Averatec 5110H
@@ -10753,11 +11207,13 @@
 		4c53 1090  Cx9 / Vx9 mainboard
 		8086 4541  Latitude D400
 	24ca  82801DBM (ICH4-M) IDE Controller
+		1014 052d  Thinkpad R50e model 1634
 		1025 005a  TravelMate 290
 		1028 0163  Latitude D505
 		1028 0196  Inspiron 5160
 		103c 088c  NC8000 laptop
 		103c 0890  NC6000 laptop
+		103c 08b0  tc1100 tablet
 		1071 8160  MIM2000
 		1734 1055  Amilo M1420
 		8086 4541  Latitude D400
@@ -10772,6 +11228,7 @@
 		1734 1055  Amilo M1420
 	24cd  82801DB/DBM (ICH4/ICH4-M) USB2 EHCI Controller
 		1014 0267  NetVista A30p
+		1014 052e  Thinkpad R50e model 1634
 		1025 005a  TravelMate 290
 		1028 011d  Latitude D600
 		1028 0126  Optiplex GX260
@@ -10780,7 +11237,9 @@
 		1028 0196  Inspiron 5160
 		103c 088c  NC8000 laptop
 		103c 0890  NC6000 laptop
+		103c 08b0  tc1100 tablet
 		1071 8160  MIM2000
+		1179 ff00  Satellite 2430
 		1462 3981  845PE Max (MS-6580)
 		1509 1968  Averatec 5110H
 		1734 1004  D1451 Mainboard (SCENIC N300, i845GV)
@@ -10797,6 +11256,7 @@
 		15d9 4580  P4SCE Mainboard
 		8086 3427  S875WP1-E mainboard
 		8086 4246  Desktop Board D865GBF
+		8086 4c43  Desktop Board D865GLC
 		8086 524c  D865PERL mainboard
 	24d2  82801EB/ER (ICH5/ICH5R) USB UHCI Controller #1
 		1014 02ed  xSeries server mainboard
@@ -10812,6 +11272,7 @@
 		1734 101c  Primergy RX300 S2
 		8086 3427  S875WP1-E mainboard
 		8086 4246  Desktop Board D865GBF
+		8086 4c43  Desktop Board D865GLC
 		8086 524c  D865PERL mainboard
 	24d3  82801EB/ER (ICH5/ICH5R) SMBus Controller
 		1014 02ed  xSeries server mainboard
@@ -10824,6 +11285,7 @@
 		1734 101c  Primergy RX300 S2
 		8086 3427  S875WP1-E mainboard
 		8086 4246  Desktop Board D865GBF
+		8086 4c43  Desktop Board D865GLC
 		8086 524c  D865PERL mainboard
 	24d4  82801EB/ER (ICH5/ICH5R) USB UHCI Controller #2
 		1014 02ed  xSeries server mainboard
@@ -10839,6 +11301,7 @@
 		1734 101c  Primergy RX300 S2
 		8086 3427  S875WP1-E mainboard
 		8086 4246  Desktop Board D865GBF
+		8086 4c43  Desktop Board D865GLC
 		8086 524c  D865PERL mainboard
 	24d5  82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller
 		1028 0169  Precision 470
@@ -10852,6 +11315,7 @@
 		8086 a000  D865PERL mainboard
 		8086 e000  D865PERL mainboard
 		8086 e001  Desktop Board D865GBF
+		8086 e002  SoundMax Intergrated Digital Audio
 	24d6  82801EB/ER (ICH5/ICH5R) AC'97 Modem Controller
 		103c 006a  NX9500
 	24d7  82801EB/ER (ICH5/ICH5R) USB UHCI Controller #3
@@ -10867,6 +11331,7 @@
 		1734 101c  Primergy RX300 S2
 		8086 3427  S875WP1-E mainboard
 		8086 4246  Desktop Board D865GBF
+		8086 4c43  Desktop Board D865GLC
 		8086 524c  D865PERL mainboard
 	24db  82801EB/ER (ICH5/ICH5R) IDE Controller
 		1014 02ed  xSeries server mainboard
@@ -10883,6 +11348,7 @@
 		8086 24db  P4C800 Mainboard
 		8086 3427  S875WP1-E mainboard
 		8086 4246  Desktop Board D865GBF
+		8086 4c43  Desktop Board D865GLC
 		8086 524c  D865PERL mainboard
 	24dc  82801EB (ICH5) LPC Interface Bridge
 	24dd  82801EB/ER (ICH5/ICH5R) USB2 EHCI Controller
@@ -10897,6 +11363,7 @@
 		1462 7280  865PE Neo2 (MS-6728)
 		8086 3427  S875WP1-E mainboard
 		8086 4246  Desktop Board D865GBF
+		8086 4c43  Desktop Board D865GLC
 		8086 524c  D865PERL mainboard
 	24de  82801EB/ER (ICH5/ICH5R) USB UHCI Controller #4
 		1014 02ed  xSeries server mainboard
@@ -10908,6 +11375,7 @@
 		1734 101c  Primergy RX300 S2
 		8086 3427  S875WP1-E mainboard
 		8086 4246  Desktop Board D865GBF
+		8086 4c43  Desktop Board D865GLC
 		8086 524c  D865PERL mainboard
 	24df  82801ER (ICH5R) SATA Controller
 	2500  82820 820 (Camino) Chipset Host Bridge (MCH)
@@ -10920,6 +11388,7 @@
 	2520  82805AA MTH Memory Translator Hub
 	2521  82804AA MRH-S Memory Repeater Hub for SDRAM
 	2530  82850 850 (Tehama) Chipset Host Bridge (MCH)
+		1028 00c7  Dimension 8100
 		147b 0507  TH7II-RAID
 	2531  82860 860 (Wombat) Chipset Host Bridge (MCH)
 	2532  82850 850 (Tehama) Chipset AGP Bridge
@@ -10966,6 +11435,7 @@
 		103c 12bc  D530 sff(dc578av)
 		1043 80a5  P5P800-MX Mainboard
 		8086 4246  Desktop Board D865GBF
+		8086 4c43  Desktop Board D865GLC
 	2573  82865G/PE/P PCI to CSA Bridge
 	2576  82865G/PE/P Processor to I/O Memory Interface
 	2578  82875P/E7210 Memory Controller Hub
@@ -10975,19 +11445,19 @@
 	2579  82875P Processor to AGP Controller
 	257b  82875P/E7210 Processor to PCI to CSA Bridge
 	257e  82875P/E7210 Processor to I/O Memory Interface
-	2580  915G/P/GV/GL/PL/910GL Express Memory Controller Hub
+	2580  82915G/P/GV/GL/PL/910GL Memory Controller Hub
 		1458 2580  GA-8I915ME-G Mainboard
 		1462 7028  915P/G Neo2
 		1734 105b  Scenic W620
-	2581  915G/P/GV/GL/PL/910GL Express PCI Express Root Port
-	2582  82915G/GV/910GL Express Chipset Family Graphics Controller
+	2581  82915G/P/GV/GL/PL/910GL PCI Express Root Port
+	2582  82915G/GV/910GL Integrated Graphics Controller
 		1028 1079  Optiplex GX280
 		103c 3006  DC7100 SFF(DX878AV)
 		1043 2582  P5GD1-VW Mainboard
 		1458 2582  GA-8I915ME-G Mainboard
 		1734 105b  Scenic W620
-	2584  925X/XE Express Memory Controller Hub
-	2585  925X/XE Express PCI Express Root Port
+	2584  82925X/XE Memory Controller Hub
+	2585  82925X/XE PCI Express Root Port
 	2588  E7220/E7221 Memory Controller Hub
 	2589  E7220/E7221 PCI Express Root Port
 	258a  E7221 Integrated Graphics Controller
@@ -11002,35 +11472,50 @@
 		1043 1881  GMA 900 915GM Integrated Graphics
 	25a1  6300ESB LPC Interface Controller
 	25a2  6300ESB PATA Storage Controller
+		1775 10d0  V5D Single Board Computer IDE
+		1775 ce90  CE9
 		4c53 10b0  CL9 mainboard
 		4c53 10e0  PSL09 PrPMC
 	25a3  6300ESB SATA Storage Controller
+		1775 ce90  CE9
 		4c53 10b0  CL9 mainboard
 		4c53 10d0  Telum ASLP10 Processor AMC
 		4c53 10e0  PSL09 PrPMC
 	25a4  6300ESB SMBus Controller
+		1775 10d0  V5D Single Board Computer
+		1775 ce90  CE9
 		4c53 10b0  CL9 mainboard
 		4c53 10d0  Telum ASLP10 Processor AMC
 		4c53 10e0  PSL09 PrPMC
 	25a6  6300ESB AC'97 Audio Controller
+		1775 ce90  CE9
 		4c53 10b0  CL9 mainboard
 	25a7  6300ESB AC'97 Modem Controller
 	25a9  6300ESB USB Universal Host Controller
+		1775 10d0  V5D Single Board Computer USB
+		1775 ce90  CE9
 		4c53 10b0  CL9 mainboard
 		4c53 10d0  Telum ASLP10 Processor AMC
 		4c53 10e0  PSL09 PrPMC
 	25aa  6300ESB USB Universal Host Controller
+		1775 ce90  CE9
 		4c53 10b0  CL9 mainboard
 		4c53 10e0  PSL09 PrPMC
 	25ab  6300ESB Watchdog Timer
+		1775 10d0  V5D Single Board Computer
+		1775 ce90  CE9
 		4c53 10b0  CL9 mainboard
 		4c53 10d0  Telum ASLP10 Processor AMC
 		4c53 10e0  PSL09 PrPMC
 	25ac  6300ESB I/O Advanced Programmable Interrupt Controller
+		1775 10d0  V5D Single Board Computer
+		1775 ce90  CE9
 		4c53 10b0  CL9 mainboard
 		4c53 10d0  Telum ASLP10 Processor AMC
 		4c53 10e0  PSL09 PrPMC
 	25ad  6300ESB USB2 Enhanced Host Controller
+		1775 10d0  V5D Single Board Computer USB 2.0
+		1775 ce90  CE9
 		4c53 10b0  CL9 mainboard
 		4c53 10d0  Telum ASLP10 Processor AMC
 		4c53 10e0  PSL09 PrPMC
@@ -11038,26 +11523,25 @@
 	25b0  6300ESB SATA RAID Controller
 		4c53 10d0  Telum ASLP10 Processor AMC
 		4c53 10e0  PSL09 PrPMC
-	25c0  Workstation Memory Controller Hub
-	25d0  Server Memory Controller Hub
-	25d4  Server Memory Contoller Hub
-	25d8  Server Memory Controller Hub
-	25e2  Server PCI Express x4 Port 2
-	25e3  Server PCI Express x4 Port 3
-	25e4  Server PCI Express x4 Port 4
-	25e5  Server PCI Express x4 Port 5
-	25e6  Server PCI Express x4 Port 6
-	25e7  Server PCI Express x4 Port 7
-	25e8  Server AMB Memory Mapped Registers
-	25f0  Server Error Reporting Registers
-	25f1  Reserved Registers
-	25f3  Reserved Registers
-	25f5  Server FBD Registers
-	25f6  Server FBD Registers
-	25f7  Server PCI Express x8 Port 2-3
-	25f8  Server PCI Express x8 Port 4-5
-	25f9  Server PCI Express x8 Port 6-7
-	25fa  Server PCI Express x16 Port 4-7
+	25c0  5000X Chipset Memory Controller Hub
+	25d0  5000Z Chipset Memory Controller Hub
+	25d4  5000V Chipset Memory Controller Hub
+	25d8  5000P Chipset Memory Controller Hub
+	25e2  5000 Series Chipset PCI Express x4 Port 2
+	25e3  5000 Series Chipset PCI Express x4 Port 3
+	25e4  5000 Series Chipset PCI Express x4 Port 4
+	25e5  5000 Series Chipset PCI Express x4 Port 5
+	25e6  5000 Series Chipset PCI Express x4 Port 6
+	25e7  5000 Series Chipset PCI Express x4 Port 7
+	25f0  5000 Series Chipset Error Reporting Registers
+	25f1  5000 Series Chipset Reserved Registers
+	25f3  5000 Series Chipset Reserved Registers
+	25f5  5000 Series Chipset FBD Registers
+	25f6  5000 Series Chipset FBD Registers
+	25f7  5000 Series Chipset PCI Express x8 Port 2-3
+	25f8  5000 Series Chipset PCI Express x8 Port 4-5
+	25f9  5000 Series Chipset PCI Express x8 Port 6-7
+	25fa  5000X Chipset PCI Express x16 Port 4-7
 	2600  E8500/E8501 Hub Interface 1.5
 	2601  E8500/E8501 PCI Express x4 Port D
 	2602  E8500/E8501 PCI Express x4 Port C0
@@ -11141,12 +11625,15 @@
 		1458 5006  GA-8I915ME-G Mainboard
 		1462 7028  915P/G Neo2
 		1734 105c  Scenic W620
+		8086 265c  Dimension 3100
 	2660  82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 1
 		103c 099c  NX6110/NC6120
 	2662  82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 2
 	2664  82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 3
 	2666  82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 4
 	2668  82801FB/FBM/FR/FW/FRW (ICH6 Family) High Definition Audio Controller
+# based on the PTGD1-LA motherboard
+		103c 2a09  PufferM-UL8E
 		1043 814e  P5GD1-VW Mainboard
 	266a  82801FB/FBM/FR/FW/FRW (ICH6 Family) SMBus Controller
 		1028 0179  Optiplex GX280
@@ -11175,161 +11662,193 @@
 		1458 266f  GA-8I915ME-G Mainboard
 		1462 7028  915P/G Neo2
 		1734 105c  Scenic W620
-	2670  Enterprise Southbridge LPC
-	2680  Enterprise Southbridge SATA IDE
-	2681  Enterprise Southbridge SATA AHCI
-	2682  Enterprise Southbridge SATA RAID
-	2683  Enterprise Southbridge SATA RAID
-	2688  Enterprise Southbridge UHCI USB #1
-	2689  Enterprise Southbridge UHCI USB #2
-	268a  Enterprise Southbridge UHCI USB #3
-	268b  Enterprise Southbridge UHCI USB #4
-	268c  Enterprise Southbridge EHCI USB
-	2690  Enterprise Southbridge PCI Express Root Port 1
-	2692  Enterprise Southbridge PCI Express Root Port 2
-	2694  Enterprise Southbridge PCI Express Root Port 3
-	2696  Enterprise Southbridge PCI Express Root Port 4
-	2698  Enterprise Southbridge AC '97 Audio
-	2699  Enterprise Southbridge AC '97 Modem
-	269a  Enterprise Southbridge High Definition Audio
-	269b  Enterprise Southbridge SMBus
-	269e  Enterprise Southbridge PATA
-	2770  945G/GZ/P/PL Express Memory Controller Hub
+	2670  631xESB/632xESB/3100 Chipset LPC Interface Controller
+	2680  631xESB/632xESB/3100 Chipset SATA Storage Controller IDE
+	2681  631xESB/632xESB SATA Storage Controller AHCI
+	2682  631xESB/632xESB SATA Storage Controller RAID
+	2683  631xESB/632xESB SATA Storage Controller RAID
+	2688  631xESB/632xESB/3100 Chipset UHCI USB Controller #1
+	2689  631xESB/632xESB/3100 Chipset UHCI USB Controller #2
+	268a  631xESB/632xESB/3100 Chipset UHCI USB Controller #3
+	268b  631xESB/632xESB/3100 Chipset UHCI USB Controller #4
+	268c  631xESB/632xESB/3100 Chipset EHCI USB2 Controller
+	2690  631xESB/632xESB/3100 Chipset PCI Express Root Port 1
+	2692  631xESB/632xESB/3100 Chipset PCI Express Root Port 2
+	2694  631xESB/632xESB/3100 Chipset PCI Express Root Port 3
+	2696  631xESB/632xESB/3100 Chipset PCI Express Root Port 4
+	2698  631xESB/632xESB AC '97 Audio Controller
+	2699  631xESB/632xESB AC '97 Modem Controller
+	269a  631xESB/632xESB High Definition Audio Controller
+	269b  631xESB/632xESB/3100 Chipset SMBus Controller
+	269e  631xESB/632xESB IDE Controller
+	2770  82945G/GZ/P/PL Memory Controller Hub
+		107b 5048  E4500
 		8086 544e  DeskTop Board D945GTP
-	2771  945G/GZ/P/PL Express PCI Express Root Port
-	2772  945G/GZ Express Integrated Graphics Controller
+	2771  82945G/GZ/P/PL PCI Express Root Port
+	2772  82945G/GZ Integrated Graphics Controller
 		8086 544e  DeskTop Board D945GTP
-	2774  955X Express Memory Controller Hub
-	2775  955X Express PCI Express Root Port
-	2776  945G/GZ Express Integrated Graphics Controller
-	2778  E7230 Memory Controller Hub
-	2779  E7230 PCI Express Root Port
-	277a  975X Express PCI Express Root Port
-	277c  975X Express Memory Controller Hub
-	277d  975X Express PCI Express Root Port
-	2782  82915G Express Chipset Family Graphics Controller
+	2774  82955X Memory Controller Hub
+	2775  82955X PCI Express Root Port
+	2776  82945G/GZ Integrated Graphics Controller
+	2778  E7230/3000/3010 Memory Controller Hub
+	2779  E7230/3000/3010 PCI Express Root Port
+	277a  82975X/3010 PCI Express Root Port
+	277c  82975X Memory Controller Hub
+	277d  82975X PCI Express Root Port
+	2782  82915G Integrated Graphics Controller
 		1043 2582  P5GD1-VW Mainboard
 		1734 105b  Scenic W620
 	2792  Mobile 915GM/GMS/910GML Express Graphics Controller
 		103c 099c  NX6110/NC6120
 		1043 1881  GMA 900 915GM Integrated Graphics
 	27a0  Mobile 945GM/PM/GMS/940GML and 945GT Express Memory Controller Hub
+		17aa 2017  Thinkpad R60e model 0657
 	27a1  Mobile 945GM/PM/GMS/940GML and 945GT Express PCI Express Root Port
 	27a2  Mobile 945GM/GMS/940GML Express Integrated Graphics Controller
+		17aa 201a  Thinkpad R60e model 0657
 	27a6  Mobile 945GM/GMS/940GML Express Integrated Graphics Controller
+		17aa 201a  Thinkpad R60e model 0657
 	27b0  82801GH (ICH7DH) LPC Interface Bridge
 	27b8  82801GB/GR (ICH7 Family) LPC Interface Bridge
+		107b 5048  E4500
 		8086 544e  DeskTop Board D945GTP
 	27b9  82801GBM (ICH7-M) LPC Interface Bridge
+		17aa 2009  ThinkPad T60/R60 series
 	27bd  82801GHM (ICH7-M DH) LPC Interface Bridge
 	27c0  82801GB/GR/GH (ICH7 Family) Serial ATA Storage Controller IDE
+		107b 5048  E4500
 		8086 544e  DeskTop Board D945GTP
 	27c1  82801GR/GH (ICH7 Family) Serial ATA Storage Controller AHCI
 	27c3  82801GR/GH (ICH7 Family) Serial ATA Storage Controller RAID
 	27c4  82801GBM/GHM (ICH7 Family) Serial ATA Storage Controller IDE
 	27c5  82801GBM/GHM (ICH7 Family) Serial ATA Storage Controller AHCI
+		17aa 200d  Thinkpad R60e model 0657
 	27c6  82801GHM (ICH7-M DH) Serial ATA Storage Controller RAID
 	27c8  82801G (ICH7 Family) USB UHCI #1
+		107b 5048  E4500
+		17aa 200a  ThinkPad T60/R60 series
 		8086 544e  DeskTop Board D945GTP
 	27c9  82801G (ICH7 Family) USB UHCI #2
+		107b 5048  E4500
+		17aa 200a  ThinkPad T60/R60 series
 		8086 544e  DeskTop Board D945GTP
 	27ca  82801G (ICH7 Family) USB UHCI #3
+		107b 5048  E4500
+		17aa 200a  ThinkPad T60/R60 series
 		8086 544e  DeskTop Board D945GTP
 	27cb  82801G (ICH7 Family) USB UHCI #4
+		107b 5048  E4500
+		17aa 200a  ThinkPad T60/R60 series
 		8086 544e  DeskTop Board D945GTP
 	27cc  82801G (ICH7 Family) USB2 EHCI Controller
+		17aa 200b  ThinkPad T60/R60 series
 		8086 544e  DeskTop Board D945GTP
 	27d0  82801G (ICH7 Family) PCI Express Port 1
 	27d2  82801G (ICH7 Family) PCI Express Port 2
 	27d4  82801G (ICH7 Family) PCI Express Port 3
 	27d6  82801G (ICH7 Family) PCI Express Port 4
 	27d8  82801G (ICH7 Family) High Definition Audio Controller
+		107b 5048  E4500
+		152d 0753  Softmodem
+		17aa 2010  ThinkPad T60/R60 series
 	27da  82801G (ICH7 Family) SMBus Controller
+		17aa 200f  ThinkPad T60/R60 series
 		8086 544e  DeskTop Board D945GTP
 	27dc  82801G (ICH7 Family) LAN Controller
 		8086 308d  DeskTop Board D945GTP
 	27dd  82801G (ICH7 Family) AC'97 Modem Controller
 	27de  82801G (ICH7 Family) AC'97 Audio Controller
 	27df  82801G (ICH7 Family) IDE Controller
+		107b 5048  E4500
+		17aa 200c  Thinkpad R60e model 0657
 		8086 544e  DeskTop Board D945GTP
 	27e0  82801GR/GH/GHM (ICH7 Family) PCI Express Port 5
 	27e2  82801GR/GH/GHM (ICH7 Family) PCI Express Port 6
-	2810  LPC Interface Controller
+	2810  82801HB/HR (ICH8/R) LPC Interface Controller
 	2811  Mobile LPC Interface Controller
-	2812  LPC Interface Controller
-	2814  LPC Interface Controller
+	2812  82801HH (ICH8DH) LPC Interface Controller
+	2814  82801HO (ICH8DO) LPC Interface Controller
 	2815  Mobile LPC Interface Controller
-	2820  SATA Controller 1 IDE
-	2821  SATA Controller AHCI
-	2822  SATA Controller RAID
-	2824  SATA Controller AHCI
-	2825  SATA Controller 2 IDE
-	2828  Mobile SATA Controller IDE
-	2829  Mobile SATA Controller AHCI
-	282a  Mobile SATA Controller RAID
-	2830  USB UHCI Controller #1
-	2831  USB UHCI Controller #2
-	2832  USB UHCI Controller #3
-	2834  USB UHCI Controller #4
-	2835  USB UHCI Controller #5
-	2836  USB2 EHCI Controller #1
-	283a  USB2 EHCI Controller #2
-	283e  SMBus Controller
-	283f  PCI Express Port 1
-	2841  PCI Express Port 2
-	2843  PCI Express Port 3
-	2845  PCI Express Port 4
-	2847  PCI Express Port 5
-	2849  PCI Express Port 6
-	284b  HD Audio Controller
-	284f  Thermal Subsystem
+	2820  82801H (ICH8 Family) 4 port SATA IDE Controller
+	2821  82801HB (ICH8) SATA AHCI Controller
+	2822  82801HR/HO/HH (ICH8R/DO/DH) SATA RAID Controller
+	2824  82801HR/HO/HH (ICH8R/DO/DH) SATA AHCI Controller
+	2825  82801H (ICH8 Family) 2 port SATA IDE Controller
+	2828  Mobile SATA IDE Controller
+	2829  Mobile SATA AHCI Controller
+	282a  Mobile SATA RAID Controller
+	2830  82801H (ICH8 Family) USB UHCI #1
+	2831  82801H (ICH8 Family) USB UHCI #2
+	2832  82801H (ICH8 Family) USB UHCI #3
+	2834  82801H (ICH8 Family) USB UHCI #4
+	2835  82801H (ICH8 Family) USB UHCI #5
+	2836  82801H (ICH8 Family) USB2 EHCI #1
+	283a  82801H (ICH8 Family) USB2 EHCI #2
+	283e  82801H (ICH8 Family) SMBus Controller
+	283f  82801H (ICH8 Family) PCI Express Port 1
+	2841  82801H (ICH8 Family) PCI Express Port 2
+	2843  82801H (ICH8 Family) PCI Express Port 3
+	2845  82801H (ICH8 Family) PCI Express Port 4
+	2847  82801H (ICH8 Family) PCI Express Port 5
+	2849  82801H (ICH8 Family) PCI Express Port 6
+	284b  82801H (ICH8 Family) HD Audio Controller
+	284f  82801H (ICH8 Family) Thermal Reporting Device
 	2850  Mobile IDE Controller
-	2970  Memory Controller Hub
-	2971  PCI Express Root Port
-	2972  Integrated Graphics Controller
-	2973  Integrated Graphics Controller
-	2974  HECI Controller
-	2976  PT IDER Controller
-	2977  KT Controller
-	2990  Memory Controller Hub
-	2991  PCI Express Root Port
-	2992  Integrated Graphics Controller
-	2993  Integrated Graphics Controller
-	2994  HECI Controller
-	2995  HECI Controller
-	2996  PT IDER Controller
-	2997  KT Controller
-	29a0  Memory Controller Hub
-	29a1  PCI Express Root Port
-	29a2  Integrated Graphics Controller
-	29a3  Integrated Graphics Controller
-	29a4  HECI Controller
-	29a5  HECI Controller
-	29a6  PT IDER Controller
-	29a7  KT Controller
+	2970  82946GZ/PL/GL Memory Controller Hub
+	2971  82946GZ/PL/GL PCI Express Root Port
+	2972  82946GZ/GL Integrated Graphics Controller
+	2973  82946GZ/GL Integrated Graphics Controller
+	2974  82946GZ/GL HECI Controller
+	2975  82946GZ/GL HECI Controller
+	2976  82946GZ/GL PT IDER Controller
+	2977  82946GZ/GL KT Controller
+	2980  965 G1 Memory Controller Hub
+	2981  965 G1 PCI Express Root Port
+	2982  965 G1 Integrated Graphics Controller
+	2990  82Q963/Q965 Memory Controller Hub
+	2991  82Q963/Q965 PCI Express Root Port
+	2992  82Q963/Q965 Integrated Graphics Controller
+	2993  82Q963/Q965 Integrated Graphics Controller
+	2994  82Q963/Q965 HECI Controller
+	2995  82Q963/Q965 HECI Controller
+	2996  82Q963/Q965 PT IDER Controller
+	2997  82Q963/Q965 KT Controller
+	29a0  82P965/G965 Memory Controller Hub
+	29a1  82P965/G965 PCI Express Root Port
+	29a2  82G965 Integrated Graphics Controller
+	29a3  82G965 Integrated Graphics Controller
+	29a4  82P965/G965 HECI Controller
+	29a5  82P965/G965 HECI Controller
+	29a6  82P965/G965 PT IDER Controller
+	29a7  82P965/G965 KT Controller
 	2a00  Mobile Memory Controller Hub
 	2a01  Mobile PCI Express Root Port
 	2a02  Mobile Integrated Graphics Controller
 	2a03  Mobile Integrated Graphics Controller
+	2a04  Mobile HECI Controller
+	2a05  Mobile HECI Controller
+	2a06  Mobile PT IDER Controller
+	2a07  Mobile KT Controller
 	3092  Integrated RAID
 	3200  GD31244 PCI-X SATA HBA
 	3340  82855PM Processor to I/O Controller
 		1025 005a  TravelMate 290
 		103c 088c  NC8000 laptop
 		103c 0890  NC6000 laptop
+		103c 08b0  tc1100 tablet
 	3341  82855PM Processor to AGP Controller
-	3500  Enterprise Southbridge PCI Express Upstream Port
-	3501  Enterprise Southbridge PCI Express Upstream Port
-	3504  Enterprise Southbridge IOxAPIC
-	3505  Enterprise Southbridge IOxAPIC
-	350c  Enterprise Southbridge PCI Express to PCI-X Bridge
-	350d  Enterprise Southbridge PCI Express to PCI-X Bridge
-	3510  Enterprise Southbridge PCI Express Downstream Port E1
-	3511  Enterprise Southbridge PCI Express Downstream Port E1
-	3514  Enterprise Southbridge PCI Express Downstream Port E2
-	3515  Enterprise Southbridge PCI Express Downstream Port E2
-	3518  Enterprise Southbridge PCI Express Downstream Port E3
-	3519  Enterprise Southbridge PCI Express Downstream Port E3
+	3500  6311ESB/6321ESB PCI Express Upstream Port
+	3501  6310ESB PCI Express Upstream Port
+	3504  6311ESB/6321ESB I/OxAPIC Interrupt Controller
+	3505  6310ESB I/OxAPIC Interrupt Controller
+	350c  6311ESB/6321ESB PCI Express to PCI-X Bridge
+	350d  6310ESB PCI Express to PCI-X Bridge
+	3510  6311ESB/6321ESB PCI Express Downstream Port E1
+	3511  6310ESB PCI Express Downstream Port E1
+	3514  6311ESB/6321ESB PCI Express Downstream Port E2
+	3515  6310ESB PCI Express Downstream Port E2
+	3518  6311ESB/6321ESB PCI Express Downstream Port E3
+	3519  6310ESB PCI Express Downstream Port E3
 	3575  82830 830 Chipset Host Bridge
 		0e11 0030  Evo N600c
 		1014 021d  ThinkPad A/T/X Series
@@ -11339,31 +11858,43 @@
 		1014 0513  ThinkPad A/T/X Series
 	3578  82830 830 Chipset Host Bridge
 	3580  82852/82855 GM/GME/PM/GMV Processor to I/O Controller
+		1014 055c  Thinkpad R50e model 1634
 		1028 0139  Latitude D400
 		1028 0163  Latitude D505
 		1028 0196  Inspiron 5160
 		1734 1055  Amilo M1420
+		1775 10d0  V5D Single Board Computer
+		1775 ce90  CE9
 		4c53 10b0  CL9 mainboard
 		4c53 10e0  PSL09 PrPMC
 	3581  82852/82855 GM/GME/PM/GMV Processor to AGP Controller
 		1734 1055  Amilo M1420
 	3582  82852/855GM Integrated Graphics Device
+		1014 0562  Thinkpad R50e model 1634
 		1028 0139  Latitude D400
 		1028 0163  Latitude D505
+		1775 10d0  V5D Single Board Computer VGA
+		1775 ce90  CE9
 		4c53 10b0  CL9 mainboard
 		4c53 10e0  PSL09 PrPMC
 	3584  82852/82855 GM/GME/PM/GMV Processor to I/O Controller
+		1014 055d  Thinkpad R50e model 1634
 		1028 0139  Latitude D400
 		1028 0163  Latitude D505
 		1028 0196  Inspiron 5160
 		1734 1055  Amilo M1420
+		1775 10d0  V5D Single Board Computer
+		1775 ce90  CE9
 		4c53 10b0  CL9 mainboard
 		4c53 10e0  PSL09 PrPMC
 	3585  82852/82855 GM/GME/PM/GMV Processor to I/O Controller
+		1014 055e  Thinkpad R50e model 1634
 		1028 0139  Latitude D400
 		1028 0163  Latitude D505
 		1028 0196  Inspiron 5160
 		1734 1055  Amilo M1420
+		1775 10d0  V5D Single Board Computer
+		1775 ce90  CE9
 		4c53 10b0  CL9 mainboard
 		4c53 10e0  PSL09 PrPMC
 	3590  E7520 Memory Controller Hub
@@ -11386,6 +11917,12 @@
 	359b  E7525/E7520/E7320 Extended Configuration Registers
 	359e  E7525 Memory Controller Hub
 		1028 0169  Precision 470
+	35b0  3100 Chipset Memory I/O Controller Hub
+	35b1  3100 DRAM Controller Error Reporting Registers
+	35b5  3100 Chipset Enhanced DMA Controller
+	35b6  3100 Chipset PCI Express Port A
+	35b7  3100 Chipset PCI Express Port A1
+	35c8  3100 Extended Configuration Test Overflow Registers
 	4220  PRO/Wireless 2200BG Network Connection
 	4222  PRO/Wireless 3945ABG Network Connection
 		8086 1005  PRO/Wireless 3945BG Network Connection
@@ -11395,8 +11932,9 @@
 		1351 103c  Compaq NC6220
 	4224  PRO/Wireless 2915ABG Network Connection
 	4227  PRO/Wireless 3945ABG Network Connection
-		8086 1011  Thinkpad X60s
+		8086 1011  Thinkpad  X60s, R60e model 0657
 		8086 1014  PRO/Wireless 3945BG Network Connection
+	5001  Pro/DSL 2100 Modem
 	5200  EtherExpress PRO/100 Intelligent Server
 	5201  EtherExpress PRO/100 Intelligent Server
 		8086 0001  EtherExpress PRO/100 Server Ethernet Adapter
@@ -11487,7 +12025,7 @@
 	84e4  460GX - 84460GX Memory Data Controller (MDC)
 	84e6  460GX - 82466GX Wide and fast PCI eXpander Bridge (WXB)
 	84ea  460GX - 84460GX AGP Bridge (GXB function 1)
-	8500  IXP4XX Intel Network Processor (IXP420/421/422/425/IXC1100)
+	8500  IXP4XX Network Processor (IXP420/421/422/425/IXC1100)
 		1993 0ded  mGuard-PCI AV#2
 		1993 0dee  mGuard-PCI AV#1
 		1993 0def  mGuard-PCI AV#0
@@ -11503,11 +12041,15 @@
 # observed, and documented in Intel revision note; new mask of 1011:0026
 	b154  21154 PCI-to-PCI Bridge
 	b555  21555 Non transparent PCI-to-PCI Bridge
+		12c7 5005  SS7HD PCI Adaptor Card
+		12c7 5006  SS7HDC cPCI Adaptor Card
 		12d9 000a  PCI VoIP Gateway
 		4c53 1050  CT7 mainboard
 		4c53 1051  CE7 mainboard
 		e4bf 1000  CC8-1-BLUES
 8401  TRENDware International Inc.
+8686  ScaleMP
+	1010  vSMPowered system controller [vSMP CTL]
 8800  Trigem Computer Inc.
 	2008  Video assistent component
 8866  T-Square Design Inc.
@@ -11718,7 +12260,11 @@
 		9005 0298  ASR-4000SAS
 		9005 0299  ASR-4800SAS
 		9005 029a  4805SAS
+		9005 02b5  ASR5800
+		9005 02b6  ASR5805
+		9005 02b7  ASR5808
 	0286  AAC-RAID (Rocket)
+		1014 034d  8s
 		1014 9540  ServeRAID 8k/8k-l4
 		1014 9580  ServeRAID 8k/8k-l8
 		9005 028c  ASR-2230S + ASR-2230SLP PCI-X (Lancer)
@@ -11732,14 +12278,32 @@
 		9005 02a1  ICP ICP9087MA
 		9005 02a2  3800SAS
 		9005 02a3  ICP ICP5445AU
-		9005 02a4  ICP ICP5085LI
+		9005 02a4  ICP ICP9085LI
 		9005 02a5  ICP ICP5085BR
 		9005 02a6  ICP9067MA
-		9005 02a7  AAR-2830SA
-		9005 02a8  AAR-2430SA
-		9005 02a9  ICP5087AU
-		9005 02aa  ICP5047AU
+		9005 02a7  3805SAS
+		9005 02a8  3400SAS
+		9005 02a9  ICP ICP5085AU
+		9005 02aa  ICP ICP5045AU
+		9005 02ac  1800SAS
+		9005 02b3  ASR-2400SAS
+		9005 02b4  ICP ICP5045AL
 		9005 0800  Callisto
+	0410  AIC-9410W SAS (Razor HBA RAID)
+		9005 0410  ASC-48300(Spirit RAID)
+		9005 0411  ASC-58300 (Oakmont RAID)
+	0412  AIC-9410W SAS (Razor HBA non-RAID)
+		9005 0412  ASC-48300 (Spirit non-RAID)
+		9005 0413  ASC-58300 (Oakmont non-RAID)
+	041e  AIC-9410W SAS (Razor ASIC non-RAID)
+	041f  AIC-9410W SAS (Razor ASIC RAID)
+		9005 041f  AIC-9410W SAS (Razor ASIC RAID)
+	0430  AIC-9405W SAS (Razor-Lite HBA RAID)
+		9005 0430  ASC-44300 (Spirit-Lite RAID)
+	0432  AIC-9405W SAS (Razor-Lite HBA non-RAID)
+		9005 0432  ASC-44300 (Spirit-Lite non-RAID)
+	043e  AIC-9405W SAS (Razor-Lite ASIC non-RAID)
+	043f  AIC-9405W SAS (Razor-Lite ASIC RAID)
 	0500  Obsidian chipset SCSI controller
 		1014 02c1  PCI-X DDR 3Gb SAS Adapter (572A/572C)
 		1014 02c2  PCI-X DDR 3Gb SAS RAID Adapter (572B/572D)
@@ -11817,7 +12381,10 @@ ac3d  Actuality Systems
 aecb  Adrienne Electronics Corporation
 	6250  VITC/LTC Timecode Reader card [PCI-VLTC/RDR]
 affe  Sirrix AG security technologies
+	02e1  PCI2E1 2-port ISDN E1 interface
 	dead  Sirrix.PCI4S0 4-port ISDN S0 interface
+# Not registered officially
+b10b  Uakron PCI Project
 b1b3  Shiva Europe Limited
 # Pinnacle should be 11bd, but they got it wrong several times --mj
 bd11  Pinnacle Systems, Inc. (Wrong ID)
@@ -11829,6 +12396,7 @@ ca50  Varian Australia Pty Ltd
 cafe  Chrysalis-ITS
 	0003  Luna K3 Hardware Security Module
 cccc  Catapult Communications
+ccec  Curtiss-Wright Controls Embedded Computing
 cddd  Tyzx, Inc.
 	0101  DeepSea 1 High Speed Stereo Vision Frame Grabber
 	0200  DeepSea 2 High Speed Stereo Vision Frame Grabber
@@ -11859,7 +12427,6 @@ e159  Tiger Jet Network Inc.
 		8086 0003  Digium X100P/X101P analogue PSTN FXO interface
 	0002  Tiger100APC ISDN chipset
 e4bf  EKF Elektronik GmbH
-# Innovative and scalable network IC vendor
 e55e  Essence Technology, Inc.
 ea01  Eagle Technology
 	000a  PCI-773 Temperature Card
diff --git a/hw/xfree86/scanpci/xf86PciStdIds.h b/hw/xfree86/scanpci/xf86PciStdIds.h
index 7b0c3cb..d86d686 100644
--- a/hw/xfree86/scanpci/xf86PciStdIds.h
+++ b/hw/xfree86/scanpci/xf86PciStdIds.h
@@ -94,15 +94,23 @@ static const char pci_device_045e_006e[]
 static const char pci_device_045e_00c2[] = "MN-710 wireless USB paddle";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_0482[] = "Kyocera";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_04cf[] = "Myson Century, Inc";
 static const char pci_device_04cf_8818[] = "CS8818 USB2.0-to-ATAPI Bridge Controller with Embedded PHY";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_050d[] = "Belkin";
+static const char pci_device_050d_001a[] = "FSD7000 802.11g PCI Wireless card";
 static const char pci_device_050d_0109[] = "F5U409-CU USB/Serial Portable Adapter";
 static const char pci_device_050d_7050[] = "F5D7050 802.11g Wireless USB Adapter";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_05a9[] = "OmniVision";
+static const char pci_device_05a9_8519[] = "OV519 series";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_05e3[] = "CyberDoor";
 static const char pci_device_05e3_0701[] = "CBD516";
 #endif
@@ -120,6 +128,7 @@ static const char pci_device_0675_1704[]
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_067b[] = "Prolific Technology, Inc.";
+static const char pci_device_067b_2303[] = "PL-2303 USB-to-Serial Converter";
 static const char pci_device_067b_3507[] = "PL-3507 Hi-Speed USB & IEEE 1394 Combo to IDE Bridge Controller";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -132,6 +141,9 @@ static const char pci_vendor_07e2[] = "E
 static const char pci_vendor_0925[] = "VIA Technologies, Inc. (Wrong ID)";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_093a[] = "PixArt Imaging Inc.";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_09c1[] = "Arris";
 static const char pci_device_09c1_0704[] = "CM 200E Cable Modem";
 #endif
@@ -146,11 +158,17 @@ static const char pci_device_0b0b_0305[]
 static const char pci_device_0b0b_0405[] = "Rhino R8FXX";
 static const char pci_device_0b0b_0505[] = "Rhino R24FXX";
 static const char pci_device_0b0b_0506[] = "Rhino R2T1";
+static const char pci_device_0b0b_0605[] = "Rhino R2T1";
+static const char pci_device_0b0b_0705[] = "Rhino R24FXS";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_0b49[] = "ASCII Corporation";
 static const char pci_device_0b49_064f[] = "Trance Vibrator";
 #endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_0ccd[] = "TerraTec Electronic GmbH";
+static const char pci_device_0ccd_0038[] = "Cinergy T^2 DVB-T Receiver";
+#endif
 static const char pci_vendor_0e11[] = "Compaq Computer Corporation";
 static const char pci_device_0e11_0001[] = "PCI to EISA Bridge";
 static const char pci_device_0e11_0002[] = "PCI to ISA Bridge";
@@ -292,6 +310,9 @@ static const char pci_vendor_0e21[] = "C
 static const char pci_vendor_0e55[] = "HaSoTec GmbH";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_0eac[] = "SHF Communication Technologies AG";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1000[] = "LSI Logic / Symbios Logic";
 static const char pci_device_1000_0001[] = "53c810";
 #ifdef INIT_SUBSYS_INFO
@@ -309,6 +330,11 @@ static const char pci_device_1000_0006[]
 static const char pci_subsys_1000_0006_1000_1000[] = "LSI53C860E PCI to Ultra SCSI I/O Processor";
 #endif
 static const char pci_device_1000_000a[] = "53c1510";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_000a_0e11_b143[] = "Integrated Dual Channel Wide Ultra2 SCSI Controller";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1000_000a_1000_1000[] = "LSI53C1510 PCI to Dual Channel Wide Ultra2 SCSI Controller (Nonintelligent mode)";
 #endif
@@ -328,7 +354,7 @@ static const char pci_subsys_1000_000b_1
 static const char pci_subsys_1000_000b_1000_1020[] = "LSI21002 PCI to Dual Channel Ultra2 SCSI host adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1000_000b_13e9_1000[] = "6221L-4U";
+static const char pci_subsys_1000_000b_13e9_1000[] = "6221L-4U (Dual U2W SCSI, dual 10/100TX, graphics)";
 #endif
 static const char pci_device_1000_000c[] = "53c895";
 #ifdef INIT_SUBSYS_INFO
@@ -365,6 +391,12 @@ static const char pci_subsys_1000_000f_1
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_000f_1775_10d0[] = "V5D Single Board Computer Wide Ultra SCSI";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_000f_1775_10d1[] = "V5D Single Board Computer Ultra SCSI";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1000_000f_1de1_3904[] = "DC390F/U Ultra Wide SCSI Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -400,6 +432,9 @@ static const char pci_device_1000_0020[]
 static const char pci_subsys_1000_0020_1000_1000[] = "LSI53C1010-33 PCI to Dual Channel Ultra160 SCSI Controller";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0020_107b_1040[] = "Server Onboard 53C1010-33";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1000_0020_1de1_1020[] = "DC-390U3W";
 #endif
 static const char pci_device_1000_0021[] = "53c1010 66MHz  Ultra3 SCSI Adapter";
@@ -409,6 +444,16 @@ static const char pci_subsys_1000_0021_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1000_0021_1000_1010[] = "Asus TR-DLS onboard 53C1010-66";
 #endif
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0021_103c_1330[] = "Ultra160 SCSI [A7059A]";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0021_103c_1340[] = "Ultra160 SCSI [A7060A]";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1000_0021_124b_1070[] = "PMC-USCSI3";
 #endif
@@ -452,6 +497,11 @@ static const char pci_subsys_1000_0030_1
 static const char pci_subsys_1000_0030_1028_1010[] = "LSI U320 SCSI Controller";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0030_103c_12c5[] = "Ultra320 SCSI [A7173A]";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1000_0030_124b_1170[] = "PMC-USCSI320";
 #endif
@@ -479,7 +529,27 @@ static const char pci_device_1000_0058[]
 static const char pci_device_1000_005a[] = "SAS1066E PCI-Express Fusion-MPT SAS";
 static const char pci_device_1000_005c[] = "SAS1064A PCI-X Fusion-MPT SAS";
 static const char pci_device_1000_005e[] = "SAS1066 PCI-X Fusion-MPT SAS";
-static const char pci_device_1000_0060[] = "SAS1078 PCI-X Fusion-MPT SAS";
+static const char pci_device_1000_0060[] = "MegaRAID SAS 1078";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0060_1028_1f0a[] = "PERC 6/E Adapter RAID Controller";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0060_1028_1f0b[] = "PERC 6/i Adapter RAID Controller";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0060_1028_1f0c[] = "PERC 6/i Integrated RAID Controller";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0060_1028_1f0d[] = "PERC 6/i Enhanced RAID Controller";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_device_1000_0062[] = "SAS1078 PCI-Express Fusion-MPT SAS";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1000_0062_1000_0062[] = "SAS1078 PCI-Express Fusion-MPT SAS";
@@ -577,6 +647,74 @@ static const char pci_subsys_1000_0409_8
 static const char pci_subsys_1000_0409_8086_3499[] = "MegaRAID RAID Controller Harwich SROMBU42E";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_device_1000_0411[] = "MegaRAID SAS";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0411_1000_1001[] = "MegaRAID SAS 8408E";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0411_1000_1002[] = "MegaRAID SAS 8480E";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0411_1000_1003[] = "MegaRAID SAS 8344ELP";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0411_1000_1004[] = "MegaRAID SAS 8308ELP";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0411_1000_100c[] = "MegaRAID SATA 300-12E";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0411_1000_100d[] = "MegaRAID SATA 300-16E";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0411_1000_2004[] = "MegaRAID SATA 300-8ELP";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0411_1000_2005[] = "MegaRAID SATA 300-4ELP";
+#endif
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0411_1033_8287[] = "MegaRAID SAS PCI Express ROMB";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0411_1054_3016[] = "MegaRAID SAS RoMB Server";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0411_1734_1081[] = "MegaRAID SAS PCI Express ROMB";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0411_1734_10a3[] = "MegaRAID SAS PCI Express ROMB";
+#endif
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0411_8086_1001[] = "SRCSAS18E RAID Controller";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0411_8086_1003[] = "SRCSAS144E RAID Controller";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0411_8086_3500[] = "SROMBSAS18E RAID Controller";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0411_8086_3501[] = "SROMBSAS18E RAID Controller";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0411_8086_3504[] = "SROMBSAS18E RAID Controller";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_device_1000_0413[] = "MegaRAID SAS Verde ZCR";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0413_1000_1005[] = "MegaRAID SAS 8300XLP";
+#endif
 static const char pci_device_1000_0621[] = "FC909 Fibre Channel Adapter";
 static const char pci_device_1000_0622[] = "FC929 Fibre Channel Adapter";
 #ifdef INIT_SUBSYS_INFO
@@ -741,6 +879,9 @@ static const char pci_subsys_1002_4152_1
 #endif
 static const char pci_device_1002_4153[] = "RV350 AS [Radeon 9550]";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_4153_1043_010c[] = "A9550GE/TD";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_4153_1462_932c[] = "865PE Neo2-V (MS-6788) mainboard";
 #endif
 static const char pci_device_1002_4154[] = "RV350 AT [Fire GL T2]";
@@ -797,7 +938,10 @@ static const char pci_subsys_1002_4172_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_4172_1787_4003[] = "Radeon 9600 XT (Secondary)";
 #endif
-static const char pci_device_1002_4173[] = "RV350 ? [Radeon 9550] (Secondary)";
+static const char pci_device_1002_4173[] = "RV350 AS [Radeon 9550] (Secondary)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_4173_1043_010d[] = "A9550GE/TD (Secondary)";
+#endif
 static const char pci_device_1002_4237[] = "Radeon 7000 IGP";
 static const char pci_device_1002_4242[] = "R200 BB [Radeon All in Wonder 8500DV]";
 #ifdef INIT_SUBSYS_INFO
@@ -1042,12 +1186,15 @@ static const char pci_subsys_1002_4752_1
 static const char pci_subsys_1002_4752_1028_00d9[] = "PowerEdge 2500";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1002_4752_1028_0134[] = "Poweredge SC600";
+static const char pci_subsys_1002_4752_1028_0134[] = "PowerEdge 600SC";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_4752_103c_10e1[] = "NetServer Rage XL";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_4752_107b_6400[] = "6400 Server";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_4752_1734_007a[] = "Primergy RX300";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -1267,7 +1414,7 @@ static const char pci_subsys_1002_4c59_1
 static const char pci_device_1002_4c5a[] = "Radeon Mobility M6 LZ";
 static const char pci_device_1002_4c64[] = "Radeon R250 Ld [Radeon Mobility 9000 M9]";
 static const char pci_device_1002_4c65[] = "Radeon R250 Le [Radeon Mobility 9000 M9]";
-static const char pci_device_1002_4c66[] = "Radeon R250 [Radeon Mobility 9200]";
+static const char pci_device_1002_4c66[] = "Radeon R250 [Mobility FireGL 9000]";
 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";
@@ -1536,6 +1683,9 @@ static const char pci_subsys_1002_5159_1
 static const char pci_subsys_1002_5159_1028_019a[] = "PowerEdge SC1425";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_5159_103c_1292[] = "Radeon 7000";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_5159_1458_4002[] = "RV100 QY [RADEON 7000 PRO MAYA AV Series]";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -1553,6 +1703,9 @@ static const char pci_subsys_1002_5159_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_5159_1787_0202[] = "RV100 QY [Excalibur Radeon 7000]";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_5159_17ee_1001[] = "Radeon 7000 64MB DDR + DVI";
+#endif
 static const char pci_device_1002_515a[] = "Radeon RV100 QZ [Radeon 7000/VE]";
 static const char pci_device_1002_515e[] = "ES1000";
 static const char pci_device_1002_515f[] = "ES1000";
@@ -1672,9 +1825,11 @@ static const char pci_device_1002_5550[]
 static const char pci_device_1002_5551[] = "R423 UQ [FireGL V7200 (PCIE)]";
 static const char pci_device_1002_5552[] = "R423 UR [FireGL V5100 (PCIE)]";
 static const char pci_device_1002_5554[] = "R423 UT [FireGL V7100 (PCIE)]";
+static const char pci_device_1002_5569[] = "R423 UI [Radeon X800PRO (PCIE)] Secondary";
 static const char pci_device_1002_556b[] = "Radeon R423 UK (PCIE) [X800 SE] (Secondary)";
 static const char pci_device_1002_556d[] = "R430 [Radeon X800 XL] (PCIe) Secondary";
 static const char pci_device_1002_556f[] = "R430 [Radeon X800 (PCIE) Secondary]";
+static const char pci_device_1002_5571[] = "R423GL-SE ATI FIREGL V5100 PCI-EX Secondary";
 static const char pci_device_1002_564a[] = "M26 [Mobility FireGL V5000]";
 static const char pci_device_1002_564b[] = "M26 [Mobility FireGL V5000]";
 static const char pci_device_1002_564f[] = "M26 [Radeon Mobility X700 XL] (PCIE)";
@@ -1794,6 +1949,7 @@ static const char pci_subsys_1002_5964_1
 static const char pci_device_1002_5969[] = "ES1000";
 static const char pci_device_1002_5974[] = "RS482 [Radeon Xpress 200]";
 static const char pci_device_1002_5975[] = "RS482 [Radeon Xpress 200M]";
+static const char pci_device_1002_5a33[] = "Radeon Xpress 200 Host Bridge";
 static const char pci_device_1002_5a34[] = "RS480 PCI-X Root Port";
 static const char pci_device_1002_5a36[] = "RS480 PCI Bridge";
 static const char pci_device_1002_5a38[] = "RS480 PCI Bridge";
@@ -1896,7 +2052,12 @@ static const char pci_device_1002_5f57[]
 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_7100[] = "R520 [Radeon X1800]";
+static const char pci_device_1002_7102[] = "M58 [Radeon Mobility X1800]";
+static const char pci_device_1002_7103[] = "M58 [Mobility FireGL V7200]";
+static const char pci_device_1002_7104[] = "R520 GL ATI FireGL V7200 Primary";
 static const char pci_device_1002_7105[] = "R520 [FireGL]";
+static const char pci_device_1002_7106[] = "M58 [Mobility FireGL V7100]";
+static const char pci_device_1002_7108[] = "M58 [Radeon Mobility X1800]";
 static const char pci_device_1002_7109[] = "R520 [Radeon X1800]";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_7109_1002_0322[] = "All-in-Wonder X1800XL";
@@ -1904,7 +2065,11 @@ static const char pci_subsys_1002_7109_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_7109_1002_0d02[] = "Radeon X1800 CrossFire Edition";
 #endif
+static const char pci_device_1002_710a[] = "R520 [Radeon X1800]";
+static const char pci_device_1002_710b[] = "R520 [Radeon X1800]";
+static const char pci_device_1002_710c[] = "R520 [Radeon X1800]";
 static const char pci_device_1002_7120[] = "R520 [Radeon X1800] (Secondary)";
+static const char pci_device_1002_7124[] = "R520 GL ATI FireGL V7200 Secondary";
 static const char pci_device_1002_7129[] = "R520 [Radeon X1800] (Secondary)";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_7129_1002_0323[] = "All-in-Wonder X1800XL (Secondary)";
@@ -1912,6 +2077,7 @@ static const char pci_subsys_1002_7129_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_7129_1002_0d03[] = "Radeon X1800 CrossFire Edition (Secondary)";
 #endif
+static const char pci_device_1002_7140[] = "RV515 [Radeon X1600]";
 static const char pci_device_1002_7142[] = "RV515 [Radeon X1300]";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_7142_1002_0322[] = "All-in-Wonder 2006 PCI-E Edition";
@@ -1925,6 +2091,10 @@ static const char pci_device_1002_7149[]
 static const char pci_device_1002_714a[] = "M52 [ATI Mobility Radeon X1300]";
 static const char pci_device_1002_714b[] = "M52 [ATI Mobility Radeon X1300]";
 static const char pci_device_1002_714c[] = "M52 [ATI Mobility Radeon X1300]";
+static const char pci_device_1002_714d[] = "RV515 [Radeon X1300]";
+static const char pci_device_1002_714e[] = "RV515 [Radeon X1300]";
+static const char pci_device_1002_7152[] = "RV515 GL ATI FireGL V3300 Primary";
+static const char pci_device_1002_715e[] = "RV515 [Radeon X1300]";
 static const char pci_device_1002_7162[] = "RV515 [Radeon X1300] (Secondary)";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_7162_1002_0323[] = "All-in-Wonder 2006 PCI-E Edition (Secondary)";
@@ -1933,12 +2103,42 @@ static const char pci_device_1002_7166[]
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_7166_1002_0323[] = "All-in-Wonder 2006 PCI-E Edition (Secondary)";
 #endif
+static const char pci_device_1002_7172[] = "RV515 GL ATI FireGL V3300 Secondary";
+static const char pci_device_1002_7180[] = "RV516 Radeon X1300 Series Primary";
+static const char pci_device_1002_7181[] = "RV516 XT Radeon X1600 Series Primary";
+static const char pci_device_1002_71a0[] = "RV516 Radeon X1300 Series Secondary";
+static const char pci_device_1002_71a1[] = "RV516 XT Radeon X1600 Series Secondary";
 static const char pci_device_1002_71c0[] = "RV530 [Radeon X1600]";
 static const char pci_device_1002_71c2[] = "RV530 [Radeon X1600]";
 static const char pci_device_1002_71c4[] = "M56GL [ATI Mobility FireGL V5200]";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_71c4_17aa_2007[] = "ThinkPad T60p";
+#endif
 static const char pci_device_1002_71c5[] = "M56P [Radeon Mobility X1600]";
+static const char pci_device_1002_71c6[] = "RV530LE [Radeon X1600]";
+static const char pci_device_1002_71ce[] = "RV530LE [Radeon X1600]";
+static const char pci_device_1002_71d5[] = "M66-P ATI Mobility Radeon X1700";
+static const char pci_device_1002_71d6[] = "M66-XT ATI Mobility Radeon X1700";
+static const char pci_device_1002_71de[] = "RV530LE [Radeon X1600]";
 static const char pci_device_1002_71e0[] = "RV530 [Radeon X1600] (Secondary)";
 static const char pci_device_1002_71e2[] = "RV530 [Radeon X1600] (Secondary)";
+static const char pci_device_1002_7240[] = "R580 [Radeon X1900]";
+static const char pci_device_1002_7241[] = "R580 [Radeon X1900]";
+static const char pci_device_1002_7242[] = "R580 [Radeon X1900]";
+static const char pci_device_1002_7243[] = "R580 [Radeon X1900]";
+static const char pci_device_1002_7244[] = "R580 [Radeon X1900]";
+static const char pci_device_1002_7245[] = "R580 [Radeon X1900]";
+static const char pci_device_1002_7246[] = "R580 [Radeon X1900]";
+static const char pci_device_1002_7247[] = "R580 [Radeon X1900]";
+static const char pci_device_1002_7248[] = "R580 [Radeon X1900]";
+static const char pci_device_1002_7249[] = "R580 [Radeon X1900 XT] Primary";
+static const char pci_device_1002_724a[] = "R580 [Radeon X1900]";
+static const char pci_device_1002_724b[] = "R580 [Radeon X1900]";
+static const char pci_device_1002_724c[] = "R580 [Radeon X1900]";
+static const char pci_device_1002_724d[] = "R580 [Radeon X1900]";
+static const char pci_device_1002_724e[] = "R580 [FireGL V7300/V7350] Primary (PCIE)";
+static const char pci_device_1002_7269[] = "R580 [Radeon X1900 XT] Secondary";
+static const char pci_device_1002_726e[] = "R580 [FireGL V7300/V7350] Secondary (PCIE)";
 static const char pci_device_1002_7833[] = "Radeon 9100 IGP Host Bridge";
 static const char pci_device_1002_7834[] = "Radeon 9100 PRO IGP";
 static const char pci_device_1002_7835[] = "Radeon Mobility 9200 IGP";
@@ -2169,6 +2369,9 @@ static const char pci_subsys_1011_0019_1
 static const char pci_subsys_1011_0019_1033_800d[] = "PC-9821NR-B06 100BASE-TX Interface Card";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1011_0019_103c_125a[] = "10/100Base-TX (PCI) [A5506B]";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1011_0019_108d_0016[] = "Rapidfire 2327 10/100 Ethernet";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -2250,6 +2453,15 @@ static const char pci_subsys_1011_0019_1
 static const char pci_subsys_1011_0019_13d1_ab01[] = "EtherFast 10/100 Cardbus (PCMPC200)";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1011_0019_1498_000a[] = "TPMC880-10 10/100Base-T and 10Base2 PMC Ethernet Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1011_0019_1498_000b[] = "TPMC880-11 Single 10/100Base-T PMC Ethernet Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1011_0019_1498_000c[] = "TPMC880-12 Single 10Base2 PMC Ethernet Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1011_0019_14cb_0100[] = "LNDL-100N 100Base-TX Ethernet PC Card";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -2278,7 +2490,7 @@ static const char pci_subsys_1011_0046_0
 static const char pci_subsys_1011_0046_0e11_4058[] = "Integrated Smart Array";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1011_0046_103c_10c2[] = "Hewlett-Packard NetRAID-4M";
+static const char pci_subsys_1011_0046_103c_10c2[] = "NetRAID-4M";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1011_0046_12d9_000a[] = "IP Telephony card";
@@ -2351,7 +2563,7 @@ static const char pci_device_1013_6001[]
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1013_6001_1014_1010[] = "CS4610 SoundFusion Audio Accelerator";
 #endif
-static const char pci_device_1013_6003[] = "CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator]";
+static const char pci_device_1013_6003[] = "CS 4614/22/24/30 [CrystalClear SoundFusion Audio Accelerator]";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1013_6003_1013_4280[] = "Crystal SoundFusion PCI Audio Accelerator";
 #endif
@@ -2359,6 +2571,9 @@ static const char pci_subsys_1013_6003_1
 static const char pci_subsys_1013_6003_1014_0153[] = "ThinkPad A20m";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1013_6003_153b_112e[] = "DMX XFire 1024";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1013_6003_153b_1136[] = "SiXPack 5.1+";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -2367,6 +2582,9 @@ static const char pci_subsys_1013_6003_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1013_6003_1681_a011[] = "Fortissimo III 7.1";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1013_6003_5053_3357[] = "Santa Cruz";
+#endif
 static const char pci_device_1013_6004[] = "CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator]";
 static const char pci_device_1013_6005[] = "Crystal CS4281 PCI Audio";
 #ifdef INIT_SUBSYS_INFO
@@ -2461,6 +2679,7 @@ static const char pci_device_1014_0050[]
 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_0058[] = "SSA Adapter [Advanced SerialRAID/X]";
 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)";
@@ -2585,6 +2804,7 @@ static const char pci_subsys_1014_02bd_1
 static const char pci_subsys_1014_02bd_1014_02c2[] = "PCI-X DDR 3Gb SAS RAID Adapter (572B/571D)";
 #endif
 static const char pci_device_1014_0302[] = "Winnipeg PCI-X Host Bridge";
+static const char pci_device_1014_0308[] = "CalIOC2 PCI-E Root Port";
 static const char pci_device_1014_0314[] = "ZISC 036 Neural accelerator card";
 static const char pci_device_1014_3022[] = "QLA3022 Network Adapter";
 static const char pci_device_1014_4022[] = "QLA3022 Network Adapter";
@@ -2753,6 +2973,9 @@ static const char pci_subsys_1022_2000_1
 static const char pci_subsys_1022_2000_1259_2703[] = "AT-2701FX";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1022_2000_1259_2704[] = "AT-2701FTX 10/100 Mb Fiber/Copper Fast 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
@@ -2945,6 +3168,7 @@ static const char pci_device_1023_9930[]
 static const char pci_vendor_1024[] = "Zenith Data Systems";
 #endif
 static const char pci_vendor_1025[] = "Acer Incorporated [ALI]";
+static const char pci_device_1025_0090[] = "BCM440x 100Base-TX Fast Ethernet";
 static const char pci_device_1025_1435[] = "M1435";
 static const char pci_device_1025_1445[] = "M1445";
 static const char pci_device_1025_1449[] = "M1449";
@@ -3054,7 +3278,7 @@ static const char pci_subsys_1028_0013_1
 static const char pci_subsys_1028_0013_1028_0170[] = "PowerEdge Expandable RAID Controller 4e/Di";
 #endif
 static const char pci_device_1028_0014[] = "Remote Access Card 4 Daughter Card SMIC interface";
-static const char pci_device_1028_0015[] = "PowerEdge Expandable RAID controller 5";
+static const char pci_device_1028_0015[] = "PowerEdge Expandable RAID controller 5i";
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1029[] = "Siemens Nixdorf IS";
 #endif
@@ -3482,6 +3706,9 @@ static const char pci_subsys_102b_2538_1
 static const char pci_subsys_102b_2538_102b_3007[] = "QID Low-profile PCIe";
 #endif
 static const char pci_device_102b_4536[] = "VIA Framegrabber";
+static const char pci_device_102b_4cdc[] = "Morphis Vision System Jpeg2000";
+static const char pci_device_102b_4fc5[] = "Morphis Vision System";
+static const char pci_device_102b_5e10[] = "Morphis Vision System Aux/IO";
 static const char pci_device_102b_6573[] = "Shark 10/100 Multiport SwitchNIC";
 static const char pci_vendor_102c[] = "Chips and Technologies";
 static const char pci_device_102c_00b8[] = "F64310";
@@ -3676,6 +3903,7 @@ static const char pci_device_1033_00f2[]
 static const char pci_device_1033_00f3[] = "uPD6113x Multimedia Decoder/Processor [EMMA2]";
 static const char pci_device_1033_010c[] = "VR7701";
 static const char pci_device_1033_0125[] = "uPD720400 PCI Express - PCI/PCI-X Bridge";
+static const char pci_device_1033_013a[] = "Dual Tuner/MPEG Encoder";
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1034[] = "Framatome Connectors USA Inc.";
 #endif
@@ -3706,6 +3934,7 @@ static const char pci_device_1039_0018[]
 static const char pci_device_1039_0180[] = "RAID bus controller 180 SATA/PATA  [SiS]";
 static const char pci_device_1039_0181[] = "SATA";
 static const char pci_device_1039_0182[] = "182 SATA/RAID Controller";
+static const char pci_device_1039_0186[] = "AHCI Controller (0106)";
 static const char pci_device_1039_0190[] = "190 Gigabit Ethernet Adapter";
 static const char pci_device_1039_0191[] = "191 Gigabit Ethernet Adapter";
 static const char pci_device_1039_0200[] = "5597/5598/6326 VGA";
@@ -3741,6 +3970,7 @@ static const char pci_device_1039_0651[]
 static const char pci_device_1039_0655[] = "655 Host";
 static const char pci_device_1039_0660[] = "660 Host";
 static const char pci_device_1039_0661[] = "661FX/M661FX/M661MX Host";
+static const char pci_device_1039_0662[] = "662 Host";
 static const char pci_device_1039_0730[] = "730 Host";
 static const char pci_device_1039_0733[] = "733 Host";
 static const char pci_device_1039_0735[] = "735 Host";
@@ -3766,6 +3996,13 @@ static const char pci_device_1039_0962[]
 static const char pci_device_1039_0963[] = "SiS963 [MuTIOL Media IO]";
 static const char pci_device_1039_0964[] = "SiS964 [MuTIOL Media IO]";
 static const char pci_device_1039_0965[] = "SiS965 [MuTIOL Media IO]";
+static const char pci_device_1039_0966[] = "SiS966 [MuTIOL Media IO]";
+static const char pci_device_1039_0968[] = "SiS968 [MuTIOL Media IO]";
+static const char pci_device_1039_1180[] = "SATA Controller / IDE mode";
+static const char pci_device_1039_1182[] = "SATA Controller / RAID mode";
+static const char pci_device_1039_1183[] = "SATA Controller / IDE mode";
+static const char pci_device_1039_1184[] = "AHCI Controller / RAID mode";
+static const char pci_device_1039_1185[] = "AHCI IDE Controller (0106)";
 static const char pci_device_1039_3602[] = "83C602";
 static const char pci_device_1039_5107[] = "5107";
 static const char pci_device_1039_5300[] = "SiS540 PCI Display Adapter";
@@ -3824,10 +4061,12 @@ static const char pci_subsys_1039_6326_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1039_6326_1569_6326[] = "SiS6326 GUI Accelerator";
 #endif
-static const char pci_device_1039_6330[] = "661/741/760/761 PCI/AGP VGA Display Adapter";
+static const char pci_device_1039_6330[] = "661/741/760 PCI/AGP or 662/761Gx PCIE VGA Display Adapter";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1039_6330_1039_6330[] = "[M]661xX/[M]741[GX]/[M]760 PCI/AGP VGA Adapter";
 #endif
+static const char pci_device_1039_6350[] = "770/670 PCIE VGA Display Adapter";
+static const char pci_device_1039_6351[] = "771/671 PCIE VGA Display Adapter";
 static const char pci_device_1039_7001[] = "USB 1.0 Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1039_7001_1019_0a14[] = "K7S5A motherboard";
@@ -3920,6 +4159,7 @@ static const char pci_subsys_1039_7018_2
 static const char pci_subsys_1039_7018_a0a0_0022[] = "SiS PCI Audio Accelerator";
 #endif
 static const char pci_device_1039_7019[] = "SiS7019 Audio Accelerator";
+static const char pci_device_1039_7502[] = "Azalia Audio Controller";
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_103a[] = "Seiko Epson Corporation";
 #endif
@@ -4004,19 +4244,31 @@ static const char pci_device_103c_121b[]
 static const char pci_device_103c_121c[] = "NetServer PCI COM Port Decoder";
 static const char pci_device_103c_1229[] = "zx1 System Bus Adapter";
 static const char pci_device_103c_122a[] = "zx1 I/O Controller";
-static const char pci_device_103c_122e[] = "zx1 Local Bus Adapter";
+static const char pci_device_103c_122e[] = "PCI-X Local Bus Adapter";
+static const char pci_device_103c_127b[] = "sx1000 System Bus Adapter";
 static const char pci_device_103c_127c[] = "sx1000 I/O Controller";
 static const char pci_device_103c_1290[] = "Auxiliary Diva Serial Port";
 static const char pci_device_103c_1291[] = "Auxiliary Diva Serial Port";
 static const char pci_device_103c_12b4[] = "zx1 QuickSilver AGP8x Local Bus Adapter";
+static const char pci_device_103c_12eb[] = "sx2000 System Bus Adapter";
+static const char pci_device_103c_12ec[] = "sx2000 I/O Controller";
+static const char pci_device_103c_12ee[] = "PCI-X 2.0 Local Bus Adapter";
 static const char pci_device_103c_12f8[] = "Broadcom BCM4306 802.11b/g Wireless LAN";
 static const char pci_device_103c_12fa[] = "BCM4306 802.11b/g Wireless LAN Controller";
 static const char pci_device_103c_2910[] = "E2910A PCIBus Exerciser";
 static const char pci_device_103c_2925[] = "E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer";
 static const char pci_device_103c_3080[] = "Pavilion ze2028ea";
 static const char pci_device_103c_3085[] = "Realtek RTL8139/8139C/8139C+";
-static const char pci_device_103c_3220[] = "Hewlett-Packard Smart Array P600";
-static const char pci_device_103c_3230[] = "Hewlett-Packard Smart Array Controller";
+static const char pci_device_103c_3220[] = "Smart Array P600";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_103c_3220_103c_3225[] = "3 Gb/s SAS RAID";
+#endif
+static const char pci_device_103c_3230[] = "Smart Array Controller";
+static const char pci_device_103c_4030[] = "zx2 System Bus Adapter";
+static const char pci_device_103c_4031[] = "zx2 I/O Controller";
+static const char pci_device_103c_4037[] = "PCIe Local Bus Adapter";
+static const char pci_device_103c_403b[] = "PCIe Root Port";
+static const char pci_device_103c_60e8[] = "NetRAID-2M : ZX1/M (OEM AMI MegaRAID 493)";
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_103e[] = "Solliday Engineering";
 #endif
@@ -4054,12 +4306,14 @@ static const char pci_device_1043_4015[]
 static const char pci_device_1043_4021[] = "v7100 Combo Deluxe [GeForce2 MX + TV tuner]";
 static const char pci_device_1043_4057[] = "v8200 GeForce 3";
 static const char pci_device_1043_8043[] = "v8240 PAL 128M [P4T] Motherboard";
+static const char pci_device_1043_8047[] = "v8420 Deluxe [GeForce4 Ti4200]";
 static const char pci_device_1043_807b[] = "v9280/TD [Geforce4 TI4200 8X With TV-Out and DVI]";
 static const char pci_device_1043_8095[] = "A7N8X Motherboard nForce2 AC97 Audio";
 static const char pci_device_1043_80ac[] = "A7N8X Motherboard nForce2 AGP/Memory";
 static const char pci_device_1043_80bb[] = "v9180 Magic/T [GeForce4 MX440 AGP 8x 64MB TV-out]";
 static const char pci_device_1043_80c5[] = "nForce3 chipset motherboard [SK8N]";
 static const char pci_device_1043_80df[] = "v9520 Magic/T";
+static const char pci_device_1043_815a[] = "A8N-SLI Motherboard nForce4 SATA";
 static const char pci_device_1043_8187[] = "802.11a/b/g Wireless LAN Card";
 static const char pci_device_1043_8188[] = "Tiger Hybrid TV Capture Device";
 #endif
@@ -4237,6 +4491,9 @@ static const char pci_device_104a_0210[]
 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";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_104a_0500_104a_0500[] = "BeWAN ADSL PCI st";
+#endif
 static const char pci_device_104a_0564[] = "STPC Client Northbridge";
 static const char pci_device_104a_0981[] = "21x4x DEC-Tulip compatible 10/100 Ethernet";
 static const char pci_device_104a_1746[] = "STG 1764X";
@@ -4357,6 +4614,9 @@ static const char pci_device_104c_8020[]
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_104c_8020_11bd_000f[] = "Studio DV500-1394";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_104c_8020_11bd_001c[] = "Excalibur 4.1";
+#endif
 static const char pci_device_104c_8021[] = "TSB43AA22 IEEE-1394 Controller (PHY/Link Integrated)";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_104c_8021_104d_80df[] = "Vaio PCG-FX403";
@@ -4406,7 +4666,7 @@ static const char pci_device_104c_802b[]
 static const char pci_subsys_104c_802b_1028_0139[] = "Latitude D400";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_104c_802b_1028_014e[] = "PCI7410,7510,7610 OHCI-Lynx Controller (Dell Latitude D800)";
+static const char pci_subsys_104c_802b_1028_014e[] = "PCI7410,7510,7610 OHCI-Lynx Controller (Latitude D800)";
 #endif
 static const char pci_device_104c_802e[] = "PCI7x20 1394a-2000 OHCI Two-Port PHY/Link-Layer Controller";
 static const char pci_device_104c_8031[] = "PCIxx21/x515 Cardbus Controller";
@@ -4439,7 +4699,7 @@ static const char pci_subsys_104c_8033_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_104c_8033_103c_308b[] = "MX6125";
 #endif
-static const char pci_device_104c_8034[] = "PCI6411, PCI6421, PCI6611, PCI6621, PCI7411, PCI7421, PCI7611, PCI7621 Secure Digital (SD) Controller";
+static const char pci_device_104c_8034[] = "PCI6411/6421/6611/6621/7411/7421/7611/7621 Secure Digital Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_104c_8034_1025_0080[] = "Aspire 5024WLMi";
 #endif
@@ -4449,14 +4709,32 @@ static const char pci_subsys_104c_8034_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_104c_8034_103c_308b[] = "MX6125";
 #endif
-static const char pci_device_104c_8035[] = "PCI6411, PCI6421, PCI6611, PCI6621, PCI7411, PCI7421, PCI7611, PCI7621 Smart Card Controller (SMC)";
+static const char pci_device_104c_8035[] = "PCI6411/6421/6611/6621/7411/7421/7611/7621 Smart Card Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_104c_8035_103c_099c[] = "NX6110/NC6120";
 #endif
 static const char pci_device_104c_8036[] = "PCI6515 Cardbus Controller";
 static const char pci_device_104c_8038[] = "PCI6515 SmartCard Controller";
 static const char pci_device_104c_8039[] = "PCIxx12 Cardbus Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_104c_8039_103c_309f[] = "nx9420";
+#endif
+static const char pci_device_104c_803a[] = "PCIxx12 OHCI Compliant IEEE 1394 Host Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_104c_803a_103c_309f[] = "nx9420";
+#endif
 static const char pci_device_104c_803b[] = "5-in-1 Multimedia Card Reader (SD/MMC/MS/MS PRO/xD)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_104c_803b_103c_309f[] = "nx9420";
+#endif
+static const char pci_device_104c_803c[] = "PCIxx12 SDA Standard Compliant SD Host Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_104c_803c_103c_309f[] = "nx9420";
+#endif
+static const char pci_device_104c_803d[] = "PCIxx12 GemCore based SmartCard controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_104c_803d_103c_309f[] = "nx9420";
+#endif
 static const char pci_device_104c_8201[] = "PCI1620 Firmware Loading Function";
 static const char pci_device_104c_8204[] = "PCI7410,7510,7610 PCI Firmware Loading Function";
 #ifdef INIT_SUBSYS_INFO
@@ -4465,8 +4743,8 @@ static const char pci_subsys_104c_8204_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_104c_8204_1028_014e[] = "Latitude D800";
 #endif
-static const char pci_device_104c_8231[] = "XIO2000(A)/XIO2200 PCI Express-to-PCI Bridge";
-static const char pci_device_104c_8235[] = "XIO2200 IEEE-1394a-2000 Controller (PHY/Link)";
+static const char pci_device_104c_8231[] = "XIO2000(A)/XIO2200(A) PCI Express-to-PCI Bridge";
+static const char pci_device_104c_8235[] = "XIO2200(A) IEEE-1394a-2000 Controller (PHY/Link)";
 static const char pci_device_104c_8400[] = "ACX 100 22Mbps Wireless Interface";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_104c_8400_1186_3b00[] = "DWL-650+ PC Card cardbus 22Mbs Wireless Adapter [AirPlus]";
@@ -4549,7 +4827,7 @@ static const char pci_device_104c_ac40[]
 static const char pci_device_104c_ac41[] = "PCI4410 PC card Cardbus Controller";
 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)";
+static const char pci_subsys_104c_ac42_1028_00e6[] = "PCI4451 PC card CardBus Controller (Inspiron 8100)";
 #endif
 static const char pci_device_104c_ac44[] = "PCI4510 PC card Cardbus Controller";
 #ifdef INIT_SUBSYS_INFO
@@ -4611,14 +4889,23 @@ static const char pci_subsys_104c_ac51_e
 static const char pci_device_104c_ac52[] = "PCI1451 PC card Cardbus Controller";
 static const char pci_device_104c_ac53[] = "PCI1421 PC card Cardbus Controller";
 static const char pci_device_104c_ac54[] = "PCI1620 PC Card Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_104c_ac54_103c_08b0[] = "tc1100 tablet";
+#endif
 static const char pci_device_104c_ac55[] = "PCI1520 PC card Cardbus Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_104c_ac55_1014_0512[] = "ThinkPad T30/T40";
 #endif
 static const char pci_device_104c_ac56[] = "PCI1510 PC card Cardbus Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_104c_ac56_1014_0512[] = "Thinkpad R50e model 1634";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_104c_ac56_1014_0528[] = "ThinkPad R40e (2684-HVG) Cardbus Controller";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_104c_ac56_17aa_2012[] = "Thinkpad R60e model 0657";
+#endif
 static const char pci_device_104c_ac60[] = "PCI2040 PCI to DSP Bridge Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_104c_ac60_175c_5100[] = "ASI51xx Audio Adapter";
@@ -4634,7 +4921,7 @@ static const char pci_subsys_104c_ac60_1
 #endif
 static const char pci_device_104c_ac8d[] = "PCI 7620";
 static const char pci_device_104c_ac8e[] = "PCI7420 CardBus Controller";
-static const char pci_device_104c_ac8f[] = "PCI7420/PCI7620 Dual Socket CardBus and Smart Card Cont. w/ 1394a-2000 OHCI Two-Port  PHY/Link-Layer Cont. and SD/MS-Pro Sockets";
+static const char pci_device_104c_ac8f[] = "PCI7420/7620 Combo CardBus, 1394a-2000 OHCI and SD/MS-Pro Controller";
 static const char pci_device_104c_fe00[] = "FireWire Host Controller";
 static const char pci_device_104c_fe03[] = "12C01A FireWire Host Controller";
 static const char pci_vendor_104d[] = "Sony Corporation";
@@ -4721,6 +5008,7 @@ static const char pci_device_1057_0004[]
 static const char pci_device_1057_0006[] = "MPC8245 [Unity]";
 static const char pci_device_1057_0008[] = "MPC8540";
 static const char pci_device_1057_0009[] = "MPC8560";
+static const char pci_device_1057_0012[] = "MPC8548 [PowerQUICC III]";
 static const char pci_device_1057_0100[] = "MC145575 [HFC-PCI]";
 static const char pci_device_1057_0431[] = "KTI829c 100VG";
 static const char pci_device_1057_1801[] = "DSP56301 Digital Signal Processor";
@@ -4798,6 +5086,7 @@ static const char pci_subsys_1057_1801_e
 #endif
 static const char pci_device_1057_18c0[] = "MPC8265A/8266/8272";
 static const char pci_device_1057_18c1[] = "MPC8271/MPC8272";
+static const char pci_device_1057_3055[] = "SM56 Data Fax Modem";
 static const char pci_device_1057_3410[] = "DSP56361 Digital Signal Processor";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1057_3410_ecc0_0050[] = "Gina24 rev.0";
@@ -4946,6 +5235,7 @@ static const char pci_device_105a_3d17[]
 static const char pci_device_105a_3d18[] = "PDC20518/PDC40518 (SATAII 150 TX4)";
 static const char pci_device_105a_3d73[] = "PDC40775 (SATA 300 TX2plus)";
 static const char pci_device_105a_3d75[] = "PDC20575 (SATAII150 TX2plus)";
+static const char pci_device_105a_4302[] = "80333 [SuperTrak EX4350]";
 static const char pci_device_105a_4d30[] = "PDC20267 (FastTrak100/Ultra100)";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_105a_4d30_105a_4d33[] = "Ultra100";
@@ -5004,6 +5294,8 @@ static const char pci_device_105a_6626[]
 static const char pci_device_105a_6629[] = "PDC20619 (FastTrak TX4000)";
 static const char pci_device_105a_7275[] = "PDC20277 (SBFastTrak133 Lite)";
 static const char pci_device_105a_8002[] = "SATAII150 SX8";
+static const char pci_device_105a_8350[] = "80333 [SuperTrak EX8350/EX16350], 80331 [SuperTrak EX8300/EX16300]";
+static const char pci_device_105a_c350[] = "80333 [SuperTrak EX12350]";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_105b[] = "Foxconn International, Inc.";
@@ -5421,8 +5713,28 @@ static const char pci_subsys_1077_2200_1
 #endif
 static const char pci_device_1077_2300[] = "QLA2300 64-bit Fibre Channel Adapter";
 static const char pci_device_1077_2312[] = "QLA2312 Fibre Channel Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1077_2312_103c_0131[] = "2Gb Fibre Channel - Single port [A7538A]";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1077_2312_103c_12ba[] = "2Gb Fibre Channel - Dual port [A6826A]";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_device_1077_2322[] = "QLA2322 Fibre Channel Adapter";
 static const char pci_device_1077_2422[] = "QLA2422 Fibre Channel Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1077_2422_103c_12d7[] = "4Gb Fibre Channel [AB379A]";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1077_2422_103c_12dd[] = "4Gb Fibre Channel [AB429A]";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_device_1077_2432[] = "QLA2432 Fibre Channel Adapter";
 static const char pci_device_1077_3010[] = "QLA3010 Network Adapter";
 static const char pci_device_1077_3022[] = "QLA3022 Network Adapter";
@@ -6177,8 +6489,6 @@ static const char pci_device_10a9_4001[]
 static const char pci_device_10a9_4002[] = "TIO-CE PCI Express Port";
 static const char pci_device_10a9_8001[] = "O2 1394";
 static const char pci_device_10a9_8002[] = "G-net NT";
-static const char pci_device_10a9_8010[] = "Broadcom e-net [SGI IO9/IO10 BaseIO]";
-static const char pci_device_10a9_8018[] = "Broadcom e-net [SGI A330 Server BaseIO]";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_10aa[] = "ACC Microelectronics";
@@ -6315,7 +6625,7 @@ static const char pci_subsys_10b5_9050_1
 static const char pci_subsys_10b5_9050_10b5_2905[] = "Alpermann+Velte PCI TS: Time Synchronisation Board";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_10b5_9050_10b5_9050[] = "MP9050";
+static const char pci_subsys_10b5_9050_10b5_9050[] = "PCI-I04 PCI Passive PC/CAN Interface";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10b5_9050_1498_0362[] = "TPMC866 8 Channel Serial Card";
@@ -6472,6 +6782,9 @@ static const char pci_subsys_10b5_9080_1
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10b5_9080_10b5_1123[] = "Sectra KK631 encryption board";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10b5_9080_10b5_9080[] = "9080 [real subsystem ID not set]";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -6483,7 +6796,21 @@ static const char pci_subsys_10b5_9080_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10b5_9080_12df_4422[] = "4422PCI [Do-All Telemetry Data Aquisition System]";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10b5_9080_1517_000b[] = "ECSG-1R3ADC-PMC Clock synthesizer";
+#endif
+static const char pci_device_10b5_9656[] = "PCI <-> IOBus Bridge";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10b5_9656_1517_000f[] = "ECDR-GC314-PMC Receiver";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10b5_9656_1885_0700[] = "Tsunami FPGA PMC with Altera Stratix S40";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10b5_9656_1885_0701[] = "Tsunami FPGA PMC with Altera Stratix S30";
+#endif
 static const char pci_device_10b5_bb04[] = "B&B 3PCIOSD1A Isolated PCI Serial";
+static const char pci_device_10b5_c001[] = "CronyxOmega-PCI (8-port RS232)";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_10b6[] = "Madge Networks";
@@ -6640,6 +6967,10 @@ static const char pci_device_10b7_9006[]
 static const char pci_device_10b7_900a[] = "3c900B-FL 10base-FL [Cyclone]";
 static const char pci_device_10b7_9050[] = "3c905 100BaseTX [Boomerang]";
 static const char pci_device_10b7_9051[] = "3c905 100BaseT4 [Boomerang]";
+static const char pci_device_10b7_9054[] = "3C905B-TX Fast Etherlink XL PCI";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10b7_9054_10b7_9054[] = "3C905B-TX Fast Etherlink XL PCI";
+#endif
 static const char pci_device_10b7_9055[] = "3c905B 100BaseTX [Cyclone]";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -6967,6 +7298,9 @@ static const char pci_subsys_10b9_5229_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10b9_5229_1043_8053[] = "A7A266 Motherboard IDE";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10b9_5229_1849_5229[] = "ASRock 939Dual-SATA2 Motherboard IDE (PATA)";
+#endif
 static const char pci_device_10b9_5235[] = "M5225";
 static const char pci_device_10b9_5237[] = "USB 1.1 Controller";
 #ifdef INIT_SUBSYS_INFO
@@ -6994,7 +7328,7 @@ static const char pci_device_10b9_524e[]
 static const char pci_device_10b9_5251[] = "M5251 P1394 OHCI 1.0 Controller";
 static const char pci_device_10b9_5253[] = "M5253 P1394 OHCI 1.1 Controller";
 static const char pci_device_10b9_5261[] = "M5261 Ethernet Controller";
-static const char pci_device_10b9_5263[] = "M5263 Ethernet Controller";
+static const char pci_device_10b9_5263[] = "ULi 1689,1573 integrated ethernet.";
 static const char pci_device_10b9_5281[] = "ALi M5281 Serial ATA / RAID Host Controller";
 static const char pci_device_10b9_5287[] = "ULi 5287 SATA";
 static const char pci_device_10b9_5288[] = "ULi M5288 SATA";
@@ -7226,6 +7560,9 @@ static const char pci_device_10cd_1300[]
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10cd_1300_10cd_1310[] = "ASC1300 SCSI Adapter";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10cd_1300_1195_1320[] = "Ultra-SCSI CardBus PC Card REX CB31";
+#endif
 static const char pci_device_10cd_2300[] = "ABP940-UW";
 static const char pci_device_10cd_2500[] = "ABP940-U2W";
 #endif
@@ -7560,8 +7897,9 @@ static const char pci_device_10de_0047[]
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10de_0047_1682_2109[] = "GeForce 6800 GS";
 #endif
-static const char pci_device_10de_0048[] = "GeForce 6800 XT";
+static const char pci_device_10de_0048[] = "NV40 [GeForce 6800 XT]";
 static const char pci_device_10de_0049[] = "NV40GL";
+static const char pci_device_10de_004d[] = "NV40GL [Quadro FX 4000]";
 static const char pci_device_10de_004e[] = "NV40GL [Quadro FX 4000]";
 static const char pci_device_10de_0050[] = "CK804 ISA Bridge";
 #ifdef INIT_SUBSYS_INFO
@@ -7781,6 +8119,9 @@ static const char pci_device_10de_00c8[]
 static const char pci_device_10de_00c9[] = "NV41.9 [GeForce Go 6800 Ultra]";
 static const char pci_device_10de_00cc[] = "NV41 [Quadro FX Go1400]";
 static const char pci_device_10de_00cd[] = "NV41 [Quadro FX 3450/4000 SDI]";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10de_00cd_10de_029b[] = "wx4300 Workstation";
+#endif
 static const char pci_device_10de_00ce[] = "NV41GL [Quadro FX 1400]";
 static const char pci_device_10de_00d0[] = "nForce3 LPC Bridge";
 static const char pci_device_10de_00d1[] = "nForce3 Host Bridge";
@@ -7806,10 +8147,16 @@ static const char pci_device_10de_00e0[]
 static const char pci_subsys_10de_00e0_10de_0c11[] = "Winfast NF3250K8AA";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10de_00e0_1462_7030[] = "K8N Neo-FSR v2.0";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10de_00e0_147b_1c0b[] = "NF8 Mainboard";
 #endif
 static const char pci_device_10de_00e1[] = "nForce3 250Gb Host Bridge";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10de_00e1_1462_7030[] = "K8N Neo-FSR v2.0";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10de_00e1_147b_1c0b[] = "NF8 Mainboard";
 #endif
 static const char pci_device_10de_00e2[] = "nForce3 250Gb AGP Host to PCI Bridge";
@@ -7825,6 +8172,9 @@ static const char pci_device_10de_00e4[]
 static const char pci_subsys_10de_00e4_105b_0c43[] = "Winfast NF3250K8AA";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10de_00e4_1462_7030[] = "K8N Neo-FSR v2.0";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10de_00e4_147b_1c0b[] = "NF8 Mainboard";
 #endif
 static const char pci_device_10de_00e5[] = "CK8S Parallel ATA Controller (v2.5)";
@@ -7832,6 +8182,9 @@ static const char pci_device_10de_00e5[]
 static const char pci_subsys_10de_00e5_105b_0c43[] = "Winfast NF3250K8AA";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10de_00e5_1462_7030[] = "K8N Neo-FSR v2.0";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10de_00e5_147b_1c0b[] = "NF8 Mainboard";
 #endif
 static const char pci_device_10de_00e6[] = "CK8S Ethernet Controller";
@@ -7840,6 +8193,9 @@ static const char pci_device_10de_00e7[]
 static const char pci_subsys_10de_00e7_105b_0c43[] = "Winfast NF3250K8AA";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10de_00e7_1462_7030[] = "K8N Neo-FSR v2.0";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10de_00e7_147b_1c0b[] = "NF8 Mainboard";
 #endif
 static const char pci_device_10de_00e8[] = "nForce3 EHCI USB 2.0 Controller";
@@ -7847,6 +8203,9 @@ static const char pci_device_10de_00e8[]
 static const char pci_subsys_10de_00e8_105b_0c43[] = "Winfast NF3250K8AA";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10de_00e8_1462_7030[] = "K8N Neo-FSR v2.0";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10de_00e8_147b_1c0b[] = "NF8 Mainboard";
 #endif
 static const char pci_device_10de_00ea[] = "nForce3 250Gb AC'97 Audio Controller";
@@ -7874,6 +8233,9 @@ static const char pci_device_10de_00f3[]
 static const char pci_device_10de_00f4[] = "NV43 [GeForce 6600 LE]";
 static const char pci_device_10de_00f5[] = "G70 [GeForce 7800 GS]";
 static const char pci_device_10de_00f6[] = "NV43 [GeForce 6600 GS]";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10de_00f6_1682_217e[] = "XFX GeForce 6800 XTreme 256MB DDR3 AGP";
+#endif
 static const char pci_device_10de_00f8[] = "NV45GL [Quadro FX 3400/4400]";
 static const char pci_device_10de_00f9[] = "NV40 [GeForce 6800 Ultra/GeForce 6800 GT]";
 #ifdef INIT_SUBSYS_INFO
@@ -8008,6 +8370,7 @@ static const char pci_device_10de_0148[]
 static const char pci_device_10de_0149[] = "NV43 [GeForce Go 6600 GT]";
 static const char pci_device_10de_014a[] = "Quadro NVS 440";
 static const char pci_device_10de_014c[] = "Quadro FX 550";
+static const char pci_device_10de_014d[] = "NV18GL [Quadro FX 550]";
 static const char pci_device_10de_014e[] = "NV43GL [Quadro FX 540]";
 static const char pci_device_10de_014f[] = "NV43 [GeForce 6200]";
 static const char pci_device_10de_0150[] = "NV15 [GeForce2 GTS/Pro]";
@@ -8027,6 +8390,9 @@ static const char pci_subsys_10de_0150_1
 static const char pci_subsys_10de_0150_107d_2842[] = "WinFast GeForce 2 Pro";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10de_0150_10de_002e[] = "GeForce2 GTS";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10de_0150_1462_8831[] = "Creative GeForce2 Pro";
 #endif
 static const char pci_device_10de_0151[] = "NV15DDR [GeForce2 Ti]";
@@ -8042,9 +8408,9 @@ static const char pci_subsys_10de_0152_1
 #endif
 static const char pci_device_10de_0153[] = "NV15GL [Quadro2 Pro]";
 static const char pci_device_10de_0160[] = "GeForce 6500";
-static const char pci_device_10de_0161[] = "GeForce 6200 TurboCache(TM)";
-static const char pci_device_10de_0162[] = "NV43 [GeForce 6200 SE]";
-static const char pci_device_10de_0163[] = "GeForce 6200 LE";
+static const char pci_device_10de_0161[] = "NV44 [GeForce 6200 TurboCache(TM)]";
+static const char pci_device_10de_0162[] = "NV44 [GeForce 6200 SE TurboCache (TM)]";
+static const char pci_device_10de_0163[] = "NV44 [GeForce 6200 LE]";
 static const char pci_device_10de_0164[] = "NV44 [GeForce Go 6200]";
 static const char pci_device_10de_0165[] = "NV44 [Quadro NVS 285]";
 static const char pci_device_10de_0166[] = "NV43 [GeForce Go 6400]";
@@ -8077,6 +8443,9 @@ static const char pci_device_10de_0174[]
 static const char pci_device_10de_0175[] = "NV17 [GeForce4 420 Go]";
 static const char pci_device_10de_0176[] = "NV17 [GeForce4 420 Go 32M]";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10de_0176_103c_08b0[] = "tc1100 tablet";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10de_0176_4c53_1090[] = "Cx9 / Vx9 mainboard";
 #endif
 static const char pci_device_10de_0177[] = "NV17 [GeForce4 460 Go]";
@@ -8091,6 +8460,9 @@ static const char pci_device_10de_017c[]
 static const char pci_device_10de_017d[] = "NV17 [GeForce4 410 Go 16M]";
 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_8063[] = "GeForce4 MX 440 AGP 8X";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10de_0181_1043_806f[] = "V9180 Magic";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -8131,6 +8503,10 @@ static const char pci_device_10de_01c1[]
 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_01d1[] = "GeForce 7300 LE";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10de_01d1_1462_0345[] = "7300LE PCI Express Graphics Adapter";
+#endif
+static const char pci_device_10de_01d6[] = "GeForce Go 7200";
 static const char pci_device_10de_01d7[] = "Quadro NVS 110M / GeForce Go 7300";
 static const char pci_device_10de_01d8[] = "GeForce Go 7400";
 static const char pci_device_10de_01da[] = "Quadro NVS 110M";
@@ -8192,7 +8568,7 @@ static const char pci_device_10de_0211[]
 static const char pci_device_10de_0212[] = "NV40 [GeForce 6800 LE]";
 static const char pci_device_10de_0215[] = "NV40 [GeForce 6800 GT]";
 static const char pci_device_10de_0218[] = "NV40 [GeForce 6800 XT]";
-static const char pci_device_10de_0221[] = "NV43 [GeForce 6200]";
+static const char pci_device_10de_0221[] = "NV44A [GeForce 6200]";
 static const char pci_device_10de_0240[] = "C51PV [GeForce 6150]";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10de_0240_1462_7207[] = "K8NGM2 series";
@@ -8294,11 +8670,15 @@ static const char pci_device_10de_0289[]
 static const char pci_device_10de_028c[] = "NV28GLM [Quadro4 700 GoGL]";
 static const char pci_device_10de_0290[] = "GeForce 7900 GTX";
 static const char pci_device_10de_0291[] = "GeForce 7900 GT";
+static const char pci_device_10de_0292[] = "GeForce 7900 GS";
+static const char pci_device_10de_0298[] = "GeForce Go 7900 GS";
+static const char pci_device_10de_0299[] = "GeForce Go 7900 GTX";
 static const char pci_device_10de_029a[] = "G71 [Quadro FX 2500M]";
 static const char pci_device_10de_029b[] = "G71 [Quadro FX 1500M]";
 static const char pci_device_10de_029c[] = "Quadro FX 5500";
 static const char pci_device_10de_029d[] = "Quadro FX 3500";
 static const char pci_device_10de_029e[] = "Quadro FX 1500";
+static const char pci_device_10de_029f[] = "Quadro FX 4500 X2";
 static const char pci_device_10de_02a0[] = "NV2A [XGPU]";
 static const char pci_device_10de_02e1[] = "GeForce 7600 GS";
 static const char pci_device_10de_02f0[] = "C51 Host Bridge";
@@ -8418,19 +8798,62 @@ static const char pci_device_10de_0367[]
 static const char pci_device_10de_0368[] = "MCP55 SMBus";
 static const char pci_device_10de_0369[] = "MCP55 Memory Controller";
 static const char pci_device_10de_036a[] = "MCP55 Memory Controller";
+static const char pci_device_10de_036b[] = "MCP55 SMU";
 static const char pci_device_10de_036c[] = "MCP55 USB Controller";
 static const char pci_device_10de_036d[] = "MCP55 USB Controller";
 static const char pci_device_10de_036e[] = "MCP55 IDE";
+static const char pci_device_10de_0370[] = "MCP55 PCI bridge";
 static const char pci_device_10de_0371[] = "MCP55 High Definition Audio";
 static const char pci_device_10de_0372[] = "MCP55 Ethernet";
 static const char pci_device_10de_0373[] = "MCP55 Ethernet";
+static const char pci_device_10de_0374[] = "MCP55 PCI Express bridge";
+static const char pci_device_10de_0375[] = "MCP55 PCI Express bridge";
+static const char pci_device_10de_0376[] = "MCP55 PCI Express bridge";
+static const char pci_device_10de_0377[] = "MCP55 PCI Express bridge";
+static const char pci_device_10de_0378[] = "MCP55 PCI Express bridge";
 static const char pci_device_10de_037a[] = "MCP55 Memory Controller";
 static const char pci_device_10de_037e[] = "MCP55 SATA Controller";
 static const char pci_device_10de_037f[] = "MCP55 SATA Controller";
 static const char pci_device_10de_0391[] = "G70 [GeForce 7600 GT]";
 static const char pci_device_10de_0392[] = "G70 [GeForce 7600 GS]";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10de_0392_1462_0622[] = "NX7600GS-T2D256EH";
+#endif
+static const char pci_device_10de_0393[] = "G70 [GeForce 7300 GT]";
 static const char pci_device_10de_0398[] = "G70 [GeForce Go 7600]";
 static const char pci_device_10de_039e[] = "Quadro FX 560";
+static const char pci_device_10de_03a0[] = "C55 Host Bridge";
+static const char pci_device_10de_03a1[] = "C55 Host Bridge";
+static const char pci_device_10de_03a2[] = "C55 Host Bridge";
+static const char pci_device_10de_03a3[] = "C55 Host Bridge";
+static const char pci_device_10de_03a4[] = "C55 Host Bridge";
+static const char pci_device_10de_03a5[] = "C55 Host Bridge";
+static const char pci_device_10de_03a6[] = "C55 Host Bridge";
+static const char pci_device_10de_03a7[] = "C55 Host Bridge";
+static const char pci_device_10de_03a8[] = "C55 Memory Controller";
+static const char pci_device_10de_03a9[] = "C55 Memory Controller";
+static const char pci_device_10de_03aa[] = "C55 Memory Controller";
+static const char pci_device_10de_03ab[] = "C55 Memory Controller";
+static const char pci_device_10de_03ac[] = "C55 Memory Controller";
+static const char pci_device_10de_03ad[] = "C55 Memory Controller";
+static const char pci_device_10de_03ae[] = "C55 Memory Controller";
+static const char pci_device_10de_03af[] = "C55 Memory Controller";
+static const char pci_device_10de_03b0[] = "C55 Memory Controller";
+static const char pci_device_10de_03b1[] = "C55 Memory Controller";
+static const char pci_device_10de_03b2[] = "C55 Memory Controller";
+static const char pci_device_10de_03b3[] = "C55 Memory Controller";
+static const char pci_device_10de_03b4[] = "C55 Memory Controller";
+static const char pci_device_10de_03b5[] = "C55 Memory Controller";
+static const char pci_device_10de_03b6[] = "C55 Memory Controller";
+static const char pci_device_10de_03b7[] = "C55 PCI Express bridge";
+static const char pci_device_10de_03b8[] = "C55 PCI Express bridge";
+static const char pci_device_10de_03b9[] = "C55 PCI Express bridge";
+static const char pci_device_10de_03ba[] = "C55 Memory Controller";
+static const char pci_device_10de_03bb[] = "C55 PCI Express bridge";
+static const char pci_device_10de_03d0[] = "GeForce 6100 nForce 430";
+static const char pci_device_10de_03d1[] = "GeForce 6100 nForce 405";
+static const char pci_device_10de_03d2[] = "GeForce 6100 nForce 400";
+static const char pci_device_10de_03d5[] = "GeForce 6100 nForce 420";
 static const char pci_device_10de_03e0[] = "MCP61 LPC Bridge";
 static const char pci_device_10de_03e1[] = "MCP61 LPC Bridge";
 static const char pci_device_10de_03e2[] = "MCP61 LPC Bridge";
@@ -8439,6 +8862,8 @@ static const char pci_device_10de_03e4[]
 static const char pci_device_10de_03e5[] = "MCP61 Ethernet";
 static const char pci_device_10de_03e6[] = "MCP61 Ethernet";
 static const char pci_device_10de_03e7[] = "MCP61 SATA Controller";
+static const char pci_device_10de_03e8[] = "MCP61 PCI Express bridge";
+static const char pci_device_10de_03e9[] = "MCP61 PCI Express bridge";
 static const char pci_device_10de_03ea[] = "MCP61 Memory Controller";
 static const char pci_device_10de_03eb[] = "MCP61 SMBus";
 static const char pci_device_10de_03ec[] = "MCP61 IDE";
@@ -8447,9 +8872,42 @@ static const char pci_device_10de_03ef[]
 static const char pci_device_10de_03f0[] = "MCP61 High Definition Audio";
 static const char pci_device_10de_03f1[] = "MCP61 USB Controller";
 static const char pci_device_10de_03f2[] = "MCP61 USB Controller";
+static const char pci_device_10de_03f3[] = "MCP61 PCI bridge";
+static const char pci_device_10de_03f4[] = "MCP61 SMU";
 static const char pci_device_10de_03f5[] = "MCP61 Memory Controller";
 static const char pci_device_10de_03f6[] = "MCP61 SATA Controller";
 static const char pci_device_10de_03f7[] = "MCP61 SATA Controller";
+static const char pci_device_10de_0440[] = "MCP65 LPC Bridge";
+static const char pci_device_10de_0441[] = "MCP65 LPC Bridge";
+static const char pci_device_10de_0442[] = "MCP65 LPC Bridge";
+static const char pci_device_10de_0443[] = "MCP65 LPC Bridge";
+static const char pci_device_10de_0444[] = "MCP65 Memory Controller";
+static const char pci_device_10de_0445[] = "MCP65 Memory Controller";
+static const char pci_device_10de_0446[] = "MCP65 SMBus";
+static const char pci_device_10de_0447[] = "MCP65 SMU";
+static const char pci_device_10de_0448[] = "MCP65 IDE";
+static const char pci_device_10de_0449[] = "MCP65 PCI bridge";
+static const char pci_device_10de_044a[] = "MCP65 High Definition Audio";
+static const char pci_device_10de_044b[] = "MCP65 High Definition Audio";
+static const char pci_device_10de_044c[] = "MCP65 AHCI Controller";
+static const char pci_device_10de_044d[] = "MCP65 AHCI Controller";
+static const char pci_device_10de_044e[] = "MCP65 AHCI Controller";
+static const char pci_device_10de_044f[] = "MCP65 AHCI Controller";
+static const char pci_device_10de_0450[] = "MCP65 Ethernet";
+static const char pci_device_10de_0451[] = "MCP65 Ethernet";
+static const char pci_device_10de_0452[] = "MCP65 Ethernet";
+static const char pci_device_10de_0453[] = "MCP65 Ethernet";
+static const char pci_device_10de_0454[] = "MCP65 USB Controller";
+static const char pci_device_10de_0455[] = "MCP65 USB Controller";
+static const char pci_device_10de_0456[] = "MCP65 USB Controller";
+static const char pci_device_10de_0457[] = "MCP65 USB Controller";
+static const char pci_device_10de_0458[] = "MCP65 PCI Express bridge";
+static const char pci_device_10de_0459[] = "MCP65 PCI Express bridge";
+static const char pci_device_10de_045a[] = "MCP65 PCI Express bridge";
+static const char pci_device_10de_045c[] = "MCP65 SATA Controller";
+static const char pci_device_10de_045d[] = "MCP65 SATA Controller";
+static const char pci_device_10de_045e[] = "MCP65 SATA Controller";
+static const char pci_device_10de_045f[] = "MCP65 SATA Controller";
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_10df[] = "Emulex Corporation";
 static const char pci_device_10df_1ae5[] = "LP6000 Fibre Channel Host Adapter";
@@ -8504,11 +8962,13 @@ static const char pci_vendor_10e2[] = "A
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_10e3[] = "Tundra Semiconductor Corp.";
 static const char pci_device_10e3_0000[] = "CA91C042 [Universe]";
+static const char pci_device_10e3_0108[] = "Tsi108 Host Bridge for Single PowerPC";
 static const char pci_device_10e3_0148[] = "Tsi148 [Tempe]";
 static const char pci_device_10e3_0860[] = "CA91C860 [QSpan]";
 static const char pci_device_10e3_0862[] = "CA91C862A [QSpan-II]";
 static const char pci_device_10e3_8260[] = "CA91L8200B [Dual PCI PowerSpan II]";
 static const char pci_device_10e3_8261[] = "CA91L8260B [Single PCI PowerSpan II]";
+static const char pci_device_10e3_a108[] = "Tsi109 Host Bridge for Dual PowerPC";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_10e4[] = "Tandem Computers";
@@ -8573,6 +9033,12 @@ static const char pci_device_10eb_8111[]
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_10ec[] = "Realtek Semiconductor Co., Ltd.";
 static const char pci_device_10ec_0139[] = "Zonet Zen3200";
+static const char pci_device_10ec_0883[] = "High Definition Audio";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_10ec_0883_1025_1605[] = "TravelMate 5600 series";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_device_10ec_8029[] = "RTL-8029(AS)";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10ec_8029_10b8_2011[] = "EZ-Card (SMC1208)";
@@ -8593,6 +9059,7 @@ static const char pci_device_10ec_8129[]
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10ec_8129_10ec_8129[] = "RT8129 Fast Ethernet Adapter";
 #endif
+static const char pci_device_10ec_8136[] = "RTL8101E PCI Express Fast Ethernet controller";
 static const char pci_device_10ec_8138[] = "RT8139 (B/C) Cardbus Fast Ethernet Adapter";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10ec_8138_10ec_8138[] = "RT8139 (B/C) Fast Ethernet Adapter";
@@ -8708,6 +9175,8 @@ static const char pci_subsys_10ec_8139_8
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_10ec_8139_a0a0_0007[] = "ALN-325C";
 #endif
+static const char pci_device_10ec_8167[] = "RTL-8169SC Gigabit Ethernet";
+static const char pci_device_10ec_8168[] = "RTL8111/8168B PCI Express Gigabit Ethernet controller";
 static const char pci_device_10ec_8169[] = "RTL-8169 Gigabit Ethernet";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -8815,6 +9284,7 @@ static const char pci_vendor_1100[] = "J
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1101[] = "Initio Corporation";
 static const char pci_device_1101_1060[] = "INI-A100U2W";
+static const char pci_device_1101_1622[] = "INI-1623 PCI SATA-II Controller";
 static const char pci_device_1101_9100[] = "INI-9100/9100W";
 static const char pci_device_1101_9400[] = "INI-940";
 static const char pci_device_1101_9401[] = "INI-950";
@@ -8897,6 +9367,13 @@ static const char pci_subsys_1102_0004_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1102_0004_1102_2002[] = "SB Audigy 2 ZS (SB0350)";
 #endif
+static const char pci_device_1102_0005[] = "SB X-Fi";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1102_0005_1102_0021[] = "X-Fi Platinum";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1102_0005_1102_1003[] = "X-Fi XtremeMusic";
+#endif
 static const char pci_device_1102_0006[] = "[SB Live! Value] EMU10k1X";
 static const char pci_device_1102_0007[] = "SB Audigy LS";
 #ifdef INIT_SUBSYS_INFO
@@ -9370,7 +9847,7 @@ static const char pci_subsys_1106_3059_1
 static const char pci_subsys_1106_3059_1043_80a1[] = "A7V8X-X Motherboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1106_3059_1043_80b0[] = "A7V600/K8V Deluxe motherboard (ADI AD1980 codec [SoundMAX])";
+static const char pci_subsys_1106_3059_1043_80b0[] = "A7V600/K8V-X/K8V Deluxe motherboard (ADI AD1980 codec [SoundMAX])";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1106_3059_1043_812a[] = "A8V Deluxe motherboard (Realtek ALC850 codec)";
@@ -10185,6 +10662,27 @@ static const char pci_subsys_1131_7133_5
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1131_7133_5168_0319[] = "LifeView FlyDVB Trio";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1131_7133_5168_0502[] = "LifeView FlyDVB-T Duo CardBus";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1131_7133_5168_0520[] = "LifeView FlyDVB Trio CardBus";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1131_7133_5168_1502[] = "LifeView FlyTV CardBus";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1131_7133_5168_2502[] = "LifeView FlyDVB-T CardBus";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1131_7133_5168_2520[] = "LifeView FlyDVB-S Duo CardBus";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1131_7133_5168_3502[] = "LifeView FlyDVB-T Hybrid CardBus";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1131_7133_5168_3520[] = "LifeView FlyDVB Trio N CardBus";
+#endif
 static const char pci_device_1131_7134[] = "SAA7134/SAA7135HL Video Broadcast Decoder";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1131_7134_1019_4cb4[] = "Elitegroup ECS TVP3XP FM1216 Tuner Card(PAL-BG,FM)";
@@ -10196,6 +10694,9 @@ static const char pci_subsys_1131_7134_1
 static const char pci_subsys_1131_7134_1043_4840[] = "ASUS TV-FM 7134";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1131_7134_1043_4842[] = "TV-FM 7134";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1131_7134_1131_2004[] = "EUROPA V3 reference design";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -10342,6 +10843,9 @@ static const char pci_subsys_1131_7146_1
 static const char pci_subsys_1131_7146_153b_1156[] = "Terratec Cynergy 1200C";
 #endif
 static const char pci_device_1131_9730[] = "SAA9730 Integrated Multimedia and Peripheral Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1131_9730_1131_0000[] = "Integrated Multimedia and Peripheral Controller";
+#endif
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1132[] = "Mitel Corp.";
@@ -11030,6 +11534,7 @@ static const char pci_device_1166_0016[]
 static const char pci_device_1166_0017[] = "GCNB-LE Host Bridge";
 static const char pci_device_1166_0036[] = "HT1000 PCI/PCI-X bridge";
 static const char pci_device_1166_0101[] = "CIOB-X2 PCI-X I/O Bridge";
+static const char pci_device_1166_0103[] = "EPB PCI-Express to PCI-X Bridge";
 static const char pci_device_1166_0104[] = "HT1000 PCI/PCI-X bridge";
 static const char pci_device_1166_0110[] = "CIOB-E I/O Bridge with Gigabit Ethernet";
 static const char pci_device_1166_0130[] = "HT2000 PCI-X bridge";
@@ -11037,6 +11542,9 @@ static const char pci_device_1166_0132[]
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1166_0132_1166_0132[] = "HT2000 PCI-Express bridge";
 #endif
+static const char pci_device_1166_0140[] = "HT2100 PCI-Express Bridge";
+static const char pci_device_1166_0141[] = "HT2100 PCI-Express Bridge";
+static const char pci_device_1166_0142[] = "HT2100 PCI-Express 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
@@ -11055,6 +11563,11 @@ static const char pci_subsys_1166_0212_4
 static const char pci_device_1166_0213[] = "CSB6 RAID/IDE Controller";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1166_0213_1028_4134[] = "PowerEdge 600SC";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1166_0213_1028_c134[] = "Poweredge SC600";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -11357,6 +11870,7 @@ static const char pci_subsys_1186_1300_1
 static const char pci_subsys_1186_1300_1186_1303[] = "DFE-528TX 10/100 Fast Ethernet PCI Adapter";
 #endif
 static const char pci_device_1186_1340[] = "DFE-690TXD CardBus PC Card";
+static const char pci_device_1186_1405[] = "DFE-520TX Fast Ethernet PCI Adapter";
 static const char pci_device_1186_1541[] = "DFE-680TXD CardBus PC Card";
 static const char pci_device_1186_1561[] = "DRP-32TXD Cardbus PC Card";
 static const char pci_device_1186_2027[] = "AirPlus Xtreme G DWL-G520 Adapter";
@@ -11375,6 +11889,7 @@ static const char pci_device_1186_3a14[]
 static const char pci_device_1186_3a63[] = "AirXpert DWL-AG660 Wireless Cardbus Adapter";
 static const char pci_device_1186_4000[] = "DL2000-based Gigabit Ethernet";
 static const char pci_device_1186_4300[] = "DGE-528T Gigabit Ethernet Adapter";
+static const char pci_device_1186_4800[] = "DGE-530T Gigabit Ethernet Adapter (rev 11)";
 static const char pci_device_1186_4b01[] = "DGE-530T Gigabit Ethernet Adapter (rev 11)";
 static const char pci_device_1186_4c00[] = "Gigabit Ethernet Adapter";
 #ifdef INIT_SUBSYS_INFO
@@ -11887,6 +12402,7 @@ static const char pci_device_11ab_6041[]
 static const char pci_device_11ab_6081[] = "MV88SX6081 8-port SATA II PCI-X Controller";
 static const char pci_device_11ab_6460[] = "MV64360/64361/64362 System Controller";
 static const char pci_device_11ab_6480[] = "MV64460/64461/64462 System Controller";
+static const char pci_device_11ab_6485[] = "MV64460/64461/64462 System Controller, Revision B";
 static const char pci_device_11ab_f003[] = "GT-64010 Primary Image Piranha Image Generator";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -12292,6 +12808,7 @@ static const char pci_device_11c1_ab30[]
 static const char pci_subsys_11c1_ab30_14cd_2012[] = "Hermes2 Mini-PCI WaveLAN a/b/g";
 #endif
 static const char pci_device_11c1_ed00[] = "ET-131x PCI-E Ethernet Controller";
+static const char pci_device_11c1_ed01[] = "ET-131x PCI-E Ethernet Controller";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_11c2[] = "Sand Microelectronics";
@@ -12674,6 +13191,7 @@ static const char pci_vendor_1216[] = "P
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1217[] = "O2 Micro, Inc.";
+static const char pci_device_1217_00f7[] = "Firewire (IEEE 1394)";
 static const char pci_device_1217_6729[] = "OZ6729";
 static const char pci_device_1217_673a[] = "OZ6730";
 static const char pci_device_1217_6832[] = "OZ6832/6833 CardBus Controller";
@@ -12710,7 +13228,10 @@ static const char pci_subsys_1217_7110_1
 static const char pci_device_1217_7112[] = "OZ711EC1/M1 SmartCardBus/MemoryCardBus Controller";
 static const char pci_device_1217_7113[] = "OZ711EC1 SmartCardBus Controller";
 static const char pci_device_1217_7114[] = "OZ711M1/MC1 4-in-1 MemoryCardBus Controller";
+static const char pci_device_1217_7120[] = "Integrated MMC/SD Controller";
+static const char pci_device_1217_7130[] = "Integrated MS/xD Controller";
 static const char pci_device_1217_7134[] = "OZ711MP1/MS1 MemoryCardBus Controller";
+static const char pci_device_1217_7135[] = "Cardbus bridge";
 static const char pci_device_1217_71e2[] = "OZ711E2 SmartCardBus Controller";
 static const char pci_device_1217_7212[] = "OZ711M2 4-in-1 MemoryCardBus Controller";
 static const char pci_device_1217_7213[] = "OZ6933E CardBus Controller";
@@ -13128,6 +13649,7 @@ static const char pci_vendor_1258[] = "G
 static const char pci_vendor_1259[] = "Allied Telesyn International";
 static const char pci_device_1259_2560[] = "AT-2560 Fast Ethernet Adapter (i82557B)";
 static const char pci_device_1259_a117[] = "RTL81xx Fast Ethernet";
+static const char pci_device_1259_a11e[] = "RTL81xx Fast Ethernet";
 static const char pci_device_1259_a120[] = "21x4x DEC-Tulip compatible 10/100 Ethernet";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -13323,6 +13845,9 @@ static const char pci_subsys_1260_3890_1
 static const char pci_subsys_1260_3890_1259_c104[] = "CG-WLCB54GT Wireless Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1260_3890_1260_0000[] = "WG511 Wireless Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1260_3890_1385_4800[] = "WG511 Wireless Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -14843,7 +15368,7 @@ static const char pci_vendor_1313[] = "Y
 static const char pci_vendor_1316[] = "Teradyne Inc";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
-static const char pci_vendor_1317[] = "Linksys";
+static const char pci_vendor_1317[] = "ADMtek";
 static const char pci_device_1317_0981[] = "21x4x DEC-Tulip compatible 10/100 Ethernet";
 static const char pci_device_1317_0985[] = "NC100 Network Everywhere Fast Ethernet 10/100";
 #ifdef INIT_SUBSYS_INFO
@@ -14851,15 +15376,15 @@ static const char pci_subsys_1317_0985_1
 #endif
 static const char pci_device_1317_1985[] = "21x4x DEC-Tulip compatible 10/100 Ethernet";
 static const char pci_device_1317_2850[] = "HSP MicroModem 56";
-static const char pci_device_1317_5120[] = "ADMtek ADM5120 OpenGate System-on-Chip";
-static const char pci_device_1317_8201[] = "ADMtek ADM8211 802.11b Wireless Interface";
+static const char pci_device_1317_5120[] = "ADM5120 OpenGate System-on-Chip";
+static const char pci_device_1317_8201[] = "ADM8211 802.11b Wireless Interface";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1317_8201_10b8_2635[] = "SMC2635W 802.11b (11Mbps) wireless lan pcmcia (cardbus) card";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1317_8201_1317_8201[] = "SMC2635W 802.11b (11mbps) wireless lan pcmcia (cardbus) card";
 #endif
-static const char pci_device_1317_8211[] = "ADMtek ADM8211 802.11b Wireless Interface";
+static const char pci_device_1317_8211[] = "ADM8211 802.11b Wireless Interface";
 static const char pci_device_1317_9511[] = "21x4x DEC-Tulip compatible 10/100 Ethernet";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -15161,6 +15686,7 @@ static const char pci_device_1360_0203[]
 static const char pci_device_1360_0204[] = "GPS170PCI GPS Receiver";
 static const char pci_device_1360_0301[] = "TCR510PCI IRIG Timecode Reader";
 static const char pci_device_1360_0302[] = "TCR167PCI IRIG Timecode Reader";
+static const char pci_device_1360_0303[] = "TCR511PCI IRIG Timecode Reader";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1361[] = "Soliton Systems K.K.";
@@ -15191,6 +15717,10 @@ static const char pci_vendor_1369[] = "D
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_136a[] = "High Soft Tech";
+static const char pci_device_136a_0004[] = "HST Saphir VII mini PCI";
+static const char pci_device_136a_0007[] = "HST Saphir III E MultiLink 4";
+static const char pci_device_136a_0008[] = "HST Saphir III E MultiLink 8";
+static const char pci_device_136a_000a[] = "HST Saphir III E MultiLink 2";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_136b[] = "Kawasaki Steel Corporation";
@@ -15327,6 +15857,10 @@ static const char pci_device_1385_622a[]
 static const char pci_device_1385_630a[] = "GA630 Gigabit Ethernet";
 static const char pci_device_1385_6b00[] = "WG311v3 54 Mbps Wireless PCI Adapter";
 static const char pci_device_1385_6d00[] = "WPNT511 RangeMax 240 Mbps Wireless PC Card";
+static const char pci_device_1385_7b00[] = "WN511B RangeMax Next 280 Mbps Wireless PC Card";
+static const char pci_device_1385_7c00[] = "WN511T RangeMax Next 300 Mbps Wireless PC Card";
+static const char pci_device_1385_7d00[] = "WN311B RangeMax Next 270 Mbps Wireless PCI Adapter";
+static const char pci_device_1385_7e00[] = "WN311T RangeMax Next 300 Mbps Wireless PCI Adapter";
 static const char pci_device_1385_f004[] = "FA310TX";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -15800,7 +16334,26 @@ static const char pci_vendor_13fd[] = "M
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_13fe[] = "Advantech Co. Ltd";
 static const char pci_device_13fe_1240[] = "PCI-1240 4-channel stepper motor controller card";
-static const char pci_device_13fe_1600[] = "PCI-1612 4-port RS-232/422/485 PCI communication card";
+static const char pci_device_13fe_1600[] = "PCI-16xx series PCI multiport serial board (function 0)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_13fe_1600_1601_0002[] = "PCI-1601 2-port unisolated RS-422/485";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_13fe_1600_1602_0002[] = "PCI-1602 2-port isolated RS-422/485";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_13fe_1600_1612_0004[] = "PCI-1612 4-port RS-232/422/485";
+#endif
+static const char pci_device_13fe_16ff[] = "PCI-16xx series PCI multiport serial board (function 1: RX/TX steering CPLD)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_13fe_16ff_1601_0000[] = "PCI-1601 2-port unisolated RS-422/485 PCI communications card";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_13fe_16ff_1602_0000[] = "PCI-1602 2-port isolated RS-422/485";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_13fe_16ff_1612_0000[] = "PCI-1612 4-port RS-232/422/485";
+#endif
 static const char pci_device_13fe_1733[] = "PCI-1733 32-channel isolated digital input card";
 static const char pci_device_13fe_1752[] = "PCI-1752";
 static const char pci_device_13fe_1754[] = "PCI-1754";
@@ -15984,7 +16537,20 @@ static const char pci_vendor_1414[] = "M
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1415[] = "Oxford Semiconductor Ltd";
 static const char pci_device_1415_8403[] = "VScom 011H-EP1 1 port parallel adaptor";
-static const char pci_device_1415_9501[] = "OX16PCI954 (Quad 16950 UART) function 0";
+static const char pci_device_1415_9500[] = "OX16PCI954 (Quad 16950 UART) function 0 (Disabled)";
+static const char pci_device_1415_9501[] = "OX16PCI954 (Quad 16950 UART) function 0 (Uart)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1415_9501_12c4_0201[] = "Titan/cPCI (2 port)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1415_9501_12c4_0202[] = "Titan/cPCI (4 port)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1415_9501_12c4_0203[] = "Titan/cPCI (8 port)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1415_9501_12c4_0210[] = "Titan/104-Plus (8 port, p1-4)";
+#endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1415_9501_131f_2050[] = "CyberPro (4-port)";
 #endif
@@ -16000,13 +16566,21 @@ static const char pci_subsys_1415_9501_1
 static const char pci_device_1415_950a[] = "EXSYS EX-41092 Dual 16950 Serial adapter";
 static const char pci_device_1415_950b[] = "OXCB950 Cardbus 16950 UART";
 static const char pci_device_1415_9510[] = "OX16PCI954 (Quad 16950 UART) function 1 (Disabled)";
-static const char pci_device_1415_9511[] = "OX16PCI954 (Quad 16950 UART) function 1";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1415_9510_12c4_0200[] = "Titan/cPCI (Unused)";
+#endif
+static const char pci_device_1415_9511[] = "OX16PCI954 (Quad 16950 UART) function 1 (8bit bus)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1415_9511_12c4_0211[] = "Titan/104-Plus (8 port, p5-8)";
+#endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1415_9511_15ed_2000[] = "MCCR Serial p4-7 of 8";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1415_9511_15ed_2001[] = "MCCR Serial p4-15 of 16";
 #endif
+static const char pci_device_1415_9512[] = "OX16PCI954 (Quad 16950 UART) function 1 (32bit bus)";
+static const char pci_device_1415_9513[] = "OX16PCI954 (Quad 16950 UART) function 1 (parallel port)";
 static const char pci_device_1415_9521[] = "OX16PCI952 (Dual 16950 UART)";
 static const char pci_device_1415_9523[] = "OX16PCI952 Integrated Parallel Port";
 #endif
@@ -16105,6 +16679,13 @@ static const char pci_vendor_1433[] = "E
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1435[] = "RTD Embedded Technologies, Inc.";
+static const char pci_device_1435_4520[] = "PCI4520";
+static const char pci_device_1435_6020[] = "SPM6020";
+static const char pci_device_1435_6030[] = "SPM6030";
+static const char pci_device_1435_6420[] = "SPM186420";
+static const char pci_device_1435_6430[] = "SPM176430";
+static const char pci_device_1435_7520[] = "DM7520";
+static const char pci_device_1435_7820[] = "DM7820";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1436[] = "CIS Technology Inc";
@@ -16433,6 +17014,7 @@ static const char pci_device_1497_1497[]
 static const char pci_vendor_1498[] = "TEWS Datentechnik GmBH";
 static const char pci_device_1498_0330[] = "TPMC816 2 Channel CAN bus controller.";
 static const char pci_device_1498_0385[] = "TPMC901 Extended CAN bus with 2/4/6 CAN controller";
+static const char pci_device_1498_21cc[] = "TCP460 CompactPCI 16 Channel Serial Interface RS232/RS422";
 static const char pci_device_1498_21cd[] = "TCP461 CompactPCI 8 Channel Serial Interface RS232/RS422";
 static const char pci_device_1498_30c8[] = "TPCI200";
 #endif
@@ -16563,6 +17145,8 @@ static const char pci_vendor_14bb[] = "S
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_14bc[] = "Globespan Semiconductor Inc.";
+static const char pci_device_14bc_d002[] = "Pulsar [PCI ADSL Card]";
+static const char pci_device_14bc_d00f[] = "Pulsar [PCI ADSL Card]";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_14bd[] = "CARDIO Control N.V.";
@@ -16578,9 +17162,14 @@ static const char pci_vendor_14c0[] = "C
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_14c1[] = "MYRICOM Inc.";
-static const char pci_device_14c1_0008[] = "Myri-10G Dual-Protocol Interconnect";
+static const char pci_device_14c1_0008[] = "Myri-10G Dual-Protocol NIC (10G-PCIE-8A)";
 static const char pci_device_14c1_8043[] = "Myrinet 2000 Scalable Cluster Interconnect";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14c1_8043_103c_1240[] = "Myrinet M2L-PCI64/2-3.0 LANai 7.4 (HP OEM)";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_14c2[] = "DTK Computer";
 #endif
@@ -16723,6 +17312,9 @@ static const char pci_device_14e4_080f[]
 static const char pci_device_14e4_0811[] = "Sentry5 External Interface Core";
 static const char pci_device_14e4_0816[] = "BCM3302 Sentry5 MIPS32 CPU";
 static const char pci_device_14e4_1600[] = "NetXtreme BCM5752 Gigabit Ethernet PCI Express";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14e4_1600_107b_5048[] = "E4500 Onboard";
+#endif
 static const char pci_device_14e4_1601[] = "NetXtreme BCM5752M Gigabit Ethernet PCI Express";
 static const char pci_device_14e4_1644[] = "NetXtreme BCM5700 Gigabit Ethernet";
 #ifdef INIT_SUBSYS_INFO
@@ -16944,6 +17536,18 @@ static const char pci_subsys_14e4_1648_0
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14e4_1648_10a9_8013[] = "Dual Port Gigabit Ethernet (PCI-X,Copper)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14e4_1648_10a9_8018[] = "Dual Port Gigabit Ethernet (A330)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14e4_1648_10a9_801a[] = "Dual Port Gigabit Ethernet (IA-blade)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14e4_1648_10a9_801b[] = "Quad Port Gigabit Ethernet (PCI-E,Copper)";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_14e4_1648_10b7_2000[] = "3C998-T Dual Port 10/100/1000 PCI-X";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -16958,10 +17562,25 @@ static const char pci_subsys_14e4_1648_1
 static const char pci_device_14e4_164a[] = "NetXtreme II BCM5706 Gigabit Ethernet";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14e4_164a_103c_3070[] = "NC380T PCI Express Dual Port Multifunction Gigabit Server Adapter";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_14e4_164a_103c_3101[] = "NC370T MultifuNCtion Gigabit Server Adapter";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_device_14e4_164c[] = "NetXtreme II BCM5708 Gigabit Ethernet";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14e4_164c_103c_7037[] = "NC373T PCI Express Multifunction Gigabit Server Adapter";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14e4_164c_103c_7038[] = "NC373i Integrated Multifunction Gigabit Server Adapter";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_device_14e4_164d[] = "NetXtreme BCM5702FE Gigabit Ethernet";
 static const char pci_device_14e4_1653[] = "NetXtreme BCM5705 Gigabit Ethernet";
 #endif
@@ -16977,7 +17596,7 @@ static const char pci_subsys_14e4_1654_0
 #ifdef VENDOR_INCLUDE_NONVIDEO
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_14e4_1654_103c_3100[] = "NC1020 HP ProLiant Gigabit Server Adapter 32 PCI";
+static const char pci_subsys_14e4_1654_103c_3100[] = "NC1020 ProLiant Gigabit Server Adapter 32 PCI";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 #endif
@@ -17066,7 +17685,17 @@ static const char pci_subsys_14e4_1677_1
 static const char pci_subsys_14e4_1677_1734_105d[] = "Scenic W620";
 #endif
 static const char pci_device_14e4_1678[] = "NetXtreme BCM5715 Gigabit Ethernet";
-static const char pci_device_14e4_1679[] = "NetXtreme 5715S Gigabit Ethernet";
+static const char pci_device_14e4_1679[] = "NetXtreme BCM5715S Gigabit Ethernet";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14e4_1679_103c_1707[] = "NC326m PCIe Dual Port Adapter";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14e4_1679_103c_170c[] = "NC325m PCIe Quad Port Adapter";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_14e4_1679_103c_703c[] = "NC326i PCIe Dual Port Gigabit Server Adapter";
@@ -17075,17 +17704,21 @@ static const char pci_subsys_14e4_1679_1
 static const char pci_device_14e4_167a[] = "NetXtreme BCM5754 Gigabit Ethernet PCI Express";
 static const char pci_device_14e4_167b[] = "NetXtreme BCM5755 Gigabit Ethernet PCI Express";
 static const char pci_device_14e4_167d[] = "NetXtreme BCM5751M Gigabit Ethernet PCI Express";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14e4_167d_17aa_2081[] = "Thinkpad R60e model 0657";
+#endif
 static const char pci_device_14e4_167e[] = "NetXtreme BCM5751F Fast Ethernet PCI Express";
 static const char pci_device_14e4_1693[] = "NetLink BCM5787M Gigabit Ethernet PCI Express";
 static const char pci_device_14e4_1696[] = "NetXtreme BCM5782 Gigabit Ethernet";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_14e4_1696_103c_12bc[] = "HP d530 CMT (DG746A)";
+static const char pci_subsys_14e4_1696_103c_12bc[] = "d530 CMT (DG746A)";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_14e4_1696_14e4_000d[] = "NetXtreme BCM5782 1000Base-T";
 #endif
+static const char pci_device_14e4_169a[] = "NetLink BCM5786 Gigabit Ethernet PCI Express";
 static const char pci_device_14e4_169b[] = "NetLink BCM5787 Gigabit Ethernet PCI Express";
 static const char pci_device_14e4_169c[] = "NetXtreme BCM5788 Gigabit Ethernet";
 #endif
@@ -17136,6 +17769,12 @@ static const char pci_subsys_14e4_16a7_1
 #endif
 static const char pci_device_14e4_16a8[] = "NetXtreme BCM5704S Gigabit Ethernet";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14e4_16a8_10a9_8014[] = "Dual Port Gigabit Ethernet (PCI-X,Fiber)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14e4_16a8_10a9_801c[] = "Quad Port Gigabit Ethernet (PCI-E,Fiber)";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_14e4_16a8_10b7_2001[] = "3C998-SX Dual Port 1000-SX PCI-X";
 #endif
 static const char pci_device_14e4_16aa[] = "NetXtreme II BCM5706S Gigabit Ethernet";
@@ -17145,6 +17784,21 @@ static const char pci_subsys_14e4_16aa_1
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_device_14e4_16ac[] = "NetXtreme II BCM5708S Gigabit Ethernet";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14e4_16ac_103c_1706[] = "NC373m Multifunction Gigabit Server Adapter";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14e4_16ac_103c_703b[] = "NC373i Integrated Multifunction Gigabit Server Adapter";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14e4_16ac_103c_703d[] = "NC373F PCI Express Multifunction Gigabit Server Adapter";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_device_14e4_16c6[] = "NetXtreme BCM5702A3 Gigabit Ethernet";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_14e4_16c6_10b7_1100[] = "3C1000B-T 10/100/1000 PCI";
@@ -17225,6 +17879,7 @@ static const char pci_device_14e4_4305[]
 static const char pci_device_14e4_4306[] = "BCM4307 Ethernet Controller";
 static const char pci_device_14e4_4307[] = "BCM4307 802.11b Wireless LAN Controller";
 static const char pci_device_14e4_4310[] = "BCM4310 Chipcommon I/OController";
+static const char pci_device_14e4_4311[] = "Dell Wireless 1390 WLAN Mini-PCI Card";
 static const char pci_device_14e4_4312[] = "BCM4310 UART";
 static const char pci_device_14e4_4313[] = "BCM4310 Ethernet Controller";
 static const char pci_device_14e4_4315[] = "BCM4310 USB Controller";
@@ -17255,7 +17910,7 @@ static const char pci_subsys_14e4_4318_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_14e4_4318_1737_0048[] = "WPC54G-EU version 3 [Wireless-G Notebook Adapter]";
 #endif
-static const char pci_device_14e4_4319[] = "Dell Wireless 1470 DualBand WLAN";
+static const char pci_device_14e4_4319[] = "BCM4311 [AirForce 54g] 802.11a/b/g PCI Express Transceiver";
 static const char pci_device_14e4_4320[] = "BCM4306 802.11b/g Wireless LAN Controller";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -17333,7 +17988,13 @@ static const char pci_subsys_14e4_4325_1
 static const char pci_subsys_14e4_4325_1414_0004[] = "Wireless PCI Adapter MN-730";
 #endif
 static const char pci_device_14e4_4326[] = "BCM4307 Chipcommon I/O Controller?";
+static const char pci_device_14e4_4329[] = "BCM43XG";
 static const char pci_device_14e4_4401[] = "BCM4401 100Base-T";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_14e4_4401_103c_08b0[] = "tc1100 tablet";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_14e4_4401_1043_80a8[] = "A7V8X motherboard";
 #endif
@@ -18263,6 +18924,7 @@ static const char pci_vendor_1541[] = "M
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1542[] = "Concurrent Computer Corporation";
+static const char pci_device_1542_9260[] = "RCIM-II Real-Time Clock & Interrupt Module";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1543[] = "SILICON Laboratories";
@@ -18972,6 +19634,7 @@ static const char pci_device_166d_0002[]
 static const char pci_vendor_1677[] = "Bernecker + Rainer";
 static const char pci_device_1677_104e[] = "5LS172.6 B&R Dual CAN Interface Card";
 static const char pci_device_1677_12d7[] = "5LS172.61 B&R Dual CAN Interface Card";
+static const char pci_device_1677_20ad[] = "5ACPCI.MFIO-K01 Profibus DP / K-Feldbus / COM";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_167b[] = "ZyDAS Technology Corp.";
@@ -19047,22 +19710,31 @@ static const char pci_subsys_168c_0013_1
 static const char pci_subsys_168c_0013_14b7_0a60[] = "8482-WD ORiNOCO 11a/b/g Wireless PCI Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_168c_0013_1668_1026[] = "IBM HighRate 11 a/b/g Wireless CardBus Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_168c_0013_168c_0013[] = "AirPlus XtremeG DWL-G650 Wireless PCMCIA Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_168c_0013_168c_1025[] = "DWL-G650B2 Wireless CardBus Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_168c_0013_168c_1027[] = "Netgate NL-3054CB ARIES b/g CardBus Adapter";
+static const char pci_subsys_168c_0013_168c_1027[] = "Engenius NL-3054CB ARIES b/g CardBus Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_168c_0013_168c_1042[] = "Ubiquiti Networks SuperRange a/b/g Cardbus Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_168c_0013_168c_2026[] = "Netgate 5354MP ARIES a(108Mb turbo)/b/g MiniPCI Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_168c_0013_168c_2041[] = "Netgate 5354MP Plus ARIES2 b/g MiniPCI Adapter";
+static const char pci_subsys_168c_0013_168c_2041[] = "Engenius 5354MP Plus ARIES2 b/g MiniPCI Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_168c_0013_168c_2042[] = "Engenius 5354MP Plus ARIES2 a/b/g MiniPCI Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_168c_0013_168c_2042[] = "Netgate 5354MP Plus ARIES2 a/b/g MiniPCI Adapter";
+static const char pci_subsys_168c_0013_168c_2051[] = "TRENDnet TEW-443PI Wireless PCI Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_168c_0013_16ab_7302[] = "Trust Speedshare Turbo Pro Wireless PCI Adapter";
@@ -19090,6 +19762,9 @@ static const char pci_subsys_168c_001a_1
 static const char pci_subsys_168c_001a_1186_3a24[] = "D-Link AirPlus G DWL-G650+A Wireless Cardbus Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_168c_001a_168c_001a[] = "Belkin FD7000";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_168c_001a_168c_1052[] = "TP-Link TL-WN510G Wireless CardBus Adapter";
 #endif
 static const char pci_device_168c_001b[] = "AR5006X 802.11abg NIC";
@@ -19100,13 +19775,16 @@ static const char pci_subsys_168c_001b_1
 static const char pci_subsys_168c_001b_1186_3a22[] = "D-Link AirPremier AG DWL-AG530 Wireless PCI Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_168c_001b_168c_2062[] = "EnGenius EMP-8602 (400mw)";
+static const char pci_subsys_168c_001b_168c_2062[] = "EnGenius EMP-8602 (400mw) or Compex WLM54AG (SuperAG)";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_168c_001b_168c_2063[] = "EnGenius EMP-8602 (400mw)";
+static const char pci_subsys_168c_001b_168c_2063[] = "EnGenius EMP-8602 (400mw) or Compex WLM54AG";
 #endif
 static const char pci_device_168c_0020[] = "AR5005VL 802.11bg Wireless NIC";
 static const char pci_device_168c_1014[] = "AR5212 802.11abg NIC";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_168c_1014_1014_058a[] = "ThinkPad 11a/b/g Wireless LAN Mini Express Adapter (AR5BXB6)";
+#endif
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1695[] = "EPoX Computer Co., Ltd.";
@@ -19173,9 +19851,14 @@ static const char pci_vendor_16e3[] = "E
 static const char pci_device_16e3_1e0f[] = "LEON2FT Processor";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_16e5[] = "Intellon Corp.";
+static const char pci_device_16e5_6000[] = "INT6000 Ethernet-to-Powerline Bridge [HomePlug AV]";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_16ec[] = "U.S. Robotics";
 static const char pci_device_16ec_00ff[] = "USR997900 10/100 Mbps PCI Network Card";
 static const char pci_device_16ec_0116[] = "USR997902 10/100/1000 Mbps PCI Network Card";
+static const char pci_device_16ec_2f00[] = "USR5660A (USR265660A, USR5660A-BP) 56K PCI Faxmodem";
 static const char pci_device_16ec_3685[] = "Wireless Access PCI Adapter Model 022415";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -19353,15 +20036,38 @@ static const char pci_vendor_17d5[] = "S
 static const char pci_device_17d5_5831[] = "Xframe 10 Gigabit Ethernet PCI-X";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_17d5_5831_103c_12d5[] = "HP PCI-X 133MHz 10GbE SR Fiber";
+static const char pci_subsys_17d5_5831_103c_12d5[] = "PCI-X 133MHz 10GbE SR Fiber";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_17d5_5831_10a9_8020[] = "Single Port 10 Gigabit Ethernet (PCI-X, Fiber)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_17d5_5831_10a9_8024[] = "Single Port 10 Gigabit Ethernet (PCI-X, Fiber)";
+#endif
 static const char pci_device_17d5_5832[] = "Xframe II 10Gbps Ethernet";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_17d5_5832_10a9_8021[] = "Single Port 10 Gigabit Ethernet II (PCI-X, Fiber)";
+#endif
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_17db[] = "Cray Inc";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_17de[] = "KWorld Computer Co. Ltd.";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_17e4[] = "Sectra AB";
+static const char pci_device_17e4_0001[] = "KK671 Cardbus encryption board";
+static const char pci_device_17e4_0002[] = "KK672 Cardbus encryption board";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_17e6[] = "Entropic Communications Inc.";
+static const char pci_device_17e6_0010[] = "EN2010 [c.Link] MoCA Network Controller (Coax, PCI interface)";
+static const char pci_device_17e6_0011[] = "EN2010 [c.Link] MoCA Network Controller (Coax, MPEG interface)";
+static const char pci_device_17e6_0021[] = "EN2210 [c.Link] MoCA Network Controller (Coax)";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_17ee[] = "Connect Components Ltd";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -19479,11 +20185,15 @@ static const char pci_vendor_183b[] = "M
 static const char pci_device_183b_08a7[] = "MVC100 DVI";
 static const char pci_device_183b_08a8[] = "MVC101 SDI";
 static const char pci_device_183b_08a9[] = "MVC102 DVI+Audio";
+static const char pci_device_183b_08b0[] = "MVC200-DC";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1849[] = "ASRock Incorporation";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_184a[] = "Thales Computers";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1851[] = "Microtune, Inc.";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -19519,6 +20229,9 @@ static const char pci_device_187e_3403[]
 static const char pci_device_187e_340e[] = "M-302 802.11g XtremeMIMO";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_1885[] = "Avvida Systems Inc.";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1888[] = "Varisys Ltd";
 static const char pci_device_1888_0301[] = "VMFX1 FPGA PMC module";
 static const char pci_device_1888_0601[] = "VSM2 dual PMC carrier";
@@ -19543,7 +20256,8 @@ static const char pci_vendor_18a1[] = "A
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_18ac[] = "DViCO Corporation";
 static const char pci_device_18ac_d500[] = "FusionHDTV 5";
-static const char pci_device_18ac_d810[] = "FusionHDTV 3 Gold";
+static const char pci_device_18ac_d800[] = "FusionHDTV 3 Gold";
+static const char pci_device_18ac_d810[] = "FusionHDTV 3 Gold-Q";
 static const char pci_device_18ac_d820[] = "FusionHDTV 3 Gold-T";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -19611,6 +20325,12 @@ static const char pci_subsys_18ec_c058_1
 #endif
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_18f6[] = "NextIO";
+static const char pci_device_18f6_1000[] = "[Nexsis] Switch Virtual P2P PCIe Bridge";
+static const char pci_device_18f6_1050[] = "[Nexsis] Switch Virtual P2P PCI Bridge";
+static const char pci_device_18f6_2000[] = "[Nexsis] Switch Integrated Mgmt. Endpoint";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_18f7[] = "Commtech, Inc.";
 static const char pci_device_18f7_0001[] = "Fastcom ESCC-PCI-335";
 static const char pci_device_18f7_0002[] = "Fastcom 422/4-PCI-335";
@@ -19629,6 +20349,7 @@ static const char pci_device_1904_8139[]
 static const char pci_vendor_1923[] = "Sangoma Technologies Corp.";
 static const char pci_device_1923_0040[] = "A200/Remora FXO/FXS Analog AFT card";
 static const char pci_device_1923_0100[] = "A104d QUAD T1/E1 AFT card";
+static const char pci_device_1923_0300[] = "A101 single-port T1/E1";
 static const char pci_device_1923_0400[] = "A104u Quad T1/E1 AFT";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -19646,7 +20367,16 @@ static const char pci_vendor_1942[] = "C
 static const char pci_device_1942_e511[] = "CSX600 Advance Accelerator Board";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_194a[] = "DapTechnology B.V.";
+static const char pci_device_194a_1111[] = "FireSpy3850";
+static const char pci_device_194a_1112[] = "FireSpy450b";
+static const char pci_device_194a_1113[] = "FireSpy450bT";
+static const char pci_device_194a_1114[] = "FireSpy850";
+static const char pci_device_194a_1115[] = "FireSpy850bT";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1957[] = "Freescale Semiconductor Inc";
+static const char pci_device_1957_0012[] = "MPC8548 [PowerQUICC III]";
 static const char pci_device_1957_0080[] = "MPC8349E";
 static const char pci_device_1957_0081[] = "MPC8349";
 static const char pci_device_1957_0082[] = "MPC8347E TBGA";
@@ -19664,6 +20394,10 @@ static const char pci_vendor_1966[] = "O
 static const char pci_device_1966_1975[] = "DVG64 family";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_1969[] = "Attansic Technology Corp.";
+static const char pci_device_1969_1048[] = "L1 Gigabit Ethernet Adapter";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_196a[] = "Sensory Networks Inc.";
 static const char pci_device_196a_0101[] = "NodalCore C-1000 Content Classification Accelerator";
 static const char pci_device_196a_0102[] = "NodalCore C-2000 Content Classification Accelerator";
@@ -19708,6 +20442,14 @@ static const char pci_vendor_19d4[] = "Q
 static const char pci_vendor_19e2[] = "Vector Informatik GmbH";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_19e7[] = "NET (Network Equipment Technologies)";
+static const char pci_device_19e7_1001[] = "STIX DSP Card";
+static const char pci_device_19e7_1002[] = "STIX - 1 Port T1/E1 Card";
+static const char pci_device_19e7_1003[] = "STIX - 2 Port T1/E1 Card";
+static const char pci_device_19e7_1004[] = "STIX - 4 Port T1/E1 Card";
+static const char pci_device_19e7_1005[] = "STIX - 4 Port FXS Card";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1a03[] = "ASPEED Technology, Inc.";
 static const char pci_device_1a03_2000[] = "AST2000";
 #endif
@@ -19722,6 +20464,9 @@ static const char pci_vendor_1a1d[] = "G
 static const char pci_vendor_1a29[] = "Fortinet, Inc.";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_1a51[] = "Hectronic AB";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1b13[] = "Jaton Corp";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -19802,6 +20547,9 @@ static const char pci_device_3388_0014[]
 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_1775_ce90[] = "CE9";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_3388_0021_4c53_1050[] = "CT7 mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -20018,12 +20766,21 @@ static const char pci_subsys_4444_0016_0
 static const char pci_subsys_4444_0016_0270_0801[] = "WinTV PVR 150";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_4444_0016_10fc_d038[] = "GV-MVP/RX2W (1st unit)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_4444_0016_10fc_d039[] = "GV-MVP/RX2W (2nd unit)";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_4444_0016_12ab_fff3[] = "MPG600";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_4444_0016_12ab_ffff[] = "MPG600";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_4444_0016_1461_c019[] = "UltraTV 1500 MCE";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_4444_0016_9005_0092[] = "VideOh! AVC-2010";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -20453,6 +21210,7 @@ static const char pci_device_6666_0101[]
 static const char pci_vendor_7063[] = "pcHDTV";
 static const char pci_device_7063_2000[] = "HD-2000";
 static const char pci_device_7063_3000[] = "HD-3000";
+static const char pci_device_7063_5500[] = "HD5500 HDTV";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_7604[] = "O.N. Electronic Co Ltd.";
@@ -20605,7 +21363,7 @@ static const char pci_subsys_8086_1008_8
 static const char pci_subsys_8086_1008_8086_2107[] = "PRO/1000 XT Server Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_1008_8086_2110[] = "PRO/1000 XT Server Adapter";
+static const char pci_subsys_8086_1008_8086_2110[] = "PRO/1000 XT Desktop Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1008_8086_3108[] = "PRO/1000 XT Network Connection";
@@ -20652,10 +21410,10 @@ static const char pci_subsys_8086_100e_1
 static const char pci_subsys_8086_100e_1014_026a[] = "PRO/1000 MT Network Connection";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_100e_1024_0134[] = "Poweredge SC600";
+static const char pci_subsys_8086_100e_1028_002e[] = "Optiplex GX260";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_100e_1028_002e[] = "Optiplex GX260";
+static const char pci_subsys_8086_100e_1028_0134[] = "PowerEdge 600SC";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_100e_1028_0151[] = "PRO/1000 MT Network Connection";
@@ -20711,10 +21469,10 @@ static const char pci_subsys_8086_1010_4
 static const char pci_subsys_8086_1010_8086_1011[] = "PRO/1000 MT Dual Port Server Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_1010_8086_1012[] = "Primergy RX300";
+static const char pci_subsys_8086_1010_8086_1012[] = "PRO/1000 MT Dual Port Server Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_1010_8086_101a[] = "PRO/1000 MT Dual Port Network Adapter";
+static const char pci_subsys_8086_1010_8086_101a[] = "PRO/1000 MT Dual Port Network Connection";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1010_8086_3424[] = "SE7501HG2 Mainboard";
@@ -20736,19 +21494,28 @@ static const char pci_subsys_8086_1012_0
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1012_8086_1012[] = "PRO/1000 MF Dual Port Server Adapter";
 #endif
-static const char pci_device_8086_1013[] = "82541EI Gigabit Ethernet Controller (Copper)";
+static const char pci_device_8086_1013[] = "82541EI Gigabit Ethernet Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1013_8086_0013[] = "PRO/1000 MT Network Connection";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_1013_8086_1013[] = "IBM ThinkCentre Network Card";
+static const char pci_subsys_8086_1013_8086_1013[] = "PRO/1000 MT Network Connection";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1013_8086_1113[] = "PRO/1000 MT Desktop Adapter";
 #endif
 static const char pci_device_8086_1014[] = "82541ER Gigabit Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1014_8086_0014[] = "PRO/1000 MT Desktop Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1014_8086_1014[] = "PRO/1000 MT Network Connection";
+#endif
 static const char pci_device_8086_1015[] = "82540EM Gigabit Ethernet Controller (LOM)";
-static const char pci_device_8086_1016[] = "82540EP Gigabit Ethernet Controller (LOM)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1015_8086_1015[] = "PRO/1000 MT Mobile Connection";
+#endif
+static const char pci_device_8086_1016[] = "82540EP Gigabit Ethernet Controller (Mobile)";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1016_1014_052c[] = "PRO/1000 MT Mobile Connection";
 #endif
@@ -20758,15 +21525,15 @@ static const char pci_subsys_8086_1016_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1016_8086_1016[] = "PRO/1000 MT Mobile Connection";
 #endif
-static const char pci_device_8086_1017[] = "82540EP Gigabit Ethernet Controller (LOM)";
+static const char pci_device_8086_1017[] = "82540EP Gigabit Ethernet Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1017_8086_1017[] = "PR0/1000 MT Desktop Connection";
 #endif
 static const char pci_device_8086_1018[] = "82541EI Gigabit Ethernet Controller";
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_1018_8086_1018[] = "PRO/1000 MT Desktop Adapter";
+static const char pci_subsys_8086_1018_8086_1018[] = "PRO/1000 MT Mobile Connection";
 #endif
-static const char pci_device_8086_1019[] = "82547EI Gigabit Ethernet Controller (LOM)";
+static const char pci_device_8086_1019[] = "82547EI Gigabit Ethernet Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1019_1458_1019[] = "GA-8IPE1000 Pro2 motherboard (865PE)";
 #endif
@@ -20786,6 +21553,9 @@ static const char pci_subsys_8086_1019_8
 static const char pci_subsys_8086_1019_8086_3427[] = "S875WP1-E mainboard";
 #endif
 static const char pci_device_8086_101a[] = "82547EI Gigabit Ethernet Controller (Mobile)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_101a_8086_101a[] = "PRO/1000 CT Mobile Connection";
+#endif
 static const char pci_device_8086_101d[] = "82546EB Gigabit Ethernet Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_101d_8086_1000[] = "PRO/1000 MT Quad Port Server Adapter";
@@ -20814,6 +21584,9 @@ static const char pci_subsys_8086_1026_8
 static const char pci_subsys_8086_1026_8086_1002[] = "PRO/1000 MT Server Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1026_8086_1003[] = "PRO/1000 GT Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1026_8086_1026[] = "PRO/1000 MT Server Connection";
 #endif
 static const char pci_device_8086_1027[] = "82545GM Gigabit Ethernet Controller";
@@ -20834,7 +21607,7 @@ static const char pci_subsys_8086_1027_8
 #endif
 static const char pci_device_8086_1028[] = "82545GM Gigabit Ethernet Controller";
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_1028_8086_1028[] = "PRO/1000 MB Server Adapter";
+static const char pci_subsys_8086_1028_8086_1028[] = "PRO/1000 MB Server Connection";
 #endif
 static const char pci_device_8086_1029[] = "82559 Ethernet Controller";
 static const char pci_device_8086_1030[] = "82559 InBusiness 10/100";
@@ -20869,7 +21642,7 @@ static const char pci_subsys_8086_1031_1
 static const char pci_device_8086_1032[] = "82801CAM (ICH3) PRO/100 VE Ethernet Controller";
 static const char pci_device_8086_1033[] = "82801CAM (ICH3) PRO/100 VM (LOM) Ethernet Controller";
 static const char pci_device_8086_1034[] = "82801CAM (ICH3) PRO/100 VM Ethernet Controller";
-static const char pci_device_8086_1035[] = "82801CAM (ICH3)/82562EH (LOM)  Ethernet Controller";
+static const char pci_device_8086_1035[] = "82801CAM (ICH3)/82562EH (LOM) Ethernet Controller";
 static const char pci_device_8086_1036[] = "82801CAM (ICH3) 82562EH Ethernet Controller";
 static const char pci_device_8086_1037[] = "82801CAM (ICH3) Chipset Ethernet Controller";
 static const char pci_device_8086_1038[] = "82801CAM (ICH3) PRO/100 VM (KM) Ethernet Controller";
@@ -20884,6 +21657,9 @@ static const char pci_device_8086_103a[]
 static const char pci_device_8086_103b[] = "82801DB PRO/100 VM (LOM) Ethernet Controller";
 static const char pci_device_8086_103c[] = "82801DB PRO/100 VM (CNR) Ethernet Controller";
 static const char pci_device_8086_103d[] = "82801DB PRO/100 VE (MOB) Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_103d_1014_0522[] = "Thinkpad R50e model 1634";
+#endif
 static const char pci_device_8086_103e[] = "82801DB PRO/100 VM (MOB) Ethernet Controller";
 static const char pci_device_8086_1040[] = "536EP Data Fax Modem";
 #ifdef INIT_SUBSYS_INFO
@@ -20891,6 +21667,9 @@ static const char pci_subsys_8086_1040_1
 #endif
 static const char pci_device_8086_1043[] = "PRO/Wireless LAN 2100 3B Mini PCI Adapter";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1043_103c_08b0[] = "tc1100 tablet";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1043_8086_2527[] = "MIM2000/Centrino";
 #endif
 static const char pci_device_8086_1048[] = "PRO/10GbE LR Server Adapter";
@@ -20900,7 +21679,11 @@ static const char pci_subsys_8086_1048_8
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1048_8086_a11f[] = "PRO/10GbE LR Server Adapter";
 #endif
-static const char pci_device_8086_104b[] = "Ethernet Controller";
+static const char pci_device_8086_1049[] = "82566MM Gigabit Network Connection";
+static const char pci_device_8086_104a[] = "82566DM Gigabit Network Connection";
+static const char pci_device_8086_104b[] = "82566DC Gigabit Network Connection";
+static const char pci_device_8086_104c[] = "82562V 10/100 Network Connection";
+static const char pci_device_8086_104d[] = "82566MC Gigabit Network Connection";
 static const char pci_device_8086_1050[] = "82562EZ 10/100 Ethernet Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1050_1462_728c[] = "865PE Neo2 (MS-6728)";
@@ -20921,12 +21704,52 @@ static const char pci_device_8086_1051[]
 static const char pci_device_8086_1052[] = "PRO/100 VM Network Connection";
 static const char pci_device_8086_1053[] = "PRO/100 VM Network Connection";
 static const char pci_device_8086_1059[] = "82551QM Ethernet Controller";
+static const char pci_device_8086_105b[] = "82546GB Gigabit Ethernet Controller (Copper)";
 static const char pci_device_8086_105e[] = "82571EB Gigabit Ethernet Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_105e_103c_7044[] = "NC360T PCI Express Dual Port Gigabit Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_105e_1775_6003[] = "Telum GE-QT";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_105e_8086_005e[] = "PRO/1000 PT Dual Port Server Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_105e_8086_105e[] = "PRO/1000 PT Dual Port Network Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_105e_8086_115e[] = "PRO/1000 PT Dual Port Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_105e_8086_116e[] = "PRO/1000 PT Dual Port Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_105e_8086_125e[] = "PRO/1000 PT Dual Port Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_105e_8086_135e[] = "PRO/1000 PT Dual Port Server Adapter";
+#endif
 static const char pci_device_8086_105f[] = "82571EB Gigabit Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_105f_8086_115f[] = "PRO/1000 PF Dual Port Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_105f_8086_116f[] = "PRO/1000 PF Dual Port Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_105f_8086_125f[] = "PRO/1000 PF Dual Port Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_105f_8086_135f[] = "PRO/1000 PF Dual Port Server Adapter";
+#endif
 static const char pci_device_8086_1060[] = "82571EB Gigabit Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1060_8086_0060[] = "PRO/1000 PB Dual Port Server Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1060_8086_1060[] = "PRO/1000 PB Dual Port Server Connection";
+#endif
 static const char pci_device_8086_1064[] = "82562ET/EZ/GT/GZ - PRO/100 VE (LOM) Ethernet Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1064_1043_80f8[] = "P5GD1-VW Mainboard";
@@ -20948,7 +21771,7 @@ static const char pci_subsys_8086_1075_8
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1075_8086_1075[] = "PRO/1000 CT Network Connection";
 #endif
-static const char pci_device_8086_1076[] = "82541GI/PI Gigabit Ethernet Controller";
+static const char pci_device_8086_1076[] = "82541GI Gigabit Ethernet Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1076_1028_0165[] = "PowerEdge 750";
 #endif
@@ -20965,7 +21788,7 @@ static const char pci_subsys_8086_1076_8
 static const char pci_subsys_8086_1076_8086_1176[] = "PRO/1000 MT Desktop Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_1076_8086_1276[] = "PRO/1000 MT Desktop Adapter";
+static const char pci_subsys_8086_1076_8086_1276[] = "PRO/1000 MT Network Adapter";
 #endif
 static const char pci_device_8086_1077[] = "82541GI Gigabit Ethernet Controller";
 #ifdef INIT_SUBSYS_INFO
@@ -20977,16 +21800,22 @@ static const char pci_subsys_8086_1077_8
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1077_8086_1077[] = "PRO/1000 MT Mobile Connection";
 #endif
-static const char pci_device_8086_1078[] = "82541EI Gigabit Ethernet Controller";
+static const char pci_device_8086_1078[] = "82541ER Gigabit Ethernet Controller";
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_1078_8086_1078[] = "PRO/1000 MT Network Connection";
+static const char pci_subsys_8086_1078_8086_1078[] = "82541ER-based Network Connection";
 #endif
 static const char pci_device_8086_1079[] = "82546GB Gigabit Ethernet Controller";
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_1079_103c_12a6[] = "HP Dual Port 1000Base-T [A9900A]";
+static const char pci_subsys_8086_1079_103c_12a6[] = "Dual Port 1000Base-T [A9900A]";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1079_103c_12cf[] = "Core Dual Port 1000Base-T [AB352A]";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_1079_103c_12cf[] = "HP Core Dual Port 1000Base-T [AB352A]";
+static const char pci_subsys_8086_1079_1775_10d0[] = "V5D Single Board Computer Gigabit Ethernet";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1079_1775_ce90[] = "CE9";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1079_1fc1_0027[] = "Niagara 2261 Failover NIC";
@@ -21004,14 +21833,14 @@ static const char pci_subsys_8086_1079_8
 static const char pci_subsys_8086_1079_8086_1079[] = "PRO/1000 MT Dual Port Network Connection";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_1079_8086_1179[] = "PRO/1000 MT Dual Port Network Connection";
+static const char pci_subsys_8086_1079_8086_1179[] = "PRO/1000 MT Dual Port Server Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1079_8086_117a[] = "PRO/1000 MT Dual Port Server Adapter";
 #endif
 static const char pci_device_8086_107a[] = "82546GB Gigabit Ethernet Controller";
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_107a_103c_12a8[] = "HP Dual Port 1000base-SX [A9899A]";
+static const char pci_subsys_8086_107a_103c_12a8[] = "Dual Port 1000base-SX [A9899A]";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_107a_8086_107a[] = "PRO/1000 MF Dual Port Server Adapter";
@@ -21027,32 +21856,65 @@ static const char pci_subsys_8086_107b_8
 static const char pci_subsys_8086_107b_8086_107b[] = "PRO/1000 MB Dual Port Server Connection";
 #endif
 static const char pci_device_8086_107c[] = "82541PI Gigabit Ethernet Controller";
-static const char pci_device_8086_107d[] = "82572EI Gigabit Ethernet Controller";
-static const char pci_device_8086_107e[] = "82572EI Gigabit Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_107c_8086_1376[] = "PRO/1000 GT Desktop Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_107c_8086_1476[] = "PRO/1000 GT Desktop Adapter";
+#endif
+static const char pci_device_8086_107d[] = "82572EI Gigabit Ethernet Controller (Copper)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_107d_8086_1082[] = "PRO/1000 PT Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_107d_8086_1092[] = "PRO/1000 PT Server Adapter";
+#endif
+static const char pci_device_8086_107e[] = "82572EI Gigabit Ethernet Controller (Fiber)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_107e_8086_1084[] = "PRO/1000 PF Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_107e_8086_1094[] = "PRO/1000 PF Server Adapter";
+#endif
 static const char pci_device_8086_107f[] = "82572EI Gigabit Ethernet Controller";
 static const char pci_device_8086_1080[] = "FA82537EP 56K V.92 Data/Fax Modem PCI";
-static const char pci_device_8086_1081[] = "Enterprise Southbridge LAN Copper";
-static const char pci_device_8086_1082[] = "Enterprise Southbridge LAN fiber";
-static const char pci_device_8086_1083[] = "Enterprise Southbridge LAN SERDES";
-static const char pci_device_8086_1084[] = "Enterprise Southbridge IDE Redirection";
-static const char pci_device_8086_1085[] = "Enterprise Southbridge Serial Port Redirection";
-static const char pci_device_8086_1086[] = "Enterprise Southbridge IPMI/KCS0";
-static const char pci_device_8086_1087[] = "Enterprise Southbridge UHCI Redirection";
-static const char pci_device_8086_1089[] = "Enterprise Southbridge BT";
-static const char pci_device_8086_108a[] = "82546EB Gigabit Ethernet Controller";
+static const char pci_device_8086_1081[] = "631xESB/632xESB LAN Controller Copper";
+static const char pci_device_8086_1082[] = "631xESB/632xESB LAN Controller fiber";
+static const char pci_device_8086_1083[] = "631xESB/632xESB LAN Controller SERDES";
+static const char pci_device_8086_1084[] = "631xESB/632xESB IDE Redirection";
+static const char pci_device_8086_1085[] = "631xESB/632xESB Serial Port Redirection";
+static const char pci_device_8086_1086[] = "631xESB/632xESB IPMI/KCS0";
+static const char pci_device_8086_1087[] = "631xESB/632xESB UHCI Redirection";
+static const char pci_device_8086_1089[] = "631xESB/632xESB BT";
+static const char pci_device_8086_108a[] = "82546GB Gigabit Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_108a_8086_108a[] = "PRO/1000 P Dual Port Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_108a_8086_118a[] = "PRO/1000 P Dual Port Server Adapter";
+#endif
 static const char pci_device_8086_108b[] = "82573V Gigabit Ethernet Controller (Copper)";
 static const char pci_device_8086_108c[] = "82573E Gigabit Ethernet Controller (Copper)";
 static const char pci_device_8086_108e[] = "82573E KCS (Active Management)";
-static const char pci_device_8086_108f[] = "Intel(R) Active Management Technology - SOL";
-static const char pci_device_8086_1092[] = "Intel(R) PRO/100 VE Network Connection";
-static const char pci_device_8086_1096[] = "PRO/1000 EB Network Connection with I/O Acceleration";
-static const char pci_device_8086_1097[] = "Enterprise Southbridge DPT LAN fiber";
-static const char pci_device_8086_1098[] = "PRO/1000 EB Backplane Connection with I/O Acceleration";
-static const char pci_device_8086_1099[] = "82546GB Quad Port Server Adapter";
+static const char pci_device_8086_108f[] = "Active Management Technology - SOL";
+static const char pci_device_8086_1092[] = "PRO/100 VE Network Connection";
+static const char pci_device_8086_1096[] = "80003ES2LAN Gigabit Ethernet Controller (Copper)";
+static const char pci_device_8086_1097[] = "631xESB/632xESB DPT LAN Controller (Fiber)";
+static const char pci_device_8086_1098[] = "80003ES2LAN Gigabit Ethernet Controller (Serdes)";
+static const char pci_device_8086_1099[] = "82546GB Gigabit Ethernet Controller (Copper)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1099_8086_1099[] = "PRO/1000 GT Quad Port Server Adapter";
+#endif
 static const char pci_device_8086_109a[] = "82573L Gigabit Ethernet Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_109a_17aa_2001[] = "ThinkPad T60";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_109a_17aa_207e[] = "Thinkpad X60s";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_109a_8086_109a[] = "PRO/1000 PL Network Connection";
+#endif
 static const char pci_device_8086_109b[] = "82546GB PRO/1000 GF Quad Port Server Adapter";
 static const char pci_device_8086_10a0[] = "82571EB PRO/1000 AT Quad Port Bypass Adapter";
 static const char pci_device_8086_10a1[] = "82571EB PRO/1000 AF Quad Port Bypass Adapter";
@@ -21060,10 +21922,25 @@ static const char pci_device_8086_10b0[]
 static const char pci_device_8086_10b2[] = "82573V PRO/1000 PM Network Connection";
 static const char pci_device_8086_10b3[] = "82573E PRO/1000 PM Network Connection";
 static const char pci_device_8086_10b4[] = "82573L PRO/1000 PL Network Connection";
-static const char pci_device_8086_10b5[] = "82546GB PRO/1000 GT Quad Port Server Adapter";
+static const char pci_device_8086_10b5[] = "82546GB Gigabit Ethernet Controller (Copper)";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_10b5_103c_3109[] = "NC340T PCI-X Quad-port Gigabit Server Adapter";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_10b5_8086_1099[] = "PRO/1000 GT Quad Port Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_10b5_8086_1199[] = "PRO/1000 GT Quad Port Server Adapter";
+#endif
+static const char pci_device_8086_10b9[] = "82572EI Gigabit Ethernet Controller (Copper)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_10b9_8086_1083[] = "PRO/1000 PT Desktop Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_10b9_8086_1093[] = "PRO/1000 PT Desktop Adapter";
+#endif
+static const char pci_device_8086_10ba[] = "80003ES2LAN Gigabit Ethernet Controller (Copper)";
+static const char pci_device_8086_10bb[] = "80003ES2LAN Gigabit Ethernet Controller (Serdes)";
 static const char pci_device_8086_1107[] = "PRO/1000 MF Server Adapter (LX)";
 static const char pci_device_8086_1130[] = "82815 815 Chipset Host Bridge and Memory Controller Hub";
 #ifdef INIT_SUBSYS_INFO
@@ -21103,7 +21980,7 @@ static const char pci_device_8086_1161[]
 static const char pci_subsys_8086_1161_8086_1161[] = "82806AA PCI64 Hub APIC";
 #endif
 static const char pci_device_8086_1162[] = "Xscale 80200 Big Endian Companion Chip";
-static const char pci_device_8086_1200[] = "Intel IXP1200 Network Processor";
+static const char pci_device_8086_1200[] = "IXP1200 Network Processor";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1200_172a_0000[] = "AEP SSL Accelerator";
 #endif
@@ -21330,6 +22207,9 @@ static const char pci_subsys_8086_1229_1
 static const char pci_subsys_8086_1229_1668_1100[] = "EtherExpress PRO/100B (TX) (MiniPCI Ethernet+Modem)";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1229_1775_ce90[] = "CE9";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1229_4c53_1080[] = "CT8 mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -21598,7 +22478,7 @@ static const char pci_device_8086_1239[]
 static const char pci_device_8086_123b[] = "82380PB PCI to PCI Docking Bridge";
 static const char pci_device_8086_123c[] = "82380AB (MISA) Mobile PCI-to-ISA Bridge";
 static const char pci_device_8086_123d[] = "683053 Programmable Interrupt Device";
-static const char pci_device_8086_123e[] = "82466GX (IHPC) Integrated Hot-Plug Controller";
+static const char pci_device_8086_123e[] = "82466GX (IHPC) Integrated Hot-Plug Controller (hidden mode)";
 static const char pci_device_8086_123f[] = "82466GX Integrated Hot-Plug Controller (IHPC)";
 static const char pci_device_8086_1240[] = "82752 (752) AGP Graphics Accelerator";
 static const char pci_device_8086_124b[] = "82380FB (MPCI2) Mobile Docking Controller";
@@ -21652,16 +22532,16 @@ static const char pci_subsys_8086_1960_1
 static const char pci_subsys_8086_1960_103c_03a2[] = "MegaRAID";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_1960_103c_10c6[] = "MegaRAID 438, HP NetRAID-3Si";
+static const char pci_subsys_8086_1960_103c_10c6[] = "MegaRAID 438, NetRAID-3Si";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_1960_103c_10c7[] = "MegaRAID T5, Integrated HP NetRAID";
+static const char pci_subsys_8086_1960_103c_10c7[] = "MegaRAID T5, Integrated NetRAID";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_1960_103c_10cc[] = "MegaRAID, Integrated HP NetRAID";
+static const char pci_subsys_8086_1960_103c_10cc[] = "MegaRAID, Integrated NetRAID";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_1960_103c_10cd[] = "HP NetRAID-1Si";
+static const char pci_subsys_8086_1960_103c_10cd[] = "NetRAID-1Si";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1960_105a_0000[] = "SuperTrak";
@@ -21705,7 +22585,7 @@ static const char pci_device_8086_1a30[]
 static const char pci_subsys_8086_1a30_1028_010e[] = "Optiplex GX240";
 #endif
 static const char pci_device_8086_1a31[] = "82845 845 (Brookdale) Chipset AGP Bridge";
-static const char pci_device_8086_1a38[] = "Server DMA Engine";
+static const char pci_device_8086_1a38[] = "5000 Series Chipset DMA Engine";
 static const char pci_device_8086_1a48[] = "PRO/10GbE SR Server Adapter";
 static const char pci_device_8086_2410[] = "82801AA ISA Bridge (LPC)";
 static const char pci_device_8086_2411[] = "82801AA IDE";
@@ -21754,6 +22634,9 @@ static const char pci_subsys_8086_2442_1
 static const char pci_subsys_8086_2442_1025_1016[] = "Travelmate 612 TX";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2442_1028_00c7[] = "Dimension 8100";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2442_1028_010e[] = "Optiplex GX240";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -21779,6 +22662,9 @@ static const char pci_subsys_8086_2443_1
 static const char pci_subsys_8086_2443_1025_1016[] = "Travelmate 612 TX";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2443_1028_00c7[] = "Dimension 8100";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2443_1028_010e[] = "Optiplex GX240";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -21801,6 +22687,9 @@ static const char pci_device_8086_2444[]
 static const char pci_subsys_8086_2444_1025_1016[] = "Travelmate 612 TX";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2444_1028_00c7[] = "Dimension 8100";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2444_1028_010e[] = "Optiplex GX240";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -21954,6 +22843,9 @@ static const char pci_device_8086_244b[]
 static const char pci_subsys_8086_244b_1014_01c6[] = "Netvista A40/A40p";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_244b_1028_00c7[] = "Dimension 8100";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_244b_1028_010e[] = "Optiplex GX240";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22126,6 +23018,9 @@ static const char pci_device_8086_24c2[]
 static const char pci_subsys_8086_24c2_1014_0267[] = "NetVista A30p";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c2_1014_052d[] = "Thinkpad R50e model 1634";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c2_1025_005a[] = "TravelMate 290";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22144,6 +23039,9 @@ static const char pci_subsys_8086_24c2_1
 static const char pci_subsys_8086_24c2_103c_0890[] = "NC6000 laptop";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c2_103c_08b0[] = "tc1100 tablet";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c2_1071_8160[] = "MIM2000";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22169,6 +23067,9 @@ static const char pci_device_8086_24c3[]
 static const char pci_subsys_8086_24c3_1014_0267[] = "NetVista A30p";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c3_1014_052d[] = "Thinkpad R50e model 1634";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c3_1025_005a[] = "TravelMate 290";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22181,6 +23082,9 @@ static const char pci_subsys_8086_24c3_1
 static const char pci_subsys_8086_24c3_103c_0890[] = "NC6000 laptop";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c3_103c_08b0[] = "tc1100 tablet";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c3_1071_8160[] = "MIM2000";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22203,6 +23107,9 @@ static const char pci_device_8086_24c4[]
 static const char pci_subsys_8086_24c4_1014_0267[] = "NetVista A30p";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c4_1014_052d[] = "Thinkpad R50e model 1634";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c4_1025_005a[] = "TravelMate 290";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22221,6 +23128,9 @@ static const char pci_subsys_8086_24c4_1
 static const char pci_subsys_8086_24c4_103c_0890[] = "NC6000 laptop";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c4_103c_08b0[] = "tc1100 tablet";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c4_1071_8160[] = "MIM2000";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22246,6 +23156,9 @@ static const char pci_subsys_8086_24c5_0
 static const char pci_subsys_8086_24c5_1014_0267[] = "NetVista A30p";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c5_1014_055f[] = "Thinkpad R50e model 1634";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c5_1025_005a[] = "TravelMate 290";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22264,6 +23177,9 @@ static const char pci_subsys_8086_24c5_1
 static const char pci_subsys_8086_24c5_103c_0890[] = "NC6000 laptop";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c5_103c_08b0[] = "tc1100 tablet";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c5_1071_8160[] = "MIM2000";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22280,6 +23196,9 @@ static const char pci_subsys_8086_24c5_1
 #endif
 static const char pci_device_8086_24c6[] = "82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c6_1014_0559[] = "Thinkpad R50e model 1634";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c6_1025_003c[] = "Aspire 2001WLCi (Compal CL50 motherboard) implementation";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22295,6 +23214,9 @@ static const char pci_subsys_8086_24c6_1
 static const char pci_subsys_8086_24c6_103c_0890[] = "NC6000 laptop";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c6_103c_08b0[] = "tc1100 tablet";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c6_1071_8160[] = "MIM2000";
 #endif
 static const char pci_device_8086_24c7[] = "82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #3";
@@ -22302,6 +23224,9 @@ static const char pci_device_8086_24c7[]
 static const char pci_subsys_8086_24c7_1014_0267[] = "NetVista A30p";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c7_1014_052d[] = "Thinkpad R50e model 1634";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c7_1025_005a[] = "TravelMate 290";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22320,6 +23245,9 @@ static const char pci_subsys_8086_24c7_1
 static const char pci_subsys_8086_24c7_103c_0890[] = "NC6000 laptop";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c7_103c_08b0[] = "tc1100 tablet";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c7_1071_8160[] = "MIM2000";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22339,6 +23267,9 @@ static const char pci_subsys_8086_24c7_8
 #endif
 static const char pci_device_8086_24ca[] = "82801DBM (ICH4-M) IDE Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24ca_1014_052d[] = "Thinkpad R50e model 1634";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24ca_1025_005a[] = "TravelMate 290";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22354,6 +23285,9 @@ static const char pci_subsys_8086_24ca_1
 static const char pci_subsys_8086_24ca_103c_0890[] = "NC6000 laptop";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24ca_103c_08b0[] = "tc1100 tablet";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24ca_1071_8160[] = "MIM2000";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22390,6 +23324,9 @@ static const char pci_device_8086_24cd[]
 static const char pci_subsys_8086_24cd_1014_0267[] = "NetVista A30p";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24cd_1014_052e[] = "Thinkpad R50e model 1634";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24cd_1025_005a[] = "TravelMate 290";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22414,9 +23351,15 @@ static const char pci_subsys_8086_24cd_1
 static const char pci_subsys_8086_24cd_103c_0890[] = "NC6000 laptop";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24cd_103c_08b0[] = "tc1100 tablet";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24cd_1071_8160[] = "MIM2000";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24cd_1179_ff00[] = "Satellite 2430";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24cd_1462_3981[] = "845PE Max (MS-6580)";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22461,6 +23404,9 @@ static const char pci_subsys_8086_24d1_8
 static const char pci_subsys_8086_24d1_8086_4246[] = "Desktop Board D865GBF";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d1_8086_4c43[] = "Desktop Board D865GLC";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24d1_8086_524c[] = "D865PERL mainboard";
 #endif
 static const char pci_device_8086_24d2[] = "82801EB/ER (ICH5/ICH5R) USB UHCI Controller #1";
@@ -22504,6 +23450,9 @@ static const char pci_subsys_8086_24d2_8
 static const char pci_subsys_8086_24d2_8086_4246[] = "Desktop Board D865GBF";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d2_8086_4c43[] = "Desktop Board D865GLC";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24d2_8086_524c[] = "D865PERL mainboard";
 #endif
 static const char pci_device_8086_24d3[] = "82801EB/ER (ICH5/ICH5R) SMBus Controller";
@@ -22538,6 +23487,9 @@ static const char pci_subsys_8086_24d3_8
 static const char pci_subsys_8086_24d3_8086_4246[] = "Desktop Board D865GBF";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d3_8086_4c43[] = "Desktop Board D865GLC";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24d3_8086_524c[] = "D865PERL mainboard";
 #endif
 static const char pci_device_8086_24d4[] = "82801EB/ER (ICH5/ICH5R) USB UHCI Controller #2";
@@ -22581,6 +23533,9 @@ static const char pci_subsys_8086_24d4_8
 static const char pci_subsys_8086_24d4_8086_4246[] = "Desktop Board D865GBF";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d4_8086_4c43[] = "Desktop Board D865GLC";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24d4_8086_524c[] = "D865PERL mainboard";
 #endif
 static const char pci_device_8086_24d5[] = "82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller";
@@ -22617,6 +23572,9 @@ static const char pci_subsys_8086_24d5_8
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24d5_8086_e001[] = "Desktop Board D865GBF";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d5_8086_e002[] = "SoundMax Intergrated Digital Audio";
+#endif
 static const char pci_device_8086_24d6[] = "82801EB/ER (ICH5/ICH5R) AC'97 Modem Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24d6_103c_006a[] = "NX9500";
@@ -22659,6 +23617,9 @@ static const char pci_subsys_8086_24d7_8
 static const char pci_subsys_8086_24d7_8086_4246[] = "Desktop Board D865GBF";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d7_8086_4c43[] = "Desktop Board D865GLC";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24d7_8086_524c[] = "D865PERL mainboard";
 #endif
 static const char pci_device_8086_24db[] = "82801EB/ER (ICH5/ICH5R) IDE Controller";
@@ -22705,6 +23666,9 @@ static const char pci_subsys_8086_24db_8
 static const char pci_subsys_8086_24db_8086_4246[] = "Desktop Board D865GBF";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24db_8086_4c43[] = "Desktop Board D865GLC";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24db_8086_524c[] = "D865PERL mainboard";
 #endif
 static const char pci_device_8086_24dc[] = "82801EB (ICH5) LPC Interface Bridge";
@@ -22743,6 +23707,9 @@ static const char pci_subsys_8086_24dd_8
 static const char pci_subsys_8086_24dd_8086_4246[] = "Desktop Board D865GBF";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24dd_8086_4c43[] = "Desktop Board D865GLC";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24dd_8086_524c[] = "D865PERL mainboard";
 #endif
 static const char pci_device_8086_24de[] = "82801EB/ER (ICH5/ICH5R) USB UHCI Controller #4";
@@ -22774,6 +23741,9 @@ static const char pci_subsys_8086_24de_8
 static const char pci_subsys_8086_24de_8086_4246[] = "Desktop Board D865GBF";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24de_8086_4c43[] = "Desktop Board D865GLC";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24de_8086_524c[] = "D865PERL mainboard";
 #endif
 static const char pci_device_8086_24df[] = "82801ER (ICH5R) SATA Controller";
@@ -22794,6 +23764,9 @@ static const char pci_device_8086_2520[]
 static const char pci_device_8086_2521[] = "82804AA MRH-S Memory Repeater Hub for SDRAM";
 static const char pci_device_8086_2530[] = "82850 850 (Tehama) Chipset Host Bridge (MCH)";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2530_1028_00c7[] = "Dimension 8100";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2530_147b_0507[] = "TH7II-RAID";
 #endif
 static const char pci_device_8086_2531[] = "82860 860 (Wombat) Chipset Host Bridge (MCH)";
@@ -22881,6 +23854,9 @@ static const char pci_subsys_8086_2572_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2572_8086_4246[] = "Desktop Board D865GBF";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2572_8086_4c43[] = "Desktop Board D865GLC";
+#endif
 static const char pci_device_8086_2573[] = "82865G/PE/P PCI to CSA Bridge";
 static const char pci_device_8086_2576[] = "82865G/PE/P Processor to I/O Memory Interface";
 static const char pci_device_8086_2578[] = "82875P/E7210 Memory Controller Hub";
@@ -22896,7 +23872,7 @@ static const char pci_subsys_8086_2578_1
 static const char pci_device_8086_2579[] = "82875P Processor to AGP Controller";
 static const char pci_device_8086_257b[] = "82875P/E7210 Processor to PCI to CSA Bridge";
 static const char pci_device_8086_257e[] = "82875P/E7210 Processor to I/O Memory Interface";
-static const char pci_device_8086_2580[] = "915G/P/GV/GL/PL/910GL Express Memory Controller Hub";
+static const char pci_device_8086_2580[] = "82915G/P/GV/GL/PL/910GL Memory Controller Hub";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2580_1458_2580[] = "GA-8I915ME-G Mainboard";
 #endif
@@ -22906,8 +23882,8 @@ static const char pci_subsys_8086_2580_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2580_1734_105b[] = "Scenic W620";
 #endif
-static const char pci_device_8086_2581[] = "915G/P/GV/GL/PL/910GL Express PCI Express Root Port";
-static const char pci_device_8086_2582[] = "82915G/GV/910GL Express Chipset Family Graphics Controller";
+static const char pci_device_8086_2581[] = "82915G/P/GV/GL/PL/910GL PCI Express Root Port";
+static const char pci_device_8086_2582[] = "82915G/GV/910GL Integrated Graphics Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2582_1028_1079[] = "Optiplex GX280";
 #endif
@@ -22923,8 +23899,8 @@ static const char pci_subsys_8086_2582_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2582_1734_105b[] = "Scenic W620";
 #endif
-static const char pci_device_8086_2584[] = "925X/XE Express Memory Controller Hub";
-static const char pci_device_8086_2585[] = "925X/XE Express PCI Express Root Port";
+static const char pci_device_8086_2584[] = "82925X/XE Memory Controller Hub";
+static const char pci_device_8086_2585[] = "82925X/XE PCI Express Root Port";
 static const char pci_device_8086_2588[] = "E7220/E7221 Memory Controller Hub";
 static const char pci_device_8086_2589[] = "E7220/E7221 PCI Express Root Port";
 static const char pci_device_8086_258a[] = "E7221 Integrated Graphics Controller";
@@ -22952,6 +23928,12 @@ static const char pci_subsys_8086_2592_1
 static const char pci_device_8086_25a1[] = "6300ESB LPC Interface Controller";
 static const char pci_device_8086_25a2[] = "6300ESB PATA Storage Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_25a2_1775_10d0[] = "V5D Single Board Computer IDE";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_25a2_1775_ce90[] = "CE9";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_25a2_4c53_10b0[] = "CL9 mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22959,6 +23941,9 @@ static const char pci_subsys_8086_25a2_4
 #endif
 static const char pci_device_8086_25a3[] = "6300ESB SATA Storage Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_25a3_1775_ce90[] = "CE9";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_25a3_4c53_10b0[] = "CL9 mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22969,6 +23954,12 @@ static const char pci_subsys_8086_25a3_4
 #endif
 static const char pci_device_8086_25a4[] = "6300ESB SMBus Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_25a4_1775_10d0[] = "V5D Single Board Computer";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_25a4_1775_ce90[] = "CE9";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_25a4_4c53_10b0[] = "CL9 mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22979,11 +23970,20 @@ static const char pci_subsys_8086_25a4_4
 #endif
 static const char pci_device_8086_25a6[] = "6300ESB AC'97 Audio Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_25a6_1775_ce90[] = "CE9";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_25a6_4c53_10b0[] = "CL9 mainboard";
 #endif
 static const char pci_device_8086_25a7[] = "6300ESB AC'97 Modem Controller";
 static const char pci_device_8086_25a9[] = "6300ESB USB Universal Host Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_25a9_1775_10d0[] = "V5D Single Board Computer USB";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_25a9_1775_ce90[] = "CE9";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_25a9_4c53_10b0[] = "CL9 mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22994,6 +23994,9 @@ static const char pci_subsys_8086_25a9_4
 #endif
 static const char pci_device_8086_25aa[] = "6300ESB USB Universal Host Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_25aa_1775_ce90[] = "CE9";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_25aa_4c53_10b0[] = "CL9 mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23001,6 +24004,12 @@ static const char pci_subsys_8086_25aa_4
 #endif
 static const char pci_device_8086_25ab[] = "6300ESB Watchdog Timer";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_25ab_1775_10d0[] = "V5D Single Board Computer";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_25ab_1775_ce90[] = "CE9";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_25ab_4c53_10b0[] = "CL9 mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23011,6 +24020,12 @@ static const char pci_subsys_8086_25ab_4
 #endif
 static const char pci_device_8086_25ac[] = "6300ESB I/O Advanced Programmable Interrupt Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_25ac_1775_10d0[] = "V5D Single Board Computer";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_25ac_1775_ce90[] = "CE9";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_25ac_4c53_10b0[] = "CL9 mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23021,6 +24036,12 @@ static const char pci_subsys_8086_25ac_4
 #endif
 static const char pci_device_8086_25ad[] = "6300ESB USB2 Enhanced Host Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_25ad_1775_10d0[] = "V5D Single Board Computer USB 2.0";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_25ad_1775_ce90[] = "CE9";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_25ad_4c53_10b0[] = "CL9 mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23037,26 +24058,25 @@ static const char pci_subsys_8086_25b0_4
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_25b0_4c53_10e0[] = "PSL09 PrPMC";
 #endif
-static const char pci_device_8086_25c0[] = "Workstation Memory Controller Hub";
-static const char pci_device_8086_25d0[] = "Server Memory Controller Hub";
-static const char pci_device_8086_25d4[] = "Server Memory Contoller Hub";
-static const char pci_device_8086_25d8[] = "Server Memory Controller Hub";
-static const char pci_device_8086_25e2[] = "Server PCI Express x4 Port 2";
-static const char pci_device_8086_25e3[] = "Server PCI Express x4 Port 3";
-static const char pci_device_8086_25e4[] = "Server PCI Express x4 Port 4";
-static const char pci_device_8086_25e5[] = "Server PCI Express x4 Port 5";
-static const char pci_device_8086_25e6[] = "Server PCI Express x4 Port 6";
-static const char pci_device_8086_25e7[] = "Server PCI Express x4 Port 7";
-static const char pci_device_8086_25e8[] = "Server AMB Memory Mapped Registers";
-static const char pci_device_8086_25f0[] = "Server Error Reporting Registers";
-static const char pci_device_8086_25f1[] = "Reserved Registers";
-static const char pci_device_8086_25f3[] = "Reserved Registers";
-static const char pci_device_8086_25f5[] = "Server FBD Registers";
-static const char pci_device_8086_25f6[] = "Server FBD Registers";
-static const char pci_device_8086_25f7[] = "Server PCI Express x8 Port 2-3";
-static const char pci_device_8086_25f8[] = "Server PCI Express x8 Port 4-5";
-static const char pci_device_8086_25f9[] = "Server PCI Express x8 Port 6-7";
-static const char pci_device_8086_25fa[] = "Server PCI Express x16 Port 4-7";
+static const char pci_device_8086_25c0[] = "5000X Chipset Memory Controller Hub";
+static const char pci_device_8086_25d0[] = "5000Z Chipset Memory Controller Hub";
+static const char pci_device_8086_25d4[] = "5000V Chipset Memory Controller Hub";
+static const char pci_device_8086_25d8[] = "5000P Chipset Memory Controller Hub";
+static const char pci_device_8086_25e2[] = "5000 Series Chipset PCI Express x4 Port 2";
+static const char pci_device_8086_25e3[] = "5000 Series Chipset PCI Express x4 Port 3";
+static const char pci_device_8086_25e4[] = "5000 Series Chipset PCI Express x4 Port 4";
+static const char pci_device_8086_25e5[] = "5000 Series Chipset PCI Express x4 Port 5";
+static const char pci_device_8086_25e6[] = "5000 Series Chipset PCI Express x4 Port 6";
+static const char pci_device_8086_25e7[] = "5000 Series Chipset PCI Express x4 Port 7";
+static const char pci_device_8086_25f0[] = "5000 Series Chipset Error Reporting Registers";
+static const char pci_device_8086_25f1[] = "5000 Series Chipset Reserved Registers";
+static const char pci_device_8086_25f3[] = "5000 Series Chipset Reserved Registers";
+static const char pci_device_8086_25f5[] = "5000 Series Chipset FBD Registers";
+static const char pci_device_8086_25f6[] = "5000 Series Chipset FBD Registers";
+static const char pci_device_8086_25f7[] = "5000 Series Chipset PCI Express x8 Port 2-3";
+static const char pci_device_8086_25f8[] = "5000 Series Chipset PCI Express x8 Port 4-5";
+static const char pci_device_8086_25f9[] = "5000 Series Chipset PCI Express x8 Port 6-7";
+static const char pci_device_8086_25fa[] = "5000X Chipset PCI Express x16 Port 4-7";
 static const char pci_device_8086_2600[] = "E8500/E8501 Hub Interface 1.5";
 static const char pci_device_8086_2601[] = "E8500/E8501 PCI Express x4 Port D";
 static const char pci_device_8086_2602[] = "E8500/E8501 PCI Express x4 Port C0";
@@ -23216,6 +24236,9 @@ static const char pci_subsys_8086_265c_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_265c_1734_105c[] = "Scenic W620";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_265c_8086_265c[] = "Dimension 3100";
+#endif
 static const char pci_device_8086_2660[] = "82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 1";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2660_103c_099c[] = "NX6110/NC6120";
@@ -23225,6 +24248,9 @@ static const char pci_device_8086_2664[]
 static const char pci_device_8086_2666[] = "82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 4";
 static const char pci_device_8086_2668[] = "82801FB/FBM/FR/FW/FRW (ICH6 Family) High Definition Audio Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2668_103c_2a09[] = "PufferM-UL8E";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2668_1043_814e[] = "P5GD1-VW Mainboard";
 #endif
 static const char pci_device_8086_266a[] = "82801FB/FBM/FR/FW/FRW (ICH6 Family) SMBus Controller";
@@ -23298,43 +24324,46 @@ static const char pci_subsys_8086_266f_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_266f_1734_105c[] = "Scenic W620";
 #endif
-static const char pci_device_8086_2670[] = "Enterprise Southbridge LPC";
-static const char pci_device_8086_2680[] = "Enterprise Southbridge SATA IDE";
-static const char pci_device_8086_2681[] = "Enterprise Southbridge SATA AHCI";
-static const char pci_device_8086_2682[] = "Enterprise Southbridge SATA RAID";
-static const char pci_device_8086_2683[] = "Enterprise Southbridge SATA RAID";
-static const char pci_device_8086_2688[] = "Enterprise Southbridge UHCI USB #1";
-static const char pci_device_8086_2689[] = "Enterprise Southbridge UHCI USB #2";
-static const char pci_device_8086_268a[] = "Enterprise Southbridge UHCI USB #3";
-static const char pci_device_8086_268b[] = "Enterprise Southbridge UHCI USB #4";
-static const char pci_device_8086_268c[] = "Enterprise Southbridge EHCI USB";
-static const char pci_device_8086_2690[] = "Enterprise Southbridge PCI Express Root Port 1";
-static const char pci_device_8086_2692[] = "Enterprise Southbridge PCI Express Root Port 2";
-static const char pci_device_8086_2694[] = "Enterprise Southbridge PCI Express Root Port 3";
-static const char pci_device_8086_2696[] = "Enterprise Southbridge PCI Express Root Port 4";
-static const char pci_device_8086_2698[] = "Enterprise Southbridge AC '97 Audio";
-static const char pci_device_8086_2699[] = "Enterprise Southbridge AC '97 Modem";
-static const char pci_device_8086_269a[] = "Enterprise Southbridge High Definition Audio";
-static const char pci_device_8086_269b[] = "Enterprise Southbridge SMBus";
-static const char pci_device_8086_269e[] = "Enterprise Southbridge PATA";
-static const char pci_device_8086_2770[] = "945G/GZ/P/PL Express Memory Controller Hub";
+static const char pci_device_8086_2670[] = "631xESB/632xESB/3100 Chipset LPC Interface Controller";
+static const char pci_device_8086_2680[] = "631xESB/632xESB/3100 Chipset SATA Storage Controller IDE";
+static const char pci_device_8086_2681[] = "631xESB/632xESB SATA Storage Controller AHCI";
+static const char pci_device_8086_2682[] = "631xESB/632xESB SATA Storage Controller RAID";
+static const char pci_device_8086_2683[] = "631xESB/632xESB SATA Storage Controller RAID";
+static const char pci_device_8086_2688[] = "631xESB/632xESB/3100 Chipset UHCI USB Controller #1";
+static const char pci_device_8086_2689[] = "631xESB/632xESB/3100 Chipset UHCI USB Controller #2";
+static const char pci_device_8086_268a[] = "631xESB/632xESB/3100 Chipset UHCI USB Controller #3";
+static const char pci_device_8086_268b[] = "631xESB/632xESB/3100 Chipset UHCI USB Controller #4";
+static const char pci_device_8086_268c[] = "631xESB/632xESB/3100 Chipset EHCI USB2 Controller";
+static const char pci_device_8086_2690[] = "631xESB/632xESB/3100 Chipset PCI Express Root Port 1";
+static const char pci_device_8086_2692[] = "631xESB/632xESB/3100 Chipset PCI Express Root Port 2";
+static const char pci_device_8086_2694[] = "631xESB/632xESB/3100 Chipset PCI Express Root Port 3";
+static const char pci_device_8086_2696[] = "631xESB/632xESB/3100 Chipset PCI Express Root Port 4";
+static const char pci_device_8086_2698[] = "631xESB/632xESB AC '97 Audio Controller";
+static const char pci_device_8086_2699[] = "631xESB/632xESB AC '97 Modem Controller";
+static const char pci_device_8086_269a[] = "631xESB/632xESB High Definition Audio Controller";
+static const char pci_device_8086_269b[] = "631xESB/632xESB/3100 Chipset SMBus Controller";
+static const char pci_device_8086_269e[] = "631xESB/632xESB IDE Controller";
+static const char pci_device_8086_2770[] = "82945G/GZ/P/PL Memory Controller Hub";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2770_107b_5048[] = "E4500";
+#endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2770_8086_544e[] = "DeskTop Board D945GTP";
 #endif
-static const char pci_device_8086_2771[] = "945G/GZ/P/PL Express PCI Express Root Port";
-static const char pci_device_8086_2772[] = "945G/GZ Express Integrated Graphics Controller";
+static const char pci_device_8086_2771[] = "82945G/GZ/P/PL PCI Express Root Port";
+static const char pci_device_8086_2772[] = "82945G/GZ Integrated Graphics Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2772_8086_544e[] = "DeskTop Board D945GTP";
 #endif
-static const char pci_device_8086_2774[] = "955X Express Memory Controller Hub";
-static const char pci_device_8086_2775[] = "955X Express PCI Express Root Port";
-static const char pci_device_8086_2776[] = "945G/GZ Express Integrated Graphics Controller";
-static const char pci_device_8086_2778[] = "E7230 Memory Controller Hub";
-static const char pci_device_8086_2779[] = "E7230 PCI Express Root Port";
-static const char pci_device_8086_277a[] = "975X Express PCI Express Root Port";
-static const char pci_device_8086_277c[] = "975X Express Memory Controller Hub";
-static const char pci_device_8086_277d[] = "975X Express PCI Express Root Port";
-static const char pci_device_8086_2782[] = "82915G Express Chipset Family Graphics Controller";
+static const char pci_device_8086_2774[] = "82955X Memory Controller Hub";
+static const char pci_device_8086_2775[] = "82955X PCI Express Root Port";
+static const char pci_device_8086_2776[] = "82945G/GZ Integrated Graphics Controller";
+static const char pci_device_8086_2778[] = "E7230/3000/3010 Memory Controller Hub";
+static const char pci_device_8086_2779[] = "E7230/3000/3010 PCI Express Root Port";
+static const char pci_device_8086_277a[] = "82975X/3010 PCI Express Root Port";
+static const char pci_device_8086_277c[] = "82975X Memory Controller Hub";
+static const char pci_device_8086_277d[] = "82975X PCI Express Root Port";
+static const char pci_device_8086_2782[] = "82915G Integrated Graphics Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2782_1043_2582[] = "P5GD1-VW Mainboard";
 #endif
@@ -23349,43 +24378,91 @@ static const char pci_subsys_8086_2792_1
 static const char pci_subsys_8086_2792_1043_1881[] = "GMA 900 915GM Integrated Graphics";
 #endif
 static const char pci_device_8086_27a0[] = "Mobile 945GM/PM/GMS/940GML and 945GT Express Memory Controller Hub";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27a0_17aa_2017[] = "Thinkpad R60e model 0657";
+#endif
 static const char pci_device_8086_27a1[] = "Mobile 945GM/PM/GMS/940GML and 945GT Express PCI Express Root Port";
 static const char pci_device_8086_27a2[] = "Mobile 945GM/GMS/940GML Express Integrated Graphics Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27a2_17aa_201a[] = "Thinkpad R60e model 0657";
+#endif
 static const char pci_device_8086_27a6[] = "Mobile 945GM/GMS/940GML Express Integrated Graphics Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27a6_17aa_201a[] = "Thinkpad R60e model 0657";
+#endif
 static const char pci_device_8086_27b0[] = "82801GH (ICH7DH) LPC Interface Bridge";
 static const char pci_device_8086_27b8[] = "82801GB/GR (ICH7 Family) LPC Interface Bridge";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27b8_107b_5048[] = "E4500";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_27b8_8086_544e[] = "DeskTop Board D945GTP";
 #endif
 static const char pci_device_8086_27b9[] = "82801GBM (ICH7-M) LPC Interface Bridge";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27b9_17aa_2009[] = "ThinkPad T60/R60 series";
+#endif
 static const char pci_device_8086_27bd[] = "82801GHM (ICH7-M DH) LPC Interface Bridge";
 static const char pci_device_8086_27c0[] = "82801GB/GR/GH (ICH7 Family) Serial ATA Storage Controller IDE";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27c0_107b_5048[] = "E4500";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_27c0_8086_544e[] = "DeskTop Board D945GTP";
 #endif
 static const char pci_device_8086_27c1[] = "82801GR/GH (ICH7 Family) Serial ATA Storage Controller AHCI";
 static const char pci_device_8086_27c3[] = "82801GR/GH (ICH7 Family) Serial ATA Storage Controller RAID";
 static const char pci_device_8086_27c4[] = "82801GBM/GHM (ICH7 Family) Serial ATA Storage Controller IDE";
 static const char pci_device_8086_27c5[] = "82801GBM/GHM (ICH7 Family) Serial ATA Storage Controller AHCI";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27c5_17aa_200d[] = "Thinkpad R60e model 0657";
+#endif
 static const char pci_device_8086_27c6[] = "82801GHM (ICH7-M DH) Serial ATA Storage Controller RAID";
 static const char pci_device_8086_27c8[] = "82801G (ICH7 Family) USB UHCI #1";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27c8_107b_5048[] = "E4500";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27c8_17aa_200a[] = "ThinkPad T60/R60 series";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_27c8_8086_544e[] = "DeskTop Board D945GTP";
 #endif
 static const char pci_device_8086_27c9[] = "82801G (ICH7 Family) USB UHCI #2";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27c9_107b_5048[] = "E4500";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27c9_17aa_200a[] = "ThinkPad T60/R60 series";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_27c9_8086_544e[] = "DeskTop Board D945GTP";
 #endif
 static const char pci_device_8086_27ca[] = "82801G (ICH7 Family) USB UHCI #3";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27ca_107b_5048[] = "E4500";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27ca_17aa_200a[] = "ThinkPad T60/R60 series";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_27ca_8086_544e[] = "DeskTop Board D945GTP";
 #endif
 static const char pci_device_8086_27cb[] = "82801G (ICH7 Family) USB UHCI #4";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27cb_107b_5048[] = "E4500";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27cb_17aa_200a[] = "ThinkPad T60/R60 series";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_27cb_8086_544e[] = "DeskTop Board D945GTP";
 #endif
 static const char pci_device_8086_27cc[] = "82801G (ICH7 Family) USB2 EHCI Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27cc_17aa_200b[] = "ThinkPad T60/R60 series";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_27cc_8086_544e[] = "DeskTop Board D945GTP";
 #endif
 static const char pci_device_8086_27d0[] = "82801G (ICH7 Family) PCI Express Port 1";
@@ -23393,8 +24470,20 @@ static const char pci_device_8086_27d2[]
 static const char pci_device_8086_27d4[] = "82801G (ICH7 Family) PCI Express Port 3";
 static const char pci_device_8086_27d6[] = "82801G (ICH7 Family) PCI Express Port 4";
 static const char pci_device_8086_27d8[] = "82801G (ICH7 Family) High Definition Audio Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27d8_107b_5048[] = "E4500";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27d8_152d_0753[] = "Softmodem";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27d8_17aa_2010[] = "ThinkPad T60/R60 series";
+#endif
 static const char pci_device_8086_27da[] = "82801G (ICH7 Family) SMBus Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27da_17aa_200f[] = "ThinkPad T60/R60 series";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_27da_8086_544e[] = "DeskTop Board D945GTP";
 #endif
 static const char pci_device_8086_27dc[] = "82801G (ICH7 Family) LAN Controller";
@@ -23405,67 +24494,81 @@ static const char pci_device_8086_27dd[]
 static const char pci_device_8086_27de[] = "82801G (ICH7 Family) AC'97 Audio Controller";
 static const char pci_device_8086_27df[] = "82801G (ICH7 Family) IDE Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27df_107b_5048[] = "E4500";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27df_17aa_200c[] = "Thinkpad R60e model 0657";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_27df_8086_544e[] = "DeskTop Board D945GTP";
 #endif
 static const char pci_device_8086_27e0[] = "82801GR/GH/GHM (ICH7 Family) PCI Express Port 5";
 static const char pci_device_8086_27e2[] = "82801GR/GH/GHM (ICH7 Family) PCI Express Port 6";
-static const char pci_device_8086_2810[] = "LPC Interface Controller";
+static const char pci_device_8086_2810[] = "82801HB/HR (ICH8/R) LPC Interface Controller";
 static const char pci_device_8086_2811[] = "Mobile LPC Interface Controller";
-static const char pci_device_8086_2812[] = "LPC Interface Controller";
-static const char pci_device_8086_2814[] = "LPC Interface Controller";
+static const char pci_device_8086_2812[] = "82801HH (ICH8DH) LPC Interface Controller";
+static const char pci_device_8086_2814[] = "82801HO (ICH8DO) LPC Interface Controller";
 static const char pci_device_8086_2815[] = "Mobile LPC Interface Controller";
-static const char pci_device_8086_2820[] = "SATA Controller 1 IDE";
-static const char pci_device_8086_2821[] = "SATA Controller AHCI";
-static const char pci_device_8086_2822[] = "SATA Controller RAID";
-static const char pci_device_8086_2824[] = "SATA Controller AHCI";
-static const char pci_device_8086_2825[] = "SATA Controller 2 IDE";
-static const char pci_device_8086_2828[] = "Mobile SATA Controller IDE";
-static const char pci_device_8086_2829[] = "Mobile SATA Controller AHCI";
-static const char pci_device_8086_282a[] = "Mobile SATA Controller RAID";
-static const char pci_device_8086_2830[] = "USB UHCI Controller #1";
-static const char pci_device_8086_2831[] = "USB UHCI Controller #2";
-static const char pci_device_8086_2832[] = "USB UHCI Controller #3";
-static const char pci_device_8086_2834[] = "USB UHCI Controller #4";
-static const char pci_device_8086_2835[] = "USB UHCI Controller #5";
-static const char pci_device_8086_2836[] = "USB2 EHCI Controller #1";
-static const char pci_device_8086_283a[] = "USB2 EHCI Controller #2";
-static const char pci_device_8086_283e[] = "SMBus Controller";
-static const char pci_device_8086_283f[] = "PCI Express Port 1";
-static const char pci_device_8086_2841[] = "PCI Express Port 2";
-static const char pci_device_8086_2843[] = "PCI Express Port 3";
-static const char pci_device_8086_2845[] = "PCI Express Port 4";
-static const char pci_device_8086_2847[] = "PCI Express Port 5";
-static const char pci_device_8086_2849[] = "PCI Express Port 6";
-static const char pci_device_8086_284b[] = "HD Audio Controller";
-static const char pci_device_8086_284f[] = "Thermal Subsystem";
+static const char pci_device_8086_2820[] = "82801H (ICH8 Family) 4 port SATA IDE Controller";
+static const char pci_device_8086_2821[] = "82801HB (ICH8) SATA AHCI Controller";
+static const char pci_device_8086_2822[] = "82801HR/HO/HH (ICH8R/DO/DH) SATA RAID Controller";
+static const char pci_device_8086_2824[] = "82801HR/HO/HH (ICH8R/DO/DH) SATA AHCI Controller";
+static const char pci_device_8086_2825[] = "82801H (ICH8 Family) 2 port SATA IDE Controller";
+static const char pci_device_8086_2828[] = "Mobile SATA IDE Controller";
+static const char pci_device_8086_2829[] = "Mobile SATA AHCI Controller";
+static const char pci_device_8086_282a[] = "Mobile SATA RAID Controller";
+static const char pci_device_8086_2830[] = "82801H (ICH8 Family) USB UHCI #1";
+static const char pci_device_8086_2831[] = "82801H (ICH8 Family) USB UHCI #2";
+static const char pci_device_8086_2832[] = "82801H (ICH8 Family) USB UHCI #3";
+static const char pci_device_8086_2834[] = "82801H (ICH8 Family) USB UHCI #4";
+static const char pci_device_8086_2835[] = "82801H (ICH8 Family) USB UHCI #5";
+static const char pci_device_8086_2836[] = "82801H (ICH8 Family) USB2 EHCI #1";
+static const char pci_device_8086_283a[] = "82801H (ICH8 Family) USB2 EHCI #2";
+static const char pci_device_8086_283e[] = "82801H (ICH8 Family) SMBus Controller";
+static const char pci_device_8086_283f[] = "82801H (ICH8 Family) PCI Express Port 1";
+static const char pci_device_8086_2841[] = "82801H (ICH8 Family) PCI Express Port 2";
+static const char pci_device_8086_2843[] = "82801H (ICH8 Family) PCI Express Port 3";
+static const char pci_device_8086_2845[] = "82801H (ICH8 Family) PCI Express Port 4";
+static const char pci_device_8086_2847[] = "82801H (ICH8 Family) PCI Express Port 5";
+static const char pci_device_8086_2849[] = "82801H (ICH8 Family) PCI Express Port 6";
+static const char pci_device_8086_284b[] = "82801H (ICH8 Family) HD Audio Controller";
+static const char pci_device_8086_284f[] = "82801H (ICH8 Family) Thermal Reporting Device";
 static const char pci_device_8086_2850[] = "Mobile IDE Controller";
-static const char pci_device_8086_2970[] = "Memory Controller Hub";
-static const char pci_device_8086_2971[] = "PCI Express Root Port";
-static const char pci_device_8086_2972[] = "Integrated Graphics Controller";
-static const char pci_device_8086_2973[] = "Integrated Graphics Controller";
-static const char pci_device_8086_2974[] = "HECI Controller";
-static const char pci_device_8086_2976[] = "PT IDER Controller";
-static const char pci_device_8086_2977[] = "KT Controller";
-static const char pci_device_8086_2990[] = "Memory Controller Hub";
-static const char pci_device_8086_2991[] = "PCI Express Root Port";
-static const char pci_device_8086_2992[] = "Integrated Graphics Controller";
-static const char pci_device_8086_2993[] = "Integrated Graphics Controller";
-static const char pci_device_8086_2994[] = "HECI Controller";
-static const char pci_device_8086_2995[] = "HECI Controller";
-static const char pci_device_8086_2996[] = "PT IDER Controller";
-static const char pci_device_8086_2997[] = "KT Controller";
-static const char pci_device_8086_29a0[] = "Memory Controller Hub";
-static const char pci_device_8086_29a1[] = "PCI Express Root Port";
-static const char pci_device_8086_29a2[] = "Integrated Graphics Controller";
-static const char pci_device_8086_29a3[] = "Integrated Graphics Controller";
-static const char pci_device_8086_29a4[] = "HECI Controller";
-static const char pci_device_8086_29a5[] = "HECI Controller";
-static const char pci_device_8086_29a6[] = "PT IDER Controller";
-static const char pci_device_8086_29a7[] = "KT Controller";
+static const char pci_device_8086_2970[] = "82946GZ/PL/GL Memory Controller Hub";
+static const char pci_device_8086_2971[] = "82946GZ/PL/GL PCI Express Root Port";
+static const char pci_device_8086_2972[] = "82946GZ/GL Integrated Graphics Controller";
+static const char pci_device_8086_2973[] = "82946GZ/GL Integrated Graphics Controller";
+static const char pci_device_8086_2974[] = "82946GZ/GL HECI Controller";
+static const char pci_device_8086_2975[] = "82946GZ/GL HECI Controller";
+static const char pci_device_8086_2976[] = "82946GZ/GL PT IDER Controller";
+static const char pci_device_8086_2977[] = "82946GZ/GL KT Controller";
+static const char pci_device_8086_2980[] = "965 G1 Memory Controller Hub";
+static const char pci_device_8086_2981[] = "965 G1 PCI Express Root Port";
+static const char pci_device_8086_2982[] = "965 G1 Integrated Graphics Controller";
+static const char pci_device_8086_2990[] = "82Q963/Q965 Memory Controller Hub";
+static const char pci_device_8086_2991[] = "82Q963/Q965 PCI Express Root Port";
+static const char pci_device_8086_2992[] = "82Q963/Q965 Integrated Graphics Controller";
+static const char pci_device_8086_2993[] = "82Q963/Q965 Integrated Graphics Controller";
+static const char pci_device_8086_2994[] = "82Q963/Q965 HECI Controller";
+static const char pci_device_8086_2995[] = "82Q963/Q965 HECI Controller";
+static const char pci_device_8086_2996[] = "82Q963/Q965 PT IDER Controller";
+static const char pci_device_8086_2997[] = "82Q963/Q965 KT Controller";
+static const char pci_device_8086_29a0[] = "82P965/G965 Memory Controller Hub";
+static const char pci_device_8086_29a1[] = "82P965/G965 PCI Express Root Port";
+static const char pci_device_8086_29a2[] = "82G965 Integrated Graphics Controller";
+static const char pci_device_8086_29a3[] = "82G965 Integrated Graphics Controller";
+static const char pci_device_8086_29a4[] = "82P965/G965 HECI Controller";
+static const char pci_device_8086_29a5[] = "82P965/G965 HECI Controller";
+static const char pci_device_8086_29a6[] = "82P965/G965 PT IDER Controller";
+static const char pci_device_8086_29a7[] = "82P965/G965 KT Controller";
 static const char pci_device_8086_2a00[] = "Mobile Memory Controller Hub";
 static const char pci_device_8086_2a01[] = "Mobile PCI Express Root Port";
 static const char pci_device_8086_2a02[] = "Mobile Integrated Graphics Controller";
 static const char pci_device_8086_2a03[] = "Mobile Integrated Graphics Controller";
+static const char pci_device_8086_2a04[] = "Mobile HECI Controller";
+static const char pci_device_8086_2a05[] = "Mobile HECI Controller";
+static const char pci_device_8086_2a06[] = "Mobile PT IDER Controller";
+static const char pci_device_8086_2a07[] = "Mobile KT Controller";
 static const char pci_device_8086_3092[] = "Integrated RAID";
 static const char pci_device_8086_3200[] = "GD31244 PCI-X SATA HBA";
 static const char pci_device_8086_3340[] = "82855PM Processor to I/O Controller";
@@ -23478,19 +24581,22 @@ static const char pci_subsys_8086_3340_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_3340_103c_0890[] = "NC6000 laptop";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_3340_103c_08b0[] = "tc1100 tablet";
+#endif
 static const char pci_device_8086_3341[] = "82855PM Processor to AGP Controller";
-static const char pci_device_8086_3500[] = "Enterprise Southbridge PCI Express Upstream Port";
-static const char pci_device_8086_3501[] = "Enterprise Southbridge PCI Express Upstream Port";
-static const char pci_device_8086_3504[] = "Enterprise Southbridge IOxAPIC";
-static const char pci_device_8086_3505[] = "Enterprise Southbridge IOxAPIC";
-static const char pci_device_8086_350c[] = "Enterprise Southbridge PCI Express to PCI-X Bridge";
-static const char pci_device_8086_350d[] = "Enterprise Southbridge PCI Express to PCI-X Bridge";
-static const char pci_device_8086_3510[] = "Enterprise Southbridge PCI Express Downstream Port E1";
-static const char pci_device_8086_3511[] = "Enterprise Southbridge PCI Express Downstream Port E1";
-static const char pci_device_8086_3514[] = "Enterprise Southbridge PCI Express Downstream Port E2";
-static const char pci_device_8086_3515[] = "Enterprise Southbridge PCI Express Downstream Port E2";
-static const char pci_device_8086_3518[] = "Enterprise Southbridge PCI Express Downstream Port E3";
-static const char pci_device_8086_3519[] = "Enterprise Southbridge PCI Express Downstream Port E3";
+static const char pci_device_8086_3500[] = "6311ESB/6321ESB PCI Express Upstream Port";
+static const char pci_device_8086_3501[] = "6310ESB PCI Express Upstream Port";
+static const char pci_device_8086_3504[] = "6311ESB/6321ESB I/OxAPIC Interrupt Controller";
+static const char pci_device_8086_3505[] = "6310ESB I/OxAPIC Interrupt Controller";
+static const char pci_device_8086_350c[] = "6311ESB/6321ESB PCI Express to PCI-X Bridge";
+static const char pci_device_8086_350d[] = "6310ESB PCI Express to PCI-X Bridge";
+static const char pci_device_8086_3510[] = "6311ESB/6321ESB PCI Express Downstream Port E1";
+static const char pci_device_8086_3511[] = "6310ESB PCI Express Downstream Port E1";
+static const char pci_device_8086_3514[] = "6311ESB/6321ESB PCI Express Downstream Port E2";
+static const char pci_device_8086_3515[] = "6310ESB PCI Express Downstream Port E2";
+static const char pci_device_8086_3518[] = "6311ESB/6321ESB PCI Express Downstream Port E3";
+static const char pci_device_8086_3519[] = "6310ESB PCI Express Downstream Port E3";
 static const char pci_device_8086_3575[] = "82830 830 Chipset Host Bridge";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_3575_0e11_0030[] = "Evo N600c";
@@ -23509,6 +24615,9 @@ static const char pci_subsys_8086_3577_1
 static const char pci_device_8086_3578[] = "82830 830 Chipset Host Bridge";
 static const char pci_device_8086_3580[] = "82852/82855 GM/GME/PM/GMV Processor to I/O Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_3580_1014_055c[] = "Thinkpad R50e model 1634";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_3580_1028_0139[] = "Latitude D400";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23521,6 +24630,12 @@ static const char pci_subsys_8086_3580_1
 static const char pci_subsys_8086_3580_1734_1055[] = "Amilo M1420";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_3580_1775_10d0[] = "V5D Single Board Computer";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_3580_1775_ce90[] = "CE9";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_3580_4c53_10b0[] = "CL9 mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23532,12 +24647,21 @@ static const char pci_subsys_8086_3581_1
 #endif
 static const char pci_device_8086_3582[] = "82852/855GM Integrated Graphics Device";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_3582_1014_0562[] = "Thinkpad R50e model 1634";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_3582_1028_0139[] = "Latitude D400";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_3582_1028_0163[] = "Latitude D505";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_3582_1775_10d0[] = "V5D Single Board Computer VGA";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_3582_1775_ce90[] = "CE9";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_3582_4c53_10b0[] = "CL9 mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23545,6 +24669,9 @@ static const char pci_subsys_8086_3582_4
 #endif
 static const char pci_device_8086_3584[] = "82852/82855 GM/GME/PM/GMV Processor to I/O Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_3584_1014_055d[] = "Thinkpad R50e model 1634";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_3584_1028_0139[] = "Latitude D400";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23557,6 +24684,12 @@ static const char pci_subsys_8086_3584_1
 static const char pci_subsys_8086_3584_1734_1055[] = "Amilo M1420";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_3584_1775_10d0[] = "V5D Single Board Computer";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_3584_1775_ce90[] = "CE9";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_3584_4c53_10b0[] = "CL9 mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23564,6 +24697,9 @@ static const char pci_subsys_8086_3584_4
 #endif
 static const char pci_device_8086_3585[] = "82852/82855 GM/GME/PM/GMV Processor to I/O Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_3585_1014_055e[] = "Thinkpad R50e model 1634";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_3585_1028_0139[] = "Latitude D400";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23576,6 +24712,12 @@ static const char pci_subsys_8086_3585_1
 static const char pci_subsys_8086_3585_1734_1055[] = "Amilo M1420";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_3585_1775_10d0[] = "V5D Single Board Computer";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_3585_1775_ce90[] = "CE9";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_3585_4c53_10b0[] = "CL9 mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23615,6 +24757,12 @@ static const char pci_device_8086_359e[]
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_359e_1028_0169[] = "Precision 470";
 #endif
+static const char pci_device_8086_35b0[] = "3100 Chipset Memory I/O Controller Hub";
+static const char pci_device_8086_35b1[] = "3100 DRAM Controller Error Reporting Registers";
+static const char pci_device_8086_35b5[] = "3100 Chipset Enhanced DMA Controller";
+static const char pci_device_8086_35b6[] = "3100 Chipset PCI Express Port A";
+static const char pci_device_8086_35b7[] = "3100 Chipset PCI Express Port A1";
+static const char pci_device_8086_35c8[] = "3100 Extended Configuration Test Overflow Registers";
 static const char pci_device_8086_4220[] = "PRO/Wireless 2200BG Network Connection";
 static const char pci_device_8086_4222[] = "PRO/Wireless 3945ABG Network Connection";
 #ifdef INIT_SUBSYS_INFO
@@ -23633,11 +24781,12 @@ static const char pci_subsys_8086_4223_1
 static const char pci_device_8086_4224[] = "PRO/Wireless 2915ABG Network Connection";
 static const char pci_device_8086_4227[] = "PRO/Wireless 3945ABG Network Connection";
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_4227_8086_1011[] = "Thinkpad X60s";
+static const char pci_subsys_8086_4227_8086_1011[] = "Thinkpad  X60s, R60e model 0657";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_4227_8086_1014[] = "PRO/Wireless 3945BG Network Connection";
 #endif
+static const char pci_device_8086_5001[] = "Pro/DSL 2100 Modem";
 static const char pci_device_8086_5200[] = "EtherExpress PRO/100 Intelligent Server";
 static const char pci_device_8086_5201[] = "EtherExpress PRO/100 Intelligent Server";
 #ifdef INIT_SUBSYS_INFO
@@ -23800,7 +24949,7 @@ static const char pci_device_8086_84e3[]
 static const char pci_device_8086_84e4[] = "460GX - 84460GX Memory Data Controller (MDC)";
 static const char pci_device_8086_84e6[] = "460GX - 82466GX Wide and fast PCI eXpander Bridge (WXB)";
 static const char pci_device_8086_84ea[] = "460GX - 84460GX AGP Bridge (GXB function 1)";
-static const char pci_device_8086_8500[] = "IXP4XX Intel Network Processor (IXP420/421/422/425/IXC1100)";
+static const char pci_device_8086_8500[] = "IXP4XX Network Processor (IXP420/421/422/425/IXC1100)";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_8500_1993_0ded[] = "mGuard-PCI AV#2";
 #endif
@@ -23822,6 +24971,12 @@ static const char pci_device_8086_b152[]
 static const char pci_device_8086_b154[] = "21154 PCI-to-PCI Bridge";
 static const char pci_device_8086_b555[] = "21555 Non transparent PCI-to-PCI Bridge";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_b555_12c7_5005[] = "SS7HD PCI Adaptor Card";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_b555_12c7_5006[] = "SS7HDC cPCI Adaptor Card";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_b555_12d9_000a[] = "PCI VoIP Gateway";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23837,6 +24992,10 @@ static const char pci_subsys_8086_b555_e
 static const char pci_vendor_8401[] = "TRENDware International Inc.";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_8686[] = "ScaleMP";
+static const char pci_device_8686_1010[] = "vSMPowered system controller [vSMP CTL]";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_8800[] = "Trigem Computer Inc.";
 static const char pci_device_8800_2008[] = "Video assistent component";
 #endif
@@ -24264,8 +25423,20 @@ static const char pci_subsys_9005_0285_9
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_9005_0285_9005_029a[] = "4805SAS";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0285_9005_02b5[] = "ASR5800";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0285_9005_02b6[] = "ASR5805";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0285_9005_02b7[] = "ASR5808";
+#endif
 static const char pci_device_9005_0286[] = "AAC-RAID (Rocket)";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0286_1014_034d[] = "8s";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_9005_0286_1014_9540[] = "ServeRAID 8k/8k-l4";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -24305,7 +25476,7 @@ static const char pci_subsys_9005_0286_9
 static const char pci_subsys_9005_0286_9005_02a3[] = "ICP ICP5445AU";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_9005_0286_9005_02a4[] = "ICP ICP5085LI";
+static const char pci_subsys_9005_0286_9005_02a4[] = "ICP ICP9085LI";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_9005_0286_9005_02a5[] = "ICP ICP5085BR";
@@ -24314,20 +25485,58 @@ static const char pci_subsys_9005_0286_9
 static const char pci_subsys_9005_0286_9005_02a6[] = "ICP9067MA";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_9005_0286_9005_02a7[] = "AAR-2830SA";
+static const char pci_subsys_9005_0286_9005_02a7[] = "3805SAS";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0286_9005_02a8[] = "3400SAS";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_9005_0286_9005_02a8[] = "AAR-2430SA";
+static const char pci_subsys_9005_0286_9005_02a9[] = "ICP ICP5085AU";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_9005_0286_9005_02a9[] = "ICP5087AU";
+static const char pci_subsys_9005_0286_9005_02aa[] = "ICP ICP5045AU";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_9005_0286_9005_02aa[] = "ICP5047AU";
+static const char pci_subsys_9005_0286_9005_02ac[] = "1800SAS";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0286_9005_02b3[] = "ASR-2400SAS";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0286_9005_02b4[] = "ICP ICP5045AL";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_9005_0286_9005_0800[] = "Callisto";
 #endif
+static const char pci_device_9005_0410[] = "AIC-9410W SAS (Razor HBA RAID)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0410_9005_0410[] = "ASC-48300(Spirit RAID)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0410_9005_0411[] = "ASC-58300 (Oakmont RAID)";
+#endif
+static const char pci_device_9005_0412[] = "AIC-9410W SAS (Razor HBA non-RAID)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0412_9005_0412[] = "ASC-48300 (Spirit non-RAID)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0412_9005_0413[] = "ASC-58300 (Oakmont non-RAID)";
+#endif
+static const char pci_device_9005_041e[] = "AIC-9410W SAS (Razor ASIC non-RAID)";
+static const char pci_device_9005_041f[] = "AIC-9410W SAS (Razor ASIC RAID)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_041f_9005_041f[] = "AIC-9410W SAS (Razor ASIC RAID)";
+#endif
+static const char pci_device_9005_0430[] = "AIC-9405W SAS (Razor-Lite HBA RAID)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0430_9005_0430[] = "ASC-44300 (Spirit-Lite RAID)";
+#endif
+static const char pci_device_9005_0432[] = "AIC-9405W SAS (Razor-Lite HBA non-RAID)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0432_9005_0432[] = "ASC-44300 (Spirit-Lite non-RAID)";
+#endif
+static const char pci_device_9005_043e[] = "AIC-9405W SAS (Razor-Lite ASIC non-RAID)";
+static const char pci_device_9005_043f[] = "AIC-9405W SAS (Razor-Lite ASIC RAID)";
 static const char pci_device_9005_0500[] = "Obsidian chipset SCSI controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_9005_0500_1014_02c1[] = "PCI-X DDR 3Gb SAS Adapter (572A/572C)";
@@ -24469,9 +25678,13 @@ static const char pci_device_aecb_6250[]
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_affe[] = "Sirrix AG security technologies";
+static const char pci_device_affe_02e1[] = "PCI2E1 2-port ISDN E1 interface";
 static const char pci_device_affe_dead[] = "Sirrix.PCI4S0 4-port ISDN S0 interface";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_b10b[] = "Uakron PCI Project";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_b1b3[] = "Shiva Europe Limited";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -24500,6 +25713,9 @@ static const char pci_device_cafe_0003[]
 static const char pci_vendor_cccc[] = "Catapult Communications";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_ccec[] = "Curtiss-Wright Controls Embedded Computing";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_cddd[] = "Tyzx, Inc.";
 static const char pci_device_cddd_0101[] = "DeepSea 1 High Speed Stereo Vision Frame Grabber";
 static const char pci_device_cddd_0200[] = "DeepSea 2 High Speed Stereo Vision Frame Grabber";
@@ -24716,6 +25932,12 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1000, 0x1000, pci_subsys_1000_0006_1000_1000, 0};
 #undef pci_ss_info_1000_1000
 #define pci_ss_info_1000_1000 pci_ss_info_1000_0006_1000_1000
+#endif
+static const pciSubsystemInfo pci_ss_info_1000_000a_0e11_b143 =
+	{0x0e11, 0xb143, pci_subsys_1000_000a_0e11_b143, 0};
+#undef pci_ss_info_0e11_b143
+#define pci_ss_info_0e11_b143 pci_ss_info_1000_000a_0e11_b143
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_1000_000a_1000_1000 =
 	{0x1000, 0x1000, pci_subsys_1000_000a_1000_1000, 0};
 #undef pci_ss_info_1000_1000
@@ -24782,6 +26004,14 @@ static const pciSubsystemInfo pci_ss_inf
 #undef pci_ss_info_1092_8760
 #define pci_ss_info_1092_8760 pci_ss_info_1000_000f_1092_8760
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_1000_000f_1775_10d0 =
+	{0x1775, 0x10d0, pci_subsys_1000_000f_1775_10d0, 0};
+#undef pci_ss_info_1775_10d0
+#define pci_ss_info_1775_10d0 pci_ss_info_1000_000f_1775_10d0
+static const pciSubsystemInfo pci_ss_info_1000_000f_1775_10d1 =
+	{0x1775, 0x10d1, pci_subsys_1000_000f_1775_10d1, 0};
+#undef pci_ss_info_1775_10d1
+#define pci_ss_info_1775_10d1 pci_ss_info_1000_000f_1775_10d1
 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
@@ -24822,6 +26052,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1000, 0x1000, pci_subsys_1000_0020_1000_1000, 0};
 #undef pci_ss_info_1000_1000
 #define pci_ss_info_1000_1000 pci_ss_info_1000_0020_1000_1000
+static const pciSubsystemInfo pci_ss_info_1000_0020_107b_1040 =
+	{0x107b, 0x1040, pci_subsys_1000_0020_107b_1040, 0};
+#undef pci_ss_info_107b_1040
+#define pci_ss_info_107b_1040 pci_ss_info_1000_0020_107b_1040
 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
@@ -24834,6 +26068,18 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1000, 0x1010, pci_subsys_1000_0021_1000_1010, 0};
 #undef pci_ss_info_1000_1010
 #define pci_ss_info_1000_1010 pci_ss_info_1000_0021_1000_1010
+#endif
+static const pciSubsystemInfo pci_ss_info_1000_0021_103c_1330 =
+	{0x103c, 0x1330, pci_subsys_1000_0021_103c_1330, 0};
+#undef pci_ss_info_103c_1330
+#define pci_ss_info_103c_1330 pci_ss_info_1000_0021_103c_1330
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_1000_0021_103c_1340 =
+	{0x103c, 0x1340, pci_subsys_1000_0021_103c_1340, 0};
+#undef pci_ss_info_103c_1340
+#define pci_ss_info_103c_1340 pci_ss_info_1000_0021_103c_1340
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_1000_0021_124b_1070 =
 	{0x124b, 0x1070, pci_subsys_1000_0021_124b_1070, 0};
 #undef pci_ss_info_124b_1070
@@ -24886,6 +26132,12 @@ static const pciSubsystemInfo pci_ss_inf
 #undef pci_ss_info_1028_1010
 #define pci_ss_info_1028_1010 pci_ss_info_1000_0030_1028_1010
 #ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_1000_0030_103c_12c5 =
+	{0x103c, 0x12c5, pci_subsys_1000_0030_103c_12c5, 0};
+#undef pci_ss_info_103c_12c5
+#define pci_ss_info_103c_12c5 pci_ss_info_1000_0030_103c_12c5
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_1000_0030_124b_1170 =
 	{0x124b, 0x1170, pci_subsys_1000_0030_124b_1170, 0};
 #undef pci_ss_info_124b_1170
@@ -24906,6 +26158,30 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1000, 0x0066, pci_subsys_1000_0040_1000_0066, 0};
 #undef pci_ss_info_1000_0066
 #define pci_ss_info_1000_0066 pci_ss_info_1000_0040_1000_0066
+#endif
+static const pciSubsystemInfo pci_ss_info_1000_0060_1028_1f0a =
+	{0x1028, 0x1f0a, pci_subsys_1000_0060_1028_1f0a, 0};
+#undef pci_ss_info_1028_1f0a
+#define pci_ss_info_1028_1f0a pci_ss_info_1000_0060_1028_1f0a
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_1000_0060_1028_1f0b =
+	{0x1028, 0x1f0b, pci_subsys_1000_0060_1028_1f0b, 0};
+#undef pci_ss_info_1028_1f0b
+#define pci_ss_info_1028_1f0b pci_ss_info_1000_0060_1028_1f0b
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_1000_0060_1028_1f0c =
+	{0x1028, 0x1f0c, pci_subsys_1000_0060_1028_1f0c, 0};
+#undef pci_ss_info_1028_1f0c
+#define pci_ss_info_1028_1f0c pci_ss_info_1000_0060_1028_1f0c
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_1000_0060_1028_1f0d =
+	{0x1028, 0x1f0d, pci_subsys_1000_0060_1028_1f0d, 0};
+#undef pci_ss_info_1028_1f0d
+#define pci_ss_info_1028_1f0d pci_ss_info_1000_0060_1028_1f0d
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_1000_0062_1000_0062 =
 	{0x1000, 0x0062, pci_subsys_1000_0062_1000_0062, 0};
 #undef pci_ss_info_1000_0062
@@ -25020,6 +26296,90 @@ static const pciSubsystemInfo pci_ss_inf
 #undef pci_ss_info_8086_3499
 #define pci_ss_info_8086_3499 pci_ss_info_1000_0409_8086_3499
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_1000_0411_1000_1001 =
+	{0x1000, 0x1001, pci_subsys_1000_0411_1000_1001, 0};
+#undef pci_ss_info_1000_1001
+#define pci_ss_info_1000_1001 pci_ss_info_1000_0411_1000_1001
+static const pciSubsystemInfo pci_ss_info_1000_0411_1000_1002 =
+	{0x1000, 0x1002, pci_subsys_1000_0411_1000_1002, 0};
+#undef pci_ss_info_1000_1002
+#define pci_ss_info_1000_1002 pci_ss_info_1000_0411_1000_1002
+static const pciSubsystemInfo pci_ss_info_1000_0411_1000_1003 =
+	{0x1000, 0x1003, pci_subsys_1000_0411_1000_1003, 0};
+#undef pci_ss_info_1000_1003
+#define pci_ss_info_1000_1003 pci_ss_info_1000_0411_1000_1003
+static const pciSubsystemInfo pci_ss_info_1000_0411_1000_1004 =
+	{0x1000, 0x1004, pci_subsys_1000_0411_1000_1004, 0};
+#undef pci_ss_info_1000_1004
+#define pci_ss_info_1000_1004 pci_ss_info_1000_0411_1000_1004
+static const pciSubsystemInfo pci_ss_info_1000_0411_1000_100c =
+	{0x1000, 0x100c, pci_subsys_1000_0411_1000_100c, 0};
+#undef pci_ss_info_1000_100c
+#define pci_ss_info_1000_100c pci_ss_info_1000_0411_1000_100c
+static const pciSubsystemInfo pci_ss_info_1000_0411_1000_100d =
+	{0x1000, 0x100d, pci_subsys_1000_0411_1000_100d, 0};
+#undef pci_ss_info_1000_100d
+#define pci_ss_info_1000_100d pci_ss_info_1000_0411_1000_100d
+static const pciSubsystemInfo pci_ss_info_1000_0411_1000_2004 =
+	{0x1000, 0x2004, pci_subsys_1000_0411_1000_2004, 0};
+#undef pci_ss_info_1000_2004
+#define pci_ss_info_1000_2004 pci_ss_info_1000_0411_1000_2004
+static const pciSubsystemInfo pci_ss_info_1000_0411_1000_2005 =
+	{0x1000, 0x2005, pci_subsys_1000_0411_1000_2005, 0};
+#undef pci_ss_info_1000_2005
+#define pci_ss_info_1000_2005 pci_ss_info_1000_0411_1000_2005
+#endif
+static const pciSubsystemInfo pci_ss_info_1000_0411_1033_8287 =
+	{0x1033, 0x8287, pci_subsys_1000_0411_1033_8287, 0};
+#undef pci_ss_info_1033_8287
+#define pci_ss_info_1033_8287 pci_ss_info_1000_0411_1033_8287
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_1000_0411_1054_3016 =
+	{0x1054, 0x3016, pci_subsys_1000_0411_1054_3016, 0};
+#undef pci_ss_info_1054_3016
+#define pci_ss_info_1054_3016 pci_ss_info_1000_0411_1054_3016
+static const pciSubsystemInfo pci_ss_info_1000_0411_1734_1081 =
+	{0x1734, 0x1081, pci_subsys_1000_0411_1734_1081, 0};
+#undef pci_ss_info_1734_1081
+#define pci_ss_info_1734_1081 pci_ss_info_1000_0411_1734_1081
+static const pciSubsystemInfo pci_ss_info_1000_0411_1734_10a3 =
+	{0x1734, 0x10a3, pci_subsys_1000_0411_1734_10a3, 0};
+#undef pci_ss_info_1734_10a3
+#define pci_ss_info_1734_10a3 pci_ss_info_1000_0411_1734_10a3
+#endif
+static const pciSubsystemInfo pci_ss_info_1000_0411_8086_1001 =
+	{0x8086, 0x1001, pci_subsys_1000_0411_8086_1001, 0};
+#undef pci_ss_info_8086_1001
+#define pci_ss_info_8086_1001 pci_ss_info_1000_0411_8086_1001
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_1000_0411_8086_1003 =
+	{0x8086, 0x1003, pci_subsys_1000_0411_8086_1003, 0};
+#undef pci_ss_info_8086_1003
+#define pci_ss_info_8086_1003 pci_ss_info_1000_0411_8086_1003
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_1000_0411_8086_3500 =
+	{0x8086, 0x3500, pci_subsys_1000_0411_8086_3500, 0};
+#undef pci_ss_info_8086_3500
+#define pci_ss_info_8086_3500 pci_ss_info_1000_0411_8086_3500
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_1000_0411_8086_3501 =
+	{0x8086, 0x3501, pci_subsys_1000_0411_8086_3501, 0};
+#undef pci_ss_info_8086_3501
+#define pci_ss_info_8086_3501 pci_ss_info_1000_0411_8086_3501
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_1000_0411_8086_3504 =
+	{0x8086, 0x3504, pci_subsys_1000_0411_8086_3504, 0};
+#undef pci_ss_info_8086_3504
+#define pci_ss_info_8086_3504 pci_ss_info_1000_0411_8086_3504
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_1000_0413_1000_1005 =
+	{0x1000, 0x1005, pci_subsys_1000_0413_1000_1005, 0};
+#undef pci_ss_info_1000_1005
+#define pci_ss_info_1000_1005 pci_ss_info_1000_0413_1000_1005
 static const pciSubsystemInfo pci_ss_info_1000_0622_1000_1020 =
 	{0x1000, 0x1020, pci_subsys_1000_0622_1000_1020, 0};
 #undef pci_ss_info_1000_1020
@@ -25161,6 +26521,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1787, 0x4002, pci_subsys_1002_4152_1787_4002, 0};
 #undef pci_ss_info_1787_4002
 #define pci_ss_info_1787_4002 pci_ss_info_1002_4152_1787_4002
+static const pciSubsystemInfo pci_ss_info_1002_4153_1043_010c =
+	{0x1043, 0x010c, pci_subsys_1002_4153_1043_010c, 0};
+#undef pci_ss_info_1043_010c
+#define pci_ss_info_1043_010c pci_ss_info_1002_4153_1043_010c
 static const pciSubsystemInfo pci_ss_info_1002_4153_1462_932c =
 	{0x1462, 0x932c, pci_subsys_1002_4153_1462_932c, 0};
 #undef pci_ss_info_1462_932c
@@ -25221,6 +26585,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1787, 0x4003, pci_subsys_1002_4172_1787_4003, 0};
 #undef pci_ss_info_1787_4003
 #define pci_ss_info_1787_4003 pci_ss_info_1002_4172_1787_4003
+static const pciSubsystemInfo pci_ss_info_1002_4173_1043_010d =
+	{0x1043, 0x010d, pci_subsys_1002_4173_1043_010d, 0};
+#undef pci_ss_info_1043_010d
+#define pci_ss_info_1043_010d pci_ss_info_1002_4173_1043_010d
 static const pciSubsystemInfo pci_ss_info_1002_4242_1002_02aa =
 	{0x1002, 0x02aa, pci_subsys_1002_4242_1002_02aa, 0};
 #undef pci_ss_info_1002_02aa
@@ -25477,6 +26845,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x103c, 0x10e1, pci_subsys_1002_4752_103c_10e1, 0};
 #undef pci_ss_info_103c_10e1
 #define pci_ss_info_103c_10e1 pci_ss_info_1002_4752_103c_10e1
+static const pciSubsystemInfo pci_ss_info_1002_4752_107b_6400 =
+	{0x107b, 0x6400, pci_subsys_1002_4752_107b_6400, 0};
+#undef pci_ss_info_107b_6400
+#define pci_ss_info_107b_6400 pci_ss_info_1002_4752_107b_6400
 static const pciSubsystemInfo pci_ss_info_1002_4752_1734_007a =
 	{0x1734, 0x007a, pci_subsys_1002_4752_1734_007a, 0};
 #undef pci_ss_info_1734_007a
@@ -25965,6 +27337,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1028, 0x019a, pci_subsys_1002_5159_1028_019a, 0};
 #undef pci_ss_info_1028_019a
 #define pci_ss_info_1028_019a pci_ss_info_1002_5159_1028_019a
+static const pciSubsystemInfo pci_ss_info_1002_5159_103c_1292 =
+	{0x103c, 0x1292, pci_subsys_1002_5159_103c_1292, 0};
+#undef pci_ss_info_103c_1292
+#define pci_ss_info_103c_1292 pci_ss_info_1002_5159_103c_1292
 static const pciSubsystemInfo pci_ss_info_1002_5159_1458_4002 =
 	{0x1458, 0x4002, pci_subsys_1002_5159_1458_4002, 0};
 #undef pci_ss_info_1458_4002
@@ -25989,6 +27365,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1787, 0x0202, pci_subsys_1002_5159_1787_0202, 0};
 #undef pci_ss_info_1787_0202
 #define pci_ss_info_1787_0202 pci_ss_info_1002_5159_1787_0202
+static const pciSubsystemInfo pci_ss_info_1002_5159_17ee_1001 =
+	{0x17ee, 0x1001, pci_subsys_1002_5159_17ee_1001, 0};
+#undef pci_ss_info_17ee_1001
+#define pci_ss_info_17ee_1001 pci_ss_info_1002_5159_17ee_1001
 static const pciSubsystemInfo pci_ss_info_1002_5245_1002_0008 =
 	{0x1002, 0x0008, pci_subsys_1002_5245_1002_0008, 0};
 #undef pci_ss_info_1002_0008
@@ -26321,6 +27701,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1002, 0x0323, pci_subsys_1002_7166_1002_0323, 0};
 #undef pci_ss_info_1002_0323
 #define pci_ss_info_1002_0323 pci_ss_info_1002_7166_1002_0323
+static const pciSubsystemInfo pci_ss_info_1002_71c4_17aa_2007 =
+	{0x17aa, 0x2007, pci_subsys_1002_71c4_17aa_2007, 0};
+#undef pci_ss_info_17aa_2007
+#define pci_ss_info_17aa_2007 pci_ss_info_1002_71c4_17aa_2007
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_1004_0304_1004_0304 =
 	{0x1004, 0x0304, pci_subsys_1004_0304_1004_0304, 0};
@@ -26475,6 +27859,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1033, 0x800d, pci_subsys_1011_0019_1033_800d, 0};
 #undef pci_ss_info_1033_800d
 #define pci_ss_info_1033_800d pci_ss_info_1011_0019_1033_800d
+static const pciSubsystemInfo pci_ss_info_1011_0019_103c_125a =
+	{0x103c, 0x125a, pci_subsys_1011_0019_103c_125a, 0};
+#undef pci_ss_info_103c_125a
+#define pci_ss_info_103c_125a pci_ss_info_1011_0019_103c_125a
 static const pciSubsystemInfo pci_ss_info_1011_0019_108d_0016 =
 	{0x108d, 0x0016, pci_subsys_1011_0019_108d_0016, 0};
 #undef pci_ss_info_108d_0016
@@ -26583,6 +27971,18 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x13d1, 0xab01, pci_subsys_1011_0019_13d1_ab01, 0};
 #undef pci_ss_info_13d1_ab01
 #define pci_ss_info_13d1_ab01 pci_ss_info_1011_0019_13d1_ab01
+static const pciSubsystemInfo pci_ss_info_1011_0019_1498_000a =
+	{0x1498, 0x000a, pci_subsys_1011_0019_1498_000a, 0};
+#undef pci_ss_info_1498_000a
+#define pci_ss_info_1498_000a pci_ss_info_1011_0019_1498_000a
+static const pciSubsystemInfo pci_ss_info_1011_0019_1498_000b =
+	{0x1498, 0x000b, pci_subsys_1011_0019_1498_000b, 0};
+#undef pci_ss_info_1498_000b
+#define pci_ss_info_1498_000b pci_ss_info_1011_0019_1498_000b
+static const pciSubsystemInfo pci_ss_info_1011_0019_1498_000c =
+	{0x1498, 0x000c, pci_subsys_1011_0019_1498_000c, 0};
+#undef pci_ss_info_1498_000c
+#define pci_ss_info_1498_000c pci_ss_info_1011_0019_1498_000c
 static const pciSubsystemInfo pci_ss_info_1011_0019_14cb_0100 =
 	{0x14cb, 0x0100, pci_subsys_1011_0019_14cb_0100, 0};
 #undef pci_ss_info_14cb_0100
@@ -26671,6 +28071,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1014, 0x0153, pci_subsys_1013_6003_1014_0153, 0};
 #undef pci_ss_info_1014_0153
 #define pci_ss_info_1014_0153 pci_ss_info_1013_6003_1014_0153
+static const pciSubsystemInfo pci_ss_info_1013_6003_153b_112e =
+	{0x153b, 0x112e, pci_subsys_1013_6003_153b_112e, 0};
+#undef pci_ss_info_153b_112e
+#define pci_ss_info_153b_112e pci_ss_info_1013_6003_153b_112e
 static const pciSubsystemInfo pci_ss_info_1013_6003_153b_1136 =
 	{0x153b, 0x1136, pci_subsys_1013_6003_153b_1136, 0};
 #undef pci_ss_info_153b_1136
@@ -26683,6 +28087,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1681, 0xa011, pci_subsys_1013_6003_1681_a011, 0};
 #undef pci_ss_info_1681_a011
 #define pci_ss_info_1681_a011 pci_ss_info_1013_6003_1681_a011
+static const pciSubsystemInfo pci_ss_info_1013_6003_5053_3357 =
+	{0x5053, 0x3357, pci_subsys_1013_6003_5053_3357, 0};
+#undef pci_ss_info_5053_3357
+#define pci_ss_info_5053_3357 pci_ss_info_1013_6003_5053_3357
 static const pciSubsystemInfo pci_ss_info_1013_6005_1013_4281 =
 	{0x1013, 0x4281, pci_subsys_1013_6005_1013_4281, 0};
 #undef pci_ss_info_1013_4281
@@ -26995,6 +28403,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1259, 0x2703, pci_subsys_1022_2000_1259_2703, 0};
 #undef pci_ss_info_1259_2703
 #define pci_ss_info_1259_2703 pci_ss_info_1022_2000_1259_2703
+static const pciSubsystemInfo pci_ss_info_1022_2000_1259_2704 =
+	{0x1259, 0x2704, pci_subsys_1022_2000_1259_2704, 0};
+#undef pci_ss_info_1259_2704
+#define pci_ss_info_1259_2704 pci_ss_info_1022_2000_1259_2704
 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
@@ -28081,6 +29493,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x103c, 0x1301, pci_subsys_103c_1048_103c_1301, 0};
 #undef pci_ss_info_103c_1301
 #define pci_ss_info_103c_1301 pci_ss_info_103c_1048_103c_1301
+static const pciSubsystemInfo pci_ss_info_103c_3220_103c_3225 =
+	{0x103c, 0x3225, pci_subsys_103c_3220_103c_3225, 0};
+#undef pci_ss_info_103c_3225
+#define pci_ss_info_103c_3225 pci_ss_info_103c_3220_103c_3225
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_1043_0675_0675_1704 =
 	{0x0675, 0x1704, pci_subsys_1043_0675_0675_1704, 0};
@@ -28251,6 +29667,10 @@ static const pciSubsystemInfo pci_ss_inf
 #undef pci_ss_info_1048_0935
 #define pci_ss_info_1048_0935 pci_ss_info_1048_8901_1048_0935
 #endif
+static const pciSubsystemInfo pci_ss_info_104a_0500_104a_0500 =
+	{0x104a, 0x0500, pci_subsys_104a_0500_104a_0500, 0};
+#undef pci_ss_info_104a_0500
+#define pci_ss_info_104a_0500 pci_ss_info_104a_0500_104a_0500
 static const pciSubsystemInfo pci_ss_info_104c_3d07_1011_4d10 =
 	{0x1011, 0x4d10, pci_subsys_104c_3d07_1011_4d10, 0};
 #undef pci_ss_info_1011_4d10
@@ -28379,6 +29799,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x11bd, 0x000f, pci_subsys_104c_8020_11bd_000f, 0};
 #undef pci_ss_info_11bd_000f
 #define pci_ss_info_11bd_000f pci_ss_info_104c_8020_11bd_000f
+static const pciSubsystemInfo pci_ss_info_104c_8020_11bd_001c =
+	{0x11bd, 0x001c, pci_subsys_104c_8020_11bd_001c, 0};
+#undef pci_ss_info_11bd_001c
+#define pci_ss_info_11bd_001c pci_ss_info_104c_8020_11bd_001c
 static const pciSubsystemInfo pci_ss_info_104c_8021_104d_80df =
 	{0x104d, 0x80df, pci_subsys_104c_8021_104d_80df, 0};
 #undef pci_ss_info_104d_80df
@@ -28487,6 +29911,26 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x103c, 0x099c, pci_subsys_104c_8035_103c_099c, 0};
 #undef pci_ss_info_103c_099c
 #define pci_ss_info_103c_099c pci_ss_info_104c_8035_103c_099c
+static const pciSubsystemInfo pci_ss_info_104c_8039_103c_309f =
+	{0x103c, 0x309f, pci_subsys_104c_8039_103c_309f, 0};
+#undef pci_ss_info_103c_309f
+#define pci_ss_info_103c_309f pci_ss_info_104c_8039_103c_309f
+static const pciSubsystemInfo pci_ss_info_104c_803a_103c_309f =
+	{0x103c, 0x309f, pci_subsys_104c_803a_103c_309f, 0};
+#undef pci_ss_info_103c_309f
+#define pci_ss_info_103c_309f pci_ss_info_104c_803a_103c_309f
+static const pciSubsystemInfo pci_ss_info_104c_803b_103c_309f =
+	{0x103c, 0x309f, pci_subsys_104c_803b_103c_309f, 0};
+#undef pci_ss_info_103c_309f
+#define pci_ss_info_103c_309f pci_ss_info_104c_803b_103c_309f
+static const pciSubsystemInfo pci_ss_info_104c_803c_103c_309f =
+	{0x103c, 0x309f, pci_subsys_104c_803c_103c_309f, 0};
+#undef pci_ss_info_103c_309f
+#define pci_ss_info_103c_309f pci_ss_info_104c_803c_103c_309f
+static const pciSubsystemInfo pci_ss_info_104c_803d_103c_309f =
+	{0x103c, 0x309f, pci_subsys_104c_803d_103c_309f, 0};
+#undef pci_ss_info_103c_309f
+#define pci_ss_info_103c_309f pci_ss_info_104c_803d_103c_309f
 static const pciSubsystemInfo pci_ss_info_104c_8204_1028_0139 =
 	{0x1028, 0x0139, pci_subsys_104c_8204_1028_0139, 0};
 #undef pci_ss_info_1028_0139
@@ -28631,14 +30075,26 @@ static const pciSubsystemInfo pci_ss_inf
 	{0xe4bf, 0x1000, pci_subsys_104c_ac51_e4bf_1000, 0};
 #undef pci_ss_info_e4bf_1000
 #define pci_ss_info_e4bf_1000 pci_ss_info_104c_ac51_e4bf_1000
+static const pciSubsystemInfo pci_ss_info_104c_ac54_103c_08b0 =
+	{0x103c, 0x08b0, pci_subsys_104c_ac54_103c_08b0, 0};
+#undef pci_ss_info_103c_08b0
+#define pci_ss_info_103c_08b0 pci_ss_info_104c_ac54_103c_08b0
 static const pciSubsystemInfo pci_ss_info_104c_ac55_1014_0512 =
 	{0x1014, 0x0512, pci_subsys_104c_ac55_1014_0512, 0};
 #undef pci_ss_info_1014_0512
 #define pci_ss_info_1014_0512 pci_ss_info_104c_ac55_1014_0512
+static const pciSubsystemInfo pci_ss_info_104c_ac56_1014_0512 =
+	{0x1014, 0x0512, pci_subsys_104c_ac56_1014_0512, 0};
+#undef pci_ss_info_1014_0512
+#define pci_ss_info_1014_0512 pci_ss_info_104c_ac56_1014_0512
 static const pciSubsystemInfo pci_ss_info_104c_ac56_1014_0528 =
 	{0x1014, 0x0528, pci_subsys_104c_ac56_1014_0528, 0};
 #undef pci_ss_info_1014_0528
 #define pci_ss_info_1014_0528 pci_ss_info_104c_ac56_1014_0528
+static const pciSubsystemInfo pci_ss_info_104c_ac56_17aa_2012 =
+	{0x17aa, 0x2012, pci_subsys_104c_ac56_17aa_2012, 0};
+#undef pci_ss_info_17aa_2012
+#define pci_ss_info_17aa_2012 pci_ss_info_104c_ac56_17aa_2012
 static const pciSubsystemInfo pci_ss_info_104c_ac60_175c_5100 =
 	{0x175c, 0x5100, pci_subsys_104c_ac60_175c_5100, 0};
 #undef pci_ss_info_175c_5100
@@ -29245,6 +30701,30 @@ static const pciSubsystemInfo pci_ss_inf
 #undef pci_ss_info_1077_0002
 #define pci_ss_info_1077_0002 pci_ss_info_1077_2200_1077_0002
 #endif
+static const pciSubsystemInfo pci_ss_info_1077_2312_103c_0131 =
+	{0x103c, 0x0131, pci_subsys_1077_2312_103c_0131, 0};
+#undef pci_ss_info_103c_0131
+#define pci_ss_info_103c_0131 pci_ss_info_1077_2312_103c_0131
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_1077_2312_103c_12ba =
+	{0x103c, 0x12ba, pci_subsys_1077_2312_103c_12ba, 0};
+#undef pci_ss_info_103c_12ba
+#define pci_ss_info_103c_12ba pci_ss_info_1077_2312_103c_12ba
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_1077_2422_103c_12d7 =
+	{0x103c, 0x12d7, pci_subsys_1077_2422_103c_12d7, 0};
+#undef pci_ss_info_103c_12d7
+#define pci_ss_info_103c_12d7 pci_ss_info_1077_2422_103c_12d7
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_1077_2422_103c_12dd =
+	{0x103c, 0x12dd, pci_subsys_1077_2422_103c_12dd, 0};
+#undef pci_ss_info_103c_12dd
+#define pci_ss_info_103c_12dd pci_ss_info_1077_2422_103c_12dd
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_108d_0004_108d_0004 =
 	{0x108d, 0x0004, pci_subsys_108d_0004_108d_0004, 0};
@@ -30082,6 +31562,10 @@ static const pciSubsystemInfo pci_ss_inf
 #undef pci_ss_info_103c_10ec
 #define pci_ss_info_103c_10ec pci_ss_info_10b5_9080_103c_10ec
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_10b5_9080_10b5_1123 =
+	{0x10b5, 0x1123, pci_subsys_10b5_9080_10b5_1123, 0};
+#undef pci_ss_info_10b5_1123
+#define pci_ss_info_10b5_1123 pci_ss_info_10b5_9080_10b5_1123
 static const pciSubsystemInfo pci_ss_info_10b5_9080_10b5_9080 =
 	{0x10b5, 0x9080, pci_subsys_10b5_9080_10b5_9080, 0};
 #undef pci_ss_info_10b5_9080
@@ -30098,6 +31582,22 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x12df, 0x4422, pci_subsys_10b5_9080_12df_4422, 0};
 #undef pci_ss_info_12df_4422
 #define pci_ss_info_12df_4422 pci_ss_info_10b5_9080_12df_4422
+static const pciSubsystemInfo pci_ss_info_10b5_9080_1517_000b =
+	{0x1517, 0x000b, pci_subsys_10b5_9080_1517_000b, 0};
+#undef pci_ss_info_1517_000b
+#define pci_ss_info_1517_000b pci_ss_info_10b5_9080_1517_000b
+static const pciSubsystemInfo pci_ss_info_10b5_9656_1517_000f =
+	{0x1517, 0x000f, pci_subsys_10b5_9656_1517_000f, 0};
+#undef pci_ss_info_1517_000f
+#define pci_ss_info_1517_000f pci_ss_info_10b5_9656_1517_000f
+static const pciSubsystemInfo pci_ss_info_10b5_9656_1885_0700 =
+	{0x1885, 0x0700, pci_subsys_10b5_9656_1885_0700, 0};
+#undef pci_ss_info_1885_0700
+#define pci_ss_info_1885_0700 pci_ss_info_10b5_9656_1885_0700
+static const pciSubsystemInfo pci_ss_info_10b5_9656_1885_0701 =
+	{0x1885, 0x0701, pci_subsys_10b5_9656_1885_0701, 0};
+#undef pci_ss_info_1885_0701
+#define pci_ss_info_1885_0701 pci_ss_info_10b5_9656_1885_0701
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_10b6_0002_10b6_0002 =
@@ -30224,6 +31724,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x10b7, 0x9005, pci_subsys_10b7_9005_10b7_9005, 0};
 #undef pci_ss_info_10b7_9005
 #define pci_ss_info_10b7_9005 pci_ss_info_10b7_9005_10b7_9005
+static const pciSubsystemInfo pci_ss_info_10b7_9054_10b7_9054 =
+	{0x10b7, 0x9054, pci_subsys_10b7_9054_10b7_9054, 0};
+#undef pci_ss_info_10b7_9054
+#define pci_ss_info_10b7_9054 pci_ss_info_10b7_9054_10b7_9054
 #endif
 static const pciSubsystemInfo pci_ss_info_10b7_9055_1028_0080 =
 	{0x1028, 0x0080, pci_subsys_10b7_9055_1028_0080, 0};
@@ -30534,6 +32038,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1043, 0x8053, pci_subsys_10b9_5229_1043_8053, 0};
 #undef pci_ss_info_1043_8053
 #define pci_ss_info_1043_8053 pci_ss_info_10b9_5229_1043_8053
+static const pciSubsystemInfo pci_ss_info_10b9_5229_1849_5229 =
+	{0x1849, 0x5229, pci_subsys_10b9_5229_1849_5229, 0};
+#undef pci_ss_info_1849_5229
+#define pci_ss_info_1849_5229 pci_ss_info_10b9_5229_1849_5229
 static const pciSubsystemInfo pci_ss_info_10b9_5237_1014_0540 =
 	{0x1014, 0x0540, pci_subsys_10b9_5237_1014_0540, 0};
 #undef pci_ss_info_1014_0540
@@ -30730,6 +32238,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x10cd, 0x1310, pci_subsys_10cd_1300_10cd_1310, 0};
 #undef pci_ss_info_10cd_1310
 #define pci_ss_info_10cd_1310 pci_ss_info_10cd_1300_10cd_1310
+static const pciSubsystemInfo pci_ss_info_10cd_1300_1195_1320 =
+	{0x1195, 0x1320, pci_subsys_10cd_1300_1195_1320, 0};
+#undef pci_ss_info_1195_1320
+#define pci_ss_info_1195_1320 pci_ss_info_10cd_1300_1195_1320
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_10d9_0531_1186_1200 =
@@ -31273,6 +32785,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x14af, 0x5810, pci_subsys_10de_00a0_14af_5810, 0};
 #undef pci_ss_info_14af_5810
 #define pci_ss_info_14af_5810 pci_ss_info_10de_00a0_14af_5810
+static const pciSubsystemInfo pci_ss_info_10de_00cd_10de_029b =
+	{0x10de, 0x029b, pci_subsys_10de_00cd_10de_029b, 0};
+#undef pci_ss_info_10de_029b
+#define pci_ss_info_10de_029b pci_ss_info_10de_00cd_10de_029b
 static const pciSubsystemInfo pci_ss_info_10de_00df_105b_0c43 =
 	{0x105b, 0x0c43, pci_subsys_10de_00df_105b_0c43, 0};
 #undef pci_ss_info_105b_0c43
@@ -31285,10 +32801,18 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x10de, 0x0c11, pci_subsys_10de_00e0_10de_0c11, 0};
 #undef pci_ss_info_10de_0c11
 #define pci_ss_info_10de_0c11 pci_ss_info_10de_00e0_10de_0c11
+static const pciSubsystemInfo pci_ss_info_10de_00e0_1462_7030 =
+	{0x1462, 0x7030, pci_subsys_10de_00e0_1462_7030, 0};
+#undef pci_ss_info_1462_7030
+#define pci_ss_info_1462_7030 pci_ss_info_10de_00e0_1462_7030
 static const pciSubsystemInfo pci_ss_info_10de_00e0_147b_1c0b =
 	{0x147b, 0x1c0b, pci_subsys_10de_00e0_147b_1c0b, 0};
 #undef pci_ss_info_147b_1c0b
 #define pci_ss_info_147b_1c0b pci_ss_info_10de_00e0_147b_1c0b
+static const pciSubsystemInfo pci_ss_info_10de_00e1_1462_7030 =
+	{0x1462, 0x7030, pci_subsys_10de_00e1_1462_7030, 0};
+#undef pci_ss_info_1462_7030
+#define pci_ss_info_1462_7030 pci_ss_info_10de_00e1_1462_7030
 static const pciSubsystemInfo pci_ss_info_10de_00e1_147b_1c0b =
 	{0x147b, 0x1c0b, pci_subsys_10de_00e1_147b_1c0b, 0};
 #undef pci_ss_info_147b_1c0b
@@ -31305,6 +32829,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x105b, 0x0c43, pci_subsys_10de_00e4_105b_0c43, 0};
 #undef pci_ss_info_105b_0c43
 #define pci_ss_info_105b_0c43 pci_ss_info_10de_00e4_105b_0c43
+static const pciSubsystemInfo pci_ss_info_10de_00e4_1462_7030 =
+	{0x1462, 0x7030, pci_subsys_10de_00e4_1462_7030, 0};
+#undef pci_ss_info_1462_7030
+#define pci_ss_info_1462_7030 pci_ss_info_10de_00e4_1462_7030
 static const pciSubsystemInfo pci_ss_info_10de_00e4_147b_1c0b =
 	{0x147b, 0x1c0b, pci_subsys_10de_00e4_147b_1c0b, 0};
 #undef pci_ss_info_147b_1c0b
@@ -31313,6 +32841,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x105b, 0x0c43, pci_subsys_10de_00e5_105b_0c43, 0};
 #undef pci_ss_info_105b_0c43
 #define pci_ss_info_105b_0c43 pci_ss_info_10de_00e5_105b_0c43
+static const pciSubsystemInfo pci_ss_info_10de_00e5_1462_7030 =
+	{0x1462, 0x7030, pci_subsys_10de_00e5_1462_7030, 0};
+#undef pci_ss_info_1462_7030
+#define pci_ss_info_1462_7030 pci_ss_info_10de_00e5_1462_7030
 static const pciSubsystemInfo pci_ss_info_10de_00e5_147b_1c0b =
 	{0x147b, 0x1c0b, pci_subsys_10de_00e5_147b_1c0b, 0};
 #undef pci_ss_info_147b_1c0b
@@ -31321,6 +32853,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x105b, 0x0c43, pci_subsys_10de_00e7_105b_0c43, 0};
 #undef pci_ss_info_105b_0c43
 #define pci_ss_info_105b_0c43 pci_ss_info_10de_00e7_105b_0c43
+static const pciSubsystemInfo pci_ss_info_10de_00e7_1462_7030 =
+	{0x1462, 0x7030, pci_subsys_10de_00e7_1462_7030, 0};
+#undef pci_ss_info_1462_7030
+#define pci_ss_info_1462_7030 pci_ss_info_10de_00e7_1462_7030
 static const pciSubsystemInfo pci_ss_info_10de_00e7_147b_1c0b =
 	{0x147b, 0x1c0b, pci_subsys_10de_00e7_147b_1c0b, 0};
 #undef pci_ss_info_147b_1c0b
@@ -31329,6 +32865,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x105b, 0x0c43, pci_subsys_10de_00e8_105b_0c43, 0};
 #undef pci_ss_info_105b_0c43
 #define pci_ss_info_105b_0c43 pci_ss_info_10de_00e8_105b_0c43
+static const pciSubsystemInfo pci_ss_info_10de_00e8_1462_7030 =
+	{0x1462, 0x7030, pci_subsys_10de_00e8_1462_7030, 0};
+#undef pci_ss_info_1462_7030
+#define pci_ss_info_1462_7030 pci_ss_info_10de_00e8_1462_7030
 static const pciSubsystemInfo pci_ss_info_10de_00e8_147b_1c0b =
 	{0x147b, 0x1c0b, pci_subsys_10de_00e8_147b_1c0b, 0};
 #undef pci_ss_info_147b_1c0b
@@ -31353,6 +32893,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1682, 0x211c, pci_subsys_10de_00f2_1682_211c, 0};
 #undef pci_ss_info_1682_211c
 #define pci_ss_info_1682_211c pci_ss_info_10de_00f2_1682_211c
+static const pciSubsystemInfo pci_ss_info_10de_00f6_1682_217e =
+	{0x1682, 0x217e, pci_subsys_10de_00f6_1682_217e, 0};
+#undef pci_ss_info_1682_217e
+#define pci_ss_info_1682_217e pci_ss_info_10de_00f6_1682_217e
 static const pciSubsystemInfo pci_ss_info_10de_00f9_1682_2120 =
 	{0x1682, 0x2120, pci_subsys_10de_00f9_1682_2120, 0};
 #undef pci_ss_info_1682_2120
@@ -31517,6 +33061,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x107d, 0x2842, pci_subsys_10de_0150_107d_2842, 0};
 #undef pci_ss_info_107d_2842
 #define pci_ss_info_107d_2842 pci_ss_info_10de_0150_107d_2842
+static const pciSubsystemInfo pci_ss_info_10de_0150_10de_002e =
+	{0x10de, 0x002e, pci_subsys_10de_0150_10de_002e, 0};
+#undef pci_ss_info_10de_002e
+#define pci_ss_info_10de_002e pci_ss_info_10de_0150_10de_002e
 static const pciSubsystemInfo pci_ss_info_10de_0150_1462_8831 =
 	{0x1462, 0x8831, pci_subsys_10de_0150_1462_8831, 0};
 #undef pci_ss_info_1462_8831
@@ -31557,6 +33105,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{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_0176_103c_08b0 =
+	{0x103c, 0x08b0, pci_subsys_10de_0176_103c_08b0, 0};
+#undef pci_ss_info_103c_08b0
+#define pci_ss_info_103c_08b0 pci_ss_info_10de_0176_103c_08b0
 static const pciSubsystemInfo pci_ss_info_10de_0176_4c53_1090 =
 	{0x4c53, 0x1090, pci_subsys_10de_0176_4c53_1090, 0};
 #undef pci_ss_info_4c53_1090
@@ -31565,6 +33117,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x10de, 0x0179, pci_subsys_10de_0179_10de_0179, 0};
 #undef pci_ss_info_10de_0179
 #define pci_ss_info_10de_0179 pci_ss_info_10de_0179_10de_0179
+static const pciSubsystemInfo pci_ss_info_10de_0181_1043_8063 =
+	{0x1043, 0x8063, pci_subsys_10de_0181_1043_8063, 0};
+#undef pci_ss_info_1043_8063
+#define pci_ss_info_1043_8063 pci_ss_info_10de_0181_1043_8063
 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
@@ -31585,6 +33141,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x147b, 0x8f0d, pci_subsys_10de_0181_147b_8f0d, 0};
 #undef pci_ss_info_147b_8f0d
 #define pci_ss_info_147b_8f0d pci_ss_info_10de_0181_147b_8f0d
+static const pciSubsystemInfo pci_ss_info_10de_01d1_1462_0345 =
+	{0x1462, 0x0345, pci_subsys_10de_01d1_1462_0345, 0};
+#undef pci_ss_info_1462_0345
+#define pci_ss_info_1462_0345 pci_ss_info_10de_01d1_1462_0345
 static const pciSubsystemInfo pci_ss_info_10de_01de_10de_01dc =
 	{0x10de, 0x01dc, pci_subsys_10de_01de_10de_01dc, 0};
 #undef pci_ss_info_10de_01dc
@@ -31753,6 +33313,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x103c, 0x006a, pci_subsys_10de_0347_103c_006a, 0};
 #undef pci_ss_info_103c_006a
 #define pci_ss_info_103c_006a pci_ss_info_10de_0347_103c_006a
+static const pciSubsystemInfo pci_ss_info_10de_0392_1462_0622 =
+	{0x1462, 0x0622, pci_subsys_10de_0392_1462_0622, 0};
+#undef pci_ss_info_1462_0622
+#define pci_ss_info_1462_0622 pci_ss_info_10de_0392_1462_0622
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_10e1_0391_10e1_0391 =
 	{0x10e1, 0x0391, pci_subsys_10e1_0391_10e1_0391, 0};
@@ -31760,6 +33324,12 @@ static const pciSubsystemInfo pci_ss_inf
 #define pci_ss_info_10e1_0391 pci_ss_info_10e1_0391_10e1_0391
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_10ec_0883_1025_1605 =
+	{0x1025, 0x1605, pci_subsys_10ec_0883_1025_1605, 0};
+#undef pci_ss_info_1025_1605
+#define pci_ss_info_1025_1605 pci_ss_info_10ec_0883_1025_1605
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_10ec_8029_10b8_2011 =
 	{0x10b8, 0x2011, pci_subsys_10ec_8029_10b8_2011, 0};
 #undef pci_ss_info_10b8_2011
@@ -32052,6 +33622,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1102, 0x2002, pci_subsys_1102_0004_1102_2002, 0};
 #undef pci_ss_info_1102_2002
 #define pci_ss_info_1102_2002 pci_ss_info_1102_0004_1102_2002
+static const pciSubsystemInfo pci_ss_info_1102_0005_1102_0021 =
+	{0x1102, 0x0021, pci_subsys_1102_0005_1102_0021, 0};
+#undef pci_ss_info_1102_0021
+#define pci_ss_info_1102_0021 pci_ss_info_1102_0005_1102_0021
+static const pciSubsystemInfo pci_ss_info_1102_0005_1102_1003 =
+	{0x1102, 0x1003, pci_subsys_1102_0005_1102_1003, 0};
+#undef pci_ss_info_1102_1003
+#define pci_ss_info_1102_1003 pci_ss_info_1102_0005_1102_1003
 static const pciSubsystemInfo pci_ss_info_1102_0007_1102_0007 =
 	{0x1102, 0x0007, pci_subsys_1102_0007_1102_0007, 0};
 #undef pci_ss_info_1102_0007
@@ -33008,6 +34586,34 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x5168, 0x0319, pci_subsys_1131_7133_5168_0319, 0};
 #undef pci_ss_info_5168_0319
 #define pci_ss_info_5168_0319 pci_ss_info_1131_7133_5168_0319
+static const pciSubsystemInfo pci_ss_info_1131_7133_5168_0502 =
+	{0x5168, 0x0502, pci_subsys_1131_7133_5168_0502, 0};
+#undef pci_ss_info_5168_0502
+#define pci_ss_info_5168_0502 pci_ss_info_1131_7133_5168_0502
+static const pciSubsystemInfo pci_ss_info_1131_7133_5168_0520 =
+	{0x5168, 0x0520, pci_subsys_1131_7133_5168_0520, 0};
+#undef pci_ss_info_5168_0520
+#define pci_ss_info_5168_0520 pci_ss_info_1131_7133_5168_0520
+static const pciSubsystemInfo pci_ss_info_1131_7133_5168_1502 =
+	{0x5168, 0x1502, pci_subsys_1131_7133_5168_1502, 0};
+#undef pci_ss_info_5168_1502
+#define pci_ss_info_5168_1502 pci_ss_info_1131_7133_5168_1502
+static const pciSubsystemInfo pci_ss_info_1131_7133_5168_2502 =
+	{0x5168, 0x2502, pci_subsys_1131_7133_5168_2502, 0};
+#undef pci_ss_info_5168_2502
+#define pci_ss_info_5168_2502 pci_ss_info_1131_7133_5168_2502
+static const pciSubsystemInfo pci_ss_info_1131_7133_5168_2520 =
+	{0x5168, 0x2520, pci_subsys_1131_7133_5168_2520, 0};
+#undef pci_ss_info_5168_2520
+#define pci_ss_info_5168_2520 pci_ss_info_1131_7133_5168_2520
+static const pciSubsystemInfo pci_ss_info_1131_7133_5168_3502 =
+	{0x5168, 0x3502, pci_subsys_1131_7133_5168_3502, 0};
+#undef pci_ss_info_5168_3502
+#define pci_ss_info_5168_3502 pci_ss_info_1131_7133_5168_3502
+static const pciSubsystemInfo pci_ss_info_1131_7133_5168_3520 =
+	{0x5168, 0x3520, pci_subsys_1131_7133_5168_3520, 0};
+#undef pci_ss_info_5168_3520
+#define pci_ss_info_5168_3520 pci_ss_info_1131_7133_5168_3520
 static const pciSubsystemInfo pci_ss_info_1131_7134_1019_4cb4 =
 	{0x1019, 0x4cb4, pci_subsys_1131_7134_1019_4cb4, 0};
 #undef pci_ss_info_1019_4cb4
@@ -33020,6 +34626,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1043, 0x4840, pci_subsys_1131_7134_1043_4840, 0};
 #undef pci_ss_info_1043_4840
 #define pci_ss_info_1043_4840 pci_ss_info_1131_7134_1043_4840
+static const pciSubsystemInfo pci_ss_info_1131_7134_1043_4842 =
+	{0x1043, 0x4842, pci_subsys_1131_7134_1043_4842, 0};
+#undef pci_ss_info_1043_4842
+#define pci_ss_info_1043_4842 pci_ss_info_1131_7134_1043_4842
 static const pciSubsystemInfo pci_ss_info_1131_7134_1131_2004 =
 	{0x1131, 0x2004, pci_subsys_1131_7134_1131_2004, 0};
 #undef pci_ss_info_1131_2004
@@ -33212,6 +34822,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x153b, 0x1156, pci_subsys_1131_7146_153b_1156, 0};
 #undef pci_ss_info_153b_1156
 #define pci_ss_info_153b_1156 pci_ss_info_1131_7146_153b_1156
+static const pciSubsystemInfo pci_ss_info_1131_9730_1131_0000 =
+	{0x1131, 0x0000, pci_subsys_1131_9730_1131_0000, 0};
+#undef pci_ss_info_1131_0000
+#define pci_ss_info_1131_0000 pci_ss_info_1131_9730_1131_0000
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_1133_e010_110a_0021 =
@@ -33723,6 +35337,12 @@ static const pciSubsystemInfo pci_ss_inf
 #undef pci_ss_info_4c53_1080
 #define pci_ss_info_4c53_1080 pci_ss_info_1166_0212_4c53_1080
 #endif
+static const pciSubsystemInfo pci_ss_info_1166_0213_1028_4134 =
+	{0x1028, 0x4134, pci_subsys_1166_0213_1028_4134, 0};
+#undef pci_ss_info_1028_4134
+#define pci_ss_info_1028_4134 pci_ss_info_1166_0213_1028_4134
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
 static const pciSubsystemInfo pci_ss_info_1166_0213_1028_c134 =
 	{0x1028, 0xc134, pci_subsys_1166_0213_1028_c134, 0};
 #undef pci_ss_info_1028_c134
@@ -35250,6 +36870,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1259, 0xc104, pci_subsys_1260_3890_1259_c104, 0};
 #undef pci_ss_info_1259_c104
 #define pci_ss_info_1259_c104 pci_ss_info_1260_3890_1259_c104
+static const pciSubsystemInfo pci_ss_info_1260_3890_1260_0000 =
+	{0x1260, 0x0000, pci_subsys_1260_3890_1260_0000, 0};
+#undef pci_ss_info_1260_0000
+#define pci_ss_info_1260_0000 pci_ss_info_1260_3890_1260_0000
 static const pciSubsystemInfo pci_ss_info_1260_3890_1385_4800 =
 	{0x1385, 0x4800, pci_subsys_1260_3890_1385_4800, 0};
 #undef pci_ss_info_1385_4800
@@ -36414,6 +38038,32 @@ static const pciSubsystemInfo pci_ss_inf
 #define pci_ss_info_1681_a000 pci_ss_info_13f6_0111_1681_a000
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_13fe_1600_1601_0002 =
+	{0x1601, 0x0002, pci_subsys_13fe_1600_1601_0002, 0};
+#undef pci_ss_info_1601_0002
+#define pci_ss_info_1601_0002 pci_ss_info_13fe_1600_1601_0002
+static const pciSubsystemInfo pci_ss_info_13fe_1600_1602_0002 =
+	{0x1602, 0x0002, pci_subsys_13fe_1600_1602_0002, 0};
+#undef pci_ss_info_1602_0002
+#define pci_ss_info_1602_0002 pci_ss_info_13fe_1600_1602_0002
+static const pciSubsystemInfo pci_ss_info_13fe_1600_1612_0004 =
+	{0x1612, 0x0004, pci_subsys_13fe_1600_1612_0004, 0};
+#undef pci_ss_info_1612_0004
+#define pci_ss_info_1612_0004 pci_ss_info_13fe_1600_1612_0004
+static const pciSubsystemInfo pci_ss_info_13fe_16ff_1601_0000 =
+	{0x1601, 0x0000, pci_subsys_13fe_16ff_1601_0000, 0};
+#undef pci_ss_info_1601_0000
+#define pci_ss_info_1601_0000 pci_ss_info_13fe_16ff_1601_0000
+static const pciSubsystemInfo pci_ss_info_13fe_16ff_1602_0000 =
+	{0x1602, 0x0000, pci_subsys_13fe_16ff_1602_0000, 0};
+#undef pci_ss_info_1602_0000
+#define pci_ss_info_1602_0000 pci_ss_info_13fe_16ff_1602_0000
+static const pciSubsystemInfo pci_ss_info_13fe_16ff_1612_0000 =
+	{0x1612, 0x0000, pci_subsys_13fe_16ff_1612_0000, 0};
+#undef pci_ss_info_1612_0000
+#define pci_ss_info_1612_0000 pci_ss_info_13fe_16ff_1612_0000
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_1412_1712_1412_1712 =
 	{0x1412, 0x1712, pci_subsys_1412_1712_1412_1712, 0};
 #undef pci_ss_info_1412_1712
@@ -36528,6 +38178,22 @@ static const pciSubsystemInfo pci_ss_inf
 #define pci_ss_info_270f_f645 pci_ss_info_1412_1724_270f_f645
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_1415_9501_12c4_0201 =
+	{0x12c4, 0x0201, pci_subsys_1415_9501_12c4_0201, 0};
+#undef pci_ss_info_12c4_0201
+#define pci_ss_info_12c4_0201 pci_ss_info_1415_9501_12c4_0201
+static const pciSubsystemInfo pci_ss_info_1415_9501_12c4_0202 =
+	{0x12c4, 0x0202, pci_subsys_1415_9501_12c4_0202, 0};
+#undef pci_ss_info_12c4_0202
+#define pci_ss_info_12c4_0202 pci_ss_info_1415_9501_12c4_0202
+static const pciSubsystemInfo pci_ss_info_1415_9501_12c4_0203 =
+	{0x12c4, 0x0203, pci_subsys_1415_9501_12c4_0203, 0};
+#undef pci_ss_info_12c4_0203
+#define pci_ss_info_12c4_0203 pci_ss_info_1415_9501_12c4_0203
+static const pciSubsystemInfo pci_ss_info_1415_9501_12c4_0210 =
+	{0x12c4, 0x0210, pci_subsys_1415_9501_12c4_0210, 0};
+#undef pci_ss_info_12c4_0210
+#define pci_ss_info_12c4_0210 pci_ss_info_1415_9501_12c4_0210
 static const pciSubsystemInfo pci_ss_info_1415_9501_131f_2050 =
 	{0x131f, 0x2050, pci_subsys_1415_9501_131f_2050, 0};
 #undef pci_ss_info_131f_2050
@@ -36544,6 +38210,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x15ed, 0x2001, pci_subsys_1415_9501_15ed_2001, 0};
 #undef pci_ss_info_15ed_2001
 #define pci_ss_info_15ed_2001 pci_ss_info_1415_9501_15ed_2001
+static const pciSubsystemInfo pci_ss_info_1415_9510_12c4_0200 =
+	{0x12c4, 0x0200, pci_subsys_1415_9510_12c4_0200, 0};
+#undef pci_ss_info_12c4_0200
+#define pci_ss_info_12c4_0200 pci_ss_info_1415_9510_12c4_0200
+static const pciSubsystemInfo pci_ss_info_1415_9511_12c4_0211 =
+	{0x12c4, 0x0211, pci_subsys_1415_9511_12c4_0211, 0};
+#undef pci_ss_info_12c4_0211
+#define pci_ss_info_12c4_0211 pci_ss_info_1415_9511_12c4_0211
 static const pciSubsystemInfo pci_ss_info_1415_9511_15ed_2000 =
 	{0x15ed, 0x2000, pci_subsys_1415_9511_15ed_2000, 0};
 #undef pci_ss_info_15ed_2000
@@ -36554,6 +38228,18 @@ static const pciSubsystemInfo pci_ss_inf
 #define pci_ss_info_15ed_2001 pci_ss_info_1415_9511_15ed_2001
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_14c1_8043_103c_1240 =
+	{0x103c, 0x1240, pci_subsys_14c1_8043_103c_1240, 0};
+#undef pci_ss_info_103c_1240
+#define pci_ss_info_103c_1240 pci_ss_info_14c1_8043_103c_1240
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_14e4_1600_107b_5048 =
+	{0x107b, 0x5048, pci_subsys_14e4_1600_107b_5048, 0};
+#undef pci_ss_info_107b_5048
+#define pci_ss_info_107b_5048 pci_ss_info_14e4_1600_107b_5048
 static const pciSubsystemInfo pci_ss_info_14e4_1644_1014_0277 =
 	{0x1014, 0x0277, pci_subsys_14e4_1644_1014_0277, 0};
 #undef pci_ss_info_1014_0277
@@ -36824,6 +38510,22 @@ static const pciSubsystemInfo pci_ss_inf
 #undef pci_ss_info_0e11_00d1
 #define pci_ss_info_0e11_00d1 pci_ss_info_14e4_1648_0e11_00d1
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_14e4_1648_10a9_8013 =
+	{0x10a9, 0x8013, pci_subsys_14e4_1648_10a9_8013, 0};
+#undef pci_ss_info_10a9_8013
+#define pci_ss_info_10a9_8013 pci_ss_info_14e4_1648_10a9_8013
+static const pciSubsystemInfo pci_ss_info_14e4_1648_10a9_8018 =
+	{0x10a9, 0x8018, pci_subsys_14e4_1648_10a9_8018, 0};
+#undef pci_ss_info_10a9_8018
+#define pci_ss_info_10a9_8018 pci_ss_info_14e4_1648_10a9_8018
+static const pciSubsystemInfo pci_ss_info_14e4_1648_10a9_801a =
+	{0x10a9, 0x801a, pci_subsys_14e4_1648_10a9_801a, 0};
+#undef pci_ss_info_10a9_801a
+#define pci_ss_info_10a9_801a pci_ss_info_14e4_1648_10a9_801a
+static const pciSubsystemInfo pci_ss_info_14e4_1648_10a9_801b =
+	{0x10a9, 0x801b, pci_subsys_14e4_1648_10a9_801b, 0};
+#undef pci_ss_info_10a9_801b
+#define pci_ss_info_10a9_801b pci_ss_info_14e4_1648_10a9_801b
 static const pciSubsystemInfo pci_ss_info_14e4_1648_10b7_2000 =
 	{0x10b7, 0x2000, pci_subsys_14e4_1648_10b7_2000, 0};
 #undef pci_ss_info_10b7_2000
@@ -36841,12 +38543,30 @@ static const pciSubsystemInfo pci_ss_inf
 #undef pci_ss_info_1734_100b
 #define pci_ss_info_1734_100b pci_ss_info_14e4_1648_1734_100b
 #endif
+static const pciSubsystemInfo pci_ss_info_14e4_164a_103c_3070 =
+	{0x103c, 0x3070, pci_subsys_14e4_164a_103c_3070, 0};
+#undef pci_ss_info_103c_3070
+#define pci_ss_info_103c_3070 pci_ss_info_14e4_164a_103c_3070
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
 static const pciSubsystemInfo pci_ss_info_14e4_164a_103c_3101 =
 	{0x103c, 0x3101, pci_subsys_14e4_164a_103c_3101, 0};
 #undef pci_ss_info_103c_3101
 #define pci_ss_info_103c_3101 pci_ss_info_14e4_164a_103c_3101
 #ifdef VENDOR_INCLUDE_NONVIDEO
 #endif
+static const pciSubsystemInfo pci_ss_info_14e4_164c_103c_7037 =
+	{0x103c, 0x7037, pci_subsys_14e4_164c_103c_7037, 0};
+#undef pci_ss_info_103c_7037
+#define pci_ss_info_103c_7037 pci_ss_info_14e4_164c_103c_7037
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_14e4_164c_103c_7038 =
+	{0x103c, 0x7038, pci_subsys_14e4_164c_103c_7038, 0};
+#undef pci_ss_info_103c_7038
+#define pci_ss_info_103c_7038 pci_ss_info_14e4_164c_103c_7038
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
 static const pciSubsystemInfo pci_ss_info_14e4_1653_0e11_00e3 =
 	{0x0e11, 0x00e3, pci_subsys_14e4_1653_0e11_00e3, 0};
 #undef pci_ss_info_0e11_00e3
@@ -36955,11 +38675,27 @@ static const pciSubsystemInfo pci_ss_inf
 #undef pci_ss_info_1734_105d
 #define pci_ss_info_1734_105d pci_ss_info_14e4_1677_1734_105d
 #endif
+static const pciSubsystemInfo pci_ss_info_14e4_1679_103c_1707 =
+	{0x103c, 0x1707, pci_subsys_14e4_1679_103c_1707, 0};
+#undef pci_ss_info_103c_1707
+#define pci_ss_info_103c_1707 pci_ss_info_14e4_1679_103c_1707
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_14e4_1679_103c_170c =
+	{0x103c, 0x170c, pci_subsys_14e4_1679_103c_170c, 0};
+#undef pci_ss_info_103c_170c
+#define pci_ss_info_103c_170c pci_ss_info_14e4_1679_103c_170c
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
 static const pciSubsystemInfo pci_ss_info_14e4_1679_103c_703c =
 	{0x103c, 0x703c, pci_subsys_14e4_1679_103c_703c, 0};
 #undef pci_ss_info_103c_703c
 #define pci_ss_info_103c_703c pci_ss_info_14e4_1679_103c_703c
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_14e4_167d_17aa_2081 =
+	{0x17aa, 0x2081, pci_subsys_14e4_167d_17aa_2081, 0};
+#undef pci_ss_info_17aa_2081
+#define pci_ss_info_17aa_2081 pci_ss_info_14e4_167d_17aa_2081
 #endif
 static const pciSubsystemInfo pci_ss_info_14e4_1696_103c_12bc =
 	{0x103c, 0x12bc, pci_subsys_14e4_1696_103c_12bc, 0};
@@ -37024,6 +38760,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x14e4, 0x800a, pci_subsys_14e4_16a7_14e4_800a, 0};
 #undef pci_ss_info_14e4_800a
 #define pci_ss_info_14e4_800a pci_ss_info_14e4_16a7_14e4_800a
+static const pciSubsystemInfo pci_ss_info_14e4_16a8_10a9_8014 =
+	{0x10a9, 0x8014, pci_subsys_14e4_16a8_10a9_8014, 0};
+#undef pci_ss_info_10a9_8014
+#define pci_ss_info_10a9_8014 pci_ss_info_14e4_16a8_10a9_8014
+static const pciSubsystemInfo pci_ss_info_14e4_16a8_10a9_801c =
+	{0x10a9, 0x801c, pci_subsys_14e4_16a8_10a9_801c, 0};
+#undef pci_ss_info_10a9_801c
+#define pci_ss_info_10a9_801c pci_ss_info_14e4_16a8_10a9_801c
 static const pciSubsystemInfo pci_ss_info_14e4_16a8_10b7_2001 =
 	{0x10b7, 0x2001, pci_subsys_14e4_16a8_10b7_2001, 0};
 #undef pci_ss_info_10b7_2001
@@ -37034,6 +38778,24 @@ static const pciSubsystemInfo pci_ss_inf
 #undef pci_ss_info_103c_3102
 #define pci_ss_info_103c_3102 pci_ss_info_14e4_16aa_103c_3102
 #ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_14e4_16ac_103c_1706 =
+	{0x103c, 0x1706, pci_subsys_14e4_16ac_103c_1706, 0};
+#undef pci_ss_info_103c_1706
+#define pci_ss_info_103c_1706 pci_ss_info_14e4_16ac_103c_1706
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_14e4_16ac_103c_703b =
+	{0x103c, 0x703b, pci_subsys_14e4_16ac_103c_703b, 0};
+#undef pci_ss_info_103c_703b
+#define pci_ss_info_103c_703b pci_ss_info_14e4_16ac_103c_703b
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_14e4_16ac_103c_703d =
+	{0x103c, 0x703d, pci_subsys_14e4_16ac_103c_703d, 0};
+#undef pci_ss_info_103c_703d
+#define pci_ss_info_103c_703d pci_ss_info_14e4_16ac_103c_703d
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_14e4_16c6_10b7_1100 =
 	{0x10b7, 0x1100, pci_subsys_14e4_16c6_10b7_1100, 0};
 #undef pci_ss_info_10b7_1100
@@ -37234,6 +38996,12 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1414, 0x0004, pci_subsys_14e4_4325_1414_0004, 0};
 #undef pci_ss_info_1414_0004
 #define pci_ss_info_1414_0004 pci_ss_info_14e4_4325_1414_0004
+#endif
+static const pciSubsystemInfo pci_ss_info_14e4_4401_103c_08b0 =
+	{0x103c, 0x08b0, pci_subsys_14e4_4401_103c_08b0, 0};
+#undef pci_ss_info_103c_08b0
+#define pci_ss_info_103c_08b0 pci_ss_info_14e4_4401_103c_08b0
+#ifdef VENDOR_INCLUDE_NONVIDEO
 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
@@ -37900,6 +39668,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x14b7, 0x0a60, pci_subsys_168c_0013_14b7_0a60, 0};
 #undef pci_ss_info_14b7_0a60
 #define pci_ss_info_14b7_0a60 pci_ss_info_168c_0013_14b7_0a60
+static const pciSubsystemInfo pci_ss_info_168c_0013_1668_1026 =
+	{0x1668, 0x1026, pci_subsys_168c_0013_1668_1026, 0};
+#undef pci_ss_info_1668_1026
+#define pci_ss_info_1668_1026 pci_ss_info_168c_0013_1668_1026
 static const pciSubsystemInfo pci_ss_info_168c_0013_168c_0013 =
 	{0x168c, 0x0013, pci_subsys_168c_0013_168c_0013, 0};
 #undef pci_ss_info_168c_0013
@@ -37912,6 +39684,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x168c, 0x1027, pci_subsys_168c_0013_168c_1027, 0};
 #undef pci_ss_info_168c_1027
 #define pci_ss_info_168c_1027 pci_ss_info_168c_0013_168c_1027
+static const pciSubsystemInfo pci_ss_info_168c_0013_168c_1042 =
+	{0x168c, 0x1042, pci_subsys_168c_0013_168c_1042, 0};
+#undef pci_ss_info_168c_1042
+#define pci_ss_info_168c_1042 pci_ss_info_168c_0013_168c_1042
 static const pciSubsystemInfo pci_ss_info_168c_0013_168c_2026 =
 	{0x168c, 0x2026, pci_subsys_168c_0013_168c_2026, 0};
 #undef pci_ss_info_168c_2026
@@ -37924,6 +39700,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x168c, 0x2042, pci_subsys_168c_0013_168c_2042, 0};
 #undef pci_ss_info_168c_2042
 #define pci_ss_info_168c_2042 pci_ss_info_168c_0013_168c_2042
+static const pciSubsystemInfo pci_ss_info_168c_0013_168c_2051 =
+	{0x168c, 0x2051, pci_subsys_168c_0013_168c_2051, 0};
+#undef pci_ss_info_168c_2051
+#define pci_ss_info_168c_2051 pci_ss_info_168c_0013_168c_2051
 static const pciSubsystemInfo pci_ss_info_168c_0013_16ab_7302 =
 	{0x16ab, 0x7302, pci_subsys_168c_0013_16ab_7302, 0};
 #undef pci_ss_info_16ab_7302
@@ -37956,6 +39736,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1186, 0x3a24, pci_subsys_168c_001a_1186_3a24, 0};
 #undef pci_ss_info_1186_3a24
 #define pci_ss_info_1186_3a24 pci_ss_info_168c_001a_1186_3a24
+static const pciSubsystemInfo pci_ss_info_168c_001a_168c_001a =
+	{0x168c, 0x001a, pci_subsys_168c_001a_168c_001a, 0};
+#undef pci_ss_info_168c_001a
+#define pci_ss_info_168c_001a pci_ss_info_168c_001a_168c_001a
 static const pciSubsystemInfo pci_ss_info_168c_001a_168c_1052 =
 	{0x168c, 0x1052, pci_subsys_168c_001a_168c_1052, 0};
 #undef pci_ss_info_168c_1052
@@ -37976,6 +39760,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x168c, 0x2063, pci_subsys_168c_001b_168c_2063, 0};
 #undef pci_ss_info_168c_2063
 #define pci_ss_info_168c_2063 pci_ss_info_168c_001b_168c_2063
+static const pciSubsystemInfo pci_ss_info_168c_1014_1014_058a =
+	{0x1014, 0x058a, pci_subsys_168c_1014_1014_058a, 0};
+#undef pci_ss_info_1014_058a
+#define pci_ss_info_1014_058a pci_ss_info_168c_1014_1014_058a
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_1737_1032_1737_0015 =
@@ -38004,6 +39792,18 @@ static const pciSubsystemInfo pci_ss_inf
 #undef pci_ss_info_103c_12d5
 #define pci_ss_info_103c_12d5 pci_ss_info_17d5_5831_103c_12d5
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_17d5_5831_10a9_8020 =
+	{0x10a9, 0x8020, pci_subsys_17d5_5831_10a9_8020, 0};
+#undef pci_ss_info_10a9_8020
+#define pci_ss_info_10a9_8020 pci_ss_info_17d5_5831_10a9_8020
+static const pciSubsystemInfo pci_ss_info_17d5_5831_10a9_8024 =
+	{0x10a9, 0x8024, pci_subsys_17d5_5831_10a9_8024, 0};
+#undef pci_ss_info_10a9_8024
+#define pci_ss_info_10a9_8024 pci_ss_info_17d5_5831_10a9_8024
+static const pciSubsystemInfo pci_ss_info_17d5_5832_10a9_8021 =
+	{0x10a9, 0x8021, pci_subsys_17d5_5832_10a9_8021, 0};
+#undef pci_ss_info_10a9_8021
+#define pci_ss_info_10a9_8021 pci_ss_info_17d5_5832_10a9_8021
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_17fe_2220_17fe_2220 =
@@ -38130,6 +39930,10 @@ static const pciSubsystemInfo pci_ss_inf
 #define pci_ss_info_18ec_d004 pci_ss_info_18ec_c058_18ec_d004
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_3388_0021_1775_ce90 =
+	{0x1775, 0xce90, pci_subsys_3388_0021_1775_ce90, 0};
+#undef pci_ss_info_1775_ce90
+#define pci_ss_info_1775_ce90 pci_ss_info_3388_0021_1775_ce90
 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
@@ -38308,6 +40112,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x0270, 0x0801, pci_subsys_4444_0016_0270_0801, 0};
 #undef pci_ss_info_0270_0801
 #define pci_ss_info_0270_0801 pci_ss_info_4444_0016_0270_0801
+static const pciSubsystemInfo pci_ss_info_4444_0016_10fc_d038 =
+	{0x10fc, 0xd038, pci_subsys_4444_0016_10fc_d038, 0};
+#undef pci_ss_info_10fc_d038
+#define pci_ss_info_10fc_d038 pci_ss_info_4444_0016_10fc_d038
+static const pciSubsystemInfo pci_ss_info_4444_0016_10fc_d039 =
+	{0x10fc, 0xd039, pci_subsys_4444_0016_10fc_d039, 0};
+#undef pci_ss_info_10fc_d039
+#define pci_ss_info_10fc_d039 pci_ss_info_4444_0016_10fc_d039
 static const pciSubsystemInfo pci_ss_info_4444_0016_12ab_fff3 =
 	{0x12ab, 0xfff3, pci_subsys_4444_0016_12ab_fff3, 0};
 #undef pci_ss_info_12ab_fff3
@@ -38316,6 +40128,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x12ab, 0xffff, pci_subsys_4444_0016_12ab_ffff, 0};
 #undef pci_ss_info_12ab_ffff
 #define pci_ss_info_12ab_ffff pci_ss_info_4444_0016_12ab_ffff
+static const pciSubsystemInfo pci_ss_info_4444_0016_1461_c019 =
+	{0x1461, 0xc019, pci_subsys_4444_0016_1461_c019, 0};
+#undef pci_ss_info_1461_c019
+#define pci_ss_info_1461_c019 pci_ss_info_4444_0016_1461_c019
 static const pciSubsystemInfo pci_ss_info_4444_0016_9005_0092 =
 	{0x9005, 0x0092, pci_subsys_4444_0016_9005_0092, 0};
 #undef pci_ss_info_9005_0092
@@ -38737,14 +40553,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1014, 0x026a, pci_subsys_8086_100e_1014_026a, 0};
 #undef pci_ss_info_1014_026a
 #define pci_ss_info_1014_026a pci_ss_info_8086_100e_1014_026a
-static const pciSubsystemInfo pci_ss_info_8086_100e_1024_0134 =
-	{0x1024, 0x0134, pci_subsys_8086_100e_1024_0134, 0};
-#undef pci_ss_info_1024_0134
-#define pci_ss_info_1024_0134 pci_ss_info_8086_100e_1024_0134
 static const pciSubsystemInfo pci_ss_info_8086_100e_1028_002e =
 	{0x1028, 0x002e, pci_subsys_8086_100e_1028_002e, 0};
 #undef pci_ss_info_1028_002e
 #define pci_ss_info_1028_002e pci_ss_info_8086_100e_1028_002e
+static const pciSubsystemInfo pci_ss_info_8086_100e_1028_0134 =
+	{0x1028, 0x0134, pci_subsys_8086_100e_1028_0134, 0};
+#undef pci_ss_info_1028_0134
+#define pci_ss_info_1028_0134 pci_ss_info_8086_100e_1028_0134
 static const pciSubsystemInfo pci_ss_info_8086_100e_1028_0151 =
 	{0x1028, 0x0151, pci_subsys_8086_100e_1028_0151, 0};
 #undef pci_ss_info_1028_0151
@@ -38857,6 +40673,18 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x1113, pci_subsys_8086_1013_8086_1113, 0};
 #undef pci_ss_info_8086_1113
 #define pci_ss_info_8086_1113 pci_ss_info_8086_1013_8086_1113
+static const pciSubsystemInfo pci_ss_info_8086_1014_8086_0014 =
+	{0x8086, 0x0014, pci_subsys_8086_1014_8086_0014, 0};
+#undef pci_ss_info_8086_0014
+#define pci_ss_info_8086_0014 pci_ss_info_8086_1014_8086_0014
+static const pciSubsystemInfo pci_ss_info_8086_1014_8086_1014 =
+	{0x8086, 0x1014, pci_subsys_8086_1014_8086_1014, 0};
+#undef pci_ss_info_8086_1014
+#define pci_ss_info_8086_1014 pci_ss_info_8086_1014_8086_1014
+static const pciSubsystemInfo pci_ss_info_8086_1015_8086_1015 =
+	{0x8086, 0x1015, pci_subsys_8086_1015_8086_1015, 0};
+#undef pci_ss_info_8086_1015
+#define pci_ss_info_8086_1015 pci_ss_info_8086_1015_8086_1015
 static const pciSubsystemInfo pci_ss_info_8086_1016_1014_052c =
 	{0x1014, 0x052c, pci_subsys_8086_1016_1014_052c, 0};
 #undef pci_ss_info_1014_052c
@@ -38901,6 +40729,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x3427, pci_subsys_8086_1019_8086_3427, 0};
 #undef pci_ss_info_8086_3427
 #define pci_ss_info_8086_3427 pci_ss_info_8086_1019_8086_3427
+static const pciSubsystemInfo pci_ss_info_8086_101a_8086_101a =
+	{0x8086, 0x101a, pci_subsys_8086_101a_8086_101a, 0};
+#undef pci_ss_info_8086_101a
+#define pci_ss_info_8086_101a pci_ss_info_8086_101a_8086_101a
 static const pciSubsystemInfo pci_ss_info_8086_101d_8086_1000 =
 	{0x8086, 0x1000, pci_subsys_8086_101d_8086_1000, 0};
 #undef pci_ss_info_8086_1000
@@ -38933,6 +40765,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x1002, pci_subsys_8086_1026_8086_1002, 0};
 #undef pci_ss_info_8086_1002
 #define pci_ss_info_8086_1002 pci_ss_info_8086_1026_8086_1002
+static const pciSubsystemInfo pci_ss_info_8086_1026_8086_1003 =
+	{0x8086, 0x1003, pci_subsys_8086_1026_8086_1003, 0};
+#undef pci_ss_info_8086_1003
+#define pci_ss_info_8086_1003 pci_ss_info_8086_1026_8086_1003
 static const pciSubsystemInfo pci_ss_info_8086_1026_8086_1026 =
 	{0x8086, 0x1026, pci_subsys_8086_1026_8086_1026, 0};
 #undef pci_ss_info_8086_1026
@@ -39005,10 +40841,18 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1014, 0x0267, pci_subsys_8086_1039_1014_0267, 0};
 #undef pci_ss_info_1014_0267
 #define pci_ss_info_1014_0267 pci_ss_info_8086_1039_1014_0267
+static const pciSubsystemInfo pci_ss_info_8086_103d_1014_0522 =
+	{0x1014, 0x0522, pci_subsys_8086_103d_1014_0522, 0};
+#undef pci_ss_info_1014_0522
+#define pci_ss_info_1014_0522 pci_ss_info_8086_103d_1014_0522
 static const pciSubsystemInfo pci_ss_info_8086_1040_16be_1040 =
 	{0x16be, 0x1040, pci_subsys_8086_1040_16be_1040, 0};
 #undef pci_ss_info_16be_1040
 #define pci_ss_info_16be_1040 pci_ss_info_8086_1040_16be_1040
+static const pciSubsystemInfo pci_ss_info_8086_1043_103c_08b0 =
+	{0x103c, 0x08b0, pci_subsys_8086_1043_103c_08b0, 0};
+#undef pci_ss_info_103c_08b0
+#define pci_ss_info_103c_08b0 pci_ss_info_8086_1043_103c_08b0
 static const pciSubsystemInfo pci_ss_info_8086_1043_8086_2527 =
 	{0x8086, 0x2527, pci_subsys_8086_1043_8086_2527, 0};
 #undef pci_ss_info_8086_2527
@@ -39041,10 +40885,62 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x3427, pci_subsys_8086_1050_8086_3427, 0};
 #undef pci_ss_info_8086_3427
 #define pci_ss_info_8086_3427 pci_ss_info_8086_1050_8086_3427
+static const pciSubsystemInfo pci_ss_info_8086_105e_103c_7044 =
+	{0x103c, 0x7044, pci_subsys_8086_105e_103c_7044, 0};
+#undef pci_ss_info_103c_7044
+#define pci_ss_info_103c_7044 pci_ss_info_8086_105e_103c_7044
 static const pciSubsystemInfo pci_ss_info_8086_105e_1775_6003 =
 	{0x1775, 0x6003, pci_subsys_8086_105e_1775_6003, 0};
 #undef pci_ss_info_1775_6003
 #define pci_ss_info_1775_6003 pci_ss_info_8086_105e_1775_6003
+static const pciSubsystemInfo pci_ss_info_8086_105e_8086_005e =
+	{0x8086, 0x005e, pci_subsys_8086_105e_8086_005e, 0};
+#undef pci_ss_info_8086_005e
+#define pci_ss_info_8086_005e pci_ss_info_8086_105e_8086_005e
+static const pciSubsystemInfo pci_ss_info_8086_105e_8086_105e =
+	{0x8086, 0x105e, pci_subsys_8086_105e_8086_105e, 0};
+#undef pci_ss_info_8086_105e
+#define pci_ss_info_8086_105e pci_ss_info_8086_105e_8086_105e
+static const pciSubsystemInfo pci_ss_info_8086_105e_8086_115e =
+	{0x8086, 0x115e, pci_subsys_8086_105e_8086_115e, 0};
+#undef pci_ss_info_8086_115e
+#define pci_ss_info_8086_115e pci_ss_info_8086_105e_8086_115e
+static const pciSubsystemInfo pci_ss_info_8086_105e_8086_116e =
+	{0x8086, 0x116e, pci_subsys_8086_105e_8086_116e, 0};
+#undef pci_ss_info_8086_116e
+#define pci_ss_info_8086_116e pci_ss_info_8086_105e_8086_116e
+static const pciSubsystemInfo pci_ss_info_8086_105e_8086_125e =
+	{0x8086, 0x125e, pci_subsys_8086_105e_8086_125e, 0};
+#undef pci_ss_info_8086_125e
+#define pci_ss_info_8086_125e pci_ss_info_8086_105e_8086_125e
+static const pciSubsystemInfo pci_ss_info_8086_105e_8086_135e =
+	{0x8086, 0x135e, pci_subsys_8086_105e_8086_135e, 0};
+#undef pci_ss_info_8086_135e
+#define pci_ss_info_8086_135e pci_ss_info_8086_105e_8086_135e
+static const pciSubsystemInfo pci_ss_info_8086_105f_8086_115f =
+	{0x8086, 0x115f, pci_subsys_8086_105f_8086_115f, 0};
+#undef pci_ss_info_8086_115f
+#define pci_ss_info_8086_115f pci_ss_info_8086_105f_8086_115f
+static const pciSubsystemInfo pci_ss_info_8086_105f_8086_116f =
+	{0x8086, 0x116f, pci_subsys_8086_105f_8086_116f, 0};
+#undef pci_ss_info_8086_116f
+#define pci_ss_info_8086_116f pci_ss_info_8086_105f_8086_116f
+static const pciSubsystemInfo pci_ss_info_8086_105f_8086_125f =
+	{0x8086, 0x125f, pci_subsys_8086_105f_8086_125f, 0};
+#undef pci_ss_info_8086_125f
+#define pci_ss_info_8086_125f pci_ss_info_8086_105f_8086_125f
+static const pciSubsystemInfo pci_ss_info_8086_105f_8086_135f =
+	{0x8086, 0x135f, pci_subsys_8086_105f_8086_135f, 0};
+#undef pci_ss_info_8086_135f
+#define pci_ss_info_8086_135f pci_ss_info_8086_105f_8086_135f
+static const pciSubsystemInfo pci_ss_info_8086_1060_8086_0060 =
+	{0x8086, 0x0060, pci_subsys_8086_1060_8086_0060, 0};
+#undef pci_ss_info_8086_0060
+#define pci_ss_info_8086_0060 pci_ss_info_8086_1060_8086_0060
+static const pciSubsystemInfo pci_ss_info_8086_1060_8086_1060 =
+	{0x8086, 0x1060, pci_subsys_8086_1060_8086_1060, 0};
+#undef pci_ss_info_8086_1060
+#define pci_ss_info_8086_1060 pci_ss_info_8086_1060_8086_1060
 static const pciSubsystemInfo pci_ss_info_8086_1064_1043_80f8 =
 	{0x1043, 0x80f8, pci_subsys_8086_1064_1043_80f8, 0};
 #undef pci_ss_info_1043_80f8
@@ -39109,6 +41005,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x103c, 0x12cf, pci_subsys_8086_1079_103c_12cf, 0};
 #undef pci_ss_info_103c_12cf
 #define pci_ss_info_103c_12cf pci_ss_info_8086_1079_103c_12cf
+static const pciSubsystemInfo pci_ss_info_8086_1079_1775_10d0 =
+	{0x1775, 0x10d0, pci_subsys_8086_1079_1775_10d0, 0};
+#undef pci_ss_info_1775_10d0
+#define pci_ss_info_1775_10d0 pci_ss_info_8086_1079_1775_10d0
+static const pciSubsystemInfo pci_ss_info_8086_1079_1775_ce90 =
+	{0x1775, 0xce90, pci_subsys_8086_1079_1775_ce90, 0};
+#undef pci_ss_info_1775_ce90
+#define pci_ss_info_1775_ce90 pci_ss_info_8086_1079_1775_ce90
 static const pciSubsystemInfo pci_ss_info_8086_1079_1fc1_0027 =
 	{0x1fc1, 0x0027, pci_subsys_8086_1079_1fc1_0027, 0};
 #undef pci_ss_info_1fc1_0027
@@ -39157,14 +41061,74 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x107b, pci_subsys_8086_107b_8086_107b, 0};
 #undef pci_ss_info_8086_107b
 #define pci_ss_info_8086_107b pci_ss_info_8086_107b_8086_107b
+static const pciSubsystemInfo pci_ss_info_8086_107c_8086_1376 =
+	{0x8086, 0x1376, pci_subsys_8086_107c_8086_1376, 0};
+#undef pci_ss_info_8086_1376
+#define pci_ss_info_8086_1376 pci_ss_info_8086_107c_8086_1376
+static const pciSubsystemInfo pci_ss_info_8086_107c_8086_1476 =
+	{0x8086, 0x1476, pci_subsys_8086_107c_8086_1476, 0};
+#undef pci_ss_info_8086_1476
+#define pci_ss_info_8086_1476 pci_ss_info_8086_107c_8086_1476
+static const pciSubsystemInfo pci_ss_info_8086_107d_8086_1082 =
+	{0x8086, 0x1082, pci_subsys_8086_107d_8086_1082, 0};
+#undef pci_ss_info_8086_1082
+#define pci_ss_info_8086_1082 pci_ss_info_8086_107d_8086_1082
+static const pciSubsystemInfo pci_ss_info_8086_107d_8086_1092 =
+	{0x8086, 0x1092, pci_subsys_8086_107d_8086_1092, 0};
+#undef pci_ss_info_8086_1092
+#define pci_ss_info_8086_1092 pci_ss_info_8086_107d_8086_1092
+static const pciSubsystemInfo pci_ss_info_8086_107e_8086_1084 =
+	{0x8086, 0x1084, pci_subsys_8086_107e_8086_1084, 0};
+#undef pci_ss_info_8086_1084
+#define pci_ss_info_8086_1084 pci_ss_info_8086_107e_8086_1084
+static const pciSubsystemInfo pci_ss_info_8086_107e_8086_1094 =
+	{0x8086, 0x1094, pci_subsys_8086_107e_8086_1094, 0};
+#undef pci_ss_info_8086_1094
+#define pci_ss_info_8086_1094 pci_ss_info_8086_107e_8086_1094
+static const pciSubsystemInfo pci_ss_info_8086_108a_8086_108a =
+	{0x8086, 0x108a, pci_subsys_8086_108a_8086_108a, 0};
+#undef pci_ss_info_8086_108a
+#define pci_ss_info_8086_108a pci_ss_info_8086_108a_8086_108a
+static const pciSubsystemInfo pci_ss_info_8086_108a_8086_118a =
+	{0x8086, 0x118a, pci_subsys_8086_108a_8086_118a, 0};
+#undef pci_ss_info_8086_118a
+#define pci_ss_info_8086_118a pci_ss_info_8086_108a_8086_118a
+static const pciSubsystemInfo pci_ss_info_8086_1099_8086_1099 =
+	{0x8086, 0x1099, pci_subsys_8086_1099_8086_1099, 0};
+#undef pci_ss_info_8086_1099
+#define pci_ss_info_8086_1099 pci_ss_info_8086_1099_8086_1099
+static const pciSubsystemInfo pci_ss_info_8086_109a_17aa_2001 =
+	{0x17aa, 0x2001, pci_subsys_8086_109a_17aa_2001, 0};
+#undef pci_ss_info_17aa_2001
+#define pci_ss_info_17aa_2001 pci_ss_info_8086_109a_17aa_2001
 static const pciSubsystemInfo pci_ss_info_8086_109a_17aa_207e =
 	{0x17aa, 0x207e, pci_subsys_8086_109a_17aa_207e, 0};
 #undef pci_ss_info_17aa_207e
 #define pci_ss_info_17aa_207e pci_ss_info_8086_109a_17aa_207e
+static const pciSubsystemInfo pci_ss_info_8086_109a_8086_109a =
+	{0x8086, 0x109a, pci_subsys_8086_109a_8086_109a, 0};
+#undef pci_ss_info_8086_109a
+#define pci_ss_info_8086_109a pci_ss_info_8086_109a_8086_109a
 static const pciSubsystemInfo pci_ss_info_8086_10b5_103c_3109 =
 	{0x103c, 0x3109, pci_subsys_8086_10b5_103c_3109, 0};
 #undef pci_ss_info_103c_3109
 #define pci_ss_info_103c_3109 pci_ss_info_8086_10b5_103c_3109
+static const pciSubsystemInfo pci_ss_info_8086_10b5_8086_1099 =
+	{0x8086, 0x1099, pci_subsys_8086_10b5_8086_1099, 0};
+#undef pci_ss_info_8086_1099
+#define pci_ss_info_8086_1099 pci_ss_info_8086_10b5_8086_1099
+static const pciSubsystemInfo pci_ss_info_8086_10b5_8086_1199 =
+	{0x8086, 0x1199, pci_subsys_8086_10b5_8086_1199, 0};
+#undef pci_ss_info_8086_1199
+#define pci_ss_info_8086_1199 pci_ss_info_8086_10b5_8086_1199
+static const pciSubsystemInfo pci_ss_info_8086_10b9_8086_1083 =
+	{0x8086, 0x1083, pci_subsys_8086_10b9_8086_1083, 0};
+#undef pci_ss_info_8086_1083
+#define pci_ss_info_8086_1083 pci_ss_info_8086_10b9_8086_1083
+static const pciSubsystemInfo pci_ss_info_8086_10b9_8086_1093 =
+	{0x8086, 0x1093, pci_subsys_8086_10b9_8086_1093, 0};
+#undef pci_ss_info_8086_1093
+#define pci_ss_info_8086_1093 pci_ss_info_8086_10b9_8086_1093
 static const pciSubsystemInfo pci_ss_info_8086_1130_1025_1016 =
 	{0x1025, 0x1016, pci_subsys_8086_1130_1025_1016, 0};
 #undef pci_ss_info_1025_1016
@@ -39497,6 +41461,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1668, 0x1100, pci_subsys_8086_1229_1668_1100, 0};
 #undef pci_ss_info_1668_1100
 #define pci_ss_info_1668_1100 pci_ss_info_8086_1229_1668_1100
+static const pciSubsystemInfo pci_ss_info_8086_1229_1775_ce90 =
+	{0x1775, 0xce90, pci_subsys_8086_1229_1775_ce90, 0};
+#undef pci_ss_info_1775_ce90
+#define pci_ss_info_1775_ce90 pci_ss_info_8086_1229_1775_ce90
 static const pciSubsystemInfo pci_ss_info_8086_1229_4c53_1080 =
 	{0x4c53, 0x1080, pci_subsys_8086_1229_4c53_1080, 0};
 #undef pci_ss_info_4c53_1080
@@ -40001,6 +41969,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1025, 0x1016, pci_subsys_8086_2442_1025_1016, 0};
 #undef pci_ss_info_1025_1016
 #define pci_ss_info_1025_1016 pci_ss_info_8086_2442_1025_1016
+static const pciSubsystemInfo pci_ss_info_8086_2442_1028_00c7 =
+	{0x1028, 0x00c7, pci_subsys_8086_2442_1028_00c7, 0};
+#undef pci_ss_info_1028_00c7
+#define pci_ss_info_1028_00c7 pci_ss_info_8086_2442_1028_00c7
 static const pciSubsystemInfo pci_ss_info_8086_2442_1028_010e =
 	{0x1028, 0x010e, pci_subsys_8086_2442_1028_010e, 0};
 #undef pci_ss_info_1028_010e
@@ -40033,6 +42005,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1025, 0x1016, pci_subsys_8086_2443_1025_1016, 0};
 #undef pci_ss_info_1025_1016
 #define pci_ss_info_1025_1016 pci_ss_info_8086_2443_1025_1016
+static const pciSubsystemInfo pci_ss_info_8086_2443_1028_00c7 =
+	{0x1028, 0x00c7, pci_subsys_8086_2443_1028_00c7, 0};
+#undef pci_ss_info_1028_00c7
+#define pci_ss_info_1028_00c7 pci_ss_info_8086_2443_1028_00c7
 static const pciSubsystemInfo pci_ss_info_8086_2443_1028_010e =
 	{0x1028, 0x010e, pci_subsys_8086_2443_1028_010e, 0};
 #undef pci_ss_info_1028_010e
@@ -40061,6 +42037,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1025, 0x1016, pci_subsys_8086_2444_1025_1016, 0};
 #undef pci_ss_info_1025_1016
 #define pci_ss_info_1025_1016 pci_ss_info_8086_2444_1025_1016
+static const pciSubsystemInfo pci_ss_info_8086_2444_1028_00c7 =
+	{0x1028, 0x00c7, pci_subsys_8086_2444_1028_00c7, 0};
+#undef pci_ss_info_1028_00c7
+#define pci_ss_info_1028_00c7 pci_ss_info_8086_2444_1028_00c7
 static const pciSubsystemInfo pci_ss_info_8086_2444_1028_010e =
 	{0x1028, 0x010e, pci_subsys_8086_2444_1028_010e, 0};
 #undef pci_ss_info_1028_010e
@@ -40257,6 +42237,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1014, 0x01c6, pci_subsys_8086_244b_1014_01c6, 0};
 #undef pci_ss_info_1014_01c6
 #define pci_ss_info_1014_01c6 pci_ss_info_8086_244b_1014_01c6
+static const pciSubsystemInfo pci_ss_info_8086_244b_1028_00c7 =
+	{0x1028, 0x00c7, pci_subsys_8086_244b_1028_00c7, 0};
+#undef pci_ss_info_1028_00c7
+#define pci_ss_info_1028_00c7 pci_ss_info_8086_244b_1028_00c7
 static const pciSubsystemInfo pci_ss_info_8086_244b_1028_010e =
 	{0x1028, 0x010e, pci_subsys_8086_244b_1028_010e, 0};
 #undef pci_ss_info_1028_010e
@@ -40457,6 +42441,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1014, 0x0267, pci_subsys_8086_24c2_1014_0267, 0};
 #undef pci_ss_info_1014_0267
 #define pci_ss_info_1014_0267 pci_ss_info_8086_24c2_1014_0267
+static const pciSubsystemInfo pci_ss_info_8086_24c2_1014_052d =
+	{0x1014, 0x052d, pci_subsys_8086_24c2_1014_052d, 0};
+#undef pci_ss_info_1014_052d
+#define pci_ss_info_1014_052d pci_ss_info_8086_24c2_1014_052d
 static const pciSubsystemInfo pci_ss_info_8086_24c2_1025_005a =
 	{0x1025, 0x005a, pci_subsys_8086_24c2_1025_005a, 0};
 #undef pci_ss_info_1025_005a
@@ -40481,6 +42469,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x103c, 0x0890, pci_subsys_8086_24c2_103c_0890, 0};
 #undef pci_ss_info_103c_0890
 #define pci_ss_info_103c_0890 pci_ss_info_8086_24c2_103c_0890
+static const pciSubsystemInfo pci_ss_info_8086_24c2_103c_08b0 =
+	{0x103c, 0x08b0, pci_subsys_8086_24c2_103c_08b0, 0};
+#undef pci_ss_info_103c_08b0
+#define pci_ss_info_103c_08b0 pci_ss_info_8086_24c2_103c_08b0
 static const pciSubsystemInfo pci_ss_info_8086_24c2_1071_8160 =
 	{0x1071, 0x8160, pci_subsys_8086_24c2_1071_8160, 0};
 #undef pci_ss_info_1071_8160
@@ -40513,6 +42505,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1014, 0x0267, pci_subsys_8086_24c3_1014_0267, 0};
 #undef pci_ss_info_1014_0267
 #define pci_ss_info_1014_0267 pci_ss_info_8086_24c3_1014_0267
+static const pciSubsystemInfo pci_ss_info_8086_24c3_1014_052d =
+	{0x1014, 0x052d, pci_subsys_8086_24c3_1014_052d, 0};
+#undef pci_ss_info_1014_052d
+#define pci_ss_info_1014_052d pci_ss_info_8086_24c3_1014_052d
 static const pciSubsystemInfo pci_ss_info_8086_24c3_1025_005a =
 	{0x1025, 0x005a, pci_subsys_8086_24c3_1025_005a, 0};
 #undef pci_ss_info_1025_005a
@@ -40529,6 +42525,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x103c, 0x0890, pci_subsys_8086_24c3_103c_0890, 0};
 #undef pci_ss_info_103c_0890
 #define pci_ss_info_103c_0890 pci_ss_info_8086_24c3_103c_0890
+static const pciSubsystemInfo pci_ss_info_8086_24c3_103c_08b0 =
+	{0x103c, 0x08b0, pci_subsys_8086_24c3_103c_08b0, 0};
+#undef pci_ss_info_103c_08b0
+#define pci_ss_info_103c_08b0 pci_ss_info_8086_24c3_103c_08b0
 static const pciSubsystemInfo pci_ss_info_8086_24c3_1071_8160 =
 	{0x1071, 0x8160, pci_subsys_8086_24c3_1071_8160, 0};
 #undef pci_ss_info_1071_8160
@@ -40557,6 +42557,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1014, 0x0267, pci_subsys_8086_24c4_1014_0267, 0};
 #undef pci_ss_info_1014_0267
 #define pci_ss_info_1014_0267 pci_ss_info_8086_24c4_1014_0267
+static const pciSubsystemInfo pci_ss_info_8086_24c4_1014_052d =
+	{0x1014, 0x052d, pci_subsys_8086_24c4_1014_052d, 0};
+#undef pci_ss_info_1014_052d
+#define pci_ss_info_1014_052d pci_ss_info_8086_24c4_1014_052d
 static const pciSubsystemInfo pci_ss_info_8086_24c4_1025_005a =
 	{0x1025, 0x005a, pci_subsys_8086_24c4_1025_005a, 0};
 #undef pci_ss_info_1025_005a
@@ -40581,6 +42585,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x103c, 0x0890, pci_subsys_8086_24c4_103c_0890, 0};
 #undef pci_ss_info_103c_0890
 #define pci_ss_info_103c_0890 pci_ss_info_8086_24c4_103c_0890
+static const pciSubsystemInfo pci_ss_info_8086_24c4_103c_08b0 =
+	{0x103c, 0x08b0, pci_subsys_8086_24c4_103c_08b0, 0};
+#undef pci_ss_info_103c_08b0
+#define pci_ss_info_103c_08b0 pci_ss_info_8086_24c4_103c_08b0
 static const pciSubsystemInfo pci_ss_info_8086_24c4_1071_8160 =
 	{0x1071, 0x8160, pci_subsys_8086_24c4_1071_8160, 0};
 #undef pci_ss_info_1071_8160
@@ -40613,6 +42621,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1014, 0x0267, pci_subsys_8086_24c5_1014_0267, 0};
 #undef pci_ss_info_1014_0267
 #define pci_ss_info_1014_0267 pci_ss_info_8086_24c5_1014_0267
+static const pciSubsystemInfo pci_ss_info_8086_24c5_1014_055f =
+	{0x1014, 0x055f, pci_subsys_8086_24c5_1014_055f, 0};
+#undef pci_ss_info_1014_055f
+#define pci_ss_info_1014_055f pci_ss_info_8086_24c5_1014_055f
 static const pciSubsystemInfo pci_ss_info_8086_24c5_1025_005a =
 	{0x1025, 0x005a, pci_subsys_8086_24c5_1025_005a, 0};
 #undef pci_ss_info_1025_005a
@@ -40637,6 +42649,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x103c, 0x0890, pci_subsys_8086_24c5_103c_0890, 0};
 #undef pci_ss_info_103c_0890
 #define pci_ss_info_103c_0890 pci_ss_info_8086_24c5_103c_0890
+static const pciSubsystemInfo pci_ss_info_8086_24c5_103c_08b0 =
+	{0x103c, 0x08b0, pci_subsys_8086_24c5_103c_08b0, 0};
+#undef pci_ss_info_103c_08b0
+#define pci_ss_info_103c_08b0 pci_ss_info_8086_24c5_103c_08b0
 static const pciSubsystemInfo pci_ss_info_8086_24c5_1071_8160 =
 	{0x1071, 0x8160, pci_subsys_8086_24c5_1071_8160, 0};
 #undef pci_ss_info_1071_8160
@@ -40657,6 +42673,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1734, 0x1055, pci_subsys_8086_24c5_1734_1055, 0};
 #undef pci_ss_info_1734_1055
 #define pci_ss_info_1734_1055 pci_ss_info_8086_24c5_1734_1055
+static const pciSubsystemInfo pci_ss_info_8086_24c6_1014_0559 =
+	{0x1014, 0x0559, pci_subsys_8086_24c6_1014_0559, 0};
+#undef pci_ss_info_1014_0559
+#define pci_ss_info_1014_0559 pci_ss_info_8086_24c6_1014_0559
 static const pciSubsystemInfo pci_ss_info_8086_24c6_1025_003c =
 	{0x1025, 0x003c, pci_subsys_8086_24c6_1025_003c, 0};
 #undef pci_ss_info_1025_003c
@@ -40677,6 +42697,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x103c, 0x0890, pci_subsys_8086_24c6_103c_0890, 0};
 #undef pci_ss_info_103c_0890
 #define pci_ss_info_103c_0890 pci_ss_info_8086_24c6_103c_0890
+static const pciSubsystemInfo pci_ss_info_8086_24c6_103c_08b0 =
+	{0x103c, 0x08b0, pci_subsys_8086_24c6_103c_08b0, 0};
+#undef pci_ss_info_103c_08b0
+#define pci_ss_info_103c_08b0 pci_ss_info_8086_24c6_103c_08b0
 static const pciSubsystemInfo pci_ss_info_8086_24c6_1071_8160 =
 	{0x1071, 0x8160, pci_subsys_8086_24c6_1071_8160, 0};
 #undef pci_ss_info_1071_8160
@@ -40685,6 +42709,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1014, 0x0267, pci_subsys_8086_24c7_1014_0267, 0};
 #undef pci_ss_info_1014_0267
 #define pci_ss_info_1014_0267 pci_ss_info_8086_24c7_1014_0267
+static const pciSubsystemInfo pci_ss_info_8086_24c7_1014_052d =
+	{0x1014, 0x052d, pci_subsys_8086_24c7_1014_052d, 0};
+#undef pci_ss_info_1014_052d
+#define pci_ss_info_1014_052d pci_ss_info_8086_24c7_1014_052d
 static const pciSubsystemInfo pci_ss_info_8086_24c7_1025_005a =
 	{0x1025, 0x005a, pci_subsys_8086_24c7_1025_005a, 0};
 #undef pci_ss_info_1025_005a
@@ -40709,6 +42737,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x103c, 0x0890, pci_subsys_8086_24c7_103c_0890, 0};
 #undef pci_ss_info_103c_0890
 #define pci_ss_info_103c_0890 pci_ss_info_8086_24c7_103c_0890
+static const pciSubsystemInfo pci_ss_info_8086_24c7_103c_08b0 =
+	{0x103c, 0x08b0, pci_subsys_8086_24c7_103c_08b0, 0};
+#undef pci_ss_info_103c_08b0
+#define pci_ss_info_103c_08b0 pci_ss_info_8086_24c7_103c_08b0
 static const pciSubsystemInfo pci_ss_info_8086_24c7_1071_8160 =
 	{0x1071, 0x8160, pci_subsys_8086_24c7_1071_8160, 0};
 #undef pci_ss_info_1071_8160
@@ -40733,6 +42765,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x4541, pci_subsys_8086_24c7_8086_4541, 0};
 #undef pci_ss_info_8086_4541
 #define pci_ss_info_8086_4541 pci_ss_info_8086_24c7_8086_4541
+static const pciSubsystemInfo pci_ss_info_8086_24ca_1014_052d =
+	{0x1014, 0x052d, pci_subsys_8086_24ca_1014_052d, 0};
+#undef pci_ss_info_1014_052d
+#define pci_ss_info_1014_052d pci_ss_info_8086_24ca_1014_052d
 static const pciSubsystemInfo pci_ss_info_8086_24ca_1025_005a =
 	{0x1025, 0x005a, pci_subsys_8086_24ca_1025_005a, 0};
 #undef pci_ss_info_1025_005a
@@ -40753,6 +42789,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x103c, 0x0890, pci_subsys_8086_24ca_103c_0890, 0};
 #undef pci_ss_info_103c_0890
 #define pci_ss_info_103c_0890 pci_ss_info_8086_24ca_103c_0890
+static const pciSubsystemInfo pci_ss_info_8086_24ca_103c_08b0 =
+	{0x103c, 0x08b0, pci_subsys_8086_24ca_103c_08b0, 0};
+#undef pci_ss_info_103c_08b0
+#define pci_ss_info_103c_08b0 pci_ss_info_8086_24ca_103c_08b0
 static const pciSubsystemInfo pci_ss_info_8086_24ca_1071_8160 =
 	{0x1071, 0x8160, pci_subsys_8086_24ca_1071_8160, 0};
 #undef pci_ss_info_1071_8160
@@ -40797,6 +42837,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1014, 0x0267, pci_subsys_8086_24cd_1014_0267, 0};
 #undef pci_ss_info_1014_0267
 #define pci_ss_info_1014_0267 pci_ss_info_8086_24cd_1014_0267
+static const pciSubsystemInfo pci_ss_info_8086_24cd_1014_052e =
+	{0x1014, 0x052e, pci_subsys_8086_24cd_1014_052e, 0};
+#undef pci_ss_info_1014_052e
+#define pci_ss_info_1014_052e pci_ss_info_8086_24cd_1014_052e
 static const pciSubsystemInfo pci_ss_info_8086_24cd_1025_005a =
 	{0x1025, 0x005a, pci_subsys_8086_24cd_1025_005a, 0};
 #undef pci_ss_info_1025_005a
@@ -40829,10 +42873,18 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x103c, 0x0890, pci_subsys_8086_24cd_103c_0890, 0};
 #undef pci_ss_info_103c_0890
 #define pci_ss_info_103c_0890 pci_ss_info_8086_24cd_103c_0890
+static const pciSubsystemInfo pci_ss_info_8086_24cd_103c_08b0 =
+	{0x103c, 0x08b0, pci_subsys_8086_24cd_103c_08b0, 0};
+#undef pci_ss_info_103c_08b0
+#define pci_ss_info_103c_08b0 pci_ss_info_8086_24cd_103c_08b0
 static const pciSubsystemInfo pci_ss_info_8086_24cd_1071_8160 =
 	{0x1071, 0x8160, pci_subsys_8086_24cd_1071_8160, 0};
 #undef pci_ss_info_1071_8160
 #define pci_ss_info_1071_8160 pci_ss_info_8086_24cd_1071_8160
+static const pciSubsystemInfo pci_ss_info_8086_24cd_1179_ff00 =
+	{0x1179, 0xff00, pci_subsys_8086_24cd_1179_ff00, 0};
+#undef pci_ss_info_1179_ff00
+#define pci_ss_info_1179_ff00 pci_ss_info_8086_24cd_1179_ff00
 static const pciSubsystemInfo pci_ss_info_8086_24cd_1462_3981 =
 	{0x1462, 0x3981, pci_subsys_8086_24cd_1462_3981, 0};
 #undef pci_ss_info_1462_3981
@@ -40889,6 +42941,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x4246, pci_subsys_8086_24d1_8086_4246, 0};
 #undef pci_ss_info_8086_4246
 #define pci_ss_info_8086_4246 pci_ss_info_8086_24d1_8086_4246
+static const pciSubsystemInfo pci_ss_info_8086_24d1_8086_4c43 =
+	{0x8086, 0x4c43, pci_subsys_8086_24d1_8086_4c43, 0};
+#undef pci_ss_info_8086_4c43
+#define pci_ss_info_8086_4c43 pci_ss_info_8086_24d1_8086_4c43
 static const pciSubsystemInfo pci_ss_info_8086_24d1_8086_524c =
 	{0x8086, 0x524c, pci_subsys_8086_24d1_8086_524c, 0};
 #undef pci_ss_info_8086_524c
@@ -40945,6 +43001,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x4246, pci_subsys_8086_24d2_8086_4246, 0};
 #undef pci_ss_info_8086_4246
 #define pci_ss_info_8086_4246 pci_ss_info_8086_24d2_8086_4246
+static const pciSubsystemInfo pci_ss_info_8086_24d2_8086_4c43 =
+	{0x8086, 0x4c43, pci_subsys_8086_24d2_8086_4c43, 0};
+#undef pci_ss_info_8086_4c43
+#define pci_ss_info_8086_4c43 pci_ss_info_8086_24d2_8086_4c43
 static const pciSubsystemInfo pci_ss_info_8086_24d2_8086_524c =
 	{0x8086, 0x524c, pci_subsys_8086_24d2_8086_524c, 0};
 #undef pci_ss_info_8086_524c
@@ -40989,6 +43049,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x4246, pci_subsys_8086_24d3_8086_4246, 0};
 #undef pci_ss_info_8086_4246
 #define pci_ss_info_8086_4246 pci_ss_info_8086_24d3_8086_4246
+static const pciSubsystemInfo pci_ss_info_8086_24d3_8086_4c43 =
+	{0x8086, 0x4c43, pci_subsys_8086_24d3_8086_4c43, 0};
+#undef pci_ss_info_8086_4c43
+#define pci_ss_info_8086_4c43 pci_ss_info_8086_24d3_8086_4c43
 static const pciSubsystemInfo pci_ss_info_8086_24d3_8086_524c =
 	{0x8086, 0x524c, pci_subsys_8086_24d3_8086_524c, 0};
 #undef pci_ss_info_8086_524c
@@ -41045,6 +43109,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x4246, pci_subsys_8086_24d4_8086_4246, 0};
 #undef pci_ss_info_8086_4246
 #define pci_ss_info_8086_4246 pci_ss_info_8086_24d4_8086_4246
+static const pciSubsystemInfo pci_ss_info_8086_24d4_8086_4c43 =
+	{0x8086, 0x4c43, pci_subsys_8086_24d4_8086_4c43, 0};
+#undef pci_ss_info_8086_4c43
+#define pci_ss_info_8086_4c43 pci_ss_info_8086_24d4_8086_4c43
 static const pciSubsystemInfo pci_ss_info_8086_24d4_8086_524c =
 	{0x8086, 0x524c, pci_subsys_8086_24d4_8086_524c, 0};
 #undef pci_ss_info_8086_524c
@@ -41093,6 +43161,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0xe001, pci_subsys_8086_24d5_8086_e001, 0};
 #undef pci_ss_info_8086_e001
 #define pci_ss_info_8086_e001 pci_ss_info_8086_24d5_8086_e001
+static const pciSubsystemInfo pci_ss_info_8086_24d5_8086_e002 =
+	{0x8086, 0xe002, pci_subsys_8086_24d5_8086_e002, 0};
+#undef pci_ss_info_8086_e002
+#define pci_ss_info_8086_e002 pci_ss_info_8086_24d5_8086_e002
 static const pciSubsystemInfo pci_ss_info_8086_24d6_103c_006a =
 	{0x103c, 0x006a, pci_subsys_8086_24d6_103c_006a, 0};
 #undef pci_ss_info_103c_006a
@@ -41145,6 +43217,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x4246, pci_subsys_8086_24d7_8086_4246, 0};
 #undef pci_ss_info_8086_4246
 #define pci_ss_info_8086_4246 pci_ss_info_8086_24d7_8086_4246
+static const pciSubsystemInfo pci_ss_info_8086_24d7_8086_4c43 =
+	{0x8086, 0x4c43, pci_subsys_8086_24d7_8086_4c43, 0};
+#undef pci_ss_info_8086_4c43
+#define pci_ss_info_8086_4c43 pci_ss_info_8086_24d7_8086_4c43
 static const pciSubsystemInfo pci_ss_info_8086_24d7_8086_524c =
 	{0x8086, 0x524c, pci_subsys_8086_24d7_8086_524c, 0};
 #undef pci_ss_info_8086_524c
@@ -41205,6 +43281,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x4246, pci_subsys_8086_24db_8086_4246, 0};
 #undef pci_ss_info_8086_4246
 #define pci_ss_info_8086_4246 pci_ss_info_8086_24db_8086_4246
+static const pciSubsystemInfo pci_ss_info_8086_24db_8086_4c43 =
+	{0x8086, 0x4c43, pci_subsys_8086_24db_8086_4c43, 0};
+#undef pci_ss_info_8086_4c43
+#define pci_ss_info_8086_4c43 pci_ss_info_8086_24db_8086_4c43
 static const pciSubsystemInfo pci_ss_info_8086_24db_8086_524c =
 	{0x8086, 0x524c, pci_subsys_8086_24db_8086_524c, 0};
 #undef pci_ss_info_8086_524c
@@ -41253,6 +43333,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x4246, pci_subsys_8086_24dd_8086_4246, 0};
 #undef pci_ss_info_8086_4246
 #define pci_ss_info_8086_4246 pci_ss_info_8086_24dd_8086_4246
+static const pciSubsystemInfo pci_ss_info_8086_24dd_8086_4c43 =
+	{0x8086, 0x4c43, pci_subsys_8086_24dd_8086_4c43, 0};
+#undef pci_ss_info_8086_4c43
+#define pci_ss_info_8086_4c43 pci_ss_info_8086_24dd_8086_4c43
 static const pciSubsystemInfo pci_ss_info_8086_24dd_8086_524c =
 	{0x8086, 0x524c, pci_subsys_8086_24dd_8086_524c, 0};
 #undef pci_ss_info_8086_524c
@@ -41293,6 +43377,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x4246, pci_subsys_8086_24de_8086_4246, 0};
 #undef pci_ss_info_8086_4246
 #define pci_ss_info_8086_4246 pci_ss_info_8086_24de_8086_4246
+static const pciSubsystemInfo pci_ss_info_8086_24de_8086_4c43 =
+	{0x8086, 0x4c43, pci_subsys_8086_24de_8086_4c43, 0};
+#undef pci_ss_info_8086_4c43
+#define pci_ss_info_8086_4c43 pci_ss_info_8086_24de_8086_4c43
 static const pciSubsystemInfo pci_ss_info_8086_24de_8086_524c =
 	{0x8086, 0x524c, pci_subsys_8086_24de_8086_524c, 0};
 #undef pci_ss_info_8086_524c
@@ -41309,6 +43397,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1043, 0x801c, pci_subsys_8086_2501_1043_801c, 0};
 #undef pci_ss_info_1043_801c
 #define pci_ss_info_1043_801c pci_ss_info_8086_2501_1043_801c
+static const pciSubsystemInfo pci_ss_info_8086_2530_1028_00c7 =
+	{0x1028, 0x00c7, pci_subsys_8086_2530_1028_00c7, 0};
+#undef pci_ss_info_1028_00c7
+#define pci_ss_info_1028_00c7 pci_ss_info_8086_2530_1028_00c7
 static const pciSubsystemInfo pci_ss_info_8086_2530_147b_0507 =
 	{0x147b, 0x0507, pci_subsys_8086_2530_147b_0507, 0};
 #undef pci_ss_info_147b_0507
@@ -41393,6 +43485,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x4246, pci_subsys_8086_2572_8086_4246, 0};
 #undef pci_ss_info_8086_4246
 #define pci_ss_info_8086_4246 pci_ss_info_8086_2572_8086_4246
+static const pciSubsystemInfo pci_ss_info_8086_2572_8086_4c43 =
+	{0x8086, 0x4c43, pci_subsys_8086_2572_8086_4c43, 0};
+#undef pci_ss_info_8086_4c43
+#define pci_ss_info_8086_4c43 pci_ss_info_8086_2572_8086_4c43
 static const pciSubsystemInfo pci_ss_info_8086_2578_1458_2578 =
 	{0x1458, 0x2578, pci_subsys_8086_2578_1458_2578, 0};
 #undef pci_ss_info_1458_2578
@@ -41461,6 +43557,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1043, 0x1881, pci_subsys_8086_2592_1043_1881, 0};
 #undef pci_ss_info_1043_1881
 #define pci_ss_info_1043_1881 pci_ss_info_8086_2592_1043_1881
+static const pciSubsystemInfo pci_ss_info_8086_25a2_1775_10d0 =
+	{0x1775, 0x10d0, pci_subsys_8086_25a2_1775_10d0, 0};
+#undef pci_ss_info_1775_10d0
+#define pci_ss_info_1775_10d0 pci_ss_info_8086_25a2_1775_10d0
+static const pciSubsystemInfo pci_ss_info_8086_25a2_1775_ce90 =
+	{0x1775, 0xce90, pci_subsys_8086_25a2_1775_ce90, 0};
+#undef pci_ss_info_1775_ce90
+#define pci_ss_info_1775_ce90 pci_ss_info_8086_25a2_1775_ce90
 static const pciSubsystemInfo pci_ss_info_8086_25a2_4c53_10b0 =
 	{0x4c53, 0x10b0, pci_subsys_8086_25a2_4c53_10b0, 0};
 #undef pci_ss_info_4c53_10b0
@@ -41469,6 +43573,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x4c53, 0x10e0, pci_subsys_8086_25a2_4c53_10e0, 0};
 #undef pci_ss_info_4c53_10e0
 #define pci_ss_info_4c53_10e0 pci_ss_info_8086_25a2_4c53_10e0
+static const pciSubsystemInfo pci_ss_info_8086_25a3_1775_ce90 =
+	{0x1775, 0xce90, pci_subsys_8086_25a3_1775_ce90, 0};
+#undef pci_ss_info_1775_ce90
+#define pci_ss_info_1775_ce90 pci_ss_info_8086_25a3_1775_ce90
 static const pciSubsystemInfo pci_ss_info_8086_25a3_4c53_10b0 =
 	{0x4c53, 0x10b0, pci_subsys_8086_25a3_4c53_10b0, 0};
 #undef pci_ss_info_4c53_10b0
@@ -41481,6 +43589,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x4c53, 0x10e0, pci_subsys_8086_25a3_4c53_10e0, 0};
 #undef pci_ss_info_4c53_10e0
 #define pci_ss_info_4c53_10e0 pci_ss_info_8086_25a3_4c53_10e0
+static const pciSubsystemInfo pci_ss_info_8086_25a4_1775_10d0 =
+	{0x1775, 0x10d0, pci_subsys_8086_25a4_1775_10d0, 0};
+#undef pci_ss_info_1775_10d0
+#define pci_ss_info_1775_10d0 pci_ss_info_8086_25a4_1775_10d0
+static const pciSubsystemInfo pci_ss_info_8086_25a4_1775_ce90 =
+	{0x1775, 0xce90, pci_subsys_8086_25a4_1775_ce90, 0};
+#undef pci_ss_info_1775_ce90
+#define pci_ss_info_1775_ce90 pci_ss_info_8086_25a4_1775_ce90
 static const pciSubsystemInfo pci_ss_info_8086_25a4_4c53_10b0 =
 	{0x4c53, 0x10b0, pci_subsys_8086_25a4_4c53_10b0, 0};
 #undef pci_ss_info_4c53_10b0
@@ -41493,10 +43609,22 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x4c53, 0x10e0, pci_subsys_8086_25a4_4c53_10e0, 0};
 #undef pci_ss_info_4c53_10e0
 #define pci_ss_info_4c53_10e0 pci_ss_info_8086_25a4_4c53_10e0
+static const pciSubsystemInfo pci_ss_info_8086_25a6_1775_ce90 =
+	{0x1775, 0xce90, pci_subsys_8086_25a6_1775_ce90, 0};
+#undef pci_ss_info_1775_ce90
+#define pci_ss_info_1775_ce90 pci_ss_info_8086_25a6_1775_ce90
 static const pciSubsystemInfo pci_ss_info_8086_25a6_4c53_10b0 =
 	{0x4c53, 0x10b0, pci_subsys_8086_25a6_4c53_10b0, 0};
 #undef pci_ss_info_4c53_10b0
 #define pci_ss_info_4c53_10b0 pci_ss_info_8086_25a6_4c53_10b0
+static const pciSubsystemInfo pci_ss_info_8086_25a9_1775_10d0 =
+	{0x1775, 0x10d0, pci_subsys_8086_25a9_1775_10d0, 0};
+#undef pci_ss_info_1775_10d0
+#define pci_ss_info_1775_10d0 pci_ss_info_8086_25a9_1775_10d0
+static const pciSubsystemInfo pci_ss_info_8086_25a9_1775_ce90 =
+	{0x1775, 0xce90, pci_subsys_8086_25a9_1775_ce90, 0};
+#undef pci_ss_info_1775_ce90
+#define pci_ss_info_1775_ce90 pci_ss_info_8086_25a9_1775_ce90
 static const pciSubsystemInfo pci_ss_info_8086_25a9_4c53_10b0 =
 	{0x4c53, 0x10b0, pci_subsys_8086_25a9_4c53_10b0, 0};
 #undef pci_ss_info_4c53_10b0
@@ -41509,6 +43637,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x4c53, 0x10e0, pci_subsys_8086_25a9_4c53_10e0, 0};
 #undef pci_ss_info_4c53_10e0
 #define pci_ss_info_4c53_10e0 pci_ss_info_8086_25a9_4c53_10e0
+static const pciSubsystemInfo pci_ss_info_8086_25aa_1775_ce90 =
+	{0x1775, 0xce90, pci_subsys_8086_25aa_1775_ce90, 0};
+#undef pci_ss_info_1775_ce90
+#define pci_ss_info_1775_ce90 pci_ss_info_8086_25aa_1775_ce90
 static const pciSubsystemInfo pci_ss_info_8086_25aa_4c53_10b0 =
 	{0x4c53, 0x10b0, pci_subsys_8086_25aa_4c53_10b0, 0};
 #undef pci_ss_info_4c53_10b0
@@ -41517,6 +43649,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x4c53, 0x10e0, pci_subsys_8086_25aa_4c53_10e0, 0};
 #undef pci_ss_info_4c53_10e0
 #define pci_ss_info_4c53_10e0 pci_ss_info_8086_25aa_4c53_10e0
+static const pciSubsystemInfo pci_ss_info_8086_25ab_1775_10d0 =
+	{0x1775, 0x10d0, pci_subsys_8086_25ab_1775_10d0, 0};
+#undef pci_ss_info_1775_10d0
+#define pci_ss_info_1775_10d0 pci_ss_info_8086_25ab_1775_10d0
+static const pciSubsystemInfo pci_ss_info_8086_25ab_1775_ce90 =
+	{0x1775, 0xce90, pci_subsys_8086_25ab_1775_ce90, 0};
+#undef pci_ss_info_1775_ce90
+#define pci_ss_info_1775_ce90 pci_ss_info_8086_25ab_1775_ce90
 static const pciSubsystemInfo pci_ss_info_8086_25ab_4c53_10b0 =
 	{0x4c53, 0x10b0, pci_subsys_8086_25ab_4c53_10b0, 0};
 #undef pci_ss_info_4c53_10b0
@@ -41529,6 +43669,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x4c53, 0x10e0, pci_subsys_8086_25ab_4c53_10e0, 0};
 #undef pci_ss_info_4c53_10e0
 #define pci_ss_info_4c53_10e0 pci_ss_info_8086_25ab_4c53_10e0
+static const pciSubsystemInfo pci_ss_info_8086_25ac_1775_10d0 =
+	{0x1775, 0x10d0, pci_subsys_8086_25ac_1775_10d0, 0};
+#undef pci_ss_info_1775_10d0
+#define pci_ss_info_1775_10d0 pci_ss_info_8086_25ac_1775_10d0
+static const pciSubsystemInfo pci_ss_info_8086_25ac_1775_ce90 =
+	{0x1775, 0xce90, pci_subsys_8086_25ac_1775_ce90, 0};
+#undef pci_ss_info_1775_ce90
+#define pci_ss_info_1775_ce90 pci_ss_info_8086_25ac_1775_ce90
 static const pciSubsystemInfo pci_ss_info_8086_25ac_4c53_10b0 =
 	{0x4c53, 0x10b0, pci_subsys_8086_25ac_4c53_10b0, 0};
 #undef pci_ss_info_4c53_10b0
@@ -41541,6 +43689,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x4c53, 0x10e0, pci_subsys_8086_25ac_4c53_10e0, 0};
 #undef pci_ss_info_4c53_10e0
 #define pci_ss_info_4c53_10e0 pci_ss_info_8086_25ac_4c53_10e0
+static const pciSubsystemInfo pci_ss_info_8086_25ad_1775_10d0 =
+	{0x1775, 0x10d0, pci_subsys_8086_25ad_1775_10d0, 0};
+#undef pci_ss_info_1775_10d0
+#define pci_ss_info_1775_10d0 pci_ss_info_8086_25ad_1775_10d0
+static const pciSubsystemInfo pci_ss_info_8086_25ad_1775_ce90 =
+	{0x1775, 0xce90, pci_subsys_8086_25ad_1775_ce90, 0};
+#undef pci_ss_info_1775_ce90
+#define pci_ss_info_1775_ce90 pci_ss_info_8086_25ad_1775_ce90
 static const pciSubsystemInfo pci_ss_info_8086_25ad_4c53_10b0 =
 	{0x4c53, 0x10b0, pci_subsys_8086_25ad_4c53_10b0, 0};
 #undef pci_ss_info_4c53_10b0
@@ -41713,10 +43869,18 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1734, 0x105c, pci_subsys_8086_265c_1734_105c, 0};
 #undef pci_ss_info_1734_105c
 #define pci_ss_info_1734_105c pci_ss_info_8086_265c_1734_105c
+static const pciSubsystemInfo pci_ss_info_8086_265c_8086_265c =
+	{0x8086, 0x265c, pci_subsys_8086_265c_8086_265c, 0};
+#undef pci_ss_info_8086_265c
+#define pci_ss_info_8086_265c pci_ss_info_8086_265c_8086_265c
 static const pciSubsystemInfo pci_ss_info_8086_2660_103c_099c =
 	{0x103c, 0x099c, pci_subsys_8086_2660_103c_099c, 0};
 #undef pci_ss_info_103c_099c
 #define pci_ss_info_103c_099c pci_ss_info_8086_2660_103c_099c
+static const pciSubsystemInfo pci_ss_info_8086_2668_103c_2a09 =
+	{0x103c, 0x2a09, pci_subsys_8086_2668_103c_2a09, 0};
+#undef pci_ss_info_103c_2a09
+#define pci_ss_info_103c_2a09 pci_ss_info_8086_2668_103c_2a09
 static const pciSubsystemInfo pci_ss_info_8086_2668_1043_814e =
 	{0x1043, 0x814e, pci_subsys_8086_2668_1043_814e, 0};
 #undef pci_ss_info_1043_814e
@@ -41809,6 +43973,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1734, 0x105c, pci_subsys_8086_266f_1734_105c, 0};
 #undef pci_ss_info_1734_105c
 #define pci_ss_info_1734_105c pci_ss_info_8086_266f_1734_105c
+static const pciSubsystemInfo pci_ss_info_8086_2770_107b_5048 =
+	{0x107b, 0x5048, pci_subsys_8086_2770_107b_5048, 0};
+#undef pci_ss_info_107b_5048
+#define pci_ss_info_107b_5048 pci_ss_info_8086_2770_107b_5048
 static const pciSubsystemInfo pci_ss_info_8086_2770_8086_544e =
 	{0x8086, 0x544e, pci_subsys_8086_2770_8086_544e, 0};
 #undef pci_ss_info_8086_544e
@@ -41833,34 +44001,114 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1043, 0x1881, pci_subsys_8086_2792_1043_1881, 0};
 #undef pci_ss_info_1043_1881
 #define pci_ss_info_1043_1881 pci_ss_info_8086_2792_1043_1881
+static const pciSubsystemInfo pci_ss_info_8086_27a0_17aa_2017 =
+	{0x17aa, 0x2017, pci_subsys_8086_27a0_17aa_2017, 0};
+#undef pci_ss_info_17aa_2017
+#define pci_ss_info_17aa_2017 pci_ss_info_8086_27a0_17aa_2017
+static const pciSubsystemInfo pci_ss_info_8086_27a2_17aa_201a =
+	{0x17aa, 0x201a, pci_subsys_8086_27a2_17aa_201a, 0};
+#undef pci_ss_info_17aa_201a
+#define pci_ss_info_17aa_201a pci_ss_info_8086_27a2_17aa_201a
+static const pciSubsystemInfo pci_ss_info_8086_27a6_17aa_201a =
+	{0x17aa, 0x201a, pci_subsys_8086_27a6_17aa_201a, 0};
+#undef pci_ss_info_17aa_201a
+#define pci_ss_info_17aa_201a pci_ss_info_8086_27a6_17aa_201a
+static const pciSubsystemInfo pci_ss_info_8086_27b8_107b_5048 =
+	{0x107b, 0x5048, pci_subsys_8086_27b8_107b_5048, 0};
+#undef pci_ss_info_107b_5048
+#define pci_ss_info_107b_5048 pci_ss_info_8086_27b8_107b_5048
 static const pciSubsystemInfo pci_ss_info_8086_27b8_8086_544e =
 	{0x8086, 0x544e, pci_subsys_8086_27b8_8086_544e, 0};
 #undef pci_ss_info_8086_544e
 #define pci_ss_info_8086_544e pci_ss_info_8086_27b8_8086_544e
+static const pciSubsystemInfo pci_ss_info_8086_27b9_17aa_2009 =
+	{0x17aa, 0x2009, pci_subsys_8086_27b9_17aa_2009, 0};
+#undef pci_ss_info_17aa_2009
+#define pci_ss_info_17aa_2009 pci_ss_info_8086_27b9_17aa_2009
+static const pciSubsystemInfo pci_ss_info_8086_27c0_107b_5048 =
+	{0x107b, 0x5048, pci_subsys_8086_27c0_107b_5048, 0};
+#undef pci_ss_info_107b_5048
+#define pci_ss_info_107b_5048 pci_ss_info_8086_27c0_107b_5048
 static const pciSubsystemInfo pci_ss_info_8086_27c0_8086_544e =
 	{0x8086, 0x544e, pci_subsys_8086_27c0_8086_544e, 0};
 #undef pci_ss_info_8086_544e
 #define pci_ss_info_8086_544e pci_ss_info_8086_27c0_8086_544e
+static const pciSubsystemInfo pci_ss_info_8086_27c5_17aa_200d =
+	{0x17aa, 0x200d, pci_subsys_8086_27c5_17aa_200d, 0};
+#undef pci_ss_info_17aa_200d
+#define pci_ss_info_17aa_200d pci_ss_info_8086_27c5_17aa_200d
+static const pciSubsystemInfo pci_ss_info_8086_27c8_107b_5048 =
+	{0x107b, 0x5048, pci_subsys_8086_27c8_107b_5048, 0};
+#undef pci_ss_info_107b_5048
+#define pci_ss_info_107b_5048 pci_ss_info_8086_27c8_107b_5048
+static const pciSubsystemInfo pci_ss_info_8086_27c8_17aa_200a =
+	{0x17aa, 0x200a, pci_subsys_8086_27c8_17aa_200a, 0};
+#undef pci_ss_info_17aa_200a
+#define pci_ss_info_17aa_200a pci_ss_info_8086_27c8_17aa_200a
 static const pciSubsystemInfo pci_ss_info_8086_27c8_8086_544e =
 	{0x8086, 0x544e, pci_subsys_8086_27c8_8086_544e, 0};
 #undef pci_ss_info_8086_544e
 #define pci_ss_info_8086_544e pci_ss_info_8086_27c8_8086_544e
+static const pciSubsystemInfo pci_ss_info_8086_27c9_107b_5048 =
+	{0x107b, 0x5048, pci_subsys_8086_27c9_107b_5048, 0};
+#undef pci_ss_info_107b_5048
+#define pci_ss_info_107b_5048 pci_ss_info_8086_27c9_107b_5048
+static const pciSubsystemInfo pci_ss_info_8086_27c9_17aa_200a =
+	{0x17aa, 0x200a, pci_subsys_8086_27c9_17aa_200a, 0};
+#undef pci_ss_info_17aa_200a
+#define pci_ss_info_17aa_200a pci_ss_info_8086_27c9_17aa_200a
 static const pciSubsystemInfo pci_ss_info_8086_27c9_8086_544e =
 	{0x8086, 0x544e, pci_subsys_8086_27c9_8086_544e, 0};
 #undef pci_ss_info_8086_544e
 #define pci_ss_info_8086_544e pci_ss_info_8086_27c9_8086_544e
+static const pciSubsystemInfo pci_ss_info_8086_27ca_107b_5048 =
+	{0x107b, 0x5048, pci_subsys_8086_27ca_107b_5048, 0};
+#undef pci_ss_info_107b_5048
+#define pci_ss_info_107b_5048 pci_ss_info_8086_27ca_107b_5048
+static const pciSubsystemInfo pci_ss_info_8086_27ca_17aa_200a =
+	{0x17aa, 0x200a, pci_subsys_8086_27ca_17aa_200a, 0};
+#undef pci_ss_info_17aa_200a
+#define pci_ss_info_17aa_200a pci_ss_info_8086_27ca_17aa_200a
 static const pciSubsystemInfo pci_ss_info_8086_27ca_8086_544e =
 	{0x8086, 0x544e, pci_subsys_8086_27ca_8086_544e, 0};
 #undef pci_ss_info_8086_544e
 #define pci_ss_info_8086_544e pci_ss_info_8086_27ca_8086_544e
+static const pciSubsystemInfo pci_ss_info_8086_27cb_107b_5048 =
+	{0x107b, 0x5048, pci_subsys_8086_27cb_107b_5048, 0};
+#undef pci_ss_info_107b_5048
+#define pci_ss_info_107b_5048 pci_ss_info_8086_27cb_107b_5048
+static const pciSubsystemInfo pci_ss_info_8086_27cb_17aa_200a =
+	{0x17aa, 0x200a, pci_subsys_8086_27cb_17aa_200a, 0};
+#undef pci_ss_info_17aa_200a
+#define pci_ss_info_17aa_200a pci_ss_info_8086_27cb_17aa_200a
 static const pciSubsystemInfo pci_ss_info_8086_27cb_8086_544e =
 	{0x8086, 0x544e, pci_subsys_8086_27cb_8086_544e, 0};
 #undef pci_ss_info_8086_544e
 #define pci_ss_info_8086_544e pci_ss_info_8086_27cb_8086_544e
+static const pciSubsystemInfo pci_ss_info_8086_27cc_17aa_200b =
+	{0x17aa, 0x200b, pci_subsys_8086_27cc_17aa_200b, 0};
+#undef pci_ss_info_17aa_200b
+#define pci_ss_info_17aa_200b pci_ss_info_8086_27cc_17aa_200b
 static const pciSubsystemInfo pci_ss_info_8086_27cc_8086_544e =
 	{0x8086, 0x544e, pci_subsys_8086_27cc_8086_544e, 0};
 #undef pci_ss_info_8086_544e
 #define pci_ss_info_8086_544e pci_ss_info_8086_27cc_8086_544e
+static const pciSubsystemInfo pci_ss_info_8086_27d8_107b_5048 =
+	{0x107b, 0x5048, pci_subsys_8086_27d8_107b_5048, 0};
+#undef pci_ss_info_107b_5048
+#define pci_ss_info_107b_5048 pci_ss_info_8086_27d8_107b_5048
+static const pciSubsystemInfo pci_ss_info_8086_27d8_152d_0753 =
+	{0x152d, 0x0753, pci_subsys_8086_27d8_152d_0753, 0};
+#undef pci_ss_info_152d_0753
+#define pci_ss_info_152d_0753 pci_ss_info_8086_27d8_152d_0753
+static const pciSubsystemInfo pci_ss_info_8086_27d8_17aa_2010 =
+	{0x17aa, 0x2010, pci_subsys_8086_27d8_17aa_2010, 0};
+#undef pci_ss_info_17aa_2010
+#define pci_ss_info_17aa_2010 pci_ss_info_8086_27d8_17aa_2010
+static const pciSubsystemInfo pci_ss_info_8086_27da_17aa_200f =
+	{0x17aa, 0x200f, pci_subsys_8086_27da_17aa_200f, 0};
+#undef pci_ss_info_17aa_200f
+#define pci_ss_info_17aa_200f pci_ss_info_8086_27da_17aa_200f
 static const pciSubsystemInfo pci_ss_info_8086_27da_8086_544e =
 	{0x8086, 0x544e, pci_subsys_8086_27da_8086_544e, 0};
 #undef pci_ss_info_8086_544e
@@ -41869,6 +44117,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x308d, pci_subsys_8086_27dc_8086_308d, 0};
 #undef pci_ss_info_8086_308d
 #define pci_ss_info_8086_308d pci_ss_info_8086_27dc_8086_308d
+static const pciSubsystemInfo pci_ss_info_8086_27df_107b_5048 =
+	{0x107b, 0x5048, pci_subsys_8086_27df_107b_5048, 0};
+#undef pci_ss_info_107b_5048
+#define pci_ss_info_107b_5048 pci_ss_info_8086_27df_107b_5048
+static const pciSubsystemInfo pci_ss_info_8086_27df_17aa_200c =
+	{0x17aa, 0x200c, pci_subsys_8086_27df_17aa_200c, 0};
+#undef pci_ss_info_17aa_200c
+#define pci_ss_info_17aa_200c pci_ss_info_8086_27df_17aa_200c
 static const pciSubsystemInfo pci_ss_info_8086_27df_8086_544e =
 	{0x8086, 0x544e, pci_subsys_8086_27df_8086_544e, 0};
 #undef pci_ss_info_8086_544e
@@ -41885,6 +44141,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x103c, 0x0890, pci_subsys_8086_3340_103c_0890, 0};
 #undef pci_ss_info_103c_0890
 #define pci_ss_info_103c_0890 pci_ss_info_8086_3340_103c_0890
+static const pciSubsystemInfo pci_ss_info_8086_3340_103c_08b0 =
+	{0x103c, 0x08b0, pci_subsys_8086_3340_103c_08b0, 0};
+#undef pci_ss_info_103c_08b0
+#define pci_ss_info_103c_08b0 pci_ss_info_8086_3340_103c_08b0
 static const pciSubsystemInfo pci_ss_info_8086_3575_0e11_0030 =
 	{0x0e11, 0x0030, pci_subsys_8086_3575_0e11_0030, 0};
 #undef pci_ss_info_0e11_0030
@@ -41901,6 +44161,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1014, 0x0513, pci_subsys_8086_3577_1014_0513, 0};
 #undef pci_ss_info_1014_0513
 #define pci_ss_info_1014_0513 pci_ss_info_8086_3577_1014_0513
+static const pciSubsystemInfo pci_ss_info_8086_3580_1014_055c =
+	{0x1014, 0x055c, pci_subsys_8086_3580_1014_055c, 0};
+#undef pci_ss_info_1014_055c
+#define pci_ss_info_1014_055c pci_ss_info_8086_3580_1014_055c
 static const pciSubsystemInfo pci_ss_info_8086_3580_1028_0139 =
 	{0x1028, 0x0139, pci_subsys_8086_3580_1028_0139, 0};
 #undef pci_ss_info_1028_0139
@@ -41917,6 +44181,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1734, 0x1055, pci_subsys_8086_3580_1734_1055, 0};
 #undef pci_ss_info_1734_1055
 #define pci_ss_info_1734_1055 pci_ss_info_8086_3580_1734_1055
+static const pciSubsystemInfo pci_ss_info_8086_3580_1775_10d0 =
+	{0x1775, 0x10d0, pci_subsys_8086_3580_1775_10d0, 0};
+#undef pci_ss_info_1775_10d0
+#define pci_ss_info_1775_10d0 pci_ss_info_8086_3580_1775_10d0
+static const pciSubsystemInfo pci_ss_info_8086_3580_1775_ce90 =
+	{0x1775, 0xce90, pci_subsys_8086_3580_1775_ce90, 0};
+#undef pci_ss_info_1775_ce90
+#define pci_ss_info_1775_ce90 pci_ss_info_8086_3580_1775_ce90
 static const pciSubsystemInfo pci_ss_info_8086_3580_4c53_10b0 =
 	{0x4c53, 0x10b0, pci_subsys_8086_3580_4c53_10b0, 0};
 #undef pci_ss_info_4c53_10b0
@@ -41929,6 +44201,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1734, 0x1055, pci_subsys_8086_3581_1734_1055, 0};
 #undef pci_ss_info_1734_1055
 #define pci_ss_info_1734_1055 pci_ss_info_8086_3581_1734_1055
+static const pciSubsystemInfo pci_ss_info_8086_3582_1014_0562 =
+	{0x1014, 0x0562, pci_subsys_8086_3582_1014_0562, 0};
+#undef pci_ss_info_1014_0562
+#define pci_ss_info_1014_0562 pci_ss_info_8086_3582_1014_0562
 static const pciSubsystemInfo pci_ss_info_8086_3582_1028_0139 =
 	{0x1028, 0x0139, pci_subsys_8086_3582_1028_0139, 0};
 #undef pci_ss_info_1028_0139
@@ -41937,6 +44213,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1028, 0x0163, pci_subsys_8086_3582_1028_0163, 0};
 #undef pci_ss_info_1028_0163
 #define pci_ss_info_1028_0163 pci_ss_info_8086_3582_1028_0163
+static const pciSubsystemInfo pci_ss_info_8086_3582_1775_10d0 =
+	{0x1775, 0x10d0, pci_subsys_8086_3582_1775_10d0, 0};
+#undef pci_ss_info_1775_10d0
+#define pci_ss_info_1775_10d0 pci_ss_info_8086_3582_1775_10d0
+static const pciSubsystemInfo pci_ss_info_8086_3582_1775_ce90 =
+	{0x1775, 0xce90, pci_subsys_8086_3582_1775_ce90, 0};
+#undef pci_ss_info_1775_ce90
+#define pci_ss_info_1775_ce90 pci_ss_info_8086_3582_1775_ce90
 static const pciSubsystemInfo pci_ss_info_8086_3582_4c53_10b0 =
 	{0x4c53, 0x10b0, pci_subsys_8086_3582_4c53_10b0, 0};
 #undef pci_ss_info_4c53_10b0
@@ -41945,6 +44229,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x4c53, 0x10e0, pci_subsys_8086_3582_4c53_10e0, 0};
 #undef pci_ss_info_4c53_10e0
 #define pci_ss_info_4c53_10e0 pci_ss_info_8086_3582_4c53_10e0
+static const pciSubsystemInfo pci_ss_info_8086_3584_1014_055d =
+	{0x1014, 0x055d, pci_subsys_8086_3584_1014_055d, 0};
+#undef pci_ss_info_1014_055d
+#define pci_ss_info_1014_055d pci_ss_info_8086_3584_1014_055d
 static const pciSubsystemInfo pci_ss_info_8086_3584_1028_0139 =
 	{0x1028, 0x0139, pci_subsys_8086_3584_1028_0139, 0};
 #undef pci_ss_info_1028_0139
@@ -41961,6 +44249,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1734, 0x1055, pci_subsys_8086_3584_1734_1055, 0};
 #undef pci_ss_info_1734_1055
 #define pci_ss_info_1734_1055 pci_ss_info_8086_3584_1734_1055
+static const pciSubsystemInfo pci_ss_info_8086_3584_1775_10d0 =
+	{0x1775, 0x10d0, pci_subsys_8086_3584_1775_10d0, 0};
+#undef pci_ss_info_1775_10d0
+#define pci_ss_info_1775_10d0 pci_ss_info_8086_3584_1775_10d0
+static const pciSubsystemInfo pci_ss_info_8086_3584_1775_ce90 =
+	{0x1775, 0xce90, pci_subsys_8086_3584_1775_ce90, 0};
+#undef pci_ss_info_1775_ce90
+#define pci_ss_info_1775_ce90 pci_ss_info_8086_3584_1775_ce90
 static const pciSubsystemInfo pci_ss_info_8086_3584_4c53_10b0 =
 	{0x4c53, 0x10b0, pci_subsys_8086_3584_4c53_10b0, 0};
 #undef pci_ss_info_4c53_10b0
@@ -41969,6 +44265,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x4c53, 0x10e0, pci_subsys_8086_3584_4c53_10e0, 0};
 #undef pci_ss_info_4c53_10e0
 #define pci_ss_info_4c53_10e0 pci_ss_info_8086_3584_4c53_10e0
+static const pciSubsystemInfo pci_ss_info_8086_3585_1014_055e =
+	{0x1014, 0x055e, pci_subsys_8086_3585_1014_055e, 0};
+#undef pci_ss_info_1014_055e
+#define pci_ss_info_1014_055e pci_ss_info_8086_3585_1014_055e
 static const pciSubsystemInfo pci_ss_info_8086_3585_1028_0139 =
 	{0x1028, 0x0139, pci_subsys_8086_3585_1028_0139, 0};
 #undef pci_ss_info_1028_0139
@@ -41985,6 +44285,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1734, 0x1055, pci_subsys_8086_3585_1734_1055, 0};
 #undef pci_ss_info_1734_1055
 #define pci_ss_info_1734_1055 pci_ss_info_8086_3585_1734_1055
+static const pciSubsystemInfo pci_ss_info_8086_3585_1775_10d0 =
+	{0x1775, 0x10d0, pci_subsys_8086_3585_1775_10d0, 0};
+#undef pci_ss_info_1775_10d0
+#define pci_ss_info_1775_10d0 pci_ss_info_8086_3585_1775_10d0
+static const pciSubsystemInfo pci_ss_info_8086_3585_1775_ce90 =
+	{0x1775, 0xce90, pci_subsys_8086_3585_1775_ce90, 0};
+#undef pci_ss_info_1775_ce90
+#define pci_ss_info_1775_ce90 pci_ss_info_8086_3585_1775_ce90
 static const pciSubsystemInfo pci_ss_info_8086_3585_4c53_10b0 =
 	{0x4c53, 0x10b0, pci_subsys_8086_3585_4c53_10b0, 0};
 #undef pci_ss_info_4c53_10b0
@@ -42201,6 +44509,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1993, 0x0def, pci_subsys_8086_8500_1993_0def, 0};
 #undef pci_ss_info_1993_0def
 #define pci_ss_info_1993_0def pci_ss_info_8086_8500_1993_0def
+static const pciSubsystemInfo pci_ss_info_8086_b555_12c7_5005 =
+	{0x12c7, 0x5005, pci_subsys_8086_b555_12c7_5005, 0};
+#undef pci_ss_info_12c7_5005
+#define pci_ss_info_12c7_5005 pci_ss_info_8086_b555_12c7_5005
+static const pciSubsystemInfo pci_ss_info_8086_b555_12c7_5006 =
+	{0x12c7, 0x5006, pci_subsys_8086_b555_12c7_5006, 0};
+#undef pci_ss_info_12c7_5006
+#define pci_ss_info_12c7_5006 pci_ss_info_8086_b555_12c7_5006
 static const pciSubsystemInfo pci_ss_info_8086_b555_12d9_000a =
 	{0x12d9, 0x000a, pci_subsys_8086_b555_12d9_000a, 0};
 #undef pci_ss_info_12d9_000a
@@ -42606,6 +44922,22 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x9005, 0x029a, pci_subsys_9005_0285_9005_029a, 0};
 #undef pci_ss_info_9005_029a
 #define pci_ss_info_9005_029a pci_ss_info_9005_0285_9005_029a
+static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02b5 =
+	{0x9005, 0x02b5, pci_subsys_9005_0285_9005_02b5, 0};
+#undef pci_ss_info_9005_02b5
+#define pci_ss_info_9005_02b5 pci_ss_info_9005_0285_9005_02b5
+static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02b6 =
+	{0x9005, 0x02b6, pci_subsys_9005_0285_9005_02b6, 0};
+#undef pci_ss_info_9005_02b6
+#define pci_ss_info_9005_02b6 pci_ss_info_9005_0285_9005_02b6
+static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02b7 =
+	{0x9005, 0x02b7, pci_subsys_9005_0285_9005_02b7, 0};
+#undef pci_ss_info_9005_02b7
+#define pci_ss_info_9005_02b7 pci_ss_info_9005_0285_9005_02b7
+static const pciSubsystemInfo pci_ss_info_9005_0286_1014_034d =
+	{0x1014, 0x034d, pci_subsys_9005_0286_1014_034d, 0};
+#undef pci_ss_info_1014_034d
+#define pci_ss_info_1014_034d pci_ss_info_9005_0286_1014_034d
 static const pciSubsystemInfo pci_ss_info_9005_0286_1014_9540 =
 	{0x1014, 0x9540, pci_subsys_9005_0286_1014_9540, 0};
 #undef pci_ss_info_1014_9540
@@ -42686,10 +45018,50 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x9005, 0x02aa, pci_subsys_9005_0286_9005_02aa, 0};
 #undef pci_ss_info_9005_02aa
 #define pci_ss_info_9005_02aa pci_ss_info_9005_0286_9005_02aa
+static const pciSubsystemInfo pci_ss_info_9005_0286_9005_02ac =
+	{0x9005, 0x02ac, pci_subsys_9005_0286_9005_02ac, 0};
+#undef pci_ss_info_9005_02ac
+#define pci_ss_info_9005_02ac pci_ss_info_9005_0286_9005_02ac
+static const pciSubsystemInfo pci_ss_info_9005_0286_9005_02b3 =
+	{0x9005, 0x02b3, pci_subsys_9005_0286_9005_02b3, 0};
+#undef pci_ss_info_9005_02b3
+#define pci_ss_info_9005_02b3 pci_ss_info_9005_0286_9005_02b3
+static const pciSubsystemInfo pci_ss_info_9005_0286_9005_02b4 =
+	{0x9005, 0x02b4, pci_subsys_9005_0286_9005_02b4, 0};
+#undef pci_ss_info_9005_02b4
+#define pci_ss_info_9005_02b4 pci_ss_info_9005_0286_9005_02b4
 static const pciSubsystemInfo pci_ss_info_9005_0286_9005_0800 =
 	{0x9005, 0x0800, pci_subsys_9005_0286_9005_0800, 0};
 #undef pci_ss_info_9005_0800
 #define pci_ss_info_9005_0800 pci_ss_info_9005_0286_9005_0800
+static const pciSubsystemInfo pci_ss_info_9005_0410_9005_0410 =
+	{0x9005, 0x0410, pci_subsys_9005_0410_9005_0410, 0};
+#undef pci_ss_info_9005_0410
+#define pci_ss_info_9005_0410 pci_ss_info_9005_0410_9005_0410
+static const pciSubsystemInfo pci_ss_info_9005_0410_9005_0411 =
+	{0x9005, 0x0411, pci_subsys_9005_0410_9005_0411, 0};
+#undef pci_ss_info_9005_0411
+#define pci_ss_info_9005_0411 pci_ss_info_9005_0410_9005_0411
+static const pciSubsystemInfo pci_ss_info_9005_0412_9005_0412 =
+	{0x9005, 0x0412, pci_subsys_9005_0412_9005_0412, 0};
+#undef pci_ss_info_9005_0412
+#define pci_ss_info_9005_0412 pci_ss_info_9005_0412_9005_0412
+static const pciSubsystemInfo pci_ss_info_9005_0412_9005_0413 =
+	{0x9005, 0x0413, pci_subsys_9005_0412_9005_0413, 0};
+#undef pci_ss_info_9005_0413
+#define pci_ss_info_9005_0413 pci_ss_info_9005_0412_9005_0413
+static const pciSubsystemInfo pci_ss_info_9005_041f_9005_041f =
+	{0x9005, 0x041f, pci_subsys_9005_041f_9005_041f, 0};
+#undef pci_ss_info_9005_041f
+#define pci_ss_info_9005_041f pci_ss_info_9005_041f_9005_041f
+static const pciSubsystemInfo pci_ss_info_9005_0430_9005_0430 =
+	{0x9005, 0x0430, pci_subsys_9005_0430_9005_0430, 0};
+#undef pci_ss_info_9005_0430
+#define pci_ss_info_9005_0430 pci_ss_info_9005_0430_9005_0430
+static const pciSubsystemInfo pci_ss_info_9005_0432_9005_0432 =
+	{0x9005, 0x0432, pci_subsys_9005_0432_9005_0432, 0};
+#undef pci_ss_info_9005_0432
+#define pci_ss_info_9005_0432 pci_ss_info_9005_0432_9005_0432
 static const pciSubsystemInfo pci_ss_info_9005_0500_1014_02c1 =
 	{0x1014, 0x02c1, pci_subsys_9005_0500_1014_02c1, 0};
 #undef pci_ss_info_1014_02c1
@@ -42777,8 +45149,10 @@ static const pciSubsystemInfo pci_ss_inf
 #define pci_ss_list_045e_006e NULL
 #define pci_ss_list_045e_00c2 NULL
 #define pci_ss_list_04cf_8818 NULL
+#define pci_ss_list_050d_001a NULL
 #define pci_ss_list_050d_0109 NULL
 #define pci_ss_list_050d_7050 NULL
+#define pci_ss_list_05a9_8519 NULL
 #define pci_ss_list_05e3_0701 NULL
 #define pci_ss_list_066f_3410 NULL
 #define pci_ss_list_066f_3500 NULL
@@ -42786,6 +45160,7 @@ static const pciSubsystemInfo pci_ss_inf
 #define pci_ss_list_0675_1702 NULL
 #define pci_ss_list_0675_1703 NULL
 #define pci_ss_list_0675_1704 NULL
+#define pci_ss_list_067b_2303 NULL
 #define pci_ss_list_067b_3507 NULL
 #define pci_ss_list_09c1_0704 NULL
 #define pci_ss_list_0b0b_0105 NULL
@@ -42794,7 +45169,10 @@ static const pciSubsystemInfo pci_ss_inf
 #define pci_ss_list_0b0b_0405 NULL
 #define pci_ss_list_0b0b_0505 NULL
 #define pci_ss_list_0b0b_0506 NULL
+#define pci_ss_list_0b0b_0605 NULL
+#define pci_ss_list_0b0b_0705 NULL
 #define pci_ss_list_0b49_064f NULL
+#define pci_ss_list_0ccd_0038 NULL
 #define pci_ss_list_0e11_0001 NULL
 #define pci_ss_list_0e11_0002 NULL
 static const pciSubsystemInfo *pci_ss_list_0e11_0046[] = {
@@ -42927,6 +45305,7 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_1000_000a[] = {
+	&pci_ss_info_1000_000a_0e11_b143,
 	&pci_ss_info_1000_000a_1000_1000,
 	NULL
 };
@@ -42952,6 +45331,8 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1000_000f_1000_1010,
 	&pci_ss_info_1000_000f_1000_1020,
 	&pci_ss_info_1000_000f_1092_8760,
+	&pci_ss_info_1000_000f_1775_10d0,
+	&pci_ss_info_1000_000f_1775_10d1,
 	&pci_ss_info_1000_000f_1de1_3904,
 	&pci_ss_info_1000_000f_4c53_1000,
 	&pci_ss_info_1000_000f_4c53_1050,
@@ -42973,12 +45354,15 @@ static const pciSubsystemInfo *pci_ss_li
 };
 static const pciSubsystemInfo *pci_ss_list_1000_0020[] = {
 	&pci_ss_info_1000_0020_1000_1000,
+	&pci_ss_info_1000_0020_107b_1040,
 	&pci_ss_info_1000_0020_1de1_1020,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_1000_0021[] = {
 	&pci_ss_info_1000_0021_1000_1000,
 	&pci_ss_info_1000_0021_1000_1010,
+	&pci_ss_info_1000_0021_103c_1330,
+	&pci_ss_info_1000_0021_103c_1340,
 	&pci_ss_info_1000_0021_124b_1070,
 	&pci_ss_info_1000_0021_4c53_1080,
 	&pci_ss_info_1000_0021_4c53_1300,
@@ -42992,6 +45376,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1000_0030_1028_016c,
 	&pci_ss_info_1000_0030_1028_0183,
 	&pci_ss_info_1000_0030_1028_1010,
+	&pci_ss_info_1000_0030_103c_12c5,
 	&pci_ss_info_1000_0030_124b_1170,
 	&pci_ss_info_1000_0030_1734_1052,
 	NULL
@@ -43015,7 +45400,13 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1000_005a NULL
 #define pci_ss_list_1000_005c NULL
 #define pci_ss_list_1000_005e NULL
-#define pci_ss_list_1000_0060 NULL
+static const pciSubsystemInfo *pci_ss_list_1000_0060[] = {
+	&pci_ss_info_1000_0060_1028_1f0a,
+	&pci_ss_info_1000_0060_1028_1f0b,
+	&pci_ss_info_1000_0060_1028_1f0c,
+	&pci_ss_info_1000_0060_1028_1f0d,
+	NULL
+};
 static const pciSubsystemInfo *pci_ss_list_1000_0062[] = {
 	&pci_ss_info_1000_0062_1000_0062,
 	NULL
@@ -43053,6 +45444,30 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1000_0409_8086_3499,
 	NULL
 };
+static const pciSubsystemInfo *pci_ss_list_1000_0411[] = {
+	&pci_ss_info_1000_0411_1000_1001,
+	&pci_ss_info_1000_0411_1000_1002,
+	&pci_ss_info_1000_0411_1000_1003,
+	&pci_ss_info_1000_0411_1000_1004,
+	&pci_ss_info_1000_0411_1000_100c,
+	&pci_ss_info_1000_0411_1000_100d,
+	&pci_ss_info_1000_0411_1000_2004,
+	&pci_ss_info_1000_0411_1000_2005,
+	&pci_ss_info_1000_0411_1033_8287,
+	&pci_ss_info_1000_0411_1054_3016,
+	&pci_ss_info_1000_0411_1734_1081,
+	&pci_ss_info_1000_0411_1734_10a3,
+	&pci_ss_info_1000_0411_8086_1001,
+	&pci_ss_info_1000_0411_8086_1003,
+	&pci_ss_info_1000_0411_8086_3500,
+	&pci_ss_info_1000_0411_8086_3501,
+	&pci_ss_info_1000_0411_8086_3504,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_1000_0413[] = {
+	&pci_ss_info_1000_0413_1000_1005,
+	NULL
+};
 #define pci_ss_list_1000_0621 NULL
 static const pciSubsystemInfo *pci_ss_list_1000_0622[] = {
 	&pci_ss_info_1000_0622_1000_1020,
@@ -43150,6 +45565,7 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_1002_4153[] = {
+	&pci_ss_info_1002_4153_1043_010c,
 	&pci_ss_info_1002_4153_1462_932c,
 	NULL
 };
@@ -43185,7 +45601,10 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1002_4172_1787_4003,
 	NULL
 };
-#define pci_ss_list_1002_4173 NULL
+static const pciSubsystemInfo *pci_ss_list_1002_4173[] = {
+	&pci_ss_info_1002_4173_1043_010d,
+	NULL
+};
 #define pci_ss_list_1002_4237 NULL
 static const pciSubsystemInfo *pci_ss_list_1002_4242[] = {
 	&pci_ss_info_1002_4242_1002_02aa,
@@ -43345,6 +45764,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1002_4752_1028_00d9,
 	&pci_ss_info_1002_4752_1028_0134,
 	&pci_ss_info_1002_4752_103c_10e1,
+	&pci_ss_info_1002_4752_107b_6400,
 	&pci_ss_info_1002_4752_1734_007a,
 	&pci_ss_info_1002_4752_8086_3411,
 	&pci_ss_info_1002_4752_8086_3427,
@@ -43641,12 +46061,14 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1002_5159_1014_029a,
 	&pci_ss_info_1002_5159_1014_02c8,
 	&pci_ss_info_1002_5159_1028_019a,
+	&pci_ss_info_1002_5159_103c_1292,
 	&pci_ss_info_1002_5159_1458_4002,
 	&pci_ss_info_1002_5159_148c_2003,
 	&pci_ss_info_1002_5159_148c_2023,
 	&pci_ss_info_1002_5159_174b_7112,
 	&pci_ss_info_1002_5159_174b_7c28,
 	&pci_ss_info_1002_5159_1787_0202,
+	&pci_ss_info_1002_5159_17ee_1001,
 	NULL
 };
 #define pci_ss_list_1002_515a NULL
@@ -43732,9 +46154,11 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1002_5551 NULL
 #define pci_ss_list_1002_5552 NULL
 #define pci_ss_list_1002_5554 NULL
+#define pci_ss_list_1002_5569 NULL
 #define pci_ss_list_1002_556b NULL
 #define pci_ss_list_1002_556d NULL
 #define pci_ss_list_1002_556f NULL
+#define pci_ss_list_1002_5571 NULL
 #define pci_ss_list_1002_564a NULL
 #define pci_ss_list_1002_564b NULL
 #define pci_ss_list_1002_564f NULL
@@ -43810,6 +46234,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1002_5969 NULL
 #define pci_ss_list_1002_5974 NULL
 #define pci_ss_list_1002_5975 NULL
+#define pci_ss_list_1002_5a33 NULL
 #define pci_ss_list_1002_5a34 NULL
 #define pci_ss_list_1002_5a36 NULL
 #define pci_ss_list_1002_5a38 NULL
@@ -43888,18 +46313,28 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1002_700f NULL
 #define pci_ss_list_1002_7010 NULL
 #define pci_ss_list_1002_7100 NULL
+#define pci_ss_list_1002_7102 NULL
+#define pci_ss_list_1002_7103 NULL
+#define pci_ss_list_1002_7104 NULL
 #define pci_ss_list_1002_7105 NULL
+#define pci_ss_list_1002_7106 NULL
+#define pci_ss_list_1002_7108 NULL
 static const pciSubsystemInfo *pci_ss_list_1002_7109[] = {
 	&pci_ss_info_1002_7109_1002_0322,
 	&pci_ss_info_1002_7109_1002_0d02,
 	NULL
 };
+#define pci_ss_list_1002_710a NULL
+#define pci_ss_list_1002_710b NULL
+#define pci_ss_list_1002_710c NULL
 #define pci_ss_list_1002_7120 NULL
+#define pci_ss_list_1002_7124 NULL
 static const pciSubsystemInfo *pci_ss_list_1002_7129[] = {
 	&pci_ss_info_1002_7129_1002_0323,
 	&pci_ss_info_1002_7129_1002_0d03,
 	NULL
 };
+#define pci_ss_list_1002_7140 NULL
 static const pciSubsystemInfo *pci_ss_list_1002_7142[] = {
 	&pci_ss_info_1002_7142_1002_0322,
 	NULL
@@ -43913,6 +46348,10 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1002_714a NULL
 #define pci_ss_list_1002_714b NULL
 #define pci_ss_list_1002_714c NULL
+#define pci_ss_list_1002_714d NULL
+#define pci_ss_list_1002_714e NULL
+#define pci_ss_list_1002_7152 NULL
+#define pci_ss_list_1002_715e NULL
 static const pciSubsystemInfo *pci_ss_list_1002_7162[] = {
 	&pci_ss_info_1002_7162_1002_0323,
 	NULL
@@ -43921,12 +46360,42 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1002_7166_1002_0323,
 	NULL
 };
+#define pci_ss_list_1002_7172 NULL
+#define pci_ss_list_1002_7180 NULL
+#define pci_ss_list_1002_7181 NULL
+#define pci_ss_list_1002_71a0 NULL
+#define pci_ss_list_1002_71a1 NULL
 #define pci_ss_list_1002_71c0 NULL
 #define pci_ss_list_1002_71c2 NULL
-#define pci_ss_list_1002_71c4 NULL
+static const pciSubsystemInfo *pci_ss_list_1002_71c4[] = {
+	&pci_ss_info_1002_71c4_17aa_2007,
+	NULL
+};
 #define pci_ss_list_1002_71c5 NULL
+#define pci_ss_list_1002_71c6 NULL
+#define pci_ss_list_1002_71ce NULL
+#define pci_ss_list_1002_71d5 NULL
+#define pci_ss_list_1002_71d6 NULL
+#define pci_ss_list_1002_71de NULL
 #define pci_ss_list_1002_71e0 NULL
 #define pci_ss_list_1002_71e2 NULL
+#define pci_ss_list_1002_7240 NULL
+#define pci_ss_list_1002_7241 NULL
+#define pci_ss_list_1002_7242 NULL
+#define pci_ss_list_1002_7243 NULL
+#define pci_ss_list_1002_7244 NULL
+#define pci_ss_list_1002_7245 NULL
+#define pci_ss_list_1002_7246 NULL
+#define pci_ss_list_1002_7247 NULL
+#define pci_ss_list_1002_7248 NULL
+#define pci_ss_list_1002_7249 NULL
+#define pci_ss_list_1002_724a NULL
+#define pci_ss_list_1002_724b NULL
+#define pci_ss_list_1002_724c NULL
+#define pci_ss_list_1002_724d NULL
+#define pci_ss_list_1002_724e NULL
+#define pci_ss_list_1002_7269 NULL
+#define pci_ss_list_1002_726e NULL
 #define pci_ss_list_1002_7833 NULL
 #define pci_ss_list_1002_7834 NULL
 #define pci_ss_list_1002_7835 NULL
@@ -44069,6 +46538,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1011_0019_1025_0315,
 	&pci_ss_info_1011_0019_1033_800c,
 	&pci_ss_info_1011_0019_1033_800d,
+	&pci_ss_info_1011_0019_103c_125a,
 	&pci_ss_info_1011_0019_108d_0016,
 	&pci_ss_info_1011_0019_108d_0017,
 	&pci_ss_info_1011_0019_10b8_2005,
@@ -44096,6 +46566,9 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1011_0019_1385_2100,
 	&pci_ss_info_1011_0019_1395_0001,
 	&pci_ss_info_1011_0019_13d1_ab01,
+	&pci_ss_info_1011_0019_1498_000a,
+	&pci_ss_info_1011_0019_1498_000b,
+	&pci_ss_info_1011_0019_1498_000c,
 	&pci_ss_info_1011_0019_14cb_0100,
 	&pci_ss_info_1011_0019_8086_0001,
 	NULL
@@ -44171,9 +46644,11 @@ static const pciSubsystemInfo *pci_ss_li
 static const pciSubsystemInfo *pci_ss_list_1013_6003[] = {
 	&pci_ss_info_1013_6003_1013_4280,
 	&pci_ss_info_1013_6003_1014_0153,
+	&pci_ss_info_1013_6003_153b_112e,
 	&pci_ss_info_1013_6003_153b_1136,
 	&pci_ss_info_1013_6003_1681_0050,
 	&pci_ss_info_1013_6003_1681_a011,
+	&pci_ss_info_1013_6003_5053_3357,
 	NULL
 };
 #define pci_ss_list_1013_6004 NULL
@@ -44237,6 +46712,7 @@ static const pciSubsystemInfo *pci_ss_li
 #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_0058 NULL
 #define pci_ss_list_1014_005c NULL
 #define pci_ss_list_1014_005e NULL
 #define pci_ss_list_1014_007c NULL
@@ -44329,6 +46805,7 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 #define pci_ss_list_1014_0302 NULL
+#define pci_ss_list_1014_0308 NULL
 #define pci_ss_list_1014_0314 NULL
 #define pci_ss_list_1014_3022 NULL
 #define pci_ss_list_1014_4022 NULL
@@ -44397,6 +46874,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1022_2000_1259_2701,
 	&pci_ss_info_1022_2000_1259_2702,
 	&pci_ss_info_1022_2000_1259_2703,
+	&pci_ss_info_1022_2000_1259_2704,
 	&pci_ss_info_1022_2000_4c53_1000,
 	&pci_ss_info_1022_2000_4c53_1010,
 	&pci_ss_info_1022_2000_4c53_1020,
@@ -44565,6 +47043,7 @@ static const pciSubsystemInfo *pci_ss_li
 };
 #define pci_ss_list_1023_9910 NULL
 #define pci_ss_list_1023_9930 NULL
+#define pci_ss_list_1025_0090 NULL
 #define pci_ss_list_1025_1435 NULL
 #define pci_ss_list_1025_1445 NULL
 #define pci_ss_list_1025_1449 NULL
@@ -44854,6 +47333,9 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 #define pci_ss_list_102b_4536 NULL
+#define pci_ss_list_102b_4cdc NULL
+#define pci_ss_list_102b_4fc5 NULL
+#define pci_ss_list_102b_5e10 NULL
 #define pci_ss_list_102b_6573 NULL
 #define pci_ss_list_102c_00b8 NULL
 static const pciSubsystemInfo *pci_ss_list_102c_00c0[] = {
@@ -44978,6 +47460,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1033_00f3 NULL
 #define pci_ss_list_1033_010c NULL
 #define pci_ss_list_1033_0125 NULL
+#define pci_ss_list_1033_013a NULL
 #define pci_ss_list_1036_0000 NULL
 #define pci_ss_list_1039_0001 NULL
 #define pci_ss_list_1039_0002 NULL
@@ -44992,6 +47475,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1039_0180 NULL
 #define pci_ss_list_1039_0181 NULL
 #define pci_ss_list_1039_0182 NULL
+#define pci_ss_list_1039_0186 NULL
 #define pci_ss_list_1039_0190 NULL
 #define pci_ss_list_1039_0191 NULL
 static const pciSubsystemInfo *pci_ss_list_1039_0200[] = {
@@ -45027,6 +47511,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1039_0655 NULL
 #define pci_ss_list_1039_0660 NULL
 #define pci_ss_list_1039_0661 NULL
+#define pci_ss_list_1039_0662 NULL
 #define pci_ss_list_1039_0730 NULL
 #define pci_ss_list_1039_0733 NULL
 #define pci_ss_list_1039_0735 NULL
@@ -45048,6 +47533,13 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1039_0963 NULL
 #define pci_ss_list_1039_0964 NULL
 #define pci_ss_list_1039_0965 NULL
+#define pci_ss_list_1039_0966 NULL
+#define pci_ss_list_1039_0968 NULL
+#define pci_ss_list_1039_1180 NULL
+#define pci_ss_list_1039_1182 NULL
+#define pci_ss_list_1039_1183 NULL
+#define pci_ss_list_1039_1184 NULL
+#define pci_ss_list_1039_1185 NULL
 #define pci_ss_list_1039_3602 NULL
 #define pci_ss_list_1039_5107 NULL
 #define pci_ss_list_1039_5300 NULL
@@ -45094,6 +47586,8 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1039_6330_1039_6330,
 	NULL
 };
+#define pci_ss_list_1039_6350 NULL
+#define pci_ss_list_1039_6351 NULL
 static const pciSubsystemInfo *pci_ss_list_1039_7001[] = {
 	&pci_ss_info_1039_7001_1019_0a14,
 	&pci_ss_info_1039_7001_1039_7000,
@@ -45140,6 +47634,7 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 #define pci_ss_list_1039_7019 NULL
+#define pci_ss_list_1039_7502 NULL
 #define pci_ss_list_103c_002a NULL
 #define pci_ss_list_103c_1005 NULL
 #define pci_ss_list_103c_1008 NULL
@@ -45192,18 +47687,30 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_103c_1229 NULL
 #define pci_ss_list_103c_122a NULL
 #define pci_ss_list_103c_122e NULL
+#define pci_ss_list_103c_127b NULL
 #define pci_ss_list_103c_127c NULL
 #define pci_ss_list_103c_1290 NULL
 #define pci_ss_list_103c_1291 NULL
 #define pci_ss_list_103c_12b4 NULL
+#define pci_ss_list_103c_12eb NULL
+#define pci_ss_list_103c_12ec NULL
+#define pci_ss_list_103c_12ee NULL
 #define pci_ss_list_103c_12f8 NULL
 #define pci_ss_list_103c_12fa NULL
 #define pci_ss_list_103c_2910 NULL
 #define pci_ss_list_103c_2925 NULL
 #define pci_ss_list_103c_3080 NULL
 #define pci_ss_list_103c_3085 NULL
-#define pci_ss_list_103c_3220 NULL
+static const pciSubsystemInfo *pci_ss_list_103c_3220[] = {
+	&pci_ss_info_103c_3220_103c_3225,
+	NULL
+};
 #define pci_ss_list_103c_3230 NULL
+#define pci_ss_list_103c_4030 NULL
+#define pci_ss_list_103c_4031 NULL
+#define pci_ss_list_103c_4037 NULL
+#define pci_ss_list_103c_403b NULL
+#define pci_ss_list_103c_60e8 NULL
 #define pci_ss_list_1042_1000 NULL
 #define pci_ss_list_1042_1001 NULL
 #define pci_ss_list_1042_3000 NULL
@@ -45221,12 +47728,14 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1043_4021 NULL
 #define pci_ss_list_1043_4057 NULL
 #define pci_ss_list_1043_8043 NULL
+#define pci_ss_list_1043_8047 NULL
 #define pci_ss_list_1043_807b NULL
 #define pci_ss_list_1043_8095 NULL
 #define pci_ss_list_1043_80ac NULL
 #define pci_ss_list_1043_80bb NULL
 #define pci_ss_list_1043_80c5 NULL
 #define pci_ss_list_1043_80df NULL
+#define pci_ss_list_1043_815a NULL
 #define pci_ss_list_1043_8187 NULL
 #define pci_ss_list_1043_8188 NULL
 #endif
@@ -45318,7 +47827,10 @@ static const pciSubsystemInfo *pci_ss_li
 #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
+static const pciSubsystemInfo *pci_ss_list_104a_0500[] = {
+	&pci_ss_info_104a_0500_104a_0500,
+	NULL
+};
 #define pci_ss_list_104a_0564 NULL
 #define pci_ss_list_104a_0981 NULL
 #define pci_ss_list_104a_1746 NULL
@@ -45379,6 +47891,7 @@ static const pciSubsystemInfo *pci_ss_li
 };
 static const pciSubsystemInfo *pci_ss_list_104c_8020[] = {
 	&pci_ss_info_104c_8020_11bd_000f,
+	&pci_ss_info_104c_8020_11bd_001c,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_104c_8021[] = {
@@ -45449,8 +47962,26 @@ static const pciSubsystemInfo *pci_ss_li
 };
 #define pci_ss_list_104c_8036 NULL
 #define pci_ss_list_104c_8038 NULL
-#define pci_ss_list_104c_8039 NULL
-#define pci_ss_list_104c_803b NULL
+static const pciSubsystemInfo *pci_ss_list_104c_8039[] = {
+	&pci_ss_info_104c_8039_103c_309f,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_104c_803a[] = {
+	&pci_ss_info_104c_803a_103c_309f,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_104c_803b[] = {
+	&pci_ss_info_104c_803b_103c_309f,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_104c_803c[] = {
+	&pci_ss_info_104c_803c_103c_309f,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_104c_803d[] = {
+	&pci_ss_info_104c_803d_103c_309f,
+	NULL
+};
 #define pci_ss_list_104c_8201 NULL
 static const pciSubsystemInfo *pci_ss_list_104c_8204[] = {
 	&pci_ss_info_104c_8204_1028_0139,
@@ -45556,13 +48087,18 @@ static const pciSubsystemInfo *pci_ss_li
 };
 #define pci_ss_list_104c_ac52 NULL
 #define pci_ss_list_104c_ac53 NULL
-#define pci_ss_list_104c_ac54 NULL
+static const pciSubsystemInfo *pci_ss_list_104c_ac54[] = {
+	&pci_ss_info_104c_ac54_103c_08b0,
+	NULL
+};
 static const pciSubsystemInfo *pci_ss_list_104c_ac55[] = {
 	&pci_ss_info_104c_ac55_1014_0512,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_104c_ac56[] = {
+	&pci_ss_info_104c_ac56_1014_0512,
 	&pci_ss_info_104c_ac56_1014_0528,
+	&pci_ss_info_104c_ac56_17aa_2012,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_104c_ac60[] = {
@@ -45624,6 +48160,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1057_0006 NULL
 #define pci_ss_list_1057_0008 NULL
 #define pci_ss_list_1057_0009 NULL
+#define pci_ss_list_1057_0012 NULL
 #define pci_ss_list_1057_0100 NULL
 #define pci_ss_list_1057_0431 NULL
 static const pciSubsystemInfo *pci_ss_list_1057_1801[] = {
@@ -45655,6 +48192,7 @@ static const pciSubsystemInfo *pci_ss_li
 };
 #define pci_ss_list_1057_18c0 NULL
 #define pci_ss_list_1057_18c1 NULL
+#define pci_ss_list_1057_3055 NULL
 static const pciSubsystemInfo *pci_ss_list_1057_3410[] = {
 	&pci_ss_info_1057_3410_ecc0_0050,
 	&pci_ss_info_1057_3410_ecc0_0051,
@@ -45738,6 +48276,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_105a_3d18 NULL
 #define pci_ss_list_105a_3d73 NULL
 #define pci_ss_list_105a_3d75 NULL
+#define pci_ss_list_105a_4302 NULL
 static const pciSubsystemInfo *pci_ss_list_105a_4d30[] = {
 	&pci_ss_info_105a_4d30_105a_4d33,
 	&pci_ss_info_105a_4d30_105a_4d39,
@@ -45784,6 +48323,8 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_105a_6629 NULL
 #define pci_ss_list_105a_7275 NULL
 #define pci_ss_list_105a_8002 NULL
+#define pci_ss_list_105a_8350 NULL
+#define pci_ss_list_105a_c350 NULL
 #endif
 #define pci_ss_list_105d_2309 NULL
 static const pciSubsystemInfo *pci_ss_list_105d_2339[] = {
@@ -46037,9 +48578,17 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 #define pci_ss_list_1077_2300 NULL
-#define pci_ss_list_1077_2312 NULL
+static const pciSubsystemInfo *pci_ss_list_1077_2312[] = {
+	&pci_ss_info_1077_2312_103c_0131,
+	&pci_ss_info_1077_2312_103c_12ba,
+	NULL
+};
 #define pci_ss_list_1077_2322 NULL
-#define pci_ss_list_1077_2422 NULL
+static const pciSubsystemInfo *pci_ss_list_1077_2422[] = {
+	&pci_ss_info_1077_2422_103c_12d7,
+	&pci_ss_info_1077_2422_103c_12dd,
+	NULL
+};
 #define pci_ss_list_1077_2432 NULL
 #define pci_ss_list_1077_3010 NULL
 #define pci_ss_list_1077_3022 NULL
@@ -46431,8 +48980,6 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_10a9_4002 NULL
 #define pci_ss_list_10a9_8001 NULL
 #define pci_ss_list_10a9_8002 NULL
-#define pci_ss_list_10a9_8010 NULL
-#define pci_ss_list_10a9_8018 NULL
 #endif
 #define pci_ss_list_10aa_0000 NULL
 #define pci_ss_list_10ad_0001 NULL
@@ -46563,13 +49110,22 @@ static const pciSubsystemInfo *pci_ss_li
 static const pciSubsystemInfo *pci_ss_list_10b5_9080[] = {
 	&pci_ss_info_10b5_9080_103c_10eb,
 	&pci_ss_info_10b5_9080_103c_10ec,
+	&pci_ss_info_10b5_9080_10b5_1123,
 	&pci_ss_info_10b5_9080_10b5_9080,
 	&pci_ss_info_10b5_9080_129d_0002,
 	&pci_ss_info_10b5_9080_12d9_0002,
 	&pci_ss_info_10b5_9080_12df_4422,
+	&pci_ss_info_10b5_9080_1517_000b,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_10b5_9656[] = {
+	&pci_ss_info_10b5_9656_1517_000f,
+	&pci_ss_info_10b5_9656_1885_0700,
+	&pci_ss_info_10b5_9656_1885_0701,
 	NULL
 };
 #define pci_ss_list_10b5_bb04 NULL
+#define pci_ss_list_10b5_c001 NULL
 #endif
 #define pci_ss_list_10b6_0001 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -46708,6 +49264,10 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_10b7_900a NULL
 #define pci_ss_list_10b7_9050 NULL
 #define pci_ss_list_10b7_9051 NULL
+static const pciSubsystemInfo *pci_ss_list_10b7_9054[] = {
+	&pci_ss_info_10b7_9054_10b7_9054,
+	NULL
+};
 static const pciSubsystemInfo *pci_ss_list_10b7_9055[] = {
 	&pci_ss_info_10b7_9055_1028_0080,
 	&pci_ss_info_10b7_9055_1028_0081,
@@ -46883,6 +49443,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_10b9_5229_1014_053d,
 	&pci_ss_info_10b9_5229_103c_0024,
 	&pci_ss_info_10b9_5229_1043_8053,
+	&pci_ss_info_10b9_5229_1849_5229,
 	NULL
 };
 #define pci_ss_list_10b9_5235 NULL
@@ -47002,6 +49563,7 @@ static const pciSubsystemInfo *pci_ss_li
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_10cd_1300[] = {
 	&pci_ss_info_10cd_1300_10cd_1310,
+	&pci_ss_info_10cd_1300_1195_1320,
 	NULL
 };
 #define pci_ss_list_10cd_2300 NULL
@@ -47152,6 +49714,7 @@ static const pciSubsystemInfo *pci_ss_li
 };
 #define pci_ss_list_10de_0048 NULL
 #define pci_ss_list_10de_0049 NULL
+#define pci_ss_list_10de_004d NULL
 #define pci_ss_list_10de_004e NULL
 static const pciSubsystemInfo *pci_ss_list_10de_0050[] = {
 	&pci_ss_info_10de_0050_1043_815a,
@@ -47312,7 +49875,10 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_10de_00c8 NULL
 #define pci_ss_list_10de_00c9 NULL
 #define pci_ss_list_10de_00cc NULL
-#define pci_ss_list_10de_00cd NULL
+static const pciSubsystemInfo *pci_ss_list_10de_00cd[] = {
+	&pci_ss_info_10de_00cd_10de_029b,
+	NULL
+};
 #define pci_ss_list_10de_00ce NULL
 #define pci_ss_list_10de_00d0 NULL
 #define pci_ss_list_10de_00d1 NULL
@@ -47333,10 +49899,12 @@ static const pciSubsystemInfo *pci_ss_li
 };
 static const pciSubsystemInfo *pci_ss_list_10de_00e0[] = {
 	&pci_ss_info_10de_00e0_10de_0c11,
+	&pci_ss_info_10de_00e0_1462_7030,
 	&pci_ss_info_10de_00e0_147b_1c0b,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_10de_00e1[] = {
+	&pci_ss_info_10de_00e1_1462_7030,
 	&pci_ss_info_10de_00e1_147b_1c0b,
 	NULL
 };
@@ -47348,22 +49916,26 @@ static const pciSubsystemInfo *pci_ss_li
 };
 static const pciSubsystemInfo *pci_ss_list_10de_00e4[] = {
 	&pci_ss_info_10de_00e4_105b_0c43,
+	&pci_ss_info_10de_00e4_1462_7030,
 	&pci_ss_info_10de_00e4_147b_1c0b,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_10de_00e5[] = {
 	&pci_ss_info_10de_00e5_105b_0c43,
+	&pci_ss_info_10de_00e5_1462_7030,
 	&pci_ss_info_10de_00e5_147b_1c0b,
 	NULL
 };
 #define pci_ss_list_10de_00e6 NULL
 static const pciSubsystemInfo *pci_ss_list_10de_00e7[] = {
 	&pci_ss_info_10de_00e7_105b_0c43,
+	&pci_ss_info_10de_00e7_1462_7030,
 	&pci_ss_info_10de_00e7_147b_1c0b,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_10de_00e8[] = {
 	&pci_ss_info_10de_00e8_105b_0c43,
+	&pci_ss_info_10de_00e8_1462_7030,
 	&pci_ss_info_10de_00e8_147b_1c0b,
 	NULL
 };
@@ -47387,7 +49959,10 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_10de_00f3 NULL
 #define pci_ss_list_10de_00f4 NULL
 #define pci_ss_list_10de_00f5 NULL
-#define pci_ss_list_10de_00f6 NULL
+static const pciSubsystemInfo *pci_ss_list_10de_00f6[] = {
+	&pci_ss_info_10de_00f6_1682_217e,
+	NULL
+};
 #define pci_ss_list_10de_00f8 NULL
 static const pciSubsystemInfo *pci_ss_list_10de_00f9[] = {
 	&pci_ss_info_10de_00f9_1682_2120,
@@ -47462,6 +50037,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_10de_0149 NULL
 #define pci_ss_list_10de_014a NULL
 #define pci_ss_list_10de_014c NULL
+#define pci_ss_list_10de_014d NULL
 #define pci_ss_list_10de_014e NULL
 #define pci_ss_list_10de_014f NULL
 static const pciSubsystemInfo *pci_ss_list_10de_0150[] = {
@@ -47470,6 +50046,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_10de_0150_1048_0c52,
 	&pci_ss_info_10de_0150_107d_2840,
 	&pci_ss_info_10de_0150_107d_2842,
+	&pci_ss_info_10de_0150_10de_002e,
 	&pci_ss_info_10de_0150_1462_8831,
 	NULL
 };
@@ -47508,6 +50085,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_10de_0174 NULL
 #define pci_ss_list_10de_0175 NULL
 static const pciSubsystemInfo *pci_ss_list_10de_0176[] = {
+	&pci_ss_info_10de_0176_103c_08b0,
 	&pci_ss_info_10de_0176_4c53_1090,
 	NULL
 };
@@ -47522,6 +50100,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_10de_017c NULL
 #define pci_ss_list_10de_017d NULL
 static const pciSubsystemInfo *pci_ss_list_10de_0181[] = {
+	&pci_ss_info_10de_0181_1043_8063,
 	&pci_ss_info_10de_0181_1043_806f,
 	&pci_ss_info_10de_0181_1462_8880,
 	&pci_ss_info_10de_0181_1462_8900,
@@ -47554,7 +50133,11 @@ static const pciSubsystemInfo *pci_ss_li
 #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_01d1 NULL
+static const pciSubsystemInfo *pci_ss_list_10de_01d1[] = {
+	&pci_ss_info_10de_01d1_1462_0345,
+	NULL
+};
+#define pci_ss_list_10de_01d6 NULL
 #define pci_ss_list_10de_01d7 NULL
 #define pci_ss_list_10de_01d8 NULL
 #define pci_ss_list_10de_01da NULL
@@ -47712,11 +50295,15 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_10de_028c NULL
 #define pci_ss_list_10de_0290 NULL
 #define pci_ss_list_10de_0291 NULL
+#define pci_ss_list_10de_0292 NULL
+#define pci_ss_list_10de_0298 NULL
+#define pci_ss_list_10de_0299 NULL
 #define pci_ss_list_10de_029a NULL
 #define pci_ss_list_10de_029b NULL
 #define pci_ss_list_10de_029c NULL
 #define pci_ss_list_10de_029d NULL
 #define pci_ss_list_10de_029e NULL
+#define pci_ss_list_10de_029f NULL
 #define pci_ss_list_10de_02a0 NULL
 #define pci_ss_list_10de_02e1 NULL
 static const pciSubsystemInfo *pci_ss_list_10de_02f0[] = {
@@ -47832,19 +50419,62 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_10de_0368 NULL
 #define pci_ss_list_10de_0369 NULL
 #define pci_ss_list_10de_036a NULL
+#define pci_ss_list_10de_036b NULL
 #define pci_ss_list_10de_036c NULL
 #define pci_ss_list_10de_036d NULL
 #define pci_ss_list_10de_036e NULL
+#define pci_ss_list_10de_0370 NULL
 #define pci_ss_list_10de_0371 NULL
 #define pci_ss_list_10de_0372 NULL
 #define pci_ss_list_10de_0373 NULL
+#define pci_ss_list_10de_0374 NULL
+#define pci_ss_list_10de_0375 NULL
+#define pci_ss_list_10de_0376 NULL
+#define pci_ss_list_10de_0377 NULL
+#define pci_ss_list_10de_0378 NULL
 #define pci_ss_list_10de_037a NULL
 #define pci_ss_list_10de_037e NULL
 #define pci_ss_list_10de_037f NULL
 #define pci_ss_list_10de_0391 NULL
-#define pci_ss_list_10de_0392 NULL
+static const pciSubsystemInfo *pci_ss_list_10de_0392[] = {
+	&pci_ss_info_10de_0392_1462_0622,
+	NULL
+};
+#define pci_ss_list_10de_0393 NULL
 #define pci_ss_list_10de_0398 NULL
 #define pci_ss_list_10de_039e NULL
+#define pci_ss_list_10de_03a0 NULL
+#define pci_ss_list_10de_03a1 NULL
+#define pci_ss_list_10de_03a2 NULL
+#define pci_ss_list_10de_03a3 NULL
+#define pci_ss_list_10de_03a4 NULL
+#define pci_ss_list_10de_03a5 NULL
+#define pci_ss_list_10de_03a6 NULL
+#define pci_ss_list_10de_03a7 NULL
+#define pci_ss_list_10de_03a8 NULL
+#define pci_ss_list_10de_03a9 NULL
+#define pci_ss_list_10de_03aa NULL
+#define pci_ss_list_10de_03ab NULL
+#define pci_ss_list_10de_03ac NULL
+#define pci_ss_list_10de_03ad NULL
+#define pci_ss_list_10de_03ae NULL
+#define pci_ss_list_10de_03af NULL
+#define pci_ss_list_10de_03b0 NULL
+#define pci_ss_list_10de_03b1 NULL
+#define pci_ss_list_10de_03b2 NULL
+#define pci_ss_list_10de_03b3 NULL
+#define pci_ss_list_10de_03b4 NULL
+#define pci_ss_list_10de_03b5 NULL
+#define pci_ss_list_10de_03b6 NULL
+#define pci_ss_list_10de_03b7 NULL
+#define pci_ss_list_10de_03b8 NULL
+#define pci_ss_list_10de_03b9 NULL
+#define pci_ss_list_10de_03ba NULL
+#define pci_ss_list_10de_03bb NULL
+#define pci_ss_list_10de_03d0 NULL
+#define pci_ss_list_10de_03d1 NULL
+#define pci_ss_list_10de_03d2 NULL
+#define pci_ss_list_10de_03d5 NULL
 #define pci_ss_list_10de_03e0 NULL
 #define pci_ss_list_10de_03e1 NULL
 #define pci_ss_list_10de_03e2 NULL
@@ -47853,6 +50483,8 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_10de_03e5 NULL
 #define pci_ss_list_10de_03e6 NULL
 #define pci_ss_list_10de_03e7 NULL
+#define pci_ss_list_10de_03e8 NULL
+#define pci_ss_list_10de_03e9 NULL
 #define pci_ss_list_10de_03ea NULL
 #define pci_ss_list_10de_03eb NULL
 #define pci_ss_list_10de_03ec NULL
@@ -47861,9 +50493,42 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_10de_03f0 NULL
 #define pci_ss_list_10de_03f1 NULL
 #define pci_ss_list_10de_03f2 NULL
+#define pci_ss_list_10de_03f3 NULL
+#define pci_ss_list_10de_03f4 NULL
 #define pci_ss_list_10de_03f5 NULL
 #define pci_ss_list_10de_03f6 NULL
 #define pci_ss_list_10de_03f7 NULL
+#define pci_ss_list_10de_0440 NULL
+#define pci_ss_list_10de_0441 NULL
+#define pci_ss_list_10de_0442 NULL
+#define pci_ss_list_10de_0443 NULL
+#define pci_ss_list_10de_0444 NULL
+#define pci_ss_list_10de_0445 NULL
+#define pci_ss_list_10de_0446 NULL
+#define pci_ss_list_10de_0447 NULL
+#define pci_ss_list_10de_0448 NULL
+#define pci_ss_list_10de_0449 NULL
+#define pci_ss_list_10de_044a NULL
+#define pci_ss_list_10de_044b NULL
+#define pci_ss_list_10de_044c NULL
+#define pci_ss_list_10de_044d NULL
+#define pci_ss_list_10de_044e NULL
+#define pci_ss_list_10de_044f NULL
+#define pci_ss_list_10de_0450 NULL
+#define pci_ss_list_10de_0451 NULL
+#define pci_ss_list_10de_0452 NULL
+#define pci_ss_list_10de_0453 NULL
+#define pci_ss_list_10de_0454 NULL
+#define pci_ss_list_10de_0455 NULL
+#define pci_ss_list_10de_0456 NULL
+#define pci_ss_list_10de_0457 NULL
+#define pci_ss_list_10de_0458 NULL
+#define pci_ss_list_10de_0459 NULL
+#define pci_ss_list_10de_045a NULL
+#define pci_ss_list_10de_045c NULL
+#define pci_ss_list_10de_045d NULL
+#define pci_ss_list_10de_045e NULL
+#define pci_ss_list_10de_045f NULL
 #define pci_ss_list_10df_1ae5 NULL
 #define pci_ss_list_10df_f085 NULL
 #define pci_ss_list_10df_f095 NULL
@@ -47908,11 +50573,13 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_10e1_dc29 NULL
 #endif
 #define pci_ss_list_10e3_0000 NULL
+#define pci_ss_list_10e3_0108 NULL
 #define pci_ss_list_10e3_0148 NULL
 #define pci_ss_list_10e3_0860 NULL
 #define pci_ss_list_10e3_0862 NULL
 #define pci_ss_list_10e3_8260 NULL
 #define pci_ss_list_10e3_8261 NULL
+#define pci_ss_list_10e3_a108 NULL
 #define pci_ss_list_10e4_8029 NULL
 #define pci_ss_list_10e8_1072 NULL
 #define pci_ss_list_10e8_2011 NULL
@@ -47953,6 +50620,10 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_10eb_8111 NULL
 #define pci_ss_list_10ec_0139 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_10ec_0883[] = {
+	&pci_ss_info_10ec_0883_1025_1605,
+	NULL
+};
 static const pciSubsystemInfo *pci_ss_list_10ec_8029[] = {
 	&pci_ss_info_10ec_8029_10b8_2011,
 	&pci_ss_info_10ec_8029_10ec_8029,
@@ -47965,6 +50636,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_10ec_8129_10ec_8129,
 	NULL
 };
+#define pci_ss_list_10ec_8136 NULL
 static const pciSubsystemInfo *pci_ss_list_10ec_8138[] = {
 	&pci_ss_info_10ec_8138_10ec_8138,
 	NULL
@@ -48006,6 +50678,8 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_10ec_8139_a0a0_0007,
 	NULL
 };
+#define pci_ss_list_10ec_8167 NULL
+#define pci_ss_list_10ec_8168 NULL
 static const pciSubsystemInfo *pci_ss_list_10ec_8169[] = {
 	&pci_ss_info_10ec_8169_1025_0079,
 	&pci_ss_info_10ec_8169_1259_c107,
@@ -48041,6 +50715,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_10fc_0003 NULL
 #define pci_ss_list_10fc_0005 NULL
 #define pci_ss_list_1101_1060 NULL
+#define pci_ss_list_1101_1622 NULL
 #define pci_ss_list_1101_9100 NULL
 #define pci_ss_list_1101_9400 NULL
 #define pci_ss_list_1101_9401 NULL
@@ -48077,6 +50752,11 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1102_0004_1102_2002,
 	NULL
 };
+static const pciSubsystemInfo *pci_ss_list_1102_0005[] = {
+	&pci_ss_info_1102_0005_1102_0021,
+	&pci_ss_info_1102_0005_1102_1003,
+	NULL
+};
 #define pci_ss_list_1102_0006 NULL
 static const pciSubsystemInfo *pci_ss_list_1102_0007[] = {
 	&pci_ss_info_1102_0007_1102_0007,
@@ -48865,12 +51545,20 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1131_7133_185b_c100,
 	&pci_ss_info_1131_7133_5168_0306,
 	&pci_ss_info_1131_7133_5168_0319,
+	&pci_ss_info_1131_7133_5168_0502,
+	&pci_ss_info_1131_7133_5168_0520,
+	&pci_ss_info_1131_7133_5168_1502,
+	&pci_ss_info_1131_7133_5168_2502,
+	&pci_ss_info_1131_7133_5168_2520,
+	&pci_ss_info_1131_7133_5168_3502,
+	&pci_ss_info_1131_7133_5168_3520,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_1131_7134[] = {
 	&pci_ss_info_1131_7134_1019_4cb4,
 	&pci_ss_info_1131_7134_1043_0210,
 	&pci_ss_info_1131_7134_1043_4840,
+	&pci_ss_info_1131_7134_1043_4842,
 	&pci_ss_info_1131_7134_1131_2004,
 	&pci_ss_info_1131_7134_1131_4e85,
 	&pci_ss_info_1131_7134_1131_6752,
@@ -48925,7 +51613,10 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1131_7146_153b_1156,
 	NULL
 };
-#define pci_ss_list_1131_9730 NULL
+static const pciSubsystemInfo *pci_ss_list_1131_9730[] = {
+	&pci_ss_info_1131_9730_1131_0000,
+	NULL
+};
 #endif
 #define pci_ss_list_1133_7901 NULL
 #define pci_ss_list_1133_7902 NULL
@@ -49266,6 +51957,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1166_0017 NULL
 #define pci_ss_list_1166_0036 NULL
 #define pci_ss_list_1166_0101 NULL
+#define pci_ss_list_1166_0103 NULL
 #define pci_ss_list_1166_0104 NULL
 #define pci_ss_list_1166_0110 NULL
 #define pci_ss_list_1166_0130 NULL
@@ -49274,6 +51966,9 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1166_0132_1166_0132,
 	NULL
 };
+#define pci_ss_list_1166_0140 NULL
+#define pci_ss_list_1166_0141 NULL
+#define pci_ss_list_1166_0142 NULL
 #define pci_ss_list_1166_0200 NULL
 static const pciSubsystemInfo *pci_ss_list_1166_0201[] = {
 	&pci_ss_info_1166_0201_4c53_1080,
@@ -49290,6 +51985,7 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_1166_0213[] = {
+	&pci_ss_info_1166_0213_1028_4134,
 	&pci_ss_info_1166_0213_1028_c134,
 	&pci_ss_info_1166_0213_1734_1012,
 	NULL
@@ -49445,6 +52141,7 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 #define pci_ss_list_1186_1340 NULL
+#define pci_ss_list_1186_1405 NULL
 #define pci_ss_list_1186_1541 NULL
 #define pci_ss_list_1186_1561 NULL
 #define pci_ss_list_1186_2027 NULL
@@ -49463,6 +52160,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1186_3a63 NULL
 #define pci_ss_list_1186_4000 NULL
 #define pci_ss_list_1186_4300 NULL
+#define pci_ss_list_1186_4800 NULL
 #define pci_ss_list_1186_4b01 NULL
 static const pciSubsystemInfo *pci_ss_list_1186_4c00[] = {
 	&pci_ss_info_1186_4c00_1186_4c00,
@@ -49666,6 +52364,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_11ab_6081 NULL
 #define pci_ss_list_11ab_6460 NULL
 #define pci_ss_list_11ab_6480 NULL
+#define pci_ss_list_11ab_6485 NULL
 #define pci_ss_list_11ab_f003 NULL
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -49841,6 +52540,7 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 #define pci_ss_list_11c1_ed00 NULL
+#define pci_ss_list_11c1_ed01 NULL
 #endif
 #define pci_ss_list_11c8_0658 NULL
 #define pci_ss_list_11c8_d665 NULL
@@ -49955,6 +52655,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_120e_0321 NULL
 #define pci_ss_list_120e_0400 NULL
 #define pci_ss_list_120f_0001 NULL
+#define pci_ss_list_1217_00f7 NULL
 #define pci_ss_list_1217_6729 NULL
 #define pci_ss_list_1217_673a NULL
 #define pci_ss_list_1217_6832 NULL
@@ -49980,7 +52681,10 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1217_7112 NULL
 #define pci_ss_list_1217_7113 NULL
 #define pci_ss_list_1217_7114 NULL
+#define pci_ss_list_1217_7120 NULL
+#define pci_ss_list_1217_7130 NULL
 #define pci_ss_list_1217_7134 NULL
+#define pci_ss_list_1217_7135 NULL
 #define pci_ss_list_1217_71e2 NULL
 #define pci_ss_list_1217_7212 NULL
 #define pci_ss_list_1217_7213 NULL
@@ -50131,6 +52835,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1256_5201 NULL
 #define pci_ss_list_1259_2560 NULL
 #define pci_ss_list_1259_a117 NULL
+#define pci_ss_list_1259_a11e NULL
 #define pci_ss_list_1259_a120 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_125b_1400[] = {
@@ -50223,6 +52928,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1260_3890_1113_ee08,
 	&pci_ss_info_1260_3890_1186_3202,
 	&pci_ss_info_1260_3890_1259_c104,
+	&pci_ss_info_1260_3890_1260_0000,
 	&pci_ss_info_1260_3890_1385_4800,
 	&pci_ss_info_1260_3890_16a5_1605,
 	&pci_ss_info_1260_3890_17cf_0014,
@@ -50892,6 +53598,11 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1360_0204 NULL
 #define pci_ss_list_1360_0301 NULL
 #define pci_ss_list_1360_0302 NULL
+#define pci_ss_list_1360_0303 NULL
+#define pci_ss_list_136a_0004 NULL
+#define pci_ss_list_136a_0007 NULL
+#define pci_ss_list_136a_0008 NULL
+#define pci_ss_list_136a_000a NULL
 #define pci_ss_list_136b_ff01 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_1371_434e[] = {
@@ -50955,6 +53666,10 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1385_630a NULL
 #define pci_ss_list_1385_6b00 NULL
 #define pci_ss_list_1385_6d00 NULL
+#define pci_ss_list_1385_7b00 NULL
+#define pci_ss_list_1385_7c00 NULL
+#define pci_ss_list_1385_7d00 NULL
+#define pci_ss_list_1385_7e00 NULL
 #define pci_ss_list_1385_f004 NULL
 #define pci_ss_list_1389_0001 NULL
 #define pci_ss_list_1393_1040 NULL
@@ -51057,11 +53772,24 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_13f6_0211 NULL
 #endif
 #define pci_ss_list_13fe_1240 NULL
-#define pci_ss_list_13fe_1600 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_13fe_1600[] = {
+	&pci_ss_info_13fe_1600_1601_0002,
+	&pci_ss_info_13fe_1600_1602_0002,
+	&pci_ss_info_13fe_1600_1612_0004,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_13fe_16ff[] = {
+	&pci_ss_info_13fe_16ff_1601_0000,
+	&pci_ss_info_13fe_16ff_1602_0000,
+	&pci_ss_info_13fe_16ff_1612_0000,
+	NULL
+};
 #define pci_ss_list_13fe_1733 NULL
 #define pci_ss_list_13fe_1752 NULL
 #define pci_ss_list_13fe_1754 NULL
 #define pci_ss_list_13fe_1756 NULL
+#endif
 #define pci_ss_list_1400_1401 NULL
 #define pci_ss_list_1407_0100 NULL
 #define pci_ss_list_1407_0101 NULL
@@ -51122,8 +53850,13 @@ static const pciSubsystemInfo *pci_ss_li
 };
 #endif
 #define pci_ss_list_1415_8403 NULL
+#define pci_ss_list_1415_9500 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_1415_9501[] = {
+	&pci_ss_info_1415_9501_12c4_0201,
+	&pci_ss_info_1415_9501_12c4_0202,
+	&pci_ss_info_1415_9501_12c4_0203,
+	&pci_ss_info_1415_9501_12c4_0210,
 	&pci_ss_info_1415_9501_131f_2050,
 	&pci_ss_info_1415_9501_131f_2051,
 	&pci_ss_info_1415_9501_15ed_2000,
@@ -51132,12 +53865,18 @@ static const pciSubsystemInfo *pci_ss_li
 };
 #define pci_ss_list_1415_950a NULL
 #define pci_ss_list_1415_950b NULL
-#define pci_ss_list_1415_9510 NULL
+static const pciSubsystemInfo *pci_ss_list_1415_9510[] = {
+	&pci_ss_info_1415_9510_12c4_0200,
+	NULL
+};
 static const pciSubsystemInfo *pci_ss_list_1415_9511[] = {
+	&pci_ss_info_1415_9511_12c4_0211,
 	&pci_ss_info_1415_9511_15ed_2000,
 	&pci_ss_info_1415_9511_15ed_2001,
 	NULL
 };
+#define pci_ss_list_1415_9512 NULL
+#define pci_ss_list_1415_9513 NULL
 #define pci_ss_list_1415_9521 NULL
 #define pci_ss_list_1415_9523 NULL
 #endif
@@ -51147,6 +53886,13 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_142e_4020 NULL
 #define pci_ss_list_142e_4337 NULL
 #define pci_ss_list_1432_9130 NULL
+#define pci_ss_list_1435_4520 NULL
+#define pci_ss_list_1435_6020 NULL
+#define pci_ss_list_1435_6030 NULL
+#define pci_ss_list_1435_6420 NULL
+#define pci_ss_list_1435_6430 NULL
+#define pci_ss_list_1435_7520 NULL
+#define pci_ss_list_1435_7820 NULL
 #define pci_ss_list_144a_7296 NULL
 #define pci_ss_list_144a_7432 NULL
 #define pci_ss_list_144a_7433 NULL
@@ -51181,6 +53927,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1497_1497 NULL
 #define pci_ss_list_1498_0330 NULL
 #define pci_ss_list_1498_0385 NULL
+#define pci_ss_list_1498_21cc NULL
 #define pci_ss_list_1498_21cd NULL
 #define pci_ss_list_1498_30c8 NULL
 #define pci_ss_list_149d_0001 NULL
@@ -51203,8 +53950,15 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_14b9_a504 NULL
 #define pci_ss_list_14b9_a505 NULL
 #define pci_ss_list_14b9_a506 NULL
+#define pci_ss_list_14bc_d002 NULL
+#define pci_ss_list_14bc_d00f NULL
 #define pci_ss_list_14c1_0008 NULL
-#define pci_ss_list_14c1_8043 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_14c1_8043[] = {
+	&pci_ss_info_14c1_8043_103c_1240,
+	NULL
+};
+#endif
 #define pci_ss_list_14d2_8001 NULL
 #define pci_ss_list_14d2_8002 NULL
 #define pci_ss_list_14d2_8010 NULL
@@ -51245,9 +53999,12 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_14e4_080f NULL
 #define pci_ss_list_14e4_0811 NULL
 #define pci_ss_list_14e4_0816 NULL
-#define pci_ss_list_14e4_1600 NULL
-#define pci_ss_list_14e4_1601 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_14e4_1600[] = {
+	&pci_ss_info_14e4_1600_107b_5048,
+	NULL
+};
+#define pci_ss_list_14e4_1601 NULL
 static const pciSubsystemInfo *pci_ss_list_14e4_1644[] = {
 	&pci_ss_info_14e4_1644_1014_0277,
 	&pci_ss_info_14e4_1644_1028_00d1,
@@ -51317,6 +54074,10 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_14e4_1648_0e11_00cf,
 	&pci_ss_info_14e4_1648_0e11_00d0,
 	&pci_ss_info_14e4_1648_0e11_00d1,
+	&pci_ss_info_14e4_1648_10a9_8013,
+	&pci_ss_info_14e4_1648_10a9_8018,
+	&pci_ss_info_14e4_1648_10a9_801a,
+	&pci_ss_info_14e4_1648_10a9_801b,
 	&pci_ss_info_14e4_1648_10b7_2000,
 	&pci_ss_info_14e4_1648_10b7_3000,
 	&pci_ss_info_14e4_1648_1166_1648,
@@ -51324,10 +54085,15 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_14e4_164a[] = {
+	&pci_ss_info_14e4_164a_103c_3070,
 	&pci_ss_info_14e4_164a_103c_3101,
 	NULL
 };
-#define pci_ss_list_14e4_164c NULL
+static const pciSubsystemInfo *pci_ss_list_14e4_164c[] = {
+	&pci_ss_info_14e4_164c_103c_7037,
+	&pci_ss_info_14e4_164c_103c_7038,
+	NULL
+};
 #define pci_ss_list_14e4_164d NULL
 static const pciSubsystemInfo *pci_ss_list_14e4_1653[] = {
 	&pci_ss_info_14e4_1653_0e11_00e3,
@@ -51377,12 +54143,17 @@ static const pciSubsystemInfo *pci_ss_li
 };
 #define pci_ss_list_14e4_1678 NULL
 static const pciSubsystemInfo *pci_ss_list_14e4_1679[] = {
+	&pci_ss_info_14e4_1679_103c_1707,
+	&pci_ss_info_14e4_1679_103c_170c,
 	&pci_ss_info_14e4_1679_103c_703c,
 	NULL
 };
 #define pci_ss_list_14e4_167a NULL
 #define pci_ss_list_14e4_167b NULL
-#define pci_ss_list_14e4_167d NULL
+static const pciSubsystemInfo *pci_ss_list_14e4_167d[] = {
+	&pci_ss_info_14e4_167d_17aa_2081,
+	NULL
+};
 #define pci_ss_list_14e4_167e NULL
 #define pci_ss_list_14e4_1693 NULL
 static const pciSubsystemInfo *pci_ss_list_14e4_1696[] = {
@@ -51390,6 +54161,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_14e4_1696_14e4_000d,
 	NULL
 };
+#define pci_ss_list_14e4_169a NULL
 #define pci_ss_list_14e4_169b NULL
 static const pciSubsystemInfo *pci_ss_list_14e4_169c[] = {
 	&pci_ss_info_14e4_169c_103c_308b,
@@ -51413,6 +54185,8 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_14e4_16a8[] = {
+	&pci_ss_info_14e4_16a8_10a9_8014,
+	&pci_ss_info_14e4_16a8_10a9_801c,
 	&pci_ss_info_14e4_16a8_10b7_2001,
 	NULL
 };
@@ -51420,7 +54194,12 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_14e4_16aa_103c_3102,
 	NULL
 };
-#define pci_ss_list_14e4_16ac NULL
+static const pciSubsystemInfo *pci_ss_list_14e4_16ac[] = {
+	&pci_ss_info_14e4_16ac_103c_1706,
+	&pci_ss_info_14e4_16ac_103c_703b,
+	&pci_ss_info_14e4_16ac_103c_703d,
+	NULL
+};
 static const pciSubsystemInfo *pci_ss_list_14e4_16c6[] = {
 	&pci_ss_info_14e4_16c6_10b7_1100,
 	&pci_ss_info_14e4_16c6_14e4_000c,
@@ -51465,6 +54244,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_14e4_4306 NULL
 #define pci_ss_list_14e4_4307 NULL
 #define pci_ss_list_14e4_4310 NULL
+#define pci_ss_list_14e4_4311 NULL
 #define pci_ss_list_14e4_4312 NULL
 #define pci_ss_list_14e4_4313 NULL
 #define pci_ss_list_14e4_4315 NULL
@@ -51511,7 +54291,9 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 #define pci_ss_list_14e4_4326 NULL
+#define pci_ss_list_14e4_4329 NULL
 static const pciSubsystemInfo *pci_ss_list_14e4_4401[] = {
+	&pci_ss_info_14e4_4401_103c_08b0,
 	&pci_ss_info_14e4_4401_1043_80a8,
 	NULL
 };
@@ -51903,6 +54685,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_153b_1147 NULL
 #define pci_ss_list_153b_1158 NULL
 #define pci_ss_list_153f_0001 NULL
+#define pci_ss_list_1542_9260 NULL
 #define pci_ss_list_1543_3052 NULL
 #define pci_ss_list_1543_4c22 NULL
 #define pci_ss_list_1571_a001 NULL
@@ -51981,6 +54764,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_166d_0002 NULL
 #define pci_ss_list_1677_104e NULL
 #define pci_ss_list_1677_12d7 NULL
+#define pci_ss_list_1677_20ad NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_167b_2102[] = {
 	&pci_ss_info_167b_2102_187e_3406,
@@ -52010,12 +54794,15 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_168c_0013_1385_4d00,
 	&pci_ss_info_168c_0013_1458_e911,
 	&pci_ss_info_168c_0013_14b7_0a60,
+	&pci_ss_info_168c_0013_1668_1026,
 	&pci_ss_info_168c_0013_168c_0013,
 	&pci_ss_info_168c_0013_168c_1025,
 	&pci_ss_info_168c_0013_168c_1027,
+	&pci_ss_info_168c_0013_168c_1042,
 	&pci_ss_info_168c_0013_168c_2026,
 	&pci_ss_info_168c_0013_168c_2041,
 	&pci_ss_info_168c_0013_168c_2042,
+	&pci_ss_info_168c_0013_168c_2051,
 	&pci_ss_info_168c_0013_16ab_7302,
 	&pci_ss_info_168c_0013_185f_2012,
 	NULL
@@ -52027,6 +54814,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_168c_001a_1186_3a16,
 	&pci_ss_info_168c_001a_1186_3a23,
 	&pci_ss_info_168c_001a_1186_3a24,
+	&pci_ss_info_168c_001a_168c_001a,
 	&pci_ss_info_168c_001a_168c_1052,
 	NULL
 };
@@ -52038,7 +54826,10 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 #define pci_ss_list_168c_0020 NULL
-#define pci_ss_list_168c_1014 NULL
+static const pciSubsystemInfo *pci_ss_list_168c_1014[] = {
+	&pci_ss_info_168c_1014_1014_058a,
+	NULL
+};
 #endif
 #define pci_ss_list_169c_0044 NULL
 #define pci_ss_list_16ab_1100 NULL
@@ -52050,8 +54841,10 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_16ca_0001 NULL
 #define pci_ss_list_16d5_4d4e NULL
 #define pci_ss_list_16e3_1e0f NULL
+#define pci_ss_list_16e5_6000 NULL
 #define pci_ss_list_16ec_00ff NULL
 #define pci_ss_list_16ec_0116 NULL
+#define pci_ss_list_16ec_2f00 NULL
 #define pci_ss_list_16ec_3685 NULL
 #define pci_ss_list_16ed_1001 NULL
 #define pci_ss_list_16f4_8000 NULL
@@ -52120,10 +54913,20 @@ static const pciSubsystemInfo *pci_ss_li
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_17d5_5831[] = {
 	&pci_ss_info_17d5_5831_103c_12d5,
+	&pci_ss_info_17d5_5831_10a9_8020,
+	&pci_ss_info_17d5_5831_10a9_8024,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_17d5_5832[] = {
+	&pci_ss_info_17d5_5832_10a9_8021,
 	NULL
 };
-#define pci_ss_list_17d5_5832 NULL
 #endif
+#define pci_ss_list_17e4_0001 NULL
+#define pci_ss_list_17e4_0002 NULL
+#define pci_ss_list_17e6_0010 NULL
+#define pci_ss_list_17e6_0011 NULL
+#define pci_ss_list_17e6_0021 NULL
 #define pci_ss_list_17fe_2120 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_17fe_2220[] = {
@@ -52182,6 +54985,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_183b_08a7 NULL
 #define pci_ss_list_183b_08a8 NULL
 #define pci_ss_list_183b_08a9 NULL
+#define pci_ss_list_183b_08b0 NULL
 #define pci_ss_list_1864_2110 NULL
 #define pci_ss_list_1867_5a44 NULL
 #define pci_ss_list_1867_5a45 NULL
@@ -52195,6 +54999,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1888_0710 NULL
 #define pci_ss_list_1888_0720 NULL
 #define pci_ss_list_18ac_d500 NULL
+#define pci_ss_list_18ac_d800 NULL
 #define pci_ss_list_18ac_d810 NULL
 #define pci_ss_list_18ac_d820 NULL
 #define pci_ss_list_18b8_b001 NULL
@@ -52221,6 +55026,9 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 #endif
+#define pci_ss_list_18f6_1000 NULL
+#define pci_ss_list_18f6_1050 NULL
+#define pci_ss_list_18f6_2000 NULL
 #define pci_ss_list_18f7_0001 NULL
 #define pci_ss_list_18f7_0002 NULL
 #define pci_ss_list_18f7_0004 NULL
@@ -52229,9 +55037,16 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1904_8139 NULL
 #define pci_ss_list_1923_0040 NULL
 #define pci_ss_list_1923_0100 NULL
+#define pci_ss_list_1923_0300 NULL
 #define pci_ss_list_1923_0400 NULL
 #define pci_ss_list_1931_000c NULL
 #define pci_ss_list_1942_e511 NULL
+#define pci_ss_list_194a_1111 NULL
+#define pci_ss_list_194a_1112 NULL
+#define pci_ss_list_194a_1113 NULL
+#define pci_ss_list_194a_1114 NULL
+#define pci_ss_list_194a_1115 NULL
+#define pci_ss_list_1957_0012 NULL
 #define pci_ss_list_1957_0080 NULL
 #define pci_ss_list_1957_0081 NULL
 #define pci_ss_list_1957_0082 NULL
@@ -52241,6 +55056,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1957_0086 NULL
 #define pci_ss_list_1957_0087 NULL
 #define pci_ss_list_1966_1975 NULL
+#define pci_ss_list_1969_1048 NULL
 #define pci_ss_list_196a_0101 NULL
 #define pci_ss_list_196a_0102 NULL
 #define pci_ss_list_197b_2360 NULL
@@ -52252,6 +55068,11 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1989_8001 NULL
 #define pci_ss_list_19ac_0001 NULL
 #define pci_ss_list_19ae_0520 NULL
+#define pci_ss_list_19e7_1001 NULL
+#define pci_ss_list_19e7_1002 NULL
+#define pci_ss_list_19e7_1003 NULL
+#define pci_ss_list_19e7_1004 NULL
+#define pci_ss_list_19e7_1005 NULL
 #define pci_ss_list_1a03_2000 NULL
 #define pci_ss_list_1a08_0000 NULL
 #define pci_ss_list_1c1c_0001 NULL
@@ -52270,6 +55091,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_3388_0020 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_3388_0021[] = {
+	&pci_ss_info_3388_0021_1775_ce90,
 	&pci_ss_info_3388_0021_4c53_1050,
 	&pci_ss_info_3388_0021_4c53_1080,
 	&pci_ss_info_3388_0021_4c53_1090,
@@ -52392,8 +55214,11 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_4444_0016_0070_e817,
 	&pci_ss_info_4444_0016_0070_ff92,
 	&pci_ss_info_4444_0016_0270_0801,
+	&pci_ss_info_4444_0016_10fc_d038,
+	&pci_ss_info_4444_0016_10fc_d039,
 	&pci_ss_info_4444_0016_12ab_fff3,
 	&pci_ss_info_4444_0016_12ab_ffff,
+	&pci_ss_info_4444_0016_1461_c019,
 	&pci_ss_info_4444_0016_9005_0092,
 	&pci_ss_info_4444_0016_9005_0093,
 	NULL
@@ -52625,6 +55450,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_6666_0101 NULL
 #define pci_ss_list_7063_2000 NULL
 #define pci_ss_list_7063_3000 NULL
+#define pci_ss_list_7063_5500 NULL
 #define pci_ss_list_8008_0010 NULL
 #define pci_ss_list_8008_0011 NULL
 #define pci_ss_list_8086_0007 NULL
@@ -52748,8 +55574,8 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_100e_1014_0265,
 	&pci_ss_info_8086_100e_1014_0267,
 	&pci_ss_info_8086_100e_1014_026a,
-	&pci_ss_info_8086_100e_1024_0134,
 	&pci_ss_info_8086_100e_1028_002e,
+	&pci_ss_info_8086_100e_1028_0134,
 	&pci_ss_info_8086_100e_1028_0151,
 	&pci_ss_info_8086_100e_107b_8920,
 	&pci_ss_info_8086_100e_8086_001e,
@@ -52795,8 +55621,15 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_1013_8086_1113,
 	NULL
 };
-#define pci_ss_list_8086_1014 NULL
-#define pci_ss_list_8086_1015 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_1014[] = {
+	&pci_ss_info_8086_1014_8086_0014,
+	&pci_ss_info_8086_1014_8086_1014,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_1015[] = {
+	&pci_ss_info_8086_1015_8086_1015,
+	NULL
+};
 static const pciSubsystemInfo *pci_ss_list_8086_1016[] = {
 	&pci_ss_info_8086_1016_1014_052c,
 	&pci_ss_info_8086_1016_1179_0001,
@@ -52820,7 +55653,10 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_1019_8086_3427,
 	NULL
 };
-#define pci_ss_list_8086_101a NULL
+static const pciSubsystemInfo *pci_ss_list_8086_101a[] = {
+	&pci_ss_info_8086_101a_8086_101a,
+	NULL
+};
 static const pciSubsystemInfo *pci_ss_list_8086_101d[] = {
 	&pci_ss_info_8086_101d_8086_1000,
 	NULL
@@ -52836,6 +55672,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_1026_8086_1000,
 	&pci_ss_info_8086_1026_8086_1001,
 	&pci_ss_info_8086_1026_8086_1002,
+	&pci_ss_info_8086_1026_8086_1003,
 	&pci_ss_info_8086_1026_8086_1026,
 	NULL
 };
@@ -52882,13 +55719,17 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_103a NULL
 #define pci_ss_list_8086_103b NULL
 #define pci_ss_list_8086_103c NULL
-#define pci_ss_list_8086_103d NULL
+static const pciSubsystemInfo *pci_ss_list_8086_103d[] = {
+	&pci_ss_info_8086_103d_1014_0522,
+	NULL
+};
 #define pci_ss_list_8086_103e NULL
 static const pciSubsystemInfo *pci_ss_list_8086_1040[] = {
 	&pci_ss_info_8086_1040_16be_1040,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_1043[] = {
+	&pci_ss_info_8086_1043_103c_08b0,
 	&pci_ss_info_8086_1043_8086_2527,
 	NULL
 };
@@ -52897,7 +55738,11 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_1048_8086_a11f,
 	NULL
 };
+#define pci_ss_list_8086_1049 NULL
+#define pci_ss_list_8086_104a NULL
 #define pci_ss_list_8086_104b NULL
+#define pci_ss_list_8086_104c NULL
+#define pci_ss_list_8086_104d NULL
 static const pciSubsystemInfo *pci_ss_list_8086_1050[] = {
 	&pci_ss_info_8086_1050_1462_728c,
 	&pci_ss_info_8086_1050_1462_758c,
@@ -52910,12 +55755,30 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_1052 NULL
 #define pci_ss_list_8086_1053 NULL
 #define pci_ss_list_8086_1059 NULL
+#define pci_ss_list_8086_105b NULL
 static const pciSubsystemInfo *pci_ss_list_8086_105e[] = {
+	&pci_ss_info_8086_105e_103c_7044,
 	&pci_ss_info_8086_105e_1775_6003,
+	&pci_ss_info_8086_105e_8086_005e,
+	&pci_ss_info_8086_105e_8086_105e,
+	&pci_ss_info_8086_105e_8086_115e,
+	&pci_ss_info_8086_105e_8086_116e,
+	&pci_ss_info_8086_105e_8086_125e,
+	&pci_ss_info_8086_105e_8086_135e,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_105f[] = {
+	&pci_ss_info_8086_105f_8086_115f,
+	&pci_ss_info_8086_105f_8086_116f,
+	&pci_ss_info_8086_105f_8086_125f,
+	&pci_ss_info_8086_105f_8086_135f,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_1060[] = {
+	&pci_ss_info_8086_1060_8086_0060,
+	&pci_ss_info_8086_1060_8086_1060,
 	NULL
 };
-#define pci_ss_list_8086_105f NULL
-#define pci_ss_list_8086_1060 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_1064[] = {
 	&pci_ss_info_8086_1064_1043_80f8,
 	NULL
@@ -52955,6 +55818,8 @@ static const pciSubsystemInfo *pci_ss_li
 static const pciSubsystemInfo *pci_ss_list_8086_1079[] = {
 	&pci_ss_info_8086_1079_103c_12a6,
 	&pci_ss_info_8086_1079_103c_12cf,
+	&pci_ss_info_8086_1079_1775_10d0,
+	&pci_ss_info_8086_1079_1775_ce90,
 	&pci_ss_info_8086_1079_1fc1_0027,
 	&pci_ss_info_8086_1079_4c53_1090,
 	&pci_ss_info_8086_1079_4c53_10b0,
@@ -52975,9 +55840,21 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_107b_8086_107b,
 	NULL
 };
-#define pci_ss_list_8086_107c NULL
-#define pci_ss_list_8086_107d NULL
-#define pci_ss_list_8086_107e NULL
+static const pciSubsystemInfo *pci_ss_list_8086_107c[] = {
+	&pci_ss_info_8086_107c_8086_1376,
+	&pci_ss_info_8086_107c_8086_1476,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_107d[] = {
+	&pci_ss_info_8086_107d_8086_1082,
+	&pci_ss_info_8086_107d_8086_1092,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_107e[] = {
+	&pci_ss_info_8086_107e_8086_1084,
+	&pci_ss_info_8086_107e_8086_1094,
+	NULL
+};
 #define pci_ss_list_8086_107f NULL
 #define pci_ss_list_8086_1080 NULL
 #define pci_ss_list_8086_1081 NULL
@@ -52988,7 +55865,11 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_1086 NULL
 #define pci_ss_list_8086_1087 NULL
 #define pci_ss_list_8086_1089 NULL
-#define pci_ss_list_8086_108a NULL
+static const pciSubsystemInfo *pci_ss_list_8086_108a[] = {
+	&pci_ss_info_8086_108a_8086_108a,
+	&pci_ss_info_8086_108a_8086_118a,
+	NULL
+};
 #define pci_ss_list_8086_108b NULL
 #define pci_ss_list_8086_108c NULL
 #define pci_ss_list_8086_108e NULL
@@ -52997,9 +55878,14 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_1096 NULL
 #define pci_ss_list_8086_1097 NULL
 #define pci_ss_list_8086_1098 NULL
-#define pci_ss_list_8086_1099 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_1099[] = {
+	&pci_ss_info_8086_1099_8086_1099,
+	NULL
+};
 static const pciSubsystemInfo *pci_ss_list_8086_109a[] = {
+	&pci_ss_info_8086_109a_17aa_2001,
 	&pci_ss_info_8086_109a_17aa_207e,
+	&pci_ss_info_8086_109a_8086_109a,
 	NULL
 };
 #define pci_ss_list_8086_109b NULL
@@ -53011,8 +55897,17 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_10b4 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_10b5[] = {
 	&pci_ss_info_8086_10b5_103c_3109,
+	&pci_ss_info_8086_10b5_8086_1099,
+	&pci_ss_info_8086_10b5_8086_1199,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_10b9[] = {
+	&pci_ss_info_8086_10b9_8086_1083,
+	&pci_ss_info_8086_10b9_8086_1093,
 	NULL
 };
+#define pci_ss_list_8086_10ba NULL
+#define pci_ss_list_8086_10bb NULL
 #define pci_ss_list_8086_1107 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_1130[] = {
 	&pci_ss_info_8086_1130_1025_1016,
@@ -53122,6 +56017,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_1229_144d_2501,
 	&pci_ss_info_8086_1229_144d_2502,
 	&pci_ss_info_8086_1229_1668_1100,
+	&pci_ss_info_8086_1229_1775_ce90,
 	&pci_ss_info_8086_1229_4c53_1080,
 	&pci_ss_info_8086_1229_4c53_10e0,
 	&pci_ss_info_8086_1229_8086_0001,
@@ -53310,6 +56206,7 @@ static const pciSubsystemInfo *pci_ss_li
 static const pciSubsystemInfo *pci_ss_list_8086_2442[] = {
 	&pci_ss_info_8086_2442_1014_01c6,
 	&pci_ss_info_8086_2442_1025_1016,
+	&pci_ss_info_8086_2442_1028_00c7,
 	&pci_ss_info_8086_2442_1028_010e,
 	&pci_ss_info_8086_2442_1043_8027,
 	&pci_ss_info_8086_2442_104d_80df,
@@ -53321,6 +56218,7 @@ static const pciSubsystemInfo *pci_ss_li
 static const pciSubsystemInfo *pci_ss_list_8086_2443[] = {
 	&pci_ss_info_8086_2443_1014_01c6,
 	&pci_ss_info_8086_2443_1025_1016,
+	&pci_ss_info_8086_2443_1028_00c7,
 	&pci_ss_info_8086_2443_1028_010e,
 	&pci_ss_info_8086_2443_1043_8027,
 	&pci_ss_info_8086_2443_104d_80df,
@@ -53331,6 +56229,7 @@ static const pciSubsystemInfo *pci_ss_li
 };
 static const pciSubsystemInfo *pci_ss_list_8086_2444[] = {
 	&pci_ss_info_8086_2444_1025_1016,
+	&pci_ss_info_8086_2444_1028_00c7,
 	&pci_ss_info_8086_2444_1028_010e,
 	&pci_ss_info_8086_2444_1043_8027,
 	&pci_ss_info_8086_2444_104d_80df,
@@ -53398,6 +56297,7 @@ static const pciSubsystemInfo *pci_ss_li
 };
 static const pciSubsystemInfo *pci_ss_list_8086_244b[] = {
 	&pci_ss_info_8086_244b_1014_01c6,
+	&pci_ss_info_8086_244b_1028_00c7,
 	&pci_ss_info_8086_244b_1028_010e,
 	&pci_ss_info_8086_244b_1043_8027,
 	&pci_ss_info_8086_244b_147b_0507,
@@ -53492,12 +56392,14 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_24c1 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_24c2[] = {
 	&pci_ss_info_8086_24c2_1014_0267,
+	&pci_ss_info_8086_24c2_1014_052d,
 	&pci_ss_info_8086_24c2_1025_005a,
 	&pci_ss_info_8086_24c2_1028_0126,
 	&pci_ss_info_8086_24c2_1028_0163,
 	&pci_ss_info_8086_24c2_1028_0196,
 	&pci_ss_info_8086_24c2_103c_088c,
 	&pci_ss_info_8086_24c2_103c_0890,
+	&pci_ss_info_8086_24c2_103c_08b0,
 	&pci_ss_info_8086_24c2_1071_8160,
 	&pci_ss_info_8086_24c2_1462_5800,
 	&pci_ss_info_8086_24c2_1509_2990,
@@ -53509,10 +56411,12 @@ static const pciSubsystemInfo *pci_ss_li
 };
 static const pciSubsystemInfo *pci_ss_list_8086_24c3[] = {
 	&pci_ss_info_8086_24c3_1014_0267,
+	&pci_ss_info_8086_24c3_1014_052d,
 	&pci_ss_info_8086_24c3_1025_005a,
 	&pci_ss_info_8086_24c3_1028_0126,
 	&pci_ss_info_8086_24c3_103c_088c,
 	&pci_ss_info_8086_24c3_103c_0890,
+	&pci_ss_info_8086_24c3_103c_08b0,
 	&pci_ss_info_8086_24c3_1071_8160,
 	&pci_ss_info_8086_24c3_1458_24c2,
 	&pci_ss_info_8086_24c3_1462_5800,
@@ -53523,12 +56427,14 @@ static const pciSubsystemInfo *pci_ss_li
 };
 static const pciSubsystemInfo *pci_ss_list_8086_24c4[] = {
 	&pci_ss_info_8086_24c4_1014_0267,
+	&pci_ss_info_8086_24c4_1014_052d,
 	&pci_ss_info_8086_24c4_1025_005a,
 	&pci_ss_info_8086_24c4_1028_0126,
 	&pci_ss_info_8086_24c4_1028_0163,
 	&pci_ss_info_8086_24c4_1028_0196,
 	&pci_ss_info_8086_24c4_103c_088c,
 	&pci_ss_info_8086_24c4_103c_0890,
+	&pci_ss_info_8086_24c4_103c_08b0,
 	&pci_ss_info_8086_24c4_1071_8160,
 	&pci_ss_info_8086_24c4_1462_5800,
 	&pci_ss_info_8086_24c4_1509_2990,
@@ -53540,12 +56446,14 @@ static const pciSubsystemInfo *pci_ss_li
 static const pciSubsystemInfo *pci_ss_list_8086_24c5[] = {
 	&pci_ss_info_8086_24c5_0e11_00b8,
 	&pci_ss_info_8086_24c5_1014_0267,
+	&pci_ss_info_8086_24c5_1014_055f,
 	&pci_ss_info_8086_24c5_1025_005a,
 	&pci_ss_info_8086_24c5_1028_0139,
 	&pci_ss_info_8086_24c5_1028_0163,
 	&pci_ss_info_8086_24c5_1028_0196,
 	&pci_ss_info_8086_24c5_103c_088c,
 	&pci_ss_info_8086_24c5_103c_0890,
+	&pci_ss_info_8086_24c5_103c_08b0,
 	&pci_ss_info_8086_24c5_1071_8160,
 	&pci_ss_info_8086_24c5_1458_a002,
 	&pci_ss_info_8086_24c5_1462_5800,
@@ -53554,22 +56462,26 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_24c6[] = {
+	&pci_ss_info_8086_24c6_1014_0559,
 	&pci_ss_info_8086_24c6_1025_003c,
 	&pci_ss_info_8086_24c6_1025_005a,
 	&pci_ss_info_8086_24c6_1028_0196,
 	&pci_ss_info_8086_24c6_103c_088c,
 	&pci_ss_info_8086_24c6_103c_0890,
+	&pci_ss_info_8086_24c6_103c_08b0,
 	&pci_ss_info_8086_24c6_1071_8160,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_24c7[] = {
 	&pci_ss_info_8086_24c7_1014_0267,
+	&pci_ss_info_8086_24c7_1014_052d,
 	&pci_ss_info_8086_24c7_1025_005a,
 	&pci_ss_info_8086_24c7_1028_0126,
 	&pci_ss_info_8086_24c7_1028_0163,
 	&pci_ss_info_8086_24c7_1028_0196,
 	&pci_ss_info_8086_24c7_103c_088c,
 	&pci_ss_info_8086_24c7_103c_0890,
+	&pci_ss_info_8086_24c7_103c_08b0,
 	&pci_ss_info_8086_24c7_1071_8160,
 	&pci_ss_info_8086_24c7_1462_5800,
 	&pci_ss_info_8086_24c7_1509_2990,
@@ -53579,11 +56491,13 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_24ca[] = {
+	&pci_ss_info_8086_24ca_1014_052d,
 	&pci_ss_info_8086_24ca_1025_005a,
 	&pci_ss_info_8086_24ca_1028_0163,
 	&pci_ss_info_8086_24ca_1028_0196,
 	&pci_ss_info_8086_24ca_103c_088c,
 	&pci_ss_info_8086_24ca_103c_0890,
+	&pci_ss_info_8086_24ca_103c_08b0,
 	&pci_ss_info_8086_24ca_1071_8160,
 	&pci_ss_info_8086_24ca_1734_1055,
 	&pci_ss_info_8086_24ca_8086_4541,
@@ -53604,6 +56518,7 @@ static const pciSubsystemInfo *pci_ss_li
 };
 static const pciSubsystemInfo *pci_ss_list_8086_24cd[] = {
 	&pci_ss_info_8086_24cd_1014_0267,
+	&pci_ss_info_8086_24cd_1014_052e,
 	&pci_ss_info_8086_24cd_1025_005a,
 	&pci_ss_info_8086_24cd_1028_011d,
 	&pci_ss_info_8086_24cd_1028_0126,
@@ -53612,7 +56527,9 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_24cd_1028_0196,
 	&pci_ss_info_8086_24cd_103c_088c,
 	&pci_ss_info_8086_24cd_103c_0890,
+	&pci_ss_info_8086_24cd_103c_08b0,
 	&pci_ss_info_8086_24cd_1071_8160,
+	&pci_ss_info_8086_24cd_1179_ff00,
 	&pci_ss_info_8086_24cd_1462_3981,
 	&pci_ss_info_8086_24cd_1509_1968,
 	&pci_ss_info_8086_24cd_1734_1004,
@@ -53631,6 +56548,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_24d1_15d9_4580,
 	&pci_ss_info_8086_24d1_8086_3427,
 	&pci_ss_info_8086_24d1_8086_4246,
+	&pci_ss_info_8086_24d1_8086_4c43,
 	&pci_ss_info_8086_24d1_8086_524c,
 	NULL
 };
@@ -53648,6 +56566,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_24d2_1734_101c,
 	&pci_ss_info_8086_24d2_8086_3427,
 	&pci_ss_info_8086_24d2_8086_4246,
+	&pci_ss_info_8086_24d2_8086_4c43,
 	&pci_ss_info_8086_24d2_8086_524c,
 	NULL
 };
@@ -53662,6 +56581,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_24d3_1734_101c,
 	&pci_ss_info_8086_24d3_8086_3427,
 	&pci_ss_info_8086_24d3_8086_4246,
+	&pci_ss_info_8086_24d3_8086_4c43,
 	&pci_ss_info_8086_24d3_8086_524c,
 	NULL
 };
@@ -53679,6 +56599,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_24d4_1734_101c,
 	&pci_ss_info_8086_24d4_8086_3427,
 	&pci_ss_info_8086_24d4_8086_4246,
+	&pci_ss_info_8086_24d4_8086_4c43,
 	&pci_ss_info_8086_24d4_8086_524c,
 	NULL
 };
@@ -53694,6 +56615,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_24d5_8086_a000,
 	&pci_ss_info_8086_24d5_8086_e000,
 	&pci_ss_info_8086_24d5_8086_e001,
+	&pci_ss_info_8086_24d5_8086_e002,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_24d6[] = {
@@ -53713,6 +56635,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_24d7_1734_101c,
 	&pci_ss_info_8086_24d7_8086_3427,
 	&pci_ss_info_8086_24d7_8086_4246,
+	&pci_ss_info_8086_24d7_8086_4c43,
 	&pci_ss_info_8086_24d7_8086_524c,
 	NULL
 };
@@ -53731,6 +56654,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_24db_8086_24db,
 	&pci_ss_info_8086_24db_8086_3427,
 	&pci_ss_info_8086_24db_8086_4246,
+	&pci_ss_info_8086_24db_8086_4c43,
 	&pci_ss_info_8086_24db_8086_524c,
 	NULL
 };
@@ -53747,6 +56671,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_24dd_1462_7280,
 	&pci_ss_info_8086_24dd_8086_3427,
 	&pci_ss_info_8086_24dd_8086_4246,
+	&pci_ss_info_8086_24dd_8086_4c43,
 	&pci_ss_info_8086_24dd_8086_524c,
 	NULL
 };
@@ -53760,6 +56685,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_24de_1734_101c,
 	&pci_ss_info_8086_24de_8086_3427,
 	&pci_ss_info_8086_24de_8086_4246,
+	&pci_ss_info_8086_24de_8086_4c43,
 	&pci_ss_info_8086_24de_8086_524c,
 	NULL
 };
@@ -53778,6 +56704,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_2520 NULL
 #define pci_ss_list_8086_2521 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_2530[] = {
+	&pci_ss_info_8086_2530_1028_00c7,
 	&pci_ss_info_8086_2530_147b_0507,
 	NULL
 };
@@ -53840,6 +56767,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_2572_103c_12bc,
 	&pci_ss_info_8086_2572_1043_80a5,
 	&pci_ss_info_8086_2572_8086_4246,
+	&pci_ss_info_8086_2572_8086_4c43,
 	NULL
 };
 #define pci_ss_list_8086_2573 NULL
@@ -53888,51 +56816,66 @@ static const pciSubsystemInfo *pci_ss_li
 };
 #define pci_ss_list_8086_25a1 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_25a2[] = {
+	&pci_ss_info_8086_25a2_1775_10d0,
+	&pci_ss_info_8086_25a2_1775_ce90,
 	&pci_ss_info_8086_25a2_4c53_10b0,
 	&pci_ss_info_8086_25a2_4c53_10e0,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_25a3[] = {
+	&pci_ss_info_8086_25a3_1775_ce90,
 	&pci_ss_info_8086_25a3_4c53_10b0,
 	&pci_ss_info_8086_25a3_4c53_10d0,
 	&pci_ss_info_8086_25a3_4c53_10e0,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_25a4[] = {
+	&pci_ss_info_8086_25a4_1775_10d0,
+	&pci_ss_info_8086_25a4_1775_ce90,
 	&pci_ss_info_8086_25a4_4c53_10b0,
 	&pci_ss_info_8086_25a4_4c53_10d0,
 	&pci_ss_info_8086_25a4_4c53_10e0,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_25a6[] = {
+	&pci_ss_info_8086_25a6_1775_ce90,
 	&pci_ss_info_8086_25a6_4c53_10b0,
 	NULL
 };
 #define pci_ss_list_8086_25a7 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_25a9[] = {
+	&pci_ss_info_8086_25a9_1775_10d0,
+	&pci_ss_info_8086_25a9_1775_ce90,
 	&pci_ss_info_8086_25a9_4c53_10b0,
 	&pci_ss_info_8086_25a9_4c53_10d0,
 	&pci_ss_info_8086_25a9_4c53_10e0,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_25aa[] = {
+	&pci_ss_info_8086_25aa_1775_ce90,
 	&pci_ss_info_8086_25aa_4c53_10b0,
 	&pci_ss_info_8086_25aa_4c53_10e0,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_25ab[] = {
+	&pci_ss_info_8086_25ab_1775_10d0,
+	&pci_ss_info_8086_25ab_1775_ce90,
 	&pci_ss_info_8086_25ab_4c53_10b0,
 	&pci_ss_info_8086_25ab_4c53_10d0,
 	&pci_ss_info_8086_25ab_4c53_10e0,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_25ac[] = {
+	&pci_ss_info_8086_25ac_1775_10d0,
+	&pci_ss_info_8086_25ac_1775_ce90,
 	&pci_ss_info_8086_25ac_4c53_10b0,
 	&pci_ss_info_8086_25ac_4c53_10d0,
 	&pci_ss_info_8086_25ac_4c53_10e0,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_25ad[] = {
+	&pci_ss_info_8086_25ad_1775_10d0,
+	&pci_ss_info_8086_25ad_1775_ce90,
 	&pci_ss_info_8086_25ad_4c53_10b0,
 	&pci_ss_info_8086_25ad_4c53_10d0,
 	&pci_ss_info_8086_25ad_4c53_10e0,
@@ -53954,7 +56897,6 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_25e5 NULL
 #define pci_ss_list_8086_25e6 NULL
 #define pci_ss_list_8086_25e7 NULL
-#define pci_ss_list_8086_25e8 NULL
 #define pci_ss_list_8086_25f0 NULL
 #define pci_ss_list_8086_25f1 NULL
 #define pci_ss_list_8086_25f3 NULL
@@ -54063,6 +57005,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_265c_1458_5006,
 	&pci_ss_info_8086_265c_1462_7028,
 	&pci_ss_info_8086_265c_1734_105c,
+	&pci_ss_info_8086_265c_8086_265c,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_2660[] = {
@@ -54073,6 +57016,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_2664 NULL
 #define pci_ss_list_8086_2666 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_2668[] = {
+	&pci_ss_info_8086_2668_103c_2a09,
 	&pci_ss_info_8086_2668_1043_814e,
 	NULL
 };
@@ -54131,6 +57075,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_269b NULL
 #define pci_ss_list_8086_269e NULL
 static const pciSubsystemInfo *pci_ss_list_8086_2770[] = {
+	&pci_ss_info_8086_2770_107b_5048,
 	&pci_ss_info_8086_2770_8086_544e,
 	NULL
 };
@@ -54157,43 +57102,69 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_2792_1043_1881,
 	NULL
 };
-#define pci_ss_list_8086_27a0 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_27a0[] = {
+	&pci_ss_info_8086_27a0_17aa_2017,
+	NULL
+};
 #define pci_ss_list_8086_27a1 NULL
-#define pci_ss_list_8086_27a2 NULL
-#define pci_ss_list_8086_27a6 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_27a2[] = {
+	&pci_ss_info_8086_27a2_17aa_201a,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_27a6[] = {
+	&pci_ss_info_8086_27a6_17aa_201a,
+	NULL
+};
 #define pci_ss_list_8086_27b0 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_27b8[] = {
+	&pci_ss_info_8086_27b8_107b_5048,
 	&pci_ss_info_8086_27b8_8086_544e,
 	NULL
 };
-#define pci_ss_list_8086_27b9 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_27b9[] = {
+	&pci_ss_info_8086_27b9_17aa_2009,
+	NULL
+};
 #define pci_ss_list_8086_27bd NULL
 static const pciSubsystemInfo *pci_ss_list_8086_27c0[] = {
+	&pci_ss_info_8086_27c0_107b_5048,
 	&pci_ss_info_8086_27c0_8086_544e,
 	NULL
 };
 #define pci_ss_list_8086_27c1 NULL
 #define pci_ss_list_8086_27c3 NULL
 #define pci_ss_list_8086_27c4 NULL
-#define pci_ss_list_8086_27c5 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_27c5[] = {
+	&pci_ss_info_8086_27c5_17aa_200d,
+	NULL
+};
 #define pci_ss_list_8086_27c6 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_27c8[] = {
+	&pci_ss_info_8086_27c8_107b_5048,
+	&pci_ss_info_8086_27c8_17aa_200a,
 	&pci_ss_info_8086_27c8_8086_544e,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_27c9[] = {
+	&pci_ss_info_8086_27c9_107b_5048,
+	&pci_ss_info_8086_27c9_17aa_200a,
 	&pci_ss_info_8086_27c9_8086_544e,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_27ca[] = {
+	&pci_ss_info_8086_27ca_107b_5048,
+	&pci_ss_info_8086_27ca_17aa_200a,
 	&pci_ss_info_8086_27ca_8086_544e,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_27cb[] = {
+	&pci_ss_info_8086_27cb_107b_5048,
+	&pci_ss_info_8086_27cb_17aa_200a,
 	&pci_ss_info_8086_27cb_8086_544e,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_27cc[] = {
+	&pci_ss_info_8086_27cc_17aa_200b,
 	&pci_ss_info_8086_27cc_8086_544e,
 	NULL
 };
@@ -54201,8 +57172,14 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_27d2 NULL
 #define pci_ss_list_8086_27d4 NULL
 #define pci_ss_list_8086_27d6 NULL
-#define pci_ss_list_8086_27d8 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_27d8[] = {
+	&pci_ss_info_8086_27d8_107b_5048,
+	&pci_ss_info_8086_27d8_152d_0753,
+	&pci_ss_info_8086_27d8_17aa_2010,
+	NULL
+};
 static const pciSubsystemInfo *pci_ss_list_8086_27da[] = {
+	&pci_ss_info_8086_27da_17aa_200f,
 	&pci_ss_info_8086_27da_8086_544e,
 	NULL
 };
@@ -54213,6 +57190,8 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_27dd NULL
 #define pci_ss_list_8086_27de NULL
 static const pciSubsystemInfo *pci_ss_list_8086_27df[] = {
+	&pci_ss_info_8086_27df_107b_5048,
+	&pci_ss_info_8086_27df_17aa_200c,
 	&pci_ss_info_8086_27df_8086_544e,
 	NULL
 };
@@ -54253,8 +57232,12 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_2972 NULL
 #define pci_ss_list_8086_2973 NULL
 #define pci_ss_list_8086_2974 NULL
+#define pci_ss_list_8086_2975 NULL
 #define pci_ss_list_8086_2976 NULL
 #define pci_ss_list_8086_2977 NULL
+#define pci_ss_list_8086_2980 NULL
+#define pci_ss_list_8086_2981 NULL
+#define pci_ss_list_8086_2982 NULL
 #define pci_ss_list_8086_2990 NULL
 #define pci_ss_list_8086_2991 NULL
 #define pci_ss_list_8086_2992 NULL
@@ -54275,12 +57258,17 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_2a01 NULL
 #define pci_ss_list_8086_2a02 NULL
 #define pci_ss_list_8086_2a03 NULL
+#define pci_ss_list_8086_2a04 NULL
+#define pci_ss_list_8086_2a05 NULL
+#define pci_ss_list_8086_2a06 NULL
+#define pci_ss_list_8086_2a07 NULL
 #define pci_ss_list_8086_3092 NULL
 #define pci_ss_list_8086_3200 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_3340[] = {
 	&pci_ss_info_8086_3340_1025_005a,
 	&pci_ss_info_8086_3340_103c_088c,
 	&pci_ss_info_8086_3340_103c_0890,
+	&pci_ss_info_8086_3340_103c_08b0,
 	NULL
 };
 #define pci_ss_list_8086_3341 NULL
@@ -54309,10 +57297,13 @@ static const pciSubsystemInfo *pci_ss_li
 };
 #define pci_ss_list_8086_3578 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_3580[] = {
+	&pci_ss_info_8086_3580_1014_055c,
 	&pci_ss_info_8086_3580_1028_0139,
 	&pci_ss_info_8086_3580_1028_0163,
 	&pci_ss_info_8086_3580_1028_0196,
 	&pci_ss_info_8086_3580_1734_1055,
+	&pci_ss_info_8086_3580_1775_10d0,
+	&pci_ss_info_8086_3580_1775_ce90,
 	&pci_ss_info_8086_3580_4c53_10b0,
 	&pci_ss_info_8086_3580_4c53_10e0,
 	NULL
@@ -54322,26 +57313,35 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_3582[] = {
+	&pci_ss_info_8086_3582_1014_0562,
 	&pci_ss_info_8086_3582_1028_0139,
 	&pci_ss_info_8086_3582_1028_0163,
+	&pci_ss_info_8086_3582_1775_10d0,
+	&pci_ss_info_8086_3582_1775_ce90,
 	&pci_ss_info_8086_3582_4c53_10b0,
 	&pci_ss_info_8086_3582_4c53_10e0,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_3584[] = {
+	&pci_ss_info_8086_3584_1014_055d,
 	&pci_ss_info_8086_3584_1028_0139,
 	&pci_ss_info_8086_3584_1028_0163,
 	&pci_ss_info_8086_3584_1028_0196,
 	&pci_ss_info_8086_3584_1734_1055,
+	&pci_ss_info_8086_3584_1775_10d0,
+	&pci_ss_info_8086_3584_1775_ce90,
 	&pci_ss_info_8086_3584_4c53_10b0,
 	&pci_ss_info_8086_3584_4c53_10e0,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_3585[] = {
+	&pci_ss_info_8086_3585_1014_055e,
 	&pci_ss_info_8086_3585_1028_0139,
 	&pci_ss_info_8086_3585_1028_0163,
 	&pci_ss_info_8086_3585_1028_0196,
 	&pci_ss_info_8086_3585_1734_1055,
+	&pci_ss_info_8086_3585_1775_10d0,
+	&pci_ss_info_8086_3585_1775_ce90,
 	&pci_ss_info_8086_3585_4c53_10b0,
 	&pci_ss_info_8086_3585_4c53_10e0,
 	NULL
@@ -54374,6 +57374,12 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_359e_1028_0169,
 	NULL
 };
+#define pci_ss_list_8086_35b0 NULL
+#define pci_ss_list_8086_35b1 NULL
+#define pci_ss_list_8086_35b5 NULL
+#define pci_ss_list_8086_35b6 NULL
+#define pci_ss_list_8086_35b7 NULL
+#define pci_ss_list_8086_35c8 NULL
 #define pci_ss_list_8086_4220 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_4222[] = {
 	&pci_ss_info_8086_4222_8086_1005,
@@ -54391,6 +57397,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_4227_8086_1014,
 	NULL
 };
+#define pci_ss_list_8086_5001 NULL
 #define pci_ss_list_8086_5200 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_5201[] = {
 	&pci_ss_info_8086_5201_8086_0001,
@@ -54528,12 +57535,15 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_b152 NULL
 #define pci_ss_list_8086_b154 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_b555[] = {
+	&pci_ss_info_8086_b555_12c7_5005,
+	&pci_ss_info_8086_b555_12c7_5006,
 	&pci_ss_info_8086_b555_12d9_000a,
 	&pci_ss_info_8086_b555_4c53_1050,
 	&pci_ss_info_8086_b555_4c53_1051,
 	&pci_ss_info_8086_b555_e4bf_1000,
 	NULL
 };
+#define pci_ss_list_8686_1010 NULL
 #define pci_ss_list_8800_2008 NULL
 #define pci_ss_list_8c4a_1980 NULL
 #define pci_ss_list_8e2e_3000 NULL
@@ -54787,9 +57797,13 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_9005_0285_9005_0298,
 	&pci_ss_info_9005_0285_9005_0299,
 	&pci_ss_info_9005_0285_9005_029a,
+	&pci_ss_info_9005_0285_9005_02b5,
+	&pci_ss_info_9005_0285_9005_02b6,
+	&pci_ss_info_9005_0285_9005_02b7,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_9005_0286[] = {
+	&pci_ss_info_9005_0286_1014_034d,
 	&pci_ss_info_9005_0286_1014_9540,
 	&pci_ss_info_9005_0286_1014_9580,
 	&pci_ss_info_9005_0286_9005_028c,
@@ -54810,9 +57824,37 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_9005_0286_9005_02a8,
 	&pci_ss_info_9005_0286_9005_02a9,
 	&pci_ss_info_9005_0286_9005_02aa,
+	&pci_ss_info_9005_0286_9005_02ac,
+	&pci_ss_info_9005_0286_9005_02b3,
+	&pci_ss_info_9005_0286_9005_02b4,
 	&pci_ss_info_9005_0286_9005_0800,
 	NULL
 };
+static const pciSubsystemInfo *pci_ss_list_9005_0410[] = {
+	&pci_ss_info_9005_0410_9005_0410,
+	&pci_ss_info_9005_0410_9005_0411,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_9005_0412[] = {
+	&pci_ss_info_9005_0412_9005_0412,
+	&pci_ss_info_9005_0412_9005_0413,
+	NULL
+};
+#define pci_ss_list_9005_041e NULL
+static const pciSubsystemInfo *pci_ss_list_9005_041f[] = {
+	&pci_ss_info_9005_041f_9005_041f,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_9005_0430[] = {
+	&pci_ss_info_9005_0430_9005_0430,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_9005_0432[] = {
+	&pci_ss_info_9005_0432_9005_0432,
+	NULL
+};
+#define pci_ss_list_9005_043e NULL
+#define pci_ss_list_9005_043f NULL
 static const pciSubsystemInfo *pci_ss_list_9005_0500[] = {
 	&pci_ss_info_9005_0500_1014_02c1,
 	&pci_ss_info_9005_0500_1014_02c2,
@@ -54891,6 +57933,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_9902_0003 NULL
 #define pci_ss_list_a727_0013 NULL
 #define pci_ss_list_aecb_6250 NULL
+#define pci_ss_list_affe_02e1 NULL
 #define pci_ss_list_affe_dead NULL
 #define pci_ss_list_cafe_0003 NULL
 #define pci_ss_list_cddd_0101 NULL
@@ -55047,8 +58090,10 @@ static const pciSubsystemInfo *pci_ss_li
 #endif
 #define pci_ss_list_0432 NULL
 #define pci_ss_list_045e NULL
+#define pci_ss_list_0482 NULL
 #define pci_ss_list_04cf NULL
 #define pci_ss_list_050d NULL
+#define pci_ss_list_05a9 NULL
 #define pci_ss_list_05e3 NULL
 #define pci_ss_list_066f NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -55068,10 +58113,12 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 #endif
+#define pci_ss_list_093a NULL
 #define pci_ss_list_09c1 NULL
 #define pci_ss_list_0a89 NULL
 #define pci_ss_list_0b0b NULL
 #define pci_ss_list_0b49 NULL
+#define pci_ss_list_0ccd NULL
 static const pciSubsystemInfo *pci_ss_list_0e11[] = {
 	&pci_ss_info_0e11_0012,
 	&pci_ss_info_0e11_001e,
@@ -55172,6 +58219,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_0e11_b126,
 	&pci_ss_info_0e11_b134,
 	&pci_ss_info_0e11_b13c,
+	&pci_ss_info_0e11_b143,
 	&pci_ss_info_0e11_b144,
 	&pci_ss_info_0e11_b14d,
 	&pci_ss_info_0e11_b15a,
@@ -55192,6 +58240,7 @@ static const pciSubsystemInfo *pci_ss_li
 };
 #define pci_ss_list_0e21 NULL
 #define pci_ss_list_0e55 NULL
+#define pci_ss_list_0eac NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_1000[] = {
 	&pci_ss_info_1000_0001,
@@ -55212,8 +58261,17 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1000_0531,
 	&pci_ss_info_1000_0532,
 	&pci_ss_info_1000_1000,
+	&pci_ss_info_1000_1001,
+	&pci_ss_info_1000_1002,
+	&pci_ss_info_1000_1003,
+	&pci_ss_info_1000_1004,
+	&pci_ss_info_1000_1005,
+	&pci_ss_info_1000_100c,
+	&pci_ss_info_1000_100d,
 	&pci_ss_info_1000_1010,
 	&pci_ss_info_1000_1020,
+	&pci_ss_info_1000_2004,
+	&pci_ss_info_1000_2005,
 	&pci_ss_info_1000_3004,
 	&pci_ss_info_1000_3008,
 	&pci_ss_info_1000_4523,
@@ -55464,6 +58522,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1014_02ed,
 	&pci_ss_info_1014_02f2,
 	&pci_ss_info_1014_030d,
+	&pci_ss_info_1014_034d,
 	&pci_ss_info_1014_0502,
 	&pci_ss_info_1014_0503,
 	&pci_ss_info_1014_0506,
@@ -55476,8 +58535,11 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1014_0517,
 	&pci_ss_info_1014_051a,
 	&pci_ss_info_1014_051c,
+	&pci_ss_info_1014_0522,
 	&pci_ss_info_1014_0528,
 	&pci_ss_info_1014_052c,
+	&pci_ss_info_1014_052d,
+	&pci_ss_info_1014_052e,
 	&pci_ss_info_1014_0535,
 	&pci_ss_info_1014_053a,
 	&pci_ss_info_1014_053b,
@@ -55488,6 +58550,13 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1014_0545,
 	&pci_ss_info_1014_0549,
 	&pci_ss_info_1014_0556,
+	&pci_ss_info_1014_0559,
+	&pci_ss_info_1014_055c,
+	&pci_ss_info_1014_055d,
+	&pci_ss_info_1014_055e,
+	&pci_ss_info_1014_055f,
+	&pci_ss_info_1014_0562,
+	&pci_ss_info_1014_058a,
 	&pci_ss_info_1014_0598,
 	&pci_ss_info_1014_1010,
 	&pci_ss_info_1014_1025,
@@ -55579,12 +58648,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1023_9880,
 	NULL
 };
-#ifdef VENDOR_INCLUDE_NONVIDEO
-static const pciSubsystemInfo *pci_ss_list_1024[] = {
-	&pci_ss_info_1024_0134,
-	NULL
-};
-#endif
+#define pci_ss_list_1024 NULL
 static const pciSubsystemInfo *pci_ss_list_1025[] = {
 	&pci_ss_info_1025_000e,
 	&pci_ss_info_1025_0018,
@@ -55599,6 +58663,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1025_1003,
 	&pci_ss_info_1025_1007,
 	&pci_ss_info_1025_1016,
+	&pci_ss_info_1025_1605,
 	&pci_ss_info_1025_8013,
 	&pci_ss_info_1025_8920,
 	&pci_ss_info_1025_8921,
@@ -55640,6 +58705,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1028_00b1,
 	&pci_ss_info_1028_00bb,
 	&pci_ss_info_1028_00c5,
+	&pci_ss_info_1028_00c7,
 	&pci_ss_info_1028_00ce,
 	&pci_ss_info_1028_00d1,
 	&pci_ss_info_1028_00d9,
@@ -55695,6 +58761,10 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1028_1010,
 	&pci_ss_info_1028_1079,
 	&pci_ss_info_1028_1111,
+	&pci_ss_info_1028_1f0a,
+	&pci_ss_info_1028_1f0b,
+	&pci_ss_info_1028_1f0c,
+	&pci_ss_info_1028_1f0d,
 	&pci_ss_info_1028_4082,
 	&pci_ss_info_1028_4134,
 	&pci_ss_info_1028_8082,
@@ -55864,6 +58934,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1033_80e5,
 	&pci_ss_info_1033_8110,
 	&pci_ss_info_1033_8112,
+	&pci_ss_info_1033_8287,
 	NULL
 };
 #define pci_ss_list_1034 NULL
@@ -55891,10 +58962,12 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_103c_000d,
 	&pci_ss_info_103c_0024,
 	&pci_ss_info_103c_006a,
+	&pci_ss_info_103c_0131,
 	&pci_ss_info_103c_03a2,
 	&pci_ss_info_103c_0850,
 	&pci_ss_info_103c_088c,
 	&pci_ss_info_103c_0890,
+	&pci_ss_info_103c_08b0,
 	&pci_ss_info_103c_0944,
 	&pci_ss_info_103c_099c,
 	&pci_ss_info_103c_1040,
@@ -55928,40 +59001,61 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_103c_1223,
 	&pci_ss_info_103c_1226,
 	&pci_ss_info_103c_1227,
+	&pci_ss_info_103c_1240,
+	&pci_ss_info_103c_125a,
 	&pci_ss_info_103c_1279,
 	&pci_ss_info_103c_1282,
 	&pci_ss_info_103c_128a,
 	&pci_ss_info_103c_128b,
+	&pci_ss_info_103c_1292,
 	&pci_ss_info_103c_12a4,
 	&pci_ss_info_103c_12a6,
 	&pci_ss_info_103c_12a8,
+	&pci_ss_info_103c_12ba,
 	&pci_ss_info_103c_12bc,
 	&pci_ss_info_103c_12c1,
 	&pci_ss_info_103c_12c3,
+	&pci_ss_info_103c_12c5,
 	&pci_ss_info_103c_12ca,
 	&pci_ss_info_103c_12cf,
 	&pci_ss_info_103c_12d5,
+	&pci_ss_info_103c_12d7,
+	&pci_ss_info_103c_12dd,
 	&pci_ss_info_103c_12f4,
 	&pci_ss_info_103c_12fa,
 	&pci_ss_info_103c_1300,
 	&pci_ss_info_103c_1301,
+	&pci_ss_info_103c_1330,
+	&pci_ss_info_103c_1340,
 	&pci_ss_info_103c_1356,
+	&pci_ss_info_103c_1706,
+	&pci_ss_info_103c_1707,
+	&pci_ss_info_103c_170c,
+	&pci_ss_info_103c_2a09,
 	&pci_ss_info_103c_2a0d,
 	&pci_ss_info_103c_3006,
+	&pci_ss_info_103c_3070,
 	&pci_ss_info_103c_308a,
 	&pci_ss_info_103c_308b,
+	&pci_ss_info_103c_309f,
 	&pci_ss_info_103c_3100,
 	&pci_ss_info_103c_3101,
 	&pci_ss_info_103c_3102,
 	&pci_ss_info_103c_3103,
 	&pci_ss_info_103c_3109,
+	&pci_ss_info_103c_3225,
 	&pci_ss_info_103c_3226,
 	&pci_ss_info_103c_3227,
 	&pci_ss_info_103c_60e7,
 	&pci_ss_info_103c_7031,
 	&pci_ss_info_103c_7032,
+	&pci_ss_info_103c_7037,
+	&pci_ss_info_103c_7038,
 	&pci_ss_info_103c_7039,
+	&pci_ss_info_103c_703b,
 	&pci_ss_info_103c_703c,
+	&pci_ss_info_103c_703d,
+	&pci_ss_info_103c_7044,
 	&pci_ss_info_103c_def1,
 	NULL
 };
@@ -55984,6 +59078,8 @@ static const pciSubsystemInfo *pci_ss_li
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_1043[] = {
 	&pci_ss_info_1043_002a,
+	&pci_ss_info_1043_010c,
+	&pci_ss_info_1043_010d,
 	&pci_ss_info_1043_0120,
 	&pci_ss_info_1043_0127,
 	&pci_ss_info_1043_0200,
@@ -56019,6 +59115,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1043_405f,
 	&pci_ss_info_1043_4823,
 	&pci_ss_info_1043_4840,
+	&pci_ss_info_1043_4842,
 	&pci_ss_info_1043_4843,
 	&pci_ss_info_1043_4845,
 	&pci_ss_info_1043_4862,
@@ -56036,6 +59133,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1043_8044,
 	&pci_ss_info_1043_8052,
 	&pci_ss_info_1043_8053,
+	&pci_ss_info_1043_8063,
 	&pci_ss_info_1043_8064,
 	&pci_ss_info_1043_806f,
 	&pci_ss_info_1043_8077,
@@ -56190,7 +59288,10 @@ static const pciSubsystemInfo *pci_ss_li
 };
 #endif
 #define pci_ss_list_1049 NULL
-#define pci_ss_list_104a NULL
+static const pciSubsystemInfo *pci_ss_list_104a[] = {
+	&pci_ss_info_104a_0500,
+	NULL
+};
 #define pci_ss_list_104b NULL
 static const pciSubsystemInfo *pci_ss_list_104c[] = {
 	&pci_ss_info_104c_9066,
@@ -56237,6 +59338,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1053 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_1054[] = {
+	&pci_ss_info_1054_3016,
 	&pci_ss_info_1054_7018,
 	NULL
 };
@@ -56394,9 +59496,12 @@ static const pciSubsystemInfo *pci_ss_li
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_107b[] = {
 	&pci_ss_info_107b_0300,
+	&pci_ss_info_107b_1040,
 	&pci_ss_info_107b_3015,
 	&pci_ss_info_107b_4009,
+	&pci_ss_info_107b_5048,
 	&pci_ss_info_107b_5350,
+	&pci_ss_info_107b_6400,
 	&pci_ss_info_107b_8030,
 	&pci_ss_info_107b_8054,
 	&pci_ss_info_107b_8920,
@@ -56598,6 +59703,15 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_10a9_8010,
 	&pci_ss_info_10a9_8011,
 	&pci_ss_info_10a9_8012,
+	&pci_ss_info_10a9_8013,
+	&pci_ss_info_10a9_8014,
+	&pci_ss_info_10a9_8018,
+	&pci_ss_info_10a9_801a,
+	&pci_ss_info_10a9_801b,
+	&pci_ss_info_10a9_801c,
+	&pci_ss_info_10a9_8020,
+	&pci_ss_info_10a9_8021,
+	&pci_ss_info_10a9_8024,
 	NULL
 };
 #endif
@@ -56646,6 +59760,7 @@ static const pciSubsystemInfo *pci_ss_li
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_10b5[] = {
 	&pci_ss_info_10b5_1067,
+	&pci_ss_info_10b5_1123,
 	&pci_ss_info_10b5_1172,
 	&pci_ss_info_10b5_2036,
 	&pci_ss_info_10b5_2221,
@@ -56718,6 +59833,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_10b7_7000,
 	&pci_ss_info_10b7_9004,
 	&pci_ss_info_10b7_9005,
+	&pci_ss_info_10b7_9054,
 	&pci_ss_info_10b7_9055,
 	&pci_ss_info_10b7_9800,
 	&pci_ss_info_10b7_9805,
@@ -56856,11 +59972,13 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_10de_000f,
 	&pci_ss_info_10de_001e,
 	&pci_ss_info_10de_0020,
+	&pci_ss_info_10de_002e,
 	&pci_ss_info_10de_006b,
 	&pci_ss_info_10de_0091,
 	&pci_ss_info_10de_00a1,
 	&pci_ss_info_10de_0179,
 	&pci_ss_info_10de_01dc,
+	&pci_ss_info_10de_029b,
 	&pci_ss_info_10de_0c11,
 	NULL
 };
@@ -56934,6 +60052,8 @@ static const pciSubsystemInfo *pci_ss_li
 static const pciSubsystemInfo *pci_ss_list_10fc[] = {
 	&pci_ss_info_10fc_d003,
 	&pci_ss_info_10fc_d035,
+	&pci_ss_info_10fc_d038,
+	&pci_ss_info_10fc_d039,
 	NULL
 };
 #endif
@@ -56966,6 +60086,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1102_0058,
 	&pci_ss_info_1102_1001,
 	&pci_ss_info_1102_1002,
+	&pci_ss_info_1102_1003,
 	&pci_ss_info_1102_1006,
 	&pci_ss_info_1102_1007,
 	&pci_ss_info_1102_100a,
@@ -57157,6 +60278,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1130 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_1131[] = {
+	&pci_ss_info_1131_0000,
 	&pci_ss_info_1131_2001,
 	&pci_ss_info_1131_2004,
 	&pci_ss_info_1131_2005,
@@ -57462,7 +60584,12 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1192 NULL
 #define pci_ss_list_1193 NULL
 #define pci_ss_list_1194 NULL
-#define pci_ss_list_1195 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_1195[] = {
+	&pci_ss_info_1195_1320,
+	NULL
+};
+#endif
 #define pci_ss_list_1196 NULL
 #define pci_ss_list_1197 NULL
 #define pci_ss_list_1198 NULL
@@ -57852,6 +60979,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1259_2701,
 	&pci_ss_info_1259_2702,
 	&pci_ss_info_1259_2703,
+	&pci_ss_info_1259_2704,
 	&pci_ss_info_1259_2800,
 	&pci_ss_info_1259_2970,
 	&pci_ss_info_1259_2971,
@@ -58110,12 +61238,24 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_12c1 NULL
 #define pci_ss_list_12c2 NULL
 #define pci_ss_list_12c3 NULL
-#define pci_ss_list_12c4 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_12c4[] = {
+	&pci_ss_info_12c4_0200,
+	&pci_ss_info_12c4_0201,
+	&pci_ss_info_12c4_0202,
+	&pci_ss_info_12c4_0203,
+	&pci_ss_info_12c4_0210,
+	&pci_ss_info_12c4_0211,
+	NULL
+};
+#endif
 #define pci_ss_list_12c5 NULL
 #define pci_ss_list_12c6 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_12c7[] = {
 	&pci_ss_info_12c7_4001,
+	&pci_ss_info_12c7_5005,
+	&pci_ss_info_12c7_5006,
 	NULL
 };
 #endif
@@ -59004,6 +62144,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1461_a3cf,
 	&pci_ss_info_1461_a70a,
 	&pci_ss_info_1461_a70b,
+	&pci_ss_info_1461_c019,
 	&pci_ss_info_1461_d6ee,
 	&pci_ss_info_1461_f31f,
 	NULL
@@ -59013,11 +62154,13 @@ static const pciSubsystemInfo *pci_ss_li
 static const pciSubsystemInfo *pci_ss_list_1462[] = {
 	&pci_ss_info_1462_0080,
 	&pci_ss_info_1462_0311,
+	&pci_ss_info_1462_0345,
 	&pci_ss_info_1462_0400,
 	&pci_ss_info_1462_0402,
 	&pci_ss_info_1462_0403,
 	&pci_ss_info_1462_052c,
 	&pci_ss_info_1462_058c,
+	&pci_ss_info_1462_0622,
 	&pci_ss_info_1462_1009,
 	&pci_ss_info_1462_207d,
 	&pci_ss_info_1462_3091,
@@ -59054,6 +62197,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1462_702c,
 	&pci_ss_info_1462_702d,
 	&pci_ss_info_1462_702e,
+	&pci_ss_info_1462_7030,
 	&pci_ss_info_1462_7100,
 	&pci_ss_info_1462_7207,
 	&pci_ss_info_1462_7280,
@@ -59215,6 +62359,9 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1497 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_1498[] = {
+	&pci_ss_info_1498_000a,
+	&pci_ss_info_1498_000b,
+	&pci_ss_info_1498_000c,
 	&pci_ss_info_1498_0362,
 	NULL
 };
@@ -59518,7 +62665,13 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1514 NULL
 #define pci_ss_list_1515 NULL
 #define pci_ss_list_1516 NULL
-#define pci_ss_list_1517 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_1517[] = {
+	&pci_ss_info_1517_000b,
+	&pci_ss_info_1517_000f,
+	NULL
+};
+#endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_1518[] = {
 	&pci_ss_info_1518_0200,
@@ -59576,6 +62729,7 @@ static const pciSubsystemInfo *pci_ss_li
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_152d[] = {
 	&pci_ss_info_152d_0745,
+	&pci_ss_info_152d_0753,
 	&pci_ss_info_152d_8801,
 	&pci_ss_info_152d_8802,
 	&pci_ss_info_152d_8803,
@@ -59604,6 +62758,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_153b_1125,
 	&pci_ss_info_153b_112b,
 	&pci_ss_info_153b_112c,
+	&pci_ss_info_153b_112e,
 	&pci_ss_info_153b_1130,
 	&pci_ss_info_153b_1136,
 	&pci_ss_info_153b_1138,
@@ -59909,8 +63064,20 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_15fe NULL
 #define pci_ss_list_15ff NULL
 #define pci_ss_list_1600 NULL
-#define pci_ss_list_1601 NULL
-#define pci_ss_list_1602 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_1601[] = {
+	&pci_ss_info_1601_0000,
+	&pci_ss_info_1601_0002,
+	NULL
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_1602[] = {
+	&pci_ss_info_1602_0000,
+	&pci_ss_info_1602_0002,
+	NULL
+};
+#endif
 #define pci_ss_list_1603 NULL
 #define pci_ss_list_1604 NULL
 #define pci_ss_list_1605 NULL
@@ -59918,7 +63085,13 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1607 NULL
 #define pci_ss_list_1608 NULL
 #define pci_ss_list_1609 NULL
-#define pci_ss_list_1612 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_1612[] = {
+	&pci_ss_info_1612_0000,
+	&pci_ss_info_1612_0004,
+	NULL
+};
+#endif
 #define pci_ss_list_1619 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_161f[] = {
@@ -59946,6 +63119,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1668_0302,
 	&pci_ss_info_1668_0414,
 	&pci_ss_info_1668_0440,
+	&pci_ss_info_1668_1026,
 	&pci_ss_info_1668_1100,
 	&pci_ss_info_1668_2400,
 	NULL
@@ -59973,6 +63147,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1682_2119,
 	&pci_ss_info_1682_211c,
 	&pci_ss_info_1682_2120,
+	&pci_ss_info_1682_217e,
 	NULL
 };
 #endif
@@ -59980,12 +63155,15 @@ static const pciSubsystemInfo *pci_ss_li
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_168c[] = {
 	&pci_ss_info_168c_0013,
+	&pci_ss_info_168c_001a,
 	&pci_ss_info_168c_1025,
 	&pci_ss_info_168c_1027,
+	&pci_ss_info_168c_1042,
 	&pci_ss_info_168c_1052,
 	&pci_ss_info_168c_2026,
 	&pci_ss_info_168c_2041,
 	&pci_ss_info_168c_2042,
+	&pci_ss_info_168c_2051,
 	&pci_ss_info_168c_2062,
 	&pci_ss_info_168c_2063,
 	NULL
@@ -60053,6 +63231,7 @@ static const pciSubsystemInfo *pci_ss_li
 };
 #endif
 #define pci_ss_list_16e3 NULL
+#define pci_ss_list_16e5 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_16ec[] = {
 	&pci_ss_info_16ec_0119,
@@ -60103,6 +63282,8 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1734_1061,
 	&pci_ss_info_1734_1065,
 	&pci_ss_info_1734_106c,
+	&pci_ss_info_1734_1081,
+	&pci_ss_info_1734_10a3,
 	NULL
 };
 #endif
@@ -60164,7 +63345,10 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_175e NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_1775[] = {
+	&pci_ss_info_1775_10d0,
+	&pci_ss_info_1775_10d1,
 	&pci_ss_info_1775_6003,
+	&pci_ss_info_1775_ce90,
 	NULL
 };
 #endif
@@ -60199,10 +63383,23 @@ static const pciSubsystemInfo *pci_ss_li
 static const pciSubsystemInfo *pci_ss_list_17aa[] = {
 	&pci_ss_info_17aa_0286,
 	&pci_ss_info_17aa_0287,
+	&pci_ss_info_17aa_2001,
+	&pci_ss_info_17aa_2007,
+	&pci_ss_info_17aa_2009,
+	&pci_ss_info_17aa_200a,
+	&pci_ss_info_17aa_200b,
+	&pci_ss_info_17aa_200c,
+	&pci_ss_info_17aa_200d,
+	&pci_ss_info_17aa_200f,
+	&pci_ss_info_17aa_2010,
+	&pci_ss_info_17aa_2012,
+	&pci_ss_info_17aa_2017,
+	&pci_ss_info_17aa_201a,
 	&pci_ss_info_17aa_201c,
 	&pci_ss_info_17aa_201d,
 	&pci_ss_info_17aa_201e,
 	&pci_ss_info_17aa_207e,
+	&pci_ss_info_17aa_2081,
 	NULL
 };
 #endif
@@ -60234,6 +63431,7 @@ static const pciSubsystemInfo *pci_ss_li
 #endif
 #define pci_ss_list_17d3 NULL
 #define pci_ss_list_17d5 NULL
+#define pci_ss_list_17db NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_17de[] = {
 	&pci_ss_info_17de_08a1,
@@ -60243,8 +63441,11 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 #endif
+#define pci_ss_list_17e4 NULL
+#define pci_ss_list_17e6 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_17ee[] = {
+	&pci_ss_info_17ee_1001,
 	&pci_ss_info_17ee_2002,
 	&pci_ss_info_17ee_2003,
 	NULL
@@ -60305,12 +63506,14 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1849_3177,
 	&pci_ss_info_1849_3189,
 	&pci_ss_info_1849_3227,
+	&pci_ss_info_1849_5229,
 	&pci_ss_info_1849_8052,
 	&pci_ss_info_1849_8053,
 	&pci_ss_info_1849_9761,
 	NULL
 };
 #endif
+#define pci_ss_list_184a NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_1851[] = {
 	&pci_ss_info_1851_1850,
@@ -60379,6 +63582,13 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 #endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_1885[] = {
+	&pci_ss_info_1885_0700,
+	&pci_ss_info_1885_0701,
+	NULL
+};
+#endif
 #define pci_ss_list_1888 NULL
 #define pci_ss_list_188a NULL
 #define pci_ss_list_1890 NULL
@@ -60434,6 +63644,7 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 #endif
+#define pci_ss_list_18f6 NULL
 #define pci_ss_list_18f7 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_18fb[] = {
@@ -60458,9 +63669,11 @@ static const pciSubsystemInfo *pci_ss_li
 };
 #endif
 #define pci_ss_list_1942 NULL
+#define pci_ss_list_194a NULL
 #define pci_ss_list_1957 NULL
 #define pci_ss_list_1958 NULL
 #define pci_ss_list_1966 NULL
+#define pci_ss_list_1969 NULL
 #define pci_ss_list_196a NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_196d[] = {
@@ -60485,10 +63698,12 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_19ae NULL
 #define pci_ss_list_19d4 NULL
 #define pci_ss_list_19e2 NULL
+#define pci_ss_list_19e7 NULL
 #define pci_ss_list_1a03 NULL
 #define pci_ss_list_1a08 NULL
 #define pci_ss_list_1a1d NULL
 #define pci_ss_list_1a29 NULL
+#define pci_ss_list_1a51 NULL
 #define pci_ss_list_1b13 NULL
 #define pci_ss_list_1c1c NULL
 #define pci_ss_list_1d44 NULL
@@ -60643,6 +63858,7 @@ static const pciSubsystemInfo *pci_ss_li
 static const pciSubsystemInfo *pci_ss_list_5053[] = {
 	&pci_ss_info_5053_3355,
 	&pci_ss_info_5053_3356,
+	&pci_ss_info_5053_3357,
 	NULL
 };
 #endif
@@ -60654,6 +63870,13 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_5168_0138,
 	&pci_ss_info_5168_0306,
 	&pci_ss_info_5168_0319,
+	&pci_ss_info_5168_0502,
+	&pci_ss_info_5168_0520,
+	&pci_ss_info_5168_1502,
+	&pci_ss_info_5168_2502,
+	&pci_ss_info_5168_2520,
+	&pci_ss_info_5168_3502,
+	&pci_ss_info_5168_3520,
 	NULL
 };
 #endif
@@ -60732,6 +63955,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_0011,
 	&pci_ss_info_8086_0012,
 	&pci_ss_info_8086_0013,
+	&pci_ss_info_8086_0014,
 	&pci_ss_info_8086_001e,
 	&pci_ss_info_8086_002a,
 	&pci_ss_info_8086_002b,
@@ -60742,6 +63966,8 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_0041,
 	&pci_ss_info_8086_0042,
 	&pci_ss_info_8086_0050,
+	&pci_ss_info_8086_005e,
+	&pci_ss_info_8086_0060,
 	&pci_ss_info_8086_0075,
 	&pci_ss_info_8086_0076,
 	&pci_ss_info_8086_0077,
@@ -60786,6 +64012,8 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_1050,
 	&pci_ss_info_8086_1051,
 	&pci_ss_info_8086_1052,
+	&pci_ss_info_8086_105e,
+	&pci_ss_info_8086_1060,
 	&pci_ss_info_8086_1075,
 	&pci_ss_info_8086_1076,
 	&pci_ss_info_8086_1077,
@@ -60793,18 +64021,37 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_1079,
 	&pci_ss_info_8086_107a,
 	&pci_ss_info_8086_107b,
+	&pci_ss_info_8086_1082,
+	&pci_ss_info_8086_1083,
+	&pci_ss_info_8086_1084,
+	&pci_ss_info_8086_108a,
+	&pci_ss_info_8086_1092,
+	&pci_ss_info_8086_1093,
+	&pci_ss_info_8086_1094,
+	&pci_ss_info_8086_1099,
+	&pci_ss_info_8086_109a,
 	&pci_ss_info_8086_10f0,
 	&pci_ss_info_8086_1107,
 	&pci_ss_info_8086_1109,
 	&pci_ss_info_8086_110d,
 	&pci_ss_info_8086_1112,
 	&pci_ss_info_8086_1113,
+	&pci_ss_info_8086_115e,
+	&pci_ss_info_8086_115f,
 	&pci_ss_info_8086_1161,
+	&pci_ss_info_8086_116e,
+	&pci_ss_info_8086_116f,
 	&pci_ss_info_8086_1176,
 	&pci_ss_info_8086_1179,
 	&pci_ss_info_8086_117a,
+	&pci_ss_info_8086_118a,
+	&pci_ss_info_8086_1199,
+	&pci_ss_info_8086_125e,
+	&pci_ss_info_8086_125f,
 	&pci_ss_info_8086_1276,
 	&pci_ss_info_8086_127a,
+	&pci_ss_info_8086_135e,
+	&pci_ss_info_8086_135f,
 	&pci_ss_info_8086_1361,
 	&pci_ss_info_8086_1376,
 	&pci_ss_info_8086_1476,
@@ -60852,6 +64099,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_24db,
 	&pci_ss_info_8086_2513,
 	&pci_ss_info_8086_2527,
+	&pci_ss_info_8086_265c,
 	&pci_ss_info_8086_3000,
 	&pci_ss_info_8086_3001,
 	&pci_ss_info_8086_3002,
@@ -60880,6 +64128,9 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_3431,
 	&pci_ss_info_8086_3439,
 	&pci_ss_info_8086_3499,
+	&pci_ss_info_8086_3500,
+	&pci_ss_info_8086_3501,
+	&pci_ss_info_8086_3504,
 	&pci_ss_info_8086_4147,
 	&pci_ss_info_8086_4152,
 	&pci_ss_info_8086_4246,
@@ -60893,6 +64144,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_4557,
 	&pci_ss_info_8086_4649,
 	&pci_ss_info_8086_464a,
+	&pci_ss_info_8086_4c43,
 	&pci_ss_info_8086_4d4f,
 	&pci_ss_info_8086_4f43,
 	&pci_ss_info_8086_5243,
@@ -60909,9 +64161,11 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_a11f,
 	&pci_ss_info_8086_e000,
 	&pci_ss_info_8086_e001,
+	&pci_ss_info_8086_e002,
 	NULL
 };
 #define pci_ss_list_8401 NULL
+#define pci_ss_list_8686 NULL
 #define pci_ss_list_8800 NULL
 #define pci_ss_list_8866 NULL
 #define pci_ss_list_8888 NULL
@@ -61013,8 +64267,21 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_9005_02a8,
 	&pci_ss_info_9005_02a9,
 	&pci_ss_info_9005_02aa,
+	&pci_ss_info_9005_02ac,
+	&pci_ss_info_9005_02b3,
+	&pci_ss_info_9005_02b4,
+	&pci_ss_info_9005_02b5,
+	&pci_ss_info_9005_02b6,
+	&pci_ss_info_9005_02b7,
 	&pci_ss_info_9005_0364,
 	&pci_ss_info_9005_0365,
+	&pci_ss_info_9005_0410,
+	&pci_ss_info_9005_0411,
+	&pci_ss_info_9005_0412,
+	&pci_ss_info_9005_0413,
+	&pci_ss_info_9005_041f,
+	&pci_ss_info_9005_0430,
+	&pci_ss_info_9005_0432,
 	&pci_ss_info_9005_0800,
 	&pci_ss_info_9005_1364,
 	&pci_ss_info_9005_1365,
@@ -61075,6 +64342,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_ac3d NULL
 #define pci_ss_list_aecb NULL
 #define pci_ss_list_affe NULL
+#define pci_ss_list_b10b NULL
 #define pci_ss_list_b1b3 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_bd11[] = {
@@ -61089,6 +64357,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_ca50 NULL
 #define pci_ss_list_cafe NULL
 #define pci_ss_list_cccc NULL
+#define pci_ss_list_ccec NULL
 #define pci_ss_list_cddd NULL
 #define pci_ss_list_d161 NULL
 #define pci_ss_list_d4d4 NULL
@@ -61289,6 +64558,15 @@ static const pciDeviceInfo pci_dev_info_
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_050d_001a = {
+	0x001a, pci_device_050d_001a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_050d_001a,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_050d_0109 = {
 	0x0109, pci_device_050d_0109,
 #ifdef INIT_SUBSYS_INFO
@@ -61309,6 +64587,17 @@ static const pciDeviceInfo pci_dev_info_
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_05a9_8519 = {
+	0x8519, pci_device_05a9_8519,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_05a9_8519,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_05e3_0701 = {
 	0x0701, pci_device_05e3_0701,
 #ifdef INIT_SUBSYS_INFO
@@ -61378,6 +64667,15 @@ static const pciDeviceInfo pci_dev_info_
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_067b_2303 = {
+	0x2303, pci_device_067b_2303,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_067b_2303,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_067b_3507 = {
 	0x3507, pci_device_067b_3507,
 #ifdef INIT_SUBSYS_INFO
@@ -61454,6 +64752,24 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_0b0b_0605 = {
+	0x0605, pci_device_0b0b_0605,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_0b0b_0605,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_0b0b_0705 = {
+	0x0705, pci_device_0b0b_0705,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_0b0b_0705,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_0b49_064f = {
@@ -61466,6 +64782,17 @@ static const pciDeviceInfo pci_dev_info_
 	0
 };
 #endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_0ccd_0038 = {
+	0x0038, pci_device_0ccd_0038,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_0ccd_0038,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
 static const pciDeviceInfo pci_dev_info_0e11_0001 = {
 	0x0001, pci_device_0e11_0001,
 #ifdef INIT_SUBSYS_INFO
@@ -62628,6 +65955,24 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1000_0411 = {
+	0x0411, pci_device_1000_0411,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1000_0411,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1000_0413 = {
+	0x0413, pci_device_1000_0413,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1000_0413,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1000_0621 = {
 	0x0621, pci_device_1000_0621,
 #ifdef INIT_SUBSYS_INFO
@@ -65178,6 +68523,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_5569 = {
+	0x5569, pci_device_1002_5569,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_5569,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_556b = {
 	0x556b, pci_device_1002_556b,
 #ifdef INIT_SUBSYS_INFO
@@ -65205,6 +68559,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_5571 = {
+	0x5571, pci_device_1002_5571,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_5571,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_564a = {
 	0x564a, pci_device_1002_564a,
 #ifdef INIT_SUBSYS_INFO
@@ -65466,6 +68829,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_5a33 = {
+	0x5a33, pci_device_1002_5a33,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_5a33,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_5a34 = {
 	0x5a34, pci_device_1002_5a34,
 #ifdef INIT_SUBSYS_INFO
@@ -65871,6 +69243,33 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_7102 = {
+	0x7102, pci_device_1002_7102,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7102,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_7103 = {
+	0x7103, pci_device_1002_7103,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7103,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_7104 = {
+	0x7104, pci_device_1002_7104,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7104,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_7105 = {
 	0x7105, pci_device_1002_7105,
 #ifdef INIT_SUBSYS_INFO
@@ -65880,6 +69279,24 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_7106 = {
+	0x7106, pci_device_1002_7106,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7106,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_7108 = {
+	0x7108, pci_device_1002_7108,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7108,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_7109 = {
 	0x7109, pci_device_1002_7109,
 #ifdef INIT_SUBSYS_INFO
@@ -65889,6 +69306,33 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_710a = {
+	0x710a, pci_device_1002_710a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_710a,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_710b = {
+	0x710b, pci_device_1002_710b,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_710b,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_710c = {
+	0x710c, pci_device_1002_710c,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_710c,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_7120 = {
 	0x7120, pci_device_1002_7120,
 #ifdef INIT_SUBSYS_INFO
@@ -65898,6 +69342,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_7124 = {
+	0x7124, pci_device_1002_7124,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7124,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_7129 = {
 	0x7129, pci_device_1002_7129,
 #ifdef INIT_SUBSYS_INFO
@@ -65907,6 +69360,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_7140 = {
+	0x7140, pci_device_1002_7140,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7140,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_7142 = {
 	0x7142, pci_device_1002_7142,
 #ifdef INIT_SUBSYS_INFO
@@ -65970,61 +69432,187 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_1002_7162 = {
-	0x7162, pci_device_1002_7162,
+static const pciDeviceInfo pci_dev_info_1002_714d = {
+	0x714d, pci_device_1002_714d,
 #ifdef INIT_SUBSYS_INFO
-	pci_ss_list_1002_7162,
+	pci_ss_list_1002_714d,
 #else
 	NULL,
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_1002_7166 = {
-	0x7166, pci_device_1002_7166,
+static const pciDeviceInfo pci_dev_info_1002_714e = {
+	0x714e, pci_device_1002_714e,
 #ifdef INIT_SUBSYS_INFO
-	pci_ss_list_1002_7166,
+	pci_ss_list_1002_714e,
 #else
 	NULL,
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_1002_71c0 = {
-	0x71c0, pci_device_1002_71c0,
+static const pciDeviceInfo pci_dev_info_1002_7152 = {
+	0x7152, pci_device_1002_7152,
 #ifdef INIT_SUBSYS_INFO
-	pci_ss_list_1002_71c0,
+	pci_ss_list_1002_7152,
 #else
 	NULL,
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_1002_71c2 = {
-	0x71c2, pci_device_1002_71c2,
+static const pciDeviceInfo pci_dev_info_1002_715e = {
+	0x715e, pci_device_1002_715e,
 #ifdef INIT_SUBSYS_INFO
-	pci_ss_list_1002_71c2,
+	pci_ss_list_1002_715e,
 #else
 	NULL,
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_1002_71c4 = {
-	0x71c4, pci_device_1002_71c4,
+static const pciDeviceInfo pci_dev_info_1002_7162 = {
+	0x7162, pci_device_1002_7162,
 #ifdef INIT_SUBSYS_INFO
-	pci_ss_list_1002_71c4,
+	pci_ss_list_1002_7162,
 #else
 	NULL,
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_1002_71c5 = {
-	0x71c5, pci_device_1002_71c5,
+static const pciDeviceInfo pci_dev_info_1002_7166 = {
+	0x7166, pci_device_1002_7166,
 #ifdef INIT_SUBSYS_INFO
-	pci_ss_list_1002_71c5,
+	pci_ss_list_1002_7166,
 #else
 	NULL,
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_1002_71e0 = {
+static const pciDeviceInfo pci_dev_info_1002_7172 = {
+	0x7172, pci_device_1002_7172,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7172,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_7180 = {
+	0x7180, pci_device_1002_7180,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7180,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_7181 = {
+	0x7181, pci_device_1002_7181,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7181,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_71a0 = {
+	0x71a0, pci_device_1002_71a0,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_71a0,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_71a1 = {
+	0x71a1, pci_device_1002_71a1,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_71a1,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_71c0 = {
+	0x71c0, pci_device_1002_71c0,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_71c0,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_71c2 = {
+	0x71c2, pci_device_1002_71c2,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_71c2,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_71c4 = {
+	0x71c4, pci_device_1002_71c4,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_71c4,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_71c5 = {
+	0x71c5, pci_device_1002_71c5,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_71c5,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_71c6 = {
+	0x71c6, pci_device_1002_71c6,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_71c6,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_71ce = {
+	0x71ce, pci_device_1002_71ce,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_71ce,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_71d5 = {
+	0x71d5, pci_device_1002_71d5,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_71d5,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_71d6 = {
+	0x71d6, pci_device_1002_71d6,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_71d6,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_71de = {
+	0x71de, pci_device_1002_71de,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_71de,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_71e0 = {
 	0x71e0, pci_device_1002_71e0,
 #ifdef INIT_SUBSYS_INFO
 	pci_ss_list_1002_71e0,
@@ -66042,6 +69630,159 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_7240 = {
+	0x7240, pci_device_1002_7240,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7240,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_7241 = {
+	0x7241, pci_device_1002_7241,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7241,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_7242 = {
+	0x7242, pci_device_1002_7242,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7242,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_7243 = {
+	0x7243, pci_device_1002_7243,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7243,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_7244 = {
+	0x7244, pci_device_1002_7244,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7244,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_7245 = {
+	0x7245, pci_device_1002_7245,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7245,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_7246 = {
+	0x7246, pci_device_1002_7246,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7246,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_7247 = {
+	0x7247, pci_device_1002_7247,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7247,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_7248 = {
+	0x7248, pci_device_1002_7248,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7248,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_7249 = {
+	0x7249, pci_device_1002_7249,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7249,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_724a = {
+	0x724a, pci_device_1002_724a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_724a,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_724b = {
+	0x724b, pci_device_1002_724b,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_724b,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_724c = {
+	0x724c, pci_device_1002_724c,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_724c,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_724d = {
+	0x724d, pci_device_1002_724d,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_724d,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_724e = {
+	0x724e, pci_device_1002_724e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_724e,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_7269 = {
+	0x7269, pci_device_1002_7269,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_7269,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_726e = {
+	0x726e, pci_device_1002_726e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_726e,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_7833 = {
 	0x7833, pci_device_1002_7833,
 #ifdef INIT_SUBSYS_INFO
@@ -67478,6 +71219,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1014_0058 = {
+	0x0058, pci_device_1014_0058,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_0058,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1014_005c = {
 	0x005c, pci_device_1014_005c,
 #ifdef INIT_SUBSYS_INFO
@@ -67901,6 +71651,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1014_0308 = {
+	0x0308, pci_device_1014_0308,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1014_0308,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1014_0314 = {
 	0x0314, pci_device_1014_0314,
 #ifdef INIT_SUBSYS_INFO
@@ -69134,6 +72893,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1025_0090 = {
+	0x0090, pci_device_1025_0090,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1025_0090,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1025_1435 = {
 	0x1435, pci_device_1025_1435,
 #ifdef INIT_SUBSYS_INFO
@@ -70009,6 +73777,33 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_102b_4cdc = {
+	0x4cdc, pci_device_102b_4cdc,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_102b_4cdc,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_102b_4fc5 = {
+	0x4fc5, pci_device_102b_4fc5,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_102b_4fc5,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_102b_5e10 = {
+	0x5e10, pci_device_102b_5e10,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_102b_5e10,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_102b_6573 = {
 	0x6573, pci_device_102b_6573,
 #ifdef INIT_SUBSYS_INFO
@@ -70625,6 +74420,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1033_013a = {
+	0x013a, pci_device_1033_013a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1033_013a,
+#else
+	NULL,
+#endif
+	0
+};
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_1036_0000 = {
 	0x0000, pci_device_1036_0000,
@@ -70753,6 +74557,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1039_0186 = {
+	0x0186, pci_device_1039_0186,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_0186,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1039_0190 = {
 	0x0190, pci_device_1039_0190,
 #ifdef INIT_SUBSYS_INFO
@@ -71014,6 +74827,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1039_0662 = {
+	0x0662, pci_device_1039_0662,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_0662,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1039_0730 = {
 	0x0730, pci_device_1039_0730,
 #ifdef INIT_SUBSYS_INFO
@@ -71158,6 +74980,69 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1039_0966 = {
+	0x0966, pci_device_1039_0966,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_0966,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1039_0968 = {
+	0x0968, pci_device_1039_0968,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_0968,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1039_1180 = {
+	0x1180, pci_device_1039_1180,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_1180,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1039_1182 = {
+	0x1182, pci_device_1039_1182,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_1182,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1039_1183 = {
+	0x1183, pci_device_1039_1183,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_1183,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1039_1184 = {
+	0x1184, pci_device_1039_1184,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_1184,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1039_1185 = {
+	0x1185, pci_device_1039_1185,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_1185,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1039_3602 = {
 	0x3602, pci_device_1039_3602,
 #ifdef INIT_SUBSYS_INFO
@@ -71365,6 +75250,24 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1039_6350 = {
+	0x6350, pci_device_1039_6350,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_6350,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1039_6351 = {
+	0x6351, pci_device_1039_6351,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_6351,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1039_7001 = {
 	0x7001, pci_device_1039_7001,
 #ifdef INIT_SUBSYS_INFO
@@ -71437,6 +75340,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1039_7502 = {
+	0x7502, pci_device_1039_7502,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_7502,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_103c_002a = {
 	0x002a, pci_device_103c_002a,
 #ifdef INIT_SUBSYS_INFO
@@ -71680,6 +75592,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_103c_127b = {
+	0x127b, pci_device_103c_127b,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_103c_127b,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_103c_127c = {
 	0x127c, pci_device_103c_127c,
 #ifdef INIT_SUBSYS_INFO
@@ -71716,6 +75637,33 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_103c_12eb = {
+	0x12eb, pci_device_103c_12eb,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_103c_12eb,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_103c_12ec = {
+	0x12ec, pci_device_103c_12ec,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_103c_12ec,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_103c_12ee = {
+	0x12ee, pci_device_103c_12ee,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_103c_12ee,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_103c_12f8 = {
 	0x12f8, pci_device_103c_12f8,
 #ifdef INIT_SUBSYS_INFO
@@ -71788,6 +75736,51 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_103c_4030 = {
+	0x4030, pci_device_103c_4030,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_103c_4030,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_103c_4031 = {
+	0x4031, pci_device_103c_4031,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_103c_4031,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_103c_4037 = {
+	0x4037, pci_device_103c_4037,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_103c_4037,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_103c_403b = {
+	0x403b, pci_device_103c_403b,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_103c_403b,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_103c_60e8 = {
+	0x60e8, pci_device_103c_60e8,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_103c_60e8,
+#else
+	NULL,
+#endif
+	0
+};
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_1042_1000 = {
 	0x1000, pci_device_1042_1000,
@@ -71890,6 +75883,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1043_8047 = {
+	0x8047, pci_device_1043_8047,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1043_8047,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1043_807b = {
 	0x807b, pci_device_1043_807b,
 #ifdef INIT_SUBSYS_INFO
@@ -71944,6 +75946,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1043_815a = {
+	0x815a, pci_device_1043_815a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1043_815a,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1043_8187 = {
 	0x8187, pci_device_1043_8187,
 #ifdef INIT_SUBSYS_INFO
@@ -72682,6 +76693,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_104c_803a = {
+	0x803a, pci_device_104c_803a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_104c_803a,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_104c_803b = {
 	0x803b, pci_device_104c_803b,
 #ifdef INIT_SUBSYS_INFO
@@ -72691,6 +76711,24 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_104c_803c = {
+	0x803c, pci_device_104c_803c,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_104c_803c,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_104c_803d = {
+	0x803d, pci_device_104c_803d,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_104c_803d,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_104c_8201 = {
 	0x8201, pci_device_104c_8201,
 #ifdef INIT_SUBSYS_INFO
@@ -73478,6 +77516,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1057_0012 = {
+	0x0012, pci_device_1057_0012,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1057_0012,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1057_0100 = {
 	0x0100, pci_device_1057_0100,
 #ifdef INIT_SUBSYS_INFO
@@ -73523,6 +77570,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1057_3055 = {
+	0x3055, pci_device_1057_3055,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1057_3055,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1057_3410 = {
 	0x3410, pci_device_1057_3410,
 #ifdef INIT_SUBSYS_INFO
@@ -73821,6 +77877,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_105a_4302 = {
+	0x4302, pci_device_105a_4302,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_105a_4302,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_105a_4d30 = {
 	0x4d30, pci_device_105a_4d30,
 #ifdef INIT_SUBSYS_INFO
@@ -73965,6 +78030,24 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_105a_8350 = {
+	0x8350, pci_device_105a_8350,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_105a_8350,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_105a_c350 = {
+	0xc350, pci_device_105a_c350,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_105a_c350,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 static const pciDeviceInfo pci_dev_info_105d_2309 = {
 	0x2309, pci_device_105d_2309,
@@ -77230,24 +81313,6 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_10a9_8010 = {
-	0x8010, pci_device_10a9_8010,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10a9_8010,
-#else
-	NULL,
-#endif
-	0
-};
-static const pciDeviceInfo pci_dev_info_10a9_8018 = {
-	0x8018, pci_device_10a9_8018,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10a9_8018,
-#else
-	NULL,
-#endif
-	0
-};
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_10aa_0000 = {
@@ -77582,6 +81647,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10b5_9656 = {
+	0x9656, pci_device_10b5_9656,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10b5_9656,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10b5_bb04 = {
 	0xbb04, pci_device_10b5_bb04,
 #ifdef INIT_SUBSYS_INFO
@@ -77591,6 +81665,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10b5_c001 = {
+	0xc001, pci_device_10b5_c001,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10b5_c001,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_10b6_0001 = {
@@ -78117,6 +82200,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10b7_9054 = {
+	0x9054, pci_device_10b7_9054,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10b7_9054,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10b7_9055 = {
 	0x9055, pci_device_10b7_9055,
 #ifdef INIT_SUBSYS_INFO
@@ -79771,6 +83863,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_004d = {
+	0x004d, pci_device_10de_004d,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_004d,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10de_004e = {
 	0x004e, pci_device_10de_004e,
 #ifdef INIT_SUBSYS_INFO
@@ -80788,6 +84889,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_014d = {
+	0x014d, pci_device_10de_014d,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_014d,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10de_014e = {
 	0x014e, pci_device_10de_014e,
 #ifdef INIT_SUBSYS_INFO
@@ -81301,6 +85411,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_01d6 = {
+	0x01d6, pci_device_10de_01d6,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_01d6,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10de_01d7 = {
 	0x01d7, pci_device_10de_01d7,
 #ifdef INIT_SUBSYS_INFO
@@ -81985,6 +86104,33 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_0292 = {
+	0x0292, pci_device_10de_0292,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0292,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0298 = {
+	0x0298, pci_device_10de_0298,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0298,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0299 = {
+	0x0299, pci_device_10de_0299,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0299,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10de_029a = {
 	0x029a, pci_device_10de_029a,
 #ifdef INIT_SUBSYS_INFO
@@ -82030,6 +86176,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_029f = {
+	0x029f, pci_device_10de_029f,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_029f,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10de_02a0 = {
 	0x02a0, pci_device_10de_02a0,
 #ifdef INIT_SUBSYS_INFO
@@ -82750,6 +86905,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_036b = {
+	0x036b, pci_device_10de_036b,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_036b,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10de_036c = {
 	0x036c, pci_device_10de_036c,
 #ifdef INIT_SUBSYS_INFO
@@ -82777,6 +86941,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_0370 = {
+	0x0370, pci_device_10de_0370,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0370,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10de_0371 = {
 	0x0371, pci_device_10de_0371,
 #ifdef INIT_SUBSYS_INFO
@@ -82804,6 +86977,51 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_0374 = {
+	0x0374, pci_device_10de_0374,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0374,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0375 = {
+	0x0375, pci_device_10de_0375,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0375,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0376 = {
+	0x0376, pci_device_10de_0376,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0376,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0377 = {
+	0x0377, pci_device_10de_0377,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0377,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0378 = {
+	0x0378, pci_device_10de_0378,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0378,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10de_037a = {
 	0x037a, pci_device_10de_037a,
 #ifdef INIT_SUBSYS_INFO
@@ -82849,6 +87067,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_0393 = {
+	0x0393, pci_device_10de_0393,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0393,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10de_0398 = {
 	0x0398, pci_device_10de_0398,
 #ifdef INIT_SUBSYS_INFO
@@ -82867,6 +87094,294 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_03a0 = {
+	0x03a0, pci_device_10de_03a0,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03a0,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03a1 = {
+	0x03a1, pci_device_10de_03a1,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03a1,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03a2 = {
+	0x03a2, pci_device_10de_03a2,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03a2,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03a3 = {
+	0x03a3, pci_device_10de_03a3,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03a3,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03a4 = {
+	0x03a4, pci_device_10de_03a4,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03a4,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03a5 = {
+	0x03a5, pci_device_10de_03a5,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03a5,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03a6 = {
+	0x03a6, pci_device_10de_03a6,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03a6,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03a7 = {
+	0x03a7, pci_device_10de_03a7,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03a7,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03a8 = {
+	0x03a8, pci_device_10de_03a8,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03a8,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03a9 = {
+	0x03a9, pci_device_10de_03a9,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03a9,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03aa = {
+	0x03aa, pci_device_10de_03aa,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03aa,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03ab = {
+	0x03ab, pci_device_10de_03ab,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03ab,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03ac = {
+	0x03ac, pci_device_10de_03ac,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03ac,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03ad = {
+	0x03ad, pci_device_10de_03ad,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03ad,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03ae = {
+	0x03ae, pci_device_10de_03ae,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03ae,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03af = {
+	0x03af, pci_device_10de_03af,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03af,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03b0 = {
+	0x03b0, pci_device_10de_03b0,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03b0,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03b1 = {
+	0x03b1, pci_device_10de_03b1,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03b1,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03b2 = {
+	0x03b2, pci_device_10de_03b2,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03b2,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03b3 = {
+	0x03b3, pci_device_10de_03b3,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03b3,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03b4 = {
+	0x03b4, pci_device_10de_03b4,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03b4,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03b5 = {
+	0x03b5, pci_device_10de_03b5,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03b5,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03b6 = {
+	0x03b6, pci_device_10de_03b6,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03b6,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03b7 = {
+	0x03b7, pci_device_10de_03b7,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03b7,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03b8 = {
+	0x03b8, pci_device_10de_03b8,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03b8,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03b9 = {
+	0x03b9, pci_device_10de_03b9,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03b9,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03ba = {
+	0x03ba, pci_device_10de_03ba,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03ba,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03bb = {
+	0x03bb, pci_device_10de_03bb,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03bb,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03d0 = {
+	0x03d0, pci_device_10de_03d0,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03d0,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03d1 = {
+	0x03d1, pci_device_10de_03d1,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03d1,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03d2 = {
+	0x03d2, pci_device_10de_03d2,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03d2,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03d5 = {
+	0x03d5, pci_device_10de_03d5,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03d5,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10de_03e0 = {
 	0x03e0, pci_device_10de_03e0,
 #ifdef INIT_SUBSYS_INFO
@@ -82939,6 +87454,24 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_03e8 = {
+	0x03e8, pci_device_10de_03e8,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03e8,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03e9 = {
+	0x03e9, pci_device_10de_03e9,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03e9,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10de_03ea = {
 	0x03ea, pci_device_10de_03ea,
 #ifdef INIT_SUBSYS_INFO
@@ -83011,6 +87544,24 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_03f3 = {
+	0x03f3, pci_device_10de_03f3,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03f3,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_03f4 = {
+	0x03f4, pci_device_10de_03f4,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_03f4,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10de_03f5 = {
 	0x03f5, pci_device_10de_03f5,
 #ifdef INIT_SUBSYS_INFO
@@ -83038,6 +87589,285 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10de_0440 = {
+	0x0440, pci_device_10de_0440,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0440,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0441 = {
+	0x0441, pci_device_10de_0441,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0441,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0442 = {
+	0x0442, pci_device_10de_0442,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0442,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0443 = {
+	0x0443, pci_device_10de_0443,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0443,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0444 = {
+	0x0444, pci_device_10de_0444,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0444,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0445 = {
+	0x0445, pci_device_10de_0445,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0445,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0446 = {
+	0x0446, pci_device_10de_0446,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0446,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0447 = {
+	0x0447, pci_device_10de_0447,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0447,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0448 = {
+	0x0448, pci_device_10de_0448,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0448,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0449 = {
+	0x0449, pci_device_10de_0449,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0449,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_044a = {
+	0x044a, pci_device_10de_044a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_044a,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_044b = {
+	0x044b, pci_device_10de_044b,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_044b,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_044c = {
+	0x044c, pci_device_10de_044c,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_044c,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_044d = {
+	0x044d, pci_device_10de_044d,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_044d,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_044e = {
+	0x044e, pci_device_10de_044e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_044e,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_044f = {
+	0x044f, pci_device_10de_044f,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_044f,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0450 = {
+	0x0450, pci_device_10de_0450,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0450,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0451 = {
+	0x0451, pci_device_10de_0451,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0451,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0452 = {
+	0x0452, pci_device_10de_0452,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0452,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0453 = {
+	0x0453, pci_device_10de_0453,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0453,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0454 = {
+	0x0454, pci_device_10de_0454,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0454,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0455 = {
+	0x0455, pci_device_10de_0455,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0455,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0456 = {
+	0x0456, pci_device_10de_0456,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0456,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0457 = {
+	0x0457, pci_device_10de_0457,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0457,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0458 = {
+	0x0458, pci_device_10de_0458,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0458,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_0459 = {
+	0x0459, pci_device_10de_0459,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_0459,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_045a = {
+	0x045a, pci_device_10de_045a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_045a,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_045c = {
+	0x045c, pci_device_10de_045c,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_045c,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_045d = {
+	0x045d, pci_device_10de_045d,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_045d,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_045e = {
+	0x045e, pci_device_10de_045e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_045e,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10de_045f = {
+	0x045f, pci_device_10de_045f,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10de_045f,
+#else
+	NULL,
+#endif
+	0
+};
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_10df_1ae5 = {
 	0x1ae5, pci_device_10df_1ae5,
@@ -83394,6 +88224,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10e3_0108 = {
+	0x0108, pci_device_10e3_0108,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10e3_0108,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10e3_0148 = {
 	0x0148, pci_device_10e3_0148,
 #ifdef INIT_SUBSYS_INFO
@@ -83439,6 +88278,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10e3_a108 = {
+	0xa108, pci_device_10e3_a108,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10e3_a108,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_10e4_8029 = {
@@ -83798,6 +88646,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10ec_0883 = {
+	0x0883, pci_device_10ec_0883,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10ec_0883,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10ec_8029 = {
 	0x8029, pci_device_10ec_8029,
 #ifdef INIT_SUBSYS_INFO
@@ -83816,6 +88673,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10ec_8136 = {
+	0x8136, pci_device_10ec_8136,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10ec_8136,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10ec_8138 = {
 	0x8138, pci_device_10ec_8138,
 #ifdef INIT_SUBSYS_INFO
@@ -83834,6 +88700,24 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_10ec_8167 = {
+	0x8167, pci_device_10ec_8167,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10ec_8167,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_10ec_8168 = {
+	0x8168, pci_device_10ec_8168,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_10ec_8168,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_10ec_8169 = {
 	0x8169, pci_device_10ec_8169,
 #ifdef INIT_SUBSYS_INFO
@@ -84095,6 +88979,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1101_1622 = {
+	0x1622, pci_device_1101_1622,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1101_1622,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1101_9100 = {
 	0x9100, pci_device_1101_9100,
 #ifdef INIT_SUBSYS_INFO
@@ -84160,6 +89053,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1102_0005 = {
+	0x0005, pci_device_1102_0005,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1102_0005,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1102_0006 = {
 	0x0006, pci_device_1102_0006,
 #ifdef INIT_SUBSYS_INFO
@@ -89730,6 +94632,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1166_0103 = {
+	0x0103, pci_device_1166_0103,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1166_0103,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1166_0104 = {
 	0x0104, pci_device_1166_0104,
 #ifdef INIT_SUBSYS_INFO
@@ -89766,6 +94677,33 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1166_0140 = {
+	0x0140, pci_device_1166_0140,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1166_0140,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1166_0141 = {
+	0x0141, pci_device_1166_0141,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1166_0141,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1166_0142 = {
+	0x0142, pci_device_1166_0142,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1166_0142,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1166_0200 = {
 	0x0200, pci_device_1166_0200,
 #ifdef INIT_SUBSYS_INFO
@@ -90381,6 +95319,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1186_1405 = {
+	0x1405, pci_device_1186_1405,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1186_1405,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1186_1541 = {
 	0x1541, pci_device_1186_1541,
 #ifdef INIT_SUBSYS_INFO
@@ -90543,6 +95490,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1186_4800 = {
+	0x4800, pci_device_1186_4800,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1186_4800,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1186_4b01 = {
 	0x4b01, pci_device_1186_4b01,
 #ifdef INIT_SUBSYS_INFO
@@ -91283,6 +96239,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_11ab_6485 = {
+	0x6485, pci_device_11ab_6485,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_11ab_6485,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_11ab_f003 = {
 	0xf003, pci_device_11ab_f003,
 #ifdef INIT_SUBSYS_INFO
@@ -91821,6 +96786,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_11c1_ed01 = {
+	0xed01, pci_device_11c1_ed01,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_11c1_ed01,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_11c8_0658 = {
@@ -92561,6 +97535,15 @@ static const pciDeviceInfo pci_dev_info_
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_1217_00f7 = {
+	0x00f7, pci_device_1217_00f7,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1217_00f7,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1217_6729 = {
 	0x6729, pci_device_1217_6729,
 #ifdef INIT_SUBSYS_INFO
@@ -92669,6 +97652,24 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1217_7120 = {
+	0x7120, pci_device_1217_7120,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1217_7120,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1217_7130 = {
+	0x7130, pci_device_1217_7130,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1217_7130,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1217_7134 = {
 	0x7134, pci_device_1217_7134,
 #ifdef INIT_SUBSYS_INFO
@@ -92678,6 +97679,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1217_7135 = {
+	0x7135, pci_device_1217_7135,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1217_7135,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1217_71e2 = {
 	0x71e2, pci_device_1217_71e2,
 #ifdef INIT_SUBSYS_INFO
@@ -93304,6 +98314,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1259_a11e = {
+	0xa11e, pci_device_1259_a11e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1259_a11e,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1259_a120 = {
 	0xa120, pci_device_1259_a120,
 #ifdef INIT_SUBSYS_INFO
@@ -96410,6 +101429,53 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1360_0303 = {
+	0x0303, pci_device_1360_0303,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1360_0303,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_136a_0004 = {
+	0x0004, pci_device_136a_0004,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_136a_0004,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_136a_0007 = {
+	0x0007, pci_device_136a_0007,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_136a_0007,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_136a_0008 = {
+	0x0008, pci_device_136a_0008,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_136a_0008,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_136a_000a = {
+	0x000a, pci_device_136a_000a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_136a_000a,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_136b_ff01 = {
@@ -96944,6 +102010,42 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1385_7b00 = {
+	0x7b00, pci_device_1385_7b00,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1385_7b00,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1385_7c00 = {
+	0x7c00, pci_device_1385_7c00,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1385_7c00,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1385_7d00 = {
+	0x7d00, pci_device_1385_7d00,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1385_7d00,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1385_7e00 = {
+	0x7e00, pci_device_1385_7e00,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1385_7e00,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1385_f004 = {
 	0xf004, pci_device_1385_f004,
 #ifdef INIT_SUBSYS_INFO
@@ -97522,6 +102624,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_13fe_16ff = {
+	0x16ff, pci_device_13fe_16ff,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_13fe_16ff,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_13fe_1733 = {
 	0x1733, pci_device_13fe_1733,
 #ifdef INIT_SUBSYS_INFO
@@ -97802,6 +102913,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1415_9500 = {
+	0x9500, pci_device_1415_9500,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1415_9500,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1415_9501 = {
 	0x9501, pci_device_1415_9501,
 #ifdef INIT_SUBSYS_INFO
@@ -97847,6 +102967,24 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1415_9512 = {
+	0x9512, pci_device_1415_9512,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1415_9512,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1415_9513 = {
+	0x9513, pci_device_1415_9513,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1415_9513,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1415_9521 = {
 	0x9521, pci_device_1415_9521,
 #ifdef INIT_SUBSYS_INFO
@@ -97929,6 +103067,71 @@ static const pciDeviceInfo pci_dev_info_
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_1435_4520 = {
+	0x4520, pci_device_1435_4520,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1435_4520,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1435_6020 = {
+	0x6020, pci_device_1435_6020,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1435_6020,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1435_6030 = {
+	0x6030, pci_device_1435_6030,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1435_6030,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1435_6420 = {
+	0x6420, pci_device_1435_6420,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1435_6420,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1435_6430 = {
+	0x6430, pci_device_1435_6430,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1435_6430,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1435_7520 = {
+	0x7520, pci_device_1435_7520,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1435_7520,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1435_7820 = {
+	0x7820, pci_device_1435_7820,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1435_7820,
+#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
@@ -98253,6 +103456,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1498_21cc = {
+	0x21cc, pci_device_1498_21cc,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1498_21cc,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1498_21cd = {
 	0x21cd, pci_device_1498_21cd,
 #ifdef INIT_SUBSYS_INFO
@@ -98465,6 +103677,26 @@ static const pciDeviceInfo pci_dev_info_
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_14bc_d002 = {
+	0xd002, pci_device_14bc_d002,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_14bc_d002,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_14bc_d00f = {
+	0xd00f, pci_device_14bc_d00f,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_14bc_d00f,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_14c1_0008 = {
 	0x0008, pci_device_14c1_0008,
 #ifdef INIT_SUBSYS_INFO
@@ -99132,6 +104364,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_14e4_169a = {
+	0x169a, pci_device_14e4_169a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_14e4_169a,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_14e4_169b = {
 	0x169b, pci_device_14e4_169b,
 #ifdef INIT_SUBSYS_INFO
@@ -99375,6 +104616,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_14e4_4311 = {
+	0x4311, pci_device_14e4_4311,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_14e4_4311,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_14e4_4312 = {
 	0x4312, pci_device_14e4_4312,
 #ifdef INIT_SUBSYS_INFO
@@ -99474,6 +104724,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_14e4_4329 = {
+	0x4329, pci_device_14e4_4329,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_14e4_4329,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_14e4_4401 = {
 	0x4401, pci_device_14e4_4401,
 #ifdef INIT_SUBSYS_INFO
@@ -101294,6 +106553,17 @@ static const pciDeviceInfo pci_dev_info_
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_1542_9260 = {
+	0x9260, pci_device_1542_9260,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1542_9260,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_1543_3052 = {
 	0x3052, pci_device_1543_3052,
 #ifdef INIT_SUBSYS_INFO
@@ -102044,6 +107314,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1677_20ad = {
+	0x20ad, pci_device_1677_20ad,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1677_20ad,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_167b_2102 = {
@@ -102268,6 +107547,17 @@ static const pciDeviceInfo pci_dev_info_
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_16e5_6000 = {
+	0x6000, pci_device_16e5_6000,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_16e5_6000,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_16ec_00ff = {
 	0x00ff, pci_device_16ec_00ff,
 #ifdef INIT_SUBSYS_INFO
@@ -102286,6 +107576,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_16ec_2f00 = {
+	0x2f00, pci_device_16ec_2f00,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_16ec_2f00,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_16ec_3685 = {
 	0x3685, pci_device_16ec_3685,
 #ifdef INIT_SUBSYS_INFO
@@ -102803,6 +108102,55 @@ static const pciDeviceInfo pci_dev_info_
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_17e4_0001 = {
+	0x0001, pci_device_17e4_0001,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_17e4_0001,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_17e4_0002 = {
+	0x0002, pci_device_17e4_0002,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_17e4_0002,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_17e6_0010 = {
+	0x0010, pci_device_17e6_0010,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_17e6_0010,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_17e6_0011 = {
+	0x0011, pci_device_17e6_0011,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_17e6_0011,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_17e6_0021 = {
+	0x0021, pci_device_17e6_0021,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_17e6_0021,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_17fe_2120 = {
 	0x2120, pci_device_17fe_2120,
 #ifdef INIT_SUBSYS_INFO
@@ -102968,6 +108316,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_183b_08b0 = {
+	0x08b0, pci_device_183b_08b0,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_183b_08b0,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_1864_2110 = {
@@ -103095,6 +108452,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_18ac_d800 = {
+	0xd800, pci_device_18ac_d800,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_18ac_d800,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_18ac_d810 = {
 	0xd810, pci_device_18ac_d810,
 #ifdef INIT_SUBSYS_INFO
@@ -103217,6 +108583,35 @@ static const pciDeviceInfo pci_dev_info_
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_18f6_1000 = {
+	0x1000, pci_device_18f6_1000,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_18f6_1000,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_18f6_1050 = {
+	0x1050, pci_device_18f6_1050,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_18f6_1050,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_18f6_2000 = {
+	0x2000, pci_device_18f6_2000,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_18f6_2000,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_18f7_0001 = {
 	0x0001, pci_device_18f7_0001,
 #ifdef INIT_SUBSYS_INFO
@@ -103293,6 +108688,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1923_0300 = {
+	0x0300, pci_device_1923_0300,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1923_0300,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1923_0400 = {
 	0x0400, pci_device_1923_0400,
 #ifdef INIT_SUBSYS_INFO
@@ -103326,6 +108730,62 @@ static const pciDeviceInfo pci_dev_info_
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_194a_1111 = {
+	0x1111, pci_device_194a_1111,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_194a_1111,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_194a_1112 = {
+	0x1112, pci_device_194a_1112,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_194a_1112,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_194a_1113 = {
+	0x1113, pci_device_194a_1113,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_194a_1113,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_194a_1114 = {
+	0x1114, pci_device_194a_1114,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_194a_1114,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_194a_1115 = {
+	0x1115, pci_device_194a_1115,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_194a_1115,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_1957_0012 = {
+	0x0012, pci_device_1957_0012,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1957_0012,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1957_0080 = {
 	0x0080, pci_device_1957_0080,
 #ifdef INIT_SUBSYS_INFO
@@ -103411,6 +108871,17 @@ static const pciDeviceInfo pci_dev_info_
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_1969_1048 = {
+	0x1048, pci_device_1969_1048,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1969_1048,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_196a_0101 = {
 	0x0101, pci_device_196a_0101,
 #ifdef INIT_SUBSYS_INFO
@@ -103520,6 +108991,53 @@ static const pciDeviceInfo pci_dev_info_
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_19e7_1001 = {
+	0x1001, pci_device_19e7_1001,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_19e7_1001,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_19e7_1002 = {
+	0x1002, pci_device_19e7_1002,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_19e7_1002,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_19e7_1003 = {
+	0x1003, pci_device_19e7_1003,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_19e7_1003,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_19e7_1004 = {
+	0x1004, pci_device_19e7_1004,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_19e7_1004,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_19e7_1005 = {
+	0x1005, pci_device_19e7_1005,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_19e7_1005,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_1a03_2000 = {
 	0x2000, pci_device_1a03_2000,
 #ifdef INIT_SUBSYS_INFO
@@ -105305,6 +110823,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_7063_5500 = {
+	0x5500, pci_device_7063_5500,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_7063_5500,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_8008_0010 = {
@@ -106235,6 +111762,24 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_1049 = {
+	0x1049, pci_device_8086_1049,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1049,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_104a = {
+	0x104a, pci_device_8086_104a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_104a,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_104b = {
 	0x104b, pci_device_8086_104b,
 #ifdef INIT_SUBSYS_INFO
@@ -106244,6 +111789,24 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_104c = {
+	0x104c, pci_device_8086_104c,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_104c,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_104d = {
+	0x104d, pci_device_8086_104d,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_104d,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_1050 = {
 	0x1050, pci_device_8086_1050,
 #ifdef INIT_SUBSYS_INFO
@@ -106289,6 +111852,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_105b = {
+	0x105b, pci_device_8086_105b,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_105b,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_105e = {
 	0x105e, pci_device_8086_105e,
 #ifdef INIT_SUBSYS_INFO
@@ -106739,6 +112311,33 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_10b9 = {
+	0x10b9, pci_device_8086_10b9,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_10b9,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_10ba = {
+	0x10ba, pci_device_8086_10ba,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_10ba,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_10bb = {
+	0x10bb, pci_device_8086_10bb,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_10bb,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_1107 = {
 	0x1107, pci_device_8086_1107,
 #ifdef INIT_SUBSYS_INFO
@@ -108413,15 +114012,6 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_8086_25e8 = {
-	0x25e8, pci_device_8086_25e8,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_8086_25e8,
-#else
-	NULL,
-#endif
-	0
-};
 static const pciDeviceInfo pci_dev_info_8086_25f0 = {
 	0x25f0, pci_device_8086_25f0,
 #ifdef INIT_SUBSYS_INFO
@@ -109880,6 +115470,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_2975 = {
+	0x2975, pci_device_8086_2975,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2975,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_2976 = {
 	0x2976, pci_device_8086_2976,
 #ifdef INIT_SUBSYS_INFO
@@ -109898,6 +115497,33 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_2980 = {
+	0x2980, pci_device_8086_2980,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2980,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_2981 = {
+	0x2981, pci_device_8086_2981,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2981,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_2982 = {
+	0x2982, pci_device_8086_2982,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2982,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_2990 = {
 	0x2990, pci_device_8086_2990,
 #ifdef INIT_SUBSYS_INFO
@@ -110078,6 +115704,42 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_2a04 = {
+	0x2a04, pci_device_8086_2a04,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2a04,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_2a05 = {
+	0x2a05, pci_device_8086_2a05,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2a05,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_2a06 = {
+	0x2a06, pci_device_8086_2a06,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2a06,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_2a07 = {
+	0x2a07, pci_device_8086_2a07,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2a07,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_3092 = {
 	0x3092, pci_device_8086_3092,
 #ifdef INIT_SUBSYS_INFO
@@ -110420,6 +116082,60 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_35b0 = {
+	0x35b0, pci_device_8086_35b0,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_35b0,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_35b1 = {
+	0x35b1, pci_device_8086_35b1,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_35b1,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_35b5 = {
+	0x35b5, pci_device_8086_35b5,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_35b5,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_35b6 = {
+	0x35b6, pci_device_8086_35b6,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_35b6,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_35b7 = {
+	0x35b7, pci_device_8086_35b7,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_35b7,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_35c8 = {
+	0x35c8, pci_device_8086_35c8,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_35c8,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_4220 = {
 	0x4220, pci_device_8086_4220,
 #ifdef INIT_SUBSYS_INFO
@@ -110465,6 +116181,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_5001 = {
+	0x5001, pci_device_8086_5001,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_5001,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_5200 = {
 	0x5200, pci_device_8086_5200,
 #ifdef INIT_SUBSYS_INFO
@@ -111060,6 +116785,17 @@ static const pciDeviceInfo pci_dev_info_
 	0
 };
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_8686_1010 = {
+	0x1010, pci_device_8686_1010,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8686_1010,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_8800_2008 = {
 	0x2008, pci_device_8800_2008,
 #ifdef INIT_SUBSYS_INFO
@@ -112040,6 +117776,78 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_9005_0410 = {
+	0x0410, pci_device_9005_0410,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9005_0410,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_9005_0412 = {
+	0x0412, pci_device_9005_0412,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9005_0412,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_9005_041e = {
+	0x041e, pci_device_9005_041e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9005_041e,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_9005_041f = {
+	0x041f, pci_device_9005_041f,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9005_041f,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_9005_0430 = {
+	0x0430, pci_device_9005_0430,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9005_0430,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_9005_0432 = {
+	0x0432, pci_device_9005_0432,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9005_0432,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_9005_043e = {
+	0x043e, pci_device_9005_043e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9005_043e,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_9005_043f = {
+	0x043f, pci_device_9005_043f,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9005_043f,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_9005_0500 = {
 	0x0500, pci_device_9005_0500,
 #ifdef INIT_SUBSYS_INFO
@@ -112470,6 +118278,15 @@ static const pciDeviceInfo pci_dev_info_
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_affe_02e1 = {
+	0x02e1, pci_device_affe_02e1,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_affe_02e1,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_affe_dead = {
 	0xdead, pci_device_affe_dead,
 #ifdef INIT_SUBSYS_INFO
@@ -113107,6 +118924,7 @@ static const pciDeviceInfo *pci_dev_list
 	NULL
 };
 #endif
+#define pci_dev_list_0482 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_04cf[] = {
 	&pci_dev_info_04cf_8818,
@@ -113115,12 +118933,19 @@ static const pciDeviceInfo *pci_dev_list
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_050d[] = {
+	&pci_dev_info_050d_001a,
 	&pci_dev_info_050d_0109,
 	&pci_dev_info_050d_7050,
 	NULL
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_05a9[] = {
+	&pci_dev_info_05a9_8519,
+	NULL
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_05e3[] = {
 	&pci_dev_info_05e3_0701,
 	NULL
@@ -113144,6 +118969,7 @@ static const pciDeviceInfo *pci_dev_list
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_067b[] = {
+	&pci_dev_info_067b_2303,
 	&pci_dev_info_067b_3507,
 	NULL
 };
@@ -113151,6 +118977,7 @@ static const pciDeviceInfo *pci_dev_list
 #define pci_dev_list_0721 NULL
 #define pci_dev_list_07e2 NULL
 #define pci_dev_list_0925 NULL
+#define pci_dev_list_093a NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_09c1[] = {
 	&pci_dev_info_09c1_0704,
@@ -113166,6 +118993,8 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_0b0b_0405,
 	&pci_dev_info_0b0b_0505,
 	&pci_dev_info_0b0b_0506,
+	&pci_dev_info_0b0b_0605,
+	&pci_dev_info_0b0b_0705,
 	NULL
 };
 #endif
@@ -113175,6 +119004,12 @@ static const pciDeviceInfo *pci_dev_list
 	NULL
 };
 #endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_0ccd[] = {
+	&pci_dev_info_0ccd_0038,
+	NULL
+};
+#endif
 static const pciDeviceInfo *pci_dev_list_0e11[] = {
 	&pci_dev_info_0e11_0001,
 	&pci_dev_info_0e11_0002,
@@ -113274,6 +119109,7 @@ static const pciDeviceInfo *pci_dev_list
 };
 #define pci_dev_list_0e21 NULL
 #define pci_dev_list_0e55 NULL
+#define pci_dev_list_0eac NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_1000[] = {
 	&pci_dev_info_1000_0001,
@@ -113311,6 +119147,8 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1000_0407,
 	&pci_dev_info_1000_0408,
 	&pci_dev_info_1000_0409,
+	&pci_dev_info_1000_0411,
+	&pci_dev_info_1000_0413,
 	&pci_dev_info_1000_0621,
 	&pci_dev_info_1000_0622,
 	&pci_dev_info_1000_0623,
@@ -113603,9 +119441,11 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1002_5551,
 	&pci_dev_info_1002_5552,
 	&pci_dev_info_1002_5554,
+	&pci_dev_info_1002_5569,
 	&pci_dev_info_1002_556b,
 	&pci_dev_info_1002_556d,
 	&pci_dev_info_1002_556f,
+	&pci_dev_info_1002_5571,
 	&pci_dev_info_1002_564a,
 	&pci_dev_info_1002_564b,
 	&pci_dev_info_1002_564f,
@@ -113635,6 +119475,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1002_5969,
 	&pci_dev_info_1002_5974,
 	&pci_dev_info_1002_5975,
+	&pci_dev_info_1002_5a33,
 	&pci_dev_info_1002_5a34,
 	&pci_dev_info_1002_5a36,
 	&pci_dev_info_1002_5a38,
@@ -113680,10 +119521,20 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1002_700f,
 	&pci_dev_info_1002_7010,
 	&pci_dev_info_1002_7100,
+	&pci_dev_info_1002_7102,
+	&pci_dev_info_1002_7103,
+	&pci_dev_info_1002_7104,
 	&pci_dev_info_1002_7105,
+	&pci_dev_info_1002_7106,
+	&pci_dev_info_1002_7108,
 	&pci_dev_info_1002_7109,
+	&pci_dev_info_1002_710a,
+	&pci_dev_info_1002_710b,
+	&pci_dev_info_1002_710c,
 	&pci_dev_info_1002_7120,
+	&pci_dev_info_1002_7124,
 	&pci_dev_info_1002_7129,
+	&pci_dev_info_1002_7140,
 	&pci_dev_info_1002_7142,
 	&pci_dev_info_1002_7145,
 	&pci_dev_info_1002_7146,
@@ -113691,14 +119542,45 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1002_714a,
 	&pci_dev_info_1002_714b,
 	&pci_dev_info_1002_714c,
+	&pci_dev_info_1002_714d,
+	&pci_dev_info_1002_714e,
+	&pci_dev_info_1002_7152,
+	&pci_dev_info_1002_715e,
 	&pci_dev_info_1002_7162,
 	&pci_dev_info_1002_7166,
+	&pci_dev_info_1002_7172,
+	&pci_dev_info_1002_7180,
+	&pci_dev_info_1002_7181,
+	&pci_dev_info_1002_71a0,
+	&pci_dev_info_1002_71a1,
 	&pci_dev_info_1002_71c0,
 	&pci_dev_info_1002_71c2,
 	&pci_dev_info_1002_71c4,
 	&pci_dev_info_1002_71c5,
+	&pci_dev_info_1002_71c6,
+	&pci_dev_info_1002_71ce,
+	&pci_dev_info_1002_71d5,
+	&pci_dev_info_1002_71d6,
+	&pci_dev_info_1002_71de,
 	&pci_dev_info_1002_71e0,
 	&pci_dev_info_1002_71e2,
+	&pci_dev_info_1002_7240,
+	&pci_dev_info_1002_7241,
+	&pci_dev_info_1002_7242,
+	&pci_dev_info_1002_7243,
+	&pci_dev_info_1002_7244,
+	&pci_dev_info_1002_7245,
+	&pci_dev_info_1002_7246,
+	&pci_dev_info_1002_7247,
+	&pci_dev_info_1002_7248,
+	&pci_dev_info_1002_7249,
+	&pci_dev_info_1002_724a,
+	&pci_dev_info_1002_724b,
+	&pci_dev_info_1002_724c,
+	&pci_dev_info_1002_724d,
+	&pci_dev_info_1002_724e,
+	&pci_dev_info_1002_7269,
+	&pci_dev_info_1002_726e,
 	&pci_dev_info_1002_7833,
 	&pci_dev_info_1002_7834,
 	&pci_dev_info_1002_7835,
@@ -113897,6 +119779,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1014_0053,
 	&pci_dev_info_1014_0054,
 	&pci_dev_info_1014_0057,
+	&pci_dev_info_1014_0058,
 	&pci_dev_info_1014_005c,
 	&pci_dev_info_1014_005e,
 	&pci_dev_info_1014_007c,
@@ -113944,6 +119827,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1014_02a1,
 	&pci_dev_info_1014_02bd,
 	&pci_dev_info_1014_0302,
+	&pci_dev_info_1014_0308,
 	&pci_dev_info_1014_0314,
 	&pci_dev_info_1014_3022,
 	&pci_dev_info_1014_4022,
@@ -114119,6 +120003,7 @@ static const pciDeviceInfo *pci_dev_list
 };
 #define pci_dev_list_1024 NULL
 static const pciDeviceInfo *pci_dev_list_1025[] = {
+	&pci_dev_info_1025_0090,
 	&pci_dev_info_1025_1435,
 	&pci_dev_info_1025_1445,
 	&pci_dev_info_1025_1449,
@@ -114228,6 +120113,9 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_102b_2537,
 	&pci_dev_info_102b_2538,
 	&pci_dev_info_102b_4536,
+	&pci_dev_info_102b_4cdc,
+	&pci_dev_info_102b_4fc5,
+	&pci_dev_info_102b_5e10,
 	&pci_dev_info_102b_6573,
 	NULL
 };
@@ -114318,6 +120206,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1033_00f3,
 	&pci_dev_info_1033_010c,
 	&pci_dev_info_1033_0125,
+	&pci_dev_info_1033_013a,
 	NULL
 };
 #define pci_dev_list_1034 NULL
@@ -114344,6 +120233,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1039_0180,
 	&pci_dev_info_1039_0181,
 	&pci_dev_info_1039_0182,
+	&pci_dev_info_1039_0186,
 	&pci_dev_info_1039_0190,
 	&pci_dev_info_1039_0191,
 	&pci_dev_info_1039_0200,
@@ -114373,6 +120263,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1039_0655,
 	&pci_dev_info_1039_0660,
 	&pci_dev_info_1039_0661,
+	&pci_dev_info_1039_0662,
 	&pci_dev_info_1039_0730,
 	&pci_dev_info_1039_0733,
 	&pci_dev_info_1039_0735,
@@ -114389,6 +120280,13 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1039_0963,
 	&pci_dev_info_1039_0964,
 	&pci_dev_info_1039_0965,
+	&pci_dev_info_1039_0966,
+	&pci_dev_info_1039_0968,
+	&pci_dev_info_1039_1180,
+	&pci_dev_info_1039_1182,
+	&pci_dev_info_1039_1183,
+	&pci_dev_info_1039_1184,
+	&pci_dev_info_1039_1185,
 	&pci_dev_info_1039_3602,
 	&pci_dev_info_1039_5107,
 	&pci_dev_info_1039_5300,
@@ -114412,6 +120310,8 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1039_6325,
 	&pci_dev_info_1039_6326,
 	&pci_dev_info_1039_6330,
+	&pci_dev_info_1039_6350,
+	&pci_dev_info_1039_6351,
 	&pci_dev_info_1039_7001,
 	&pci_dev_info_1039_7002,
 	&pci_dev_info_1039_7007,
@@ -114420,6 +120320,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1039_7016,
 	&pci_dev_info_1039_7018,
 	&pci_dev_info_1039_7019,
+	&pci_dev_info_1039_7502,
 	NULL
 };
 #define pci_dev_list_103a NULL
@@ -114452,10 +120353,14 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_103c_1229,
 	&pci_dev_info_103c_122a,
 	&pci_dev_info_103c_122e,
+	&pci_dev_info_103c_127b,
 	&pci_dev_info_103c_127c,
 	&pci_dev_info_103c_1290,
 	&pci_dev_info_103c_1291,
 	&pci_dev_info_103c_12b4,
+	&pci_dev_info_103c_12eb,
+	&pci_dev_info_103c_12ec,
+	&pci_dev_info_103c_12ee,
 	&pci_dev_info_103c_12f8,
 	&pci_dev_info_103c_12fa,
 	&pci_dev_info_103c_2910,
@@ -114464,6 +120369,11 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_103c_3085,
 	&pci_dev_info_103c_3220,
 	&pci_dev_info_103c_3230,
+	&pci_dev_info_103c_4030,
+	&pci_dev_info_103c_4031,
+	&pci_dev_info_103c_4037,
+	&pci_dev_info_103c_403b,
+	&pci_dev_info_103c_60e8,
 	NULL
 };
 #define pci_dev_list_103e NULL
@@ -114488,12 +120398,14 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1043_4021,
 	&pci_dev_info_1043_4057,
 	&pci_dev_info_1043_8043,
+	&pci_dev_info_1043_8047,
 	&pci_dev_info_1043_807b,
 	&pci_dev_info_1043_8095,
 	&pci_dev_info_1043_80ac,
 	&pci_dev_info_1043_80bb,
 	&pci_dev_info_1043_80c5,
 	&pci_dev_info_1043_80df,
+	&pci_dev_info_1043_815a,
 	&pci_dev_info_1043_8187,
 	&pci_dev_info_1043_8188,
 	NULL
@@ -114605,7 +120517,10 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_104c_8036,
 	&pci_dev_info_104c_8038,
 	&pci_dev_info_104c_8039,
+	&pci_dev_info_104c_803a,
 	&pci_dev_info_104c_803b,
+	&pci_dev_info_104c_803c,
+	&pci_dev_info_104c_803d,
 	&pci_dev_info_104c_8201,
 	&pci_dev_info_104c_8204,
 	&pci_dev_info_104c_8231,
@@ -114718,11 +120633,13 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1057_0006,
 	&pci_dev_info_1057_0008,
 	&pci_dev_info_1057_0009,
+	&pci_dev_info_1057_0012,
 	&pci_dev_info_1057_0100,
 	&pci_dev_info_1057_0431,
 	&pci_dev_info_1057_1801,
 	&pci_dev_info_1057_18c0,
 	&pci_dev_info_1057_18c1,
+	&pci_dev_info_1057_3055,
 	&pci_dev_info_1057_3410,
 	&pci_dev_info_1057_4801,
 	&pci_dev_info_1057_4802,
@@ -114762,6 +120679,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_105a_3d18,
 	&pci_dev_info_105a_3d73,
 	&pci_dev_info_105a_3d75,
+	&pci_dev_info_105a_4302,
 	&pci_dev_info_105a_4d30,
 	&pci_dev_info_105a_4d33,
 	&pci_dev_info_105a_4d38,
@@ -114778,6 +120696,8 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_105a_6629,
 	&pci_dev_info_105a_7275,
 	&pci_dev_info_105a_8002,
+	&pci_dev_info_105a_8350,
+	&pci_dev_info_105a_c350,
 	NULL
 };
 #endif
@@ -115327,8 +121247,6 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_10a9_4002,
 	&pci_dev_info_10a9_8001,
 	&pci_dev_info_10a9_8002,
-	&pci_dev_info_10a9_8010,
-	&pci_dev_info_10a9_8018,
 	NULL
 };
 #endif
@@ -115397,7 +121315,9 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_10b5_906d,
 	&pci_dev_info_10b5_906e,
 	&pci_dev_info_10b5_9080,
+	&pci_dev_info_10b5_9656,
 	&pci_dev_info_10b5_bb04,
+	&pci_dev_info_10b5_c001,
 	NULL
 };
 #endif
@@ -115466,6 +121386,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_10b7_900a,
 	&pci_dev_info_10b7_9050,
 	&pci_dev_info_10b7_9051,
+	&pci_dev_info_10b7_9054,
 	&pci_dev_info_10b7_9055,
 	&pci_dev_info_10b7_9056,
 	&pci_dev_info_10b7_9058,
@@ -115738,6 +121659,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_10de_0047,
 	&pci_dev_info_10de_0048,
 	&pci_dev_info_10de_0049,
+	&pci_dev_info_10de_004d,
 	&pci_dev_info_10de_004e,
 	&pci_dev_info_10de_0050,
 	&pci_dev_info_10de_0051,
@@ -115851,6 +121773,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_10de_0149,
 	&pci_dev_info_10de_014a,
 	&pci_dev_info_10de_014c,
+	&pci_dev_info_10de_014d,
 	&pci_dev_info_10de_014e,
 	&pci_dev_info_10de_014f,
 	&pci_dev_info_10de_0150,
@@ -115908,6 +121831,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_10de_01c2,
 	&pci_dev_info_10de_01c3,
 	&pci_dev_info_10de_01d1,
+	&pci_dev_info_10de_01d6,
 	&pci_dev_info_10de_01d7,
 	&pci_dev_info_10de_01d8,
 	&pci_dev_info_10de_01da,
@@ -115984,11 +121908,15 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_10de_028c,
 	&pci_dev_info_10de_0290,
 	&pci_dev_info_10de_0291,
+	&pci_dev_info_10de_0292,
+	&pci_dev_info_10de_0298,
+	&pci_dev_info_10de_0299,
 	&pci_dev_info_10de_029a,
 	&pci_dev_info_10de_029b,
 	&pci_dev_info_10de_029c,
 	&pci_dev_info_10de_029d,
 	&pci_dev_info_10de_029e,
+	&pci_dev_info_10de_029f,
 	&pci_dev_info_10de_02a0,
 	&pci_dev_info_10de_02e1,
 	&pci_dev_info_10de_02f0,
@@ -116069,19 +121997,59 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_10de_0368,
 	&pci_dev_info_10de_0369,
 	&pci_dev_info_10de_036a,
+	&pci_dev_info_10de_036b,
 	&pci_dev_info_10de_036c,
 	&pci_dev_info_10de_036d,
 	&pci_dev_info_10de_036e,
+	&pci_dev_info_10de_0370,
 	&pci_dev_info_10de_0371,
 	&pci_dev_info_10de_0372,
 	&pci_dev_info_10de_0373,
+	&pci_dev_info_10de_0374,
+	&pci_dev_info_10de_0375,
+	&pci_dev_info_10de_0376,
+	&pci_dev_info_10de_0377,
+	&pci_dev_info_10de_0378,
 	&pci_dev_info_10de_037a,
 	&pci_dev_info_10de_037e,
 	&pci_dev_info_10de_037f,
 	&pci_dev_info_10de_0391,
 	&pci_dev_info_10de_0392,
+	&pci_dev_info_10de_0393,
 	&pci_dev_info_10de_0398,
 	&pci_dev_info_10de_039e,
+	&pci_dev_info_10de_03a0,
+	&pci_dev_info_10de_03a1,
+	&pci_dev_info_10de_03a2,
+	&pci_dev_info_10de_03a3,
+	&pci_dev_info_10de_03a4,
+	&pci_dev_info_10de_03a5,
+	&pci_dev_info_10de_03a6,
+	&pci_dev_info_10de_03a7,
+	&pci_dev_info_10de_03a8,
+	&pci_dev_info_10de_03a9,
+	&pci_dev_info_10de_03aa,
+	&pci_dev_info_10de_03ab,
+	&pci_dev_info_10de_03ac,
+	&pci_dev_info_10de_03ad,
+	&pci_dev_info_10de_03ae,
+	&pci_dev_info_10de_03af,
+	&pci_dev_info_10de_03b0,
+	&pci_dev_info_10de_03b1,
+	&pci_dev_info_10de_03b2,
+	&pci_dev_info_10de_03b3,
+	&pci_dev_info_10de_03b4,
+	&pci_dev_info_10de_03b5,
+	&pci_dev_info_10de_03b6,
+	&pci_dev_info_10de_03b7,
+	&pci_dev_info_10de_03b8,
+	&pci_dev_info_10de_03b9,
+	&pci_dev_info_10de_03ba,
+	&pci_dev_info_10de_03bb,
+	&pci_dev_info_10de_03d0,
+	&pci_dev_info_10de_03d1,
+	&pci_dev_info_10de_03d2,
+	&pci_dev_info_10de_03d5,
 	&pci_dev_info_10de_03e0,
 	&pci_dev_info_10de_03e1,
 	&pci_dev_info_10de_03e2,
@@ -116090,6 +122058,8 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_10de_03e5,
 	&pci_dev_info_10de_03e6,
 	&pci_dev_info_10de_03e7,
+	&pci_dev_info_10de_03e8,
+	&pci_dev_info_10de_03e9,
 	&pci_dev_info_10de_03ea,
 	&pci_dev_info_10de_03eb,
 	&pci_dev_info_10de_03ec,
@@ -116098,9 +122068,42 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_10de_03f0,
 	&pci_dev_info_10de_03f1,
 	&pci_dev_info_10de_03f2,
+	&pci_dev_info_10de_03f3,
+	&pci_dev_info_10de_03f4,
 	&pci_dev_info_10de_03f5,
 	&pci_dev_info_10de_03f6,
 	&pci_dev_info_10de_03f7,
+	&pci_dev_info_10de_0440,
+	&pci_dev_info_10de_0441,
+	&pci_dev_info_10de_0442,
+	&pci_dev_info_10de_0443,
+	&pci_dev_info_10de_0444,
+	&pci_dev_info_10de_0445,
+	&pci_dev_info_10de_0446,
+	&pci_dev_info_10de_0447,
+	&pci_dev_info_10de_0448,
+	&pci_dev_info_10de_0449,
+	&pci_dev_info_10de_044a,
+	&pci_dev_info_10de_044b,
+	&pci_dev_info_10de_044c,
+	&pci_dev_info_10de_044d,
+	&pci_dev_info_10de_044e,
+	&pci_dev_info_10de_044f,
+	&pci_dev_info_10de_0450,
+	&pci_dev_info_10de_0451,
+	&pci_dev_info_10de_0452,
+	&pci_dev_info_10de_0453,
+	&pci_dev_info_10de_0454,
+	&pci_dev_info_10de_0455,
+	&pci_dev_info_10de_0456,
+	&pci_dev_info_10de_0457,
+	&pci_dev_info_10de_0458,
+	&pci_dev_info_10de_0459,
+	&pci_dev_info_10de_045a,
+	&pci_dev_info_10de_045c,
+	&pci_dev_info_10de_045d,
+	&pci_dev_info_10de_045e,
+	&pci_dev_info_10de_045f,
 	NULL
 };
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -116158,11 +122161,13 @@ static const pciDeviceInfo *pci_dev_list
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_10e3[] = {
 	&pci_dev_info_10e3_0000,
+	&pci_dev_info_10e3_0108,
 	&pci_dev_info_10e3_0148,
 	&pci_dev_info_10e3_0860,
 	&pci_dev_info_10e3_0862,
 	&pci_dev_info_10e3_8260,
 	&pci_dev_info_10e3_8261,
+	&pci_dev_info_10e3_a108,
 	NULL
 };
 #endif
@@ -116229,10 +122234,14 @@ static const pciDeviceInfo *pci_dev_list
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_10ec[] = {
 	&pci_dev_info_10ec_0139,
+	&pci_dev_info_10ec_0883,
 	&pci_dev_info_10ec_8029,
 	&pci_dev_info_10ec_8129,
+	&pci_dev_info_10ec_8136,
 	&pci_dev_info_10ec_8138,
 	&pci_dev_info_10ec_8139,
+	&pci_dev_info_10ec_8167,
+	&pci_dev_info_10ec_8168,
 	&pci_dev_info_10ec_8169,
 	&pci_dev_info_10ec_8180,
 	&pci_dev_info_10ec_8185,
@@ -116317,6 +122326,7 @@ static const pciDeviceInfo *pci_dev_list
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_1101[] = {
 	&pci_dev_info_1101_1060,
+	&pci_dev_info_1101_1622,
 	&pci_dev_info_1101_9100,
 	&pci_dev_info_1101_9400,
 	&pci_dev_info_1101_9401,
@@ -116329,6 +122339,7 @@ static const pciDeviceInfo *pci_dev_list
 static const pciDeviceInfo *pci_dev_list_1102[] = {
 	&pci_dev_info_1102_0002,
 	&pci_dev_info_1102_0004,
+	&pci_dev_info_1102_0005,
 	&pci_dev_info_1102_0006,
 	&pci_dev_info_1102_0007,
 	&pci_dev_info_1102_0008,
@@ -117202,10 +123213,14 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1166_0017,
 	&pci_dev_info_1166_0036,
 	&pci_dev_info_1166_0101,
+	&pci_dev_info_1166_0103,
 	&pci_dev_info_1166_0104,
 	&pci_dev_info_1166_0110,
 	&pci_dev_info_1166_0130,
 	&pci_dev_info_1166_0132,
+	&pci_dev_info_1166_0140,
+	&pci_dev_info_1166_0141,
+	&pci_dev_info_1166_0142,
 	&pci_dev_info_1166_0200,
 	&pci_dev_info_1166_0201,
 	&pci_dev_info_1166_0203,
@@ -117328,6 +123343,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1186_1043,
 	&pci_dev_info_1186_1300,
 	&pci_dev_info_1186_1340,
+	&pci_dev_info_1186_1405,
 	&pci_dev_info_1186_1541,
 	&pci_dev_info_1186_1561,
 	&pci_dev_info_1186_2027,
@@ -117346,6 +123362,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1186_3a63,
 	&pci_dev_info_1186_4000,
 	&pci_dev_info_1186_4300,
+	&pci_dev_info_1186_4800,
 	&pci_dev_info_1186_4b01,
 	&pci_dev_info_1186_4c00,
 	&pci_dev_info_1186_8400,
@@ -117503,6 +123520,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_11ab_6081,
 	&pci_dev_info_11ab_6460,
 	&pci_dev_info_11ab_6480,
+	&pci_dev_info_11ab_6485,
 	&pci_dev_info_11ab_f003,
 	NULL
 };
@@ -117615,6 +123633,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_11c1_ab21,
 	&pci_dev_info_11c1_ab30,
 	&pci_dev_info_11c1_ed00,
+	&pci_dev_info_11c1_ed01,
 	NULL
 };
 #endif
@@ -117854,6 +123873,7 @@ static const pciDeviceInfo *pci_dev_list
 #define pci_dev_list_1216 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_1217[] = {
+	&pci_dev_info_1217_00f7,
 	&pci_dev_info_1217_6729,
 	&pci_dev_info_1217_673a,
 	&pci_dev_info_1217_6832,
@@ -117866,7 +123886,10 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1217_7112,
 	&pci_dev_info_1217_7113,
 	&pci_dev_info_1217_7114,
+	&pci_dev_info_1217_7120,
+	&pci_dev_info_1217_7130,
 	&pci_dev_info_1217_7134,
+	&pci_dev_info_1217_7135,
 	&pci_dev_info_1217_71e2,
 	&pci_dev_info_1217_7212,
 	&pci_dev_info_1217_7213,
@@ -118063,6 +124086,7 @@ static const pciDeviceInfo *pci_dev_list
 static const pciDeviceInfo *pci_dev_list_1259[] = {
 	&pci_dev_info_1259_2560,
 	&pci_dev_info_1259_a117,
+	&pci_dev_info_1259_a11e,
 	&pci_dev_info_1259_a120,
 	NULL
 };
@@ -118849,6 +124873,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1360_0204,
 	&pci_dev_info_1360_0301,
 	&pci_dev_info_1360_0302,
+	&pci_dev_info_1360_0303,
 	NULL
 };
 #endif
@@ -118861,7 +124886,15 @@ static const pciDeviceInfo *pci_dev_list
 #define pci_dev_list_1367 NULL
 #define pci_dev_list_1368 NULL
 #define pci_dev_list_1369 NULL
-#define pci_dev_list_136a NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_136a[] = {
+	&pci_dev_info_136a_0004,
+	&pci_dev_info_136a_0007,
+	&pci_dev_info_136a_0008,
+	&pci_dev_info_136a_000a,
+	NULL
+};
+#endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_136b[] = {
 	&pci_dev_info_136b_ff01,
@@ -118966,6 +124999,10 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1385_630a,
 	&pci_dev_info_1385_6b00,
 	&pci_dev_info_1385_6d00,
+	&pci_dev_info_1385_7b00,
+	&pci_dev_info_1385_7c00,
+	&pci_dev_info_1385_7d00,
+	&pci_dev_info_1385_7e00,
 	&pci_dev_info_1385_f004,
 	NULL
 };
@@ -119223,6 +125260,7 @@ static const pciDeviceInfo *pci_dev_list
 static const pciDeviceInfo *pci_dev_list_13fe[] = {
 	&pci_dev_info_13fe_1240,
 	&pci_dev_info_13fe_1600,
+	&pci_dev_info_13fe_16ff,
 	&pci_dev_info_13fe_1733,
 	&pci_dev_info_13fe_1752,
 	&pci_dev_info_13fe_1754,
@@ -119296,11 +125334,14 @@ static const pciDeviceInfo *pci_dev_list
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_1415[] = {
 	&pci_dev_info_1415_8403,
+	&pci_dev_info_1415_9500,
 	&pci_dev_info_1415_9501,
 	&pci_dev_info_1415_950a,
 	&pci_dev_info_1415_950b,
 	&pci_dev_info_1415_9510,
 	&pci_dev_info_1415_9511,
+	&pci_dev_info_1415_9512,
+	&pci_dev_info_1415_9513,
 	&pci_dev_info_1415_9521,
 	&pci_dev_info_1415_9523,
 	NULL
@@ -119357,7 +125398,18 @@ static const pciDeviceInfo *pci_dev_list
 };
 #endif
 #define pci_dev_list_1433 NULL
-#define pci_dev_list_1435 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_1435[] = {
+	&pci_dev_info_1435_4520,
+	&pci_dev_info_1435_6020,
+	&pci_dev_info_1435_6030,
+	&pci_dev_info_1435_6420,
+	&pci_dev_info_1435_6430,
+	&pci_dev_info_1435_7520,
+	&pci_dev_info_1435_7820,
+	NULL
+};
+#endif
 #define pci_dev_list_1436 NULL
 #define pci_dev_list_1437 NULL
 #define pci_dev_list_1438 NULL
@@ -119527,6 +125579,7 @@ static const pciDeviceInfo *pci_dev_list
 static const pciDeviceInfo *pci_dev_list_1498[] = {
 	&pci_dev_info_1498_0330,
 	&pci_dev_info_1498_0385,
+	&pci_dev_info_1498_21cc,
 	&pci_dev_info_1498_21cd,
 	&pci_dev_info_1498_30c8,
 	NULL
@@ -119611,7 +125664,13 @@ static const pciDeviceInfo *pci_dev_list
 #endif
 #define pci_dev_list_14ba NULL
 #define pci_dev_list_14bb NULL
-#define pci_dev_list_14bc NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_14bc[] = {
+	&pci_dev_info_14bc_d002,
+	&pci_dev_info_14bc_d00f,
+	NULL
+};
+#endif
 #define pci_dev_list_14bd NULL
 #define pci_dev_list_14be NULL
 #define pci_dev_list_14bf NULL
@@ -119745,6 +125804,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_14e4_167e,
 	&pci_dev_info_14e4_1693,
 	&pci_dev_info_14e4_1696,
+	&pci_dev_info_14e4_169a,
 	&pci_dev_info_14e4_169b,
 	&pci_dev_info_14e4_169c,
 	&pci_dev_info_14e4_169d,
@@ -119772,6 +125832,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_14e4_4306,
 	&pci_dev_info_14e4_4307,
 	&pci_dev_info_14e4_4310,
+	&pci_dev_info_14e4_4311,
 	&pci_dev_info_14e4_4312,
 	&pci_dev_info_14e4_4313,
 	&pci_dev_info_14e4_4315,
@@ -119783,6 +125844,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_14e4_4324,
 	&pci_dev_info_14e4_4325,
 	&pci_dev_info_14e4_4326,
+	&pci_dev_info_14e4_4329,
 	&pci_dev_info_14e4_4401,
 	&pci_dev_info_14e4_4402,
 	&pci_dev_info_14e4_4403,
@@ -120148,7 +126210,12 @@ static const pciDeviceInfo *pci_dev_list
 #endif
 #define pci_dev_list_1540 NULL
 #define pci_dev_list_1541 NULL
-#define pci_dev_list_1542 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_1542[] = {
+	&pci_dev_info_1542_9260,
+	NULL
+};
+#endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_1543[] = {
 	&pci_dev_info_1543_3052,
@@ -120537,6 +126604,7 @@ static const pciDeviceInfo *pci_dev_list
 static const pciDeviceInfo *pci_dev_list_1677[] = {
 	&pci_dev_info_1677_104e,
 	&pci_dev_info_1677_12d7,
+	&pci_dev_info_1677_20ad,
 	NULL
 };
 #endif
@@ -120635,9 +126703,16 @@ static const pciDeviceInfo *pci_dev_list
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_16e5[] = {
+	&pci_dev_info_16e5_6000,
+	NULL
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_16ec[] = {
 	&pci_dev_info_16ec_00ff,
 	&pci_dev_info_16ec_0116,
+	&pci_dev_info_16ec_2f00,
 	&pci_dev_info_16ec_3685,
 	NULL
 };
@@ -120807,7 +126882,23 @@ static const pciDeviceInfo *pci_dev_list
 	NULL
 };
 #endif
+#define pci_dev_list_17db NULL
 #define pci_dev_list_17de NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_17e4[] = {
+	&pci_dev_info_17e4_0001,
+	&pci_dev_info_17e4_0002,
+	NULL
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_17e6[] = {
+	&pci_dev_info_17e6_0010,
+	&pci_dev_info_17e6_0011,
+	&pci_dev_info_17e6_0021,
+	NULL
+};
+#endif
 #define pci_dev_list_17ee NULL
 #define pci_dev_list_17f2 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -120863,10 +126954,12 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_183b_08a7,
 	&pci_dev_info_183b_08a8,
 	&pci_dev_info_183b_08a9,
+	&pci_dev_info_183b_08b0,
 	NULL
 };
 #endif
 #define pci_dev_list_1849 NULL
+#define pci_dev_list_184a NULL
 #define pci_dev_list_1851 NULL
 #define pci_dev_list_1852 NULL
 #define pci_dev_list_1853 NULL
@@ -120896,6 +126989,7 @@ static const pciDeviceInfo *pci_dev_list
 	NULL
 };
 #endif
+#define pci_dev_list_1885 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_1888[] = {
 	&pci_dev_info_1888_0301,
@@ -120913,6 +127007,7 @@ static const pciDeviceInfo *pci_dev_list
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_18ac[] = {
 	&pci_dev_info_18ac_d500,
+	&pci_dev_info_18ac_d800,
 	&pci_dev_info_18ac_d810,
 	&pci_dev_info_18ac_d820,
 	NULL
@@ -120963,6 +127058,14 @@ static const pciDeviceInfo *pci_dev_list
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_18f6[] = {
+	&pci_dev_info_18f6_1000,
+	&pci_dev_info_18f6_1050,
+	&pci_dev_info_18f6_2000,
+	NULL
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_18f7[] = {
 	&pci_dev_info_18f7_0001,
 	&pci_dev_info_18f7_0002,
@@ -120983,6 +127086,7 @@ static const pciDeviceInfo *pci_dev_list
 static const pciDeviceInfo *pci_dev_list_1923[] = {
 	&pci_dev_info_1923_0040,
 	&pci_dev_info_1923_0100,
+	&pci_dev_info_1923_0300,
 	&pci_dev_info_1923_0400,
 	NULL
 };
@@ -121002,7 +127106,18 @@ static const pciDeviceInfo *pci_dev_list
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_194a[] = {
+	&pci_dev_info_194a_1111,
+	&pci_dev_info_194a_1112,
+	&pci_dev_info_194a_1113,
+	&pci_dev_info_194a_1114,
+	&pci_dev_info_194a_1115,
+	NULL
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_1957[] = {
+	&pci_dev_info_1957_0012,
 	&pci_dev_info_1957_0080,
 	&pci_dev_info_1957_0081,
 	&pci_dev_info_1957_0082,
@@ -121022,6 +127137,12 @@ static const pciDeviceInfo *pci_dev_list
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_1969[] = {
+	&pci_dev_info_1969_1048,
+	NULL
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_196a[] = {
 	&pci_dev_info_196a_0101,
 	&pci_dev_info_196a_0102,
@@ -121064,6 +127185,16 @@ static const pciDeviceInfo *pci_dev_list
 #define pci_dev_list_19d4 NULL
 #define pci_dev_list_19e2 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_19e7[] = {
+	&pci_dev_info_19e7_1001,
+	&pci_dev_info_19e7_1002,
+	&pci_dev_info_19e7_1003,
+	&pci_dev_info_19e7_1004,
+	&pci_dev_info_19e7_1005,
+	NULL
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_1a03[] = {
 	&pci_dev_info_1a03_2000,
 	NULL
@@ -121077,6 +127208,7 @@ static const pciDeviceInfo *pci_dev_list
 #endif
 #define pci_dev_list_1a1d NULL
 #define pci_dev_list_1a29 NULL
+#define pci_dev_list_1a51 NULL
 #define pci_dev_list_1b13 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_1c1c[] = {
@@ -121469,6 +127601,7 @@ static const pciDeviceInfo *pci_dev_list
 static const pciDeviceInfo *pci_dev_list_7063[] = {
 	&pci_dev_info_7063_2000,
 	&pci_dev_info_7063_3000,
+	&pci_dev_info_7063_5500,
 	NULL
 };
 #endif
@@ -121585,12 +127718,17 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_8086_1040,
 	&pci_dev_info_8086_1043,
 	&pci_dev_info_8086_1048,
+	&pci_dev_info_8086_1049,
+	&pci_dev_info_8086_104a,
 	&pci_dev_info_8086_104b,
+	&pci_dev_info_8086_104c,
+	&pci_dev_info_8086_104d,
 	&pci_dev_info_8086_1050,
 	&pci_dev_info_8086_1051,
 	&pci_dev_info_8086_1052,
 	&pci_dev_info_8086_1053,
 	&pci_dev_info_8086_1059,
+	&pci_dev_info_8086_105b,
 	&pci_dev_info_8086_105e,
 	&pci_dev_info_8086_105f,
 	&pci_dev_info_8086_1060,
@@ -121641,6 +127779,9 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_8086_10b3,
 	&pci_dev_info_8086_10b4,
 	&pci_dev_info_8086_10b5,
+	&pci_dev_info_8086_10b9,
+	&pci_dev_info_8086_10ba,
+	&pci_dev_info_8086_10bb,
 	&pci_dev_info_8086_1107,
 	&pci_dev_info_8086_1130,
 	&pci_dev_info_8086_1131,
@@ -121827,7 +127968,6 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_8086_25e5,
 	&pci_dev_info_8086_25e6,
 	&pci_dev_info_8086_25e7,
-	&pci_dev_info_8086_25e8,
 	&pci_dev_info_8086_25f0,
 	&pci_dev_info_8086_25f1,
 	&pci_dev_info_8086_25f3,
@@ -121990,8 +128130,12 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_8086_2972,
 	&pci_dev_info_8086_2973,
 	&pci_dev_info_8086_2974,
+	&pci_dev_info_8086_2975,
 	&pci_dev_info_8086_2976,
 	&pci_dev_info_8086_2977,
+	&pci_dev_info_8086_2980,
+	&pci_dev_info_8086_2981,
+	&pci_dev_info_8086_2982,
 	&pci_dev_info_8086_2990,
 	&pci_dev_info_8086_2991,
 	&pci_dev_info_8086_2992,
@@ -122012,6 +128156,10 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_8086_2a01,
 	&pci_dev_info_8086_2a02,
 	&pci_dev_info_8086_2a03,
+	&pci_dev_info_8086_2a04,
+	&pci_dev_info_8086_2a05,
+	&pci_dev_info_8086_2a06,
+	&pci_dev_info_8086_2a07,
 	&pci_dev_info_8086_3092,
 	&pci_dev_info_8086_3200,
 	&pci_dev_info_8086_3340,
@@ -122050,11 +128198,18 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_8086_359a,
 	&pci_dev_info_8086_359b,
 	&pci_dev_info_8086_359e,
+	&pci_dev_info_8086_35b0,
+	&pci_dev_info_8086_35b1,
+	&pci_dev_info_8086_35b5,
+	&pci_dev_info_8086_35b6,
+	&pci_dev_info_8086_35b7,
+	&pci_dev_info_8086_35c8,
 	&pci_dev_info_8086_4220,
 	&pci_dev_info_8086_4222,
 	&pci_dev_info_8086_4223,
 	&pci_dev_info_8086_4224,
 	&pci_dev_info_8086_4227,
+	&pci_dev_info_8086_5001,
 	&pci_dev_info_8086_5200,
 	&pci_dev_info_8086_5201,
 	&pci_dev_info_8086_530d,
@@ -122125,6 +128280,12 @@ static const pciDeviceInfo *pci_dev_list
 };
 #define pci_dev_list_8401 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_8686[] = {
+	&pci_dev_info_8686_1010,
+	NULL
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_8800[] = {
 	&pci_dev_info_8800_2008,
 	NULL
@@ -122258,6 +128419,14 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_9005_0284,
 	&pci_dev_info_9005_0285,
 	&pci_dev_info_9005_0286,
+	&pci_dev_info_9005_0410,
+	&pci_dev_info_9005_0412,
+	&pci_dev_info_9005_041e,
+	&pci_dev_info_9005_041f,
+	&pci_dev_info_9005_0430,
+	&pci_dev_info_9005_0432,
+	&pci_dev_info_9005_043e,
+	&pci_dev_info_9005_043f,
 	&pci_dev_info_9005_0500,
 	&pci_dev_info_9005_0503,
 	&pci_dev_info_9005_0910,
@@ -122354,10 +128523,12 @@ static const pciDeviceInfo *pci_dev_list
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_affe[] = {
+	&pci_dev_info_affe_02e1,
 	&pci_dev_info_affe_dead,
 	NULL
 };
 #endif
+#define pci_dev_list_b10b NULL
 #define pci_dev_list_b1b3 NULL
 #define pci_dev_list_bd11 NULL
 #define pci_dev_list_c001 NULL
@@ -122372,6 +128543,7 @@ static const pciDeviceInfo *pci_dev_list
 };
 #endif
 #define pci_dev_list_cccc NULL
+#define pci_dev_list_ccec NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_cddd[] = {
 	&pci_dev_info_cddd_0101,
@@ -122587,12 +128759,18 @@ static const pciVendorInfo pciVendorInfo
 	{0x045e, pci_vendor_045e, pci_dev_list_045e},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x0482, pci_vendor_0482, pci_dev_list_0482},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x04cf, pci_vendor_04cf, pci_dev_list_04cf},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x050d, pci_vendor_050d, pci_dev_list_050d},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x05a9, pci_vendor_05a9, pci_dev_list_05a9},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x05e3, pci_vendor_05e3, pci_dev_list_05e3},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -122614,6 +128792,9 @@ static const pciVendorInfo pciVendorInfo
 	{0x0925, pci_vendor_0925, pci_dev_list_0925},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x093a, pci_vendor_093a, pci_dev_list_093a},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x09c1, pci_vendor_09c1, pci_dev_list_09c1},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -122625,6 +128806,9 @@ static const pciVendorInfo pciVendorInfo
 #ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x0b49, pci_vendor_0b49, pci_dev_list_0b49},
 #endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x0ccd, pci_vendor_0ccd, pci_dev_list_0ccd},
+#endif
 	{0x0e11, pci_vendor_0e11, pci_dev_list_0e11},
 #ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x0e21, pci_vendor_0e21, pci_dev_list_0e21},
@@ -122633,6 +128817,9 @@ static const pciVendorInfo pciVendorInfo
 	{0x0e55, pci_vendor_0e55, pci_dev_list_0e55},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x0eac, pci_vendor_0eac, pci_dev_list_0eac},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1000, pci_vendor_1000, pci_dev_list_1000},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -127196,6 +133383,9 @@ static const pciVendorInfo pciVendorInfo
 	{0x16e3, pci_vendor_16e3, pci_dev_list_16e3},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x16e5, pci_vendor_16e5, pci_dev_list_16e5},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x16ec, pci_vendor_16ec, pci_dev_list_16ec},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -127310,9 +133500,18 @@ static const pciVendorInfo pciVendorInfo
 	{0x17d5, pci_vendor_17d5, pci_dev_list_17d5},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x17db, pci_vendor_17db, pci_dev_list_17db},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x17de, pci_vendor_17de, pci_dev_list_17de},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x17e4, pci_vendor_17e4, pci_dev_list_17e4},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x17e6, pci_vendor_17e6, pci_dev_list_17e6},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x17ee, pci_vendor_17ee, pci_dev_list_17ee},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -127355,6 +133554,9 @@ static const pciVendorInfo pciVendorInfo
 	{0x1849, pci_vendor_1849, pci_dev_list_1849},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x184a, pci_vendor_184a, pci_dev_list_184a},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1851, pci_vendor_1851, pci_dev_list_1851},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -127382,6 +133584,9 @@ static const pciVendorInfo pciVendorInfo
 	{0x187e, pci_vendor_187e, pci_dev_list_187e},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x1885, pci_vendor_1885, pci_dev_list_1885},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1888, pci_vendor_1888, pci_dev_list_1888},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -127433,6 +133638,9 @@ static const pciVendorInfo pciVendorInfo
 	{0x18ec, pci_vendor_18ec, pci_dev_list_18ec},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x18f6, pci_vendor_18f6, pci_dev_list_18f6},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x18f7, pci_vendor_18f7, pci_dev_list_18f7},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -127457,6 +133665,9 @@ static const pciVendorInfo pciVendorInfo
 	{0x1942, pci_vendor_1942, pci_dev_list_1942},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x194a, pci_vendor_194a, pci_dev_list_194a},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1957, pci_vendor_1957, pci_dev_list_1957},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -127466,6 +133677,9 @@ static const pciVendorInfo pciVendorInfo
 	{0x1966, pci_vendor_1966, pci_dev_list_1966},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x1969, pci_vendor_1969, pci_dev_list_1969},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x196a, pci_vendor_196a, pci_dev_list_196a},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -127499,6 +133713,9 @@ static const pciVendorInfo pciVendorInfo
 	{0x19e2, pci_vendor_19e2, pci_dev_list_19e2},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x19e7, pci_vendor_19e7, pci_dev_list_19e7},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1a03, pci_vendor_1a03, pci_dev_list_1a03},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -127511,6 +133728,9 @@ static const pciVendorInfo pciVendorInfo
 	{0x1a29, pci_vendor_1a29, pci_dev_list_1a29},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x1a51, pci_vendor_1a51, pci_dev_list_1a51},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1b13, pci_vendor_1b13, pci_dev_list_1b13},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -127738,6 +133958,9 @@ static const pciVendorInfo pciVendorInfo
 	{0x8401, pci_vendor_8401, pci_dev_list_8401},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x8686, pci_vendor_8686, pci_dev_list_8686},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x8800, pci_vendor_8800, pci_dev_list_8800},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -127819,6 +134042,9 @@ static const pciVendorInfo pciVendorInfo
 	{0xaffe, pci_vendor_affe, pci_dev_list_affe},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0xb10b, pci_vendor_b10b, pci_dev_list_b10b},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0xb1b3, pci_vendor_b1b3, pci_dev_list_b1b3},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -127846,6 +134072,9 @@ static const pciVendorInfo pciVendorInfo
 	{0xcccc, pci_vendor_cccc, pci_dev_list_cccc},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0xccec, pci_vendor_ccec, pci_dev_list_ccec},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0xcddd, pci_vendor_cddd, pci_dev_list_cddd},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -127991,12 +134220,18 @@ static const pciVendorSubsysInfo pciVend
 	{0x045e, pci_vendor_045e, pci_ss_list_045e},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x0482, pci_vendor_0482, pci_ss_list_0482},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x04cf, pci_vendor_04cf, pci_ss_list_04cf},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x050d, pci_vendor_050d, pci_ss_list_050d},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x05a9, pci_vendor_05a9, pci_ss_list_05a9},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x05e3, pci_vendor_05e3, pci_ss_list_05e3},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -128018,6 +134253,9 @@ static const pciVendorSubsysInfo pciVend
 	{0x0925, pci_vendor_0925, pci_ss_list_0925},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x093a, pci_vendor_093a, pci_ss_list_093a},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x09c1, pci_vendor_09c1, pci_ss_list_09c1},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -128029,6 +134267,9 @@ static const pciVendorSubsysInfo pciVend
 #ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x0b49, pci_vendor_0b49, pci_ss_list_0b49},
 #endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x0ccd, pci_vendor_0ccd, pci_ss_list_0ccd},
+#endif
 	{0x0e11, pci_vendor_0e11, pci_ss_list_0e11},
 #ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x0e21, pci_vendor_0e21, pci_ss_list_0e21},
@@ -128037,6 +134278,9 @@ static const pciVendorSubsysInfo pciVend
 	{0x0e55, pci_vendor_0e55, pci_ss_list_0e55},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x0eac, pci_vendor_0eac, pci_ss_list_0eac},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1000, pci_vendor_1000, pci_ss_list_1000},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -132600,6 +138844,9 @@ static const pciVendorSubsysInfo pciVend
 	{0x16e3, pci_vendor_16e3, pci_ss_list_16e3},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x16e5, pci_vendor_16e5, pci_ss_list_16e5},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x16ec, pci_vendor_16ec, pci_ss_list_16ec},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -132714,9 +138961,18 @@ static const pciVendorSubsysInfo pciVend
 	{0x17d5, pci_vendor_17d5, pci_ss_list_17d5},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x17db, pci_vendor_17db, pci_ss_list_17db},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x17de, pci_vendor_17de, pci_ss_list_17de},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x17e4, pci_vendor_17e4, pci_ss_list_17e4},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x17e6, pci_vendor_17e6, pci_ss_list_17e6},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x17ee, pci_vendor_17ee, pci_ss_list_17ee},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -132759,6 +139015,9 @@ static const pciVendorSubsysInfo pciVend
 	{0x1849, pci_vendor_1849, pci_ss_list_1849},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x184a, pci_vendor_184a, pci_ss_list_184a},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1851, pci_vendor_1851, pci_ss_list_1851},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -132786,6 +139045,9 @@ static const pciVendorSubsysInfo pciVend
 	{0x187e, pci_vendor_187e, pci_ss_list_187e},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x1885, pci_vendor_1885, pci_ss_list_1885},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1888, pci_vendor_1888, pci_ss_list_1888},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -132837,6 +139099,9 @@ static const pciVendorSubsysInfo pciVend
 	{0x18ec, pci_vendor_18ec, pci_ss_list_18ec},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x18f6, pci_vendor_18f6, pci_ss_list_18f6},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x18f7, pci_vendor_18f7, pci_ss_list_18f7},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -132861,6 +139126,9 @@ static const pciVendorSubsysInfo pciVend
 	{0x1942, pci_vendor_1942, pci_ss_list_1942},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x194a, pci_vendor_194a, pci_ss_list_194a},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1957, pci_vendor_1957, pci_ss_list_1957},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -132870,6 +139138,9 @@ static const pciVendorSubsysInfo pciVend
 	{0x1966, pci_vendor_1966, pci_ss_list_1966},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x1969, pci_vendor_1969, pci_ss_list_1969},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x196a, pci_vendor_196a, pci_ss_list_196a},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -132903,6 +139174,9 @@ static const pciVendorSubsysInfo pciVend
 	{0x19e2, pci_vendor_19e2, pci_ss_list_19e2},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x19e7, pci_vendor_19e7, pci_ss_list_19e7},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1a03, pci_vendor_1a03, pci_ss_list_1a03},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -132915,6 +139189,9 @@ static const pciVendorSubsysInfo pciVend
 	{0x1a29, pci_vendor_1a29, pci_ss_list_1a29},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x1a51, pci_vendor_1a51, pci_ss_list_1a51},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1b13, pci_vendor_1b13, pci_ss_list_1b13},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -133142,6 +139419,9 @@ static const pciVendorSubsysInfo pciVend
 	{0x8401, pci_vendor_8401, pci_ss_list_8401},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x8686, pci_vendor_8686, pci_ss_list_8686},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x8800, pci_vendor_8800, pci_ss_list_8800},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -133223,6 +139503,9 @@ static const pciVendorSubsysInfo pciVend
 	{0xaffe, pci_vendor_affe, pci_ss_list_affe},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0xb10b, pci_vendor_b10b, pci_ss_list_b10b},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0xb1b3, pci_vendor_b1b3, pci_ss_list_b1b3},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -133250,6 +139533,9 @@ static const pciVendorSubsysInfo pciVend
 	{0xcccc, pci_vendor_cccc, pci_ss_list_cccc},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0xccec, pci_vendor_ccec, pci_ss_list_ccec},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0xcddd, pci_vendor_cddd, pci_ss_list_cddd},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
diff-tree 96edf7b853c1045d12d957a2957a11879100a2de (from df800d87e04ce984a8a9ab4252ac6478ab1e4426)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Oct 3 17:48:50 2006 -0700

    Don't insert RCS tag into generated pci id header files

diff --git a/hw/xfree86/scanpci/pciid2c.pl b/hw/xfree86/scanpci/pciid2c.pl
index db6b1a9..b8947ed 100644
--- a/hw/xfree86/scanpci/pciid2c.pl
+++ b/hw/xfree86/scanpci/pciid2c.pl
@@ -135,8 +135,7 @@ if ($infofile) {
 # Print out header information.
 
 $proj = "XdotOrg";
-print "/* \$$proj\$ */
-
+print "
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT
  *
diff-tree 75e0cc41b201b9ceb2615e7cec0dd5b4c136b343 (from parents)
Merge: 6926776f0ecd1e8e81c5c40ccd3a97227bc44dcb 20c0ceedfbce9ae5c70703900b52973917ac4cd0
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Tue Oct 3 13:58:03 2006 -0400

    Merge branch 'my-XACE-modular' into my-XACE-SELINUX

diff-tree df800d87e04ce984a8a9ab4252ac6478ab1e4426 (from d7c89c7c1c8c1e110345d9d8d300adbf5fe5804a)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Mon Oct 2 11:28:47 2006 -0700

    Add (void) casts to clear compiler errors about ?: results having type mismatch

diff --git a/fb/fb.h b/fb/fb.h
index edd9392..de0b3a8 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -488,20 +488,20 @@ extern void fbSetBits (FbStip *bits, int
  * The term "lane" comes from the hardware term "byte-lane" which
  */
 
-#define FbLaneCase1(n,a,o)  ((n) == 0x01 ? \
+#define FbLaneCase1(n,a,o)  ((n) == 0x01 ? (void) \
 			     WRITE((CARD8 *) ((a)+FbPatternOffset(o,CARD8)), \
-			      fgxor) : 0)
-#define FbLaneCase2(n,a,o)  ((n) == 0x03 ? \
+			      fgxor) : (void) 0)
+#define FbLaneCase2(n,a,o)  ((n) == 0x03 ? (void) \
 			     WRITE((CARD16 *) ((a)+FbPatternOffset(o,CARD16)), \
 			      fgxor) : \
 			     ((void)FbLaneCase1((n)&1,a,o), \
 				    FbLaneCase1((n)>>1,a,(o)+1)))
-#define FbLaneCase4(n,a,o)  ((n) == 0x0f ? \
+#define FbLaneCase4(n,a,o)  ((n) == 0x0f ? (void) \
 			     WRITE((CARD32 *) ((a)+FbPatternOffset(o,CARD32)), \
 			      fgxor) : \
 			     ((void)FbLaneCase2((n)&3,a,o), \
 				    FbLaneCase2((n)>>2,a,(o)+2)))
-#define FbLaneCase8(n,a,o)  ((n) == 0x0ff ? (*(FbBits *) ((a)+(o)) = fgxor) : \
+#define FbLaneCase8(n,a,o)  ((n) == 0x0ff ? (void) (*(FbBits *) ((a)+(o)) = fgxor) : \
 			     ((void)FbLaneCase4((n)&15,a,o), \
 				    FbLaneCase4((n)>>4,a,(o)+4)))
 
diff-tree d7c89c7c1c8c1e110345d9d8d300adbf5fe5804a (from d6ea96b13e2ea01c51998c41ae2a3677bdedf61c)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Mon Oct 2 02:15:36 2006 +0300

    symlink-mesa.sh: expand *.{c,h}

diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh
index 88dddfc..c14c683 100755
--- a/GL/symlink-mesa.sh
+++ b/GL/symlink-mesa.sh
@@ -62,7 +62,7 @@ symlink_mesa_glapi() {
     src_dir src/mesa/glapi
     dst_dir mesa/glapi
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -71,7 +71,7 @@ symlink_mesa_main() {
     src_dir src/mesa/main
     dst_dir mesa/main
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -80,7 +80,7 @@ symlink_mesa_math() {
     src_dir src/mesa/math
     dst_dir mesa/math
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -89,7 +89,7 @@ symlink_mesa_ac() {
     src_dir src/mesa/array_cache
     dst_dir mesa/array_cache
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -98,7 +98,7 @@ symlink_mesa_swrast() {
     src_dir src/mesa/swrast
     dst_dir mesa/swrast
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -107,7 +107,7 @@ symlink_mesa_ss() {
     src_dir src/mesa/swrast_setup
     dst_dir mesa/swrast_setup
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -116,7 +116,7 @@ symlink_mesa_tnl() {
     src_dir src/mesa/tnl
     dst_dir mesa/tnl
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -125,7 +125,7 @@ symlink_mesa_shader() {
     src_dir src/mesa/shader
     dst_dir mesa/shader
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -134,7 +134,7 @@ symlink_mesa_shader_grammar() {
     src_dir src/mesa/shader/grammar
     dst_dir mesa/shader/grammar
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -143,7 +143,7 @@ symlink_mesa_shader_slang() {
     src_dir src/mesa/shader/slang
     dst_dir mesa/shader/slang
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -152,7 +152,7 @@ symlink_mesa_shader_slang_library() {
     src_dir src/mesa/shader/slang/library
     dst_dir mesa/shader/slang/library
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }        
diff-tree d6ea96b13e2ea01c51998c41ae2a3677bdedf61c (from 84eb2c0a06de60e88e14bb03fabe661d7cd8f1d3)
Author: Ivan Pascal <pascal at info.tsu.ru>
Date:   Mon Oct 2 02:17:14 2006 +0300

    xkb: fix wrapping when switching between groups
    Use XkbCharToInt as that's what we're doing.

diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index ee0abbe..26ff35e 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -754,12 +754,12 @@ unsigned char	grp;
 
 
     grp= state->locked_group;
-    if (grp>=ctrls->num_groups || grp < 0)
-	state->locked_group= XkbAdjustGroup(grp,ctrls);
+    if (grp>=ctrls->num_groups)
+	state->locked_group= XkbAdjustGroup(XkbCharToInt(grp),ctrls);
 
     grp= state->locked_group+state->base_group+state->latched_group;
-    if (grp>=ctrls->num_groups || grp < 0)
-	 state->group= XkbAdjustGroup(grp,ctrls);
+    if (grp>=ctrls->num_groups)
+	 state->group= XkbAdjustGroup(XkbCharToInt(grp),ctrls);
     else state->group= grp;
     XkbComputeCompatState(xkbi);
     return;
diff-tree 20c0ceedfbce9ae5c70703900b52973917ac4cd0 (from parents)
Merge: 49a70c8570b03aff8239324a2474918a6fbc52a0 84eb2c0a06de60e88e14bb03fabe661d7cd8f1d3
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Fri Sep 29 15:37:00 2006 -0400

    Merge branch 'master' into my-XACE-modular

diff-tree 84eb2c0a06de60e88e14bb03fabe661d7cd8f1d3 (from 4bc5dc2854e33bf343cdea44a3c3b4c41f6f4145)
Author: Brian <brian at yutani.localnet.net>
Date:   Thu Sep 28 15:09:40 2006 -0600

    Replace hard-coded filesnames with loops (all .c and .h files).
    Should fix problems with Mesa adding/removing source files, for the most part.
    Patch by Dan Nicholson.

diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh
index a836866..88dddfc 100755
--- a/GL/symlink-mesa.sh
+++ b/GL/symlink-mesa.sh
@@ -62,417 +62,99 @@ symlink_mesa_glapi() {
     src_dir src/mesa/glapi
     dst_dir mesa/glapi
 
-    action dispatch.h
-    action glapi.c
-    action glapi.h
-    action glapioffsets.h
-    action glapitable.h
-    action glapitemp.h
-    action glprocs.h
-    action glthread.c
-    action glthread.h
+    for src in $REAL_SRC_DIR/*.{c,h}; do
+        action `basename $src`
+    done
 }
 
 symlink_mesa_main() {
     src_dir src/mesa/main
     dst_dir mesa/main
 
-    action accum.c
-    action accum.h
-    action api_arrayelt.c
-    action api_arrayelt.h
-    action api_eval.h
-    action api_loopback.c
-    action api_loopback.h
-    action api_noop.c
-    action api_noop.h
-    action api_validate.c
-    action api_validate.h
-    action arrayobj.c
-    action arrayobj.h
-    action attrib.c
-    action attrib.h
-    action bitset.h
-    action blend.c
-    action blend.h
-    action bufferobj.c
-    action bufferobj.h
-    action buffers.c
-    action buffers.h
-    action clip.c
-    action clip.h
-    action colormac.h
-    action colortab.c
-    action colortab.h
-    action config.h
-    action context.c
-    action context.h
-    action convolve.c
-    action convolve.h
-    action dd.h
-    action debug.c
-    action debug.h
-    action depth.c
-    action depth.h
-    action depthstencil.c
-    action depthstencil.h
-    action dlist.c
-    action dlist.h
-    action drawpix.c
-    action drawpix.h
-    action enable.c
-    action enable.h
-    action enums.c
-    action enums.h
-    action eval.c
-    action eval.h
-    action execmem.c
-    action extensions.c
-    action extensions.h
-    action fbobject.c
-    action fbobject.h
-    action feedback.c
-    action feedback.h
-    action fog.c
-    action fog.h
-    action framebuffer.c
-    action framebuffer.h
-    action get.c
-    action get.h
-    action getstring.c
-    action glheader.h
-    action hash.c
-    action hash.h
-    action hint.c
-    action hint.h
-    action histogram.c
-    action histogram.h
-    action image.c
-    action image.h
-    action imports.c
-    action imports.h
-    action light.c
-    action light.h
-    action lines.c
-    action lines.h
-    action macros.h
-    action matrix.c
-    action matrix.h
-    action mm.c
-    action mm.h
-    action mtypes.h
-    action occlude.c
-    action occlude.h
-    action pixel.c
-    action pixel.h
-    action points.c
-    action points.h
-    action polygon.c
-    action polygon.h
-    action rastpos.c
-    action rastpos.h
-    action rbadaptors.c
-    action rbadaptors.h
-    action renderbuffer.c
-    action renderbuffer.h
-    action simple_list.h
-    action state.c
-    action state.h
-    action stencil.c
-    action stencil.h
-    action texcompress.c
-    action texcompress.h
-    action texcompress_fxt1.c
-    action texcompress_s3tc.c
-    action texenvprogram.c
-    action texenvprogram.h
-    action texformat.c
-    action texformat.h
-    action texformat_tmp.h
-    action teximage.c
-    action teximage.h
-    action texobj.c
-    action texobj.h
-    action texrender.c
-    action texrender.h
-    action texstate.c
-    action texstate.h
-    action texstore.c
-    action texstore.h
-    action varray.c
-    action varray.h
-    action version.h
-    action vsnprintf.c
-    action vtxfmt.c
-    action vtxfmt.h
-    action vtxfmt_tmp.h
+    for src in $REAL_SRC_DIR/*.{c,h}; do
+        action `basename $src`
+    done
 }
 
 symlink_mesa_math() {
     src_dir src/mesa/math
     dst_dir mesa/math
 
-    action m_clip_tmp.h
-    action m_copy_tmp.h
-    action m_debug.h
-    action m_debug_clip.c
-    action m_debug_norm.c
-    action m_debug_util.h
-    action m_debug_xform.c
-    action m_dotprod_tmp.h
-    action m_eval.c
-    action m_eval.h
-    action m_matrix.c
-    action m_matrix.h
-    action m_norm_tmp.h
-    action m_trans_tmp.h
-    action m_translate.c
-    action m_translate.h
-    action m_vector.c
-    action m_vector.h
-    action m_xform.c
-    action m_xform.h
-    action m_xform_tmp.h
-    action mathmod.h
+    for src in $REAL_SRC_DIR/*.{c,h}; do
+        action `basename $src`
+    done
 }
 
 symlink_mesa_ac() {
     src_dir src/mesa/array_cache
     dst_dir mesa/array_cache
 
-    action ac_context.c
-    action ac_context.h
-    action ac_import.c
-    action acache.h
+    for src in $REAL_SRC_DIR/*.{c,h}; do
+        action `basename $src`
+    done
 }
 
 symlink_mesa_swrast() {
     src_dir src/mesa/swrast
     dst_dir mesa/swrast
 
-    action s_aaline.c
-    action s_aaline.h
-    action s_aalinetemp.h
-    action s_aatriangle.c
-    action s_aatriangle.h
-    action s_aatritemp.h
-    action s_accum.c
-    action s_accum.h
-    action s_alpha.c
-    action s_alpha.h
-    action s_arbshader.c
-    action s_arbshader.h
-    action s_atifragshader.c
-    action s_atifragshader.h
-    action s_bitmap.c
-    action s_blend.c
-    action s_blend.h
-    action s_blit.c
-    action s_buffers.c
-    action s_context.c
-    action s_context.h
-    action s_copypix.c
-    action s_depth.c
-    action s_depth.h
-    action s_drawpix.c
-    action s_drawpix.h
-    action s_feedback.c
-    action s_feedback.h
-    action s_fog.c
-    action s_fog.h
-    action s_imaging.c
-    action s_lines.c
-    action s_lines.h
-    action s_linetemp.h
-    action s_logic.c
-    action s_logic.h
-    action s_masking.c
-    action s_masking.h
-    action s_nvfragprog.c
-    action s_nvfragprog.h
-    action s_points.c
-    action s_points.h
-    action s_pointtemp.h
-    action s_readpix.c
-    action s_span.c
-    action s_span.h
-    action s_spantemp.h
-    action s_stencil.c
-    action s_stencil.h
-    action s_texcombine.c
-    action s_texcombine.h
-    action s_texfilter.c
-    action s_texfilter.h
-    action s_texstore.c
-    action s_triangle.c
-    action s_triangle.h
-    action s_trispan.h
-    action s_tritemp.h
-    action s_zoom.c
-    action s_zoom.h
-    action swrast.h
+    for src in $REAL_SRC_DIR/*.{c,h}; do
+        action `basename $src`
+    done
 }
 
 symlink_mesa_ss() {
     src_dir src/mesa/swrast_setup
     dst_dir mesa/swrast_setup
 
-    action ss_context.c
-    action ss_context.h
-    action ss_triangle.c
-    action ss_triangle.h
-    action ss_tritmp.h
-    action ss_vb.h
-    action swrast_setup.h
+    for src in $REAL_SRC_DIR/*.{c,h}; do
+        action `basename $src`
+    done
 }
 
 symlink_mesa_tnl() {
     src_dir src/mesa/tnl
     dst_dir mesa/tnl
 
-    action t_array_api.c
-    action t_array_api.h
-    action t_array_import.c
-    action t_array_import.h
-    action t_context.c
-    action t_context.h
-    action t_pipeline.c
-    action t_pipeline.h
-    action t_save_api.c
-    action t_save_api.h
-    action t_save_loopback.c
-    action t_save_playback.c
-    action t_vb_arbprogram.c
-    action t_vb_arbprogram.h
-    action t_vb_arbprogram_sse.c
-    action t_vb_arbshader.c
-    action t_vb_cliptmp.h
-    action t_vb_cull.c
-    action t_vb_fog.c
-    action t_vb_light.c
-    action t_vb_lighttmp.h
-    action t_vb_normals.c
-    action t_vb_points.c
-    action t_vb_program.c
-    action t_vb_render.c
-    action t_vb_rendertmp.h
-    action t_vb_texgen.c
-    action t_vb_texmat.c
-    action t_vb_vertex.c
-    action t_vertex.c
-    action t_vertex.h
-    action t_vertex_generic.c
-    action t_vertex_sse.c
-    action t_vp_build.c
-    action t_vp_build.h
-    action t_vtx_api.c
-    action t_vtx_api.h
-    action t_vtx_eval.c
-    action t_vtx_exec.c
-    action t_vtx_generic.c
-    action t_vtx_x86.c
-    action tnl.h
+    for src in $REAL_SRC_DIR/*.{c,h}; do
+        action `basename $src`
+    done
 }
 
 symlink_mesa_shader() {
     src_dir src/mesa/shader
     dst_dir mesa/shader
 
-    action arbprogparse.c
-    action arbprogparse.h
-    action arbprogram.c
-    action arbprogram.h
-    action arbprogram_syn.h
-    action atifragshader.c
-    action atifragshader.h
-    action nvfragparse.c
-    action nvfragparse.h
-    action nvprogram.c
-    action nvprogram.h
-    action nvvertexec.c
-    action nvvertexec.h
-    action nvvertparse.c
-    action nvvertparse.h
-    action program.c
-    action program.h
-    action program_instruction.h
-    action shaderobjects.c
-    action shaderobjects.h
-    action shaderobjects_3dlabs.c
-    action shaderobjects_3dlabs.h
+    for src in $REAL_SRC_DIR/*.{c,h}; do
+        action `basename $src`
+    done
 }
 
 symlink_mesa_shader_grammar() {
     src_dir src/mesa/shader/grammar
     dst_dir mesa/shader/grammar
 
-    action grammar.c
-    action grammar.h
-    action grammar_syn.h
-    action grammar_mesa.c
-    action grammar_mesa.h
+    for src in $REAL_SRC_DIR/*.{c,h}; do
+        action `basename $src`
+    done
 }
 
 symlink_mesa_shader_slang() {
     src_dir src/mesa/shader/slang
     dst_dir mesa/shader/slang
 
-    action slang_analyse.c
-    action slang_analyse.h
-    action slang_assemble.c
-    action slang_assemble.h
-    action slang_assemble_assignment.c
-    action slang_assemble_assignment.h
-    action slang_assemble_conditional.c
-    action slang_assemble_conditional.h
-    action slang_assemble_constructor.c
-    action slang_assemble_constructor.h
-    action slang_assemble_typeinfo.c
-    action slang_assemble_typeinfo.h
-    action slang_compile.c
-    action slang_compile.h
-    action slang_compile_function.c
-    action slang_compile_function.h
-    action slang_compile_operation.c
-    action slang_compile_operation.h
-    action slang_compile_struct.c
-    action slang_compile_struct.h
-    action slang_compile_variable.c
-    action slang_compile_variable.h
-    action slang_execute.c
-    action slang_execute.h
-    action slang_execute_x86.c
-    action slang_export.c
-    action slang_export.h
-    action slang_library_noise.c
-    action slang_library_noise.h
-    action slang_library_texsample.c
-    action slang_library_texsample.h
-    action slang_link.c
-    action slang_link.h
-    action slang_mesa.h
-    action slang_preprocess.c
-    action slang_preprocess.h
-    action slang_storage.c
-    action slang_storage.h
-    action slang_utility.c
-    action slang_utility.h
-    action traverse_wrap.h
+    for src in $REAL_SRC_DIR/*.{c,h}; do
+        action `basename $src`
+    done
 }
 
 symlink_mesa_shader_slang_library() {
     src_dir src/mesa/shader/slang/library
     dst_dir mesa/shader/slang/library
 
-    action slang_builtin_vec4_gc.h
-    action slang_common_builtin_gc.h
-    action slang_core_gc.h
-    action slang_fragment_builtin_gc.h
-    action slang_shader_syn.h
-    action slang_pp_directives_syn.h
-    action slang_pp_expression_syn.h
-    action slang_pp_version_syn.h
-    action slang_vertex_builtin_gc.h
+    for src in $REAL_SRC_DIR/*.{c,h}; do
+        action `basename $src`
+    done
 }        
 
 symlink_mesa_x() {
diff-tree 4bc5dc2854e33bf343cdea44a3c3b4c41f6f4145 (from parents)
Merge: cf6e9687ffcc52af0d64e9098186570719a575a2 f9542e749544c7a3084fd72ecc6642ca3262f7c7
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Thu Sep 28 13:27:13 2006 -0700

    Merge branch 'wfb'

diff-tree f9542e749544c7a3084fd72ecc6642ca3262f7c7 (from d16e83413e7e06adebd629d04de57bbedd8c3765)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Thu Sep 28 13:26:54 2006 -0700

    Restore the global xx* symbols and add them to wfbrename.h.
    
    I don't think they're ever used, but it's best to just leave them alone for ABI
    compatibility.

diff --git a/fb/fbpseudocolor.c b/fb/fbpseudocolor.c
index 53bfb14..271e981 100644
--- a/fb/fbpseudocolor.c
+++ b/fb/fbpseudocolor.c
@@ -143,10 +143,10 @@ typedef struct _xxGCPriv {
 				      (pGC)->devPrivates[xxGCPrivateIndex].ptr)
 #define xxGCPriv(pGC)   xxGCPrivPtr  pGCPriv = xxGetGCPriv(pGC)
 
-static int xxScrPrivateIndex = -1;
-static int xxGCPrivateIndex;
-static int xxColormapPrivateIndex = -1;
-static int xxGeneration;
+int xxScrPrivateIndex = -1;
+int xxGCPrivateIndex;
+int xxColormapPrivateIndex = -1;
+int xxGeneration;
 
 
 #define wrap(priv,real,mem,func) {\
@@ -1199,7 +1199,7 @@ xxSetup(ScreenPtr pScreen, int myDepth, 
     return TRUE;
 }
 
-static GCFuncs xxGCFuncs = {
+GCFuncs xxGCFuncs = {
     xxValidateGC, xxChangeGC, xxCopyGC, xxDestroyGC,
     xxChangeClip, xxDestroyClip, xxCopyClip
 };
diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index 4c3bc17..8f875c8 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -187,6 +187,12 @@
 #define fbWinPrivateIndex wfbWinPrivateIndex
 #define fbZeroLine wfbZeroLine
 #define fbZeroSegment wfbZeroSegment
+#define xxScrPrivateIndex wfbxxScrPrivateIndex
+#define xxGCPrivateIndex wfbxxGCPrivateIndex
+#define xxColormapPrivateIndex wfbxxColormapPrivateIndex
+#define xxGeneration wfbxxGeneration
 #define xxPrintVisuals wfbxxPrintVisuals
+#define xxGCFuncs wfbxxGCFuncs
+#define xxGCOps wfbxxGCOps
 #define xxSetup wfbxxSetup
 #define composeFunctions wfbComposeFunctions
diff-tree cf6e9687ffcc52af0d64e9098186570719a575a2 (from 2206a92a97901977910a6e39b4174ca805f9f4a7)
Author: Jeff Smith <whydoubt at yahoo.com>
Date:   Thu Sep 28 15:34:17 2006 -0400

    Bug #8449: Yet another Mesa symlink script resync.

diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh
index 7b5ed5c..a836866 100755
--- a/GL/symlink-mesa.sh
+++ b/GL/symlink-mesa.sh
@@ -464,10 +464,13 @@ symlink_mesa_shader_slang_library() {
     src_dir src/mesa/shader/slang/library
     dst_dir mesa/shader/slang/library
 
+    action slang_builtin_vec4_gc.h
     action slang_common_builtin_gc.h
     action slang_core_gc.h
     action slang_fragment_builtin_gc.h
     action slang_shader_syn.h
+    action slang_pp_directives_syn.h
+    action slang_pp_expression_syn.h
     action slang_pp_version_syn.h
     action slang_vertex_builtin_gc.h
 }        
diff-tree 2206a92a97901977910a6e39b4174ca805f9f4a7 (from 54d371e7a4ebab79a0f616669e2f601d8370cef3)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Wed Aug 30 19:15:55 2006 +0200

    Push information about cliprects of DRI windows to the DRM.

diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 7b4d5bd..9e52e61 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -992,6 +992,10 @@ DRICreateDrawable(ScreenPtr pScreen, Dra
 	pWin = (WindowPtr)pDrawable;
 	if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {
 	    pDRIDrawablePriv->refCount++;
+
+	    if (!pDRIDrawablePriv->hwDrawable) {
+		drmCreateDrawable(pDRIPriv->drmFD, &pDRIDrawablePriv->hwDrawable);
+	    }
 	}
 	else {
 	    /* allocate a DRI Window Private record */
@@ -1000,13 +1004,13 @@ DRICreateDrawable(ScreenPtr pScreen, Dra
 	    }
 
 	    /* Only create a drm_drawable_t once */
-	    if (drmCreateDrawable(pDRIPriv->drmFD, hHWDrawable)) {
+	    if (drmCreateDrawable(pDRIPriv->drmFD,
+				  &pDRIDrawablePriv->hwDrawable)) {
 		xfree(pDRIDrawablePriv);
 		return FALSE;
 	    }
 
 	    /* add it to the list of DRI drawables for this screen */
-	    pDRIDrawablePriv->hwDrawable = *hHWDrawable;
 	    pDRIDrawablePriv->pScreen = pScreen;
 	    pDRIDrawablePriv->refCount = 1;
 	    pDRIDrawablePriv->drawableIndex = -1;
@@ -1029,6 +1033,15 @@ DRICreateDrawable(ScreenPtr pScreen, Dra
 	    /* track this in case this window is destroyed */
 	    AddResource(id, DRIDrawablePrivResType, (pointer)pWin);
 	}
+
+	if (pDRIDrawablePriv->hwDrawable) {
+	    drmUpdateDrawableInfo(pDRIPriv->drmFD,
+				  pDRIDrawablePriv->hwDrawable,
+				  DRM_DRAWABLE_CLIPRECTS,
+				  REGION_NUM_RECTS(&pWin->clipList),
+				  REGION_RECTS(&pWin->clipList));
+	    *hHWDrawable = pDRIDrawablePriv->hwDrawable;
+	}
     }
     else { /* pixmap (or for GLX 1.3, a PBuffer) */
 	/* NOT_DONE */
@@ -1813,6 +1826,11 @@ DRIClipNotify(WindowPtr pWin, int dx, in
 
 	pDRIPriv->pSAREA->drawableTable[pDRIDrawablePriv->drawableIndex].stamp
 	    = DRIDrawableValidationStamp++;
+
+	drmUpdateDrawableInfo(pDRIPriv->drmFD, pDRIDrawablePriv->hwDrawable,
+			      DRM_DRAWABLE_CLIPRECTS,
+			      REGION_NUM_RECTS(&pWin->clipList),
+			      REGION_RECTS(&pWin->clipList));
     }
 
     /* call lower wrapped functions */
diff-tree 54d371e7a4ebab79a0f616669e2f601d8370cef3 (from f7c1d942416db8d0d4c5a21f5ece1ccacb926b69)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Wed Aug 30 19:12:17 2006 +0200

    Add wrapper for new ioctl to update drawable information in the DRM.

diff --git a/hw/xfree86/os-support/drm/xf86drm.c b/hw/xfree86/os-support/drm/xf86drm.c
index 3759920..214e58b 100644
--- a/hw/xfree86/os-support/drm/xf86drm.c
+++ b/hw/xfree86/os-support/drm/xf86drm.c
@@ -1388,6 +1388,22 @@ int drmDestroyDrawable(int fd, drm_drawa
     return 0;
 }
 
+int drmUpdateDrawableInfo(int fd, drm_drawable_t handle,
+			   drm_drawable_info_type_t type, unsigned int num,
+			   void *data)
+{
+    drm_update_draw_t update;
+
+    update.handle = handle;
+    update.type = type;
+    update.num = num;
+    update.data = (unsigned long long)(unsigned long)data;
+
+    if (ioctl(fd, DRM_IOCTL_UPDATE_DRAW, &update)) return -errno;
+
+    return 0;
+}
+
 /**
  * Acquire the AGP device.
  *
diff --git a/hw/xfree86/os-support/xf86drm.h b/hw/xfree86/os-support/xf86drm.h
index 88f5e0f..1076706 100644
--- a/hw/xfree86/os-support/xf86drm.h
+++ b/hw/xfree86/os-support/xf86drm.h
@@ -543,6 +543,9 @@ extern int           drmSwitchToContext(
 extern int           drmDestroyContext(int fd, drm_context_t handle);
 extern int           drmCreateDrawable(int fd, drm_drawable_t * handle);
 extern int           drmDestroyDrawable(int fd, drm_drawable_t handle);
+extern int           drmUpdateDrawableInfo(int fd, drm_drawable_t handle,
+					   drm_drawable_info_type_t type,
+					   unsigned int num, void *data);
 extern int           drmCtlInstHandler(int fd, int irq);
 extern int           drmCtlUninstHandler(int fd);
 extern int           drmInstallSIGIOHandler(int fd,
diff-tree f7c1d942416db8d0d4c5a21f5ece1ccacb926b69 (from 945b7c63946f5257d0f9b0dcf2f8f4882fb2c6f8)
Author: Brian <brian at yutani.localnet.net>
Date:   Sat Sep 23 10:38:10 2006 -0600

    Check for visual==NULL in dmxBECreateColormap() before calling XCreateColormap()
    to prevent potential segfault.

diff --git a/hw/dmx/dmxcmap.c b/hw/dmx/dmxcmap.c
index b4279e7..9a9781f 100644
--- a/hw/dmx/dmxcmap.c
+++ b/hw/dmx/dmxcmap.c
@@ -40,6 +40,7 @@
 #endif
 
 #include "dmx.h"
+#include "dmxlog.h"
 #include "dmxsync.h"
 #include "dmxcmap.h"
 #include "dmxvisual.h"
@@ -83,12 +84,18 @@ Bool dmxBECreateColormap(ColormapPtr pCo
     VisualPtr           pVisual   = pColormap->pVisual;
     Visual             *visual    = dmxLookupVisual(pScreen, pVisual);
 
-    pCmapPriv->cmap = XCreateColormap(dmxScreen->beDisplay,
-				      dmxScreen->scrnWin,
-				      visual,
-				      (pVisual->class & DynamicClass ?
-				       AllocAll : AllocNone));
-    return (pCmapPriv->cmap != 0);
+    if (visual) {
+       pCmapPriv->cmap = XCreateColormap(dmxScreen->beDisplay,
+                                         dmxScreen->scrnWin,
+                                         visual,
+                                         (pVisual->class & DynamicClass ?
+                                          AllocAll : AllocNone));
+       return (pCmapPriv->cmap != 0);
+    }
+    else {
+       dmxLog(dmxWarning, "dmxBECreateColormap: No visual found\n");
+       return 0;
+    }
 }
 
 /** Create colormap on back-end server associated with \a pColormap's
diff-tree 945b7c63946f5257d0f9b0dcf2f8f4882fb2c6f8 (from 891e9c3e6cbd0869a57395b96c8e18ff522c2bb4)
Author: Brian <brian at yutani.localnet.net>
Date:   Sat Sep 23 10:35:25 2006 -0600

    The fbcmap.c file used by Xdmx _must_ be compiled with XFree86Server defined.
    Otherwise, Xdmx generates a slew of protocol errors.

diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index d36647b..89136b9 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -16,6 +16,9 @@ GLX_INCS = -I$(top_srcdir)/hw/xfree86/di
 GLX_DEFS = @GL_CFLAGS@ 
 endif
 
+# It's essential that fbcmap.c be compiled with this flag for DMX to work!!
+DMX_CFLAGS = -DXFree86Server=1
+
 if BUILDDOCS
 SUBDIRS += doc
 endif
@@ -86,6 +89,7 @@ Xdmx_CFLAGS = \
               $(DIX_CFLAGS) \
               $(GLX_INCS) \
               $(GLX_DEFS) \
+              $(DMX_CFLAGS) \
               @DMXMODULES_CFLAGS@
 
 # Man page
diff-tree 891e9c3e6cbd0869a57395b96c8e18ff522c2bb4 (from a10039a100dfe5f87e29e9cc4fa656176e0890f9)
Author: Brian <brian at yutani.localnet.net>
Date:   Sat Sep 23 10:28:24 2006 -0600

    Replace broken DMXDBG3() with DMXDBG2()

diff --git a/hw/dmx/dmxcursor.c b/hw/dmx/dmxcursor.c
index a49fc9f..e74a052 100644
--- a/hw/dmx/dmxcursor.c
+++ b/hw/dmx/dmxcursor.c
@@ -664,8 +664,8 @@ static Bool _dmxUnrealizeCursor(ScreenPt
 {
     DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];
 
-    DMXDBG3("_dmxUnrealizeCursor(%d,%p) %p\n",
-            pScreen->myNum, pCursor, pCursorPriv);
+    DMXDBG2("_dmxUnrealizeCursor(%d,%p)\n",
+            pScreen->myNum, pCursor);
 
     if (dmxScreen->beDisplay) {
 	if (dmxBEFreeCursor(pScreen, pCursor))
diff-tree a10039a100dfe5f87e29e9cc4fa656176e0890f9 (from ce78b0cd2b1c35d60eb5683a1d00222aa4797c79)
Author: David Nusinow <dnusinow at debian.org>
Date:   Thu Sep 21 23:58:32 2006 -0400

    Allow the xfree86 ddx utils to be optionally built. Patch by Eugene Konev.

diff --git a/configure.ac b/configure.ac
index 798c8f0..76f5e04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -426,6 +426,7 @@ AC_ARG_ENABLE(dbe,            AS_HELP_ST
 AC_ARG_ENABLE(xf86bigfont,    AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=yes])
 AC_ARG_ENABLE(dpms,           AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes])
 AC_ARG_ENABLE(xinput,         AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes])
+AC_ARG_ENABLE(xfree86-utils,     AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])
 
 dnl DDXes.
 AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
@@ -735,6 +736,8 @@ if test "x$XINPUT" = xyes; then
 	XI_INC='-I$(top_srcdir)/Xi'
 fi
 
+AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
+
 AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
 
 AC_DEFINE(XKB, 1, [Build XKB])
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 67bfd80..5cce11d 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -2,12 +2,16 @@ if DRI
 DRI_SUBDIR = dri
 endif
 
+if XF86UTILS
+XF86UTILS_SUBDIR = utils
+endif
+
 DOC_SUBDIR = doc
 
 SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
           ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \
 	  xf8_32bpp loader scanpci dixmods exa \
-	  $(DRI_SUBDIR) utils $(DOC_SUBDIR)
+	  $(DRI_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)
 
 DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
                parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \
diff-tree ce78b0cd2b1c35d60eb5683a1d00222aa4797c79 (from c1655f0fd457f9bdf0857c5e0904639925bb01f1)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Thu Sep 21 20:42:47 2006 -0400

    Close with Pclose() that which we open with Popen().

diff --git a/xkb/ddxList.c b/xkb/ddxList.c
index f94a869..034f694 100644
--- a/xkb/ddxList.c
+++ b/xkb/ddxList.c
@@ -269,7 +269,7 @@ char	tmpname[PATH_MAX];
 #ifndef WIN32
     if (haveDir)
 	fclose(in);
-    else if ((rval=pclose(in))!=0) {
+    else if ((rval=Pclose(in))!=0) {
 	if (xkbDebugFlags)
 	    ErrorF("xkbcomp returned exit code %d\n",rval);
     }
diff-tree c1655f0fd457f9bdf0857c5e0904639925bb01f1 (from 8b4ed47c5d39f219866e3c72fa973c6fc4c70f18)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Thu Sep 21 14:45:17 2006 -0700

    Bug 8386: Grow parser buffers to fit an entire line if it's longer than CONFIG_BUF_LEN.

diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c
index 5b29ab8..f81c45a 100644
--- a/hw/xfree86/parser/scan.c
+++ b/hw/xfree86/parser/scan.c
@@ -157,9 +157,128 @@ xf86strToUL (char *str)
 	return (tot);
 }
 
+/*
+ * xf86getNextLine --
+ *
+ *  read from the configFile FILE stream until we encounter a new
+ *  line; this is effectively just a big wrapper for fgets(3).
+ *
+ *  xf86getToken() assumes that we will read up to the next
+ *  newline; we need to grow configBuf and configRBuf as needed to
+ *  support that.
+ */
+
+static char*
+xf86getNextLine(void)
+{
+	static int configBufLen = CONFIG_BUF_LEN;
+	char *tmpConfigBuf, *tmpConfigRBuf;
+	int c, i, pos = 0, eolFound = 0;
+	char *ret = NULL;
+
+	/*
+	 * reallocate the string if it was grown last time (i.e., is no
+	 * longer CONFIG_BUF_LEN); we malloc the new strings first, so
+	 * that if either of the mallocs fail, we can fall back on the
+	 * existing buffer allocations
+	 */
+
+	if (configBufLen != CONFIG_BUF_LEN) {
+
+		tmpConfigBuf = xf86confmalloc(CONFIG_BUF_LEN);
+		tmpConfigRBuf = xf86confmalloc(CONFIG_BUF_LEN);
+
+		if (!tmpConfigBuf || !tmpConfigRBuf) {
+
+			/*
+			 * at least one of the mallocs failed; keep the old buffers
+			 * and free any partial allocations
+			 */
+
+			xf86conffree(tmpConfigBuf);
+			xf86conffree(tmpConfigRBuf);
+
+		} else {
+
+			/*
+			 * malloc succeeded; free the old buffers and use the new
+			 * buffers
+			 */
+
+			configBufLen = CONFIG_BUF_LEN;
+
+			xf86conffree(configBuf);
+			xf86conffree(configRBuf);
+
+			configBuf = tmpConfigBuf;
+			configRBuf = tmpConfigRBuf;
+		}
+	}
+
+	/* read in another block of chars */
+
+	do {
+		ret = fgets(configBuf + pos, configBufLen - pos - 1, configFile);
+
+		if (!ret) break;
+
+		/* search for EOL in the new block of chars */
+
+		for (i = pos; i < (configBufLen - 1); i++) {
+			c = configBuf[i];
+
+			if (c == '\0') break;
+
+			if ((c == '\n') || (c == '\r')) {
+				eolFound = 1;
+				break;
+			}
+		}
+
+		/*
+		 * if we didn't find EOL, then grow the string and
+		 * read in more
+		 */
+
+		if (!eolFound) {
+
+			tmpConfigBuf = xf86confrealloc(configBuf, configBufLen + CONFIG_BUF_LEN);
+			tmpConfigRBuf = xf86confrealloc(configRBuf, configBufLen + CONFIG_BUF_LEN);
+
+			if (!tmpConfigBuf || !tmpConfigRBuf) {
+
+				/*
+				 * at least one of the reallocations failed; use the
+				 * new allocation that succeeded, but we have to
+				 * fallback to the previous configBufLen size and use
+				 * the string we have, even though we don't have an
+				 * EOL
+				 */
+
+				if (tmpConfigBuf) configBuf = tmpConfigBuf;
+				if (tmpConfigRBuf) configRBuf = tmpConfigRBuf;
+
+				break;
+
+			} else {
+
+				/* reallocation succeeded */
+
+				configBuf = tmpConfigBuf;
+				configRBuf = tmpConfigRBuf;
+				pos = i;
+				configBufLen += CONFIG_BUF_LEN;
+			}
+		}
+
+	} while (!eolFound);
+
+	return (ret);
+}
+
 /* 
  * xf86getToken --
- *      Read next Token form the config file. Handle the global variable
+ *      Read next Token from the config file. Handle the global variable
  *      pushToken.
  */
 int
@@ -193,7 +312,7 @@ again:
 		{
 			char *ret;
 			if (configFile)
-				ret = fgets (configBuf, CONFIG_BUF_LEN - 1, configFile);
+				ret = xf86getNextLine();
 			else {
 				if (builtinConfig[builtinIndex] == NULL)
 					ret = NULL;
diff-tree 8b4ed47c5d39f219866e3c72fa973c6fc4c70f18 (from d812f486a01a6276aed7b4ebd3cd8eb8ddfe10d3)
Author: Drew Parsons <dparsons at debian.org>
Date:   Thu Sep 21 22:19:44 2006 +1000

    * Install Xprint's Xsession script to $(sysconfdir)/X11/Xsession.d
    * Removing outdated references to CDE and dt, rename script to
      92xprint-xpserverlist.

diff --git a/hw/xprint/etc/Xsession.d/92xprint-xpserverlist b/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
new file mode 100644
index 0000000..60d964a
--- /dev/null
+++ b/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
@@ -0,0 +1,30 @@
+#!/bin/sh 
+#####################################################################
+###  File:              92xprint-xpserverlist
+###
+###  Default Location:  /etc/X11/Xsession.d/
+###
+###  Purpose:           Setup Xprint env vars
+###                     
+###  Description:       This script is invoked by means of the Xsession file
+###                     at user login. 
+###
+###  Invoked by:        /etc/X11/Xsession
+###
+###  (c) Copyright 2003-2004 Roland Mainz <roland.mainz at nrubsig.org>
+###
+###  please send bugfixes or comments to https://bugs.freedesktop.org
+###
+#####################################################################
+
+
+#
+# Obtain list of Xprint servers
+#
+
+if [ -x "/etc/init.d/xprint" ] ; then
+  XPSERVERLIST="`/etc/init.d/xprint get_xpserverlist`"
+  export XPSERVERLIST
+fi
+
+##########################         eof       #####################
diff --git a/hw/xprint/etc/Xsession.d/Makefile.am b/hw/xprint/etc/Xsession.d/Makefile.am
index e0277d9..96a5ee7 100644
--- a/hw/xprint/etc/Xsession.d/Makefile.am
+++ b/hw/xprint/etc/Xsession.d/Makefile.am
@@ -1 +1,2 @@
-EXTRA_DIST = cde_xsessiond_xprint.sh
+xpcdir = $(sysconfdir)/X11/Xsession.d
+dist_xpc_DATA = 92xprint-xpserverlist
diff --git a/hw/xprint/etc/Xsession.d/cde_xsessiond_xprint.sh b/hw/xprint/etc/Xsession.d/cde_xsessiond_xprint.sh
deleted file mode 100644
index 54c431d..0000000
--- a/hw/xprint/etc/Xsession.d/cde_xsessiond_xprint.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh 
-#####################################################################
-###  File:              0018.xprint
-###
-###  Default Location:  /usr/dt/config/Xsession.d/
-###
-###  Purpose:           Setup Xprint env vars
-###                     
-###  Description:       This script is invoked by means of the Xsession file
-###                     at user login. 
-###
-###  Invoked by:        /usr/dt/bin/Xsession
-###
-###  (c) Copyright 2003-2004 Roland Mainz <roland.mainz at nrubsig.org>
-###
-###  please send bugfixes or comments to http://xprint.mozdev.org/
-###
-#####################################################################
-
-
-#
-# Obtain list of Xprint servers
-#
-
-if [ -x "/etc/init.d/xprint" ] ; then
-  XPSERVERLIST="`/etc/init.d/xprint get_xpserverlist`"
-  export XPSERVERLIST
-fi
-
-##########################         eof       #####################
diff-tree d812f486a01a6276aed7b4ebd3cd8eb8ddfe10d3 (from f057de4f73fa593fa3fc5f05f65b89e76273b158)
Author: Donnie Berkholz <donnie at supernova.(none)>
Date:   Wed Sep 20 15:39:39 2006 -0700

    Really fix sparc on 64-bit kernel/32-bit userland.
    
    Commit b3a3020fd018df8bc5a8193d36e1a1c7ae8af8ba used a sparc64 ifdef instead of
    sparc. But for 32-bit userland, __sparc64__ is not defined so the wrong code is
    used.

diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
index a97e6f0..c6dad1f 100644
--- a/hw/xfree86/os-support/bus/linuxPci.c
+++ b/hw/xfree86/os-support/bus/linuxPci.c
@@ -85,7 +85,7 @@ static pciBusFuncs_t linuxFuncs0 = {
 /* pciAddrHostToBus */	pciAddrNOOP,
 /* linuxTransAddrBusToHost is busted on sparc64 but the PCI rework tree
  * makes it all moot, so we kludge it for now */
-#if defined(__sparc64__)
+#if defined(__sparc__)
 /* pciAddrBusToHost */  pciAddrNOOP,
 #else
 /* pciAddrBusToHost */	linuxTransAddrBusToHost,
diff-tree d16e83413e7e06adebd629d04de57bbedd8c3765 (from f39fd4242902eaa862321d39337f429dd14ebacf)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Wed Sep 20 12:47:17 2006 -0700

    Hide or rename more global symbols to avoid clashes with libfb.
    
    Rename composeFunctions, xxSetup, and xxPrintVisuals.  Hide the other xx*
    symbols by making them static.

diff --git a/fb/fbpseudocolor.c b/fb/fbpseudocolor.c
index f4facbc..53bfb14 100644
--- a/fb/fbpseudocolor.c
+++ b/fb/fbpseudocolor.c
@@ -143,10 +143,10 @@ typedef struct _xxGCPriv {
 				      (pGC)->devPrivates[xxGCPrivateIndex].ptr)
 #define xxGCPriv(pGC)   xxGCPrivPtr  pGCPriv = xxGetGCPriv(pGC)
 
-int xxScrPrivateIndex = -1;
-int xxGCPrivateIndex;
-int xxColormapPrivateIndex = -1;
-int xxGeneration;
+static int xxScrPrivateIndex = -1;
+static int xxGCPrivateIndex;
+static int xxColormapPrivateIndex = -1;
+static int xxGeneration;
 
 
 #define wrap(priv,real,mem,func) {\
@@ -1199,12 +1199,12 @@ xxSetup(ScreenPtr pScreen, int myDepth, 
     return TRUE;
 }
 
-GCFuncs xxGCFuncs = {
+static GCFuncs xxGCFuncs = {
     xxValidateGC, xxChangeGC, xxCopyGC, xxDestroyGC,
     xxChangeClip, xxDestroyClip, xxCopyClip
 };
 
-GCOps xxGCOps = {
+static GCOps xxGCOps = {
     xxFillSpans, xxSetSpans, 
     xxPutImage, xxCopyArea, 
     xxCopyPlane, xxPolyPoint, 
diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index 9721bc6..4c3bc17 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -187,3 +187,6 @@
 #define fbWinPrivateIndex wfbWinPrivateIndex
 #define fbZeroLine wfbZeroLine
 #define fbZeroSegment wfbZeroSegment
+#define xxPrintVisuals wfbxxPrintVisuals
+#define xxSetup wfbxxSetup
+#define composeFunctions wfbComposeFunctions
diff-tree f057de4f73fa593fa3fc5f05f65b89e76273b158 (from 05231e336db8f959c15dda518641976f061df1a6)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Sat Sep 16 03:49:11 2006 -0400

    Don't install librac.a.
    
    Thanks, automake.

diff --git a/hw/xfree86/rac/Makefile.am b/hw/xfree86/rac/Makefile.am
index 328ed19..2d8d879 100644
--- a/hw/xfree86/rac/Makefile.am
+++ b/hw/xfree86/rac/Makefile.am
@@ -1,4 +1,4 @@
-module_LIBRARIES = librac.a
+noinst_LIBRARIES = librac.a
 librac_a_SOURCES = xf86RAC.c
 
 sdk_HEADERS = xf86RAC.h
diff-tree f39fd4242902eaa862321d39337f429dd14ebacf (from 1c72290cdf4d9b214e1b9c0526cb7cb8641051f3)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Tue Sep 5 15:23:54 2006 -0700

    (unsigned long)(1 << 31) = bad news on x86_64.
    (cherry picked from 410e5b1d738ba47b36778e6cbed44023a27ce259 commit)

diff --git a/fb/fbimage.c b/fb/fbimage.c
index 4798709..06a3c84 100644
--- a/fb/fbimage.c
+++ b/fb/fbimage.c
@@ -68,7 +68,7 @@ fbPutImage (DrawablePtr	pDrawable,
 	break;
     case XYPixmap:
 	srcStride = BitmapBytePad(w + leftPad) / sizeof (FbStip);
-	for (i = 1 << (pDrawable->depth - 1); i; i >>= 1)
+	for (i = (unsigned long)1 << (pDrawable->depth - 1); i; i >>= 1)
 	{
 	    if (i & pGC->planemask)
 	    {
diff-tree 1c72290cdf4d9b214e1b9c0526cb7cb8641051f3 (from ee02e647882a4be29e1130bd79904ee79ed6b802)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Aug 7 09:57:58 2006 -0700

    Use DrawablePtrs instead of PixmapPtrs for Prepare/Finish access.
    
    Also, define some wfb functions even if FB_ACCESS_WRAPPER is not defined.  This allows a client to use libfb and libwfb at the same time.

diff --git a/fb/fb.h b/fb/fb.h
index dcf2e53..edd9392 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -622,30 +622,28 @@ extern WindowPtr    *WindowTable;
 #endif
 
 /* Framebuffer access wrapper */
-#ifdef FB_ACCESS_WRAPPER
 typedef FbBits (*ReadMemoryProcPtr)(const void *src, int size);
 typedef void (*WriteMemoryProcPtr)(void *dst, FbBits value, int size);
 typedef void (*SetupWrapProcPtr)(ReadMemoryProcPtr  *pRead,
                                  WriteMemoryProcPtr *pWrite,
-                                 PixmapPtr           pPixmap);
-typedef void (*FinishWrapProcPtr)(PixmapPtr pPixmap);
-#define fbPrepareAccess(pPix) \
-	fbGetScreenPrivate((pPix)->drawable.pScreen)->setupWrap( \
+                                 DrawablePtr         pDraw);
+typedef void (*FinishWrapProcPtr)(DrawablePtr pDraw);
+
+#ifdef FB_ACCESS_WRAPPER
+
+#define fbPrepareAccess(pDraw) \
+	fbGetScreenPrivate((pDraw)->pScreen)->setupWrap( \
 		&wfbReadMemory, \
 		&wfbWriteMemory, \
-		(pPix))
-#define fbFinishAccess(pDrawable) { \
-	PixmapPtr _pPix; \
-	if ((pDrawable)->type != DRAWABLE_PIXMAP) \
-	    _pPix = fbGetWindowPixmap(pDrawable); \
-	else \
-	    _pPix = (PixmapPtr) (pDrawable); \
-	fbGetScreenPrivate(_pPix->drawable.pScreen)->finishWrap(_pPix); \
-}
+		(pDraw))
+#define fbFinishAccess(pDraw) \
+	fbGetScreenPrivate((pDraw)->pScreen)->finishWrap(pDraw)
 
 #else
+
 #define fbPrepareAccess(pPix)
 #define fbFinishAccess(pDraw)
+
 #endif
 
 
@@ -739,7 +737,7 @@ typedef struct {
 	(xoff) = __fbPixOffXPix(_pPix); \
 	(yoff) = __fbPixOffYPix(_pPix); \
     } \
-    fbPrepareAccess(_pPix); \
+    fbPrepareAccess(pDrawable); \
     (pointer) = (FbBits *) _pPix->devPrivate.ptr; \
     (stride) = ((int) _pPix->devKind) / sizeof (FbBits); (void)(stride); \
     (bpp) = _pPix->drawable.bitsPerPixel;  (void)(bpp); \
@@ -756,7 +754,7 @@ typedef struct {
 	(xoff) = __fbPixOffXPix(_pPix); \
 	(yoff) = __fbPixOffYPix(_pPix); \
     } \
-    fbPrepareAccess(_pPix); \
+    fbPrepareAccess(pDrawable); \
     (pointer) = (FbStip *) _pPix->devPrivate.ptr; \
     (stride) = ((int) _pPix->devKind) / sizeof (FbStip); (void)(stride); \
     (bpp) = _pPix->drawable.bitsPerPixel; (void)(bpp); \
@@ -1805,7 +1803,6 @@ fbSetupScreen(ScreenPtr	pScreen, 
 	      int	width,		/* pixel width of frame buffer */
 	      int	bpp);		/* bits per pixel of frame buffer */
 
-#ifdef FB_ACCESS_WRAPPER
 Bool
 wfbFinishScreenInit(ScreenPtr	pScreen,
 		    pointer	pbits,
@@ -1829,7 +1826,7 @@ wfbScreenInit(ScreenPtr	pScreen,
 	      int	bpp,
 	      SetupWrapProcPtr setupWrap,
 	      FinishWrapProcPtr finishWrap);
-#else
+
 Bool
 fbFinishScreenInit(ScreenPtr	pScreen,
 		   pointer	pbits,
@@ -1849,7 +1846,6 @@ fbScreenInit(ScreenPtr	pScreen,
 	     int	dpiy,
 	     int	width,
 	     int	bpp);
-#endif
 
 void
 fbInitializeBackingStore (ScreenPtr pScreen);
diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c
index aca37d4..c2ddcb0 100644
--- a/fb/fbpixmap.c
+++ b/fb/fbpixmap.c
@@ -160,7 +160,7 @@ fbPixmapToRegion(PixmapPtr pPix)
     FirstRect = REGION_BOXPTR(pReg);
     rects = FirstRect;
 
-    fbPrepareAccess(pPix);
+    fbPrepareAccess(&pPix->drawable);
 
     pwLine = (FbBits *) pPix->devPrivate.ptr;
     nWidth = pPix->devKind >> (FB_SHIFT-3);
diff --git a/fb/fbpseudocolor.c b/fb/fbpseudocolor.c
index 170fcad..f4facbc 100644
--- a/fb/fbpseudocolor.c
+++ b/fb/fbpseudocolor.c
@@ -875,7 +875,7 @@ xxCopyPseudocolorRegion(ScreenPtr pScree
     register CARD16     *d;
     int w;
 
-    fbPrepareAccess((PixmapPtr)pScreen->devPrivate);
+    fbPrepareAccess((DrawablePtr)pScreen->devPrivate);
 
     dst_base = (CARD16*) ((PixmapPtr)pScreen->devPrivate)->devPrivate.ptr;
     dst_stride = (int)((PixmapPtr)pScreen->devPrivate)->devKind
diff-tree ee02e647882a4be29e1130bd79904ee79ed6b802 (from a69335dc299be6de8b82ed34de1cb30f1255feb4)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Tue Aug 1 13:45:43 2006 -0700

    Wrap libwfb memory access.
    
    Use the READ and WRITE macros to wrap memory accesses that could be in video
    memory.  Add MEMCPY_WRAPPED and MEMSET_WRAPPED macros to wrap memcpy and
    memset, respectively.

diff --git a/fb/fb.h b/fb/fb.h
index e32c10b..dcf2e53 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -45,14 +45,36 @@
 #endif
 
 #ifdef FB_ACCESS_WRAPPER
+
 #include "wfbrename.h"
 #define FBPREFIX(x) wfb##x
-#define WRITE(ptr, val) ((*wfbWriteMemory)(ptr, val, sizeof(*ptr)))
-#define READ(ptr) ((*wfbReadMemory)(ptr, sizeof(*ptr)))
+#define WRITE(ptr, val) ((*wfbWriteMemory)((ptr), (val), sizeof(*(ptr))))
+#define READ(ptr) ((*wfbReadMemory)((ptr), sizeof(*(ptr))))
+
+#define MEMCPY_WRAPPED(dst, src, size) do {                       \
+    size_t _i;                                                    \
+    CARD8 *_dst = (CARD8*)(dst), *_src = (CARD8*)(src);           \
+    for(_i = 0; _i < size; _i++) {                                \
+        WRITE(_dst +_i, READ(_src + _i));                         \
+    }                                                             \
+} while(0)
+
+#define MEMSET_WRAPPED(dst, val, size) do {                       \
+    size_t _i;                                                    \
+    CARD8 *_dst = (CARD8*)(dst);                                  \
+    for(_i = 0; _i < size; _i++) {                                \
+        WRITE(_dst +_i, (val));                                   \
+    }                                                             \
+} while(0)
+
 #else
+
 #define FBPREFIX(x) fb##x
 #define WRITE(ptr, val) (*(ptr) = (val))
 #define READ(ptr) (*(ptr))
+#define MEMCPY_WRAPPED(dst, src, size) memcpy((dst), (src), (size))
+#define MEMSET_WRAPPED(dst, val, size) memset((dst), (val), (size))
+
 #endif
 
 /*
@@ -233,8 +255,8 @@ extern void fbSetBits (FbStip *bits, int
 
 #define FbPtrOffset(p,o,t)		((t *) ((CARD8 *) (p) + (o)))
 #define FbSelectPatternPart(xor,o,t)	((xor) >> (FbPatternOffset (o,t) << 3))
-#define FbStorePart(dst,off,t,xor)	(*FbPtrOffset(dst,off,t) = \
-					 FbSelectPart(xor,off,t))
+#define FbStorePart(dst,off,t,xor)	(WRITE(FbPtrOffset(dst,off,t), \
+					 FbSelectPart(xor,off,t)))
 #ifndef FbSelectPart
 #define FbSelectPart(x,o,t) FbSelectPatternPart(x,o,t)
 #endif
@@ -414,7 +436,7 @@ extern void fbSetBits (FbStip *bits, int
 	FbStorePart(dst,sizeof (FbBits) - 1,CARD8,xor); \
 	break; \
     default: \
-	*dst = FbDoMaskRRop(*dst, and, xor, l); \
+	WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, l)); \
 	break; \
     } \
 }
@@ -434,7 +456,7 @@ extern void fbSetBits (FbStip *bits, int
 	break; \
     FbDoRightMaskByteRRop6Cases(dst,xor) \
     default: \
-	*dst = FbDoMaskRRop (*dst, and, xor, r); \
+	WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, r)); \
     } \
 }
 #endif
@@ -467,15 +489,15 @@ extern void fbSetBits (FbStip *bits, int
  */
 
 #define FbLaneCase1(n,a,o)  ((n) == 0x01 ? \
-			     (*(CARD8 *) ((a)+FbPatternOffset(o,CARD8)) = \
+			     WRITE((CARD8 *) ((a)+FbPatternOffset(o,CARD8)), \
 			      fgxor) : 0)
 #define FbLaneCase2(n,a,o)  ((n) == 0x03 ? \
-			     (*(CARD16 *) ((a)+FbPatternOffset(o,CARD16)) = \
+			     WRITE((CARD16 *) ((a)+FbPatternOffset(o,CARD16)), \
 			      fgxor) : \
 			     ((void)FbLaneCase1((n)&1,a,o), \
 				    FbLaneCase1((n)>>1,a,(o)+1)))
 #define FbLaneCase4(n,a,o)  ((n) == 0x0f ? \
-			     (*(CARD32 *) ((a)+FbPatternOffset(o,CARD32)) = \
+			     WRITE((CARD32 *) ((a)+FbPatternOffset(o,CARD32)), \
 			      fgxor) : \
 			     ((void)FbLaneCase2((n)&3,a,o), \
 				    FbLaneCase2((n)>>2,a,(o)+2)))
diff --git a/fb/fb24_32.c b/fb/fb24_32.c
index 0fdd9b8..00b739b 100644
--- a/fb/fb24_32.c
+++ b/fb/fb24_32.c
@@ -38,18 +38,18 @@
  * by reading/writing aligned CARD32s where it's easy
  */
 
-#define Get8(a)	((CARD32) *(a))
+#define Get8(a)	((CARD32) READ(a))
 
 #if BITMAP_BIT_ORDER == MSBFirst
 #define Get24(a)    ((Get8(a) << 16) | (Get8((a)+1) << 8) | Get8((a)+2))
-#define Put24(a,p)  (((a)[0] = (CARD8) ((p) >> 16)), \
-		     ((a)[1] = (CARD8) ((p) >> 8)), \
-		     ((a)[2] = (CARD8) (p)))
+#define Put24(a,p)  ((WRITE((a+0), (CARD8) ((p) >> 16))), \
+		     (WRITE((a+1), (CARD8) ((p) >> 8))), \
+		     (WRITE((a+2), (CARD8) (p))))
 #else
 #define Get24(a)    (Get8(a) | (Get8((a)+1) << 8) | (Get8((a)+2)<<16))
-#define Put24(a,p)  (((a)[0] = (CARD8) (p)), \
-		     ((a)[1] = (CARD8) ((p) >> 8)), \
-		     ((a)[2] = (CARD8) ((p) >> 16)))
+#define Put24(a,p)  ((WRITE((a+0), (CARD8) (p))), \
+		     (WRITE((a+1), (CARD8) ((p) >> 8))), \
+		     (WRITE((a+2), (CARD8) ((p) >> 16))))
 #endif
 
 typedef void (*fb24_32BltFunc) (CARD8	    *srcLine,
@@ -106,7 +106,7 @@ fb24_32BltDown (CARD8	    *srcLine,
 	    while (((long) dst & 3) && w)
 	    {
 		w--;
-		pixel = *src++;
+		pixel = READ(src++);
 		pixel = FbDoDestInvarientMergeRop(pixel);
 		Put24 (dst, pixel);
 		dst += 3;
@@ -115,35 +115,35 @@ fb24_32BltDown (CARD8	    *srcLine,
 	    while (w >= 4)
 	    {
 		CARD32  s0, s1;
-		s0 = *src++;
+		s0 = READ(src++);
 		s0 = FbDoDestInvarientMergeRop(s0);
-		s1 = *src++;
+		s1 = READ(src++);
 		s1 = FbDoDestInvarientMergeRop(s1);
 #if BITMAP_BIT_ORDER == LSBFirst
-		*(CARD32 *)(dst) = (s0 & 0xffffff) | (s1 << 24);
+		WRITE((CARD32 *)dst, (s0 & 0xffffff) | (s1 << 24));
 #else
-		*(CARD32 *)(dst) = (s0 << 8) | ((s1 & 0xffffff) >> 16);
+		WRITE((CARD32 *)dst, (s0 << 8) | ((s1 & 0xffffff) >> 16));
 #endif
-		s0 = *src++;
+		s0 = READ(src++);
 		s0 = FbDoDestInvarientMergeRop(s0);
 #if BITMAP_BIT_ORDER == LSBFirst
-		*(CARD32 *)(dst+4) = ((s1 & 0xffffff) >> 8) | (s0 << 16);
+		WRITE((CARD32 *)(dst+4), ((s1 & 0xffffff) >> 8) | (s0 << 16));
 #else
-		*(CARD32 *)(dst+4) = (s1 << 16) | ((s0 & 0xffffff) >> 8);
+		WRITE((CARD32 *)(dst+4), (s1 << 16) | ((s0 & 0xffffff) >> 8));
 #endif
-		s1 = *src++;
+		s1 = READ(src++);
 		s1 = FbDoDestInvarientMergeRop(s1);
 #if BITMAP_BIT_ORDER == LSBFirst
-		*(CARD32 *)(dst+8) = ((s0 & 0xffffff) >> 16) | (s1 << 8);
+		WRITE((CARD32 *)(dst+8), ((s0 & 0xffffff) >> 16) | (s1 << 8));
 #else
-		*(CARD32 *)(dst+8) = (s0 << 24) | (s1 & 0xffffff);
+		WRITE((CARD32 *)(dst+8), (s0 << 24) | (s1 & 0xffffff));
 #endif
 		dst += 12;
 		w -= 4;
 	    }
 	    while (w--)
 	    {
-		pixel = *src++;
+		pixel = READ(src++);
 		pixel = FbDoDestInvarientMergeRop(pixel);
 		Put24 (dst, pixel);
 		dst += 3;
@@ -153,7 +153,7 @@ fb24_32BltDown (CARD8	    *srcLine,
 	{
 	    while (w--)
 	    {
-		pixel = *src++;
+		pixel = READ(src++);
 		dpixel = Get24 (dst);
 		pixel = FbDoMergeRop(pixel, dpixel);
 		Put24 (dst, pixel);
@@ -205,40 +205,40 @@ fb24_32BltUp (CARD8	    *srcLine,
 		w--;
 		pixel = Get24(src);
 		src += 3;
-		*dst++ = FbDoDestInvarientMergeRop(pixel);
+		WRITE(dst++, FbDoDestInvarientMergeRop(pixel));
 	    }
 	    /* Do four aligned pixels at a time */
 	    while (w >= 4)
 	    {
 		CARD32  s0, s1;
 
-		s0 = *(CARD32 *)(src);
+		s0 = READ((CARD32 *)src);
 #if BITMAP_BIT_ORDER == LSBFirst
 		pixel = s0 & 0xffffff;
 #else
 		pixel = s0 >> 8;
 #endif
-		*dst++ = FbDoDestInvarientMergeRop(pixel);
-		s1 = *(CARD32 *)(src+4);
+		WRITE(dst++, FbDoDestInvarientMergeRop(pixel));
+		s1 = READ((CARD32 *)(src+4));
 #if BITMAP_BIT_ORDER == LSBFirst
 		pixel = (s0 >> 24) | ((s1 << 8) & 0xffffff);
 #else
 		pixel = ((s0 << 16) & 0xffffff) | (s1 >> 16);
 #endif
-		*dst++ = FbDoDestInvarientMergeRop(pixel);
-		s0 = *(CARD32 *)(src+8);
+		WRITE(dst++, FbDoDestInvarientMergeRop(pixel));
+		s0 = READ((CARD32 *)(src+8));
 #if BITMAP_BIT_ORDER == LSBFirst
 		pixel = (s1 >> 16) | ((s0 << 16) & 0xffffff);
 #else
 		pixel = ((s1 << 8) & 0xffffff) | (s0 >> 24);
 #endif
-		*dst++ = FbDoDestInvarientMergeRop(pixel);
+		WRITE(dst++, FbDoDestInvarientMergeRop(pixel));
 #if BITMAP_BIT_ORDER == LSBFirst
 		pixel = s0 >> 8;
 #else
 		pixel = s0 & 0xffffff;
 #endif
-		*dst++ = FbDoDestInvarientMergeRop(pixel);
+		WRITE(dst++, FbDoDestInvarientMergeRop(pixel));
 		src += 12;
 		w -= 4;
 	    }
@@ -247,7 +247,7 @@ fb24_32BltUp (CARD8	    *srcLine,
 		w--;
 		pixel = Get24(src);
 		src += 3;
-		*dst++ = FbDoDestInvarientMergeRop(pixel);
+		WRITE(dst++, FbDoDestInvarientMergeRop(pixel));
 	    }
 	}
 	else
@@ -256,7 +256,7 @@ fb24_32BltUp (CARD8	    *srcLine,
 	    {
 		pixel = Get24(src);
 		src += 3;
-		*dst = FbDoMergeRop(pixel, *dst);
+		WRITE(dst, FbDoMergeRop(pixel, READ(dst)));
 		dst++;
 	    }
 	}
diff --git a/fb/fbbits.c b/fb/fbbits.c
index 56b58df..cefe943 100644
--- a/fb/fbbits.c
+++ b/fb/fbbits.c
@@ -103,14 +103,14 @@
 #define BITSUNIT    BYTE
 #define BITSMUL	    3
 
-#define FbDoTypeStore(b,t,x,s)	(*((t *) (b)) = (x) >> (s))
-#define FbDoTypeRRop(b,t,a,x,s) (*((t *) (b)) = FbDoRRop(*((t *) (b)),\
-							 (a) >> (s), \
-							 (x) >> (s)))
-#define FbDoTypeMaskRRop(b,t,a,x,m,s) (*((t *) (b)) = FbDoMaskRRop(*((t *) (b)),\
-								   (a) >> (s), \
-								   (x) >> (s), \
-								   (m) >> (s))
+#define FbDoTypeStore(b,t,x,s)	WRITE(((t *) (b)), (x) >> (s))
+#define FbDoTypeRRop(b,t,a,x,s) WRITE((t *) (b), FbDoRRop(READ((t *) (b)),\
+							  (a) >> (s), \
+							  (x) >> (s)))
+#define FbDoTypeMaskRRop(b,t,a,x,m,s) WRITE((t *) (b), FbDoMaskRRop(READ((t *) (b)),\
+								    (a) >> (s), \
+								    (x) >> (s), \
+								    (m) >> (s)))
 #if BITMAP_BIT_ORDER == LSBFirst
 #define BITSSTORE(b,x)	((unsigned long) (b) & 1 ? \
 			 (FbDoTypeStore (b, CARD8, x, 0), \
diff --git a/fb/fbbits.h b/fb/fbbits.h
index e99a297..603c029 100644
--- a/fb/fbbits.h
+++ b/fb/fbbits.h
@@ -42,13 +42,13 @@
 #ifdef BITSSTORE
 #define STORE(b,x)  BITSSTORE(b,x)
 #else
-#define STORE(b,x)  (*(b) = (x))
+#define STORE(b,x)  WRITE((b), (x))
 #endif
 
 #ifdef BITSRROP
 #define RROP(b,a,x)	BITSRROP(b,a,x)
 #else
-#define RROP(b,a,x)	(*(b) = FbDoRRop (*(b), (a), (x)))
+#define RROP(b,a,x)	WRITE((b), FbDoRRop (READ(b), (a), (x)))
 #endif
 
 #ifdef BITSUNIT
@@ -545,18 +545,18 @@ ARC (FbBits	*dst,
 # define WRITE_ADDR4(n)	    ((n))
 #endif
 
-#define WRITE1(d,n,fg)	    ((d)[WRITE_ADDR1(n)] = (BITS) (fg))
+#define WRITE1(d,n,fg)	    WRITE(d + WRITE_ADDR1(n), (BITS) (fg))
 
 #ifdef BITS2
-# define WRITE2(d,n,fg)	    (*((BITS2 *) &((d)[WRITE_ADDR2(n)])) = (BITS2) (fg))
+# define WRITE2(d,n,fg)	    WRITE((BITS2 *) &((d)[WRITE_ADDR2(n)]), (BITS2) (fg))
 #else
-# define WRITE2(d,n,fg)	    WRITE1(d,(n)+1,WRITE1(d,n,fg))
+# define WRITE2(d,n,fg)	    (WRITE1(d,n,fg), WRITE1(d,(n)+1,fg))
 #endif
 
 #ifdef BITS4
-# define WRITE4(d,n,fg)	    (*((BITS4 *) &((d)[WRITE_ADDR4(n)])) = (BITS4) (fg))
+# define WRITE4(d,n,fg)	    WRITE((BITS4 *) &((d)[WRITE_ADDR4(n)]), (BITS4) (fg))
 #else
-# define WRITE4(d,n,fg)	    WRITE2(d,(n)+2,WRITE2(d,n,fg))
+# define WRITE4(d,n,fg)	    (WRITE2(d,n,fg), WRITE2(d,(n)+2,fg))
 #endif
 
 void
@@ -892,20 +892,20 @@ POLYSEGMENT (DrawablePtr    pDrawable,
 		FbMaskBits (dstX, width, startmask, nmiddle, endmask);
 		if (startmask)
 		{
-		    *dstLine = FbDoMaskRRop (*dstLine, andBits, xorBits, startmask);
+		    WRITE(dstLine, FbDoMaskRRop (READ(dstLine), andBits, xorBits, startmask));
 		    dstLine++;
 		}
 		if (!andBits)
 		    while (nmiddle--)
-			*dstLine++ = xorBits;
+			WRITE(dstLine++, xorBits);
 		else
 		    while (nmiddle--)
 		    {
-			*dstLine = FbDoRRop (*dstLine, andBits, xorBits);
+			WRITE(dstLine, FbDoRRop (READ(dstLine), andBits, xorBits));
 			dstLine++;
 		    }
 		if (endmask)
-		    *dstLine = FbDoMaskRRop (*dstLine, andBits, xorBits, endmask);
+		    WRITE(dstLine, FbDoMaskRRop (READ(dstLine), andBits, xorBits, endmask));
 	    }
 	    else
 	    {
diff --git a/fb/fbblt.c b/fb/fbblt.c
index d176a7c..e18981a 100644
--- a/fb/fbblt.c
+++ b/fb/fbblt.c
@@ -92,10 +92,10 @@ fbBlt (FbBits   *srcLine,
 
         if (!upsidedown)
             for (i = 0; i < height; i++)
-                memcpy(dst + i * dstStride, src + i * srcStride, width);
+                MEMCPY_WRAPPED(dst + i * dstStride, src + i * srcStride, width);
         else
             for (i = height - 1; i >= 0; i--)
-                memcpy(dst + i * dstStride, src + i * srcStride, width);
+                MEMCPY_WRAPPED(dst + i * dstStride, src + i * srcStride, width);
 
         return;
     }
@@ -137,7 +137,7 @@ fbBlt (FbBits   *srcLine,
 	    {
 		if (endmask)
 		{
-		    bits = *--src;
+		    bits = READ(--src);
 		    --dst;
 		    FbDoRightMaskByteMergeRop(dst, bits, endbyte, endmask);
 		}
@@ -145,20 +145,20 @@ fbBlt (FbBits   *srcLine,
 		if (destInvarient)
 		{
 		    while (n--)
-			*--dst = FbDoDestInvarientMergeRop(*--src);
+			WRITE(--dst, FbDoDestInvarientMergeRop(READ(--src)));
 		}
 		else
 		{
 		    while (n--)
 		    {
-			bits = *--src;
+			bits = READ(--src);
 			--dst;
-			*dst = FbDoMergeRop (bits, *dst);
+			WRITE(dst, FbDoMergeRop (bits, READ(dst)));
 		    }
 		}
 		if (startmask)
 		{
-		    bits = *--src;
+		    bits = READ(--src);
 		    --dst;
 		    FbDoLeftMaskByteMergeRop(dst, bits, startbyte, startmask);
 		}
@@ -167,7 +167,7 @@ fbBlt (FbBits   *srcLine,
 	    {
 		if (startmask)
 		{
-		    bits = *src++;
+		    bits = READ(src++);
 		    FbDoLeftMaskByteMergeRop(dst, bits, startbyte, startmask);
 		    dst++;
 		}
@@ -198,20 +198,20 @@ fbBlt (FbBits   *srcLine,
 		    }
 #endif
 		    while (n--)
-			*dst++ = FbDoDestInvarientMergeRop(*src++);
+			WRITE(dst++, FbDoDestInvarientMergeRop(READ(src++)));
 		}
 		else
 		{
 		    while (n--)
 		    {
-			bits = *src++;
-			*dst = FbDoMergeRop (bits, *dst);
+			bits = READ(src++);
+			WRITE(dst, FbDoMergeRop (bits, READ(dst)));
 			dst++;
 		    }
 		}
 		if (endmask)
 		{
-		    bits = *src;
+		    bits = READ(src);
 		    FbDoRightMaskByteMergeRop(dst, bits, endbyte, endmask);
 		}
 	    }
@@ -240,13 +240,13 @@ fbBlt (FbBits   *srcLine,
 	    if (reverse)
 	    {
 		if (srcX < dstX)
-		    bits1 = *--src;
+		    bits1 = READ(--src);
 		if (endmask)
 		{
 		    bits = FbScrRight(bits1, rightShift); 
 		    if (FbScrRight(endmask, leftShift))
 		    {
-			bits1 = *--src;
+			bits1 = READ(--src);
 			bits |= FbScrLeft(bits1, leftShift);
 		    }
 		    --dst;
@@ -258,10 +258,10 @@ fbBlt (FbBits   *srcLine,
 		    while (n--)
 		    {
 			bits = FbScrRight(bits1, rightShift); 
-			bits1 = *--src;
+			bits1 = READ(--src);
 			bits |= FbScrLeft(bits1, leftShift);
 			--dst;
-			*dst = FbDoDestInvarientMergeRop(bits);
+			WRITE(dst, FbDoDestInvarientMergeRop(bits));
 		    }
 		}
 		else
@@ -269,10 +269,10 @@ fbBlt (FbBits   *srcLine,
 		    while (n--)
 		    {
 			bits = FbScrRight(bits1, rightShift); 
-			bits1 = *--src;
+			bits1 = READ(--src);
 			bits |= FbScrLeft(bits1, leftShift);
 			--dst;
-			*dst = FbDoMergeRop(bits, *dst);
+			WRITE(dst, FbDoMergeRop(bits, READ(dst)));
 		    }
 		}
 		if (startmask)
@@ -280,7 +280,7 @@ fbBlt (FbBits   *srcLine,
 		    bits = FbScrRight(bits1, rightShift); 
 		    if (FbScrRight(startmask, leftShift))
 		    {
-			bits1 = *--src;
+			bits1 = READ(--src);
 			bits |= FbScrLeft(bits1, leftShift);
 		    }
 		    --dst;
@@ -290,13 +290,13 @@ fbBlt (FbBits   *srcLine,
 	    else
 	    {
 		if (srcX > dstX)
-		    bits1 = *src++;
+		    bits1 = READ(src++);
 		if (startmask)
 		{
 		    bits = FbScrLeft(bits1, leftShift); 
 		    if (FbScrLeft(startmask, rightShift))
 		    {
-			bits1 = *src++;
+			bits1 = READ(src++);
 			bits |= FbScrRight(bits1, rightShift);
 		    }
 		    FbDoLeftMaskByteMergeRop (dst, bits, startbyte, startmask);
@@ -308,9 +308,9 @@ fbBlt (FbBits   *srcLine,
 		    while (n--)
 		    {
 			bits = FbScrLeft(bits1, leftShift); 
-			bits1 = *src++;
+			bits1 = READ(src++);
 			bits |= FbScrRight(bits1, rightShift);
-			*dst = FbDoDestInvarientMergeRop(bits);
+			WRITE(dst, FbDoDestInvarientMergeRop(bits));
 			dst++;
 		    }
 		}
@@ -319,9 +319,9 @@ fbBlt (FbBits   *srcLine,
 		    while (n--)
 		    {
 			bits = FbScrLeft(bits1, leftShift); 
-			bits1 = *src++;
+			bits1 = READ(src++);
 			bits |= FbScrRight(bits1, rightShift);
-			*dst = FbDoMergeRop(bits, *dst);
+			WRITE(dst, FbDoMergeRop(bits, READ(dst)));
 			dst++;
 		    }
 		}
@@ -330,7 +330,7 @@ fbBlt (FbBits   *srcLine,
 		    bits = FbScrLeft(bits1, leftShift); 
 		    if (FbScrLeft(endmask, rightShift))
 		    {
-			bits1 = *src;
+			bits1 = READ(src);
 			bits |= FbScrRight(bits1, rightShift);
 		    }
 		    FbDoRightMaskByteMergeRop (dst, bits, endbyte, endmask);
@@ -425,45 +425,45 @@ fbBlt24Line (FbBits	    *src,
 	{
 	    if (endmask)
 	    {
-		bits = *--src;
+		bits = READ(--src);
 		--dst;
-		*dst = FbDoMaskMergeRop (bits, *dst, mask & endmask);
+		WRITE(dst, FbDoMaskMergeRop (bits, READ(dst), mask & endmask));
 		mask = FbPrev24Pix (mask);
 	    }
 	    while (n--)
 	    {
-		bits = *--src;
+		bits = READ(--src);
 		--dst;
-		*dst = FbDoMaskMergeRop (bits, *dst, mask);
+		WRITE(dst, FbDoMaskMergeRop (bits, READ(dst), mask));
 		mask = FbPrev24Pix (mask);
 	    }
 	    if (startmask)
 	    {
-		bits = *--src;
+		bits = READ(--src);
 		--dst;
-		*dst = FbDoMaskMergeRop(bits, *dst, mask & startmask);
+		WRITE(dst, FbDoMaskMergeRop(bits, READ(dst), mask & startmask));
 	    }
 	}
 	else
 	{
 	    if (startmask)
 	    {
-		bits = *src++;
-		*dst = FbDoMaskMergeRop (bits, *dst, mask & startmask);
+		bits = READ(src++);
+		WRITE(dst, FbDoMaskMergeRop (bits, READ(dst), mask & startmask));
 		dst++;
 		mask = FbNext24Pix(mask);
 	    }
 	    while (n--)
 	    {
-		bits = *src++;
-		*dst = FbDoMaskMergeRop (bits, *dst, mask);
+		bits = READ(src++);
+		WRITE(dst, FbDoMaskMergeRop (bits, READ(dst), mask));
 		dst++;
 		mask = FbNext24Pix(mask);
 	    }
 	    if (endmask)
 	    {
-		bits = *src;
-		*dst = FbDoMaskMergeRop(bits, *dst, mask & endmask);
+		bits = READ(src);
+		WRITE(dst, FbDoMaskMergeRop(bits, READ(dst), mask & endmask));
 	    }
 	}
     }
@@ -484,26 +484,26 @@ fbBlt24Line (FbBits	    *src,
 	if (reverse)
 	{
 	    if (srcX < dstX)
-		bits1 = *--src;
+		bits1 = READ(--src);
 	    if (endmask)
 	    {
 		bits = FbScrRight(bits1, rightShift); 
 		if (FbScrRight(endmask, leftShift))
 		{
-		    bits1 = *--src;
+		    bits1 = READ(--src);
 		    bits |= FbScrLeft(bits1, leftShift);
 		}
 		--dst;
-		*dst = FbDoMaskMergeRop (bits, *dst, mask & endmask);
+		WRITE(dst, FbDoMaskMergeRop (bits, READ(dst), mask & endmask));
 		mask = FbPrev24Pix(mask);
 	    }
 	    while (n--)
 	    {
 		bits = FbScrRight(bits1, rightShift); 
-		bits1 = *--src;
+		bits1 = READ(--src);
 		bits |= FbScrLeft(bits1, leftShift);
 		--dst;
-		*dst = FbDoMaskMergeRop(bits, *dst, mask);
+		WRITE(dst, FbDoMaskMergeRop(bits, READ(dst), mask));
 		mask = FbPrev24Pix(mask);
 	    }
 	    if (startmask)
@@ -511,32 +511,32 @@ fbBlt24Line (FbBits	    *src,
 		bits = FbScrRight(bits1, rightShift); 
 		if (FbScrRight(startmask, leftShift))
 		{
-		    bits1 = *--src;
+		    bits1 = READ(--src);
 		    bits |= FbScrLeft(bits1, leftShift);
 		}
 		--dst;
-		*dst = FbDoMaskMergeRop (bits, *dst, mask & startmask);
+		WRITE(dst, FbDoMaskMergeRop (bits, READ(dst), mask & startmask));
 	    }
 	}
 	else
 	{
 	    if (srcX > dstX)
-		bits1 = *src++;
+		bits1 = READ(src++);
 	    if (startmask)
 	    {
 		bits = FbScrLeft(bits1, leftShift); 
-		bits1 = *src++;
+		bits1 = READ(src++);
 		bits |= FbScrRight(bits1, rightShift);
-		*dst = FbDoMaskMergeRop (bits, *dst, mask & startmask);
+		WRITE(dst, FbDoMaskMergeRop (bits, READ(dst), mask & startmask));
 		dst++;
 		mask = FbNext24Pix(mask);
 	    }
 	    while (n--)
 	    {
 		bits = FbScrLeft(bits1, leftShift); 
-		bits1 = *src++;
+		bits1 = READ(src++);
 		bits |= FbScrRight(bits1, rightShift);
-		*dst = FbDoMaskMergeRop(bits, *dst, mask);
+		WRITE(dst, FbDoMaskMergeRop(bits, READ(dst), mask));
 		dst++;
 		mask = FbNext24Pix(mask);
 	    }
@@ -545,10 +545,10 @@ fbBlt24Line (FbBits	    *src,
 		bits = FbScrLeft(bits1, leftShift); 
 		if (FbScrLeft(endmask, rightShift))
 		{
-		    bits1 = *src;
+		    bits1 = READ(src);
 		    bits |= FbScrRight(bits1, rightShift);
 		}
-		*dst = FbDoMaskMergeRop (bits, *dst, mask & endmask);
+		WRITE(dst, FbDoMaskMergeRop (bits, READ(dst), mask & endmask));
 	    }
 	}
     }
@@ -707,8 +707,8 @@ fbBltOdd (FbBits    *srcLine,
 	{
 	    if (startmask)
 	    {
-		bits = *src++;
-		*dst = FbDoMaskMergeRop (bits, *dst, startmask);
+		bits = READ(src++);
+		WRITE(dst, FbDoMaskMergeRop (bits, READ(dst), startmask));
 		dst++;
 	    }
 	    n = nmiddle;
@@ -716,8 +716,8 @@ fbBltOdd (FbBits    *srcLine,
 	    {
 		while (n--)
 		{
-		    bits = *src++;
-		    *dst = FbDoDestInvarientMergeRop(bits);
+		    bits = READ(src++);
+		    WRITE(dst, FbDoDestInvarientMergeRop(bits));
 		    dst++;
 		}
 	    }
@@ -725,28 +725,28 @@ fbBltOdd (FbBits    *srcLine,
 	    {
 		while (n--)
 		{
-		    bits = *src++;
-		    *dst = FbDoMergeRop (bits, *dst);
+		    bits = READ(src++);
+		    WRITE(dst, FbDoMergeRop (bits, READ(dst)));
 		    dst++;
 		}
 	    }
 	    if (endmask)
 	    {
-		bits = *src;
-		*dst = FbDoMaskMergeRop(bits, *dst, endmask);
+		bits = READ(src);
+		WRITE(dst, FbDoMaskMergeRop(bits, READ(dst), endmask));
 	    }
 	}
 	else
 	{
 	    bits = 0;
 	    if (srcX > dstX)
-		bits = *src++;
+		bits = READ(src++);
 	    if (startmask)
 	    {
 		bits1 = FbScrLeft(bits, leftShift);
-		bits = *src++;
+		bits = READ(src++);
 		bits1 |= FbScrRight(bits, rightShift);
-		*dst = FbDoMaskMergeRop (bits1, *dst, startmask);
+		WRITE(dst, FbDoMaskMergeRop (bits1, READ(dst), startmask));
 		dst++;
 	    }
 	    n = nmiddle;
@@ -755,9 +755,9 @@ fbBltOdd (FbBits    *srcLine,
 		while (n--)
 		{
 		    bits1 = FbScrLeft(bits, leftShift);
-		    bits = *src++;
+		    bits = READ(src++);
 		    bits1 |= FbScrRight(bits, rightShift);
-		    *dst = FbDoDestInvarientMergeRop(bits1);
+		    WRITE(dst, FbDoDestInvarientMergeRop(bits1));
 		    dst++;
 		}
 	    }
@@ -766,9 +766,9 @@ fbBltOdd (FbBits    *srcLine,
 		while (n--)
 		{
 		    bits1 = FbScrLeft(bits, leftShift);
-		    bits = *src++;
+		    bits = READ(src++);
 		    bits1 |= FbScrRight(bits, rightShift);
-		    *dst = FbDoMergeRop(bits1, *dst);
+		    WRITE(dst, FbDoMergeRop(bits1, READ(dst)));
 		    dst++;
 		}
 	    }
@@ -777,10 +777,10 @@ fbBltOdd (FbBits    *srcLine,
 		bits1 = FbScrLeft(bits, leftShift);
 		if (FbScrLeft(endmask, rightShift))
 		{
-		    bits = *src;
+		    bits = READ(src);
 		    bits1 |= FbScrRight(bits, rightShift);
 		}
-		*dst = FbDoMaskMergeRop (bits1, *dst, endmask);
+		WRITE(dst, FbDoMaskMergeRop (bits1, READ(dst), endmask));
 	    }
 	}
     }
diff --git a/fb/fbbltone.c b/fb/fbbltone.c
index f06357a..d2c180f 100644
--- a/fb/fbbltone.c
+++ b/fb/fbbltone.c
@@ -51,12 +51,12 @@
 
 #define LoadBits {\
     if (leftShift) { \
-	bitsRight = (src < srcEnd ? *src++ : 0); \
+	bitsRight = (src < srcEnd ? READ(src++) : 0); \
 	bits = (FbStipLeft (bitsLeft, leftShift) | \
 		FbStipRight(bitsRight, rightShift)); \
 	bitsLeft = bitsRight; \
     } else \
-	bits = (src < srcEnd ? *src++ : 0); \
+	bits = (src < srcEnd ? READ(src++) : 0); \
 }
     
 #ifndef FBNOPIXADDR
@@ -285,7 +285,7 @@ fbBltOne (FbStip    *src,
 	
 	bitsLeft = 0;
 	if (srcX > dstS)
-	    bitsLeft = *src++;
+	    bitsLeft = READ(src++);
 	if (n)
 	{
 	    /*
@@ -338,7 +338,7 @@ fbBltOne (FbStip    *src,
 			else
 #endif
 			    mask = fbBits[FbLeftStipBits(bits,pixelsPerDst)];
-			*dst = FbOpaqueStipple (mask, fgxor, bgxor);
+			WRITE(dst, FbOpaqueStipple (mask, fgxor, bgxor));
 			dst++;
 			bits = FbStipLeft(bits, pixelsPerDst);
 		    }
@@ -368,8 +368,8 @@ fbBltOne (FbStip    *src,
 			    if (left || !transparent)
 			    {
 				mask = fbBits[left];
-				*dst = FbStippleRRop (*dst, mask,
-						      fgand, fgxor, bgand, bgxor);
+				WRITE(dst, FbStippleRRop (READ(dst), mask,
+						          fgand, fgxor, bgand, bgxor));
 			    }
 			    dst++;
 			    bits = FbStipLeft(bits, pixelsPerDst);
@@ -537,7 +537,7 @@ const FbBits	fbStipple24Bits[3][1 << FbS
 	stip = FbLeftStipBits(bits, len); \
     } else { \
 	stip = FbLeftStipBits(bits, remain); \
-	bits = (src < srcEnd ? *src++ : 0); \
+	bits = (src < srcEnd ? READ(src++) : 0); \
 	__len = (len) - remain; \
 	stip = FbMergePartStip24Bits(stip, FbLeftStipBits(bits, __len), \
 				     remain, __len); \
@@ -548,7 +548,7 @@ const FbBits	fbStipple24Bits[3][1 << FbS
 }
 
 #define fbInitStipBits(offset,len,stip) {\
-    bits = FbStipLeft (*src++,offset); \
+    bits = FbStipLeft (READ(src++),offset); \
     remain = FB_STIP_UNIT - offset; \
     fbFirstStipBits(len,stip); \
     stip = FbMergeStip24Bits (0, stip, len); \
@@ -631,10 +631,11 @@ fbBltOne24 (FbStip	*srcLine,
 	    if (leftMask)
 	    {
 		mask = fbStipple24Bits[rot >> 3][stip];
-		*dst = (*dst & ~leftMask) | (FbOpaqueStipple (mask,
-							      FbRot24(fgxor, rot),
-							      FbRot24(bgxor, rot))
-					     & leftMask);
+		WRITE(dst, (READ(dst) & ~leftMask) |
+			    (FbOpaqueStipple (mask,
+					      FbRot24(fgxor, rot),
+					      FbRot24(bgxor, rot))
+			     & leftMask));
 		dst++;
 		fbNextStipBits(rot,stip);
 	    }
@@ -642,19 +643,20 @@ fbBltOne24 (FbStip	*srcLine,
 	    while (nl--)
 	    {
 		mask = fbStipple24Bits[rot>>3][stip];
-		*dst = FbOpaqueStipple (mask, 
-					FbRot24(fgxor, rot),
-					FbRot24(bgxor, rot));
+		WRITE(dst, FbOpaqueStipple (mask,
+					    FbRot24(fgxor, rot),
+					    FbRot24(bgxor, rot)));
 		dst++;
 		fbNextStipBits(rot,stip);
 	    }
 	    if (rightMask)
 	    {
 		mask = fbStipple24Bits[rot >> 3][stip];
-		*dst = (*dst & ~rightMask) | (FbOpaqueStipple (mask,
-							       FbRot24(fgxor, rot),
-							       FbRot24(bgxor, rot))
-					      & rightMask);
+		WRITE(dst, (READ(dst) & ~rightMask) |
+			    (FbOpaqueStipple (mask,
+					      FbRot24(fgxor, rot),
+					      FbRot24(bgxor, rot))
+			     & rightMask));
 	    }
 	    dst += dstStride;
 	    src += srcStride;
@@ -674,7 +676,7 @@ fbBltOne24 (FbStip	*srcLine,
 		if (stip)
 		{
 		    mask = fbStipple24Bits[rot >> 3][stip] & leftMask;
-		    *dst = (*dst & ~mask) | (FbRot24(fgxor, rot) & mask);
+		    WRITE(dst, (READ(dst) & ~mask) | (FbRot24(fgxor, rot) & mask));
 		}
 		dst++;
 		fbNextStipBits (rot, stip);
@@ -685,7 +687,7 @@ fbBltOne24 (FbStip	*srcLine,
 		if (stip)
 		{
 		    mask = fbStipple24Bits[rot>>3][stip];
-		    *dst = (*dst & ~mask) | (FbRot24(fgxor,rot) & mask);
+		    WRITE(dst, (READ(dst) & ~mask) | (FbRot24(fgxor,rot) & mask));
 		}
 		dst++;
 		fbNextStipBits (rot, stip);
@@ -695,7 +697,7 @@ fbBltOne24 (FbStip	*srcLine,
 		if (stip)
 		{
 		    mask = fbStipple24Bits[rot >> 3][stip] & rightMask;
-		    *dst = (*dst & ~mask) | (FbRot24(fgxor, rot) & mask);
+		    WRITE(dst, (READ(dst) & ~mask) | (FbRot24(fgxor, rot) & mask));
 		}
 	    }
 	    dst += dstStride;
@@ -712,12 +714,12 @@ fbBltOne24 (FbStip	*srcLine,
 	    if (leftMask)
 	    {
 		mask = fbStipple24Bits[rot >> 3][stip];
-		*dst = FbStippleRRopMask (*dst, mask,
-					  FbRot24(fgand, rot),
-					  FbRot24(fgxor, rot),
-					  FbRot24(bgand, rot),
-					  FbRot24(bgxor, rot),
-					  leftMask);
+		WRITE(dst, FbStippleRRopMask (READ(dst), mask,
+					      FbRot24(fgand, rot),
+					      FbRot24(fgxor, rot),
+					      FbRot24(bgand, rot),
+					      FbRot24(bgxor, rot),
+					      leftMask));
 		dst++;
 		fbNextStipBits(rot,stip);
 	    }
@@ -725,23 +727,23 @@ fbBltOne24 (FbStip	*srcLine,
 	    while (nl--)
 	    {
 		mask = fbStipple24Bits[rot >> 3][stip];
-		*dst = FbStippleRRop (*dst, mask,
-				      FbRot24(fgand, rot),
-				      FbRot24(fgxor, rot),
-				      FbRot24(bgand, rot),
-				      FbRot24(bgxor, rot));
+		WRITE(dst, FbStippleRRop (READ(dst), mask,
+					  FbRot24(fgand, rot),
+					  FbRot24(fgxor, rot),
+					  FbRot24(bgand, rot),
+					  FbRot24(bgxor, rot)));
 		dst++;
 		fbNextStipBits(rot,stip);
 	    }
 	    if (rightMask)
 	    {
 		mask = fbStipple24Bits[rot >> 3][stip];
-		*dst = FbStippleRRopMask (*dst, mask,
-					  FbRot24(fgand, rot),
-					  FbRot24(fgxor, rot),
-					  FbRot24(bgand, rot),
-					  FbRot24(bgxor, rot),
-					  rightMask);
+		WRITE(dst, FbStippleRRopMask (READ(dst), mask,
+					      FbRot24(fgand, rot),
+					      FbRot24(fgxor, rot),
+					      FbRot24(bgand, rot),
+					      FbRot24(bgxor, rot),
+					      rightMask));
 	    }
 	    dst += dstStride;
 	}
@@ -832,7 +834,7 @@ fbBltPlane (FbBits	    *src,
 	if (srcBpp == 24)
 	    srcMask0 = FbRot24(pm,rot0) & FbBitsMask(0, srcBpp);
 #endif
-    	srcBits = *s++;
+    	srcBits = READ(s++);
 
 	dstMask = dstMaskFirst;
 	dstUnion = 0;
@@ -844,7 +846,7 @@ fbBltPlane (FbBits	    *src,
 	{
 	    if (!srcMask)
 	    {
-		srcBits = *s++;
+		srcBits = READ(s++);
 #ifdef FB_24BIT
 		if (srcBpp == 24)
 		    srcMask0 = FbNext24Pix(srcMask0) & FbBitsMask(0,24);
@@ -853,9 +855,9 @@ fbBltPlane (FbBits	    *src,
 	    }
 	    if (!dstMask)
 	    {
-		*d = FbStippleRRopMask(*d, dstBits,
-				       fgand, fgxor, bgand, bgxor,
-				       dstUnion);
+		WRITE(d, FbStippleRRopMask(READ(d), dstBits,
+					   fgand, fgxor, bgand, bgxor,
+					   dstUnion));
 		d++;
 		dstMask = FbStipMask(0,1);
 		dstUnion = 0;
@@ -871,9 +873,9 @@ fbBltPlane (FbBits	    *src,
 	    dstMask = FbStipRight(dstMask,1);
 	}
 	if (dstUnion)
-	    *d = FbStippleRRopMask(*d,dstBits,
-				   fgand, fgxor, bgand, bgxor,
-				   dstUnion);
+	    WRITE(d, FbStippleRRopMask(READ(d),dstBits,
+				       fgand, fgxor, bgand, bgxor,
+				       dstUnion));
     }
 }
 
diff --git a/fb/fbcompose.c b/fb/fbcompose.c
index c7a7280..6ea9483 100644
--- a/fb/fbcompose.c
+++ b/fb/fbcompose.c
@@ -53,7 +53,7 @@ typedef FASTCALL void (*fetchProc)(const
 static FASTCALL void
 fbFetch_a8r8g8b8 (const FbBits *bits, int x, int width, CARD32 *buffer, miIndexedPtr indexed)
 {
-    memcpy(buffer, (const CARD32 *)bits + x, width*sizeof(CARD32));
+    MEMCPY_WRAPPED(buffer, (const CARD32 *)bits + x, width*sizeof(CARD32));
 }
 
 static FASTCALL void
@@ -62,7 +62,7 @@ fbFetch_x8r8g8b8 (const FbBits *bits, in
     const CARD32 *pixel = (const CARD32 *)bits + x;
     const CARD32 *end = pixel + width;
     while (pixel < end) {
-        *buffer++ = *pixel++ | 0xff000000;
+        WRITE(buffer++, READ(pixel++) | 0xff000000);
     }
 }
 
@@ -72,9 +72,9 @@ fbFetch_a8b8g8r8 (const FbBits *bits, in
     const CARD32 *pixel = (CARD32 *)bits + x;
     const CARD32 *end = pixel + width;
     while (pixel < end) {
-        *buffer++ =  ((*pixel & 0xff00ff00) |
-                      ((*pixel >> 16) & 0xff) |
-                      ((*pixel & 0xff) << 16));
+        WRITE(buffer++, ((READ(pixel) & 0xff00ff00) |
+                         ((READ(pixel) >> 16) & 0xff) |
+                         ((READ(pixel) & 0xff) << 16)));
         ++pixel;
     }
 }
@@ -85,10 +85,10 @@ fbFetch_x8b8g8r8 (const FbBits *bits, in
     const CARD32 *pixel = (CARD32 *)bits + x;
     const CARD32 *end = pixel + width;
     while (pixel < end) {
-        *buffer++ =  0xff000000 |
-                     ((*pixel & 0x0000ff00) |
-                      ((*pixel >> 16) & 0xff) |
-                      ((*pixel & 0xff) << 16));
+        WRITE(buffer++, 0xff000000 |
+                        ((READ(pixel) & 0x0000ff00) |
+                         ((READ(pixel) >> 16) & 0xff) |
+                         ((READ(pixel) & 0xff) << 16)));
         ++pixel;
     }
 }
@@ -101,7 +101,7 @@ fbFetch_r8g8b8 (const FbBits *bits, int 
     while (pixel < end) {
         CARD32 b = Fetch24(pixel) | 0xff000000;
         pixel += 3;
-        *buffer++ = b;
+        WRITE(buffer++, b);
     }
 }
 
@@ -113,13 +113,13 @@ fbFetch_b8g8r8 (const FbBits *bits, int 
     while (pixel < end) {
         CARD32 b = 0xff000000;
 #if IMAGE_BYTE_ORDER == MSBFirst
-        b |= (*pixel++);
-        b |= (*pixel++ << 8);
-        b |= (*pixel++ << 16);
+        b |= (READ(pixel++));
+        b |= (READ(pixel++) << 8);
+        b |= (READ(pixel++) << 16);
 #else
-        b |= (*pixel++ << 16);
-        b |= (*pixel++ << 8);
-        b |= (*pixel++);
+        b |= (READ(pixel++) << 16);
+        b |= (READ(pixel++) << 8);
+        b |= (READ(pixel++));
 #endif
     }
 }
@@ -130,13 +130,13 @@ fbFetch_r5g6b5 (const FbBits *bits, int 
     const CARD16 *pixel = (const CARD16 *)bits + x;
     const CARD16 *end = pixel + width;
     while (pixel < end) {
-        CARD32  p = *pixel++;
+        CARD32  p = READ(pixel++);
         CARD32 r = (((p) << 3) & 0xf8) | 
                    (((p) << 5) & 0xfc00) |
                    (((p) << 8) & 0xf80000);
         r |= (r >> 5) & 0x70007;
         r |= (r >> 6) & 0x300;
-        *buffer++ = 0xff000000 | r;
+        WRITE(buffer++, 0xff000000 | r);
     }
 }
 
@@ -146,13 +146,13 @@ fbFetch_b5g6r5 (const FbBits *bits, int 
     const CARD16 *pixel = (const CARD16 *)bits + x;
     const CARD16 *end = pixel + width;
     while (pixel < end) {
-        CARD32  p = *pixel++;
+        CARD32  p = READ(pixel++);
         CARD32  r,g,b;
 
         b = ((p & 0xf800) | ((p & 0xe000) >> 5)) >> 8;
         g = ((p & 0x07e0) | ((p & 0x0600) >> 6)) << 5;
         r = ((p & 0x001c) | ((p & 0x001f) << 5)) << 14;
-        *buffer++ = (0xff000000 | r | g | b);
+        WRITE(buffer++, (0xff000000 | r | g | b));
     }
 }
 
@@ -162,14 +162,14 @@ fbFetch_a1r5g5b5 (const FbBits *bits, in
     const CARD16 *pixel = (const CARD16 *)bits + x;
     const CARD16 *end = pixel + width;
     while (pixel < end) {
-        CARD32  p = *pixel++;
+        CARD32  p = READ(pixel++);
         CARD32  r,g,b, a;
 
         a = (CARD32) ((CARD8) (0 - ((p & 0x8000) >> 15))) << 24;
         r = ((p & 0x7c00) | ((p & 0x7000) >> 5)) << 9;
         g = ((p & 0x03e0) | ((p & 0x0380) >> 5)) << 6;
         b = ((p & 0x001c) | ((p & 0x001f) << 5)) >> 2;
-        *buffer++ = (a | r | g | b);
+        WRITE(buffer++, (a | r | g | b));
     }
 }
 
@@ -179,13 +179,13 @@ fbFetch_x1r5g5b5 (const FbBits *bits, in
     const CARD16 *pixel = (const CARD16 *)bits + x;
     const CARD16 *end = pixel + width;
     while (pixel < end) {
-        CARD32  p = *pixel++;
+        CARD32  p = READ(pixel++);
         CARD32  r,g,b;
 
         r = ((p & 0x7c00) | ((p & 0x7000) >> 5)) << 9;
         g = ((p & 0x03e0) | ((p & 0x0380) >> 5)) << 6;
         b = ((p & 0x001c) | ((p & 0x001f) << 5)) >> 2;
-        *buffer++ = (0xff000000 | r | g | b);
+        WRITE(buffer++, (0xff000000 | r | g | b));
     }
 }
 
@@ -195,14 +195,14 @@ fbFetch_a1b5g5r5 (const FbBits *bits, in
     const CARD16 *pixel = (const CARD16 *)bits + x;
     const CARD16 *end = pixel + width;
     while (pixel < end) {
-        CARD32  p = *pixel++;
+        CARD32  p = READ(pixel++);
         CARD32  r,g,b, a;
 
         a = (CARD32) ((CARD8) (0 - ((p & 0x8000) >> 15))) << 24;
         b = ((p & 0x7c00) | ((p & 0x7000) >> 5)) >> 7;
         g = ((p & 0x03e0) | ((p & 0x0380) >> 5)) << 6;
         r = ((p & 0x001c) | ((p & 0x001f) << 5)) << 14;
-        *buffer++ = (a | r | g | b);
+        WRITE(buffer++, (a | r | g | b));
     }
 }
 
@@ -212,13 +212,13 @@ fbFetch_x1b5g5r5 (const FbBits *bits, in
     const CARD16 *pixel = (const CARD16 *)bits + x;
     const CARD16 *end = pixel + width;
     while (pixel < end) {
-        CARD32  p = *pixel++;
+        CARD32  p = READ(pixel++);
         CARD32  r,g,b;
 
         b = ((p & 0x7c00) | ((p & 0x7000) >> 5)) >> 7;
         g = ((p & 0x03e0) | ((p & 0x0380) >> 5)) << 6;
         r = ((p & 0x001c) | ((p & 0x001f) << 5)) << 14;
-        *buffer++ = (0xff000000 | r | g | b);
+        WRITE(buffer++, (0xff000000 | r | g | b));
     }
 }
 
@@ -228,14 +228,14 @@ fbFetch_a4r4g4b4 (const FbBits *bits, in
     const CARD16 *pixel = (const CARD16 *)bits + x;
     const CARD16 *end = pixel + width;
     while (pixel < end) {
-        CARD32  p = *pixel++;
+        CARD32  p = READ(pixel++);
         CARD32  r,g,b, a;
 
         a = ((p & 0xf000) | ((p & 0xf000) >> 4)) << 16;
         r = ((p & 0x0f00) | ((p & 0x0f00) >> 4)) << 12;
         g = ((p & 0x00f0) | ((p & 0x00f0) >> 4)) << 8;
         b = ((p & 0x000f) | ((p & 0x000f) << 4));
-        *buffer++ = (a | r | g | b);
+        WRITE(buffer++, (a | r | g | b));
     }
 }
 
@@ -245,13 +245,13 @@ fbFetch_x4r4g4b4 (const FbBits *bits, in
     const CARD16 *pixel = (const CARD16 *)bits + x;
     const CARD16 *end = pixel + width;
     while (pixel < end) {
-        CARD32  p = *pixel++;
+        CARD32  p = READ(pixel++);
         CARD32  r,g,b;
 
         r = ((p & 0x0f00) | ((p & 0x0f00) >> 4)) << 12;
         g = ((p & 0x00f0) | ((p & 0x00f0) >> 4)) << 8;
         b = ((p & 0x000f) | ((p & 0x000f) << 4));
-        *buffer++ = (0xff000000 | r | g | b);
+        WRITE(buffer++, (0xff000000 | r | g | b));
     }
 }
 
@@ -261,14 +261,14 @@ fbFetch_a4b4g4r4 (const FbBits *bits, in
     const CARD16 *pixel = (const CARD16 *)bits + x;
     const CARD16 *end = pixel + width;
     while (pixel < end) {
-        CARD32  p = *pixel++;
+        CARD32  p = READ(pixel++);
         CARD32  r,g,b, a;
 
         a = ((p & 0xf000) | ((p & 0xf000) >> 4)) << 16;
         b = ((p & 0x0f00) | ((p & 0x0f00) >> 4)) >> 4;
         g = ((p & 0x00f0) | ((p & 0x00f0) >> 4)) << 8;
         r = ((p & 0x000f) | ((p & 0x000f) << 4)) << 16;
-        *buffer++ = (a | r | g | b);
+        WRITE(buffer++, (a | r | g | b));
     }
 }
 
@@ -278,13 +278,13 @@ fbFetch_x4b4g4r4 (const FbBits *bits, in
     const CARD16 *pixel = (const CARD16 *)bits + x;
     const CARD16 *end = pixel + width;
     while (pixel < end) {
-        CARD32  p = *pixel++;
+        CARD32  p = READ(pixel++);
         CARD32  r,g,b;
 
         b = ((p & 0x0f00) | ((p & 0x0f00) >> 4)) >> 4;
         g = ((p & 0x00f0) | ((p & 0x00f0) >> 4)) << 8;
         r = ((p & 0x000f) | ((p & 0x000f) << 4)) << 16;
-        *buffer++ = (0xff000000 | r | g | b);
+        WRITE(buffer++, (0xff000000 | r | g | b));
     }
 }
 
@@ -294,7 +294,7 @@ fbFetch_a8 (const FbBits *bits, int x, i
     const CARD8 *pixel = (const CARD8 *)bits + x;
     const CARD8 *end = pixel + width;
     while (pixel < end) {
-        *buffer++ = (*pixel++) << 24;
+        WRITE(buffer++, READ(pixel++) << 24);
     }
 }
 
@@ -304,7 +304,7 @@ fbFetch_r3g3b2 (const FbBits *bits, int 
     const CARD8 *pixel = (const CARD8 *)bits + x;
     const CARD8 *end = pixel + width;
     while (pixel < end) {
-        CARD32  p = *pixel++;
+        CARD32  p = READ(pixel++);
         CARD32  r,g,b;
 
         r = ((p & 0xe0) | ((p & 0xe0) >> 3) | ((p & 0xc0) >> 6)) << 16;
@@ -313,7 +313,7 @@ fbFetch_r3g3b2 (const FbBits *bits, int 
              ((p & 0x03) << 2) |
              ((p & 0x03) << 4) |
              ((p & 0x03) << 6));
-        *buffer++ = (0xff000000 | r | g | b);
+        WRITE(buffer++, (0xff000000 | r | g | b));
     }
 }
 
@@ -323,7 +323,7 @@ fbFetch_b2g3r3 (const FbBits *bits, int 
     const CARD8 *pixel = (const CARD8 *)bits + x;
     const CARD8 *end = pixel + width;
     while (pixel < end) {
-        CARD32  p = *pixel++;
+        CARD32  p = READ(pixel++);
         CARD32  r,g,b;
 
         b = (((p & 0xc0)     ) |
@@ -334,7 +334,7 @@ fbFetch_b2g3r3 (const FbBits *bits, int 
         r = (((p & 0x07)     ) |
              ((p & 0x07) << 3) |
              ((p & 0x06) << 6)) << 16;
-        *buffer++ = (0xff000000 | r | g | b);
+        WRITE(buffer++, (0xff000000 | r | g | b));
 	}
 }
 
@@ -344,14 +344,14 @@ fbFetch_a2r2g2b2 (const FbBits *bits, in
     const CARD8 *pixel = (const CARD8 *)bits + x;
     const CARD8 *end = pixel + width;
     while (pixel < end) {
-        CARD32  p = *pixel++;
+        CARD32  p = READ(pixel++);
         CARD32   a,r,g,b;
 
         a = ((p & 0xc0) * 0x55) << 18;
         r = ((p & 0x30) * 0x55) << 12;
         g = ((p & 0x0c) * 0x55) << 6;
         b = ((p & 0x03) * 0x55);
-        *buffer++ = a|r|g|b;
+        WRITE(buffer++, a|r|g|b);
     }
 }
 
@@ -361,14 +361,14 @@ fbFetch_a2b2g2r2 (const FbBits *bits, in
     const CARD8 *pixel = (const CARD8 *)bits + x;
     const CARD8 *end = pixel + width;
     while (pixel < end) {
-        CARD32  p = *pixel++;
+        CARD32  p = READ(pixel++);
         CARD32   a,r,g,b;
 
         a = ((p & 0xc0) * 0x55) << 18;
         b = ((p & 0x30) * 0x55) >> 6;
         g = ((p & 0x0c) * 0x55) << 6;
         r = ((p & 0x03) * 0x55) << 16;
-        *buffer++ = a|r|g|b;
+        WRITE(buffer++, a|r|g|b);
     }
 }
 
@@ -378,8 +378,8 @@ fbFetch_c8 (const FbBits *bits, int x, i
     const CARD8 *pixel = (const CARD8 *)bits + x;
     const CARD8 *end = pixel + width;
     while (pixel < end) {
-        CARD32  p = *pixel++;
-        *buffer++ = indexed->rgba[p];
+        CARD32  p = READ(pixel++);
+        WRITE(buffer++, indexed->rgba[p]);
     }
 }
 
@@ -389,8 +389,8 @@ fbFetch_x4a4 (const FbBits *bits, int x,
     const CARD8 *pixel = (const CARD8 *)bits + x;
     const CARD8 *end = pixel + width;
     while (pixel < end) {
-	CARD8 p = (*pixel++) & 0xf;
-        *buffer++ = (p | (p << 4)) << 24;
+	CARD8 p = READ(pixel++) & 0xf;
+        WRITE(buffer++, (p | (p << 4)) << 24);
     }
 }
 
@@ -409,7 +409,7 @@ fbFetch_a4 (const FbBits *bits, int x, i
         CARD32  p = Fetch4(bits, i + x);
 
         p |= p << 4;
-        *buffer++ = p << 24;
+        WRITE(buffer++, p << 24);
     }
 }
 
@@ -424,7 +424,7 @@ fbFetch_r1g2b1 (const FbBits *bits, int 
         r = ((p & 0x8) * 0xff) << 13;
         g = ((p & 0x6) * 0x55) << 7;
         b = ((p & 0x1) * 0xff);
-        *buffer++ = 0xff000000|r|g|b;
+        WRITE(buffer++, 0xff000000|r|g|b);
     }
 }
 
@@ -439,7 +439,7 @@ fbFetch_b1g2r1 (const FbBits *bits, int 
         b = ((p & 0x8) * 0xff) >> 3;
         g = ((p & 0x6) * 0x55) << 7;
         r = ((p & 0x1) * 0xff) << 16;
-        *buffer++ = 0xff000000|r|g|b;
+        WRITE(buffer++, 0xff000000|r|g|b);
     }
 }
 
@@ -455,7 +455,7 @@ fbFetch_a1r1g1b1 (const FbBits *bits, in
         r = ((p & 0x4) * 0xff) << 14;
         g = ((p & 0x2) * 0xff) << 7;
         b = ((p & 0x1) * 0xff);
-        *buffer++ = a|r|g|b;
+        WRITE(buffer++, a|r|g|b);
     }
 }
 
@@ -471,7 +471,7 @@ fbFetch_a1b1g1r1 (const FbBits *bits, in
         r = ((p & 0x4) * 0xff) >> 3;
         g = ((p & 0x2) * 0xff) << 7;
         b = ((p & 0x1) * 0xff) << 16;
-        *buffer++ = a|r|g|b;
+        WRITE(buffer++, a|r|g|b);
     }
 }
 
@@ -482,7 +482,7 @@ fbFetch_c4 (const FbBits *bits, int x, i
     for (i = 0; i < width; ++i) {
         CARD32  p = Fetch4(bits, i + x);
 
-        *buffer++ = indexed->rgba[p];
+        WRITE(buffer++, indexed->rgba[p]);
     }
 }
 
@@ -503,7 +503,7 @@ fbFetch_a1 (const FbBits *bits, int x, i
         a |= a << 1;
         a |= a << 2;
         a |= a << 4;
-        *buffer++ = a << 24;
+        WRITE(buffer++, a << 24);
     }
 }
 
@@ -520,7 +520,7 @@ fbFetch_g1 (const FbBits *bits, int x, i
         a = p >> ((i+x) & 0x1f);
 #endif
         a = a & 1;
-        *buffer++ = indexed->rgba[a];
+        WRITE(buffer++, indexed->rgba[a]);
     }
 }
 
@@ -585,19 +585,19 @@ typedef FASTCALL CARD32 (*fetchPixelProc
 static FASTCALL CARD32
 fbFetchPixel_a8r8g8b8 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    return ((CARD32 *)bits)[offset];
+    return READ((CARD32 *)bits + offset);
 }
 
 static FASTCALL CARD32
 fbFetchPixel_x8r8g8b8 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    return ((CARD32 *)bits)[offset] | 0xff000000;
+    return READ((CARD32 *)bits + offset) | 0xff000000;
 }
 
 static FASTCALL CARD32
 fbFetchPixel_a8b8g8r8 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32  pixel = ((CARD32 *)bits)[offset];
+    CARD32  pixel = READ((CARD32 *)bits + offset);
 
     return ((pixel & 0xff000000) |
 	    ((pixel >> 16) & 0xff) |
@@ -608,7 +608,7 @@ fbFetchPixel_a8b8g8r8 (const FbBits *bit
 static FASTCALL CARD32
 fbFetchPixel_x8b8g8r8 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32  pixel = ((CARD32 *)bits)[offset];
+    CARD32  pixel = READ((CARD32 *)bits + offset);
 
     return ((0xff000000) |
 	    ((pixel >> 16) & 0xff) |
@@ -622,14 +622,14 @@ fbFetchPixel_r8g8b8 (const FbBits *bits,
     CARD8   *pixel = ((CARD8 *) bits) + (offset*3);
 #if IMAGE_BYTE_ORDER == MSBFirst
     return (0xff000000 |
-	    (pixel[0] << 16) |
-	    (pixel[1] << 8) |
-	    (pixel[2]));
+	    (READ(pixel + 0) << 16) |
+	    (READ(pixel + 1) << 8) |
+	    (READ(pixel + 2)));
 #else
     return (0xff000000 |
-            (pixel[2] << 16) |
-            (pixel[1] << 8) |
-            (pixel[0]));
+            (READ(pixel + 2) << 16) |
+            (READ(pixel + 1) << 8) |
+            (READ(pixel + 0)));
 #endif
 }
 
@@ -639,21 +639,21 @@ fbFetchPixel_b8g8r8 (const FbBits *bits,
     CARD8   *pixel = ((CARD8 *) bits) + (offset*3);
 #if IMAGE_BYTE_ORDER == MSBFirst
     return (0xff000000 |
-	    (pixel[2] << 16) |
-	    (pixel[1] << 8) |
-	    (pixel[0]));
+	    (READ(pixel + 2) << 16) |
+	    (READ(pixel + 1) << 8) |
+	    (READ(pixel + 0)));
 #else
     return (0xff000000 |
-	    (pixel[0] << 16) |
-	    (pixel[1] << 8) |
-	    (pixel[2]));
+	    (READ(pixel + 0) << 16) |
+	    (READ(pixel + 1) << 8) |
+	    (READ(pixel + 2)));
 #endif
 }
 
 static FASTCALL CARD32
 fbFetchPixel_r5g6b5 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32  pixel = ((CARD16 *) bits)[offset];
+    CARD32  pixel = READ((CARD16 *) bits + offset);
     CARD32  r,g,b;
 
     r = ((pixel & 0xf800) | ((pixel & 0xe000) >> 5)) << 8;
@@ -665,7 +665,7 @@ fbFetchPixel_r5g6b5 (const FbBits *bits,
 static FASTCALL CARD32
 fbFetchPixel_b5g6r5 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32  pixel = ((CARD16 *) bits)[offset];
+    CARD32  pixel = READ((CARD16 *) bits + offset);
     CARD32  r,g,b;
 
     b = ((pixel & 0xf800) | ((pixel & 0xe000) >> 5)) >> 8;
@@ -677,7 +677,7 @@ fbFetchPixel_b5g6r5 (const FbBits *bits,
 static FASTCALL CARD32
 fbFetchPixel_a1r5g5b5 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32  pixel = ((CARD16 *) bits)[offset];
+    CARD32  pixel = READ((CARD16 *) bits + offset);
     CARD32  a,r,g,b;
 
     a = (CARD32) ((CARD8) (0 - ((pixel & 0x8000) >> 15))) << 24;
@@ -690,7 +690,7 @@ fbFetchPixel_a1r5g5b5 (const FbBits *bit
 static FASTCALL CARD32
 fbFetchPixel_x1r5g5b5 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32  pixel = ((CARD16 *) bits)[offset];
+    CARD32  pixel = READ((CARD16 *) bits + offset);
     CARD32  r,g,b;
 
     r = ((pixel & 0x7c00) | ((pixel & 0x7000) >> 5)) << 9;
@@ -702,7 +702,7 @@ fbFetchPixel_x1r5g5b5 (const FbBits *bit
 static FASTCALL CARD32
 fbFetchPixel_a1b5g5r5 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32  pixel = ((CARD16 *) bits)[offset];
+    CARD32  pixel = READ((CARD16 *) bits + offset);
     CARD32  a,r,g,b;
 
     a = (CARD32) ((CARD8) (0 - ((pixel & 0x8000) >> 15))) << 24;
@@ -715,7 +715,7 @@ fbFetchPixel_a1b5g5r5 (const FbBits *bit
 static FASTCALL CARD32
 fbFetchPixel_x1b5g5r5 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32  pixel = ((CARD16 *) bits)[offset];
+    CARD32  pixel = READ((CARD16 *) bits + offset);
     CARD32  r,g,b;
 
     b = ((pixel & 0x7c00) | ((pixel & 0x7000) >> 5)) >> 7;
@@ -727,7 +727,7 @@ fbFetchPixel_x1b5g5r5 (const FbBits *bit
 static FASTCALL CARD32
 fbFetchPixel_a4r4g4b4 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32  pixel = ((CARD16 *) bits)[offset];
+    CARD32  pixel = READ((CARD16 *) bits + offset);
     CARD32  a,r,g,b;
 
     a = ((pixel & 0xf000) | ((pixel & 0xf000) >> 4)) << 16;
@@ -740,7 +740,7 @@ fbFetchPixel_a4r4g4b4 (const FbBits *bit
 static FASTCALL CARD32
 fbFetchPixel_x4r4g4b4 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32  pixel = ((CARD16 *) bits)[offset];
+    CARD32  pixel = READ((CARD16 *) bits + offset);
     CARD32  r,g,b;
 
     r = ((pixel & 0x0f00) | ((pixel & 0x0f00) >> 4)) << 12;
@@ -752,7 +752,7 @@ fbFetchPixel_x4r4g4b4 (const FbBits *bit
 static FASTCALL CARD32
 fbFetchPixel_a4b4g4r4 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32  pixel = ((CARD16 *) bits)[offset];
+    CARD32  pixel = READ((CARD16 *) bits + offset);
     CARD32  a,r,g,b;
 
     a = ((pixel & 0xf000) | ((pixel & 0xf000) >> 4)) << 16;
@@ -765,7 +765,7 @@ fbFetchPixel_a4b4g4r4 (const FbBits *bit
 static FASTCALL CARD32
 fbFetchPixel_x4b4g4r4 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32  pixel = ((CARD16 *) bits)[offset];
+    CARD32  pixel = READ((CARD16 *) bits + offset);
     CARD32  r,g,b;
 
     b = ((pixel & 0x0f00) | ((pixel & 0x0f00) >> 4)) >> 4;
@@ -777,7 +777,7 @@ fbFetchPixel_x4b4g4r4 (const FbBits *bit
 static FASTCALL CARD32
 fbFetchPixel_a8 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32   pixel = ((CARD8 *) bits)[offset];
+    CARD32   pixel = READ((CARD8 *) bits + offset);
 
     return pixel << 24;
 }
@@ -785,7 +785,7 @@ fbFetchPixel_a8 (const FbBits *bits, int
 static FASTCALL CARD32
 fbFetchPixel_r3g3b2 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32   pixel = ((CARD8 *) bits)[offset];
+    CARD32   pixel = READ((CARD8 *) bits + offset);
     CARD32  r,g,b;
 
     r = ((pixel & 0xe0) | ((pixel & 0xe0) >> 3) | ((pixel & 0xc0) >> 6)) << 16;
@@ -800,7 +800,7 @@ fbFetchPixel_r3g3b2 (const FbBits *bits,
 static FASTCALL CARD32
 fbFetchPixel_b2g3r3 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32   pixel = ((CARD8 *) bits)[offset];
+    CARD32   pixel = READ((CARD8 *) bits + offset);
     CARD32  r,g,b;
 
     b = (((pixel & 0xc0)     ) |
@@ -817,7 +817,7 @@ fbFetchPixel_b2g3r3 (const FbBits *bits,
 static FASTCALL CARD32
 fbFetchPixel_a2r2g2b2 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32   pixel = ((CARD8 *) bits)[offset];
+    CARD32   pixel = READ((CARD8 *) bits + offset);
     CARD32   a,r,g,b;
 
     a = ((pixel & 0xc0) * 0x55) << 18;
@@ -830,7 +830,7 @@ fbFetchPixel_a2r2g2b2 (const FbBits *bit
 static FASTCALL CARD32
 fbFetchPixel_a2b2g2r2 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32   pixel = ((CARD8 *) bits)[offset];
+    CARD32   pixel = READ((CARD8 *) bits + offset);
     CARD32   a,r,g,b;
 
     a = ((pixel & 0xc0) * 0x55) << 18;
@@ -843,14 +843,14 @@ fbFetchPixel_a2b2g2r2 (const FbBits *bit
 static FASTCALL CARD32
 fbFetchPixel_c8 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32   pixel = ((CARD8 *) bits)[offset];
+    CARD32   pixel = READ((CARD8 *) bits + offset);
     return indexed->rgba[pixel];
 }
 
 static FASTCALL CARD32
 fbFetchPixel_x4a4 (const FbBits *bits, int offset, miIndexedPtr indexed)
 {
-    CARD32   pixel = ((CARD8 *) bits)[offset];
+    CARD32   pixel = READ((CARD8 *) bits + offset);
 
     return ((pixel & 0xf) | ((pixel & 0xf) << 4)) << 24;
 }
@@ -1027,7 +1027,7 @@ typedef FASTCALL void (*storeProc) (FbBi
 static FASTCALL void
 fbStore_a8r8g8b8 (FbBits *bits, const CARD32 *values, int x, int width, miIndexedPtr indexed)
 {
-    memcpy(((CARD32 *)bits) + x, values, width*sizeof(CARD32));
+    MEMCPY_WRAPPED(((CARD32 *)bits) + x, values, width*sizeof(CARD32));
 }
 
 static FASTCALL void
@@ -1036,7 +1036,7 @@ fbStore_x8r8g8b8 (FbBits *bits, const CA
     int i;
     CARD32 *pixel = (CARD32 *)bits + x;
     for (i = 0; i < width; ++i)
-        *pixel++ = values[i] & 0xffffff;
+        WRITE(pixel++, READ(values + i) & 0xffffff);
 }
 
 static FASTCALL void
@@ -1045,7 +1045,7 @@ fbStore_a8b8g8r8 (FbBits *bits, const CA
     int i;
     CARD32 *pixel = (CARD32 *)bits + x;
     for (i = 0; i < width; ++i)
-        *pixel++ = (values[i] & 0xff00ff00) | ((values[i] >> 16) & 0xff) | ((values[i] & 0xff) << 16);
+        WRITE(pixel++, (READ(values + i) & 0xff00ff00) | ((READ(values + i) >> 16) & 0xff) | ((READ(values + i) & 0xff) << 16));
 }
 
 static FASTCALL void
@@ -1054,7 +1054,7 @@ fbStore_x8b8g8r8 (FbBits *bits, const CA
     int i;
     CARD32 *pixel = (CARD32 *)bits + x;
     for (i = 0; i < width; ++i)
-        *pixel++ = (values[i] & 0x0000ff00) | ((values[i] >> 16) & 0xff) | ((values[i] & 0xff) << 16);
+        WRITE(pixel++, (READ(values + i) & 0x0000ff00) | ((READ(values + i) >> 16) & 0xff) | ((READ(values + i) & 0xff) << 16));
 }
 
 static FASTCALL void
@@ -1063,7 +1063,7 @@ fbStore_r8g8b8 (FbBits *bits, const CARD
     int i;
     CARD8 *pixel = ((CARD8 *) bits) + 3*x;
     for (i = 0; i < width; ++i) {
-        Store24(pixel, values[i]);
+        Store24(pixel, READ(values + i));
         pixel += 3;
     }
 }
@@ -1074,14 +1074,15 @@ fbStore_b8g8r8 (FbBits *bits, const CARD
     int i;
     CARD8 *pixel = ((CARD8 *) bits) + 3*x;
     for (i = 0; i < width; ++i) {
+        CARD32 val = READ(values + i);
 #if IMAGE_BYTE_ORDER == MSBFirst
-        *pixel++ = Blue(values[i]);
-        *pixel++ = Green(values[i]);
-        *pixel++ = Red(values[i]);
+        WRITE(pixel++, Blue(val));
+        WRITE(pixel++, Green(val));
+        WRITE(pixel++, Red(val));
 #else
-        *pixel++ = Red(values[i]);
-        *pixel++ = Green(values[i]);
-        *pixel++ = Blue(values[i]);
+        WRITE(pixel++, Red(val));
+        WRITE(pixel++, Green(val));
+        WRITE(pixel++, Blue(val));
 #endif
     }
 }
@@ -1092,10 +1093,10 @@ fbStore_r5g6b5 (FbBits *bits, const CARD
     int i;
     CARD16 *pixel = ((CARD16 *) bits) + x;
     for (i = 0; i < width; ++i) {
-        CARD32 s = values[i];
-        *pixel++ = ((s >> 3) & 0x001f) |
-                   ((s >> 5) & 0x07e0) |
-                   ((s >> 8) & 0xf800);
+        CARD32 s = READ(values + i);
+        WRITE(pixel++, ((s >> 3) & 0x001f) |
+                       ((s >> 5) & 0x07e0) |
+                       ((s >> 8) & 0xf800));
     }
 }
 
@@ -1105,10 +1106,10 @@ fbStore_b5g6r5 (FbBits *bits, const CARD
     int i;
     CARD16  *pixel = ((CARD16 *) bits) + x;
     for (i = 0; i < width; ++i) {
-        Split(values[i]);
-        *pixel++ = (((b << 8) & 0xf800) |
-                    ((g << 3) & 0x07e0) |
-                    ((r >> 3)         ));
+        Split(READ(values + i));
+        WRITE(pixel++, ((b << 8) & 0xf800) |
+                       ((g << 3) & 0x07e0) |
+                       ((r >> 3)         ));
     }
 }
 
@@ -1118,11 +1119,11 @@ fbStore_a1r5g5b5 (FbBits *bits, const CA
     int i;
     CARD16  *pixel = ((CARD16 *) bits) + x;
     for (i = 0; i < width; ++i) {
-        Splita(values[i]);
-        *pixel++ = (((a << 8) & 0x8000) |
-                    ((r << 7) & 0x7c00) |
-                    ((g << 2) & 0x03e0) |
-                    ((b >> 3)         ));
+        Splita(READ(values + i));
+        WRITE(pixel++, ((a << 8) & 0x8000) |
+                       ((r << 7) & 0x7c00) |
+                       ((g << 2) & 0x03e0) |
+                       ((b >> 3)         ));
     }
 }
 
@@ -1132,10 +1133,10 @@ fbStore_x1r5g5b5 (FbBits *bits, const CA
     int i;
     CARD16  *pixel = ((CARD16 *) bits) + x;
     for (i = 0; i < width; ++i) {
-        Split(values[i]);
-        *pixel++ = (((r << 7) & 0x7c00) |
-                    ((g << 2) & 0x03e0) |
-                    ((b >> 3)         ));
+        Split(READ(values + i));
+        WRITE(pixel++, ((r << 7) & 0x7c00) |
+                       ((g << 2) & 0x03e0) |
+                       ((b >> 3)         ));
     }
 }
 
@@ -1145,11 +1146,11 @@ fbStore_a1b5g5r5 (FbBits *bits, const CA
     int i;
     CARD16  *pixel = ((CARD16 *) bits) + x;
     for (i = 0; i < width; ++i) {
-        Splita(values[i]);
-        *pixel++ = (((a << 8) & 0x8000) |
-                    ((b << 7) & 0x7c00) |
-                    ((g << 2) & 0x03e0) |
-                    ((r >> 3)         ));
+        Splita(READ(values + i));
+        WRITE(pixel++, ((a << 8) & 0x8000) |
+                       ((b << 7) & 0x7c00) |
+                       ((g << 2) & 0x03e0) |
+                       ((r >> 3)         ));
 	}
 }
 
@@ -1159,10 +1160,10 @@ fbStore_x1b5g5r5 (FbBits *bits, const CA
     int i;
     CARD16  *pixel = ((CARD16 *) bits) + x;
     for (i = 0; i < width; ++i) {
-        Split(values[i]);
-        *pixel++ = (((b << 7) & 0x7c00) |
-                    ((g << 2) & 0x03e0) |
-                    ((r >> 3)         ));
+        Split(READ(values + i));
+        WRITE(pixel++, ((b << 7) & 0x7c00) |
+                       ((g << 2) & 0x03e0) |
+                       ((r >> 3)         ));
     }
 }
 
@@ -1172,11 +1173,11 @@ fbStore_a4r4g4b4 (FbBits *bits, const CA
     int i;
     CARD16  *pixel = ((CARD16 *) bits) + x;
     for (i = 0; i < width; ++i) {
-        Splita(values[i]);
-        *pixel++ = (((a << 8) & 0xf000) |
-                    ((r << 4) & 0x0f00) |
-                    ((g     ) & 0x00f0) |
-                    ((b >> 4)         ));
+        Splita(READ(values + i));
+        WRITE(pixel++, ((a << 8) & 0xf000) |
+                       ((r << 4) & 0x0f00) |
+                       ((g     ) & 0x00f0) |
+                       ((b >> 4)         ));
     }
 }
 
@@ -1186,10 +1187,10 @@ fbStore_x4r4g4b4 (FbBits *bits, const CA
     int i;
     CARD16  *pixel = ((CARD16 *) bits) + x;
     for (i = 0; i < width; ++i) {
-        Split(values[i]);
-        *pixel++ = (((r << 4) & 0x0f00) |
-                    ((g     ) & 0x00f0) |
-                    ((b >> 4)         ));
+        Split(READ(values + i));
+        WRITE(pixel++, ((r << 4) & 0x0f00) |
+                       ((g     ) & 0x00f0) |
+                       ((b >> 4)         ));
     }
 }
 
@@ -1199,11 +1200,11 @@ fbStore_a4b4g4r4 (FbBits *bits, const CA
     int i;
     CARD16  *pixel = ((CARD16 *) bits) + x;
     for (i = 0; i < width; ++i) {
-        Splita(values[i]);
-        *pixel++ = (((a << 8) & 0xf000) |
-                    ((b << 4) & 0x0f00) |
-                    ((g     ) & 0x00f0) |
-                    ((r >> 4)         ));
+        Splita(READ(values + i));
+        WRITE(pixel++, ((a << 8) & 0xf000) |
+                       ((b << 4) & 0x0f00) |
+                       ((g     ) & 0x00f0) |
+                       ((r >> 4)         ));
     }
 }
 
@@ -1213,10 +1214,10 @@ fbStore_x4b4g4r4 (FbBits *bits, const CA
     int i;
     CARD16  *pixel = ((CARD16 *) bits) + x;
     for (i = 0; i < width; ++i) {
-        Split(values[i]);
-        *pixel++ = (((b << 4) & 0x0f00) |
-                    ((g     ) & 0x00f0) |
-                    ((r >> 4)         ));
+        Split(READ(values + i));
+        WRITE(pixel++, ((b << 4) & 0x0f00) |
+                       ((g     ) & 0x00f0) |
+                       ((r >> 4)         ));
     }
 }
 
@@ -1226,7 +1227,7 @@ fbStore_a8 (FbBits *bits, const CARD32 *
     int i;
     CARD8   *pixel = ((CARD8 *) bits) + x;
     for (i = 0; i < width; ++i) {
-        *pixel++ = values[i] >> 24;
+        WRITE(pixel++, READ(values + i) >> 24);
     }
 }
 
@@ -1236,10 +1237,10 @@ fbStore_r3g3b2 (FbBits *bits, const CARD
     int i;
     CARD8   *pixel = ((CARD8 *) bits) + x;
     for (i = 0; i < width; ++i) {
-        Split(values[i]);
-        *pixel++ = (((r     ) & 0xe0) |
-                    ((g >> 3) & 0x1c) |
-                    ((b >> 6)       ));
+        Split(READ(values + i));
+        WRITE(pixel++, ((r     ) & 0xe0) |
+                       ((g >> 3) & 0x1c) |
+                       ((b >> 6)       ));
     }
 }
 
@@ -1249,10 +1250,10 @@ fbStore_b2g3r3 (FbBits *bits, const CARD
     int i;
     CARD8   *pixel = ((CARD8 *) bits) + x;
     for (i = 0; i < width; ++i) {
-        Split(values[i]);
-        *pixel++ = (((b     ) & 0xe0) |
-                    ((g >> 3) & 0x1c) |
-                    ((r >> 6)       ));
+        Split(READ(values + i));
+        WRITE(pixel++, ((b     ) & 0xe0) |
+                       ((g >> 3) & 0x1c) |
+                       ((r >> 6)       ));
     }
 }
 
@@ -1262,11 +1263,11 @@ fbStore_a2r2g2b2 (FbBits *bits, const CA
     int i;
     CARD8   *pixel = ((CARD8 *) bits) + x;
     for (i = 0; i < width; ++i) {
-        Splita(values[i]);
-        *pixel++ = (((a     ) & 0xc0) |
-                    ((r >> 2) & 0x30) |
-                    ((g >> 4) & 0x0c) |
-                    ((b >> 6)       ));
+        Splita(READ(values + i));
+        WRITE(pixel++, ((a     ) & 0xc0) |
+                       ((r >> 2) & 0x30) |
+                       ((g >> 4) & 0x0c) |
+                       ((b >> 6)       ));
     }
 }
 
@@ -1276,7 +1277,7 @@ fbStore_c8 (FbBits *bits, const CARD32 *
     int i;
     CARD8   *pixel = ((CARD8 *) bits) + x;
     for (i = 0; i < width; ++i) {
-        *pixel++ = miIndexToEnt24(indexed,values[i]);
+        WRITE(pixel++, miIndexToEnt24(indexed,READ(values + i)));
     }
 }
 
@@ -1286,7 +1287,7 @@ fbStore_x4a4 (FbBits *bits, const CARD32
     int i;
     CARD8   *pixel = ((CARD8 *) bits) + x;
     for (i = 0; i < width; ++i) {
-        *pixel++ = values[i] >> 28;
+        WRITE(pixel++, READ(values + i) >> 28);
     }
 }
 
@@ -1306,7 +1307,7 @@ fbStore_a4 (FbBits *bits, const CARD32 *
 {
     int i;
     for (i = 0; i < width; ++i) {
-        Store4(bits, i + x, values[i]>>28);
+        Store4(bits, i + x, READ(values + i)>>28);
     }
 }
 
@@ -1317,7 +1318,7 @@ fbStore_r1g2b1 (FbBits *bits, const CARD
     for (i = 0; i < width; ++i) {
         CARD32  pixel;
 
-        Split(values[i]);
+        Split(READ(values + i));
         pixel = (((r >> 4) & 0x8) |
                  ((g >> 5) & 0x6) |
                  ((b >> 7)      ));
@@ -1332,7 +1333,7 @@ fbStore_b1g2r1 (FbBits *bits, const CARD
     for (i = 0; i < width; ++i) {
         CARD32  pixel;
 
-        Split(values[i]);
+        Split(READ(values + i));
         pixel = (((b >> 4) & 0x8) |
                  ((g >> 5) & 0x6) |
                  ((r >> 7)      ));
@@ -1346,7 +1347,7 @@ fbStore_a1r1g1b1 (FbBits *bits, const CA
     int i;
     for (i = 0; i < width; ++i) {
         CARD32  pixel;
-        Splita(values[i]);
+        Splita(READ(values + i));
         pixel = (((a >> 4) & 0x8) |
                  ((r >> 5) & 0x4) |
                  ((g >> 6) & 0x2) |
@@ -1361,7 +1362,7 @@ fbStore_a1b1g1r1 (FbBits *bits, const CA
     int i;
     for (i = 0; i < width; ++i) {
         CARD32  pixel;
-        Splita(values[i]);
+        Splita(READ(values + i));
         pixel = (((a >> 4) & 0x8) |
                  ((b >> 5) & 0x4) |
                  ((g >> 6) & 0x2) |
@@ -1377,7 +1378,7 @@ fbStore_c4 (FbBits *bits, const CARD32 *
     for (i = 0; i < width; ++i) {
         CARD32  pixel;
 
-        pixel = miIndexToEnt24(indexed, values[i]);
+        pixel = miIndexToEnt24(indexed, READ(values + i));
         Store4(bits, i + x, pixel);
     }
 }
@@ -1390,8 +1391,8 @@ fbStore_a1 (FbBits *bits, const CARD32 *
         CARD32  *pixel = ((CARD32 *) bits) + ((i+x) >> 5);
         CARD32  mask = FbStipMask((i+x) & 0x1f, 1);
 
-        CARD32 v = values[i] & 0x80000000 ? mask : 0;
-        *pixel = (*pixel & ~mask) | v;
+        CARD32 v = READ(values + i) & 0x80000000 ? mask : 0;
+        WRITE(pixel, (READ(pixel) & ~mask) | v);
     }
 }
 
@@ -1403,8 +1404,8 @@ fbStore_g1 (FbBits *bits, const CARD32 *
         CARD32  *pixel = ((CARD32 *) bits) + ((i+x) >> 5);
         CARD32  mask = FbStipMask((i+x) & 0x1f, 1);
 
-        CARD32 v = miIndexToEntY24(indexed,values[i]) ? mask : 0;
-        *pixel = (*pixel & ~mask) | v;
+        CARD32 v = miIndexToEntY24(indexed,READ(values + i)) ? mask : 0;
+        WRITE(pixel, (READ(pixel) & ~mask) | v);
     }
 }
 
@@ -1469,10 +1470,10 @@ fbCombineMaskU (CARD32 *src, const CARD3
 {
     int i;
     for (i = 0; i < width; ++i) {
-        CARD32 a = mask[i] >> 24;
-        CARD32 s = src[i];
+        CARD32 a = READ(mask + i) >> 24;
+        CARD32 s = READ(src + i);
         FbByteMul(s, a);
-        src[i] = s;
+        WRITE(src + i, s);
     }
 }
 
@@ -1483,13 +1484,13 @@ fbCombineMaskU (CARD32 *src, const CARD3
 static FASTCALL void
 fbCombineClear (CARD32 *dest, const CARD32 *src, int width)
 {
-    memset(dest, 0, width*sizeof(CARD32));
+    MEMSET_WRAPPED(dest, 0, width*sizeof(CARD32));
 }
 
 static FASTCALL void
 fbCombineSrcU (CARD32 *dest, const CARD32 *src, int width)
 {
-    memcpy(dest, src, width*sizeof(CARD32));
+    MEMCPY_WRAPPED(dest, src, width*sizeof(CARD32));
 }
 
 
@@ -1498,12 +1499,12 @@ fbCombineOverU (CARD32 *dest, const CARD
 {
     int i;
     for (i = 0; i < width; ++i) {
-        CARD32 s = src[i];
-        CARD32 d = dest[i];
+        CARD32 s = READ(src + i);
+        CARD32 d = READ(dest + i);
         CARD32 ia = Alpha(~s);
 
         FbByteMulAdd(d, ia, s);
-        dest[i] = d;
+        WRITE(dest + i, d);
     }
 }
 
@@ -1512,11 +1513,11 @@ fbCombineOverReverseU (CARD32 *dest, con
 {
     int i;
     for (i = 0; i < width; ++i) {
-        CARD32 s = src[i];
-        CARD32 d = dest[i];
-        CARD32 ia = Alpha(~dest[i]);
+        CARD32 s = READ(src + i);
+        CARD32 d = READ(dest + i);
+        CARD32 ia = Alpha(~READ(dest + i));
         FbByteMulAdd(s, ia, d);
-        dest[i] = s;
+        WRITE(dest + i, s);
     }
 }
 
@@ -1525,10 +1526,10 @@ fbCombineInU (CARD32 *dest, const CARD32
 {
     int i;
     for (i = 0; i < width; ++i) {
-        CARD32 s = src[i];
-        CARD32 a = Alpha(dest[i]);
+        CARD32 s = READ(src + i);
+        CARD32 a = Alpha(READ(dest + i));
         FbByteMul(s, a);
-        dest[i] = s;
+        WRITE(dest + i, s);
     }
 }
 
@@ -1537,10 +1538,10 @@ fbCombineInReverseU (CARD32 *dest, const
 {
     int i;
     for (i = 0; i < width; ++i) {
-        CARD32 d = dest[i];
-        CARD32 a = Alpha(src[i]);
+        CARD32 d = READ(dest + i);
+        CARD32 a = Alpha(READ(src + i));
         FbByteMul(d, a);
-        dest[i] = d;
+        WRITE(dest + i, d);
     }
 }
 
@@ -1549,10 +1550,10 @@ fbCombineOutU (CARD32 *dest, const CARD3
 {
     int i;
     for (i = 0; i < width; ++i) {
-        CARD32 s = src[i];
-        CARD32 a = Alpha(~dest[i]);
+        CARD32 s = READ(src + i);
+        CARD32 a = Alpha(~READ(dest + i));
         FbByteMul(s, a);
-        dest[i] = s;
+        WRITE(dest + i, s);
     }
 }
 
@@ -1561,10 +1562,10 @@ fbCombineOutReverseU (CARD32 *dest, cons
 {
     int i;
     for (i = 0; i < width; ++i) {
-        CARD32 d = dest[i];
-        CARD32 a = Alpha(~src[i]);
+        CARD32 d = READ(dest + i);
+        CARD32 a = Alpha(~READ(src + i));
         FbByteMul(d, a);
-        dest[i] = d;
+        WRITE(dest + i, d);
     }
 }
 
@@ -1573,13 +1574,13 @@ fbCombineAtopU (CARD32 *dest, const CARD
 {
     int i;
     for (i = 0; i < width; ++i) {
-        CARD32 s = src[i];
-        CARD32 d = dest[i];
+        CARD32 s = READ(src + i);
+        CARD32 d = READ(dest + i);
         CARD32 dest_a = Alpha(d);
         CARD32 src_ia = Alpha(~s);
 
         FbByteAddMul(s, dest_a, d, src_ia);
-        dest[i] = s;
+        WRITE(dest + i, s);
     }
 }
 
@@ -1588,13 +1589,13 @@ fbCombineAtopReverseU (CARD32 *dest, con
 {
     int i;
     for (i = 0; i < width; ++i) {
-        CARD32 s = src[i];
-        CARD32 d = dest[i];
+        CARD32 s = READ(src + i);
+        CARD32 d = READ(dest + i);
         CARD32 src_a = Alpha(s);
         CARD32 dest_ia = Alpha(~d);
 
         FbByteAddMul(s, dest_ia, d, src_a);
-        dest[i] = s;
+        WRITE(dest + i, s);
     }
 }
 
@@ -1603,13 +1604,13 @@ fbCombineXorU (CARD32 *dest, const CARD3
 {
     int i;
     for (i = 0; i < width; ++i) {
-        CARD32 s = src[i];
-        CARD32 d = dest[i];
+        CARD32 s = READ(src + i);
+        CARD32 d = READ(dest + i);
         CARD32 src_ia = Alpha(~s);
         CARD32 dest_ia = Alpha(~d);
 
         FbByteAddMul(s, dest_ia, d, src_ia);
-        dest[i] = s;
+        WRITE(dest + i, s);
     }
 }
 
@@ -1618,10 +1619,10 @@ fbCombineAddU (CARD32 *dest, const CARD3
 {
     int i;
     for (i = 0; i < width; ++i) {
-        CARD32 s = src[i];
-        CARD32 d = dest[i];
+        CARD32 s = READ(src + i);
+        CARD32 d = READ(dest + i);
         FbByteAdd(d, s);
-        dest[i] = d;
+        WRITE(dest + i, d);
     }
 }
 
@@ -1630,8 +1631,8 @@ fbCombineSaturateU (CARD32 *dest, const 
 {
     int i;
     for (i = 0; i < width; ++i) {
-        CARD32  s = src[i];
-        CARD32 d = dest[i];
+        CARD32  s = READ(src + i);
+        CARD32 d = READ(dest + i);
         CARD16  sa, da;
 
         sa = s >> 24;
@@ -1642,7 +1643,7 @@ fbCombineSaturateU (CARD32 *dest, const 
             FbByteMul(s, sa);
         }
         FbByteAdd(d, s);
-        dest[i] = d;
+        WRITE(dest + i, d);
     }
 }
 
@@ -1716,8 +1717,8 @@ fbCombineDisjointGeneralU (CARD32 *dest,
 {
     int i;
     for (i = 0; i < width; ++i) {
-        CARD32 s = src[i];
-        CARD32 d = dest[i];
+        CARD32 s = READ(src + i);
+        CARD32 d = READ(dest + i);
         CARD32 m,n,o,p;
         CARD16 Fa, Fb, t, u, v;
         CARD8 sa = s >> 24;
@@ -1757,7 +1758,7 @@ fbCombineDisjointGeneralU (CARD32 *dest,
         o = FbGen (s,d,16,Fa,Fb,t, u, v);
         p = FbGen (s,d,24,Fa,Fb,t, u, v);
         s = m|n|o|p;
-        dest[i] = s;
+        WRITE(dest + i, s);
     }
 }
 
@@ -1766,19 +1767,19 @@ fbCombineDisjointOverU (CARD32 *dest, co
 {
     int i;
     for (i = 0; i < width; ++i) {
-        CARD32  s = src[i];
+        CARD32  s = READ(src + i);
         CARD16  a = s >> 24;
 
         if (a != 0x00)
         {
             if (a != 0xff)
             {
-                CARD32 d = dest[i];
+                CARD32 d = READ(dest + i);
                 a = fbCombineDisjointOutPart (d >> 24, a);
                 FbByteMulAdd(d, a, s);
                 s = d;
             }
-            dest[i] = s;
+            WRITE(dest + i, s);
         }
     }
 }
@@ -1855,8 +1856,8 @@ fbCombineConjointGeneralU (CARD32 *dest,
 {
     int i;
     for (i = 0; i < width; ++i) {
-        CARD32  s = src[i];
-        CARD32 d = dest[i];
+        CARD32  s = READ(src + i);
+        CARD32 d = READ(dest + i);
         CARD32  m,n,o,p;
         CARD16  Fa, Fb, t, u, v;
         CARD8 sa = s >> 24;
@@ -1896,7 +1897,7 @@ fbCombineConjointGeneralU (CARD32 *dest,
         o = FbGen (s,d,16,Fa,Fb,t, u, v);
         p = FbGen (s,d,24,Fa,Fb,t, u, v);
         s = m|n|o|p;
-        dest[i] = s;
+        WRITE(dest + i, s);
     }
 }
 
@@ -2009,32 +2010,32 @@ fbCombineMaskC (CARD32 *src, CARD32 *mas
 {
     int i;
     for (i = 0; i < width; ++i) {
-        CARD32 a = mask[i];
+        CARD32 a = READ(mask + i);
 
         CARD32	x;
         CARD16	xa;
 
         if (!a)
         {
-            src[i] = 0;
+            WRITE(src + i, 0);
             continue;
         }
 
-        x = src[i];
+        x = READ(src + i);
         if (a == 0xffffffff)
         {
             x = x >> 24;
             x |= x << 8;
             x |= x << 16;
-            mask[i] = x;
+            WRITE(mask + i, x);
             continue;
         }
 
         xa = x >> 24;
         FbByteMulC(x, a);
-        src[i] = x;
+        WRITE(src + i, x);
         FbByteMul(a, xa);
-        mask[i] = a;
+        WRITE(mask + i, a);
     }
 }
 
@@ -2043,21 +2044,21 @@ fbCombineMaskValueC (CARD32 *src, const 
 {
     int i;
     for (i = 0; i < width; ++i) {
-        CARD32 a = mask[i];
+        CARD32 a = READ(mask + i);
         CARD32	x;
 
         if (!a)
         {
-            src[i] = 0;
+            WRITE(src + i, 0);
             continue;
         }
 
         if (a == 0xffffffff)
             continue;
 
-        x = src[i];
+        x = READ(src + i);
         FbByteMulC(x, a);
-        src[i] = x;
+        WRITE(src + i, x);
     }
 }
 
@@ -2067,13 +2068,13 @@ fbCombineMaskAlphaC (const CARD32 *src, 
 {
     int i;
     for (i = 0; i < width; ++i) {
-        CARD32 a = mask[i];
+        CARD32 a = READ(mask + i);
         CARD32	x;
 
         if (!a)
             continue;
 
-        x = src[i] >> 24;
+        x = READ(src + i) >> 24;
         if (x == 0xff)
             continue;
         if (a == 0xffffffff)
@@ -2081,12 +2082,12 @@ fbCombineMaskAlphaC (const CARD32 *src, 
             x = x >> 24;
             x |= x << 8;
             x |= x << 16;
-            mask[i] = x;
+            WRITE(mask + i, x);
             continue;
         }
 
         FbByteMul(a, x);
-        mask[i] = a;
+        WRITE(mask + i, a);
     }
 }
 
@@ -2100,7 +2101,7 @@ static FASTCALL void
 fbCombineSrcC (CARD32 *dest, CARD32 *src, CARD32 *mask, int width)
 {
     fbCombineMaskValueC(src, mask, width);
-    memcpy(dest, src, width*sizeof(CARD32));
+    MEMCPY_WRAPPED(dest, src, width*sizeof(CARD32));
 }
 
 static FASTCALL void
@@ -2109,18 +2110,18 @@ fbCombineOverC (CARD32 *dest, CARD32 *sr
     int i;
     fbCombineMaskC(src, mask, width);
     for (i = 0; i < width; ++i) {
-        CARD32  s = src[i];
-        CARD32  a = ~mask[i];
+        CARD32  s = READ(src + i);
+        CARD32  a = ~READ(mask + i);
 
         if (a != 0xffffffff)
         {
             if (a)
             {
-                CARD32 d = dest[i];
+                CARD32 d = READ(dest + i);
                 FbByteMulAddC(d, a, s);
                 s = d;
             }
-            dest[i] = s;
+            WRITE(dest + i, s);
         }
     }
 }
@@ -2131,17 +2132,17 @@ fbCombineOverReverseC (CARD32 *dest, CAR
     int i;
     fbCombineMaskValueC(src, mask, width);
     for (i = 0; i < width; ++i) {
-        CARD32 d = dest[i];
+        CARD32 d = READ(dest + i);
         CARD32 a = ~d >> 24;
 
         if (a)
         {
-            CARD32 s = src[i];
+            CARD32 s = READ(src + i);
             if (a != 0xff)
             {
                 FbByteMulAdd(s, a, d);
             }
-            dest[i] = s;
+            WRITE(dest + i, s);
         }
     }
 }
@@ -2152,18 +2153,18 @@ fbCombineInC (CARD32 *dest, CARD32 *src,
     int i;
     fbCombineMaskValueC(src, mask, width);
     for (i = 0; i < width; ++i) {
-        CARD32 d = dest[i];
+        CARD32 d = READ(dest + i);
         CARD16 a = d >> 24;
         CARD32 s = 0;
         if (a)
         {
-            s = src[i];
+            s = READ(src + i);
             if (a != 0xff)
             {
                 FbByteMul(s, a);
             }
         }
-        dest[i] = s;
+        WRITE(dest + i, s);
     }
 }
 
@@ -2173,17 +2174,17 @@ fbCombineInReverseC (CARD32 *dest, CARD3
     int i;
     fbCombineMaskAlphaC(src, mask, width);
     for (i = 0; i < width; ++i) {
-        CARD32 a = mask[i];
+        CARD32 a = READ(mask + i);
 
         if (a != 0xffffffff)
         {
             CARD32 d = 0;
             if (a)
             {
-                d = dest[i];
+                d = READ(dest + i);
                 FbByteMulC(d, a);
             }
-            dest[i] = d;
+            WRITE(dest + i, d);
         }
     }
 }
@@ -2194,18 +2195,18 @@ fbCombineOutC (CARD32 *dest, CARD32 *src
     int i;
     fbCombineMaskValueC(src, mask, width);
     for (i = 0; i < width; ++i) {
-        CARD32 d = dest[i];
+        CARD32 d = READ(dest + i);
         CARD16 a = ~d >> 24;
         CARD32 s = 0;
         if (a)
         {
-            s = src[i];
+            s = READ(src + i);
             if (a != 0xff)
             {
                 FbByteMul(s, a);
             }
         }
-        dest[i] = s;
+        WRITE(dest + i, s);
     }
 }
 
@@ -2215,17 +2216,17 @@ fbCombineOutReverseC (CARD32 *dest, CARD
     int i;
     fbCombineMaskAlphaC(src, mask, width);
     for (i = 0; i < width; ++i) {
-        CARD32 a = ~mask[i];
+        CARD32 a = ~READ(mask + i);
 
         if (a != 0xffffffff)
         {
             CARD32 d = 0;
             if (a)
             {
-                d = dest[i];
+                d = READ(dest + i);
                 FbByteMulC(d, a);
             }
-            dest[i] = d;
+            WRITE(dest + i, d);
         }
     }
 }
@@ -2236,12 +2237,12 @@ fbCombineAtopC (CARD32 *dest, CARD32 *sr
     int i;
     fbCombineMaskC(src, mask, width);
     for (i = 0; i < width; ++i) {
-        CARD32 d = dest[i];
-        CARD32 s = src[i];
-        CARD32 ad = ~mask[i];
+        CARD32 d = READ(dest + i);
+        CARD32 s = READ(src + i);
+        CARD32 ad = ~READ(mask + i);
         CARD16 as = d >> 24;
         FbByteAddMulC(d, ad, s, as);
-        dest[i] = d;
+        WRITE(dest + i, d);
     }
 }
 
@@ -2252,12 +2253,12 @@ fbCombineAtopReverseC (CARD32 *dest, CAR
     fbCombineMaskC(src, mask, width);
     for (i = 0; i < width; ++i) {
 
-        CARD32 d = dest[i];
-        CARD32 s = src[i];
-        CARD32 ad = mask[i];
+        CARD32 d = READ(dest + i);
+        CARD32 s = READ(src + i);
+        CARD32 ad = READ(mask + i);
         CARD16 as = ~d >> 24;
         FbByteAddMulC(d, ad, s, as);
-        dest[i] = d;
+        WRITE(dest + i, d);
     }
 }
 
@@ -2267,12 +2268,12 @@ fbCombineXorC (CARD32 *dest, CARD32 *src
     int i;
     fbCombineMaskC(src, mask, width);
     for (i = 0; i < width; ++i) {
-        CARD32 d = dest[i];
-        CARD32 s = src[i];
-        CARD32 ad = ~mask[i];
+        CARD32 d = READ(dest + i);
+        CARD32 s = READ(src + i);
+        CARD32 ad = ~READ(mask + i);
         CARD16 as = ~d >> 24;
         FbByteAddMulC(d, ad, s, as);
-        dest[i] = d;
+        WRITE(dest + i, d);
     }
 }
 
@@ -2282,10 +2283,10 @@ fbCombineAddC (CARD32 *dest, CARD32 *src
     int i;
     fbCombineMaskValueC(src, mask, width);
     for (i = 0; i < width; ++i) {
-        CARD32 s = src[i];
-        CARD32 d = dest[i];
+        CARD32 s = READ(src + i);
+        CARD32 d = READ(dest + i);
         FbByteAdd(d, s);
-        dest[i] = d;
+        WRITE(dest + i, d);
     }
 }
 
@@ -2300,12 +2301,12 @@ fbCombineSaturateC (CARD32 *dest, CARD32
         CARD16  t, u, v;
         CARD32  m,n,o,p;
 
-        d = dest[i];
-        s = src[i];
-        sa = (mask[i] >> 24);
-        sr = (mask[i] >> 16) & 0xff;
-        sg = (mask[i] >>  8) & 0xff;
-        sb = (mask[i]      ) & 0xff;
+        d = READ(dest + i);
+        s = READ(src + i);
+        sa = (READ(mask + i) >> 24);
+        sr = (READ(mask + i) >> 16) & 0xff;
+        sg = (READ(mask + i) >>  8) & 0xff;
+        sb = (READ(mask + i)      ) & 0xff;
         da = ~d >> 24;
 
         if (sb <= da)
@@ -2328,7 +2329,7 @@ fbCombineSaturateC (CARD32 *dest, CARD32
         else
             p = FbGen (s, d, 24, (da << 8) / sa, 0xff, t, u, v);
 
-        dest[i] = m|n|o|p;
+        WRITE(dest + i, m|n|o|p);
     }
 }
 
@@ -2345,9 +2346,9 @@ fbCombineDisjointGeneralC (CARD32 *dest,
         CARD32  sa;
         CARD8   da;
 
-        s = src[i];
-        sa = mask[i];
-        d = dest[i];
+        s = READ(src + i);
+        sa = READ(mask + i);
+        d = READ(dest + i);
         da = d >> 24;
 
         switch (combine & CombineA) {
@@ -2400,7 +2401,7 @@ fbCombineDisjointGeneralC (CARD32 *dest,
         o = FbGen (s,d,16,FbGet8(Fa,16),FbGet8(Fb,16),t, u, v);
         p = FbGen (s,d,24,FbGet8(Fa,24),FbGet8(Fb,24),t, u, v);
         s = m|n|o|p;
-        dest[i] = s;
+        WRITE(dest + i, s);
     }
 }
 
@@ -2465,9 +2466,9 @@ fbCombineConjointGeneralC (CARD32 *dest,
         CARD32  sa;
         CARD8   da;
 
-        s = src[i];
-        sa = mask[i];
-        d = dest[i];
+        s = READ(src + i);
+        sa = READ(mask + i);
+        d = READ(dest + i);
         da = d >> 24;
 
         switch (combine & CombineA) {
@@ -2520,7 +2521,7 @@ fbCombineConjointGeneralC (CARD32 *dest,
         o = FbGen (s,d,16,FbGet8(Fa,16),FbGet8(Fb,16),t, u, v);
         p = FbGen (s,d,24,FbGet8(Fa,24),FbGet8(Fb,24),t, u, v);
         s = m|n|o|p;
-        dest[i] = s;
+        WRITE(dest + i, s);
     }
 }
 
@@ -2651,7 +2652,7 @@ static void fbFetchSolid(PicturePtr pict
 
     end = buffer + width;
     while (buffer < end)
-        *buffer++ = color;
+        WRITE(buffer++, color);
     fbFinishAccess (pict->pDrawable);
 }
 
@@ -2719,7 +2720,7 @@ static void fbFetchSourcePict(PicturePtr
     if (pGradient->type == SourcePictTypeSolidFill) {
         register CARD32 color = pGradient->solidFill.color;
         while (buffer < end) {
-            *buffer++ = color;
+            WRITE(buffer++, color);
         }
     } else if (pGradient->type == SourcePictTypeLinear) {
         PictVector v, unit;
@@ -2761,7 +2762,7 @@ static void fbFetchSourcePict(PicturePtr
                 inc = (a * unit.vector[0] + b * unit.vector[1]) >> 16;
             }
             while (buffer < end) {
-                *buffer++ = gradientPixel(pGradient, t, pict->repeatType);
+                WRITE(buffer++, gradientPixel(pGradient, t, pict->repeatType));
                 t += inc;
             }
         } else {
@@ -2776,7 +2777,7 @@ static void fbFetchSourcePict(PicturePtr
                     y = ((xFixed_48_16)v.vector[1] << 16) / v.vector[2];
                     t = ((a*x + b*y) >> 16) + off;
                 }
-                *buffer++ = gradientPixel(pGradient, t, pict->repeatType);
+                WRITE(buffer++, gradientPixel(pGradient, t, pict->repeatType));
                 v.vector[0] += unit.vector[0];
                 v.vector[1] += unit.vector[1];
                 v.vector[2] += unit.vector[2];
@@ -2820,9 +2821,9 @@ static void fbFetchSourcePict(PicturePtr
                     double c = -(rx*rx + ry*ry);
                     double det = (b * b) - (4 * pGradient->radial.a * c);
                     double s = (-b + sqrt(det))/(2. * pGradient->radial.a);
-                    *buffer = gradientPixel(pGradient,
-                                            (xFixed_48_16)((s*pGradient->radial.m + pGradient->radial.b)*65536),
-                                            pict->repeatType);
+                    WRITE(buffer, gradientPixel(pGradient,
+                                                (xFixed_48_16)((s*pGradient->radial.m + pGradient->radial.b)*65536),
+                                                pict->repeatType));
                     ++buffer;
                     rx += cx;
                     ry += cy;
@@ -2843,9 +2844,9 @@ static void fbFetchSourcePict(PicturePtr
                     c = -(x*x + y*y);
                     det = (b * b) - (4 * pGradient->radial.a * c);
                     s = (-b + sqrt(det))/(2. * pGradient->radial.a);
-                    *buffer = gradientPixel(pGradient,
-                                            (xFixed_48_16)((s*pGradient->radial.m + pGradient->radial.b)*65536),
-                                            pict->repeatType);
+                    WRITE(buffer, gradientPixel(pGradient,
+                                                (xFixed_48_16)((s*pGradient->radial.m + pGradient->radial.b)*65536),
+                                                pict->repeatType));
                     ++buffer;
                     rx += cx;
                     ry += cy;
@@ -2860,8 +2861,8 @@ static void fbFetchSourcePict(PicturePtr
 
                 while (buffer < end) {
                     double angle = atan2(ry, rx) + a;
-                    *buffer = gradientPixel(pGradient, (xFixed_48_16) (angle * (65536. / (2*M_PI))),
-                                            pict->repeatType);
+                    WRITE(buffer, gradientPixel(pGradient, (xFixed_48_16) (angle * (65536. / (2*M_PI))),
+                                                pict->repeatType));
                     ++buffer;
                     rx += cx;
                     ry += cy;
@@ -2879,8 +2880,8 @@ static void fbFetchSourcePict(PicturePtr
                     x -= pGradient->conical.center.x/65536.;
                     y -= pGradient->conical.center.y/65536.;
                     angle = atan2(y, x) + a;
-                    *buffer = gradientPixel(pGradient, (xFixed_48_16) (angle * (65536. / (2*M_PI))),
-                                            pict->repeatType);
+                    WRITE(buffer, gradientPixel(pGradient, (xFixed_48_16) (angle * (65536. / (2*M_PI))),
+                                                pict->repeatType));
                     ++buffer;
                     rx += cx;
                     ry += cy;
@@ -2943,7 +2944,7 @@ static void fbFetchTransformed(PicturePt
             if (REGION_NUM_RECTS(pict->pCompositeClip) == 1) {
                 for (i = 0; i < width; ++i) {
                     if (!v.vector[2]) {
-                        buffer[i] = 0;
+                        WRITE(buffer + i, 0);
                     } else {
                         if (!affine) {
                             y = MOD(DIV(v.vector[1],v.vector[2]), pict->pDrawable->height);
@@ -2952,7 +2953,7 @@ static void fbFetchTransformed(PicturePt
                             y = MOD(v.vector[1]>>16, pict->pDrawable->height);
                             x = MOD(v.vector[0]>>16, pict->pDrawable->width);
                         }
-                        buffer[i] = fetch(bits + (y + dy)*stride, x + dx, indexed);
+                        WRITE(buffer + i, fetch(bits + (y + dy)*stride, x + dx, indexed));
                     }
                     v.vector[0] += unit.vector[0];
                     v.vector[1] += unit.vector[1];
@@ -2961,7 +2962,7 @@ static void fbFetchTransformed(PicturePt
             } else {
                 for (i = 0; i < width; ++i) {
                     if (!v.vector[2]) {
-                        buffer[i] = 0;
+                        WRITE(buffer + i, 0);
                     } else {
                         if (!affine) {
                             y = MOD(DIV(v.vector[1],v.vector[2]), pict->pDrawable->height);
@@ -2971,9 +2972,9 @@ static void fbFetchTransformed(PicturePt
                             x = MOD(v.vector[0]>>16, pict->pDrawable->width);
                         }
                         if (POINT_IN_REGION (0, pict->pCompositeClip, x + dx, y + dy, &box))
-                            buffer[i] = fetch(bits + (y + dy)*stride, x + dx, indexed);
+                            WRITE(buffer + i, fetch(bits + (y + dy)*stride, x + dx, indexed));
                         else
-                            buffer[i] = 0;
+                            WRITE(buffer + i, 0);
                     }
                     v.vector[0] += unit.vector[0];
                     v.vector[1] += unit.vector[1];
@@ -2985,7 +2986,7 @@ static void fbFetchTransformed(PicturePt
                 box = pict->pCompositeClip->extents;
                 for (i = 0; i < width; ++i) {
                     if (!v.vector[2]) {
-                        buffer[i] = 0;
+                        WRITE(buffer + i, 0);
                     } else {
                         if (!affine) {
                             y = DIV(v.vector[1],v.vector[2]);
@@ -2994,8 +2995,8 @@ static void fbFetchTransformed(PicturePt
                             y = v.vector[1]>>16;
                             x = v.vector[0]>>16;
                         }
-                        buffer[i] = ((x < box.x1-dx) | (x >= box.x2-dx) | (y < box.y1-dy) | (y >= box.y2-dy)) ?
-                                    0 : fetch(bits + (y + dy)*stride, x + dx, indexed);
+                        WRITE(buffer + i, ((x < box.x1-dx) | (x >= box.x2-dx) | (y < box.y1-dy) | (y >= box.y2-dy)) ?
+                                          0 : fetch(bits + (y + dy)*stride, x + dx, indexed));
                     }
                     v.vector[0] += unit.vector[0];
                     v.vector[1] += unit.vector[1];
@@ -3004,7 +3005,7 @@ static void fbFetchTransformed(PicturePt
             } else {
                 for (i = 0; i < width; ++i) {
                     if (!v.vector[2]) {
-                        buffer[i] = 0;
+                        WRITE(buffer + i, 0);
                     } else {
                         if (!affine) {
                             y = DIV(v.vector[1],v.vector[2]);
@@ -3014,9 +3015,9 @@ static void fbFetchTransformed(PicturePt
                             x = v.vector[0]>>16;
                         }
                         if (POINT_IN_REGION (0, pict->pCompositeClip, x + dx, y + dy, &box))
-                            buffer[i] = fetch(bits + (y + dy)*stride, x + dx, indexed);
+                            WRITE(buffer + i, fetch(bits + (y + dy)*stride, x + dx, indexed));
                         else
-                            buffer[i] = 0;
+                            WRITE(buffer + i, 0);
                     }
                     v.vector[0] += unit.vector[0];
                     v.vector[1] += unit.vector[1];
@@ -3035,7 +3036,7 @@ static void fbFetchTransformed(PicturePt
             if (REGION_NUM_RECTS(pict->pCompositeClip) == 1) {
                 for (i = 0; i < width; ++i) {
                     if (!v.vector[2]) {
-                        buffer[i] = 0;
+                        WRITE(buffer + i, 0);
                     } else {
                         int x1, x2, y1, y2, distx, idistx, disty, idisty;
                         FbBits *b;
@@ -3087,7 +3088,7 @@ static void fbFetchTransformed(PicturePt
                         ft = FbGet8(tl,24) * idistx + FbGet8(tr,24) * distx;
                         fb = FbGet8(bl,24) * idistx + FbGet8(br,24) * distx;
                         r |= (((ft * idisty + fb * disty) << 8) & 0xff000000);
-                        buffer[i] = r;
+                        WRITE(buffer + i, r);
                     }
                     v.vector[0] += unit.vector[0];
                     v.vector[1] += unit.vector[1];
@@ -3096,7 +3097,7 @@ static void fbFetchTransformed(PicturePt
             } else {
                 for (i = 0; i < width; ++i) {
                     if (!v.vector[2]) {
-                        buffer[i] = 0;
+                        WRITE(buffer + i, 0);
                     } else {
                         int x1, x2, y1, y2, distx, idistx, disty, idisty;
                         FbBits *b;
@@ -3152,7 +3153,7 @@ static void fbFetchTransformed(PicturePt
                         ft = FbGet8(tl,24) * idistx + FbGet8(tr,24) * distx;
                         fb = FbGet8(bl,24) * idistx + FbGet8(br,24) * distx;
                         r |= (((ft * idisty + fb * disty) << 8) & 0xff000000);
-                        buffer[i] = r;
+                        WRITE(buffer + i, r);
                     }
                     v.vector[0] += unit.vector[0];
                     v.vector[1] += unit.vector[1];
@@ -3164,7 +3165,7 @@ static void fbFetchTransformed(PicturePt
                 box = pict->pCompositeClip->extents;
                 for (i = 0; i < width; ++i) {
                     if (!v.vector[2]) {
-                        buffer[i] = 0;
+                        WRITE(buffer + i, 0);
                     } else {
                         int x1, x2, y1, y2, distx, idistx, disty, idisty, x_off;
                         FbBits *b;
@@ -3218,7 +3219,7 @@ static void fbFetchTransformed(PicturePt
                         ft = FbGet8(tl,24) * idistx + FbGet8(tr,24) * distx;
                         fb = FbGet8(bl,24) * idistx + FbGet8(br,24) * distx;
                         r |= (((ft * idisty + fb * disty) << 8) & 0xff000000);
-                        buffer[i] = r;
+                        WRITE(buffer + i, r);
                     }
                     v.vector[0] += unit.vector[0];
                     v.vector[1] += unit.vector[1];
@@ -3227,7 +3228,7 @@ static void fbFetchTransformed(PicturePt
             } else {
                 for (i = 0; i < width; ++i) {
                     if (!v.vector[2]) {
-                        buffer[i] = 0;
+                        WRITE(buffer + i, 0);
                     } else {
                         int x1, x2, y1, y2, distx, idistx, disty, idisty, x_off;
                         FbBits *b;
@@ -3279,7 +3280,7 @@ static void fbFetchTransformed(PicturePt
                         ft = FbGet8(tl,24) * idistx + FbGet8(tr,24) * distx;
                         fb = FbGet8(bl,24) * idistx + FbGet8(br,24) * distx;
                         r |= (((ft * idisty + fb * disty) << 8) & 0xff000000);
-                        buffer[i] = r;
+                        WRITE(buffer + i, r);
                     }
                     v.vector[0] += unit.vector[0];
                     v.vector[1] += unit.vector[1];
@@ -3296,7 +3297,7 @@ static void fbFetchTransformed(PicturePt
         params += 2;
         for (i = 0; i < width; ++i) {
             if (!v.vector[2]) {
-                buffer[i] = 0;
+                WRITE(buffer + i, 0);
             } else {
                 int x1, x2, y1, y2, x, y;
                 INT32 srtot, sgtot, sbtot, satot;
@@ -3346,10 +3347,10 @@ static void fbFetchTransformed(PicturePt
                 if (sgtot < 0) sgtot = 0; else if (sgtot > 0xff) sgtot = 0xff;
                 if (sbtot < 0) sbtot = 0; else if (sbtot > 0xff) sbtot = 0xff;
 
-                buffer[i] = ((satot << 24) |
-                             (srtot << 16) |
-                             (sgtot <<  8) |
-                             (sbtot       ));
+                WRITE(buffer + i, ((satot << 24) |
+                                  (srtot << 16) |
+                                  (sgtot <<  8) |
+                                  (sbtot       )));
             }
             v.vector[0] += unit.vector[0];
             v.vector[1] += unit.vector[1];
@@ -3378,10 +3379,10 @@ static void fbFetchExternalAlpha(Picture
     fbFetchTransformed(pict->alphaMap, x - pict->alphaOrigin.x, y - pict->alphaOrigin.y, width, alpha_buffer);
     for (i = 0; i < width; ++i) {
         int a = alpha_buffer[i]>>24;
-        buffer[i] = (a << 24)
-                 | (div_255(Red(buffer[i]) * a) << 16)
-                 | (div_255(Green(buffer[i]) * a) << 8)
-                 | (div_255(Blue(buffer[i]) * a));
+        WRITE(buffer + i, (a << 24)
+                          | (div_255(Red(READ(buffer + i)) * a) << 16)
+                          | (div_255(Green(READ(buffer + i)) * a) << 8)
+                          | (div_255(Blue(READ(buffer + i)) * a)));
     }
 
     if (alpha_buffer != _alpha_buffer)
diff --git a/fb/fbedge.c b/fb/fbedge.c
index b6ca829..70fc423 100644
--- a/fb/fbedge.c
+++ b/fb/fbedge.c
@@ -60,9 +60,9 @@
 #define StepAlpha	((__ap += __ao), (__ao ^= 1))
 
 #define AddAlpha(a) {						\
-    CARD8   __o = *__ap;					\
+    CARD8   __o = READ(__ap);					\
     CARD8   __a = (a) + Get4(__o, __ao);			\
-    *__ap = Put4 (__o, __ao, __a | (0 - ((__a) >> 4)));		\
+    WRITE(__ap, Put4 (__o, __ao, __a | (0 - ((__a) >> 4))));	\
 }
 
 #include "fbedgeimp.h"
@@ -102,7 +102,7 @@ add_saturate_8 (CARD8 *buf, int value, i
 {
     while (length--)
     {
-        *buf = clip255 (*buf + value);
+        WRITE(buf, clip255 (READ(buf) + value));
         buf++;
     }
 }
@@ -164,11 +164,11 @@ fbRasterizeEdges8 (FbBits	*buf,
             /* Add coverage across row */
             if (lxi == rxi)
             {
-                ap[lxi] = clip255 (ap[lxi] + rxs - lxs);
+                WRITE(ap +lxi, clip255 (READ(ap + lxi) + rxs - lxs));
             }
             else
             {
-                ap[lxi] = clip255 (ap[lxi] + N_X_FRAC(8) - lxs);
+                WRITE(ap + lxi, clip255 (READ(ap + lxi) + N_X_FRAC(8) - lxs));
 
                 /* Move forward so that lxi/rxi is the pixel span */
                 lxi++;
@@ -238,7 +238,7 @@ fbRasterizeEdges8 (FbBits	*buf,
                  * necessary to avoid a buffer overrun, (when rx
                  * is exactly on a pixel boundary). */
                 if (rxs)
-                    ap[rxi] = clip255 (ap[rxi] + rxs);
+                    WRITE(ap + rxi, clip255 (READ(ap + rxi) + rxs));
             }
 	}
 
@@ -247,7 +247,7 @@ fbRasterizeEdges8 (FbBits	*buf,
             if (fill_start != fill_end) {
                 if (fill_size == N_Y_FRAC(8))
                 {
-                    memset (ap + fill_start, 0xff, fill_end - fill_start);
+                    MEMSET_WRAPPED (ap + fill_start, 0xff, fill_end - fill_start);
                 }
                 else
                 {
@@ -273,7 +273,7 @@ fbRasterizeEdges8 (FbBits	*buf,
             {
                 if (fill_size == N_Y_FRAC(8))
                 {
-                    memset (ap + fill_start, 0xff, fill_end - fill_start);
+                    MEMSET_WRAPPED (ap + fill_start, 0xff, fill_end - fill_start);
                 }
                 else
                 {
diff --git a/fb/fbedgeimp.h b/fb/fbedgeimp.h
index 8773935..57da31a 100644
--- a/fb/fbedgeimp.h
+++ b/fb/fbedgeimp.h
@@ -76,12 +76,14 @@ rasterizeEdges (FbBits		*buf,
 		x &= FB_MASK;
 
 		FbMaskBits (x, width, startmask, nmiddle, endmask);
-		if (startmask)
-		    *a++ |= startmask;
+		if (startmask) {
+		    WRITE(a, READ(a) | startmask);
+		    a++;
+		}
 		while (nmiddle--)
-		    *a++ = FB_ALLONES;
+		    WRITE(a++, FB_ALLONES);
 		if (endmask)
-		    *a |= endmask;
+		    WRITE(a, READ(a) | endmask);
 	    }
 #else
 	    {
diff --git a/fb/fbgc.c b/fb/fbgc.c
index 1aca17c..3f8bf25 100644
--- a/fb/fbgc.c
+++ b/fb/fbgc.c
@@ -106,14 +106,14 @@ fbPadPixmap (PixmapPtr pPixmap)
     mask = FbBitsMask (0, width);
     while (height--)
     {
-	b = *bits & mask;
+	b = READ(bits) & mask;
 	w = width;
 	while (w < FB_UNIT)
 	{
 	    b = b | FbScrRight(b, w);
 	    w <<= 1;
 	}
-	*bits = b;
+	WRITE(bits, b);
 	bits += stride;
     }
 
@@ -155,7 +155,7 @@ fbLineRepeat (FbBits *bits, int len, int
     width = (width + FB_UNIT-1) >> FB_SHIFT;
     bits++;
     while (--width)
-	if (*bits != first)
+	if (READ(bits) != first)
 	    return FALSE;
     return TRUE;
 }
diff --git a/fb/fbglyph.c b/fb/fbglyph.c
index 78e26a9..2c19b74 100644
--- a/fb/fbglyph.c
+++ b/fb/fbglyph.c
@@ -62,11 +62,11 @@ fbGlyphIn (RegionPtr	pRegion,
 #ifdef FB_24BIT
 #ifndef FBNOPIXADDR
 
-#define WRITE1(d,n,fg)	((d)[n] = (CARD8) fg)
-#define WRITE2(d,n,fg)	(*(CARD16 *) &(d[n]) = (CARD16) fg)
-#define WRITE4(d,n,fg)	(*(CARD32 *) &(d[n]) = (CARD32) fg)
+#define WRITE1(d,n,fg)	WRITE((d) + (n), (CARD8) fg)
+#define WRITE2(d,n,fg)	WRITE((CARD16 *) &(d[n]), (CARD16) fg)
+#define WRITE4(d,n,fg)	WRITE((CARD32 *) &(d[n]), (CARD32) fg)
 #if FB_UNIT == 6 && IMAGE_BYTE_ORDER == LSBFirst
-#define WRITE8(d)	(*(FbBits *) &(d[0]) = fg)
+#define WRITE8(d)	WRITE((FbBits *) &(d[0]), fg)
 #else
 #define WRITE8(d)	WRITE4(d,0,_ABCA), WRITE4(d,4,_BCAB)
 #endif
@@ -157,7 +157,7 @@ fbGlyph24 (FbBits   *dstBits,
     lshift = 4 - shift;
     while (height--)
     {
-	bits = *stipple++;
+	bits = READ(stipple++);
 	n = lshift;
 	dst = dstLine;
 	while (bits)
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 2af0278..eb305b9 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -137,18 +137,18 @@ fbCompositeSolidMask_nx8x8888 (CARD8    
 
 	while (w--)
 	{
-	    m = *mask++;
+	    m = READ(mask++);
 	    if (m == 0xff)
 	    {
 		if (srca == 0xff)
-		    *dst = src & dstMask;
+		    WRITE(dst, src & dstMask);
 		else
-		    *dst = fbOver (src, *dst) & dstMask;
+		    WRITE(dst, fbOver (src, READ(dst)) & dstMask);
 	    }
 	    else if (m)
 	    {
 		d = fbIn (src, m);
-		*dst = fbOver (d, *dst) & dstMask;
+		WRITE(dst, fbOver (d, READ(dst)) & dstMask);
 	    }
 	    dst++;
 	}
@@ -199,17 +199,17 @@ fbCompositeSolidMask_nx8888x8888C (CARD8
 
 	while (w--)
 	{
-	    ma = *mask++;
+	    ma = READ(mask++);
 	    if (ma == 0xffffffff)
 	    {
 		if (srca == 0xff)
-		    *dst = src & dstMask;
+		    WRITE(dst, src & dstMask);
 		else
-		    *dst = fbOver (src, *dst) & dstMask;
+		    WRITE(dst, fbOver (src, READ(dst)) & dstMask);
 	    }
 	    else if (ma)
 	    {
-		d = *dst;
+		d = READ(dst);
 #define FbInOverC(src,srca,msk,dst,i,result) { \
     CARD16  __a = FbGet8(msk,i); \
     CARD32  __t, __ta; \
@@ -224,7 +224,7 @@ fbCompositeSolidMask_nx8888x8888C (CARD8
 		FbInOverC (src, srca, ma, d, 8, n);
 		FbInOverC (src, srca, ma, d, 16, o);
 		FbInOverC (src, srca, ma, d, 24, p);
-		*dst = m|n|o|p;
+		WRITE(dst, m|n|o|p);
 	    }
 	    dst++;
 	}
@@ -274,7 +274,7 @@ fbCompositeSolidMask_nx8x0888 (CARD8    
 
 	while (w--)
 	{
-	    m = *mask++;
+	    m = READ(mask++);
 	    if (m == 0xff)
 	    {
 		if (srca == 0xff)
@@ -339,23 +339,23 @@ fbCompositeSolidMask_nx8x0565 (CARD8    
 
 	while (w--)
 	{
-	    m = *mask++;
+	    m = READ(mask++);
 	    if (m == 0xff)
 	    {
 		if (srca == 0xff)
 		    d = src;
 		else
 		{
-		    d = *dst;
+		    d = READ(dst);
 		    d = fbOver24 (src, cvt0565to8888(d));
 		}
-		*dst = cvt8888to0565(d);
+		WRITE(dst, cvt8888to0565(d));
 	    }
 	    else if (m)
 	    {
-		d = *dst;
+		d = READ(dst);
 		d = fbOver24 (fbIn(src,m), cvt0565to8888(d));
-		*dst = cvt8888to0565(d);
+		WRITE(dst, cvt8888to0565(d));
 	    }
 	    dst++;
 	}
@@ -409,29 +409,29 @@ fbCompositeSolidMask_nx8888x0565C (CARD8
 
 	while (w--)
 	{
-	    ma = *mask++;
+	    ma = READ(mask++);
 	    if (ma == 0xffffffff)
 	    {
 		if (srca == 0xff)
 		{
-		    *dst = src16;
+		    WRITE(dst, src16);
 		}
 		else
 		{
-		    d = *dst;
+		    d = READ(dst);
 		    d = fbOver24 (src, cvt0565to8888(d));
-		    *dst = cvt8888to0565(d);
+		    WRITE(dst, cvt8888to0565(d));
 		}
 	    }
 	    else if (ma)
 	    {
-		d = *dst;
+		d = READ(dst);
 		d = cvt0565to8888(d);
 		FbInOverC (src, srca, ma, d, 0, m);
 		FbInOverC (src, srca, ma, d, 8, n);
 		FbInOverC (src, srca, ma, d, 16, o);
 		d = m|n|o;
-		*dst = cvt8888to0565(d);
+		WRITE(dst, cvt8888to0565(d));
 	    }
 	    dst++;
 	}
@@ -476,12 +476,12 @@ fbCompositeSrc_8888x8888 (CARD8      op,
 
 	while (w--)
 	{
-	    s = *src++;
+	    s = READ(src++);
 	    a = s >> 24;
 	    if (a == 0xff)
-		*dst = s & dstMask;
+		WRITE(dst, s & dstMask);
 	    else if (a)
-		*dst = fbOver (s, *dst) & dstMask;
+		WRITE(dst, fbOver (s, READ(dst)) & dstMask);
 	    dst++;
 	}
     }
@@ -524,7 +524,7 @@ fbCompositeSrc_8888x0888 (CARD8      op,
 
 	while (w--)
 	{
-	    s = *src++;
+	    s = READ(src++);
 	    a = s >> 24;
 	    if (a)
 	    {
@@ -576,7 +576,7 @@ fbCompositeSrc_8888x0565 (CARD8      op,
 
 	while (w--)
 	{
-	    s = *src++;
+	    s = READ(src++);
 	    a = s >> 24;
 	    if (a)
 	    {
@@ -584,10 +584,10 @@ fbCompositeSrc_8888x0565 (CARD8      op,
 		    d = s;
 		else
 		{
-		    d = *dst;
+		    d = READ(dst);
 		    d = fbOver24 (s, cvt0565to8888(d));
 		}
-		*dst = cvt8888to0565(d);
+		WRITE(dst, cvt8888to0565(d));
 	    }
 	    dst++;
 	}
@@ -629,7 +629,7 @@ fbCompositeSrc_0565x0565 (CARD8      op,
 	w = width;
 
 	while (w--)
-	    *dst++ = *src++;
+	    WRITE(dst, READ(src++));
     }
 
     fbFinishAccess (pDst->pDrawable);
@@ -670,16 +670,16 @@ fbCompositeSrcAdd_8000x8000 (CARD8	op,
 
 	while (w--)
 	{
-	    s = *src++;
+	    s = READ(src++);
 	    if (s)
 	    {
 		if (s != 0xff)
 		{
-		    d = *dst;
+		    d = READ(dst);
 		    t = d + s;
 		    s = t | (0 - (t >> 8));
 		}
-		*dst = s;
+		WRITE(dst, s);
 	    }
 	    dst++;
 	}
@@ -724,12 +724,12 @@ fbCompositeSrcAdd_8888x8888 (CARD8	op,
 
 	while (w--)
 	{
-	    s = *src++;
+	    s = READ(src++);
 	    if (s)
 	    {
 		if (s != 0xffffffff)
 		{
-		    d = *dst;
+		    d = READ(dst);
 		    if (d)
 		    {
 			m = FbAdd(s,d,0,t);
@@ -739,7 +739,7 @@ fbCompositeSrcAdd_8888x8888 (CARD8	op,
 			s = m|n|o|p;
 		    }
 		}
-		*dst = s;
+		WRITE(dst, s);
 	    }
 	    dst++;
 	}
diff --git a/fb/fbpict.h b/fb/fbpict.h
index 296cfbd..19d5557 100644
--- a/fb/fbpict.h
+++ b/fb/fbpict.h
@@ -76,13 +76,13 @@
     fbGetDrawable((pict)->pDrawable,__bits__,__stride__,__bpp__,__xoff__,__yoff__); \
     switch (__bpp__) { \
     case 32: \
-	(bits) = *(CARD32 *) __bits__; \
+	(bits) = READ((CARD32 *) __bits__); \
 	break; \
     case 24: \
 	(bits) = Fetch24 ((CARD8 *) __bits__); \
 	break; \
     case 16: \
-	(bits) = *(CARD16 *) __bits__; \
+	(bits) = READ((CARD16 *) __bits__); \
 	(bits) = cvt0565to8888(bits); \
 	break; \
     default: \
@@ -121,22 +121,22 @@
 
 #if IMAGE_BYTE_ORDER == MSBFirst
 #define Fetch24(a)  ((unsigned long) (a) & 1 ? \
-		     ((*(a) << 16) | *((CARD16 *) ((a)+1))) : \
-		     ((*((CARD16 *) (a)) << 8) | *((a)+2)))
+		     ((READ(a) << 16) | READ((CARD16 *) ((a)+1))) : \
+		     ((READ((CARD16 *) (a)) << 8) | READ((a)+2)))
 #define Store24(a,v) ((unsigned long) (a) & 1 ? \
-		      ((*(a) = (CARD8) ((v) >> 16)), \
-		       (*((CARD16 *) ((a)+1)) = (CARD16) (v))) : \
-		      ((*((CARD16 *) (a)) = (CARD16) ((v) >> 8)), \
-		       (*((a)+2) = (CARD8) (v))))
+		      (WRITE(a, (CARD8) ((v) >> 16)), \
+		       WRITE((CARD16 *) ((a)+1), (CARD16) (v))) : \
+		      (WRITE((CARD16 *) (a), (CARD16) ((v) >> 8)), \
+		       WRITE((a)+2, (CARD8) (v))))
 #else
 #define Fetch24(a)  ((unsigned long) (a) & 1 ? \
-		     ((*(a)) | (*((CARD16 *) ((a)+1)) << 8)) : \
-		     ((*((CARD16 *) (a))) | (*((a)+2) << 16)))
+		     (READ(a) | (READ((CARD16 *) ((a)+1)) << 8)) : \
+		     (READ((CARD16 *) (a)) | (READ((a)+2) << 16)))
 #define Store24(a,v) ((unsigned long) (a) & 1 ? \
-		      ((*(a) = (CARD8) (v)), \
-		       (*((CARD16 *) ((a)+1)) = (CARD16) ((v) >> 8))) : \
-		      ((*((CARD16 *) (a)) = (CARD16) (v)),\
-		       (*((a)+2) = (CARD8) ((v) >> 16))))
+		      (WRITE(a, (CARD8) (v)), \
+		       WRITE((CARD16 *) ((a)+1), (CARD16) ((v) >> 8))) : \
+		      (WRITE((CARD16 *) (a), (CARD16) (v)),\
+		       WRITE((a)+2, (CARD8) ((v) >> 16))))
 #endif
 		      
 /*
diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c
index 3fe38ef..aca37d4 100644
--- a/fb/fbpixmap.c
+++ b/fb/fbpixmap.c
@@ -176,7 +176,7 @@ fbPixmapToRegion(PixmapPtr pPix)
 	irectLineStart = rects - FirstRect;
 	/* If the Screen left most bit of the word is set, we're starting in
 	 * a box */
-	if(*pw & mask0)
+	if(READ(pw) & mask0)
 	{
 	    fInBox = TRUE;
 	    rx1 = 0;
@@ -187,7 +187,7 @@ fbPixmapToRegion(PixmapPtr pPix)
 	pwLineEnd = pw + (width >> FB_SHIFT);
 	for (base = 0; pw < pwLineEnd; base += FB_UNIT)
 	{
-	    w = *pw++;
+	    w = READ(pw++);
 	    if (fInBox)
 	    {
 		if (!~w)
@@ -228,7 +228,7 @@ fbPixmapToRegion(PixmapPtr pPix)
 	if(width & FB_MASK)
 	{
 	    /* Process final partial word on line */
-	    w = *pw++;
+	    w = READ(pw++);
 	    for(ib = 0; ib < (width & FB_MASK); ib++)
 	    {
 	        /* If the Screen left most bit of the word is set, we're
diff --git a/fb/fbpoint.c b/fb/fbpoint.c
index 4e2ff0c..c03ea18 100644
--- a/fb/fbpoint.c
+++ b/fb/fbpoint.c
@@ -90,20 +90,20 @@ fbDots (FbBits	    *dstOrig,
 		FbMaskStip (x, 24, leftMask, n, rightMask);
 		if (leftMask)
 		{
-		    *d = FbDoMaskRRop (*d, andT, xorT, leftMask);
+		    WRITE(d, FbDoMaskRRop (READ(d), andT, xorT, leftMask));
 		    andT = FbNext24Stip(andT);
 		    xorT = FbNext24Stip(xorT);
 		    d++;
 		}
 		if (rightMask)
-		    *d = FbDoMaskRRop(*d, andT, xorT, rightMask);
+		    WRITE(d, FbDoMaskRRop(READ(d), andT, xorT, rightMask));
 	    }
 	    else
 #endif
 	    {
 		FbStip	mask;
 		mask = FbStipMask(x, dstBpp);
-		*d = FbDoMaskRRop (*d, and, xor, mask);
+		WRITE(d, FbDoMaskRRop (READ(d), and, xor, mask));
 	    }
 	}
     }
diff --git a/fb/fbpush.c b/fb/fbpush.c
index 282344d..bb7bcef 100644
--- a/fb/fbpush.c
+++ b/fb/fbpush.c
@@ -58,7 +58,7 @@ fbPushPattern (DrawablePtr  pDrawable,
 	w = width;
 	s = src;
 	src += srcStride;
-	bits = *s++;
+	bits = READ(s++);
 	xspan = x;
 	while (w)
 	{
@@ -73,7 +73,7 @@ fbPushPattern (DrawablePtr  pDrawable,
 		    bitsMask = FbStipRight (bitsMask, 1);
 		    if (!bitsMask)
 		    {
-			bits = *s++;
+			bits = READ(s++);
 			bitsMask = FbBitsMask(0,1);
 		    }
 		} while (bits & bitsMask);
@@ -92,7 +92,7 @@ fbPushPattern (DrawablePtr  pDrawable,
 		    bitsMask = FbStipRight (bitsMask, 1);
 		    if (!bitsMask)
 		    {
-			bits = *s++;
+			bits = READ(s++);
 			bitsMask = FbBitsMask(0,1);
 		    }
 		} while (!(bits & bitsMask));
diff --git a/fb/fbseg.c b/fb/fbseg.c
index a980c24..3107637 100644
--- a/fb/fbseg.c
+++ b/fb/fbseg.c
@@ -79,7 +79,7 @@ fbBresSolid (DrawablePtr    pDrawable,
 	    mask = fbBresShiftMask(mask,signdx,dstBpp);
 	    if (!mask)
 	    {
-		*dst = FbDoMaskRRop (*dst, and, xor, bits);
+		WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, bits));
 		bits = 0;
 		dst += signdx;
 		mask = mask0;
@@ -87,20 +87,20 @@ fbBresSolid (DrawablePtr    pDrawable,
 	    e += e1;
 	    if (e >= 0)
 	    {
-		*dst = FbDoMaskRRop (*dst, and, xor, bits);
+		WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, bits));
 		bits = 0;
 		dst += dstStride;
 		e += e3;
 	    }
 	}
 	if (bits)
-	    *dst = FbDoMaskRRop (*dst, and, xor, bits);
+	    WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, bits));
     }
     else
     {
 	while (len--)
 	{
-	    *dst = FbDoMaskRRop (*dst, and, xor, mask);
+	    WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, mask));
 	    dst += dstStride;
 	    e += e1;
 	    if (e >= 0)
@@ -166,9 +166,9 @@ fbBresDash (DrawablePtr	pDrawable,
     while (len--)
     {
 	if (even)
-	    *dst = FbDoMaskRRop (*dst, and, xor, mask);
+	    WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, mask));
 	else if (doOdd)
-	    *dst = FbDoMaskRRop (*dst, bgand, bgxor, mask);
+	    WRITE(dst, FbDoMaskRRop (READ(dst), bgand, bgxor, mask));
 	if (axis == X_AXIS)
 	{
 	    mask = fbBresShiftMask(mask,signdx,dstBpp);
@@ -375,13 +375,13 @@ fbBresSolid24RRop (DrawablePtr  pDrawabl
 	FbMaskStip (x, 24, leftMask, nl, rightMask);
 	if (leftMask)
 	{
-	    *d = FbDoMaskRRop (*d, andT, xorT, leftMask);
+	    WRITE(d, FbDoMaskRRop (READ(d), andT, xorT, leftMask));
 	    d++;
 	    andT = FbNext24Stip (andT);
 	    xorT = FbNext24Stip (xorT);
 	}
 	if (rightMask)
-	    *d = FbDoMaskRRop (*d, andT, xorT, rightMask);
+	    WRITE(d, FbDoMaskRRop (READ(d), andT, xorT, rightMask));
 	if (axis == X_AXIS)
 	{
 	    x1 += signdx;
@@ -474,13 +474,13 @@ fbBresDash24RRop (DrawablePtr	pDrawable,
 	    FbMaskStip (x, 24, leftMask, nl, rightMask);
 	    if (leftMask)
 	    {
-		*d = FbDoMaskRRop (*d, andT, xorT, leftMask);
+		WRITE(d, FbDoMaskRRop (READ(d), andT, xorT, leftMask));
 		d++;
 		andT = FbNext24Stip (andT);
 		xorT = FbNext24Stip (xorT);
 	    }
 	    if (rightMask)
-		*d = FbDoMaskRRop (*d, andT, xorT, rightMask);
+		WRITE(d, FbDoMaskRRop (READ(d), andT, xorT, rightMask));
 	}
 	if (axis == X_AXIS)
 	{
diff --git a/fb/fbsolid.c b/fb/fbsolid.c
index 89effe6..6b5ed0f 100644
--- a/fb/fbsolid.c
+++ b/fb/fbsolid.c
@@ -70,12 +70,12 @@ fbSolid (FbBits	    *dst,
 	n = nmiddle;
 	if (!and)
 	    while (n--)
-		*dst++ = xor;
+		WRITE(dst++, xor);
 	else
 	    while (n--)
 	    {
-		*dst = FbDoRRop (*dst, and, xor);
-		dst++;
+		WRITE(dst, FbDoRRop (READ(dst), and, xor));
+                dst++;
 	    }
 	if (endmask)
 	    FbDoRightMaskByteRRop(dst,endbyte,endmask,and,xor);
@@ -160,26 +160,26 @@ fbSolid24 (FbBits   *dst,
     {
 	if (startmask)
 	{
-	    *dst = FbDoMaskRRop(*dst, andS, xorS, startmask);
-	    dst++;
+	    WRITE(dst, FbDoMaskRRop(READ(dst), andS, xorS, startmask));
+            dst++;
 	}
 	n = nmiddle;
 	if (!and0)
 	{
 	    while (n >= 3)
 	    {
-		*dst++ = xor0;
-		*dst++ = xor1;
-		*dst++ = xor2;
+		WRITE(dst++, xor0);
+		WRITE(dst++, xor1);
+		WRITE(dst++, xor2);
 		n -= 3;
 	    }
 	    if (n)
 	    {
-		*dst++ = xor0;
+		WRITE(dst++, xor0);
 		n--;
 		if (n)
 		{
-		    *dst++ = xor1;
+		    WRITE(dst++, xor1);
 		}
 	    }
 	}
@@ -187,28 +187,28 @@ fbSolid24 (FbBits   *dst,
 	{
 	    while (n >= 3)
 	    {
-		*dst = FbDoRRop (*dst, and0, xor0);
-		dst++;
-		*dst = FbDoRRop (*dst, and1, xor1);
-		dst++;
-		*dst = FbDoRRop (*dst, and2, xor2);
-		dst++;
+		WRITE(dst, FbDoRRop (READ(dst), and0, xor0));
+                dst++;
+		WRITE(dst, FbDoRRop (READ(dst), and1, xor1));
+                dst++;
+		WRITE(dst, FbDoRRop (READ(dst), and2, xor2));
+                dst++;
 		n -= 3;
 	    }
 	    if (n)
 	    {
-		*dst = FbDoRRop (*dst, and0, xor0);
-		dst++;
+		WRITE(dst, FbDoRRop (READ(dst), and0, xor0));
+                dst++;
 		n--;
 		if (n)
 		{
-		    *dst = FbDoRRop (*dst, and1, xor1);
-		    dst++;
+		    WRITE(dst, FbDoRRop (READ(dst), and1, xor1));
+                    dst++;
 		}
 	    }
 	}
 	if (endmask)
-	    *dst = FbDoMaskRRop (*dst, andE, xorE, endmask);
+	    WRITE(dst, FbDoMaskRRop (READ(dst), andE, xorE, endmask));
 	dst += dstStride;
     }
 }
diff --git a/fb/fbstipple.c b/fb/fbstipple.c
index ce97148..de8d1f8 100644
--- a/fb/fbstipple.c
+++ b/fb/fbstipple.c
@@ -155,7 +155,7 @@ fbEvenStipple (FbBits	*dst,
 	/*
 	 * Extract stipple bits for this scanline;
 	 */
-	bits = *s;
+	bits = READ(s);
 	s += stipStride;
 	if (s == stipEnd)
 	    s = stip;
@@ -199,12 +199,12 @@ fbEvenStipple (FbBits	*dst,
 	    n = nmiddle;
 	    if (!and)
 		while (n--)
-		    *dst++ = xor;
+		    WRITE(dst++, xor);
 	    else
 	    {
 		while (n--)
 		{
-		    *dst = FbDoRRop (*dst, and, xor);
+		    WRITE(dst, FbDoRRop (READ(dst), and, xor));
 		    dst++;
 		}
 	    }
diff --git a/fb/fbtile.c b/fb/fbtile.c
index 0d0cfe1..e7df1af 100644
--- a/fb/fbtile.c
+++ b/fb/fbtile.c
@@ -80,7 +80,7 @@ fbEvenTile (FbBits	*dst,
 	/*
 	 * Pick up bits for this scanline
 	 */
-	bits = *t++;
+	bits = READ(t++);
 	if (t == tileEnd) t = tile;
 	bits = FbRotLeft(bits,rot);
 	and = fbAnd(alu,bits,pm);
@@ -94,11 +94,11 @@ fbEvenTile (FbBits	*dst,
 	n = nmiddle;
 	if (!and)
 	    while (n--)
-		*dst++ = xor;
+		WRITE(dst++, xor);
 	else
 	    while (n--)
 	    {
-		*dst = FbDoRRop (*dst, and, xor);
+		WRITE(dst, FbDoRRop (READ(dst), and, xor));
 		dst++;
 	    }
 	if (endmask)
diff-tree a69335dc299be6de8b82ed34de1cb30f1255feb4 (from e6ae1612be519ee6224d354244d076d85d44a750)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Jul 31 14:15:55 2006 -0700

    Make ReadMemoryProcPtr take a const pointer.
    
    Fixes some warnings when using READ with a const pointer.

diff --git a/fb/fb.h b/fb/fb.h
index 22ed4f7..e32c10b 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -601,7 +601,7 @@ extern WindowPtr    *WindowTable;
 
 /* Framebuffer access wrapper */
 #ifdef FB_ACCESS_WRAPPER
-typedef FbBits (*ReadMemoryProcPtr)(void *src, int size);
+typedef FbBits (*ReadMemoryProcPtr)(const void *src, int size);
 typedef void (*WriteMemoryProcPtr)(void *dst, FbBits value, int size);
 typedef void (*SetupWrapProcPtr)(ReadMemoryProcPtr  *pRead,
                                  WriteMemoryProcPtr *pWrite,
diff-tree e6ae1612be519ee6224d354244d076d85d44a750 (from 377a581ddf5e428a368efb1b59fcb317666fecdd)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Thu Jul 27 18:24:59 2006 -0700

    Add fbHasVisualTypes and fbSetVisualTypesAndMasks to wfbrename.h and include -DXFree86Server.

diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index 7b7d81e..9721bc6 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -97,6 +97,7 @@
 #define fbGlyph32 wfbGlyph32
 #define fbGlyph8 wfbGlyph8
 #define fbGlyphIn wfbGlyphIn
+#define fbHasVisualTypes wfbHasVisualTypes
 #define fbImageGlyphBlt wfbImageGlyphBlt
 #define fbIn wfbIn
 #define fbInitializeColormap wfbInitializeColormap
@@ -165,6 +166,7 @@
 #define fbSetSpans wfbSetSpans
 #define fbSetupScreen wfbSetupScreen
 #define fbSetVisualTypes wfbSetVisualTypes
+#define fbSetVisualTypesAndMasks wfbSetVisualTypesAndMasks
 #define _fbSetWindowPixmap _wfbSetWindowPixmap
 #define fbSolid wfbSolid
 #define fbSolid24 wfbSolid24
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index 54bc099..c34ddd6 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -70,7 +70,7 @@ libfb_la_CFLAGS = -DXFree86Server $(AM_C
 libwfb_la_LDFLAGS = -avoid-version
 libwfb_la_LIBADD = $(top_builddir)/fb/libwfb.la
 libwfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c
-libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
+libwfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
 
 libglx_la_LDFLAGS = -avoid-version
 if AIGLX
diff-tree 377a581ddf5e428a368efb1b59fcb317666fecdd (from a4005c15fbb48231cb958c32b2c791a2d23a135a)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Tue Jul 25 15:27:31 2006 -0700

    Switch to using void* pointers.
    
    Pass the size of the data pointed to by src or dst as an argument to
    wfb{Read,Write}Memory.  This allows one set of macros to be used with any size
    pointer.  Assumes that sizeof(FbBits) >= sizeof(FbStip).

diff --git a/fb/fb.h b/fb/fb.h
index 13783d3..22ed4f7 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -47,8 +47,8 @@
 #ifdef FB_ACCESS_WRAPPER
 #include "wfbrename.h"
 #define FBPREFIX(x) wfb##x
-#define WRITE(ptr, val) ((*wfbWriteMemory)(ptr, val))
-#define READ(ptr) ((*wfbReadMemory)(ptr))
+#define WRITE(ptr, val) ((*wfbWriteMemory)(ptr, val, sizeof(*ptr)))
+#define READ(ptr) ((*wfbReadMemory)(ptr, sizeof(*ptr)))
 #else
 #define FBPREFIX(x) fb##x
 #define WRITE(ptr, val) (*(ptr) = (val))
@@ -601,8 +601,8 @@ extern WindowPtr    *WindowTable;
 
 /* Framebuffer access wrapper */
 #ifdef FB_ACCESS_WRAPPER
-typedef FbBits (*ReadMemoryProcPtr)(FbBits *src);
-typedef void (*WriteMemoryProcPtr)(FbBits *dst, FbBits value);
+typedef FbBits (*ReadMemoryProcPtr)(void *src, int size);
+typedef void (*WriteMemoryProcPtr)(void *dst, FbBits value, int size);
 typedef void (*SetupWrapProcPtr)(ReadMemoryProcPtr  *pRead,
                                  WriteMemoryProcPtr *pWrite,
                                  PixmapPtr           pPixmap);
diff-tree a4005c15fbb48231cb958c32b2c791a2d23a135a (from 319efac445cebda5a2ac1db67efebe54bc47ba9d)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Jul 10 18:58:09 2006 -0700

    Add framebuffer access wrapper infrastructure.
    
    Create fbPrepareAccess macros to call into the driver to set up the
    wfbReadMemory and wfbWriteWemory pointers.  Call these from fbGetDrawable and
    fbGetStipDrawable.
    
    Add the READ and WRITE macros, which expand to simple memory accesses for fb,
    and calls through the function pointers for wfb.
    
    Add fbFinishAccess macro to give the driver an opportunity to clean up.  Add
    calls to this in the appropriate places.

diff --git a/fb/fb.h b/fb/fb.h
index 9c777c1..13783d3 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -47,8 +47,12 @@
 #ifdef FB_ACCESS_WRAPPER
 #include "wfbrename.h"
 #define FBPREFIX(x) wfb##x
+#define WRITE(ptr, val) ((*wfbWriteMemory)(ptr, val))
+#define READ(ptr) ((*wfbReadMemory)(ptr))
 #else
 #define FBPREFIX(x) fb##x
+#define WRITE(ptr, val) (*(ptr) = (val))
+#define READ(ptr) (*(ptr))
 #endif
 
 /*
@@ -595,6 +599,34 @@ extern WindowPtr    *WindowTable;
 #define FB_SCREEN_PRIVATE
 #endif
 
+/* Framebuffer access wrapper */
+#ifdef FB_ACCESS_WRAPPER
+typedef FbBits (*ReadMemoryProcPtr)(FbBits *src);
+typedef void (*WriteMemoryProcPtr)(FbBits *dst, FbBits value);
+typedef void (*SetupWrapProcPtr)(ReadMemoryProcPtr  *pRead,
+                                 WriteMemoryProcPtr *pWrite,
+                                 PixmapPtr           pPixmap);
+typedef void (*FinishWrapProcPtr)(PixmapPtr pPixmap);
+#define fbPrepareAccess(pPix) \
+	fbGetScreenPrivate((pPix)->drawable.pScreen)->setupWrap( \
+		&wfbReadMemory, \
+		&wfbWriteMemory, \
+		(pPix))
+#define fbFinishAccess(pDrawable) { \
+	PixmapPtr _pPix; \
+	if ((pDrawable)->type != DRAWABLE_PIXMAP) \
+	    _pPix = fbGetWindowPixmap(pDrawable); \
+	else \
+	    _pPix = (PixmapPtr) (pDrawable); \
+	fbGetScreenPrivate(_pPix->drawable.pScreen)->finishWrap(_pPix); \
+}
+
+#else
+#define fbPrepareAccess(pPix)
+#define fbFinishAccess(pDraw)
+#endif
+
+
 #ifdef FB_SCREEN_PRIVATE
 extern int	fbScreenPrivateIndex;
 extern int	fbGetScreenPrivateIndex(void);
@@ -603,6 +635,10 @@ extern int	fbGetScreenPrivateIndex(void)
 typedef struct {
     unsigned char	win32bpp;	/* window bpp for 32-bpp images */
     unsigned char	pix32bpp;	/* pixmap bpp for 32-bpp images */
+#ifdef FB_ACCESS_WRAPPER
+    SetupWrapProcPtr	setupWrap;	/* driver hook to set pixmap access wrapping */
+    FinishWrapProcPtr	finishWrap;	/* driver hook to clean up pixmap access wrapping */
+#endif
 } FbScreenPrivRec, *FbScreenPrivPtr;
 
 #define fbGetScreenPrivate(pScreen) ((FbScreenPrivPtr) \
@@ -681,6 +717,7 @@ typedef struct {
 	(xoff) = __fbPixOffXPix(_pPix); \
 	(yoff) = __fbPixOffYPix(_pPix); \
     } \
+    fbPrepareAccess(_pPix); \
     (pointer) = (FbBits *) _pPix->devPrivate.ptr; \
     (stride) = ((int) _pPix->devKind) / sizeof (FbBits); (void)(stride); \
     (bpp) = _pPix->drawable.bitsPerPixel;  (void)(bpp); \
@@ -697,6 +734,7 @@ typedef struct {
 	(xoff) = __fbPixOffXPix(_pPix); \
 	(yoff) = __fbPixOffYPix(_pPix); \
     } \
+    fbPrepareAccess(_pPix); \
     (pointer) = (FbStip *) _pPix->devPrivate.ptr; \
     (stride) = ((int) _pPix->devKind) / sizeof (FbStip); (void)(stride); \
     (bpp) = _pPix->drawable.bitsPerPixel; (void)(bpp); \
@@ -1745,6 +1783,31 @@ fbSetupScreen(ScreenPtr	pScreen, 
 	      int	width,		/* pixel width of frame buffer */
 	      int	bpp);		/* bits per pixel of frame buffer */
 
+#ifdef FB_ACCESS_WRAPPER
+Bool
+wfbFinishScreenInit(ScreenPtr	pScreen,
+		    pointer	pbits,
+		    int		xsize,
+		    int		ysize,
+		    int		dpix,
+		    int		dpiy,
+		    int		width,
+		    int		bpp,
+		    SetupWrapProcPtr setupWrap,
+		    FinishWrapProcPtr finishWrap);
+
+Bool
+wfbScreenInit(ScreenPtr	pScreen,
+	      pointer	pbits,
+	      int	xsize,
+	      int	ysize,
+	      int	dpix,
+	      int	dpiy,
+	      int	width,
+	      int	bpp,
+	      SetupWrapProcPtr setupWrap,
+	      FinishWrapProcPtr finishWrap);
+#else
 Bool
 fbFinishScreenInit(ScreenPtr	pScreen,
 		   pointer	pbits,
@@ -1764,6 +1827,7 @@ fbScreenInit(ScreenPtr	pScreen,
 	     int	dpiy,
 	     int	width,
 	     int	bpp);
+#endif
 
 void
 fbInitializeBackingStore (ScreenPtr pScreen);
@@ -2001,6 +2065,11 @@ fbReplicatePixel (Pixel p, int bpp);
 void
 fbReduceRasterOp (int rop, FbBits fg, FbBits pm, FbBits *andp, FbBits *xorp);
 
+#ifdef FB_ACCESS_WRAPPER
+extern ReadMemoryProcPtr wfbReadMemory;
+extern WriteMemoryProcPtr wfbWriteMemory;
+#endif
+
 /*
  * fbwindow.c
  */
diff --git a/fb/fb24_32.c b/fb/fb24_32.c
index 572da48..0fdd9b8 100644
--- a/fb/fb24_32.c
+++ b/fb/fb24_32.c
@@ -305,6 +305,8 @@ fb24_32GetSpans(DrawablePtr	pDrawable, 
 	ppt++;
 	pwidth++;
     }
+
+    fbFinishAccess (pDrawable);
 }
 
 void
@@ -366,6 +368,8 @@ fb24_32SetSpans (DrawablePtr	    pDrawab
 	ppt++;
 	pwidth++;
     }
+
+    fbFinishAccess (pDrawable);
 }
 
 /*
@@ -429,6 +433,8 @@ fb24_32PutZImage (DrawablePtr	pDrawable,
 			alu,
 			pm);
     }
+
+    fbFinishAccess (pDrawable);
 }
 
 void
@@ -463,6 +469,8 @@ fb24_32GetImage (DrawablePtr     pDrawab
     fb24_32BltUp (src + (y + srcYoff) * srcStride, srcStride, x + srcXoff,
 		  (CARD8 *) d, dstStride, 0,
 		  w, h, GXcopy, pm);
+
+    fbFinishAccess (pDrawable);
 }
 
 void
@@ -519,6 +527,9 @@ fb24_32CopyMtoN (DrawablePtr pSrcDrawabl
 		pPriv->pm);
 	pbox++;
     }
+
+    fbFinishAccess (pSrcDrawable);
+    fbFinishAccess (pDstDrawable);
 }
 
 PixmapPtr
@@ -563,6 +574,9 @@ fb24_32ReformatTile(PixmapPtr pOldTile, 
 	    GXcopy,
 	    FB_ALLONES);
 
+    fbFinishAccess (&pOldTile->drawable);
+    fbFinishAccess (&pNewTile->drawable);
+
     return pNewTile;
 }
 
diff --git a/fb/fballpriv.c b/fb/fballpriv.c
index 3c05ff3..4f807ed 100644
--- a/fb/fballpriv.c
+++ b/fb/fballpriv.c
@@ -90,3 +90,8 @@ fbAllocatePrivates(ScreenPtr pScreen, in
 #endif
     return TRUE;
 }
+
+#ifdef FB_ACCESS_WRAPPER
+ReadMemoryProcPtr wfbReadMemory;
+WriteMemoryProcPtr wfbWriteMemory;
+#endif
diff --git a/fb/fbarc.c b/fb/fbarc.c
index 8f4d296..d2c1a76 100644
--- a/fb/fbarc.c
+++ b/fb/fbarc.c
@@ -109,6 +109,7 @@ fbPolyArc (DrawablePtr	pDrawable,
 		    miPolyArc(pDrawable, pGC, 1, parcs);
 		parcs++;
 	    }
+	    fbFinishAccess (pDrawable);
 	}
 	else
 #endif
diff --git a/fb/fbbits.h b/fb/fbbits.h
index e5c006d..e99a297 100644
--- a/fb/fbbits.h
+++ b/fb/fbbits.h
@@ -119,6 +119,8 @@ BRESSOLID (DrawablePtr	pDrawable,
 	    e += e3;
 	}
     }
+
+    fbFinishAccess (pDrawable);
 }
 #endif
 
@@ -263,6 +265,8 @@ onOffOdd:
 		dashlen = len;
 	}
     }
+
+    fbFinishAccess (pDrawable);
 }
 #endif
 
@@ -710,8 +714,10 @@ POLYLINE (DrawablePtr	pDrawable,
 		       intToX(pt2) + xoff, intToY(pt2) + yoff,
 		       npt == 0 && pGC->capStyle != CapNotLast,
 		       &dashoffset);
-	    if (!npt)
+	    if (!npt) {
+		fbFinishAccess (pDrawable);
 		return;
+	    }
 	    pt1 = pt2;
 	    pt2 = *pts++;
 	    npt--;
@@ -776,6 +782,7 @@ POLYLINE (DrawablePtr	pDrawable,
 		    {
 			RROP(bits,and,xor);
 		    }
+		    fbFinishAccess (pDrawable);
 		    return;
 		}
 		pt1 = pt2;
@@ -786,6 +793,8 @@ POLYLINE (DrawablePtr	pDrawable,
     	    }
 	}
     }
+
+    fbFinishAccess (pDrawable);
 }
 #endif
 
@@ -950,6 +959,8 @@ POLYSEGMENT (DrawablePtr    pDrawable,
 	    }
 	}
     }
+
+    fbFinishAccess (pDrawable);
 }
 #endif
 
diff --git a/fb/fbcompose.c b/fb/fbcompose.c
index b1903e9..c7a7280 100644
--- a/fb/fbcompose.c
+++ b/fb/fbcompose.c
@@ -2652,6 +2652,7 @@ static void fbFetchSolid(PicturePtr pict
     end = buffer + width;
     while (buffer < end)
         *buffer++ = color;
+    fbFinishAccess (pict->pDrawable);
 }
 
 static void fbFetch(PicturePtr pict, int x, int y, int width, CARD32 *buffer)
@@ -2670,6 +2671,7 @@ static void fbFetch(PicturePtr pict, int
     bits += y*stride;
 
     fetch(bits, x, width, buffer, indexed);
+    fbFinishAccess (pict->pDrawable);
 }
 
 #define MOD(a,b) ((a) < 0 ? ((b) - ((-(a) - 1) % (b))) - 1 : (a) % (b))
@@ -2921,8 +2923,10 @@ static void fbFetchTransformed(PicturePt
 
     /* when using convolution filters one might get here without a transform */
     if (pict->transform) {
-        if (!PictureTransformPoint3d (pict->transform, &v))
+        if (!PictureTransformPoint3d (pict->transform, &v)) {
+            fbFinishAccess (pict->pDrawable);
             return;
+        }
         unit.vector[0] = pict->transform->matrix[0][0];
         unit.vector[1] = pict->transform->matrix[1][0];
         unit.vector[2] = pict->transform->matrix[2][0];
@@ -3352,6 +3356,8 @@ static void fbFetchTransformed(PicturePt
             v.vector[2] += unit.vector[2];
         }
     }
+
+    fbFinishAccess (pict->pDrawable);
 }
 
 
@@ -3397,6 +3403,7 @@ static void fbStore(PicturePtr pict, int
 
     bits += y*stride;
     store(bits, buffer, x, width, indexed);
+    fbFinishAccess (pict->pDrawable);
 }
 
 static void fbStoreExternalAlpha(PicturePtr pict, int x, int y, int width, CARD32 *buffer)
@@ -3436,6 +3443,9 @@ static void fbStoreExternalAlpha(Picture
 
     store(bits, buffer, x, width, indexed);
     astore(alpha_bits, buffer, ax - pict->alphaOrigin.x, width, aindexed);
+
+    fbFinishAccess (pict->alphaMap->pDrawable);
+    fbFinishAccess (pict->pDrawable);
 }
 
 typedef void (*scanStoreProc)(PicturePtr , int , int , int , CARD32 *);
diff --git a/fb/fbcopy.c b/fb/fbcopy.c
index 0d1cb7f..164cd3d 100644
--- a/fb/fbcopy.c
+++ b/fb/fbcopy.c
@@ -103,6 +103,8 @@ fbCopyNtoN (DrawablePtr	pSrcDrawable,
 #endif
 	pbox++;
     }    
+    fbFinishAccess (pDstDrawable);
+    fbFinishAccess (pSrcDrawable);
 }
 
 void
@@ -173,6 +175,9 @@ fbCopy1toN (DrawablePtr	pSrcDrawable,
 	}
 	pbox++;
     }
+
+    fbFinishAccess (pDstDrawable);
+    fbFinishAccess (pSrcDrawable);
 }
 
 void
@@ -221,6 +226,8 @@ fbCopyNto1 (DrawablePtr	pSrcDrawable,
 			(FbStip) pPriv->and, (FbStip) pPriv->xor,
 			(FbStip) pPriv->bgand, (FbStip) pPriv->bgxor,
 			bitplane);
+	    fbFinishAccess (pDstDrawable);
+	    fbFinishAccess (pSrcDrawable);
 	}
 	else
 	{
@@ -281,6 +288,9 @@ fbCopyNto1 (DrawablePtr	pSrcDrawable,
 		      pPriv->and, pPriv->xor,
 		      pPriv->bgand, pPriv->bgxor);
 	    xfree (tmp);
+
+	    fbFinishAccess (pDstDrawable);
+	    fbFinishAccess (pSrcDrawable);
 	}
 	pbox++;
     }
diff --git a/fb/fbfill.c b/fb/fbfill.c
index ad5025c..7ef3a70 100644
--- a/fb/fbfill.c
+++ b/fb/fbfill.c
@@ -49,8 +49,10 @@ fbFill (DrawablePtr pDrawable,
     case FillSolid:
 #ifdef USE_MMX
 	if (!pPriv->and && fbHaveMMX())
-	    if (fbSolidFillmmx (pDrawable, x, y, width, height, pPriv->xor))
+	    if (fbSolidFillmmx (pDrawable, x, y, width, height, pPriv->xor)) {
+		fbFinishAccess (pDrawable);
 		return;
+	    }
 #endif	    
 	fbSolid (dst + (y + dstYoff) * dstStride, 
 		 dstStride, 
@@ -92,6 +94,7 @@ fbFill (DrawablePtr pDrawable,
 		    
 		    (pGC->patOrg.x + pDrawable->x + dstXoff),
 		    pGC->patOrg.y + pDrawable->y - y);
+	    fbFinishAccess (&pStip->drawable);
 	}
 	else
 	{
@@ -129,6 +132,7 @@ fbFill (DrawablePtr pDrawable,
 		       bgand, bgxor,
 		       pGC->patOrg.x + pDrawable->x + dstXoff,
 		       pGC->patOrg.y + pDrawable->y - y);
+	    fbFinishAccess (&pStip->drawable);
 	}
 	break;
     }
@@ -157,10 +161,12 @@ fbFill (DrawablePtr pDrawable,
 		dstBpp,
 		(pGC->patOrg.x + pDrawable->x + dstXoff) * dstBpp,
 		pGC->patOrg.y + pDrawable->y - y);
+	fbFinishAccess (&pTile->drawable);
 	break;
     }
     }
     fbValidateDrawable (pDrawable);
+    fbFinishAccess (pDrawable);
 }
 
 void
@@ -215,8 +221,10 @@ fbSolidBoxClipped (DrawablePtr	pDrawable
 		if (fbSolidFillmmx (pDrawable,
 		                    partX1, partY1,
 				    (partX2 - partX1), (partY2 - partY1),
-				    xor))
+				    xor)) {
+			fbFinishAccess (pDrawable);
 			return;
+		}
 	}
 #endif
 	fbSolid (dst + (partY1 + dstYoff) * dstStride,
@@ -228,4 +236,5 @@ fbSolidBoxClipped (DrawablePtr	pDrawable
 		 (partY2 - partY1),
 		 and, xor);
     }
+    fbFinishAccess (pDrawable);
 }
diff --git a/fb/fbgc.c b/fb/fbgc.c
index 5b55810..1aca17c 100644
--- a/fb/fbgc.c
+++ b/fb/fbgc.c
@@ -116,6 +116,8 @@ fbPadPixmap (PixmapPtr pPixmap)
 	*bits = b;
 	bits += stride;
     }
+
+    fbFinishAccess (&pPixmap->drawable);
 }
 
 /*
@@ -183,10 +185,13 @@ fbCanEvenStipple (PixmapPtr pStipple, in
     /* check to see that the stipple repeats horizontally */
     while (h--)
     {
-	if (!fbLineRepeat (bits, len, pStipple->drawable.width))
+	if (!fbLineRepeat (bits, len, pStipple->drawable.width)) {
+	    fbFinishAccess (&pStipple->drawable);
 	    return FALSE;
+	}
 	bits += stride;
     }
+    fbFinishAccess (&pStipple->drawable);
     return TRUE;
 }
 
diff --git a/fb/fbgetsp.c b/fb/fbgetsp.c
index f77ea8c..ffd8a1d 100644
--- a/fb/fbgetsp.c
+++ b/fb/fbgetsp.c
@@ -84,4 +84,6 @@ fbGetSpans(DrawablePtr	pDrawable, 
 	ppt++;
 	pwidth++;
     }
+
+    fbFinishAccess (pDrawable);
 }
diff --git a/fb/fbglyph.c b/fb/fbglyph.c
index 8e81940..78e26a9 100644
--- a/fb/fbglyph.c
+++ b/fb/fbglyph.c
@@ -284,7 +284,7 @@ fbPolyGlyphBlt (DrawablePtr	pDrawable,
     glyph = 0;
     if (pGC->fillStyle == FillSolid && pPriv->and == 0)
     {
-	fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
+	dstBpp = pDrawable->bitsPerPixel;
 	switch (dstBpp) {
 	case 8:	    glyph = fbGlyph8; break;
 	case 16:    glyph = fbGlyph16; break;
@@ -312,6 +312,7 @@ fbPolyGlyphBlt (DrawablePtr	pDrawable,
 	    if (glyph && gWidth <= sizeof (FbStip) * 8 &&
 		fbGlyphIn (fbGetCompositeClip(pGC), gx, gy, gWidth, gHeight))
 	    {
+		fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
 		(*glyph) (dst + (gy + dstYoff) * dstStride,
 			  dstStride,
 			  dstBpp,
@@ -319,6 +320,7 @@ fbPolyGlyphBlt (DrawablePtr	pDrawable,
 			  pPriv->xor,
 			  gx + dstXoff,
 			  gHeight);
+		fbFinishAccess (pDrawable);
 	    }
 	    else
 #endif
@@ -375,7 +377,7 @@ fbImageGlyphBlt (DrawablePtr	pDrawable,
     glyph = 0;
     if (pPriv->and == 0)
     {
-	fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
+	dstBpp = pDrawable->bitsPerPixel;
 	switch (dstBpp) {
 	case 8:	    glyph = fbGlyph8; break;
 	case 16:    glyph = fbGlyph16; break;
@@ -443,6 +445,7 @@ fbImageGlyphBlt (DrawablePtr	pDrawable,
 	    if (glyph && gWidth <= sizeof (FbStip) * 8 &&
 		fbGlyphIn (fbGetCompositeClip(pGC), gx, gy, gWidth, gHeight))
 	    {
+		fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
 		(*glyph) (dst + (gy + dstYoff) * dstStride,
 			  dstStride,
 			  dstBpp,
@@ -450,6 +453,7 @@ fbImageGlyphBlt (DrawablePtr	pDrawable,
 			  pPriv->fg,
 			  gx + dstXoff,
 			  gHeight);
+		fbFinishAccess (pDrawable);
 	    }
 	    else
 #endif
diff --git a/fb/fbimage.c b/fb/fbimage.c
index bf5c06b..4798709 100644
--- a/fb/fbimage.c
+++ b/fb/fbimage.c
@@ -170,6 +170,8 @@ fbPutZImage (DrawablePtr	pDrawable,
 		   pm,
 		   dstBpp);
     }
+
+    fbFinishAccess (pDrawable);
 }
 	     
 void
@@ -277,6 +279,8 @@ fbPutXYImage (DrawablePtr	pDrawable,
 		      fgand, fgxor, bgand, bgxor);
 	}
     }
+
+    fbFinishAccess (pDrawable);
 }
 
 void
@@ -361,4 +365,6 @@ fbGetImage (DrawablePtr	    pDrawable,
 		    fbXorStip(GXcopy,0,FB_STIP_ALLONES),
 		    planeMask);
     }
+
+    fbFinishAccess (pDrawable);
 }
diff --git a/fb/fbpict.c b/fb/fbpict.c
index c208643..2af0278 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -153,6 +153,9 @@ fbCompositeSolidMask_nx8x8888 (CARD8    
 	    dst++;
 	}
     }
+
+    fbFinishAccess (pMask->pDrawable);
+    fbFinishAccess (pDst->pDrawable);
 }
 
 void
@@ -226,6 +229,9 @@ fbCompositeSolidMask_nx8888x8888C (CARD8
 	    dst++;
 	}
     }
+
+    fbFinishAccess (pMask->pDrawable);
+    fbFinishAccess (pDst->pDrawable);
 }
 
 void
@@ -288,6 +294,9 @@ fbCompositeSolidMask_nx8x0888 (CARD8    
 	    dst += 3;
 	}
     }
+
+    fbFinishAccess (pMask->pDrawable);
+    fbFinishAccess (pDst->pDrawable);
 }
 
 void
@@ -351,6 +360,9 @@ fbCompositeSolidMask_nx8x0565 (CARD8    
 	    dst++;
 	}
     }
+
+    fbFinishAccess (pMask->pDrawable);
+    fbFinishAccess (pDst->pDrawable);
 }
 
 void
@@ -424,6 +436,9 @@ fbCompositeSolidMask_nx8888x0565C (CARD8
 	    dst++;
 	}
     }
+
+    fbFinishAccess (pMask->pDrawable);
+    fbFinishAccess (pDst->pDrawable);
 }
 
 void
@@ -470,6 +485,9 @@ fbCompositeSrc_8888x8888 (CARD8      op,
 	    dst++;
 	}
     }
+
+    fbFinishAccess (pSrc->pDrawable);
+    fbFinishAccess (pDst->pDrawable);
 }
 
 void
@@ -519,6 +537,9 @@ fbCompositeSrc_8888x0888 (CARD8      op,
 	    dst += 3;
 	}
     }
+
+    fbFinishAccess (pSrc->pDrawable);
+    fbFinishAccess (pDst->pDrawable);
 }
 
 void
@@ -571,6 +592,9 @@ fbCompositeSrc_8888x0565 (CARD8      op,
 	    dst++;
 	}
     }
+
+    fbFinishAccess (pDst->pDrawable);
+    fbFinishAccess (pSrc->pDrawable);
 }
 
 void
@@ -607,6 +631,9 @@ fbCompositeSrc_0565x0565 (CARD8      op,
 	while (w--)
 	    *dst++ = *src++;
     }
+
+    fbFinishAccess (pDst->pDrawable);
+    fbFinishAccess (pSrc->pDrawable);
 }
 
 void
@@ -657,6 +684,9 @@ fbCompositeSrcAdd_8000x8000 (CARD8	op,
 	    dst++;
 	}
     }
+
+    fbFinishAccess (pDst->pDrawable);
+    fbFinishAccess (pSrc->pDrawable);
 }
 
 void
@@ -714,6 +744,9 @@ fbCompositeSrcAdd_8888x8888 (CARD8	op,
 	    dst++;
 	}
     }
+
+    fbFinishAccess (pDst->pDrawable);
+    fbFinishAccess (pSrc->pDrawable);
 }
 
 void
@@ -757,6 +790,9 @@ fbCompositeSrcAdd_1000x1000 (CARD8	op,
 
 	   FALSE,
 	   FALSE);
+
+    fbFinishAccess(pDst->pDrawable);
+    fbFinishAccess(pSrc->pDrawable);
 }
 
 void
@@ -821,6 +857,9 @@ fbCompositeSolidMask_nx1xn (CARD8      o
 	      src,
 	      FB_ALLONES,
 	      0x0);
+
+    fbFinishAccess (pDst->pDrawable);
+    fbFinishAccess (pMask->pDrawable);
 }
 
 # define mod(a,b)	((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))
diff --git a/fb/fbpict.h b/fb/fbpict.h
index 4ad0324..296cfbd 100644
--- a/fb/fbpict.h
+++ b/fb/fbpict.h
@@ -99,6 +99,7 @@
     /* manage missing src alpha */ \
     if ((pict)->pFormat->direct.alphaMask == 0) \
 	(bits) |= 0xff000000; \
+    fbFinishAccess ((pict)->pDrawable); \
 }
 
 #define fbComposeGetStart(pict,x,y,type,stride,line,mul) {\
diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c
index f79f701..3fe38ef 100644
--- a/fb/fbpixmap.c
+++ b/fb/fbpixmap.c
@@ -160,6 +160,8 @@ fbPixmapToRegion(PixmapPtr pPix)
     FirstRect = REGION_BOXPTR(pReg);
     rects = FirstRect;
 
+    fbPrepareAccess(pPix);
+
     pwLine = (FbBits *) pPix->devPrivate.ptr;
     nWidth = pPix->devKind >> (FB_SHIFT-3);
 
@@ -311,6 +313,8 @@ fbPixmapToRegion(PixmapPtr pPix)
 	    pReg->data = (RegDataPtr)NULL;
 	}
     }
+
+    fbFinishAccess(&pPix->drawable);
 #ifdef DEBUG
     if (!miValidRegion(pReg))
 	FatalError("Assertion failed file %s, line %d: expr\n", __FILE__, __LINE__);
@@ -362,6 +366,7 @@ fbValidateDrawable (DrawablePtr pDrawabl
     if (!fbValidateBits (first, stride, FB_HEAD_BITS) ||
 	!fbValidateBits (last, stride, FB_TAIL_BITS))
 	fbInitializeDrawable(pDrawable);
+    fbFinishAccess (pDrawable);
 }
 
 void
@@ -383,5 +388,6 @@ fbInitializeDrawable (DrawablePtr pDrawa
     last = bits + stride * pDrawable->height;
     fbSetBits (first, stride, FB_HEAD_BITS);
     fbSetBits (last, stride, FB_TAIL_BITS);
+    fbFinishAccess (pDrawable);
 }
 #endif /* FB_DEBUG */
diff --git a/fb/fbpoint.c b/fb/fbpoint.c
index 7154b53..4e2ff0c 100644
--- a/fb/fbpoint.c
+++ b/fb/fbpoint.c
@@ -160,4 +160,5 @@ fbPolyPoint (DrawablePtr    pDrawable,
 	 nBox--; pBox++)
 	(*dots) (dst, dstStride, dstBpp, pBox, pptInit, nptInit, 
 		 pDrawable->x, pDrawable->y, dstXoff, dstYoff, and, xor);
+    fbFinishAccess (pDrawable);
 }
diff --git a/fb/fbpseudocolor.c b/fb/fbpseudocolor.c
index 2233f95..170fcad 100644
--- a/fb/fbpseudocolor.c
+++ b/fb/fbpseudocolor.c
@@ -875,6 +875,8 @@ xxCopyPseudocolorRegion(ScreenPtr pScree
     register CARD16     *d;
     int w;
 
+    fbPrepareAccess((PixmapPtr)pScreen->devPrivate);
+
     dst_base = (CARD16*) ((PixmapPtr)pScreen->devPrivate)->devPrivate.ptr;
     dst_stride = (int)((PixmapPtr)pScreen->devPrivate)->devKind
 	/ sizeof (CARD16);
@@ -899,6 +901,8 @@ xxCopyPseudocolorRegion(ScreenPtr pScree
 	}
 	pbox++;
     }
+
+    fbFinishAccess(&((PixmapPtr)pScreen->devPrivate)->drawable);
 }
 
 static void
diff --git a/fb/fbpush.c b/fb/fbpush.c
index 0632766..282344d 100644
--- a/fb/fbpush.c
+++ b/fb/fbpush.c
@@ -165,6 +165,7 @@ fbPushFill (DrawablePtr	pDrawable,
 		      fbAnd(GXnoop,(FbBits) 0,FB_ALLONES),
 		      fbXor(GXnoop,(FbBits) 0,FB_ALLONES));
 	}
+	fbFinishAccess (pDrawable);
     }
     else
     {
diff --git a/fb/fbscreen.c b/fb/fbscreen.c
index b883758..045ca8f 100644
--- a/fb/fbscreen.c
+++ b/fb/fbscreen.c
@@ -155,6 +155,19 @@ fbSetupScreen(ScreenPtr	pScreen, 
     return TRUE;
 }
 
+#ifdef FB_ACCESS_WRAPPER
+Bool
+wfbFinishScreenInit(ScreenPtr		pScreen,
+		    pointer		pbits,
+		    int			xsize,
+		    int			ysize,
+		    int			dpix,
+		    int			dpiy,
+		    int			width,
+		    int			bpp,
+		    SetupWrapProcPtr	setupWrap,
+		    FinishWrapProcPtr	finishWrap)
+#else
 Bool
 fbFinishScreenInit(ScreenPtr	pScreen,
 		   pointer	pbits,
@@ -164,6 +177,7 @@ fbFinishScreenInit(ScreenPtr	pScreen,
 		   int		dpiy,
 		   int		width,
 		   int		bpp)
+#endif
 {
     VisualPtr	visuals;
     DepthPtr	depths;
@@ -222,6 +236,10 @@ fbFinishScreenInit(ScreenPtr	pScreen,
 	fbGetScreenPrivate(pScreen)->win32bpp = 32;
 	fbGetScreenPrivate(pScreen)->pix32bpp = 32;
     }
+#ifdef FB_ACCESS_WRAPPER
+    fbGetScreenPrivate(pScreen)->setupWrap = setupWrap;
+    fbGetScreenPrivate(pScreen)->finishWrap = finishWrap;
+#endif
 #endif
     rootdepth = 0;
     if (!fbInitVisuals (&visuals, &depths, &nvisuals, &ndepths, &rootdepth,
@@ -256,6 +274,27 @@ fbFinishScreenInit(ScreenPtr	pScreen,
 }
 
 /* dts * (inch/dot) * (25.4 mm / inch) = mm */
+#ifdef FB_ACCESS_WRAPPER
+Bool
+wfbScreenInit(ScreenPtr		pScreen,
+	      pointer		pbits,
+	      int		xsize,
+	      int		ysize,
+	      int		dpix,
+	      int		dpiy,
+	      int		width,
+	      int		bpp,
+	      SetupWrapProcPtr	setupWrap,
+	      FinishWrapProcPtr	finishWrap)
+{
+    if (!fbSetupScreen(pScreen, pbits, xsize, ysize, dpix, dpiy, width, bpp))
+	return FALSE;
+    if (!wfbFinishScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy,
+			     width, bpp, setupWrap, finishWrap))
+	return FALSE;
+    return TRUE;
+}
+#else
 Bool
 fbScreenInit(ScreenPtr	pScreen,
 	     pointer	pbits,
@@ -273,6 +312,7 @@ fbScreenInit(ScreenPtr	pScreen,
 	return FALSE;
     return TRUE;
 }
+#endif
 
 
 #ifdef FB_OLD_SCREEN
diff --git a/fb/fbseg.c b/fb/fbseg.c
index d66e424..a980c24 100644
--- a/fb/fbseg.c
+++ b/fb/fbseg.c
@@ -115,6 +115,8 @@ fbBresSolid (DrawablePtr    pDrawable,
 	    }
 	}
     }
+
+    fbFinishAccess (pDrawable);
 }
 
 void
@@ -199,6 +201,8 @@ fbBresDash (DrawablePtr	pDrawable,
 	}
 	FbDashStep (dashlen, even);
     }
+
+    fbFinishAccess (pDrawable);
 }
 
 void
@@ -399,6 +403,8 @@ fbBresSolid24RRop (DrawablePtr  pDrawabl
 	    }
 	}
     }
+
+    fbFinishAccess (pDrawable);
 }
 
 static void
@@ -498,6 +504,8 @@ fbBresDash24RRop (DrawablePtr	pDrawable,
 	}
 	FbDashStep (dashlen, even);
     }
+
+    fbFinishAccess (pDrawable);
 }
 #endif
 
diff --git a/fb/fbsetsp.c b/fb/fbsetsp.c
index c59c13c..0633256 100644
--- a/fb/fbsetsp.c
+++ b/fb/fbsetsp.c
@@ -99,5 +99,6 @@ fbSetSpans (DrawablePtr	    pDrawable,
 	pwidth++;
     }
     fbValidateDrawable (pDrawable);
+    fbFinishAccess (pDrawable);
 }
 	    
diff --git a/fb/fbtrap.c b/fb/fbtrap.c
index 8639695..4c67bcd 100644
--- a/fb/fbtrap.c
+++ b/fb/fbtrap.c
@@ -95,6 +95,8 @@ fbAddTraps (PicturePtr	pPicture,
 	}
 	traps++;
     }
+
+    fbFinishAccess (pPicture->pDrawable);
 }
 
 void
@@ -142,6 +144,8 @@ fbRasterizeTrapezoid (PicturePtr    pPic
 	
 	fbRasterizeEdges (buf, bpp, width, stride, &l, &r, t, b);
     }
+
+    fbFinishAccess (pPicture->pDrawable);
 }
 
 static int
diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index 968b5a6..cac662c 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -118,6 +118,9 @@ fbCopyWindowProc (DrawablePtr	pSrcDrawab
 	       upsidedown);
 	pbox++;
     }
+
+    fbFinishAccess (pDstDrawable);
+    fbFinishAccess (pSrcDrawable);
 }
 
 void 
@@ -249,6 +252,8 @@ fbFillRegionSolid (DrawablePtr	pDrawable
 	fbValidateDrawable (pDrawable);
 	pbox++;
     }
+
+    fbFinishAccess (pDrawable);
 }
 
 #ifdef PANORAMIX
@@ -311,6 +316,9 @@ fbFillRegionTiled (DrawablePtr	pDrawable
 		yRot - (pbox->y1 + dstYoff));
 	pbox++;
     }
+
+    fbFinishAccess (&pTile->drawable);
+    fbFinishAccess (pDrawable);
 }
 
 void
diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index 3c1bfde..7b7d81e 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -81,7 +81,6 @@
 #define fbFillRegionSolid wfbFillRegionSolid
 #define fbFillRegionTiled wfbFillRegionTiled
 #define fbFillSpans wfbFillSpans
-#define fbFinishScreenInit wfbFinishScreenInit
 #define fbFixCoordModePrevious wfbFixCoordModePrevious
 #define fbGCFuncs wfbGCFuncs
 #define fbGCOps wfbGCOps
@@ -160,7 +159,6 @@
 #define fbResolveColor wfbResolveColor
 #define fbRestoreAreas wfbRestoreAreas
 #define fbSaveAreas wfbSaveAreas
-#define fbScreenInit wfbScreenInit
 #define fbScreenPrivateIndex wfbScreenPrivateIndex
 #define fbSegment wfbSegment
 #define fbSelectBres wfbSelectBres
diff-tree 319efac445cebda5a2ac1db67efebe54bc47ba9d (from 7608a63ff7409f399c9a26962a304b84196a1868)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Fri Jul 7 18:45:30 2006 -0700

    Prefix all of the exported symbols in libwfb.so with "wfb".
    
    For now, just #define all of the exported symbols in wfbrename.h.  Later,
    we should add FBPREFIX() around the exported symbols and use -fvisiblity=hidden
    to hide the rest.

diff --git a/fb/Makefile.am b/fb/Makefile.am
index 251c168..9a56b93 100644
--- a/fb/Makefile.am
+++ b/fb/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = \
 AM_CFLAGS = $(DIX_CFLAGS)
 
 if XORG
-sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h
+sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h wfbrename.h
 endif
 
 if MMX_CAPABLE
diff --git a/fb/fb.h b/fb/fb.h
index 13d0121..9c777c1 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -45,6 +45,7 @@
 #endif
 
 #ifdef FB_ACCESS_WRAPPER
+#include "wfbrename.h"
 #define FBPREFIX(x) wfb##x
 #else
 #define FBPREFIX(x) fb##x
diff --git a/fb/wfbrename.h b/fb/wfbrename.h
new file mode 100644
index 0000000..3c1bfde
--- /dev/null
+++ b/fb/wfbrename.h
@@ -0,0 +1,189 @@
+#define fb16Lane wfb16Lane
+#define fb24_32CopyMtoN wfb24_32CopyMtoN
+#define fb24_32CreateScreenResources wfb24_32CreateScreenResources
+#define fb24_32GetImage wfb24_32GetImage
+#define fb24_32GetSpans wfb24_32GetSpans
+#define fb24_32ModifyPixmapHeader wfb24_32ModifyPixmapHeader
+#define fb24_32PutZImage wfb24_32PutZImage
+#define fb24_32ReformatTile wfb24_32ReformatTile
+#define fb24_32SetSpans wfb24_32SetSpans
+#define fb32Lane wfb32Lane
+#define fb8Lane wfb8Lane
+#define fbAddTraps wfbAddTraps
+#define fbAddTriangles wfbAddTriangles
+#define fbAllocatePrivates wfbAllocatePrivates
+#define fbArc16 wfbArc16
+#define fbArc24 wfbArc24
+#define fbArc32 wfbArc32
+#define fbArc8 wfbArc8
+#define fbBlt wfbBlt
+#define fbBlt24 wfbBlt24
+#define fbBltOne wfbBltOne
+#define fbBltOne24 wfbBltOne24
+#define fbBltPlane wfbBltPlane
+#define fbBltStip wfbBltStip
+#define fbBres wfbBres
+#define fbBresDash wfbBresDash
+#define fbBresDash16 wfbBresDash16
+#define fbBresDash24 wfbBresDash24
+#define fbBresDash32 wfbBresDash32
+#define fbBresDash8 wfbBresDash8
+#define fbBresFill wfbBresFill
+#define fbBresFillDash wfbBresFillDash
+#define fbBresSolid wfbBresSolid
+#define fbBresSolid16 wfbBresSolid16
+#define fbBresSolid24 wfbBresSolid24
+#define fbBresSolid32 wfbBresSolid32
+#define fbBresSolid8 wfbBresSolid8
+#define fbChangeWindowAttributes wfbChangeWindowAttributes
+#define fbClearVisualTypes wfbClearVisualTypes
+#define fbCloseScreen wfbCloseScreen
+#define fbComposite wfbComposite
+#define fbCompositeGeneral wfbCompositeGeneral
+#define fbCompositeSolidMask_nx1xn wfbCompositeSolidMask_nx1xn
+#define fbCompositeSolidMask_nx8888x0565C wfbCompositeSolidMask_nx8888x0565C
+#define fbCompositeSolidMask_nx8888x8888C wfbCompositeSolidMask_nx8888x8888C
+#define fbCompositeSolidMask_nx8x0565 wfbCompositeSolidMask_nx8x0565
+#define fbCompositeSolidMask_nx8x0888 wfbCompositeSolidMask_nx8x0888
+#define fbCompositeSolidMask_nx8x8888 wfbCompositeSolidMask_nx8x8888
+#define fbCompositeSrc_0565x0565 wfbCompositeSrc_0565x0565
+#define fbCompositeSrc_8888x0565 wfbCompositeSrc_8888x0565
+#define fbCompositeSrc_8888x0888 wfbCompositeSrc_8888x0888
+#define fbCompositeSrc_8888x8888 wfbCompositeSrc_8888x8888
+#define fbCompositeSrcAdd_1000x1000 wfbCompositeSrcAdd_1000x1000
+#define fbCompositeSrcAdd_8000x8000 wfbCompositeSrcAdd_8000x8000
+#define fbCompositeSrcAdd_8888x8888 wfbCompositeSrcAdd_8888x8888
+#define fbCopy1toN wfbCopy1toN
+#define fbCopyArea wfbCopyArea
+#define fbCopyNto1 wfbCopyNto1
+#define fbCopyNtoN wfbCopyNtoN
+#define fbCopyPlane wfbCopyPlane
+#define fbCopyRegion wfbCopyRegion
+#define fbCopyWindow wfbCopyWindow
+#define fbCopyWindowProc wfbCopyWindowProc
+#define fbCreateDefColormap wfbCreateDefColormap
+#define fbCreateGC wfbCreateGC
+#define fbCreatePixmap wfbCreatePixmap
+#define fbCreatePixmapBpp wfbCreatePixmapBpp
+#define fbCreateWindow wfbCreateWindow
+#define fbDestroyPixmap wfbDestroyPixmap
+#define fbDestroyWindow wfbDestroyWindow
+#define fbDoCopy wfbDoCopy
+#define fbDots wfbDots
+#define fbDots16 wfbDots16
+#define fbDots24 wfbDots24
+#define fbDots32 wfbDots32
+#define fbDots8 wfbDots8
+#define fbEvenStipple wfbEvenStipple
+#define fbEvenTile wfbEvenTile
+#define fbExpandDirectColors wfbExpandDirectColors
+#define fbFill wfbFill
+#define fbFillRegionSolid wfbFillRegionSolid
+#define fbFillRegionTiled wfbFillRegionTiled
+#define fbFillSpans wfbFillSpans
+#define fbFinishScreenInit wfbFinishScreenInit
+#define fbFixCoordModePrevious wfbFixCoordModePrevious
+#define fbGCFuncs wfbGCFuncs
+#define fbGCOps wfbGCOps
+#define fbGCPrivateIndex wfbGCPrivateIndex
+#define fbGeneration wfbGeneration
+#define fbGetGCPrivateIndex wfbGetGCPrivateIndex
+#define fbGetImage wfbGetImage
+#define fbGetScreenPrivateIndex wfbGetScreenPrivateIndex
+#define fbGetSpans wfbGetSpans
+#define _fbGetWindowPixmap _wfbGetWindowPixmap
+#define fbGetWinPrivateIndex wfbGetWinPrivateIndex
+#define fbGlyph16 wfbGlyph16
+#define fbGlyph24 wfbGlyph24
+#define fbGlyph32 wfbGlyph32
+#define fbGlyph8 wfbGlyph8
+#define fbGlyphIn wfbGlyphIn
+#define fbImageGlyphBlt wfbImageGlyphBlt
+#define fbIn wfbIn
+#define fbInitializeColormap wfbInitializeColormap
+#define fbInitVisuals wfbInitVisuals
+#define fbInstallColormap wfbInstallColormap
+#define fbLaneTable wfbLaneTable
+#define fbListInstalledColormaps wfbListInstalledColormaps
+#define fbMapWindow wfbMapWindow
+#define FbMergeRopBits wFbMergeRopBits
+#define fbOddStipple wfbOddStipple
+#define fbOddTile wfbOddTile
+#define fbOver wfbOver
+#define fbOver24 wfbOver24
+#define fbOverlayCloseScreen wfbOverlayCloseScreen
+#define fbOverlayCopyWindow wfbOverlayCopyWindow
+#define fbOverlayCreateScreenResources wfbOverlayCreateScreenResources
+#define fbOverlayCreateWindow wfbOverlayCreateWindow
+#define fbOverlayFinishScreenInit wfbOverlayFinishScreenInit
+#define fbOverlayGeneration wfbOverlayGeneration
+#define fbOverlayGetScreenPrivateIndex wfbOverlayGetScreenPrivateIndex
+#define fbOverlayPaintKey wfbOverlayPaintKey
+#define fbOverlayPaintWindow wfbOverlayPaintWindow
+#define fbOverlayScreenPrivateIndex wfbOverlayScreenPrivateIndex
+#define fbOverlaySetupScreen wfbOverlaySetupScreen
+#define fbOverlayUpdateLayerRegion wfbOverlayUpdateLayerRegion
+#define fbOverlayWindowExposures wfbOverlayWindowExposures
+#define fbOverlayWindowLayer wfbOverlayWindowLayer
+#define fbPadPixmap wfbPadPixmap
+#define fbPaintWindow wfbPaintWindow
+#define fbPictureInit wfbPictureInit
+#define fbPixmapToRegion wfbPixmapToRegion
+#define fbPolyArc wfbPolyArc
+#define fbPolyFillRect wfbPolyFillRect
+#define fbPolyGlyphBlt wfbPolyGlyphBlt
+#define fbPolyLine wfbPolyLine
+#define fbPolyline16 wfbPolyline16
+#define fbPolyline24 wfbPolyline24
+#define fbPolyline32 wfbPolyline32
+#define fbPolyline8 wfbPolyline8
+#define fbPolyPoint wfbPolyPoint
+#define fbPolySegment wfbPolySegment
+#define fbPolySegment16 wfbPolySegment16
+#define fbPolySegment24 wfbPolySegment24
+#define fbPolySegment32 wfbPolySegment32
+#define fbPolySegment8 wfbPolySegment8
+#define fbPositionWindow wfbPositionWindow
+#define fbPushFill wfbPushFill
+#define fbPushImage wfbPushImage
+#define fbPushPattern wfbPushPattern
+#define fbPushPixels wfbPushPixels
+#define fbPutImage wfbPutImage
+#define fbPutXYImage wfbPutXYImage
+#define fbPutZImage wfbPutZImage
+#define fbQueryBestSize wfbQueryBestSize
+#define fbRasterizeEdges wfbRasterizeEdges
+#define fbRasterizeTrapezoid wfbRasterizeTrapezoid
+#define fbRealizeFont wfbRealizeFont
+#define fbReduceRasterOp wfbReduceRasterOp
+#define fbReplicatePixel wfbReplicatePixel
+#define fbResolveColor wfbResolveColor
+#define fbRestoreAreas wfbRestoreAreas
+#define fbSaveAreas wfbSaveAreas
+#define fbScreenInit wfbScreenInit
+#define fbScreenPrivateIndex wfbScreenPrivateIndex
+#define fbSegment wfbSegment
+#define fbSelectBres wfbSelectBres
+#define fbSetSpans wfbSetSpans
+#define fbSetupScreen wfbSetupScreen
+#define fbSetVisualTypes wfbSetVisualTypes
+#define _fbSetWindowPixmap _wfbSetWindowPixmap
+#define fbSolid wfbSolid
+#define fbSolid24 wfbSolid24
+#define fbSolidBoxClipped wfbSolidBoxClipped
+#define fbStipple wfbStipple
+#define fbStipple1Bits wfbStipple1Bits
+#define fbStipple24Bits wfbStipple24Bits
+#define fbStipple2Bits wfbStipple2Bits
+#define fbStipple4Bits wfbStipple4Bits
+#define fbStipple8Bits wfbStipple8Bits
+#define fbStippleTable wfbStippleTable
+#define fbTile wfbTile
+#define fbTransparentSpan wfbTransparentSpan
+#define fbUninstallColormap wfbUninstallColormap
+#define fbUnmapWindow wfbUnmapWindow
+#define fbUnrealizeFont wfbUnrealizeFont
+#define fbValidateGC wfbValidateGC
+#define fbWinPrivateIndex wfbWinPrivateIndex
+#define fbZeroLine wfbZeroLine
+#define fbZeroSegment wfbZeroSegment
diff-tree 7608a63ff7409f399c9a26962a304b84196a1868 (from 39158e98acb29e97a2682d4a37385f9141b484c4)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Thu Jul 6 17:05:21 2006 -0700

    Build infrastructure for libwfb.so.
    
    Builds fb/* twice, defining FB_ACCESS_WRAPPER for libwfb.la.  Define a macro,
    FBPREFIX(X) which expands to fbX for libfb.la and wfbX for libwfb.la.  Use the
    macro on [w]fbModuleData so the new module loads.

diff --git a/fb/Makefile.am b/fb/Makefile.am
index 11b2d2f..251c168 100644
--- a/fb/Makefile.am
+++ b/fb/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libfb.la libfbmmx.la
+noinst_LTLIBRARIES = libfb.la libwfb.la libfbmmx.la
 
 INCLUDES = \
 	-I$(top_srcdir)/hw/xfree86/os-support \
@@ -11,7 +11,7 @@ sdk_HEADERS = fb.h fbrop.h fbpseudocolor
 endif
 
 if MMX_CAPABLE
-AM_CFLAGS += -DUSE_MMX
+libfb_la_CFLAGS = $(AM_CFLAGS) -DUSE_MMX
 
 libfbmmx_la_CFLAGS =				\
 	$(DIX_CFLAGS)				\
@@ -23,6 +23,8 @@ libfbmmx_la_CFLAGS =				\
         --param large-function-growth=10000
 endif
 
+libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
+
 libfbmmx_la_SOURCES =	\
 	fbmmx.c		\
 	fbmmx.h
@@ -70,6 +72,8 @@ libfb_la_SOURCES = 	\
 	fbedge.c	\
 	fbedgeimp.h
 
+libwfb_la_SOURCES = $(libfb_la_SOURCES)
+
 libfb_la_LIBADD = libfbmmx.la
 
 EXTRA_DIST = fbcmap.c
diff --git a/fb/fb.h b/fb/fb.h
index 3742cf0..13d0121 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -44,6 +44,12 @@
 #include "picture.h"
 #endif
 
+#ifdef FB_ACCESS_WRAPPER
+#define FBPREFIX(x) wfb##x
+#else
+#define FBPREFIX(x) fb##x
+#endif
+
 /*
  * This single define controls the basic size of data manipulated
  * by this software; it must be log2(sizeof (FbBits) * 8)
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index 65dad8a..54bc099 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -18,6 +18,7 @@ module_LTLIBRARIES = libafb.la \
                      libcfb.la \
                      libcfb32.la \
                      libfb.la \
+                     libwfb.la \
                      libmfb.la \
                      libshadow.la
 
@@ -66,6 +67,11 @@ libfb_la_LIBADD = $(top_builddir)/fb/lib
 libfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c
 libfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS)
 
+libwfb_la_LDFLAGS = -avoid-version
+libwfb_la_LIBADD = $(top_builddir)/fb/libwfb.la
+libwfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c
+libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
+
 libglx_la_LDFLAGS = -avoid-version
 if AIGLX
 GLXDRI_LIBRARY = $(top_builddir)/GL/glx/libglxdri.la
diff --git a/hw/xfree86/dixmods/fbmodule.c b/hw/xfree86/dixmods/fbmodule.c
index e8e6cd7..4df2646 100644
--- a/hw/xfree86/dixmods/fbmodule.c
+++ b/hw/xfree86/dixmods/fbmodule.c
@@ -33,7 +33,11 @@
 
 static XF86ModuleVersionInfo VersRec =
 {
+#ifdef FB_ACCESS_WRAPPER
+	"wfb",
+#else
 	"fb",
+#endif
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
@@ -45,4 +49,4 @@ static XF86ModuleVersionInfo VersRec =
 	{0,0,0,0}       /* signature, to be patched into the file by a tool */
 };
 
-_X_EXPORT XF86ModuleData fbModuleData = { &VersRec, NULL, NULL };
+_X_EXPORT XF86ModuleData FBPREFIX(ModuleData) = { &VersRec, NULL, NULL };



More information about the xorg-commit mailing list