Re: [patch 1/3] m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible
On Sunday 22 July 2007 08:51, Geert Uytterhoeven wrote: On Sun, 22 Jul 2007, Dmitry Torokhov wrote: On Saturday 21 July 2007 04:27, Geert Uytterhoeven wrote: On Fri, 20 Jul 2007, Dmitry Torokhov wrote: I am OK with adding a new header file. I was just saying that placing that declaration in linux/hid.h makes about the same sense as putting it into linux/scsi.h At first I just wanted to move it. Then I thought about the angry comments I would get about not moving it to a header file ;-) linux/hid.h looked like the best candidate. linux/kbd_kern.h is another option. linux/kbd_kern.h sounds much better. And so it will be. Applied to 'for-linus' branch of input tree, thank you. -- Dmitry ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [patch 1/3] m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible
On Sun, 22 Jul 2007, Dmitry Torokhov wrote:
On Saturday 21 July 2007 04:27, Geert Uytterhoeven wrote:
On Fri, 20 Jul 2007, Dmitry Torokhov wrote:
I am OK with adding a new header file. I was just saying that placing
that declaration in linux/hid.h makes about the same sense as putting
it into linux/scsi.h
At first I just wanted to move it. Then I thought about the angry
comments I would get about not moving it to a header file ;-)
linux/hid.h looked like the best candidate. linux/kbd_kern.h is
another option.
linux/kbd_kern.h sounds much better.
And so it will be.
---
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 [EMAIL PROTECTED]
---
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 -- [EMAIL PROTECTED]
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
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [patch 1/3] m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible
On Fri, 20 Jul 2007, Dmitry Torokhov wrote:
On 7/20/07, Adrian Bunk [EMAIL PROTECTED] wrote:
On Fri, Jul 20, 2007 at 01:47:36PM -0400, Dmitry Torokhov wrote:
On 7/20/07, Geert Uytterhoeven [EMAIL PROTECTED] wrote:
From: Geert Uytterhoeven [EMAIL PROTECTED]
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/hid.h, correct the type of the second parameter, and
include linux/hid.h where needed.
linux/hid.h contains definitions needed for drivers speaking HID
protocol, I don't think we want to put quirks for legacy keyboard
driver there. I'd just move the #ifdef within drivers/char/keyboard.c
for now.
...
If you only move it you will keep the bug of the wrong second parameter.
But if you move it to any header file gcc is able to figure out such
errors itself instead of them being nasty runtime errors.
Such prototypes in C files are really bad since (like in this case) they
prevent the finding of bugs. It doesn't matter which header file you put
the prototype into (it can even be a new one), but it belongs into a
header file.
I am OK with adding a new header file. I was just saying that placing
that declaration in linux/hid.h makes about the same sense as putting
it into linux/scsi.h
At first I just wanted to move it. Then I thought about the angry
comments I would get about not moving it to a header file ;-)
linux/hid.h looked like the best candidate. linux/kbd_kern.h is
another option.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [EMAIL PROTECTED]
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
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [patch 1/3] m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible
Hi Geert, On Saturday 21 July 2007 04:27, Geert Uytterhoeven wrote: On Fri, 20 Jul 2007, Dmitry Torokhov wrote: I am OK with adding a new header file. I was just saying that placing that declaration in linux/hid.h makes about the same sense as putting it into linux/scsi.h At first I just wanted to move it. Then I thought about the angry comments I would get about not moving it to a header file ;-) linux/hid.h looked like the best candidate. linux/kbd_kern.h is another option. linux/kbd_kern.h sounds much better. -- Dmitry ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
[patch 1/3] m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible
From: Geert Uytterhoeven [EMAIL PROTECTED]
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/hid.h, correct the type of the second parameter, and
include linux/hid.h where needed.
Signed-off-by: Geert Uytterhoeven [EMAIL PROTECTED]
---
drivers/char/keyboard.c |5 +
drivers/macintosh/mac_hid.c |1 +
include/linux/hid.h |3 +++
3 files changed, 5 insertions(+), 4 deletions(-)
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -41,6 +41,7 @@
#include linux/sysrq.h
#include linux/input.h
#include linux/reboot.h
+#include linux/hid.h
extern void ctrl_alt_del(void);
@@ -1022,10 +1023,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/hid.h
static struct input_dev *emumousebtn;
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -522,6 +522,9 @@ int usbhid_quirks_init(char **quirks_par
void usbhid_quirks_exit(void);
void usbhid_fixup_report_descriptor(const u16, const u16, char *, unsigned,
char **);
+/* mac hid */
+extern int mac_hid_mouse_emulate_buttons(int, unsigned int, int);
+
#ifdef CONFIG_HID_FF
int hid_ff_init(struct hid_device *hid);
--
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [EMAIL PROTECTED]
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
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [patch 1/3] m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible
Hi Geert, On 7/20/07, Geert Uytterhoeven [EMAIL PROTECTED] wrote: From: Geert Uytterhoeven [EMAIL PROTECTED] 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/hid.h, correct the type of the second parameter, and include linux/hid.h where needed. linux/hid.h contains definitions needed for drivers speaking HID protocol, I don't think we want to put quirks for legacy keyboard driver there. I'd just move the #ifdef within drivers/char/keyboard.c for now. BTW, I don't think that mac button emulation will work well when x86 evdev-based driver gains popularity - it grabs the device and so no event will flow through keyboard driver... We'd need a new solution... -- Dmitry ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [patch 1/3] m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible
On Fri, Jul 20, 2007 at 01:47:36PM -0400, Dmitry Torokhov wrote: Hi Geert, On 7/20/07, Geert Uytterhoeven [EMAIL PROTECTED] wrote: From: Geert Uytterhoeven [EMAIL PROTECTED] 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/hid.h, correct the type of the second parameter, and include linux/hid.h where needed. linux/hid.h contains definitions needed for drivers speaking HID protocol, I don't think we want to put quirks for legacy keyboard driver there. I'd just move the #ifdef within drivers/char/keyboard.c for now. ... If you only move it you will keep the bug of the wrong second parameter. But if you move it to any header file gcc is able to figure out such errors itself instead of them being nasty runtime errors. Such prototypes in C files are really bad since (like in this case) they prevent the finding of bugs. It doesn't matter which header file you put the prototype into (it can even be a new one), but it belongs into a header file. Dmitry cu Adrian -- Is there not promise of rain? Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. Only a promise, Lao Er said. Pearl S. Buck - Dragon Seed ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [patch 1/3] m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible
On Fri, Jul 20, 2007 at 02:51:02PM -0400, Dmitry Torokhov wrote: On 7/20/07, Adrian Bunk [EMAIL PROTECTED] wrote: On Fri, Jul 20, 2007 at 01:47:36PM -0400, Dmitry Torokhov wrote: Hi Geert, On 7/20/07, Geert Uytterhoeven [EMAIL PROTECTED] wrote: From: Geert Uytterhoeven [EMAIL PROTECTED] 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/hid.h, correct the type of the second parameter, and include linux/hid.h where needed. linux/hid.h contains definitions needed for drivers speaking HID protocol, I don't think we want to put quirks for legacy keyboard driver there. I'd just move the #ifdef within drivers/char/keyboard.c for now. ... If you only move it you will keep the bug of the wrong second parameter. But if you move it to any header file gcc is able to figure out such errors itself instead of them being nasty runtime errors. Such prototypes in C files are really bad since (like in this case) they prevent the finding of bugs. It doesn't matter which header file you put the prototype into (it can even be a new one), but it belongs into a header file. I am OK with adding a new header file. I was just saying that placing that declaration in linux/hid.h makes about the same sense as putting it into linux/scsi.h scsi.h would also be fine with me. ;-) Are you making a patch or should I send one? [1] Dmitry cu Adrian [1] for a new header file, not scsi.h -- Is there not promise of rain? Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. Only a promise, Lao Er said. Pearl S. Buck - Dragon Seed ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
