diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2009-07-30 07:45:36 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-07-30 07:45:36 +0000 |
commit | 5ca1d7bf8f1aa774c076b614fa692c2026d7e854 (patch) | |
tree | 9a9a09e422e8c7d96e30d9d2854bd504f6780090 /LUFA/Drivers/USB | |
parent | fef185a409e2fee980d5fd391813a1cb7809582a (diff) | |
download | lufa-5ca1d7bf8f1aa774c076b614fa692c2026d7e854.tar.gz lufa-5ca1d7bf8f1aa774c076b614fa692c2026d7e854.tar.bz2 lufa-5ca1d7bf8f1aa774c076b614fa692c2026d7e854.zip |
Fix redefinition warning when USB_DEVICE_ONLY is set on an AVR which does not support USB host mode.
Diffstat (limited to 'LUFA/Drivers/USB')
-rw-r--r-- | LUFA/Drivers/USB/Class/Common/MIDI.h | 2 | ||||
-rw-r--r-- | LUFA/Drivers/USB/HighLevel/USBMode.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/LUFA/Drivers/USB/Class/Common/MIDI.h b/LUFA/Drivers/USB/Class/Common/MIDI.h index 7dfb0e780..a52b037dc 100644 --- a/LUFA/Drivers/USB/Class/Common/MIDI.h +++ b/LUFA/Drivers/USB/Class/Common/MIDI.h @@ -137,7 +137,7 @@ /** Type define for a USB MIDI event packet, used to encapsulate sent and received MIDI messages from a USB MIDI interface. */
typedef struct
{
- unsigned char Command : 4; /**< MIDI command being sent or received in the event packet */
+ 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 */
uint8_t Data1; /**< First byte of data in the MIDI event */
diff --git a/LUFA/Drivers/USB/HighLevel/USBMode.h b/LUFA/Drivers/USB/HighLevel/USBMode.h index 18a2666c6..ba221c520 100644 --- a/LUFA/Drivers/USB/HighLevel/USBMode.h +++ b/LUFA/Drivers/USB/HighLevel/USBMode.h @@ -50,7 +50,9 @@ #error USB_HOST_ONLY is not available for the currently selected USB AVR model.
#endif
- #define USB_DEVICE_ONLY
+ #if !defined(USB_DEVICE_ONLY)
+ #define USB_DEVICE_ONLY
+ #endif
#endif
#if (!defined(USB_DEVICE_ONLY) && !defined(USB_HOST_ONLY))
|