X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/64937a62062368504cc9982d15a7d332566d8fac..6928f17b640bc2060c7829ed67c797f37c3d92a0:/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c

diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
index 79a559234..6cfe669f6 100644
--- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
+++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
@@ -48,8 +48,7 @@ int main(void)
 {
 	SetupHardware();
 
-	puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
-	       "Mass Storage Host Demo running.\r\n" ESC_INVERSE_OFF));
+	puts_P(PSTR(ESC_FG_CYAN "Mass Storage Host Demo running.\r\n" ESC_FG_WHITE));
 
 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
 
@@ -82,7 +81,7 @@ void SetupHardware(void)
  */
 void EVENT_USB_DeviceAttached(void)
 {
-	puts_P(PSTR("Device Attached.\r\n"));
+	puts_P(PSTR(ESC_FG_GREEN "Device Attached.\r\n" ESC_FG_WHITE));
 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
 }
 
@@ -91,7 +90,7 @@ void EVENT_USB_DeviceAttached(void)
  */
 void EVENT_USB_DeviceUnattached(void)
 {
-	puts_P(PSTR("\r\nDevice Unattached.\r\n"));
+	puts_P(PSTR(ESC_FG_GREEN "\r\nDevice Unattached.\r\n" ESC_FG_WHITE));
 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
 }
 
@@ -108,8 +107,8 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 {
 	USB_ShutDown();
 
-	puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));
-	printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
+	puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));
+	printf_P(PSTR(" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
 
 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 	for(;;);
@@ -120,10 +119,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
  */
 void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)
 {
-	puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));
+	puts_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"));
 	printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
 	printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);
-	printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);
+	printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);
 	
 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
