[src/nick-nhusb]: src/sys/dev/usb Use KASSERT* instead of panic wrapped in #i...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/671968a06402
branches:  nick-nhusb
changeset: 334337:671968a06402
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Dec 19 09:59:03 2015 +0000

description:
Use KASSERT* instead of panic wrapped in #ifdef DIAGNOSTIC / #endif

diffstat:

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

diffs (104 lines):

diff -r 19f694b0b76d -r 671968a06402 sys/dev/usb/motg.c
--- a/sys/dev/usb/motg.c        Sat Dec 19 09:56:41 2015 +0000
+++ b/sys/dev/usb/motg.c        Sat Dec 19 09:59:03 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: motg.c,v 1.12.2.24 2015/12/19 09:56:41 skrll Exp $     */
+/*     $NetBSD: motg.c,v 1.12.2.25 2015/12/19 09:59:03 skrll Exp $     */
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
 #include "opt_motg.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.24 2015/12/19 09:56:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.25 2015/12/19 09:59:03 skrll Exp $");
 
 #include <sys/param.h>
 
@@ -690,8 +690,7 @@
        rx_status |= UREAD2(sc, MUSB2_REG_INTRX);
        tx_status |= UREAD2(sc, MUSB2_REG_INTTX);
 
-       if (rx_status & 0x01)
-               panic("ctrl_rx %08x", rx_status);
+       KASSERTMSG((rx_status & 0x01) == 0, "ctrl_rx %08x", rx_status);
        if (tx_status & 0x01)
                motg_device_ctrl_intr_tx(sc);
        for (i = 1; i <= sc->sc_ep_max; i++) {
@@ -1332,10 +1331,7 @@
        xfer->ux_status = USBD_IN_PROGRESS;
        KASSERT(otgpipe == MOTG_PIPE2MPIPE(xfer->ux_pipe));
        KASSERT(otgpipe->hw_ep == ep);
-#ifdef DIAGNOSTIC
-       if (!(xfer->ux_rqflags & URQ_REQUEST))
-               panic("motg_device_ctrl_transfer: not a request");
-#endif
+       KASSERT(xfer->ux_rqflags & URQ_REQUEST);
        // KASSERT(xfer->ux_actlen == 0);
        xfer->ux_actlen = 0;
 
@@ -1408,11 +1404,7 @@
 
        KASSERT(mutex_owned(&sc->sc_lock));
 
-#ifdef DIAGNOSTIC
-       if (ep->phase != DATA_IN &&
-           ep->phase != STATUS_IN)
-               panic("motg_device_ctrl_intr_rx: bad phase %d", ep->phase);
-#endif
+       KASSERT(ep->phase == DATA_IN || ep->phase != STATUS_IN);
        /* select endpoint 0 */
        UWRITE1(sc, MUSB2_REG_EPINDEX, 0);
 
@@ -1529,11 +1521,9 @@
                return;
        }
 
-#ifdef DIAGNOSTIC
-       if (ep->phase != SETUP && ep->phase != DATA_OUT &&
-           ep->phase != STATUS_OUT)
-               panic("motg_device_ctrl_intr_tx: bad phase %d", ep->phase);
-#endif
+       KASSERT(ep->phase == SETUP || ep->phase == DATA_OUT ||
+           ep->phase == STATUS_OUT);
+
        /* select endpoint 0 */
        UWRITE1(sc, MUSB2_REG_EPINDEX, 0);
 
@@ -1781,10 +1771,7 @@
        xfer->ux_status = USBD_IN_PROGRESS;
        KASSERT(otgpipe == MOTG_PIPE2MPIPE(xfer->ux_pipe));
        KASSERT(otgpipe->hw_ep == ep);
-#ifdef DIAGNOSTIC
-       if (xfer->ux_rqflags & URQ_REQUEST)
-               panic("motg_device_data_transfer: a request");
-#endif
+       KASSERT(!(xfer->ux_rqflags & URQ_REQUEST));
        // KASSERT(xfer->ux_actlen == 0);
        xfer->ux_actlen = 0;
 
@@ -1942,10 +1929,7 @@
            MUSB2_MASK_CSRL_RXERROR | MUSB2_MASK_CSRL_RXPKTRDY)) == 0)
                return;
 
-#ifdef DIAGNOSTIC
-       if (ep->phase != DATA_IN)
-               panic("motg_device_intr_rx: bad phase %d", ep->phase);
-#endif
+       KASSERTMSG(ep->phase == DATA_IN, "phase %d", ep->phase);
        if (csr & MUSB2_MASK_CSRL_RXNAKTO) {
                csr &= ~MUSB2_MASK_CSRL_RXREQPKT;
                UWRITE1(sc, MUSB2_REG_RXCSRL, csr);
@@ -2085,10 +2069,7 @@
        }
        if (xfer == NULL || xfer->ux_status != USBD_IN_PROGRESS)
                goto complete;
-#ifdef DIAGNOSTIC
-       if (ep->phase != DATA_OUT)
-               panic("motg_device_intr_tx: bad phase %d", ep->phase);
-#endif
+       KASSERT(ep->phase == DATA_OUT);
 
        otgpipe = MOTG_PIPE2MPIPE(xfer->ux_pipe);
        otgpipe->nexttoggle = otgpipe->nexttoggle ^ 1;