From 2737650a69f0c56d325c2d9cfd45eef099fbd581 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Thu, 11 Jul 2013 21:56:39 -0500 Subject: 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 --- src/dev/arm/pl111.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/dev/arm/pl111.cc') diff --git a/src/dev/arm/pl111.cc b/src/dev/arm/pl111.cc index 5929da07c..c3d684f29 100644 --- a/src/dev/arm/pl111.cc +++ b/src/dev/arm/pl111.cc @@ -55,8 +55,6 @@ // we open up the entire namespace std using std::vector; -using namespace AmbaDev; - // initialize clcd registers Pl111::Pl111(const Params *p) : AmbaDmaDevice(p), lcdTiming0(0), lcdTiming1(0), lcdTiming2(0), @@ -181,7 +179,7 @@ Pl111::read(PacketPtr pkt) data = clcdCrsrMis; break; default: - if (AmbaDev::readId(pkt, AMBA_ID, pioAddr)) { + if (readId(pkt, AMBA_ID, pioAddr)) { // Hack for variable size accesses data = pkt->get(); break; -- cgit v1.2.3