Index: pccard.conf
===================================================================
RCS file: /home/ncvs/src/etc/defaults/pccard.conf,v
retrieving revision 1.121
diff -u -r1.121 pccard.conf
--- pccard.conf	2000/07/12 01:20:55	1.121
+++ pccard.conf	2000/07/12 09:41:22
@@ -36,7 +36,7 @@
 ########## aic ##########
 
 # Adaptec SlimSCSI (also included with Sony CD-ROM players)
-card "Adaptec, Inc." "APA-1460 SCSI Host Adapter"
+card "Adaptec, Inc." "/APA-1460 .*/"
 	config	0x9 "aic0" ?
 	insert	logger -t pccard:$device -s Adaptec Slim SCSI inserted
 	insert	camcontrol rescan $device
@@ -69,7 +69,7 @@
 
 ########## ata ##########
 
-# Sony VAIO cdrom
+# Sony VAIO cdrom, Ninja-ATA CD-ROM Drive, MELCO CDN-D12EX
 card " " "NinjaATA-"
 	config  auto "ata" ?
 	insert	logger -t pccard:$device -s NinjaATA inserted
@@ -81,6 +81,29 @@
 	insert	logger -t pccard:$device -s Compact Flash Card 32MB inserted
 	remove	logger -t pccard:$device -s Compact Flash Card 32MB removed
 
+# Caravelle PSC-IDE 6x ATAPI CD-ROM
+card "Caravelle" "PSC-IDE "
+	config	0x2a "ata" ? # 0x1 (flags for wd, not sure for ata)
+	insert	logger -t pccard:$device -s Caravelle PSC-IDE card inserted
+	remove	logger -t pccard:$device -s Caravelle PSC-IDE card removed
+
+# <Vendor Unknown> MCD-601p 6x CD-ROM drive.
+card "CDROM" "IDE"
+	config	auto "ata" ?
+	insert	logger -t pccard:$device -s MCD-601p inserted
+	remove	logger -t pccard:$device -s MCD-601p removed
+
+# DATAFAB PCMMD2
+card "DATAFAB" "PCMCIA-TO-IDE"
+	config	0x1 "ata" ?
+	insert	logger -t pccard:$device -s DATAFAB PCMMD2 inserted
+	remove	logger -t pccard:$device -s DATAFAB PCMMD2 removed
+
+# DHU Mobile Media CD-ROM
+# (no hotplug support)
+card "Digital Equipment Corporation." "Digital Mobile Media CD-ROM"
+	config 0xb "ata" 15
+
 # EXP DVD-780 DVD-ROM drive
 card "EXP   " "PnPIDE"
 	config	auto "ata" ?
@@ -93,12 +116,77 @@
 	insert	logger -t pccard:$device -s Toshiba CD-ROM inserted
 	remove	logger -t pccard:$device -s Toshiba CD-ROM removed
 
+# FUJITSU FlashDiskCard ZEBO-ATA40
+card "FUJITSU" "ZEBO-ATA"
+	config	0x03 "ata" ?
+	insert	logger -t pccard:$device -s FUJITSU Flash ATA inserted
+	remove	logger -t pccard:$device -s FUJITSU Flash ATA removed
+
+# Greystone Diskdock
+card "GREYSTONE PERIPHERAL DISKDOCK" "/.*/"
+	config	default "ata" ?
+	insert	logger -t pccard:$device -s Greystone Diskdock inserted
+	remove	logger -t pccard:$device -s Greystone Diskdock removed
+
+# HAGIWARA FLASH
+card "HAGIWARA" "FLASH"
+	config	default "ata" ?
+	insert	logger -t pccard:$device -s HAGIWARA FLASH inserted
+	remove	logger -t pccard:$device -s HAGIWARA FLASH removed
+
+# Hitachi Flash ATA
+card "HITACHI" "/.*FLASH.*/"
+	config	0x01 "ata" ? iosize 16
+	insert	logger -t pccard:$device -s Hitachi Flash ATA inserted
+	remove	logger -t pccard:$device -s Hitachi Flash ATA removed
+
 # IBM Flash ATA (Ricoh Flash ATA 10MB)
 card "IBM" "IBM17JSSFP10"
 	config	auto "ata" ? iosize 16
 	insert	logger -t pccard:$device -s IBM Flash ATA inserted
 	remove	logger -t pccard:$device -s IBM flash ATA removed
 
+# XXX NOT SURE SUPPORTED
+# IBM Portable 4X Speed CD-ROM Drive CD-400
+#card "IBM" "PCMCIA CD-ROM Drive CD-400"
+#	config	0x1 "ata" ? iosize 0x20 # 0x10000 (flags for wd, not sure for ata)
+#	insert	logger -t pccard:$device -s IBM PCMCIA CD-ROM CD-400 inserted
+#	remove	logger -t pccard:$device -s IBM PCMCIA CD-ROM CD-400 removed
+
+# XXX NOT SURE SUPPORTED
+# IBM CD-20XSeries(IDE PC Card)
+#card "IBM" "PCMCIA Portable CD-ROM Drive"
+#	config	0x1 "ata" ? iosize 0x20 # 0x10000 (flags for wd, not sure for ata)
+#	insert	logger -t pccard:$device -s IBM CD-20XS inserted
+#	remove	logger -t pccard:$device -s IBM CD-20XS removed
+
+# IBM Microdrive (CF+ Type II)
+card "IBM" "microdrive"
+#	config	0x03 "ata" ?
+	config	0x01 "ata" ? iosize 16
+	insert	logger -t pccard:$device -s IBM Microdrive inserted
+	remove	logger -t pccard:$device -s IBM Microdrive removed
+
+# Integral Peripherals Viper HDD Series
+card "INTEGRAL PERIPHERALS" "ATA CARD"
+#	config	default "ata" ?
+	config	0x01 "ata" ? iosize 16
+	insert	logger -t pccard:$device -s Integral Peripherals inserted
+	remove	logger -t pccard:$device -s Integral Peripherals removed
+
+# IO DATA PCMF144/20 (as Flash ATA only)
+card "IO DATA" "ATA&MODEM"
+	config	0x7 "ata" ?
+	insert	logger -t pccard:$device -s IO DATA PCMF144/20 inserted as ATA
+	remove	logger -t pccard:$device -s IO DATA PCMF144/20 removed
+
+# IO DATA CBIDE2 in 16 bit mode
+# (bundled with IO DATA CDP-AX24T, Panasonic DVD-ROM LK-RV8171D)
+card "IO DATA" "CBIDE2"
+	config	default "ata" ?
+	insert	logger -t pccard:$device -s IO DATA CBIDE2 inserted
+	remove	logger -t pccard:$device -s IO DATA CBIDE2 removed
+
 # IO Data PCIDE-II (bundled with CDP-TX6, etc.)
 card "IO DATA" "PCIDEII"
 	config	auto "ata" ?
@@ -111,23 +199,41 @@
 	insert	logger -t pccard:$device -s Iomega Zip Drive inserted
 	remove	logger -t pccard:$device -s Iomega Zip Drive removed
 
-# Maxtor 131MB Type III HDD
-card "Maxtor" "MXL131"
+# KODAK Picture Card
+card "KODAK Picture Card" "KODAK"
+	config	default "ata" ?
+	insert	logger -t pccard:$device -s KODAK Picture Card inserted
+	remove	logger -t pccard:$device -s KODAK Picture Card removed
+
+# TOSHIBA Portable 24X Speed CD-ROM Drive PA2673UJ
+card "LOOKMEET" "CBIDE2"
+	config	default "ata" ?
+	insert	logger -t pccard:$device -s TOSHIBA CD-ROM Drive inserted
+	remove	logger -t pccard:$device -s TOSHIBA CD-ROM Drive removed
+
+# Maxtor ATA HDD
+card "Maxtor" "/MXL.*/"
 	config	0x03 "ata" ?
-	insert	logger -t pccard:$device -s Maxtor 131MB HDD inserted
-	remove	logger -t pccard:$device -s Maxtor 131MB HDD removed
+	insert	logger -t pccard:$device -s Maxtor ATA HDD inserted
+	remove	logger -t pccard:$device -s Maxtor ATA HDD removed
 
 # Microtech XpressDock
 card "Microtech International Inc." "IDE PCCARD"
 	config	auto "ata" ? 0x20000 iosize 16
 	insert	logger -t pccard:$device -s Microtech XpressDock inserted
 	remove	logger -t pccard:$device -s Microtech XpressDock removed
