lkml.org 
[lkml]   [2014]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 19/24] hid: Port hid-zpff to ff-memless-next
    Date
    Port hid-zpff to ff-memless-next

    Signed-off-by: Michal Malý <madcatxster@devoid-pointer.net>
    ---
    drivers/hid/Kconfig | 2 +-
    drivers/hid/hid-zpff.c | 30 ++++++++++++++++++++++--------
    2 files changed, 23 insertions(+), 9 deletions(-)

    diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
    index 23d9776..97d2d8f 100644
    --- a/drivers/hid/Kconfig
    +++ b/drivers/hid/Kconfig
    @@ -786,7 +786,7 @@ config HID_ZEROPLUS
    config ZEROPLUS_FF
    bool "Zeroplus based game controller force feedback support"
    depends on HID_ZEROPLUS
    - select INPUT_FF_MEMLESS
    + select INPUT_FF_MEMLESS_NEXT
    ---help---
    Say Y here if you have a Zeroplus based game controller and want
    to have force feedback support for it.
    diff --git a/drivers/hid/hid-zpff.c b/drivers/hid/hid-zpff.c
    index a29756c..6912500 100644
    --- a/drivers/hid/hid-zpff.c
    +++ b/drivers/hid/hid-zpff.c
    @@ -25,9 +25,12 @@
    #include <linux/input.h>
    #include <linux/slab.h>
    #include <linux/module.h>
    +#include <linux/input/ff-memless-next.h>

    #include "hid-ids.h"

    +#define FF_UPDATE_RATE 50
    +
    #ifdef CONFIG_ZEROPLUS_FF

    struct zpff_device {
    @@ -35,10 +38,11 @@ struct zpff_device {
    };

    static int zpff_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 zpff_device *zpff = data;
    + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force;
    int left, right;

    /*
    @@ -47,12 +51,22 @@ static int zpff_play(struct input_dev *dev, void *data,
    * however it is possible that the XFX Executioner is an exception
    */

    - left = effect->u.rumble.strong_magnitude;
    - right = effect->u.rumble.weak_magnitude;
    - dbg_hid("called with 0x%04x 0x%04x\n", left, right);
    -
    - left = left * 0x7f / 0xffff;
    - right = right * 0x7f / 0xffff;
    + switch (command->cmd) {
    + case MLNX_START_RUMBLE:
    + left = rumble_force->strong;
    + right = rumble_force->weak;
    + dbg_hid("called with 0x%04x 0x%04x\n", left, right);
    +
    + left = left * 0x7f / 0xffff;
    + right = right * 0x7f / 0xffff;
    + break;
    + case MLNX_STOP_RUMBLE:
    + left = 0;
    + right = 0;
    + break;
    + default:
    + return -EINVAL;
    + }

    zpff->report->field[2]->value[0] = left;
    zpff->report->field[3]->value[0] = right;
    @@ -83,7 +97,7 @@ static int zpff_init(struct hid_device *hid)

    set_bit(FF_RUMBLE, dev->ffbit);

    - error = input_ff_create_memless(dev, zpff, zpff_play);
    + error = input_ff_create_mlnx(dev, zpff, zpff_play, FF_UPDATE_RATE);
    if (error) {
    kfree(zpff);
    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/

    \
     
     \ /
      Last update: 2014-04-26 17:41    [W:4.258 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site