Commit f27f0a04 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa 

* master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (28 commits)
  [ALSA] Kconfig SND_SEQUENCER_OSS help text fix
  [ALSA] Add Aux input switch control for Aureon Universe
  [ALSA] pcxhr - Fix the crash with REV01 board
  [ALSA] sound/pci/hda: use create_singlethread_workqueue()
  [ALSA] hda-intel - Add support of ATI SB600
  [ALSA] cs4281 - Fix the check of timeout in probe
  [ALSA] cs4281 - Fix the check of right channel
  [ALSA] Test volume resolution of usb audio at initialization
  [ALSA] maestro3.c: fix BUG, optimization
  [ALSA] HDA/Realtek: multiple input mux definitions and pin mode additions
  [ALSA] AdLib FM card driver
  [ALSA] Fix / clean up PCM-OSS setup hooks
  [ALSA] Clean up PCM codes (take 2)
  [ALSA] Tiny clean up of PCM codes
  [ALSA] ISA drivers bailing on first !enable[i]
  [ALSA] Remove obsolete kfree_nocheck call
  [ALSA] Remove obsolete kfree_nocheck call
  [ALSA] Add snd-als300 driver for Avance Logic ALS300/ALS300+ soundcards
  [ALSA] Add snd-riptide driver for Conexant Riptide chip
  [ALSA] hda-codec - Fix noisy output wtih AD1986A 3stack model
  ...
parents 6e0dd741 c2f60c52

Documentation/sound/alsa/ALSA-Configuration.txt

+69 −0
Original line number Diff line number Diff line
@@ -120,6 +120,34 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    enable  	- enable card

		- Default: enabled, for PCI and ISA PnP cards



  Module snd-adlib

  ----------------



    Module for AdLib FM cards.



    port	- port # for OPL chip



    This module supports multiple cards. It does not support autoprobe, so

    the port must be specified. For actual AdLib FM cards it will be 0x388.

    Note that this card does not have PCM support and no mixer; only FM

    synthesis.



    Make sure you have "sbiload" from the alsa-tools package available and,

    after loading the module, find out the assigned ALSA sequencer port

    number through "sbiload -l". Example output:



      Port     Client name                       Port name

      64:0     OPL2 FM synth                     OPL2 FM Port



    Load the std.sb and drums.sb patches also supplied by sbiload:



      sbiload -p 64:0 std.sb drums.sb



    If you use this driver to drive an OPL3, you can use std.o3 and drums.o3

    instead. To have the card produce sound, use aplaymidi from alsa-utils:



      aplaymidi -p 64:0 foo.mid



  Module snd-ad1816a

  ------------------
@@ -190,6 +218,15 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    The power-management is supported.



  Module snd-als300

  -----------------



    Module for  Avance Logic ALS300 and ALS300+



    This module supports multiple cards.



    The power-management is supported.



  Module snd-als4000

  ------------------
@@ -701,6 +738,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  uniwill	3-jack

	  F1734		2-jack

	  lg		LG laptop (m1 express dual)

	  lg-lw		LG LW20 laptop

	  test		for testing/debugging purpose, almost all controls can be

			adjusted.  Appearing only when compiled with

			$CONFIG_SND_DEBUG=y
@@ -1013,6 +1051,23 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    The power-management is supported.



  Module snd-miro

  ---------------



    Module for Miro soundcards: miroSOUND PCM 1 pro, 

				miroSOUND PCM 12,

				miroSOUND PCM 20 Radio.



    port	- Port # (0x530,0x604,0xe80,0xf40)

    irq		- IRQ # (5,7,9,10,11)

    dma1	- 1st dma # (0,1,3)

    dma2	- 2nd dma # (0,1)

    mpu_port	- MPU-401 port # (0x300,0x310,0x320,0x330)

    mpu_irq	- MPU-401 irq # (5,7,9,10)

    fm_port	- FM Port # (0x388)

    wss		- enable WSS mode

    ide		- enable onboard ide support



  Module snd-mixart

  -----------------
@@ -1202,6 +1257,20 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    The power-management is supported.



  Module snd-riptide

  ------------------



    Module for Conexant Riptide chip



      joystick_port	- Joystick port # (default: 0x200)

      mpu_port		- MPU401 port # (default: 0x330)

      opl3_port		- OPL3 port # (default: 0x388)



    This module supports multiple cards.

    The driver requires the firmware loader support on kernel.

    You need to install the firmware file "riptide.hex" to the standard

    firmware path (e.g. /lib/firmware).



  Module snd-rme32

  ----------------

