Added incomplete MIDIToneGenerator project.

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

diff --git a/Projects/Incomplete/StandaloneProgrammer/DiskHost.c b/Projects/Incomplete/StandaloneProgrammer/DiskHost.c
index c554141..e50fc30 100644 (file)
--- a/Projects/Incomplete/StandaloneProgrammer/DiskHost.c
+++ b/Projects/Incomplete/StandaloneProgrammer/DiskHost.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
 \r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
@@ -59,16 +59,14 @@ void DiskHost_USBTask(void)
                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
-                                                                       ConfigDescriptorSize, ConfigDescriptorData) != MS_ENUMERROR_NoError)\r
+                                          ConfigDescriptorSize, ConfigDescriptorData) != MS_ENUMERROR_NoError)\r
                {\r
-                       printf("ERROR - Pipes\r\n");\r
                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                        return;\r
@@ -76,16 +74,14 @@ void DiskHost_USBTask(void)
                \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
-\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
@@ -93,16 +89,18 @@ void DiskHost_USBTask(void)
                \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
                }\r
                \r
+               USB_HostState = HOST_STATE_Configured;\r
+               \r
+               /* Note: For the RequestSense call to work, the host state machine must be in the \r
+                *       Configured state, or the call will be aborted */\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
@@ -111,7 +109,6 @@ void DiskHost_USBTask(void)
                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