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

Merge grub_net into net. Compiles but is broken right now.

Browse source
This commit is contained in:
Manoel R. Abranches 2010-09-16 21:57:31 +02:00 • committed by Vladimir 'phcoder' Serbinenko
commit 7bb47706c9
30 changed files with 1544 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

25
grub-core/kern/ieee1275/openfw.c
View file

@ -22,11 +22,17 @@
#include <grub/misc.h>
#include <grub/mm.h>
#include <grub/ieee1275/ieee1275.h>
#include <grub/ieee1275/ofnet.h>
#include <grub/net/ieee1275/interface.h>
#include <grub/net.h>
#include <grub/net/disknet.h>
#include <grub/net/tftp.h>
enum grub_ieee1275_parse_type
{
GRUB_PARSE_FILENAME,
GRUB_PARSE_PARTITION,
GRUB_PARSE_DEVICE
};
/* Walk children of 'devpath', calling hook for each. */
@ -366,12 +372,14 @@ grub_ieee1275_parse_args (const char *path, enum grub_ieee1275_parse_type ptype)
ret = grub_strndup (args, (grub_size_t)(comma - args));
}
}
else
else if (!grub_strcmp ("network", type))
{
if (ptype == GRUB_PARSE_DEVICE)
ret = grub_strdup(device);
}
else
{
/* XXX Handle net devices by configuring & registering a grub_net_dev
here, then return its name?
Example path: "net:<server ip>,<file name>,<client ip>,<gateway
ip>,<bootp retries>,<tftp retries>". */
grub_printf ("Unsupported type %s for device %s\n", type, device);
}
@ -381,6 +389,12 @@ fail:
return ret;
}
char *
grub_ieee1275_get_aliasdevname (const char *path)
{
return grub_ieee1275_parse_args (path, GRUB_PARSE_DEVICE);
}
char *
grub_ieee1275_get_filename (const char *path)
{
@ -423,3 +437,4 @@ grub_reboot (void)
for (;;) ;
}
#endif