Module Name: src
Committed By: jakllsch
Date: Wed Apr 27 19:35:17 UTC 2016
Modified Files:
src/sys/dev/usb: hid.c uhid.c uhidev.c ukbd.c ums.c uts.c
Log Message:
Pull in opt_usb.h in _KERNEL_OPT case for various *_DEBUG options.
Makes various driver-specific debugging options work again.
XXX more to fix in dev/usb
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/usb/hid.c
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.131 -r1.132 src/sys/dev/usb/ukbd.c
cvs rdiff -u -r1.89 -r1.90 src/sys/dev/usb/ums.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/uts.c
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/hid.c
diff -u src/sys/dev/usb/hid.c:1.44 src/sys/dev/usb/hid.c:1.45
--- src/sys/dev/usb/hid.c:1.44 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/hid.c Wed Apr 27 19:35:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: hid.c,v 1.44 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: hid.c,v 1.45 2016/04/27 19:35:17 jakllsch Exp $ */
/* $FreeBSD: src/sys/dev/usb/hid.c,v 1.11 1999/11/17 22:33:39 n_hibma Exp $ */
/*
@@ -32,7 +32,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.44 2016/04/23 10:15:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.45 2016/04/27 19:35:17 jakllsch Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_usb.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.95 src/sys/dev/usb/uhid.c:1.96
--- src/sys/dev/usb/uhid.c:1.95 Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/uhid.c Wed Apr 27 19:35:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.95 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: uhid.c,v 1.96 2016/04/27 19:35:17 jakllsch Exp $ */
/*
* Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,10 +35,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.95 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.96 2016/04/27 19:35:17 jakllsch Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
+#include "opt_usb.h"
#endif
#include <sys/param.h>
Index: src/sys/dev/usb/uhidev.c
diff -u src/sys/dev/usb/uhidev.c:1.65 src/sys/dev/usb/uhidev.c:1.66
--- src/sys/dev/usb/uhidev.c:1.65 Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/uhidev.c Wed Apr 27 19:35:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uhidev.c,v 1.65 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: uhidev.c,v 1.66 2016/04/27 19:35:17 jakllsch Exp $ */
/*
* Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.65 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.66 2016/04/27 19:35:17 jakllsch Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_usb.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/usb/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.131 src/sys/dev/usb/ukbd.c:1.132
--- src/sys/dev/usb/ukbd.c:1.131 Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/ukbd.c Wed Apr 27 19:35:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbd.c,v 1.131 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: ukbd.c,v 1.132 2016/04/27 19:35:17 jakllsch Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,11 +35,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.131 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.132 2016/04/27 19:35:17 jakllsch Exp $");
#ifdef _KERNEL_OPT
#include "opt_ukbd.h"
#include "opt_ukbd_layout.h"
+#include "opt_usb.h"
#include "opt_wsdisplay_compat.h"
#include "opt_ddb.h"
#endif /* _KERNEL_OPT */
Index: src/sys/dev/usb/ums.c
diff -u src/sys/dev/usb/ums.c:1.89 src/sys/dev/usb/ums.c:1.90
--- src/sys/dev/usb/ums.c:1.89 Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/ums.c Wed Apr 27 19:35:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ums.c,v 1.89 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: ums.c,v 1.90 2016/04/27 19:35:17 jakllsch Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.89 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.90 2016/04/27 19:35:17 jakllsch Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_usb.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/usb/uts.c
diff -u src/sys/dev/usb/uts.c:1.4 src/sys/dev/usb/uts.c:1.5
--- src/sys/dev/usb/uts.c:1.4 Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/uts.c Wed Apr 27 19:35:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uts.c,v 1.4 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: uts.c,v 1.5 2016/04/27 19:35:17 jakllsch Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.4 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.5 2016/04/27 19:35:17 jakllsch Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_usb.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
