diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/bounce.c | 2 | ||||
-rw-r--r-- | apps/plugins/bubbles.c | 2 | ||||
-rw-r--r-- | apps/plugins/clock/clock_draw_analog.c | 2 | ||||
-rw-r--r-- | apps/plugins/cube.c | 2 | ||||
-rw-r--r-- | apps/plugins/fft/math.h | 2 | ||||
-rw-r--r-- | apps/plugins/fire.c | 2 | ||||
-rw-r--r-- | apps/plugins/lib/SOURCES | 1 | ||||
-rw-r--r-- | apps/plugins/lib/fixedpoint.c | 1 | ||||
-rw-r--r-- | apps/plugins/lib/fixedpoint.h | 26 | ||||
-rw-r--r-- | apps/plugins/oscilloscope.c | 4 | ||||
-rw-r--r-- | apps/plugins/plasma.c | 2 | ||||
-rw-r--r-- | apps/plugins/plugins.make | 2 | ||||
-rw-r--r-- | apps/plugins/vu_meter.c | 2 |
13 files changed, 10 insertions, 40 deletions
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index ece8440e53..9e0ae7b563 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c | |||
@@ -20,7 +20,7 @@ | |||
20 | **************************************************************************/ | 20 | **************************************************************************/ |
21 | #include "plugin.h" | 21 | #include "plugin.h" |
22 | #include "time.h" | 22 | #include "time.h" |
23 | #include "lib/fixedpoint.h" | 23 | #include "fixedpoint.h" |
24 | #include "lib/pluginlib_actions.h" | 24 | #include "lib/pluginlib_actions.h" |
25 | 25 | ||
26 | 26 | ||
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index eef4f4dc19..e796afd672 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -22,10 +22,10 @@ | |||
22 | ****************************************************************************/ | 22 | ****************************************************************************/ |
23 | 23 | ||
24 | #include "plugin.h" | 24 | #include "plugin.h" |
25 | #include "fixedpoint.h" | ||
25 | 26 | ||
26 | #include "lib/xlcd.h" | 27 | #include "lib/xlcd.h" |
27 | #include "lib/pluginlib_actions.h" | 28 | #include "lib/pluginlib_actions.h" |
28 | #include "lib/fixedpoint.h" | ||
29 | #include "lib/playback_control.h" | 29 | #include "lib/playback_control.h" |
30 | #include "lib/highscore.h" | 30 | #include "lib/highscore.h" |
31 | 31 | ||
diff --git a/apps/plugins/clock/clock_draw_analog.c b/apps/plugins/clock/clock_draw_analog.c index bda7241d33..62ada08c34 100644 --- a/apps/plugins/clock/clock_draw_analog.c +++ b/apps/plugins/clock/clock_draw_analog.c | |||
@@ -19,9 +19,9 @@ | |||
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | #include "fixedpoint.h" | ||
22 | #include "clock_draw_analog.h" | 23 | #include "clock_draw_analog.h" |
23 | #include "lib/xlcd.h" | 24 | #include "lib/xlcd.h" |
24 | #include "lib/fixedpoint.h" | ||
25 | #include "clock_bitmaps.h" | 25 | #include "clock_bitmaps.h" |
26 | #include "clock_bitmap_strings.h" | 26 | #include "clock_bitmap_strings.h" |
27 | 27 | ||
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index b6031af975..34252e857e 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -21,6 +21,7 @@ | |||
21 | * | 21 | * |
22 | ***************************************************************************/ | 22 | ***************************************************************************/ |
23 | #include "plugin.h" | 23 | #include "plugin.h" |
24 | #include "fixedpoint.h" | ||
24 | #include "lib/playergfx.h" | 25 | #include "lib/playergfx.h" |
25 | #include "lib/pluginlib_exit.h" | 26 | #include "lib/pluginlib_exit.h" |
26 | #if LCD_DEPTH > 1 | 27 | #if LCD_DEPTH > 1 |
@@ -31,7 +32,6 @@ | |||
31 | #include "lib/mylcd.h" /* MYLCD_CFG_GREYLIB or MYLCD_CFG_PGFX */ | 32 | #include "lib/mylcd.h" /* MYLCD_CFG_GREYLIB or MYLCD_CFG_PGFX */ |
32 | #endif | 33 | #endif |
33 | #include "lib/xlcd.h" | 34 | #include "lib/xlcd.h" |
34 | #include "lib/fixedpoint.h" | ||
35 | 35 | ||
36 | /* Loops that the values are displayed */ | 36 | /* Loops that the values are displayed */ |
37 | #define DISP_TIME 30 | 37 | #define DISP_TIME 30 |
diff --git a/apps/plugins/fft/math.h b/apps/plugins/fft/math.h index ffacf1eedb..5545c497f2 100644 --- a/apps/plugins/fft/math.h +++ b/apps/plugins/fft/math.h | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | #include <inttypes.h> | 4 | #include <inttypes.h> |
5 | #include <math.h> | 5 | #include <math.h> |
6 | #include "lib/fixedpoint.h" | 6 | #include "fixedpoint.h" |
7 | 7 | ||
8 | #define Q_MUL(a, b, bits) (( (int64_t) (a) * (int64_t) (b) ) >> (bits)) | 8 | #define Q_MUL(a, b, bits) (( (int64_t) (a) * (int64_t) (b) ) >> (bits)) |
9 | #define Q15_MUL(a, b) Q_MUL(a,b,15) | 9 | #define Q15_MUL(a, b) Q_MUL(a,b,15) |
diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c index 5813894d4f..478296b5f8 100644 --- a/apps/plugins/fire.c +++ b/apps/plugins/fire.c | |||
@@ -22,10 +22,10 @@ | |||
22 | ****************************************************************************/ | 22 | ****************************************************************************/ |
23 | 23 | ||
24 | #include "plugin.h" | 24 | #include "plugin.h" |
25 | #include "fixedpoint.h" | ||
25 | #include "lib/helper.h" | 26 | #include "lib/helper.h" |
26 | 27 | ||
27 | #include "lib/pluginlib_actions.h" | 28 | #include "lib/pluginlib_actions.h" |
28 | #include "lib/fixedpoint.h" | ||
29 | 29 | ||
30 | #ifndef HAVE_LCD_COLOR | 30 | #ifndef HAVE_LCD_COLOR |
31 | #include "lib/grey.h" | 31 | #include "lib/grey.h" |
diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES index d49605f1ad..0a125dbbe4 100644 --- a/apps/plugins/lib/SOURCES +++ b/apps/plugins/lib/SOURCES | |||
@@ -4,7 +4,6 @@ helper.c | |||
4 | md5.c | 4 | md5.c |
5 | jhash.c | 5 | jhash.c |
6 | configfile.c | 6 | configfile.c |
7 | fixedpoint.c | ||
8 | playback_control.c | 7 | playback_control.c |
9 | rgb_hsv.c | 8 | rgb_hsv.c |
10 | highscore.c | 9 | highscore.c |
diff --git a/apps/plugins/lib/fixedpoint.c b/apps/plugins/lib/fixedpoint.c deleted file mode 100644 index 352e246673..0000000000 --- a/apps/plugins/lib/fixedpoint.c +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include "../../fixedpoint.c" | ||
diff --git a/apps/plugins/lib/fixedpoint.h b/apps/plugins/lib/fixedpoint.h deleted file mode 100644 index 811a1d9b81..0000000000 --- a/apps/plugins/lib/fixedpoint.h +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2006 Jens Arnold | ||
11 | * | ||
12 | * Fixed point library for plugins | ||
13 | * | ||
14 | * This program is free software; you can redistribute it and/or | ||
15 | * modify it under the terms of the GNU General Public License | ||
16 | * as published by the Free Software Foundation; either version 2 | ||
17 | * of the License, or (at your option) any later version. | ||
18 | * | ||
19 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
20 | * KIND, either express or implied. | ||
21 | * | ||
22 | ****************************************************************************/ | ||
23 | #ifndef _FIXEDPOINT_H_PLUGINS | ||
24 | #define _FIXEDPOINT_H_PLUGINS | ||
25 | #include "../../../firmware/include/fixedpoint.h" | ||
26 | #endif /* _FIXEDPOINT_H_PLUGINS */ | ||
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 13cc359a5d..a4ec6a8789 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -22,13 +22,11 @@ | |||
22 | ****************************************************************************/ | 22 | ****************************************************************************/ |
23 | 23 | ||
24 | #include "plugin.h" | 24 | #include "plugin.h" |
25 | #include "fixedpoint.h" | ||
25 | #include "lib/helper.h" | 26 | #include "lib/helper.h" |
26 | #include "lib/pluginlib_exit.h" | 27 | #include "lib/pluginlib_exit.h" |
27 | |||
28 | #include "lib/xlcd.h" | 28 | #include "lib/xlcd.h" |
29 | #include "lib/configfile.h" | 29 | #include "lib/configfile.h" |
30 | #include "fixedpoint.h" | ||
31 | #include "lib/fixedpoint.h" | ||
32 | #include "lib/osd.h" | 30 | #include "lib/osd.h" |
33 | 31 | ||
34 | /* variable button definitions */ | 32 | /* variable button definitions */ |
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index 88afb858f5..5b2b3ae94d 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c | |||
@@ -25,6 +25,7 @@ | |||
25 | ****************************************************************************/ | 25 | ****************************************************************************/ |
26 | 26 | ||
27 | #include "plugin.h" | 27 | #include "plugin.h" |
28 | #include "fixedpoint.h" | ||
28 | #include "lib/helper.h" | 29 | #include "lib/helper.h" |
29 | #include "lib/pluginlib_actions.h" | 30 | #include "lib/pluginlib_actions.h" |
30 | #include "lib/pluginlib_exit.h" | 31 | #include "lib/pluginlib_exit.h" |
@@ -32,7 +33,6 @@ | |||
32 | #ifndef HAVE_LCD_COLOR | 33 | #ifndef HAVE_LCD_COLOR |
33 | #include "lib/grey.h" | 34 | #include "lib/grey.h" |
34 | #endif | 35 | #endif |
35 | #include "lib/fixedpoint.h" | ||
36 | 36 | ||
37 | 37 | ||
38 | /******************************* Globals ***********************************/ | 38 | /******************************* Globals ***********************************/ |
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index 0fc8ba7dc1..92769d770a 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make | |||
@@ -53,7 +53,7 @@ else | |||
53 | PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS) | 53 | PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS) |
54 | endif | 54 | endif |
55 | 55 | ||
56 | PLUGIN_LIBS := $(PLUGINLIB) $(PLUGINBITMAPLIB) $(SETJMPLIB) | 56 | PLUGIN_LIBS := $(PLUGINLIB) $(PLUGINBITMAPLIB) $(SETJMPLIB) $(FIXEDPOINTLIB) |
57 | 57 | ||
58 | # include <dir>.make from each subdir (yay!) | 58 | # include <dir>.make from each subdir (yay!) |
59 | $(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make)) | 59 | $(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make)) |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index ec884442d4..107d46bd67 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * | 18 | * |
19 | **************************************************************************/ | 19 | **************************************************************************/ |
20 | #include "plugin.h" | 20 | #include "plugin.h" |
21 | #include "lib/fixedpoint.h" | 21 | #include "fixedpoint.h" |
22 | #include "lib/playback_control.h" | 22 | #include "lib/playback_control.h" |
23 | 23 | ||
24 | 24 | ||