From: "Michal Malý" <madcatxster@devoid-pointer.net>
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 04/24] input: Port twl6040-vibra to ff-memless-next
Date: Tue, 22 Apr 2014 15:59:49 +0200 [thread overview]
Message-ID: <1398175209-9565-5-git-send-email-madcatxster@devoid-pointer.net> (raw)
In-Reply-To: <1398175209-9565-1-git-send-email-madcatxster@devoid-pointer.net>
Port twl6040-vibra to ff-memless-next
Signed-off-by: Michal Malý <madcatxster@devoid-pointer.net>
---
drivers/input/misc/Kconfig | 2 +-
drivers/input/misc/twl6040-vibra.c | 27 ++++++++++++++++++++++-----
2 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 1016a1b..91dcae8 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -417,7 +417,7 @@ config INPUT_TWL4030_VIBRA
config INPUT_TWL6040_VIBRA
tristate "Support for TWL6040 Vibrator"
depends on TWL6040_CORE
- select INPUT_FF_MEMLESS
+ select INPUT_FF_MEMLESS_NEXT
help
This option enables support for TWL6040 Vibrator Driver.
diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
index 77dc23b..7440a74 100644
--- a/drivers/input/misc/twl6040-vibra.c
+++ b/drivers/input/misc/twl6040-vibra.c
@@ -30,12 +30,14 @@
#include <linux/of.h>
#include <linux/workqueue.h>
#include <linux/input.h>
+#include <linux/input/ff-memless-next.h>
#include <linux/mfd/twl6040.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/regulator/consumer.h>
#define EFFECT_DIR_180_DEG 0x8000
+#define FF_UPDATE_RATE 50
/* Recommended modulation index 85% */
#define TWL6040_VIBRA_MOD 85
@@ -197,9 +199,10 @@ static void vibra_play_work(struct work_struct *work)
}
static int vibra_play(struct input_dev *input, void *data,
- struct ff_effect *effect)
+ const struct mlnx_effect_command *command)
{
struct vibra_info *info = input_get_drvdata(input);
+ const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force;
int ret;
/* Do not allow effect, while the routing is set to use audio */
@@ -209,9 +212,23 @@ static int vibra_play(struct input_dev *input, void *data,
return -EBUSY;
}
- info->weak_speed = effect->u.rumble.weak_magnitude;
- info->strong_speed = effect->u.rumble.strong_magnitude;
- info->direction = effect->direction < EFFECT_DIR_180_DEG ? 1 : -1;
+ switch (command->cmd) {
+ case MLNX_START_RUMBLE:
+ info->weak_speed = rumble_force->weak;
+ info->strong_speed = rumble_force->strong;
+ if (info->strong_speed >= info->weak_speed)
+ info->direction = rumble_force->strong_dir < EFFECT_DIR_180_DEG ? 1 : -1;
+ else
+ info->direction = rumble_force->weak_dir < EFFECT_DIR_180_DEG ? 1 : -1;
+ break;
+ case MLNX_STOP_RUMBLE:
+ info->weak_speed = 0;
+ info->strong_speed = 0;
+ info->direction = 1;
+ break;
+ default:
+ return -EINVAL;
+ }
ret = queue_work(info->workqueue, &info->play_work);
if (!ret) {
@@ -367,7 +384,7 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
info->input_dev->close = twl6040_vibra_close;
__set_bit(FF_RUMBLE, info->input_dev->ffbit);
- ret = input_ff_create_memless(info->input_dev, NULL, vibra_play);
+ ret = input_ff_create_mlnx(info->input_dev, NULL, vibra_play, FF_UPDATE_RATE);
if (ret < 0) {
dev_err(info->dev, "couldn't register vibrator to FF\n");
goto err_ialloc;
--
1.9.2
next prev parent reply other threads:[~2014-04-22 14:01 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-22 13:59 [PATCH v2 00/24] input: Introduce ff-memless-next as an improved replacement for ff-memless Michal Malý
2014-04-22 13:59 ` [PATCH v2 01/24] input: Add ff-memless-next module Michal Malý
2014-04-23 12:12 ` Oliver Neukum
2014-04-23 12:30 ` Michal Malý
2014-04-23 13:31 ` Oliver Neukum
2014-04-23 15:59 ` Dmitry Torokhov
2014-04-23 17:06 ` Oliver Neukum
2014-04-23 17:24 ` Dmitry Torokhov
2014-04-22 13:59 ` [PATCH v2 02/24] input: Port arizona-haptics to ff-memless-next Michal Malý
2014-04-22 13:59 ` [PATCH v2 03/24] input: Port twl4030-vibra " Michal Malý
2014-04-22 13:59 ` Michal Malý [this message]
2014-04-22 13:59 ` [PATCH v2 05/24] input: Port max8997_haptic " Michal Malý
2014-04-22 13:59 ` [PATCH v2 06/24] input: Port pm8xxx-vibrator " Michal Malý
2014-04-22 13:59 ` [PATCH v2 07/24] input: Port hid-axff " Michal Malý
2014-04-22 13:59 ` [PATCH v2 08/24] input: Port hid-emsff " Michal Malý
2014-04-22 13:59 ` [PATCH v2 09/24] input: Port hid-dr " Michal Malý
2014-04-23 13:41 ` Oliver Neukum
[not found] ` <5sjip0.n4hp0o.2szhuh-qmf@smtp.devoid-pointer.net>
[not found] ` <20140423154201.GA10531@core.coreip.homeip.net>
2014-04-23 15:47 ` simon
2014-04-23 15:57 ` Michal Malý
2014-04-24 10:32 ` Michal Malý
2014-04-27 8:22 ` Oliver Neukum
2014-04-22 13:59 ` [PATCH v2 10/24] input: Port hid-gaff " Michal Malý
2014-04-22 13:59 ` [PATCH v2 11/24] input: Port hid-holtekff " Michal Malý
2014-04-23 12:17 ` Oliver Neukum
2014-04-23 12:31 ` Michal Malý
2014-04-23 16:02 ` Dmitry Torokhov
2014-04-22 13:59 ` [PATCH v2 12/24] input: Port hid-lgff " Michal Malý
2014-04-22 13:59 ` [PATCH v2 13/24] input: Port hid-lg3ff " Michal Malý
2014-04-22 13:59 ` [PATCH v2 14/24] input: Port hid-pl " Michal Malý
2014-04-22 14:00 ` [PATCH v2 15/24] input: Port hid-sjoy " Michal Malý
2014-04-22 14:00 ` [PATCH v2 16/24] input: Port hid-sony " Michal Malý
2014-04-22 14:00 ` [PATCH v2 17/24] input: Port hid-tmff " Michal Malý
2014-04-22 14:00 ` [PATCH v2 18/24] input: Port hid-wiimote-modules " Michal Malý
2014-04-22 14:00 ` [PATCH v2 19/24] input: Port hid-zpff " Michal Malý
2014-04-22 14:00 ` [PATCH v2 20/24] input: Port gamecon " Michal Malý
2014-04-22 14:00 ` [PATCH v2 21/24] input: Port xpad " Michal Malý
2014-04-22 14:00 ` [PATCH v2 22/24] input: Port hid-lg2ff " Michal Malý
2014-04-22 14:00 ` [PATCH v2 23/24] input: Port hid-lg4ff " Michal Malý
2014-04-22 14:00 ` [PATCH v2 24/24] input: Replace ff-memless with ff-memless-next Michal Malý
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=1398175209-9565-5-git-send-email-madcatxster@devoid-pointer.net \
--to=madcatxster@devoid-pointer.net \
--cc=anssi.hannula@iki.fi \
--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 \
--cc=simon@mungewell.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).