From ffefe0c08bdeeab725ce5fc054b3add4e05a1f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Mon, 29 Jun 2009 14:30:12 +0000 Subject: Put TIMER_FREQ definition in CPU-specific config, and remove timer-target.h Note : SH has TIMER_FREQ defined to CPU_FREQ, so any code wanting it must include #config.h before #cpu.h git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21560 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/timer.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'firmware/export/timer.h') diff --git a/firmware/export/timer.h b/firmware/export/timer.h index 230c0ae..b070aca 100644 --- a/firmware/export/timer.h +++ b/firmware/export/timer.h @@ -24,21 +24,10 @@ #include #include "config.h" +#include "cpu.h" #if defined(SIMULATOR) - #define TIMER_FREQ 1000000 -#elif CONFIG_CPU == S3C2440 || CONFIG_CPU == DM320 || CONFIG_CPU == TCC7801 \ - || defined(CPU_TCC77X) || CONFIG_CPU == AS3525 || CONFIG_CPU == IMX31L \ - || CONFIG_CPU == JZ4732 || CONFIG_CPU == PNX0101 \ - || defined(CPU_COLDFIRE) || CONFIG_CPU == SH7034 || defined(CPU_PP) - #include "timer-target.h" -#else - #warning "Target without timer-target.h" -#endif - -#ifndef TIMER_FREQ - #warning "TIMER_FREQ not defined" - #define TIMER_FREQ CPU_FREQ +#define TIMER_FREQ 1000000 #endif bool timer_register(int reg_prio, void (*unregister_callback)(void), -- cgit v1.1