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:
2021-06-01 18:21:49 +02:00
22 changed files with 89 additions and 143 deletions

View File

@@ -10,15 +10,15 @@
#include <systemc>
#include "packet.h"
#include <scc/initiator_mixin.h>
#include <scc/target_mixin.h>
#include <tlm/scc/initiator_mixin.h>
#include <tlm/scc/target_mixin.h>
class pkt_sender : sc_core::sc_module {
public:
sc_core::sc_in<bool> clk_i{"clk_i"};
scc::initiator_mixin<tlm::tlm_initiator_socket<32>> isck;
scc::target_mixin<tlm::tlm_target_socket<32>> tsck;
tlm::scc::initiator_mixin<tlm::tlm_initiator_socket<32>> isck;
tlm::scc::target_mixin<tlm::tlm_target_socket<32>> tsck;
pkt_sender(sc_core::sc_module_name const&, unsigned dim, unsigned pos_x, unsigned pos_y, unsigned count);
virtual ~pkt_sender() = default;
sc_core::sc_event const& get_finish_event(){return finish_evt;}