[2.6 patch] schedule obsolete OSS drivers for removal (version 2)

[2.6 patch] schedule obsolete OSS drivers for removal (version 2)

[Adrian Bunk]

This patch schedules obsolete OSS drivers (with ALSA drivers that 
support the same hardware) for removal.

Scheduling the via82cxxx driver for removal was ACK'ed by Jeff Garzik.


Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Thomas Sailer <sailer@ife.ee.ethz.ch>

---

@Andrew:
I'd like to see this in the next -mm for getting more feedback.

Changes since the first version:

Options no longer scheduled for removal:
- SOUND_AD1816
- SOUND_ICH
- SOUND_OPL3SA2

I've Cc'ed the people listed in MAINTAINERS as being responsible for one 
or more of these drivers, and I've also Cc'ed the ALSA people.

Please tell if any of my driver selections are wrong.

 Documentation/feature-removal-schedule.txt |    7 +
 sound/oss/Kconfig                          |   74 ++++++++++++---------
 2 files changed, 51 insertions(+), 30 deletions(-)

--- linux-2.6.13-rc3-mm1-full/Documentation/feature-removal-schedule.txt.old	2005-07-26 16:50:05.000000000 +0200
+++ linux-2.6.13-rc3-mm1-full/Documentation/feature-removal-schedule.txt	2005-07-26 16:51:24.000000000 +0200
@@ -44,0 +45,7 @@
+What:	drivers depending on OBSOLETE_OSS_DRIVER
+When:	October 2005
+Why:	OSS drivers with ALSA replacements
+Who:	Adrian Bunk <bunk@stusta.de>
+
+---------------------------
+
--- linux-2.6.13-rc3-mm1-modular/sound/oss/Kconfig.old	2005-07-23 21:04:56.000000000 +0200
+++ linux-2.6.13-rc3-mm1-modular/sound/oss/Kconfig	2005-07-24 01:22:11.000000000 +0200
@@ -4,9 +4,24 @@
 # More hacking for modularisation.
 #
 # Prompt user for primary drivers.
+
+config OBSOLETE_OSS_DRIVER
+	bool "Obsolete OSS drivers"
+	depends on SOUND_PRIME
+	help
+	  This option enables support for obsolete OSS drivers that
+	  are scheduled for removal in the near future since there
+	  are ALSA drivers for the same hardware.
+
+	  Please contact Adrian Bunk <bunk@stusta.de> if you had to
+	  say Y here because your soundcard is not properly supported
+	  by ALSA.
+
+	  If unsure, say N.
+
 config SOUND_BT878
 	tristate "BT878 audio dma"
-	depends on SOUND_PRIME
+	depends on SOUND_PRIME && OBSOLETE_OSS_DRIVER
 	---help---
 	  Audio DMA support for bt878 based grabber boards.  As you might have
 	  already noticed, bt878 is listed with two functions in /proc/pci.
@@ -22,7 +37,7 @@
 
 config SOUND_CMPCI
 	tristate "C-Media PCI (CMI8338/8738)"
-	depends on SOUND_PRIME && PCI
+	depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
 	help
 	  Say Y or M if you have a PCI sound card using the CMI8338
 	  or the CMI8738 chipset.  Data on these chips are available at
@@ -61,7 +76,7 @@
 
 config SOUND_EMU10K1
 	tristate "Creative SBLive! (EMU10K1)"
-	depends on SOUND_PRIME && PCI
+	depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
 	---help---
 	  Say Y or M if you have a PCI sound card using the EMU10K1 chipset,
 	  such as the Creative SBLive!, SB PCI512 or Emu-APS.
@@ -95,7 +110,7 @@
 
 config SOUND_CS4281
 	tristate "Crystal Sound CS4281"
-	depends on SOUND_PRIME
+	depends on SOUND_PRIME && OBSOLETE_OSS_DRIVER
 	help
 	  Picture and feature list at
 	  <http://www.pcbroker.com/crystal4281.html>.
