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 06/24] Port pm8xxx-vibrator to ff-memless-next Date: Wed, 09 Apr 2014 13:17:55 +0200 [thread overview] Message-ID: <5798897.DMOHYaxkqk@sigyn> (raw) In-Reply-To: <1609685.QRL9N9sQvX@sigyn> Port pm8xxx-vibrator to ff-memless-next Signed-off-by: Michal Malý <madcatxster@devoid-pointer.net> --- drivers/input/misc/Kconfig | 2 +- drivers/input/misc/pm8xxx-vibrator.c | 28 +++++++++++++++++++--------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 6ba327f..300b5a8 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -108,7 +108,7 @@ config INPUT_PCSPKR config INPUT_PM8XXX_VIBRATOR tristate "Qualcomm PM8XXX vibrator support" depends on MFD_PM8XXX - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT help This option enables device driver support for the vibrator on Qualcomm PM8xxx chip. This driver supports ff-memless interface diff --git a/drivers/input/misc/pm8xxx-vibrator.c b/drivers/input/misc/pm8xxx-vibrator.c index b88b7cb..6b0e9eb 100644 --- a/drivers/input/misc/pm8xxx-vibrator.c +++ b/drivers/input/misc/pm8xxx-vibrator.c @@ -17,6 +17,7 @@ #include <linux/input.h> #include <linux/slab.h> #include <linux/regmap.h> +#include <linux/input/ff-memless-next.h> #define VIB_DRV 0x4A @@ -29,7 +30,7 @@ #define VIB_MAX_LEVELS (VIB_MAX_LEVEL_mV - VIB_MIN_LEVEL_mV) #define MAX_FF_SPEED 0xff - +#define FF_UPDATE_RATE 50 /** * struct pm8xxx_vib - structure to hold vibrator data * @vib_input_dev: input device supporting force feedback @@ -128,14 +129,23 @@ static void pm8xxx_vib_close(struct input_dev *dev) * Currently this driver supports only rumble effects. */ static int pm8xxx_vib_play_effect(struct input_dev *dev, void *data, - struct ff_effect *effect) + const struct mlnx_command *command) { struct pm8xxx_vib *vib = input_get_drvdata(dev); - - vib->speed = effect->u.rumble.strong_magnitude >> 8; - if (!vib->speed) - vib->speed = effect->u.rumble.weak_magnitude >> 9; - + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force; + + switch (command->cmd) { + case MLNX_START_RUMBLE: + vib->speed = rumble_force->strong >> 8; + if (!vib->speed) + vib->speed = rumble_force->weak >> 9; + break; + case MLNX_STOP_RUMBLE: + vib->speed = 0; + break; + default: + return -EINVAL; + } schedule_work(&vib->work); return 0; @@ -182,8 +192,8 @@ static int pm8xxx_vib_probe(struct platform_device *pdev) input_set_drvdata(input_dev, vib); input_set_capability(vib->vib_input_dev, EV_FF, FF_RUMBLE); - error = input_ff_create_memless(input_dev, NULL, - pm8xxx_vib_play_effect); + error = input_ff_create_mlnx(input_dev, NULL, + pm8xxx_vib_play_effect, FF_UPDATE_RATE); if (error) { dev_err(&pdev->dev, "couldn't register vibrator as FF device\n"); -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
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 06/24] Port pm8xxx-vibrator to ff-memless-next Date: Wed, 09 Apr 2014 13:17:55 +0200 [thread overview] Message-ID: <5798897.DMOHYaxkqk@sigyn> (raw) In-Reply-To: <1609685.QRL9N9sQvX@sigyn> Port pm8xxx-vibrator to ff-memless-next Signed-off-by: Michal Malý <madcatxster@devoid-pointer.net> --- drivers/input/misc/Kconfig | 2 +- drivers/input/misc/pm8xxx-vibrator.c | 28 +++++++++++++++++++--------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 6ba327f..300b5a8 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -108,7 +108,7 @@ config INPUT_PCSPKR config INPUT_PM8XXX_VIBRATOR tristate "Qualcomm PM8XXX vibrator support" depends on MFD_PM8XXX - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT help This option enables device driver support for the vibrator on Qualcomm PM8xxx chip. This driver supports ff-memless interface diff --git a/drivers/input/misc/pm8xxx-vibrator.c b/drivers/input/misc/pm8xxx-vibrator.c index b88b7cb..6b0e9eb 100644 --- a/drivers/input/misc/pm8xxx-vibrator.c +++ b/drivers/input/misc/pm8xxx-vibrator.c @@ -17,6 +17,7 @@ #include <linux/input.h> #include <linux/slab.h> #include <linux/regmap.h> +#include <linux/input/ff-memless-next.h> #define VIB_DRV 0x4A @@ -29,7 +30,7 @@ #define VIB_MAX_LEVELS (VIB_MAX_LEVEL_mV - VIB_MIN_LEVEL_mV) #define MAX_FF_SPEED 0xff - +#define FF_UPDATE_RATE 50 /** * struct pm8xxx_vib - structure to hold vibrator data * @vib_input_dev: input device supporting force feedback @@ -128,14 +129,23 @@ static void pm8xxx_vib_close(struct input_dev *dev) * Currently this driver supports only rumble effects. */ static int pm8xxx_vib_play_effect(struct input_dev *dev, void *data, - struct ff_effect *effect) + const struct mlnx_command *command) { struct pm8xxx_vib *vib = input_get_drvdata(dev); - - vib->speed = effect->u.rumble.strong_magnitude >> 8; - if (!vib->speed) - vib->speed = effect->u.rumble.weak_magnitude >> 9; - + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force; + + switch (command->cmd) { + case MLNX_START_RUMBLE: + vib->speed = rumble_force->strong >> 8; + if (!vib->speed) + vib->speed = rumble_force->weak >> 9; + break; + case MLNX_STOP_RUMBLE: + vib->speed = 0; + break; + default: + return -EINVAL; + } schedule_work(&vib->work); return 0; @@ -182,8 +192,8 @@ static int pm8xxx_vib_probe(struct platform_device *pdev) input_set_drvdata(input_dev, vib); input_set_capability(vib->vib_input_dev, EV_FF, FF_RUMBLE); - error = input_ff_create_memless(input_dev, NULL, - pm8xxx_vib_play_effect); + error = input_ff_create_mlnx(input_dev, NULL, + pm8xxx_vib_play_effect, FF_UPDATE_RATE); if (error) { dev_err(&pdev->dev, "couldn't register vibrator as FF device\n"); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2014-04-09 11:18 UTC|newest] Thread overview: 51+ 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:10 ` Michal Malý 2014-04-09 11:13 ` [PATCH 01/24] Add ff-memless-next module Michal Malý 2014-04-09 11:13 ` 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:16 ` Michal Malý 2014-04-09 11:17 ` [PATCH 05/24] Port max8997_haptic " Michal Malý 2014-04-09 11:17 ` Michal Malý 2014-04-09 11:17 ` Michal Malý [this message] 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:18 ` Michal Malý 2014-04-09 11:19 ` [PATCH 08/24] Port hid-emsff " Michal Malý 2014-04-09 11:19 ` Michal Malý 2014-04-09 11:21 ` [PATCH 09/24] Port hid-dr " Michal Malý 2014-04-09 11:21 ` Michal Malý 2014-04-09 11:22 ` [PATCH 10/24] Port hid-gaff " Michal Malý 2014-04-09 11:22 ` Michal Malý 2014-04-09 11:23 ` [PATCH 11/24] Port hid-holtekff " Michal Malý 2014-04-09 11:23 ` Michal Malý 2014-04-09 11:24 ` [PATCH 12/24] Port hid-lgff " Michal Malý 2014-04-09 11:24 ` Michal Malý 2014-04-20 22:00 ` Elias Vanderstuyft 2014-04-20 22:00 ` Elias Vanderstuyft 2014-04-09 11:24 ` [PATCH 13/24] Port hid-lg3ff " Michal Malý 2014-04-09 11:24 ` Michal Malý 2014-04-20 22:13 ` Elias Vanderstuyft 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:26 ` 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 ` [PATCH 19/24] Port hid-zpff " Michal Malý 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:31 ` 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-09 11:35 ` 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 2014-04-22 13:45 [PATCH v2 00/24] input: " Michal Malý 2014-04-22 13:45 ` [PATCH 06/24] Port pm8xxx-vibrator to ff-memless-next Michal Malý 2014-04-22 13:45 ` 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=5798897.DMOHYaxkqk@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.