diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-07-06 14:54:09 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-07-06 14:54:09 -0400 |
| commit | c8a37ce71514de9362640e8cb18c1744f0e2f83b (patch) | |
| tree | 70eb71e46428c20bd6a44eed1d08a019abb70e25 /src/dev/ns_gige.hh | |
| parent | 05eef5ee1569f7a1c399a2b358a11323e88a48f8 (diff) | |
| parent | 4b741100714c6f20749f344ddd4b16459f28df72 (diff) | |
| download | gem5-c8a37ce71514de9362640e8cb18c1744f0e2f83b.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
--HG--
extra : convert_revision : 0c4fbbe0826358a6a58f844bec34ce830ffd4ced
Diffstat (limited to 'src/dev/ns_gige.hh')
| -rw-r--r-- | src/dev/ns_gige.hh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/dev/ns_gige.hh b/src/dev/ns_gige.hh index 2f47026f3..ea7243777 100644 --- a/src/dev/ns_gige.hh +++ b/src/dev/ns_gige.hh @@ -114,7 +114,6 @@ struct dp_rom { class NSGigEInt; class Packet; -class PciConfigAll; /** * NS DP83820 Ethernet device model @@ -376,7 +375,7 @@ class NSGigE : public PciDev ~NSGigE(); const Params *params() const { return (const Params *)_params; } - virtual void writeConfig(int offset, const uint16_t data); + virtual Tick writeConfig(Packet *pkt); virtual Tick read(Packet *pkt); virtual Tick write(Packet *pkt); |