I don't have any atu(4) device.

However, I do have an OHCI HUB with a keyboard hooked.

No breakage up to now, and the ukbd still works fine.

ohci0 at pci4 dev 0 function 0 "AT&T/Lucent USB 2-port" rev 0x10: apic
1 int 16, version 1.0, legacy support
usb1 at ohci0: USB revision 1.0
uhub1 at usb1 "AT&T/Lucent OHCI root hub" rev 1.00/1.00 addr 1
ohci0 at pci4 dev 0 function 0 "AT&T/Lucent USB 2-port" rev 0x10: apic
1 int 16, version 1.0, legacy support
usb1 at ohci0: USB revision 1.0
uhub1 at usb1 "AT&T/Lucent OHCI root hub" rev 1.00/1.00 addr 1

ukbd0 at uhidev0: 8 modifier keys, 6 key codes
wskbd1 at ukbd0 mux 1
ukbd0 at uhidev0: 8 modifier keys, 6 key codes
wskbd1 at ukbd0 mux 1

uhidev0 at uhub1 port 2 configuration 1 interface 0 "Ever Electronics
Corp. Usb KeyBoard" rev 1.10/1.05 addr 2
uhidev1 at uhub1 port 2 configuration 1 interface 1 "Ever Electronics
Corp. Usb KeyBoard" rev 1.10/1.05 addr 2
uhub1 at usb1 "AT&T/Lucent OHCI root hub" rev 1.00/1.00 addr 1


On Thu, Sep 8, 2011 at 5:00 AM, Michael Knudsen <[email protected]> wrote:
> if_atu.c includes kthread.h but it doesn't actually have any threads,
> so include timeout.h instead since that's what's needed (usbdi.h pulls
> in struct timeout).
>
> ohci.c uses 0 instead of NULL in a pointer assignment.
>
> -m.
>
> Index: if_atu.c
> ===================================================================
> RCS file: /var/ocvs/src/sys/dev/usb/if_atu.c,v
> retrieving revision 1.99
> diff -u -p -r1.99 if_atu.c
> --- if_atu.c    3 Jul 2011 15:47:17 -0000       1.99
> +++ if_atu.c    7 Sep 2011 23:51:36 -0000
> @@ -53,7 +53,7 @@
>  #include <sys/kernel.h>
>  #include <sys/socket.h>
>  #include <sys/systm.h>
> -#include <sys/kthread.h>
> +#include <sys/timeout.h>
>  #include <sys/queue.h>
>  #include <sys/device.h>
>
> Index: ohci.c
> ===================================================================
> RCS file: /var/ocvs/src/sys/dev/usb/ohci.c,v
> retrieving revision 1.104
> diff -u -p -r1.104 ohci.c
> --- ohci.c      3 Jul 2011 15:47:17 -0000       1.104
> +++ ohci.c      8 Sep 2011 00:36:42 -0000
> @@ -442,7 +442,7 @@ ohci_alloc_sed(ohci_softc_t *sc)
>        sed = sc->sc_freeeds;
>        sc->sc_freeeds = sed->next;
>        memset(&sed->ed, 0, sizeof(ohci_ed_t));
> -       sed->next = 0;
> +       sed->next = NULL;
>        return (sed);
>  }
>
> --
> The Librarian gave him the kind of look other people would reserve for
> people who said things like `What's so bad about genocide?'
> -- (Terry Pratchett, Guards! Guards!)
>
>



--
`` Real men run current !''

Reply via email to