More PAO-ish stuff. Wildcard the IRQ bits.

1 files changed, 69 insertions, 69 deletions

diff --git a/etc/pccard.conf.sample b/etc/pccard.conf.sample
index e7057f9..f3a7fb1 100644
--- a/etc/pccard.conf.sample
+++ b/etc/pccard.conf.sample
@@ -8,7 +8,7 @@
 # IRQ == 0 means "allocate free IRQ from IRQ pool"
 # IRQ == 16 means "do not use IRQ (e.g. PIO mode)"
 #
-# $Id: pccard.conf.sample,v 1.35 1999/05/05 07:36:51 wpaul Exp $
+# $Id: pccard.conf.sample,v 1.36 1999/05/14 03:52:07 obrien Exp $
 
 # Generally available IO ports
 io	0x240-0x360
@@ -20,7 +20,7 @@ memory	0xd4000  96k
 
 # Lucent WaveLAN/IEEE
 card "Lucent Technologies" "WaveLAN/IEEE"
-	config	0x1 "wi0" 11
+	config	0x1 "wi0" ?
 	insert	echo WaveLAN/IEEE inserted
 	insert	/etc/pccard_ether wi0
 	remove	echo WaveLAN/IEEE removed
@@ -28,7 +28,7 @@ card "Lucent Technologies" "WaveLAN/IEEE"
 
 # NCR WaveLAN/IEEE
 card "NCR" "WaveLAN/IEEE"
-	config	0x1 "wi0" 11
+	config	0x1 "wi0" ?
 	insert	echo WaveLAN/IEEE inserted
 	insert	/etc/pccard_ether wi0
 	remove	echo WaveLAN/IEEE removed
@@ -36,7 +36,7 @@ card "NCR" "WaveLAN/IEEE"
 
 # Cabletron RoamAbout, WaveLAN/IEEE clone
 card "Cabletron" "RoamAbout 802.11 DS"
-	config	0x1 "wi0" 11
+	config	0x1 "wi0" ?
 	insert	echo WaveLAN/IEEE inserted
 	insert	/etc/pccard_ether wi0
 	remove	echo WaveLAN/IEEE removed
@@ -44,7 +44,7 @@ card "Cabletron" "RoamAbout 802.11 DS"
 
 # IBM PCMCIA Ethernet I/II
 card "IBM Corp." "Ethernet"
-	config	0x1 "ed0" 11
+	config	0x1 "ed0" ?
 	ether	0xff0
 	insert	echo IBM PCMCIA Ethernet inserted
 	insert	/etc/pccard_ether ed0
@@ -53,7 +53,7 @@ card "IBM Corp." "Ethernet"
 
 # Melco LPC-T (PIO mode)
 card "PCMCIA" "UE2212"
-	config	0x1 "ed0" 11 0x10
+	config	0x1 "ed0" ? 0x10
 	ether	0xff0
 	insert	echo UE2212 inserted
 	insert	/etc/pccard_ether ed0
@@ -63,7 +63,7 @@ card "PCMCIA" "UE2212"
 # Accton EN2212
 # Very slow!  (PIO mode)
 card "ACCTON" "EN2212"
-	config	0x1 "ed0" 11 0x10
+	config	0x1 "ed0" ? 0x10
 	ether	0xff0
 	insert	echo Accton EN2212 inserted
 	insert	/etc/pccard_ether ed0
@@ -72,7 +72,7 @@ card "ACCTON" "EN2212"
 
 #Accton 2216
 card "ACCTON" "EN2216-PCMCIA-ETHERNET"
-	config 0x20 "ed0" 10
+	config 0x20 "ed0" ?
 	insert echo Accton 2216 inserted
 	insert /etc/pccard_ether ed0
 	remove echo Accton 2216 removed
@@ -97,7 +97,7 @@ card "3Com Corporation" "3C589D"
 
 # LinkSys ethernet card
 card "E-CARD" "E-CARD" 
-	config  0x20 "ed0" 10 
+	config  0x20 "ed0" ? 
 	insert  echo "LinkSys card inserted" 
 	insert  /etc/pccard_ether ed0 
 	remove  echo "LinkSys card removed" 
