From 259eaab9a9de1b01ac45803fe4f0e58b90f99d84 Mon Sep 17 00:00:00 2001 From: Damien George Date: Sat, 18 Apr 2015 14:29:28 +0100 Subject: [PATCH] cc3200: Clean up and reduce use/include of std.h. --- cc3200/bootmgr/main.c | 2 +- cc3200/fatfs/src/ffconf.c | 1 - cc3200/ftp/ftp.c | 2 +- cc3200/ftp/updater.c | 1 - cc3200/misc/mperror.c | 2 +- cc3200/misc/mpexception.c | 1 - cc3200/mods/modnetwork.c | 2 +- cc3200/mods/modpyb.c | 3 +-- cc3200/mods/moduos.c | 1 - cc3200/mods/modusocket.c | 1 - cc3200/mods/modwlan.c | 2 +- cc3200/mods/pybsleep.c | 1 - cc3200/mptask.c | 3 +-- cc3200/serverstask.c | 1 - cc3200/telnet/telnet.c | 1 - cc3200/util/fifo.c | 1 - cc3200/util/hash.c | 1 - cc3200/util/socketfifo.c | 1 - cc3200/util/std.h | 17 ++++------------- 19 files changed, 11 insertions(+), 33 deletions(-) diff --git a/cc3200/bootmgr/main.c b/cc3200/bootmgr/main.c index 2297c568d9..7121479038 100644 --- a/cc3200/bootmgr/main.c +++ b/cc3200/bootmgr/main.c @@ -26,7 +26,7 @@ #include #include -#include +#include "std.h" #include "py/mpconfig.h" #include MICROPY_HAL_H diff --git a/cc3200/fatfs/src/ffconf.c b/cc3200/fatfs/src/ffconf.c index 3206a85bf7..120fb8328d 100644 --- a/cc3200/fatfs/src/ffconf.c +++ b/cc3200/fatfs/src/ffconf.c @@ -25,7 +25,6 @@ */ #include -#include #include "py/mpconfig.h" #include "py/misc.h" diff --git a/cc3200/ftp/ftp.c b/cc3200/ftp/ftp.c index 2899ca4080..8a2afa2728 100644 --- a/cc3200/ftp/ftp.c +++ b/cc3200/ftp/ftp.c @@ -26,7 +26,7 @@ #include #include -#include +#include "std.h" #include "py/mpconfig.h" #include MICROPY_HAL_H diff --git a/cc3200/ftp/updater.c b/cc3200/ftp/updater.c index 98282a0517..5b599d2f63 100644 --- a/cc3200/ftp/updater.c +++ b/cc3200/ftp/updater.c @@ -1,6 +1,5 @@ #include #include -#include "std.h" #include "py/mpconfig.h" #include MICROPY_HAL_H diff --git a/cc3200/misc/mperror.c b/cc3200/misc/mperror.c index 1f77f06929..3927b21220 100644 --- a/cc3200/misc/mperror.c +++ b/cc3200/misc/mperror.c @@ -25,7 +25,7 @@ * THE SOFTWARE. */ -#include +#include #include #include diff --git a/cc3200/misc/mpexception.c b/cc3200/misc/mpexception.c index dbbebe539a..c45f0244bf 100644 --- a/cc3200/misc/mpexception.c +++ b/cc3200/misc/mpexception.c @@ -27,7 +27,6 @@ #include #include -#include #include "py/mpstate.h" #include "mpexception.h" diff --git a/cc3200/mods/modnetwork.c b/cc3200/mods/modnetwork.c index fa45e57157..77e8e0658f 100644 --- a/cc3200/mods/modnetwork.c +++ b/cc3200/mods/modnetwork.c @@ -25,7 +25,7 @@ * THE SOFTWARE. */ -#include +#include #include #include diff --git a/cc3200/mods/modpyb.c b/cc3200/mods/modpyb.c index fbff8bae6c..f7a941d083 100644 --- a/cc3200/mods/modpyb.c +++ b/cc3200/mods/modpyb.c @@ -25,9 +25,8 @@ * THE SOFTWARE. */ - -#include #include +#include "std.h" #include "py/mpstate.h" #include "py/runtime.h" diff --git a/cc3200/mods/moduos.c b/cc3200/mods/moduos.c index 1f9a03e0ee..34993f5cab 100644 --- a/cc3200/mods/moduos.c +++ b/cc3200/mods/moduos.c @@ -27,7 +27,6 @@ #include #include -#include "std.h" #include "py/mpconfig.h" #include "py/nlr.h" diff --git a/cc3200/mods/modusocket.c b/cc3200/mods/modusocket.c index a83f3c0018..929238c5da 100644 --- a/cc3200/mods/modusocket.c +++ b/cc3200/mods/modusocket.c @@ -25,7 +25,6 @@ * THE SOFTWARE. */ -#include #include #include diff --git a/cc3200/mods/modwlan.c b/cc3200/mods/modwlan.c index cf7519a0dd..6f3c21ca40 100644 --- a/cc3200/mods/modwlan.c +++ b/cc3200/mods/modwlan.c @@ -24,9 +24,9 @@ * THE SOFTWARE. */ -#include "std.h" #include #include +#include "std.h" #include "simplelink.h" #include "py/mpconfig.h" diff --git a/cc3200/mods/pybsleep.c b/cc3200/mods/pybsleep.c index 427ff518d1..334f62446d 100644 --- a/cc3200/mods/pybsleep.c +++ b/cc3200/mods/pybsleep.c @@ -24,7 +24,6 @@ * THE SOFTWARE. */ -#include #include #include diff --git a/cc3200/mptask.c b/cc3200/mptask.c index 2213943e5d..d9c0ed8f7e 100644 --- a/cc3200/mptask.c +++ b/cc3200/mptask.c @@ -26,7 +26,6 @@ */ #include -#include #include "py/mpconfig.h" #include MICROPY_HAL_H @@ -245,7 +244,7 @@ soft_reset_exit: // soft reset pybsleep_signal_soft_reset(); - printf("PYB: soft reboot\n"); + mp_printf(&mp_plat_print, "PYB: soft reboot\n"); sflash_disk_flush(); diff --git a/cc3200/serverstask.c b/cc3200/serverstask.c index 62e41fcd44..ea56589eab 100644 --- a/cc3200/serverstask.c +++ b/cc3200/serverstask.c @@ -25,7 +25,6 @@ */ #include -#include #include "py/mpconfig.h" #include MICROPY_HAL_H diff --git a/cc3200/telnet/telnet.c b/cc3200/telnet/telnet.c index fd91805447..4100cec61a 100644 --- a/cc3200/telnet/telnet.c +++ b/cc3200/telnet/telnet.c @@ -25,7 +25,6 @@ */ #include -#include #include "py/mpconfig.h" #include MICROPY_HAL_H diff --git a/cc3200/util/fifo.c b/cc3200/util/fifo.c index 73b2b7161c..166f99d985 100644 --- a/cc3200/util/fifo.c +++ b/cc3200/util/fifo.c @@ -27,7 +27,6 @@ #include #include -#include "std.h" #include "fifo.h" diff --git a/cc3200/util/hash.c b/cc3200/util/hash.c index c25ebb2b06..1ae0c3ce64 100644 --- a/cc3200/util/hash.c +++ b/cc3200/util/hash.c @@ -24,7 +24,6 @@ * THE SOFTWARE. */ -#include "std.h" #include #include #include "inc/hw_types.h" diff --git a/cc3200/util/socketfifo.c b/cc3200/util/socketfifo.c index cfe92a82b6..eb25f3be3e 100644 --- a/cc3200/util/socketfifo.c +++ b/cc3200/util/socketfifo.c @@ -28,7 +28,6 @@ #include #include -#include #include "osi.h" #include "fifo.h" #include "socketfifo.h" diff --git a/cc3200/util/std.h b/cc3200/util/std.h index 8368432b9f..2b23fb63e1 100644 --- a/cc3200/util/std.h +++ b/cc3200/util/std.h @@ -24,21 +24,12 @@ * THE SOFTWARE. */ +// This file is needed because in some cases we can't include stdio.h, +// because the CC3100 socket driver has name clashes with it. + typedef unsigned int size_t; -void *memcpy(void *dest, const void *src, size_t n); -void *memmove(void *dest, const void *src, size_t n); -void *memset(void *s, int c, size_t n); - -size_t strlen(const char *str); -int strcmp(const char *s1, const char *s2); -int strncmp(const char *s1, const char *s2, size_t n); -char *strcpy(char *dest, const char *src); -char *strcat(char *dest, const char *src); -char *strchr(const char *s, int c); -char *strstr(const char *haystack, const char *needle); - -int printf(const char *fmt, ...); int snprintf(char *str, size_t size, const char *fmt, ...); +// Convenience function, defined in main.c. void stoupper (char *str);