Changeset 1787e527 in mainline for kernel/genarch/include/ofw/ebus.h

Timestamp:

2009-11-16T21:22:54Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5ebdf94

Parents:

fcbd1be (diff), 9c70ed6 (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:

merged with head (unstable)

File:

• kernel/genarch/include/ofw/ebus.h (moved) (moved from uspace/lib/libc/arch/mips32/include/stackarg.h ) (2 diffs)

kernel/genarch/include/ofw/ebus.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2006 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libcmips32      
- * @{
- */
-/** @file
- * @ingroup libcmips32eb        
- */
+#ifndef KERN_EBUS_H_
+#define KERN_EBUS_H_
 
-#ifndef LIBC_mips32_STACKARG_H_
-#define LIBC_mips32_STACKARG_H_
+#include <genarch/ofw/ofw_tree.h>
+#include <arch/types.h>
+#include <ddi/irq.h>
+#include <typedefs.h>
 
-/* dont allow to define it second time in stdarg.h */
-#define __VARARGS_DEFINED
+typedef struct {
+        uint32_t space;
+        uint32_t addr;
+        uint32_t size;
+} __attribute__ ((packed)) ofw_ebus_reg_t;
 
-#include <sys/types.h>
+typedef struct {
+        uint32_t child_space;
+        uint32_t child_base;
+        uint32_t parent_space;
+        
+        /* Group phys.mid and phys.lo together */
+        uint64_t parent_base;
+        uint32_t size;
+} __attribute__ ((packed)) ofw_ebus_range_t;
 
-/**
- * va_arg macro for MIPS32 - problem is that 64 bit values must be aligned on an 8-byte boundary (32bit values not)
- * To satisfy this, paddings must be sometimes inserted. 
- */
+typedef struct {
+        uint32_t space;
+        uint32_t addr;
+        uint32_t intr;
+        uint32_t controller_handle;
+        uint32_t controller_ino;
+} __attribute__ ((packed)) ofw_ebus_intr_map_t;
 
-typedef uint8_t* va_list;
+typedef struct {
+        uint32_t space_mask;
+        uint32_t addr_mask;
+        uint32_t intr_mask;
+} __attribute__ ((packed)) ofw_ebus_intr_mask_t;
 
-#define va_start(ap, lst) \
-        ((ap) = (va_list)&(lst) + sizeof(lst))
-
-#define va_arg(ap, type)        \
-        (((type *)((ap) = (va_list)( (sizeof(type) <= 4) ? ((uint32_t)((ap) + 2*4 - 1) & (~3)) : ((uint32_t)((ap) + 2*8 -1) & (~7)) )))[-1])
-
-#define va_end(ap)
+extern bool ofw_ebus_apply_ranges(ofw_tree_node_t *, ofw_ebus_reg_t *,
+    uintptr_t *);
+extern bool ofw_ebus_map_interrupt(ofw_tree_node_t *, ofw_ebus_reg_t *,
+    uint32_t, int *, cir_t *, void **);
 
 #endif
-
-/** @}
- */