xserver: Branch 'randr-1.2-for-server-1.2' - 12 commits

Keith Packard keithp at kemper.freedesktop.org
Wed Dec 13 08:58:21 EET 2006


 composite/compext.c                       |    5 
 configure.ac                              |    4 
 hw/xfree86/os-support/solaris/sun_kbdEv.c |   36 -
 hw/xfree86/scanpci/pci.ids                |   85 +++-
 hw/xfree86/scanpci/xf86PciStdIds.h        |  619 +++++++++++++++++++++++++++---
 hw/xwin/InitOutput.c                      |    1 
 hw/xwin/winmultiwindowwindow.c            |    7 
 randr/randr.c                             |    6 
 randr/randrstr.h                          |   12 
 randr/rrcrtc.c                            |    4 
 randr/rrinfo.c                            |    2 
 randr/rrmode.c                            |   23 +
 randr/rroutput.c                          |   20 
 13 files changed, 726 insertions(+), 98 deletions(-)

New commits:
diff-tree 98d18a6578130adb411ca4bcc776fcb7e07f189f (from 78689d0d6630afcbcd3ce5394d12c2564a489f45)
Author: Keith Packard <keithp at guitar.keithp.com>
Date:   Tue Dec 12 22:59:03 2006 -0800

    RandR: config time updates when hardware config changes.
    
    The config time in the RandR protocol reflects when the hardware state has
    changed. It was getting changed anytime the driver changed the usage
    of the hardware as well.

