- add missing modules (now in sync with pcitable)

- add 'media' class
- cleanup

1 files changed, 97 insertions, 63 deletions

diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index db6e80445..ad0a149a3 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -23,73 +23,84 @@ if_(arch() =~ /ppc/,
 if_(arch() =~ /^sparc/,
   "myri_sbus" => "MyriCOM Gigabit Ethernet",
   "sunbmac" => "Sun BigMac Ethernet",
-  "sunhme" => "Sun Happy Meal Ethernet",
   "sunqe" => "Sun Quad Ethernet",
 ),
 if_(arch() !~ /alpha/ && arch() !~ /sparc/,
-  "3c509" => "3com 3c509",
   "3c501" => "3com 3c501",
   "3c503" => "3com 3c503",
   "3c505" => "3com 3c505",
   "3c507" => "3com 3c507",
+  "3c509" => "3com 3c509",
   "3c515" => "3com 3c515",
   "3c90x" => "3Com 3c90x (Cyclone/Hurricane/Tornado)",
-  "at1700" => "Allied Telesis AT1700",
+  "82596" => "Apricot 82596",
+  "abyss" => "Smart 16/4 PCI Ringnode (token ring)",
   "ac3200" => "Ansel Communication AC3200",
   "acenic" => "AceNIC Gigabit Ethernet",
-  "pcnet32" => "AMD PC/Net 32",
-  "82596" => "Apricot 82596",
+  "aironet4500_card" => "aironet4500_card",
+  "at1700" => "Allied Telesis AT1700",
   "atp" => "ATP", # builtin the kernel
-  "e2100" => "Cabletron E2100",
-  "tlan" => "Compaq Netelligent",
+  "com20020-pci" => "com20020-pci",
   "cs89x0" => "CS89x0",
   "de600" => "D-Link DE-600 pocket adapter",
   "de620" => "D-Link DE-620 pocket adapter",
-  "dgrs" => "Digi International RightSwitch",
+  "defxx" => "DEC DEFPA FDDI", # most unused
   "depca" => "Digital DEPCA and EtherWORKS",
-  "ewrk3" => "Digital EtherWORKS 3",
-  "old_tulip" => "Digital 21040/21041/21140 (old Tulip driver)",
-  "tulip" => "Digital 21040/21041/21140 (Tulip)",
-  "eth16i" => "ICL EtherTeam 16i",
-  "epic100" => "EPIC 100",
-  "eexpress" => "Intel EtherExpress",
+  "dgrs" => "Digi International RightSwitch",
+  "dmfe" => "dmfe",
+  "e100" => "Intel Ethernet Pro 100", #- newer Intel version of eepro100
+  "e1000" => "Intel Gigabit Ethernet",
+  "e2100" => "Cabletron E2100",
   "eepro" => "Intel EtherExpress Pro",
   "eepro100" => "Intel EtherExpress Pro 100", #- should run on sparc but no memory on floppy
-  "e100" => "Intel Ethernet Pro 100", #- newer Intel version of eepro100
-  "hp100" => "HP10/100VG any LAN ",
+  "eexpress" => "Intel EtherExpress",
+  "epic100" => "SMC 83c170 EPIC/100",
+  "eth16i" => "ICL EtherTeam 16i",
+  "ewrk3" => "Digital EtherWORKS 3",
+  "hamachi" => "hamachi",
   "hp" => "HP LAN/AnyLan",
   "hp-plus" => "HP PCLAN/plus",
+  "hp100" => "HP10/100VG any LAN ",
+  "ibmtr" => "Token Ring Tropic",
+# requires scsi_mod???  "iph5526" => "iph5526",
   "lance" => "Lance",
+  "natsemi" => "National Semiconductor 10/100",
   "ne" => "NE2000 and compatible",
   "ne2k-pci" => "NE2000 PCI",
   "ni5010" => "NI 5010",
   "ni52" => "NI 5210",
   "ni65" => "NI 6510",
+  "old_tulip" => "Digital 21040/21041/21140 (old Tulip driver)",
+  "olympic" => "olympic",
+  "pcnet32" => "AMD PC/Net 32",
+  "plip" => "PLIP (parallel port)",
   "rcpci" => "Red Creek Hardware VPN",
-  "epic100" => "SMC 83c170 EPIC/100",
-# -token ring-    "sktr" => "Syskonnect Token ring adaptor",
-  "smc9194" => "SMC 9000 series",
+  "rrunner" => "Roadrunner serial HIPPI", # mostly unused
+  "sb1000" => "sb1000",
+  "sis900" => "sis900",
+  "sk98lin" => "Syskonnect (Schneider & Koch)|Gigabit Ethernet",
+  "sktr" => "Syskonnect Token ring adaptor",
   "smc-ultra" => "SMC Ultra",
-#******(missing-2.4)    "smc-ultra32" => "SMC Ultra 32",
-  "yellowfin" => "Symbios Yellowfin G-NIC",
+  "smc9194" => "SMC 9000 series",
+  "starfire" => "Adaptec StarFire",
+  "tlan" => "Compaq Netelligent",
+  "tmspci" => "tmspci (token ring)",
+  "tulip" => "Digital 21040/21041/21140 (Tulip)",
   "via-rhine" => "VIA Rhine",
 #  "wavelan" => "AT&T WaveLAN & DEC RoamAbout DS", # TODO is a "AT&T GIS WaveLAN ISA" ?
   "wd" => "WD8003, WD8013 and compatible",
-#******(missing-2.4)  "z85230" => "Z85x30",
-
-  "dmfe" => "dmfe",
-# -token ring-    "ibmtr" => "Token Ring Tropic",
-# -token ring-    "olympic" => "olympic",
-  "plip" => "PLIP (parallel port)",
+  "winbond-840" => "Compex RL100-ATX",
+  "yellowfin" => "Symbios Yellowfin G-NIC",
+#******(missing-2.4)    "smc-ultra32" => "SMC Ultra 32",
 #******(missing-2.4)  "rl100a" => "rl100a",
-  "sb1000" => "sb1000",
-  "sis900" => "sis900",
-  "sk98lin" => "Syskonnect (Schneider & Koch)|Gigabit Ethernet",
+#******(missing-2.4)  "z85230" => "Z85x30",
 ),
   "3c59x" => "3com 3c59x (Vortex)",
+  "8139too" => "Realtek RTL-8139",
   "de4x5" => "Digital 425,434,435,450,500",
   "rtl8139" => "RealTek RTL8129/8139",
-  "8139too" => "Realtek RTL-8139",
+  "sunhme" => "Sun Happy Meal Ethernet",
+  "sundance" => "sundance",
 }],
 [ 'net_raw', {
   "8390" => "8390",
@@ -103,7 +114,14 @@ if_(arch() !~ /alpha/ && arch() !~ /sparc/,
 }],
 [ 'isdn', {
    "hisax" => "hisax",
+   "hysdn" => "hysdn",
    "b1pci" => "b1pci",
+   "t1pci" => "t1pci",
+   "c4" => "c4",
+}],
+[ 'media', {
+   "ns558" => "Creative Labs SB Live! joystick",
+   "radio-maxiradio" => "radio-maxiradio",
 }],
 [ 'scsi', {
 if_(arch() =~ /ppc/,
@@ -114,35 +132,37 @@ if_(arch() =~ /^sparc/,
   "qlogicpti" => "Performance Technologies ISP",
 ),
 if_(arch() !~ /alpha/ && arch() !~ /sparc/,
+  "3w-xxxx" => "3ware ATA-RAID",
+  "53c7,8xx" => "NCR 53c7xx",
+  "AM53C974" => "AMD SCSI",
+  "BusLogic" => "BusLogic Adapters",
+  "NCR53c406a" => "NCR 53c406a",
+  "a100u2w" => "a100u2w",
+  "advansys" => "AdvanSys Adapters",
   "aha152x" => "Adaptec 152x",
   "aha1542" => "Adaptec 1542",
   "aha1740" => "Adaptec 1740",
-  "advansys" => "AdvanSys Adapters",
-  "in2000" => "Always IN2000",
-  "AM53C974" => "AMD SCSI",
-  "BusLogic" => "BusLogic Adapters",
+  "atp870u" => "atp870u (Acard/Artop)",
+  "dc395x_trm" => "dc395x_trm",
   "dtc" => "DTC 3180/3280",
-  "seagate" => "Future Domain TMC-885, TMC-950",
   "fdomain" => "Future Domain TMC-16x0",
-  "initio" => "Initio",
   "g_NCR5380" => "NCR 5380",
-  "NCR53c406a" => "NCR 53c406a",
-  "53c7,8xx" => "NCR 53c7xx",
+  "in2000" => "Always IN2000",
+  "initio" => "Initio",
+  "pci2220i" => "Perceptive Solutions 2240I",
+  "psi240i" => "psi240i",
+  "qla1280" => "Q Logic QLA1280",
+  "qla2x00" => "Q Logic QLA2200",
   "qlogicfas" => "Qlogic FAS",
+  "qlogicfc" => "qlogicfc",
   "seagate" => "Seagate ST01/02",
+  "sim710" => "sim710",
+  "sym53c416" => "sym53c416",
   "t128" => "Trantor T128/T128F/T228",
+  "tmscsim" => "tmscsim",
   "u14-34f" => "UltraStor 14F/34F",
   "ultrastor" => "UltraStor 14F/24F/34F",
   "wd7000" => "Western Digital wd7000",
-
-  "a100u2w" => "a100u2w",
-  "atp870u" => "atp870u (Acard/Artop)",
-  "dc395x_trm" => "dc395x_trm",
-  "psi240i" => "psi240i",
-  "qlogicfc" => "qlogicfc",
-  "sim710" => "sim710",
-  "sym53c416" => "sym53c416",
-  "tmscsim" => "tmscsim",
 ),
   "aic7xxx" => "Adaptec 2740, 2840, 2940",
   "ncr53c8xx" => "NCR 53C8xx PCI",
@@ -169,6 +189,7 @@ if_(arch() !~ /alpha/ && arch() !~ /sparc/,
   "cciss" => "Compaq Smart Array 5300 Controller",
   "cpqarray" => "Compaq Smart-2/P RAID Controller",
   "gdth" => "ICP Disk Array Controller",
+  "i2o_block" => "Intel Integrated RAID",
   "ips" => "IBM ServeRAID controller",
   "eata" => "EATA SCSI PM2x24/PM3224",
   "eata_pio" => "EATA PIO Adapters",
@@ -207,19 +228,26 @@ if_(arch() =~ /ppc/,
 ),
 if_(arch() !~ /^sparc/,
   "cmpci" => "C-Media Electronics CMI8338A CMI8338B CMI8738",
+  "cs46xx" => "CrystalClear SoundFusion (cs46xx)",
+  "cs4281" => "Crystal CS4281",
   "es1370" => "Ensoniq ES1370 [AudioPCI]",
   "es1371" => "Ensoniq ES1371 [AudioPCI-97]",
   "esssolo1" => "ESS Technology ES1969 Solo-1 Audiodrive",
   "i810_audio" => "i810 integrated sound card",
   "maestro" => "Maestro",
+  "maestro3" => "ESS Maestro-3",
   "nm256" => "Neomagic MagicMedia 256AV",
   "pas16" => "Pro Audio Spectrum/Studio 16",
+  "trident" => "M5451 PCI South Bridge Audio",
   "via82cxxx" => "VIA VT82C686_5",
+  "via82cxxx_audio" => "VT82C686 (Apollo Super AC97)",
   "sonicvibes" => "S3 SonicVibes",
   "snd-card-ice1712" => "IC Ensemble Inc|ICE1712 [Envy24]",
   "emu10k1" => "Creative Labs|SB Live! (audio)",
+  "ymfpci" => "Yamaha YMF-740, DS-1",
 #  "au8820" => "Aureal Semiconductor|Vortex 1",
 #  "au8830" => "Aureal Semiconductor|Vortex 2",
+  "snd-card-cmipci" => "CMI",
   "snd-card-cs461x" => "Cirrus Logic|CS 4610/11 [CrystalClear SoundFusion Audio Accelerator]",
   "snd-card-ens1371" => "Ensoniq/Creative Labs ES1371",
   "snd-card-es1938" => "ESS Technology|ES1969 Solo-1 Audiodrive",
@@ -323,19 +351,20 @@ if_(arch() !~ /^sparc/,
   "vfat" => "vfat",
 }],
 [ 'other', {
-  "st" => "st",
-  "sg" => "sg",
+  "agpgart" => "agpgart",
+  "bttv" => "Brooktree Corporation|Bt8xx Video Capture",
+  "buz" => "Zoran Corporation|ZR36057PQC Video cutting chipset",
+  "defxx" => "DEC|DEFPA",
+  "i810_rng" => "i810_rng",
+  "ide-floppy" => "ide-floppy",
   "ide-scsi" => "ide-scsi",
+  "ide-tape" => "ide-tape",
   "loop" => "Loopback device",
   "lp" => "Parallel Printer",
-  "ide-floppy" => "ide-floppy",
-  "ide-tape" => "ide-tape",
   "nbd" => "nbd",
-  "bttv" => "Brooktree Corporation|Bt8xx Video Capture",
-  "buz" => "Zoran Corporation|ZR36057PQC Video cutting chipset",
   "rrunner" => "Essential Communications|Roadrunner serial HIPPI",
-  "defxx" => "DEC|DEFPA"
-#-  "ide-probe-mod" => "ide-probe-mod",
+  "sg" => "sg",
+  "st" => "st",
 }],
 );
 
@@ -343,17 +372,20 @@ my %type_aliases = (
   scsi => 'disk',
 );
 
-my @skip_big_modules_on_stage1 = 
+my @skip_big_modules_on_stage1 = (
+# dgrs e1000
 qw(
-sk98lin dc395x_trm
-); #******(missing-2.4)  dpt_i2o aztcd gscd isp16 mcd mcdx optcd cm206 sjcd cdu31a
-
-#acenic 
-#BusLogic seagate fdomain g_NCR5380 tmscsim
-#gdth eata eata_pio eata_dma
+sk98lin acenic
+aironet4500_card com20020-pci hamachi natsemi starfire winbond-840
 
+dc395x_trm
+BusLogic seagate fdomain g_NCR5380 tmscsim
+)
+); #******(missing-2.4)  dpt_i2o aztcd gscd isp16 mcd mcdx optcd cm206 sjcd cdu31a
 
 my @skip_modules_on_stage1 = (
+  qw(olympic sktr tmspci ibmtr abyss), # token ring
+  qw(old_tulip rtl8139), # doesn't exist in 2.4
   if_(arch() =~ /alpha|ppc/, qw(sb1000)),
   "apa1480_cb",
   "imm",
@@ -361,6 +393,8 @@ my @skip_modules_on_stage1 = (
   "parport",
   "parport_pc",
   "plip",
+  qw(3w-xxxx pci2220i qla1280 qla2x00 i2o_block),
+  qw(gdth eata eata_pio eata_dma ips),
 );