Commit fdb2b2ee authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai

ALSA: firewire-digi00x: remove transaction handler for unknown purpose

For digi00x series, asynchronous transaction is not used to transfer MIDI
messages to/from control surface. One of transction handlers in my previous
work loses its practical meaning.

This commit removes the handler. I note that unit of console type
transfers 0x00001000 to registered address of host space when switching
to 'standalone' mode. Then the unit generates bus reset.
Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 0c3f15f3
...@@ -9,40 +9,6 @@ ...@@ -9,40 +9,6 @@
#include <sound/asound.h> #include <sound/asound.h>
#include "digi00x.h" #include "digi00x.h"
static int fill_midi_message(struct snd_rawmidi_substream *substream, u8 *buf)
{
int bytes;
buf[0] = 0x80;
bytes = snd_rawmidi_transmit_peek(substream, buf + 1, 2);
if (bytes >= 0)
buf[3] = 0xc0 | bytes;
return bytes;
}
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, static void handle_unknown_message(struct snd_dg00x *dg00x,
unsigned long long offset, __be32 *buf) unsigned long long offset, __be32 *buf)
{ {
...@@ -63,39 +29,36 @@ static void handle_message(struct fw_card *card, struct fw_request *request, ...@@ -63,39 +29,36 @@ static void handle_message(struct fw_card *card, struct fw_request *request,
struct snd_dg00x *dg00x = callback_data; struct snd_dg00x *dg00x = callback_data;
__be32 *buf = (__be32 *)data; __be32 *buf = (__be32 *)data;
fw_send_response(card, request, RCODE_COMPLETE);
if (offset == dg00x->async_handler.offset) if (offset == dg00x->async_handler.offset)
handle_unknown_message(dg00x, offset, buf); 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);
} }
int snd_dg00x_transaction_reregister(struct snd_dg00x *dg00x) int snd_dg00x_transaction_reregister(struct snd_dg00x *dg00x)
{ {
struct fw_device *device = fw_parent_device(dg00x->unit); struct fw_device *device = fw_parent_device(dg00x->unit);
__be32 data[2]; __be32 data[2];
int err;
/* Unknown. 4bytes. */ /* Unknown. 4bytes. */
data[0] = cpu_to_be32((device->card->node_id << 16) | data[0] = cpu_to_be32((device->card->node_id << 16) |
(dg00x->async_handler.offset >> 32)); (dg00x->async_handler.offset >> 32));
data[1] = cpu_to_be32(dg00x->async_handler.offset); 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, return snd_fw_transaction(dg00x->unit, TCODE_WRITE_BLOCK_REQUEST,
DG00X_ADDR_BASE + DG00X_OFFSET_MIDI_CTL_ADDR, DG00X_ADDR_BASE + DG00X_OFFSET_MESSAGE_ADDR,
&data, sizeof(data), 0); &data, sizeof(data), 0);
} }
void snd_dg00x_transaction_unregister(struct snd_dg00x *dg00x)
{
if (dg00x->async_handler.callback_data == NULL)
return;
fw_core_remove_address_handler(&dg00x->async_handler);
dg00x->async_handler.callback_data = NULL;
}
int snd_dg00x_transaction_register(struct snd_dg00x *dg00x) int snd_dg00x_transaction_register(struct snd_dg00x *dg00x)
{ {
static const struct fw_address_region resp_register_region = { static const struct fw_address_region resp_register_region = {
...@@ -104,7 +67,7 @@ int snd_dg00x_transaction_register(struct snd_dg00x *dg00x) ...@@ -104,7 +67,7 @@ int snd_dg00x_transaction_register(struct snd_dg00x *dg00x)
}; };
int err; int err;
dg00x->async_handler.length = 12; dg00x->async_handler.length = 4;
dg00x->async_handler.address_callback = handle_message; dg00x->async_handler.address_callback = handle_message;
dg00x->async_handler.callback_data = dg00x; dg00x->async_handler.callback_data = dg00x;
...@@ -115,28 +78,7 @@ int snd_dg00x_transaction_register(struct snd_dg00x *dg00x) ...@@ -115,28 +78,7 @@ int snd_dg00x_transaction_register(struct snd_dg00x *dg00x)
err = snd_dg00x_transaction_reregister(dg00x); err = snd_dg00x_transaction_reregister(dg00x);
if (err < 0) if (err < 0)
goto error; snd_dg00x_transaction_unregister(dg00x);
err = snd_fw_async_midi_port_init(&dg00x->out_control, dg00x->unit,
DG00X_ADDR_BASE + DG00X_OFFSET_MMC,
4, fill_midi_message);
if (err < 0)
goto error;
return err; return err;
error:
fw_core_remove_address_handler(&dg00x->async_handler);
dg00x->async_handler.callback_data = NULL;
return err;
}
void snd_dg00x_transaction_unregister(struct snd_dg00x *dg00x)
{
if (dg00x->async_handler.callback_data == NULL)
return;
snd_fw_async_midi_port_destroy(&dg00x->out_control);
fw_core_remove_address_handler(&dg00x->async_handler);
dg00x->async_handler.callback_data = NULL;
} }
...@@ -58,9 +58,7 @@ struct snd_dg00x { ...@@ -58,9 +58,7 @@ struct snd_dg00x {
struct fw_address_handler async_handler; struct fw_address_handler async_handler;
u32 msg; u32 msg;
/* For asynchronous MIDI controls. */ /* Console models have additional MIDI ports for control surface. */
struct snd_rawmidi_substream *in_control;
struct snd_fw_async_midi_port out_control;
bool is_console; bool is_console;
}; };
...@@ -68,7 +66,7 @@ struct snd_dg00x { ...@@ -68,7 +66,7 @@ struct snd_dg00x {
#define DG00X_OFFSET_STREAMING_STATE 0x0000 #define DG00X_OFFSET_STREAMING_STATE 0x0000
#define DG00X_OFFSET_STREAMING_SET 0x0004 #define DG00X_OFFSET_STREAMING_SET 0x0004
#define DG00X_OFFSET_MIDI_CTL_ADDR 0x0008 /* unknown but address in host space 0x0008 */
/* For LSB of the address 0x000c */ /* For LSB of the address 0x000c */
/* unknown 0x0010 */ /* unknown 0x0010 */
#define DG00X_OFFSET_MESSAGE_ADDR 0x0014 #define DG00X_OFFSET_MESSAGE_ADDR 0x0014
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment