From patchwork Tue Apr 22 14:00:01 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: 4032431 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 93E03BFF02 for ; Tue, 22 Apr 2014 14:06:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A9A402022D for ; Tue, 22 Apr 2014 14:05:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5EF052027D for ; Tue, 22 Apr 2014 14:05:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932418AbaDVOB3 (ORCPT ); Tue, 22 Apr 2014 10:01:29 -0400 Received: from prifuk.cz ([31.31.77.140]:49523 "EHLO smtp.devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932371AbaDVOBZ (ORCPT ); Tue, 22 Apr 2014 10:01:25 -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 1C0D720B73; Tue, 22 Apr 2014 16:01:16 +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 16/24] input: Port hid-sony to ff-memless-next Date: Tue, 22 Apr 2014 16:00:01 +0200 Message-Id: <1398175209-9565-17-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-sony to ff-memless-next Signed-off-by: Michal Malý --- drivers/hid/Kconfig | 2 +- drivers/hid/hid-sony.c | 24 ++++++++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index e76c36a..fc22f72 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -623,7 +623,7 @@ config HID_SONY config SONY_FF bool "Sony PS2/3 accessories force feedback support" depends on HID_SONY - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT ---help--- Say Y here if you have a Sony PS2/3 accessory and want to enable force feedback support for it. diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index 2f19b15..70a9cc5 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "hid-ids.h" @@ -44,6 +45,7 @@ #define SONY_LED_SUPPORT (SIXAXIS_CONTROLLER_USB | BUZZ_CONTROLLER | DUALSHOCK4_CONTROLLER_USB) #define SONY_FF_SUPPORT (SIXAXIS_CONTROLLER_USB | DUALSHOCK4_CONTROLLER_USB) +#define FF_UPDATE_RATE 50 #define MAX_LEDS 4 static const u8 sixaxis_rdesc_fixup[] = { @@ -970,16 +972,25 @@ static void dualshock4_state_worker(struct work_struct *work) #ifdef CONFIG_SONY_FF static int sony_play_effect(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 sony_sc *sc = hid_get_drvdata(hid); + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force; - if (effect->type != FF_RUMBLE) - return 0; - sc->left = effect->u.rumble.strong_magnitude / 256; - sc->right = effect->u.rumble.weak_magnitude / 256; + switch (command->cmd) { + case MLNX_START_RUMBLE: + sc->left = rumble_force->strong / 256; + sc->right = rumble_force->weak / 256; + break; + case MLNX_STOP_RUMBLE: + sc->left = 0; + sc->right = 0; + break; + default: + return -EINVAL; + } schedule_work(&sc->state_worker); return 0; @@ -992,7 +1003,7 @@ static int sony_init_ff(struct hid_device *hdev) struct input_dev *input_dev = hidinput->input; input_set_capability(input_dev, EV_FF, FF_RUMBLE); - return input_ff_create_memless(input_dev, NULL, sony_play_effect); + return input_ff_create_mlnx(input_dev, NULL, sony_play_effect, FF_UPDATE_RATE); } #else @@ -1150,6 +1161,7 @@ static const struct hid_device_id sony_devices[] = { .driver_data = DUALSHOCK4_CONTROLLER_USB }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER), .driver_data = DUALSHOCK4_CONTROLLER_BT }, + { } }; MODULE_DEVICE_TABLE(hid, sony_devices);