Converted Host mode demos to schedulerless. Fixed host mode broken due to earlier Start-of-frame event experiments.

pull/1469/head
Dean Camera 16 years ago
parent 33a0184749
commit ac70ddd0a1

@ -248,7 +248,7 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
else else
{ {
/* Read the next FLASH byte from the current FLASH page */ /* Read the next FLASH byte from the current FLASH page */
#if defined(RAMPZ) #if (FLASHEND > 0xFFFF)
WriteNextResponseByte(pgm_read_byte_far(CurrAddress | HighByte)); WriteNextResponseByte(pgm_read_byte_far(CurrAddress | HighByte));
#else #else
WriteNextResponseByte(pgm_read_byte(CurrAddress | HighByte)); WriteNextResponseByte(pgm_read_byte(CurrAddress | HighByte));
@ -513,7 +513,7 @@ TASK(CDC_Task)
} }
else if (Command == 'R') else if (Command == 'R')
{ {
#if defined(RAMPZ) #if (FLASHEND > 0xFFFF)
uint16_t ProgramWord = pgm_read_word_far(CurrAddress); uint16_t ProgramWord = pgm_read_word_far(CurrAddress);
#else #else
uint16_t ProgramWord = pgm_read_word(CurrAddress); uint16_t ProgramWord = pgm_read_word(CurrAddress);

@ -342,7 +342,7 @@ void EVENT_USB_UnhandledControlPacket(void)
} }
/* Read the flash word and send it via USB to the host */ /* Read the flash word and send it via USB to the host */
#if defined(RAMPZ) #if (FLASHEND > 0xFFFF)
Endpoint_Write_Word_LE(pgm_read_word_far(CurrFlashAddress.Long)); Endpoint_Write_Word_LE(pgm_read_word_far(CurrFlashAddress.Long));
#else #else
Endpoint_Write_Word_LE(pgm_read_word(CurrFlashAddress.Long)); Endpoint_Write_Word_LE(pgm_read_word(CurrFlashAddress.Long));
@ -585,7 +585,7 @@ static void ProcessMemReadCommand(void)
while (CurrFlashAddress < BOOT_START_ADDR) while (CurrFlashAddress < BOOT_START_ADDR)
{ {
/* Check if the current byte is not blank */ /* Check if the current byte is not blank */
#if defined(RAMPZ) #if (FLASHEND > 0xFFFF)
if (pgm_read_byte_far(CurrFlashAddress) != 0xFF) if (pgm_read_byte_far(CurrFlashAddress) != 0xFF)
#else #else
if (pgm_read_byte(CurrFlashAddress) != 0xFF) if (pgm_read_byte(CurrFlashAddress) != 0xFF)

@ -119,10 +119,10 @@ static uint8_t MassStore_WaitForDataReceived(void)
while (!(Pipe_IsINReceived())) while (!(Pipe_IsINReceived()))
{ {
/* Check to see if a new frame has been issued (1ms elapsed) */ /* Check to see if a new frame has been issued (1ms elapsed) */
if (FrameElapsed) if (USB_INT_HasOccurred(USB_INT_HSOFI))
{ {
/* Clear the flag and decrement the timeout period counter */ /* Clear the flag and decrement the timeout period counter */
FrameElapsed = false; USB_INT_Clear(USB_INT_HSOFI);
TimeoutMSRem--; TimeoutMSRem--;
/* Check to see if the timeout period for the command has elapsed */ /* Check to see if the timeout period for the command has elapsed */

@ -109,10 +109,10 @@ uint8_t SImage_RecieveBlockHeader(void)
while (!(Pipe_IsReadWriteAllowed())) while (!(Pipe_IsReadWriteAllowed()))
{ {
/* Check to see if a new frame has been issued (1ms elapsed) */ /* Check to see if a new frame has been issued (1ms elapsed) */
if (FrameElapsed) if (USB_INT_HasOccurred(USB_INT_HSOFI))
{ {
/* Clear the flag and decrement the timeout period counter */ /* Clear the flag and decrement the timeout period counter */
FrameElapsed = false; USB_INT_Clear(USB_INT_HSOFI);
TimeoutMSRem--; TimeoutMSRem--;
/* Check to see if the timeout period for the command has elapsed */ /* Check to see if the timeout period for the command has elapsed */

@ -58,6 +58,7 @@ int main(void)
{ {
Bluetooth_Stack_Task(); Bluetooth_Stack_Task();
Bluetooth_Management_Task(); Bluetooth_Management_Task();
USB_USBTask();
} }
} }

@ -36,18 +36,27 @@
#include "CDCHost.h" #include "CDCHost.h"
/* Scheduler Task List */
TASK_LIST
{
{ .Task = USB_USBTask , .TaskStatus = TASK_STOP },
{ .Task = USB_CDC_Host , .TaskStatus = TASK_STOP },
};
/** Main program entry point. This routine configures the hardware required by the application, then /** Main program entry point. This routine configures the hardware required by the application, then
* starts the scheduler to run the application tasks. * starts the scheduler to run the application tasks.
*/ */
int main(void) int main(void)
{
SetupHardware();
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"CDC Host Demo running.\r\n" ESC_INVERSE_OFF));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
for (;;)
{
CDC_Host_Task();
USB_USBTask();
}
}
/** Configures the board hardware and chip peripherals for the demo's functionality. */
void SetupHardware(void)
{ {
/* Disable watchdog if enabled by bootloader/fuses */ /* Disable watchdog if enabled by bootloader/fuses */
MCUSR &= ~(1 << WDRF); MCUSR &= ~(1 << WDRF);
@ -59,22 +68,7 @@ int main(void)
/* Hardware Initialization */ /* Hardware Initialization */
SerialStream_Init(9600, false); SerialStream_Init(9600, false);
LEDs_Init(); LEDs_Init();
/* Indicate USB not ready */
UpdateStatus(Status_USBNotReady);
/* Initialize Scheduler so that it can be used */
Scheduler_Init();
/* Initialize USB Subsystem */
USB_Init(); USB_Init();
/* Start-up message */
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"CDC Host Demo running.\r\n" ESC_INVERSE_OFF));
/* Scheduling - routine never returns, so put this last in the main function */
Scheduler_Start();
} }
/** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
@ -83,10 +77,7 @@ int main(void)
void EVENT_USB_DeviceAttached(void) void EVENT_USB_DeviceAttached(void)
{ {
puts_P(PSTR("Device Attached.\r\n")); puts_P(PSTR("Device Attached.\r\n"));
UpdateStatus(Status_USBEnumerating); LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
/* Start USB management task to enumerate the device */
Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);
} }
/** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and
@ -94,12 +85,8 @@ void EVENT_USB_DeviceAttached(void)
*/ */
void EVENT_USB_DeviceUnattached(void) void EVENT_USB_DeviceUnattached(void)
{ {
/* Stop keyboard and USB management task */
Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);
Scheduler_SetTaskMode(USB_CDC_Host, TASK_STOP);
puts_P(PSTR("\r\nDevice Unattached.\r\n")); puts_P(PSTR("\r\nDevice Unattached.\r\n"));
UpdateStatus(Status_USBNotReady); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
} }
/** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully
@ -107,11 +94,7 @@ void EVENT_USB_DeviceUnattached(void)
*/ */
void EVENT_USB_DeviceEnumerationComplete(void) void EVENT_USB_DeviceEnumerationComplete(void)
{ {
/* Start CDC Host task */ LEDs_SetAllLEDs(LEDMASK_USB_READY);
Scheduler_SetTaskMode(USB_CDC_Host, TASK_RUN);
/* Indicate device enumeration complete */
UpdateStatus(Status_USBReady);
} }
/** 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. */
@ -122,7 +105,7 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n")); puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
UpdateStatus(Status_HardwareError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
for(;;); for(;;);
} }
@ -136,44 +119,13 @@ void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t Su
printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode); printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);
printf_P(PSTR(" -- In State %d\r\n"), USB_HostState); printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
}
/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to
* log to a serial port, or anything else that is suitable for status updates.
*
* \param CurrentStatus Current status of the system, from the CDCHost_StatusCodes_t enum
*/
void UpdateStatus(uint8_t CurrentStatus)
{
uint8_t LEDMask = LEDS_NO_LEDS;
/* Set the LED mask to the appropriate LED mask based on the given status code */
switch (CurrentStatus)
{
case Status_USBNotReady:
LEDMask = (LEDS_LED1);
break;
case Status_USBEnumerating:
LEDMask = (LEDS_LED1 | LEDS_LED2);
break;
case Status_USBReady:
LEDMask = (LEDS_LED2);
break;
case Status_EnumerationError:
case Status_HardwareError:
LEDMask = (LEDS_LED1 | LEDS_LED3);
break;
}
/* Set the board LEDs to the new LED mask */
LEDs_SetAllLEDs(LEDMask);
} }
/** Task to set the configuration of the attached device after it has been enumerated, and to read in /** Task to set the configuration of the attached device after it has been enumerated, and to read in
* data received from the attached CDC device and print it to the serial port. * data received from the attached CDC device and print it to the serial port.
*/ */
TASK(USB_CDC_Host) void CDC_Host_Task(void)
{ {
uint8_t ErrorCode; uint8_t ErrorCode;
@ -200,7 +152,7 @@ TASK(USB_CDC_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error via status LEDs */ /* Indicate error via status LEDs */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);
@ -223,7 +175,7 @@ TASK(USB_CDC_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error via status LEDs */ /* Indicate error via status LEDs */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);

@ -43,12 +43,11 @@
#include <avr/power.h> #include <avr/power.h>
#include <stdio.h> #include <stdio.h>
#include <LUFA/Version.h> // Library Version Information #include <LUFA/Version.h>
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes #include <LUFA/Drivers/Misc/TerminalCodes.h>
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/Peripheral/SerialStream.h> // Serial stream driver #include <LUFA/Drivers/Peripheral/SerialStream.h>
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver #include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
#include "ConfigDescriptor.h" #include "ConfigDescriptor.h"
@ -62,27 +61,26 @@
/** Pipe number for the CDC notification pipe */ /** Pipe number for the CDC notification pipe */
#define CDC_NOTIFICATIONPIPE 3 #define CDC_NOTIFICATIONPIPE 3
/* Enums: */ /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
/** Enum for the possible status codes for passing to the UpdateStatus() function. */ #define LEDMASK_USB_NOTREADY LEDS_LED1
enum CDCHost_StatusCodes_t
{
Status_USBNotReady = 0, /**< USB is not ready (disconnected from a USB device) */
Status_USBEnumerating = 1, /**< USB interface is enumerating */
Status_USBReady = 2, /**< USB interface is connected and ready */
Status_EnumerationError = 3, /**< Software error while enumerating the attached USB device */
Status_HardwareError = 4, /**< Hardware error while enumerating the attached USB device */
};
/* Task Definitions: */ /** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */
TASK(USB_CDC_Host); #define LEDMASK_USB_ENUMERATING (LEDS_LED2 | LEDS_LED3)
/** LED mask for the library LED driver, to indicate that the USB interface is ready. */
#define LEDMASK_USB_READY (LEDS_LED2 | LEDS_LED4)
/** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
#define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3)
/* Function Prototypes: */ /* Function Prototypes: */
void SetupHardware(void);
void CDC_Host_Task(void);
void EVENT_USB_HostError(const uint8_t ErrorCode); void EVENT_USB_HostError(const uint8_t ErrorCode);
void EVENT_USB_DeviceAttached(void); void EVENT_USB_DeviceAttached(void);
void EVENT_USB_DeviceUnattached(void); void EVENT_USB_DeviceUnattached(void);
void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);
void EVENT_USB_DeviceEnumerationComplete(void); void EVENT_USB_DeviceEnumerationComplete(void);
void UpdateStatus(uint8_t CurrentStatus);
#endif #endif

@ -119,13 +119,12 @@ OBJDIR = .
# Path to the LUFA library # Path to the LUFA library
LUFA_PATH = ../../.. LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.) # List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \ SRC = $(TARGET).c \
ConfigDescriptor.c \ ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \
@ -138,7 +137,6 @@ SRC = $(TARGET).c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c \
# List C++ source files here. (C dependencies are automatically generated.) # List C++ source files here. (C dependencies are automatically generated.)

