Module Name: src
Committed By: mrg
Date: Thu Apr 5 22:32:09 UTC 2012
Modified Files:
src/sys/dev/usb [jmcneill-usbmp]: ehci.c ohci.c uhci.c
Log Message:
make these compile without DIAGNOSTIC.
To generate a diff of this commit:
cvs rdiff -u -r1.181.6.19 -r1.181.6.20 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.218.6.19 -r1.218.6.20 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.240.6.18 -r1.240.6.19 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.19 src/sys/dev/usb/ehci.c:1.181.6.20
--- src/sys/dev/usb/ehci.c:1.181.6.19 Thu Apr 5 21:33:33 2012
+++ src/sys/dev/usb/ehci.c Thu Apr 5 22:32:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.181.6.19 2012/04/05 21:33:33 mrg Exp $ */
+/* $NetBSD: ehci.c,v 1.181.6.20 2012/04/05 22:32:08 mrg Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.181.6.19 2012/04/05 21:33:33 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.181.6.20 2012/04/05 22:32:08 mrg Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -2596,7 +2596,9 @@ ehci_root_intr_start(usbd_xfer_handle xf
Static void
ehci_root_intr_abort(usbd_xfer_handle xfer)
{
+#ifdef DIAGNOSTIC
ehci_softc_t *sc = xfer->pipe->device->bus->hci_private;
+#endif
KASSERT(mutex_owned(&sc->sc_lock));
if (xfer->pipe->intrxfer == xfer) {
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.218.6.19 src/sys/dev/usb/ohci.c:1.218.6.20
--- src/sys/dev/usb/ohci.c:1.218.6.19 Sun Mar 11 01:52:28 2012
+++ src/sys/dev/usb/ohci.c Thu Apr 5 22:32:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.218.6.19 2012/03/11 01:52:28 mrg Exp $ */
+/* $NetBSD: ohci.c,v 1.218.6.20 2012/04/05 22:32:08 mrg Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.218.6.19 2012/03/11 01:52:28 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.218.6.20 2012/04/05 22:32:08 mrg Exp $");
#include "opt_usb.h"
@@ -2873,7 +2873,9 @@ ohci_root_intr_start(usbd_xfer_handle xf
Static void
ohci_root_intr_abort(usbd_xfer_handle xfer)
{
+#ifdef DIAGNOSTIC
ohci_softc_t *sc = xfer->pipe->device->bus->hci_private;
+#endif
KASSERT(mutex_owned(&sc->sc_lock));
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.240.6.18 src/sys/dev/usb/uhci.c:1.240.6.19
--- src/sys/dev/usb/uhci.c:1.240.6.18 Sun Mar 11 01:52:28 2012
+++ src/sys/dev/usb/uhci.c Thu Apr 5 22:32:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.240.6.18 2012/03/11 01:52:28 mrg Exp $ */
+/* $NetBSD: uhci.c,v 1.240.6.19 2012/04/05 22:32:09 mrg Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.240.6.18 2012/03/11 01:52:28 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.240.6.19 2012/04/05 22:32:09 mrg Exp $");
#include "opt_usb.h"
@@ -1498,7 +1498,9 @@ uhci_idone(uhci_intr_info_t *ii)
{
usbd_xfer_handle xfer = ii->xfer;
struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
+#ifdef DIAGNOSTIC
uhci_softc_t *sc = upipe->pipe.device->bus->hci_private;
+#endif
uhci_soft_td_t *std;
u_int32_t status = 0, nstatus;
int actlen;
@@ -2745,7 +2747,9 @@ uhci_device_isoc_start(usbd_xfer_handle
void
uhci_device_isoc_abort(usbd_xfer_handle xfer)
{
+#ifdef DIAGNOSTIC
uhci_softc_t *sc = xfer->pipe->device->bus->hci_private;
+#endif
struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
uhci_soft_td_t **stds = upipe->u.iso.stds;
uhci_soft_td_t *std;
