projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make benchmarks.ini a bit less confusing
[gem5.git]
/
dev
/
ns_gige.hh
diff --git
a/dev/ns_gige.hh
b/dev/ns_gige.hh
index 5f023dcccd35aeaf2978b3f0c54e21c5f84855f0..90711d63fc3e72e4b908d5d553187e1548a0ce0e 100644
(file)
--- a/
dev/ns_gige.hh
+++ b/
dev/ns_gige.hh
@@
-41,6
+41,7
@@
#include "dev/io_device.hh"
#include "dev/ns_gige_reg.h"
#include "dev/pcidev.hh"
#include "dev/io_device.hh"
#include "dev/ns_gige_reg.h"
#include "dev/pcidev.hh"
+#include "dev/pktfifo.hh"
#include "mem/bus/bus.hh"
#include "sim/eventq.hh"
#include "mem/bus/bus.hh"
#include "sim/eventq.hh"
@@
-158,10
+159,8
@@
class NSGigE : public PciDev
/*** BASIC STRUCTURES FOR TX/RX ***/
/* Data FIFOs */
/*** BASIC STRUCTURES FOR TX/RX ***/
/* Data FIFOs */
- pktbuf_t txFifo;
- uint32_t maxTxFifoSize;
- pktbuf_t rxFifo;
- uint32_t maxRxFifoSize;
+ PacketFifo txFifo;
+ PacketFifo rxFifo;
/** various helper vars */
PacketPtr txPacket;
/** various helper vars */
PacketPtr txPacket;
@@
-183,8
+182,6
@@
class NSGigE : public PciDev
/** Current Transmit Descriptor Done */
bool CTDD;
/** Current Transmit Descriptor Done */
bool CTDD;
- /** current amt of free space in txDataFifo in bytes */
- uint32_t txFifoAvail;
/** halt the tx state machine after next packet */
bool txHalt;
/** ptr to the next byte in the current fragment */
/** halt the tx state machine after next packet */
bool txHalt;
/** ptr to the next byte in the current fragment */
@@
-201,8
+198,6
@@
class NSGigE : public PciDev
bool CRDD;
/** num of bytes in the current packet being drained from rxDataFifo */
uint32_t rxPktBytes;
bool CRDD;
/** num of bytes in the current packet being drained from rxDataFifo */
uint32_t rxPktBytes;
- /** number of bytes in the rxFifo */
- uint32_t rxFifoCnt;
/** halt the rx state machine after current packet */
bool rxHalt;
/** ptr to the next byte in current fragment */
/** halt the rx state machine after current packet */
bool rxHalt;
/** ptr to the next byte in current fragment */
@@
-295,7
+290,7
@@
class NSGigE : public PciDev
* receive address filter
*/
bool rxFilterEnable;
* receive address filter
*/
bool rxFilterEnable;
- bool rxFilter(PacketPtr &packet);
+ bool rxFilter(
const
PacketPtr &packet);
bool acceptBroadcast;
bool acceptMulticast;
bool acceptUnicast;
bool acceptBroadcast;
bool acceptMulticast;
bool acceptUnicast;
@@
-360,7
+355,7
@@
class NSGigE : public PciDev
bool cpuIntrPending() const;
void cpuIntrAck() { cpuIntrClear(); }
bool cpuIntrPending() const;
void cpuIntrAck() { cpuIntrClear(); }
- bool recvPacket(PacketPtr
&
packet);
+ bool recvPacket(PacketPtr packet);
void transferDone();
void setInterface(NSGigEInt *i) { assert(!interface); interface = i; }
void transferDone();
void setInterface(NSGigEInt *i) { assert(!interface); interface = i; }
@@
-407,7
+402,7
@@
class NSGigEInt : public EtherInt
NSGigEInt(const std::string &name, NSGigE *d)
: EtherInt(name), dev(d) { dev->setInterface(this); }
NSGigEInt(const std::string &name, NSGigE *d)
: EtherInt(name), dev(d) { dev->setInterface(this); }
- virtual bool recvPacket(PacketPtr
&
pkt) { return dev->recvPacket(pkt); }
+ virtual bool recvPacket(PacketPtr pkt) { return dev->recvPacket(pkt); }
virtual void sendDone() { dev->transferDone(); }
};
virtual void sendDone() { dev->transferDone(); }
};