@ -36,18 +36,27 @@
#include "GenericHIDHost.h" #include "GenericHIDHost.h"
/* Scheduler Task List */
TASK_LIST
{
{ .Task = USB_USBTask , .TaskStatus = TASK_STOP },
{ .Task = USB_HID_Host , .TaskStatus = TASK_STOP },
};
/** Main program entry point. This routine configures the hardware required by the application, then /** Main program entry point. This routine configures the hardware required by the application, then
* starts the scheduler to run the application tasks. * starts the scheduler to run the application tasks.
*/ */
int main(void) int main(void)
{
SetupHardware();
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"Generic HID Host Demo running.\r\n" ESC_INVERSE_OFF));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
for (;;)
{
HID_Host_Task();
USB_USBTask();
}
}
/** Configures the board hardware and chip peripherals for the demo's functionality. */
void SetupHardware(void)
{ {
/* Disable watchdog if enabled by bootloader/fuses */ /* Disable watchdog if enabled by bootloader/fuses */
MCUSR &= ~(1 << WDRF); MCUSR &= ~(1 << WDRF);
@ -59,22 +68,7 @@ int main(void)
/* Hardware Initialization */ /* Hardware Initialization */
SerialStream_Init(9600, false); SerialStream_Init(9600, false);
LEDs_Init(); LEDs_Init();
/* Indicate USB not ready */
UpdateStatus(Status_USBNotReady);
/* Initialize Scheduler so that it can be used */
Scheduler_Init();
/* Initialize USB Subsystem */
USB_Init(); USB_Init();
/* Start-up message */
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"Generic HID Host Demo running.\r\n" ESC_INVERSE_OFF));
/* Scheduling - routine never returns, so put this last in the main function */
Scheduler_Start();
} }
/** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
@ -83,10 +77,7 @@ int main(void)
void EVENT_USB_DeviceAttached(void) void EVENT_USB_DeviceAttached(void)
{ {
puts_P(PSTR("Device Attached.\r\n")); puts_P(PSTR("Device Attached.\r\n"));
UpdateStatus(Status_USBEnumerating); LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
/* Start USB management task to enumerate the device */
Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);
} }
/** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and
@ -94,12 +85,8 @@ void EVENT_USB_DeviceAttached(void)
*/ */
void EVENT_USB_DeviceUnattached(void) void EVENT_USB_DeviceUnattached(void)
{ {
/* Stop HID and USB management task */
Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);
Scheduler_SetTaskMode(USB_HID_Host, TASK_STOP);
puts_P(PSTR("Device Unattached.\r\n")); puts_P(PSTR("Device Unattached.\r\n"));
UpdateStatus(Status_USBNotReady); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
} }
/** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully
@ -107,11 +94,7 @@ void EVENT_USB_DeviceUnattached(void)
*/ */
void EVENT_USB_DeviceEnumerationComplete(void) void EVENT_USB_DeviceEnumerationComplete(void)
{ {
/* Start HID Host task */ LEDs_SetAllLEDs(LEDMASK_USB_READY);
Scheduler_SetTaskMode(USB_HID_Host, TASK_RUN);
/* Indicate device enumeration complete */
UpdateStatus(Status_USBReady);
} }
/** 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. */
@ -122,7 +105,7 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n")); puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
UpdateStatus(Status_HardwareError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
for(;;); for(;;);
} }
@ -136,38 +119,7 @@ void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t Su
printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode); printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);
printf_P(PSTR(" -- In State %d\r\n"), USB_HostState); printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
}
/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to
* log to a serial port, or anything else that is suitable for status updates.
*
* \param CurrentStatus Current status of the system, from the GenericHIDHost_StatusCodes_t enum
*/
void UpdateStatus(uint8_t CurrentStatus)
{
uint8_t LEDMask = LEDS_NO_LEDS;
/* Set the LED mask to the appropriate LED mask based on the given status code */
switch (CurrentStatus)
{
case Status_USBNotReady:
LEDMask = (LEDS_LED1);
break;
case Status_USBEnumerating:
LEDMask = (LEDS_LED1 | LEDS_LED2);
break;
case Status_USBReady:
LEDMask = (LEDS_LED2);
break;
case Status_EnumerationError:
case Status_HardwareError:
LEDMask = (LEDS_LED1 | LEDS_LED3);
break;
}
/* Set the board LEDs to the new LED mask */
LEDs_SetAllLEDs(LEDMask);
} }
/** Reads in and processes the next report from the attached device, displaying the report /** Reads in and processes the next report from the attached device, displaying the report
@ -273,7 +225,7 @@ void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t Report
/** Task to set the configuration of the attached device after it has been enumerated, and to read and process /** Task to set the configuration of the attached device after it has been enumerated, and to read and process
* HID reports from the device and to send reports if desired. * HID reports from the device and to send reports if desired.
*/ */
TASK(USB_HID_Host) void HID_Host_Task(void)
{ {
uint8_t ErrorCode; uint8_t ErrorCode;
@ -301,7 +253,7 @@ TASK(USB_HID_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error status */ /* Indicate error status */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);
@ -324,7 +276,7 @@ TASK(USB_HID_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error status */ /* Indicate error status */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);

@ -44,12 +44,11 @@
#include <avr/power.h> #include <avr/power.h>
#include <stdio.h> #include <stdio.h>
#include <LUFA/Version.h> // Library Version Information #include <LUFA/Version.h>
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes #include <LUFA/Drivers/Misc/TerminalCodes.h>
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/Peripheral/SerialStream.h> // Serial stream driver #include <LUFA/Drivers/Peripheral/SerialStream.h>
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver #include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
#include "ConfigDescriptor.h" #include "ConfigDescriptor.h"
@ -69,28 +68,28 @@
/** HID Report type specifier, for feature reports to a device */ /** HID Report type specifier, for feature reports to a device */
#define HID_REPORTTYPE_FEATURE 0x03 #define HID_REPORTTYPE_FEATURE 0x03
/* Task Definitions: */ /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
TASK(USB_HID_Host); #define LEDMASK_USB_NOTREADY LEDS_LED1
/* Enums: */ /** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */
/** Enum for the possible status codes for passing to the UpdateStatus() function. */ #define LEDMASK_USB_ENUMERATING (LEDS_LED2 | LEDS_LED3)
enum GenricHIDHost_StatusCodes_t
{ /** LED mask for the library LED driver, to indicate that the USB interface is ready. */
Status_USBNotReady = 0, /**< USB is not ready (disconnected from a USB device) */ #define LEDMASK_USB_READY (LEDS_LED2 | LEDS_LED4)
Status_USBEnumerating = 1, /**< USB interface is enumerating */
Status_USBReady = 2, /**< USB interface is connected and ready */ /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
Status_EnumerationError = 3, /**< Software error while enumerating the attached USB device */ #define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3)
Status_HardwareError = 4, /**< Hardware error while enumerating the attached USB device */
};
/* Function Prototypes: */ /* Function Prototypes: */
void SetupHardware(void);
void HID_Host_Task(void);
void EVENT_USB_HostError(const uint8_t ErrorCode); void EVENT_USB_HostError(const uint8_t ErrorCode);
void EVENT_USB_DeviceAttached(void); void EVENT_USB_DeviceAttached(void);
void EVENT_USB_DeviceUnattached(void); void EVENT_USB_DeviceUnattached(void);
void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);
void EVENT_USB_DeviceEnumerationComplete(void); void EVENT_USB_DeviceEnumerationComplete(void);
void UpdateStatus(uint8_t CurrentStatus);
void ReadNextReport(void); void ReadNextReport(void);
void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t ReportType, uint16_t ReportLength); void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t ReportType, uint16_t ReportLength);

@ -119,13 +119,12 @@ OBJDIR = .
# Path to the LUFA library # Path to the LUFA library
LUFA_PATH = ../../.. LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.) # List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \ SRC = $(TARGET).c \
ConfigDescriptor.c \ ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \

@ -36,18 +36,27 @@
#include "KeyboardHost.h" #include "KeyboardHost.h"
/* Scheduler Task List */
TASK_LIST
{
{ .Task = USB_USBTask , .TaskStatus = TASK_STOP },
{ .Task = USB_Keyboard_Host , .TaskStatus = TASK_STOP },
};
/** Main program entry point. This routine configures the hardware required by the application, then /** Main program entry point. This routine configures the hardware required by the application, then
* starts the scheduler to run the application tasks. * starts the scheduler to run the application tasks.
*/ */
int main(void) int main(void)
{
SetupHardware();
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"Keyboard HID Host Demo running.\r\n" ESC_INVERSE_OFF));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
for (;;)
{
Keyboard_HID_Task();
USB_USBTask();
}
}
/** Configures the board hardware and chip peripherals for the demo's functionality. */
void SetupHardware(void)
{ {
/* Disable watchdog if enabled by bootloader/fuses */ /* Disable watchdog if enabled by bootloader/fuses */
MCUSR &= ~(1 << WDRF); MCUSR &= ~(1 << WDRF);
@ -59,22 +68,7 @@ int main(void)
/* Hardware Initialization */ /* Hardware Initialization */
SerialStream_Init(9600, false); SerialStream_Init(9600, false);
LEDs_Init(); LEDs_Init();
/* Indicate USB not ready */
UpdateStatus(Status_USBNotReady);
/* Initialize Scheduler so that it can be used */
Scheduler_Init();
/* Initialize USB Subsystem */
USB_Init(); USB_Init();
/* Start-up message */
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"Keyboard Host Demo running.\r\n" ESC_INVERSE_OFF));
/* Scheduling - routine never returns, so put this last in the main function */
Scheduler_Start();
} }
/** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
@ -83,10 +77,7 @@ int main(void)
void EVENT_USB_DeviceAttached(void) void EVENT_USB_DeviceAttached(void)
{ {
puts_P(PSTR("Device Attached.\r\n")); puts_P(PSTR("Device Attached.\r\n"));
UpdateStatus(Status_USBEnumerating); LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
/* Start USB management task to enumerate the device */
Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);
} }
/** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and
@ -94,12 +85,8 @@ void EVENT_USB_DeviceAttached(void)
*/ */
void EVENT_USB_DeviceUnattached(void) void EVENT_USB_DeviceUnattached(void)
{ {
/* Stop Keyboard and USB management task */
Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);
Scheduler_SetTaskMode(USB_Keyboard_Host, TASK_STOP);
puts_P(PSTR("Device Unattached.\r\n")); puts_P(PSTR("Device Unattached.\r\n"));
UpdateStatus(Status_USBNotReady); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
} }
/** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully
@ -107,11 +94,7 @@ void EVENT_USB_DeviceUnattached(void)
*/ */
void EVENT_USB_DeviceEnumerationComplete(void) void EVENT_USB_DeviceEnumerationComplete(void)
{ {
/* Start Keyboard Host task */ LEDs_SetAllLEDs(LEDMASK_USB_READY);
Scheduler_SetTaskMode(USB_Keyboard_Host, TASK_RUN);
/* Indicate device enumeration complete */
UpdateStatus(Status_USBReady);
} }
/** 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. */
@ -122,7 +105,7 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n")); puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
UpdateStatus(Status_HardwareError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
for(;;); for(;;);
} }
@ -136,38 +119,7 @@ void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t Su
printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode); printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);
printf_P(PSTR(" -- In State %d\r\n"), USB_HostState); printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
}
/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to
* log to a serial port, or anything else that is suitable for status updates.
*
* \param CurrentStatus Current status of the system, from the KeyboardHost_StatusCodes_t enum
*/
void UpdateStatus(uint8_t CurrentStatus)
{
uint8_t LEDMask = LEDS_NO_LEDS;
/* Set the LED mask to the appropriate LED mask based on the given status code */
switch (CurrentStatus)
{
case Status_USBNotReady:
LEDMask = (LEDS_LED1);
break;
case Status_USBEnumerating:
LEDMask = (LEDS_LED1 | LEDS_LED2);
break;
case Status_USBReady:
LEDMask = (LEDS_LED2);
break;
case Status_EnumerationError:
case Status_HardwareError:
LEDMask = (LEDS_LED1 | LEDS_LED3);
break;
}
/* Set the board LEDs to the new LED mask */
LEDs_SetAllLEDs(LEDMask);
} }
/** Reads in and processes the next report from the attached device, displaying the report /** Reads in and processes the next report from the attached device, displaying the report
@ -238,7 +190,7 @@ void ReadNextReport(void)
/** Task to set the configuration of the attached device after it has been enumerated, and to read and process /** Task to set the configuration of the attached device after it has been enumerated, and to read and process
* HID reports from the device and display the results onto the board LEDs. * HID reports from the device and display the results onto the board LEDs.
*/ */
TASK(USB_Keyboard_Host) void Keyboard_HID_Task(void)
{ {
uint8_t ErrorCode; uint8_t ErrorCode;
@ -265,7 +217,7 @@ TASK(USB_Keyboard_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error status */ /* Indicate error status */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);
@ -288,7 +240,7 @@ TASK(USB_Keyboard_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error status */ /* Indicate error status */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);
@ -315,7 +267,7 @@ TASK(USB_Keyboard_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error status */ /* Indicate error status */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);

@ -44,12 +44,11 @@
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <stdio.h> #include <stdio.h>
#include <LUFA/Version.h> // Library Version Information #include <LUFA/Version.h>
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes #include <LUFA/Drivers/Misc/TerminalCodes.h>
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/Peripheral/SerialStream.h> // Serial stream driver #include <LUFA/Drivers/Peripheral/SerialStream.h>
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver #include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
#include "ConfigDescriptor.h" #include "ConfigDescriptor.h"
@ -60,6 +59,18 @@
/** HID Class Specific request to set the report protocol mode */ /** HID Class Specific request to set the report protocol mode */
#define REQ_SetProtocol 0x0B #define REQ_SetProtocol 0x0B
/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
#define LEDMASK_USB_NOTREADY LEDS_LED1
/** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */
#define LEDMASK_USB_ENUMERATING (LEDS_LED2 | LEDS_LED3)
/** LED mask for the library LED driver, to indicate that the USB interface is ready. */
#define LEDMASK_USB_READY (LEDS_LED2 | LEDS_LED4)
/** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
#define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3)
/* Type Defines: */ /* Type Defines: */
/** Type define for a standard Boot Protocol Keyboard report */ /** Type define for a standard Boot Protocol Keyboard report */
typedef struct typedef struct
@ -69,28 +80,15 @@
uint8_t KeyCode; /**< Key code of the currently pressed key */ uint8_t KeyCode; /**< Key code of the currently pressed key */
} USB_KeyboardReport_Data_t; } USB_KeyboardReport_Data_t;
/* Enums: */
/** Enum for the possible status codes for passing to the UpdateStatus() function. */
enum KeyboardHost_StatusCodes_t
{
Status_USBNotReady = 0, /**< USB is not ready (disconnected from a USB device) */
Status_USBEnumerating = 1, /**< USB interface is enumerating */
Status_USBReady = 2, /**< USB interface is connected and ready */
Status_EnumerationError = 3, /**< Software error while enumerating the attached USB device */
Status_HardwareError = 4, /**< Hardware error while enumerating the attached USB device */
};
/* Task Definitions: */
TASK(USB_Keyboard_Host);
/* Function Prototypes: */ /* Function Prototypes: */
void Keyboard_HID_Task(void);
void EVENT_USB_HostError(const uint8_t ErrorCode); void EVENT_USB_HostError(const uint8_t ErrorCode);
void EVENT_USB_DeviceAttached(void); void EVENT_USB_DeviceAttached(void);
void EVENT_USB_DeviceUnattached(void); void EVENT_USB_DeviceUnattached(void);
void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);
void EVENT_USB_DeviceEnumerationComplete(void); void EVENT_USB_DeviceEnumerationComplete(void);
void UpdateStatus(uint8_t CurrentStatus);
void ReadNextReport(void); void ReadNextReport(void);
#endif #endif

@ -119,13 +119,12 @@ OBJDIR = .
# Path to the LUFA library # Path to the LUFA library
LUFA_PATH = ../../.. LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.) # List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \ SRC = $(TARGET).c \
ConfigDescriptor.c \ ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \
@ -138,7 +137,6 @@ SRC = $(TARGET).c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c \
# List C++ source files here. (C dependencies are automatically generated.) # List C++ source files here. (C dependencies are automatically generated.)

@ -37,7 +37,8 @@
#define _HID_REPORT_H_ #define _HID_REPORT_H_
/* Includes: */ /* Includes: */
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/USB/Class/Host/HIDParser.h>
#include "KeyboardHostWithParser.h" #include "KeyboardHostWithParser.h"

