Changeset c621f4aa in mainline for kernel/arch/arm32/include/machine_func.h

Timestamp:

2010-07-25T10:11:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

File:

• kernel/arch/arm32/include/machine_func.h (modified) (4 diffs)

kernel/arch/arm32/include/machine_func.h

@@ -43 +43 @@
 
 #include <console/console.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/exception.h>
 
-#define MACHINE_GENFUNC machine_genfunc
-
 struct arm_machine_ops {
-        void            (*machine_init)(void);
-        void            (*machine_timer_irq_start)(void);
-        void            (*machine_cpu_halt)(void);
-        uintptr_t       (*machine_get_memory_size)(void);
-        void            (*machine_irq_exception)(int, istate_t*);
-        void            (*machine_frame_init)(void);
-        void            (*machine_output_init)(void);
-        void            (*machine_input_init)(void);
+        void (*machine_init)(void);
+        void (*machine_timer_irq_start)(void);
+        void (*machine_cpu_halt)(void);
+        void (*machine_get_memory_extents)(uintptr_t *, uintptr_t *);
+        void (*machine_irq_exception)(unsigned int, istate_t *);
+        void (*machine_frame_init)(void);
+        void (*machine_output_init)(void);
+        void (*machine_input_init)(void);
 };
 
-extern struct arm_machine_ops machine_ops;
+/** Pointer to arm_machine_ops structure being used. */
+extern struct arm_machine_ops *machine_ops;
 
+/** Initialize machine_ops pointer. */
+extern void machine_ops_init(void);
 
 /** Maps HW devices to the kernel address space using #hw_map. */
@@ -73 +74 @@
 extern void machine_cpu_halt(void);
 
-
-/** Returns size of available memory.
+/** Get extents of available memory.
  *
- *  @return Size of available memory.
+ * @param start         Place to store memory start address.
+ * @param size          Place to store memory size.
  */
-extern uintptr_t machine_get_memory_size(void);
-
+extern void machine_get_memory_extents(uintptr_t *start, uintptr_t *size);
 
 /** Interrupt exception handler.
@@ -86 +86 @@
  * @param istate Saved processor state.
  */
-extern void machine_irq_exception(int exc_no, istate_t *istate);
+extern void machine_irq_exception(unsigned int exc_no, istate_t *istate);
 
 
@@ -104 +104 @@
 extern void machine_input_init(void);
 
-extern void machine_genfunc(void);
+extern size_t machine_get_irq_count(void);
+
 #endif