o Almost all the config line changed to `auto', except for

  multifunction cards and I recieved reports that the card does not
  workd by `config auto'. (MFPAO)
o Remove static assign of the IRQ number.
o Remove two duplicated entries.
o Join some entries using regex and fixed matching order problem.

These changes for boot.flp.

Suggested by: sanpei

1 files changed, 222 insertions, 378 deletions

diff --git a/etc/defaults/pccard.conf b/etc/defaults/pccard.conf
index 38b1763..d4898e4 100644
--- a/etc/defaults/pccard.conf
+++ b/etc/defaults/pccard.conf
@@ -150,6 +150,7 @@ card "INTEGRAL PERIPHERALS" "ATA CARD"
 # IO DATA PCMF144/20 (as Flash ATA only)
 card "IO DATA" "ATA&MODEM"
 	config	0x7 "ata" ?
+#	config	auto "sio" ?
 
 # IO DATA CBIDE2 in 16 bit mode
 # (bundled with IO DATA CDP-AX24T, Panasonic DVD-ROM LK-RV8171D)
@@ -214,7 +215,7 @@ card "Sicon  Peripheral" "PCMCIA ATA/ATAPI Adapter"
 	config	default "ata" ?
 
 # SiliconTech,Inc. Compact PC Card
-card "SiliconTech,Inc." "/[0-9]*MB Compact PC Card/"
+card "SiliconTech,Inc." "/[0-9]+MB Compact PC Card/"
 	config	0x1 "ata" ?
 
 # Simple Technology ata flash
@@ -317,34 +318,28 @@ card "2408LAN" "Ethernet"
 # Accton EN2212
 # Very slow!  (PIO mode)
 card "ACCTON" "EN2212"
-	config	0x1 "ed" ? 0x10
-	ether	0xff0
+	config	auto "ed" ? 0x30
+	ether	0xff0 # 00:00:e8
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-#Accton 2216
+# Accton EN2216
 card "ACCTON" "EN2216-PCMCIA-ETHERNET"
 	config	auto "ed" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# Allied Telesis CentreCOM LA100-PCM-T V2
-card "Allied Telesis, K.K" "CentreCOM LA100-PCM-T V2 100/10M LAN PC Card"
-	config	auto "ed" ? 0x80000
-	insert	/etc/pccard_ether $device start
-	remove	/etc/pccard_ether $device stop
-
-# Allied Telesis Ethernet Card
+# Allied Telesis CentreCOM LA-PCM
 card "Allied Telesis,K.K" "Ethernet LAN Card"
-	config	0x1 "ed" ? 0x10
-	ether	0xff0
+	config	default "ed" ? 0x10
+	ether	0xff0 # 00:00:f4
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # 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 "ed" ?
+	config	auto "ed" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -362,7 +357,7 @@ card "Allied Telesis K.K." "LA-PCM V3"
 
 # AmbiCom 10BaseT card
 card "AmbiCom Inc" "AMB8002T"
-	config	0x20 "ed" ?
+	config	auto "ed" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -381,7 +376,7 @@ card "BUFFALO" "LPC3-CLX"
 
 # CNet BC40 adapter
 card "CNet" "CN40BC Ethernet"
-	config	0x20 "ed" ?
+	config	auto "ed" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -391,14 +386,8 @@ card "corega" "FEther PCC-TXF"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# COREGA Ether PCC-T
-card "corega K.K." "corega Ether PCC-T"
-	config	auto "ed" ?
-	insert	/etc/pccard_ether $device start
-	remove	/etc/pccard_ether $device stop
-
-# COREGA EtherII PCC-T
-card "corega K.K." "corega EtherII PCC-T"
+# COREGA Ether PCC-T and COREGA EtherII PCC-T
+card "corega K.K." "/corega Ether(II)? PCC-T/"
 	config	auto "ed" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
@@ -412,93 +401,71 @@ card "corega K.K." "corega FastEther PCC-TX"
 # Corega PCM-T
 card "Corega,K.K." "Ethernet LAN Card"
 	config	auto "ed" ?
-	ether   0xff0
+	ether   0xff0 # 00:00:f4
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # CyQ've ELA-010
 card "CyQ've" "ELA-010"
-	config	0x20 "ed" ?
-	insert	/etc/pccard_ether $device start
-	remove	/etc/pccard_ether $device stop
-
-# CyQ've ELA-110
-card "CyQ've" "ELA-110 10/100M LAN Card"
-	config	auto "ed" ? 0x80000
+	config	auto "ed" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# CyQ've ELA-110E
-card "CyQ've" "ELA-110E 10/100M LAN Card"
+# CyQ've ELA-110 and ELA-110E
+card "CyQ've" "/ELA-110E? 10/100M LAN Card/"
 	config	auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# D-Link DE-650 NE2000 clone
-card "D-Link" "DE-650"
-	config	0x20 "ed" ? 0x10
-	insert	/etc/pccard_ether $device start
-	remove	/etc/pccard_ether $device stop
-
-# D-Link DE-660 NE2000 clone
-card "D-Link" "DE-660"
-	config	0x20 "ed" ? 0x10
-	ether 0x81
+# D-Link DE-650 and DE-660
+card "D-Link" "/DE-6[56]0/"
+	config	auto "ed" ? 0x10
 	insert	/etc/pccard_ether $device start
-#	insert	/etc/pccard_ether $device start link0 -link1
 	remove	/etc/pccard_ether $device stop
 
-# D-Link DFE-650 Ethernet Card
+# D-Link DFE-650 Fast Ethernet Card
 card "D-Link" "DFE-650"
-	config	0x20 "ed" ? 0x80010
+	config	auto "ed" ? 0x80010
 	insert	/etc/pccard_ether $device start
-#	insert	/etc/pccard_ether $device start link0 -link1
 	remove	/etc/pccard_ether $device stop
 
 # D-Link DME-560T LAN/FAX/MODEM Card (as Ethernet)
 card "D-Link" "DME560T"
 	config	default "ed" ?
+#	config	auto "sio" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Danpex (Alloy, etc.) EN-6200P2
 card "DANPEX" "EN-6200P2"
-	config	0x22 "ed" ?
+	config	auto "ed" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Dayna Communications CommuniCard E
 card "Dayna Communications, Inc." "CommuniCard E"
 	config	auto "ed" ? 0x10
