updated c++ wrapper

stateos · Nov 20, 2018 · 5aa87d4 · 5aa87d4
1 parent 6c54169
commit 5aa87d4
Show file tree

Hide file tree

Showing 20 changed files with 89 additions and 102 deletions.
diff --git a/StateOS/README b/StateOS/README
@@ -44,6 +44,7 @@ Features:
 - modified context structures
 - added dynamic tasks
 - added create/destroy functions to c++ wrapper
+- updated c++ wrapper
 ---------
 6.3
 - merged test branch

diff --git a/StateOS/kernel/inc/osbarrier.h b/StateOS/kernel/inc/osbarrier.h
@@ -2,7 +2,7 @@
 
     @file    StateOS: osbarrier.h
     @author  Rajmund Szymanski
-    @date    16.11.2018
+    @date    19.11.2018
     @brief   This file contains definitions for StateOS.
 
  ******************************************************************************
@@ -34,10 +34,6 @@
 
 #include "oskernel.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /******************************************************************************
  *
  * Name              : barrier
@@ -54,6 +50,10 @@ struct __bar
 	unsigned limit; // limit of tasks blocked on the barrier object
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /******************************************************************************
  *
  * Name              : _BAR_INIT

diff --git a/StateOS/kernel/inc/osconditionvariable.h b/StateOS/kernel/inc/osconditionvariable.h
@@ -2,7 +2,7 @@
 
     @file    StateOS: osconditionvariable.h
     @author  Rajmund Szymanski
-    @date    16.11.2018
+    @date    19.11.2018
     @brief   This file contains definitions for StateOS.
 
  ******************************************************************************
@@ -35,10 +35,6 @@
 #include "oskernel.h"
 #include "osmutex.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* -------------------------------------------------------------------------- */
 
 #define cndOne       ( false ) // notify one task
@@ -58,6 +54,10 @@ struct __cnd
 	obj_t    obj;   // object header
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /******************************************************************************
  *
  * Name              : _CND_INIT

diff --git a/StateOS/kernel/inc/osevent.h b/StateOS/kernel/inc/osevent.h
@@ -2,7 +2,7 @@
 
     @file    StateOS: osevent.h
     @author  Rajmund Szymanski
-    @date    16.11.2018
+    @date    19.11.2018
     @brief   This file contains definitions for StateOS.
 
  ******************************************************************************
@@ -34,10 +34,6 @@
 
 #include "oskernel.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /******************************************************************************
  *
  * Name              : event
@@ -51,6 +47,10 @@ struct __evt
 	obj_t    obj;   // object header
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /******************************************************************************
  *
  * Name              : _EVT_INIT

diff --git a/StateOS/kernel/inc/oseventqueue.h b/StateOS/kernel/inc/oseventqueue.h
@@ -34,10 +34,6 @@
 
 #include "oskernel.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /******************************************************************************
  *
  * Name              : event queue
@@ -59,14 +55,16 @@ struct __evq
 };
 
 #ifdef __cplusplus
-}
 template<unsigned limit_>
 struct evq_T { evq_t evq; unsigned buf[limit_]; };
-extern "C" {
 #else
 struct evq_T { evq_t evq; unsigned buf[]; };
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /******************************************************************************
  *
  * Name              : _EVQ_INIT

diff --git a/StateOS/kernel/inc/osfastmutex.h b/StateOS/kernel/inc/osfastmutex.h
@@ -2,7 +2,7 @@
 
     @file    StateOS: osfastmutex.h
     @author  Rajmund Szymanski
-    @date    16.11.2018
+    @date    19.11.2018
     @brief   This file contains definitions for StateOS.
 
  ******************************************************************************
@@ -34,10 +34,6 @@
 
 #include "oskernel.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /******************************************************************************
  *
  * Name              : fast mutex (error checking)
@@ -55,6 +51,10 @@ struct __mut
 	tsk_t  * owner; // mutex owner
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /******************************************************************************
  *
  * Name              : _MUT_INIT

diff --git a/StateOS/kernel/inc/osflag.h b/StateOS/kernel/inc/osflag.h
@@ -2,7 +2,7 @@
 
     @file    StateOS: osflag.h
     @author  Rajmund Szymanski
-    @date    16.11.2018
+    @date    19.11.2018
     @brief   This file contains definitions for StateOS.
 
  ******************************************************************************
@@ -34,10 +34,6 @@
 
 #include "oskernel.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* -------------------------------------------------------------------------- */
 
 #define flgAny          0
