From patchwork Fri Jan 28 11:50:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolai Kondrashov X-Patchwork-Id: 514611 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0SBpJOS032463 for ; Fri, 28 Jan 2011 12:08:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754752Ab1A1LvS (ORCPT ); Fri, 28 Jan 2011 06:51:18 -0500 Received: from mail-ey0-f174.google.com ([209.85.215.174]:59067 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754594Ab1A1LvQ (ORCPT ); Fri, 28 Jan 2011 06:51:16 -0500 Received: by eye27 with SMTP id 27so1476100eye.19 for ; Fri, 28 Jan 2011 03:51:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=o0LNQCtV8bjhplmfq0b+oneAPZubqcleDWAug8+vm7k=; b=Fktq0mgC4fd/b7IvcHj7ndlsM4+X5UY190nlexg4MIU/Y2124pCsqXdGsOBPFEtb25 Zgtp5gWqoQfpM79TVJNBxOutUm486G0+onpzaDa48rAxN8u0izm9NTl26FnWWLseQkP7 dg14Ox9zJJEcUxhnZBxRIcsHRxYjkzOYo/tF8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=b6bb8lXrsmy0fpgC7cuC3sZJDIb9dS+lApTbLkFmFCrwEkel5/1YAtzjOwHiYmdqpv Dqg+NjjF7o5Oz3V50egxABM0enxOTSuqwrZCOWF/pykgrSidsOWG61+o0CUe5+UU6KV8 nC4a6xZqDMhOzuIjta9ctX+H1cbTXXZpEZmiI= Received: by 10.213.34.142 with SMTP id l14mr812803ebd.31.1296215474959; Fri, 28 Jan 2011 03:51:14 -0800 (PST) Received: from pippin.ponomarevs.spb.ru (umbar.oktetlabs.ru [188.134.5.200]) by mx.google.com with ESMTPS id q52sm1196306eei.9.2011.01.28.03.51.13 (version=SSLv3 cipher=RC4-MD5); Fri, 28 Jan 2011 03:51:14 -0800 (PST) From: Nikolai Kondrashov To: Jiri Kosina Cc: Dmitry Torokhov , linux-input , Vladislav Naumov , Nikolai Kondrashov Subject: [PATCH 1/3] Input: rename hid-drff.c to hid-dr.c Date: Fri, 28 Jan 2011 14:50:51 +0300 Message-Id: <1296215454-2586-2-git-send-email-spbnick@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1296215454-2586-1-git-send-email-spbnick@gmail.com> References: <1296215454-2586-1-git-send-email-spbnick@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 28 Jan 2011 12:08:42 +0000 (UTC) diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 6efc2a0..bb744e6 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -34,7 +34,7 @@ obj-$(CONFIG_HID_CANDO) += hid-cando.o obj-$(CONFIG_HID_CHERRY) += hid-cherry.o obj-$(CONFIG_HID_CHICONY) += hid-chicony.o obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o -obj-$(CONFIG_HID_DRAGONRISE) += hid-drff.o +obj-$(CONFIG_HID_DRAGONRISE) += hid-dr.o obj-$(CONFIG_HID_EMS_FF) += hid-emsff.o obj-$(CONFIG_HID_EGALAX) += hid-egalax.o obj-$(CONFIG_HID_ELECOM) += hid-elecom.o diff --git a/drivers/hid/hid-dr.c b/drivers/hid/hid-dr.c new file mode 100644 index 0000000..afcf3d6 --- /dev/null +++ b/drivers/hid/hid-dr.c @@ -0,0 +1,197 @@ +/* + * Force feedback support for DragonRise Inc. game controllers + * + * From what I have gathered, these devices are mass produced in China and are + * distributed under several vendors. They often share the same design as + * the original PlayStation DualShock controller. + * + * 0079:0006 "DragonRise Inc. Generic USB Joystick " + * - tested with a Tesun USB-703 game controller. + * + * Copyright (c) 2009 Richard Walmsley + */ + +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include +#include +#include + +#include "hid-ids.h" + +#ifdef CONFIG_DRAGONRISE_FF +#include "usbhid/usbhid.h" + +struct drff_device { + struct hid_report *report; +}; + +static int drff_play(struct input_dev *dev, void *data, + struct ff_effect *effect) +{ + struct hid_device *hid = input_get_drvdata(dev); + struct drff_device *drff = data; + int strong, weak; + + strong = effect->u.rumble.strong_magnitude; + weak = effect->u.rumble.weak_magnitude; + + dbg_hid("called with 0x%04x 0x%04x", strong, weak); + + if (strong || weak) { + strong = strong * 0xff / 0xffff; + weak = weak * 0xff / 0xffff; + + /* While reverse engineering this device, I found that when + this value is set, it causes the strong rumble to function + at a near maximum speed, so we'll bypass it. */ + if (weak == 0x0a) + weak = 0x0b; + + drff->report->field[0]->value[0] = 0x51; + drff->report->field[0]->value[1] = 0x00; + drff->report->field[0]->value[2] = weak; + drff->report->field[0]->value[4] = strong; + usbhid_submit_report(hid, drff->report, USB_DIR_OUT); + + drff->report->field[0]->value[0] = 0xfa; + drff->report->field[0]->value[1] = 0xfe; + } else { + drff->report->field[0]->value[0] = 0xf3; + drff->report->field[0]->value[1] = 0x00; + } + + drff->report->field[0]->value[2] = 0x00; + drff->report->field[0]->value[4] = 0x00; + dbg_hid("running with 0x%02x 0x%02x", strong, weak); + usbhid_submit_report(hid, drff->report, USB_DIR_OUT); + + return 0; +} + +static int drff_init(struct hid_device *hid) +{ + struct drff_device *drff; + struct hid_report *report; + struct hid_input *hidinput = list_first_entry(&hid->inputs, + struct hid_input, list); + struct list_head *report_list = + &hid->report_enum[HID_OUTPUT_REPORT].report_list; + struct input_dev *dev = hidinput->input; + int error; + + if (list_empty(report_list)) { + hid_err(hid, "no output reports found\n"); + return -ENODEV; + } + + report = list_first_entry(report_list, struct hid_report, list); + if (report->maxfield < 1) { + hid_err(hid, "no fields in the report\n"); + return -ENODEV; + } + + if (report->field[0]->report_count < 7) { + hid_err(hid, "not enough values in the field\n"); + return -ENODEV; + } + + drff = kzalloc(sizeof(struct drff_device), GFP_KERNEL); + if (!drff) + return -ENOMEM; + + set_bit(FF_RUMBLE, dev->ffbit); + + error = input_ff_create_memless(dev, drff, drff_play); + if (error) { + kfree(drff); + return error; + } + + drff->report = report; + drff->report->field[0]->value[0] = 0xf3; + drff->report->field[0]->value[1] = 0x00; + drff->report->field[0]->value[2] = 0x00; + drff->report->field[0]->value[3] = 0x00; + drff->report->field[0]->value[4] = 0x00; + drff->report->field[0]->value[5] = 0x00; + drff->report->field[0]->value[6] = 0x00; + usbhid_submit_report(hid, drff->report, USB_DIR_OUT); + + hid_info(hid, "Force Feedback for DragonRise Inc. " + "game controllers by Richard Walmsley \n"); + + return 0; +} +#else +static inline int drff_init(struct hid_device *hid) +{ + return 0; +} +#endif + +static int dr_probe(struct hid_device *hdev, const struct hid_device_id *id) +{ + int ret; + + dev_dbg(&hdev->dev, "DragonRise Inc. HID hardware probe..."); + + ret = hid_parse(hdev); + if (ret) { + hid_err(hdev, "parse failed\n"); + goto err; + } + + ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF); + if (ret) { + hid_err(hdev, "hw start failed\n"); + goto err; + } + + drff_init(hdev); + + return 0; +err: + return ret; +} + +static const struct hid_device_id dr_devices[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006), }, + { } +}; +MODULE_DEVICE_TABLE(hid, dr_devices); + +static struct hid_driver dr_driver = { + .name = "dragonrise", + .id_table = dr_devices, + .probe = dr_probe, +}; + +static int __init dr_init(void) +{ + return hid_register_driver(&dr_driver); +} + +static void __exit dr_exit(void) +{ + hid_unregister_driver(&dr_driver); +} + +module_init(dr_init); +module_exit(dr_exit); +MODULE_LICENSE("GPL"); diff --git a/drivers/hid/hid-drff.c b/drivers/hid/hid-drff.c deleted file mode 100644 index afcf3d6..0000000 --- a/drivers/hid/hid-drff.c +++ /dev/null @@ -1,197 +0,0 @@ -/* - * Force feedback support for DragonRise Inc. game controllers - * - * From what I have gathered, these devices are mass produced in China and are - * distributed under several vendors. They often share the same design as - * the original PlayStation DualShock controller. - * - * 0079:0006 "DragonRise Inc. Generic USB Joystick " - * - tested with a Tesun USB-703 game controller. - * - * Copyright (c) 2009 Richard Walmsley - */ - -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include -#include -#include -#include - -#include "hid-ids.h" - -#ifdef CONFIG_DRAGONRISE_FF -#include "usbhid/usbhid.h" - -struct drff_device { - struct hid_report *report; -}; - -static int drff_play(struct input_dev *dev, void *data, - struct ff_effect *effect) -{ - struct hid_device *hid = input_get_drvdata(dev); - struct drff_device *drff = data; - int strong, weak; - - strong = effect->u.rumble.strong_magnitude; - weak = effect->u.rumble.weak_magnitude; - - dbg_hid("called with 0x%04x 0x%04x", strong, weak); - - if (strong || weak) { - strong = strong * 0xff / 0xffff; - weak = weak * 0xff / 0xffff; - - /* While reverse engineering this device, I found that when - this value is set, it causes the strong rumble to function - at a near maximum speed, so we'll bypass it. */ - if (weak == 0x0a) - weak = 0x0b; - - drff->report->field[0]->value[0] = 0x51; - drff->report->field[0]->value[1] = 0x00; - drff->report->field[0]->value[2] = weak; - drff->report->field[0]->value[4] = strong; - usbhid_submit_report(hid, drff->report, USB_DIR_OUT); - - drff->report->field[0]->value[0] = 0xfa; - drff->report->field[0]->value[1] = 0xfe; - } else { - drff->report->field[0]->value[0] = 0xf3; - drff->report->field[0]->value[1] = 0x00; - } - - drff->report->field[0]->value[2] = 0x00; - drff->report->field[0]->value[4] = 0x00; - dbg_hid("running with 0x%02x 0x%02x", strong, weak); - usbhid_submit_report(hid, drff->report, USB_DIR_OUT); - - return 0; -} - -static int drff_init(struct hid_device *hid) -{ - struct drff_device *drff; - struct hid_report *report; - struct hid_input *hidinput = list_first_entry(&hid->inputs, - struct hid_input, list); - struct list_head *report_list = - &hid->report_enum[HID_OUTPUT_REPORT].report_list; - struct input_dev *dev = hidinput->input; - int error; - - if (list_empty(report_list)) { - hid_err(hid, "no output reports found\n"); - return -ENODEV; - } - - report = list_first_entry(report_list, struct hid_report, list); - if (report->maxfield < 1) { - hid_err(hid, "no fields in the report\n"); - return -ENODEV; - } - - if (report->field[0]->report_count < 7) { - hid_err(hid, "not enough values in the field\n"); - return -ENODEV; - } - - drff = kzalloc(sizeof(struct drff_device), GFP_KERNEL); - if (!drff) - return -ENOMEM; - - set_bit(FF_RUMBLE, dev->ffbit); - - error = input_ff_create_memless(dev, drff, drff_play); - if (error) { - kfree(drff); - return error; - } - - drff->report = report; - drff->report->field[0]->value[0] = 0xf3; - drff->report->field[0]->value[1] = 0x00; - drff->report->field[0]->value[2] = 0x00; - drff->report->field[0]->value[3] = 0x00; - drff->report->field[0]->value[4] = 0x00; - drff->report->field[0]->value[5] = 0x00; - drff->report->field[0]->value[6] = 0x00; - usbhid_submit_report(hid, drff->report, USB_DIR_OUT); - - hid_info(hid, "Force Feedback for DragonRise Inc. " - "game controllers by Richard Walmsley \n"); - - return 0; -} -#else -static inline int drff_init(struct hid_device *hid) -{ - return 0; -} -#endif - -static int dr_probe(struct hid_device *hdev, const struct hid_device_id *id) -{ - int ret; - - dev_dbg(&hdev->dev, "DragonRise Inc. HID hardware probe..."); - - ret = hid_parse(hdev); - if (ret) { - hid_err(hdev, "parse failed\n"); - goto err; - } - - ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF); - if (ret) { - hid_err(hdev, "hw start failed\n"); - goto err; - } - - drff_init(hdev); - - return 0; -err: - return ret; -} - -static const struct hid_device_id dr_devices[] = { - { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006), }, - { } -}; -MODULE_DEVICE_TABLE(hid, dr_devices); - -static struct hid_driver dr_driver = { - .name = "dragonrise", - .id_table = dr_devices, - .probe = dr_probe, -}; - -static int __init dr_init(void) -{ - return hid_register_driver(&dr_driver); -} - -static void __exit dr_exit(void) -{ - hid_unregister_driver(&dr_driver); -} - -module_init(dr_init); -module_exit(dr_exit); -MODULE_LICENSE("GPL");