Merge zizzer.eecs.umich.edu:/bk/m5

into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : bc9d5460bc3b5aed0f1bf0e4aa6d5aed06598e74
This commit is contained in:
Nathan Binkert 2004-11-17 21:04:02 -05:00
commit 42de71bc9d

View file

@ -2166,6 +2166,7 @@ NSGigE::serialize(ostream &os)
SERIALIZE_SCALAR(rxEnable); SERIALIZE_SCALAR(rxEnable);
SERIALIZE_SCALAR(CRDD); SERIALIZE_SCALAR(CRDD);
SERIALIZE_SCALAR(rxPktBytes); SERIALIZE_SCALAR(rxPktBytes);
SERIALIZE_SCALAR(rxFragPtr);
SERIALIZE_SCALAR(rxDescCnt); SERIALIZE_SCALAR(rxDescCnt);
int rxDmaState = this->rxDmaState; int rxDmaState = this->rxDmaState;
SERIALIZE_SCALAR(rxDmaState); SERIALIZE_SCALAR(rxDmaState);
@ -2314,6 +2315,7 @@ NSGigE::unserialize(Checkpoint *cp, const std::string &section)
UNSERIALIZE_SCALAR(rxEnable); UNSERIALIZE_SCALAR(rxEnable);
UNSERIALIZE_SCALAR(CRDD); UNSERIALIZE_SCALAR(CRDD);
UNSERIALIZE_SCALAR(rxPktBytes); UNSERIALIZE_SCALAR(rxPktBytes);
UNSERIALIZE_SCALAR(rxFragPtr);
UNSERIALIZE_SCALAR(rxDescCnt); UNSERIALIZE_SCALAR(rxDescCnt);
int rxDmaState; int rxDmaState;
UNSERIALIZE_SCALAR(rxDmaState); UNSERIALIZE_SCALAR(rxDmaState);