X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Firq.c;h=9e0647f25145bf748894d49c6ce8a651f0dc17b7;hb=b3fa9a08edcbc459bd8e9df73186e292470ebfc3;hp=848e7e9dba4ca8d6a701ca191df82573b631ff0c;hpb=8bc40333b1401d7616b225945fee53d972c2f418;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/irq.c b/Kernel/arch/x86/irq.c
index 848e7e9d..9e0647f2 100644
--- a/Kernel/arch/x86/irq.c
+++ b/Kernel/arch/x86/irq.c
@@ -2,13 +2,13 @@
  * 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];
@@ -21,36 +21,40 @@ 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("IRQ_AddHandler: Added IRQ%i Cb#%i %p", Num, i, Callback);
 			gIRQ_Handlers[Num][i] = Callback;
 			return 1;
 		}
 	}
-	
+
+	Warning("IRQ_AddHandler - No free callbacks on IRQ%i", Num);
 	return 0;
 }