Module Name: src
Committed By: skrll
Date: Sun Jul 3 07:27:37 UTC 2016
Modified Files:
src/sys/dev/usb: umass.c umass_scsipi.c umassvar.h
Log Message:
Fix build for USB_DEBUG without UMASS_DEBUG
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/usb/umass_scsipi.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/usb/umassvar.h
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/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.154 src/sys/dev/usb/umass.c:1.155
--- src/sys/dev/usb/umass.c:1.154 Sun Jul 3 07:24:56 2016
+++ src/sys/dev/usb/umass.c Sun Jul 3 07:27:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.154 2016/07/03 07:24:56 skrll Exp $ */
+/* $NetBSD: umass.c,v 1.155 2016/07/03 07:27:37 skrll Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.154 2016/07/03 07:24:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.155 2016/07/03 07:27:37 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -158,6 +158,7 @@ __KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.
#include <dev/scsipi/scsipiconf.h>
#ifdef USB_DEBUG
+#ifdef UMASS_DEBUG
int umassdebug = 0;
SYSCTL_SETUP(sysctl_hw_umass_setup, "sysctl hw.umass setup")
@@ -210,6 +211,7 @@ const char *states[TSTATE_STATES+1] = {
NULL
};
#endif
+#endif
/* USB device probe/attach/detach functions */
int umass_match(device_t, cfdata_t, void *);
@@ -1614,8 +1616,8 @@ umass_cbi_state(struct usbd_xfer *xfer,
* State handling for CBI transfers.
*/
- DPRINTFM(UDMASS_CBI, "sc %p: Handling CBI state %d (%s), xfer=%p, ...",
- sc, sc->transfer_state, states[sc->transfer_state], xfer);
+ DPRINTFM(UDMASS_CBI, "sc %p: Handling CBI state %d, xfer=%p, ...",
+ sc, sc->transfer_state, xfer, 0);
DPRINTFM(UDMASS_CBI, "... err %d", err, 0, 0, 0);
switch (sc->transfer_state) {
Index: src/sys/dev/usb/umass_scsipi.c
diff -u src/sys/dev/usb/umass_scsipi.c:1.52 src/sys/dev/usb/umass_scsipi.c:1.53
--- src/sys/dev/usb/umass_scsipi.c:1.52 Fri Jul 1 12:16:35 2016
+++ src/sys/dev/usb/umass_scsipi.c Sun Jul 3 07:27:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_scsipi.c,v 1.52 2016/07/01 12:16:35 skrll Exp $ */
+/* $NetBSD: umass_scsipi.c,v 1.53 2016/07/03 07:27:37 skrll Exp $ */
/*
* Copyright (c) 2001, 2003, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.52 2016/07/01 12:16:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.53 2016/07/03 07:27:37 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -403,10 +403,10 @@ umass_scsipi_cb(struct umass_softc *sc,
u_int delta;
microtime(&tv);
delta = (tv.tv_sec - sc->tv.tv_sec) * 1000000 + tv.tv_usec - sc->tv.tv_usec;
-#endif
-
DPRINTFM(UDMASS_CMD, "delta=%u: xs=%p residue=%d status=%d", delta, xs,
residue, status);
+#endif
+
xs->resid = residue;
Index: src/sys/dev/usb/umassvar.h
diff -u src/sys/dev/usb/umassvar.h:1.37 src/sys/dev/usb/umassvar.h:1.38
--- src/sys/dev/usb/umassvar.h:1.37 Fri Jul 1 12:16:35 2016
+++ src/sys/dev/usb/umassvar.h Sun Jul 3 07:27:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: umassvar.h,v 1.37 2016/07/01 12:16:35 skrll Exp $ */
+/* $NetBSD: umassvar.h,v 1.38 2016/07/03 07:27:37 skrll Exp $ */
/*-
* Copyright (c) 1999 MAEKAWA Masahide <[email protected]>,
@@ -29,6 +29,14 @@
* $FreeBSD: src/sys/dev/usb/umass.c,v 1.13 2000/03/26 01:39:12 n_hibma Exp $
*/
+#ifdef UMASS_DEBUG
+#define DIF(m, x) if (umassdebug & (m)) do { x ; } while (0)
+extern int umassdebug;
+#else
+#define umassdebug 0
+#define DIF(m, x) /* nop */
+#endif
+
#define DPRINTFM(M,FMT,A,B,C,D) USBHIST_LOGM(umassdebug,M,FMT,A,B,C,D)
#define UMASSHIST_FUNC() USBHIST_FUNC()
#define UMASSHIST_CALLED(name) USBHIST_CALLED(umassdebug)
@@ -46,13 +54,6 @@
#define UDMASS_XFER 0x40000000 /* all transfers */
#define UDMASS_CMD 0x80000000
-#ifdef UMASS_DEBUG
-#define DIF(m, x) if (umassdebug & (m)) do { x ; } while (0)
-extern int umassdebug;
-#else
-#define DIF(m, x) /* nop */
-#endif
-
/* Generic definitions */
#define UFI_COMMAND_LENGTH 12
