X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/b5ca3990c2ec9dc240fb334002ed2f7c82eea853..23f3c3deee8bd153d59f2ac4e659c71ee75915f7:/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c

diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
index 905077e81..2f84d0fb8 100644
--- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
+++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
@@ -191,7 +191,7 @@ void MassStorage_Task(void)
 			}
 			
 			/* Print number of LUNs detected in the attached device */
-			printf_P(PSTR("Total LUNs: %d.\r\n"), (MassStore_MaxLUNIndex + 1));
+			printf_P(PSTR("Total LUNs: %d - Using first LUN in device.\r\n"), (MassStore_MaxLUNIndex + 1));
 			
 			/* Reset the Mass Storage device interface, ready for use */
 			if ((ErrorCode = MassStore_MassStorageReset()) != HOST_SENDCONTROL_Successful)
@@ -216,9 +216,20 @@ void MassStorage_Task(void)
 				break;
 			}
 
-			puts_P(PSTR("Waiting until ready.."));
-			
+			/* Get inquiry data from the device */
+			SCSI_Inquiry_Response_t InquiryData;
+			if (((ErrorCode = MassStore_Inquiry(0, &InquiryData)) != 0) || (SCSICommandStatus.Status != Command_Pass))
+			{
+				ShowDiskReadError(PSTR("Inquiry"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);
+				break;
+			}
+
+			/* Print vendor and product names of attached device */
+			printf_P(PSTR("Vendor \"%.8s\", Product \"%.16s\"\r\n"), InquiryData.VendorID, InquiryData.ProductID);
+						
 			/* Wait until disk ready */
+			puts_P(PSTR("Waiting until ready.."));
+
 			do
 			{
 				Serial_TxByte('.');
@@ -338,9 +349,9 @@ 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)
 {