sync

2 files changed, 35 insertions, 35 deletions

diff --git a/sys/dev/cardbus/cardbusdevs.h b/sys/dev/cardbus/cardbusdevs.h
index 43e0ef25cfc..4543bc3e317 100644
--- a/sys/dev/cardbus/cardbusdevs.h
+++ b/sys/dev/cardbus/cardbusdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: cardbusdevs.h,v 1.5 2000/09/17 03:50:40 aaron Exp $	*/
+/*	$OpenBSD: cardbusdevs.h,v 1.6 2000/10/26 22:27:35 deraadt Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: cardbusdevs,v 1.4 2000/07/01 14:43:26 aaron Exp 
+ *	OpenBSD: cardbusdevs,v 1.6 2000/10/26 22:27:28 deraadt Exp 
  */
 /*	$NetBSD: cardbusdevs,v 1.7 1999/12/11 22:22:34 explorer Exp $	*/
 
@@ -48,50 +48,50 @@
  * List of known CardBus vendors
  */
 
-#define	CARDBUS_VENDOR_DEC	0x1011		/* Digital Equipment */
+#define	CARDBUS_VENDOR_DEC	0x1011		/* DEC */
 #define	CARDBUS_VENDOR_OPTI	0x1045		/* Opti */
 #define	CARDBUS_VENDOR_3COM	0x10B7		/* 3Com */
 #define	CARDBUS_VENDOR_XIRCOM	0x115d		/* Xircom */
 #define	CARDBUS_VENDOR_ADMTEK	0x1317		/* ADMtek */
 #define	CARDBUS_VENDOR_INTEL	0x8086		/* Intel */
 #define	CARDBUS_VENDOR_ADP	0x9004		/* Adaptec */
-#define	CARDBUS_VENDOR_ADP2	0x9005		/* Adaptec (2nd PCI Vendor ID) */
-#define	CARDBUS_VENDOR_INVALID	0xffff		/* INVALID VENDOR ID */
+#define	CARDBUS_VENDOR_ADP2	0x9005		/* Adaptec(2) */
+#define	CARDBUS_VENDOR_INVALID	0xffff		/* INVALID */
 
 /*
  * List of known products.  Grouped by vendor.
  */
 
 /* 3COM Products */
-#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_3CCFEM656	0x6560		/* 3CCFEM656 100Base-TX */
-#define	CARDBUS_PRODUCT_3COM_3CCFEM656B	0x6562		/* 3CCFEM656B 100Base-TX */
+#define	CARDBUS_PRODUCT_3COM_3C575	0x5057		/* 3C575 */
+#define	CARDBUS_PRODUCT_3COM_3CCFE575BT	0x5157		/* 3CCFE575BT */
+#define	CARDBUS_PRODUCT_3COM_3CCFE575CT	0x5257		/* 3CCFE575CT */
+#define	CARDBUS_PRODUCT_3COM_3CCFEM656	0x6560		/* 3CCFEM656 */
+#define	CARDBUS_PRODUCT_3COM_3CCFEM656B	0x6562		/* 3CCFEM656B */
 #define	CARDBUS_PRODUCT_3COM_MODEM56	0x6563		/* 56k Modem */
-#define	CARDBUS_PRODUCT_3COM_3CCFEM656C	0x6564		/* 3CCFEM656C 100Base-TX */
+#define	CARDBUS_PRODUCT_3COM_3CCFEM656C	0x6564		/* 3CCFEM656C */
 
 /* ADMtek products */
-#define	CARDBUS_PRODUCT_ADMTEK_AN985	0x1985		/* AN985 100Base-TX */
+#define	CARDBUS_PRODUCT_ADMTEK_AN985	0x1985		/* AN985 */
 
 /* Adaptec products */
 #define	CARDBUS_PRODUCT_ADP_1480	0x6075		/* APA-1480 */
 
 /* DEC products */
-#define	CARDBUS_PRODUCT_DEC_21142	0x0019		/* DECchip 21142/3 */
+#define	CARDBUS_PRODUCT_DEC_21142	0x0019		/* 21142/3 */
 
 /* Intel products */
-#define	CARDBUS_PRODUCT_INTEL_82557	0x1229		/* 82557 Fast Ethernet LAN Controller */
+#define	CARDBUS_PRODUCT_INTEL_82557	0x1229		/* 82557 */
 /* XXX product name? */
 #define	CARDBUS_PRODUCT_INTEL_MODEM56	0x1002		/* Modem */
 
 /* Opti products */
-#define	CARDBUS_PRODUCT_OPTI_82C861	0xc861		/* 82C861 USB Host Controller (OHCI) */
+#define	CARDBUS_PRODUCT_OPTI_82C861	0xc861		/* 82C861 */
 
 /* Xircom products */
 /* is the `-3' here just indicating revision 3, or is it really part
    of the device name? */
-#define	CARDBUS_PRODUCT_XIRCOM_X3201_3	0x0002		/* X3201-3 Fast Ethernet Controller */
+#define	CARDBUS_PRODUCT_XIRCOM_X3201_3	0x0002		/* X3201-3 */
 /* this is the device id `indicating 21143 driver compatibility' */
-#define	CARDBUS_PRODUCT_XIRCOM_X3201_3_21143	0x0003		/* X3201-3 Fast Ethernet Controller (21143) */
+#define	CARDBUS_PRODUCT_XIRCOM_X3201_3_21143	0x0003		/* X3201-3 (21143) */
 #define	CARDBUS_PRODUCT_XIRCOM_MODEM56	0x0103		/* 56k Modem */
diff --git a/sys/dev/cardbus/cardbusdevs_data.h b/sys/dev/cardbus/cardbusdevs_data.h
index 31a06e0c82f..e6404c69099 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.5 2000/09/17 03:50:40 aaron Exp $	*/
+/*	$OpenBSD: cardbusdevs_data.h,v 1.6 2000/10/26 22:27:35 deraadt Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: cardbusdevs,v 1.4 2000/07/01 14:43:26 aaron Exp 
+ *	OpenBSD: cardbusdevs,v 1.6 2000/10/26 22:27:28 deraadt Exp 
  */
 /*	$NetBSD: cardbusdevs,v 1.7 1999/12/11 22:22:34 explorer Exp $	*/
 
@@ -44,31 +44,31 @@ struct cardbus_knowndev cardbus_knowndevs[] = {
 	    CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3C575,
 	    0,
 	    "3Com",
-	    "3C575 100Base-TX",
+	    "3C575",
 	},
 	{
 	    CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3CCFE575BT,
 	    0,
 	    "3Com",
-	    "3CCFE575BT 100Base-TX",
+	    "3CCFE575BT",
 	},
 	{
 	    CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3CCFE575CT,
 	    0,
 	    "3Com",
-	    "3CCFE575CT 100Base-TX",
+	    "3CCFE575CT",
 	},
 	{
 	    CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3CCFEM656,
 	    0,
 	    "3Com",
-	    "3CCFEM656 100Base-TX",
+	    "3CCFEM656",
 	},
 	{
 	    CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3CCFEM656B,
 	    0,
 	    "3Com",
-	    "3CCFEM656B 100Base-TX",
+	    "3CCFEM656B",
 	},
 	{
 	    CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_MODEM56,
@@ -80,13 +80,13 @@ struct cardbus_knowndev cardbus_knowndevs[] = {
 	    CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3CCFEM656C,
 	    0,
 	    "3Com",
-	    "3CCFEM656C 100Base-TX",
+	    "3CCFEM656C",
 	},
 	{
 	    CARDBUS_VENDOR_ADMTEK, CARDBUS_PRODUCT_ADMTEK_AN985,
 	    0,
 	    "ADMtek",
-	    "AN985 100Base-TX",
+	    "AN985",
 	},
 	{
 	    CARDBUS_VENDOR_ADP, CARDBUS_PRODUCT_ADP_1480,
@@ -97,14 +97,14 @@ struct cardbus_knowndev cardbus_knowndevs[] = {
 	{
 	    CARDBUS_VENDOR_DEC, CARDBUS_PRODUCT_DEC_21142,
 	    0,
-	    "Digital Equipment",
-	    "DECchip 21142/3",
+	    "DEC",
+	    "21142/3",
 	},
 	{
 	    CARDBUS_VENDOR_INTEL, CARDBUS_PRODUCT_INTEL_82557,
 	    0,
 	    "Intel",
-	    "82557 Fast Ethernet LAN Controller",
+	    "82557",
 	},
 	{
 	    CARDBUS_VENDOR_INTEL, CARDBUS_PRODUCT_INTEL_MODEM56,
@@ -116,19 +116,19 @@ struct cardbus_knowndev cardbus_knowndevs[] = {
 	    CARDBUS_VENDOR_OPTI, CARDBUS_PRODUCT_OPTI_82C861,
 	    0,
 	    "Opti",
-	    "82C861 USB Host Controller (OHCI)",
+	    "82C861",
 	},
 	{
 	    CARDBUS_VENDOR_XIRCOM, CARDBUS_PRODUCT_XIRCOM_X3201_3,
 	    0,
 	    "Xircom",
-	    "X3201-3 Fast Ethernet Controller",
+	    "X3201-3",
 	},
 	{
 	    CARDBUS_VENDOR_XIRCOM, CARDBUS_PRODUCT_XIRCOM_X3201_3_21143,
 	    0,
 	    "Xircom",
-	    "X3201-3 Fast Ethernet Controller (21143)",
+	    "X3201-3 (21143)",
 	},
 	{
 	    CARDBUS_VENDOR_XIRCOM, CARDBUS_PRODUCT_XIRCOM_MODEM56,
@@ -139,7 +139,7 @@ struct cardbus_knowndev cardbus_knowndevs[] = {
 	{
 	    CARDBUS_VENDOR_DEC, 0,
 	    CARDBUS_KNOWNDEV_NOPROD,
-	    "Digital Equipment",
+	    "DEC",
 	    NULL,
 	},
 	{
@@ -181,13 +181,13 @@ struct cardbus_knowndev cardbus_knowndevs[] = {
 	{
 	    CARDBUS_VENDOR_ADP2, 0,
 	    CARDBUS_KNOWNDEV_NOPROD,
-	    "Adaptec (2nd PCI Vendor ID)",
+	    "Adaptec(2)",
 	    NULL,
 	},
 	{
 	    CARDBUS_VENDOR_INVALID, 0,
 	    CARDBUS_KNOWNDEV_NOPROD,
-	    "INVALID VENDOR ID",
+	    "INVALID",
 	    NULL,
 	},
 	{ 0, 0, 0, NULL, NULL, }