Fix PDITarget_ReceiveByte() not discarding the start bit properly, and reading in...

[pub/USBasp.git] / Projects / Incomplete / StandaloneProgrammer / DiskHost.c

diff --git a/Projects/Incomplete/StandaloneProgrammer/DiskHost.c b/Projects/Incomplete/StandaloneProgrammer/DiskHost.c
index c554141..8e51820 100644 (file)
--- a/Projects/Incomplete/StandaloneProgrammer/DiskHost.c
+++ b/Projects/Incomplete/StandaloneProgrammer/DiskHost.c
@@ -59,16 +59,14 @@ void DiskHost_USBTask(void)
                if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
                                                                                           sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
                {\r
                if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
                                                                                           sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
                {\r

-                       printf("ERROR - GetConfig\r\n");\r

                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                        return;\r
                }\r
 \r
                if (MS_Host_ConfigurePipes(&DiskHost_MS_Interface,\r
                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                        return;\r
                }\r
 \r
                if (MS_Host_ConfigurePipes(&DiskHost_MS_Interface,\r

-                                                                       ConfigDescriptorSize, ConfigDescriptorData) != MS_ENUMERROR_NoError)\r
+                                          ConfigDescriptorSize, ConfigDescriptorData) != MS_ENUMERROR_NoError)\r

                {\r
                {\r

-                       printf("ERROR - Pipes\r\n");\r

                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                        return;\r
                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                        return;\r


@@ -76,16 +74,16 @@ void DiskHost_USBTask(void)
                \r
                if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)\r
                {\r
                \r
                if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)\r
                {\r

-                       printf("ERROR - SetConfig\r\n");\r

                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                        return;\r
                }\r
                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                        return;\r
                }\r

-\r
+               \r
+               USB_HostState = HOST_STATE_Configured;\r
+               \r

                uint8_t MaxLUNIndex;\r
                if (MS_Host_GetMaxLUN(&DiskHost_MS_Interface, &MaxLUNIndex))\r
                {\r
                uint8_t MaxLUNIndex;\r
                if (MS_Host_GetMaxLUN(&DiskHost_MS_Interface, &MaxLUNIndex))\r
                {\r

-                       printf("ERROR - MaxLUN\r\n");\r

                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                        return;\r
                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                        return;\r


@@ -93,7 +91,6 @@ void DiskHost_USBTask(void)
                \r
                if (MS_Host_ResetMSInterface(&DiskHost_MS_Interface))\r
                {\r
                \r
                if (MS_Host_ResetMSInterface(&DiskHost_MS_Interface))\r
                {\r

-                       printf("ERROR - ResetMS\r\n");\r

                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                        return;\r
                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                        return;\r


@@ -102,7 +99,6 @@ void DiskHost_USBTask(void)
                SCSI_Request_Sense_Response_t SenseData;\r
                if (MS_Host_RequestSense(&DiskHost_MS_Interface, 0, &SenseData) != 0)\r
                {\r
                SCSI_Request_Sense_Response_t SenseData;\r
                if (MS_Host_RequestSense(&DiskHost_MS_Interface, 0, &SenseData) != 0)\r
                {\r

-                       printf("ERROR - Sense\r\n");\r

                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                        return;\r
                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                        return;\r


@@ -111,7 +107,6 @@ void DiskHost_USBTask(void)
                pf_mount(&DiskFATState);\r
                \r
                LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
                pf_mount(&DiskFATState);\r
                \r
                LEDs_SetAllLEDs(LEDMASK_USB_READY);\r

-               USB_HostState = HOST_STATE_Configured;\r

        }\r
 \r
        MS_Host_USBTask(&DiskHost_MS_Interface);                \r
        }\r
 \r
        MS_Host_USBTask(&DiskHost_MS_Interface);                \r