Changeset 89c57b6 in mainline for kernel/arch/arm32/src/machine_func.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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:

• kernel/arch/arm32/src/machine_func.c (modified) (4 diffs)

kernel/arch/arm32/src/machine_func.c

@@ -39 +39 @@
 
 #include <arch/machine_func.h>
+#include <arch/mach/gta02/gta02.h>
 #include <arch/mach/integratorcp/integratorcp.h>
 #include <arch/mach/testarm/testarm.h>
@@ -48 +49 @@
 void machine_ops_init(void)
 {
-#if defined(MACHINE_testarm)
+#if defined(MACHINE_gta02)
+        machine_ops = &gta02_machine_ops;
+#elif defined(MACHINE_testarm)
         machine_ops = &gxemul_machine_ops;
 #elif defined(MACHINE_integratorcp)
@@ -77 +80 @@
 }
 
-
-/** 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.
  */
-uintptr_t machine_get_memory_size(void)
+void machine_get_memory_extents(uintptr_t *start, uintptr_t *size)
 {
-        return (machine_ops->machine_get_memory_size)();
+        (machine_ops->machine_get_memory_extents)(start, size);
 }
 
@@ -122 +125 @@
 }
 
+/** Get IRQ number range used by machine. */
+size_t machine_get_irq_count(void)
+{
+        return (machine_ops->machine_get_irq_count)();
+}
+
 /** @}
  */