From 6fcba07ce4854093c63bb66e9c1a56671c9778ba Mon Sep 17 00:00:00 2001 From: pk Date: Wed, 3 Jul 1996 22:38:37 +0000 Subject: [PATCH] Update. --- sbin/disklabel/disklabel.5 | 241 +++++++++++++++++++++---------------- 1 file changed, 134 insertions(+), 107 deletions(-) diff --git a/sbin/disklabel/disklabel.5 b/sbin/disklabel/disklabel.5 index 1dcc22cd1c9c..b26ef7ac9eef 100644 --- a/sbin/disklabel/disklabel.5 +++ b/sbin/disklabel/disklabel.5 @@ -1,4 +1,4 @@ -.\" $NetBSD: disklabel.5,v 1.3 1995/03/18 14:54:36 cgd Exp $ +.\" $NetBSD: disklabel.5,v 1.4 1996/07/03 22:38:37 pk Exp $ .\" .\" Copyright (c) 1987, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -104,131 +104,145 @@ All of these operations are normally done using .Xr disklabel . .Pp The format of the disk label, as specified in -.Aw Pa sys/disklabel.h , +.Pa sys/disklabel.h , is .Bd -literal /* -* Disk description table, see disktab(5) -*/ -#define DISKTAB "/etc/disktab" + * Disk description table, see disktab(5) + */ +#define _PATH_DISKTAB "/etc/disktab" /* -* Each disk has a label which includes information about the hardware -* disk geometry, filesystem partitions, and drive specific information. -* The label is in block 0 or 1, possibly offset from the beginning -* to leave room for a bootstrap, etc. -*/ + * Each disk has a label which includes information about the hardware + * disk geometry, filesystem partitions, and drive specific information. + * The location of the label, as well as the number of partitions the + * label can describe and the number of the "whole disk" (raw) + * paritition are machine dependent. + */ +#include -#ifndef LABELSECTOR -#define LABELSECTOR 0 /* sector containing label */ +/* + * The absolute maximum number of disk partitions allowed. + * This is the maximum value of MAXPARTITIONS for which 'struct disklabel' + * is <= DEV_BSIZE bytes long. If MAXPARTITIONS is greater than this, beware. + */ +#define MAXMAXPARTITIONS 22 +#if MAXPARTITIONS > MAXMAXPARTITIONS +#warn beware: MAXPARTITIONS bigger than MAXMAXPARTITIONS #endif -#ifndef LABELOFFSET -#define LABELOFFSET 64 /* offset of label in sector */ -#endif -#define DISKMAGIC ((u_long) 0x82564557) /* The disk magic number */ -#ifndef MAXPARTITIONS -#define MAXPARTITIONS 8 -#endif +#define DISKMAGIC ((u_int32_t) 0x82564557) /* The disk magic number */ -#ifndef LOCORE +#ifndef _LOCORE struct disklabel { - u_long d_magic; /* the magic number */ - short d_type; /* drive type */ - short d_subtype; /* controller/d_type specific */ - char d_typename[16]; /* type name, e.g. "eagle" */ - /* - * d_packname contains the pack identifier and is returned when - * the disklabel is read off the disk or in-core copy. - * d_boot0 and d_boot1 are the (optional) names of the - * primary (block 0) and secondary (block 1-15) bootstraps - * as found in /usr/mdec. These are returned when using - * getdiskbyname(3) - to retrieve the values from /etc/disktab. - */ + u_int32_t d_magic; /* the magic number */ + u_int16_t d_type; /* drive type */ + u_int16_t d_subtype; /* controller/d_type specific */ + char d_typename[16]; /* type name, e.g. "eagle" */ + + /* + * d_packname contains the pack identifier and is returned when + * the disklabel is read off the disk or in-core copy. + * d_boot0 and d_boot1 are the (optional) names of the + * primary (block 0) and secondary (block 1-15) bootstraps + * as found in /usr/mdec. These are returned when using + * getdiskbyname(3) to retrieve the values from /etc/disktab. + */ union { - char un_d_packname[16]; /* pack identifier */ + char un_d_packname[16]; /* pack identifier */ struct { char *un_d_boot0; /* primary bootstrap name */ char *un_d_boot1; /* secondary bootstrap name */ - } un_b; - } d_un; + } un_b; + } d_un; #define d_packname d_un.un_d_packname #define d_boot0 d_un.un_b.un_d_boot0 #define d_boot1 d_un.un_b.un_d_boot1 - /* disk geometry: */ - u_long d_secsize; /* # of bytes per sector */ - u_long d_nsectors; /* # of data sectors per track */ - u_long d_ntracks; /* # of tracks per cylinder */ - u_long d_ncylinders; /* # of data cylinders per unit */ - u_long d_secpercyl; /* # of data sectors per cylinder */ - u_long d_secperunit; /* # of data sectors per unit */ - /* - * Spares (bad sector replacements) below - * are not counted in d_nsectors or d_secpercyl. - * Spare sectors are assumed to be physical sectors - * which occupy space at the end of each track and/or cylinder. - */ - u_short d_sparespertrack; /* # of spare sectors per track */ - u_short d_sparespercyl; /* # of spare sectors per cylinder */ - /* - * Alternate cylinders include maintenance, replacement, - * configuration description areas, etc. - */ - u_long d_acylinders; /* # of alt. cylinders per unit */ + /* disk geometry: */ + u_int32_t d_secsize; /* # of bytes per sector */ + u_int32_t d_nsectors; /* # of data sectors per track */ + u_int32_t d_ntracks; /* # of tracks per cylinder */ + u_int32_t d_ncylinders; /* # of data cylinders per unit */ + u_int32_t d_secpercyl; /* # of data sectors per cylinder */ + u_int32_t d_secperunit; /* # of data sectors per unit */ - /* hardware characteristics: */ /* - * d_interleave, d_trackskew and d_cylskew describe perturbations - * in the media format used to compensate for a slow controller. - * Interleave is physical sector interleave, set up by the formatter - * or controller when formatting. When interleaving is in use, - * logically adjacent sectors are not physically contiguous, - * but instead are separated by some number of sectors. - * It is specified as the ratio of physical sectors traversed - * per logical sector. Thus an interleave of 1:1 implies contiguous - * layout, while 2:1 implies that logical sector 0 is separated - * by one sector from logical sector 1. - * d_trackskew is the offset of sector 0 on track N - * relative to sector 0 on track N-1 on the same cylinder. - * Finally, d_cylskew is the offset of sector 0 on cylinder N - * relative to sector 0 on cylinder N-1. - */ - u_short d_rpm; /* rotational speed */ - u_short d_interleave; /* hardware sector interleave */ - u_short d_trackskew; /* sector 0 skew, per track */ - u_short d_cylskew; /* sector 0 skew, per cylinder */ - u_long d_headswitch; /* head switch time, usec */ - u_long d_trkseek; /* track-to-track seek, usec */ - u_long d_flags; /* generic flags */ + * Spares (bad sector replacements) below are not counted in + * d_nsectors or d_secpercyl. Spare sectors are assumed to + * be physical sectors which occupy space at the end of each + * track and/or cylinder. + */ + u_int16_t d_sparespertrack; /* # of spare sectors per track */ + u_int16_t d_sparespercyl; /* # of spare sectors per cylinder */ + /* + * Alternate cylinders include maintenance, replacement, configuration + * description areas, etc. + */ + u_int32_t d_acylinders; /* # of alt. cylinders per unit */ + + /* hardware characteristics: */ + /* + * d_interleave, d_trackskew and d_cylskew describe perturbations + * in the media format used to compensate for a slow controller. + * Interleave is physical sector interleave, set up by the + * formatter or controller when formatting. When interleaving is + * in use, logically adjacent sectors are not physically + * contiguous, but instead are separated by some number of + * sectors. It is specified as the ratio of physical sectors + * traversed per logical sector. Thus an interleave of 1:1 + * implies contiguous layout, while 2:1 implies that logical + * sector 0 is separated by one sector from logical sector 1. + * d_trackskew is the offset of sector 0 on track N relative to + * sector 0 on track N-1 on the same cylinder. Finally, d_cylskew + * is the offset of sector 0 on cylinder N relative to sector 0 + * on cylinder N-1. + */ + u_int16_t d_rpm; /* rotational speed */ + u_int16_t d_interleave; /* hardware sector interleave */ + u_int16_t d_trackskew; /* sector 0 skew, per track */ + u_int16_t d_cylskew; /* sector 0 skew, per cylinder */ + u_int32_t d_headswitch; /* head switch time, usec */ + u_int32_t d_trkseek; /* track-to-track seek, usec */ + u_int32_t d_flags; /* generic flags */ #define NDDATA 5 - u_long d_drivedata[NDDATA]; /* drive-type specific information */ + u_int32_t d_drivedata[NDDATA]; /* drive-type specific information */ #define NSPARE 5 - u_long d_spare[NSPARE]; /* reserved for future use */ - u_long d_magic2; /* the magic number (again) */ - u_short d_checksum; /* xor of data incl. partitions */ + u_int32_t d_spare[NSPARE]; /* reserved for future use */ + u_int32_t d_magic2; /* the magic number (again) */ + u_int16_t d_checksum; /* xor of data incl. partitions */ - /* filesystem and partition information: */ - u_short d_npartitions; /* number of partitions in following */ - u_long d_bbsize; /* size of boot area at sn0, bytes */ - u_long d_sbsize; /* max size of fs superblock, bytes */ - struct partition { /* the partition table */ - u_long p_size; /* number of sectors in partition */ - u_long p_offset; /* starting sector */ - u_long p_fsize; /* filesystem basic fragment size */ - u_char p_fstype; /* filesystem type, see below */ - u_char p_frag; /* filesystem fragments per block */ + /* filesystem and partition information: */ + u_int16_t d_npartitions; /* number of partitions in following */ + u_int32_t d_bbsize; /* size of boot area at sn0, bytes */ + u_int32_t d_sbsize; /* max size of fs superblock, bytes */ + struct partition { /* the partition table */ + u_int32_t p_size; /* number of sectors in partition */ + u_int32_t p_offset; /* starting sector */ + u_int32_t p_fsize; /* filesystem basic fragment size */ + u_int8_t p_fstype; /* filesystem type, see below */ + u_int8_t p_frag; /* filesystem fragments per block */ union { - u_short cpg; /* UFS: FS cylinders per group */ - u_short sgs; /* LFS: FS segment shift */ + u_int16_t cpg; /* UFS: FS cylinders per group */ + u_int16_t sgs; /* LFS: FS segment shift */ } __partition_u1; #define p_cpg __partition_u1.cpg #define p_sgs __partition_u1.sgs - u_short p_cpg; /* filesystem cylinders per group */ } d_partitions[MAXPARTITIONS]; /* actually may be more */ }; +#else /* _LOCORE */ + /* + * offsets for asm boot files. + */ + .set d_secsize,40 + .set d_nsectors,44 + .set d_ntracks,48 + .set d_ncylinders,52 + .set d_secpercyl,56 + .set d_secperunit,60 + .set d_end_,276 /* size of disk label */ +#endif /* _LOCORE */ /* d_type values: */ #define DTYPE_SMD 1 /* SMD, XSMD; VAX hp/up */ @@ -240,6 +254,8 @@ struct disklabel { #define DTYPE_HPIB 7 /* CS/80 on HP-IB */ #define DTYPE_HPFL 8 /* HP Fiber-link */ #define DTYPE_FLOPPY 10 /* floppy */ +#define DTYPE_CCD 11 /* concatenated disk device */ +#define DTYPE_VND 12 /* vnode pseudo-disk */ #ifdef DKTYPENAMES static char *dktypenames[] = { @@ -254,6 +270,8 @@ static char *dktypenames[] = { "HP-FL", "type 9", "floppy", + "ccd", + "vnd", 0 }; #define DKMAXTYPES (sizeof(dktypenames) / sizeof(dktypenames[0]) - 1) @@ -278,6 +296,9 @@ static char *dktypenames[] = { #define FS_HPFS 11 /* OS/2 high-performance file system */ #define FS_ISO9660 12 /* ISO 9660, normally CD-ROM */ #define FS_BOOT 13 /* partition contains bootstrap */ +#define FS_ADOS 14 /* AmigaDOS fast file system */ +#define FS_HFS 15 /* Macintosh HFS */ +#define FS_ADFS 16 /* Acorn Disk Filing System */ #ifdef DKTYPENAMES static char *fstypenames[] = { @@ -295,6 +316,9 @@ static char *fstypenames[] = { "HPFS", "ISO9660", "boot", + "ADOS", + "HFS", + "ADFS", 0 }; #define FSMAXTYPES (sizeof(fstypenames) / sizeof(fstypenames[0]) - 1) @@ -330,14 +354,12 @@ static char *fstypenames[] = { */ #define d_blind d_drivedata[0] -#ifndef LOCORE +#ifndef _LOCORE /* -* Structure used to perform a format -* or other raw operation, returning data -* and/or register values. -* Register identification and format -* are device- and driver-dependent. -*/ + * Structure used to perform a format or other raw operation, + * returning data and/or register values. Register identification + * and format are device- and driver-dependent. + */ struct format_op { char *df_buf; int df_count; /* value-result */ @@ -353,17 +375,22 @@ struct partinfo { struct disklabel *disklab; struct partition *part; }; +.Ed +.Pp +Disk specific ioctls ar defined in +.Pa sys/dkio.h . +.Bd -literal /* -* Disk-specific ioctls. -*/ + * Disk-specific ioctls. + */ /* get and set disklabel; DIOCGPART used internally */ #define DIOCGDINFO _IOR('d', 101, struct disklabel) /* get */ #define DIOCSDINFO _IOW('d', 102, struct disklabel) /* set */ #define DIOCWDINFO _IOW('d', 103, struct disklabel) /* set, update disk */ #define DIOCGPART _IOW('d', 104, struct partinfo) /* get partition */ -/* do format operation, read or write */ + /* do format operation, read or write */ #define DIOCRFORMAT _IOWR('d', 105, struct format_op) #define DIOCWFORMAT _IOWR('d', 106, struct format_op) @@ -373,7 +400,7 @@ struct partinfo { #define DIOCSBAD _IOW('d', 110, struct dkbad) /* set kernel dkbad */ -#endif LOCORE +#endif _LOCORE .Ed .Sh SEE ALSO .Xr disktab 5 ,