Mercurial > unleashed > prev-conversion
changeset 18824:4272f05ab956
loader: Minor cosmetic changes.
illumos issue #9272
| author | Toomas Soome <tsoome@me.com> |
|---|---|
| date | Tue, 13 Mar 2018 07:59:41 +0200 |
| parents | 92fc8be96510 |
| children | 2ed7ea649fe9 |
| files | usr/src/boot/lib/libstand/stand.h usr/src/boot/sys/boot/common/disk.h usr/src/boot/sys/boot/i386/libi386/libi386.h usr/src/boot/sys/boot/ofw/libofw/libofw.h usr/src/boot/sys/boot/uboot/lib/libuboot.h usr/src/boot/sys/boot/zfs/libzfs.h |
| diffstat | 6 files changed, 17 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- 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; };
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;