5 files changed, 72 insertions, 1 deletions

diff --git a/firmware/target/arm/imx233/kernel-imx233.c b/firmware/target/arm/imx233/kernel-imx233.c
index 367f359dc0..edb9b8366c 100644
--- a/firmware/target/arm/imx233/kernel-imx233.c
+++ b/firmware/target/arm/imx233/kernel-imx233.c
@@ -31,7 +31,7 @@ static void tick_timer(void)
 void tick_start(unsigned int interval_in_ms)
 {
     /* use the 1-kHz XTAL clock source */
-    imx233_setup_timer(0, true, interval_in_ms,
+    imx233_setup_timer(TICK_TIMER_NR, true, interval_in_ms,
         HW_TIMROT_TIMCTRL__SELECT_1KHZ_XTAL, HW_TIMROT_TIMCTRL__PRESCALE_1,
         false, &tick_timer);
 }
diff --git a/firmware/target/arm/imx233/system-imx233.c b/firmware/target/arm/imx233/system-imx233.c
index 68f16bf860..8e742c0822 100644
--- a/firmware/target/arm/imx233/system-imx233.c
+++ b/firmware/target/arm/imx233/system-imx233.c
@@ -127,6 +127,12 @@ void system_exception_wait(void)
     while(!button_read_device());
 }
 
+int system_memory_guard(int newmode)
+{
+    (void)newmode;
+    return 0;
+}
+
 void imx233_enable_interrupt(int src, bool enable)
 {
     if(enable)
diff --git a/firmware/target/arm/imx233/timer-imx233.c b/firmware/target/arm/imx233/timer-imx233.c
new file mode 100644
index 0000000000..9721de5cd3
--- /dev/null
+++ b/firmware/target/arm/imx233/timer-imx233.c
@@ -0,0 +1,60 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2011 by Amaury Pouly
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include "kernel.h"
+#include "timrot-imx233.h"
+#include "timer.h"
+
+static long timer_cycles = 0;
+
+static void timer_fn()
+{
+    if(pfn_timer)
+        pfn_timer();
+}
+
+bool timer_set(long cycles, bool start)
+{
+    timer_stop();
+    
+    if(start && pfn_unregister)
+    {
+        pfn_unregister();
+        pfn_unregister = NULL;
+    }
+
+    timer_cycles = cycles;
+
+    return true;
+}
+
+bool timer_start(IF_COP_VOID(int core))
+{
+    imx233_setup_timer(USER_TIMER_NR, true, timer_cycles,
+        HW_TIMROT_TIMCTRL__SELECT_TICK_ALWAYS, HW_TIMROT_TIMCTRL__PRESCALE_1,
+            false, &timer_fn);
+    return true;
+}
+
+void timer_stop(void)
+{
+    imx233_setup_timer(USER_TIMER_NR, false, 0, HW_TIMROT_TIMCTRL__SELECT_NEVER_TICK,
+        HW_TIMROT_TIMCTRL__PRESCALE_1, false, NULL);
+}
diff --git a/firmware/target/arm/imx233/timrot-imx233.c b/firmware/target/arm/imx233/timrot-imx233.c
index 64a7c63f24..b2a1181ece 100644
--- a/firmware/target/arm/imx233/timrot-imx233.c
+++ b/firmware/target/arm/imx233/timrot-imx233.c
@@ -39,6 +39,8 @@ define_timer_irq(3)
 void imx233_setup_timer(unsigned timer_nr, bool reload, unsigned count,
     unsigned src, unsigned prescale, bool polarity, imx233_timer_fn_t fn)
 {
+    int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS);
+    
     timer_fns[timer_nr] = fn;
     
     HW_TIMROT_TIMCTRL(timer_nr) = src | prescale;
@@ -65,6 +67,8 @@ void imx233_setup_timer(unsigned timer_nr, bool reload, unsigned count,
         imx233_enable_interrupt(INT_SRC_TIMER(timer_nr), false);
     /* finally update */
     __REG_SET(HW_TIMROT_TIMCTRL(timer_nr)) = HW_TIMROT_TIMCTRL__UPDATE;
+
+    restore_interrupt(oldstatus);
 }
 
 void imx233_timrot_init(void)
diff --git a/firmware/target/arm/imx233/timrot-imx233.h b/firmware/target/arm/imx233/timrot-imx233.h
index 792ab767ac..c79023da51 100644
--- a/firmware/target/arm/imx233/timrot-imx233.h
+++ b/firmware/target/arm/imx233/timrot-imx233.h
@@ -40,6 +40,7 @@
 #define HW_TIMROT_TIMCTRL__PRESCALE_2   (1 << 4)
 #define HW_TIMROT_TIMCTRL__PRESCALE_4   (2 << 4)
 #define HW_TIMROT_TIMCTRL__PRESCALE_8   (3 << 4)
+#define HW_TIMROT_TIMCTRL__SELECT_NEVER_TICK    0
 #define HW_TIMROT_TIMCTRL__SELECT_32KHZ_XTAL    8
 #define HW_TIMROT_TIMCTRL__SELECT_8KHZ_XTAL     9
 #define HW_TIMROT_TIMCTRL__SELECT_4KHZ_XTAL     10