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

Merge mainline into sunpc

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-26 16:35:12 +01:00
commit bb8eacef88
173 changed files with 4364 additions and 3467 deletions
Download patch file Download diff file Expand all files Collapse all files

5
partmap/acorn.c
View file

@ -106,7 +106,6 @@ acorn_partition_map_iterate (grub_disk_t disk,
return err;
part.partmap = &grub_acorn_partition_map;
part.data = 0;
for (i = 0; i != LINUX_MAP_ENTRIES; ++i)
{
@ -135,12 +134,12 @@ static struct grub_partition_map grub_acorn_partition_map =
.iterate = acorn_partition_map_iterate,
};
GRUB_MOD_INIT(acorn_partition_map)
GRUB_MOD_INIT(part_acorn)
{
grub_partition_map_register (&grub_acorn_partition_map);
}
GRUB_MOD_FINI(acorn_partition_map)
GRUB_MOD_FINI(part_acorn)
{
grub_partition_map_unregister (&grub_acorn_partition_map);
}

6
partmap/amiga.c
View file

@ -99,8 +99,6 @@ amiga_partition_map_iterate (grub_disk_t disk,
return grub_error (GRUB_ERR_BAD_PART_TABLE,
"Amiga partition map not found");
part.data = 0;
/* The end of the partition list is marked using "-1". */
while (next != -1)
{
@ -142,12 +140,12 @@ static struct grub_partition_map grub_amiga_partition_map =
.iterate = amiga_partition_map_iterate,
};
GRUB_MOD_INIT(amiga_partition_map)
GRUB_MOD_INIT(part_amiga)
{
grub_partition_map_register (&grub_amiga_partition_map);
}
GRUB_MOD_FINI(amiga_partition_map)
GRUB_MOD_FINI(part_amiga)
{
grub_partition_map_unregister (&grub_amiga_partition_map);
}

15
partmap/apple.c
View file

@ -122,17 +122,16 @@ apple_partition_map_iterate (grub_disk_t disk,
goto fail;
}
part.data = 0;
pos = grub_be_to_cpu16 (aheader.blocksize);
do
{
part.offset = pos / GRUB_DISK_SECTOR_SIZE;
part.index = pos % GRUB_DISK_SECTOR_SIZE;
part.offset = pos / GRUB_DISK_SECTOR_SIZE;
part.index = pos % GRUB_DISK_SECTOR_SIZE;
if (grub_disk_read (disk, part.offset, part.index,
sizeof (struct grub_apple_part), &apart))
return grub_errno;
if (grub_disk_read (disk, part.offset, part.index,
sizeof (struct grub_apple_part), &apart))
return grub_errno;
if (grub_be_to_cpu16 (apart.magic) != GRUB_APPLE_PART_MAGIC)
{
@ -186,12 +185,12 @@ static struct grub_partition_map grub_apple_partition_map =
.iterate = apple_partition_map_iterate,
};
GRUB_MOD_INIT(apple_partition_map)
GRUB_MOD_INIT(part_apple)
{
grub_partition_map_register (&grub_apple_partition_map);
}
GRUB_MOD_FINI(apple_partition_map)
GRUB_MOD_FINI(part_apple)
{
grub_partition_map_unregister (&grub_apple_partition_map);
}

4
partmap/bsdlabel.c
View file

@ -86,12 +86,12 @@ static struct grub_partition_map grub_bsdlabel_partition_map =
.iterate = bsdlabel_partition_map_iterate,
};
GRUB_MOD_INIT(bsd_partition_map)
GRUB_MOD_INIT(part_bsd)
{
grub_partition_map_register (&grub_bsdlabel_partition_map);
}
GRUB_MOD_FINI(bsd_partition_map)
GRUB_MOD_FINI(part_bsd)
{
grub_partition_map_unregister (&grub_bsdlabel_partition_map);
}

13
partmap/gpt.c
View file

@ -71,15 +71,11 @@ gpt_partition_map_iterate (grub_disk_t disk,
grub_dprintf ("gpt", "Read a valid GPT header\n");
entries = grub_le_to_cpu64 (gpt.partitions);
part.data = grub_malloc (sizeof (entry));
for (i = 0; i < grub_le_to_cpu32 (gpt.maxpart); i++)
{
if (grub_disk_read (disk, entries, last_offset,
sizeof (entry), &entry))
{
grub_free (part.data);
return grub_errno;
}
return grub_errno;
if (grub_memcmp (&grub_gpt_partition_type_empty, &entry.type,
sizeof (grub_gpt_partition_type_empty)))
@ -92,7 +88,6 @@ gpt_partition_map_iterate (grub_disk_t disk,
part.number = i;
part.index = last_offset;
part.partmap = &grub_gpt_partition_map;
grub_memcpy (part.data, &entry, sizeof (entry));
grub_dprintf ("gpt", "GPT entry %d: start=%lld, length=%lld\n", i,
(unsigned long long) part.start,
@ -110,8 +105,6 @@ gpt_partition_map_iterate (grub_disk_t disk,
}
}
grub_free (part.data);
return GRUB_ERR_NONE;
}
@ -123,12 +116,12 @@ static struct grub_partition_map grub_gpt_partition_map =
.iterate = gpt_partition_map_iterate,
};
GRUB_MOD_INIT(gpt_partition_map)
GRUB_MOD_INIT(part_gpt)
{
grub_partition_map_register (&grub_gpt_partition_map);
}
GRUB_MOD_FINI(gpt_partition_map)
GRUB_MOD_FINI(part_gpt)
{
grub_partition_map_unregister (&grub_gpt_partition_map);
}

5
partmap/msdos.c
View file

@ -40,7 +40,6 @@ pc_partition_map_iterate (grub_disk_t disk,
p.offset = 0;
ext_offset = 0;
p.data = 0;
p.number = -1;
p.partmap = &grub_msdos_partition_map;
@ -142,12 +141,12 @@ static struct grub_partition_map grub_msdos_partition_map =
.iterate = pc_partition_map_iterate,
};
GRUB_MOD_INIT(pc_partition_map)
GRUB_MOD_INIT(part_msdos)
{
grub_partition_map_register (&grub_msdos_partition_map);
}
GRUB_MOD_FINI(pc_partition_map)
GRUB_MOD_FINI(part_msdos)
{
grub_partition_map_unregister (&grub_msdos_partition_map);
}

4
partmap/sun.c
View file

@ -152,12 +152,12 @@ static struct grub_partition_map grub_sun_partition_map =
.iterate = sun_partition_map_iterate,
};
GRUB_MOD_INIT(sun_partition_map)
GRUB_MOD_INIT(part_sun)
{
grub_partition_map_register (&grub_sun_partition_map);
}
GRUB_MOD_FINI(sun_partition_map)
GRUB_MOD_FINI(part_sun)
{
grub_partition_map_unregister (&grub_sun_partition_map);
}

4
partmap/sunpc.c
View file

@ -132,12 +132,12 @@ static struct grub_partition_map grub_sun_pc_partition_map =
.iterate = sun_pc_partition_map_iterate,
};
GRUB_MOD_INIT(sun_pc_partition_map)
GRUB_MOD_INIT(part_sunpc)
{
grub_partition_map_register (&grub_sun_pc_partition_map);
}
GRUB_MOD_FINI(sun_pc_partition_map)
GRUB_MOD_FINI(part_sunpc)
{
grub_partition_map_unregister (&grub_sun_pc_partition_map);
}