derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: Change how the AMBA device ID checking is done to make it more generic

Browse Source
This commit is contained in:
Ali Saidi
2010-08-23 11:18:40 -05:00
parent 330fada1aa
commit c0ca01ec36
7 changed files with 64 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/dev/arm/amba_device.cc
View File

@@ -50,22 +50,29 @@ AmbaDevice::AmbaDevice(const Params *p)
{
}
bool
AmbaDevice::readId(PacketPtr pkt)
AmbaDmaDevice::AmbaDmaDevice(const Params *p)
: DmaDevice(p), ambaId(ULL(0xb105f00d00000000) | p->amba_id)
{
Addr daddr = pkt->getAddr() - pioAddr;
}
namespace AmbaDev {
bool
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)
return false;
pkt->allocate();
daddr -= AMBA_PER_ID0;
daddr <<= 1;
int byte = (daddr - AMBA_PER_ID0) << 1;
// Too noisy right now
//DPRINTF(AMBA, "Returning %#x for offset %#x(%d)\n", (ambaId >> daddr) & 0xFF,
// pkt->getAddr() - pioAddr, daddr);
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>((ambaId >> daddr) & 0xFF);
pkt->set<uint32_t>((amba_id >> byte) & 0xFF);
return true;
}
} // namespace AmbaDev