Changeset 3b3e776 in mainline for kernel/arch/arm32/src/arm32.c

Timestamp:

2010-02-05T10:57:50Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

0358da0

Parents:

3f085132 (diff), b4cbef1 (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

File:

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

kernel/arch/arm32/src/arm32.c

@@ -48 +48 @@
 #include <macros.h>
 #include <string.h>
+#include <arch/ras.h>
 
 #ifdef MACHINE_testarm
@@ -88 +89 @@
         exception_init();
         interrupt_init();
+
+        /* Initialize Restartable Atomic Sequences support. */
+        ras_init();
         
         machine_output_init();
@@ -136 +140 @@
         uint8_t *stck;
         
-        tlb_invalidate_all();
         stck = &THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA];
         supervisor_sp = (uintptr_t) stck;
@@ -152 +155 @@
 void cpu_halt(void)
 {
-        machine_cpu_halt();
+        while (true)
+                machine_cpu_halt();
 }
 
@@ -159 +163 @@
 {
         /* not implemented */
-        while (1);
+        while (true);
 }
 
@@ -176 +180 @@
 }
 
+void irq_initialize_arch(irq_t *irq)
+{
+        (void) irq;
+}
+
 /** @}
  */