[PATCH] drivers/input/joystick/xpad.c: Add rumble support for original xbox controller
in [Kernel]
|
Prev: elf coredump: Add extended numbering support
Next: [RFC] [PATCH 1/2] cgroups: modular subsystems support for use_id
From: Benjamin Valentin on 7 Jan 2010 22:00 This will add rumble support for xbox 1 compatible controllers. I am wondering why XTYPE_XBOX360W is excluded from the rumbling action, however as I have no device to test, I have not touched this. --- /usr/src/linux-source-2.6.33/drivers/input/joystick/xpad.c 2010-01-08 02:56:59.365851076 +0100 +++ xpad.c 2010-01-08 03:13:38.477835651 +0100 @@ -505,7 +505,7 @@ 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 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 +554,43 @@ #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, unsigned char left, unsigned char 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 + xpad->odata[4] = 0x00; + xpad->odata[5] = right; // right actuator + xpad->irq_out->transfer_buffer_length = 6; + return usb_submit_urb(xpad->irq_out, GFP_KERNEL); + case XTYPE_XBOX360: + xpad->odata[0] = 0x00; + xpad->odata[1] = 0x08; + xpad->odata[2] = 0x00; + xpad->odata[3] = left; // left actuator? + xpad->odata[4] = right; // right actuator? + xpad->odata[5] = 0x00; + xpad->odata[6] = 0x00; + xpad->odata[7] = 0x00; + xpad->irq_out->transfer_buffer_length = 8; + return usb_submit_urb(xpad->irq_out, GFP_KERNEL); + default: + dbg("%s - rumble command sent to unsupported xpad type: %d", + __func__, xpad->xtype); + return 0; + } +} + +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); + unsigned char strong = effect->u.rumble.strong_magnitude / 256; + unsigned char weak = effect->u.rumble.weak_magnitude / 256; + xpad_send_rumble(xpad, strong, weak); } return 0; @@ -579,7 +598,7 @@ 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); |