Added new HOST_STATE_WaitForDeviceRemoval host state machine state for non-blocking...

[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 2f84d0f..1bb94f6 100644 (file)
--- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
+++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
@@ -154,7 +154,7 @@ void MassStorage_Task(void)
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r
                                /* Wait until USB device disconnected */\r
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r
                                /* Wait until USB device disconnected */\r

-                               while (USB_IsConnected);\r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

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


@@ -168,7 +168,7 @@ void MassStorage_Task(void)
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r
                                /* Wait until USB device disconnected */\r
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r
                                /* Wait until USB device disconnected */\r

-                               while (USB_IsConnected);\r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

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


@@ -187,6 +187,8 @@ void MassStorage_Task(void)
                        if ((ErrorCode = MassStore_GetMaxLUN(&MassStore_MaxLUNIndex)) != HOST_SENDCONTROL_Successful)\r
                        {       \r
                                ShowDiskReadError(PSTR("Get Max LUN"), false, ErrorCode);\r
                        if ((ErrorCode = MassStore_GetMaxLUN(&MassStore_MaxLUNIndex)) != HOST_SENDCONTROL_Successful)\r
                        {       \r
                                ShowDiskReadError(PSTR("Get Max LUN"), false, ErrorCode);\r

+\r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

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


@@ -197,6 +199,8 @@ void MassStorage_Task(void)
                        if ((ErrorCode = MassStore_MassStorageReset()) != HOST_SENDCONTROL_Successful)\r
                        {\r
                                ShowDiskReadError(PSTR("Mass Storage Reset"), false, ErrorCode);\r
                        if ((ErrorCode = MassStore_MassStorageReset()) != HOST_SENDCONTROL_Successful)\r
                        {\r
                                ShowDiskReadError(PSTR("Mass Storage Reset"), false, ErrorCode);\r

+                               \r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

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


@@ -213,6 +217,8 @@ void MassStorage_Task(void)
                        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
                        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

+                               \r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

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


@@ -221,6 +227,8 @@ void MassStorage_Task(void)
                        if (((ErrorCode = MassStore_Inquiry(0, &InquiryData)) != 0) || (SCSICommandStatus.Status != Command_Pass))\r
                        {\r
                                ShowDiskReadError(PSTR("Inquiry"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r
                        if (((ErrorCode = MassStore_Inquiry(0, &InquiryData)) != 0) || (SCSICommandStatus.Status != Command_Pass))\r
                        {\r
                                ShowDiskReadError(PSTR("Inquiry"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r

+                               \r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

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


@@ -237,7 +245,9 @@ void MassStorage_Task(void)
                                if ((ErrorCode = MassStore_TestUnitReady(0)) != 0)\r
                                {\r
                                        ShowDiskReadError(PSTR("Test Unit Ready"), false, ErrorCode);\r
                                if ((ErrorCode = MassStore_TestUnitReady(0)) != 0)\r
                                {\r
                                        ShowDiskReadError(PSTR("Test Unit Ready"), false, ErrorCode);\r

-                                       break;                          \r
+\r
+                                       USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+                                       break;\r

                                }\r
                        }\r
                        while ((SCSICommandStatus.Status != Command_Pass) && USB_IsConnected);\r
                                }\r
                        }\r
                        while ((SCSICommandStatus.Status != Command_Pass) && USB_IsConnected);\r


@@ -255,6 +265,8 @@ void MassStorage_Task(void)
                        if (((ErrorCode = MassStore_ReadCapacity(0, &DiskCapacity)) != 0) || (SCSICommandStatus.Status != Command_Pass))\r
                        {\r
                                ShowDiskReadError(PSTR("Read Capacity"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r
                        if (((ErrorCode = MassStore_ReadCapacity(0, &DiskCapacity)) != 0) || (SCSICommandStatus.Status != Command_Pass))\r
                        {\r
                                ShowDiskReadError(PSTR("Read Capacity"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r

+                               \r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

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


@@ -269,6 +281,8 @@ void MassStorage_Task(void)
                            (SCSICommandStatus.Status != Command_Pass))\r
                        {\r
                                ShowDiskReadError(PSTR("Read Device Block"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r
                            (SCSICommandStatus.Status != Command_Pass))\r
                        {\r
                                ShowDiskReadError(PSTR("Read Device Block"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r

+                               \r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

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


@@ -319,6 +333,8 @@ void MassStorage_Task(void)
                                    (SCSICommandStatus.Status != Command_Pass))\r
                                {\r
                                        ShowDiskReadError(PSTR("Read Device Block"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r
                                    (SCSICommandStatus.Status != Command_Pass))\r
                                {\r
                                        ShowDiskReadError(PSTR("Read Device Block"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);\r

+                                       \r
+                                       USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

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


@@ -339,8 +355,7 @@ void MassStorage_Task(void)
                        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
                        \r
                        /* Wait until USB device disconnected */\r
                        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
                        \r
                        /* Wait until USB device disconnected */\r

-                       while (USB_IsConnected);\r
-                       \r
+                       USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

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


@@ -372,7 +387,4 @@ void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t Erro
 \r
        /* Indicate device error via the status LEDs */\r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\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
 }\r