summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-11-04 19:43:18 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-11-04 19:43:18 +0000
commitd8d8063c6ad623d49cc664865ae8e04a68b1ff5e (patch)
treedd72d9427a8148ac0d80198fbae9baf01f196031 /sys/dev
parentf75fdd8bf0b39dc0badff758c1226b6a48687c82 (diff)
regen
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/pcidevs.h8
-rw-r--r--sys/dev/pci/pcidevs_data.h26
2 files changed, 32 insertions, 2 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 0821bb730fb..f5686973346 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.1178 2006/11/04 12:46:48 mk Exp
+ * OpenBSD: pcidevs,v 1.1179 2006/11/04 19:41:59 brad Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -337,6 +337,9 @@
#define PCI_PRODUCT_O2MICRO_OZ7110 0x7110 /* OZ711Mx CardBus */
#define PCI_PRODUCT_O2MICRO_OZ7113 0x7113 /* OZ711EC1 SmartCardBus */
#define PCI_PRODUCT_O2MICRO_OZ7114 0x7114 /* OZ711M1 CardBus */
+#define PCI_PRODUCT_O2MICRO_OZ7120 0x7120 /* OZ711MP1 SDHC */
+#define PCI_PRODUCT_O2MICRO_OZ7130 0x7130 /* OZ711MP1 XDHC */
+#define PCI_PRODUCT_O2MICRO_OZ7134 0x7134 /* OZ711MP1 CardBus */
#define PCI_PRODUCT_O2MICRO_OZ7223 0x7223 /* OZ711E0 CardBus */
/* 3Com Products */
@@ -3492,6 +3495,9 @@
#define PCI_PRODUCT_TI_PCI7XX1_SM 0x8035 /* PCI7XX1 Smart Card */
#define PCI_PRODUCT_TI_PCI6515 0x8036 /* PCI6515 CardBus */
#define PCI_PRODUCT_TI_PCI6515SC 0x8038 /* PCI6515 CardBus (Smart Card mode) */
+#define PCI_PRODUCT_TI_PCIXX12 0x8039 /* PCIXX12 CardBus */
+#define PCI_PRODUCT_TI_PCIXX12_MCR 0x803b /* PCIXX12 Multimedia Card Reader */
+#define PCI_PRODUCT_TI_PCIXX12_SD 0x803c /* PCIXX12 Secure Data */
#define PCI_PRODUCT_TI_PCI1620_MISC 0x8201 /* PCI1620 Misc */
#define PCI_PRODUCT_TI_ACX100A 0x8400 /* ACX100A */
#define PCI_PRODUCT_TI_ACX100B 0x8401 /* ACX100B */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 7152374d5a4..8aedc4b8a3b 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.1178 2006/11/04 12:46:48 mk Exp
+ * OpenBSD: pcidevs,v 1.1179 2006/11/04 19:41:59 brad Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -83,6 +83,18 @@ static const struct pci_known_product pci_known_products[] = {
"OZ711M1 CardBus",
},
{
+ PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ7120,
+ "OZ711MP1 SDHC",
+ },
+ {
+ PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ7130,
+ "OZ711MP1 XDHC",
+ },
+ {
+ PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ7134,
+ "OZ711MP1 CardBus",
+ },
+ {
PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ7223,
"OZ711E0 CardBus",
},
@@ -10935,6 +10947,18 @@ static const struct pci_known_product pci_known_products[] = {
"PCI6515 CardBus (Smart Card mode)",
},
{
+ PCI_VENDOR_TI, PCI_PRODUCT_TI_PCIXX12,
+ "PCIXX12 CardBus",
+ },
+ {
+ PCI_VENDOR_TI, PCI_PRODUCT_TI_PCIXX12_MCR,
+ "PCIXX12 Multimedia Card Reader",
+ },
+ {
+ PCI_VENDOR_TI, PCI_PRODUCT_TI_PCIXX12_SD,
+ "PCIXX12 Secure Data",
+ },
+ {
PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1620_MISC,
"PCI1620 Misc",
},