From 4a0ba19b3afd6014b11f5c1d2b6da0535b4ab4ce Mon Sep 17 00:00:00 2001 From: MMS Date: Tue, 26 Jan 2021 13:30:33 -0500 Subject: [PATCH] 6.9.2a ThreadX port: added name of the form "AOpp" to ThreadX thread and queue --- doxygen/history.dox | 2 +- doxygen/struct.dox | 4 ++-- ports/lint-plus/au-misra3.lnt | 3 --- ports/threadx/qf_port.c | 17 ++++++++++++----- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/doxygen/history.dox b/doxygen/history.dox index 23ca8539..fb4a1397 100644 --- a/doxygen/history.dox +++ b/doxygen/history.dox @@ -1305,7 +1305,7 @@ Even though the QP/C source has been re-packaged in this release, there are no A The two changes in basic approach to distributing and building the framework have also the following ripple effects: -1. The QP/C source code has been simplified and has been re-packaged into a much smaller number of source files. The whole QP/C source code now resides in the single source folder. Additionally, the source code files have now the **read-only** protection to prevent inadvertent changes to the QP/C soruce code that is part of your projects. +1. The QP/C source code has been simplified and has been re-packaged into a much smaller number of source files. The whole QP/C source code now resides in the single source folder. Additionally, the source code files have now the **read-only** protection to prevent inadvertent changes to the QP/C soruce code that is part of your projects. 2. It is no longer necessary to define the **QPC environment variable** to build the QP/C examples. All directories and files referenced by example projects are **relative** to the project folder. This change reflects the fact that most development tools add source files to the project using relative paths (and now the projects contain QP/C source code, not just the QP library). diff --git a/doxygen/struct.dox b/doxygen/struct.dox index fb0eca7c..4f3a482b 100644 --- a/doxygen/struct.dox +++ b/doxygen/struct.dox @@ -16,9 +16,9 @@ The following annotated directory tree lists the top-level directories provided
  • ports/ — @ref ports "QP/C Ports"
    • -
  • include/ — Platform-independent QP/C API (see include) +
  • include/ — Platform-independent QP/C API (see include)
    • -
  • src/ — Platform-independent QP/C source code (see src) +
  • src/ — Platform-independent QP/C source code (see src)
    • diff --git a/ports/lint-plus/au-misra3.lnt b/ports/lint-plus/au-misra3.lnt index fe4c4719..e20961fa 100644 --- a/ports/lint-plus/au-misra3.lnt +++ b/ports/lint-plus/au-misra3.lnt @@ -1105,9 +1105,6 @@ +e9006 /* sizeof used with expression with side effect */ +elib(9006) -append(9006,[MISRA 2012 Rule 13.6, mandatory]) - +e9089 /* potential side-effect in argument to sizeof */ - +elib(9089) - -append(9089,[MISRA 2012 Rule 13.6, mandatory]) /**** Rule 14.1 (Req) ************/ diff --git a/ports/threadx/qf_port.c b/ports/threadx/qf_port.c index dd564a29..d38400b3 100644 --- a/ports/threadx/qf_port.c +++ b/ports/threadx/qf_port.c @@ -4,14 +4,14 @@ * @ingroup ports * @cond ****************************************************************************** -* Last updated for version 6.9.1 -* Last updated on 2020-09-11 +* Last updated for version 6.9.2a +* Last updated on 2021-01-26 * * Q u a n t u m L e a P s * ------------------------ * Modern Embedded Software * -* Copyright (C) 2005-2020 Quantum Leaps, LLC. All rights reserved. +* Copyright (C) 2005-2021 Quantum Leaps, LLC. All rights reserved. * * This program is open source software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -87,11 +87,18 @@ void QActive_start_(QActive * const me, uint_fast8_t prio, void const * const par) { UINT tx_prio; /* ThreadX priority corresponding to the QF priority prio */ + CHAR tx_name[5]; /* name passed to ThreadX queue and thread */ + + tx_name[0] = 'A'; + tx_name[1] = 'O'; + tx_name[2] = '0' + (prio / 10U); + tx_name[3] = '0' + (prio % 10U); + tx_name[4] = '\0'; /* allege that the ThreadX queue is created successfully */ Q_ALLEGE_ID(210, tx_queue_create(&me->eQueue, - (CHAR *)"AO", + tx_name, TX_1_ULONG, (VOID *)qSto, (ULONG)(qLen * sizeof(ULONG))) @@ -109,7 +116,7 @@ void QActive_start_(QActive * const me, uint_fast8_t prio, Q_ALLEGE_ID(220, tx_thread_create( &me->thread, /* ThreadX thread control block */ - (CHAR *)"AO", /* thread name */ + tx_name, /* thread name */ &thread_function, /* thread function */ (ULONG)me, /* thread parameter */ stkSto, /* stack start */