lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: emu10k1: allow high-resolution mixer controls
  ALSA: pcm: fix delta calculation at boundary wraparound
  ALSA: hda_intel: fix handling of non-completion stream interrupts
  ALSA: usb/caiaq: fix Traktor Kontrol X1 ABS_HAT2X axis
  ALSA: hda: Fix model quirk for Dell M1730
  ALSA: hda - iMac9,1 sound fixes
  ALSA: hda: Use LPIB for Toshiba A100-259
  ALSA: hda: Use LPIB for Acer Aspire 5110
  ALSA: aw2-alsa.c: use pci_ids.h defines and fix checkpatch.pl noise
  ALSA: usb-audio: add support for Akai MPD16
  ALSA: pcm: fix the fix of the runtime->boundary calculation
This commit is contained in:
Linus Torvalds
2010-05-26 08:41:25 -07:00
parent 13da9e200f d21921215a
commit 2214482cb0
13 changed files with 222 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
sound/usb/midi.c
View File

@ -644,6 +644,105 @@ static struct usb_protocol_ops snd_usbmidi_cme_ops = {
.output_packet = snd_usbmidi_output_standard_packet,
};
/*
* AKAI MPD16 protocol:
*
* For control port (endpoint 1):
* ==============================
* One or more chunks consisting of first byte of (0x10 | msg_len) and then a
* SysEx message (msg_len=9 bytes long).
*
* For data port (endpoint 2):
* ===========================
* One or more chunks consisting of first byte of (0x20 | msg_len) and then a
* MIDI message (msg_len bytes long)
*
* Messages sent: Active Sense, Note On, Poly Pressure, Control Change.
*/
static void snd_usbmidi_akai_input(struct snd_usb_midi_in_endpoint *ep,
uint8_t *buffer, int buffer_length)
{
unsigned int pos = 0;
unsigned int len = (unsigned int)buffer_length;
while (pos < len) {
unsigned int port = (buffer[pos] >> 4) - 1;
unsigned int msg_len = buffer[pos] & 0x0f;
pos++;
if (pos + msg_len <= len && port < 2)
snd_usbmidi_input_data(ep, 0, &buffer[pos], msg_len);
pos += msg_len;
}
}
#define MAX_AKAI_SYSEX_LEN 9
static void snd_usbmidi_akai_output(struct snd_usb_midi_out_endpoint *ep,
struct urb *urb)
{
uint8_t *msg;
int pos, end, count, buf_end;
uint8_t tmp[MAX_AKAI_SYSEX_LEN];
struct snd_rawmidi_substream *substream = ep->ports[0].substream;
if (!ep->ports[0].active)
return;
msg = urb->transfer_buffer + urb->transfer_buffer_length;
buf_end = ep->max_transfer - MAX_AKAI_SYSEX_LEN - 1;
/* only try adding more data when there's space for at least 1 SysEx */
while (urb->transfer_buffer_length < buf_end) {
count = snd_rawmidi_transmit_peek(substream,
tmp, MAX_AKAI_SYSEX_LEN);
if (!count) {
ep->ports[0].active = 0;
return;
}
/* try to skip non-SysEx data */
for (pos = 0; pos < count && tmp[pos] != 0xF0; pos++)
;
if (pos > 0) {
snd_rawmidi_transmit_ack(substream, pos);
continue;
}
/* look for the start or end marker */
for (end = 1; end < count && tmp[end] < 0xF0; end++)
;
/* next SysEx started before the end of current one */
if (end < count && tmp[end] == 0xF0) {
/* it's incomplete - drop it */
snd_rawmidi_transmit_ack(substream, end);
continue;
}
/* SysEx complete */
if (end < count && tmp[end] == 0xF7) {
/* queue it, ack it, and get the next one */
count = end + 1;
msg[0] = 0x10 | count;
memcpy(&msg[1], tmp, count);
snd_rawmidi_transmit_ack(substream, count);
urb->transfer_buffer_length += count + 1;
msg += count + 1;
continue;
}
/* less than 9 bytes and no end byte - wait for more */
if (count < MAX_AKAI_SYSEX_LEN) {
ep->ports[0].active = 0;
return;
}
/* 9 bytes and no end marker in sight - malformed, skip it */
snd_rawmidi_transmit_ack(substream, count);
}
}
static struct usb_protocol_ops snd_usbmidi_akai_ops = {
.input = snd_usbmidi_akai_input,
.output = snd_usbmidi_akai_output,
};
/*
* Novation USB MIDI protocol: number of data bytes is in the first byte
* (when receiving) (+1!) or in the second byte (when sending); data begins
@ -1434,6 +1533,11 @@ static struct port_info {
EXTERNAL_PORT(0x086a, 0x0001, 8, "%s Broadcast"),
EXTERNAL_PORT(0x086a, 0x0002, 8, "%s Broadcast"),
EXTERNAL_PORT(0x086a, 0x0003, 4, "%s Broadcast"),
/* Akai MPD16 */
CONTROL_PORT(0x09e8, 0x0062, 0, "%s Control"),
PORT_INFO(0x09e8, 0x0062, 1, "%s MIDI", 0,
SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |
SNDRV_SEQ_PORT_TYPE_HARDWARE),
/* Access Music Virus TI */
EXTERNAL_PORT(0x133e, 0x0815, 0, "%s MIDI"),
PORT_INFO(0x133e, 0x0815, 1, "%s Synth", 0,
@ -2035,6 +2139,12 @@ int snd_usbmidi_create(struct snd_card *card,
umidi->usb_protocol_ops = &snd_usbmidi_cme_ops;
err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints);
break;
case QUIRK_MIDI_AKAI:
umidi->usb_protocol_ops = &snd_usbmidi_akai_ops;
err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints);
/* endpoint 1 is input-only */
endpoints[1].out_cables = 0;
break;
default:
snd_printd(KERN_ERR "invalid quirk type %d\n", quirk->type);
err = -ENXIO;