ns_gige.cc (11701:5e7599457b97) ns_gige.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;

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

2347 txFifo.unserialize("txFifo", cp);
2348
2349 /*
2350 * unserialize the various helper variables
2351 */
2352 bool txPacketExists;
2353 UNSERIALIZE_SCALAR(txPacketExists);
2354 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;

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

2347 txFifo.unserialize("txFifo", cp);
2348
2349 /*
2350 * unserialize the various helper variables
2351 */
2352 bool txPacketExists;
2353 UNSERIALIZE_SCALAR(txPacketExists);
2354 if (txPacketExists) {
2355 txPacket = make_shared();
2355 txPacket = make_shared<EthPacketData>(16384);
2356 txPacket->unserialize("txPacket", cp);
2357 uint32_t txPktBufPtr;
2358 UNSERIALIZE_SCALAR(txPktBufPtr);
2359 txPacketBufPtr = (uint8_t *) txPacket->data + txPktBufPtr;
2360 } else
2361 txPacket = 0;
2362
2363 bool rxPacketExists;

--- 119 unchanged lines hidden --- 		2356 txPacket->unserialize("txPacket", cp);
2357 uint32_t txPktBufPtr;
2358 UNSERIALIZE_SCALAR(txPktBufPtr);
2359 txPacketBufPtr = (uint8_t *) txPacket->data + txPktBufPtr;
2360 } else
2361 txPacket = 0;
2362
2363 bool rxPacketExists;

--- 119 unchanged lines hidden ---