@@ -105,7 +105,7 @@ card "E-CARD" "E-CARD"
 
 # Linksys Combo PCMCIA EthernetCard (model EC2T on box) 
 card "Linksys" "Combo PCMCIA EthernetCard (EC" 
-	config 0x1 "ed0" 10 
+	config 0x1 "ed0" ? 
 	insert echo Linksys Ethernet inserted 
 	insert /etc/pccard_ether ed0 
 	remove echo Linksys Ethernet removed 
@@ -122,7 +122,7 @@ card "Farallon" "ENet"
 
 # Fujitsu MBH10302
 card "PCMCIA MBH10302" "01"
-	config  0x14 "fe0" 10
+	config  0x14 "fe0" ?
 	insert  echo Fujitsu MBH10302 inserted
 	insert	/etc/pccard_ether fe0
 	remove  echo Fujitsu MBH10302 removed
@@ -130,7 +130,7 @@ card "PCMCIA MBH10302" "01"
 
 # NextCom J Link NC5310
 card "NextComK.K." "NC5310 Ver1.0      "
-	config  0x14 "fe0" 10
+	config  0x14 "fe0" ?
 	insert  echo NextCom J Link NC5310 inserted
 	insert	/etc/pccard_ether fe0
 	remove  echo NextCom J Link NC5310 removed
@@ -138,7 +138,7 @@ card "NextComK.K." "NC5310 Ver1.0      "
 
 # HITACHI HT-4840-11
 card "HITACHI" "HT-4840-11"
-	config	0x1a "fe0" 15
+	config	0x1a "fe0" ?
 	insert	echo HT-4840-11 inserted
 	insert	/etc/pccard_ether fe0
 	remove	echo HT-4840-11 removed
@@ -146,7 +146,7 @@ card "HITACHI" "HT-4840-11"
 
 # Danpex (Alloy, etc.) EN-6200P2
 card "DANPEX" "EN-6200P2"
-	config 0x22 "ed0" 9
+	config 0x22 "ed0" ?
 	insert /etc/pccard_ether ed0
 	remove /sbin/ifconfig ed0 delete
 
@@ -158,7 +158,7 @@ card "EAGLE Technology" "NE200 ETHERNET LAN MBH10303  "
 
 # Compex Net-A adapter
 card "Ethernet" "Adapter"
-	config 0x1 "ed0" 11
+	config 0x1 "ed0" ?
 	ether 0xff0
 	insert	/etc/pccard_ether ed0
 	remove	/sbin/ifconfig ed0 delete
@@ -186,7 +186,7 @@ card "D-Link" "DE-660"
 
 #  Intel EtherExpress PRO/100 Mobile Adapter (16-bit verison)
 card "Intel" "EtherExpress(TM) PRO/100 PC C"
-	config  0x1 "xe0" 10
+	config  0x1 "xe0" ?
 	insert  echo Intel EtherExpress PRO/100 Mobile Adapter/16 inserted
 	insert	/etc/pccard_ether xe0
 	remove  echo Intel EtherExpress PRO/100 Mobile Adapter/16 removed
@@ -194,91 +194,91 @@ card "Intel" "EtherExpress(TM) PRO/100 PC C"
 
 # AIWA PV-JF288
 card "AIWA CO.,LTD." "PV-JF288  "
-	config  0x23 "sio2" 10
+	config  0x23 "sio2" ?
 	insert  echo AIWA PV-JF288 inserted
 	remove  echo AIWA PV-JF288 removed
 
 # Apex Data 28.8 PC Card "MOBILE PLUS Cellular" modem. 
 card "AD PC_CARD" "RC288ACL" 
-	config  0x22 "sio2" 10 
+	config  0x22 "sio2" ? 
 	insert  echo Apex Data Mobile Plus 28.8 Modem inserted 
 	remove  echo Apex Data Mobile Plus 28.8 Modem removed 
 
 # Megahertz XJ1144
 card "MEGAHERTZ" "XJ1144"
