From: "Michal Malý" <madcatxster@devoid-pointer.net>
To: dmitry.torokhov@gmail.com, jkosina@suse.cz
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
Elias Vanderstuyft <elias.vds@gmail.com>
Subject: [PATCH 19/24] Port hid-zpff to ff-memless-next
Date: Wed, 09 Apr 2014 13:29:42 +0200 [thread overview]
Message-ID: <1496205.vHVYf5XDMd@sigyn> (raw)
In-Reply-To: <1609685.QRL9N9sQvX@sigyn>
Port hid-zpff to ff-memless-next
Signed-off-by: Michal Malý <madcatxster@devoid-pointer.net>
---
drivers/hid/Kconfig | 2 +-
drivers/hid/hid-zpff.c | 30 ++++++++++++++++++++++--------
2 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index d1cbad6..7d617a8 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -775,7 +775,7 @@ config HID_ZEROPLUS
config ZEROPLUS_FF
bool "Zeroplus based game controller force feedback support"
depends on HID_ZEROPLUS
- select INPUT_FF_MEMLESS
+ select INPUT_FF_MEMLESS_NEXT
---help---
Say Y here if you have a Zeroplus based game controller and want
to have force feedback support for it.
diff --git a/drivers/hid/hid-zpff.c b/drivers/hid/hid-zpff.c
index a29756c..6912500 100644
--- a/drivers/hid/hid-zpff.c
+++ b/drivers/hid/hid-zpff.c
@@ -25,9 +25,12 @@
#include <linux/input.h>
#include <linux/slab.h>
#include <linux/module.h>
+#include <linux/input/ff-memless-next.h>
#include "hid-ids.h"
+#define FF_UPDATE_RATE 50
+
#ifdef CONFIG_ZEROPLUS_FF
struct zpff_device {
@@ -35,10 +38,11 @@ struct zpff_device {
};
static int zpff_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 zpff_device *zpff = data;
+ const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force;
int left, right;
/*
@@ -47,12 +51,22 @@ static int zpff_play(struct input_dev *dev, void *data,
* however it is possible that the XFX Executioner is an exception
*/
- left = effect->u.rumble.strong_magnitude;
- right = effect->u.rumble.weak_magnitude;
- dbg_hid("called with 0x%04x 0x%04x\n", left, right);
-
- left = left * 0x7f / 0xffff;
- right = right * 0x7f / 0xffff;
+ switch (command->cmd) {
+ case MLNX_START_RUMBLE:
+ left = rumble_force->strong;
+ right = rumble_force->weak;
+ dbg_hid("called with 0x%04x 0x%04x\n", left, right);
+
+ left = left * 0x7f / 0xffff;
+ right = right * 0x7f / 0xffff;
+ break;
+ case MLNX_STOP_RUMBLE:
+ left = 0;
+ right = 0;
+ break;
+ default:
+ return -EINVAL;
+ }
zpff->report->field[2]->value[0] = left;
zpff->report->field[3]->value[0] = right;
@@ -83,7 +97,7 @@ static int zpff_init(struct hid_device *hid)
set_bit(FF_RUMBLE, dev->ffbit);
- error = input_ff_create_memless(dev, zpff, zpff_play);
+ error = input_ff_create_mlnx(dev, zpff, zpff_play, FF_UPDATE_RATE);
if (error) {
kfree(zpff);
return error;
--
1.9.1
next prev parent reply other threads:[~2014-04-09 11:29 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-09 11:10 [PATCH 0/24] Introduce ff-memless-next as an improved replacement for ff-memless Michal Malý
2014-04-09 11:13 ` [PATCH 01/24] Add ff-memless-next module Michal Malý
2014-04-09 11:14 ` [PATCH 02/24] Port arizona-haptics to ff-memless-next Michal Malý
2014-04-09 11:15 ` [PATCH 03/24] Port twl4030-vibra " Michal Malý
2014-04-09 11:16 ` [PATCH 04/24] Port twl6040-vibra " Michal Malý
2014-04-09 11:17 ` [PATCH 05/24] Port max8997_haptic " Michal Malý
2014-04-09 11:17 ` [PATCH 06/24] Port pm8xxx-vibrator " Michal Malý
2014-04-09 11:18 ` [PATCH 07/24] Port hid-axff " Michal Malý
2014-04-09 11:19 ` [PATCH 08/24] Port hid-emsff " Michal Malý
2014-04-09 11:21 ` [PATCH 09/24] Port hid-dr " Michal Malý
2014-04-09 11:22 ` [PATCH 10/24] Port hid-gaff " Michal Malý
2014-04-09 11:23 ` [PATCH 11/24] Port hid-holtekff " Michal Malý
2014-04-09 11:24 ` [PATCH 12/24] Port hid-lgff " Michal Malý
2014-04-20 22:00 ` Elias Vanderstuyft
2014-04-09 11:24 ` [PATCH 13/24] Port hid-lg3ff " Michal Malý
2014-04-20 22:13 ` Elias Vanderstuyft
2014-04-09 11:25 ` [PATCH 14/24] Port hid-pl " Michal Malý
2014-04-09 11:26 ` [PATCH 15/24] Port hid-sjoy " Michal Malý
2014-04-09 11:27 ` [PATCH 16/24] Port hid-sony " Michal Malý
2014-04-09 11:28 ` [PATCH 17/24] Port hid-tmff " Michal Malý
2014-04-09 11:28 ` [PATCH 18/24] Port hid-wiimote-modules " Michal Malý
2014-04-09 11:29 ` Michal Malý [this message]
2014-04-09 11:30 ` [PATCH 20/24] Port gamecon " Michal Malý
2014-04-09 11:31 ` [PATCH 21/24] Port xpad " Michal Malý
2014-04-09 11:33 ` [PATCH 22/24] Port hid-lg2ff " Michal Malý
2014-04-09 11:35 ` [PATCH 23/24] Port hid-lg4ff " Michal Malý
2014-04-20 17:27 ` simon
2014-04-09 11:36 ` [PATCH 24/24] Replace ff-memless with ff-memless-next Michal Malý
2014-04-20 17:27 ` [PATCH 0/24] Introduce ff-memless-next as an improved replacement for ff-memless simon
2014-04-20 22:05 ` Elias Vanderstuyft
2014-04-20 22:29 ` simon
2014-04-21 11:25 ` Elias Vanderstuyft
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1496205.vHVYf5XDMd@sigyn \
--to=madcatxster@devoid-pointer.net \
--cc=dmitry.torokhov@gmail.com \
--cc=elias.vds@gmail.com \
--cc=jkosina@suse.cz \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).