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 1d56240bd5b5..71f4c84caa2f 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 7063266704d4..0e8691034a68 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 b3a7ebd0f868..ba7d8a89c46f 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 f6adb06b213d..5ecbe31401a8 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 b3c63648592c..e547f4878033 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 efb2d21fac72..6ba4cf82240a 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 1ad4676c2bec..797881cf6985 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 0904b07fbd0b..5a24149180fc 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 c874c82f5d71..e4297a41e8fd 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 2f4182b5544e..00081b556904 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 6a96d28937e1..a7f53d1cbaeb 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 0956a2ac2b85..ac31a79ded63 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 6ce7080bee26..b15984948d29 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 ac3d0b7f9c4f..bf020d706df8 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 240dc9d31d6c..9fc35319b86e 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 2e64ac28116d..2fc796f72457 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 413c2a4c731a..078efa515253 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 a82933d73bfc..71b6a816edad 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 5621b7c1ee46..54dc1848c45e 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 47ed15dab647..7f8d5462cbf5 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 36db5edce871..07d044ead81c 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 fa8a45aef30a..615bbcafa2d9 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 214e8af08961..245ce162752e 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 8354d006ce64..ca61e0aaed32 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 48c9fc730844..2d5b7281aed6 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 a047c1178395..b2139c0d9e68 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 0be9d98d276f..c2e01147995d 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 be620b4f79cc..8bf0fb0c0478 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 6891ffbdc5ea..f27bb45d9fa8 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 7f017370bb25..b22a2b939719 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 048801033c13..def16575f2b2 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 37a9ac2f0a06..395b316cda06 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 e0ba1b808020..45d994d59b50 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 dc295f4e2ea4..a4807207eb1e 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 0192b5ca6270..fd44cea939b4 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 440bc19fb2b0..3766785dbd6d 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 f705875f1035..2eb353a1761a 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 b866db89c173..1a2a74f899bc 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 70330e2238fd..dbd0bd107698 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 25b212c11d40..d4845bdf709d 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 42e8a7d113ac..0476ac67177c 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 5bc34e2105b1..f2556e4dfef4 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 4e77f1ffe3a3..bd7cb60b5b63 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 bf1dee910f85..f1e411f72423 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 e7465b3633a7..7871619fe55f 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 811f00eaa8d0..a8e4fd1b5373 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 1b90b17238a5..7db0fa61f963 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 1a9192caaa96..ace0ac932b76 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 8596b1915ab5..21d890178f7a 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 ed576c194365..58343b4117bf 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 e848276a9cdc..0761f7aa64f4 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 09d8c84ca487..b8c4f819c2d3 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 7ccaa43381c3..5c79c256967a 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 5c9d915b021d..47b4867e6c5c 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 f52b8d02ea85..adb042dcadff 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 8028683d97f6..74ded02c2130 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 7bafb7fc95ed..aa426889fd52 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 7ea867e29d52..7c8bcd7ef7f6 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 285592d51d47..7c90b62e6413 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 e0ddc3e6ed0a..a47e96312546 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 b3ce86179ceb..d9adaf695556 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 242ee1caa946..b39a053b39c0 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 488bfad1bb9d..e1fc17ab259f 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 3eac0e83157b..32365efb216b 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 974b1cfc9e6e..b2fdb23e8083 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 c4cc6988915b..ef382f0baa21 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 19bfabe3b1da..85bd9bf258b6 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.