X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/d18f12bf42e735cecfccb7cbc551f022bf0dd91b..07e521db928dc7e8ae707e8e395dfade95d031f0:/LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h?ds=sidebyside diff --git a/LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h b/LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h index 9bb042cb7..02bd015dc 100644 --- a/LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h +++ b/LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h @@ -1,13 +1,13 @@ /* LUFA Library - Copyright (C) Dean Camera, 2013. + Copyright (C) Dean Camera, 2015. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ /* - Copyright 2013 Dean Camera (dean [at] fourwalledcubicle [dot] com) + Copyright 2015 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 @@ -40,7 +40,7 @@ /** \ingroup Group_USBClassMIDI * \defgroup Group_USBClassMIDICommon Common Class Definitions * - * \section Sec_ModDescription Module Description + * \section Sec_USBClassMIDICommon_ModDescription Module Description * Constants, Types and Enum definitions that are common to both Device and Host modes for the USB * MIDI Class. * @@ -135,7 +135,7 @@ * * \return Constructed MIDI event ID. */ - #define MIDI_EVENT(virtualcable, command) ((virtualcable << 4) | (command >> 4)) + #define MIDI_EVENT(virtualcable, command) (((virtualcable) << 4) | ((command) >> 4)) /* Enums: */ /** Enum for the possible MIDI jack types in a MIDI device jack descriptor. */ @@ -163,6 +163,8 @@ uint16_t AudioSpecification; /**< Binary coded decimal value, indicating the supported Audio Class * specification version. + * + * \see \ref VERSION_BCD() utility macro. */ uint16_t TotalLength; /**< Total length of the Audio class-specific descriptors, including this descriptor. */ } ATTR_PACKED USB_MIDI_Descriptor_AudioInterface_AS_t; @@ -187,7 +189,10 @@ uint8_t bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */ - uint16_t bcdMSC; /**< Binary coded decimal value, indicating the supported MIDI Class specification version. */ + uint16_t bcdMSC; /**< Binary coded decimal value, indicating the supported MIDI Class specification version. + * + * \see \ref VERSION_BCD() utility macro. + */ uint16_t wTotalLength; /**< Total length of the Audio class-specific descriptors, including this descriptor. */ } ATTR_PACKED USB_MIDI_StdDescriptor_AudioInterface_AS_t; @@ -340,7 +345,7 @@ */ typedef struct { - uint8_t Event; /**< MIDI event type, constructed with the \ref MIDI_EVENT() macro. */ + uint8_t Event; /**< MIDI event type, constructed with the \ref MIDI_EVENT() macro. */ uint8_t Data1; /**< First byte of data in the MIDI event. */ uint8_t Data2; /**< Second byte of data in the MIDI event. */