* Patch by John Kerl, 19 Apr 2004:

  Use U-boot's miiphy.h for PHY register names, rather than
  introducing a new header file.

* Update pci_ids.h from linux-2.4.26

* Patch by Masami Komiya, 19 Apr 2004:
  Fix problem cause by VLAN function on little endian architecture
  without VLAN environment

diff --git a/CHANGELOG b/CHANGELOG
index 73dc5bd130d646ace6786817c0f3fde7edf13686..fdfb21291e91fd91a4c4b66631dfa021d7896f81 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,8 +2,18 @@
 Changes for U-Boot 1.1.1:
 ======================================================================
 
+* Patch by John Kerl, 19 Apr 2004:
+  Use U-boot's miiphy.h for PHY register names, rather than
+  introducing a new header file.
+
+* Update pci_ids.h from linux-2.4.26
+
+* Patch by Masami Komiya, 19 Apr 2004:
+  Fix problem cause by VLAN function on little endian architecture
+  without VLAN environment
+
 * Clean up the TQM8xx_YYMHz configurations; allow to use the same
-  binary image for all clok frequencies. Implement run-time
+  binary image for all clock frequencies. Implement run-time
   optimization of flash access timing based on the actual bus
   frequency.
 

diff --git a/common/cmd_mii.c b/common/cmd_mii.c
index 8ec05c80fa527a3c7cdd8173f0579270692fa01d..5be4e6374df6aea64cf942a4c55bc7d12c2f22be 100644 (file)
--- a/common/cmd_mii.c
+++ b/common/cmd_mii.c
@@ -31,8 +31,6 @@
 #if (CONFIG_COMMANDS & CFG_CMD_MII)
 #include <miiphy.h>
 
-#define        CONFIG_TERSE_MII        /* XXX necessary here because "miivals.h" is missing */
-
 #ifdef CONFIG_TERSE_MII
 /*
  * Display values from last command.
@@ -149,8 +147,6 @@ U_BOOT_CMD(
 
 #else /* ! CONFIG_TERSE_MII ================================================= */
 
