From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1JEkq0-0001j4-05 for mharc-grub-devel@gnu.org; Tue, 15 Jan 2008 07:24:16 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JEkpy-0001io-PE for grub-devel@gnu.org; Tue, 15 Jan 2008 07:24:14 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JEkpy-0001iW-7W for grub-devel@gnu.org; Tue, 15 Jan 2008 07:24:14 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JEkpy-0001iS-4E for grub-devel@gnu.org; Tue, 15 Jan 2008 07:24:14 -0500 Received: from aybabtu.com ([69.60.117.155]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JEkpx-0000yr-KR for grub-devel@gnu.org; Tue, 15 Jan 2008 07:24:13 -0500 Received: from [192.168.10.6] (helo=thorin) by aybabtu.com with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1JEkpr-0004sB-DB for grub-devel@gnu.org; Tue, 15 Jan 2008 13:24:12 +0100 Received: from rmh by thorin with local (Exim 4.63) (envelope-from ) id 1JEko6-0000BE-47 for grub-devel@gnu.org; Tue, 15 Jan 2008 13:22:18 +0100 Date: Tue, 15 Jan 2008 13:22:18 +0100 From: Robert Millan To: The development of GRUB 2 Message-ID: <20080115122218.GG31275@thorin> References: <20080113203041.GA25702@thorin> <1200320439.13534.4.camel@dv> <20080114142731.GA28109@thorin> <20080114234930.i3cws167e68c8osc@webmail.spamcop.net> <20080115121257.GF31275@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="h31gzZEtNLTqOjlF" Content-Disposition: inline In-Reply-To: <20080115121257.GF31275@thorin> Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.13 (2006-08-11) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. Subject: Re: [PATCH] fix endianess in IEEE-1275 integer properties X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 12:24:15 -0000 --h31gzZEtNLTqOjlF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Jan 15, 2008 at 01:12:57PM +0100, Robert Millan wrote: > > Ok. Checked in the first one. I'll complete the second now. Here. Please can you test? -- Robert Millan I know my rights; I want my phone call! What use is a phone call, if you are unable to speak? (as seen on /.) --h31gzZEtNLTqOjlF Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="integer.diff" * include/grub/ieee1275/ieee1275.h (grub_ieee1275_get_integer_property): New function prototype. * kern/ieee1275/ieee1275.c: Include `'. (grub_ieee1275_get_integer_property): New function. Wraps around grub_ieee1275_get_property() to handle endianess. * kern/powerpc/ieee1275/cmain.c (grub_ieee1275_find_options): Replace grub_ieee1275_get_property() with grub_ieee1275_get_integer_property() where appropiate. * kern/powerpc/ieee1275/openfw.c (grub_available_iterate): Likewise. (grub_map): Likewise. * kern/sparc64/ieee1275/openfw.c (grub_map): Likewise. diff -urp grub2/include/grub/ieee1275/ieee1275.h integer/include/grub/ieee1275/ieee1275.h --- grub2/include/grub/ieee1275/ieee1275.h 2007-07-22 11:05:10.000000000 +0200 +++ integer/include/grub/ieee1275/ieee1275.h 2008-01-15 13:17:27.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 grub2/kern/ieee1275/ieee1275.c integer/kern/ieee1275/ieee1275.c --- grub2/kern/ieee1275/ieee1275.c 2007-07-22 01:32:27.000000000 +0200 +++ integer/kern/ieee1275/ieee1275.c 2008-01-15 13:17:27.000000000 +0100 @@ -18,6 +18,7 @@ */ #include +#include #define IEEE1275_PHANDLE_INVALID ((grub_ieee1275_phandle_t) -1) #define IEEE1275_IHANDLE_INVALID ((grub_ieee1275_ihandle_t) 0) @@ -89,6 +90,26 @@ 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. */ + if (ret == 0) + { + 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 grub2/kern/powerpc/ieee1275/cmain.c integer/kern/powerpc/ieee1275/cmain.c --- grub2/kern/powerpc/ieee1275/cmain.c 2007-12-30 09:52:05.000000000 +0100 +++ integer/kern/powerpc/ieee1275/cmain.c 2008-01-15 13:17:27.000000000 +0100 @@ -56,8 +56,8 @@ grub_ieee1275_find_options (void) int is_smartfirmware = 0; grub_ieee1275_finddevice ("/options", &options); - rc = grub_ieee1275_get_property (options, "real-mode?", &realmode, - sizeof realmode, 0); + rc = grub_ieee1275_get_integer_property (options, "real-mode?", &realmode, + sizeof realmode, 0); if ((rc >= 0) && realmode) grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_REAL_MODE); diff -urp grub2/kern/powerpc/ieee1275/openfw.c integer/kern/powerpc/ieee1275/openfw.c --- grub2/kern/powerpc/ieee1275/openfw.c 2008-01-15 13:13:58.000000000 +0100 +++ integer/kern/powerpc/ieee1275/openfw.c 2008-01-15 13:17:27.000000000 +0100 @@ -148,17 +148,17 @@ grub_err_t grub_available_iterate (int ( /* Determine the format of each entry in `available'. */ grub_ieee1275_finddevice ("/", &root); - grub_ieee1275_get_property (root, "#address-cells", &address_cells, - sizeof address_cells, 0); - grub_ieee1275_get_property (root, "#size-cells", &size_cells, - sizeof size_cells, 0); + grub_ieee1275_get_integer_property (root, "#address-cells", &address_cells, + sizeof address_cells, 0); + grub_ieee1275_get_integer_property (root, "#size-cells", &size_cells, + sizeof size_cells, 0); /* Load `/memory/available'. */ 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"); @@ -203,8 +203,8 @@ grub_map (grub_addr_t phys, grub_addr_t grub_ieee1275_ihandle_t mmu; int len; - grub_ieee1275_get_property (grub_ieee1275_chosen, "mmu", &mmu, sizeof mmu, - &len); + grub_ieee1275_get_integer_property (grub_ieee1275_chosen, "mmu", &mmu, sizeof mmu, + &len); if (len != sizeof mmu) return -1; diff -urp grub2/kern/sparc64/ieee1275/openfw.c integer/kern/sparc64/ieee1275/openfw.c --- grub2/kern/sparc64/ieee1275/openfw.c 2007-12-30 09:52:05.000000000 +0100 +++ integer/kern/sparc64/ieee1275/openfw.c 2008-01-15 13:17:27.000000000 +0100 @@ -183,8 +183,8 @@ grub_map (grub_addr_t phys, grub_addr_t grub_ieee1275_ihandle_t mmu; grub_ssize_t len; - grub_ieee1275_get_property (grub_ieee1275_chosen, "mmu", &mmu, sizeof mmu, - &len); + grub_ieee1275_get_integer_property (grub_ieee1275_chosen, "mmu", &mmu, sizeof mmu, + &len); if (len != sizeof mmu) return -1; --h31gzZEtNLTqOjlF--