Add a bunch of wireless cards from Japan. Shigeru YAMAMOTO-san

brought them to BSDcon and gratiously allowed me to test each one with
the wireless setup here.  In addition, support another CF card which
YAMAMOTO-san also brought.

Also add a Lexar CF card which didn't work with auto on many laptops.

1 files changed, 53 insertions, 7 deletions

diff --git a/etc/defaults/pccard.conf b/etc/defaults/pccard.conf
index 49e64a6..aeb5204 100644
--- a/etc/defaults/pccard.conf
+++ b/etc/defaults/pccard.conf
@@ -86,6 +86,11 @@ card "CDROM" "IDE"
 	config	auto "ata" ?
 	logstr	"MCD-601p"
 
+# Lexar Media compact flash
+#   auto does not work
+card "CL ATA FLASH CARD LEXAR " "TIDALWV"
+	config 0x1 "ata" ?
+
 # DATAFAB PCMMD2
 card "DATAFAB" "PCMCIA-TO-IDE"
 	config	0x1 "ata" ?
@@ -523,6 +528,17 @@ card "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" ?
+	insert /etc/pccard_ether $device
+
+# pci Ethernet Adapter Card
+card "Ethernet" "CF Size PC Card"
+	config auto "ed" ?
+	insert /etc/pccard_ether $device
+
 # "Ethernet Adapter" "E2000 PCMCIA Ethernet"
 card "Ethernet Adapter" "E2000 PCMCIA Ethernet"
 	config	auto "ed" ?
@@ -856,7 +872,7 @@ card "PMX   " "PE-200"
 # Psion Dacom Gold Card V34 Ethernet GSM
 # as ethernet
 card "Psion Dacom" "Gold Card V34 Ethernet GSM"
-	config	default "ed" ?
+	config	auto "ed" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -898,7 +914,7 @@ card "SUN WAY" "3WL-847-TX 100BASE-TX"
 
 # Surecom EtherPerfect EP-427
 card "TAMARACK" "Ethernet"
-	config	0x21 "ed" ?
+	config	auto "ed" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -953,6 +969,7 @@ card "3Com" "Megahertz 574B"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
+# 3Com Etherlink III 3CXE589EC
 # 3Com Etherlink III 3CXE589ET
 card "3Com" "Megahertz 589E"
 	config	0x1 "ep" ?
@@ -1713,6 +1730,23 @@ card "Cabletron" "RoamAbout 802.11 DS"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
+# Compaq WL100
+card "Compaq" "WL100_11Mbps_Wireless_PC_Card"
+	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" ?
+	insert	/etc/pccard_ether $device start
+	remove	/etc/pccard_ether $device stop
+
+# Laneed Wireless card
+	config auto "wi" ?
+	insert	/etc/pccard_ether $device start
+	remove	/etc/pccard_ether $device stop
+
 # ELECOM Air@Hawk/LD-WL11/PCC (0.7.5)
 card "ELECOM" "Air@Hark/LD-WL11/PCC"
 	config  auto "wi" ?
@@ -1725,6 +1759,12 @@ card "ELECOM" "Air@Hawk/LD-WL11/PCC"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
+# ICOM SL-1100
+card "ICOM" "SL-1100"
+	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" ?
@@ -1737,6 +1777,12 @@ card "Lucent Technologies" "WaveLAN/IEEE"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
+# Melco Airconnect
+card "MELCO" "WLI-PCM-L11"
+	config	0x1 "wi" ?
+	insert	/etc/pccard_ether $device start
+	remove	/etc/pccard_ether $device stop
+
 # NCR WaveLAN/IEEE
 card "NCR" "WaveLAN/IEEE"
 	config	auto "wi" ?
@@ -1749,15 +1795,15 @@ card "NEC" "Wireless Card CMZ-RT-WP"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# Melco Airconnect
-card "MELCO" "WLI-PCM-L11"
+# PLANEX GeoWave/GW-NS110
+card "PLANEX" "GeoWave/GW-NS110"
 	config	0x1 "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# PLANEX GeoWave/GW-NS110
-card "PLANEX" "GeoWave/GW-NS110"
-	config	0x1 "wi" ?
+# TDK LAK-CD011WL
+card "TDK" "LAK-CD011WL for Wireless LAN"
+	config auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop