[src/trunk]: src/sys/dev/usb defopt UMASS_DEBUG

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

details:   https://anonhg.NetBSD.org/src/rev/4bc1cd6d6074
branches:  trunk
changeset: 768646:4bc1cd6d6074
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Aug 23 16:16:43 2011 +0000

description:
defopt UMASS_DEBUG

diffstat:

 sys/dev/usb/files.usb      |  3 ++-
 sys/dev/usb/umass.c        |  6 ++++--
 sys/dev/usb/umass_isdata.c |  6 ++++--
 sys/dev/usb/umass_quirks.c |  6 ++++--
 sys/dev/usb/umass_scsipi.c |  6 ++++--
 sys/dev/usb/usb.h          |  3 +--
 6 files changed, 19 insertions(+), 11 deletions(-)

diffs (114 lines):

diff -r eaa8d5c5d981 -r 4bc1cd6d6074 sys/dev/usb/files.usb
--- a/sys/dev/usb/files.usb     Tue Aug 23 16:16:26 2011 +0000
+++ b/sys/dev/usb/files.usb     Tue Aug 23 16:16:43 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.usb,v 1.113 2011/07/30 12:19:12 jmcneill Exp $
+#      $NetBSD: files.usb,v 1.114 2011/08/23 16:16:43 christos Exp $
 #
 # Config file and device description for machine-independent USB code.
 # Included by ports that need it.  Ports that use it must provide
@@ -9,6 +9,7 @@
 defflag        opt_usb.h       EHCI_DEBUG OHCI_DEBUG UHCI_DEBUG UHUB_DEBUG USB_DEBUG
 
 defflag        opt_uvideo.h    UVIDEO_DEBUG
+defflag        opt_umass.h     UMASS_DEBUG
 
 define usbroothubif { }
 define usbdevif { [port = -1], [configuration = -1], [interface = -1],
diff -r eaa8d5c5d981 -r 4bc1cd6d6074 sys/dev/usb/umass.c
--- a/sys/dev/usb/umass.c       Tue Aug 23 16:16:26 2011 +0000
+++ b/sys/dev/usb/umass.c       Tue Aug 23 16:16:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umass.c,v 1.139 2011/07/31 16:32:02 jakllsch Exp $     */
+/*     $NetBSD: umass.c,v 1.140 2011/08/23 16:16:43 christos Exp $     */
 
 /*
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.139 2011/07/31 16:32:02 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.140 2011/08/23 16:16:43 christos Exp $");
+
+#include "opt_umass.h"
 
 #include "atapibus.h"
 #include "scsibus.h"
diff -r eaa8d5c5d981 -r 4bc1cd6d6074 sys/dev/usb/umass_isdata.c
--- a/sys/dev/usb/umass_isdata.c        Tue Aug 23 16:16:26 2011 +0000
+++ b/sys/dev/usb/umass_isdata.c        Tue Aug 23 16:16:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umass_isdata.c,v 1.19 2010/11/03 22:34:24 dyoung Exp $ */
+/*     $NetBSD: umass_isdata.c,v 1.20 2011/08/23 16:16:43 christos Exp $       */
 
 /*
  * TODO:
@@ -37,7 +37,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.19 2010/11/03 22:34:24 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.20 2011/08/23 16:16:43 christos Exp $");
+
+#include "opt_umass.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r eaa8d5c5d981 -r 4bc1cd6d6074 sys/dev/usb/umass_quirks.c
--- a/sys/dev/usb/umass_quirks.c        Tue Aug 23 16:16:26 2011 +0000
+++ b/sys/dev/usb/umass_quirks.c        Tue Aug 23 16:16:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umass_quirks.c,v 1.85 2011/07/31 16:32:02 jakllsch Exp $       */
+/*     $NetBSD: umass_quirks.c,v 1.86 2011/08/23 16:16:43 christos Exp $       */
 
 /*
  * Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -32,7 +32,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_quirks.c,v 1.85 2011/07/31 16:32:02 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_quirks.c,v 1.86 2011/08/23 16:16:43 christos Exp $");
+
+#include "opt_umass.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r eaa8d5c5d981 -r 4bc1cd6d6074 sys/dev/usb/umass_scsipi.c
--- a/sys/dev/usb/umass_scsipi.c        Tue Aug 23 16:16:26 2011 +0000
+++ b/sys/dev/usb/umass_scsipi.c        Tue Aug 23 16:16:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umass_scsipi.c,v 1.36 2010/11/03 22:34:24 dyoung Exp $ */
+/*     $NetBSD: umass_scsipi.c,v 1.37 2011/08/23 16:16:43 christos Exp $       */
 
 /*
  * Copyright (c) 2001, 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.36 2010/11/03 22:34:24 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.37 2011/08/23 16:16:43 christos Exp $");
+
+#include "opt_umass.h"
 
 #include "atapibus.h"
 #include "scsibus.h"
diff -r eaa8d5c5d981 -r 4bc1cd6d6074 sys/dev/usb/usb.h
--- a/sys/dev/usb/usb.h Tue Aug 23 16:16:26 2011 +0000
+++ b/sys/dev/usb/usb.h Tue Aug 23 16:16:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usb.h,v 1.92 2011/07/20 16:53:27 jakllsch Exp $        */
+/*     $NetBSD: usb.h,v 1.93 2011/08/23 16:16:43 christos Exp $        */
 /*     $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $        */
 
 /*
@@ -71,7 +71,6 @@
 #define CUE_DEBUG 1
 #define KUE_DEBUG 1
 #define URL_DEBUG 1
-#define UMASS_DEBUG 1
 #define UVISOR_DEBUG 1
 #define UPL_DEBUG 1
 #define UZCOM_DEBUG 1