+
+# Midori Elec. Flash ATA
+card "Midori Elec." "/.*FLASH.*/"
+	config	0x03 "ata" ?
+	insert	logger -t pccard:$device -s Midori Flash ATA inserted
+	remove	logger -t pccard:$device -s Midori Flash ATA removed
 
-# Midori Elec Fast Flash
-card "Midori Elec." "FAST FLASH"
-	config	0x3  "ata" ?
-	insert	logger -t pccard:$device -s Midori Elec Fast FLASH inserted
-	remove	logger -t pccard:$device -s Midori Elec Fast FLASH removed
+# LK-RM120
+card "Panasonic" "LMEK0406"
+	config	0x22 "ata" ? 0x1
+	insert	logger -t pccard:$device -s Panasonic LMEK0406  inserted
+	remove	logger -t pccard:$device -s Panasonic LMEK0406  removed
 
 # Another boring, generic ata atapter
 card "PC CARD MANUFACTURER" "PCMCIA ATA/ATAPI Adapter"
@@ -153,8 +259,21 @@
 	insert	logger -t pccard:$device -s Microtech PortableDRIVE25 inserted
 	remove	logger -t pccard:$device -s Microtech PortableDRIVE25 removed
 
-# SiliconTech, Inc flash card
-card "SiliconTech,Inc" "16MB Compact PC Card"
+# XXX NOT SURE SUPPORTED
+#  CitiDISK & Addonics PocketZIP
+#card "Shining" "PMIDE-ASC"
+#	config	default "ata" ? # 0x20000 (flags for wd, not sure for ata)
+#	insert	logger -t pccard:$device -s CitiDISK/PocketZIP inserted
+#	remove	logger -t pccard:$device -s CitiDISK/PocketZIP removed
+
+# Sicon Peripheral PCMCIA ATA/ATAPI Adapter
+card "Sicon  Peripheral" "PCMCIA ATA/ATAPI Adapter"
+	config	default "ata" ?
+	insert	logger -t pccard:$device -s Sicon Peripherals inserted
+	remove	logger -t pccard:$device -s Sicon Peripherals removed
+
+# SiliconTech,Inc. Compact PC Card
+card "SiliconTech,Inc." "/[0-9]*MB Compact PC Card/"
 	config	0x1 "ata" ?
 	insert	logger -t pccard:$device -s SiliconTech Flash ATA inserted
 	remove	logger -t pccard:$device -s SiliconTech Flash ATA removed
@@ -164,18 +283,28 @@
 	config	0x2 "ata" ?
 	insert	logger -t pccard:$device -s Simple Technology ata FLASH inserted
 	remove	logger -t pccard:$device -s Simple Technology ata FLASH removed
-	
+
+# XXX NOT SURE SUPPORTED
+# SONY Memory Stick PC Card Adaptor
+#card "SONY" "/MEMORYSTICK.*/"
+#	config	0x01 "ata" ?
+##	cardio	0x340 16
+#	iosize	16
+#	insert	logger -t pccard:$device -s SONY Memory Stick inserted
+#	remove	logger -t pccard:$device -s SONY Memory Stick removed
+
 # SunDisk Flash ATA
 # (OEM: Epson Flash Packer)
-card "SunDisk" "SDP5"
+card "SunDisk" "/.*/"
 	config	0x1 "ata" ?
-	insert	logger -t pccard:$device -s Sundisk Flash ATA inserted
-	remove	logger -t pccard:$device -s Sundisk Flash ATA removed
+	insert	logger -t pccard:$device -s SunDisk Flash ATA inserted
+	remove	logger -t pccard:$device -s SunDisk Flash ATA removed
 
-card "SunDisk" "SDP"
+# TDK Flash ATA
+card "TDK TC_H." "/.*/"
 	config	0x1 "ata" ?
-	insert	logger -t pccard:$device -s SunDisk Flash ATA Inserted
-	remove	logger -t pccard:$device -s SunDisk Flash ATA removed
+	insert	logger -t pccard:$device -s TDK Flash ATA inserted
+	remove	logger -t pccard:$device -s TDK Flash ATA removed
 
 # IO Data CBIDE (bundled with CDP-FX24, etc.)
 card "WIT" "IDE16"
@@ -183,6 +312,12 @@
 	insert	logger -t pccard:$device -s IO Data CBIDE inserted
 	remove	logger -t pccard:$device -s IO Data CBIDE removed
 
+# LIP-32B attached to Logitec LCW-PD648PI
+card "WORKBIT" "ATA-32Bi(16)"
+	config	default "ata" ?
+	insert	logger -t pccard:$device -s Logitec LIP-32B inserted
+	remove	logger -t pccard:$device -s Logitec LIP-32B removed
+
 # Viking ATA Flash card
 card "VIKING ATA/CF FLASH CARD " "TOR/AM "
 	config	0x2 "ata" ?
@@ -220,8 +355,44 @@
 	remove	logger -t pccard:$device -s Icom SL-200 remvoed
 	remove	/sbin/ifconfig $device delete
 
+########## cnw ##########
+
+# XXX NOT SUPPORTED YET
+# NetWave AirSurfer
+# NOTE: For some machines, wait cycle for memory access is required.
+# you should change "0x40" on the last part of "cardmem" line to "0x44",
+# like:
+#	cardmem	0xd4000 0x20000 0x9000 0x44
+# IBM ThinkPads are known to require this change.
+#card "Xircom" "CreditCard Netwave"
+#	config	0x01 "cnw0" ?
+#	cardmem	0xd4000 0x20000 0x9000 0x40
+#	config	0x01 "cnw1" ?
+##	cardmem	0xdd000 0x20000 0x9000 0x40
+#	ether	0x126 00:80:c7 00:20:d8
+#	insert	logger -t pccard:$device -s Netwave Ethernet inserted
+#	insert	/etc/pccard_ether $device
+#	remove	logger -t pccard:$device -s Netwave Ethernet removed
+#	remove	/etc/pccard_ether_remove $device
+
 ########## ed ##########
 
+# No-brand NE2000 compatible card (FCC ID: LXLC1LANTB)
+card "     " "Ethernet Combo card"
+	config	auto "ed0" ? 0x10
+	insert	logger -t pccard:$device -s NE2000 compatible card inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s NE2000 compatible card removed
+	remove	/sbin/ifconfig $device delete
+
+# Map Japan MPL-972
+card "2408LAN" "Ethernet"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s Map Japan MPL-972 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Map Japan MPL-972 removed
+	remove	/sbin/ifconfig $device delete
+
 # Accton EN2212
 # Very slow!  (PIO mode)
 card "ACCTON" "EN2212"
@@ -275,6 +446,14 @@
 	remove	logger -t pccard:$device -s Allied Telesis LA100-PCM-T V2 removed
 	remove	/etc/pccard_ether_remove $device
 
+# Allied Telesis CentreCOM LA-PCM V3
+card "Allied Telesis K.K." "LA-PCM V3"
+	config	auto "ed0" ? 0x10
+	insert	logger -t pccard:$device -s Allied Telesis LA-PCM V3 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Allied Telesis LA-PCM V3 removed
+	remove	/etc/pccard_ether_remove $device
+
 # AmbiCom 10BaseT card
 card "AmbiCom Inc" "AMB8002T"
 	config	0x20 "ed0" ?
@@ -283,6 +462,14 @@
 	remove	logger -t pccard:$device -s AmbiCom 8002T removed
 	remove	/sbin/ifconfig $device delete
 
+# Billionton LNT-10TB
+card "Billionton" "LNT-10TB"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s Billionton LNT-10TB inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Billionton LNT-10TB removed
+	remove	/sbin/ifconfig $device delete
+
 # CNet BC40 adapter
 card "CNet" "CN40BC Ethernet"
 	config	0x20 "ed0" ?
@@ -291,6 +478,16 @@
 	remove	logger -t pccard:$device -s CNet CN40BC Ethernet removed
 	remove	/etc/pccard_ether_remove $device
 
+# CONTEC C-NET(PC)C Ethernet
+card "CONTEC Co.,Ltd." "/C-NET\(PC\)C.*/"
+	config	auto "fe0" ?
+#	ether	0x58 00:80:4c
+	ether	0x58 
+	insert	logger -t pccard:$device -s CONTEC C-NET inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s CONTEC C-NET removed
+	remove	/sbin/ifconfig $device delete
+
 # COREGA Ether PCC-T
 card "corega K.K." "corega Ether PCC-T"
 	config	0x20 "ed0" ?