diff --git a/randr/randr.c b/randr/randr.c
index 147df8c..1470035 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -415,7 +415,11 @@ RRTellChanged (ScreenPtr pScreen)
     if (pScrPriv->changed)
     {
 	UpdateCurrentTime ();
-	pScrPriv->lastConfigTime = currentTime;
+	if (pScrPriv->configChanged)
+	{
+	    pScrPriv->lastConfigTime = currentTime;
+	    pScrPriv->configChanged = FALSE;
+	}
 	pScrPriv->changed = FALSE;
 	WalkTree (pScreen, TellChanged, (pointer) pScreen);
 	for (i = 0; i < pScrPriv->numOutputs; i++)
diff --git a/randr/randrstr.h b/randr/randrstr.h
index 27ede92..88f7588 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -216,11 +216,14 @@ typedef struct _rrScrPriv {
     TimeStamp		    lastSetTime;	/* last changed by client */
     TimeStamp		    lastConfigTime;	/* possible configs changed */
     RRCloseScreenProcPtr    CloseScreen;
+
     Bool		    changed;		/* some config changed */
+    Bool		    configChanged;	/* configuration changed */
+    Bool		    layoutChanged;	/* screen layout changed */
+
     CARD16		    minWidth, minHeight;
     CARD16		    maxWidth, maxHeight;
     CARD16		    width, height;	/* last known screen size */
-    Bool		    layoutChanged;	/* screen layout changed */
 
     int			    numOutputs;
     RROutputPtr		    *outputs;
@@ -619,10 +622,13 @@ ProcRRDeleteOutputMode (ClientPtr client
 /* rroutput.c */
 
 /*
- * Notify the output of some change
+ * Notify the output of some change. configChanged indicates whether
+ * any external configuration (mode list, clones, connected status)
+ * has changed, or whether the change was strictly internal
+ * (which crtc is in use)
  */
 void
-RROutputChanged (RROutputPtr output);
+RROutputChanged (RROutputPtr output, Bool configChanged);
 
 /*
  * Create an output
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index e8a7b79..5100bda 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -136,7 +136,7 @@ RRCrtcNotify (RRCrtcPtr	    crtc,
 		break;
 	if (j == crtc->numOutputs)
 	{
-	    RROutputChanged (outputs[i]);
+	    RROutputChanged (outputs[i], FALSE);
 	    RRCrtcChanged (crtc, FALSE);
 	}
     }
@@ -151,7 +151,7 @@ RRCrtcNotify (RRCrtcPtr	    crtc,
 		break;
 	if (i == numOutputs)
 	{
-	    RROutputChanged (crtc->outputs[j]);
+	    RROutputChanged (crtc->outputs[j], FALSE);
 	    RRCrtcChanged (crtc, FALSE);
 	}
     }
diff --git a/randr/rrinfo.c b/randr/rrinfo.c
index 244b089..85426f6 100644
--- a/randr/rrinfo.c
+++ b/randr/rrinfo.c
@@ -69,6 +69,7 @@ RROldModeAdd (RROutputPtr output, RRScre
     output->modes = modes;
     output->changed = TRUE;
     pScrPriv->changed = TRUE;
+    pScrPriv->configChanged = TRUE;
     return mode;
 }
 
@@ -205,6 +206,7 @@ RRGetInfo (ScreenPtr pScreen)
     
     rotations = 0;
     pScrPriv->changed = FALSE;
+    pScrPriv->configChanged = FALSE;
     
     if (!(*pScrPriv->rrGetInfo) (pScreen, &rotations))
 	return FALSE;
diff --git a/randr/rroutput.c b/randr/rroutput.c
index 430f8bd..8007a8a 100644
--- a/randr/rroutput.c
+++ b/randr/rroutput.c
@@ -28,7 +28,7 @@ RESTYPE	RROutputType;
  * Notify the output of some change
  */
 void
-RROutputChanged (RROutputPtr output)
+RROutputChanged (RROutputPtr output, Bool configChanged)
 {
     ScreenPtr	pScreen = output->pScreen;
     
@@ -37,6 +37,8 @@ RROutputChanged (RROutputPtr output)
     {
 	rrScrPriv (pScreen);
 	pScrPriv->changed = TRUE;
+	if (configChanged)
+	    pScrPriv->configChanged = TRUE;
     }
 }
 
@@ -106,7 +108,7 @@ RROutputAttachScreen (RROutputPtr output
     output->pScreen = pScreen;
     pScrPriv->outputs = outputs;
     pScrPriv->outputs[pScrPriv->numOutputs++] = output;
-    RROutputChanged (output);
+    RROutputChanged (output, FALSE);
     return TRUE;
 }
 		      
@@ -142,7 +144,7 @@ RROutputSetClones (RROutputPtr  output,
     memcpy (newClones, clones, numClones * sizeof (RROutputPtr));
     output->clones = newClones;
     output->numClones = numClones;
-    RROutputChanged (output);
+    RROutputChanged (output, TRUE);
     return TRUE;
 }
 
@@ -186,7 +188,7 @@ RROutputSetModes (RROutputPtr	output,
     output->modes = newModes;
     output->numModes = numModes;
     output->numPreferred = numPreferred;
-    RROutputChanged (output);
+    RROutputChanged (output, TRUE);
     return TRUE;
 }
 
@@ -219,7 +221,7 @@ RROutputSetCrtcs (RROutputPtr	output,
     memcpy (newCrtcs, crtcs, numCrtcs * sizeof (RRCrtcPtr));
     output->crtcs = newCrtcs;
     output->numCrtcs = numCrtcs;
-    RROutputChanged (output);
+    RROutputChanged (output, TRUE);
     return TRUE;
 }
 
@@ -229,7 +231,7 @@ RROutputSetCrtc (RROutputPtr output, RRC
     if (output->crtc == crtc)
 	return;
     output->crtc = crtc;
-    RROutputChanged (output);
+    RROutputChanged (output, FALSE);
 }
 
 Bool
@@ -239,7 +241,7 @@ RROutputSetConnection (RROutputPtr  outp
     if (output->connection == connection)
 	return TRUE;
     output->connection = connection;
-    RROutputChanged (output);
+    RROutputChanged (output, TRUE);
     return TRUE;
 }
 
@@ -251,7 +253,7 @@ RROutputSetSubpixelOrder (RROutputPtr ou
 	return TRUE;
 
     output->subpixelOrder = subpixelOrder;
-    RROutputChanged (output);
+    RROutputChanged (output, FALSE);
     return TRUE;
 }
 
@@ -264,7 +266,7 @@ RROutputSetPhysicalSize (RROutputPtr	out
 	return TRUE;
     output->mmWidth = mmWidth;
     output->mmHeight = mmHeight;
-    RROutputChanged (output);
+    RROutputChanged (output, FALSE);
     return TRUE;
 }
 
diff-tree 78689d0d6630afcbcd3ce5394d12c2564a489f45 (from 12c9714ba7dc01bb845b299ec9213e8c2e98e3e6)
Author: Keith Packard <keithp at guitar.keithp.com>
Date:   Tue Dec 12 20:16:49 2006 -0800

    RandR mode list needs both output and crtc modes.
    
    When an output no longer reports the current mode, it must still be included
    in the list advertised by the X server. Walk the crtcs to ensure it is
    included.

diff --git a/randr/rrmode.c b/randr/rrmode.c
index a0696e1..261e1b7 100644
--- a/randr/rrmode.c
+++ b/randr/rrmode.c
@@ -108,12 +108,15 @@ RRModePtr *
 RRModesForScreen (ScreenPtr pScreen, int *num_ret)
 {
     rrScrPriv(pScreen);
-    int	o;
+    int	o, c;
     RRModePtr	*screen_modes;
     int		num_screen_modes = 0;
 
     screen_modes = xalloc ((num_modes ? num_modes : 1) * sizeof (RRModePtr));
     
+    /*
+     * Add modes from all outputs
+     */
     for (o = 0; o < pScrPriv->numOutputs; o++)
     {
 	RROutputPtr	output = pScrPriv->outputs[o];
@@ -129,6 +132,24 @@ RRModesForScreen (ScreenPtr pScreen, int
 		screen_modes[num_screen_modes++] = mode;
 	}
     }
+    /*
+     * Add modes from all crtcs. The goal is to
+     * make sure all available and active modes
+     * are visible to the client
+     */
+    for (c = 0; c < pScrPriv->numCrtcs; c++)
+    {
+	RRCrtcPtr	crtc = pScrPriv->crtcs[c];
+	RRModePtr	mode = crtc->mode;
+	int		n;
+
+	if (!mode) continue;
+	for (n = 0; n < num_screen_modes; n++)
+	    if (screen_modes[n] == mode)
+		break;
+	if (n == num_screen_modes)
+	    screen_modes[num_screen_modes++] = mode;
+    }
     *num_ret = num_screen_modes;
     return screen_modes;
 }
diff-tree 12c9714ba7dc01bb845b299ec9213e8c2e98e3e6 (from parents)
Merge: 66b6358a393972946f16394918db2401c51dc5ed 8049eeea994ad88273b3e62199237f41b22b48df
Author: Keith Packard <keithp at guitar.keithp.com>
Date:   Tue Dec 12 09:22:14 2006 -0800

    Merge branch 'server-1.2-branch' into randr-1.2-for-server-1.2

diff-tree 8049eeea994ad88273b3e62199237f41b22b48df (from f604d0b69a61d3c4d9b7c815686f1947f23d1a5c)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Tue Dec 12 11:28:24 2006 +0000

    Fix bad commit
    (cherry picked from 81281cb298a5825bc7a2e692375a86199293bbbe commit)

diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 9964980..39a5eda 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -694,7 +694,7 @@ winFixupPaths (void)
         if (sizeof(xkbbasedir) > 0)
             xkbbasedir[sizeof(xkbbasedir)-1] = 0;
         XkbBaseDirectory = xkbbasedir;
-	XkbBinDirectory = xkbbasedir
+	XkbBinDirectory = basedir;
     }
 #endif /* XKB */
 #endif /* RELOCATE_PROJECTROOT */
diff-tree f604d0b69a61d3c4d9b7c815686f1947f23d1a5c (from 1587946f875f75f5324b35d0fc3f79a6e375bf7d)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Mon Dec 11 14:54:49 2006 +0000

    Fix Xming fails to use xkb bug
    bug #5049 (Colin Harrison)
    (cherry picked from 792e0f71c6a435b2e28f8a4cdcc790f3b982e62c commit)

diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index b64eee9..9964980 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -694,6 +694,7 @@ winFixupPaths (void)
         if (sizeof(xkbbasedir) > 0)
             xkbbasedir[sizeof(xkbbasedir)-1] = 0;
         XkbBaseDirectory = xkbbasedir;
+	XkbBinDirectory = xkbbasedir
     }
 #endif /* XKB */
 #endif /* RELOCATE_PROJECTROOT */
diff-tree 1587946f875f75f5324b35d0fc3f79a6e375bf7d (from a092419fe7a9f3c5602842d1aa98fa3c4089f058)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Mon Dec 11 14:50:08 2006 +0000

    Fix Tooltip from minimized clients
    
    Bug #3678 (Colin Harrison)
    (cherry picked from 27d4b84f268ac21601f7f52a7e257f70753396b3 commit)

diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index dc8e38b..037c881 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -982,11 +982,10 @@ winAdjustXWindow (WindowPtr pWin, HWND h
       /*
        * If the Windows window is minimized, its WindowRect has
        * meaningless values so we don't adjust X window to it.
-       * Instead we put the X window to the bottom in Z order to
-       * be obscured by other windows.
        */
-      vlist[0] = Below;
-      return ConfigureWindow (pWin, CWStackMode, vlist, wClient(pWin));
+      vlist[0] = 0;
+      vlist[1] = 0;
+      return ConfigureWindow (pWin, CWX | CWY, vlist, wClient(pWin));
     }
   
   pDraw = &pWin->drawable;
diff-tree a092419fe7a9f3c5602842d1aa98fa3c4089f058 (from d1e8b7c4a4dcbeefbe93fe0de0270593a8d80b94)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Tue Dec 5 13:44:05 2006 -0800

    Bug #9219: Use pWin->viewable instead of pWin->realized to catch InputOnly windows too.
    (cherry picked from 724f9cb578086e8483a2d0636dd6eb05d664d31c commit)

diff --git a/composite/compext.c b/composite/compext.c
index ec5e1fa..13936fa 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -270,7 +270,7 @@ ProcCompositeNameWindowPixmap (ClientPtr
 	return BadWindow;
     }
 
-    if (!pWin->realized)
+    if (!pWin->viewable)
 	return BadMatch;
 
     LEGAL_NEW_RESOURCE (stuff->pixmap, client);
diff-tree d1e8b7c4a4dcbeefbe93fe0de0270593a8d80b94 (from 2cba9a4f1caf32a2ee41fd8811e8e0e802610985)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Tue Dec 5 12:42:12 2006 -0800

    Bug #9219: Return BadMatch when trying to name the backing pixmap of an unrealized window.
    
    Before this change, ProcCompositeNameWindowPixmap would name the screen pixmap
    if !pWin->realized.
    (cherry picked from 3690de9b1b0902d395bc7d071fc05ebc8f75be2b commit)

diff --git a/composite/compext.c b/composite/compext.c
index a7ad4e2..ec5e1fa 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -269,7 +269,10 @@ ProcCompositeNameWindowPixmap (ClientPtr
 	client->errorValue = stuff->window;
 	return BadWindow;
     }
-    
+
+    if (!pWin->realized)
+	return BadMatch;
+
     LEGAL_NEW_RESOURCE (stuff->pixmap, client);
     
     cw = GetCompWindow (pWin);
diff-tree 2cba9a4f1caf32a2ee41fd8811e8e0e802610985 (from 77df81245394417121ef429af429b63f2eeef3d9)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Wed Dec 6 07:58:03 2006 -0800

    Update pci.ids to 2006-12-06 from pciids.sf.net
    (cherry picked from abe5e079af715713097ab0daad29a3e9f523c398 commit)

diff --git a/hw/xfree86/scanpci/pci.ids b/hw/xfree86/scanpci/pci.ids
index c6f5653..d48e25c 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 Tue 2006-10-03 01:05:01
+#	Daily snapshot on Wed 2006-12-06 02:05:02
 #
 
 # Vendors, devices and subsystems. Please keep sorted.
@@ -3012,20 +3012,22 @@
 	2200  QLA2200 64-bit Fibre Channel Adapter
 		1077 0002  QLA2200
 	2300  QLA2300 64-bit Fibre Channel Adapter
-	2312  QLA2312 Fibre Channel Adapter
+	2312  ISP2312-based 2Gb Fibre Channel to PCI-X HBA
 		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
+	2322  ISP2322-based 2Gb Fibre Channel to PCI-X HBA
+	2422  ISP2422-based 4Gb Fibre Channel to PCI-X HBA
 		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
-	4010  QLA4010 iSCSI TOE Adapter
-	4022  QLA4022 iSCSI TOE Adapter
-	6312  QLA6312 Fibre Channel Adapter
-	6322  QLA6322 Fibre Channel Adapter
+	2432  ISP2432-based 4Gb Fibre Channel to PCI Express HBA
+	3022  ISP4022-based Ethernet NIC
+	3032  ISP4032-based Ethernet NIC
+	4010  ISP4010-based iSCSI TOE HBA
+	4022  ISP4022-based iSCSI TOE HBA
+	4032  ISP4032-based iSCSI TOE IPv6 HBA
+	5432  SP232-based 4Gb Fibre Channel to PCI Express HBA
+	6312  SP202-based 2Gb Fibre Channel to PCI-X HBA
+	6322  SP212-based 2Gb Fibre Channel to PCI-X HBA
 1078  Cyrix Corporation
 	0000  5510 [Grappa]
 	0001  PCI Master
@@ -10565,7 +10567,9 @@
 		16be 1040  V.9X DSP Data Fax Modem
 	1043  PRO/Wireless LAN 2100 3B Mini PCI Adapter
 		103c 08b0  tc1100 tablet
+		8086 2522  Samsung P30 integrated WLAN
 		8086 2527  MIM2000/Centrino
+		8086 2581  Toshiba Satellite M10
 	1048  PRO/10GbE LR Server Adapter
 		8086 a01f  PRO/10GbE LR Server Adapter
 		8086 a11f  PRO/10GbE LR Server Adapter
@@ -10583,6 +10587,10 @@
 	1051  82801EB/ER (ICH5/ICH5R) integrated LAN Controller
 	1052  PRO/100 VM Network Connection
 	1053  PRO/100 VM Network Connection
+	1054  PRO/100 VE Network Connection
+	1055  PRO/100 VM Network Connection
+	1056  PRO/100 VE Network Connection
+	1057  PRO/100 VE Network Connection
 	1059  82551QM Ethernet Controller
 	105b  82546GB Gigabit Ethernet Controller (Copper)
 	105e  82571EB Gigabit Ethernet Controller
@@ -10673,19 +10681,30 @@
 	108c  82573E Gigabit Ethernet Controller (Copper)
 	108e  82573E KCS (Active Management)
 	108f  Active Management Technology - SOL
+	1091  PRO/100 VM Network Connection
 	1092  PRO/100 VE Network Connection
+	1093  PRO/100 VM Network Connection
+	1094  PRO/100 VE Network Connection
+	1095  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
+		1179 ff10  PRO/1000 PL
 		17aa 2001  ThinkPad T60
 		17aa 207e  Thinkpad X60s
 		8086 109a  PRO/1000 PL Network Connection
 	109b  82546GB PRO/1000 GF Quad Port Server Adapter
+	109e  82597EX 10GbE Ethernet Controller
+		8086 a01f  PRO/10GbE CX4 Server Adapter
+		8086 a11f  PRO/10GbE CX4 Server Adapter
 	10a0  82571EB PRO/1000 AT Quad Port Bypass Adapter
 	10a1  82571EB PRO/1000 AF Quad Port Bypass Adapter
+	10a4  82571EB Gigabit Ethernet Controller
+		8086 10a4  PRO/1000 PT Quad Port Server Adapter
+		8086 11a4  PRO/1000 PT Quad Port Server Adapter
 	10b0  82573L PRO/1000 PL Network Connection
 	10b2  82573V PRO/1000 PM Network Connection
 	10b3  82573E PRO/1000 PM Network Connection
@@ -10699,6 +10718,11 @@
 		8086 1093  PRO/1000 PT Desktop Adapter
 	10ba  80003ES2LAN Gigabit Ethernet Controller (Copper)
 	10bb  80003ES2LAN Gigabit Ethernet Controller (Serdes)
+	10bc  82571EB Gigabit Ethernet Controller (Copper)
+		8086 10bc  PRO/1000 PT Quad Port LP Server Adapter
+		8086 11bc  PRO/1000 PT Quad Port LP Server Adapter
+	10c4  82562GT 10/100 Network Connection
+	10c5  82562G 10/100 Network Connection
 	1107  PRO/1000 MF Server Adapter (LX)
 	1130  82815 815 Chipset Host Bridge and Memory Controller Hub
 		1025 1016  Travelmate 612 TX
@@ -10946,6 +10970,9 @@
 	1a31  82845 845 (Brookdale) Chipset AGP Bridge
 	1a38  5000 Series Chipset DMA Engine
 	1a48  PRO/10GbE SR Server Adapter
+	1b48  82597EX 10GbE Ethernet Controller
+		8086 a01f  PRO/10GbE LR Server Adapter
+		8086 a11f  PRO/10GbE LR Server Adapter
 	2410  82801AA ISA Bridge (LPC)
 	2411  82801AA IDE
 	2412  82801AA USB
@@ -10998,6 +11025,7 @@
 		147b 0507  TH7II-RAID
 		8086 4532  D815EEA2 mainboard
 	2445  82801BA/BAM AC'97 Audio
+		0e11 000b  Compaq Deskpro EN Audio
 		0e11 0088  Evo D500
 		1014 01c6  Netvista A40/A40p
 		1025 1016  Travelmate 612 TX
@@ -11010,6 +11038,7 @@
 		104d 80df  Vaio PCG-FX403
 	2448  82801 Mobile PCI Bridge
 		103c 099c  NX6110/NC6120
+		144d c00c  P30 notebook
 		1734 1055  Amilo M1420
 	2449  82801BA/BAM/CA/CAM Ethernet Controller
 		0e11 0012  EtherExpress PRO/100 VM
@@ -11129,6 +11158,7 @@
 		103c 0890  NC6000 laptop
 		103c 08b0  tc1100 tablet
 		1071 8160  MIM2000
+		144d c00c  P30 notebook
 		1462 5800  845PE Max (MS-6580)
 		1509 2990  Averatec 5110H laptop
 		1734 1004  D1451 Mainboard (SCENIC N300, i845GV)
@@ -11160,6 +11190,7 @@
 		103c 0890  NC6000 laptop
 		103c 08b0  tc1100 tablet
 		1071 8160  MIM2000
+		144d c00c  P30 notebook
 		1462 5800  845PE Max (MS-6580)
 		1509 2990  Averatec 5110H
 		1734 1004  D1451 Mainboard (SCENIC N300, i845GV)
@@ -11177,6 +11208,7 @@
 		103c 0890  NC6000 laptop
 		103c 08b0  tc1100 tablet
 		1071 8160  MIM2000
+		144d c00c  P30 notebook
 		1458 a002  GA-8PE667 Ultra
 		1462 5800  845PE Max (MS-6580)
 		1734 1005  D1451 (SCENIC N300, i845GV) Sigmatel STAC9750T
@@ -11190,6 +11222,7 @@
 		103c 0890  NC6000 laptop
 		103c 08b0  tc1100 tablet
 		1071 8160  MIM2000
+		144d c00c  P30 notebook
 	24c7  82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #3
 		1014 0267  NetVista A30p
 		1014 052d  Thinkpad R50e model 1634
@@ -11201,6 +11234,7 @@
 		103c 0890  NC6000 laptop
 		103c 08b0  tc1100 tablet
 		1071 8160  MIM2000
+		144d c00c  P30 notebook
 		1462 5800  845PE Max (MS-6580)
 		1509 2990  Averatec 5110H
 		1734 1004  D1451 Mainboard (SCENIC N300, i845GV)
@@ -11215,6 +11249,7 @@
 		103c 0890  NC6000 laptop
 		103c 08b0  tc1100 tablet
 		1071 8160  MIM2000
+		144d c00c  P30 notebook
 		1734 1055  Amilo M1420
 		8086 4541  Latitude D400
 	24cb  82801DB (ICH4) IDE Controller
@@ -11225,6 +11260,7 @@
 		1734 1004  D1451 Mainboard (SCENIC N300, i845GV)
 		4c53 1090  Cx9 / Vx9 mainboard
 	24cc  82801DBM (ICH4-M) LPC Interface Bridge
+		144d c00c  P30 notebook
 		1734 1055  Amilo M1420
 	24cd  82801DB/DBM (ICH4/ICH4-M) USB2 EHCI Controller
 		1014 0267  NetVista A30p
@@ -11240,6 +11276,7 @@
 		103c 08b0  tc1100 tablet
 		1071 8160  MIM2000
 		1179 ff00  Satellite 2430
+		144d c00c  P30 notebook
 		1462 3981  845PE Max (MS-6580)
 		1509 1968  Averatec 5110H
 		1734 1004  D1451 Mainboard (SCENIC N300, i845GV)
@@ -11278,6 +11315,7 @@
 		1014 02ed  xSeries server mainboard
 		1028 0156  Precision 360
 		1028 0169  Precision 470
+		103c 12bc  d330 uT
 		1043 80a6  P4P800 Mainboard
 		1458 24d2  GA-8IPE1000 Pro2 motherboard (865PE)
 		1462 7280  865PE Neo2 (MS-6728)
@@ -11304,6 +11342,7 @@
 		8086 4c43  Desktop Board D865GLC
 		8086 524c  D865PERL mainboard
 	24d5  82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller
+		100a 147b  Abit IS7-E motherboard
 		1028 0169  Precision 470
 		103c 006a  NX9500
 		103c 12bc  d330 uT
@@ -11427,6 +11466,7 @@
 		1734 1004  D1451 Mainboard (SCENIC N300, i845GV)
 	2570  82865G/PE/P DRAM Controller/Host-Hub Interface
 		103c 006a  NX9500
+		103c 12bc  d330 uT
 		1043 80f2  P5P800-MX Mainboard
 		1458 2570  GA-8IPE1000 Pro2 motherboard (865PE)
 	2571  82865G/PE/P PCI to AGP Controller
@@ -11533,7 +11573,7 @@
 	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
+	25f0  5000 Series Chipset FSB Registers
 	25f1  5000 Series Chipset Reserved Registers
 	25f3  5000 Series Chipset Reserved Registers
 	25f5  5000 Series Chipset FBD Registers
@@ -11554,7 +11594,7 @@
 	2609  E8500/E8501 PCI Express x8 Port B
 	260a  E8500/E8501 PCI Express x8 Port A
 	260c  E8500/E8501 IMI Registers
-	2610  E8500/E8501 Front Side Bus, Boot, and Interrupt Registers
+	2610  E8500/E8501 FSB Registers
 	2611  E8500/E8501 Address Mapping Registers
 	2612  E8500/E8501 RAS Registers
 	2613  E8500/E8501 Reserved Registers
@@ -11713,6 +11753,7 @@
 		107b 5048  E4500
 		8086 544e  DeskTop Board D945GTP
 	27b9  82801GBM (ICH7-M) LPC Interface Bridge
+		10f7 8338  Panasonic CF-Y5 laptop
 		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
@@ -11749,9 +11790,12 @@
 	27d6  82801G (ICH7 Family) PCI Express Port 4
 	27d8  82801G (ICH7 Family) High Definition Audio Controller
 		107b 5048  E4500
+		10f7 8338  Panasonic CF-Y5 laptop
+		1179 ff31  Toshiba America Information Systems:AC97 Data Fax SoftModem with SmartCP
 		152d 0753  Softmodem
 		17aa 2010  ThinkPad T60/R60 series
 	27da  82801G (ICH7 Family) SMBus Controller
+		10f7 8338  Panasonic CF-Y5 laptop
 		17aa 200f  ThinkPad T60/R60 series
 		8086 544e  DeskTop Board D945GTP
 	27dc  82801G (ICH7 Family) LAN Controller
@@ -11760,6 +11804,7 @@
 	27de  82801G (ICH7 Family) AC'97 Audio Controller
 	27df  82801G (ICH7 Family) IDE Controller
 		107b 5048  E4500
+		10f7 8338  Panasonic CF-Y5 laptop
 		17aa 200c  Thinkpad R60e model 0657
 		8086 544e  DeskTop Board D945GTP
 	27e0  82801GR/GH/GHM (ICH7 Family) PCI Express Port 5
@@ -11770,21 +11815,28 @@
 	2814  82801HO (ICH8DO) LPC Interface Controller
 	2815  Mobile LPC Interface Controller
 	2820  82801H (ICH8 Family) 4 port SATA IDE Controller
-	2821  82801HB (ICH8) SATA AHCI Controller
+		1462 7235  P965 Neo MS-7235 mainboard
+	2821  82801HR/HO/HH (ICH8R/DO/DH) 6 port SATA AHCI Controller
 	2822  82801HR/HO/HH (ICH8R/DO/DH) SATA RAID Controller
-	2824  82801HR/HO/HH (ICH8R/DO/DH) SATA AHCI Controller
+	2824  82801HB (ICH8) 4 port SATA AHCI Controller
 	2825  82801H (ICH8 Family) 2 port SATA IDE Controller
+		1462 7235  P965 Neo MS-7235 mainboard
 	2828  Mobile SATA IDE Controller
 	2829  Mobile SATA AHCI Controller
 	282a  Mobile SATA RAID Controller
 	2830  82801H (ICH8 Family) USB UHCI #1
+		1462 7235  P965 Neo MS-7235 mainboard
 	2831  82801H (ICH8 Family) USB UHCI #2
+		1462 7235  P965 Neo MS-7235 mainboard
 	2832  82801H (ICH8 Family) USB UHCI #3
 	2834  82801H (ICH8 Family) USB UHCI #4
+		1462 7235  P965 Neo MS-7235 mainboard
 	2835  82801H (ICH8 Family) USB UHCI #5
 	2836  82801H (ICH8 Family) USB2 EHCI #1
+		1462 7235  P965 Neo MS-7235 mainboard
 	283a  82801H (ICH8 Family) USB2 EHCI #2
 	283e  82801H (ICH8 Family) SMBus Controller
+		1462 7235  P965 Neo MS-7235 mainboard
 	283f  82801H (ICH8 Family) PCI Express Port 1
 	2841  82801H (ICH8 Family) PCI Express Port 2
 	2843  82801H (ICH8 Family) PCI Express Port 3
@@ -11831,12 +11883,15 @@
 	2a07  Mobile KT Controller
 	3092  Integrated RAID
 	3200  GD31244 PCI-X SATA HBA
+		1775 c200  C2K onboard SATA host bus adapter
 	3340  82855PM Processor to I/O Controller
 		1025 005a  TravelMate 290
 		103c 088c  NC8000 laptop
 		103c 0890  NC6000 laptop
 		103c 08b0  tc1100 tablet
+		144d c00c  P30 notebook
 	3341  82855PM Processor to AGP Controller
+		144d c00c  P30 notebook
 	3500  6311ESB/6321ESB PCI Express Upstream Port
 	3501  6310ESB PCI Express Upstream Port
 	3504  6311ESB/6321ESB I/OxAPIC Interrupt Controller
diff --git a/hw/xfree86/scanpci/xf86PciStdIds.h b/hw/xfree86/scanpci/xf86PciStdIds.h
index d86d686..0cf8d4e 100644
--- a/hw/xfree86/scanpci/xf86PciStdIds.h
+++ b/hw/xfree86/scanpci/xf86PciStdIds.h
@@ -5712,7 +5712,7 @@ static const char pci_device_1077_2200[]
 static const char pci_subsys_1077_2200_1077_0002[] = "QLA2200";
 #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";
+static const char pci_device_1077_2312[] = "ISP2312-based 2Gb Fibre Channel to PCI-X HBA";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1077_2312_103c_0131[] = "2Gb Fibre Channel - Single port [A7538A]";
@@ -5723,8 +5723,8 @@ static const char pci_subsys_1077_2312_1
 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";
+static const char pci_device_1077_2322[] = "ISP2322-based 2Gb Fibre Channel to PCI-X HBA";
+static const char pci_device_1077_2422[] = "ISP2422-based 4Gb Fibre Channel to PCI-X HBA";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1077_2422_103c_12d7[] = "4Gb Fibre Channel [AB379A]";
@@ -5735,13 +5735,15 @@ static const char pci_subsys_1077_2422_1
 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";
-static const char pci_device_1077_4010[] = "QLA4010 iSCSI TOE Adapter";
-static const char pci_device_1077_4022[] = "QLA4022 iSCSI TOE Adapter";
-static const char pci_device_1077_6312[] = "QLA6312 Fibre Channel Adapter";
-static const char pci_device_1077_6322[] = "QLA6322 Fibre Channel Adapter";
+static const char pci_device_1077_2432[] = "ISP2432-based 4Gb Fibre Channel to PCI Express HBA";
+static const char pci_device_1077_3022[] = "ISP4022-based Ethernet NIC";
+static const char pci_device_1077_3032[] = "ISP4032-based Ethernet NIC";
+static const char pci_device_1077_4010[] = "ISP4010-based iSCSI TOE HBA";
+static const char pci_device_1077_4022[] = "ISP4022-based iSCSI TOE HBA";
+static const char pci_device_1077_4032[] = "ISP4032-based iSCSI TOE IPv6 HBA";
+static const char pci_device_1077_5432[] = "SP232-based 4Gb Fibre Channel to PCI Express HBA";
+static const char pci_device_1077_6312[] = "SP202-based 2Gb Fibre Channel to PCI-X HBA";
+static const char pci_device_1077_6322[] = "SP212-based 2Gb Fibre Channel to PCI-X HBA";
 #endif
 static const char pci_vendor_1078[] = "Cyrix Corporation";
 static const char pci_device_1078_0000[] = "5510 [Grappa]";
@@ -20449,10 +20451,8 @@ static const char pci_device_19e7_1003[]
 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
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1a08[] = "Sierra semiconductor";
 static const char pci_device_1a08_0000[] = "SC15064";
@@ -21670,8 +21670,14 @@ static const char pci_device_8086_1043[]
 static const char pci_subsys_8086_1043_103c_08b0[] = "tc1100 tablet";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1043_8086_2522[] = "Samsung P30 integrated WLAN";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1043_8086_2527[] = "MIM2000/Centrino";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1043_8086_2581[] = "Toshiba Satellite M10";
+#endif
 static const char pci_device_8086_1048[] = "PRO/10GbE LR Server Adapter";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1048_8086_a01f[] = "PRO/10GbE LR Server Adapter";
@@ -21703,6 +21709,10 @@ static const char pci_subsys_8086_1050_8
 static const char pci_device_8086_1051[] = "82801EB/ER (ICH5/ICH5R) integrated LAN Controller";
 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_1054[] = "PRO/100 VE Network Connection";
+static const char pci_device_8086_1055[] = "PRO/100 VM Network Connection";
+static const char pci_device_8086_1056[] = "PRO/100 VE Network Connection";
+static const char pci_device_8086_1057[] = "PRO/100 VE 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";
@@ -21897,7 +21907,11 @@ static const char pci_device_8086_108b[]
 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[] = "Active Management Technology - SOL";
+static const char pci_device_8086_1091[] = "PRO/100 VM Network Connection";
 static const char pci_device_8086_1092[] = "PRO/100 VE Network Connection";
+static const char pci_device_8086_1093[] = "PRO/100 VM Network Connection";
+static const char pci_device_8086_1094[] = "PRO/100 VE Network Connection";
+static const char pci_device_8086_1095[] = "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)";
@@ -21907,6 +21921,9 @@ static const char pci_subsys_8086_1099_8
 #endif
 static const char pci_device_8086_109a[] = "82573L Gigabit Ethernet Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_109a_1179_ff10[] = "PRO/1000 PL";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_109a_17aa_2001[] = "ThinkPad T60";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -21916,8 +21933,22 @@ static const char pci_subsys_8086_109a_1
 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_109e[] = "82597EX 10GbE Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_109e_8086_a01f[] = "PRO/10GbE CX4 Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_109e_8086_a11f[] = "PRO/10GbE CX4 Server Adapter";
+#endif
 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";
+static const char pci_device_8086_10a4[] = "82571EB Gigabit Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_10a4_8086_10a4[] = "PRO/1000 PT Quad Port Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_10a4_8086_11a4[] = "PRO/1000 PT Quad Port Server Adapter";
+#endif
 static const char pci_device_8086_10b0[] = "82573L PRO/1000 PL Network Connection";
 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";
@@ -21941,6 +21972,15 @@ static const char pci_subsys_8086_10b9_8
 #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_10bc[] = "82571EB Gigabit Ethernet Controller (Copper)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_10bc_8086_10bc[] = "PRO/1000 PT Quad Port LP Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_10bc_8086_11bc[] = "PRO/1000 PT Quad Port LP Server Adapter";
+#endif
+static const char pci_device_8086_10c4[] = "82562GT 10/100 Network Connection";
+static const char pci_device_8086_10c5[] = "82562G 10/100 Network Connection";
 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
@@ -22587,6 +22627,13 @@ static const char pci_subsys_8086_1a30_1
 static const char pci_device_8086_1a31[] = "82845 845 (Brookdale) Chipset AGP Bridge";
 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_1b48[] = "82597EX 10GbE Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1b48_8086_a01f[] = "PRO/10GbE LR Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1b48_8086_a11f[] = "PRO/10GbE LR Server Adapter";
+#endif
 static const char pci_device_8086_2410[] = "82801AA ISA Bridge (LPC)";
 static const char pci_device_8086_2411[] = "82801AA IDE";
 static const char pci_device_8086_2412[] = "82801AA USB";
@@ -22706,6 +22753,9 @@ static const char pci_subsys_8086_2444_8
 #endif
 static const char pci_device_8086_2445[] = "82801BA/BAM AC'97 Audio";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2445_0e11_000b[] = "Compaq Deskpro EN Audio";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2445_0e11_0088[] = "Evo D500";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -22738,6 +22788,9 @@ static const char pci_device_8086_2448[]
 static const char pci_subsys_8086_2448_103c_099c[] = "NX6110/NC6120";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2448_144d_c00c[] = "P30 notebook";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2448_1734_1055[] = "Amilo M1420";
 #endif
 static const char pci_device_8086_2449[] = "82801BA/BAM/CA/CAM Ethernet Controller";
@@ -23045,6 +23098,9 @@ static const char pci_subsys_8086_24c2_1
 static const char pci_subsys_8086_24c2_1071_8160[] = "MIM2000";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c2_144d_c00c[] = "P30 notebook";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c2_1462_5800[] = "845PE Max (MS-6580)";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23134,6 +23190,9 @@ static const char pci_subsys_8086_24c4_1
 static const char pci_subsys_8086_24c4_1071_8160[] = "MIM2000";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c4_144d_c00c[] = "P30 notebook";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c4_1462_5800[] = "845PE Max (MS-6580)";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23183,6 +23242,9 @@ static const char pci_subsys_8086_24c5_1
 static const char pci_subsys_8086_24c5_1071_8160[] = "MIM2000";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c5_144d_c00c[] = "P30 notebook";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c5_1458_a002[] = "GA-8PE667 Ultra";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23219,6 +23281,9 @@ static const char pci_subsys_8086_24c6_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c6_1071_8160[] = "MIM2000";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c6_144d_c00c[] = "P30 notebook";
+#endif
 static const char pci_device_8086_24c7[] = "82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #3";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c7_1014_0267[] = "NetVista A30p";
@@ -23251,6 +23316,9 @@ static const char pci_subsys_8086_24c7_1
 static const char pci_subsys_8086_24c7_1071_8160[] = "MIM2000";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c7_144d_c00c[] = "P30 notebook";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c7_1462_5800[] = "845PE Max (MS-6580)";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23291,6 +23359,9 @@ static const char pci_subsys_8086_24ca_1
 static const char pci_subsys_8086_24ca_1071_8160[] = "MIM2000";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24ca_144d_c00c[] = "P30 notebook";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24ca_1734_1055[] = "Amilo M1420";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23317,6 +23388,9 @@ static const char pci_subsys_8086_24cb_4
 #endif
 static const char pci_device_8086_24cc[] = "82801DBM (ICH4-M) LPC Interface Bridge";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24cc_144d_c00c[] = "P30 notebook";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24cc_1734_1055[] = "Amilo M1420";
 #endif
 static const char pci_device_8086_24cd[] = "82801DB/DBM (ICH4/ICH4-M) USB2 EHCI Controller";
@@ -23360,6 +23434,9 @@ static const char pci_subsys_8086_24cd_1
 static const char pci_subsys_8086_24cd_1179_ff00[] = "Satellite 2430";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24cd_144d_c00c[] = "P30 notebook";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24cd_1462_3981[] = "845PE Max (MS-6580)";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23466,6 +23543,9 @@ static const char pci_subsys_8086_24d3_1
 static const char pci_subsys_8086_24d3_1028_0169[] = "Precision 470";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d3_103c_12bc[] = "d330 uT";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24d3_1043_80a6[] = "P4P800 Mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23540,6 +23620,9 @@ static const char pci_subsys_8086_24d4_8
 #endif
 static const char pci_device_8086_24d5[] = "82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d5_100a_147b[] = "Abit IS7-E motherboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24d5_1028_0169[] = "Precision 470";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -23835,6 +23918,9 @@ static const char pci_device_8086_2570[]
 static const char pci_subsys_8086_2570_103c_006a[] = "NX9500";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2570_103c_12bc[] = "d330 uT";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2570_1043_80f2[] = "P5P800-MX Mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -24068,7 +24154,7 @@ static const char pci_device_8086_25e4[]
 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_25f0[] = "5000 Series Chipset FSB 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";
@@ -24089,7 +24175,7 @@ static const char pci_device_8086_2608[]
 static const char pci_device_8086_2609[] = "E8500/E8501 PCI Express x8 Port B";
 static const char pci_device_8086_260a[] = "E8500/E8501 PCI Express x8 Port A";
 static const char pci_device_8086_260c[] = "E8500/E8501 IMI Registers";
-static const char pci_device_8086_2610[] = "E8500/E8501 Front Side Bus, Boot, and Interrupt Registers";
+static const char pci_device_8086_2610[] = "E8500/E8501 FSB Registers";
 static const char pci_device_8086_2611[] = "E8500/E8501 Address Mapping Registers";
 static const char pci_device_8086_2612[] = "E8500/E8501 RAS Registers";
 static const char pci_device_8086_2613[] = "E8500/E8501 Reserved Registers";
@@ -24400,6 +24486,9 @@ static const char pci_subsys_8086_27b8_8
 #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_10f7_8338[] = "Panasonic CF-Y5 laptop";
+#endif
+#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";
@@ -24474,6 +24563,12 @@ static const char pci_device_8086_27d8[]
 static const char pci_subsys_8086_27d8_107b_5048[] = "E4500";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27d8_10f7_8338[] = "Panasonic CF-Y5 laptop";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27d8_1179_ff31[] = "Toshiba America Information Systems:AC97 Data Fax SoftModem with SmartCP";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_27d8_152d_0753[] = "Softmodem";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -24481,6 +24576,9 @@ static const char pci_subsys_8086_27d8_1
 #endif
 static const char pci_device_8086_27da[] = "82801G (ICH7 Family) SMBus Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27da_10f7_8338[] = "Panasonic CF-Y5 laptop";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_27da_17aa_200f[] = "ThinkPad T60/R60 series";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -24497,6 +24595,9 @@ static const char pci_device_8086_27df[]
 static const char pci_subsys_8086_27df_107b_5048[] = "E4500";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_27df_10f7_8338[] = "Panasonic CF-Y5 laptop";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_27df_17aa_200c[] = "Thinkpad R60e model 0657";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -24510,21 +24611,42 @@ static const char pci_device_8086_2812[]
 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[] = "82801H (ICH8 Family) 4 port SATA IDE Controller";
-static const char pci_device_8086_2821[] = "82801HB (ICH8) SATA AHCI Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2820_1462_7235[] = "P965 Neo MS-7235 mainboard";
+#endif
+static const char pci_device_8086_2821[] = "82801HR/HO/HH (ICH8R/DO/DH) 6 port 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_2824[] = "82801HB (ICH8) 4 port SATA AHCI Controller";
 static const char pci_device_8086_2825[] = "82801H (ICH8 Family) 2 port SATA IDE Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2825_1462_7235[] = "P965 Neo MS-7235 mainboard";
+#endif
 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";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2830_1462_7235[] = "P965 Neo MS-7235 mainboard";
+#endif
 static const char pci_device_8086_2831[] = "82801H (ICH8 Family) USB UHCI #2";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2831_1462_7235[] = "P965 Neo MS-7235 mainboard";
+#endif
 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";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2834_1462_7235[] = "P965 Neo MS-7235 mainboard";
+#endif
 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";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2836_1462_7235[] = "P965 Neo MS-7235 mainboard";
+#endif
 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";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_283e_1462_7235[] = "P965 Neo MS-7235 mainboard";
+#endif
 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";
@@ -24571,6 +24693,9 @@ static const char pci_device_8086_2a06[]
 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";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_3200_1775_c200[] = "C2K onboard SATA host bus adapter";
+#endif
 static const char pci_device_8086_3340[] = "82855PM Processor to I/O Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_3340_1025_005a[] = "TravelMate 290";
@@ -24584,7 +24709,13 @@ static const char pci_subsys_8086_3340_1
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_3340_103c_08b0[] = "tc1100 tablet";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_3340_144d_c00c[] = "P30 notebook";
+#endif
 static const char pci_device_8086_3341[] = "82855PM Processor to AGP Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_3341_144d_c00c[] = "P30 notebook";
+#endif
 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";
@@ -40853,10 +40984,18 @@ static const pciSubsystemInfo pci_ss_inf
 	{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_2522 =
+	{0x8086, 0x2522, pci_subsys_8086_1043_8086_2522, 0};
+#undef pci_ss_info_8086_2522
+#define pci_ss_info_8086_2522 pci_ss_info_8086_1043_8086_2522
 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
 #define pci_ss_info_8086_2527 pci_ss_info_8086_1043_8086_2527
+static const pciSubsystemInfo pci_ss_info_8086_1043_8086_2581 =
+	{0x8086, 0x2581, pci_subsys_8086_1043_8086_2581, 0};
+#undef pci_ss_info_8086_2581
+#define pci_ss_info_8086_2581 pci_ss_info_8086_1043_8086_2581
 static const pciSubsystemInfo pci_ss_info_8086_1048_8086_a01f =
 	{0x8086, 0xa01f, pci_subsys_8086_1048_8086_a01f, 0};
 #undef pci_ss_info_8086_a01f
@@ -41097,6 +41236,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{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_1179_ff10 =
+	{0x1179, 0xff10, pci_subsys_8086_109a_1179_ff10, 0};
+#undef pci_ss_info_1179_ff10
+#define pci_ss_info_1179_ff10 pci_ss_info_8086_109a_1179_ff10
 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
@@ -41109,6 +41252,22 @@ static const pciSubsystemInfo pci_ss_inf
 	{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_109e_8086_a01f =
+	{0x8086, 0xa01f, pci_subsys_8086_109e_8086_a01f, 0};
+#undef pci_ss_info_8086_a01f
+#define pci_ss_info_8086_a01f pci_ss_info_8086_109e_8086_a01f
+static const pciSubsystemInfo pci_ss_info_8086_109e_8086_a11f =
+	{0x8086, 0xa11f, pci_subsys_8086_109e_8086_a11f, 0};
+#undef pci_ss_info_8086_a11f
+#define pci_ss_info_8086_a11f pci_ss_info_8086_109e_8086_a11f
+static const pciSubsystemInfo pci_ss_info_8086_10a4_8086_10a4 =
+	{0x8086, 0x10a4, pci_subsys_8086_10a4_8086_10a4, 0};
+#undef pci_ss_info_8086_10a4
+#define pci_ss_info_8086_10a4 pci_ss_info_8086_10a4_8086_10a4
+static const pciSubsystemInfo pci_ss_info_8086_10a4_8086_11a4 =
+	{0x8086, 0x11a4, pci_subsys_8086_10a4_8086_11a4, 0};
+#undef pci_ss_info_8086_11a4
+#define pci_ss_info_8086_11a4 pci_ss_info_8086_10a4_8086_11a4
 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
@@ -41129,6 +41288,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{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_10bc_8086_10bc =
+	{0x8086, 0x10bc, pci_subsys_8086_10bc_8086_10bc, 0};
+#undef pci_ss_info_8086_10bc
+#define pci_ss_info_8086_10bc pci_ss_info_8086_10bc_8086_10bc
+static const pciSubsystemInfo pci_ss_info_8086_10bc_8086_11bc =
+	{0x8086, 0x11bc, pci_subsys_8086_10bc_8086_11bc, 0};
+#undef pci_ss_info_8086_11bc
+#define pci_ss_info_8086_11bc pci_ss_info_8086_10bc_8086_11bc
 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
@@ -41929,6 +42096,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1028, 0x010e, pci_subsys_8086_1a30_1028_010e, 0};
 #undef pci_ss_info_1028_010e
 #define pci_ss_info_1028_010e pci_ss_info_8086_1a30_1028_010e
+static const pciSubsystemInfo pci_ss_info_8086_1b48_8086_a01f =
+	{0x8086, 0xa01f, pci_subsys_8086_1b48_8086_a01f, 0};
+#undef pci_ss_info_8086_a01f
+#define pci_ss_info_8086_a01f pci_ss_info_8086_1b48_8086_a01f
+static const pciSubsystemInfo pci_ss_info_8086_1b48_8086_a11f =
+	{0x8086, 0xa11f, pci_subsys_8086_1b48_8086_a11f, 0};
+#undef pci_ss_info_8086_a11f
+#define pci_ss_info_8086_a11f pci_ss_info_8086_1b48_8086_a11f
 static const pciSubsystemInfo pci_ss_info_8086_2415_1028_0095 =
 	{0x1028, 0x0095, pci_subsys_8086_2415_1028_0095, 0};
 #undef pci_ss_info_1028_0095
@@ -42061,6 +42236,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x4532, pci_subsys_8086_2444_8086_4532, 0};
 #undef pci_ss_info_8086_4532
 #define pci_ss_info_8086_4532 pci_ss_info_8086_2444_8086_4532
+static const pciSubsystemInfo pci_ss_info_8086_2445_0e11_000b =
+	{0x0e11, 0x000b, pci_subsys_8086_2445_0e11_000b, 0};
+#undef pci_ss_info_0e11_000b
+#define pci_ss_info_0e11_000b pci_ss_info_8086_2445_0e11_000b
 static const pciSubsystemInfo pci_ss_info_8086_2445_0e11_0088 =
 	{0x0e11, 0x0088, pci_subsys_8086_2445_0e11_0088, 0};
 #undef pci_ss_info_0e11_0088
@@ -42101,6 +42280,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x103c, 0x099c, pci_subsys_8086_2448_103c_099c, 0};
 #undef pci_ss_info_103c_099c
 #define pci_ss_info_103c_099c pci_ss_info_8086_2448_103c_099c
+static const pciSubsystemInfo pci_ss_info_8086_2448_144d_c00c =
+	{0x144d, 0xc00c, pci_subsys_8086_2448_144d_c00c, 0};
+#undef pci_ss_info_144d_c00c
+#define pci_ss_info_144d_c00c pci_ss_info_8086_2448_144d_c00c
 static const pciSubsystemInfo pci_ss_info_8086_2448_1734_1055 =
 	{0x1734, 0x1055, pci_subsys_8086_2448_1734_1055, 0};
 #undef pci_ss_info_1734_1055
@@ -42477,6 +42660,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1071, 0x8160, pci_subsys_8086_24c2_1071_8160, 0};
 #undef pci_ss_info_1071_8160
 #define pci_ss_info_1071_8160 pci_ss_info_8086_24c2_1071_8160
+static const pciSubsystemInfo pci_ss_info_8086_24c2_144d_c00c =
+	{0x144d, 0xc00c, pci_subsys_8086_24c2_144d_c00c, 0};
+#undef pci_ss_info_144d_c00c
+#define pci_ss_info_144d_c00c pci_ss_info_8086_24c2_144d_c00c
 static const pciSubsystemInfo pci_ss_info_8086_24c2_1462_5800 =
 	{0x1462, 0x5800, pci_subsys_8086_24c2_1462_5800, 0};
 #undef pci_ss_info_1462_5800
@@ -42593,6 +42780,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1071, 0x8160, pci_subsys_8086_24c4_1071_8160, 0};
 #undef pci_ss_info_1071_8160
 #define pci_ss_info_1071_8160 pci_ss_info_8086_24c4_1071_8160
+static const pciSubsystemInfo pci_ss_info_8086_24c4_144d_c00c =
+	{0x144d, 0xc00c, pci_subsys_8086_24c4_144d_c00c, 0};
+#undef pci_ss_info_144d_c00c
+#define pci_ss_info_144d_c00c pci_ss_info_8086_24c4_144d_c00c
 static const pciSubsystemInfo pci_ss_info_8086_24c4_1462_5800 =
 	{0x1462, 0x5800, pci_subsys_8086_24c4_1462_5800, 0};
 #undef pci_ss_info_1462_5800
@@ -42657,6 +42848,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1071, 0x8160, pci_subsys_8086_24c5_1071_8160, 0};
 #undef pci_ss_info_1071_8160
 #define pci_ss_info_1071_8160 pci_ss_info_8086_24c5_1071_8160
+static const pciSubsystemInfo pci_ss_info_8086_24c5_144d_c00c =
+	{0x144d, 0xc00c, pci_subsys_8086_24c5_144d_c00c, 0};
+#undef pci_ss_info_144d_c00c
+#define pci_ss_info_144d_c00c pci_ss_info_8086_24c5_144d_c00c
 static const pciSubsystemInfo pci_ss_info_8086_24c5_1458_a002 =
 	{0x1458, 0xa002, pci_subsys_8086_24c5_1458_a002, 0};
 #undef pci_ss_info_1458_a002
@@ -42705,6 +42900,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1071, 0x8160, pci_subsys_8086_24c6_1071_8160, 0};
 #undef pci_ss_info_1071_8160
 #define pci_ss_info_1071_8160 pci_ss_info_8086_24c6_1071_8160
+static const pciSubsystemInfo pci_ss_info_8086_24c6_144d_c00c =
+	{0x144d, 0xc00c, pci_subsys_8086_24c6_144d_c00c, 0};
+#undef pci_ss_info_144d_c00c
+#define pci_ss_info_144d_c00c pci_ss_info_8086_24c6_144d_c00c
 static const pciSubsystemInfo pci_ss_info_8086_24c7_1014_0267 =
 	{0x1014, 0x0267, pci_subsys_8086_24c7_1014_0267, 0};
 #undef pci_ss_info_1014_0267
@@ -42745,6 +42944,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1071, 0x8160, pci_subsys_8086_24c7_1071_8160, 0};
 #undef pci_ss_info_1071_8160
 #define pci_ss_info_1071_8160 pci_ss_info_8086_24c7_1071_8160
+static const pciSubsystemInfo pci_ss_info_8086_24c7_144d_c00c =
+	{0x144d, 0xc00c, pci_subsys_8086_24c7_144d_c00c, 0};
+#undef pci_ss_info_144d_c00c
+#define pci_ss_info_144d_c00c pci_ss_info_8086_24c7_144d_c00c
 static const pciSubsystemInfo pci_ss_info_8086_24c7_1462_5800 =
 	{0x1462, 0x5800, pci_subsys_8086_24c7_1462_5800, 0};
 #undef pci_ss_info_1462_5800
@@ -42797,6 +43000,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1071, 0x8160, pci_subsys_8086_24ca_1071_8160, 0};
 #undef pci_ss_info_1071_8160
 #define pci_ss_info_1071_8160 pci_ss_info_8086_24ca_1071_8160
+static const pciSubsystemInfo pci_ss_info_8086_24ca_144d_c00c =
+	{0x144d, 0xc00c, pci_subsys_8086_24ca_144d_c00c, 0};
+#undef pci_ss_info_144d_c00c
+#define pci_ss_info_144d_c00c pci_ss_info_8086_24ca_144d_c00c
 static const pciSubsystemInfo pci_ss_info_8086_24ca_1734_1055 =
 	{0x1734, 0x1055, pci_subsys_8086_24ca_1734_1055, 0};
 #undef pci_ss_info_1734_1055
@@ -42829,6 +43036,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x4c53, 0x1090, pci_subsys_8086_24cb_4c53_1090, 0};
 #undef pci_ss_info_4c53_1090
 #define pci_ss_info_4c53_1090 pci_ss_info_8086_24cb_4c53_1090
+static const pciSubsystemInfo pci_ss_info_8086_24cc_144d_c00c =
+	{0x144d, 0xc00c, pci_subsys_8086_24cc_144d_c00c, 0};
+#undef pci_ss_info_144d_c00c
+#define pci_ss_info_144d_c00c pci_ss_info_8086_24cc_144d_c00c
 static const pciSubsystemInfo pci_ss_info_8086_24cc_1734_1055 =
 	{0x1734, 0x1055, pci_subsys_8086_24cc_1734_1055, 0};
 #undef pci_ss_info_1734_1055
@@ -42885,6 +43096,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{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_144d_c00c =
+	{0x144d, 0xc00c, pci_subsys_8086_24cd_144d_c00c, 0};
+#undef pci_ss_info_144d_c00c
+#define pci_ss_info_144d_c00c pci_ss_info_8086_24cd_144d_c00c
 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
@@ -43021,6 +43236,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x1028, 0x0169, pci_subsys_8086_24d3_1028_0169, 0};
 #undef pci_ss_info_1028_0169
 #define pci_ss_info_1028_0169 pci_ss_info_8086_24d3_1028_0169
+static const pciSubsystemInfo pci_ss_info_8086_24d3_103c_12bc =
+	{0x103c, 0x12bc, pci_subsys_8086_24d3_103c_12bc, 0};
+#undef pci_ss_info_103c_12bc
+#define pci_ss_info_103c_12bc pci_ss_info_8086_24d3_103c_12bc
 static const pciSubsystemInfo pci_ss_info_8086_24d3_1043_80a6 =
 	{0x1043, 0x80a6, pci_subsys_8086_24d3_1043_80a6, 0};
 #undef pci_ss_info_1043_80a6
@@ -43117,6 +43336,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x524c, pci_subsys_8086_24d4_8086_524c, 0};
 #undef pci_ss_info_8086_524c
 #define pci_ss_info_8086_524c pci_ss_info_8086_24d4_8086_524c
