diff options
author | Andreas Sandberg <Andreas.Sandberg@ARM.com> | 2012-10-25 14:05:24 +0100 |
---|---|---|
committer | Andreas Sandberg <Andreas.Sandberg@ARM.com> | 2012-10-25 14:05:24 +0100 |
commit | 81be8b9d157a038c1d8f3ebf7e2ec8eba0eac935 (patch) | |
tree | a10132c3d1938bab3cd79626aead978ca1760d20 /src/dev/arm/amba_device.hh | |
parent | b904bd5437ead0dfc2c4c0977f3d29d63299c601 (diff) | |
download | gem5-81be8b9d157a038c1d8f3ebf7e2ec8eba0eac935.tar.xz |
arm: Create a GIC base class and make the PL390 derive from it
This patch moves the GIC interface to a separate base class and makes
all interrupt devices use that base class instead of a pointer to the
PL390 implementation. This allows us to have multiple GIC
implementations. Future implementations will allow in-kernel GIC
implementations when using hardware virtualization.
--HG--
rename : src/dev/arm/gic.cc => src/dev/arm/gic_pl390.cc
rename : src/dev/arm/gic.hh => src/dev/arm/gic_pl390.hh
Diffstat (limited to 'src/dev/arm/amba_device.hh')
-rw-r--r-- | src/dev/arm/amba_device.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dev/arm/amba_device.hh b/src/dev/arm/amba_device.hh index 92dfed541..6a3ed1c9e 100644 --- a/src/dev/arm/amba_device.hh +++ b/src/dev/arm/amba_device.hh @@ -49,7 +49,7 @@ #ifndef __DEV_ARM_AMBA_DEVICE_HH__ #define __DEV_ARM_AMBA_DEVICE_HH__ -#include "dev/arm/gic.hh" +#include "dev/arm/base_gic.hh" #include "dev/dma_device.hh" #include "dev/io_device.hh" #include "mem/packet.hh" @@ -86,7 +86,7 @@ class AmbaIntDevice : public AmbaDevice { protected: int intNum; - Gic *gic; + BaseGic *gic; Tick intDelay; public: @@ -102,7 +102,7 @@ class AmbaDmaDevice : public DmaDevice Addr pioSize; Tick pioDelay; int intNum; - Gic *gic; + BaseGic *gic; public: typedef AmbaDmaDeviceParams Params; |