* AcessOS Microkernel Version
* irq.c
*/
-#include <common.h>
+#include <acess.h>
// === CONSTANTS ===
#define MAX_CALLBACKS_PER_IRQ 4
// === TYPES ===
-typedef void (*tIRQ_Callback)(void);
+typedef void (*tIRQ_Callback)(int);
// === GLOBALS ===
tIRQ_Callback gIRQ_Handlers[16][MAX_CALLBACKS_PER_IRQ];
void IRQ_Handler(tRegs *Regs)
{
int i;
-
+
Regs->int_num -= 0xF0; // Adjust
-
+
//Log("IRQ_Handler: (Regs={int_num:%i})", Regs->int_num);
-
+
for( i = 0; i < MAX_CALLBACKS_PER_IRQ; i++ )
{
//Log(" IRQ_Handler: Call %p", gIRQ_Handlers[Regs->int_num][i]);
if( gIRQ_Handlers[Regs->int_num][i] )
- gIRQ_Handlers[Regs->int_num][i]();
+ gIRQ_Handlers[Regs->int_num][i](Regs->int_num);
}
-
- outb(0x20, 0x20); // ACK IRQ
+
+ //Log(" IRQ_Handler: Resetting");
if(Regs->int_num >= 8)
outb(0xA0, 0x20); // ACK IRQ (Secondary PIC)
+ outb(0x20, 0x20); // ACK IRQ
+ //Log("IRQ_Handler: RETURN");
}
/**
- * \fn int IRQ_AddHandler( int Num, void (*Callback)(void) )
+ * \fn int IRQ_AddHandler( int Num, void (*Callback)(int) )
*/
-int IRQ_AddHandler( int Num, void (*Callback)(void) )
+int IRQ_AddHandler( int Num, void (*Callback)(int) )
{
int i;
for( i = 0; i < MAX_CALLBACKS_PER_IRQ; i++ )
{
if( gIRQ_Handlers[Num][i] == NULL ) {
+ Log_Log("IRQ", "Added IRQ%i Cb#%i %p", Num, i, Callback);
gIRQ_Handlers[Num][i] = Callback;
return 1;
}
}
-
+
+ Log_Warning("IRQ", "No free callbacks on IRQ%i", Num);
return 0;
}