[src/trunk]: src/sys/dev/usb Merge from FreeBSD:

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

details:   https://anonhg.NetBSD.org/src/rev/57fd66181f6c
branches:  trunk
changeset: 572738:57fd66181f6c
user:      imp <imp%NetBSD.org@localhost>
date:      Tue Jan 11 07:45:34 2005 +0000

description:
Merge from FreeBSD:
sc_child is only used on NetBSD and OpenBSD, ifdef appropriately
FreeBSD revisions:
        ehcivar.h       1.8
        ohcivar.h       1.39
        uhicvar.h       1.39

diffstat:

 sys/dev/usb/ehcivar.h |  5 +++--
 sys/dev/usb/ohcivar.h |  6 +++---
 sys/dev/usb/uhcivar.h |  4 +++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diffs (60 lines):

diff -r 8f9bbb91f730 -r 57fd66181f6c sys/dev/usb/ehcivar.h
--- a/sys/dev/usb/ehcivar.h     Tue Jan 11 07:26:57 2005 +0000
+++ b/sys/dev/usb/ehcivar.h     Tue Jan 11 07:45:34 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehcivar.h,v 1.16 2004/12/21 16:41:24 fvdl Exp $ */
+/*     $NetBSD: ehcivar.h,v 1.17 2005/01/11 07:45:34 imp Exp $ */
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -133,8 +133,9 @@
 
        usb_callout_t sc_tmo_pcd;
 
+#if defined(__NetBSD__) || defined(__OpenBSD__)
        device_ptr_t sc_child;          /* /dev/usb# device */
-
+#endif
        char sc_dying;
 #ifdef __NetBSD__
        struct usb_dma_reserve sc_dma_reserve;
diff -r 8f9bbb91f730 -r 57fd66181f6c sys/dev/usb/ohcivar.h
--- a/sys/dev/usb/ohcivar.h     Tue Jan 11 07:26:57 2005 +0000
+++ b/sys/dev/usb/ohcivar.h     Tue Jan 11 07:45:34 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohcivar.h,v 1.34 2004/12/21 16:41:24 fvdl Exp $        */
+/*     $NetBSD: ohcivar.h,v 1.35 2005/01/11 07:45:34 imp Exp $ */
 /*     $FreeBSD: src/sys/dev/usb/ohcivar.h,v 1.13 1999/11/17 22:33:41 n_hibma Exp $    */
 
 /*
@@ -135,9 +135,9 @@
        struct timeval sc_overrun_ntc;
 
        usb_callout_t sc_tmo_rhsc;
-
+#if defined(__NetBSD__) || defined(__OpenBSD__)
        device_ptr_t sc_child;
-
+#endif
        char sc_dying;
 #ifdef __NetBSD__
        struct usb_dma_reserve sc_dma_reserve;
diff -r 8f9bbb91f730 -r 57fd66181f6c sys/dev/usb/uhcivar.h
--- a/sys/dev/usb/uhcivar.h     Tue Jan 11 07:26:57 2005 +0000
+++ b/sys/dev/usb/uhcivar.h     Tue Jan 11 07:45:34 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhcivar.h,v 1.37 2004/12/21 16:41:24 fvdl Exp $        */
+/*     $NetBSD: uhcivar.h,v 1.38 2005/01/11 07:45:34 imp Exp $ */
 /*     $FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.14 1999/11/17 22:33:42 n_hibma Exp $    */
 
 /*
@@ -182,7 +182,9 @@
        void *sc_powerhook;             /* cookie from power hook */
        void *sc_shutdownhook;          /* cookie from shutdown hook */
 
+#if defined(__NetBSD__) || defined(__OpenBSD__)
        device_ptr_t sc_child;          /* /dev/usb# device */
+#endif
 #ifdef __NetBSD__
        struct usb_dma_reserve sc_dma_reserve;
 #endif