@@ -112,7 +127,7 @@
 
 config SOUND_ES1370
 	tristate "Ensoniq AudioPCI (ES1370)"
-	depends on SOUND_PRIME && PCI
+	depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
 	help
 	  Say Y or M if you have a PCI sound card utilizing the Ensoniq
 	  ES1370 chipset, such as Ensoniq's AudioPCI (non-97). To find
@@ -125,7 +140,7 @@
 
 config SOUND_ES1371
 	tristate "Creative Ensoniq AudioPCI 97 (ES1371)"
-	depends on SOUND_PRIME && PCI
+	depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
 	help
 	  Say Y or M if you have a PCI sound card utilizing the Ensoniq
 	  ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if
@@ -138,7 +153,7 @@
 
 config SOUND_ESSSOLO1
 	tristate "ESS Technology Solo1" 
-	depends on SOUND_PRIME && PCI
+	depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
 	help
 	  Say Y or M if you have a PCI sound card utilizing the ESS Technology
 	  Solo1 chip. To find out if your sound card uses a
@@ -149,7 +164,7 @@
 
 config SOUND_MAESTRO
 	tristate "ESS Maestro, Maestro2, Maestro2E driver"
-	depends on SOUND_PRIME && PCI
+	depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
 	help
 	  Say Y or M if you have a sound system driven by ESS's Maestro line
 	  of PCI sound chips.  These include the Maestro 1, Maestro 2, and
@@ -158,28 +173,28 @@
 
 config SOUND_MAESTRO3
 	tristate "ESS Maestro3/Allegro driver (EXPERIMENTAL)"
-	depends on SOUND_PRIME && PCI && EXPERIMENTAL
+	depends on SOUND_PRIME && PCI && EXPERIMENTAL && OBSOLETE_OSS_DRIVER
 	help
 	  Say Y or M if you have a sound system driven by ESS's Maestro 3
 	  PCI sound chip.
 
 config SOUND_ICH
 	tristate "Intel ICH (i8xx) audio support"
 	depends on SOUND_PRIME && PCI
 	help
 	  Support for integral audio in Intel's I/O Controller Hub (ICH)
 	  chipset, as used on the 810/820/840 motherboards.
 
 config SOUND_HARMONY
 	tristate "PA Harmony audio driver"
-	depends on GSC_LASI && SOUND_PRIME
+	depends on GSC_LASI && SOUND_PRIME && OBSOLETE_OSS_DRIVER
 	help
 	  Say 'Y' or 'M' to include support for Harmony soundchip
 	  on HP 712, 715/new and many other GSC based machines.
 
 config SOUND_SONICVIBES
 	tristate "S3 SonicVibes"
-	depends on SOUND_PRIME
+	depends on SOUND_PRIME && OBSOLETE_OSS_DRIVER
 	help
 	  Say Y or M if you have a PCI sound card utilizing the S3
 	  SonicVibes chipset. To find out if your sound card uses a
@@ -218,7 +233,7 @@
 
 config SOUND_AU1000
 	tristate "Au1000 Sound"
-	depends on SOUND_PRIME && (SOC_AU1000 || SOC_AU1100 || SOC_AU1500)
+	depends on SOUND_PRIME && (SOC_AU1000 || SOC_AU1100 || SOC_AU1500) && OBSOLETE_OSS_DRIVER
 
 config SOUND_AU1550_AC97
 	tristate "Au1550 AC97 Sound"
@@ -492,7 +507,7 @@
 
 config SOUND_VIA82CXXX
 	tristate "VIA 82C686 Audio Codec"
-	depends on SOUND_PRIME && PCI
+	depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
 	help
 	  Say Y here to include support for the audio codec found on VIA
 	  82Cxxx-based chips. Typically these are built into a motherboard.
@@ -563,7 +578,7 @@
 
 config SOUND_SGALAXY
 	tristate "Aztech Sound Galaxy (non-PnP) cards"
-	depends on SOUND_OSS
+	depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
 	help
 	  This module initializes the older non Plug and Play sound galaxy
 	  cards from Aztech. It supports the Waverider Pro 32 - 3D and the
@@ -599,7 +614,7 @@
 
 config SOUND_CS4232
 	tristate "Crystal CS4232 based (PnP) cards"
-	depends on SOUND_OSS
+	depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
 	help
 	  Say Y here if you have a card based on the Crystal CS4232 chip set,
 	  which uses its own Plug and Play protocol.
@@ -613,7 +628,7 @@
 
 config SOUND_SSCAPE
 	tristate "Ensoniq SoundScape support"
-	depends on SOUND_OSS
+	depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
 	help
 	  Answer Y if you have a sound card based on the Ensoniq SoundScape
 	  chipset. Such cards are being manufactured at least by Ensoniq, Spea
@@ -625,7 +640,7 @@
 
 config SOUND_GUS
 	tristate "Gravis Ultrasound support"
-	depends on SOUND_OSS
+	depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
 	help
 	  Say Y here for any type of Gravis Ultrasound card, including the GUS
 	  or GUS MAX.  See also <file:Documentation/sound/oss/ultrasound> for more
@@ -727,7 +742,7 @@
 
 config SOUND_NM256
 	tristate "NM256AV/NM256ZX audio support"
-	depends on SOUND_OSS
+	depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
 	help
 	  Say M here to include audio support for the NeoMagic 256AV/256ZX
 	  chipsets. These are the audio chipsets found in the Sony
@@ -739,7 +754,7 @@
 
 config SOUND_MAD16
 	tristate "OPTi MAD16 and/or Mozart based cards"
-	depends on SOUND_OSS
+	depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
 	---help---
 	  Answer Y if your card has a Mozart (OAK OTI-601) or MAD16 (OPTi
 	  82C928 or 82C929 or 82C931) audio interface chip. These chips are
@@ -860,7 +875,7 @@
 
 config SOUND_AWE32_SYNTH
 	tristate "AWE32 synth"
-	depends on SOUND_OSS
+	depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
 	help
 	  Say Y here if you have a Sound Blaster SB32, AWE32-PnP, SB AWE64 or
 	  similar sound card. See <file:Documentation/sound/oss/README.awe>,
@@ -870,7 +885,7 @@
 
 config SOUND_WAVEFRONT
 	tristate "Full support for Turtle Beach WaveFront (Tropez Plus, Tropez, Maui) synth/soundcards"
-	depends on SOUND_OSS && m
+	depends on SOUND_OSS && m && OBSOLETE_OSS_DRIVER
 	help
 	  Answer Y or M if you have a Tropez Plus, Tropez or Maui sound card
 	  and read the files <file:Documentation/sound/oss/Wavefront> and
@@ -878,7 +893,7 @@
 
 config SOUND_MAUI
 	tristate "Limited support for Turtle Beach Wave Front (Maui, Tropez) synthesizers"
-	depends on SOUND_OSS
+	depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
 	help
 	  Say Y here if you have a Turtle Beach Wave Front, Maui, or Tropez
 	  sound card.
@@ -904,7 +919,7 @@
 
 config SOUND_YM3812
 	tristate "Yamaha FM synthesizer (YM3812/OPL-3) support"
-	depends on SOUND_OSS
+	depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
 	---help---
 	  Answer Y if your card has a FM chip made by Yamaha (OPL2/OPL3/OPL4).
 	  Answering Y is usually a safe and recommended choice, however some
@@ -920,7 +935,7 @@
 
 config SOUND_OPL3SA1
 	tristate "Yamaha OPL3-SA1 audio controller"
-	depends on SOUND_OSS
+	depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
 	help
 	  Say Y or M if you have a Yamaha OPL3-SA1 sound chip, which is
 	  usually built into motherboards. Read
