From patchwork Wed Jan 20 00:04:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Valentin X-Patchwork-Id: 73989 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0K0PGMf016234 for ; Wed, 20 Jan 2010 00:25:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751458Ab0ATAZP (ORCPT ); Tue, 19 Jan 2010 19:25:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753120Ab0ATAZP (ORCPT ); Tue, 19 Jan 2010 19:25:15 -0500 Received: from outpost1.zedat.fu-berlin.de ([130.133.4.66]:33992 "EHLO outpost1.zedat.fu-berlin.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751458Ab0ATAZO (ORCPT ); Tue, 19 Jan 2010 19:25:14 -0500 X-Greylist: delayed 1263 seconds by postgrey-1.27 at vger.kernel.org; Tue, 19 Jan 2010 19:25:13 EST Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost1.zedat.fu-berlin.de (Exim 4.69) with esmtp (envelope-from ) id <1NXO3O-0005Yz-3u>; Wed, 20 Jan 2010 01:04:10 +0100 Received: from i577b753f.versanet.de ([87.123.117.63] helo=rechenknecht2k7) by inpost2.zedat.fu-berlin.de (Exim 4.69) with esmtpsa (envelope-from ) id <1NXO3N-0001Md-Tk>; Wed, 20 Jan 2010 01:04:10 +0100 Date: Wed, 20 Jan 2010 01:04:06 +0100 From: Benjamin Valentin To: linux-input@vger.kernel.org Cc: Dmitry Torokhov Subject: [PATCH][resubmit] xpad.c: Add rumble support for original xbox controller Message-ID: <20100120010406.54a11bc6@rechenknecht2k7> X-Mailer: Claws Mail 3.7.2 (GTK+ 2.18.3; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-Originating-IP: 87.123.117.63 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org --- a/drivers/input/joystick/xpad.c 2010-01-13 21:35:35.081651802 +0100 +++ b/drivers/input/joystick/xpad.c 2010-01-13 22:02:29.313757056 +0100 @@ -446,7 +446,7 @@ static void xpad_irq_in(struct urb *urb) } exit: - retval = usb_submit_urb (urb, GFP_ATOMIC); + retval = usb_submit_urb(urb, GFP_ATOMIC); if (retval) err ("%s - usb_submit_urb failed with result %d", __func__, retval); @@ -505,7 +505,7 @@ static int xpad_init_output(struct usb_i struct usb_endpoint_descriptor *ep_irq_out; int error = -ENOMEM; - if (xpad->xtype != XTYPE_XBOX360) + if (xpad->xtype != XTYPE_XBOX360 && xpad->xtype != XTYPE_XBOX) return 0; xpad->odata = usb_buffer_alloc(xpad->udev, XPAD_PKT_LEN, @@ -535,13 +535,13 @@ static int xpad_init_output(struct usb_i static void xpad_stop_output(struct usb_xpad *xpad) { - if (xpad->xtype == XTYPE_XBOX360) + if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype == XTYPE_XBOX) usb_kill_urb(xpad->irq_out); } static void xpad_deinit_output(struct usb_xpad *xpad) { - if (xpad->xtype == XTYPE_XBOX360) { + if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype == XTYPE_XBOX) { usb_free_urb(xpad->irq_out); usb_buffer_free(xpad->udev, XPAD_PKT_LEN, xpad->odata, xpad->odata_dma); @@ -554,24 +555,46 @@ static void xpad_stop_output(struct usb_ #endif #ifdef CONFIG_JOYSTICK_XPAD_FF -static int xpad_play_effect(struct input_dev *dev, void *data, - struct ff_effect *effect) +static int xpad_send_rumble(struct usb_xpad *xpad, __u8 left, __u8 right) +{ + switch (xpad->xtype) { + case XTYPE_XBOX: + xpad->odata[0] = 0x00; + xpad->odata[1] = 0x06; + xpad->odata[2] = 0x00; + xpad->odata[3] = left; /* left actuator (strong) */ + xpad->odata[4] = 0x00; + xpad->odata[5] = right; /* right actuator (weak) */ + xpad->irq_out->transfer_buffer_length = 6; + break; + case XTYPE_XBOX360: + xpad->odata[0] = 0x00; + xpad->odata[1] = 0x08; + xpad->odata[2] = 0x00; + xpad->odata[3] = left; /* left actuator (strong) */ + xpad->odata[4] = right; /* right actuator (weak) */ + xpad->odata[5] = 0x00; + xpad->odata[6] = 0x00; + xpad->odata[7] = 0x00; + xpad->irq_out->transfer_buffer_length = 8; + break; + default: + dbg("%s - rumble command sent to unsupported xpad type: %d", + __func__, xpad->xtype); + return 0; + } + + return usb_submit_urb(xpad->irq_out, GFP_ATOMIC); +} + +static int xpad_play_effect(struct input_dev *dev, void *data, struct ff_effect *effect) { struct usb_xpad *xpad = input_get_drvdata(dev); if (effect->type == FF_RUMBLE) { - __u16 strong = effect->u.rumble.strong_magnitude; - __u16 weak = effect->u.rumble.weak_magnitude; - xpad->odata[0] = 0x00; - xpad->odata[1] = 0x08; - xpad->odata[2] = 0x00; - xpad->odata[3] = strong / 256; - xpad->odata[4] = weak / 256; - xpad->odata[5] = 0x00; - xpad->odata[6] = 0x00; - xpad->odata[7] = 0x00; - xpad->irq_out->transfer_buffer_length = 8; - usb_submit_urb(xpad->irq_out, GFP_KERNEL); + __u8 strong = effect->u.rumble.strong_magnitude / 256; + __u8 weak = effect->u.rumble.weak_magnitude / 256; + xpad_send_rumble(xpad, strong, weak); } return 0; @@ -579,7 +601,7 @@ static int xpad_play_effect(struct input static int xpad_init_ff(struct usb_xpad *xpad) { - if (xpad->xtype != XTYPE_XBOX360) + if (xpad->xtype != XTYPE_XBOX360 && xpad->xtype != XTYPE_XBOX) return 0; input_set_capability(xpad->dev, EV_FF, FF_RUMBLE);