@@ -66,6 +62,10 @@ struct __flg
 	unsigned flags; // pending flags
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /******************************************************************************
  *
  * Name              : _FLG_INIT

diff --git a/StateOS/kernel/inc/osjobqueue.h b/StateOS/kernel/inc/osjobqueue.h
@@ -35,10 +35,6 @@
 #include "oskernel.h"
 #include "osmailboxqueue.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /******************************************************************************
  *
  * Name              : job queue
@@ -60,14 +56,16 @@ struct __job
 };
 
 #ifdef __cplusplus
-}
 template<unsigned limit_>
 struct job_T { job_t job; fun_t *buf[limit_]; };
-extern "C" {
 #else
 struct job_T { job_t job; fun_t *buf[]; };
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /******************************************************************************
  *
  * Name              : _JOB_INIT

diff --git a/StateOS/kernel/inc/oslist.h b/StateOS/kernel/inc/oslist.h
@@ -2,7 +2,7 @@
 
     @file    StateOS: oslist.h
     @author  Rajmund Szymanski
-    @date    16.11.2018
+    @date    19.11.2018
     @brief   This file contains definitions for StateOS.
 
  ******************************************************************************
@@ -34,10 +34,6 @@
 
 #include "oskernel.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /******************************************************************************
  *
  * Name              : queue
@@ -51,6 +47,10 @@ struct __que
 	que_t  * next; // next object in the queue
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /******************************************************************************
  *
  * Name              : _QUE_INIT

diff --git a/StateOS/kernel/inc/osmailboxqueue.h b/StateOS/kernel/inc/osmailboxqueue.h
@@ -34,10 +34,6 @@
 
 #include "oskernel.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /******************************************************************************
  *
  * Name              : mailbox queue
@@ -60,14 +56,16 @@ struct __box
 };
 
 #ifdef __cplusplus
-}
 template<unsigned limit_, unsigned size_>
 struct box_T { box_t box; char buf[limit_ * size_]; };
-extern "C" {
 #else
 struct box_T { box_t box; char buf[]; };
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /******************************************************************************
  *
  * Name              : _BOX_INIT

diff --git a/StateOS/kernel/inc/osmemorypool.h b/StateOS/kernel/inc/osmemorypool.h
@@ -35,10 +35,6 @@
 #include "oskernel.h"
 #include "oslist.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* -------------------------------------------------------------------------- */
 
 #define MEM_SIZE( size ) \
@@ -62,14 +58,16 @@ struct __mem
 };
 
 #ifdef __cplusplus
-}
 template<unsigned limit_, unsigned size_>
 struct mem_T { mem_t mem; que_t buf[limit_ * (1 + MEM_SIZE(size_))]; };
-extern "C" {
 #else
 struct mem_T { mem_t mem; que_t buf[]; };
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /******************************************************************************
  *
  * Name              : _MEM_INIT

diff --git a/StateOS/kernel/inc/osmessagebuffer.h b/StateOS/kernel/inc/osmessagebuffer.h
@@ -34,10 +34,6 @@
 
 #include "oskernel.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /******************************************************************************
  *
  * Name              : message buffer
@@ -59,14 +55,16 @@ struct __msg
 };
 
 #ifdef __cplusplus
-}
 template<unsigned limit_>
 struct msg_T { msg_t msg; char buf[limit_]; };
-extern "C" {
 #else
 struct msg_T { msg_t msg; char buf[]; };
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /******************************************************************************
  *
  * Name              : _MSG_INIT

diff --git a/StateOS/kernel/inc/osmutex.h b/StateOS/kernel/inc/osmutex.h
@@ -2,7 +2,7 @@
 
     @file    StateOS: osmutex.h
     @author  Rajmund Szymanski
-    @date    16.11.2018
+    @date    19.11.2018
     @brief   This file contains definitions for StateOS.
 
  ******************************************************************************
@@ -34,10 +34,6 @@
 
 #include "oskernel.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* -------------------------------------------------------------------------- */
 
 /////// mutex type
@@ -84,6 +80,10 @@ struct __mtx
 	mtx_t  * list;  // list of mutexes held by owner
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /******************************************************************************
  *
  * Name              : _MTX_INIT