-	config	0x23 "sio2" 10
+	config	0x23 "sio2" ?
 	insert	echo Megahertz XJ1144 inserted
 	remove	echo Megahertz XJ1144 removed
 
 # Megahertz XJ2144 (US)
 card "MEGAHERTZ" "XJ2144"
-	config	0x23 "sio2" 10
+	config	0x23 "sio2" ?
 	insert	echo Megahertz XJ2144 inserted
 	remove	echo Megahertz XJ2144 removed
 
 # Megahertz XJ2144 (JP)
 card "MEGAHERTZ" "XJ2144-81"
-	config	0x23 "sio2" 10
+	config	0x23 "sio2" ?
 	insert	echo Megahertz XJ2144 inserted
 	remove	echo Megahertz XJ2144 removed
 
 # Megahertz XJ2288
 card "MEGAHERTZ" "XJ2288"
-	config	0x23 "sio2" 10
+	config	0x23 "sio2" ?
 	insert	echo Megahertz XJ2288 inserted
 	remove	echo Megahertz XJ2288 removed
 
 # Megahertz XJ4336
 card "Megahertz" "XJ4336-CC4336"
-	config 0x21 "sio1" 10
+	config 0x21 "sio1" ?
 	insert echo Megahertz XJ4336 inserted
 	remove echo Megahertz XJ4336 removed
 
 # Megahertz XJ1336
 card "U.S. Robotics" "XJ/CC1336"
-	config 0x21 "sio2" 10
+	config 0x21 "sio2" ?
 	insert echo U.S. Robotics XJ/CC1336 inserted
 	remove echo U.S. Robotics XJ/CC1336 removed
 
 # Omron ME2814 FAX/DATA MODEM
 card "OMRON" "ME2814 FAX/DATA MOD"
-	config  0x23 "sio2" 3
+	config  0x23 "sio2" ?
 	insert  echo OMRON ME2814 Modem inserted
 	remove  echo OMRON ME2814 Modem removed
 
 # TDK 14.4 FAX/Data Modem
 card "TDK" "DF1414 DATA/FAX MOD"
-	config	0x23 "sio2" 10
+	config	0x23 "sio2" ?
 	insert	echo TDK DF1414 inserted
 	remove	echo TDK DF1414 removed
 
 # TDK 14.4 FAX/Data Modem
 card "TDK" "DF1414EX DATA/FAX M"
-	config  0x23 "sio2" 10
+	config  0x23 "sio2" ?
 	insert  echo TDK DF1414 inserted
 	remove  echo TDK DF1414 removed
 
 # Panasonic Modem Card TO-706C
 card "Panasonic" "TO-706C"
-	config	0x23 "sio2" 10
+	config	0x23 "sio2" ?
 	insert	echo Panasonic TO-706C inserted
 	remove	echo Panasonic TO-706C removed
 
 # Panasonic Modem Card TO-706C
 card "Panasonic" "TO-CAF288"
-	config	0x23 "sio2" 10
+	config	0x23 "sio2" ?
 	insert	echo Panasonic TO-CAF288 inserted
 	remove	echo Panasonic TO-CAF288 removed
 
 # NewMedia 14.4K FAX/Data Modem
 card "CIRRUS LOGIC" "FAX MODEM"
-	config	0x23 "sio2" 10
+	config	0x23 "sio2" ?
 	insert	echo Newmedia 14.4 Modem inserted
 	remove	echo Newmedia 14.4 Modem removed
 
 # Omron MD24XCA FAX/Data Modem
 #card "OMRON Corp." "MD24XCA"
-#	config	0x23 "sio2" 16
+#	config	0x23 "sio2" ?
 #	reset	10000
 #	insert	echo OMRON MD24XCA Modem inserted
 #	remove	echo OMRON MD24XCA Modem removed
@@ -286,33 +286,33 @@ card "CIRRUS LOGIC" "FAX MODEM"
 # Hayes OPTIMA 288 FAX/Data Modem
 # currently does not work on my machine
 card "Hayes" "OPTIMA 288 + FAX fo"
