Merge branch 'main' of github.com:bcmi-labs/ArduinoCore-renesas

Author: facchinm

.gitignore

@@ -1,3 +1,4 @@
 .idea
 cores/arduino/mydebug.cpp
 libraries/Storage/.development
+cores/arduino/mydebug.cpp.donotuse

cores/arduino/IRQManager.cpp

@@ -20,8 +20,8 @@
 #define ETHERNET_REQ_NUM            1
 #define SDCARD_REQ_NUM              3
 #define ETHERNET_PRIORITY          12
-#define SDCARD_ACCESS_PRIORITY     12
-#define SDCARD_DMA_REQ_PRIORITY    12
+#define SDCARD_ACCESS_PRIORITY     10
+#define SDCARD_DMA_REQ_PRIORITY    10
 #define SDCARD_CARD_PRIORITY       12
 #define EXTERNAL_PIN_PRIORITY      12
 #define UART_SCI_PRIORITY          12

cores/arduino/usb/USB.cpp

@@ -51,6 +51,17 @@ extern "C" {
 #define USBD_HID_EP    (0x83)
 #endif
 
+#ifndef USBD_MSD_EP_OUT
+#define USBD_MSD_EP_OUT (0x04)
+#endif
+
+#ifndef USBD_MSD_EP_IN
+#define USBD_MSD_EP_IN (0x84)
+#endif
+
+#define USBD_MSD_IN_OUT_SIZE (512)
+
+
 #define USBD_CDC_CMD_MAX_SIZE (8)
 #if (CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE)
 #define USBD_CDC_IN_OUT_MAX_SIZE (512)
@@ -112,14 +123,18 @@ const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
 void __SetupUSBDescriptor() {
     if (!usbd_desc_cfg) {
 
-        uint8_t interface_count = (__USBInstallSerial ? 3 : 0) + (__USBGetHIDReport ? 1 : 0);
+        uint8_t interface_count = (__USBInstallSerial ? 3 : 0) + (__USBGetHIDReport ? 1 : 0) + (__USBInstallMSD ? 1 : 0);
 
         uint8_t cdc_desc[TUD_CDC_DESC_LEN + TUD_DFU_RT_DESC_LEN] = {
             // Interface number, string index, protocol, report descriptor len, EP In & Out address, size & polling interval
             TUD_CDC_DESCRIPTOR(USBD_ITF_CDC, USBD_STR_CDC, USBD_CDC_EP_CMD, USBD_CDC_CMD_MAX_SIZE, USBD_CDC_EP_OUT, USBD_CDC_EP_IN, USBD_CDC_IN_OUT_MAX_SIZE),
             TUD_DFU_RT_DESCRIPTOR(USBD_ITF_CDC+2, USBD_STR_DFU_RT, 0x0d, 1000, 4096),
         };
 
+        /*
+         * -----    HID
+         */ 
+
         size_t hid_report_len = 0;
         if (__USBGetHIDReport) {
             __USBGetHIDReport(&hid_report_len);
@@ -130,7 +145,19 @@ void __SetupUSBDescriptor() {
             TUD_HID_DESCRIPTOR(hid_itf, 0, HID_ITF_PROTOCOL_NONE, hid_report_len, USBD_HID_EP, CFG_TUD_HID_EP_BUFSIZE, 10)
         };
 
-        int usbd_desc_len = TUD_CONFIG_DESC_LEN + (__USBInstallSerial ? sizeof(cdc_desc) : 0) + (__USBGetHIDReport ? sizeof(hid_desc) : 0);
+        /*
+         * -----    MASS STORAGE DEVICE
+         */ 
+
+        uint8_t msd_itf = (__USBInstallSerial ? 3 : 0) + (__USBGetHIDReport ? 1 : 0);
+        uint8_t msd_desc[TUD_MSC_DESC_LEN] = {
+            // Interface number, string index, EP Out & EP In address, EP size
+            TUD_MSC_DESCRIPTOR(msd_itf, 0, USBD_MSD_EP_OUT, USBD_MSD_EP_IN, USBD_MSD_IN_OUT_SIZE)   
+        };
+
+        
+
+        int usbd_desc_len = TUD_CONFIG_DESC_LEN + (__USBInstallSerial ? sizeof(cdc_desc) : 0) + (__USBGetHIDReport ? sizeof(hid_desc) : 0) + (__USBInstallMSD ? sizeof(msd_desc) : 0);
 
         uint8_t tud_cfg_desc[TUD_CONFIG_DESC_LEN] = {
             // Config number, interface count, string index, total length, attribute, power in mA
@@ -152,6 +179,10 @@ void __SetupUSBDescriptor() {
                 memcpy(ptr, hid_desc, sizeof(hid_desc));
                 ptr += sizeof(hid_desc);
             }
+            if (__USBInstallMSD) {
+                memcpy(ptr, msd_desc, sizeof(msd_desc));
+                ptr += sizeof(msd_desc);
+            }
         }
     }
 }
@@ -331,7 +362,7 @@ void __USBStart() {
 // Invoked when received GET_REPORT control request
 // Application must fill buffer report's content and return its length.
 // Return zero will cause the stack to STALL request
-extern "C" uint16_t tud_hid_get_report_cb(uint8_t instance, uint8_t report_id, hid_report_type_t report_type, uint8_t* buffer, uint16_t reqlen) {
+extern "C"  __attribute((weak)) uint16_t tud_hid_get_report_cb(uint8_t instance, uint8_t report_id, hid_report_type_t report_type, uint8_t* buffer, uint16_t reqlen) {
     // TODO not implemented
     (void) instance;
     (void) report_id;
@@ -344,7 +375,7 @@ extern "C" uint16_t tud_hid_get_report_cb(uint8_t instance, uint8_t report_id, h
 
 // Invoked when received SET_REPORT control request or
 // received data on OUT endpoint ( Report ID = 0, Type = 0 )
-extern "C" void tud_hid_set_report_cb(uint8_t instance, uint8_t report_id, hid_report_type_t report_type, uint8_t const* buffer, uint16_t bufsize) {
+extern "C" __attribute((weak)) void tud_hid_set_report_cb(uint8_t instance, uint8_t report_id, hid_report_type_t report_type, uint8_t const* buffer, uint16_t bufsize) {
     // TODO set LED based on CAPLOCK, NUMLOCK etc...
     (void) instance;
     (void) report_id;
@@ -353,4 +384,40 @@ extern "C" void tud_hid_set_report_cb(uint8_t instance, uint8_t report_id, hid_r
     (void) bufsize;
 }
 
+
+extern "C" __attribute((weak))  int32_t tud_msc_read10_cb (uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize) {
+   
+    return 0;
+}
+
+
+extern "C" __attribute((weak)) int32_t tud_msc_write10_cb (uint8_t lun, uint32_t lba, uint32_t offset, uint8_t* buffer, uint32_t bufsize) {
+    
+    return 0;
+}
+
+
+extern "C"  __attribute((weak)) void tud_msc_inquiry_cb(uint8_t lun, uint8_t vendor_id[8], uint8_t product_id[16], uint8_t product_rev[4]) {
+    
+}
+
+
+extern "C"  __attribute((weak)) bool tud_msc_test_unit_ready_cb(uint8_t lun) {
+    
+    return false;
+}
+
+
+extern "C"  __attribute((weak))  void tud_msc_capacity_cb(uint8_t lun, uint32_t* block_count, uint16_t* block_size) {
+   
+}
+
+
+extern "C"  __attribute((weak))  int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16], void* buffer, uint16_t bufsize) {
+    
+    return -1;
+}
+
+
+
 #endif

cores/arduino/usb/USB.h

@@ -20,6 +20,7 @@ extern void __USBInstallSerial() __attribute__((weak));
 extern void __USBInstallKeyboard() __attribute__((weak));
 extern void __USBInstallMouse() __attribute__((weak));
 extern void __USBInstallMIDI() __attribute__((weak));
+extern void __USBInstallMSD() __attribute__((weak));
 
 // HID report ID inquiry (report ID will vary depending on the number/type of other HID)
 extern uint8_t* __USBGetHIDReport(size_t* len) __attribute__((weak));

libraries/BlockDevices/MBRBlockDevice.cpp

@@ -20,6 +20,8 @@
 #include <algorithm>
 #include <string.h>
 
+//#define DEBUG_MSD
+extern "C" int mylogadd(const char *fmt, ...) ;
 //namespace mbed {
 
 // On disk structures, all entries are little endian
@@ -287,10 +289,23 @@ int MBRBlockDevice::init()
 
     // Get partition attributes
     sector = std::max<uint32_t>(_bd->get_erase_size(), 512);
+    #ifdef DEBUG_MSD
+    mylogadd("MBR sectort %i", sector);
+    #endif
+
     _type = table->entries[_part - 1].type;
     _offset = fromle32(table->entries[_part - 1].lba_offset) * sector;
+    #ifdef DEBUG_MSD
+    mylogadd("MBR _offset %i", _offset);
+    #endif
+
     _size   = fromle32(table->entries[_part - 1].lba_size)   * sector;
 
+    #ifdef DEBUG_MSD
+    mylogadd("MBR _size %i", _size);
+    #endif
+    
+
     // Check that block addresses are valid
     if (!_bd->is_valid_erase(_offset, _size)) {
         err = BD_ERROR_INVALID_PARTITION;
@@ -342,7 +357,9 @@ int MBRBlockDevice::read(void *b, bd_addr_t addr, bd_size_t size)
     if (!is_valid_read(addr, size)) {
         return BD_ERROR_DEVICE_ERROR;
     }
-
+    #ifdef DEBUG_MSD
+    mylogadd("MBR READ %i, %i", addr + _offset, size);
+    #endif
     return _bd->read(b, addr + _offset, size);
 }
 
@@ -355,7 +372,9 @@ int MBRBlockDevice::program(const void *b, bd_addr_t addr, bd_size_t size)
     if (!is_valid_program(addr, size)) {
         return BD_ERROR_DEVICE_ERROR;
     }
-
+    #ifdef DEBUG_MSD
+    mylogadd("MBR WRITE %i, %i", addr + _offset, size);
+    #endif
     return _bd->program(b, addr + _offset, size);
 }