[patch 10/10] m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible

[patch 10/10] m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible

[Geert Uytterhoeven]

[-- Attachment #1: mac-mac_hid_mouse_emulate_buttons-prototype.diff --]
[-- Type: text/plain, Size: 2050 bytes --]

From: Geert Uytterhoeven <geert@linux-m68k.org>

m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible

drivers/char/keyboard.c: In function 'kbd_keycode':
drivers/char/keyboard.c:1142: error: implicit declaration of function 'mac_hid_mouse_emulate_buttons'

The forward declaration of mac_hid_mouse_emulate_buttons() is not visible on
m68k because it's hidden in the middle of a big #ifdef block.

Move it to <linux/kbd_kern.h>, correct the type of the second parameter, and
include <linux/kbd_kern.h> where needed.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 drivers/char/keyboard.c     |    4 ----
 drivers/macintosh/mac_hid.c |    1 +
 include/linux/kbd_kern.h    |    3 +++
 3 files changed, 4 insertions(+), 4 deletions(-)

--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -1022,10 +1022,6 @@ static const unsigned short x86_keycodes
 	308,310,313,314,315,317,318,319,320,357,322,323,324,325,276,330,
 	332,340,365,342,343,344,345,346,356,270,341,368,369,370,371,372 };
 
-#ifdef CONFIG_MAC_EMUMOUSEBTN
-extern int mac_hid_mouse_emulate_buttons(int, int, int);
-#endif /* CONFIG_MAC_EMUMOUSEBTN */
-
 #ifdef CONFIG_SPARC
 static int sparc_l1_a_state = 0;
 extern void sun_do_break(void);
--- a/drivers/macintosh/mac_hid.c
+++ b/drivers/macintosh/mac_hid.c
@@ -13,6 +13,7 @@
 #include <linux/sysctl.h>
 #include <linux/input.h>
 #include <linux/module.h>
+#include <linux/kbd_kern.h>
 
 
 static struct input_dev *emumousebtn;
--- a/include/linux/kbd_kern.h
+++ b/include/linux/kbd_kern.h
@@ -161,4 +161,7 @@ static inline void con_schedule_flip(str
 	schedule_delayed_work(&t->buf.work, 0);
 }
 
+/* mac_hid.c */
+extern int mac_hid_mouse_emulate_buttons(int, unsigned int, int);
+
 #endif

-- 
Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: [patch 10/10] m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible

[Michael Schmitz]

> From: Geert Uytterhoeven <geert@linux-m68k.org>
>
> m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible

With buttons emulation being available via uinput event devices, do we
still need the kernel mouse button emulation? At least on powerpc, it was
declared deprecated long ago ...

Anyone using mouseemu on m68k Mac?

	Michael

Re: [patch 10/10] m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible

[Finn Thain]

On Mon, 13 Aug 2007, Michael Schmitz wrote:

> > From: Geert Uytterhoeven <geert@linux-m68k.org>
> >
> > m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible
> 
> With buttons emulation being available via uinput event devices, do we 
> still need the kernel mouse button emulation? At least on powerpc, it 
> was declared deprecated long ago ...
>
> Anyone using mouseemu on m68k Mac?

Yes, and on powermac too. It provides the paste key for gpm and I'm quite 
fond of it. But if there's a better alternative, I'll happily try it 
instead.

-f

> 
> 	Michael
> -
> To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [patch 10/10] m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible

[Michael Schmitz]

> > Anyone using mouseemu on m68k Mac?
>
> Yes, and on powermac too. It provides the paste key for gpm and I'm quite
> fond of it. But if there's a better alternative, I'll happily try it
> instead.

Too much overhead on m68k? On powermac it never gave me trouble, but I was
surprised to hear people use it on m68k.

If it works OK, we can really drop the kernel support.

	Michael

Re: [patch 10/10] m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible

[Geert Uytterhoeven]

On Mon, 13 Aug 2007, Michael Schmitz wrote:
> > > Anyone using mouseemu on m68k Mac?
> >
> > Yes, and on powermac too. It provides the paste key for gpm and I'm quite
> > fond of it. But if there's a better alternative, I'll happily try it
> > instead.
> 
> Too much overhead on m68k? On powermac it never gave me trouble, but I was
> surprised to hear people use it on m68k.
> 
> If it works OK, we can really drop the kernel support.

If it can be removed completely, for PowerMac, Mac/m68k, and IntelliMac (or
whatever it's called), fine for me!  Please coordinate with the other
Mac people.

But for now, Linus, please apply, as the missing prototype causes a
broken Mac/m68k build.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds