Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys eliminate USBHIST as a define/option. it was entangled ...
details: https://anonhg.NetBSD.org/src/rev/4740148d4206
branches: trunk
changeset: 811404:4740148d4206
user: mrg <mrg%NetBSD.org@localhost>
date: Thu Oct 29 00:15:48 2015 +0000
description:
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.
diffstat:
sys/arch/evbarm/conf/ODROID-U | 4 ++--
sys/arch/evbarm/conf/ODROID-XU | 4 ++--
sys/arch/evbarm/conf/VEXPRESS_A15 | 4 ++--
sys/arch/evbmips/conf/CI20 | 6 +++---
sys/dev/usb/ehci.c | 9 ++-------
sys/dev/usb/files.usb | 5 ++---
sys/dev/usb/usb.c | 6 +++---
sys/dev/usb/usbhist.h | 4 ++--
8 files changed, 18 insertions(+), 24 deletions(-)
diffs (188 lines):
diff -r f024ff6924bd -r 4740148d4206 sys/arch/evbarm/conf/ODROID-U
--- a/sys/arch/evbarm/conf/ODROID-U Wed Oct 28 14:05:04 2015 +0000
+++ b/sys/arch/evbarm/conf/ODROID-U Thu Oct 29 00:15:48 2015 +0000
@@ -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 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
diff -r f024ff6924bd -r 4740148d4206 sys/arch/evbarm/conf/ODROID-XU
--- a/sys/arch/evbarm/conf/ODROID-XU Wed Oct 28 14:05:04 2015 +0000
+++ b/sys/arch/evbarm/conf/ODROID-XU Thu Oct 29 00:15:48 2015 +0000
@@ -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 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
diff -r f024ff6924bd -r 4740148d4206 sys/arch/evbarm/conf/VEXPRESS_A15
--- a/sys/arch/evbarm/conf/VEXPRESS_A15 Wed Oct 28 14:05:04 2015 +0000
+++ b/sys/arch/evbarm/conf/VEXPRESS_A15 Thu Oct 29 00:15:48 2015 +0000
@@ -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 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
diff -r f024ff6924bd -r 4740148d4206 sys/arch/evbmips/conf/CI20
--- a/sys/arch/evbmips/conf/CI20 Wed Oct 28 14:05:04 2015 +0000
+++ b/sys/arch/evbmips/conf/CI20 Thu Oct 29 00:15:48 2015 +0000
@@ -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 @@
#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 @@
#options INGENIC_EHCI_DEBUG
#options EHCI_DEBUG
#options USBVERBOSE
-#options USBHIST
+#options USB_DEBUG
#usb* at ehci?
# onboard ethernet
diff -r f024ff6924bd -r 4740148d4206 sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c Wed Oct 28 14:05:04 2015 +0000
+++ b/sys/dev/usb/ehci.c Thu Oct 29 00:15:48 2015 +0000
@@ -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 @@
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 @@
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);
diff -r f024ff6924bd -r 4740148d4206 sys/dev/usb/files.usb
--- a/sys/dev/usb/files.usb Wed Oct 28 14:05:04 2015 +0000
+++ b/sys/dev/usb/files.usb Thu Oct 29 00:15:48 2015 +0000
@@ -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 @@
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
diff -r f024ff6924bd -r 4740148d4206 sys/dev/usb/usb.c
--- a/sys/dev/usb/usb.c Wed Oct 28 14:05:04 2015 +0000
+++ b/sys/dev/usb/usb.c Thu Oct 29 00:15:48 2015 +0000
@@ -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 @@
#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
diff -r f024ff6924bd -r 4740148d4206 sys/dev/usb/usbhist.h
--- a/sys/dev/usb/usbhist.h Wed Oct 28 14:05:04 2015 +0000
+++ b/sys/dev/usb/usbhist.h Thu Oct 29 00:15:48 2015 +0000
@@ -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;
Home |
Main Index |
Thread Index |
Old Index