diff --git a/etc/defaults/pccard.conf b/etc/defaults/pccard.conf
index 1f553c863602..fefdc84fa6dc 100644
--- a/etc/defaults/pccard.conf
+++ b/etc/defaults/pccard.conf
@@ -21,6 +21,15 @@ irq	3 5 10 11 13 15
 # Available memory slots
 memory	0xd4000  96k
 
+#
+# PLEASE KEEP THIS FILE IN ORDER
+#
+# In order is defined as follows.  We sort first by driver type (an, ed, etc)
+# and then by CIS strings.  Do not commit to this file entries out of
+# order.
+#
+
+########## an ##########
 
 # Aironet PC4500 2Mbps 802.11 wireless NIC
 card "Aironet" "PC4500"
@@ -38,80 +47,85 @@ card "Aironet" "PC4800"
 	remove	logger -t pccard:$device -s Aironet PC4800 removed
 	remove	/sbin/ifconfig $device delete
 
-# Lucent WaveLAN/IEEE
-card "Lucent Technologies" "WaveLAN/IEEE"
-	config	0x1 "wi0" ?
-	insert	logger -t pccard:$device -s WaveLAN/IEEE inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s WaveLAN/IEEE removed
-	remove	/sbin/ifconfig $device delete
+########## aic ##########
 
-# NCR WaveLAN/IEEE
-card "NCR" "WaveLAN/IEEE"
-	config	0x1 "wi0" ?
-#	config	auto "wi0" ?
-	insert	logger -t pccard:$device -s WaveLAN/IEEE inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s WaveLAN/IEEE removed
-	remove	/sbin/ifconfig $device delete
+# 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
 
-# Cabletron RoamAbout, WaveLAN/IEEE clone
-card "Cabletron" "RoamAbout 802.11 DS"
-	config	0x1 "wi0" ?
-	insert	logger -t pccard:$device -s WaveLAN/IEEE inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s WaveLAN/IEEE removed
-	remove	/sbin/ifconfig $device delete
+# 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
 
-# Socket LP-E (WinCE Low Power Ethernet)
-card "Low Power Ethernet LAN Adapter" "Socket Communications, Inc"
-	config	0x20 "ed0" ?
-	insert	logger -t pccard:$device -s Socket LP-E inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Socket LP-E removed
-	remove	/etc/pccard_ether_remove $device
+########## ata ##########
 
-# CNet BC40 adapter
-card "CNet" "CN40BC Ethernet"
-	config	0x20 "ed0" ?
-	insert	logger -t pccard:$device -s CNet CN40BC Ethernet inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s CNet CN40BC Ethernet removed
-	remove	/etc/pccard_ether_remove $device
+# Non-brand Compact Flash Card(32MB)
+card "       " "KCF 32M"
+	config	0x1 "ata2" ? iosize 16
+	insert	logger -t pccard:$device -s Compact Flash Card 32MB inserted
+	remove	logger -t pccard:$device -s Compact Flash Card 32MB removed
 
-# LinkMates LM 336 LAN Fax/Modem PC Card
-card "PCMCIAs" "ComboCard"
-	config	0x24 "ed0" ? 0x10
-	insert	logger -t pccard:$device -s LinkMates LM 336 inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s LinkMates LM 336 removed
-	remove	/sbin/ifconfig $device delete
+# IBM Flash ATA (Ricoh Flash ATA 10MB)
+card "IBM" "IBM17JSSFP10"
+	config	auto "ata0" ? iosize 16
+	insert	logger -t pccard:$device -s IBM Flash ATA inserted
+	remove	logger -t pccard:$device -s IBM flash ATA removed
 
-# IBM PCMCIA Ethernet I/II
-card "IBM Corp." "Ethernet"
-	config	0x1 "ed0" ?
-	ether	0xff0
-	insert	logger -t pccard:$device -s IBM PCMCIA Ethernet inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s IBM PCMCIA Ethernet removed
-	remove	/sbin/ifconfig $device delete
+# Maxtor 131MB Type III HDD
+card "Maxtor" "MXL131"
+	config	0x03 "ata2" ?
+	insert	logger -t pccard:$device -s Maxtor 131MB HDD inserted
+	remove	logger -t pccard:$device -s Maxtor 131MB HDD removed
 
-# Melco LPC-T (PIO mode)
-card "PCMCIA" "UE2212"
-	config	0x1 "ed0" ? 0x10
-	ether	0xff0
-	insert	logger -t pccard:$device -s UE2212 inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s UE2212 removed
-	remove	/sbin/ifconfig $device delete
+# Midori Elec Fast Flash
+card "Midori Elec." "FAST FLASH"
+	config	0x3  "ata2" ?
+	insert	logger -t pccard:$device -s Midori Elec Fast FLASH inserted
+	remove	logger -t pccard:$device -s Midori Elec Fast FLASH removed
 
-# Billionton 10Base-TX ETHERNET PCCARD (aka UE2216)
-card "PCMCIA" "PCMCIA-ETHERNET-CARD"
-	config	0x20 "ed0" ? 0x10
-	insert	logger -t pccard:$device -s UE2216 inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s UE2216 removed
-	remove	/sbin/ifconfig $device delete
+# SiliconTech, Inc flash card
+card "SiliconTech,Inc" "16MB Compact PC Card"
+	config	0x1 "ata2" ?
+	insert	logger -t pccard:$device -s SiliconTech Flash ATA inserted
+	remove	logger -t pccard:$device -s SiliconTech Flash ATA removed
+
+# Simple Technology ata flash
+card "Simple Technology        " "STI-ATA"
+	config	0x2 "ata2" ?
+	insert	logger -t pccard:$device -s Simple Technology ata FLASH inserted
+	remove	logger -t pccard:$device -s Simple Technology ata FLASH removed
+	
+# SunDisk Flash ATA
+# (OEM: Epson Flash Packer)
+card "SunDisk" "SDP5"
+	config	0x1 "ata2" ?
+	insert	logger -t pccard:$device -s Sundisk Flash ATA inserted
+	remove	logger -t pccard:$device -s Sundisk Flash ATA removed
+
+card "SunDisk" "SDP"
+	config	0x1 "ata2" ?
+	insert	logger -t pccard:$device -s SunDisk Flash ATA Inserted
+	remove	logger -t pccard:$device -s SunDisk Flash ATA removed
+
+# IO Data CBIDE (bundled with CDP-FX24, etc.)
+card "WIT" "IDE16"
+	config	auto "ata0" ?
+	insert	logger -t pccard:$device -s IO Data CBIDE inserted
+	remove	logger -t pccard:$device -s IO Data CBIDE removed
+
+# Viking ATA Flash card
+card "VIKING ATA/CF FLASH CARD " "TOR/AM "
+	config	0x2 "ata2" ?
+	insert	logger -t pccard:$device -s Simple Technology ata FLASH inserted
+	remove	logger -t pccard:$device -s Simple Technology ata FLASH removed
+	
+########## ed ##########
 
 # Accton EN2212
 # Very slow!  (PIO mode)
@@ -132,6 +146,57 @@ card "ACCTON" "EN2216-PCMCIA-ETHERNET"
 	remove	logger -t pccard:$device -s Accton 2216 removed
 	remove	/sbin/ifconfig $device delete
 
+# Allied Telesis Ethernet Card inserted
+card "Allied Telesis,K.K" "Ethernet LAN Card"
+	config	0x1 "ed1" ? 0x10
+	ether	0xff0
+	insert	logger -t pccard:$device -s Allied Telesis Ethernet Card inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Allied Telesis Ethernet Card removed
+	remove	/sbin/ifconfig $device delete
+
+# Allied Telesis CentreCOM LA-PCM_V2 ethernet card
+# NTT-DATA ASTROWINK-M/MMOIL(IrLAN) ethernet card
+card "Allied Telesis, K.K." "CentreCOM LA-PCM_V2"
+	config	0x20 "ed0" ?
+	insert	logger -t pccard:$device -s CentreCOM LA-PCM V2 Ethernet card inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s CentreCOM LA-PCM V2 Ethernet card removed
+	remove	/sbin/ifconfig $device delete
+
+# Allied Telesis CentreCOM LA100-PCM-T V2
+card "Allied Telesis, K.K." "CentreCOM LA100-PCM-T V2 100/10M LAN PC Card"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s Allied Telesis LA100-PCM-T V2 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Allied Telesis LA100-PCM-T V2 removed
+	remove	/etc/pccard_ether_remove $device
+
+# AmbiCom 10BaseT card
+card "AmbiCom Inc" "AMB8002T"
+	config	0x20 "ed0" ?
+	insert	logger -t pccard:$device -s AmbiCom 8002T inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s AmbiCom 8002T removed
+	remove	/sbin/ifconfig $device delete
+
+# CNet BC40 adapter
+card "CNet" "CN40BC Ethernet"
+	config	0x20 "ed0" ?
+	insert	logger -t pccard:$device -s CNet CN40BC Ethernet inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s CNet CN40BC Ethernet removed
+	remove	/etc/pccard_ether_remove $device
+
+# COREGA Ether PCC-T
+card "corega K.K." "corega Ether PCC-T"
+	config	0x20 "ed0" ?
+#	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s Ether PCC-T inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Ether PCC-T removed
+	remove	/etc/pccard_ether_remove $device
+
 # COREGA EtherII PCC-T
 card "corega K.K." "corega EtherII PCC-T"
 	config	0x20 "ed0" ?
@@ -141,113 +206,29 @@ card "corega K.K." "corega EtherII PCC-T"
 	remove	logger -t pccard:$device -s EtherII PCC-T removed
 	remove	/sbin/ifconfig $device delete
 
-# I-O DATA PCLATE
-card "IO DATA" "PCLATE"
+# CyQ've ELA-010
+card "CyQ've" "ELA-010"
+	config	0x20 "ed0" ?
+	insert	logger -t pccard:$device -s CyQve ELA-010 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s CyQve ELA-010 removed
+	remove	/sbin/ifconfig $device delete
+
+# D-Link DE-660 NE2000 clone
+card "D-Link" "DE-660"
 	config	0x20 "ed0" ? 0x10
-	insert	logger -t pccard:$device -s IO DATA PCLATE inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s IO DATA PCLATE removed
+	insert	logger -t pccard:$device -s D-Link DE-660 inserted
+	insert	/etc/pccard_ether $device link0 -link1
+	remove	logger -t pccard:$device -s D-Link DE-660 removed
 	remove	/sbin/ifconfig $device delete
 
-# 3Com Etherlink III 3C589B, 3C589C
-card "3Com Corporation" "3C589"
-	config	0x1 "ep0" ?
-#	config	auto "ep0" ?
-	insert	logger -t pccard:$device -s 3Com Etherlink III inserted
-	insert	/etc/pccard_ether $device -link0 link1
+# D-Link DFE-650 NE2000 clone
+card "D-Link" "DFE-650"
+	config	0x20 "ed0" ? 0x10
+	insert	logger -t pccard:$device -s D-Link DFE-650 inserted
+	insert	/etc/pccard_ether $device
 #	insert	/etc/pccard_ether $device link0 -link1
-	remove	logger -t pccard:$device -s 3Com Etherlink III removed
-	remove	/sbin/ifconfig $device delete
-
-# 3Com Etherlink III 3C589D
-card "3Com Corporation" "3C589D"
-	config	0x1 "ep0" ?
-#	config	auto "ep0" ?
-	insert	logger -t pccard:$device -s 3Com Etherlink III inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s 3Com Etherlink III removed
-	remove	/sbin/ifconfig $device delete
-
-# 3Com Etherlink III 3CXE589ET
-card "3Com" "Megahertz 589E"
-	config	0x1 "ep0" ?
-	insert	logger -t pccard:$device -s 3Com 3C589E inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s 3Com 3C589E removed
-	remove	/sbin/ifconfig $device delete
-
-# 3Com Fast Etherlink 3C574TX
-card "3Com" "3C574-TX Fast EtherLink PC Card"
-	config	0x1 "ep0" ? 0x1
-	insert	logger -t pccard:$device -s 3Com Fast Etherlink 3C574TX inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s 3Com Fast Etherlink 3C574TX removed
-	remove	/sbin/ifconfig $device delete
-
-# 3Com Megahertz 574B
-card "3Com" "Megahertz 574B"
-	config	0x1 "ep0" ? 0x1
-	insert	logger -t pccard:$device -s 3Com Megahertz 574B inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s 3Com Megahertz 574B removed
-	remove	/sbin/ifconfig $device delete
-
-# LinkSys ethernet card
-card "E-CARD" "E-CARD" 
-	config	0x20 "ed0" ? 
-	insert	logger -t pccard:$device -s "LinkSys card inserted" 
-	insert	/etc/pccard_ether $device 
-	remove	logger -t pccard:$device -s "LinkSys card removed" 
-	remove	/sbin/ifconfig $device delete
-
-# Linksys Combo PCMCIA EthernetCard (model EC2T on box) 
-card "Linksys" "Combo PCMCIA EthernetCard (EC2T)"
-	config	0x1 "ed0" ? 
-	insert	logger -t pccard:$device -s Linksys Ethernet inserted 
-	insert	/etc/pccard_ether $device 
-	remove	logger -t pccard:$device -s Linksys Ethernet removed 
-	remove	/sbin/ifconfig $device delete 
-
-#Linksys EtherFast 10/100 PC Card (PCMPC100)
-card "Linksys" "EtherFast 10/100 PC Card (PCMPC100)"
-	config	0x3 "ed0" ?
-#	config	auto "ed0" ?
-	insert	logger -t pccard:$device -s Linksys Fast 100-BaseT inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Linksys Fast 100-BaseT removed
-	remove	/sbin/ifconfig $device delete
-
-# Farallon EtherMac
-card "Farallon" "ENet"
-	config	0x1 "ep0" ?
-	insert	logger -t pccard:$device -s Farallon EtherMac inserted
-	insert	/etc/pccard_ether $device
-#	insert	/etc/pccard_ether $device link0
-	remove	logger -t pccard:$device -s Farallon EtherMac removed
-	remove	/sbin/ifconfig $device delete
-
-# Fujitsu MBH10302
-card "PCMCIA MBH10302" "01"
-	config	0x14 "fe0" ?
-	insert	logger -t pccard:$device -s Fujitsu MBH10302 inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Fujitsu MBH10302 removed
-	remove	/sbin/ifconfig $device delete
-
-# NextCom J Link NC5310
-card "NextComK.K." "NC5310 Ver1.0      "
-	config	0x14 "fe0" ?
-	insert	logger -t pccard:$device -s NextCom J Link NC5310 inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s NextCom J Link NC5310 removed
-	remove	/sbin/ifconfig $device delete
-
-# HITACHI HT-4840-11
-card "HITACHI" "HT-4840-11"
-	config	0x1a "fe0" ?
-	insert	logger -t pccard:$device -s HT-4840-11 inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s HT-4840-11 removed
+	remove	logger -t pccard:$device -s D-Link DFE-650 removed
 	remove	/sbin/ifconfig $device delete
 
 # Danpex (Alloy, etc.) EN-6200P2
@@ -258,13 +239,13 @@ card "DANPEX" "EN-6200P2"
 	remove	logger -t pccard:$device -s Danpex EN-6200P2 removed
 	remove	/sbin/ifconfig $device delete
 
-# Fujitsu MBH10303 Ethernet PCMCIA
-card "EAGLE Technology" "NE200 ETHERNET LAN MBH10303  "
-	config	0x1 "fe0" ?
-	insert	/etc/pccard_ether $device
-	insert	logger -t pccard:$device -s Fujitsu MBH10303 inserted
+# LinkSys ethernet card
+card "E-CARD" "E-CARD" 
+	config	0x20 "ed0" ? 
+	insert	logger -t pccard:$device -s "LinkSys card inserted" 
+	insert	/etc/pccard_ether $device 
+	remove	logger -t pccard:$device -s "LinkSys card removed" 
 	remove	/sbin/ifconfig $device delete
-	remove	logger -t pccard:$device -s Fujitsu MBH10303 removed
 
 # Compex Net-A adapter
 card "Ethernet" "Adapter"
@@ -292,62 +273,104 @@ card "Ethernet" "Adapter"
 	remove	logger -t pccard:$device -s Telecom SuperSocket RE450T removed
 	remove	/sbin/ifconfig $device delete
 
-# D-Link DE-660 NE2000 clone
-card "D-Link" "DE-660"
-	config	0x20 "ed0" ? 0x10
-	insert	logger -t pccard:$device -s D-Link DE-660 inserted
-	insert	/etc/pccard_ether $device link0 -link1
-	remove	logger -t pccard:$device -s D-Link DE-660 removed
+# Apollo PCMCIA Ethernet Adapter
+card "Ethernet" "Adapter"
+	config	0x0 "ed0" ?
+	insert	logger -t pccard:$device -s Apollo PCMCIA Ethernet Adapter inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Apollo PCMCIA Ethernet Adapter removed
 	remove	/sbin/ifconfig $device delete
 
