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 13/24] Port hid-lg3ff to ff-memless-next Date: Wed, 09 Apr 2014 13:24:49 +0200 [thread overview] Message-ID: <1950497.jofl5Si0qz@sigyn> (raw) In-Reply-To: <1609685.QRL9N9sQvX@sigyn> Port hid-lg3ff to ff-memless-next Signed-off-by: Michal Malý <madcatxster@devoid-pointer.net> --- drivers/hid/Kconfig | 2 +- drivers/hid/hid-lg3ff.c | 56 +++++++++++++++++++++++++++++++------------------ 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index c7794ae..6f2941a 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -382,7 +382,7 @@ config LOGIRUMBLEPAD2_FF config LOGIG940_FF bool "Logitech Flight System G940 force feedback support" depends on HID_LOGITECH - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT help Say Y here if you want to enable force feedback support for Logitech Flight System G940 devices. diff --git a/drivers/hid/hid-lg3ff.c b/drivers/hid/hid-lg3ff.c index 8c2da18..a85f8e5 100644 --- a/drivers/hid/hid-lg3ff.c +++ b/drivers/hid/hid-lg3ff.c @@ -23,9 +23,12 @@ #include <linux/input.h> #include <linux/hid.h> +#include <linux/input/ff-memless-next.h> #include "hid-lg.h" +#define FF_UPDATE_RATE 50 + /* * G940 Theory of Operation (from experimentation) * @@ -58,12 +61,11 @@ struct lg3ff_device { }; static int hid_lg3ff_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 list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT].report_list; struct hid_report *report = list_entry(report_list->next, struct hid_report, list); - int x, y; /* * Available values in the field should always be 63, but we only use up to @@ -72,30 +74,37 @@ static int hid_lg3ff_play(struct input_dev *dev, void *data, memset(report->field[0]->value, 0, sizeof(__s32) * report->field[0]->report_count); - switch (effect->type) { - case FF_CONSTANT: -/* - * Already clamped in ff_memless - * 0 is center (different then other logitech) - */ - x = effect->u.ramp.start_level; - y = effect->u.ramp.end_level; - - /* send command byte */ - report->field[0]->value[0] = 0x51; + /* send command byte */ + report->field[0]->value[0] = 0x51; -/* - * Sign backwards from other Force3d pro - * which get recast here in two's complement 8 bits - */ + switch (command->cmd) { + case MLNX_START_COMBINED: { + const struct mlnx_simple_force *simple_force = &command->u.simple_force; + /* Scale down from MLNX range */ + const int x = 0x80 - (simple_force->x * 0xff / 0xffff); + const int y = simple_force->y * 0xff / 0xffff; + + /* + * Sign backwards from other Force3d pro + * which get recast here in two's complement 8 bits + */ report->field[0]->value[1] = (unsigned char)(-x); report->field[0]->value[31] = (unsigned char)(-y); - - hid_hw_request(hid, report, HID_REQ_SET_REPORT); break; + } + case MLNX_STOP_COMBINED: + report->field[0]->value[1] = 0; + report->field[0]->value[31] = 0; + break; + default: + return -EINVAL; } + + hid_hw_request(hid, report, HID_REQ_SET_REPORT); + return 0; } + static void hid_lg3ff_set_autocenter(struct input_dev *dev, u16 magnitude) { struct hid_device *hid = input_get_drvdata(dev); @@ -123,6 +132,13 @@ static void hid_lg3ff_set_autocenter(struct input_dev *dev, u16 magnitude) static const signed short ff3_joystick_ac[] = { FF_CONSTANT, + FF_RAMP, + FF_PERIODIC, + FF_SQUARE, + FF_TRIANGLE, + FF_SINE, + FF_SAW_UP, + FF_SAW_DOWN, FF_AUTOCENTER, -1 }; @@ -143,7 +159,7 @@ int lg3ff_init(struct hid_device *hid) for (i = 0; ff_bits[i] >= 0; i++) set_bit(ff_bits[i], dev->ffbit); - error = input_ff_create_memless(dev, NULL, hid_lg3ff_play); + error = input_ff_create_mlnx(dev, NULL, hid_lg3ff_play, FF_UPDATE_RATE); if (error) return error; -- 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 13/24] Port hid-lg3ff to ff-memless-next Date: Wed, 09 Apr 2014 13:24:49 +0200 [thread overview] Message-ID: <1950497.jofl5Si0qz@sigyn> (raw) In-Reply-To: <1609685.QRL9N9sQvX@sigyn> Port hid-lg3ff to ff-memless-next Signed-off-by: Michal Malý <madcatxster@devoid-pointer.net> --- drivers/hid/Kconfig | 2 +- drivers/hid/hid-lg3ff.c | 56 +++++++++++++++++++++++++++++++------------------ 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index c7794ae..6f2941a 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -382,7 +382,7 @@ config LOGIRUMBLEPAD2_FF config LOGIG940_FF bool "Logitech Flight System G940 force feedback support" depends on HID_LOGITECH - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT help Say Y here if you want to enable force feedback support for Logitech Flight System G940 devices. diff --git a/drivers/hid/hid-lg3ff.c b/drivers/hid/hid-lg3ff.c index 8c2da18..a85f8e5 100644 --- a/drivers/hid/hid-lg3ff.c +++ b/drivers/hid/hid-lg3ff.c @@ -23,9 +23,12 @@ #include <linux/input.h> #include <linux/hid.h> +#include <linux/input/ff-memless-next.h> #include "hid-lg.h" +#define FF_UPDATE_RATE 50 + /* * G940 Theory of Operation (from experimentation) * @@ -58,12 +61,11 @@ struct lg3ff_device { }; static int hid_lg3ff_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 list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT].report_list; struct hid_report *report = list_entry(report_list->next, struct hid_report, list); - int x, y; /* * Available values in the field should always be 63, but we only use up to @@ -72,30 +74,37 @@ static int hid_lg3ff_play(struct input_dev *dev, void *data, memset(report->field[0]->value, 0, sizeof(__s32) * report->field[0]->report_count); - switch (effect->type) { - case FF_CONSTANT: -/* - * Already clamped in ff_memless - * 0 is center (different then other logitech) - */ - x = effect->u.ramp.start_level; - y = effect->u.ramp.end_level; - - /* send command byte */ - report->field[0]->value[0] = 0x51; + /* send command byte */ + report->field[0]->value[0] = 0x51; -/* - * Sign backwards from other Force3d pro - * which get recast here in two's complement 8 bits - */ + switch (command->cmd) { + case MLNX_START_COMBINED: { + const struct mlnx_simple_force *simple_force = &command->u.simple_force; + /* Scale down from MLNX range */ + const int x = 0x80 - (simple_force->x * 0xff / 0xffff); + const int y = simple_force->y * 0xff / 0xffff; + + /* + * Sign backwards from other Force3d pro + * which get recast here in two's complement 8 bits + */ report->field[0]->value[1] = (unsigned char)(-x); report->field[0]->value[31] = (unsigned char)(-y); - - hid_hw_request(hid, report, HID_REQ_SET_REPORT); break; + } + case MLNX_STOP_COMBINED: + report->field[0]->value[1] = 0; + report->field[0]->value[31] = 0; + break; + default: + return -EINVAL; } + + hid_hw_request(hid, report, HID_REQ_SET_REPORT); + return 0; } + static void hid_lg3ff_set_autocenter(struct input_dev *dev, u16 magnitude) { struct hid_device *hid = input_get_drvdata(dev); @@ -123,6 +132,13 @@ static void hid_lg3ff_set_autocenter(struct input_dev *dev, u16 magnitude) static const signed short ff3_joystick_ac[] = { FF_CONSTANT, + FF_RAMP, + FF_PERIODIC, + FF_SQUARE, + FF_TRIANGLE, + FF_SINE, + FF_SAW_UP, + FF_SAW_DOWN, FF_AUTOCENTER, -1 }; @@ -143,7 +159,7 @@ int lg3ff_init(struct hid_device *hid) for (i = 0; ff_bits[i] >= 0; i++) set_bit(ff_bits[i], dev->ffbit); - error = input_ff_create_memless(dev, NULL, hid_lg3ff_play); + error = input_ff_create_mlnx(dev, NULL, hid_lg3ff_play, FF_UPDATE_RATE); if (error) return error; -- 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:24 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 ` [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 ` Michal Malý [this message] 2014-04-09 11:24 ` [PATCH 13/24] Port hid-lg3ff " 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:46 ` [PATCH 13/24] Port hid-lg3ff 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=1950497.jofl5Si0qz@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.