diff options
-rw-r--r-- | apps/bookmark.c | 1 | ||||
-rw-r--r-- | apps/codecs.c | 2 | ||||
-rw-r--r-- | apps/cuesheet.c | 1 | ||||
-rw-r--r-- | apps/enc_config.c | 2 | ||||
-rw-r--r-- | apps/filetypes.c | 1 | ||||
-rw-r--r-- | apps/gui/gwps-common.c | 1 | ||||
-rw-r--r-- | apps/gui/viewport.c | 2 | ||||
-rw-r--r-- | apps/gui/wps_parser.c | 4 | ||||
-rw-r--r-- | apps/metadata/asf.c | 1 | ||||
-rw-r--r-- | apps/metadata/metadata_common.c | 1 | ||||
-rw-r--r-- | apps/metadata/mp4.c | 1 | ||||
-rw-r--r-- | apps/metadata/sid.c | 1 | ||||
-rw-r--r-- | apps/metadata/spc.c | 1 | ||||
-rw-r--r-- | apps/misc.c | 1 | ||||
-rw-r--r-- | apps/playlist.c | 1 | ||||
-rw-r--r-- | apps/plugin.c | 2 | ||||
-rw-r--r-- | apps/recorder/radio.c | 1 | ||||
-rw-r--r-- | apps/recorder/recording.c | 1 | ||||
-rw-r--r-- | apps/settings.c | 1 | ||||
-rw-r--r-- | apps/tagcache.c | 1 | ||||
-rw-r--r-- | apps/tagtree.c | 1 | ||||
-rw-r--r-- | firmware/common/dir_uncached.c | 2 | ||||
-rw-r--r-- | firmware/common/dircache.c | 2 | ||||
-rw-r--r-- | firmware/drivers/fat.c | 1 | ||||
-rw-r--r-- | firmware/id3.c | 1 | ||||
-rw-r--r-- | firmware/include/atoi.h | 25 | ||||
-rw-r--r-- | firmware/include/stdlib.h | 2 |
27 files changed, 9 insertions, 52 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c index 13c9abe936..b371431259 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include "system.h" | 35 | #include "system.h" |
36 | #include "errno.h" | 36 | #include "errno.h" |
37 | #include "icons.h" | 37 | #include "icons.h" |
38 | #include "atoi.h" | ||
39 | #include "string.h" | 38 | #include "string.h" |
40 | #include "menu.h" | 39 | #include "menu.h" |
41 | #include "lang.h" | 40 | #include "lang.h" |
diff --git a/apps/codecs.c b/apps/codecs.c index c8573fc84a..c0adb5d08f 100644 --- a/apps/codecs.c +++ b/apps/codecs.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <stdbool.h> | 21 | #include <stdbool.h> |
22 | #include <string.h> | 22 | #include <string.h> |
23 | #include <stdio.h> | 23 | #include <stdio.h> |
24 | #include <atoi.h> | 24 | #include <stdlib.h> |
25 | #include <timefuncs.h> | 25 | #include <timefuncs.h> |
26 | #include <ctype.h> | 26 | #include <ctype.h> |
27 | #include "debug.h" | 27 | #include "debug.h" |
diff --git a/apps/cuesheet.c b/apps/cuesheet.c index dcdba9f4c6..98262db731 100644 --- a/apps/cuesheet.c +++ b/apps/cuesheet.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <stdio.h> | 20 | #include <stdio.h> |
21 | #include <stdlib.h> | 21 | #include <stdlib.h> |
22 | #include <stdbool.h> | 22 | #include <stdbool.h> |
23 | #include <atoi.h> | ||
24 | #include <ctype.h> | 23 | #include <ctype.h> |
25 | #include <string.h> | 24 | #include <string.h> |
26 | #include "system.h" | 25 | #include "system.h" |
diff --git a/apps/enc_config.c b/apps/enc_config.c index 9d64536e5d..e1956ed960 100644 --- a/apps/enc_config.c +++ b/apps/enc_config.c | |||
@@ -19,9 +19,9 @@ | |||
19 | #include <stdio.h> | 19 | #include <stdio.h> |
20 | #include <sprintf.h> | 20 | #include <sprintf.h> |
21 | #include <string.h> | 21 | #include <string.h> |
22 | #include <stdlib.h> | ||
22 | #include "config.h" | 23 | #include "config.h" |
23 | #include "action.h" | 24 | #include "action.h" |
24 | #include "atoi.h" | ||
25 | #include "lang.h" | 25 | #include "lang.h" |
26 | #include "misc.h" | 26 | #include "misc.h" |
27 | #include "talk.h" | 27 | #include "talk.h" |
diff --git a/apps/filetypes.c b/apps/filetypes.c index c63f37ea27..722456b8f4 100644 --- a/apps/filetypes.c +++ b/apps/filetypes.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <stdlib.h> | 22 | #include <stdlib.h> |
23 | #include <stdbool.h> | 23 | #include <stdbool.h> |
24 | #include "string.h" | 24 | #include "string.h" |
25 | #include "atoi.h" | ||
26 | #include <ctype.h> | 25 | #include <ctype.h> |
27 | 26 | ||
28 | #include "sprintf.h" | 27 | #include "sprintf.h" |
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index bd552ecae2..9582a48dc4 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c | |||
@@ -47,7 +47,6 @@ | |||
47 | #include "peakmeter.h" | 47 | #include "peakmeter.h" |
48 | /* Image stuff */ | 48 | /* Image stuff */ |
49 | #include "bmp.h" | 49 | #include "bmp.h" |
50 | #include "atoi.h" | ||
51 | #include "albumart.h" | 50 | #include "albumart.h" |
52 | #endif | 51 | #endif |
53 | #include "dsp.h" | 52 | #include "dsp.h" |
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index 8a2e6bb99a..86ecd995ca 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c | |||
@@ -17,6 +17,7 @@ | |||
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #include <stdlib.h> | ||
20 | #include "config.h" | 21 | #include "config.h" |
21 | #include "lcd.h" | 22 | #include "lcd.h" |
22 | #include "lcd-remote.h" | 23 | #include "lcd-remote.h" |
@@ -27,7 +28,6 @@ | |||
27 | #include "kernel.h" | 28 | #include "kernel.h" |
28 | #include "system.h" | 29 | #include "system.h" |
29 | #include "misc.h" | 30 | #include "misc.h" |
30 | #include "atoi.h" | ||
31 | #include "viewport.h" | 31 | #include "viewport.h" |
32 | #include "statusbar.h" | 32 | #include "statusbar.h" |
33 | #include "screen_access.h" | 33 | #include "screen_access.h" |
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c index 50020dada6..fe43272bb0 100644 --- a/apps/gui/wps_parser.c +++ b/apps/gui/wps_parser.c | |||
@@ -19,6 +19,7 @@ | |||
19 | 19 | ||
20 | #include <stdio.h> | 20 | #include <stdio.h> |
21 | #include <string.h> | 21 | #include <string.h> |
22 | #include <stdlib.h> | ||
22 | #include "gwps.h" | 23 | #include "gwps.h" |
23 | #include "file.h" | 24 | #include "file.h" |
24 | #include "misc.h" | 25 | #include "misc.h" |
@@ -33,12 +34,9 @@ | |||
33 | #ifndef __PCTOOL__ | 34 | #ifndef __PCTOOL__ |
34 | #include <ctype.h> | 35 | #include <ctype.h> |
35 | #include <stdbool.h> | 36 | #include <stdbool.h> |
36 | #include <stdio.h> | ||
37 | #include <stdlib.h> | ||
38 | #include <string.h> | 37 | #include <string.h> |
39 | #include "font.h" | 38 | #include "font.h" |
40 | 39 | ||
41 | #include "atoi.h" | ||
42 | #include "gwps.h" | 40 | #include "gwps.h" |
43 | #include "settings.h" | 41 | #include "settings.h" |
44 | #include "plugin.h" | 42 | #include "plugin.h" |
diff --git a/apps/metadata/asf.c b/apps/metadata/asf.c index c4d7aab030..408dcbf436 100644 --- a/apps/metadata/asf.c +++ b/apps/metadata/asf.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <string.h> | 21 | #include <string.h> |
22 | #include <stdlib.h> | 22 | #include <stdlib.h> |
23 | #include <ctype.h> | 23 | #include <ctype.h> |
24 | #include <atoi.h> | ||
25 | #include <inttypes.h> | 24 | #include <inttypes.h> |
26 | 25 | ||
27 | #include "id3.h" | 26 | #include "id3.h" |
diff --git a/apps/metadata/metadata_common.c b/apps/metadata/metadata_common.c index e3579473f0..95160b1bca 100644 --- a/apps/metadata/metadata_common.c +++ b/apps/metadata/metadata_common.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include "id3.h" | 26 | #include "id3.h" |
27 | #include "metadata_common.h" | 27 | #include "metadata_common.h" |
28 | #include "replaygain.h" | 28 | #include "replaygain.h" |
29 | #include "atoi.h" | ||
30 | 29 | ||
31 | /* Skip an ID3v2 tag if it can be found. We assume the tag is located at the | 30 | /* Skip an ID3v2 tag if it can be found. We assume the tag is located at the |
32 | * start of the file, which should be true in all cases where we need to skip it. | 31 | * start of the file, which should be true in all cases where we need to skip it. |
diff --git a/apps/metadata/mp4.c b/apps/metadata/mp4.c index 31c9509b94..eb44a2d889 100644 --- a/apps/metadata/mp4.c +++ b/apps/metadata/mp4.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include "logf.h" | 29 | #include "logf.h" |
30 | #include "debug.h" | 30 | #include "debug.h" |
31 | #include "replaygain.h" | 31 | #include "replaygain.h" |
32 | #include "atoi.h" | ||
33 | 32 | ||
34 | #define MP4_ID(a, b, c, d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) | 33 | #define MP4_ID(a, b, c, d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) |
35 | 34 | ||
diff --git a/apps/metadata/sid.c b/apps/metadata/sid.c index 0dff5f6268..566cd6f2be 100644 --- a/apps/metadata/sid.c +++ b/apps/metadata/sid.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include "system.h" | 25 | #include "system.h" |
26 | #include "id3.h" | 26 | #include "id3.h" |
27 | #include "metadata_common.h" | 27 | #include "metadata_common.h" |
28 | #include "atoi.h" | ||
29 | #include "rbunicode.h" | 28 | #include "rbunicode.h" |
30 | 29 | ||
31 | /* PSID metadata info is available here: | 30 | /* PSID metadata info is available here: |
diff --git a/apps/metadata/spc.c b/apps/metadata/spc.c index 8d85518714..144ac97b7a 100644 --- a/apps/metadata/spc.c +++ b/apps/metadata/spc.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include "id3.h" | 26 | #include "id3.h" |
27 | #include "metadata_common.h" | 27 | #include "metadata_common.h" |
28 | #include "debug.h" | 28 | #include "debug.h" |
29 | #include "atoi.h" | ||
30 | #include "rbunicode.h" | 29 | #include "rbunicode.h" |
31 | 30 | ||
32 | bool get_spc_metadata(int fd, struct mp3entry* id3) | 31 | bool get_spc_metadata(int fd, struct mp3entry* id3) |
diff --git a/apps/misc.c b/apps/misc.c index ef4f968119..c97b9cf0f3 100644 --- a/apps/misc.c +++ b/apps/misc.c | |||
@@ -44,7 +44,6 @@ | |||
44 | #include "power.h" | 44 | #include "power.h" |
45 | #include "powermgmt.h" | 45 | #include "powermgmt.h" |
46 | #include "backlight.h" | 46 | #include "backlight.h" |
47 | #include "atoi.h" | ||
48 | #include "version.h" | 47 | #include "version.h" |
49 | #include "font.h" | 48 | #include "font.h" |
50 | #include "splash.h" | 49 | #include "splash.h" |
diff --git a/apps/playlist.c b/apps/playlist.c index 416f981347..756680c336 100644 --- a/apps/playlist.c +++ b/apps/playlist.c | |||
@@ -83,7 +83,6 @@ | |||
83 | #include "applimits.h" | 83 | #include "applimits.h" |
84 | #include "screens.h" | 84 | #include "screens.h" |
85 | #include "buffer.h" | 85 | #include "buffer.h" |
86 | #include "atoi.h" | ||
87 | #include "misc.h" | 86 | #include "misc.h" |
88 | #include "button.h" | 87 | #include "button.h" |
89 | #include "filetree.h" | 88 | #include "filetree.h" |
diff --git a/apps/plugin.c b/apps/plugin.c index b3710e4d62..aa3f73e4c5 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <ctype.h> | 20 | #include <ctype.h> |
21 | #include <string.h> | 21 | #include <string.h> |
22 | #include <sprintf.h> | 22 | #include <sprintf.h> |
23 | #include <atoi.h> | 23 | #include <stdlib.h> |
24 | #include "debug.h" | 24 | #include "debug.h" |
25 | #include "i2c.h" | 25 | #include "i2c.h" |
26 | #include "lang.h" | 26 | #include "lang.h" |
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 522f1dac93..3a15d4f721 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -33,7 +33,6 @@ | |||
33 | #include "ctype.h" | 33 | #include "ctype.h" |
34 | #include "file.h" | 34 | #include "file.h" |
35 | #include "errno.h" | 35 | #include "errno.h" |
36 | #include "atoi.h" | ||
37 | #include "string.h" | 36 | #include "string.h" |
38 | #include "system.h" | 37 | #include "system.h" |
39 | #include "radio.h" | 38 | #include "radio.h" |
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 543b7f2775..4c8da8c3bd 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -60,7 +60,6 @@ | |||
60 | #include "dir.h" | 60 | #include "dir.h" |
61 | #include "errno.h" | 61 | #include "errno.h" |
62 | #include "talk.h" | 62 | #include "talk.h" |
63 | #include "atoi.h" | ||
64 | #include "sound.h" | 63 | #include "sound.h" |
65 | #include "ata.h" | 64 | #include "ata.h" |
66 | #include "splash.h" | 65 | #include "splash.h" |
diff --git a/apps/settings.c b/apps/settings.c index 394f0a6c03..9fb1f12d0d 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include "rtc.h" | 36 | #include "rtc.h" |
37 | #include "power.h" | 37 | #include "power.h" |
38 | #include "ata_idle_notify.h" | 38 | #include "ata_idle_notify.h" |
39 | #include "atoi.h" | ||
40 | #include "screens.h" | 39 | #include "screens.h" |
41 | #include "ctype.h" | 40 | #include "ctype.h" |
42 | #include "file.h" | 41 | #include "file.h" |
diff --git a/apps/tagcache.c b/apps/tagcache.c index a2e3c9ca01..8cf261f93f 100644 --- a/apps/tagcache.c +++ b/apps/tagcache.c | |||
@@ -74,7 +74,6 @@ | |||
74 | #include "dir.h" | 74 | #include "dir.h" |
75 | #include "structec.h" | 75 | #include "structec.h" |
76 | #ifndef __PCTOOL__ | 76 | #ifndef __PCTOOL__ |
77 | #include "atoi.h" | ||
78 | #include "splash.h" | 77 | #include "splash.h" |
79 | #include "lang.h" | 78 | #include "lang.h" |
80 | #include "eeprom_settings.h" | 79 | #include "eeprom_settings.h" |
diff --git a/apps/tagtree.c b/apps/tagtree.c index 53c8bd032c..627cad3817 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c | |||
@@ -40,7 +40,6 @@ | |||
40 | #include "keyboard.h" | 40 | #include "keyboard.h" |
41 | #include "gui/list.h" | 41 | #include "gui/list.h" |
42 | #include "buffer.h" | 42 | #include "buffer.h" |
43 | #include "atoi.h" | ||
44 | #include "playback.h" | 43 | #include "playback.h" |
45 | #include "yesno.h" | 44 | #include "yesno.h" |
46 | #include "misc.h" | 45 | #include "misc.h" |
diff --git a/firmware/common/dir_uncached.c b/firmware/common/dir_uncached.c index 129ef35603..105265bc8f 100644 --- a/firmware/common/dir_uncached.c +++ b/firmware/common/dir_uncached.c | |||
@@ -20,10 +20,10 @@ | |||
20 | #include <errno.h> | 20 | #include <errno.h> |
21 | #include <string.h> | 21 | #include <string.h> |
22 | #include <stdbool.h> | 22 | #include <stdbool.h> |
23 | #include <stdlib.h> | ||
23 | #include "fat.h" | 24 | #include "fat.h" |
24 | #include "dir.h" | 25 | #include "dir.h" |
25 | #include "debug.h" | 26 | #include "debug.h" |
26 | #include "atoi.h" | ||
27 | 27 | ||
28 | #define MAX_OPEN_DIRS 8 | 28 | #define MAX_OPEN_DIRS 8 |
29 | 29 | ||
diff --git a/firmware/common/dircache.c b/firmware/common/dircache.c index d2a0b31600..40d86f3552 100644 --- a/firmware/common/dircache.c +++ b/firmware/common/dircache.c | |||
@@ -27,8 +27,8 @@ | |||
27 | #include <errno.h> | 27 | #include <errno.h> |
28 | #include <string.h> | 28 | #include <string.h> |
29 | #include <stdbool.h> | 29 | #include <stdbool.h> |
30 | #include <stdlib.h> | ||
30 | #include "debug.h" | 31 | #include "debug.h" |
31 | #include "atoi.h" | ||
32 | #include "system.h" | 32 | #include "system.h" |
33 | #include "logf.h" | 33 | #include "logf.h" |
34 | #include "dircache.h" | 34 | #include "dircache.h" |
diff --git a/firmware/drivers/fat.c b/firmware/drivers/fat.c index 002e100405..0ff47a82b5 100644 --- a/firmware/drivers/fat.c +++ b/firmware/drivers/fat.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include "kernel.h" | 30 | #include "kernel.h" |
31 | #include "rbunicode.h" | 31 | #include "rbunicode.h" |
32 | #include "logf.h" | 32 | #include "logf.h" |
33 | #include "atoi.h" | ||
34 | 33 | ||
35 | #define BYTES2INT16(array,pos) \ | 34 | #define BYTES2INT16(array,pos) \ |
36 | (array[pos] | (array[pos+1] << 8 )) | 35 | (array[pos] | (array[pos+1] << 8 )) |
diff --git a/firmware/id3.c b/firmware/id3.c index 181ce97c6c..0e5c05ca27 100644 --- a/firmware/id3.c +++ b/firmware/id3.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include "config.h" | 36 | #include "config.h" |
37 | #include "file.h" | 37 | #include "file.h" |
38 | #include "logf.h" | 38 | #include "logf.h" |
39 | #include "atoi.h" | ||
40 | 39 | ||
41 | #include "id3.h" | 40 | #include "id3.h" |
42 | #include "mp3data.h" | 41 | #include "mp3data.h" |
diff --git a/firmware/include/atoi.h b/firmware/include/atoi.h deleted file mode 100644 index 118879622b..0000000000 --- a/firmware/include/atoi.h +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2002 by Felix Arends | ||
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 | |||
20 | #ifndef __ATOI_H__ | ||
21 | #define __ATOI_H__ | ||
22 | |||
23 | int atoi (const char *str); | ||
24 | |||
25 | #endif /* __ATOI_H__ */ | ||
diff --git a/firmware/include/stdlib.h b/firmware/include/stdlib.h index 1f4fb88668..504b59247a 100644 --- a/firmware/include/stdlib.h +++ b/firmware/include/stdlib.h | |||
@@ -41,6 +41,8 @@ int rand(void); | |||
41 | #ifdef SIMULATOR | 41 | #ifdef SIMULATOR |
42 | void exit(int status); | 42 | void exit(int status); |
43 | #endif | 43 | #endif |
44 | |||
45 | int atoi (const char *str); | ||
44 | 46 | ||
45 | #ifdef __cplusplus | 47 | #ifdef __cplusplus |
46 | } | 48 | } |