sinic.cc (11701:5e7599457b97) | sinic.cc (11719:e832056deaed) |
---|---|
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; --- 1482 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) { | 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; --- 1482 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) { |
1499 txPacket = make_shared | 1499 txPacket = make_shared<EthPacketData>(16384); |
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 --- | 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 --- |