From fd2ee3a5987b24af5f4b863497bc805fc70b851b Mon Sep 17 00:00:00 2001
From: David Reid <dreid@nowhere.fake>
Date: Fri, 19 Jul 2002 16:02:58 +0000
Subject: [PATCH] Change to the interrupt handler return values.

Also, the style police have visited ps2mouse.c


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@338 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../drivers/arch/x86/keyboard/keyboard.c      |  6 ++---
 .../drivers/arch/x86/ps2mouse/ps2mouse.c      | 22 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/add-ons/kernel/drivers/arch/x86/keyboard/keyboard.c b/src/add-ons/kernel/drivers/arch/x86/keyboard/keyboard.c
index 6a9f227049..95780cb8c9 100644
--- a/src/add-ons/kernel/drivers/arch/x86/keyboard/keyboard.c
+++ b/src/add-ons/kernel/drivers/arch/x86/keyboard/keyboard.c
@@ -158,7 +158,7 @@ static void insert_in_buf(char c)
 static int handle_keyboard_interrupt(void* data)
 {
 	unsigned char key;
-	int retval = INT_NO_RESCHEDULE;
+	int retval = B_UNHANDLED_INTERRUPT;
 
 	key = in8(0x60);
 //	dprintf("handle_keyboard_interrupt: key = 0x%x\n", key);
@@ -220,7 +220,7 @@ static int handle_keyboard_interrupt(void* data)
 //					dprintf("ascii = 0x%x, '%c'\n", ascii, ascii);
 				if(ascii != 0) {
 					insert_in_buf(ascii);
-					retval = INT_RESCHEDULE;
+					retval = B_INVOKE_SCHEDULER;
 				} else {
 //					dprintf("keyboard: unknown scan-code 0x%x\n",key);
 				}
@@ -306,7 +306,7 @@ static int setup_keyboard(void)
 status_t init_hardware()
 {
 	setup_keyboard();
-	int_set_io_interrupt_handler(0x21,&handle_keyboard_interrupt, NULL);
+	install_io_interrupt_handler(0x21, &handle_keyboard_interrupt, NULL, 0);
 
 	return 0;
 }
diff --git a/src/add-ons/kernel/drivers/arch/x86/ps2mouse/ps2mouse.c b/src/add-ons/kernel/drivers/arch/x86/ps2mouse/ps2mouse.c
index 66aa06d512..56edde91ce 100644
--- a/src/add-ons/kernel/drivers/arch/x86/ps2mouse/ps2mouse.c
+++ b/src/add-ons/kernel/drivers/arch/x86/ps2mouse/ps2mouse.c
@@ -111,8 +111,8 @@ static int handle_mouse_interrupt(void* data)
 		break;
 	} // switch
 
-   next_input = (next_input + 1) % 3;
-	return INT_NO_RESCHEDULE;
+	next_input = (next_input + 1) % 3;
+	return B_HANDLED_INTERRUPT;
 } // handle_mouse_interrupt
 
 /////////////////////////////////////////////////////////////////////////
@@ -298,35 +298,35 @@ static unsigned char read_data_byte()
  */
 status_t init_hardware()
 {
-   dprintf("Initializing PS/2 mouse\n");
+	dprintf("Initializing PS/2 mouse\n");
 
-   // init device driver
+	// init device driver
 	memset(&md_int, 0, sizeof(mouse_data));
 
 	// register interrupt handler
-	int_set_io_interrupt_handler(INT_BASE + INT_PS2_MOUSE,
-	   &handle_mouse_interrupt, NULL);
+	install_io_interrupt_handler(INT_BASE + INT_PS2_MOUSE,
+	                             &handle_mouse_interrupt, NULL, 0);
 
 	// must enable the cascade interrupt
 	arch_int_enable_io_interrupt(INT_BASE + INT_CASCADE);
 
 	// enable auxilary device, IRQs and PS/2 mouse
-   write_command_byte(PS2_CMD_DEV_INIT);
+	write_command_byte(PS2_CMD_DEV_INIT);
 	write_aux_byte(PS2_CMD_ENABLE_MOUSE);
 
 	// controller should send ACK if mouse was detected
 	if(read_data_byte() != PS2_RES_ACK) {
-	   dprintf("No PS/2 mouse found\n");
+		dprintf("No PS/2 mouse found\n");
 		return -1;
-	} // if
-
+	} 
+	
 	dprintf("A PS/2 mouse has been successfully detected\n");
 
 	// create the mouse semaphore, used for synchronization between
 	// the interrupt handler and the read() operation
 	mouse_sem = create_sem(0, "ps2_mouse_sem");
 	if(mouse_sem < 0)
-	   panic("failed to create PS/2 mouse semaphore!\n");
+		panic("failed to create PS/2 mouse semaphore!\n");
 
 	return 0;
 } // mouse_dev_init