diff options
author | Sean Wilson <spwilson2@wisc.edu> | 2017-06-07 16:32:15 -0500 |
---|---|---|
committer | Sean Wilson <spwilson2@wisc.edu> | 2017-06-20 18:03:21 +0000 |
commit | c8668a663992264911545f8001d462e0885b114c (patch) | |
tree | b91e2fd0b64f01f4606b4d3c9efae91623276652 /src/dev/net/sinic.hh | |
parent | 475f613f2661f3be5f7479c5c7229e5adcb74d93 (diff) | |
download | gem5-c8668a663992264911545f8001d462e0885b114c.tar.xz |
dev: Replace EventWrapper use with EventFunctionWrapper
Change-Id: I6b03cc6f67e76dffb79940431711ae6171901c6a
Signed-off-by: Sean Wilson <spwilson2@wisc.edu>
Reviewed-on: https://gem5-review.googlesource.com/3748
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/dev/net/sinic.hh')
-rw-r--r-- | src/dev/net/sinic.hh | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/dev/net/sinic.hh b/src/dev/net/sinic.hh index b041cb16d..70d22f12d 100644 --- a/src/dev/net/sinic.hh +++ b/src/dev/net/sinic.hh @@ -61,9 +61,7 @@ class Base : public EtherDevBase void cpuInterrupt(); void cpuIntrClear(); - typedef EventWrapper<Base, &Base::cpuInterrupt> IntrEvent; - friend void IntrEvent::process(); - IntrEvent *intrEvent; + EventFunctionWrapper *intrEvent; Interface *interface; bool cpuIntrPending() const; @@ -196,13 +194,9 @@ class Device : public Base void rxKick(); Tick rxKickTick; - typedef EventWrapper<Device, &Device::rxKick> RxKickEvent; - friend void RxKickEvent::process(); void txKick(); Tick txKickTick; - typedef EventWrapper<Device, &Device::txKick> TxKickEvent; - friend void TxKickEvent::process(); /** * Retransmit event @@ -214,9 +208,7 @@ class Device : public Base if (txState == txFifoBlock) txKick(); } - typedef EventWrapper<Device, &Device::txEventTransmit> TxEvent; - friend void TxEvent::process(); - TxEvent txEvent; + EventFunctionWrapper txEvent; void txDump() const; void rxDump() const; @@ -245,12 +237,10 @@ class Device : public Base */ protected: void rxDmaDone(); - friend class EventWrapper<Device, &Device::rxDmaDone>; - EventWrapper<Device, &Device::rxDmaDone> rxDmaEvent; + EventFunctionWrapper rxDmaEvent; void txDmaDone(); - friend class EventWrapper<Device, &Device::txDmaDone>; - EventWrapper<Device, &Device::txDmaDone> txDmaEvent; + EventFunctionWrapper txDmaEvent; Tick dmaReadDelay; Tick dmaReadFactor; |