Use the regular expression form to solve the ambiguous card parameters

which have tailing spaces.
Some card entries had problem because of incorrect number of spaces.

Approved by:	imp
MFC after:	1 week

1 files changed, 19 insertions, 19 deletions

diff --git a/etc/defaults/pccard.conf b/etc/defaults/pccard.conf
index 80ce618..092eacf 100644
--- a/etc/defaults/pccard.conf
+++ b/etc/defaults/pccard.conf
@@ -102,7 +102,7 @@ card "       " "KCF 32M"
 	logstr	"Compact Flash Card 32M"
 
 # Caravelle PSC-IDE 6x ATAPI CD-ROM
-card "Caravelle" "PSC-IDE "
+card "Caravelle" "/PSC-IDE */"
 	config	0x2a "ata" ? # 0x1 (flags for wd, not sure for ata)
 
 # <Vendor Unknown> MCD-601p 6x CD-ROM drive.
@@ -111,7 +111,7 @@ card "CDROM" "IDE"
 	logstr	"MCD-601p"
 
 # Lexar Media compact flash
-card "CL ATA FLASH CARD LEXAR  " "TIDALWV"
+card "/CL ATA FLASH CARD LEXAR */" "TIDALWV"
 #   auto does not work
 	config 0x1 "ata" ?
 
@@ -130,7 +130,7 @@ card "Digital Equipment Corporation." "Digital Mobile Media CD-ROM"
 	config	auto "ata" ?
 
 # EXP DVD-780 DVD-ROM drive
-card "EXP   " "PnPIDE"
+card "/EXP */" "PnPIDE"
 	config	auto "ata" ?
 
 # Toshiba mobile CD-ROM (Bundled with Portege 3110CT)
@@ -183,7 +183,7 @@ card "IO DATA" "ATA&MODEM"
 
 # IO DATA CBIDE2 in 16 bit mode
 # (bundled with IO DATA CDP-AX24T, Panasonic DVD-ROM LK-RV8171D)
-card "IO DATA" "CBIDE2      "
+card "IO DATA" "/CBIDE2 */"
 	config	default "ata" ?
 
 # IO Data PCIDE-II (bundled with CDP-TX6, etc.)
@@ -199,7 +199,7 @@ card "KODAK Picture Card" "KODAK"
 	config	default "ata" ?
 
 # TOSHIBA Portable 24X Speed CD-ROM Drive PA2673UJ
-card "LOOKMEET" "CBIDE2      "
+card "LOOKMEET" "/CBIDE2 */"
 	config	default "ata" ?
 
 # Maxtor ATA HDD
@@ -215,7 +215,7 @@ card "Midori Elec." "/.*FLASH.*/"
 	config	0x03 "ata" ?
 
 # Panasonic Flash ATA BN-040ABP3
-card "Panasonic" "ATA" "BN-040AB-M "
+card "Panasonic" "ATA" "/BN-040AB-M */"
 #   auto does not work
 	config	0x1 "ata" ?
 	logstr	"Panasonic Flash ATA BN-040ABP3"
@@ -258,7 +258,7 @@ card "SiliconTech,Inc." "/[0-9]+MB Compact PC Card/"
 	config	0x1 "ata" ?
 
 # Simple Technology ata flash
-card "Simple Technology        " "STI-ATA"
+card "/Simple Technology */" "STI-ATA"
 	config	0x2 "ata" ?
 
 # SONY Memory Stick PC Card Adaptor
@@ -272,7 +272,7 @@ card "SunDisk" "/.*/"
 	config	0x1 "ata" ?
 
 # T-POWER Flash ATA
-card "T-POWER             " "/.*/"
+card "/T-POWER */" "/.*/"
 	config	0x1 "ata" ?
 
 # TDK Flash ATA
@@ -288,7 +288,7 @@ card "WORKBIT" "ATA-32Bi(16)"
 	config	default "ata" ?
 
 # Viking ATA Flash card
-card "VIKING ATA/CF FLASH CARD " "TOR/AM "
+card "/VIKING ATA/CF FLASH CARD */" "/TOR/AM */"
 	config	0x2 "ata" ?
 	
 ########## awi ##########
@@ -926,7 +926,7 @@ card "PCMCIAs" "LanModem"
 	remove	/etc/pccard_ether $device stop
 
 # PreMax PE-200 Ethernet Card
-card "PMX   " "PE-200"
+card "/PMX */" "PE-200"
 	config	auto "ed" ? 0x10
 	ether	0x7f0 # 00:20:e0
 	insert	/etc/pccard_ether $device start
@@ -1097,7 +1097,7 @@ card "CONTEC Co.,Ltd." "/C-NET\(PC\)C.*/"
 	remove	/etc/pccard_ether $device stop
 
 # Fujitsu MBH10303 Ethernet PCMCIA
-card "EAGLE Technology" "NE200 ETHERNET LAN MBH10303  "
+card "EAGLE Technology" "/NE200 ETHERNET LAN MBH10303 */"
 	config	auto "fe" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
@@ -1250,11 +1250,11 @@ card "RATOC System Inc." "/SOUND/SCSI2 CARD.*/"
 ########## nsp ##########
 
 # WORKBIT Ninja SCSI series
-card "IO DATA" "CBSC16       "
+card "IO DATA" "/CBSC16 */"
 	config	auto "nsp" ?
 
 # Hewlett Packard M820e (CD-writer)
-card "KME    " "SCSI-CARD-001"
+card "/KME */" "SCSI-CARD-001"
 	config	auto "nsp" ?
 
 # WORKBIT Ninja SCSI series
@@ -1319,7 +1319,7 @@ card "AD PC_CARD" "RC288ACL"
 	config	auto "sio" ? 
 
 # AIWA PV-JF288
-card "AIWA CO.,LTD." "PV-JF288  "
+card "AIWA CO.,LTD." "/PV-JF288 */"
 	config	auto "sio" ?
 
 # AIWA PV-JF3356
@@ -1487,7 +1487,7 @@ card "Nokia Mobile Phones" "/DTP-2( ver II)?/"
 	config	auto "sio" ?
 
 # Novalink NovaModem 144
-card "NovaLink Tech." "NovaModem 144   "
+card "NovaLink Tech." "/NovaModem 144 */"
 	config	auto "sio" ?
 
 # Novatel Merlin CDPD card (wireless modem)
@@ -1515,11 +1515,11 @@ card "PCCardModem" "CardModem 56"
 # 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  "
+card "/PCMCIA */" "/33\.6K Fax/Modem */"
 	config	auto "sio" ?
 
 # Actiontec Datalink with v.90 upgrade
-card "PCMCIA  " "56K V.90 Fax Modem (LK)  "
+card "/PCMCIA */" "/56K V\.90 Fax Modem (LK) */"
 	config	auto "sio" ?
 
 # Billionton 56Kbps Fax Modem
@@ -1527,7 +1527,7 @@ card "PCMCIA CARD 56KFaxModem" "FM56C-NFS"
 	config	auto "sio" ?
 
 # PREMAX FM288 FAX/Data Modem
-card "PREMAX" "FM288 "
+card "PREMAX" "/FM288 */"
 	config	auto "sio" ?
 
 # Panasonic FM-RADIO card
@@ -1874,7 +1874,7 @@ card "Geowave" "GW-NS11S"
 	remove	/etc/pccard_ether $device stop
 
 # Linksys Instant Wireless WPC11
-card "Instant Wireless " " Network PC CARD"
+card "/Instant Wireless */" " Network PC CARD"
 	config	auto "wi" ? 0x10000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop