derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge zizzer:/z/m5/Bitkeeper/m5

Browse Source 
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/timing_L1

--HG--
extra : convert_revision : 1064ec4c8624682b35f66163fb349fe04903411d
This commit is contained in:
Ron Dreslinski
2005-01-19 13:22:38 -05:00
parent 19bd52c935 b65f365474
commit 51d52a3834
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dev/pktfifo.cc
View File

@@ -60,7 +60,6 @@ PacketFifo::unserialize(const string &base, Checkpoint *cp,
paramIn(cp, section, base + ".packets", fifosize);
fifo.clear();
fifo.resize(fifosize);
for (int i = 0; i < fifosize; ++i) {
PacketPtr p = new PacketData(16384);

4
objects/Pci.mpy
View File

@@ -1,7 +1,7 @@
from Device import FooPioDevice, DmaDevice
simobj PciConfigData(FooPioDevice):
addr = 0xffffffffffffffff
addr = 0xffffffffffffffffL
VendorID = Param.UInt16("Vendor ID")
DeviceID = Param.UInt16("Device ID")
Command = Param.UInt16(0, "Command")
@@ -47,4 +47,4 @@ simobj PciDevice(DmaDevice):
pci_func = Param.Int("PCI function code")
configdata = Param.PciConfigData(Super, "PCI Config data")
configspace = Param.PciConfigAll(Super, "PCI Configspace")
addr = 0xffffffffffffffff
addr = 0xffffffffffffffffL