diff options
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/arm/imx233/kernel-imx233.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx233/system-imx233.c | 6 | ||||
-rw-r--r-- | firmware/target/arm/imx233/timer-imx233.c | 60 | ||||
-rw-r--r-- | firmware/target/arm/imx233/timrot-imx233.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/imx233/timrot-imx233.h | 1 |
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) | |||
31 | void tick_start(unsigned int interval_in_ms) | 31 | void tick_start(unsigned int interval_in_ms) |
32 | { | 32 | { |
33 | /* use the 1-kHz XTAL clock source */ | 33 | /* use the 1-kHz XTAL clock source */ |
34 | imx233_setup_timer(0, true, interval_in_ms, | 34 | imx233_setup_timer(TICK_TIMER_NR, true, interval_in_ms, |
35 | HW_TIMROT_TIMCTRL__SELECT_1KHZ_XTAL, HW_TIMROT_TIMCTRL__PRESCALE_1, | 35 | HW_TIMROT_TIMCTRL__SELECT_1KHZ_XTAL, HW_TIMROT_TIMCTRL__PRESCALE_1, |
36 | false, &tick_timer); | 36 | false, &tick_timer); |
37 | } | 37 | } |
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) | |||
127 | while(!button_read_device()); | 127 | while(!button_read_device()); |
128 | } | 128 | } |
129 | 129 | ||
130 | int system_memory_guard(int newmode) | ||
131 | { | ||
132 | (void)newmode; | ||
133 | return 0; | ||
134 | } | ||
135 | |||
130 | void imx233_enable_interrupt(int src, bool enable) | 136 | void imx233_enable_interrupt(int src, bool enable) |
131 | { | 137 | { |
132 | if(enable) | 138 | 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 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2011 by Amaury Pouly | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | #include "kernel.h" | ||
22 | #include "timrot-imx233.h" | ||
23 | #include "timer.h" | ||
24 | |||
25 | static long timer_cycles = 0; | ||
26 | |||
27 | static void timer_fn() | ||
28 | { | ||
29 | if(pfn_timer) | ||
30 | pfn_timer(); | ||
31 | } | ||
32 | |||
33 | bool timer_set(long cycles, bool start) | ||
34 | { | ||
35 | timer_stop(); | ||
36 | |||
37 | if(start && pfn_unregister) | ||
38 | { | ||
39 | pfn_unregister(); | ||
40 | pfn_unregister = NULL; | ||
41 | } | ||
42 | |||
43 | timer_cycles = cycles; | ||
44 | |||
45 | return true; | ||
46 | } | ||
47 | |||
48 | bool timer_start(IF_COP_VOID(int core)) | ||
49 | { | ||
50 | imx233_setup_timer(USER_TIMER_NR, true, timer_cycles, | ||
51 | HW_TIMROT_TIMCTRL__SELECT_TICK_ALWAYS, HW_TIMROT_TIMCTRL__PRESCALE_1, | ||
52 | false, &timer_fn); | ||
53 | return true; | ||
54 | } | ||
55 | |||
56 | void timer_stop(void) | ||
57 | { | ||
58 | imx233_setup_timer(USER_TIMER_NR, false, 0, HW_TIMROT_TIMCTRL__SELECT_NEVER_TICK, | ||
59 | HW_TIMROT_TIMCTRL__PRESCALE_1, false, NULL); | ||
60 | } | ||
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) | |||
39 | void imx233_setup_timer(unsigned timer_nr, bool reload, unsigned count, | 39 | void imx233_setup_timer(unsigned timer_nr, bool reload, unsigned count, |
40 | unsigned src, unsigned prescale, bool polarity, imx233_timer_fn_t fn) | 40 | unsigned src, unsigned prescale, bool polarity, imx233_timer_fn_t fn) |
41 | { | 41 | { |
42 | int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS); | ||
43 | |||
42 | timer_fns[timer_nr] = fn; | 44 | timer_fns[timer_nr] = fn; |
43 | 45 | ||
44 | HW_TIMROT_TIMCTRL(timer_nr) = src | prescale; | 46 | HW_TIMROT_TIMCTRL(timer_nr) = src | prescale; |
@@ -65,6 +67,8 @@ void imx233_setup_timer(unsigned timer_nr, bool reload, unsigned count, | |||
65 | imx233_enable_interrupt(INT_SRC_TIMER(timer_nr), false); | 67 | imx233_enable_interrupt(INT_SRC_TIMER(timer_nr), false); |
66 | /* finally update */ | 68 | /* finally update */ |
67 | __REG_SET(HW_TIMROT_TIMCTRL(timer_nr)) = HW_TIMROT_TIMCTRL__UPDATE; | 69 | __REG_SET(HW_TIMROT_TIMCTRL(timer_nr)) = HW_TIMROT_TIMCTRL__UPDATE; |
70 | |||
71 | restore_interrupt(oldstatus); | ||
68 | } | 72 | } |
69 | 73 | ||
70 | void imx233_timrot_init(void) | 74 | 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 @@ | |||
40 | #define HW_TIMROT_TIMCTRL__PRESCALE_2 (1 << 4) | 40 | #define HW_TIMROT_TIMCTRL__PRESCALE_2 (1 << 4) |
41 | #define HW_TIMROT_TIMCTRL__PRESCALE_4 (2 << 4) | 41 | #define HW_TIMROT_TIMCTRL__PRESCALE_4 (2 << 4) |
42 | #define HW_TIMROT_TIMCTRL__PRESCALE_8 (3 << 4) | 42 | #define HW_TIMROT_TIMCTRL__PRESCALE_8 (3 << 4) |
43 | #define HW_TIMROT_TIMCTRL__SELECT_NEVER_TICK 0 | ||
43 | #define HW_TIMROT_TIMCTRL__SELECT_32KHZ_XTAL 8 | 44 | #define HW_TIMROT_TIMCTRL__SELECT_32KHZ_XTAL 8 |
44 | #define HW_TIMROT_TIMCTRL__SELECT_8KHZ_XTAL 9 | 45 | #define HW_TIMROT_TIMCTRL__SELECT_8KHZ_XTAL 9 |
45 | #define HW_TIMROT_TIMCTRL__SELECT_4KHZ_XTAL 10 | 46 | #define HW_TIMROT_TIMCTRL__SELECT_4KHZ_XTAL 10 |