From patchwork Wed Apr 9 11:28:58 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: 3954771 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 31411BFF02 for ; Wed, 9 Apr 2014 11:29:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0F64520444 for ; Wed, 9 Apr 2014 11:29:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BFBC020435 for ; Wed, 9 Apr 2014 11:29:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932482AbaDIL3H (ORCPT ); Wed, 9 Apr 2014 07:29:07 -0400 Received: from transparentnimenzy.cz ([31.31.77.140]:52630 "EHLO devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758397AbaDIL3D convert rfc822-to-8bit (ORCPT ); Wed, 9 Apr 2014 07:29:03 -0400 Received: from sigyn.localnet (228.123.broadband5.iol.cz [88.100.123.228]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by devoid-pointer.net (Postfix) with ESMTPSA id BAAE921056; Wed, 9 Apr 2014 13:28:58 +0200 (CEST) From: Michal =?ISO-8859-1?Q?Mal=FD?= To: dmitry.torokhov@gmail.com, jkosina@suse.cz Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Elias Vanderstuyft Subject: [PATCH 18/24] Port hid-wiimote-modules to ff-memless-next Date: Wed, 09 Apr 2014 13:28:58 +0200 Message-ID: <2608465.PLkBZsz9Zm@sigyn> User-Agent: KMail/4.13 rc (Linux/3.14.0-1-ARCHMOD; KDE/4.12.97; x86_64; ; ) In-Reply-To: <1609685.QRL9N9sQvX@sigyn> References: <1609685.QRL9N9sQvX@sigyn> 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.2 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-wiimote-modules to ff-memless-next Signed-off-by: Michal Malý --- drivers/hid/Kconfig | 2 +- drivers/hid/hid-wiimote-modules.c | 74 ++++++++++++++++++++++++--------------- 2 files changed, 46 insertions(+), 30 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index ee999bc..d1cbad6 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -738,7 +738,7 @@ config HID_WIIMOTE depends on HID depends on LEDS_CLASS select POWER_SUPPLY - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT ---help--- Support for Nintendo Wii and Wii U Bluetooth peripherals. Supported devices are the Wii Remote and its extension devices, but also devices diff --git a/drivers/hid/hid-wiimote-modules.c b/drivers/hid/hid-wiimote-modules.c index 6b61f01..95b20ea 100644 --- a/drivers/hid/hid-wiimote-modules.c +++ b/drivers/hid/hid-wiimote-modules.c @@ -37,8 +37,11 @@ #include #include #include +#include #include "hid-wiimote.h" +#define FF_UPDATE_RATE 50 + /* * Keys * The initial Wii Remote provided a bunch of buttons that are reported as @@ -131,21 +134,27 @@ static void wiimod_rumble_worker(struct work_struct *work) } static int wiimod_rumble_play(struct input_dev *dev, void *data, - struct ff_effect *eff) + const struct mlnx_effect_command *command) { struct wiimote_data *wdata = input_get_drvdata(dev); - __u8 value; - - /* - * The wiimote supports only a single rumble motor so if any magnitude - * is set to non-zero then we start the rumble motor. If both are set to - * zero, we stop the rumble motor. - */ - - if (eff->u.rumble.strong_magnitude || eff->u.rumble.weak_magnitude) - value = 1; - else - value = 0; + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force; + __u8 value = 0; + + switch (command->cmd) { + case MLNX_START_RUMBLE: + /* + * The wiimote supports only a single rumble motor so if any magnitude + * is set to non-zero then we start the rumble motor. If both are set to + * zero, we stop the rumble motor. + */ + if (rumble_force->strong || rumble_force->weak) + value = 1; + break; + case MLNX_STOP_RUMBLE: + break; + default: + return -EINVAL; + } /* Locking state.lock here might deadlock with input_event() calls. * schedule_work acts as barrier. Merging multiple changes is fine. */ @@ -161,7 +170,7 @@ static int wiimod_rumble_probe(const struct wiimod_ops *ops, INIT_WORK(&wdata->rumble_worker, wiimod_rumble_worker); set_bit(FF_RUMBLE, wdata->input->ffbit); - if (input_ff_create_memless(wdata->input, NULL, wiimod_rumble_play)) + if (input_ff_create_mlnx(wdata->input, NULL, wiimod_rumble_play, FF_UPDATE_RATE)) return -ENOMEM; return 0; @@ -1771,21 +1780,28 @@ static void wiimod_pro_close(struct input_dev *dev) } static int wiimod_pro_play(struct input_dev *dev, void *data, - struct ff_effect *eff) + const struct mlnx_effect_command *command) { struct wiimote_data *wdata = input_get_drvdata(dev); - __u8 value; - - /* - * The wiimote supports only a single rumble motor so if any magnitude - * is set to non-zero then we start the rumble motor. If both are set to - * zero, we stop the rumble motor. - */ - - if (eff->u.rumble.strong_magnitude || eff->u.rumble.weak_magnitude) - value = 1; - else - value = 0; + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force; + __u8 value = 0; + + switch (command->cmd) { + case MLNX_START_RUMBLE: + /* + * The wiimote supports only a single rumble motor so if any magnitude + * is set to non-zero then we start the rumble motor. If both are set to + * zero, we stop the rumble motor. + */ + + if (rumble_force->strong || rumble_force->weak) + value = 1; + break; + case MLNX_STOP_RUMBLE: + break; + default: + return -EINVAL; + } /* Locking state.lock here might deadlock with input_event() calls. * schedule_work acts as barrier. Merging multiple changes is fine. */ @@ -1867,8 +1883,8 @@ static int wiimod_pro_probe(const struct wiimod_ops *ops, set_bit(FF_RUMBLE, wdata->extension.input->ffbit); input_set_drvdata(wdata->extension.input, wdata); - if (input_ff_create_memless(wdata->extension.input, NULL, - wiimod_pro_play)) { + if (input_ff_create_mlnx(wdata->extension.input, NULL, + wiimod_pro_play, FF_UPDATE_RATE)) { ret = -ENOMEM; goto err_free; }