summaryrefslogtreecommitdiff
path: root/examples/device
diff options
context:
space:
mode:
authorhathach <[email protected]>2018-04-20 21:18:59 +0700
committerhathach <[email protected]>2018-04-20 21:18:59 +0700
commit14471f31545b006cde01d7317518eb440942532f (patch)
treea7eb2a96115c0e5474685bc7304b62fe78fc6560 /examples/device
parenta9d4c1e339ba1554beba15374873613e8fc28f47 (diff)
update msc app
Diffstat (limited to 'examples/device')
-rw-r--r--examples/device/nrf52840/src/msc_device_ramdisk.c14
-rw-r--r--examples/device/nrf52840/src/tusb_config.h5
2 files changed, 13 insertions, 6 deletions
diff --git a/examples/device/nrf52840/src/msc_device_ramdisk.c b/examples/device/nrf52840/src/msc_device_ramdisk.c
index 8e34942d6..eb617ea56 100644
--- a/examples/device/nrf52840/src/msc_device_ramdisk.c
+++ b/examples/device/nrf52840/src/msc_device_ramdisk.c
@@ -91,17 +91,19 @@ uint8_t msc_device_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] =
//--------------------------------------------------------------------+
// IMPLEMENTATION
//--------------------------------------------------------------------+
-uint16_t tud_msc_read10_cb (uint8_t rhport, uint8_t lun, uint32_t lba, uint16_t block_count, void** pp_buffer)
+uint32_t tud_msc_read10_cb (uint8_t rhport, uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize)
{
- (*pp_buffer) = msc_device_ramdisk[lba];
+ uint8_t* addr = msc_device_ramdisk[lba] + offset;
+ memcpy(buffer, addr, bufsize);
- return min16_of(block_count, DISK_BLOCK_NUM);
+ return bufsize;
}
-uint16_t tud_msc_write10_cb(uint8_t rhport, uint8_t lun, uint32_t lba, uint16_t block_count, void** pp_buffer)
+uint32_t tud_msc_write10_cb (uint8_t rhport, uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize)
{
- (*pp_buffer) = msc_device_ramdisk[lba];
+ uint8_t* addr = msc_device_ramdisk[lba] + offset;
+ memcpy(addr, buffer, bufsize);
- return min16_of(block_count, DISK_BLOCK_NUM);
+ return bufsize;
}
//--------------------------------------------------------------------+
diff --git a/examples/device/nrf52840/src/tusb_config.h b/examples/device/nrf52840/src/tusb_config.h
index 86e3698f8..476ff4bed 100644
--- a/examples/device/nrf52840/src/tusb_config.h
+++ b/examples/device/nrf52840/src/tusb_config.h
@@ -78,6 +78,11 @@
// If not enabled, application must call tud_cdc_flush() periodically
#define CFG_TUD_CDC_FLUSH_ON_SOF 1
+// Number of supported Logical Unit Number
+#define CFG_TUD_MSC_MAXLUN 1
+
+// Buffer size of Device Mass storage
+#define CFG_TUD_MSC_BUFSIZE 512
//--------------------------------------------------------------------+
// USB RAM PLACEMENT