- Alsa-devel - mailman.alsa-project.org

[PATCH] ALSA: wss_lib: rework snd_ad1848_probe()
by Rene Herman 06 Aug '08

06 Aug '08

Make snd_ad1848_probe() easier to follow. With an exception for only trying once as soon as the codec is out of init (which should be all that's needed) the detection logic should be unchanged. Signed-off-by: Rene Herman <rene.herman(a)gmail.com> --- sound/isa/wss/wss_lib.c | 131 ++++++++++++++++++++++++----------------------- 1 files changed, 67 insertions(+), 64 deletions(-) diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c index 955db45..802474b 100644 --- a/sound/isa/wss/wss_lib.c +++ b/sound/isa/wss/wss_lib.c @@ -1147,79 +1147,82 @@ static snd_pcm_uframes_t snd_wss_capture_pointer(struct snd_pcm_substream *subst static int snd_ad1848_probe(struct snd_wss *chip) { + unsigned long timeout = jiffies + msecs_to_jiffies(1000); unsigned long flags; - int i, id, rev, ad1847; + unsigned char r; + unsigned short hardware = 0; + int err = 0; + int i; - id = 0; - ad1847 = 0; - for (i = 0; i < 1000; i++) { - mb(); - if (inb(chip->port + CS4231P(REGSEL)) & CS4231_INIT) - msleep(1); - else { - spin_lock_irqsave(&chip->reg_lock, flags); - snd_wss_out(chip, CS4231_MISC_INFO, 0x00); - snd_wss_out(chip, CS4231_LEFT_INPUT, 0xaa); - snd_wss_out(chip, CS4231_RIGHT_INPUT, 0x45); - rev = snd_wss_in(chip, CS4231_RIGHT_INPUT); - if (rev == 0x65) { - spin_unlock_irqrestore(&chip->reg_lock, flags); - id = 1; - ad1847 = 1; - break; - } - if (rev == 0x45) { - rev = snd_wss_in(chip, CS4231_LEFT_INPUT); - if (rev == 0xaa || rev == 0x8a) { - spin_unlock_irqrestore(&chip->reg_lock, flags); - id = 1; - break; - } - } - spin_unlock_irqrestore(&chip->reg_lock, flags); - } + while (wss_inb(chip, CS4231P(REGSEL)) & CS4231_INIT) { + if (time_after(jiffies, timeout)) + return -ENODEV; + cond_resched(); } - if (id != 1) - return -ENODEV; /* no valid device found */ - id = 0; - if (chip->hardware == WSS_HW_DETECT) - id = ad1847 ? WSS_HW_AD1847 : WSS_HW_AD1848; - spin_lock_irqsave(&chip->reg_lock, flags); - inb(chip->port + CS4231P(STATUS)); /* clear any pendings IRQ */ - outb(0, chip->port + CS4231P(STATUS)); - mb(); - if (id == WSS_HW_AD1848) { - /* check if there are more than 16 registers */ - rev = snd_wss_in(chip, CS4231_MISC_INFO); - snd_wss_out(chip, CS4231_MISC_INFO, 0x40); - for (i = 0; i < 16; ++i) { - if (snd_wss_in(chip, i) != snd_wss_in(chip, i + 16)) { - id = WSS_HW_CMI8330; - break; - } + + /* set CS423x MODE 1 */ + snd_wss_out(chip, CS4231_MISC_INFO, 0); + + snd_wss_out(chip, CS4231_RIGHT_INPUT, 0x45); /* 0x55 & ~0x10 */ + r = snd_wss_in(chip, CS4231_RIGHT_INPUT); + if (r != 0x45) { + /* RMGE always high on AD1847 */ + if ((r & ~CS4231_ENABLE_MIC_GAIN) != 0x45) { + err = -ENODEV; + goto out; + } + hardware = WSS_HW_AD1847; + } else { + snd_wss_out(chip, CS4231_LEFT_INPUT, 0xaa); + r = snd_wss_in(chip, CS4231_LEFT_INPUT); + /* L/RMGE always low on AT2320 */ + if ((r | CS4231_ENABLE_MIC_GAIN) != 0xaa) { + err = -ENODEV; + goto out; } - snd_wss_out(chip, CS4231_MISC_INFO, 0x00); - if (id != WSS_HW_CMI8330 && (rev & 0x80)) - id = WSS_HW_CS4248; - if (id == WSS_HW_CMI8330 && (rev & 0x0f) != 0x0a) - id = 0; } - if (id == WSS_HW_CMI8330) { - /* verify it is not CS4231 by changing the version register */ - /* on CMI8330 it is volume control register and can be set 0 */ - snd_wss_out(chip, CS4231_MISC_INFO, CS4231_MODE2); - snd_wss_dout(chip, CS4231_VERSION, 0x00); - rev = snd_wss_in(chip, CS4231_VERSION) & 0xe7; - if (rev) - id = 0; - snd_wss_out(chip, CS4231_MISC_INFO, 0); + + /* clear pending IRQ */ + wss_inb(chip, CS4231P(STATUS)); + wss_outb(chip, CS4231P(STATUS), 0); + mb(); + + if ((chip->hardware & WSS_HW_TYPE_MASK) != WSS_HW_DETECT) + goto out; + + if (hardware) { + chip->hardware = hardware; + goto out; } - if (id) - chip->hardware = id; + r = snd_wss_in(chip, CS4231_MISC_INFO); + + /* set CS423x MODE 2 */ + snd_wss_out(chip, CS4231_MISC_INFO, CS4231_MODE2); + for (i = 0; i < 16; i++) { + if (snd_wss_in(chip, i) != snd_wss_in(chip, 16 + i)) { + /* we have more than 16 registers: check ID */ + if ((r & 0xf) != 0xa) + goto out; + /* + * on CMI8330, CS4231_VERSION is volume control and + * can be set to 0 + */ + snd_wss_dout(chip, CS4231_VERSION, 0); + r = snd_wss_in(chip, CS4231_VERSION) & 0xe7; + if (!r) + chip->hardware = WSS_HW_CMI8330; + goto out; + } + } + if (r & 0x80) + chip->hardware = WSS_HW_CS4248; + else + chip->hardware = WSS_HW_AD1848; +out: spin_unlock_irqrestore(&chip->reg_lock, flags); - return 0; /* all things are ok.. */ + return err; } static int snd_wss_probe(struct snd_wss *chip) -- 1.5.5 --------------060807000500060608070809--

1 0

[PATCH] ALSA: wss_lib: rework snd_ad1848_probe()
by Rene Herman 06 Aug '08

06 Aug '08

Make snd_ad1848_probe() easier to follow. With an exception for only trying once as soon as the codec is out of init (which should be all that's needed) the detection logic should be unchanged. Signed-off-by: Rene Herman <rene.herman(a)gmail.com> --- sound/isa/wss/wss_lib.c | 133 ++++++++++++++++++++++++---------------------- 1 files changed, 69 insertions(+), 64 deletions(-) diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c index 955db45..cbe9565 100644 --- a/sound/isa/wss/wss_lib.c +++ b/sound/isa/wss/wss_lib.c @@ -1147,79 +1147,84 @@ static snd_pcm_uframes_t snd_wss_capture_pointer(struct snd_pcm_substream *subst static int snd_ad1848_probe(struct snd_wss *chip) { + unsigned long timeout = jiffies + msecs_to_jiffies(1000); unsigned long flags; - int i, id, rev, ad1847; + unsigned char r; + unsigned short hardware = 0; + int err = 0; + int i; - id = 0; - ad1847 = 0; - for (i = 0; i < 1000; i++) { - mb(); - if (inb(chip->port + CS4231P(REGSEL)) & CS4231_INIT) - msleep(1); - else { - spin_lock_irqsave(&chip->reg_lock, flags); - snd_wss_out(chip, CS4231_MISC_INFO, 0x00); - snd_wss_out(chip, CS4231_LEFT_INPUT, 0xaa); - snd_wss_out(chip, CS4231_RIGHT_INPUT, 0x45); - rev = snd_wss_in(chip, CS4231_RIGHT_INPUT); - if (rev == 0x65) { - spin_unlock_irqrestore(&chip->reg_lock, flags); - id = 1; - ad1847 = 1; - break; - } - if (rev == 0x45) { - rev = snd_wss_in(chip, CS4231_LEFT_INPUT); - if (rev == 0xaa || rev == 0x8a) { - spin_unlock_irqrestore(&chip->reg_lock, flags); - id = 1; - break; - } - } - spin_unlock_irqrestore(&chip->reg_lock, flags); - } + while (wss_inb(chip, CS4231P(REGSEL)) & CS4231_INIT) { + if (time_after(jiffies, timeout)) + return -ENODEV; + cond_resched(); } - if (id != 1) - return -ENODEV; /* no valid device found */ - id = 0; - if (chip->hardware == WSS_HW_DETECT) - id = ad1847 ? WSS_HW_AD1847 : WSS_HW_AD1848; - spin_lock_irqsave(&chip->reg_lock, flags); - inb(chip->port + CS4231P(STATUS)); /* clear any pendings IRQ */ - outb(0, chip->port + CS4231P(STATUS)); - mb(); - if (id == WSS_HW_AD1848) { - /* check if there are more than 16 registers */ - rev = snd_wss_in(chip, CS4231_MISC_INFO); - snd_wss_out(chip, CS4231_MISC_INFO, 0x40); - for (i = 0; i < 16; ++i) { - if (snd_wss_in(chip, i) != snd_wss_in(chip, i + 16)) { - id = WSS_HW_CMI8330; - break; - } + + /* set CS423x MODE 1 */ + snd_wss_out(chip, CS4231_MISC_INFO, 0); + + snd_wss_out(chip, CS4231_RIGHT_INPUT, 0x45); /* 0x55 & ~0x10 */ + r = snd_wss_in(chip, CS4231_RIGHT_INPUT); + if (r != 0x45) { + /* RMGE always high on AD1847 */ + if ((r & ~CS4231_ENABLE_MIC_GAIN) != 0x45) { + err = -ENODEV; + goto out; + } + hardware = WSS_HW_AD1847; + } else { + snd_wss_out(chip, CS4231_LEFT_INPUT, 0xaa); + r = snd_wss_in(chip, CS4231_LEFT_INPUT); + /* L/RMGE always low on AT2320 */ + if ((r | CS4231_ENABLE_MIC_GAIN) != 0xaa) { + err = -ENODEV; + goto out; } - snd_wss_out(chip, CS4231_MISC_INFO, 0x00); - if (id != WSS_HW_CMI8330 && (rev & 0x80)) - id = WSS_HW_CS4248; - if (id == WSS_HW_CMI8330 && (rev & 0x0f) != 0x0a) - id = 0; } - if (id == WSS_HW_CMI8330) { - /* verify it is not CS4231 by changing the version register */ - /* on CMI8330 it is volume control register and can be set 0 */ - snd_wss_out(chip, CS4231_MISC_INFO, CS4231_MODE2); - snd_wss_dout(chip, CS4231_VERSION, 0x00); - rev = snd_wss_in(chip, CS4231_VERSION) & 0xe7; - if (rev) - id = 0; - snd_wss_out(chip, CS4231_MISC_INFO, 0); + + /* clear pending IRQ */ + wss_inb(chip, CS4231P(STATUS)); + wss_outb(chip, CS4231P(STATUS), 0); + mb(); + + if ((chip->hardware & WSS_HW_TYPE_MASK) != WSS_HW_DETECT) + goto out; + + if (hardware) { + chip->hardware = hardware; + goto out; } - if (id) - chip->hardware = id; + r = snd_wss_in(chip, CS4231_MISC_INFO); + + /* set CS423x MODE 2 */ + snd_wss_out(chip, CS4231_MISC_INFO, CS4231_MODE2); + for (i = 0; i < 16; i++) { + if (snd_wss_in(chip, i) != snd_wss_in(chip, 16 + i)) { + /* we have more than 16 registers: check ID */ + if ((r & 0xf) != 0xa) + goto out_mode; + /* + * on CMI8330, CS4231_VERSION is volume control and + * can be set to 0 + */ + snd_wss_dout(chip, CS4231_VERSION, 0); + r = snd_wss_in(chip, CS4231_VERSION) & 0xe7; + if (!r) + chip->hardware = WSS_HW_CMI8330; + goto out_mode; + } + } + if (r & 0x80) + chip->hardware = WSS_HW_CS4248; + else + chip->hardware = WSS_HW_AD1848; +out_mode: + snd_wss_out(chip, CS4231_MISC_INFO, 0); +out: spin_unlock_irqrestore(&chip->reg_lock, flags); - return 0; /* all things are ok.. */ + return err; } static int snd_wss_probe(struct snd_wss *chip) -- 1.5.5 --------------080803020607030707060103--

1 0

[alsa-devel] dmix in a forked process
by Bankim Bhavsar 05 Aug '08

05 Aug '08

Don't know why the earlier message got truncated so here it is again... Reading the source alsa-lib I see that dmix runs in a forked process *without* exec. file: src/pcm/pcm_direct.c function: snd_pcm_direct_server_create ret = fork(); if (ret < 0) { close(dmix->server_fd); return ret; } else if (ret == 0) { ret = fork(); if (ret == 0) server_job(dmix); _exit(EXIT_SUCCESS); } else { waitpid(ret, NULL, 0); } _From what I understand, this is a concern since if our app is the first to start dmix then a copy of the process (app) will remain till the system is shutdown ? Also I see that from alsa-lib 1.0.12 a check is performed before starting dmix. file: src/pcm/pcm_dmix.c function: snd_pcm_dmix_open if (dmix->shmptr->use_server) { dmix->server_free = dmix_server_free; ret = snd_pcm_direct_server_create(dmix); if (ret < 0) { SNDERR("unable to create server"); goto _err; } } When I checked how dmix->shmptr->use_server is set file: src/pcm/pcm_dmix.c function: snd_pcm_direct_initialize_slave int ver = 0; ioctl(spcm->poll_fd, SNDRV_PCM_IOCTL_PVERSION, &ver); if (ver < SNDRV_PROTOCOL_VERSION(2, 0, 8)) dmix->shmptr->use_server = 1; So if sndrv version is older than 2.0.8, use_server is set! So even using alsa-lib greater than 1.0.12 doesn't guarantee that the forked process (without exec) code path will be avoided. I'm currently porting the sound code of our app from OSS to ALSA but this problem is preventing me from doing so. Is there any way to get around this problem? Help here will be greatly appreciated. If this is an incorrect list then kindly fwd it to the appropriate one. Thanks, Bankim. PS: I've tried using the ioctl mentioned above after copying the necessary macros from kernel headers but ioctl returns error "Inappropriate ioctl for this device" on my Ubuntu 7.04 host.

3 4

[alsa-devel] [PATCH] ac97 mono-out w/internal speaker
by george pee 05 Aug '08

05 Aug '08

I have a wireless tablet (webdt310) http://dtresearch.com/product/wt310/index.htm It has cs5536 audio and a realtek alc203 codec. The headphone jack works perfectly, but the internal speaker was not. After a bit a twiddling and reading the ALC203 data sheet, I finally figured out that the function of Pin 37 had to be changed to MONO-OUT to get sound out of the internal speaker. I'm not sure that this is the best approach (maybe there could be some pin sensing?) but I added this as an ac97 quirk. Here's the patch. diff -rub linux-2.6.26.orig/sound/pci/ac97/ac97_codec.c linux-2.6.26.new/sound/pci/ac97/ac97_codec.c --- linux-2.6.26.orig/sound/pci/ac97/ac97_codec.c 2008-07-29 15:30:57.000000000 -0500 +++ linux-2.6.26.new/sound/pci/ac97/ac97_codec.c 2008-08-04 10:58:12.000000000 -0500 @@ -2709,6 +2710,12 @@ return snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&snd_ac97_alc_jack_detect, ac97)); } +/* ac97 tune: turn on mono-out */ +static int tune_mono_out(struct snd_ac97 *ac97) +{ + snd_ac97_update_bits(ac97, 0x7a, 0x400, 0x400); + return 1; +} + /* ac97 tune: inversed EAPD bit */ static int tune_inv_eapd(struct snd_ac97 *ac97) { @@ -2801,6 +2808,7 @@ { "inv_eapd", tune_inv_eapd }, { "mute_led", tune_mute_led }, { "hp_mute_led", tune_hp_mute_led }, + { "mono_out", tune_mono_out }, };

2 3

Re: [alsa-devel] [PATCH 07/11] wss_lib: use CS4231P instead of AD1848P (kill the AD1848P)
by krzysztof.h1＠poczta.fm 05 Aug '08

05 Aug '08

> On 31-07-08 21:07, Krzysztof Helt wrote: > > > From: Krzysztof Helt <krzysztof.h1(a)wp.pl> > > > > Use CS4231P instead of AD1848P (kill the AD1848P). > > > > Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> > > --- > > Changes since previous version: > > > > 1. No reformatting of the snd_ad1848_debug() > > as the file is going to be killed. > > 1. Nicer formatting of WSS_SINGLE and WSS_DOUBLE > > macros. > > I believe 1 no. 2 is a cut & paste error? There are no such changes in > this patch. > Right. Regards, Krzysztof ---------------------------------------------------------------------- Wymien zeszyty na notebooka! Sprawdz >>> http://link.interia.pl/f1eab

1 0

Re: [alsa-devel] ultra small alsa library
by Marco Schuster 05 Aug '08

05 Aug '08

The problem I have is: As soon as I try to play a mp3 via mpg123, in dmesg comes the following error: Division by zero in kernel. [<c0026e2c>] (dump_stack+0x0/0x14) from [<c0026e58>] (__div0+0x18/0x20) [<c0026e40>] (__div0+0x0/0x20) from [<c011c65c>] (Ldiv0+0x8/0x10) [<bf0267ec>] (iso_stream_find+0x0/0x340 [ehci_hcd]) from [<bf028140>] (ehci_urb_enqueue+0x848/0xdf4 [ehci_hcd]) [<bf0278f8>] (ehci_urb_enqueue+0x0/0xdf4 [ehci_hcd]) from [<bf005228>] (usb_hcd_submit_urb+0x660/0x77c [usbcore]) [<bf004bc8>] (usb_hcd_submit_urb+0x0/0x77c [usbcore]) from [<bf0057fc>] (usb_submit_urb+0x228/0x264 [usbcore]) [<bf0055d4>] (usb_submit_urb+0x0/0x264 [usbcore]) from [<bf1c2820>] (start_urbs+0x1cc/0x308 [snd_usb_audio]) r6:00000000 r5:c0c2dc10 r4:00000010 [<bf1c2654>] (start_urbs+0x0/0x308 [snd_usb_audio]) from [<bf1c4d78>] (snd_usb_pcm_prepare+0xa4/0xb8 [snd_usb_audio]) r7:00000000 r6:00000000 r5:c0c2b800 r4:c0c2dc10 [<bf1c4cd4>] (snd_usb_pcm_prepare+0x0/0xb8 [snd_usb_audio]) from [<bf19bdc4>] (snd_pcm_do_prepare+0x1c/0x3c [snd_pcm]) r6:00000802 r5:c13d02c0 r4:c13d02c0 [<bf19bda8>] (snd_pcm_do_prepare+0x0/0x3c [snd_pcm]) from [<bf19b96c>] (snd_pcm_action_single+0x40/0x7c [snd_pcm]) r4:bf1acd74 [<bf19b92c>] (snd_pcm_action_single+0x0/0x7c [snd_pcm]) from [<bf19c774>] (snd_pcm_action_nonatomic+0x58/0x70 [snd_pcm]) r7:00044930 r6:bf1acd74 r5:00000802 r4:c13d02c0 [<bf19c71c>] (snd_pcm_action_nonatomic+0x0/0x70 [snd_pcm]) from [<bf19eba8>] (snd_pcm_common_ioctl1+0x664/0xf7c [snd_pcm]) r6:c13d02c0 r5:00044930 r4:00044930 [<bf19e544>] (snd_pcm_common_ioctl1+0x0/0xf7c [snd_pcm]) from [<bf19fe18>] (snd_pcm_playback_ioctl1+0x48c/0x4b0 [snd_pcm]) [<bf19f98c>] (snd_pcm_playback_ioctl1+0x0/0x4b0 [snd_pcm]) from [<bf19ff20>] (snd_pcm_playback_ioctl+0x34/0x40 [snd_pcm]) [<bf19feec>] (snd_pcm_playback_ioctl+0x0/0x40 [snd_pcm]) from [<c0097e70>] (do_ioctl+0x34/0x78) [<c0097e3c>] (do_ioctl+0x0/0x78) from [<c0098114>] (vfs_ioctl+0x260/0x290) r5:00044930 r4:c0fbcbc0 [<c0097eb4>] (vfs_ioctl+0x0/0x290) from [<c009819c>] (sys_ioctl+0x58/0x78) r7:00004140 r6:c0fbcbc0 r5:00044930 r4:00000000 [<c0098144>] (sys_ioctl+0x0/0x78) from [<c0022de0>] (ret_fast_syscall+0x0/0x2c) r8:c0022f84 r7:00000036 r6:beebb3a0 r5:beebb708 r4:00043598 Can anyone point me what goes wrong here? Kernel is debian 2.6.24-1-ixp4xx (armv5tel). Thanks, Marco

2 1

Re: [alsa-devel] [PATCH] ALSA: wss_lib: fix AZT2320 probe.
by krzysztof.h1＠poczta.fm 05 Aug '08

05 Aug '08

> Hi Takashi > > The attached is needed and sufficient to get AZT2320 back in line. > Trouble is with non-settable MIC gain bits on AZT2320 which fools > snd_ad1848_probe() and makes snd-azt2320 fail to load after the wss_lib > merge. > > Krzysztof should ACK/NAK this -- he was busy there with CS4248 and might > have other plans for it. > > Krzysztof, do you? I'm rather itching to rewrite that function > otherwise. It's horrible. > Acked-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> If you want to rewrite this function go for it. I'll try to solve cs4248 misdetection and forward you all details (or make a patch after your rewrite). Kind regards, Krzysztof ---------------------------------------------------------------------- Te newsy nakreca Cie na caly dzien! Sprawdz >>> http://link.interia.pl/f1e94

2 1

[alsa-devel] [PATCH] snd_usb_audio: fix SB Extigy IR Remote regression
by Phil Jordan 05 Aug '08

05 Aug '08

From: Phillip Michael Jordan <phil(a)philjordan.eu> The support for the SB Extigy's remote seems to be broken in all recent ALSA versions, including 1.0.17. The driver detects the event correctly, then submits a URB to query the RC code. On the Extigy, the URB is submitted with a length of 2 bytes. My hardware, however, only replies with 1 byte, containing the correct RC button code. The current implementation discards this as being too short. (line 1784 of usbmixer.c) This patch specifies a "minimum packet length" in the remote control configuration. I've left the values for the Audigy 2/Live! the same as the packet length, as I'm assuming the existing code works with them. (I don't have the hardware to confirm) This fixes the Extigy RC support, e.g. for use with Lirc. Signed-off-by: Phillip Michael Jordan <phil(a)philjordan.eu> --- An alternative, simpler fix would be to change the check on line 1784 to if (urb->status < 0 || urb->actual_length < rc->offset + rc->length) On the Extigy, this works out the same as the fix proposed in the patch (urb->actual_length < 1), but I have no idea how this would behave with the other types of hardware. Comments & suggestions welcome! phil --- a/sound/usb/usbmixer.c 2008-08-05 10:30:12.729535006 +0200 +++ b/sound/usb/usbmixer.c 2008-08-05 10:29:23.497533626 +0200 @@ -59,12 +59,13 @@ static const struct rc_config { u8 offset; u8 length; u8 packet_length; + u8 min_packet_length; /* minimum accepted length of the URB result */ u8 mute_mixer_id; u32 mute_code; } rc_configs[] = { - { USB_ID(0x041e, 0x3000), 0, 1, 2, 18, 0x0013 }, /* Extigy */ - { USB_ID(0x041e, 0x3020), 2, 1, 6, 18, 0x0013 }, /* Audigy 2 NX */ - { USB_ID(0x041e, 0x3040), 2, 2, 6, 2, 0x6e91 }, /* Live! 24-bit */ + { USB_ID(0x041e, 0x3000), 0, 1, 2, 1, 18, 0x0013 }, /* Extigy */ + { USB_ID(0x041e, 0x3020), 2, 1, 6, 6, 18, 0x0013 }, /* Audigy 2 NX */ + { USB_ID(0x041e, 0x3040), 2, 2, 6, 6, 2, 0x6e91 }, /* Live! 24-bit */ }; struct usb_mixer_interface { @@ -1781,7 +1782,7 @@ static void snd_usb_soundblaster_remote_ const struct rc_config *rc = mixer->rc_cfg; u32 code; - if (urb->status < 0 || urb->actual_length < rc->packet_length) + if (urb->status < 0 || urb->actual_length < rc->min_packet_length) return; code = mixer->rc_buffer[rc->offset];

2 1

[alsa-devel] [PATCH] ALSA: wss_lib: fix AZT2320 probe.
by Rene Herman 05 Aug '08

05 Aug '08

Hi Takashi The attached is needed and sufficient to get AZT2320 back in line. Trouble is with non-settable MIC gain bits on AZT2320 which fools snd_ad1848_probe() and makes snd-azt2320 fail to load after the wss_lib merge. Krzysztof should ACK/NAK this -- he was busy there with CS4248 and might have other plans for it. Krzysztof, do you? I'm rather itching to rewrite that function otherwise. It's horrible. Rene.

1 0

[PATCH] ALSA: wss_lib: fix AZT2320 probe.
by Rene Herman 05 Aug '08

05 Aug '08

After the transition from cs4321_lib to wss_lib, azt2320 probe visits snd_ad1848_probe during detection. It expects register 0 (LEFT_INPUT) to be able to retain the value 0xaa during detection but AZT2320 does not support MIC gain meaning it reads back as 0x8a instead. Signed-off-by: Rene Herman <rene.herman(a)gmail.com> --- sound/isa/wss/wss_lib.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c index f2df77b..955db45 100644 --- a/sound/isa/wss/wss_lib.c +++ b/sound/isa/wss/wss_lib.c @@ -1168,11 +1168,13 @@ static int snd_ad1848_probe(struct snd_wss *chip) ad1847 = 1; break; } - if (snd_wss_in(chip, CS4231_LEFT_INPUT) == 0xaa && - rev == 0x45) { - spin_unlock_irqrestore(&chip->reg_lock, flags); - id = 1; - break; + if (rev == 0x45) { + rev = snd_wss_in(chip, CS4231_LEFT_INPUT); + if (rev == 0xaa || rev == 0x8a) { + spin_unlock_irqrestore(&chip->reg_lock, flags); + id = 1; + break; + } } spin_unlock_irqrestore(&chip->reg_lock, flags); } -- 1.5.5 --------------010905020004010504060906--

1 0