lkml.org 
[lkml]   [2000]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] for PAS16 functionality for 2.4
The PAS16 sound support includes code for the Soundblaster capability on
the card. I found an apparent Makefile error which does not enable the
Soundblaster support as anticipated. Adding SB support induces an error
for uart401 being included twice at various points of the build process.
The enclosed patch corrects the Makefile and makes appropriate changes
to various doc files. Please consider accepting this for the next
kernel. This patch is against 2.4.0-test8.

Alan: would you like a patch for 2.2? If so, against which kernel?

diff -urN linux/Documentation/Configure.help linux.new/Documentation/Configure.help
--- linux/Documentation/Configure.help Sat Sep 9 09:44:39 2000
+++ linux.new/Documentation/Configure.help Sat Sep 9 14:06:54 2000
@@ -13699,7 +13699,9 @@
Answer Y only if you have a Pro Audio Spectrum 16, ProAudio Studio
16 or Logitech SoundMan 16 sound card. Answer N if you have some
other card made by Media Vision or Logitech since those are not
- PAS16 compatible. Please read Documentation/sound/PAS16.
+ PAS16 compatible. Do not enable both PAS16 support and Soundblaster
+ support since PAS16 support includes support for Soundblaster.
+ Please read Documentation/sound/PAS16.

If you compile the driver into the kernel, you have to add
"pas2=<io>,<irq>,<dma>,<dma2>,<sbio>,<sbirq>,<sbdma>,<sbdma2>
@@ -13710,7 +13712,8 @@
Answer Y if you have an original Sound Blaster card made by Creative
Labs or a 100% hardware compatible clone (like the Thunderboard or
SM Games). For an unknown card you may answer Y if the card claims
- to be Sound Blaster-compatible.
+ to be Sound Blaster-compatible. Do not enable both Soundblaster
+ and PAS16 support.

Please read the file Documentation/sound/Soundblaster.

diff -urN linux/Documentation/sound/PAS16 linux.new/Documentation/sound/PAS16
--- linux/Documentation/sound/PAS16 Fri Apr 14 19:19:09 2000
+++ linux.new/Documentation/sound/PAS16 Sat Sep 9 14:32:15 2000
@@ -1,7 +1,7 @@
Pro Audio Spectrum 16 for 2.3.99 and later
=========================================
by Thomas Molina (tmolina@home.com)
-last modified 26 Mar 2000
+last modified 9 Sep 2000
Acknowledgement to Axel Boldt (boldt@math.ucsb.edu) for stuff taken
from Configure.help, Riccardo Facchetti for stuff from README.OSS,
and others whose names I could not find.
@@ -43,11 +43,10 @@
Pro Audio Studio 16 or Logitech SoundMan 16 (be sure that
you read the above list correctly). Don't answer 'y' if you
have some other card made by Media Vision or Logitech since they
- are not PAS16 compatible.
- NOTE! Since 3.5-beta10 you need to enable SB support (next question)
- if you want to use the SB emulation of PAS16. It's also possible to
- the emulation if you want to use a true SB card together with PAS16
- (there is another question about this that is asked later).
+ are not PAS16 compatible. PAS16 support includes support for
+ Soundblaster (sb.o module) so do not enable them both.
+
+
"Sound Blaster support",
- Answer 'y' if you have an original SB card made by Creative Labs
or a full 100% hardware compatible clone (like Thunderboard or
@@ -55,7 +54,7 @@
please look at the card specific instructions later in this file
before answering this question. For an unknown card you may answer
'y' if the card claims to be SB compatible.
- Enable this option also with PAS16.
+ Do not enable this option together with PAS16.

"Generic OPL2/OPL3 FM synthesizer support",
- Answer 'y' if your card has a FM chip made by Yamaha (OPL2/OPL3/OPL4).
@@ -113,7 +112,10 @@
Answer Y only if you have a Pro Audio Spectrum 16, ProAudio Studio
16 or Logitech SoundMan 16 sound card. Don't answer Y if you have
some other card made by Media Vision or Logitech since they are not
- PAS16 compatible.
+ PAS16 compatible. Do NOT enable both CONFIG_SOUND_PAS and
+ CONFIG_SOUND_SB since the PAS modules include support for
+ Soundblaster.
+
If you compile the driver into the kernel, you have to add
"pas2=<io>,<irq>,<dma>,<dma2>,<sbio>,<sbirq>,<sbdma>,<sbdma2>
to the kernel command line.
@@ -126,13 +128,7 @@
to be Sound Blaster-compatible. The PAS16 has 8-bit Soundblaster
support, so you can answer Y here for it.

- Please read the file Documentation/sound/Soundblaster.
-
- If you compile the driver into the kernel and don't want to use isapnp,
- you have to add "sb=<io>,<irq>,<dma>,<dma2>" to the kernel command line.
-
- You can say M here to compile this driver as a module; the module is
- called sb.o.
+ Do not enable both this option and PAS16 above

FM Synthesizer (YM3812/OPL-3) support
CONFIG_SOUND_YM3812
@@ -149,7 +145,7 @@
If you compile your drivers into the kernel, you MUST configure
OPL3 support as a module for PAS16 support to work properly.
You can then get OPL3 functionality by issuing the command:
- insmod opl3
+ modprobe opl3
In addition, you must either add the following line to
/etc/modules.conf:
options opl3 io=0x388
@@ -167,7 +163,6 @@
CONFIG_SOUND_TRACEINIT=y
CONFIG_SOUND_DMAP=y
CONFIG_SOUND_PAS=y
-CONFIG_SOUND_SB=y
CONFIG_SOUND_YM3812=m

I have also included the following append line in /etc/lilo.conf:
diff -urN linux/drivers/sound/Makefile linux.new/drivers/sound/Makefile
--- linux/drivers/sound/Makefile Sat Sep 9 13:10:51 2000
+++ linux.new/drivers/sound/Makefile Sat Sep 9 14:01:17 2000
@@ -49,7 +49,7 @@
obj-$(CONFIG_SOUND_CS4232) += cs4232.o uart401.o
obj-$(CONFIG_SOUND_OPL3SA2) += opl3sa2.o ad1848.o mpu401.o
obj-$(CONFIG_SOUND_MSS) += ad1848.o
-obj-$(CONFIG_SOUND_PAS) += pas2.o sb_lib.o uart401.o
+obj-$(CONFIG_SOUND_PAS) += pas2.o sb.o sb_lib.o uart401.o
obj-$(CONFIG_SOUND_SB) += sb.o sb_lib.o uart401.o
obj-$(CONFIG_SOUND_WAVEFRONT) += wavefront.o
obj-$(CONFIG_SOUND_MAUI) += maui.o mpu401.o
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 12:38    [W:0.041 / U:22.932 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site