8.0.4

Author: quantum-leaps

.gitignore

@@ -49,6 +49,7 @@ src/qxk/qxk.c
 src/qxk/qxk_mutex.c
 src/qxk/qxk_sema.c
 src/qxk/qxk_xthr.c
+zephyr/qutest_port.c
 
 ports/arm-cm/qxk/
 ports/arm-cm/qutest/

3rd_party

@@ -42,12 +42,12 @@ typedef uint_fast8_t QSchedStatus;
 //============================================================================
 //! @class QK_Attr
 typedef struct {
-    QPSet readySet;            //!< @memberof QK_Attr
-    uint_fast8_t actPrio;      //!< @memberof QK_Attr
-    uint_fast8_t nextPrio;     //!< @memberof QK_Attr
-    uint_fast8_t actThre;      //!< @memberof QK_Attr
-    uint_fast8_t lockCeil;     //!< @memberof QK_Attr
-    uint_fast8_t intNest;      //!< @memberof QK_Attr
+    QPSet readySet;        //!< @memberof QK_Attr
+    uint8_t actPrio;       //!< @memberof QK_Attr
+    uint8_t nextPrio;      //!< @memberof QK_Attr
+    uint8_t actThre;       //!< @memberof QK_Attr
+    uint8_t lockCeil;      //!< @memberof QK_Attr
+    uint8_t intNest;       //!< @memberof QK_Attr
 } QK_Attr;
 
 //! @static @private @memberof QK

examples

@@ -32,8 +32,8 @@
 //============================================================================
 #define QP_VERSION_STR "8.0.4"
 #define QP_VERSION     804U
-// <VER>=804 <DATE>=250531
-#define QP_RELEASE     0x6AABFDABU
+// <VER>=804 <DATE>=250611
+#define QP_RELEASE     0x6A9FC8ABU
 
 //============================================================================
 // default configuration settings
@@ -509,26 +509,17 @@ typedef struct QActive {
 
 #ifdef QACTIVE_THREAD_TYPE
     QACTIVE_THREAD_TYPE thread; //!< @protected @memberof QActive
-#endif // def QACTIVE_THREAD_TYPE
+#endif
 
 #ifdef QACTIVE_OS_OBJ_TYPE
     QACTIVE_OS_OBJ_TYPE osObject; //!< @protected @memberof QActive
-#endif // def QACTIVE_OS_OBJ_TYPE
+#endif
 
 #ifdef QACTIVE_EQUEUE_TYPE
     QACTIVE_EQUEUE_TYPE eQueue; //!< @protected @memberof QActive
 #endif // def QACTIVE_EQUEUE_TYPE
 } QActive;
 
-//! @static @private @memberof QActive
-extern QActive * QActive_registry_[QF_MAX_ACTIVE + 1U];
-
-//! @static @private @memberof QActive
-extern QSubscrList * QActive_subscrList_;
-
-//! @static @private @memberof QActive
-extern enum_t QActive_maxPubSignal_;
-
 //! @protected @memberof QActive
 void QActive_ctor(QActive * const me,
     QStateHandler const initial);
