From bcfd132286e8946e989e4ca3b5bfe17f4641033e Mon Sep 17 00:00:00 2001 From: David Reid Date: Fri, 19 Jul 2002 18:36:14 +0000 Subject: [PATCH] Change to the way that interrupts are called. These now are the correct calls for the recent changes. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@349 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/arch/x86/keyboard/keyboard.c | 4 ++-- src/add-ons/kernel/drivers/arch/x86/ps2mouse/ps2mouse.c | 6 +++--- 2 files changed, 5 insertions(+), 5 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 95780cb8c9..559afd68cb 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 = B_UNHANDLED_INTERRUPT; + int retval = B_HANDLED_INTERRUPT; key = in8(0x60); // dprintf("handle_keyboard_interrupt: key = 0x%x\n", key); @@ -306,7 +306,7 @@ static int setup_keyboard(void) status_t init_hardware() { setup_keyboard(); - install_io_interrupt_handler(0x21, &handle_keyboard_interrupt, NULL, 0); + install_io_interrupt_handler(0x01, &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 56edde91ce..d06a8fda20 100644 --- a/src/add-ons/kernel/drivers/arch/x86/ps2mouse/ps2mouse.c +++ b/src/add-ons/kernel/drivers/arch/x86/ps2mouse/ps2mouse.c @@ -55,7 +55,7 @@ #include #define _PS2MOUSE_ -#include +#include "ps2mouse.h" #define DEVICE_NAME "ps2mouse" int32 api_version = B_CUR_DRIVER_API_VERSION; @@ -304,11 +304,11 @@ status_t init_hardware() memset(&md_int, 0, sizeof(mouse_data)); // register interrupt handler - install_io_interrupt_handler(INT_BASE + INT_PS2_MOUSE, + install_io_interrupt_handler(INT_PS2_MOUSE, &handle_mouse_interrupt, NULL, 0); // must enable the cascade interrupt - arch_int_enable_io_interrupt(INT_BASE + INT_CASCADE); + arch_int_enable_io_interrupt(INT_CASCADE); // enable auxilary device, IRQs and PS/2 mouse write_command_byte(PS2_CMD_DEV_INIT);