-#	ether	0x110 00:80:19
-	ether	0x110 
+	ether	0x110 # 00:80:19
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Digital DEPCM-BA Ethernet
 card "DIGITAL" "DEPCM-XX"
 	config	auto "ed" ? 0x10
-#	ether	0xff0 00:00:e8
-	ether	0xff0
-	insert	/etc/pccard_ether $device start
-	remove	/etc/pccard_ether $device stop
-
-# Planex FNW-3600-T
-card "Dual Speed" "10/100 PC Card"
-	config	auto "ed" ? 0x80000
+	ether	0xff0 # 00:00:e8
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# Planex FNW-3600-TX 16bit FastEthernet DirectDock
-card "Dual Speed" "10/100 Port Attached PC Card"
+# Planex FNW-3600-T and FNW-3600-TX DirectDock (second model)
+card "Dual Speed" "/10/100( Port Attached)? PC Card/"
 	config	auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# LinkSys ethernet card
+# Linksys Combo PCMCIA Ethernet Card
 card "E-CARD" "E-CARD" 
-	config	0x20 "ed" ? 
-	logstr	"LinkSys card"
+	config	auto "ed" ? 
+	logstr	"Linksys Combo Ethernet Card"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -508,20 +475,12 @@ card "EIGER Labs Inc." "Ethernet COMBO Card"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# XXX	Compex Net-A adapter, Telecom SuperSocket RE450T and
-# 	Apollo PCMCIA Ethernet Adapter have same manufacturer and
+# XXX	Compex Net-A adapter, Telecom SuperSocket RE450T,
+# 	Apollo PCMCIA Ethernet Adapter, PLANEX ENW-3503-T and
+#	Fiber line 10M Ethernet COMBO have same manufacturer and
 #	card version string.  They should be distinguished by 
 #	other info. (such as additional information or OEM-ID/product-ID).
 
-# Compex Net-A adapter
-card "Ethernet" "Adapter"
-	config	0x1 "ed" ?
-	ether	0xff0
-	logstr	"Compex Net-A adapter"
-	insert	/etc/pccard_ether $device start
-	remove	/etc/pccard_ether $device stop
-	
-# Telecom Device SuperSocket RE450T
 # Note: There are several revisions of the cardon the market.
 #	Type A needs no "ether" line.
 #	Type B needs "ether 0x110" line.
@@ -530,23 +489,9 @@ card "Ethernet" "Adapter"
 #	If you see strange MAC address shown by ifconfig command,
 #	try other config.
 card "Ethernet" "Adapter"
-	config	0x2 "ed" ?
-#	ether	0x110 00:e0:98
-#	ether	0xff0 00:e0:98
-	logstr	"Telecom SuperSocket RE450T"
-	insert	/etc/pccard_ether $device start
-	remove	/etc/pccard_ether $device stop
-
-# Apollo PCMCIA Ethernet Adapter
-card "Ethernet" "Adapter"
-	config	0x0 "ed" ?
-	logstr	"Apollo PCMCIA Ethernet Adapter"
-	insert	/etc/pccard_ether $device start
-	remove	/etc/pccard_ether $device stop
-
-# pci Ethernet Adapter Card
-card "Ethernet" "CF Size PC Card"
 	config	auto "ed" ?
+#	ether	0x110 # 00:e0:98
+	ether	0xff0 # 00:e0:98
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -565,33 +510,26 @@ card "Ethernet Adapter" "E2000 PCMCIA Ethernet"
 # ADDTRON EP-210A
 card "EP-210 PCMCIA LAN CARD." "/.*/"
 	config	auto "ed" ? 0x10
-#	ether	0x110 00:40:33
-	ether	0x110
+	ether	0x110 # 00:40:33
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# PLANEX (PLANET) FNW-3700-T
+# Planex FNW-3700-T Fast Ethernet
 card "Fast Ethernet" "16-bit PC Card"
 	config	auto "ed" ? 0x30000
 	logstr	"Planex FNW-3700-T"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# Planex FNW-3600-T 16bit FastEthernet
+# Planex FNW-3600-T 16bit Fast Ethernet (old model)
 card "Fast Ethernet" "Adapter"
 	config	auto "ed" ? 0x80000
 	logstr	"Planex FNW-3600-T"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# TDK Grey Cell GCS2000 Ethernet Card
-card "Grey Cell" "GCS2000"
-	config	auto "ed" ? 0x10
-	insert	/etc/pccard_ether $device start
-	remove	/etc/pccard_ether $device stop
-
-# Grey Cell GCS2220 Ethernet Card
-card "Grey Cell" "GCS2220"
+# TDK Grey Cell GCS2000 and GCS2220
+card "Grey Cell" "/GCS2(00|22)0/"
 	config	auto "ed" ? 0x10
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
@@ -602,64 +540,57 @@ card "GVC" "NIC-2000p"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# IBM PCMCIA Ethernet I/II
+# IBM PCMCIA Ethernet I/II, RIOS PC CARD II ETHERNET
 card "IBM Corp." "Ethernet"
 	config	auto "ed" ?
-	ether	0xff0
+	ether	0xff0	# 08:00:5a 00:04:ac 00:06:29
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-#AR-P500 ethernet card, PLANET PCMCIA ethernet Adapter card ENW-3500
-card "IC-CARD" "IC-CARD"
+# AR-P500 ethernet card, Planet Communications Smart COM 3500 same as
+# model ENW-3500 and ENW-3501-T, IC-CARD Ethernet, SYSCOM SC100 Ethernet Card
+# ELECOM Laneed LD-CDY, IC-CARD+ Ethernet card
+card "/^IC-CARD\+$/" "/^IC-CARD\+$/"
 	config	auto "ed" ?
-	logstr	"AR-P500 Ethernet card"
-	insert	/etc/pccard_ether $device start
-	remove	/etc/pccard_ether $device stop
-
-# IC-CARD+ Ethernet card
-card "IC-CARD+" "IC-CARD+"
-	config	auto "ed" ?
-	logstr	"IC-CARD+ Ethernet card"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # I/O DATA PCLA/T
 card "I-O DATA" "PCLA"
 	config	auto "ed" ? 0x10
