From patchwork Wed Apr 9 11:29:42 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: 3954791 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 BACF09F371 for ; Wed, 9 Apr 2014 11:30:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A632920444 for ; Wed, 9 Apr 2014 11:30:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7EBFB20435 for ; Wed, 9 Apr 2014 11:30:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932898AbaDIL3s (ORCPT ); Wed, 9 Apr 2014 07:29:48 -0400 Received: from prifuk.cz ([31.31.77.140]:52633 "EHLO devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932777AbaDIL3p convert rfc822-to-8bit (ORCPT ); Wed, 9 Apr 2014 07:29:45 -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 6347921056; Wed, 9 Apr 2014 13:29:41 +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 19/24] Port hid-zpff to ff-memless-next Date: Wed, 09 Apr 2014 13:29:42 +0200 Message-ID: <1496205.vHVYf5XDMd@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=unavailable 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-zpff to ff-memless-next Signed-off-by: Michal Malý --- drivers/hid/Kconfig | 2 +- drivers/hid/hid-zpff.c | 30 ++++++++++++++++++++++-------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index d1cbad6..7d617a8 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -775,7 +775,7 @@ config HID_ZEROPLUS config ZEROPLUS_FF bool "Zeroplus based game controller force feedback support" depends on HID_ZEROPLUS - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT ---help--- Say Y here if you have a Zeroplus based game controller and want to have force feedback support for it. diff --git a/drivers/hid/hid-zpff.c b/drivers/hid/hid-zpff.c index a29756c..6912500 100644 --- a/drivers/hid/hid-zpff.c +++ b/drivers/hid/hid-zpff.c @@ -25,9 +25,12 @@ #include #include #include +#include #include "hid-ids.h" +#define FF_UPDATE_RATE 50 + #ifdef CONFIG_ZEROPLUS_FF struct zpff_device { @@ -35,10 +38,11 @@ struct zpff_device { }; static int zpff_play(struct input_dev *dev, void *data, - struct ff_effect *effect) + const struct mlnx_effect_command *command) { struct hid_device *hid = input_get_drvdata(dev); struct zpff_device *zpff = data; + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force; int left, right; /* @@ -47,12 +51,22 @@ static int zpff_play(struct input_dev *dev, void *data, * however it is possible that the XFX Executioner is an exception */ - left = effect->u.rumble.strong_magnitude; - right = effect->u.rumble.weak_magnitude; - dbg_hid("called with 0x%04x 0x%04x\n", left, right); - - left = left * 0x7f / 0xffff; - right = right * 0x7f / 0xffff; + switch (command->cmd) { + case MLNX_START_RUMBLE: + left = rumble_force->strong; + right = rumble_force->weak; + dbg_hid("called with 0x%04x 0x%04x\n", left, right); + + left = left * 0x7f / 0xffff; + right = right * 0x7f / 0xffff; + break; + case MLNX_STOP_RUMBLE: + left = 0; + right = 0; + break; + default: + return -EINVAL; + } zpff->report->field[2]->value[0] = left; zpff->report->field[3]->value[0] = right; @@ -83,7 +97,7 @@ static int zpff_init(struct hid_device *hid) set_bit(FF_RUMBLE, dev->ffbit); - error = input_ff_create_memless(dev, zpff, zpff_play); + error = input_ff_create_mlnx(dev, zpff, zpff_play, FF_UPDATE_RATE); if (error) { kfree(zpff); return error;