From 85c2716f2d37bb50d126102fcdd09fb78d26ebc5 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Fri, 7 Aug 2009 00:27:11 +0000 Subject: Make Benito ping-pong LED code more explicit, using masks of the TX and RX LED masks for ping-pong toggle rather than the ambiguous LED "Busy" mask. Fix incorrect event name in MassStorageHost.c. --- LUFA/Drivers/USB/HighLevel/StdDescriptors.h | 6 +++--- LUFA/Drivers/USB/HighLevel/USBTask.h | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'LUFA') diff --git a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h index 274b84fc4..0e0d1e9f4 100644 --- a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h +++ b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h @@ -85,13 +85,13 @@ * On unsupported devices, this will evaluate to NO_DESCRIPTOR and so will force the host to create a pseduo-serial * number for the device. */ - #define USE_INTERNAL_SERIAL 0xDC + #define USE_INTERNAL_SERIAL 0xDC #else - #define USE_INTERNAL_SERIAL NO_DESCRIPTOR + #define USE_INTERNAL_SERIAL NO_DESCRIPTOR #endif /** Macro to calculate the power value for the device descriptor, from a given number of milliamps. */ - #define USB_CONFIG_POWER_MA(mA) (mA >> 1) + #define USB_CONFIG_POWER_MA(mA) (mA >> 1) /** Macro to calculate the Unicode length of a string with a given number of Unicode characters. * Should be used in string descriptor's headers for giving the string descriptor's byte length. diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.h b/LUFA/Drivers/USB/HighLevel/USBTask.h index 08accc1ef..9c0abf013 100644 --- a/LUFA/Drivers/USB/HighLevel/USBTask.h +++ b/LUFA/Drivers/USB/HighLevel/USBTask.h @@ -35,17 +35,20 @@ #include #include #include - #include #include "../LowLevel/LowLevel.h" - #include "StdRequestType.h" - #include "USBMode.h" #include "Events.h" + #include "StdRequestType.h" #include "StdDescriptors.h" + #include "USBMode.h" + + #if defined(USB_CAN_BE_DEVICE) + #include "../LowLevel/DevChapter9.h" + #endif #if defined(USB_CAN_BE_HOST) #include "../LowLevel/HostChapter9.h" - #endif + #endif /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) -- cgit v1.2.3