From d3683440923051607ae96974fb2bdc5783993bf4 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 4 Oct 2011 02:26:03 -0700 Subject: SE/FS: Put platform pointers in fewer objects. Not all objects need a platform pointer, and having one creates a dependence on their being a platform object. This change removes the platform pointer to from the base device object and moves it into subclasses that actually need it. --- src/dev/sparc/T1000.py | 1 + src/dev/sparc/iob.cc | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'src/dev/sparc') diff --git a/src/dev/sparc/T1000.py b/src/dev/sparc/T1000.py index cbf390737..901304251 100644 --- a/src/dev/sparc/T1000.py +++ b/src/dev/sparc/T1000.py @@ -46,6 +46,7 @@ class DumbTOD(BasicPioDevice): class Iob(PioDevice): type = 'Iob' + platform = Param.Platform(Parent.any, "Platform this device is part of.") pio_latency = Param.Latency('1ns', "Programed IO latency in simticks") diff --git a/src/dev/sparc/iob.cc b/src/dev/sparc/iob.cc index cbb0bbde0..008e063e0 100644 --- a/src/dev/sparc/iob.cc +++ b/src/dev/sparc/iob.cc @@ -62,9 +62,6 @@ Iob::Iob(const Params *p) pioDelay = p->pio_latency; - // Get the interrupt controller from the platform - ic = platform->intrctrl; - for (int x = 0; x < NumDeviceIds; ++x) { intMan[x].cpu = 0; intMan[x].vector = 0; -- cgit v1.2.3