Fix accidentally changed code breaking the HID descriptor parser.

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

diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
index 1adec5b..855ce8d 100644 (file)
--- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
+++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
@@ -79,7 +79,7 @@ void SetupHardware(void)
 /** 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
 /** 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(ESC_FG_GREEN "Device Attached.\r\n" ESC_FG_WHITE));\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 {\r
        puts_P(PSTR(ESC_FG_GREEN "Device Attached.\r\n" ESC_FG_WHITE));\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r


@@ -88,7 +88,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(ESC_FG_GREEN "\r\nDevice Unattached.\r\n" ESC_FG_WHITE));\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 {\r
        puts_P(PSTR(ESC_FG_GREEN "\r\nDevice Unattached.\r\n" ESC_FG_WHITE));\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r


@@ -97,18 +97,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_FG_RED "Host Mode Error\r\n"));\r
-       printf_P(PSTR(" -- Error Code %d\r\n" ESC_FG_WHITE), 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


@@ -117,12 +117,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_FG_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" ESC_FG_WHITE), 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


@@ -160,8 +160,8 @@ void MassStorage_Task(void)
                        /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */\r
                        if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)\r
                        {\r
                        /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */\r
                        if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)\r
                        {\r

-                               puts_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\r\n"));\r
-                               printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);\r
+                               printf_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\r\n"\r
+                                                        " -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);\r

 \r
                                /* Indicate error via status LEDs */\r
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r
                                /* Indicate error via status LEDs */\r
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r


@@ -171,21 +171,18 @@ void MassStorage_Task(void)
                                break;\r
                        }\r
                                \r
                                break;\r
                        }\r
                                \r

+                       puts_P(PSTR("Mass Storage Disk Enumerated.\r\n"));\r
+\r

                        USB_HostState = HOST_STATE_Configured;\r
                        break;\r
                case HOST_STATE_Configured:\r
                        USB_HostState = HOST_STATE_Configured;\r
                        break;\r
                case HOST_STATE_Configured:\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
                        /* 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
+                               ShowDiskReadError(PSTR("Get Max LUN"), ErrorCode);\r

 \r
                                USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                break;\r
 \r
                                USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                break;\r


@@ -197,7 +194,7 @@ void MassStorage_Task(void)
                        /* Reset the Mass Storage device interface, ready for use */\r
                        if ((ErrorCode = MassStore_MassStorageReset()) != HOST_SENDCONTROL_Successful)\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
+                               ShowDiskReadError(PSTR("Mass Storage Reset"), ErrorCode);\r

                                \r
                                USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                break;\r
                                \r
                                USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                break;\r


@@ -206,16 +203,17 @@ void MassStorage_Task(void)
                        /* 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
                        /* 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
+                       if ((ErrorCode = MassStore_RequestSense(0, &SenseData)) != 0)\r

                        {\r
                        {\r

-                               ShowDiskReadError(PSTR("Request Sense"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r
+                               ShowDiskReadError(PSTR("Request Sense"), ErrorCode);\r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

                                break;\r
                        }\r
                        \r
                        /* Set the prevent removal flag for the device, allowing it to be accessed */\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
