diff options
Diffstat (limited to 'include/asm-i386/keyboard.h')
| -rw-r--r-- | include/asm-i386/keyboard.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/asm-i386/keyboard.h b/include/asm-i386/keyboard.h index 2a7effa3c..4b308f746 100644 --- a/include/asm-i386/keyboard.h +++ b/include/asm-i386/keyboard.h @@ -2,8 +2,6 @@ * linux/include/asm-i386/keyboard.h * * Created 3 Nov 1996 by Geert Uytterhoeven - * - * $Id: keyboard.h,v 1.8 1999/06/10 08:02:38 ralf Exp $ */ /* @@ -16,6 +14,7 @@ #ifdef __KERNEL__ #include <linux/kernel.h> +#include <linux/ioport.h> #include <asm/io.h> #define KEYBOARD_IRQ 1 @@ -40,6 +39,11 @@ extern unsigned char pckbd_sysrq_xlate[128]; #define SYSRQ_KEY 0x54 +/* resource allocation */ +#define kbd_request_region() +#define kbd_request_irq(handler) request_irq(KEYBOARD_IRQ, handler, 0, \ + "keyboard", NULL) + /* How to access the keyboard macros on this platform. */ #define kbd_read_input() inb(KBD_DATA_REG) #define kbd_read_status() inb(KBD_STATUS_REG) @@ -47,13 +51,7 @@ extern unsigned char pckbd_sysrq_xlate[128]; #define kbd_write_command(val) outb(val, KBD_CNTL_REG) /* Some stoneage hardware needs delays after some operations. */ -#define kbd_pause() do { SLOW_DOWN_IO; } while(0) - -/* Get the keyboard controller registers (incomplete decode) */ -#define kbd_request_region() request_region(0x60, 16, "keyboard") - -#define kbd_request_irq() request_irq(KEYBOARD_IRQ, keyboard_interrupt, 0, \ - "keyboard", NULL); +#define kbd_pause() do { } while(0) /* * Machine specific bits for the PS/2 driver @@ -61,8 +59,10 @@ extern unsigned char pckbd_sysrq_xlate[128]; #define AUX_IRQ 12 -#define aux_free_irq(dev_id) free_irq(AUX_IRQ, AUX_DEV) -request_irq(AUX_IRQ, keyboard_interrupt, SA_SHIRQ, "PS/2 Mouse", AUX_DEV) +#define aux_request_irq(hand, dev_id) \ + request_irq(AUX_IRQ, hand, SA_SHIRQ, "PS/2 Mouse", dev_id) + +#define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id) #endif /* __KERNEL__ */ -#endif /* __ASM_i386_KEYBOARD_H */ +#endif /* _I386_KEYBOARD_H */ |