PERFORCE change 159553 for review
Andrew Thompson
thompsa at FreeBSD.org
Fri Mar 20 16:44:33 PDT 2009
http://perforce.freebsd.org/chv.cgi?CH=159553
Change 159553 by thompsa at thompsa_burger on 2009/03/20 23:44:19
IFC @159552
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#8 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/at91dci_atmelarm.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci_atmelarm.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci_atmelarm.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/input/ums.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb/storage/urio.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/template/usb_template.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_bus.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_busdma.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#32 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#12 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_controller.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_core.h#8 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_debug.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_debug.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_defs.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#13 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_dev.h#9 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_device.c#12 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_device.h#10 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_dynamic.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_endian.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#28 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#16 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#5 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_lookup.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_lookup.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_mbuf.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_mbuf.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_process.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_process.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_request.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_request.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_sw_transfer.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#135 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_util.c#5 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_util.h#4 integrate
.. //depot/projects/usb/src/sys/nfs4client/nfs4_vnops.c#9 integrate
.. //depot/projects/usb/src/sys/nfsclient/nfs.h#7 integrate
.. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#19 integrate
.. //depot/projects/usb/src/sys/nfsclient/nfsnode.h#7 integrate
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#8 (text+ko) ====
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/controller/at91dci.c,v 1.2 2009/02/24 03:39:13 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/controller/at91dci.c,v 1.6 2009/03/20 21:57:54 thompsa Exp $");
/*-
* Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved.
==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci_atmelarm.c#4 (text+ko) ====
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/controller/at91dci_atmelarm.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/controller/at91dci_atmelarm.c,v 1.3 2009/03/20 21:57:54 thompsa Exp $");
/*-
* Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved.
==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#11 (text+ko) ====
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/controller/atmegadci.c,v 1.3 2009/03/11 04:58:21 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/controller/atmegadci.c,v 1.7 2009/03/20 21:57:54 thompsa Exp $");
/*-
* Copyright (c) 2009 Hans Petter Selasky. All rights reserved.
==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#6 (text+ko) ====
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/controller/atmegadci_atmelarm.c,v 1.2 2009/03/11 04:58:21 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/controller/atmegadci_atmelarm.c,v 1.4 2009/03/20 21:57:54 thompsa Exp $");
/*-
* Copyright (c) 2009 Hans Petter Selasky. All rights reserved.
==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#11 (text+ko) ====
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci.c,v 1.5 2009/03/07 19:49:47 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci.c,v 1.8 2009/03/20 21:57:54 thompsa Exp $");
#include <dev/usb/usb.h>
#include <dev/usb/usb_mfunc.h>
==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/controller/ehci.h,v 1.2 2009/03/07 19:49:47 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/controller/ehci.h,v 1.3 2009/03/20 19:04:31 thompsa Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#5 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci_ixp4xx.c,v 1.2 2009/03/07 19:49:47 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci_ixp4xx.c,v 1.4 2009/03/20 21:57:54 thompsa Exp $");
#include "opt_bus.h"
==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#4 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci_mbus.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci_mbus.c,v 1.3 2009/03/20 21:57:54 thompsa Exp $");
#include "opt_bus.h"
==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#5 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci_pci.c,v 1.2 2009/03/09 13:23:54 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci_pci.c,v 1.4 2009/03/20 21:57:54 thompsa Exp $");
/*
* USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller.
==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#6 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/controller/musb_otg.c,v 1.2 2009/02/24 03:39:13 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/controller/musb_otg.c,v 1.5 2009/03/20 21:57:54 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#6 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/controller/musb_otg_atmelarm.c,v 1.2 2009/03/09 20:05:46 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/controller/musb_otg_atmelarm.c,v 1.4 2009/03/20 21:57:54 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#9 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ohci.c,v 1.2 2009/02/24 03:39:13 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ohci.c,v 1.5 2009/03/20 21:57:54 thompsa Exp $");
/*
* USB Open Host Controller driver.
==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/controller/ohci.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/controller/ohci.h,v 1.2 2009/03/20 19:04:31 thompsa Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
==== //depot/projects/usb/src/sys/dev/usb/controller/ohci_atmelarm.c#4 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ohci_atmelarm.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ohci_atmelarm.c,v 1.3 2009/03/20 21:57:54 thompsa Exp $");
#include <dev/usb/usb_mfunc.h>
#include <dev/usb/usb.h>
==== //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#5 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ohci_pci.c,v 1.2 2009/03/09 13:23:54 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ohci_pci.c,v 1.4 2009/03/20 21:57:54 thompsa Exp $");
/*
* USB Open Host Controller driver.
==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#7 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/controller/uhci.c,v 1.2 2009/02/24 03:39:13 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/controller/uhci.c,v 1.5 2009/03/20 21:57:54 thompsa Exp $");
/*
* USB Universal Host Controller driver.
==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/controller/uhci.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/controller/uhci.h,v 1.2 2009/03/20 19:04:31 thompsa Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
==== //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#5 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/controller/uhci_pci.c,v 1.2 2009/03/09 13:23:54 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/controller/uhci_pci.c,v 1.4 2009/03/20 21:57:54 thompsa Exp $");
/* Universal Host Controller Interface
*
==== //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#6 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/controller/usb_controller.c,v 1.2 2009/03/11 04:56:30 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/controller/usb_controller.c,v 1.4 2009/03/20 21:48:11 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#7 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/controller/uss820dci.c,v 1.3 2009/02/24 17:15:29 ed Exp $ */
+/* $FreeBSD: src/sys/dev/usb/controller/uss820dci.c,v 1.7 2009/03/20 21:57:54 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky <hselasky at FreeBSD.org>
* All rights reserved.
==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci_atmelarm.c#4 (text+ko) ====
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/controller/uss820dci_atmelarm.c,v 1.2 2009/02/24 17:15:29 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/controller/uss820dci_atmelarm.c,v 1.4 2009/03/20 21:57:54 thompsa Exp $");
/*-
* Copyright (c) 2008 Hans Petter Selasky <hselasky at FreeBSD.org>
==== //depot/projects/usb/src/sys/dev/usb/input/uhid.c#5 (text+ko) ====
@@ -5,7 +5,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/input/uhid.c,v 1.3 2009/03/02 05:37:05 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/input/uhid.c,v 1.4 2009/03/20 18:56:27 thompsa Exp $");
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
==== //depot/projects/usb/src/sys/dev/usb/input/ums.c#7 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/input/ums.c,v 1.5 2009/03/09 15:25:46 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/input/ums.c,v 1.6 2009/03/20 18:56:27 thompsa Exp $");
/*
* HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
==== //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#4 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/misc/udbp.c,v 1.2 2009/03/02 05:37:05 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/misc/udbp.c,v 1.3 2009/03/20 22:10:36 thompsa Exp $");
/* Driver for arbitrary double bulk pipe devices.
* The driver assumes that there will be the same driver on the other side.
==== //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#5 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/net/if_cdce.c,v 1.3 2009/03/08 06:56:13 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/net/if_cdce.c,v 1.4 2009/03/20 19:04:31 thompsa Exp $");
#include "usbdevs.h"
#include <dev/usb/usb.h>
==== //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#6 (text+ko) ====
@@ -16,7 +16,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $FreeBSD: src/sys/dev/usb/serial/u3g.c,v 1.5 2009/03/08 22:55:17 thompsa Exp $
+ * $FreeBSD: src/sys/dev/usb/serial/u3g.c,v 1.6 2009/03/20 19:04:31 thompsa Exp $
*/
/*
==== //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#5 (text+ko) ====
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/serial/ubser.c,v 1.4 2009/03/02 05:37:05 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/serial/ubser.c,v 1.6 2009/03/20 19:04:31 thompsa Exp $");
/*
* BWCT serial adapter driver
==== //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#5 (text+ko) ====
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/serial/ucycom.c,v 1.3 2009/03/02 05:37:05 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/serial/ucycom.c,v 1.5 2009/03/20 22:10:36 thompsa Exp $");
/*-
* Copyright (c) 2004 Dag-Erling Coïdan Smørgrav
==== //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#4 (text+ko) ====
@@ -1,7 +1,7 @@
/* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/serial/ufoma.c,v 1.4 2009/03/02 05:37:05 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/serial/ufoma.c,v 1.5 2009/03/20 22:10:36 thompsa Exp $");
#define UFOMA_HANDSFREE
/*-
* Copyright (c) 2005, Takanori Watanabe
==== //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/serial/ugensa.c,v 1.3 2009/03/02 05:37:05 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/serial/ugensa.c,v 1.4 2009/03/20 19:04:31 thompsa Exp $ */
/* $NetBSD: ugensa.c,v 1.9.2.1 2007/03/24 14:55:50 yamt Exp $ */
/*
==== //depot/projects/usb/src/sys/dev/usb/serial/umct.c#4 (text+ko) ====
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/serial/umct.c,v 1.4 2009/03/02 05:37:05 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/serial/umct.c,v 1.5 2009/03/20 19:04:31 thompsa Exp $");
/*-
* Copyright (c) 2003 Scott Long
==== //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#7 (text+ko) ====
@@ -1,7 +1,7 @@
/* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/serial/umodem.c,v 1.5 2009/03/05 16:15:07 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/serial/umodem.c,v 1.7 2009/03/20 19:04:31 thompsa Exp $");
/*-
* Copyright (c) 2003, M. Warner Losh <imp at FreeBSD.org>.
==== //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#4 (text+ko) ====
@@ -1,7 +1,7 @@
/* $NetBSD: uplcom.c,v 1.21 2001/11/13 06:24:56 lukem Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/serial/uplcom.c,v 1.4 2009/03/04 03:47:57 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/serial/uplcom.c,v 1.5 2009/03/20 18:56:27 thompsa Exp $");
/*-
* Copyright (c) 2001-2003, 2005 Shunsuke Akiyama <akiyama at jp.FreeBSD.org>.
==== //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#4 (text+ko) ====
@@ -1,5 +1,5 @@
/* $NetBSD: uvisor.c,v 1.9 2001/01/23 14:04:14 augustss Exp $ */
-/* $FreeBSD: src/sys/dev/usb/serial/uvisor.c,v 1.3 2009/03/02 05:37:05 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/serial/uvisor.c,v 1.4 2009/03/20 18:56:27 thompsa Exp $ */
/* Also already merged from NetBSD:
* $NetBSD: uvisor.c,v 1.12 2001/11/13 06:24:57 lukem Exp $
==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#9 (text+ko) ====
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.4 2009/03/17 01:42:46 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.7 2009/03/20 22:17:27 thompsa Exp $");
/*-
* Copyright (c) 1999 MAEKAWA Masahide <bishop at rr.iij4u.or.jp>,
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.4 2009/03/17 01:42:46 thompsa Exp $
+ * $FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.7 2009/03/20 22:17:27 thompsa Exp $
* $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $
*/
==== //depot/projects/usb/src/sys/dev/usb/storage/urio.c#5 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/storage/urio.c,v 1.3 2009/03/02 05:37:05 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/storage/urio.c,v 1.4 2009/03/20 22:10:36 thompsa Exp $");
/*
==== //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#6 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/storage/ustorage_fs.c,v 1.2 2009/03/02 05:37:05 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/storage/ustorage_fs.c,v 1.5 2009/03/20 21:50:54 thompsa Exp $ */
/*-
* Copyright (C) 2003-2005 Alan Stern
* Copyright (C) 2008 Hans Petter Selasky
==== //depot/projects/usb/src/sys/dev/usb/template/usb_template.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/template/usb_template.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/template/usb_template.c,v 1.2 2009/03/20 19:04:31 thompsa Exp $ */
/*-
* Copyright (c) 2007 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_bus.h#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_bus.h,v 1.2 2009/02/27 17:27:16 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_bus.h,v 1.4 2009/03/20 23:12:14 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_busdma.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_busdma.c,v 1.4 2009/03/20 21:50:54 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_busdma.h#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_busdma.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_busdma.h,v 1.4 2009/03/20 23:12:14 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#32 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_compat_linux.c,v 1.2 2009/03/02 05:37:05 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_compat_linux.c,v 1.4 2009/03/20 21:50:54 thompsa Exp $ */
/*-
* Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa. All rights reserved.
* Copyright (c) 2007 Hans Petter Selasky. All rights reserved.
==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#12 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_compat_linux.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_compat_linux.h,v 1.2 2009/03/20 21:50:54 thompsa Exp $ */
/*-
* Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa. All rights reserved.
* Copyright (c) 2007 Hans Petter Selasky. All rights reserved.
==== //depot/projects/usb/src/sys/dev/usb/usb_controller.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_controller.h,v 1.2 2009/02/24 03:39:13 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_controller.h,v 1.3 2009/03/20 21:50:54 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_core.h#8 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_core.h,v 1.4 2009/03/09 20:08:08 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_core.h,v 1.8 2009/03/20 22:04:33 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_debug.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_debug.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_debug.c,v 1.2 2009/03/20 19:04:31 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_debug.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_debug.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_debug.h,v 1.2 2009/03/20 21:48:11 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_defs.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_defs.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_defs.h,v 1.2 2009/03/20 19:04:31 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#13 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_dev.c,v 1.9 2009/03/17 01:46:40 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_dev.c,v 1.12 2009/03/20 23:12:14 thompsa Exp $ */
/*-
* Copyright (c) 2006-2008 Hans Petter Selasky. All rights reserved.
*
@@ -54,6 +54,8 @@
#include <machine/stdarg.h>
+#if USB_HAVE_UGEN
+
#if USB_DEBUG
static int usb2_fifo_debug = 0;
@@ -2195,3 +2197,4 @@
/* send a Zero Length Packet, ZLP, before close */
f->flag_short = onoff;
}
+#endif /* USB_HAVE_UGEN */
==== //depot/projects/usb/src/sys/dev/usb/usb_dev.h#9 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_dev.h,v 1.4 2009/03/17 01:46:40 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_dev.h,v 1.5 2009/03/20 21:50:54 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#12 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_device.c,v 1.7 2009/03/09 20:08:08 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_device.c,v 1.11 2009/03/20 23:12:14 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
@@ -75,9 +75,8 @@
#endif
static usb2_error_t usb2_fill_iface_data(struct usb2_device *, uint8_t,
uint8_t);
+#if USB_HAVE_UGEN
static void usb2_notify_addq(const char *type, struct usb2_device *);
-
-#if USB_HAVE_UGEN
static void usb2_fifo_free_wrap(struct usb2_device *, uint8_t, uint8_t);
static struct cdev *usb2_make_dev(struct usb2_device *, int, int);
static void usb2_cdev_create(struct usb2_device *);
@@ -1446,13 +1445,11 @@
/* set device index */
udev->device_index = device_index;
-#if USB_HAVE_STRINGS
+#if USB_HAVE_UGEN
/* Create ugen name */
snprintf(udev->ugen_name, sizeof(udev->ugen_name),
USB_GENERIC_NAME "%u.%u", device_get_unit(bus->bdev),
device_index);
-#endif
-#if USB_HAVE_UGEN
LIST_INIT(&udev->pd_list);
/* Create the control endpoint device */
@@ -1716,13 +1713,14 @@
#if USB_HAVE_UGEN
/* Symlink the ugen device name */
udev->ugen_symlink = usb2_alloc_symlink(udev->ugen_name);
-#endif
+
+ /* Announce device */
#if USB_HAVE_STRINGS
- /* Announce device */
printf("%s: <%s> at %s\n", udev->ugen_name, udev->manufacturer,
device_get_nameunit(udev->bus->bdev));
#endif
usb2_notify_addq("+", udev);
+#endif
done:
if (err) {
/* free device */
@@ -1852,12 +1850,14 @@
DPRINTFN(4, "udev=%p port=%d\n", udev, udev->port_no);
+#if USB_HAVE_UGEN
usb2_notify_addq("-", udev);
+#if USB_HAVE_STRINGS
printf("%s: <%s> at %s (disconnected)\n", udev->ugen_name,
udev->manufacturer, device_get_nameunit(bus->bdev));
+#endif
-#if USB_HAVE_UGEN
/* Destroy UGEN symlink, if any */
if (udev->ugen_symlink) {
usb2_free_symlink(udev->ugen_symlink);
@@ -1923,7 +1923,9 @@
usb2_cv_destroy(udev->default_cv + 1);
mtx_destroy(udev->default_mtx);
+#if USB_HAVE_UGEN
KASSERT(LIST_FIRST(&udev->pd_list) == NULL, ("leaked cdev entries"));
+#endif
/* free device */
free(udev, M_USB);
@@ -2026,14 +2028,24 @@
if (udd->bDeviceClass != 0xFF) {
snprintf(dst_ptr, dst_len, "%s %s, class %d/%d, rev %x.%02x/"
- "%x.%02x, addr %d", udev->manufacturer, udev->product,
+ "%x.%02x, addr %d",
+#if USB_HAVE_STRINGS
+ udev->manufacturer, udev->product,
+#else
+ "-", "-",
+#endif
udd->bDeviceClass, udd->bDeviceSubClass,
(bcdUSB >> 8), bcdUSB & 0xFF,
(bcdDevice >> 8), bcdDevice & 0xFF,
udev->address);
} else {
snprintf(dst_ptr, dst_len, "%s %s, rev %x.%02x/"
- "%x.%02x, addr %d", udev->manufacturer, udev->product,
+ "%x.%02x, addr %d",
+#if USB_HAVE_STRINGS
+ udev->manufacturer, udev->product,
+#else
+ "-", "-",
+#endif
(bcdUSB >> 8), bcdUSB & 0xFF,
(bcdDevice >> 8), bcdDevice & 0xFF,
udev->address);
@@ -2230,6 +2242,7 @@
return (udev->device_index);
}
+#if USB_HAVE_UGEN
/*------------------------------------------------------------------------*
* usb2_notify_addq
*
@@ -2238,7 +2251,6 @@
static void
usb2_notify_addq(const char *type, struct usb2_device *udev)
{
-#if USB_HAVE_STRINGS
char *data = NULL;
struct malloc_type *mt;
@@ -2272,36 +2284,19 @@
UGETW(udev->ddesc.idProduct),
udev->ddesc.bDeviceClass,
udev->ddesc.bDeviceSubClass,
+#if USB_HAVE_STRINGS
udev->serial,
+#else
+ "",
+#endif
udev->port_no,
- udev->parent_hub->ugen_name);
- } else {
- snprintf(data, 1024,
- "%s"
- "%s "
- "vendor=0x%04x "
- "product=0x%04x "
- "devclass=0x%02x "
- "devsubclass=0x%02x "
- "sernum=\"%s\" "
- "at port=%u "
- "on "
- "%s\n",
- type,
- udev->ugen_name,
- UGETW(udev->ddesc.idVendor),
- UGETW(udev->ddesc.idProduct),
- udev->ddesc.bDeviceClass,
- udev->ddesc.bDeviceSubClass,
- udev->serial,
- udev->port_no,
- device_get_nameunit(device_get_parent(udev->bus->bdev)));
+ udev->parent_hub != NULL ?
+ udev->parent_hub->ugen_name :
+ device_get_nameunit(device_get_parent(udev->bus->bdev)));
}
devctl_queue_data(data);
-#endif
}
-#if USB_HAVE_UGEN
/*------------------------------------------------------------------------*
* usb2_fifo_free_wrap
*
==== //depot/projects/usb/src/sys/dev/usb/usb_device.h#10 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_device.h,v 1.6 2009/03/17 01:46:40 thompsa Exp $ */
+/* $FreeBSD: head/sys/dev/usb/usb_device.h 190191 2009-03-20 23:12:14Z thompsa $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
@@ -125,6 +125,7 @@
struct usb2_fifo *fifo[USB_FIFO_MAX];
struct usb2_symlink *ugen_symlink; /* our generic symlink */
LIST_HEAD(,usb2_fs_privdata) pd_list;
+ char ugen_name[20]; /* name of ugenX.X device */
#endif
usb2_ticks_t plugtime; /* copy of "ticks" */
@@ -155,7 +156,6 @@
struct usb2_device_descriptor ddesc; /* device descriptor */
#if USB_HAVE_STRINGS
- char ugen_name[20]; /* name of ugenX.X device */
char serial[64]; /* serial number */
char manufacturer[64]; /* manufacturer string */
char product[64]; /* product string */
==== //depot/projects/usb/src/sys/dev/usb/usb_dynamic.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_dynamic.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_dynamic.c,v 1.2 2009/03/20 19:04:31 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_endian.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_endian.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_endian.h,v 1.2 2009/03/20 18:59:53 thompsa Exp $ */
/*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_generic.c#9 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_generic.c,v 1.4 2009/02/27 22:12:15 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_generic.c,v 1.8 2009/03/20 23:12:14 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
@@ -47,6 +47,8 @@
#include <dev/usb/usb_controller.h>
#include <dev/usb/usb_bus.h>
+#if USB_HAVE_UGEN
+
/* defines */
#define UGEN_BULK_FS_BUFFER_SIZE (64*32) /* bytes */
@@ -799,12 +801,14 @@
di->udi_bus = device_get_unit(udev->bus->bdev);
di->udi_addr = udev->address;
di->udi_index = udev->device_index;
+#if USB_HAVE_STRINGS
strlcpy(di->udi_serial, udev->serial,
sizeof(di->udi_serial));
strlcpy(di->udi_vendor, udev->manufacturer,
sizeof(di->udi_vendor));
strlcpy(di->udi_product, udev->product,
sizeof(di->udi_product));
+#endif
usb2_printBCD(di->udi_release, sizeof(di->udi_release),
UGETW(udev->ddesc.bcdDevice));
di->udi_vendorNo = UGETW(udev->ddesc.idVendor);
@@ -2183,3 +2187,4 @@
break;
}
}
+#endif /* USB_HAVE_UGEN */
==== //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_handle_request.c,v 1.2 2009/02/24 03:41:52 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_handle_request.c,v 1.4 2009/03/20 22:10:36 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#28 (text+ko) ====
@@ -2,7 +2,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/usb_hid.c,v 1.6 2009/03/13 22:28:37 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb_hid.c,v 1.8 2009/03/20 21:50:54 thompsa Exp $");
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
==== //depot/projects/usb/src/sys/dev/usb/usb_hid.h#16 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_hid.h,v 1.3 2009/03/08 22:58:19 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_hid.h,v 1.4 2009/03/20 21:50:54 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#7 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_hub.c,v 1.4 2009/03/09 20:08:08 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_hub.c,v 1.7 2009/03/20 23:12:14 thompsa Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
* Copyright (c) 1998 Lennart Augustsson. All rights reserved.
@@ -978,7 +978,11 @@
UGETW(res.udev->ddesc.idProduct),
res.udev->ddesc.bDeviceClass,
res.udev->ddesc.bDeviceSubClass,
+#if USB_HAVE_STRINGS
res.udev->serial,
+#else
+ "",
+#endif
iface->idesc->bInterfaceClass,
iface->idesc->bInterfaceSubClass);
} else {
==== //depot/projects/usb/src/sys/dev/usb/usb_hub.h#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_hub.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */
+/* $FreeBSD: head/sys/dev/usb/usb_hub.h 190181 2009-03-20 21:50:54Z thompsa $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
@@ -27,11 +27,6 @@
#ifndef _USB2_HUB_H_
#define _USB2_HUB_H_
-#include <dev/usb/usb_defs.h>
-
-struct usb2_bus;
-struct usb2_device;
-
/*
* The following structure defines an USB port.
*/
==== //depot/projects/usb/src/sys/dev/usb/usb_lookup.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_lookup.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_lookup.c,v 1.2 2009/03/20 21:50:54 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_lookup.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_lookup.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_lookup.h,v 1.2 2009/03/20 21:50:54 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_mbuf.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_mbuf.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_mbuf.c,v 1.2 2009/03/20 21:50:54 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_mbuf.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_mbuf.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_mbuf.h,v 1.2 2009/03/20 21:50:54 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_msctest.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_msctest.c,v 1.4 2009/03/20 22:10:36 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_process.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/usb_process.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usb_process.c,v 1.2 2009/03/20 21:50:54 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/dev/usb/usb_process.h#3 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list