dev, arm: Include PIO size in AmbaDmaDevice constructor

Make it possible to specify the size of the PIO space for an AMBA DMA
device. Maintain backwards compatibility and default to zero.

diff --git a/src/dev/arm/amba_device.cc b/src/dev/arm/amba_device.cc
index 0ba20d0875a038b1d0ded2a586d0fd2ad2f1e0c7..540d096154e0ba0d62d04674f383fbeef2d4b538 100644 (file)
--- a/src/dev/arm/amba_device.cc
+++ b/src/dev/arm/amba_device.cc
@@ -62,9 +62,9 @@ AmbaIntDevice::AmbaIntDevice(const Params *p, Addr pio_size)
 
 
 
-AmbaDmaDevice::AmbaDmaDevice(const Params *p)
+AmbaDmaDevice::AmbaDmaDevice(const Params *p, Addr pio_size)
     : DmaDevice(p), ambaId(AmbaVendor | p->amba_id),
-      pioAddr(p->pio_addr), pioSize(0),
+      pioAddr(p->pio_addr), pioSize(pio_size),
       pioDelay(p->pio_latency),intNum(p->int_num), gic(p->gic)
 {
 }

diff --git a/src/dev/arm/amba_device.hh b/src/dev/arm/amba_device.hh
index 3915e436cb4c4897f89d693843fc78a42944f951..8691261463f159571a42aef3ad248bb3033e5cdf 100644 (file)
--- a/src/dev/arm/amba_device.hh
+++ b/src/dev/arm/amba_device.hh
@@ -109,7 +109,7 @@ class AmbaDmaDevice : public DmaDevice, public AmbaDevice
 
   public:
     typedef AmbaDmaDeviceParams Params;
-    AmbaDmaDevice(const Params *p);
+    AmbaDmaDevice(const Params *p, Addr pio_size = 0);
 };