Update NUC980 and M480

1. Add 980 drv_usbd.
2. EMAC - move MDC CLK divider before EMAC initialization.
3. Correct NUC980 and M480 CAN RX_MSG_ID_INDEX definition.
4. add USBD cdc demo - vcom_echo.
5. mnt - add mount_table definition.

bsp/nuvoton/libraries/m480/rtt_port/drv_can.c

@@ -212,15 +212,16 @@ static void nu_can_isr(nu_can_t can)
         }
     }
 #ifdef RT_CAN_USING_HDR
-    /*Number of Message Object which caused the interrupt*/
+    /*IntId: 0x0001-0x0020, Number of Message Object which caused the interrupt.*/
     else if (u32IIDRstatus > 0 && u32IIDRstatus <= 32)
     {
-        rt_kprintf("=> Interrupt Pointer = %d\n", u32IIDRstatus - 1);
-        /*Message RAM 0~15 for CAN Tx using*/
-        if (u32IIDRstatus <= 16)
+        /*Message RAM 0~RX_MSG_ID_INDEX for CAN Tx using*/
+        if (u32IIDRstatus <= RX_MSG_ID_INDEX)
+        {
             //rt_kprintf("[%s-Tx]IntId = %d\n", can->name, u32IIDRstatus);
             rt_hw_can_isr(&can->dev, RT_CAN_EVENT_TX_DONE);
-        else /*Message RAM 16~31 for CAN Rx using*/
+        }
+        else /*Message RAM RX_MSG_ID_INDEX~31 for CAN Rx using*/
         {
             //rt_kprintf("[%s-Rx]IntId = %d\n", can->name, u32IIDRstatus);
             rt_hw_can_isr(&can->dev, (RT_CAN_EVENT_RX_IND | ((u32IIDRstatus - 1) << 8)));

bsp/nuvoton/libraries/nu_packages/Demo/SConscript

@@ -6,6 +6,7 @@ if GetDepend('NU_PKG_USING_DEMO'):
     src = Split("""
     usbd_hid_dance_mouse.c
     slcd_show_tick.c
+    usbd_cdc_vcom_echo.c
     """)
     CPPPATH = [cwd]
     group = DefineGroup('nu_pkgs_demo', src, depend = [''], CPPPATH = CPPPATH)

bsp/nuvoton/libraries/nu_packages/Demo/slcd_show_tick.c

+/**************************************************************************//**
+*
+* @copyright (C) 2019 Nuvoton Technology Corp. All rights reserved.
+*
+* SPDX-License-Identifier: Apache-2.0
+*
+* Change Logs:
+* Date            Author       Notes
+* 2020-11-11      Wayne        First version
+*
+******************************************************************************/
+
+#include <rtconfig.h>
+
+#if defined(BSP_USING_SLCD)
+
+#include <rtthread.h>
+#include <rtdevice.h>
+
+#include "slcd_rhe6616tp01.h"
+
+const uint32_t au32SLCDSymbols [] =
+{
+    SYMBOL_NVT,
+    SYMBOL_WIFI,
+    SYMBOL_SOUND,
+    SYMBOL_NUMICRO,
+    SYMBOL_BAT_FRAME,
+    SYMBOL_BAT_1,
+    SYMBOL_BAT_2,
+    SYMBOL_BAT_3,
+    SYMBOL_PLUS,
+    SYMBOL_MINUS,
+    SYMBOL_V,
+    SYMBOL_A,
+    SYMBOL_W,
+    SYMBOL_ARROW_UP,
+    SYMBOL_ARROW_LEFT,
+    SYMBOL_ARROW_DOWN,
+    SYMBOL_ARROW_RIGHT,
+    SYMBOL_CIRCLE_UP,
+    SYMBOL_CIRCLE_LEFT,
+    SYMBOL_CIRCLE_RIGHT,
+    SYMBOL_PERCENTAGE,
+    SYMBOL_PPM,
+    SYMBOL_TEMP_C,
+    SYMBOL_TEMP_F,
+    SYMBOL_VERSION,
+    SYMBOL_MAIN_DIG_COL1,
+    SYMBOL_MAIN_DIG_COL2,
+    SYMBOL_MAIN_DIG_COL3,
+    SYMBOL_MAIN_DIG_COL4,
+    SYMBOL_MAIN_DIG_COL5,
+    SYMBOL_MAIN_DIG_COL6,
+    SYMBOL_MAIN_DIG_P1,
+    SYMBOL_MAIN_DIG_P2,
+    SYMBOL_MAIN_DIG_P3,
+    SYMBOL_MAIN_DIG_P4,
+    SYMBOL_MAIN_DIG_P5,
+    SYMBOL_MAIN_DIG_P6,
+    SYMBOL_VER_DIG_P1,
+    SYMBOL_VER_DIG_P2,
+    SYMBOL_TIME_DIG_COL1,
+    SYMBOL_TIME_DIG_P1,
+    SYMBOL_TIME_DIG_P2,
+    SYMBOL_TIME_DIG_P3
+};
+const int i32SLCDSymbolsSize  = sizeof(au32SLCDSymbols) / sizeof(au32SLCDSymbols[0]);
+
+void slcd_demo_hook(void)
+{
+    uint32_t u32CurTickCount = rt_tick_get();
+
+    /* ZONE_MAIN_DIGIT */
+    LCDLIB_PrintNumber(ZONE_MAIN_DIGIT, u32CurTickCount);
+
+    /* ZONE_PPM_DIGIT */
+    LCDLIB_PrintNumber(ZONE_PPM_DIGIT, u32CurTickCount);
+
+    /* ZONE_TEMP_DIGIT */
+    LCDLIB_PrintNumber(ZONE_TEMP_DIGIT, u32CurTickCount);
+
+    /* ZONE_VER_DIGIT */
+    LCDLIB_PrintNumber(ZONE_VER_DIGIT, u32CurTickCount);
+
+    /* ZONE_TIME_DIGIT */
+    LCDLIB_PrintNumber(ZONE_TIME_DIGIT, u32CurTickCount);
+
+    /* ZONE_NUMICRO_DIGIT */
+    LCDLIB_PrintNumber(ZONE_NUMICRO_DIGIT, u32CurTickCount);
+
+    /* Travel all symbols */
+    LCDLIB_SetSymbol(au32SLCDSymbols[u32CurTickCount % i32SLCDSymbolsSize], (u32CurTickCount / i32SLCDSymbolsSize) % 2);
+
+    /* Travel all dots */
+    LCDLIB_SetSymbol(SYMBOL_S(u32CurTickCount % 40 + 1), (u32CurTickCount / 40) % 2);
+}
+
+static int slcd_demo_init(void)
+{
+    rt_err_t err = rt_thread_idle_sethook(slcd_demo_hook);
+
+    if (err != RT_EOK)
+    {
+        rt_kprintf("set idle hook failed!\n");
+        return -1;
+    }
+
+    return 0;
+}
+INIT_APP_EXPORT(slcd_demo_init);
+
+#endif /* #if defined(BSP_USING_SLCD) */

bsp/nuvoton/libraries/nu_packages/Demo/usbd_cdc_vcom_echo.c

+#include <rtthread.h>
+
+#if defined(RT_USB_DEVICE_CDC) && (defined(BSP_USING_USBD) || defined(BSP_USING_HSUSBD))
+
+static struct rt_semaphore rx_sem;
+
+static rt_err_t uart_input(rt_device_t dev, rt_size_t size)
+{
+    rt_sem_release(&rx_sem);
+    return RT_EOK;
+}
+
+static void serial_thread_entry(void *parameter)
+{
+    rt_device_t serial = (rt_device_t)parameter;
+    char ch;
+    char szStr[64];
+    while (1)
+    {
+        while (rt_device_read(serial, -1, &ch, 1) != 1)
+        {
+            if (rt_sem_take(&rx_sem, 3 * RT_TICK_PER_SECOND) == -RT_ETIMEOUT)
+            {
+                time_t now;
+                /* output current time */
+                now = time(RT_NULL);
+                rt_snprintf(szStr, sizeof(szStr), "%.*s\n", 25, ctime(&now));
+                rt_device_write(serial, 0, &szStr[0], rt_strlen(szStr));
+                continue;
+            }
+        }
+        rt_device_write(serial, 0, &ch, 1);
+    }
+}
+
+static int vcom_echo_init(void)
+{
+    int err = 0;
+    rt_thread_t thread;
+    rt_device_t serial;
+
+    serial = rt_device_find("vcom");
+    if (!serial)
+    {
+        rt_kprintf("find failed!\n");
+        return RT_ERROR;
+    }
+    err = rt_device_init(serial);
+    if (err)
+    {
+        rt_kprintf("find failed!\n");
+        return -RT_ERROR;
+    }
+    err = rt_device_open(serial, RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX/* | RT_DEVICE_FLAG_DMA_TX */);
+
+    rt_sem_init(&rx_sem, "rx_sem", 0, RT_IPC_FLAG_FIFO);
+
+    rt_device_set_rx_indicate(serial, uart_input);
+
+    thread = rt_thread_create("serial", serial_thread_entry, (void *)serial, 1024, 25, 10);
+    if (thread != RT_NULL)
+    {
+        rt_thread_startup(thread);
+    }
+
+    return RT_EOK;
+}
+INIT_APP_EXPORT(vcom_echo_init);
+
+#endif

bsp/nuvoton/libraries/nu_packages/SLCD/SConscript

+# RT-Thread building script for component
+
+from building import *
+
+cwd = GetCurrentDir()
+group = []
+if GetDepend('BSP_USING_SLCD'):
+	src = Glob('*.c') + Glob('*.cpp')
+	CPPPATH = [cwd]
+	group = DefineGroup('nu_pkgs_slcd', src, depend = [''], CPPPATH = CPPPATH)
+
+Return('group')

bsp/nuvoton/libraries/nu_packages/SLCD/slcd_rhe6616tp01.h

+/**************************************************************************//**
+ * @file     LCDLIB.h
+ * @version  V3.00
+ * @brief    RHE6616TP01(8-COM, 40-SEG, 1/4 Bias) LCD library header file
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * @copyright (C) 2019-2020 Nuvoton Technology Corp. All rights reserved.
+ *****************************************************************************/
+#ifndef __M2354_LCDLIB_H
+#define __M2354_LCDLIB_H
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/** @addtogroup LIBRARY Library
+  @{
+*/
+
+/** @addtogroup M2354_LCDLIB_Driver LCD Library
+  @{
+*/
+
+/** @addtogroup M2354_LCDLIB_EXPORTED_CONSTANTS LCDLIB Exported Constants
+  @{
+*/
+/*---------------------------------------------------------------------------------------------------------*/
+/*  Digit Zone Constant Definitions                                                                        */
+/*---------------------------------------------------------------------------------------------------------*/
+#define ZONE_MAIN_DIGIT         0   /*!< Main digit display zone index */
+#define ZONE_MAIN_DIG_CNT       7   /*!< Number of digits/texts, for number and alphabet display */
+#define ZONE_MAIN_SEG_NUM       14  /*!< Number of segments on each digit number */
+
+#define ZONE_PPM_DIGIT          1   /*!< PPM or percentage digit display zone index */
+#define ZONE_PPM_DIG_CNT        3   /*!< Number of digits, for ppm display */
+#define ZONE_PPM_SEG_NUM        7   /*!< Number of segments on each digit number */
+
+#define ZONE_TEMP_DIGIT         2   /*!< Temperature digit display zone index */
+#define ZONE_TEMP_DIG_CNT       3   /*!< Number of digits, for c/f display */
+#define ZONE_TEMP_SEG_NUM       7   /*!< Number of segments on each digit number */
+
+#define ZONE_VER_DIGIT          3   /*!< Version number digit display zone index */
+#define ZONE_VER_DIG_CNT        6   /*!< Number of digits, for version display */
+#define ZONE_VER_SEG_NUM        7   /*!< Number of segments on each digit number */
+
+#define ZONE_TIME_DIGIT         4   /*!< Time digit display zone index */
+#define ZONE_TIME_DIG_CNT       4   /*!< Number of digits */
+#define ZONE_TIME_SEG_NUM       7   /*!< Number of segments on each digit number */
+
+#define ZONE_NUMICRO_DIGIT      5   /*!< NuMicro digit display zone index */
+#define ZONE_NUMICRO_DIG_CNT    3   /*!< Number of digits */
+#define ZONE_NUMICRO_SEG_NUM    7   /*!< Number of segments on each digit number */
+
+/*---------------------------------------------------------------------------------------------------------*/
+/*  COM and SEG Position of Symbol Constant Definitions                                                    */
+/*---------------------------------------------------------------------------------------------------------*/
+#define SYMBOL_NVT              ((10)<<4 | (4)<<0)  /*!< T1 display on COM 4, SEG 10 */
+#define SYMBOL_WIFI             ((10)<<4 | (5)<<0)  /*!< T2 display on COM 5, SEG 10 */
+#define SYMBOL_SOUND            ((10)<<4 | (6)<<0)  /*!< T3 display on COM 6, SEG 10 */
+#define SYMBOL_NUMICRO          ((9)<<4  | (3)<<0)  /*!< Y3 display on COM 3, SEG 9 */
+#define SYMBOL_BAT_FRAME        ((10)<<4 | (0)<<0)  /*!< T7 display on COM 0, SEG 10 */
+#define SYMBOL_BAT_1            ((10)<<4 | (2)<<0)  /*!< T4 display on COM 2, SEG 10 */
+#define SYMBOL_BAT_2            ((10)<<4 | (3)<<0)  /*!< T5 display on COM 3, SEG 10 */
+#define SYMBOL_BAT_3            ((10)<<4 | (1)<<0)  /*!< T6 display on COM 1, SEG 10 */
+#define SYMBOL_PLUS             ((3)<<4  | (1)<<0)  /*!< T12 display on COM 1, SEG 3 */
+#define SYMBOL_MINUS            ((3)<<4  | (3)<<0)  /*!< T13 display on COM 3, SEG 3 */
+#define SYMBOL_V                ((39)<<4 | (4)<<0)  /*!< T26 display on COM 4, SEG 39 */
+#define SYMBOL_A                ((37)<<4 | (4)<<0)  /*!< T27 display on COM 4, SEG 37 */
+#define SYMBOL_W                ((35)<<4 | (4)<<0)  /*!< T28 display on COM 4, SEG 35 */
+#define SYMBOL_ARROW_UP         ((1)<<4  | (4)<<0)  /*!< T29 display on COM 4, SEG 1 */
+#define SYMBOL_ARROW_LEFT       ((1)<<4  | (6)<<0)  /*!< T30 display on COM 6, SEG 1 */
+#define SYMBOL_ARROW_DOWN       ((0)<<4  | (7)<<0)  /*!< T31 display on COM 7, SEG 0 */
+#define SYMBOL_ARROW_RIGHT      ((0)<<4  | (4)<<0)  /*!< T32 display on COM 4, SEG 0 */
+#define SYMBOL_CIRCLE_UP        ((1)<<4  | (5)<<0)  /*!< T33 display on COM 5, SEG 1 */
+#define SYMBOL_CIRCLE_LEFT      ((0)<<4  | (6)<<0)  /*!< T34 display on COM 6, SEG 0 */
+#define SYMBOL_CIRCLE_RIGHT     ((0)<<4  | (5)<<0)  /*!< T35 display on COM 5, SEG 0 */
+#define SYMBOL_PERCENTAGE       ((23)<<4 | (4)<<0)  /*!< Y2 display on COM 4, SEG 23 */
+#define SYMBOL_PPM              ((21)<<4 | (4)<<0)  /*!< Y1 display on COM 4, SEG 21 */
+#define SYMBOL_TEMP_C           ((25)<<4 | (4)<<0)  /*!< T37 display on COM 4, SEG 25 */
+#define SYMBOL_TEMP_F           ((27)<<4 | (4)<<0)  /*!< T38 display on COM 4, SEG 27 */
+#define SYMBOL_VERSION          ((31)<<4 | (4)<<0)  /*!< T41 display on COM 4, SEG 31 */
+#define SYMBOL_S(x)             (((((x)-1)%5)+11)<<4 | (((x)-1)/5)<<0)  /*!< S[x] display on COM x, SEG x. [x] range is 1 ~ 40. */
+#define SYMBOL_MAIN_DIG_COL1    ((16)<<4 | (1)<<0)  /*!< T14 display on COM 1, SEG 16 */
+#define SYMBOL_MAIN_DIG_COL2    ((20)<<4 | (1)<<0)  /*!< T16 display on COM 1, SEG 20 */
+#define SYMBOL_MAIN_DIG_COL3    ((24)<<4 | (1)<<0)  /*!< T18 display on COM 1, SEG 24 */
+#define SYMBOL_MAIN_DIG_COL4    ((28)<<4 | (1)<<0)  /*!< T20 display on COM 1, SEG 28 */
+#define SYMBOL_MAIN_DIG_COL5    ((32)<<4 | (1)<<0)  /*!< T22 display on COM 1, SEG 32 */
+#define SYMBOL_MAIN_DIG_COL6    ((36)<<4 | (1)<<0)  /*!< T24 display on COM 1, SEG 36 */
+#define SYMBOL_MAIN_DIG_P1      ((16)<<4 | (3)<<0)  /*!< T15 display on COM 3, SEG 16 */
+#define SYMBOL_MAIN_DIG_P2      ((20)<<4 | (3)<<0)  /*!< T17 display on COM 3, SEG 20 */
+#define SYMBOL_MAIN_DIG_P3      ((24)<<4 | (3)<<0)  /*!< T19 display on COM 3, SEG 24 */
+#define SYMBOL_MAIN_DIG_P4      ((28)<<4 | (3)<<0)  /*!< T21 display on COM 3, SEG 28 */
+#define SYMBOL_MAIN_DIG_P5      ((32)<<4 | (3)<<0)  /*!< T23 display on COM 3, SEG 32 */
+#define SYMBOL_MAIN_DIG_P6      ((36)<<4 | (3)<<0)  /*!< T25 display on COM 3, SEG 36 */
+#define SYMBOL_VER_DIG_P1       ((29)<<4 | (4)<<0)  /*!< T39 display on COM 4, SEG 29 */
+#define SYMBOL_VER_DIG_P2       ((33)<<4 | (4)<<0)  /*!< T40 display on COM 4, SEG 33 */
+#define SYMBOL_TIME_DIG_COL1    ((5)<<4  | (7)<<0)  /*!< T9 display on COM 7, SEG 5 */
+#define SYMBOL_TIME_DIG_P1      ((3)<<4  | (7)<<0)  /*!< T8 display on COM 7, SEG 3 */
+#define SYMBOL_TIME_DIG_P2      ((5)<<4  | (3)<<0)  /*!< T10 display on COM 3, SEG 5 */
+#define SYMBOL_TIME_DIG_P3      ((7)<<4  | (3)<<0)  /*!< T11 display on COM 3, SEG 7 */
+
+/**@}*/ /* end of group M2354_LCDLIB_EXPORTED_CONSTANTS */
+
+
+/** @addtogroup M2354_LCDLIB_EXPORTED_STRUCTS LCDLIB Exported Structs
+  @{
+*/
+typedef struct
+{
+    uint32_t u32DigitCnt;   /*!< Digit counts */
+    uint32_t u32MaxSegNum;  /*!< Maximum segment number */
+} LCD_ZONE_INFO_T;
+
+/**@}*/ /* end of group M2354_LCDLIB_EXPORTED_STRUCTS */
+
+
+/** @addtogroup M2354_LCDLIB_EXPORTED_FUNCTIONS LCD Exported Functions
+  @{
+*/
+
+void LCDLIB_Printf(uint32_t u32Zone, char *InputStr);
+void LCDLIB_PutChar(uint32_t u32Zone, uint32_t u32Index, uint8_t u8Ch);
+void LCDLIB_PrintNumber(uint32_t u32Zone, uint32_t InputNum);
+void LCDLIB_SetSymbol(uint32_t u32Symbol, uint32_t u32OnOff);
+
+/**@}*/ /* end of group M2354_LCDLIB_EXPORTED_FUNCTIONS */
+
+/**@}*/ /* end of group M2354_LCDLIB_Driver */
+
+/**@}*/ /* end of group LIBRARY */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* __M2354_LCDLIB_H */
+
+/*** (C) COPYRIGHT 2019-2020 Nuvoton Technology Corp. ***/

bsp/nuvoton/libraries/nuc980/Driver/Include/NuMicro.h

@@ -28,6 +28,7 @@
 #include "nu_crypto.h"
 #include "nu_can.h"
 #include "nu_i2s.h"
+#include "nu_usbd.h"
 
 #include "nu_sys.h"
 

bsp/nuvoton/libraries/nuc980/README.md

@@ -16,6 +16,7 @@
 | QSPI | RT_Device_Class_SPIBUS | ***qspi[0]*** |
 | RTC | RT_Device_Class_RTC | ***rtc*** |
 | PWM | RT_Device_Class_Miscellaneous (PWM) | ***pwm[0-1]*** |
+| USBD | RT_Device_Class_USBDevice | ***usbd*** |
 | SC (UART function) | RT_Device_Class_Char | ***scuart[0-1]*** |
 | SDH | RT_Device_Class_Block | ***sdh[0-1]*** |
 | SPI | RT_Device_Class_SPIBUS | ***spi[0-1]*** |

bsp/nuvoton/libraries/nuc980/rtt_port/Kconfig

@@ -628,24 +628,15 @@ config SOC_SERIES_NUC980
         default n
 
     config BSP_USING_USBD
-        bool "Enable Full-Speed USB Device Controller(USBD)"
-        select RT_USING_USB_DEVICE
-
-    config BSP_USING_HSUSBD
-        bool "Enable High-Speed USB Device Controller(HSUSBD)"
+        bool "Enable USB Device Controller(USBD)"
         select RT_USING_USB_DEVICE
 
     config BSP_USING_USBH
-        bool "Enable Full-Speed USB Host Controller(USBH)"
-        select RT_USING_USB_HOST
-        select RT_USBH_MSTORAGE
-
-    config BSP_USING_HSUSBH
-        bool "Enable High-Speed USB Host Controller(HSUSBH)"
+        bool "Enable USB Host Controller(USBH)"
         select RT_USING_USB_HOST
         select RT_USBH_MSTORAGE
 
-    config BSP_USING_HSOTG
-        bool "Enable High-Speed USB On-The-Go(HSOTG)"
-        select BSP_USING_HSUSBH
-        select BSP_USING_HSUSBD
+    config BSP_USING_OTG
+        bool "Enable USB On-The-Go(OTG)"
+        select BSP_USING_USBH
+        select BSP_USING_USBD

bsp/nuvoton/libraries/nuc980/rtt_port/SConscript

@@ -9,27 +9,6 @@ CPPPATH = [cwd]
 group = []
 
 # USB driver constrain
-if GetDepend('BOARD_USING_HSUSBD') and ( GetDepend('BSP_USING_USBD') or GetDepend('BSP_USING_HSUSBH') or GetDepend('BSP_USING_HSOTG') ):
-    print 'Sorry, wrong selection.'
-    print '[Hint] You already select BOARD_USING_HSUSBD. Please de-select BSP_USING_USBD, BSP_USING_HSUSBH and BSP_USING_HSOTG options.'
-    sys.exit(1)
-elif GetDepend('BOARD_USING_HSUSBD_USBH') and ( GetDepend('BSP_USING_USBD') or GetDepend('BSP_USING_HSUSBH') or GetDepend('BSP_USING_HSOTG') ):
-    print 'Sorry, wrong selection.'
-    print '[Hint] You already select BOARD_USING_HSUSBD_USBH. Please de-select BSP_USING_USBD, BSP_USING_HSUSBH and BSP_USING_HSOTG options.'
-    sys.exit(1)
-elif GetDepend('BOARD_USING_HSUSBH') and ( GetDepend('BSP_USING_USBH') or GetDepend('BSP_USING_HSUSBD') or GetDepend('BSP_USING_HSOTG') ):
-    print 'Sorry, wrong selection.'
-    print '[Hint] You already select BOARD_USING_HSUSBH. Please de-select BSP_USING_USBH, BSP_USING_HSUSBD and BSP_USING_HSOTG options.'
-    sys.exit(1)
-elif GetDepend('BOARD_USING_HSUSBH_USBD') and ( GetDepend('BSP_USING_USBH') or GetDepend('BSP_USING_HSUSBD') or GetDepend('BSP_USING_HSOTG') ):
-    print 'Sorry, wrong selection.'
-    print '[Hint] You already select BOARD_USING_HSUSBH_USBD. Please de-select BSP_USING_USBH, BSP_USING_HSUSBD and BSP_USING_HSOTG options.'
-    sys.exit(1)
-elif GetDepend('BOARD_USING_HSOTG') and ( GetDepend('BSP_USING_USBD') or GetDepend('BSP_USING_USBH') ):
-    print 'Sorry, wrong selection.'
-    print '[Hint] You already select BOARD_USING_HSOTG. Please de-select BSP_USING_USBD and BSP_USING_USBH options.'
-    sys.exit(1)
-else:
-    group = DefineGroup('nuc980_rttport', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('nuc980_rttport', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

bsp/nuvoton/libraries/nuc980/rtt_port/drv_can.c

@@ -192,13 +192,13 @@ static void nu_can_isr(int vector, void *param)
     /*IntId: 0x0001-0x0020, Number of Message Object which caused the interrupt.*/
     else if (u32IIDRstatus > 0 && u32IIDRstatus <= 32)
     {
-        /*Message RAM 0~15 for CAN Tx using*/
-        if (u32IIDRstatus <= 16)
+        /*Message RAM 0~RX_MSG_ID_INDEX for CAN Tx using*/
+        if (u32IIDRstatus <= RX_MSG_ID_INDEX)
         {
             //rt_kprintf("[%s-Tx]IntId = %d\n", psNuCAN->name, u32IIDRstatus);
             rt_hw_can_isr(&psNuCAN->dev, RT_CAN_EVENT_TX_DONE);
         }
-        else /*Message RAM 16~31 for CAN Rx using*/
+        else /*Message RAM RX_MSG_ID_INDEX~31 for CAN Rx using*/
         {
             //rt_kprintf("[%s-Rx]IntId = %d\n",  psNuCAN->name, u32IIDRstatus);
             rt_hw_can_isr(&psNuCAN->dev, (RT_CAN_EVENT_RX_IND | ((u32IIDRstatus - 1) << 8)));

bsp/nuvoton/libraries/nuc980/rtt_port/drv_emac.c

@@ -590,6 +590,9 @@ static int rt_hw_nu_emac_init(void)
     rt_err_t ret = RT_EOK;
     char szTmp[32];
 
+    /* MDC CLK divider */
+    outpw(REG_CLK_DIVCTL8, (inpw(REG_CLK_DIVCTL8) & ~0xFF) | 0xA0);
+
     for (i = (EMAC_START + 1); i < EMAC_CNT; i++)
     {
         nu_emac_t psNuEMAC = (nu_emac_t)&nu_emac_arr[i];
@@ -624,9 +627,6 @@ static int rt_hw_nu_emac_init(void)
         RT_ASSERT(ret == RT_EOK);
     }
 
-    /* MDC CLK divider */
-    outpw(REG_CLK_DIVCTL8, (inpw(REG_CLK_DIVCTL8) & ~0xFF) | 0xA0);
-
     return 0;
 }
 

bsp/nuvoton/libraries/nuc980/rtt_port/drv_sys.c

@@ -217,8 +217,6 @@ void machine_shutdown(void)
     /* Unlock */
     SYS_UnlockReg();
 
-    // TODO
-
     while (1);
 }
 

bsp/nuvoton/nk-980iot/.config

@@ -109,10 +109,10 @@ CONFIG_FINSH_ARG_MAX=10
 #
 CONFIG_RT_USING_DFS=y
 CONFIG_DFS_USING_WORKDIR=y
-CONFIG_DFS_FILESYSTEMS_MAX=8
-CONFIG_DFS_FILESYSTEM_TYPES_MAX=8
+CONFIG_DFS_FILESYSTEMS_MAX=16
+CONFIG_DFS_FILESYSTEM_TYPES_MAX=16
 CONFIG_DFS_FD_MAX=64
-# CONFIG_RT_USING_DFS_MNTTABLE is not set
+CONFIG_RT_USING_DFS_MNTTABLE=y
 CONFIG_RT_USING_DFS_ELMFAT=y
 
 #
@@ -220,8 +220,29 @@ CONFIG_RT_HWCRYPTO_USING_RNG=y
 #
 # Using USB
 #
-# CONFIG_RT_USING_USB_HOST is not set
-# CONFIG_RT_USING_USB_DEVICE is not set
+CONFIG_RT_USING_USB_HOST=y
+CONFIG_RT_USBH_MSTORAGE=y
+CONFIG_UDISK_MOUNTPOINT="/"
+CONFIG_RT_USING_USB_DEVICE=y
+CONFIG_RT_USBD_THREAD_STACK_SZ=4096
+CONFIG_USB_VENDOR_ID=0x0FFE
+CONFIG_USB_PRODUCT_ID=0x0001
+CONFIG_RT_USB_DEVICE_COMPOSITE=y
+CONFIG_RT_USB_DEVICE_CDC=y
+CONFIG_RT_USB_DEVICE_NONE=y
+CONFIG_RT_USB_DEVICE_MSTORAGE=y
+# CONFIG_RT_USB_DEVICE_HID is not set
+# CONFIG_RT_USB_DEVICE_RNDIS is not set
+# CONFIG_RT_USB_DEVICE_ECM is not set
+# CONFIG_RT_USB_DEVICE_WINUSB is not set
+# CONFIG_RT_USB_DEVICE_AUDIO is not set
+CONFIG_RT_VCOM_TASK_STK_SIZE=2048
+CONFIG_RT_CDC_RX_BUFSIZE=128
+# CONFIG_RT_VCOM_TX_USE_DMA is not set
+CONFIG_RT_VCOM_SERNO="32021919830108"
+CONFIG_RT_VCOM_SER_LEN=14
+CONFIG_RT_VCOM_TX_TIMEOUT=1000
+CONFIG_RT_USB_MSTORAGE_DISK_NAME="ramdisk1"
 
 #
 # POSIX layer and C standard library
@@ -680,7 +701,7 @@ CONFIG_PKG_VI_VER="latest"
 # Nuvoton Packages Config
 #
 CONFIG_NU_PKG_USING_UTILS=y
-# CONFIG_NU_PKG_USING_DEMO is not set
+CONFIG_NU_PKG_USING_DEMO=y
 # CONFIG_NU_PKG_USING_BMX055 is not set
 # CONFIG_NU_PKG_USING_MAX31875 is not set
 # CONFIG_NU_PKG_USING_NAU88L25 is not set
@@ -779,11 +800,9 @@ CONFIG_BSP_USING_CRYPTO=y
 # CONFIG_BSP_USING_SOFT_I2C is not set
 CONFIG_BSP_USING_WDT=y
 # CONFIG_BSP_USING_EBI is not set
-# CONFIG_BSP_USING_USBD is not set
-# CONFIG_BSP_USING_HSUSBD is not set
-# CONFIG_BSP_USING_USBH is not set
-# CONFIG_BSP_USING_HSUSBH is not set
-# CONFIG_BSP_USING_HSOTG is not set
+CONFIG_BSP_USING_USBD=y
+CONFIG_BSP_USING_USBH=y
+CONFIG_BSP_USING_OTG=y
 
 #
 # On-board Peripheral Drivers
@@ -793,12 +812,10 @@ CONFIG_BOARD_USING_IP101GR=y
 CONFIG_BOARD_USING_NAU8822=y
 CONFIG_BOARD_USING_STORAGE_SDCARD=y
 CONFIG_BOARD_USING_STORAGE_SPIFLASH=y
-CONFIG_BOARD_USING_USB_NONE=y
-# CONFIG_BOARD_USING_HSUSBD is not set
-# CONFIG_BOARD_USING_HSUSBD_USBH is not set
-# CONFIG_BOARD_USING_HSUSBH is not set
-# CONFIG_BOARD_USING_HSUSBH_USBD is not set
-# CONFIG_BOARD_USING_HSOTG is not set
+# CONFIG_BOARD_USING_USB_NONE is not set
+# CONFIG_BOARD_USING_USB_HOST is not set
+# CONFIG_BOARD_USING_USB_OTG is not set
+CONFIG_BOARD_USING_USB_OTG_HOST=y
 
 #
 # Board extended module drivers

bsp/nuvoton/nk-980iot/README.md

@@ -42,8 +42,10 @@ Nuvoton Technology provides industrial IoT development platform using NUC980DK61
 |Button |  | Supported |
 |LEDs |  | Supported |
 |Audio Codec | NAU8822, Supports MIC and earphone | Supported |
+|USB Device | VCOM + MStorage | Supported |
+|2xUSB Host | MStorage | Not ready |
 |SPI NAND flash | W25N01GVZE1G | Not ready |
-|Virtual COM | For console | Ready.(Need to install VCOM driver) |
+|VCOM | For console | Ready.(Need to install VCOM driver) |
 
 ## 2. Supported compiler
 Support GCC, MDK4 and MDK5 IDE/compilers. More information of these compiler version as following:

bsp/nuvoton/nk-980iot/applications/mnt.c

@@ -32,6 +32,7 @@
 
 #if defined(PKG_USING_RAMDISK)
     #define RAMDISK_NAME         "ramdisk0"
+    #define RAMDISK_UDC          "ramdisk1"
     #define MOUNT_POINT_RAMDISK0 "/"
 #endif
 
@@ -40,8 +41,43 @@
     #define MOUNT_POINT_SPIFLASH0 "/mnt/"PARTITION_NAME_FILESYSTEM
 #endif
 
+#ifdef RT_USING_DFS_MNTTABLE
+
+/*
+const char   *device_name;
+const char   *path;
+const char   *filesystemtype;
+unsigned long rwflag;
+const void   *data;
+*/
+
+const struct dfs_mount_tbl mount_table[] =
+{
+    { RAMDISK_UDC, "/ramdisk_udc", "elm", 0, RT_NULL },
+    {0},
+};
+#endif
+
+
 #if defined(PKG_USING_RAMDISK)
 
+extern rt_err_t ramdisk_init(const char *dev_name, rt_uint8_t *disk_addr, rt_size_t block_size, rt_size_t num_block);
+int ramdisk_device_init(void)
+{
+    rt_err_t result = RT_EOK;
+
+    /* Create a 8MB RAMDISK */
+    result = ramdisk_init(RAMDISK_NAME, NULL, 512, 2 * 8192);
+    RT_ASSERT(result == RT_EOK);
+
+    /* Create a 4MB RAMDISK */
+    result = ramdisk_init(RAMDISK_UDC, NULL, 512, 2 * 4096);
+    RT_ASSERT(result == RT_EOK);
+
+    return 0;
+}
+INIT_DEVICE_EXPORT(ramdisk_device_init);
+
 /* Recursive mkdir */
 static int mkdir_p(const char *dir, const mode_t mode)
 {
@@ -115,11 +151,19 @@ exit_mkdir_p:
 /* Initialize the filesystem */
 int filesystem_init(void)
 {
+    rt_err_t result = RT_EOK;
+
     // ramdisk as root
-    if (rt_device_find(RAMDISK_NAME))
+    if (!rt_device_find(RAMDISK_NAME))
+    {
+        LOG_E("cannot find %s device", RAMDISK_NAME);
+        goto exit_filesystem_init;
+    }
+    else
     {
-        // format the ramdisk
-        dfs_mkfs("elm", RAMDISK_NAME);
+        /* Format these ramdisk */
+        result = (rt_err_t)dfs_mkfs("elm", RAMDISK_NAME);
+        RT_ASSERT(result == RT_EOK);
 
         /* mount ramdisk0 as root directory */
         if (dfs_mount(RAMDISK_NAME, "/", "elm", 0, RT_NULL) == 0)
@@ -127,6 +171,7 @@ int filesystem_init(void)
             LOG_I("ramdisk mounted on \"/\".");
 
             /* now you can create dir dynamically. */
+            mkdir_p("/ramdisk_udc", 0x777);
             mkdir_p("/mnt", 0x777);
             mkdir_p("/cache", 0x777);
             mkdir_p("/download", 0x777);
@@ -137,21 +182,27 @@ int filesystem_init(void)
         else
         {
             LOG_E("root folder creation failed!\n");
+            goto exit_filesystem_init;
         }
-        return RT_EOK;
     }
-    LOG_E("cannot find %s device", RAMDISK_NAME);
-    return -RT_ERROR;
-}
-INIT_ENV_EXPORT(filesystem_init);
 
-extern rt_err_t ramdisk_init(const char *dev_name, rt_uint8_t *disk_addr, rt_size_t block_size, rt_size_t num_block);
-int ramdisk_device_init(void)
-{
-    /* Create a 8MB RAMDISK */
-    return (int)ramdisk_init(RAMDISK_NAME, NULL, 512, 2 * 8192);
+    if (!rt_device_find(RAMDISK_UDC))
+    {
+        LOG_E("cannot find %s device", RAMDISK_UDC);
+        goto exit_filesystem_init;
+    }
+    else
+    {
+        /* Format these ramdisk */
+        result = (rt_err_t)dfs_mkfs("elm", RAMDISK_UDC);
+        RT_ASSERT(result == RT_EOK);
+    }
+
+exit_filesystem_init:
+
+    return -result;
 }
-INIT_DEVICE_EXPORT(ramdisk_device_init);
+INIT_ENV_EXPORT(filesystem_init);
 #endif
 
 #if defined(BOARD_USING_STORAGE_SPIFLASH)

bsp/nuvoton/nk-980iot/board/Kconfig

@@ -39,44 +39,31 @@ menu "Hardware Drivers Config"
             default y
 
         choice
-            prompt "Select FS/HS USB Ports"
+            prompt "Select HS USB Ports"
 
             config BOARD_USING_USB_NONE
                 bool "Without any USB function"
                 help
                     Choose this option if you need not USB functions.
 
-            config BOARD_USING_HSUSBD
-                select BSP_USING_HSUSBD
-                bool "Enable HSUSBD(over USB2.0)"
-                help
-                    Choose this option if you need HSUSBD function mode.
-
-            config BOARD_USING_HSUSBD_USBH
+            config BOARD_USING_USB_HOST
                 select BSP_USING_USBH
-                select BSP_USING_HSUSBD
-                bool "Enable HSUSBD(over USB2.0) and USBH(over USB1.1)"
+                bool "Enable USBH"
                 help
-                    Choose this option if you need HSUSBD and USBH function mode at the same time.
+                    Choose this option if you need USB HOST function mode.
 
-            config BOARD_USING_HSUSBH
-                select BSP_USING_HSUSBH
-                bool "Enable HSUSBH(over USB2.0)"
+            config BOARD_USING_USB_OTG
+                select BSP_USING_OTG
+                bool "Enable OTG"
                 help
-                    Choose this option if you need HSUSBH function mode.
+                    Choose this option if you need USB HOST function mode.
 
-            config BOARD_USING_HSUSBH_USBD
-                select BSP_USING_HSUSBH
-                select BSP_USING_USBD
-                bool "Enable HSUSBH(over USB2.0) and USBD(over USB1.1)"
-                help
-                    Choose this option if you need HSUSBH and USBD function mode at the same time.
-
-            config BOARD_USING_HSOTG
-                select BSP_USING_HSOTG
-                bool "Enable HSOTG(over USB2.0)"
+            config BOARD_USING_USB_OTG_HOST
+                select BSP_USING_USBH
+                select BSP_USING_OTG
+                bool "Enable OTG AND USBH"
                 help
-                    Choose this option if you need HSOTG function mode.
+                    Choose this option if you need both USB ports function mode.
 
         endchoice
 

bsp/nuvoton/nk-980iot/board/nu_pin_init.c

@@ -78,6 +78,12 @@ static void nu_pin_can_init(void)
 
 }
 
+static void nu_pin_usbd_init(void)
+{
+    /* USB0_VBUSVLD, PE.11  */
+    //outpw(REG_SYS_GPE_MFPH, (inpw(REG_SYS_GPE_MFPH) & ~0x0000F000) | 0x00001000);
+}
+
 void nu_pin_init(void)
 {
     nu_pin_uart_init();
@@ -89,6 +95,7 @@ void nu_pin_init(void)
     nu_pin_pwm_init();
     nu_pin_i2s_init();
     nu_pin_can_init();
+    nu_pin_usbd_init();
 }
 
 void nu_pin_deinit(void)