os: use async IRQ interface in Irq_activation

Issue #1456.
This commit is contained in:
Josef Söntgen 2015-04-09 12:02:00 +02:00 committed by Christian Helmuth
parent 85599c072f
commit 0383c68bf6
1 changed files with 22 additions and 5 deletions

View File

@ -46,12 +46,21 @@ class Genode::Irq_activation : Thread_base
Irq_handler &_handler; Irq_handler &_handler;
char _thread_name[8]; char _thread_name[8];
Genode::Signal_receiver _sig_rec;
Genode::Signal_dispatcher<Irq_activation> _dispatcher;
char const *_create_thread_name(unsigned irq_number) char const *_create_thread_name(unsigned irq_number)
{ {
snprintf(_thread_name, sizeof(_thread_name), "irq.%02x", irq_number); snprintf(_thread_name, sizeof(_thread_name), "irq.%02x", irq_number);
return _thread_name; return _thread_name;
} }
void _handle(unsigned)
{
_connection.ack_irq();
_handler.handle_irq(_number);
}
public: public:
/** /**
@ -64,22 +73,30 @@ class Genode::Irq_activation : Thread_base
Irq_activation(int irq_number, Irq_handler &handler, size_t stack_size) Irq_activation(int irq_number, Irq_handler &handler, size_t stack_size)
: :
Thread_base(0, _create_thread_name(irq_number), stack_size), Thread_base(0, _create_thread_name(irq_number), stack_size),
_number(irq_number), _connection(irq_number), _handler(handler) _number(irq_number), _connection(irq_number), _handler(handler),
_dispatcher(_sig_rec, *this, &Irq_activation::_handle)
{ {
start(); start();
_connection.sigh(_dispatcher);
_connection.ack_irq();
} }
/** /**
* Thread entry * Thread entry
* *
* The interrupt thread infinitely waits for interrupts and calls * The interrupt thread infinitely waits for interrupts signals and
* the handler on occurrence. * dispatches the handler on occurrence.
*/ */
void entry() void entry()
{ {
while (true) { while (true) {
_connection.wait_for_irq(); Genode::Signal sig = _sig_rec.wait_for_signal();
_handler.handle_irq(_number); int num = sig.num();
Genode::Signal_dispatcher_base *dispatcher;
dispatcher = dynamic_cast<Genode::Signal_dispatcher_base *>(sig.context());
dispatcher->dispatch(num);
} }
} }
}; };