Merge remote-tracking branch 'upstream/master'

bsp/imxrt1052-evk/Libraries/drivers/fsl_enet.c

@@ -1345,7 +1345,13 @@ status_t ENET_SendFrame(ENET_Type *base, enet_handle_t *handle, const uint8_t *d
 #else
         address = (uint32_t)curBuffDescrip->buffer;
 #endif /* FSL_FEATURE_MEMORY_HAS_ADDRESS_OFFSET */
-        memcpy((void *)address, data, length);
+        
+        {
+            // Change SDK to reduce memory copy
+            extern void pbuf2mem(const uint8_t *data, void *dataptr, uint32_t len);
+            pbuf2mem(data, (void *)address, length);
+        }
+        //memcpy((void *)address, data, length);
         /* Set data length. */
         curBuffDescrip->length = length;
 #ifdef ENET_ENHANCEDBUFFERDESCRIPTOR_MODE

components/drivers/rtc/rtc.c

@@ -247,7 +247,7 @@ FINSH_FUNCTION_EXPORT(list_date, show date and time.)
 FINSH_FUNCTION_EXPORT(set_date, set date. e.g: set_date(2010,2,28))
 FINSH_FUNCTION_EXPORT(set_time, set time. e.g: set_time(23,59,59))
 
-#if defined(RT_USING_FINSH)
+#if defined(RT_USING_FINSH) && defined(FINSH_USING_MSH)
 static void date(uint8_t argc, char **argv)
 {
     if (argc == 1)
@@ -308,6 +308,6 @@ static void date(uint8_t argc, char **argv)
     }
 }
 MSH_CMD_EXPORT(date, get date and time or set [year month day hour min sec]);
-#endif /* defined(RT_USING_FINSH) */
+#endif /* defined(RT_USING_FINSH) && defined(FINSH_USING_MSH) */
 
 #endif /* RT_USING_FINSH */

components/drivers/src/pipe.c

@@ -358,7 +358,7 @@ rt_err_t  rt_pipe_close  (rt_device_t device)
 rt_size_t rt_pipe_read   (rt_device_t device, rt_off_t pos, void *buffer, rt_size_t count)
 {
     uint8_t *pbuf;
-    int read_bytes = 0;
+    rt_size_t read_bytes = 0;
     rt_pipe_t *pipe = (rt_pipe_t *)device;
 
     if (device == RT_NULL)
@@ -386,7 +386,7 @@ rt_size_t rt_pipe_read   (rt_device_t device, rt_off_t pos, void *buffer, rt_siz
 rt_size_t rt_pipe_write  (rt_device_t device, rt_off_t pos, const void *buffer, rt_size_t count)
 {
     uint8_t *pbuf;
-    int write_bytes = 0;
+    rt_size_t write_bytes = 0;
     rt_pipe_t *pipe = (rt_pipe_t *)device;
 
     if (device == RT_NULL)

components/finsh/msh.c

@@ -282,7 +282,7 @@ RTM_EXPORT(system);
 static int _msh_exec_cmd(char *cmd, rt_size_t length, int *retp)
 {
     int argc;
-    int cmd0_size = 0;
+    rt_size_t cmd0_size = 0;
     cmd_function_t cmd_func;
     char *argv[RT_FINSH_ARG_MAX];
 
@@ -448,7 +448,7 @@ void msh_auto_complete_path(char *path)
     }
     else
     {
-        int length, min_length;
+        rt_size_t length, min_length;
 
         min_length = 0;
         for (;;)

src/mempool.c

@@ -95,7 +95,7 @@ rt_err_t rt_mp_init(struct rt_mempool *mp,
                     rt_size_t          block_size)
 {
     rt_uint8_t *block_ptr;
-    register rt_base_t offset;
+    register rt_size_t offset;
 
     /* parameter check */
     RT_ASSERT(mp != RT_NULL);
@@ -200,7 +200,7 @@ rt_mp_t rt_mp_create(const char *name,
 {
     rt_uint8_t *block_ptr;
     struct rt_mempool *mp;
-    register rt_base_t offset;
+    register rt_size_t offset;
 
     RT_DEBUG_NOT_IN_INTERRUPT;