Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752667AbaDZMD5 (ORCPT ); Sat, 26 Apr 2014 08:03:57 -0400 Received: from devoid-pointer.net ([31.31.77.140]:49900 "EHLO smtp.devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752641AbaDZMDx (ORCPT ); Sat, 26 Apr 2014 08:03:53 -0400 From: =?UTF-8?q?Michal=20Mal=C3=BD?= To: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: dmitry.torokhov@gmail.com, jkosina@suse.cz, elias.vds@gmail.com, anssi.hannula@iki.fi, simon@mungewell.org, =?UTF-8?q?Michal=20Mal=C3=BD?= Subject: [PATCH v3 19/24] hid: Port hid-zpff to ff-memless-next Date: Sat, 26 Apr 2014 13:57:56 +0200 Message-Id: <1398513696-12626-20-git-send-email-madcatxster@devoid-pointer.net> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1398513696-12626-1-git-send-email-madcatxster@devoid-pointer.net> References: <1398513696-12626-1-git-send-email-madcatxster@devoid-pointer.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 23d9776..97d2d8f 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -786,7 +786,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; -- 1.9.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/