switch default QP/C to v8.0.4, while maintaining compatibility with prior v7.3.x

Author: mattheweshleman

CMakeLists.txt

@@ -15,7 +15,7 @@ if(NOT DEFINED CMS_QPC_TOP_DIR)
     set(CMS_QPC_TOP_DIR ${CMS_EXTERNALS_TOP_DIR}/qpc)
     FetchContent_Declare(qpc
             GIT_REPOSITORY https://github.com/QuantumLeaps/qpc.git
-            GIT_TAG        fcea9943bbeeca49c66ce124d4d71467f6e2661e #7.3.3
+            GIT_TAG        6cbb42cf26f10e8ba1fff887f5fd66f674b2d92a #8.0.4
             SOURCE_DIR     ${CMS_QPC_TOP_DIR}
     )
     message("Fetching QP/C git repository")

cpputest-for-qpc-lib/src/cms_cpputest_qf_ctrl.cpp

@@ -71,7 +71,15 @@ void Setup(enum_t const maxPubSubSignalValue, uint32_t ticksPerSecond,
     l_subscriberStorage->resize(static_cast<size_t>(maxPubSubSignalValue));
     QSubscrList nullValue;
     QPSet_setEmpty(&nullValue.set);
+
+#if QP_VERSION >= 800U
+    //safety fields eliminated from GPL version of QP starting in v8.x.x
+#elif QP_VERSION > 700U
     QPSet_setEmpty(&nullValue.set_dis);
+#else
+    #error "unsupported QP version"
+#endif
+
     std::fill(l_subscriberStorage->begin(), l_subscriberStorage->end(),
               nullValue);
 

cpputest-for-qpc-lib/src/cpputest_qf_port.cpp

@@ -52,13 +52,26 @@ extern "C" void QF_stop(void)
     QF_onCleanup();
 }
 
+#if QP_VERSION >= 800U
+extern "C" void QActive_start(QActive * const me,
+                               QPrioSpec const prioSpec,
+                               QEvt const * * const qSto,
+                               uint_fast16_t const qLen,
+                               void * const stkSto,
+                               uint_fast16_t const stkSize,
+                               void const * const par)
+
+#elif QP_VERSION > 700U
 extern "C" void QActive_start_(QActive * const me,
                                QPrioSpec const prioSpec,
                                QEvt const * * const qSto,
                                uint_fast16_t const qLen,
                                void * const stkSto,
                                uint_fast16_t const stkSize,
                                void const * const par)
+#else
+#error "unsupported QP version"
+#endif
 {
     Q_UNUSED_PAR(stkSto);
     Q_UNUSED_PAR(stkSize);