diff options
| -rw-r--r-- | src/utils/tlm_initiator_socket_tagged.h | 8 | ||||
| -rw-r--r-- | src/utils/tlm_target_socket_tagged.h | 13 |
2 files changed, 12 insertions, 9 deletions
diff --git a/src/utils/tlm_initiator_socket_tagged.h b/src/utils/tlm_initiator_socket_tagged.h index f85ed91..194de61 100644 --- a/src/utils/tlm_initiator_socket_tagged.h +++ b/src/utils/tlm_initiator_socket_tagged.h @@ -1,18 +1,20 @@ #ifndef SYSC_PLAYGROUND_TAGGED_INITIATOR #define SYSC_PLAYGROUND_TAGGED_INITIATOR +#include "utils/types.h" + #include <tlm_core/tlm_2/tlm_sockets/tlm_initiator_socket.h> template <typename Module> class tlm_initiator_socket_tagged : public tlm::tlm_initiator_socket<>, public tlm::tlm_bw_transport_if<> { - using cb_invalidate_direct_mem_ptr = void (Module::*)(std::size_t, + using cb_invalidate_direct_mem_ptr = void (Module::*)(usize, sc_dt::uint64, sc_dt::uint64); public: explicit tlm_initiator_socket_tagged(const char* name, - std::size_t id, + usize id, Module* mod, cb_invalidate_direct_mem_ptr i) : tlm_initiator_socket<>{name}, @@ -40,7 +42,7 @@ class tlm_initiator_socket_tagged : public tlm::tlm_initiator_socket<>, // -- MEMBER ----------------------------------------------------------------- - std::size_t m_id{0}; + usize m_id{0}; Module* m_mod{nullptr}; cb_invalidate_direct_mem_ptr m_invalidate_direct_mem_ptr{nullptr}; }; diff --git a/src/utils/tlm_target_socket_tagged.h b/src/utils/tlm_target_socket_tagged.h index 99ed547..d8ca155 100644 --- a/src/utils/tlm_target_socket_tagged.h +++ b/src/utils/tlm_target_socket_tagged.h @@ -1,24 +1,25 @@ #ifndef SYSC_PLAYGROUND_TAGGED_TARGET #define SYSC_PLAYGROUND_TAGGED_TARGET +#include "utils/types.h" + #include <tlm_core/tlm_2/tlm_sockets/tlm_target_socket.h> template <typename Module> class tlm_target_socket_tagged : public tlm::tlm_target_socket<>, public tlm::tlm_fw_transport_if<> { - using cb_b_transport = void (Module::*)(std::size_t, + using cb_b_transport = void (Module::*)(usize, tlm::tlm_generic_payload&, sc_core::sc_time&); - - using cb_get_direct_mem_ptr = bool (Module::*)(std::size_t, + using cb_get_direct_mem_ptr = bool (Module::*)(usize, tlm::tlm_generic_payload&, tlm::tlm_dmi&); - using cb_transport_dbg = unsigned int (Module::*)(std::size_t, + using cb_transport_dbg = unsigned int (Module::*)(usize, tlm::tlm_generic_payload&); public: explicit tlm_target_socket_tagged(const char* name, - std::size_t id, + usize id, Module* mod, cb_b_transport b, cb_get_direct_mem_ptr m, @@ -59,7 +60,7 @@ class tlm_target_socket_tagged : public tlm::tlm_target_socket<>, // -- MEMBER ----------------------------------------------------------------- - std::size_t m_id{0}; + usize m_id{0}; Module* m_mod{nullptr}; cb_b_transport m_b_transport{nullptr}; cb_get_direct_mem_ptr m_get_direct_mem_ptr{nullptr}; |