summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sandberg <andreas.sandberg@arm.com>2015-06-09 09:21:12 -0400
committerAndreas Sandberg <andreas.sandberg@arm.com>2015-06-09 09:21:12 -0400
commita9cad92011560fe03c7d6ffde6d679cc84e48816 (patch)
treec7f7e6a0e8a3791126a80ef4bdd1eeba04b3064d
parentb29e55d44a70de6ed126a03fcd938bfe34a3a8a5 (diff)
downloadgem5-a9cad92011560fe03c7d6ffde6d679cc84e48816.tar.xz
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.
-rw-r--r--src/dev/arm/amba_device.cc4
-rw-r--r--src/dev/arm/amba_device.hh2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/dev/arm/amba_device.cc b/src/dev/arm/amba_device.cc
index 0ba20d087..540d09615 100644
--- 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 3915e436c..869126146 100644
--- 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);
};