mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-19 07:00:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git@git.alsa-project.org:alsa-lib

Browse source
This commit is contained in:
Takashi Iwai 2009-06-24 12:25:47 +02:00
commit 608cccb088
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pcm/pcm_dmix_i386.h
View file

@ -400,8 +400,8 @@ static void MIX_AREAS_24(unsigned int size,
"\tmovzwl (%%esi), %%ecx\n" "\tmovzwl (%%esi), %%ecx\n"
"\tmovl (%%ebx), %%edx\n" "\tmovl (%%ebx), %%edx\n"
"\tsall $16, %%eax\n" "\tsall $16, %%eax\n"
"\torl %%eax, %%ecx\n"
"\t" LOCK_PREFIX "btsw $0, (%%edi)\n" "\t" LOCK_PREFIX "btsw $0, (%%edi)\n"
"\tleal (%%ecx,%%eax,1), %%ecx\n"
"\tjc 2f\n" "\tjc 2f\n"
"\t" XSUB " %%edx, %%ecx\n" "\t" XSUB " %%edx, %%ecx\n"
"2:" "2:"

4
src/pcm/pcm_dmix_x86_64.h
View file

@ -284,11 +284,11 @@ static void MIX_AREAS_24(unsigned int size,
* *sum += sample; * *sum += sample;
*/ */
"\tmovsbl 2(%%rsi), %%eax\n" "\tmovsbl 2(%%rsi), %%eax\n"
"\tmovswl (%%rsi), %%ecx\n" "\tmovzwl (%%rsi), %%ecx\n"
"\tmovl (%%rbx), %%edx\n" "\tmovl (%%rbx), %%edx\n"
"\tsall $16, %%eax\n" "\tsall $16, %%eax\n"
"\torl %%eax, %%ecx\n"
"\t" LOCK_PREFIX "btsw $0, (%%rdi)\n" "\t" LOCK_PREFIX "btsw $0, (%%rdi)\n"
"\t.byte 0x67, 0x8d, 0x0c, 0x01\n"
"\tjc 2f\n" "\tjc 2f\n"
"\t" XSUB " %%edx, %%ecx\n" "\t" XSUB " %%edx, %%ecx\n"
"2:" "2:"

9
src/seq/seq_midi_event.c
View file

@ -442,6 +442,7 @@ long snd_midi_event_decode(snd_midi_event_t *dev, unsigned char *buf, long count
if (cmd == MIDI_CMD_COMMON_SYSEX) { if (cmd == MIDI_CMD_COMMON_SYSEX) {
snd_midi_event_reset_decode(dev);
qlen = ev->data.ext.len; qlen = ev->data.ext.len;
if (count < qlen) if (count < qlen)
return -ENOMEM; return -ENOMEM;
@ -566,10 +567,10 @@ static int extra_decode_xrpn(snd_midi_event_t *dev, unsigned char *buf, int coun
if (dev->nostat && count < 12) if (dev->nostat && count < 12)
return -ENOMEM; return -ENOMEM;
cmd = MIDI_CMD_CONTROL|(ev->data.control.channel & 0x0f); cmd = MIDI_CMD_CONTROL|(ev->data.control.channel & 0x0f);
bytes[0] = ev->data.control.param & 0x007f; bytes[0] = (ev->data.control.param & 0x3f80) >> 7;
bytes[1] = (ev->data.control.param & 0x3f80) >> 7; bytes[1] = ev->data.control.param & 0x007f;
bytes[2] = ev->data.control.value & 0x007f; bytes[2] = (ev->data.control.value & 0x3f80) >> 7;
bytes[3] = (ev->data.control.value & 0x3f80) >> 7; bytes[3] = ev->data.control.value & 0x007f;
if (cmd != dev->lastcmd && !dev->nostat) { if (cmd != dev->lastcmd && !dev->nostat) {
if (count < 9) if (count < 9)
return -ENOMEM; return -ENOMEM;