@@ -144,42 +143,39 @@ void MassStorage_Task(void)
 			if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)
 			{
 				if (ErrorCode == ControlError)
-				  puts_P(PSTR("Control Error (Get Configuration).\r\n"));
+				  puts_P(PSTR(ESC_FG_RED "Control Error (Get Configuration).\r\n"));
 				else
-				  puts_P(PSTR("Invalid Device.\r\n"));
+				  puts_P(PSTR(ESC_FG_RED "Invalid Device.\r\n"));
 
-				printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
+				printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
 				
 				/* Indicate error via status LEDs */
 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 
 				/* Wait until USB device disconnected */
-				while (USB_IsConnected);
+				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
 
 			/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */
 			if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)
 			{
-				puts_P(PSTR("Control Error (Set Configuration).\r\n"));
-				printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
+				puts_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\r\n"));
+				printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
 
 				/* Indicate error via status LEDs */
 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 
 				/* Wait until USB device disconnected */
-				while (USB_IsConnected);
+				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
 				
+			puts_P(PSTR("Mass Storage Disk Enumerated.\r\n"));
+
 			USB_HostState = HOST_STATE_Configured;
 			break;
 		case HOST_STATE_Configured:
-			puts_P(PSTR("Mass Storage Disk Enumerated.\r\n"));
-				
-			USB_HostState = HOST_STATE_Ready;
-			break;
-		case HOST_STATE_Ready:
 			/* Indicate device busy via the status LEDs */
 			LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
 			
@@ -187,6 +183,8 @@ void MassStorage_Task(void)
 			if ((ErrorCode = MassStore_GetMaxLUN(&MassStore_MaxLUNIndex)) != HOST_SENDCONTROL_Successful)
 			{	
 				ShowDiskReadError(PSTR("Get Max LUN"), false, ErrorCode);
+
+				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
 			
@@ -197,6 +195,8 @@ void MassStorage_Task(void)
 			if ((ErrorCode = MassStore_MassStorageReset()) != HOST_SENDCONTROL_Successful)
 			{
 				ShowDiskReadError(PSTR("Mass Storage Reset"), false, ErrorCode);
+				
+				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
 			
@@ -213,6 +213,8 @@ void MassStorage_Task(void)
 			if (((ErrorCode = MassStore_PreventAllowMediumRemoval(0, true)) != 0) || (SCSICommandStatus.Status != Command_Pass))
 			{
 				ShowDiskReadError(PSTR("Prevent/Allow Medium Removal"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);
+				
+				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
 
@@ -221,11 +223,13 @@ void MassStorage_Task(void)
 			if (((ErrorCode = MassStore_Inquiry(0, &InquiryData)) != 0) || (SCSICommandStatus.Status != Command_Pass))
 			{
 				ShowDiskReadError(PSTR("Inquiry"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);
+				
+				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
-			
+
 			/* Print vendor and product names of attached device */
-			printf_P(PSTR("Vendor: %s, Product: %s\r\n"), InquiryData.VendorID, InquiryData.ProductID);
+			printf_P(PSTR("Vendor \"%.8s\", Product \"%.16s\"\r\n"), InquiryData.VendorID, InquiryData.ProductID);
 						
 			/* Wait until disk ready */
 			puts_P(PSTR("Waiting until ready.."));
@@ -234,17 +238,19 @@ void MassStorage_Task(void)
 			{
 				Serial_TxByte('.');
 				
-				if ((ErrorCode = MassStore_TestUnitReady(0)) != 0)
+				/* Abort if device removed */
+				if (USB_HostState == HOST_STATE_Unattached)
+				  break;
+
+				if ((ErrorCode = MassStore_TestUnitReady(0)) != PIPE_RWSTREAM_NoError)
 				{
 					ShowDiskReadError(PSTR("Test Unit Ready"), false, ErrorCode);
-					break;				
+
+					USB_HostState = HOST_STATE_WaitForDeviceRemoval;
+					break;
 				}
 			}
-			while ((SCSICommandStatus.Status != Command_Pass) && USB_IsConnected);
-			
-			/* Abort if device removed */
-			if (!(USB_IsConnected))
-			  break;
+			while (SCSICommandStatus.Status != Command_Pass);
 
 			puts_P(PSTR("\r\nRetrieving Capacity... "));
 
@@ -255,6 +261,8 @@ void MassStorage_Task(void)
 			if (((ErrorCode = MassStore_ReadCapacity(0, &DiskCapacity)) != 0) || (SCSICommandStatus.Status != Command_Pass))
 			{
 				ShowDiskReadError(PSTR("Read Capacity"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);
+				
+				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
 			
@@ -269,6 +277,8 @@ void MassStorage_Task(void)
 			    (SCSICommandStatus.Status != Command_Pass))
 			{
 				ShowDiskReadError(PSTR("Read Device Block"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);
+				
+				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
 			
@@ -307,7 +317,7 @@ void MassStorage_Task(void)
 			while (!(Buttons_GetStatus() & BUTTONS_BUTTON1))
 			{
 				/* Abort if device removed */
-				if (!(USB_IsConnected))
+				if (USB_HostState == HOST_STATE_Unattached)
 				  break;
 			}
 			
@@ -319,6 +329,8 @@ void MassStorage_Task(void)
 				    (SCSICommandStatus.Status != Command_Pass))
 				{
 					ShowDiskReadError(PSTR("Read Device Block"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);
+					
+					USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 					break;
 				}
 
@@ -331,7 +343,7 @@ void MassStorage_Task(void)
 				}
 
 				/* Abort if device removed */
-				if (!(USB_IsConnected))
+				if (USB_HostState == HOST_STATE_Unattached)
 				  break;
 			}
 			
@@ -339,8 +351,7 @@ void MassStorage_Task(void)
 			LEDs_SetAllLEDs(LEDMASK_USB_READY);
 			
 			/* Wait until USB device disconnected */
-			while (USB_IsConnected);
-			
+			USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 			break;
 	}
 }
@@ -349,30 +360,27 @@ void MassStorage_Task(void)
  *  printing error codes to the serial port and waiting until the device is removed before
  *  continuing.
  *
- *  \param CommandString  ASCII string located in PROGMEM space indicating what operation failed
- *  \param FailedAtSCSILayer  Indicates if the command failed at the (logical) SCSI layer or at the physical USB layer
- *  \param ErrorCode      Error code of the function which failed to complete successfully
+ *  \param[in] CommandString      ASCII string located in PROGMEM space indicating what operation failed
+ *  \param[in] FailedAtSCSILayer  Indicates if the command failed at the (logical) SCSI layer or at the physical USB layer
+ *  \param[in] ErrorCode          Error code of the function which failed to complete successfully
  */
 void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t ErrorCode)
 {
 	if (FailedAtSCSILayer)
 	{
 		/* Display the error code */
-		printf_P(PSTR(ESC_BG_RED "SCSI command error (%S).\r\n"), CommandString);
-		printf_P(PSTR("  -- Status Code: %d"), ErrorCode);
+		printf_P(PSTR(ESC_FG_RED "SCSI command error (%S).\r\n"), CommandString);
+		printf_P(PSTR("  -- Status Code: %d" ESC_FG_WHITE), ErrorCode);
 	}
 	else
 	{
 		/* Display the error code */
-		printf_P(PSTR(ESC_BG_RED "Command error (%S).\r\n"), CommandString);
-		printf_P(PSTR("  -- Error Code: %d"), ErrorCode);	
+		printf_P(PSTR(ESC_FG_RED "Command error (%S).\r\n"), CommandString);
+		printf_P(PSTR("  -- Error Code: %d" ESC_FG_WHITE), ErrorCode);	
 	}
 
 	Pipe_Freeze();
 
 	/* Indicate device error via the status LEDs */
 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-
-	/* Wait until USB device disconnected */
-	while (USB_IsConnected);
 }