+                       if ((ErrorCode = MassStore_PreventAllowMediumRemoval(0, true)) != 0)\r

                        {\r
                        {\r

-                               ShowDiskReadError(PSTR("Prevent/Allow Medium Removal"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r
+                               ShowDiskReadError(PSTR("Prevent/Allow Medium Removal"), ErrorCode);\r

                                \r
                                USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                break;\r
                                \r
                                USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                break;\r


@@ -223,9 +221,9 @@ void MassStorage_Task(void)
 \r
                        /* Get inquiry data from the device */\r
                        SCSI_Inquiry_Response_t InquiryData;\r
 \r
                        /* Get inquiry data from the device */\r
                        SCSI_Inquiry_Response_t InquiryData;\r

-                       if (((ErrorCode = MassStore_Inquiry(0, &InquiryData)) != 0) || (SCSICommandStatus.Status != Command_Pass))\r
+                       if ((ErrorCode = MassStore_Inquiry(0, &InquiryData)) != 0)\r

                        {\r
                        {\r

-                               ShowDiskReadError(PSTR("Inquiry"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r
+                               ShowDiskReadError(PSTR("Inquiry"), ErrorCode);\r

                                \r
                                USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                break;\r
                                \r
                                USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                break;\r


@@ -237,23 +235,30 @@ void MassStorage_Task(void)
                        /* Wait until disk ready */\r
                        puts_P(PSTR("Waiting until ready.."));\r
 \r
                        /* Wait until disk ready */\r
                        puts_P(PSTR("Waiting until ready.."));\r
 \r

-                       do\r
+                       for (;;)\r

                        {\r
                                Serial_TxByte('.');\r
                        {\r
                                Serial_TxByte('.');\r

-                               \r
-                               if ((ErrorCode = MassStore_TestUnitReady(0)) != 0)\r
+\r
+                               /* Abort if device removed */\r
+                               if (USB_HostState == HOST_STATE_Unattached)\r
+                                 break;\r
+\r
+                               /* Check to see if the attached device is ready for new commands */\r
+                               ErrorCode = MassStore_TestUnitReady(0);\r
+                                 \r
+                               /* If attached device is ready, abort the loop */\r
+                               if (!(ErrorCode))\r
+                                 break;\r
+\r
+                               /* If an error othe than a logical command failure (indicating device busy) returned, abort */\r
+                               if (ErrorCode != MASS_STORE_SCSI_COMMAND_FAILED)\r

                                {\r
                                {\r

-                                       ShowDiskReadError(PSTR("Test Unit Ready"), false, ErrorCode);\r
+                                       ShowDiskReadError(PSTR("Test Unit Ready"), ErrorCode);\r

 \r
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                        break;\r
                                }\r
                        }\r
 \r
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\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
 \r
                        puts_P(PSTR("\r\nRetrieving Capacity... "));\r
 \r


@@ -261,9 +266,9 @@ void MassStorage_Task(void)
                        SCSI_Capacity_t DiskCapacity;\r
 \r
                        /* Retrieve disk capacity */\r
                        SCSI_Capacity_t DiskCapacity;\r
 \r
                        /* Retrieve disk capacity */\r

-                       if (((ErrorCode = MassStore_ReadCapacity(0, &DiskCapacity)) != 0) || (SCSICommandStatus.Status != Command_Pass))\r
+                       if ((ErrorCode = MassStore_ReadCapacity(0, &DiskCapacity)) != 0)\r

                        {\r
                        {\r

-                               ShowDiskReadError(PSTR("Read Capacity"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r
+                               ShowDiskReadError(PSTR("Read Capacity"), ErrorCode);\r

                                \r
                                USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                break;\r
                                \r
                                USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                break;\r


@@ -276,10 +281,9 @@ void MassStorage_Task(void)
                        uint8_t BlockBuffer[DiskCapacity.BlockSize];\r
 \r
                        /* Read in the first 512 byte 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
+                       if ((ErrorCode = MassStore_ReadDeviceBlock(0, 0x00000000, 1, DiskCapacity.BlockSize, BlockBuffer)) != 0)\r

                        {\r
                        {\r

-                               ShowDiskReadError(PSTR("Read Device Block"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r
+                               ShowDiskReadError(PSTR("Read Device Block"), ErrorCode);\r

                                \r
                                USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                break;\r
                                \r
                                USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                break;\r


@@ -320,18 +324,21 @@ void MassStorage_Task(void)
                        while (!(Buttons_GetStatus() & BUTTONS_BUTTON1))\r
                        {\r
                                /* Abort if device removed */\r
                        while (!(Buttons_GetStatus() & BUTTONS_BUTTON1))\r
                        {\r
                                /* Abort if device removed */\r

-                               if (!(USB_IsConnected))\r
+                               if (USB_HostState == HOST_STATE_Unattached)\r

                                  break;\r
                        }\r
                                  break;\r
                        }\r

+\r
+                       /* Abort if device removed */\r
+                       if (USB_HostState == HOST_STATE_Unattached)\r
+                         break;\r

                        \r
                        /* Print out the entire disk contents in ASCII format */\r
                        \r
                        /* Print out the entire disk contents in ASCII format */\r

-                       for (uint32_t CurrBlock = 0; CurrBlock < DiskCapacity.Blocks; CurrBlock++)\r
+                       for (uint32_t CurrBlockAddress = 0; CurrBlockAddress < DiskCapacity.Blocks; CurrBlockAddress++)\r

                        {\r
                                /* Read in the next block of data from the device */\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
+                               if ((ErrorCode = MassStore_ReadDeviceBlock(0, CurrBlockAddress, 1, DiskCapacity.BlockSize, BlockBuffer)) != 0)\r

                                {\r
                                {\r

-                                       ShowDiskReadError(PSTR("Read Device Block"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r
+                                       ShowDiskReadError(PSTR("Read Device Block"), ErrorCode);\r

                                        \r
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                        break;\r
                                        \r
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                        break;\r


@@ -346,7 +353,7 @@ void MassStorage_Task(void)
                                }\r
 \r
                                /* Abort if device removed */\r
                                }\r
 \r
                                /* Abort if device removed */\r

-                               if (!(USB_IsConnected))\r
+                               if (USB_HostState == HOST_STATE_Unattached)\r

                                  break;\r
                        }\r
                        \r
                                  break;\r
                        }\r
                        \r


@@ -363,17 +370,15 @@ void MassStorage_Task(void)
  *  printing error codes to the serial port and waiting until the device is removed before\r
  *  continuing.\r
  *\r
  *  printing error codes to the serial port and waiting until the device is removed before\r
  *  continuing.\r
  *\r

- *  \param[in] CommandString      ASCII string located in PROGMEM space indicating what operation failed\r
- *  \param[in] FailedAtSCSILayer  Indicates if the command failed at the (logical) SCSI layer or at the physical USB layer\r
- *  \param[in] ErrorCode          Error code of the function which failed to complete successfully\r
+ *  \param[in] CommandString  ASCII string located in PROGMEM space indicating what operation failed\r
+ *  \param[in] ErrorCode      Error code of the function which failed to complete successfully\r

  */\r
  */\r

-void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t ErrorCode)\r
+void ShowDiskReadError(char* CommandString, uint8_t ErrorCode)\r

 {\r
 {\r

-       if (FailedAtSCSILayer)\r
+       if (ErrorCode == MASS_STORE_SCSI_COMMAND_FAILED)\r

        {\r
                /* Display the error code */\r
                printf_P(PSTR(ESC_FG_RED "SCSI command error (%S).\r\n"), CommandString);\r
        {\r
                /* Display the error code */\r
                printf_P(PSTR(ESC_FG_RED "SCSI command error (%S).\r\n"), CommandString);\r

-               printf_P(PSTR("  -- Status Code: %d" ESC_FG_WHITE), ErrorCode);\r

        }\r
        else\r
        {\r
        }\r
        else\r
        {\r