diff options
author | James Courtier-Dutton <James@superbug.co.uk> | 2007-07-23 09:01:46 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2007-10-16 09:57:43 -0400 |
commit | 90fd5ce5f67968d3250eeab9bc1f6822644347ef (patch) | |
tree | 9bec33c26b7cc6fac6765eb85bb317f7911f07cc /sound/pci/emu10k1/emuproc.c | |
parent | 25765c4e5de8edcd06b60993b63feeed9e7885c1 (diff) |
[ALSA] snd-emu10k1: Add support for E-Mu 1616 PCI, 1616M PCI, 0404 PCI, E-Mu
Notebook.
Description: The .device=0x0008 chips have new, but different EMU32 in/out
channels. Driver updated to make use of these EMU32 channels.
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/emu10k1/emuproc.c')
-rw-r--r-- | sound/pci/emu10k1/emuproc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c index 2c1585991bc8..a0dae0d916cb 100644 --- a/sound/pci/emu10k1/emuproc.c +++ b/sound/pci/emu10k1/emuproc.c | |||
@@ -385,7 +385,7 @@ static void snd_emu_proc_emu1010_reg_read(struct snd_info_entry *entry, | |||
385 | int i; | 385 | int i; |
386 | snd_iprintf(buffer, "EMU1010 Registers:\n\n"); | 386 | snd_iprintf(buffer, "EMU1010 Registers:\n\n"); |
387 | 387 | ||
388 | for(i = 0; i < 0x30; i+=1) { | 388 | for(i = 0; i < 0x40; i+=1) { |
389 | spin_lock_irqsave(&emu->emu_lock, flags); | 389 | spin_lock_irqsave(&emu->emu_lock, flags); |
390 | regs=i+0x40; /* 0x40 upwards are registers. */ | 390 | regs=i+0x40; /* 0x40 upwards are registers. */ |
391 | outl(regs, emu->port + A_IOCFG); | 391 | outl(regs, emu->port + A_IOCFG); |
@@ -555,9 +555,9 @@ int __devinit snd_emu10k1_proc_init(struct snd_emu10k1 * emu) | |||
555 | { | 555 | { |
556 | struct snd_info_entry *entry; | 556 | struct snd_info_entry *entry; |
557 | #ifdef CONFIG_SND_DEBUG | 557 | #ifdef CONFIG_SND_DEBUG |
558 | if ((emu->card_capabilities->emu1010) && | 558 | if (emu->card_capabilities->emu1010) { |
559 | snd_card_proc_new(emu->card, "emu1010_regs", &entry)) { | 559 | if (! snd_card_proc_new(emu->card, "emu1010_regs", &entry)) |
560 | snd_info_set_text_ops(entry, emu, snd_emu_proc_emu1010_reg_read); | 560 | snd_info_set_text_ops(entry, emu, snd_emu_proc_emu1010_reg_read); |
561 | } | 561 | } |
562 | if (! snd_card_proc_new(emu->card, "io_regs", &entry)) { | 562 | if (! snd_card_proc_new(emu->card, "io_regs", &entry)) { |
563 | snd_info_set_text_ops(entry, emu, snd_emu_proc_io_reg_read); | 563 | snd_info_set_text_ops(entry, emu, snd_emu_proc_io_reg_read); |