diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-02-04 18:25:49 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-02-04 18:25:49 -0500 |
| commit | 1e7a744c09d0bde70e0f83179fdf4d6059585e4b (patch) | |
| tree | 9bbc7713c4bb79abb3f76b07547d8822f0557caa /dev/etherlink.hh | |
| parent | c389c2e327cc3ee1c988855b05505660c6670172 (diff) | |
| parent | b78d7c2f16dac11ed468de45a088a362605c6493 (diff) | |
| download | gem5-1e7a744c09d0bde70e0f83179fdf4d6059585e4b.tar.xz | |
Hand merge
--HG--
extra : convert_revision : 86c7399b79c17558041a73056745227f70fe8b3b
Diffstat (limited to 'dev/etherlink.hh')
| -rw-r--r-- | dev/etherlink.hh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dev/etherlink.hh b/dev/etherlink.hh index e998a006f..d5cd7d7c8 100644 --- a/dev/etherlink.hh +++ b/dev/etherlink.hh @@ -30,13 +30,13 @@ * Device module for modelling a fixed bandwidth full duplex ethernet link */ -#ifndef __ETHERLINK_HH__ -#define __ETHERLINK_HH__ +#ifndef __DEV_ETHERLINK_HH__ +#define __DEV_ETHERLINK_HH__ -#include "sim/host.hh" -#include "sim/eventq.hh" #include "dev/etherint.hh" #include "dev/etherpkt.hh" +#include "sim/eventq.hh" +#include "sim/host.hh" #include "sim/sim_object.hh" class EtherDump; @@ -71,7 +71,7 @@ class EtherLink : public SimObject PacketPtr packet; void txDone(); typedef EventWrapper<Link, &Link::txDone> DoneEvent; - friend class DoneEvent; + friend void DoneEvent::process(); DoneEvent doneEvent; friend class LinkDelayEvent; |