-	config	0x24 "sio2" 5
+	config	0x24 "sio2" ?
 	reset	10000
 	insert	echo Optima 288 inserted
 	remove	echo Optima 288 removed
 
 # This one does work though
 card "HAYES" "OPT288"
-        config  0x23 "sio3" 9
+        config  0x23 "sio3" ?
         insert  echo Hayes Optima 28.8k inserted
         remove  echo Hayes Optima 28.8k removed
 
 # PREMAX FM288 FAX/Data Modem
 card "PREMAX" "FM288 "
-	config  0x23 "sio2" 10
+	config  0x23 "sio2" ?
 	insert  echo PREMAX FM288 Modem inserted
 	remove  echo PREMAX FM288 Modem removed
 
 # Novalink NovaModem 144
 card "NovaLink Tech." "NovaModem 144   "
-	config  0x23 "sio2" 10
+	config  0x23 "sio2" ?
 	insert  echo NovaModem 144 Modem inserted
 	remove  echo NovaModem 144 Modem removed
 
 # US Robotics Sportster PCMCIA V.34
 # US Robotics COURIER PCMCIA V.34
 card "USRobotics" "PCMCIA 28800 Data/F"
-	config  0x3 "sio2" 3
+	config  0x3 "sio2" ?
 	insert  echo USRobotics PCMCIA Modem inserted
 	remove  echo USRobotics PCMCIA Modem removed
 
@@ -325,19 +325,19 @@ card "Xircom" "CreditCard Modem CM-56T"
 
 # Xircom CreditCard Ethernet+Modem (Modem only !!!)
 card "Xircom" "CreditCard Ethernet"
-	config  0x23 "sio2" 3
+	config  0x23 "sio2" ?
 	insert  echo Xircom CreditCard Modem inserted
 	remove  echo Xircom CreditCard Modem removed
 
 # Xircom CreditCard Ethernet 10/100 + modem (modem only)
 card "Xircom" "CreditCard Ethernet 10/100 + "
-	config  0x1f "sio3" 10
+	config  0x1f "sio3" ?
 	insert  echo Xircom CreditCard Modem inserted
 	remove  echo Xircom CreditCard Modem removed
 
 # Xircom CreditCard Ethernet 10/100 + modem (Ethernet part)
 card "Xircom" "CreditCard Ethernet 10/100 + Modem 56"
-	config  0x17 "sio3" 10
+	config  0x17 "sio3" ?
 	insert  echo Xircom CreditCard Modem inserted
 	insert /etc/pccard_ether xe0
 	remove  echo Xircom CreditCard Modem removed
@@ -345,7 +345,7 @@ card "Xircom" "CreditCard Ethernet 10/100 + Modem 56"
 
 # Xircom CreditCard Ethernet 10/100
 card "Xircom" "CreditCard 10/100"
-	config  0x1 "xe0" 10
+	config  0x1 "xe0" ?
 	insert  echo Xircom CreditCard Ethernet inserted
 	insert	/etc/pccard_ether xe0
 	remove  echo Xircom CreditCard Ethernet removed
@@ -353,19 +353,19 @@ card "Xircom" "CreditCard 10/100"
 
 # Xircom GlobalACCESS modem
 card "Xircom" "CreditCard Modem 56 - GlobalA"
- 	config 0x1f "sio2" 11
+ 	config 0x1f "sio2" ?
  	insert  echo Xircom CreditCard Modem 56 - GlobalACCESS inserted
  	remove  echo Xircom CreditCard Modem 56 - GlobalACCESS removed
 
 # GATEWAY 2000 FAX/Data Modem (14.4K)
 card "GATEWAY2000" "CC3144"
-	config  0x22 "sio3" 7
+	config  0x22 "sio3" ?
 	insert  echo GATEWAY2000 FAX/Data Modem inserted
 	remove  echo GATEWAY2000 FAX/Data Modem removed
 
 # IBM Push/Pop Modem (14.4K)
 card "IBM" "Push/Pop Modem(14.4"
-	config	0x22 "sio2" 5
+	config	0x22 "sio2" ?
 	insert	echo IBM Push/Pop Modem inserted
 	remove	echo IBM Push/Pop Modem removed
 
@@ -373,125 +373,125 @@ card "IBM" "Push/Pop Modem(14.4"
 # Apparently this modem does not work unless the recommended
 # init string (AT&F&C1&D2) is supplied.
 card "PCMCIA  " "33.6K Fax/Modem  "
-	config 23 "sio2" 5
+	config 23 "sio2" ?
 	insert echo Eiger 33.6K modem inserted
 	remove echo Eiger 33.6K modem removed
 
 # NTT ThunderCard Modem
 card "NTT-IT CO., LTD" "ThunderCard AVF288, V.34"
-	config	0x22 "sio2" 10
+	config	0x22 "sio2" ?
 	insert echo NTT ThunderCard inserted
 	remove echo NTT ThunderCard removed
 
 # U.S. Robotics XJ1560J
 card "U.S. Robotics" "XJ/CC1560J"
-	config	0x22 "sio2" 10
+	config	0x22 "sio2" ?
 	insert	echo U.S. Robotics XJ1560J inserted
 	remove	echo U.S. Robotics XJ1560J removed
 
 # 3com/USR/Megahertz 3CCM556
 card "3Com" "3CXM/3CCM556"
-	config 0x23 "sio2" 10
+	config 0x23 "sio2" ?
 	insert echo 3Com PCMCIA 56K Modem inserted
 	remove echo 3Com PCMCIA 56K Modem removed
 
 # 3Com/NoteWorthy 56K modem (bundled with Toshiba notebooks)
 card "Toshiba America" "3CXM056-BNW"
-      config  0x20 "sio1" 3
+      config  0x20 "sio1" ?
       insert  echo NoteWorthy 56K PCMCIA Modem inserted
       remove  echo NoteWorthy 56K PCMCIA Modem removed
 
 # BUG Linkboy D64K (ISDN)
 card "BUG Inc." "Linkboy D64K"
-	config  0x23 "sio2" 3
+	config  0x23 "sio2" ?
 	insert  echo BUG Linkboy D64K inserted
 	remove  echo BUG Linkboy D64K removed
 
 # NTT DoCoMo DATA/FAX Adapter
 card "NTT DoCoMo" "PCMCIA DATA/FAX ADA"
-	config  0x22 "sio3" 10 0x82
+	config  0x22 "sio3" ? 0x82
 	insert  echo NTT DoCoMo DATA/FAX Adapter inserted
 	remove  echo NTT DoCoMo DATA/FAX Adapter removed
 
 # Random modem bundled with Dell systems
 card "Psion Dacom" "Gold Card Global 56K+Fax"
-	config	0x23 "sio2" 10
+	config	0x23 "sio2" ?
 	insert	echo "Psion Dacom modem card inserted"
 	remove	echo "Psion Dacom modem card removed"
 
 # Actiontec Datalink with v.90 upgrade
 card "PCMCIA  " "56K V.90 Fax Modem (LK)  "
-	config	0x1f "sio2" 10
+	config	0x1f "sio2" ?
 	insert	echo "Actiontec Datalink modem card inserted"
 	remove	echo "Actiontec Datalink modem card removed"
 
 # Panasonic FM-RADIO card
 #card "Panasonic" "CF-JVR101"
-#	config  0x22 "sio3" 16
+#	config  0x22 "sio3" ?
 #	insert  echo Panasonic FM radio card inserted
 #	remove  echo Panasonic FM radio card removed
 
 # SunDisk Flash ATA
 # (OEM: Epson Flash Packer)
 #card "SunDisk" "SDP5"
-#	config	0x3 "wdc1" 7
+#	config	0x3 "wdc1" ?
 #	insert	echo Sundisk Flash ATA inserted
 #	remove	echo Sundisk Flash ATA removed
 
 #card "SunDisk" "SDP"
-#	config  0x3 "wdc1" 7
+#	config  0x3 "wdc1" ?
 #	insert  echo SunDisk Flash ATA Inserted
 #	remove  echo SunDisk Flash ATA Removed
 
 # Midori Elec Fast Flash
 #card "Midori Elec." "FAST FLASH"
