summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--firmware/target/arm/as3525/kernel-as3525.c2
-rw-r--r--firmware/target/arm/as3525/sansa-e200v2/timer-target.h38
-rw-r--r--firmware/target/arm/as3525/sansa-fuze/timer-target.h38
-rw-r--r--firmware/target/arm/as3525/sansa-m200v4/timer-target.h38
-rw-r--r--firmware/target/arm/as3525/timer-target.h (renamed from firmware/target/arm/as3525/sansa-clip/timer-target.h)4
5 files changed, 4 insertions, 116 deletions
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)
34{ 34{
35 int phi = 0; /* prescaler bits */ 35 int phi = 0; /* prescaler bits */
36 int prescale = 1; 36 int prescale = 1;
37 int cycles = 1000 * interval_in_ms; /* pclk is clocked at 64MHz */ 37 int cycles = TIMER_FREQ / 1000 * interval_in_ms;
38 38
39 while(cycles > 0x10000) 39 while(cycles > 0x10000)
40 { 40 {
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 @@
1/***************************************************************************
2* __________ __ ___.
3* Open \______ \ ____ ____ | | _\_ |__ _______ ___
4* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7* \/ \/ \/ \/ \/
8* $Id$
9*
10* Copyright (C) 2008 ??
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#ifndef TIMER_TARGET_H
22#define TIMER_TARGET_H
23
24bool __timer_set(long cycles, bool set);
25bool __timer_register(void);
26void __timer_unregister(void);
27
28#define __TIMER_SET(cycles, set) \
29 __timer_set(cycles, set)
30
31#define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \
32 int_prio, timer_callback) \
33 __timer_register()
34
35#define __TIMER_UNREGISTER(...) \
36 __timer_unregister()
37
38#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 @@
1/***************************************************************************
2* __________ __ ___.
3* Open \______ \ ____ ____ | | _\_ |__ _______ ___
4* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7* \/ \/ \/ \/ \/
8* $Id$
9*
10* Copyright (C) 2008 ??
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#ifndef TIMER_TARGET_H
22#define TIMER_TARGET_H
23
24bool __timer_set(long cycles, bool set);
25bool __timer_register(void);
26void __timer_unregister(void);
27
28#define __TIMER_SET(cycles, set) \
29 __timer_set(cycles, set)
30
31#define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \
32 int_prio, timer_callback) \
33 __timer_register()
34
35#define __TIMER_UNREGISTER(...) \
36 __timer_unregister()
37
38#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 @@
1/***************************************************************************
2* __________ __ ___.
3* Open \______ \ ____ ____ | | _\_ |__ _______ ___
4* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7* \/ \/ \/ \/ \/
8* $Id$
9*
10* Copyright (C) 2008 ??
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#ifndef TIMER_TARGET_H
22#define TIMER_TARGET_H
23
24bool __timer_set(long cycles, bool set);
25bool __timer_register(void);
26void __timer_unregister(void);
27
28#define __TIMER_SET(cycles, set) \
29 __timer_set(cycles, set)
30
31#define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \
32 int_prio, timer_callback) \
33 __timer_register()
34
35#define __TIMER_UNREGISTER(...) \
36 __timer_unregister()
37
38#endif /* TIMER_TARGET_H */
diff --git a/firmware/target/arm/as3525/sansa-clip/timer-target.h b/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 @@
7* \/ \/ \/ \/ \/ 7* \/ \/ \/ \/ \/
8* $Id$ 8* $Id$
9* 9*
10* Copyright (C) 2008 ?? 10* Copyright (C) 2008 Rafaël Carré
11* 11*
12* This program is free software; you can redistribute it and/or 12* This program is free software; you can redistribute it and/or
13* modify it under the terms of the GNU General Public License 13* modify it under the terms of the GNU General Public License
@@ -25,6 +25,8 @@ bool __timer_set(long cycles, bool set);
25bool __timer_register(void); 25bool __timer_register(void);
26void __timer_unregister(void); 26void __timer_unregister(void);
27 27
28#define TIMER_FREQ (24000000 / 16)
29
28#define __TIMER_SET(cycles, set) \ 30#define __TIMER_SET(cycles, set) \
29 __timer_set(cycles, set) 31 __timer_set(cycles, set)
30 32
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-04 03:21:19 +0000