sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

IDE: Fix serialization for the IDE controller.

Browse source
This commit is contained in:
Richard Strong 2008-12-09 10:34:08 -08:00
parent d0c0c25ebc
commit dae531c049
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/dev/ide_ctrl.cc
View file

@ -524,9 +524,11 @@ IdeController::Channel::serialize(std::ostream &os)
SERIALIZE_SCALAR(cmdSize); SERIALIZE_SCALAR(cmdSize);
SERIALIZE_SCALAR(ctrlAddr); SERIALIZE_SCALAR(ctrlAddr);
SERIALIZE_SCALAR(ctrlSize); SERIALIZE_SCALAR(ctrlSize);
SERIALIZE_SCALAR((uint8_t)bmiRegs.command); uint8_t command = bmiRegs.command;
SERIALIZE_SCALAR(command);
SERIALIZE_SCALAR(bmiRegs.reserved0); SERIALIZE_SCALAR(bmiRegs.reserved0);
SERIALIZE_SCALAR((uint8_t)bmiRegs.status); uint8_t status = bmiRegs.status;
SERIALIZE_SCALAR(status);
SERIALIZE_SCALAR(bmiRegs.reserved1); SERIALIZE_SCALAR(bmiRegs.reserved1);
SERIALIZE_SCALAR(bmiRegs.bmidtp); SERIALIZE_SCALAR(bmiRegs.bmidtp);
SERIALIZE_SCALAR(selectBit); SERIALIZE_SCALAR(selectBit);
@ -559,16 +561,17 @@ void
IdeController::Channel::unserialize( IdeController::Channel::unserialize(
Checkpoint *cp, const std::string &section) Checkpoint *cp, const std::string &section)
{ {
uint8_t temp;
UNSERIALIZE_SCALAR(cmdAddr); UNSERIALIZE_SCALAR(cmdAddr);
UNSERIALIZE_SCALAR(cmdSize); UNSERIALIZE_SCALAR(cmdSize);
UNSERIALIZE_SCALAR(ctrlAddr); UNSERIALIZE_SCALAR(ctrlAddr);
UNSERIALIZE_SCALAR(ctrlSize); UNSERIALIZE_SCALAR(ctrlSize);
UNSERIALIZE_SCALAR(temp); uint8_t command;
bmiRegs.command = temp; UNSERIALIZE_SCALAR(command);
bmiRegs.command = command;
UNSERIALIZE_SCALAR(bmiRegs.reserved0); UNSERIALIZE_SCALAR(bmiRegs.reserved0);
UNSERIALIZE_SCALAR(temp); uint8_t status;
bmiRegs.status = temp; UNSERIALIZE_SCALAR(status);
bmiRegs.status = status;
UNSERIALIZE_SCALAR(bmiRegs.reserved1); UNSERIALIZE_SCALAR(bmiRegs.reserved1);
UNSERIALIZE_SCALAR(bmiRegs.bmidtp); UNSERIALIZE_SCALAR(bmiRegs.bmidtp);
UNSERIALIZE_SCALAR(selectBit); UNSERIALIZE_SCALAR(selectBit);