Module Name: src
Committed By: christos
Date: Tue Aug 23 16:16:43 UTC 2011
Modified Files:
src/sys/dev/usb: files.usb umass.c umass_isdata.c umass_quirks.c
umass_scsipi.c usb.h
Log Message:
defopt UMASS_DEBUG
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/dev/usb/files.usb
cvs rdiff -u -r1.139 -r1.140 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/umass_isdata.c
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/usb/umass_quirks.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/usb/umass_scsipi.c
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/usb/usb.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/files.usb
diff -u src/sys/dev/usb/files.usb:1.113 src/sys/dev/usb/files.usb:1.114
--- src/sys/dev/usb/files.usb:1.113 Sat Jul 30 08:19:12 2011
+++ src/sys/dev/usb/files.usb Tue Aug 23 12:16:43 2011
@@ -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],
Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.139 src/sys/dev/usb/umass.c:1.140
--- src/sys/dev/usb/umass.c:1.139 Sun Jul 31 12:32:02 2011
+++ src/sys/dev/usb/umass.c Tue Aug 23 12:16:43 2011
@@ -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"
Index: src/sys/dev/usb/umass_isdata.c
diff -u src/sys/dev/usb/umass_isdata.c:1.19 src/sys/dev/usb/umass_isdata.c:1.20
--- src/sys/dev/usb/umass_isdata.c:1.19 Wed Nov 3 18:34:24 2010
+++ src/sys/dev/usb/umass_isdata.c Tue Aug 23 12:16:43 2011
@@ -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>
Index: src/sys/dev/usb/umass_quirks.c
diff -u src/sys/dev/usb/umass_quirks.c:1.85 src/sys/dev/usb/umass_quirks.c:1.86
--- src/sys/dev/usb/umass_quirks.c:1.85 Sun Jul 31 12:32:02 2011
+++ src/sys/dev/usb/umass_quirks.c Tue Aug 23 12:16:43 2011
@@ -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>
Index: src/sys/dev/usb/umass_scsipi.c
diff -u src/sys/dev/usb/umass_scsipi.c:1.36 src/sys/dev/usb/umass_scsipi.c:1.37
--- src/sys/dev/usb/umass_scsipi.c:1.36 Wed Nov 3 18:34:24 2010
+++ src/sys/dev/usb/umass_scsipi.c Tue Aug 23 12:16:43 2011
@@ -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"
Index: src/sys/dev/usb/usb.h
diff -u src/sys/dev/usb/usb.h:1.92 src/sys/dev/usb/usb.h:1.93
--- src/sys/dev/usb/usb.h:1.92 Wed Jul 20 12:53:27 2011
+++ src/sys/dev/usb/usb.h Tue Aug 23 12:16:43 2011
@@ -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
