X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/5e7319058268e021ae39ca4b9fcabaec0060117b..77a9df36a77d2523dd2bc24fa17f9f04c6c175c5:/LUFA/Drivers/USB/Class/Common/MIDI.h diff --git a/LUFA/Drivers/USB/Class/Common/MIDI.h b/LUFA/Drivers/USB/Class/Common/MIDI.h index d2e884a97..a273589e4 100644 --- a/LUFA/Drivers/USB/Class/Common/MIDI.h +++ b/LUFA/Drivers/USB/Class/Common/MIDI.h @@ -103,6 +103,8 @@ * See the USB Audio specification for more details. * * \see \ref USB_MIDI_StdDescriptor_AudioInterface_AS_t for the version of this type with standard element names. + * + * \note Regardless of CPU architecture, these values should be stored as little endian. */ typedef struct { @@ -113,7 +115,7 @@ * specification version. */ uint16_t TotalLength; /**< Total length of the Audio class-specific descriptors, including this descriptor. */ - } USB_MIDI_Descriptor_AudioInterface_AS_t; + } ATTR_PACKED USB_MIDI_Descriptor_AudioInterface_AS_t; /** \brief MIDI class-specific Streaming Interface Descriptor (USB-IF naming conventions). * @@ -123,6 +125,8 @@ * * \see \ref USB_MIDI_Descriptor_AudioInterface_AS_t for the version of this type with non-standard LUFA specific * element names. + * + * \note Regardless of CPU architecture, these values should be stored as little endian. */ typedef struct { @@ -135,7 +139,7 @@ uint16_t bcdMSC; /**< Binary coded decimal value, indicating the supported MIDI Class specification version. */ uint16_t wTotalLength; /**< Total length of the Audio class-specific descriptors, including this descriptor. */ - } USB_MIDI_StdDescriptor_AudioInterface_AS_t; + } ATTR_PACKED USB_MIDI_StdDescriptor_AudioInterface_AS_t; /** \brief MIDI class-specific Input Jack Descriptor (LUFA naming conventions). * @@ -143,6 +147,8 @@ * a physical input jack, or a logical jack (receiving input data internally, or from the host via an endpoint). * * \see \ref USB_MIDI_StdDescriptor_InputJack_t for the version of this type with standard element names. + * + * \note Regardless of CPU architecture, these values should be stored as little endian. */ typedef struct { @@ -153,7 +159,7 @@ uint8_t JackID; /**< ID value of this jack - must be a unique value within the device. */ uint8_t JackStrIndex; /**< Index of a string descriptor describing this descriptor within the device. */ - } USB_MIDI_Descriptor_InputJack_t; + } ATTR_PACKED USB_MIDI_Descriptor_InputJack_t; /** \brief MIDI class-specific Input Jack Descriptor (USB-IF naming conventions). * @@ -162,6 +168,8 @@ * * \see \ref USB_MIDI_Descriptor_InputJack_t for the version of this type with non-standard LUFA specific * element names. + * + * \note Regardless of CPU architecture, these values should be stored as little endian. */ typedef struct { @@ -176,7 +184,7 @@ uint8_t bJackID; /**< ID value of this jack - must be a unique value within the device. */ uint8_t iJack; /**< Index of a string descriptor describing this descriptor within the device. */ - } USB_MIDI_StdDescriptor_InputJack_t; + } ATTR_PACKED USB_MIDI_StdDescriptor_InputJack_t; /** \brief MIDI class-specific Output Jack Descriptor (LUFA naming conventions). * @@ -184,6 +192,8 @@ * a physical output jack, or a logical jack (sending output data internally, or to the host via an endpoint). * * \see \ref USB_MIDI_StdDescriptor_OutputJack_t for the version of this type with standard element names. + * + * \note Regardless of CPU architecture, these values should be stored as little endian. */ typedef struct { @@ -198,7 +208,7 @@ uint8_t SourcePinID[1]; /**< Pin number in the input jack of each output pin's source data. */ uint8_t JackStrIndex; /**< Index of a string descriptor describing this descriptor within the device. */ - } USB_MIDI_Descriptor_OutputJack_t; + } ATTR_PACKED USB_MIDI_Descriptor_OutputJack_t; /** \brief MIDI class-specific Output Jack Descriptor (USB-IF naming conventions). * @@ -207,6 +217,8 @@ * * \see \ref USB_MIDI_Descriptor_OutputJack_t for the version of this type with non-standard LUFA specific * element names. + * + * \note Regardless of CPU architecture, these values should be stored as little endian. */ typedef struct { @@ -225,7 +237,7 @@ uint8_t baSourcePin[1]; /**< Pin number in the input jack of each output pin's source data. */ uint8_t iJack; /**< Index of a string descriptor describing this descriptor within the device. */ - } USB_MIDI_StdDescriptor_OutputJack_t; + } ATTR_PACKED USB_MIDI_StdDescriptor_OutputJack_t; /** \brief Audio class-specific Jack Endpoint Descriptor (LUFA naming conventions). * @@ -234,6 +246,8 @@ * class-specific extended MIDI endpoint descriptor. See the USB Audio specification for more details. * * \see \ref USB_MIDI_StdDescriptor_Jack_Endpoint_t for the version of this type with standard element names. + * + * \note Regardless of CPU architecture, these values should be stored as little endian. */ typedef struct { @@ -242,7 +256,7 @@ uint8_t TotalEmbeddedJacks; /**< Total number of jacks inside this endpoint. */ uint8_t AssociatedJackID[1]; /**< IDs of each jack inside the endpoint. */ - } USB_MIDI_Descriptor_Jack_Endpoint_t; + } ATTR_PACKED USB_MIDI_Descriptor_Jack_Endpoint_t; /** \brief Audio class-specific Jack Endpoint Descriptor (USB-IF naming conventions). * @@ -252,6 +266,8 @@ * * \see \ref USB_MIDI_Descriptor_Jack_Endpoint_t for the version of this type with non-standard LUFA specific * element names. + * + * \note Regardless of CPU architecture, these values should be stored as little endian. */ typedef struct { @@ -264,21 +280,23 @@ uint8_t bNumEmbMIDIJack; /**< Total number of jacks inside this endpoint. */ uint8_t bAssocJackID[1]; /**< IDs of each jack inside the endpoint. */ - } USB_MIDI_StdDescriptor_Jack_Endpoint_t; + } ATTR_PACKED USB_MIDI_StdDescriptor_Jack_Endpoint_t; /** \brief MIDI Class Driver Event Packet. * * Type define for a USB MIDI event packet, used to encapsulate sent and received MIDI messages from a USB MIDI interface. + * + * \note Regardless of CPU architecture, these values should be stored as little endian. */ typedef struct { - unsigned char Command : 4; /**< Upper nibble of the MIDI command being sent or received in the event packet. */ - unsigned char CableNumber : 4; /**< Virtual cable number of the event being sent or received in the given MIDI interface. */ + unsigned Command : 4; /**< Upper nibble of the MIDI command being sent or received in the event packet. */ + unsigned CableNumber : 4; /**< Virtual cable number of the event being sent or received in the given MIDI interface. */ - uint8_t Data1; /**< First byte of data in the MIDI event. */ - uint8_t Data2; /**< Second byte of data in the MIDI event. */ - uint8_t Data3; /**< Third byte of data in the MIDI event. */ - } MIDI_EventPacket_t; + uint8_t Data1; /**< First byte of data in the MIDI event. */ + uint8_t Data2; /**< Second byte of data in the MIDI event. */ + uint8_t Data3; /**< Third byte of data in the MIDI event. */ + } ATTR_PACKED MIDI_EventPacket_t; /* Disable C linkage for C++ Compilers: */ #if defined(__cplusplus)