[U-Boot] [PATCH] USB: Add usb_event_poll() to get keyboards working with EHCI

[U-Boot] [PATCH] USB: Add usb_event_poll() to get keyboards working with EHCI

[Marek Vasut]

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Remy Bohmer <linux@bohmer.net>
---
 drivers/usb/host/ehci-hcd.c |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 52b98c2..5b53b3a 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -27,6 +27,10 @@
 #include <malloc.h>
 #include <watchdog.h>
 #include <usb/ehci-fsl.h>
+#ifdef CONFIG_USB_KEYBOARD
+#include <stdio_dev.h>
+extern unsigned char new[];
+#endif
 
 #include "ehci.h"
 
@@ -914,5 +918,32 @@ submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
 
 	debug("dev=%p, pipe=%lu, buffer=%p, length=%d, interval=%d",
 	      dev, pipe, buffer, length, interval);
-	return -1;
+	return ehci_submit_async(dev, pipe, buffer, length, NULL);
+}
+
+#ifdef CONFIG_SYS_USB_EVENT_POLL
+/*
+ * This function polls for USB keyboard data.
+ */
+void usb_event_poll()
+{
+	struct stdio_dev *dev;
+	struct usb_device *usb_kbd_dev;
+	struct usb_interface *iface;
+	struct usb_endpoint_descriptor *ep;
+	int pipe;
+	int maxp;
+
+	/* Get the pointer to USB Keyboard device pointer */
+	dev = stdio_get_by_name("usbkbd");
+	usb_kbd_dev = (struct usb_device *)dev->priv;
+	iface = &usb_kbd_dev->config.if_desc[0];
+	ep = &iface->ep_desc[0];
+	pipe = usb_rcvintpipe(usb_kbd_dev, ep->bEndpointAddress);
+
+	/* Submit a interrupt transfer request */
+	maxp = usb_maxpacket(usb_kbd_dev, pipe);
+	usb_submit_int_msg(usb_kbd_dev, pipe, &new[0],
+			maxp > 8 ? 8 : maxp, ep->bInterval);
 }
+#endif /* CONFIG_SYS_USB_EVENT_POLL */
-- 
1.7.5.4

[U-Boot] [PATCH] USB: Add usb_event_poll() to get keyboards working with EHCI

[Remy Bohmer]

Hi,

2011/9/23 Marek Vasut <marek.vasut@gmail.com>:
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Remy Bohmer <linux@bohmer.net>
> ---
> ?drivers/usb/host/ehci-hcd.c | ? 33 ++++++++++++++++++++++++++++++++-
> ?1 files changed, 32 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
> index 52b98c2..5b53b3a 100644
> --- a/drivers/usb/host/ehci-hcd.c
> +++ b/drivers/usb/host/ehci-hcd.c
> @@ -27,6 +27,10 @@
> ?#include <malloc.h>
> ?#include <watchdog.h>
> ?#include <usb/ehci-fsl.h>
> +#ifdef CONFIG_USB_KEYBOARD
> +#include <stdio_dev.h>
> +extern unsigned char new[];
> +#endif
>
> ?#include "ehci.h"
>
> @@ -914,5 +918,32 @@ submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
>
> ? ? ? ?debug("dev=%p, pipe=%lu, buffer=%p, length=%d, interval=%d",
> ? ? ? ? ? ? ?dev, pipe, buffer, length, interval);
> - ? ? ? return -1;
> + ? ? ? return ehci_submit_async(dev, pipe, buffer, length, NULL);

Why is changing this line needed?

> +}
> +
> +#ifdef CONFIG_SYS_USB_EVENT_POLL
> +/*
> + * This function polls for USB keyboard data.
> + */
> +void usb_event_poll()
> +{
> + ? ? ? struct stdio_dev *dev;
> + ? ? ? struct usb_device *usb_kbd_dev;
> + ? ? ? struct usb_interface *iface;
> + ? ? ? struct usb_endpoint_descriptor *ep;
> + ? ? ? int pipe;
> + ? ? ? int maxp;
> +
> + ? ? ? /* Get the pointer to USB Keyboard device pointer */
> + ? ? ? dev = stdio_get_by_name("usbkbd");
> + ? ? ? usb_kbd_dev = (struct usb_device *)dev->priv;
> + ? ? ? iface = &usb_kbd_dev->config.if_desc[0];
> + ? ? ? ep = &iface->ep_desc[0];
> + ? ? ? pipe = usb_rcvintpipe(usb_kbd_dev, ep->bEndpointAddress);
> +
> + ? ? ? /* Submit a interrupt transfer request */
> + ? ? ? maxp = usb_maxpacket(usb_kbd_dev, pipe);
> + ? ? ? usb_submit_int_msg(usb_kbd_dev, pipe, &new[0],
> + ? ? ? ? ? ? ? ? ? ? ? maxp > 8 ? 8 : maxp, ep->bInterval);
> ?}
> +#endif /* CONFIG_SYS_USB_EVENT_POLL */