+static const pciSubsystemInfo pci_ss_info_8086_24d5_100a_147b =
+	{0x100a, 0x147b, pci_subsys_8086_24d5_100a_147b, 0};
+#undef pci_ss_info_100a_147b
+#define pci_ss_info_100a_147b pci_ss_info_8086_24d5_100a_147b
 static const pciSubsystemInfo pci_ss_info_8086_24d5_1028_0169 =
 	{0x1028, 0x0169, pci_subsys_8086_24d5_1028_0169, 0};
 #undef pci_ss_info_1028_0169
@@ -43461,6 +43684,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x103c, 0x006a, pci_subsys_8086_2570_103c_006a, 0};
 #undef pci_ss_info_103c_006a
 #define pci_ss_info_103c_006a pci_ss_info_8086_2570_103c_006a
+static const pciSubsystemInfo pci_ss_info_8086_2570_103c_12bc =
+	{0x103c, 0x12bc, pci_subsys_8086_2570_103c_12bc, 0};
+#undef pci_ss_info_103c_12bc
+#define pci_ss_info_103c_12bc pci_ss_info_8086_2570_103c_12bc
 static const pciSubsystemInfo pci_ss_info_8086_2570_1043_80f2 =
 	{0x1043, 0x80f2, pci_subsys_8086_2570_1043_80f2, 0};
 #undef pci_ss_info_1043_80f2
@@ -44021,6 +44248,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{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_10f7_8338 =
+	{0x10f7, 0x8338, pci_subsys_8086_27b9_10f7_8338, 0};
+#undef pci_ss_info_10f7_8338
+#define pci_ss_info_10f7_8338 pci_ss_info_8086_27b9_10f7_8338
 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
@@ -44097,6 +44328,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{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_10f7_8338 =
+	{0x10f7, 0x8338, pci_subsys_8086_27d8_10f7_8338, 0};
+#undef pci_ss_info_10f7_8338
+#define pci_ss_info_10f7_8338 pci_ss_info_8086_27d8_10f7_8338
+static const pciSubsystemInfo pci_ss_info_8086_27d8_1179_ff31 =
+	{0x1179, 0xff31, pci_subsys_8086_27d8_1179_ff31, 0};
+#undef pci_ss_info_1179_ff31
+#define pci_ss_info_1179_ff31 pci_ss_info_8086_27d8_1179_ff31
 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
@@ -44105,6 +44344,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{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_10f7_8338 =
+	{0x10f7, 0x8338, pci_subsys_8086_27da_10f7_8338, 0};
+#undef pci_ss_info_10f7_8338
+#define pci_ss_info_10f7_8338 pci_ss_info_8086_27da_10f7_8338
 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
@@ -44121,6 +44364,10 @@ static const pciSubsystemInfo pci_ss_inf
 	{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_10f7_8338 =
+	{0x10f7, 0x8338, pci_subsys_8086_27df_10f7_8338, 0};
+#undef pci_ss_info_10f7_8338
+#define pci_ss_info_10f7_8338 pci_ss_info_8086_27df_10f7_8338
 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
@@ -44129,6 +44376,38 @@ static const pciSubsystemInfo pci_ss_inf
 	{0x8086, 0x544e, pci_subsys_8086_27df_8086_544e, 0};
 #undef pci_ss_info_8086_544e
 #define pci_ss_info_8086_544e pci_ss_info_8086_27df_8086_544e
+static const pciSubsystemInfo pci_ss_info_8086_2820_1462_7235 =
+	{0x1462, 0x7235, pci_subsys_8086_2820_1462_7235, 0};
+#undef pci_ss_info_1462_7235
+#define pci_ss_info_1462_7235 pci_ss_info_8086_2820_1462_7235
+static const pciSubsystemInfo pci_ss_info_8086_2825_1462_7235 =
+	{0x1462, 0x7235, pci_subsys_8086_2825_1462_7235, 0};
+#undef pci_ss_info_1462_7235
+#define pci_ss_info_1462_7235 pci_ss_info_8086_2825_1462_7235
+static const pciSubsystemInfo pci_ss_info_8086_2830_1462_7235 =
+	{0x1462, 0x7235, pci_subsys_8086_2830_1462_7235, 0};
+#undef pci_ss_info_1462_7235
+#define pci_ss_info_1462_7235 pci_ss_info_8086_2830_1462_7235
+static const pciSubsystemInfo pci_ss_info_8086_2831_1462_7235 =
+	{0x1462, 0x7235, pci_subsys_8086_2831_1462_7235, 0};
+#undef pci_ss_info_1462_7235
+#define pci_ss_info_1462_7235 pci_ss_info_8086_2831_1462_7235
+static const pciSubsystemInfo pci_ss_info_8086_2834_1462_7235 =
+	{0x1462, 0x7235, pci_subsys_8086_2834_1462_7235, 0};
+#undef pci_ss_info_1462_7235
+#define pci_ss_info_1462_7235 pci_ss_info_8086_2834_1462_7235
+static const pciSubsystemInfo pci_ss_info_8086_2836_1462_7235 =
+	{0x1462, 0x7235, pci_subsys_8086_2836_1462_7235, 0};
+#undef pci_ss_info_1462_7235
+#define pci_ss_info_1462_7235 pci_ss_info_8086_2836_1462_7235
+static const pciSubsystemInfo pci_ss_info_8086_283e_1462_7235 =
+	{0x1462, 0x7235, pci_subsys_8086_283e_1462_7235, 0};
+#undef pci_ss_info_1462_7235
+#define pci_ss_info_1462_7235 pci_ss_info_8086_283e_1462_7235
+static const pciSubsystemInfo pci_ss_info_8086_3200_1775_c200 =
+	{0x1775, 0xc200, pci_subsys_8086_3200_1775_c200, 0};
+#undef pci_ss_info_1775_c200
+#define pci_ss_info_1775_c200 pci_ss_info_8086_3200_1775_c200
 static const pciSubsystemInfo pci_ss_info_8086_3340_1025_005a =
 	{0x1025, 0x005a, pci_subsys_8086_3340_1025_005a, 0};
 #undef pci_ss_info_1025_005a
@@ -44145,6 +44424,14 @@ static const pciSubsystemInfo pci_ss_inf
 	{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_3340_144d_c00c =
+	{0x144d, 0xc00c, pci_subsys_8086_3340_144d_c00c, 0};
+#undef pci_ss_info_144d_c00c
+#define pci_ss_info_144d_c00c pci_ss_info_8086_3340_144d_c00c
+static const pciSubsystemInfo pci_ss_info_8086_3341_144d_c00c =
+	{0x144d, 0xc00c, pci_subsys_8086_3341_144d_c00c, 0};
+#undef pci_ss_info_144d_c00c
+#define pci_ss_info_144d_c00c pci_ss_info_8086_3341_144d_c00c
 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
@@ -48590,10 +48877,12 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 #define pci_ss_list_1077_2432 NULL
-#define pci_ss_list_1077_3010 NULL
 #define pci_ss_list_1077_3022 NULL
+#define pci_ss_list_1077_3032 NULL
 #define pci_ss_list_1077_4010 NULL
 #define pci_ss_list_1077_4022 NULL
+#define pci_ss_list_1077_4032 NULL
+#define pci_ss_list_1077_5432 NULL
 #define pci_ss_list_1077_6312 NULL
 #define pci_ss_list_1077_6322 NULL
 #endif
@@ -55730,7 +56019,9 @@ static const pciSubsystemInfo *pci_ss_li
 };
 static const pciSubsystemInfo *pci_ss_list_8086_1043[] = {
 	&pci_ss_info_8086_1043_103c_08b0,
+	&pci_ss_info_8086_1043_8086_2522,
 	&pci_ss_info_8086_1043_8086_2527,
+	&pci_ss_info_8086_1043_8086_2581,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_1048[] = {
@@ -55754,6 +56045,10 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_1051 NULL
 #define pci_ss_list_8086_1052 NULL
 #define pci_ss_list_8086_1053 NULL
+#define pci_ss_list_8086_1054 NULL
+#define pci_ss_list_8086_1055 NULL
+#define pci_ss_list_8086_1056 NULL
+#define pci_ss_list_8086_1057 NULL
 #define pci_ss_list_8086_1059 NULL
 #define pci_ss_list_8086_105b NULL
 static const pciSubsystemInfo *pci_ss_list_8086_105e[] = {
@@ -55874,7 +56169,11 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_108c NULL
 #define pci_ss_list_8086_108e NULL
 #define pci_ss_list_8086_108f NULL
+#define pci_ss_list_8086_1091 NULL
 #define pci_ss_list_8086_1092 NULL
+#define pci_ss_list_8086_1093 NULL
+#define pci_ss_list_8086_1094 NULL
+#define pci_ss_list_8086_1095 NULL
 #define pci_ss_list_8086_1096 NULL
 #define pci_ss_list_8086_1097 NULL
 #define pci_ss_list_8086_1098 NULL
@@ -55883,14 +56182,25 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_109a[] = {
+	&pci_ss_info_8086_109a_1179_ff10,
 	&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
+static const pciSubsystemInfo *pci_ss_list_8086_109e[] = {
+	&pci_ss_info_8086_109e_8086_a01f,
+	&pci_ss_info_8086_109e_8086_a11f,
+	NULL
+};
 #define pci_ss_list_8086_10a0 NULL
 #define pci_ss_list_8086_10a1 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_10a4[] = {
+	&pci_ss_info_8086_10a4_8086_10a4,
+	&pci_ss_info_8086_10a4_8086_11a4,
+	NULL
+};
 #define pci_ss_list_8086_10b0 NULL
 #define pci_ss_list_8086_10b2 NULL
 #define pci_ss_list_8086_10b3 NULL
@@ -55908,6 +56218,13 @@ static const pciSubsystemInfo *pci_ss_li
 };
 #define pci_ss_list_8086_10ba NULL
 #define pci_ss_list_8086_10bb NULL
+static const pciSubsystemInfo *pci_ss_list_8086_10bc[] = {
+	&pci_ss_info_8086_10bc_8086_10bc,
+	&pci_ss_info_8086_10bc_8086_11bc,
+	NULL
+};
+#define pci_ss_list_8086_10c4 NULL
+#define pci_ss_list_8086_10c5 NULL
 #define pci_ss_list_8086_1107 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_1130[] = {
 	&pci_ss_info_8086_1130_1025_1016,
@@ -56176,6 +56493,11 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_1a31 NULL
 #define pci_ss_list_8086_1a38 NULL
 #define pci_ss_list_8086_1a48 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_1b48[] = {
+	&pci_ss_info_8086_1b48_8086_a01f,
+	&pci_ss_info_8086_1b48_8086_a11f,
+	NULL
+};
 #define pci_ss_list_8086_2410 NULL
 #define pci_ss_list_8086_2411 NULL
 #define pci_ss_list_8086_2412 NULL
@@ -56238,6 +56560,7 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_2445[] = {
+	&pci_ss_info_8086_2445_0e11_000b,
 	&pci_ss_info_8086_2445_0e11_0088,
 	&pci_ss_info_8086_2445_1014_01c6,
 	&pci_ss_info_8086_2445_1025_1016,
@@ -56254,6 +56577,7 @@ static const pciSubsystemInfo *pci_ss_li
 };
 static const pciSubsystemInfo *pci_ss_list_8086_2448[] = {
 	&pci_ss_info_8086_2448_103c_099c,
+	&pci_ss_info_8086_2448_144d_c00c,
 	&pci_ss_info_8086_2448_1734_1055,
 	NULL
 };
@@ -56401,6 +56725,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&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_144d_c00c,
 	&pci_ss_info_8086_24c2_1462_5800,
 	&pci_ss_info_8086_24c2_1509_2990,
 	&pci_ss_info_8086_24c2_1734_1004,
@@ -56436,6 +56761,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&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_144d_c00c,
 	&pci_ss_info_8086_24c4_1462_5800,
 	&pci_ss_info_8086_24c4_1509_2990,
 	&pci_ss_info_8086_24c4_1734_1004,
@@ -56455,6 +56781,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&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_144d_c00c,
 	&pci_ss_info_8086_24c5_1458_a002,
 	&pci_ss_info_8086_24c5_1462_5800,
 	&pci_ss_info_8086_24c5_1734_1005,
@@ -56470,6 +56797,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_24c6_103c_0890,
 	&pci_ss_info_8086_24c6_103c_08b0,
 	&pci_ss_info_8086_24c6_1071_8160,
+	&pci_ss_info_8086_24c6_144d_c00c,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_24c7[] = {
@@ -56483,6 +56811,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&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_144d_c00c,
 	&pci_ss_info_8086_24c7_1462_5800,
 	&pci_ss_info_8086_24c7_1509_2990,
 	&pci_ss_info_8086_24c7_1734_1004,
@@ -56499,6 +56828,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&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_144d_c00c,
 	&pci_ss_info_8086_24ca_1734_1055,
 	&pci_ss_info_8086_24ca_8086_4541,
 	NULL
@@ -56513,6 +56843,7 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_24cc[] = {
+	&pci_ss_info_8086_24cc_144d_c00c,
 	&pci_ss_info_8086_24cc_1734_1055,
 	NULL
 };
@@ -56530,6 +56861,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&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_144d_c00c,
 	&pci_ss_info_8086_24cd_1462_3981,
 	&pci_ss_info_8086_24cd_1509_1968,
 	&pci_ss_info_8086_24cd_1734_1004,
@@ -56574,6 +56906,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_24d3_1014_02ed,
 	&pci_ss_info_8086_24d3_1028_0156,
 	&pci_ss_info_8086_24d3_1028_0169,
+	&pci_ss_info_8086_24d3_103c_12bc,
 	&pci_ss_info_8086_24d3_1043_80a6,
 	&pci_ss_info_8086_24d3_1458_24d2,
 	&pci_ss_info_8086_24d3_1462_7280,
@@ -56604,6 +56937,7 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_24d5[] = {
+	&pci_ss_info_8086_24d5_100a_147b,
 	&pci_ss_info_8086_24d5_1028_0169,
 	&pci_ss_info_8086_24d5_103c_006a,
 	&pci_ss_info_8086_24d5_103c_12bc,
@@ -56757,6 +57091,7 @@ static const pciSubsystemInfo *pci_ss_li
 };
 static const pciSubsystemInfo *pci_ss_list_8086_2570[] = {
 	&pci_ss_info_8086_2570_103c_006a,
+	&pci_ss_info_8086_2570_103c_12bc,
 	&pci_ss_info_8086_2570_1043_80f2,
 	&pci_ss_info_8086_2570_1458_2570,
 	NULL
@@ -57122,6 +57457,7 @@ static const pciSubsystemInfo *pci_ss_li
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_27b9[] = {
+	&pci_ss_info_8086_27b9_10f7_8338,
 	&pci_ss_info_8086_27b9_17aa_2009,
 	NULL
 };
@@ -57174,11 +57510,14 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_27d6 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_27d8[] = {
 	&pci_ss_info_8086_27d8_107b_5048,
+	&pci_ss_info_8086_27d8_10f7_8338,
+	&pci_ss_info_8086_27d8_1179_ff31,
 	&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_10f7_8338,
 	&pci_ss_info_8086_27da_17aa_200f,
 	&pci_ss_info_8086_27da_8086_544e,
 	NULL
@@ -57191,6 +57530,7 @@ static const pciSubsystemInfo *pci_ss_li
 #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_10f7_8338,
 	&pci_ss_info_8086_27df_17aa_200c,
 	&pci_ss_info_8086_27df_8086_544e,
 	NULL
@@ -57202,22 +57542,43 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_8086_2812 NULL
 #define pci_ss_list_8086_2814 NULL
 #define pci_ss_list_8086_2815 NULL
-#define pci_ss_list_8086_2820 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_2820[] = {
+	&pci_ss_info_8086_2820_1462_7235,
+	NULL
+};
 #define pci_ss_list_8086_2821 NULL
 #define pci_ss_list_8086_2822 NULL
 #define pci_ss_list_8086_2824 NULL
-#define pci_ss_list_8086_2825 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_2825[] = {
+	&pci_ss_info_8086_2825_1462_7235,
+	NULL
+};
 #define pci_ss_list_8086_2828 NULL
 #define pci_ss_list_8086_2829 NULL
 #define pci_ss_list_8086_282a NULL
-#define pci_ss_list_8086_2830 NULL
-#define pci_ss_list_8086_2831 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_2830[] = {
+	&pci_ss_info_8086_2830_1462_7235,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_2831[] = {
+	&pci_ss_info_8086_2831_1462_7235,
+	NULL
+};
 #define pci_ss_list_8086_2832 NULL
-#define pci_ss_list_8086_2834 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_2834[] = {
+	&pci_ss_info_8086_2834_1462_7235,
+	NULL
+};
 #define pci_ss_list_8086_2835 NULL
-#define pci_ss_list_8086_2836 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_2836[] = {
+	&pci_ss_info_8086_2836_1462_7235,
+	NULL
+};
 #define pci_ss_list_8086_283a NULL
-#define pci_ss_list_8086_283e NULL
+static const pciSubsystemInfo *pci_ss_list_8086_283e[] = {
+	&pci_ss_info_8086_283e_1462_7235,
+	NULL
+};
 #define pci_ss_list_8086_283f NULL
 #define pci_ss_list_8086_2841 NULL
 #define pci_ss_list_8086_2843 NULL
@@ -57263,15 +57624,22 @@ static const pciSubsystemInfo *pci_ss_li
 #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_3200[] = {
+	&pci_ss_info_8086_3200_1775_c200,
+	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,
+	&pci_ss_info_8086_3340_144d_c00c,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_3341[] = {
+	&pci_ss_info_8086_3341_144d_c00c,
 	NULL
 };
-#define pci_ss_list_8086_3341 NULL
 #define pci_ss_list_8086_3500 NULL
 #define pci_ss_list_8086_3501 NULL
 #define pci_ss_list_8086_3504 NULL
@@ -58120,6 +58488,7 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_0b49 NULL
 #define pci_ss_list_0ccd NULL
 static const pciSubsystemInfo *pci_ss_list_0e11[] = {
+	&pci_ss_info_0e11_000b,
 	&pci_ss_info_0e11_0012,
 	&pci_ss_info_0e11_001e,
 	&pci_ss_info_0e11_0022,
@@ -58382,7 +58751,12 @@ static const pciSubsystemInfo *pci_ss_li
 #define pci_ss_list_1006 NULL
 #define pci_ss_list_1007 NULL
 #define pci_ss_list_1008 NULL
-#define pci_ss_list_100a NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_100a[] = {
+	&pci_ss_info_100a_147b,
+	NULL
+};
+#endif
 #define pci_ss_list_100b NULL
 #define pci_ss_list_100c NULL
 #define pci_ss_list_100d NULL
@@ -60499,6 +60873,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1179_ff00,
 	&pci_ss_info_1179_ff01,
 	&pci_ss_info_1179_ff10,
+	&pci_ss_info_1179_ff31,
 	NULL
 };
 #endif
@@ -62200,6 +62575,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1462_7030,
 	&pci_ss_info_1462_7100,
 	&pci_ss_info_1462_7207,
+	&pci_ss_info_1462_7235,
 	&pci_ss_info_1462_7280,
 	&pci_ss_info_1462_728c,
 	&pci_ss_info_1462_7580,
@@ -63348,6 +63724,7 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_1775_10d0,
 	&pci_ss_info_1775_10d1,
 	&pci_ss_info_1775_6003,
+	&pci_ss_info_1775_c200,
 	&pci_ss_info_1775_ce90,
 	NULL
 };
@@ -64030,6 +64407,8 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_1094,
 	&pci_ss_info_8086_1099,
 	&pci_ss_info_8086_109a,
+	&pci_ss_info_8086_10a4,
+	&pci_ss_info_8086_10bc,
 	&pci_ss_info_8086_10f0,
 	&pci_ss_info_8086_1107,
 	&pci_ss_info_8086_1109,
@@ -64046,6 +64425,8 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_117a,
 	&pci_ss_info_8086_118a,
 	&pci_ss_info_8086_1199,
+	&pci_ss_info_8086_11a4,
+	&pci_ss_info_8086_11bc,
 	&pci_ss_info_8086_125e,
 	&pci_ss_info_8086_125f,
 	&pci_ss_info_8086_1276,
@@ -64098,7 +64479,9 @@ static const pciSubsystemInfo *pci_ss_li
 	&pci_ss_info_8086_2413,
 	&pci_ss_info_8086_24db,
 	&pci_ss_info_8086_2513,
+	&pci_ss_info_8086_2522,
 	&pci_ss_info_8086_2527,
+	&pci_ss_info_8086_2581,
 	&pci_ss_info_8086_265c,
 	&pci_ss_info_8086_3000,
 	&pci_ss_info_8086_3001,
@@ -79384,19 +79767,19 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_1077_3010 = {
-	0x3010, pci_device_1077_3010,
+static const pciDeviceInfo pci_dev_info_1077_3022 = {
+	0x3022, pci_device_1077_3022,
 #ifdef INIT_SUBSYS_INFO
-	pci_ss_list_1077_3010,
+	pci_ss_list_1077_3022,
 #else
 	NULL,
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_1077_3022 = {
-	0x3022, pci_device_1077_3022,
+static const pciDeviceInfo pci_dev_info_1077_3032 = {
+	0x3032, pci_device_1077_3032,
 #ifdef INIT_SUBSYS_INFO
-	pci_ss_list_1077_3022,
+	pci_ss_list_1077_3032,
 #else
 	NULL,
 #endif
@@ -79420,6 +79803,24 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1077_4032 = {
+	0x4032, pci_device_1077_4032,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1077_4032,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1077_5432 = {
+	0x5432, pci_device_1077_5432,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1077_5432,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1077_6312 = {
 	0x6312, pci_device_1077_6312,
 #ifdef INIT_SUBSYS_INFO
@@ -109037,7 +109438,6 @@ static const pciDeviceInfo pci_dev_info_
 	0
 };
 #endif
-#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_1a03_2000 = {
 	0x2000, pci_device_1a03_2000,
 #ifdef INIT_SUBSYS_INFO
@@ -109047,7 +109447,6 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
-#endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_1a08_0000 = {
 	0x0000, pci_device_1a08_0000,
@@ -111843,6 +112242,42 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_1054 = {
+	0x1054, pci_device_8086_1054,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1054,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_1055 = {
+	0x1055, pci_device_8086_1055,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1055,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_1056 = {
+	0x1056, pci_device_8086_1056,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1056,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_1057 = {
+	0x1057, pci_device_8086_1057,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1057,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_1059 = {
 	0x1059, pci_device_8086_1059,
 #ifdef INIT_SUBSYS_INFO
@@ -112185,6 +112620,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_1091 = {
+	0x1091, pci_device_8086_1091,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1091,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_1092 = {
 	0x1092, pci_device_8086_1092,
 #ifdef INIT_SUBSYS_INFO
@@ -112194,6 +112638,33 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_1093 = {
+	0x1093, pci_device_8086_1093,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1093,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_1094 = {
+	0x1094, pci_device_8086_1094,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1094,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_1095 = {
+	0x1095, pci_device_8086_1095,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1095,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_1096 = {
 	0x1096, pci_device_8086_1096,
 #ifdef INIT_SUBSYS_INFO
@@ -112248,6 +112719,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_109e = {
+	0x109e, pci_device_8086_109e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_109e,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_10a0 = {
 	0x10a0, pci_device_8086_10a0,
 #ifdef INIT_SUBSYS_INFO
@@ -112266,6 +112746,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_10a4 = {
+	0x10a4, pci_device_8086_10a4,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_10a4,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_10b0 = {
 	0x10b0, pci_device_8086_10b0,
 #ifdef INIT_SUBSYS_INFO
@@ -112338,6 +112827,33 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_10bc = {
+	0x10bc, pci_device_8086_10bc,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_10bc,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_10c4 = {
+	0x10c4, pci_device_8086_10c4,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_10c4,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_10c5 = {
+	0x10c5, pci_device_8086_10c5,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_10c5,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_1107 = {
 	0x1107, pci_device_8086_1107,
 #ifdef INIT_SUBSYS_INFO
@@ -112752,6 +113268,15 @@ static const pciDeviceInfo pci_dev_info_
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_1b48 = {
+	0x1b48, pci_device_8086_1b48,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1b48,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_2410 = {
 	0x2410, pci_device_8086_2410,
 #ifdef INIT_SUBSYS_INFO
@@ -120919,10 +121444,12 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_1077_2322,
 	&pci_dev_info_1077_2422,
 	&pci_dev_info_1077_2432,
-	&pci_dev_info_1077_3010,
 	&pci_dev_info_1077_3022,
+	&pci_dev_info_1077_3032,
 	&pci_dev_info_1077_4010,
 	&pci_dev_info_1077_4022,
+	&pci_dev_info_1077_4032,
+	&pci_dev_info_1077_5432,
 	&pci_dev_info_1077_6312,
 	&pci_dev_info_1077_6322,
 	NULL
@@ -127194,12 +127721,10 @@ static const pciDeviceInfo *pci_dev_list
 	NULL
 };
 #endif
-#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_1a03[] = {
 	&pci_dev_info_1a03_2000,
 	NULL
 };
-#endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_1a08[] = {
 	&pci_dev_info_1a08_0000,
@@ -127727,6 +128252,10 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_8086_1051,
 	&pci_dev_info_8086_1052,
 	&pci_dev_info_8086_1053,
+	&pci_dev_info_8086_1054,
+	&pci_dev_info_8086_1055,
+	&pci_dev_info_8086_1056,
+	&pci_dev_info_8086_1057,
 	&pci_dev_info_8086_1059,
 	&pci_dev_info_8086_105b,
 	&pci_dev_info_8086_105e,
@@ -127765,15 +128294,21 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_8086_108c,
 	&pci_dev_info_8086_108e,
 	&pci_dev_info_8086_108f,
+	&pci_dev_info_8086_1091,
 	&pci_dev_info_8086_1092,
+	&pci_dev_info_8086_1093,
+	&pci_dev_info_8086_1094,
+	&pci_dev_info_8086_1095,
 	&pci_dev_info_8086_1096,
 	&pci_dev_info_8086_1097,
 	&pci_dev_info_8086_1098,
 	&pci_dev_info_8086_1099,
 	&pci_dev_info_8086_109a,
 	&pci_dev_info_8086_109b,
+	&pci_dev_info_8086_109e,
 	&pci_dev_info_8086_10a0,
 	&pci_dev_info_8086_10a1,
+	&pci_dev_info_8086_10a4,
 	&pci_dev_info_8086_10b0,
 	&pci_dev_info_8086_10b2,
 	&pci_dev_info_8086_10b3,
@@ -127782,6 +128317,9 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_8086_10b9,
 	&pci_dev_info_8086_10ba,
 	&pci_dev_info_8086_10bb,
+	&pci_dev_info_8086_10bc,
+	&pci_dev_info_8086_10c4,
+	&pci_dev_info_8086_10c5,
 	&pci_dev_info_8086_1107,
 	&pci_dev_info_8086_1130,
 	&pci_dev_info_8086_1131,
@@ -127828,6 +128366,7 @@ static const pciDeviceInfo *pci_dev_list
 	&pci_dev_info_8086_1a31,
 	&pci_dev_info_8086_1a38,
 	&pci_dev_info_8086_1a48,
+	&pci_dev_info_8086_1b48,
 	&pci_dev_info_8086_2410,
 	&pci_dev_info_8086_2411,
 	&pci_dev_info_8086_2412,
@@ -133715,9 +134254,7 @@ static const pciVendorInfo pciVendorInfo
 #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
 	{0x1a08, pci_vendor_1a08, pci_dev_list_1a08},
 #endif
@@ -139176,9 +139713,7 @@ static const pciVendorSubsysInfo pciVend
 #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
 	{0x1a08, pci_vendor_1a08, pci_ss_list_1a08},
 #endif
diff-tree 77df81245394417121ef429af429b63f2eeef3d9 (from fde2d5e033ea7eab10b2c0aac56a9e581cbb8898)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Dec 5 20:05:15 2006 -0800

    Map missing keycodes for Sun Type 5 keyboard on Solaris SPARC

diff --git a/hw/xfree86/os-support/solaris/sun_kbdEv.c b/hw/xfree86/os-support/solaris/sun_kbdEv.c
index df8b6fa..1e645ca 100644
--- a/hw/xfree86/os-support/solaris/sun_kbdEv.c
+++ b/hw/xfree86/os-support/solaris/sun_kbdEv.c
@@ -216,10 +216,10 @@ static unsigned char map[256] = {
 	KEY_UNKNOWN,		/* 134 */
 #elif defined(sparc) || defined(__sparc__)
 	KEY_UNKNOWN,		/* 0x00 */
-	KEY_UNKNOWN,		/* 0x01 */
-	KEY_UNKNOWN,		/* 0x02 */
-	KEY_UNKNOWN,		/* 0x03 */
-	KEY_UNKNOWN,		/* 0x04 */
+	KEY_L1,			/* 0x01 */
+	KEY_AudioLower,		/* 0x02 */
+	KEY_L2,			/* 0x03 */
+	KEY_AudioRaise,		/* 0x04 */
 	KEY_F1,			/* 0x05 */
 	KEY_F2,			/* 0x06 */
 	KEY_F10,		/* 0x07 */
@@ -228,9 +228,9 @@ static unsigned char map[256] = {
 	KEY_F4,			/* 0x0A */
 	KEY_F12,		/* 0x0B */
 	KEY_F5,			/* 0x0C */
-	KEY_UNKNOWN,		/* 0x0D */
+	KEY_AltLang,		/* 0x0D */
 	KEY_F6,			/* 0x0E */
-	KEY_UNKNOWN,		/* 0x0F */
+	0x7a, /* <I02> */	/* 0x0F */	/* Blank key on US Unix */
 	KEY_F7,			/* 0x10 */
 	KEY_F8,			/* 0x11 */
 	KEY_F9,			/* 0x12 */
@@ -240,8 +240,8 @@ static unsigned char map[256] = {
 	KEY_SysReqest,		/* 0x16 */
 	KEY_ScrollLock,		/* 0x17 */
 	KEY_Left,		/* 0x18 */
-	KEY_UNKNOWN,		/* 0x19 */
-	KEY_UNKNOWN,		/* 0x1A */
+	KEY_L3,			/* 0x19 */
+	KEY_L4,			/* 0x1A */
 	KEY_Down,		/* 0x1B */
 	KEY_Right,		/* 0x1C */
 	KEY_Escape,		/* 0x1D */
@@ -260,13 +260,13 @@ static unsigned char map[256] = {
 	KEY_Tilde,		/* 0x2A */
 	KEY_BackSpace,		/* 0x2B */
 	KEY_Insert,		/* 0x2C */
-	KEY_UNKNOWN,		/* 0x2D */
+	KEY_Mute,		/* 0x2D */
 	KEY_KP_Divide,		/* 0x2E */
 	KEY_KP_Multiply,	/* 0x2F */
-	KEY_UNKNOWN,		/* 0x30 */
-	KEY_UNKNOWN,		/* 0x31 */
+	KEY_Power,		/* 0x30 */
+	KEY_L5,			/* 0x31 */
 	KEY_KP_Decimal,		/* 0x32 */
-	KEY_UNKNOWN,		/* 0x33 */
+	KEY_L6,			/* 0x33 */
 	KEY_Home,		/* 0x34 */
 	KEY_Tab,		/* 0x35 */
 	KEY_Q,			/* 0x36 */
@@ -282,13 +282,13 @@ static unsigned char map[256] = {
 	KEY_LBrace,		/* 0x40 */
 	KEY_RBrace,		/* 0x41 */
 	KEY_Delete,		/* 0x42 */
-	KEY_UNKNOWN,		/* 0x43 */
+	KEY_Menu,		/* 0x43 */
 	KEY_KP_7,		/* 0x44 */
 	KEY_KP_8,		/* 0x45 */
 	KEY_KP_9,		/* 0x46 */
 	KEY_KP_Minus,		/* 0x47 */
-	KEY_UNKNOWN,		/* 0x48 */
-	KEY_UNKNOWN,		/* 0x49 */
+	KEY_L7,			/* 0x48 */
+	KEY_L8,			/* 0x49 */
 	KEY_End,		/* 0x4A */
 	KEY_UNKNOWN,		/* 0x4B */
 	KEY_LCtrl,		/* 0x4C */
@@ -310,9 +310,9 @@ static unsigned char map[256] = {
 	KEY_KP_5,		/* 0x5C */
 	KEY_KP_6,		/* 0x5D */
 	KEY_KP_0,		/* 0x5E */
-	KEY_UNKNOWN,		/* 0x5F */
+	KEY_L9,			/* 0x5F */
 	KEY_PgUp,		/* 0x60 */
-	KEY_UNKNOWN,		/* 0x61 */
+	KEY_L10,		/* 0x61 */
 	KEY_NumLock,		/* 0x62 */
 	KEY_ShiftL,		/* 0x63 */
 	KEY_Z,			/* 0x64 */
@@ -333,7 +333,7 @@ static unsigned char map[256] = {
 	KEY_UNKNOWN,		/* 0x73 */
 	KEY_UNKNOWN,		/* 0x74 */
 	KEY_UNKNOWN,		/* 0x75 */
-	KEY_UNKNOWN,		/* 0x76 */
+	KEY_Help,		/* 0x76 */
 	KEY_CapsLock,		/* 0x77 */
 	KEY_LMeta,		/* 0x78 */
 	KEY_Space,		/* 0x79 */
diff-tree fde2d5e033ea7eab10b2c0aac56a9e581cbb8898 (from dd8bc0162c5c32eed83c46b00424fe08b9784e83)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Fri Dec 1 16:42:37 2006 -0800

    Fix syntax error in configure check for SYSV_IPC that broke with Sun cc
    (cherry picked from a5d6499d666fea4a9988118ddd3a5e4c9cfcc32c commit)

diff --git a/configure.ac b/configure.ac
index 13561b2..249f58d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,7 +153,7 @@ AC_CACHE_CHECK([for SYSV IPC],
 		[AC_TRY_LINK([
 #include <sys/shm.h>
 ],[
-int main () { 
+{ 
     int id;
     id = shmget(IPC_PRIVATE, 512, SHM_W | SHM_R);
     if (id < 0) return -1;
diff-tree dd8bc0162c5c32eed83c46b00424fe08b9784e83 (from 7c639791bea07340182de5e43db9526f8baee65a)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Fri Dec 1 18:45:02 2006 -0500

    Fix release date, and tag 1.1.99.903

diff --git a/configure.ac b/configure.ac
index df001a6..13561b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -298,7 +298,7 @@ DEFAULT_VERSION_MAJOR=7
 DEFAULT_VERSION_MINOR=1
 DEFAULT_VERSION_PATCH=99
 DEFAULT_VERSION_SNAP=903
-DEFAULT_RELEASE_DATE="30 November 2006"
+DEFAULT_RELEASE_DATE="1 December 2006"
 DEFAULT_VENDOR_WEB="http://wiki.x.org"
 
 m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])



More information about the xorg-commit mailing list