1 files changed, 27 insertions, 1 deletions

diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/kernel-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/kernel-meg-fx.c
index 5ef8c8023a..6a750c32e2 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/kernel-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/kernel-meg-fx.c
@@ -24,7 +24,7 @@
 #include "timer.h"
 #include "thread.h"
 
-void tick_start(unsigned int interval_in_ms)
+static inline void tick_set(unsigned int interval_in_ms)
 {
     /*
      * Based on default PCLK of 49.1568MHz - scaling chosen to give
@@ -49,6 +49,12 @@ void tick_start(unsigned int interval_in_ms)
     TCON |= 1 << 21;
     /* reset manual bit */
     TCON &= ~(1 << 21);
+}
+
+void tick_start(unsigned int interval_in_ms)
+{
+    tick_set(interval_in_ms);
+
     /* interval mode */
     TCON |= 1 << 22;
     /* start timer 4 */
@@ -58,6 +64,26 @@ void tick_start(unsigned int interval_in_ms)
     INTMSK &= ~TIMER4_MASK;
 }
 
+#ifdef BOOTLOADER
+void delay(int ticks)
+{
+    volatile unsigned long counter;
+
+    INTMSK |= TIMER4_MASK;
+
+    tick_set(1000 * ticks / HZ);
+
+    /* autoreload Off */
+    TCON &= ~(1 << 22);
+    /* start timer 4 */
+    TCON |= (1 << 20);
+
+    do {
+        counter = TCNTO4;
+    } while(counter > 0);
+}
+#endif /* BOOTLOADER */
+
 void TIMER4(void)
 {
     /* Run through the list of tick tasks */