diff options
author | Michael Schmitz <schmitz@biophys.uni-duesseldorf.de> | 2008-12-16 15:26:03 -0500 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-05-19 12:19:11 -0400 |
commit | 7786908c3c1bb38dcc5cd2c037251c05507eef16 (patch) | |
tree | 48c872a9338bfa05ab78ec7cb073d4b9e5c805cd /arch/m68k | |
parent | 79abeed6ee93231d494c191a9251c0845bd71fdd (diff) |
input/atari: Use the correct mouse interrupt hook
The Atari keyboard driver calls atari_mouse_interrupt_hook if it's set, not
atari_input_mouse_interrupt_hook. Fix below.
[geert] Killed off atari_mouse_interrupt_hook completely, after fixing another
incorrect assignment in atarimouse.c.
Signed-off-by: Michael Schmitz <schmitz@debian.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/atari/atakeyb.c | 7 | ||||
-rw-r--r-- | arch/m68k/include/asm/atarikb.h | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c index db26f0e926a4..95022b04b62d 100644 --- a/arch/m68k/atari/atakeyb.c +++ b/arch/m68k/atari/atakeyb.c | |||
@@ -36,13 +36,10 @@ | |||
36 | 36 | ||
37 | /* Hook for MIDI serial driver */ | 37 | /* Hook for MIDI serial driver */ |
38 | void (*atari_MIDI_interrupt_hook) (void); | 38 | void (*atari_MIDI_interrupt_hook) (void); |
39 | /* Hook for mouse driver */ | ||
40 | void (*atari_mouse_interrupt_hook) (char *); | ||
41 | /* Hook for keyboard inputdev driver */ | 39 | /* Hook for keyboard inputdev driver */ |
42 | void (*atari_input_keyboard_interrupt_hook) (unsigned char, char); | 40 | void (*atari_input_keyboard_interrupt_hook) (unsigned char, char); |
43 | /* Hook for mouse inputdev driver */ | 41 | /* Hook for mouse inputdev driver */ |
44 | void (*atari_input_mouse_interrupt_hook) (char *); | 42 | void (*atari_input_mouse_interrupt_hook) (char *); |
45 | EXPORT_SYMBOL(atari_mouse_interrupt_hook); | ||
46 | EXPORT_SYMBOL(atari_input_keyboard_interrupt_hook); | 43 | EXPORT_SYMBOL(atari_input_keyboard_interrupt_hook); |
47 | EXPORT_SYMBOL(atari_input_mouse_interrupt_hook); | 44 | EXPORT_SYMBOL(atari_input_mouse_interrupt_hook); |
48 | 45 | ||
@@ -263,8 +260,8 @@ repeat: | |||
263 | kb_state.buf[kb_state.len++] = scancode; | 260 | kb_state.buf[kb_state.len++] = scancode; |
264 | if (kb_state.len == 3) { | 261 | if (kb_state.len == 3) { |
265 | kb_state.state = KEYBOARD; | 262 | kb_state.state = KEYBOARD; |
266 | if (atari_mouse_interrupt_hook) | 263 | if (atari_input_mouse_interrupt_hook) |
267 | atari_mouse_interrupt_hook(kb_state.buf); | 264 | atari_input_mouse_interrupt_hook(kb_state.buf); |
268 | } | 265 | } |
269 | break; | 266 | break; |
270 | 267 | ||
diff --git a/arch/m68k/include/asm/atarikb.h b/arch/m68k/include/asm/atarikb.h index 546e7da5804f..68f3622bf591 100644 --- a/arch/m68k/include/asm/atarikb.h +++ b/arch/m68k/include/asm/atarikb.h | |||
@@ -34,8 +34,6 @@ void ikbd_joystick_disable(void); | |||
34 | 34 | ||
35 | /* Hook for MIDI serial driver */ | 35 | /* Hook for MIDI serial driver */ |
36 | extern void (*atari_MIDI_interrupt_hook) (void); | 36 | extern void (*atari_MIDI_interrupt_hook) (void); |
37 | /* Hook for mouse driver */ | ||
38 | extern void (*atari_mouse_interrupt_hook) (char *); | ||
39 | /* Hook for keyboard inputdev driver */ | 37 | /* Hook for keyboard inputdev driver */ |
40 | extern void (*atari_input_keyboard_interrupt_hook) (unsigned char, char); | 38 | extern void (*atari_input_keyboard_interrupt_hook) (unsigned char, char); |
41 | /* Hook for mouse inputdev driver */ | 39 | /* Hook for mouse inputdev driver */ |