From 137ce280c1e9c33e9393f1dfd6bb160c131bd1a4 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Fri, 8 Jul 2011 07:25:56 +0000 Subject: Updated all host mode demos and projects to use the EVENT_USB_Host_DeviceEnumerationComplete() event callback for device configuration instead of manual host state machine manipulations in the main application task. Added new USB_Host_ConfigurationNumber global variable to indicate the selected configuration in an attached device. Renamed global state variables that are specific to a certain USB mode to clearly indicate which mode the variable relates to, by changing the USB_* prefix to USB_Device_* or USB_Host_*. Removed the HOST_STATE_WaitForDeviceRemoval and HOST_STATE_Suspended host state machine states, as these are no longer required. Altered the USB_Host_SetDeviceConfiguration() function to update the new USB_Host_ConfigurationNumber global as required. Moved out the Host mode standard request convenience/helper functions from the architecture specific Host driver files to the architecture agnostic HostStandardReq.c driver file. --- .../LowLevel/MassStorageHost/MassStorageHost.c | 417 ++++++++++----------- .../LowLevel/MassStorageHost/MassStorageHost.h | 2 +- 2 files changed, 195 insertions(+), 224 deletions(-) (limited to 'Demos/Host/LowLevel/MassStorageHost') diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c index dd085efab..a1d39cbb3 100644 --- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c +++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c @@ -54,7 +54,8 @@ int main(void) for (;;) { - MassStorage_Task(); + MassStorageHost_Task(); + USB_USBTask(); } } @@ -102,6 +103,35 @@ void EVENT_USB_Host_DeviceUnattached(void) */ void EVENT_USB_Host_DeviceEnumerationComplete(void) { + puts_P(PSTR("Getting Config Data.\r\n")); + + uint8_t ErrorCode; + + /* Get and process the configuration descriptor data */ + if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead) + { + if (ErrorCode == ControlError) + puts_P(PSTR(ESC_FG_RED "Control Error (Get Configuration).\r\n")); + else + puts_P(PSTR(ESC_FG_RED "Invalid Device.\r\n")); + + printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode); + + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); + return; + } + + /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */ + if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful) + { + printf_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\r\n" + " -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode); + + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); + return; + } + + puts_P(PSTR("Mass Storage Disk Enumerated.\r\n")); LEDs_SetAllLEDs(LEDMASK_USB_READY); } @@ -134,240 +164,181 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, /** 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. */ -void MassStorage_Task(void) +void MassStorageHost_Task(void) { + if (USB_HostState != HOST_STATE_Configured) + return; + + /* Indicate device busy via the status LEDs */ + LEDs_SetAllLEDs(LEDMASK_USB_BUSY); + uint8_t ErrorCode; - switch (USB_HostState) + /* Send the request, display error and wait for device detach if request fails */ + if ((ErrorCode = MassStore_GetMaxLUN(&MassStore_MaxLUNIndex)) != HOST_SENDCONTROL_Successful) + { + ShowDiskReadError(PSTR("Get Max LUN"), ErrorCode); + USB_Host_SetDeviceConfiguration(0); + return; + } + + /* Print number of LUNs detected in the attached device */ + 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) + { + ShowDiskReadError(PSTR("Mass Storage Reset"), ErrorCode); + USB_Host_SetDeviceConfiguration(0); + return; + } + + /* Get sense data from the device - many devices will not accept any other commands until the sense data + * is read - both on start-up and after a failed command */ + SCSI_Request_Sense_Response_t SenseData; + if ((ErrorCode = MassStore_RequestSense(0, &SenseData)) != 0) + { + ShowDiskReadError(PSTR("Request Sense"), ErrorCode); + USB_Host_SetDeviceConfiguration(0); + return; + } + + /* Set the prevent removal flag for the device, allowing it to be accessed */ + if ((ErrorCode = MassStore_PreventAllowMediumRemoval(0, true)) != 0) + { + ShowDiskReadError(PSTR("Prevent/Allow Medium Removal"), ErrorCode); + USB_Host_SetDeviceConfiguration(0); + return; + } + + /* Get inquiry data from the device */ + SCSI_Inquiry_Response_t InquiryData; + if ((ErrorCode = MassStore_Inquiry(0, &InquiryData)) != 0) { - case HOST_STATE_Addressed: - puts_P(PSTR("Getting Config Data.\r\n")); - - /* Get and process the configuration descriptor data */ - if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead) - { - if (ErrorCode == ControlError) - puts_P(PSTR(ESC_FG_RED "Control Error (Get Configuration).\r\n")); - else - puts_P(PSTR(ESC_FG_RED "Invalid Device.\r\n")); - - printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode); - - /* Indicate error via status LEDs */ - LEDs_SetAllLEDs(LEDMASK_USB_ERROR); - - /* Wait until USB device disconnected */ - USB_HostState = HOST_STATE_WaitForDeviceRemoval; - break; - } - - /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */ - if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful) - { - printf_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\r\n" - " -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode); - - /* Indicate error via status LEDs */ - LEDs_SetAllLEDs(LEDMASK_USB_ERROR); - - /* Wait until USB device disconnected */ - USB_HostState = HOST_STATE_WaitForDeviceRemoval; - break; - } - - puts_P(PSTR("Mass Storage Disk Enumerated.\r\n")); - - USB_HostState = HOST_STATE_Configured; - break; - case HOST_STATE_Configured: - /* Indicate device busy via the status LEDs */ - 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) - { - ShowDiskReadError(PSTR("Get Max LUN"), ErrorCode); - - USB_HostState = HOST_STATE_WaitForDeviceRemoval; - break; - } - - /* Print number of LUNs detected in the attached device */ - 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) - { - ShowDiskReadError(PSTR("Mass Storage Reset"), ErrorCode); - - USB_HostState = HOST_STATE_WaitForDeviceRemoval; - break; - } - - /* Get sense data from the device - many devices will not accept any other commands until the sense data - * is read - both on start-up and after a failed command */ - SCSI_Request_Sense_Response_t SenseData; - if ((ErrorCode = MassStore_RequestSense(0, &SenseData)) != 0) - { - ShowDiskReadError(PSTR("Request Sense"), ErrorCode); - USB_HostState = HOST_STATE_WaitForDeviceRemoval; - break; - } - - /* Set the prevent removal flag for the device, allowing it to be accessed */ - if ((ErrorCode = MassStore_PreventAllowMediumRemoval(0, true)) != 0) - { - ShowDiskReadError(PSTR("Prevent/Allow Medium Removal"), ErrorCode); - - USB_HostState = HOST_STATE_WaitForDeviceRemoval; - break; - } - - /* Get inquiry data from the device */ - SCSI_Inquiry_Response_t InquiryData; - if ((ErrorCode = MassStore_Inquiry(0, &InquiryData)) != 0) - { - ShowDiskReadError(PSTR("Inquiry"), ErrorCode); - - USB_HostState = HOST_STATE_WaitForDeviceRemoval; - 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..")); - - for (;;) - { - Serial_SendByte('.'); - - /* Abort if device removed */ - if (USB_HostState == HOST_STATE_Unattached) - break; - - /* Check to see if the attached device is ready for new commands */ - ErrorCode = MassStore_TestUnitReady(0); - - /* If attached device is ready, abort the loop */ - if (!(ErrorCode)) - break; - - /* If an error other than a logical command failure (indicating device busy) returned, abort */ - if (ErrorCode != MASS_STORE_SCSI_COMMAND_FAILED) - { - ShowDiskReadError(PSTR("Test Unit Ready"), ErrorCode); - - USB_HostState = HOST_STATE_WaitForDeviceRemoval; - break; - } - } - - puts_P(PSTR("\r\nRetrieving Capacity... ")); - - /* Create new structure for the disk's capacity in blocks and block size */ - SCSI_Capacity_t DiskCapacity; - - /* Retrieve disk capacity */ - if ((ErrorCode = MassStore_ReadCapacity(0, &DiskCapacity)) != 0) - { - ShowDiskReadError(PSTR("Read Capacity"), ErrorCode); - - USB_HostState = HOST_STATE_WaitForDeviceRemoval; - break; - } - - /* Display the disk capacity in blocks * block size bytes */ - printf_P(PSTR("%lu blocks of %lu bytes.\r\n"), DiskCapacity.Blocks, DiskCapacity.BlockSize); - - /* Create a new buffer capable of holding a single block from the device */ - uint8_t BlockBuffer[DiskCapacity.BlockSize]; - - /* Read in the first 512 byte block from the device */ - if ((ErrorCode = MassStore_ReadDeviceBlock(0, 0x00000000, 1, DiskCapacity.BlockSize, BlockBuffer)) != 0) - { - ShowDiskReadError(PSTR("Read Device Block"), ErrorCode); - - USB_HostState = HOST_STATE_WaitForDeviceRemoval; - break; - } - - puts_P(PSTR("\r\nContents of first block:\r\n")); - - /* Print out the first block in both HEX and ASCII, 16 bytes per line */ - for (uint16_t Chunk = 0; Chunk < (DiskCapacity.BlockSize >> 4); Chunk++) - { - /* Pointer to the start of the current 16-byte chunk in the read block of data */ - uint8_t* ChunkPtr = &BlockBuffer[Chunk << 4]; - - /* Print out the 16 bytes of the chunk in HEX format */ - for (uint8_t ByteOffset = 0; ByteOffset < (1 << 4); ByteOffset++) - { - char CurrByte = *(ChunkPtr + ByteOffset); - - printf_P(PSTR("%.2X "), CurrByte); - } - - puts_P(PSTR(" ")); - - /* Print out the 16 bytes of the chunk in ASCII format */ - for (uint8_t ByteOffset = 0; ByteOffset < (1 << 4); ByteOffset++) - { - char CurrByte = *(ChunkPtr + ByteOffset); - - putchar(isprint(CurrByte) ? CurrByte : '.'); - } + ShowDiskReadError(PSTR("Inquiry"), ErrorCode); + USB_Host_SetDeviceConfiguration(0); + return; + } + + /* 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..")); + + for (;;) + { + Serial_SendByte('.'); + + /* Abort if device removed */ + if (USB_HostState == HOST_STATE_Unattached) + break; + + /* Check to see if the attached device is ready for new commands */ + ErrorCode = MassStore_TestUnitReady(0); + + /* If attached device is ready, abort the loop */ + if (!(ErrorCode)) + break; + + /* If an error other than a logical command failure (indicating device busy) returned, abort */ + if (ErrorCode != MASS_STORE_SCSI_COMMAND_FAILED) + { + ShowDiskReadError(PSTR("Test Unit Ready"), ErrorCode); + USB_Host_SetDeviceConfiguration(0); + return; + } + } + + puts_P(PSTR("\r\nRetrieving Capacity... ")); + + /* Create new structure for the disk's capacity in blocks and block size */ + SCSI_Capacity_t DiskCapacity; + + /* Retrieve disk capacity */ + if ((ErrorCode = MassStore_ReadCapacity(0, &DiskCapacity)) != 0) + { + ShowDiskReadError(PSTR("Read Capacity"), ErrorCode); + USB_Host_SetDeviceConfiguration(0); + return; + } + + /* Display the disk capacity in blocks * block size bytes */ + printf_P(PSTR("%lu blocks of %lu bytes.\r\n"), DiskCapacity.Blocks, DiskCapacity.BlockSize); + + /* Create a new buffer capable of holding a single block from the device */ + uint8_t BlockBuffer[DiskCapacity.BlockSize]; - puts_P(PSTR("\r\n")); - } + /* Read in the first 512 byte block from the device */ + if ((ErrorCode = MassStore_ReadDeviceBlock(0, 0x00000000, 1, DiskCapacity.BlockSize, BlockBuffer)) != 0) + { + ShowDiskReadError(PSTR("Read Device Block"), ErrorCode); + USB_Host_SetDeviceConfiguration(0); + return; + } + + puts_P(PSTR("\r\nContents of first block:\r\n")); + + /* Print out the first block in both HEX and ASCII, 16 bytes per line */ + for (uint16_t Chunk = 0; Chunk < (DiskCapacity.BlockSize >> 4); Chunk++) + { + /* Pointer to the start of the current 16-byte chunk in the read block of data */ + uint8_t* ChunkPtr = &BlockBuffer[Chunk << 4]; + + /* Print out the 16 bytes of the chunk in HEX format */ + for (uint8_t ByteOffset = 0; ByteOffset < (1 << 4); ByteOffset++) + { + char CurrByte = *(ChunkPtr + ByteOffset); + + printf_P(PSTR("%.2X "), CurrByte); + } - puts_P(PSTR("\r\n\r\nPress board button to read entire ASCII contents of disk...\r\n\r\n")); - - /* Wait for the board button to be pressed */ - while (!(Buttons_GetStatus() & BUTTONS_BUTTON1)) - { - /* Abort if device removed */ - if (USB_HostState == HOST_STATE_Unattached) - break; - } + puts_P(PSTR(" ")); - /* Abort if device removed */ - if (USB_HostState == HOST_STATE_Unattached) - break; + /* Print out the 16 bytes of the chunk in ASCII format */ + for (uint8_t ByteOffset = 0; ByteOffset < (1 << 4); ByteOffset++) + { + char CurrByte = *(ChunkPtr + ByteOffset); - /* Print out the entire disk contents in ASCII format */ - for (uint32_t CurrBlockAddress = 0; CurrBlockAddress < DiskCapacity.Blocks; CurrBlockAddress++) - { - /* Read in the next block of data from the device */ - if ((ErrorCode = MassStore_ReadDeviceBlock(0, CurrBlockAddress, 1, DiskCapacity.BlockSize, BlockBuffer)) != 0) - { - ShowDiskReadError(PSTR("Read Device Block"), ErrorCode); - - USB_HostState = HOST_STATE_WaitForDeviceRemoval; - break; - } - - /* Send the ASCII data in the read in block to the serial port */ - for (uint16_t Byte = 0; Byte < DiskCapacity.BlockSize; Byte++) - { - char CurrByte = BlockBuffer[Byte]; + putchar(isprint(CurrByte) ? CurrByte : '.'); + } - putchar(isprint(CurrByte) ? CurrByte : '.'); - } - - /* Abort if device removed */ - if (USB_HostState == HOST_STATE_Unattached) - break; - } + puts_P(PSTR("\r\n")); + } - /* Indicate device no longer busy */ - LEDs_SetAllLEDs(LEDMASK_USB_READY); + puts_P(PSTR("\r\n\r\nPress board button to read entire ASCII contents of disk...\r\n\r\n")); - /* Wait until USB device disconnected */ - USB_HostState = HOST_STATE_WaitForDeviceRemoval; - break; + /* Wait for the board button to be pressed */ + while (!(Buttons_GetStatus() & BUTTONS_BUTTON1)) + { + /* Abort if device removed */ + if (USB_HostState == HOST_STATE_Unattached) + return; } + + /* Print out the entire disk contents in ASCII format */ + for (uint32_t CurrBlockAddress = 0; CurrBlockAddress < DiskCapacity.Blocks; CurrBlockAddress++) + { + /* Read in the next block of data from the device */ + if ((ErrorCode = MassStore_ReadDeviceBlock(0, CurrBlockAddress, 1, DiskCapacity.BlockSize, BlockBuffer)) != 0) + { + ShowDiskReadError(PSTR("Read Device Block"), ErrorCode); + USB_Host_SetDeviceConfiguration(0); + return; + } + + /* Send the ASCII data in the read in block to the serial port */ + for (uint16_t Byte = 0; Byte < DiskCapacity.BlockSize; Byte++) + { + char CurrByte = BlockBuffer[Byte]; + + putchar(isprint(CurrByte) ? CurrByte : '.'); + } + } + + /* Indicate device no longer busy */ + LEDs_SetAllLEDs(LEDMASK_USB_READY); + USB_Host_SetDeviceConfiguration(0); } /** Indicates that a communication error has occurred with the attached Mass Storage Device, diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h index 92bfb65b5..0aec46fd0 100644 --- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h +++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h @@ -74,8 +74,8 @@ #define LEDMASK_USB_BUSY LEDS_LED2 /* Function Prototypes: */ - void MassStorage_Task(void); void SetupHardware(void); + void MassStorageHost_Task(void); void EVENT_USB_Host_HostError(const uint8_t ErrorCode); void EVENT_USB_Host_DeviceAttached(void); -- cgit v1.2.3