diff options
| author | Steve Reinhardt <stever@gmail.com> | 2013-07-11 21:56:39 -0500 |
|---|---|---|
| committer | Steve Reinhardt <stever@gmail.com> | 2013-07-11 21:56:39 -0500 |
| commit | 2737650a69f0c56d325c2d9cfd45eef099fbd581 (patch) | |
| tree | 7e1a7030cdfb961d074729397b6f2c1e24f41e43 /src/dev/arm/pl011.hh | |
| parent | b0b1c0205c438d382aaec54ee4b79b92e1a5e285 (diff) | |
| download | gem5-2737650a69f0c56d325c2d9cfd45eef099fbd581.tar.xz | |
dev/arm: get rid of AmbaDev namespace
It was confusing having an AmbaDev namespace along with an
AmbaDevice class. The namespace stuff is now moved in to
a new base AmbaDevice class, which is a mixin for classes
AmbaPioDevice (the former AmbaDevice) and AmbaDmaDevice
to provide the readId function as an inherited member function.
Committed by: Nilay Vaish <nilay@cs.wisc.edu>
Diffstat (limited to 'src/dev/arm/pl011.hh')
| -rw-r--r-- | src/dev/arm/pl011.hh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dev/arm/pl011.hh b/src/dev/arm/pl011.hh index a13f635f0..b5c55beab 100644 --- a/src/dev/arm/pl011.hh +++ b/src/dev/arm/pl011.hh @@ -50,13 +50,14 @@ #include "base/bitfield.hh" #include "base/bitunion.hh" +#include "dev/arm/amba_device.hh" #include "dev/io_device.hh" #include "dev/uart.hh" #include "params/Pl011.hh" class BaseGic; -class Pl011 : public Uart +class Pl011 : public Uart, public AmbaDevice { protected: static const uint64_t AMBA_ID = ULL(0xb105f00d00341011); |