7.1.0-beta3

Author: quantum-leaps

include/qf.h

@@ -885,7 +885,7 @@ typedef struct QActiveVtable {
     /*! @private virtual function to start the AO/thread
     * @sa QACTIVE_START()
     */
-    void (*start)(QActive * const me, uint_fast16_t prio,
+    void (*start)(QActive * const me, QPrioSpec prio,
                   QEvt const * * const qSto, uint_fast16_t const qLen,
                   void * const stkSto, uint_fast16_t const stkSize,
                   void const * const par);

qpc.qm

@@ -93,7 +93,7 @@ static QEvt const QEP_reservedEvt_[] = {
 #ifdef Q_SPY
     #define QEP_EXIT_(state_, qs_id_) do {                  \
         if ((*(state_))(me, &QEP_reservedEvt_[Q_EXIT_SIG])  \
-             == Q_RET_HANDLED) {                    \
+             == Q_RET_HANDLED) {                            \
             QS_BEGIN_PRE_(QS_QEP_STATE_EXIT, (qs_id_))      \
                 QS_OBJ_PRE_(me);                            \
                 QS_FUN_PRE_(state_);                        \
@@ -103,7 +103,7 @@ static QEvt const QEP_reservedEvt_[] = {
 
     #define QEP_ENTER_(state_, qs_id_) do {                 \
         if ((*(state_))(me, &QEP_reservedEvt_[Q_ENTRY_SIG]) \
-             == Q_RET_HANDLED) {                    \
+             == Q_RET_HANDLED) {                            \
             QS_BEGIN_PRE_(QS_QEP_STATE_ENTRY, (qs_id_))     \
                 QS_OBJ_PRE_(me);                            \
                 QS_FUN_PRE_(state_);                        \

src/qf/qep_hsm.c

@@ -130,7 +130,7 @@ void QActive_publish_(
         QActive *a = QActive_registry_[p];
         QF_SCHED_STAT_
 
-        QF_SCHED_LOCK_(a->pthre); /* lock the scheduler up to ceiling */
+        QF_SCHED_LOCK_(a->pthre); /* lock the scheduler up to threshold */
         do { /* loop over all subscribers */
             /* the prio of the AO must be registered with the framework */
             Q_ASSERT_ID(210, a != (QActive *)0);

src/qf/qf_ps.c

@@ -137,28 +137,28 @@ void QActive_register_(QActive * const me) {
     if (me->pthre == 0U) { /* preemption-threshold not defined? */
         me->pthre = me->prio; /* apply the default */
     }
-    uint8_t prev_ceil = me->pthre;
-    uint8_t next_ceil = me->pthre;
+    uint8_t prev_thre = me->pthre;
+    uint8_t next_thre = me->pthre;
 
     uint_fast8_t p;
     for (p = (uint_fast8_t)prio - 1U; p > 0U; --p) {
         if (QActive_registry_[p] != (QActive *)0) {
-            prev_ceil = QActive_registry_[p]->pthre;
+            prev_thre = QActive_registry_[p]->pthre;
             break;
         }
     }
     for (p = (uint_fast8_t)prio + 1U; p <= QF_MAX_ACTIVE; ++p) {
         if (QActive_registry_[p] != (QActive *)0) {
-            next_ceil = QActive_registry_[p]->pthre;
+            next_thre = QActive_registry_[p]->pthre;
             break;
         }
     }
 
-    /* @post The preemption threshold of the AO (me->pthre) must be
+    /*! @post The preemption threshold of the AO (me->pthre) must be
     * between the threshold of the previous AO and the next AO
     */
-    Q_ENSURE_ID(101, (prev_ceil <= me->pthre)
-                      && (me->pthre <= next_ceil));
+    Q_ENSURE_ID(101, (prev_thre <= me->pthre)
+                      && (me->pthre <= next_thre));
     QF_CRIT_STAT_
     QF_CRIT_E_();
     QActive_registry_[prio] = me; /* register the AO at this QF priority */
@@ -169,17 +169,17 @@ void QActive_register_(QActive * const me) {
 
 /*${QF::QActive::unregister_} ..............................................*/
 void QActive_unregister_(QActive * const me) {
-    uint_fast8_t const prio = (uint_fast8_t)me->prio;
+    uint_fast8_t const p = (uint_fast8_t)me->prio;
 
     /*! @pre the priority of the active object must not be zero and cannot
     * exceed the maximum #QF_MAX_ACTIVE. Also, the priority of the active
     * object must be already registered with the framework.
     */
-    Q_REQUIRE_ID(200, (0U < prio) && (prio <= QF_MAX_ACTIVE)
-                       && (QActive_registry_[prio] == me));
+    Q_REQUIRE_ID(200, (0U < p) && (p <= QF_MAX_ACTIVE)
+                       && (QActive_registry_[p] == me));
     QF_CRIT_STAT_
     QF_CRIT_E_();
-    QActive_registry_[prio] = (QActive *)0; /* free-up the priority level */
+    QActive_registry_[p] = (QActive *)0; /* free-up the priority level */
     me->super.state.fun = Q_STATE_CAST(0); /* invalidate the state */
     QF_CRIT_X_();
 }

src/qf/qf_qact.c

@@ -349,15 +349,14 @@ void QActive_start_(QActive * const me,
     /*! @pre AO cannot be started from an ISR and the stack storage must
     * NOT be provided because the QK kernel does not need per-AO stacks.
     */
-    Q_REQUIRE_ID(300, (!QK_ISR_CONTEXT_())
-                      && (stkSto == (void *)0));
-
-    QEQueue_init(&me->eQueue, qSto, qLen); /* initialize the built-in queue */
+    Q_REQUIRE_ID(300, (!QK_ISR_CONTEXT_()) && (stkSto == (void *)0));
 
     me->prio  = (uint8_t)(prio & 0xFFU); /* QF-priority of the AO */
     me->pthre = (uint8_t)(prio >> 8U);   /* preemption-ceiling of the AO */
     QActive_register_(me); /* make QF aware of this AO */
 
+    QEQueue_init(&me->eQueue, qSto, qLen); /* initialize the built-in queue */
+
     QHSM_INIT(&me->super, par, me->prio); /* top-most initial tran. */
     QS_FLUSH(); /* flush the trace buffer to the host */
 

src/qk/qk.c

@@ -391,7 +391,7 @@ void QS_rxHandleGoodFrame_(uint8_t const state) {
     #ifdef Q_UTEST
     #if Q_UTEST != 0
             QS_processTestEvts_(); /* process all events produced */
-    #endif  /* Q_UTEST != 0*/
+    #endif  /* Q_UTEST != 0 */
     #endif  /* Q_UTEST */
             QS_rxReportDone_((int8_t)QS_RX_COMMAND);
             break;
@@ -402,7 +402,7 @@ void QS_rxHandleGoodFrame_(uint8_t const state) {
             QTimeEvt_tick1_((uint_fast8_t)l_rx.var.tick.rate, &QS_rxPriv_);
     #if Q_UTEST != 0
             QS_processTestEvts_(); /* process all events produced */
-    #endif  /* Q_UTEST  != 0*/
+    #endif  /* Q_UTEST != 0 */
     #else
             QTimeEvt_tick_((uint_fast8_t)l_rx.var.tick.rate, &QS_rxPriv_);
     #endif  /* Q_UTEST */

src/qs/qs_rx.c

@@ -214,16 +214,14 @@ void QActive_start_(QActive * const me,
     uint_fast16_t const stkSize,
     void const * const par)
 {
-    (void)stkSto;  /* unused parameter */
-    (void)stkSize; /* unused parameter */
+    Q_UNUSED_PAR(stkSto);
+    Q_UNUSED_PAR(stkSize);
 
-    /* priority must be in range */
-    Q_REQUIRE_ID(200, (0U < prio) && (prio <= QF_MAX_ACTIVE));
+    me->prio  = (uint8_t)(prio & 0xFFU); /* QF-priority of the AO */
+    me->pthre = (uint8_t)(prio >> 8U);   /* preemption-ceiling of the AO */
+    QActive_register_(me); /* make QF aware of this active object */
 
     QEQueue_init(&me->eQueue, qSto, qLen); /* initialize the built-in queue */
-    me->prio = (uint8_t)prio; /* set the current priority of the AO */
-
-    QActive_register_(me); /* make QF aware of this active object */
 
     QHSM_INIT(&me->super, par, me->prio); /* the top-most initial tran. */
 }

src/qs/qutest.c

@@ -183,15 +183,16 @@ void QActive_start_(QActive * const me,
 {
     Q_UNUSED_PAR(stkSize);
 
-    /*! @pre The priority must be in range and the stack storage must not
-    * be provided, because the QV kernel does not need per-AO stacks.
+    /*! @pre Stack storage must not be provided because the QV kernel
+    * does not need per-AO stacks.
     */
-    Q_REQUIRE_ID(500, (0U < prio) && (prio <= QF_MAX_ACTIVE)
-                      && (stkSto == (void *)0));
+    Q_REQUIRE_ID(500, stkSto == (void *)0);
+
+    me->prio  = (uint8_t)(prio & 0xFFU); /* QF-priority of the AO */
+    me->pthre = (uint8_t)(prio >> 8U);   /* preemption-ceiling of the AO */
+    QActive_register_(me); /* make QF aware of this AO */
 
     QEQueue_init(&me->eQueue, qSto, qLen); /* initialize the built-in queue */
-    me->prio = (uint8_t)prio; /* set the current priority of the AO */
-    QActive_register_(me); /* register this active object */
 
     QHSM_INIT(&me->super, par, me->prio); /* top-most initial tran. */
     QS_FLUSH(); /* flush the trace buffer to the host */

src/qv/qv.c

@@ -452,12 +452,13 @@ void QActive_start_(QActive * const me,
         && (stkSto == (void *)0)
         && (stkSize == 0U));
 
-    QEQueue_init(&me->eQueue, qSto, qLen);  /* initialize the built-in queue */
-    me->osObject = (void *)0;               /* no private stack for the AO */
     me->prio     = (uint8_t)(prio & 0xFFU); /* QF-priority of the AO */
     me->pthre    = (uint8_t)(prio >> 8U);   /* preemption-threshold of the AO */
     QActive_register_(me); /* register this AO */
 
+    QEQueue_init(&me->eQueue, qSto, qLen);  /* initialize the built-in queue */
+    me->osObject = (void *)0;               /* no private stack for the AO */
+
     QHSM_INIT(&me->super, par, me->prio); /* top-most initial tran. */
     QS_FLUSH(); /* flush the trace buffer to the host */