-#include <miivals.h>
-
 typedef struct _MII_reg_desc_t {
        ushort regno;
        char * name;
@@ -343,14 +339,14 @@ static int special_field(
        ushort regval)
 {
        if ((regno == 0) && (pdesc->lo == 6)) {
-               ushort speed_bits = regval & MII_CTL_SPEED_MASK;
+               ushort speed_bits = regval & PHY_BMCR_SPEED_MASK;
                printf("%2u,%2u =   b%u%u    speed selection = %s Mbps",
                        6, 13,
                        (regval >>  6) & 1,
                        (regval >> 13) & 1,
-                       speed_bits == MII_CTL_SPEED_1000_MBPS ? "1000" :
-                       speed_bits == MII_CTL_SPEED_100_MBPS  ? "100" :
-                       speed_bits == MII_CTL_SPEED_10_MBPS   ? "10" :
+                       speed_bits == PHY_BMCR_1000_MBPS ? "1000" :
+                       speed_bits == PHY_BMCR_100_MBPS  ? "100" :
+                       speed_bits == PHY_BMCR_10_MBPS   ? "10" :
                        "???");
                return 1;
        }
@@ -367,9 +363,9 @@ static int special_field(
                ushort sel_bits = (regval >> pdesc->lo) & pdesc->mask;
                printf("%2u-%2u = %5u    selector = %s",
                        pdesc->hi, pdesc->lo, sel_bits,
-                       sel_bits == MII_AN_ADV_IEEE_802_3 ?
+                       sel_bits == PHY_ANLPAR_PSB_802_3 ?
                                "IEEE 802.3" :
-                       sel_bits == MII_AN_ADV_IEEE_802_9_ISLAN_16T ?
+                       sel_bits == PHY_ANLPAR_PSB_802_9 ?
                                "IEEE 802.9 ISLAN-16T" :
                        "???");
                return 1;
@@ -379,9 +375,9 @@ static int special_field(
                ushort sel_bits = (regval >> pdesc->lo) & pdesc->mask;
                printf("%2u-%2u =     %u    selector = %s",
                        pdesc->hi, pdesc->lo, sel_bits,
-                       sel_bits == MII_AN_PARTNER_IEEE_802_3 ?
+                       sel_bits == PHY_ANLPAR_PSB_802_3 ?
                                "IEEE 802.3" :
-                       sel_bits == MII_AN_PARTNER_IEEE_802_9_ISLAN_16T ?
+                       sel_bits == PHY_ANLPAR_PSB_802_9 ?
                                "IEEE 802.9 ISLAN-16T" :
                        "???");
                return 1;
@@ -418,7 +414,7 @@ int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
        char            op;
        unsigned char   addrlo, addrhi, reglo, reghi;
-       unsigned char   addr, reg;
+       unsigned char   addr = 0, reg = 0;
        unsigned short  data;
        int             rcode = 0;
 

diff --git a/include/miiphy.h b/include/miiphy.h
index 7f61cfa4e37f8677de48cdb4f95d37d646d4aea2..afdd5a7fe15bff0823afb6caeb5254596be0df8b 100644 (file)
--- a/include/miiphy.h
+++ b/include/miiphy.h
@@ -93,6 +93,11 @@ int  miiphy_link(unsigned char addr);
 #define PHY_BMCR_DPLX          0x0100
 #define PHY_BMCR_COL_TST       0x0080
 
+#define PHY_BMCR_SPEED_MASK     0x2040
+#define PHY_BMCR_1000_MBPS      0x0040
+#define PHY_BMCR_100_MBPS       0x2000
+#define PHY_BMCR_10_MBPS        0x0000
+
 /* phy BMSR */
 #define PHY_BMSR_100T4         0x8000
 #define PHY_BMSR_100TXF                0x4000
@@ -118,6 +123,10 @@ int  miiphy_link(unsigned char addr);
 #define PHY_ANLPAR_10          0x0020
 #define PHY_ANLPAR_100         0x0380      /* we can run at 100 */
 
+#define PHY_ANLPAR_PSB_MASK     0x001f
+#define PHY_ANLPAR_PSB_802_3    0x0001
+#define PHY_ANLPAR_PSB_802_9    0x0002
+
 /* PHY_1000BTSR */
 #define PHY_1000BTSR_MSCF       0x8000
 #define PHY_1000BTSR_MSCR       0x4000

diff --git a/include/pci_ids.h b/include/pci_ids.h
index a5d7ed54fe289c11ce568eddbbbdf4b1c13bb693..61344214902d0d9d2153ea7a92276172e22a0827 100644 (file)
--- a/include/pci_ids.h
+++ b/include/pci_ids.h
@@ -133,8 +133,10 @@
 #define PCI_DEVICE_ID_COMPAQ_1280      0x3033
 #define PCI_DEVICE_ID_COMPAQ_TRIFLEX   0x4000
 #define PCI_DEVICE_ID_COMPAQ_6010      0x6010
+#define PCI_DEVICE_ID_COMPAQ_TACHYON   0xa0fc
 #define PCI_DEVICE_ID_COMPAQ_SMART2P   0xae10
 #define PCI_DEVICE_ID_COMPAQ_NETEL100  0xae32
+#define PCI_DEVICE_ID_COMPAQ_TRIFLEX_IDE 0xae33
 #define PCI_DEVICE_ID_COMPAQ_NETEL10   0xae34
 #define PCI_DEVICE_ID_COMPAQ_NETFLEX3I 0xae35
 #define PCI_DEVICE_ID_COMPAQ_NETEL100D 0xae40
@@ -142,46 +144,181 @@
 #define PCI_DEVICE_ID_COMPAQ_NETEL100I 0xb011
 #define PCI_DEVICE_ID_COMPAQ_CISS      0xb060
 #define PCI_DEVICE_ID_COMPAQ_CISSB     0xb178
+#define PCI_DEVICE_ID_COMPAQ_CISSC     0x0046
 #define PCI_DEVICE_ID_COMPAQ_THUNDER   0xf130
 #define PCI_DEVICE_ID_COMPAQ_NETFLEX3B 0xf150
 
 #define PCI_VENDOR_ID_NCR              0x1000
+#define PCI_VENDOR_ID_LSI_LOGIC                0x1000
 #define PCI_DEVICE_ID_NCR_53C810       0x0001
 #define PCI_DEVICE_ID_NCR_53C820       0x0002
 #define PCI_DEVICE_ID_NCR_53C825       0x0003
 #define PCI_DEVICE_ID_NCR_53C815       0x0004
+#define PCI_DEVICE_ID_LSI_53C810AP     0x0005
 #define PCI_DEVICE_ID_NCR_53C860       0x0006
+#define PCI_DEVICE_ID_LSI_53C1510      0x000a
 #define PCI_DEVICE_ID_NCR_53C896       0x000b
 #define PCI_DEVICE_ID_NCR_53C895       0x000c
 #define PCI_DEVICE_ID_NCR_53C885       0x000d
 #define PCI_DEVICE_ID_NCR_53C875       0x000f
 #define PCI_DEVICE_ID_NCR_53C1510      0x0010
+#define PCI_DEVICE_ID_LSI_53C895A      0x0012
+#define PCI_DEVICE_ID_LSI_53C875A      0x0013
+#define PCI_DEVICE_ID_LSI_53C1010_33   0x0020
+#define PCI_DEVICE_ID_LSI_53C1010_66   0x0021
+#define PCI_DEVICE_ID_LSI_53C1030      0x0030
+#define PCI_DEVICE_ID_LSI_53C1035      0x0040
 #define PCI_DEVICE_ID_NCR_53C875J      0x008f
+#define PCI_DEVICE_ID_LSI_FC909                0x0621
+#define PCI_DEVICE_ID_LSI_FC929                0x0622
+#define PCI_DEVICE_ID_LSI_FC929_LAN    0x0623
+#define PCI_DEVICE_ID_LSI_FC919                0x0624
+#define PCI_DEVICE_ID_LSI_FC919_LAN    0x0625
+#define PCI_DEVICE_ID_LSI_FC929X       0x0626
+#define PCI_DEVICE_ID_LSI_FC919X       0x0628
 #define PCI_DEVICE_ID_NCR_YELLOWFIN    0x0701
+#define PCI_DEVICE_ID_LSI_61C102       0x0901
+#define PCI_DEVICE_ID_LSI_63C815       0x1000
 
 #define PCI_VENDOR_ID_ATI              0x1002
+/* Mach64 */
 #define PCI_DEVICE_ID_ATI_68800                0x4158
 #define PCI_DEVICE_ID_ATI_215CT222     0x4354
 #define PCI_DEVICE_ID_ATI_210888CX     0x4358
+#define PCI_DEVICE_ID_ATI_215ET222     0x4554
+/* Mach64 / Rage */
 #define PCI_DEVICE_ID_ATI_215GB                0x4742
 #define PCI_DEVICE_ID_ATI_215GD                0x4744
 #define PCI_DEVICE_ID_ATI_215GI                0x4749
 #define PCI_DEVICE_ID_ATI_215GP                0x4750
 #define PCI_DEVICE_ID_ATI_215GQ                0x4751
+#define PCI_DEVICE_ID_ATI_215XL                0x4752
 #define PCI_DEVICE_ID_ATI_215GT                0x4754
 #define PCI_DEVICE_ID_ATI_215GTB       0x4755
+#define PCI_DEVICE_ID_ATI_215_IV       0x4756
+#define PCI_DEVICE_ID_ATI_215_IW       0x4757
+#define PCI_DEVICE_ID_ATI_215_IZ       0x475A
 #define PCI_DEVICE_ID_ATI_210888GX     0x4758
-#define PCI_DEVICE_ID_ATI_215LG                0x4c47
-#define PCI_DEVICE_ID_ATI_264LT                0x4c54
+#define PCI_DEVICE_ID_ATI_215_LB       0x4c42
+#define PCI_DEVICE_ID_ATI_215_LD       0x4c44
+#define PCI_DEVICE_ID_ATI_215_LG       0x4c47
+#define PCI_DEVICE_ID_ATI_215_LI       0x4c49
+#define PCI_DEVICE_ID_ATI_215_LM       0x4c4D
+#define PCI_DEVICE_ID_ATI_215_LN       0x4c4E
+#define PCI_DEVICE_ID_ATI_215_LR       0x4c52
+#define PCI_DEVICE_ID_ATI_215_LS       0x4c53
+#define PCI_DEVICE_ID_ATI_264_LT       0x4c54
+/* Mach64 VT */
 #define PCI_DEVICE_ID_ATI_264VT                0x5654
+#define PCI_DEVICE_ID_ATI_264VU                0x5655
+#define PCI_DEVICE_ID_ATI_264VV                0x5656
+/* Rage128 Pro GL */
+#define PCI_DEVICE_ID_ATI_Rage128_PA   0x5041
+#define PCI_DEVICE_ID_ATI_Rage128_PB   0x5042
+#define PCI_DEVICE_ID_ATI_Rage128_PC   0x5043
+#define PCI_DEVICE_ID_ATI_Rage128_PD   0x5044
+#define PCI_DEVICE_ID_ATI_Rage128_PE   0x5045
+#define PCI_DEVICE_ID_ATI_RAGE128_PF   0x5046
+/* Rage128 Pro VR */
+#define PCI_DEVICE_ID_ATI_RAGE128_PG   0x5047
+#define PCI_DEVICE_ID_ATI_RAGE128_PH   0x5048
+#define PCI_DEVICE_ID_ATI_RAGE128_PI   0x5049
+#define PCI_DEVICE_ID_ATI_RAGE128_PJ   0x504A
+#define PCI_DEVICE_ID_ATI_RAGE128_PK   0x504B
+#define PCI_DEVICE_ID_ATI_RAGE128_PL   0x504C
+#define PCI_DEVICE_ID_ATI_RAGE128_PM   0x504D
+#define PCI_DEVICE_ID_ATI_RAGE128_PN   0x504E
+#define PCI_DEVICE_ID_ATI_RAGE128_PO   0x504F
+#define PCI_DEVICE_ID_ATI_RAGE128_PP   0x5050
+#define PCI_DEVICE_ID_ATI_RAGE128_PQ   0x5051
+#define PCI_DEVICE_ID_ATI_RAGE128_PR   0x5052
+#define PCI_DEVICE_ID_ATI_RAGE128_TR   0x5452
+#define PCI_DEVICE_ID_ATI_RAGE128_PS   0x5053
+#define PCI_DEVICE_ID_ATI_RAGE128_PT   0x5054
+#define PCI_DEVICE_ID_ATI_RAGE128_PU   0x5055
+#define PCI_DEVICE_ID_ATI_RAGE128_PV   0x5056
+#define PCI_DEVICE_ID_ATI_RAGE128_PW   0x5057
+#define PCI_DEVICE_ID_ATI_RAGE128_PX   0x5058
+/* Rage128 GL */
 #define PCI_DEVICE_ID_ATI_RAGE128_RE   0x5245
 #define PCI_DEVICE_ID_ATI_RAGE128_RF   0x5246
+#define PCI_DEVICE_ID_ATI_RAGE128_RG   0x534b
+#define PCI_DEVICE_ID_ATI_RAGE128_RH   0x534c
+#define PCI_DEVICE_ID_ATI_RAGE128_RI   0x534d
+/* Rage128 VR */
 #define PCI_DEVICE_ID_ATI_RAGE128_RK   0x524b
 #define PCI_DEVICE_ID_ATI_RAGE128_RL   0x524c
-#define PCI_DEVICE_ID_ATI_RAGE128_PF   0x5046
-#define PCI_DEVICE_ID_ATI_RAGE128_PR   0x5052
+#define PCI_DEVICE_ID_ATI_RAGE128_RM   0x5345
+#define PCI_DEVICE_ID_ATI_RAGE128_RN   0x5346
+#define PCI_DEVICE_ID_ATI_RAGE128_RO   0x5347
+/* Rage128 M3 */
 #define PCI_DEVICE_ID_ATI_RAGE128_LE   0x4c45
 #define PCI_DEVICE_ID_ATI_RAGE128_LF   0x4c46
+/* Rage128 Pro Ultra */
+#define PCI_DEVICE_ID_ATI_RAGE128_U1   0x5446
+#define PCI_DEVICE_ID_ATI_RAGE128_U2   0x544C
+#define PCI_DEVICE_ID_ATI_RAGE128_U3   0x5452
+/* Rage M4 */
+#define PCI_DEVICE_ID_ATI_RADEON_LE    0x4d45
+#define PCI_DEVICE_ID_ATI_RADEON_LF    0x4d46
+/* Radeon R100 */
+#define PCI_DEVICE_ID_ATI_RADEON_QD    0x5144
+#define PCI_DEVICE_ID_ATI_RADEON_QE    0x5145
+#define PCI_DEVICE_ID_ATI_RADEON_QF    0x5146
+#define PCI_DEVICE_ID_ATI_RADEON_QG    0x5147
+/* Radeon RV100 (VE) */
+#define PCI_DEVICE_ID_ATI_RADEON_QY    0x5159
+#define PCI_DEVICE_ID_ATI_RADEON_QZ    0x515a
+/* Radeon R200 (8500) */
+#define PCI_DEVICE_ID_ATI_RADEON_QL    0x514c
+#define PCI_DEVICE_ID_ATI_RADEON_QN    0x514e
+#define PCI_DEVICE_ID_ATI_RADEON_QO    0x514f
+#define PCI_DEVICE_ID_ATI_RADEON_Ql    0x516c
+#define PCI_DEVICE_ID_ATI_RADEON_BB    0x4242
+/* Radeon R200 (9100) */
+#define PCI_DEVICE_ID_ATI_RADEON_QM    0x514d
+/* Radeon RV200 (7500) */
+#define PCI_DEVICE_ID_ATI_RADEON_QW    0x5157
+#define PCI_DEVICE_ID_ATI_RADEON_QX    0x5158
+/* Radeon RV250 (9000) */
+#define PCI_DEVICE_ID_ATI_RADEON_Id    0x4964
+#define PCI_DEVICE_ID_ATI_RADEON_Ie    0x4965
+#define PCI_DEVICE_ID_ATI_RADEON_If    0x4966
+#define PCI_DEVICE_ID_ATI_RADEON_Ig    0x4967
+/* Radeon RV280 (9200) */
+#define PCI_DEVICE_ID_ATI_RADEON_Y_    0x5960
+#define PCI_DEVICE_ID_ATI_RADEON_Ya    0x5961
+#define PCI_DEVICE_ID_ATI_RADEON_Yd    0x5964
+/* Radeon R300 (9700) */
+#define PCI_DEVICE_ID_ATI_RADEON_ND    0x4e44
+#define PCI_DEVICE_ID_ATI_RADEON_NE    0x4e45
+#define PCI_DEVICE_ID_ATI_RADEON_NF    0x4e46
+#define PCI_DEVICE_ID_ATI_RADEON_NG    0x4e47
+#define PCI_DEVICE_ID_ATI_RADEON_AE    0x4145
+#define PCI_DEVICE_ID_ATI_RADEON_AF    0x4146
+/* Radeon R300 (9500) */
+#define PCI_DEVICE_ID_ATI_RADEON_AD    0x4144
+/* Radeon R350 (9800) */
+#define PCI_DEVICE_ID_ATI_RADEON_NH    0x4e48
+#define PCI_DEVICE_ID_ATI_RADEON_NI    0x4e49
+/* Radeon RV350 (9600) */
+#define PCI_DEVICE_ID_ATI_RADEON_AP    0x4150
+#define PCI_DEVICE_ID_ATI_RADEON_AR    0x4152
+/* Radeon M6 */
+#define PCI_DEVICE_ID_ATI_RADEON_LY    0x4c59
+#define PCI_DEVICE_ID_ATI_RADEON_LZ    0x4c5a
+/* Radeon M7 */
+#define PCI_DEVICE_ID_ATI_RADEON_LW    0x4c57
+#define PCI_DEVICE_ID_ATI_RADEON_LX    0x4c58
+/* Radeon M9 */
+#define PCI_DEVICE_ID_ATI_RADEON_Ld    0x4c64
+#define PCI_DEVICE_ID_ATI_RADEON_Le    0x4c65
+#define PCI_DEVICE_ID_ATI_RADEON_Lf    0x4c66
+#define PCI_DEVICE_ID_ATI_RADEON_Lg    0x4c67
+/* RadeonIGP */
+#define PCI_DEVICE_ID_ATI_RADEON_IGP   0xCAB0
+/* ATI IXP Chipset */
+#define PCI_DEVICE_ID_ATI_IXP_IDE      0x4349
 
 #define PCI_VENDOR_ID_VLSI             0x1004
 #define PCI_DEVICE_ID_VLSI_82C592      0x0005
@@ -200,11 +337,17 @@
 #define PCI_DEVICE_ID_ADL_2301         0x2301
 
 #define PCI_VENDOR_ID_NS               0x100b
-#define PCI_DEVICE_ID_NS_83815         0x0020
-#define PCI_DEVICE_ID_NS_8382x         0x0022
 #define PCI_DEVICE_ID_NS_87415         0x0002
 #define PCI_DEVICE_ID_NS_87560_LIO     0x000e
 #define PCI_DEVICE_ID_NS_87560_USB     0x0012
+#define PCI_DEVICE_ID_NS_83815         0x0020
+#define PCI_DEVICE_ID_NS_83820         0x0022
+#define PCI_DEVICE_ID_NS_SCx200_BRIDGE 0x0500
+#define PCI_DEVICE_ID_NS_SCx200_SMI    0x0501
+#define PCI_DEVICE_ID_NS_SCx200_IDE    0x0502
+#define PCI_DEVICE_ID_NS_SCx200_AUDIO  0x0503
+#define PCI_DEVICE_ID_NS_SCx200_VIDEO  0x0504
+#define PCI_DEVICE_ID_NS_SCx200_XBUS   0x0505
 #define PCI_DEVICE_ID_NS_87410         0xd001
 
 #define PCI_VENDOR_ID_TSENG            0x100c
@@ -263,10 +406,11 @@
 #define PCI_DEVICE_ID_IBM_TR_WAKE      0x003e
 #define PCI_DEVICE_ID_IBM_MPIC         0x0046
 #define PCI_DEVICE_ID_IBM_3780IDSP     0x007d
-#define PCI_DEVICE_ID_IBM_CPC700       0x00f9
+#define PCI_DEVICE_ID_IBM_CHUKAR       0x0096
 #define PCI_DEVICE_ID_IBM_CPC710_PCI64 0x00fc
 #define PCI_DEVICE_ID_IBM_CPC710_PCI32 0x0105
 #define        PCI_DEVICE_ID_IBM_405GP         0x0156
+#define PCI_DEVICE_ID_IBM_SERVERAIDI960        0x01bd
 #define PCI_DEVICE_ID_IBM_MPIC_2       0xffff
 
 #define PCI_VENDOR_ID_COMPEX2          0x101a /* pci.ids says "AT&T GIS (NCR)" */
@@ -274,6 +418,7 @@
 
 #define PCI_VENDOR_ID_WD               0x101c
 #define PCI_DEVICE_ID_WD_7197          0x3296
+#define PCI_DEVICE_ID_WD_90C           0xc24a
 
 #define PCI_VENDOR_ID_AMI              0x101e
 #define PCI_DEVICE_ID_AMI_MEGARAID3    0x1960
@@ -284,7 +429,13 @@
 #define PCI_DEVICE_ID_AMD_LANCE                0x2000
 #define PCI_DEVICE_ID_AMD_LANCE_HOME   0x2001
 #define PCI_DEVICE_ID_AMD_SCSI         0x2020
+#define PCI_DEVICE_ID_AMD_SERENADE     0x36c0
 #define PCI_DEVICE_ID_AMD_FE_GATE_7006 0x7006
+#define PCI_DEVICE_ID_AMD_FE_GATE_7007 0x7007
+#define PCI_DEVICE_ID_AMD_FE_GATE_700C 0x700C
+#define PCI_DEVICE_ID_AMD_FE_GATE_700D 0x700D
+#define PCI_DEVICE_ID_AMD_FE_GATE_700E 0x700E
+#define PCI_DEVICE_ID_AMD_FE_GATE_700F 0x700F
 #define PCI_DEVICE_ID_AMD_COBRA_7400   0x7400
 #define PCI_DEVICE_ID_AMD_COBRA_7401   0x7401
 #define PCI_DEVICE_ID_AMD_COBRA_7403   0x7403
@@ -293,6 +444,24 @@
 #define PCI_DEVICE_ID_AMD_VIPER_7409   0x7409
 #define PCI_DEVICE_ID_AMD_VIPER_740B   0x740B
 #define PCI_DEVICE_ID_AMD_VIPER_740C   0x740C
+#define PCI_DEVICE_ID_AMD_VIPER_7410   0x7410
+#define PCI_DEVICE_ID_AMD_VIPER_7411   0x7411
+#define PCI_DEVICE_ID_AMD_VIPER_7413   0x7413
+#define PCI_DEVICE_ID_AMD_VIPER_7414   0x7414
+#define PCI_DEVICE_ID_AMD_OPUS_7440    0x7440
+#      define PCI_DEVICE_ID_AMD_VIPER_7440     PCI_DEVICE_ID_AMD_OPUS_7440
+#define PCI_DEVICE_ID_AMD_OPUS_7441    0x7441
+#      define PCI_DEVICE_ID_AMD_VIPER_7441     PCI_DEVICE_ID_AMD_OPUS_7441
+#define PCI_DEVICE_ID_AMD_OPUS_7443    0x7443
+#      define PCI_DEVICE_ID_AMD_VIPER_7443     PCI_DEVICE_ID_AMD_OPUS_7443
+#define PCI_DEVICE_ID_AMD_OPUS_7448    0x7448
+# define       PCI_DEVICE_ID_AMD_VIPER_7448    PCI_DEVICE_ID_AMD_OPUS_7448
+#define PCI_DEVICE_ID_AMD_OPUS_7449    0x7449
+#      define PCI_DEVICE_ID_AMD_VIPER_7449     PCI_DEVICE_ID_AMD_OPUS_7449
+#define PCI_DEVICE_ID_AMD_8111_LAN     0x7462
+#define PCI_DEVICE_ID_AMD_8111_IDE     0x7469
+#define PCI_DEVICE_ID_AMD_8111_AC97    0x746d
+#define PCI_DEVICE_ID_AMD_8131_APIC     0x7450
 
 #define PCI_VENDOR_ID_TRIDENT          0x1023
 #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX        0x2000
@@ -316,6 +485,8 @@
 #define PCI_VENDOR_ID_AI               0x1025
 #define PCI_DEVICE_ID_AI_M1435         0x1435
 
+#define PCI_VENDOR_ID_DELL              0x1028
+
 #define PCI_VENDOR_ID_MATROX           0x102B
 #define PCI_DEVICE_ID_MATROX_MGA_2     0x0518
 #define PCI_DEVICE_ID_MATROX_MIL       0x0519
@@ -328,6 +499,7 @@
 #define PCI_DEVICE_ID_MATROX_G200_PCI  0x0520
 #define PCI_DEVICE_ID_MATROX_G200_AGP  0x0521
 #define        PCI_DEVICE_ID_MATROX_G400       0x0525
+#define PCI_DEVICE_ID_MATROX_G550      0x2527
 #define PCI_DEVICE_ID_MATROX_VIA       0x4536
 
 #define PCI_VENDOR_ID_CT               0x102c
@@ -336,14 +508,17 @@
 #define PCI_DEVICE_ID_CT_65550         0x00e0
 #define PCI_DEVICE_ID_CT_65554         0x00e4
 #define PCI_DEVICE_ID_CT_65555         0x00e5
-#define PCI_DEVICE_ID_CT_69000         0x00c0
 
 #define PCI_VENDOR_ID_MIRO             0x1031
 #define PCI_DEVICE_ID_MIRO_36050       0x5601
 
 #define PCI_VENDOR_ID_NEC              0x1033
+#define PCI_DEVICE_ID_NEC_NAPCCARD     0x003e
 #define PCI_DEVICE_ID_NEC_PCX2         0x0046
 #define PCI_DEVICE_ID_NEC_NILE4                0x005a
+#define PCI_DEVICE_ID_NEC_VRC5476       0x009b
+#define PCI_DEVICE_ID_NEC_VRC4173      0x00a5
+#define PCI_DEVICE_ID_NEC_VRC5477_AC97  0x00a6
 
 #define PCI_VENDOR_ID_FD               0x1036
 #define PCI_DEVICE_ID_FD_36C70         0x0000
@@ -353,26 +528,57 @@
 #define PCI_DEVICE_ID_SI_6202          0x0002
 #define PCI_DEVICE_ID_SI_503           0x0008
 #define PCI_DEVICE_ID_SI_ACPI          0x0009
+#define PCI_DEVICE_ID_SI_180           0x0180
 #define PCI_DEVICE_ID_SI_5597_VGA      0x0200
 #define PCI_DEVICE_ID_SI_6205          0x0205
 #define PCI_DEVICE_ID_SI_501           0x0406
 #define PCI_DEVICE_ID_SI_496           0x0496
 #define PCI_DEVICE_ID_SI_300           0x0300
+#define PCI_DEVICE_ID_SI_315H          0x0310
+#define PCI_DEVICE_ID_SI_315           0x0315
+#define PCI_DEVICE_ID_SI_315PRO                0x0325
 #define PCI_DEVICE_ID_SI_530           0x0530
 #define PCI_DEVICE_ID_SI_540           0x0540
+#define PCI_DEVICE_ID_SI_550           0x0550
 #define PCI_DEVICE_ID_SI_540_VGA       0x5300
+#define PCI_DEVICE_ID_SI_550_VGA       0x5315
 #define PCI_DEVICE_ID_SI_601           0x0601
 #define PCI_DEVICE_ID_SI_620           0x0620
 #define PCI_DEVICE_ID_SI_630           0x0630
+#define PCI_DEVICE_ID_SI_633           0x0633
+#define PCI_DEVICE_ID_SI_635           0x0635
+#define PCI_DEVICE_ID_SI_640           0x0640
+#define PCI_DEVICE_ID_SI_645           0x0645
+#define PCI_DEVICE_ID_SI_646           0x0646
+#define PCI_DEVICE_ID_SI_648           0x0648
+#define PCI_DEVICE_ID_SI_650           0x0650
+#define PCI_DEVICE_ID_SI_651           0x0651
+#define PCI_DEVICE_ID_SI_652           0x0652
+#define PCI_DEVICE_ID_SI_655           0x0655
 #define PCI_DEVICE_ID_SI_730           0x0730
+#define PCI_DEVICE_ID_SI_733           0x0733
 #define PCI_DEVICE_ID_SI_630_VGA       0x6300
 #define PCI_DEVICE_ID_SI_730_VGA       0x7300
+#define PCI_DEVICE_ID_SI_735           0x0735
+#define PCI_DEVICE_ID_SI_740           0x0740
+#define PCI_DEVICE_ID_SI_745           0x0745
+#define PCI_DEVICE_ID_SI_746           0x0746
+#define PCI_DEVICE_ID_SI_748           0x0748
+#define PCI_DEVICE_ID_SI_750           0x0750
+#define PCI_DEVICE_ID_SI_751           0x0751
+#define PCI_DEVICE_ID_SI_752           0x0752
+#define PCI_DEVICE_ID_SI_755            0x0755
+#define PCI_DEVICE_ID_SI_900           0x0900
 #define PCI_DEVICE_ID_SI_5107          0x5107
 #define PCI_DEVICE_ID_SI_5300          0x5300
 #define PCI_DEVICE_ID_SI_5511          0x5511
 #define PCI_DEVICE_ID_SI_5513          0x5513
+#define PCI_DEVICE_ID_SI_5518          0x5518
 #define PCI_DEVICE_ID_SI_5571          0x5571
+#define PCI_DEVICE_ID_SI_5581          0x5581
+#define PCI_DEVICE_ID_SI_5582          0x5582
 #define PCI_DEVICE_ID_SI_5591          0x5591
+#define PCI_DEVICE_ID_SI_5596          0x5596
 #define PCI_DEVICE_ID_SI_5597          0x5597
 #define PCI_DEVICE_ID_SI_5598          0x5598
 #define PCI_DEVICE_ID_SI_5600          0x5600
@@ -380,10 +586,25 @@
 #define PCI_DEVICE_ID_SI_6306          0x6306
 #define PCI_DEVICE_ID_SI_6326          0x6326
 #define PCI_DEVICE_ID_SI_7001          0x7001
+#define PCI_DEVICE_ID_SI_7016          0x7016
 
 #define PCI_VENDOR_ID_HP               0x103c
+#define PCI_DEVICE_ID_HP_DONNER_GFX    0x1008
+#define PCI_DEVICE_ID_HP_TACHYON       0x1028
+#define PCI_DEVICE_ID_HP_TACHLITE      0x1029
 #define PCI_DEVICE_ID_HP_J2585A                0x1030
 #define PCI_DEVICE_ID_HP_J2585B                0x1031
+#define PCI_DEVICE_ID_HP_SAS           0x1048
+#define PCI_DEVICE_ID_HP_DIVA1         0x1049
+#define PCI_DEVICE_ID_HP_DIVA2         0x104A
+#define PCI_DEVICE_ID_HP_SP2_0         0x104B
+#define PCI_DEVICE_ID_HP_PCI_LBA       0x1054
+#define PCI_DEVICE_ID_HP_REO_SBA       0x10f0
+#define PCI_DEVICE_ID_HP_REO_IOC       0x10f1
+#define PCI_DEVICE_ID_HP_ZX1_SBA       0x1229
+#define PCI_DEVICE_ID_HP_ZX1_IOC       0x122a
+#define PCI_DEVICE_ID_HP_PCIX_LBA      0x122e
+#define PCI_DEVICE_ID_HP_SX1000_IOC    0x127c
 
 #define PCI_VENDOR_ID_PCTECH           0x1042
 #define PCI_DEVICE_ID_PCTECH_RZ1000    0x1000
@@ -433,12 +654,16 @@
 #define PCI_DEVICE_ID_TI_1220          0xac17
 #define PCI_DEVICE_ID_TI_1221          0xac19
 #define PCI_DEVICE_ID_TI_1210          0xac1a
+#define PCI_DEVICE_ID_TI_1410          0xac50
 #define PCI_DEVICE_ID_TI_1450          0xac1b
 #define PCI_DEVICE_ID_TI_1225          0xac1c
 #define PCI_DEVICE_ID_TI_1251A         0xac1d
 #define PCI_DEVICE_ID_TI_1211          0xac1e
 #define PCI_DEVICE_ID_TI_1251B         0xac1f
+#define PCI_DEVICE_ID_TI_4410          0xac41
+#define PCI_DEVICE_ID_TI_4451          0xac42
 #define PCI_DEVICE_ID_TI_1420          0xac51
+#define PCI_DEVICE_ID_TI_1520          0xac55
 #define PCI_DEVICE_ID_TI_1510          0xac56
 
 #define PCI_VENDOR_ID_SONY             0x104d
@@ -466,20 +691,25 @@
 #define PCI_VENDOR_ID_MOTOROLA_OOPS    0x1507
 #define PCI_DEVICE_ID_MOTOROLA_MPC105  0x0001
 #define PCI_DEVICE_ID_MOTOROLA_MPC106  0x0002
+#define PCI_DEVICE_ID_MOTOROLA_MPC107  0x0004
 #define PCI_DEVICE_ID_MOTOROLA_RAVEN   0x4801
 #define PCI_DEVICE_ID_MOTOROLA_FALCON  0x4802
 #define PCI_DEVICE_ID_MOTOROLA_HAWK    0x4803
 #define PCI_DEVICE_ID_MOTOROLA_CPX8216 0x4806
-#define PCI_DEVICE_ID_MOTOROLA_MPC190  0x6400
-#define PCI_DEVICE_ID_MOTOROLA_MPC8265A 0x18c0
-#define PCI_DEVICE_ID_MOTOROLA_MPC8540  0x0008
-#define PCI_DEVICE_ID_MOTOROLA_MPC8560  0x0009
 
 #define PCI_VENDOR_ID_PROMISE          0x105a
 #define PCI_DEVICE_ID_PROMISE_20265    0x0d30
 #define PCI_DEVICE_ID_PROMISE_20267    0x4d30
 #define PCI_DEVICE_ID_PROMISE_20246    0x4d33
 #define PCI_DEVICE_ID_PROMISE_20262    0x4d38
+#define PCI_DEVICE_ID_PROMISE_20263    0x0D38
+#define PCI_DEVICE_ID_PROMISE_20268    0x4d68
+#define PCI_DEVICE_ID_PROMISE_20270    0x6268
+#define PCI_DEVICE_ID_PROMISE_20269    0x4d69
+#define PCI_DEVICE_ID_PROMISE_20271    0x6269
+#define PCI_DEVICE_ID_PROMISE_20275    0x1275
+#define PCI_DEVICE_ID_PROMISE_20276    0x5275
+#define PCI_DEVICE_ID_PROMISE_20277    0x7275
 #define PCI_DEVICE_ID_PROMISE_5300     0x5300
 
 #define PCI_VENDOR_ID_N9               0x105d
@@ -521,6 +751,14 @@
 #define PCI_DEVICE_ID_APPLE_KL_USB     0x0019
 #define PCI_DEVICE_ID_APPLE_UNI_N_AGP  0x0020
 #define PCI_DEVICE_ID_APPLE_UNI_N_GMAC 0x0021
+#define PCI_DEVICE_ID_APPLE_KEYLARGO   0x0022
+#define PCI_DEVICE_ID_APPLE_UNI_N_GMACP        0x0024
+#define PCI_DEVICE_ID_APPLE_KEYLARGO_P 0x0025
+#define PCI_DEVICE_ID_APPLE_KL_USB_P   0x0026
+#define PCI_DEVICE_ID_APPLE_UNI_N_AGP_P        0x0027
+#define PCI_DEVICE_ID_APPLE_UNI_N_AGP15        0x002d
+#define PCI_DEVICE_ID_APPLE_UNI_N_FW2  0x0030
+#define PCI_DEVICE_ID_APPLE_TIGON3     0x1645
 
 #define PCI_VENDOR_ID_YAMAHA           0x1073
 #define PCI_DEVICE_ID_YAMAHA_724       0x0004
@@ -574,11 +812,21 @@
 #define PCI_VENDOR_ID_SUN              0x108e
 #define PCI_DEVICE_ID_SUN_EBUS         0x1000
 #define PCI_DEVICE_ID_SUN_HAPPYMEAL    0x1001
+#define PCI_DEVICE_ID_SUN_RIO_EBUS     0x1100
+#define PCI_DEVICE_ID_SUN_RIO_GEM      0x1101
+#define PCI_DEVICE_ID_SUN_RIO_1394     0x1102
+#define PCI_DEVICE_ID_SUN_RIO_USB      0x1103
+#define PCI_DEVICE_ID_SUN_GEM          0x2bad
 #define PCI_DEVICE_ID_SUN_SIMBA                0x5000
 #define PCI_DEVICE_ID_SUN_PBM          0x8000
+#define PCI_DEVICE_ID_SUN_SCHIZO       0x8001
 #define PCI_DEVICE_ID_SUN_SABRE                0xa000
+#define PCI_DEVICE_ID_SUN_HUMMINGBIRD  0xa001
+#define PCI_DEVICE_ID_SUN_TOMATILLO    0xa801
 
 #define PCI_VENDOR_ID_CMD              0x1095
+#define PCI_DEVICE_ID_SII_1210SA       0x0240
+
 #define PCI_DEVICE_ID_CMD_640          0x0640
 #define PCI_DEVICE_ID_CMD_643          0x0643
 #define PCI_DEVICE_ID_CMD_646          0x0646
@@ -587,6 +835,9 @@
 #define PCI_DEVICE_ID_CMD_649          0x0649
 #define PCI_DEVICE_ID_CMD_670          0x0670
 
+#define PCI_DEVICE_ID_SII_680          0x0680
+#define PCI_DEVICE_ID_SII_3112         0x3112
+
 #define PCI_VENDOR_ID_VISION           0x1098
 #define PCI_DEVICE_ID_VISION_QD8500    0x0001
 #define PCI_DEVICE_ID_VISION_QD8580    0x0002
@@ -603,6 +854,7 @@
 
 #define PCI_VENDOR_ID_SGI              0x10a9
 #define PCI_DEVICE_ID_SGI_IOC3         0x0003
+#define PCI_DEVICE_ID_SGI_IOC4         0x100a
 
 #define PCI_VENDOR_ID_ACC              0x10aa
 #define PCI_DEVICE_ID_ACC_2056         0x0000
@@ -646,6 +898,14 @@
 #define PCI_DEVICE_ID_3COM_3C905TX     0x9050
 #define PCI_DEVICE_ID_3COM_3C905T4     0x9051
 #define PCI_DEVICE_ID_3COM_3C905B_TX   0x9055
+#define PCI_DEVICE_ID_3COM_3CR990      0x9900
+#define PCI_DEVICE_ID_3COM_3CR990_TX_95        0x9902
+#define PCI_DEVICE_ID_3COM_3CR990_TX_97        0x9903
+#define PCI_DEVICE_ID_3COM_3CR990B     0x9904
+#define PCI_DEVICE_ID_3COM_3CR990_FX   0x9905
+#define PCI_DEVICE_ID_3COM_3CR990SVR95 0x9908
+#define PCI_DEVICE_ID_3COM_3CR990SVR97 0x9909
+#define PCI_DEVICE_ID_3COM_3CR990SVR   0x990a
 
 #define PCI_VENDOR_ID_SMC              0x10b8
 #define PCI_DEVICE_ID_SMC_EPIC100      0x0005
@@ -662,7 +922,14 @@
 #define PCI_DEVICE_ID_AL_M1523         0x1523
 #define PCI_DEVICE_ID_AL_M1531         0x1531
 #define PCI_DEVICE_ID_AL_M1533         0x1533
+#define PCI_DEVICE_ID_AL_M1535                 0x1535
 #define PCI_DEVICE_ID_AL_M1541         0x1541
+#define PCI_DEVICE_ID_AL_M1621          0x1621
+#define PCI_DEVICE_ID_AL_M1631          0x1631
+#define PCI_DEVICE_ID_AL_M1641          0x1641
+#define PCI_DEVICE_ID_AL_M1644          0x1644
+#define PCI_DEVICE_ID_AL_M1647          0x1647
+#define PCI_DEVICE_ID_AL_M1651          0x1651
 #define PCI_DEVICE_ID_AL_M1543         0x1543
 #define PCI_DEVICE_ID_AL_M3307         0x3307
 #define PCI_DEVICE_ID_AL_M4803         0x5215
@@ -710,20 +977,40 @@
 #define PCI_DEVICE_ID_NVIDIA_UTNT2             0x0029
 #define PCI_DEVICE_ID_NVIDIA_VTNT2             0x002C
 #define PCI_DEVICE_ID_NVIDIA_UVTNT2            0x002D
+#define PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE       0x0065
+#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE      0x0085
+#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA     0x008e
 #define PCI_DEVICE_ID_NVIDIA_ITNT2             0x00A0
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3           0x00d1
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE       0x00d5
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3S          0x00e1
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA     0x00e3
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE      0x00e5
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2    0x00ee
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR       0x0100
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR       0x0101
 #define PCI_DEVICE_ID_NVIDIA_QUADRO            0x0103
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX       0x0110
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX2      0x0111
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GO       0x0112
 #define PCI_DEVICE_ID_NVIDIA_QUADRO2_MXR       0x0113
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS      0x0150
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS2     0x0151
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE2_ULTRA    0x0152
 #define PCI_DEVICE_ID_NVIDIA_QUADRO2_PRO       0x0153
+#define PCI_DEVICE_ID_NVIDIA_IGEFORCE2         0x01a0
+#define PCI_DEVICE_ID_NVIDIA_NFORCE            0x01a4
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_IDE                0x01bc
+#define PCI_DEVICE_ID_NVIDIA_NFORCE2           0x01e0
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE3          0x0200
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE3_1                0x0201
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE3_2                0x0202
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_DDC                0x0203
 
 #define PCI_VENDOR_ID_IMS              0x10e0
 #define PCI_DEVICE_ID_IMS_8849         0x8849
+#define PCI_DEVICE_ID_IMS_TT128                0x9128
+#define PCI_DEVICE_ID_IMS_TT3D         0x9135
 
 #define PCI_VENDOR_ID_TEKRAM2          0x10e1
 #define PCI_DEVICE_ID_TEKRAM2_690c     0x690c
@@ -743,11 +1030,16 @@
 #define PCI_DEVICE_ID_INTERG_2000      0x2000
 #define PCI_DEVICE_ID_INTERG_2010      0x2010
 #define PCI_DEVICE_ID_INTERG_5000      0x5000
+#define PCI_DEVICE_ID_INTERG_5050      0x5050
 
 #define PCI_VENDOR_ID_REALTEK          0x10ec
 #define PCI_DEVICE_ID_REALTEK_8029     0x8029
 #define PCI_DEVICE_ID_REALTEK_8129     0x8129
 #define PCI_DEVICE_ID_REALTEK_8139     0x8139
+#define PCI_DEVICE_ID_REALTEK_8169     0x8169
+
+#define PCI_VENDOR_ID_XILINX           0x10ee
+#define PCI_DEVICE_ID_TURBOPAM         0x4020
 
 #define PCI_VENDOR_ID_TRUEVISION       0x10fa
 #define PCI_DEVICE_ID_TRUEVISION_T1000 0x000c
@@ -765,6 +1057,11 @@
 #define PCI_VENDOR_ID_TTI              0x1103
 #define PCI_DEVICE_ID_TTI_HPT343       0x0003
 #define PCI_DEVICE_ID_TTI_HPT366       0x0004
+#define PCI_DEVICE_ID_TTI_HPT372       0x0005
+#define PCI_DEVICE_ID_TTI_HPT302       0x0006
+#define PCI_DEVICE_ID_TTI_HPT371       0x0007
+#define PCI_DEVICE_ID_TTI_HPT374       0x0008
+#define PCI_DEVICE_ID_TTI_HPT372N      0x0009  /* appoarently a 372N variant? */
 
 #define PCI_VENDOR_ID_VIA              0x1106
 #define PCI_DEVICE_ID_VIA_8363_0       0x0305
@@ -788,7 +1085,7 @@
 #define PCI_DEVICE_ID_VIA_82C693       0x0693
 #define PCI_DEVICE_ID_VIA_82C693_1     0x0698
 #define PCI_DEVICE_ID_VIA_82C926       0x0926
-#define PCI_DEVICE_ID_VIA_82C416       0x1571
+#define PCI_DEVICE_ID_VIA_82C576_1     0x1571
 #define PCI_DEVICE_ID_VIA_82C595_97    0x1595
 #define PCI_DEVICE_ID_VIA_82C586_2     0x3038
 #define PCI_DEVICE_ID_VIA_82C586_3     0x3040
@@ -803,6 +1100,19 @@
 #define PCI_DEVICE_ID_VIA_8233_0       0x3074
 #define PCI_DEVICE_ID_VIA_8633_0       0x3091
 #define PCI_DEVICE_ID_VIA_8367_0       0x3099
+#define PCI_DEVICE_ID_VIA_8622         0x3102
+#define PCI_DEVICE_ID_VIA_8233C_0      0x3109
+#define PCI_DEVICE_ID_VIA_8361         0x3112
+#define PCI_DEVICE_ID_VIA_8375         0x3116
+#define PCI_DEVICE_ID_VIA_CLE266       0x3123
+#define PCI_DEVICE_ID_VIA_8233A                0x3147
+#define PCI_DEVICE_ID_VIA_P4M266       0x3148
+#define PCI_DEVICE_ID_VIA_8237_SATA    0x3149
+#define PCI_DEVICE_ID_VIA_P4X333       0x3168
+#define PCI_DEVICE_ID_VIA_8235         0x3177
+#define PCI_DEVICE_ID_VIA_8377_0       0x3189
+#define PCI_DEVICE_ID_VIA_K8T400M_0    0x3188
+#define PCI_DEVICE_ID_VIA_8237         0x3227
 #define PCI_DEVICE_ID_VIA_86C100A      0x6100
 #define PCI_DEVICE_ID_VIA_8231         0x8231
 #define PCI_DEVICE_ID_VIA_8231_4       0x8235
@@ -812,10 +1122,13 @@
 #define PCI_DEVICE_ID_VIA_82C597_1     0x8597
 #define PCI_DEVICE_ID_VIA_82C598_1     0x8598
 #define PCI_DEVICE_ID_VIA_8601_1       0x8601
-#define PCI_DEVICE_ID_VIA_8505_1       0X8605
+#define PCI_DEVICE_ID_VIA_8505_1       0x8605
 #define PCI_DEVICE_ID_VIA_8633_1       0xB091
 #define PCI_DEVICE_ID_VIA_8367_1       0xB099
 
+#define PCI_VENDOR_ID_SIEMENS           0x110A
+#define PCI_DEVICE_ID_SIEMENS_DSCC4     0x2102
+
 #define PCI_VENDOR_ID_SMC2             0x1113
 #define PCI_DEVICE_ID_SMC2_1211TX      0x1211
 
@@ -870,6 +1183,7 @@
 #define PCI_VENDOR_ID_PHILIPS          0x1131
 #define PCI_DEVICE_ID_PHILIPS_SAA7145  0x7145
 #define PCI_DEVICE_ID_PHILIPS_SAA7146  0x7146
+#define PCI_DEVICE_ID_PHILIPS_SAA9730  0x9730
 
 #define PCI_VENDOR_ID_EICON            0x1133
 #define PCI_DEVICE_ID_EICON_DIVA20PRO  0xe001
@@ -877,6 +1191,7 @@
 #define PCI_DEVICE_ID_EICON_DIVA20PRO_U        0xe003
 #define PCI_DEVICE_ID_EICON_DIVA20_U   0xe004
 #define PCI_DEVICE_ID_EICON_DIVA201    0xe005
+#define PCI_DEVICE_ID_EICON_DIVA202    0xe00b
 #define PCI_DEVICE_ID_EICON_MAESTRA    0xe010
 #define PCI_DEVICE_ID_EICON_MAESTRAQ   0xe012
 #define PCI_DEVICE_ID_EICON_MAESTRAQ_U 0xe013
@@ -895,7 +1210,9 @@
 #define PCI_DEVICE_ID_SYSKONNECT_FP    0x4000
 #define PCI_DEVICE_ID_SYSKONNECT_TR    0x4200
 #define PCI_DEVICE_ID_SYSKONNECT_GE    0x4300
-#define PCI_DEVICE_ID_SYSKONNECT_GE_SA 0x4320
+#define PCI_DEVICE_ID_SYSKONNECT_YU    0x4320
+#define PCI_DEVICE_ID_SYSKONNECT_9DXX  0x4400
+#define PCI_DEVICE_ID_SYSKONNECT_9MXX  0x4500
 
 #define PCI_VENDOR_ID_VMIC             0x114a
 #define PCI_DEVICE_ID_VMIC_VME         0x7587
@@ -917,19 +1234,33 @@
 #define PCI_VENDOR_ID_MUTECH           0x1159
 #define PCI_DEVICE_ID_MUTECH_MV1000    0x0001
 
+#define PCI_VENDOR_ID_XIRCOM           0x115d
+#define PCI_DEVICE_ID_XIRCOM_X3201_ETH 0x0003
+#define PCI_DEVICE_ID_XIRCOM_X3201_MDM 0x0103
+
 #define PCI_VENDOR_ID_RENDITION                0x1163
 #define PCI_DEVICE_ID_RENDITION_VERITE 0x0001
 #define PCI_DEVICE_ID_RENDITION_VERITE2100 0x2000
 
-#define PCI_VENDOR_ID_SERVERWORKS      0x1166
-#define PCI_DEVICE_ID_SERVERWORKS_HE   0x0008
-#define PCI_DEVICE_ID_SERVERWORKS_LE   0x0009
-#define PCI_DEVICE_ID_SERVERWORKS_CIOB30   0x0010
-#define PCI_DEVICE_ID_SERVERWORKS_CMIC_HE  0x0011
-#define PCI_DEVICE_ID_SERVERWORKS_CSB5    0x0201
-#define PCI_DEVICE_ID_SERVERWORKS_OSB4 0x0200
+#define PCI_VENDOR_ID_SERVERWORKS        0x1166
+#define PCI_DEVICE_ID_SERVERWORKS_HE     0x0008
+#define PCI_DEVICE_ID_SERVERWORKS_LE     0x0009
+#define PCI_DEVICE_ID_SERVERWORKS_CIOB30  0x0010
+#define PCI_DEVICE_ID_SERVERWORKS_CMIC_HE 0x0011
+#define PCI_DEVICE_ID_SERVERWORKS_GCNB_LE 0x0017
+#define PCI_DEVICE_ID_SERVERWORKS_OSB4   0x0200
+#define PCI_DEVICE_ID_SERVERWORKS_CSB5   0x0201
+#define PCI_DEVICE_ID_SERVERWORKS_CSB6    0x0203
 #define PCI_DEVICE_ID_SERVERWORKS_OSB4IDE 0x0211
+#define PCI_DEVICE_ID_SERVERWORKS_CSB5IDE 0x0212
+#define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE 0x0213
+#define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2 0x0217
 #define PCI_DEVICE_ID_SERVERWORKS_OSB4USB 0x0220
+#define PCI_DEVICE_ID_SERVERWORKS_CSB5USB PCI_DEVICE_ID_SERVERWORKS_OSB4USB
+#define PCI_DEVICE_ID_SERVERWORKS_CSB6USB 0x0221
+#define PCI_DEVICE_ID_SERVERWORKS_GCLE    0x0225
+#define PCI_DEVICE_ID_SERVERWORKS_GCLE2   0x0227
+#define PCI_DEVICE_ID_SERVERWORKS_CSB5ISA 0x0230
 
 #define PCI_VENDOR_ID_SBE              0x1176
 #define PCI_DEVICE_ID_SBE_WANXL100     0x0301
@@ -937,10 +1268,16 @@
 #define PCI_DEVICE_ID_SBE_WANXL400     0x0104
 
 #define PCI_VENDOR_ID_TOSHIBA          0x1179
+#define PCI_DEVICE_ID_TOSHIBA_PICCOLO  0x0102
 #define PCI_DEVICE_ID_TOSHIBA_601      0x0601
 #define PCI_DEVICE_ID_TOSHIBA_TOPIC95  0x060a
 #define PCI_DEVICE_ID_TOSHIBA_TOPIC97  0x060f
 
+#define PCI_VENDOR_ID_TOSHIBA_2                0x102f
+#define PCI_DEVICE_ID_TOSHIBA_TX3927   0x000a
+#define PCI_DEVICE_ID_TOSHIBA_TC35815CF        0x0030
+#define PCI_DEVICE_ID_TOSHIBA_TX4927   0x0180
+
 #define PCI_VENDOR_ID_RICOH            0x1180
 #define PCI_DEVICE_ID_RICOH_RL5C465    0x0465
 #define PCI_DEVICE_ID_RICOH_RL5C466    0x0466
@@ -953,6 +1290,8 @@
 #define PCI_DEVICE_ID_ARTOP_ATP850UF   0x0005
 #define PCI_DEVICE_ID_ARTOP_ATP860     0x0006
 #define PCI_DEVICE_ID_ARTOP_ATP860R    0x0007
+#define PCI_DEVICE_ID_ARTOP_ATP865     0x0008
+#define PCI_DEVICE_ID_ARTOP_ATP865R    0x0009
 #define PCI_DEVICE_ID_ARTOP_AEC7610    0x8002
 #define PCI_DEVICE_ID_ARTOP_AEC7612UW  0x8010
 #define PCI_DEVICE_ID_ARTOP_AEC7612U   0x8020
@@ -968,6 +1307,10 @@
 #define PCI_VENDOR_ID_OMEGA            0x119b
 #define PCI_DEVICE_ID_OMEGA_82C092G    0x1221
 
+#define PCI_VENDOR_ID_FUJITSU_ME       0x119e
+#define PCI_DEVICE_ID_FUJITSU_FS155    0x0001
+#define PCI_DEVICE_ID_FUJITSU_FS50     0x0003
+
 #define PCI_SUBVENDOR_ID_KEYSPAN       0x11a9
 #define PCI_SUBDEVICE_ID_KEYSPAN_SX2   0x5334
 
@@ -1002,6 +1345,9 @@
 #define PCI_VENDOR_ID_AURAVISION       0x11d1
 #define PCI_DEVICE_ID_AURAVISION_VXP524        0x01f7
 
+#define PCI_VENDOR_ID_ANALOG_DEVICES   0x11d4
+#define PCI_DEVICE_ID_AD1889JS         0x1889
+
 #define PCI_VENDOR_ID_IKON             0x11d5
 #define PCI_DEVICE_ID_IKON_10115       0x0115
 #define PCI_DEVICE_ID_IKON_10117       0x0117
@@ -1066,6 +1412,8 @@
 #define PCI_DEVICE_ID_AVM_B1           0x0700
 #define PCI_DEVICE_ID_AVM_C4           0x0800
 #define PCI_DEVICE_ID_AVM_A1           0x0a00
+#define PCI_DEVICE_ID_AVM_A1_V2                0x0e00
+#define PCI_DEVICE_ID_AVM_C2           0x1100
 #define PCI_DEVICE_ID_AVM_T1           0x1200
 
 #define PCI_VENDOR_ID_DIPIX            0x1246
@@ -1096,17 +1444,19 @@
 #define PCI_DEVICE_ID_HUGHES_DIRECPC   0x0002
 
 #define PCI_VENDOR_ID_ENSONIQ          0x1274
-#define PCI_DEVICE_ID_ENSONIQ_AUDIOPCI 0x5000
+#define PCI_DEVICE_ID_ENSONIQ_CT5880   0x5880
+#define PCI_DEVICE_ID_ENSONIQ_ES1370   0x5000
 #define PCI_DEVICE_ID_ENSONIQ_ES1371   0x1371
 
 #define PCI_VENDOR_ID_ROCKWELL         0x127A
 
-#define PCI_VENDOR_ID_DAVICOM          0x1282
-#define PCI_DEVICE_ID_DAVICOM_DM9102A  0x9102
-
 #define PCI_VENDOR_ID_ITE              0x1283
 #define PCI_DEVICE_ID_ITE_IT8172G      0x8172
 #define PCI_DEVICE_ID_ITE_IT8172G_AUDIO 0x0801
+#define PCI_DEVICE_ID_ITE_IT8181       0x8181
+#define PCI_DEVICE_ID_ITE_8872         0x8872
+
+#define PCI_DEVICE_ID_ITE_IT8330G_0    0xe886
 
 /* formerly Platform Tech */
 #define PCI_VENDOR_ID_ESS_OLD          0x1285
@@ -1218,6 +1568,9 @@
 #define PCI_SUBDEVICE_ID_HYPERCOPE_CHAMP2      0x0108
 #define PCI_SUBDEVICE_ID_HYPERCOPE_PLEXUS      0x0109
 
+#define PCI_VENDOR_ID_KAWASAKI         0x136b
+#define PCI_DEVICE_ID_MCHIP_KL5A72002  0xff01
+
 #define PCI_VENDOR_ID_LMC              0x1376
 #define PCI_DEVICE_ID_LMC_HSSI         0x0003
 #define PCI_DEVICE_ID_LMC_DS3          0x0004
@@ -1226,6 +1579,7 @@
 
 #define PCI_VENDOR_ID_NETGEAR          0x1385
 #define PCI_DEVICE_ID_NETGEAR_GA620    0x620a
+#define PCI_DEVICE_ID_NETGEAR_GA622    0x622a
 
 #define PCI_VENDOR_ID_APPLICOM         0x1389
 #define PCI_DEVICE_ID_APPLICOM_PCIGENERIC 0x0001
@@ -1267,6 +1621,8 @@
 #define PCI_DEVICE_ID_LAVA_DSERIAL     0x0100 /* 2x 16550 */
 #define PCI_DEVICE_ID_LAVA_QUATRO_A    0x0101 /* 2x 16550, half of 4 port */
 #define PCI_DEVICE_ID_LAVA_QUATRO_B    0x0102 /* 2x 16550, half of 4 port */
+#define PCI_DEVICE_ID_LAVA_OCTO_A      0x0180 /* 4x 16550A, half of 8 port */
+#define PCI_DEVICE_ID_LAVA_OCTO_B      0x0181 /* 4x 16550A, half of 8 port */
 #define PCI_DEVICE_ID_LAVA_PORT_PLUS   0x0200 /* 2x 16650 */
 #define PCI_DEVICE_ID_LAVA_QUAD_A      0x0201 /* 2x 16650, half of 4 port */
 #define PCI_DEVICE_ID_LAVA_QUAD_B      0x0202 /* 2x 16650, half of 4 port */
@@ -1281,9 +1637,11 @@
 #define PCI_DEVICE_ID_TIMEDIA_1889     0x7168
 
 #define PCI_VENDOR_ID_OXSEMI           0x1415
+#define PCI_DEVICE_ID_OXSEMI_12PCI840  0x8403
 #define PCI_DEVICE_ID_OXSEMI_16PCI954  0x9501
-#define PCI_DEVICE_ID_OXSEMI_16PCI952  0x950A
 #define PCI_DEVICE_ID_OXSEMI_16PCI95N  0x9511
+#define PCI_DEVICE_ID_OXSEMI_16PCI954PP        0x9513
+#define PCI_DEVICE_ID_OXSEMI_16PCI952  0x9521
 
 #define PCI_VENDOR_ID_AIRONET          0x14b9
 #define PCI_DEVICE_ID_AIRONET_4800_1   0x0001
@@ -1291,6 +1649,13 @@
 #define PCI_DEVICE_ID_AIRONET_4500     0x4800 /* drivers/net/aironet4500_card.c */
 
 #define PCI_VENDOR_ID_TITAN            0x14D2
+#define PCI_DEVICE_ID_TITAN_010L       0x8001
+#define PCI_DEVICE_ID_TITAN_100L       0x8010
+#define PCI_DEVICE_ID_TITAN_110L       0x8011
+#define PCI_DEVICE_ID_TITAN_200L       0x8020
+#define PCI_DEVICE_ID_TITAN_210L       0x8021
+#define PCI_DEVICE_ID_TITAN_400L       0x8040
+#define PCI_DEVICE_ID_TITAN_800L       0x8080
 #define PCI_DEVICE_ID_TITAN_100                0xA001
 #define PCI_DEVICE_ID_TITAN_200                0xA005
 #define PCI_DEVICE_ID_TITAN_400                0xA003
@@ -1301,7 +1666,37 @@
 #define PCI_DEVICE_ID_PANACOM_DUALMODEM        0x0402
 
 #define PCI_VENDOR_ID_AFAVLAB          0x14db
-#define PCI_DEVICE_ID_AFAVLAB_TK9902   0x2120
+#define PCI_DEVICE_ID_AFAVLAB_P028     0x2180
+
+#define PCI_VENDOR_ID_BROADCOM         0x14e4
+#define PCI_DEVICE_ID_TIGON3_5700      0x1644
+#define PCI_DEVICE_ID_TIGON3_5701      0x1645
+#define PCI_DEVICE_ID_TIGON3_5702      0x1646
+#define PCI_DEVICE_ID_TIGON3_5703      0x1647
+#define PCI_DEVICE_ID_TIGON3_5704      0x1648
+#define PCI_DEVICE_ID_TIGON3_5704S_2   0x1649
+#define PCI_DEVICE_ID_TIGON3_5702FE    0x164d
+#define PCI_DEVICE_ID_TIGON3_5705      0x1653
+#define PCI_DEVICE_ID_TIGON3_5705_2    0x1654
+#define PCI_DEVICE_ID_TIGON3_5705M     0x165d
+#define PCI_DEVICE_ID_TIGON3_5705M_2   0x165e
+#define PCI_DEVICE_ID_TIGON3_5705F     0x166e
+#define PCI_DEVICE_ID_TIGON3_5782      0x1696
+#define PCI_DEVICE_ID_TIGON3_5788      0x169c
+#define PCI_DEVICE_ID_TIGON3_5702X     0x16a6
+#define PCI_DEVICE_ID_TIGON3_5703X     0x16a7
+#define PCI_DEVICE_ID_TIGON3_5704S     0x16a8
+#define PCI_DEVICE_ID_TIGON3_5702A3    0x16c6
+#define PCI_DEVICE_ID_TIGON3_5703A3    0x16c7
+#define PCI_DEVICE_ID_TIGON3_5901      0x170d
+#define PCI_DEVICE_ID_TIGON3_5901_2    0x170e
+#define PCI_DEVICE_ID_BCM4401          0x4401
+
+#define PCI_VENDOR_ID_ENE              0x1524
+#define PCI_DEVICE_ID_ENE_1211         0x1211
+#define PCI_DEVICE_ID_ENE_1225         0x1225
+#define PCI_DEVICE_ID_ENE_1410         0x1410
+#define PCI_DEVICE_ID_ENE_1420         0x1420
 
 #define PCI_VENDOR_ID_SYBA             0x1592
 #define PCI_DEVICE_ID_SYBA_2P_EPP      0x0782
@@ -1313,12 +1708,24 @@
 #define PCI_VENDOR_ID_ZOLTRIX          0x15b0
 #define PCI_DEVICE_ID_ZOLTRIX_2BD0     0x2bd0
 
+#define PCI_VENDOR_ID_PDC              0x15e9
+#define PCI_DEVICE_ID_PDC_ADMA100      0x1841
+
+#define PCI_VENDOR_ID_ALTIMA           0x173b
+#define PCI_DEVICE_ID_ALTIMA_AC1000    0x03e8
+#define PCI_DEVICE_ID_ALTIMA_AC1001    0x03e9
+#define PCI_DEVICE_ID_ALTIMA_AC9100    0x03ea
+#define PCI_DEVICE_ID_ALTIMA_AC1003    0x03eb
+
 #define PCI_VENDOR_ID_SYMPHONY         0x1c1c
 #define PCI_DEVICE_ID_SYMPHONY_101     0x0001
 
 #define PCI_VENDOR_ID_TEKRAM           0x1de1
 #define PCI_DEVICE_ID_TEKRAM_DC290     0xdc29
 
+#define PCI_VENDOR_ID_HINT             0x3388
+#define PCI_DEVICE_ID_HINT_VXPROII_IDE 0x8013
+
 #define PCI_VENDOR_ID_3DLABS           0x3d3d
 #define PCI_DEVICE_ID_3DLABS_300SX     0x0001
 #define PCI_DEVICE_ID_3DLABS_500TX     0x0002
@@ -1333,6 +1740,13 @@
 #define PCI_DEVICE_ID_AVANCE_ALG2064   0x2064
 #define PCI_DEVICE_ID_AVANCE_2302      0x2302
 
+#define PCI_VENDOR_ID_AKS              0x416c
+#define PCI_DEVICE_ID_AKS_ALADDINCARD  0x0100
+#define PCI_DEVICE_ID_AKS_CPC          0x0200
+
+#define PCI_VENDOR_ID_REDCREEK         0x4916
+#define PCI_DEVICE_ID_RC45             0x1960
+
 #define PCI_VENDOR_ID_NETVIN           0x4a14
 #define PCI_DEVICE_ID_NETVIN_NV5000SC  0x5000
 
@@ -1359,39 +1773,33 @@
 #define PCI_DEVICE_ID_S3_ViRGE_MXPMV   0x8c03
 #define PCI_DEVICE_ID_S3_SONICVIBES    0xca00
 
-#define PCI_VENDOR_ID_DCI              0x6666
-#define PCI_DEVICE_ID_DCI_PCCOM4       0x0001
-
+#define PCI_VENDOR_ID_DUNORD           0x5544
+#define PCI_DEVICE_ID_DUNORD_I3000     0x0001
 #define PCI_VENDOR_ID_GENROCO          0x5555
 #define PCI_DEVICE_ID_GENROCO_HFP832   0x0003
 
+#define PCI_VENDOR_ID_DCI              0x6666
+#define PCI_DEVICE_ID_DCI_PCCOM4       0x0001
+#define PCI_DEVICE_ID_DCI_PCCOM8       0x0002
+
 #define PCI_VENDOR_ID_INTEL            0x8086
 #define PCI_DEVICE_ID_INTEL_21145      0x0039
-#define PCI_DEVICE_ID_INTEL_21152BB    0xb152
 #define PCI_DEVICE_ID_INTEL_82375      0x0482
 #define PCI_DEVICE_ID_INTEL_82424      0x0483
 #define PCI_DEVICE_ID_INTEL_82378      0x0484
 #define PCI_DEVICE_ID_INTEL_82430      0x0486
 #define PCI_DEVICE_ID_INTEL_82434      0x04a3
 #define PCI_DEVICE_ID_INTEL_I960       0x0960
-#define PCI_DEVICE_ID_INTEL_82542              0x1000
-#define PCI_DEVICE_ID_INTEL_82543GC_FIBER      0x1001
-#define PCI_DEVICE_ID_INTEL_82543GC_COPPER     0x1004
-#define PCI_DEVICE_ID_INTEL_82544EI_COPPER     0x1008
-#define PCI_DEVICE_ID_INTEL_82544EI_FIBER      0x1009
-#define PCI_DEVICE_ID_INTEL_82544GC_COPPER     0x100C
-#define PCI_DEVICE_ID_INTEL_82544GC_LOM        0x100D
-#define PCI_DEVICE_ID_INTEL_82540EM            0x100E
-#define PCI_DEVICE_ID_INTEL_82545EM_COPPER     0x100F
-#define PCI_DEVICE_ID_INTEL_82546EB_COPPER     0x1010
-#define PCI_DEVICE_ID_INTEL_82545EM_FIBER      0x1011
-#define PCI_DEVICE_ID_INTEL_82546EB_FIBER      0x1012
-#define PCI_DEVICE_ID_INTEL_82540EM_LOM                0x1015
-#define PCI_DEVICE_ID_INTEL_82559      0x1030
+#define PCI_DEVICE_ID_INTEL_I960RM     0x0962
+#define PCI_DEVICE_ID_INTEL_82562ET    0x1031
+
+#define PCI_DEVICE_ID_INTEL_82815_MC   0x1130
+
 #define PCI_DEVICE_ID_INTEL_82559ER    0x1209
 #define PCI_DEVICE_ID_INTEL_82092AA_0  0x1221
 #define PCI_DEVICE_ID_INTEL_82092AA_1  0x1222
 #define PCI_DEVICE_ID_INTEL_7116       0x1223
+#define PCI_DEVICE_ID_INTEL_7205_0     0x255d
 #define PCI_DEVICE_ID_INTEL_82596      0x1226
 #define PCI_DEVICE_ID_INTEL_82865      0x1227
 #define PCI_DEVICE_ID_INTEL_82557      0x1229
@@ -1404,6 +1812,7 @@
 #define PCI_DEVICE_ID_INTEL_82380FB    0x124b
 #define PCI_DEVICE_ID_INTEL_82439      0x1250
 #define PCI_DEVICE_ID_INTEL_80960_RP   0x1960
+#define PCI_DEVICE_ID_INTEL_82845_HB   0x1a30
 #define PCI_DEVICE_ID_INTEL_82371SB_0  0x7000
 #define PCI_DEVICE_ID_INTEL_82371SB_1  0x7010
 #define PCI_DEVICE_ID_INTEL_82371SB_2  0x7020
@@ -1427,13 +1836,78 @@
 #define PCI_DEVICE_ID_INTEL_82801AB_5  0x2425
 #define PCI_DEVICE_ID_INTEL_82801AB_6  0x2426
 #define PCI_DEVICE_ID_INTEL_82801AB_8  0x2428
-#define PCI_DEVICE_ID_INTEL_82820FW_0  0x2440
-#define PCI_DEVICE_ID_INTEL_82820FW_1  0x2442
-#define PCI_DEVICE_ID_INTEL_82820FW_2  0x2443
-#define PCI_DEVICE_ID_INTEL_82820FW_3  0x2444
-#define PCI_DEVICE_ID_INTEL_82820FW_4  0x2449
-#define PCI_DEVICE_ID_INTEL_82820FW_5  0x244b
-#define PCI_DEVICE_ID_INTEL_82820FW_6  0x244e
+#define PCI_DEVICE_ID_INTEL_82801BA_0  0x2440
+#define PCI_DEVICE_ID_INTEL_82801BA_1  0x2442
+#define PCI_DEVICE_ID_INTEL_82801BA_2  0x2443
+#define PCI_DEVICE_ID_INTEL_82801BA_3  0x2444
+#define PCI_DEVICE_ID_INTEL_82801BA_4  0x2445
+#define PCI_DEVICE_ID_INTEL_82801BA_5  0x2446
+#define PCI_DEVICE_ID_INTEL_82801BA_6  0x2448
+#define PCI_DEVICE_ID_INTEL_82801BA_7  0x2449
+#define PCI_DEVICE_ID_INTEL_82801BA_8  0x244a
+#define PCI_DEVICE_ID_INTEL_82801BA_9  0x244b
+#define PCI_DEVICE_ID_INTEL_82801BA_10 0x244c
+#define PCI_DEVICE_ID_INTEL_82801BA_11 0x244e
+#define PCI_DEVICE_ID_INTEL_82801E_0   0x2450
+#define PCI_DEVICE_ID_INTEL_82801E_2   0x2452
+#define PCI_DEVICE_ID_INTEL_82801E_3   0x2453
+#define PCI_DEVICE_ID_INTEL_82801E_9   0x2459
+#define PCI_DEVICE_ID_INTEL_82801E_11  0x245B
+#define PCI_DEVICE_ID_INTEL_82801E_14  0x245D
+#define PCI_DEVICE_ID_INTEL_82801E_15  0x245E
+#define PCI_DEVICE_ID_INTEL_82801CA_0  0x2480
+#define PCI_DEVICE_ID_INTEL_82801CA_2  0x2482
+#define PCI_DEVICE_ID_INTEL_82801CA_3  0x2483
+#define PCI_DEVICE_ID_INTEL_82801CA_4  0x2484
+#define PCI_DEVICE_ID_INTEL_82801CA_5  0x2485
+#define PCI_DEVICE_ID_INTEL_82801CA_6  0x2486
+#define PCI_DEVICE_ID_INTEL_82801CA_7  0x2487
+#define PCI_DEVICE_ID_INTEL_82801CA_10 0x248a
+#define PCI_DEVICE_ID_INTEL_82801CA_11 0x248b
+#define PCI_DEVICE_ID_INTEL_82801CA_12 0x248c
+#define PCI_DEVICE_ID_INTEL_82801DB_0  0x24c0
+#define PCI_DEVICE_ID_INTEL_82801DB_2  0x24c2
+#define PCI_DEVICE_ID_INTEL_82801DB_3  0x24c3
+#define PCI_DEVICE_ID_INTEL_82801DB_4  0x24c4
+#define PCI_DEVICE_ID_INTEL_82801DB_5  0x24c5
+#define PCI_DEVICE_ID_INTEL_82801DB_6  0x24c6
+#define PCI_DEVICE_ID_INTEL_82801DB_7  0x24c7
+#define PCI_DEVICE_ID_INTEL_82801DB_10 0x24ca
+#define PCI_DEVICE_ID_INTEL_82801DB_11 0x24cb
+#define PCI_DEVICE_ID_INTEL_82801DB_12 0x24cc
+#define PCI_DEVICE_ID_INTEL_82801DB_13 0x24cd
+#define PCI_DEVICE_ID_INTEL_82801EB_0  0x24d0
+#define PCI_DEVICE_ID_INTEL_82801EB_1  0x24d1
+#define PCI_DEVICE_ID_INTEL_82801EB_2  0x24d2
+#define PCI_DEVICE_ID_INTEL_82801EB_3  0x24d3
+#define PCI_DEVICE_ID_INTEL_82801EB_4  0x24d4
+#define PCI_DEVICE_ID_INTEL_82801EB_5  0x24d5
+#define PCI_DEVICE_ID_INTEL_82801EB_6  0x24d6
+#define PCI_DEVICE_ID_INTEL_82801EB_7  0x24d7
+#define PCI_DEVICE_ID_INTEL_82801DB_10 0x24ca
+#define PCI_DEVICE_ID_INTEL_82801EB_11 0x24db
+#define PCI_DEVICE_ID_INTEL_82801EB_13 0x24dd
+#define PCI_DEVICE_ID_INTEL_ESB_0      0x25a0
+#define PCI_DEVICE_ID_INTEL_ESB_1      0x25a1
+#define PCI_DEVICE_ID_INTEL_ESB_2      0x25a2
+#define PCI_DEVICE_ID_INTEL_ESB_3      0x25a3
+#define PCI_DEVICE_ID_INTEL_ESB_31     0x25b0
+#define PCI_DEVICE_ID_INTEL_ESB_4      0x25a4
+#define PCI_DEVICE_ID_INTEL_ESB_5      0x25a6
+#define PCI_DEVICE_ID_INTEL_ESB_6      0x25a7
+#define PCI_DEVICE_ID_INTEL_ESB_7      0x25a9
+#define PCI_DEVICE_ID_INTEL_ESB_8      0x25aa
+#define PCI_DEVICE_ID_INTEL_ESB_9      0x25ab
+#define PCI_DEVICE_ID_INTEL_ESB_11     0x25ac
+#define PCI_DEVICE_ID_INTEL_ESB_12     0x25ad
+#define PCI_DEVICE_ID_INTEL_ESB_13     0x25ae
+#define PCI_DEVICE_ID_INTEL_ICH6_0     0x2640
+#define PCI_DEVICE_ID_INTEL_ICH6_1     0x2641
+#define PCI_DEVICE_ID_INTEL_ICH6_2     0x266f
+#define PCI_DEVICE_ID_INTEL_ICH6_3     0x266e
+#define PCI_DEVICE_ID_INTEL_82850_HB   0x2530
+#define PCI_DEVICE_ID_INTEL_82845G_HB  0x2560
+#define PCI_DEVICE_ID_INTEL_80310      0x530d
 #define PCI_DEVICE_ID_INTEL_82810_MC1  0x7120
 #define PCI_DEVICE_ID_INTEL_82810_IG1  0x7121
 #define PCI_DEVICE_ID_INTEL_82810_MC3  0x7122
@@ -1447,6 +1921,9 @@
 #define PCI_DEVICE_ID_INTEL_82443MX_1  0x7199
 #define PCI_DEVICE_ID_INTEL_82443MX_2  0x719a
 #define PCI_DEVICE_ID_INTEL_82443MX_3  0x719b
+#define PCI_DEVICE_ID_INTEL_82443GX_0  0x71a0
+#define PCI_DEVICE_ID_INTEL_82443GX_1  0x71a1
+#define PCI_DEVICE_ID_INTEL_82443GX_2  0x71a2
 #define PCI_DEVICE_ID_INTEL_82372FB_0  0x7600
 #define PCI_DEVICE_ID_INTEL_82372FB_1  0x7601
 #define PCI_DEVICE_ID_INTEL_82372FB_2  0x7602
@@ -1454,6 +1931,7 @@
 #define PCI_DEVICE_ID_INTEL_82454GX    0x84c4
 #define PCI_DEVICE_ID_INTEL_82450GX    0x84c5
 #define PCI_DEVICE_ID_INTEL_82451NX    0x84ca
+#define PCI_DEVICE_ID_INTEL_82454NX    0x84cb
 
 #define PCI_VENDOR_ID_COMPUTONE                0x8e0e
 #define PCI_DEVICE_ID_COMPUTONE_IP2EX  0x0291
@@ -1517,8 +1995,13 @@
 #define PCI_VENDOR_ID_HOLTEK           0x9412
 #define PCI_DEVICE_ID_HOLTEK_6565      0x6565
 
+#define PCI_VENDOR_ID_NETMOS           0x9710
+#define PCI_DEVICE_ID_NETMOS_9735      0x9735
+#define PCI_DEVICE_ID_NETMOS_9835      0x9835
+
 #define PCI_SUBVENDOR_ID_EXSYS         0xd84d
 #define PCI_SUBDEVICE_ID_EXSYS_4014    0x4014
+#define PCI_SUBDEVICE_ID_EXSYS_4055    0x4055
 
 #define PCI_VENDOR_ID_TIGERJET         0xe159
 #define PCI_DEVICE_ID_TIGERJET_300     0x0001
@@ -1533,13 +2016,3 @@
 #define PCI_DEVICE_ID_MICROGATE_USC    0x0010
 #define PCI_DEVICE_ID_MICROGATE_SCC    0x0020
 #define PCI_DEVICE_ID_MICROGATE_SCA    0x0030
-
-#define PCI_VENDOR_ID_SIS               0x1039
-#define PCI_DEVICE_ID_SIS_300           0x0300
-#define PCI_DEVICE_ID_SIS_540           0x5300
-#define PCI_DEVICE_ID_SIS_630           0x6300
-
-#define PCI_VENDOR_ID_SMI               0x126f
-#define PCI_DEVICE_ID_SMI_710           0x0710
-#define PCI_DEVICE_ID_SMI_712           0x0712
-#define PCI_DEVICE_ID_SMI_810           0x0810

diff --git a/net/net.c b/net/net.c
index c9874587ea266ab54c4f7354c841ea5b75e0f569..6e0288dc0676cc7f2cd427d26b6add770eb58d0c 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -1613,14 +1613,14 @@ ushort string_to_VLAN(char *s)
        ushort id;
 
        if (s == NULL)
-               return VLAN_NONE;
+               return htons(VLAN_NONE);
 
        if (*s < '0' || *s > '9')
                id = VLAN_NONE;
        else
                id = (ushort)simple_strtoul(s, NULL, 10);
 
-       return id;
+       return htons(id);
 }
 
 void print_IPaddr (IPaddr_t x)