Module Name: src
Committed By: mrg
Date: Thu Oct 29 00:15:48 UTC 2015
Modified Files:
src/sys/arch/evbarm/conf: ODROID-U ODROID-XU VEXPRESS_A15
src/sys/arch/evbmips/conf: CI20
src/sys/dev/usb: ehci.c files.usb usb.c usbhist.h
Log Message:
eliminate USBHIST as a define/option. it was entangled with USB_DEBUG
and only referenced a handful of times. rename any usage in configs.
fixes recent build problems i introduced with the previous files.usb
change.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/ODROID-U
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/ODROID-XU
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/VEXPRESS_A15
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbmips/conf/CI20
cvs rdiff -u -r1.245 -r1.246 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.136 -r1.137 src/sys/dev/usb/files.usb
cvs rdiff -u -r1.159 -r1.160 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/usbhist.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/arch/evbarm/conf/ODROID-U
diff -u src/sys/arch/evbarm/conf/ODROID-U:1.18 src/sys/arch/evbarm/conf/ODROID-U:1.19
--- src/sys/arch/evbarm/conf/ODROID-U:1.18 Fri Aug 7 13:53:28 2015
+++ src/sys/arch/evbarm/conf/ODROID-U Thu Oct 29 00:15:48 2015
@@ -1,5 +1,5 @@
#
-# $NetBSD: ODROID-U,v 1.18 2015/08/07 13:53:28 maxv Exp $
+# $NetBSD: ODROID-U,v 1.19 2015/10/29 00:15:48 mrg Exp $
#
# ODROID-U -- ODROID-U{2,3} series Exynos4x12(P) based kernel
#
@@ -29,7 +29,7 @@ options EXYNOS_CONSOLE_EARLY
#options UVMHIST
#options UVMHIST_PRINT,KERNHIST_DELAY=0
#options KERNHIST
-#options USBHIST
+#options USB_DEBUG
#options USBHIST_SIZE=100000
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
options PMAP_NEED_ALLOC_POOLPAGE
Index: src/sys/arch/evbarm/conf/ODROID-XU
diff -u src/sys/arch/evbarm/conf/ODROID-XU:1.5 src/sys/arch/evbarm/conf/ODROID-XU:1.6
--- src/sys/arch/evbarm/conf/ODROID-XU:1.5 Fri Aug 7 13:53:28 2015
+++ src/sys/arch/evbarm/conf/ODROID-XU Thu Oct 29 00:15:48 2015
@@ -1,5 +1,5 @@
#
-# $NetBSD: ODROID-XU,v 1.5 2015/08/07 13:53:28 maxv Exp $
+# $NetBSD: ODROID-XU,v 1.6 2015/10/29 00:15:48 mrg Exp $
#
# ODROID-XU -- ODROID-XU Exynos5410 based kernel
#
@@ -26,7 +26,7 @@ options PMAPCOUNTERS
options BUSDMA_COUNTERS
options EXYNOS_CONSOLE_EARLY
#options UVMHIST
-options USBHIST
+options USB_DEBUG
options USBHIST_SIZE=100000
#options UVMHIST_PRINT,KERNHIST_DELAY=0
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
Index: src/sys/arch/evbarm/conf/VEXPRESS_A15
diff -u src/sys/arch/evbarm/conf/VEXPRESS_A15:1.3 src/sys/arch/evbarm/conf/VEXPRESS_A15:1.4
--- src/sys/arch/evbarm/conf/VEXPRESS_A15:1.3 Fri Aug 7 13:53:28 2015
+++ src/sys/arch/evbarm/conf/VEXPRESS_A15 Thu Oct 29 00:15:48 2015
@@ -1,5 +1,5 @@
#
-# $NetBSD: VEXPRESS_A15,v 1.3 2015/08/07 13:53:28 maxv Exp $
+# $NetBSD: VEXPRESS_A15,v 1.4 2015/10/29 00:15:48 mrg Exp $
#
# VEXPRESS_A15 -- Versatile Express A15 kernel
#
@@ -25,7 +25,7 @@ options PMAPCOUNTERS
options BUSDMA_COUNTERS
#options EXYNOS_CONSOLE_EARLY
#options UVMHIST
-#options USBHIST
+#options USB_DEBUG
#options USBHIST_SIZE=100000
#options UVMHIST_PRINT,KERNHIST_DELAY=0
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
Index: src/sys/arch/evbmips/conf/CI20
diff -u src/sys/arch/evbmips/conf/CI20:1.17 src/sys/arch/evbmips/conf/CI20:1.18
--- src/sys/arch/evbmips/conf/CI20:1.17 Thu Oct 8 17:58:51 2015
+++ src/sys/arch/evbmips/conf/CI20 Thu Oct 29 00:15:48 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CI20,v 1.17 2015/10/08 17:58:51 macallan Exp $
+# $NetBSD: CI20,v 1.18 2015/10/29 00:15:48 mrg Exp $
#
# MIPS Creator CI20
#
@@ -7,7 +7,7 @@ include "arch/evbmips/conf/std.ingenic"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "CI20-$Revision: 1.17 $"
+#ident "CI20-$Revision: 1.18 $"
maxusers 32
@@ -161,7 +161,7 @@ usb* at ohci?
#options INGENIC_EHCI_DEBUG
#options EHCI_DEBUG
#options USBVERBOSE
-#options USBHIST
+#options USB_DEBUG
#usb* at ehci?
# onboard ethernet
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.245 src/sys/dev/usb/ehci.c:1.246
--- src/sys/dev/usb/ehci.c:1.245 Fri Sep 11 06:51:43 2015
+++ src/sys/dev/usb/ehci.c Thu Oct 29 00:15:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.245 2015/09/11 06:51:43 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.246 2015/10/29 00:15:48 mrg Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.245 2015/09/11 06:51:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.246 2015/10/29 00:15:48 mrg Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -1610,10 +1610,7 @@ Static void
ehci_dump_qtd(ehci_qtd_t *qtd)
{
USBHIST_FUNC(); USBHIST_CALLED(ehcidebug);
-
-#ifdef USBHIST
uint32_t s = le32toh(qtd->qtd_status);
-#endif
USBHIST_LOGN(ehcidebug, 10,
" next = 0x%08x altnext = 0x%08x status = 0x%08x",
@@ -1650,10 +1647,8 @@ ehci_dump_qtd(ehci_qtd_t *qtd)
Static void
ehci_dump_sqh(ehci_soft_qh_t *sqh)
{
-#ifdef USBHIST
ehci_qh_t *qh = &sqh->qh;
ehci_link_t link;
-#endif
u_int32_t endp, endphub;
USBHIST_FUNC(); USBHIST_CALLED(ehcidebug);
Index: src/sys/dev/usb/files.usb
diff -u src/sys/dev/usb/files.usb:1.136 src/sys/dev/usb/files.usb:1.137
--- src/sys/dev/usb/files.usb:1.136 Tue Oct 27 22:25:23 2015
+++ src/sys/dev/usb/files.usb Thu Oct 29 00:15:48 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.usb,v 1.136 2015/10/27 22:25:23 mrg Exp $
+# $NetBSD: files.usb,v 1.137 2015/10/29 00:15:48 mrg Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
@@ -9,8 +9,7 @@ defparam opt_usb.h USBHIST_SIZE
defflag opt_usb.h USB_FRAG_DMA_WORKAROUND
# top level usb debug defines
-defflag opt_usb.h USB_DEBUG
-defflag opt_usb.h USBHIST: KERNHIST, USB_DEBUG
+defflag opt_usb.h USB_DEBUG: KERNHIST
# HC controllers
defflag opt_usb.h EHCI_DEBUG: USB_DEBUG
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.159 src/sys/dev/usb/usb.c:1.160
--- src/sys/dev/usb/usb.c:1.159 Sat May 30 06:41:08 2015
+++ src/sys/dev/usb/usb.c Thu Oct 29 00:15:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.159 2015/05/30 06:41:08 skrll Exp $ */
+/* $NetBSD: usb.c,v 1.160 2015/10/29 00:15:48 mrg Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.159 2015/05/30 06:41:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.160 2015/10/29 00:15:48 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.15
#include <dev/usb/usb_quirks.h>
#include <dev/usb/usbhist.h>
-#if defined(USBHIST)
+#if defined(USB_DEBUG)
#ifndef USBHIST_SIZE
#define USBHIST_SIZE 50000
Index: src/sys/dev/usb/usbhist.h
diff -u src/sys/dev/usb/usbhist.h:1.2 src/sys/dev/usb/usbhist.h:1.3
--- src/sys/dev/usb/usbhist.h:1.2 Sat May 30 06:41:08 2015
+++ src/sys/dev/usb/usbhist.h Thu Oct 29 00:15:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usbhist.h,v 1.2 2015/05/30 06:41:08 skrll Exp $ */
+/* $NetBSD: usbhist.h,v 1.3 2015/10/29 00:15:48 mrg Exp $ */
/*
* Copyright (c) 2012 Matthew R. Green
@@ -44,7 +44,7 @@
#include <sys/kernhist.h>
-#ifdef USBHIST
+#ifdef USB_DEBUG
extern int usbdebug;
