On Thu, Oct 01, 2015 at 10:57:14PM +0200, Pavel Rojtberg wrote:
> From: Pavel Rojtberg <rojtberg@xxxxxxxxx>
>
> this changes helps understanding the code
> 1. rename led_no -> pad_nr: the number stored there is not the LED Nr -
> it gets translated later on to a LED Nr in xpad_identify_controller
> 2. move all comments regarding xpad_identify_controller to the function
> definition to prevent inconsistent documentation.
I like the comments at xpad_identify_controller() call sites to remind
me that "identify" means identify it for the user, not for the kernel to
determine what kind of device we are dealing with.
So half-applied.
Thanks.
>
> Signed-off-by: Pavel Rojtberg <rojtberg@xxxxxxxxx>
> ---
> drivers/input/joystick/xpad.c | 20 ++++++++------------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
> index e3b393c..ab62d47 100644
> --- a/drivers/input/joystick/xpad.c
> +++ b/drivers/input/joystick/xpad.c
> @@ -345,7 +345,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 */
> };
>
> /*
> @@ -357,7 +357,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;
> @@ -506,7 +505,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 */
> @@ -514,10 +512,6 @@ static void xpad360w_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned cha
> if (data[1] & 0x80) {
> xpad->pad_present = 1;
> usb_submit_urb(xpad->bulk_out, GFP_ATOMIC);
> - /*
> - * Light up the segment corresponding to
> - * controller number.
> - */
> xpad_identify_controller(xpad);
> } else
> xpad->pad_present = 0;
> @@ -891,6 +885,7 @@ struct xpad_led {
> };
>
> /**
> + * set the LEDs on Xbox360 / Wireless Controllers
> * @param command
> * 0: off
> * 1: all blink, then previous setting
> @@ -943,10 +938,12 @@ 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,
> @@ -972,9 +969,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;
> @@ -988,7 +985,6 @@ static int xpad_led_probe(struct usb_xpad *xpad)
> return error;
> }
>
> - /* Light up the segment corresponding to controller number */
> xpad_identify_controller(xpad);
>
> return 0;
> --
> 1.9.1
>
--
Dmitry
--
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
