X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Farch%2Fx86%2Firq.c;h=6ec3c2f3b4940db1995b9aaa30fd19b61566b466;hb=HEAD;hp=eb891398529b8fba636b567f22480789c2341634;hpb=45c91b880402af13c4b8f934c53780d7cba24aac;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/arch/x86/irq.c b/KernelLand/Kernel/arch/x86/irq.c
index eb891398..6ec3c2f3 100644
--- a/KernelLand/Kernel/arch/x86/irq.c
+++ b/KernelLand/Kernel/arch/x86/irq.c
@@ -25,12 +25,12 @@ void	*gaIRQ_DataPointers[16][MAX_CALLBACKS_PER_IRQ];
  */
 void IRQ_Handler(tRegs *Regs)
 {
-	 int	i, irq = Regs->int_num - 0xF0;
+	 int	irq = Regs->int_num - 0xF0;
 	 int	bHandled = 0;
 
 	//Log("IRQ_Handler: (Regs={int_num:%i})", Regs->int_num);
 
-	for( i = 0; i < MAX_CALLBACKS_PER_IRQ; i++ )
+	for( int i = 0; i < MAX_CALLBACKS_PER_IRQ; i++ )
 	{
 		if( gIRQ_Handlers[irq][i] ) {
 			gIRQ_Handlers[irq][i](irq, gaIRQ_DataPointers[irq][i]);
@@ -58,17 +58,24 @@ void IRQ_Handler(tRegs *Regs)
  */
 int IRQ_AddHandler( int Num, void (*Callback)(int, void*), void *Ptr )
 {
-	 int	i;
-	for( i = 0; i < MAX_CALLBACKS_PER_IRQ; i++ )
+	for( int 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;
 }