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.
pull/1469/head
Dean Camera 15 years ago
parent 33a5715e91
commit 85c2716f2d

@ -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. */ /** 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(); USB_ShutDown();

@ -85,13 +85,13 @@
* On unsupported devices, this will evaluate to NO_DESCRIPTOR and so will force the host to create a pseduo-serial * On unsupported devices, this will evaluate to NO_DESCRIPTOR and so will force the host to create a pseduo-serial
* number for the device. * number for the device.
*/ */
#define USE_INTERNAL_SERIAL 0xDC #define USE_INTERNAL_SERIAL 0xDC
#else #else
#define USE_INTERNAL_SERIAL NO_DESCRIPTOR #define USE_INTERNAL_SERIAL NO_DESCRIPTOR
#endif #endif
/** Macro to calculate the power value for the device descriptor, from a given number of milliamps. */ /** 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. /** 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. * Should be used in string descriptor's headers for giving the string descriptor's byte length.

@ -35,13 +35,16 @@
#include <avr/io.h> #include <avr/io.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h>
#include "../LowLevel/LowLevel.h" #include "../LowLevel/LowLevel.h"
#include "StdRequestType.h"
#include "USBMode.h"
#include "Events.h" #include "Events.h"
#include "StdRequestType.h"
#include "StdDescriptors.h" #include "StdDescriptors.h"
#include "USBMode.h"
#if defined(USB_CAN_BE_DEVICE)
#include "../LowLevel/DevChapter9.h"
#endif
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
#include "../LowLevel/HostChapter9.h" #include "../LowLevel/HostChapter9.h"

@ -102,7 +102,7 @@ int main(void)
/* Check if the LEDs should be ping-ponging (during enumeration) */ /* Check if the LEDs should be ping-ponging (during enumeration) */
if (PingPongMSRemaining && !(--PingPongMSRemaining)) if (PingPongMSRemaining && !(--PingPongMSRemaining))
{ {
LEDs_ToggleLEDs(LEDMASK_BUSY); LEDs_ToggleLEDs(LEDMASK_TX | LEDMASK_RX);
PingPongMSRemaining = PING_PONG_LED_PULSE_MS; PingPongMSRemaining = PING_PONG_LED_PULSE_MS;
} }

Loading…
Cancel
Save