【修改】printf 输出统一使用 MicroPython 的 mp_printf 。

Signed-off-by: armink <armink.ztl@gmail.com>

port/machine_hw_i2c.c

@@ -83,7 +83,7 @@ mp_obj_t machine_hard_i2c_make_new(const mp_obj_type_t *type, size_t n_args, siz
     struct rt_i2c_bus_device *i2c_bus = rt_i2c_bus_device_find(iic_device);
 
     if (i2c_bus == RT_NULL) {
-        rt_kprintf("can't find %s device\r\n", iic_device);
+        mp_printf(&mp_plat_print, "can't find %s device\r\n", iic_device);
         nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "I2C(%s) doesn't exist", iic_device));
     }
 

port/machine_hw_spi.c

@@ -56,7 +56,7 @@ mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz
 
     struct rt_spi_device *rt_spi_device = (struct rt_spi_device *) rt_device_find(spi_dev_name);
     if (rt_spi_device == RT_NULL || rt_spi_device->parent.type != RT_Device_Class_SPIDevice) {
-        rt_kprintf("ERROR: SPI device %s not found!\n", spi_dev_name);
+        mp_printf(&mp_plat_print, "ERROR: SPI device %s not found!\n", spi_dev_name);
         nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "SPI(%s) doesn't exist", spi_dev_name));
     }
 

port/machine_uart.c

@@ -63,7 +63,7 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
 
     struct rt_serial_device *rt_serial_device = (struct rt_serial_device *) rt_device_find(uart_dev_name);
     if (rt_serial_device == RT_NULL || rt_serial_device->parent.type != RT_Device_Class_Char) {
-        rt_kprintf("ERROR: UART device %s not found!\n", uart_dev_name);
+        mp_printf(&mp_plat_print, "ERROR: UART device %s not found!\n", uart_dev_name);
         nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "UART(%s) doesn't exist", uart_dev_name));
     }
 	
@@ -71,7 +71,7 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
     result = rt_device_open((rt_device_t)rt_serial_device, RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_INT_RX );
     if (result != RT_EOK)
     {
-        rt_kprintf("ERROR: UART device %s can't open!\n", uart_dev_name);
+        mp_printf(&mp_plat_print, "ERROR: UART device %s can't open!\n", uart_dev_name);
         nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "UART(%s) can't open", uart_dev_name));
     }
 

port/modmachine.c

@@ -55,9 +55,9 @@ STATIC mp_obj_t machine_info(uint n_args, const mp_obj_t *args) {
 #endif
     // RT-Thread info
     {
-        rt_kprintf("---------------------------------------------\n");
-        rt_kprintf("RT-Thread\n");
-        rt_kprintf("---------------------------------------------\n");
+        mp_printf(&mp_plat_print, "---------------------------------------------\n");
+        mp_printf(&mp_plat_print, "RT-Thread\n");
+        mp_printf(&mp_plat_print, "---------------------------------------------\n");
 
 #ifdef RT_USING_FINSH
         extern void list_mem(void);
@@ -71,25 +71,25 @@ STATIC mp_obj_t machine_info(uint n_args, const mp_obj_t *args) {
 
         list_thread();
 #endif
-        rt_kprintf("---------------------------------------------\n");
+        mp_printf(&mp_plat_print, "---------------------------------------------\n");
     }
 
     // qstr info
     {
         mp_uint_t n_pool, n_qstr, n_str_data_bytes, n_total_bytes;
         qstr_pool_info(&n_pool, &n_qstr, &n_str_data_bytes, &n_total_bytes);
-        rt_kprintf("qstr:\n  n_pool=" UINT_FMT "\n  n_qstr=" UINT_FMT "\n  n_str_data_bytes=" UINT_FMT "\n  n_total_bytes=" UINT_FMT "\n", n_pool, n_qstr, n_str_data_bytes, n_total_bytes);
+        mp_printf(&mp_plat_print, "qstr:\n  n_pool=" UINT_FMT "\n  n_qstr=" UINT_FMT "\n  n_str_data_bytes=" UINT_FMT "\n  n_total_bytes=" UINT_FMT "\n", n_pool, n_qstr, n_str_data_bytes, n_total_bytes);
     }
-    rt_kprintf("---------------------------------------------\n");
+    mp_printf(&mp_plat_print, "---------------------------------------------\n");
 
     // GC info
     {
         gc_info_t info;
         gc_info(&info);
-        rt_kprintf("GC:\n");
-        rt_kprintf("  " UINT_FMT " total\n", info.total);
-        rt_kprintf("  " UINT_FMT " : " UINT_FMT "\n", info.used, info.free);
-        rt_kprintf("  1=" UINT_FMT " 2=" UINT_FMT " m=" UINT_FMT "\n", info.num_1block, info.num_2block, info.max_block);
+        mp_printf(&mp_plat_print, "GC:\n");
+        mp_printf(&mp_plat_print, "  " UINT_FMT " total\n", info.total);
+        mp_printf(&mp_plat_print, "  " UINT_FMT " : " UINT_FMT "\n", info.used, info.free);
+        mp_printf(&mp_plat_print, "  1=" UINT_FMT " 2=" UINT_FMT " m=" UINT_FMT "\n", info.num_1block, info.num_2block, info.max_block);
     }
 
     // free space on flash

port/modrtthread.c

@@ -55,7 +55,7 @@ STATIC mp_obj_t mod_stacks_analyze(void) {
     extern long list_thread(void);
     list_thread();
 #else
-    rt_kprintf("Not available when FINSH module disable\n");
+    mp_printf(&mp_plat_print, "Not available when FINSH module disable\n");
 #endif
 
     return mp_const_none;

port/moduos_file.c

@@ -74,7 +74,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_posix_mkfs_obj, 1, 2, mp_posix_mkfs);
 mp_obj_t mp_posix_chdir(mp_obj_t path_in) {
     const char *changepath = mp_obj_str_get_str(path_in);
     if (chdir(changepath) != 0) {
-        rt_kprintf("No such directory: %s\n", changepath);
+        mp_printf(&mp_plat_print, "No such directory: %s\n", changepath);
     }
     return mp_const_none;
 }
@@ -152,7 +152,7 @@ mp_obj_t mp_posix_listdir(size_t n_args, const mp_obj_t *args) {
                     mp_obj_get_array_fixed_n(next, 3, &items);
                     mp_obj_list_append(dir_list, items[0]);
                 } else {
-                    rt_kprintf("BAD file: %s\n", dirent.d_name);
+                    mp_printf(&mp_plat_print, "BAD file: %s\n", dirent.d_name);
                 }
                 rt_free(fullpath);
             }
@@ -162,7 +162,7 @@ mp_obj_t mp_posix_listdir(size_t n_args, const mp_obj_t *args) {
     }
     else
     {
-//        rt_kprintf("No such directory\n");
+//        mp_printf(&mp_plat_print, "No such directory\n");
     }
     if (pathname == NULL)
         rt_free(path);
@@ -184,12 +184,12 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_posix_mkdir_obj, mp_posix_mkdir);
 mp_obj_t mp_posix_remove(uint n_args, const mp_obj_t *arg) {
     int index;
     if (n_args == 0) {
-        rt_kprintf("Usage: rm FILE...\n");
-        rt_kprintf("Remove (unlink) the FILE(s).\n");
+        mp_printf(&mp_plat_print, "Usage: rm FILE...\n");
+        mp_printf(&mp_plat_print, "Remove (unlink) the FILE(s).\n");
         return mp_const_none;
     }
     for (index = 0; index < n_args; index++) {
-        //rt_kprintf("Remove %s.\n", mp_obj_str_get_str(arg[index]));
+        //mp_printf(&mp_plat_print, "Remove %s.\n", mp_obj_str_get_str(arg[index]));
         unlink(mp_obj_str_get_str(arg[index]));
     }
     // TODO  recursive deletion
@@ -211,12 +211,12 @@ MP_DEFINE_CONST_FUN_OBJ_2(mp_posix_rename_obj, mp_posix_rename);
 mp_obj_t mp_posix_rmdir(uint n_args, const mp_obj_t *arg) {
     int index;
     if (n_args == 0) {
-        rt_kprintf("Usage: rm FILE...\n");
-        rt_kprintf("Remove (unlink) the FILE(s).\n");
+        mp_printf(&mp_plat_print, "Usage: rm FILE...\n");
+        mp_printf(&mp_plat_print, "Remove (unlink) the FILE(s).\n");
         return mp_const_none;
     }
     for (index = 0; index < n_args; index++) {
-        //rt_kprintf("Remove %s.\n", mp_obj_str_get_str(arg[index]));
+        //mp_printf(&mp_plat_print, "Remove %s.\n", mp_obj_str_get_str(arg[index]));
         rmdir(mp_obj_str_get_str(arg[index]));
     }
     // TODO  recursive deletion

port/modusocket.c

@@ -548,7 +548,7 @@ STATIC mp_obj_t mod_usocket_getaddrinfo(uint n_args, const mp_obj_t *arg) {
     ret = getaddrinfo(host, NULL, &hint, &res);
     MP_THREAD_GIL_ENTER();
     if (ret != 0) {
-        rt_kprintf("getaddrinfo err: %d '%s'\n", ret, host);
+        mp_printf(&mp_plat_print, "getaddrinfo err: %d '%s'\n", ret, host);
         nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "no available netif"));
     }
 

port/mpconfigport.h

@@ -512,5 +512,5 @@ extern const struct _mp_obj_module_t mp_module_network;
     MODUZLIB_PORT_BUILTIN_MODULE_WEAK_LINKS \
     MODUSTRUCT_PORT_BUILTIN_MODULE_WEAK_LINKS \
 
-#define MP_RTT_NOT_IMPL_PRINT rt_kprintf("Not implement on %s:%ld, Please add for your board!\n", __FILE__, __LINE__)
+#define MP_RTT_NOT_IMPL_PRINT mp_printf(&mp_plat_print, "Not implement on %s:%ld, Please add for your board!\n", __FILE__, __LINE__)
 

port/mpy_main.c

@@ -74,7 +74,7 @@ void mpy_main(const char *filename) {
     mp_putsn_init();
 
     if (rt_thread_self()->stack_size < 4096) {
-        rt_kprintf("The stack (%.*s) size for executing MicroPython must be >=4096\n", RT_NAME_MAX, rt_thread_self()->name);
+        mp_printf(&mp_plat_print, "The stack (%.*s) size for executing MicroPython must be >=4096\n", RT_NAME_MAX, rt_thread_self()->name);
     }
 
 #if MICROPY_PY_THREAD
@@ -88,7 +88,7 @@ void mpy_main(const char *filename) {
 #if MICROPY_ENABLE_GC
     heap = rt_malloc(MICROPY_HEAP_SIZE);
     if (!heap) {
-        rt_kprintf("No memory for MicroPython Heap!\n");
+        mp_printf(&mp_plat_print, "No memory for MicroPython Heap!\n");
         return;
     }
     gc_init(heap, heap + MICROPY_HEAP_SIZE);
@@ -106,7 +106,7 @@ void mpy_main(const char *filename) {
 
     if (filename) {
 #ifndef MICROPYTHON_USING_UOS
-        rt_kprintf("Please enable uos module in sys module option first.\n");
+        mp_printf(&mp_plat_print, "Please enable uos module in sys module option first.\n");
 #else
         pyexec_file(filename);
 #endif
@@ -129,7 +129,7 @@ void mpy_main(const char *filename) {
         }
 #endif /* MICROPYTHON_USING_UOS */
 
-        rt_kprintf("\n");
+        mp_printf(&mp_plat_print, "\n");
         for (;;) {
             if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
                 if (pyexec_raw_repl() != 0) {
@@ -164,13 +164,13 @@ mp_import_stat_t mp_import_stat(const char *path) {
 #endif
 
 NORETURN void nlr_jump_fail(void *val) {
-    DEBUG_printf("nlr_jump_fail\n");
+    mp_printf(MICROPY_ERROR_PRINTER, "nlr_jump_fail\n");
     while (1);
 }
 
 #ifndef NDEBUG
 void MP_WEAK __assert_func(const char *file, int line, const char *func, const char *expr) {
-    rt_kprintf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);
+    mp_printf(MICROPY_ERROR_PRINTER, "Assertion '%s' failed, at file %s:%d\n", expr, file, line);
     RT_ASSERT(0);
 }
 #endif
@@ -186,7 +186,7 @@ int DEBUG_printf(const char *format, ...)
     va_start(args, format);
     /* must use vprintf to print */
     rt_vsprintf(log_buf, format, args);
-    rt_kprintf("%s", log_buf);
+    mp_printf(&mp_plat_print, "%s", log_buf);
     va_end(args);
 
     return 0;

port/native/native_module.c

@@ -50,7 +50,7 @@
  */
 
 void native_module_show(const char *str) {
-    rt_kprintf("Native module show: %s\n", str);
+    mp_printf(&mp_plat_print, "Native module show: %s\n", str);
 }
 RTM_EXPORT(native_module_show)
 

port/network_wlan.c

@@ -280,7 +280,7 @@ void wlan_station_scan(void)
     }
     else
     {
-        rt_kprintf("wifi scan result is null\n");
+        mp_printf(&mp_plat_print, ("wifi scan result is null\n");
         *wlan_scan_list = MP_OBJ_NULL;
     }
 }
@@ -323,7 +323,7 @@ STATIC mp_obj_t wlan_ifconfig(size_t n_args, const mp_obj_t *args) {
     struct netdev *netdev = netdev_default;
     if (netdev == RT_NULL)
     {
-        rt_kprintf("not find wlan interface device.\n");
+        mp_printf(&mp_plat_print, ("not find wlan interface device.\n");
         return MP_OBJ_NEW_SMALL_INT(-1);
     }