@@ -946,7 +961,7 @@
 
 config SOUND_YMFPCI
 	tristate "Yamaha YMF7xx PCI audio (native mode)"
-	depends on SOUND_OSS && PCI
+	depends on SOUND_OSS && PCI && OBSOLETE_OSS_DRIVER
 	help
 	  Support for Yamaha cards including the YMF711, YMF715, YMF718,
 	  YMF719, YMF724, Waveforce 192XG, and Waveforce 192 Digital.
@@ -1088,11 +1103,11 @@
 
 config SOUND_ALI5455
 	tristate "ALi5455 audio support"
-	depends on SOUND_PRIME && PCI
+	depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
 
 config SOUND_FORTE
 	tristate "ForteMedia FM801 driver"
-	depends on SOUND_PRIME && PCI
+	depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
 	help
 	  Say Y or M if you want driver support for the ForteMedia FM801 PCI
 	  audio controller (Abit AU10, Genius Sound Maker, HP Workstation
@@ -1100,7 +1115,7 @@
 
 config SOUND_RME96XX
 	tristate "RME Hammerfall (RME96XX) support"
-	depends on SOUND_PRIME && PCI
+	depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
 	help
 	  Say Y or M if you have a Hammerfall or Hammerfall light
 	  multichannel card from RME. If you want to access advanced
@@ -1108,7 +1123,7 @@
 
 config SOUND_AD1980
 	tristate "AD1980 front/back switch plugin"
-	depends on SOUND_PRIME
+	depends on SOUND_PRIME && OBSOLETE_OSS_DRIVER
 
 config SOUND_SH_DAC_AUDIO
 	tristate "SuperH DAC audio support"

Re: [2.6 patch] schedule obsolete OSS drivers for removal (version 2)

[Lee Revell]

On Fri, 2005-07-29 at 17:32 +0200, Adrian Bunk wrote:
> This patch schedules obsolete OSS drivers (with ALSA drivers that 
> support the same hardware) for removal.
> 
> Scheduling the via82cxxx driver for removal was ACK'ed by Jeff Garzik.
> 

Someone on linux-audio-user just pointed out that the OSS USB audio and
midi modules were never deprecated, much less scheduled to be removed.

Maybe the best way to deprecate them is to move them to Sound -> OSS,
that's where they belong anyway.

Lee

On Tue, 2005-08-09 at 18:42 +0200, Christoph Eckert wrote: 
> > Recompile the kernel with USB audio support.
> 
> Please ensure that you *disable* => Devioce drivers => USB => 
> USB audio and USB Midi.
> 
> Both are OSS modules and caused a lot of trouble here when 
> used in conjunction with the ALSA module
> 
> => Sound => ALSA => USB devices => USB Audio/MIDI driver
> 
> 
> BTW: OSS is marked as deprecated, but not the two OSS modules 
> mentioned above. Couldn't this get set or at least some info 
> that these modules belong to OSS?

Re: [2.6 patch] schedule obsolete OSS drivers for removal (version 2)

[Adrian Bunk]

On Tue, Aug 09, 2005 at 01:13:51PM -0400, Lee Revell wrote:
> On Fri, 2005-07-29 at 17:32 +0200, Adrian Bunk wrote:
> > This patch schedules obsolete OSS drivers (with ALSA drivers that 
> > support the same hardware) for removal.
> > 
> > Scheduling the via82cxxx driver for removal was ACK'ed by Jeff Garzik.
> > 
> 
> Someone on linux-audio-user just pointed out that the OSS USB audio and
> midi modules were never deprecated, much less scheduled to be removed.
> 
> Maybe the best way to deprecate them is to move them to Sound -> OSS,
> that's where they belong anyway.

I'd deprecate them without moving them.

I'll send a patch unless someone tells that any functionality of these 
drivers is lacking in ALSA.

> Lee

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [2.6 patch] schedule obsolete OSS drivers for removal (version 2)

[Lee Revell]

On Tue, 2005-08-09 at 19:49 +0200, Adrian Bunk wrote:
> I'd deprecate them without moving them.
> 

OK, I think that will still be slightly confusing becuase it comes
before Sound in the kernel config, but maybe the deprecated part will
make people think twice.

I think we should at least label these clearly as part of OSS.  Users at
least seem to know that mixing OSS and ALSA modules is bad.

> I'll send a patch unless someone tells that any functionality of these
> drivers is lacking in ALSA. 

OK.  I'm almost positive there is no functionality missing, there have
not been any reports of people needing to use the OSS driver on any of
the ALSA lists.

Lee 

Re: [2.6 patch] schedule obsolete OSS drivers for removal (version 2)

[Lee Revell]

On Tue, 2005-08-09 at 19:49 +0200, Adrian Bunk wrote:
> On Tue, Aug 09, 2005 at 01:13:51PM -0400, Lee Revell wrote:
> > On Fri, 2005-07-29 at 17:32 +0200, Adrian Bunk wrote:
> > > This patch schedules obsolete OSS drivers (with ALSA drivers that 
> > > support the same hardware) for removal.
> > > 
> > > Scheduling the via82cxxx driver for removal was ACK'ed by Jeff Garzik.
> > > 
> > 
> > Someone on linux-audio-user just pointed out that the OSS USB audio and
> > midi modules were never deprecated, much less scheduled to be removed.
> > 
> > Maybe the best way to deprecate them is to move them to Sound -> OSS,
> > that's where they belong anyway.
> 
> I'd deprecate them without moving them.
> 

Here's the patch.  The bug was that CONFIG_USB_AUDIO and CONFIG_USB_MIDI
need to depend on CONFIG_SOUND_PRIME.

It also fixes some typos and clarifies the help text.

Signed-Off-By: Lee Revell <rlrevell@joe-job.com>

--- linux-2.6.13-rc4/drivers/usb/class/Kconfig~	2005-08-12 15:54:36.000000000 -0400
+++ linux-2.6.13-rc4/drivers/usb/class/Kconfig	2005-08-12 15:57:38.000000000 -0400
@@ -5,12 +5,12 @@
 	depends on USB
 
 config USB_AUDIO
-	tristate "USB Audio support"
-	depends on USB && SOUND
+	tristate "USB Audio support (OSS)"
+	depends on USB && SOUND_PRIME
 	help
 	  Say Y here if you want to connect USB audio equipment such as
 	  speakers to your computer's USB port. You only need this if you use
-	  the OSS sound driver; ALSA has its own option for usb audio support.
+	  the OSS sound system; ALSA has its own option for USB audio support.
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called audio.
@@ -39,11 +39,13 @@
 	  module will be called bluetty.
 
 config USB_MIDI
-	tristate "USB MIDI support"
-	depends on USB && SOUND
+	tristate "USB MIDI support (OSS)"
+	depends on USB && SOUND_PRIME
 	---help---
 	  Say Y here if you want to connect a USB MIDI device to your
-	  computer's USB port. This driver is for devices that comply with
+	  computer's USB port. You only need this if you use the OSS 
+	  sound system; USB MIDI devices are supported by ALSA's USB 
+	  audio driver.  This driver is for devices that comply with
 	  'Universal Serial Bus Device Class Definition for MIDI Device'.
 
 	  The following devices are known to work:

[2.6 patch] schedule OSS USB drivers for removal

[Adrian Bunk]

On Fri, Aug 12, 2005 at 03:58:48PM -0400, Lee Revell wrote:
> On Tue, 2005-08-09 at 19:49 +0200, Adrian Bunk wrote:
> > On Tue, Aug 09, 2005 at 01:13:51PM -0400, Lee Revell wrote:
> > > On Fri, 2005-07-29 at 17:32 +0200, Adrian Bunk wrote:
> > > > This patch schedules obsolete OSS drivers (with ALSA drivers that 
> > > > support the same hardware) for removal.
> > > > 
> > > > Scheduling the via82cxxx driver for removal was ACK'ed by Jeff Garzik.
> > > > 
> > > 
> > > Someone on linux-audio-user just pointed out that the OSS USB audio and
> > > midi modules were never deprecated, much less scheduled to be removed.
> > > 
> > > Maybe the best way to deprecate them is to move them to Sound -> OSS,
> > > that's where they belong anyway.
> > 
> > I'd deprecate them without moving them.
> > 
> 
> Here's the patch.  The bug was that CONFIG_USB_AUDIO and CONFIG_USB_MIDI
> need to depend on CONFIG_SOUND_PRIME.
>...

This doesn't deprecate them (I've deprecated only some of the options 
below CONFIG_SOUND_PRIME).

