Merge branch 'master' of https://github.com/RT-Thread/rt-thread into renhaibo-branch

hichard · hichard · commit ec3b4349d302 · 2019-11-16T11:20:13.000+08:00
diff --git a/components/drivers/Kconfig b/components/drivers/Kconfig
@@ -125,7 +125,6 @@ config RT_USING_PM
 
 config RT_USING_RTC
     bool "Using RTC device drivers"
-    select RT_USING_LIBC
     default n
 
     if RT_USING_RTC
diff --git a/components/drivers/usb/usbdevice/class/rndis.c b/components/drivers/usb/usbdevice/class/rndis.c
@@ -421,7 +421,7 @@ static rt_err_t _rndis_query_response(ufunction_t func,rndis_query_msg_t msg)
     case OID_GEN_LINK_SPEED:
         resp = _create_resp(4);
         if(resp == RT_NULL) break;
-        _set_resp(resp, func->device->dcd->device_is_hs ? (480UL * 1000 *1000) : (12UL * 1000 * 1000) / 100);
+        _set_resp(resp, (func->device->dcd->device_is_hs ? (480UL * 1000 *1000) : (12UL * 1000 * 1000)) / 100);
         break;
 
     case OID_GEN_MEDIA_CONNECT_STATUS:
diff --git a/components/utilities/Kconfig b/components/utilities/Kconfig
@@ -146,7 +146,6 @@ config RT_USING_ULOG
             config ULOG_TIME_USING_TIMESTAMP
                 bool "Enable timestamp format for time."
                 default n
-                select RT_USING_LIBC
                 depends on ULOG_OUTPUT_TIME
 
             config ULOG_OUTPUT_LEVEL
diff --git a/src/thread.c b/src/thread.c
@@ -107,11 +107,11 @@ void rt_thread_exit(void)
         rt_list_insert_after(&rt_thread_defunct, &(thread->tlist));
     }
 
-    /* enable interrupt */
-    rt_hw_interrupt_enable(level);
-
     /* switch to next task */
     rt_schedule();
+
+    /* enable interrupt */
+    rt_hw_interrupt_enable(level);
 }
 
 static rt_err_t _rt_thread_init(struct rt_thread *thread,

Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,11 @@ void rt_thread_exit(void)`
`107`	`107`	`rt_list_insert_after(&rt_thread_defunct, &(thread->tlist));`
`108`	`108`	`}`
`109`	`109`
`110`		`- /* enable interrupt */`
`111`		`- rt_hw_interrupt_enable(level);`
`112`		`-`
`113`	`110`	`/* switch to next task */`
`114`	`111`	`rt_schedule();`
	`112`	`+`
	`113`	`+ /* enable interrupt */`
	`114`	`+ rt_hw_interrupt_enable(level);`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`static rt_err_t _rt_thread_init(struct rt_thread *thread,`