-#	ether	0x1c0 00:a0:b0
-#	ether	0xff0 00:a0:b0
-	ether	0xff0
+#	ether	0x1c0 # 00:a0:b0
+	ether	0xff0 # 00:a0:b0
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# I-O DATA PCLATE
+# I-O DATA PCLA/TE
 card "IO DATA" "PCLATE"
-	config	0x20 "ed" ? 0x10
+	config	auto "ed" ? 0x10
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# I-O DATA PCETTX
+# I-O DATA PCET/TX
 card "IO DATA" "PCETTX"
-	config	0x20 "ed" ? 0x80000
+	config	auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # KANSAI ELECTRIC KLA-PCM/T
 card "KANSAI ELECTRIC CO.,LTD" "KLA-PCM/T"
-	config	0x1 "ed" 15
+	config	auto "ed" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Kingston KNE-PC2
 card "Kingston" "KNE-PC2"
-	config	default "ed" ?
+	config	auto "ed" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Kingston KNE-PCM/x Ethernet
 card "Kingston Technology Corp." "/EtheRx PC Card Ethernet.*/"
 	config	auto "ed" ?
-	ether	0xff0
+	ether	0xff0 # 00:c0:f0
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -669,27 +600,22 @@ card "Laneed" "LD-10/100CD"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# Elecom Laneed LD-CDF
-card "Laneed" "LD-CDF"
-	config	0x20 "ed" ?
-	insert	/etc/pccard_ether $device start
-	remove	/etc/pccard_ether $device stop
-
-# ELECOM Laneed LD-CDS
-card "Laneed" "LD-CDS"
+# ELECOM Laneed LD-CDF, LD-CDS
+card "Laneed" "/LD-CD[FS]/"
 	config	auto "ed" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Linksys Combo PCMCIA EthernetCard (model EC2T on box) 
 card "Linksys" "Combo PCMCIA EthernetCard (EC2T)"
-	config	0x1 "ed" ? 
+	config	auto "ed" ? 
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Linksys Combo PCMCIA Ethernet Card
 card "LINKSYS" "E-CARD"
 	config	auto "ed" ? 0x10
+	logstr	"Linksys Combo Ethernet Card"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -699,7 +625,7 @@ card "Linksys" "EtherFast 10/100 Integrated PC Card (PCM100)"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# Linksys EtherFast 10/100 PC Card (PCMPC100) and V2
+# Linksys EtherFast 10/100 PC Card (PCMPC100), model V2 and V3
 card "Linksys" "/Ether[Ff]ast 10/100 PC Card \(PCMPC100.*\)/"
 	config	auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
@@ -719,23 +645,21 @@ card "Logitec" "LPM-LN20T"
 
 # Socket LP-E (WinCE Low Power Ethernet)
 card "Low Power Ethernet LAN Adapter" "Socket Communications, Inc"
-	config	0x20 "ed" ?
+	config	auto "ed" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# ELECOM Laneed LD-CDWA (DP83902A)
+# ELECOM Laneed LD-CDWA (DP83902A), MACNICA Ethernet ME1 for JEIDA
 card "MACNICA" "ME1-JEIDA"
 	config	auto "ed" ?
-#	ether	0xb8 08:00:42
-	ether	0xb8
+	ether	0xb8 # 08:00:42
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Matsushita Electric Industrial Co.,LTD. CF-VEL211P-B
 card "Matsushita Electric Industrial Co.,LTD." "CF-VEL211"
 	config	auto "ed" ?
-#	ether	0xff0 00:80:45
-	ether	0xff0
+	ether	0xff0 # 00:80:45
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -753,36 +677,27 @@ card "MELCO" "LPC2-TX"
 
 # MELCO LPC3-TX
 card "MELCO" "LPC3-TX"
-	config	0x1 "ed" ? 0x30000
+	config	auto "ed" ? 0x30000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# National Semiconductor InfoMover 4100
-card "National Semiconductor" "InfoMover 4100"
+# National Semiconductor InfoMover 4100 and NE4100
+card "National Semiconductor" "/InfoMover (NE)?4100/"
 	config	auto "ed" ?
-#	ether	0xff0 08:00:17
-	ether	0xff0
-	insert	/etc/pccard_ether $device start
-	remove	/etc/pccard_ether $device stop
-
-# National Semiconductor InfoMover NE4100
-card "National Semiconductor" "InfoMover NE4100"
-	config	0x1 "ed" ?
-	ether	0xff0
+	ether	0xff0 # 08:00:17
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # NDC Ethernet Instant-Link NE2000 clone
 card "NDC" "Ethernet"
-	config	0x22 "ed" ? 0x10
+	config	auto "ed" ? 0x30
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # NEC PC-9801N-J12
 card "NEC" "PC-9801N-J12"
 	config	auto "ed" ?
-#	ether	0xff0 00:00:4c
-	ether	0xff0
+	ether	0xff0 # 00:00:4c
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -794,13 +709,13 @@ card "NETGEAR" "FA410TX"
 
 # Network Everywhere Ethernet 10BaseT PC Card
 card "Network Everywhere" "Ethernet 10BaseT PC Card"
-	config	0x1 "ed" ?
+	config	auto "ed" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Network Everywhere Ethernet Fast Ethernet 10/100 PC Card
 card "Network Everywhere" "Fast Ethernet 10/100 PC Card"
-	config	0x5 "ed" 10 0x80000
+	config	auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -816,19 +731,10 @@ card "NextCom K.K." "Next Hawk"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# Nihon Unisys, Ltd. JPF0400-ETH
-card "Nihon Unisys, Ltd." "JPF0400-ETH"
+# Nihon Unisys, Ltd. JPF0400-ETH and JPF0400-LAN
+card "Nihon Unisys, Ltd." "/JPF0400-(ETH|LAN)/"
 	config	auto "ed" ?
-#	ether	0xff0 00:80:45
-	ether	0xff0
-	insert	/etc/pccard_ether $device start
-	remove	/etc/pccard_ether $device stop
-
-# Nihon Unisys, Ltd. JPF0400-LAN
-card "Nihon Unisys, Ltd." "JPF0400-LAN"
-	config	auto "ed" ?
-#	ether	0xff0 00:80:45
-	ether	0xff0
+	ether	0xff0 # 00:80:45
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -849,15 +755,15 @@ card "PCMCIA" "FastEthernet"
 # Billionton 10Base-TX ETHERNET PCCARD (aka UE2216)
 # Also Genuius "Ethernet ME3000II SE"
 card "PCMCIA" "PCMCIA-ETHERNET-CARD"
