* partmap/pc.c: Rename to ...
* partmap/msdos.c: ... this. Update all users.
(grub_pc_partition_map): Rename to ...
(grub_msdos_partition_map): ... this. Update all users.
* parttool/pcpart.c: Rename to ...
* parttool/msdospart.c: ... this. Update all users.
* include/grub/pc_partition.h: Rename to ...
* include/grub/msdos_partition.h: ... this. Update all users.
(grub_pc_partition_bsd_entry): Rename to ...
(grub_msdos_partition_bsd_entry): ... this. Update all users.
(grub_pc_partition_disk_label): Rename to ...
(grub_msdos_partition_disk_label): ... this. Update all users.
(grub_pc_partition_entry): Rename to ...
(grub_msdos_partition_entry): ... this. Update all users.
(grub_pc_partition_mbr): Rename to ...
(grub_msdos_partition_mbr): ... this. Update all users.
(grub_pc_partition): Rename to ...
(grub_msdos_partition): ... this. Update all users.
(grub_pc_partition_is_empty): Rename to ...
(grub_msdos_partition_is_empty): ... this. Update all users.
(grub_pc_partition_is_extended): Rename to ...
(grub_msdos_partition_is_extended): ... this. Update all users.
(grub_pc_partition_is_bsd): Rename to ...
(grub_msdos_partition_is_bsd): ... this. Update all users.
* conf/common.rmk (amiga_mod_SOURCES, amiga_mod_CFLAGS)
(amiga_mod_LDFLAGS, apple_mod_SOURCES, apple_mod_CFLAGS)
(apple_mod_LDFLAGS, msdos_mod_SOURCES, msdos_mod_CFLAGS)
(msdos_mod_LDFLAGS, sun_mod_SOURCES, sun_mod_CFLAGS)
(sun_mod_LDFLAGS, acorn_mod_SOURCES, acorn_mod_CFLAGS)
(acorn_mod_LDFLAGS, gpt_mod_SOURCES, gpt_mod_CFLAGS)
(gpt_mod_LDFLAGS): Rename to ...
(part_amiga_mod_SOURCES, part_amiga_mod_CFLAGS, part_amiga_mod_LDFLAGS)
(part_apple_mod_SOURCES, part_apple_mod_CFLAGS, part_apple_mod_LDFLAGS)
(part_msdos_mod_SOURCES, part_msdos_mod_CFLAGS, part_msdos_mod_LDFLAGS)
(part_sun_mod_SOURCES, part_sun_mod_CFLAGS, part_sun_mod_LDFLAGS)
(part_acorn_mod_SOURCES, part_acorn_mod_CFLAGS, part_acorn_mod_LDFLAGS)
(part_gpt_mod_SOURCES, part_gpt_mod_CFLAGS)
(part_gpt_mod_LDFLAGS): ... this.
(pkglib_MODULES): Prefix partition modules with `part_'. Rename
`pcpart.mod' to `msdospart.mod'.
(pcpart_mod_SOURCES, pcpart_mod_CFLAGS, pcpart_mod_LDFLAGS): Rename
to ...
(msdospart_mod_SOURCES, msdospart_mod_CFLAGS)
(msdospart_mod_LDFLAGS): ... this.
+2009-08-23 Robert Millan <rmh.grub@aybabtu.com>
+
+ * partmap/pc.c: Rename to ...
+ * partmap/msdos.c: ... this. Update all users.
+ (grub_pc_partition_map): Rename to ...
+ (grub_msdos_partition_map): ... this. Update all users.
+
+ * parttool/pcpart.c: Rename to ...
+ * parttool/msdospart.c: ... this. Update all users.
+
+ * include/grub/pc_partition.h: Rename to ...
+ * include/grub/msdos_partition.h: ... this. Update all users.
+ (grub_pc_partition_bsd_entry): Rename to ...
+ (grub_msdos_partition_bsd_entry): ... this. Update all users.
+ (grub_pc_partition_disk_label): Rename to ...
+ (grub_msdos_partition_disk_label): ... this. Update all users.
+ (grub_pc_partition_entry): Rename to ...
+ (grub_msdos_partition_entry): ... this. Update all users.
+ (grub_pc_partition_mbr): Rename to ...
+ (grub_msdos_partition_mbr): ... this. Update all users.
+ (grub_pc_partition): Rename to ...
+ (grub_msdos_partition): ... this. Update all users.
+ (grub_pc_partition_is_empty): Rename to ...
+ (grub_msdos_partition_is_empty): ... this. Update all users.
+ (grub_pc_partition_is_extended): Rename to ...
+ (grub_msdos_partition_is_extended): ... this. Update all users.
+ (grub_pc_partition_is_bsd): Rename to ...
+ (grub_msdos_partition_is_bsd): ... this. Update all users.
+
+ * conf/common.rmk (amiga_mod_SOURCES, amiga_mod_CFLAGS)
+ (amiga_mod_LDFLAGS, apple_mod_SOURCES, apple_mod_CFLAGS)
+ (apple_mod_LDFLAGS, msdos_mod_SOURCES, msdos_mod_CFLAGS)
+ (msdos_mod_LDFLAGS, sun_mod_SOURCES, sun_mod_CFLAGS)
+ (sun_mod_LDFLAGS, acorn_mod_SOURCES, acorn_mod_CFLAGS)
+ (acorn_mod_LDFLAGS, gpt_mod_SOURCES, gpt_mod_CFLAGS)
+ (gpt_mod_LDFLAGS): Rename to ...
+ (part_amiga_mod_SOURCES, part_amiga_mod_CFLAGS, part_amiga_mod_LDFLAGS)
+ (part_apple_mod_SOURCES, part_apple_mod_CFLAGS, part_apple_mod_LDFLAGS)
+ (part_msdos_mod_SOURCES, part_msdos_mod_CFLAGS, part_msdos_mod_LDFLAGS)
+ (part_sun_mod_SOURCES, part_sun_mod_CFLAGS, part_sun_mod_LDFLAGS)
+ (part_acorn_mod_SOURCES, part_acorn_mod_CFLAGS, part_acorn_mod_LDFLAGS)
+ (part_gpt_mod_SOURCES, part_gpt_mod_CFLAGS)
+ (part_gpt_mod_LDFLAGS): ... this.
+ (pkglib_MODULES): Prefix partition modules with `part_'. Rename
+ `pcpart.mod' to `msdospart.mod'.
+ (pcpart_mod_SOURCES, pcpart_mod_CFLAGS, pcpart_mod_LDFLAGS): Rename
+ to ...
+ (msdospart_mod_SOURCES, msdospart_mod_CFLAGS)
+ (msdospart_mod_LDFLAGS): ... this.
+
2009-08-23 Vladimir Serbinenko <phcoder@gmail.com>
* loader/i386/bsd.c (freebsd_opts): Rewritten to use extcmd.
#include <grub/dl.h>
#include <grub/device.h>
#include <grub/disk.h>
-#include <grub/pc_partition.h>
+#include <grub/msdos_partition.h>
#include <grub/partition.h>
#include <grub/misc.h>
#include <grub/mm.h>
int argc, char **args)
{
grub_device_t dev;
- struct grub_pc_partition_mbr mbr;
+ struct grub_msdos_partition_mbr mbr;
struct grub_partition *partition;
grub_disk_addr_t first_sector;
int numactive = 0;
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/befs.c fs/tar.c \
\
- partmap/pc.c partmap/apple.c partmap/sun.c partmap/gpt.c\
+ partmap/msdos.c partmap/apple.c partmap/sun.c partmap/gpt.c\
kern/fs.c kern/env.c fs/fshelp.c \
disk/raid.c disk/mdraid_linux.c disk/lvm.c grub_probe_init.c
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/befs.c fs/tar.c \
\
- kern/partition.c partmap/pc.c partmap/apple.c partmap/sun.c \
+ kern/partition.c partmap/msdos.c partmap/apple.c partmap/sun.c \
partmap/gpt.c \
kern/fs.c kern/env.c fs/fshelp.c disk/raid.c \
disk/raid5_recover.c disk/raid6_recover.c \
befs_mod_LDFLAGS = $(COMMON_LDFLAGS)
# Partition maps.
-pkglib_MODULES += amiga.mod apple.mod pc.mod sun.mod acorn.mod gpt.mod
-
-# For amiga.mod
-amiga_mod_SOURCES = partmap/amiga.c
-amiga_mod_CFLAGS = $(COMMON_CFLAGS)
-amiga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For apple.mod
-apple_mod_SOURCES = partmap/apple.c
-apple_mod_CFLAGS = $(COMMON_CFLAGS)
-apple_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pc.mod
-pc_mod_SOURCES = partmap/pc.c
-pc_mod_CFLAGS = $(COMMON_CFLAGS)
-pc_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For sun.mod
-sun_mod_SOURCES = partmap/sun.c
-sun_mod_CFLAGS = $(COMMON_CFLAGS)
-sun_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For acorn.mod
-acorn_mod_SOURCES = partmap/acorn.c
-acorn_mod_CFLAGS = $(COMMON_CFLAGS)
-acorn_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For gpt.mod
-gpt_mod_SOURCES = partmap/gpt.c
-gpt_mod_CFLAGS = $(COMMON_CFLAGS)
-gpt_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+pkglib_MODULES += part_amiga.mod
+part_amiga_mod_SOURCES = partmap/amiga.c
+part_amiga_mod_CFLAGS = $(COMMON_CFLAGS)
+part_amiga_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+pkglib_MODULES += part_apple.mod
+part_apple_mod_SOURCES = partmap/apple.c
+part_apple_mod_CFLAGS = $(COMMON_CFLAGS)
+part_apple_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+pkglib_MODULES += part_msdos.mod
+part_msdos_mod_SOURCES = partmap/msdos.c
+part_msdos_mod_CFLAGS = $(COMMON_CFLAGS)
+part_msdos_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+pkglib_MODULES += part_sun.mod
+part_sun_mod_SOURCES = partmap/sun.c
+part_sun_mod_CFLAGS = $(COMMON_CFLAGS)
+part_sun_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+pkglib_MODULES += part_acorn.mod
+part_acorn_mod_SOURCES = partmap/acorn.c
+part_acorn_mod_CFLAGS = $(COMMON_CFLAGS)
+part_acorn_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+pkglib_MODULES += part_gpt.mod
+part_gpt_mod_SOURCES = partmap/gpt.c
+part_gpt_mod_CFLAGS = $(COMMON_CFLAGS)
+part_gpt_mod_LDFLAGS = $(COMMON_LDFLAGS)
# Special disk structures and generic drivers
fs_file.mod fs_uuid.mod configfile.mod echo.mod \
terminfo.mod test.mod blocklist.mod hexdump.mod \
read.mod sleep.mod loadenv.mod crc.mod parttool.mod \
- pcpart.mod memrw.mod normal.mod sh.mod lua.mod \
+ msdospart.mod memrw.mod normal.mod sh.mod lua.mod \
gptsync.mod true.mod probe.mod
# For gptsync.mod.
parttool_mod_CFLAGS = $(COMMON_CFLAGS)
parttool_mod_LDFLAGS = $(COMMON_LDFLAGS)
-# For pcpart.mod.
-pcpart_mod_SOURCES = parttool/pcpart.c
-pcpart_mod_CFLAGS = $(COMMON_CFLAGS)
-pcpart_mod_LDFLAGS = $(COMMON_LDFLAGS)
+# For msdospart.mod.
+msdospart_mod_SOURCES = parttool/msdospart.c
+msdospart_mod_CFLAGS = $(COMMON_CFLAGS)
+msdospart_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For handler.mod.
handler_mod_SOURCES = commands/handler.c
symlist.c
kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
- partition.h pc_partition.h reader.h symbol.h term.h time.h types.h \
+ partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
machine/boot.h machine/console.h machine/init.h \
machine/memory.h machine/loader.h list.h handler.h command.h
kernel_img_CFLAGS = $(COMMON_CFLAGS)
symlist.c
kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
- partition.h pc_partition.h reader.h symbol.h term.h time.h types.h \
+ partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
machine/boot.h machine/console.h machine/init.h \
machine/memory.h machine/loader.h list.h handler.h command.h
kernel_img_CFLAGS = $(COMMON_CFLAGS) -DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)
normal/color.c \
script/sh/main.c script/sh/execute.c script/sh/function.c \
script/sh/lexer.c script/sh/script.c grub_script.tab.c \
- partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
+ partmap/amiga.c partmap/apple.c partmap/msdos.c partmap/sun.c \
partmap/acorn.c partmap/gpt.c \
util/console.c util/hostfs.c util/grub-emu.c util/misc.c \
util/hostdisk.c util/getroot.c \
\
disk/raid.c disk/raid5_recover.c disk/raid6_recover.c \
disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c \
- commands/parttool.c parttool/pcpart.c \
+ commands/parttool.c parttool/msdospart.c \
grub_emu_init.c
grub_emu_LDFLAGS = $(LIBCURSES)
#grub_setup_SOURCES = util/i386/pc/grub-setup.c util/hostdisk.c \
# util/misc.c util/getroot.c kern/device.c kern/disk.c \
# kern/err.c kern/misc.c fs/fat.c fs/ext2.c fs/xfs.c fs/affs.c \
-# fs/sfs.c kern/parser.c kern/partition.c partmap/pc.c \
+# fs/sfs.c kern/parser.c kern/partition.c partmap/msdos.c \
# fs/ufs.c fs/ufs2.c fs/minix.c fs/hfs.c fs/jfs.c fs/hfsplus.c kern/file.c \
# kern/fs.c kern/env.c fs/fshelp.c
normal/color.c \
script/sh/main.c script/sh/execute.c script/sh/function.c \
script/sh/lexer.c script/sh/script.c grub_script.tab.c \
- partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
+ partmap/amiga.c partmap/apple.c partmap/msdos.c partmap/sun.c \
partmap/acorn.c partmap/gpt.c \
util/console.c util/hostfs.c util/grub-emu.c util/misc.c \
util/hostdisk.c util/getroot.c \
\
disk/raid.c disk/raid5_recover.c disk/raid6_recover.c \
disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c \
- commands/parttool.c parttool/pcpart.c \
+ commands/parttool.c parttool/msdospart.c \
grub_emu_init.c
grub_emu_LDFLAGS = $(LIBCURSES)
kern/generic/millisleep.c
kernel_mod_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
- partition.h pc_partition.h reader.h symbol.h term.h time.h types.h \
+ partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
efi/efi.h efi/time.h efi/disk.h i386/pit.h list.h handler.h command.h
kernel_mod_CFLAGS = $(COMMON_CFLAGS)
kernel_mod_ASFLAGS = $(COMMON_ASFLAGS)
symlist.c
kernel_img_HEADERS = cache.h device.h disk.h dl.h elf.h elfload.h \
env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
- partition.h pc_partition.h reader.h symbol.h term.h time.h types.h \
+ partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
ieee1275/ieee1275.h machine/kernel.h machine/loader.h machine/memory.h \
list.h handler.h command.h
kernel_img_CFLAGS = $(COMMON_CFLAGS)
normal/color.c \
script/sh/main.c script/sh/execute.c script/sh/function.c \
script/sh/lexer.c script/sh/script.c grub_script.tab.c \
- partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
+ partmap/amiga.c partmap/apple.c partmap/msdos.c partmap/sun.c \
partmap/acorn.c partmap/gpt.c \
util/console.c util/hostfs.c util/grub-emu.c util/misc.c \
util/hostdisk.c util/getroot.c \
symlist.c
kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
- partition.h pc_partition.h reader.h symbol.h term.h time.h types.h \
+ partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
machine/biosdisk.h machine/boot.h machine/console.h machine/init.h \
machine/memory.h machine/loader.h machine/vga.h machine/vbe.h \
machine/kernel.h machine/pxe.h i386/pit.h list.h handler.h command.h
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/befs.c fs/tar.c \
\
- partmap/pc.c partmap/gpt.c \
+ partmap/msdos.c partmap/gpt.c \
\
disk/raid.c disk/mdraid_linux.c disk/lvm.c \
util/raid.c util/lvm.c \
normal/menu_text.c \
script/sh/main.c script/sh/execute.c script/sh/function.c \
script/sh/lexer.c script/sh/script.c grub_script.tab.c \
- partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
+ partmap/amiga.c partmap/apple.c partmap/msdos.c partmap/sun.c \
partmap/acorn.c partmap/gpt.c \
\
fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c \
\
disk/raid.c disk/raid5_recover.c disk/raid6_recover.c \
disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c \
- commands/parttool.c parttool/pcpart.c \
+ commands/parttool.c parttool/msdospart.c \
grub_emu_init.c
grub_emu_LDFLAGS = $(LIBCURSES)
kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
symbol.h term.h time.h types.h powerpc/libgcc.h loader.h partition.h \
- pc_partition.h ieee1275/ieee1275.h machine/kernel.h handler.h list.h \
+ msdos_partition.h ieee1275/ieee1275.h machine/kernel.h handler.h list.h \
command.h
symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
normal/color.c \
script/sh/main.c script/sh/execute.c script/sh/function.c \
script/sh/lexer.c script/sh/script.c \
- partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
+ partmap/amiga.c partmap/apple.c partmap/msdos.c partmap/sun.c \
partmap/acorn.c \
util/console.c util/hostfs.c util/grub-emu.c util/misc.c \
util/hostdisk.c util/getroot.c \
\
disk/raid.c disk/raid5_recover.c disk/raid6_recover.c \
disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c \
- commands/parttool.c parttool/pcpart.c \
+ commands/parttool.c parttool/msdospart.c \
grub_script.tab.c grub_emu_init.c
grub_emu_LDFLAGS = $(LIBCURSES)
kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
- partition.h pc_partition.h reader.h symbol.h term.h time.h types.h \
+ partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
list.h handler.h command.h \
sparc64/libgcc.h ieee1275/ieee1275.h machine/kernel.h \
sparc64/ieee1275/ieee1275.h
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/befs.c fs/tar.c \
\
- partmap/amiga.c partmap/apple.c partmap/pc.c \
+ partmap/amiga.c partmap/apple.c partmap/msdos.c \
partmap/sun.c partmap/acorn.c \
\
disk/raid.c disk/mdraid_linux.c disk/lvm.c \
normal/color.c \
script/sh/main.c script/sh/execute.c script/sh/function.c \
script/sh/lexer.c script/sh/script.c \
- partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
+ partmap/amiga.c partmap/apple.c partmap/msdos.c partmap/sun.c \
partmap/acorn.c \
util/console.c util/hostfs.c util/grub-emu.c util/misc.c \
util/hostdisk.c util/getroot.c \
\
disk/raid.c disk/raid5_recover.c disk/raid6_recover.c \
disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c \
- commands/parttool.c parttool/pcpart.c \
+ commands/parttool.c parttool/msdospart.c \
grub_script.tab.c grub_emu_init.c
grub_emu_LDFLAGS = $(LIBCURSES)
#grub_setup_SOURCES = util/i386/pc/grub-setup.c util/hostdisk.c \
# util/misc.c util/getroot.c kern/device.c kern/disk.c \
# kern/err.c kern/misc.c fs/fat.c fs/ext2.c fs/xfs.c fs/affs.c \
-# fs/sfs.c kern/parser.c kern/partition.c partmap/pc.c \
+# fs/sfs.c kern/parser.c kern/partition.c partmap/msdos.c \
# fs/ufs.c fs/ufs2.c fs/minix.c fs/hfs.c fs/jfs.c fs/hfsplus.c kern/file.c \
# kern/fs.c kern/env.c fs/fshelp.c
normal/color.c \
script/sh/main.c script/sh/execute.c script/sh/function.c \
script/sh/lexer.c script/sh/script.c grub_script.tab.c \
- partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
+ partmap/amiga.c partmap/apple.c partmap/msdos.c partmap/sun.c \
partmap/acorn.c partmap/gpt.c \
util/console.c util/hostfs.c util/grub-emu.c util/misc.c \
util/hostdisk.c util/getroot.c \
\
disk/raid.c disk/raid5_recover.c disk/raid6_recover.c \
disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c \
- commands/parttool.c parttool/pcpart.c \
+ commands/parttool.c parttool/msdospart.c \
grub_emu_init.c
grub_emu_LDFLAGS = $(LIBCURSES)
term/efi/console.c disk/efi/efidisk.c
kernel_mod_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
- partition.h pc_partition.h reader.h symbol.h term.h time.h types.h \
+ partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
efi/efi.h efi/time.h efi/disk.h machine/loader.h i386/pit.h list.h \
handler.h command.h
kernel_mod_CFLAGS = $(COMMON_CFLAGS)
#define GRUB_PC_PARTITION_OPENBSD_TYPE_RAID 19
/* The BSD partition entry. */
-struct grub_pc_partition_bsd_entry
+struct grub_msdos_partition_bsd_entry
{
grub_uint32_t size;
grub_uint32_t offset;
} __attribute__ ((packed));
/* The BSD disk label. Only define members useful for GRUB. */
-struct grub_pc_partition_disk_label
+struct grub_msdos_partition_disk_label
{
grub_uint32_t magic;
grub_uint8_t padding[128];
grub_uint16_t num_partitions;
grub_uint32_t boot_size;
grub_uint32_t superblock_size;
- struct grub_pc_partition_bsd_entry entries[GRUB_PC_PARTITION_BSD_MAX_ENTRIES];
+ struct grub_msdos_partition_bsd_entry entries[GRUB_PC_PARTITION_BSD_MAX_ENTRIES];
} __attribute__ ((packed));
/* The partition entry. */
-struct grub_pc_partition_entry
+struct grub_msdos_partition_entry
{
/* If active, 0x80, otherwise, 0x00. */
grub_uint8_t flag;
} __attribute__ ((packed));
/* The structure of MBR. */
-struct grub_pc_partition_mbr
+struct grub_msdos_partition_mbr
{
/* The code area (actually, including BPB). */
grub_uint8_t code[446];
/* Four partition entries. */
- struct grub_pc_partition_entry entries[4];
+ struct grub_msdos_partition_entry entries[4];
/* The signature 0xaa55. */
grub_uint16_t signature;
} __attribute__ ((packed));
\f
-struct grub_pc_partition
+struct grub_msdos_partition
{
/* The DOS partition number. */
int dos_part;
};
static inline int
-grub_pc_partition_is_empty (int type)
+grub_msdos_partition_is_empty (int type)
{
return (type == GRUB_PC_PARTITION_TYPE_NONE);
}
static inline int
-grub_pc_partition_is_extended (int type)
+grub_msdos_partition_is_extended (int type)
{
return (type == GRUB_PC_PARTITION_TYPE_EXTENDED
|| type == GRUB_PC_PARTITION_TYPE_WIN95_EXTENDED
}
static inline int
-grub_pc_partition_is_bsd (int type)
+grub_msdos_partition_is_bsd (int type)
{
return (type == GRUB_PC_PARTITION_TYPE_FREEBSD
|| type == GRUB_PC_PARTITION_TYPE_OPENBSD
void EXPORT_FUNC(grub_partition_map_unregister) (grub_partition_map_t partmap);
#ifdef GRUB_UTIL
-void grub_pc_partition_map_init (void);
-void grub_pc_partition_map_fini (void);
+void grub_msdos_partition_map_init (void);
+void grub_msdos_partition_map_fini (void);
void grub_amiga_partition_map_init (void);
void grub_amiga_partition_map_fini (void);
void grub_apple_partition_map_init (void);
#include <grub/mm.h>
#include <grub/partition.h>
#include <grub/dl.h>
-#include <grub/pc_partition.h>
+#include <grub/msdos_partition.h>
#include <grub/gpt_partition.h>
static grub_uint8_t grub_gpt_magic[8] =
struct grub_gpt_header gpt;
struct grub_gpt_partentry entry;
struct grub_disk raw;
- struct grub_pc_partition_mbr mbr;
+ struct grub_msdos_partition_mbr mbr;
grub_uint64_t entries;
unsigned int i;
int last_offset = 0;
*/
#include <grub/partition.h>
-#include <grub/pc_partition.h>
+#include <grub/msdos_partition.h>
#include <grub/disk.h>
#include <grub/mm.h>
#include <grub/misc.h>
#include <grub/dl.h>
-static struct grub_partition_map grub_pc_partition_map;
+static struct grub_partition_map grub_msdos_partition_map;
\f
/* Parse the partition representation in STR and return a partition. */
grub_partition_parse (const char *str)
{
grub_partition_t p;
- struct grub_pc_partition *pcdata;
+ struct grub_msdos_partition *pcdata;
char *s = (char *) str;
if (! p)
return 0;
- pcdata = (struct grub_pc_partition *) grub_malloc (sizeof (*pcdata));
+ pcdata = (struct grub_msdos_partition *) grub_malloc (sizeof (*pcdata));
if (! pcdata)
goto fail;
p->data = pcdata;
- p->partmap = &grub_pc_partition_map;
+ p->partmap = &grub_msdos_partition_map;
/* Initialize some of the fields with invalid values. */
pcdata->bsd_part = pcdata->dos_type = pcdata->bsd_type = p->index = -1;
const grub_partition_t partition))
{
struct grub_partition p;
- struct grub_pc_partition pcdata;
- struct grub_pc_partition_mbr mbr;
- struct grub_pc_partition_disk_label label;
+ struct grub_msdos_partition pcdata;
+ struct grub_msdos_partition_mbr mbr;
+ struct grub_msdos_partition_disk_label label;
struct grub_disk raw;
/* Enforce raw disk access. */
pcdata.ext_offset = 0;
pcdata.dos_part = -1;
p.data = &pcdata;
- p.partmap = &grub_pc_partition_map;
+ p.partmap = &grub_msdos_partition_map;
while (1)
{
int i;
- struct grub_pc_partition_entry *e;
+ struct grub_msdos_partition_entry *e;
/* Read the MBR. */
if (grub_disk_read (&raw, p.offset, 0, sizeof (mbr), &mbr))
return grub_error (GRUB_ERR_BAD_PART_TABLE, "dummy mbr");
/* If this partition is a normal one, call the hook. */
- if (! grub_pc_partition_is_empty (e->type)
- && ! grub_pc_partition_is_extended (e->type))
+ if (! grub_msdos_partition_is_empty (e->type)
+ && ! grub_msdos_partition_is_extended (e->type))
{
pcdata.dos_part++;
return 1;
/* Check if this is a BSD partition. */
- if (grub_pc_partition_is_bsd (e->type))
+ if (grub_msdos_partition_is_bsd (e->type))
{
/* Check if the BSD label is within the DOS partition. */
if (p.len <= GRUB_PC_PARTITION_BSD_LABEL_SECTOR)
pcdata.bsd_part < grub_cpu_to_le16 (label.num_partitions);
pcdata.bsd_part++)
{
- struct grub_pc_partition_bsd_entry *be
+ struct grub_msdos_partition_bsd_entry *be
= label.entries + pcdata.bsd_part;
p.start = grub_le_to_cpu32 (be->offset);
{
e = mbr.entries + i;
- if (grub_pc_partition_is_extended (e->type))
+ if (grub_msdos_partition_is_extended (e->type))
{
p.offset = pcdata.ext_offset + grub_le_to_cpu32 (e->start);
if (! pcdata.ext_offset)
pc_partition_map_probe (grub_disk_t disk, const char *str)
{
grub_partition_t p;
- struct grub_pc_partition *pcdata;
+ struct grub_msdos_partition *pcdata;
auto int find_func (grub_disk_t d, const grub_partition_t partition);
int find_func (grub_disk_t d __attribute__ ((unused)),
const grub_partition_t partition)
{
- struct grub_pc_partition *partdata = partition->data;
+ struct grub_msdos_partition *partdata = partition->data;
if ((pcdata->dos_part == partdata->dos_part || pcdata->dos_part == -1)
&& pcdata->bsd_part == partdata->bsd_part)
pc_partition_map_get_name (const grub_partition_t p)
{
char *name;
- struct grub_pc_partition *pcdata = p->data;
+ struct grub_msdos_partition *pcdata = p->data;
name = grub_malloc (13);
if (! name)
\f
/* Partition map type. */
-static struct grub_partition_map grub_pc_partition_map =
+static struct grub_partition_map grub_msdos_partition_map =
{
- .name = "pc_partition_map",
+ .name = "msdos_partition_map",
.iterate = pc_partition_map_iterate,
.probe = pc_partition_map_probe,
.get_name = pc_partition_map_get_name
GRUB_MOD_INIT(pc_partition_map)
{
- grub_partition_map_register (&grub_pc_partition_map);
+ grub_partition_map_register (&grub_msdos_partition_map);
}
GRUB_MOD_FINI(pc_partition_map)
{
- grub_partition_map_unregister (&grub_pc_partition_map);
+ grub_partition_map_unregister (&grub_msdos_partition_map);
}
#include <grub/misc.h>
#include <grub/mm.h>
#include <grub/err.h>
-#include <grub/pc_partition.h>
+#include <grub/msdos_partition.h>
#include <grub/device.h>
#include <grub/disk.h>
#include <grub/partition.h>
{
int i, index;
grub_partition_t part;
- struct grub_pc_partition_mbr mbr;
+ struct grub_msdos_partition_mbr mbr;
if (dev->disk->partition->offset)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "not a primary partition");
int index;
grub_uint8_t type;
grub_partition_t part;
- struct grub_pc_partition_mbr mbr;
+ struct grub_msdos_partition_mbr mbr;
index = dev->disk->partition->index;
part = dev->disk->partition;
type &= ~GRUB_PC_PARTITION_TYPE_HIDDEN_FLAG;
}
- if (grub_pc_partition_is_empty (type)
- || grub_pc_partition_is_extended (type))
+ if (grub_msdos_partition_is_empty (type)
+ || grub_msdos_partition_is_extended (type))
{
dev->disk->partition = part;
return grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid type");
GRUB_MOD_INIT (pcpart)
{
- activate_table_handle = grub_parttool_register ("pc_partition_map",
+ activate_table_handle = grub_parttool_register ("msdos_partition_map",
grub_pcpart_boot,
grub_pcpart_bootargs);
- type_table_handle = grub_parttool_register ("pc_partition_map",
+ type_table_handle = grub_parttool_register ("msdos_partition_map",
grub_pcpart_type,
grub_pcpart_typeargs);
#include <grub/file.h>
#include <grub/fs.h>
#include <grub/partition.h>
-#include <grub/pc_partition.h>
+#include <grub/msdos_partition.h>
#include <grub/util/hostdisk.h>
#include <grub/util/getroot.h>
#include <grub/term.h>
#include <grub/disk.h>
#include <grub/partition.h>
-#include <grub/pc_partition.h>
+#include <grub/msdos_partition.h>
#include <grub/types.h>
#include <grub/err.h>
#include <grub/util/misc.h>
int find_partition (grub_disk_t disk __attribute__ ((unused)),
const grub_partition_t partition)
{
- struct grub_pc_partition *pcdata = NULL;
+ struct grub_msdos_partition *pcdata = NULL;
- if (strcmp (partition->partmap->name, "pc_partition_map") == 0)
+ if (strcmp (partition->partmap->name, "msdos_partition_map") == 0)
pcdata = partition->data;
if (pcdata)
#include <grub/file.h>
#include <grub/fs.h>
#include <grub/partition.h>
-#include <grub/pc_partition.h>
+#include <grub/msdos_partition.h>
#include <grub/gpt_partition.h>
#include <grub/env.h>
#include <grub/util/hostdisk.h>
int NESTED_FUNC_ATTR find_usable_region_msdos (grub_disk_t disk __attribute__ ((unused)),
const grub_partition_t p)
{
- struct grub_pc_partition *pcdata = p->data;
+ struct grub_msdos_partition *pcdata = p->data;
/* There's always an embed region, and it starts right after the MBR. */
embed_region.start = 1;
/* For its end offset, include as many dummy partitions as we can. */
- if (! grub_pc_partition_is_empty (pcdata->dos_type)
- && ! grub_pc_partition_is_bsd (pcdata->dos_type)
+ if (! grub_msdos_partition_is_empty (pcdata->dos_type)
+ && ! grub_msdos_partition_is_bsd (pcdata->dos_type)
&& embed_region.end > p->start)
embed_region.end = p->start;
if (root_dev->disk->partition)
{
if (strcmp (root_dev->disk->partition->partmap->name,
- "pc_partition_map") == 0)
+ "msdos_partition_map") == 0)
{
- struct grub_pc_partition *pcdata =
+ struct grub_msdos_partition *pcdata =
root_dev->disk->partition->data;
dos_part = pcdata->dos_part;
bsd_part = pcdata->bsd_part;
goto unable_to_embed;
}
- grub_partition_iterate (dest_dev->disk, (strcmp (dest_partmap, "pc_partition_map") ?
+ grub_partition_iterate (dest_dev->disk, (strcmp (dest_partmap, "msdos_partition_map") ?
find_usable_region_gpt : find_usable_region_msdos));
if (embed_region.end == embed_region.start)
{
- if (! strcmp (dest_partmap, "pc_partition_map"))
+ if (! strcmp (dest_partmap, "msdos_partition_map"))
grub_util_warn ("This msdos-style partition label has no post-MBR gap; embedding won't be possible!");
else
grub_util_warn ("This GPT partition label has no BIOS Boot Partition; embedding won't be possible!");
#include <grub/file.h>
#include <grub/fs.h>
#include <grub/partition.h>
-#include <grub/pc_partition.h>
+#include <grub/msdos_partition.h>
#include <grub/gpt_partition.h>
#include <grub/env.h>
#include <grub/util/hostdisk.h>
projects / thirdparty / grub.git / commitdiff
