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

[alsa-devel] [PATCH - SB-0500 1/1] preliminary support for Toshiba SB-0500
by Andrea Borgia 12 Jan '09

12 Jan '09

The Toshiba Multimedia Center SB-0500 is a rebranded version of the Creative Technology SB Live! 24-bit External: it shares the same chipset and only has minor cosmetic differences. Remote controller works with alsa_usb module, basic audio is there and mixer controls are mostly untested. Signed-off-by: Andrea Borgia <andrea(a)borgia.bo.it> --- diff --git a/usb/usbmixer.c b/usb/usbmixer.c index a492461..6490a74 100644 --- a/usb/usbmixer.c +++ b/usb/usbmixer.c @@ -66,6 +66,7 @@ static const struct rc_config { { 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 */ + { USB_ID(0x041e, 0x3048), 2, 2, 6, 6, 2, 0x6e91 }, /* Toshiba SB0500 */ }; struct usb_mixer_interface { @@ -1706,7 +1707,8 @@ static void snd_usb_mixer_memory_change(struct usb_mixer_interface *mixer, break; /* live24ext: 4 = line-in jack */ case 3: /* hp-out jack (may actuate Mute) */ - if (mixer->chip->usb_id == USB_ID(0x041e, 0x3040)) + if (mixer->chip->usb_id == USB_ID(0x041e, 0x3040) || + mixer->chip->usb_id == USB_ID(0x041e, 0x3048)) snd_usb_mixer_notify_id(mixer, mixer->rc_cfg->mute_mixer_id); break; default: @@ -1957,8 +1959,9 @@ static int snd_audigy2nx_controls_create(struct usb_mixer_interface *mixer) int i, err; for (i = 0; i < ARRAY_SIZE(snd_audigy2nx_controls); ++i) { - if (i > 1 && /* Live24ext has 2 LEDs only */ - mixer->chip->usb_id == USB_ID(0x041e, 0x3040)) + if (i > 1 && /* Live24ext has 2 LEDs only */ + (mixer->chip->usb_id == USB_ID(0x041e, 0x3040) || + mixer->chip->usb_id == USB_ID(0x041e, 0x3048))) break; err = snd_ctl_add(mixer->chip->card, snd_ctl_new1(&snd_audigy2nx_controls[i], mixer)); @@ -1995,7 +1998,8 @@ static void snd_audigy2nx_proc_read(struct snd_info_entry *entry, snd_iprintf(buffer, "%s jacks\n\n", mixer->chip->card->shortname); if (mixer->chip->usb_id == USB_ID(0x041e, 0x3020)) jacks = jacks_audigy2nx; - else if (mixer->chip->usb_id == USB_ID(0x041e, 0x3040)) + else if (mixer->chip->usb_id == USB_ID(0x041e, 0x3040) || + mixer->chip->usb_id == USB_ID(0x041e, 0x3048)) jacks = jacks_live24ext; else return; @@ -2045,7 +2049,8 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif, goto _error; if (mixer->chip->usb_id == USB_ID(0x041e, 0x3020) || - mixer->chip->usb_id == USB_ID(0x041e, 0x3040)) { + mixer->chip->usb_id == USB_ID(0x041e, 0x3040) || + mixer->chip->usb_id == USB_ID(0x041e, 0x3048)) { struct snd_info_entry *entry; if ((err = snd_audigy2nx_controls_create(mixer)) < 0) diff --git a/usb/usbmixer_maps.c b/usb/usbmixer_maps.c index d755be0..f41214f 100644 --- a/usb/usbmixer_maps.c +++ b/usb/usbmixer_maps.c @@ -285,6 +285,11 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = { .map = live24ext_map, }, { + .id = USB_ID(0x041e, 0x3048), + .map = audigy2nx_map, + .selector_map = audigy2nx_selectors, + }, + { /* Hercules DJ Console (Windows Edition) */ .id = USB_ID(0x06f8, 0xb000), .ignore_ctl_error = 1, -- 1.5.4.3 !DSPAM:49626d6b49731845111285!

2 8

[alsa-devel] 'node->type == SND_CONFIG_TYPE_COMPOUND' failed
by Michael Hirsch 12 Jan '09

12 Jan '09

Hello all, I'm trying to get alsa 1.0.16 working on a ARM PXA processor and I'm stuck with the following error message: aplay: conf.c: 3166: snd_config_iterator_first: Assertion `node->type == SND_CONFIG_TYPE_COMPOUND' failed. kernel version matches the user space library and utils version. searching the archives / google brings no result. We tried with an empty alsa.conf but then the message: ALSA lib pcm.c:2144:(snd_pcm_open_noupdate) Unknown PCM default aplay: main:564: audio open error: No such file or directory appears. However the card shows up /proc/asound/cards and alsamixer is able to access it. Any ideas? Best regards Michael

2 3

Re: [alsa-devel] [PATCH] wss-lib: move AD1845 frequency setting into wss-lib
by Krzysztof Helt 12 Jan '09

12 Jan '09

On Sun, 11 Jan 2009 08:28:13 -0500 "Theodore J. Allen" <tjallen(a)hws.edu> wrote: > The Soundscape Elite does work, but after a reboot > I noticed that there is an oddness in that there's > a little "pop" before playing sounds with aplay and > a series of short spike pops before the sound plays > with xmms, which uses the old oss interface. > I traced this and the "pop" sound is caused by two things: 1. Codec autocalibration every time a new sound is started (even when sound is muted it produces the "pop" on AD1848). 2. Muting sound on and off every autocalibration. The OSS code from the 2.4 kernel states that autocalibration produced that "pop" so it got disabled. This solves two problems at once as the muting on and off is not required then (and is not done in the code). I am not audiofile so I cannot comment how audible the lack of autocalibration is. Most codecs require it after they are powered up (and most of them except the oldest ones actually force it after powering up). One can autocalibrate the codec only once during a card/codec initialization. I can prepare a patch which disables the autocalibration. This is the only solution as I tested others like slow volume muting but all others still produce some noise. Regards, Krzysztof ----------------------------------------------------------------------- Promocja w Speak Up. Kwartal angielskiego za darmo. 3 miesiace nauki gratis. Sprawdz teraz! >> http://link.interia.pl/f2019

2 1

[alsa-devel] snd_usb_caiaq bug?
by Marco Santamaria 12 Jan '09

12 Jan '09

Hi, it's about one year that I'm using my Native Instruments Audio Kontrol 1 (USB2 audio/MIDI interface) only with audio applications and it has been working well so far. Now I'm trying to use it with Rosegarden (MIDI) and, as soon as I start Rosegarden, JACK crashes, the process jackd becomes "uninterruptible" and with the command dmesg I find the following new lines [ 1935.173876] BUG: unable to handle kernel NULL pointer dereference at virtual address 00000044 [ 1935.173885] printing eip: f8a5f6fd *pde = 00000000 [ 1935.173891] Oops: 0000 [#1] PREEMPT SMP [ 1935.173896] Modules linked in: isofs udf ipv6 af_packet i915 drm rfcomm l2cap bluetooth ppdev acpi_cpufreq cpufreq_ondemand cpufreq_conservative cpufreq_stats freq_table cpufreq_userspace cpufreq_powersave dock container sbs sbshc iptable_filter ip_tables x_tables sbp2 parport_pc lp parport snd_hda_intel snd_usb_caiaq snd_hwdep snd_pcm_oss snd_mixer_oss arc4 snd_seq_oss snd_pcm ecb blkcipher snd_seq_midi snd_page_alloc joydev snd_rawmidi snd_seq_midi_event snd_seq iwl3945 sdhci serio_raw mmc_core iwlwifi_mac80211 video output cfg80211 battery led_class ac snd_timer snd_seq_device wmi_acer button snd evdev dcdbas iTCO_wdt iTCO_vendor_support intel_agp shpchp pci_hotplug pcspkr soundcore agpgart psmouse ext3 jbd mbcache sg sr_mod cdrom sd_mod b44 ata_generic ssb mii ohci1394 ieee1394 ata_piix pata_acpi libata scsi_mod ehci_hcd uhci_hcd usbcore thermal processor fan fuse [ 1935.173964] [ 1935.173967] Pid: 1421, comm: IRQ-18 Not tainted (2.6.24-19-rt #1) [ 1935.173970] EIP: 0060:[<f8a5f6fd>] EFLAGS: 00010292 CPU: 1 [ 1935.173979] EIP is at snd_rawmidi_transmit_peek+0x1d/0x100 [snd_rawmidi] [ 1935.173982] EAX: 00000000 EBX: f7106264 ECX: 0000003d EDX: f7106407 [ 1935.173985] ESI: ffffffea EDI: 00000000 EBP: f7106407 ESP: df85be38 [ 1935.173988] DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068 preempt:00000001 [ 1935.173991] Process IRQ-18 (pid: 1421, ti=df85a000 task=f7d45320 task.ti=df85a000) [ 1935.173993] Stack: 0000003d 00000000 f7106264 00000000 00000000 df83fc00 f8b8cc09 00000000 [ 1935.174000] f7106264 f710630c 00000000 df83fc00 df83fc00 f710630c f888c888 00000008 [ 1935.174007] df83fd08 00000000 f710630c f8870770 f728a0c0 f728a0c0 ffffff8d f721e180 [ 1935.174014] Call Trace: [ 1935.174021] [<f8b8cc09>] snd_usb_caiaq_midi_send+0x29/0x80 [snd_usb_caiaq] [ 1935.174034] [<f888c888>] usb_hcd_giveback_urb+0x48/0xc0 [usbcore] [ 1935.174064] [<f8870770>] ehci_urb_done+0x70/0xb0 [ehci_hcd] [ 1935.174075] [<f887153f>] qh_completions+0x24f/0x430 [ehci_hcd] [ 1935.174087] [<f8870770>] ehci_urb_done+0x70/0xb0 [ehci_hcd] [ 1935.174096] [<f887293e>] ehci_work+0x51e/0x810 [ehci_hcd] [ 1935.174103] [<c010b1e3>] sched_clock+0x13/0x40 [ 1935.174116] [<c0129199>] dequeue_task_rt+0xb9/0x1c0 [ 1935.174129] [<f8875498>] ehci_irq+0x158/0x1c0 [ehci_hcd] [ 1935.174142] [<f888cb7b>] usb_hcd_irq+0x2b/0x60 [usbcore] [ 1935.174166] [<c016a9cc>] handle_IRQ_event+0x5c/0x100 [ 1935.174178] [<c016b00a>] thread_simple_irq+0x4a/0x90 [ 1935.174185] [<c016b959>] do_irqd+0x229/0x290 [ 1935.174194] [<c016b730>] do_irqd+0x0/0x290 [ 1935.174199] [<c0141fc2>] kthread+0x42/0x70 [ 1935.174203] [<c0141f80>] kthread+0x0/0x70 [ 1935.174209] [<c0105857>] kernel_thread_helper+0x7/0x10 [ 1935.174217] ======================= [ 1935.174219] Code: 24 10 83 c4 14 c3 bf ea ff ff ff eb e3 90 83 ec 18 89 74 24 0c be ea ff ff ff 89 6c 24 14 89 d5 89 5c 24 08 89 7c 24 10 89 0c 24 <8b> 58 44 8b 7b 04 85 ff 0f 84 8e 00 00 00 8d 43 20 31 f6 89 44 [ 1935.174256] EIP: [<f8a5f6fd>] snd_rawmidi_transmit_peek+0x1d/0x100 [snd_rawmidi] SS:ESP 0068:df85be38 [ 1935.174265] ---[ end trace 9090d02b798b5496 ]--- I already asked to the Rosegarden and JACK people, but they couldn't help me: it seems to be a driver related problem, as I can happily use Rosegarden if I run JACK with the internal Intel sound card. The program versions I'm using are: jackd 0.116.1, rosegarden 1.7.2. Here's some other outputs: $ uname -a Linux din6400 2.6.24-19-rt #1 SMP PREEMPT RT Thu Aug 21 02:08:03 UTC 2008 i686 GNU/Linux $ cat /proc/asound/version Advanced Linux Sound Architecture Driver Version 1.0.17. Compiled on Jan 3 2009 for kernel 2.6.24-19-rt (SMP). $ grep VERSION_STR /usr/include/alsa/version.h #define SND_LIB_VERSION_STR "1.0.17a" $ aplay -l **** Lista di PLAYBACK dispositivi hardware **** scheda 0: Intel [HDA Intel], dispositivo 0: STAC92xx Analog [STAC92xx Analog] Sottoperiferiche: 1/1 Sottoperiferica #0: subdevice #0 scheda 0: Intel [HDA Intel], dispositivo 1: STAC92xx Digital [STAC92xx Digital] Sottoperiferiche: 1/1 Sottoperiferica #0: subdevice #0 scheda 1: A1 [Audio Kontrol 1], dispositivo 0: Audio Kontrol 1 [Audio Kontrol 1] Sottoperiferiche: 1/2 Sottoperiferica #0: subdevice #0 Sottoperiferica #1: subdevice #1 $ cat /proc/interrupts CPU0 CPU1 0: 5438968 0 IO-APIC-edge timer 1: 5123 0 IO-APIC-edge i8042 8: 7 0 IO-APIC-edge rtc 9: 2 0 IO-APIC-fasteoi acpi 12: 570309 0 IO-APIC-edge i8042 14: 16584 0 IO-APIC-edge libata 15: 7712 0 IO-APIC-edge libata 16: 312032 0 IO-APIC-fasteoi i915@pci:0000:00:02.0 17: 2 0 IO-APIC-fasteoi ohci1394 18: 269358 0 IO-APIC-fasteoi uhci_hcd:usb1, ehci_hcd:usb5 19: 3999 0 IO-APIC-fasteoi uhci_hcd:usb2, HDA Intel 20: 0 0 IO-APIC-fasteoi uhci_hcd:usb3 21: 0 0 IO-APIC-fasteoi uhci_hcd:usb4 22: 7638 0 IO-APIC-fasteoi eth0 23: 0 0 IO-APIC-fasteoi sdhci:slot0 221: 31667 0 PCI-MSI-edge iwl3945 NMI: 0 0 Non-maskable interrupts LOC: 266694 2894868 Local timer interrupts RES: 1091345 1871342 Rescheduling interrupts CAL: 12287 11042 function call interrupts TLB: 1395 1581 TLB shootdowns TRM: 0 0 Thermal event interrupts SPU: 0 0 Spurious interrupts ERR: 0 MIS: 0 I do not include the jackd and rosegarden outputs becouse they are quite long, but, if you think they are useful to understand what is going on, I can send them too. Any ideas? Thank you Marco

4 20

[alsa-devel] [PATCH] Bug in aplay/arecord --list-pcms
by Peter Stokes 12 Jan '09

12 Jan '09

Hi, I have just discovered a minor logic inversion bug in aplay/arecord --list-pcms functionality. Basically, executing "aplay --list-pcms" lists all devices capable of capture and executing "arecord --list-pcms" lists all devices capable of playback. Please find below a patch to resolve this issue. Best regards Peter Stokes ------------------------------------------------------------------------------- Signed-off-by: Peter Stokes <linux(a)dadeos.co.uk> diff --git a/aplay/aplay.c b/aplay/aplay.c index 2e14d2a..837e46a 100644 --- a/aplay/aplay.c +++ b/aplay/aplay.c @@ -287,7 +287,7 @@ static void pcm_list(void) name = snd_device_name_get_hint(*n, "NAME"); descr = snd_device_name_get_hint(*n, "DESC"); io = snd_device_name_get_hint(*n, "IOID"); - if (io != NULL && strcmp(io, filter) == 0) + if (io != NULL && strcmp(io, filter) != 0) goto __end; printf("%s\n", name); if ((descr1 = descr) != NULL) {

2 1

[alsa-devel] [PATCH] ALSA: hda - add support for Intel DX58SO board
by Wu Fengguang 12 Jan '09

12 Jan '09

The Intel DX58SO board works fine with model ALC883_3ST_6ch_INTEL. Signed-off-by: Wu Fengguang <fengguang.wu(a)intel.com> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) --- mm.orig/sound/pci/hda/patch_realtek.c +++ mm/sound/pci/hda/patch_realtek.c @@ -8522,6 +8522,7 @@ static struct snd_pci_quirk alc883_cfg_t SND_PCI_QUIRK(0x1991, 0x5625, "Haier W66", ALC883_HAIER_W66), SND_PCI_QUIRK(0x8086, 0x0001, "DG33BUC", ALC883_3ST_6ch_INTEL), SND_PCI_QUIRK(0x8086, 0x0002, "DG33FBC", ALC883_3ST_6ch_INTEL), + SND_PCI_QUIRK(0x8086, 0x0022, "DX58SO", ALC883_3ST_6ch_INTEL), SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC883_3ST_6ch), {} };

2 1

Re: [alsa-devel] [PATCH] wss-lib: move AD1845 frequency setting into wss-lib
by Krzysztof Helt 11 Jan '09

11 Jan '09

On Sun, 11 Jan 2009 08:28:13 -0500 "Theodore J. Allen" <tjallen(a)hws.edu> wrote: > The Soundscape Elite does work, but after a reboot > I noticed that there is an oddness in that there's > a little "pop" before playing sounds with aplay and > a series of short spike pops before the sound plays > with xmms, which uses the old oss interface. > This is imperfection of early codecs. Sequences for changing sound format and rate are not yet perfect enough to avoid these "pops". Newer codecs mutes sound during such changes to avoid pops e.g. Soundscape VIVO with AD1845 does not produce "pops" before playing sounds. This is something of low priority and hard to master (guess) so do not expect solution soon. Regards, Krzysztof ---------------------------------------------------------------------- Szef przynudza? Zagraj sobie! Kliknij >> http://link.interia.pl/f200e

1 0

[alsa-devel] The Dark Art of Sound on Linux
by A. C. Censi 11 Jan '09

11 Jan '09

This is of interest: http://glyph.twistedmatrix.com/2009/01/dark-art-of-sound-on-linux.html -- A. C. Censi accensi [em] gmail [ponto] com accensi [em] montreal [ponto] com [ponto] br

1 0

[alsa-devel] [PATCH] wss-lib: move AD1845 frequency setting into wss-lib
by Krzysztof Helt 11 Jan '09

11 Jan '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> This is required to allow the sscape driver to autodetect installed codec. Also, do not create a timer if detected codec has no hardware timer (e.g. AD1848). Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> Cc: Rene Herman --- Ted, please test if the patch helps to make your Soundscape Elite card working. If not the patch is required anyway as your last feedback showed that frequency setting is incorrect in the sscape driver if the codec is not the AD1845. sound/isa/sscape.c | 113 +++------------------------------------------- sound/isa/wss/wss_lib.c | 40 +++++++++++++++++ 2 files changed, 48 insertions(+), 105 deletions(-) diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c index 48a16d8..bc44916 100644 --- a/sound/isa/sscape.c +++ b/sound/isa/sscape.c @@ -129,9 +129,6 @@ enum GA_REG { #define DMA_8BIT 0x80 -#define AD1845_FREQ_SEL_MSB 0x16 -#define AD1845_FREQ_SEL_LSB 0x17 - enum card_type { SSCAPE, SSCAPE_PNP, @@ -955,82 +952,6 @@ static int __devinit create_mpu401(struct snd_card *card, int devnum, unsigned l /* - * Override for the CS4231 playback format function. - * The AD1845 has much simpler format and rate selection. - */ -static void ad1845_playback_format(struct snd_wss *chip, - struct snd_pcm_hw_params *params, - unsigned char format) -{ - unsigned long flags; - unsigned rate = params_rate(params); - - /* - * The AD1845 can't handle sample frequencies - * outside of 4 kHZ to 50 kHZ - */ - if (rate > 50000) - rate = 50000; - else if (rate < 4000) - rate = 4000; - - spin_lock_irqsave(&chip->reg_lock, flags); - - /* - * Program the AD1845 correctly for the playback stream. - * Note that we do NOT need to toggle the MCE bit because - * the PLAYBACK_ENABLE bit of the Interface Configuration - * register is set. - * - * NOTE: We seem to need to write to the MSB before the LSB - * to get the correct sample frequency. - */ - snd_wss_out(chip, CS4231_PLAYBK_FORMAT, (format & 0xf0)); - snd_wss_out(chip, AD1845_FREQ_SEL_MSB, (unsigned char) (rate >> 8)); - snd_wss_out(chip, AD1845_FREQ_SEL_LSB, (unsigned char) rate); - - spin_unlock_irqrestore(&chip->reg_lock, flags); -} - -/* - * Override for the CS4231 capture format function. - * The AD1845 has much simpler format and rate selection. - */ -static void ad1845_capture_format(struct snd_wss *chip, - struct snd_pcm_hw_params *params, - unsigned char format) -{ - unsigned long flags; - unsigned rate = params_rate(params); - - /* - * The AD1845 can't handle sample frequencies - * outside of 4 kHZ to 50 kHZ - */ - if (rate > 50000) - rate = 50000; - else if (rate < 4000) - rate = 4000; - - spin_lock_irqsave(&chip->reg_lock, flags); - - /* - * Program the AD1845 correctly for the playback stream. - * Note that we do NOT need to toggle the MCE bit because - * the CAPTURE_ENABLE bit of the Interface Configuration - * register is set. - * - * NOTE: We seem to need to write to the MSB before the LSB - * to get the correct sample frequency. - */ - snd_wss_out(chip, CS4231_REC_FORMAT, (format & 0xf0)); - snd_wss_out(chip, AD1845_FREQ_SEL_MSB, (unsigned char) (rate >> 8)); - snd_wss_out(chip, AD1845_FREQ_SEL_LSB, (unsigned char) rate); - - spin_unlock_irqrestore(&chip->reg_lock, flags); -} - -/* * Create an AD1845 PCM subdevice on the SoundScape. The AD1845 * is very much like a CS4231, with a few extra bits. We will * try to support at least some of the extra bits by overriding @@ -1055,11 +976,6 @@ static int __devinit create_ad1845(struct snd_card *card, unsigned port, unsigned long flags; struct snd_pcm *pcm; -#define AD1845_FREQ_SEL_ENABLE 0x08 - -#define AD1845_PWR_DOWN_CTRL 0x1b -#define AD1845_CRYS_CLOCK_SEL 0x1d - /* * It turns out that the PLAYBACK_ENABLE bit is set * by the lowlevel driver ... @@ -1074,7 +990,6 @@ static int __devinit create_ad1845(struct snd_card *card, unsigned port, */ if (sscape->type != SSCAPE_VIVO) { - int val; /* * The input clock frequency on the SoundScape must * be 14.31818 MHz, because we must set this register @@ -1082,22 +997,10 @@ static int __devinit create_ad1845(struct snd_card *card, unsigned port, */ snd_wss_mce_up(chip); spin_lock_irqsave(&chip->reg_lock, flags); - snd_wss_out(chip, AD1845_CRYS_CLOCK_SEL, 0x20); + snd_wss_out(chip, AD1845_CLOCK, 0x20); spin_unlock_irqrestore(&chip->reg_lock, flags); snd_wss_mce_down(chip); - /* - * More custom configuration: - * a) select "mode 2" and provide a current drive of 8mA - * b) enable frequency selection (for capture/playback) - */ - spin_lock_irqsave(&chip->reg_lock, flags); - snd_wss_out(chip, CS4231_MISC_INFO, - CS4231_MODE2 | 0x10); - val = snd_wss_in(chip, AD1845_PWR_DOWN_CTRL); - snd_wss_out(chip, AD1845_PWR_DOWN_CTRL, - val | AD1845_FREQ_SEL_ENABLE); - spin_unlock_irqrestore(&chip->reg_lock, flags); } err = snd_wss_pcm(chip, 0, &pcm); @@ -1113,11 +1016,13 @@ static int __devinit create_ad1845(struct snd_card *card, unsigned port, "for AD1845 chip\n"); goto _error; } - err = snd_wss_timer(chip, 0, NULL); - if (err < 0) { - snd_printk(KERN_ERR "sscape: No timer device " - "for AD1845 chip\n"); - goto _error; + if (chip->hardware != WSS_HW_AD1848) { + err = snd_wss_timer(chip, 0, NULL); + if (err < 0) { + snd_printk(KERN_ERR "sscape: No timer device " + "for AD1845 chip\n"); + goto _error; + } } if (sscape->type != SSCAPE_VIVO) { @@ -1128,8 +1033,6 @@ static int __devinit create_ad1845(struct snd_card *card, unsigned port, "MIDI mixer control\n"); goto _error; } - chip->set_playback_format = ad1845_playback_format; - chip->set_capture_format = ad1845_capture_format; } strcpy(card->driver, "SoundScape"); diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c index 3d6c5f2..13299ae 100644 --- a/sound/isa/wss/wss_lib.c +++ b/sound/isa/wss/wss_lib.c @@ -646,6 +646,24 @@ static void snd_wss_playback_format(struct snd_wss *chip, full_calib = 0; } spin_unlock_irqrestore(&chip->reg_lock, flags); + } else if (chip->hardware == WSS_HW_AD1845) { + unsigned rate = params_rate(params); + + /* + * Program the AD1845 correctly for the playback stream. + * Note that we do NOT need to toggle the MCE bit because + * the PLAYBACK_ENABLE bit of the Interface Configuration + * register is set. + * + * NOTE: We seem to need to write to the MSB before the LSB + * to get the correct sample frequency. + */ + spin_lock_irqsave(&chip->reg_lock, flags); + snd_wss_out(chip, CS4231_PLAYBK_FORMAT, (pdfr & 0xf0)); + snd_wss_out(chip, AD1845_UPR_FREQ_SEL, (rate >> 8) & 0xff); + snd_wss_out(chip, AD1845_LWR_FREQ_SEL, rate & 0xff); + full_calib = 0; + spin_unlock_irqrestore(&chip->reg_lock, flags); } if (full_calib) { snd_wss_mce_up(chip); @@ -690,6 +708,24 @@ static void snd_wss_capture_format(struct snd_wss *chip, full_calib = 0; } spin_unlock_irqrestore(&chip->reg_lock, flags); + } else if (chip->hardware == WSS_HW_AD1845) { + unsigned rate = params_rate(params); + + /* + * Program the AD1845 correctly for the capture stream. + * Note that we do NOT need to toggle the MCE bit because + * the PLAYBACK_ENABLE bit of the Interface Configuration + * register is set. + * + * NOTE: We seem to need to write to the MSB before the LSB + * to get the correct sample frequency. + */ + spin_lock_irqsave(&chip->reg_lock, flags); + snd_wss_out(chip, CS4231_REC_FORMAT, (cdfr & 0xf0)); + snd_wss_out(chip, AD1845_UPR_FREQ_SEL, (rate >> 8) & 0xff); + snd_wss_out(chip, AD1845_LWR_FREQ_SEL, rate & 0xff); + full_calib = 0; + spin_unlock_irqrestore(&chip->reg_lock, flags); } if (full_calib) { snd_wss_mce_up(chip); @@ -1314,6 +1350,10 @@ static int snd_wss_probe(struct snd_wss *chip) chip->image[CS4231_ALT_FEATURE_2] = chip->hardware == WSS_HW_INTERWAVE ? 0xc2 : 0x01; } + /* enable fine grained frequency selection */ + if (chip->hardware == WSS_HW_AD1845) + chip->image[AD1845_PWR_DOWN] = 8; + ptr = (unsigned char *) &chip->image; regnum = (chip->hardware & WSS_HW_AD1848_MASK) ? 16 : 32; snd_wss_mce_down(chip); -- 1.5.2.2 ---------------------------------------------------------------------- Promocja w Speak Up. 3 miesiace angielskiego gratis. Sprawdz teraz i wypelnij formularz! >> http://link.interia.pl/f2019

2 2

[alsa-devel] [patch] Indigo DJx
by carmen 11 Jan '09

11 Jan '09

the old Indigo DJ driver worked after a few tweaks... tested w/ jack, cmus, mplayer mapping/virtual-outs seem good.. this is a diff on alsa-kernel.git. copied the old firmware and amazed it works, although something seems wonky with the samplerate registers. going to email echo about an updated firmware .. no noise bursts or ear destruction tho!

3 4