Merge zed.eecs.umich.edu:/.automount/fox/y/mserrano/m5_dir/m5

into  zed.eecs.umich.edu:/z/benash/bk/m5

dev/ide_ctrl.cc:
dev/ide_ctrl.hh:
dev/ide_disk.cc:
dev/ide_disk.hh:
dev/ns_gige.cc:
dev/pciconfigall.cc:
dev/pcidev.cc:
dev/rtcreg.h:
dev/tsunami_io.cc:
dev/tsunami_io.hh:
dev/uart8250.cc:
dev/uart8250.hh:
python/m5/objects/Tsunami.py:
    Merge code.

--HG--
extra : convert_revision : e97d5dbcc051d2061622201265430d359f995d48

1 files changed, 11 insertions, 5 deletions

diff --git a/dev/pcidev.hh b/dev/pcidev.hh
index 31b0cab16..433079b61 100644
--- a/dev/pcidev.hh
+++ b/dev/pcidev.hh
@@ -37,6 +37,12 @@
 #include "dev/pcireg.h"
 #include "dev/platform.hh"
 
+#define BAR_IO_MASK 0x3
+#define BAR_MEM_MASK 0xF
+#define BAR_IO_SPACE_BIT 0x1
+#define BAR_IO_SPACE(x) ((x) & BAR_IO_SPACE_BIT)
+#define BAR_NUMBER(x) (((x) - PCI0_BASE_ADDR0) >> 0x2);
+
 class PciConfigAll;
 class MemoryController;
 
@@ -136,15 +142,15 @@ class PciDev : public DmaDevice
 
     void
     intrPost()
-    { plat->postPciInt(configData->config.hdr.pci0.interruptLine); }
+    { plat->postPciInt(configData->config.interruptLine); }
 
     void
     intrClear()
-    { plat->clearPciInt(configData->config.hdr.pci0.interruptLine); }
+    { plat->clearPciInt(configData->config.interruptLine); }
 
     uint8_t
     interruptLine()
-    { return configData->config.hdr.pci0.interruptLine; }
+    { return configData->config.interruptLine; }
 
   public:
     /**
@@ -169,7 +175,7 @@ class PciDev : public DmaDevice
      * @param size the size of the write
      * @param data the data to write
      */
-    virtual void WriteConfig(int offset, int size, uint32_t data);
+    virtual void writeConfig(int offset, int size, const uint8_t* data);
 
 
     /**
@@ -180,7 +186,7 @@ class PciDev : public DmaDevice
      * @param size the size of the read
      * @param data pointer to the location where the read value should be stored
      */
-    virtual void ReadConfig(int offset, int size, uint8_t *data);
+    virtual void readConfig(int offset, int size, uint8_t *data);
 
     /**
      * Serialize this object to the given output stream.