-# D-Link DFE-650 NE2000 clone
-card "D-Link" "DFE-650"
-	config	0x20 "ed0" ? 0x10
-	insert	logger -t pccard:$device -s D-Link DFE-650 inserted
+# Planex FNW-3600-T 16bit FastEthernet
+card "Fast Ethernet" "Adapter"
+	config	0x7 "ed0" ?
+	iosize	32
+	insert	logger -t pccard:$device -s Planex FNW-3600-T inserted
 	insert	/etc/pccard_ether $device
-#	insert	/etc/pccard_ether $device link0 -link1
-	remove	logger -t pccard:$device -s D-Link DFE-650 removed
-	remove	/sbin/ifconfig $device delete
-
-# NDC Ethernet Instant-Link NE2000 clone
-card "NDC" "Ethernet"
-	config	0x22 "ed0" ? 0x10
-	insert	logger -t pccard:$device -s NDC Ethernet Instant-Link adapter inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s NDC Ethernet Instant-Link adapter removed
-	remove	/sbin/ifconfig $device delete
-
-# CyQ've ELA-010
-card "CyQ've" "ELA-010"
-	config	0x20 "ed0" ?
-	insert	logger -t pccard:$device -s CyQve ELA-010 inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s CyQve ELA-010 removed
-	remove	/sbin/ifconfig $device delete
-
-# Allied Telesis CentreCOM LA100-PCM-T V2
-card "Allied Telesis, K.K." "CentreCOM LA100-PCM-T V2 100/10M LAN PC Card"
-	config	auto "ed0" ?
-	insert	logger -t pccard:$device -s Allied Telesis LA100-PCM-T V2 inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Allied Telesis LA100-PCM-T V2 removed
+	remove	logger -t pccard:$device -s Planex FNW-3600-T removed
 	remove	/etc/pccard_ether_remove $device
 
-# Allied Telesis CentreCOM LA-PCM_V2 ethernet card
-# NTT-DATA ASTROWINK-M/MMOIL(IrLAN) ethernet card
-card "Allied Telesis, K.K." "CentreCOM LA-PCM_V2"
-	config	0x20 "ed0" ?
-	insert	logger -t pccard:$device -s CentreCOM LA-PCM V2 Ethernet card inserted
+# IBM PCMCIA Ethernet I/II
+card "IBM Corp." "Ethernet"
+	config	0x1 "ed0" ?
+	ether	0xff0
+	insert	logger -t pccard:$device -s IBM PCMCIA Ethernet inserted
 	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s CentreCOM LA-PCM V2 Ethernet card removed
+	remove	logger -t pccard:$device -s IBM PCMCIA Ethernet removed
 	remove	/sbin/ifconfig $device delete
 
-#  Intel EtherExpress PRO/100 Mobile Adapter (16-bit verison)
-card "Intel" "EtherExpress(TM) PRO/100 PC Card Mobile Adapter16"
-	config	0x1 "xe0" ?
-	insert	logger -t pccard:$device -s Intel EtherExpress PRO/100 Mobile Adapter/16 inserted
+#AR-P500 ethernet card
+card "IC-CARD" "IC-CARD"
+	config	0x20 "ed0" ?
+	insert	logger -t pccard:$device -s AR-P500 Ethernet card inserted
 	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Intel EtherExpress PRO/100 Mobile Adapter/16 removed
+	remove	logger -t pccard:$device -s AR-P500 Ethernet card removed
+	remove	ifconfig $device delete
+
+# IC-CARD+ Ethernet card
+card "IC-CARD+" "IC-CARD+"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s IC-CARD+ Ethernet card inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s IC-CARD+ Ethernet card removed
+	remove	ifconfig $device delete
+
+# I-O DATA PCLATE
+card "IO DATA" "PCLATE"
+	config	0x20 "ed0" ? 0x10
+	insert	logger -t pccard:$device -s IO DATA PCLATE inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s IO DATA PCLATE removed
+	remove	/sbin/ifconfig $device delete
+
+# I-O DATA PCETTX
+card "IO DATA" "PCETTX"
+	config	0x20 "ed0" ?
+	insert	logger -t pccard:$device -s IO DATA PCETTX inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s IO DATA PCETTX removed
+	remove	/sbin/ifconfig $device delete
+
+# Elecom Laneed LD-CDF
+card "Laneed" "LD-CDF"
+	config	0x20 "ed1" ?
+	insert	logger -t pccard:$device -s Elecom Laneed LD-CDF inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Elecom Laneed LD-CDF removed
+	remove	/sbin/ifconfig $device delete
+
+# Linksys Combo PCMCIA EthernetCard (model EC2T on box) 
+card "Linksys" "Combo PCMCIA EthernetCard (EC2T)"
+	config	0x1 "ed0" ? 
+	insert	logger -t pccard:$device -s Linksys Ethernet inserted 
+	insert	/etc/pccard_ether $device 
+	remove	logger -t pccard:$device -s Linksys Ethernet removed 
+	remove	/sbin/ifconfig $device delete 
+
+#Linksys EtherFast 10/100 PC Card (PCMPC100)
+card "Linksys" "EtherFast 10/100 PC Card (PCMPC100)"
+	config	0x3 "ed0" ?
+#	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s Linksys Fast 100-BaseT inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Linksys Fast 100-BaseT removed
+	remove	/sbin/ifconfig $device delete
+
+# Socket LP-E (WinCE Low Power Ethernet)
+card "Low Power Ethernet LAN Adapter" "Socket Communications, Inc"
+	config	0x20 "ed0" ?
+	insert	logger -t pccard:$device -s Socket LP-E inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Socket LP-E removed
+	remove	/etc/pccard_ether_remove $device
+
+# National Semiconductor InfoMover NE4100
+card "National Semiconductor" "InfoMover NE4100"
+	config	0x1 "ed0" ?
+	ether	0xff0
+	insert	logger -t pccard:$device -s National Semiconductor InfoMover NE4100 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s National Semiconductor InfoMover NE4100 removed
 	remove	/sbin/ifconfig $device delete
 
 # BayNetworks NETGEAR FA410TXC Fast Ethernet
@@ -366,6 +389,174 @@ card "Network Everywhere" "Ethernet 10BaseT PC Card"
 	remove	logger -t pccard:$device -s Network Everywhere Ethernet 10BaseT PC Card removed
 	remove	/sbin/ifconfig $device delete
 
+# NDC Ethernet Instant-Link NE2000 clone
+card "NDC" "Ethernet"
+	config	0x22 "ed0" ? 0x10
+	insert	logger -t pccard:$device -s NDC Ethernet Instant-Link adapter inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s NDC Ethernet Instant-Link adapter removed
+	remove	/sbin/ifconfig $device delete
+
+# Billionton 10Base-TX ETHERNET PCCARD (aka UE2216)
+card "PCMCIA" "PCMCIA-ETHERNET-CARD"
+	config	0x20 "ed0" ? 0x10
+	insert	logger -t pccard:$device -s UE2216 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s UE2216 removed
+	remove	/sbin/ifconfig $device delete
+
+# Melco LPC-T (PIO mode)
+card "PCMCIA" "UE2212"
+	config	0x1 "ed0" ? 0x10
+	ether	0xff0
+	insert	logger -t pccard:$device -s UE2212 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s UE2212 removed
+	remove	/sbin/ifconfig $device delete
+
+# LinkMates LM 336 LAN Fax/Modem PC Card
+card "PCMCIAs" "ComboCard"
+	config	0x24 "ed0" ? 0x10
+	insert	logger -t pccard:$device -s LinkMates LM 336 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s LinkMates LM 336 removed
+	remove	/sbin/ifconfig $device delete
+
+# Surecom EtherPerfect EP-427
+card "TAMARACK" "Ethernet"
+	config	0x21 "ed0" ?
+	insert	logger -t pccard:$device -s Surecom Ethernet card inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Surecom Ethernet card removed
+	remove	ifconfig $device delete
+
+########## ep ##########
+
+# 3Com Fast Etherlink 3C574TX
+card "3Com" "3C574-TX Fast EtherLink PC Card"
+	config	0x1 "ep0" ? 0x1
+	insert	logger -t pccard:$device -s 3Com Fast Etherlink 3C574TX inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s 3Com Fast Etherlink 3C574TX removed
+	remove	/sbin/ifconfig $device delete
+
+# 3Com Megahertz 574B
+card "3Com" "Megahertz 574B"
+	config	0x1 "ep0" ? 0x1
+	insert	logger -t pccard:$device -s 3Com Megahertz 574B inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s 3Com Megahertz 574B removed
+	remove	/sbin/ifconfig $device delete
+
+# 3Com Etherlink III 3CXE589ET
+card "3Com" "Megahertz 589E"
+	config	0x1 "ep0" ?
+	insert	logger -t pccard:$device -s 3Com 3C589E inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s 3Com 3C589E removed
+	remove	/sbin/ifconfig $device delete
+
+# 3Com OfficeConnect 3CXSH572BT
+card "3Com" "OfficeConnect 572B"
+	config	0x1 "ep0" ? 0x1
+	insert	logger -t pccard:$device -s 3Com 3CXSH572BT inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s 3Com 3CXSH572BT removed
+	remove	/sbin/ifconfig $device delete
+
+# 3Com Etherlink III 3C589B, 3C589C
+card "3Com Corporation" "3C589"
+	config	0x1 "ep0" ?
+#	config	auto "ep0" ?
+	insert	logger -t pccard:$device -s 3Com Etherlink III inserted
+	insert	/etc/pccard_ether $device -link0 link1
+#	insert	/etc/pccard_ether $device link0 -link1
+	remove	logger -t pccard:$device -s 3Com Etherlink III removed
+	remove	/sbin/ifconfig $device delete
+
+# 3Com Etherlink III 3C589D
+card "3Com Corporation" "3C589D"
+	config	0x1 "ep0" ?
+#	config	auto "ep0" ?
+	insert	logger -t pccard:$device -s 3Com Etherlink III inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s 3Com Etherlink III removed
+	remove	/sbin/ifconfig $device delete
+
+# Farallon EtherMac
+card "Farallon" "ENet"
+	config	0x1 "ep0" ?
+	insert	logger -t pccard:$device -s Farallon EtherMac inserted
+	insert	/etc/pccard_ether $device
+#	insert	/etc/pccard_ether $device link0
+	remove	logger -t pccard:$device -s Farallon EtherMac removed
+	remove	/sbin/ifconfig $device delete
+
+########## ex ##########
+
+# Olicom OC2220
+card "Olicom" "Ethernet"
+	config	0x1 "ex0" ?
+	insert	logger -t pccard:$device -s Olicom OC2220 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Olicom OC2220 removed
+	remove	/sbin/ifconfig $device delete
+
+########## fe ##########
+
+# Fujitsu MBH10303 Ethernet PCMCIA
+card "EAGLE Technology" "NE200 ETHERNET LAN MBH10303  "
+	config	0x1 "fe0" ?
+	insert	/etc/pccard_ether $device
+	insert	logger -t pccard:$device -s Fujitsu MBH10303 inserted
+	remove	/sbin/ifconfig $device delete
+	remove	logger -t pccard:$device -s Fujitsu MBH10303 removed
+
+# HITACHI HT-4840-11
+card "HITACHI" "HT-4840-11"
+	config	0x1a "fe0" ?
+	insert	logger -t pccard:$device -s HT-4840-11 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s HT-4840-11 removed
+	remove	/sbin/ifconfig $device delete
+
+# NextCom J Link NC5310
+card "NextComK.K." "NC5310 Ver1.0      "
+	config	0x14 "fe0" ?
+	insert	logger -t pccard:$device -s NextCom J Link NC5310 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s NextCom J Link NC5310 removed
+	remove	/sbin/ifconfig $device delete
+
+# Fujitsu MBH10302
+card "PCMCIA MBH10302" "01"
+	config	0x14 "fe0" ?
+	insert	logger -t pccard:$device -s Fujitsu MBH10302 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Fujitsu MBH10302 removed
+	remove	/sbin/ifconfig $device delete
+
+########## fdc ##########
+
+# Libretto Floppy disk
+card "Y-E DATA" "External FDD"
+	config	0x4 "fdc0" ?
+	insert	logger -t pccard:$device -s Libretto Floopy Disk inserted
+	remove	logger -t pccard:$device -s Libretto Floopy Disk removed
+
+########## sio ##########
+
+# 3Com/USR/MegaHertz 3CCM156
+card "3COM" "3CCM156"
+	config	0x23 "sio2" ?
+	insert	logger -t pccard:$device -s 3Com PCMCIA 56K modem inserted
+	remove	logger -t pccard:$device -s 3Com PCMCIA 56K modem removed
+
+# 3com/USR/Megahertz 3CCM556
+card "3Com" "3CXM/3CCM556"
+	config	0x23 "sio2" ?
+	insert	logger -t pccard:$device -s 3Com PCMCIA 56K Modem inserted
+	remove	logger -t pccard:$device -s 3Com PCMCIA 56K Modem removed
 
 # AIWA PV-JF288
 card "AIWA CO.,LTD." "PV-JF288  "
@@ -380,6 +571,73 @@ card "AD PC_CARD" "RC288ACL"
 	insert	logger -t pccard:$device -s Apex Data Mobile Plus 28.8 Modem inserted 
 	remove	logger -t pccard:$device -s Apex Data Mobile Plus 28.8 Modem removed 
 
+# Eiger 33.6 modem
+card "AT&T" "V34+ Fax Modem"
+	config	0x23 "sio1" ?
+	insert	logger -t pccard:$device -s Eiger 33.6K modem inserted
+	remove	logger -t pccard:$device -s Eiger 33.6K modem removed
+
+# AT&T Paradyne KeepInTouch 14.4 modem
+card "AT&T Paradyne" "KeepInTouch Card"
+	config	0x23 "sio3" ?
+	reset	1000
+	insert	logger -t pccard:$device -s ATT Paradyne 14.4 inserted
+	remove	logger -t pccard:$device -s ATT Paradyne 14.4 removed
+
+# BUG Linkboy D64K (ISDN)
+card "BUG Inc." "Linkboy D64K"
+	config	0x23 "sio2" ?
+	insert	logger -t pccard:$device -s BUG Linkboy D64K inserted
+	remove	logger -t pccard:$device -s BUG Linkboy D64K removed
+
+# NewMedia 14.4K FAX/Data Modem
+card "CIRRUS LOGIC" "FAX MODEM"
+	config	0x23 "sio2" ?
+	insert	logger -t pccard:$device -s Newmedia 14.4 Modem inserted
+	remove	logger -t pccard:$device -s Newmedia 14.4 Modem removed
+
+# COM1 SA
+card "COM1 SA" "MC220 CARD"
+	config	0x3 "sio2" ?
+	insert	logger -t pccard:$device -s COM1 SA MC220 CARD Modem inserted
+	remove	logger -t pccard:$device -s COM1 SA MC220 CARD Modem removed
+	insert	logger -t pccard:$device -s Melco Airconnect inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Melco Airconnect removed
+	remove	/sbin/ifconfig $device delete
+
+# GATEWAY 2000 FAX/Data Modem (14.4K)
+card "GATEWAY2000" "CC3144"
+	config	0x22 "sio3" ?
+	insert	logger -t pccard:$device -s GATEWAY2000 FAX/Data Modem inserted
+	remove	logger -t pccard:$device -s GATEWAY2000 FAX/Data Modem removed
+
+# This one does work though
+card "HAYES" "OPT288"
+	config	0x23 "sio3" ?
+	insert	logger -t pccard:$device -s Hayes Optima 28.8k inserted
+	remove	logger -t pccard:$device -s Hayes Optima 28.8k removed
+
+# Hayes OPTIMA 288 FAX/Data Modem
+# currently does not work on my machine
+card "Hayes" "OPTIMA 288 + FAX fo"
+	config	0x24 "sio2" ?
+	reset	10000
+	insert	logger -t pccard:$device -s Optima 288 inserted
+	remove	logger -t pccard:$device -s Optima 288 removed
+
+# IBM Push/Pop Modem (14.4K)
+card "IBM" "Push/Pop Modem(14.4K)"
+	config	0x22 "sio2" ?
+	insert	logger -t pccard:$device -s IBM Push/Pop Modem inserted
+	remove	logger -t pccard:$device -s IBM Push/Pop Modem removed
+
+# Megahertz XJEM1336 (as modem)
+card "MEGAHERTZ" "CC/XJEM3336"
+	config	auto "sio2" ?
+	insert	logger -t pccard:$device -s Megahertz CC/XJEM3336 inserted
+	remove	logger -t pccard:$device -s Megahertz CC/XJEM3336 removed
+
 # Megahertz XJ1144
 card "MEGAHERTZ" "XJ1144"
 	config	0x23 "sio2" ?
@@ -424,17 +682,49 @@ card "Megahertz" "XJ4336-CC4336"
 	insert	logger -t pccard:$device -s Megahertz XJ4336 inserted
 	remove	logger -t pccard:$device -s Megahertz XJ4336 removed
 
-# Megahertz XJEM1336 (as modem)
-card "MEGAHERTZ" "CC/XJEM3336"
-	config	auto "sio2" ?
-	insert	logger -t pccard:$device -s Megahertz CC/XJEM3336 inserted
-	remove	logger -t pccard:$device -s Megahertz CC/XJEM3336 removed
+# Motorola Montana 
+card "Motorola" "MONTANA 33.6 FAX/MODEM"
+	config	0x21 "sio1" ?
+	insert	echo Motorola Montana 33.6K FAX/modem inserted
+	remove	echo Motorola Montana 33.6K FAX/modem removed
 
-# Megahertz XJ1336
-card "U.S. Robotics" "XJ/CC1336"
-	config	0x21 "sio2" ?
-	insert	logger -t pccard:$device -s U.S. Robotics XJ/CC1336 inserted
-	remove	logger -t pccard:$device -s U.S. Robotics XJ/CC1336 removed
+# NTT ThunderCard Modem
+card "NTT-IT CO., LTD" "ThunderCard AVF288, V.34"
+	config	0x22 "sio2" ?
+	insert	logger -t pccard:$device -s NTT ThunderCard inserted
+	remove	logger -t pccard:$device -s NTT ThunderCard removed
+
+# NTT DoCoMo Mobile D Card 96P1
+card "NTT DoCoMo" "Mobile D Card 96P1"
+#	config	0x22 "sio2" ? 0x82
+	config	0x23 "sio3" ? 0x82
+#	config	auto "sio3" ? 0x82
+	insert	logger -t pccard:$device -s NTT DoCoMo Mobile D Card 96P1 inserted
+	remove	logger -t pccard:$device -s NTT DoCoMo Mobile D Card 96P1 removed
+
+# NTT DoCoMo DATA/FAX Adapter
+card "NTT DoCoMo" "PCMCIA DATA/FAX ADAPTER 9600"
+	config	0x22 "sio3" ? 0x82
+	insert	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter inserted
+	remove	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter removed
+
+# NTT DoCoMo DATA/FAX Adapter
+card "NTT DoCoMo" "PCMCIA DATA/FAX ADAPTER 9600 Mark2"
+	config	auto "sio3" ?
+	insert	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter inserted
+	remove	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter removed
+
+# NTT DoCoMo (formerly NTT Personal) FAX/Data 32K PHS Card Paldio 321S
+card "NTT Personal" "32K Paldio 321S PC CARD"
+	config	0x23 "sio2" ?
+	insert	logger -t pccard:$device -s NTT Personal Paldio 321S PC Card inserted
+	remove	logger -t pccard:$device -s NTT Personal Paldio 321S PC Card removed
+
+# NTT DoCoMo (formerly NTT Personal) FAX/Data 32K PHS Card Paldio 341S
+card "NTT Personal" "32K Paldio 341S PC CARD"
+	config	0x23 "sio2" ?
+	insert	logger -t pccard:$device -s NTT Personal 32K Paldio 341S PC Card inserted
+	remove	logger -t pccard:$device -s NTT Personal 32K Paldio 341S PC Card removed
 
 # Nokia Cellular Data Card
 card "Nokia Mobile Phones" "DTP-2"
@@ -452,23 +742,68 @@ card "Nokia Mobile Phones" "DTP-2 ver II"
 	insert	logger -t pccard:$device -s Nokia Mobile Phones DTP-2 ver II inserted
 	remove	logger -t pccard:$device -s Nokia Mobile Phones DTP-2 ver II removed
 
+# Novalink NovaModem 144
+card "NovaLink Tech." "NovaModem 144   "
+	config	0x23 "sio2" ?
+	insert	logger -t pccard:$device -s NovaModem 144 Modem inserted
+	remove	logger -t pccard:$device -s NovaModem 144 Modem removed
+
 # Omron ME2814 FAX/DATA MODEM
 card "OMRON" "ME2814 FAX/DATA MOD"
 	config	0x23 "sio2" ?
 	insert	logger -t pccard:$device -s OMRON ME2814 Modem inserted
 	remove	logger -t pccard:$device -s OMRON ME2814 Modem removed
 
-# TDK 14.4 FAX/Data Modem
-card "TDK" "DF1414 DATA/FAX MOD"
+# Omron MD24XCA FAX/Data Modem
+card "OMRON Corp." "MD24XCA"
 	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s TDK DF1414 inserted
-	remove	logger -t pccard:$device -s TDK DF1414 removed
+	reset	10000
+	insert	logger -t pccard:$device -s OMRON MD24XCA Modem inserted
+	remove	logger -t pccard:$device -s OMRON MD24XCA Modem removed
 
-# TDK 14.4 FAX/Data Modem
-card "TDK" "DF1414EX DATA/FAX M"
+# Option International PCMCIA55K06
+card "Option International" "GSM Data/Fax/SMS Modem"
+	config	0x22 "sio2" ?
+	insert	logger -t pccard:$device -s Option 55K06 Modem inserted
+	remove	logger -t pccard:$device -s Option 55K06 Modem removed
+
+# Banksia CardModem 56
+card "PCCardModem" "CardModem 56"
+	config	0x22 "sio3" ?
+	insert	logger -t pccard:$device -s Banksia CardModem 56 inserted
+	remove	logger -t pccard:$device -s Banksia CardModem 56 removed
+
+# Eiger PCCARD modem 
+# Apparently this modem does not work unless the recommended
+# init string (AT&F&C1&D2) is supplied.
+card "PCMCIA  " "33.6K Fax/Modem  "
+	config	23 "sio2" ?
+	insert	logger -t pccard:$device -s Eiger 33.6K modem inserted
+	remove	logger -t pccard:$device -s Eiger 33.6K modem removed
+
+# Actiontec Datalink with v.90 upgrade
+card "PCMCIA  " "56K V.90 Fax Modem (LK)  "
+	config	0x1f "sio2" ?
+	insert	logger -t pccard:$device -s "Actiontec Datalink modem card inserted"
+	remove	logger -t pccard:$device -s "Actiontec Datalink modem card removed"
+
+# PREMAX FM288 FAX/Data Modem
+card "PREMAX" "FM288 "
 	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s TDK DF1414 inserted
-	remove	logger -t pccard:$device -s TDK DF1414 removed
+	insert	logger -t pccard:$device -s PREMAX FM288 Modem inserted
+	remove	logger -t pccard:$device -s PREMAX FM288 Modem removed
+
+# Panasonic FM-RADIO card
+card "Panasonic" "CF-JVR101"
+	config	0x22 "sio3" ?
+	insert	logger -t pccard:$device -s Panasonic FM radio card inserted
+	remove	logger -t pccard:$device -s Panasonic FM radio card removed
+
+# Panasonic KX-PH402D
+card "Panasonic" "KX-PH402D"
+	config	0x23 "sio4" ?
+	insert	logger -t pccard:$device -s Panasonic KX-PH402D inserted
+	remove	logger -t pccard:$device -s Panasonic KX-PH402D removed
 
 # Panasonic Modem Card TO-706C
 card "Panasonic" "TO-706C"
@@ -482,50 +817,41 @@ card "Panasonic" "TO-CAF288"
 	insert	logger -t pccard:$device -s Panasonic TO-CAF288 inserted
 	remove	logger -t pccard:$device -s Panasonic TO-CAF288 removed
 
-# NewMedia 14.4K FAX/Data Modem
-card "CIRRUS LOGIC" "FAX MODEM"
+# Random modem bundled with Dell systems
+card "Psion Dacom" "Gold Card Global 56K+Fax"
 	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s Newmedia 14.4 Modem inserted
-	remove	logger -t pccard:$device -s Newmedia 14.4 Modem removed
+	insert	logger -t pccard:$device -s "Psion Dacom modem card inserted"
+	remove	logger -t pccard:$device -s "Psion Dacom modem card removed"
 
-# Omron MD24XCA FAX/Data Modem
-#card "OMRON Corp." "MD24XCA"
-#	config	0x23 "sio2" ?
-#	reset	10000
-#	insert	logger -t pccard:$device -s OMRON MD24XCA Modem inserted
-#	remove	logger -t pccard:$device -s OMRON MD24XCA Modem removed
-
-# Hayes OPTIMA 288 FAX/Data Modem
-# currently does not work on my machine
-card "Hayes" "OPTIMA 288 + FAX fo"
-	config	0x24 "sio2" ?
-	reset	10000
-	insert	logger -t pccard:$device -s Optima 288 inserted
-	remove	logger -t pccard:$device -s Optima 288 removed
-
-# This one does work though
-card "HAYES" "OPT288"
-	config	0x23 "sio3" ?
-	insert	logger -t pccard:$device -s Hayes Optima 28.8k inserted
-	remove	logger -t pccard:$device -s Hayes Optima 28.8k removed
-
-# PREMAX FM288 FAX/Data Modem
-card "PREMAX" "FM288 "
+# TDK 14.4 FAX/Data Modem
+card "TDK" "DF1414 DATA/FAX MOD"
 	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s PREMAX FM288 Modem inserted
-	remove	logger -t pccard:$device -s PREMAX FM288 Modem removed
+	insert	logger -t pccard:$device -s TDK DF1414 inserted
+	remove	logger -t pccard:$device -s TDK DF1414 removed
 
-# Novalink NovaModem 144
-card "NovaLink Tech." "NovaModem 144   "
+# TDK 14.4 FAX/Data Modem
+card "TDK" "DF1414EX DATA/FAX M"
 	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s NovaModem 144 Modem inserted
-	remove	logger -t pccard:$device -s NovaModem 144 Modem removed
+	insert	logger -t pccard:$device -s TDK DF1414 inserted
+	remove	logger -t pccard:$device -s TDK DF1414 removed
 
-# Option International PCMCIA55K06
-card "Option International" "GSM Data/Fax/SMS Modem"
+# 3Com/NoteWorthy 56K modem (bundled with Toshiba notebooks)
+card "Toshiba America" "3CXM056-BNW"
+	config	0x20 "sio1" ?
+	insert	logger -t pccard:$device -s NoteWorthy 56K PCMCIA Modem inserted
+	remove	logger -t pccard:$device -s NoteWorthy 56K PCMCIA Modem removed
+
+# U.S. Robotics XJ1560J
+card "U.S. Robotics" "XJ/CC1560J"
 	config	0x22 "sio2" ?
-	insert	logger -t pccard:$device -s Option 55K06 Modem inserted
-	remove	logger -t pccard:$device -s Option 55K06 Modem removed
+	insert	logger -t pccard:$device -s U.S. Robotics XJ1560J inserted
+	remove	logger -t pccard:$device -s U.S. Robotics XJ1560J removed
+
+# Megahertz XJ1336
+card "U.S. Robotics" "XJ/CC1336"
+	config	0x21 "sio2" ?
+	insert	logger -t pccard:$device -s U.S. Robotics XJ/CC1336 inserted
+	remove	logger -t pccard:$device -s U.S. Robotics XJ/CC1336 removed
 
 # US Robotics Sportster PCMCIA V.34
 # US Robotics COURIER PCMCIA V.34
@@ -534,12 +860,11 @@ card "USRobotics" "PCMCIA 28800 Data/F"
 	insert	logger -t pccard:$device -s USRobotics PCMCIA Modem inserted
 	remove	logger -t pccard:$device -s USRobotics PCMCIA Modem removed
 
-# Xircom CreditCard Modem
-card "Xircom" "CreditCard Modem CM-56T"
-	config	0x17 "sio1" ?
-	reset	100
-	insert	logger -t pccard:$device -s Xircom CreditCard Modem CM-56T inserted
-	remove	logger -t pccard:$device -s Xircom CreditCard Modem CM-56T removed
+# Viking V.90/K56Flex modem
+card "Viking" "V.90 K56flex"
+	config	0x23 "sio3" ?
+	insert	logger -t pccard:$device -s Viking 56K Modem inserted
+	remove	logger -t pccard:$device -s Viking 56K Modem removed
 
 # Xircom CreditCard Ethernet+Modem (Modem only !!!)
 card "Xircom" "CreditCard Ethernet"
@@ -553,215 +878,18 @@ card "Xircom" "CreditCard Ethernet+Modem 33.6"
 	insert	logger -t pccard:$device -s Xircom CreditCard Modem inserted
 	remove	logger -t pccard:$device -s Xircom CreditCard Modem removed
 
-# Xircom CreditCard Ethernet 10/100 + modem (Ethernet part)
-card "Xircom" "CreditCard Ethernet 10/100 + Modem 56"
-	config	0x1 "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
-	remove	/sbin/ifconfig $device delete
-
-# Xircom CreditCard Ethernet 10/100
-card "Xircom" "CreditCard 10/100"
-	config	0x1 "xe0" ?
-	insert	logger -t pccard:$device -s Xircom CreditCard Ethernet inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Xircom CreditCard Ethernet removed
-	remove	/etc/pccard_ether $device delete
-
 # Xircom GlobalACCESS modem
 card "Xircom" "CreditCard Modem 56 - GlobalA"
 	config	0x1f "sio2" ?
 	insert	logger -t pccard:$device -s Xircom CreditCard Modem 56 - GlobalACCESS inserted
 	remove	logger -t pccard:$device -s Xircom CreditCard Modem 56 - GlobalACCESS removed
 
-# Xircom Realport card + modem
-card "Xircom" "16-bit Ethernet + Modem 56"
-	config	0x27 "xe0" 9
-	insert	logger -t pccard:$device -s Xircom Realport Ethernet inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Xircom Realport Ethernet removed
-	remove	/etc/pccard_ether $device delete
-
-# GATEWAY 2000 FAX/Data Modem (14.4K)
-card "GATEWAY2000" "CC3144"
-	config	0x22 "sio3" ?
-	insert	logger -t pccard:$device -s GATEWAY2000 FAX/Data Modem inserted
-	remove	logger -t pccard:$device -s GATEWAY2000 FAX/Data Modem removed
-
-# IBM Push/Pop Modem (14.4K)
-card "IBM" "Push/Pop Modem(14.4K)"
-	config	0x22 "sio2" ?
-	insert	logger -t pccard:$device -s IBM Push/Pop Modem inserted
-	remove	logger -t pccard:$device -s IBM Push/Pop Modem removed
-
-# Eiger PCCARD modem 
-# Apparently this modem does not work unless the recommended
-# init string (AT&F&C1&D2) is supplied.
-card "PCMCIA  " "33.6K Fax/Modem  "
-	config	23 "sio2" ?
-	insert	logger -t pccard:$device -s Eiger 33.6K modem inserted
-	remove	logger -t pccard:$device -s Eiger 33.6K modem removed
-
-# NTT ThunderCard Modem
-card "NTT-IT CO., LTD" "ThunderCard AVF288, V.34"
-	config	0x22 "sio2" ?
-	insert	logger -t pccard:$device -s NTT ThunderCard inserted
-	remove	logger -t pccard:$device -s NTT ThunderCard removed
-
-# U.S. Robotics XJ1560J
-card "U.S. Robotics" "XJ/CC1560J"
-	config	0x22 "sio2" ?
-	insert	logger -t pccard:$device -s U.S. Robotics XJ1560J inserted
-	remove	logger -t pccard:$device -s U.S. Robotics XJ1560J removed
-
-# 3com/USR/Megahertz 3CCM556
-card "3Com" "3CXM/3CCM556"
-	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s 3Com PCMCIA 56K Modem inserted
-	remove	logger -t pccard:$device -s 3Com PCMCIA 56K Modem removed
-
-# 3Com/NoteWorthy 56K modem (bundled with Toshiba notebooks)
-card "Toshiba America" "3CXM056-BNW"
-	config	0x20 "sio1" ?
-	insert	logger -t pccard:$device -s NoteWorthy 56K PCMCIA Modem inserted
-	remove	logger -t pccard:$device -s NoteWorthy 56K PCMCIA Modem removed
-
-# BUG Linkboy D64K (ISDN)
-card "BUG Inc." "Linkboy D64K"
-	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s BUG Linkboy D64K inserted
-	remove	logger -t pccard:$device -s BUG Linkboy D64K removed
-
-# NTT DoCoMo DATA/FAX Adapter
-card "NTT DoCoMo" "PCMCIA DATA/FAX ADAPTER 9600"
-	config	0x22 "sio3" ? 0x82
-	insert	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter inserted
-	remove	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter removed
-
-# NTT DoCoMo DATA/FAX Adapter
-card "NTT DoCoMo" "PCMCIA DATA/FAX ADAPTER 9600 Mark2"
-	config	auto "sio3" ?
-	insert	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter inserted
-	remove	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter removed
-
-# NTT DoCoMo Mobile D Card 96P1
-card "NTT DoCoMo" "Mobile D Card 96P1"
-#	config	0x22 "sio2" ? 0x82
-	config	0x23 "sio3" ? 0x82
-#	config	auto "sio3" ? 0x82
-	insert	logger -t pccard:$device -s NTT DoCoMo Mobile D Card 96P1 inserted
-	remove	logger -t pccard:$device -s NTT DoCoMo Mobile D Card 96P1 removed
-
-# Random modem bundled with Dell systems
-card "Psion Dacom" "Gold Card Global 56K+Fax"
-	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s "Psion Dacom modem card inserted"
-	remove	logger -t pccard:$device -s "Psion Dacom modem card removed"
-
-# Actiontec Datalink with v.90 upgrade
-card "PCMCIA  " "56K V.90 Fax Modem (LK)  "
-	config	0x1f "sio2" ?
-	insert	logger -t pccard:$device -s "Actiontec Datalink modem card inserted"
-	remove	logger -t pccard:$device -s "Actiontec Datalink modem card removed"
-
-# Panasonic FM-RADIO card
-#card "Panasonic" "CF-JVR101"
-#	config	0x22 "sio3" ?
-#	insert	logger -t pccard:$device -s Panasonic FM radio card inserted
-#	remove	logger -t pccard:$device -s Panasonic FM radio card removed
-
-# IO Data CBIDE (bundled with CDP-FX24, etc.)
-card "WIT" "IDE16"
-	config	auto "ata0" ?
-	insert	logger -t pccard:$device -s IO Data CBIDE inserted
-	remove	logger -t pccard:$device -s IO Data CBIDE removed
-
-# IBM Flash ATA (Ricoh Flash ATA 10MB)
-card "IBM" "IBM17JSSFP10"
-	config	auto "ata0" ? iosize 16
-	insert	logger -t pccard:$device -s IBM Flash ATA inserted
-	remove	logger -t pccard:$device -s IBM flash ATA removed
-
-# Non-brand Compact Flash Card(32MB)
-card "       " "KCF 32M"
-	config	0x1 "ata2" ? iosize 16
-	insert	logger -t pccard:$device -s Compact Flash Card 32MB inserted
-	remove	logger -t pccard:$device -s Compact Flash Card 32MB removed
-
-# SunDisk Flash ATA
-# (OEM: Epson Flash Packer)
-card "SunDisk" "SDP5"
-	config	0x1 "ata2" ?
-	insert	logger -t pccard:$device -s Sundisk Flash ATA inserted
-	remove	logger -t pccard:$device -s Sundisk Flash ATA removed
-
-card "SunDisk" "SDP"
-	config	0x1 "ata2" ?
-	insert	logger -t pccard:$device -s SunDisk Flash ATA Inserted
-	remove	logger -t pccard:$device -s SunDisk Flash ATA removed
-
-# Midori Elec Fast Flash
-card "Midori Elec." "FAST FLASH"
-	config	0x3  "ata2" ?
-	insert	logger -t pccard:$device -s Midori Elec Fast FLASH inserted
-	remove	logger -t pccard:$device -s Midori Elec Fast FLASH removed
-
-# Simple Technology ata flash
-card "Simple Technology        " "STI-ATA"
-	config	0x2 "ata2" ?
-	insert	logger -t pccard:$device -s Simple Technology ata FLASH inserted
-	remove	logger -t pccard:$device -s Simple Technology ata FLASH removed
-	
-# Viking ATA Flash card
-card "VIKING ATA/CF FLASH CARD " "TOR/AM "
-	config	0x2 "ata2" ?
-	insert	logger -t pccard:$device -s Simple Technology ata FLASH inserted
-	remove	logger -t pccard:$device -s Simple Technology ata FLASH removed
-	
-# Maxtor 131MB Type III HDD
-card "Maxtor" "MXL131"
-	config	0x03 "ata2" ?
-	insert	logger -t pccard:$device -s Maxtor 131MB HDD inserted
-	remove	logger -t pccard:$device -s Maxtor 131MB HDD removed
-
-# SiliconTech, Inc flash card
-card "SiliconTech,Inc" "16MB Compact PC Card"
-	config	0x1 "ata2" ?
-	insert	logger -t pccard:$device -s SiliconTech Flash ATA inserted
-	remove	logger -t pccard:$device -s SiliconTech Flash ATA removed
-
-# 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
-
-# REX5535AC, REX5535X SCSI
-#card "PCMCIA SCSI MBH1040" "01"
-#	config	0x3a "spc0" ?
-#	insert	logger -t pccard:$device -s REX-5535 SCSI card inserted
-#	remove	logger -t pccard:$device -s REX-5535 SCSI card removed
-
-# Libretto Floppy disk
-card "Y-E DATA" "External FDD"
-	config	0x4 "fdc0" ?
-	insert	logger -t pccard:$device -s Libretto Floopy Disk inserted
-	remove	logger -t pccard:$device -s Libretto Floopy Disk removed
-
-# Viking V.90/K56Flex modem
-card "Viking" "V.90 K56flex"
-	config	0x23 "sio3" ?
-	insert	logger -t pccard:$device -s Viking 56K Modem inserted
-	remove	logger -t pccard:$device -s Viking 56K Modem removed
+# Xircom CreditCard Modem
+card "Xircom" "CreditCard Modem CM-56T"
+	config	0x17 "sio1" ?
+	reset	100
+	insert	logger -t pccard:$device -s Xircom CreditCard Modem CM-56T inserted
+	remove	logger -t pccard:$device -s Xircom CreditCard Modem CM-56T removed
 
 # Zoom 56K modem 
 # Freezes your system entirely if you don't have the reset..
@@ -771,101 +899,7 @@ card "Zoom Telephonics, Inc." "PCMCIA 56K LT DataFax"
 	insert	logger -t pccard:$device -s Zoom modem inserted
 	remove	logger -t pccard:$device -s Zoom modem removed
 
-# 3Com Megahertz 3CCE589E* 10 Mbps LAN PC Card
-card "3Com" "Megahertz 589E"
-	config	0x1 "ep0" ?
-#	config	auto "ep0" ?
-	insert	logger -t pccard:$device -s 3Com Megahertz Ethernet card inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s 3Com Megahertz Ethernet card removed
-	remove	/sbin/ifconfig $device delete
-
-#AR-P500 ethernet card
-card "IC-CARD" "IC-CARD"
-	config	0x20 "ed0" ?
-	insert	logger -t pccard:$device -s AR-P500 Ethernet card inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s AR-P500 Ethernet card removed
-	remove	ifconfig $device delete
-
-# 3Com/USR/MegaHertz 3CCM156
-card "3COM" "3CCM156"
-	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s 3Com PCMCIA 56K modem inserted
-	remove	logger -t pccard:$device -s 3Com PCMCIA 56K modem removed
-
-#Eiger 33.6 modem
-card "AT&T" "V34+ Fax Modem"
-	config	0x23 "sio1" ?
-	insert	logger -t pccard:$device -s Eiger 33.6K modem inserted
-	remove	logger -t pccard:$device -s Eiger 33.6K modem removed
-
-# Motorola Montana 
-card "Motorola" "MONTANA 33.6 FAX/MODEM"
-	config	0x21 "sio1" ?
-	insert	echo Motorola Montana 33.6K FAX/modem inserted
-	remove	echo Motorola Montana 33.6K FAX/modem removed
-
-# AT&T Paradyne KeepInTouch 14.4 modem
-card "AT&T Paradyne" "KeepInTouch Card"
-	config	0x23 "sio3" ?
-	reset	1000
-	insert	logger -t pccard:$device -s ATT Paradyne 14.4 inserted
-	remove	logger -t pccard:$device -s ATT Paradyne 14.4 removed
-
-# AmbiCom 10BaseT card
-card "AmbiCom Inc" "AMB8002T"
-	config	0x20 "ed0" ?
-	insert	logger -t pccard:$device -s AmbiCom 8002T inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s AmbiCom 8002T removed
-	remove	/sbin/ifconfig $device delete
-
-# 3Com OfficeConnect 3CXSH572BT
-#This had auto, so the config slot might be wrong.  Replace it by the
-#one that pccardc dumpcis tells you is default.
-#
-card "3Com" "OfficeConnect 572B"
-	config	0x1 "ep0" ? 0x1
-	insert	logger -t pccard:$device -s 3Com 3CXSH572BT inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s 3Com 3CXSH572BT removed
-	remove	/sbin/ifconfig $device delete
-
-# Elecom Laneed LD-CDF
-card "Laneed" "LD-CDF"
-	config	0x20 "ed1" ?
-	insert	logger -t pccard:$device -s Elecom Laneed LD-CDF inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Elecom Laneed LD-CDF removed
-	remove	/sbin/ifconfig $device delete
-
-# NTT DoCoMo (formerly NTT Personal) FAX/Data 32K PHS Card Paldio 321S
-card "NTT Personal" "32K Paldio 321S PC CARD"
-	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s NTT Personal Paldio 321S PC Card inserted
-	remove	logger -t pccard:$device -s NTT Personal Paldio 321S PC Card removed
-
-# NTT DoCoMo (formerly NTT Personal) FAX/Data 32K PHS Card Paldio 341S
-card "NTT Personal" "32K Paldio 341S PC CARD"
-	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s NTT Personal 32K Paldio 341S PC Card inserted
-	remove	logger -t pccard:$device -s NTT Personal 32K Paldio 341S PC Card removed
-
-# Allied Telesis Ethernet Card inserted
-card "Allied Telesis,K.K" "Ethernet LAN Card"
-	config	0x1 "ed1" ? 0x10
-	ether	0xff0
-	insert	logger -t pccard:$device -s Allied Telesis Ethernet Card inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Allied Telesis Ethernet Card removed
-	remove	/sbin/ifconfig $device delete
-
-# Panasonic KX-PH402D
-card "Panasonic" "KX-PH402D"
-	config	0x23 "sio4" ?
-	insert	logger -t pccard:$device -s Panasonic KX-PH402D inserted
-	remove	logger -t pccard:$device -s Panasonic KX-PH402D removed
+########## sn ##########
 
 # Megahertz X-Jack Ethernet
 card "Megahertz" "CC10BT/2"
@@ -876,88 +910,75 @@ card "Megahertz" "CC10BT/2"
 	remove	logger -t pccard:$device -s Megahertz X-Jack Ethernet removed
 	remove	/etc/pccard_ether_remove $device
 
-# Surecom EtherPerfect EP-427
-card "TAMARACK" "Ethernet"
-	config	0x21 "ed0" ?
-	insert	logger -t pccard:$device -s Surecom Ethernet card inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Surecom Ethernet card removed
-	remove	ifconfig $device delete
+########## spc ##########
 
-# COREGA Ether PCC-T
-card "corega K.K." "corega Ether PCC-T"
-	config	0x20 "ed0" ?
-#	config	auto "ed0" ?
-	insert	logger -t pccard:$device -s Ether PCC-T inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Ether PCC-T removed
-	remove	/etc/pccard_ether_remove $device
+# REX5535AC, REX5535X SCSI
+card "PCMCIA SCSI MBH1040" "01"
+	config	0x3a "spc0" ?
+	insert	logger -t pccard:$device -s REX-5535 SCSI card inserted
+	remove	logger -t pccard:$device -s REX-5535 SCSI card removed
 
-# Planex FNW-3600-T 16bit FastEthernet
-card "Fast Ethernet" "Adapter"
-	config	0x7 "ed0" ?
-	iosize	32
-	insert	logger -t pccard:$device -s Planex FNW-3600-T inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Planex FNW-3600-T removed
-	remove	/etc/pccard_ether_remove $device
+########## wi ##########
 
-# IC-CARD+ Ethernet card
-card "IC-CARD+" "IC-CARD+"
-	config	auto "ed0" ?
-	insert	logger -t pccard:$device -s IC-CARD+ Ethernet card inserted
+# Cabletron RoamAbout, WaveLAN/IEEE clone
+card "Cabletron" "RoamAbout 802.11 DS"
+	config	0x1 "wi0" ?
+	insert	logger -t pccard:$device -s WaveLAN/IEEE inserted
 	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s IC-CARD+ Ethernet card removed
-	remove	ifconfig $device delete
-
-# Banksia CardModem 56
-card "PCCardModem" "CardModem 56"
-	config	0x22 "sio3" ?
-	insert	logger -t pccard:$device -s Banksia CardModem 56 inserted
-	remove	logger -t pccard:$device -s Banksia CardModem 56 removed
-
-# Apollo PCMCIA Ethernet Adapter
-card "Ethernet" "Adapter"
-	config	0x0 "ed0" ?
-	insert	logger -t pccard:$device -s Apollo PCMCIA Ethernet Adapter inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Apollo PCMCIA Ethernet Adapter removed
+	remove	logger -t pccard:$device -s WaveLAN/IEEE removed
 	remove	/sbin/ifconfig $device delete
 
-# Olicom OC2220
-card "Olicom" "Ethernet"
-	config	0x1 "ex0" ?
-	insert	logger -t pccard:$device -s Olicom OC2220 inserted
+# Lucent WaveLAN/IEEE
+card "Lucent Technologies" "WaveLAN/IEEE"
+	config	0x1 "wi0" ?
+	insert	logger -t pccard:$device -s WaveLAN/IEEE inserted
 	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Olicom OC2220 removed
+	remove	logger -t pccard:$device -s WaveLAN/IEEE removed
 	remove	/sbin/ifconfig $device delete
 
-# National Semiconductor InfoMover NE4100
-card "National Semiconductor" "InfoMover NE4100"
-	config	0x1 "ed0" ?
-	ether	0xff0
-	insert	logger -t pccard:$device -s National Semiconductor InfoMover NE4100 inserted
+# NCR WaveLAN/IEEE
+card "NCR" "WaveLAN/IEEE"
+	config	0x1 "wi0" ?
+#	config	auto "wi0" ?
+	insert	logger -t pccard:$device -s WaveLAN/IEEE inserted
 	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s National Semiconductor InfoMover NE4100 removed
-	remove	/sbin/ifconfig $device delete
-
-card "IO DATA" "PCETTX"
-	config	0x20 "ed0" ?
-	insert	logger -t pccard:$device -s IO DATA PCETTX inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s IO DATA PCETTX removed
+	remove	logger -t pccard:$device -s WaveLAN/IEEE removed
 	remove	/sbin/ifconfig $device delete
 
 # Melco Airconnect
 card "MELCO" "WLI-PCM-L11"
 	config	0x1 "wi0" ?
 
-# COM1 SA
-card "COM1 SA" "MC220 CARD"
-	config	0x3 "sio2" ?
-	insert	logger -t pccard:$device -s COM1 SA MC220 CARD Modem inserted
-	remove	logger -t pccard:$device -s COM1 SA MC220 CARD Modem removed
-	insert	logger -t pccard:$device -s Melco Airconnect inserted
+########## xe ##########
+
+#  Intel EtherExpress PRO/100 Mobile Adapter (16-bit verison)
+card "Intel" "EtherExpress(TM) PRO/100 PC Card Mobile Adapter16"
+	config	0x1 "xe0" ?
+	insert	logger -t pccard:$device -s Intel EtherExpress PRO/100 Mobile Adapter/16 inserted
 	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Melco Airconnect removed
+	remove	logger -t pccard:$device -s Intel EtherExpress PRO/100 Mobile Adapter/16 removed
+	remove	/sbin/ifconfig $device delete
+
+# Xircom Realport card + modem
+card "Xircom" "16-bit Ethernet + Modem 56"
+	config	0x27 "xe0" 9
+	insert	logger -t pccard:$device -s Xircom Realport Ethernet inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Xircom Realport Ethernet removed
+	remove	/etc/pccard_ether $device delete
+
+# Xircom CreditCard Ethernet 10/100
+card "Xircom" "CreditCard 10/100"
+	config	0x1 "xe0" ?
+	insert	logger -t pccard:$device -s Xircom CreditCard Ethernet inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Xircom CreditCard Ethernet removed
+	remove	/etc/pccard_ether $device delete
+
+# Xircom CreditCard Ethernet 10/100 + modem (Ethernet part)
+card "Xircom" "CreditCard Ethernet 10/100 + Modem 56"
+	config	0x1 "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
 	remove	/sbin/ifconfig $device delete
diff --git a/etc/pccard.conf.sample b/etc/pccard.conf.sample
index 1f553c863602..fefdc84fa6dc 100644
--- a/etc/pccard.conf.sample
+++ b/etc/pccard.conf.sample
@@ -21,6 +21,15 @@ irq	3 5 10 11 13 15
 # Available memory slots
 memory	0xd4000  96k
 
+#
+# PLEASE KEEP THIS FILE IN ORDER
+#
+# In order is defined as follows.  We sort first by driver type (an, ed, etc)
+# and then by CIS strings.  Do not commit to this file entries out of
+# order.
+#
+
+########## an ##########
 
 # Aironet PC4500 2Mbps 802.11 wireless NIC
 card "Aironet" "PC4500"
@@ -38,80 +47,85 @@ card "Aironet" "PC4800"
 	remove	logger -t pccard:$device -s Aironet PC4800 removed
 	remove	/sbin/ifconfig $device delete
 
-# Lucent WaveLAN/IEEE
-card "Lucent Technologies" "WaveLAN/IEEE"
-	config	0x1 "wi0" ?
-	insert	logger -t pccard:$device -s WaveLAN/IEEE inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s WaveLAN/IEEE removed
-	remove	/sbin/ifconfig $device delete
+########## aic ##########
 
-# NCR WaveLAN/IEEE
-card "NCR" "WaveLAN/IEEE"
-	config	0x1 "wi0" ?
-#	config	auto "wi0" ?
-	insert	logger -t pccard:$device -s WaveLAN/IEEE inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s WaveLAN/IEEE removed
-	remove	/sbin/ifconfig $device delete
+# 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
 
-# Cabletron RoamAbout, WaveLAN/IEEE clone
-card "Cabletron" "RoamAbout 802.11 DS"
-	config	0x1 "wi0" ?
-	insert	logger -t pccard:$device -s WaveLAN/IEEE inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s WaveLAN/IEEE removed
-	remove	/sbin/ifconfig $device delete
+# 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
 
-# Socket LP-E (WinCE Low Power Ethernet)
-card "Low Power Ethernet LAN Adapter" "Socket Communications, Inc"
-	config	0x20 "ed0" ?
-	insert	logger -t pccard:$device -s Socket LP-E inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Socket LP-E removed
-	remove	/etc/pccard_ether_remove $device
+########## ata ##########
 
-# CNet BC40 adapter
-card "CNet" "CN40BC Ethernet"
-	config	0x20 "ed0" ?
-	insert	logger -t pccard:$device -s CNet CN40BC Ethernet inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s CNet CN40BC Ethernet removed
-	remove	/etc/pccard_ether_remove $device
+# Non-brand Compact Flash Card(32MB)
+card "       " "KCF 32M"
+	config	0x1 "ata2" ? iosize 16
+	insert	logger -t pccard:$device -s Compact Flash Card 32MB inserted
+	remove	logger -t pccard:$device -s Compact Flash Card 32MB removed
 
-# LinkMates LM 336 LAN Fax/Modem PC Card
-card "PCMCIAs" "ComboCard"
-	config	0x24 "ed0" ? 0x10
-	insert	logger -t pccard:$device -s LinkMates LM 336 inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s LinkMates LM 336 removed
-	remove	/sbin/ifconfig $device delete
+# IBM Flash ATA (Ricoh Flash ATA 10MB)
+card "IBM" "IBM17JSSFP10"
+	config	auto "ata0" ? iosize 16
+	insert	logger -t pccard:$device -s IBM Flash ATA inserted
+	remove	logger -t pccard:$device -s IBM flash ATA removed
 
-# IBM PCMCIA Ethernet I/II
-card "IBM Corp." "Ethernet"
-	config	0x1 "ed0" ?
-	ether	0xff0
-	insert	logger -t pccard:$device -s IBM PCMCIA Ethernet inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s IBM PCMCIA Ethernet removed
-	remove	/sbin/ifconfig $device delete
+# Maxtor 131MB Type III HDD
+card "Maxtor" "MXL131"
+	config	0x03 "ata2" ?
+	insert	logger -t pccard:$device -s Maxtor 131MB HDD inserted
+	remove	logger -t pccard:$device -s Maxtor 131MB HDD removed
 
-# Melco LPC-T (PIO mode)
-card "PCMCIA" "UE2212"
-	config	0x1 "ed0" ? 0x10
-	ether	0xff0
-	insert	logger -t pccard:$device -s UE2212 inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s UE2212 removed
-	remove	/sbin/ifconfig $device delete
+# Midori Elec Fast Flash
+card "Midori Elec." "FAST FLASH"
+	config	0x3  "ata2" ?
+	insert	logger -t pccard:$device -s Midori Elec Fast FLASH inserted
+	remove	logger -t pccard:$device -s Midori Elec Fast FLASH removed
 
-# Billionton 10Base-TX ETHERNET PCCARD (aka UE2216)
-card "PCMCIA" "PCMCIA-ETHERNET-CARD"
-	config	0x20 "ed0" ? 0x10
-	insert	logger -t pccard:$device -s UE2216 inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s UE2216 removed
-	remove	/sbin/ifconfig $device delete
+# SiliconTech, Inc flash card
+card "SiliconTech,Inc" "16MB Compact PC Card"
+	config	0x1 "ata2" ?
+	insert	logger -t pccard:$device -s SiliconTech Flash ATA inserted
+	remove	logger -t pccard:$device -s SiliconTech Flash ATA removed
+
+# Simple Technology ata flash
+card "Simple Technology        " "STI-ATA"
+	config	0x2 "ata2" ?
+	insert	logger -t pccard:$device -s Simple Technology ata FLASH inserted
+	remove	logger -t pccard:$device -s Simple Technology ata FLASH removed
+	
+# SunDisk Flash ATA
+# (OEM: Epson Flash Packer)
+card "SunDisk" "SDP5"
+	config	0x1 "ata2" ?
+	insert	logger -t pccard:$device -s Sundisk Flash ATA inserted
+	remove	logger -t pccard:$device -s Sundisk Flash ATA removed
+
+card "SunDisk" "SDP"
+	config	0x1 "ata2" ?
+	insert	logger -t pccard:$device -s SunDisk Flash ATA Inserted
+	remove	logger -t pccard:$device -s SunDisk Flash ATA removed
+
+# IO Data CBIDE (bundled with CDP-FX24, etc.)
+card "WIT" "IDE16"
+	config	auto "ata0" ?
+	insert	logger -t pccard:$device -s IO Data CBIDE inserted
+	remove	logger -t pccard:$device -s IO Data CBIDE removed
+
+# Viking ATA Flash card
+card "VIKING ATA/CF FLASH CARD " "TOR/AM "
+	config	0x2 "ata2" ?
+	insert	logger -t pccard:$device -s Simple Technology ata FLASH inserted
+	remove	logger -t pccard:$device -s Simple Technology ata FLASH removed
+	
+########## ed ##########
 
 # Accton EN2212
 # Very slow!  (PIO mode)
@@ -132,6 +146,57 @@ card "ACCTON" "EN2216-PCMCIA-ETHERNET"
 	remove	logger -t pccard:$device -s Accton 2216 removed
 	remove	/sbin/ifconfig $device delete
 
+# Allied Telesis Ethernet Card inserted
+card "Allied Telesis,K.K" "Ethernet LAN Card"
+	config	0x1 "ed1" ? 0x10
+	ether	0xff0
+	insert	logger -t pccard:$device -s Allied Telesis Ethernet Card inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Allied Telesis Ethernet Card removed
+	remove	/sbin/ifconfig $device delete
+
+# Allied Telesis CentreCOM LA-PCM_V2 ethernet card
+# NTT-DATA ASTROWINK-M/MMOIL(IrLAN) ethernet card
+card "Allied Telesis, K.K." "CentreCOM LA-PCM_V2"
+	config	0x20 "ed0" ?
+	insert	logger -t pccard:$device -s CentreCOM LA-PCM V2 Ethernet card inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s CentreCOM LA-PCM V2 Ethernet card removed
+	remove	/sbin/ifconfig $device delete
+
+# Allied Telesis CentreCOM LA100-PCM-T V2
+card "Allied Telesis, K.K." "CentreCOM LA100-PCM-T V2 100/10M LAN PC Card"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s Allied Telesis LA100-PCM-T V2 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Allied Telesis LA100-PCM-T V2 removed
+	remove	/etc/pccard_ether_remove $device
+
+# AmbiCom 10BaseT card
+card "AmbiCom Inc" "AMB8002T"
+	config	0x20 "ed0" ?
+	insert	logger -t pccard:$device -s AmbiCom 8002T inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s AmbiCom 8002T removed
+	remove	/sbin/ifconfig $device delete
+
+# CNet BC40 adapter
+card "CNet" "CN40BC Ethernet"
+	config	0x20 "ed0" ?
+	insert	logger -t pccard:$device -s CNet CN40BC Ethernet inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s CNet CN40BC Ethernet removed
+	remove	/etc/pccard_ether_remove $device
+
+# COREGA Ether PCC-T
+card "corega K.K." "corega Ether PCC-T"
+	config	0x20 "ed0" ?
+#	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s Ether PCC-T inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Ether PCC-T removed
+	remove	/etc/pccard_ether_remove $device
+
 # COREGA EtherII PCC-T
 card "corega K.K." "corega EtherII PCC-T"
 	config	0x20 "ed0" ?
@@ -141,113 +206,29 @@ card "corega K.K." "corega EtherII PCC-T"
 	remove	logger -t pccard:$device -s EtherII PCC-T removed
 	remove	/sbin/ifconfig $device delete
 
-# I-O DATA PCLATE
-card "IO DATA" "PCLATE"
+# CyQ've ELA-010
+card "CyQ've" "ELA-010"
+	config	0x20 "ed0" ?
+	insert	logger -t pccard:$device -s CyQve ELA-010 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s CyQve ELA-010 removed
+	remove	/sbin/ifconfig $device delete
+
+# D-Link DE-660 NE2000 clone
+card "D-Link" "DE-660"
 	config	0x20 "ed0" ? 0x10
-	insert	logger -t pccard:$device -s IO DATA PCLATE inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s IO DATA PCLATE removed
+	insert	logger -t pccard:$device -s D-Link DE-660 inserted
+	insert	/etc/pccard_ether $device link0 -link1
+	remove	logger -t pccard:$device -s D-Link DE-660 removed
 	remove	/sbin/ifconfig $device delete
 
-# 3Com Etherlink III 3C589B, 3C589C
-card "3Com Corporation" "3C589"
-	config	0x1 "ep0" ?
-#	config	auto "ep0" ?
-	insert	logger -t pccard:$device -s 3Com Etherlink III inserted
-	insert	/etc/pccard_ether $device -link0 link1
+# D-Link DFE-650 NE2000 clone
+card "D-Link" "DFE-650"
+	config	0x20 "ed0" ? 0x10
+	insert	logger -t pccard:$device -s D-Link DFE-650 inserted
+	insert	/etc/pccard_ether $device
 #	insert	/etc/pccard_ether $device link0 -link1
-	remove	logger -t pccard:$device -s 3Com Etherlink III removed
-	remove	/sbin/ifconfig $device delete
-
-# 3Com Etherlink III 3C589D
-card "3Com Corporation" "3C589D"
-	config	0x1 "ep0" ?
-#	config	auto "ep0" ?
-	insert	logger -t pccard:$device -s 3Com Etherlink III inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s 3Com Etherlink III removed
-	remove	/sbin/ifconfig $device delete
-
-# 3Com Etherlink III 3CXE589ET
-card "3Com" "Megahertz 589E"
-	config	0x1 "ep0" ?
-	insert	logger -t pccard:$device -s 3Com 3C589E inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s 3Com 3C589E removed
-	remove	/sbin/ifconfig $device delete
-
-# 3Com Fast Etherlink 3C574TX
-card "3Com" "3C574-TX Fast EtherLink PC Card"
-	config	0x1 "ep0" ? 0x1
-	insert	logger -t pccard:$device -s 3Com Fast Etherlink 3C574TX inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s 3Com Fast Etherlink 3C574TX removed
-	remove	/sbin/ifconfig $device delete
-
-# 3Com Megahertz 574B
-card "3Com" "Megahertz 574B"
-	config	0x1 "ep0" ? 0x1
-	insert	logger -t pccard:$device -s 3Com Megahertz 574B inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s 3Com Megahertz 574B removed
-	remove	/sbin/ifconfig $device delete
-
-# LinkSys ethernet card
-card "E-CARD" "E-CARD" 
-	config	0x20 "ed0" ? 
-	insert	logger -t pccard:$device -s "LinkSys card inserted" 
-	insert	/etc/pccard_ether $device 
-	remove	logger -t pccard:$device -s "LinkSys card removed" 
-	remove	/sbin/ifconfig $device delete
-
-# Linksys Combo PCMCIA EthernetCard (model EC2T on box) 
-card "Linksys" "Combo PCMCIA EthernetCard (EC2T)"
-	config	0x1 "ed0" ? 
-	insert	logger -t pccard:$device -s Linksys Ethernet inserted 
-	insert	/etc/pccard_ether $device 
-	remove	logger -t pccard:$device -s Linksys Ethernet removed 
-	remove	/sbin/ifconfig $device delete 
-
-#Linksys EtherFast 10/100 PC Card (PCMPC100)
-card "Linksys" "EtherFast 10/100 PC Card (PCMPC100)"
-	config	0x3 "ed0" ?
-#	config	auto "ed0" ?
-	insert	logger -t pccard:$device -s Linksys Fast 100-BaseT inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Linksys Fast 100-BaseT removed
-	remove	/sbin/ifconfig $device delete
-
-# Farallon EtherMac
-card "Farallon" "ENet"
-	config	0x1 "ep0" ?
-	insert	logger -t pccard:$device -s Farallon EtherMac inserted
-	insert	/etc/pccard_ether $device
-#	insert	/etc/pccard_ether $device link0
-	remove	logger -t pccard:$device -s Farallon EtherMac removed
-	remove	/sbin/ifconfig $device delete
-
-# Fujitsu MBH10302
-card "PCMCIA MBH10302" "01"
-	config	0x14 "fe0" ?
-	insert	logger -t pccard:$device -s Fujitsu MBH10302 inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Fujitsu MBH10302 removed
-	remove	/sbin/ifconfig $device delete
-
-# NextCom J Link NC5310
-card "NextComK.K." "NC5310 Ver1.0      "
-	config	0x14 "fe0" ?
-	insert	logger -t pccard:$device -s NextCom J Link NC5310 inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s NextCom J Link NC5310 removed
-	remove	/sbin/ifconfig $device delete
-
-# HITACHI HT-4840-11
-card "HITACHI" "HT-4840-11"
-	config	0x1a "fe0" ?
-	insert	logger -t pccard:$device -s HT-4840-11 inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s HT-4840-11 removed
+	remove	logger -t pccard:$device -s D-Link DFE-650 removed
 	remove	/sbin/ifconfig $device delete
 
 # Danpex (Alloy, etc.) EN-6200P2
@@ -258,13 +239,13 @@ card "DANPEX" "EN-6200P2"
 	remove	logger -t pccard:$device -s Danpex EN-6200P2 removed
 	remove	/sbin/ifconfig $device delete
 
-# Fujitsu MBH10303 Ethernet PCMCIA
-card "EAGLE Technology" "NE200 ETHERNET LAN MBH10303  "
-	config	0x1 "fe0" ?
-	insert	/etc/pccard_ether $device
-	insert	logger -t pccard:$device -s Fujitsu MBH10303 inserted
+# LinkSys ethernet card
+card "E-CARD" "E-CARD" 
+	config	0x20 "ed0" ? 
+	insert	logger -t pccard:$device -s "LinkSys card inserted" 
+	insert	/etc/pccard_ether $device 
+	remove	logger -t pccard:$device -s "LinkSys card removed" 
 	remove	/sbin/ifconfig $device delete
-	remove	logger -t pccard:$device -s Fujitsu MBH10303 removed
 
 # Compex Net-A adapter
 card "Ethernet" "Adapter"
@@ -292,62 +273,104 @@ card "Ethernet" "Adapter"
 	remove	logger -t pccard:$device -s Telecom SuperSocket RE450T removed
 	remove	/sbin/ifconfig $device delete
 
-# D-Link DE-660 NE2000 clone
-card "D-Link" "DE-660"
-	config	0x20 "ed0" ? 0x10
-	insert	logger -t pccard:$device -s D-Link DE-660 inserted
-	insert	/etc/pccard_ether $device link0 -link1
-	remove	logger -t pccard:$device -s D-Link DE-660 removed
+# Apollo PCMCIA Ethernet Adapter
+card "Ethernet" "Adapter"
+	config	0x0 "ed0" ?
+	insert	logger -t pccard:$device -s Apollo PCMCIA Ethernet Adapter inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Apollo PCMCIA Ethernet Adapter removed
 	remove	/sbin/ifconfig $device delete
 
-# D-Link DFE-650 NE2000 clone
-card "D-Link" "DFE-650"
-	config	0x20 "ed0" ? 0x10
-	insert	logger -t pccard:$device -s D-Link DFE-650 inserted
+# Planex FNW-3600-T 16bit FastEthernet
+card "Fast Ethernet" "Adapter"
+	config	0x7 "ed0" ?
+	iosize	32
+	insert	logger -t pccard:$device -s Planex FNW-3600-T inserted
 	insert	/etc/pccard_ether $device
-#	insert	/etc/pccard_ether $device link0 -link1
-	remove	logger -t pccard:$device -s D-Link DFE-650 removed
-	remove	/sbin/ifconfig $device delete
-
-# NDC Ethernet Instant-Link NE2000 clone
-card "NDC" "Ethernet"
-	config	0x22 "ed0" ? 0x10
-	insert	logger -t pccard:$device -s NDC Ethernet Instant-Link adapter inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s NDC Ethernet Instant-Link adapter removed
-	remove	/sbin/ifconfig $device delete
-
-# CyQ've ELA-010
-card "CyQ've" "ELA-010"
-	config	0x20 "ed0" ?
-	insert	logger -t pccard:$device -s CyQve ELA-010 inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s CyQve ELA-010 removed
-	remove	/sbin/ifconfig $device delete
-
-# Allied Telesis CentreCOM LA100-PCM-T V2
-card "Allied Telesis, K.K." "CentreCOM LA100-PCM-T V2 100/10M LAN PC Card"
-	config	auto "ed0" ?
-	insert	logger -t pccard:$device -s Allied Telesis LA100-PCM-T V2 inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Allied Telesis LA100-PCM-T V2 removed
+	remove	logger -t pccard:$device -s Planex FNW-3600-T removed
 	remove	/etc/pccard_ether_remove $device
 
-# Allied Telesis CentreCOM LA-PCM_V2 ethernet card
-# NTT-DATA ASTROWINK-M/MMOIL(IrLAN) ethernet card
-card "Allied Telesis, K.K." "CentreCOM LA-PCM_V2"
-	config	0x20 "ed0" ?
-	insert	logger -t pccard:$device -s CentreCOM LA-PCM V2 Ethernet card inserted
+# IBM PCMCIA Ethernet I/II
+card "IBM Corp." "Ethernet"
+	config	0x1 "ed0" ?
+	ether	0xff0
+	insert	logger -t pccard:$device -s IBM PCMCIA Ethernet inserted
 	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s CentreCOM LA-PCM V2 Ethernet card removed
+	remove	logger -t pccard:$device -s IBM PCMCIA Ethernet removed
 	remove	/sbin/ifconfig $device delete
 
-#  Intel EtherExpress PRO/100 Mobile Adapter (16-bit verison)
-card "Intel" "EtherExpress(TM) PRO/100 PC Card Mobile Adapter16"
-	config	0x1 "xe0" ?
-	insert	logger -t pccard:$device -s Intel EtherExpress PRO/100 Mobile Adapter/16 inserted
+#AR-P500 ethernet card
+card "IC-CARD" "IC-CARD"
+	config	0x20 "ed0" ?
+	insert	logger -t pccard:$device -s AR-P500 Ethernet card inserted
 	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Intel EtherExpress PRO/100 Mobile Adapter/16 removed
+	remove	logger -t pccard:$device -s AR-P500 Ethernet card removed
+	remove	ifconfig $device delete
+
+# IC-CARD+ Ethernet card
+card "IC-CARD+" "IC-CARD+"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s IC-CARD+ Ethernet card inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s IC-CARD+ Ethernet card removed
+	remove	ifconfig $device delete
+
+# I-O DATA PCLATE
+card "IO DATA" "PCLATE"
+	config	0x20 "ed0" ? 0x10
+	insert	logger -t pccard:$device -s IO DATA PCLATE inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s IO DATA PCLATE removed
+	remove	/sbin/ifconfig $device delete
+
+# I-O DATA PCETTX
+card "IO DATA" "PCETTX"
+	config	0x20 "ed0" ?
+	insert	logger -t pccard:$device -s IO DATA PCETTX inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s IO DATA PCETTX removed
+	remove	/sbin/ifconfig $device delete
+
+# Elecom Laneed LD-CDF
+card "Laneed" "LD-CDF"
+	config	0x20 "ed1" ?
+	insert	logger -t pccard:$device -s Elecom Laneed LD-CDF inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Elecom Laneed LD-CDF removed
+	remove	/sbin/ifconfig $device delete
+
+# Linksys Combo PCMCIA EthernetCard (model EC2T on box) 
+card "Linksys" "Combo PCMCIA EthernetCard (EC2T)"
+	config	0x1 "ed0" ? 
+	insert	logger -t pccard:$device -s Linksys Ethernet inserted 
+	insert	/etc/pccard_ether $device 
+	remove	logger -t pccard:$device -s Linksys Ethernet removed 
+	remove	/sbin/ifconfig $device delete 
+
+#Linksys EtherFast 10/100 PC Card (PCMPC100)
+card "Linksys" "EtherFast 10/100 PC Card (PCMPC100)"
+	config	0x3 "ed0" ?
+#	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s Linksys Fast 100-BaseT inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Linksys Fast 100-BaseT removed
+	remove	/sbin/ifconfig $device delete
+
+# Socket LP-E (WinCE Low Power Ethernet)
+card "Low Power Ethernet LAN Adapter" "Socket Communications, Inc"
+	config	0x20 "ed0" ?
+	insert	logger -t pccard:$device -s Socket LP-E inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Socket LP-E removed
+	remove	/etc/pccard_ether_remove $device
+
+# National Semiconductor InfoMover NE4100
+card "National Semiconductor" "InfoMover NE4100"
+	config	0x1 "ed0" ?
+	ether	0xff0
+	insert	logger -t pccard:$device -s National Semiconductor InfoMover NE4100 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s National Semiconductor InfoMover NE4100 removed
 	remove	/sbin/ifconfig $device delete
 
 # BayNetworks NETGEAR FA410TXC Fast Ethernet
@@ -366,6 +389,174 @@ card "Network Everywhere" "Ethernet 10BaseT PC Card"
 	remove	logger -t pccard:$device -s Network Everywhere Ethernet 10BaseT PC Card removed
 	remove	/sbin/ifconfig $device delete
 
+# NDC Ethernet Instant-Link NE2000 clone
+card "NDC" "Ethernet"
+	config	0x22 "ed0" ? 0x10
+	insert	logger -t pccard:$device -s NDC Ethernet Instant-Link adapter inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s NDC Ethernet Instant-Link adapter removed
+	remove	/sbin/ifconfig $device delete
+
+# Billionton 10Base-TX ETHERNET PCCARD (aka UE2216)
+card "PCMCIA" "PCMCIA-ETHERNET-CARD"
+	config	0x20 "ed0" ? 0x10
+	insert	logger -t pccard:$device -s UE2216 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s UE2216 removed
+	remove	/sbin/ifconfig $device delete
+
+# Melco LPC-T (PIO mode)
+card "PCMCIA" "UE2212"
+	config	0x1 "ed0" ? 0x10
+	ether	0xff0
+	insert	logger -t pccard:$device -s UE2212 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s UE2212 removed
+	remove	/sbin/ifconfig $device delete
+
+# LinkMates LM 336 LAN Fax/Modem PC Card
+card "PCMCIAs" "ComboCard"
+	config	0x24 "ed0" ? 0x10
+	insert	logger -t pccard:$device -s LinkMates LM 336 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s LinkMates LM 336 removed
+	remove	/sbin/ifconfig $device delete
+
+# Surecom EtherPerfect EP-427
+card "TAMARACK" "Ethernet"
+	config	0x21 "ed0" ?
+	insert	logger -t pccard:$device -s Surecom Ethernet card inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Surecom Ethernet card removed
+	remove	ifconfig $device delete
+
+########## ep ##########
+
+# 3Com Fast Etherlink 3C574TX
+card "3Com" "3C574-TX Fast EtherLink PC Card"
+	config	0x1 "ep0" ? 0x1
+	insert	logger -t pccard:$device -s 3Com Fast Etherlink 3C574TX inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s 3Com Fast Etherlink 3C574TX removed
+	remove	/sbin/ifconfig $device delete
+
+# 3Com Megahertz 574B
+card "3Com" "Megahertz 574B"
+	config	0x1 "ep0" ? 0x1
+	insert	logger -t pccard:$device -s 3Com Megahertz 574B inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s 3Com Megahertz 574B removed
+	remove	/sbin/ifconfig $device delete
+
+# 3Com Etherlink III 3CXE589ET
+card "3Com" "Megahertz 589E"
+	config	0x1 "ep0" ?
+	insert	logger -t pccard:$device -s 3Com 3C589E inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s 3Com 3C589E removed
+	remove	/sbin/ifconfig $device delete
+
+# 3Com OfficeConnect 3CXSH572BT
+card "3Com" "OfficeConnect 572B"
+	config	0x1 "ep0" ? 0x1
+	insert	logger -t pccard:$device -s 3Com 3CXSH572BT inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s 3Com 3CXSH572BT removed
+	remove	/sbin/ifconfig $device delete
+
+# 3Com Etherlink III 3C589B, 3C589C
+card "3Com Corporation" "3C589"
+	config	0x1 "ep0" ?
+#	config	auto "ep0" ?
+	insert	logger -t pccard:$device -s 3Com Etherlink III inserted
+	insert	/etc/pccard_ether $device -link0 link1
+#	insert	/etc/pccard_ether $device link0 -link1
+	remove	logger -t pccard:$device -s 3Com Etherlink III removed
+	remove	/sbin/ifconfig $device delete
+
+# 3Com Etherlink III 3C589D
+card "3Com Corporation" "3C589D"
+	config	0x1 "ep0" ?
+#	config	auto "ep0" ?
+	insert	logger -t pccard:$device -s 3Com Etherlink III inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s 3Com Etherlink III removed
+	remove	/sbin/ifconfig $device delete
+
+# Farallon EtherMac
+card "Farallon" "ENet"
+	config	0x1 "ep0" ?
+	insert	logger -t pccard:$device -s Farallon EtherMac inserted
+	insert	/etc/pccard_ether $device
+#	insert	/etc/pccard_ether $device link0
+	remove	logger -t pccard:$device -s Farallon EtherMac removed
+	remove	/sbin/ifconfig $device delete
+
+########## ex ##########
+
+# Olicom OC2220
+card "Olicom" "Ethernet"
+	config	0x1 "ex0" ?
+	insert	logger -t pccard:$device -s Olicom OC2220 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Olicom OC2220 removed
+	remove	/sbin/ifconfig $device delete
+
+########## fe ##########
+
+# Fujitsu MBH10303 Ethernet PCMCIA
+card "EAGLE Technology" "NE200 ETHERNET LAN MBH10303  "
+	config	0x1 "fe0" ?
+	insert	/etc/pccard_ether $device
+	insert	logger -t pccard:$device -s Fujitsu MBH10303 inserted
+	remove	/sbin/ifconfig $device delete
+	remove	logger -t pccard:$device -s Fujitsu MBH10303 removed
+
+# HITACHI HT-4840-11
+card "HITACHI" "HT-4840-11"
+	config	0x1a "fe0" ?
+	insert	logger -t pccard:$device -s HT-4840-11 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s HT-4840-11 removed
+	remove	/sbin/ifconfig $device delete
+
+# NextCom J Link NC5310
+card "NextComK.K." "NC5310 Ver1.0      "
+	config	0x14 "fe0" ?
+	insert	logger -t pccard:$device -s NextCom J Link NC5310 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s NextCom J Link NC5310 removed
+	remove	/sbin/ifconfig $device delete
+
+# Fujitsu MBH10302
+card "PCMCIA MBH10302" "01"
+	config	0x14 "fe0" ?
+	insert	logger -t pccard:$device -s Fujitsu MBH10302 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Fujitsu MBH10302 removed
+	remove	/sbin/ifconfig $device delete
+
+########## fdc ##########
+
+# Libretto Floppy disk
+card "Y-E DATA" "External FDD"
+	config	0x4 "fdc0" ?
+	insert	logger -t pccard:$device -s Libretto Floopy Disk inserted
+	remove	logger -t pccard:$device -s Libretto Floopy Disk removed
+
+########## sio ##########
+
+# 3Com/USR/MegaHertz 3CCM156
+card "3COM" "3CCM156"
+	config	0x23 "sio2" ?
+	insert	logger -t pccard:$device -s 3Com PCMCIA 56K modem inserted
+	remove	logger -t pccard:$device -s 3Com PCMCIA 56K modem removed
+
+# 3com/USR/Megahertz 3CCM556
+card "3Com" "3CXM/3CCM556"
+	config	0x23 "sio2" ?
+	insert	logger -t pccard:$device -s 3Com PCMCIA 56K Modem inserted
+	remove	logger -t pccard:$device -s 3Com PCMCIA 56K Modem removed
 
 # AIWA PV-JF288
 card "AIWA CO.,LTD." "PV-JF288  "
@@ -380,6 +571,73 @@ card "AD PC_CARD" "RC288ACL"
 	insert	logger -t pccard:$device -s Apex Data Mobile Plus 28.8 Modem inserted 
 	remove	logger -t pccard:$device -s Apex Data Mobile Plus 28.8 Modem removed 
 
+# Eiger 33.6 modem
+card "AT&T" "V34+ Fax Modem"
+	config	0x23 "sio1" ?
+	insert	logger -t pccard:$device -s Eiger 33.6K modem inserted
+	remove	logger -t pccard:$device -s Eiger 33.6K modem removed
+
+# AT&T Paradyne KeepInTouch 14.4 modem
+card "AT&T Paradyne" "KeepInTouch Card"
+	config	0x23 "sio3" ?
+	reset	1000
+	insert	logger -t pccard:$device -s ATT Paradyne 14.4 inserted
+	remove	logger -t pccard:$device -s ATT Paradyne 14.4 removed
+
+# BUG Linkboy D64K (ISDN)
+card "BUG Inc." "Linkboy D64K"
+	config	0x23 "sio2" ?
+	insert	logger -t pccard:$device -s BUG Linkboy D64K inserted
+	remove	logger -t pccard:$device -s BUG Linkboy D64K removed
+
+# NewMedia 14.4K FAX/Data Modem
+card "CIRRUS LOGIC" "FAX MODEM"
+	config	0x23 "sio2" ?
+	insert	logger -t pccard:$device -s Newmedia 14.4 Modem inserted
+	remove	logger -t pccard:$device -s Newmedia 14.4 Modem removed
+
+# COM1 SA
+card "COM1 SA" "MC220 CARD"
+	config	0x3 "sio2" ?
+	insert	logger -t pccard:$device -s COM1 SA MC220 CARD Modem inserted
+	remove	logger -t pccard:$device -s COM1 SA MC220 CARD Modem removed
+	insert	logger -t pccard:$device -s Melco Airconnect inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Melco Airconnect removed
+	remove	/sbin/ifconfig $device delete
+
+# GATEWAY 2000 FAX/Data Modem (14.4K)
+card "GATEWAY2000" "CC3144"
+	config	0x22 "sio3" ?
+	insert	logger -t pccard:$device -s GATEWAY2000 FAX/Data Modem inserted
+	remove	logger -t pccard:$device -s GATEWAY2000 FAX/Data Modem removed
+
+# This one does work though
+card "HAYES" "OPT288"
+	config	0x23 "sio3" ?
+	insert	logger -t pccard:$device -s Hayes Optima 28.8k inserted
+	remove	logger -t pccard:$device -s Hayes Optima 28.8k removed
+
+# Hayes OPTIMA 288 FAX/Data Modem
+# currently does not work on my machine
+card "Hayes" "OPTIMA 288 + FAX fo"
+	config	0x24 "sio2" ?
+	reset	10000
+	insert	logger -t pccard:$device -s Optima 288 inserted
+	remove	logger -t pccard:$device -s Optima 288 removed
+
+# IBM Push/Pop Modem (14.4K)
+card "IBM" "Push/Pop Modem(14.4K)"
+	config	0x22 "sio2" ?
+	insert	logger -t pccard:$device -s IBM Push/Pop Modem inserted
+	remove	logger -t pccard:$device -s IBM Push/Pop Modem removed
+
+# Megahertz XJEM1336 (as modem)
+card "MEGAHERTZ" "CC/XJEM3336"
+	config	auto "sio2" ?
+	insert	logger -t pccard:$device -s Megahertz CC/XJEM3336 inserted
+	remove	logger -t pccard:$device -s Megahertz CC/XJEM3336 removed
+
 # Megahertz XJ1144
 card "MEGAHERTZ" "XJ1144"
 	config	0x23 "sio2" ?
