From patchwork Wed Apr 9 11:30:45 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: 3954811 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 EC7AD9F371 for ; Wed, 9 Apr 2014 11:31:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1ECA120444 for ; Wed, 9 Apr 2014 11:31:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F2BD20435 for ; Wed, 9 Apr 2014 11:31:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932681AbaDILav (ORCPT ); Wed, 9 Apr 2014 07:30:51 -0400 Received: from transparentnimenzy.cz ([31.31.77.140]:52637 "EHLO devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932542AbaDILat convert rfc822-to-8bit (ORCPT ); Wed, 9 Apr 2014 07:30:49 -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 C7BF321056; Wed, 9 Apr 2014 13:30:45 +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 20/24] Port gamecon to ff-memless-next Date: Wed, 09 Apr 2014 13:30:45 +0200 Message-ID: <2807349.5CLbAnYOXZ@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 gamecon to ff-memless-next Signed-off-by: Michal Malý --- drivers/input/joystick/Kconfig | 2 +- drivers/input/joystick/gamecon.c | 57 ++++++++++++++++++++++------------------ 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig index 56eb471..2dd3ba1 100644 --- a/drivers/input/joystick/Kconfig +++ b/drivers/input/joystick/Kconfig @@ -221,7 +221,7 @@ config JOYSTICK_DB9 config JOYSTICK_GAMECON tristate "Multisystem, NES, SNES, N64, PSX joysticks and gamepads" depends on PARPORT - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT ---help--- Say Y here if you have a Nintendo Entertainment System gamepad, Super Nintendo Entertainment System gamepad, Nintendo 64 gamepad, diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c index e68e497..209d0fb 100644 --- a/drivers/input/joystick/gamecon.c +++ b/drivers/input/joystick/gamecon.c @@ -40,6 +40,7 @@ #include #include #include +#include MODULE_AUTHOR("Vojtech Pavlik "); MODULE_DESCRIPTION("NES, SNES, N64, MultiSystem, PSX gamepad driver"); @@ -47,6 +48,7 @@ MODULE_LICENSE("GPL"); #define GC_MAX_PORTS 3 #define GC_MAX_DEVICES 5 +#define FF_UPDATE_RATE 50 struct gc_config { int args[GC_MAX_DEVICES + 1]; @@ -263,43 +265,48 @@ static void gc_n64_process_packet(struct gc *gc) } static int gc_n64_play_effect(struct input_dev *dev, void *data, - struct ff_effect *effect) + const struct mlnx_effect_command *command) { + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force; int i; unsigned long flags; struct gc *gc = input_get_drvdata(dev); struct gc_subdev *sdev = data; unsigned char target = 1 << sdev->idx; /* select desired pin */ + unsigned int cmd; - if (effect->type == FF_RUMBLE) { - struct ff_rumble_effect *rumble = &effect->u.rumble; - unsigned int cmd = - rumble->strong_magnitude || rumble->weak_magnitude ? - GC_N64_CMD_01 : GC_N64_CMD_00; + switch (command->cmd) { + case MLNX_START_RUMBLE: + cmd = (rumble_force->strong || rumble_force->weak) ? GC_N64_CMD_01 : GC_N64_CMD_00; + break; + case MLNX_STOP_RUMBLE: + cmd = GC_N64_CMD_00; + break; + default: + return -EINVAL; + } - local_irq_save(flags); + local_irq_save(flags); - /* Init Rumble - 0x03, 0x80, 0x01, (34)0x80 */ - gc_n64_send_command(gc, GC_N64_CMD_03, target); + /* Init Rumble - 0x03, 0x80, 0x01, (34)0x80 */ + gc_n64_send_command(gc, GC_N64_CMD_03, target); + gc_n64_send_command(gc, GC_N64_CMD_80, target); + gc_n64_send_command(gc, GC_N64_CMD_01, target); + for (i = 0; i < 32; i++) gc_n64_send_command(gc, GC_N64_CMD_80, target); - gc_n64_send_command(gc, GC_N64_CMD_01, target); - for (i = 0; i < 32; i++) - gc_n64_send_command(gc, GC_N64_CMD_80, target); - gc_n64_send_stop_bit(gc, target); + gc_n64_send_stop_bit(gc, target); - udelay(GC_N64_DELAY); - - /* Now start or stop it - 0x03, 0xc0, 0zx1b, (32)0x01/0x00 */ - gc_n64_send_command(gc, GC_N64_CMD_03, target); - gc_n64_send_command(gc, GC_N64_CMD_c0, target); - gc_n64_send_command(gc, GC_N64_CMD_1b, target); - for (i = 0; i < 32; i++) - gc_n64_send_command(gc, cmd, target); - gc_n64_send_stop_bit(gc, target); + udelay(GC_N64_DELAY); - local_irq_restore(flags); + /* Now start or stop it - 0x03, 0xc0, 0zx1b, (32)0x01/0x00 */ + gc_n64_send_command(gc, GC_N64_CMD_03, target); + gc_n64_send_command(gc, GC_N64_CMD_c0, target); + gc_n64_send_command(gc, GC_N64_CMD_1b, target); + for (i = 0; i < 32; i++) + gc_n64_send_command(gc, cmd, target); + gc_n64_send_stop_bit(gc, target); - } + local_irq_restore(flags); return 0; } @@ -317,7 +324,7 @@ static int __init gc_n64_init_ff(struct input_dev *dev, int i) input_set_capability(dev, EV_FF, FF_RUMBLE); - err = input_ff_create_memless(dev, sdev, gc_n64_play_effect); + err = input_ff_create_mlnx(dev, sdev, gc_n64_play_effect, FF_UPDATE_RATE); if (err) { kfree(sdev); return err;