Sound Blaster in 2.1.77

rjc@snoopy.virtual.net.au
Sat, 3 Jan 1998 21:17:10 +1100 (EST)

The following patch makes the Sound Blaster 16 driver work for me. The
change to Makefile makes it compile the uart401.o module. This is good as an
interim hack (the code in 2.1.77 should work but does not for some reason I
can't determine), and possibly as a real solution (maybe we should just force
it to be a module if we compile sb.o as a module).
The change to sb_audio.c follows another similar change in the 2.1.77 patch
and I believe it to be the intention of whoever is maintaining the SB code.

With this patch I can load the module and play my mp3 files (more on this in
another message).

Russell Coker

PS Is vger down or something? I'm not getting any messages on the list...

diff -ru linux/drivers/sound/Makefile linux-patched/drivers/sound/Makefile
--- linux/drivers/sound/Makefile Sat Jan 3 21:09:50 1998
+++ linux-patched/drivers/sound/Makefile Sat Jan 3 21:09:30 1998
@@ -95,9 +95,7 @@
ifeq ($(CONFIG_SB),m)
M_OBJS += sb.o
MIX_OBJS += sb_card.o
- ifneq ($(CONFIG_UART401),y)
CONFIG_UART401 = m
- endif
endif
endif

diff -ru linux/drivers/sound/sb_audio.c linux-patched/drivers/sound/sb_audio.c
--- linux/drivers/sound/sb_audio.c Sat Jan 3 21:10:31 1998
+++ linux-patched/drivers/sound/sb_audio.c Sat Jan 3 21:10:17 1998
@@ -982,7 +982,7 @@
sb_audio_close,
sb_set_output_parms,
sb_set_input_parms,
- sb_audio_ioctl,
+ NULL, /* ioctl */
sb1_audio_prepare_for_input,
sb1_audio_prepare_for_output,
sb1_audio_halt_xfer,
@@ -1002,7 +1002,7 @@
sb_audio_close,
sb_set_output_parms,
sb_set_input_parms,
- sb_audio_ioctl,
+ NULL, /* ioctl */
sb1_audio_prepare_for_input,
sb1_audio_prepare_for_output,
sb1_audio_halt_xfer,
@@ -1022,7 +1022,7 @@
sb_audio_close,
sb_set_output_parms,
sb_set_input_parms,
- sb_audio_ioctl,
+ NULL, /* ioctl */
sbpro_audio_prepare_for_input,
sbpro_audio_prepare_for_output,
sb1_audio_halt_xfer,
@@ -1042,7 +1042,7 @@
sb_audio_close,
sb_set_output_parms,
sb_set_input_parms,
- sb_audio_ioctl,
+ NULL, /* ioctl */
sbpro_audio_prepare_for_input,
sbpro_audio_prepare_for_output,
sb1_audio_halt_xfer,
@@ -1062,7 +1062,7 @@
sb_audio_close,
sb_set_output_parms,
sb_set_input_parms,
- sb_audio_ioctl,
+ NULL, /* ioctl */
sb16_audio_prepare_for_input,
sb16_audio_prepare_for_output,
sb1_audio_halt_xfer,
@@ -1082,7 +1082,7 @@
sb_audio_close,
sb_set_output_parms,
sb_set_input_parms,
- sb_audio_ioctl,
+ NULL, /* ioctl */
ess_audio_prepare_for_input,
ess_audio_prepare_for_output,
sb1_audio_halt_xfer,