2004-09-14 Yoshinori K. Okuji <okuji@enbug.org>

  From Hollis Blanchard <hollis@penguinppc.org>:
  * kern/misc.c (memmove): New alias for grub_memmove.
  (memcmp): New alias for grub_memcmp.
  (memset): New alias for grub_memset.
  * boot/powerpc/ieee1275/ieee1275.c (grub_ieee1275_get_property):
  Change "int handle" to "grub_ieee1275_phandle_t handle".
  * include/grub/powerpc/ieee1275/ieee1275.h
  (grub_ieee1275_get_property): Likewise.

diff --git a/ChangeLog b/ChangeLog
index e66c700774319a2a79dd7f57ea2bddb41479b5e8..2f635990c9d58d1178d40ee68479f91bdcf5b6cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-09-14  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       From Hollis Blanchard <hollis@penguinppc.org>:
+       * kern/misc.c (memmove): New alias for grub_memmove.
+       (memcmp): New alias for grub_memcmp.
+       (memset): New alias for grub_memset.
+       * boot/powerpc/ieee1275/ieee1275.c (grub_ieee1275_get_property): 
+       Change "int handle" to "grub_ieee1275_phandle_t handle".
+       * include/grub/powerpc/ieee1275/ieee1275.h 
+       (grub_ieee1275_get_property): Likewise.
+       
 2004-09-12  Tomas Ebenlendr  <ebik@ucw.cz>
 
        Added normal mode command `chainloader' as module chain.mod, which

diff --git a/THANKS b/THANKS
index 5b851be284915e8c12774491c26f523e7e12ed40..c84c6ba595f2735e10ef23041ff23b88b86eedf4 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -6,6 +6,7 @@ The following people made especially gracious contributions of their
 time and energy in helping to track down bugs, add new features, and
 generally assist in the GRUB 2 maintainership process:
 
+Hollis Blanchard <hollis@penguinppc.org>
 NIIBE Yutaka <gniibe@m17n.org>
 Tsuneyoshi Yasuo <tuneyoshi@naic.co.jp>
 

diff --git a/boot/powerpc/ieee1275/ieee1275.c b/boot/powerpc/ieee1275/ieee1275.c
index 580e829848c18a452338cff0a1a2ac1c4810096e..1658687fb118f9a0553bbf0882961c63344fd4ea 100644 (file)
--- a/boot/powerpc/ieee1275/ieee1275.c
+++ b/boot/powerpc/ieee1275/ieee1275.c
@@ -75,7 +75,8 @@ grub_ieee1275_finddevice (char *name, grub_ieee1275_phandle_t *phandlep)
 }
 
 int
-grub_ieee1275_get_property (int handle, const char *property, void *buf,
+grub_ieee1275_get_property (grub_ieee1275_phandle_t handle,
+                           const char *property, void *buf,
                            grub_size_t size, grub_size_t *actual)
 {
   struct get_property_args {

diff --git a/include/grub/powerpc/ieee1275/ieee1275.h b/include/grub/powerpc/ieee1275/ieee1275.h
index ef3bb80c77b86784075da03acf898cd25e005c28..b58f49df650cdeee90527635adf6d1366457de34 100644 (file)
--- a/include/grub/powerpc/ieee1275/ieee1275.h
+++ b/include/grub/powerpc/ieee1275/ieee1275.h
@@ -49,8 +49,9 @@ extern intptr_t (*grub_ieee1275_entry_fn) (void *);
 uint32_t EXPORT_FUNC(grub_ieee1275_decode_int_4) (unsigned char *p);
 int EXPORT_FUNC(grub_ieee1275_finddevice) (char *name,
                                           grub_ieee1275_phandle_t *phandlep);
-int EXPORT_FUNC(grub_ieee1275_get_property) (int handle, const char *property,
-                                            void *buf, grub_size_t size,
+int EXPORT_FUNC(grub_ieee1275_get_property) (grub_ieee1275_phandle_t handle,
+                                            const char *property, void *buf,
+                                            grub_size_t size,
                                             grub_size_t *actual);
 int EXPORT_FUNC(grub_ieee1275_next_property) (int handle, char *prev_prop,
                                              char *prop, int *flags);

diff --git a/kern/misc.c b/kern/misc.c
index 36604ac68045a00695015c535b4f613f25a6a86f..df1e7badefb16a8c9575732543022af60bd9da89 100644 (file)
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -45,6 +45,8 @@ grub_memmove (void *dest, const void *src, grub_size_t n)
   
   return dest;
 }
+void *memmove (void *dest, const void *src, grub_size_t n)
+  __attribute__ ((alias ("grub_memmove")));
 /* GCC emits references to memcpy() for struct copies etc.  */
 void *memcpy (void *dest, const void *src, grub_size_t n)
   __attribute__ ((alias ("grub_memmove")));
@@ -134,6 +136,8 @@ grub_memcmp (const void *s1, const void *s2, grub_size_t n)
 
   return 0;
 }
+void *memcmp (const void *s1, const void *s2, grub_size_t n)
+  __attribute__ ((alias ("grub_memcmp")));
 
 int
 grub_strcmp (const char *s1, const char *s2)
@@ -359,6 +363,8 @@ grub_memset (void *s, int c, grub_size_t n)
 
   return s;
 }
+void *memset (void *s, int c, grub_size_t n)
+  __attribute__ ((alias ("grub_memset")));
 
 grub_size_t
 grub_strlen (const char *s)