ChangeSet 1.930.159.1, 2003/06/20 11:50:29-07:00, [EMAIL PROTECTED]
[PATCH] USB: Update for the powermate driver to work with newer devices
this patch updates the powermate driver to work with a minor revision of the
powermate firmware.
drivers/usb/powermate.c | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff -Nru a/drivers/usb/powermate.c b/drivers/usb/powermate.c
--- a/drivers/usb/powermate.c Fri Jun 27 16:27:31 2003
+++ b/drivers/usb/powermate.c Fri Jun 27 16:27:31 2003
@@ -1,9 +1,9 @@
/*
* A driver for the Griffin Technology, Inc. "PowerMate" USB controller dial.
*
- * v1.0, (c)2002 William R Sowerbutts <[EMAIL PROTECTED]>
+ * v1.1, (c)2002 William R Sowerbutts <[EMAIL PROTECTED]>
*
- * This device is a stainless steel knob which connects over USB. It can measure
+ * This device is an anodized aluminium knob which connects over USB. It can measure
* clockwise and anticlockwise rotation. The dial also acts as a pushbutton with
* a spring for automatic release. The base contains a pair of LEDs which illuminate
* the translucent base. It rotates without limit and reports its relative rotation
@@ -49,9 +49,13 @@
#define UPDATE_PULSE_AWAKE (1<<2)
#define UPDATE_PULSE_MODE (1<<3)
-#define POWERMATE_PAYLOAD_SIZE 3
+/* at least two versions of the hardware exist, with differing payload
+ sizes. the first three bytes always contain the "interesting" data in
+ the relevant format. */
+#define POWERMATE_PAYLOAD_SIZE_MAX 6
+#define POWERMATE_PAYLOAD_SIZE_MIN 3
struct powermate_device {
- signed char data[POWERMATE_PAYLOAD_SIZE];
+ signed char data[POWERMATE_PAYLOAD_SIZE_MAX];
struct urb irq, config;
struct usb_ctrlrequest configdr;
struct usb_device *udev;
@@ -266,10 +270,14 @@
pipe = usb_rcvintpipe(udev, endpoint->bEndpointAddress);
maxp = usb_maxpacket(udev, pipe, usb_pipeout(pipe));
- if(maxp != POWERMATE_PAYLOAD_SIZE)
- printk("powermate: Expected payload of %d bytes, found %d bytes!\n",
POWERMATE_PAYLOAD_SIZE, maxp);
+ if(maxp < POWERMATE_PAYLOAD_SIZE_MIN || maxp > POWERMATE_PAYLOAD_SIZE_MAX){
+ printk("powermate: Expected payload of %d--%d bytes, found %d
bytes!\n",
+ POWERMATE_PAYLOAD_SIZE_MIN, POWERMATE_PAYLOAD_SIZE_MAX, maxp);
+ maxp = POWERMATE_PAYLOAD_SIZE_MAX;
+ }
+
- FILL_INT_URB(&pm->irq, udev, pipe, pm->data, POWERMATE_PAYLOAD_SIZE,
powermate_irq, pm, endpoint->bInterval);
+ FILL_INT_URB(&pm->irq, udev, pipe, pm->data, maxp, powermate_irq, pm,
endpoint->bInterval);
/* register our interrupt URB with the USB system */
if(usb_submit_urb(&pm->irq)) {
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