-#	config  0x3  "wdc1" 9
+#	config  0x3  "wdc1" ?
 #	insert  echo Midori Elec Fast FLASH inserted
 #	remove  echo Midori Elec Fast FLASH removed
 
 # Maxtor 131MB Type III HDD
 #card "Maxtor" "MXL131"
-#	config  0x03 "wdc1" 10
+#	config  0x03 "wdc1" ?
 #	insert	echo Maxtor 131MB HDD inserted
 #	remove	echo Maxtor 131MB HDD removed
 
 # Adaptec SlimSCSI (also included with Sony CD-ROM players)
 card "Adaptec, Inc." "APA-1460 SCSI Host Adapter"
-	config	0x9 "aic0" 10
+	config	0x9 "aic0" ?
 	insert	echo Adaptec Slim SCSI inserted
 	remove	echo Adaptec Slim SCSI removed
 
 # NewMedia Bustoaster SCSI
 card "New Media" "SCSI"
-	config	0x22 "aic0" 10
+	config	0x22 "aic0" ?
 	insert	echo New Media Bus Toaster inserted
 	remove	echo New Media Bus Toaster removed
 
 # REX5535AC, REX5535X SCSI
 #card "PCMCIA SCSI MBH1040" "01"
-#	config	0x3a "spc0" 11
+#	config	0x3a "spc0" ?
 #	insert	echo REX-5535 SCSI card inserted
 #	remove	echo REX-5535 SCSI card removed
 
 # Libretto Floppy disk
 card "Y-E DATA" "External FDD"
-	config  0x4 "fdc0" 10
+	config  0x4 "fdc0" ?
 
 # Viking V.90/K56Flex modem
 card "Viking" "V.90 K56flex"
-        config 0x23 "sio3" 9
+        config 0x23 "sio3" ?
         insert echo Viking 56K Modem inserted
         remove echo Viking 56K Modem removed
 
 # Zoom 56K modem
 card "Zoom Telephonics, Inc." "PCMCIA 56K LT DataFax"
-        config 0x1f "sio2" 10
+        config 0x1f "sio2" ?
         insert echo Zoom modem inserted
         remove echo Zoom modem removed
 
 # 3Com Megahertz 3CCE589E* 10 Mbps LAN PC Card
 card "3Com" "Megahertz 589E"
-        config 0x1 "ep0" 10
+        config 0x1 "ep0" ?
         insert echo 3Com Megahertz Ethernet card inserted
         insert /etc/pccard_ether ep0
         remove echo 3Com Megahertz Ethernet card removed
@@ -499,13 +499,13 @@ card "3Com" "Megahertz 589E"
 
 # 3Com/USR/MegaHertz 3CCM156
 card "3COM" "3CCM156"
-	config 0x23 "sio2" 10
+	config 0x23 "sio2" ?
 	insert echo 3Com PCMCIA 56K modem inserted
 	remove echo 3Com PCMCIA 56K modem removed
 
 #AR-P500 ethernet card
 card "IC-CARD" "IC-CARD"
-	config 0x20 "ed0" 15
+	config 0x20 "ed0" ?
 	insert echo AR-P500 Ethernet card inserted
 	insert /etc/pccard_ether ed0
 	remove echo AR-P500 Ethernet card removed
@@ -513,17 +513,17 @@ card "IC-CARD" "IC-CARD"
 
 #Eiger 33.6 modem
 card "AT&T" "V34+ Fax Modem"
-	config 0x23 "sio1" 10
+	config 0x23 "sio1" ?
 	insert echo Eiger 33.6K modem inserted
 	remove echo Eiger 33.6K modem removed
 
 # Motorola Montana 
 card "Motorola" "MONTANA 33.6 FAX/MODEM"
-	config 0x21 "sio1" 10
+	config 0x21 "sio1" ?
 
 # AmbiCom 10BaseT card
 card "AmbiCom Inc" "AMB8002T"
-	config 0x20 "ed0" 11
+	config 0x20 "ed0" ?
 	insert echo AmbiCom 8002T inserted
 	insert /etc/pccard_ether ed0
 	remove echo AmbiCom 8002T removed