From a6ec0293cc6139e38fc2b3c1ac19ba31cd0f2f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Wed, 26 Nov 2008 14:40:57 +0000 Subject: [PATCH] Sansa AMS: correct timer definition (clk_main == 24MHz / 16) make timer-target.h common to all AMS targets git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19229 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/as3525/kernel-as3525.c | 2 +- .../arm/as3525/sansa-e200v2/timer-target.h | 38 ------------------- .../arm/as3525/sansa-fuze/timer-target.h | 38 ------------------- .../arm/as3525/sansa-m200v4/timer-target.h | 38 ------------------- .../as3525/{sansa-clip => }/timer-target.h | 4 +- 5 files changed, 4 insertions(+), 116 deletions(-) delete mode 100644 firmware/target/arm/as3525/sansa-e200v2/timer-target.h delete mode 100644 firmware/target/arm/as3525/sansa-fuze/timer-target.h delete mode 100644 firmware/target/arm/as3525/sansa-m200v4/timer-target.h rename firmware/target/arm/as3525/{sansa-clip => }/timer-target.h (94%) diff --git a/firmware/target/arm/as3525/kernel-as3525.c b/firmware/target/arm/as3525/kernel-as3525.c index c534d5e130..92e3f01ef3 100644 --- a/firmware/target/arm/as3525/kernel-as3525.c +++ b/firmware/target/arm/as3525/kernel-as3525.c @@ -34,7 +34,7 @@ void tick_start(unsigned int interval_in_ms) { int phi = 0; /* prescaler bits */ int prescale = 1; - int cycles = 1000 * interval_in_ms; /* pclk is clocked at 64MHz */ + int cycles = TIMER_FREQ / 1000 * interval_in_ms; while(cycles > 0x10000) { diff --git a/firmware/target/arm/as3525/sansa-e200v2/timer-target.h b/firmware/target/arm/as3525/sansa-e200v2/timer-target.h deleted file mode 100644 index b81da57885..0000000000 --- a/firmware/target/arm/as3525/sansa-e200v2/timer-target.h +++ /dev/null @@ -1,38 +0,0 @@ -/*************************************************************************** -* __________ __ ___. -* Open \______ \ ____ ____ | | _\_ |__ _______ ___ -* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / -* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < -* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ -* \/ \/ \/ \/ \/ -* $Id$ -* -* Copyright (C) 2008 ?? -* -* 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. -* -****************************************************************************/ -#ifndef TIMER_TARGET_H -#define TIMER_TARGET_H - -bool __timer_set(long cycles, bool set); -bool __timer_register(void); -void __timer_unregister(void); - -#define __TIMER_SET(cycles, set) \ - __timer_set(cycles, set) - -#define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \ - int_prio, timer_callback) \ - __timer_register() - -#define __TIMER_UNREGISTER(...) \ - __timer_unregister() - -#endif /* TIMER_TARGET_H */ diff --git a/firmware/target/arm/as3525/sansa-fuze/timer-target.h b/firmware/target/arm/as3525/sansa-fuze/timer-target.h deleted file mode 100644 index b81da57885..0000000000 --- a/firmware/target/arm/as3525/sansa-fuze/timer-target.h +++ /dev/null @@ -1,38 +0,0 @@ -/*************************************************************************** -* __________ __ ___. -* Open \______ \ ____ ____ | | _\_ |__ _______ ___ -* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / -* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < -* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ -* \/ \/ \/ \/ \/ -* $Id$ -* -* Copyright (C) 2008 ?? -* -* 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. -* -****************************************************************************/ -#ifndef TIMER_TARGET_H -#define TIMER_TARGET_H - -bool __timer_set(long cycles, bool set); -bool __timer_register(void); -void __timer_unregister(void); - -#define __TIMER_SET(cycles, set) \ - __timer_set(cycles, set) - -#define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \ - int_prio, timer_callback) \ - __timer_register() - -#define __TIMER_UNREGISTER(...) \ - __timer_unregister() - -#endif /* TIMER_TARGET_H */ diff --git a/firmware/target/arm/as3525/sansa-m200v4/timer-target.h b/firmware/target/arm/as3525/sansa-m200v4/timer-target.h deleted file mode 100644 index b81da57885..0000000000 --- a/firmware/target/arm/as3525/sansa-m200v4/timer-target.h +++ /dev/null @@ -1,38 +0,0 @@ -/*************************************************************************** -* __________ __ ___. -* Open \______ \ ____ ____ | | _\_ |__ _______ ___ -* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / -* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < -* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ -* \/ \/ \/ \/ \/ -* $Id$ -* -* Copyright (C) 2008 ?? -* -* 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. -* -****************************************************************************/ -#ifndef TIMER_TARGET_H -#define TIMER_TARGET_H - -bool __timer_set(long cycles, bool set); -bool __timer_register(void); -void __timer_unregister(void); - -#define __TIMER_SET(cycles, set) \ - __timer_set(cycles, set) - -#define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \ - int_prio, timer_callback) \ - __timer_register() - -#define __TIMER_UNREGISTER(...) \ - __timer_unregister() - -#endif /* TIMER_TARGET_H */ diff --git a/firmware/target/arm/as3525/sansa-clip/timer-target.h b/firmware/target/arm/as3525/timer-target.h similarity index 94% rename from firmware/target/arm/as3525/sansa-clip/timer-target.h rename to firmware/target/arm/as3525/timer-target.h index b81da57885..21ee6e7804 100644 --- a/firmware/target/arm/as3525/sansa-clip/timer-target.h +++ b/firmware/target/arm/as3525/timer-target.h @@ -7,7 +7,7 @@ * \/ \/ \/ \/ \/ * $Id$ * -* Copyright (C) 2008 ?? +* Copyright (C) 2008 Rafaël Carré * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -25,6 +25,8 @@ bool __timer_set(long cycles, bool set); bool __timer_register(void); void __timer_unregister(void); +#define TIMER_FREQ (24000000 / 16) + #define __TIMER_SET(cycles, set) \ __timer_set(cycles, set)