Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 10 additions & 10 deletions include/zephyr/audio/midi.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,15 @@ struct midi_ump {
* @param[in] ump Universal MIDI Packet
*/
#define UMP_GROUP(ump) \
(((ump).data[0] >> 24) & BIT_MASK(4))
(((ump).data[0] >> 24) & 0xF)

/**
* @brief Status byte of a MIDI channel voice or system message
* @param[in] ump Universal MIDI Packet (containing a MIDI1 event)
* @see midi_ump_sys
*/
#define UMP_MIDI_STATUS(ump) \
(((ump).data[0] >> 16) & BIT_MASK(8))
(((ump).data[0] >> 16) & 0xFF)
/**
* @brief Command of a MIDI channel voice message
* @param[in] ump Universal MIDI Packet (containing a MIDI event)
Expand All @@ -122,19 +122,19 @@ struct midi_ump {
* @param[in] ump Universal MIDI Packet (containing a MIDI event)
*/
#define UMP_MIDI_CHANNEL(ump) \
(UMP_MIDI_STATUS(ump) & BIT_MASK(4))
(UMP_MIDI_STATUS(ump) & 0xF)
/**
* @brief First parameter of a MIDI1 channel voice or system message
* @param[in] ump Universal MIDI Packet (containing a MIDI1 message)
*/
#define UMP_MIDI1_P1(ump) \
(((ump).data[0] >> 8) & BIT_MASK(7))
(((ump).data[0] >> 8) & 0x7F)
/**
* @brief Second parameter of a MIDI1 channel voice or system message
* @param[in] ump Universal MIDI Packet (containing a MIDI1 message)
*/
#define UMP_MIDI1_P2(ump) \
((ump).data[0] & BIT_MASK(7))
((ump).data[0] & 0x7F)

/**
* @brief Initialize a UMP with a MIDI1 channel voice message
Expand Down Expand Up @@ -226,7 +226,7 @@ struct midi_ump {
* @see midi_ump_stream_format
*/
#define UMP_STREAM_FORMAT(ump) \
(((ump).data[0] >> 26) & BIT_MASK(2))
(((ump).data[0] >> 26) & 0x03)

/**
* @defgroup midi_ump_stream_format UMP Stream format
Expand Down Expand Up @@ -256,7 +256,7 @@ struct midi_ump {
* @see midi_ump_stream_status
*/
#define UMP_STREAM_STATUS(ump) \
(((ump).data[0] >> 16) & BIT_MASK(10))
(((ump).data[0] >> 16) & 0x3FF)

/**
* @defgroup midi_ump_stream_status UMP Stream status
Expand Down Expand Up @@ -296,7 +296,7 @@ struct midi_ump {
* @see midi_ump_ep_disc
*/
#define UMP_STREAM_EP_DISCOVERY_FILTER(ump) \
((ump).data[1] & BIT_MASK(8))
((ump).data[1] & 0xFF)

/**
* @defgroup midi_ump_ep_disc UMP Stream endpoint discovery message filter bits
Expand Down Expand Up @@ -327,15 +327,15 @@ struct midi_ump {
* @see midi_ump_fb_disc
*/
#define UMP_STREAM_FB_DISCOVERY_FILTER(ump) \
((ump).data[0] & BIT_MASK(8))
((ump).data[0] & 0xFF)

/**
* @brief Block number requested in a Function Block Discovery message
* @param[in] ump Universal MIDI Packet (containing a Function Block Discovery message)
* @see ump112: 7.1.7 Function Block Discovery Message
*/
#define UMP_STREAM_FB_DISCOVERY_NUM(ump) \
(((ump).data[0] >> 8) & BIT_MASK(8))
(((ump).data[0] >> 8) & 0xFF)

/**
* @defgroup midi_ump_fb_disc UMP Stream Function Block discovery message filter bits
Expand Down
2 changes: 1 addition & 1 deletion samples/subsys/usb/midi/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ 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 %02lX %02lX %02lX",
LOG_INF("Send back MIDI1 message %02X %02X %02X",
UMP_MIDI_STATUS(ump), UMP_MIDI1_P1(ump), UMP_MIDI1_P2(ump));
usbd_midi_send(dev, ump);
break;
Expand Down