-	config	0x20 "ed" ? 0x10
+	config	auto "ed" ? 0x10
 	logstr	"UE2216"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# Melco LPC-T (PIO mode)
+# Planet Smart COM 2000, Melco LPC-T
 card "PCMCIA" "UE2212"
 	config	auto "ed" ? 0x10
-	ether	0xff0
+	ether	0xff0 # 00:00:e8
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -868,9 +774,10 @@ card "PCMCIA LAN" "Ethernet"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# LinkMates LM 336 LAN Fax/Modem PC Card
+# LinkMates LM 336 LAN Fax/Modem PC Card (as Ethernet only)
 card "PCMCIAs" "ComboCard"
 	config	0x24 "ed" ? 0x10
+#	config	auto "sio" ?
 	logstr	"LinkMates LM 336"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
@@ -878,6 +785,7 @@ card "PCMCIAs" "ComboCard"
 # Telecom Device SuperSocket LM336 (as Ethernet only)
 card "PCMCIAs" "LanModem"
 	config	default "ed" ?
+#	config	auto "sio" ?
 	logstr	"SuperSocket LM336"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
@@ -885,8 +793,7 @@ card "PCMCIAs" "LanModem"
 # PreMax PE-200 Ethernet Card
 card "PMX   " "PE-200"
 	config	auto "ed" ? 0x10
-#	ether	0x7f0 00:20:e0
-	ether	0x7f0
+	ether	0x7f0 # 00:20:e0
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -894,36 +801,34 @@ card "PMX   " "PE-200"
 # as ethernet
 card "Psion Dacom" "Gold Card V34 Ethernet GSM"
 	config	auto "ed" ?
+#	config	auto "sio" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # RIOS PC CARD3 ETHERNET
 card "RIOS Systems Co." "PC CARD3 ETHERNET"
 	config	auto "ed" ?
-#	ether	0xff0 00:00:48
-	ether	0xff0
+	ether	0xff0 # 00:00:48
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # RPTI EP401 Ethernet card
 card "RPTI" "EP401 Ethernet NE2000 Compatible"
-	config	0x22 "ed" 9 
+	config	auto "ed" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # SCM Ethernet Combo (*Not SMC :-)*)
 card "SCM" "Ethernet Combo card"
 	config	auto "ed" ? 0x10
-#	ether	0xff0 00:20:cb
-	ether	0xff0
+	ether	0xff0 # 00:20:cb
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Epson EEN10B Ethernet Card
 card "Seiko Epson Corp." "Ethernet"
 	config	auto "ed" ? 0x10
-#	ether	0xff0 00:00:48
-	ether	0xff0
+	ether	0xff0 # 00:00:48
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -967,7 +872,7 @@ card "TJ" "Ethernet"
 # TOSHIBA LABCTA00A (Add `option TOSH_ETHER' line to your kernel
 # configuration file and rebuilding kernel.)
 #card "TOSHIBA" "LANCT00A"
-#	config	default "ed0" any 0x10
+#	config	default "ed" ? 0x10
 #	cardmem 0xd0000 0x0000 32k
 ##	cardmem 0xd8000 0x0000 32k
 #	insert	/etc/pccard_ether $device start
@@ -983,39 +888,33 @@ card "Xircom" "CompactCard Ethernet"
 
 # 3Com Fast Etherlink 3C574TX
 card "3Com" "3C574-TX Fast EtherLink PC Card"
-	config	0x1 "ep" ? 0x1
+	config	auto "ep" ? 0x1
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# 3Com Megahertz 3CXEM556 (only lan side) doesn't work yet
-card "3Com" "Megahertz 3CXEM556"
-	config	0x1 "ep" ? 0x1
-	insert	/etc/pccard_ether $device start
-	remove	/etc/pccard_ether $device stop
-
-# 3Com Megahertz 3CCFEM556BI, 3CXEM556B
+# 3Com Megahertz 3CCFEM556BI, 3CXEM556 and model B
 # as ethernet
-card "3Com" "/Megahertz 3C.*EM556/"
+card "3Com" "/Megahertz 3C(CF|X)EM556/"
 	config	default "ep" ? 0x1
+#	config	auto "sio" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# 3Com Megahertz 574B
+# 3Com Megahertz 574B same as 3Com Fast Etherlink 3C574B
 card "3Com" "Megahertz 574B"
-	config	0x1 "ep" ? 0x1
+	config	auto "ep" ? 0x1
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# 3Com Etherlink III 3CXE589EC
-# 3Com Etherlink III 3CXE589ET
+# 3Com Etherlink III 3CXE589EC and 3CXE589ET
 card "3Com" "Megahertz 589E"
-	config	0x1 "ep" ?
+	config	auto "ep" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # 3Com OfficeConnect 3CXSH572BT
 card "3Com" "OfficeConnect 572B"
-	config	0x1 "ep" ? 0x1
+	config	auto "ep" ? 0x1
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -1026,26 +925,17 @@ card "3Com" "OfficeConnect 572B"
 #	insert	/etc/pccard_ether $device start -link0 link1
 #	remove	/etc/pccard_ether $device stop
 
-# 3Com Etherlink III 3C589B, 3C589C
-card "3Com Corporation" "3C589"
-	config	0x1 "ep" ?
-#	config	auto "ep" ?
+# 3Com Etherlink III 3C589, 3C589B, 3C589C, 3C589D
+card "3Com Corporation" "/3C589/"
+	config	auto "ep" ?
 	insert	/etc/pccard_ether $device start -link0 link1
 #	insert	/etc/pccard_ether $device start link0 -link1
 	remove	/etc/pccard_ether $device stop
 
-# 3Com Etherlink III 3C589D
-card "3Com Corporation" "3C589D"
-	config	0x1 "ep" ?
-#	config	auto "ep" ?
-	insert	/etc/pccard_ether $device start
-	remove	/etc/pccard_ether $device stop
-
 # Farallon EtherMac
 card "Farallon" "ENet"
-	config	0x1 "ep" ?
+	config	auto "ep" ?
 	insert	/etc/pccard_ether $device start
-#	insert	/etc/pccard_ether $device start link0
 	remove	/etc/pccard_ether $device stop
 
 ########## ex ##########
@@ -1061,8 +951,7 @@ card "Olicom" "Ethernet"
 # CONTEC C-NET(PC)C Ethernet
 card "CONTEC Co.,Ltd." "/C-NET\(PC\)C.*/"
 	config	auto "fe" ?
-#	ether	0x58 00:80:4c
-	ether	0x58 
+	ether	0x58 # 00:80:4c
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -1081,20 +970,17 @@ card "Eiger labs,Inc." "EPX-10BT PC Card Ethernet 10BT"
 # Fujitsu FMV-J182, FMV-J182A
 card "FUJITSU" "LAN Card(FMV-J182)"
 	config	auto "fe" ?
-	# These cards have same ID strings, and different MAC address
-	# locations.
-#	ether	0xf2c 00:00:0e		#FMV-J182
-#	ether	0xf2c			#FMV-J182
-#	ether	0x1cc 00:00:0e		#FMV-J182A
-	ether	0x1cc			#FMV-J182A
+# These cards have same ID strings, and different MAC address
+# locations.
+#	ether	0xf2c # 00:00:0e	#FMV-J182
+	ether	0x1cc # 00:00:0e	#FMV-J182A
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Fujitsu Towa LA501 Ethernet
 card "FUJITSU TOWA" "LA501"
 	config	auto "fe" ? 0x10
-#	ether	0x332 00:00:0e
-	ether	0x332 
+	ether	0x332 # 00:00:0e
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -1113,10 +999,9 @@ card "NextComK.K." "/NC5310 Ver1\.0.*/"
 # RATOC REX-5588, REX-9822, REX-4886
 card "PCMCIA LAN MBH10304  ES" "  01"
 	config	auto "fe" ?
-#	ether	0x32c 00:c0:d0  # many minor revs....
-#	ether	0x328 00:c0:d0
-#	ether	0x200 00:c0:d0
-	ether	0x200
+#	ether	0x32c # 00:c0:d0  # many minor revs....
+#	ether	0x328 # 00:c0:d0
+	ether	0x200 # 00:c0:d0
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -1129,18 +1014,17 @@ card "PCMCIA MBH10302" "01"
 # RATOC REX-R280
 card "RATOC System Inc." "10BASE_T CARD R280"
 	config	auto "fe" ?
-#	ether	0x1fc 00:c0:d0
-	ether	0x1fc
+	ether	0x1fc # 00:c0:d0
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # TDK LAK-CD021, LAK-CD021A, LAK-CD021BX
 card "TDK" "LAC-CD02x"
 	config	auto "fe" ?
-	# These cards have same ID strings, and different MAC address
-	# locations.
-	#ether	0x92 00:80:98		# LAC-CD021, LAC-021A
-	#ether	0x96 00:80:98		# LAC-CD021BX
+# These cards have same ID strings, and different MAC address
+# locations.
+#	ether	0x92 # 00:80:98		# LAC-CD021, LAC-021A
+#	ether	0x96 # 00:80:98		# LAC-CD021BX
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -1261,28 +1145,28 @@ card "WebGear" "PC Card WLAN Adapter"
 
 # 3Com/USR/MegaHertz 3CCM156
 card "3COM" "3CCM156"
-	config	0x23 "sio" ?
+	config	auto "sio" ?
 
 # 3com/USR/Megahertz 3CCM556
 card "3Com" "3CXM/3CCM556"
-	config	0x23 "sio" ?
+	config	auto "sio" ?
 
-# 3Com Etherlink III 3C562 (as Modem)
-card "3Com Corporation" "3C562"
+# 3Com Etherlink III 3C562 and 3C563 (as Modem)
+card "3Com Corporation" "/3C56[23]/"
 	config	0x09 "sio" ?
+#	config	auto "sio" ?
 
 # ADVANTECH COMpad-32/85 (dual port, but only one works)
 card "ADVANTECH" "COMpad-32/85"
 	config	auto "sio" ? 0x330
 
-# AIWA PV-JF288
-card "AIWA CO.,LTD." "PV-JF288  "
-	config	0x23 "sio" ?
-
 # Apex Data 28.8 PC Card "MOBILE PLUS Cellular" modem. 
 card "AD PC_CARD" "RC288ACL" 
-	config	0x22 "sio" ? 
-#	config	auto "sio" ? 
+	config	auto "sio" ? 
+
+# AIWA PV-JF288
+card "AIWA CO.,LTD." "PV-JF288  "
+	config	auto "sio" ?
 
 # AIWA PV-JF3356
 card "AIWA CO.,LTD. MODEM" "PV-JF3356"
@@ -1291,80 +1175,78 @@ card "AIWA CO.,LTD. MODEM" "PV-JF3356"
 # APEX DATA MultiCard (as Modem only)
 card "APEX DATA" "MULTICARD"
 	config	0xb "sio" ?
+#	config	auto "sio" ?
 
 # Eiger 33.6 modem
 card "AT&T" "V34+ Fax Modem"
-	config	0x23 "sio" ?
+	config	auto "sio" ?
 
 # AT&T Paradyne KeepInTouch 14.4 modem
 card "AT&T Paradyne" "KeepInTouch Card"
-	config	0x23 "sio" ?
+	config	auto "sio" ?
 	reset	1000
 
 # BUG Linkboy D64K (ISDN)
 card "BUG Inc." "Linkboy D64K"
-	config	0x23 "sio" ?
+	config	auto "sio" ?
 
 # NewMedia 14.4K FAX/Data Modem
 card "CIRRUS LOGIC" "FAX MODEM"
-	config	0x23 "sio" ?
-
-# COM1 SA
-card "COM1 SA" "MC218 CARD"
-	config	0x3 "sio" ?
+	config	auto "sio" ?
 
 # COM1 SA
-card "COM1 SA" "MC220 CARD"
-	config	0x3 "sio" ?
+card "COM1 SA" "/MC2(18|20) CARD/"
+	config	auto "sio" ?
 
 # Digiteam Expresso 14.4 Modem
 card "Digiteam GmbH" "Expresso Modem"
