ppc32: Fix the mac mouse button emulation code

Move the call to mac_hid_mouse_emulate_buttongs to the
right function so it works again in console mode
parent 5dbcd700
...@@ -972,11 +972,6 @@ extern void sun_do_break(void); ...@@ -972,11 +972,6 @@ extern void sun_do_break(void);
static int emulate_raw(struct vc_data *vc, unsigned int keycode, static int emulate_raw(struct vc_data *vc, unsigned int keycode,
unsigned char up_flag) unsigned char up_flag)
{ {
#ifdef CONFIG_MAC_EMUMOUSEBTN
if (mac_hid_mouse_emulate_buttons(1, keycode, !up_flag))
return 0;
#endif /* CONFIG_MAC_EMUMOUSEBTN */
if (keycode > 255 || !x86_keycodes[keycode]) if (keycode > 255 || !x86_keycodes[keycode])
return -1; return -1;
...@@ -1055,6 +1050,11 @@ void kbd_keycode(unsigned int keycode, int down, struct pt_regs *regs) ...@@ -1055,6 +1050,11 @@ void kbd_keycode(unsigned int keycode, int down, struct pt_regs *regs)
rep = (down == 2); rep = (down == 2);
#ifdef CONFIG_MAC_EMUMOUSEBTN
if (mac_hid_mouse_emulate_buttons(1, keycode, down))
return;
#endif /* CONFIG_MAC_EMUMOUSEBTN */
if ((raw_mode = (kbd->kbdmode == VC_RAW))) if ((raw_mode = (kbd->kbdmode == VC_RAW)))
if (emulate_raw(vc, keycode, !down << 7)) if (emulate_raw(vc, keycode, !down << 7))
if (keycode < BTN_MISC) if (keycode < BTN_MISC)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment