# HG changeset patch
# User Toomas Soome <tsoome@me.com>
# Date 1520920781 -7200
# Node ID 4272f05ab956ba909bc632d5b15453888bbf23ba
# Parent  92fc8be96510b3e3fefd3665f93e0fa3379bd533
loader: Minor cosmetic changes.

illumos issue #9272

diff -r 92fc8be96510 -r 4272f05ab956 usr/src/boot/lib/libstand/stand.h
--- a/usr/src/boot/lib/libstand/stand.h	Mon Feb 19 19:14:22 2018 +0200
+++ b/usr/src/boot/lib/libstand/stand.h	Tue Mar 13 07:59:41 2018 +0200
@@ -137,6 +137,12 @@
 struct devsw {
     const char	dv_name[8];
     int		dv_type;		/* opaque type constant, arch-dependant */
+#define	DEVT_NONE	0
+#define	DEVT_DISK	1
+#define	DEVT_NET	2
+#define	DEVT_CD		3
+#define	DEVT_ZFS	4
+#define	DEVT_FD		5
     int		(*dv_init)(void);	/* early probe call */
     int		(*dv_strategy)(void *devdata, int rw, daddr_t blk,
 			size_t size, char *buf, size_t *rsize);
@@ -159,16 +165,9 @@
  * versions may be larger, but should be allowed to
  * overlap.
  */
-struct devdesc
-{
+struct devdesc {
     struct devsw	*d_dev;
     int			d_type;
-#define	DEVT_NONE	0
-#define	DEVT_DISK	1
-#define	DEVT_NET	2
-#define	DEVT_CD		3
-#define	DEVT_ZFS	4
-#define	DEVT_FD		5
     int			d_unit;
     void		*d_opendata;
 };
diff -r 92fc8be96510 -r 4272f05ab956 usr/src/boot/sys/boot/common/disk.h
--- a/usr/src/boot/sys/boot/common/disk.h	Mon Feb 19 19:14:22 2018 +0200
+++ b/usr/src/boot/sys/boot/common/disk.h	Tue Mar 13 07:59:41 2018 +0200
@@ -84,8 +84,8 @@
 #ifndef	_DISK_H
 #define	_DISK_H
 
-struct disk_devdesc
-{
+/* Note: Must match the 'struct devdesc' in stand.h */
+struct disk_devdesc {
 	struct devsw	*d_dev;
 	int		d_type;
 	int		d_unit;
diff -r 92fc8be96510 -r 4272f05ab956 usr/src/boot/sys/boot/i386/libi386/libi386.h
--- a/usr/src/boot/sys/boot/i386/libi386/libi386.h	Mon Feb 19 19:14:22 2018 +0200
+++ b/usr/src/boot/sys/boot/i386/libi386/libi386.h	Tue Mar 13 07:59:41 2018 +0200
@@ -30,12 +30,10 @@
 
 /*
  * i386 fully-qualified device descriptor.
- * Note, this must match the 'struct devdesc' declaration
- * in bootstrap.h and also with struct zfs_devdesc for zfs
- * support.
+ * Note, this must match struct zfs_devdesc for zfs support.
  */
-struct i386_devdesc
-{
+/* Note: Must match the 'struct devdesc' in stand.h */
+struct i386_devdesc {
     struct devsw	*d_dev;
     int			d_type;
     int			d_unit;
diff -r 92fc8be96510 -r 4272f05ab956 usr/src/boot/sys/boot/ofw/libofw/libofw.h
--- a/usr/src/boot/sys/boot/ofw/libofw/libofw.h	Mon Feb 19 19:14:22 2018 +0200
+++ b/usr/src/boot/sys/boot/ofw/libofw/libofw.h	Tue Mar 13 07:59:41 2018 +0200
@@ -27,7 +27,7 @@
 
 #include "openfirm.h"
 
-/* Note: Must match the 'struct devdesc' in bootstrap.h */
+/* Note: Must match the 'struct devdesc' in stand.h */
 struct ofw_devdesc {
 	struct devsw	*d_dev;
 	int		d_type;
diff -r 92fc8be96510 -r 4272f05ab956 usr/src/boot/sys/boot/uboot/lib/libuboot.h
--- a/usr/src/boot/sys/boot/uboot/lib/libuboot.h	Mon Feb 19 19:14:22 2018 +0200
+++ b/usr/src/boot/sys/boot/uboot/lib/libuboot.h	Tue Mar 13 07:59:41 2018 +0200
@@ -27,8 +27,8 @@
  * $FreeBSD$
  */
 
-struct uboot_devdesc
-{
+/* Note: Must match the 'struct devdesc' in stand.h */
+struct uboot_devdesc {
 	struct devsw	*d_dev;
 	int		d_type;
 	int		d_unit;
diff -r 92fc8be96510 -r 4272f05ab956 usr/src/boot/sys/boot/zfs/libzfs.h
--- a/usr/src/boot/sys/boot/zfs/libzfs.h	Mon Feb 19 19:14:22 2018 +0200
+++ b/usr/src/boot/sys/boot/zfs/libzfs.h	Tue Mar 13 07:59:41 2018 +0200
@@ -33,12 +33,11 @@
 
 /*
  * ZFS fully-qualified device descriptor.
- * Note, this must match the 'struct devdesc' declaration in bootstrap.h.
  * Arch-specific device descriptors should be binary compatible with this
  * structure if they are to support ZFS.
  */
-struct zfs_devdesc
-{
+/* Note: Must match the 'struct devdesc' in stand.h */
+struct zfs_devdesc {
     struct devsw	*d_dev;
     int			d_type;
     int			d_unit;