From f2b12529c8dbbe01b3035c78193fcc4b4dd5293b Mon Sep 17 00:00:00 2001 From: Markus Pfeiffer Date: Thu, 8 Jan 2015 22:09:17 +0000 Subject: [PATCH] usb4bsd: Sync with FreeBSD r276791 * Update some files' SVN ids --- sys/bus/u4b/usb.h | 3 ++- sys/bus/u4b/usb_bus.h | 7 ++++++- sys/bus/u4b/usb_controller.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/bus/u4b/usb.h b/sys/bus/u4b/usb.h index 5351084d7f..41f6ca2910 100644 --- a/sys/bus/u4b/usb.h +++ b/sys/bus/u4b/usb.h @@ -1,4 +1,4 @@ -/* $FreeBSD$ */ +/* $FreeBSD: head/sys/dev/usb/usb.h 273456 2014-10-22 07:50:19Z hselasky $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. @@ -51,6 +51,7 @@ SYSCTL_DECL(_hw_usb); MALLOC_DECLARE(M_USB); MALLOC_DECLARE(M_USBDEV); +MALLOC_DECLARE(M_USBHC); #endif /* _KERNEL */ #include diff --git a/sys/bus/u4b/usb_bus.h b/sys/bus/u4b/usb_bus.h index 2edb0375e5..eaf16fc79d 100644 --- a/sys/bus/u4b/usb_bus.h +++ b/sys/bus/u4b/usb_bus.h @@ -1,4 +1,4 @@ -/* $FreeBSD$ */ +/* $FreeBSD: head/sys/dev/usb/usb_bus.h 276717 2015-01-05 20:22:18Z hselasky $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -87,6 +87,11 @@ struct usb_bus { * This mutex protects the USB hardware: */ struct lock bus_lock; + /* + * mpf: this is only used in ARM embedded USB controllers + * up to this point. Why is it not a spinlock? + struct lock bus_spin_lock; + */ struct usb_xfer_queue intr_q; struct usb_callout power_wdog; /* power management */ diff --git a/sys/bus/u4b/usb_controller.h b/sys/bus/u4b/usb_controller.h index e2bbf937f0..83ab37b196 100644 --- a/sys/bus/u4b/usb_controller.h +++ b/sys/bus/u4b/usb_controller.h @@ -1,4 +1,4 @@ -/* $FreeBSD$ */ +/* $FreeBSD: head/sys/dev/usb/usb_controller.h 259023 2013-12-06 08:42:41Z hselasky $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * -- 2.41.0