156,17 → 156,16 |
void ipc_irq_unregister(answerbox_t *box, int irq) |
{ |
ipl_t ipl; |
int mq = irq + IPC_IRQ_RESERVED_VIRTUAL; |
|
ipl = interrupts_disable(); |
spinlock_lock(&irq_conns[mq].lock); |
if (irq_conns[mq].box == box) { |
irq_conns[mq].box = NULL; |
code_free(irq_conns[mq].code); |
irq_conns[mq].code = NULL; |
spinlock_lock(&irq_conns[irq].lock); |
if (irq_conns[irq].box == box) { |
irq_conns[irq].box = NULL; |
code_free(irq_conns[irq].code); |
irq_conns[irq].code = NULL; |
} |
|
spinlock_unlock(&irq_conns[mq].lock); |
spinlock_unlock(&irq_conns[irq].lock); |
interrupts_restore(ipl); |
} |
|
175,7 → 174,6 |
{ |
ipl_t ipl; |
irq_code_t *code; |
int mq = irq + IPC_IRQ_RESERVED_VIRTUAL; |
|
ASSERT(irq_conns); |
|
187,62 → 185,23 |
code = NULL; |
|
ipl = interrupts_disable(); |
spinlock_lock(&irq_conns[mq].lock); |
spinlock_lock(&irq_conns[irq].lock); |
|
if (irq_conns[mq].box) { |
spinlock_unlock(&irq_conns[mq].lock); |
if (irq_conns[irq].box) { |
spinlock_unlock(&irq_conns[irq].lock); |
interrupts_restore(ipl); |
code_free(code); |
return EEXISTS; |
} |
irq_conns[mq].box = box; |
irq_conns[mq].code = code; |
atomic_set(&irq_conns[mq].counter, 0); |
spinlock_unlock(&irq_conns[mq].lock); |
irq_conns[irq].box = box; |
irq_conns[irq].code = code; |
atomic_set(&irq_conns[irq].counter, 0); |
spinlock_unlock(&irq_conns[irq].lock); |
interrupts_restore(ipl); |
|
return 0; |
} |
|
/** Add call to proper answerbox queue |
* |
* Assume irq_conns[mq].lock is locked */ |
static void send_call(int mq, call_t *call) |
{ |
spinlock_lock(&irq_conns[mq].box->irq_lock); |
list_append(&call->link, &irq_conns[mq].box->irq_notifs); |
spinlock_unlock(&irq_conns[mq].box->irq_lock); |
|
waitq_wakeup(&irq_conns[mq].box->wq, 0); |
} |
|
/** Send notification message |
* |
*/ |
void ipc_irq_send_msg(int irq, __native a2, __native a3) |
{ |
call_t *call; |
int mq = irq + IPC_IRQ_RESERVED_VIRTUAL; |
|
spinlock_lock(&irq_conns[mq].lock); |
|
if (irq_conns[mq].box) { |
call = ipc_call_alloc(FRAME_ATOMIC); |
if (!call) { |
spinlock_unlock(&irq_conns[mq].lock); |
return; |
} |
call->flags |= IPC_CALL_NOTIF; |
IPC_SET_METHOD(call->data, IPC_M_INTERRUPT); |
IPC_SET_ARG1(call->data, irq); |
IPC_SET_ARG2(call->data, a2); |
IPC_SET_ARG3(call->data, a3); |
|
send_call(mq, call); |
} |
spinlock_unlock(&irq_conns[mq].lock); |
} |
|
/** Notify process that an irq had happend |
* |
* We expect interrupts to be disabled |
250,42 → 209,40 |
void ipc_irq_send_notif(int irq) |
{ |
call_t *call; |
int mq = irq + IPC_IRQ_RESERVED_VIRTUAL; |
|
ASSERT(irq_conns); |
spinlock_lock(&irq_conns[mq].lock); |
spinlock_lock(&irq_conns[irq].lock); |
|
if (irq_conns[mq].box) { |
if (irq_conns[irq].box) { |
call = ipc_call_alloc(FRAME_ATOMIC); |
if (!call) { |
spinlock_unlock(&irq_conns[mq].lock); |
spinlock_unlock(&irq_conns[irq].lock); |
return; |
} |
call->flags |= IPC_CALL_NOTIF; |
IPC_SET_METHOD(call->data, IPC_M_INTERRUPT); |
IPC_SET_ARG1(call->data, irq); |
IPC_SET_ARG3(call->data, atomic_preinc(&irq_conns[mq].counter)); |
IPC_SET_ARG3(call->data, atomic_preinc(&irq_conns[irq].counter)); |
|
/* Execute code to handle irq */ |
code_execute(call, irq_conns[mq].code); |
|
send_call(mq, call); |
code_execute(call, irq_conns[irq].code); |
|
spinlock_lock(&irq_conns[irq].box->irq_lock); |
list_append(&call->link, &irq_conns[irq].box->irq_notifs); |
spinlock_unlock(&irq_conns[irq].box->irq_lock); |
|
waitq_wakeup(&irq_conns[irq].box->wq, 0); |
} |
|
spinlock_unlock(&irq_conns[mq].lock); |
spinlock_unlock(&irq_conns[irq].lock); |
} |
|
|
/** Initialize table of interrupt handlers |
* |
* @param irqcount Count of required hardware IRQs to be supported |
*/ |
/** Initialize table of interrupt handlers */ |
void ipc_irq_make_table(int irqcount) |
{ |
int i; |
|
irqcount += IPC_IRQ_RESERVED_VIRTUAL; |
|
irq_conns_size = irqcount; |
irq_conns = malloc(irqcount * (sizeof(*irq_conns)), 0); |
for (i=0; i < irqcount; i++) { |