Skip to content

audio: midi: revert macros from using BIT_MASK #97297

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

Closed
wants to merge 1 commit into from
Closed

audio: midi: revert macros from using BIT_MASK #97297

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
10 changes: 5 additions & 5 deletions include/zephyr/audio/midi.h
View file
Open in desktop
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) & 0x0f)

/**
* @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) & 0x0f)
/**
* @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
2 changes: 1 addition & 1 deletion samples/subsys/usb/midi/src/main.c
View file
Open in desktop
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