diff options
| author | hichard <[email protected]> | 2019-11-16 11:20:13 +0800 |
|---|---|---|
| committer | hichard <[email protected]> | 2019-11-16 11:20:13 +0800 |
| commit | ec3b4349d30249c1dfd64af19df3af82307ec2dc (patch) | |
| tree | f86f16887433ece993f7c8269ab627b7fbb00aea | |
| parent | aafed7b43455d6e2d66d5e36e8f3d849b677e195 (diff) | |
| parent | 97b7661f6ef902db9b5bc92d384f2944433d0e8f (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread into renhaibo-branch
| -rwxr-xr-x | components/drivers/Kconfig | 1 | ||||
| -rw-r--r-- | components/drivers/usb/usbdevice/class/rndis.c | 2 | ||||
| -rw-r--r-- | components/utilities/Kconfig | 1 | ||||
| -rw-r--r-- | src/thread.c | 6 |
4 files changed, 4 insertions, 6 deletions
diff --git a/components/drivers/Kconfig b/components/drivers/Kconfig index 6b57ff00c3..c2e6d3a411 100755 --- 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 index ec61234947..93e0ba6ae2 100644 --- 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 index 250239aea6..9a50512989 100644 --- 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 index bee5f0c2c0..c5f75a1176 100644 --- 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, |