2004-03-28 21:52:02 +00:00
|
|
|
/* ofdisk.c - Open Firmware disk access. */
|
|
|
|
/*
|
2004-04-04 13:46:03 +00:00
|
|
|
* GRUB -- GRand Unified Bootloader
|
2010-01-03 22:05:07 +00:00
|
|
|
* Copyright (C) 2004,2006,2007,2008,2009 Free Software Foundation, Inc.
|
2004-03-28 21:52:02 +00:00
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
* GRUB is free software: you can redistribute it and/or modify
|
2004-03-28 21:52:02 +00:00
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-21 23:32:33 +00:00
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
2004-03-28 21:52:02 +00:00
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
* GRUB is distributed in the hope that it will be useful,
|
2004-03-28 21:52:02 +00:00
|
|
|
* 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
|
2007-07-21 23:32:33 +00:00
|
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
2004-03-28 21:52:02 +00:00
|
|
|
*/
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
#include <grub/misc.h>
|
|
|
|
#include <grub/disk.h>
|
|
|
|
#include <grub/mm.h>
|
2005-08-03 22:53:51 +00:00
|
|
|
#include <grub/ieee1275/ieee1275.h>
|
|
|
|
#include <grub/ieee1275/ofdisk.h>
|
2004-03-28 21:52:02 +00:00
|
|
|
|
2010-09-13 17:17:29 +00:00
|
|
|
static char *last_devpath;
|
|
|
|
static grub_ieee1275_ihandle_t last_ihandle;
|
|
|
|
|
2009-04-13 06:40:34 +00:00
|
|
|
struct ofdisk_hash_ent
|
|
|
|
{
|
|
|
|
char *devpath;
|
2010-09-13 17:17:29 +00:00
|
|
|
/* Pointer to shortest available name on nodes representing canonical names,
|
|
|
|
otherwise NULL. */
|
|
|
|
const char *shortest;
|
2009-04-13 06:40:34 +00:00
|
|
|
struct ofdisk_hash_ent *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define OFDISK_HASH_SZ 8
|
|
|
|
static struct ofdisk_hash_ent *ofdisk_hash[OFDISK_HASH_SZ];
|
|
|
|
|
|
|
|
static int
|
|
|
|
ofdisk_hash_fn (const char *devpath)
|
|
|
|
{
|
|
|
|
int hash = 0;
|
|
|
|
while (*devpath)
|
|
|
|
hash ^= *devpath++;
|
|
|
|
return (hash & (OFDISK_HASH_SZ - 1));
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ofdisk_hash_ent *
|
|
|
|
ofdisk_hash_find (const char *devpath)
|
|
|
|
{
|
|
|
|
struct ofdisk_hash_ent *p = ofdisk_hash[ofdisk_hash_fn(devpath)];
|
|
|
|
|
|
|
|
while (p)
|
|
|
|
{
|
|
|
|
if (!grub_strcmp (p->devpath, devpath))
|
|
|
|
break;
|
|
|
|
p = p->next;
|
|
|
|
}
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ofdisk_hash_ent *
|
|
|
|
ofdisk_hash_add (char *devpath)
|
|
|
|
{
|
|
|
|
struct ofdisk_hash_ent **head = &ofdisk_hash[ofdisk_hash_fn(devpath)];
|
2010-09-13 17:17:29 +00:00
|
|
|
struct ofdisk_hash_ent *p, *pcan;
|
|
|
|
char *curcan;
|
|
|
|
|
|
|
|
p = grub_malloc(sizeof (*p));
|
|
|
|
if (!p)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
p->devpath = devpath;
|
|
|
|
p->next = *head;
|
|
|
|
p->shortest = 0;
|
|
|
|
*head = p;
|
|
|
|
|
|
|
|
curcan = grub_ieee1275_canonicalise_devname (devpath);
|
|
|
|
if (!curcan)
|
|
|
|
{
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
pcan = ofdisk_hash_find (curcan);
|
|
|
|
if (!pcan)
|
|
|
|
pcan = ofdisk_hash_add (curcan);
|
|
|
|
else
|
|
|
|
grub_free (curcan);
|
2009-04-13 06:40:34 +00:00
|
|
|
|
2010-09-13 17:17:29 +00:00
|
|
|
if (!pcan)
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
|
|
|
else
|
2009-04-13 06:40:34 +00:00
|
|
|
{
|
2010-09-13 17:17:29 +00:00
|
|
|
if (!pcan->shortest
|
|
|
|
|| grub_strlen (pcan->shortest) > grub_strlen (devpath))
|
|
|
|
pcan->shortest = devpath;
|
2009-04-13 06:40:34 +00:00
|
|
|
}
|
2010-09-13 17:17:29 +00:00
|
|
|
|
2009-04-13 06:40:34 +00:00
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2010-09-13 17:17:29 +00:00
|
|
|
static void
|
|
|
|
scan (void)
|
2004-03-28 21:52:02 +00:00
|
|
|
{
|
2004-12-27 Marco Gerards <metgerards@student.han.nl>
* genmk.rb: Handle the `Program' class in the main loop. Written
by Johan Rydberg <jrydberg@gnu.org>.
(Program): New class.
(programs): New variable.
* boot/powerpc/ieee1275/cmain.c: Include <grub/machine/ieee1275.h>
instead of "grub/machine/ieee1275.h". Include <grub/kernel.h>
instead of "grub/kernel.h". Include <grub/machine/init.h>.
(help_arch): Function removed.
* conf/powerpc-ieee1275.rmk (grubof_HEADERS): Add
`powerpc/libgcc.h' and `loader.h'.
(pkgdata_PROGRAMS): New variable.
(sbin_UTILITIES): Variable removed.
(grub_emu_SOURCES): Added kern/powerpc/cache.S.
(grubof_SOURCES): Variable re-defined so it only includes the
core functionality.
(grubof_CFLAGS): Remove `-DGRUBOF'.
(pkgdata_MODULES, fshelp_mod_SOURCES, fshelp_mod_CFLAGS,
(fat_mod_SOURCES, fat_mod_CFLAGS, ext2_mod_SOURCES)
(ext2_mod_CFLAGS, ufs_mod_SOURCES, ufs_mod_CFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, hfs_mod_SOURCES)
(hfs_mod_CFLAGS, jfs_mod_SOURCES, jfs_mod_CFLAGS)
(iso9660_mod_SOURCES, iso9660_mod_CFLAGS, _linux_mod_SOURCES)
(_linux_mod_CFLAGS, linux_mod_SOURCES, linux_mod_CFLAGS)
(normal_mod_SOURCES, normal_mod_CFLAGS, normal_mod_ASFLAGS)
(hello_mod_SOURCES, hello_mod_CFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, terminal_mod_SOURCES, terminal_mod_CFLAGS)
(ls_mod_SOURCES, ls_mod_CFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cat_mod_SOURCES, cat_mod_CFLAGS, font_mod_SOURCES)
(font_mod_CFLAGS, amiga_mod_SOURCES, amiga_mod_CFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, pc_mod_SOURCES)
(pc_mod_CFLAGS): New variables.
* disk/powerpc/ieee1275/ofdisk.c: Include <grub/machine/init.h>.
(grub_ofdisk_iterate): Add a prototype for `dev_iterate'.
* include/grub/dl.h (grub_arch_dl_sync_caches): New prototype.
* include/grub/loader.h (grub_os_area_addr, grub_os_area_size):
Moved from here...
* include/grub/i386/pc/init.h (grub_os_area_addr)
(rub_os_area_size): ... to here.
* include/grub/powerpc/ieee1275/ieee1275.h
(grub_ieee1275_entry_fn): Export symbol.
* include/grub/powerpc/ieee1275/init.h: New file.
* include/grub/powerpc/libgcc.h: Likewise.
* include/grub/cache.h: Likewise.
* kern/powerpc/cache.S: Likewise. Written by Hollis Blanchard
<hollis@penguinppc.org>.
* kern/dl.c: Include <grub/cache.h>.
(grub_dl_flush_cache): New function.
(grub_dl_load_core): Call `grub_dl_flush_cache' to flush the cache
for this module.
* kern/powerpc/ieee1275/init.c (grub_ofdisk_init)
(grub_console_init): Removed prototypes.
(grub_machine_init): Don't initialize the modules anymore.
* kern/powerpc/ieee1275/openfw.c (grub_map): Make the function
static.
* include/grub/powerpc/types.h (GRUB_HOST_WORDS_LITTLEENDIAN):
Macro undef removed.
(GRUB_HOST_WORDS_BIGENDIAN): New macro.
* kern/powerpc/dl.c (grub_arch_dl_relocate_symbols): Add
relocation `R_PPC_REL32'. Return an error when the relocation is
unknown.
* Makefile.in (DATA): Add `$(pkgdata_PROGRAMS)'.
* kern/i386/pc/init.c (grub_arch_sync_caches): New function.
* util/misc.c (grub_arch_sync_caches): Likewise.
2004-12-27 13:46:20 +00:00
|
|
|
auto int dev_iterate (struct grub_ieee1275_devalias *alias);
|
2005-10-01 Hollis Blanchard <hollis@penguinppc.org>
* disk/ieee1275/ofdisk.c (grub_ofdisk_iterate): Cast `size' to long.
* include/grub/ieee1275/ieee1275.h (grub_ieee1275_next_property):
Remove `flags' argument. All callers changed.
* kern/ieee1275/ieee1275.c (IEEE1275_PHANDLE_ROOT): Removed.
(IEEE1275_IHANDLE_INVALID): New variable.
(IEEE1275_CELL_INVALID): New variable.
(grub_ieee1275_finddevice, grub_ieee1275_get_property,
grub_ieee1275_get_property_length, grub_ieee1275_instance_to_package,
grub_ieee1275_package_to_path, grub_ieee1275_instance_to_path,
grub_ieee1275_peer, grub_ieee1275_child, grub_ieee1275_open,
grub_ieee1275_claim, grub_ieee1275_set_property): Error-check return
codes from Open Firmware. All callers updated.
(grub_ieee1275_next_property): Directly return Open Firmware return
code.
* kern/powerpc/ieee1275/cmain.c (grub_ieee1275_find_options):
Standardize error checking from `grub_ieee1275_get_property'.
* kern/powerpc/ieee1275/openfw.c (grub_devalias_iterate): Rename
`devalias' to `aliases'. Correct comments. Consolidate error paths.
2006-10-01 08:30:09 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
int dev_iterate (struct grub_ieee1275_devalias *alias)
|
2004-03-28 21:52:02 +00:00
|
|
|
{
|
2010-09-13 17:17:29 +00:00
|
|
|
struct ofdisk_hash_ent *op;
|
|
|
|
|
|
|
|
grub_dprintf ("disk", "device name = %s type = %s\n", alias->name,
|
|
|
|
alias->type);
|
|
|
|
|
|
|
|
if (grub_strcmp (alias->type, "block") != 0)
|
|
|
|
return 0;
|
2009-04-24 12:05:54 +00:00
|
|
|
|
2008-01-22 20:13:14 +00:00
|
|
|
grub_dprintf ("disk", "disk name = %s\n", alias->name);
|
|
|
|
|
2010-09-13 17:17:29 +00:00
|
|
|
op = ofdisk_hash_find (alias->path);
|
|
|
|
if (!op)
|
2008-01-22 20:13:14 +00:00
|
|
|
{
|
2010-09-13 17:17:29 +00:00
|
|
|
char *name = grub_strdup (alias->name);
|
|
|
|
if (!name)
|
2008-01-22 20:13:14 +00:00
|
|
|
{
|
2010-09-13 17:17:29 +00:00
|
|
|
grub_errno = GRUB_ERR_NONE;
|
2008-01-22 20:13:14 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2010-09-13 17:17:29 +00:00
|
|
|
op = ofdisk_hash_add (name);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2008-01-22 20:13:14 +00:00
|
|
|
|
2010-09-13 17:17:29 +00:00
|
|
|
grub_devalias_iterate (dev_iterate);
|
|
|
|
grub_ieee1275_devices_iterate (dev_iterate);
|
|
|
|
}
|
2008-01-22 20:13:14 +00:00
|
|
|
|
2010-09-13 17:17:29 +00:00
|
|
|
static int
|
|
|
|
grub_ofdisk_iterate (int (*hook) (const char *name))
|
|
|
|
{
|
|
|
|
unsigned i;
|
|
|
|
scan ();
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE (ofdisk_hash); i++)
|
|
|
|
{
|
|
|
|
static struct ofdisk_hash_ent *ent;
|
|
|
|
for (ent = ofdisk_hash[i]; ent; ent = ent->next)
|
|
|
|
{
|
|
|
|
if (!ent->shortest)
|
|
|
|
continue;
|
|
|
|
if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_OFDISK_SDCARD_ONLY))
|
2008-01-22 20:13:14 +00:00
|
|
|
{
|
2010-09-13 17:17:29 +00:00
|
|
|
grub_ieee1275_phandle_t dev;
|
|
|
|
char tmp[8];
|
|
|
|
|
|
|
|
if (grub_ieee1275_finddevice (ent->devpath, &dev))
|
|
|
|
{
|
|
|
|
grub_dprintf ("disk", "finddevice (%s) failed\n",
|
|
|
|
ent->devpath);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (grub_ieee1275_get_property (dev, "iconname", tmp,
|
|
|
|
sizeof tmp, 0))
|
|
|
|
{
|
|
|
|
grub_dprintf ("disk", "get iconname failed\n");
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (grub_strcmp (tmp, "sdmmc") != 0)
|
|
|
|
{
|
|
|
|
grub_dprintf ("disk", "device is not an SD card\n");
|
|
|
|
continue;
|
|
|
|
}
|
2008-01-22 20:13:14 +00:00
|
|
|
}
|
|
|
|
|
2010-09-13 17:17:29 +00:00
|
|
|
if (grub_strncmp (ent->shortest, "cdrom", 5) == 0)
|
|
|
|
continue;
|
2004-03-28 21:52:02 +00:00
|
|
|
|
2010-09-13 17:17:29 +00:00
|
|
|
if (hook (ent->shortest))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
2004-03-28 21:52:02 +00:00
|
|
|
}
|
|
|
|
|
2009-05-04 23:13:53 +00:00
|
|
|
static char *
|
|
|
|
compute_dev_path (const char *name)
|
|
|
|
{
|
2010-01-31 10:11:03 +00:00
|
|
|
char *devpath = grub_malloc (grub_strlen (name) + 3);
|
2009-05-04 23:13:53 +00:00
|
|
|
char *p, c;
|
|
|
|
|
|
|
|
if (!devpath)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* Un-escape commas. */
|
|
|
|
p = devpath;
|
|
|
|
while ((c = *name++) != '\0')
|
|
|
|
{
|
|
|
|
if (c == '\\' && *name == ',')
|
|
|
|
{
|
|
|
|
*p++ = ',';
|
|
|
|
name++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*p++ = c;
|
|
|
|
}
|
|
|
|
|
|
|
|
*p++ = '\0';
|
|
|
|
|
|
|
|
return devpath;
|
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
static grub_err_t
|
|
|
|
grub_ofdisk_open (const char *name, grub_disk_t disk)
|
2004-03-28 21:52:02 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_ieee1275_phandle_t dev;
|
2005-01-22 16:03:15 +00:00
|
|
|
char *devpath;
|
2004-03-28 21:52:02 +00:00
|
|
|
/* XXX: This should be large enough for any possible case. */
|
|
|
|
char prop[64];
|
2005-08-21 18:42:55 +00:00
|
|
|
grub_ssize_t actual;
|
2004-03-28 21:52:02 +00:00
|
|
|
|
2009-05-04 23:13:53 +00:00
|
|
|
devpath = compute_dev_path (name);
|
2004-03-28 21:52:02 +00:00
|
|
|
if (! devpath)
|
2004-04-04 13:46:03 +00:00
|
|
|
return grub_errno;
|
2004-03-28 21:52:02 +00:00
|
|
|
|
2010-09-13 17:17:29 +00:00
|
|
|
grub_dprintf ("disk", "Opening `%s'.\n", devpath);
|
2005-07-12 22:36:43 +00:00
|
|
|
|
2010-09-13 17:17:29 +00:00
|
|
|
if (grub_ieee1275_finddevice (devpath, &dev))
|
|
|
|
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't read device properties");
|
2004-03-28 21:52:02 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
if (grub_ieee1275_get_property (dev, "device_type", prop, sizeof (prop),
|
2004-03-28 21:52:02 +00:00
|
|
|
&actual))
|
2010-09-13 17:17:29 +00:00
|
|
|
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't read the device type");
|
2004-03-28 21:52:02 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
if (grub_strcmp (prop, "block"))
|
2010-09-13 17:17:29 +00:00
|
|
|
return grub_error (GRUB_ERR_BAD_DEVICE, "not a block device");
|
2010-02-13 15:44:34 +00:00
|
|
|
|
2004-03-28 21:52:02 +00:00
|
|
|
/* XXX: There is no property to read the number of blocks. There
|
|
|
|
should be a property `#blocks', but it is not there. Perhaps it
|
|
|
|
is possible to use seek for this. */
|
2010-05-31 19:01:01 +00:00
|
|
|
disk->total_sectors = GRUB_DISK_SIZE_UNKNOWN;
|
2004-03-28 21:52:02 +00:00
|
|
|
|
2010-09-13 17:17:29 +00:00
|
|
|
{
|
|
|
|
struct ofdisk_hash_ent *op;
|
|
|
|
op = ofdisk_hash_find (devpath);
|
|
|
|
if (!op)
|
|
|
|
op = ofdisk_hash_add (devpath);
|
|
|
|
else
|
|
|
|
grub_free (devpath);
|
|
|
|
if (!op)
|
|
|
|
return grub_errno;
|
|
|
|
disk->id = (unsigned long) op;
|
|
|
|
disk->data = op->devpath;
|
|
|
|
}
|
2004-03-28 21:52:02 +00:00
|
|
|
|
2008-01-14 04:16:20 +00:00
|
|
|
return 0;
|
2004-03-28 21:52:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_ofdisk_close (grub_disk_t disk)
|
2004-03-28 21:52:02 +00:00
|
|
|
{
|
2010-09-13 17:17:29 +00:00
|
|
|
if (disk->data == last_devpath)
|
|
|
|
{
|
|
|
|
if (last_ihandle)
|
|
|
|
grub_ieee1275_close (last_ihandle);
|
|
|
|
last_ihandle = 0;
|
|
|
|
last_devpath = NULL;
|
|
|
|
}
|
|
|
|
disk->data = 0;
|
2004-03-28 21:52:02 +00:00
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
static grub_err_t
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
grub_ofdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
|
|
|
|
grub_size_t size, char *buf)
|
2004-03-28 21:52:02 +00:00
|
|
|
{
|
2005-08-21 18:42:55 +00:00
|
|
|
grub_ssize_t status, actual;
|
2004-03-28 21:52:02 +00:00
|
|
|
unsigned long long pos;
|
|
|
|
|
2010-09-13 17:17:29 +00:00
|
|
|
if (disk->data != last_devpath)
|
|
|
|
{
|
|
|
|
if (last_ihandle)
|
|
|
|
grub_ieee1275_close (last_ihandle);
|
|
|
|
last_ihandle = 0;
|
|
|
|
last_devpath = NULL;
|
|
|
|
|
|
|
|
if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_PARTITION_0))
|
|
|
|
{
|
|
|
|
char name2[grub_strlen (disk->data) + 3];
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
grub_strcpy (name2, disk->data);
|
|
|
|
p = name2 + grub_strlen (name2);
|
|
|
|
*p++ = ':';
|
|
|
|
*p++ = '0';
|
|
|
|
*p = 0;
|
|
|
|
grub_ieee1275_open (name2, &last_ihandle);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
grub_ieee1275_open (disk->data, &last_ihandle);
|
|
|
|
if (! last_ihandle)
|
|
|
|
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
|
|
|
|
last_devpath = disk->data;
|
|
|
|
}
|
|
|
|
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
pos = sector * 512UL;
|
2004-03-28 21:52:02 +00:00
|
|
|
|
2010-09-13 17:17:29 +00:00
|
|
|
grub_ieee1275_seek (last_ihandle, pos, &status);
|
2006-10-27 17:57:05 +00:00
|
|
|
if (status < 0)
|
2004-04-04 13:46:03 +00:00
|
|
|
return grub_error (GRUB_ERR_READ_ERROR,
|
2009-12-24 22:53:05 +00:00
|
|
|
"seek error, can't seek block %llu",
|
2009-04-30 01:18:43 +00:00
|
|
|
(long long) sector);
|
2010-09-13 17:17:29 +00:00
|
|
|
grub_ieee1275_read (last_ihandle, buf, size * 512UL, &actual);
|
2010-02-06 14:51:22 +00:00
|
|
|
if (actual != (grub_ssize_t) (size * 512UL))
|
2009-12-24 22:53:05 +00:00
|
|
|
return grub_error (GRUB_ERR_READ_ERROR, "read error on block: %llu",
|
2009-04-30 01:18:43 +00:00
|
|
|
(long long) sector);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2004-03-28 21:52:02 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
static grub_err_t
|
|
|
|
grub_ofdisk_write (grub_disk_t disk __attribute ((unused)),
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
grub_disk_addr_t sector __attribute ((unused)),
|
|
|
|
grub_size_t size __attribute ((unused)),
|
2004-03-28 21:52:02 +00:00
|
|
|
const char *buf __attribute ((unused)))
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
return GRUB_ERR_NOT_IMPLEMENTED_YET;
|
2004-03-28 21:52:02 +00:00
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
static struct grub_disk_dev grub_ofdisk_dev =
|
2004-03-28 21:52:02 +00:00
|
|
|
{
|
|
|
|
.name = "ofdisk",
|
2004-08-21 13:54:22 +00:00
|
|
|
.id = GRUB_DISK_DEVICE_OFDISK_ID,
|
2004-04-04 13:46:03 +00:00
|
|
|
.iterate = grub_ofdisk_iterate,
|
|
|
|
.open = grub_ofdisk_open,
|
|
|
|
.close = grub_ofdisk_close,
|
|
|
|
.read = grub_ofdisk_read,
|
|
|
|
.write = grub_ofdisk_write,
|
2004-03-28 21:52:02 +00:00
|
|
|
.next = 0
|
|
|
|
};
|
|
|
|
|
|
|
|
void
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_ofdisk_init (void)
|
2004-03-28 21:52:02 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_disk_dev_register (&grub_ofdisk_dev);
|
2004-03-28 21:52:02 +00:00
|
|
|
}
|
2005-03-26 17:34:50 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
grub_ofdisk_fini (void)
|
|
|
|
{
|
2010-09-13 17:17:29 +00:00
|
|
|
if (last_ihandle)
|
|
|
|
grub_ieee1275_close (last_ihandle);
|
|
|
|
last_ihandle = 0;
|
|
|
|
last_devpath = NULL;
|
|
|
|
|
2005-03-26 17:34:50 +00:00
|
|
|
grub_disk_dev_unregister (&grub_ofdisk_dev);
|
|
|
|
}
|