Fix accidentally changed code breaking the HID descriptor parser.

[pub/USBasp.git] / Demos / Host / ClassDriver / MassStorageHost / MassStorageHost.c

diff --git a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c
index 354a75f..d22e074 100644 (file)
--- a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c
+++ b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c
@@ -33,14 +33,23 @@
  *  Main source file for the MassStorageHost demo. This file contains the main tasks of\r
  *  the demo and is responsible for the initial application hardware configuration.\r
  */\r
  *  Main source file for the MassStorageHost demo. This file contains the main tasks of\r
  *  the demo and is responsible for the initial application hardware configuration.\r
  */\r

-\r
+ \r

 #include "MassStorageHost.h"\r
 \r
 #include "MassStorageHost.h"\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
+/** LUFA Mass Storage Class driver interface configuration and state information. This structure is\r
+ *  passed to all Mass Storage Class driver functions, so that multiple instances of the same class\r
+ *  within a device can be differentiated from one another.\r
+ */\r
+USB_ClassInfo_MS_Host_t FlashDisk_MS_Interface =\r
+       {\r
+               .Config =\r
+                       {\r
+                               .DataINPipeNumber       = 1,\r
+                               .DataOUTPipeNumber      = 2,\r
+                       },\r
+       };\r

 \r
 \r

+       \r

 /** Main program entry point. This routine configures the hardware required by the application, then\r
  *  starts the scheduler to run the application tasks.\r
  */\r
 /** Main program entry point. This routine configures the hardware required by the application, then\r
  *  starts the scheduler to run the application tasks.\r
  */\r


