diff options
| -rw-r--r-- | sys/dev/pci/pcidevs.h | 48 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs_data.h | 90 |
2 files changed, 69 insertions, 69 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index f57ce9deef2..ff645b2fc77 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.794 2004/11/20 22:49:41 brad Exp + * OpenBSD: pcidevs,v 1.796 2004/11/20 23:07:18 brad Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -1348,7 +1348,7 @@ #define PCI_PRODUCT_INTEL_82801BA_LPC 0x2440 /* 82801BA LPC */ #define PCI_PRODUCT_INTEL_82801BA_USB 0x2442 /* 82801BA USB */ #define PCI_PRODUCT_INTEL_82801BA_SMB 0x2443 /* 82801BA SMBus */ -#define PCI_PRODUCT_INTEL_82801BA_USB2 0x2444 /* 82801BA USB2 */ +#define PCI_PRODUCT_INTEL_82801BA_USB 0x2444 /* 82801BA USB */ #define PCI_PRODUCT_INTEL_82801BA_ACA 0x2445 /* 82801BA AC97 */ #define PCI_PRODUCT_INTEL_82801BA_ACM 0x2446 /* 82801BA Modem */ #define PCI_PRODUCT_INTEL_82801BAM_HPB 0x2448 /* 82801BAM Hub-to-PCI */ @@ -1405,10 +1405,6 @@ #define PCI_PRODUCT_INTEL_E7500_HI_D2 0x2548 /* E7500 MCH HI_D vppb 2 */ #define PCI_PRODUCT_INTEL_82860_HB 0x2531 /* 82860 Host */ #define PCI_PRODUCT_INTEL_82850_AGP 0x2532 /* 82850/82860 AGP */ -#define PCI_PRODUCT_INTEL_82852_IO1 0x3580 /* 82852/82855 CPU-I/O-1 */ -#define PCI_PRODUCT_INTEL_82852_AGP 0x3581 /* 82852/82855 AGP */ -#define PCI_PRODUCT_INTEL_82852_IO2 0x3584 /* 82852/82855 CPU-I/O-2 */ -#define PCI_PRODUCT_INTEL_82852_IO3 0x3585 /* 82852/82855 CPU-I/O-3 */ #define PCI_PRODUCT_INTEL_82860_PCI1 0x2533 /* 82860 PCI-PCI */ #define PCI_PRODUCT_INTEL_82860_PCI2 0x2534 /* 82860 PCI-PCI */ #define PCI_PRODUCT_INTEL_82860_PCI3 0x2535 /* 82860 PCI-PCI */ @@ -1432,15 +1428,15 @@ #define PCI_PRODUCT_INTEL_5300ESB_USB 0x25aa /* 5300ESB USB */ #define PCI_PRODUCT_INTEL_6300ESB_WDT 0x25ab /* 6300ESB WDT */ #define PCI_PRODUCT_INTEL_6300ESB_APIC 0x25ac /* 6300ESB APIC */ -#define PCI_PRODUCT_INTEL_6300ESB_USB2 0x25ad /* 6300ESB USB */ +#define PCI_PRODUCT_INTEL_6300ESB_USB 0x25ad /* 6300ESB USB */ #define PCI_PRODUCT_INTEL_6300ESB_PCIX 0x25ae /* 6300ESB PCIX */ -#define PCI_PRODUCT_INTEL_82801_SATA 0x2651 /* 82801FB/FR/FW/FRW SATA */ -#define PCI_PRODUCT_INTEL_82801_USB_1 0x2658 /* 82801FB/FR/FW/FRW USB */ -#define PCI_PRODUCT_INTEL_82801_USB_2 0x2659 /* 82801FB/FR/FW/FRW USB */ -#define PCI_PRODUCT_INTEL_82801_USB_3 0x265a /* 82801FB/FR/FW/FRW USB */ -#define PCI_PRODUCT_INTEL_82801_USB2 0x265c /* 82801FB/FR/FW/FRW USB 2.0 */ -#define PCI_PRODUCT_INTEL_82801_PCIE_1 0x2660 /* 82801FB/FR/FW/FRW PCIE Port 1 */ -#define PCI_PRODUCT_INTEL_82801_PCIE_2 0x2662 /* 82801FB/FR/FW/FRW PCIE Port 2 */ +#define PCI_PRODUCT_INTEL_82801FB_SATA 0x2651 /* 82801FB SATA */ +#define PCI_PRODUCT_INTEL_82801FB_USB_1 0x2658 /* 82801FB USB */ +#define PCI_PRODUCT_INTEL_82801FB_USB_2 0x2659 /* 82801FB USB */ +#define PCI_PRODUCT_INTEL_82801FB_USB_3 0x265a /* 82801FB USB */ +#define PCI_PRODUCT_INTEL_82801FB_USB 0x265c /* 82801FB USB */ +#define PCI_PRODUCT_INTEL_82801FB_PCIE_1 0x2660 /* 82801FB PCIE */ +#define PCI_PRODUCT_INTEL_82801FB_PCIE_2 0x2662 /* 82801FB PCIE */ #define PCI_PRODUCT_INTEL_31244 0x3200 /* 31244 SATA */ #define PCI_PRODUCT_INTEL_82830MP_IO_1 0x3575 /* 82830MP CPU-I/O-1 */ #define PCI_PRODUCT_INTEL_82830MP_AGP 0x3576 /* 82830MP CPU-AGP */ @@ -1453,15 +1449,19 @@ #define PCI_PRODUCT_INTEL_82855PE 0x3340 /* 82855PE Hub */ #define PCI_PRODUCT_INTEL_82855PE_AGP 0x3341 /* 82855PE AGP */ #define PCI_PRODUCT_INTEL_RCU32 0x3092 /* RCU32 I2O RAID */ +#define PCI_PRODUCT_INTEL_82852_IO1 0x3580 /* 82852/82855 CPU-I/O-1 */ +#define PCI_PRODUCT_INTEL_82852_AGP 0x3581 /* 82852/82855 AGP */ +#define PCI_PRODUCT_INTEL_82852_IO2 0x3584 /* 82852/82855 CPU-I/O-2 */ +#define PCI_PRODUCT_INTEL_82852_IO3 0x3585 /* 82852/82855 CPU-I/O-3 */ #define PCI_PRODUCT_INTEL_E7710_SMCH 0x3590 /* E7710 SMCH */ #define PCI_PRODUCT_INTEL_E7710_MCH_ERR 0x3591 /* E7710 MCH ERR */ #define PCI_PRODUCT_INTEL_E7710_MCH_DMA 0x3594 /* E7710 MCH DMA */ -#define PCI_PRODUCT_INTEL_E7710_MCH_PCIEA0 0x3595 /* E7710 MCH PCIE Port A0 */ -#define PCI_PRODUCT_INTEL_E7710_MCH_PCIEA1 0x3596 /* E7710 MCH PCIE Port A1 */ -#define PCI_PRODUCT_INTEL_E7710_MCH_PCIEB0 0x3597 /* E7710 MCH PCIE Port B0 */ -#define PCI_PRODUCT_INTEL_E7710_MCH_PCIEB1 0x3598 /* E7710 MCH PCIE Port B1 */ -#define PCI_PRODUCT_INTEL_E7710_MCH_PCIEC0 0x3599 /* E7710 MCH PCIE Port C0 */ -#define PCI_PRODUCT_INTEL_E7710_MCH_PCIEC1 0x359a /* E7710 MCH PCIE Port C1 */ +#define PCI_PRODUCT_INTEL_E7710_MCH_PCIEA0 0x3595 /* E7710 MCH PCIE */ +#define PCI_PRODUCT_INTEL_E7710_MCH_PCIEA1 0x3596 /* E7710 MCH PCIE */ +#define PCI_PRODUCT_INTEL_E7710_MCH_PCIEB0 0x3597 /* E7710 MCH PCIE */ +#define PCI_PRODUCT_INTEL_E7710_MCH_PCIEB1 0x3598 /* E7710 MCH PCIE */ +#define PCI_PRODUCT_INTEL_E7710_MCH_PCIEC0 0x3599 /* E7710 MCH PCIE */ +#define PCI_PRODUCT_INTEL_E7710_MCH_PCIEC1 0x359a /* E7710 MCH PCIE */ #define PCI_PRODUCT_INTEL_E7710_WMCH 0x359e /* E7710 WMCH */ #define PCI_PRODUCT_INTEL_PRO_2200BG_3B 0x4220 /* PRO/2200BG_3 */ #define PCI_PRODUCT_INTEL_80960RD 0x5200 /* i960 RD PCI-PCI */ @@ -1735,7 +1735,7 @@ #define PCI_PRODUCT_NEC_MARTH 0x0074 /* I/O */ #define PCI_PRODUCT_NEC_PKUG 0x007d /* I/O */ #define PCI_PRODUCT_NEC_uPD72874 0x00f2 /* Firewire */ -#define PCI_PRODUCT_NEC_USB2 0x00e0 /* USB 2.0 */ +#define PCI_PRODUCT_NEC_USB 0x00e0 /* USB */ #define PCI_PRODUCT_NEC_VERSAMAESTRO 0x8058 /* Versa Maestro */ #define PCI_PRODUCT_NEC_VERSAPRONXVA26D 0x803c /* Versa Va26D Maestro */ @@ -1885,7 +1885,7 @@ #define PCI_PRODUCT_NVIDIA_NFORCE2_IDE 0x0065 /* nForce2 IDE */ #define PCI_PRODUCT_NVIDIA_NFORCE2_LAN 0x0066 /* nForce2 LAN */ #define PCI_PRODUCT_NVIDIA_NFORCE2_USB 0x0067 /* nForce2 USB */ -#define PCI_PRODUCT_NVIDIA_NFORCE2_USB2 0x0068 /* nForce2 USB2 */ +#define PCI_PRODUCT_NVIDIA_NFORCE2_USB2 0x0068 /* nForce2 USB */ #define PCI_PRODUCT_NVIDIA_NFORCE2_ACA 0x006a /* nForce2 AC-97 Audio */ #define PCI_PRODUCT_NVIDIA_NFORCE2_APU 0x006b /* nForce2 Audio */ #define PCI_PRODUCT_NVIDIA_NFORCE2_PPB 0x006c /* nForce2 PCI-PCI */ @@ -1901,7 +1901,7 @@ #define PCI_PRODUCT_NVIDIA_NFORCE3_IDE 0x00d5 /* nForce3 IDE */ #define PCI_PRODUCT_NVIDIA_NFORCE3_LAN1 0x00d6 /* nForce3 LAN */ #define PCI_PRODUCT_NVIDIA_NFORCE3_USB 0x00d7 /* nForce3 USB */ -#define PCI_PRODUCT_NVIDIA_NFORCE3_USB2 0x00d8 /* nForce3 USB2 */ +#define PCI_PRODUCT_NVIDIA_NFORCE3_USB2 0x00d8 /* nForce3 USB */ #define PCI_PRODUCT_NVIDIA_NFORCE3_ACA 0x00da /* nForce3 AC-97 Audio */ #define PCI_PRODUCT_NVIDIA_NFORCE3_PPB 0x00dd /* nForce3 PCI-PCI */ #define PCI_PRODUCT_NVIDIA_NFORCE3_LAN4 0x00df /* nForce3 LAN */ @@ -2561,7 +2561,7 @@ #define PCI_PRODUCT_VIATECH_VT8366_ISA 0x3074 /* VT8366 ISA */ #define PCI_PRODUCT_VIATECH_VT8366 0x3099 /* VT8366 PCI */ #define PCI_PRODUCT_VIATECH_VT8653_PCI 0x3101 /* VT8653 PCI */ -#define PCI_PRODUCT_VIATECH_VT6202 0x3104 /* VT6202 USB 2.0 */ +#define PCI_PRODUCT_VIATECH_VT6202 0x3104 /* VT6202 USB */ #define PCI_PRODUCT_VIATECH_VT6105 0x3106 /* VT6105 RhineIII */ #define PCI_PRODUCT_VIATECH_VT8361_PCI 0x3112 /* VT8361 PCI */ #define PCI_PRODUCT_VIATECH_VT8375 0x3116 /* VT8375 PCI */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index c33daa01a4a..8c5a3de01a8 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.794 2004/11/20 22:49:41 brad Exp + * OpenBSD: pcidevs,v 1.796 2004/11/20 23:07:18 brad Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -3503,8 +3503,8 @@ static const struct pci_known_product pci_known_products[] = { "82801BA SMBus", }, { - PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801BA_USB2, - "82801BA USB2", + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801BA_USB, + "82801BA USB", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801BA_ACA, @@ -3731,22 +3731,6 @@ static const struct pci_known_product pci_known_products[] = { "82850/82860 AGP", }, { - PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82852_IO1, - "82852/82855 CPU-I/O-1", - }, - { - PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82852_AGP, - "82852/82855 AGP", - }, - { - PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82852_IO2, - "82852/82855 CPU-I/O-2", - }, - { - PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82852_IO3, - "82852/82855 CPU-I/O-3", - }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82860_PCI1, "82860 PCI-PCI", }, @@ -3839,7 +3823,7 @@ static const struct pci_known_product pci_known_products[] = { "6300ESB APIC", }, { - PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6300ESB_USB2, + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6300ESB_USB, "6300ESB USB", }, { @@ -3847,32 +3831,32 @@ static const struct pci_known_product pci_known_products[] = { "6300ESB PCIX", }, { - PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801_SATA, - "82801FB/FR/FW/FRW SATA", + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801FB_SATA, + "82801FB SATA", }, { - PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801_USB_1, - "82801FB/FR/FW/FRW USB", + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801FB_USB_1, + "82801FB USB", }, { - PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801_USB_2, - "82801FB/FR/FW/FRW USB", + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801FB_USB_2, + "82801FB USB", }, { - PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801_USB_3, - "82801FB/FR/FW/FRW USB", + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801FB_USB_3, + "82801FB USB", }, { - PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801_USB2, - "82801FB/FR/FW/FRW USB 2.0", + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801FB_USB, + "82801FB USB", }, { - PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801_PCIE_1, - "82801FB/FR/FW/FRW PCIE Port 1", + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801FB_PCIE_1, + "82801FB PCIE", }, { - PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801_PCIE_2, - "82801FB/FR/FW/FRW PCIE Port 2", + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801FB_PCIE_2, + "82801FB PCIE", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_31244, @@ -3923,6 +3907,22 @@ static const struct pci_known_product pci_known_products[] = { "RCU32 I2O RAID", }, { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82852_IO1, + "82852/82855 CPU-I/O-1", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82852_AGP, + "82852/82855 AGP", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82852_IO2, + "82852/82855 CPU-I/O-2", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82852_IO3, + "82852/82855 CPU-I/O-3", + }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_SMCH, "E7710 SMCH", }, @@ -3936,27 +3936,27 @@ static const struct pci_known_product pci_known_products[] = { }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_MCH_PCIEA0, - "E7710 MCH PCIE Port A0", + "E7710 MCH PCIE", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_MCH_PCIEA1, - "E7710 MCH PCIE Port A1", + "E7710 MCH PCIE", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_MCH_PCIEB0, - "E7710 MCH PCIE Port B0", + "E7710 MCH PCIE", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_MCH_PCIEB1, - "E7710 MCH PCIE Port B1", + "E7710 MCH PCIE", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_MCH_PCIEC0, - "E7710 MCH PCIE Port C0", + "E7710 MCH PCIE", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_MCH_PCIEC1, - "E7710 MCH PCIE Port C1", + "E7710 MCH PCIE", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_WMCH, @@ -4779,8 +4779,8 @@ static const struct pci_known_product pci_known_products[] = { "Firewire", }, { - PCI_VENDOR_NEC, PCI_PRODUCT_NEC_USB2, - "USB 2.0", + PCI_VENDOR_NEC, PCI_PRODUCT_NEC_USB, + "USB", }, { PCI_VENDOR_NEC, PCI_PRODUCT_NEC_VERSAMAESTRO, @@ -5244,7 +5244,7 @@ static const struct pci_known_product pci_known_products[] = { }, { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_USB2, - "nForce2 USB2", + "nForce2 USB", }, { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_ACA, @@ -5308,7 +5308,7 @@ static const struct pci_known_product pci_known_products[] = { }, { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_USB2, - "nForce3 USB2", + "nForce3 USB", }, { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_ACA, @@ -7476,7 +7476,7 @@ static const struct pci_known_product pci_known_products[] = { }, { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT6202, - "VT6202 USB 2.0", + "VT6202 USB", }, { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT6105, |