diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2006-10-20 13:00:15 -0400 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-10-20 13:00:15 -0400 |
commit | 7be58fd5f4c3f9f112b19de3a81861bded21acb0 (patch) | |
tree | ad9ca8f688f1e57d9af1b900c712224b050fb462 /src/dev/i8254xGBe.hh | |
parent | a4c6f0d69eda5d23b12576080d532ddf768fbdbe (diff) | |
parent | 32384b2f6be42016f7bd92c9cfca591314f68e5e (diff) | |
download | gem5-7be58fd5f4c3f9f112b19de3a81861bded21acb0.tar.xz |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem.head
--HG--
extra : convert_revision : c0f9bde20585b3811ff906728b003072b69696b5
Diffstat (limited to 'src/dev/i8254xGBe.hh')
-rw-r--r-- | src/dev/i8254xGBe.hh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/dev/i8254xGBe.hh b/src/dev/i8254xGBe.hh index 161d8befc..ce4007263 100644 --- a/src/dev/i8254xGBe.hh +++ b/src/dev/i8254xGBe.hh @@ -39,6 +39,7 @@ #include "base/statistics.hh" #include "dev/etherint.hh" #include "dev/etherpkt.hh" +#include "dev/i8254xGBe_defs.hh" #include "dev/pcidev.hh" #include "dev/pktfifo.hh" #include "sim/eventq.hh" @@ -49,6 +50,12 @@ class IGbE : public PciDev { private: IGbEInt *etherInt; + iGbReg::Regs regs; + int eeOpBits, eeAddrBits, eeDataBits; + uint8_t eeOpcode, eeAddr; + + uint16_t flash[iGbReg::EEPROM_SIZE]; + public: struct Params : public PciDev::Params |