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

2005-10-01 Hollis Blanchard <hollis@penguinppc.org>

Browse source 
* 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.
This commit is contained in:
hollisb 2006-10-01 08:30:09 +00:00
parent cc6d3df39e
commit fba51f4801
6 changed files with 84 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ChangeLog
View file

@ -1,3 +1,25 @@
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.
2005-10-01 Hollis Blanchard <hollis@penguinppc.org> 2005-10-01 Hollis Blanchard <hollis@penguinppc.org>
* kern/ieee1275/ieee1275.c (grub_ieee1275_instance_to_path): Rename * kern/ieee1275/ieee1275.c (grub_ieee1275_instance_to_path): Rename

2
disk/ieee1275/ofdisk.c
View file

@ -130,7 +130,7 @@ grub_ofdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
grub_dprintf ("disk", grub_dprintf ("disk",
"Reading handle %p: sector 0x%llx, size 0x%lx, buf %p.\n", "Reading handle %p: sector 0x%llx, size 0x%lx, buf %p.\n",
(void *) disk->data, sector, size, buf); (void *) disk->data, sector, (long) size, buf);
pos = sector * 512UL; pos = sector * 512UL;

3
include/grub/ieee1275/ieee1275.h
View file

@ -96,8 +96,7 @@ int EXPORT_FUNC(grub_ieee1275_get_property) (grub_ieee1275_phandle_t phandle,
grub_size_t size, grub_size_t size,
grub_ssize_t *actual); grub_ssize_t *actual);
int EXPORT_FUNC(grub_ieee1275_next_property) (grub_ieee1275_phandle_t phandle, int EXPORT_FUNC(grub_ieee1275_next_property) (grub_ieee1275_phandle_t phandle,
char *prev_prop, char *prop, char *prev_prop, char *prop);
grub_ieee1275_cell_t *flags);
int EXPORT_FUNC(grub_ieee1275_get_property_length) int EXPORT_FUNC(grub_ieee1275_get_property_length)
(grub_ieee1275_phandle_t phandle, const char *prop, grub_ssize_t *length); (grub_ieee1275_phandle_t phandle, const char *prop, grub_ssize_t *length);
int EXPORT_FUNC(grub_ieee1275_instance_to_package) int EXPORT_FUNC(grub_ieee1275_instance_to_package)

38
kern/ieee1275/ieee1275.c
View file