@@ -309,6 +506,14 @@
 	remove	logger -t pccard:$device -s EtherII PCC-T removed
 	remove	/sbin/ifconfig $device delete
 
+# COREGA FastEther PCC-TX
+card "corega K.K." "corega FastEther PCC-TX"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s Corega FastEther PCC-TX inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Corega FastEther PCC-TX removed
+	remove	/etc/pccard_ether_remove $device
+
 # Corega PCM-T
 card "Corega,K.K." "Ethernet LAN Card"
 	config	auto "ed0" ?
@@ -369,6 +574,14 @@
 	remove	logger -t pccard:$device -s D-Link DFE-650 removed
 	remove	/sbin/ifconfig $device delete
 
+# D-Link DME-560T LAN/FAX/MODEM Card (as Ethernet)
+card "D-Link" "DME560T"
+	config	default "ed0" ?
+	insert	logger -t pccard:$device -s D-Link LANmodem DME-560T inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s D-Link LANmodem DME-560T removed
+	remove	/sbin/ifconfig $device delete
+
 # Danpex (Alloy, etc.) EN-6200P2
 card "DANPEX" "EN-6200P2"
 	config	0x22 "ed0" ?
@@ -377,6 +590,26 @@
 	remove	logger -t pccard:$device -s Danpex EN-6200P2 removed
 	remove	/sbin/ifconfig $device delete
 
+# Dayna Communications CommuniCard E
+card "Dayna Communications, Inc." "CommuniCard E"
+	config	auto "ed0" ? 0x10
+#	ether	0x110 00:80:19
+	ether	0x110 
+	insert	logger -t pccard:$device -s Dayna CommuniCard inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Dayna CommuniCard removed
+	remove	/sbin/ifconfig $device delete
+
+# Digital DEPCM-BA Ethernet
+card "DIGITAL" "DEPCM-XX"
+	config	auto "ed0" ? 0x10
+#	ether	0xff0 00:00:e8
+	ether	0xff0
+	insert	logger -t pccard:$device -s Digital DEPCM-BA Ethernet inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Digital DEPCM-BA Ethernet removed
+	remove	/sbin/ifconfig $device delete
+
 # Planex FNW-3600-T
 card "Dual Speed" "10/100 PC Card"
 	config	auto "ed0" ?
@@ -401,6 +634,14 @@
 	remove	logger -t pccard:$device -s "LinkSys card removed" 
 	remove	/sbin/ifconfig $device delete
 
+# Eiger Labs Ethernet COMBO
+card "EIGER Labs Inc." "Ethernet COMBO Card"
+	config	auto "ed0" ? 0x10
+	insert	logger -t pccard:$device -s Eiger Labs Ethernet COMBO inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Eiger Labs Ethernet COMBO inserted
+	remove	/sbin/ifconfig $device delete
+
 # Compex Net-A adapter
 card "Ethernet" "Adapter"
 	config	0x1 "ed0" ?
@@ -435,13 +676,31 @@
 	remove	logger -t pccard:$device -s Apollo PCMCIA Ethernet Adapter removed
 	remove	/sbin/ifconfig $device delete
 
+# "Ethernet Adapter" "E2000 PCMCIA Ethernet"
+card "Ethernet Adapter" "E2000 PCMCIA Ethernet"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s Ethernet Adapter E2000 PCMCIA Ethernet
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Ethernet Adapter E2000 PCMCIA Ethernet
+	remove	/sbin/ifconfig $device delete
+
+# ADDTRON EP-210A
+card "EP-210 PCMCIA LAN CARD." "/.*/"
+	config	auto "ed0" ? 0x10
+#	ether	0x110 00:40:33
+	ether	0x110
+	insert	logger -t pccard:$device -s ADDTRON EP-210A inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s ADDTRON EP-210A removed
+	remove	/sbin/ifconfig $device delete
+
 # PLANEX (PLANET) FNW-3700-T
 card "Fast Ethernet" "16-bit PC Card"
-	config  auto "ed0" ? 0x30000
+	config	auto "ed0" ? 0x30000
 	insert	logger -t pccard:$device -s Planex FNW-3700-T inserted
-	insert  /etc/pccard_ether $device
+	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s Planex FNW-3700-T removed
-	remove  /etc/pccard_ether_remove $device
+	remove	/sbin/ifconfig $device delete
 
 # Planex FNW-3600-T 16bit FastEthernet
 card "Fast Ethernet" "Adapter"
@@ -450,8 +709,24 @@
 	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
+	remove	/sbin/ifconfig $device delete
+
+# Grey Cell GCS2220 Ethernet Card
+card "Grey Cell" "GCS2220"
+	config	auto "ed0" ? 0x10
+	insert	logger -t pccard:$device -s Grey Cell GCS2220 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Grey Cell GCS2220 removed
+	remove	/sbin/ifconfig $device delete
 
+# GVC NIC-2000P Ethernet Card
+card "GVC" "NIC-2000p"
+	config	auto "ed0" ? 0x10
+	insert	logger -t pccard:$device -s GVC NIC-200P inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s GVC NIC-200P removed
+	remove	/sbin/ifconfig $device delete
+
 # IBM PCMCIA Ethernet I/II
 card "IBM Corp." "Ethernet"
 	config	0x1 "ed0" ?
@@ -477,6 +752,17 @@
 	remove	logger -t pccard:$device -s IC-CARD+ Ethernet card removed
 	remove	ifconfig $device delete
 
+# I/O DATA PCLA/T
+card "I-O DATA" "PCLA"
+	config	auto "ed0" ? 0x10
+#	ether	0x1c0 00:a0:b0
+#	ether	0xff0 00:a0:b0
+	ether	0xff0
+	insert	logger -t pccard:$device -s I-O DATA PCLA/T Ethernet inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s I-O DATA PCLA/T Ethernet removed
+	remove	ifconfig $device delete
+
 # I-O DATA PCLATE
 card "IO DATA" "PCLATE"
 	config	0x20 "ed0" ? 0x10
@@ -493,13 +779,38 @@
 	remove	logger -t pccard:$device -s IO DATA PCETTX removed
 	remove	/sbin/ifconfig $device delete
 
-# Kingston KNE PC-2
+# KANSAI ELECTRIC KLA-PCM/T
+card "KANSAI ELECTRIC CO.,LTD" "KLA-PCM/T"
+	config	0x1 "ed0" 15
+	insert	logger -t pccard:$device -s KANSAI ELECTRIC KLA-PCM/T inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s KANSAI ELECTRIC KLA-PCM/T removed
+	remove	/sbin/ifconfig $device delete
+
+# Kingston KNE-PC2
 card "Kingston" "KNE-PC2"
 	config	default "ed0" ?
-	insert	logger -t pccard:$device -s Kingston KNE-PC2
+	insert	logger -t pccard:$device -s Kingston KNE-PC2 inserted
 	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Kingston KNE-PC2
-	remove	/etc/pccard_ether_remove $device
+	remove	logger -t pccard:$device -s Kingston KNE-PC2 removed
+	remove	/sbin/ifconfig $device delete
+
+# Kingston KNE-PCM/x Ethernet
+card "Kingston Technology Corp." "/EtheRx PC Card Ethernet.*/"
+	config	auto "ed0" ?
+	ether	0xff0
+	insert	logger -t pccard:$device -s Kingston KNE-PCM/x Ethernet inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Kingston KNE-PCM/x Ethernet removed
+	remove	/sbin/ifconfig $device delete
+
+# ELECOM Laneed LD-10/100CD
+card "Laneed" "LD-10/100CD"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s Laneed LD-10/100CD inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Laneed LD-10/100CD removed
+	remove	/sbin/ifconfig $device delete
 
 # Elecom Laneed LD-CDF
 card "Laneed" "LD-CDF"
@@ -509,6 +820,14 @@
 	remove	logger -t pccard:$device -s Elecom Laneed LD-CDF removed
 	remove	/sbin/ifconfig $device delete
 
+# ELECOM Laneed LD-CDS
+card "Laneed" "LD-CDS"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s Laneed LD-CDS inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Laneed LD-CDS removed
+	remove	/sbin/ifconfig $device delete
+
 # Linksys Combo PCMCIA EthernetCard (model EC2T on box) 
 card "Linksys" "Combo PCMCIA EthernetCard (EC2T)"
 	config	0x1 "ed0" ? 
