1 files changed, 26 insertions, 48 deletions

diff --git a/dev/pciconfigall.cc b/dev/pciconfigall.cc
index 86a505b9a..c3597c486 100644
--- a/dev/pciconfigall.cc
+++ b/dev/pciconfigall.cc
@@ -37,7 +37,7 @@
 
 #include "base/trace.hh"
 #include "dev/pciconfigall.hh"
-//#include "dev/pcidev.hh"
+#include "dev/pcidev.hh"
 #include "dev/pcireg.h"
 #include "dev/platform.hh"
 #include "mem/packet.hh"
@@ -68,7 +68,7 @@ PciConfigAll::PciConfigAll(Params *p)
 void
 PciConfigAll::startup()
 {
-/*    bitset<256> intLines;
+    bitset<256> intLines;
     PciDev *tempDev;
     uint8_t intline;
 
@@ -85,7 +85,7 @@ PciConfigAll::startup()
            } // devices != NULL
         } // PCI_FUNC
     } // PCI_DEV
-  */
+
 }
 
 Tick
@@ -97,65 +97,32 @@ PciConfigAll::read(Packet &pkt)
     Addr daddr = pkt.addr - pioAddr;
     int device = (daddr >> 11) & 0x1F;
     int func = (daddr >> 8) & 0x7;
-    //int reg = daddr & 0xFF;
+    int reg = daddr & 0xFF;
 
     pkt.time = curTick + pioDelay;
+    pkt.allocate();
 
     DPRINTF(PciConfigAll, "read  va=%#x da=%#x size=%d\n", pkt.addr, daddr,
             pkt.size);
 
-    uint8_t *data8;
-    uint16_t *data16;
-    uint32_t *data32;
-
     switch (pkt.size) {
-/*      case sizeof(uint64_t):
-         if (!pkt.data) {
-             data64 = new uint64_t;
-             pkt.data = (uint8_t*)data64;
-         } else {
-             data64 = (uint64_t*)pkt.data;
-         }
-         if (devices[device][func] == NULL)
-             *data64 = 0xFFFFFFFFFFFFFFFFULL;
-         else
-             devices[device][func]->readConfig(reg, req.size, data64);
-         break;*/
       case sizeof(uint32_t):
-         if (!pkt.data) {
-             data32 = new uint32_t;
-             pkt.data = (uint8_t*)data32;
-         } else {
-             data32 = (uint32_t*)pkt.data;
-         }
          if (devices[device][func] == NULL)
-             *data32 = 0xFFFFFFFF;
+             pkt.set<uint32_t>(0xFFFFFFFF);
          else
-             ;//devices[device][func]->readConfig(reg, req.size, data32);
+             devices[device][func]->readConfig(reg, pkt.getPtr<uint32_t>());
          break;
       case sizeof(uint16_t):
-         if (!pkt.data) {
-             data16 = new uint16_t;
-             pkt.data = (uint8_t*)data16;
-         } else {
-             data16 = (uint16_t*)pkt.data;
-         }
          if (devices[device][func] == NULL)
-             *data16 = 0xFFFF;
+             pkt.set<uint16_t>(0xFFFF);
          else
-             ;//devices[device][func]->readConfig(reg, req.size, data16);
+             devices[device][func]->readConfig(reg, pkt.getPtr<uint16_t>());
          break;
       case sizeof(uint8_t):
-         if (!pkt.data) {
-             data8 = new uint8_t;
-             pkt.data = data8;
-         } else {
-             data8 = (uint8_t*)pkt.data;
-         }
          if (devices[device][func] == NULL)
-             *data8 = 0xFF;
+             pkt.set<uint8_t>(0xFF);
          else
-             ;//devices[device][func]->readConfig(reg, req.size, data8);
+             devices[device][func]->readConfig(reg, pkt.getPtr<uint8_t>());
          break;
       default:
         panic("invalid access size(?) for PCI configspace!\n");
@@ -177,16 +144,27 @@ PciConfigAll::write(Packet &pkt)
 
     int device = (daddr >> 11) & 0x1F;
     int func = (daddr >> 8) & 0x7;
-//    int reg = daddr & 0xFF;
+    int reg = daddr & 0xFF;
 
     if (devices[device][func] == NULL)
         panic("Attempting to write to config space on non-existant device\n");
 
     DPRINTF(PciConfigAll, "write - va=%#x size=%d data=%#x\n",
-            pkt.addr, pkt.size, *(uint32_t*)pkt.data);
-
-//    devices[device][func]->writeConfig(reg, req->size, data);
+            pkt.addr, pkt.size, pkt.get<uint32_t>());
 
+    switch (pkt.size) {
+      case sizeof(uint8_t):
+        devices[device][func]->writeConfig(reg, pkt.get<uint8_t>());
+        break;
+      case sizeof(uint16_t):
+        devices[device][func]->writeConfig(reg, pkt.get<uint16_t>());
+        break;
+      case sizeof(uint32_t):
+        devices[device][func]->writeConfig(reg, pkt.get<uint32_t>());
+        break;
+      default:
+        panic("invalid pci config write size\n");
+    }
     return pioDelay;
 }