diff options
Diffstat (limited to 'src/systemc/ext/tlm_core/2')
12 files changed, 26 insertions, 23 deletions
diff --git a/src/systemc/ext/tlm_core/2/generic_payload/endian_conv.hh b/src/systemc/ext/tlm_core/2/generic_payload/endian_conv.hh index 07dcef74c..05d2f652a 100644 --- a/src/systemc/ext/tlm_core/2/generic_payload/endian_conv.hh +++ b/src/systemc/ext/tlm_core/2/generic_payload/endian_conv.hh @@ -23,7 +23,7 @@ #include <cstring> // std::memset -#include "tlm_core/2/generic_payload/gp.hh" +#include "gp.hh" namespace tlm { diff --git a/src/systemc/ext/tlm_core/2/generic_payload/generic_payload.hh b/src/systemc/ext/tlm_core/2/generic_payload/generic_payload.hh index 4e03bb907..0d0e4df1a 100644 --- a/src/systemc/ext/tlm_core/2/generic_payload/generic_payload.hh +++ b/src/systemc/ext/tlm_core/2/generic_payload/generic_payload.hh @@ -20,9 +20,9 @@ #ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_HH__ #define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_HH__ -#include "tlm_core/2/generic_payload/endian_conv.hh" -#include "tlm_core/2/generic_payload/gp.hh" -#include "tlm_core/2/generic_payload/helpers.hh" -#include "tlm_core/2/generic_payload/phase.hh" +#include "endian_conv.hh" +#include "gp.hh" +#include "helpers.hh" +#include "phase.hh" #endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_HH__ */ diff --git a/src/systemc/ext/tlm_core/2/generic_payload/gp.hh b/src/systemc/ext/tlm_core/2/generic_payload/gp.hh index 80ceb6a20..63db3a76b 100644 --- a/src/systemc/ext/tlm_core/2/generic_payload/gp.hh +++ b/src/systemc/ext/tlm_core/2/generic_payload/gp.hh @@ -20,10 +20,10 @@ #ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_HH__ #define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_HH__ -#include <systemc> #include <typeinfo> // std::type_info -#include "tlm_core/2/generic_payload/array.hh" +#include "../../../utils/sc_report_handler.hh" // sc_assert +#include "array.hh" namespace tlm { diff --git a/src/systemc/ext/tlm_core/2/interfaces/dmi.hh b/src/systemc/ext/tlm_core/2/interfaces/dmi.hh index b00f0990c..9450993ac 100644 --- a/src/systemc/ext/tlm_core/2/interfaces/dmi.hh +++ b/src/systemc/ext/tlm_core/2/interfaces/dmi.hh @@ -20,7 +20,8 @@ #ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_HH__ #define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_HH__ -#include <systemc> +#include "../../../core/sc_time.hh" +#include "../../../dt/int/sc_nbdefs.hh" namespace tlm { diff --git a/src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.hh b/src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.hh index 76946532d..51621f4f8 100644 --- a/src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.hh +++ b/src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.hh @@ -20,10 +20,10 @@ #ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_HH__ #define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_HH__ -#include <systemc> - -#include "tlm_core/2/generic_payload/generic_payload.hh" -#include "tlm_core/2/interfaces/dmi.hh" +#include "../../../core/sc_interface.hh" +#include "../../../core/sc_time.hh" +#include "../generic_payload/generic_payload.hh" +#include "dmi.hh" namespace tlm { diff --git a/src/systemc/ext/tlm_core/2/interfaces/interfaces.hh b/src/systemc/ext/tlm_core/2/interfaces/interfaces.hh index 888683473..6bd5b5687 100644 --- a/src/systemc/ext/tlm_core/2/interfaces/interfaces.hh +++ b/src/systemc/ext/tlm_core/2/interfaces/interfaces.hh @@ -20,7 +20,7 @@ #ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_HH__ #define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_HH__ -#include "tlm_core/2/interfaces/dmi.hh" -#include "tlm_core/2/interfaces/fw_bw_ifs.hh" +#include "dmi.hh" +#include "fw_bw_ifs.hh" #endif /* __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_HH__ */ diff --git a/src/systemc/ext/tlm_core/2/quantum/global_quantum.hh b/src/systemc/ext/tlm_core/2/quantum/global_quantum.hh index 5b6e267d1..ab9a5b117 100644 --- a/src/systemc/ext/tlm_core/2/quantum/global_quantum.hh +++ b/src/systemc/ext/tlm_core/2/quantum/global_quantum.hh @@ -20,7 +20,7 @@ #ifndef __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_HH__ #define __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_HH__ -#include <systemc> +#include "../../../core/sc_time.hh" namespace tlm { diff --git a/src/systemc/ext/tlm_core/2/quantum/quantum.hh b/src/systemc/ext/tlm_core/2/quantum/quantum.hh index b46047e63..9d5340033 100644 --- a/src/systemc/ext/tlm_core/2/quantum/quantum.hh +++ b/src/systemc/ext/tlm_core/2/quantum/quantum.hh @@ -20,6 +20,6 @@ #ifndef ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_HH__ #define ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_HH__ -#include "tlm_core/2/quantum/global_quantum.hh" +#include "global_quantum.hh" #endif /* ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_HH__ */ diff --git a/src/systemc/ext/tlm_core/2/sockets/base_socket_if.hh b/src/systemc/ext/tlm_core/2/sockets/base_socket_if.hh index a494b683f..fd2e277c1 100644 --- a/src/systemc/ext/tlm_core/2/sockets/base_socket_if.hh +++ b/src/systemc/ext/tlm_core/2/sockets/base_socket_if.hh @@ -20,9 +20,11 @@ #ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_BASE_SOCKET_IF_H__ #define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_BASE_SOCKET_IF_H__ -#include <systemc> #include <typeindex> +#include "../../../core/sc_export.hh" +#include "../../../core/sc_port.hh" + namespace tlm { diff --git a/src/systemc/ext/tlm_core/2/sockets/initiator_socket.hh b/src/systemc/ext/tlm_core/2/sockets/initiator_socket.hh index a7c53cc33..71fbf1b90 100644 --- a/src/systemc/ext/tlm_core/2/sockets/initiator_socket.hh +++ b/src/systemc/ext/tlm_core/2/sockets/initiator_socket.hh @@ -22,8 +22,8 @@ #include <typeindex> -#include "tlm_core/2/interfaces/fw_bw_ifs.hh" -#include "tlm_core/2/sockets/base_socket_if.hh" +#include "../interfaces/fw_bw_ifs.hh" +#include "base_socket_if.hh" namespace tlm { diff --git a/src/systemc/ext/tlm_core/2/sockets/sockets.hh b/src/systemc/ext/tlm_core/2/sockets/sockets.hh index 781c51a26..7a2ea308a 100644 --- a/src/systemc/ext/tlm_core/2/sockets/sockets.hh +++ b/src/systemc/ext/tlm_core/2/sockets/sockets.hh @@ -20,7 +20,7 @@ #ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_HH__ #define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_HH__ -#include "tlm_core/2/sockets/initiator_socket.hh" -#include "tlm_core/2/sockets/target_socket.hh" +#include "initiator_socket.hh" +#include "target_socket.hh" #endif /* __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_HH__ */ diff --git a/src/systemc/ext/tlm_core/2/sockets/target_socket.hh b/src/systemc/ext/tlm_core/2/sockets/target_socket.hh index 4ca31c9b9..5a0e5ff9e 100644 --- a/src/systemc/ext/tlm_core/2/sockets/target_socket.hh +++ b/src/systemc/ext/tlm_core/2/sockets/target_socket.hh @@ -22,8 +22,8 @@ #include <typeindex> -#include "tlm_core/2/interfaces/fw_bw_ifs.hh" -#include "tlm_core/2/sockets/base_socket_if.hh" +#include "../interfaces/fw_bw_ifs.hh" +#include "base_socket_if.hh" namespace tlm { |