@ -36,18 +36,27 @@
#include "KeyboardHostWithParser.h" #include "KeyboardHostWithParser.h"
/* Scheduler Task List */
TASK_LIST
{
{ .Task = USB_USBTask , .TaskStatus = TASK_STOP },
{ .Task = USB_Keyboard_Host , .TaskStatus = TASK_STOP },
};
/** Main program entry point. This routine configures the hardware required by the application, then /** Main program entry point. This routine configures the hardware required by the application, then
* starts the scheduler to run the application tasks. * starts the scheduler to run the application tasks.
*/ */
int main(void) int main(void)
{
SetupHardware();
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"Keyboard HID Parser Host Demo running.\r\n" ESC_INVERSE_OFF));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
for (;;)
{
Keyboard_HID_Task();
USB_USBTask();
}
}
/** Configures the board hardware and chip peripherals for the demo's functionality. */
void SetupHardware(void)
{ {
/* Disable watchdog if enabled by bootloader/fuses */ /* Disable watchdog if enabled by bootloader/fuses */
MCUSR &= ~(1 << WDRF); MCUSR &= ~(1 << WDRF);
@ -59,22 +68,7 @@ int main(void)
/* Hardware Initialization */ /* Hardware Initialization */
SerialStream_Init(9600, false); SerialStream_Init(9600, false);
LEDs_Init(); LEDs_Init();
/* Indicate USB not ready */
UpdateStatus(Status_USBNotReady);
/* Initialize Scheduler so that it can be used */
Scheduler_Init();
/* Initialize USB Subsystem */
USB_Init(); USB_Init();
/* Start-up message */
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"Keyboard Host Demo running.\r\n" ESC_INVERSE_OFF));
/* Scheduling - routine never returns, so put this last in the main function */
Scheduler_Start();
} }
/** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
@ -83,10 +77,7 @@ int main(void)
void EVENT_USB_DeviceAttached(void) void EVENT_USB_DeviceAttached(void)
{ {
puts_P(PSTR("Device Attached.\r\n")); puts_P(PSTR("Device Attached.\r\n"));
UpdateStatus(Status_USBEnumerating); LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
/* Start USB management task to enumerate the device */
Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);
} }
/** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and
@ -94,12 +85,8 @@ void EVENT_USB_DeviceAttached(void)
*/ */
void EVENT_USB_DeviceUnattached(void) void EVENT_USB_DeviceUnattached(void)
{ {
/* Stop keyboard and USB management task */
Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);
Scheduler_SetTaskMode(USB_Keyboard_Host, TASK_STOP);
puts_P(PSTR("\r\nDevice Unattached.\r\n")); puts_P(PSTR("\r\nDevice Unattached.\r\n"));
UpdateStatus(Status_USBNotReady); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
} }
/** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully
@ -107,11 +94,7 @@ void EVENT_USB_DeviceUnattached(void)
*/ */
void EVENT_USB_DeviceEnumerationComplete(void) void EVENT_USB_DeviceEnumerationComplete(void)
{ {
/* Start Keyboard Host task */ LEDs_SetAllLEDs(LEDMASK_USB_READY);
Scheduler_SetTaskMode(USB_Keyboard_Host, TASK_RUN);
/* Indicate device enumeration complete */
UpdateStatus(Status_USBReady);
} }
/** 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. */
@ -122,7 +105,7 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n")); puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
UpdateStatus(Status_HardwareError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
for(;;); for(;;);
} }
@ -136,47 +119,13 @@ void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t Su
printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode); printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);
printf_P(PSTR(" -- In State %d\r\n"), USB_HostState); printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
}
/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to
* log to a serial port, or anything else that is suitable for status updates.
*
* \param CurrentStatus Current status of the system, from the KeyboardHostWithParser_StatusCodes_t enum
*/
void UpdateStatus(uint8_t CurrentStatus)
{
uint8_t LEDMask = LEDS_NO_LEDS;
/* Set the LED mask to the appropriate LED mask based on the given status code */
switch (CurrentStatus)
{
case Status_USBNotReady:
LEDMask = (LEDS_LED1);
break;
case Status_USBEnumerating:
LEDMask = (LEDS_LED1 | LEDS_LED2);
break;
case Status_USBReady:
LEDMask = (LEDS_LED2);
break;
case Status_EnumerationError:
case Status_HardwareError:
LEDMask = (LEDS_LED1 | LEDS_LED3);
break;
case Status_Busy:
LEDMask = (LEDS_LED1 | LEDS_LED4);
break;
}
/* Set the board LEDs to the new LED mask */
LEDs_SetAllLEDs(LEDMask);
} }
/** Task to set the configuration of the attached device after it has been enumerated, and to read and process /** Task to set the configuration of the attached device after it has been enumerated, and to read and process
* the HID report descriptor and HID reports from the device and display the results onto the board LEDs. * the HID report descriptor and HID reports from the device and display the results onto the board LEDs.
*/ */
TASK(USB_Keyboard_Host) void Keyboard_HID_Task(void)
{ {
uint8_t ErrorCode; uint8_t ErrorCode;
@ -203,7 +152,7 @@ TASK(USB_Keyboard_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error via status LEDs */ /* Indicate error via status LEDs */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);
@ -226,7 +175,7 @@ TASK(USB_Keyboard_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error via status LEDs */ /* Indicate error via status LEDs */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);
@ -235,9 +184,6 @@ TASK(USB_Keyboard_Host)
puts_P(PSTR("Processing HID Report.\r\n")); puts_P(PSTR("Processing HID Report.\r\n"));
/* LEDs one and two on to indicate busy processing */
UpdateStatus(Status_Busy);
/* Get and process the device's first HID report descriptor */ /* Get and process the device's first HID report descriptor */
if ((ErrorCode = GetHIDReportData()) != ParseSuccessful) if ((ErrorCode = GetHIDReportData()) != ParseSuccessful)
{ {
@ -245,16 +191,13 @@ TASK(USB_Keyboard_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error via status LEDs */ /* Indicate error via status LEDs */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);
break; break;
} }
/* All LEDs off - ready to indicate key presses */
UpdateStatus(Status_USBReady);
puts_P(PSTR("Keyboard Enumerated.\r\n")); puts_P(PSTR("Keyboard Enumerated.\r\n"));
USB_HostState = HOST_STATE_Ready; USB_HostState = HOST_STATE_Ready;

@ -38,12 +38,11 @@
#include <avr/power.h> #include <avr/power.h>
#include <stdio.h> #include <stdio.h>
#include <LUFA/Version.h> // Library Version Information #include <LUFA/Version.h>
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes #include <LUFA/Drivers/Misc/TerminalCodes.h>
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/Peripheral/SerialStream.h> // Serial stream driver #include <LUFA/Drivers/Peripheral/SerialStream.h>
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver #include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
#include "ConfigDescriptor.h" #include "ConfigDescriptor.h"
#include "HIDReport.h" #include "HIDReport.h"
@ -52,29 +51,28 @@
/** Pipe number for the keyboard report data pipe */ /** Pipe number for the keyboard report data pipe */
#define KEYBOARD_DATAPIPE 1 #define KEYBOARD_DATAPIPE 1
/* Enums: */ /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
/** Enum for the possible status codes for passing to the UpdateStatus() function. */ #define LEDMASK_USB_NOTREADY LEDS_LED1
enum KeyboardHostWithParser_StatusCodes_t
{ /** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */
Status_USBNotReady = 0, /**< USB is not ready (disconnected from a USB device) */ #define LEDMASK_USB_ENUMERATING (LEDS_LED2 | LEDS_LED3)
Status_USBEnumerating = 1, /**< USB interface is enumerating */
Status_USBReady = 2, /**< USB interface is connected and ready */ /** LED mask for the library LED driver, to indicate that the USB interface is ready. */
Status_EnumerationError = 3, /**< Software error while enumerating the attached USB device */ #define LEDMASK_USB_READY (LEDS_LED2 | LEDS_LED4)
Status_HardwareError = 4, /**< Hardware error while enumerating the attached USB device */
Status_Busy = 5, /**< Busy dumping HID report items to the serial port */ /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
}; #define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3)
/* Task Definitions: */
TASK(USB_Keyboard_Host);
/* Function Prototypes: */ /* Function Prototypes: */
void Keyboard_HID_Task(void);
void SetupHardware(void);
void EVENT_USB_HostError(const uint8_t ErrorCode); void EVENT_USB_HostError(const uint8_t ErrorCode);
void EVENT_USB_DeviceAttached(void); void EVENT_USB_DeviceAttached(void);
void EVENT_USB_DeviceUnattached(void); void EVENT_USB_DeviceUnattached(void);
void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);
void EVENT_USB_DeviceEnumerationComplete(void); void EVENT_USB_DeviceEnumerationComplete(void);
void UpdateStatus(uint8_t CurrentStatus);
void ProcessKeyboardReport(uint8_t* KeyboardReport); void ProcessKeyboardReport(uint8_t* KeyboardReport);
#endif #endif

@ -119,14 +119,13 @@ OBJDIR = .
# Path to the LUFA library # Path to the LUFA library
LUFA_PATH = ../../.. LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.) # List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \ SRC = $(TARGET).c \
ConfigDescriptor.c \ ConfigDescriptor.c \
HIDReport.c \ HIDReport.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \
@ -139,7 +138,7 @@ SRC = $(TARGET).c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c \ $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HIDParser.c \
# List C++ source files here. (C dependencies are automatically generated.) # List C++ source files here. (C dependencies are automatically generated.)