What about the patch below?

A second "deprecated OSS" option doesn't do much harm and seems to be 
the easiest solution.

cu
Adrian


<--  snip  -->


Deprecate the OSS USB drivers.

This patch includes spelling fixes by Lee Revell.


Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 Documentation/feature-removal-schedule.txt |    2 +-
 drivers/usb/class/Kconfig                  |   21 ++++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

--- linux-2.6.13-rc5-mm1-full/Documentation/feature-removal-schedule.txt.old	2005-08-14 12:53:46.000000000 +0200
+++ linux-2.6.13-rc5-mm1-full/Documentation/feature-removal-schedule.txt	2005-08-14 12:54:01.000000000 +0200
@@ -42,7 +42,7 @@
 
 ---------------------------
 
-What:	drivers depending on OBSOLETE_OSS_DRIVER
+What:	drivers depending on OBSOLETE_OSS_DRIVER or OBSOLETE_OSS_USB_DRIVER
 When:	October 2005
 Why:	OSS drivers with ALSA replacements
 Who:	Adrian Bunk <bunk@stusta.de>
--- linux-2.6.13-rc5-mm1-full/drivers/usb/class/Kconfig.old	2005-08-14 12:47:29.000000000 +0200
+++ linux-2.6.13-rc5-mm1-full/drivers/usb/class/Kconfig	2005-08-14 12:54:52.000000000 +0200
@@ -4,9 +4,22 @@
 comment "USB Device Class drivers"
 	depends on USB
 
