From patchwork Sat Apr 26 11:57:55 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: 4068361 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 3D6DC9F319 for ; Sat, 26 Apr 2014 12:07:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 56B9720279 for ; Sat, 26 Apr 2014 12:07:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5DD1520256 for ; Sat, 26 Apr 2014 12:07:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752840AbaDZMHR (ORCPT ); Sat, 26 Apr 2014 08:07:17 -0400 Received: from devoid-pointer.net ([31.31.77.140]:49895 "EHLO smtp.devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751842AbaDZMDv (ORCPT ); Sat, 26 Apr 2014 08:03:51 -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 E480020BB1; Sat, 26 Apr 2014 14:03:45 +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 18/24] hid: Port hid-wiimote-modules to ff-memless-next Date: Sat, 26 Apr 2014 13:57:55 +0200 Message-Id: <1398513696-12626-19-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-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 17ed5cf..23d9776 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -749,7 +749,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; }