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:
@@ -8,7 +8,7 @@
|
||||
#include "pkt_sender.h"
|
||||
#include "types.h"
|
||||
#include <scc/report.h>
|
||||
#include <tlm/tlm_mm.h>
|
||||
#include <tlm/scc/tlm_mm.h>
|
||||
|
||||
using namespace sc_core;
|
||||
|
||||
@@ -54,7 +54,7 @@ void pkt_sender::gen_routing(std::vector<uint8_t> &route_vec) {
|
||||
void pkt_sender::run() {
|
||||
wait(clk_i.posedge_event());
|
||||
for(auto i=0U; i<count; i++){
|
||||
tlm::tlm_generic_payload* gp = tlm::tlm_mm<>::get().allocate<packet_ext>();
|
||||
tlm::tlm_generic_payload* gp = tlm::scc::tlm_mm<>::get().allocate<packet_ext>();
|
||||
gen_routing(gp->get_extension<packet_ext>()->routing);
|
||||
tlm::tlm_phase phase{tlm::BEGIN_REQ};
|
||||
sc_time delay;
|
||||
|
Reference in New Issue
Block a user