patch-2.1.132 linux/drivers/sound/Config.in

Next file: linux/drivers/sound/Makefile
Previous file: linux/drivers/scsi/scsi_obsolete.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.131/linux/drivers/sound/Config.in linux/drivers/sound/Config.in
@@ -15,6 +15,12 @@
      bool 'Joystick support at boot time' CONFIG_SOUND_ES1370_JOYPORT_BOOT
   fi  
   dep_tristate 'Creative Ensoniq AudioPCI 97 (ES1371)' CONFIG_SOUND_ES1371 $CONFIG_SOUND
+  if [ "$CONFIG_SOUND_ES1371" = "y" ]; then
+     bool 'Joystick support at boot time' CONFIG_SOUND_ES1371_JOYPORT_BOOT
+     if [ "$CONFIG_SOUND_ES1371_JOYPORT_BOOT" = "y" ]; then
+        hex 'Gameport I/O 200,208,210,218' CONFIG_SOUND_ES1371_GAMEPORT 200
+     fi
+  fi
   dep_tristate 'S3 SonicVibes' CONFIG_SOUND_SONICVIBES $CONFIG_SOUND
 fi
 
@@ -195,13 +201,14 @@
       int 'CS4232 MIDI IRQ 5, 7, 9, 11, 12 or 15' CONFIG_CS4232_MPU_IRQ 9
   fi
 
-  dep_tristate 'Support for Yamaha OPL3-SA[2,3,x] based (PnP) cards' CONFIG_SOUND_OPL3SA2 $CONFIG_SOUND_OSS
+  dep_tristate 'Support for Yamaha OPL3-SA2, SA3, and SAx based PnP cards' CONFIG_SOUND_OPL3SA2 $CONFIG_SOUND_OSS
   if [ "$CONFIG_SOUND_OPL3SA2" = "y" ]; then
-      hex 'OPL3SA2 audio I/O base 530, 604, E80 or F40' CONFIG_OPL3SA2_BASE 530
-      int 'OPL3SA2 audio IRQ 5, 7, 9, 11, 12 or 15' CONFIG_OPL3SA2_IRQ 11
+      hex 'OPL3SA2 audio I/O base (530 - F48 valid)' CONFIG_OPL3SA2_BASE 530
+      int 'OPL3SA2 audio IRQ 5, 7, 9, 11, 12 or 15' CONFIG_OPL3SA2_IRQ 9
       int 'OPL3SA2 audio DMA 0, 1 or 3' CONFIG_OPL3SA2_DMA 0
       int 'OPL3SA2 second (duplex) DMA 0, 1 or 3' CONFIG_OPL3SA2_DMA2 1
-      hex 'OPL3SA2 MIDI I/O base 330, 370, 3B0 or 3F0' CONFIG_OPL3SA2_MPU_BASE 330
+      hex 'OPL3SA2 control I/O base (100 - FFE valid)' CONFIG_OPL3SA2_CTRL_BASE 370
+      hex 'OPL3SA2 MIDI I/O base (300 - 334 valid)' CONFIG_OPL3SA2_MPU_BASE 330
       int 'OPL3SA2 MIDI IRQ 5, 7, 9, 11, 12 or 15' CONFIG_OPL3SA2_MPU_IRQ 9
   fi
 
@@ -224,6 +231,17 @@
       int 'SGALAXY second (duplex) DMA 0, 1 or 3' CONFIG_SGALAXY_DMA2 3
       hex 'SGALAXY SB I/O base 220 or 240' CONFIG_SGALAXY_SGBASE 220
   fi
+
+  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+    dep_tristate 'Support for AD1816(A) based cards (EXPERIMENTAL)' CONFIG_SOUND_AD1816 $CONFIG_SOUND
+    if [ "$CONFIG_SOUND_AD1816" = "y" ]; then
+      hex 'AD1816 audio I/O base 530, 604, E80 or F40' CONFIG_AD1816_BASE 530
+      int 'AD1816 audio IRQ 5, 7, 9, 11, 12 or 15' CONFIG_AD1816_IRQ 7
+      int 'AD1816 audio DMA 0, 1 or 3' CONFIG_AD1816_DMA 0
+      int 'AD1816 second (duplex) DMA 0, 1 or 3' CONFIG_AD1816_DMA2 3
+      int 'AD1816 clock chip frequency' CONFIG_AD1816_CLOCK 33000
+    fi
+  fi
   
   dep_tristate 'Yamaha OPL3-SA1 audio controller' CONFIG_SOUND_OPL3SA1 $CONFIG_SOUND_OSS
   if [ "$CONFIG_SOUND_OPL3SA1" = "y" ]; then
@@ -252,7 +270,14 @@
   fi
   
   if [ "$CONFIG_ARM" = "y" ]; then
-      bool 'VIDC 16-bit sound' CONFIG_VIDC_SOUND
+    dep_tristate 'VIDC 16-bit sound' CONFIG_SOUND_VIDC $CONFIG_SOUND_OSS
+    dep_tristate 'Netwinder WaveArtist' CONFIG_SOUND_WAVEARTIST $CONFIG_SOUND_OSS
+    if [ "$CONFIG_SOUND_WAVEARTIST" != "n" ]; then
+      hex '  WaveArtist I/O base' CONFIG_WAVEARTIST_BASE 250
+      int '  WaveArtist IRQ' CONFIG_WAVEARTIST_IRQ 28
+      int '  WaveArtist DMA' CONFIG_WAVEARTIST_DMA 3
+      int '  WaveArtist second DMA' CONFIG_WAVEARTIST_DMA2 7
+    fi
   fi
   
   

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov