Changeset dcb74c0a in mainline for uspace/drv/bus/usb

Timestamp:

2011-07-03T10:05:21Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

64e6945d

Parents:

8e1a819

Message:

Add function to str.c to convert space-padded ASCII to standard string
representation. Use for decoding SCSI strings.

Location:

uspace/drv/bus/usb/usbmast

Files:

• inquiry.c (modified) (2 diffs)
• mast.h (modified) (2 diffs)

uspace/drv/bus/usb/usbmast/inquiry.c

@@ -62 +62 @@
 }
 
-/** Trim trailing spaces from a string (rewrite with string terminator).
- *
- * @param name String to be trimmed (in-out parameter).
- */
-static void trim_trailing_spaces(char *name)
-{
-        size_t len = str_length(name);
-        while ((len > 0) && isspace((int) name[len - 1])) {
-                name[len - 1] = 0;
-                len--;
-        }
-}
-
 /** Perform SCSI INQUIRY command on USB mass storage device.
  *
@@ -126 +113 @@
             SCSI_RMB_RMB, SCSI_RMB_RMB);
 
-        str_ncpy(inquiry_result->vendor, 1 + sizeof(inq_data.vendor),
-            (const char *) &inq_data.vendor, sizeof(inq_data.vendor));
-        trim_trailing_spaces(inquiry_result->vendor);
+        spascii_to_str(inquiry_result->vendor, SCSI_INQ_VENDOR_STR_BUFSIZE,
+            inq_data.vendor, sizeof(inq_data.vendor));
 
-        str_ncpy(inquiry_result->product, 1 + sizeof(inq_data.product),
-            (const char *) &inq_data.product, sizeof(inq_data.product));
-        trim_trailing_spaces(inquiry_result->product);
+        spascii_to_str(inquiry_result->product, SCSI_INQ_PRODUCT_STR_BUFSIZE,
+            inq_data.product, sizeof(inq_data.product));
 
-        str_ncpy(inquiry_result->revision, 1 + sizeof(inq_data.revision),
-            (const char *) &inq_data.revision, sizeof(inq_data.revision));
-        trim_trailing_spaces(inquiry_result->revision);
+        spascii_to_str(inquiry_result->revision, SCSI_INQ_REVISION_STR_BUFSIZE,
+            inq_data.revision, sizeof(inq_data.revision));
 
         return EOK;

uspace/drv/bus/usb/usbmast/mast.h

@@ -37 +37 @@
 #define USB_USBMAST_MAST_H_
 
+#include <scsi/spc.h>
 #include <sys/types.h>
 #include <usb/usb.h>
@@ -52 +53 @@
         bool removable;
         /** Vendor ID string */
-        char vendor[9];
+        char vendor[SCSI_INQ_VENDOR_STR_BUFSIZE];
         /** Product ID string */
-        char product[17];
+        char product[SCSI_INQ_PRODUCT_STR_BUFSIZE];
         /** Revision string */
-        char revision[17];
+        char revision[SCSI_INQ_REVISION_STR_BUFSIZE];
 } usb_massstor_inquiry_result_t;