@ -119,10 +119,10 @@ static uint8_t MassStore_WaitForDataReceived(void)
while (!(Pipe_IsINReceived())) while (!(Pipe_IsINReceived()))
{ {
/* Check to see if a new frame has been issued (1ms elapsed) */ /* Check to see if a new frame has been issued (1ms elapsed) */
if (FrameElapsed) if (USB_INT_HasOccurred(USB_INT_HSOFI))
{ {
/* Clear the flag and decrement the timeout period counter */ /* Clear the flag and decrement the timeout period counter */
FrameElapsed = false; USB_INT_Clear(USB_INT_HSOFI);
TimeoutMSRem--; TimeoutMSRem--;
/* Check to see if the timeout period for the command has elapsed */ /* Check to see if the timeout period for the command has elapsed */

@ -36,13 +36,6 @@
#include "MassStorageHost.h" #include "MassStorageHost.h"
/* Scheduler Task List */
TASK_LIST
{
{ .Task = USB_USBTask , .TaskStatus = TASK_STOP },
{ .Task = USB_MassStore_Host , .TaskStatus = TASK_STOP },
};
/* Globals */ /* Globals */
/** Index of the highest available LUN (Logical Unit) in the attached Mass Storage Device */ /** Index of the highest available LUN (Logical Unit) in the attached Mass Storage Device */
uint8_t MassStore_MaxLUNIndex; uint8_t MassStore_MaxLUNIndex;
@ -52,6 +45,23 @@ uint8_t MassStore_MaxLUNIndex;
* starts the scheduler to run the application tasks. * starts the scheduler to run the application tasks.
*/ */
int main(void) int main(void)
{
SetupHardware();
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"Mass Storage Host Demo running.\r\n" ESC_INVERSE_OFF));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
for (;;)
{
MassStorage_Task();
USB_USBTask();
}
}
/** Configures the board hardware and chip peripherals for the demo's functionality. */
void SetupHardware(void)
{ {
/* Disable watchdog if enabled by bootloader/fuses */ /* Disable watchdog if enabled by bootloader/fuses */
MCUSR &= ~(1 << WDRF); MCUSR &= ~(1 << WDRF);
@ -64,22 +74,6 @@ int main(void)
SerialStream_Init(9600, false); SerialStream_Init(9600, false);
LEDs_Init(); LEDs_Init();
Buttons_Init(); Buttons_Init();
/* Indicate USB not ready */
UpdateStatus(Status_USBNotReady);
/* Start-up message */
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"MassStore Host Demo running.\r\n" ESC_INVERSE_OFF));
/* Initialize Scheduler so that it can be used */
Scheduler_Init();
/* Initialize USB Subsystem */
USB_Init();
/* Scheduling routine never returns, so put this last in the main function */
Scheduler_Start();
} }
/** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
@ -88,10 +82,7 @@ int main(void)
void EVENT_USB_DeviceAttached(void) void EVENT_USB_DeviceAttached(void)
{ {
puts_P(PSTR("Device Attached.\r\n")); puts_P(PSTR("Device Attached.\r\n"));
UpdateStatus(Status_USBEnumerating); LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
/* Start USB management task to enumerate the device */
Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);
} }
/** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and
@ -99,12 +90,8 @@ void EVENT_USB_DeviceAttached(void)
*/ */
void EVENT_USB_DeviceUnattached(void) void EVENT_USB_DeviceUnattached(void)
{ {
/* Stop USB management and Mass Storage tasks */
Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);
Scheduler_SetTaskMode(USB_MassStore_Host, TASK_STOP);
puts_P(PSTR("\r\nDevice Unattached.\r\n")); puts_P(PSTR("\r\nDevice Unattached.\r\n"));
UpdateStatus(Status_USBNotReady); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
} }
/** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully
@ -112,11 +99,7 @@ void EVENT_USB_DeviceUnattached(void)
*/ */
void EVENT_USB_DeviceEnumerationComplete(void) void EVENT_USB_DeviceEnumerationComplete(void)
{ {
/* Once device is fully enumerated, start the Mass Storage Host task */ LEDs_SetAllLEDs(LEDMASK_USB_READY);
Scheduler_SetTaskMode(USB_MassStore_Host, TASK_RUN);
/* Indicate device enumeration complete */
UpdateStatus(Status_USBReady);
} }
/** 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. */
@ -127,7 +110,7 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n")); puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
UpdateStatus(Status_HardwareError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
for(;;); for(;;);
} }
@ -141,13 +124,13 @@ void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t Su
printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode); printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);
printf_P(PSTR(" -- In State %d\r\n"), USB_HostState); printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
} }
/** Task to set the configuration of the attached device after it has been enumerated, and to read in blocks from /** Task to set the configuration of the attached device after it has been enumerated, and to read in blocks from
* the device and print them to the serial port. * the device and print them to the serial port.
*/ */
TASK(USB_MassStore_Host) void MassStorage_Task(void)
{ {
uint8_t ErrorCode; uint8_t ErrorCode;
@ -174,7 +157,7 @@ TASK(USB_MassStore_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error via status LEDs */ /* Indicate error via status LEDs */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);
@ -197,7 +180,7 @@ TASK(USB_MassStore_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error via status LEDs */ /* Indicate error via status LEDs */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);
@ -210,7 +193,7 @@ TASK(USB_MassStore_Host)
break; break;
case HOST_STATE_Ready: case HOST_STATE_Ready:
/* Indicate device busy via the status LEDs */ /* Indicate device busy via the status LEDs */
UpdateStatus(Status_Busy); LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
/* Send the request, display error and wait for device detach if request fails */ /* Send the request, display error and wait for device detach if request fails */
if ((ErrorCode = MassStore_GetMaxLUN(&MassStore_MaxLUNIndex)) != HOST_SENDCONTROL_Successful) if ((ErrorCode = MassStore_GetMaxLUN(&MassStore_MaxLUNIndex)) != HOST_SENDCONTROL_Successful)
@ -354,7 +337,7 @@ TASK(USB_MassStore_Host)
} }
/* Indicate device no longer busy */ /* Indicate device no longer busy */
UpdateStatus(Status_USBReady); LEDs_SetAllLEDs(LEDMASK_USB_READY);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);
@ -363,41 +346,6 @@ TASK(USB_MassStore_Host)
} }
} }
/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to
* log to a serial port, or anything else that is suitable for status updates.
*
* \param CurrentStatus Current status of the system, from the MassStorageHost_StatusCodes_t enum
*/
void UpdateStatus(uint8_t CurrentStatus)
{
uint8_t LEDMask = LEDS_NO_LEDS;
/* Set the LED mask to the appropriate LED mask based on the given status code */
switch (CurrentStatus)
{
case Status_USBNotReady:
LEDMask = (LEDS_LED1);
break;
case Status_USBEnumerating:
LEDMask = (LEDS_LED1 | LEDS_LED2);
break;
case Status_USBReady:
LEDMask = (LEDS_LED2);
break;
case Status_EnumerationError:
case Status_HardwareError:
case Status_SCSICommandError:
LEDMask = (LEDS_LED1 | LEDS_LED3);
break;
case Status_Busy:
LEDMask = (LEDS_LED1 | LEDS_LED4);
break;
}
/* Set the board LEDs to the new LED mask */
LEDs_SetAllLEDs(LEDMask);
}
/** Indicates that a communication error has occurred with the attached Mass Storage Device, /** Indicates that a communication error has occurred with the attached Mass Storage Device,
* printing error codes to the serial port and waiting until the device is removed before * printing error codes to the serial port and waiting until the device is removed before
* continuing. * continuing.
@ -424,7 +372,7 @@ void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t Erro
Pipe_Freeze(); Pipe_Freeze();
/* Indicate device error via the status LEDs */ /* Indicate device error via the status LEDs */
UpdateStatus(Status_SCSICommandError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);

@ -54,25 +54,27 @@
#include <LUFA/Drivers/Peripheral/SerialStream.h> // Serial stream driver #include <LUFA/Drivers/Peripheral/SerialStream.h> // Serial stream driver
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver #include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Drivers/Board/Buttons.h> // Board Buttons driver #include <LUFA/Drivers/Board/Buttons.h> // Board Buttons driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
/* Macros: */
/* Enums: */ /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
/** Enum for the possible status codes for passing to the UpdateStatus() function. */ #define LEDMASK_USB_NOTREADY LEDS_LED1
enum MassStorageHost_StatusCodes_t
{ /** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */
Status_USBNotReady = 0, /**< USB is not ready (disconnected from a USB device) */ #define LEDMASK_USB_ENUMERATING (LEDS_LED2 | LEDS_LED3)
Status_USBEnumerating = 1, /**< USB interface is enumerating */
Status_USBReady = 2, /**< USB interface is connected and ready */ /** LED mask for the library LED driver, to indicate that the USB interface is ready. */
Status_EnumerationError = 3, /**< Software error while enumerating the attached USB device */ #define LEDMASK_USB_READY (LEDS_LED2 | LEDS_LED4)
Status_HardwareError = 4, /**< Hardware error while enumerating the attached USB device */
Status_Busy = 5, /**< Busy reading or writing to the attached Mass Storage device */ /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
Status_SCSICommandError = 6, /**< Error sending or receiving a command to or from the attached SCSI device */ #define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3)
};
/** LED mask for the library LED driver, to indicate that the USB interface is busy. */
/* Task Definitions: */ #define LEDMASK_USB_BUSY (LEDS_LED2)
TASK(USB_MassStore_Host);
/* Function Prototypes: */ /* Function Prototypes: */
void MassStorage_Task(void);
void SetupHardware(void);
void EVENT_USB_HostError(const uint8_t ErrorCode); void EVENT_USB_HostError(const uint8_t ErrorCode);
void EVENT_USB_DeviceAttached(void); void EVENT_USB_DeviceAttached(void);
void EVENT_USB_DeviceUnattached(void); void EVENT_USB_DeviceUnattached(void);
@ -80,6 +82,5 @@
void EVENT_USB_DeviceEnumerationComplete(void); void EVENT_USB_DeviceEnumerationComplete(void);
void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t ErrorCode); void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t ErrorCode);
void UpdateStatus(uint8_t CurrentStatus);
#endif #endif

@ -119,14 +119,13 @@ OBJDIR = .
# Path to the LUFA library # Path to the LUFA library
LUFA_PATH = ../../.. LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.) # List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \ SRC = $(TARGET).c \
ConfigDescriptor.c \ ConfigDescriptor.c \
Lib/MassStoreCommands.c \ Lib/MassStoreCommands.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \
@ -139,7 +138,6 @@ SRC = $(TARGET).c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c \
# List C++ source files here. (C dependencies are automatically generated.) # List C++ source files here. (C dependencies are automatically generated.)

