X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/31d8ebebc0796873f7c70db80a04acdcbb307ed8..023838fe4aad5b5f0da00b767afd1400d4e40b4c:/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c

diff --git a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c
index 27662db75..01553354d 100644
--- a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c
+++ b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c
@@ -98,7 +98,7 @@ int main(void)
 					break;
 				}
 				
-				printf("Mouse Enumerated.\r\n");
+				printf("Mass Storage Device Enumerated.\r\n");
 				USB_HostState = HOST_STATE_Configured;
 				break;
 			case HOST_STATE_Configured:
@@ -139,7 +139,7 @@ int main(void)
 				}
 
 				SCSI_Inquiry_Response_t InquiryData;
-				if (MS_Host_GetInquiryData(&FlashDisk_MS_Interface, &InquiryData))
+				if (MS_Host_GetInquiryData(&FlashDisk_MS_Interface, 0, &InquiryData))
 				{
 					printf("Error retreiving device Inquiry data.\r\n");
 					LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
@@ -150,11 +150,16 @@ int main(void)
 				printf("Vendor \"%.8s\", Product \"%.16s\"\r\n", InquiryData.VendorID, InquiryData.ProductID);
 				
 				printf("Waiting until ready...\r\n");
-				bool DeviceReady;
 
-				do
+				for (;;)
 				{
-					if (MS_Host_TestUnitReady(&FlashDisk_MS_Interface, 0, &DeviceReady))
+					uint8_t ErrorCode = MS_Host_TestUnitReady(&FlashDisk_MS_Interface, 0);
+					
+					if (!(ErrorCode))
+					  break;
+
+					/* Check if an error other than a logical command error (device busy) received */
+					if (ErrorCode != MS_ERROR_LOGICAL_CMD_FAILED)
 					{
 						printf("Error waiting for device to be ready.\r\n");
 						LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
@@ -162,7 +167,6 @@ int main(void)
 						break;
 					}
 				}
-				while (!(DeviceReady));
 
 				printf("Retrieving Capacity... ");