Move options files from <build_dir>/build_options to build_options/<build_dir>.

[gem5.git] / dev / pciconfigall.cc

diff --git a/dev/pciconfigall.cc b/dev/pciconfigall.cc
index 609763e928d742bb52c6ddabc32f8e500a7d52c4..b2bff6cb644e5b8fcda16650125f36223f6e4ef4 100644 (file)
--- a/dev/pciconfigall.cc
+++ b/dev/pciconfigall.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 The Regents of The University of Michigan
+ * Copyright (c) 2004-2005 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,29 +42,30 @@
 #include "mem/bus/bus.hh"
 #include "mem/bus/pio_interface.hh"
 #include "mem/bus/pio_interface_impl.hh"
-#include "mem/functional_mem/memory_control.hh"
+#include "mem/functional/memory_control.hh"
 #include "sim/builder.hh"
 #include "sim/system.hh"
 
 using namespace std;
 
-PciConfigAll::PciConfigAll(const string &name, Addr a, MemoryController *mmu,
+PciConfigAll::PciConfigAll(const string &name,
+                           Addr a, MemoryController *mmu,
                            HierParams *hier, Bus *bus, Tick pio_latency)
-    : PioDevice(name), addr(a)
+    : PioDevice(name, NULL), addr(a)
 {
     mmu->add_child(this, RangeSize(addr, size));
 
     if (bus) {
-        pioInterface = newPioInterface(name, hier, bus, this,
+        pioInterface = newPioInterface(name + ".pio", hier, bus, this,
                                       &PciConfigAll::cacheAccess);
         pioInterface->addAddrRange(RangeSize(addr, size));
-        pioLatency = pio_latency * bus->clockRatio;
+        pioLatency = pio_latency * bus->clockRate;
     }
 
     // Make all the pointers to devices null
     for(int x=0; x < MAX_PCI_DEV; x++)
         for(int y=0; y < MAX_PCI_FUNC; y++)
-          devices[x][y] = NULL;
+            devices[x][y] = NULL;
 }
 
 // If two interrupts share the same line largely bad things will happen.
@@ -97,11 +98,12 @@ PciConfigAll::startup()
 Fault
 PciConfigAll::read(MemReqPtr &req, uint8_t *data)
 {
-    DPRINTF(PciConfigAll, "read  va=%#x size=%d\n",
-            req->vaddr, req->size);
 
     Addr daddr = (req->paddr - (addr & EV5::PAddrImplMask));
 
+    DPRINTF(PciConfigAll, "read  va=%#x da=%#x size=%d\n",
+            req->vaddr, daddr, req->size);
+
     int device = (daddr >> 11) & 0x1F;
     int func = (daddr >> 8) & 0x7;
     int reg = daddr & 0xFF;
@@ -128,7 +130,7 @@ PciConfigAll::read(MemReqPtr &req, uint8_t *data)
             case sizeof(uint32_t):
             case sizeof(uint16_t):
             case sizeof(uint8_t):
-                devices[device][func]->ReadConfig(reg, req->size, data);
+                devices[device][func]->readConfig(reg, req->size, data);
                 return No_Fault;
             default:
                 panic("invalid access size(?) for PCI configspace!\n");
@@ -150,34 +152,17 @@ PciConfigAll::write(MemReqPtr &req, const uint8_t *data)
     int func = (daddr >> 8) & 0x7;
     int reg = daddr & 0xFF;
 
-    union {
-        uint8_t byte_value;
-        uint16_t half_value;
-        uint32_t word_value;
-    };
-
     if (devices[device][func] == NULL)
         panic("Attempting to write to config space on non-existant device\n");
-    else {
-            switch (req->size) {
-            case sizeof(uint8_t):
-                byte_value = *(uint8_t*)data;
-                break;
-            case sizeof(uint16_t):
-                half_value = *(uint16_t*)data;
-                break;
-            case sizeof(uint32_t):
-                word_value = *(uint32_t*)data;
-                break;
-            default:
-                panic("invalid access size(?) for PCI configspace!\n");
-            }
-    }
+    else if (req->size != sizeof(uint8_t) &&
+             req->size != sizeof(uint16_t) &&
+             req->size != sizeof(uint32_t))
+        panic("invalid access size(?) for PCI configspace!\n");
 
     DPRINTF(PciConfigAll, "write - va=%#x size=%d data=%#x\n",
-            req->vaddr, req->size, word_value);
+            req->vaddr, req->size, *(uint32_t*)data);
 
-    devices[device][func]->WriteConfig(reg, req->size, word_value);
+    devices[device][func]->writeConfig(reg, req->size, data);
 
     return No_Fault;
 }