diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2007-03-15 15:16:35 -0400 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-03-15 15:16:35 -0400 |
commit | c6e1dc61c23dc1f5300610ce8348f9a0e9c128cc (patch) | |
tree | e044c5007a2e7e7bad6e14afee930f5626eebdec /src/dev/i8254xGBe.hh | |
parent | 47c8d9d3462db91cb296f8f42b2c401e736d4daa (diff) | |
parent | 3a5a20769b2ba15905fc2e0a833a8ecbf3098646 (diff) | |
download | gem5-c6e1dc61c23dc1f5300610ce8348f9a0e9c128cc.tar.xz |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : 6a75fa02391c4c65063c5412a568705bb1dd892b
Diffstat (limited to 'src/dev/i8254xGBe.hh')
-rw-r--r-- | src/dev/i8254xGBe.hh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dev/i8254xGBe.hh b/src/dev/i8254xGBe.hh index ce4007263..fa9e65b22 100644 --- a/src/dev/i8254xGBe.hh +++ b/src/dev/i8254xGBe.hh @@ -54,13 +54,15 @@ class IGbE : public PciDev int eeOpBits, eeAddrBits, eeDataBits; uint8_t eeOpcode, eeAddr; + bool useFlowControl; + uint16_t flash[iGbReg::EEPROM_SIZE]; public: struct Params : public PciDev::Params { - ; + bool use_flow_control; }; IGbE(Params *params); |