From ac70ddd0a1c412bb54def48e53caaebd0b5c9c61 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Mon, 8 Jun 2009 07:34:16 +0000 Subject: [PATCH] Converted Host mode demos to schedulerless. Fixed host mode broken due to earlier Start-of-frame event experiments. --- Bootloaders/CDC/BootloaderCDC.c | 4 +- Bootloaders/DFU/BootloaderDFU.c | 4 +- .../MassStorageHost/Lib/MassStoreCommands.c | 4 +- .../StillImageHost/Lib/StillImageCommands.c | 4 +- .../Incomplete/BluetoothHost/BluetoothHost.c | 1 + Demos/Host/LowLevel/CDCHost/CDCHost.c | 98 ++++------------ Demos/Host/LowLevel/CDCHost/CDCHost.h | 38 +++--- Demos/Host/LowLevel/CDCHost/makefile | 4 +- .../LowLevel/GenericHIDHost/GenericHIDHost.c | 100 ++++------------ .../LowLevel/GenericHIDHost/GenericHIDHost.h | 37 +++--- Demos/Host/LowLevel/GenericHIDHost/makefile | 3 +- .../Host/LowLevel/KeyboardHost/KeyboardHost.c | 100 ++++------------ .../Host/LowLevel/KeyboardHost/KeyboardHost.h | 40 +++---- Demos/Host/LowLevel/KeyboardHost/makefile | 4 +- .../KeyboardHostWithParser/HIDReport.h | 3 +- .../KeyboardHostWithParser.c | 109 ++++------------- .../KeyboardHostWithParser.h | 38 +++--- .../LowLevel/KeyboardHostWithParser/makefile | 5 +- .../MassStorageHost/Lib/MassStoreCommands.c | 4 +- .../MassStorageHost/MassStorageHost.c | 108 +++++------------ .../MassStorageHost/MassStorageHost.h | 35 +++--- Demos/Host/LowLevel/MassStorageHost/makefile | 4 +- Demos/Host/LowLevel/MouseHost/MouseHost.c | 100 ++++------------ Demos/Host/LowLevel/MouseHost/MouseHost.h | 41 ++++--- Demos/Host/LowLevel/MouseHost/makefile | 4 +- .../LowLevel/MouseHostWithParser/HIDReport.h | 3 +- .../MouseHostWithParser/MouseHostWithParser.c | 111 +++++------------- .../MouseHostWithParser/MouseHostWithParser.h | 38 +++--- .../LowLevel/MouseHostWithParser/makefile | 5 +- .../StillImageHost/Lib/StillImageCommands.c | 4 +- .../LowLevel/StillImageHost/StillImageHost.c | 110 +++++------------ .../LowLevel/StillImageHost/StillImageHost.h | 41 +++---- Demos/Host/LowLevel/StillImageHost/makefile | 4 +- LUFA/ChangeLog.txt | 5 +- LUFA/Drivers/USB/LowLevel/Endpoint.c | 4 +- LUFA/Drivers/USB/LowLevel/Host.c | 15 ++- LUFA/Drivers/USB/LowLevel/LowLevel.c | 4 - LUFA/Drivers/USB/LowLevel/LowLevel.h | 3 - LUFA/Drivers/USB/LowLevel/Pipe.c | 4 +- 39 files changed, 405 insertions(+), 838 deletions(-) diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index 265e90f8f8..d797915bc5 100644 --- a/Bootloaders/CDC/BootloaderCDC.c +++ b/Bootloaders/CDC/BootloaderCDC.c @@ -248,7 +248,7 @@ static void ReadWriteMemoryBlock(const uint8_t Command) else { /* Read the next FLASH byte from the current FLASH page */ - #if defined(RAMPZ) + #if (FLASHEND > 0xFFFF) WriteNextResponseByte(pgm_read_byte_far(CurrAddress | HighByte)); #else WriteNextResponseByte(pgm_read_byte(CurrAddress | HighByte)); @@ -513,7 +513,7 @@ TASK(CDC_Task) } else if (Command == 'R') { - #if defined(RAMPZ) + #if (FLASHEND > 0xFFFF) uint16_t ProgramWord = pgm_read_word_far(CurrAddress); #else uint16_t ProgramWord = pgm_read_word(CurrAddress); diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c index 11177c5a63..1850803d41 100644 --- a/Bootloaders/DFU/BootloaderDFU.c +++ b/Bootloaders/DFU/BootloaderDFU.c @@ -342,7 +342,7 @@ void EVENT_USB_UnhandledControlPacket(void) } /* 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)); #else Endpoint_Write_Word_LE(pgm_read_word(CurrFlashAddress.Long)); @@ -585,7 +585,7 @@ static void ProcessMemReadCommand(void) while (CurrFlashAddress < BOOT_START_ADDR) { /* Check if the current byte is not blank */ - #if defined(RAMPZ) + #if (FLASHEND > 0xFFFF) if (pgm_read_byte_far(CurrFlashAddress) != 0xFF) #else if (pgm_read_byte(CurrFlashAddress) != 0xFF) diff --git a/Demos/Host/ClassDriver/MassStorageHost/Lib/MassStoreCommands.c b/Demos/Host/ClassDriver/MassStorageHost/Lib/MassStoreCommands.c index f47e9f5ed9..95aafca8c7 100644 --- a/Demos/Host/ClassDriver/MassStorageHost/Lib/MassStoreCommands.c +++ b/Demos/Host/ClassDriver/MassStorageHost/Lib/MassStoreCommands.c @@ -119,10 +119,10 @@ static uint8_t MassStore_WaitForDataReceived(void) while (!(Pipe_IsINReceived())) { /* 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 */ - FrameElapsed = false; + USB_INT_Clear(USB_INT_HSOFI); TimeoutMSRem--; /* Check to see if the timeout period for the command has elapsed */ diff --git a/Demos/Host/ClassDriver/StillImageHost/Lib/StillImageCommands.c b/Demos/Host/ClassDriver/StillImageHost/Lib/StillImageCommands.c index f2f666bd13..8f05e48f4a 100644 --- a/Demos/Host/ClassDriver/StillImageHost/Lib/StillImageCommands.c +++ b/Demos/Host/ClassDriver/StillImageHost/Lib/StillImageCommands.c @@ -109,10 +109,10 @@ uint8_t SImage_RecieveBlockHeader(void) while (!(Pipe_IsReadWriteAllowed())) { /* 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 */ - FrameElapsed = false; + USB_INT_Clear(USB_INT_HSOFI); TimeoutMSRem--; /* Check to see if the timeout period for the command has elapsed */ diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c index b855456ab9..b7d49f609f 100644 --- a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c +++ b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c @@ -58,6 +58,7 @@ int main(void) { Bluetooth_Stack_Task(); Bluetooth_Management_Task(); + USB_USBTask(); } } diff --git a/Demos/Host/LowLevel/CDCHost/CDCHost.c b/Demos/Host/LowLevel/CDCHost/CDCHost.c index b83473106a..9a5e81ae44 100644 --- a/Demos/Host/LowLevel/CDCHost/CDCHost.c +++ b/Demos/Host/LowLevel/CDCHost/CDCHost.c @@ -36,18 +36,27 @@ #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 * starts the scheduler to run the application tasks. */ 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 */ MCUSR &= ~(1 << WDRF); @@ -59,22 +68,7 @@ int main(void) /* Hardware Initialization */ SerialStream_Init(9600, false); LEDs_Init(); - - /* Indicate USB not ready */ - UpdateStatus(Status_USBNotReady); - - /* Initialize Scheduler so that it can be used */ - Scheduler_Init(); - - /* Initialize USB Subsystem */ 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 @@ -83,10 +77,7 @@ int main(void) void EVENT_USB_DeviceAttached(void) { puts_P(PSTR("Device Attached.\r\n")); - UpdateStatus(Status_USBEnumerating); - - /* Start USB management task to enumerate the device */ - Scheduler_SetTaskMode(USB_USBTask, TASK_RUN); + LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING); } /** 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) { - /* 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")); - UpdateStatus(Status_USBNotReady); + LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); } /** 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) { - /* Start CDC Host task */ - Scheduler_SetTaskMode(USB_CDC_Host, TASK_RUN); - - /* Indicate device enumeration complete */ - UpdateStatus(Status_USBReady); + LEDs_SetAllLEDs(LEDMASK_USB_READY); } /** 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")); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); - UpdateStatus(Status_HardwareError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); 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(" -- In State %d\r\n"), USB_HostState); - UpdateStatus(Status_EnumerationError); -} - -/** 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); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); } /** 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. */ -TASK(USB_CDC_Host) +void CDC_Host_Task(void) { uint8_t ErrorCode; @@ -200,7 +152,7 @@ TASK(USB_CDC_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error via status LEDs */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); @@ -223,7 +175,7 @@ TASK(USB_CDC_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error via status LEDs */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); diff --git a/Demos/Host/LowLevel/CDCHost/CDCHost.h b/Demos/Host/LowLevel/CDCHost/CDCHost.h index afec780e7d..5dcbc8e8e4 100644 --- a/Demos/Host/LowLevel/CDCHost/CDCHost.h +++ b/Demos/Host/LowLevel/CDCHost/CDCHost.h @@ -43,12 +43,11 @@ #include #include - #include // Library Version Information - #include // ANSI Terminal Escape Codes - #include // USB Functionality - #include // Serial stream driver - #include // LEDs driver - #include // Simple scheduler for task management + #include + #include + #include + #include + #include #include "ConfigDescriptor.h" @@ -62,27 +61,26 @@ /** Pipe number for the CDC notification pipe */ #define CDC_NOTIFICATIONPIPE 3 - /* Enums: */ - /** Enum for the possible status codes for passing to the UpdateStatus() function. */ - 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 */ - }; + /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */ + #define LEDMASK_USB_NOTREADY LEDS_LED1 - /* Task Definitions: */ - TASK(USB_CDC_Host); + /** 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) + /* Function Prototypes: */ + void SetupHardware(void); + void CDC_Host_Task(void); + void EVENT_USB_HostError(const uint8_t ErrorCode); void EVENT_USB_DeviceAttached(void); void EVENT_USB_DeviceUnattached(void); void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); void EVENT_USB_DeviceEnumerationComplete(void); - - void UpdateStatus(uint8_t CurrentStatus); #endif diff --git a/Demos/Host/LowLevel/CDCHost/makefile b/Demos/Host/LowLevel/CDCHost/makefile index f1255aad24..dfbefbb800 100644 --- a/Demos/Host/LowLevel/CDCHost/makefile +++ b/Demos/Host/LowLevel/CDCHost/makefile @@ -119,13 +119,12 @@ OBJDIR = . # Path to the LUFA library -LUFA_PATH = ../../.. +LUFA_PATH = ../../../.. # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ ConfigDescriptor.c \ - $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.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/USBTask.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.) diff --git a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c index e731f90cf9..ac764fad04 100644 --- a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c +++ b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c @@ -36,18 +36,27 @@ #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 * starts the scheduler to run the application tasks. */ 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 */ MCUSR &= ~(1 << WDRF); @@ -55,26 +64,11 @@ int main(void) /* Disable clock division */ clock_prescale_set(clock_div_1); - + /* Hardware Initialization */ SerialStream_Init(9600, false); LEDs_Init(); - - /* Indicate USB not ready */ - UpdateStatus(Status_USBNotReady); - - /* Initialize Scheduler so that it can be used */ - Scheduler_Init(); - - /* Initialize USB Subsystem */ 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 @@ -83,10 +77,7 @@ int main(void) void EVENT_USB_DeviceAttached(void) { puts_P(PSTR("Device Attached.\r\n")); - UpdateStatus(Status_USBEnumerating); - - /* Start USB management task to enumerate the device */ - Scheduler_SetTaskMode(USB_USBTask, TASK_RUN); + LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING); } /** 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) { - /* 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")); - UpdateStatus(Status_USBNotReady); + LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); } /** 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) { - /* Start HID Host task */ - Scheduler_SetTaskMode(USB_HID_Host, TASK_RUN); - - /* Indicate device enumeration complete */ - UpdateStatus(Status_USBReady); + LEDs_SetAllLEDs(LEDMASK_USB_READY); } /** 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")); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); - UpdateStatus(Status_HardwareError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); 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(" -- In State %d\r\n"), USB_HostState); - UpdateStatus(Status_EnumerationError); -} - -/** 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); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); } /** 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 * HID reports from the device and to send reports if desired. */ -TASK(USB_HID_Host) +void HID_Host_Task(void) { uint8_t ErrorCode; @@ -301,7 +253,7 @@ TASK(USB_HID_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error status */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); @@ -324,7 +276,7 @@ TASK(USB_HID_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error status */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); diff --git a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.h b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.h index 7e2f8b822a..415dae0231 100644 --- a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.h +++ b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.h @@ -44,12 +44,11 @@ #include #include - #include // Library Version Information - #include // ANSI Terminal Escape Codes - #include // USB Functionality - #include // Serial stream driver - #include // LEDs driver - #include // Simple scheduler for task management + #include + #include + #include + #include + #include #include "ConfigDescriptor.h" @@ -69,28 +68,28 @@ /** HID Report type specifier, for feature reports to a device */ #define HID_REPORTTYPE_FEATURE 0x03 - /* Task Definitions: */ - TASK(USB_HID_Host); + /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */ + #define LEDMASK_USB_NOTREADY LEDS_LED1 - /* Enums: */ - /** Enum for the possible status codes for passing to the UpdateStatus() function. */ - enum GenricHIDHost_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 */ - }; + /** 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) + /* Function Prototypes: */ + void SetupHardware(void); + void HID_Host_Task(void); + void EVENT_USB_HostError(const uint8_t ErrorCode); void EVENT_USB_DeviceAttached(void); void EVENT_USB_DeviceUnattached(void); void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); void EVENT_USB_DeviceEnumerationComplete(void); - void UpdateStatus(uint8_t CurrentStatus); void ReadNextReport(void); void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t ReportType, uint16_t ReportLength); diff --git a/Demos/Host/LowLevel/GenericHIDHost/makefile b/Demos/Host/LowLevel/GenericHIDHost/makefile index b912b2ff8d..a07acb4389 100644 --- a/Demos/Host/LowLevel/GenericHIDHost/makefile +++ b/Demos/Host/LowLevel/GenericHIDHost/makefile @@ -119,13 +119,12 @@ OBJDIR = . # Path to the LUFA library -LUFA_PATH = ../../.. +LUFA_PATH = ../../../.. # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ ConfigDescriptor.c \ - $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \ diff --git a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c index 2b9bb2b0b5..64bcf0906a 100644 --- a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c +++ b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c @@ -36,18 +36,27 @@ #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 * starts the scheduler to run the application tasks. */ 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 */ MCUSR &= ~(1 << WDRF); @@ -59,22 +68,7 @@ int main(void) /* Hardware Initialization */ SerialStream_Init(9600, false); LEDs_Init(); - - /* Indicate USB not ready */ - UpdateStatus(Status_USBNotReady); - - /* Initialize Scheduler so that it can be used */ - Scheduler_Init(); - - /* Initialize USB Subsystem */ 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 @@ -83,10 +77,7 @@ int main(void) void EVENT_USB_DeviceAttached(void) { puts_P(PSTR("Device Attached.\r\n")); - UpdateStatus(Status_USBEnumerating); - - /* Start USB management task to enumerate the device */ - Scheduler_SetTaskMode(USB_USBTask, TASK_RUN); + LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING); } /** 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) { - /* 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")); - UpdateStatus(Status_USBNotReady); + LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); } /** 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) { - /* Start Keyboard Host task */ - Scheduler_SetTaskMode(USB_Keyboard_Host, TASK_RUN); - - /* Indicate device enumeration complete */ - UpdateStatus(Status_USBReady); + LEDs_SetAllLEDs(LEDMASK_USB_READY); } /** 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")); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); - UpdateStatus(Status_HardwareError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); 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(" -- In State %d\r\n"), USB_HostState); - UpdateStatus(Status_EnumerationError); -} - -/** 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); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); } /** 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 * 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; @@ -265,7 +217,7 @@ TASK(USB_Keyboard_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error status */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); @@ -288,7 +240,7 @@ TASK(USB_Keyboard_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error status */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); @@ -315,7 +267,7 @@ TASK(USB_Keyboard_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error status */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); diff --git a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h index d00b76afba..4aa09e1b7a 100644 --- a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h +++ b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h @@ -44,12 +44,11 @@ #include #include - #include // Library Version Information - #include // ANSI Terminal Escape Codes - #include // USB Functionality - #include // Serial stream driver - #include // LEDs driver - #include // Simple scheduler for task management + #include + #include + #include + #include + #include #include "ConfigDescriptor.h" @@ -60,6 +59,18 @@ /** HID Class Specific request to set the report protocol mode */ #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 define for a standard Boot Protocol Keyboard report */ typedef struct @@ -69,28 +80,15 @@ uint8_t KeyCode; /**< Key code of the currently pressed key */ } 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: */ + void Keyboard_HID_Task(void); + void EVENT_USB_HostError(const uint8_t ErrorCode); void EVENT_USB_DeviceAttached(void); void EVENT_USB_DeviceUnattached(void); void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); void EVENT_USB_DeviceEnumerationComplete(void); - void UpdateStatus(uint8_t CurrentStatus); void ReadNextReport(void); #endif diff --git a/Demos/Host/LowLevel/KeyboardHost/makefile b/Demos/Host/LowLevel/KeyboardHost/makefile index b8cb79c5c4..6e005da0a7 100644 --- a/Demos/Host/LowLevel/KeyboardHost/makefile +++ b/Demos/Host/LowLevel/KeyboardHost/makefile @@ -119,13 +119,12 @@ OBJDIR = . # Path to the LUFA library -LUFA_PATH = ../../.. +LUFA_PATH = ../../../.. # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ ConfigDescriptor.c \ - $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.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/USBTask.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.) diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h b/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h index 20968872ef..a141ffb8ce 100644 --- a/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h +++ b/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h @@ -37,7 +37,8 @@ #define _HID_REPORT_H_ /* Includes: */ - #include // USB Functionality + #include + #include #include "KeyboardHostWithParser.h" diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c index 840cb90cf4..620f158e01 100644 --- a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c +++ b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c @@ -36,18 +36,27 @@ #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 * starts the scheduler to run the application tasks. */ 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 */ MCUSR &= ~(1 << WDRF); @@ -59,22 +68,7 @@ int main(void) /* Hardware Initialization */ SerialStream_Init(9600, false); LEDs_Init(); - - /* Indicate USB not ready */ - UpdateStatus(Status_USBNotReady); - - /* Initialize Scheduler so that it can be used */ - Scheduler_Init(); - - /* Initialize USB Subsystem */ 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 @@ -83,10 +77,7 @@ int main(void) void EVENT_USB_DeviceAttached(void) { puts_P(PSTR("Device Attached.\r\n")); - UpdateStatus(Status_USBEnumerating); - - /* Start USB management task to enumerate the device */ - Scheduler_SetTaskMode(USB_USBTask, TASK_RUN); + LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING); } /** 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) { - /* 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")); - UpdateStatus(Status_USBNotReady); + LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); } /** 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) { - /* Start Keyboard Host task */ - Scheduler_SetTaskMode(USB_Keyboard_Host, TASK_RUN); - - /* Indicate device enumeration complete */ - UpdateStatus(Status_USBReady); + LEDs_SetAllLEDs(LEDMASK_USB_READY); } /** 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")); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); - UpdateStatus(Status_HardwareError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); 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(" -- In State %d\r\n"), USB_HostState); - UpdateStatus(Status_EnumerationError); -} - -/** 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); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); } /** 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. */ -TASK(USB_Keyboard_Host) +void Keyboard_HID_Task(void) { uint8_t ErrorCode; @@ -203,7 +152,7 @@ TASK(USB_Keyboard_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error via status LEDs */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); @@ -226,7 +175,7 @@ TASK(USB_Keyboard_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error via status LEDs */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); @@ -235,9 +184,6 @@ TASK(USB_Keyboard_Host) 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 */ if ((ErrorCode = GetHIDReportData()) != ParseSuccessful) { @@ -245,15 +191,12 @@ TASK(USB_Keyboard_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error via status LEDs */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); break; } - - /* All LEDs off - ready to indicate key presses */ - UpdateStatus(Status_USBReady); puts_P(PSTR("Keyboard Enumerated.\r\n")); diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.h b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.h index acb5b8b3ef..90db94a2aa 100644 --- a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.h +++ b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.h @@ -38,12 +38,11 @@ #include #include - #include // Library Version Information - #include // ANSI Terminal Escape Codes - #include // USB Functionality - #include // Serial stream driver - #include // LEDs driver - #include // Simple scheduler for task management + #include + #include + #include + #include + #include #include "ConfigDescriptor.h" #include "HIDReport.h" @@ -52,29 +51,28 @@ /** Pipe number for the keyboard report data pipe */ #define KEYBOARD_DATAPIPE 1 - /* Enums: */ - /** Enum for the possible status codes for passing to the UpdateStatus() function. */ - enum KeyboardHostWithParser_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 */ - Status_Busy = 5, /**< Busy dumping HID report items to the serial port */ - }; + /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */ + #define LEDMASK_USB_NOTREADY LEDS_LED1 - /* Task Definitions: */ - TASK(USB_Keyboard_Host); + /** 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) + /* Function Prototypes: */ + void Keyboard_HID_Task(void); + void SetupHardware(void); + void EVENT_USB_HostError(const uint8_t ErrorCode); void EVENT_USB_DeviceAttached(void); void EVENT_USB_DeviceUnattached(void); void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); void EVENT_USB_DeviceEnumerationComplete(void); - void UpdateStatus(uint8_t CurrentStatus); void ProcessKeyboardReport(uint8_t* KeyboardReport); #endif diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/makefile b/Demos/Host/LowLevel/KeyboardHostWithParser/makefile index 0d09178ddb..393551268e 100644 --- a/Demos/Host/LowLevel/KeyboardHostWithParser/makefile +++ b/Demos/Host/LowLevel/KeyboardHostWithParser/makefile @@ -119,14 +119,13 @@ OBJDIR = . # Path to the LUFA library -LUFA_PATH = ../../.. +LUFA_PATH = ../../../.. # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ ConfigDescriptor.c \ HIDReport.c \ - $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.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/USBTask.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.) diff --git a/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c b/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c index f47e9f5ed9..95aafca8c7 100644 --- a/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c +++ b/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c @@ -119,10 +119,10 @@ static uint8_t MassStore_WaitForDataReceived(void) while (!(Pipe_IsINReceived())) { /* 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 */ - FrameElapsed = false; + USB_INT_Clear(USB_INT_HSOFI); TimeoutMSRem--; /* Check to see if the timeout period for the command has elapsed */ diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c index a2e6631e27..6810320e87 100644 --- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c +++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c @@ -36,13 +36,6 @@ #include "MassStorageHost.h" -/* Scheduler Task List */ -TASK_LIST -{ - { .Task = USB_USBTask , .TaskStatus = TASK_STOP }, - { .Task = USB_MassStore_Host , .TaskStatus = TASK_STOP }, -}; - /* Globals */ /** Index of the highest available LUN (Logical Unit) in the attached Mass Storage Device */ uint8_t MassStore_MaxLUNIndex; @@ -52,6 +45,23 @@ uint8_t MassStore_MaxLUNIndex; * starts the scheduler to run the application tasks. */ 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 */ MCUSR &= ~(1 << WDRF); @@ -64,22 +74,6 @@ int main(void) SerialStream_Init(9600, false); LEDs_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 @@ -88,10 +82,7 @@ int main(void) void EVENT_USB_DeviceAttached(void) { puts_P(PSTR("Device Attached.\r\n")); - UpdateStatus(Status_USBEnumerating); - - /* Start USB management task to enumerate the device */ - Scheduler_SetTaskMode(USB_USBTask, TASK_RUN); + LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING); } /** 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) { - /* 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")); - UpdateStatus(Status_USBNotReady); + LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); } /** 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) { - /* Once device is fully enumerated, start the Mass Storage Host task */ - Scheduler_SetTaskMode(USB_MassStore_Host, TASK_RUN); - - /* Indicate device enumeration complete */ - UpdateStatus(Status_USBReady); + LEDs_SetAllLEDs(LEDMASK_USB_READY); } /** 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")); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); - UpdateStatus(Status_HardwareError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); 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(" -- 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 * the device and print them to the serial port. */ -TASK(USB_MassStore_Host) +void MassStorage_Task(void) { uint8_t ErrorCode; @@ -174,7 +157,7 @@ TASK(USB_MassStore_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error via status LEDs */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); @@ -197,7 +180,7 @@ TASK(USB_MassStore_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error via status LEDs */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); @@ -210,7 +193,7 @@ TASK(USB_MassStore_Host) break; case HOST_STATE_Ready: /* 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 */ if ((ErrorCode = MassStore_GetMaxLUN(&MassStore_MaxLUNIndex)) != HOST_SENDCONTROL_Successful) @@ -354,7 +337,7 @@ TASK(USB_MassStore_Host) } /* Indicate device no longer busy */ - UpdateStatus(Status_USBReady); + LEDs_SetAllLEDs(LEDMASK_USB_READY); /* Wait until USB device disconnected */ 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, * printing error codes to the serial port and waiting until the device is removed before * continuing. @@ -424,7 +372,7 @@ void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t Erro Pipe_Freeze(); /* Indicate device error via the status LEDs */ - UpdateStatus(Status_SCSICommandError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h index 6e1e5cd9e4..a299b7008f 100644 --- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h +++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h @@ -54,25 +54,27 @@ #include // Serial stream driver #include // LEDs driver #include // Board Buttons driver - #include // Simple scheduler for task management - /* Enums: */ - /** Enum for the possible status codes for passing to the UpdateStatus() function. */ - enum MassStorageHost_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 */ - Status_Busy = 5, /**< Busy reading or writing to the attached Mass Storage device */ - Status_SCSICommandError = 6, /**< Error sending or receiving a command to or from the attached SCSI device */ - }; + /* Macros: */ + /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */ + #define LEDMASK_USB_NOTREADY LEDS_LED1 - /* Task Definitions: */ - TASK(USB_MassStore_Host); - + /** 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) + + /** LED mask for the library LED driver, to indicate that the USB interface is busy. */ + #define LEDMASK_USB_BUSY (LEDS_LED2) + /* Function Prototypes: */ + void MassStorage_Task(void); + void SetupHardware(void); + void EVENT_USB_HostError(const uint8_t ErrorCode); void EVENT_USB_DeviceAttached(void); void EVENT_USB_DeviceUnattached(void); @@ -80,6 +82,5 @@ void EVENT_USB_DeviceEnumerationComplete(void); void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t ErrorCode); - void UpdateStatus(uint8_t CurrentStatus); #endif diff --git a/Demos/Host/LowLevel/MassStorageHost/makefile b/Demos/Host/LowLevel/MassStorageHost/makefile index f50f598872..709f42f617 100644 --- a/Demos/Host/LowLevel/MassStorageHost/makefile +++ b/Demos/Host/LowLevel/MassStorageHost/makefile @@ -119,14 +119,13 @@ OBJDIR = . # Path to the LUFA library -LUFA_PATH = ../../.. +LUFA_PATH = ../../../.. # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ ConfigDescriptor.c \ Lib/MassStoreCommands.c \ - $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.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/USBTask.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.) diff --git a/Demos/Host/LowLevel/MouseHost/MouseHost.c b/Demos/Host/LowLevel/MouseHost/MouseHost.c index 7db95808ae..9b4db30860 100644 --- a/Demos/Host/LowLevel/MouseHost/MouseHost.c +++ b/Demos/Host/LowLevel/MouseHost/MouseHost.c @@ -36,18 +36,27 @@ #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 * starts the scheduler to run the application tasks. */ 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 */ MCUSR &= ~(1 << WDRF); @@ -59,22 +68,7 @@ int main(void) /* Hardware Initialization */ SerialStream_Init(9600, false); LEDs_Init(); - - /* Indicate USB not ready */ - UpdateStatus(Status_USBNotReady); - - /* Initialize Scheduler so that it can be used */ - Scheduler_Init(); - - /* Initialize USB Subsystem */ 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 @@ -83,10 +77,7 @@ int main(void) void EVENT_USB_DeviceAttached(void) { puts_P(PSTR("Device Attached.\r\n")); - UpdateStatus(Status_USBEnumerating); - - /* Start USB management task to enumerate the device */ - Scheduler_SetTaskMode(USB_USBTask, TASK_RUN); + LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING); } /** 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) { - /* 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")); - UpdateStatus(Status_USBNotReady); + LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); } /** 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) { - /* Start Mouse Host task */ - Scheduler_SetTaskMode(USB_Mouse_Host, TASK_RUN); - - /* Indicate device enumeration complete */ - UpdateStatus(Status_USBReady); + LEDs_SetAllLEDs(LEDMASK_USB_READY); } /** 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")); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); - UpdateStatus(Status_HardwareError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); 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(" -- In State %d\r\n"), USB_HostState); - UpdateStatus(Status_EnumerationError); -} - -/** 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); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); } /** 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 * 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; @@ -261,7 +213,7 @@ TASK(USB_Mouse_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error status */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); @@ -284,7 +236,7 @@ TASK(USB_Mouse_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error status */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); @@ -311,7 +263,7 @@ TASK(USB_Mouse_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error status */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); diff --git a/Demos/Host/LowLevel/MouseHost/MouseHost.h b/Demos/Host/LowLevel/MouseHost/MouseHost.h index 7111218ba6..1abd560687 100644 --- a/Demos/Host/LowLevel/MouseHost/MouseHost.h +++ b/Demos/Host/LowLevel/MouseHost/MouseHost.h @@ -44,12 +44,11 @@ #include #include - #include // Library Version Information - #include // ANSI Terminal Escape Codes - #include // USB Functionality - #include // Serial stream driver - #include // LEDs driver - #include // Simple scheduler for task management + #include + #include + #include + #include + #include #include "ConfigDescriptor.h" @@ -60,6 +59,18 @@ /** HID Class Specific request to set the report protocol mode */ #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 define for a standard Boot Protocol Mouse report */ typedef struct @@ -69,28 +80,16 @@ int8_t Y; /**< Current delta Y movement on the mouse */ } 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: */ + void Mouse_HID_Task(void); + void SetupHardware(void); + void EVENT_USB_HostError(const uint8_t ErrorCode); void EVENT_USB_DeviceAttached(void); void EVENT_USB_DeviceUnattached(void); void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); void EVENT_USB_DeviceEnumerationComplete(void); - void UpdateStatus(uint8_t CurrentStatus); void ReadNextReport(void); #endif diff --git a/Demos/Host/LowLevel/MouseHost/makefile b/Demos/Host/LowLevel/MouseHost/makefile index b7bad9400a..67e05a63ad 100644 --- a/Demos/Host/LowLevel/MouseHost/makefile +++ b/Demos/Host/LowLevel/MouseHost/makefile @@ -119,13 +119,12 @@ OBJDIR = . # Path to the LUFA library -LUFA_PATH = ../../.. +LUFA_PATH = ../../../.. # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ ConfigDescriptor.c \ - $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.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/USBTask.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.) diff --git a/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.h b/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.h index b24885544b..f5429f0a96 100644 --- a/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.h +++ b/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.h @@ -37,7 +37,8 @@ #define _HID_REPORT_H_ /* Includes: */ - #include // USB Functionality + #include + #include #include "MouseHostWithParser.h" diff --git a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c index f26e9e2a6b..3ef5503b3c 100644 --- a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c +++ b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c @@ -36,18 +36,27 @@ #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 * starts the scheduler to run the application tasks. */ 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 */ MCUSR &= ~(1 << WDRF); @@ -59,22 +68,7 @@ int main(void) /* Hardware Initialization */ SerialStream_Init(9600, false); LEDs_Init(); - - /* Indicate USB not ready */ - UpdateStatus(Status_USBNotReady); - - /* Initialize Scheduler so that it can be used */ - Scheduler_Init(); - - /* Initialize USB Subsystem */ 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 @@ -83,10 +77,7 @@ int main(void) void EVENT_USB_DeviceAttached(void) { puts_P(PSTR("Device Attached.\r\n")); - UpdateStatus(Status_USBEnumerating); - - /* Start USB management task to enumerate the device */ - Scheduler_SetTaskMode(USB_USBTask, TASK_RUN); + LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING); } /** 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) { - /* 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")); - UpdateStatus(Status_USBNotReady); + LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); } /** 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) { - /* Start Mouse Host task */ - Scheduler_SetTaskMode(USB_Mouse_Host, TASK_RUN); - - /* Indicate device enumeration complete */ - UpdateStatus(Status_USBReady); + LEDs_SetAllLEDs(LEDMASK_USB_READY); } /** 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")); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); - UpdateStatus(Status_HardwareError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); 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(" -- In State %d\r\n"), USB_HostState); - UpdateStatus(Status_EnumerationError); -} - -/** 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); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); } /** 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. */ -TASK(USB_Mouse_Host) +void Mouse_HID_Task(void) { uint8_t ErrorCode; @@ -204,8 +153,8 @@ TASK(USB_Mouse_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error via status LEDs */ - UpdateStatus(Status_EnumerationError); - + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); + /* Wait until USB device disconnected */ while (USB_IsConnected); break; @@ -227,7 +176,7 @@ TASK(USB_Mouse_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error via status LEDs */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); @@ -236,9 +185,6 @@ TASK(USB_Mouse_Host) 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 */ if ((ErrorCode = GetHIDReportData()) != ParseSuccessful) { @@ -246,15 +192,12 @@ TASK(USB_Mouse_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error via status LEDs */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); break; } - - /* All LEDs off - ready to indicate key presses */ - UpdateStatus(Status_USBReady); puts_P(PSTR("Mouse Enumerated.\r\n")); diff --git a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.h b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.h index f2cc2fd001..b91d6d1a83 100644 --- a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.h +++ b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.h @@ -38,12 +38,11 @@ #include #include - #include // Library Version Information - #include // ANSI Terminal Escape Codes - #include // USB Functionality - #include // Serial stream driver - #include // LEDs driver - #include // Simple scheduler for task management + #include + #include + #include + #include + #include #include "ConfigDescriptor.h" #include "HIDReport.h" @@ -52,29 +51,28 @@ /** Pipe number for the mouse report data pipe */ #define MOUSE_DATAPIPE 1 - /* Enums: */ - /** Enum for the possible status codes for passing to the UpdateStatus() function. */ - enum MouseHostWithParser_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 */ - Status_Busy = 5, /**< Busy dumping HID report items to the serial port */ - }; + /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */ + #define LEDMASK_USB_NOTREADY LEDS_LED1 - /* Task Definitions: */ - TASK(USB_Mouse_Host); + /** 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) /* Function Prototypes: */ + void Mouse_HID_Task(void); + void SetupHardware(void); + void EVENT_USB_HostError(const uint8_t ErrorCode); void EVENT_USB_DeviceAttached(void); void EVENT_USB_DeviceUnattached(void); void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); void EVENT_USB_DeviceEnumerationComplete(void); - void UpdateStatus(uint8_t CurrentStatus); void ProcessMouseReport(uint8_t* MouseReport); #endif diff --git a/Demos/Host/LowLevel/MouseHostWithParser/makefile b/Demos/Host/LowLevel/MouseHostWithParser/makefile index a6aeb6dc79..30e40ad45a 100644 --- a/Demos/Host/LowLevel/MouseHostWithParser/makefile +++ b/Demos/Host/LowLevel/MouseHostWithParser/makefile @@ -119,14 +119,13 @@ OBJDIR = . # Path to the LUFA library -LUFA_PATH = ../../.. +LUFA_PATH = ../../../.. # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ ConfigDescriptor.c \ HIDReport.c \ - $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.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/USBTask.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.) diff --git a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c index f2f666bd13..8f05e48f4a 100644 --- a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c +++ b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c @@ -109,10 +109,10 @@ uint8_t SImage_RecieveBlockHeader(void) while (!(Pipe_IsReadWriteAllowed())) { /* 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 */ - FrameElapsed = false; + USB_INT_Clear(USB_INT_HSOFI); TimeoutMSRem--; /* Check to see if the timeout period for the command has elapsed */ diff --git a/Demos/Host/LowLevel/StillImageHost/StillImageHost.c b/Demos/Host/LowLevel/StillImageHost/StillImageHost.c index 197e832f6a..318e257314 100644 --- a/Demos/Host/LowLevel/StillImageHost/StillImageHost.c +++ b/Demos/Host/LowLevel/StillImageHost/StillImageHost.c @@ -36,18 +36,27 @@ #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 * starts the scheduler to run the application tasks. */ 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 */ MCUSR &= ~(1 << WDRF); @@ -60,22 +69,7 @@ int main(void) /* Hardware Initialization */ SerialStream_Init(9600, false); LEDs_Init(); - - /* Indicate USB not ready */ - UpdateStatus(Status_USBNotReady); - - /* Initialize Scheduler so that it can be used */ - Scheduler_Init(); - - /* Initialize USB Subsystem */ 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 @@ -84,10 +78,7 @@ int main(void) void EVENT_USB_DeviceAttached(void) { puts_P(PSTR("Device Attached.\r\n")); - UpdateStatus(Status_USBEnumerating); - - /* Start USB management task to enumerate the device */ - Scheduler_SetTaskMode(USB_USBTask, TASK_RUN); + LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING); } /** 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) { - /* 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")); - UpdateStatus(Status_USBNotReady); + LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); } /** 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) { - /* Once device is fully enumerated, start the Still Image Host task */ - Scheduler_SetTaskMode(USB_SImage_Host, TASK_RUN); - - /* Indicate device enumeration complete */ - UpdateStatus(Status_USBReady); + LEDs_SetAllLEDs(LEDMASK_USB_READY); } /** 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")); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); - UpdateStatus(Status_HardwareError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); 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(" -- 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 * through the serial port. */ -TASK(USB_SImage_Host) +void StillImage_Task(void) { uint8_t ErrorCode; @@ -169,7 +152,7 @@ TASK(USB_SImage_Host) puts_P(PSTR("Control error.\r\n")); /* Indicate error via status LEDs */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); @@ -192,7 +175,7 @@ TASK(USB_SImage_Host) printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); /* Indicate error via status LEDs */ - UpdateStatus(Status_EnumerationError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); @@ -205,8 +188,8 @@ TASK(USB_SImage_Host) break; case HOST_STATE_Ready: /* Indicate device busy via the status LEDs */ - UpdateStatus(Status_Busy); - + LEDs_SetAllLEDs(LEDMASK_USB_BUSY); + puts_P(PSTR("Retrieving Device Info...\r\n")); PIMA_SendBlock = (PIMA_Container_t) @@ -345,7 +328,7 @@ TASK(USB_SImage_Host) puts_P(PSTR("Done.\r\n")); /* Indicate device no longer busy */ - UpdateStatus(Status_USBReady); + LEDs_SetAllLEDs(LEDMASK_USB_READY); /* Wait until USB device disconnected */ while (USB_IsConnected); @@ -379,41 +362,6 @@ void UnicodeToASCII(uint8_t* UnicodeString, char* Buffer) *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. * * \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); /* Indicate error via status LEDs */ - UpdateStatus(Status_PIMACommandError); + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); /* Wait until USB device disconnected */ while (USB_IsConnected); diff --git a/Demos/Host/LowLevel/StillImageHost/StillImageHost.h b/Demos/Host/LowLevel/StillImageHost/StillImageHost.h index b563767ccb..1896b8fe5a 100644 --- a/Demos/Host/LowLevel/StillImageHost/StillImageHost.h +++ b/Demos/Host/LowLevel/StillImageHost/StillImageHost.h @@ -47,29 +47,31 @@ #include "Lib/PIMACodes.h" #include "Lib/StillImageCommands.h" - #include // ANSI Terminal Escape Codes - #include // USB Functionality - #include // Serial stream driver - #include // LED driver - #include // Simple scheduler for task management + #include + #include + #include + #include + + /* Macros: */ + /** 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) - /* Enums: */ - /** Enum for the possible status codes for passing to the UpdateStatus() function. */ - enum StillImageHost_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 */ - Status_Busy = 5, /**< Busy reading or writing to the attached Still Image device */ - Status_PIMACommandError = 6, /**< Error while sending or receiving a PIM command to the attached device */ - }; + /** LED mask for the library LED driver, to indicate that the USB interface is ready. */ + #define LEDMASK_USB_READY (LEDS_LED2 | LEDS_LED4) - /* Task Definitions: */ - TASK(USB_SImage_Host); + /** 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) + /** LED mask for the library LED driver, to indicate that the USB interface is busy. */ + #define LEDMASK_USB_BUSY (LEDS_LED2) + /* Function Prototypes: */ + void StillImage_Task(void); + void SetupHardware(void); + void EVENT_USB_HostError(const uint8_t ErrorCode); void EVENT_USB_DeviceAttached(void); void EVENT_USB_DeviceUnattached(void); @@ -78,6 +80,5 @@ void UnicodeToASCII(uint8_t* restrict UnicodeString, char* restrict Buffer); void ShowCommandError(uint8_t ErrorCode, bool ResponseCodeError); - void UpdateStatus(uint8_t CurrentStatus); #endif diff --git a/Demos/Host/LowLevel/StillImageHost/makefile b/Demos/Host/LowLevel/StillImageHost/makefile index 8c1ca0b452..a4428c5656 100644 --- a/Demos/Host/LowLevel/StillImageHost/makefile +++ b/Demos/Host/LowLevel/StillImageHost/makefile @@ -118,14 +118,13 @@ OBJDIR = . # Path to the LUFA library -LUFA_PATH = ../../.. +LUFA_PATH = ../../../.. # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ ConfigDescriptor.c \ Lib/StillImageCommands.c \ - $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.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/USBTask.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.) diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt index 94e8da087e..f65c62aeed 100644 --- a/LUFA/ChangeLog.txt +++ b/LUFA/ChangeLog.txt @@ -5,13 +5,14 @@ */ ========== 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 - Made new host class drivers - Document new host class drivers - Convert Host mode demos to class drivers - Convert Host mode demos to schedulerless - 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 @@ -20,6 +21,8 @@ * * - 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 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 diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.c b/LUFA/Drivers/USB/LowLevel/Endpoint.c index d02071bbd5..fd97b75c1d 100644 --- a/LUFA/Drivers/USB/LowLevel/Endpoint.c +++ b/LUFA/Drivers/USB/LowLevel/Endpoint.c @@ -98,9 +98,9 @@ uint8_t Endpoint_WaitUntilReady(void) else if (Endpoint_IsStalled()) return ENDPOINT_READYWAIT_EndpointStalled; - if (FrameElapsed) + if (USB_INT_HasOccurred(USB_INT_HSOFI)) { - FrameElapsed = false; + USB_INT_Clear(USB_INT_HSOFI); if (!(TimeoutMSRem--)) return ENDPOINT_READYWAIT_Timeout; diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c index 02a1c2171c..5f3eeb8e87 100644 --- a/LUFA/Drivers/USB/LowLevel/Host.c +++ b/LUFA/Drivers/USB/LowLevel/Host.c @@ -214,9 +214,9 @@ uint8_t USB_Host_WaitMS(uint8_t MS) while (MS) { - if (FrameElapsed) + if (USB_INT_HasOccurred(USB_INT_HSOFI)) { - FrameElapsed = false; + USB_INT_Clear(USB_INT_HSOFI); MS--; } @@ -259,9 +259,9 @@ static void USB_Host_ResetDevice(void) USB_Host_ResetBus(); while (!(USB_Host_IsBusResetComplete())); - USB_Host_ResumeBus(); - - FrameElapsed = false; + USB_Host_ResumeBus(); + + USB_INT_Clear(USB_INT_HSOFI); 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 present. */ - if (FrameElapsed) + if (USB_INT_HasOccurred(USB_INT_HSOFI)) { - FrameElapsed = false; - + USB_INT_Clear(USB_INT_HSOFI); USB_INT_Clear(USB_INT_DDISCI); break; } diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.c b/LUFA/Drivers/USB/LowLevel/LowLevel.c index 82705db966..16a50ac8f2 100644 --- a/LUFA/Drivers/USB/LowLevel/LowLevel.c +++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c @@ -38,8 +38,6 @@ volatile uint8_t USB_CurrentMode = USB_MODE_NONE; volatile uint8_t USB_Options; #endif -volatile bool FrameElapsed; - void USB_Init( #if defined(USB_CAN_BE_BOTH) const uint8_t Mode @@ -152,8 +150,6 @@ void USB_ResetInterface(void) USB_INT_DisableAllInterrupts(); USB_INT_ClearAllInterrupts(); - FrameElapsed = false; - USB_IsConnected = false; #if defined(USB_CAN_BE_HOST) diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.h b/LUFA/Drivers/USB/LowLevel/LowLevel.h index 4279ca3159..41b0ff5f67 100644 --- a/LUFA/Drivers/USB/LowLevel/LowLevel.h +++ b/LUFA/Drivers/USB/LowLevel/LowLevel.h @@ -350,9 +350,6 @@ return USB_MODE_HOST; } #endif - - /* External Variables: */ - extern volatile bool FrameElapsed; #endif diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.c b/LUFA/Drivers/USB/LowLevel/Pipe.c index 720da17723..3c493fe5a0 100644 --- a/LUFA/Drivers/USB/LowLevel/Pipe.c +++ b/LUFA/Drivers/USB/LowLevel/Pipe.c @@ -94,9 +94,9 @@ uint8_t Pipe_WaitUntilReady(void) else if (!(USB_IsConnected)) return PIPE_READYWAIT_DeviceDisconnected; - if (FrameElapsed) + if (USB_INT_HasOccurred(USB_INT_HSOFI)) { - FrameElapsed = false; + USB_INT_Clear(USB_INT_HSOFI); if (!(TimeoutMSRem--)) return PIPE_READYWAIT_Timeout;