Changeset 04803bf in mainline for boot/genarch/include/ofw.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes (needs fixes).

File:

• boot/genarch/include/ofw.h (moved) (moved from boot/genarch/ofw.h ) (3 diffs)

boot/genarch/include/ofw.h

@@ -30 +30 @@
 #define BOOT_OFW_H_
 
-#include <types.h>
+#include <typedefs.h>
 #include <stdarg.h>
 
-#define BUF_SIZE  1024
+#define MEMMAP_MAX_RECORDS  32
+#define MAX_OFW_ARGS        12
 
-#define MEMMAP_MAX_RECORDS  32
+#define OFW_TREE_PATH_MAX_LEN           256
+#define OFW_TREE_PROPERTY_MAX_NAMELEN   32
+#define OFW_TREE_PROPERTY_MAX_VALUELEN  64
 
-#define MAX_OFW_ARGS  12
-
-typedef unative_t ofw_arg_t;
-typedef unsigned int ihandle;
-typedef unsigned int phandle;
+typedef sysarg_t ofw_arg_t;
+typedef native_t ofw_ret_t;
+typedef uint32_t ofw_prop_t;
+typedef uint32_t ihandle;
+typedef uint32_t phandle;
 
 /** OpenFirmware command structure
@@ -55 +58 @@
 typedef struct {
         void *start;
-        uint32_t size;
+        size_t size;
 } memzone_t;
 
 typedef struct {
-        uint32_t total;
-        uint32_t count;
+        uint64_t total;
+        size_t cnt;
         memzone_t zones[MEMMAP_MAX_RECORDS];
 } memmap_t;
@@ -83 +86 @@
 extern ihandle ofw_mmu;
 extern phandle ofw_memory;
-extern phandle ofw_aliases;
 
 extern void ofw_init(void);
 
-extern void ofw_write(const char *str, const int len);
+extern void ofw_putchar(const char);
 
-extern int ofw_get_property(const phandle device, const char *name, void *buf, const int buflen);
-extern int ofw_get_proplen(const phandle device, const char *name);
-extern int ofw_next_property(const phandle device, char *previous, char *buf);
+extern ofw_arg_t ofw_get_property(const phandle, const char *, void *,
+    const size_t);
+extern ofw_arg_t ofw_get_proplen(const phandle, const char *);
+extern ofw_arg_t ofw_next_property(const phandle, char *, char *);
 
-extern phandle ofw_get_child_node(const phandle node);
-extern phandle ofw_get_peer_node(const phandle node);
-extern phandle ofw_find_device(const char *name);
+extern phandle ofw_get_child_node(const phandle);
+extern phandle ofw_get_peer_node(const phandle);
+extern phandle ofw_find_device(const char *);
 
-extern int ofw_package_to_path(const phandle device, char *buf, const int buflen);
+extern ofw_arg_t ofw_package_to_path(const phandle, char *, const size_t);
 
-extern int ofw(ofw_args_t *arg);
-extern unsigned long ofw_call(const char *service, const int nargs, const int nret, ofw_arg_t *rets, ...);
-extern unsigned int ofw_get_address_cells(const phandle device);
-extern unsigned int ofw_get_size_cells(const phandle device);
-extern void *ofw_translate(const void *virt);
-extern int ofw_translate_failed(ofw_arg_t flag);
-extern void *ofw_claim_virt(const void *virt, const unsigned int len);
-extern void *ofw_claim_phys(const void *virt, const unsigned int len);
-extern void *ofw_claim_phys_any(const unsigned int len, const unsigned int alignment);
-extern int ofw_map(const void *phys, const void *virt, const unsigned int size, const int mode);
-extern int ofw_memmap(memmap_t *map);
-extern int ofw_setup_palette(void);
+extern ofw_arg_t ofw(ofw_args_t *);
+extern ofw_arg_t ofw_call(const char *, const size_t, const size_t, ofw_arg_t *,
+    ...);
+
+extern size_t ofw_get_address_cells(const phandle);
+extern size_t ofw_get_size_cells(const phandle);
+
+extern void *ofw_translate(const void *);
+
+extern void ofw_claim_virt(const void *, const size_t);
+extern void *ofw_claim_virt_any(const size_t, const size_t);
+
+extern void ofw_claim_phys(const void *, const size_t);
+extern void *ofw_claim_phys_any(const size_t, const size_t);
+
+extern void ofw_map(const void *, const void *, const size_t,
+    const ofw_arg_t);
+
+extern void ofw_alloc(const char *, void **, void **, const size_t, void *);
+
+extern void ofw_memmap(memmap_t *);
+extern void ofw_setup_screens(void);
 extern void ofw_quiesce(void);