@@ -517,6 +836,14 @@
 	remove	logger -t pccard:$device -s Linksys Ethernet removed 
 	remove	/sbin/ifconfig $device delete 
 
+# Linksys Combo PCMCIA Ethernet Card
+card "LINKSYS" "E-CARD"
+	config	auto "ed0" ? 0x10
+	insert	logger -t pccard:$device -s Linksys Combo Ethernet inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Linksys Combo Ethernet removed
+	remove	/sbin/ifconfig $device delete
+
 # Linksys EtherFast 10/100 Intergrated PC Card (PCM100)
 card "Linksys" "EtherFast 10/100 Integrated PC Card (PCM100)"
 	config	auto "ed0" ?
@@ -534,20 +861,20 @@
 	remove	logger -t pccard:$device -s Linksys Fast 100-BaseT removed
 	remove	/sbin/ifconfig $device delete
 
-# KANSAI ELECTRIC KLA-PCM/T
-card "KANSAI ELECTRIC CO.,LTD" "KLA-PCM/T"
-	config	0x1 "ed0" 15
-	insert	logger -t pccard:$device -s KANSAI ELECTRIC KLA-PCM/T inserted
+# Logitec LPM-LN100TX 100BASE-TX Ethernet LAN CARD
+card "Logitec" "LPM-LN100TX"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s Logitec LPM-LN100TX Ethernet inserted
 	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s KANSAI ELECTRIC KLA-PCM/T removed
+	remove	logger -t pccard:$device -s Logitec LPM-LN100TX Ethernet removed
 	remove	/sbin/ifconfig $device delete
 
-# Kingston KNE-PC2
-card "Kingston" "KNE-PC2"
-	config default "ed0" ?
-	insert	logger -t pccard:$device -s Kingston KNE-PC2 inserted
+# Logitec LPM-LN20T
+card "Logitec" "LPM-LN20T"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s Logitec LPM-LN20T inserted
 	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Kingston KNE-PC2 removed
+	remove	logger -t pccard:$device -s Logitec LPM-LN20T removed
 	remove	/sbin/ifconfig $device delete
 
 # Socket LP-E (WinCE Low Power Ethernet)
@@ -558,6 +885,42 @@
 	remove	logger -t pccard:$device -s Socket LP-E removed
 	remove	/etc/pccard_ether_remove $device
 
+# ELECOM Laneed LD-CDWA (DP83902A)
+card "MACNICA" "ME1-JEIDA"
+	config	auto "ed0" ?
+#	ether	0xb8 08:00:42
+	ether	0xb8
+	insert	logger -t pccard:$device -s MACNICA PCMCIA Ethernet inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s MACNICA PCMCIA Ethernet removed
+	remove	/etc/pccard_ether_remove $device
+
+# Matsushita Electric Industrial Co.,LTD. CF-VEL211P-B
+card "Matsushita Electric Industrial Co.,LTD." "CF-VEL211"
+	config	auto "ed0" ?
+#	ether	0xff0 00:80:45
+	ether	0xff0
+	insert	logger -t pccard:$device -s Panasonic CF-VEL211 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Panasonic CF-VEL211 removed
+	remove	/etc/pccard_ether_remove $devicen
+
+# MELCO LPC2-T
+card "MELCO" "LPC2-T"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s MELCO LPC2-T inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s MELCO LPC2-T removed
+	remove	/etc/pccard_ether_remove $device
+
+# MELCO LPC2-TX
+card "MELCO" "LPC2-TX"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s MELCO LPC2-TX inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s MELCO LPC2-TX removed
+	remove	/etc/pccard_ether_remove $device
+
 # Melco LPC-T (PIO mode)
 card "MELCO" "LPC3-TX"
 	config	0x1 "ed0" ? 0x30000
@@ -567,6 +930,16 @@
 	remove	logger -t pccard:$device -s MELCO LPC3-TX removed
 	remove	/sbin/ifconfig $device delete
 
+# National Semiconductor InfoMover 4100
+card "National Semiconductor" "InfoMover 4100"
+	config	auto "ed0" ?
+#	ether	0xff0 08:00:17
+	ether	0xff0
+	insert	logger -t pccard:$device -s National Semiconductor InfoMover inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s National Semiconductor InfoMover removed
+	remove	/etc/pccard_ether_remove $device
+
 # National Semiconductor InfoMover NE4100
 card "National Semiconductor" "InfoMover NE4100"
 	config	0x1 "ed0" ?
@@ -576,9 +949,27 @@
 	remove	logger -t pccard:$device -s National Semiconductor InfoMover NE4100 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
+
+# NEC PC-9801N-J12
+card "NEC" "PC-9801N-J12"
+	config	auto "ed0" ?
+#	ether	0xff0 00:00:4c
+	ether	0xff0
+	insert	logger -t pccard:$device -s NEC PC-9801N-J12 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s NEC PC-9801N-J12 removed
+	remove	/etc/pccard_ether_remove $device
+
 # BayNetworks NETGEAR FA410TXC Fast Ethernet
 card "NETGEAR" "FA410TX"
-	config	0x20 "ed0" ?
+	config	auto "ed0" ?
 	insert	logger -t pccard:$device -s NETGEAR FA410TX Ethernet inserted
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s NETGEAR FA410TX Ethernet removed
@@ -600,14 +991,60 @@
         remove  echo Network Everywhere Fast Ethernet removed
         remove  /sbin/ifconfig ed1 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
+# New Media Corporation LiveWire 10/100
+card "New Media Corporation" "LiveWire 10/100"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s New Media LiveWire 10/100 inserted
 	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s NDC Ethernet Instant-Link adapter removed
-	remove	/sbin/ifconfig $device delete
+	remove	logger -t pccard:$device -s New Media LiveWire 10/100 removed
+	remove	/etc/pccard_ether_remove $device
+
+# NextCom Next Hawk Etherneet Adapter
+card "NextCom K.K." "Next Hawk"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s NextCom Next Hawk Ethernet inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s NextCom Next Hawk Ethernet removed
+	remove	/etc/pccard_ether_remove $device
+
+# Nihon Unisys, Ltd. JPF0400-ETH
+card "Nihon Unisys, Ltd." "JPF0400-ETH"
+	config	auto "ed0" ?
+#	ether	0xff0 00:80:45
+	ether	0xff0
+	insert	logger -t pccard:$device -s Nihon Unisys JPF0400-ETH inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Nihon Unisys JPF0400-ETH removed
+	remove	/etc/pccard_ether_remove $device
+
+# Nihon Unisys, Ltd. JPF0400-LAN
+card "Nihon Unisys, Ltd." "JPF0400-LAN"
+	config	auto "ed0" ?
+#	ether	0xff0 00:80:45
+	ether	0xff0
+	insert	logger -t pccard:$device -s Nihon Unisys JPF0400-LAN inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Nihon Unisys JPF0400-LAN removed
+	remove	/etc/pccard_ether_remove $device
 
+# No-brand NE-2000 compatible card
+card "PCMCIA" "ETHERNET V1.0"
+	config	auto "ed0" ? 0x10
+#	ether	0xff0		# MAC address field should be filled
+	ether	0xff0
+	insert	logger -t pccard:$device -s PCMCIA ETHERNET V1.0 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s PCMCIA ETHERNET V1.0 removed
+	remove	/etc/pccard_ether_remove $device
+
+# Telecom Device SuperSocket HPC100
+card "PCMCIA" "FastEthernet"
+	config	auto "ed0" ? 0x30000
+	insert	logger -t pccard:$device -s Telecom Device SuperSocket HPC100 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Telecom Device SuperSocket HPC100 removed
+	remove	/etc/pccard_ether_remove $device
+
 # Billionton 10Base-TX ETHERNET PCCARD (aka UE2216)
 # Also Genuius "Ethernet ME3000II SE"
 card "PCMCIA" "PCMCIA-ETHERNET-CARD"
@@ -626,6 +1063,14 @@
 	remove	logger -t pccard:$device -s UE2212 removed
 	remove	/sbin/ifconfig $device delete
 
+# EXPsys PCMCIA Ethernet Combo, Relia PCMCIA Ethernet
+card "PCMCIA LAN" "Ethernet"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s EXPsys Ethernet inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s EXPsys Ethernet removed
+	remove	/etc/pccard_ether_remove $device
+
 # LinkMates LM 336 LAN Fax/Modem PC Card
 card "PCMCIAs" "ComboCard"
 	config	0x24 "ed0" ? 0x10
