Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932520AbaDVNrL (ORCPT ); Tue, 22 Apr 2014 09:47:11 -0400 Received: from imap.devoid-pointer.net ([31.31.77.140]:49434 "EHLO smtp.devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932331AbaDVNqr (ORCPT ); Tue, 22 Apr 2014 09:46:47 -0400 From: =?UTF-8?q?Michal=20Mal=C3=BD?= 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 13/24] Port hid-lg3ff to ff-memless-next Date: Tue, 22 Apr 2014 15:46:03 +0200 Message-Id: <1398174374-9501-14-git-send-email-madcatxster@devoid-pointer.net> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1398174374-9501-1-git-send-email-madcatxster@devoid-pointer.net> References: <1398174374-9501-1-git-send-email-madcatxster@devoid-pointer.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Michal Malý --- drivers/hid/Kconfig | 2 +- drivers/hid/hid-lg3ff.c | 60 +++++++++++++++++++++++++++++++------------------ 2 files changed, 39 insertions(+), 23 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..c49b374 100644 --- a/drivers/hid/hid-lg3ff.c +++ b/drivers/hid/hid-lg3ff.c @@ -23,9 +23,12 @@ #include #include +#include #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; - -/* - * 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); + /* send command byte */ + report->field[0]->value[0] = 0x51; - hid_hw_request(hid, report, HID_REQ_SET_REPORT); + 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 = 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; + 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.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/