* include/grub/bsdlabel.h: Use enums.

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-05 10:33:53 +02:00
parent 0467a5ddf0
commit 98b23b9519
2 changed files with 48 additions and 32 deletions

View file

@ -1,3 +1,7 @@
2013-04-05 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/bsdlabel.h: Use enums.
2013-04-05 Vladimir Serbinenko <phcoder@gmail.com> 2013-04-05 Vladimir Serbinenko <phcoder@gmail.com>
Move GRUB_CHAR_BIT to types.h. Move GRUB_CHAR_BIT to types.h.

View file

@ -24,44 +24,56 @@
#define GRUB_PC_PARTITION_BSD_LABEL_MAGIC 0x82564557 #define GRUB_PC_PARTITION_BSD_LABEL_MAGIC 0x82564557
/* BSD partition types. */ /* BSD partition types. */
#define GRUB_PC_PARTITION_BSD_TYPE_UNUSED 0 enum
#define GRUB_PC_PARTITION_BSD_TYPE_SWAP 1 {
#define GRUB_PC_PARTITION_BSD_TYPE_V6 2 GRUB_PC_PARTITION_BSD_TYPE_UNUSED = 0,
#define GRUB_PC_PARTITION_BSD_TYPE_V7 3 GRUB_PC_PARTITION_BSD_TYPE_SWAP = 1,
#define GRUB_PC_PARTITION_BSD_TYPE_SYSV 4 GRUB_PC_PARTITION_BSD_TYPE_V6 = 2,
#define GRUB_PC_PARTITION_BSD_TYPE_V71K 5 GRUB_PC_PARTITION_BSD_TYPE_V7 = 3,
#define GRUB_PC_PARTITION_BSD_TYPE_V8 6 GRUB_PC_PARTITION_BSD_TYPE_SYSV = 4,
#define GRUB_PC_PARTITION_BSD_TYPE_BSDFFS 7 GRUB_PC_PARTITION_BSD_TYPE_V71K = 5,
#define GRUB_PC_PARTITION_BSD_TYPE_MSDOS 8 GRUB_PC_PARTITION_BSD_TYPE_V8 = 6,
#define GRUB_PC_PARTITION_BSD_TYPE_BSDLFS 9 GRUB_PC_PARTITION_BSD_TYPE_BSDFFS = 7,
#define GRUB_PC_PARTITION_BSD_TYPE_OTHER 10 GRUB_PC_PARTITION_BSD_TYPE_MSDOS = 8,
#define GRUB_PC_PARTITION_BSD_TYPE_HPFS 11 GRUB_PC_PARTITION_BSD_TYPE_BSDLFS = 9,
#define GRUB_PC_PARTITION_BSD_TYPE_ISO9660 12 GRUB_PC_PARTITION_BSD_TYPE_OTHER = 10,
#define GRUB_PC_PARTITION_BSD_TYPE_BOOT 13 GRUB_PC_PARTITION_BSD_TYPE_HPFS = 11,
GRUB_PC_PARTITION_BSD_TYPE_ISO9660 = 12,
GRUB_PC_PARTITION_BSD_TYPE_BOOT = 13
};
/* FreeBSD-specific types. */ /* FreeBSD-specific types. */
#define GRUB_PC_PARTITION_FREEBSD_TYPE_VINUM 14 enum
#define GRUB_PC_PARTITION_FREEBSD_TYPE_RAID 15 {
#define GRUB_PC_PARTITION_FREEBSD_TYPE_JFS2 21 GRUB_PC_PARTITION_FREEBSD_TYPE_VINUM = 14,
GRUB_PC_PARTITION_FREEBSD_TYPE_RAID = 15,
GRUB_PC_PARTITION_FREEBSD_TYPE_JFS2 = 21
};
/* NetBSD-specific types. */ /* NetBSD-specific types. */
#define GRUB_PC_PARTITION_NETBSD_TYPE_ADOS 14 enum
#define GRUB_PC_PARTITION_NETBSD_TYPE_HFS 15 {
#define GRUB_PC_PARTITION_NETBSD_TYPE_FILECORE 16 GRUB_PC_PARTITION_NETBSD_TYPE_ADOS = 14,
#define GRUB_PC_PARTITION_NETBSD_TYPE_EXT2FS 17 GRUB_PC_PARTITION_NETBSD_TYPE_HFS = 15,
#define GRUB_PC_PARTITION_NETBSD_TYPE_NTFS 18 GRUB_PC_PARTITION_NETBSD_TYPE_FILECORE = 16,
#define GRUB_PC_PARTITION_NETBSD_TYPE_RAID 19 GRUB_PC_PARTITION_NETBSD_TYPE_EXT2FS = 17,
#define GRUB_PC_PARTITION_NETBSD_TYPE_CCD 20 GRUB_PC_PARTITION_NETBSD_TYPE_NTFS = 18,
#define GRUB_PC_PARTITION_NETBSD_TYPE_JFS2 21 GRUB_PC_PARTITION_NETBSD_TYPE_RAID = 19,
#define GRUB_PC_PARTITION_NETBSD_TYPE_APPLEUFS 22 GRUB_PC_PARTITION_NETBSD_TYPE_CCD = 20,
GRUB_PC_PARTITION_NETBSD_TYPE_JFS2 = 21,
GRUB_PC_PARTITION_NETBSD_TYPE_APPLEUFS = 22
};
/* OpenBSD-specific types. */ /* OpenBSD-specific types. */
#define GRUB_PC_PARTITION_OPENBSD_TYPE_ADOS 14 enum
#define GRUB_PC_PARTITION_OPENBSD_TYPE_HFS 15 {
#define GRUB_PC_PARTITION_OPENBSD_TYPE_FILECORE 16 GRUB_PC_PARTITION_OPENBSD_TYPE_ADOS = 14,
#define GRUB_PC_PARTITION_OPENBSD_TYPE_EXT2FS 17 GRUB_PC_PARTITION_OPENBSD_TYPE_HFS = 15,
#define GRUB_PC_PARTITION_OPENBSD_TYPE_NTFS 18 GRUB_PC_PARTITION_OPENBSD_TYPE_FILECORE = 16,
#define GRUB_PC_PARTITION_OPENBSD_TYPE_RAID 19 GRUB_PC_PARTITION_OPENBSD_TYPE_EXT2FS = 17,
GRUB_PC_PARTITION_OPENBSD_TYPE_NTFS = 18,
GRUB_PC_PARTITION_OPENBSD_TYPE_RAID = 19
};
#define GRUB_PC_PARTITION_BSD_LABEL_WHOLE_DISK_PARTITION 2 #define GRUB_PC_PARTITION_BSD_LABEL_WHOLE_DISK_PARTITION 2