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

Changed name of lisa's device to NSgigE instead of Etherdev so it

Browse source 
doesn't conflict with the old ethernet driver name.

Added config file to try to boot Tru64 with Tsunami

Cleaned up kern/linux a bit more and fixed bug where we were using
Tru64 system calls

dev/ns_gige.cc:
dev/ns_gige.hh:
dev/tsunami.hh:
    Changed name of lisa's device to NSgigE instead of Etherdev so it
    doesn't conflict with the old ethernet driver name.
kern/linux/linux_syscalls.hh:
    the Syscalls still used the Tru64 calls, oops.. fixed.

--HG--
extra : convert_revision : dedd20686cc367ed37f31920f753566afbc69045
This commit is contained in:
Ali Saidi 2004-05-25 15:59:54 -04:00
parent 74c494a4eb
commit 391f228fda
4 changed files with 84 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
dev/ns_gige.cc
View file

@ -88,9 +88,9 @@ using namespace std;
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
// //
// EtherDev PCI Device // NSGigE PCI Device
// //
EtherDev::EtherDev(const std::string &name, IntrControl *i, Tick intr_delay, NSGigE::NSGigE(const std::string &name, IntrControl *i, Tick intr_delay,
PhysicalMemory *pmem, Tick tx_delay, Tick rx_delay, PhysicalMemory *pmem, Tick tx_delay, Tick rx_delay,
MemoryController *mmu, HierParams *hier, Bus *header_bus, MemoryController *mmu, HierParams *hier, Bus *header_bus,
Bus *payload_bus, Tick pio_latency, bool dma_desc_free, Bus *payload_bus, Tick pio_latency, bool dma_desc_free,
@ -120,7 +120,7 @@ EtherDev::EtherDev(const std::string &name, IntrControl *i, Tick intr_delay,
if (header_bus) { if (header_bus) {
pioInterface = newPioInterface(name, hier, header_bus, this, pioInterface = newPioInterface(name, hier, header_bus, this,
&EtherDev::cacheAccess); &NSGigE::cacheAccess);
pioInterface->addAddrRange(addr, addr + size - 1); pioInterface->addAddrRange(addr, addr + size - 1);
if (payload_bus) if (payload_bus)
dmaInterface = new DMAInterface<Bus>(name + ".dma", dmaInterface = new DMAInterface<Bus>(name + ".dma",
@ -130,7 +130,7 @@ EtherDev::EtherDev(const std::string &name, IntrControl *i, Tick intr_delay,
header_bus, header_bus, 1); header_bus, header_bus, 1);
} else if (payload_bus) { } else if (payload_bus) {
pioInterface = newPioInterface(name, hier, payload_bus, this, pioInterface = newPioInterface(name, hier, payload_bus, this,
&EtherDev::cacheAccess); &NSGigE::cacheAccess);
pioInterface->addAddrRange(addr, addr + size - 1); pioInterface->addAddrRange(addr, addr + size - 1);
dmaInterface = new DMAInterface<Bus>(name + ".dma", dmaInterface = new DMAInterface<Bus>(name + ".dma",
payload_bus, payload_bus, 1); payload_bus, payload_bus, 1);
@ -154,11 +154,11 @@ EtherDev::EtherDev(const std::string &name, IntrControl *i, Tick intr_delay,
rom.perfectMatch[5] = eaddr[5]; rom.perfectMatch[5] = eaddr[5];
} }
EtherDev::~EtherDev() NSGigE::~NSGigE()
{} {}
void void
EtherDev::regStats() NSGigE::regStats()
{ {
txBytes txBytes
.name(name() + ".txBytes") .name(name() + ".txBytes")
@ -222,7 +222,7 @@ EtherDev::regStats()
* This is to read the PCI general configuration registers * This is to read the PCI general configuration registers
*/ */
void void
EtherDev::ReadConfig(int offset, int size, uint8_t *data) NSGigE::ReadConfig(int offset, int size, uint8_t *data)
{ {
if (offset < PCI_DEVICE_SPECIFIC) if (offset < PCI_DEVICE_SPECIFIC)
PciDev::ReadConfig(offset, size, data); PciDev::ReadConfig(offset, size, data);
@ -235,7 +235,7 @@ EtherDev::ReadConfig(int offset, int size, uint8_t *data)
* This is to write to the PCI general configuration registers * This is to write to the PCI general configuration registers
*/ */
void void
EtherDev::WriteConfig(int offset, int size, uint32_t data) NSGigE::WriteConfig(int offset, int size, uint32_t data)
{ {
if (offset < PCI_DEVICE_SPECIFIC) if (offset < PCI_DEVICE_SPECIFIC)
PciDev::WriteConfig(offset, size, data); PciDev::WriteConfig(offset, size, data);
@ -248,7 +248,7 @@ EtherDev::WriteConfig(int offset, int size, uint32_t data)
* spec sheet * spec sheet
*/ */
Fault Fault
EtherDev::read(MemReqPtr &req, uint8_t *data) NSGigE::read(MemReqPtr &req, uint8_t *data)
{ {
//The mask is to give you only the offset into the device register file //The mask is to give you only the offset into the device register file
Addr daddr = req->paddr & 0xfff; Addr daddr = req->paddr & 0xfff;
@ -450,7 +450,7 @@ EtherDev::read(MemReqPtr &req, uint8_t *data)
} }
Fault Fault
EtherDev::write(MemReqPtr &req, const uint8_t *data) NSGigE::write(MemReqPtr &req, const uint8_t *data)
{ {
Addr daddr = req->paddr & 0xfff; Addr daddr = req->paddr & 0xfff;
DPRINTF(EthernetPIO, "write da=%#x pa=%#x va=%#x size=%d\n", DPRINTF(EthernetPIO, "write da=%#x pa=%#x va=%#x size=%d\n",
@ -791,7 +791,7 @@ EtherDev::write(MemReqPtr &req, const uint8_t *data)
} }
void void
EtherDev::devIntrPost(uint32_t interrupts) NSGigE::devIntrPost(uint32_t interrupts)
{ {
DPRINTF(Ethernet, "interrupt posted intr=%#x isr=%#x imr=%#x\n", DPRINTF(Ethernet, "interrupt posted intr=%#x isr=%#x imr=%#x\n",
interrupts, regs.isr, regs.imr); interrupts, regs.isr, regs.imr);
@ -860,7 +860,7 @@ EtherDev::devIntrPost(uint32_t interrupts)
} }
void void
EtherDev::devIntrClear(uint32_t interrupts) NSGigE::devIntrClear(uint32_t interrupts)
{ {
DPRINTF(Ethernet, "interrupt cleared intr=%x isr=%x imr=%x\n", DPRINTF(Ethernet, "interrupt cleared intr=%x isr=%x imr=%x\n",
interrupts, regs.isr, regs.imr); interrupts, regs.isr, regs.imr);
@ -919,7 +919,7 @@ EtherDev::devIntrClear(uint32_t interrupts)
} }
void void
EtherDev::devIntrChangeMask() NSGigE::devIntrChangeMask()
{ {
DPRINTF(Ethernet, "interrupt mask changed\n"); DPRINTF(Ethernet, "interrupt mask changed\n");
@ -930,7 +930,7 @@ EtherDev::devIntrChangeMask()
} }
void void
EtherDev::cpuIntrPost(Tick when) NSGigE::cpuIntrPost(Tick when)
{ {
if (when > intrTick && intrTick != 0) if (when > intrTick && intrTick != 0)
return; return;
@ -951,7 +951,7 @@ EtherDev::cpuIntrPost(Tick when)
} }
void void
EtherDev::cpuInterrupt() NSGigE::cpuInterrupt()
{ {
// Don't send an interrupt if there's already one // Don't send an interrupt if there's already one
if (cpuPendingIntr) if (cpuPendingIntr)
@ -974,7 +974,7 @@ EtherDev::cpuInterrupt()
} }
void void
EtherDev::cpuIntrClear() NSGigE::cpuIntrClear()
{ {
if (cpuPendingIntr) { if (cpuPendingIntr) {
cpuPendingIntr = false; cpuPendingIntr = false;
@ -985,11 +985,11 @@ EtherDev::cpuIntrClear()
} }
bool bool
EtherDev::cpuIntrPending() const NSGigE::cpuIntrPending() const
{ return cpuPendingIntr; } { return cpuPendingIntr; }
void void
EtherDev::txReset() NSGigE::txReset()
{ {
DPRINTF(Ethernet, "transmit reset\n"); DPRINTF(Ethernet, "transmit reset\n");
@ -1007,7 +1007,7 @@ EtherDev::txReset()
} }
void void
EtherDev::rxReset() NSGigE::rxReset()
{ {
DPRINTF(Ethernet, "receive reset\n"); DPRINTF(Ethernet, "receive reset\n");
@ -1024,7 +1024,7 @@ EtherDev::rxReset()
} }
void void
EtherDev::rxDmaReadCopy() NSGigE::rxDmaReadCopy()
{ {
assert(rxDmaState == dmaReading); assert(rxDmaState == dmaReading);
@ -1037,7 +1037,7 @@ EtherDev::rxDmaReadCopy()
} }
bool bool
EtherDev::doRxDmaRead() NSGigE::doRxDmaRead()
{ {
assert(rxDmaState == dmaIdle || rxDmaState == dmaReadWaiting); assert(rxDmaState == dmaIdle || rxDmaState == dmaReadWaiting);
rxDmaState = dmaReading; rxDmaState = dmaReading;
@ -1063,7 +1063,7 @@ EtherDev::doRxDmaRead()
} }
void void
EtherDev::rxDmaReadDone() NSGigE::rxDmaReadDone()
{ {
assert(rxDmaState == dmaReading); assert(rxDmaState == dmaReading);
rxDmaReadCopy(); rxDmaReadCopy();
@ -1076,7 +1076,7 @@ EtherDev::rxDmaReadDone()
} }
void void
EtherDev::rxDmaWriteCopy() NSGigE::rxDmaWriteCopy()
{ {
assert(rxDmaState == dmaWriting); assert(rxDmaState == dmaWriting);
@ -1089,7 +1089,7 @@ EtherDev::rxDmaWriteCopy()
} }
bool bool
EtherDev::doRxDmaWrite() NSGigE::doRxDmaWrite()
{ {
assert(rxDmaState == dmaIdle || rxDmaState == dmaWriteWaiting); assert(rxDmaState == dmaIdle || rxDmaState == dmaWriteWaiting);
rxDmaState = dmaWriting; rxDmaState = dmaWriting;
@ -1115,7 +1115,7 @@ EtherDev::doRxDmaWrite()
} }
void void
EtherDev::rxDmaWriteDone() NSGigE::rxDmaWriteDone()
{ {
assert(rxDmaState == dmaWriting); assert(rxDmaState == dmaWriting);
rxDmaWriteCopy(); rxDmaWriteCopy();
@ -1128,7 +1128,7 @@ EtherDev::rxDmaWriteDone()
} }
void void
EtherDev::rxKick() NSGigE::rxKick()
{ {
DPRINTF(Ethernet, "receive kick state=%s (rxBuf.size=%d)\n", DPRINTF(Ethernet, "receive kick state=%s (rxBuf.size=%d)\n",
NsRxStateStrings[rxState], rxFifo.size()); NsRxStateStrings[rxState], rxFifo.size());
@ -1388,7 +1388,7 @@ EtherDev::rxKick()
} }
void void
EtherDev::transmit() NSGigE::transmit()
{ {
if (txFifo.empty()) { if (txFifo.empty()) {
DPRINTF(Ethernet, "nothing to transmit\n"); DPRINTF(Ethernet, "nothing to transmit\n");
@ -1421,7 +1421,7 @@ EtherDev::transmit()
} }
void void
EtherDev::txDmaReadCopy() NSGigE::txDmaReadCopy()
{ {
assert(txDmaState == dmaReading); assert(txDmaState == dmaReading);
@ -1434,7 +1434,7 @@ EtherDev::txDmaReadCopy()
} }
bool bool
EtherDev::doTxDmaRead() NSGigE::doTxDmaRead()
{ {
assert(txDmaState == dmaIdle || txDmaState == dmaReadWaiting); assert(txDmaState == dmaIdle || txDmaState == dmaReadWaiting);
txDmaState = dmaReading; txDmaState = dmaReading;
@ -1460,7 +1460,7 @@ EtherDev::doTxDmaRead()
} }
void void
EtherDev::txDmaReadDone() NSGigE::txDmaReadDone()
{ {
assert(txDmaState == dmaReading); assert(txDmaState == dmaReading);
txDmaReadCopy(); txDmaReadCopy();
@ -1473,7 +1473,7 @@ EtherDev::txDmaReadDone()
} }
void void
EtherDev::txDmaWriteCopy() NSGigE::txDmaWriteCopy()
{ {
assert(txDmaState == dmaWriting); assert(txDmaState == dmaWriting);
@ -1486,7 +1486,7 @@ EtherDev::txDmaWriteCopy()
} }
bool bool
EtherDev::doTxDmaWrite() NSGigE::doTxDmaWrite()
{ {
assert(txDmaState == dmaIdle || txDmaState == dmaWriteWaiting); assert(txDmaState == dmaIdle || txDmaState == dmaWriteWaiting);
txDmaState = dmaWriting; txDmaState = dmaWriting;
@ -1512,7 +1512,7 @@ EtherDev::doTxDmaWrite()
} }
void void
EtherDev::txDmaWriteDone() NSGigE::txDmaWriteDone()
{ {
assert(txDmaState == dmaWriting); assert(txDmaState == dmaWriting);
txDmaWriteCopy(); txDmaWriteCopy();
@ -1525,7 +1525,7 @@ EtherDev::txDmaWriteDone()
} }
void void
EtherDev::txKick() NSGigE::txKick()
{ {
DPRINTF(Ethernet, "transmit kick state=%s\n", NsTxStateStrings[txState]); DPRINTF(Ethernet, "transmit kick state=%s\n", NsTxStateStrings[txState]);
@ -1777,7 +1777,7 @@ EtherDev::txKick()
} }
void void
EtherDev::transferDone() NSGigE::transferDone()
{ {
if (txFifo.empty()) if (txFifo.empty())
return; return;
@ -1791,7 +1791,7 @@ EtherDev::transferDone()
} }
bool bool
EtherDev::rxFilter(PacketPtr packet) NSGigE::rxFilter(PacketPtr packet)
{ {
bool drop = true; bool drop = true;
string type; string type;
@ -1841,7 +1841,7 @@ EtherDev::rxFilter(PacketPtr packet)
} }
bool bool
EtherDev::recvPacket(PacketPtr packet) NSGigE::recvPacket(PacketPtr packet)
{ {
rxBytes += packet->length; rxBytes += packet->length;
rxPackets++; rxPackets++;
@ -1878,7 +1878,7 @@ EtherDev::recvPacket(PacketPtr packet)
* else, it just checks what it calculates against the value in the header in packet * else, it just checks what it calculates against the value in the header in packet
*/ */
bool bool
EtherDev::udpChecksum(PacketPtr packet, bool gen) NSGigE::udpChecksum(PacketPtr packet, bool gen)
{ {
udp_header *hdr = (udp_header *) packet->getTransportHdr(); udp_header *hdr = (udp_header *) packet->getTransportHdr();
@ -1905,7 +1905,7 @@ EtherDev::udpChecksum(PacketPtr packet, bool gen)
} }
bool bool
EtherDev::tcpChecksum(PacketPtr packet, bool gen) NSGigE::tcpChecksum(PacketPtr packet, bool gen)
{ {
tcp_header *hdr = (tcp_header *) packet->getTransportHdr(); tcp_header *hdr = (tcp_header *) packet->getTransportHdr();
@ -1932,7 +1932,7 @@ EtherDev::tcpChecksum(PacketPtr packet, bool gen)
} }
bool bool
EtherDev::ipChecksum(PacketPtr packet, bool gen) NSGigE::ipChecksum(PacketPtr packet, bool gen)
{ {
ip_header *hdr = packet->getIpHdr(); ip_header *hdr = packet->getIpHdr();
@ -1948,7 +1948,7 @@ EtherDev::ipChecksum(PacketPtr packet, bool gen)
} }
uint16_t uint16_t
EtherDev::checksumCalc(uint16_t *pseudo, uint16_t *buf, uint32_t len) NSGigE::checksumCalc(uint16_t *pseudo, uint16_t *buf, uint32_t len)
{ {
uint32_t sum = 0; uint32_t sum = 0;
@ -1978,7 +1978,7 @@ EtherDev::checksumCalc(uint16_t *pseudo, uint16_t *buf, uint32_t len)
// //
// //
void void
EtherDev::serialize(ostream &os) NSGigE::serialize(ostream &os)
{ {
/* /*
* Finalize any DMA events now. * Finalize any DMA events now.
@ -2129,7 +2129,7 @@ EtherDev::serialize(ostream &os)
} }
void void
EtherDev::unserialize(Checkpoint *cp, const std::string &section) NSGigE::unserialize(Checkpoint *cp, const std::string &section)
{ {
UNSERIALIZE_SCALAR(regs.command); UNSERIALIZE_SCALAR(regs.command);
UNSERIALIZE_SCALAR(regs.config); UNSERIALIZE_SCALAR(regs.config);
@ -2277,7 +2277,7 @@ EtherDev::unserialize(Checkpoint *cp, const std::string &section)
Tick Tick
EtherDev::cacheAccess(MemReqPtr &req) NSGigE::cacheAccess(MemReqPtr &req)
{ {
DPRINTF(EthernetPIO, "timing access to paddr=%#x (daddr=%#x)\n", DPRINTF(EthernetPIO, "timing access to paddr=%#x (daddr=%#x)\n",
req->paddr, req->paddr - addr); req->paddr, req->paddr - addr);
@ -2286,23 +2286,23 @@ EtherDev::cacheAccess(MemReqPtr &req)
//===================================================================== //=====================================================================
BEGIN_DECLARE_SIM_OBJECT_PARAMS(EtherDevInt) BEGIN_DECLARE_SIM_OBJECT_PARAMS(NSGigEInt)
SimObjectParam<EtherInt *> peer; SimObjectParam<EtherInt *> peer;
SimObjectParam<EtherDev *> device; SimObjectParam<NSGigE *> device;
END_DECLARE_SIM_OBJECT_PARAMS(EtherDevInt) END_DECLARE_SIM_OBJECT_PARAMS(NSGigEInt)
BEGIN_INIT_SIM_OBJECT_PARAMS(EtherDevInt) BEGIN_INIT_SIM_OBJECT_PARAMS(NSGigEInt)
INIT_PARAM_DFLT(peer, "peer interface", NULL), INIT_PARAM_DFLT(peer, "peer interface", NULL),
INIT_PARAM(device, "Ethernet device of this interface") INIT_PARAM(device, "Ethernet device of this interface")
END_INIT_SIM_OBJECT_PARAMS(EtherDevInt) END_INIT_SIM_OBJECT_PARAMS(NSGigEInt)
CREATE_SIM_OBJECT(EtherDevInt) CREATE_SIM_OBJECT(NSGigEInt)
{ {
EtherDevInt *dev_int = new EtherDevInt(getInstanceName(), device); NSGigEInt *dev_int = new NSGigEInt(getInstanceName(), device);
EtherInt *p = (EtherInt *)peer; EtherInt *p = (EtherInt *)peer;
if (p) { if (p) {
@ -2313,10 +2313,10 @@ CREATE_SIM_OBJECT(EtherDevInt)
return dev_int; return dev_int;
} }
REGISTER_SIM_OBJECT("EtherDevInt", EtherDevInt) REGISTER_SIM_OBJECT("NSGigEInt", NSGigEInt)
BEGIN_DECLARE_SIM_OBJECT_PARAMS(EtherDev) BEGIN_DECLARE_SIM_OBJECT_PARAMS(NSGigE)
Param<Tick> tx_delay; Param<Tick> tx_delay;
Param<Tick> rx_delay; Param<Tick> rx_delay;
@ -2344,9 +2344,9 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(EtherDev)
Param<uint32_t> pci_dev; Param<uint32_t> pci_dev;
Param<uint32_t> pci_func; Param<uint32_t> pci_func;
END_DECLARE_SIM_OBJECT_PARAMS(EtherDev) END_DECLARE_SIM_OBJECT_PARAMS(NSGigE)
BEGIN_INIT_SIM_OBJECT_PARAMS(EtherDev) BEGIN_INIT_SIM_OBJECT_PARAMS(NSGigE)
INIT_PARAM_DFLT(tx_delay, "Transmit Delay", 1000), INIT_PARAM_DFLT(tx_delay, "Transmit Delay", 1000),
INIT_PARAM_DFLT(rx_delay, "Receive Delay", 1000), INIT_PARAM_DFLT(rx_delay, "Receive Delay", 1000),
@ -2375,16 +2375,16 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(EtherDev)
INIT_PARAM(pci_dev, "PCI device number"), INIT_PARAM(pci_dev, "PCI device number"),
INIT_PARAM(pci_func, "PCI function code") INIT_PARAM(pci_func, "PCI function code")
END_INIT_SIM_OBJECT_PARAMS(EtherDev) END_INIT_SIM_OBJECT_PARAMS(NSGigE)
CREATE_SIM_OBJECT(EtherDev) CREATE_SIM_OBJECT(NSGigE)
{ {
int eaddr[6]; int eaddr[6];
sscanf(((string)hardware_address).c_str(), "%x:%x:%x:%x:%x:%x", sscanf(((string)hardware_address).c_str(), "%x:%x:%x:%x:%x:%x",
&eaddr[0], &eaddr[1], &eaddr[2], &eaddr[3], &eaddr[4], &eaddr[5]); &eaddr[0], &eaddr[1], &eaddr[2], &eaddr[3], &eaddr[4], &eaddr[5]);
return new EtherDev(getInstanceName(), intr_ctrl, intr_delay, return new NSGigE(getInstanceName(), intr_ctrl, intr_delay,
physmem, tx_delay, rx_delay, mmu, hier, header_bus, physmem, tx_delay, rx_delay, mmu, hier, header_bus,
payload_bus, pio_latency, dma_desc_free, dma_data_free, payload_bus, pio_latency, dma_desc_free, dma_data_free,
dma_read_delay, dma_write_delay, dma_read_factor, dma_read_delay, dma_write_delay, dma_read_factor,
@ -2393,4 +2393,4 @@ CREATE_SIM_OBJECT(EtherDev)
addr); addr);
} }
REGISTER_SIM_OBJECT("EtherDev", EtherDev) REGISTER_SIM_OBJECT("NSGigE", NSGigE)

42
dev/ns_gige.hh
View file

@ -96,7 +96,7 @@ struct dp_rom {
}; };
class IntrControl; class IntrControl;
class EtherDevInt; class NSGigEInt;
class PhysicalMemory; class PhysicalMemory;
class BaseInterface; class BaseInterface;
class HierParams; class HierParams;
@ -106,7 +106,7 @@ class PciConfigAll;
/** /**
* NS DP82830 Ethernet device model * NS DP82830 Ethernet device model
*/ */
class EtherDev : public PciDev class NSGigE : public PciDev
{ {
public: public:
/** Transmit State Machine states */ /** Transmit State Machine states */
@ -236,20 +236,20 @@ class EtherDev : public PciDev
void txDmaWriteCopy(); void txDmaWriteCopy();
void rxDmaReadDone(); void rxDmaReadDone();
friend class EventWrapper<EtherDev, &EtherDev::rxDmaReadDone>; friend class EventWrapper<NSGigE, &NSGigE::rxDmaReadDone>;
EventWrapper<EtherDev, &EtherDev::rxDmaReadDone> rxDmaReadEvent; EventWrapper<NSGigE, &NSGigE::rxDmaReadDone> rxDmaReadEvent;
void rxDmaWriteDone(); void rxDmaWriteDone();
friend class EventWrapper<EtherDev, &EtherDev::rxDmaWriteDone>; friend class EventWrapper<NSGigE, &NSGigE::rxDmaWriteDone>;
EventWrapper<EtherDev, &EtherDev::rxDmaWriteDone> rxDmaWriteEvent; EventWrapper<NSGigE, &NSGigE::rxDmaWriteDone> rxDmaWriteEvent;
void txDmaReadDone(); void txDmaReadDone();
friend class EventWrapper<EtherDev, &EtherDev::txDmaReadDone>; friend class EventWrapper<NSGigE, &NSGigE::txDmaReadDone>;
EventWrapper<EtherDev, &EtherDev::txDmaReadDone> txDmaReadEvent; EventWrapper<NSGigE, &NSGigE::txDmaReadDone> txDmaReadEvent;
void txDmaWriteDone(); void txDmaWriteDone();
friend class EventWrapper<EtherDev, &EtherDev::txDmaWriteDone>; friend class EventWrapper<NSGigE, &NSGigE::txDmaWriteDone>;
EventWrapper<EtherDev, &EtherDev::txDmaWriteDone> txDmaWriteEvent; EventWrapper<NSGigE, &NSGigE::txDmaWriteDone> txDmaWriteEvent;
bool dmaDescFree; bool dmaDescFree;
bool dmaDataFree; bool dmaDataFree;
@ -276,19 +276,19 @@ class EtherDev : public PciDev
void rxKick(); void rxKick();
Tick rxKickTick; Tick rxKickTick;
typedef EventWrapper<EtherDev, &EtherDev::rxKick> RxKickEvent; typedef EventWrapper<NSGigE, &NSGigE::rxKick> RxKickEvent;
friend class RxKickEvent; friend class RxKickEvent;
void txKick(); void txKick();
Tick txKickTick; Tick txKickTick;
typedef EventWrapper<EtherDev, &EtherDev::txKick> TxKickEvent; typedef EventWrapper<NSGigE, &NSGigE::txKick> TxKickEvent;
friend class TxKickEvent; friend class TxKickEvent;
/** /**
* Retransmit event * Retransmit event
*/ */
void transmit(); void transmit();
typedef EventWrapper<EtherDev, &EtherDev::transmit> TxEvent; typedef EventWrapper<NSGigE, &NSGigE::transmit> TxEvent;
friend class TxEvent; friend class TxEvent;
TxEvent txEvent; TxEvent txEvent;
@ -323,7 +323,7 @@ class EtherDev : public PciDev
void cpuInterrupt(); void cpuInterrupt();
void cpuIntrClear(); void cpuIntrClear();
typedef EventWrapper<EtherDev, &EtherDev::cpuInterrupt> IntrEvent; typedef EventWrapper<NSGigE, &NSGigE::cpuInterrupt> IntrEvent;
friend class IntrEvent; friend class IntrEvent;
IntrEvent *intrEvent; IntrEvent *intrEvent;
@ -335,10 +335,10 @@ class EtherDev : public PciDev
bool ipChecksum(PacketPtr packet, bool gen); bool ipChecksum(PacketPtr packet, bool gen);
uint16_t checksumCalc(uint16_t *pseudo, uint16_t *buf, uint32_t len); uint16_t checksumCalc(uint16_t *pseudo, uint16_t *buf, uint32_t len);
EtherDevInt *interface; NSGigEInt *interface;
public: public:
EtherDev(const std::string &name, IntrControl *i, Tick intr_delay, NSGigE(const std::string &name, IntrControl *i, Tick intr_delay,
PhysicalMemory *pmem, Tick tx_delay, Tick rx_delay, PhysicalMemory *pmem, Tick tx_delay, Tick rx_delay,
MemoryController *mmu, HierParams *hier, Bus *header_bus, MemoryController *mmu, HierParams *hier, Bus *header_bus,
Bus *payload_bus, Tick pio_latency, bool dma_desc_free, Bus *payload_bus, Tick pio_latency, bool dma_desc_free,
@ -346,7 +346,7 @@ class EtherDev : public PciDev
Tick dma_read_factor, Tick dma_write_factor, PciConfigAll *cf, Tick dma_read_factor, Tick dma_write_factor, PciConfigAll *cf,
PciConfigData *cd, Tsunami *t, uint32_t bus, uint32_t dev, PciConfigData *cd, Tsunami *t, uint32_t bus, uint32_t dev,
uint32_t func, bool rx_filter, const int eaddr[6], Addr addr); uint32_t func, bool rx_filter, const int eaddr[6], Addr addr);
~EtherDev(); ~NSGigE();
virtual void WriteConfig(int offset, int size, uint32_t data); virtual void WriteConfig(int offset, int size, uint32_t data);
virtual void ReadConfig(int offset, int size, uint8_t *data); virtual void ReadConfig(int offset, int size, uint8_t *data);
@ -360,7 +360,7 @@ class EtherDev : public PciDev
bool recvPacket(PacketPtr packet); bool recvPacket(PacketPtr packet);
void transferDone(); void transferDone();
void setInterface(EtherDevInt *i) { assert(!interface); interface = i; } void setInterface(NSGigEInt *i) { assert(!interface); interface = i; }
virtual void serialize(std::ostream &os); virtual void serialize(std::ostream &os);
virtual void unserialize(Checkpoint *cp, const std::string &section); virtual void unserialize(Checkpoint *cp, const std::string &section);
@ -388,13 +388,13 @@ class EtherDev : public PciDev
/* /*
* Ethernet Interface for an Ethernet Device * Ethernet Interface for an Ethernet Device
*/ */
class EtherDevInt : public EtherInt class NSGigEInt : public EtherInt
{ {
private: private:
EtherDev *dev; NSGigE *dev;
public: public:
EtherDevInt(const std::string &name, EtherDev *d) NSGigEInt(const std::string &name, NSGigE *d)
: EtherInt(name), dev(d) { dev->setInterface(this); } : 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); }

4
dev/tsunami.hh
View file

@ -39,7 +39,7 @@
class IdeController; class IdeController;
class TlaserClock; class TlaserClock;
class EtherDev; class NSGigE;
class TsunamiCChip; class TsunamiCChip;
class TsunamiPChip; class TsunamiPChip;
class TsunamiIO; class TsunamiIO;
@ -67,7 +67,7 @@ class Tsunami : public Platform
/** Pointer to the disk controller device */ /** Pointer to the disk controller device */
IdeController *disk_controller; IdeController *disk_controller;
/** Pointer to the ethernet controller device */ /** Pointer to the ethernet controller device */
EtherDev *ethernet; NSGigE *ethernet;
/** Pointer to the Tsunami CChip. /** Pointer to the Tsunami CChip.
* The chip contains some configuration information and * The chip contains some configuration information and

2
kern/linux/linux_syscalls.hh
View file

@ -311,6 +311,8 @@ struct SystemCalls<Linux>
StandardNumber StandardNumber
}; };
static const int Number = StandardNumber;
static const char *name(int num); static const char *name(int num);
static bool validSyscallNumber(int num) { static bool validSyscallNumber(int num) {