aboutsummaryrefslogtreecommitdiffstats
path: root/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-06-23 09:38:22 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-06-23 09:38:22 +0000
commitb2cf4d32221075c96a7487b1fc0baa2598d373fe (patch)
tree593932d38a3b0edd51d95530ff4afeec5ba6588e /Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
parent64937a62062368504cc9982d15a7d332566d8fac (diff)
downloadlufa-b2cf4d32221075c96a7487b1fc0baa2598d373fe.tar.gz
lufa-b2cf4d32221075c96a7487b1fc0baa2598d373fe.tar.bz2
lufa-b2cf4d32221075c96a7487b1fc0baa2598d373fe.zip
Oops - SCSI INQUIRY data uses fixed-length, non-terminated strings -- need to copy the strings to a temp buffer and terminate before using them in printf.
Diffstat (limited to 'Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c')
-rw-r--r--Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
index 79a559234..a1febf204 100644
--- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
+++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
@@ -224,8 +224,17 @@ void MassStorage_Task(void)
break;
}
+ /* VendorID and ProductID are fixed-length non-null terminated strings - need to terminate them before displaying */
+ char VendorID[9];
+ char ProductID[17];
+
+ memcpy(&VendorID, &InquiryData.VendorID, 8);
+ memcpy(&ProductID, &InquiryData.ProductID, 16);
+ VendorID[8] = 0x00;
+ ProductID[16] = 0x00;
+
/* 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 \"%s\", Product \"%s\"\r\n"), VendorID, ProductID);
/* Wait until disk ready */
puts_P(PSTR("Waiting until ready.."));