Module Name: src
Committed By: mrg
Date: Sun Mar 11 01:06:07 UTC 2012
Modified Files:
src/sys/dev/usb: emdtv.c emdtv_dtv.c ezload.c if_aue.c if_axe.c
if_cue.c if_kue.c if_otus.c if_udav.c if_upgt.c if_url.c udsbr.c
ukbd.c ulpt.c umass_scsipi.c umidi.c umidivar.h usb.c usbdi.c
usbdi_util.h usbdivar.h utoppy.c
Log Message:
minor cleanups from usbmp:
- move usbd_delay_ms() into usbdivar.h in the usb_subr.c section
- minor rcsid fixes
- copyright maintenence
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/emdtv.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/emdtv_dtv.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/usb/ezload.c
cvs rdiff -u -r1.125 -r1.126 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/usb/if_cue.c
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/usb/if_kue.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/usb/if_otus.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/usb/if_udav.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/if_upgt.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/usb/if_url.c \
src/sys/dev/usb/umass_scsipi.c src/sys/dev/usb/usbdi_util.h
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/usb/udsbr.c
cvs rdiff -u -r1.116 -r1.117 src/sys/dev/usb/ukbd.c
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/usb/ulpt.c
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/usb/umidi.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/usb/umidivar.h \
src/sys/dev/usb/utoppy.c
cvs rdiff -u -r1.128 -r1.129 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.136 -r1.137 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/usb/usbdivar.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/dev/usb/emdtv.c
diff -u src/sys/dev/usb/emdtv.c:1.7 src/sys/dev/usb/emdtv.c:1.8
--- src/sys/dev/usb/emdtv.c:1.7 Mon Jan 9 11:02:18 2012
+++ src/sys/dev/usb/emdtv.c Sun Mar 11 01:06:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv.c,v 1.7 2012/01/09 11:02:18 jmcneill Exp $ */
+/* $NetBSD: emdtv.c,v 1.8 2012/03/11 01:06:06 mrg Exp $ */
/*-
* Copyright (c) 2008, 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.7 2012/01/09 11:02:18 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.8 2012/03/11 01:06:06 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,6 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/emdtvvar.h>
Index: src/sys/dev/usb/emdtv_dtv.c
diff -u src/sys/dev/usb/emdtv_dtv.c:1.8 src/sys/dev/usb/emdtv_dtv.c:1.9
--- src/sys/dev/usb/emdtv_dtv.c:1.8 Mon Jan 9 11:02:18 2012
+++ src/sys/dev/usb/emdtv_dtv.c Sun Mar 11 01:06:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv_dtv.c,v 1.8 2012/01/09 11:02:18 jmcneill Exp $ */
+/* $NetBSD: emdtv_dtv.c,v 1.9 2012/03/11 01:06:06 mrg Exp $ */
/*-
* Copyright (c) 2008, 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emdtv_dtv.c,v 1.8 2012/01/09 11:02:18 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv_dtv.c,v 1.9 2012/03/11 01:06:06 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,6 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: emdtv_dtv.c,
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdevs.h>
#include <dev/i2c/i2cvar.h>
Index: src/sys/dev/usb/ezload.c
diff -u src/sys/dev/usb/ezload.c:1.12 src/sys/dev/usb/ezload.c:1.13
--- src/sys/dev/usb/ezload.c:1.12 Mon Apr 28 20:23:59 2008
+++ src/sys/dev/usb/ezload.c Sun Mar 11 01:06:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ezload.c,v 1.12 2008/04/28 20:23:59 martin Exp $ */
+/* $NetBSD: ezload.c,v 1.13 2012/03/11 01:06:06 mrg Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ezload.c,v 1.12 2008/04/28 20:23:59 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ezload.c,v 1.13 2012/03/11 01:06:06 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,6 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: ezload.c,v 1
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/ezload.h>
Index: src/sys/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.125 src/sys/dev/usb/if_aue.c:1.126
--- src/sys/dev/usb/if_aue.c:1.125 Tue Mar 6 03:35:29 2012
+++ src/sys/dev/usb/if_aue.c Sun Mar 11 01:06:06 2012
@@ -1,4 +1,5 @@
-/* $NetBSD: if_aue.c,v 1.125 2012/03/06 03:35:29 mrg Exp $ */
+/* $NetBSD: if_aue.c,v 1.126 2012/03/11 01:06:06 mrg Exp $ */
+
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -77,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.125 2012/03/06 03:35:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.126 2012/03/11 01:06:06 mrg Exp $");
#include "opt_inet.h"
@@ -424,7 +425,7 @@ aue_unlock_mii(struct aue_softc *sc)
{
mutex_exit(&sc->aue_mii_lock);
if (--sc->aue_refcnt < 0)
- usb_detach_wakeupold((sc->aue_dev));
+ usb_detach_wakeupold(sc->aue_dev);
}
Static int
@@ -923,7 +924,7 @@ aue_detach(device_t self, int flags)
if (--sc->aue_refcnt >= 0) {
/* Wait for processes to go away. */
- usb_detach_waitold((sc->aue_dev));
+ usb_detach_waitold(sc->aue_dev);
}
splx(s);
Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.53 src/sys/dev/usb/if_axe.c:1.54
--- src/sys/dev/usb/if_axe.c:1.53 Tue Mar 6 03:35:29 2012
+++ src/sys/dev/usb/if_axe.c Sun Mar 11 01:06:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.53 2012/03/06 03:35:29 mrg Exp $ */
+/* $NetBSD: if_axe.c,v 1.54 2012/03/11 01:06:06 mrg Exp $ */
/* $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
/*
@@ -89,7 +89,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.53 2012/03/06 03:35:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.54 2012/03/11 01:06:06 mrg Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -778,7 +778,7 @@ axe_detach(device_t self, int flags)
if (--sc->axe_refcnt >= 0) {
/* Wait for processes to go away. */
- usb_detach_waitold((sc->axe_dev));
+ usb_detach_waitold(sc->axe_dev);
}
splx(s);
Index: src/sys/dev/usb/if_cue.c
diff -u src/sys/dev/usb/if_cue.c:1.62 src/sys/dev/usb/if_cue.c:1.63
--- src/sys/dev/usb/if_cue.c:1.62 Fri Feb 24 06:48:24 2012
+++ src/sys/dev/usb/if_cue.c Sun Mar 11 01:06:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cue.c,v 1.62 2012/02/24 06:48:24 mrg Exp $ */
+/* $NetBSD: if_cue.c,v 1.63 2012/03/11 01:06:06 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.62 2012/02/24 06:48:24 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.63 2012/03/11 01:06:06 mrg Exp $");
#include "opt_inet.h"
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
-
+#include <sys/bus.h>
#include <sys/device.h>
#include <sys/rnd.h>
@@ -86,6 +86,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/if_cuereg.h>
Index: src/sys/dev/usb/if_kue.c
diff -u src/sys/dev/usb/if_kue.c:1.76 src/sys/dev/usb/if_kue.c:1.77
--- src/sys/dev/usb/if_kue.c:1.76 Sat Mar 10 23:01:07 2012
+++ src/sys/dev/usb/if_kue.c Sun Mar 11 01:06:06 2012
@@ -1,4 +1,5 @@
-/* $NetBSD: if_kue.c,v 1.76 2012/03/10 23:01:07 mrg Exp $ */
+/* $NetBSD: if_kue.c,v 1.77 2012/03/11 01:06:06 mrg Exp $ */
+
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -70,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.76 2012/03/10 23:01:07 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.77 2012/03/11 01:06:06 mrg Exp $");
#include "opt_inet.h"
@@ -83,25 +84,23 @@ __KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1
#include <sys/socket.h>
#include <sys/device.h>
#include <sys/proc.h>
-
#include <sys/rnd.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/if_dl.h>
-
#include <net/bpf.h>
-
#include <net/if_ether.h>
+
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_inarp.h>
#endif
-
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/if_kuereg.h>
Index: src/sys/dev/usb/if_otus.c
diff -u src/sys/dev/usb/if_otus.c:1.9 src/sys/dev/usb/if_otus.c:1.10
--- src/sys/dev/usb/if_otus.c:1.9 Thu Dec 2 17:38:05 2010
+++ src/sys/dev/usb/if_otus.c Sun Mar 11 01:06:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_otus.c,v 1.9 2010/12/02 17:38:05 christos Exp $ */
+/* $NetBSD: if_otus.c,v 1.10 2012/03/11 01:06:06 mrg Exp $ */
/* $OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $ */
/*-
@@ -31,7 +31,6 @@
#include <sys/callout.h>
#include <sys/device.h>
#include <sys/proc.h>
-
#include <sys/bus.h>
#include <sys/endian.h>
#include <sys/intr.h>
@@ -58,6 +57,7 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/if_otusreg.h>
Index: src/sys/dev/usb/if_udav.c
diff -u src/sys/dev/usb/if_udav.c:1.36 src/sys/dev/usb/if_udav.c:1.37
--- src/sys/dev/usb/if_udav.c:1.36 Tue Mar 6 03:35:29 2012
+++ src/sys/dev/usb/if_udav.c Sun Mar 11 01:06:06 2012
@@ -1,5 +1,6 @@
-/* $NetBSD: if_udav.c,v 1.36 2012/03/06 03:35:29 mrg Exp $ */
+/* $NetBSD: if_udav.c,v 1.37 2012/03/11 01:06:06 mrg Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
+
/*
* Copyright (c) 2003
* Shingo WATANABE <n...@nabechan.org>. All rights reserved.
@@ -44,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.36 2012/03/06 03:35:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.37 2012/03/11 01:06:06 mrg Exp $");
#include "opt_inet.h"
Index: src/sys/dev/usb/if_upgt.c
diff -u src/sys/dev/usb/if_upgt.c:1.5 src/sys/dev/usb/if_upgt.c:1.6
--- src/sys/dev/usb/if_upgt.c:1.5 Fri Dec 23 00:51:43 2011
+++ src/sys/dev/usb/if_upgt.c Sun Mar 11 01:06:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upgt.c,v 1.5 2011/12/23 00:51:43 jakllsch Exp $ */
+/* $NetBSD: if_upgt.c,v 1.6 2012/03/11 01:06:06 mrg Exp $ */
/* $OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.5 2011/12/23 00:51:43 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.6 2012/03/11 01:06:06 mrg Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -31,7 +31,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v
#include <sys/sockio.h>
#include <sys/systm.h>
#include <sys/vnode.h>
-
#include <sys/bus.h>
#include <sys/endian.h>
#include <sys/intr.h>
@@ -52,6 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/if_upgtvar.h>
Index: src/sys/dev/usb/if_url.c
diff -u src/sys/dev/usb/if_url.c:1.42 src/sys/dev/usb/if_url.c:1.43
--- src/sys/dev/usb/if_url.c:1.42 Tue Mar 6 03:35:29 2012
+++ src/sys/dev/usb/if_url.c Sun Mar 11 01:06:07 2012
@@ -1,4 +1,5 @@
-/* $NetBSD: if_url.c,v 1.42 2012/03/06 03:35:29 mrg Exp $ */
+/* $NetBSD: if_url.c,v 1.43 2012/03/11 01:06:07 mrg Exp $ */
+
/*
* Copyright (c) 2001, 2002
* Shingo WATANABE <n...@nabechan.org>. All rights reserved.
@@ -43,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.42 2012/03/06 03:35:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.43 2012/03/11 01:06:07 mrg Exp $");
#include "opt_inet.h"
Index: src/sys/dev/usb/umass_scsipi.c
diff -u src/sys/dev/usb/umass_scsipi.c:1.42 src/sys/dev/usb/umass_scsipi.c:1.43
--- src/sys/dev/usb/umass_scsipi.c:1.42 Tue Mar 6 03:35:30 2012
+++ src/sys/dev/usb/umass_scsipi.c Sun Mar 11 01:06:07 2012
@@ -1,12 +1,12 @@
-/* $NetBSD: umass_scsipi.c,v 1.42 2012/03/06 03:35:30 mrg Exp $ */
+/* $NetBSD: umass_scsipi.c,v 1.43 2012/03/11 01:06:07 mrg Exp $ */
/*
- * Copyright (c) 2001, 2003 The NetBSD Foundation, Inc.
+ * Copyright (c) 2001, 2003, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Lennart Augustsson (lenn...@augustsson.net) at
- * Carlstedt Research & Technology and by Charles M. Hamnnum.
+ * Carlstedt Research & Technology, Charles M. Hamnnum and Matthew R. Green.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.42 2012/03/06 03:35:30 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.43 2012/03/11 01:06:07 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_umass.h"
Index: src/sys/dev/usb/usbdi_util.h
diff -u src/sys/dev/usb/usbdi_util.h:1.42 src/sys/dev/usb/usbdi_util.h:1.43
--- src/sys/dev/usb/usbdi_util.h:1.42 Tue Mar 6 03:35:30 2012
+++ src/sys/dev/usb/usbdi_util.h Sun Mar 11 01:06:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi_util.h,v 1.42 2012/03/06 03:35:30 mrg Exp $ */
+/* $NetBSD: usbdi_util.h,v 1.43 2012/03/11 01:06:07 mrg Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -69,7 +69,6 @@ usbd_status usbd_get_config(usbd_device_
usbd_status usbd_get_string_desc(usbd_device_handle dev, int sindex,
int langid,usb_string_descriptor_t *sdesc,
int *sizep);
-void usbd_delay_ms(usbd_device_handle, u_int);
usbd_status usbd_set_config_no(usbd_device_handle, int, int);
Index: src/sys/dev/usb/udsbr.c
diff -u src/sys/dev/usb/udsbr.c:1.20 src/sys/dev/usb/udsbr.c:1.21
--- src/sys/dev/usb/udsbr.c:1.20 Fri Dec 23 00:51:45 2011
+++ src/sys/dev/usb/udsbr.c Sun Mar 11 01:06:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: udsbr.c,v 1.20 2011/12/23 00:51:45 jakllsch Exp $ */
+/* $NetBSD: udsbr.c,v 1.21 2012/03/11 01:06:07 mrg Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.20 2011/12/23 00:51:45 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.21 2012/03/11 01:06:07 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,6 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdevs.h>
Index: src/sys/dev/usb/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.116 src/sys/dev/usb/ukbd.c:1.117
--- src/sys/dev/usb/ukbd.c:1.116 Fri Feb 24 06:48:26 2012
+++ src/sys/dev/usb/ukbd.c Sun Mar 11 01:06:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbd.c,v 1.116 2012/02/24 06:48:26 mrg Exp $ */
+/* $NetBSD: ukbd.c,v 1.117 2012/03/11 01:06:07 mrg Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.116 2012/02/24 06:48:26 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.117 2012/03/11 01:06:07 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,6 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.1
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_quirks.h>
#include <dev/usb/uhidev.h>
Index: src/sys/dev/usb/ulpt.c
diff -u src/sys/dev/usb/ulpt.c:1.90 src/sys/dev/usb/ulpt.c:1.91
--- src/sys/dev/usb/ulpt.c:1.90 Tue Mar 6 03:35:29 2012
+++ src/sys/dev/usb/ulpt.c Sun Mar 11 01:06:07 2012
@@ -1,5 +1,4 @@
-/* $NetBSD: ulpt.c,v 1.90 2012/03/06 03:35:29 mrg Exp $ */
-/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */
+/* $NetBSD: ulpt.c,v 1.91 2012/03/11 01:06:07 mrg Exp $ */
/*
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -36,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.90 2012/03/06 03:35:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.91 2012/03/11 01:06:07 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/usb/umidi.c
diff -u src/sys/dev/usb/umidi.c:1.60 src/sys/dev/usb/umidi.c:1.61
--- src/sys/dev/usb/umidi.c:1.60 Sun Feb 19 20:20:31 2012
+++ src/sys/dev/usb/umidi.c Sun Mar 11 01:06:07 2012
@@ -1,11 +1,12 @@
-/* $NetBSD: umidi.c,v 1.60 2012/02/19 20:20:31 mrg Exp $ */
+/* $NetBSD: umidi.c,v 1.61 2012/03/11 01:06:07 mrg Exp $ */
/*
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
- * by Takuya SHIOZAKI (tshio...@netbsd.org) and (full-size transfers, extended
- * hw_if) Chapman Flack (c...@netbsd.org).
+ * by Takuya SHIOZAKI (tshio...@netbsd.org), (full-size transfers, extended
+ * hw_if) Chapman Flack (c...@netbsd.org), and Matthew R. Green
+ * (m...@eterna.com.au).
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.60 2012/02/19 20:20:31 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.61 2012/03/11 01:06:07 mrg Exp $");
#include <sys/types.h>
#include <sys/param.h>
Index: src/sys/dev/usb/umidivar.h
diff -u src/sys/dev/usb/umidivar.h:1.18 src/sys/dev/usb/umidivar.h:1.19
--- src/sys/dev/usb/umidivar.h:1.18 Tue Feb 14 19:28:23 2012
+++ src/sys/dev/usb/umidivar.h Sun Mar 11 01:06:07 2012
@@ -1,10 +1,11 @@
-/* $NetBSD: umidivar.h,v 1.18 2012/02/14 19:28:23 mrg Exp $ */
+/* $NetBSD: umidivar.h,v 1.19 2012/03/11 01:06:07 mrg Exp $ */
/*
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
- * by Takuya SHIOZAKI (tshio...@netbsd.org).
+ * by Takuya SHIOZAKI (tshio...@netbsd.org) and Matthew R. Green
+ * (m...@eterna.com.au).
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Index: src/sys/dev/usb/utoppy.c
diff -u src/sys/dev/usb/utoppy.c:1.18 src/sys/dev/usb/utoppy.c:1.19
--- src/sys/dev/usb/utoppy.c:1.18 Tue Mar 6 03:35:30 2012
+++ src/sys/dev/usb/utoppy.c Sun Mar 11 01:06:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: utoppy.c,v 1.18 2012/03/06 03:35:30 mrg Exp $ */
+/* $NetBSD: utoppy.c,v 1.19 2012/03/11 01:06:07 mrg Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.18 2012/03/06 03:35:30 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.19 2012/03/11 01:06:07 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,9 +43,11 @@ __KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1
#include <sys/uio.h>
#include <sys/conf.h>
#include <sys/vnode.h>
+#include <sys/bus.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_quirks.h>
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.128 src/sys/dev/usb/usb.c:1.129
--- src/sys/dev/usb/usb.c:1.128 Tue Mar 6 02:49:03 2012
+++ src/sys/dev/usb/usb.c Sun Mar 11 01:06:07 2012
@@ -1,12 +1,12 @@
-/* $NetBSD: usb.c,v 1.128 2012/03/06 02:49:03 mrg Exp $ */
+/* $NetBSD: usb.c,v 1.129 2012/03/11 01:06:07 mrg Exp $ */
/*
- * Copyright (c) 1998, 2002, 2008 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Lennart Augustsson (lenn...@augustsson.net) at
- * Carlstedt Research & Technology.
+ * Carlstedt Research & Technology and Matthew R. Green (m...@eterna.com.au).
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.128 2012/03/06 02:49:03 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.129 2012/03/11 01:06:07 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_usb.h"
Index: src/sys/dev/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.136 src/sys/dev/usb/usbdi.c:1.137
--- src/sys/dev/usb/usbdi.c:1.136 Sun Mar 11 00:34:46 2012
+++ src/sys/dev/usb/usbdi.c Sun Mar 11 01:06:07 2012
@@ -1,13 +1,12 @@
-/* $NetBSD: usbdi.c,v 1.136 2012/03/11 00:34:46 mrg Exp $ */
-/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */
+/* $NetBSD: usbdi.c,v 1.137 2012/03/11 01:06:07 mrg Exp $ */
/*
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Lennart Augustsson (lenn...@augustsson.net) at
- * Carlstedt Research & Technology.
+ * Carlstedt Research & Technology and Matthew R. Green (m...@eterna.com.au).
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.136 2012/03/11 00:34:46 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.137 2012/03/11 01:06:07 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_usb.h"
Index: src/sys/dev/usb/usbdivar.h
diff -u src/sys/dev/usb/usbdivar.h:1.95 src/sys/dev/usb/usbdivar.h:1.96
--- src/sys/dev/usb/usbdivar.h:1.95 Sun Mar 11 00:34:45 2012
+++ src/sys/dev/usb/usbdivar.h Sun Mar 11 01:06:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdivar.h,v 1.95 2012/03/11 00:34:45 mrg Exp $ */
+/* $NetBSD: usbdivar.h,v 1.96 2012/03/11 01:06:07 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $ */
/*
@@ -32,6 +32,7 @@
*/
#include <sys/callout.h>
+#include <sys/bus.h>
/* From usb_mem.h */
struct usb_dma_block;
@@ -234,6 +235,7 @@ void usbd_dump_pipe(usbd_pipe_handle pip
/* Routines from usb_subr.c */
int usbctlprint(void *, const char *);
void usb_delay_ms(usbd_bus_handle, u_int);
+void usbd_delay_ms(usbd_device_handle, u_int);
usbd_status usbd_reset_port(usbd_device_handle, int, usb_port_status_t *);
usbd_status usbd_setup_pipe(usbd_device_handle dev,
usbd_interface_handle iface,
