From: James Clark james.clark@arm.com
To be able to instantiate the OCSD_BUILTIN_DCD_ETE decoder the header trc_pkt_types_ete.h is required, so install it alongside the headers for the other versions.
Signed-off-by: James Clark james.clark@arm.com --- decoder/build/linux/rctdl_c_api_lib/makefile | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/decoder/build/linux/rctdl_c_api_lib/makefile b/decoder/build/linux/rctdl_c_api_lib/makefile index a0bd5a3..7b4055d 100644 --- a/decoder/build/linux/rctdl_c_api_lib/makefile +++ b/decoder/build/linux/rctdl_c_api_lib/makefile @@ -113,6 +113,8 @@ install_inc: $(INSTALL) --mode=0644 $(INST_INC_SRC)/etmv3/trc_pkt_types_etmv3.h $(INST_INC_DST)/etmv3/ $(INSTALL) -d --mode=0755 $(INST_INC_DST)/etmv4 $(INSTALL) --mode=0644 $(INST_INC_SRC)/etmv4/trc_pkt_types_etmv4.h $(INST_INC_DST)/etmv4/ + $(INSTALL) -d --mode=0755 $(INST_INC_DST)/ete + $(INSTALL) --mode=0644 $(INST_INC_SRC)/ete/trc_pkt_types_ete.h $(INST_INC_DST)/ete/ $(INSTALL) -d --mode=0755 $(INST_INC_DST)/c_api $(INSTALL) --mode=0644 $(INST_INC_SRC)/c_api/ocsd_c_api_types.h $(INST_INC_DST)/c_api/ $(INSTALL) --mode=0644 $(INST_INC_SRC)/c_api/opencsd_c_api.h $(INST_INC_DST)/c_api/
ETE decoder requires ETE type header to be pulled in by the C-API header.
Signed-off-by: Mike Leach mike.leach@linaro.org --- decoder/include/opencsd/c_api/ocsd_c_api_types.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/decoder/include/opencsd/c_api/ocsd_c_api_types.h b/decoder/include/opencsd/c_api/ocsd_c_api_types.h index cde351f..7f9b4ba 100644 --- a/decoder/include/opencsd/c_api/ocsd_c_api_types.h +++ b/decoder/include/opencsd/c_api/ocsd_c_api_types.h @@ -46,6 +46,7 @@ #include "opencsd/etmv4/trc_pkt_types_etmv4.h" #include "opencsd/ptm/trc_pkt_types_ptm.h" #include "opencsd/stm/trc_pkt_types_stm.h" +#include "opencsd/ete/trc_pkt_types_ete.h"
/** @ingroup lib_c_api @{*/
On 16/07/2021 17:08, Mike Leach wrote:
ETE decoder requires ETE type header to be pulled in by the C-API header.
Signed-off-by: Mike Leach mike.leach@linaro.org
decoder/include/opencsd/c_api/ocsd_c_api_types.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/decoder/include/opencsd/c_api/ocsd_c_api_types.h b/decoder/include/opencsd/c_api/ocsd_c_api_types.h index cde351f..7f9b4ba 100644 --- a/decoder/include/opencsd/c_api/ocsd_c_api_types.h +++ b/decoder/include/opencsd/c_api/ocsd_c_api_types.h @@ -46,6 +46,7 @@ #include "opencsd/etmv4/trc_pkt_types_etmv4.h" #include "opencsd/ptm/trc_pkt_types_ptm.h" #include "opencsd/stm/trc_pkt_types_stm.h" +#include "opencsd/ete/trc_pkt_types_ete.h" /** @ingroup lib_c_api @{*/
Yep this looks good, and the single C api include works.
There is just one typo in this commit message summary.
Reviewed-by: James Clark james.clark@arm.com
Signed-off-by: Mike Leach mike.leach@linaro.org --- README.md | 5 ++++- decoder/docs/doxygen_config.dox | 2 +- decoder/include/opencsd/ocsd_if_version.h | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md index b697843..1647112 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Releases will appear on the master branch in the git repository with an appropri CoreSight Trace Component Support. ----------------------------------
-_Current Version 1.1.0_ +_Current Version 1.1.1_
### Current support:
@@ -247,6 +247,9 @@ Version and Modification Information - __Bugfix__: Add Pull request #36 from github (Ross Burton) - __Bugfix__: Add Pull request #37 from github (Ian Rogers)
+- _Version 1.1.1_: + - __Bugfix__: Fix include and install for ETE decoder headers. + Licence Information ===================
diff --git a/decoder/docs/doxygen_config.dox b/decoder/docs/doxygen_config.dox index 2deb050..1a45ee7 100644 --- a/decoder/docs/doxygen_config.dox +++ b/decoder/docs/doxygen_config.dox @@ -38,7 +38,7 @@ PROJECT_NAME = "OpenCSD - CoreSight Trace Decode Library" # could be handy for archiving the generated documentation or if some version # control system is used.
-PROJECT_NUMBER = 1.1.0 +PROJECT_NUMBER = 1.1.1
# Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/decoder/include/opencsd/ocsd_if_version.h b/decoder/include/opencsd/ocsd_if_version.h index a06dd6c..ea2b239 100644 --- a/decoder/include/opencsd/ocsd_if_version.h +++ b/decoder/include/opencsd/ocsd_if_version.h @@ -44,7 +44,7 @@ @{*/ #define OCSD_VER_MAJOR 0x1 /**< Library Major Version */ #define OCSD_VER_MINOR 0x1 /**< Library Minor Version */ -#define OCSD_VER_PATCH 0x0 /**< Library Patch Version */ +#define OCSD_VER_PATCH 0x1 /**< Library Patch Version */
/** Library version number - MMMMnnpp format. MMMM = major version, @@ -53,7 +53,7 @@ */ #define OCSD_VER_NUM ((OCSD_VER_MAJOR << 16) | (OCSD_VER_MINOR << 8) | OCSD_VER_PATCH)
-#define OCSD_VER_STRING "1.1.0" /**< Library Version string */ +#define OCSD_VER_STRING "1.1.1" /**< Library Version string */ #define OCSD_LIB_NAME "OpenCSD Library" /**< Library name string */ #define OCSD_LIB_SHORT_NAME "OCSD" /**< Library Short name string */ /** @}*/
-
James Clark -
Mike Leach