* [PATCH] sound: Retire OSS
@ 2017-10-30 15:01 Takashi Iwai
2017-10-30 19:31 ` Jaroslav Kysela
0 siblings, 1 reply; 5+ messages in thread
From: Takashi Iwai @ 2017-10-30 15:01 UTC (permalink / raw)
To: alsa-devel
Hi,
below is a snippet of the patch I'm going to apply for finally
dropping the OSS code. It's been already disabled for a few kernel
versions, and we didn't get any complains. So, as discussed in the
last audio mini-summit, we go forward now.
Since the whole patch just removing a bunch of files is too big to
post (and useless), I attach only a part of it: namely, the changelog,
the diffstat, and the files that are modified (but not deleted).
thanks,
Takashi
-- 8< --
From: Takashi Iwai <tiwai@suse.de>
Subject: [PATCH] sound: Retire OSS
Since no complaints have been raised after disabling the build of OSS
(Open Sound System) by the commit 31cbee6a5611 ("sound: Disable the
build of OSS drivers"), let's finally drop the whole code and
documentation.
Some glue codes are still left intact since sound/oss/dmasound stuff
remains -- which is an independent implementation solely for m68k, and
it's not covered by ALSA yet.
Also, a couple of API header files (linux/sound.h and
linux/soundcard.h) are kept remaining as well, since the OSS API
itself is still supported by ALSA OSS emulation, and applications can
refer to these.
Where we're at it, some help texts in the top-level Kconfig are
adjusted, too (who still needs to specify I/O port in kbuild
nowadays?).
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
Documentation/sound/oss/ALS | 66 -
Documentation/sound/oss/AudioExcelDSP16 | 101 -
Documentation/sound/oss/CMI8330 | 152 --
Documentation/sound/oss/ESS | 34 -
Documentation/sound/oss/ESS1868 | 55 -
Documentation/sound/oss/Introduction | 459 -----
Documentation/sound/oss/MultiSound | 1137 -----------
Documentation/sound/oss/OPL3 | 6 -
Documentation/sound/oss/Opti | 218 --
Documentation/sound/oss/PAS16 | 162 --
Documentation/sound/oss/PSS | 41 -
Documentation/sound/oss/PSS-updates | 88 -
Documentation/sound/oss/README.OSS | 1455 -------------
Documentation/sound/oss/README.modules | 106 -
Documentation/sound/oss/README.ymfsb | 107 -
Documentation/sound/oss/SoundPro | 105 -
Documentation/sound/oss/Soundblaster | 53 -
Documentation/sound/oss/Tropez+ | 26 -
Documentation/sound/oss/VIBRA16 | 80 -
Documentation/sound/oss/WaveArtist | 170 --
Documentation/sound/oss/btaudio | 92 -
Documentation/sound/oss/mwave | 185 --
Documentation/sound/oss/oss-parameters.txt | 51 -
Documentation/sound/oss/ultrasound | 30 -
MAINTAINERS | 11 -
sound/Kconfig | 33 +-
sound/oss/CHANGELOG | 369 ----
sound/oss/Kconfig | 533 -----
sound/oss/Makefile | 107 -
sound/oss/README.FIRST | 6 -
sound/oss/ad1848.c | 3062 ----------------------------
sound/oss/ad1848.h | 24 -
sound/oss/ad1848_mixer.h | 253 ---
sound/oss/aedsp16.c | 1373 -------------
sound/oss/audio.c | 985 ---------
sound/oss/bin2hex.c | 39 -
sound/oss/coproc.h | 12 -
sound/oss/dev_table.c | 256 ---
sound/oss/dev_table.h | 390 ----
sound/oss/dmabuf.c | 1268 ------------
sound/oss/hex2hex.c | 101 -
sound/oss/kahlua.c | 229 ---
sound/oss/midi_ctrl.h | 22 -
sound/oss/midi_synth.c | 712 -------
sound/oss/midi_synth.h | 47 -
sound/oss/midibuf.c | 427 ----
sound/oss/mpu401.c | 1804 ----------------
sound/oss/mpu401.h | 11 -
sound/oss/msnd.c | 413 ----
sound/oss/msnd.h | 278 ---
sound/oss/msnd_classic.c | 3 -
sound/oss/msnd_classic.h | 185 --
sound/oss/msnd_pinnacle.c | 1941 ------------------
sound/oss/msnd_pinnacle.h | 246 ---
sound/oss/opl3.c | 1255 ------------
sound/oss/opl3_hw.h | 246 ---
sound/oss/os.h | 45 -
sound/oss/pas2.h | 20 -
sound/oss/pas2_card.c | 458 -----
sound/oss/pas2_midi.c | 262 ---
sound/oss/pas2_mixer.c | 327 ---
sound/oss/pas2_pcm.c | 419 ----
sound/oss/pss.c | 1270 ------------
sound/oss/sb.h | 185 --
sound/oss/sb_audio.c | 1097 ----------
sound/oss/sb_card.c | 354 ----
sound/oss/sb_card.h | 149 --
sound/oss/sb_common.c | 1287 ------------
sound/oss/sb_ess.c | 1822 -----------------
sound/oss/sb_ess.h | 34 -
sound/oss/sb_midi.c | 206 --
sound/oss/sb_mixer.c | 770 -------
sound/oss/sb_mixer.h | 105 -
sound/oss/sequencer.c | 1661 ---------------
sound/oss/sleep.h | 18 -
sound/oss/sound_calls.h | 87 -
sound/oss/sound_config.h | 144 --
sound/oss/sound_firmware.h | 29 -
sound/oss/sound_timer.c | 327 ---
sound/oss/soundcard.c | 733 -------
sound/oss/soundvers.h | 2 -
sound/oss/swarm_cs4297a.c | 2781 -------------------------
sound/oss/sys_timer.c | 280 ---
sound/oss/trix.c | 525 -----
sound/oss/tuning.h | 23 -
sound/oss/uart401.c | 477 -----
sound/oss/uart6850.c | 361 ----
sound/oss/ulaw.h | 69 -
sound/oss/v_midi.c | 290 ---
sound/oss/v_midi.h | 14 -
sound/oss/vidc.c | 557 -----
sound/oss/vidc.h | 63 -
sound/oss/vidc_fill.S | 218 --
sound/oss/waveartist.c | 2043 -------------------
sound/oss/waveartist.h | 92 -
95 files changed, 1 insertion(+), 41223 deletions(-)
delete mode 100644 Documentation/sound/oss/ALS
delete mode 100644 Documentation/sound/oss/AudioExcelDSP16
delete mode 100644 Documentation/sound/oss/CMI8330
delete mode 100644 Documentation/sound/oss/ESS
delete mode 100644 Documentation/sound/oss/ESS1868
delete mode 100644 Documentation/sound/oss/Introduction
delete mode 100644 Documentation/sound/oss/MultiSound
delete mode 100644 Documentation/sound/oss/OPL3
delete mode 100644 Documentation/sound/oss/Opti
delete mode 100644 Documentation/sound/oss/PAS16
delete mode 100644 Documentation/sound/oss/PSS
delete mode 100644 Documentation/sound/oss/PSS-updates
delete mode 100644 Documentation/sound/oss/README.OSS
delete mode 100644 Documentation/sound/oss/README.modules
delete mode 100644 Documentation/sound/oss/README.ymfsb
delete mode 100644 Documentation/sound/oss/SoundPro
delete mode 100644 Documentation/sound/oss/Soundblaster
delete mode 100644 Documentation/sound/oss/Tropez+
delete mode 100644 Documentation/sound/oss/VIBRA16
delete mode 100644 Documentation/sound/oss/WaveArtist
delete mode 100644 Documentation/sound/oss/btaudio
delete mode 100644 Documentation/sound/oss/mwave
delete mode 100644 Documentation/sound/oss/oss-parameters.txt
delete mode 100644 Documentation/sound/oss/ultrasound
delete mode 100644 sound/oss/CHANGELOG
delete mode 100644 sound/oss/Kconfig
delete mode 100644 sound/oss/Makefile
delete mode 100644 sound/oss/README.FIRST
delete mode 100644 sound/oss/ad1848.c
delete mode 100644 sound/oss/ad1848.h
delete mode 100644 sound/oss/ad1848_mixer.h
delete mode 100644 sound/oss/aedsp16.c
delete mode 100644 sound/oss/audio.c
delete mode 100644 sound/oss/bin2hex.c
delete mode 100644 sound/oss/coproc.h
delete mode 100644 sound/oss/dev_table.c
delete mode 100644 sound/oss/dev_table.h
delete mode 100644 sound/oss/dmabuf.c
delete mode 100644 sound/oss/hex2hex.c
delete mode 100644 sound/oss/kahlua.c
delete mode 100644 sound/oss/midi_ctrl.h
delete mode 100644 sound/oss/midi_synth.c
delete mode 100644 sound/oss/midi_synth.h
delete mode 100644 sound/oss/midibuf.c
delete mode 100644 sound/oss/mpu401.c
delete mode 100644 sound/oss/mpu401.h
delete mode 100644 sound/oss/msnd.c
delete mode 100644 sound/oss/msnd.h
delete mode 100644 sound/oss/msnd_classic.c
delete mode 100644 sound/oss/msnd_classic.h
delete mode 100644 sound/oss/msnd_pinnacle.c
delete mode 100644 sound/oss/msnd_pinnacle.h
delete mode 100644 sound/oss/opl3.c
delete mode 100644 sound/oss/opl3_hw.h
delete mode 100644 sound/oss/os.h
delete mode 100644 sound/oss/pas2.h
delete mode 100644 sound/oss/pas2_card.c
delete mode 100644 sound/oss/pas2_midi.c
delete mode 100644 sound/oss/pas2_mixer.c
delete mode 100644 sound/oss/pas2_pcm.c
delete mode 100644 sound/oss/pss.c
delete mode 100644 sound/oss/sb.h
delete mode 100644 sound/oss/sb_audio.c
delete mode 100644 sound/oss/sb_card.c
delete mode 100644 sound/oss/sb_card.h
delete mode 100644 sound/oss/sb_common.c
delete mode 100644 sound/oss/sb_ess.c
delete mode 100644 sound/oss/sb_ess.h
delete mode 100644 sound/oss/sb_midi.c
delete mode 100644 sound/oss/sb_mixer.c
delete mode 100644 sound/oss/sb_mixer.h
delete mode 100644 sound/oss/sequencer.c
delete mode 100644 sound/oss/sleep.h
delete mode 100644 sound/oss/sound_calls.h
delete mode 100644 sound/oss/sound_config.h
delete mode 100644 sound/oss/sound_firmware.h
delete mode 100644 sound/oss/sound_timer.c
delete mode 100644 sound/oss/soundcard.c
delete mode 100644 sound/oss/soundvers.h
delete mode 100644 sound/oss/swarm_cs4297a.c
delete mode 100644 sound/oss/sys_timer.c
delete mode 100644 sound/oss/trix.c
delete mode 100644 sound/oss/tuning.h
delete mode 100644 sound/oss/uart401.c
delete mode 100644 sound/oss/uart6850.c
delete mode 100644 sound/oss/ulaw.h
delete mode 100644 sound/oss/v_midi.c
delete mode 100644 sound/oss/v_midi.h
delete mode 100644 sound/oss/vidc.c
delete mode 100644 sound/oss/vidc.h
delete mode 100644 sound/oss/vidc_fill.S
delete mode 100644 sound/oss/waveartist.c
delete mode 100644 sound/oss/waveartist.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 2d3d750b19c0..01f0b76dcc06 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -527,11 +527,6 @@ W: http://ez.analog.com/community/linux-device-drivers
S: Supported
F: drivers/input/misc/adxl34x.c
-AEDSP16 DRIVER
-M: Riccardo Facchetti <fizban@tin.it>
-S: Maintained
-F: sound/oss/aedsp16.c
-
AF9013 MEDIA DRIVER
M: Antti Palosaari <crope@iki.fi>
L: linux-media@vger.kernel.org
@@ -9199,12 +9194,6 @@ F: include/linux/dt-bindings/mux/
F: include/linux/mux/
F: drivers/mux/
-MULTISOUND SOUND DRIVER
-M: Andrew Veliath <andrewtv@usa.net>
-S: Maintained
-F: Documentation/sound/oss/MultiSound
-F: sound/oss/msnd*
-
MULTITECH MULTIPORT CARD (ISICOM)
S: Orphan
F: drivers/tty/isicom.c
diff --git a/sound/Kconfig b/sound/Kconfig
index d7d2aac9542e..b6d047985905 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -3,25 +3,7 @@ menuconfig SOUND
depends on HAS_IOMEM
help
If you have a sound card in your computer, i.e. if it can say more
- than an occasional beep, say Y. Be sure to have all the information
- about your sound card and its configuration down (I/O port,
- interrupt and DMA channel), because you will be asked for it.
-
- You want to read the Sound-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>. General information about
- the modular sound system is contained in the files
- <file:Documentation/sound/oss/Introduction>. The file
- <file:Documentation/sound/oss/README.OSS> contains some slightly
- outdated but still useful information as well. Newer sound
- driver documentation is found in <file:Documentation/sound/alsa/*>.
-
- If you have a PnP sound card and you want to configure it at boot
- time using the ISA PnP tools (read
- <http://www.roestock.demon.co.uk/isapnptools/>), then you need to
- compile the sound card support as a module and load that module
- after the PnP configuration is finished. To do this, choose M here
- and read <file:Documentation/sound/oss/README.modules>; the module
- will be called soundcore.
+ than an occasional beep, say Y.
if SOUND
@@ -114,19 +96,6 @@ source "sound/synth/Kconfig"
endif # SND
-menuconfig SOUND_PRIME
- tristate "Open Sound System (DEPRECATED)"
- select SOUND_OSS_CORE
- depends on BROKEN
- help
- Say 'Y' or 'M' to enable Open Sound System drivers.
-
-if SOUND_PRIME
-
-source "sound/oss/Kconfig"
-
-endif # SOUND_PRIME
-
endif # !UML
endif # SOUND
--
2.14.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] sound: Retire OSS
2017-10-30 15:01 [PATCH] sound: Retire OSS Takashi Iwai
@ 2017-10-30 19:31 ` Jaroslav Kysela
2017-10-31 7:43 ` Takashi Iwai
0 siblings, 1 reply; 5+ messages in thread
From: Jaroslav Kysela @ 2017-10-30 19:31 UTC (permalink / raw)
To: Takashi Iwai; +Cc: ALSA development
Dne 30.10.2017 v 16:01 Takashi Iwai napsal(a):
> Hi,
>
> below is a snippet of the patch I'm going to apply for finally
> dropping the OSS code. It's been already disabled for a few kernel
> versions, and we didn't get any complains. So, as discussed in the
> last audio mini-summit, we go forward now.
>
> Since the whole patch just removing a bunch of files is too big to
> post (and useless), I attach only a part of it: namely, the changelog,
> the diffstat, and the files that are modified (but not deleted).
Reviewed-by: Jaroslav Kysela <perex@perex.cz>
--
Jaroslav Kysela <perex@perex.cz>
Linux Sound Maintainer; ALSA Project; Red Hat, Inc.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] sound: Retire OSS
2017-10-30 19:31 ` Jaroslav Kysela
@ 2017-10-31 7:43 ` Takashi Iwai
2017-10-31 10:15 ` Takashi Iwai
0 siblings, 1 reply; 5+ messages in thread
From: Takashi Iwai @ 2017-10-31 7:43 UTC (permalink / raw)
To: Jaroslav Kysela; +Cc: ALSA development
On Mon, 30 Oct 2017 20:31:38 +0100,
Jaroslav Kysela wrote:
>
> Dne 30.10.2017 v 16:01 Takashi Iwai napsal(a):
> > Hi,
> >
> > below is a snippet of the patch I'm going to apply for finally
> > dropping the OSS code. It's been already disabled for a few kernel
> > versions, and we didn't get any complains. So, as discussed in the
> > last audio mini-summit, we go forward now.
> >
> > Since the whole patch just removing a bunch of files is too big to
> > post (and useless), I attach only a part of it: namely, the changelog,
> > the diffstat, and the files that are modified (but not deleted).
>
> Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Thanks, now I merged the patch to for-next branch.
Let's see whether it goes well.
Takashi
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] sound: Retire OSS
2017-10-31 7:43 ` Takashi Iwai
@ 2017-10-31 10:15 ` Takashi Iwai
2017-10-31 10:29 ` Jaroslav Kysela
0 siblings, 1 reply; 5+ messages in thread
From: Takashi Iwai @ 2017-10-31 10:15 UTC (permalink / raw)
To: ALSA development
On Tue, 31 Oct 2017 08:43:52 +0100,
Takashi Iwai wrote:
>
> On Mon, 30 Oct 2017 20:31:38 +0100,
> Jaroslav Kysela wrote:
> >
> > Dne 30.10.2017 v 16:01 Takashi Iwai napsal(a):
> > > Hi,
> > >
> > > below is a snippet of the patch I'm going to apply for finally
> > > dropping the OSS code. It's been already disabled for a few kernel
> > > versions, and we didn't get any complains. So, as discussed in the
> > > last audio mini-summit, we go forward now.
> > >
> > > Since the whole patch just removing a bunch of files is too big to
> > > post (and useless), I attach only a part of it: namely, the changelog,
> > > the diffstat, and the files that are modified (but not deleted).
> >
> > Reviewed-by: Jaroslav Kysela <perex@perex.cz>
>
> Thanks, now I merged the patch to for-next branch.
> Let's see whether it goes well.
... and it had a bug, a leftover at sound/Makefile.
The following diff was applied.
Takashi
---
diff --git a/sound/Makefile b/sound/Makefile
index 6de45d2c32f7..e5794fdd3d79 100644
--- a/sound/Makefile
+++ b/sound/Makefile
@@ -2,8 +2,7 @@
#
obj-$(CONFIG_SOUND) += soundcore.o
-obj-$(CONFIG_SOUND_PRIME) += oss/
-obj-$(CONFIG_DMASOUND) += oss/
+obj-$(CONFIG_DMASOUND) += oss/dmasound/
obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \
firewire/ sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/ hda/ x86/
obj-$(CONFIG_SND_AOA) += aoa/
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] sound: Retire OSS
2017-10-31 10:15 ` Takashi Iwai
@ 2017-10-31 10:29 ` Jaroslav Kysela
0 siblings, 0 replies; 5+ messages in thread
From: Jaroslav Kysela @ 2017-10-31 10:29 UTC (permalink / raw)
To: Takashi Iwai; +Cc: ALSA development
Dne 31.10.2017 v 11:15 Takashi Iwai napsal(a):
> On Tue, 31 Oct 2017 08:43:52 +0100,
> Takashi Iwai wrote:
>>
>> On Mon, 30 Oct 2017 20:31:38 +0100,
>> Jaroslav Kysela wrote:
>>>
>>> Dne 30.10.2017 v 16:01 Takashi Iwai napsal(a):
>>>> Hi,
>>>>
>>>> below is a snippet of the patch I'm going to apply for finally
>>>> dropping the OSS code. It's been already disabled for a few kernel
>>>> versions, and we didn't get any complains. So, as discussed in the
>>>> last audio mini-summit, we go forward now.
>>>>
>>>> Since the whole patch just removing a bunch of files is too big to
>>>> post (and useless), I attach only a part of it: namely, the changelog,
>>>> the diffstat, and the files that are modified (but not deleted).
>>>
>>> Reviewed-by: Jaroslav Kysela <perex@perex.cz>
>>
>> Thanks, now I merged the patch to for-next branch.
>> Let's see whether it goes well.
>
> ... and it had a bug, a leftover at sound/Makefile.
> The following diff was applied.
Thanks. This simple change is obvious.
Jaroslav
>
>
> Takashi
>
> ---
> diff --git a/sound/Makefile b/sound/Makefile
> index 6de45d2c32f7..e5794fdd3d79 100644
> --- a/sound/Makefile
> +++ b/sound/Makefile
> @@ -2,8 +2,7 @@
> #
>
> obj-$(CONFIG_SOUND) += soundcore.o
> -obj-$(CONFIG_SOUND_PRIME) += oss/
> -obj-$(CONFIG_DMASOUND) += oss/
> +obj-$(CONFIG_DMASOUND) += oss/dmasound/
> obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \
> firewire/ sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/ hda/ x86/
> obj-$(CONFIG_SND_AOA) += aoa/
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>
--
Jaroslav Kysela <perex@perex.cz>
Linux Sound Maintainer; ALSA Project; Red Hat, Inc.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-10-31 10:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-30 15:01 [PATCH] sound: Retire OSS Takashi Iwai
2017-10-30 19:31 ` Jaroslav Kysela
2017-10-31 7:43 ` Takashi Iwai
2017-10-31 10:15 ` Takashi Iwai
2017-10-31 10:29 ` Jaroslav Kysela
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.