|
@@ -9,6 +9,28 @@
|
|
|
#include <sound/asound.h>
|
|
|
#include "digi00x.h"
|
|
|
|
|
|
+static void handle_midi_control(struct snd_dg00x *dg00x, __be32 *buf,
|
|
|
+ unsigned int length)
|
|
|
+{
|
|
|
+ struct snd_rawmidi_substream *substream;
|
|
|
+ unsigned int i;
|
|
|
+ unsigned int len;
|
|
|
+ u8 *b;
|
|
|
+
|
|
|
+ substream = ACCESS_ONCE(dg00x->in_control);
|
|
|
+ if (substream == NULL)
|
|
|
+ return;
|
|
|
+
|
|
|
+ length /= 4;
|
|
|
+
|
|
|
+ for (i = 0; i < length; i++) {
|
|
|
+ b = (u8 *)&buf[i];
|
|
|
+ len = b[3] & 0xf;
|
|
|
+ if (len > 0)
|
|
|
+ snd_rawmidi_receive(dg00x->in_control, b + 1, len);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
static void handle_unknown_message(struct snd_dg00x *dg00x,
|
|
|
unsigned long long offset, __be32 *buf)
|
|
|
{
|
|
@@ -31,6 +53,8 @@ static void handle_message(struct fw_card *card, struct fw_request *request,
|
|
|
|
|
|
if (offset == dg00x->async_handler.offset)
|
|
|
handle_unknown_message(dg00x, offset, buf);
|
|
|
+ else if (offset == dg00x->async_handler.offset + 4)
|
|
|
+ handle_midi_control(dg00x, buf, length);
|
|
|
|
|
|
fw_send_response(card, request, RCODE_COMPLETE);
|
|
|
}
|
|
@@ -39,14 +63,25 @@ int snd_dg00x_transaction_reregister(struct snd_dg00x *dg00x)
|
|
|
{
|
|
|
struct fw_device *device = fw_parent_device(dg00x->unit);
|
|
|
__be32 data[2];
|
|
|
+ int err;
|
|
|
|
|
|
/* Unknown. 4bytes. */
|
|
|
data[0] = cpu_to_be32((device->card->node_id << 16) |
|
|
|
(dg00x->async_handler.offset >> 32));
|
|
|
data[1] = cpu_to_be32(dg00x->async_handler.offset);
|
|
|
+ err = snd_fw_transaction(dg00x->unit, TCODE_WRITE_BLOCK_REQUEST,
|
|
|
+ DG00X_ADDR_BASE + DG00X_OFFSET_MESSAGE_ADDR,
|
|
|
+ &data, sizeof(data), 0);
|
|
|
+ if (err < 0)
|
|
|
+ return err;
|
|
|
+
|
|
|
+ /* Asynchronous transactions for MIDI control message. */
|
|
|
+ data[0] = cpu_to_be32((device->card->node_id << 16) |
|
|
|
+ (dg00x->async_handler.offset >> 32));
|
|
|
+ data[1] = cpu_to_be32(dg00x->async_handler.offset + 4);
|
|
|
return snd_fw_transaction(dg00x->unit, TCODE_WRITE_BLOCK_REQUEST,
|
|
|
- DG00X_ADDR_BASE + DG00X_OFFSET_MESSAGE_ADDR,
|
|
|
- &data, sizeof(data), 0);
|
|
|
+ DG00X_ADDR_BASE + DG00X_OFFSET_MIDI_CTL_ADDR,
|
|
|
+ &data, sizeof(data), 0);
|
|
|
}
|
|
|
|
|
|
int snd_dg00x_transaction_register(struct snd_dg00x *dg00x)
|
|
@@ -57,7 +92,7 @@ int snd_dg00x_transaction_register(struct snd_dg00x *dg00x)
|
|
|
};
|
|
|
int err;
|
|
|
|
|
|
- dg00x->async_handler.length = 4;
|
|
|
+ dg00x->async_handler.length = 12;
|
|
|
dg00x->async_handler.address_callback = handle_message;
|
|
|
dg00x->async_handler.callback_data = dg00x;
|
|
|
|