> From: Sergey Vlasov <[email protected]>
> Subject: usbhid: Add HID_QUIRK_IGNORE_MOUSE flag
>
> Some HID devices by Apple have both keyboard and mouse interfaces; the
> keyboard interface is handled by usbhid, but the mouse (really
> touchpad) interface must be handled by the separate 'appletouch'
> driver. Using HID_QUIRK_IGNORE will make hiddev ignore both
> interfaces, therefore a new quirk flag to ignore only the mouse
> interface is required.
Exactly. Combing both patches:
Soeren, if this works, please sign it off and send it to Greg.
Signed-off-by: Sergey Vlasov <[email protected]>
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index 0549ec9..0745fcb 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -1626,8 +1626,16 @@ #define USB_DEVICE_ID_LD_POWERCONTROL 0x
#define USB_DEVICE_ID_LD_MACHINETEST 0x2040
#define USB_VENDOR_ID_APPLE 0x05ac
+
+#define USB_DEVICE_ID_APPLE_GEYSER_ANSI 0x0214
+#define USB_DEVICE_ID_APPLE_GEYSER_ISO 0x0215
+#define USB_DEVICE_ID_APPLE_GEYSER_JIS 0x0216
+#define USB_DEVICE_ID_APPLE_GEYSER3_ANSI 0x0217
+#define USB_DEVICE_ID_APPLE_GEYSER3_ISO 0x0218
+#define USB_DEVICE_ID_APPLE_GEYSER3_JIS 0x0219
#define USB_DEVICE_ID_APPLE_MIGHTYMOUSE 0x0304
+
#define USB_VENDOR_ID_CHERRY 0x046a
#define USB_DEVICE_ID_CHERRY_CYMOTION 0x0023
@@ -1801,6 +1809,18 @@ static const struct hid_blacklist {
{ USB_VENDOR_ID_APPLE, 0x030A, HID_QUIRK_POWERBOOK_HAS_FN },
{ USB_VENDOR_ID_APPLE, 0x030B, HID_QUIRK_POWERBOOK_HAS_FN },
+ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI, HID_QUIRK_IGNORE_MOUSE },
+ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO, HID_QUIRK_IGNORE_MOUSE },
+ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS, HID_QUIRK_IGNORE_MOUSE },
+ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI, HID_QUIRK_IGNORE_MOUSE },
+ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO, HID_QUIRK_IGNORE_MOUSE },
+ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS, HID_QUIRK_IGNORE_MOUSE },
+ { USB_VENDOR_ID_APPLE, 0x020E, HID_QUIRK_IGNORE_MOUSE },
+ { USB_VENDOR_ID_APPLE, 0x020F, HID_QUIRK_IGNORE_MOUSE },
+ { USB_VENDOR_ID_APPLE, 0x030A, HID_QUIRK_IGNORE_MOUSE },
+ { USB_VENDOR_ID_APPLE, 0x030B, HID_QUIRK_IGNORE_MOUSE },
+
+
{ USB_VENDOR_ID_PANJIT, 0x0001, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_PANJIT, 0x0002, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_PANJIT, 0x0003, HID_QUIRK_IGNORE },
@@ -1897,6 +1917,9 @@ static struct hid_device *usb_hid_config
if (quirks & HID_QUIRK_IGNORE)
return NULL;
+ if (quirks & HID_QUIRK_IGNORE_MOUSE)
+ if (interface->desc.bInterfaceProtocol == USB_INTERFACE_PROTOCOL_MOUSE)
+ return NULL;
if (usb_get_extra_descriptor(interface, HID_DT_HID, &hdesc) &&
(!interface->desc.bNumEndpoints ||
diff --git a/drivers/usb/input/hid.h b/drivers/usb/input/hid.h
index 9b50eff..abd7b52 100644
--- a/drivers/usb/input/hid.h
+++ b/drivers/usb/input/hid.h
@@ -260,6 +260,7 @@ #define HID_QUIRK_CYMOTION 0x00000800
#define HID_QUIRK_POWERBOOK_HAS_FN 0x00001000
#define HID_QUIRK_POWERBOOK_FN_ON 0x00002000
#define HID_QUIRK_INVERT_HWHEEL 0x00004000
+#define HID_QUIRK_IGNORE_MOUSE 0x00008000
/*
* This is the global environment of the parser. This information is
On Sat, 28 Oct 2006 20:55:03 +0200 (MEST), Oliver Neukum <[email protected]> wrote:
> Exactly. Combing both patches:
> Soeren, if this works, please sign it off and send it to Greg.
>
> Signed-off-by: Sergey Vlasov <[email protected]>
This looks good. However, the love of meaningless whitespace makes
me uneasy. It sets us up for double-patching.
> +#define USB_DEVICE_ID_APPLE_GEYSER3_JIS 0x0219
> #define USB_DEVICE_ID_APPLE_MIGHTYMOUSE 0x0304
>
> +
> #define USB_VENDOR_ID_CHERRY 0x046a
> #define USB_DEVICE_ID_CHERRY_CYMOTION 0x0023
-- Pete
On Sat, 2006-10-28 at 20:55 +0200, Oliver Neukum wrote:
> > From: Sergey Vlasov <[email protected]>
> > Subject: usbhid: Add HID_QUIRK_IGNORE_MOUSE flag
> >
> > Some HID devices by Apple have both keyboard and mouse interfaces; the
> > keyboard interface is handled by usbhid, but the mouse (really
> > touchpad) interface must be handled by the separate 'appletouch'
> > driver. Using HID_QUIRK_IGNORE will make hiddev ignore both
> > interfaces, therefore a new quirk flag to ignore only the mouse
> > interface is required.
>
> Exactly. Combing both patches:
> Soeren, if this works, please sign it off and send it to Greg.
OK, this works, but as the same IDs need the FN key hacks I or'ed the FN
and mouse quirk flags. Also I added the appleir (builtin infrared on the
macbook/pro) to the list of ignored IDs. Therefore the patch though very
similar is again slightly different.
But hey, it worked for me over the last hour on this mbp :-))
Please comment/apply.
Soeren.
--
Sometimes, there's a moment as you're waking, when you become aware of
the real world around you, but you're still dreaming.
On Sat, Oct 28, 2006 at 10:27:46PM +0200, Soeren Sonnenburg wrote:
> On Sat, 2006-10-28 at 20:55 +0200, Oliver Neukum wrote:
> > > From: Sergey Vlasov <[email protected]>
> > > Subject: usbhid: Add HID_QUIRK_IGNORE_MOUSE flag
> > >
> > > Some HID devices by Apple have both keyboard and mouse interfaces; the
> > > keyboard interface is handled by usbhid, but the mouse (really
> > > touchpad) interface must be handled by the separate 'appletouch'
> > > driver. Using HID_QUIRK_IGNORE will make hiddev ignore both
> > > interfaces, therefore a new quirk flag to ignore only the mouse
> > > interface is required.
The appletouch driver doesn't work properly on the MacBook
(non-Pro). It claims the device, and sort of functions, but is
basically unusable.
If this goes in, and blacklists the MacBook touchpad too, Macbook
users will be unhappy. I think the MacBook and the -Pro use the same
IDs, though, which makes a problem for this patch until appletouch is
fixed on MacBooks.
> > Exactly. Combing both patches:
> > Soeren, if this works, please sign it off and send it to Greg.
>
> OK, this works, but as the same IDs need the FN key hacks I or'ed the FN
> and mouse quirk flags. Also I added the appleir (builtin infrared on the
> macbook/pro) to the list of ignored IDs. Therefore the patch though very
> similar is again slightly different.
>
> But hey, it worked for me over the last hour on this mbp :-))
> Please comment/apply.
>
> Soeren.
> Signed-off-by: Soeren Sonnenburg <[email protected]>
> Signed-off-by: Sergey Vlasov <[email protected]>
--
Joseph Fannin
[email protected]
On Mon, 2006-10-30 at 05:12 -0500, Joseph Fannin wrote:
> On Sat, Oct 28, 2006 at 10:27:46PM +0200, Soeren Sonnenburg wrote:
> > On Sat, 2006-10-28 at 20:55 +0200, Oliver Neukum wrote:
> > > > From: Sergey Vlasov <[email protected]>
> > > > Subject: usbhid: Add HID_QUIRK_IGNORE_MOUSE flag
> > > >
> > > > Some HID devices by Apple have both keyboard and mouse interfaces; the
> > > > keyboard interface is handled by usbhid, but the mouse (really
> > > > touchpad) interface must be handled by the separate 'appletouch'
> > > > driver. Using HID_QUIRK_IGNORE will make hiddev ignore both
> > > > interfaces, therefore a new quirk flag to ignore only the mouse
> > > > interface is required.
>
> The appletouch driver doesn't work properly on the MacBook
> (non-Pro). It claims the device, and sort of functions, but is
> basically unusable.
>
> If this goes in, and blacklists the MacBook touchpad too, Macbook
> users will be unhappy. I think the MacBook and the -Pro use the same
> IDs, though, which makes a problem for this patch until appletouch is
> fixed on MacBooks.
Can you please be a bit more specific on this ? Other sites mention it
works http://bbbart.ulyssis.be/gentoomacbook/ ... what are you missing ?
Sensitivity and such can all be tweaked in xorg.conf ...
Soeren
--
Sometimes, there's a moment as you're waking, when you become aware of
the real world oaround you, but you're still dreaming.
On Mon, Oct 30, 2006 at 01:43:31PM +0100, Soeren Sonnenburg wrote:
> On Mon, 2006-10-30 at 05:12 -0500, Joseph Fannin wrote:
> > On Sat, Oct 28, 2006 at 10:27:46PM +0200, Soeren Sonnenburg wrote:
> > > On Sat, 2006-10-28 at 20:55 +0200, Oliver Neukum wrote:
> > > > > From: Sergey Vlasov <[email protected]>
> > > > > Subject: usbhid: Add HID_QUIRK_IGNORE_MOUSE flag
> > > > >
> > > > > Some HID devices by Apple have both keyboard and mouse interfaces; the
> > > > > keyboard interface is handled by usbhid, but the mouse (really
> > > > > touchpad) interface must be handled by the separate 'appletouch'
> > > > > driver. Using HID_QUIRK_IGNORE will make hiddev ignore both
> > > > > interfaces, therefore a new quirk flag to ignore only the mouse
> > > > > interface is required.
> >
> > The appletouch driver doesn't work properly on the MacBook
> > (non-Pro). It claims the device, and sort of functions, but is
> > basically unusable.
> >
> > If this goes in, and blacklists the MacBook touchpad too, Macbook
> > users will be unhappy. I think the MacBook and the -Pro use the same
> > IDs, though, which makes a problem for this patch until appletouch is
> > fixed on MacBooks.
>
> Can you please be a bit more specific on this ? Other sites mention it
> works http://bbbart.ulyssis.be/gentoomacbook/ ... what are you missing ?
> Sensitivity and such can all be tweaked in xorg.conf ...
That's the first I've heard of it working on a vanilla MacBook.
I'm glad. I've only heard of failures before, some by people way
smarter than me.
I wish I could whip out my 'Book and try it again, but it's away
for service. But here's what I do know:
Enabling the "dbg" parameter of the module produced output only
once, when I switched VTs to X and back quickly. The one
time it did work, it dumped so much info to syslog it for all
practical purposes locked the machine up, so I didn't learn much.
Printk's I added to the code that initializes absolute mode for
geiser3 did get printed, though.
I couldn't get debug events out of the driver in any other
situation, and I couldn't reproduce it.
The touchpad doesn't respond to any of the xorg.conf knobs, and
synclient doesn't detect any device. Yes, shm or whatever was
enabled. (I've had a real synaptics pad working before, for what
that's worth.)
Without the ability to tweak the settings, the tap-to-click
sensitivity was way too high, even for people who like that sort of
thing, and the pointer speed lower than that of the hid driver, even
with the GNOME mouse speed stuff turned all the way up.
All my attempts to enable side-scrolling and so on also failed.
Taken with all the other stuff, it seemed to be that the MacBook
touchpad was getting reset and so dropped out of absolute mode just as
soon as the driver enabled it. The one time it actually produced
absolute events, it was because the geiser3 init code won the race
with whatever was resetting it, due to the quick switch to X and back
to vgacon. It was at this point that I decided I was in *way* over my
head.
Maybe it's a misconfiguration, or HAL doing something dumb to the
mouse device, and Gentoo dude didn't have HAL installed. Anyway, it
looks like *someone* got it working. But lots of people have failed,
and they're going to be unhappy when they upgrade their kernel and
their trackpad starts behaving badly.
--
Joseph Fannin
[email protected]
On Mon, 2006-10-30 at 15:05 -0500, Joseph Fannin wrote:
> On Mon, Oct 30, 2006 at 01:43:31PM +0100, Soeren Sonnenburg wrote:
> > On Mon, 2006-10-30 at 05:12 -0500, Joseph Fannin wrote:
> > > On Sat, Oct 28, 2006 at 10:27:46PM +0200, Soeren Sonnenburg wrote:
> > > > On Sat, 2006-10-28 at 20:55 +0200, Oliver Neukum wrote:
> > > > > > From: Sergey Vlasov <[email protected]>
> > > > > > Subject: usbhid: Add HID_QUIRK_IGNORE_MOUSE flag
> > > > > >
> > > > > > Some HID devices by Apple have both keyboard and mouse interfaces; the
> > > > > > keyboard interface is handled by usbhid, but the mouse (really
> > > > > > touchpad) interface must be handled by the separate 'appletouch'
> > > > > > driver. Using HID_QUIRK_IGNORE will make hiddev ignore both
> > > > > > interfaces, therefore a new quirk flag to ignore only the mouse
> > > > > > interface is required.
> > >
> > > The appletouch driver doesn't work properly on the MacBook
> > > (non-Pro). It claims the device, and sort of functions, but is
> > > basically unusable.
> > >
> > > If this goes in, and blacklists the MacBook touchpad too, Macbook
> > > users will be unhappy. I think the MacBook and the -Pro use the same
> > > IDs, though, which makes a problem for this patch until appletouch is
> > > fixed on MacBooks.
> >
> > Can you please be a bit more specific on this ? Other sites mention it
> > works http://bbbart.ulyssis.be/gentoomacbook/ ... what are you missing ?
> > Sensitivity and such can all be tweaked in xorg.conf ...
>
> That's the first I've heard of it working on a vanilla MacBook.
> I'm glad. I've only heard of failures before, some by people way
> smarter than me.
[lots of problems with the appletouch driver]
OK I am asking this on the mactel-linux list... Lets see if these
problems are gone and I find some happy mb appletouch user...
In the worst case this patch could be a config option or will have to be
kept separate.
Soeren.
--
Sometimes, there's a moment as you're waking, when you become aware of
the real world around you, but you're still dreaming.
On Mon, 2006-10-30 at 05:12 -0500, Joseph Fannin wrote:
> On Sat, Oct 28, 2006 at 10:27:46PM +0200, Soeren Sonnenburg wrote:
> > On Sat, 2006-10-28 at 20:55 +0200, Oliver Neukum wrote:
> > > > From: Sergey Vlasov <[email protected]>
> > > > Subject: usbhid: Add HID_QUIRK_IGNORE_MOUSE flag
> > > >
> > > > Some HID devices by Apple have both keyboard and mouse interfaces; the
> > > > keyboard interface is handled by usbhid, but the mouse (really
> > > > touchpad) interface must be handled by the separate 'appletouch'
> > > > driver. Using HID_QUIRK_IGNORE will make hiddev ignore both
> > > > interfaces, therefore a new quirk flag to ignore only the mouse
> > > > interface is required.
>
> The appletouch driver doesn't work properly on the MacBook
> (non-Pro). It claims the device, and sort of functions, but is
> basically unusable.
>
> If this goes in, and blacklists the MacBook touchpad too, Macbook
> users will be unhappy. I think the MacBook and the -Pro use the same
> IDs, though, which makes a problem for this patch until appletouch is
> fixed on MacBooks.
ok, this patch was now in the mactel svn repository since about a month
and I've never ever seen a report about it failing. Also I asked on the
mailinglist for anyone having problems with that and got no answer,
execpt Joseph, the problem you have been seeing might have been that
one:
http://www.mail-archive.com/[email protected]/msg00129.html
I would therefore hope it can be applied and thus appear in .20. I am
attaching the version that is now in mactel-svn (which also includes
geyser4 support).
Soeren
--
Sometimes, there's a moment as you're waking, when you become aware of
the real world around you, but you're still dreaming.
On Fri, 2006-12-08 at 18:19 +0100, Soeren Sonnenburg wrote:
> ok, this patch was now in the mactel svn repository since about a month
> and I've never ever seen a report about it failing. Also I asked on the
> mailinglist for anyone having problems with that and got no answer,
> execpt Joseph, the problem you have been seeing might have been that
> one:
>
> http://www.mail-archive.com/[email protected]/msg00129.html
>
> I would therefore hope it can be applied and thus appear in .20. I am
> attaching the version that is now in mactel-svn (which also includes
> geyser4 support).
I've since gotten my Macbook's trackpad working with the Appletouch
driver also, now, so make that no problems, please.
I don't know what the problems I was seeing were anymore, but I
think it was mostly the difficulty in getting it set up. I understand
that this should help fix that, and wish I hadn't tried to hold it up!
--
Joseph Fannin
[email protected] | [email protected]
On Sat, 2006-12-09 at 21:08 -0500, Joseph Fannin wrote:
> On Fri, 2006-12-08 at 18:19 +0100, Soeren Sonnenburg wrote:
>
> > ok, this patch was now in the mactel svn repository since about a month
> > and I've never ever seen a report about it failing. Also I asked on the
> > mailinglist for anyone having problems with that and got no answer,
> > execpt Joseph, the problem you have been seeing might have been that
> > one:
> >
> > http://www.mail-archive.com/[email protected]/msg00129.html
> >
> > I would therefore hope it can be applied and thus appear in .20. I am
> > attaching the version that is now in mactel-svn (which also includes
> > geyser4 support).
>
> I've since gotten my Macbook's trackpad working with the Appletouch
> driver also, now, so make that no problems, please.
>
> I don't know what the problems I was seeing were anymore, but I
> think it was mostly the difficulty in getting it set up. I understand
> that this should help fix that, and wish I hadn't tried to hold it up!
Greg,
I've noticed that this patch is not in 2.6.20-rc1. Could you please
comment on what is wrong with it / whether it will ever have a chance to
be accepted in the way it is done ?
Thanks,
Soeren
On Fri, Dec 15, 2006 at 09:36:04AM +0100, Soeren Sonnenburg wrote:
> On Sat, 2006-12-09 at 21:08 -0500, Joseph Fannin wrote:
> > On Fri, 2006-12-08 at 18:19 +0100, Soeren Sonnenburg wrote:
> >
> > > ok, this patch was now in the mactel svn repository since about a month
> > > and I've never ever seen a report about it failing. Also I asked on the
> > > mailinglist for anyone having problems with that and got no answer,
> > > execpt Joseph, the problem you have been seeing might have been that
> > > one:
> > >
> > > http://www.mail-archive.com/[email protected]/msg00129.html
> > >
> > > I would therefore hope it can be applied and thus appear in .20. I am
> > > attaching the version that is now in mactel-svn (which also includes
> > > geyser4 support).
> >
> > I've since gotten my Macbook's trackpad working with the Appletouch
> > driver also, now, so make that no problems, please.
> >
> > I don't know what the problems I was seeing were anymore, but I
> > think it was mostly the difficulty in getting it set up. I understand
> > that this should help fix that, and wish I hadn't tried to hold it up!
>
> Greg,
>
> I've noticed that this patch is not in 2.6.20-rc1. Could you please
> comment on what is wrong with it / whether it will ever have a chance to
> be accepted in the way it is done ?
It's in my queue right now, sorry. I'll catch up on it in a few hours.
thanks,
greg k-h
On Fri, 2006-12-15 at 09:56 -0800, Greg KH wrote:
> On Fri, Dec 15, 2006 at 09:36:04AM +0100, Soeren Sonnenburg wrote:
> > On Sat, 2006-12-09 at 21:08 -0500, Joseph Fannin wrote:
> > > On Fri, 2006-12-08 at 18:19 +0100, Soeren Sonnenburg wrote:
[...]
> > Greg,
> >
> > I've noticed that this patch is not in 2.6.20-rc1. Could you please
> > comment on what is wrong with it / whether it will ever have a chance to
> > be accepted in the way it is done ?
>
> It's in my queue right now, sorry. I'll catch up on it in a few hours.
Please find attached a updated version of this patch (for kernel
2.6.20-rc1)
Soeren
--
Sometimes, there's a moment as you're waking, when you become aware of
the real world around you, but you're still dreaming.
On Sat, 2006-12-23 at 11:38 +0100, Soeren Sonnenburg wrote:
> On Fri, 2006-12-15 at 09:56 -0800, Greg KH wrote:
> > On Fri, Dec 15, 2006 at 09:36:04AM +0100, Soeren Sonnenburg wrote:
> > > On Sat, 2006-12-09 at 21:08 -0500, Joseph Fannin wrote:
> > > > On Fri, 2006-12-08 at 18:19 +0100, Soeren Sonnenburg wrote:
> [...]
> > > Greg,
> > >
> > > I've noticed that this patch is not in 2.6.20-rc1. Could you please
> > > comment on what is wrong with it / whether it will ever have a chance to
> > > be accepted in the way it is done ?
> >
> > It's in my queue right now, sorry. I'll catch up on it in a few hours.
This is the updated version for 2.6.20-rc6.
Soeren
--
Sometimes, there's a moment as you're waking, when you become aware of
the real world around you, but you're still dreaming.
On Sat, 27 Jan 2007, Soeren Sonnenburg wrote:
> > > > I've noticed that this patch is not in 2.6.20-rc1. Could you please
> > > > comment on what is wrong with it / whether it will ever have a chance to
> > > > be accepted in the way it is done ?
> > > It's in my queue right now, sorry. I'll catch up on it in a few hours.
> This is the updated version for 2.6.20-rc6.
Greg,
do you have this already in your tree, or should I take it over?
Soeren - could you please submit your patch with proper Signed-off-by
line?
Thanks,
--
Jiri Kosina
On Mon, 2007-01-29 at 10:38 +0100, Jiri Kosina wrote:
> On Sat, 27 Jan 2007, Soeren Sonnenburg wrote:
[...]
> Soeren - could you please submit your patch with proper Signed-off-by
> line?
argh, sorry!
Attached!
Soeren
--
Sometimes, there's a moment as you're waking, when you become aware of
the real world around you, but you're still dreaming.
On Mon, 29 Jan 2007, Jiri Kosina wrote:
> > > > > I've noticed that this patch is not in 2.6.20-rc1. Could you
> > > > > please comment on what is wrong with it / whether it will ever
> > > > > have a chance to be accepted in the way it is done ?
> > > > It's in my queue right now, sorry. I'll catch up on it in a few hours.
> > This is the updated version for 2.6.20-rc6.
> do you have this already in your tree, or should I take it over?
I have checked that it doesn't seem to be in Greg's patchset, so I merged
it into hid tree.
Thanks,
--
Jiri Kosina