Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b70888a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents cd85c8b4 0a97af41

Documentation/sound/alsa/ALSA-Configuration.txt

+20 −24
Original line number Diff line number Diff line
@@ -636,11 +636,16 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  3stack-digout	3-jack in back, a HP out and a SPDIF out

	  5stack	5-jack in back, 2-jack in front

	  5stack-digout	5-jack in back, 2-jack in front, a SPDIF out

	  6stack	6-jack in back, 2-jack in front

	  6stack-digout	6-jack with a SPDIF out

	  w810		3-jack

	  z71v		3-jack (HP shared SPDIF)

	  asus		3-jack

	  uniwill	3-jack

	  F1734		2-jack

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

			adjusted.  Appearing only when compiled with

			$CONFIG_SND_DEBUG=y



	CMI9880

	  minimal	3-jack in back
@@ -1054,6 +1059,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    The power-management is supported.



  Module snd-pxa2xx-ac97 (on arm only)

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



    Module for AC97 driver for the Intel PXA2xx chip



    For ARM architecture only.



  Module snd-rme32

  ----------------
@@ -1173,6 +1185,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    Module supports up to 8 cards.



  Module snd-sun-dbri (on sparc only)

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



    Module for DBRI sound chips found on Sparcs.



    Module supports up to 8 cards.



  Module snd-wavefront

  --------------------
@@ -1371,7 +1390,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
  Module snd-vxpocket

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



    Module for Digigram VX-Pocket VX2 PCMCIA card.

    Module for Digigram VX-Pocket VX2 and 440 PCMCIA cards.



    ibl      - Capture IBL size. (default = 0, minimum size)
@@ -1391,29 +1410,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    Note: the driver is build only when CONFIG_ISA is set.

    

  Module snd-vxp440

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



    Module for Digigram VX-Pocket 440 PCMCIA card.



    ibl      - Capture IBL size. (default = 0, minimum size)



    Module supports up to 8 cards.  The module is compiled only when

    PCMCIA is supported on kernel.



    To activate the driver via the card manager, you'll need to set

    up /etc/pcmcia/vxp440.conf.  See the sound/pcmcia/vx/vxp440.c.



    When the driver is compiled as a module and the hotplug firmware

    is supported, the firmware data is loaded via hotplug automatically.

    Install the necessary firmware files in alsa-firmware package.

    When no hotplug fw loader is available, you need to load the

    firmware via vxloader utility in alsa-tools package.



    About capture IBL, see the description of snd-vx222 module.



    Note: the driver is build only when CONFIG_ISA is set.

    

  Module snd-ymfpci

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

include/sound/core.h

+20 −17
Original line number Diff line number Diff line
@@ -126,25 +126,26 @@ struct snd_monitor_file { 
	struct snd_monitor_file *next;

};



struct snd_shutdown_f_ops;	/* define it later */

struct snd_shutdown_f_ops;	/* define it later in init.c */



/* main structure for soundcard */



struct _snd_card {

	int number;			/* number of soundcard (index to snd_cards) */

	int number;			/* number of soundcard (index to

								snd_cards) */



	char id[16];			/* id string of this card */

	char driver[16];		/* driver name */

	char shortname[32];		/* short name of this soundcard */

	char longname[80];		/* name of this soundcard */

	char mixername[80];		/* mixer name */

	char components[80];		/* card components delimited with space */



	char components[80];		/* card components delimited with

								space */

	struct module *module;		/* top-level module */



	void *private_data;		/* private data for soundcard */

	void (*private_free) (snd_card_t *card); /* callback for freeing of private data */



	void (*private_free) (snd_card_t *card); /* callback for freeing of

								private data */

	struct list_head devices;	/* devices */



