From edfc490287dddf11945f1ac31b87397db133d9b9 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 4 Jul 2018 15:01:16 +0700 Subject: [PATCH] update --- lib/tinyusb | 2 +- src/usb/msc_uf2.c | 15 --------------- src/usb/tusb_config.h | 9 +++++++++ 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/lib/tinyusb b/lib/tinyusb index 3eb410c..fc139b0 160000 --- a/lib/tinyusb +++ b/lib/tinyusb @@ -1 +1 @@ -Subproject commit 3eb410cf8521755874fb9900a7f711bcafdc81d5 +Subproject commit fc139b009f4c49d4fdbf1b80097c94c8dabb1ee1 diff --git a/src/usb/msc_uf2.c b/src/usb/msc_uf2.c index bf7a7ae..f9cbf7c 100644 --- a/src/usb/msc_uf2.c +++ b/src/usb/msc_uf2.c @@ -53,16 +53,6 @@ int write_block(uint32_t block_no, uint8_t *data, bool quiet/*, WriteState *stat /*------------------------------------------------------------------*/ /* VARIABLES *------------------------------------------------------------------*/ -static scsi_inquiry_data_t const mscd_inquiry_data = -{ - .is_removable = 1, - .version = 2, - .response_data_format = 2, - .vendor_id = "Adafruit", - .product_id = "Feather52840", - .product_revision = "1.0" -}; - static scsi_sense_fixed_data_t mscd_sense_data = { .response_code = 0x70, @@ -111,11 +101,6 @@ int32_t tud_msc_scsi_cb (uint8_t rhport, uint8_t lun, uint8_t const scsi_cmd[16] switch (scsi_cmd[0]) { - case SCSI_CMD_INQUIRY: - ptr = &mscd_inquiry_data; - len = sizeof(scsi_inquiry_data_t); - break; - case SCSI_CMD_REQUEST_SENSE: ptr = &mscd_sense_data; len = sizeof(scsi_sense_fixed_data_t); diff --git a/src/usb/tusb_config.h b/src/usb/tusb_config.h index 51a0dc6..4976f8d 100644 --- a/src/usb/tusb_config.h +++ b/src/usb/tusb_config.h @@ -106,6 +106,15 @@ // Buffer size for each read/write transfer, the more the better #define CFG_TUD_MSC_BUFSIZE (4*1024) +// Vendor name included in Inquiry response, max 8 bytes +#define CFG_TUD_MSC_VENDOR "Adafruit" + +// Product name included in Inquiry response, max 16 bytes +#define CFG_TUD_MSC_PRODUCT "Feather52840" + +// Product revision string included in Inquiry response, max 4 bytes +#define CFG_TUD_MSC_PRODUCT_REV "1.0" + //--------------------------------------------------------------------+ // USB RAM PLACEMENT