diff options
| -rw-r--r-- | sys/dev/pci/pcidevs.h | 30 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs_data.h | 52 |
2 files changed, 41 insertions, 41 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index 3255c25325b..eca9b57eb1b 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.959 2005/11/14 15:08:49 jsg Exp + * OpenBSD: pcidevs,v 1.960 2005/11/15 20:32:03 brad Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -1921,23 +1921,23 @@ #define PCI_PRODUCT_MARVELL_88W8335_1 0x1faa /* Libertas 88W8335 */ #define PCI_PRODUCT_MARVELL_88W8335_2 0x1fab /* Libertas 88W8335 */ #define PCI_PRODUCT_MARVELL_88W8300_2 0x2a01 /* Libertas 88W8300 */ -#define PCI_PRODUCT_MARVELL_SK_V2 0x4320 /* SKv2 */ -#define PCI_PRODUCT_MARVELL_YUKON_1 0x4340 /* Yukon */ -#define PCI_PRODUCT_MARVELL_YUKON_2 0x4341 /* Yukon */ -#define PCI_PRODUCT_MARVELL_YUKON_3 0x4342 /* Yukon */ -#define PCI_PRODUCT_MARVELL_YUKON_4 0x4343 /* Yukon */ -#define PCI_PRODUCT_MARVELL_YUKON_5 0x4344 /* Yukon */ -#define PCI_PRODUCT_MARVELL_YUKON_6 0x4345 /* Yukon */ -#define PCI_PRODUCT_MARVELL_YUKON_7 0x4346 /* Yukon */ -#define PCI_PRODUCT_MARVELL_YUKON_8 0x4347 /* Yukon */ +#define PCI_PRODUCT_MARVELL_YUKON 0x4320 /* Yukon 88E8001/8003/8010 */ +#define PCI_PRODUCT_MARVELL_YUKONII_8021CU 0x4340 /* Yukon-II 8021CU */ +#define PCI_PRODUCT_MARVELL_YUKONII_8022CU 0x4341 /* Yukon-II 8022CU */ +#define PCI_PRODUCT_MARVELL_YUKONII_8061CU 0x4342 /* Yukon-II 8061CU */ +#define PCI_PRODUCT_MARVELL_YUKONII_8062CU 0x4343 /* Yukon-II 8062CU */ +#define PCI_PRODUCT_MARVELL_YUKONII_8021X 0x4344 /* Yukon-II 8021X */ +#define PCI_PRODUCT_MARVELL_YUKONII_8022X 0x4345 /* Yukon-II 8022X */ +#define PCI_PRODUCT_MARVELL_YUKONII_8061X 0x4346 /* Yukon-II 8061X */ +#define PCI_PRODUCT_MARVELL_YUKONII_8062X 0x4347 /* Yukon-II 8062X */ #define PCI_PRODUCT_MARVELL_YUKON_8035 0x4350 /* Yukon 8035 */ #define PCI_PRODUCT_MARVELL_YUKON_8036 0x4351 /* Yukon 8036 */ -#define PCI_PRODUCT_MARVELL_YUKON_9 0x4352 /* Yukon */ +#define PCI_PRODUCT_MARVELL_YUKON_2 0x4352 /* Yukon */ #define PCI_PRODUCT_MARVELL_YUKON_8052 0x4360 /* Yukon 8052 */ #define PCI_PRODUCT_MARVELL_YUKON_8050 0x4361 /* Yukon 8050 */ #define PCI_PRODUCT_MARVELL_YUKON_8053 0x4362 /* Yukon 8053 */ -#define PCI_PRODUCT_MARVELL_YUKON_10 0x4363 /* Yukon */ -#define PCI_PRODUCT_MARVELL_SK_V2_BELKIN 0x5005 /* Belkin F5D5005 */ +#define PCI_PRODUCT_MARVELL_YUKON_3 0x4363 /* Yukon */ +#define PCI_PRODUCT_MARVELL_YUKON_BELKIN 0x5005 /* Belkin F5D5005 */ #define PCI_PRODUCT_MARVELL_MV88SX5040 0x5040 /* MV88SX5040 SATA */ #define PCI_PRODUCT_MARVELL_MV88SX5041 0x5041 /* MV88SX5041 SATA */ #define PCI_PRODUCT_MARVELL_MV88SX5080 0x5080 /* MV88SX5080 SATA */ @@ -2600,8 +2600,8 @@ /* Schneider & Koch (SysKonnect) */ #define PCI_PRODUCT_SCHNEIDERKOCH_FDDI 0x4000 /* FDDI */ -#define PCI_PRODUCT_SCHNEIDERKOCH_GE 0x4300 /* 984x GE */ -#define PCI_PRODUCT_SCHNEIDERKOCH_SK9821v2 0x4320 /* SK-9821 v2.0 */ +#define PCI_PRODUCT_SCHNEIDERKOCH_SK98XX 0x4300 /* SK-98xx */ +#define PCI_PRODUCT_SCHNEIDERKOCH_SK98XX2 0x4320 /* SK-98xx v2.0 */ #define PCI_PRODUCT_SCHNEIDERKOCH_SK9D21 0x4400 /* SK-9D21 */ #define PCI_PRODUCT_SCHNEIDERKOCH_SK9Sxx 0x9000 /* SK-9Sxx */ #define PCI_PRODUCT_SCHNEIDERKOCH_SK9Exx 0x9E00 /* SK-9Exx */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index 3a5018d0c6f..1fc9c275a04 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.959 2005/11/14 15:08:49 jsg Exp + * OpenBSD: pcidevs,v 1.960 2005/11/15 20:32:03 brad Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -5523,40 +5523,40 @@ static const struct pci_known_product pci_known_products[] = { "Libertas 88W8300", }, { - PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_SK_V2, - "SKv2", + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON, + "Yukon 88E8001/8003/8010", }, { - PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_1, - "Yukon", + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8021CU, + "Yukon-II 8021CU", }, { - PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_2, - "Yukon", + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8022CU, + "Yukon-II 8022CU", }, { - PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_3, - "Yukon", + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8061CU, + "Yukon-II 8061CU", }, { - PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_4, - "Yukon", + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8062CU, + "Yukon-II 8062CU", }, { - PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_5, - "Yukon", + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8021X, + "Yukon-II 8021X", }, { - PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_6, - "Yukon", + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8022X, + "Yukon-II 8022X", }, { - PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_7, - "Yukon", + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8061X, + "Yukon-II 8061X", }, { - PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8, - "Yukon", + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8062X, + "Yukon-II 8062X", }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8035, @@ -5567,7 +5567,7 @@ static const struct pci_known_product pci_known_products[] = { "Yukon 8036", }, { - PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_9, + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_2, "Yukon", }, { @@ -5583,11 +5583,11 @@ static const struct pci_known_product pci_known_products[] = { "Yukon 8053", }, { - PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_10, + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_3, "Yukon", }, { - PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_SK_V2_BELKIN, + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_BELKIN, "Belkin F5D5005", }, { @@ -7767,12 +7767,12 @@ static const struct pci_known_product pci_known_products[] = { "FDDI", }, { - PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_GE, - "984x GE", + PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK98XX, + "SK-98xx", }, { - PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9821v2, - "SK-9821 v2.0", + PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK98XX2, + "SK-98xx v2.0", }, { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9D21, |