From patchwork Sat Apr 26 15:02:07 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: 4069031 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 92F7F9F319 for ; Sat, 26 Apr 2014 15:14:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C046D20254 for ; Sat, 26 Apr 2014 15:14:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 964AF20274 for ; Sat, 26 Apr 2014 15:14:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752044AbaDZPED (ORCPT ); Sat, 26 Apr 2014 11:04:03 -0400 Received: from devoid-pointer.net ([31.31.77.140]:49984 "EHLO smtp.devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751814AbaDZPDQ (ORCPT ); Sat, 26 Apr 2014 11:03:16 -0400 Received: from localhost.localdomain (cst-prg-12-245.cust.vodafone.cz [46.135.12.245]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by smtp.devoid-pointer.net (Postfix) with ESMTPSA id 8B75820BB2; Sat, 26 Apr 2014 17:03:11 +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 v4 08/24] hid: Port hid-emsff to ff-memless-next Date: Sat, 26 Apr 2014 17:02:07 +0200 Message-Id: <1398524543-15012-9-git-send-email-madcatxster@devoid-pointer.net> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1398524543-15012-1-git-send-email-madcatxster@devoid-pointer.net> References: <1398524543-15012-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-emsff to ff-memless-next Signed-off-by: Michal Malý --- drivers/hid/Kconfig | 2 +- drivers/hid/hid-emsff.c | 38 ++++++++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index e076627..a78b5d8 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -213,7 +213,7 @@ config DRAGONRISE_FF config HID_EMS_FF tristate "EMS Production Inc. force feedback support" depends on HID - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT ---help--- Say Y here if you want to enable force feedback support for devices by EMS Production Ltd. diff --git a/drivers/hid/hid-emsff.c b/drivers/hid/hid-emsff.c index d82d75b..c0cbe50 100644 --- a/drivers/hid/hid-emsff.c +++ b/drivers/hid/hid-emsff.c @@ -24,30 +24,44 @@ #include #include #include +#include #include "hid-ids.h" +#define FF_UPDATE_RATE 50 + struct emsff_device { struct hid_report *report; }; static int emsff_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 emsff_device *emsff = data; + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force; int weak, strong; - weak = effect->u.rumble.weak_magnitude; - strong = effect->u.rumble.strong_magnitude; - - dbg_hid("called with 0x%04x 0x%04x\n", strong, weak); - - weak = weak * 0xff / 0xffff; - strong = strong * 0xff / 0xffff; - - emsff->report->field[0]->value[1] = weak; - emsff->report->field[0]->value[2] = strong; + switch (command->cmd) { + case MLNX_START_RUMBLE: + weak = rumble_force->weak; + strong = rumble_force->strong; + + dbg_hid("called with 0x%04x 0x%04x\n", strong, weak); + + weak = weak * 0xff / 0xffff; + strong = strong * 0xff / 0xffff; + + emsff->report->field[0]->value[1] = weak; + emsff->report->field[0]->value[2] = strong; + break; + case MLNX_STOP_RUMBLE: + weak = 0; + strong = 0; + break; + default: + return -EINVAL; + } dbg_hid("running with 0x%02x 0x%02x\n", strong, weak); hid_hw_request(hid, emsff->report, HID_REQ_SET_REPORT); @@ -88,7 +102,7 @@ static int emsff_init(struct hid_device *hid) set_bit(FF_RUMBLE, dev->ffbit); - error = input_ff_create_memless(dev, emsff, emsff_play); + error = input_ff_create_mlnx(dev, emsff, emsff_play, FF_UPDATE_RATE); if (error) { kfree(emsff); return error;