Commit 12dabd66 authored by Jaroslav Kysela's avatar Jaroslav Kysela

ALSA CVS update - Takashi Iwai <tiwai@suse.de>

ICE1712 driver,ICE1724 driver
- added the support of independent surround PCM for ice1724.
parent b9256b5e
...@@ -2375,6 +2375,7 @@ static int __devinit snd_ice1712_create(snd_card_t * card, ...@@ -2375,6 +2375,7 @@ static int __devinit snd_ice1712_create(snd_card_t * card,
ice->omni = omni ? 1 : 0; ice->omni = omni ? 1 : 0;
spin_lock_init(&ice->reg_lock); spin_lock_init(&ice->reg_lock);
init_MUTEX(&ice->gpio_mutex); init_MUTEX(&ice->gpio_mutex);
init_MUTEX(&ice->open_mutex);
ice->gpio.set_mask = snd_ice1712_set_gpio_mask; ice->gpio.set_mask = snd_ice1712_set_gpio_mask;
ice->gpio.set_dir = snd_ice1712_set_gpio_dir; ice->gpio.set_dir = snd_ice1712_set_gpio_dir;
ice->gpio.set_data = snd_ice1712_set_gpio_data; ice->gpio.set_data = snd_ice1712_set_gpio_data;
......
...@@ -335,6 +335,9 @@ struct _snd_ice1712 { ...@@ -335,6 +335,9 @@ struct _snd_ice1712 {
unsigned short hoontech_boxconfig[4]; unsigned short hoontech_boxconfig[4];
unsigned int cur_rate; /* current rate */ unsigned int cur_rate; /* current rate */
struct semaphore open_mutex;
snd_pcm_substream_t *pcm_reserved[4];
unsigned int akm_codecs; unsigned int akm_codecs;
akm4xxx_t *akm; akm4xxx_t *akm;
struct snd_ice1712_spdif spdif; struct snd_ice1712_spdif spdif;
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment