From: Mathieu Poirier mathieu.poirier@linaro.org

Some of the header file need to be exposed to client programs so that they can be compiled against them. As such moving the header file needed to compile the current perf tools to an "opencsd" directory under include/ and adjust other files to reflect the change.

With this change user programs can now be compiled without having to specify the -I option. The other advantage is that the library can be packaged for installation on a system.

Signed-off-by: Mathieu Poirier mathieu.poirier@linaro.org --- decoder/include/common/comp_attach_pt_t.h | 2 +- decoder/include/common/ocsd_code_follower.h | 4 ++-- decoder/include/common/ocsd_dcd_mngr.h | 2 +- decoder/include/common/ocsd_dcd_mngr_i.h | 2 +- decoder/include/common/ocsd_error.h | 2 +- decoder/include/common/ocsd_lib_dcd_register.h | 2 +- decoder/include/common/ocsd_pe_context.h | 2 +- decoder/include/common/trc_core_arch_map.h | 2 +- decoder/include/common/trc_frame_deformatter.h | 2 +- decoder/include/common/trc_gen_elem.h | 2 +- decoder/include/common/trc_ret_stack.h | 2 +- decoder/include/i_dec/trc_i_decode.h | 2 +- decoder/include/i_dec/trc_idec_arminst.h | 2 +- decoder/include/interfaces/trc_data_raw_in_i.h | 2 +- decoder/include/interfaces/trc_data_rawframe_in_i.h | 2 +- decoder/include/interfaces/trc_error_log_i.h | 2 +- decoder/include/interfaces/trc_indexer_src_i.h | 2 +- decoder/include/mem_acc/trc_mem_acc_base.h | 2 +- decoder/include/mem_acc/trc_mem_acc_cb_if.h | 2 +- decoder/include/mem_acc/trc_mem_acc_file.h | 2 +- decoder/include/mem_acc/trc_mem_acc_mapper.h | 2 +- decoder/include/opencsd.h | 14 +++++++------- decoder/include/{ => opencsd}/c_api/ocsd_c_api_cust_fact.h | 0 decoder/include/{ => opencsd}/c_api/ocsd_c_api_cust_impl.h | 4 ++-- decoder/include/{ => opencsd}/c_api/ocsd_c_api_custom.h | 0 decoder/include/{ => opencsd}/c_api/ocsd_c_api_types.h | 14 +++++++------- decoder/include/{ => opencsd}/c_api/opencsd_c_api.h | 0 decoder/include/{ => opencsd}/etmv3/etmv3_decoder.h | 10 +++++----- decoder/include/{ => opencsd}/etmv3/trc_cmp_cfg_etmv3.h | 0 decoder/include/{ => opencsd}/etmv3/trc_dcd_mngr_etmv3.h | 0 decoder/include/{ => opencsd}/etmv3/trc_pkt_decode_etmv3.h | 4 ++-- decoder/include/{ => opencsd}/etmv3/trc_pkt_elem_etmv3.h | 0 decoder/include/{ => opencsd}/etmv3/trc_pkt_proc_etmv3.h | 0 decoder/include/{ => opencsd}/etmv3/trc_pkt_types_etmv3.h | 2 +- decoder/include/{ => opencsd}/etmv4/etmv4_decoder.h | 0 decoder/include/{ => opencsd}/etmv4/trc_cmp_cfg_etmv4.h | 0 decoder/include/{ => opencsd}/etmv4/trc_dcd_mngr_etmv4i.h | 0 decoder/include/{ => opencsd}/etmv4/trc_etmv4_stack_elem.h | 2 +- .../include/{ => opencsd}/etmv4/trc_pkt_decode_etmv4i.h | 6 +++--- decoder/include/{ => opencsd}/etmv4/trc_pkt_elem_etmv4d.h | 0 decoder/include/{ => opencsd}/etmv4/trc_pkt_elem_etmv4i.h | 0 decoder/include/{ => opencsd}/etmv4/trc_pkt_proc_etmv4.h | 0 decoder/include/{ => opencsd}/etmv4/trc_pkt_types_etmv4.h | 2 +- decoder/include/{ => opencsd}/ocsd_if_types.h | 4 ++-- decoder/include/{ => opencsd}/ptm/ptm_decoder.h | 0 decoder/include/{ => opencsd}/ptm/trc_cmp_cfg_ptm.h | 0 decoder/include/{ => opencsd}/ptm/trc_dcd_mngr_ptm.h | 0 decoder/include/{ => opencsd}/ptm/trc_pkt_decode_ptm.h | 4 ++-- decoder/include/{ => opencsd}/ptm/trc_pkt_elem_ptm.h | 0 decoder/include/{ => opencsd}/ptm/trc_pkt_proc_ptm.h | 0 decoder/include/{ => opencsd}/ptm/trc_pkt_types_ptm.h | 2 +- decoder/include/{ => opencsd}/stm/stm_decoder.h | 0 decoder/include/{ => opencsd}/stm/trc_cmp_cfg_stm.h | 0 decoder/include/{ => opencsd}/stm/trc_dcd_mngr_stm.h | 0 decoder/include/{ => opencsd}/stm/trc_pkt_decode_stm.h | 4 ++-- decoder/include/{ => opencsd}/stm/trc_pkt_elem_stm.h | 0 decoder/include/{ => opencsd}/stm/trc_pkt_proc_stm.h | 0 decoder/include/{ => opencsd}/stm/trc_pkt_types_stm.h | 2 +- decoder/include/{ => opencsd}/trc_gen_elem_types.h | 6 +++--- decoder/include/{ => opencsd}/trc_pkt_types.h | 6 +++--- decoder/source/c_api/ocsd_c_api.cpp | 2 +- decoder/source/c_api/ocsd_c_api_custom_obj.cpp | 2 +- decoder/source/c_api/ocsd_c_api_custom_obj.h | 2 +- decoder/source/c_api/ocsd_c_api_obj.h | 2 +- decoder/source/etmv3/trc_cmp_cfg_etmv3.cpp | 2 +- decoder/source/etmv3/trc_pkt_decode_etmv3.cpp | 2 +- decoder/source/etmv3/trc_pkt_elem_etmv3.cpp | 2 +- decoder/source/etmv3/trc_pkt_proc_etmv3.cpp | 2 +- decoder/source/etmv3/trc_pkt_proc_etmv3_impl.h | 6 +++--- decoder/source/etmv4/trc_cmp_cfg_etmv4.cpp | 2 +- decoder/source/etmv4/trc_etmv4_stack_elem.cpp | 2 +- decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp | 2 +- decoder/source/etmv4/trc_pkt_elem_etmv4d.cpp | 2 +- decoder/source/etmv4/trc_pkt_elem_etmv4i.cpp | 2 +- decoder/source/etmv4/trc_pkt_proc_etmv4.cpp | 2 +- decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.h | 6 +++--- decoder/source/i_dec/trc_i_decode.cpp | 2 +- decoder/source/ocsd_lib_dcd_register.cpp | 8 ++++---- decoder/source/ptm/trc_cmp_cfg_ptm.cpp | 2 +- decoder/source/ptm/trc_pkt_decode_ptm.cpp | 2 +- decoder/source/ptm/trc_pkt_elem_ptm.cpp | 2 +- decoder/source/ptm/trc_pkt_proc_ptm.cpp | 4 ++-- decoder/source/stm/trc_pkt_decode_stm.cpp | 2 +- decoder/source/stm/trc_pkt_elem_stm.cpp | 2 +- decoder/source/stm/trc_pkt_proc_stm.cpp | 2 +- decoder/source/trc_frame_deformatter_impl.h | 2 +- .../ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.c | 6 +++--- .../ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.h | 2 +- .../c_api_echo_test/ext_dcd_echo_test_fact.h | 2 +- decoder/tests/source/c_api_pkt_print_test.c | 2 +- 90 files changed, 105 insertions(+), 105 deletions(-) rename decoder/include/{ => opencsd}/c_api/ocsd_c_api_cust_fact.h (100%) rename decoder/include/{ => opencsd}/c_api/ocsd_c_api_cust_impl.h (98%) rename decoder/include/{ => opencsd}/c_api/ocsd_c_api_custom.h (100%) rename decoder/include/{ => opencsd}/c_api/ocsd_c_api_types.h (94%) rename decoder/include/{ => opencsd}/c_api/opencsd_c_api.h (100%) rename decoder/include/{ => opencsd}/etmv3/etmv3_decoder.h (88%) rename decoder/include/{ => opencsd}/etmv3/trc_cmp_cfg_etmv3.h (100%) rename decoder/include/{ => opencsd}/etmv3/trc_dcd_mngr_etmv3.h (100%) rename decoder/include/{ => opencsd}/etmv3/trc_pkt_decode_etmv3.h (98%) rename decoder/include/{ => opencsd}/etmv3/trc_pkt_elem_etmv3.h (100%) rename decoder/include/{ => opencsd}/etmv3/trc_pkt_proc_etmv3.h (100%) rename decoder/include/{ => opencsd}/etmv3/trc_pkt_types_etmv3.h (99%) rename decoder/include/{ => opencsd}/etmv4/etmv4_decoder.h (100%) rename decoder/include/{ => opencsd}/etmv4/trc_cmp_cfg_etmv4.h (100%) rename decoder/include/{ => opencsd}/etmv4/trc_dcd_mngr_etmv4i.h (100%) rename decoder/include/{ => opencsd}/etmv4/trc_etmv4_stack_elem.h (99%) rename decoder/include/{ => opencsd}/etmv4/trc_pkt_decode_etmv4i.h (98%) rename decoder/include/{ => opencsd}/etmv4/trc_pkt_elem_etmv4d.h (100%) rename decoder/include/{ => opencsd}/etmv4/trc_pkt_elem_etmv4i.h (100%) rename decoder/include/{ => opencsd}/etmv4/trc_pkt_proc_etmv4.h (100%) rename decoder/include/{ => opencsd}/etmv4/trc_pkt_types_etmv4.h (99%) rename decoder/include/{ => opencsd}/ocsd_if_types.h (99%) rename decoder/include/{ => opencsd}/ptm/ptm_decoder.h (100%) rename decoder/include/{ => opencsd}/ptm/trc_cmp_cfg_ptm.h (100%) rename decoder/include/{ => opencsd}/ptm/trc_dcd_mngr_ptm.h (100%) rename decoder/include/{ => opencsd}/ptm/trc_pkt_decode_ptm.h (98%) rename decoder/include/{ => opencsd}/ptm/trc_pkt_elem_ptm.h (100%) rename decoder/include/{ => opencsd}/ptm/trc_pkt_proc_ptm.h (100%) rename decoder/include/{ => opencsd}/ptm/trc_pkt_types_ptm.h (99%) rename decoder/include/{ => opencsd}/stm/stm_decoder.h (100%) rename decoder/include/{ => opencsd}/stm/trc_cmp_cfg_stm.h (100%) rename decoder/include/{ => opencsd}/stm/trc_dcd_mngr_stm.h (100%) rename decoder/include/{ => opencsd}/stm/trc_pkt_decode_stm.h (97%) rename decoder/include/{ => opencsd}/stm/trc_pkt_elem_stm.h (100%) rename decoder/include/{ => opencsd}/stm/trc_pkt_proc_stm.h (100%) rename decoder/include/{ => opencsd}/stm/trc_pkt_types_stm.h (99%) rename decoder/include/{ => opencsd}/trc_gen_elem_types.h (98%) rename decoder/include/{ => opencsd}/trc_pkt_types.h (97%)

diff --git a/decoder/include/common/comp_attach_pt_t.h b/decoder/include/common/comp_attach_pt_t.h index 1d56240..71f4c84 100644 --- a/decoder/include/common/comp_attach_pt_t.h +++ b/decoder/include/common/comp_attach_pt_t.h @@ -36,7 +36,7 @@ #define ARM_COMP_ATTACH_PT_T_H_INCLUDED

#include <vector> -#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"

/** @defgroup ocsd_infrastructure OpenCSD Library : Library Component Infrastructure

diff --git a/decoder/include/common/ocsd_code_follower.h b/decoder/include/common/ocsd_code_follower.h index 7063266..0e86910 100644 --- a/decoder/include/common/ocsd_code_follower.h +++ b/decoder/include/common/ocsd_code_follower.h @@ -35,8 +35,8 @@ #ifndef ARM_OCSD_CODE_FOLLOWER_H_INCLUDED #define ARM_OCSD_CODE_FOLLOWER_H_INCLUDED

-#include "ocsd_if_types.h" -#include "trc_pkt_types.h" +#include "opencsd/ocsd_if_types.h" +#include "opencsd/trc_pkt_types.h" #include "comp_attach_pt_t.h" #include "interfaces/trc_tgt_mem_access_i.h" #include "interfaces/trc_instr_decode_i.h" diff --git a/decoder/include/common/ocsd_dcd_mngr.h b/decoder/include/common/ocsd_dcd_mngr.h index b3a7ebd..ba7d8a8 100644 --- a/decoder/include/common/ocsd_dcd_mngr.h +++ b/decoder/include/common/ocsd_dcd_mngr.h @@ -35,7 +35,7 @@ #ifndef ARM_OCSD_DCD_MNGR_H_INCLUDED #define ARM_OCSD_DCD_MNGR_H_INCLUDED

-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include "common/ocsd_dcd_mngr_i.h" #include "common/ocsd_lib_dcd_register.h" #include "common/trc_pkt_decode_base.h" diff --git a/decoder/include/common/ocsd_dcd_mngr_i.h b/decoder/include/common/ocsd_dcd_mngr_i.h index f6adb06..5ecbe31 100644 --- a/decoder/include/common/ocsd_dcd_mngr_i.h +++ b/decoder/include/common/ocsd_dcd_mngr_i.h @@ -35,7 +35,7 @@ #ifndef ARM_OCSD_DCD_MNGR_I_H_INCLUDED #define ARM_OCSD_DCD_MNGR_I_H_INCLUDED

-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include "common/trc_cs_config.h" #include "common/trc_component.h"

diff --git a/decoder/include/common/ocsd_error.h b/decoder/include/common/ocsd_error.h index b3c6364..e547f48 100644 --- a/decoder/include/common/ocsd_error.h +++ b/decoder/include/common/ocsd_error.h @@ -36,7 +36,7 @@ #ifndef ARM_OCSD_ERROR_H_INCLUDED #define ARM_OCSD_ERROR_H_INCLUDED

-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include <string> /** @ingroup ocsd_infrastructure @{*/ diff --git a/decoder/include/common/ocsd_lib_dcd_register.h b/decoder/include/common/ocsd_lib_dcd_register.h index efb2d21..6ba4cf8 100644 --- a/decoder/include/common/ocsd_lib_dcd_register.h +++ b/decoder/include/common/ocsd_lib_dcd_register.h @@ -38,7 +38,7 @@

#include <map>

-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include "common/ocsd_dcd_mngr_i.h"

/*! diff --git a/decoder/include/common/ocsd_pe_context.h b/decoder/include/common/ocsd_pe_context.h index 1ad4676..797881c 100644 --- a/decoder/include/common/ocsd_pe_context.h +++ b/decoder/include/common/ocsd_pe_context.h @@ -34,7 +34,7 @@ #ifndef ARM_OCSD_PE_CONTEXT_H_INCLUDED #define ARM_OCSD_PE_CONTEXT_H_INCLUDED

-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"

/*! @class OcsdPeContext * @brief Handler for the ocsd_pe_context structure. diff --git a/decoder/include/common/trc_core_arch_map.h b/decoder/include/common/trc_core_arch_map.h index 0904b07..5a24149 100644 --- a/decoder/include/common/trc_core_arch_map.h +++ b/decoder/include/common/trc_core_arch_map.h @@ -37,7 +37,7 @@

#include <map> #include <string> -#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"

class CoreArchProfileMap { diff --git a/decoder/include/common/trc_frame_deformatter.h b/decoder/include/common/trc_frame_deformatter.h index c874c82..e4297a4 100644 --- a/decoder/include/common/trc_frame_deformatter.h +++ b/decoder/include/common/trc_frame_deformatter.h @@ -34,7 +34,7 @@ #ifndef ARM_TRC_FRAME_DEFORMATTER_H_INCLUDED #define ARM_TRC_FRAME_DEFORMATTER_H_INCLUDED

-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"

#include "interfaces/trc_data_raw_in_i.h" #include "comp_attach_pt_t.h" diff --git a/decoder/include/common/trc_gen_elem.h b/decoder/include/common/trc_gen_elem.h index 2f4182b..00081b5 100644 --- a/decoder/include/common/trc_gen_elem.h +++ b/decoder/include/common/trc_gen_elem.h @@ -34,7 +34,7 @@ #ifndef ARM_TRC_GEN_ELEM_H_INCLUDED #define ARM_TRC_GEN_ELEM_H_INCLUDED

-#include "trc_gen_elem_types.h" +#include "opencsd/trc_gen_elem_types.h" #include "trc_printable_elem.h" #include "ocsd_pe_context.h"

diff --git a/decoder/include/common/trc_ret_stack.h b/decoder/include/common/trc_ret_stack.h index 6a96d28..a7f53d1 100644 --- a/decoder/include/common/trc_ret_stack.h +++ b/decoder/include/common/trc_ret_stack.h @@ -35,7 +35,7 @@ #ifndef ARM_TRC_RET_STACK_H_INCLUDED #define ARM_TRC_RET_STACK_H_INCLUDED

-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"

// uncomment below for return stack logging // #define TRC_RET_STACK_DEBUG diff --git a/decoder/include/i_dec/trc_i_decode.h b/decoder/include/i_dec/trc_i_decode.h index 0956a2a..ac31a79 100644 --- a/decoder/include/i_dec/trc_i_decode.h +++ b/decoder/include/i_dec/trc_i_decode.h @@ -35,7 +35,7 @@ #define ARM_TRC_I_DECODE_H_INCLUDED

#include "interfaces/trc_instr_decode_i.h" -#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"

class TrcIDecode : public IInstrDecode { diff --git a/decoder/include/i_dec/trc_idec_arminst.h b/decoder/include/i_dec/trc_idec_arminst.h index 6ce7080..b159849 100644 --- a/decoder/include/i_dec/trc_idec_arminst.h +++ b/decoder/include/i_dec/trc_idec_arminst.h @@ -39,7 +39,7 @@ #define __STDC_CONSTANT_MACROS 1 #endif

-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include <cstdint>

/* diff --git a/decoder/include/interfaces/trc_data_raw_in_i.h b/decoder/include/interfaces/trc_data_raw_in_i.h index ac3d0b7..bf020d7 100644 --- a/decoder/include/interfaces/trc_data_raw_in_i.h +++ b/decoder/include/interfaces/trc_data_raw_in_i.h @@ -35,7 +35,7 @@ #ifndef ARM_TRCDATA_RAW_IN_I_H_INCLUDED #define ARM_TRCDATA_RAW_IN_I_H_INCLUDED

-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"

/** @class ITrcDataIn * diff --git a/decoder/include/interfaces/trc_data_rawframe_in_i.h b/decoder/include/interfaces/trc_data_rawframe_in_i.h index 240dc9d..9fc3531 100644 --- a/decoder/include/interfaces/trc_data_rawframe_in_i.h +++ b/decoder/include/interfaces/trc_data_rawframe_in_i.h @@ -36,7 +36,7 @@ #ifndef ARM_TRCDATA_RAWFRAME_IN_I_H_INCLUDED #define ARM_TRCDATA_RAWFRAME_IN_I_H_INCLUDED

-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"

/*! * @class ITrcRawFrameIn diff --git a/decoder/include/interfaces/trc_error_log_i.h b/decoder/include/interfaces/trc_error_log_i.h index 2e64ac2..2fc796f 100644 --- a/decoder/include/interfaces/trc_error_log_i.h +++ b/decoder/include/interfaces/trc_error_log_i.h @@ -36,7 +36,7 @@ #ifndef ARM_TRC_ERROR_LOG_I_H_INCLUDED #define ARM_TRC_ERROR_LOG_I_H_INCLUDED

-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include <string>

class ocsdError; diff --git a/decoder/include/interfaces/trc_indexer_src_i.h b/decoder/include/interfaces/trc_indexer_src_i.h index 413c2a4..078efa5 100644 --- a/decoder/include/interfaces/trc_indexer_src_i.h +++ b/decoder/include/interfaces/trc_indexer_src_i.h @@ -38,7 +38,7 @@ #define ARM_TRC_INDEXER_SRC_I_H_INCLUDED

#include <vector> -#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"

/*! * @class ITrcSrcIndexCreator diff --git a/decoder/include/mem_acc/trc_mem_acc_base.h b/decoder/include/mem_acc/trc_mem_acc_base.h index a82933d..71b6a81 100644 --- a/decoder/include/mem_acc/trc_mem_acc_base.h +++ b/decoder/include/mem_acc/trc_mem_acc_base.h @@ -35,7 +35,7 @@ #ifndef ARM_TRC_MEM_ACC_BASE_H_INCLUDED #define ARM_TRC_MEM_ACC_BASE_H_INCLUDED

-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include <string>

/*! diff --git a/decoder/include/mem_acc/trc_mem_acc_cb_if.h b/decoder/include/mem_acc/trc_mem_acc_cb_if.h index 5621b7c..54dc184 100644 --- a/decoder/include/mem_acc/trc_mem_acc_cb_if.h +++ b/decoder/include/mem_acc/trc_mem_acc_cb_if.h @@ -35,7 +35,7 @@ #ifndef ARM_TRC_MEM_ACC_CB_IF_H_INCLUDED #define ARM_TRC_MEM_ACC_CB_IF_H_INCLUDED

-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"

/*! * @class TrcMemAccCBIF diff --git a/decoder/include/mem_acc/trc_mem_acc_file.h b/decoder/include/mem_acc/trc_mem_acc_file.h index 47ed15d..7f8d546 100644 --- a/decoder/include/mem_acc/trc_mem_acc_file.h +++ b/decoder/include/mem_acc/trc_mem_acc_file.h @@ -40,7 +40,7 @@ #include <fstream> #include <list>

-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include "mem_acc/trc_mem_acc_base.h"

// an add-on region to a file - allows setting of a region at a none-zero offset for a file. diff --git a/decoder/include/mem_acc/trc_mem_acc_mapper.h b/decoder/include/mem_acc/trc_mem_acc_mapper.h index 36db5ed..07d044e 100644 --- a/decoder/include/mem_acc/trc_mem_acc_mapper.h +++ b/decoder/include/mem_acc/trc_mem_acc_mapper.h @@ -37,7 +37,7 @@

#include <vector>

-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include "interfaces/trc_tgt_mem_access_i.h" #include "interfaces/trc_error_log_i.h" #include "mem_acc/trc_mem_acc_base.h" diff --git a/decoder/include/opencsd.h b/decoder/include/opencsd.h index fa8a45a..615bbca 100644 --- a/decoder/include/opencsd.h +++ b/decoder/include/opencsd.h @@ -36,9 +36,9 @@ #define ARM_OPENCSD_H_INCLUDED

/** C interface types */ -#include "ocsd_if_types.h" -#include "trc_pkt_types.h" -#include "trc_gen_elem_types.h" +#include "opencsd/ocsd_if_types.h" +#include "opencsd/trc_pkt_types.h" +#include "opencsd/trc_gen_elem_types.h"

/* C++ abstract interfaces */ #include "interfaces/trc_data_raw_in_i.h" @@ -59,10 +59,10 @@ /** Implemented Protocol decoders */ #include "common/trc_frame_deformatter.h"

-#include "etmv3/etmv3_decoder.h" -#include "etmv4/etmv4_decoder.h" -#include "ptm/ptm_decoder.h" -#include "stm/stm_decoder.h" +#include "opencsd/etmv3/etmv3_decoder.h" +#include "opencsd/etmv4/etmv4_decoder.h" +#include "opencsd/ptm/ptm_decoder.h" +#include "opencsd/stm/stm_decoder.h"

/** C++ library object types */ #include "common/ocsd_error_logger.h" diff --git a/decoder/include/c_api/ocsd_c_api_cust_fact.h b/decoder/include/opencsd/c_api/ocsd_c_api_cust_fact.h similarity index 100% rename from decoder/include/c_api/ocsd_c_api_cust_fact.h rename to decoder/include/opencsd/c_api/ocsd_c_api_cust_fact.h diff --git a/decoder/include/c_api/ocsd_c_api_cust_impl.h b/decoder/include/opencsd/c_api/ocsd_c_api_cust_impl.h similarity index 98% rename from decoder/include/c_api/ocsd_c_api_cust_impl.h rename to decoder/include/opencsd/c_api/ocsd_c_api_cust_impl.h index 214e8af..245ce16 100644 --- a/decoder/include/c_api/ocsd_c_api_cust_impl.h +++ b/decoder/include/opencsd/c_api/ocsd_c_api_cust_impl.h @@ -34,8 +34,8 @@ #ifndef ARM_OCSD_C_API_CUST_IMPL_H_INCLUDED #define ARM_OCSD_C_API_CUST_IMPL_H_INCLUDED

-#include "c_api/ocsd_c_api_types.h" -#include "c_api/ocsd_c_api_custom.h" +#include "opencsd/c_api/ocsd_c_api_types.h" +#include "opencsd/c_api/ocsd_c_api_custom.h"

/** @addtogroup ocsd_ext_dcd @{*/ diff --git a/decoder/include/c_api/ocsd_c_api_custom.h b/decoder/include/opencsd/c_api/ocsd_c_api_custom.h similarity index 100% rename from decoder/include/c_api/ocsd_c_api_custom.h rename to decoder/include/opencsd/c_api/ocsd_c_api_custom.h diff --git a/decoder/include/c_api/ocsd_c_api_types.h b/decoder/include/opencsd/c_api/ocsd_c_api_types.h similarity index 94% rename from decoder/include/c_api/ocsd_c_api_types.h rename to decoder/include/opencsd/c_api/ocsd_c_api_types.h index 8354d00..ca61e0a 100644 --- a/decoder/include/c_api/ocsd_c_api_types.h +++ b/decoder/include/opencsd/c_api/ocsd_c_api_types.h @@ -36,15 +36,15 @@ #define ARM_OCSD_C_API_TYPES_H_INCLUDED

/* select the library types that are C compatible - the interface data types */ -#include "ocsd_if_types.h" -#include "trc_gen_elem_types.h" -#include "trc_pkt_types.h" +#include "opencsd/ocsd_if_types.h" +#include "opencsd/trc_gen_elem_types.h" +#include "opencsd/trc_pkt_types.h"

/* pull in the protocol decoder types. */ -#include "etmv3/trc_pkt_types_etmv3.h" -#include "etmv4/trc_pkt_types_etmv4.h" -#include "ptm/trc_pkt_types_ptm.h" -#include "stm/trc_pkt_types_stm.h" +#include "opencsd/etmv3/trc_pkt_types_etmv3.h" +#include "opencsd/etmv4/trc_pkt_types_etmv4.h" +#include "opencsd/ptm/trc_pkt_types_ptm.h" +#include "opencsd/stm/trc_pkt_types_stm.h"

/** @ingroup lib_c_api @{*/ diff --git a/decoder/include/c_api/opencsd_c_api.h b/decoder/include/opencsd/c_api/opencsd_c_api.h similarity index 100% rename from decoder/include/c_api/opencsd_c_api.h rename to decoder/include/opencsd/c_api/opencsd_c_api.h diff --git a/decoder/include/etmv3/etmv3_decoder.h b/decoder/include/opencsd/etmv3/etmv3_decoder.h similarity index 88% rename from decoder/include/etmv3/etmv3_decoder.h rename to decoder/include/opencsd/etmv3/etmv3_decoder.h index 48c9fc7..2d5b728 100644 --- a/decoder/include/etmv3/etmv3_decoder.h +++ b/decoder/include/opencsd/etmv3/etmv3_decoder.h @@ -36,11 +36,11 @@ #ifndef ARM_ETMV3_DECODER_H_INCLUDED #define ARM_ETMV3_DECODER_H_INCLUDED

-#include "etmv3/trc_cmp_cfg_etmv3.h" -#include "etmv3/trc_pkt_elem_etmv3.h" -#include "etmv3/trc_pkt_proc_etmv3.h" -#include "etmv3/trc_pkt_types_etmv3.h" -#include "etmv3/trc_pkt_decode_etmv3.h" +#include "opencsd/etmv3/trc_cmp_cfg_etmv3.h" +#include "opencsd/etmv3/trc_pkt_elem_etmv3.h" +#include "opencsd/etmv3/trc_pkt_proc_etmv3.h" +#include "opencsd/etmv3/trc_pkt_types_etmv3.h" +#include "opencsd/etmv3/trc_pkt_decode_etmv3.h"

#endif // ARM_ETMV3_DECODER_H_INCLUDED

diff --git a/decoder/include/etmv3/trc_cmp_cfg_etmv3.h b/decoder/include/opencsd/etmv3/trc_cmp_cfg_etmv3.h similarity index 100% rename from decoder/include/etmv3/trc_cmp_cfg_etmv3.h rename to decoder/include/opencsd/etmv3/trc_cmp_cfg_etmv3.h diff --git a/decoder/include/etmv3/trc_dcd_mngr_etmv3.h b/decoder/include/opencsd/etmv3/trc_dcd_mngr_etmv3.h similarity index 100% rename from decoder/include/etmv3/trc_dcd_mngr_etmv3.h rename to decoder/include/opencsd/etmv3/trc_dcd_mngr_etmv3.h diff --git a/decoder/include/etmv3/trc_pkt_decode_etmv3.h b/decoder/include/opencsd/etmv3/trc_pkt_decode_etmv3.h similarity index 98% rename from decoder/include/etmv3/trc_pkt_decode_etmv3.h rename to decoder/include/opencsd/etmv3/trc_pkt_decode_etmv3.h index a047c11..b2139c0 100644 --- a/decoder/include/etmv3/trc_pkt_decode_etmv3.h +++ b/decoder/include/opencsd/etmv3/trc_pkt_decode_etmv3.h @@ -41,8 +41,8 @@ #include "common/ocsd_code_follower.h" #include "common/ocsd_gen_elem_list.h"

-#include "etmv3/trc_pkt_elem_etmv3.h" -#include "etmv3/trc_cmp_cfg_etmv3.h" +#include "opencsd/etmv3/trc_pkt_elem_etmv3.h" +#include "opencsd/etmv3/trc_cmp_cfg_etmv3.h"

/**************** Atom handling class **************************************/ class Etmv3Atoms diff --git a/decoder/include/etmv3/trc_pkt_elem_etmv3.h b/decoder/include/opencsd/etmv3/trc_pkt_elem_etmv3.h similarity index 100% rename from decoder/include/etmv3/trc_pkt_elem_etmv3.h rename to decoder/include/opencsd/etmv3/trc_pkt_elem_etmv3.h diff --git a/decoder/include/etmv3/trc_pkt_proc_etmv3.h b/decoder/include/opencsd/etmv3/trc_pkt_proc_etmv3.h similarity index 100% rename from decoder/include/etmv3/trc_pkt_proc_etmv3.h rename to decoder/include/opencsd/etmv3/trc_pkt_proc_etmv3.h diff --git a/decoder/include/etmv3/trc_pkt_types_etmv3.h b/decoder/include/opencsd/etmv3/trc_pkt_types_etmv3.h similarity index 99% rename from decoder/include/etmv3/trc_pkt_types_etmv3.h rename to decoder/include/opencsd/etmv3/trc_pkt_types_etmv3.h index 0be9d98..c2e0114 100644 --- a/decoder/include/etmv3/trc_pkt_types_etmv3.h +++ b/decoder/include/opencsd/etmv3/trc_pkt_types_etmv3.h @@ -35,7 +35,7 @@ #ifndef ARM_TRC_ETM3_PKT_TYPES_ETMV3_H_INCLUDED #define ARM_TRC_ETM3_PKT_TYPES_ETMV3_H_INCLUDED

-#include "trc_pkt_types.h" +#include "opencsd/trc_pkt_types.h"

/** @addtogroup trc_pkts @{*/ diff --git a/decoder/include/etmv4/etmv4_decoder.h b/decoder/include/opencsd/etmv4/etmv4_decoder.h similarity index 100% rename from decoder/include/etmv4/etmv4_decoder.h rename to decoder/include/opencsd/etmv4/etmv4_decoder.h diff --git a/decoder/include/etmv4/trc_cmp_cfg_etmv4.h b/decoder/include/opencsd/etmv4/trc_cmp_cfg_etmv4.h similarity index 100% rename from decoder/include/etmv4/trc_cmp_cfg_etmv4.h rename to decoder/include/opencsd/etmv4/trc_cmp_cfg_etmv4.h diff --git a/decoder/include/etmv4/trc_dcd_mngr_etmv4i.h b/decoder/include/opencsd/etmv4/trc_dcd_mngr_etmv4i.h similarity index 100% rename from decoder/include/etmv4/trc_dcd_mngr_etmv4i.h rename to decoder/include/opencsd/etmv4/trc_dcd_mngr_etmv4i.h diff --git a/decoder/include/etmv4/trc_etmv4_stack_elem.h b/decoder/include/opencsd/etmv4/trc_etmv4_stack_elem.h similarity index 99% rename from decoder/include/etmv4/trc_etmv4_stack_elem.h rename to decoder/include/opencsd/etmv4/trc_etmv4_stack_elem.h index be620b4..8bf0fb0 100644 --- a/decoder/include/etmv4/trc_etmv4_stack_elem.h +++ b/decoder/include/opencsd/etmv4/trc_etmv4_stack_elem.h @@ -33,7 +33,7 @@ #ifndef ARM_TRC_ETMV4_STACK_ELEM_H_INCLUDED #define ARM_TRC_ETMV4_STACK_ELEM_H_INCLUDED

-#include "etmv4/trc_pkt_types_etmv4.h" +#include "opencsd/etmv4/trc_pkt_types_etmv4.h"

#include <deque> #include <vector> diff --git a/decoder/include/etmv4/trc_pkt_decode_etmv4i.h b/decoder/include/opencsd/etmv4/trc_pkt_decode_etmv4i.h similarity index 98% rename from decoder/include/etmv4/trc_pkt_decode_etmv4i.h rename to decoder/include/opencsd/etmv4/trc_pkt_decode_etmv4i.h index 6891ffb..f27bb45 100644 --- a/decoder/include/etmv4/trc_pkt_decode_etmv4i.h +++ b/decoder/include/opencsd/etmv4/trc_pkt_decode_etmv4i.h @@ -36,11 +36,11 @@ #define ARM_TRC_PKT_DECODE_ETMV4I_H_INCLUDED

#include "common/trc_pkt_decode_base.h" -#include "etmv4/trc_pkt_elem_etmv4i.h" -#include "etmv4/trc_cmp_cfg_etmv4.h" +#include "opencsd/etmv4/trc_pkt_elem_etmv4i.h" +#include "opencsd/etmv4/trc_cmp_cfg_etmv4.h" #include "common/trc_gen_elem.h" #include "common/trc_ret_stack.h" -#include "etmv4/trc_etmv4_stack_elem.h" +#include "opencsd/etmv4/trc_etmv4_stack_elem.h"

class TrcStackElem; class TrcStackElemParam; diff --git a/decoder/include/etmv4/trc_pkt_elem_etmv4d.h b/decoder/include/opencsd/etmv4/trc_pkt_elem_etmv4d.h similarity index 100% rename from decoder/include/etmv4/trc_pkt_elem_etmv4d.h rename to decoder/include/opencsd/etmv4/trc_pkt_elem_etmv4d.h diff --git a/decoder/include/etmv4/trc_pkt_elem_etmv4i.h b/decoder/include/opencsd/etmv4/trc_pkt_elem_etmv4i.h similarity index 100% rename from decoder/include/etmv4/trc_pkt_elem_etmv4i.h rename to decoder/include/opencsd/etmv4/trc_pkt_elem_etmv4i.h diff --git a/decoder/include/etmv4/trc_pkt_proc_etmv4.h b/decoder/include/opencsd/etmv4/trc_pkt_proc_etmv4.h similarity index 100% rename from decoder/include/etmv4/trc_pkt_proc_etmv4.h rename to decoder/include/opencsd/etmv4/trc_pkt_proc_etmv4.h diff --git a/decoder/include/etmv4/trc_pkt_types_etmv4.h b/decoder/include/opencsd/etmv4/trc_pkt_types_etmv4.h similarity index 99% rename from decoder/include/etmv4/trc_pkt_types_etmv4.h rename to decoder/include/opencsd/etmv4/trc_pkt_types_etmv4.h index 7f01737..b22a2b9 100644 --- a/decoder/include/etmv4/trc_pkt_types_etmv4.h +++ b/decoder/include/opencsd/etmv4/trc_pkt_types_etmv4.h @@ -36,7 +36,7 @@ #ifndef ARM_TRC_PKT_TYPES_ETMV4_H_INCLUDED #define ARM_TRC_PKT_TYPES_ETMV4_H_INCLUDED

-#include "trc_pkt_types.h" +#include "opencsd/trc_pkt_types.h"

/** @addtogroup trc_pkts @{*/ diff --git a/decoder/include/ocsd_if_types.h b/decoder/include/opencsd/ocsd_if_types.h similarity index 99% rename from decoder/include/ocsd_if_types.h rename to decoder/include/opencsd/ocsd_if_types.h index 0488010..def1657 100644 --- a/decoder/include/ocsd_if_types.h +++ b/decoder/include/opencsd/ocsd_if_types.h @@ -1,5 +1,5 @@ /*! - * \file ocsd_if_types.h + * \file opencsd/ocsd_if_types.h * \brief OpenCSD : Standard Types used in the library interfaces. * * \copyright Copyright (c) 2015, ARM Limited. All Rights Reserved. @@ -589,4 +589,4 @@ typedef struct _ocsd_swt_info { /** @}*/ #endif // ARM_OCSD_IF_TYPES_H_INCLUDED

-/* End of File ocsd_if_types.h */ +/* End of File opencsd/ocsd_if_types.h */ diff --git a/decoder/include/ptm/ptm_decoder.h b/decoder/include/opencsd/ptm/ptm_decoder.h similarity index 100% rename from decoder/include/ptm/ptm_decoder.h rename to decoder/include/opencsd/ptm/ptm_decoder.h diff --git a/decoder/include/ptm/trc_cmp_cfg_ptm.h b/decoder/include/opencsd/ptm/trc_cmp_cfg_ptm.h similarity index 100% rename from decoder/include/ptm/trc_cmp_cfg_ptm.h rename to decoder/include/opencsd/ptm/trc_cmp_cfg_ptm.h diff --git a/decoder/include/ptm/trc_dcd_mngr_ptm.h b/decoder/include/opencsd/ptm/trc_dcd_mngr_ptm.h similarity index 100% rename from decoder/include/ptm/trc_dcd_mngr_ptm.h rename to decoder/include/opencsd/ptm/trc_dcd_mngr_ptm.h diff --git a/decoder/include/ptm/trc_pkt_decode_ptm.h b/decoder/include/opencsd/ptm/trc_pkt_decode_ptm.h similarity index 98% rename from decoder/include/ptm/trc_pkt_decode_ptm.h rename to decoder/include/opencsd/ptm/trc_pkt_decode_ptm.h index 37a9ac2..395b316 100644 --- a/decoder/include/ptm/trc_pkt_decode_ptm.h +++ b/decoder/include/opencsd/ptm/trc_pkt_decode_ptm.h @@ -35,8 +35,8 @@ #define ARM_TRC_PKT_DECODE_PTM_H_INCLUDED

#include "common/trc_pkt_decode_base.h" -#include "ptm/trc_pkt_elem_ptm.h" -#include "ptm/trc_cmp_cfg_ptm.h" +#include "opencsd/ptm/trc_pkt_elem_ptm.h" +#include "opencsd/ptm/trc_cmp_cfg_ptm.h" #include "common/trc_gen_elem.h" #include "common/trc_ret_stack.h"

diff --git a/decoder/include/ptm/trc_pkt_elem_ptm.h b/decoder/include/opencsd/ptm/trc_pkt_elem_ptm.h similarity index 100% rename from decoder/include/ptm/trc_pkt_elem_ptm.h rename to decoder/include/opencsd/ptm/trc_pkt_elem_ptm.h diff --git a/decoder/include/ptm/trc_pkt_proc_ptm.h b/decoder/include/opencsd/ptm/trc_pkt_proc_ptm.h similarity index 100% rename from decoder/include/ptm/trc_pkt_proc_ptm.h rename to decoder/include/opencsd/ptm/trc_pkt_proc_ptm.h diff --git a/decoder/include/ptm/trc_pkt_types_ptm.h b/decoder/include/opencsd/ptm/trc_pkt_types_ptm.h similarity index 99% rename from decoder/include/ptm/trc_pkt_types_ptm.h rename to decoder/include/opencsd/ptm/trc_pkt_types_ptm.h index e0ba1b8..45d994d 100644 --- a/decoder/include/ptm/trc_pkt_types_ptm.h +++ b/decoder/include/opencsd/ptm/trc_pkt_types_ptm.h @@ -35,7 +35,7 @@ #ifndef ARM_TRC_PKT_PTM_TYPES_H_INCLUDED #define ARM_TRC_PKT_PTM_TYPES_H_INCLUDED

-#include "trc_pkt_types.h" +#include "opencsd/trc_pkt_types.h"

/** @addtogroup trc_pkts @{*/ diff --git a/decoder/include/stm/stm_decoder.h b/decoder/include/opencsd/stm/stm_decoder.h similarity index 100% rename from decoder/include/stm/stm_decoder.h rename to decoder/include/opencsd/stm/stm_decoder.h diff --git a/decoder/include/stm/trc_cmp_cfg_stm.h b/decoder/include/opencsd/stm/trc_cmp_cfg_stm.h similarity index 100% rename from decoder/include/stm/trc_cmp_cfg_stm.h rename to decoder/include/opencsd/stm/trc_cmp_cfg_stm.h diff --git a/decoder/include/stm/trc_dcd_mngr_stm.h b/decoder/include/opencsd/stm/trc_dcd_mngr_stm.h similarity index 100% rename from decoder/include/stm/trc_dcd_mngr_stm.h rename to decoder/include/opencsd/stm/trc_dcd_mngr_stm.h diff --git a/decoder/include/stm/trc_pkt_decode_stm.h b/decoder/include/opencsd/stm/trc_pkt_decode_stm.h similarity index 97% rename from decoder/include/stm/trc_pkt_decode_stm.h rename to decoder/include/opencsd/stm/trc_pkt_decode_stm.h index dc295f4..a480720 100644 --- a/decoder/include/stm/trc_pkt_decode_stm.h +++ b/decoder/include/opencsd/stm/trc_pkt_decode_stm.h @@ -41,8 +41,8 @@

#include "common/trc_pkt_decode_base.h" -#include "stm/trc_pkt_elem_stm.h" -#include "stm/trc_cmp_cfg_stm.h" +#include "opencsd/stm/trc_pkt_elem_stm.h" +#include "opencsd/stm/trc_cmp_cfg_stm.h" #include "common/trc_gen_elem.h"

class TrcPktDecodeStm : public TrcPktDecodeBase<StmTrcPacket, STMConfig> diff --git a/decoder/include/stm/trc_pkt_elem_stm.h b/decoder/include/opencsd/stm/trc_pkt_elem_stm.h similarity index 100% rename from decoder/include/stm/trc_pkt_elem_stm.h rename to decoder/include/opencsd/stm/trc_pkt_elem_stm.h diff --git a/decoder/include/stm/trc_pkt_proc_stm.h b/decoder/include/opencsd/stm/trc_pkt_proc_stm.h similarity index 100% rename from decoder/include/stm/trc_pkt_proc_stm.h rename to decoder/include/opencsd/stm/trc_pkt_proc_stm.h diff --git a/decoder/include/stm/trc_pkt_types_stm.h b/decoder/include/opencsd/stm/trc_pkt_types_stm.h similarity index 99% rename from decoder/include/stm/trc_pkt_types_stm.h rename to decoder/include/opencsd/stm/trc_pkt_types_stm.h index 0192b5c..fd44cea 100644 --- a/decoder/include/stm/trc_pkt_types_stm.h +++ b/decoder/include/opencsd/stm/trc_pkt_types_stm.h @@ -34,7 +34,7 @@ #ifndef ARM_TRC_PKT_TYPES_STM_H_INCLUDED #define ARM_TRC_PKT_TYPES_STM_H_INCLUDED

-#include "trc_pkt_types.h" +#include "opencsd/trc_pkt_types.h"

/** @addtogroup trc_pkts @{*/ diff --git a/decoder/include/trc_gen_elem_types.h b/decoder/include/opencsd/trc_gen_elem_types.h similarity index 98% rename from decoder/include/trc_gen_elem_types.h rename to decoder/include/opencsd/trc_gen_elem_types.h index 440bc19..3766785 100644 --- a/decoder/include/trc_gen_elem_types.h +++ b/decoder/include/opencsd/trc_gen_elem_types.h @@ -1,5 +1,5 @@ /*! - * \file trc_gen_elem_types.h + * \file opencsd/trc_gen_elem_types.h * \brief OpenCSD : Decoder Output Generic Element types. * * \copyright Copyright (c) 2015, ARM Limited. All Rights Reserved. @@ -41,7 +41,7 @@ * @{*/

-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"

/** Enum for generic element types */ typedef enum _ocsd_gen_trc_elem_t @@ -123,4 +123,4 @@ typedef enum _event_t { /** @}*/ #endif // ARM_TRC_GEN_ELEM_TYPES_H_INCLUDED

-/* End of File trc_gen_elem_types.h */ +/* End of File opencsd/trc_gen_elem_types.h */ diff --git a/decoder/include/trc_pkt_types.h b/decoder/include/opencsd/trc_pkt_types.h similarity index 97% rename from decoder/include/trc_pkt_types.h rename to decoder/include/opencsd/trc_pkt_types.h index f705875..2eb353a 100644 --- a/decoder/include/trc_pkt_types.h +++ b/decoder/include/opencsd/trc_pkt_types.h @@ -1,5 +1,5 @@ /*! - * \file trc_pkt_types.h + * \file opencsd/trc_pkt_types.h * \brief OpenCSD: Common "C" types for trace packets. * * \copyright Copyright (c) 2015, ARM Limited. All Rights Reserved. @@ -37,7 +37,7 @@ #define ARM_TRC_PKT_TYPES_H_INCLUDED

#include <stdint.h> -#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h"

/** @defgroup trc_pkts OpenCSD Library : Trace Packet Types

@@ -134,4 +134,4 @@ typedef enum _ocsd_armv7_exception {

#endif // ARM_TRC_PKT_TYPES_H_INCLUDED

-/* End of File trc_pkt_types.h */ +/* End of File opencsd/trc_pkt_types.h */ diff --git a/decoder/source/c_api/ocsd_c_api.cpp b/decoder/source/c_api/ocsd_c_api.cpp index b866db8..1a2a74f 100644 --- a/decoder/source/c_api/ocsd_c_api.cpp +++ b/decoder/source/c_api/ocsd_c_api.cpp @@ -38,7 +38,7 @@ #include "opencsd.h"

/* C-API and wrapper objects */ -#include "c_api/opencsd_c_api.h" +#include "opencsd/c_api/opencsd_c_api.h" #include "ocsd_c_api_obj.h"

/** MSVC2010 unwanted export workaround */ diff --git a/decoder/source/c_api/ocsd_c_api_custom_obj.cpp b/decoder/source/c_api/ocsd_c_api_custom_obj.cpp index 70330e2..dbd0bd1 100644 --- a/decoder/source/c_api/ocsd_c_api_custom_obj.cpp +++ b/decoder/source/c_api/ocsd_c_api_custom_obj.cpp @@ -35,7 +35,7 @@ /* pull in the C++ decode library */ #include "opencsd.h"

-#include "c_api/opencsd_c_api.h" +#include "opencsd/c_api/opencsd_c_api.h" #include "ocsd_c_api_custom_obj.h" #include "common/ocsd_lib_dcd_register.h"

diff --git a/decoder/source/c_api/ocsd_c_api_custom_obj.h b/decoder/source/c_api/ocsd_c_api_custom_obj.h index 25b212c..d4845bd 100644 --- a/decoder/source/c_api/ocsd_c_api_custom_obj.h +++ b/decoder/source/c_api/ocsd_c_api_custom_obj.h @@ -36,7 +36,7 @@ #ifndef ARM_OCSD_C_API_CUSTOM_OBJ_H_INCLUDED #define ARM_OCSD_C_API_CUSTOM_OBJ_H_INCLUDED

-#include "c_api/ocsd_c_api_custom.h" +#include "opencsd/c_api/ocsd_c_api_custom.h" #include "common/ocsd_dcd_mngr_i.h"

/***** Decoder manager interface ******************************/ diff --git a/decoder/source/c_api/ocsd_c_api_obj.h b/decoder/source/c_api/ocsd_c_api_obj.h index 42e8a7d..0476ac6 100644 --- a/decoder/source/c_api/ocsd_c_api_obj.h +++ b/decoder/source/c_api/ocsd_c_api_obj.h @@ -8,7 +8,7 @@ #ifndef ARM_OCSD_C_API_OBJ_H_INCLUDED #define ARM_OCSD_C_API_OBJ_H_INCLUDED

-#include "c_api/ocsd_c_api_types.h" +#include "opencsd/c_api/ocsd_c_api_types.h" #include "interfaces/trc_gen_elem_in_i.h" #include "common/ocsd_msg_logger.h"

diff --git a/decoder/source/etmv3/trc_cmp_cfg_etmv3.cpp b/decoder/source/etmv3/trc_cmp_cfg_etmv3.cpp index 5bc34e2..f2556e4 100644 --- a/decoder/source/etmv3/trc_cmp_cfg_etmv3.cpp +++ b/decoder/source/etmv3/trc_cmp_cfg_etmv3.cpp @@ -33,7 +33,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */

-#include "etmv3/trc_cmp_cfg_etmv3.h" +#include "opencsd/etmv3/trc_cmp_cfg_etmv3.h"

EtmV3Config::EtmV3Config() { diff --git a/decoder/source/etmv3/trc_pkt_decode_etmv3.cpp b/decoder/source/etmv3/trc_pkt_decode_etmv3.cpp index 4e77f1f..bd7cb60 100644 --- a/decoder/source/etmv3/trc_pkt_decode_etmv3.cpp +++ b/decoder/source/etmv3/trc_pkt_decode_etmv3.cpp @@ -32,7 +32,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */

-#include "etmv3/trc_pkt_decode_etmv3.h" +#include "opencsd/etmv3/trc_pkt_decode_etmv3.h"

#define DCD_NAME "DCD_ETMV3"

diff --git a/decoder/source/etmv3/trc_pkt_elem_etmv3.cpp b/decoder/source/etmv3/trc_pkt_elem_etmv3.cpp index bf1dee9..f1e411f 100644 --- a/decoder/source/etmv3/trc_pkt_elem_etmv3.cpp +++ b/decoder/source/etmv3/trc_pkt_elem_etmv3.cpp @@ -36,7 +36,7 @@ #include <sstream> #include <iomanip>

-#include "etmv3/trc_pkt_elem_etmv3.h" +#include "opencsd/etmv3/trc_pkt_elem_etmv3.h"

EtmV3TrcPacket::EtmV3TrcPacket() { diff --git a/decoder/source/etmv3/trc_pkt_proc_etmv3.cpp b/decoder/source/etmv3/trc_pkt_proc_etmv3.cpp index e7465b3..7871619 100644 --- a/decoder/source/etmv3/trc_pkt_proc_etmv3.cpp +++ b/decoder/source/etmv3/trc_pkt_proc_etmv3.cpp @@ -33,7 +33,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */

-#include "etmv3/trc_pkt_proc_etmv3.h" +#include "opencsd/etmv3/trc_pkt_proc_etmv3.h" #include "trc_pkt_proc_etmv3_impl.h" #include "common/ocsd_error.h"

diff --git a/decoder/source/etmv3/trc_pkt_proc_etmv3_impl.h b/decoder/source/etmv3/trc_pkt_proc_etmv3_impl.h index 811f00e..a8e4fd1 100644 --- a/decoder/source/etmv3/trc_pkt_proc_etmv3_impl.h +++ b/decoder/source/etmv3/trc_pkt_proc_etmv3_impl.h @@ -36,9 +36,9 @@ #ifndef ARM_TRC_PKT_PROC_ETMV3_IMPL_H_INCLUDED #define ARM_TRC_PKT_PROC_ETMV3_IMPL_H_INCLUDED

-#include "etmv3/trc_pkt_proc_etmv3.h" -#include "etmv3/trc_cmp_cfg_etmv3.h" -#include "etmv3/trc_pkt_elem_etmv3.h" +#include "opencsd/etmv3/trc_pkt_proc_etmv3.h" +#include "opencsd/etmv3/trc_cmp_cfg_etmv3.h" +#include "opencsd/etmv3/trc_pkt_elem_etmv3.h"

#define MAX_PACKET_SIZE 32 #define ASYNC_SIZE 6 diff --git a/decoder/source/etmv4/trc_cmp_cfg_etmv4.cpp b/decoder/source/etmv4/trc_cmp_cfg_etmv4.cpp index 1b90b17..7db0fa6 100644 --- a/decoder/source/etmv4/trc_cmp_cfg_etmv4.cpp +++ b/decoder/source/etmv4/trc_cmp_cfg_etmv4.cpp @@ -32,7 +32,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */

-#include "etmv4/trc_cmp_cfg_etmv4.h" +#include "opencsd/etmv4/trc_cmp_cfg_etmv4.h"

EtmV4Config::EtmV4Config() { diff --git a/decoder/source/etmv4/trc_etmv4_stack_elem.cpp b/decoder/source/etmv4/trc_etmv4_stack_elem.cpp index 1a9192c..ace0ac9 100644 --- a/decoder/source/etmv4/trc_etmv4_stack_elem.cpp +++ b/decoder/source/etmv4/trc_etmv4_stack_elem.cpp @@ -33,7 +33,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */

-#include "etmv4/trc_etmv4_stack_elem.h" +#include "opencsd/etmv4/trc_etmv4_stack_elem.h"

/* implementation of P0 element stack in ETM v4 trace*/ TrcStackElemParam *EtmV4P0Stack::createParamElemNoParam(const p0_elem_t p0_type, const bool isP0, const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index) diff --git a/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp b/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp index 8596b19..21d8901 100644 --- a/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp +++ b/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp @@ -33,7 +33,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */

-#include "etmv4/trc_pkt_decode_etmv4i.h" +#include "opencsd/etmv4/trc_pkt_decode_etmv4i.h"

#include "common/trc_gen_elem.h"

diff --git a/decoder/source/etmv4/trc_pkt_elem_etmv4d.cpp b/decoder/source/etmv4/trc_pkt_elem_etmv4d.cpp index ed576c1..58343b4 100644 --- a/decoder/source/etmv4/trc_pkt_elem_etmv4d.cpp +++ b/decoder/source/etmv4/trc_pkt_elem_etmv4d.cpp @@ -33,7 +33,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */

-#include "etmv4/trc_pkt_elem_etmv4d.h" +#include "opencsd/etmv4/trc_pkt_elem_etmv4d.h"

EtmV4DTrcPacket::EtmV4DTrcPacket() { diff --git a/decoder/source/etmv4/trc_pkt_elem_etmv4i.cpp b/decoder/source/etmv4/trc_pkt_elem_etmv4i.cpp index e848276..0761f7a 100644 --- a/decoder/source/etmv4/trc_pkt_elem_etmv4i.cpp +++ b/decoder/source/etmv4/trc_pkt_elem_etmv4i.cpp @@ -34,7 +34,7 @@ #include <sstream> #include <iomanip>

-#include "etmv4/trc_pkt_elem_etmv4i.h" +#include "opencsd/etmv4/trc_pkt_elem_etmv4i.h"

EtmV4ITrcPacket::EtmV4ITrcPacket() { diff --git a/decoder/source/etmv4/trc_pkt_proc_etmv4.cpp b/decoder/source/etmv4/trc_pkt_proc_etmv4.cpp index 09d8c84..b8c4f81 100644 --- a/decoder/source/etmv4/trc_pkt_proc_etmv4.cpp +++ b/decoder/source/etmv4/trc_pkt_proc_etmv4.cpp @@ -33,7 +33,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */

-#include "etmv4/trc_pkt_proc_etmv4.h" +#include "opencsd/etmv4/trc_pkt_proc_etmv4.h" #include "trc_pkt_proc_etmv4i_impl.h" #include "common/ocsd_error.h"

diff --git a/decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.h b/decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.h index 7ccaa43..5c79c25 100644 --- a/decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.h +++ b/decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.h @@ -35,9 +35,9 @@ #ifndef ARM_TRC_PKT_PROC_ETMV4I_IMPL_H_INCLUDED #define ARM_TRC_PKT_PROC_ETMV4I_IMPL_H_INCLUDED

-#include "etmv4/trc_pkt_proc_etmv4.h" -#include "etmv4/trc_cmp_cfg_etmv4.h" -#include "etmv4/trc_pkt_elem_etmv4i.h" +#include "opencsd/etmv4/trc_pkt_proc_etmv4.h" +#include "opencsd/etmv4/trc_cmp_cfg_etmv4.h" +#include "opencsd/etmv4/trc_pkt_elem_etmv4i.h"

class EtmV4IPktProcImpl { diff --git a/decoder/source/i_dec/trc_i_decode.cpp b/decoder/source/i_dec/trc_i_decode.cpp index 5c9d915..47b4867 100644 --- a/decoder/source/i_dec/trc_i_decode.cpp +++ b/decoder/source/i_dec/trc_i_decode.cpp @@ -32,7 +32,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */

-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include "i_dec/trc_i_decode.h" #include "i_dec/trc_idec_arminst.h"

diff --git a/decoder/source/ocsd_lib_dcd_register.cpp b/decoder/source/ocsd_lib_dcd_register.cpp index f52b8d0..adb042d 100644 --- a/decoder/source/ocsd_lib_dcd_register.cpp +++ b/decoder/source/ocsd_lib_dcd_register.cpp @@ -35,10 +35,10 @@ #include "common/ocsd_lib_dcd_register.h"

// include built-in decode manager headers -#include "etmv4/trc_dcd_mngr_etmv4i.h" -#include "etmv3/trc_dcd_mngr_etmv3.h" -#include "ptm/trc_dcd_mngr_ptm.h" -#include "stm/trc_dcd_mngr_stm.h" +#include "opencsd/etmv4/trc_dcd_mngr_etmv4i.h" +#include "opencsd/etmv3/trc_dcd_mngr_etmv3.h" +#include "opencsd/ptm/trc_dcd_mngr_ptm.h" +#include "opencsd/stm/trc_dcd_mngr_stm.h"

// create array of built-in decoders to register with library static built_in_decoder_info_t sBuiltInArray[] = { diff --git a/decoder/source/ptm/trc_cmp_cfg_ptm.cpp b/decoder/source/ptm/trc_cmp_cfg_ptm.cpp index 8028683..74ded02 100644 --- a/decoder/source/ptm/trc_cmp_cfg_ptm.cpp +++ b/decoder/source/ptm/trc_cmp_cfg_ptm.cpp @@ -32,7 +32,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */

-#include "ptm/trc_cmp_cfg_ptm.h" +#include "opencsd/ptm/trc_cmp_cfg_ptm.h"

PtmConfig::PtmConfig() { diff --git a/decoder/source/ptm/trc_pkt_decode_ptm.cpp b/decoder/source/ptm/trc_pkt_decode_ptm.cpp index 7bafb7f..aa42688 100644 --- a/decoder/source/ptm/trc_pkt_decode_ptm.cpp +++ b/decoder/source/ptm/trc_pkt_decode_ptm.cpp @@ -33,7 +33,7 @@ */

#include <sstream> -#include "ptm/trc_pkt_decode_ptm.h" +#include "opencsd/ptm/trc_pkt_decode_ptm.h"

#define DCD_NAME "DCD_PTM"

diff --git a/decoder/source/ptm/trc_pkt_elem_ptm.cpp b/decoder/source/ptm/trc_pkt_elem_ptm.cpp index 7ea867e..7c8bcd7 100644 --- a/decoder/source/ptm/trc_pkt_elem_ptm.cpp +++ b/decoder/source/ptm/trc_pkt_elem_ptm.cpp @@ -36,7 +36,7 @@ #include <sstream> #include <iomanip>

-#include "ptm/trc_pkt_elem_ptm.h" +#include "opencsd/ptm/trc_pkt_elem_ptm.h"

PtmTrcPacket::PtmTrcPacket() { diff --git a/decoder/source/ptm/trc_pkt_proc_ptm.cpp b/decoder/source/ptm/trc_pkt_proc_ptm.cpp index 285592d..7c90b62 100644 --- a/decoder/source/ptm/trc_pkt_proc_ptm.cpp +++ b/decoder/source/ptm/trc_pkt_proc_ptm.cpp @@ -32,8 +32,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */

-#include "ptm/trc_pkt_proc_ptm.h" -#include "ptm/trc_cmp_cfg_ptm.h" +#include "opencsd/ptm/trc_pkt_proc_ptm.h" +#include "opencsd/ptm/trc_cmp_cfg_ptm.h" #include "common/ocsd_error.h"

diff --git a/decoder/source/stm/trc_pkt_decode_stm.cpp b/decoder/source/stm/trc_pkt_decode_stm.cpp index e0ddc3e..a47e963 100644 --- a/decoder/source/stm/trc_pkt_decode_stm.cpp +++ b/decoder/source/stm/trc_pkt_decode_stm.cpp @@ -32,7 +32,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */

-#include "stm/trc_pkt_decode_stm.h" +#include "opencsd/stm/trc_pkt_decode_stm.h" #define DCD_NAME "DCD_STM"

TrcPktDecodeStm::TrcPktDecodeStm() diff --git a/decoder/source/stm/trc_pkt_elem_stm.cpp b/decoder/source/stm/trc_pkt_elem_stm.cpp index b3ce861..d9adaf6 100644 --- a/decoder/source/stm/trc_pkt_elem_stm.cpp +++ b/decoder/source/stm/trc_pkt_elem_stm.cpp @@ -34,7 +34,7 @@

#include <sstream> #include <iomanip> -#include "stm/trc_pkt_elem_stm.h" +#include "opencsd/stm/trc_pkt_elem_stm.h"

StmTrcPacket::StmTrcPacket() { diff --git a/decoder/source/stm/trc_pkt_proc_stm.cpp b/decoder/source/stm/trc_pkt_proc_stm.cpp index 242ee1c..b39a053 100644 --- a/decoder/source/stm/trc_pkt_proc_stm.cpp +++ b/decoder/source/stm/trc_pkt_proc_stm.cpp @@ -32,7 +32,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */

-#include "stm/trc_pkt_proc_stm.h" +#include "opencsd/stm/trc_pkt_proc_stm.h"

// processor object construction diff --git a/decoder/source/trc_frame_deformatter_impl.h b/decoder/source/trc_frame_deformatter_impl.h index 488bfad..e1fc17a 100644 --- a/decoder/source/trc_frame_deformatter_impl.h +++ b/decoder/source/trc_frame_deformatter_impl.h @@ -35,7 +35,7 @@ #ifndef ARM_TRC_FRAME_DECODER_IMPL_H_INCLUDED #define ARM_TRC_FRAME_DECODER_IMPL_H_INCLUDED

-#include "ocsd_if_types.h" +#include "opencsd/ocsd_if_types.h" #include "common/comp_attach_pt_t.h" #include "interfaces/trc_data_raw_in_i.h" #include "interfaces/trc_data_rawframe_in_i.h" diff --git a/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.c b/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.c index 3eac0e8..32365ef 100644 --- a/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.c +++ b/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.c @@ -36,9 +36,9 @@ #include <stdlib.h> #include <string.h>

-#include "c_api/opencsd_c_api.h" -#include "c_api/ocsd_c_api_types.h" -#include "c_api/ocsd_c_api_cust_impl.h" +#include "opencsd/c_api/opencsd_c_api.h" +#include "opencsd/c_api/ocsd_c_api_types.h" +#include "opencsd/c_api/ocsd_c_api_cust_impl.h"

#include "ext_dcd_echo_test_fact.h" #include "ext_dcd_echo_test.h" diff --git a/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.h b/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.h index 974b1cf..b2fdb23 100644 --- a/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.h +++ b/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test.h @@ -35,7 +35,7 @@ #define ARM_EXT_DCD_ECHO_TEST_H_INCLUDED

#include <inttypes.h> -#include "c_api/ocsd_c_api_custom.h" +#include "opencsd/c_api/ocsd_c_api_custom.h"

/* Echo test decoder designed to test the external decoder C - API infrastructure. diff --git a/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test_fact.h b/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test_fact.h index c4cc698..ef382f0 100644 --- a/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test_fact.h +++ b/decoder/tests/ext_dcd_test_eg/c_api_echo_test/ext_dcd_echo_test_fact.h @@ -39,7 +39,7 @@ back with a simple "protocol" decoded - not based on real protocol. */

-#include "c_api/ocsd_c_api_custom.h" +#include "opencsd/c_api/ocsd_c_api_custom.h"

/* return an initialised structure with the factory functions */ extern ocsd_extern_dcd_fact_t *ext_echo_get_dcd_fact(); diff --git a/decoder/tests/source/c_api_pkt_print_test.c b/decoder/tests/source/c_api_pkt_print_test.c index 19bfabe..85bd9bf 100644 --- a/decoder/tests/source/c_api_pkt_print_test.c +++ b/decoder/tests/source/c_api_pkt_print_test.c @@ -53,7 +53,7 @@ #include <stdlib.h>

/* include the C-API library header */ -#include "c_api/opencsd_c_api.h" +#include "opencsd/c_api/opencsd_c_api.h"

/* include the test external decoder factory and decoder types headers - separate from the main library includes by definition as external decoder.

Limit the header files copied to those necessary for installaion of C-API interface to the library.

Install list maintained in the C-API makefile.

Signed-off-by: Mike Leach mike.leach@linaro.org --- decoder/build/linux/makefile | 8 ++++---- decoder/build/linux/rctdl_c_api_lib/makefile | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/decoder/build/linux/makefile b/decoder/build/linux/makefile index 969cd24..24152d3 100644 --- a/decoder/build/linux/makefile +++ b/decoder/build/linux/makefile @@ -61,7 +61,7 @@ export OCSD_SOURCE=$(OCSD_ROOT)/source

export OCSD_TESTS=$(OCSD_ROOT)/tests

-UAPI_INCLUDE=$(OCSD_INCLUDE)/$(LIB_BASE_NAME) +export LIB_UAPI_INC_DIR=opencsd

# tools export MASTER_CC=$(CROSS_COMPILE)gcc @@ -72,7 +72,7 @@ INSTALL=install

# installation directory INSTALL_LIB_DIR=/usr/lib/ -INSTALL_INCLUDE_DIR=/usr/include/ +export INSTALL_INCLUDE_DIR=/usr/include/

# compile flags MASTER_CC_FLAGS := -c -Wall -DLINUX @@ -135,7 +135,7 @@ libs: $(LIB_BASE_NAME)_lib $(LIB_CAPI_NAME)_lib install: libs $(INSTALL) --mode=644 $(LIB_TARGET_DIR)/lib$(LIB_BASE_NAME).so $(INSTALL_LIB_DIR)/ $(INSTALL) --mode=644 $(LIB_TARGET_DIR)/lib$(LIB_CAPI_NAME).so $(INSTALL_LIB_DIR)/ - cp -dR $(UAPI_INCLUDE) $(INSTALL_INCLUDE_DIR)/ + cd $(OCSD_ROOT)/build/linux/rctdl_c_api_lib && make install_inc

################################ # build OpenCSD trace decode library @@ -193,4 +193,4 @@ clean_tests: clean_install: rm -f $(INSTALL_LIB_DIR)/lib$(LIB_BASE_NAME).so rm -f $(INSTALL_LIB_DIR)/lib$(LIB_CAPI_NAME).so - rm -rf $(INSTALL_INCLUDE_DIR)/$(LIB_BASE_NAME) + rm -rf $(INSTALL_INCLUDE_DIR)/$(LIB_UAPI_INC_DIR) diff --git a/decoder/build/linux/rctdl_c_api_lib/makefile b/decoder/build/linux/rctdl_c_api_lib/makefile index 1b8cf90..4f70dc9 100644 --- a/decoder/build/linux/rctdl_c_api_lib/makefile +++ b/decoder/build/linux/rctdl_c_api_lib/makefile @@ -52,6 +52,8 @@ CPP_INCLUDES= \ OBJECTS=$(BUILD_DIR)/ocsd_c_api.o \ $(BUILD_DIR)/ocsd_c_api_custom_obj.o

+INST_INC_SRC=$(OCSD_INCLUDE)/$(LIB_UAPI_INC_DIR) +INST_INC_DST=$(INSTALL_INCLUDE_DIR)/$(LIB_UAPI_INC_DIR)

all: build_dir $(OBJECTS) mkdir -p $(LIB_TARGET_DIR) @@ -80,3 +82,24 @@ clean: rm -f $(DEPS) rm -f $(LIB_TARGET_DIR)/$(LIB_NAME).a rm -f $(LIB_TARGET_DIR)/$(LIB_NAME).so + +#### install the necessary include files for the c-api library on linux +install_inc: + mkdir -p $(INST_INC_DST)/ + cp -d $(INST_INC_SRC)/trc_gen_elem_types.h $(INST_INC_DST)/. + cp -d $(INST_INC_SRC)/ocsd_if_types.h $(INST_INC_DST)/. + cp -d $(INST_INC_SRC)/trc_pkt_types.h $(INST_INC_DST)/. + mkdir -p $(INST_INC_DST)/ptm + cp -d $(INST_INC_SRC)/ptm/trc_pkt_types_ptm.h $(INST_INC_DST)/ptm/. + mkdir -p $(INST_INC_DST)/stm + cp -d $(INST_INC_SRC)/stm/trc_pkt_types_stm.h $(INST_INC_DST)/stm/. + mkdir -p $(INST_INC_DST)/etmv3 + cp -d $(INST_INC_SRC)/etmv3/trc_pkt_types_etmv3.h $(INST_INC_DST)/etmv3/. + mkdir -p $(INST_INC_DST)/etmv4 + cp -d $(INST_INC_SRC)/etmv4/trc_pkt_types_etmv4.h $(INST_INC_DST)/etmv4/. + mkdir -p $(INST_INC_DST)/c_api + cp -d $(INST_INC_SRC)/c_api/ocsd_c_api_types.h $(INST_INC_DST)/c_api/. + cp -d $(INST_INC_SRC)/c_api/opencsd_c_api.h $(INST_INC_DST)/c_api/. + cp -d $(INST_INC_SRC)/c_api/ocsd_c_api_custom.h $(INST_INC_DST)/c_api/. + +

As part of the process to make the library installable in standard linux library locations it has been agreed to change the base library name to 'opencsd' from 'cstraced' to make the name more closely associate with the github project.

This will result in the Linux versions being 'libopencsd.so' and 'libopencsd_c_api.so' with the Windows versions being 'opencsd.dll' and 'opencsd_c_api.dll'

Signed-off-by: Mike Leach mike.leach@linaro.org --- decoder/build/linux/makefile | 2 +- decoder/build/win-vs2015/opencsd.props | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/decoder/build/linux/makefile b/decoder/build/linux/makefile index 24152d3..15d0da9 100644 --- a/decoder/build/linux/makefile +++ b/decoder/build/linux/makefile @@ -40,7 +40,7 @@ export OCSD_ROOT endif

# library names -LIB_BASE_NAME=cstraced +LIB_BASE_NAME=opencsd export LIB_BASE_NAME LIB_CAPI_NAME=$(LIB_BASE_NAME)_c_api export LIB_CAPI_NAME diff --git a/decoder/build/win-vs2015/opencsd.props b/decoder/build/win-vs2015/opencsd.props index 3b33ee9..64b1268 100644 --- a/decoder/build/win-vs2015/opencsd.props +++ b/decoder/build/win-vs2015/opencsd.props @@ -1,9 +1,9 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ImportGroup Label="PropertySheets" /> <PropertyGroup Label="UserMacros"> - <LIB_BASE_NAME>cstraced</LIB_BASE_NAME> - <LIB_CAPI_NAME>cstraced_c_api</LIB_CAPI_NAME> + <LIB_BASE_NAME>opencsd</LIB_BASE_NAME> + <LIB_CAPI_NAME>opencsd_c_api</LIB_CAPI_NAME> </PropertyGroup> <PropertyGroup /> <ItemDefinitionGroup /> @@ -17,4 +17,4 @@ <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> </ItemGroup> -</Project> \ No newline at end of file +</Project>

Signed-off-by: Mike Leach mike.leach@linaro.org --- README.md | 4 +++- decoder/include/ocsd_if_version.h | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md index 4924d39..2c539a3 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 0.7.5_ +_Current Version 0.8.0_

### Current support:

@@ -112,6 +112,8 @@ Version and Modification Information - _Version 0.7.3_: Bugfix: PTM decoder - issues with initialisation and ASYNC detection. - _Version 0.7.4_: Notification of change of repository for perf extensions. gcc 6.x build fixes. - _Version 0.7.5_: Bugfix: ETMv4 decoder memory leak. Linux build update - header dependencies force rebuild. +- _Version 0.8.0_: Header restructure and build update to enable linux version to install library and C-API headers in standard locations. + Library output naming changed from 'cstraced' to 'opencsd'.

Licence Information =================== diff --git a/decoder/include/ocsd_if_version.h b/decoder/include/ocsd_if_version.h index 1a427ae..35f19d9 100644 --- a/decoder/include/ocsd_if_version.h +++ b/decoder/include/ocsd_if_version.h @@ -43,8 +43,8 @@ /** @name Library Versioning @{*/ #define OCSD_VER_MAJOR 0x0 /**< Library Major Version */ -#define OCSD_VER_MINOR 0x7 /**< Library Minor Version */ -#define OCSD_VER_PATCH 0x5 /**< Library Patch Version */ +#define OCSD_VER_MINOR 0x8 /**< Library Minor Version */ +#define OCSD_VER_PATCH 0x0 /**< Library Patch Version */

/** Library version number - MMMMnnpp format. MMMM = major version, @@ -53,7 +53,7 @@ */ #define OCSD_VER_NUM (((uint32_t)OCSD_VER_MAJOR << 16) | ((uint32_t)OCSD_VER_MINOR << 8) | ((uint32_t)OCSD_VER_PATCH))

-#define OCSD_VER_STRING "0.7.5" /**< Library Version string */ +#define OCSD_VER_STRING "0.8.0" /**< Library Version string */ #define OCSD_LIB_NAME "OpenCSD Library" /**< Library name string */ #define OCSD_LIB_SHORT_NAME "OCSD" /**< Library Short name string */ /** @}*/