@ -36,18 +36,27 @@
#include "MouseHost.h" #include "MouseHost.h"
/* Scheduler Task List */
TASK_LIST
{
{ .Task = USB_USBTask , .TaskStatus = TASK_STOP },
{ .Task = USB_Mouse_Host , .TaskStatus = TASK_STOP },
};
/** Main program entry point. This routine configures the hardware required by the application, then /** Main program entry point. This routine configures the hardware required by the application, then
* starts the scheduler to run the application tasks. * starts the scheduler to run the application tasks.
*/ */
int main(void) int main(void)
{
SetupHardware();
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"Mouse HID Host Demo running.\r\n" ESC_INVERSE_OFF));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
for (;;)
{
Mouse_HID_Task();
USB_USBTask();
}
}
/** Configures the board hardware and chip peripherals for the demo's functionality. */
void SetupHardware(void)
{ {
/* Disable watchdog if enabled by bootloader/fuses */ /* Disable watchdog if enabled by bootloader/fuses */
MCUSR &= ~(1 << WDRF); MCUSR &= ~(1 << WDRF);
@ -59,22 +68,7 @@ int main(void)
/* Hardware Initialization */ /* Hardware Initialization */
SerialStream_Init(9600, false); SerialStream_Init(9600, false);
LEDs_Init(); LEDs_Init();
/* Indicate USB not ready */
UpdateStatus(Status_USBNotReady);
/* Initialize Scheduler so that it can be used */
Scheduler_Init();
/* Initialize USB Subsystem */
USB_Init(); USB_Init();
/* Start-up message */
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"Mouse Host Demo running.\r\n" ESC_INVERSE_OFF));
/* Scheduling - routine never returns, so put this last in the main function */
Scheduler_Start();
} }
/** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
@ -83,10 +77,7 @@ int main(void)
void EVENT_USB_DeviceAttached(void) void EVENT_USB_DeviceAttached(void)
{ {
puts_P(PSTR("Device Attached.\r\n")); puts_P(PSTR("Device Attached.\r\n"));
UpdateStatus(Status_USBEnumerating); LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
/* Start USB management task to enumerate the device */
Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);
} }
/** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and
@ -94,12 +85,8 @@ void EVENT_USB_DeviceAttached(void)
*/ */
void EVENT_USB_DeviceUnattached(void) void EVENT_USB_DeviceUnattached(void)
{ {
/* Stop mouse and USB management task */
Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);
Scheduler_SetTaskMode(USB_Mouse_Host, TASK_STOP);
puts_P(PSTR("Device Unattached.\r\n")); puts_P(PSTR("Device Unattached.\r\n"));
UpdateStatus(Status_USBNotReady); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
} }
/** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully
@ -107,11 +94,7 @@ void EVENT_USB_DeviceUnattached(void)
*/ */
void EVENT_USB_DeviceEnumerationComplete(void) void EVENT_USB_DeviceEnumerationComplete(void)
{ {
/* Start Mouse Host task */ LEDs_SetAllLEDs(LEDMASK_USB_READY);
Scheduler_SetTaskMode(USB_Mouse_Host, TASK_RUN);
/* Indicate device enumeration complete */
UpdateStatus(Status_USBReady);
} }
/** 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. */
@ -122,7 +105,7 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n")); puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
UpdateStatus(Status_HardwareError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
for(;;); for(;;);
} }
@ -136,38 +119,7 @@ void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t Su
printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode); printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);
printf_P(PSTR(" -- In State %d\r\n"), USB_HostState); printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
}
/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to
* log to a serial port, or anything else that is suitable for status updates.
*
* \param CurrentStatus Current status of the system, from the MouseHost_StatusCodes_t enum
*/
void UpdateStatus(uint8_t CurrentStatus)
{
uint8_t LEDMask = LEDS_NO_LEDS;
/* Set the LED mask to the appropriate LED mask based on the given status code */
switch (CurrentStatus)
{
case Status_USBNotReady:
LEDMask = (LEDS_LED1);
break;
case Status_USBEnumerating:
LEDMask = (LEDS_LED1 | LEDS_LED2);
break;
case Status_USBReady:
LEDMask = (LEDS_LED2);
break;
case Status_EnumerationError:
case Status_HardwareError:
LEDMask = (LEDS_LED1 | LEDS_LED3);
break;
}
/* Set the board LEDs to the new LED mask */
LEDs_SetAllLEDs(LEDMask);
} }
/** Reads in and processes the next report from the attached device, displaying the report /** Reads in and processes the next report from the attached device, displaying the report
@ -233,7 +185,7 @@ void ReadNextReport(void)
/** Task to set the configuration of the attached device after it has been enumerated, and to read and process /** Task to set the configuration of the attached device after it has been enumerated, and to read and process
* HID reports from the device and display the results onto the board LEDs. * HID reports from the device and display the results onto the board LEDs.
*/ */
TASK(USB_Mouse_Host) void Mouse_HID_Task(void)
{ {
uint8_t ErrorCode; uint8_t ErrorCode;
@ -261,7 +213,7 @@ TASK(USB_Mouse_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error status */ /* Indicate error status */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);
@ -284,7 +236,7 @@ TASK(USB_Mouse_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error status */ /* Indicate error status */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);
@ -311,7 +263,7 @@ TASK(USB_Mouse_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error status */ /* Indicate error status */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);

@ -44,12 +44,11 @@
#include <avr/power.h> #include <avr/power.h>
#include <stdio.h> #include <stdio.h>
#include <LUFA/Version.h> // Library Version Information #include <LUFA/Version.h>
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes #include <LUFA/Drivers/Misc/TerminalCodes.h>
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/Peripheral/SerialStream.h> // Serial stream driver #include <LUFA/Drivers/Peripheral/SerialStream.h>
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver #include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
#include "ConfigDescriptor.h" #include "ConfigDescriptor.h"
@ -60,6 +59,18 @@
/** HID Class Specific request to set the report protocol mode */ /** HID Class Specific request to set the report protocol mode */
#define REQ_SetProtocol 0x0B #define REQ_SetProtocol 0x0B
/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
#define LEDMASK_USB_NOTREADY LEDS_LED1
/** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */
#define LEDMASK_USB_ENUMERATING (LEDS_LED2 | LEDS_LED3)
/** LED mask for the library LED driver, to indicate that the USB interface is ready. */
#define LEDMASK_USB_READY (LEDS_LED2 | LEDS_LED4)
/** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
#define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3)
/* Type Defines: */ /* Type Defines: */
/** Type define for a standard Boot Protocol Mouse report */ /** Type define for a standard Boot Protocol Mouse report */
typedef struct typedef struct
@ -69,28 +80,16 @@
int8_t Y; /**< Current delta Y movement on the mouse */ int8_t Y; /**< Current delta Y movement on the mouse */
} USB_MouseReport_Data_t; } USB_MouseReport_Data_t;
/* Task Definitions: */
TASK(USB_Mouse_Host);
/* Enums: */
/** Enum for the possible status codes for passing to the UpdateStatus() function. */
enum MouseHost_StatusCodes_t
{
Status_USBNotReady = 0, /**< USB is not ready (disconnected from a USB device) */
Status_USBEnumerating = 1, /**< USB interface is enumerating */
Status_USBReady = 2, /**< USB interface is connected and ready */
Status_EnumerationError = 3, /**< Software error while enumerating the attached USB device */
Status_HardwareError = 4, /**< Hardware error while enumerating the attached USB device */
};
/* Function Prototypes: */ /* Function Prototypes: */
void Mouse_HID_Task(void);
void SetupHardware(void);
void EVENT_USB_HostError(const uint8_t ErrorCode); void EVENT_USB_HostError(const uint8_t ErrorCode);
void EVENT_USB_DeviceAttached(void); void EVENT_USB_DeviceAttached(void);
void EVENT_USB_DeviceUnattached(void); void EVENT_USB_DeviceUnattached(void);
void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);
void EVENT_USB_DeviceEnumerationComplete(void); void EVENT_USB_DeviceEnumerationComplete(void);
void UpdateStatus(uint8_t CurrentStatus);
void ReadNextReport(void); void ReadNextReport(void);
#endif #endif

@ -119,13 +119,12 @@ OBJDIR = .
# Path to the LUFA library # Path to the LUFA library
LUFA_PATH = ../../.. LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.) # List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \ SRC = $(TARGET).c \
ConfigDescriptor.c \ ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \
@ -138,7 +137,6 @@ SRC = $(TARGET).c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c \
# List C++ source files here. (C dependencies are automatically generated.) # List C++ source files here. (C dependencies are automatically generated.)

@ -37,7 +37,8 @@
#define _HID_REPORT_H_ #define _HID_REPORT_H_
/* Includes: */ /* Includes: */
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/USB/Class/Host/HIDParser.h>
#include "MouseHostWithParser.h" #include "MouseHostWithParser.h"

