diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-03-04 22:32:31 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-03-04 22:32:31 +0000 |
commit | 530511492dd251fcb739fd0b7560c7996327d1b9 (patch) | |
tree | cd4faccc9d7bc73b7a5beae80a7d60e197e0c22e | |
parent | 522cfddd59b8226b36751e2e7f5dcf2aa55c33ba (diff) |
sync
-rw-r--r-- | sys/dev/pci/pcidevs.h | 15 | ||||
-rw-r--r-- | sys/dev/pci/pcidevs_data.h | 30 |
2 files changed, 36 insertions, 9 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index 474e0e64de1..591ed4863ca 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.124 1999/03/04 15:27:30 mickey Exp + * OpenBSD: pcidevs,v 1.125 1999/03/04 22:32:21 deraadt Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -569,8 +569,8 @@ /* ACC Products */ #define PCI_PRODUCT_ACC_2188 0x0000 /* ACCM 2188 VL-PCI */ -#define PCI_PRODUCT_ACC_2051_HB 0x2051 /* 2051 PCI Host-PCI */ -#define PCI_PRODUCT_ACC_2051_ISA 0x5842 /* 2051 PCI Host-ISA */ +#define PCI_PRODUCT_ACC_2051_HB 0x2051 /* 2051 Host-PCI */ +#define PCI_PRODUCT_ACC_2051_ISA 0x5842 /* 2051 Host-ISA */ /* Accton products */ #define PCI_PRODUCT_ACCTON_5030 0x1211 /* MPX 5030/5038 */ @@ -1156,9 +1156,12 @@ /* Toshiba products */ #define PCI_PRODUCT_TOSHIBA_R4X00 0x102f /* R4x00 Host-PCI */ #define PCI_PRODUCT_TOSHIBA_TC35856F 0x0020 /* TC35856F ATM (Meteor) */ -/* product TOSHIBA2 ?? 0x0601 Host-PCI */ -/* product TOSHIBA2 ?? 0x060f PCI-CardBus */ -/* product TOSHIBA2 ?? 0x0701 ?? misc communications */ + +/* Toshiba (2nd ID) products */ +#define PCI_PRODUCT_TOSHIBA2_THB 0x0601 /* Host-PCI */ +#define PCI_PRODUCT_TOSHIBA2_TOPIC95 0x060a /* PCI-CardBus */ +#define PCI_PRODUCT_TOSHIBA2_TCB 0x060f /* PCI-CardBus */ +#define PCI_PRODUCT_TOSHIBA2_TFIRO 0x0701 /* PCI-FIRO */ /* Trident products */ #define PCI_PRODUCT_TRIDENT_TGUI_9320 0x9320 /* TGUI 9320 */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index daf64523915..5bba20aec52 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.124 1999/03/04 15:27:30 mickey Exp + * OpenBSD: pcidevs,v 1.125 1999/03/04 22:32:21 deraadt Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -162,13 +162,13 @@ struct pci_knowndev pci_knowndevs[] = { PCI_VENDOR_ACC, PCI_PRODUCT_ACC_2051_HB, 0, "ACC Microelectronics", - "2051 PCI Host-PCI", + "2051 Host-PCI", }, { PCI_VENDOR_ACC, PCI_PRODUCT_ACC_2051_ISA, 0, "ACC Microelectronics", - "2051 PCI Host-ISA", + "2051 Host-ISA", }, { PCI_VENDOR_ACCTON, PCI_PRODUCT_ACCTON_5030, @@ -2529,6 +2529,30 @@ struct pci_knowndev pci_knowndevs[] = { "TC35856F ATM (Meteor)", }, { + PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_THB, + 0, + "Toshiba (2nd ID)", + "Host-PCI", + }, + { + PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_TOPIC95, + 0, + "Toshiba (2nd ID)", + "PCI-CardBus", + }, + { + PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_TCB, + 0, + "Toshiba (2nd ID)", + "PCI-CardBus", + }, + { + PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_TFIRO, + 0, + "Toshiba (2nd ID)", + "PCI-FIRO", + }, + { PCI_VENDOR_TRIDENT, PCI_PRODUCT_TRIDENT_TGUI_9320, 0, "Trident Microsystems", |