From 5cffb7d013ac976bd34c56d9bc95070da43e91f0 Mon Sep 17 00:00:00 2001 From: Quantum Leaps Date: Mon, 23 Sep 2013 20:00:30 -0400 Subject: [PATCH] 5.1.0a --- doxygen/Doxyfile | 2 +- include/qs.h | 4 ++-- ports/lint/lint_qs.txt | 6 +++--- qs/source/qs_.c | 4 ++-- qs/source/qs_str.c | 9 +++++---- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/doxygen/Doxyfile b/doxygen/Doxyfile index f4668d93..bfb5a769 100644 --- a/doxygen/Doxyfile +++ b/doxygen/Doxyfile @@ -588,7 +588,7 @@ DOCSET_PUBLISHER_NAME = Publisher # If the GENERATE_HTMLHELP tag is set to YES, additional index files will be generated that can be used as input for tools like the Microsoft HTML help workshop to generate a compiled HTML help file (.chm) of the generated HTML documentation. -GENERATE_HTMLHELP = NO +GENERATE_HTMLHELP = YES # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can be used to specify the file name of the resulting .chm file. You can add a path in front of the file if the result should not be written to the html output directory. diff --git a/include/qs.h b/include/qs.h index 6cd31805..2d0afd6c 100644 --- a/include/qs.h +++ b/include/qs.h @@ -266,7 +266,7 @@ void QS_u8_(uint8_t d); * \note This function is only to be used through macros, never in the * client code directly. */ -void QS_2u8_(uint8_t d1, uint8_t d2); +void QS_u8u8_(uint8_t d1, uint8_t d2); /** \brief Output uint16_t data element without format information * \note This function is only to be used through macros, never in the @@ -790,7 +790,7 @@ QSTimeCtr QS_onGetTime(void); #define QS_U8_(data_) (QS_u8_(data_)) /** \brief Internal QS macro to output 2 unformatted uint8_t data elements */ -#define QS_2U8_(data1_, data2_) (QS_2u8_((data1_), (data2_))) +#define QS_2U8_(data1_, data2_) (QS_u8u8_((data1_), (data2_))) /** \brief Internal QS macro to output an unformatted uint16_t data element */ #define QS_U16_(data_) (QS_u16_(data_)) diff --git a/ports/lint/lint_qs.txt b/ports/lint/lint_qs.txt index 6291795a..53c77624 100644 --- a/ports/lint/lint_qs.txt +++ b/ports/lint/lint_qs.txt @@ -84,9 +84,6 @@ Note 960: Violates MISRA 2004 Required Rule 8.9, undefined symbol: 'QF_onCleanup' "D:\qp\qpc\include\qf.h" 878 1 Info 757: global declarator 'QF_onIdle(void)' (line 878, file D:\qp\qpc\include\qf.h) not referenced Note 960: Violates MISRA 2004 Required Rule 8.9, undefined symbol: 'QF_onIdle' -"D:\qp\qpc\qs\source\qs_.c" 57 1 Info 759: header declaration for symbol 'QS_2u8_(uint8_t, uint8_t)' defined at (line 57, file D:\qp\qpc\qs\source\qs_.c) could be moved from header to module -"D:\qp\qpc\qs\source\qs_.c" 57 1 Info 765: external 'QS_2u8_(uint8_t, uint8_t)' (line 57, file D:\qp\qpc\qs\source\qs_.c) could be made static [MISRA 2004 Rule 8.10, required] -"D:\qp\qpc\qs\source\qs_.c" 57 1 Info 714: Symbol 'QS_2u8_(uint8_t, uint8_t)' (line 57, file D:\qp\qpc\qs\source\qs_.c) not referenced "D:\qp\qpc\include\qf.h" 786 1 Info 757: global declarator 'QF_poolInit(void *, uint32_t, uint32_t)' (line 786, file D:\qp\qpc\include\qf.h) not referenced Note 960: Violates MISRA 2004 Required Rule 8.9, undefined symbol: 'QF_poolInit' "D:\qp\qpc\include\qf.h" 753 1 Info 757: global declarator 'QF_psInit(QSubscrList *, uint32_t)' (line 753, file D:\qp\qpc\include\qf.h) not referenced @@ -134,6 +131,9 @@ "D:\qp\qpc\qs\source\qs.c" 169 1 Info 759: header declaration for symbol 'QS_u8(uint8_t, uint8_t)' defined at (line 169, file D:\qp\qpc\qs\source\qs.c) could be moved from header to module "D:\qp\qpc\qs\source\qs.c" 169 1 Info 765: external 'QS_u8(uint8_t, uint8_t)' (line 169, file D:\qp\qpc\qs\source\qs.c) could be made static [MISRA 2004 Rule 8.10, required] "D:\qp\qpc\qs\source\qs.c" 169 1 Info 714: Symbol 'QS_u8(uint8_t, uint8_t)' (line 169, file D:\qp\qpc\qs\source\qs.c) not referenced +"D:\qp\qpc\qs\source\qs_.c" 57 1 Info 759: header declaration for symbol 'QS_u8u8_(uint8_t, uint8_t)' defined at (line 57, file D:\qp\qpc\qs\source\qs_.c) could be moved from header to module +"D:\qp\qpc\qs\source\qs_.c" 57 1 Info 765: external 'QS_u8u8_(uint8_t, uint8_t)' (line 57, file D:\qp\qpc\qs\source\qs_.c) could be made static [MISRA 2004 Rule 8.10, required] +"D:\qp\qpc\qs\source\qs_.c" 57 1 Info 714: Symbol 'QS_u8u8_(uint8_t, uint8_t)' (line 57, file D:\qp\qpc\qs\source\qs_.c) not referenced "D:\qp\qpc\qs\source\qs_dict.c" 85 1 Info 759: header declaration for symbol 'QS_usr_dict(enum_t, const char_t *)' defined at (line 85, file D:\qp\qpc\qs\source\qs_dict.c) could be moved from header to module "D:\qp\qpc\qs\source\qs_dict.c" 85 1 Info 765: external 'QS_usr_dict(enum_t, const char_t *)' (line 85, file D:\qp\qpc\qs\source\qs_dict.c) could be made static [MISRA 2004 Rule 8.10, required] "D:\qp\qpc\qs\source\qs_dict.c" 85 1 Info 714: Symbol 'QS_usr_dict(enum_t, const char_t *)' (line 85, file D:\qp\qpc\qs\source\qs_dict.c) not referenced diff --git a/qs/source/qs_.c b/qs/source/qs_.c index dbeca521..2d8a890d 100644 --- a/qs/source/qs_.c +++ b/qs/source/qs_.c @@ -1,7 +1,7 @@ /***************************************************************************** * Product: QS/C * Last Updated for Version: 5.1.0 -* Date of the Last Update: Sep 18, 2013 +* Date of the Last Update: Sep 23, 2013 * * Q u a n t u m L e a P s * --------------------------- @@ -54,7 +54,7 @@ void QS_u8_(uint8_t d) { QS_priv_.chksum = chksum; /* save the checksum */ } /*..........................................................................*/ -void QS_2u8_(uint8_t d1, uint8_t d2) { +void QS_u8u8_(uint8_t d1, uint8_t d2) { uint8_t chksum = QS_priv_.chksum; /* put in a temporary (register) */ uint8_t *buf = QS_priv_.buf; /* put in a temporary (register) */ QSCtr head = QS_priv_.head; /* put in a temporary (register) */ diff --git a/qs/source/qs_str.c b/qs/source/qs_str.c index 7130d893..5fc4225c 100644 --- a/qs/source/qs_str.c +++ b/qs/source/qs_str.c @@ -1,7 +1,7 @@ /***************************************************************************** * Product: QS/C * Last Updated for Version: 5.1.0 -* Date of the Last Update: Sep 18, 2013 +* Date of the Last Update: Sep 23, 2013 * * Q u a n t u m L e a P s * --------------------------- @@ -49,17 +49,17 @@ void QS_str(char_t const *s) { QSCtr end = QS_priv_.end; /* put in a temporary (register) */ QSCtr used = QS_priv_.used; /* put in a temporary (register) */ + used += (QSCtr)2; /* account for the format byte and the terminating-0 */ QS_INSERT_BYTE((uint8_t)QS_STR_T) while (b != (uint8_t)(0)) { /* ASCII characters don't need escaping */ chksum = (uint8_t)(chksum + b); /* update checksum */ QS_INSERT_BYTE(b) QS_PTR_INC_(s); - b = (uint8_t)Q_ROM_BYTE(*s); + b = (uint8_t)(*s); ++used; } QS_INSERT_BYTE((uint8_t)0) /* zero-terminate the string */ - ++used; QS_priv_.head = head; /* save the head */ QS_priv_.chksum = chksum; /* save the checksum */ @@ -74,6 +74,8 @@ void QS_str_ROM(char_t const Q_ROM * Q_ROM_VAR s) { QSCtr end = QS_priv_.end; /* put in a temporary (register) */ QSCtr used = QS_priv_.used; /* put in a temporary (register) */ + used += (QSCtr)2; /* account for the format byte and the terminating-0 */ + QS_INSERT_BYTE((uint8_t)QS_STR_T) while (b != (uint8_t)(0)) { /* ASCII characters don't need escaping */ @@ -84,7 +86,6 @@ void QS_str_ROM(char_t const Q_ROM * Q_ROM_VAR s) { ++used; } QS_INSERT_BYTE((uint8_t)0) /* zero-terminate the string */ - ++used; QS_priv_.head = head; /* save the head */ QS_priv_.chksum = chksum; /* save the checksum */