+config OBSOLETE_OSS_USB_DRIVER
+	bool "Obsolete OSS USB drivers"
+	depends on USB && SOUND
+	help
+	  This option enables support for the obsolete USB Audio and Midi
+	  drivers that are scheduled for removal in the near future since
+	  there are ALSA drivers for the same hardware.
+
+	  Please contact Adrian Bunk <bunk@stusta.de> if you had to
+	  say Y here because of missing support in the ALSA drivers.
+
+	  If unsure, say N.
+
 config USB_AUDIO
 	tristate "USB Audio support"
-	depends on USB && SOUND
+	depends on USB && SOUND && OBSOLETE_OSS_USB_DRIVER
 	help
 	  Say Y here if you want to connect USB audio equipment such as
 	  speakers to your computer's USB port. You only need this if you use
@@ -40,10 +53,12 @@
 
 config USB_MIDI
 	tristate "USB MIDI support"
-	depends on USB && SOUND
+	depends on USB && SOUND && OBSOLETE_OSS_USB_DRIVER
 	---help---
 	  Say Y here if you want to connect a USB MIDI device to your
-	  computer's USB port. This driver is for devices that comply with
+	  computer's USB port.  You only need this if you use the OSS
+	  sound system; USB MIDI devices are supported by ALSA's USB
+	  audio driver. This driver is for devices that comply with
 	  'Universal Serial Bus Device Class Definition for MIDI Device'.
 
 	  The following devices are known to work: