Woof. Had lots more of these than I thought when I started. Time to

batch the rest:

Add EXP DVD-780 DVD rom drive (brian reichert)
Generic cdrom (???)
Two modems eicon DIVA and com1 mc218 from oliver breuninger
Farallon SkyLINE (Dirk-Willem van Gulik)
Nits to the xe cards for xe driver!

1 files changed, 43 insertions, 10 deletions

diff --git a/etc/defaults/pccard.conf b/etc/defaults/pccard.conf
index 19e02f89fd3a..72f7f3cf8e06 100644
--- a/etc/defaults/pccard.conf
+++ b/etc/defaults/pccard.conf
@@ -81,6 +81,12 @@ card "       " "KCF 32M"
 	insert	logger -t pccard:$device -s Compact Flash Card 32MB inserted
 	remove	logger -t pccard:$device -s Compact Flash Card 32MB removed
 
+# EXP DVD-780 DVD-ROM drive
+card "EXP   " "PnPIDE"
+	config	auto "ata2" ?
+	insert	logger -t pccard:$device -s EXP DVD-780 inserted
+	remove	logger -t pccard:$device -s EXP DVD-780 removed
+
 # IBM Flash ATA (Ricoh Flash ATA 10MB)
 card "IBM" "IBM17JSSFP10"
 	config	auto "ata0" ? iosize 16
@@ -99,6 +105,12 @@ card "Midori Elec." "FAST FLASH"
 	insert	logger -t pccard:$device -s Midori Elec Fast FLASH inserted
 	remove	logger -t pccard:$device -s Midori Elec Fast FLASH removed
 
+# Another boring, generic ata atapter
+card "PC CARD MANUFACTURER" "PCMCIA ATA/ATAPI Adapter"
+	config	auto "ata2" ?
+	insert	logger -t pccard:$device -s PCMCIA CDROM inserted
+	remove	logger -t pccard:$device -s PCMCIA CDROM removed
+
 # pc-card from PSCD-740 cdrom
 card "PCMCIA" "CD-ROM"
 	config	0x1 "ata2" ?
@@ -145,26 +157,32 @@ card "VIKING ATA/CF FLASH CARD " "TOR/AM "
 
 # Generic AMD Am79c930 based card
 card "AMD" "Am79C930"
-	config 0x1 "awi0" ?
+	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" ?
+	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
 
+card "Farallon" "SkyLINE Wireless"
+	config	default "awi0" ?
+	insert	logger -s Farallon SkyLINE Wireless LAN inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -s Farallon SkyLINE Wireless LAN removed
+	remove	/etc/pccard_ether_remove $device
+
+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
 
 ########## ed ##########
 
@@ -670,6 +688,12 @@ card "CIRRUS LOGIC" "FAX MODEM"
 	remove	logger -t pccard:$device -s Newmedia 14.4 Modem removed
 
 # COM1 SA
+card "COM1 SA" "MC218 CARD"
+	config	0x3 "sio4" ?
+	insert	logger -t pccard:$device -s COM1 SA MC218 CARD Modem inserted
+	remove	logger -t pccard:$device -s COM1 SA MC218 CARD Modem removed
+
+# COM1 SA
 card "COM1 SA" "MC220 CARD"
 	config	0x3 "sio2" ?
 	insert	logger -t pccard:$device -s COM1 SA MC220 CARD Modem inserted
@@ -681,6 +705,15 @@ card "Digiteam GmbH" "Expresso Modem"
 	insert	logger -t pccard:$device -s Expresso Modem inserted
 	remove	logger -t pccard:$device -s Expresso Modem removed
 
+# Eicon DIVA T/A
+# at@menu       Config menu
+# at>vc         View current profile
+# at>vd         View troubleshooting information
+card "Eicon Technology" "DIVA T/A"
+	config	0x5 "sio4" ?
+	insert	logger -t pccard:$device -s Eicon DIVA T/A inserted
+	remove	logger -t pccard:$device -s Eicon DIVA T/A removed
+
 # GATEWAY 2000 FAX/Data Modem (14.4K)
 card "GATEWAY2000" "CC3144"
 	config	0x22 "sio3" ?
@@ -1101,7 +1134,7 @@ card "Xircom" "CreditCard 10/100"
 
 # Xircom CreditCard Ethernet 10/100 + modem (Ethernet part)
 card "Xircom" "CreditCard Ethernet 10/100 + Modem 56"
-	config	0x1 "xe0" ?
+	config	0x27 "xe0" ?
 	insert	logger -t pccard:$device -s Xircom CreditCard Modem inserted
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s Xircom CreditCard Modem removed