mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-03-25 10:43:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

follow up to PR #39

Browse Source
This commit is contained in:
hathach 2019-03-04 11:51:36 +07:00
parent f23affbb0a
commit a19455d1ff
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/class/msc/msc_device.c
View File

@ -265,20 +265,20 @@ int32_t proc_builtin_scsi(msc_cbw_t const * p_cbw, uint8_t* buffer, uint32_t buf
.is_removable = 1, .is_removable = 1,
.version = 2, .version = 2,
.response_data_format = 2, .response_data_format = 2,
.vendor_id = " ", // vendor_id, product_id, product_rev is space padded string
.product_id = " ", .vendor_id = "",
.product_rev = " ", .product_id = "",
.product_rev = "",
}; };
size_t len;
#define _min(a,b) ((a) < (b) ? (a) : (b)) memset(inquiry_rsp.vendor_id, ' ', sizeof(inquiry_rsp.vendor_id));
len = strlen(CFG_TUD_MSC_VENDOR); memcpy(inquiry_rsp.vendor_id, CFG_TUD_MSC_VENDOR, tu_min32(strlen(CFG_TUD_MSC_VENDOR), sizeof(inquiry_rsp.vendor_id)));
memcpy(inquiry_rsp.vendor_id , CFG_TUD_MSC_VENDOR , _min(len, sizeof(inquiry_rsp.vendor_id)));
len = strlen(CFG_TUD_MSC_PRODUCT); memset(inquiry_rsp.product_id, ' ', sizeof(inquiry_rsp.product_id));
memcpy(inquiry_rsp.product_id , CFG_TUD_MSC_PRODUCT , _min(len, sizeof(inquiry_rsp.product_id))); memcpy(inquiry_rsp.product_id, CFG_TUD_MSC_PRODUCT, tu_min32(strlen(CFG_TUD_MSC_PRODUCT), sizeof(inquiry_rsp.product_id)));
len = strlen(CFG_TUD_MSC_PRODUCT_REV);
memcpy(inquiry_rsp.product_rev, CFG_TUD_MSC_PRODUCT_REV, _min(len, sizeof(inquiry_rsp.product_rev))); memset(inquiry_rsp.product_rev, ' ', sizeof(inquiry_rsp.product_rev));
#undef _min memcpy(inquiry_rsp.product_rev, CFG_TUD_MSC_PRODUCT_REV, tu_min32(strlen(CFG_TUD_MSC_PRODUCT_REV), sizeof(inquiry_rsp.product_rev)));
ret = sizeof(inquiry_rsp); ret = sizeof(inquiry_rsp);
memcpy(buffer, &inquiry_rsp, ret); memcpy(buffer, &inquiry_rsp, ret);