summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
Diffstat (limited to 'firmware')
-rw-r--r--firmware/common/dir_uncached.c2
-rw-r--r--firmware/common/dircache.c2
-rw-r--r--firmware/drivers/fat.c1
-rw-r--r--firmware/id3.c1
-rw-r--r--firmware/include/atoi.h25
-rw-r--r--firmware/include/stdlib.h2
6 files changed, 4 insertions, 29 deletions
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
23int 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
42void exit(int status); 42void exit(int status);
43#endif 43#endif
44
45int atoi (const char *str);
44 46
45#ifdef __cplusplus 47#ifdef __cplusplus
46} 48}