Add NewMedia BusToaster SCSI Host Adapter.

Remove repeated entry in if_ne_pcmcia.c. Minor cosmetical changes.

3 files changed, 17 insertions, 12 deletions

diff --git a/sys/dev/pcmcia/aic_pcmcia.c b/sys/dev/pcmcia/aic_pcmcia.c
index 8be6947d65a..f18eb9b72ac 100644
--- a/sys/dev/pcmcia/aic_pcmcia.c
+++ b/sys/dev/pcmcia/aic_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic_pcmcia.c,v 1.3 1999/05/28 12:41:55 niklas Exp $	*/
+/*	$OpenBSD: aic_pcmcia.c,v 1.4 1999/07/01 06:29:54 fgsch Exp $	*/
 /*	$NetBSD: aic_pcmcia.c,v 1.6 1998/07/19 17:28:15 christos Exp $	*/
 
 /*
@@ -77,6 +77,8 @@ struct aic_pcmcia_product {
 	  0,				PCMCIA_STR_ADAPTEC_APA1460_1 },
 	{ PCMCIA_VENDOR_ADAPTEC,	PCMCIA_PRODUCT_ADAPTEC_APA1460_2,
 	  0,				PCMCIA_STR_ADAPTEC_APA1460_2 },
+	{ PCMCIA_VENDOR_NEWMEDIA,	PCMCIA_PRODUCT_NEWMEDIA_BUSTOASTER,
+	  0,				PCMCIA_STR_NEWMEDIA_BUSTOASTER },
 	{ 0,				0,
 	  0,				NULL },
 };
@@ -132,6 +134,14 @@ aic_pcmcia_attach(parent, self, aux)
 		    cfe->num_iospace != 1)
 			continue;
 
+		/* The bustoaster has a default config as first
+		 * entry, we don't want to use that. */
+
+		if (pa->manufacturer == PCMCIA_VENDOR_NEWMEDIA &&
+		    pa->product == PCMCIA_PRODUCT_NEWMEDIA_BUSTOASTER &&
+		    cfe->iospace[0].start == 0)
+			continue;
+
 		if (pcmcia_io_alloc(pa->pf, cfe->iospace[0].start,
 		    cfe->iospace[0].length, AIC_NPORTS, &psc->sc_pcioh) == 0)
 			break;
diff --git a/sys/dev/pcmcia/files.pcmcia b/sys/dev/pcmcia/files.pcmcia
index 5d75d427de6..817193adcb4 100644
--- a/sys/dev/pcmcia/files.pcmcia
+++ b/sys/dev/pcmcia/files.pcmcia
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.pcmcia,v 1.17 1999/06/21 23:21:45 d Exp $
+#	$OpenBSD: files.pcmcia,v 1.18 1999/07/01 06:29:55 fgsch Exp $
 #	$NetBSD: files.pcmcia,v 1.9 1998/06/21 18:45:41 christos Exp $
 #
 # Config.new file and device description for machine-independent PCMCIA code.
@@ -13,8 +13,7 @@ file	dev/pcmcia/pcmcia_cis_quirks.c		pcmcia
 attach	pcmcia at pcic
 
 # 3Com 3c589 Ethernet, 3c562 multifunction Ethernet, and 3CXEM556
-#   multifunction Ethernet controllers
-# device declaration in sys/conf/files
+# multifunction Ethernet controllers
 attach	ep at pcmcia with ep_pcmcia
 file	dev/pcmcia/if_ep_pcmcia.c		ep_pcmcia
 
@@ -23,7 +22,7 @@ file	dev/pcmcia/if_ep_pcmcia.c		ep_pcmcia
 attach	ne at pcmcia with ne_pcmcia: rtl80x9
 file	dev/pcmcia/if_ne_pcmcia.c		ne_pcmcia
 
-# Adaptec APA-1460 SCSI Host Adapter
+# Adaptec APA-14[56]0 / NewMedia BusToaster SCSI Host Adapter
 attach	aic at pcmcia with aic_pcmcia
 file	dev/pcmcia/aic_pcmcia.c			aic_pcmcia
 
@@ -57,9 +56,8 @@ file dev/pcmcia/if_xe.c				xe_pcmcia
 #file	dev/pcmcia/fdc_pcmcia.c			fdc_pcmcia
 
 # Proxim RangeLAN2 PC-Card
-define rln
-attach	rln at pcmcia with rln_pcmcia : rln
-file	dev/pcmcia/if_rl2_pcmcia.c		rln_pcmcia
+attach rln at pcmcia with rln_pcmcia
+file dev/pcmcia/if_rl2_pcmcia.c			rln_pcmcia
 
 # PCMCIA multi-port serial cards
 #device	pcmcom {[slave = -1]}
diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c
index ebddb296a28..4a64c575bec 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.9 1999/06/03 06:40:28 fgsch Exp $	*/
+/*	$OpenBSD: if_ne_pcmcia.c,v 1.10 1999/07/01 06:29:55 fgsch Exp $	*/
 /*	$NetBSD: if_ne_pcmcia.c,v 1.17 1998/08/15 19:00:04 thorpej Exp $	*/
 
 /*
@@ -250,9 +250,6 @@ struct ne2000dev {
     { "DataTrek NetCard",
       0x0000, 0x0000, NULL, NULL, 0,
       0x0ff0, { 0x00, 0x20, 0xe8 } },
-    { "Dayna CommuniCard E",
-      0x0000, 0x0000, NULL, NULL, 0,
-      0x0110, { 0x00, 0x80, 0x19 } },
     { "EP-210 Ethernet",
       0x0000, 0x0000, NULL, NULL, 0,
       0x0110, { 0x00, 0x40, 0x33 } },