@@ -634,7 +1079,43 @@
 	remove	logger -t pccard:$device -s LinkMates LM 336 removed
 	remove	/sbin/ifconfig $device delete
 
+# Telecom Device SuperSocket LM336 (as Ethernet only)
+card "PCMCIAs" "LanModem"
+	config	default "ed0" ?
+	insert	logger -t pccard:$device -s SuperSocket LM336 inserted as Ethernet
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s SuperSocket LM336 removed
+	remove	/etc/pccard_ether_remove $device
+
+# PreMax PE-200 Ethernet Card
+card "PMX   " "PE-200"
+	config	auto "ed0" ? 0x10
+#	ether	0x7f0 00:20:e0
+	ether	0x7f0
+	insert	logger -t pccard:$device -s PREMAX PE-200 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s PREMAX PE-200 removed
+	remove	/etc/pccard_ether_remove $device
 
+# Psion Dacom Gold Card V34 Ethernet GSM
+# as ethernet
+card "Psion Dacom" "Gold Card V34 Ethernet GSM"
+	config	default "ed0" ?
+	insert	logger -t pccard:$device -s Psion Dacom Gold Card inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Psion Dacom Gold Card removed
+	remove	/etc/pccard_ether_remove $device
+
+# RIOS PC CARD3 ETHERNET
+card "RIOS Systems Co." "PC CARD3 ETHERNET"
+	config	auto "ed0" ?
+#	ether	0xff0 00:00:48
+	ether	0xff0
+	insert	logger -t pccard:$device -s RIOS PC CARD3 ETHERNET inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s RIOS PC CARD3 ETHERNET removed
+	remove	/etc/pccard_ether_remove $device
+
 # RPTI EP401 Ethernet card
 card "RPTI" "EP401 Ethernet NE2000 Compatible"
 	config	0x22 "ed0" 9 
@@ -643,6 +1124,34 @@
 	remove	logger -t pccard:$device -s RPTI EP401 removed
 	remove	/sbin/ifconfig $device delete
 
+# SCM Ethernet Combo (*Not SMC :-)*)
+card "SCM" "Ethernet Combo card"
+	config	auto "ed0" ? 0x10
+#	ether	0xff0 00:20:cb
+	ether	0xff0
+	insert	logger -t pccard:$device -s SCM Ethernet card inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s SCM Ethernet card removed
+	remove	/etc/pccard_ether_remove $device
+
+# Epson EEN10B Ethernet Card
+card "Seiko Epson Corp." "Ethernet"
+	config	auto "ed0" ? 0x10
+#	ether	0xff0 00:00:48
+	ether	0xff0
+	insert	logger -t pccard:$device -s Epson EEN10B Ethernet Card inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Epson EEN10B Ethernet Card removed
+	remove	/etc/pccard_ether_remove $device
+
+# 3way 3WL-847-TX
+card "SUN WAY" "3WL-847-TX 100BASE-TX"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s 3way 3WL-847-TX inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s 3way 3WL-847-TX removed
+	remove	/etc/pccard_ether_remove $device
+
 # Surecom EtherPerfect EP-427
 card "TAMARACK" "Ethernet"
 	config	0x21 "ed0" ?
@@ -659,6 +1168,31 @@
 	remove	logger -t pccard:$device -s Xircom CompactCard Ethernet card removed
 	remove	ifconfig $device delete
 
+# Telecom Device SuperSocket RE450T and RE550T
+card "Telecom Device K.K." "/SuperSocket RE[45]50T/"
+	config	auto "ed0" ?
+	insert	logger -t pccard:$device -s Telecom Device SuperSocket REx50T inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Telecom Device SuperSocket REx50T removed
+	remove	/etc/pccard_ether_remove $device
+
+# Toshiba Joho System PTJ-LAN/T
+card "TJ" "Ethernet"
+	config	auto "ed0" ? 0x10
+	insert	logger -t pccard:$device -s TJ Ethernet card inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s TJ Ethernet card removed
+	remove	/etc/pccard_ether_remove $device
+
+# XXX NOT SURE SUPPORTED
+# Xircom CompactCard Ethernet 10 (CFE-10)
+#card "Xircom" "CompactCard Ethernet"
+#	config	auto "ed0" ?
+#	insert	logger -t pccard:$device -s Xircom CF inserted
+#	insert	/etc/pccard_ether $device
+#	remove	logger -t pccard:$device -s Xircom CF removed
+#	remove	/etc/pccard_ether_remove $device
+
 ########## ep ##########
 
 # 3Com Fast Etherlink 3C574TX
@@ -677,6 +1211,15 @@
 	remove	logger -t pccard:$device -s 3Com Megahertz 3CXEM556 removed
 	remove	/sbin/ifconfig $device delete
 
+# 3Com Megahertz 3CCFEM556BI, 3CXEM556B
+# as ethernet
+card "3Com" "/Megahertz 3C.*EM556/"
+	config	default "ep0" ? 0x1
+	insert	logger -t pccard:$device -s 3com Megahertz 10/100 LAN+56K Modem inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s 3com Megahertz 10/100 LAN+56K Modem removed
+	remove	/sbin/ifconfig $device delete
+
 # 3Com Megahertz 574B
 card "3Com" "Megahertz 574B"
 	config	0x1 "ep0" ? 0x1
@@ -750,6 +1293,113 @@
 
 ########## fe ##########
 
+# XXX NOT SUPPORTED YET
+# 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
+
+# XXX NOT SUPPORTED YET
+# Eiger Labs EPX-10BT
+#card "Eiger labs,Inc." "EPX-10BT PC Card Ethernet 10BT"
+#	config	0x20 "fe" ?
+#	insert	/etc/pccard_ether $device
+#	insert	logger -t pccard:$device -s Eiger EPX-10BT inserted
+#	remove	/sbin/ifconfig $device delete
+#	remove	logger -t pccard:$device -s Eiger EPX-10BT removed
+
+# XXX NOT SUPPORTED YET
+# Fujitsu FMV-J182, FMV-J182A
+#card "FUJITSU" "LAN Card(FMV-J182)"
+#	config	auto "fe0" ?
+#	# 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
+#	insert	logger -t pccard:$device -s Fujitsu FMV-J182 inserted
+#	insert	/etc/pccard_ether $device
+#	remove	logger -t pccard:$device -s Fujitsu FMV-J182 removed
+#	remove	/sbin/ifconfig $device delete
+
+# XXX NOT SUPPORTED YET
+# Fujitsu Towa LA501 Ethernet
+#card "FUJITSU TOWA" "LA501"
+#	config	auto "fe1" ? 0x10
+##	ether	0x332 00:00:0e
+#	ether	0x332 
+#	insert	logger -t pccard:$device -s Fujitsu Towa LA501 Ethernet inserted
+#	insert	/etc/pccard_ether $device
+#	remove	logger -t pccard:$device -s Fujitsu Towa LA501 Ethernet removed
+#	remove	/sbin/ifconfig $device delete
+
+# XXX NOT SUPPORTED YET
+# 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
+
+# XXX NOT SUPPORTED YET
+# NextCom J Link NC5310
+#card "NextComK.K." "/NC5310 Ver1\.0.*/"
+#	config	auto "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	/etc/pccard_ether_remove $device
+
+# XXX NOT SUPPORTED YET
+# RATOC REX-5588, REX-9822, REX-4886
+#card "PCMCIA LAN MBH10304  ES" "  01"
+#	config	auto "fe0" ?
+#	ether	0x32c 00:c0:d0  # many minor revs....
+#	ether	0x328 00:c0:d0
+#	ether	0x200 00:c0:d0
+#	insert	logger -t pccard:$device -s RATOC REX-5588 Ethernet inserted
+#	insert	/etc/pccard_ether $device
+#	remove	logger -t pccard:$device -s RATOC REX-5588 Ethernet removed
+#	remove	/etc/pccard_ether_remove $device
+
+# XXX NOT SUPPORTED YET
+# 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
+
+# XXX NOT SUPPORTED YET
+# RATOC REX-R280
+#card "RATOC System Inc." "10BASE_T CARD R280"
+#	config	auto "fe0" ?
+##	ether	0x1fc 00:c0:d0
+#	ether	0x1fc
+#	insert	logger -t pccard:$device -s RATOC REX-R280 inserted
+#	insert	/etc/pccard_ether $device
+#	remove	logger -t pccard:$device -s RATOC REX-R280 removed
+#	remove	/etc/pccard_ether_remove $device
+
+# XXX NOT SUPPORTED YET
+# TDK LAK-CD021, LAK-CD021A, LAK-CD021BX
+#card "TDK" "LAC-CD02x"
+#	config	auto "fe0" ?
+#	# 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	logger -t pccard:$device -s TDK LAC-CD021 inserted
+#	insert	/etc/pccard_ether $device
+#	remove	logger -t pccard:$device -s TDK LAC-CD021 removed
+#	remove	/etc/pccard_ether_remove $device
+
 # Fujitsu MBH10303 Ethernet PCMCIA
 card "EAGLE Technology" "NE200 ETHERNET LAN MBH10303  "
 	config	0x1 "fe0" ?
@@ -758,14 +1408,6 @@
 	remove	/sbin/ifconfig $device delete
 	remove	logger -t pccard:$device -s Fujitsu MBH10303 removed
 
-# Eiger Labs EPX-10BT
-card "Eiger labs,Inc." "EPX-10BT PC Card Ethernet 10BT"
-	config	0x20 "fe" ?
-	insert	/etc/pccard_ether $device
-	insert	logger -t pccard:$device -s Eiger EPX-10BT inserted
-	remove	/sbin/ifconfig $device delete
-	remove	logger -t pccard:$device -s Eiger EPX-10BT removed
-
 # HITACHI HT-4840-11
 card "HITACHI" "HT-4840-11"
 	config	0x1a "fe0" ?
@@ -798,21 +1440,150 @@
 	insert	logger -t pccard:$device -s Libretto Floopy Disk inserted
 	remove	logger -t pccard:$device -s Libretto Floopy Disk removed
 
+########## gp ##########
+
+# XXX NOT SUPPORTED YET
+# National Instruments PCMCIA-GPIB Cards
+#card "National Instruments" "PCMCIA-GPIB"
+#	config	default "gp0" pio
+#	insert	logger -t pccard:$device -s National Instruments PCMCIA-GPIB card inserted
+#	remove	logger -t pccard:$device -s National Instruments PCMCIA-GPIB card removed
+
+########## hss ##########
+
+# XXX NOT SUPPORTED YET
+# Hitachi microcomputer speech synthesizer card
+#card "/HITACHI MICROCOMPUTER SYSTEM LTD.*/" "MSSHVPC02"
+#	config	default "hss0" pio
+#	insert	logger -t pccard:$device -s Hitachi microcomputer speech synthesizer inserted
+#	remove	logger -t pccard:$device -s Hitachi microcomputer speech synthesizer removed
+
+########## joy ##########
+
+# XXX NOT SUPPORTED YET
+# IO DATA PCJOY
+#card    "IO DATA" "PCJOY"
+#	config	default "joy0" pio
+##	config	0x1 "joy0" pio
+##	config	0x2 "joy0" pio
+#	insert	logger -t pccard:$device -s IO DATA PCJOY inserted
+#	remove	logger -t pccard:$device -s IO DATA PCJOY removed
+
 ########## ncv ##########
 
+# XXX NOT SUPPORTED YET
+# New Media Corporation BASICS SCSI
+# (Do not put this entry under Bustoaster)
+#card "BASICS by New Media Corporation" "SCSI Sym53C500"
+#	config	0x14 "ncv0" ?
+#	insert	logger -t pccard:$device -s New Media BASICS SCSI inserted
+#	remove	logger -t pccard:$device -s New Media BASICS SCSI removed
+
+# XXX NOT SUPPORTED YET
+# Media Intelligent SCSI-2 PC Card MSC-200
+#card "EPSON" "SCSI-2 PC Card SC200"
+#	config	0x12 "ncv0" ?
+#	insert	logger -t pccard:$device -s EPSON SCSI-2 PC Card MSC200 inserted
+#	remove	logger -t pccard:$device -s EPSON SCSI-2 PC Card MSC200 removed
+
+# XXX NOT SUPPORTED YET
 # KME (TAXAN ICD-400PN, etc.)
-card "KME" "KXLC002"
-	config	0x26 "ncv" ? 0xb4d00000
-	insert	logger -t pccard:$device -s KME SCSI PCMCIA Card inserted
-	remove	logger -t pccard:$device -s KME SCSI PCMCIA Card removed
+#card "KME" "KXLC002"
+#	config	0x26 "ncv" ? 0xb4d00000
+#	insert	logger -t pccard:$device -s KME SCSI PCMCIA Card inserted
+#	remove	logger -t pccard:$device -s KME SCSI PCMCIA Card removed
+
+# XXX NOT SUPPORTED YET
+# KME KXLC004
+#card "KME" "KXLC004"
+#	config	default "ncv0" ? 0xb4d00001
+#	insert	logger -t pccard:$device -s KME KXLC004 SCSI PCMCIA Card inserted
+#	remove	logger -t pccard:$device -s KME KXLC004 SCSI PCMCIA Card removed
+
+# XXX NOT SUPPORTED YET
+# IO DATA PCSC-DV
+# Macnica Miracle SCSI mPS100
+#card "MACNICA" "MIRACLE SCSI" "mPS100" "D.0"
+#	config	0x11 "ncv0" ? 0xb6250000
+#	insert	logger -t pccard:$device -s MACNICA Miracle SCSI inserted
+#	remove	logger -t pccard:$device -s MACNICA Miracle SCSI removed
+
+# XXX NOT SUPPORTED YET
+# Macnica Miracle SCSI-II mPS110
+#card "MACNICA" "MIRACLE SCSI-II mPS110"
+#	config	0x15 "ncv0" ? 0
+#	insert	logger -t pccard:$device -s MACNICA Miracle SCSI-II inserted
+#	remove	logger -t pccard:$device -s MACNICA Miracle SCSI-II removed
+
+# XXX NOT SUPPORTED YET
+# NEC PC-9801N-J03R
+#card "NEC" "PC-9801N-J03R"
+#	config	0x15 "ncv0" ? 0
+#	insert	logger -t pccard:$device -s NEC PC-9801N-J03R inserted
+#	remove	logger -t pccard:$device -s NEC PC-9801N-J03R removed
+
+# XXX NOT SUPPORTED YET
+# Qlogic Fast SCSI
+#card "QLOGIC CORPORATION" "pc05"
+#	config	0x2f "ncv0" ? 0x84d00000
+#	insert	logger -t pccard:$device -s Qlogic Fast SCSI inserted
+#	remove	logger -t pccard:$device -s Qlogic Fast SCSI removed
+
+# XXX NOT SUPPORTED YET
+# RATOC REX-9530
+#card "RATOC System Inc." "/SCSI2 CARD.*/"
+#	config	auto "ncv0" ? 0x84d00000
+#	insert	logger -t pccard:$device -s RATOC REX-9530 SCSI inserted
+#	remove	logger -t pccard:$device -s RATOC REX-9530 SCSI removed
+
+# XXX NOT SUPPORTED YET
+# RATOC REX-5572 (as SCSI only)
+#card "RATOC System Inc." "/SOUND/SCSI2 CARD.*/"
+#	config	default "ncv0" ? 0x84d00000
+##	cardio	0x640 0x10
+#	iosize	16
+#	insert	logger -t pccard:$device -s RATOC SOUND/SCSI2 REX-5572 inserted as SCSI
+#	remove	logger -t pccard:$device -s RATOC SOUND/SCSI2 REX-5572 removed
 
 ########## nsp ##########
 
+# XXX NOT SUPPORTED YET
+# WORKBIT Ninja SCSI series
+#card "IO DATA" "CBSC16       "
+#	config	default "nsp" ?
+#	insert	logger -t pccard:$device -s Workbit NinjaSCSI-3 inserted
+#	remove	logger -t pccard:$device -s Workbit NinjaSCSI-3 removed
+
+# XXX NOT SUPPORTED YET
 # WORKBIT Ninja SCSI series
