Messages in this thread Patch in this message | | | Date | Sat, 2 Oct 1999 19:51:42 -0500 (CDT) | From | Thomas Molina <> | Subject | Re: Duplicate FM synth config options |
| |
On Sun, 3 Oct 1999, Robert Cardell wrote:
> This is really quite trivial, but in the kernel config options for > sound, the following lines: > > Generic OPL2/OPL3 FM synthesizer support (CONFIG_SOUND_ADLIB) > FM synthesizer (YM3812/OPL-3) support (CONFIG_SOUND_YM3812) > > appear to do exactly the same thing (looking at the makefile). > > This had me a bit confused until I looked closer. Could someone remove > one of them? Or if they are different, explain why?
They are the same thing. I did a patch for 2.3, but forgot to do the same for 2.2. Here is the patch rediffed for 2.2.12. Alan, would you consider applying this for either 2.2.13 or 2.2.14?
diff -urN linux-2.2.12.old/Documentation/Configure.help linux-2.2.12/Documentation/Configure.help --- linux-2.2.12.old/Documentation/Configure.help Thu Aug 26 18:15:05 1999 +++ linux-2.2.12/Documentation/Configure.help Sat Oct 2 19:26:34 1999 @@ -9387,20 +9387,6 @@ You can say M here to compile this driver as a module; the module is called sb.o. -Generic OPL2/OPL3 FM synthesizer support -CONFIG_SOUND_ADLIB - 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 - cards may have software (TSR) FM emulation. Enabling FM support with - these cards may cause trouble (I don't currently know of any such - cards, however). - - Please read the file Documentation/sound/OPL3 if your card has an - OPL3 chip. - - If unsure, say Y. - - #Loopback MIDI device support #CONFIG_SOUND_VMIDI ### @@ -9670,7 +9656,15 @@ FM synthesizer (YM3812/OPL-3) support CONFIG_SOUND_YM3812 - Answer Y here, unless you know you will not need the option. + 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 + cards may have software (TSR) FM emulation. Enabling FM support with + these cards may cause trouble (I don't currently know of any such + cards, however). + Please read the file Documentation/sound/OPL3 if your card has an + OPL3 chip. + + If unsure, say Y. Sun Audio support CONFIG_SUN_AUDIO diff -urN linux-2.2.12.old/drivers/sound/Config.in linux-2.2.12/drivers/sound/Config.in --- linux-2.2.12.old/drivers/sound/Config.in Thu Aug 26 18:15:09 1999 +++ linux-2.2.12/drivers/sound/Config.in Sat Oct 2 19:26:35 1999 @@ -105,8 +105,6 @@ int 'SB MPU401 IRQ (Jazz16, SM Wave and ES1688) Check from manual of the card' CONFIG_SB_MPU_IRQ -1 fi - dep_tristate 'Generic OPL2/OPL3 FM synthesizer support' CONFIG_SOUND_ADLIB $CONFIG_SOUND_OSS - dep_tristate 'Gravis Ultrasound support' CONFIG_SOUND_GUS $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_GUS" = "y" -o "$CONFIG_SOUND_GUS" = "m" ]; then bool '16 bit sampling option of GUS (_NOT_ GUS MAX)' CONFIG_GUS16 diff -urN linux-2.2.12.old/drivers/sound/Makefile linux-2.2.12/drivers/sound/Makefile --- linux-2.2.12.old/drivers/sound/Makefile Thu Aug 26 18:15:09 1999 +++ linux-2.2.12/drivers/sound/Makefile Sat Oct 2 19:26:35 1999 @@ -42,7 +42,6 @@ obj-$(CONFIG_SOUND) += soundcore.o obj-$(CONFIG_DMASOUND) += dmasound.o obj-$(CONFIG_SOUND_OSS) += sound.o -obj-$(CONFIG_SOUND_ADLIB) += adlib_card.o opl3.o obj-$(CONFIG_SOUND_CS4232) += cs4232.o ad1848.o # In theory, there's probably no reason to include the uart401 code diff -urN linux-2.2.12.old/drivers/sound/adlib_card.c linux-2.2.12/drivers/sound/adlib_card.c --- linux-2.2.12.old/drivers/sound/adlib_card.c Thu May 14 12:33:17 1998 +++ linux-2.2.12/drivers/sound/adlib_card.c Sat Oct 2 19:26:35 1999 @@ -16,8 +16,6 @@ #include "sound_config.h" #include "soundmodule.h" -#ifdef CONFIG_YM3812 - void attach_adlib_card(struct address_info *hw_config) { hw_config->slots[0] = opl3_init(hw_config->io_base, hw_config->osp); @@ -69,5 +67,4 @@ SOUND_LOCK_END; } -#endif #endif diff -urN linux-2.2.12.old/drivers/sound/opl3.c linux-2.2.12/drivers/sound/opl3.c --- linux-2.2.12.old/drivers/sound/opl3.c Wed Aug 19 16:48:30 1998 +++ linux-2.2.12/drivers/sound/opl3.c Sat Oct 2 19:26:35 1999 @@ -32,8 +32,6 @@ #include "sound_config.h" #include "soundmodule.h" -#ifdef CONFIG_YM3812 - #include "opl3.h" #define MAX_VOICE 18 @@ -1223,5 +1221,3 @@ EXPORT_SYMBOL(opl3_init); EXPORT_SYMBOL(opl3_detect); MODULE_PARM(io, "i"); - -#endif | |