deae281bfe
Count partitions from 1 instead of 0 in the string representation of partitions. Still use 0-based internally. * partmap/sun.c (grub_sun_is_valid): A cosmetic change. (sun_partition_map_iterate): Use grub_partition_t instead of struct grub_partition *. Cast DESC->START_CYLINDER to grub_uint64_t after converting the endian. (sun_partition_map_probe): Subtract 1 for PARTNUM. (sun_partition_map_get_name): Add 1 to P->INDEX. * partmap/pc.c (grub_partition_parse): Subtract 1 for PCDATA->DOS_PART. (pc_partition_map_get_name): Add 1 into PCDATA->DOS_PART. * partmap/gpt.c (gpt_partition_map_iterate): Initialize PARTNO to zero instead of one. (gpt_partition_map_probe): Subtract 1 for PARTNUM. (gpt_partition_map_get_name): Add 1 into P->INDEX. * partmap/apple.c (apple_partition_map_iterate): Change the type of POS to unsigned. (apple_partition_map_probe): Subtract 1 for PARTNUM. (apple_partition_map_get_name): Add 1 into P->INDEX. * partmap/amiga.c (amiga_partition_map_iterate): Change the type of POS to unsigned. (amiga_partition_map_iterate): Cast NEXT to grub_off_t to calculate the offset of a partition. (amiga_partition_map_probe): Subtract 1 for PARTNUM. (amiga_partition_map_get_name): Add 1 into P->INDEX. * partmap/acorn.c (acorn_partition_map_find): Change the type of SECTOR to grub_disk_addr_t. (acorn_partition_map_iterate): Likewise. (acorn_partition_map_probe): Subtract 1 for PARTNUM. Change the type of SECTOR to grub_disk_addr_t. Declare P on the top. (acorn_partition_map_get_name): Add 1 into P->INDEX. * kern/i386/pc/init.c (make_install_device): Add 1 into GRUB_INSTALL_DOS_PART. * fs/iso9660.c (grub_iso9660_mount): Fixed a reversed conditional.
223 lines
5.4 KiB
C
223 lines
5.4 KiB
C
/* amiga.c - Read amiga partition tables (RDB). */
|
||
/*
|
||
* GRUB -- GRand Unified Bootloader
|
||
* Copyright (C) 2002,2004,2005,2006 Free Software Foundation, Inc.
|
||
*
|
||
* This program is free software; you can redistribute it and/or modify
|
||
* it under the terms of the GNU General Public License as published by
|
||
* the Free Software Foundation; either version 2 of the License, or
|
||
* (at your option) any later version.
|
||
*
|
||
* This program is distributed in the hope that it will be useful,
|
||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
* GNU General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU General Public License
|
||
* along with this program; if not, write to the Free Software
|
||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||
*/
|
||
|
||
#include <grub/disk.h>
|
||
#include <grub/misc.h>
|
||
#include <grub/mm.h>
|
||
#include <grub/partition.h>
|
||
#include <grub/dl.h>
|
||
|
||
struct grub_amiga_rdsk
|
||
{
|
||
/* "RDSK". */
|
||
grub_uint8_t magic[4];
|
||
grub_uint32_t size;
|
||
grub_int32_t checksum;
|
||
grub_uint32_t scsihost;
|
||
grub_uint32_t blksz;
|
||
grub_uint32_t flags;
|
||
grub_uint32_t badblcklst;
|
||
grub_uint32_t partitionlst;
|
||
grub_uint32_t fslst;
|
||
|
||
/* The other information is not important for us. */
|
||
} __attribute__ ((packed));
|
||
|
||
struct grub_amiga_partition
|
||
{
|
||
/* "PART". */
|
||
grub_uint8_t magic[4];
|
||
grub_int32_t size;
|
||
grub_int32_t checksum;
|
||
grub_uint32_t scsihost;
|
||
grub_uint32_t next;
|
||
grub_uint32_t flags;
|
||
grub_uint32_t unused1[2];
|
||
grub_uint32_t devflags;
|
||
grub_uint8_t namelen;
|
||
grub_uint8_t name[31];
|
||
grub_uint32_t unused2[15];
|
||
|
||
grub_uint32_t unused3[3];
|
||
grub_uint32_t heads;
|
||
grub_uint32_t unused4;
|
||
grub_uint32_t block_per_track;
|
||
grub_uint32_t unused5[3];
|
||
grub_uint32_t lowcyl;
|
||
grub_uint32_t highcyl;
|
||
|
||
grub_uint32_t firstcyl;
|
||
} __attribute__ ((packed));
|
||
|
||
static struct grub_partition_map grub_amiga_partition_map;
|
||
|
||
#ifndef GRUB_UTIL
|
||
static grub_dl_t my_mod;
|
||
#endif
|
||
|
||
|
||
|
||
static grub_err_t
|
||
amiga_partition_map_iterate (grub_disk_t disk,
|
||
int (*hook) (grub_disk_t disk,
|
||
const grub_partition_t partition))
|
||
{
|
||
struct grub_partition part;
|
||
struct grub_amiga_rdsk rdsk;
|
||
struct grub_disk raw;
|
||
int partno = 0;
|
||
int next = -1;
|
||
unsigned pos;
|
||
|
||
/* Enforce raw disk access. */
|
||
raw = *disk;
|
||
raw.partition = 0;
|
||
|
||
/* The RDSK block is one of the first 15 blocks. */
|
||
for (pos = 0; pos < 15; pos++)
|
||
{
|
||
/* Read the RDSK block which is a descriptor for the entire disk. */
|
||
if (grub_disk_read (&raw, pos, 0, sizeof (rdsk), (char *) &rdsk))
|
||
return grub_errno;
|
||
|
||
if (grub_strcmp ((char *) rdsk.magic, "RDSK") == 0)
|
||
{
|
||
/* Found the first PART block. */
|
||
next = grub_be_to_cpu32 (rdsk.partitionlst);
|
||
break;
|
||
}
|
||
}
|
||
|
||
if (next == -1)
|
||
return grub_error (GRUB_ERR_BAD_PART_TABLE,
|
||
"Amiga partition map not found.");
|
||
|
||
/* The end of the partition list is marked using "-1". */
|
||
while (next != -1)
|
||
{
|
||
struct grub_amiga_partition apart;
|
||
|
||
/* Read the RDSK block which is a descriptor for the entire disk. */
|
||
if (grub_disk_read (&raw, next, 0, sizeof (apart), (char *) &apart))
|
||
return grub_errno;
|
||
|
||
/* Calculate the first block and the size of the partition. */
|
||
part.start = (grub_be_to_cpu32 (apart.lowcyl)
|
||
* grub_be_to_cpu32 (apart.heads)
|
||
* grub_be_to_cpu32 (apart.block_per_track));
|
||
part.len = ((grub_be_to_cpu32 (apart.highcyl)
|
||
- grub_be_to_cpu32 (apart.lowcyl) + 1)
|
||
* grub_be_to_cpu32 (apart.heads)
|
||
* grub_be_to_cpu32 (apart.block_per_track));
|
||
|
||
part.offset = (grub_off_t) next * 512;
|
||
part.index = partno;
|
||
part.partmap = &grub_amiga_partition_map;
|
||
|
||
if (hook (disk, &part))
|
||
return grub_errno;
|
||
|
||
next = grub_be_to_cpu32 (apart.next);
|
||
partno++;
|
||
}
|
||
|
||
return 0;
|
||
}
|
||
|
||
|
||
static grub_partition_t
|
||
amiga_partition_map_probe (grub_disk_t disk, const char *str)
|
||
{
|
||
grub_partition_t p = 0;
|
||
int partnum = 0;
|
||
char *s = (char *) str;
|
||
|
||
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)
|
||
{
|
||
if (partnum == partition->index)
|
||
{
|
||
p = (grub_partition_t) grub_malloc (sizeof (*p));
|
||
if (! p)
|
||
return 1;
|
||
|
||
grub_memcpy (p, partition, sizeof (*p));
|
||
return 1;
|
||
}
|
||
|
||
return 0;
|
||
}
|
||
|
||
/* Get the partition number. */
|
||
partnum = grub_strtoul (s, 0, 10) - 1;
|
||
if (grub_errno)
|
||
{
|
||
grub_error (GRUB_ERR_BAD_FILENAME, "invalid partition");
|
||
return 0;
|
||
}
|
||
|
||
if (amiga_partition_map_iterate (disk, find_func))
|
||
goto fail;
|
||
|
||
return p;
|
||
|
||
fail:
|
||
grub_free (p);
|
||
return 0;
|
||
}
|
||
|
||
|
||
static char *
|
||
amiga_partition_map_get_name (const grub_partition_t p)
|
||
{
|
||
char *name;
|
||
|
||
name = grub_malloc (13);
|
||
if (! name)
|
||
return 0;
|
||
|
||
grub_sprintf (name, "%d", p->index + 1);
|
||
return name;
|
||
}
|
||
|
||
|
||
/* Partition map type. */
|
||
static struct grub_partition_map grub_amiga_partition_map =
|
||
{
|
||
.name = "amiga_partition_map",
|
||
.iterate = amiga_partition_map_iterate,
|
||
.probe = amiga_partition_map_probe,
|
||
.get_name = amiga_partition_map_get_name
|
||
};
|
||
|
||
GRUB_MOD_INIT(amiga_partition_map)
|
||
{
|
||
grub_partition_map_register (&grub_amiga_partition_map);
|
||
#ifndef GRUB_UTIL
|
||
my_mod = mod;
|
||
#endif
|
||
}
|
||
|
||
GRUB_MOD_FINI(amiga_partition_map)
|
||
{
|
||
grub_partition_map_unregister (&grub_amiga_partition_map);
|
||
}
|