	unsigned int last_numid;	/* last used numeric ID */
@@ -160,7 +161,8 @@ struct _snd_card { 
	struct proc_dir_entry *proc_root_link;	/* number link to real id */



	struct snd_monitor_file *files; /* all files associated to this card */

	struct snd_shutdown_f_ops *s_f_ops; /* file operations in the shutdown state */

	struct snd_shutdown_f_ops *s_f_ops; /* file operations in the shutdown

								state */

	spinlock_t files_lock;		/* lock the files for this card */

	int shutdown;			/* this card is going down */

	wait_queue_head_t shutdown_sleep;
@@ -196,8 +198,6 @@ static inline void snd_power_unlock(snd_card_t *card) 
	up(&card->power_lock);

}



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



static inline unsigned int snd_power_get_state(snd_card_t *card)

{

	return card->power_state;
@@ -208,6 +208,10 @@ static inline void snd_power_change_state(snd_card_t *card, unsigned int state) 
	card->power_state = state;

	wake_up(&card->power_sleep);

}



/* init.c */

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



int snd_card_set_pm_callback(snd_card_t *card,

			     int (*suspend)(snd_card_t *, pm_message_t),

			     int (*resume)(snd_card_t *),
@@ -238,15 +242,14 @@ static inline int snd_power_wait(snd_card_t *card, unsigned int state, struct fi 


#endif /* CONFIG_PM */



/* device.c */



struct _snd_minor {

	struct list_head list;		/* list of all minors per card */

	int number;			/* minor number */

	int device;			/* device number */

	const char *comment;		/* for /proc/asound/devices */

	struct file_operations *f_ops;	/* file operations */

	char name[0];			/* device name (keep at the end of structure) */

	char name[0];			/* device name (keep at the end of

								structure) */

};



typedef struct _snd_minor snd_minor_t;
@@ -287,12 +290,12 @@ void snd_memory_init(void); 
void snd_memory_done(void);

int snd_memory_info_init(void);

int snd_memory_info_done(void);

void *snd_hidden_kmalloc(size_t size, int flags);

void *snd_hidden_kcalloc(size_t n, size_t size, int flags);

void *snd_hidden_kmalloc(size_t size, unsigned int __nocast flags);

void *snd_hidden_kcalloc(size_t n, size_t size, unsigned int __nocast flags);

void snd_hidden_kfree(const void *obj);

void *snd_hidden_vmalloc(unsigned long size);

void snd_hidden_vfree(void *obj);

char *snd_hidden_kstrdup(const char *s, int flags);

char *snd_hidden_kstrdup(const char *s, unsigned int __nocast flags);

#define kmalloc(size, flags) snd_hidden_kmalloc(size, flags)

#define kcalloc(n, size, flags) snd_hidden_kcalloc(n, size, flags)

#define kfree(obj) snd_hidden_kfree(obj)
@@ -411,7 +414,7 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...) 
	printk(fmt ,##args)

#endif

/**

 * snd_assert - run-time assersion macro

 * snd_assert - run-time assertion macro

 * @expr: expression

 * @args...: the action

 *
@@ -427,7 +430,7 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...) 
	}\

} while (0)

/**

 * snd_runtime_check - run-time assersion macro

 * snd_runtime_check - run-time assertion macro

 * @expr: expression

 * @args...: the action

 *

include/sound/driver.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
#ifdef CONFIG_SND_DEBUG_MEMORY

#include <linux/slab.h>

#include <linux/vmalloc.h>

void *snd_wrapper_kmalloc(size_t, int);

void *snd_wrapper_kmalloc(size_t, unsigned int __nocast);

#undef kmalloc

void snd_wrapper_kfree(const void *);

#undef kfree

include/sound/emu10k1.h

+1 −0
Original line number Diff line number Diff line
@@ -1167,6 +1167,7 @@ int snd_emu10k1_create(snd_card_t * card, 
		       unsigned short extout_mask,

		       long max_cache_bytes,

		       int enable_ir,

		       uint subsystem,

		       emu10k1_t ** remu);



int snd_emu10k1_pcm(emu10k1_t * emu, int device, snd_pcm_t ** rpcm);

include/sound/version.h

+2 −2
Original line number Diff line number Diff line 
/* include/version.h.  Generated by configure.  */

#define CONFIG_SND_VERSION "1.0.9"

#define CONFIG_SND_DATE " (Sun May 29 07:31:02 2005 UTC)"
 
#define CONFIG_SND_VERSION "1.0.9b"

#define CONFIG_SND_DATE " (Thu Jul 28 12:20:13 2005 UTC)"