mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-10-28 05:40:23 -04:00
include/ump_msg.h: Fix endianness detection
The SNDRV_BIG_ENDIAN_BITFIELD define is only available in the alsa-lib's internal build process (include/local.h). Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela
parent
ea8972c83b
commit
a7de48692f
1 changed files with 32 additions and 28 deletions
|
|
@ -19,9 +19,13 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
#if __BYTE_ORDER != __LITTLE_ENDIAN && __BYTE_ORDER != __BIG_ENDIAN
|
||||
#error "Endianness check failed!"
|
||||
#endif
|
||||
|
||||
/** general UMP packet header in 32bit word */
|
||||
typedef struct _snd_ump_msg_hdr {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status:4; /**< Status */
|
||||
|
|
@ -40,7 +44,7 @@ typedef struct _snd_ump_msg_hdr {
|
|||
|
||||
/** MIDI 1.0 Note Off / Note On (32bit) */
|
||||
typedef struct _snd_ump_msg_midi1_note {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status:4; /**< Status */
|
||||
|
|
@ -59,7 +63,7 @@ typedef struct _snd_ump_msg_midi1_note {
|
|||
|
||||
/** MIDI 1.0 Poly Pressure (32bit) */
|
||||
typedef struct _snd_ump_msg_midi1_paf {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status:4; /**< Status */
|
||||
|
|
@ -78,7 +82,7 @@ typedef struct _snd_ump_msg_midi1_paf {
|
|||
|
||||
/** MIDI 1.0 Control Change (32bit) */
|
||||
typedef struct _snd_ump_msg_midi1_cc {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status:4; /**< Status */
|
||||
|
|
@ -97,7 +101,7 @@ typedef struct _snd_ump_msg_midi1_cc {
|
|||
|
||||
/** MIDI 1.0 Program Change (32bit) */
|
||||
typedef struct _snd_ump_msg_midi1_program {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status:4; /**< Status */
|
||||
|
|
@ -116,7 +120,7 @@ typedef struct _snd_ump_msg_midi1_program {
|
|||
|
||||
/** MIDI 1.0 Channel Pressure (32bit) */
|
||||
typedef struct _snd_ump_msg_midi1_caf {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status:4; /**< Status */
|
||||
|
|
@ -135,7 +139,7 @@ typedef struct _snd_ump_msg_midi1_caf {
|
|||
|
||||
/** MIDI 1.0 Pitch Bend (32bit) */
|
||||
typedef struct _snd_ump_msg_midi1_pitchbend {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status:4; /**< Status */
|
||||
|
|
@ -154,7 +158,7 @@ typedef struct _snd_ump_msg_midi1_pitchbend {
|
|||
|
||||
/** System Common and Real Time messages (32bit); no channel field */
|
||||
typedef struct snd_ump_msg_system {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status; /**< Status */
|
||||
|
|
@ -193,7 +197,7 @@ enum {
|
|||
|
||||
/** MIDI 2.0 Note Off / Note On (64bit) */
|
||||
typedef struct _snd_ump_msg_midi2_note {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status:4; /**< Status */
|
||||
|
|
@ -218,7 +222,7 @@ typedef struct _snd_ump_msg_midi2_note {
|
|||
|
||||
/** MIDI 2.0 Poly Pressure (64bit) */
|
||||
typedef struct _snd_ump_msg_midi2_paf {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status:4; /**< Status */
|
||||
|
|
@ -241,7 +245,7 @@ typedef struct _snd_ump_msg_midi2_paf {
|
|||
|
||||
/** MIDI 2.0 Per-Note Controller (64bit) */
|
||||
typedef struct _snd_ump_msg_midi2_per_note_cc {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status:4; /**< Status */
|
||||
|
|
@ -270,7 +274,7 @@ enum {
|
|||
|
||||
/** MIDI 2.0 Per-Note Management (64bit) */
|
||||
typedef struct _snd_ump_msg_midi2_per_note_mgmt {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status:4; /**< Status */
|
||||
|
|
@ -293,7 +297,7 @@ typedef struct _snd_ump_msg_midi2_per_note_mgmt {
|
|||
|
||||
/** MIDI 2.0 Control Change (64bit) */
|
||||
typedef struct _snd_ump_msg_midi2_cc {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status:4; /**< Status */
|
||||
|
|
@ -316,7 +320,7 @@ typedef struct _snd_ump_msg_midi2_cc {
|
|||
|
||||
/** MIDI 2.0 Registered Controller (RPN) / Assignable Controller (NRPN) (64bit) */
|
||||
typedef struct _snd_ump_msg_midi2_rpn {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status:4; /**< Status */
|
||||
|
|
@ -339,7 +343,7 @@ typedef struct _snd_ump_msg_midi2_rpn {
|
|||
|
||||
/** MIDI 2.0 Program Change (64bit) */
|
||||
typedef struct _snd_ump_msg_midi2_program {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status:4; /**< Status */
|
||||
|
|
@ -368,7 +372,7 @@ typedef struct _snd_ump_msg_midi2_program {
|
|||
|
||||
/** MIDI 2.0 Channel Pressure (64bit) */
|
||||
typedef struct _snd_ump_msg_midi2_caf {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status:4; /**< Status */
|
||||
|
|
@ -389,7 +393,7 @@ typedef struct _snd_ump_msg_midi2_caf {
|
|||
|
||||
/** MIDI 2.0 Pitch Bend (64bit) */
|
||||
typedef struct _snd_ump_msg_midi2_pitchbend {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status:4; /**< Status */
|
||||
|
|
@ -454,7 +458,7 @@ typedef union _snd_ump_msg_midi2 {
|
|||
|
||||
/** Stream Message (generic) (128bit) */
|
||||
typedef struct _snd_ump_msg_stream_gen {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint16_t type:4; /**< UMP packet type */
|
||||
uint16_t format:2; /**< Format */
|
||||
uint16_t status:10; /**< Status */
|
||||
|
|
@ -482,7 +486,7 @@ typedef union _snd_ump_msg_stream {
|
|||
|
||||
/** Metadata / Text Message (128bit) */
|
||||
typedef struct _snd_ump_msg_flex_data_meta {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t format:2; /**< Format */
|
||||
|
|
@ -505,7 +509,7 @@ typedef struct _snd_ump_msg_flex_data_meta {
|
|||
|
||||
/** Set Tempo Message (128bit) */
|
||||
typedef struct _snd_ump_msg_set_tempo {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t format:2; /**< Format */
|
||||
|
|
@ -534,7 +538,7 @@ typedef struct _snd_ump_msg_set_tempo {
|
|||
|
||||
/** Set Time Signature Message (128bit) */
|
||||
typedef struct _snd_ump_msg_set_time_sig {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t format:2; /**< Format */
|
||||
|
|
@ -569,7 +573,7 @@ typedef struct _snd_ump_msg_set_time_sig {
|
|||
|
||||
/** Set Metronome Message (128bit) */
|
||||
typedef struct _snd_ump_msg_set_metronome {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t format:2; /**< Format */
|
||||
|
|
@ -612,7 +616,7 @@ typedef struct _snd_ump_msg_set_metronome {
|
|||
|
||||
/** Set Key Signature Message (128bit) */
|
||||
typedef struct _snd_ump_msg_set_key_sig {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t format:2; /**< Format */
|
||||
|
|
@ -645,7 +649,7 @@ typedef struct _snd_ump_msg_set_key_sig {
|
|||
|
||||
/** Set Chord Name Message (128bit) */
|
||||
typedef struct _snd_ump_msg_set_chord_name {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t format:2; /**< Format */
|
||||
|
|
@ -786,7 +790,7 @@ typedef union _snd_ump_msg_mixed_data {
|
|||
|
||||
/** Jitter Reduction Clock / Timestamp Message (32bit) */
|
||||
typedef struct _snd_ump_msg_jr_clock {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status:4; /**< Status */
|
||||
|
|
@ -803,7 +807,7 @@ typedef struct _snd_ump_msg_jr_clock {
|
|||
|
||||
/** Delta Clockstamp Ticks Per Quarter Note (DCTPQ) (32bit) */
|
||||
typedef struct _snd_ump_msg_dctpq {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint8_t type:4; /**< UMP packet type */
|
||||
uint8_t group:4; /**< UMP Group */
|
||||
uint8_t status:4; /**< Status */
|
||||
|
|
@ -820,7 +824,7 @@ typedef struct _snd_ump_msg_dctpq {
|
|||
|
||||
/** Delta Clockstamp (DC) (32bit) */
|
||||
typedef struct _snd_ump_msg_dc {
|
||||
#ifdef SNDRV_BIG_ENDIAN_BITFIELD
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
uint32_t type:4; /**< UMP packet type */
|
||||
uint32_t group:4; /**< UMP Group */
|
||||
uint32_t status:4; /**< Status */
|
||||
|
|
@ -1113,7 +1117,7 @@ static inline uint8_t snd_ump_sysex_msg_length(const uint32_t *ump)
|
|||
*/
|
||||
static inline uint8_t snd_ump_get_byte(const uint32_t *ump, unsigned int offset)
|
||||
{
|
||||
#ifdef SNDRV_BIG_ENDIAN
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
return ((const uint8_t *)ump)[offset];
|
||||
#else
|
||||
return ((const uint8_t *)ump)[(offset & ~3) | (3 - (offset & 3))];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue