From patchwork Tue Apr 22 13:59:56 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: 4032601 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 64173BFF02 for ; Tue, 22 Apr 2014 14:09:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7A9752021B for ; Tue, 22 Apr 2014 14:09:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D03720211 for ; Tue, 22 Apr 2014 14:09:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932510AbaDVOIx (ORCPT ); Tue, 22 Apr 2014 10:08:53 -0400 Received: from imap.devoid-pointer.net ([31.31.77.140]:49493 "EHLO smtp.devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751229AbaDVOBH (ORCPT ); Tue, 22 Apr 2014 10:01:07 -0400 Received: from localhost (nat-prf72.natur.cuni.cz [195.113.58.72]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.devoid-pointer.net (Postfix) with ESMTPSA id C781020B6E; Tue, 22 Apr 2014 16:01:03 +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 Subject: [PATCH v2 11/24] input: Port hid-holtekff to ff-memless-next Date: Tue, 22 Apr 2014 15:59:56 +0200 Message-Id: <1398175209-9565-12-git-send-email-madcatxster@devoid-pointer.net> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1398175209-9565-1-git-send-email-madcatxster@devoid-pointer.net> References: <1398175209-9565-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-holtekff to ff-memless-next Signed-off-by: Michal Malý --- drivers/hid/Kconfig | 2 +- drivers/hid/hid-holtekff.c | 47 +++++++++++++++++++++++++++++----------------- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 24b336e..d1d4e77 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -247,7 +247,7 @@ config HID_HOLTEK config HOLTEK_FF bool "Holtek On Line Grip force feedback support" depends on HID_HOLTEK - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT ---help--- Say Y here if you have a Holtek On Line Grip based game controller and want to have force feedback support for it. diff --git a/drivers/hid/hid-holtekff.c b/drivers/hid/hid-holtekff.c index 9325545..9c6064d 100644 --- a/drivers/hid/hid-holtekff.c +++ b/drivers/hid/hid-holtekff.c @@ -27,9 +27,12 @@ #include #include #include +#include #include "hid-ids.h" +#define FF_UPDATE_RATE 50 + #ifdef CONFIG_HOLTEK_FF MODULE_LICENSE("GPL"); @@ -104,34 +107,44 @@ static void holtekff_send(struct holtekff_device *holtekff, } static int holtekff_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 holtekff_device *holtekff = data; + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force; int left, right; /* effect type 1, length 65535 msec */ u8 buf[HOLTEKFF_MSG_LENGTH] = { 0x01, 0x01, 0xff, 0xff, 0x10, 0xe0, 0x00 }; - left = effect->u.rumble.strong_magnitude; - right = effect->u.rumble.weak_magnitude; - dbg_hid("called with 0x%04x 0x%04x\n", left, right); + 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); - if (!left && !right) { - holtekff_send(holtekff, hid, stop_all6); - return 0; - } + if (!left && !right) { + holtekff_send(holtekff, hid, stop_all6); + return 0; + } - if (left) - buf[1] |= 0x80; - if (right) - buf[1] |= 0x40; + if (left) + buf[1] |= 0x80; + if (right) + buf[1] |= 0x40; - /* The device takes a single magnitude, so we just sum them up. */ - buf[6] = min(0xf, (left >> 12) + (right >> 12)); + /* The device takes a single magnitude, so we just sum them up. */ + buf[6] = min(0xf, (left >> 12) + (right >> 12)); - holtekff_send(holtekff, hid, buf); - holtekff_send(holtekff, hid, start_effect_1); + holtekff_send(holtekff, hid, buf); + holtekff_send(holtekff, hid, start_effect_1); + return 0; + case MLNX_STOP_RUMBLE: + holtekff_send(holtekff, hid, stop_all6); + return 0; + default: + return -EINVAL; + } return 0; } @@ -171,7 +184,7 @@ static int holtekff_init(struct hid_device *hid) holtekff_send(holtekff, hid, stop_all4); holtekff_send(holtekff, hid, stop_all6); - error = input_ff_create_memless(dev, holtekff, holtekff_play); + error = input_ff_create_mlnx(dev, holtekff, holtekff_play, FF_UPDATE_RATE); if (error) { kfree(holtekff); return error;