Merge in Lite2: use fixed-width types and reformat comments.
Reviewed by: davidg & bde
This commit is contained in:
Jeffrey Hsu
parent
0ab2567421
commit
5bc24578ca
|
|
@ -30,8 +30,8 @@
|
|||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)disklabel.h 8.1 (Berkeley) 6/2/93
|
||||
* $Id: disklabel.h,v 1.18 1995/11/24 14:50:39 bde Exp $
|
||||
* @(#)disklabel.h 8.2 (Berkeley) 7/10/94
|
||||
* $Id: disklabel.h,v 1.20 1996/02/24 05:21:50 hsu Exp $
|
||||
*/
|
||||
|
||||
#ifndef _SYS_DISKLABEL_H_
|
||||
|
|
@ -64,7 +64,7 @@
|
|||
#define LABELOFFSET 64 /* offset of label in sector */
|
||||
#endif
|
||||
|
||||
#define DISKMAGIC ((u_long) 0x82564557) /* The disk magic number */
|
||||
#define DISKMAGIC ((u_int32_t)0x82564557) /* The disk magic number */
|
||||
#ifndef MAXPARTITIONS
|
||||
#define MAXPARTITIONS 8
|
||||
#endif
|
||||
|
|
@ -75,11 +75,12 @@
|
|||
|
||||
#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" */
|
||||
/*
|
||||
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
|
||||
|
|
@ -88,7 +89,7 @@ struct disklabel {
|
|||
* getdiskbyname(3) to retrieve the values from /etc/disktab.
|
||||
*/
|
||||
#if defined(KERNEL) || defined(STANDALONE)
|
||||
char d_packname[16]; /* pack identifier */
|
||||
char d_packname[16]; /* pack identifier */
|
||||
#else
|
||||
union {
|
||||
char un_d_packname[16]; /* pack identifier */
|
||||
|
|
@ -101,71 +102,73 @@ struct disklabel {
|
|||
#define d_boot0 d_un.un_b.un_d_boot0
|
||||
#define d_boot1 d_un.un_b.un_d_boot1
|
||||
#endif /* ! KERNEL or STANDALONE */
|
||||
|
||||
/* 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 */
|
||||
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 */
|
||||
|
||||
/*
|
||||
* 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.
|
||||
* 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 */
|
||||
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.
|
||||
* Alternate cylinders include maintenance, replacement, configuration
|
||||
* description areas, etc.
|
||||
*/
|
||||
u_long d_acylinders; /* # of alt. cylinders per unit */
|
||||
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.
|
||||
* 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 */
|
||||
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 */
|
||||
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_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 */
|
||||
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
|
||||
|
|
@ -208,7 +211,7 @@ static char *dktypenames[] = {
|
|||
"HP-FL",
|
||||
"type 9",
|
||||
"floppy",
|
||||
0
|
||||
NULL
|
||||
};
|
||||
#define DKMAXTYPES (sizeof(dktypenames) / sizeof(dktypenames[0]) - 1)
|
||||
#endif
|
||||
|
|
@ -249,7 +252,7 @@ static char *fstypenames[] = {
|
|||
"HPFS",
|
||||
"ISO9660",
|
||||
"boot",
|
||||
0
|
||||
NULL
|
||||
};
|
||||
#define FSMAXTYPES (sizeof(fstypenames) / sizeof(fstypenames[0]) - 1)
|
||||
#endif
|
||||
|
|
@ -285,10 +288,8 @@ static char *fstypenames[] = {
|
|||
|
||||
#ifndef LOCORE
|
||||
/*
|
||||
* Structure used to perform a format
|
||||
* or other raw operation, returning data
|
||||
* and/or register values.
|
||||
* Register identification and format
|
||||
* 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 {
|
||||
|
|
@ -299,8 +300,8 @@ struct format_op {
|
|||
};
|
||||
|
||||
/*
|
||||
* Structure used internally to retrieve
|
||||
* information about a partition on a disk.
|
||||
* Structure used internally to retrieve information about a partition
|
||||
* on a disk.
|
||||
*/
|
||||
struct partinfo {
|
||||
struct disklabel *disklab;
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)disklabel.h 8.1 (Berkeley) 6/2/93
|
||||
* $Id: disklabel.h,v 1.18 1995/11/24 14:50:39 bde Exp $
|
||||
* @(#)disklabel.h 8.2 (Berkeley) 7/10/94
|
||||
* $Id: disklabel.h,v 1.20 1996/02/24 05:21:50 hsu Exp $
|
||||
*/
|
||||
|
||||
#ifndef _SYS_DISKLABEL_H_
|
||||
|
|
@ -64,7 +64,7 @@
|
|||
#define LABELOFFSET 64 /* offset of label in sector */
|
||||
#endif
|
||||
|
||||
#define DISKMAGIC ((u_long) 0x82564557) /* The disk magic number */
|
||||
#define DISKMAGIC ((u_int32_t)0x82564557) /* The disk magic number */
|
||||
#ifndef MAXPARTITIONS
|
||||
#define MAXPARTITIONS 8
|
||||
#endif
|
||||
|
|
@ -75,11 +75,12 @@
|
|||
|
||||
#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" */
|
||||
/*
|
||||
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
|
||||
|
|
@ -88,7 +89,7 @@ struct disklabel {
|
|||
* getdiskbyname(3) to retrieve the values from /etc/disktab.
|
||||
*/
|
||||
#if defined(KERNEL) || defined(STANDALONE)
|
||||
char d_packname[16]; /* pack identifier */
|
||||
char d_packname[16]; /* pack identifier */
|
||||
#else
|
||||
union {
|
||||
char un_d_packname[16]; /* pack identifier */
|
||||
|
|
@ -101,71 +102,73 @@ struct disklabel {
|
|||
#define d_boot0 d_un.un_b.un_d_boot0
|
||||
#define d_boot1 d_un.un_b.un_d_boot1
|
||||
#endif /* ! KERNEL or STANDALONE */
|
||||
|
||||
/* 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 */
|
||||
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 */
|
||||
|
||||
/*
|
||||
* 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.
|
||||
* 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 */
|
||||
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.
|
||||
* Alternate cylinders include maintenance, replacement, configuration
|
||||
* description areas, etc.
|
||||
*/
|
||||
u_long d_acylinders; /* # of alt. cylinders per unit */
|
||||
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.
|
||||
* 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 */
|
||||
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 */
|
||||
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_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 */
|
||||
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
|
||||
|
|
@ -208,7 +211,7 @@ static char *dktypenames[] = {
|
|||
"HP-FL",
|
||||
"type 9",
|
||||
"floppy",
|
||||
0
|
||||
NULL
|
||||
};
|
||||
#define DKMAXTYPES (sizeof(dktypenames) / sizeof(dktypenames[0]) - 1)
|
||||
#endif
|
||||
|
|
@ -249,7 +252,7 @@ static char *fstypenames[] = {
|
|||
"HPFS",
|
||||
"ISO9660",
|
||||
"boot",
|
||||
0
|
||||
NULL
|
||||
};
|
||||
#define FSMAXTYPES (sizeof(fstypenames) / sizeof(fstypenames[0]) - 1)
|
||||
#endif
|
||||
|
|
@ -285,10 +288,8 @@ static char *fstypenames[] = {
|
|||
|
||||
#ifndef LOCORE
|
||||
/*
|
||||
* Structure used to perform a format
|
||||
* or other raw operation, returning data
|
||||
* and/or register values.
|
||||
* Register identification and format
|
||||
* 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 {
|
||||
|
|
@ -299,8 +300,8 @@ struct format_op {
|
|||
};
|
||||
|
||||
/*
|
||||
* Structure used internally to retrieve
|
||||
* information about a partition on a disk.
|
||||
* Structure used internally to retrieve information about a partition
|
||||
* on a disk.
|
||||
*/
|
||||
struct partinfo {
|
||||
struct disklabel *disklab;
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)disklabel.h 8.1 (Berkeley) 6/2/93
|
||||
* $Id: disklabel.h,v 1.18 1995/11/24 14:50:39 bde Exp $
|
||||
* @(#)disklabel.h 8.2 (Berkeley) 7/10/94
|
||||
* $Id: disklabel.h,v 1.20 1996/02/24 05:21:50 hsu Exp $
|
||||
*/
|
||||
|
||||
#ifndef _SYS_DISKLABEL_H_
|
||||
|
|
@ -64,7 +64,7 @@
|
|||
#define LABELOFFSET 64 /* offset of label in sector */
|
||||
#endif
|
||||
|
||||
#define DISKMAGIC ((u_long) 0x82564557) /* The disk magic number */
|
||||
#define DISKMAGIC ((u_int32_t)0x82564557) /* The disk magic number */
|
||||
#ifndef MAXPARTITIONS
|
||||
#define MAXPARTITIONS 8
|
||||
#endif
|
||||
|
|
@ -75,11 +75,12 @@
|
|||
|
||||
#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" */
|
||||
/*
|
||||
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
|
||||
|
|
@ -88,7 +89,7 @@ struct disklabel {
|
|||
* getdiskbyname(3) to retrieve the values from /etc/disktab.
|
||||
*/
|
||||
#if defined(KERNEL) || defined(STANDALONE)
|
||||
char d_packname[16]; /* pack identifier */
|
||||
char d_packname[16]; /* pack identifier */
|
||||
#else
|
||||
union {
|
||||
char un_d_packname[16]; /* pack identifier */
|
||||
|
|
@ -101,71 +102,73 @@ struct disklabel {
|
|||
#define d_boot0 d_un.un_b.un_d_boot0
|
||||
#define d_boot1 d_un.un_b.un_d_boot1
|
||||
#endif /* ! KERNEL or STANDALONE */
|
||||
|
||||
/* 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 */
|
||||
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 */
|
||||
|
||||
/*
|
||||
* 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.
|
||||
* 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 */
|
||||
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.
|
||||
* Alternate cylinders include maintenance, replacement, configuration
|
||||
* description areas, etc.
|
||||
*/
|
||||
u_long d_acylinders; /* # of alt. cylinders per unit */
|
||||
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.
|
||||
* 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 */
|
||||
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 */
|
||||
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_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 */
|
||||
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
|
||||
|
|
@ -208,7 +211,7 @@ static char *dktypenames[] = {
|
|||
"HP-FL",
|
||||
"type 9",
|
||||
"floppy",
|
||||
0
|
||||
NULL
|
||||
};
|
||||
#define DKMAXTYPES (sizeof(dktypenames) / sizeof(dktypenames[0]) - 1)
|
||||
#endif
|
||||
|
|
@ -249,7 +252,7 @@ static char *fstypenames[] = {
|
|||
"HPFS",
|
||||
"ISO9660",
|
||||
"boot",
|
||||
0
|
||||
NULL
|
||||
};
|
||||
#define FSMAXTYPES (sizeof(fstypenames) / sizeof(fstypenames[0]) - 1)
|
||||
#endif
|
||||
|
|
@ -285,10 +288,8 @@ static char *fstypenames[] = {
|
|||
|
||||
#ifndef LOCORE
|
||||
/*
|
||||
* Structure used to perform a format
|
||||
* or other raw operation, returning data
|
||||
* and/or register values.
|
||||
* Register identification and format
|
||||
* 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 {
|
||||
|
|
@ -299,8 +300,8 @@ struct format_op {
|
|||
};
|
||||
|
||||
/*
|
||||
* Structure used internally to retrieve
|
||||
* information about a partition on a disk.
|
||||
* Structure used internally to retrieve information about a partition
|
||||
* on a disk.
|
||||
*/
|
||||
struct partinfo {
|
||||
struct disklabel *disklab;
|
||||
|
|
|
|||
Loading…
Reference in New Issue