Merge branch 'master' into develop
Conflicts: .cproject .settings/language.settings.xml CMakeLists.txt examples/simple_system/gpio.cpp examples/simple_system/plic.cpp sc-components
This commit is contained in:
@@ -10,8 +10,8 @@
|
||||
|
||||
#include <systemc>
|
||||
#include "packet.h"
|
||||
#include <scc/tagged_initiator_mixin.h>
|
||||
#include <scc/tagged_target_mixin.h>
|
||||
#include <tlm/scc/tagged_initiator_mixin.h>
|
||||
#include <tlm/scc/tagged_target_mixin.h>
|
||||
#include <scc/sc_owning_signal.h>
|
||||
#include <array>
|
||||
|
||||
@@ -20,8 +20,8 @@ class pkt_switch : sc_core::sc_module {
|
||||
public:
|
||||
enum {NONE=std::numeric_limits<unsigned>::max()};
|
||||
sc_core::sc_in<bool> clk_i{"clk_i"};
|
||||
sc_core::sc_vector<scc::tagged_target_mixin<tlm::tlm_target_socket<32>>> tsck{"tsck",4};
|
||||
sc_core::sc_vector<scc::tagged_initiator_mixin<tlm::tlm_initiator_socket<32>>> isck{"isck",4};
|
||||
sc_core::sc_vector<tlm::scc::tagged_target_mixin<tlm::tlm_target_socket<32>>> tsck{"tsck",4};
|
||||
sc_core::sc_vector<tlm::scc::tagged_initiator_mixin<tlm::tlm_initiator_socket<32>>> isck{"isck",4};
|
||||
pkt_switch(sc_core::sc_module_name const&);
|
||||
virtual ~pkt_switch() = default;
|
||||
private:
|
||||
|
Reference in New Issue
Block a user