On Sat, 26 Apr 2014 13:57:53 +0200
Michal Malý <madcatxster@xxxxxxxxxxxxxxxxxx> wrote:
> Port hid-sony to ff-memless-next
>
> Signed-off-by: Michal Malý <madcatxster@xxxxxxxxxxxxxxxxxx>
Not a big deal, but note that the patch adds an unneeded
blank line. Pointed out below.
> ---
> drivers/hid/Kconfig | 2 +-
> drivers/hid/hid-sony.c | 24 ++++++++++++++++++------
> 2 files changed, 19 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
> index 9260d14..e97c382 100644
> --- a/drivers/hid/Kconfig
> +++ b/drivers/hid/Kconfig
> @@ -634,7 +634,7 @@ config HID_SONY
> config SONY_FF
> bool "Sony PS2/3/4 accessories force feedback support"
> depends on HID_SONY
> - select INPUT_FF_MEMLESS
> + select INPUT_FF_MEMLESS_NEXT
> ---help---
> Say Y here if you have a Sony PS2/3/4 accessory and want to enable
> force feedback support for it.
> diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
> index 908de27..95bb2e1 100644
> --- a/drivers/hid/hid-sony.c
> +++ b/drivers/hid/hid-sony.c
> @@ -34,6 +34,7 @@
> #include <linux/spinlock.h>
> #include <linux/list.h>
> #include <linux/input/mt.h>
> +#include <linux/input/ff-memless-next.h>
>
> #include "hid-ids.h"
>
> @@ -53,6 +54,7 @@
> #define SONY_BATTERY_SUPPORT (SIXAXIS_CONTROLLER | DUALSHOCK4_CONTROLLER)
> #define SONY_FF_SUPPORT (SIXAXIS_CONTROLLER | DUALSHOCK4_CONTROLLER)
>
> +#define FF_UPDATE_RATE 50
> #define MAX_LEDS 4
>
> static const u8 sixaxis_rdesc_fixup[] = {
> @@ -1308,16 +1310,25 @@ static void dualshock4_state_worker(struct work_struct *work)
>
> #ifdef CONFIG_SONY_FF
> static int sony_play_effect(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 sony_sc *sc = hid_get_drvdata(hid);
> + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force;
>
> - if (effect->type != FF_RUMBLE)
> - return 0;
>
> - sc->left = effect->u.rumble.strong_magnitude / 256;
> - sc->right = effect->u.rumble.weak_magnitude / 256;
> + switch (command->cmd) {
> + case MLNX_START_RUMBLE:
> + sc->left = rumble_force->strong / 256;
> + sc->right = rumble_force->weak / 256;
> + break;
> + case MLNX_STOP_RUMBLE:
> + sc->left = 0;
> + sc->right = 0;
> + break;
> + default:
> + return -EINVAL;
> + }
>
> schedule_work(&sc->state_worker);
> return 0;
> @@ -1330,7 +1341,7 @@ static int sony_init_ff(struct hid_device *hdev)
> struct input_dev *input_dev = hidinput->input;
>
> input_set_capability(input_dev, EV_FF, FF_RUMBLE);
> - return input_ff_create_memless(input_dev, NULL, sony_play_effect);
> + return input_ff_create_mlnx(input_dev, NULL, sony_play_effect, FF_UPDATE_RATE);
> }
>
> #else
> @@ -1762,6 +1773,7 @@ static const struct hid_device_id sony_devices[] = {
> .driver_data = DUALSHOCK4_CONTROLLER_USB },
> { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER),
> .driver_data = DUALSHOCK4_CONTROLLER_BT },
> +
Extra blank line here.
> { }
> };
> MODULE_DEVICE_TABLE(hid, sony_devices);
> --
> 1.9.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-input" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Antonio Ospite
http://ao2.it
A: Because it messes up the order in which people normally read text.
See http://en.wikipedia.org/wiki/Posting_style
Q: Why is top-posting such a bad thing?
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
