Messages in this thread Patch in this message | | | Date | Sun, 19 Sep 1999 00:48:45 -0500 (CDT) | From | Thomas Molina <> | Subject | [PATCH] FM Synthesizer support configuration for 2.3.18 |
| |
While mucking about with FM Synthesizer support configuration I noticed there were two choices, CONFIG_SOUND_ADLIB and CONFIG_SOUND_YM3812. Since both choices ended up adding the same two source files (adlib_card.c and opl3.c) I believe one to be redundant. The attached patch against the base 2.3.18 kernel deletes the CONFIG_SOUND_ADLIB choice and makes a few appropriate changes elsewhere.
Hopefully this will reduce confusion (at least on my part) when adding FM Synthesizer support. Please consider for inclusion in 2.3. It compiles and works on my system with a PAS16 soundcard. Feedback welcome, but be gentle; this is my first attempt at a kernel patch.
Alan, this is the same patch I previously sent you in private email. diff -urN linux-2.3.18.old/Documentation/Configure.help linux-2.3.18/Documentation/Configure.help --- linux-2.3.18.old/Documentation/Configure.help Fri Sep 10 20:09:26 1999 +++ linux-2.3.18/Documentation/Configure.help Sat Sep 18 15:54:52 1999 @@ -9744,20 +9744,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 ### @@ -10027,7 +10013,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.3.18.old/drivers/sound/Config.in linux-2.3.18/drivers/sound/Config.in --- linux-2.3.18.old/drivers/sound/Config.in Wed Sep 8 17:04:12 1999 +++ linux-2.3.18/drivers/sound/Config.in Sat Sep 18 15:48:16 1999 @@ -101,8 +101,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.3.18.old/drivers/sound/Makefile linux-2.3.18/drivers/sound/Makefile --- linux-2.3.18.old/drivers/sound/Makefile Wed Sep 8 17:04:14 1999 +++ linux-2.3.18/drivers/sound/Makefile Sat Sep 18 15:49:13 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.3.18.old/drivers/sound/adlib_card.c linux-2.3.18/drivers/sound/adlib_card.c --- linux-2.3.18.old/drivers/sound/adlib_card.c Thu May 14 12:33:17 1998 +++ linux-2.3.18/drivers/sound/adlib_card.c Sat Sep 18 16:15: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.3.18.old/drivers/sound/opl3.c linux-2.3.18/drivers/sound/opl3.c --- linux-2.3.18.old/drivers/sound/opl3.c Wed Aug 19 16:48:30 1998 +++ linux-2.3.18/drivers/sound/opl3.c Sat Sep 18 16:16:42 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 | |