X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Farch%2Fx86%2Firq.c;h=7250debe195c950e279706a00753e32cd19b08da;hb=be5123fe1f4aa66b76ce8ef589362ad21b6bbf72;hp=eb891398529b8fba636b567f22480789c2341634;hpb=a3ef890d4f4e213f69c04dba3fb1df3e1dd8fb54;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/arch/x86/irq.c b/KernelLand/Kernel/arch/x86/irq.c
index eb891398..7250debe 100644
--- a/KernelLand/Kernel/arch/x86/irq.c
+++ b/KernelLand/Kernel/arch/x86/irq.c
@@ -61,14 +61,22 @@ int IRQ_AddHandler( int Num, void (*Callback)(int, void*), void *Ptr )
 	 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);
+		if( gIRQ_Handlers[Num][i] == NULL )
+		{
+			Log_Log("IRQ", "Added IRQ%i Cb#%i %p", Num, i, Callback);
 			gIRQ_Handlers[Num][i] = Callback;
 			gaIRQ_DataPointers[Num][i] = Ptr;
-			return 1;
+			return Num * MAX_CALLBACKS_PER_IRQ + i;
 		}
 	}
 
 	Log_Warning("IRQ", "No free callbacks on IRQ%i", Num);
-	return 0;
+	return -1;
+}
+
+void IRQ_RemHandler(int Handle)
+{
+	 int	Num = Handle / MAX_CALLBACKS_PER_IRQ;
+	 int	id = Handle % MAX_CALLBACKS_PER_IRQ;
+	gIRQ_Handlers[Num][id] = NULL;
 }