diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2005-03-11 19:34:43 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2005-03-11 19:34:43 -0500 |
| commit | e0d52f56e12d5ef4ddbc98b173543a95f75fb68e (patch) | |
| tree | 8d30fde311ce5b5a090cbe1f42446a32e1c11475 | |
| parent | 05e07428f103ae97f7929e3a4ed9bb7bea1eab9c (diff) | |
| parent | c977d2a02b1b3071d52fe43779730ed5290babff (diff) | |
| download | gem5-e0d52f56e12d5ef4ddbc98b173543a95f75fb68e.tar.xz | |
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
rename : objects/Pci.mpy => python/m5/objects/Pci.mpy
extra : convert_revision : 6902e8f9c2a309eb1846094a94b38018587a3761
| -rw-r--r-- | dev/pcidev.cc | 10 | ||||
| -rw-r--r-- | python/m5/objects/Pci.mpy | 4 |
2 files changed, 1 insertions, 13 deletions
diff --git a/dev/pcidev.cc b/dev/pcidev.cc index c45afadd4..76b42390a 100644 --- a/dev/pcidev.cc +++ b/dev/pcidev.cc @@ -285,11 +285,6 @@ PciDev::unserialize(Checkpoint *cp, const std::string §ion) BEGIN_DECLARE_SIM_OBJECT_PARAMS(PciConfigData) - SimObjectParam<MemoryController *> mmu; - Param<Addr> addr; - SimObjectParam<Bus*> io_bus; - Param<Tick> pio_latency; - Param<uint16_t> VendorID; Param<uint16_t> DeviceID; Param<uint16_t> Command; @@ -327,11 +322,6 @@ END_DECLARE_SIM_OBJECT_PARAMS(PciConfigData) BEGIN_INIT_SIM_OBJECT_PARAMS(PciConfigData) - INIT_PARAM(mmu, "Memory Controller"), - INIT_PARAM(addr, "Device Address"), - INIT_PARAM_DFLT(io_bus, "The IO Bus to attach to", NULL), - INIT_PARAM_DFLT(pio_latency, "Programmed IO latency in bus cycles", 1), - INIT_PARAM(VendorID, "Vendor ID"), INIT_PARAM(DeviceID, "Device ID"), INIT_PARAM_DFLT(Command, "Command Register", 0x00), diff --git a/python/m5/objects/Pci.mpy b/python/m5/objects/Pci.mpy index caa3c52ff..907472727 100644 --- a/python/m5/objects/Pci.mpy +++ b/python/m5/objects/Pci.mpy @@ -1,8 +1,7 @@ from Device import FooPioDevice, DmaDevice -simobj PciConfigData(FooPioDevice): +simobj PciConfigData(SimObject): type = 'PciConfigData' - addr = 0xffffffffffffffffL VendorID = Param.UInt16("Vendor ID") DeviceID = Param.UInt16("Device ID") Command = Param.UInt16(0, "Command") @@ -49,4 +48,3 @@ simobj PciDevice(DmaDevice): pci_func = Param.Int("PCI function code") configdata = Param.PciConfigData(Super, "PCI Config data") configspace = Param.PciConfigAll(Super, "PCI Configspace") - addr = 0xffffffffffffffffL |