* grub-core/kern/ieee1275/ieee1275.c (grub_ieee1275_finddevice): Make

	first argument a const pointer.
	* grub-core/kern/ieee1275/openfw.c (grub_children_iterate): Likewise.
	* include/grub/ieee1275/ieee1275.h (grub_ieee1275_finddevice): Update
	proto.
	(grub_children_iterate): Likewise.
	(grub_machine_mmap_iterate): Remove redundant declaration.

diff --git a/ChangeLog b/ChangeLog
index e6a2125dddba254dc88896ce853762705e421a5f..0d92fb4247d1ce80540d60dd537cf850d1e4bdf4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/ieee1275/ieee1275.c (grub_ieee1275_finddevice): Make
+       first argument a const pointer.
+       * grub-core/kern/ieee1275/openfw.c (grub_children_iterate): Likewise.
+       * include/grub/ieee1275/ieee1275.h (grub_ieee1275_finddevice): Update
+       proto.
+       (grub_children_iterate): Likewise.
+       (grub_machine_mmap_iterate): Remove redundant declaration.
+
 2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/commands/acpi.c (grub_acpi_create_ebda) [!x86]: Disable.

diff --git a/grub-core/kern/ieee1275/ieee1275.c b/grub-core/kern/ieee1275/ieee1275.c
index b32fd2d8bd49bf9db23e187a62de5d3c32753c90..b20f64d68bf0c235728fa847e24b75c2f1474549 100644 (file)
--- a/grub-core/kern/ieee1275/ieee1275.c
+++ b/grub-core/kern/ieee1275/ieee1275.c
@@ -27,7 +27,7 @@
 \f
 
 int
-grub_ieee1275_finddevice (char *name, grub_ieee1275_phandle_t *phandlep)
+grub_ieee1275_finddevice (const char *name, grub_ieee1275_phandle_t *phandlep)
 {
   struct find_device_args
   {

diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
index 3568ffe64ab66818a1e630f5257f1c0afaa2b79e..ee81b4ef90622036391b2950530ac11d25ae9240 100644 (file)
--- a/grub-core/kern/ieee1275/openfw.c
+++ b/grub-core/kern/ieee1275/openfw.c
@@ -34,7 +34,7 @@ enum grub_ieee1275_parse_type
 
 /* Walk children of 'devpath', calling hook for each.  */
 int
-grub_children_iterate (char *devpath,
+grub_children_iterate (const char *devpath,
                       int (*hook) (struct grub_ieee1275_devalias *alias))
 {
   grub_ieee1275_phandle_t dev;

diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
index be3835a4242dbcbd605629186d19c6f585599091..b84d756976574c02bc366b74c483419349b59c27 100644 (file)
--- a/include/grub/ieee1275/ieee1275.h
+++ b/include/grub/ieee1275/ieee1275.h
@@ -125,7 +125,7 @@ extern void EXPORT_FUNC(grub_ieee1275_set_flag) (enum grub_ieee1275_flag flag);
 
 
 void EXPORT_FUNC(grub_ieee1275_init) (void);
-int EXPORT_FUNC(grub_ieee1275_finddevice) (char *name,
+int EXPORT_FUNC(grub_ieee1275_finddevice) (const char *name,
                                           grub_ieee1275_phandle_t *phandlep);
 int EXPORT_FUNC(grub_ieee1275_get_property) (grub_ieee1275_phandle_t phandle,
                                             const char *property, void *buf,
@@ -184,10 +184,8 @@ int EXPORT_FUNC(grub_ieee1275_milliseconds) (grub_uint32_t *msecs);
 
 int EXPORT_FUNC(grub_devalias_iterate)
      (int (*hook) (struct grub_ieee1275_devalias *alias));
-int EXPORT_FUNC(grub_children_iterate) (char *devpath,
+int EXPORT_FUNC(grub_children_iterate) (const char *devpath,
      int (*hook) (struct grub_ieee1275_devalias *alias));
-grub_err_t EXPORT_FUNC(grub_machine_mmap_iterate)
-     (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
 int EXPORT_FUNC(grub_claimmap) (grub_addr_t addr, grub_size_t size);
 
 int