From patchwork Sat Apr 26 11:57:51 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: 4068411 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 69A79BFF02 for ; Sat, 26 Apr 2014 12:08:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 916CB20279 for ; Sat, 26 Apr 2014 12:08:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A9FE820256 for ; Sat, 26 Apr 2014 12:08:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752577AbaDZMIT (ORCPT ); Sat, 26 Apr 2014 08:08:19 -0400 Received: from imap.devoid-pointer.net ([31.31.77.140]:49876 "EHLO smtp.devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752569AbaDZMDl (ORCPT ); Sat, 26 Apr 2014 08:03:41 -0400 Received: from localhost.localdomain (cst-prg-5-22.cust.vodafone.cz [46.135.5.22]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by smtp.devoid-pointer.net (Postfix) with ESMTPSA id 4833920BA1; Sat, 26 Apr 2014 14:03:36 +0200 (CEST) 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 14/24] hid: Port hid-pl to ff-memless-next Date: Sat, 26 Apr 2014 13:57:51 +0200 Message-Id: <1398513696-12626-15-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 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.5 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-pl to ff-memless-next Signed-off-by: Michal Malý --- drivers/hid/Kconfig | 2 +- drivers/hid/hid-pl.c | 38 ++++++++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index eb0c7f1..42904e4 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -509,7 +509,7 @@ config HID_PANTHERLORD config PANTHERLORD_FF bool "Pantherlord force feedback support" depends on HID_PANTHERLORD - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT ---help--- Say Y here if you have a PantherLord/GreenAsia based game controller or adapter and want to enable force feedback support for it. diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c index 2dcd7d9..9b539d5 100644 --- a/drivers/hid/hid-pl.c +++ b/drivers/hid/hid-pl.c @@ -44,9 +44,12 @@ #include #include #include +#include #include "hid-ids.h" +#define FF_UPDATE_RATE 50 + #ifdef CONFIG_PANTHERLORD_FF struct plff_device { @@ -57,24 +60,35 @@ struct plff_device { }; static int hid_plff_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 plff_device *plff = 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; - debug("called with 0x%04x 0x%04x", left, right); - - left = left * plff->maxval / 0xffff; - right = right * plff->maxval / 0xffff; + switch (command->cmd) { + case MLNX_START_RUMBLE: + left = rumble_force->strong; + right = rumble_force->weak; + debug("called with 0x%04x 0x%04x", left, right); + + left = left * plff->maxval / 0xffff; + right = right * plff->maxval / 0xffff; + + *plff->strong = left; + *plff->weak = right; + debug("running with 0x%02x 0x%02x", left, right); + break; + case MLNX_STOP_RUMBLE: + *plff->strong = 0; + *plff->weak = 0; + break; + default: + return -EINVAL; + } - *plff->strong = left; - *plff->weak = right; - debug("running with 0x%02x 0x%02x", left, right); hid_hw_request(hid, plff->report, HID_REQ_SET_REPORT); - return 0; } @@ -160,7 +174,7 @@ static int plff_init(struct hid_device *hid) set_bit(FF_RUMBLE, dev->ffbit); - error = input_ff_create_memless(dev, plff, hid_plff_play); + error = input_ff_create_mlnx(dev, plff, hid_plff_play, FF_UPDATE_RATE); if (error) { kfree(plff); return error;