diff options
author | Michael Giacomelli <giac2000@hotmail.com> | 2008-07-28 22:43:41 +0000 |
---|---|---|
committer | Michael Giacomelli <giac2000@hotmail.com> | 2008-07-28 22:43:41 +0000 |
commit | 52bdcbae856b07d3a793615b98dff338d26302ec (patch) | |
tree | 9ee975d98287ca851664cbc626e7d006c0a4264b /apps | |
parent | c323d533c29fcf420df6b63ccf5c37340c7ba6c5 (diff) | |
download | rockbox-52bdcbae856b07d3a793615b98dff338d26302ec.tar.gz rockbox-52bdcbae856b07d3a793615b98dff338d26302ec.zip |
Commit FS#9170 by Dave Hooper. Adds support for profiling on ARM, and fixes various issues with compiling profile builds. Also, note that profile_reader.pl syntax has changed.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18142 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/codecs.c | 4 | ||||
-rw-r--r-- | apps/codecs/SOURCES | 2 | ||||
-rw-r--r-- | apps/plugin.c | 4 | ||||
-rw-r--r-- | apps/plugins/SUBDIRS | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/apps/codecs.c b/apps/codecs.c index c31fd843b3..24490dd04b 100644 --- a/apps/codecs.c +++ b/apps/codecs.c | |||
@@ -138,8 +138,8 @@ struct codec_api ci = { | |||
138 | #ifdef RB_PROFILE | 138 | #ifdef RB_PROFILE |
139 | profile_thread, | 139 | profile_thread, |
140 | profstop, | 140 | profstop, |
141 | profile_func_enter, | 141 | __cyg_profile_func_enter, |
142 | profile_func_exit, | 142 | __cyg_profile_func_exit, |
143 | #endif | 143 | #endif |
144 | 144 | ||
145 | #if defined(HAVE_RECORDING) && !defined(SIMULATOR) | 145 | #if defined(HAVE_RECORDING) && !defined(SIMULATOR) |
diff --git a/apps/codecs/SOURCES b/apps/codecs/SOURCES index 25ca5490d4..3038903f9e 100644 --- a/apps/codecs/SOURCES +++ b/apps/codecs/SOURCES | |||
@@ -7,7 +7,9 @@ wav.c | |||
7 | a52.c | 7 | a52.c |
8 | mpc.c | 8 | mpc.c |
9 | wavpack.c | 9 | wavpack.c |
10 | #ifndef RB_PROFILE | ||
10 | alac.c | 11 | alac.c |
12 | #endif | ||
11 | wma.c | 13 | wma.c |
12 | #if MEMORYSIZE > 1 | 14 | #if MEMORYSIZE > 1 |
13 | aac.c | 15 | aac.c |
diff --git a/apps/plugin.c b/apps/plugin.c index a220e8c429..24082de637 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -335,8 +335,8 @@ static const struct plugin_api rockbox_api = { | |||
335 | #ifdef RB_PROFILE | 335 | #ifdef RB_PROFILE |
336 | profile_thread, | 336 | profile_thread, |
337 | profstop, | 337 | profstop, |
338 | profile_func_enter, | 338 | __cyg_profile_func_enter, |
339 | profile_func_exit, | 339 | __cyg_profile_func_exit, |
340 | #endif | 340 | #endif |
341 | 341 | ||
342 | #ifdef SIMULATOR | 342 | #ifdef SIMULATOR |
diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS index 94614e2f12..1b3e2af252 100644 --- a/apps/plugins/SUBDIRS +++ b/apps/plugins/SUBDIRS | |||
@@ -33,14 +33,18 @@ pacbox | |||
33 | /* For all the color targets */ | 33 | /* For all the color targets */ |
34 | #if defined(HAVE_LCD_COLOR) || defined(MROBE_100) || \ | 34 | #if defined(HAVE_LCD_COLOR) || defined(MROBE_100) || \ |
35 | (LCD_DEPTH == 2) && !defined(ARCHOS_AV300) | 35 | (LCD_DEPTH == 2) && !defined(ARCHOS_AV300) |
36 | #ifndef RB_PROFILE | ||
36 | doom | 37 | doom |
37 | #endif | 38 | #endif |
39 | #endif | ||
38 | 40 | ||
39 | /* For all the swcodec targets */ | 41 | /* For all the swcodec targets */ |
40 | #if CONFIG_CODEC == SWCODEC | 42 | #if CONFIG_CODEC == SWCODEC |
41 | midi | 43 | midi |
42 | /* beatbox */ | 44 | /* beatbox */ |
45 | #ifndef RB_PROFILE | ||
43 | mpegplayer | 46 | mpegplayer |
44 | #endif | 47 | #endif |
48 | #endif | ||
45 | 49 | ||
46 | #endif /* IRIVER_IFP7XX_SERIES */ | 50 | #endif /* IRIVER_IFP7XX_SERIES */ |