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