lkml.org 
[lkml]   [2018]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 26/83] Input: xpad - clarify LED enumeration
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 1f6f02b728eef0d937d5138ae60dbf8fbd045f3e ]

    Rename led_no -> pad_nr: the number stored there is not the LED number - it
    gets translated later on to a LED number in xpad_identify_controller;

    Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/input/joystick/xpad.c | 16 +++++++++-------
    1 file changed, 9 insertions(+), 7 deletions(-)

    diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
    index e9a2e2d89772..60ebd78a49a6 100644
    --- a/drivers/input/joystick/xpad.c
    +++ b/drivers/input/joystick/xpad.c
    @@ -347,7 +347,7 @@ struct usb_xpad {

    int mapping; /* map d-pad to buttons or to axes */
    int xtype; /* type of xbox device */
    - unsigned long led_no; /* led to lit on xbox360 controllers */
    + unsigned long pad_nr; /* the order x360 pads were attached */
    };

    /*
    @@ -359,7 +359,6 @@ struct usb_xpad {
    * The used report descriptor was taken from ITO Takayukis website:
    * http://euc.jp/periphs/xbox-controller.ja.html
    */
    -
    static void xpad_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *data)
    {
    struct input_dev *dev = xpad->dev;
    @@ -508,7 +507,6 @@ static void xpad_identify_controller(struct usb_xpad *xpad);
    * 01.1 - Pad state (Bytes 4+) valid
    *
    */
    -
    static void xpad360w_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *data)
    {
    /* Presence change */
    @@ -893,6 +891,7 @@ struct xpad_led {
    };

    /**
    + * set the LEDs on Xbox360 / Wireless Controllers
    * @param command
    * 0: off
    * 1: all blink, then previous setting
    @@ -945,10 +944,13 @@ static void xpad_send_led_command(struct usb_xpad *xpad, int command)
    mutex_unlock(&xpad->odata_mutex);
    }

    +/*
    + * Light up the segment corresponding to the pad number on
    + * Xbox 360 Controllers.
    + */
    static void xpad_identify_controller(struct usb_xpad *xpad)
    {
    - /* Light up the segment corresponding to controller number */
    - xpad_send_led_command(xpad, (xpad->led_no % 4) + 2);
    + xpad_send_led_command(xpad, (xpad->pad_nr % 4) + 2);
    }

    static void xpad_led_set(struct led_classdev *led_cdev,
    @@ -974,9 +976,9 @@ static int xpad_led_probe(struct usb_xpad *xpad)
    if (!led)
    return -ENOMEM;

    - xpad->led_no = atomic_inc_return(&led_seq);
    + xpad->pad_nr = atomic_inc_return(&led_seq);

    - snprintf(led->name, sizeof(led->name), "xpad%lu", xpad->led_no);
    + snprintf(led->name, sizeof(led->name), "xpad%lu", xpad->pad_nr);
    led->xpad = xpad;

    led_cdev = &led->led_cdev;
    --
    2.17.1


    \
     
     \ /
      Last update: 2018-11-29 16:07    [W:4.085 / U:0.308 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site