Moved atoi declaration to stdlib.h. Deleted atoi.h

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17280 a1c6a512-1295-4272-9138-f99709370657

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 @@
 #include "system.h"
 #include "errno.h"
 #include "icons.h"
-#include "atoi.h"
 #include "string.h"
 #include "menu.h"
 #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 @@
 #include <stdbool.h>
 #include <string.h>
 #include <stdio.h>
-#include <atoi.h>
+#include <stdlib.h>
 #include <timefuncs.h>
 #include <ctype.h>
 #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 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include <atoi.h>
 #include <ctype.h>
 #include <string.h>
 #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 @@
 #include <stdio.h>
 #include <sprintf.h>
 #include <string.h>
+#include <stdlib.h>
 #include "config.h"
 #include "action.h"
-#include "atoi.h"
 #include "lang.h"
 #include "misc.h"
 #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 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include "string.h"
-#include "atoi.h"
 #include <ctype.h>
 
 #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 @@
 #include "peakmeter.h"
 /* Image stuff */
 #include "bmp.h"
-#include "atoi.h"
 #include "albumart.h"
 #endif
 #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 @@
  *
  ****************************************************************************/
 
+#include <stdlib.h>
 #include "config.h"
 #include "lcd.h"
 #include "lcd-remote.h"
@@ -27,7 +28,6 @@
 #include "kernel.h"
 #include "system.h"
 #include "misc.h"
-#include "atoi.h"
 #include "viewport.h"
 #include "statusbar.h"
 #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 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include "gwps.h"
 #include "file.h"
 #include "misc.h"
@@ -33,12 +34,9 @@
 #ifndef __PCTOOL__
 #include <ctype.h>
 #include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include "font.h"
 
-#include "atoi.h"
 #include "gwps.h"
 #include "settings.h"
 #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 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <atoi.h>
 #include <inttypes.h>
 
 #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 @@
 #include "id3.h"
 #include "metadata_common.h"
 #include "replaygain.h"
-#include "atoi.h"
 
 /* Skip an ID3v2 tag if it can be found. We assume the tag is located at the
  * 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 @@
 #include "logf.h"
 #include "debug.h"
 #include "replaygain.h"
-#include "atoi.h"
 
 #define MP4_ID(a, b, c, d)  (((a) << 24) | ((b) << 16) | ((c) << 8) | (d))
 
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 @@
 #include "system.h"
 #include "id3.h"
 #include "metadata_common.h"
-#include "atoi.h"
 #include "rbunicode.h"
 
 /* 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 @@
 #include "id3.h"
 #include "metadata_common.h"
 #include "debug.h"
-#include "atoi.h"
 #include "rbunicode.h"
 
 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 @@
 #include "power.h"
 #include "powermgmt.h"
 #include "backlight.h"
-#include "atoi.h"
 #include "version.h"
 #include "font.h"
 #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 @@
 #include "applimits.h"
 #include "screens.h"
 #include "buffer.h"
-#include "atoi.h"
 #include "misc.h"
 #include "button.h"
 #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 @@
 #include <ctype.h>
 #include <string.h>
 #include <sprintf.h>
-#include <atoi.h>
+#include <stdlib.h>
 #include "debug.h"
 #include "i2c.h"
 #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 @@
 #include "ctype.h"
 #include "file.h"
 #include "errno.h"
-#include "atoi.h"
 #include "string.h"
 #include "system.h"
 #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 @@
 #include "dir.h"
 #include "errno.h"
 #include "talk.h"
-#include "atoi.h"
 #include "sound.h"
 #include "ata.h"
 #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 @@
 #include "rtc.h"
 #include "power.h"
 #include "ata_idle_notify.h"
-#include "atoi.h"
 #include "screens.h"
 #include "ctype.h"
 #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 @@
 #include "dir.h"
 #include "structec.h"
 #ifndef __PCTOOL__
-#include "atoi.h"
 #include "splash.h"
 #include "lang.h"
 #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 @@
 #include "keyboard.h"
 #include "gui/list.h"
 #include "buffer.h"
-#include "atoi.h"
 #include "playback.h"
 #include "yesno.h"
 #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 @@
 #include <errno.h>
 #include <string.h>
 #include <stdbool.h>
+#include <stdlib.h>
 #include "fat.h"
 #include "dir.h"
 #include "debug.h"
-#include "atoi.h"
 
 #define MAX_OPEN_DIRS 8
 
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 @@
 #include <errno.h>
 #include <string.h>
 #include <stdbool.h>
+#include <stdlib.h>
 #include "debug.h"
-#include "atoi.h"
 #include "system.h"
 #include "logf.h"
 #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 @@
 #include "kernel.h"
 #include "rbunicode.h"
 #include "logf.h"
-#include "atoi.h"
 
 #define BYTES2INT16(array,pos) \
           (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 @@
 #include "config.h"
 #include "file.h"
 #include "logf.h"
-#include "atoi.h"
 
 #include "id3.h"
 #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 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2002 by Felix Arends
- *
- * All files in this archive are subject to the GNU General Public License.
- * See the file COPYING in the source tree root for full license agreement.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-#ifndef __ATOI_H__ 
-#define __ATOI_H__ 
-
-int atoi (const char *str);
-
-#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);
 #ifdef SIMULATOR
 void exit(int status);
 #endif
+
+int atoi (const char *str);
     
 #ifdef __cplusplus
 }