Deleted Added
sdiff udiff text old ( 9808:13ffc0066b76 ) new ( 10565:23593fdaadcd )
full compact
1/*
2 * Copyright (c) 2010 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 52 unchanged lines hidden (view full) ---

61
62
63Tick
64Sp804::read(PacketPtr pkt)
65{
66 assert(pkt->getAddr() >= pioAddr && pkt->getAddr() < pioAddr + pioSize);
67 assert(pkt->getSize() == 4);
68 Addr daddr = pkt->getAddr() - pioAddr;
69 pkt->allocate();
70 DPRINTF(Timer, "Reading from DualTimer at offset: %#x\n", daddr);
71
72 if (daddr < Timer::Size)
73 timer0.read(pkt, daddr);
74 else if ((daddr - Timer::Size) < Timer::Size)
75 timer1.read(pkt, daddr - Timer::Size);
76 else if (!readId(pkt, ambaId, pioAddr))
77 panic("Tried to read SP804 at offset %#x that doesn't exist\n", daddr);

--- 38 unchanged lines hidden (view full) ---

116}
117
118Tick
119Sp804::write(PacketPtr pkt)
120{
121 assert(pkt->getAddr() >= pioAddr && pkt->getAddr() < pioAddr + pioSize);
122 assert(pkt->getSize() == 4);
123 Addr daddr = pkt->getAddr() - pioAddr;
124 pkt->allocate();
125 DPRINTF(Timer, "Writing to DualTimer at offset: %#x\n", daddr);
126
127 if (daddr < Timer::Size)
128 timer0.write(pkt, daddr);
129 else if ((daddr - Timer::Size) < Timer::Size)
130 timer1.write(pkt, daddr - Timer::Size);
131 else if (!readId(pkt, ambaId, pioAddr))
132 panic("Tried to write SP804 at offset %#x that doesn't exist\n", daddr);

--- 156 unchanged lines hidden ---