ehmry/genode
ehmry/genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

base-hw: Pic::mask for rpi

Browse Source
This commit is contained in:
Norman Feske 2013-09-13 21:38:49 +02:00
parent 33305dd08d
commit 0f663991c1
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
base-hw/src/core/rpi/pic.h
View File

@ -56,7 +56,7 @@ namespace Kernel
public: public:
Pic() : Genode::Mmio(Genode::Board::IRQ_CONTROLLER_BASE) { } Pic() : Genode::Mmio(Genode::Board::IRQ_CONTROLLER_BASE) { mask(); }
bool take_request(unsigned &irq) bool take_request(unsigned &irq)
{ {
@ -69,7 +69,7 @@ namespace Kernel
p2 = read<Irq_pending_gpu_2>(); p2 = read<Irq_pending_gpu_2>();
if (Irq_pending_basic::Timer::get(p)) { if (Irq_pending_basic::Timer::get(p)) {
irq = 0; irq = Irq_pending_basic::Timer::SHIFT;
return true; return true;
} }
@ -89,31 +89,29 @@ namespace Kernel
void unmask() { PDBG("not implemented"); } void unmask() { PDBG("not implemented"); }
void mask() { PDBG("not implemented"); } void mask()
{
write<Irq_disable_basic>(~0);
write<Irq_disable_gpu_1>(~0);
write<Irq_disable_gpu_2>(~0);
}
void unmask(unsigned const i) void unmask(unsigned const i)
{ {
if (i < 8) if (i < 8)
write<Irq_enable_basic>(1 << i); write<Irq_enable_basic>(1 << i);
else if (i < 32 + 8)
else if (i < 32 + 8) {
write<Irq_enable_gpu_1>(1 << (i - 8)); write<Irq_enable_gpu_1>(1 << (i - 8));
write<Irq_enable_basic>(1 << 8); else
} else {
write<Irq_enable_gpu_2>(1 << (i - 8 - 32)); write<Irq_enable_gpu_2>(1 << (i - 8 - 32));
write<Irq_enable_basic>(1 << 9);
}
} }
void mask(unsigned const i) void mask(unsigned const i)
{ {
if (i < 8) if (i < 8)
write<Irq_disable_basic>(1 << i); write<Irq_disable_basic>(1 << i);
else if (i < 32 + 8) else if (i < 32 + 8)
write<Irq_disable_gpu_1>(1 << (i - 8)); write<Irq_disable_gpu_1>(1 << (i - 8));
else else
write<Irq_disable_gpu_2>(1 << (i - 8 - 32)); write<Irq_disable_gpu_2>(1 << (i - 8 - 32));
} }