Oops - SCSI INQUIRY data uses fixed-length, non-terminated strings -- need to copy...

diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
index 79a5592..a1febf2 100644 (file)
--- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
+++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
@@ -224,8 +224,17 @@ void MassStorage_Task(void)
                                break;\r
                        }\r
                        \r
                                break;\r
                        }\r
                        \r

+                       /* VendorID and ProductID are fixed-length non-null terminated strings - need to terminate them before displaying */\r
+                       char VendorID[9];\r
+                       char ProductID[17];\r
+                       \r
+                       memcpy(&VendorID, &InquiryData.VendorID, 8);\r
+                       memcpy(&ProductID, &InquiryData.ProductID, 16);\r
+                       VendorID[8]   = 0x00;\r
+                       ProductID[16] = 0x00;\r
+\r

                        /* Print vendor and product names of attached device */\r
                        /* Print vendor and product names of attached device */\r

-                       printf_P(PSTR("Vendor: %s, Product: %s\r\n"), InquiryData.VendorID, InquiryData.ProductID);\r
+                       printf_P(PSTR("Vendor \"%s\", Product \"%s\"\r\n"), VendorID, ProductID);\r

                                                \r
                        /* Wait until disk ready */\r
                        puts_P(PSTR("Waiting until ready.."));\r
                                                \r
                        /* Wait until disk ready */\r
                        puts_P(PSTR("Waiting until ready.."));\r

diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h
index a299b70..a5b84c2 100644 (file)
--- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h
+++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h
@@ -43,6 +43,7 @@
                #include <avr/power.h>\r
                #include <stdio.h>\r
                #include <ctype.h>\r
                #include <avr/power.h>\r
                #include <stdio.h>\r
                #include <ctype.h>\r

+               #include <string.h>\r

 \r
                #include "ConfigDescriptor.h"\r
 \r
 \r
                #include "ConfigDescriptor.h"\r
 \r