vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2009-08-23 Robert Millan <rmh.grub@aybabtu.com>

Browse source 
* 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.
This commit is contained in:
robertmh 2009-08-23 12:00:57 +00:00
parent c11fded5f2
commit 71acf5e54b
19 changed files with 164 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

14
parttool/pcpart.c → parttool/msdospart.c
View file

@ -22,7 +22,7 @@
#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>
@ -42,7 +42,7 @@ static grub_err_t grub_pcpart_boot (const grub_device_t dev,
{
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");
@ -92,7 +92,7 @@ static grub_err_t grub_pcpart_type (const grub_device_t dev,
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;
@ -119,8 +119,8 @@ static grub_err_t grub_pcpart_type (const grub_device_t dev,
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");
@ -140,10 +140,10 @@ static grub_err_t grub_pcpart_type (const grub_device_t dev,
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);