mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 12:43:29 +02:00
Merge branch 'topic/midi20' into for-next
Pull yet more fixes for UMP core. All about the legacy MIDI support code. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
@@ -340,9 +340,6 @@ static int cvt_legacy_cmd_to_ump(struct snd_ump_endpoint *ump,
|
|||||||
|
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case UMP_MSG_STATUS_NOTE_ON:
|
case UMP_MSG_STATUS_NOTE_ON:
|
||||||
if (!buf[2])
|
|
||||||
status = UMP_MSG_STATUS_NOTE_OFF;
|
|
||||||
fallthrough;
|
|
||||||
case UMP_MSG_STATUS_NOTE_OFF:
|
case UMP_MSG_STATUS_NOTE_OFF:
|
||||||
midi2->note.note = buf[1];
|
midi2->note.note = buf[1];
|
||||||
midi2->note.velocity = upscale_7_to_16bit(buf[2]);
|
midi2->note.velocity = upscale_7_to_16bit(buf[2]);
|
||||||
@@ -457,7 +454,7 @@ static int do_convert_to_ump(struct snd_ump_endpoint *ump,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (c & 0x80) {
|
if (c & 0x80) {
|
||||||
bytes = cmd_bytes[(c >> 8) & 7];
|
bytes = cmd_bytes[(c >> 4) & 7];
|
||||||
cvt->buf[0] = c;
|
cvt->buf[0] = c;
|
||||||
cvt->len = 1;
|
cvt->len = 1;
|
||||||
cvt->cmd_bytes = bytes;
|
cvt->cmd_bytes = bytes;
|
||||||
|
Reference in New Issue
Block a user