aboutsummaryrefslogtreecommitdiff
path: root/sys/sys/diskmbr.h
diff options
context:
space:
mode:
authorMarcel Moolenaar <marcel@FreeBSD.org>2016-10-16 02:43:51 +0000
committerMarcel Moolenaar <marcel@FreeBSD.org>2016-10-16 02:43:51 +0000
commit50875ed2c1b04e9a7316a6677c368f615169ef86 (patch)
tree8a5814ed19072525825784c60ada702c8a271c11 /sys/sys/diskmbr.h
parent9ffbf09f2f8f86e6f52aea78dec1a009a14657b3 (diff)
downloadsrc-50875ed2c1b04e9a7316a6677c368f615169ef86.tar.gz
src-50875ed2c1b04e9a7316a6677c368f615169ef86.zip
Re-apply change 306811 or alternatively, revert change 307385.
Notes
Notes: svn path=/head/; revision=307386
Diffstat (limited to 'sys/sys/diskmbr.h')
-rw-r--r--sys/sys/diskmbr.h49
1 files changed, 1 insertions, 48 deletions
diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h
index 5f49eb9e8d06..deed3399a0f8 100644
--- a/sys/sys/diskmbr.h
+++ b/sys/sys/diskmbr.h
@@ -33,59 +33,12 @@
#ifndef _SYS_DISKMBR_H_
#define _SYS_DISKMBR_H_
+#include <sys/disk/mbr.h>
#include <sys/ioccom.h>
-#define DOSBBSECTOR 0 /* DOS boot block relative sector number */
-#define DOSDSNOFF 440 /* WinNT/2K/XP Drive Serial Number offset */
-#define DOSPARTOFF 446
-#define DOSPARTSIZE 16
-#define NDOSPART 4
-#define NEXTDOSPART 32
-#define DOSMAGICOFFSET 510
-#define DOSMAGIC 0xAA55
-
-#define DOSPTYP_EXT 0x05 /* DOS extended partition */
-#define DOSPTYP_FAT16 0x06 /* FAT16 partition */
-#define DOSPTYP_NTFS 0x07 /* NTFS partition */
-#define DOSPTYP_FAT32 0x0b /* FAT32 partition */
-#define DOSPTYP_EXTLBA 0x0f /* DOS extended partition */
-#define DOSPTYP_PPCBOOT 0x41 /* PReP/CHRP boot partition */
-#define DOSPTYP_LDM 0x42 /* Win2k dynamic extended partition */
-#define DOSPTYP_LINSWP 0x82 /* Linux swap partition */
-#define DOSPTYP_LINUX 0x83 /* Linux partition */
-#define DOSPTYP_LINLVM 0x8e /* Linux LVM partition */
-#define DOSPTYP_386BSD 0xa5 /* 386BSD partition type */
-#define DOSPTYP_APPLE_UFS 0xa8 /* Apple Mac OS X boot */
-#define DOSPTYP_APPLE_BOOT 0xab /* Apple Mac OS X UFS */
-#define DOSPTYP_HFS 0xaf /* HFS/HFS+ partition type */
-#define DOSPTYP_PMBR 0xee /* GPT Protective MBR */
-#define DOSPTYP_EFI 0xef /* EFI FAT parition */
-#define DOSPTYP_VMFS 0xfb /* VMware VMFS partition */
-#define DOSPTYP_VMKDIAG 0xfc /* VMware vmkDiagnostic partition */
-#define DOSPTYP_LINRAID 0xfd /* Linux raid partition */
-
-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 */
- unsigned char dp_ehd; /* end head */
- unsigned char dp_esect; /* end sector */
- unsigned char dp_ecyl; /* end cylinder */
- u_int32_t dp_start; /* absolute starting sector number */
- u_int32_t dp_size; /* partition size in sectors */
-};
-#ifdef CTASSERT
-CTASSERT(sizeof (struct dos_partition) == DOSPARTSIZE);
-#endif
-
void dos_partition_dec(void const *pp, struct dos_partition *d);
void dos_partition_enc(void *pp, struct dos_partition *d);
-#define DPSECT(s) ((s) & 0x3f) /* isolate relevant bits of sector */
-#define DPCYL(c, s) ((c) + (((s) & 0xc0)<<2)) /* and those that are cylinder */
-
#define DIOCSMBR _IOW('M', 129, u_char[512])
#endif /* !_SYS_DISKMBR_H_ */