@@ -48,14 +57,172 @@ int main(void)
 {\r
        SetupHardware();\r
 \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
+       puts_P(PSTR(ESC_FG_CYAN "Mass Storage Host Demo running.\r\n" ESC_FG_WHITE));\r

 \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 \r
        for (;;)\r
        {\r
 \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 \r
        for (;;)\r
        {\r

-               MassStorage_Task();\r
+               switch (USB_HostState)\r
+               {\r
+                       case HOST_STATE_Addressed:\r
+                               LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
+                       \r
+                               uint16_t ConfigDescriptorSize;\r
+                               uint8_t  ConfigDescriptorData[512];\r
+\r
+                               if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
+                                                                 sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
+                               {\r
+                                       printf("Error Retrieving Configuration Descriptor.\r\n");\r
+                                       LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+                                       USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+                                       break;\r
+                               }\r
+\r
+                               if (MS_Host_ConfigurePipes(&FlashDisk_MS_Interface,\r
+                                                           ConfigDescriptorSize, ConfigDescriptorData) != MS_ENUMERROR_NoError)\r
+                               {\r
+                                       printf("Attached Device Not a Valid Mass Storage Device.\r\n");\r
+                                       LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+                                       USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+                                       break;\r
+                               }\r
+                               \r
+                               if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)\r
+                               {\r
+                                       printf("Error Setting Device Configuration.\r\n");\r
+                                       LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+                                       USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+                                       break;\r
+                               }\r
+                               \r
+                               printf("Mass Storage Device Enumerated.\r\n");\r
+                               USB_HostState = HOST_STATE_Configured;\r
+                               break;\r
+                       case HOST_STATE_Configured:\r
+                               LEDs_SetAllLEDs(LEDMASK_USB_BUSY);\r
+                               \r
+                               uint8_t MaxLUNIndex;\r
+                               if (MS_Host_GetMaxLUN(&FlashDisk_MS_Interface, &MaxLUNIndex))\r
+                               {\r
+                                       printf("Error retrieving max LUN index.\r\n");\r
+                                       LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+                                       USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+                                       break;\r
+                               }\r
+                               \r
+                               printf("Total LUNs: %d - Using first LUN in device.\r\n", (MaxLUNIndex + 1));\r
+                               \r
+                               if (MS_Host_ResetMSInterface(&FlashDisk_MS_Interface))\r
+                               {\r
+                                       printf("Error resetting Mass Storage interface.\r\n");\r
+                                       LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+                                       USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+                                       break;\r
+                               }\r
+                               \r
+                               SCSI_Request_Sense_Response_t SenseData;\r
+                               if (MS_Host_RequestSense(&FlashDisk_MS_Interface, 0, &SenseData) != 0)\r
+                               {\r
+                                       printf("Error retrieving device sense.\r\n");\r
+                                       LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+                                       USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+                                       break;\r
+                               }\r
+                       \r
+                               if (MS_Host_PreventAllowMediumRemoval(&FlashDisk_MS_Interface, 0, true))\r
+                               {\r
+                                       printf("Error setting Prevent Device Removal bit.\r\n");\r
+                                       LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+                                       USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+                                       break;\r
+                               }\r
+\r
+                               SCSI_Inquiry_Response_t InquiryData;\r
+                               if (MS_Host_GetInquiryData(&FlashDisk_MS_Interface, 0, &InquiryData))\r
+                               {\r
+                                       printf("Error retreiving device Inquiry data.\r\n");\r
+                                       LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+                                       USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+                                       break;                          \r
+                               }\r
+\r
+                               printf("Vendor \"%.8s\", Product \"%.16s\"\r\n", InquiryData.VendorID, InquiryData.ProductID);\r
+                               \r
+                               printf("Waiting until ready...\r\n");\r
+\r
+                               for (;;)\r
+                               {\r
+                                       uint8_t ErrorCode = MS_Host_TestUnitReady(&FlashDisk_MS_Interface, 0);\r
+                                       \r
+                                       if (!(ErrorCode))\r
+                                         break;\r
+\r
+                                       /* Check if an error other than a logical command error (device busy) received */\r
+                                       if (ErrorCode != MS_ERROR_LOGICAL_CMD_FAILED)\r
+                                       {\r
+                                               printf("Error waiting for device to be ready.\r\n");\r
+                                               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+                                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+                                               break;\r
+                                       }\r
+                               }\r
+\r
+                               printf("Retrieving Capacity... ");\r
+\r
+                               SCSI_Capacity_t DiskCapacity;\r
+                               if (MS_Host_ReadDeviceCapacity(&FlashDisk_MS_Interface, 0, &DiskCapacity))\r
+                               {\r
+                                       printf("Error retrieving device capacity.\r\n");\r
+                                       LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+                                       USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+                                       break;\r
+                               }\r
+                               \r
+                               printf("%lu blocks of %lu bytes.\r\n", DiskCapacity.Blocks, DiskCapacity.BlockSize);\r
+\r
+                               uint8_t BlockBuffer[DiskCapacity.BlockSize];\r
+\r
+                               if (MS_Host_ReadDeviceBlocks(&FlashDisk_MS_Interface, 0, 0x00000000, 1, DiskCapacity.BlockSize, BlockBuffer))\r
+                               {\r
+                                       printf("Error reading device block.\r\n");\r
+                                       LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+                                       USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+                                       break;\r
+                               }\r
+                       \r
+                               printf("\r\nContents of first block:\r\n");\r
+\r
+                               for (uint16_t Chunk = 0; Chunk < (DiskCapacity.BlockSize >> 4); Chunk++)\r
+                               {\r
+                                       uint8_t* ChunkPtr = &BlockBuffer[Chunk << 4];\r
+                                       \r
+                                       /* Print out the 16 bytes of the chunk in HEX format */\r
+                                       for (uint8_t ByteOffset = 0; ByteOffset < (1 << 4); ByteOffset++)\r
+                                       {\r
+                                               char CurrByte = *(ChunkPtr + ByteOffset);\r
+                                               printf_P(PSTR("%.2X "), CurrByte);\r
+                                       }\r
+                                       \r
+                                       printf("    ");\r
+\r
+                                       /* Print out the 16 bytes of the chunk in ASCII format */\r
+                                       for (uint8_t ByteOffset = 0; ByteOffset < (1 << 4); ByteOffset++)\r
+                                       {\r
+                                               char CurrByte = *(ChunkPtr + ByteOffset);\r
+                                               putchar(isprint(CurrByte) ? CurrByte : '.');\r
+                                       }\r
+                                       \r
+                                       printf("\r\n");\r
+                               }\r
+\r
+                               LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+                               break;\r
+               }\r
+       \r
+               MS_Host_USBTask(&FlashDisk_MS_Interface);\r

                USB_USBTask();\r
        }\r
 }\r
                USB_USBTask();\r
        }\r
 }\r


@@ -73,14 +240,13 @@ void SetupHardware(void)
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r
        LEDs_Init();\r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r
        LEDs_Init();\r

-       Buttons_Init();\r

        USB_Init();\r
 }\r
 \r
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and\r
  *  starts the library USB task to begin the enumeration and USB management process.\r
  */\r
        USB_Init();\r
 }\r
 \r
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and\r
  *  starts the library USB task to begin the enumeration and USB management process.\r
  */\r

-void EVENT_USB_DeviceAttached(void)\r
+void EVENT_USB_Host_DeviceAttached(void)\r

 {\r
        puts_P(PSTR("Device Attached.\r\n"));\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 {\r
        puts_P(PSTR("Device Attached.\r\n"));\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r


@@ -89,7 +255,7 @@ void EVENT_USB_DeviceAttached(void)
 /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and\r
  *  stops the library USB task management process.\r
  */\r
 /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and\r
  *  stops the library USB task management process.\r
  */\r

-void EVENT_USB_DeviceUnattached(void)\r
+void EVENT_USB_Host_DeviceUnattached(void)\r

 {\r
        puts_P(PSTR("\r\nDevice Unattached.\r\n"));\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 {\r
        puts_P(PSTR("\r\nDevice Unattached.\r\n"));\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r


@@ -98,18 +264,18 @@ void EVENT_USB_DeviceUnattached(void)
 /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully\r
  *  enumerated by the host and is now ready to be used by the application.\r
  */\r
 /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully\r
  *  enumerated by the host and is now ready to be used by the application.\r
  */\r

-void EVENT_USB_DeviceEnumerationComplete(void)\r
+void EVENT_USB_Host_DeviceEnumerationComplete(void)\r

 {\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
 {\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

-void EVENT_USB_HostError(const uint8_t ErrorCode)\r
+void EVENT_USB_Host_HostError(const uint8_t ErrorCode)\r

 {\r
        USB_ShutDown();\r
 \r
 {\r
        USB_ShutDown();\r
 \r

-       puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));\r
-       printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r
+       printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"\r
+                                " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);\r

 \r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
        for(;;);\r
 \r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
        for(;;);\r


@@ -118,263 +284,12 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while\r
  *  enumerating an attached USB device.\r
  */\r
 /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while\r
  *  enumerating an attached USB device.\r
  */\r

-void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)\r
+void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)\r

 {\r
 {\r

-       puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));\r
-       printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r
-       printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);\r
-       printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);\r
+       printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"\r
+                                " -- Error Code %d\r\n"\r
+                                " -- Sub Error Code %d\r\n"\r
+                                " -- In State %d\r\n" ESC_FG_WHITE), ErrorCode, SubErrorCode, USB_HostState);\r

        \r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
        \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
-void MassStorage_Task(void)\r
-{\r
-       uint8_t ErrorCode;\r
-\r
-       switch (USB_HostState)\r
-       {\r
-               case HOST_STATE_Addressed:\r
-                       /* Standard request to set the device configuration to configuration 1 */\r
-                       USB_ControlRequest = (USB_Request_Header_t)\r
-                               {\r
-                                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
-                                       .bRequest      = REQ_SetConfiguration,\r
-                                       .wValue        = 1,\r
-                                       .wIndex        = 0,\r
-                                       .wLength       = 0,\r
-                               };\r
-                               \r
-                       /* Select the control pipe for the request transfer */\r
-                       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
-\r
-                       /* Send the request, display error and wait for device detach if request fails */\r
-                       if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
-                       {\r
-                               puts_P(PSTR("Control Error (Set Configuration).\r\n"));\r
-                               printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);\r
-\r
-                               /* Indicate error via status LEDs */\r
-                               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
-\r
-                               /* Wait until USB device disconnected */\r
-                               while (USB_IsConnected);\r
-                               break;\r
-                       }\r
-                               \r
-                       USB_HostState = HOST_STATE_Configured;\r
-                       break;\r
-               case HOST_STATE_Configured:\r
-                       puts_P(PSTR("Getting Config Data.\r\n"));\r
-               \r
-                       /* Get and process the configuration descriptor data */\r
-                       if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)\r
-                       {\r
-                               if (ErrorCode == ControlError)\r
-                                 puts_P(PSTR("Control Error (Get Configuration).\r\n"));\r
-                               else\r
-                                 puts_P(PSTR("Invalid Device.\r\n"));\r
-\r
-                               printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);\r
-                               \r
-                               /* Indicate error via status LEDs */\r
-                               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
-\r
-                               /* Wait until USB device disconnected */\r
-                               while (USB_IsConnected);\r
-                               break;\r
-                       }\r
-\r
-                       puts_P(PSTR("Mass Storage Disk Enumerated.\r\n"));\r
-                               \r
-                       USB_HostState = HOST_STATE_Ready;\r
-                       break;\r
-               case HOST_STATE_Ready:\r
-                       /* Indicate device busy via the status LEDs */\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
-                               ShowDiskReadError(PSTR("Get Max LUN"), false, ErrorCode);\r
-                               break;\r
-                       }\r
-                       \r
-                       /* Print number of LUNs detected in the attached device */\r
-                       printf_P(PSTR("Total LUNs: %d.\r\n"), (MassStore_MaxLUNIndex + 1));\r
-                       \r
-                       /* Reset the Mass Storage device interface, ready for use */\r
-                       if ((ErrorCode = MassStore_MassStorageReset()) != HOST_SENDCONTROL_Successful)\r
-                       {\r
-                               ShowDiskReadError(PSTR("Mass Storage Reset"), false, ErrorCode);\r
-                               break;\r
-                       }\r
-                       \r
-                       /* Get sense data from the device - many devices will not accept any other commands until the sense data\r
-                        * is read - both on start-up and after a failed command */\r
-                       SCSI_Request_Sense_Response_t SenseData;\r
-                       if (((ErrorCode = MassStore_RequestSense(0, &SenseData)) != 0) || (SCSICommandStatus.Status != Command_Pass))\r
-                       {\r
-                               ShowDiskReadError(PSTR("Request Sense"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r
-                               break;\r
-                       }\r
-                       \r
-                       /* Set the prevent removal flag for the device, allowing it to be accessed */\r
-                       if (((ErrorCode = MassStore_PreventAllowMediumRemoval(0, true)) != 0) || (SCSICommandStatus.Status != Command_Pass))\r
-                       {\r
-                               ShowDiskReadError(PSTR("Prevent/Allow Medium Removal"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r
-                               break;\r
-                       }\r
-\r
-                       puts_P(PSTR("Waiting until ready.."));\r
-                       \r
-                       /* Wait until disk ready */\r
-                       do\r
-                       {\r
-                               Serial_TxByte('.');\r
-                               \r
-                               if ((ErrorCode = MassStore_TestUnitReady(0)) != 0)\r
-                               {\r
-                                       ShowDiskReadError(PSTR("Test Unit Ready"), false, ErrorCode);\r
-                                       break;                          \r
-                               }\r
-                       }\r
-                       while ((SCSICommandStatus.Status != Command_Pass) && USB_IsConnected);\r
-                       \r
-                       /* Abort if device removed */\r
-                       if (!(USB_IsConnected))\r
-                         break;\r
-\r
-                       puts_P(PSTR("\r\nRetrieving Capacity... "));\r
-\r
-                       /* Create new structure for the disk's capacity in blocks and block size */\r
-                       SCSI_Capacity_t DiskCapacity;\r
-\r
-                       /* Retrieve disk capacity */\r
-                       if (((ErrorCode = MassStore_ReadCapacity(0, &DiskCapacity)) != 0) || (SCSICommandStatus.Status != Command_Pass))\r
-                       {\r
-                               ShowDiskReadError(PSTR("Read Capacity"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r
-                               break;\r
-                       }\r
-                       \r
-                       /* Display the disk capacity in blocks * block size bytes */\r
-                       printf_P(PSTR("%lu blocks of %lu bytes.\r\n"), DiskCapacity.Blocks, DiskCapacity.BlockSize);\r
-\r
-                       /* Create a new buffer capabable of holding a single block from the device */\r
-                       uint8_t BlockBuffer[DiskCapacity.BlockSize];\r
-\r
-                       /* Read in the first 512 byte block from the device */\r
-                       if (((ErrorCode = MassStore_ReadDeviceBlock(0, 0x00000000, 1, DiskCapacity.BlockSize, BlockBuffer)) != 0) ||\r
-                           (SCSICommandStatus.Status != Command_Pass))\r
-                       {\r
-                               ShowDiskReadError(PSTR("Read Device Block"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r
-                               break;\r
-                       }\r
-                       \r
-                       puts_P(PSTR("\r\nContents of first block:\r\n"));\r
-\r
-                       /* Print out the first block in both HEX and ASCII, 16 bytes per line */\r
-                       for (uint16_t Chunk = 0; Chunk < (DiskCapacity.BlockSize >> 4); Chunk++)\r
-                       {\r
-                               /* Pointer to the start of the current 16-byte chunk in the read block of data */\r
-                               uint8_t* ChunkPtr = &BlockBuffer[Chunk << 4];\r
-                               \r
-                               /* Print out the 16 bytes of the chunk in HEX format */\r
-                               for (uint8_t ByteOffset = 0; ByteOffset < (1 << 4); ByteOffset++)\r
-                               {\r
-                                       char CurrByte = *(ChunkPtr + ByteOffset);\r
-                               \r
-                                       printf_P(PSTR("%.2X "), CurrByte);\r
-                               }\r
-                               \r
-                               puts_P(PSTR("    "));\r
-\r
-                               /* Print out the 16 bytes of the chunk in ASCII format */\r
-                               for (uint8_t ByteOffset = 0; ByteOffset < (1 << 4); ByteOffset++)\r
-                               {\r
-                                       char CurrByte = *(ChunkPtr + ByteOffset);\r
-                               \r
-                                       putchar(isprint(CurrByte) ? CurrByte : '.');\r
-                               }\r
-                               \r
-                               puts_P(PSTR("\r\n"));\r
-                       }\r
-                       \r
-                       puts_P(PSTR("\r\n\r\nPress board button to read entire ASCII contents of disk...\r\n\r\n"));\r
-                       \r
-                       /* Wait for the board button to be pressed */\r
-                       while (!(Buttons_GetStatus() & BUTTONS_BUTTON1))\r
-                       {\r
-                               /* Abort if device removed */\r
-                               if (!(USB_IsConnected))\r
-                                 break;\r
-                       }\r
-                       \r
-                       /* Print out the entire disk contents in ASCII format */\r
-                       for (uint32_t CurrBlock = 0; CurrBlock < DiskCapacity.Blocks; CurrBlock++)\r
-                       {\r
-                               /* Read in the next block of data from the device */\r
-                               if (((ErrorCode = MassStore_ReadDeviceBlock(0, CurrBlock, 1, DiskCapacity.BlockSize, BlockBuffer)) != 0) ||\r
-                                   (SCSICommandStatus.Status != Command_Pass))\r
-                               {\r
-                                       ShowDiskReadError(PSTR("Read Device Block"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r
-                                       break;\r
-                               }\r
-\r
-                               /* Send the ASCII data in the read in block to the serial port */\r
-                               for (uint16_t Byte = 0; Byte < DiskCapacity.BlockSize; Byte++)\r
-                               {\r
-                                       char CurrByte = BlockBuffer[Byte];\r
-                                       \r
-                                       putchar(isprint(CurrByte) ? CurrByte : '.');\r
-                               }\r
-\r
-                               /* Abort if device removed */\r
-                               if (!(USB_IsConnected))\r
-                                 break;\r
-                       }\r
-                       \r
-                       /* Indicate device no longer busy */\r
-                       LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
-                       \r
-                       /* Wait until USB device disconnected */\r
-                       while (USB_IsConnected);\r
-                       \r
-                       break;\r
-       }\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
- *\r
- *  \param CommandString  ASCII string located in PROGMEM space indicating what operation failed\r
- *  \param FailedAtSCSILayer  Indicates if the command failed at the (logical) SCSI layer or at the physical USB layer\r
- *  \param ErrorCode      Error code of the function which failed to complete successfully\r
- */\r
-void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t ErrorCode)\r
-{\r
-       if (FailedAtSCSILayer)\r
-       {\r
-               /* Display the error code */\r
-               printf_P(PSTR(ESC_BG_RED "SCSI command error (%S).\r\n"), CommandString);\r
-               printf_P(PSTR("  -- Status Code: %d"), ErrorCode);\r
-       }\r
-       else\r
-       {\r
-               /* Display the error code */\r
-               printf_P(PSTR(ESC_BG_RED "Command error (%S).\r\n"), CommandString);\r
-               printf_P(PSTR("  -- Error Code: %d"), ErrorCode);       \r
-       }\r
-\r
-       Pipe_Freeze();\r
-\r
-       /* Indicate device error via the status LEDs */\r
-       LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
-\r
-       /* Wait until USB device disconnected */\r
-       while (USB_IsConnected);\r
-}\r