@ -20,8 +20,9 @@
#include <grub/ieee1275/ieee1275.h> #include <grub/ieee1275/ieee1275.h>
#define IEEE1275_PHANDLE_ROOT ((grub_ieee1275_phandle_t) 0) #define IEEE1275_PHANDLE_INVALID ((grub_ieee1275_phandle_t) -1)
#define IEEE1275_PHANDLE_INVALID ((grub_ieee1275_phandle_t) -1) #define IEEE1275_IHANDLE_INVALID ((grub_ieee1275_ihandle_t) -1)
#define IEEE1275_CELL_INVALID ((grub_ieee1275_cell_t) -1)
@ -52,6 +53,8 @@ grub_ieee1275_finddevice (char *name, grub_ieee1275_phandle_t *phandlep)
if (IEEE1275_CALL_ENTRY_FN (&args) == -1) if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
return -1; return -1;
*phandlep = args.phandle; *phandlep = args.phandle;
if (args.phandle == IEEE1275_PHANDLE_INVALID)
return -1;
return 0; return 0;
} }
@ -81,14 +84,14 @@ grub_ieee1275_get_property (grub_ieee1275_phandle_t phandle,
return -1; return -1;
if (actual) if (actual)
*actual = (grub_ssize_t) args.size; *actual = (grub_ssize_t) args.size;
if (args.size == (grub_ieee1275_cell_t) -1) if (args.size == IEEE1275_CELL_INVALID)
return -1; return -1;
return 0; return 0;
} }
int int
grub_ieee1275_next_property (grub_ieee1275_phandle_t phandle, char *prev_prop, grub_ieee1275_next_property (grub_ieee1275_phandle_t phandle, char *prev_prop,
char *prop, grub_ieee1275_cell_t *flags) char *prop)
{ {
struct get_property_args struct get_property_args
{ {
@ -108,9 +111,7 @@ grub_ieee1275_next_property (grub_ieee1275_phandle_t phandle, char *prev_prop,
if (IEEE1275_CALL_ENTRY_FN (&args) == -1) if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
return -1; return -1;
if (flags) return (int) args.flags;
*flags = args.flags;
return 0;
} }
int int
@ -134,6 +135,8 @@ grub_ieee1275_get_property_length (grub_ieee1275_phandle_t phandle,
if (IEEE1275_CALL_ENTRY_FN (&args) == -1) if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
return -1; return -1;
*length = args.length; *length = args.length;
if (args.length == IEEE1275_CELL_INVALID)
return -1;
return 0; return 0;
} }
@ -155,6 +158,8 @@ grub_ieee1275_instance_to_package (grub_ieee1275_ihandle_t ihandle,
if (IEEE1275_CALL_ENTRY_FN (&args) == -1) if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
return -1; return -1;
*phandlep = args.phandle; *phandlep = args.phandle;
if (args.phandle == IEEE1275_PHANDLE_INVALID)
return -1;
return 0; return 0;
} }
@ -182,6 +187,8 @@ grub_ieee1275_package_to_path (grub_ieee1275_phandle_t phandle,
return -1; return -1;
if (actual) if (actual)
*actual = args.actual; *actual = args.actual;
if (args.actual == IEEE1275_CELL_INVALID)
return -1;
return 0; return 0;
} }
@ -209,6 +216,8 @@ grub_ieee1275_instance_to_path (grub_ieee1275_ihandle_t ihandle,
return -1; return -1;
if (actual) if (actual)
*actual = args.actual; *actual = args.actual;
if (args.actual == IEEE1275_CELL_INVALID)
return -1;
return 0; return 0;
} }
@ -309,6 +318,8 @@ grub_ieee1275_peer (grub_ieee1275_phandle_t node,
if (IEEE1275_CALL_ENTRY_FN (&args) == -1) if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
return -1; return -1;
*result = args.result; *result = args.result;
if (args.result == 0)
return -1;
return 0; return 0;
} }
@ -331,6 +342,8 @@ grub_ieee1275_child (grub_ieee1275_phandle_t node,
if (IEEE1275_CALL_ENTRY_FN (&args) == -1) if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
return -1; return -1;
*result = args.result; *result = args.result;
if (args.result == 0)
return -1;
return 0; return 0;
} }
@ -425,6 +438,8 @@ grub_ieee1275_open (const char *path, grub_ieee1275_ihandle_t *result)
if (IEEE1275_CALL_ENTRY_FN (&args) == -1) if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
return -1; return -1;
*result = args.result; *result = args.result;
if (args.result == IEEE1275_IHANDLE_INVALID)
return -1;
return 0; return 0;
} }
@ -468,13 +483,10 @@ grub_ieee1275_claim (grub_addr_t addr, grub_size_t size, unsigned int align,
if (IEEE1275_CALL_ENTRY_FN (&args) == -1) if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
return -1; return -1;
if (result) if (result)
*result = args.base; *result = args.base;
if (args.base == IEEE1275_CELL_INVALID)
if (args.base == (grub_ieee1275_cell_t)-1)
return -1; return -1;
return 0; return 0;
} }
@ -495,7 +507,6 @@ grub_ieee1275_release (grub_addr_t addr, grub_size_t size)
if (IEEE1275_CALL_ENTRY_FN (&args) == -1) if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
return -1; return -1;
return 0; return 0;
} }
@ -524,6 +535,8 @@ grub_ieee1275_set_property (grub_ieee1275_phandle_t phandle,
if (IEEE1275_CALL_ENTRY_FN (&args) == -1) if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
return -1; return -1;
*actual = args.actual; *actual = args.actual;
if ((args.actual == IEEE1275_CELL_INVALID) || (args.actual != args.size))
return -1;
return 0; return 0;
} }
@ -553,7 +566,6 @@ grub_ieee1275_set_color (grub_ieee1275_ihandle_t ihandle,
if (IEEE1275_CALL_ENTRY_FN (&args) == -1) if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
return -1; return -1;
return 0; return 0;
} }

15
kern/powerpc/ieee1275/cmain.c
View file

@ -51,19 +51,18 @@ grub_ieee1275_find_options (void)
{ {
grub_ieee1275_phandle_t options; grub_ieee1275_phandle_t options;
grub_ieee1275_phandle_t openprom; grub_ieee1275_phandle_t openprom;
int realmode; int rc;
int smartfw; int realmode = 0;
grub_ieee1275_finddevice ("/options", &options); grub_ieee1275_finddevice ("/options", &options);
grub_ieee1275_get_property (options, "real-mode?", &realmode, rc = grub_ieee1275_get_property (options, "real-mode?", &realmode,
sizeof (realmode), 0); sizeof realmode, 0);
if (realmode) if ((rc >= 0) && realmode)
grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_REAL_MODE); grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_REAL_MODE);
grub_ieee1275_finddevice ("/openprom", &openprom); grub_ieee1275_finddevice ("/openprom", &openprom);
smartfw = grub_ieee1275_get_property (openprom, "SmartFirmware-version", rc = grub_ieee1275_get_property (openprom, "SmartFirmware-version", 0, 0, 0);
0, 0, 0); if (rc >= 0)
if (smartfw != -1)
grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_0_BASED_PARTITIONS); grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_0_BASED_PARTITIONS);
} }

61
kern/powerpc/ieee1275/openfw.c
View file

@ -38,12 +38,10 @@ grub_children_iterate (char *devpath,
grub_ieee1275_phandle_t dev; grub_ieee1275_phandle_t dev;
grub_ieee1275_phandle_t child; grub_ieee1275_phandle_t child;
grub_ieee1275_finddevice (devpath, &dev); if (grub_ieee1275_finddevice (devpath, &dev))
if (dev == (grub_ieee1275_phandle_t) -1)
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "Unknown device"); return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "Unknown device");
grub_ieee1275_child (dev, &child); if (grub_ieee1275_child (dev, &child))
if (child == (grub_ieee1275_phandle_t) -1)
return grub_error (GRUB_ERR_BAD_DEVICE, "Device has no children"); return grub_error (GRUB_ERR_BAD_DEVICE, "Device has no children");
do do
@ -56,19 +54,16 @@ grub_children_iterate (char *devpath,
struct grub_ieee1275_devalias alias; struct grub_ieee1275_devalias alias;
int actual; int actual;
grub_ieee1275_get_property (child, "device_type", &childtype, if (grub_ieee1275_get_property (child, "device_type", &childtype,
sizeof childtype, &actual); sizeof childtype, &actual))
if (actual == -1)
continue; continue;
grub_ieee1275_package_to_path (child, childpath, sizeof childpath, if (grub_ieee1275_package_to_path (child, childpath, sizeof childpath,
&actual); &actual))
if (actual == -1)
continue; continue;
grub_ieee1275_get_property (child, "name", &childname, if (grub_ieee1275_get_property (child, "name", &childname,
sizeof childname, &actual); sizeof childname, &actual))
if (actual == -1)
continue; continue;
grub_sprintf (fullname, "%s/%s", devpath, childname); grub_sprintf (fullname, "%s/%s", devpath, childname);
@ -88,19 +83,18 @@ grub_children_iterate (char *devpath,
grub_err_t grub_err_t
grub_devalias_iterate (int (*hook) (struct grub_ieee1275_devalias *alias)) grub_devalias_iterate (int (*hook) (struct grub_ieee1275_devalias *alias))
{ {
grub_ieee1275_phandle_t devalias; grub_ieee1275_phandle_t aliases;
char aliasname[32]; char aliasname[32];
int actual; int actual;
struct grub_ieee1275_devalias alias; struct grub_ieee1275_devalias alias;
if (grub_ieee1275_finddevice ("/aliases", &devalias)) if (grub_ieee1275_finddevice ("/aliases", &aliases))
return -1; return -1;
/* XXX: Is this the right way to find the first property? */ /* Find the first property. */
aliasname[0] = '\0'; aliasname[0] = '\0';
/* XXX: Are the while conditions correct? */ while (grub_ieee1275_next_property (aliases, aliasname, aliasname))
while (grub_ieee1275_next_property (devalias, aliasname, aliasname, 0))
{ {
grub_ieee1275_phandle_t dev; grub_ieee1275_phandle_t dev;
grub_ssize_t pathlen; grub_ssize_t pathlen;
@ -108,42 +102,33 @@ grub_devalias_iterate (int (*hook) (struct grub_ieee1275_devalias *alias))
/* XXX: This should be large enough for any possible case. */ /* XXX: This should be large enough for any possible case. */
char devtype[64]; char devtype[64];
grub_ieee1275_get_property_length (devalias, aliasname, &pathlen); grub_ieee1275_get_property_length (aliases, aliasname, &pathlen);
/* The property `name' is a special case we should skip. */ /* The property `name' is a special case we should skip. */
if (!grub_strcmp (aliasname, "name")) if (!grub_strcmp (aliasname, "name"))
continue; continue;
devpath = grub_malloc (pathlen); devpath = grub_malloc (pathlen);
if (! devpath) if (! devpath)
return grub_errno; return grub_errno;
if (grub_ieee1275_get_property (devalias, aliasname, devpath, pathlen, if (grub_ieee1275_get_property (aliases, aliasname, devpath, pathlen,
&actual)) &actual))
{ goto nextprop;
grub_free (devpath);
continue;
}
if (grub_ieee1275_finddevice (devpath, &dev) if (grub_ieee1275_finddevice (devpath, &dev))
|| dev == (grub_ieee1275_phandle_t) -1) goto nextprop;
{
grub_free (devpath);
continue;
}
if (grub_ieee1275_get_property (dev, "device_type", devtype, sizeof devtype, if (grub_ieee1275_get_property (dev, "device_type", devtype,
&actual)) sizeof devtype, &actual))
{ goto nextprop;
grub_free (devpath);
continue;
}
alias.name = aliasname; alias.name = aliasname;
alias.path= devpath; alias.path = devpath;
alias.type = devtype; alias.type = devtype;
hook (&alias); hook (&alias);
nextprop:
grub_free (devpath); grub_free (devpath);
} }