From c977d2a02b1b3071d52fe43779730ed5290babff Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@eecs.umich.edu>
Date: Fri, 11 Mar 2005 19:34:35 -0500
Subject: [PATCH] remove addr from PciConfigDevice since it's not used Random
 some small config file stuff

dev/pcidev.cc:
objects/Pci.mpy:
    remove addr since it's not used

--HG--
extra : convert_revision : aeb5993552d65a5e3b57f393bcb7d8aaadf6b5a2
---
 dev/pcidev.cc   | 10 ----------
 objects/Pci.mpy |  4 +---
 2 files changed, 1 insertion(+), 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 &section)
 
 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/objects/Pci.mpy b/objects/Pci.mpy
index caa3c52ff..907472727 100644
--- a/objects/Pci.mpy
+++ b/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