X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fdev%2Fetherbus.cc;h=c9e9c93ba9895395d2ad878eacbfd532abf50c02;hb=bcb71963ebb3c226f4f36f6d5907c6fb3bc10b64;hp=2316bfed95cde3e940488743a16aad782a722970;hpb=773cb77656174b221c1e51b92a8af7d8e268b733;p=gem5.git diff --git a/src/dev/etherbus.cc b/src/dev/etherbus.cc index 2316bfed9..c9e9c93ba 100644 --- a/src/dev/etherbus.cc +++ b/src/dev/etherbus.cc @@ -38,6 +38,8 @@ #include #include "base/trace.hh" +#include "debug/Ethernet.hh" +#include "debug/EthernetData.hh" #include "dev/etherbus.hh" #include "dev/etherdump.hh" #include "dev/etherint.hh" @@ -49,7 +51,7 @@ using namespace std; EtherBus::EtherBus(const Params *p) : EtherObject(p), ticksPerByte(p->speed), loopback(p->loopback), - event(&mainEventQueue, this), sender(0), dump(p->dump) + event(this), sender(0), dump(p->dump) { } @@ -87,7 +89,7 @@ bool EtherBus::send(EtherInt *sndr, EthPacketPtr &pkt) { if (busy()) { - DPRINTF(Ethernet, "ethernet packet not sent, bus busy\n", curTick); + DPRINTF(Ethernet, "ethernet packet not sent, bus busy\n", curTick()); return false; } @@ -99,7 +101,7 @@ EtherBus::send(EtherInt *sndr, EthPacketPtr &pkt) int delay = (int)ceil(((double)pkt->length * ticksPerByte) + 1.0); DPRINTF(Ethernet, "scheduling packet: delay=%d, (rate=%f)\n", delay, ticksPerByte); - event.schedule(curTick + delay); + schedule(event, curTick() + delay); return true; }