Module Name: src
Committed By: mrg
Date: Mon Feb 20 03:23:26 UTC 2012
Modified Files:
src/sys/dev/usb [jmcneill-usbmp]: ehci.c ohci.c uhci.c
Log Message:
adjust some comments to reality. copy some XXX comments from ehci
into uhci/ohci since it's probably right there too
To generate a diff of this commit:
cvs rdiff -u -r1.181.6.6 -r1.181.6.7 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.218.6.9 -r1.218.6.10 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.240.6.7 -r1.240.6.8 src/sys/dev/usb/uhci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.181.6.6 src/sys/dev/usb/ehci.c:1.181.6.7
--- src/sys/dev/usb/ehci.c:1.181.6.6 Mon Feb 20 02:12:23 2012
+++ src/sys/dev/usb/ehci.c Mon Feb 20 03:23:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.181.6.6 2012/02/20 02:12:23 mrg Exp $ */
+/* $NetBSD: ehci.c,v 1.181.6.7 2012/02/20 03:23:26 mrg Exp $ */
/*
* Copyright (c) 2004-2011 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.181.6.6 2012/02/20 02:12:23 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.181.6.7 2012/02/20 03:23:26 mrg Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -1932,7 +1932,6 @@ ehci_sync_hc(ehci_softc_t *sc)
DPRINTFN(2,("ehci_sync_hc: exit\n"));
}
-/*Call at splusb*/
Static void
ehci_rem_free_itd_chain(ehci_softc_t *sc, struct ehci_xfer *exfer)
{
@@ -2986,6 +2985,7 @@ ehci_close_pipe(usbd_pipe_handle pipe, e
* If the transaction has already happened we rely on the ordinary
* interrupt processing to process it.
* XXX This is most probably wrong.
+ * XXXMRG this doesn't make sense anymore.
*/
Static void
ehci_abort_xfer(usbd_xfer_handle xfer, usbd_status status)
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.218.6.9 src/sys/dev/usb/ohci.c:1.218.6.10
--- src/sys/dev/usb/ohci.c:1.218.6.9 Mon Feb 20 02:12:24 2012
+++ src/sys/dev/usb/ohci.c Mon Feb 20 03:23:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.218.6.9 2012/02/20 02:12:24 mrg Exp $ */
+/* $NetBSD: ohci.c,v 1.218.6.10 2012/02/20 03:23:26 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
/*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.218.6.9 2012/02/20 02:12:24 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.218.6.10 2012/02/20 03:23:26 mrg Exp $");
#include "opt_usb.h"
@@ -2299,6 +2299,8 @@ ohci_close_pipe(usbd_pipe_handle pipe, o
* have happened since the hardware runs concurrently.
* If the transaction has already happened we rely on the ordinary
* interrupt processing to process it.
+ * XXX This is most probably wrong.
+ * XXXMRG this doesn't make sense anymore.
*/
void
ohci_abort_xfer(usbd_xfer_handle xfer, usbd_status status)
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.240.6.7 src/sys/dev/usb/uhci.c:1.240.6.8
--- src/sys/dev/usb/uhci.c:1.240.6.7 Mon Feb 20 02:12:24 2012
+++ src/sys/dev/usb/uhci.c Mon Feb 20 03:23:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.240.6.7 2012/02/20 02:12:24 mrg Exp $ */
+/* $NetBSD: uhci.c,v 1.240.6.8 2012/02/20 03:23:26 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
/*
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.240.6.7 2012/02/20 02:12:24 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.240.6.8 2012/02/20 03:23:26 mrg Exp $");
#include "opt_usb.h"
@@ -1091,7 +1091,7 @@ uhci_rem_loop(uhci_softc_t *sc) {
}
}
-/* Add high speed control QH, called at splusb(). */
+/* Add high speed control QH, called with thread lock held. */
void
uhci_add_hs_ctrl(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
{
@@ -1118,7 +1118,7 @@ uhci_add_hs_ctrl(uhci_softc_t *sc, uhci_
#endif
}
-/* Remove high speed control QH, called at splusb(). */
+/* Remove high speed control QH, called with thread lock held. */
void
uhci_remove_hs_ctrl(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
{
@@ -1168,7 +1168,7 @@ uhci_remove_hs_ctrl(uhci_softc_t *sc, uh
sc->sc_hctl_end = pqh;
}
-/* Add low speed control QH, called at splusb(). */
+/* Add low speed control QH, called with thread lock held. */
void
uhci_add_ls_ctrl(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
{
@@ -1191,7 +1191,7 @@ uhci_add_ls_ctrl(uhci_softc_t *sc, uhci_
sc->sc_lctl_end = sqh;
}
-/* Remove low speed control QH, called at splusb(). */
+/* Remove low speed control QH, called with thread lock held. */
void
uhci_remove_ls_ctrl(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
{
@@ -1225,7 +1225,7 @@ uhci_remove_ls_ctrl(uhci_softc_t *sc, uh
sc->sc_lctl_end = pqh;
}
-/* Add bulk QH, called at splusb(). */
+/* Add bulk QH, called with thread lock held. */
void
uhci_add_bulk(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
{
@@ -1249,7 +1249,7 @@ uhci_add_bulk(uhci_softc_t *sc, uhci_sof
uhci_add_loop(sc);
}
-/* Remove bulk QH, called at splusb(). */
+/* Remove bulk QH, called with thread lock held. */
void
uhci_remove_bulk(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
{
@@ -2130,6 +2130,8 @@ uhci_device_bulk_abort(usbd_xfer_handle
* have happened since the hardware runs concurrently.
* If the transaction has already happened we rely on the ordinary
* interrupt processing to process it.
+ * XXX This is most probably wrong.
+ * XXXMRG this doesn't make sense anymore.
*/
void
uhci_abort_xfer(usbd_xfer_handle xfer, usbd_status status)
