Changeset b50b5af2 in mainline for boot/genarch/ofw.h

Timestamp:

2009-08-22T10:48:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (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.

File:

• boot/genarch/ofw.h (modified) (4 diffs)

boot/genarch/ofw.h

@@ -33 +33 @@
 #include <stdarg.h>
 
-#define BUF_SIZE                1024
+#define BUF_SIZE  1024
 
-#define MEMMAP_MAX_RECORDS      32
+#define MEMMAP_MAX_RECORDS  32
 
-#define MAX_OFW_ARGS            12
+#define MAX_OFW_ARGS  12
 
 typedef unative_t ofw_arg_t;
@@ -47 +47 @@
  */
 typedef struct {
-        ofw_arg_t service;              /**< Command name. */
-        ofw_arg_t nargs;                /**< Number of in arguments. */
-        ofw_arg_t nret;                 /**< Number of out arguments. */
-        ofw_arg_t args[MAX_OFW_ARGS];   /**< List of arguments. */
+        ofw_arg_t service;             /**< Command name. */
+        ofw_arg_t nargs;               /**< Number of in arguments. */
+        ofw_arg_t nret;                /**< Number of out arguments. */
+        ofw_arg_t args[MAX_OFW_ARGS];  /**< List of arguments. */
 } ofw_args_t;
 
@@ -63 +63 @@
         memzone_t zones[MEMMAP_MAX_RECORDS];
 } memmap_t;
-
-typedef struct {
-        void *addr;
-        uint32_t width;
-        uint32_t height;
-        uint32_t bpp;
-        uint32_t scanline;
-} screen_t;
-
-typedef struct {
-        void *addr;
-        uint32_t size;
-} macio_t;
 
 typedef struct {
@@ -118 +105 @@
 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 int len);
-extern void *ofw_claim_phys(const void *virt, const int len);
-extern int ofw_map(const void *phys, const void *virt, const int size, const int mode);
+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_screen(screen_t *screen);
-extern int ofw_macio(macio_t *macio);
 extern int ofw_setup_palette(void);
 extern void ofw_quiesce(void);