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/timer_sp804.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/dev/arm/timer_sp804.cc') diff --git a/src/dev/arm/timer_sp804.cc b/src/dev/arm/timer_sp804.cc index 18a22e108..d4550845d 100644 --- a/src/dev/arm/timer_sp804.cc +++ b/src/dev/arm/timer_sp804.cc @@ -46,10 +46,8 @@ #include "mem/packet.hh" #include "mem/packet_access.hh" -using namespace AmbaDev; - Sp804::Sp804(Params *p) - : AmbaDevice(p), gic(p->gic), timer0(name() + ".timer0", this, p->int_num0, p->clock0), + : AmbaPioDevice(p), gic(p->gic), timer0(name() + ".timer0", this, p->int_num0, p->clock0), timer1(name() + ".timer1", this, p->int_num1, p->clock1) { pioSize = 0xfff; -- cgit v1.2.3