[src/jmcneill-usbmp]: src/sys/dev/usb include usbdivar.h in several places th...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9f32bb0affa1
branches:  jmcneill-usbmp
changeset: 771824:9f32bb0affa1
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Feb 26 06:28:58 2012 +0000

description:
include usbdivar.h in several places that should.

diffstat:

 sys/dev/usb/emdtv.c     |   5 +++--
 sys/dev/usb/emdtv_dtv.c |   5 +++--
 sys/dev/usb/ezload.c    |   5 +++--
 sys/dev/usb/if_cue.c    |   7 ++++---
 sys/dev/usb/if_kue.c    |  12 +++++-------
 sys/dev/usb/if_otus.c   |   4 ++--
 sys/dev/usb/if_upgt.c   |   6 +++---
 sys/dev/usb/udsbr.c     |   5 +++--
 8 files changed, 26 insertions(+), 23 deletions(-)

diffs (245 lines):

diff -r 611addc5baa2 -r 9f32bb0affa1 sys/dev/usb/emdtv.c
--- a/sys/dev/usb/emdtv.c       Sun Feb 26 05:05:44 2012 +0000
+++ b/sys/dev/usb/emdtv.c       Sun Feb 26 06:28:58 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv.c,v 1.4.6.1 2012/02/18 07:35:04 mrg Exp $ */
+/* $NetBSD: emdtv.c,v 1.4.6.2 2012/02/26 06:28:58 mrg Exp $ */
 
 /*-
  * Copyright (c) 2008, 2011 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.4.6.1 2012/02/18 07:35:04 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.4.6.2 2012/02/26 06:28:58 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -38,6 +38,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/emdtvvar.h>
diff -r 611addc5baa2 -r 9f32bb0affa1 sys/dev/usb/emdtv_dtv.c
--- a/sys/dev/usb/emdtv_dtv.c   Sun Feb 26 05:05:44 2012 +0000
+++ b/sys/dev/usb/emdtv_dtv.c   Sun Feb 26 06:28:58 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv_dtv.c,v 1.5.6.1 2012/02/18 07:35:04 mrg Exp $ */
+/* $NetBSD: emdtv_dtv.c,v 1.5.6.2 2012/02/26 06:28:58 mrg Exp $ */
 
 /*-
  * Copyright (c) 2008, 2011 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emdtv_dtv.c,v 1.5.6.1 2012/02/18 07:35:04 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv_dtv.c,v 1.5.6.2 2012/02/26 06:28:58 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -37,6 +37,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/i2c/i2cvar.h>
diff -r 611addc5baa2 -r 9f32bb0affa1 sys/dev/usb/ezload.c
--- a/sys/dev/usb/ezload.c      Sun Feb 26 05:05:44 2012 +0000
+++ b/sys/dev/usb/ezload.c      Sun Feb 26 06:28:58 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ezload.c,v 1.12 2008/04/28 20:23:59 martin Exp $       */
+/*     $NetBSD: ezload.c,v 1.12.38.1 2012/02/26 06:28:58 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.12.38.1 2012/02/26 06:28:58 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,6 +41,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/ezload.h>
 
diff -r 611addc5baa2 -r 9f32bb0affa1 sys/dev/usb/if_cue.c
--- a/sys/dev/usb/if_cue.c      Sun Feb 26 05:05:44 2012 +0000
+++ b/sys/dev/usb/if_cue.c      Sun Feb 26 06:28:58 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_cue.c,v 1.60.12.2 2012/02/24 09:11:42 mrg Exp $     */
+/*     $NetBSD: if_cue.c,v 1.60.12.3 2012/02/26 06:28:58 mrg Exp $     */
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
  *     Bill Paul <wpaul%ee.columbia.edu@localhost>.  All rights reserved.
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.60.12.2 2012/02/24 09:11:42 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.60.12.3 2012/02/26 06:28:58 mrg Exp $");
 
 #include "opt_inet.h"
 
@@ -68,7 +68,7 @@
 #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 @@
 #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>
diff -r 611addc5baa2 -r 9f32bb0affa1 sys/dev/usb/if_kue.c
--- a/sys/dev/usb/if_kue.c      Sun Feb 26 05:05:44 2012 +0000
+++ b/sys/dev/usb/if_kue.c      Sun Feb 26 06:28:58 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_kue.c,v 1.74.12.2 2012/02/25 12:53:34 mrg Exp $     */
+/*     $NetBSD: if_kue.c,v 1.74.12.3 2012/02/26 06:28:58 mrg Exp $     */
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
  *     Bill Paul <wpaul%ee.columbia.edu@localhost>.  All rights reserved.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.74.12.2 2012/02/25 12:53:34 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.74.12.3 2012/02/26 06:28:58 mrg Exp $");
 
 #include "opt_inet.h"
 
@@ -83,25 +83,23 @@
 #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>
 
-#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>
diff -r 611addc5baa2 -r 9f32bb0affa1 sys/dev/usb/if_otus.c
--- a/sys/dev/usb/if_otus.c     Sun Feb 26 05:05:44 2012 +0000
+++ b/sys/dev/usb/if_otus.c     Sun Feb 26 06:28:58 2012 +0000
@@ -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.9.14.1 2012/02/26 06:28:58 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>
diff -r 611addc5baa2 -r 9f32bb0affa1 sys/dev/usb/if_upgt.c
--- a/sys/dev/usb/if_upgt.c     Sun Feb 26 05:05:44 2012 +0000
+++ b/sys/dev/usb/if_upgt.c     Sun Feb 26 06:28:58 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_upgt.c,v 1.3.14.1 2012/02/18 07:35:06 mrg Exp $     */
+/*     $NetBSD: if_upgt.c,v 1.3.14.2 2012/02/26 06:28:58 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.3.14.1 2012/02/18 07:35:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.3.14.2 2012/02/26 06:28:58 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/callout.h>
@@ -31,7 +31,6 @@
 #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 @@
 #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>
diff -r 611addc5baa2 -r 9f32bb0affa1 sys/dev/usb/udsbr.c
--- a/sys/dev/usb/udsbr.c       Sun Feb 26 05:05:44 2012 +0000
+++ b/sys/dev/usb/udsbr.c       Sun Feb 26 06:28:58 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: udsbr.c,v 1.18.12.1 2012/02/18 07:35:08 mrg Exp $      */
+/*     $NetBSD: udsbr.c,v 1.18.12.2 2012/02/26 06:28:59 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.18.12.1 2012/02/18 07:35:08 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.18.12.2 2012/02/26 06:28:59 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -51,6 +51,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>