Fix compile errors when compiling for the AVR32 UC3 target.

[pub/USBasp.git] / 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 fe43fe5..1d6eb70 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Common/MIDI.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -38,7 +38,7 @@
  */
 
 /** \ingroup Group_USBClassMIDI
  */
 
 /** \ingroup Group_USBClassMIDI

- *  @defgroup Group_USBClassMIDICommon  Common Class Definitions
+ *  \defgroup Group_USBClassMIDICommon  Common Class Definitions

  *
  *  \section Sec_ModDescription Module Description
  *  Constants, Types and Enum definitions that are common to both Device and Host modes for the USB
  *
  *  \section Sec_ModDescription Module Description
  *  Constants, Types and Enum definitions that are common to both Device and Host modes for the USB


@@ -54,11 +54,9 @@
                #define __INCLUDE_FROM_AUDIO_DRIVER
 
        /* Includes: */
                #define __INCLUDE_FROM_AUDIO_DRIVER
 
        /* Includes: */

-               #include "../../HighLevel/StdDescriptors.h"
+               #include "../../Core/StdDescriptors.h"

                #include "Audio.h"
 
                #include "Audio.h"
 

-               #include <string.h>
-

        /* Enable C linkage for C++ Compilers: */
                #if defined(__cplusplus)
                        extern "C" {
        /* Enable C linkage for C++ Compilers: */
                #if defined(__cplusplus)
                        extern "C" {


@@ -115,7 +113,7 @@
                                                                     *   specification version.
                                                                     */
                        uint16_t                TotalLength; /**< Total length of the Audio class-specific descriptors, including this descriptor. */
                                                                     *   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).
                 *
 
                /** \brief MIDI class-specific Streaming Interface Descriptor (USB-IF naming conventions).
                 *


@@ -137,7 +135,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. */
 
                        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).
                 *
 
                /** \brief MIDI class-specific Input Jack Descriptor (LUFA naming conventions).
                 *


@@ -151,11 +149,11 @@
                        USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
                        uint8_t                 Subtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */
 
                        USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
                        uint8_t                 Subtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */
 

-                       uint8_t                 JackType; /**< Type of jack, one of the JACKTYPE_* mask values. */
+                       uint8_t                 JackType; /**< Type of jack, one of the \c JACKTYPE_* mask values. */

                        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. */
                        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).
                 *
 
                /** \brief MIDI class-specific Input Jack Descriptor (USB-IF naming conventions).
                 *


@@ -174,11 +172,11 @@
 
                        uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */
 
 
                        uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */
 

-                       uint8_t  bJackType; /**< Type of jack, one of the JACKTYPE_* mask values. */
+                       uint8_t  bJackType; /**< Type of jack, one of the \c JACKTYPE_* mask values. */

                        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. */
                        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).
                 *
 
                /** \brief MIDI class-specific Output Jack Descriptor (LUFA naming conventions).
                 *


@@ -192,7 +190,7 @@
                        USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length. */
                        uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */
 
                        USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length. */
                        uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */
 

-                       uint8_t                   JackType; /**< Type of jack, one of the JACKTYPE_* mask values. */
+                       uint8_t                   JackType; /**< Type of jack, one of the \c JACKTYPE_* mask values. */

                        uint8_t                   JackID; /**< ID value of this jack - must be a unique value within the device. */
 
                        uint8_t                   NumberOfPins; /**< Number of output channels within the jack, either physical or logical. */
                        uint8_t                   JackID; /**< ID value of this jack - must be a unique value within the device. */
 
                        uint8_t                   NumberOfPins; /**< Number of output channels within the jack, either physical or logical. */


@@ -200,7 +198,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. */
                        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).
                 *
 
                /** \brief MIDI class-specific Output Jack Descriptor (USB-IF naming conventions).
                 *


@@ -219,7 +217,7 @@
 
                        uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */
 
 
                        uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */
 

-                       uint8_t  bJackType; /**< Type of jack, one of the JACKTYPE_* mask values. */
+                       uint8_t  bJackType; /**< Type of jack, one of the \c JACKTYPE_* mask values. */

                        uint8_t  bJackID; /**< ID value of this jack - must be a unique value within the device. */
 
                        uint8_t  bNrInputPins; /**< Number of output channels within the jack, either physical or logical. */
                        uint8_t  bJackID; /**< ID value of this jack - must be a unique value within the device. */
 
                        uint8_t  bNrInputPins; /**< Number of output channels within the jack, either physical or logical. */


@@ -227,7 +225,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. */
                        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).
                 *
 
                /** \brief Audio class-specific Jack Endpoint Descriptor (LUFA naming conventions).
                 *


@@ -244,7 +242,7 @@
 
                        uint8_t                   TotalEmbeddedJacks; /**< Total number of jacks inside this endpoint. */
                        uint8_t                   AssociatedJackID[1]; /**< IDs of each jack inside the endpoint. */
 
                        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).
                 *
 
                /** \brief Audio class-specific Jack Endpoint Descriptor (USB-IF naming conventions).
                 *


@@ -266,7 +264,7 @@
 
                        uint8_t  bNumEmbMIDIJack; /**< Total number of jacks inside this endpoint. */
                        uint8_t  bAssocJackID[1]; /**< IDs of each jack inside the endpoint. */
 
                        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.
                 *
 
                /** \brief MIDI Class Driver Event Packet.
                 *


@@ -274,13 +272,13 @@
                 */
                typedef struct
                {
                 */
                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)
 
        /* Disable C linkage for C++ Compilers: */
                #if defined(__cplusplus)