From patchwork Sun Feb 23 23:32:23 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: 3705311 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 477FFBF13A for ; Sun, 23 Feb 2014 23:32:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4C188201E4 for ; Sun, 23 Feb 2014 23:32:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 541B7201DD for ; Sun, 23 Feb 2014 23:32:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752036AbaBWXc0 (ORCPT ); Sun, 23 Feb 2014 18:32:26 -0500 Received: from www.prifuk.cz ([31.31.77.241]:41495 "EHLO prifuk.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751545AbaBWXcZ convert rfc822-to-8bit (ORCPT ); Sun, 23 Feb 2014 18:32:25 -0500 Received: from geidi-prime.localnet (228.123.broadband5.iol.cz [88.100.123.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: madcatxster@prifuk.cz) by prifuk.cz (Postfix) with ESMTPSA id A690521007; Mon, 24 Feb 2014 00:32:17 +0100 (CET) From: Michal =?ISO-8859-1?Q?Mal=FD?= To: linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, dmitry.torokhov@gmail.com, anssi.hannula@gmail.com, elias.vds@gmail.com, jkosina@suse.cz, simon@mungewell.org Subject: [PATCH v2 2/4] Port hid-lg4ff to ff-memless-next Date: Mon, 24 Feb 2014 00:32:23 +0100 Message-ID: <1646498.7GVfWfMn8D@geidi-prime> User-Agent: KMail/4.12.2 (Linux/3.13.5-1-ARCHMOD; KDE/4.12.2; x86_64; ; ) In-Reply-To: <1516865.M993BQAYe4@geidi-prime> References: <1516865.M993BQAYe4@geidi-prime> 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.4 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-lg4ff to ff-memless-next Tested-by: Elias Vanderstuyft Signed-off-by: Michal Malý --- v2: Differentiate between "set force to zero" and "stop force completely" drivers/hid/Kconfig | 2 +- drivers/hid/hid-lg4ff.c | 86 +++++++++++++++++++++++++++++-------------------- 2 files changed, 52 insertions(+), 36 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index f722001..11ac17e 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -390,7 +390,7 @@ config LOGIG940_FF config LOGIWHEELS_FF bool "Logitech wheels configuration and force feedback support" depends on HID_LOGITECH - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT default LOGITECH_FF help Say Y here if you want to enable force feedback and range setting diff --git a/drivers/hid/hid-lg4ff.c b/drivers/hid/hid-lg4ff.c index befe0e3..95d2a9f 100644 --- a/drivers/hid/hid-lg4ff.c +++ b/drivers/hid/hid-lg4ff.c @@ -25,6 +25,7 @@ #include +#include #include #include @@ -44,6 +45,8 @@ #define G27_REV_MAJ 0x12 #define G27_REV_MIN 0x38 +#define FF_UPDATE_RATE 8 + #define to_hid_device(pdev) container_of(pdev, struct hid_device, dev) static void hid_lg4ff_set_range_dfp(struct hid_device *hid, u16 range); @@ -182,47 +185,60 @@ int lg4ff_adjust_input_event(struct hid_device *hid, struct hid_field *field, } } -static int hid_lg4ff_play(struct input_dev *dev, void *data, struct ff_effect *effect) +static int hid_lg4ff_start_combined(struct hid_device *hid, struct hid_report *report, + const struct mlnx_simple_force *force) +{ + __s32 *value = report->field[0]->value; + int scaled_x; + + /* Scale down from MLNX range */ + scaled_x = 0x80 - (force->x * 0xff / 0xffff); + + value[0] = 0x11; /* Slot 1 */ + value[1] = 0x08; + value[2] = scaled_x; + value[3] = 0x80; + value[4] = 0x00; + value[5] = 0x00; + value[6] = 0x00; + + hid_hw_request(hid, report, HID_REQ_SET_REPORT); + return 0; +} + +static int hid_lg4ff_stop_combined(struct hid_device *hid, struct hid_report *report) +{ + __s32 *value = report->field[0]->value; + + value[0] = 0x13; /* Slot 1 */ + value[1] = 0x00; + value[2] = 0x00; + value[3] = 0x00; + value[4] = 0x00; + value[5] = 0x00; + value[6] = 0x00; + + hid_hw_request(hid, report, HID_REQ_SET_REPORT); + return 0; +} + +static int hid_lg4ff_control(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); - __s32 *value = report->field[0]->value; - int x; - -#define CLAMP(x) do { if (x < 0) x = 0; else if (x > 0xff) x = 0xff; } while (0) - - switch (effect->type) { - case FF_CONSTANT: - x = effect->u.ramp.start_level + 0x80; /* 0x80 is no force */ - CLAMP(x); - - if (x == 0x80) { - /* De-activate force in slot-1*/ - value[0] = 0x13; - value[1] = 0x00; - value[2] = 0x00; - value[3] = 0x00; - value[4] = 0x00; - value[5] = 0x00; - value[6] = 0x00; - - hid_hw_request(hid, report, HID_REQ_SET_REPORT); - return 0; - } - - value[0] = 0x11; /* Slot 1 */ - value[1] = 0x08; - value[2] = x; - value[3] = 0x80; - value[4] = 0x00; - value[5] = 0x00; - value[6] = 0x00; - hid_hw_request(hid, report, HID_REQ_SET_REPORT); + switch (command->cmd) { + case MLNX_START_COMBINED: + return hid_lg4ff_start_combined(hid, report, &command->u.simple_force); + break; + case MLNX_STOP_COMBINED: + return hid_lg4ff_stop_combined(hid, report); break; + default: + dbg_hid("Unsupported effect command"); + return -EINVAL; } - return 0; } /* Sends default autocentering command compatible with @@ -608,7 +624,7 @@ int lg4ff_init(struct hid_device *hid) for (j = 0; lg4ff_devices[i].ff_effects[j] >= 0; j++) set_bit(lg4ff_devices[i].ff_effects[j], dev->ffbit); - error = input_ff_create_memless(dev, NULL, hid_lg4ff_play); + error = input_ff_create_mlnx(dev, (void *)NULL, hid_lg4ff_control, FF_UPDATE_RATE); if (error) return error;