diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/arc/include/disklabel.h | 52 | ||||
| -rw-r--r-- | sys/arch/i386/include/disklabel.h | 15 |
2 files changed, 35 insertions, 32 deletions
diff --git a/sys/arch/arc/include/disklabel.h b/sys/arch/arc/include/disklabel.h index 085272f8704..4e8c7c14161 100644 --- a/sys/arch/arc/include/disklabel.h +++ b/sys/arch/arc/include/disklabel.h @@ -1,5 +1,5 @@ -/* $OpenBSD: disklabel.h,v 1.5 1996/10/06 19:59:56 pefo Exp $ */ -/* $NetBSD: disklabel.h,v 1.2 1995/01/18 06:37:55 mellon Exp $ */ +/* $OpenBSD: disklabel.h,v 1.6 1997/04/10 13:06:25 deraadt Exp $ */ +/* $NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $ */ /* * Copyright (c) 1994 Christopher G. Demetriou @@ -34,41 +34,41 @@ #ifndef _MACHINE_DISKLABEL_H_ #define _MACHINE_DISKLABEL_H_ -#define LABELSECTOR 1 /* sector containing label */ -#define LABELOFFSET 0 /* offset of label in sector */ -#define MAXPARTITIONS 16 /* number of partitions */ -#define PARTITIONSHIFT 4 /* log2 */ -#define PARTITIONMASK 0xf -#define RAW_PART 2 /* raw partition: xx?c */ +#define LABELSECTOR 1 /* sector containing label */ +#define LABELOFFSET 0 /* offset of label in sector */ +#define MAXPARTITIONS 16 /* number of partitions */ +#define RAW_PART 2 /* raw partition: ie. rsd0c */ -/* DOS partition table -- used when the system is booted from a dos - * partition. This is the case on NT systems. - */ +/* DOS partition table -- located in boot block */ #define DOSBBSECTOR 0 /* DOS boot block relative sector # */ #define DOSPARTOFF 446 #define NDOSPART 4 struct dos_partition { - unsigned char dp_flag; /* bootstrap flags */ - unsigned char dp_shd; /* starting head */ - unsigned char dp_ssect; /* starting sector */ - unsigned char dp_scyl; /* starting cylinder */ - unsigned char dp_typ; /* partition type (see below) */ - unsigned char dp_ehd; /* end head */ - unsigned char dp_esect; /* end sector */ - unsigned char dp_ecyl; /* end cylinder */ - unsigned long dp_start; /* absolute starting sector number */ - unsigned long dp_size; /* partition size in sectors */ -} dos_partitions[NDOSPART]; + u_int8_t dp_flag; /* bootstrap flags */ + u_int8_t dp_shd; /* starting head */ + u_int8_t dp_ssect; /* starting sector */ + u_int8_t dp_scyl; /* starting cylinder */ + u_int8_t dp_typ; /* partition type (see below) */ + u_int8_t dp_ehd; /* end head */ + u_int8_t dp_esect; /* end sector */ + u_int8_t dp_ecyl; /* end cylinder */ + u_int32_t dp_start; /* absolute starting sector number */ + u_int32_t dp_size; /* partition size in sectors */ +}; /* Known DOS partition types. */ +#define DOSPTYP_UNUSED 0x00 /* Unused partition */ +#define DOSPTYP_FAT12 0x01 /* 12-bit FAT */ +#define DOSPTYP_FAT16S 0x04 /* 16-bit FAT, less than 32M */ +#define DOSPTYP_EXTEND 0x05 /* Extended; contains sub-partitions */ +#define DOSPTYP_FAT16B 0x06 /* 16-bit FAT, more than 32M */ +#define DOSPTYP_FAT16C 0x0e /* 16-bit FAT, CHS-mapped */ +#define DOSPTYP_ONTRACK 0x54 +#define DOSPTYP_LINUX 0x83 /* That other thing */ #define DOSPTYP_386BSD 0xa5 /* 386BSD partition type */ #define DOSPTYP_NETBSD DOSPTYP_386BSD /* NetBSD partition type (XXX) */ #define DOSPTYP_OPENBSD 0xa6 /* OpenBSD partition type */ -#define DOSPTYP_FAT12 0x1 -#define DOSPTYP_FAT16S 0x4 -#define DOSPTYP_FAT16B 0x6 -#define DOSPTYP_FAT16C 0xe #include <sys/dkbad.h> struct cpu_disklabel { diff --git a/sys/arch/i386/include/disklabel.h b/sys/arch/i386/include/disklabel.h index 0d9439a9c77..4868e912f53 100644 --- a/sys/arch/i386/include/disklabel.h +++ b/sys/arch/i386/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.8 1996/10/04 02:49:59 deraadt Exp $ */ +/* $OpenBSD: disklabel.h,v 1.9 1997/04/10 13:06:24 deraadt Exp $ */ /* $NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $ */ /* @@ -58,14 +58,17 @@ struct dos_partition { }; /* Known DOS partition types. */ +#define DOSPTYP_UNUSED 0x00 /* Unused partition */ +#define DOSPTYP_FAT12 0x01 /* 12-bit FAT */ +#define DOSPTYP_FAT16S 0x04 /* 16-bit FAT, less than 32M */ +#define DOSPTYP_EXTEND 0x05 /* Extended; contains sub-partitions */ +#define DOSPTYP_FAT16B 0x06 /* 16-bit FAT, more than 32M */ +#define DOSPTYP_FAT16C 0x0e /* 16-bit FAT, CHS-mapped */ +#define DOSPTYP_ONTRACK 0x54 +#define DOSPTYP_LINUX 0x83 /* That other thing */ #define DOSPTYP_386BSD 0xa5 /* 386BSD partition type */ #define DOSPTYP_NETBSD DOSPTYP_386BSD /* NetBSD partition type (XXX) */ #define DOSPTYP_OPENBSD 0xa6 /* OpenBSD partition type */ -#define DOSPTYP_FAT12 0x1 /* 12-bit FAT */ -#define DOSPTYP_FAT16S 0x4 /* 16-bit FAT, less than 32M */ -#define DOSPTYP_FAT16B 0x6 /* 16-bit FAT, more than 32M */ -#define DOSPTYP_FAT16C 0xe /* 16-bit FAT, CHS-mapped */ -#define DOSPTYP_ONTRACK 0x54 #include <sys/dkbad.h> struct cpu_disklabel { |