Source-Changes-HG archive

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

[src/nick-nhusb]: src/sys/dev/usb #ifdef DIAGNOSTIC + panic -> KASSERTMSG



details:   https://anonhg.NetBSD.org/src/rev/d8a80ec90ee3
branches:  nick-nhusb
changeset: 334571:d8a80ec90ee3
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Dec 27 08:49:29 2016 +0000

description:
#ifdef DIAGNOSTIC + panic -> KASSERTMSG

diffstat:

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

diffs (31 lines):

diff -r f2c9761663f6 -r d8a80ec90ee3 sys/dev/usb/motg.c
--- a/sys/dev/usb/motg.c        Tue Dec 27 08:33:08 2016 +0000
+++ b/sys/dev/usb/motg.c        Tue Dec 27 08:49:29 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: motg.c,v 1.12.2.30 2016/07/09 20:25:15 skrll Exp $     */
+/*     $NetBSD: motg.c,v 1.12.2.31 2016/12/27 08:49:29 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.12.2.30 2016/07/09 20:25:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.31 2016/12/27 08:49:29 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_motg.h"
@@ -2087,9 +2087,9 @@
 complete:
        DPRINTFN(MD_BULK, "xfer %p complete, status %d", 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);
+       KASSERTMSG(xfer && xfer->ux_status == USBD_IN_PROGRESS && 
+           ep->phase == DATA_OUT, "xfer %p status %d phase %d",
+           xfer, xfer->ux_status, ep->phase);
 #endif
        ep->phase = IDLE;
        ep->xfer = NULL;



Home | Main Index | Thread Index | Old Index