Patch does not apply to u-boot-usb master.
Please rebase this patch.

Kind regards,

Remy

[U-Boot] [PATCH] USB: Add usb_event_poll() to get keyboards working with EHCI

[Marek Vasut]

On Saturday, September 24, 2011 06:41:58 PM Remy Bohmer wrote:
> Hi,
> 
> 2011/9/23 Marek Vasut <marek.vasut@gmail.com>:
> > Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> > Cc: Remy Bohmer <linux@bohmer.net>
> > ---
> >  drivers/usb/host/ehci-hcd.c |   33 ++++++++++++++++++++++++++++++++-
> >  1 files changed, 32 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
> > index 52b98c2..5b53b3a 100644
> > --- a/drivers/usb/host/ehci-hcd.c
> > +++ b/drivers/usb/host/ehci-hcd.c
> > @@ -27,6 +27,10 @@
> >  #include <malloc.h>
> >  #include <watchdog.h>
> >  #include <usb/ehci-fsl.h>
> > +#ifdef CONFIG_USB_KEYBOARD
> > +#include <stdio_dev.h>
> > +extern unsigned char new[];
> > +#endif
> > 
> >  #include "ehci.h"
> > 
> > @@ -914,5 +918,32 @@ submit_int_msg(struct usb_device *dev, unsigned long
> > pipe, void *buffer,
> > 
> >        debug("dev=%p, pipe=%lu, buffer=%p, length=%d, interval=%d",
> >              dev, pipe, buffer, length, interval);
> > -       return -1;
> > +       return ehci_submit_async(dev, pipe, buffer, length, NULL);
> 
> Why is changing this line needed?

To actually submit the interrupt request ?

> 
> > +}
> > +
> > +#ifdef CONFIG_SYS_USB_EVENT_POLL
> > +/*
> > + * This function polls for USB keyboard data.
> > + */
> > +void usb_event_poll()
> > +{
> > +       struct stdio_dev *dev;
> > +       struct usb_device *usb_kbd_dev;
> > +       struct usb_interface *iface;
> > +       struct usb_endpoint_descriptor *ep;
> > +       int pipe;
> > +       int maxp;
> > +
> > +       /* Get the pointer to USB Keyboard device pointer */
> > +       dev = stdio_get_by_name("usbkbd");
> > +       usb_kbd_dev = (struct usb_device *)dev->priv;
> > +       iface = &usb_kbd_dev->config.if_desc[0];
> > +       ep = &iface->ep_desc[0];
> > +       pipe = usb_rcvintpipe(usb_kbd_dev, ep->bEndpointAddress);
> > +
> > +       /* Submit a interrupt transfer request */
> > +       maxp = usb_maxpacket(usb_kbd_dev, pipe);
> > +       usb_submit_int_msg(usb_kbd_dev, pipe, &new[0],
> > +                       maxp > 8 ? 8 : maxp, ep->bInterval);
> >  }
> > +#endif /* CONFIG_SYS_USB_EVENT_POLL */
> 
> Patch does not apply to u-boot-usb master.
> Please rebase this patch.

Ah right ... there must be some changes in my repo or u-boot-imx/next ... will 
do in my next submission round.

Cheers

> 
> Kind regards,
> 
> Remy

[U-Boot] [PATCH] USB: Add usb_event_poll() to get keyboards working with EHCI

[Remy Bohmer]

Hi,