@@ -424,17 +682,49 @@ card "Megahertz" "XJ4336-CC4336"
 	insert	logger -t pccard:$device -s Megahertz XJ4336 inserted
 	remove	logger -t pccard:$device -s Megahertz XJ4336 removed
 
-# Megahertz XJEM1336 (as modem)
-card "MEGAHERTZ" "CC/XJEM3336"
-	config	auto "sio2" ?
-	insert	logger -t pccard:$device -s Megahertz CC/XJEM3336 inserted
-	remove	logger -t pccard:$device -s Megahertz CC/XJEM3336 removed
+# Motorola Montana 
+card "Motorola" "MONTANA 33.6 FAX/MODEM"
+	config	0x21 "sio1" ?
+	insert	echo Motorola Montana 33.6K FAX/modem inserted
+	remove	echo Motorola Montana 33.6K FAX/modem removed
 
-# Megahertz XJ1336
-card "U.S. Robotics" "XJ/CC1336"
-	config	0x21 "sio2" ?
-	insert	logger -t pccard:$device -s U.S. Robotics XJ/CC1336 inserted
-	remove	logger -t pccard:$device -s U.S. Robotics XJ/CC1336 removed
+# NTT ThunderCard Modem
+card "NTT-IT CO., LTD" "ThunderCard AVF288, V.34"
+	config	0x22 "sio2" ?
+	insert	logger -t pccard:$device -s NTT ThunderCard inserted
+	remove	logger -t pccard:$device -s NTT ThunderCard removed
+
+# NTT DoCoMo Mobile D Card 96P1
+card "NTT DoCoMo" "Mobile D Card 96P1"
+#	config	0x22 "sio2" ? 0x82
+	config	0x23 "sio3" ? 0x82
+#	config	auto "sio3" ? 0x82
+	insert	logger -t pccard:$device -s NTT DoCoMo Mobile D Card 96P1 inserted
+	remove	logger -t pccard:$device -s NTT DoCoMo Mobile D Card 96P1 removed
+
+# NTT DoCoMo DATA/FAX Adapter
+card "NTT DoCoMo" "PCMCIA DATA/FAX ADAPTER 9600"
+	config	0x22 "sio3" ? 0x82
+	insert	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter inserted
+	remove	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter removed
+
+# NTT DoCoMo DATA/FAX Adapter
+card "NTT DoCoMo" "PCMCIA DATA/FAX ADAPTER 9600 Mark2"
+	config	auto "sio3" ?
+	insert	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter inserted
+	remove	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter removed
+
+# NTT DoCoMo (formerly NTT Personal) FAX/Data 32K PHS Card Paldio 321S
+card "NTT Personal" "32K Paldio 321S PC CARD"
+	config	0x23 "sio2" ?
+	insert	logger -t pccard:$device -s NTT Personal Paldio 321S PC Card inserted
+	remove	logger -t pccard:$device -s NTT Personal Paldio 321S PC Card removed
+
+# NTT DoCoMo (formerly NTT Personal) FAX/Data 32K PHS Card Paldio 341S
+card "NTT Personal" "32K Paldio 341S PC CARD"
+	config	0x23 "sio2" ?
+	insert	logger -t pccard:$device -s NTT Personal 32K Paldio 341S PC Card inserted
+	remove	logger -t pccard:$device -s NTT Personal 32K Paldio 341S PC Card removed
 
 # Nokia Cellular Data Card
 card "Nokia Mobile Phones" "DTP-2"
@@ -452,23 +742,68 @@ card "Nokia Mobile Phones" "DTP-2 ver II"
 	insert	logger -t pccard:$device -s Nokia Mobile Phones DTP-2 ver II inserted
 	remove	logger -t pccard:$device -s Nokia Mobile Phones DTP-2 ver II removed
 
+# Novalink NovaModem 144
+card "NovaLink Tech." "NovaModem 144   "
+	config	0x23 "sio2" ?
+	insert	logger -t pccard:$device -s NovaModem 144 Modem inserted
+	remove	logger -t pccard:$device -s NovaModem 144 Modem removed
+
 # Omron ME2814 FAX/DATA MODEM
 card "OMRON" "ME2814 FAX/DATA MOD"
 	config	0x23 "sio2" ?
 	insert	logger -t pccard:$device -s OMRON ME2814 Modem inserted
 	remove	logger -t pccard:$device -s OMRON ME2814 Modem removed
 
-# TDK 14.4 FAX/Data Modem
-card "TDK" "DF1414 DATA/FAX MOD"
+# Omron MD24XCA FAX/Data Modem
+card "OMRON Corp." "MD24XCA"
 	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s TDK DF1414 inserted
-	remove	logger -t pccard:$device -s TDK DF1414 removed
+	reset	10000
+	insert	logger -t pccard:$device -s OMRON MD24XCA Modem inserted
+	remove	logger -t pccard:$device -s OMRON MD24XCA Modem removed
 
-# TDK 14.4 FAX/Data Modem
-card "TDK" "DF1414EX DATA/FAX M"
+# Option International PCMCIA55K06
+card "Option International" "GSM Data/Fax/SMS Modem"
+	config	0x22 "sio2" ?
+	insert	logger -t pccard:$device -s Option 55K06 Modem inserted
+	remove	logger -t pccard:$device -s Option 55K06 Modem removed
+
+# Banksia CardModem 56
+card "PCCardModem" "CardModem 56"
+	config	0x22 "sio3" ?
+	insert	logger -t pccard:$device -s Banksia CardModem 56 inserted
+	remove	logger -t pccard:$device -s Banksia CardModem 56 removed
+
+# Eiger PCCARD modem 
+# Apparently this modem does not work unless the recommended
+# init string (AT&F&C1&D2) is supplied.
+card "PCMCIA  " "33.6K Fax/Modem  "
+	config	23 "sio2" ?
+	insert	logger -t pccard:$device -s Eiger 33.6K modem inserted
+	remove	logger -t pccard:$device -s Eiger 33.6K modem removed
+
+# Actiontec Datalink with v.90 upgrade
+card "PCMCIA  " "56K V.90 Fax Modem (LK)  "
+	config	0x1f "sio2" ?
+	insert	logger -t pccard:$device -s "Actiontec Datalink modem card inserted"
+	remove	logger -t pccard:$device -s "Actiontec Datalink modem card removed"
+
+# PREMAX FM288 FAX/Data Modem
+card "PREMAX" "FM288 "
 	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s TDK DF1414 inserted
-	remove	logger -t pccard:$device -s TDK DF1414 removed
+	insert	logger -t pccard:$device -s PREMAX FM288 Modem inserted
+	remove	logger -t pccard:$device -s PREMAX FM288 Modem removed
+
+# Panasonic FM-RADIO card
+card "Panasonic" "CF-JVR101"
+	config	0x22 "sio3" ?
+	insert	logger -t pccard:$device -s Panasonic FM radio card inserted
+	remove	logger -t pccard:$device -s Panasonic FM radio card removed
+
+# Panasonic KX-PH402D
+card "Panasonic" "KX-PH402D"
+	config	0x23 "sio4" ?
+	insert	logger -t pccard:$device -s Panasonic KX-PH402D inserted
+	remove	logger -t pccard:$device -s Panasonic KX-PH402D removed
 
 # Panasonic Modem Card TO-706C
 card "Panasonic" "TO-706C"
@@ -482,50 +817,41 @@ card "Panasonic" "TO-CAF288"
 	insert	logger -t pccard:$device -s Panasonic TO-CAF288 inserted
 	remove	logger -t pccard:$device -s Panasonic TO-CAF288 removed
 
-# NewMedia 14.4K FAX/Data Modem
-card "CIRRUS LOGIC" "FAX MODEM"
+# Random modem bundled with Dell systems
+card "Psion Dacom" "Gold Card Global 56K+Fax"
 	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s Newmedia 14.4 Modem inserted
-	remove	logger -t pccard:$device -s Newmedia 14.4 Modem removed
+	insert	logger -t pccard:$device -s "Psion Dacom modem card inserted"
+	remove	logger -t pccard:$device -s "Psion Dacom modem card removed"
 
-# Omron MD24XCA FAX/Data Modem
-#card "OMRON Corp." "MD24XCA"
-#	config	0x23 "sio2" ?
-#	reset	10000
-#	insert	logger -t pccard:$device -s OMRON MD24XCA Modem inserted
-#	remove	logger -t pccard:$device -s OMRON MD24XCA Modem removed
-
-# Hayes OPTIMA 288 FAX/Data Modem
-# currently does not work on my machine
-card "Hayes" "OPTIMA 288 + FAX fo"
-	config	0x24 "sio2" ?
-	reset	10000
-	insert	logger -t pccard:$device -s Optima 288 inserted
-	remove	logger -t pccard:$device -s Optima 288 removed
-
-# This one does work though
-card "HAYES" "OPT288"
-	config	0x23 "sio3" ?
-	insert	logger -t pccard:$device -s Hayes Optima 28.8k inserted
-	remove	logger -t pccard:$device -s Hayes Optima 28.8k removed
-
-# PREMAX FM288 FAX/Data Modem
-card "PREMAX" "FM288 "
+# TDK 14.4 FAX/Data Modem
+card "TDK" "DF1414 DATA/FAX MOD"
 	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s PREMAX FM288 Modem inserted
-	remove	logger -t pccard:$device -s PREMAX FM288 Modem removed
+	insert	logger -t pccard:$device -s TDK DF1414 inserted
+	remove	logger -t pccard:$device -s TDK DF1414 removed
 
-# Novalink NovaModem 144
-card "NovaLink Tech." "NovaModem 144   "
+# TDK 14.4 FAX/Data Modem
+card "TDK" "DF1414EX DATA/FAX M"
 	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s NovaModem 144 Modem inserted
-	remove	logger -t pccard:$device -s NovaModem 144 Modem removed
+	insert	logger -t pccard:$device -s TDK DF1414 inserted
+	remove	logger -t pccard:$device -s TDK DF1414 removed
 
-# Option International PCMCIA55K06
-card "Option International" "GSM Data/Fax/SMS Modem"
+# 3Com/NoteWorthy 56K modem (bundled with Toshiba notebooks)
+card "Toshiba America" "3CXM056-BNW"
+	config	0x20 "sio1" ?
+	insert	logger -t pccard:$device -s NoteWorthy 56K PCMCIA Modem inserted
+	remove	logger -t pccard:$device -s NoteWorthy 56K PCMCIA Modem removed
+
+# U.S. Robotics XJ1560J
+card "U.S. Robotics" "XJ/CC1560J"
 	config	0x22 "sio2" ?
-	insert	logger -t pccard:$device -s Option 55K06 Modem inserted
-	remove	logger -t pccard:$device -s Option 55K06 Modem removed
+	insert	logger -t pccard:$device -s U.S. Robotics XJ1560J inserted
+	remove	logger -t pccard:$device -s U.S. Robotics XJ1560J removed
+
+# Megahertz XJ1336
+card "U.S. Robotics" "XJ/CC1336"
+	config	0x21 "sio2" ?
+	insert	logger -t pccard:$device -s U.S. Robotics XJ/CC1336 inserted
+	remove	logger -t pccard:$device -s U.S. Robotics XJ/CC1336 removed
 
 # US Robotics Sportster PCMCIA V.34
 # US Robotics COURIER PCMCIA V.34
@@ -534,12 +860,11 @@ card "USRobotics" "PCMCIA 28800 Data/F"
 	insert	logger -t pccard:$device -s USRobotics PCMCIA Modem inserted
 	remove	logger -t pccard:$device -s USRobotics PCMCIA Modem removed
 
-# Xircom CreditCard Modem
-card "Xircom" "CreditCard Modem CM-56T"
-	config	0x17 "sio1" ?
-	reset	100
-	insert	logger -t pccard:$device -s Xircom CreditCard Modem CM-56T inserted
-	remove	logger -t pccard:$device -s Xircom CreditCard Modem CM-56T removed
+# Viking V.90/K56Flex modem
+card "Viking" "V.90 K56flex"
+	config	0x23 "sio3" ?
+	insert	logger -t pccard:$device -s Viking 56K Modem inserted
+	remove	logger -t pccard:$device -s Viking 56K Modem removed
 
 # Xircom CreditCard Ethernet+Modem (Modem only !!!)
 card "Xircom" "CreditCard Ethernet"
@@ -553,215 +878,18 @@ card "Xircom" "CreditCard Ethernet+Modem 33.6"
 	insert	logger -t pccard:$device -s Xircom CreditCard Modem inserted
 	remove	logger -t pccard:$device -s Xircom CreditCard Modem removed
 
-# Xircom CreditCard Ethernet 10/100 + modem (Ethernet part)
-card "Xircom" "CreditCard Ethernet 10/100 + Modem 56"
-	config	0x1 "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
-	remove	/sbin/ifconfig $device delete
-
-# Xircom CreditCard Ethernet 10/100
-card "Xircom" "CreditCard 10/100"
-	config	0x1 "xe0" ?
-	insert	logger -t pccard:$device -s Xircom CreditCard Ethernet inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Xircom CreditCard Ethernet removed
-	remove	/etc/pccard_ether $device delete
-
 # Xircom GlobalACCESS modem
 card "Xircom" "CreditCard Modem 56 - GlobalA"
 	config	0x1f "sio2" ?
 	insert	logger -t pccard:$device -s Xircom CreditCard Modem 56 - GlobalACCESS inserted
 	remove	logger -t pccard:$device -s Xircom CreditCard Modem 56 - GlobalACCESS removed
 
