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/RealView.py | |
| 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/RealView.py')
| -rw-r--r-- | src/dev/arm/RealView.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py index 5c2768fb9..731e8abe7 100644 --- a/src/dev/arm/RealView.py +++ b/src/dev/arm/RealView.py @@ -52,13 +52,13 @@ from Uart import Uart from SimpleMemory import SimpleMemory from Gic import * -class AmbaDevice(BasicPioDevice): - type = 'AmbaDevice' +class AmbaPioDevice(BasicPioDevice): + type = 'AmbaPioDevice' abstract = True cxx_header = "dev/arm/amba_device.hh" amba_id = Param.UInt32("ID of AMBA device for kernel detection") -class AmbaIntDevice(AmbaDevice): +class AmbaIntDevice(AmbaPioDevice): type = 'AmbaIntDevice' abstract = True cxx_header = "dev/arm/amba_device.hh" @@ -88,7 +88,7 @@ class RealViewCtrl(BasicPioDevice): proc_id1 = Param.UInt32(0x0C000222, "Processor ID, SYS_PROCID1") idreg = Param.UInt32(0x00000000, "ID Register, SYS_ID") -class AmbaFake(AmbaDevice): +class AmbaFake(AmbaPioDevice): type = 'AmbaFake' cxx_header = "dev/arm/amba_fake.hh" ignore_access = Param.Bool(False, "Ignore reads/writes to this device, (e.g. IsaFake + AMBA)") @@ -102,7 +102,7 @@ class Pl011(Uart): end_on_eot = Param.Bool(False, "End the simulation when a EOT is received on the UART") int_delay = Param.Latency("100ns", "Time between action and interrupt generation by UART") -class Sp804(AmbaDevice): +class Sp804(AmbaPioDevice): type = 'Sp804' cxx_header = "dev/arm/timer_sp804.hh" gic = Param.BaseGic(Parent.any, "Gic to use for interrupting") |