[alsa-devel] [PATCH 1/4] sound: oss: Remove SoftOSS documentation
SoftOSS has been removed before kernel git history but not this documentation part.
Signed-off-by: Jarkko Nikula jarkko.nikula@linux.intel.com --- Documentation/sound/oss/README.OSS | 46 -------------------------------------- 1 file changed, 46 deletions(-)
diff --git a/Documentation/sound/oss/README.OSS b/Documentation/sound/oss/README.OSS index 4be259428a1c..ad261dd602ce 100644 --- a/Documentation/sound/oss/README.OSS +++ b/Documentation/sound/oss/README.OSS @@ -516,52 +516,6 @@ Yamaha OPL3-SA1 use the standard MSS, MPU401 and OPL3 options with these chips and to activate the card using isapnptools.
-4Front Technologies SoftOSS - - SoftOSS is a software based wave table emulation which works with - any 16 bit stereo sound card. Due to its nature a fast CPU is - required (P133 is minimum). Although SoftOSS does _not_ use MMX - instructions it has proven out that recent processors (which appear - to have MMX) perform significantly better with SoftOSS than earlier - ones. For example a P166MMX beats a PPro200. SoftOSS should not be used - on 486 or 386 machines. - - The amount of CPU load caused by SoftOSS can be controlled by - selecting the CONFIG_SOFTOSS_RATE and CONFIG_SOFTOSS_VOICES - parameters properly (they will be prompted by make config). It's - recommended to set CONFIG_SOFTOSS_VOICES to 32. If you have a - P166MMX or faster (PPro200 is not faster) you can set - CONFIG_SOFTOSS_RATE to 44100 (kHz). However with slower systems it - recommended to use sampling rates around 22050 or even 16000 kHz. - Selecting too high values for these parameters may hang your - system when playing MIDI files with hight degree of polyphony - (number of concurrently playing notes). It's also possible to - decrease CONFIG_SOFTOSS_VOICES. This makes it possible to use - higher sampling rates. However using fewer voices decreases - playback quality more than decreasing the sampling rate. - - SoftOSS keeps the samples loaded on the system's RAM so much RAM is - required. SoftOSS should never be used on machines with less than 16 MB - of RAM since this is potentially dangerous (you may accidentally run out - of memory which probably crashes the machine). - - SoftOSS implements the wave table API originally designed for GUS. For - this reason all applications designed for GUS should work (at least - after minor modifications). For example gmod/xgmod and playmidi -g are - known to work. - - To work SoftOSS will require GUS compatible - patch files to be installed on the system (in /dos/ultrasnd/midi). You - can use the public domain MIDIA patchset available from several ftp - sites. - - ********************************************************************* - IMPORTANT NOTICE! The original patch set distributed with the Gravis - Ultrasound card is not in public domain (even though it's available from - some FTP sites). You should contact Voice Crystal (www.voicecrystal.com) - if you like to use these patches with SoftOSS included in OSS/Free. - ********************************************************************* - PSS based cards (AD1848 + ADSP-2115 + Echo ESC614 ASIC) Analog Devices and Echo Speech have together defined a sound card architecture based on the above chips. The DSP chip is used
int softoss_dev is not defined anywhere.
Signed-off-by: Jarkko Nikula jarkko.nikula@linux.intel.com --- sound/oss/vidc.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c index 92ca5bee1860..d81f76f72c8c 100644 --- a/sound/oss/vidc.c +++ b/sound/oss/vidc.c @@ -82,7 +82,6 @@ static unsigned int vidc_audio_volume_l; /* left PCM vol, 0 - 65536 */ static unsigned int vidc_audio_volume_r; /* right PCM vol, 0 - 65536 */
extern void vidc_update_filler(int bits, int channels); -extern int softoss_dev;
static void vidc_mixer_set(int mdev, unsigned int level)
None of these is used in kernel tree.
Signed-off-by: Jarkko Nikula jarkko.nikula@linux.intel.com --- sound/oss/dev_table.h | 13 ------------- 1 file changed, 13 deletions(-)
diff --git a/sound/oss/dev_table.h b/sound/oss/dev_table.h index 0199a317c5a9..afb3aaff145f 100644 --- a/sound/oss/dev_table.h +++ b/sound/oss/dev_table.h @@ -21,20 +21,7 @@ * Numbers 1000 to N are reserved for driver's internal use. */
-#define SNDCARD_DESKPROXL 27 /* Compaq Deskpro XL */ -#define SNDCARD_VIDC 28 /* ARMs VIDC */ -#define SNDCARD_SBPNP 29 -#define SNDCARD_SOFTOSS 36 #define SNDCARD_VMIDI 37 -#define SNDCARD_OPL3SA1 38 /* Note: clash in msnd.h */ -#define SNDCARD_OPL3SA1_SB 39 -#define SNDCARD_OPL3SA1_MPU 40 -#define SNDCARD_WAVEFRONT 41 -#define SNDCARD_OPL3SA2 42 -#define SNDCARD_OPL3SA2_MPU 43 -#define SNDCARD_WAVEARTIST 44 /* Waveartist */ -#define SNDCARD_OPL3SA2_MSS 45 /* Originally missed */ -#define SNDCARD_AD1816 88
/* * NOTE! NOTE! NOTE! NOTE!
None of these is used in kernel tree.
Signed-off-by: Jarkko Nikula jarkko.nikula@linux.intel.com Cc: linux-api@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- RFC, I don't know can these be used in user-space? --- include/uapi/linux/soundcard.h | 22 ---------------------- 1 file changed, 22 deletions(-)
diff --git a/include/uapi/linux/soundcard.h b/include/uapi/linux/soundcard.h index f3b21f989872..d2256bf4bdd8 100644 --- a/include/uapi/linux/soundcard.h +++ b/include/uapi/linux/soundcard.h @@ -48,32 +48,10 @@ * Supported card ID numbers (Should be somewhere else?) */
-#define SNDCARD_ADLIB 1 #define SNDCARD_SB 2 #define SNDCARD_PAS 3 -#define SNDCARD_GUS 4 #define SNDCARD_MPU401 5 -#define SNDCARD_SB16 6 -#define SNDCARD_SB16MIDI 7 #define SNDCARD_UART6850 8 -#define SNDCARD_GUS16 9 -#define SNDCARD_MSS 10 -#define SNDCARD_PSS 11 -#define SNDCARD_SSCAPE 12 -#define SNDCARD_PSS_MPU 13 -#define SNDCARD_PSS_MSS 14 -#define SNDCARD_SSCAPE_MSS 15 -#define SNDCARD_TRXPRO 16 -#define SNDCARD_TRXPRO_SB 17 -#define SNDCARD_TRXPRO_MPU 18 -#define SNDCARD_MAD16 19 -#define SNDCARD_MAD16_MPU 20 -#define SNDCARD_CS4232 21 -#define SNDCARD_CS4232_MPU 22 -#define SNDCARD_MAUI 23 -#define SNDCARD_PSEUDO_MSS 24 -#define SNDCARD_GUSPNP 25 -#define SNDCARD_UART401 26 /* Sound card numbers 27 to N are reserved. Don't add more numbers here. */
/***********************************
At Thu, 11 Dec 2014 14:19:13 +0200, Jarkko Nikula wrote:
None of these is used in kernel tree.
Signed-off-by: Jarkko Nikula jarkko.nikula@linux.intel.com Cc: linux-api@vger.kernel.org Cc: linux-kernel@vger.kernel.org
RFC, I don't know can these be used in user-space?
I guess we should keep these. These are fixed ID numbers, no matter whether the driver actually is present or not.
Takashi
include/uapi/linux/soundcard.h | 22 ---------------------- 1 file changed, 22 deletions(-)
diff --git a/include/uapi/linux/soundcard.h b/include/uapi/linux/soundcard.h index f3b21f989872..d2256bf4bdd8 100644 --- a/include/uapi/linux/soundcard.h +++ b/include/uapi/linux/soundcard.h @@ -48,32 +48,10 @@
- Supported card ID numbers (Should be somewhere else?)
*/
-#define SNDCARD_ADLIB 1 #define SNDCARD_SB 2 #define SNDCARD_PAS 3 -#define SNDCARD_GUS 4 #define SNDCARD_MPU401 5 -#define SNDCARD_SB16 6 -#define SNDCARD_SB16MIDI 7 #define SNDCARD_UART6850 8 -#define SNDCARD_GUS16 9 -#define SNDCARD_MSS 10 -#define SNDCARD_PSS 11 -#define SNDCARD_SSCAPE 12 -#define SNDCARD_PSS_MPU 13 -#define SNDCARD_PSS_MSS 14 -#define SNDCARD_SSCAPE_MSS 15 -#define SNDCARD_TRXPRO 16 -#define SNDCARD_TRXPRO_SB 17 -#define SNDCARD_TRXPRO_MPU 18 -#define SNDCARD_MAD16 19 -#define SNDCARD_MAD16_MPU 20 -#define SNDCARD_CS4232 21 -#define SNDCARD_CS4232_MPU 22 -#define SNDCARD_MAUI 23 -#define SNDCARD_PSEUDO_MSS 24 -#define SNDCARD_GUSPNP 25 -#define SNDCARD_UART401 26 /* Sound card numbers 27 to N are reserved. Don't add more numbers here. */
/***********************************
2.1.3
participants (2)
-
Jarkko Nikula -
Takashi Iwai