Module Name: src
Committed By: riastradh
Date: Sat Jun 12 12:13:23 UTC 2021
Modified Files:
src/sys/dev/usb: uhub.c usb_subr.c
Log Message:
usb(4), uhub(4): Sprinkle usbhist.
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/sys/dev/usb/uhub.c
cvs rdiff -u -r1.253 -r1.254 src/sys/dev/usb/usb_subr.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/uhub.c
diff -u src/sys/dev/usb/uhub.c:1.149 src/sys/dev/usb/uhub.c:1.150
--- src/sys/dev/usb/uhub.c:1.149 Sat Jun 12 12:13:10 2021
+++ src/sys/dev/usb/uhub.c Sat Jun 12 12:13:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uhub.c,v 1.149 2021/06/12 12:13:10 riastradh Exp $ */
+/* $NetBSD: uhub.c,v 1.150 2021/06/12 12:13:23 riastradh Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */
/* $OpenBSD: uhub.c,v 1.86 2015/06/29 18:27:40 mpi Exp $ */
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.149 2021/06/12 12:13:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.150 2021/06/12 12:13:23 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -932,6 +932,9 @@ uhub_rescan(device_t self, const char *i
struct usbd_device *dev;
int port;
+ UHUBHIST_FUNC();
+ UHUBHIST_CALLARGS("uhub%jd", device_unit(sc->sc_dev), 0, 0, 0);
+
KASSERT(KERNEL_LOCKED_P());
if (uhub_explore_enter(sc) != 0)
Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.253 src/sys/dev/usb/usb_subr.c:1.254
--- src/sys/dev/usb/usb_subr.c:1.253 Sat Jun 12 12:13:10 2021
+++ src/sys/dev/usb/usb_subr.c Sat Jun 12 12:13:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.253 2021/06/12 12:13:10 riastradh Exp $ */
+/* $NetBSD: usb_subr.c,v 1.254 2021/06/12 12:13:23 riastradh Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.253 2021/06/12 12:13:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.254 2021/06/12 12:13:23 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1116,6 +1116,10 @@ usbd_reattach_device(device_t parent, st
{
int i, loc;
+ USBHIST_FUNC();
+ USBHIST_CALLARGS(usbdebug, "uhub%jd port=%jd",
+ device_unit(parent), port, 0, 0);
+
KASSERT(KERNEL_LOCKED_P());
if (locators != NULL) {
