From patchwork Wed Apr 9 11:33:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Michal_Mal=C3=BD?= X-Patchwork-Id: 3954841 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5DAE09F371 for ; Wed, 9 Apr 2014 11:33:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7AF7B20503 for ; Wed, 9 Apr 2014 11:33:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 965B520435 for ; Wed, 9 Apr 2014 11:33:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932781AbaDILdx (ORCPT ); Wed, 9 Apr 2014 07:33:53 -0400 Received: from devoid-pointer.net ([31.31.77.140]:52644 "EHLO devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932542AbaDILdv (ORCPT ); Wed, 9 Apr 2014 07:33:51 -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 0184F21056; Wed, 9 Apr 2014 13:33:47 +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 22/24] Port hid-lg2ff to ff-memless-next Date: Wed, 09 Apr 2014 13:33:48 +0200 Message-ID: <13307215.OmXFEFLT8Q@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-lg2ff to ff-memless-next - Clamp vibration magnitude to range <0x02; 0xfd> to prevent irregular shaking of the vibration motors. Signed-off-by: Elias Vanderstuyft --- drivers/hid/Kconfig | 2 +- drivers/hid/hid-lg2ff.c | 65 ++++++++++++++++++++++++++++++++++--------------- 2 files changed, 47 insertions(+), 20 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 7d617a8..8889b7a 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -372,7 +372,7 @@ config LOGITECH_FF config LOGIRUMBLEPAD2_FF bool "Logitech force feedback support (variant 2)" depends on HID_LOGITECH - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT help Say Y here if you want to enable force feedback support for: - Logitech RumblePad diff --git a/drivers/hid/hid-lg2ff.c b/drivers/hid/hid-lg2ff.c index 0e3fb1a..6ab5327 100644 --- a/drivers/hid/hid-lg2ff.c +++ b/drivers/hid/hid-lg2ff.c @@ -22,42 +22,69 @@ #include +#include #include #include #include "hid-lg.h" +#define FF_UPDATE_RATE 8 + struct lg2ff_device { struct hid_report *report; }; -static int play_effect(struct input_dev *dev, void *data, - struct ff_effect *effect) +static int hid_lg2ff_start_rumble(struct hid_device *hid, struct hid_report *report, + const struct mlnx_rumble_force *rumble) { - struct hid_device *hid = input_get_drvdata(dev); - struct lg2ff_device *lg2ff = data; int weak, strong; - strong = effect->u.rumble.strong_magnitude; - weak = effect->u.rumble.weak_magnitude; +#define CLAMP_QUIRK(x) do { if (x < 2) x = 2; else if (x > 0xfd) x = 0xfd; } \ + while (0) - if (weak || strong) { - weak = weak * 0xff / 0xffff; - strong = strong * 0xff / 0xffff; + /* Scale down from MLNX range */ + strong = rumble->strong * 0xff / 0xffff; + weak = rumble->weak * 0xff / 0xffff; + CLAMP_QUIRK(weak); + CLAMP_QUIRK(strong); - lg2ff->report->field[0]->value[0] = 0x51; - lg2ff->report->field[0]->value[2] = weak; - lg2ff->report->field[0]->value[4] = strong; - } else { - lg2ff->report->field[0]->value[0] = 0xf3; - lg2ff->report->field[0]->value[2] = 0x00; - lg2ff->report->field[0]->value[4] = 0x00; - } + report->field[0]->value[0] = 0x51; + report->field[0]->value[2] = weak; + report->field[0]->value[4] = strong; - hid_hw_request(hid, lg2ff->report, HID_REQ_SET_REPORT); + hid_hw_request(hid, report, HID_REQ_SET_REPORT); return 0; } +static int hid_lg2ff_stop_rumble(struct hid_device *hid, struct hid_report *report) +{ + report->field[0]->value[0] = 0xf3; + report->field[0]->value[2] = 0x00; + report->field[0]->value[4] = 0x00; + + hid_hw_request(hid, report, HID_REQ_SET_REPORT); + return 0; +} + +static int hid_lg2ff_control(struct input_dev *dev, void *data, + const struct mlnx_effect_command *command) +{ + struct hid_device *hid = input_get_drvdata(dev); + struct lg2ff_device *lg2ff = data; + + switch (command->cmd) { + case MLNX_START_RUMBLE: + return hid_lg2ff_start_rumble(hid, lg2ff->report, &command->u.rumble_force); + break; + case MLNX_STOP_RUMBLE: + return hid_lg2ff_stop_rumble(hid, lg2ff->report); + break; + default: + dbg_hid("Unsupported effect command"); + return -EINVAL; + } +} + int lg2ff_init(struct hid_device *hid) { struct lg2ff_device *lg2ff; @@ -78,7 +105,7 @@ int lg2ff_init(struct hid_device *hid) set_bit(FF_RUMBLE, dev->ffbit); - error = input_ff_create_memless(dev, lg2ff, play_effect); + error = input_ff_create_mlnx(dev, lg2ff, hid_lg2ff_control, FF_UPDATE_RATE); if (error) { kfree(lg2ff); return error;