Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/usb #ifdef DIAGNOSTIC / panic -> KASSERTMSG



details:   https://anonhg.NetBSD.org/src/rev/cc1d321fc985
branches:  trunk
changeset: 838550:cc1d321fc985
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Jan 22 06:39:24 2019 +0000

description:
#ifdef DIAGNOSTIC / panic -> KASSERTMSG

diffstat:

 sys/dev/usb/motg.c |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (32 lines):

diff -r ebb2e112bb6b -r cc1d321fc985 sys/dev/usb/motg.c
--- a/sys/dev/usb/motg.c        Tue Jan 22 06:38:53 2019 +0000
+++ b/sys/dev/usb/motg.c        Tue Jan 22 06:39:24 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: motg.c,v 1.23 2018/09/03 16:29:33 riastradh Exp $      */
+/*     $NetBSD: motg.c,v 1.24 2019/01/22 06:39:24 skrll Exp $  */
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.23 2018/09/03 16:29:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.24 2019/01/22 06:39:24 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -2079,10 +2079,9 @@
 complete:
        DPRINTFN(MD_BULK, "xfer %#jx complete, status %jd", (uintptr_t)xfer,
            (xfer != NULL) ? xfer->ux_status : 0, 0, 0);
-#ifdef DIAGNOSTIC
-       if (xfer && xfer->ux_status == USBD_IN_PROGRESS && ep->phase != DATA_OUT)
-               panic("motg_device_intr_tx: bad phase %d", ep->phase);
-#endif
+       KASSERTMSG(xfer && xfer->ux_status == USBD_IN_PROGRESS && 
+           ep->phase == DATA_OUT, "xfer %p status %d phase %d",
+           xfer, xfer->ux_status, ep->phase);
        ep->phase = IDLE;
        ep->xfer = NULL;
        if (xfer && xfer->ux_status == USBD_IN_PROGRESS) {



Home | Main Index | Thread Index | Old Index