2011/9/24 Marek Vasut <marek.vasut@gmail.com>:
> On Saturday, September 24, 2011 06:41:58 PM Remy Bohmer wrote:
>> Hi,
>>
>> 2011/9/23 Marek Vasut <marek.vasut@gmail.com>:
>> > Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
>> > Cc: Remy Bohmer <linux@bohmer.net>
>> > ---
>> > ?drivers/usb/host/ehci-hcd.c | ? 33 ++++++++++++++++++++++++++++++++-
>> > ?1 files changed, 32 insertions(+), 1 deletions(-)
>> >
>> > diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
>> > index 52b98c2..5b53b3a 100644
>> > --- a/drivers/usb/host/ehci-hcd.c
>> > +++ b/drivers/usb/host/ehci-hcd.c
>> > @@ -27,6 +27,10 @@
>> > ?#include <malloc.h>
>> > ?#include <watchdog.h>
>> > ?#include <usb/ehci-fsl.h>
>> > +#ifdef CONFIG_USB_KEYBOARD
>> > +#include <stdio_dev.h>
>> > +extern unsigned char new[];
>> > +#endif
>> >
>> > ?#include "ehci.h"
>> >
>> > @@ -914,5 +918,32 @@ submit_int_msg(struct usb_device *dev, unsigned long
>> > pipe, void *buffer,
>> >
>> > ? ? ? ?debug("dev=%p, pipe=%lu, buffer=%p, length=%d, interval=%d",
>> > ? ? ? ? ? ? ?dev, pipe, buffer, length, interval);
>> > - ? ? ? return -1;
>> > + ? ? ? return ehci_submit_async(dev, pipe, buffer, length, NULL);
>>
>> Why is changing this line needed?
>
> To actually submit the interrupt request ?

Was just checking... at first impression it appeared to be some
unrelated change. While looking at it in its context it seems indeed
logical.

> Ah right ... there must be some changes in my repo or u-boot-imx/next ... will
> do in my next submission round.

OK. I will pull it in then.

Kind regards,

Remy

[U-Boot] [PATCH V2] USB: Add usb_event_poll() to get keyboards working with EHCI

[Marek Vasut]

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Remy Bohmer <linux@bohmer.net>
---
 drivers/usb/host/ehci-hcd.c |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 deletions(-)

V2: Drop redundant bogus header.

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 83ac8b1..41928a2 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -26,6 +26,10 @@
 #include <asm/io.h>
 #include <malloc.h>
 #include <watchdog.h>
+#ifdef CONFIG_USB_KEYBOARD
+#include <stdio_dev.h>
+extern unsigned char new[];
+#endif
 
 #include "ehci.h"
 
@@ -911,5 +915,32 @@ submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
 
 	debug("dev=%p, pipe=%lu, buffer=%p, length=%d, interval=%d",
 	      dev, pipe, buffer, length, interval);
-	return -1;
+	return ehci_submit_async(dev, pipe, buffer, length, NULL);
+}
+
+#ifdef CONFIG_SYS_USB_EVENT_POLL
+/*
+ * This function polls for USB keyboard data.
+ */
+void usb_event_poll()
+{
+	struct stdio_dev *dev;
+	struct usb_device *usb_kbd_dev;
+	struct usb_interface *iface;
+	struct usb_endpoint_descriptor *ep;
+	int pipe;
+	int maxp;
+
+	/* Get the pointer to USB Keyboard device pointer */
+	dev = stdio_get_by_name("usbkbd");
+	usb_kbd_dev = (struct usb_device *)dev->priv;
+	iface = &usb_kbd_dev->config.if_desc[0];
+	ep = &iface->ep_desc[0];
+	pipe = usb_rcvintpipe(usb_kbd_dev, ep->bEndpointAddress);
+
+	/* Submit a interrupt transfer request */
+	maxp = usb_maxpacket(usb_kbd_dev, pipe);
+	usb_submit_int_msg(usb_kbd_dev, pipe, &new[0],
+			maxp > 8 ? 8 : maxp, ep->bInterval);
 }
+#endif /* CONFIG_SYS_USB_EVENT_POLL */
-- 
1.7.5.4

[U-Boot] [PATCH V2] USB: Add usb_event_poll() to get keyboards working with EHCI

[Wolfgang Denk]

Dear Marek Vasut,

In message <1316977676-10284-1-git-send-email-marek.vasut@gmail.com> you wrote:
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Remy Bohmer <linux@bohmer.net>
> ---
>  drivers/usb/host/ehci-hcd.c |   33 ++++++++++++++++++++++++++++++++-
>  1 files changed, 32 insertions(+), 1 deletions(-)
> 
> V2: Drop redundant bogus header.

Checkpatch says:

total: 0 errors, 1 warnings, 43 lines checked

Please clean up and resubmit.  Thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"The pathology is to want control, not that you ever get it,  because
of course you never do."                            - Gregory Bateson

[U-Boot] [PATCH V2] USB: Add usb_event_poll() to get keyboards working with EHCI

[Marek Vasut]

Dear Wolfgang Denk,

> Dear Marek Vasut,
> 
> In message <1316977676-10284-1-git-send-email-marek.vasut@gmail.com> you 
wrote:
> > Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> > Cc: Remy Bohmer <linux@bohmer.net>
> > ---
> > 
> >  drivers/usb/host/ehci-hcd.c |   33 ++++++++++++++++++++++++++++++++-
> >  1 files changed, 32 insertions(+), 1 deletions(-)
> > 
> > V2: Drop redundant bogus header.
> 
> Checkpatch says:
> 
> total: 0 errors, 1 warnings, 43 lines checked
> 
> Please clean up and resubmit.  Thanks.
> 
> Best regards,
> 
> Wolfgang Denk

The extern-stuff checkpatch is complaining about is a problem with usbkbd.c . 
The file needs cleanup, badly, only then we can get rid of those externs.

I'd prefer to get this applied and then cleanup the usbkbd.c. The musb driver 
suffers the same trouble, so it can be cleaned up with this together.

Cheers

[U-Boot] [PATCH V2] USB: Add usb_event_poll() to get keyboards working with EHCI

[Wolfgang Denk]

Dear Marek Vasut,

In message <201110070130.14881.marek.vasut@gmail.com> you wrote:
> 
> > Checkpatch says:
> > 
> > total: 0 errors, 1 warnings, 43 lines checked
> > 
> > Please clean up and resubmit.  Thanks.
...
> The extern-stuff checkpatch is complaining about is a problem with usbkbd.c . 
> The file needs cleanup, badly, only then we can get rid of those externs.
> 
> I'd prefer to get this applied and then cleanup the usbkbd.c. The musb driver 
> suffers the same trouble, so it can be cleaned up with this together.

If Remy accepts this, I'm fine with it, too.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
When it is incorrect, it is, at least *authoritatively* incorrect.
                                    - Hitchiker's Guide To The Galaxy

[U-Boot] [PATCH V2] USB: Add usb_event_poll() to get keyboards working with EHCI

[Marek Vasut]

On Friday, October 07, 2011 07:25:22 AM Wolfgang Denk wrote:
> Dear Marek Vasut,
> 
> In message <201110070130.14881.marek.vasut@gmail.com> you wrote:
> > > Checkpatch says:
> > > 
> > > total: 0 errors, 1 warnings, 43 lines checked
> > > 
> > > Please clean up and resubmit.  Thanks.
> 
> ...
> 
> > The extern-stuff checkpatch is complaining about is a problem with
> > usbkbd.c . The file needs cleanup, badly, only then we can get rid of
> > those externs.
> > 
> > I'd prefer to get this applied and then cleanup the usbkbd.c. The musb
> > driver suffers the same trouble, so it can be cleaned up with this
> > together.
> 
> If Remy accepts this, I'm fine with it, too.

I'm adding the cleanup to my todo.

[U-Boot] [PATCH V2] USB: Add usb_event_poll() to get keyboards working with EHCI

[Remy Bohmer]

Hi Marek,

2011/10/7 Marek Vasut <marek.vasut@gmail.com>:
> On Friday, October 07, 2011 07:25:22 AM Wolfgang Denk wrote:
>> Dear Marek Vasut,
>>
>> In message <201110070130.14881.marek.vasut@gmail.com> you wrote:
>> > > Checkpatch says:
>> > >
>> > > total: 0 errors, 1 warnings, 43 lines checked
>> > >
>> > > Please clean up and resubmit. ?Thanks.
>>
>> ...
>>
>> > The extern-stuff checkpatch is complaining about is a problem with
>> > usbkbd.c . The file needs cleanup, badly, only then we can get rid of
>> > those externs.
>> >
>> > I'd prefer to get this applied and then cleanup the usbkbd.c. The musb
>> > driver suffers the same trouble, so it can be cleaned up with this
>> > together.
>>
>> If Remy accepts this, I'm fine with it, too.
>
> I'm adding the cleanup to my todo.

I am looking forward to the cleanup.
In the mean time I will pull it in.

Kind regards,

Remy

[U-Boot] [PATCH V2] USB: Add usb_event_poll() to get keyboards working with EHCI

[Remy Bohmer]

Hi,

2011/9/25 Marek Vasut <marek.vasut@gmail.com>:
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Remy Bohmer <linux@bohmer.net>
> ---
> ?drivers/usb/host/ehci-hcd.c | ? 33 ++++++++++++++++++++++++++++++++-
> ?1 files changed, 32 insertions(+), 1 deletions(-)
>
> V2: Drop redundant bogus header.
>

Applied to u-boot-usb

Kind regards,

Remy