Remove unnecessary code. Shorten dmesg output.

1 files changed, 26 insertions, 51 deletions

diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c
index 9cbe6d78c7a..e200551594e 100644
--- a/sys/dev/pcmcia/if_ne_pcmcia.c
+++ b/sys/dev/pcmcia/if_ne_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_pcmcia.c,v 1.15 1999/08/15 19:10:31 fgsch Exp $	*/
+/*	$OpenBSD: if_ne_pcmcia.c,v 1.16 1999/08/16 08:49:05 fgsch Exp $	*/
 /*	$NetBSD: if_ne_pcmcia.c,v 1.17 1998/08/15 19:00:04 thorpej Exp $	*/
 
 /*
@@ -87,7 +87,6 @@ struct cfattach ne_pcmcia_ca = {
 };
 
 struct ne2000dev {
-    char *name;
     int32_t manufacturer;
     int32_t product;
     char *cis_info[4];
@@ -95,48 +94,39 @@ struct ne2000dev {
     int enet_maddr;
     unsigned char enet_vendor[3];
 } ne2000devs[] = {
-    { PCMCIA_STR_PREMAX_PE200,
-      PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
+    { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
       PCMCIA_CIS_PREMAX_PE200,
       0, 0x07f0, { 0x00, 0x20, 0xe0 } },
 
-    { PCMCIA_STR_DIGITAL_DEPCMXX,
-      PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
+    { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
       PCMCIA_CIS_DIGITAL_DEPCMXX,
       0, 0x0ff0, { 0x00, 0x00, 0xe8 } },
 
-    { PCMCIA_STR_PLANET_SMARTCOM2000,
-      PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
+    { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
       PCMCIA_CIS_PLANET_SMARTCOM2000,
       0, 0xff0, { 0x00, 0x00, 0xe8 } },
 
-    { PCMCIA_STR_DLINK_DE660,
-      PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
+    { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
       PCMCIA_CIS_DLINK_DE660,
       0, -1, { 0x00, 0x80, 0xc8 } },
 
-    { PCMCIA_STR_RPTI_EP401,
-      PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
+    { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
       PCMCIA_CIS_RPTI_EP401,
       0, -1, { 0x00, 0x40, 0x95 } },
 
-    { PCMCIA_STR_ACCTON_EN2212,
-      PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
+    { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
       PCMCIA_CIS_ACCTON_EN2212,
       0, 0x0ff0, { 0x00, 0x00, 0xe8 } },
 
-    { PCMCIA_STR_SVEC_COMBOCARD,
-      PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
+    { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
       PCMCIA_CIS_SVEC_COMBOCARD,
       0, -1, { 0x00, 0xe0, 0x98 } },
 
-    { PCMCIA_STR_SVEC_LANCARD,
-      PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
+    { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
       PCMCIA_CIS_SVEC_LANCARD,
       0, 0x7f0, { 0x00, 0xc0, 0x6c } },
 
-    { PCMCIA_STR_AMBICOM_AMB8002T,
-      PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
+    { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
       PCMCIA_CIS_AMBICOM_AMB8002T,
       0, -1, { 0x00, 0x00, 0xb2 } },
 
@@ -151,23 +141,19 @@ struct ne2000dev {
      * product and vendor entries.
      */
 