-card "IO DATA" "CBSC16       "
-	config	default "nsp" ?
-	insert	logger -t pccard:$device -s Workbit NinjaSCSI-3 inserted
-	remove	logger -t pccard:$device -s Workbit NinjaSCSI-3 removed
+#card "WBT" "NinjaSCSI-3"
+#	config	default "nsp0" ?
+#	insert	logger -t pccard:$device -s Workbit NinjaSCSI-3 inserted
+#	remove	logger -t pccard:$device -s Workbit NinjaSCSI-3 removed
+
+# XXX NOT SUPPORTED YET
+# WORKBIT Ninja SCSI series (PIO mode)
+#card "WBT" "NinjaSCSI-3"
+#	config	default "nsp0" ? 0x1
+#	insert	logger -t pccard:$device -s Workbit NinjaSCSI-3 inserted
+#	remove	logger -t pccard:$device -s Workbit NinjaSCSI-3 removed
+
+########## opl ##########
+
+# XXX NOT SUPPORTED YET
+# RATOC REX-5570 Sound Card
+#card "1195 RATOC System Inc." "REX5570 SOUND CARD"
+#	config	default "opl0" ?
+
+########## scc ##########
+
+# XXX NOT SUPPORTED YET
+# IBM Smart Capture Card
+#card "IBM Corp." "Video Capture"
+#	config	default "scc0" pio
+#	cardmem 0xd4000 0x0 0x8000
+#	insert	logger -t pccard:$device -s Smart Capture Card inserted
+#	remove	logger -t pccard:$device -s Smart Capture Card removed
 
 ########## sio ##########
 
@@ -853,6 +1624,18 @@
 	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 
 
+# AIWA PV-JF3356
+card "AIWA CO.,LTD. MODEM" "PV-JF3356"
+	config	auto "sio3" ? 0x40000
+	insert	logger -t pccard:$device -s AIWA PV-JF3356 inserted
+	remove	logger -t pccard:$device -s AIWA PV-JF3356 removed
+
+# APEX DATA MultiCard (as Modem only)
+card "APEX DATA" "MULTICARD"
+	config	0xb "sio3" ?
+	insert	logger -t pccard:$device -s APEX DATA MultiCard inserted as Modem
+	remove	logger -t pccard:$device -s APEX DATA MultiCard removed
+
 # Eiger 33.6 modem
 card "AT&T" "V34+ Fax Modem"
 	config	0x23 "sio1" ?
@@ -943,6 +1726,12 @@
 	insert	logger -t pccard:$device -s IBM 56K PC Card Modem inserted
 	remove	logger -t pccard:$device -s IBM 56K PC Card Modem removed
 
+# 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 "sio3" ?
+	insert	logger -t pccard:$device -s Intel EtherExpress PRO/100 LAN/Modem as Modem
+	remove	logger -t pccard:$device -s Intel EtherExpress PRO/100 LAN/Modem
+
 # US Robotics Worldport 14400
 card "Intel" "MODEM 2400+"
 	config	0x2 "sio1" ?
@@ -1012,12 +1801,26 @@
 	insert	logger -t pccard:$device -s Megahertz XJ4336 inserted
 	remove	logger -t pccard:$device -s Megahertz XJ4336 removed
 
+# XXX generic serial?
+# Megahertz X-Jack Ethernet/Modem 14.4K (as Modem only)
+card "Megahertz" "XJEM1144/CCEM1144"
+	config	0x27 "sio3" ?
+	insert	logger -t pccard:$device -s Megahertz X-Jack Multifunction Card inserted as Modem.
+	remove	logger -t pccard:$device -s Megahertz X-Jack Multifunction Card removed.
+
 # Motorola Montana 
 card "Motorola" "MONTANA 33.6 FAX/MODEM"
 	config	0x21 "sio1" ?
 	insert	logger -t pccard:$device -s Motorola Montana 33.6K FAX/modem inserted
 	remove	logger -t pccard:$device -s Motorola Montana 33.6K FAX/modem removed
 
+# XXX generic serial?
+# Motorola Marine multifunction card (as modem)
+card "Motorola, Inc." "MARINER MODEM/FAX/LAN"
+	config	0x35 "sio3" ?
+	insert	logger -t pccard:$device -s Motorola Marine inserted as Modem
+	remove	logger -t pccard:$device -s Motorola Marine removed
+
 # NTT ThunderCard Modem
 card "NTT-IT CO., LTD" "ThunderCard AVF288, V.34"
 	config	0x22 "sio2" ?
@@ -1039,17 +1842,24 @@
 	remove	logger -t pccard:$device -s NTT DoCoMo Paldio 611S PC Card 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 Mark2 inserted
+	remove	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter Mark2 removed
+
+# NTT DoCoMo DATA/FAX Adapter
+card "NTT DoCoMo" "/PCMCIA DATA/FAX.*/"
+	config	auto "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-IT ThunderCard
+card "NTT Intelligent Technology Co., Ltd." "ThunderCard DD128"
+	config	auto "sio3" ? 0x80
+	reset	1000
+	insert	logger -t pccard:$device -s NTT-IT Thunder-card inserted
+	remove	logger -t pccard:$device -s NTT-IT Thunder-card removed
+
 # NTT DoCoMo (formerly NTT Personal) FAX/Data 32K PHS Card Paldio 321S
 card "NTT Personal" "32K Paldio 321S PC CARD"
 	config	0x23 "sio2" ?
@@ -1062,6 +1872,12 @@
 	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
 
+# NTT Personal Paldio Data Card DC-1S
+card "NTT Personal" "/Paldio Data.*/" "DC-1S"
+	config	auto "sio3" ? 0x40000
+	insert	logger -t pccard:$device -s NTT Personal Paldio Data Card DC-1S inserted
+	remove	logger -t pccard:$device -s NTT Personal Paldio Data Card DC-1S removed
+
 # Nokia Cellular Data Card
 card "Nokia Mobile Phones" "DTP-2"
 	config	0x22 "sio2" ?
@@ -1185,6 +2001,18 @@
 	insert	logger -t pccard:$device -s RFI Hotline inserted
 	insert	remove -t pccard:$device -s RFI Hotline removed
 
+# SII MC-6530
+card "SII" "PHS DATA 32S"
+	config	auto "sio3" ? 0x40000
+	insert	logger -t pccard:$device -s SII MC-6530 inserted
+	remove	logger -t pccard:$device -s SII MC-6530 removed
+
+# SII (DDI) MC-6550
+card "SII" "PHS DATA 64"
+	config	auto "sio3" ? 0x40000
+	insert	logger -t pccard:$device -s SII MC-6550 inserted
+	remove	logger -t pccard:$device -s SII MC-6550 removed
+
 # TDK 14.4 FAX/Data Modem
 card "TDK" "DF1414 DATA/FAX MOD"
 	config	0x23 "sio2" ?
@@ -1204,6 +2032,27 @@
 	insert logger -t pccard:$device -s TDK ISDN Adapter DN1280R inserted
 	remove logger -t pccard:$device -s TDK ISDN Adapter DN1280R removed
 
+# TDK DP9600
+card "TDK" "DP9600"
+	config	auto "sio3" ? 0x40000
+	insert	logger -t pccard:$device -s TDK DP9600 inserted
+	remove	logger -t pccard:$device -s TDK DP9600 removed
+
+# XXX NOT SURE SUPPORTED
+# TDK Multifunctioon Card (as Modem)
+#card "TDK" "GlobalNetworker 3410/3412"
+#	config	auto "sio3" ? 0x40000
+#	insert	logger -t pccard:$device -s TDK Multifunction Card inserted as Modem
+#	remove	logger -t pccard:$device -s TDK Multifunction Card removed
+
+# XXX NOT SURE SUPPORTED
+# XXX generic serial?
+# Toshiba Modem/LAN card IPC5001B
+#card "TOSHIBA" "Modem/LAN Card"
+#	config	0x25 "sio3" ?
+#	insert	logger -t pccard:$device -s TOSHIBA IPC5001B Multifunction Card inserted as Modem
+#	remove	logger -t pccard:$device -s TOSHIBA IPC5001B Multifunction Card removed
+
 # 3Com/USR/Toshiba SLIMV90
 card "TOSHIBA" "SLIMV90"
 	config 0x4 "sio1" ?
@@ -1283,16 +2132,54 @@
 	insert	logger -t pccard:$device -s Megahertz X-Jack Ethernet inserted
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s Megahertz X-Jack Ethernet removed
+	remove	/sbin/ifconfig $device delete
+
+# Megahertz Ethernet Adapter
+card "Megahertz" "ETHERNET ADAPTOR"
+	config	auto "sn0" ?
+#	ether	attr2hex 00:00:86
+	ether	attr2
+	insert	logger -t pccard:$device -s Megahertz Ethernet inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Megahertz Ethernet removed
 	remove	/etc/pccard_ether_remove $device
 
-# SMC EtherEZ Combo
+# Megahertz X-Jack Ethernet/Modem 14.4K
+#card "MEGAHERTZ" "XJEM1144/CCEM1144"
+#	multifunc
+#	config	default "sn0" ?
+#	config	0x27 "sio3" shared
+#	insert	logger -t pccard:$device -s Megahertz X-Jack Multifunction Card inserted
+#	remove	logger -t pccard:$device -s Megahertz X-Jack Multifunction Card removed
+
+# MELCO LPC-TX
+card "MELCO/SMC" "LPC-TX"
+	config	auto "sn0" ?
+#	ether	0x4a 00:a0:dc
+	ether	0x4a
+	insert	logger -t pccard:$device -s MELCO/SMC LPC-TX inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s MELCO/SMC LPC-TX removed
+	remove	/etc/pccard_ether_remove $device
+
+# SMC EtherEZ Combo(SMC8020BT)
 card "SMC" "EtherEZ Ethernet 8020"
 	config	default "sn" ?
+#	ether	0x9a 00:00:c0
+#	ether	0x9a
 	insert	logger -t pccard:$device -s SMC EtherEZ Ethernet 8020 inserted
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s SMC EtherEZ Ethernet 8020 removed
-	remove	/etc/pccard_ether_remove $device
+	remove	/sbin/ifconfig $device delete
 
+# Victor M-MOIL CARD
+card "JVC" "MiniMoil Ethernet Card"
+	config	0x01 "sn0" ?
+	insert	logger -t pccard:$device -s MiniMoil Ethernet inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s MiniMoil Ethernet removed
+	remove	/sbin/ifconfig $device delete
+
 ########## spc ##########
 
 # REX5535AC, REX5535X SCSI
@@ -1301,17 +2188,96 @@
 	insert	logger -t pccard:$device -s REX-5535 SCSI card inserted
 	remove	logger -t pccard:$device -s REX-5535 SCSI card removed
 
+########## stg ##########
+
+# XXX NOT SUPPORTED YET
+# RATOC REX-5536, Melco IFC-SC
+#card "1195 RATOC System Inc." "REX5536 SCSI2 CARD"
+#	config	0x7 "stg0" ? 0
+#	insert	logger -t pccard:$device -s RATOC REX-5536 SCSI inserted
+#	remove	logger -t pccard:$device -s RATOC REX-5536 SCSI removed
+
+# XXX NOT SUPPORTED YET
+# Future Domain SCSI2GO
+#card "Future Domain Corporation" "SCSI PCMCIA Credit Card Controller"
+#	config	default "stg0" ?
+#	insert	logger -t pccard:$device -s Future Domain SCSI2GO inserted
+#	remove	logger -t pccard:$device -s Future Domain SCSI2GO removed
+
+# XXX NOT SUPPORTED YET
+# IBM SCSI PCMCIA Card
+#card "IBM Corp." "SCSI PCMCIA Card"
+#	config	default "stg0" ?
+#	insert	logger -t pccard:$device -s IBM SCSI PCMCIA Card inserted
+#	remove	logger -t pccard:$device -s IBM SCSI PCMCIA Card removed
+
+# XXX NOT SUPPORTED YET
+# RATOC REX-5536AM, REX-9836A, ICM PSC-2401 SCSI
+# (Don't put this entry under REX5535 series!)
+# There's a buggy revision of this card which has broken CIS tupples.
+# if you can't use this card, please use the point enabler. (for example,
+# type "pccardc enabler 0 stg0 -a 0x4140 -i 5" from root command prompt)
+#card "PCMCIA SCSI MBH10404" "01"
+#	config	0x37 "stg0" ?
+#	insert	logger -t pccard:$device -s RATOC REX-5536AM SCSI inserted
+#	remove	logger -t pccard:$device -s RATOC REX-5536AM SCSI removed
+
+# XXX NOT SUPPORTED YET
+# RATOC REX-5536M
+#card "PCMCIA SCSI2 CARD" "01"
+#	config	0x5 "stg0" ? 0
+#	insert	logger -t pccard:$device -s RATOC REX-5536M SCSI inserted
+#	remove	logger -t pccard:$device -s RATOC REX-5536M SCSI removed
+
 ########## wlp ##########
 
+# XXX NOT SUPPORTED YET
+# AT&T GIS Wavelan PCMCIA
+# If you want to use Japanese version, uncomment the second config
+# line and comment-out the first line.
+#card "AT&T" "WaveLAN/PCMCIA"
+#	config	default "wlp0" ?      # US version (915MHz)
+##	config	default "wlp0" ? 0x01 # Japanese version (2.4GHz)
+##	ether	wavelan
+#	insert	logger -t pccard:$device -s WaveLAN PCMCIA inserted
+#	insert	/etc/pccard_ether $device
+#	remove	logger -t pccard:$device -s WaveLAN PCMCIA removed
+#	remove	/etc/pccard_ether_remove $device
+
+# XXX NOT SUPPORTED YET
 # Digital RoamAbout
-card "Digital" "RoamAbout/DS"
-	config	auto "wlp0" ?
+#card "Digital" "RoamAbout/DS"
+#	config	auto "wlp0" ?
+##	ether	wavelan
+#	insert	logger -t pccard:$device -s Digital RoamAbout/DS inserted
+#	insert	/usr/sbin/wlpconfig -i wlp0 -w 0xaaaa
+#	insert	/etc/pccard_ether $device
+#	remove	logger -t pccard:$device -s Digital RoamAbout/DS removed
+#	remove	/etc/pccard_ether_remove $device
+
+# XXX NOT SUPPORTED YET
+# Lucent Wavelan
+#card "Lucent Technologies" "WaveLAN/PCMCIA"
+#	config	default "wlp0" ?
 #	ether	wavelan
-	insert	logger -t pccard:$device -s Digital RoamAbout/DS inserted
-	insert	/usr/sbin/wlpconfig -i wlp0 -w 0xaaaa
-	insert	/etc/pccard_ether $device
-	remove	logger -t pccard:$device -s Digital RoamAbout/DS removed
-	remove	/etc/pccard_ether_remove $device
+#	insert	logger -t pccard:$device -s Lucent WaveLAN PCMCIA inserted
+#	insert	/etc/pccard_ether $device
+#	remove	logger -t pccard:$device -s Lucent WaveLAN PCMCIA removed
+#	remove	/etc/pccard_ether_remove $device
+
+# XXX NOT SUPPORTED YET
+# NCR Wavelan PCMCIA
+# If you want to use Japanese version, uncomment the second config
+# line and comment-out the first line.
+#card "NCR" "WaveLAN/PCMCIA"
+#	config	default "wlp0" ?      # US version (915MHz)
+##	config	default "wlp0" ? 0x01 # Japanese version (2.4GHz)
+#	ether	wavelan
+#	insert	logger -t pccard:$device -s NCR WaveLAN PCMCIA inserted
+#	insert	/etc/pccard_ether $device
+#	remove	logger -t pccard:$device -s NCR WaveLAN PCMCIA removed
+#	remove	/etc/pccard_ether_remove $device
+
 
 ########## wi ##########
 
@@ -1382,6 +2348,17 @@
 	remove	logger -t pccard:$device -s Intel EtherExpress PRO/100 Mobile Adapter/16 removed
 	remove	/sbin/ifconfig $device delete
 
+# XXX NOT SURE SUPPORTED
+# Toshiba 10/100 Ethernet PC Card IPC5008A
+#card "Toshiba" "10/100 Ethernet PC Card"
+#	config	auto "xe0" ?
+##	cardio	0x300 0x10
+#	iosize	16
+#	insert	logger -t pccard:$device -s Toshiba 10/100 Ethernet PC Card inserted
+#	insert	/etc/pccard_ether $device
+#	remove	logger -t pccard:$device -s Toshiba 10/100 Ethernet PC Card removed
+#	remove	/etc/pccard_ether_remove $device
+
 # Xircom Realport card + modem
 card "Xircom" "16-bit Ethernet + Modem 56"
 	config	0x27 "xe0" 9
@@ -1397,6 +2374,14 @@
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s Xircom CreditCard Ethernet removed
 	remove	/etc/pccard_ether $device delete
+
+# Xircom CreditCard 10Base-T "CreditCard Ethernet Adaptor IIps" (PS-CE2-10)
+card "Xircom" "CreditCard 10Base-T"
+	config	auto "xe0" ?
+	insert	logger -t pccard:$device -s Xircom CC IIps inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s Xircom CC IIps removed
+	remove	/etc/pccard_ether_remove $device
 
 # Xircom CreditCard Ethernet 10/100 + modem (Ethernet part)
 card "Xircom" "CreditCard Ethernet 10/100 + Modem 56"