Add 'config auto' confirmed entries.

Submitted by:	Atsushi Onoe <onoe@sm.sony.co.jp>,
		YAMAMOTO Shigeru <shigeru@iij.ad.jp>,
		Masahide -mac- NODA <mac@clave.gr.jp>

2 files changed, 46 insertions, 0 deletions

diff --git a/etc/defaults/pccard.conf b/etc/defaults/pccard.conf
index a642c33..a080b5f 100644
--- a/etc/defaults/pccard.conf
+++ b/etc/defaults/pccard.conf
@@ -45,6 +45,7 @@ card "Lucent Technologies" "WaveLAN/IEEE"
 # NCR WaveLAN/IEEE
 card "NCR" "WaveLAN/IEEE"
 	config	0x1 "wi0" ?
+#	config	auto "wi0" ?
 	insert	logger -t pccard:$device -s WaveLAN/IEEE inserted
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s WaveLAN/IEEE removed
@@ -97,6 +98,7 @@ card "ACCTON" "EN2212"
 #Accton 2216
 card "ACCTON" "EN2216-PCMCIA-ETHERNET"
 	config	0x20 "ed0" ?
+#	config	auto "ed0" ?
 	insert	logger -t pccard:$device -s Accton 2216 inserted
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s Accton 2216 removed
@@ -105,6 +107,7 @@ card "ACCTON" "EN2216-PCMCIA-ETHERNET"
 # COREGA EtherII PCC-T
 card "corega K.K." "corega EtherII PCC-T"
 	config	0x20 "ed0" ?
+#	config	auto "ed0" ?
 	insert	logger -t pccard:$device -s EtherII PCC-T inserted
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s EtherII PCC-T removed
@@ -121,6 +124,7 @@ card "IO DATA" "PCLATE"
 # 3Com Etherlink III 3C589B, 3C589C
 card "3Com Corporation" "3C589"
 	config	0x1 "ep0" ?
+#	config	auto "ep0" ?
 	insert	logger -t pccard:$device -s 3Com Etherlink III inserted
 	insert	/etc/pccard_ether $device -link0 link1
 #	insert	/etc/pccard_ether $device link0 -link1
@@ -130,6 +134,7 @@ card "3Com Corporation" "3C589"
 # 3Com Etherlink III 3C589D
 card "3Com Corporation" "3C589D"
 	config	0x1 "ep0" ?
+#	config	auto "ep0" ?
 	insert	logger -t pccard:$device -s 3Com Etherlink III inserted
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s 3Com Etherlink III removed
@@ -178,6 +183,7 @@ card "Linksys" "Combo PCMCIA EthernetCard (EC2T)"
 #Linksys EtherFast 10/100 PC Card (PCMPC100)
 card "Linksys" "EtherFast 10/100 PC Card (PCMPC100)"
 	config	0x3 "ed0" ?
+#	config	auto "ed0" ?
 	insert	logger -t pccard:$device -s Linksys Fast 100-BaseT inserted
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s Linksys Fast 100-BaseT removed
@@ -334,6 +340,7 @@ card "AIWA CO.,LTD." "PV-JF288  "
 # Apex Data 28.8 PC Card "MOBILE PLUS Cellular" modem. 
 card "AD PC_CARD" "RC288ACL" 
 	config	0x22 "sio2" ? 
+#	config	auto "sio2" ? 
 	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 
 
@@ -364,10 +371,17 @@ card "MEGAHERTZ" "XJ2288"
 # Megahertz XJ4336
 card "Megahertz" "XJ4336-CC4336"
 	config	0x22 "sio2" ?
+#	config	auto "sio2" ?
 #	config	0x23 "sio3" ?
 	insert	logger -t pccard:$device -s Megahertz XJ4336 inserted
 	remove	logger -t pccard:$device -s Megahertz XJ4336 removed
 
+# Megahertz XJEM1336 (as modem)
+card "MEGAHERTZ" "CC/XJEM3336"
+	config	auto "sio2" ?
+	insert	logger -t pccard:$device -s Megahertz CC/XJEM3336 inserted
+	remove	logger -t pccard:$device -s Megahertz CC/XJEM3336 removed
+
 # Megahertz XJ1336
 card "U.S. Robotics" "XJ/CC1336"
 	config	0x21 "sio2" ?
@@ -571,10 +585,17 @@ card "NTT DoCoMo" "PCMCIA DATA/FAX ADAPTER 9600"
 	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 inserted
+	remove	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter removed
+
 # NTT DoCoMo Mobile D Card 96P1
 card "NTT DoCoMo" "Mobile D Card 96P1"
 #	config	0x22 "sio2" ? 0x82
 	config	0x23 "sio3" ? 0x82
+#	config	auto "sio3" ? 0x82
 	insert	logger -t pccard:$device -s NTT DoCoMo Mobile D Card 96P1 inserted
 	remove	logger -t pccard:$device -s NTT DoCoMo Mobile D Card 96P1 removed
 
@@ -673,6 +694,7 @@ card "Zoom Telephonics, Inc." "PCMCIA 56K LT DataFax"
 # 3Com Megahertz 3CCE589E* 10 Mbps LAN PC Card
 card "3Com" "Megahertz 589E"
 	config	0x1 "ep0" ?
+#	config	auto "ep0" ?
 	insert	logger -t pccard:$device -s 3Com Megahertz Ethernet card inserted
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s 3Com Megahertz Ethernet card removed
@@ -770,6 +792,7 @@ card "Megahertz" "CC10BT/2"
 # COREGA Ether PCC-T
 card "corega K.K." "corega Ether PCC-T"
 	config	0x20 "ed0" ?
+#	config	auto "ed0" ?
 	insert	logger -t pccard:$device -s Ether PCC-T inserted
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s Ether PCC-T removed
diff --git a/etc/pccard.conf.sample b/etc/pccard.conf.sample
index a642c33..a080b5f 100644
--- a/etc/pccard.conf.sample
+++ b/etc/pccard.conf.sample
@@ -45,6 +45,7 @@ card "Lucent Technologies" "WaveLAN/IEEE"
 # NCR WaveLAN/IEEE
 card "NCR" "WaveLAN/IEEE"
 	config	0x1 "wi0" ?
+#	config	auto "wi0" ?
 	insert	logger -t pccard:$device -s WaveLAN/IEEE inserted
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s WaveLAN/IEEE removed
@@ -97,6 +98,7 @@ card "ACCTON" "EN2212"
 #Accton 2216
 card "ACCTON" "EN2216-PCMCIA-ETHERNET"
 	config	0x20 "ed0" ?
+#	config	auto "ed0" ?
 	insert	logger -t pccard:$device -s Accton 2216 inserted
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s Accton 2216 removed
@@ -105,6 +107,7 @@ card "ACCTON" "EN2216-PCMCIA-ETHERNET"
 # COREGA EtherII PCC-T
 card "corega K.K." "corega EtherII PCC-T"
 	config	0x20 "ed0" ?
+#	config	auto "ed0" ?
 	insert	logger -t pccard:$device -s EtherII PCC-T inserted
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s EtherII PCC-T removed
@@ -121,6 +124,7 @@ card "IO DATA" "PCLATE"
 # 3Com Etherlink III 3C589B, 3C589C
 card "3Com Corporation" "3C589"
 	config	0x1 "ep0" ?
+#	config	auto "ep0" ?
 	insert	logger -t pccard:$device -s 3Com Etherlink III inserted
 	insert	/etc/pccard_ether $device -link0 link1
 #	insert	/etc/pccard_ether $device link0 -link1
@@ -130,6 +134,7 @@ card "3Com Corporation" "3C589"
 # 3Com Etherlink III 3C589D
 card "3Com Corporation" "3C589D"
 	config	0x1 "ep0" ?
+#	config	auto "ep0" ?
 	insert	logger -t pccard:$device -s 3Com Etherlink III inserted
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s 3Com Etherlink III removed
@@ -178,6 +183,7 @@ card "Linksys" "Combo PCMCIA EthernetCard (EC2T)"
 #Linksys EtherFast 10/100 PC Card (PCMPC100)
 card "Linksys" "EtherFast 10/100 PC Card (PCMPC100)"
 	config	0x3 "ed0" ?
+#	config	auto "ed0" ?
 	insert	logger -t pccard:$device -s Linksys Fast 100-BaseT inserted
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s Linksys Fast 100-BaseT removed
@@ -334,6 +340,7 @@ card "AIWA CO.,LTD." "PV-JF288  "
 # Apex Data 28.8 PC Card "MOBILE PLUS Cellular" modem. 
 card "AD PC_CARD" "RC288ACL" 
 	config	0x22 "sio2" ? 
+#	config	auto "sio2" ? 
 	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 
 
@@ -364,10 +371,17 @@ card "MEGAHERTZ" "XJ2288"
 # Megahertz XJ4336
 card "Megahertz" "XJ4336-CC4336"
 	config	0x22 "sio2" ?
+#	config	auto "sio2" ?
 #	config	0x23 "sio3" ?
 	insert	logger -t pccard:$device -s Megahertz XJ4336 inserted
 	remove	logger -t pccard:$device -s Megahertz XJ4336 removed
 
+# Megahertz XJEM1336 (as modem)
+card "MEGAHERTZ" "CC/XJEM3336"
+	config	auto "sio2" ?
+	insert	logger -t pccard:$device -s Megahertz CC/XJEM3336 inserted
+	remove	logger -t pccard:$device -s Megahertz CC/XJEM3336 removed
+
 # Megahertz XJ1336
 card "U.S. Robotics" "XJ/CC1336"
 	config	0x21 "sio2" ?
@@ -571,10 +585,17 @@ card "NTT DoCoMo" "PCMCIA DATA/FAX ADAPTER 9600"
 	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 inserted
+	remove	logger -t pccard:$device -s NTT DoCoMo DATA/FAX Adapter removed
+
 # NTT DoCoMo Mobile D Card 96P1
 card "NTT DoCoMo" "Mobile D Card 96P1"
 #	config	0x22 "sio2" ? 0x82
 	config	0x23 "sio3" ? 0x82
+#	config	auto "sio3" ? 0x82
 	insert	logger -t pccard:$device -s NTT DoCoMo Mobile D Card 96P1 inserted
 	remove	logger -t pccard:$device -s NTT DoCoMo Mobile D Card 96P1 removed
 
@@ -673,6 +694,7 @@ card "Zoom Telephonics, Inc." "PCMCIA 56K LT DataFax"
 # 3Com Megahertz 3CCE589E* 10 Mbps LAN PC Card
 card "3Com" "Megahertz 589E"
 	config	0x1 "ep0" ?
+#	config	auto "ep0" ?
 	insert	logger -t pccard:$device -s 3Com Megahertz Ethernet card inserted
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s 3Com Megahertz Ethernet card removed
@@ -770,6 +792,7 @@ card "Megahertz" "CC10BT/2"
 # COREGA Ether PCC-T
 card "corega K.K." "corega Ether PCC-T"
 	config	0x20 "ed0" ?
+#	config	auto "ed0" ?
 	insert	logger -t pccard:$device -s Ether PCC-T inserted
 	insert	/etc/pccard_ether $device
 	remove	logger -t pccard:$device -s Ether PCC-T removed