@ -36,18 +36,27 @@
#include "MouseHostWithParser.h" #include "MouseHostWithParser.h"
/* Scheduler Task List */
TASK_LIST
{
{ .Task = USB_USBTask , .TaskStatus = TASK_STOP },
{ .Task = USB_Mouse_Host , .TaskStatus = TASK_STOP },
};
/** Main program entry point. This routine configures the hardware required by the application, then /** Main program entry point. This routine configures the hardware required by the application, then
* starts the scheduler to run the application tasks. * starts the scheduler to run the application tasks.
*/ */
int main(void) int main(void)
{
SetupHardware();
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"Mouse HID Parser Host Demo running.\r\n" ESC_INVERSE_OFF));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
for (;;)
{
Mouse_HID_Task();
USB_USBTask();
}
}
/** Configures the board hardware and chip peripherals for the demo's functionality. */
void SetupHardware(void)
{ {
/* Disable watchdog if enabled by bootloader/fuses */ /* Disable watchdog if enabled by bootloader/fuses */
MCUSR &= ~(1 << WDRF); MCUSR &= ~(1 << WDRF);
@ -59,22 +68,7 @@ int main(void)
/* Hardware Initialization */ /* Hardware Initialization */
SerialStream_Init(9600, false); SerialStream_Init(9600, false);
LEDs_Init(); LEDs_Init();
/* Indicate USB not ready */
UpdateStatus(Status_USBNotReady);
/* Initialize Scheduler so that it can be used */
Scheduler_Init();
/* Initialize USB Subsystem */
USB_Init(); USB_Init();
/* Start-up message */
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"Mouse Host Demo running.\r\n" ESC_INVERSE_OFF));
/* Scheduling - routine never returns, so put this last in the main function */
Scheduler_Start();
} }
/** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
@ -83,10 +77,7 @@ int main(void)
void EVENT_USB_DeviceAttached(void) void EVENT_USB_DeviceAttached(void)
{ {
puts_P(PSTR("Device Attached.\r\n")); puts_P(PSTR("Device Attached.\r\n"));
UpdateStatus(Status_USBEnumerating); LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
/* Start USB management task to enumerate the device */
Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);
} }
/** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and
@ -94,12 +85,8 @@ void EVENT_USB_DeviceAttached(void)
*/ */
void EVENT_USB_DeviceUnattached(void) void EVENT_USB_DeviceUnattached(void)
{ {
/* Stop mouse and USB management task */
Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);
Scheduler_SetTaskMode(USB_Mouse_Host, TASK_STOP);
puts_P(PSTR("Device Unattached.\r\n")); puts_P(PSTR("Device Unattached.\r\n"));
UpdateStatus(Status_USBNotReady); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
} }
/** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully
@ -107,11 +94,7 @@ void EVENT_USB_DeviceUnattached(void)
*/ */
void EVENT_USB_DeviceEnumerationComplete(void) void EVENT_USB_DeviceEnumerationComplete(void)
{ {
/* Start Mouse Host task */ LEDs_SetAllLEDs(LEDMASK_USB_READY);
Scheduler_SetTaskMode(USB_Mouse_Host, TASK_RUN);
/* Indicate device enumeration complete */
UpdateStatus(Status_USBReady);
} }
/** 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. */
@ -122,7 +105,7 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n")); puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
UpdateStatus(Status_HardwareError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
for(;;); for(;;);
} }
@ -136,47 +119,13 @@ void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t Su
printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode); printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);
printf_P(PSTR(" -- In State %d\r\n"), USB_HostState); printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
}
/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to
* log to a serial port, or anything else that is suitable for status updates.
*
* \param CurrentStatus Current status of the system, from the MouseHostWithParser_StatusCodes_t enum
*/
void UpdateStatus(uint8_t CurrentStatus)
{
uint8_t LEDMask = LEDS_NO_LEDS;
/* Set the LED mask to the appropriate LED mask based on the given status code */
switch (CurrentStatus)
{
case Status_USBNotReady:
LEDMask = (LEDS_LED1);
break;
case Status_USBEnumerating:
LEDMask = (LEDS_LED1 | LEDS_LED2);
break;
case Status_USBReady:
LEDMask = (LEDS_LED2);
break;
case Status_EnumerationError:
case Status_HardwareError:
LEDMask = (LEDS_LED1 | LEDS_LED3);
break;
case Status_Busy:
LEDMask = (LEDS_LED1 | LEDS_LED4);
break;
}
/* Set the board LEDs to the new LED mask */
LEDs_SetAllLEDs(LEDMask);
} }
/** Task to set the configuration of the attached device after it has been enumerated, and to read and process /** Task to set the configuration of the attached device after it has been enumerated, and to read and process
* the HID report descriptor and HID reports from the device and display the results onto the board LEDs. * the HID report descriptor and HID reports from the device and display the results onto the board LEDs.
*/ */
TASK(USB_Mouse_Host) void Mouse_HID_Task(void)
{ {
uint8_t ErrorCode; uint8_t ErrorCode;
@ -204,7 +153,7 @@ TASK(USB_Mouse_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error via status LEDs */ /* Indicate error via status LEDs */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);
@ -227,7 +176,7 @@ TASK(USB_Mouse_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error via status LEDs */ /* Indicate error via status LEDs */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);
@ -236,9 +185,6 @@ TASK(USB_Mouse_Host)
puts_P(PSTR("Processing HID Report.\r\n")); puts_P(PSTR("Processing HID Report.\r\n"));
/* LEDs one and two on to indicate busy processing */
UpdateStatus(Status_Busy);
/* Get and process the device's first HID report descriptor */ /* Get and process the device's first HID report descriptor */
if ((ErrorCode = GetHIDReportData()) != ParseSuccessful) if ((ErrorCode = GetHIDReportData()) != ParseSuccessful)
{ {
@ -246,16 +192,13 @@ TASK(USB_Mouse_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error via status LEDs */ /* Indicate error via status LEDs */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);
break; break;
} }
/* All LEDs off - ready to indicate key presses */
UpdateStatus(Status_USBReady);
puts_P(PSTR("Mouse Enumerated.\r\n")); puts_P(PSTR("Mouse Enumerated.\r\n"));
USB_HostState = HOST_STATE_Ready; USB_HostState = HOST_STATE_Ready;

@ -38,12 +38,11 @@
#include <avr/power.h> #include <avr/power.h>
#include <stdio.h> #include <stdio.h>
#include <LUFA/Version.h> // Library Version Information #include <LUFA/Version.h>
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes #include <LUFA/Drivers/Misc/TerminalCodes.h>
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/Peripheral/SerialStream.h> // Serial stream driver #include <LUFA/Drivers/Peripheral/SerialStream.h>
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver #include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
#include "ConfigDescriptor.h" #include "ConfigDescriptor.h"
#include "HIDReport.h" #include "HIDReport.h"
@ -52,29 +51,28 @@
/** Pipe number for the mouse report data pipe */ /** Pipe number for the mouse report data pipe */
#define MOUSE_DATAPIPE 1 #define MOUSE_DATAPIPE 1
/* Enums: */ /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
/** Enum for the possible status codes for passing to the UpdateStatus() function. */ #define LEDMASK_USB_NOTREADY LEDS_LED1
enum MouseHostWithParser_StatusCodes_t
{ /** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */
Status_USBNotReady = 0, /**< USB is not ready (disconnected from a USB device) */ #define LEDMASK_USB_ENUMERATING (LEDS_LED2 | LEDS_LED3)
Status_USBEnumerating = 1, /**< USB interface is enumerating */
Status_USBReady = 2, /**< USB interface is connected and ready */ /** LED mask for the library LED driver, to indicate that the USB interface is ready. */
Status_EnumerationError = 3, /**< Software error while enumerating the attached USB device */ #define LEDMASK_USB_READY (LEDS_LED2 | LEDS_LED4)
Status_HardwareError = 4, /**< Hardware error while enumerating the attached USB device */
Status_Busy = 5, /**< Busy dumping HID report items to the serial port */ /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
}; #define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3)
/* Task Definitions: */
TASK(USB_Mouse_Host);
/* Function Prototypes: */ /* Function Prototypes: */
void Mouse_HID_Task(void);
void SetupHardware(void);
void EVENT_USB_HostError(const uint8_t ErrorCode); void EVENT_USB_HostError(const uint8_t ErrorCode);
void EVENT_USB_DeviceAttached(void); void EVENT_USB_DeviceAttached(void);
void EVENT_USB_DeviceUnattached(void); void EVENT_USB_DeviceUnattached(void);
void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);
void EVENT_USB_DeviceEnumerationComplete(void); void EVENT_USB_DeviceEnumerationComplete(void);
void UpdateStatus(uint8_t CurrentStatus);
void ProcessMouseReport(uint8_t* MouseReport); void ProcessMouseReport(uint8_t* MouseReport);
#endif #endif

@ -119,14 +119,13 @@ OBJDIR = .
# Path to the LUFA library # Path to the LUFA library
LUFA_PATH = ../../.. LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.) # List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \ SRC = $(TARGET).c \
ConfigDescriptor.c \ ConfigDescriptor.c \
HIDReport.c \ HIDReport.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \
@ -139,7 +138,7 @@ SRC = $(TARGET).c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c \ $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HIDParser.c \
# List C++ source files here. (C dependencies are automatically generated.) # List C++ source files here. (C dependencies are automatically generated.)

@ -109,10 +109,10 @@ uint8_t SImage_RecieveBlockHeader(void)
while (!(Pipe_IsReadWriteAllowed())) while (!(Pipe_IsReadWriteAllowed()))
{ {
/* Check to see if a new frame has been issued (1ms elapsed) */ /* Check to see if a new frame has been issued (1ms elapsed) */
if (FrameElapsed) if (USB_INT_HasOccurred(USB_INT_HSOFI))
{ {
/* Clear the flag and decrement the timeout period counter */ /* Clear the flag and decrement the timeout period counter */
FrameElapsed = false; USB_INT_Clear(USB_INT_HSOFI);
TimeoutMSRem--; TimeoutMSRem--;
/* Check to see if the timeout period for the command has elapsed */ /* Check to see if the timeout period for the command has elapsed */

@ -36,18 +36,27 @@
#include "StillImageHost.h" #include "StillImageHost.h"
/* Scheduler Task List */
TASK_LIST
{
{ .Task = USB_USBTask , .TaskStatus = TASK_STOP },
{ .Task = USB_SImage_Host , .TaskStatus = TASK_STOP },
};
/** Main program entry point. This routine configures the hardware required by the application, then /** Main program entry point. This routine configures the hardware required by the application, then
* starts the scheduler to run the application tasks. * starts the scheduler to run the application tasks.
*/ */
int main(void) int main(void)
{
SetupHardware();
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"Still Image Host Demo running.\r\n" ESC_INVERSE_OFF));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
for (;;)
{
StillImage_Task();
USB_USBTask();
}
}
/** Configures the board hardware and chip peripherals for the demo's functionality. */
void SetupHardware(void)
{ {
/* Disable watchdog if enabled by bootloader/fuses */ /* Disable watchdog if enabled by bootloader/fuses */
MCUSR &= ~(1 << WDRF); MCUSR &= ~(1 << WDRF);
@ -60,22 +69,7 @@ int main(void)
/* Hardware Initialization */ /* Hardware Initialization */
SerialStream_Init(9600, false); SerialStream_Init(9600, false);
LEDs_Init(); LEDs_Init();
/* Indicate USB not ready */
UpdateStatus(Status_USBNotReady);
/* Initialize Scheduler so that it can be used */
Scheduler_Init();
/* Initialize USB Subsystem */
USB_Init(); USB_Init();
/* Start-up message */
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"Still Image Host Demo running.\r\n" ESC_INVERSE_OFF));
/* Scheduling - routine never returns, so put this last in the main function */
Scheduler_Start();
} }
/** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
@ -84,10 +78,7 @@ int main(void)
void EVENT_USB_DeviceAttached(void) void EVENT_USB_DeviceAttached(void)
{ {
puts_P(PSTR("Device Attached.\r\n")); puts_P(PSTR("Device Attached.\r\n"));
UpdateStatus(Status_USBEnumerating); LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
/* Start USB management task to enumerate the device */
Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);
} }
/** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and
@ -95,12 +86,8 @@ void EVENT_USB_DeviceAttached(void)
*/ */
void EVENT_USB_DeviceUnattached(void) void EVENT_USB_DeviceUnattached(void)
{ {
/* Stop USB management and Still Image tasks */
Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);
Scheduler_SetTaskMode(USB_SImage_Host, TASK_STOP);
puts_P(PSTR("\r\nDevice Unattached.\r\n")); puts_P(PSTR("\r\nDevice Unattached.\r\n"));
UpdateStatus(Status_USBNotReady); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
} }
/** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully
@ -108,11 +95,7 @@ void EVENT_USB_DeviceUnattached(void)
*/ */
void EVENT_USB_DeviceEnumerationComplete(void) void EVENT_USB_DeviceEnumerationComplete(void)
{ {
/* Once device is fully enumerated, start the Still Image Host task */ LEDs_SetAllLEDs(LEDMASK_USB_READY);
Scheduler_SetTaskMode(USB_SImage_Host, TASK_RUN);
/* Indicate device enumeration complete */
UpdateStatus(Status_USBReady);
} }
/** 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. */
@ -123,7 +106,7 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n")); puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
UpdateStatus(Status_HardwareError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
for(;;); for(;;);
} }
@ -137,13 +120,13 @@ void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t Su
printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode); printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);
printf_P(PSTR(" -- In State %d\r\n"), USB_HostState); printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
} }
/** Task to set the configuration of the attached device after it has been enumerated, and to print device information /** Task to set the configuration of the attached device after it has been enumerated, and to print device information
* through the serial port. * through the serial port.
*/ */
TASK(USB_SImage_Host) void StillImage_Task(void)
{ {
uint8_t ErrorCode; uint8_t ErrorCode;
@ -169,7 +152,7 @@ TASK(USB_SImage_Host)
puts_P(PSTR("Control error.\r\n")); puts_P(PSTR("Control error.\r\n"));
/* Indicate error via status LEDs */ /* Indicate error via status LEDs */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);
@ -192,7 +175,7 @@ TASK(USB_SImage_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error via status LEDs */ /* Indicate error via status LEDs */
UpdateStatus(Status_EnumerationError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);
@ -205,7 +188,7 @@ TASK(USB_SImage_Host)
break; break;
case HOST_STATE_Ready: case HOST_STATE_Ready:
/* Indicate device busy via the status LEDs */ /* Indicate device busy via the status LEDs */
UpdateStatus(Status_Busy); LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
puts_P(PSTR("Retrieving Device Info...\r\n")); puts_P(PSTR("Retrieving Device Info...\r\n"));
@ -345,7 +328,7 @@ TASK(USB_SImage_Host)
puts_P(PSTR("Done.\r\n")); puts_P(PSTR("Done.\r\n"));
/* Indicate device no longer busy */ /* Indicate device no longer busy */
UpdateStatus(Status_USBReady); LEDs_SetAllLEDs(LEDMASK_USB_READY);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);
@ -379,41 +362,6 @@ void UnicodeToASCII(uint8_t* UnicodeString, char* Buffer)
*Buffer = 0; *Buffer = 0;
} }
/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to
* log to a serial port, or anything else that is suitable for status updates.
*
* \param CurrentStatus Current status of the system, from the StillImageHost_StatusCodes_t enum
*/
void UpdateStatus(uint8_t CurrentStatus)
{
uint8_t LEDMask = LEDS_NO_LEDS;
/* Set the LED mask to the appropriate LED mask based on the given status code */
switch (CurrentStatus)
{
case Status_USBNotReady:
LEDMask = (LEDS_LED1);
break;
case Status_USBEnumerating:
LEDMask = (LEDS_LED1 | LEDS_LED2);
break;
case Status_USBReady:
LEDMask = (LEDS_LED2);
break;
case Status_EnumerationError:
case Status_HardwareError:
case Status_PIMACommandError:
LEDMask = (LEDS_LED1 | LEDS_LED3);
break;
case Status_Busy:
LEDMask = (LEDS_LED1 | LEDS_LED3 | LEDS_LED4);
break;
}
/* Set the board LEDs to the new LED mask */
LEDs_SetAllLEDs(LEDMask);
}
/** Displays a PIMA command error via the device's serial port. /** Displays a PIMA command error via the device's serial port.
* *
* \param ErrorCode Error code of the function which failed to complete successfully * \param ErrorCode Error code of the function which failed to complete successfully
@ -427,7 +375,7 @@ void ShowCommandError(uint8_t ErrorCode, bool ResponseCodeError)
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
/* Indicate error via status LEDs */ /* Indicate error via status LEDs */
UpdateStatus(Status_PIMACommandError); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */ /* Wait until USB device disconnected */
while (USB_IsConnected); while (USB_IsConnected);

