[PATCH] fix endianess in IEEE-1275 integer properties

[Robert Millan <rmh@aybabtu.com>]

[-- Attachment #1: Type: text/plain, Size: 516 bytes --]


Integer properties are always in big endian.  This (incomplete) patch is my
suggested approach to deal with this.  I'd like to receive input about it
before I complete it (checking all calls to grub_ieee1275_get_property
through GRUB and replacing with grub_ieee1275_get_integer_property when
appropiate).

Again, some testing on Apple/IBM/Genesi hardware would be nice.

-- 
Robert Millan

<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call, if you are unable to speak?
(as seen on /.)

[-- Attachment #2: ieee1275_endianess.diff --]
[-- Type: text/x-diff, Size: 2781 bytes --]

diff -urp endianess.old/include/grub/ieee1275/ieee1275.h endianess/include/grub/ieee1275/ieee1275.h
--- endianess.old/include/grub/ieee1275/ieee1275.h	2007-07-22 11:05:10.000000000 +0200
+++ endianess/include/grub/ieee1275/ieee1275.h	2008-01-13 21:27:19.000000000 +0100
@@ -97,6 +97,10 @@ int EXPORT_FUNC(grub_ieee1275_get_proper
 					     const char *property, void *buf,
 					     grub_size_t size,
 					     grub_ssize_t *actual);
+int EXPORT_FUNC(grub_ieee1275_get_integer_property) (grub_ieee1275_phandle_t phandle,
+						     const char *property, grub_uint32_t *buf,
+						     grub_size_t size,
+						     grub_ssize_t *actual);
 int EXPORT_FUNC(grub_ieee1275_next_property) (grub_ieee1275_phandle_t phandle,
 					      char *prev_prop, char *prop);
 int EXPORT_FUNC(grub_ieee1275_get_property_length) 
diff -urp endianess.old/kern/ieee1275/ieee1275.c endianess/kern/ieee1275/ieee1275.c
--- endianess.old/kern/ieee1275/ieee1275.c	2007-07-22 01:32:27.000000000 +0200
+++ endianess/kern/ieee1275/ieee1275.c	2008-01-13 21:27:19.000000000 +0100
@@ -18,6 +18,7 @@
  */
 
 #include <grub/ieee1275/ieee1275.h>
+#include <grub/types.h>
 
 #define IEEE1275_PHANDLE_INVALID  ((grub_ieee1275_phandle_t) -1)
 #define IEEE1275_IHANDLE_INVALID  ((grub_ieee1275_ihandle_t) 0)
@@ -89,6 +90,25 @@ grub_ieee1275_get_property (grub_ieee127
 }
 
 int
+grub_ieee1275_get_integer_property (grub_ieee1275_phandle_t phandle,
+				    const char *property, grub_uint32_t *buf,
+				    grub_size_t size, grub_ssize_t *actual)
+{
+  int ret;
+  ret = grub_ieee1275_get_property (phandle, property, (void *) buf, size, actual);
+#ifndef GRUB_CPU_WORDS_BIGENDIAN
+  /* Integer properties are always in big endian.  */
+  {
+    int i;
+    size /= sizeof (grub_uint32_t);
+    for (i = 0; i < size; i++)
+      buf[i] = grub_be_to_cpu32 (buf[i]);
+  }
+#endif
+  return ret;
+}
+
+int
 grub_ieee1275_next_property (grub_ieee1275_phandle_t phandle, char *prev_prop,
 			     char *prop)
 {
diff -urp endianess.old/kern/powerpc/ieee1275/openfw.c endianess/kern/powerpc/ieee1275/openfw.c
--- endianess.old/kern/powerpc/ieee1275/openfw.c	2008-01-13 21:27:09.000000000 +0100
+++ endianess/kern/powerpc/ieee1275/openfw.c	2008-01-13 21:27:19.000000000 +0100
@@ -157,8 +157,8 @@ grub_err_t grub_available_iterate (int (
   if (grub_ieee1275_finddevice ("/memory", &memory))
     return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
 		       "Couldn't find /memory node");
-  if (grub_ieee1275_get_property (memory, "available", available,
-				  sizeof available, &available_size))
+  if (grub_ieee1275_get_integer_property (memory, "available", available,
+					  sizeof available, &available_size))
     return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
 		       "Couldn't examine /memory/available property");