From f80f7b2af4478be5f124919370589e75c4f3b817 Mon Sep 17 00:00:00 2001
From: Janos Magasrevy <75690572+wes-jmagasrevy@users.noreply.github.com>
Date: Tue, 11 May 2021 22:26:37 -0400
Subject: [PATCH 1/2] Fixed logic that handled OS_ERR_PEND_ABORT in Cs/OS2's
kal.c that ultimately caused a TCP connection leak.
---
KAL/uCOS-II/kal.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/KAL/uCOS-II/kal.c b/KAL/uCOS-II/kal.c
index 8e79376..2e9f503 100644
--- a/KAL/uCOS-II/kal.c
+++ b/KAL/uCOS-II/kal.c
@@ -1551,7 +1551,7 @@ void KAL_SemPendAbort (KAL_SEM_HANDLE sem_handle,
OS_PEND_OPT_BROADCAST,
&err_os);
if ((err_os == OS_ERR_NONE) ||
- (err_os != OS_ERR_PEND_ABORT)) {
+ (err_os == OS_ERR_PEND_ABORT)) {
*p_err = RTOS_ERR_NONE;
} else {
*p_err = KAL_ErrConvert(err_os);
From 74c25f2e6b09ab7821e945fd12c5bcad8c8c1d60 Mon Sep 17 00:00:00 2001
From: Janos Magasrevy <75690572+wes-jmagasrevy@users.noreply.github.com>
Date: Thu, 20 May 2021 16:56:15 -0400
Subject: [PATCH 2/2] Updated version and Copyright year. Incremented
COMMON_VERSION constant. Updated Readme.
---
Auth/auth.c | 4 ++--
Auth/auth.h | 4 ++--
Collections/slist.c | 4 ++--
Collections/slist.h | 4 ++--
KAL/None/kal.c | 4 ++--
KAL/POSIX/kal.c | 4 ++--
KAL/Template/kal.c | 4 ++--
KAL/kal.h | 4 ++--
KAL/uCOS-II/kal.c | 4 ++--
KAL/uCOS-III/kal.c | 4 ++--
README.rst | 45 +++++++++++++++++++++++++++++++++++++++++++++
common.h | 6 +++---
common_err.h | 4 ++--
readme.md | 5 -----
14 files changed, 70 insertions(+), 30 deletions(-)
create mode 100644 README.rst
delete mode 100644 readme.md
diff --git a/Auth/auth.c b/Auth/auth.c
index 4f21cdc..2989c4a 100644
--- a/Auth/auth.c
+++ b/Auth/auth.c
@@ -3,7 +3,7 @@
* uC/Common
* Common Features for Micrium Stacks
*
-* Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+* Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
@@ -20,7 +20,7 @@
* uC/Common - Authentication Module (Auth)
*
* Filename : auth.c
-* Version : V1.02.00
+* Version : V1.02.01
*********************************************************************************************************
* Note(s) : (1) 'goto' statements were used in this software module. Their usage
* is restricted to cleanup purposes in exceptional program flow (e.g.
diff --git a/Auth/auth.h b/Auth/auth.h
index f717ec1..c929b25 100644
--- a/Auth/auth.h
+++ b/Auth/auth.h
@@ -3,7 +3,7 @@
* uC/Common
* Common Features for Micrium Stacks
*
-* Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+* Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
@@ -20,7 +20,7 @@
* uC/Common - Authentication Module (Auth)
*
* Filename : auth.h
-* Version : V1.02.00
+* Version : V1.02.01
*********************************************************************************************************
*/
diff --git a/Collections/slist.c b/Collections/slist.c
index 78c9cb5..2330af7 100644
--- a/Collections/slist.c
+++ b/Collections/slist.c
@@ -3,7 +3,7 @@
* uC/Common
* Common Features for Micrium Stacks
*
-* Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+* Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
@@ -20,7 +20,7 @@
* uC/Common - Singly-linked Lists (SList)
*
* Filename : slist.c
-* Version : V1.02.00
+* Version : V1.02.01
*********************************************************************************************************
*/
diff --git a/Collections/slist.h b/Collections/slist.h
index 77c33cc..77c3e8a 100644
--- a/Collections/slist.h
+++ b/Collections/slist.h
@@ -3,7 +3,7 @@
* uC/Common
* Common Features for Micrium Stacks
*
-* Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+* Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
@@ -20,7 +20,7 @@
* uC/Common - Singly-linked Lists (SList)
*
* Filename : slist.h
-* Version : V1.02.00
+* Version : V1.02.01
*********************************************************************************************************
*/
diff --git a/KAL/None/kal.c b/KAL/None/kal.c
index a8929d6..36e0c34 100644
--- a/KAL/None/kal.c
+++ b/KAL/None/kal.c
@@ -3,7 +3,7 @@
* uC/Common
* Common Features for Micrium Stacks
*
-* Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+* Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
@@ -21,7 +21,7 @@
* No Operating System
*
* Filename : kal.c
-* Version : V1.02.00
+* Version : V1.02.01
*********************************************************************************************************
* Note(s) : (1) Since no operating system is present, most of the present features are implemented
* directly in the KAL.
diff --git a/KAL/POSIX/kal.c b/KAL/POSIX/kal.c
index df1db02..45ce330 100644
--- a/KAL/POSIX/kal.c
+++ b/KAL/POSIX/kal.c
@@ -3,7 +3,7 @@
* uC/Common
* Common Features for Micrium Stacks
*
-* Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+* Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
@@ -21,7 +21,7 @@
* POSIX Threads
*
* Filename : kal.c
-* Version : V1.02.00
+* Version : V1.02.01
*********************************************************************************************************
* Notes : (1) Requires a Single UNIX Specification, Version 3 compliant operating environment.
* On Linux _XOPEN_SOURCE must be defined to at least 600, generally by passing the
diff --git a/KAL/Template/kal.c b/KAL/Template/kal.c
index 7c2dcbd..2ee924e 100644
--- a/KAL/Template/kal.c
+++ b/KAL/Template/kal.c
@@ -3,7 +3,7 @@
* uC/Common
* Common Features for Micrium Stacks
*
-* Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+* Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
@@ -21,7 +21,7 @@
* Template
*
* Filename : kal.c
-* Version : V1.02.00
+* Version : V1.02.01
*********************************************************************************************************
*/
diff --git a/KAL/kal.h b/KAL/kal.h
index fb752b2..3e94f9f 100644
--- a/KAL/kal.h
+++ b/KAL/kal.h
@@ -3,7 +3,7 @@
* uC/Common
* Common Features for Micrium Stacks
*
-* Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+* Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
@@ -20,7 +20,7 @@
* uC/Common - Kernel Abstraction Layer (KAL)
*
* Filename : kal.h
-* Version : V1.02.00
+* Version : V1.02.01
*********************************************************************************************************
*/
diff --git a/KAL/uCOS-II/kal.c b/KAL/uCOS-II/kal.c
index 2e9f503..68559a0 100644
--- a/KAL/uCOS-II/kal.c
+++ b/KAL/uCOS-II/kal.c
@@ -3,7 +3,7 @@
* uC/Common
* Common Features for Micrium Stacks
*
-* Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+* Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
@@ -21,7 +21,7 @@
* uCOS-II
*
* Filename : kal.c
-* Version : V1.02.00
+* Version : V1.02.01
*********************************************************************************************************
* Note(s) : (1) 'goto' statements were used in this software module. Their usage
* is restricted to cleanup purposes in exceptional program flow (e.g.
diff --git a/KAL/uCOS-III/kal.c b/KAL/uCOS-III/kal.c
index a5e86a6..e52c45f 100644
--- a/KAL/uCOS-III/kal.c
+++ b/KAL/uCOS-III/kal.c
@@ -3,7 +3,7 @@
* uC/Common
* Common Features for Micrium Stacks
*
-* Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+* Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
@@ -21,7 +21,7 @@
* uCOS-III
*
* Filename : kal.c
-* Version : V1.02.00
+* Version : V1.02.01
*********************************************************************************************************
* Note(s) : (1) 'goto' statements were used in this software module. Their usage
* is restricted to cleanup purposes in exceptional program flow (e.g.
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000..a75ea7e
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,45 @@
+.. raw:: html
+
+
+
+ 
+
+
+
+µC/OS is a full-featured embedded operating system originally developed by Micriµm™. In addition to the two highly popular kernels, µC/OS features support for TCP/IP, USB-Device, USB-Host, and Modbus, as well as a robust File System.
+
+Since its founding in 1999 as a private company, Micriµm and its team of engineers have offered world-class embedded software components for the most critical and demanding real-time applications. Recognized as having some of the cleanest code in the industry, with easy-to-understand documentation, the Micrium real-time kernels, and software components have successfully been deployed in thousands of products worldwide across a broad range of industries. Micrium’s µC/OS-II™ kernel has been certified for use in safety-critical applications and remains a respected favorite in the medical, aerospace, and industrial markets. µC/OS continues to be the RTOS of choice for engineers requiring the most reliable and trusted solution for their mission-critical applications.
+
+----------
+
+.. raw:: HTML
+
+
+
+ 
+
+
+
+Founded by a team of former Micrium employees, Weston Embedded Solutions is the official custodian for the µC/OS RTOS and Stacks software repository to ensure it remains the trusted choice for embedded engineers around the world.
+
+----------
+
+Product Documentation and Release Notes
+***************
+https://micrium.atlassian.net/
+
+Technical Support
+*****************
+https://weston-embedded.com/micrium-support
+
+Example Projects
+*********
+https://weston-embedded.com/micrium-examples
+
+Commercial Licensing Option
+*********
+https://weston-embedded.com/products/cesium
+
+Who to Contact
+*********
+https://weston-embedded.com/company/contact
\ No newline at end of file
diff --git a/common.h b/common.h
index ed0483d..bac7e3b 100644
--- a/common.h
+++ b/common.h
@@ -3,7 +3,7 @@
* uC/Common
* Common Features for Micrium Stacks
*
-* Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+* Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
@@ -20,7 +20,7 @@
* uC/Common - Common Definitions
*
* Filename : common.h
-* Version : V1.02.00
+* Version : V1.02.01
*********************************************************************************************************
*/
@@ -74,7 +74,7 @@
*********************************************************************************************************
*/
-#define COMMON_VERSION 10200u /* See Note #1. */
+#define COMMON_VERSION 10201u /* See Note #1. */
#endif /* COMMON_MODULE_PRESENT */
diff --git a/common_err.h b/common_err.h
index c240037..9908829 100644
--- a/common_err.h
+++ b/common_err.h
@@ -3,7 +3,7 @@
* uC/Common
* Common Features for Micrium Stacks
*
-* Copyright 2013-2020 Silicon Laboratories Inc. www.silabs.com
+* Copyright 2013-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
@@ -20,7 +20,7 @@
* uC/Common - Generic error codes
*
* Filename : common_err.h
-* Version : V1.02.00
+* Version : V1.02.01
*********************************************************************************************************
*/
diff --git a/readme.md b/readme.md
deleted file mode 100644
index 9edaa6c..0000000
--- a/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# uC/Common
-
-µC/Common is a module that regroups components used by various Micrium products. It currently includes a Kernel Abstraction Layer (KAL), allowing products to make abstraction of the kernel that is used. µC/Common is designed to be included in any project using µC/FS, µC/USB-Device, µC/USB-Host or µC/TCP-IP.
-
-## For the complete documentation, visit https://doc.micrium.com/display/ucos/
\ No newline at end of file