Merge pull request #4460 from OpenNuvoton/nuvoton

[nuvoton] Update BSP.

Author: BernardXiong

bsp/nuvoton/README.md

@@ -1,9 +1,10 @@
-# Nuvoton BSP descriptions
+ï»? Nuvoton BSP descriptions
 Current supported BSP shown in below table:
 
 | **BSP folder** | **Board name** |
 |:------------------------- |:-------------------------- |
 | [numaker-iot-m487](numaker-iot-m487) | Nuvoton NuMaker-IoT-M487 |
 | [numaker-pfm-m487](numaker-pfm-m487) | Nuvoton NuMaker-PFM-M487 |
 | [nk-980iot](nk-980iot) | Nuvoton NK-980IOT |
-| [numaker-m2354](numaker-m2354) | Nuvoton NuMaker-M2354 |
+| [numaker-m2354](numaker-m2354) | Nuvoton NuMaker-M2354 |
+| [nk-rtu980](nk-rtu980) | Nuvoton NK-RTU980 |

bsp/nuvoton/libraries/m2354/Device/Nuvoton/M2354/Include/NuMicro.h

@@ -9,6 +9,7 @@
 #ifndef __NUMICRO_H__
 #define __NUMICRO_H__
 
+#include "nutool_clkcfg.h"
 #include "M2354.h"
 
 #endif  /* __NUMICRO_H__ */

bsp/nuvoton/libraries/m2354/Device/Nuvoton/M2354/Include/system_M2354.h

@@ -49,11 +49,21 @@ extern "C" {
 /*----------------------------------------------------------------------------
   Define SYSCLK
  *----------------------------------------------------------------------------*/
+#ifndef __HXT
 #define __HXT       (12000000UL)    /*!< External Crystal Clock Frequency     */
+#endif
+
 #define __LIRC      (32000UL)       /*!< Internal 32K RC Oscillator Frequency */
 #define __HIRC      (12000000UL)    /*!< Internal 12M RC Oscillator Frequency */
+
+#ifndef __LXT
 #define __LXT       (32768UL)       /*!< External Crystal Clock Frequency 32.768KHz */
+#endif
+
+#ifndef __HSI
 #define __HSI       (48000000UL)    /*!< PLL Output Clock Frequency */
+#endif
+
 #define __HIRC48    (48000000UL)    /*!< Internal 48M RC Oscillator Frequency */
 #define __LIRC32    (32000UL)       /*!< Internal 32K RC Oscillator Frequency */
 #define __MIRC      (4000000UL)     /*!< Internal 4M RC Oscillator Frequency */
@@ -93,7 +103,7 @@ extern uint32_t __PC(void);         /*!< Return the current program counter valu
  */
 #define ASSERT_PARAM(expr)  { if (!(expr)) { AssertError((uint8_t*)__FILE__, __LINE__); } }
 
-void AssertError(uint8_t* file, uint32_t line);
+void AssertError(uint8_t *file, uint32_t line);
 #else
 #define ASSERT_PARAM(expr)
 #endif

bsp/nuvoton/libraries/m2354/StdDriver/lib/libStdDriver.ewp

@@ -348,6 +348,7 @@
                     <state>$PROJ_DIR$\..\..\Device\Nuvoton\M2354\Include</state>
                     <state>$PROJ_DIR$\..\..\CMSIS\Include</state>
                     <state>$PROJ_DIR$\..\inc</state>
+                    <state>$PROJ_DIR$</state>
                 </option>
                 <option>
                     <name>CCStdIncCheck</name>
@@ -1385,6 +1386,7 @@
                     <state>$PROJ_DIR$\..\..\Device\Nuvoton\M2354\Include</state>
                     <state>$PROJ_DIR$\..\..\CMSIS\Include</state>
                     <state>$PROJ_DIR$\..\inc</state>
+                    <state>$PROJ_DIR$</state>
                 </option>
                 <option>
                     <name>CCStdIncCheck</name>

bsp/nuvoton/libraries/m2354/StdDriver/lib/libStdDriver.uvprojx

@@ -338,7 +338,7 @@
               <MiscControls></MiscControls>
               <Define></Define>
               <Undefine></Undefine>
-              <IncludePath>..\inc;..\..\CMSIS\Include;..\..\Device\Nuvoton\M2354\Include</IncludePath>
+              <IncludePath>..\inc;..\..\CMSIS\Include;..\..\Device\Nuvoton\M2354\Include;.</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>

bsp/nuvoton/libraries/m2354/rtt_port/drv_bpwm_capture.c

@@ -14,7 +14,7 @@
 #if defined(BSP_USING_BPWM_CAPTURE)
 #if ((BSP_USING_BPWM0_CAPTURE_CHMSK+BSP_USING_BPWM1_CAPTURE_CHMSK)!=0)
 #include <rtdevice.h>
-#include <NuMicro.h>
+#include "NuMicro.h"
 
 /* Private typedef --------------------------------------------------------------*/
 typedef struct _bpwm_dev

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

@@ -16,7 +16,7 @@
 
 #include <rtdevice.h>
 #include <rthw.h>
-#include <NuMicro.h>
+#include "NuMicro.h"
 
 /* Private Define ---------------------------------------------------------------*/
 #define RX_MSG_ID_INDEX        16

bsp/nuvoton/libraries/m2354/rtt_port/drv_clk.c

@@ -18,7 +18,7 @@
 #include <rtdbg.h>
 #include <stdint.h>
 #include <string.h>
-#include <NuMicro.h>
+#include "NuMicro.h"
 
 
 /* Private define ---------------------------------------------------------------*/

bsp/nuvoton/numaker-m2354/board/board.c renamed to bsp/nuvoton/libraries/m2354/rtt_port/drv_common.c

@@ -12,7 +12,7 @@
 
 #include <rtconfig.h>
 #include <rtthread.h>
-#include <NuMicro.h>
+#include "NuMicro.h"
 #include <nu_bitutil.h>
 #include "drv_uart.h"
 #include "board.h"
@@ -24,7 +24,7 @@
 /**
  * This function will initial M487 board.
  */
-void rt_hw_board_init(void)
+RT_WEAK void rt_hw_board_init(void)
 {
     /* Init System/modules clock */
     nutool_modclkcfg_init();
@@ -67,6 +67,41 @@ void rt_hw_board_init(void)
 #endif
 }
 
+/**
+ * The time delay function.
+ *
+ * @param microseconds.
+ */
+void rt_hw_us_delay(rt_uint32_t us)
+{
+    rt_uint32_t ticks;
+    rt_uint32_t told, tnow, tcnt = 0;
+    rt_uint32_t reload = SysTick->LOAD;
+
+    ticks = us * reload / (1000000 / RT_TICK_PER_SECOND);
+    told = SysTick->VAL;
+    while (1)
+    {
+        tnow = SysTick->VAL;
+        if (tnow != told)
+        {
+            if (tnow < told)
+            {
+                tcnt += told - tnow;
+            }
+            else
+            {
+                tcnt += reload - tnow + told;
+            }
+            told = tnow;
+            if (tcnt >= ticks)
+            {
+                break;
+            }
+        }
+    }
+}
+
 /**
  * This is the timer interrupt service routine.
  *

bsp/nuvoton/libraries/m2354/rtt_port/drv_eadc.c

@@ -11,7 +11,7 @@
 
 #include <rtconfig.h>
 #include <rtdevice.h>
-#include <NuMicro.h>
+#include "NuMicro.h"
 
 #ifdef BSP_USING_EADC