Merge remote-tracking branch 'remotes/origin/master' into 723

Author: SummerGift

SConscript

@@ -9,13 +9,17 @@ src    += Glob('lib/mp-readline/*.c')
 src    += Glob('lib/utils/*.c')
 src    += Glob('extmod/*.c')
 src    += Glob('port/*.c')
+src    += Glob('port/modules/*.c')
+src    += Glob('port/modules/machine/*.c')
 src    += Glob('lib/netutils/*.c')
 src    += Glob('lib/timeutils/*.c')
 src    += Glob('drivers/bus/*.c')
 src    += Glob('port/native/*.c')
 
 path    = [cwd + '/']
 path   += [cwd + '/port']
+path   += [cwd + '/port/modules']
+path   += [cwd + '/port/modules/machine']
 
 LOCAL_CCFLAGS = ''
 

port/fdfile.h

@@ -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/help.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));
     }