Add Iomega IDE card for their 250M drives. Also remove the N in all

ataN entries while I'm here.  They aren't generally needed.

Submitted by: "Sean O'Connell" <sean@stat.Duke.EDU>

1 files changed, 22 insertions, 16 deletions

diff --git a/etc/defaults/pccard.conf b/etc/defaults/pccard.conf
index 3f82204..189cac4 100644
--- a/etc/defaults/pccard.conf
+++ b/etc/defaults/pccard.conf
@@ -71,97 +71,103 @@ card "Aironet" "PC4800"
 
 # Sony VAIO cdrom
 card " " "NinjaATA-"
-	config  auto "ata0" ?
+	config  auto "ata" ?
 	insert	logger -t pccard:$device -s NinjaATA inserted
 	remove	logger -t pccard:$device -s NinjaATA removed
 
 # Non-brand Compact Flash Card(32MB)
 card "       " "KCF 32M"
-	config	0x1 "ata2" ? iosize 16
+	config	0x1 "ata" ? iosize 16
 	insert	logger -t pccard:$device -s Compact Flash Card 32MB inserted
 	remove	logger -t pccard:$device -s Compact Flash Card 32MB removed
 
 # EXP DVD-780 DVD-ROM drive
 card "EXP   " "PnPIDE"
-	config	auto "ata2" ?
+	config	auto "ata" ?
 	insert	logger -t pccard:$device -s EXP DVD-780 inserted
 	remove	logger -t pccard:$device -s EXP DVD-780 removed
 
 # Toshiba mobile CD-ROM (Bundled with Portege 3110CT)
 card "FREECOM" "PCCARD-IDE"
-	config	auto "ata0" ? iosize 16
+	config	auto "ata" ? iosize 16
 	insert	logger -t pccard:$device -s Toshiba CD-ROM inserted
 	remove	logger -t pccard:$device -s Toshiba CD-ROM removed
 
 # IBM Flash ATA (Ricoh Flash ATA 10MB)
 card "IBM" "IBM17JSSFP10"
-	config	auto "ata0" ? iosize 16
+	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
 
 # IO Data PCIDE-II (bundled with CDP-TX6, etc.)
 card "IO DATA" "PCIDEII"
-	config	auto "ata0" ?
+	config	auto "ata" ?
 	insert	logger -t pccard:$device -s IO Data PCIDE-TT inserted
 	remove	logger -t pccard:$device -s IO Data PCIDE-TT removed
 
+# Iomega Zip Drive
+card "Iomega" "PCMCIA to 16 bit ATAPI Adapter"
+	config	0x2 "ata" ?
+	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"
-	config	0x03 "ata2" ?
+	config	0x03 "ata" ?
 	insert	logger -t pccard:$device -s Maxtor 131MB HDD inserted
 	remove	logger -t pccard:$device -s Maxtor 131MB HDD removed
 
 # Midori Elec Fast Flash
 card "Midori Elec." "FAST FLASH"
-	config	0x3  "ata2" ?
+	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
 
 # Another boring, generic ata atapter
 card "PC CARD MANUFACTURER" "PCMCIA ATA/ATAPI Adapter"
-	config	auto "ata2" ?
+	config	auto "ata" ?
 	insert	logger -t pccard:$device -s PCMCIA CDROM inserted
 	remove	logger -t pccard:$device -s PCMCIA CDROM removed
 
 # pc-card from PSCD-740 cdrom
 card "PCMCIA" "CD-ROM"
-	config	0x1 "ata2" ?
+	config	0x1 "ata" ?
 	insert	logger -t pccard:$device -s PCMCIA CD-ROM inserted
 	remove	logger -t pccard:$device -s PCMCIA CD-ROM removed
 
 # SiliconTech, Inc flash card
 card "SiliconTech,Inc" "16MB Compact PC Card"
-	config	0x1 "ata2" ?
+	config	0x1 "ata" ?
 	insert	logger -t pccard:$device -s SiliconTech Flash ATA inserted
 	remove	logger -t pccard:$device -s SiliconTech Flash ATA removed
 
 # Simple Technology ata flash
 card "Simple Technology        " "STI-ATA"
-	config	0x2 "ata2" ?
+	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
 	
 # SunDisk Flash ATA
 # (OEM: Epson Flash Packer)
 card "SunDisk" "SDP5"
-	config	0x1 "ata2" ?
+	config	0x1 "ata" ?
 	insert	logger -t pccard:$device -s Sundisk Flash ATA inserted
 	remove	logger -t pccard:$device -s Sundisk Flash ATA removed
 
 card "SunDisk" "SDP"
-	config	0x1 "ata2" ?
+	config	0x1 "ata" ?
 	insert	logger -t pccard:$device -s SunDisk Flash ATA Inserted
 	remove	logger -t pccard:$device -s SunDisk Flash ATA removed
 
 # IO Data CBIDE (bundled with CDP-FX24, etc.)
 card "WIT" "IDE16"
-	config	auto "ata0" ?
+	config	auto "ata" ?
 	insert	logger -t pccard:$device -s IO Data CBIDE inserted
 	remove	logger -t pccard:$device -s IO Data CBIDE removed
 
 # Viking ATA Flash card
 card "VIKING ATA/CF FLASH CARD " "TOR/AM "
-	config	0x2 "ata2" ?
+	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