Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756453AbaDVNss (ORCPT ); Tue, 22 Apr 2014 09:48:48 -0400 Received: from imap.devoid-pointer.net ([31.31.77.140]:49420 "EHLO smtp.devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932152AbaDVNqk (ORCPT ); Tue, 22 Apr 2014 09:46:40 -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 Subject: [PATCH 10/24] Port hid-gaff to ff-memless-next Date: Tue, 22 Apr 2014 15:46:00 +0200 Message-Id: <1398174374-9501-11-git-send-email-madcatxster@devoid-pointer.net> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1398174374-9501-1-git-send-email-madcatxster@devoid-pointer.net> References: <1398174374-9501-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 Signed-off-by: Michal Malý --- drivers/hid/Kconfig | 2 +- drivers/hid/hid-gaff.c | 32 +++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 0ba1962..24b336e 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -656,7 +656,7 @@ config HID_GREENASIA config GREENASIA_FF bool "GreenAsia (Product ID 0x12) force feedback support" depends on HID_GREENASIA - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT ---help--- Say Y here if you have a GreenAsia (Product ID 0x12) based game controller (like MANTA Warrior MM816 and SpeedLink Strike2 SL-6635) or adapter diff --git a/drivers/hid/hid-gaff.c b/drivers/hid/hid-gaff.c index 2d8cead..f2f70c1 100644 --- a/drivers/hid/hid-gaff.c +++ b/drivers/hid/hid-gaff.c @@ -31,8 +31,11 @@ #include #include #include +#include #include "hid-ids.h" +#define FF_UPDATE_RATE 50 + #ifdef CONFIG_GREENASIA_FF struct gaff_device { @@ -40,19 +43,30 @@ struct gaff_device { }; static int hid_gaff_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 gaff_device *gaff = data; + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force; int left, right; - left = effect->u.rumble.strong_magnitude; - right = effect->u.rumble.weak_magnitude; - - dbg_hid("called with 0x%04x 0x%04x", left, right); - - left = left * 0xfe / 0xffff; - right = right * 0xfe / 0xffff; + switch (command->cmd) { + case MLNX_START_RUMBLE: + left = rumble_force->strong; + right = rumble_force->weak; + + dbg_hid("called with 0x%04x 0x%04x", left, right); + + left = left * 0xfe / 0xffff; + right = right * 0xfe / 0xffff; + break; + case MLNX_STOP_RUMBLE: + left = 0; + right = 0; + break; + default: + return -EINVAL; + } gaff->report->field[0]->value[0] = 0x51; gaff->report->field[0]->value[1] = 0x0; @@ -109,7 +123,7 @@ static int gaff_init(struct hid_device *hid) set_bit(FF_RUMBLE, dev->ffbit); - error = input_ff_create_memless(dev, gaff, hid_gaff_play); + error = input_ff_create_mlnx(dev, gaff, hid_gaff_play, FF_UPDATE_RATE); if (error) { kfree(gaff); 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/