CVS commit: src/sys/dev/ic

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Fri Jun 17 16:07:40 UTC 2016

Modified Files:
        src/sys/dev/ic: sl811hs.c

Log Message:
More(/less) debug


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/ic/sl811hs.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/ic/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.77 src/sys/dev/ic/sl811hs.c:1.78
--- src/sys/dev/ic/sl811hs.c:1.77	Fri Jun 17 15:57:08 2016
+++ src/sys/dev/ic/sl811hs.c	Fri Jun 17 16:07:40 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: sl811hs.c,v 1.77 2016/06/17 15:57:08 skrll Exp $	*/
+/*	$NetBSD: sl811hs.c,v 1.78 2016/06/17 16:07:40 skrll Exp $	*/
 
 /*
  * Not (c) 2007 Matthew Orgass
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.77 2016/06/17 15:57:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.78 2016/06/17 16:07:40 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_slhci.h"
@@ -1735,11 +1735,10 @@ slhci_dointr(struct slhci_softc *sc)
 
 	KASSERT(mutex_owned(&sc->sc_intr_lock));
 
-	DLOG(D_INTR, "Flags %#x sc_ier %#x ISR=%#x", t->flags, sc->sc_ier,
-	    slhci_read(sc, SL11_ISR), 0);
-
-	if (sc->sc_ier == 0)
+	if (sc->sc_ier == 0) {
+		DLOG(D_INTR, "sc_ier is zero", 0, 0, 0, 0);
 		return 0;
+	}
 
 	r = slhci_read(sc, SL11_ISR);
 
@@ -1776,8 +1775,10 @@ slhci_dointr(struct slhci_softc *sc)
 
 	r &= sc->sc_ier;
 
-	if (r == 0)
+	if (r == 0) {
+		DLOG(D_INTR, "r is zero", 0, 0, 0, 0);
 		return 0;
+	}
 
 	sc->sc_ier_check = 0;
 
@@ -1787,6 +1788,7 @@ slhci_dointr(struct slhci_softc *sc)
 	/* If we have an insertion event we do not care about anything else. */
 	if (__predict_false(r & SL11_ISR_INSERT)) {
 		slhci_insert(sc);
+		DLOG(D_INTR, "... done", 0, 0, 0, 0);
 		return 1;
 	}
 
@@ -1896,6 +1898,8 @@ slhci_dointr(struct slhci_softc *sc)
 
 	slhci_dotransfer(sc);
 
+	DLOG(D_INTR, "... done", 0, 0, 0, 0);
+
 	return 1;
 }