sinic.cc (11299:72046b9b3323) sinic.cc (11701:5e7599457b97)
1/*
2 * Copyright (c) 2004-2005 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 1071 unchanged lines hidden (view full) ---

1080 break;
1081
1082 case txCopy:
1083 DPRINTF(EthernetSM, "transmit machine still copying\n");
1084 goto exit;
1085
1086 case txCopyDone:
1087 vnic->TxDone = txDmaLen | Regs::TxDone_Complete;
1/*
2 * Copyright (c) 2004-2005 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 1071 unchanged lines hidden (view full) ---

1080 break;
1081
1082 case txCopy:
1083 DPRINTF(EthernetSM, "transmit machine still copying\n");
1084 goto exit;
1085
1086 case txCopyDone:
1087 vnic->TxDone = txDmaLen | Regs::TxDone_Complete;
1088 txPacket->simLength += txDmaLen;
1088 txPacket->length += txDmaLen;
1089 if ((vnic->TxData & Regs::TxData_More)) {
1090 txPacketOffset += txDmaLen;
1091 txState = txIdle;
1092 devIntrPost(Regs::Intr_TxDMA);
1093 break;
1094 }
1095

--- 394 unchanged lines hidden (view full) ---

1490 UNSERIALIZE_SCALAR(txState);
1491 UNSERIALIZE_SCALAR(txFull);
1492 this->txState = (TxState) txState;
1493 txFifo.unserialize("txFifo", cp);
1494 bool txPacketExists;
1495 UNSERIALIZE_SCALAR(txPacketExists);
1496 txPacket = 0;
1497 if (txPacketExists) {
1089 txPacket->length += txDmaLen;
1090 if ((vnic->TxData & Regs::TxData_More)) {
1091 txPacketOffset += txDmaLen;
1092 txState = txIdle;
1093 devIntrPost(Regs::Intr_TxDMA);
1094 break;
1095 }
1096

--- 394 unchanged lines hidden (view full) ---

1491 UNSERIALIZE_SCALAR(txState);
1492 UNSERIALIZE_SCALAR(txFull);
1493 this->txState = (TxState) txState;
1494 txFifo.unserialize("txFifo", cp);
1495 bool txPacketExists;
1496 UNSERIALIZE_SCALAR(txPacketExists);
1497 txPacket = 0;
1498 if (txPacketExists) {
1498 txPacket = make_shared<EthPacketData>(16384);
1499 txPacket = make_shared();
1499 txPacket->unserialize("txPacket", cp);
1500 UNSERIALIZE_SCALAR(txPacketOffset);
1501 UNSERIALIZE_SCALAR(txPacketBytes);
1502 }
1503
1504 /*
1505 * unserialize the virtual nic registers/state
1506 *

--- 56 unchanged lines hidden --- 		1500 txPacket->unserialize("txPacket", cp);
1501 UNSERIALIZE_SCALAR(txPacketOffset);
1502 UNSERIALIZE_SCALAR(txPacketBytes);
1503 }
1504
1505 /*
1506 * unserialize the virtual nic registers/state
1507 *

--- 56 unchanged lines hidden ---