summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>2000-07-01 14:43:56 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>2000-07-01 14:43:56 +0000
commitde24e57f3d6e3259658a4cf65b4647446335da7f (patch)
tree8a9f8b3f3547650caa3770f7ab0d5280393b0f0c
parent4d2427b7e23fd61feedb34d22ea54027062eb917 (diff)
sync
-rw-r--r--sys/dev/cardbus/cardbusdevs.h12
-rw-r--r--sys/dev/cardbus/cardbusdevs_data.h28
2 files changed, 27 insertions, 13 deletions
diff --git a/sys/dev/cardbus/cardbusdevs.h b/sys/dev/cardbus/cardbusdevs.h
index 92f74463ffa..51f5c39aa36 100644
--- a/sys/dev/cardbus/cardbusdevs.h
+++ b/sys/dev/cardbus/cardbusdevs.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: cardbusdevs.h,v 1.3 2000/06/09 00:43:05 aaron Exp $ */
+/* $OpenBSD: cardbusdevs.h,v 1.4 2000/07/01 14:43:55 aaron Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: cardbusdevs,v 1.2 2000/05/15 06:26:58 niklas Exp
+ * OpenBSD: cardbusdevs,v 1.3 2000/06/09 00:42:36 aaron Exp
*/
/* $NetBSD: cardbusdevs,v 1.7 1999/12/11 22:22:34 explorer Exp $ */
@@ -63,11 +63,13 @@
/* 3COM Products */
-#define CARDBUS_PRODUCT_3COM_3C575TX 0x5057 /* 3c575 100Base-TX */
-#define CARDBUS_PRODUCT_3COM_3C575BTX 0x5157 /* 3c575B 100Base-TX */
+#define CARDBUS_PRODUCT_3COM_3C575 0x5057 /* 3C575 100Base-TX */
+#define CARDBUS_PRODUCT_3COM_3CCFE575BT 0x5157 /* 3CCFE575BT 100Base-TX */
#define CARDBUS_PRODUCT_3COM_3CCFE575CT 0x5257 /* 3CCFE575CT 100Base-TX */
-#define CARDBUS_PRODUCT_3COM_3CCFE656B 0x6562 /* 3CCFE656B 100Base-TX */
+#define CARDBUS_PRODUCT_3COM_3CCFEM656 0x6560 /* 3CCFEM656 100Base-TX */
+#define CARDBUS_PRODUCT_3COM_3CCFEM656B 0x6562 /* 3CCFEM656B 100Base-TX */
#define CARDBUS_PRODUCT_3COM_MODEM56 0x6563 /* 56k Modem */
+#define CARDBUS_PRODUCT_3COM_3CCFEM656C 0x6564 /* 3CCFEM656C 100Base-TX */
/* Adaptec products */
#define CARDBUS_PRODUCT_ADP_1480 0x6075 /* APA-1480 */
diff --git a/sys/dev/cardbus/cardbusdevs_data.h b/sys/dev/cardbus/cardbusdevs_data.h
index 837ca765290..512f3f421b0 100644
--- a/sys/dev/cardbus/cardbusdevs_data.h
+++ b/sys/dev/cardbus/cardbusdevs_data.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: cardbusdevs_data.h,v 1.3 2000/06/09 00:43:05 aaron Exp $ */
+/* $OpenBSD: cardbusdevs_data.h,v 1.4 2000/07/01 14:43:55 aaron Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: cardbusdevs,v 1.2 2000/05/15 06:26:58 niklas Exp
+ * OpenBSD: cardbusdevs,v 1.3 2000/06/09 00:42:36 aaron Exp
*/
/* $NetBSD: cardbusdevs,v 1.7 1999/12/11 22:22:34 explorer Exp $ */
@@ -41,16 +41,16 @@
struct cardbus_knowndev cardbus_knowndevs[] = {
{
- CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3C575TX,
+ CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3C575,
0,
"3Com",
- "3c575 100Base-TX",
+ "3C575 100Base-TX",
},
{
- CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3C575BTX,
+ CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3CCFE575BT,
0,
"3Com",
- "3c575B 100Base-TX",
+ "3CCFE575BT 100Base-TX",
},
{
CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3CCFE575CT,
@@ -59,10 +59,16 @@ struct cardbus_knowndev cardbus_knowndevs[] = {
"3CCFE575CT 100Base-TX",
},
{
- CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3CCFE656B,
+ CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3CCFEM656,
0,
"3Com",
- "3CCFE656B 100Base-TX",
+ "3CCFEM656 100Base-TX",
+ },
+ {
+ CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3CCFEM656B,
+ 0,
+ "3Com",
+ "3CCFEM656B 100Base-TX",
},
{
CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_MODEM56,
@@ -71,6 +77,12 @@ struct cardbus_knowndev cardbus_knowndevs[] = {
"56k Modem",
},
{
+ CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3CCFEM656C,
+ 0,
+ "3Com",
+ "3CCFEM656C 100Base-TX",
+ },
+ {
CARDBUS_VENDOR_ADP, CARDBUS_PRODUCT_ADP_1480,
0,
"Adaptec",