-	config	0x24 "sio" ?
+	config	auto "sio" ?
 
 # Eicon DIVA T/A
 # at@menu       Config menu
 # at>vc         View current profile
 # at>vd         View troubleshooting information
 card "Eicon Technology" "DIVA T/A"
-	config	0x5 "sio" ?
+	config	auto "sio" ?
 
 # Ericsson DC23 GSM modem card
 card "ERICSSON" "Modem, DC23"
-	config	0x21 "sio" ?
+	config	auto "sio" ?
 
 # GATEWAY 2000 FAX/Data Modem (14.4K)
 card "GATEWAY2000" "CC3144"
-	config	0x22 "sio" ?
+	config	auto "sio" ?
 
 # This one does work though
 card "HAYES" "OPT288"
-	config	0x23 "sio" ?
+	config	auto "sio" ?
 
 # Hayes OPTIMA 288 FAX/Data Modem
 # currently does not work on my machine
 card "Hayes" "OPTIMA 288 + FAX fo"
-	config	0x24 "sio" ?
+	config	auto "sio" ?
 	reset	10000
 
 # IBM Push/Pop Modem (14.4K)
 card "IBM" "Push/Pop Modem(14.4K)"
-	config	0x22 "sio" ?
+	config	auto "sio" ?
 
 # IBM 56k PCCCARD modem
 card "IBM" "56K PC Card Modem"
-	config	0x22 "sio" ?
+	config	auto "sio" ?
 
 # Intel EtherExpress(TM) PRO/100 LAN/Modem PC Card Adapter (as modem)
 card "Intel" "EtherExpress(TM) PRO/100 LAN/Modem PC Card Adapter"
 	config	0x1f "sio" ?
+#	config	auto "sio" ?
 
 # US Robotics Worldport 14400
 card "Intel" "MODEM 2400+"
-	config	0x2 "sio" ?
+	config	auto "sio" ?
 
 # Intelligent SurfCard
 card "Intelligent" "PCMCIA FAX+MODEM"
-	config	0x1f "sio" ?
+	config	auto "sio" ?
 	reset	1000
 
 # Megahertz XJEM3288 (as modem)
@@ -1375,59 +1257,41 @@ card "MEGAHERTZ" "CC/XJEM3288"
 card "MEGAHERTZ" "CC/XJEM3336"
 	config	auto "sio" ?
 
-# Megahertz XJ1144
-card "MEGAHERTZ" "XJ1144"
-	config	0x23 "sio" ?
-
-# Megahertz XJ2144 (US)
-card "MEGAHERTZ" "XJ2144"
-	config	0x23 "sio" ?
-
-# Megahertz XJ2144 (JP)
-card "MEGAHERTZ" "XJ2144-81"
-	config	0x23 "sio" ?
-
-# Megahertz XJ2288
-card "MEGAHERTZ" "XJ2288"
-	config	0x23 "sio" ?
-
-# Megahertz XJ3288
-card "MEGAHERTZ" "XJ3288"
-	config	0x21 "sio" ?
+# Megahertz XJ1144, XJ2144 (US and JP), XJ2288, XJ3288
+card "MEGAHERTZ" "/XJ[0-9]+/"
+	config	auto "sio" ?
 
 # Megahertz XJ-CC4288
 card "Megahertz" "XJ-CC4288"
-	config	0x23 "sio" ?
+	config	auto "sio" ?
 
 # Megahertz XJ4336
 card "Megahertz" "XJ4336-CC4336"
-	config	0x22 "sio" ?
-#	config	auto "sio" ?
-#	config	0x23 "sio" ?
+	config	auto "sio" ?
 
 # XXX generic serial?
 # Megahertz X-Jack Ethernet/Modem 14.4K (as Modem only)
 card "Megahertz" "XJEM1144/CCEM1144"
 	config	0x27 "sio" ?
+#	config	auto "sio" ?
 
 # Motorola Montana 
 card "Motorola" "MONTANA 33.6 FAX/MODEM"
-	config	0x21 "sio" ?
+	config	auto "sio" ?
 
 # XXX generic serial?
 # Motorola Marine multifunction card (as modem)
 card "Motorola, Inc." "MARINER MODEM/FAX/LAN"
 	config	0x35 "sio" ?
+#	config	auto "sio" ?
 
 # NTT ThunderCard Modem
 card "NTT-IT CO., LTD" "ThunderCard AVF288, V.34"
-	config	0x22 "sio" ?
+	config	auto "sio" ?
 
 # NTT DoCoMo Mobile D Card 96P1
 card "NTT DoCoMo" "Mobile D Card 96P1"
-#	config	0x22 "sio" ? 0x82
-	config	0x23 "sio" ? 0x82
-#	config	auto "sio" ? 0x82
+	config	auto "sio" ? 0x82
 
 # NTT DoCoMo (formerly NTT Personal) Paldio 611S
 card "NTT DoCoMo" "PALDIO 611S PC CARD"
@@ -1448,31 +1312,29 @@ card "NTT Intelligent Technology Co., Ltd." "ThunderCard DD128"
 
 # NTT DoCoMo (formerly NTT Personal) FAX/Data 32K PHS Card Paldio 321S
 card "NTT Personal" "32K Paldio 321S PC CARD"
-	config	0x23 "sio" ?
+	config	auto "sio" ?
+#	config	auto "sio" ? 0x40000
 
 # NTT DoCoMo (formerly NTT Personal) FAX/Data 32K PHS Card Paldio 341S
 card "NTT Personal" "32K Paldio 341S PC CARD"
-	config	0x23 "sio" ?
+	config	auto "sio" ?
 
 # NTT Personal Paldio Data Card DC-1S
 card "NTT Personal" "/Paldio Data.*/" "DC-1S"
 	config	auto "sio" ? 0x40000
 
-# Nokia Cellular Data Card
-card "Nokia Mobile Phones" "DTP-2"
-	config	0x22 "sio" ?
-	config	0x23 "sio" ?
-
+# Nokia Cellular Data Card DTP-2 and DTP-2 ver II
 # This Nokia example allows either 1 or 2 Nokia cards to be fitted.
 # With 2 Mobile Phones and Multilink PPP you can get a 19200 data channel.
 # Nokia Cellular Data Card
