diff options
Diffstat (limited to 'src/dev/arm/amba_device.cc')
| -rw-r--r-- | src/dev/arm/amba_device.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/dev/arm/amba_device.cc b/src/dev/arm/amba_device.cc index a9a163fd2..617a67d79 100644 --- a/src/dev/arm/amba_device.cc +++ b/src/dev/arm/amba_device.cc @@ -49,13 +49,13 @@ const uint64_t AmbaVendor = ULL(0xb105f00d00000000); -AmbaDevice::AmbaDevice(const Params *p) +AmbaPioDevice::AmbaPioDevice(const Params *p) : BasicPioDevice(p), ambaId(AmbaVendor | p->amba_id) { } AmbaIntDevice::AmbaIntDevice(const Params *p) - : AmbaDevice(p), intNum(p->int_num), gic(p->gic), intDelay(p->int_delay) + : AmbaPioDevice(p), intNum(p->int_num), gic(p->gic), intDelay(p->int_delay) { } @@ -68,9 +68,8 @@ AmbaDmaDevice::AmbaDmaDevice(const Params *p) { } -namespace AmbaDev { bool -readId(PacketPtr pkt, uint64_t amba_id, Addr pio_addr) +AmbaDevice::readId(PacketPtr pkt, uint64_t amba_id, Addr pio_addr) { Addr daddr = pkt->getAddr() - pio_addr; if (daddr < AMBA_PER_ID0 || daddr > AMBA_CEL_ID3) @@ -80,11 +79,10 @@ readId(PacketPtr pkt, uint64_t amba_id, Addr pio_addr) int byte = (daddr - AMBA_PER_ID0) << 1; // Too noisy right now - DPRINTF(AMBA, "Returning %#x for offset %#x(%d)\n", (amba_id >> byte) & 0xFF, + DPRINTF(AMBA, "Returning %#x for offset %#x(%d)\n", + (amba_id >> byte) & 0xFF, pkt->getAddr() - pio_addr, byte); assert(pkt->getSize() == 4); pkt->set<uint32_t>((amba_id >> byte) & 0xFF); return true; } - -} // namespace AmbaDev |