X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/f1199200e167a737a4676378da184387e543830c..23f3c3deee8bd153d59f2ac4e659c71ee75915f7:/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c index a2e6631e2..2f84d0fb8 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; @@ -53,6 +46,23 @@ uint8_t MassStore_MaxLUNIndex; */ 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); wdt_disable(); @@ -64,22 +74,7 @@ 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 +83,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 +91,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 +100,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 +111,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,49 +125,19 @@ 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; switch (USB_HostState) { case HOST_STATE_Addressed: - /* Standard request to set the device configuration to configuration 1 */ - USB_ControlRequest = (USB_Request_Header_t) - { - .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE), - .bRequest = REQ_SetConfiguration, - .wValue = 1, - .wIndex = 0, - .wLength = 0, - }; - - /* Select the control pipe for the request transfer */ - Pipe_SelectPipe(PIPE_CONTROLPIPE); - - /* Send the request, display error and wait for device detach if request fails */ - if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful) - { - puts_P(PSTR("Control Error (Set Configuration).\r\n")); - printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); - - /* Indicate error via status LEDs */ - UpdateStatus(Status_EnumerationError); - - /* Wait until USB device disconnected */ - while (USB_IsConnected); - break; - } - - USB_HostState = HOST_STATE_Configured; - break; - case HOST_STATE_Configured: puts_P(PSTR("Getting Config Data.\r\n")); /* Get and process the configuration descriptor data */ @@ -197,20 +151,37 @@ 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); break; } + /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */ + if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful) + { + puts_P(PSTR("Control Error (Set Configuration).\r\n")); + printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode); + + /* Indicate error via status LEDs */ + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); + + /* Wait until USB device disconnected */ + while (USB_IsConnected); + break; + } + + USB_HostState = HOST_STATE_Configured; + break; + case HOST_STATE_Configured: puts_P(PSTR("Mass Storage Disk Enumerated.\r\n")); USB_HostState = HOST_STATE_Ready; 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) @@ -220,7 +191,7 @@ TASK(USB_MassStore_Host) } /* Print number of LUNs detected in the attached device */ - printf_P(PSTR("Total LUNs: %d.\r\n"), (MassStore_MaxLUNIndex + 1)); + printf_P(PSTR("Total LUNs: %d - Using first LUN in device.\r\n"), (MassStore_MaxLUNIndex + 1)); /* Reset the Mass Storage device interface, ready for use */ if ((ErrorCode = MassStore_MassStorageReset()) != HOST_SENDCONTROL_Successful) @@ -245,9 +216,20 @@ TASK(USB_MassStore_Host) break; } - puts_P(PSTR("Waiting until ready..")); - + /* Get inquiry data from the device */ + SCSI_Inquiry_Response_t InquiryData; + if (((ErrorCode = MassStore_Inquiry(0, &InquiryData)) != 0) || (SCSICommandStatus.Status != Command_Pass)) + { + ShowDiskReadError(PSTR("Inquiry"), (SCSICommandStatus.Status != Command_Pass), ErrorCode); + break; + } + + /* Print vendor and product names of attached device */ + printf_P(PSTR("Vendor \"%.8s\", Product \"%.16s\"\r\n"), InquiryData.VendorID, InquiryData.ProductID); + /* Wait until disk ready */ + puts_P(PSTR("Waiting until ready..")); + do { Serial_TxByte('.'); @@ -354,7 +336,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,48 +345,13 @@ 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. * - * \param CommandString ASCII string located in PROGMEM space indicating what operation failed - * \param FailedAtSCSILayer Indicates if the command failed at the (logical) SCSI layer or at the physical USB layer - * \param ErrorCode Error code of the function which failed to complete successfully + * \param[in] CommandString ASCII string located in PROGMEM space indicating what operation failed + * \param[in] FailedAtSCSILayer Indicates if the command failed at the (logical) SCSI layer or at the physical USB layer + * \param[in] ErrorCode Error code of the function which failed to complete successfully */ void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t ErrorCode) { @@ -424,7 +371,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);