diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2005-02-09 12:56:24 -0500 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2005-02-09 12:56:24 -0500 |
| commit | 230a5a608dfb2204e2886a795e6bd8a30224b84f (patch) | |
| tree | 81d312257237c4d13ad44836d55d2f192a479036 /dev/etherlink.hh | |
| parent | d9317dd348f3acd853d1e6a09c09f2a27ad5d707 (diff) | |
| parent | c4089562d5add225cd8275b59456eb7eb559b988 (diff) | |
| download | gem5-230a5a608dfb2204e2886a795e6bd8a30224b84f.tar.xz | |
Merger
cpu/simple_cpu/simple_cpu.hh:
Merge
--HG--
extra : convert_revision : 1b6003ac731051fefacb7d7a30c317553b4bf1bc
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; |