@@ -686,9 +677,6 @@ QTimeEvt * QTimeEvt_expire_(QTimeEvt * const me,
 //! @static @public @memberof QTimeEvt
 bool QTimeEvt_noActive(uint_fast8_t const tickRate);
 
-//! @static @private @memberof QTimeEvt
-extern QTimeEvt QTimeEvt_timeEvtHead_[QF_MAX_TICK_RATE];
-
 //============================================================================
 //! @class QTicker
 //! @extends QActive
@@ -714,7 +702,7 @@ void QTicker_dispatch_(
 
 //! @private @memberof QTicker
 void QTicker_trig_(
-    QActive * const me,
+    QTicker * const me,
     void const * const sender);
 
 //============================================================================
@@ -834,6 +822,6 @@ void QF_gcFromISR(QEvt const * const e);
 
 #ifdef QF_MEM_ISOLATE
     #error Memory isolation not supported in this QP edition, need SafeQP
-#endif // def QF_MEM_ISOLATE
+#endif
 
 #endif // QP_H_

include/qk.h

@@ -30,8 +30,10 @@
 #define QP_PKG_H_
 
 //============================================================================
-#define QACTIVE_CAST_(ptr_)    ((QActive *)(ptr_))
-#define Q_PTR2UINT_CAST_(ptr_) ((uintptr_t)(ptr_))
+// helper macros...
+#define QACTIVE_CAST_(ptr_)            ((QActive *)(ptr_))
+#define QP_DIS_UPDATE_(T_, org_)       ((T_)~(org_))
+#define QP_DIS_VERIFY_(T_, org_, dis_) ((T_)(org_) == (T_)~(dis_))
 
 //============================================================================
 typedef struct {
@@ -50,6 +52,20 @@ void QF_bzero_(
     void * const start,
     uint_fast16_t const len);
 
+//! @static @private @memberof QActive
+extern QActive * QActive_registry_[QF_MAX_ACTIVE + 1U];
+
+//============================================================================
+//! @static @private @memberof QActive
+extern QSubscrList * QActive_subscrList_;
+
+//! @static @private @memberof QActive
+extern QSignal QActive_maxPubSignal_;
+
+//============================================================================
+//! @static @private @memberof QTimeEvt
+extern QTimeEvt QTimeEvt_timeEvtHead_[QF_MAX_TICK_RATE];
+
 //============================================================================
 // Bitmasks are for the QTimeEvt::flags attribute
 #define QTE_FLAG_IS_LINKED      (1U << 7U)

include/qp.h

@@ -84,55 +84,6 @@
 #define QS_RX_PUT(b_)                   ((void)0)
 #define QS_ONLY(code_)                  ((void)0)
 
-//============================================================================
-// QS API used inside applications
-#ifndef QS_TIME_SIZE
-    typedef uint32_t QSTimeCtr;
-#elif (QS_TIME_SIZE == 2U)
-    typedef uint16_t QSTimeCtr;
-#else
-    typedef uint32_t QSTimeCtr;
-#endif
-
-void QS_initBuf(uint8_t * const sto, uint_fast32_t const stoSize);
-uint16_t QS_getByte(void);
-uint8_t const *QS_getBlock(uint16_t* const pNbytes);
-void QS_doOutput(void);
-uint8_t QS_onStartup(void const* arg);
-void QS_onCleanup(void);
-void QS_onFlush(void);
-QSTimeCtr QS_onGetTime(void);
-
-void QS_rxInitBuf(uint8_t * const sto, uint16_t const stoSize);
-void QS_rxParse(void);
-
-//============================================================================
-// QS API used inside test fixtures
-#ifdef Q_UTEST
-
-#if (QS_FUN_PTR_SIZE == 2U)
-    typedef uint16_t QSFun;
-#elif (QS_FUN_PTR_SIZE == 4U)
-    typedef uint32_t QSFun;
-#elif (QS_FUN_PTR_SIZE == 8U)
-    typedef uint64_t QSFun;
-#endif
-
-struct QS_TProbe {
-    QSFun    addr;
-    uint32_t data;
-    uint8_t  idx;
-};
-
-void QS_onTestSetup(void);
-void QS_onTestTeardown(void);
-void QS_onTestEvt(QEvt *e);
-void QS_onTestPost(void const *sender, QActive *recipient,
-                   QEvt const *e, bool status);
-void QS_onTestLoop(void);
-
-#endif // def Q_UTEST
-
 //============================================================================
 // interface used only for internal implementation, but not in applications
 #ifdef QP_IMPL

include/qp_pkg.h

@@ -60,7 +60,7 @@
 #define Q_ASSERT_ID(id_, expr_) do { \
     QF_CRIT_STAT \
     QF_CRIT_ENTRY(); \
-    (expr_) ? ((void)0) : Q_onError(&Q_this_module_[0], (id_)); \
+    if (!(expr_)) Q_onError(&Q_this_module_[0], (id_)); \
     QF_CRIT_EXIT(); \
 } while (false)
 
@@ -70,7 +70,7 @@
 } while (false)
 
 #define Q_ASSERT_LOCAL(id_, expr_) do { \
-    if (expr_) {} else { \
+    if (!(expr_)) { \
         QF_CRIT_EST(); \
         Q_onError(&Q_this_module_[0], (id_)); \
     } \

include/qs_dummy.h

@@ -40,8 +40,8 @@ typedef struct QV {
 //============================================================================
 //! @class QV_Attr
 typedef struct {
-    QPSet readySet;             //!< @private @memberof QV_Attr
-    uint_fast8_t schedCeil;     //!< @private @memberof QV_Attr
+    QPSet readySet;        //!< @private @memberof QV_Attr
+    uint8_t schedCeil;     //!< @private @memberof QV_Attr
 } QV_Attr;
 
 //! @static @private @memberof QV

include/qsafe.h

@@ -158,12 +158,12 @@ static int_t l_critSectNest;   // critical section nesting up-down counter
 //............................................................................
 void QF_enterCriticalSection_(void) {
     pthread_mutex_lock(&l_critSectMutex_);
-    Q_ASSERT_INCRIT(101, l_critSectNest == 0); // NO nesting of crit.sect!
+    Q_ASSERT_INCRIT(100, l_critSectNest == 0); // NO nesting of crit.sect!
     ++l_critSectNest;
 }
 //............................................................................
 void QF_leaveCriticalSection_(void) {
-    Q_ASSERT_INCRIT(102, l_critSectNest == 1); // crit.sect. must balance!
+    Q_ASSERT_INCRIT(200, l_critSectNest == 1); // crit.sect. must balance!
     if ((--l_critSectNest) == 0) {
         pthread_mutex_unlock(&l_critSectMutex_);
     }
@@ -362,7 +362,7 @@ void QActive_start(QActive * const me,
     // no per-AO stack needed for this port
     QF_CRIT_STAT
     QF_CRIT_ENTRY();
-    Q_REQUIRE_INCRIT(600, stkSto == (void *)0);
+    Q_REQUIRE_INCRIT(800, stkSto == (void *)0);
     QF_CRIT_EXIT();
 
     me->prio  = (uint8_t)(prioSpec & 0xFFU); // QF-priority of the AO
@@ -379,7 +379,9 @@ void QActive_start(QActive * const me,
 //............................................................................
 #ifdef QACTIVE_CAN_STOP
 void QActive_stop(QActive * const me) {
-    QActive_unsubscribeAll(me);
+    if (QActive_subscrList_ != (QSubscrList *)0) {
+        QActive_unsubscribeAll(me); // unsubscribe from all events
+    }
 
     // make sure the AO is no longer in "ready set"
     QF_CRIT_STAT