cc3200: Clean up and reduce use/include of std.h.

dpgeorge · dpgeorge · commit 259eaab9a9de · 2015-04-18T14:29:28.000+01:00
diff --git a/cc3200/bootmgr/main.c b/cc3200/bootmgr/main.c
@@ -26,7 +26,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <std.h>
+#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
@@ -25,7 +25,6 @@
  */
 
 #include <string.h>
-#include <std.h>
 
 #include "py/mpconfig.h"
 #include "py/misc.h"
diff --git a/cc3200/ftp/ftp.c b/cc3200/ftp/ftp.c
@@ -26,7 +26,7 @@
 
 #include <stdint.h>
 #include <ctype.h>
-#include <std.h>
+#include "std.h"
 
 #include "py/mpconfig.h"
 #include MICROPY_HAL_H
diff --git a/cc3200/ftp/updater.c b/cc3200/ftp/updater.c
@@ -1,6 +1,5 @@
 #include <stdint.h>
 #include <stdbool.h>
-#include "std.h"
 
 #include "py/mpconfig.h"
 #include MICROPY_HAL_H
diff --git a/cc3200/misc/mperror.c b/cc3200/misc/mperror.c
@@ -25,7 +25,7 @@
  * THE SOFTWARE.
  */
 
-#include <std.h>
+#include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 
diff --git a/cc3200/misc/mpexception.c b/cc3200/misc/mpexception.c
@@ -27,7 +27,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <std.h>
 
 #include "py/mpstate.h"
 #include "mpexception.h"
diff --git a/cc3200/mods/modnetwork.c b/cc3200/mods/modnetwork.c
@@ -25,7 +25,7 @@
  * THE SOFTWARE.
  */
 
-#include <std.h>
+#include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 
diff --git a/cc3200/mods/modpyb.c b/cc3200/mods/modpyb.c
@@ -25,9 +25,8 @@
  * THE SOFTWARE.
  */
 
-
-#include <std.h>
 #include <stdint.h>
+#include "std.h"
 
 #include "py/mpstate.h"
 #include "py/runtime.h"
diff --git a/cc3200/mods/moduos.c b/cc3200/mods/moduos.c
@@ -27,7 +27,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include "std.h"
 
 #include "py/mpconfig.h"
 #include "py/nlr.h"
diff --git a/cc3200/mods/modusocket.c b/cc3200/mods/modusocket.c
@@ -25,7 +25,6 @@
  * THE SOFTWARE.
  */
 
-#include <std.h>
 #include <stdint.h>
 #include <string.h>
 
diff --git a/cc3200/mods/modwlan.c b/cc3200/mods/modwlan.c
@@ -24,9 +24,9 @@
  * THE SOFTWARE.
  */
 
-#include "std.h"
 #include <stdint.h>
 #include <stdbool.h>
+#include "std.h"
 
 #include "simplelink.h"
 #include "py/mpconfig.h"
diff --git a/cc3200/mods/pybsleep.c b/cc3200/mods/pybsleep.c
@@ -24,7 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include <std.h>
 #include <stdint.h>
 #include <string.h>
 
diff --git a/cc3200/mptask.c b/cc3200/mptask.c
@@ -26,7 +26,6 @@
  */
 
 #include <stdint.h>
-#include <std.h>
 
 #include "py/mpconfig.h"
 #include MICROPY_HAL_H
@@ -245,7 +244,7 @@ void TASK_Micropython (void *pvParameters) {
     // 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
@@ -25,7 +25,6 @@
  */
 
 #include <stdint.h>
-#include <std.h>
 
 #include "py/mpconfig.h"
 #include MICROPY_HAL_H
diff --git a/cc3200/telnet/telnet.c b/cc3200/telnet/telnet.c
@@ -25,7 +25,6 @@
  */
 
 #include <stdint.h>
-#include <std.h>
 
 #include "py/mpconfig.h"
 #include MICROPY_HAL_H
diff --git a/cc3200/util/fifo.c b/cc3200/util/fifo.c
@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "std.h"
 #include "fifo.h"
 
 
diff --git a/cc3200/util/hash.c b/cc3200/util/hash.c
@@ -24,7 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include "std.h"
 #include <stdint.h>
 #include <stdbool.h>
 #include "inc/hw_types.h"
diff --git a/cc3200/util/socketfifo.c b/cc3200/util/socketfifo.c
@@ -28,7 +28,6 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include <std.h>
 #include "osi.h"
 #include "fifo.h"
 #include "socketfifo.h"
diff --git a/cc3200/util/std.h b/cc3200/util/std.h
@@ -24,21 +24,12 @@
  * THE SOFTWARE.
  */
 
-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);
+// This file is needed because in some cases we can't include stdio.h,
+// because the CC3100 socket driver has name clashes with it.
 
-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);
+typedef unsigned int size_t;
 
-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);