-# Xircom Realport card + modem
-card "Xircom" "16-bit Ethernet + Modem 56"
-	config	0x27 "xe0" 9
-	insert	logger -t pccard:$device -s Xircom Realport Ethernet inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Xircom Realport Ethernet removed
-	remove	/etc/pccard_ether $device delete
-
-# GATEWAY 2000 FAX/Data Modem (14.4K)
-card "GATEWAY2000" "CC3144"
-	config	0x22 "sio3" ?
-	insert	logger -t pccard:$device -s GATEWAY2000 FAX/Data Modem inserted
-	remove	logger -t pccard:$device -s GATEWAY2000 FAX/Data Modem removed
-
-# IBM Push/Pop Modem (14.4K)
-card "IBM" "Push/Pop Modem(14.4K)"
-	config	0x22 "sio2" ?
-	insert	logger -t pccard:$device -s IBM Push/Pop Modem inserted
-	remove	logger -t pccard:$device -s IBM Push/Pop Modem removed
-
-# Eiger PCCARD modem 
-# Apparently this modem does not work unless the recommended
-# init string (AT&F&C1&D2) is supplied.
-card "PCMCIA  " "33.6K Fax/Modem  "
-	config	23 "sio2" ?
-	insert	logger -t pccard:$device -s Eiger 33.6K modem inserted
-	remove	logger -t pccard:$device -s Eiger 33.6K modem removed
-
-# NTT ThunderCard Modem
-card "NTT-IT CO., LTD" "ThunderCard AVF288, V.34"
-	config	0x22 "sio2" ?
-	insert	logger -t pccard:$device -s NTT ThunderCard inserted
-	remove	logger -t pccard:$device -s NTT ThunderCard removed
-
-# U.S. Robotics XJ1560J
-card "U.S. Robotics" "XJ/CC1560J"
-	config	0x22 "sio2" ?
-	insert	logger -t pccard:$device -s U.S. Robotics XJ1560J inserted
-	remove	logger -t pccard:$device -s U.S. Robotics XJ1560J removed
-
-# 3com/USR/Megahertz 3CCM556
-card "3Com" "3CXM/3CCM556"
-	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s 3Com PCMCIA 56K Modem inserted
-	remove	logger -t pccard:$device -s 3Com PCMCIA 56K Modem removed
-
-# 3Com/NoteWorthy 56K modem (bundled with Toshiba notebooks)
-card "Toshiba America" "3CXM056-BNW"
-	config	0x20 "sio1" ?
-	insert	logger -t pccard:$device -s NoteWorthy 56K PCMCIA Modem inserted
-	remove	logger -t pccard:$device -s NoteWorthy 56K PCMCIA Modem removed
-
-# BUG Linkboy D64K (ISDN)
-card "BUG Inc." "Linkboy D64K"
-	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s BUG Linkboy D64K inserted
-	remove	logger -t pccard:$device -s BUG Linkboy D64K removed
-
-# NTT DoCoMo DATA/FAX Adapter
-card "NTT DoCoMo" "PCMCIA DATA/FAX ADAPTER 9600"
-	config	0x22 "sio3" ? 0x82
-	insert	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter inserted
-	remove	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter removed
-
-# NTT DoCoMo DATA/FAX Adapter
-card "NTT DoCoMo" "PCMCIA DATA/FAX ADAPTER 9600 Mark2"
-	config	auto "sio3" ?
-	insert	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter inserted
-	remove	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter removed
-
-# NTT DoCoMo Mobile D Card 96P1
-card "NTT DoCoMo" "Mobile D Card 96P1"
-#	config	0x22 "sio2" ? 0x82
-	config	0x23 "sio3" ? 0x82
-#	config	auto "sio3" ? 0x82
-	insert	logger -t pccard:$device -s NTT DoCoMo Mobile D Card 96P1 inserted
-	remove	logger -t pccard:$device -s NTT DoCoMo Mobile D Card 96P1 removed
-
-# Random modem bundled with Dell systems
-card "Psion Dacom" "Gold Card Global 56K+Fax"
-	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s "Psion Dacom modem card inserted"
-	remove	logger -t pccard:$device -s "Psion Dacom modem card removed"
-
-# Actiontec Datalink with v.90 upgrade
-card "PCMCIA  " "56K V.90 Fax Modem (LK)  "
-	config	0x1f "sio2" ?
-	insert	logger -t pccard:$device -s "Actiontec Datalink modem card inserted"
-	remove	logger -t pccard:$device -s "Actiontec Datalink modem card removed"
-
-# Panasonic FM-RADIO card
-#card "Panasonic" "CF-JVR101"
-#	config	0x22 "sio3" ?
-#	insert	logger -t pccard:$device -s Panasonic FM radio card inserted
-#	remove	logger -t pccard:$device -s Panasonic FM radio card removed
-
-# IO Data CBIDE (bundled with CDP-FX24, etc.)
-card "WIT" "IDE16"
-	config	auto "ata0" ?
-	insert	logger -t pccard:$device -s IO Data CBIDE inserted
-	remove	logger -t pccard:$device -s IO Data CBIDE removed
-
-# IBM Flash ATA (Ricoh Flash ATA 10MB)
-card "IBM" "IBM17JSSFP10"
-	config	auto "ata0" ? iosize 16
-	insert	logger -t pccard:$device -s IBM Flash ATA inserted
-	remove	logger -t pccard:$device -s IBM flash ATA removed
-
-# Non-brand Compact Flash Card(32MB)
-card "       " "KCF 32M"
-	config	0x1 "ata2" ? iosize 16
-	insert	logger -t pccard:$device -s Compact Flash Card 32MB inserted
-	remove	logger -t pccard:$device -s Compact Flash Card 32MB removed
-
-# SunDisk Flash ATA
-# (OEM: Epson Flash Packer)
-card "SunDisk" "SDP5"
-	config	0x1 "ata2" ?
-	insert	logger -t pccard:$device -s Sundisk Flash ATA inserted
-	remove	logger -t pccard:$device -s Sundisk Flash ATA removed
-
-card "SunDisk" "SDP"
-	config	0x1 "ata2" ?
-	insert	logger -t pccard:$device -s SunDisk Flash ATA Inserted
-	remove	logger -t pccard:$device -s SunDisk Flash ATA removed
-
-# Midori Elec Fast Flash
-card "Midori Elec." "FAST FLASH"
-	config	0x3  "ata2" ?
-	insert	logger -t pccard:$device -s Midori Elec Fast FLASH inserted
-	remove	logger -t pccard:$device -s Midori Elec Fast FLASH removed
-
-# Simple Technology ata flash
-card "Simple Technology        " "STI-ATA"
-	config	0x2 "ata2" ?
-	insert	logger -t pccard:$device -s Simple Technology ata FLASH inserted
-	remove	logger -t pccard:$device -s Simple Technology ata FLASH removed
-	
-# Viking ATA Flash card
-card "VIKING ATA/CF FLASH CARD " "TOR/AM "
-	config	0x2 "ata2" ?
-	insert	logger -t pccard:$device -s Simple Technology ata FLASH inserted
-	remove	logger -t pccard:$device -s Simple Technology ata FLASH removed
-	
-# Maxtor 131MB Type III HDD
-card "Maxtor" "MXL131"
-	config	0x03 "ata2" ?
-	insert	logger -t pccard:$device -s Maxtor 131MB HDD inserted
-	remove	logger -t pccard:$device -s Maxtor 131MB HDD removed
-
-# SiliconTech, Inc flash card
-card "SiliconTech,Inc" "16MB Compact PC Card"
-	config	0x1 "ata2" ?
-	insert	logger -t pccard:$device -s SiliconTech Flash ATA inserted
-	remove	logger -t pccard:$device -s SiliconTech Flash ATA removed
-
-# 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
-
-# REX5535AC, REX5535X SCSI
-#card "PCMCIA SCSI MBH1040" "01"
-#	config	0x3a "spc0" ?
-#	insert	logger -t pccard:$device -s REX-5535 SCSI card inserted
-#	remove	logger -t pccard:$device -s REX-5535 SCSI card removed
-
-# Libretto Floppy disk
-card "Y-E DATA" "External FDD"
-	config	0x4 "fdc0" ?
-	insert	logger -t pccard:$device -s Libretto Floopy Disk inserted
-	remove	logger -t pccard:$device -s Libretto Floopy Disk removed
-
-# Viking V.90/K56Flex modem
-card "Viking" "V.90 K56flex"
-	config	0x23 "sio3" ?
-	insert	logger -t pccard:$device -s Viking 56K Modem inserted
-	remove	logger -t pccard:$device -s Viking 56K Modem removed
+# Xircom CreditCard Modem
+card "Xircom" "CreditCard Modem CM-56T"
+	config	0x17 "sio1" ?
+	reset	100
+	insert	logger -t pccard:$device -s Xircom CreditCard Modem CM-56T inserted
+	remove	logger -t pccard:$device -s Xircom CreditCard Modem CM-56T removed
 
 # Zoom 56K modem 
 # Freezes your system entirely if you don't have the reset..
@@ -771,101 +899,7 @@ card "Zoom Telephonics, Inc." "PCMCIA 56K LT DataFax"
 	insert	logger -t pccard:$device -s Zoom modem inserted
 	remove	logger -t pccard:$device -s Zoom modem removed
 
-# 3Com Megahertz 3CCE589E* 10 Mbps LAN PC Card
-card "3Com" "Megahertz 589E"
-	config	0x1 "ep0" ?
-#	config	auto "ep0" ?
-	insert	logger -t pccard:$device -s 3Com Megahertz Ethernet card inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s 3Com Megahertz Ethernet card removed
-	remove	/sbin/ifconfig $device delete
-
-#AR-P500 ethernet card
-card "IC-CARD" "IC-CARD"
-	config	0x20 "ed0" ?
-	insert	logger -t pccard:$device -s AR-P500 Ethernet card inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s AR-P500 Ethernet card removed
-	remove	ifconfig $device delete
-
-# 3Com/USR/MegaHertz 3CCM156
-card "3COM" "3CCM156"
-	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s 3Com PCMCIA 56K modem inserted
-	remove	logger -t pccard:$device -s 3Com PCMCIA 56K modem removed
-
-#Eiger 33.6 modem
-card "AT&T" "V34+ Fax Modem"
-	config	0x23 "sio1" ?
-	insert	logger -t pccard:$device -s Eiger 33.6K modem inserted
-	remove	logger -t pccard:$device -s Eiger 33.6K modem removed
-
-# Motorola Montana 
-card "Motorola" "MONTANA 33.6 FAX/MODEM"
-	config	0x21 "sio1" ?
-	insert	echo Motorola Montana 33.6K FAX/modem inserted
-	remove	echo Motorola Montana 33.6K FAX/modem removed
-
-# AT&T Paradyne KeepInTouch 14.4 modem
-card "AT&T Paradyne" "KeepInTouch Card"
-	config	0x23 "sio3" ?
-	reset	1000
-	insert	logger -t pccard:$device -s ATT Paradyne 14.4 inserted
-	remove	logger -t pccard:$device -s ATT Paradyne 14.4 removed
-
-# AmbiCom 10BaseT card
-card "AmbiCom Inc" "AMB8002T"
-	config	0x20 "ed0" ?
-	insert	logger -t pccard:$device -s AmbiCom 8002T inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s AmbiCom 8002T removed
-	remove	/sbin/ifconfig $device delete
-
-# 3Com OfficeConnect 3CXSH572BT
-#This had auto, so the config slot might be wrong.  Replace it by the
-#one that pccardc dumpcis tells you is default.
-#
-card "3Com" "OfficeConnect 572B"
-	config	0x1 "ep0" ? 0x1
-	insert	logger -t pccard:$device -s 3Com 3CXSH572BT inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s 3Com 3CXSH572BT removed
-	remove	/sbin/ifconfig $device delete
-
-# Elecom Laneed LD-CDF
-card "Laneed" "LD-CDF"
-	config	0x20 "ed1" ?
-	insert	logger -t pccard:$device -s Elecom Laneed LD-CDF inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Elecom Laneed LD-CDF removed
-	remove	/sbin/ifconfig $device delete
-
-# NTT DoCoMo (formerly NTT Personal) FAX/Data 32K PHS Card Paldio 321S
-card "NTT Personal" "32K Paldio 321S PC CARD"
-	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s NTT Personal Paldio 321S PC Card inserted
-	remove	logger -t pccard:$device -s NTT Personal Paldio 321S PC Card removed
-
-# NTT DoCoMo (formerly NTT Personal) FAX/Data 32K PHS Card Paldio 341S
-card "NTT Personal" "32K Paldio 341S PC CARD"
-	config	0x23 "sio2" ?
-	insert	logger -t pccard:$device -s NTT Personal 32K Paldio 341S PC Card inserted
-	remove	logger -t pccard:$device -s NTT Personal 32K Paldio 341S PC Card removed
-
-# Allied Telesis Ethernet Card inserted
-card "Allied Telesis,K.K" "Ethernet LAN Card"
-	config	0x1 "ed1" ? 0x10
-	ether	0xff0
-	insert	logger -t pccard:$device -s Allied Telesis Ethernet Card inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Allied Telesis Ethernet Card removed
-	remove	/sbin/ifconfig $device delete
-
-# Panasonic KX-PH402D
-card "Panasonic" "KX-PH402D"
-	config	0x23 "sio4" ?
-	insert	logger -t pccard:$device -s Panasonic KX-PH402D inserted
-	remove	logger -t pccard:$device -s Panasonic KX-PH402D removed
+########## sn ##########
 
 # Megahertz X-Jack Ethernet
 card "Megahertz" "CC10BT/2"
@@ -876,88 +910,75 @@ card "Megahertz" "CC10BT/2"
 	remove	logger -t pccard:$device -s Megahertz X-Jack Ethernet removed
 	remove	/etc/pccard_ether_remove $device
 
-# Surecom EtherPerfect EP-427
-card "TAMARACK" "Ethernet"
-	config	0x21 "ed0" ?
-	insert	logger -t pccard:$device -s Surecom Ethernet card inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Surecom Ethernet card removed
-	remove	ifconfig $device delete
+########## spc ##########
 
-# COREGA Ether PCC-T
-card "corega K.K." "corega Ether PCC-T"
-	config	0x20 "ed0" ?
-#	config	auto "ed0" ?
-	insert	logger -t pccard:$device -s Ether PCC-T inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Ether PCC-T removed
-	remove	/etc/pccard_ether_remove $device
+# REX5535AC, REX5535X SCSI
+card "PCMCIA SCSI MBH1040" "01"
+	config	0x3a "spc0" ?
+	insert	logger -t pccard:$device -s REX-5535 SCSI card inserted
+	remove	logger -t pccard:$device -s REX-5535 SCSI card removed
 
-# Planex FNW-3600-T 16bit FastEthernet
-card "Fast Ethernet" "Adapter"
-	config	0x7 "ed0" ?
-	iosize	32
-	insert	logger -t pccard:$device -s Planex FNW-3600-T inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Planex FNW-3600-T removed
-	remove	/etc/pccard_ether_remove $device
+########## wi ##########
 
-# IC-CARD+ Ethernet card
-card "IC-CARD+" "IC-CARD+"
-	config	auto "ed0" ?
-	insert	logger -t pccard:$device -s IC-CARD+ Ethernet card inserted
+# Cabletron RoamAbout, WaveLAN/IEEE clone
+card "Cabletron" "RoamAbout 802.11 DS"
+	config	0x1 "wi0" ?
+	insert	logger -t pccard:$device -s WaveLAN/IEEE inserted
 	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s IC-CARD+ Ethernet card removed
-	remove	ifconfig $device delete
-
-# Banksia CardModem 56
-card "PCCardModem" "CardModem 56"
-	config	0x22 "sio3" ?
-	insert	logger -t pccard:$device -s Banksia CardModem 56 inserted
-	remove	logger -t pccard:$device -s Banksia CardModem 56 removed
-
-# Apollo PCMCIA Ethernet Adapter
-card "Ethernet" "Adapter"
-	config	0x0 "ed0" ?
-	insert	logger -t pccard:$device -s Apollo PCMCIA Ethernet Adapter inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Apollo PCMCIA Ethernet Adapter removed
+	remove	logger -t pccard:$device -s WaveLAN/IEEE removed
 	remove	/sbin/ifconfig $device delete
 
-# Olicom OC2220
-card "Olicom" "Ethernet"
-	config	0x1 "ex0" ?
-	insert	logger -t pccard:$device -s Olicom OC2220 inserted
+# Lucent WaveLAN/IEEE
+card "Lucent Technologies" "WaveLAN/IEEE"
+	config	0x1 "wi0" ?
+	insert	logger -t pccard:$device -s WaveLAN/IEEE inserted
 	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Olicom OC2220 removed
+	remove	logger -t pccard:$device -s WaveLAN/IEEE removed
 	remove	/sbin/ifconfig $device delete
 
-# National Semiconductor InfoMover NE4100
-card "National Semiconductor" "InfoMover NE4100"
-	config	0x1 "ed0" ?
-	ether	0xff0
-	insert	logger -t pccard:$device -s National Semiconductor InfoMover NE4100 inserted
+# NCR WaveLAN/IEEE
+card "NCR" "WaveLAN/IEEE"
+	config	0x1 "wi0" ?
+#	config	auto "wi0" ?
+	insert	logger -t pccard:$device -s WaveLAN/IEEE inserted
 	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s National Semiconductor InfoMover NE4100 removed
-	remove	/sbin/ifconfig $device delete
-
-card "IO DATA" "PCETTX"
-	config	0x20 "ed0" ?
-	insert	logger -t pccard:$device -s IO DATA PCETTX inserted
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s IO DATA PCETTX removed
+	remove	logger -t pccard:$device -s WaveLAN/IEEE removed
 	remove	/sbin/ifconfig $device delete
 
 # Melco Airconnect
 card "MELCO" "WLI-PCM-L11"
 	config	0x1 "wi0" ?
 
-# COM1 SA
-card "COM1 SA" "MC220 CARD"
-	config	0x3 "sio2" ?
-	insert	logger -t pccard:$device -s COM1 SA MC220 CARD Modem inserted
-	remove	logger -t pccard:$device -s COM1 SA MC220 CARD Modem removed
-	insert	logger -t pccard:$device -s Melco Airconnect inserted
+########## xe ##########
+
+#  Intel EtherExpress PRO/100 Mobile Adapter (16-bit verison)
+card "Intel" "EtherExpress(TM) PRO/100 PC Card Mobile Adapter16"
+	config	0x1 "xe0" ?
+	insert	logger -t pccard:$device -s Intel EtherExpress PRO/100 Mobile Adapter/16 inserted
 	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Melco Airconnect removed
+	remove	logger -t pccard:$device -s Intel EtherExpress PRO/100 Mobile Adapter/16 removed
+	remove	/sbin/ifconfig $device delete
+
+# Xircom Realport card + modem
+card "Xircom" "16-bit Ethernet + Modem 56"
+	config	0x27 "xe0" 9
+	insert	logger -t pccard:$device -s Xircom Realport Ethernet inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Xircom Realport Ethernet removed
+	remove	/etc/pccard_ether $device delete
+
+# Xircom CreditCard Ethernet 10/100
+card "Xircom" "CreditCard 10/100"
+	config	0x1 "xe0" ?
+	insert	logger -t pccard:$device -s Xircom CreditCard Ethernet inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Xircom CreditCard Ethernet removed
+	remove	/etc/pccard_ether $device delete
+
+# Xircom CreditCard Ethernet 10/100 + modem (Ethernet part)
+card "Xircom" "CreditCard Ethernet 10/100 + Modem 56"
+	config	0x1 "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
 	remove	/sbin/ifconfig $device delete