[src/trunk]: src/sys/dev/usb Don't nest structure definitions.

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

details:   https://anonhg.NetBSD.org/src/rev/186e2764c053
branches:  trunk
changeset: 332019:186e2764c053
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Sep 05 05:31:15 2014 +0000

description:
Don't nest structure definitions.

diffstat:

 sys/dev/usb/ugen.c |  18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r 57bb0a059da0 -r 186e2764c053 sys/dev/usb/ugen.c
--- a/sys/dev/usb/ugen.c        Fri Sep 05 05:30:42 2014 +0000
+++ b/sys/dev/usb/ugen.c        Fri Sep 05 05:31:15 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ugen.c,v 1.124 2014/07/25 08:10:39 dholland Exp $      */
+/*     $NetBSD: ugen.c,v 1.125 2014/09/05 05:31:15 matt Exp $  */
 
 /*
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.124 2014/07/25 08:10:39 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.125 2014/09/05 05:31:15 matt Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -81,6 +81,13 @@
 #define UGEN_BULK_RA_WB_BUFSIZE        16384           /* default buffer size */
 #define UGEN_BULK_RA_WB_BUFMAX (1 << 20)       /* maximum allowed buffer */
 
+struct isoreq {
+       struct ugen_endpoint *sce;
+       usbd_xfer_handle xfer;
+       void *dmabuf;
+       u_int16_t sizes[UGEN_NISORFRMS];
+};
+
 struct ugen_endpoint {
        struct ugen_softc *sc;
        usb_endpoint_descriptor_t *edesc;
@@ -103,12 +110,7 @@
        u_int32_t ra_wb_used;    /* how much is in buffer */
        u_int32_t ra_wb_xferlen; /* current xfer length for RA/WB */
        usbd_xfer_handle ra_wb_xfer;
-       struct isoreq {
-               struct ugen_endpoint *sce;
-               usbd_xfer_handle xfer;
-               void *dmabuf;
-               u_int16_t sizes[UGEN_NISORFRMS];
-       } isoreqs[UGEN_NISOREQS];
+       struct isoreq isoreqs[UGEN_NISOREQS];
        /* Keep these last; we don't overwrite them in ugen_set_config() */
 #define UGEN_ENDPOINT_NONZERO_CRUFT    offsetof(struct ugen_endpoint, rsel)
        struct selinfo rsel;