diff options
author | James Courtier-Dutton <James@superbug.co.uk> | 2006-10-01 05:48:04 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-02-09 02:59:59 -0500 |
commit | 9f4bd5dde81b5cb94e4f52f2f05825aa0422f1ff (patch) | |
tree | 884d0016c361a555ab1bc95287e64a6c109a0609 /sound/pci/emu10k1/emu10k1x.c | |
parent | 5986a2ec35836a878350c54af4bd91b1de6abc59 (diff) |
[ALSA] snd-emu10k1: Added support for emu1010, including E-Mu 1212m and E-Mu 1820m
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/emu10k1/emu10k1x.c')
-rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index 2199b42a6019..bb0fec7f7e1b 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
@@ -460,7 +460,7 @@ static int snd_emu10k1x_pcm_prepare(struct snd_pcm_substream *substream) | |||
460 | u32 period_size_bytes = frames_to_bytes(runtime, runtime->period_size); | 460 | u32 period_size_bytes = frames_to_bytes(runtime, runtime->period_size); |
461 | int i; | 461 | int i; |
462 | 462 | ||
463 | for(i=0; i < runtime->periods; i++) { | 463 | for(i = 0; i < runtime->periods; i++) { |
464 | *table_base++=runtime->dma_addr+(i*period_size_bytes); | 464 | *table_base++=runtime->dma_addr+(i*period_size_bytes); |
465 | *table_base++=period_size_bytes<<16; | 465 | *table_base++=period_size_bytes<<16; |
466 | } | 466 | } |
@@ -1042,8 +1042,8 @@ static void snd_emu10k1x_proc_reg_write(struct snd_info_entry *entry, | |||
1042 | if (sscanf(line, "%x %x %x", ®, &channel_id, &val) != 3) | 1042 | if (sscanf(line, "%x %x %x", ®, &channel_id, &val) != 3) |
1043 | continue; | 1043 | continue; |
1044 | 1044 | ||
1045 | if ((reg < 0x49) && (reg >=0) && (val <= 0xffffffff) | 1045 | if ((reg < 0x49) && (reg >= 0) && (val <= 0xffffffff) |
1046 | && (channel_id >=0) && (channel_id <= 2) ) | 1046 | && (channel_id >= 0) && (channel_id <= 2) ) |
1047 | snd_emu10k1x_ptr_write(emu, reg, channel_id, val); | 1047 | snd_emu10k1x_ptr_write(emu, reg, channel_id, val); |
1048 | } | 1048 | } |
1049 | } | 1049 | } |