Merge pull request arduino#51 from bcmi-labs/usb_host_dev

Usb Host Mass Device Storage

Author: facchinm

Diff for: .gitignore

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

Diff for: .gitmodules

@@ -1,3 +1,3 @@
 [submodule "extras/tinyusb"]
 	path = extras/tinyusb
-	url = https://github.com/bcmi-labs/tinyusb.git
+	url = git@github.com:bcmi-labs/tinyusb.git

Diff for: cores/arduino/FspTransfer.h

@@ -33,6 +33,10 @@ class FspDma {
         extend_cfg.p_callback = NULL; 
         extend_cfg.p_context = NULL; 
         extend_cfg.activation_source = ELC_EVENT_NONE;
+
+        instance.p_ctrl = &ctrl;
+        instance.p_cfg = &cfg;
+        instance.p_api = &g_transfer_on_dmac;
     }
 
     bool set_activation_source(elc_event_t ev) {
@@ -58,6 +62,7 @@ class FspDma {
     dmac_instance_ctrl_t ctrl;
     transfer_info_t info;
     dmac_extended_cfg_t extend_cfg;
+    transfer_instance_t  instance;
 };
 
 

Diff for: cores/arduino/IRQManager.cpp

@@ -18,7 +18,11 @@
 #define SPI_MASTER_REQ_NUM          4
 #define CAN_REQ_NUM                 3
 #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_CARD_PRIORITY       12
 #define EXTERNAL_PIN_PRIORITY      12
 #define UART_SCI_PRIORITY          12
 #define USB_PRIORITY               12
@@ -904,7 +908,7 @@ bool IRQManager::addPeripheral(Peripheral_t p, void *cfg) {
        ********************************************************************** */
     else if(p == IRQ_ETHERNET && cfg != NULL) {
         ether_cfg_t *eth = (ether_cfg_t *)cfg;
-        if ((last_interrupt_index + SPI_MASTER_REQ_NUM) < PROG_IRQ_NUM && eth->irq == FSP_INVALID_VECTOR) {
+        if ((last_interrupt_index + ETHERNET_REQ_NUM) < PROG_IRQ_NUM && eth->irq == FSP_INVALID_VECTOR) {
             eth->irq = (IRQn_Type)last_interrupt_index;
             eth->interrupt_priority = ETHERNET_PRIORITY;
             *(irq_ptr + last_interrupt_index) = (uint32_t)ether_eint_isr;
@@ -951,6 +955,49 @@ bool IRQManager::addPeripheral(Peripheral_t p, void *cfg) {
     }
 #endif /* CANFD_HOWMANY > 0 */
 
+#if SDCARD_HOWMANY > 0
+    /* **********************************************************************
+                                    SDCARD
+       ********************************************************************** */
+    else if(p == IRQ_SDCARD && cfg != NULL) {
+        sdmmc_cfg_t *sd_cfg = (sdmmc_cfg_t *)cfg;
+        /* SDCARD_ACCESS */
+        if ((last_interrupt_index + SDCARD_REQ_NUM) < PROG_IRQ_NUM ) {
+            if(sd_cfg->access_irq == FSP_INVALID_VECTOR) {
+
+                sd_cfg->access_irq = (IRQn_Type)last_interrupt_index;
+                sd_cfg->access_ipl = SDCARD_ACCESS_PRIORITY;
+                *(irq_ptr + last_interrupt_index) = (uint32_t)sdhimmc_accs_isr;
+                R_ICU->IELSR[last_interrupt_index] = BSP_PRV_IELS_ENUM(EVENT_SDHIMMC0_ACCS);
+                last_interrupt_index++;
+            }
+            /*
+            this interrupt is neeed if DTC is used but it must not be used if
+            DMA is used 
+            -----------
+            if(sd_cfg->dma_req_irq == FSP_INVALID_VECTOR) {
+                sd_cfg->dma_req_irq = (IRQn_Type)last_interrupt_index;
+                sd_cfg->dma_req_ipl = SDCARD_DMA_REQ_PRIORITY;
+                *(irq_ptr + last_interrupt_index) = (uint32_t)sdhimmc_dma_req_isr;
+                R_ICU->IELSR[last_interrupt_index] = BSP_PRV_IELS_ENUM(EVENT_SDHIMMC0_DMA_REQ);
+                last_interrupt_index++;
+            }
+            */
+            if(sd_cfg->card_irq == FSP_INVALID_VECTOR) {
+                sd_cfg->card_irq = (IRQn_Type)last_interrupt_index;
+                sd_cfg->card_ipl = SDCARD_CARD_PRIORITY;
+                *(irq_ptr + last_interrupt_index) = (uint32_t)sdhimmc_card_isr;
+                R_ICU->IELSR[last_interrupt_index] = BSP_PRV_IELS_ENUM(EVENT_SDHIMMC0_CARD);
+                last_interrupt_index++;
+            }
+        }
+
+        if(sd_cfg->access_irq == FSP_INVALID_VECTOR || sd_cfg->dma_req_irq == FSP_INVALID_VECTOR || sd_cfg->card_irq == FSP_INVALID_VECTOR) {
+            rv = false;
+        }
+        rv = true;
+    }
+#endif
     else {
         rv = false;
     }

Diff for: cores/arduino/IRQManager.h

@@ -43,8 +43,14 @@ typedef enum {
     IRQ_CAN,
     IRQ_ETHERNET,
     IRQ_CANFD,
+    IRQ_SDCARD
 } Peripheral_t;
 
+#if SDCARD_HOWMANY > 0
+#include "r_sdhi.h"
+#endif
+
+
 #if RTC_HOWMANY > 0
 #include "r_rtc_api.h"
 #include "r_rtc.h"
@@ -180,6 +186,9 @@ void ether_eint_isr (void);
 void canfd_error_isr(void);
 void canfd_rx_fifo_isr(void);
 void canfd_channel_tx_isr(void);
+void sdhimmc_dma_req_isr(void);
+void sdhimmc_accs_isr(void);
+void sdhimmc_card_isr(void);
 #ifdef __cplusplus
 }
 #endif

Diff for: cores/arduino/tinyusb/host

@@ -0,0 +1 @@
+../../../extras/tinyusb/src/host

Diff for: cores/arduino/usb/USB.cpp

@@ -232,12 +232,14 @@ void _usbfs_interrupt_handler(void)
 
 #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_HOST
   tuh_int_handler(0);
+  tuh_task();
 #endif
 
 #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
   tud_int_handler(0);
-#endif
   tud_task();
+#endif
+  
 }
 
 void _usbhs_interrupt_handler(void)
@@ -268,12 +270,18 @@ void __USBStart() {
         return;
     }
 
-    /* Enable USB_BASE */
+    /* 
+     * ENABLE USB
+     */
     R_SYSTEM->PRCR = (uint16_t) BSP_PRV_PRCR_PRC1_UNLOCK;
     R_MSTP->MSTPCRB &= ~(1U << 11U);
     R_MSTP->MSTPCRB &= ~(1U << 12U);
     R_SYSTEM->PRCR = (uint16_t) BSP_PRV_PRCR_LOCK;
 
+    /*
+     * CONFIGURE USB INTERRUPTS
+     */
+
 #ifdef CFG_TUSB_RHPORT0_MODE
 #if (CFG_TUSB_RHPORT0_MODE != 0)
     usb_irq_cfg.num_of_irqs_required = 4;
@@ -294,7 +302,15 @@ void __USBStart() {
 
     __SetupUSBDescriptor();
 
+    /* 
+     * INIT Tiny USB
+     */
+
+    assert(BOARD_TUD_RHPORT != BOARD_TUH_RHPORT); 
+    /* init device port*/
     tud_init(BOARD_TUD_RHPORT);
+    /* init host port */
+    tuh_init(BOARD_TUH_RHPORT);
 
 #if 0 //defined(AZURE_RTOS_THREADX)
     static TX_BYTE_POOL byte_pool_0;

Diff for: extras/Filesystems/FatFs/LICENSE.txt

@@ -0,0 +1,24 @@
+FatFs License
+
+FatFs has being developped as a personal project of the author, ChaN. It is free from the code anyone else wrote at current release. Following code block shows a copy of the FatFs license document that heading the source files.
+
+/*----------------------------------------------------------------------------/
+/  FatFs - Generic FAT Filesystem Module  Rx.xx                               /
+/-----------------------------------------------------------------------------/
+/
+/ Copyright (C) 20xx, ChaN, all right reserved.
+/
+/ FatFs module is an open source software. Redistribution and use of FatFs in
+/ source and binary forms, with or without modification, are permitted provided
+/ that the following condition is met:
+/
+/ 1. Redistributions of source code must retain the above copyright notice,
+/    this condition and the following disclaimer.
+/
+/ This software is provided by the copyright holder and contributors "AS IS"
+/ and any warranties related to this software are DISCLAIMED.
+/ The copyright owner or contributors be NOT LIABLE for any damages caused
+/ by use of this software.
+/----------------------------------------------------------------------------*/
+
+Therefore FatFs license is one of the BSD-style licenses, but there is a significant feature. FatFs is mainly intended for embedded systems. In order to extend the usability for commercial products, the redistributions of FatFs in binary form, such as embedded code, binary library and any forms without source code, do not need to include about FatFs in the documentations. This is equivalent to the 1-clause BSD license. Of course FatFs is compatible with the most of open source software licenses include GNU GPL. When you redistribute the FatFs source code with changes or create a fork, the license can also be changed to GNU GPL, BSD-style license or any open source software license that not conflict with FatFs license.