djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Also make stdout_print_strn static (ultimately this function needs to be
merged with stdout_tx_strn).
This commit is contained in:
Damien George 2014-06-15 09:10:07 +01:00
parent 34ab8dd6dd
commit e79c6696c5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stmhal/file.c
View File

@ -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) {

2
stmhal/printf.c
View File

@ -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) {

2
stmhal/pybstdio.c
View File

@ -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) {