These isa devs are already disabled and not particularly popular among our users. affected: tcic, sea, wds, eg, el
Index: arch/i386/conf/GENERIC =================================================================== RCS file: /cvs/src/sys/arch/i386/conf/GENERIC,v retrieving revision 1.744 diff -u -p -r1.744 GENERIC --- arch/i386/conf/GENERIC 15 Mar 2013 09:10:52 -0000 1.744 +++ arch/i386/conf/GENERIC 26 Mar 2013 08:20:40 -0000 @@ -188,7 +188,6 @@ nvt* at iic? # Novoton W83795G pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000 pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000 pcic2 at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000 -tcic0 at isa? disable port 0x240 iomem 0xd0000 iosiz 0x10000 # ISA Plug-and-Play PCMCIA controllers #option DEBUG_ISAPNP @@ -199,7 +198,6 @@ pcic* at pci? # PCMCIA bus support pcmcia* at pcic? -pcmcia* at tcic? # CardBus bus support cardbus* at cardslot? @@ -464,13 +462,10 @@ siop* at pci? # NCR 538XX SCSI control adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI adw* at pci? # AdvanSys ULTRA WIDE SCSI pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI -sea0 at isa? disable iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers trm* at pci? # Tekram DC-3x5U SCSI Controllers uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers uha1 at isa? disable port 0x334 # UltraStor [13]4f SCSI controllers uha* at eisa? # UltraStor 24f SCSI controllers -wds0 at isa? disable port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers -#wds1 at isa? port 0x358 irq 11 drq 5 scsibus* at scsi? sd* at scsibus? # SCSI disk drives @@ -511,8 +506,6 @@ ne0 at isa? port 0x240 irq 9 # NE[12]00 ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet ne* at isapnp? # NE[12]000 PnP ethernet -eg0 at isa? disable port 0x310 irq 5 # 3C505/Etherlink+ ethernet -el0 at isa? disable port 0x300 irq 9 # 3C501 ethernet ep0 at isa? # 3C509 ethernet ep* at isapnp? # 3C509 PnP ethernet ep* at isa? # 3C509 ethernet Index: arch/i386/conf/RAMDISK_CD =================================================================== RCS file: /cvs/src/sys/arch/i386/conf/RAMDISK_CD,v retrieving revision 1.194 diff -u -p -r1.194 RAMDISK_CD --- arch/i386/conf/RAMDISK_CD 16 Nov 2012 02:15:38 -0000 1.194 +++ arch/i386/conf/RAMDISK_CD 26 Mar 2013 08:19:13 -0000 @@ -223,13 +223,11 @@ siop* at pci? # NCR 538XX SCSI control adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI adw* at pci? # AdvanSys ULTRA WIDE SCSI pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI -sea0 at isa? disable iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers trm* at pci? # Tekram DC-3x5U SCSI Controllers uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers uha1 at isa? disable port 0x334 # UltraStor [13]4f SCSI controllers uha* at eisa? # UltraStor 24f SCSI controllers -wds0 at isa? disable port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers -#wds1 at isa? port 0x358 irq 11 drq 5 + softraid0 at root # Software RAID # I2O @@ -272,8 +270,6 @@ ne0 at isa? port 0x240 irq 9 # NE[12]000 ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet ne* at isapnp? # NE[12]000 PnP ethernet -eg0 at isa? disable port 0x310 irq 5 # 3C505/Etherlink+ ethernet -el0 at isa? disable port 0x300 irq 9 # 3C501 ethernet ep0 at isa? # 3C509 ethernet ep* at isa? # 3C509 ethernet ep* at isapnp? # 3C509 PnP ethernet Index: arch/i386/conf/files.i386 =================================================================== RCS file: /cvs/src/sys/arch/i386/conf/files.i386,v retrieving revision 1.211 diff -u -p -r1.211 files.i386 --- arch/i386/conf/files.i386 6 Sep 2012 20:20:30 -0000 1.211 +++ arch/i386/conf/files.i386 26 Mar 2013 08:19:33 -0000 @@ -362,12 +362,6 @@ file dev/isa/i82365_isapnp.c pcic_isapnp # Code common to ISA and ISAPnP attachments file dev/isa/i82365_isasubr.c pcic_isa | pcic_isapnp | pcic_pci -# Databook TCIC/2 pcmcia/isa bridge -device tcic: pcmciabus -file dev/ic/tcic2.c tcic -attach tcic at isa with tcic_isa -file dev/isa/tcic2_isa.c tcic_isa - # # Machine-independent PCMCIA drivers # Index: dev/isa/files.isa =================================================================== RCS file: /cvs/src/sys/dev/isa/files.isa,v retrieving revision 1.111 diff -u -p -r1.111 files.isa --- dev/isa/files.isa 29 Jun 2011 17:48:22 -0000 1.111 +++ dev/isa/files.isa 26 Mar 2013 08:15:07 -0000 @@ -99,21 +99,11 @@ device aha: scsi, isa_dma attach aha at isa with aha_isa file dev/isa/aha.c aha needs-flag -# Seagate ST0[12] ICs -device sea: scsi -attach sea at isa -file dev/isa/seagate.c sea - # UltraStor UHA-[13]4f boards # device declaration in sys/conf/files attach uha at isa with uha_isa: isa_dma file dev/isa/uha_isa.c uha_isa -# Western Digital WD7000 and Future Domain TMC-7000 boards -device wds: scsi, isa_dma -attach wds at isa -file dev/isa/wds.c wds - # OPTi 82C929 chipset setup code define opti file dev/isa/opti.c opti @@ -154,16 +144,6 @@ file dev/isa/elink.c elink device ec: ether, ifnet, dp8390nic, ifmedia attach ec at isa file dev/isa/if_ec.c ec - -# 3Com 3C505 -device eg: ether, ifnet -attach eg at isa -file dev/isa/if_eg.c eg - -# 3Com 3C501 -device el: ether, ifnet -attach el at isa -file dev/isa/if_el.c el # 3Com 3C509 Ethernet controller attach ep at isa with ep_isa: elink
