Module Name: src
Committed By: matt
Date: Fri Sep 5 05:30:23 UTC 2014
Modified Files:
src/sys/dev/scsipi: sdvar.h
Log Message:
Don't nest structure definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/scsipi/sdvar.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/scsipi/sdvar.h
diff -u src/sys/dev/scsipi/sdvar.h:1.34 src/sys/dev/scsipi/sdvar.h:1.35
--- src/sys/dev/scsipi/sdvar.h:1.34 Thu Feb 2 19:43:06 2012
+++ src/sys/dev/scsipi/sdvar.h Fri Sep 5 05:30:23 2014
@@ -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 sd_softc {
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;
