Consistently uppercase pci product defines.
does not address IBM oddities like
product IBM 0x0002 0x0002 MCA
minor changes to avoid duplicate defines or unclear names
(IIi -> 2I instead of III).
Index: arch/i386/pci/geodesc.c
===================================================================
RCS file: /cvs/src/sys/arch/i386/pci/geodesc.c,v
retrieving revision 1.13
diff -u -p -r1.13 geodesc.c
--- arch/i386/pci/geodesc.c 10 Dec 2014 12:27:56 -0000 1.13
+++ arch/i386/pci/geodesc.c 4 Jan 2020 03:50:20 -0000
@@ -75,7 +75,7 @@ geodesc_match(struct device *parent, voi
if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_NS &&
(PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_NS_SC1100_XBUS ||
- PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_NS_SCx200_XBUS))
+ PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_NS_SCX200_XBUS))
return (1);
return (0);
}
Index: dev/cardbus/if_fxp_cardbus.c
===================================================================
RCS file: /cvs/src/sys/dev/cardbus/if_fxp_cardbus.c,v
retrieving revision 1.36
diff -u -p -r1.36 if_fxp_cardbus.c
--- dev/cardbus/if_fxp_cardbus.c 24 Nov 2015 17:11:39 -0000 1.36
+++ dev/cardbus/if_fxp_cardbus.c 4 Jan 2020 03:50:22 -0000
@@ -93,7 +93,7 @@ struct cfattach fxp_cardbus_ca = {
};
const struct pci_matchid fxp_cardbus_devices[] = {
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_8255x },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_8255X },
};
#ifdef CBB_DEBUG
Index: dev/pci/ciss_pci.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/ciss_pci.c,v
retrieving revision 1.20
diff -u -p -r1.20 ciss_pci.c
--- dev/pci/ciss_pci.c 20 Oct 2014 19:19:20 -0000 1.20
+++ dev/pci/ciss_pci.c 4 Jan 2020 03:50:22 -0000
@@ -51,9 +51,9 @@ const struct pci_matchid ciss_pci_device
{ PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA5300 },
{ PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA5300_2 },
{ PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA5312 },
- { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA5i },
- { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA5i_2 },
- { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA6i },
+ { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA5I },
+ { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA5I_2 },
+ { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA6I },
{ PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA641 },
{ PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA642 },
{ PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA6400 },
@@ -152,7 +152,7 @@ ciss_pci_attach(struct device *parent, s
sc->iem = CISS_READYENA;
reg = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_SUBSYS_ID_REG);
if (PCI_VENDOR(reg) == PCI_VENDOR_COMPAQ &&
- (PCI_PRODUCT(reg) == PCI_PRODUCT_COMPAQ_CSA5i ||
+ (PCI_PRODUCT(reg) == PCI_PRODUCT_COMPAQ_CSA5I ||
PCI_PRODUCT(reg) == PCI_PRODUCT_COMPAQ_CSA532 ||
PCI_PRODUCT(reg) == PCI_PRODUCT_COMPAQ_CSA5312))
sc->iem = CISS_READYENAB;
Index: dev/pci/envy.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/envy.c,v
retrieving revision 1.80
diff -u -p -r1.80 envy.c
--- dev/pci/envy.c 23 Nov 2019 17:22:10 -0000 1.80
+++ dev/pci/envy.c 4 Jan 2020 03:50:22 -0000
@@ -217,7 +217,7 @@ struct midi_hw_if envy_midi_hw_if = {
struct pci_matchid envy_matchids[] = {
{ PCI_VENDOR_ICENSEMBLE, PCI_PRODUCT_ICENSEMBLE_ICE1712 },
- { PCI_VENDOR_ICENSEMBLE, PCI_PRODUCT_ICENSEMBLE_VT172x }
+ { PCI_VENDOR_ICENSEMBLE, PCI_PRODUCT_ICENSEMBLE_VT172X }
};
/*
@@ -1723,7 +1723,7 @@ envyattach(struct device *parent, struct
sc->ibuf.addr = sc->obuf.addr = NULL;
sc->ccs_iosz = 0;
sc->mt_iosz = 0;
- sc->isht = (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ICENSEMBLE_VT172x);
+ sc->isht = (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ICENSEMBLE_VT172X);
if (pci_mapreg_map(pa, ENVY_CTL_BAR, PCI_MAPREG_TYPE_IO, 0,
&sc->ccs_iot, &sc->ccs_ioh, NULL, &sc->ccs_iosz, 0)) {
Index: dev/pci/gdt_pci.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/gdt_pci.c,v
retrieving revision 1.25
diff -u -p -r1.25 gdt_pci.c
--- dev/pci/gdt_pci.c 14 Mar 2015 03:38:48 -0000 1.25
+++ dev/pci/gdt_pci.c 4 Jan 2020 03:50:22 -0000
@@ -191,52 +191,52 @@ gdt_pci_attach(struct device *parent, st
if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_VORTEX) {
prod = PCI_PRODUCT(pa->pa_id);
switch (prod) {
- case PCI_PRODUCT_VORTEX_GDT_60x0:
+ case PCI_PRODUCT_VORTEX_GDT_60X0:
case PCI_PRODUCT_VORTEX_GDT_6000B:
sc->sc_class = GDT_PCI;
break;
- case PCI_PRODUCT_VORTEX_GDT_6x10:
- case PCI_PRODUCT_VORTEX_GDT_6x20:
+ case PCI_PRODUCT_VORTEX_GDT_6X10:
+ case PCI_PRODUCT_VORTEX_GDT_6X20:
case PCI_PRODUCT_VORTEX_GDT_6530:
case PCI_PRODUCT_VORTEX_GDT_6550:
- case PCI_PRODUCT_VORTEX_GDT_6x17:
- case PCI_PRODUCT_VORTEX_GDT_6x27:
+ case PCI_PRODUCT_VORTEX_GDT_6X17:
+ case PCI_PRODUCT_VORTEX_GDT_6X27:
case PCI_PRODUCT_VORTEX_GDT_6537:
case PCI_PRODUCT_VORTEX_GDT_6557:
- case PCI_PRODUCT_VORTEX_GDT_6x15:
- case PCI_PRODUCT_VORTEX_GDT_6x25:
+ case PCI_PRODUCT_VORTEX_GDT_6X15:
+ case PCI_PRODUCT_VORTEX_GDT_6X25:
case PCI_PRODUCT_VORTEX_GDT_6535:
case PCI_PRODUCT_VORTEX_GDT_6555:
sc->sc_class = GDT_PCINEW;
break;
- case PCI_PRODUCT_VORTEX_GDT_6x17RP:
- case PCI_PRODUCT_VORTEX_GDT_6x27RP:
+ case PCI_PRODUCT_VORTEX_GDT_6X17RP:
+ case PCI_PRODUCT_VORTEX_GDT_6X27RP:
case PCI_PRODUCT_VORTEX_GDT_6537RP:
case PCI_PRODUCT_VORTEX_GDT_6557RP:
- case PCI_PRODUCT_VORTEX_GDT_6x11RP:
- case PCI_PRODUCT_VORTEX_GDT_6x21RP:
- case PCI_PRODUCT_VORTEX_GDT_6x17RD:
- case PCI_PRODUCT_VORTEX_GDT_6x27RD:
+ case PCI_PRODUCT_VORTEX_GDT_6X11RP:
+ case PCI_PRODUCT_VORTEX_GDT_6X21RP:
+ case PCI_PRODUCT_VORTEX_GDT_6X17RD:
+ case PCI_PRODUCT_VORTEX_GDT_6X27RD:
case PCI_PRODUCT_VORTEX_GDT_6537RD:
case PCI_PRODUCT_VORTEX_GDT_6557RD:
- case PCI_PRODUCT_VORTEX_GDT_6x11RD:
- case PCI_PRODUCT_VORTEX_GDT_6x21RD:
- case PCI_PRODUCT_VORTEX_GDT_6x18RD:
- case PCI_PRODUCT_VORTEX_GDT_6x28RD:
- case PCI_PRODUCT_VORTEX_GDT_6x38RD:
- case PCI_PRODUCT_VORTEX_GDT_6x58RD:
+ case PCI_PRODUCT_VORTEX_GDT_6X11RD:
+ case PCI_PRODUCT_VORTEX_GDT_6X21RD:
+ case PCI_PRODUCT_VORTEX_GDT_6X18RD:
+ case PCI_PRODUCT_VORTEX_GDT_6X28RD:
+ case PCI_PRODUCT_VORTEX_GDT_6X38RD:
+ case PCI_PRODUCT_VORTEX_GDT_6X58RD:
case PCI_PRODUCT_VORTEX_GDT_6518RS:
- case PCI_PRODUCT_VORTEX_GDT_7x18RN:
- case PCI_PRODUCT_VORTEX_GDT_7x28RN:
- case PCI_PRODUCT_VORTEX_GDT_7x38RN:
- case PCI_PRODUCT_VORTEX_GDT_7x58RN:
- case PCI_PRODUCT_VORTEX_GDT_6x19RD:
- case PCI_PRODUCT_VORTEX_GDT_6x29RD:
- case PCI_PRODUCT_VORTEX_GDT_7x19RN:
- case PCI_PRODUCT_VORTEX_GDT_7x29RN:
- case PCI_PRODUCT_VORTEX_GDT_7x43RN:
+ case PCI_PRODUCT_VORTEX_GDT_7X18RN:
+ case PCI_PRODUCT_VORTEX_GDT_7X28RN:
+ case PCI_PRODUCT_VORTEX_GDT_7X38RN:
+ case PCI_PRODUCT_VORTEX_GDT_7X58RN:
+ case PCI_PRODUCT_VORTEX_GDT_6X19RD:
+ case PCI_PRODUCT_VORTEX_GDT_6X29RD:
+ case PCI_PRODUCT_VORTEX_GDT_7X19RN:
+ case PCI_PRODUCT_VORTEX_GDT_7X29RN:
+ case PCI_PRODUCT_VORTEX_GDT_7X43RN:
sc->sc_class = GDT_MPR;
}
Index: dev/pci/if_fxp_pci.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_fxp_pci.c,v
retrieving revision 1.65
diff -u -p -r1.65 if_fxp_pci.c
--- dev/pci/if_fxp_pci.c 24 Nov 2015 17:11:39 -0000 1.65
+++ dev/pci/if_fxp_pci.c 4 Jan 2020 03:50:22 -0000
@@ -87,7 +87,7 @@ struct cfattach fxp_pci_ca = {
};
const struct pci_matchid fxp_pci_devices[] = {
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_8255x },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_8255X },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82552 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82559 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82559ER },
@@ -186,7 +186,7 @@ fxp_pci_attach(struct device *parent, st
}
switch (PCI_PRODUCT(pa->pa_id)) {
- case PCI_PRODUCT_INTEL_8255x:
+ case PCI_PRODUCT_INTEL_8255X:
case PCI_PRODUCT_INTEL_82559:
case PCI_PRODUCT_INTEL_82559ER:
chipname = "i82557";
Index: dev/pci/if_msk.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_msk.c,v
retrieving revision 1.133
diff -u -p -r1.133 if_msk.c
--- dev/pci/if_msk.c 26 Aug 2019 11:05:54 -0000 1.133
+++ dev/pci/if_msk.c 4 Jan 2020 03:50:22 -0000
@@ -212,8 +212,8 @@ const struct pci_matchid mskc_devices[]
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C034 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C036 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C042 },
- { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9Exx },
- { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9Sxx }
+ { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9EXX },
+ { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9SXX }
};
static inline u_int32_t
Index: dev/pci/if_nxe.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_nxe.c,v
retrieving revision 1.75
diff -u -p -r1.75 if_nxe.c
--- dev/pci/if_nxe.c 8 Apr 2017 02:57:25 -0000 1.75
+++ dev/pci/if_nxe.c 4 Jan 2020 03:50:23 -0000
@@ -834,7 +834,7 @@ int nxe_rom_read_region(struct nxe_sof
/* let's go! */
const struct pci_matchid nxe_devices[] = {
- { PCI_VENDOR_NETXEN, PCI_PRODUCT_NETXEN_NXB_10GXxR },
+ { PCI_VENDOR_NETXEN, PCI_PRODUCT_NETXEN_NXB_10GXXR },
{ PCI_VENDOR_NETXEN, PCI_PRODUCT_NETXEN_NXB_10GCX4 },
{ PCI_VENDOR_NETXEN, PCI_PRODUCT_NETXEN_NXB_4GCU },
{ PCI_VENDOR_NETXEN, PCI_PRODUCT_NETXEN_NXB_IMEZ },
Index: dev/pci/if_tl.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_tl.c,v
retrieving revision 1.71
diff -u -p -r1.71 if_tl.c
--- dev/pci/if_tl.c 13 Jul 2017 17:44:36 -0000 1.71
+++ dev/pci/if_tl.c 4 Jan 2020 03:50:23 -0000
@@ -226,9 +226,9 @@
const struct tl_products tl_prods[] = {
{ PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_N100TX, TLPHY_MEDIA_NO_10_T },
{ PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_N10T, TLPHY_MEDIA_10_5 },
- { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_IntNF3P, TLPHY_MEDIA_10_2 },
- { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_IntPL100TX,
TLPHY_MEDIA_10_5|TLPHY_MEDIA_NO_10_T },
- { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_DPNet100TX,
TLPHY_MEDIA_10_5|TLPHY_MEDIA_NO_10_T },
+ { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_INTNF3P, TLPHY_MEDIA_10_2 },
+ { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_INTPL100TX,
TLPHY_MEDIA_10_5|TLPHY_MEDIA_NO_10_T },
+ { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_DPNET100TX,
TLPHY_MEDIA_10_5|TLPHY_MEDIA_NO_10_T },
{ PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_DP4000,
TLPHY_MEDIA_10_5|TLPHY_MEDIA_NO_10_T },
{ PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_NF3P_BNC, TLPHY_MEDIA_10_2 },
{ PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_NF3P, TLPHY_MEDIA_10_5 },
@@ -1786,9 +1786,9 @@ tl_probe(struct device *parent, void *ma
switch (PCI_PRODUCT(pa->pa_id)) {
case PCI_PRODUCT_COMPAQ_N100TX:
case PCI_PRODUCT_COMPAQ_N10T:
- case PCI_PRODUCT_COMPAQ_IntNF3P:
- case PCI_PRODUCT_COMPAQ_DPNet100TX:
- case PCI_PRODUCT_COMPAQ_IntPL100TX:
+ case PCI_PRODUCT_COMPAQ_INTNF3P:
+ case PCI_PRODUCT_COMPAQ_DPNET100TX:
+ case PCI_PRODUCT_COMPAQ_INTPL100TX:
case PCI_PRODUCT_COMPAQ_DP4000:
case PCI_PRODUCT_COMPAQ_N10T2:
case PCI_PRODUCT_COMPAQ_N10_TX_UTP:
Index: dev/pci/if_vge.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_vge.c,v
retrieving revision 1.71
diff -u -p -r1.71 if_vge.c
--- dev/pci/if_vge.c 22 Jan 2017 10:17:38 -0000 1.71
+++ dev/pci/if_vge.c 4 Jan 2020 03:50:23 -0000
@@ -169,7 +169,7 @@ int vge_debug = 0;
#define DPRINTFN(n, x) if (vge_debug >= (n)) printf x
const struct pci_matchid vge_devices[] = {
- { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT612x },
+ { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT612X },
};
#ifdef VGE_EEPROM
Index: dev/pci/km.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/km.c,v
retrieving revision 1.12
diff -u -p -r1.12 km.c
--- dev/pci/km.c 4 Jan 2020 01:34:24 -0000 1.12
+++ dev/pci/km.c 4 Jan 2020 03:50:23 -0000
@@ -70,8 +70,8 @@ static const struct pci_matchid km_devic
{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_10_MISC },
{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_11_MISC },
{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_14_MISC },
- { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_15_0x_MISC },
- { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_15_1x_MISC },
+ { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_15_0X_MISC },
+ { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_15_1X_MISC },
{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_16_MISC },
{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_16_3X_MISC }
};
Index: dev/pci/pccbb.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/pccbb.c,v
retrieving revision 1.98
diff -u -p -r1.98 pccbb.c
--- dev/pci/pccbb.c 17 Jul 2018 03:32:10 -0000 1.98
+++ dev/pci/pccbb.c 4 Jan 2020 03:50:23 -0000
@@ -292,13 +292,13 @@ struct yenta_chipinfo {
PCCBB_PCMCIA_MEM_32},
/* Toshiba products */
- { MAKEID(PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC95),
+ { MAKEID(PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_TOPIC95),
CB_TOPIC95, PCCBB_PCMCIA_MEM_32},
- { MAKEID(PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC95B),
+ { MAKEID(PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_TOPIC95B),
CB_TOPIC95B, PCCBB_PCMCIA_MEM_32},
- { MAKEID(PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC97),
+ { MAKEID(PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_TOPIC97),
CB_TOPIC97, PCCBB_PCMCIA_MEM_32},
- { MAKEID(PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC100),
+ { MAKEID(PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_TOPIC100),
CB_TOPIC97, PCCBB_PCMCIA_MEM_32},
/* Cirrus Logic products */
Index: dev/pci/pcidevs
===================================================================
RCS file: /cvs/src/sys/dev/pci/pcidevs,v
retrieving revision 1.1906
diff -u -p -r1.1906 pcidevs
--- dev/pci/pcidevs 4 Jan 2020 01:34:24 -0000 1.1906
+++ dev/pci/pcidevs 4 Jan 2020 03:50:25 -0000
@@ -613,7 +613,7 @@ product ADP 2940U 0x8178 AHA-2940U
product ADP 3940U 0x8278 AHA-3940U
product ADP 398XU 0x8378 AHA-398XU
product ADP 2944U 0x8478 AHA-2944U
-product ADP 2940UWPro 0x8778 AHA-2940UWPro
+product ADP 2940UWPRO 0x8778 AHA-2940UWPro
product ADP AIC6915 0x6915 AIC-6915
product ADP 7895 0x7895 AIC-7895
@@ -706,21 +706,21 @@ product AMD 11_ADDR 0x1301 11h Address
product AMD 11_DRAM 0x1302 11h DRAM Cfg
product AMD 11_MISC 0x1303 11h Misc Cfg
product AMD 11_LINK 0x1304 11h Link Cfg
-product AMD 15_1x_LINK 0x1400 15/1xh Link Cfg
-product AMD 15_1x_ADDR 0x1401 15/1xh Address Map
-product AMD 15_1x_DRAM 0x1402 15/1xh DRAM Cfg
-product AMD 15_1x_MISC 0x1403 15/1xh Misc Cfg
-product AMD 15_1x_CPU_PM 0x1404 15/1xh CPU Power
-product AMD 15_1x_NB_PM 0x1405 15/1xh NB Power
-product AMD 15_1x_HB 0x1410 15/1xh Host
-product AMD 15_1x_PCIE_1 0x1412 15/1xh PCIE
-product AMD 15_1x_PCIE_2 0x1413 15/1xh PCIE
-product AMD 15_1x_PCIE_3 0x1414 15/1xh PCIE
-product AMD 15_1x_PCIE_4 0x1415 15/1xh PCIE
-product AMD 15_1x_PCIE_5 0x1416 15/1xh PCIE
-product AMD 15_1x_PCIE_6 0x1417 15/1xh PCIE
-product AMD 15_1x_PCIE_7 0x1418 15/1xh PCIE
-product AMD 15_1x_IOMMU 0x1419 15/1xh IOMMU
+product AMD 15_1X_LINK 0x1400 15/1xh Link Cfg
+product AMD 15_1X_ADDR 0x1401 15/1xh Address Map
+product AMD 15_1X_DRAM 0x1402 15/1xh DRAM Cfg
+product AMD 15_1X_MISC 0x1403 15/1xh Misc Cfg
+product AMD 15_1X_CPU_PM 0x1404 15/1xh CPU Power
+product AMD 15_1X_NB_PM 0x1405 15/1xh NB Power
+product AMD 15_1X_HB 0x1410 15/1xh Host
+product AMD 15_1X_PCIE_1 0x1412 15/1xh PCIE
+product AMD 15_1X_PCIE_2 0x1413 15/1xh PCIE
+product AMD 15_1X_PCIE_3 0x1414 15/1xh PCIE
+product AMD 15_1X_PCIE_4 0x1415 15/1xh PCIE
+product AMD 15_1X_PCIE_5 0x1416 15/1xh PCIE
+product AMD 15_1X_PCIE_6 0x1417 15/1xh PCIE
+product AMD 15_1X_PCIE_7 0x1418 15/1xh PCIE
+product AMD 15_1X_IOMMU 0x1419 15/1xh IOMMU
product AMD 15_3X_LINK 0x141a 15h Link Cfg
product AMD 15_3X_ADDR 0x141b 15h Address Map
product AMD 15_3X_DRAM 0x141c 15h DRAM Cfg
@@ -807,12 +807,12 @@ product AMD 17_1X_DF_4 0x15ec 17h/1xh D
product AMD 17_1X_DF_5 0x15ed 17h/1xh Data Fabric
product AMD 17_1X_DF_6 0x15ee 17h/1xh Data Fabric
product AMD 17_1X_DF_7 0x15ef 17h/1xh Data Fabric
-product AMD 15_0x_LINK 0x1600 15/0xh Link Cfg
-product AMD 15_0x_ADDR 0x1601 15/0xh Address Map
-product AMD 15_0x_DRAM 0x1602 15/0xh DRAM Cfg
-product AMD 15_0x_MISC 0x1603 15/0xh Misc Cfg
-product AMD 15_0x_CPU_PM 0x1604 15/0xh CPU Power
-product AMD 15_0x_HB 0x1605 15/0xh Host
+product AMD 15_0X_LINK 0x1600 15/0xh Link Cfg
+product AMD 15_0X_ADDR 0x1601 15/0xh Address Map
+product AMD 15_0X_DRAM 0x1602 15/0xh DRAM Cfg
+product AMD 15_0X_MISC 0x1603 15/0xh Misc Cfg
+product AMD 15_0X_CPU_PM 0x1604 15/0xh CPU Power
+product AMD 15_0X_HB 0x1605 15/0xh Host
product AMD 14_LINK 0x1700 14h Link Cfg
product AMD 14_ADDR 0x1701 14h Address Map
product AMD 14_DRAM 0x1702 14h DRAM Cfg
@@ -1254,8 +1254,8 @@ product ATI FIREGL_M7 0x4c58 FireGL Mob
product ATI RADEON_M6LY 0x4c59 Radeon Mobility M6
product ATI RADEON_M6LZ 0x4c5a Radeon Mobility M6
product ATI RADEON_M9LD 0x4c64 Radeon Mobility M9
-product ATI RADEON_M9Lf 0x4c66 Radeon Mobility M9
-product ATI RADEON_M9Lg 0x4c67 Radeon Mobility M9
+product ATI RADEON_M9LF 0x4c66 Radeon Mobility M9
+product ATI RADEON_M9LG 0x4c67 Radeon Mobility M9
product ATI FIREMV_2400_PCI 0x4c6e FireMV 2400 PCI
product ATI RAGE128_MF 0x4d46 Rage 128 Mobility
product ATI RAGE128_ML 0x4d4c Rage 128 Mobility
@@ -1314,7 +1314,7 @@ product ATI RV200_QX 0x5158 Radeon 7500
product ATI RADEON_QY 0x5159 Radeon VE
product ATI RADEON_QZ 0x515a Radeon VE
product ATI ES1000 0x515e ES1000
-product ATI R200_Ql 0x516c Radeon 8500
+product ATI R200_QL_2 0x516c Radeon 8500
product ATI RAGE128_GL 0x5245 Rage 128
product ATI RAGE_MAGNUM 0x5246 Rage Magnum
product ATI RAGE128_RG 0x5247 Rage 128
@@ -1346,7 +1346,7 @@ product ATI FIREGL_UT_RV423 0x5553 FireG
product ATI FIREGL_UT_R423 0x5554 FireGL
product ATI RADEON_X800_RV430_S 0x556d Radeon X800 Sec
product ATI FIREGL_V5000_M26 0x564a Mobility FireGL V5000 M26
-product ATI FIREGL_V5000_M26b 0x564b Mobility FireGL V5000 M26
+product ATI FIREGL_V5000_M26B 0x564b Mobility FireGL V5000 M26
product ATI RADEON_X700XL_M26 0x564f Radeon Mobility X700 XL M26
product ATI RADEON_X700_M26_1 0x5652 Radeon Mobility X700 M26
product ATI RADEON_X700_M26_2 0x5653 Radeon Mobility X700 M26
@@ -2095,8 +2095,8 @@ product ATI RADEON_HD2600_HDA 0xaa08 Rad
product ATI RS690M_HDA 0xaa10 RS690M HD Audio
product ATI RADEON_HD3870_HDA 0xaa18 Radeon HD 3870 HD Audio
product ATI RADEON_HD3600_HDA 0xaa20 Radeon HD 3600 HD Audio
-product ATI RADEON_HD34xx_HDA 0xaa28 Radeon HD 34xx HD Audio
-product ATI RADEON_HD48xx_HDA 0xaa30 Radeon HD 48xx HD Audio
+product ATI RADEON_HD34XX_HDA 0xaa28 Radeon HD 34xx HD Audio
+product ATI RADEON_HD48XX_HDA 0xaa30 Radeon HD 48xx HD Audio
product ATI RADEON_HD4000_HDA 0xaa38 Radeon HD 4000 HD Audio
product ATI RADEON_HD5800_HDA 0xaa50 Radeon HD 5800 Audio
product ATI RADEON_HD5700_HDA 0xaa58 Radeon HD 5700 Audio
@@ -2438,7 +2438,7 @@ product CAVIUM OCTEON_CN50XX 0x0070 OCTE
product CCUBE CINEMASTER 0x8888 Cinemaster
/* Chelsio products */
-product CHELSIO Nx10 0x0006 Nx10 10GbE
+product CHELSIO NX10 0x0006 Nx10 10GbE
product CHELSIO PE9000 0x0020 PE9000 10GbE
product CHELSIO T302E 0x0021 T302E 10GbE
product CHELSIO T310E 0x0022 T310E 10GbE
@@ -2535,10 +2535,10 @@ product COMPAQ QVISION_1280P 0x3033 QVis
product COMPAQ QVISION_V2 0x3034 QVision
product COMPAQ TRIFLEX4 0x4000 Triflex PCI
product COMPAQ CSA5300 0x4070 Smart Array 5300
-product COMPAQ CSA5i 0x4080 Smart Array 5i
+product COMPAQ CSA5I 0x4080 Smart Array 5i
product COMPAQ CSA532 0x4082 Smart Array 532
product COMPAQ CSA5312 0x4083 Smart Array 5312
-product COMPAQ CSA6i 0x4091 Smart Array 6i
+product COMPAQ CSA6I 0x4091 Smart Array 6i
product COMPAQ CSA641 0x409a Smart Array 641
product COMPAQ CSA642 0x409b Smart Array 642
product COMPAQ CSA6400 0x409c Smart Array 6400
@@ -2556,9 +2556,9 @@ product COMPAQ PCI_ISAPNP 0xae2b ISAPnP
product COMPAQ N100TX 0xae32 Netelligent
product COMPAQ IDE 0xae33 Netelligent IDE
product COMPAQ N10T 0xae34 Netelligent 10 T
-product COMPAQ IntNF3P 0xae35 Integrated NetFlex 3/P
-product COMPAQ DPNet100TX 0xae40 DP Netelligent
-product COMPAQ IntPL100TX 0xae43 ProLiant Netelligent
+product COMPAQ INTNF3P 0xae35 Integrated NetFlex 3/P
+product COMPAQ DPNET100TX 0xae40 DP Netelligent
+product COMPAQ INTPL100TX 0xae43 ProLiant Netelligent
product COMPAQ PCI_ISA_BRIDGE2 0xae69 ISA
product COMPAQ HOST_PCI_BRIDGE1 0xae6c PCI
product COMPAQ HOST_PCI_BRIDGE2 0xae6d PCI
@@ -2566,7 +2566,7 @@ product COMPAQ DP4000 0xb011 Embedded N
product COMPAQ N10T2 0xb012 Netelligent 10 T/2 PCI
product COMPAQ N10_TX_UTP 0xb030 Netelligent
product COMPAQ CSA5300_2 0xb060 Smart Array 5300 rev.2
-product COMPAQ CSA5i_2 0xb178 Smart Array 5i/532 rev.2
+product COMPAQ CSA5I_2 0xb178 Smart Array 5i/532 rev.2
product COMPAQ ILO_1 0xb203 iLO
product COMPAQ ILO_2 0xb204 iLO
product COMPAQ NF3P 0xf130 NetFlex 3/P
@@ -2588,11 +2588,11 @@ product CONEXANT MUSYCC8478 0x8478 MUSYC
product CONEXANT MUSYCC8474 0x8474 MUSYCC CN8474
product CONEXANT MUSYCC8472 0x8472 MUSYCC CN8472
product CONEXANT MUSYCC8471 0x8471 MUSYCC CN8471
-product CONEXANT CX2388x 0x8800 CX2388x
-product CONEXANT CX2388x_AUDIO 0x8801 CX2388x Audio
-product CONEXANT CX2388x_MPEG 0x8802 CX2388x MPEG
-product CONEXANT CX2388x_IR 0x8804 CX2388x IR
-product CONEXANT CX2388x_AUDIO2 0x8811 CX2388x Audio
+product CONEXANT CX2388X 0x8800 CX2388x
+product CONEXANT CX2388X_AUDIO 0x8801 CX2388x Audio
+product CONEXANT CX2388X_MPEG 0x8802 CX2388x MPEG
+product CONEXANT CX2388X_IR 0x8804 CX2388x IR
+product CONEXANT CX2388X_AUDIO2 0x8811 CX2388x Audio
product CONEXANT CX23885 0x8852 CX23885
/* Contaq Microsystems products */
@@ -3078,7 +3078,7 @@ product IBM CALGARY_IOMMU 0x02a1 Calgary
/* IC Ensemble */
product ICENSEMBLE ICE1712 0x1712 Envy24 I/O Ctrlr
-product ICENSEMBLE VT172x 0x1724 Envy24PT/HT Audio
+product ICENSEMBLE VT172X 0x1724 Envy24PT/HT Audio
/* IDT products */
product IDT 77201 0x0001 77201/77211 ATM
@@ -3093,7 +3093,7 @@ product IDT 89HPES48H12G2 0x807a 89HPES4
product IDT 89H64H16G3 0x80bf 89H64H16G3
/* Industrial Computer Source */
-product INDCOMPSRC WDT50x 0x22c0 WDT 50x Watchdog Timer
+product INDCOMPSRC WDT50X 0x22c0 WDT 50x Watchdog Timer
/* Initio Corporation */
product INITIO INIC850 0x0850 INIC-850
@@ -3614,7 +3614,7 @@ product INTEL 82452_HB 0x1225 82452KX/G
product INTEL 82596 0x1226 EE Pro 10 PCI
product INTEL EEPRO100 0x1227 EE Pro 100
product INTEL EEPRO100S 0x1228 EE Pro 100 Smart
-product INTEL 8255x 0x1229 8255x
+product INTEL 8255X 0x1229 8255x
product INTEL 82437FX 0x122d 82437FX
product INTEL 82371FB_ISA 0x122e 82371FB ISA
product INTEL 82371FB_IDE 0x1230 82371FB IDE
@@ -3626,7 +3626,7 @@ product INTEL 82380FB 0x124b 82380FB Mo
product INTEL 82439HX 0x1250 82439HX
product INTEL 82806AA 0x1360 82806AA
product INTEL 82870P2_PPB 0x1460 82870P2 PCIX-PCIX
-product INTEL 82870P2_IOxAPIC 0x1461 82870P2 IOxAPIC
+product INTEL 82870P2_IOXAPIC 0x1461 82870P2 IOxAPIC
product INTEL 82870P2_HPLUG 0x1462 82870P2 Hot Plug
product INTEL ICH8_82567V_3 0x1501 ICH8 82567V-3
product INTEL 82579LM 0x1502 82579LM
@@ -5275,7 +5275,7 @@ product INTEL C610_MS_SMB_2 0x8d7e C610
product INTEL C610_MS_SMB_3 0x8d7f C610 MS SMBus
product INTEL I2OPCIB 0x9620 I2O RAID
product INTEL RCU21 0x9621 RCU21 I2O RAID
-product INTEL RCUxx 0x9622 RCUxx I2O RAID
+product INTEL RCUXX 0x9622 RCUxx I2O RAID
product INTEL RCU31 0x9641 RCU31 I2O RAID
product INTEL RCU31L 0x96a1 RCU31L I2O RAID
product INTEL 8SERIES_LP_SATA_1 0x9c00 8 Series SATA
@@ -5752,7 +5752,7 @@ product LUCENT LTMODEM_0458 0x0458 LTMOD
product LUCENT LTMODEM_0459 0x0459 LTMODEM
product LUCENT LTMODEM_045A 0x045a LTMODEM
product LUCENT LTMODEM_045C 0x045c LTMODEM
-product LUCENT LTMODEM_048c 0x048c LTMODEM
+product LUCENT LTMODEM_048C 0x048c LTMODEM
product LUCENT VENUSMODEM 0x0480 Venus Modem
product LUCENT USBHC 0x5801 USB
product LUCENT USBHC2 0x5802 USB 2-port
@@ -5997,7 +5997,7 @@ product NATINST PCIGPIB 0xc801 PCI-GPIB
product NETCHIP NET2282 0x2282 NET2282 USB
/* NetXen Inc products */
-product NETXEN NXB_10GXxR 0x0001 NXB-10GXxR
+product NETXEN NXB_10GXXR 0x0001 NXB-10GXxR
product NETXEN NXB_10GCX4 0x0002 NXB-10GCX4
product NETXEN NXB_4GCU 0x0003 NXB-4GCU
product NETXEN NXB_IMEZ 0x0004 IMEZ 10GbE
@@ -6020,12 +6020,12 @@ product NS CS5535_AUDIO 0x002e CS5535 A
product NS CS5535_USB 0x002f CS5535 USB
product NS CS5535_VIDEO 0x0030 CS5535 VIDEO
product NS SATURN 0x0035 Saturn
-product NS SCx200_ISA 0x0500 SCx200 ISA
-product NS SCx200_SMI 0x0501 SCx200 SMI
-product NS SCx200_IDE 0x0502 SCx200 IDE
-product NS SCx200_AUDIO 0x0503 SCx200 AUDIO
-product NS SCx200_VIDEO 0x0504 SCx200 VIDEO
-product NS SCx200_XBUS 0x0505 SCx200 X-BUS
+product NS SCX200_ISA 0x0500 SCx200 ISA
+product NS SCX200_SMI 0x0501 SCx200 SMI
+product NS SCX200_IDE 0x0502 SCx200 IDE
+product NS SCX200_AUDIO 0x0503 SCx200 AUDIO
+product NS SCX200_VIDEO 0x0504 SCx200 VIDEO
+product NS SCX200_XBUS 0x0505 SCx200 X-BUS
product NS SC1100_ISA 0x0510 SC1100 ISA
product NS SC1100_SMI 0x0511 SC1100 SMI
product NS SC1100_XBUS 0x0515 SC1100 X-Bus
@@ -6036,10 +6036,10 @@ product NEC USB 0x0035 USB
product NEC POWERVR2 0x0046 PowerVR PCX2
product NEC MARTH 0x0074 I/O
product NEC PKUG 0x007d I/O
-product NEC uPD72874 0x00f2 Firewire
+product NEC UPD72874 0x00f2 Firewire
product NEC USB2 0x00e0 USB
-product NEC uPD720400 0x0125 PCIE-PCIX
-product NEC uPD720200 0x0194 xHCI
+product NEC UPD720400 0x0125 PCIE-PCIX
+product NEC UPD720200 0x0194 xHCI
product NEC VERSAMAESTRO 0x8058 Versa Maestro
product NEC VERSAPRONXVA26D 0x803c Versa Va26D Maestro
@@ -6576,7 +6576,7 @@ product NVIDIA C55_PCIE_3 0x03bb C55 PCI
product NVIDIA C55_MEM_17 0x03bc C55 Memory
product NVIDIA GEFORCE6100_430 0x03d0 GeForce 6100 nForce 430
product NVIDIA GEFORCE6100_405 0x03d1 GeForce 6100 nForce 405
-product NVIDIA GEFORCE7025_630a 0x03d6 GeForce 7025 nForce 630a
+product NVIDIA GEFORCE7025_630A 0x03d6 GeForce 7025 nForce 630a
product NVIDIA MCP61_ISA 0x03e0 MCP61 ISA
product NVIDIA MCP61_ISA_2 0x03e1 MCP61 ISA
product NVIDIA MCP61_MEM1 0x03e2 MCP61 Memory
@@ -6918,7 +6918,7 @@ product OXFORD VSCOM_PCI200L 0x8020 200L
product OXFORD VSCOM_PCI210L 0x8021 210L
product MOLEX VSCOM_PCI400L 0x8040 400L
product OXFORD VSCOM_PCI800L 0x8080 800L
-product OXFORD VSCOM_PCIx10H 0xa000 x10H
+product OXFORD VSCOM_PCIX10H 0xa000 x10H
product OXFORD VSCOM_PCI100H 0xa001 100H
product OXFORD VSCOM_PCI200H 0xa005 200H
product OXFORD VSCOM_PCI800H_0 0xa003 400H/800H
@@ -7029,7 +7029,7 @@ product RCC HT_1100_SATA_2 0x0411 HT-110
/* Rendition products */
product RENDITION V1000 0x0001 Verite 1000
-product RENDITION V2x00 0x2000 Verite V2x00
+product RENDITION V2X00 0x2000 Verite V2x00
/* Renesas products */
product RENESAS SH7757_PPB 0x0012 SH7757 PCIE-PCI
@@ -7037,7 +7037,7 @@ product RENESAS SH7757_SW 0x0013 SH7757
product RENESAS SH7758_PPB 0x001a SH7758 PCIE-PCI
product RENESAS SH7758_SW 0x001d SH7758 PCIE Switch
product RENESAS UPD720201_XHCI 0x0014 uPD720201 xHCI
-product RENESAS uPD720202_XHCI 0x0015 uPD720202 xHCI
+product RENESAS UPD720202_XHCI 0x0015 uPD720202 xHCI
/* Rhino Equipment products */
product RHINO R1T1 0x0105 T1/E1/J1
@@ -7386,10 +7386,10 @@ product SCHNEIDERKOCH FDDI 0x4000 FDDI
product SCHNEIDERKOCH SK98XX 0x4300 SK-98xx
product SCHNEIDERKOCH SK98XX2 0x4320 SK-98xx v2.0
product SCHNEIDERKOCH SK9D21 0x4400 SK-9D21
-product SCHNEIDERKOCH SK9Sxx 0x9000 SK-9Sxx
+product SCHNEIDERKOCH SK9SXX 0x9000 SK-9Sxx
product SCHNEIDERKOCH SK9821 0x9821 SK-9821
product SCHNEIDERKOCH SK9843 0x9843 SK-9843
-product SCHNEIDERKOCH SK9Exx 0x9e00 SK-9Exx
+product SCHNEIDERKOCH SK9EXX 0x9e00 SK-9Exx
product SCHNEIDERKOCH SK9E21M 0x9e01 SK-9E21M
/* ServerEngines products */
@@ -7581,9 +7581,9 @@ product SUN PSYCHO 0x8000 Psycho PCI
product SUN SPARC_T3_PCIE 0x8186 SPARC-T3/T4 PCIE
product SUN SPARC_M7_PCIE 0x818e SPARC-M7 PCIE
product SUN SPARC_T5_PCIE 0x8196 SPARC-T5/M5/M6 PCIE
-product SUN MS_IIep 0x9000 microSPARC IIep PCI
-product SUN US_IIi 0xa000 UltraSPARC IIi PCI
-product SUN US_IIe 0xa001 UltraSPARC IIe PCI
+product SUN MS_2EP 0x9000 microSPARC IIep PCI
+product SUN US_2I 0xa000 UltraSPARC IIi PCI
+product SUN US_2E 0xa001 UltraSPARC IIe PCI
product SUN CASSINI 0xabba Cassini
product SUN NEPTUNE 0xabcd Neptune
product SUN SBBC 0xc416 SBBC
@@ -7748,19 +7748,19 @@ product TIGERJET TIGER320 0x0001 PCI
product TOPIC 5634PCV 0x0000 5634PCV SurfRider
/* Toshiba products */
-product TOSHIBA R4x00 0x0009 R4x00
+product TOSHIBA R4X00 0x0009 R4x00
product TOSHIBA TC35856F 0x0020 TC35856F ATM
-product TOSHIBA R4X00 0x102f R4x00 PCI
+product TOSHIBA R4X00_PCI 0x102f R4x00 PCI
/* Toshiba(2) products */
product TOSHIBA2 BG3_NVME 0x0113 BG3 NVMe
product TOSHIBA2 NVME 0x0115 NVMe
product TOSHIBA2 THB 0x0601 PCI
product TOSHIBA2 ISA 0x0602 ISA
-product TOSHIBA2 ToPIC95 0x0603 ToPIC95 CardBus-PCI
-product TOSHIBA2 ToPIC95B 0x060a ToPIC95B CardBus
-product TOSHIBA2 ToPIC97 0x060f ToPIC97 CardBus
-product TOSHIBA2 ToPIC100 0x0617 ToPIC100 CardBus
+product TOSHIBA2 TOPIC95 0x0603 ToPIC95 CardBus-PCI
+product TOSHIBA2 TOPIC95B 0x060a ToPIC95B CardBus
+product TOSHIBA2 TOPIC97 0x060f ToPIC97 CardBus
+product TOSHIBA2 TOPIC100 0x0617 ToPIC100 CardBus
product TOSHIBA2 TFIRO 0x0701 Fast Infrared Type O
product TOSHIBA2 SDCARD 0x0805 SD Controller
@@ -7968,7 +7968,7 @@ product VIATECH VT8361_PCI 0x3112 VT8361
product VIATECH VT8101_PPB 0x3113 VT8101 VPX-64
product VIATECH VT8375 0x3116 VT8375 PCI
product VIATECH PM800_UNICHROME 0x3118 PM800 Unichrome S3
-product VIATECH VT612x 0x3119 VT612x
+product VIATECH VT612X 0x3119 VT612x
product VIATECH CLE266 0x3122 CLE266
product VIATECH VT8623 0x3123 VT8623 PCI
product VIATECH VT8233A_ISA 0x3147 VT8233A ISA
@@ -8014,7 +8014,7 @@ product VIATECH VT8237S_ISA 0x3372 VT823
product VIATECH VT8237A_PPB_1 0x337a VT8237A
product VIATECH VT8237A_PPB_2 0x337b VT8237A
product VIATECH VX900_DRAM 0x3410 VX900 DRAM
-product VIATECH VL80x_XHCI 0x3432 VL80x xHCI
+product VIATECH VL80X_XHCI 0x3432 VL80x xHCI
product VIATECH VL805_XHCI 0x3483 VL805 xHCI
product VIATECH K8M800_4 0x4204 K8M800 Host
product VIATECH K8T890_4 0x4238 K8T890 Host
@@ -8118,74 +8118,74 @@ product VIATECH VX800_PCIE_2 0xf353 VX80
product VITESSE VSC_7174 0x7174 VSC-7174 SATA
/* Vortex Computer Systems products */
-product VORTEX GDT_60x0 0x0000 GDT6000/6020/6050
+product VORTEX GDT_60X0 0x0000 GDT6000/6020/6050
product VORTEX GDT_6000B 0x0001 GDT6000B/6010
-product VORTEX GDT_6x10 0x0002 GDT6110/6510
-product VORTEX GDT_6x20 0x0003 GDT6120/6520
+product VORTEX GDT_6X10 0x0002 GDT6110/6510
+product VORTEX GDT_6X20 0x0003 GDT6120/6520
product VORTEX GDT_6530 0x0004 GDT6530
product VORTEX GDT_6550 0x0005 GDT6550
-product VORTEX GDT_6x17 0x0006 GDT6x17
-product VORTEX GDT_6x27 0x0007 GDT6x27
+product VORTEX GDT_6X17 0x0006 GDT6x17
+product VORTEX GDT_6X27 0x0007 GDT6x27
product VORTEX GDT_6537 0x0008 GDT6537
product VORTEX GDT_6557 0x0009 GDT6557
-product VORTEX GDT_6x15 0x000a GDT6x15
-product VORTEX GDT_6x25 0x000b GDT6x25
+product VORTEX GDT_6X15 0x000a GDT6x15
+product VORTEX GDT_6X25 0x000b GDT6x25
product VORTEX GDT_6535 0x000c GDT6535
product VORTEX GDT_6555 0x000d GDT6555
-product VORTEX GDT_6x17RP 0x0100 GDT6x17RP
-product VORTEX GDT_6x27RP 0x0101 GDT6x27RP
+product VORTEX GDT_6X17RP 0x0100 GDT6x17RP
+product VORTEX GDT_6X27RP 0x0101 GDT6x27RP
product VORTEX GDT_6537RP 0x0102 GDT6537RP
product VORTEX GDT_6557RP 0x0103 GDT6557RP
-product VORTEX GDT_6x11RP 0x0104 GDT6x11RP
-product VORTEX GDT_6x21RP 0x0105 GDT6x21RP
-product VORTEX GDT_6x17RD 0x0110 GDT6x17RP1
-product VORTEX GDT_6x27RD 0x0111 GDT6x27RP1
+product VORTEX GDT_6X11RP 0x0104 GDT6x11RP
+product VORTEX GDT_6X21RP 0x0105 GDT6x21RP
+product VORTEX GDT_6X17RD 0x0110 GDT6x17RP1
+product VORTEX GDT_6X27RD 0x0111 GDT6x27RP1
product VORTEX GDT_6537RD 0x0112 GDT6537RP1
product VORTEX GDT_6557RD 0x0113 GDT6557RP1
-product VORTEX GDT_6x11RD 0x0114 GDT6x11RP1
-product VORTEX GDT_6x21RD 0x0115 GDT6x21RP1
-product VORTEX GDT_6x18RD 0x0118 GDT6x18RD
-product VORTEX GDT_6x28RD 0x0119 GDT6x28RD
-product VORTEX GDT_6x38RD 0x011a GDT6x38RD
-product VORTEX GDT_6x58RD 0x011b GDT6x58RD
-product VORTEX GDT_6x17RP2 0x0120 GDT6x17RP2
-product VORTEX GDT_6x27RP2 0x0121 GDT6x27RP2
+product VORTEX GDT_6X11RD 0x0114 GDT6x11RP1
+product VORTEX GDT_6X21RD 0x0115 GDT6x21RP1
+product VORTEX GDT_6X18RD 0x0118 GDT6x18RD
+product VORTEX GDT_6X28RD 0x0119 GDT6x28RD
+product VORTEX GDT_6X38RD 0x011a GDT6x38RD
+product VORTEX GDT_6X58RD 0x011b GDT6x58RD
+product VORTEX GDT_6X17RP2 0x0120 GDT6x17RP2
+product VORTEX GDT_6X27RP2 0x0121 GDT6x27RP2
product VORTEX GDT_6537RP2 0x0122 GDT6537RP2
product VORTEX GDT_6557RP2 0x0123 GDT6557RP2
-product VORTEX GDT_6x11RP2 0x0124 GDT6x11RP2
-product VORTEX GDT_6x21RP2 0x0125 GDT6x21RP2
-product VORTEX GDT_6x13RS 0x0136 GDT6513RS
-product VORTEX GDT_6x23RS 0x0137 GDT6523RS
+product VORTEX GDT_6X11RP2 0x0124 GDT6x11RP2
+product VORTEX GDT_6X21RP2 0x0125 GDT6x21RP2
+product VORTEX GDT_6X13RS 0x0136 GDT6513RS
+product VORTEX GDT_6X23RS 0x0137 GDT6523RS
product VORTEX GDT_6518RS 0x0138 GDT6518RS
-product VORTEX GDT_6x28RS 0x0139 GDT6x28RS
-product VORTEX GDT_6x38RS 0x013a GDT6x38RS
-product VORTEX GDT_6x58RS 0x013b GDT6x58RS
-product VORTEX GDT_6x33RS 0x013c GDT6x33RS
-product VORTEX GDT_6x43RS 0x013d GDT6x43RS
-product VORTEX GDT_6x53RS 0x013e GDT6x53RS
-product VORTEX GDT_6x63RS 0x013f GDT6x63RS
-product VORTEX GDT_7x13RN 0x0166 GDT7x13RN
-product VORTEX GDT_7x23RN 0x0167 GDT7x23RN
-product VORTEX GDT_7x18RN 0x0168 GDT7x18RN
-product VORTEX GDT_7x28RN 0x0169 GDT7x28RN
-product VORTEX GDT_7x38RN 0x016a GDT7x38RN
-product VORTEX GDT_7x58RN 0x016b GDT7x58RN
-product VORTEX GDT_7x43RN 0x016d GDT7x43RN
-product VORTEX GDT_7x53RN 0x016e GDT7x53RN
-product VORTEX GDT_7x63RN 0x016f GDT7x63RN
-product VORTEX GDT_4x13RZ 0x01d6 GDT4x13RZ
-product VORTEX GDT_4x23RZ 0x01d7 GDT4x23RZ
-product VORTEX GDT_8x13RZ 0x01f6 GDT8x13RZ
-product VORTEX GDT_8x23RZ 0x01f7 GDT8x23RZ
-product VORTEX GDT_8x33RZ 0x01fc GDT8x33RZ
-product VORTEX GDT_8x43RZ 0x01fd GDT8x43RZ
-product VORTEX GDT_8x53RZ 0x01fe GDT8x53RZ
-product VORTEX GDT_8x63RZ 0x01ff GDT8x63RZ
-product VORTEX GDT_6x19RD 0x0210 GDT6x19RD
-product VORTEX GDT_6x29RD 0x0211 GDT6x29RD
-product VORTEX GDT_7x19RN 0x0260 GDT7x19RN
-product VORTEX GDT_7x29RN 0x0261 GDT7x29RN
-product VORTEX GDT_8x22RZ 0x02f6 GDT8x22RZ
+product VORTEX GDT_6X28RS 0x0139 GDT6x28RS
+product VORTEX GDT_6X38RS 0x013a GDT6x38RS
+product VORTEX GDT_6X58RS 0x013b GDT6x58RS
+product VORTEX GDT_6X33RS 0x013c GDT6x33RS
+product VORTEX GDT_6X43RS 0x013d GDT6x43RS
+product VORTEX GDT_6X53RS 0x013e GDT6x53RS
+product VORTEX GDT_6X63RS 0x013f GDT6x63RS
+product VORTEX GDT_7X13RN 0x0166 GDT7x13RN
+product VORTEX GDT_7X23RN 0x0167 GDT7x23RN
+product VORTEX GDT_7X18RN 0x0168 GDT7x18RN
+product VORTEX GDT_7X28RN 0x0169 GDT7x28RN
+product VORTEX GDT_7X38RN 0x016a GDT7x38RN
+product VORTEX GDT_7X58RN 0x016b GDT7x58RN
+product VORTEX GDT_7X43RN 0x016d GDT7x43RN
+product VORTEX GDT_7X53RN 0x016e GDT7x53RN
+product VORTEX GDT_7X63RN 0x016f GDT7x63RN
+product VORTEX GDT_4X13RZ 0x01d6 GDT4x13RZ
+product VORTEX GDT_4X23RZ 0x01d7 GDT4x23RZ
+product VORTEX GDT_8X13RZ 0x01f6 GDT8x13RZ
+product VORTEX GDT_8X23RZ 0x01f7 GDT8x23RZ
+product VORTEX GDT_8X33RZ 0x01fc GDT8x33RZ
+product VORTEX GDT_8X43RZ 0x01fd GDT8x43RZ
+product VORTEX GDT_8X53RZ 0x01fe GDT8x53RZ
+product VORTEX GDT_8X63RZ 0x01ff GDT8x63RZ
+product VORTEX GDT_6X19RD 0x0210 GDT6x19RD
+product VORTEX GDT_6X29RD 0x0211 GDT6x29RD
+product VORTEX GDT_7X19RN 0x0260 GDT7x19RN
+product VORTEX GDT_7X29RN 0x0261 GDT7x29RN
+product VORTEX GDT_8X22RZ 0x02f6 GDT8x22RZ
product VORTEX GDT_ICP 0x0300 ICP
product VORTEX GDT_ICP2 0x0301 ICP
Index: dev/pci/pciide.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/pciide.c,v
retrieving revision 1.358
diff -u -p -r1.358 pciide.c
--- dev/pci/pciide.c 12 Jul 2017 13:40:59 -0000 1.358
+++ dev/pci/pciide.c 4 Jan 2020 03:50:31 -0000
@@ -881,7 +881,7 @@ const struct pciide_product_desc pciide_
0,
natsemi_chip_map
},
- { PCI_PRODUCT_NS_SCx200_IDE, /* National Semi SCx200 IDE */
+ { PCI_PRODUCT_NS_SCX200_IDE, /* National Semi SCx200 IDE */
0,
ns_scx200_chip_map
}
@@ -5667,7 +5667,7 @@ ns_scx200_chip_map(struct pciide_softc *
* Assume that reducing maximum segment size by one page
* will be enough, and restrict boundary too for extra certainty.
*/
- if (sc->sc_pp->ide_product == PCI_PRODUCT_NS_SCx200_IDE) {
+ if (sc->sc_pp->ide_product == PCI_PRODUCT_NS_SCX200_IDE) {
sc->sc_dma_maxsegsz = IDEDMA_BYTE_COUNT_MAX - PAGE_SIZE;
sc->sc_dma_boundary = IDEDMA_BYTE_COUNT_MAX - PAGE_SIZE;
}
Index: dev/pci/pucdata.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/pucdata.c,v
retrieving revision 1.110
diff -u -p -r1.110 pucdata.c
--- dev/pci/pucdata.c 8 May 2019 15:23:20 -0000 1.110
+++ dev/pci/pucdata.c 4 Jan 2020 03:50:32 -0000
@@ -871,7 +871,7 @@ const struct puc_device_description puc_
* is the lpt part of VScom 110H, 210H, 410H
*/
{ /* "VScom PCI-x10H", */
- { PCI_VENDOR_OXFORD, PCI_PRODUCT_OXFORD_VSCOM_PCIx10H, 0, 0 },
+ { PCI_VENDOR_OXFORD, PCI_PRODUCT_OXFORD_VSCOM_PCIX10H, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
{ PUC_PORT_LPT, 0x10, 0x0000 },
Index: dev/pci/wdt.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/wdt.c,v
retrieving revision 1.23
diff -u -p -r1.23 wdt.c
--- dev/pci/wdt.c 8 Sep 2017 05:36:52 -0000 1.23
+++ dev/pci/wdt.c 4 Jan 2020 03:50:32 -0000
@@ -73,7 +73,7 @@ struct cfdriver wdt_cd = {
};
const struct pci_matchid wdt_devices[] = {
- { PCI_VENDOR_INDCOMPSRC, PCI_PRODUCT_INDCOMPSRC_WDT50x }
+ { PCI_VENDOR_INDCOMPSRC, PCI_PRODUCT_INDCOMPSRC_WDT50X }
};
/*
