Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/usb KASSERT -> KASSERTMSG and while I'm here update ...
details: https://anonhg.NetBSD.org/src/rev/9f8f203e2079
branches: trunk
changeset: 356883:9f8f203e2079
user: skrll <skrll%NetBSD.org@localhost>
date: Thu Oct 19 05:39:22 2017 +0000
description:
KASSERT -> KASSERTMSG and while I'm here update a comment
diffstat:
sys/dev/usb/usbdi.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diffs (37 lines):
diff -r 65e271a522dd -r 9f8f203e2079 sys/dev/usb/usbdi.c
--- a/sys/dev/usb/usbdi.c Thu Oct 19 03:26:28 2017 +0000
+++ b/sys/dev/usb/usbdi.c Thu Oct 19 05:39:22 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.173 2017/06/01 02:45:12 chs Exp $ */
+/* $NetBSD: usbdi.c,v 1.174 2017/10/19 05:39:22 skrll Exp $ */
/*
* Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.173 2017/06/01 02:45:12 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.174 2017/10/19 05:39:22 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -856,7 +856,7 @@
/*** Internal routines ***/
-/* Dequeue all pipe operations, called at splusb(). */
+/* Dequeue all pipe operations, called with bus lock held. */
Static usbd_status
usbd_ar_pipe(struct usbd_pipe *pipe)
{
@@ -999,7 +999,8 @@
xfer, pipe, pipe->up_running, xfer->ux_timeout);
KASSERT(mutex_owned(pipe->up_dev->ud_bus->ub_lock));
- KASSERT(xfer->ux_state == XFER_BUSY);
+ KASSERTMSG(xfer->ux_state == XFER_BUSY, "xfer %p state is %x", xfer,
+ xfer->ux_state);
#ifdef DIAGNOSTIC
xfer->ux_state = XFER_ONQU;
Home |
Main Index |
Thread Index |
Old Index