diff options
| -rw-r--r-- | sys/dev/pci/pcidevs.h | 46 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs_data.h | 96 |
2 files changed, 91 insertions, 51 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index 22de01d9b1f..508d19b52f2 100644 --- a/sys/dev/pci/pcidevs.h +++ b/sys/dev/pci/pcidevs.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.941 2005/10/12 19:34:16 brad Exp + * OpenBSD: pcidevs,v 1.942 2005/10/15 11:42:52 brad Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -2353,31 +2353,39 @@ #define PCI_PRODUCT_PCTEL_MICROMODEM56 0x7879 /* HSP MicroModem 56 */ /* Ross -> Pequr -> ServerWorks -> Broadcom products */ -#define PCI_PRODUCT_RCC_XX5 0x0005 /* PCIHB5 */ -#define PCI_PRODUCT_RCC_CIOB20 0x0006 /* I/O Bridge */ -#define PCI_PRODUCT_RCC_XX7 0x0007 /* PCIHB7 */ -#define PCI_PRODUCT_RCC_CNB20HE 0x0008 /* CNB20HE Host */ +#define PCI_PRODUCT_RCC_CMIC_LE 0x0000 /* CMIC-LE */ +#define PCI_PRODUCT_RCC_CNB20_LE 0x0005 /* CNB20-LE Host */ +#define PCI_PRODUCT_RCC_CNB20HE_1 0x0006 /* CNB20HE Host */ +#define PCI_PRODUCT_RCC_CNB20_LE_2 0x0007 /* CNB20-LE Host */ +#define PCI_PRODUCT_RCC_CNB20HE_2 0x0008 /* CNB20HE Host */ #define PCI_PRODUCT_RCC_CNB20LE 0x0009 /* CNB20LE Host */ #define PCI_PRODUCT_RCC_CIOB30 0x0010 /* CIOB30 */ -#define PCI_PRODUCT_RCC_CMIC_HE 0x0011 /* CMIC_HE Host */ -#define PCI_PRODUCT_RCC_CMIC_LE 0x0012 /* CMIC_LE Host */ -#define PCI_PRODUCT_RCC_CNB20_HE 0x0014 /* CNB20-HE */ -#define PCI_PRODUCT_RCC_CMIC_SL 0x0017 /* CMIC_SL Host */ -#define PCI_PRODUCT_RCC_CIOBX2 0x0101 /* CIOBX2 */ +#define PCI_PRODUCT_RCC_CMIC_HE 0x0011 /* CMIC-HE */ +#define PCI_PRODUCT_RCC_CMIC_WS_GC_LE 0x0012 /* CMIC-WS Host (GC-LE) */ +#define PCI_PRODUCT_RCC_CNB20_HE 0x0013 /* CNB20-HE Host */ +#define PCI_PRODUCT_RCC_CMIC_LE_GC_LE 0x0014 /* CNB20-HE Host (GC-LE) */ +#define PCI_PRODUCT_RCC_CMIC_GC_1 0x0015 /* CMIC-GC Host */ +#define PCI_PRODUCT_RCC_CMIC_GC_2 0x0016 /* CMIC-GC Host */ +#define PCI_PRODUCT_RCC_GCNB_LE 0x0017 /* GCNB-LE Host */ +#define PCI_PRODUCT_RCC_CIOB_X2 0x0101 /* CIOB-X2 PCIX */ #define PCI_PRODUCT_RCC_CIOB_E 0x0110 /* CIOB-E */ -#define PCI_PRODUCT_RCC_ROSB4 0x0200 /* ROSB4 SouthBridge */ -#define PCI_PRODUCT_RCC_CSB5 0x0201 /* CSB5 SouthBridge */ -#define PCI_PRODUCT_RCC_CSB6_PCI 0x0203 /* CSB6 PCI */ +#define PCI_PRODUCT_RCC_OSB4 0x0200 /* OSB4 */ +#define PCI_PRODUCT_RCC_CSB5 0x0201 /* CSB5 */ +#define PCI_PRODUCT_RCC_CSB6 0x0203 /* CSB6 */ #define PCI_PRODUCT_RCC_OSB4_IDE 0x0211 /* OSB4 IDE */ #define PCI_PRODUCT_RCC_CSB5_IDE 0x0212 /* CSB5 IDE */ -#define PCI_PRODUCT_RCC_CSB6_IDE 0x0213 /* CSB6 IDE */ -#define PCI_PRODUCT_RCC_CSB6_IDE2 0x0217 /* CSB6 IDE */ +#define PCI_PRODUCT_RCC_CSB6_RAID_IDE 0x0213 /* CSB6 RAID/IDE */ +#define PCI_PRODUCT_RCC_HT_1000_IDE 0x0214 /* HT-1000 IDE */ +#define PCI_PRODUCT_RCC_CSB6_IDE 0x0217 /* CSB6 IDE */ #define PCI_PRODUCT_RCC_USB 0x0220 /* OSB4/CSB5 USB */ #define PCI_PRODUCT_RCC_CSB6_USB 0x0221 /* CSB6 USB */ -#define PCI_PRODUCT_RCC_CSB5BRIDGE 0x0225 /* CSB5 PCI */ -#define PCI_PRODUCT_RCC_CSB6_LPC 0x0227 /* CSB6 LPC */ -#define PCI_PRODUCT_RCC_ISA 0x0230 /* PCI/ISA */ -#define PCI_PRODUCT_RCC_SATA 0x0240 /* SATA */ +#define PCI_PRODUCT_RCC_CSB5_LPC_1 0x0225 /* CSB5 LPC */ +#define PCI_PRODUCT_RCC_GCLE_2 0x0227 /* GCLE-2 Host */ +#define PCI_PRODUCT_RCC_CSB5_LPC_2 0x0230 /* CSB5 LPC */ +#define PCI_PRODUCT_RCC_K2_SATA 0x0240 /* K2 SATA */ +#define PCI_PRODUCT_RCC_FRODO4_SATA 0x0241 /* Frodo4 SATA */ +#define PCI_PRODUCT_RCC_FRODO8_SATA 0x0242 /* Frodo8 SATA */ +#define PCI_PRODUCT_RCC_HT_1000_SATA 0x024a /* HT-1000 SATA */ /* Philips products */ #define PCI_PRODUCT_PHILIPS_SAA7130 0x7130 /* SAA7130 */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index 4a884585f89..366726a6309 100644 --- a/sys/dev/pci/pcidevs_data.h +++ b/sys/dev/pci/pcidevs_data.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.941 2005/10/12 19:34:16 brad Exp + * OpenBSD: pcidevs,v 1.942 2005/10/15 11:42:52 brad Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -6943,19 +6943,23 @@ static const struct pci_known_product pci_known_products[] = { "HSP MicroModem 56", }, { - PCI_VENDOR_RCC, PCI_PRODUCT_RCC_XX5, - "PCIHB5", + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CMIC_LE, + "CMIC-LE", + }, + { + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CNB20_LE, + "CNB20-LE Host", }, { - PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CIOB20, - "I/O Bridge", + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CNB20HE_1, + "CNB20HE Host", }, { - PCI_VENDOR_RCC, PCI_PRODUCT_RCC_XX7, - "PCIHB7", + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CNB20_LE_2, + "CNB20-LE Host", }, { - PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CNB20HE, + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CNB20HE_2, "CNB20HE Host", }, { @@ -6968,39 +6972,51 @@ static const struct pci_known_product pci_known_products[] = { }, { PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CMIC_HE, - "CMIC_HE Host", + "CMIC-HE", }, { - PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CMIC_LE, - "CMIC_LE Host", + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CMIC_WS_GC_LE, + "CMIC-WS Host (GC-LE)", }, { PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CNB20_HE, - "CNB20-HE", + "CNB20-HE Host", + }, + { + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CMIC_LE_GC_LE, + "CNB20-HE Host (GC-LE)", + }, + { + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CMIC_GC_1, + "CMIC-GC Host", + }, + { + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CMIC_GC_2, + "CMIC-GC Host", }, { - PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CMIC_SL, - "CMIC_SL Host", + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_GCNB_LE, + "GCNB-LE Host", }, { - PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CIOBX2, - "CIOBX2", + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CIOB_X2, + "CIOB-X2 PCIX", }, { PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CIOB_E, "CIOB-E", }, { - PCI_VENDOR_RCC, PCI_PRODUCT_RCC_ROSB4, - "ROSB4 SouthBridge", + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_OSB4, + "OSB4", }, { PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CSB5, - "CSB5 SouthBridge", + "CSB5", }, { - PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CSB6_PCI, - "CSB6 PCI", + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CSB6, + "CSB6", }, { PCI_VENDOR_RCC, PCI_PRODUCT_RCC_OSB4_IDE, @@ -7011,11 +7027,15 @@ static const struct pci_known_product pci_known_products[] = { "CSB5 IDE", }, { - PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CSB6_IDE, - "CSB6 IDE", + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CSB6_RAID_IDE, + "CSB6 RAID/IDE", + }, + { + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_HT_1000_IDE, + "HT-1000 IDE", }, { - PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CSB6_IDE2, + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CSB6_IDE, "CSB6 IDE", }, { @@ -7027,20 +7047,32 @@ static const struct pci_known_product pci_known_products[] = { "CSB6 USB", }, { - PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CSB5BRIDGE, - "CSB5 PCI", + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CSB5_LPC_1, + "CSB5 LPC", + }, + { + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_GCLE_2, + "GCLE-2 Host", + }, + { + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CSB5_LPC_2, + "CSB5 LPC", + }, + { + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_K2_SATA, + "K2 SATA", }, { - PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CSB6_LPC, - "CSB6 LPC", + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_FRODO4_SATA, + "Frodo4 SATA", }, { - PCI_VENDOR_RCC, PCI_PRODUCT_RCC_ISA, - "PCI/ISA", + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_FRODO8_SATA, + "Frodo8 SATA", }, { - PCI_VENDOR_RCC, PCI_PRODUCT_RCC_SATA, - "SATA", + PCI_VENDOR_RCC, PCI_PRODUCT_RCC_HT_1000_SATA, + "HT-1000 SATA", }, { PCI_VENDOR_PHILIPS, PCI_PRODUCT_PHILIPS_SAA7130, |