OS: Update UCOSII version to v2.93 using opensource repo

This UCOSII source code is fetched from https://github.com/SiliconLabs/uC-OS2, which use apache-2 license. * Now for ucosii application, three files must be provided app_hooks.c, app_cfg.h and os_cfg.h Signed-off-by: Huaqi Fang <578567190@qq.com>
Nuclei-Software · Mar 25, 2020 · 7efe072 · 7efe072
1 parent 04ace13
commit 7efe072
Show file tree

Hide file tree

Showing 23 changed files with 11,500 additions and 9,795 deletions.
diff --git a/Build/Makefile.rtos.UCOSII b/Build/Makefile.rtos.UCOSII
@@ -1,6 +1,4 @@
 C_SRCDIRS += $(NUCLEI_SDK_RTOS)/source $(NUCLEI_SDK_RTOS)/arch
 ASM_SRCDIRS += $(NUCLEI_SDK_RTOS)/arch
 
-INCDIRS += $(NUCLEI_SDK_RTOS)/arch \
-		$(NUCLEI_SDK_RTOS)/cfg \
-		$(NUCLEI_SDK_RTOS)/source/
+INCDIRS += $(NUCLEI_SDK_RTOS)/arch $(NUCLEI_SDK_RTOS)/source/
diff --git a/OS/UCOSII/cfg/os_cpu.h → OS/UCOSII/arch/os_cpu.h b/OS/UCOSII/cfg/os_cpu.h → OS/UCOSII/arch/os_cpu.h
@@ -3,37 +3,30 @@
 *                                              uC/OS-II
 *                                        The Real-Time Kernel
 *
+*                    Copyright 1992-2020 Silicon Laboratories Inc. www.silabs.com
 *
-*                         (c) Copyright 2009-2017; Micrium, Inc.; Weston, FL
-*                  All rights reserved.  Protected by international copyright laws.
+*                                 SPDX-License-Identifier: APACHE-2.0
 *
-*                                             RISC-V Port
+*               This software is subject to an open source license and is distributed by
+*                Silicon Laboratories Inc. pursuant to the terms of the Apache License,
+*                    Version 2.0 available at www.apache.org/licenses/LICENSE-2.0.
 *
-* File      : OS_CPU.H
-* Version   : V2.92.13
-*
-* LICENSING TERMS:
-* ---------------
-*           uC/OS-II is provided in source form for FREE short-term evaluation, for educational use or
-*           for peaceful research.  If you plan or intend to use uC/OS-II in a commercial application/
-*           product then, you need to contact Micrium to properly license uC/OS-II for its use in your
-*           application/product.   We provide ALL the source code for your convenience and to help you
-*           experience uC/OS-II.  The fact that the source is provided does NOT mean that you can use
-*           it commercially without paying a licensing fee.
-*
-*           Knowledge of the source code may NOT be used to develop a similar product.
-*
-*           Please help us continue to provide the embedded community with the finest software available.
-*           Your honesty is greatly appreciated.
+*********************************************************************************************************
+*/
+
+
+/*
+*********************************************************************************************************
 *
-*           You can find our product's user manual, API reference, release notes and
-*           more information at https://doc.micrium.com.
-*           You can contact us at www.micrium.com.
+*                                              RISC-V Port
 *
-* For       : RISC-V RV64
+* Filename  : os_cpu.h
+* Version   : V2.93.00
+*********************************************************************************************************
+* For       : Nuclei RISC-V RV32 and RV64
 * Toolchain : GNU C Compiler
-*
-* Note(s)   : Hardware FP is not supported.
+*********************************************************************************************************
+* Note(s)   : Hardware FP is not supported, Modified by Nuclei to support Nuclei RISC-V Cores.
 *********************************************************************************************************
 */
 
@@ -47,7 +40,6 @@
 #endif
 
 
-
 #include <stdint.h>
 #include "os_cpu_port.h"
 
@@ -147,13 +139,13 @@ typedef  uint32_t         OS_CPU_SR;        /* Define size of Machine status reg
 #define  OS_TASK_SW()           portYIELD()
 #define  OSIntCtxSw()           portYIELD()
 
-#ifndef TICK_RATE_HZ
-#warning "Use default TICK_RATE_HZ=100"
-#define TICK_RATE_HZ            100
+#ifndef OS_TICKS_PER_SEC
+#warning "Use default OS_TICKS_PER_SEC=100"
+#define OS_TICKS_PER_SEC            100
 #endif
 
 #ifndef configTICK_RATE_HZ
-    #define configTICK_RATE_HZ  TICK_RATE_HZ
+    #define configTICK_RATE_HZ  OS_TICKS_PER_SEC
 #endif
 
 /*
@@ -162,7 +154,7 @@ typedef  uint32_t         OS_CPU_SR;        /* Define size of Machine status reg
 *********************************************************************************************************
 */
 
-#if OS_CRITICAL_METHOD == 3u                      /* See OS_CPU_A.S                                    */
+#if OS_CRITICAL_METHOD == 3u                      /* See os_cpu_a.S   */
 portFORCE_INLINE OS_CPU_SR OS_CPU_SR_Save (void)
 {
     return __RV_CSR_READ_CLEAR(CSR_MSTATUS, MSTATUS_MIE);