UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: firewire-tascam: send fixed-length transaction for async midi port 

TASCAM FireWire series uses asynchronous transactions with fixed length
payload for MIDI messaging. On the other hand, ALSA driver for the series
has a redundant design to handle different length of payload.

This commit removes the redundant abstraction.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2017-04-14 16:46:27 +09:00 committed by Takashi Iwai
parent 9bae2150d0
commit 38d5826142
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sound/firewire/tascam/tascam-transaction.c
View File

@ -176,7 +176,6 @@ static void midi_port_work(struct work_struct *work)
container_of(work, struct snd_fw_async_midi_port, work); container_of(work, struct snd_fw_async_midi_port, work);
struct snd_rawmidi_substream *substream = ACCESS_ONCE(port->substream); struct snd_rawmidi_substream *substream = ACCESS_ONCE(port->substream);
int generation; int generation;
int type;
/* Under transacting or error state. */ /* Under transacting or error state. */
if (!port->idling || port->error) if (!port->idling || port->error)
@ -196,7 +195,7 @@ static void midi_port_work(struct work_struct *work)
* Fill the buffer. The callee must use snd_rawmidi_transmit_peek(). * Fill the buffer. The callee must use snd_rawmidi_transmit_peek().
* Later, snd_rawmidi_transmit_ack() is called. * Later, snd_rawmidi_transmit_ack() is called.
*/ */
memset(port->buf, 0, port->len); memset(port->buf, 0, 4);
port->consume_bytes = fill_message(substream, port->buf); port->consume_bytes = fill_message(substream, port->buf);
if (port->consume_bytes <= 0) { if (port->consume_bytes <= 0) {
/* Do it in next chance, immediately. */ /* Do it in next chance, immediately. */
@ -210,12 +209,6 @@ static void midi_port_work(struct work_struct *work)
return; return;
} }
/* Calculate type of transaction. */
if (port->len == 4)
type = TCODE_WRITE_QUADLET_REQUEST;
else
type = TCODE_WRITE_BLOCK_REQUEST;
/* Set interval to next transaction. */ /* Set interval to next transaction. */
port->next_ktime = ktime_add_ns(ktime_get(), port->next_ktime = ktime_add_ns(ktime_get(),
port->consume_bytes * 8 * NSEC_PER_SEC / 31250); port->consume_bytes * 8 * NSEC_PER_SEC / 31250);
@ -234,18 +227,18 @@ static void midi_port_work(struct work_struct *work)
generation = port->parent->generation; generation = port->parent->generation;
smp_rmb(); smp_rmb();
fw_send_request(port->parent->card, &port->transaction, type, fw_send_request(port->parent->card, &port->transaction,
TCODE_WRITE_QUADLET_REQUEST,
port->parent->node_id, generation, port->parent->node_id, generation,
port->parent->max_speed, port->addr, port->parent->max_speed, port->addr,
port->buf, port->len, async_midi_port_callback, port->buf, 4, async_midi_port_callback,
port); port);
} }
int snd_fw_async_midi_port_init(struct snd_fw_async_midi_port *port, int snd_fw_async_midi_port_init(struct snd_fw_async_midi_port *port,
struct fw_unit *unit, u64 addr, unsigned int len) struct fw_unit *unit, u64 addr)
{ {
port->len = DIV_ROUND_UP(len, 4) * 4; port->buf = kzalloc(4, GFP_KERNEL);
port->buf = kzalloc(port->len, GFP_KERNEL);
if (port->buf == NULL) if (port->buf == NULL)
return -ENOMEM; return -ENOMEM;
@ -344,8 +337,7 @@ int snd_tscm_transaction_register(struct snd_tscm *tscm)
for (i = 0; i < TSCM_MIDI_OUT_PORT_MAX; i++) { for (i = 0; i < TSCM_MIDI_OUT_PORT_MAX; i++) {
err = snd_fw_async_midi_port_init( err = snd_fw_async_midi_port_init(
&tscm->out_ports[i], tscm->unit, &tscm->out_ports[i], tscm->unit,
TSCM_ADDR_BASE + TSCM_OFFSET_MIDI_RX_QUAD, TSCM_ADDR_BASE + TSCM_OFFSET_MIDI_RX_QUAD);
4);
if (err < 0) if (err < 0)
goto error; goto error;
} }

3
sound/firewire/tascam/tascam.h
View File

@ -56,7 +56,6 @@ struct snd_fw_async_midi_port {
struct fw_transaction transaction; struct fw_transaction transaction;
u8 *buf; u8 *buf;
unsigned int len;
struct snd_rawmidi_substream *substream; struct snd_rawmidi_substream *substream;
int consume_bytes; int consume_bytes;
@ -149,7 +148,7 @@ int snd_tscm_stream_lock_try(struct snd_tscm *tscm);
void snd_tscm_stream_lock_release(struct snd_tscm *tscm); void snd_tscm_stream_lock_release(struct snd_tscm *tscm);
int snd_fw_async_midi_port_init(struct snd_fw_async_midi_port *port, int snd_fw_async_midi_port_init(struct snd_fw_async_midi_port *port,
struct fw_unit *unit, u64 addr, unsigned int len); struct fw_unit *unit, u64 addr);
void snd_fw_async_midi_port_destroy(struct snd_fw_async_midi_port *port); void snd_fw_async_midi_port_destroy(struct snd_fw_async_midi_port *port);
static inline void static inline void