Linksys Fast Ethernet PCCARD cards supported by the ed driver now

require the addition of flag 0x80000 to their config line in
pccard.conf(5).  This flag is not optional.  These Linksys cards will
not be recognized without it.

Reviewed by:    imp, iwasaki

1 files changed, 31 insertions, 25 deletions

diff --git a/etc/defaults/pccard.conf b/etc/defaults/pccard.conf
index 73b4a32..9b61ba5 100644
--- a/etc/defaults/pccard.conf
+++ b/etc/defaults/pccard.conf
@@ -331,7 +331,7 @@ card "ACCTON" "EN2216-PCMCIA-ETHERNET"
 
 # 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" ?
+	config	auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -351,7 +351,7 @@ card "Allied Telesis, K.K." "CentreCOM LA-PCM_V2"
 
 # 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" ?
+	config	auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -387,7 +387,7 @@ card "CNet" "CN40BC Ethernet"
 
 # COREGA FEther PCC-TXF
 card "corega" "FEther PCC-TXF"
-	config  auto "ed" ?
+	config  auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -405,7 +405,7 @@ card "corega K.K." "corega EtherII PCC-T"
 
 # COREGA FastEther PCC-TX
 card "corega K.K." "corega FastEther PCC-TX"
-	config	auto "ed" ?
+	config	auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -424,13 +424,13 @@ card "CyQ've" "ELA-010"
 
 # CyQ've ELA-110
 card "CyQ've" "ELA-110 10/100M LAN Card"
-	config	auto "ed" ?
+	config	auto "ed" ? 0x80000
 	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"
-	config	auto "ed" ?
+	config	auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -448,9 +448,9 @@ card "D-Link" "DE-660"
 #	insert	/etc/pccard_ether $device start link0 -link1
 	remove	/etc/pccard_ether $device stop
 
-# D-Link DFE-650 NE2000 clone
+# D-Link DFE-650 Ethernet Card
 card "D-Link" "DFE-650"
-	config	0x20 "ed" ? 0x10
+	config	0x20 "ed" ? 0x80010
 	insert	/etc/pccard_ether $device start
 #	insert	/etc/pccard_ether $device start link0 -link1
 	remove	/etc/pccard_ether $device stop
@@ -485,13 +485,13 @@ card "DIGITAL" "DEPCM-XX"
 
 # Planex FNW-3600-T
 card "Dual Speed" "10/100 PC Card"
-	config	auto "ed" ?
+	config	auto "ed" ? 0x80000
 	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"
-	config	auto "ed" ?
+	config	auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -573,13 +573,13 @@ card "EP-210 PCMCIA LAN CARD." "/.*/"
 # PLANEX (PLANET) FNW-3700-T
 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
 card "Fast Ethernet" "Adapter"
-	config	0x7 "ed" ?
-	iosize	32
+	config	auto "ed" ? 0x80000
 	logstr	"Planex FNW-3600-T"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
@@ -640,7 +640,7 @@ card "IO DATA" "PCLATE"
 
 # I-O DATA PCETTX
 card "IO DATA" "PCETTX"
-	config	0x20 "ed" ?
+	config	0x20 "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -665,7 +665,7 @@ card "Kingston Technology Corp." "/EtheRx PC Card Ethernet.*/"
 
 # ELECOM Laneed LD-10/100CD
 card "Laneed" "LD-10/100CD"
-	config	auto "ed" ?
+	config	auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -695,26 +695,26 @@ card "LINKSYS" "E-CARD"
 
 # Linksys EtherFast 10/100 Intergrated PC Card (PCM100)
 card "Linksys" "EtherFast 10/100 Integrated PC Card (PCM100)"
-	config	auto "ed" ?
+	config	auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Linksys EtherFast 10/100 PC Card (PCMPC100)
 card "Linksys" "EtherFast 10/100 PC Card (PCMPC100)"
-	config	0x3 "ed" ?
+	config	0x3 "ed" ? 0x80000
 #	config	auto "ed" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Linksys EtherFast 10/100 PC Card (PCMPC100 V2)
 card "Linksys" "Etherfast 10/100 PC Card (PCMPC100 V2)"
-	config	auto "ed" ?
+	config	auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Logitec LPM-LN100TX 100BASE-TX Ethernet LAN CARD
 card "Logitec" "LPM-LN100TX"
-	config	auto "ed" ?
+	config	auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -754,7 +754,7 @@ card "MELCO" "LPC2-T"
 
 # MELCO LPC2-TX
 card "MELCO" "LPC2-TX"
-	config	auto "ed" ?
+	config	auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -795,7 +795,7 @@ card "NEC" "PC-9801N-J12"
 
 # BayNetworks NETGEAR FA410TXC Fast Ethernet
 card "NETGEAR" "FA410TX"
-	config	auto "ed" ?
+	config	auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -807,13 +807,13 @@ card "Network Everywhere" "Ethernet 10BaseT PC Card"
 
 # Network Everywhere Ethernet Fast Ethernet 10/100 PC Card
 card "Network Everywhere" "Fast Ethernet 10/100 PC Card"
-	config	0x5 "ed" 10
+	config	0x5 "ed" 10 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # New Media Corporation LiveWire 10/100
 card "New Media Corporation" "LiveWire 10/100"
-	config	auto "ed" ?
+	config	auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -936,7 +936,7 @@ card "Seiko Epson Corp." "Ethernet"
 
 # 3way 3WL-847-TX
 card "SUN WAY" "3WL-847-TX 100BASE-TX"
-	config	auto "ed" ?
+	config	auto "ed" ? 0x80000
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -952,12 +952,18 @@ card "TDK" "/LAK-CD031.*/"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
-# Telecom Device SuperSocket RE450T and RE550T
-card "Telecom Device K.K." "/SuperSocket RE[45]50T/"
+# Telecom Device SuperSocket RE450T
+card "Telecom Device K.K." "SuperSocket RE450T"
 	config	auto "ed" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
+# Telecom Device SuperSocket RE550T
+card "Telecom Device K.K." "SuperSocket RE550T"
+	config	auto "ed" ? 0x80000
+	insert	/etc/pccard_ether $device start
+	remove	/etc/pccard_ether $device stop
+
 # Toshiba Joho System PTJ-LAN/T
 card "TJ" "Ethernet"
 	config	auto "ed" ? 0x10