From ac575d2a58ef36ce8d1fa812fd71a95eacbf95e1 Mon Sep 17 00:00:00 2001 From: mycroft Date: Tue, 29 Jun 2004 03:56:04 +0000 Subject: Make one message dependent on ohcidebug, so it doesn't interfere with polled operation; e.g. when entering a root device or in DDB. --- sys/dev/usb/ehci.c | 6 +++--- sys/dev/usb/ohci.c | 6 +++--- sys/dev/usb/uhci.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index 23fb49c43dd..510a4aab8d3 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ehci.c,v 1.64 2004/06/23 06:45:56 mycroft Exp $ */ +/* $NetBSD: ehci.c,v 1.65 2004/06/29 03:58:14 mycroft Exp $ */ /* * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.64 2004/06/23 06:45:56 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.65 2004/06/29 03:58:14 mycroft Exp $"); #include "ohci.h" #include "uhci.h" @@ -477,7 +477,7 @@ ehci_intr(void *v) /* If we get an interrupt while polling, then just ignore it. */ if (sc->sc_bus.use_polling) { #ifdef DIAGNOSTIC - printf("ehci_intr: ignored interrupt while polling\n"); + DPRINTFN(16, ("ehci_intr: ignored interrupt while polling\n")); #endif return (0); } diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 9ccae6815c8..ce1b0522ae7 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ohci.c,v 1.148 2004/06/22 18:27:46 mycroft Exp $ */ +/* $NetBSD: ohci.c,v 1.149 2004/06/29 03:56:04 mycroft Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */ /* @@ -46,7 +46,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.148 2004/06/22 18:27:46 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.149 2004/06/29 03:56:04 mycroft Exp $"); #include #include @@ -1090,7 +1090,7 @@ ohci_intr(void *p) /* If we get an interrupt while polling, then just ignore it. */ if (sc->sc_bus.use_polling) { #ifdef DIAGNOSTIC - printf("ohci_intr: ignored interrupt while polling\n"); + DPRINTFN(16, ("ohci_intr: ignored interrupt while polling\n")); #endif return (0); } diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 5417114f9f7..76d95a170fa 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhci.c,v 1.178 2004/03/02 16:32:05 martin Exp $ */ +/* $NetBSD: uhci.c,v 1.179 2004/06/29 03:57:36 mycroft Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */ /* @@ -49,7 +49,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.178 2004/03/02 16:32:05 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.179 2004/06/29 03:57:36 mycroft Exp $"); #include #include @@ -1176,13 +1176,13 @@ uhci_intr(void *arg) if (sc->sc_dying) return (0); - DPRINTFN(15,("uhci_intr: real interrupt\n")); if (sc->sc_bus.use_polling) { #ifdef DIAGNOSTIC - printf("uhci_intr: ignored interrupt while polling\n"); + DPRINTFN(16, ("uhci_intr: ignored interrupt while polling\n")); #endif return (0); } + return (uhci_intr1(sc)); } -- cgit