From 068443caaf101bccfa5ff44b44e6f98e6612b27f Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Sat, 19 May 2012 13:28:41 +0200 Subject: imx233: move away timer defines from imx233.h Change-Id: I9f721ae12a3ddf72c4e90ad0754a5c2b819847bb --- firmware/target/arm/imx233/kernel-imx233.c | 10 ++++++++++ firmware/target/arm/imx233/timer-imx233.c | 10 ++++++++++ 2 files changed, 20 insertions(+) (limited to 'firmware/target/arm/imx233') diff --git a/firmware/target/arm/imx233/kernel-imx233.c b/firmware/target/arm/imx233/kernel-imx233.c index 752db68149..8e1e122277 100644 --- a/firmware/target/arm/imx233/kernel-imx233.c +++ b/firmware/target/arm/imx233/kernel-imx233.c @@ -23,6 +23,16 @@ #include "clkctrl-imx233.h" #include "kernel-imx233.h" +#ifdef SANSA_FUZEPLUS +#define TICK_TIMER_NR 0 +#elif defined(CREATIVE_ZENXFI2) +#define TICK_TIMER_NR 0 +#elif defined(CREATIVE_ZENXFI3) +#define TICK_TIMER_NR 0 +#else +#error Select tick timer ! +#endif + static void tick_timer(void) { /* Run through the list of tick tasks */ diff --git a/firmware/target/arm/imx233/timer-imx233.c b/firmware/target/arm/imx233/timer-imx233.c index 2812f1adfc..bcc1974c63 100644 --- a/firmware/target/arm/imx233/timer-imx233.c +++ b/firmware/target/arm/imx233/timer-imx233.c @@ -22,6 +22,16 @@ #include "timrot-imx233.h" #include "timer.h" +#ifdef SANSA_FUZEPLUS +#define USER_TIMER_NR 1 +#elif defined(CREATIVE_ZENXFI2) +#define USER_TIMER_NR 1 +#elif defined(CREATIVE_ZENXFI3) +#define USER_TIMER_NR 1 +#else +#error Select user timer ! +#endif + static long timer_cycles = 0; static void timer_fn(void) -- cgit v1.2.3