lib/utils/printf: Move from stmhal/ .

This file contains various MicroPython-specific helper functions, so isn't
good fit for lib/libc/.

2 files changed, 1 insertions, 115 deletions

diff --git a/stmhal/Makefile b/stmhal/Makefile
index ab1c345af..de41d9261 100644
--- a/stmhal/Makefile
+++ b/stmhal/Makefile
@@ -104,6 +104,7 @@ SRC_LIB = $(addprefix lib/,\
 	netutils/netutils.c \
 	timeutils/timeutils.c \
 	utils/pyexec.c \
+	utils/printf.c \
 	)
 
 SRC_C = \
@@ -130,7 +131,6 @@ SRC_C = \
 	uart.c \
 	can.c \
 	usb.c \
-	printf.c \
 	gccollect.c \
 	pybstdio.c \
 	help.c \
diff --git a/stmhal/printf.c b/stmhal/printf.c
deleted file mode 100644
index 611ad2df4..000000000
--- a/stmhal/printf.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include <string.h>
-#include <stdarg.h>
-
-#include "py/obj.h"
-#include "py/mphal.h"
-
-#if MICROPY_PY_BUILTINS_FLOAT
-#include "py/formatfloat.h"
-#endif
-
-int printf(const char *fmt, ...) {
-    va_list ap;
-    va_start(ap, fmt);
-    int ret = mp_vprintf(&mp_plat_print, fmt, ap);
-    va_end(ap);
-    return ret;
-}
-
-int vprintf(const char *fmt, va_list ap) {
-    return mp_vprintf(&mp_plat_print, fmt, ap);
-}
-
-#if MICROPY_DEBUG_PRINTERS
-mp_uint_t mp_verbose_flag = 1;
-
-int DEBUG_printf(const char *fmt, ...) {
-    va_list ap;
-    va_start(ap, fmt);
-    int ret = mp_vprintf(&mp_plat_print, fmt, ap);
-    va_end(ap);
-    return ret;
-}
-#endif
-
-// need this because gcc optimises printf("%c", c) -> putchar(c), and printf("a") -> putchar('a')
-#undef putchar  // Some stdlibs have a #define for putchar
-int putchar(int c) {
-    char chr = c;
-    mp_hal_stdout_tx_strn_cooked(&chr, 1);
-    return chr;
-}
-
-// need this because gcc optimises printf("string\n") -> puts("string")
-int puts(const char *s) {
-    mp_hal_stdout_tx_strn_cooked(s, strlen(s));
-    char chr = '\n';
-    mp_hal_stdout_tx_strn_cooked(&chr, 1);
-    return 1;
-}
-
-typedef struct _strn_print_env_t {
-    char *cur;
-    size_t remain;
-} strn_print_env_t;
-
-STATIC void strn_print_strn(void *data, const char *str, mp_uint_t len) {
-    strn_print_env_t *strn_print_env = data;
-    if (len > strn_print_env->remain) {
-        len = strn_print_env->remain;
-    }
-    memcpy(strn_print_env->cur, str, len);
-    strn_print_env->cur += len;
-    strn_print_env->remain -= len;
-}
-
-int vsnprintf(char *str, size_t size, const char *fmt, va_list ap) {
-    strn_print_env_t strn_print_env = {str, size};
-    mp_print_t print = {&strn_print_env, strn_print_strn};
-    int len = mp_vprintf(&print, fmt, ap);
-    // add terminating null byte
-    if (size > 0) {
-        if (strn_print_env.remain == 0) {
-            strn_print_env.cur[-1] = 0;
-        } else {
-            strn_print_env.cur[0] = 0;
-        }
-    }
-    return len;
-}
-
-int snprintf(char *str, size_t size, const char *fmt, ...) {
-    va_list ap;
-    va_start(ap, fmt);
-    int ret = vsnprintf(str, size, fmt, ap);
-    va_end(ap);
-    return ret;
-}