[2076] * disk/ieee1275/nand.c (grub_nand_open): All ieee1275 call arg
"David S. Miller" <[email protected]>
| Newsgroups | gmane.comp.boot-loaders.grub.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 2076
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2076
Author: davem
Date: 2009-04-11 03:07:58 +0000 (Sat, 11 Apr 2009)
Log Message:
-----------
* disk/ieee1275/nand.c (grub_nand_open): All ieee1275 call arg
slots are of type grub_ieee1275_cell_t.
(grub_nand_read): Likewise.
* kern/ieee1275/ieee1275.c (IEEE1275_PHANDLE_INVALID,
IEEE1275_IHANDLE_INVALID): Use grub_ieee1275_cell_t since these
macros are used to compare values in arg/ret block of the call.
(grub_ieee1275_finddevice, grub_ieee1275_get_property,
grub_ieee1275_next_property, grub_ieee1275_get_property_length,
grub_ieee1275_instance_to_package, grub_ieee1275_package_to_path,
grub_ieee1275_instance_to_path, grub_ieee1275_write,
grub_ieee1275_read, grub_ieee1275_seek, grub_ieee1275_peer,
grub_ieee1275_child, grub_ieee1275_parent, grub_ieee1275_open,
grub_ieee1275_close, grub_ieee1275_set_property,
grub_ieee1275_set_color): All ieee1275 call arg slots are of type
grub_ieee1275_cell_t.
* kern/ieee1275/openfw.c (grub_map): Likewise.
* include/grub/ieee1275/ieee1275.h (grub_ieee1275_ihandle_t,
grub_ieee1275_phandle_t): Define as grub_unit32_t type.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/disk/ieee1275/nand.c
trunk/grub2/include/grub/ieee1275/ieee1275.h
trunk/grub2/kern/ieee1275/ieee1275.c
trunk/grub2/kern/ieee1275/openfw.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-04-10 21:47:08 UTC (rev 2075)
+++ trunk/grub2/ChangeLog 2009-04-11 03:07:58 UTC (rev 2076)
@@ -1,3 +1,24 @@
+2009-04-10 David S. Miller <[email protected]>
+
+ * disk/ieee1275/nand.c (grub_nand_open): All ieee1275 call arg
+ slots are of type grub_ieee1275_cell_t.
+ (grub_nand_read): Likewise.
+ * kern/ieee1275/ieee1275.c (IEEE1275_PHANDLE_INVALID,
+ IEEE1275_IHANDLE_INVALID): Use grub_ieee1275_cell_t since these
+ macros are used to compare values in arg/ret block of the call.
+ (grub_ieee1275_finddevice, grub_ieee1275_get_property,
+ grub_ieee1275_next_property, grub_ieee1275_get_property_length,
+ grub_ieee1275_instance_to_package, grub_ieee1275_package_to_path,
+ grub_ieee1275_instance_to_path, grub_ieee1275_write,
+ grub_ieee1275_read, grub_ieee1275_seek, grub_ieee1275_peer,
+ grub_ieee1275_child, grub_ieee1275_parent, grub_ieee1275_open,
+ grub_ieee1275_close, grub_ieee1275_set_property,
+ grub_ieee1275_set_color): All ieee1275 call arg slots are of type
+ grub_ieee1275_cell_t.
+ * kern/ieee1275/openfw.c (grub_map): Likewise.
+ * include/grub/ieee1275/ieee1275.h (grub_ieee1275_ihandle_t,
+ grub_ieee1275_phandle_t): Define as grub_unit32_t type.
+
2009-04-10 Vladimir Serbinenko <[email protected]>
UFS improvements
Modified: trunk/grub2/disk/ieee1275/nand.c
===================================================================
--- trunk/grub2/disk/ieee1275/nand.c 2009-04-10 21:47:08 UTC (rev 2075)
+++ trunk/grub2/disk/ieee1275/nand.c 2009-04-11 03:07:58 UTC (rev 2076)
@@ -60,8 +60,8 @@
struct size_args
{
struct grub_ieee1275_common_hdr common;
- char *method;
- grub_ieee1275_ihandle_t ihandle;
+ grub_ieee1275_cell_t method;
+ grub_ieee1275_cell_t ihandle;
grub_ieee1275_cell_t result;
grub_ieee1275_cell_t size1;
grub_ieee1275_cell_t size2;
@@ -84,7 +84,7 @@
data->handle = dev_ihandle;
INIT_IEEE1275_COMMON (&args.common, "call-method", 2, 2);
- args.method = "block-size";
+ args.method = (grub_ieee1275_cell_t) "block-size";
args.ihandle = dev_ihandle;
args.result = 1;
@@ -97,7 +97,7 @@
data->block_size = (args.size1 >> GRUB_DISK_SECTOR_BITS);
INIT_IEEE1275_COMMON (&args.common, "call-method", 2, 3);
- args.method = "size";
+ args.method = (grub_ieee1275_cell_t) "size";
args.ihandle = dev_ihandle;
args.result = 1;
@@ -143,8 +143,8 @@
struct read_args
{
struct grub_ieee1275_common_hdr common;
- char *method;
- grub_ieee1275_ihandle_t ihandle;
+ grub_ieee1275_cell_t method;
+ grub_ieee1275_cell_t ihandle;
grub_ieee1275_cell_t ofs;
grub_ieee1275_cell_t page;
grub_ieee1275_cell_t len;
@@ -153,7 +153,7 @@
} args;
INIT_IEEE1275_COMMON (&args.common, "call-method", 6, 1);
- args.method = "pio-read";
+ args.method = (grub_ieee1275_cell_t) "pio-read";
args.ihandle = data->handle;
args.buf = (grub_ieee1275_cell_t) buf;
args.page = (grub_ieee1275_cell_t) ((grub_size_t) sector / data->block_size);
Modified: trunk/grub2/include/grub/ieee1275/ieee1275.h
===================================================================
--- trunk/grub2/include/grub/ieee1275/ieee1275.h 2009-04-10 21:47:08 UTC (rev 2075)
+++ trunk/grub2/include/grub/ieee1275/ieee1275.h 2009-04-11 03:07:58 UTC (rev 2076)
@@ -60,8 +60,8 @@
(p)->nr_ins = (grub_ieee1275_cell_t) xins; \
(p)->nr_outs = (grub_ieee1275_cell_t) xouts
-typedef grub_ieee1275_cell_t grub_ieee1275_ihandle_t;
-typedef grub_ieee1275_cell_t grub_ieee1275_phandle_t;
+typedef grub_uint32_t grub_ieee1275_ihandle_t;
+typedef grub_uint32_t grub_ieee1275_phandle_t;
extern grub_ieee1275_phandle_t EXPORT_VAR(grub_ieee1275_chosen);
extern grub_ieee1275_ihandle_t EXPORT_VAR(grub_ieee1275_mmu);
Modified: trunk/grub2/kern/ieee1275/ieee1275.c
===================================================================
--- trunk/grub2/kern/ieee1275/ieee1275.c 2009-04-10 21:47:08 UTC (rev 2075)
+++ trunk/grub2/kern/ieee1275/ieee1275.c 2009-04-11 03:07:58 UTC (rev 2076)
@@ -20,8 +20,8 @@
#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)
+#define IEEE1275_PHANDLE_INVALID ((grub_ieee1275_cell_t) -1)
+#define IEEE1275_IHANDLE_INVALID ((grub_ieee1275_cell_t) 0)
#define IEEE1275_CELL_INVALID ((grub_ieee1275_cell_t) -1)
@@ -33,7 +33,7 @@
{
struct grub_ieee1275_common_hdr common;
grub_ieee1275_cell_t device;
- grub_ieee1275_phandle_t phandle;
+ grub_ieee1275_cell_t phandle;
}
args;
@@ -56,7 +56,7 @@
struct get_property_args
{
struct grub_ieee1275_common_hdr common;
- grub_ieee1275_phandle_t phandle;
+ grub_ieee1275_cell_t phandle;
grub_ieee1275_cell_t prop;
grub_ieee1275_cell_t buf;
grub_ieee1275_cell_t buflen;
@@ -106,7 +106,7 @@
struct get_property_args
{
struct grub_ieee1275_common_hdr common;
- grub_ieee1275_phandle_t phandle;
+ grub_ieee1275_cell_t phandle;
grub_ieee1275_cell_t prev_prop;
grub_ieee1275_cell_t next_prop;
grub_ieee1275_cell_t flags;
@@ -131,7 +131,7 @@
struct get_property_args
{
struct grub_ieee1275_common_hdr common;
- grub_ieee1275_phandle_t phandle;
+ grub_ieee1275_cell_t phandle;
grub_ieee1275_cell_t prop;
grub_ieee1275_cell_t length;
}
@@ -157,8 +157,8 @@
struct instance_to_package_args
{
struct grub_ieee1275_common_hdr common;
- grub_ieee1275_ihandle_t ihandle;
- grub_ieee1275_phandle_t phandle;
+ grub_ieee1275_cell_t ihandle;
+ grub_ieee1275_cell_t phandle;
}
args;
@@ -181,7 +181,7 @@
struct instance_to_package_args
{
struct grub_ieee1275_common_hdr common;
- grub_ieee1275_phandle_t phandle;
+ grub_ieee1275_cell_t phandle;
grub_ieee1275_cell_t buf;
grub_ieee1275_cell_t buflen;
grub_ieee1275_cell_t actual;
@@ -210,7 +210,7 @@
struct instance_to_path_args
{
struct grub_ieee1275_common_hdr common;
- grub_ieee1275_ihandle_t ihandle;
+ grub_ieee1275_cell_t ihandle;
grub_ieee1275_cell_t buf;
grub_ieee1275_cell_t buflen;
grub_ieee1275_cell_t actual;
@@ -238,7 +238,7 @@
struct write_args
{
struct grub_ieee1275_common_hdr common;
- grub_ieee1275_ihandle_t ihandle;
+ grub_ieee1275_cell_t ihandle;
grub_ieee1275_cell_t buf;
grub_ieee1275_cell_t len;
grub_ieee1275_cell_t actual;
@@ -264,7 +264,7 @@
struct write_args
{
struct grub_ieee1275_common_hdr common;
- grub_ieee1275_ihandle_t ihandle;
+ grub_ieee1275_cell_t ihandle;
grub_ieee1275_cell_t buf;
grub_ieee1275_cell_t len;
grub_ieee1275_cell_t actual;
@@ -290,7 +290,7 @@
struct write_args
{
struct grub_ieee1275_common_hdr common;
- grub_ieee1275_ihandle_t ihandle;
+ grub_ieee1275_cell_t ihandle;
grub_ieee1275_cell_t pos_hi;
grub_ieee1275_cell_t pos_lo;
grub_ieee1275_cell_t result;
@@ -317,8 +317,8 @@
struct peer_args
{
struct grub_ieee1275_common_hdr common;
- grub_ieee1275_phandle_t node;
- grub_ieee1275_phandle_t result;
+ grub_ieee1275_cell_t node;
+ grub_ieee1275_cell_t result;
}
args;
@@ -340,8 +340,8 @@
struct child_args
{
struct grub_ieee1275_common_hdr common;
- grub_ieee1275_phandle_t node;
- grub_ieee1275_phandle_t result;
+ grub_ieee1275_cell_t node;
+ grub_ieee1275_cell_t result;
}
args;
@@ -364,8 +364,8 @@
struct parent_args
{
struct grub_ieee1275_common_hdr common;
- grub_ieee1275_phandle_t node;
- grub_ieee1275_phandle_t result;
+ grub_ieee1275_cell_t node;
+ grub_ieee1275_cell_t result;
}
args;
@@ -441,7 +441,7 @@
{
struct grub_ieee1275_common_hdr common;
grub_ieee1275_cell_t path;
- grub_ieee1275_ihandle_t result;
+ grub_ieee1275_cell_t result;
}
args;
@@ -462,7 +462,7 @@
struct close_args
{
struct grub_ieee1275_common_hdr common;
- grub_ieee1275_ihandle_t ihandle;
+ grub_ieee1275_cell_t ihandle;
}
args;
@@ -531,7 +531,7 @@
struct set_property_args
{
struct grub_ieee1275_common_hdr common;
- grub_ieee1275_phandle_t phandle;
+ grub_ieee1275_cell_t phandle;
grub_ieee1275_cell_t propname;
grub_ieee1275_cell_t buf;
grub_ieee1275_cell_t size;
@@ -560,8 +560,8 @@
struct set_color_args
{
struct grub_ieee1275_common_hdr common;
- char *method;
- grub_ieee1275_ihandle_t ihandle;
+ grub_ieee1275_cell_t method;
+ grub_ieee1275_cell_t ihandle;
grub_ieee1275_cell_t index;
grub_ieee1275_cell_t b;
grub_ieee1275_cell_t g;
@@ -571,7 +571,7 @@
args;
INIT_IEEE1275_COMMON (&args.common, "call-method", 6, 1);
- args.method = "color!";
+ args.method = (grub_ieee1275_cell_t) "color!";
args.ihandle = ihandle;
args.index = index;
args.r = r;
Modified: trunk/grub2/kern/ieee1275/openfw.c
===================================================================
--- trunk/grub2/kern/ieee1275/openfw.c 2009-04-10 21:47:08 UTC (rev 2075)
+++ trunk/grub2/kern/ieee1275/openfw.c 2009-04-11 03:07:58 UTC (rev 2076)
@@ -154,17 +154,17 @@
{
struct map_args {
struct grub_ieee1275_common_hdr common;
- char *method;
- grub_ieee1275_ihandle_t ihandle;
- grub_uint32_t mode;
- grub_uint32_t size;
- grub_uint32_t virt;
- grub_uint32_t phys;
- int catch_result;
+ grub_ieee1275_cell_t method;
+ grub_ieee1275_cell_t ihandle;
+ grub_ieee1275_cell_t mode;
+ grub_ieee1275_cell_t size;
+ grub_ieee1275_cell_t virt;
+ grub_ieee1275_cell_t phys;
+ grub_ieee1275_cell_t catch_result;
} args;
INIT_IEEE1275_COMMON (&args.common, "call-method", 6, 1);
- args.method = "map";
+ args.method = (grub_ieee1275_cell_t) "map";
args.ihandle = grub_ieee1275_mmu;
args.phys = phys;
args.virt = virt;