From 34b53ae56c44ba8ecd5afe7c1af1ca0a075d9f19 Mon Sep 17 00:00:00 2001
From: Toomas Soome <tsoome@me.com>
Date: Tue, 13 Mar 2018 07:59:41 +0200
Subject: [PATCH] loader: Minor cosmetic changes.

illumos issue #9272
---
 usr/src/boot/lib/libstand/stand.h            | 15 +++++++--------
 usr/src/boot/sys/boot/common/disk.h          |  4 ++--
 usr/src/boot/sys/boot/i386/libi386/libi386.h |  8 +++-----
 usr/src/boot/sys/boot/ofw/libofw/libofw.h    |  2 +-
 usr/src/boot/sys/boot/uboot/lib/libuboot.h   |  4 ++--
 usr/src/boot/sys/boot/zfs/libzfs.h           |  5 ++---
 6 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/usr/src/boot/lib/libstand/stand.h b/usr/src/boot/lib/libstand/stand.h
index c445d684a1..915302b0f5 100644
--- a/usr/src/boot/lib/libstand/stand.h
+++ b/usr/src/boot/lib/libstand/stand.h
@@ -137,6 +137,12 @@ extern struct fs_ops pkgfs_fsops;
 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 @@ extern int errno;
  * 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 --git a/usr/src/boot/sys/boot/common/disk.h b/usr/src/boot/sys/boot/common/disk.h
index 4f1666b1b7..0de50a1763 100644
--- a/usr/src/boot/sys/boot/common/disk.h
+++ b/usr/src/boot/sys/boot/common/disk.h
@@ -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 --git a/usr/src/boot/sys/boot/i386/libi386/libi386.h b/usr/src/boot/sys/boot/i386/libi386/libi386.h
index d0ed92115e..65bbd9b5d8 100644
--- a/usr/src/boot/sys/boot/i386/libi386/libi386.h
+++ b/usr/src/boot/sys/boot/i386/libi386/libi386.h
@@ -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 --git a/usr/src/boot/sys/boot/ofw/libofw/libofw.h b/usr/src/boot/sys/boot/ofw/libofw/libofw.h
index 87e90959c9..9845e03399 100644
--- a/usr/src/boot/sys/boot/ofw/libofw/libofw.h
+++ b/usr/src/boot/sys/boot/ofw/libofw/libofw.h
@@ -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 --git a/usr/src/boot/sys/boot/uboot/lib/libuboot.h b/usr/src/boot/sys/boot/uboot/lib/libuboot.h
index e4201d8a13..384e03789f 100644
--- a/usr/src/boot/sys/boot/uboot/lib/libuboot.h
+++ b/usr/src/boot/sys/boot/uboot/lib/libuboot.h
@@ -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 --git a/usr/src/boot/sys/boot/zfs/libzfs.h b/usr/src/boot/sys/boot/zfs/libzfs.h
index d08f76e569..05d1620425 100644
--- a/usr/src/boot/sys/boot/zfs/libzfs.h
+++ b/usr/src/boot/sys/boot/zfs/libzfs.h
@@ -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;
-- 
2.11.4.GIT