Changeset dcb74c0a in mainline for uspace/drv/bus/usb/usbmast/inquiry.c
- Timestamp:
- 2011-07-03T10:05:21Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 64e6945d
- Parents:
- 8e1a819
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/usbmast/inquiry.c
r8e1a819 rdcb74c0a 62 62 } 63 63 64 /** Trim trailing spaces from a string (rewrite with string terminator).65 *66 * @param name String to be trimmed (in-out parameter).67 */68 static void trim_trailing_spaces(char *name)69 {70 size_t len = str_length(name);71 while ((len > 0) && isspace((int) name[len - 1])) {72 name[len - 1] = 0;73 len--;74 }75 }76 77 64 /** Perform SCSI INQUIRY command on USB mass storage device. 78 65 * … … 126 113 SCSI_RMB_RMB, SCSI_RMB_RMB); 127 114 128 str_ncpy(inquiry_result->vendor, 1 + sizeof(inq_data.vendor), 129 (const char *) &inq_data.vendor, sizeof(inq_data.vendor)); 130 trim_trailing_spaces(inquiry_result->vendor); 115 spascii_to_str(inquiry_result->vendor, SCSI_INQ_VENDOR_STR_BUFSIZE, 116 inq_data.vendor, sizeof(inq_data.vendor)); 131 117 132 str_ncpy(inquiry_result->product, 1 + sizeof(inq_data.product), 133 (const char *) &inq_data.product, sizeof(inq_data.product)); 134 trim_trailing_spaces(inquiry_result->product); 118 spascii_to_str(inquiry_result->product, SCSI_INQ_PRODUCT_STR_BUFSIZE, 119 inq_data.product, sizeof(inq_data.product)); 135 120 136 str_ncpy(inquiry_result->revision, 1 + sizeof(inq_data.revision), 137 (const char *) &inq_data.revision, sizeof(inq_data.revision)); 138 trim_trailing_spaces(inquiry_result->revision); 121 spascii_to_str(inquiry_result->revision, SCSI_INQ_REVISION_STR_BUFSIZE, 122 inq_data.revision, sizeof(inq_data.revision)); 139 123 140 124 return EOK;
Note:
See TracChangeset
for help on using the changeset viewer.