From 85c2716f2d37bb50d126102fcdd09fb78d26ebc5 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Fri, 7 Aug 2009 00:27:11 +0000
Subject: [PATCH] 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.
---
Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c | 2 +-
LUFA/Drivers/USB/HighLevel/StdDescriptors.h | 6 +++---
LUFA/Drivers/USB/HighLevel/USBTask.h | 11 +++++++----
Projects/Benito/Benito.c | 2 +-
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
index 4f02e5128..2b27b120e 100644
--- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
+++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
@@ -103,7 +103,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
}
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
-void EVENT_USB_HostError(const uint8_t ErrorCode)
+void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{
USB_ShutDown();
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 <avr/io.h>
#include <avr/interrupt.h>
#include <stdbool.h>
- #include <stddef.h>
#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)
diff --git a/Projects/Benito/Benito.c b/Projects/Benito/Benito.c
index 100c897fa..afe29b4a9 100644
--- a/Projects/Benito/Benito.c
+++ b/Projects/Benito/Benito.c
@@ -102,7 +102,7 @@ int main(void)
/* Check if the LEDs should be ping-ponging (during enumeration) */
if (PingPongMSRemaining && !(--PingPongMSRemaining))
{
- LEDs_ToggleLEDs(LEDMASK_BUSY);
+ LEDs_ToggleLEDs(LEDMASK_TX | LEDMASK_RX);
PingPongMSRemaining = PING_PONG_LED_PULSE_MS;
}
--
GitLab