summaryrefslogtreecommitdiff
path: root/src/dev/arm/rtc_pl031.cc
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@gmail.com>2013-07-11 21:56:39 -0500
committerSteve Reinhardt <stever@gmail.com>2013-07-11 21:56:39 -0500
commit2737650a69f0c56d325c2d9cfd45eef099fbd581 (patch)
tree7e1a7030cdfb961d074729397b6f2c1e24f41e43 /src/dev/arm/rtc_pl031.cc
parentb0b1c0205c438d382aaec54ee4b79b92e1a5e285 (diff)
downloadgem5-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/rtc_pl031.cc')
-rw-r--r--src/dev/arm/rtc_pl031.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/dev/arm/rtc_pl031.cc b/src/dev/arm/rtc_pl031.cc
index 99436c280..ca1486f04 100644
--- a/src/dev/arm/rtc_pl031.cc
+++ b/src/dev/arm/rtc_pl031.cc
@@ -48,8 +48,6 @@
#include "mem/packet.hh"
#include "mem/packet_access.hh"
-using namespace AmbaDev;
-
PL031::PL031(Params *p)
: AmbaIntDevice(p), timeVal(mkutctime(&p->time)), lastWrittenTick(0),
loadVal(0), matchVal(0), rawInt(false), maskInt(false),
@@ -93,7 +91,7 @@ PL031::read(PacketPtr pkt)
data = pendingInt;
break;
default:
- if (AmbaDev::readId(pkt, ambaId, pioAddr)) {
+ if (readId(pkt, ambaId, pioAddr)) {
// Hack for variable sized access
data = pkt->get<uint32_t>();
break;
@@ -156,7 +154,7 @@ PL031::write(PacketPtr pkt)
}
break;
default:
- if (AmbaDev::readId(pkt, ambaId, pioAddr))
+ if (readId(pkt, ambaId, pioAddr))
break;
panic("Tried to read PL031 at offset %#x that doesn't exist\n", daddr);
break;