From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Pavel Rojtberg <rojtberg@gmail.com>
Cc: linux-input@vger.kernel.org, pgriffais@valvesoftware.com,
gregkh@linuxfoundation.org
Subject: Re: [PATCH 4/8] Input: xpad: query Wireless controller state at init
Date: Wed, 29 Jul 2015 23:57:21 -0700 [thread overview]
Message-ID: <20150730065721.GC35939@dtor-ws> (raw)
In-Reply-To: <1436572068-10661-5-git-send-email-rojtberg@gmail.com>
On Sat, Jul 11, 2015 at 01:47:44AM +0200, Pavel Rojtberg wrote:
> From: Pavel Rojtberg <rojtberg@gmail.com>
>
> We initializing the driver/device, we really don't know how many
> controllers are connected. So send a "query presence" command to the
> base-station. (Command discovered by Zachary Lund)
>
> Note, this means we now do not "preallocate" all 4 devices when a single
> wireless base station is seen, but require the device to be properly
> connected to the base station before that can happen. The allocation of
> the device happens in the next patch, not here, so in a way, this patch
> breaks all wireless devices...
Then we have to combine it with the one adding necessary handling.
>
> based on patch by
> "Pierre-Loup A. Griffais" <pgriffais@valvesoftware.com>
>
> presence packet taken from:
> https://github.com/computerquip/xpad5
>
> Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
> ---
> drivers/input/joystick/xpad.c | 33 +++++++++++++++++++++++++++++----
> 1 file changed, 29 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
> index ed17e5d..3349861 100644
> --- a/drivers/input/joystick/xpad.c
> +++ b/drivers/input/joystick/xpad.c
> @@ -1223,11 +1223,36 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
> usb_kill_urb(xpad->irq_in);
> goto fail4;
> }
> +
> + /*
> + * send presence packet
> + * This will force the controller to resend connection packets.
> + * This is useful in the case we activate the module after the
> + * adapter has been plugged in, as it won't automatically
> + * send us info about the controllers.
> + */
> + mutex_lock(&xpad->odata_mutex);
> + xpad->odata[0] = 0x08;
> + xpad->odata[1] = 0x00;
> + xpad->odata[2] = 0x0F;
> + xpad->odata[3] = 0xC0;
> + xpad->odata[4] = 0x00;
> + xpad->odata[5] = 0x00;
> + xpad->odata[6] = 0x00;
> + xpad->odata[7] = 0x00;
> + xpad->odata[8] = 0x00;
> + xpad->odata[9] = 0x00;
> + xpad->odata[10] = 0x00;
> + xpad->odata[11] = 0x00;
> + xpad->irq_out->transfer_buffer_length = 12;
> + usb_submit_urb(xpad->irq_out, GFP_KERNEL);
> + mutex_unlock(&xpad->odata_mutex);
> + } else {
> + xpad->pad_present = 1;
> + error = xpad_init_input(xpad);
> + if (error)
> + goto fail4;
> }
> - xpad->pad_present = 1;
> - error = xpad_init_input(xpad);
> - if (error)
> - goto fail4;
>
> return 0;
>
> --
> 1.9.1
>
--
Dmitry
next prev parent reply other threads:[~2015-07-30 6:57 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-10 23:47 [PATCH 0/8] Input: xpad: fix wireless pad connection and URB out Pavel Rojtberg
2015-07-10 23:47 ` [PATCH 1/8] Input: xpad: clarify LED enumeration Pavel Rojtberg
2015-07-10 23:47 ` [PATCH 2/8] Input: xpad: remove bulk out URB Pavel Rojtberg
2015-07-10 23:47 ` [PATCH 3/8] Input: xpad: move the input device creation to a new function Pavel Rojtberg
2015-07-10 23:47 ` [PATCH 4/8] Input: xpad: query Wireless controller state at init Pavel Rojtberg
2015-07-30 6:57 ` Dmitry Torokhov [this message]
2015-07-10 23:47 ` [PATCH 5/8] Input: xpad: handle "present" and "gone" correctly Pavel Rojtberg
2015-07-30 7:06 ` Dmitry Torokhov
2015-07-10 23:47 ` [PATCH 6/8] Input: xpad: use bitmask for finding the pad_nr Pavel Rojtberg
2015-07-30 6:55 ` Dmitry Torokhov
2015-07-31 12:46 ` Pavel Rojtberg
2015-07-10 23:47 ` [PATCH 7/8] Input: xpad: factor out URB submission in xpad_play_effect Pavel Rojtberg
2015-07-10 23:47 ` [PATCH 8/8] Input: xpad: do not submit active URBs Pavel Rojtberg
2015-07-30 6:59 ` Dmitry Torokhov
2015-07-31 13:08 ` Pavel Rojtberg
[not found] ` <CA+b0ujev6m0Bpzyj6tJ2-hjf1vudRAkfVyacMb=uV8t6ZKr0dg@mail.gmail.com>
2015-07-25 10:55 ` [PATCH 0/8] Input: xpad: fix wireless pad connection and URB out Pavel Rojtberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150730065721.GC35939@dtor-ws \
--to=dmitry.torokhov@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-input@vger.kernel.org \
--cc=pgriffais@valvesoftware.com \
--cc=rojtberg@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).