From patchwork Sat Apr 26 15:02:16 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: 4068921 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 83CC3BFF02 for ; Sat, 26 Apr 2014 15:13:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9918C2026C for ; Sat, 26 Apr 2014 15:13:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A15C920254 for ; Sat, 26 Apr 2014 15:13:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752223AbaDZPEL (ORCPT ); Sat, 26 Apr 2014 11:04:11 -0400 Received: from transparentnimenzy.cz ([31.31.77.140]:50025 "EHLO smtp.devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751878AbaDZPDi (ORCPT ); Sat, 26 Apr 2014 11:03:38 -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 C171420BCD; Sat, 26 Apr 2014 17:03:33 +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 17/24] hid: Port hid-tmff to ff-memless-next Date: Sat, 26 Apr 2014 17:02:16 +0200 Message-Id: <1398524543-15012-18-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-tmff to ff-memless-next Signed-off-by: Michal Malý --- drivers/hid/Kconfig | 2 +- drivers/hid/hid-tmff.c | 83 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 51 insertions(+), 34 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index e97c382..17ed5cf 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -730,7 +730,7 @@ config HID_THRUSTMASTER config THRUSTMASTER_FF bool "ThrustMaster devices force feedback support" depends on HID_THRUSTMASTER - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT ---help--- Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or 3, a THRUSTMASTER Dual Trigger 3-in-1 or a THRUSTMASTER Ferrari GT diff --git a/drivers/hid/hid-tmff.c b/drivers/hid/hid-tmff.c index b833760..3df000c 100644 --- a/drivers/hid/hid-tmff.c +++ b/drivers/hid/hid-tmff.c @@ -31,9 +31,12 @@ #include #include #include +#include #include "hid-ids.h" +#define FF_UPDATE_RATE 50 + static const signed short ff_rumble[] = { FF_RUMBLE, -1 @@ -41,6 +44,13 @@ static const signed short ff_rumble[] = { static const signed short ff_joystick[] = { FF_CONSTANT, + FF_RAMP, + FF_PERIODIC, + FF_SINE, + FF_SQUARE, + FF_TRIANGLE, + FF_SAW_DOWN, + FF_SAW_UP, -1 }; @@ -67,12 +77,12 @@ static inline int tmff_scale_u16(unsigned int in, int minimum, int maximum) return ret; } -/* Changes values from -0x80 to 0x7f into values from minimum to maximum */ -static inline int tmff_scale_s8(int in, int minimum, int maximum) +/* Changes values from -0x7fff to 0x7fff into values from minimum to maximum */ +static inline int tmff_scale_s32(int in, int minimum, int maximum) { int ret; - ret = (((in + 0x80) * (maximum - minimum)) / 0xff) + minimum; + ret = (((in + 0x7fff) * (maximum - minimum)) / 0xffff) + minimum; if (ret < minimum) return minimum; if (ret > maximum) @@ -81,43 +91,50 @@ static inline int tmff_scale_s8(int in, int minimum, int maximum) } static int tmff_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 tmff_device *tmff = data; struct hid_field *ff_field = tmff->ff_field; int x, y; - int left, right; /* Rumbling */ - - switch (effect->type) { - case FF_CONSTANT: - x = tmff_scale_s8(effect->u.ramp.start_level, - ff_field->logical_minimum, - ff_field->logical_maximum); - y = tmff_scale_s8(effect->u.ramp.end_level, - ff_field->logical_minimum, - ff_field->logical_maximum); - - dbg_hid("(x, y)=(%04x, %04x)\n", x, y); - ff_field->value[0] = x; - ff_field->value[1] = y; - hid_hw_request(hid, tmff->report, HID_REQ_SET_REPORT); - break; - case FF_RUMBLE: - left = tmff_scale_u16(effect->u.rumble.weak_magnitude, - ff_field->logical_minimum, - ff_field->logical_maximum); - right = tmff_scale_u16(effect->u.rumble.strong_magnitude, - ff_field->logical_minimum, - ff_field->logical_maximum); - - dbg_hid("(left,right)=(%08x, %08x)\n", left, right); - ff_field->value[0] = left; - ff_field->value[1] = right; - hid_hw_request(hid, tmff->report, HID_REQ_SET_REPORT); + switch (command->cmd) { + case MLNX_START_COMBINED: { + const struct mlnx_simple_force *sf = &command->u.simple_force; + x = tmff_scale_s32(sf->x, + ff_field->logical_minimum, + ff_field->logical_maximum); + y = tmff_scale_s32(sf->y, + ff_field->logical_minimum, + ff_field->logical_maximum); + break; + } + case MLNX_STOP_COMBINED: + x = 0; + y = 0; + break; + case MLNX_START_RUMBLE: { + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force; + x = tmff_scale_u16(rumble_force->weak, + ff_field->logical_minimum, + ff_field->logical_maximum); + y = tmff_scale_u16(rumble_force->strong, + ff_field->logical_minimum, + ff_field->logical_maximum); break; + } + case MLNX_STOP_RUMBLE: + x = 0; + y = 0; + break; + default: + return -EINVAL; } + + ff_field->value[0] = x; + ff_field->value[1] = y; + + hid_hw_request(hid, tmff->report, HID_REQ_SET_REPORT); return 0; } @@ -192,7 +209,7 @@ static int tmff_init(struct hid_device *hid, const signed short *ff_bits) goto fail; } - error = input_ff_create_memless(input_dev, tmff, tmff_play); + error = input_ff_create_mlnx(input_dev, tmff, tmff_play, FF_UPDATE_RATE); if (error) goto fail;