i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change to the way that interrupts are called. These now are the correct

Browse Source 
calls for the recent changes.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@349 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
David Reid
2002-07-19 18:36:14 +00:00
parent b1dba4cbd5
commit bcfd132286
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/arch/x86/keyboard/keyboard.c
+2 -2
View File
@@ -158,7 +158,7 @@ static void insert_in_buf(char c)
static int handle_keyboard_interrupt(void* data) static int handle_keyboard_interrupt(void* data)
{ {
unsigned char key; unsigned char key;
int retval = B_UNHANDLED_INTERRUPT; int retval = B_HANDLED_INTERRUPT;
key = in8(0x60); key = in8(0x60);
// dprintf("handle_keyboard_interrupt: key = 0x%x\n", key); // dprintf("handle_keyboard_interrupt: key = 0x%x\n", key);
@@ -306,7 +306,7 @@ static int setup_keyboard(void)
status_t init_hardware() status_t init_hardware()
{ {
setup_keyboard(); setup_keyboard();
install_io_interrupt_handler(0x21, &handle_keyboard_interrupt, NULL, 0); install_io_interrupt_handler(0x01, &handle_keyboard_interrupt, NULL, 0);
return 0; return 0;
} }
src/add-ons/kernel/drivers/arch/x86/ps2mouse/ps2mouse.c
+3 -3
View File
@@ -55,7 +55,7 @@
#include <string.h> #include <string.h>
#define _PS2MOUSE_ #define _PS2MOUSE_
#include <arch/x86/ps2mouse.h> #include "ps2mouse.h"
#define DEVICE_NAME "ps2mouse" #define DEVICE_NAME "ps2mouse"
int32 api_version = B_CUR_DRIVER_API_VERSION; int32 api_version = B_CUR_DRIVER_API_VERSION;
@@ -304,11 +304,11 @@ status_t init_hardware()
memset(&md_int, 0, sizeof(mouse_data)); memset(&md_int, 0, sizeof(mouse_data));
// register interrupt handler // register interrupt handler
install_io_interrupt_handler(INT_BASE + INT_PS2_MOUSE, install_io_interrupt_handler(INT_PS2_MOUSE,
&handle_mouse_interrupt, NULL, 0); &handle_mouse_interrupt, NULL, 0);
// must enable the cascade interrupt // 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 // enable auxilary device, IRQs and PS/2 mouse
write_command_byte(PS2_CMD_DEV_INIT); write_command_byte(PS2_CMD_DEV_INIT);