From patchwork Wed Apr 9 11:24:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Michal_Mal=C3=BD?= X-Patchwork-Id: 3954561 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0D38CBFF02 for ; Wed, 9 Apr 2014 11:24:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 124E4201FA for ; Wed, 9 Apr 2014 11:24:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 25EAF200E6 for ; Wed, 9 Apr 2014 11:24:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932777AbaDILYH (ORCPT ); Wed, 9 Apr 2014 07:24:07 -0400 Received: from devoid-pointer.net ([31.31.77.140]:52610 "EHLO devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932542AbaDILYG convert rfc822-to-8bit (ORCPT ); Wed, 9 Apr 2014 07:24:06 -0400 Received: from sigyn.localnet (228.123.broadband5.iol.cz [88.100.123.228]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by devoid-pointer.net (Postfix) with ESMTPSA id 7EE1D21056; Wed, 9 Apr 2014 13:24:01 +0200 (CEST) From: Michal =?ISO-8859-1?Q?Mal=FD?= To: dmitry.torokhov@gmail.com, jkosina@suse.cz Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Elias Vanderstuyft Subject: [PATCH 12/24] Port hid-lgff to ff-memless-next Date: Wed, 09 Apr 2014 13:24:02 +0200 Message-ID: <1533887.5nzvy1GCXV@sigyn> User-Agent: KMail/4.13 rc (Linux/3.14.0-1-ARCHMOD; KDE/4.12.97; x86_64; ; ) In-Reply-To: <1609685.QRL9N9sQvX@sigyn> References: <1609685.QRL9N9sQvX@sigyn> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Port hid-lgff to ff-memless-next Signed-off-by: Michal Malý --- drivers/hid/Kconfig | 2 +- drivers/hid/hid-lgff.c | 63 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index d1d4e77..c7794ae 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -356,7 +356,7 @@ config HID_LOGITECH_DJ config LOGITECH_FF bool "Logitech force feedback support" depends on HID_LOGITECH - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT help Say Y here if you have one of these devices: - Logitech WingMan Cordless RumblePad diff --git a/drivers/hid/hid-lgff.c b/drivers/hid/hid-lgff.c index e1394af..b929a3a 100644 --- a/drivers/hid/hid-lgff.c +++ b/drivers/hid/hid-lgff.c @@ -31,9 +31,12 @@ #include #include +#include #include "hid-lg.h" +#define FF_UPDATE_RATE 50 + struct dev_type { u16 idVendor; u16 idProduct; @@ -47,6 +50,13 @@ static const signed short ff_rumble[] = { static const signed short ff_joystick[] = { FF_CONSTANT, + FF_RAMP, + FF_PERIODIC, + FF_SQUARE, + FF_TRIANGLE, + FF_SINE, + FF_SAW_UP, + FF_SAW_DOWN, -1 }; @@ -66,45 +76,58 @@ static const struct dev_type devices[] = { { 0x046d, 0xc295, ff_joystick }, }; -static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *effect) +static int hid_lgff_play(struct input_dev *dev, void *data, + const struct mlnx_effect_command *command) { struct hid_device *hid = input_get_drvdata(dev); struct list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT].report_list; struct hid_report *report = list_entry(report_list->next, struct hid_report, list); - int x, y; - unsigned int left, right; -#define CLAMP(x) if (x < 0) x = 0; if (x > 0xff) x = 0xff + switch (command->cmd) { + case MLNX_START_COMBINED: { + const struct mlnx_simple_force *simple_force = &command->u.simple_force; + /* Scale down from MLNX range */ + const int x = 0x80 - (simple_force->x * 0xff / 0xffff); + const int y = simple_force->y * 0xff / 0xffff; - switch (effect->type) { - case FF_CONSTANT: - x = effect->u.ramp.start_level + 0x7f; /* 0x7f is center */ - y = effect->u.ramp.end_level + 0x7f; - CLAMP(x); - CLAMP(y); report->field[0]->value[0] = 0x51; report->field[0]->value[1] = 0x08; report->field[0]->value[2] = x; report->field[0]->value[3] = y; dbg_hid("(x, y)=(%04x, %04x)\n", x, y); - hid_hw_request(hid, report, HID_REQ_SET_REPORT); break; + } + case MLNX_STOP_COMBINED: + report->field[0]->value[0] = 0x51; + report->field[0]->value[1] = 0x08; + report->field[0]->value[2] = 0; + report->field[0]->value[3] = 0; + break; + case MLNX_START_RUMBLE: { + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force; + /* Scale down from MLNX range */ + const unsigned int right = rumble_force->weak * 0xff / 0xffff; + const unsigned int left = rumble_force->strong * 0xff / 0xffff; - case FF_RUMBLE: - right = effect->u.rumble.strong_magnitude; - left = effect->u.rumble.weak_magnitude; - right = right * 0xff / 0xffff; - left = left * 0xff / 0xffff; - CLAMP(left); - CLAMP(right); report->field[0]->value[0] = 0x42; report->field[0]->value[1] = 0x00; report->field[0]->value[2] = left; report->field[0]->value[3] = right; dbg_hid("(left, right)=(%04x, %04x)\n", left, right); - hid_hw_request(hid, report, HID_REQ_SET_REPORT); break; } + case MLNX_STOP_RUMBLE: + report->field[0]->value[0] = 0x42; + report->field[0]->value[1] = 0x00; + report->field[0]->value[2] = 0; + report->field[0]->value[3] = 0; + break; + default: + return -EINVAL; + } + + hid_hw_request(hid, report, HID_REQ_SET_REPORT); + return 0; } @@ -148,7 +171,7 @@ int lgff_init(struct hid_device* hid) for (i = 0; ff_bits[i] >= 0; i++) set_bit(ff_bits[i], dev->ffbit); - error = input_ff_create_memless(dev, NULL, hid_lgff_play); + error = input_ff_create_mlnx(dev, NULL, hid_lgff_play, FF_UPDATE_RATE); if (error) return error;