57c57
< #include "params/AmbaDevice.hh"
---
> #include "params/AmbaPioDevice.hh"
61d60
< namespace AmbaDev {
63,70c62,72
< const int AMBA_PER_ID0 = 0xFE0;
< const int AMBA_PER_ID1 = 0xFE4;
< const int AMBA_PER_ID2 = 0xFE8;
< const int AMBA_PER_ID3 = 0xFEC;
< const int AMBA_CEL_ID0 = 0xFF0;
< const int AMBA_CEL_ID1 = 0xFF4;
< const int AMBA_CEL_ID2 = 0xFF8;
< const int AMBA_CEL_ID3 = 0xFFC;
---
> class AmbaDevice
> {
> protected:
> static const int AMBA_PER_ID0 = 0xFE0;
> static const int AMBA_PER_ID1 = 0xFE4;
> static const int AMBA_PER_ID2 = 0xFE8;
> static const int AMBA_PER_ID3 = 0xFEC;
> static const int AMBA_CEL_ID0 = 0xFF0;
> static const int AMBA_CEL_ID1 = 0xFF4;
> static const int AMBA_CEL_ID2 = 0xFF8;
> static const int AMBA_CEL_ID3 = 0xFFC;
72,73c74,75
< bool readId(PacketPtr pkt, uint64_t amba_id, Addr pio_addr);
< }
---
> bool readId(PacketPtr pkt, uint64_t amba_id, Addr pio_addr);
> };
75c77,78
< class AmbaDevice : public BasicPioDevice
---
>
> class AmbaPioDevice : public BasicPioDevice, public AmbaDevice
81,82c84,85
< typedef AmbaDeviceParams Params;
< AmbaDevice(const Params *p);
---
> typedef AmbaPioDeviceParams Params;
> AmbaPioDevice(const Params *p);
85c88
< class AmbaIntDevice : public AmbaDevice
---
> class AmbaIntDevice : public AmbaPioDevice
97c100
< class AmbaDmaDevice : public DmaDevice
---
> class AmbaDmaDevice : public DmaDevice, public AmbaDevice