Re: squeeze some isa drivers

2016-08-31 Thread Miod Vallat

> Time to play whack i386/conf/GENERIC with a bat and see what pops out.
>
> Extensive research in the archives indicates that these devices are extinct.

You'll need to remove out the commented wss line in alpha GENERIC as
well.



squeeze some isa drivers

2016-08-31 Thread Ted Unangst
Time to play whack i386/conf/GENERIC with a bat and see what pops out.

Extensive research in the archives indicates that these devices are extinct.

Index: arch/i386/conf/GENERIC
===
RCS file: /cvs/src/sys/arch/i386/conf/GENERIC,v
retrieving revision 1.817
diff -u -p -r1.817 GENERIC
--- arch/i386/conf/GENERIC  28 Jun 2016 04:41:37 -  1.817
+++ arch/i386/conf/GENERIC  31 Aug 2016 10:17:04 -
@@ -467,7 +467,6 @@ 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
@@ -691,18 +690,14 @@ envy* at pci? # VIA Envy24 
(aka ICE17
 sb0at isa? port 0x220 irq 5 drq 1  # SoundBlaster
 sb*at isapnp?
 ess*   at isapnp?  # ESS Tech ES188[78], ES888
-wss0   at isa? port 0x530 irq 10 drq 0 # Windows Sound System
-wss*   at isapnp?
 pas0   at isa? port 0x220 irq 7 drq 1  # ProAudio Spectrum
 gus0   at isa? port 0x220 irq 7 drq 1 drq2 6   # Gravis (drq2 is record drq)
 gus*   at isapnp?
-ym*at isapnp?
 mpu*   at isapnp?
 mpu*   at isa? port 0x300  # generic MPU, Yamaha SW60XG
 
 # MIDI support
 midi*  at sb?  # SB MPU401 port
-midi*  at ym?
 midi*  at mpu?
 midi*  at autri?
 midi*  at eap?
@@ -715,8 +710,6 @@ audio*  at sb?
 audio* at gus?
 audio* at pas?
 audio* at ess?
-audio* at wss?
-audio* at ym?
 audio* at eap?
 audio* at envy?
 audio* at eso?
Index: dev/isa/files.isa
===
RCS file: /cvs/src/sys/dev/isa/files.isa,v
retrieving revision 1.119
diff -u -p -r1.119 files.isa
--- dev/isa/files.isa   30 Sep 2015 12:15:12 -  1.119
+++ dev/isa/files.isa   31 Aug 2016 10:16:27 -
@@ -109,11 +109,6 @@ 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
@@ -247,14 +242,6 @@ file   dev/isa/ad1848.cad1848
 # ICS2101 mixer chip support; used by other drivers
 define ics2101
 file   dev/isa/ics2101.c   ics2101
-
-
-# Microsoft Windows Sound System
-device wss: audio, isa_dma, ad1848
-file   dev/isa/wss.c   wss
-
-attach wss at isa with wss_isa
-file   dev/isa/wss_isa.c   wss & (wss_isa | wss_isapnp)
 
 # ESS Technology ES1887/ES888/ES1888
 device ess {} : audio, isa_dma, midibus
Index: dev/isa/files.isapnp
===
RCS file: /cvs/src/sys/dev/isa/files.isapnp,v
retrieving revision 1.33
diff -u -p -r1.33 files.isapnp
--- dev/isa/files.isapnp11 May 2015 06:46:21 -  1.33
+++ dev/isa/files.isapnp31 Aug 2016 10:19:15 -
@@ -34,8 +34,6 @@ file  dev/isa/aic_isapnp.caic_isapnp
 attach sb at isapnp with sb_isapnp
 file   dev/isa/sb_isapnp.c sb_isapnp
 
-attach wss at isapnp with wss_isapnp
-file   dev/isa/wss_isapnp.cwss_isapnp
 attach ess at isapnp with ess_isapnp
 file   dev/isa/ess_isapnp.cess_isapnp
 attach gus at isapnp with gus_isapnp
@@ -63,8 +61,3 @@ attachwe at isapnp with we_isapnp
 attach rt at isapnp with rt_isapnp
 file   dev/isa/rt_isapnp.c rt_isapnp
 
-# Yamaha OPL3-SA3
-device ym: audio, isa_dma, ad1848, midibus
-attach ym at isapnp with ym_isapnp
-file   dev/isa/ym.cym_isapnp
-file   dev/isa/ym_isapnp.c ym_isapnp