Skip to content

samples: subsys: usb: midi: fix compilation error and warnings #97204

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 2 commits into from
Oct 8, 2025
Merged

samples: subsys: usb: midi: fix compilation error and warnings #97204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b108116
lib: midi2: fix const-incorrect ump_stream_responder_cfg
titouanc Oct 8, 2025
622eb31
samples: subsys: usb: midi: fix compilation warning
titouanc Oct 8, 2025
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
22 changes: 20 additions & 2 deletions lib/midi2/ump_stream_responder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,32 @@ struct ump_endpoint_dt_spec {
struct ump_block_dt_spec blocks[];
};

/**
* @brief A function to send a UMP
*/
typedef void (*ump_send_func)(const void *, const struct midi_ump);

/**
* @brief Initialize a configuration for the UMP Stream responder
* @param _dev The device to send reply packets
* @param _send The send function
* @param _ep_spec The UMP endpoint specification
*/
#define UMP_STREAM_RESPONDER(_dev, _send, _ep_spec) \
{ \
.dev = _dev, \
.send = (ump_send_func) _send, \
.ep_spec = _ep_spec, \
}

/**
* @brief Configuration for the UMP Stream responder
*/
struct ump_stream_responder_cfg {
/** The device to send reply packets */
void *dev;
const void *dev;
/** The function to call to send a reply packet */
void (*send)(void *dev, const struct midi_ump ump);
ump_send_func send;
/** The UMP endpoint specification */
const struct ump_endpoint_dt_spec *ep_spec;
};
Expand Down
7 changes: 2 additions & 5 deletions samples/net/midi2/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,8 @@ static const struct ump_endpoint_dt_spec ump_ep_dt =
static inline void handle_ump_stream(struct netmidi2_session *session,
const struct midi_ump ump)
{
const struct ump_stream_responder_cfg responder_cfg = {
.dev = session,
.send = (void (*)(void *, const struct midi_ump)) netmidi2_send,
.ep_spec = &ump_ep_dt,
};
const struct ump_stream_responder_cfg responder_cfg =
UMP_STREAM_RESPONDER(session, netmidi2_send, &ump_ep_dt);
ump_stream_respond(&responder_cfg, ump);
}

Expand Down
11 changes: 4 additions & 7 deletions samples/subsys/usb/midi/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,8 @@ INPUT_CALLBACK_DEFINE(NULL, key_press, NULL);
static const struct ump_endpoint_dt_spec ump_ep_dt =
UMP_ENDPOINT_DT_SPEC_GET(USB_MIDI_DT_NODE);

const struct ump_stream_responder_cfg responder_cfg = {
.dev = midi,
.send = (void (*)(void *, const struct midi_ump)) usbd_midi_send,
.ep_spec = &ump_ep_dt,
};
const struct ump_stream_responder_cfg responder_cfg =
UMP_STREAM_RESPONDER(midi, usbd_midi_send, &ump_ep_dt);

static void on_midi_packet(const struct device *dev, const struct midi_ump ump)
{
Expand All @@ -58,8 +55,8 @@ static void on_midi_packet(const struct device *dev, const struct midi_ump ump)
switch (UMP_MT(ump)) {
case UMP_MT_MIDI1_CHANNEL_VOICE:
/* Only send MIDI1 channel voice messages back to the host */
LOG_INF("Send back MIDI1 message %02X %02X %02X", UMP_MIDI_STATUS(ump),
UMP_MIDI1_P1(ump), UMP_MIDI1_P2(ump));
LOG_INF("Send back MIDI1 message %02lX %02lX %02lX",
UMP_MIDI_STATUS(ump), UMP_MIDI1_P1(ump), UMP_MIDI1_P2(ump));
usbd_midi_send(dev, ump);
break;
case UMP_MT_UMP_STREAM:
Expand Down