From patchwork Tue Apr 22 13:45:59 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: 4032061 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 81648BFF02 for ; Tue, 22 Apr 2014 13:48:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 98A0A201F2 for ; Tue, 22 Apr 2014 13:48:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 89443201FD for ; Tue, 22 Apr 2014 13:48:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756400AbaDVNqj (ORCPT ); Tue, 22 Apr 2014 09:46:39 -0400 Received: from transparentnimenzy.cz ([31.31.77.140]:49417 "EHLO smtp.devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932111AbaDVNqi (ORCPT ); Tue, 22 Apr 2014 09:46:38 -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 80F7A20B68; Tue, 22 Apr 2014 15:46:34 +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 09/24] Port hid-dr to ff-memless-next Date: Tue, 22 Apr 2014 15:45:59 +0200 Message-Id: <1398174374-9501-10-git-send-email-madcatxster@devoid-pointer.net> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1398174374-9501-1-git-send-email-madcatxster@devoid-pointer.net> References: <1398174374-9501-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 Signed-off-by: Michal Malý --- drivers/hid/Kconfig | 2 +- drivers/hid/hid-dr.c | 59 ++++++++++++++++++++++++++++++++-------------------- 2 files changed, 37 insertions(+), 24 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 6e233d2..0ba1962 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -196,7 +196,7 @@ config HID_DRAGONRISE config DRAGONRISE_FF bool "DragonRise Inc. force feedback" depends on HID_DRAGONRISE - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT ---help--- Say Y here if you want to enable force feedback support for DragonRise Inc. game controllers. diff --git a/drivers/hid/hid-dr.c b/drivers/hid/hid-dr.c index ce06444..b95c676 100644 --- a/drivers/hid/hid-dr.c +++ b/drivers/hid/hid-dr.c @@ -31,8 +31,10 @@ #include #include #include +#include #include "hid-ids.h" +#define FF_UPDATE_RATE 50 #ifdef CONFIG_DRAGONRISE_FF @@ -41,38 +43,49 @@ struct drff_device { }; static int drff_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 drff_device *drff = data; + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force; int strong, weak; - strong = effect->u.rumble.strong_magnitude; - weak = effect->u.rumble.weak_magnitude; + strong = rumble_force->strong; + weak = rumble_force->weak; dbg_hid("called with 0x%04x 0x%04x", strong, weak); - if (strong || weak) { - strong = strong * 0xff / 0xffff; - weak = weak * 0xff / 0xffff; - - /* While reverse engineering this device, I found that when - this value is set, it causes the strong rumble to function - at a near maximum speed, so we'll bypass it. */ - if (weak == 0x0a) - weak = 0x0b; - - drff->report->field[0]->value[0] = 0x51; - drff->report->field[0]->value[1] = 0x00; - drff->report->field[0]->value[2] = weak; - drff->report->field[0]->value[4] = strong; - hid_hw_request(hid, drff->report, HID_REQ_SET_REPORT); - - drff->report->field[0]->value[0] = 0xfa; - drff->report->field[0]->value[1] = 0xfe; - } else { + switch (command->cmd) { + case MLNX_START_RUMBLE: + if (strong || weak) { + strong = strong * 0xff / 0xffff; + weak = weak * 0xff / 0xffff; + + /* While reverse engineering this device, I found that when + this value is set, it causes the strong rumble to function + at a near maximum speed, so we'll bypass it. */ + if (weak == 0x0a) + weak = 0x0b; + + drff->report->field[0]->value[0] = 0x51; + drff->report->field[0]->value[1] = 0x00; + drff->report->field[0]->value[2] = weak; + drff->report->field[0]->value[4] = strong; + hid_hw_request(hid, drff->report, HID_REQ_SET_REPORT); + + drff->report->field[0]->value[0] = 0xfa; + drff->report->field[0]->value[1] = 0xfe; + } else { + drff->report->field[0]->value[0] = 0xf3; + drff->report->field[0]->value[1] = 0x00; + } + break; + case MLNX_STOP_RUMBLE: drff->report->field[0]->value[0] = 0xf3; drff->report->field[0]->value[1] = 0x00; + break; + default: + return -EINVAL; } drff->report->field[0]->value[2] = 0x00; @@ -116,7 +129,7 @@ static int drff_init(struct hid_device *hid) set_bit(FF_RUMBLE, dev->ffbit); - error = input_ff_create_memless(dev, drff, drff_play); + error = input_ff_create_mlnx(dev, drff, drff_play, FF_UPDATE_RATE); if (error) { kfree(drff); return error;