@ -47,29 +47,31 @@
#include "Lib/PIMACodes.h" #include "Lib/PIMACodes.h"
#include "Lib/StillImageCommands.h" #include "Lib/StillImageCommands.h"
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes #include <LUFA/Drivers/Misc/TerminalCodes.h>
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/Peripheral/SerialStream.h> // Serial stream driver #include <LUFA/Drivers/Peripheral/SerialStream.h>
#include <LUFA/Drivers/Board/LEDs.h> // LED driver #include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
/* Macros: */
/* Enums: */ /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
/** Enum for the possible status codes for passing to the UpdateStatus() function. */ #define LEDMASK_USB_NOTREADY LEDS_LED1
enum StillImageHost_StatusCodes_t
{ /** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */
Status_USBNotReady = 0, /**< USB is not ready (disconnected from a USB device) */ #define LEDMASK_USB_ENUMERATING (LEDS_LED2 | LEDS_LED3)
Status_USBEnumerating = 1, /**< USB interface is enumerating */
Status_USBReady = 2, /**< USB interface is connected and ready */ /** LED mask for the library LED driver, to indicate that the USB interface is ready. */
Status_EnumerationError = 3, /**< Software error while enumerating the attached USB device */ #define LEDMASK_USB_READY (LEDS_LED2 | LEDS_LED4)
Status_HardwareError = 4, /**< Hardware error while enumerating the attached USB device */
Status_Busy = 5, /**< Busy reading or writing to the attached Still Image device */ /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
Status_PIMACommandError = 6, /**< Error while sending or receiving a PIM command to the attached device */ #define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3)
};
/** LED mask for the library LED driver, to indicate that the USB interface is busy. */
/* Task Definitions: */ #define LEDMASK_USB_BUSY (LEDS_LED2)
TASK(USB_SImage_Host);
/* Function Prototypes: */ /* Function Prototypes: */
void StillImage_Task(void);
void SetupHardware(void);
void EVENT_USB_HostError(const uint8_t ErrorCode); void EVENT_USB_HostError(const uint8_t ErrorCode);
void EVENT_USB_DeviceAttached(void); void EVENT_USB_DeviceAttached(void);
void EVENT_USB_DeviceUnattached(void); void EVENT_USB_DeviceUnattached(void);
@ -78,6 +80,5 @@
void UnicodeToASCII(uint8_t* restrict UnicodeString, char* restrict Buffer); void UnicodeToASCII(uint8_t* restrict UnicodeString, char* restrict Buffer);
void ShowCommandError(uint8_t ErrorCode, bool ResponseCodeError); void ShowCommandError(uint8_t ErrorCode, bool ResponseCodeError);
void UpdateStatus(uint8_t CurrentStatus);
#endif #endif

@ -118,14 +118,13 @@ OBJDIR = .
# Path to the LUFA library # Path to the LUFA library
LUFA_PATH = ../../.. LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.) # List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \ SRC = $(TARGET).c \
ConfigDescriptor.c \ ConfigDescriptor.c \
Lib/StillImageCommands.c \ Lib/StillImageCommands.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \
@ -138,7 +137,6 @@ SRC = $(TARGET).c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c \
# List C++ source files here. (C dependencies are automatically generated.) # List C++ source files here. (C dependencies are automatically generated.)

@ -5,13 +5,14 @@
*/ */
========== TODO: =========== ========== TODO: ===========
- Fix bootloaders - make compatible with smaller USB AVRS (USB_IsConnected, RAMPZ) - Fix bootloaders - make compatible with smaller USB AVRS (USB_IsConnected)
- Document new device class drivers - Document new device class drivers
- Made new host class drivers - Made new host class drivers
- Document new host class drivers - Document new host class drivers
- Convert Host mode demos to class drivers - Convert Host mode demos to class drivers
- Convert Host mode demos to schedulerless - Convert Host mode demos to schedulerless
- Add standardized descriptor names to class driver structures, controlled by USE_NONSTANDARD_DESCRIPTOR_NAMES - Add standardized descriptor names to class driver structures, controlled by USE_NONSTANDARD_DESCRIPTOR_NAMES
- Device demos error if endpoint config fail
============================ ============================
/** \page Page_ChangeLog Project Changelog /** \page Page_ChangeLog Project Changelog
@ -20,6 +21,8 @@
* *
* - Removed psuedo-scheduler, dynamic memory block allocator from the library (no longer needed and not used respectively) * - Removed psuedo-scheduler, dynamic memory block allocator from the library (no longer needed and not used respectively)
* - Added new class drivers and matching demos to the library for rapid application development * - Added new class drivers and matching demos to the library for rapid application development
* - Added incomplete device and host mode demos for later enhancement
* - Changed bootloaders to use FLASHEND rather than the existence of RAMPZ to determine if far FLASH pointers are needed
* *
* *
* \section Sec_ChangeLog090605 Version 090605 * \section Sec_ChangeLog090605 Version 090605

@ -98,9 +98,9 @@ uint8_t Endpoint_WaitUntilReady(void)
else if (Endpoint_IsStalled()) else if (Endpoint_IsStalled())
return ENDPOINT_READYWAIT_EndpointStalled; return ENDPOINT_READYWAIT_EndpointStalled;
if (FrameElapsed) if (USB_INT_HasOccurred(USB_INT_HSOFI))
{ {
FrameElapsed = false; USB_INT_Clear(USB_INT_HSOFI);
if (!(TimeoutMSRem--)) if (!(TimeoutMSRem--))
return ENDPOINT_READYWAIT_Timeout; return ENDPOINT_READYWAIT_Timeout;

@ -214,9 +214,9 @@ uint8_t USB_Host_WaitMS(uint8_t MS)
while (MS) while (MS)
{ {
if (FrameElapsed) if (USB_INT_HasOccurred(USB_INT_HSOFI))
{ {
FrameElapsed = false; USB_INT_Clear(USB_INT_HSOFI);
MS--; MS--;
} }
@ -261,7 +261,7 @@ static void USB_Host_ResetDevice(void)
USB_Host_ResumeBus(); USB_Host_ResumeBus();
FrameElapsed = false; USB_INT_Clear(USB_INT_HSOFI);
for (uint8_t MSRem = 10; MSRem != 0; MSRem--) for (uint8_t MSRem = 10; MSRem != 0; MSRem--)
{ {
@ -270,10 +270,9 @@ static void USB_Host_ResetDevice(void)
looked for - if it is found within 10ms, the device is still looked for - if it is found within 10ms, the device is still
present. */ present. */
if (FrameElapsed) if (USB_INT_HasOccurred(USB_INT_HSOFI))
{ {
FrameElapsed = false; USB_INT_Clear(USB_INT_HSOFI);
USB_INT_Clear(USB_INT_DDISCI); USB_INT_Clear(USB_INT_DDISCI);
break; break;
} }

@ -38,8 +38,6 @@ volatile uint8_t USB_CurrentMode = USB_MODE_NONE;
volatile uint8_t USB_Options; volatile uint8_t USB_Options;
#endif #endif
volatile bool FrameElapsed;
void USB_Init( void USB_Init(
#if defined(USB_CAN_BE_BOTH) #if defined(USB_CAN_BE_BOTH)
const uint8_t Mode const uint8_t Mode
@ -152,8 +150,6 @@ void USB_ResetInterface(void)
USB_INT_DisableAllInterrupts(); USB_INT_DisableAllInterrupts();
USB_INT_ClearAllInterrupts(); USB_INT_ClearAllInterrupts();
FrameElapsed = false;
USB_IsConnected = false; USB_IsConnected = false;
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)

@ -351,9 +351,6 @@
} }
#endif #endif
/* External Variables: */
extern volatile bool FrameElapsed;
#endif #endif
/* Disable C linkage for C++ Compilers: */ /* Disable C linkage for C++ Compilers: */

@ -94,9 +94,9 @@ uint8_t Pipe_WaitUntilReady(void)
else if (!(USB_IsConnected)) else if (!(USB_IsConnected))
return PIPE_READYWAIT_DeviceDisconnected; return PIPE_READYWAIT_DeviceDisconnected;
if (FrameElapsed) if (USB_INT_HasOccurred(USB_INT_HSOFI))
{ {
FrameElapsed = false; USB_INT_Clear(USB_INT_HSOFI);
if (!(TimeoutMSRem--)) if (!(TimeoutMSRem--))
return PIPE_READYWAIT_Timeout; return PIPE_READYWAIT_Timeout;

Loading…
Cancel
Save