-    { PCMCIA_STR_IBM_INFOMOVER,
-      PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_INFOMOVER,
+    { PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_INFOMOVER,
       PCMCIA_CIS_IBM_INFOMOVER,
       0, 0x0ff0, { 0x08, 0x00, 0x5a } },
 
-    { PCMCIA_STR_LINKSYS_ECARD_1,
-      PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ECARD_1,
+    { PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ECARD_1,
       PCMCIA_CIS_LINKSYS_ECARD_1,
       0, -1, { 0x00, 0x80, 0xc8 } },
 
-    { PCMCIA_STR_LINKSYS_COMBO_ECARD, 
-      PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD,
+    { PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD,
       PCMCIA_CIS_LINKSYS_COMBO_ECARD, 
       0, -1, { 0x00, 0x80, 0xc8 } },
 
-    { PCMCIA_STR_LINKSYS_TRUST_COMBO_ECARD,
-      PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_TRUST_COMBO_ECARD,
+    { PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_TRUST_COMBO_ECARD,
       PCMCIA_CIS_LINKSYS_TRUST_COMBO_ECARD,
       0, 0x0120, { 0x20, 0x04, 0x49 } },
 
@@ -175,8 +161,7 @@ struct ne2000dev {
        above this list, we need to keep this one below the ECARD_1, or else
        both will match the same more-generic entry rather than the more
        specific one above with proper vendor and product IDs. */
-    { PCMCIA_STR_LINKSYS_ECARD_2, 
-      PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
+    { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
       PCMCIA_CIS_LINKSYS_ECARD_2,
       0, -1, { 0x00, 0x80, 0xc8 } },
 
@@ -193,54 +178,44 @@ struct ne2000dev {
      * the 3rd and the 4th types should use the "Linksys EtherCard" entry.
      * Therefore, this enty must be below the LINKSYS_ECARD_1.  --itohy
      */
-    { PCMCIA_STR_DLINK_DE650,
-      PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
+    { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
       PCMCIA_CIS_DLINK_DE650,
       0, 0x0040, { 0x00, 0x80, 0xc8 } },
 
-    { PCMCIA_STR_IODATA_PCLAT,
-      PCMCIA_VENDOR_IODATA, PCMCIA_PRODUCT_IODATA_PCLAT,
+    { PCMCIA_VENDOR_IODATA, PCMCIA_PRODUCT_IODATA_PCLAT,
       PCMCIA_CIS_IODATA_PCLAT,
       /* two possible location, 0x01c0 or 0x0ff0 */
       0, -1, { 0x00, 0xa0, 0xb0 } },
 
-    { PCMCIA_STR_DAYNA_COMMUNICARD_E_1,
-      PCMCIA_VENDOR_DAYNA, PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_1,
+    { PCMCIA_VENDOR_DAYNA, PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_1,
       PCMCIA_CIS_DAYNA_COMMUNICARD_E_1,
       0, 0x0110, { 0x00, 0x80, 0x19 } },
 
-    { PCMCIA_STR_DAYNA_COMMUNICARD_E_2,
-      PCMCIA_VENDOR_DAYNA, PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_2,
+    { PCMCIA_VENDOR_DAYNA, PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_2,
       PCMCIA_CIS_DAYNA_COMMUNICARD_E_2,
       0, -1, { 0x00, 0x80, 0x19 } },
 
-    { PCMCIA_STR_COREGA_PCC_2,
-      PCMCIA_VENDOR_COREGA, PCMCIA_PRODUCT_COREGA_PCC_2,
+    { PCMCIA_VENDOR_COREGA, PCMCIA_PRODUCT_COREGA_PCC_2,
       PCMCIA_CIS_COREGA_PCC_2,
       0, -1, { 0x00, 0x00, 0xf4 } },
 
-    { PCMCIA_STR_COMPEX_LINKPORT_ENET_B,
-      PCMCIA_VENDOR_COMPEX, PCMCIA_PRODUCT_COMPEX_LINKPORT_ENET_B,
+    { PCMCIA_VENDOR_COMPEX, PCMCIA_PRODUCT_COMPEX_LINKPORT_ENET_B,
       PCMCIA_CIS_COMPEX_LINKPORT_ENET_B,
       0, 0xd400, { 0x01, 0x03, 0xdc } },
 
-    { PCMCIA_STR_KINGSTON_KNE_PC2,
-      PCMCIA_VENDOR_KINGSTON, PCMCIA_PRODUCT_KINGSTON_KNE_PC2,
+    { PCMCIA_VENDOR_KINGSTON, PCMCIA_PRODUCT_KINGSTON_KNE_PC2,
       PCMCIA_CIS_KINGSTON_KNE_PC2,
       0, 0x0180, { 0x00, 0xc0, 0xf0 } },
 
-    { PCMCIA_STR_LINKSYS_FAST_ECARD,
-      PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_FAST_ECARD,
+    { PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_FAST_ECARD,
       PCMCIA_CIS_LINKSYS_FAST_ECARD,
       0, -1, { 0x00, 0x80, 0xc8} },
 
-    { PCMCIA_STR_SMC_EZCARD,
-      PCMCIA_VENDOR_SMC, PCMCIA_PRODUCT_SMC_EZCARD,
+    { PCMCIA_VENDOR_SMC, PCMCIA_PRODUCT_SMC_EZCARD,
       PCMCIA_CIS_SMC_EZCARD,
       0, 0x01c0, { 0x00, 0xe0, 0x29 } },
 
-    { PCMCIA_STR_COREGA_LA_PCM,
-      PCMCIA_VENDOR_COREGA, PCMCIA_PRODUCT_COREGA_LA_PCM,
+    { PCMCIA_VENDOR_COREGA, PCMCIA_PRODUCT_COREGA_LA_PCM,
       PCMCIA_CIS_COREGA_LA_PCM,
       0, 0x0ff0, { 0x00, 0x00, 0xf4 } },
 
@@ -542,7 +517,7 @@ ne_pcmcia_attach(parent, self, aux)
 	if (psc->sc_ih == NULL)
 		printf("no irq");
 
-	printf(": <%s%s>\n", ne_dev->name, typestr);
+	printf(": <%s>\n", typestr);
 
 	/* Initialize media, if we have it. */
 	if (npp_init_media != NULL)