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 07/24] Port hid-axff to ff-memless-next Date: Wed, 09 Apr 2014 13:18:51 +0200 [thread overview] Message-ID: <1620862.YaQ9IaA2dH@sigyn> (raw) In-Reply-To: <1609685.QRL9N9sQvX@sigyn> Port hid-axff to ff-memless-next Signed-off-by: Michal Malý <madcatxster@devoid-pointer.net> --- drivers/hid/Kconfig | 2 +- drivers/hid/hid-axff.c | 32 +++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index f722001..68c19a0 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -106,7 +106,7 @@ config HID_ACRUX config HID_ACRUX_FF bool "ACRUX force feedback support" depends on HID_ACRUX - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT ---help--- Say Y here if you want to enable force feedback support for ACRUX game controllers. diff --git a/drivers/hid/hid-axff.c b/drivers/hid/hid-axff.c index a594e47..7fbfcbc 100644 --- a/drivers/hid/hid-axff.c +++ b/drivers/hid/hid-axff.c @@ -31,31 +31,45 @@ #include <linux/slab.h> #include <linux/hid.h> #include <linux/module.h> +#include <linux/input/ff-memless-next.h> #include "hid-ids.h" +#define FF_UPDATE_RATE 50 #ifdef CONFIG_HID_ACRUX_FF struct axff_device { struct hid_report *report; }; -static int axff_play(struct input_dev *dev, void *data, struct ff_effect *effect) +static int axff_play(struct input_dev *dev, void *data, + const struct mlnx_effect_command *command) { struct hid_device *hid = input_get_drvdata(dev); struct axff_device *axff = data; struct hid_report *report = axff->report; + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force; int field_count = 0; int left, right; int i, j; - left = effect->u.rumble.strong_magnitude; - right = effect->u.rumble.weak_magnitude; - - dbg_hid("called with 0x%04x 0x%04x", left, right); - - left = left * 0xff / 0xffff; - right = right * 0xff / 0xffff; + switch (command->cmd) { + case MLNX_START_RUMBLE: + left = rumble_force->strong; + right = rumble_force->weak; + + dbg_hid("called with 0x%04x 0x%04x", left, right); + + left = left * 0xff / 0xffff; + right = right * 0xff / 0xffff; + break; + case MLNX_STOP_RUMBLE: + left = 0; + right = 0; + break; + default: + return -EINVAL; + } for (i = 0; i < report->maxfield; i++) { for (j = 0; j < report->field[i]->report_count; j++) { @@ -107,7 +121,7 @@ static int axff_init(struct hid_device *hid) set_bit(FF_RUMBLE, dev->ffbit); - error = input_ff_create_memless(dev, axff, axff_play); + error = input_ff_create_mlnx(dev, axff, axff_play, FF_UPDATE_RATE); if (error) goto err_free_mem; -- 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 07/24] Port hid-axff to ff-memless-next Date: Wed, 09 Apr 2014 13:18:51 +0200 [thread overview] Message-ID: <1620862.YaQ9IaA2dH@sigyn> (raw) In-Reply-To: <1609685.QRL9N9sQvX@sigyn> Port hid-axff to ff-memless-next Signed-off-by: Michal Malý <madcatxster@devoid-pointer.net> --- drivers/hid/Kconfig | 2 +- drivers/hid/hid-axff.c | 32 +++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index f722001..68c19a0 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -106,7 +106,7 @@ config HID_ACRUX config HID_ACRUX_FF bool "ACRUX force feedback support" depends on HID_ACRUX - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT ---help--- Say Y here if you want to enable force feedback support for ACRUX game controllers. diff --git a/drivers/hid/hid-axff.c b/drivers/hid/hid-axff.c index a594e47..7fbfcbc 100644 --- a/drivers/hid/hid-axff.c +++ b/drivers/hid/hid-axff.c @@ -31,31 +31,45 @@ #include <linux/slab.h> #include <linux/hid.h> #include <linux/module.h> +#include <linux/input/ff-memless-next.h> #include "hid-ids.h" +#define FF_UPDATE_RATE 50 #ifdef CONFIG_HID_ACRUX_FF struct axff_device { struct hid_report *report; }; -static int axff_play(struct input_dev *dev, void *data, struct ff_effect *effect) +static int axff_play(struct input_dev *dev, void *data, + const struct mlnx_effect_command *command) { struct hid_device *hid = input_get_drvdata(dev); struct axff_device *axff = data; struct hid_report *report = axff->report; + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force; int field_count = 0; int left, right; int i, j; - left = effect->u.rumble.strong_magnitude; - right = effect->u.rumble.weak_magnitude; - - dbg_hid("called with 0x%04x 0x%04x", left, right); - - left = left * 0xff / 0xffff; - right = right * 0xff / 0xffff; + switch (command->cmd) { + case MLNX_START_RUMBLE: + left = rumble_force->strong; + right = rumble_force->weak; + + dbg_hid("called with 0x%04x 0x%04x", left, right); + + left = left * 0xff / 0xffff; + right = right * 0xff / 0xffff; + break; + case MLNX_STOP_RUMBLE: + left = 0; + right = 0; + break; + default: + return -EINVAL; + } for (i = 0; i < report->maxfield; i++) { for (j = 0; j < report->field[i]->report_count; j++) { @@ -107,7 +121,7 @@ static int axff_init(struct hid_device *hid) set_bit(FF_RUMBLE, dev->ffbit); - error = input_ff_create_memless(dev, axff, axff_play); + error = input_ff_create_mlnx(dev, axff, axff_play, FF_UPDATE_RATE); if (error) goto err_free_mem; -- 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: 50+ 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 ` [PATCH 06/24] Port pm8xxx-vibrator " Michal Malý 2014-04-09 11:17 ` Michal Malý 2014-04-09 11:18 ` Michal Malý [this message] 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: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 07/24] Port hid-axff to 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=1620862.YaQ9IaA2dH@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.