stmhal: Fix file print methods to use print instead of printf.

dpgeorge · dpgeorge · commit e79c6696c59e · 2014-06-15T09:10:07.000+01:00
Also make stdout_print_strn static (ultimately this function needs to be
merged with stdout_tx_strn).
diff --git a/stmhal/file.c b/stmhal/file.c
@@ -70,7 +70,7 @@ typedef struct _pyb_file_obj_t {
 } pyb_file_obj_t;
 
 void file_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
-    printf("<io.%s %p>", mp_obj_get_type_str(self_in), self_in);
+    print(env, "<io.%s %p>", mp_obj_get_type_str(self_in), self_in);
 }
 
 STATIC machine_int_t file_obj_read(mp_obj_t self_in, void *buf, machine_uint_t size, int *errcode) {
diff --git a/stmhal/printf.c b/stmhal/printf.c
@@ -195,7 +195,7 @@ int pfenv_printf(const pfenv_t *pfenv, const char *fmt, va_list args) {
     return chrs;
 }
 
-void stdout_print_strn(void *data, const char *str, unsigned int len) {
+STATIC void stdout_print_strn(void *data, const char *str, unsigned int len) {
     // TODO this needs to be replaced with a proper stdio interface ala CPython
     // send stdout to UART and USB CDC VCP
     if (pyb_uart_global_debug != PYB_UART_NONE) {
diff --git a/stmhal/pybstdio.c b/stmhal/pybstdio.c
@@ -96,7 +96,7 @@ typedef struct _pyb_stdio_obj_t {
 
 void stdio_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_stdio_obj_t *self = self_in;
-    printf("<io.FileIO %d>", self->fd);
+    print(env, "<io.FileIO %d>", self->fd);
 }
 
 STATIC machine_int_t stdio_read(mp_obj_t self_in, void *buf, machine_uint_t size, int *errcode) {

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ typedef struct _pyb_file_obj_t {`
`70`	`70`	`} pyb_file_obj_t;`
`71`	`71`
`72`	`72`	`void file_obj_print(void (print)(void env, const char fmt, ...), void env, mp_obj_t self_in, mp_print_kind_t kind) {`
`73`		`- printf("<io.%s %p>", mp_obj_get_type_str(self_in), self_in);`
	`73`	`+ print(env, "<io.%s %p>", mp_obj_get_type_str(self_in), self_in);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`STATIC machine_int_t file_obj_read(mp_obj_t self_in, void buf, machine_uint_t size, int errcode) {`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ int pfenv_printf(const pfenv_t pfenv, const char fmt, va_list args) {`
`195`	`195`	`return chrs;`
`196`	`196`	`}`
`197`	`197`
`198`		`-void stdout_print_strn(void data, const char str, unsigned int len) {`
	`198`	`+STATIC void stdout_print_strn(void data, const char str, unsigned int len) {`
`199`	`199`	`// TODO this needs to be replaced with a proper stdio interface ala CPython`
`200`	`200`	`// send stdout to UART and USB CDC VCP`
`201`	`201`	`if (pyb_uart_global_debug != PYB_UART_NONE) {`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ typedef struct _pyb_stdio_obj_t {`
`96`	`96`
`97`	`97`	`void stdio_obj_print(void (print)(void env, const char fmt, ...), void env, mp_obj_t self_in, mp_print_kind_t kind) {`
`98`	`98`	`pyb_stdio_obj_t *self = self_in;`
`99`		`- printf("<io.FileIO %d>", self->fd);`
	`99`	`+ print(env, "<io.FileIO %d>", self->fd);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`STATIC machine_int_t stdio_read(mp_obj_t self_in, void buf, machine_uint_t size, int errcode) {`