Skip to content

Pisound Micro: Fix for MIDI output under full load. #6748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 7, 2025
+33 −21
Merged

Pisound Micro: Fix for MIDI output under full load. #6748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sound/drivers/upisnd/upisnd_comm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ int upisnd_comm_init(struct upisnd_instance *instance,

int upisnd_comm_send_midi(struct upisnd_instance *instance, const void *data, unsigned int n)
{
if (n >= UPISND_MAX_PACKET_LENGTH)
if (n == 0 || n >= UPISND_MAX_PACKET_LENGTH)
return -EINVAL;

u8 buffer[UPISND_MAX_PACKET_LENGTH];
Expand Down
49 changes: 30 additions & 19 deletions sound/drivers/upisnd/upisnd_midi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ static const struct snd_rawmidi_global_ops upisnd_midi_ops = {

static void upisnd_midi_in_handler(struct work_struct *work)
{
int i, n, err;
int n, err;

printd("In handler");
struct upisnd_instance *instance = container_of(work,
Expand All @@ -153,8 +153,7 @@ static void upisnd_midi_in_handler(struct work_struct *work)
instance->midi.rx_cnt += err;
}

for (i = 0; i < err; ++i)
kfifo_skip(&instance->midi.midi_in_fifo);
kfifo_skip_count(&instance->midi.midi_in_fifo, err);

if (!kfifo_is_empty(&instance->midi.midi_in_fifo) &&
!work_pending(&instance->midi.midi_in_handler)) {
Expand Down Expand Up @@ -193,25 +192,37 @@ static void upisnd_midi_out_handler(struct work_struct *work)
instance->midi.output_buffer_used_in_millibytes) / 1000;

u8 buffer[UPISND_MAX_PACKET_LENGTH - 1];
int n, batch, err;

printd("Available: %u", output_buffer_available);
int n = snd_rawmidi_transmit_peek(instance->midi.midi_output,
buffer,
min(output_buffer_available, sizeof(buffer)));

if (n > 0) {
printd("Peeked: %d", n);
snd_rawmidi_transmit_ack(instance->midi.midi_output, n);
n = upisnd_comm_send_midi(instance, buffer, (unsigned int)n);
if (n < 0)
printe("Error occurred when sending MIDI data over I2C! (%d)", n);
} else {
printe("snd_rawmidi_transmit_peek returned error %d!", n);
goto cleanup;
}

instance->midi.tx_cnt += n;
instance->midi.output_buffer_used_in_millibytes += n * 1000;
for (batch = 0; batch < 3; ++batch) {
if (output_buffer_available == 0)
break;

n = snd_rawmidi_transmit_peek(instance->midi.midi_output,
buffer,
min(output_buffer_available, sizeof(buffer)));

if (n > 0) {
printd("Peeked: %d (batch %d)", n, batch);
err = upisnd_comm_send_midi(instance, buffer, (unsigned int)n);
if (err < 0) {
printe("Error occurred when sending MIDI data over I2C! (%d)", n);
goto cleanup;
}
snd_rawmidi_transmit_ack(instance->midi.midi_output, n);

instance->midi.tx_cnt += n;
instance->midi.output_buffer_used_in_millibytes += n * 1000;
output_buffer_available -= n;
} else if (n < 0) {
printe("snd_rawmidi_transmit_peek returned error %d!", n);
goto cleanup;
} else {
break;
}
}

printd("Checking if empty %p", instance->midi.midi_output);
if (!snd_rawmidi_transmit_empty(instance->midi.midi_output)) {
Expand Down
3 changes: 2 additions & 1 deletion sound/drivers/upisnd/upisnd_protocol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,8 @@ static inline u8 upisnd_cmd_decode_length(u8 b)

static inline u8 upisnd_cmd_encode(enum upisnd_cmd_type_e type, u8 size)
{
return (size < UPISND_MAX_PACKET_LENGTH && size > 0) ? (type | (size - 1)) : 0xff;
return (size <= UPISND_MAX_PACKET_LENGTH && size > 0) ? (type | (size - 1))
: UPISND_CMD_INVALID;
}

static inline u8 upisnd_msg_id_encode(upisnd_msg_id_t msg_id, bool response)
Expand Down