sync

3 files changed, 54 insertions, 62 deletions

diff --git a/sys/dev/pcmcia/Makefile.pcmciadevs b/sys/dev/pcmcia/Makefile.pcmciadevs
deleted file mode 100644
index 6b76864c0c4..00000000000
--- a/sys/dev/pcmcia/Makefile.pcmciadevs
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$OpenBSD: Makefile.pcmciadevs,v 1.1 1998/09/11 10:47:14 fgsch Exp $
-#	$NetBSD: Makefile.pcmciadevs,v 1.1 1998/07/19 17:28:15 christos Exp $
-
-AWK=	awk
-
-pcmciadevs.h pcmciadevs_data.h: pcmciadevs devlist2h.awk
-	/bin/rm -f pcmciadevs.h pcmciadevs_data.h
-	${AWK} -f devlist2h.awk pcmciadevs
diff --git a/sys/dev/pcmcia/pcmciadevs.h b/sys/dev/pcmcia/pcmciadevs.h
index b22edd43b9d..49ccf016b5c 100644
--- a/sys/dev/pcmcia/pcmciadevs.h
+++ b/sys/dev/pcmcia/pcmciadevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: pcmciadevs.h,v 1.2 1998/09/11 13:46:59 fgsch Exp $	*/
+/*	$OpenBSD: pcmciadevs.h,v 1.3 1998/09/14 19:21:22 deraadt Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: pcmciadevs,v 1.1 1998/09/11 10:47:15 fgsch Exp 
+ *		OpenBSD: pcmciadevs,v 1.3 1998/09/14 19:21:15 deraadt Exp 
  */
 /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */
 
@@ -43,20 +43,20 @@
  * List of known PCMCIA vendors
  */
 
-#define	PCMCIA_VENDOR_NEWMEDIA	0x0057	/* NewMedia Corporation */
-#define	PCMCIA_VENDOR_IBM	0x00a4	/* IBM Corporation */
-#define	PCMCIA_VENDOR_3COM	0x0101	/* 3Com Corporation */
-#define	PCMCIA_VENDOR_MEGAHERTZ	0x0102	/* Megahertz Corporation */
+#define	PCMCIA_VENDOR_NEWMEDIA	0x0057	/* NewMedia */
+#define	PCMCIA_VENDOR_IBM	0x00a4	/* IBM */
+#define	PCMCIA_VENDOR_3COM	0x0101	/* 3Com */
+#define	PCMCIA_VENDOR_MEGAHERTZ	0x0102	/* Megahertz */
 #define	PCMCIA_VENDOR_SOCKET	0x0104	/* Socket Communications */
-#define	PCMCIA_VENDOR_TDK	0x0105	/* TDK Corporation */
-#define	PCMCIA_VENDOR_SMC	0x0108	/* Standard Microsystems Corporation */
-#define	PCMCIA_VENDOR_MOTOROLA	0x0109	/* Motorola Corporation */
-#define	PCMCIA_VENDOR_USROBOTICS	0x0115	/* US Robotics Corporation */
-#define	PCMCIA_VENDOR_MEGAHERTZ2	0x0128	/* Megahertz Corporation */
-#define	PCMCIA_VENDOR_ADAPTEC	0x012f	/* Adaptec Corporation */
-#define	PCMCIA_VENDOR_LINKSYS	0x0149	/* Linksys Corporation */
+#define	PCMCIA_VENDOR_TDK	0x0105	/* TDK */
+#define	PCMCIA_VENDOR_SMC	0x0108	/* SMC */
+#define	PCMCIA_VENDOR_MOTOROLA	0x0109	/* Motorola */
+#define	PCMCIA_VENDOR_USROBOTICS	0x0115	/* US Robotics */
+#define	PCMCIA_VENDOR_MEGAHERTZ2	0x0128	/* Megahertz */
+#define	PCMCIA_VENDOR_ADAPTEC	0x012f	/* Adaptec */
+#define	PCMCIA_VENDOR_LINKSYS	0x0149	/* Linksys */
 #define	PCMCIA_VENDOR_SIMPLETECH	0x014d	/* Simple Technology */
-#define	PCMCIA_VENDOR_DAYNA	0x0194	/* Dayna Corporation */
+#define	PCMCIA_VENDOR_DAYNA	0x0194	/* Dayna */
 #define	PCMCIA_VENDOR_IODATA	0x01bf	/* I-O DATA */
 
 /*
@@ -175,7 +175,7 @@
 #define	PCMCIA_VENDOR_RPTI	-1	/* RPTI */
 #define	PCMCIA_VENDOR_ACCTON	-1	/* ACCTON */
 #define	PCMCIA_VENDOR_YEDATA	-1	/* Y-E DATA */
-#define	PCMCIA_VENDOR_DIGITAL	-1	/* Digital Equipment Corporation */
+#define	PCMCIA_VENDOR_DIGITAL	-1	/* Digital */
 
 #define	PCMCIA_CIS_MEGAHERTZ_XJ2288	{ "MEGAHERTZ", "MODEM XJ2288", NULL, NULL }
 #define	PCMCIA_PRODUCT_MEGAHERTZ_XJ2288	-1
diff --git a/sys/dev/pcmcia/pcmciadevs_data.h b/sys/dev/pcmcia/pcmciadevs_data.h
index bf95e397b00..b6aa7dd2992 100644
--- a/sys/dev/pcmcia/pcmciadevs_data.h
+++ b/sys/dev/pcmcia/pcmciadevs_data.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: pcmciadevs_data.h,v 1.2 1998/09/11 13:47:00 fgsch Exp $	*/
+/*	$OpenBSD: pcmciadevs_data.h,v 1.3 1998/09/14 19:21:22 deraadt Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: pcmciadevs,v 1.1 1998/09/11 10:47:15 fgsch Exp 
+ *		OpenBSD: pcmciadevs,v 1.3 1998/09/14 19:21:15 deraadt Exp 
  */
 /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */
 
@@ -44,77 +44,77 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = {
 	    PCMCIA_VENDOR_ADAPTEC, PCMCIA_PRODUCT_ADAPTEC_APA1460_1,
 	    PCMCIA_CIS_ADAPTEC_APA1460_1,
 	    0,
-	    "Adaptec Corporation",
+	    "Adaptec",
 	    "Adaptec APA-1460/A SCSI Host Adapter"	},
 	},
 	{
 	    PCMCIA_VENDOR_ADAPTEC, PCMCIA_PRODUCT_ADAPTEC_APA1460_2,
 	    PCMCIA_CIS_ADAPTEC_APA1460_2,
 	    0,
-	    "Adaptec Corporation",
+	    "Adaptec",
 	    "Adaptec APA-1460/B SCSI Host Adapter"	},
 	},
 	{
 	    PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3C562,
 	    PCMCIA_CIS_3COM_3C562,
 	    0,
-	    "3Com Corporation",
+	    "3Com",
 	    "3Com 3c562 33.6 Modem/10Mbps Ethernet"	},
 	},
 	{
 	    PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3C589,
 	    PCMCIA_CIS_3COM_3C589,
 	    0,
-	    "3Com Corporation",
+	    "3Com",
 	    "3Com 3c589 10Mbps Ethernet"	},
 	},
 	{
 	    PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3C574,
 	    PCMCIA_CIS_3COM_3C574,
 	    0,
-	    "3Com Corporation",
+	    "3Com",
 	    "3Com 3c574-TX 10/100Mbps Ethernet"	},
 	},
 	{
 	    PCMCIA_VENDOR_DAYNA, PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E,
 	    PCMCIA_CIS_DAYNA_COMMUNICARD_E,
 	    0,
-	    "Dayna Corporation",
+	    "Dayna",
 	    "Dayna CommuniCard E"	},
 	},
 	{
 	    PCMCIA_VENDOR_MOTOROLA, PCMCIA_PRODUCT_MOTOROLA_POWER144,
 	    PCMCIA_CIS_MOTOROLA_POWER144,
 	    0,
-	    "Motorola Corporation",
+	    "Motorola",
 	    "Motorola Power 14.4 Modem"	},
 	},
 	{
 	    PCMCIA_VENDOR_MOTOROLA, PCMCIA_PRODUCT_MOTOROLA_PM100C,
 	    PCMCIA_CIS_MOTOROLA_PM100C,
 	    0,
-	    "Motorola Corporation",
+	    "Motorola",
 	    "Motorola Personal Messenger 100C CDPD Modem"	},
 	},
 	{
 	    PCMCIA_VENDOR_MOTOROLA, PCMCIA_PRODUCT_MOTOROLA_MONTANA_336,
 	    PCMCIA_CIS_MOTOROLA_MONTANA_336,
 	    0,
-	    "Motorola Corporation",
+	    "Motorola",
 	    "Motorola Montana 33.6 Fax/Modem"	},
 	},
 	{
 	    PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_INFOMOVER,
 	    PCMCIA_CIS_IBM_INFOMOVER,
 	    0,
-	    "IBM Corporation",
+	    "IBM",
 	    "National Semiconductor InfoMover"	},
 	},
 	{
 	    PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_HOME_AND_AWAY,
 	    PCMCIA_CIS_IBM_HOME_AND_AWAY,
 	    0,
-	    "IBM Corporation",
+	    "IBM",
 	    "IBM Home and Away Modem"	},
 	},
 	{
@@ -128,49 +128,49 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = {
 	    PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ECARD,
 	    PCMCIA_CIS_LINKSYS_ECARD,
 	    0,
-	    "Linksys Corporation",
+	    "Linksys",
 	    "Linksys EthernetCard"	},
 	},
 	{
 	    PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD,
 	    PCMCIA_CIS_LINKSYS_COMBO_ECARD,
 	    0,
-	    "Linksys Corporation",
+	    "Linksys",
 	    "Linksys Combo EthernetCard"	},
 	},
 	{
 	    PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_TRUST_COMBO_ECARD,
 	    PCMCIA_CIS_LINKSYS_TRUST_COMBO_ECARD,
 	    0,
-	    "Linksys Corporation",
+	    "Linksys",
 	    "Trust (Linksys) Combo EthernetCard"	},
 	},
 	{
 	    PCMCIA_VENDOR_MEGAHERTZ, PCMCIA_PRODUCT_MEGAHERTZ_XJ4288,
 	    PCMCIA_CIS_MEGAHERTZ_XJ4288,
 	    0,
-	    "Megahertz Corporation",
+	    "Megahertz",
 	    "Megahertz XJ4288 Modem"	},
 	},
 	{
 	    PCMCIA_VENDOR_MEGAHERTZ2, PCMCIA_PRODUCT_MEGAHERTZ2_XJEM1144,
 	    PCMCIA_CIS_MEGAHERTZ2_XJEM1144,
 	    0,
-	    "Megahertz Corporation",
+	    "Megahertz",
 	    "Megahertz XJEM1144 Ethernet"	},
 	},
 	{
 	    PCMCIA_VENDOR_MEGAHERTZ2, PCMCIA_PRODUCT_MEGAHERTZ2_XJACK,
 	    PCMCIA_CIS_MEGAHERTZ2_XJACK,
 	    0,
-	    "Megahertz Corporation",
+	    "Megahertz",
 	    "Megahertz X-JACK Ethernet"	},
 	},
 	{
 	    PCMCIA_VENDOR_USROBOTICS, PCMCIA_PRODUCT_USROBOTICS_WORLDPORT144,
 	    PCMCIA_CIS_USROBOTICS_WORLDPORT144,
 	    0,
-	    "US Robotics Corporation",
+	    "US Robotics",
 	    "US Robotics WorldPort 14.4 Modem"	},
 	},
 	{
@@ -198,35 +198,35 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = {
 	    PCMCIA_VENDOR_TDK, PCMCIA_PRODUCT_TDK_LAK_CD021BX,
 	    PCMCIA_CIS_TDK_LAK_CD021BX,
 	    0,
-	    "TDK Corporation",
+	    "TDK",
 	    "TDK LAK-CD021BX Ethernet"	},
 	},
 	{
 	    PCMCIA_VENDOR_TDK, PCMCIA_PRODUCT_TDK_DFL9610,
 	    PCMCIA_CIS_TDK_DFL9610,
 	    0,
-	    "TDK Corporation",
+	    "TDK",
 	    "TDK DFL9610 Ethernet & Digital Cellular"	},
 	},
 	{
 	    PCMCIA_VENDOR_NEWMEDIA, PCMCIA_PRODUCT_NEWMEDIA_BASICS,
 	    PCMCIA_CIS_NEWMEDIA_BASICS,
 	    0,
-	    "NewMedia Corporation",
+	    "NewMedia",
 	    "NewMedia BASICS Ethernet"	},
 	},
 	{
 	    PCMCIA_VENDOR_SMC, PCMCIA_PRODUCT_SMC_8016,
 	    PCMCIA_CIS_SMC_8016,
 	    0,
-	    "Standard Microsystems Corporation",
+	    "SMC",
 	    "SMC 8016 EtherCard"	},
 	},
 	{
 	    PCMCIA_VENDOR_UNKNOWN, PCMCIA_PRODUCT_MEGAHERTZ_XJ2288,
 	    PCMCIA_CIS_MEGAHERTZ_XJ2288,
 	    0,
-	    "Megahertz Corporation",
+	    "Megahertz",
 	    "Megahertz XJ2288 Modem"	},
 	},
 	{
@@ -282,35 +282,35 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = {
 	    PCMCIA_VENDOR_UNKNOWN, PCMCIA_PRODUCT_DIGITAL_DEPCMXX,
 	    PCMCIA_CIS_DIGITAL_DEPCMXX,
 	    0,
-	    "Digital Equipment Corporation",
+	    "Digital",
 	    "DEC DEPCM-BA"	},
 	},
 	{
 	    PCMCIA_VENDOR_NEWMEDIA, 0,
 	    PCMCIA_KNOWNDEV_NOPROD,
 	    PCMCIA_CIS_INVALID,
-	    "NewMedia Corporation",
+	    "NewMedia",
 	    NULL,
 	},
 	{
 	    PCMCIA_VENDOR_IBM, 0,
 	    PCMCIA_KNOWNDEV_NOPROD,
 	    PCMCIA_CIS_INVALID,
-	    "IBM Corporation",
+	    "IBM",
 	    NULL,
 	},
 	{
 	    PCMCIA_VENDOR_3COM, 0,
 	    PCMCIA_KNOWNDEV_NOPROD,
 	    PCMCIA_CIS_INVALID,
-	    "3Com Corporation",
+	    "3Com",
 	    NULL,
 	},
 	{
 	    PCMCIA_VENDOR_MEGAHERTZ, 0,
 	    PCMCIA_KNOWNDEV_NOPROD,
 	    PCMCIA_CIS_INVALID,
-	    "Megahertz Corporation",
+	    "Megahertz",
 	    NULL,
 	},
 	{
@@ -324,49 +324,49 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = {
 	    PCMCIA_VENDOR_TDK, 0,
 	    PCMCIA_KNOWNDEV_NOPROD,
 	    PCMCIA_CIS_INVALID,
-	    "TDK Corporation",
+	    "TDK",
 	    NULL,
 	},
 	{
 	    PCMCIA_VENDOR_SMC, 0,
 	    PCMCIA_KNOWNDEV_NOPROD,
 	    PCMCIA_CIS_INVALID,
-	    "Standard Microsystems Corporation",
+	    "SMC",
 	    NULL,
 	},
 	{
 	    PCMCIA_VENDOR_MOTOROLA, 0,
 	    PCMCIA_KNOWNDEV_NOPROD,
 	    PCMCIA_CIS_INVALID,
-	    "Motorola Corporation",
+	    "Motorola",
 	    NULL,
 	},
 	{
 	    PCMCIA_VENDOR_USROBOTICS, 0,
 	    PCMCIA_KNOWNDEV_NOPROD,
 	    PCMCIA_CIS_INVALID,
-	    "US Robotics Corporation",
+	    "US Robotics",
 	    NULL,
 	},
 	{
 	    PCMCIA_VENDOR_MEGAHERTZ2, 0,
 	    PCMCIA_KNOWNDEV_NOPROD,
 	    PCMCIA_CIS_INVALID,
-	    "Megahertz Corporation",
+	    "Megahertz",
 	    NULL,
 	},
 	{
 	    PCMCIA_VENDOR_ADAPTEC, 0,
 	    PCMCIA_KNOWNDEV_NOPROD,
 	    PCMCIA_CIS_INVALID,
-	    "Adaptec Corporation",
+	    "Adaptec",
 	    NULL,
 	},
 	{
 	    PCMCIA_VENDOR_LINKSYS, 0,
 	    PCMCIA_KNOWNDEV_NOPROD,
 	    PCMCIA_CIS_INVALID,
-	    "Linksys Corporation",
+	    "Linksys",
 	    NULL,
 	},
 	{
@@ -380,7 +380,7 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = {
 	    PCMCIA_VENDOR_DAYNA, 0,
 	    PCMCIA_KNOWNDEV_NOPROD,
 	    PCMCIA_CIS_INVALID,
-	    "Dayna Corporation",
+	    "Dayna",
 	    NULL,
 	},
 	{
@@ -436,7 +436,7 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = {
 	    PCMCIA_VENDOR_DIGITAL, 0,
 	    PCMCIA_KNOWNDEV_NOPROD,
 	    PCMCIA_CIS_INVALID,
-	    "Digital Equipment Corporation",
+	    "Digital",
 	    NULL,
 	},
 	{ 0, 0, { NULL, NULL, NULL, NULL }, 0, NULL, NULL, }