-card "Nokia Mobile Phones" "DTP-2 ver II"
-	config	0x23 "sio" ?
-	config	0x24 "sio" ?
+card "Nokia Mobile Phones" "/DTP-2( ver II)?/"
+#	config	0x23 "sio" ?
+#	config	0x24 "sio" ?
+	config	auto "sio" ?
 
 # Novalink NovaModem 144
 card "NovaLink Tech." "NovaModem 144   "
-	config	0x23 "sio" ?
+	config	auto "sio" ?
 
 # Novatel Merlin CDPD card (wireless modem)
 card "Novatel Wireless" "Merlin Type II Wireless IP Modem"
@@ -1480,54 +1342,56 @@ card "Novatel Wireless" "Merlin Type II Wireless IP Modem"
 
 # Omron ME2814 FAX/DATA MODEM
 card "OMRON" "ME2814 FAX/DATA MOD"
-	config	0x23 "sio" ?
+	config	auto "sio" ?
 
 # Omron MD24XCA FAX/Data Modem
 card "OMRON Corp." "MD24XCA"
-	config	0x23 "sio" ?
+	config	auto "sio" ?
+#	config	auto "sio" pio
 	reset	10000
 
 # Option International PCMCIA55K06
 card "Option International" "GSM Data/Fax/SMS Modem"
-	config	0x22 "sio" ?
+	config	auto "sio" ?
 
 # Banksia CardModem 56
 card "PCCardModem" "CardModem 56"
-	config	0x22 "sio" ?
+	config	auto "sio" ?
 
 # 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 "sio" ?
+	config	auto "sio" ?
 
 # Actiontec Datalink with v.90 upgrade
 card "PCMCIA  " "56K V.90 Fax Modem (LK)  "
-	config	0x1f "sio" ?
+	config	auto "sio" ?
 
 # Billionton 56Kbps Fax Modem
 card "PCMCIA CARD 56KFaxModem" "FM56C-NFS"
-	config	0x22 "sio" ?
+	config	auto "sio" ?
 
 # PREMAX FM288 FAX/Data Modem
 card "PREMAX" "FM288 "
-	config	0x23 "sio" ?
+	config	auto "sio" ?
 
 # Panasonic FM-RADIO card
 card "Panasonic" "CF-JVR101"
-	config	0x22 "sio" ?
+	config	auto "sio" ?
+#	config	auto "sio" pio
 
 # Panasonic KX-PH402D
 card "Panasonic" "KX-PH402D"
-	config	0x23 "sio" ?
+	config	auto "sio" ?
 
 # Panasonic Modem Card TO-706C
 card "Panasonic" "TO-706C"
-	config	0x23 "sio" ?
+	config	auto "sio" ?
 
 # Panasonic Modem Card TO-706C
 card "Panasonic" "TO-CAF288"
-	config	0x23 "sio" ?
+	config	auto "sio" ?
 
 # Panasonic TO-CAF56K FAX/Data Modem
 card "Panasonic Co." "TO-CAF56K"
@@ -1537,31 +1401,19 @@ card "Panasonic Co." "TO-CAF56K"
 
 # Random modem bundled with Dell systems
 card "Psion Dacom" "Gold Card Global 56K+Fax"
-	config	0x23 "sio" ?
+	config	auto "sio" ?
 
 # RFI HotLine serial card
 card "RFI" "RS-232 ComCard Rev.II"
-	config	0x23 "sio" ?
-
-# SII MC-6530
-card "SII" "PHS DATA 32S"
-	config	auto "sio" ? 0x40000
-
-# SII (DDI) MC-6550
-card "SII" "PHS DATA 64"
-	config	auto "sio" ? 0x40000
+	config	auto "sio" ?
 
-# SII MC-P200
-card "SII" "PHS LINK 64"
+# SII MC-6530, MC-6550 and MC-P200
+card "SII" "/PHS (DATA|LINK) (32S|64)/"
 	config	auto "sio" ? 0x40000
 
 # TDK 14.4 FAX/Data Modem
-card "TDK" "DF1414 DATA/FAX MOD"
-	config	0x23 "sio" ?
-
-# TDK 14.4 FAX/Data Modem
-card "TDK" "DF1414EX DATA/FAX M"
-	config	0x23 "sio" ?
+card "TDK" "/DF1414(EX)? DATA/FAX MODEM/"
+	config	auto "sio" ?
 
 # TDK DN1280R
 card "TDK" "DN1280R"
@@ -1572,51 +1424,44 @@ card "TDK" "DN1280R"
 card "TDK" "DP9600"
 	config	auto "sio" ? 0x40000
 
-# XXX NOT SURE SUPPORTED
 # TDK Multifunctioon Card (as Modem)
-#card "TDK" "GlobalNetworker 3410/3412"
-#	config	auto "sio" ? 0x40000
+card "TDK" "GlobalNetworker 3410/3412"
+	config	auto "sio" ? 0x40000
 
 # Toshiba Modem/LAN card IPC5001B (as Modem)
 card "TOSHIBA" "Modem/LAN Card"
 	config	0x25 "sio" ?
+#	config	auto "sio" ?
 
 # 3Com/USR/Toshiba SLIMV90
 card "TOSHIBA" "SLIMV90"
-	config	0x4 "sio" ?
+	config	auto "sio" ?
 
 # 3Com/NoteWorthy 56K modem (bundled with Toshiba notebooks)
 card "Toshiba America" "3CXM056-BNW"
-	config	0x20 "sio" ?
-
-# U.S. Robotics XJ1560J
-card "U.S. Robotics" "XJ/CC1560J"
-	config	0x22 "sio" ?
+	config	auto "sio" ?
 
-# Megahertz XJ1336
-card "U.S. Robotics" "XJ/CC1336"
-	config	0x21 "sio" ?
+# U.S. Robotics XJ1560 and XJ1560J, Megahertz XJ1336
+card "U.S. Robotics" "/XJ/CC1(336|560)J?/"
+	config	auto "sio" ?
 
 # US Robotics Sportster PCMCIA V.34
 # US Robotics COURIER PCMCIA V.34
 card "USRobotics" "PCMCIA 28800 Data/F"
-	config	0x3 "sio" ?
+	config	auto "sio" ?
 
 # Viking V.90/K56Flex modem
 card "Viking" "V.90 K56flex"
-	config	0x23 "sio" ?
-
-# Xircom CreditCard Ethernet+Modem (Modem only !!!)
-card "Xircom" "CreditCard Ethernet"
-	config	0x23 "sio" ?
+	config	auto "sio" ?
 
 # Xircom CreditCard Ethernet 10/100 + modem (modem part)
 card "Xircom" "CreditCard Ethernet+Modem 33.6"
 	config	0x23 "sio" ?
+#	config	auto "sio" ?
 
 # Xircom GlobalACCESS modem
 card "Xircom" "CreditCard Modem 56 - GlobalACCESS"
-	config	0x1f "sio" ?
+	config	auto "sio" ?
 
 # Xircom CreditCard Modem
 card "Xircom" "CreditCard Modem CM-56T"
@@ -1626,14 +1471,14 @@ card "Xircom" "CreditCard Modem CM-56T"
 # Zoom 56K modem 
 # Freezes your system entirely if you don't have the reset..
 card "Zoom Telephonics, Inc." "PCMCIA 56K LT DataFax"
-	config	0x1f "sio" ?
+	config	auto "sio" ?
 	reset	1000
 
 ########## sn ##########
 
 # Megahertz X-Jack Ethernet
 card "Megahertz" "CC10BT/2"
-	config	0x1 "sn" ?
+	config	auto "sn" ?
 	ether	attr2
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
@@ -1641,36 +1486,27 @@ card "Megahertz" "CC10BT/2"
 # Megahertz Ethernet Adapter
 card "Megahertz" "ETHERNET ADAPTOR"
 	config	auto "sn" ?
-#	ether	attr2hex 00:00:86
 	ether	attr2
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# Megahertz X-Jack Ethernet/Modem 14.4K
-#card "MEGAHERTZ" "XJEM1144/CCEM1144"
-#	multifunc
-#	config	default "sn" ?
-#	config	0x27 "sio" shared
-
 # MELCO LPC-TX
 card "MELCO/SMC" "LPC-TX"
 	config	auto "sn" ?
-#	ether	0x4a 00:a0:dc
-	ether	0x4a
+	ether	0x4a # 00:a0:dc
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # SMC EtherEZ Combo(SMC8020BT)
 card "SMC" "EtherEZ Ethernet 8020"
-	config	default "sn" ?
-#	ether	0x9a 00:00:c0
-#	ether	0x9a
+	config	auto "sn" ?
+#	ether	0x9a # 00:00:c0
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Victor M-MOIL CARD
 card "JVC" "MiniMoil Ethernet Card"
-	config	0x01 "sn" ?
+	config	auto "sn" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -1757,18 +1593,19 @@ card "PCMCIA SCSI2 CARD" "01"
 # Cabletron RoamAbout, WaveLAN/IEEE clone
 card "Cabletron" "RoamAbout 802.11 DS"
 	config	0x1 "wi" ?
+#	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Compaq WL100
 card "Compaq" "WL100_11Mbps_Wireless_PC_Card"
-	config auto "wi" ?
+	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Corega KK Wireless LAN PCC-11
 card "corega K.K." "Wireless LAN PCC-11"
-	config auto "wi" ?
+	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -1786,19 +1623,21 @@ card "ELECOM" "Air@Hawk/LD-WL11/PCC"
 
 # ICOM SL-1100
 card "ICOM" "SL-1100"
-	config auto "wi" ?
+	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Farallon Skyline 11Mbps Wireless
 card "INTERSIL" "HFA384x/IEEE"
 	config	0x1 "wi" ?
+#	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Lucent WaveLAN/IEEE
 card "Lucent Technologies" "WaveLAN/IEEE"
 	config	0x1 "wi" ?
+#	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -1823,12 +1662,13 @@ card "NEC" "Wireless Card CMZ-RT-WP"
 # PLANEX GeoWave/GW-NS110
 card "PLANEX" "GeoWave/GW-NS110"
 	config	0x1 "wi" ?
+#	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # TDK LAK-CD011WL
 card "TDK" "LAK-CD011WL for Wireless LAN"
-	config auto "wi" ?
+	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -1842,14 +1682,14 @@ card "Accton" "Fast EtherCard-16"
 	remove	/etc/pccard_ether $device stop
 
 # Compaq Netelligent 10/100 PC Card
-card	"Compaq" "Netelligent 10/100 PC Card"
-	config	0x1 "xe" ?
+card "Compaq" "Netelligent 10/100 PC Card"
+	config	auto "xe" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 #  Intel EtherExpress PRO/100 Mobile Adapter (16-bit verison)
 card "Intel" "EtherExpress(TM) PRO/100 PC Card Mobile Adapter16"
-	config	0x1 "xe" ?
+	config	auto "xe" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -1864,31 +1704,33 @@ card "Intel" "EtherExpress(TM) PRO/100 PC Card Mobile Adapter16"
 
 # Xircom 10/100 Network PC Card
 card "Xircom" "10/100 Network PC Card"
-	config	auto "xe0" ?
+	config	auto "xe" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Xircom Realport card + modem
 card "Xircom" "16-bit Ethernet + Modem 56"
-	config	0x27 "xe" 9
+	config	0x27 "xe" ?
+#	config	auto "sio" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# Xircom CreditCard Ethernet 10/100
+# Xircom CreditCard Ethernet CE3-10/100
 card "Xircom" "CreditCard 10/100"
-	config	0x1 "xe" ?
+	config	auto "xe" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# Xircom CreditCard 10Base-T "CreditCard Ethernet Adaptor IIps" (PS-CE2-10)
+# Xircom CreditCard Ethernet Adaptor IIps (PS-CE2-10)
 card "Xircom" "CreditCard 10Base-T"
 	config	auto "xe" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# Xircom CreditCard Ethernet 10/100 + modem (Ethernet part)
+# Xircom CreditCard Ethernet 10/100 + modem (Ethernet part) (CEM56)
 card "Xircom" "CreditCard Ethernet 10/100 + Modem 56"
 	config	0x27 "xe" ?
+#	config	auto "sio" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -1901,6 +1743,8 @@ card "Xircom" "CreditCard Ethernet 10/100 + Modem 56"
 # GENERIC PCMCIA modem
 generic serial
 	config	auto "sio" ?
+#	reset	100			# default
+#	reset 	1000			# safety reset time
 	reset	10000			# for unstable cards
 	logstr	"GENERIC PCMCIA modem"