On Tue, Mar 27, 2007 at 12:02:42PM -0400, Dmitry Torokhov wrote:
> On 3/27/07, Greg KH <[EMAIL PROTECTED]> wrote:
> >On Tue, Mar 27, 2007 at 12:51:18AM -0400, Dmitry Torokhov wrote:
> >> On Tuesday 27 March 2007 00:29, Greg KH wrote:
> >> > On Tue, Mar 27, 2007 at 12:13:06AM -0400, Dmitry Torokhov wrote:
> >> > > Hi Greg,
> >> > >
> >> > > As I promised several month ago here is a patch series that moves
> >> > > all USB input devices, except full HID, to drivers/input. The reason
> >> > > behind the move is that I am trying to have all input drivers in
> >> > > the same place in menuconfig, xconfig, etc. I think it makes more
> >> > > sense to have all keyboards, mice, joysticks in the same place
> >instead
> >> > > of hunting for them across entire tree, depending on how they are
> >> > > connected to the box.
> >> > >
> >> > > Pleas elet me know if this is acceptable and if it is who is going
> >> > > to send this to Linus.
> >> >
> >> > It is fine with me for you to do this, and you can send it to Linus if
> >> > you want to, with:
> >> > Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
> >> > added to all of these.
> >> >
> >>
> >> Ok, I'll add them to my tree then and wait for .22 merge window. Do you
> >> have any pending patches against USB input drivers?
> >
> >I have one ati_remote2.c patch and something that touches the gtco
> >driver. I'll be glad to just forward them to you to handle if you want,
> >or I can handle you moving and the merge that way and then send them on
> >to you. Which ever is easier for you, I have no preference either way.
> >
>
> Just send them to me please.
I've attached them below. If you need them in some other format, please
let me know.
thanks,
greg k-h
>From [EMAIL PROTECTED] Sat Mar 17 07:14:21 2007
Date: Sat, 17 Mar 2007 16:14:12 +0200
From: Peter Stokes <[EMAIL PROTECTED]>
To: linux-usb-devel@lists.sourceforge.net
Cc: [EMAIL PROTECTED], [EMAIL PROTECTED]
Subject: USB: ati_remote2: Add channel support
Message-ID: <[EMAIL PROTECTED]>
From: Peter Stokes <[EMAIL PROTECTED]>
Add logical channel support for ATI Remote Wonder II
The ATI Remote Wonder II can be configured with one of 16 unique logical
channels. Allowing up to 16 remotes to be used independently within
range of each other. This change adds functionality to configure the
receiver and filter the input data to respond or exclude remotes
configured with different logical channels.
Signed-off-by: Peter Stokes <[EMAIL PROTECTED]>
Acked-by: Ville Syrjala <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
drivers/usb/input/ati_remote2.c | 89 +++++++++++++++++++++++++++++++++++-----
1 file changed, 80 insertions(+), 9 deletions(-)
--- a/drivers/usb/input/ati_remote2.c
+++ b/drivers/usb/input/ati_remote2.c
@@ -2,6 +2,7 @@
* ati_remote2 - ATI/Philips USB RF remote driver
*
* Copyright (C) 2005 Ville Syrjala <[EMAIL PROTECTED]>
+ * Copyright (C) 2007 Peter Stokes <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
@@ -11,13 +12,29 @@
#include <linux/usb/input.h>
#define DRIVER_DESC "ATI/Philips USB RF remote driver"
-#define DRIVER_VERSION "0.1"
+#define DRIVER_VERSION "0.2"
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_VERSION(DRIVER_VERSION);
MODULE_AUTHOR("Ville Syrjala <[EMAIL PROTECTED]>");
MODULE_LICENSE("GPL");
+/*
+ * ATI Remote Wonder II Channel Configuration
+ *
+ * The remote control can by assigned one of sixteen "channels" in order to
facilitate
+ * the use of multiple remote controls within range of each other.
+ * A remote's "channel" may be altered by pressing and holding the "PC" button
for
+ * approximately 3 seconds, after which the button will slowly flash the count
of the
+ * currently configured "channel", using the numeric keypad enter a number
between 1 and
+ * 16 and then the "PC" button again, the button will slowly flash the count
of the
+ * newly configured "channel".
+ */
+
+static unsigned int channel_mask = 0xFFFF;
+module_param(channel_mask, uint, 0644);
+MODULE_PARM_DESC(channel_mask, "Bitmask of channels to accept
<15:Channel16>...<1:Channel2><0:Channel1>");
+
static unsigned int mode_mask = 0x1F;
module_param(mode_mask, uint, 0644);
MODULE_PARM_DESC(mode_mask, "Bitmask of modes to accept
<4:PC><3:AUX4><2:AUX3><1:AUX2><0:AUX1>");
@@ -146,15 +163,23 @@ static void ati_remote2_input_mouse(stru
{
struct input_dev *idev = ar2->idev;
u8 *data = ar2->buf[0];
+ int channel, mode;
+
+ channel = data[0] >> 4;
+
+ if (!((1 << channel) & channel_mask))
+ return;
+
+ mode = data[0] & 0x0F;
- if (data[0] > 4) {
+ if (mode > 4) {
dev_err(&ar2->intf[0]->dev,
"Unknown mode byte (%02x %02x %02x %02x)\n",
data[3], data[2], data[1], data[0]);
return;
}
- if (!((1 << data[0]) & mode_mask))
+ if (!((1 << mode) & mode_mask))
return;
input_event(idev, EV_REL, REL_X, (s8) data[1]);
@@ -177,9 +202,16 @@ static void ati_remote2_input_key(struct
{
struct input_dev *idev = ar2->idev;
u8 *data = ar2->buf[1];
- int hw_code, index;
+ int channel, mode, hw_code, index;
- if (data[0] > 4) {
+ channel = data[0] >> 4;
+
+ if (!((1 << channel) & channel_mask))
+ return;
+
+ mode = data[0] & 0x0F;
+
+ if (mode > 4) {
dev_err(&ar2->intf[1]->dev,
"Unknown mode byte (%02x %02x %02x %02x)\n",
data[3], data[2], data[1], data[0]);
@@ -199,16 +231,16 @@ static void ati_remote2_input_key(struct
* events for the mouse pad so we filter out any subsequent
* events from the same mode key.
*/
- if (ar2->mode == data[0])
+ if (ar2->mode == mode)
return;
if (data[1] == 0)
- ar2->mode = data[0];
+ ar2->mode = mode;
- hw_code |= data[0] << 8;
+ hw_code |= mode << 8;
}
- if (!((1 << data[0]) & mode_mask))
+ if (!((1 << mode) & mode_mask))
return;
index = ati_remote2_lookup(hw_code);
@@ -379,6 +411,41 @@ static void ati_remote2_urb_cleanup(stru
}
}
+static int ati_remote2_setup(struct ati_remote2 *ar2)
+{
+ int r, i, channel;
+
+ /*
+ * Configure receiver to only accept input from remote "channel"
+ * channel == 0 -> Accept input from any remote channel
+ * channel == 1 -> Only accept input from remote channel 1
+ * channel == 2 -> Only accept input from remote channel 2
+ * ...
+ * channel == 16 -> Only accept input from remote channel 16
+ */
+
+ channel = 0;
+ for (i = 0; i < 16; i++) {
+ if ((1 << i) & channel_mask) {
+ if (!(~(1 << i) & 0xFFFF & channel_mask))
+ channel = i + 1;
+ break;
+ }
+ }
+
+ r = usb_control_msg(ar2->udev, usb_sndctrlpipe(ar2->udev, 0),
+ 0x20,
+ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
+ channel, 0x0, NULL, 0, USB_CTRL_SET_TIMEOUT);
+ if (r) {
+ dev_err(&ar2->udev->dev, "%s - failed to set channel due to
error: %d\n",
+ __FUNCTION__, r);
+ return r;
+ }
+
+ return 0;
+}
+
static int ati_remote2_probe(struct usb_interface *interface, const struct
usb_device_id *id)
{
struct usb_device *udev = interface_to_usbdev(interface);
@@ -409,6 +476,10 @@ static int ati_remote2_probe(struct usb_
if (r)
goto fail2;
+ r = ati_remote2_setup(ar2);
+ if (r)
+ goto fail2;
+
usb_make_path(udev, ar2->phys, sizeof(ar2->phys));
strlcat(ar2->phys, "/input0", sizeof(ar2->phys));
>From [EMAIL PROTECTED] Mon Mar 19 02:26:29 2007
Date: Mon, 19 Mar 2007 10:26:32 +0100
From: Adrian Bunk <[EMAIL PROTECTED]>
To: "Jeremy A. Roberson" <[EMAIL PROTECTED]>, Greg Kroah-Hartman <[EMAIL
PROTECTED]>
Subject: USB: gtco.c: fix a use-before-check
Message-ID: <[EMAIL PROTECTED]>
NULL checks should be before the first dereference.
Spotted by the Coverity checker.
Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
drivers/usb/input/gtco.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
--- a/drivers/usb/input/gtco.c
+++ b/drivers/usb/input/gtco.c
@@ -1047,13 +1047,10 @@ static void gtco_disconnect(struct usb_i
/* Grab private device ptr */
struct gtco *device = usb_get_intfdata (interface);
- struct input_dev *inputdev;
-
- inputdev = device->inputdevice;
/* Now reverse all the registration stuff */
if (device) {
- input_unregister_device(inputdev);
+ input_unregister_device(device->inputdevice);
usb_kill_urb(device->urbinfo);
usb_free_urb(device->urbinfo);
usb_buffer_free(device->usbdev, REPORT_MAX_SIZE,
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
linux-usb-devel@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
