From 2eb1626e612a645e7775d23e1c8cc089a4ceb1cc Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 6 Apr 2000 02:54:35 +0000
Subject: [PATCH] Two changes: 	1) Move an cards to after aic, since an sorts
 after aic. 	2) Add awi cards for the new awi drivers. This is a wireless
 pcmcia 	   card.

---
 etc/defaults/pccard.conf | 57 +++++++++++++++++++++++++++++-----------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/etc/defaults/pccard.conf b/etc/defaults/pccard.conf
index d6fa64faa1f..dac38671ee4 100644
--- a/etc/defaults/pccard.conf
+++ b/etc/defaults/pccard.conf
@@ -33,6 +33,22 @@ include /etc/pccard.conf
 # order.
 #
 
+########## aic ##########
+
+# Adaptec SlimSCSI (also included with Sony CD-ROM players)
+card "Adaptec, Inc." "APA-1460 SCSI Host Adapter"
+	config	0x9 "aic0" ?
+	insert	logger -t pccard:$device -s Adaptec Slim SCSI inserted
+	insert	camcontrol rescan $device
+	remove	logger -t pccard:$device -s Adaptec Slim SCSI removed
+
+# NewMedia Bustoaster SCSI
+card "New Media" "SCSI"
+	config	0x22 "aic0" ?
+	insert	logger -t pccard:$device -s New Media Bus Toaster inserted
+	insert	camcontrol rescan $device
+	remove	logger -t pccard:$device -s New Media Bus Toaster removed
+
 ########## an ##########
 
 # Aironet PC4500 2Mbps 802.11 wireless NIC
@@ -51,22 +67,6 @@ card "Aironet" "PC4800"
 	remove	logger -t pccard:$device -s Aironet PC4800 removed
 	remove	/sbin/ifconfig $device delete
 
-########## aic ##########
-
-# Adaptec SlimSCSI (also included with Sony CD-ROM players)
-card "Adaptec, Inc." "APA-1460 SCSI Host Adapter"
-	config	0x9 "aic0" ?
-	insert	logger -t pccard:$device -s Adaptec Slim SCSI inserted
-	insert	camcontrol rescan $device
-	remove	logger -t pccard:$device -s Adaptec Slim SCSI removed
-
-# NewMedia Bustoaster SCSI
-card "New Media" "SCSI"
-	config	0x22 "aic0" ?
-	insert	logger -t pccard:$device -s New Media Bus Toaster inserted
-	insert	camcontrol rescan $device
-	remove	logger -t pccard:$device -s New Media Bus Toaster removed
-
 ########## ata ##########
 
 # Non-brand Compact Flash Card(32MB)
@@ -135,6 +135,31 @@ card "VIKING ATA/CF FLASH CARD " "TOR/AM "
 	insert	logger -t pccard:$device -s Simple Technology ata FLASH inserted
 	remove	logger -t pccard:$device -s Simple Technology ata FLASH removed
 	
+########## awi ##########
+
+# Generic AMD Am79c930 based card
+card "AMD" "Am79C930"
+	config 0x1 "awi0" ?
+	insert	logger -t pccard:$device -s Generic AMD Am79c930 based card inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Generic AMD Am79c930 based card removed
+	remove	/sbin/ifconfig $device delete
+
+card "Icom" "SL-200"
+	config 0x1 "awi0" ?
+	insert	logger -t pccard:$device -s Icom SL-200 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Icom SL-200 remvoed
+	remove	/sbin/ifconfig $device delete
+
+card "Bay Networks" "BayStack 650 Wireless LAN"
+	config 0x1 "awi0" ?
+	insert	logger -t pccard:$device -s Bay Networks Baystack 650 Wireless LAN inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Bay Networks Baystack 650 Wireless LAN removed
+	remove	/sbin/ifconfig $device delete
+
+
 ########## ed ##########
 
 # Accton EN2212