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

set id on arc disks

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-05-16 21:50:14 +02:00
parent bee1aeb9a1
commit 8e29b2ffe3
1 changed files with 64 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
grub-core/disk/arc/arcdisk.c
View file

@ -25,6 +25,59 @@
static grub_arc_fileno_t last_handle = 0; static grub_arc_fileno_t last_handle = 0;
static char *last_path = NULL; static char *last_path = NULL;
static int lnum = 0;
struct arcdisk_hash_ent
{
char *devpath;
int num;
struct arcdisk_hash_ent *next;
};
#define ARCDISK_HASH_SZ 8
static struct arcdisk_hash_ent *arcdisk_hash[ARCDISK_HASH_SZ];
static int
arcdisk_hash_fn (const char *devpath)
{
int hash = 0;
while (*devpath)
hash ^= *devpath++;
return (hash & (ARCDISK_HASH_SZ - 1));
}
static struct arcdisk_hash_ent *
arcdisk_hash_find (const char *devpath)
{
struct arcdisk_hash_ent *p = arcdisk_hash[arcdisk_hash_fn (devpath)];
while (p)
{
if (!grub_strcmp (p->devpath, devpath))
break;
p = p->next;
}
return p;
}
static struct arcdisk_hash_ent *
arcdisk_hash_add (char *devpath)
{
struct arcdisk_hash_ent *p;
struct arcdisk_hash_ent **head = &arcdisk_hash[arcdisk_hash_fn(devpath)];
p = grub_malloc (sizeof (*p));
if (!p)
return NULL;
p->devpath = devpath;
p->next = *head;
p->num = lnum++;
*head = p;
return p;
}
static int static int
grub_arcdisk_iterate (int (*hook_in) (const char *name)) grub_arcdisk_iterate (int (*hook_in) (const char *name))
{ {
@ -81,6 +134,8 @@ grub_arcdisk_open (const char *name, grub_disk_t disk)
grub_err_t err; grub_err_t err;
grub_arc_err_t r; grub_arc_err_t r;
struct grub_arc_fileinfo info; struct grub_arc_fileinfo info;
struct arcdisk_hash_ent *hash;
if (grub_memcmp (name, "arc/", 4) != 0) if (grub_memcmp (name, "arc/", 4) != 0)
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not arc device"); return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not arc device");
fullname = grub_malloc (2 * grub_strlen (name) + sizeof (RAW_SUFFIX)); fullname = grub_malloc (2 * grub_strlen (name) + sizeof (RAW_SUFFIX));
@ -114,6 +169,13 @@ grub_arcdisk_open (const char *name, grub_disk_t disk)
grub_memcpy (optr, RAW_SUFFIX, sizeof (RAW_SUFFIX)); grub_memcpy (optr, RAW_SUFFIX, sizeof (RAW_SUFFIX));
disk->data = fullname; disk->data = fullname;
grub_dprintf ("arcdisk", "opening %s\n", fullname); grub_dprintf ("arcdisk", "opening %s\n", fullname);
hash = arcdisk_hash_find (fullname);
if (!hash)
hash = arcdisk_hash_add (fullname);
if (!hash)
return grub_errno;
err = reopen (fullname); err = reopen (fullname);
if (err) if (err)
return err; return err;
@ -147,7 +209,8 @@ grub_arcdisk_open (const char *name, grub_disk_t disk)
} }
else else
disk->total_sectors = (info.end >> 9); disk->total_sectors = (info.end >> 9);
disk->id = 0; /* XXX */
disk->id = hash->num;
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }