Merge zizzer:/bk/linux into zower.eecs.umich.edu:/z/hsul/work/bk/linux

--HG--
extra : convert_revision : 7af5650ceae277ce838e778bba1fba86285d6dca

2 files changed, 20 insertions, 19 deletions

diff --git a/dev/pcidev.cc b/dev/pcidev.cc
index 2b2f54fce..4852fc581 100644
--- a/dev/pcidev.cc
+++ b/dev/pcidev.cc
@@ -40,7 +40,6 @@
 #include "base/str.hh"	// for to_number
 #include "base/trace.hh"
 #include "dev/pciareg.h"
-#include "dev/scsi_ctrl.hh"
 #include "dev/pcidev.hh"
 #include "dev/pciconfigall.hh"
 #include "mem/functional_mem/memory_control.hh"
@@ -53,8 +52,8 @@ using namespace std;
 
 PciDev::PciDev(const string &name, MemoryController *mmu, PciConfigAll *cf,
                PciConfigData *cd, uint32_t bus, uint32_t dev, uint32_t func)
-    : FunctionalMemory(name), MMU(mmu), configSpace(cf), configData(cd),
-      bus(bus), device(dev), function(func)
+    : DmaDevice(name), mmu(mmu), configSpace(cf), configData(cd), busNum(bus),
+      deviceNum(dev), functionNum(func)
 {
     // copy the config data from the PciConfigData object
     if (cd) {
@@ -79,21 +78,24 @@ PciDev::ReadConfig(int offset, int size, uint8_t *data)
         memcpy((uint32_t*)data, config.data + offset, sizeof(uint32_t));
         DPRINTF(PCIDEV,
                 "read device: %#x function: %#x register: %#x data: %#x\n",
-                device, function, offset, *(uint32_t*)(config.data + offset));
+                deviceNum, functionNum, offset,
+                *(uint32_t*)(config.data + offset));
         break;
 
       case sizeof(uint16_t):
         memcpy((uint16_t*)data, config.data + offset, sizeof(uint16_t));
         DPRINTF(PCIDEV,
                 "read device: %#x function: %#x register: %#x data: %#x\n",
-                device, function, offset, *(uint16_t*)(config.data + offset));
+                deviceNum, functionNum, offset,
+                *(uint16_t*)(config.data + offset));
         break;
 
       case sizeof(uint8_t):
         memcpy((uint8_t*)data, config.data + offset, sizeof(uint8_t));
         DPRINTF(PCIDEV,
                 "read device: %#x function: %#x register: %#x data: %#x\n",
-                device, function, offset, (uint16_t)(*(uint8_t*)(config.data + offset)));
+                deviceNum, functionNum, offset,
+                (uint16_t)(*(uint8_t*)(config.data + offset)));
         break;
 
       default:
@@ -115,7 +117,7 @@ PciDev::WriteConfig(int offset, int size, uint32_t data)
 
     DPRINTF(PCIDEV,
             "write device: %#x function: %#x reg: %#x size: %#x data: %#x\n",
-            device, function, offset, size, word_value);
+            deviceNum, functionNum, offset, size, word_value);
 
     barnum = (offset - PCI0_BASE_ADDR0) >> 2;
 
@@ -184,11 +186,11 @@ PciDev::WriteConfig(int offset, int size, uint32_t data)
 
                         // It's never been set
                         if (BARAddrs[barnum] == 0)
-                            MMU->add_child(this,
+                            mmu->add_child((FunctionalMemory *)this,
                                            Range<Addr>(base_addr,
                                                        base_addr + base_size));
                         else
-                            MMU->update_child(this,
+                            mmu->update_child((FunctionalMemory *)this,
                                               Range<Addr>(BARAddrs[barnum],
                                                           BARAddrs[barnum] +
                                                           base_size),
@@ -212,11 +214,11 @@ PciDev::WriteConfig(int offset, int size, uint32_t data)
 
                         // It's never been set
                         if (BARAddrs[barnum] == 0)
-                            MMU->add_child(this,
+                            mmu->add_child((FunctionalMemory *)this,
                                            Range<Addr>(base_addr,
                                                        base_addr + base_size));
                         else
-                            MMU->update_child(this,
+                            mmu->update_child((FunctionalMemory *)this,
                                               Range<Addr>(BARAddrs[barnum],
                                                           BARAddrs[barnum] +
                                                           base_size),
diff --git a/dev/pcidev.hh b/dev/pcidev.hh
index 1a45f5c7b..f8192db3c 100644
--- a/dev/pcidev.hh
+++ b/dev/pcidev.hh
@@ -27,15 +27,14 @@
  */
 
 /* @file
- * PCI configspace devices
+ * Interface for devices using PCI configuration
  */
 
 #ifndef __PCI_DEV_HH__
 #define __PCI_DEV_HH__
 
 #include "dev/pcireg.h"
-#include "sim/sim_object.hh"
-#include "mem/functional_mem/functional_memory.hh"
+#include "dev/io_device.hh"
 
 class PciConfigAll;
 class MemoryController;
@@ -63,15 +62,15 @@ class PciConfigData : public SimObject
  * register with it. This object registers with the PCIConfig space
  * object.
  */
-class PciDev : public FunctionalMemory
+class PciDev : public DmaDevice
 {
   protected:
-    MemoryController *MMU;
+    MemoryController *mmu;
     PciConfigAll *configSpace;
     PciConfigData *configData;
-    uint32_t bus;
-    uint32_t device;
-    uint32_t function;
+    uint32_t busNum;
+    uint32_t deviceNum;
+    uint32_t functionNum;
 
     PCIConfig config;
     uint32_t BARSize[6];