include/sound/core.h

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static inline void snd_power_change_state(struct snd_card *card, unsigned int st 
}



/* init.c */

int snd_power_wait(struct snd_card *card, unsigned int power_state, struct file *file);

int snd_power_wait(struct snd_card *card, unsigned int power_state);



#else /* ! CONFIG_PM */

include/sound/pcm.h

+7 −8
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ struct snd_pcm_substream { 
	/* -- assigned files -- */

	struct snd_pcm_file *file;

	struct file *ffile;

	void (*pcm_release)(struct snd_pcm_substream *);

#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)

	/* -- OSS things -- */

	struct snd_pcm_oss_substream oss;
@@ -381,13 +382,10 @@ struct snd_pcm_substream { 
	struct snd_info_entry *proc_prealloc_entry;

	/* misc flags */

	unsigned int no_mmap_ctrl: 1;

	unsigned int hw_opened: 1;

};



#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)

#define SUBSTREAM_BUSY(substream) ((substream)->file != NULL || ((substream)->oss.file != NULL))

#else

#define SUBSTREAM_BUSY(substream) ((substream)->file != NULL)

#endif





struct snd_pcm_str {
@@ -460,7 +458,6 @@ int snd_pcm_info_user(struct snd_pcm_substream *substream, 
		      struct snd_pcm_info __user *info);

int snd_pcm_status(struct snd_pcm_substream *substream,

		   struct snd_pcm_status *status);

int snd_pcm_prepare(struct snd_pcm_substream *substream);

int snd_pcm_start(struct snd_pcm_substream *substream);

int snd_pcm_stop(struct snd_pcm_substream *substream, int status);

int snd_pcm_drain_done(struct snd_pcm_substream *substream);
@@ -468,11 +465,13 @@ int snd_pcm_drain_done(struct snd_pcm_substream *substream); 
int snd_pcm_suspend(struct snd_pcm_substream *substream);

int snd_pcm_suspend_all(struct snd_pcm *pcm);

#endif

int snd_pcm_kernel_playback_ioctl(struct snd_pcm_substream *substream, unsigned int cmd, void *arg);

int snd_pcm_kernel_capture_ioctl(struct snd_pcm_substream *substream, unsigned int cmd, void *arg);

int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream, unsigned int cmd, void *arg);

int snd_pcm_open_substream(struct snd_pcm *pcm, int stream, struct snd_pcm_substream **rsubstream);

int snd_pcm_open_substream(struct snd_pcm *pcm, int stream, struct file *file,

			   struct snd_pcm_substream **rsubstream);

void snd_pcm_release_substream(struct snd_pcm_substream *substream);

int snd_pcm_attach_substream(struct snd_pcm *pcm, int stream, struct file *file,

			     struct snd_pcm_substream **rsubstream);

void snd_pcm_detach_substream(struct snd_pcm_substream *substream);

void snd_pcm_vma_notify_data(void *client, void *data);

int snd_pcm_mmap_data(struct snd_pcm_substream *substream, struct file *file, struct vm_area_struct *area);

include/sound/pcm_oss.h

+1 −2
Original line number Diff line number Diff line
@@ -69,8 +69,7 @@ struct snd_pcm_oss_file { 


struct snd_pcm_oss_substream {

	unsigned oss: 1;			/* oss mode */

	struct snd_pcm_oss_setup *setup;		/* active setup */

	struct snd_pcm_oss_file *file;

	struct snd_pcm_oss_setup setup;		/* active setup */

};



struct snd_pcm_oss_stream {

sound/core/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -92,8 +92,9 @@ config SND_SEQUENCER_OSS 


	  Many programs still use the OSS API, so say Y.



	  To compile this driver as a module, choose M here: the module

	  will be called snd-seq-oss.

	  If you choose M in "Sequencer support" (SND_SEQUENCER),

	  this will be compiled as a module. The module will be called

	  snd-seq-oss.



config SND_RTCTIMER

	tristate "RTC Timer support"

CRA Git | Maintained and supported by SUSTech CRA and CCSE