diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugin.h | 20 | ||||
-rw-r--r-- | apps/plugins/battery_bench.c | 1 | ||||
-rw-r--r-- | apps/plugins/blackjack.c | 1 | ||||
-rw-r--r-- | apps/plugins/chessclock.c | 1 | ||||
-rw-r--r-- | apps/plugins/jpeg.c | 1 | ||||
-rw-r--r-- | apps/plugins/lib/mem_function_wrappers.h | 44 | ||||
-rw-r--r-- | apps/plugins/mazezam.c | 1 | ||||
-rw-r--r-- | apps/plugins/metronome.c | 1 | ||||
-rw-r--r-- | apps/plugins/mp3_encoder.c | 1 | ||||
-rw-r--r-- | apps/plugins/properties.c | 1 | ||||
-rw-r--r-- | apps/plugins/rockpaint.c | 1 | ||||
-rw-r--r-- | apps/plugins/xobox.c | 1 |
12 files changed, 20 insertions, 54 deletions
diff --git a/apps/plugin.h b/apps/plugin.h index 11bb80de66..606db6ebd6 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -679,4 +679,24 @@ void plugin_tsr(bool (*exit_callback)(bool reenter)); | |||
679 | enum plugin_status plugin_start(struct plugin_api* rockbox, void* parameter) | 679 | enum plugin_status plugin_start(struct plugin_api* rockbox, void* parameter) |
680 | NO_PROF_ATTR; | 680 | NO_PROF_ATTR; |
681 | 681 | ||
682 | /* Use this macro in plugins where gcc tries to optimize by calling | ||
683 | * these functions directly */ | ||
684 | #define MEM_FUNCTION_WRAPPERS(api) \ | ||
685 | void *memcpy(void *dest, const void *src, size_t n) \ | ||
686 | { \ | ||
687 | return (api)->memcpy(dest, src, n); \ | ||
688 | } \ | ||
689 | void *memset(void *dest, int c, size_t n) \ | ||
690 | { \ | ||
691 | return (api)->memset(dest, c, n); \ | ||
692 | } \ | ||
693 | void *memmove(void *dest, const void *src, size_t n) \ | ||
694 | { \ | ||
695 | return (api)->memmove(dest, src, n); \ | ||
696 | } \ | ||
697 | int memcmp(const void *s1, const void *s2, size_t n) \ | ||
698 | { \ | ||
699 | return (api)->memcmp(s1, s2, n); \ | ||
700 | } | ||
701 | |||
682 | #endif | 702 | #endif |
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index fef3f36db2..9a70fbf6a0 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #ifndef SIMULATOR /* not for the simulator */ | 20 | #ifndef SIMULATOR /* not for the simulator */ |
21 | 21 | ||
22 | #include "plugin.h" | 22 | #include "plugin.h" |
23 | #include "mem_function_wrappers.h" | ||
24 | PLUGIN_HEADER | 23 | PLUGIN_HEADER |
25 | 24 | ||
26 | #define BATTERY_LOG "/battery_bench.txt" | 25 | #define BATTERY_LOG "/battery_bench.txt" |
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 07af984a80..1cce364125 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include "plugin.h" | 20 | #include "plugin.h" |
21 | #include "card_deck.h" | 21 | #include "card_deck.h" |
22 | #include "card_back.h" | 22 | #include "card_back.h" |
23 | #include "mem_function_wrappers.h" | ||
24 | 23 | ||
25 | PLUGIN_HEADER | 24 | PLUGIN_HEADER |
26 | 25 | ||
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 3dfb0fef6c..6efaf44300 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -17,7 +17,6 @@ | |||
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #include "plugin.h" | 19 | #include "plugin.h" |
20 | #include "mem_function_wrappers.h" | ||
21 | 20 | ||
22 | PLUGIN_HEADER | 21 | PLUGIN_HEADER |
23 | 22 | ||
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index cd364f4d51..f9275fb802 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include "plugin.h" | 27 | #include "plugin.h" |
28 | #include "playback_control.h" | 28 | #include "playback_control.h" |
29 | #include "oldmenuapi.h" | 29 | #include "oldmenuapi.h" |
30 | #include "mem_function_wrappers.h" | ||
31 | 30 | ||
32 | #ifdef HAVE_LCD_BITMAP | 31 | #ifdef HAVE_LCD_BITMAP |
33 | #include "gray.h" | 32 | #include "gray.h" |
diff --git a/apps/plugins/lib/mem_function_wrappers.h b/apps/plugins/lib/mem_function_wrappers.h deleted file mode 100644 index ec3872c4c1..0000000000 --- a/apps/plugins/lib/mem_function_wrappers.h +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2007 Nils Wallménius | ||
11 | * | ||
12 | * All files in this archive are subject to the GNU General Public License. | ||
13 | * See the file COPYING in the source tree root for full license agreement. | ||
14 | * | ||
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
16 | * KIND, either express or implied. | ||
17 | * | ||
18 | ****************************************************************************/ | ||
19 | #ifndef __MEM_FUNCTION_WRAPPERS_H__ | ||
20 | #define __MEM_FUNCTION_WRAPPERS_H__ | ||
21 | |||
22 | /* Use this macro in plugins where gcc tries to optimize by calling | ||
23 | * these functions directly */ | ||
24 | |||
25 | #define MEM_FUNCTION_WRAPPERS(api) \ | ||
26 | void *memcpy(void *dest, const void *src, size_t n) \ | ||
27 | { \ | ||
28 | return (api)->memcpy(dest, src, n); \ | ||
29 | } \ | ||
30 | void *memset(void *dest, int c, size_t n) \ | ||
31 | { \ | ||
32 | return (api)->memset(dest, c, n); \ | ||
33 | } \ | ||
34 | void *memmove(void *dest, const void *src, size_t n) \ | ||
35 | { \ | ||
36 | return (api)->memmove(dest, src, n); \ | ||
37 | } \ | ||
38 | int memcmp(const void *s1, const void *s2, size_t n) \ | ||
39 | { \ | ||
40 | return (api)->memcmp(s1, s2, n); \ | ||
41 | } | ||
42 | |||
43 | #endif /* __MEM_FUNCTION_WRAPPERS_H__ */ | ||
44 | |||
diff --git a/apps/plugins/mazezam.c b/apps/plugins/mazezam.c index ee93d10024..6f68f98e36 100644 --- a/apps/plugins/mazezam.c +++ b/apps/plugins/mazezam.c | |||
@@ -20,7 +20,6 @@ | |||
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | #include "plugin.h" | 21 | #include "plugin.h" |
22 | #include "configfile.h" | 22 | #include "configfile.h" |
23 | #include "mem_function_wrappers.h" | ||
24 | 23 | ||
25 | /* Include standard plugin macro */ | 24 | /* Include standard plugin macro */ |
26 | PLUGIN_HEADER | 25 | PLUGIN_HEADER |
diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c index daf3294b75..3255ad3b93 100644 --- a/apps/plugins/metronome.c +++ b/apps/plugins/metronome.c | |||
@@ -18,7 +18,6 @@ | |||
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #include "plugin.h" | 19 | #include "plugin.h" |
20 | #include "pluginlib_actions.h" | 20 | #include "pluginlib_actions.h" |
21 | #include "mem_function_wrappers.h" | ||
22 | 21 | ||
23 | PLUGIN_HEADER | 22 | PLUGIN_HEADER |
24 | 23 | ||
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index d1ef2e0a7c..8a4560a935 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c | |||
@@ -12,7 +12,6 @@ | |||
12 | * Library General Public License for more details. */ | 12 | * Library General Public License for more details. */ |
13 | 13 | ||
14 | #include "plugin.h" | 14 | #include "plugin.h" |
15 | #include "mem_function_wrappers.h" | ||
16 | 15 | ||
17 | PLUGIN_HEADER | 16 | PLUGIN_HEADER |
18 | PLUGIN_IRAM_DECLARE | 17 | PLUGIN_IRAM_DECLARE |
diff --git a/apps/plugins/properties.c b/apps/plugins/properties.c index 2e2e057b64..f58a412056 100644 --- a/apps/plugins/properties.c +++ b/apps/plugins/properties.c | |||
@@ -17,7 +17,6 @@ | |||
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #include "plugin.h" | 19 | #include "plugin.h" |
20 | #include "mem_function_wrappers.h" | ||
21 | 20 | ||
22 | PLUGIN_HEADER | 21 | PLUGIN_HEADER |
23 | 22 | ||
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 29296ac1b6..d478bf9947 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include "errno.h" | 30 | #include "errno.h" |
31 | #include "lib/bmp.h" | 31 | #include "lib/bmp.h" |
32 | #include "lib/rgb_hsv.h" | 32 | #include "lib/rgb_hsv.h" |
33 | #include "mem_function_wrappers.h" | ||
34 | 33 | ||
35 | PLUGIN_HEADER | 34 | PLUGIN_HEADER |
36 | 35 | ||
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index 0d1bdc4f72..def11b3bb0 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -19,7 +19,6 @@ | |||
19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
20 | 20 | ||
21 | #include "plugin.h" | 21 | #include "plugin.h" |
22 | #include "mem_function_wrappers.h" | ||
23 | 22 | ||
24 | PLUGIN_HEADER | 23 | PLUGIN_HEADER |
25 | 24 | ||