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

Make nand a prefix for nand devices.

Browse source 
* grub-core/disk/ieee1275/nand.c (grub_nand_open): Use prefix nand.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-26 23:59:00 +01:00
parent 10133b5ff3
commit d5534665ff
3 changed files with 29 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
grub-core/disk/ieee1275/nand.c
View file

@ -38,15 +38,15 @@ grub_nand_iterate (int (*hook) (const char *name),
{
auto int dev_iterate (struct grub_ieee1275_devalias *alias);
int dev_iterate (struct grub_ieee1275_devalias *alias)
{
if (! grub_strcmp (alias->name, "nand"))
{
hook (alias->name);
return 1;
}
return 0;
}
{
if (grub_strcmp (alias->name, "nand") == 0)
{
hook (alias->name);
return 1;
}
return 0;
}
if (pull != GRUB_DISK_PULL_NONE)
return 0;
@ -63,6 +63,7 @@ grub_nand_open (const char *name, grub_disk_t disk)
{
grub_ieee1275_ihandle_t dev_ihandle = 0;
struct grub_nand_data *data = 0;
const char *devname;
struct size_args
{
struct grub_ieee1275_common_hdr common;
@ -73,14 +74,18 @@ grub_nand_open (const char *name, grub_disk_t disk)
grub_ieee1275_cell_t size2;
} args;
if (! grub_strstr (name, "nand"))
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a NAND device");
if (grub_memcmp (name, "nand/", sizeof ("nand/") - 1) == 0)
devname = name + sizeof ("nand/") - 1;
else if (grub_strcmp (name, "nand") == 0)
devname = name;
else
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a NAND device");
data = grub_malloc (sizeof (*data));
if (! data)
goto fail;
grub_ieee1275_open (name, &dev_ihandle);
grub_ieee1275_open (devname, &dev_ihandle);
if (! dev_ihandle)
{
grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");