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

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

details:   https://anonhg.NetBSD.org/src/rev/5bef7f3fd245
branches:  trunk
changeset: 332017:5bef7f3fd245
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Sep 05 05:30:23 2014 +0000

description:
Don't nest structure definitions.

diffstat:

 sys/dev/scsipi/sdvar.h |  22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diffs (43 lines):

diff -r 38863b79f8f7 -r 5bef7f3fd245 sys/dev/scsipi/sdvar.h
--- a/sys/dev/scsipi/sdvar.h    Fri Sep 05 05:29:16 2014 +0000
+++ b/sys/dev/scsipi/sdvar.h    Fri Sep 05 05:30:23 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sdvar.h,v 1.34 2012/02/02 19:43:06 tls Exp $   */
+/*     $NetBSD: sdvar.h,v 1.35 2014/09/05 05:30:23 matt Exp $  */
 
 /*-
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -61,6 +61,16 @@
 #define        SD_IO_TIMEOUT   (60 * 1000)
 #endif
 
+struct disk_parms {
+       u_long  heads;                  /* number of heads */
+       u_long  cyls;                   /* number of cylinders */
+       u_long  sectors;                /* number of sectors/track */
+       u_long  blksize;                /* number of bytes/sector */
+       u_long  rot_rate;               /* rotational rate, in RPM */
+       u_int64_t disksize;             /* total number sectors */
+       u_int64_t disksize512;          /* total number sectors */
+};
+
 struct sd_softc {
        device_t sc_dev;
        struct disk sc_dk;
@@ -74,15 +84,7 @@
 
        struct scsipi_periph *sc_periph;/* contains our targ, lun, etc. */
 
-       struct disk_parms {
-               u_long  heads;          /* number of heads */
-               u_long  cyls;           /* number of cylinders */
-               u_long  sectors;        /* number of sectors/track */
-               u_long  blksize;        /* number of bytes/sector */
-               u_long  rot_rate;       /* rotational rate, in RPM */
-               u_int64_t disksize;     /* total number sectors */
-               u_int64_t disksize512;  /* total number sectors */
-       } params;
+       struct disk_parms params;
 
        struct bufq_state *buf_queue;
        callout_t sc_callout;