libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
hichard 2019-11-16 11:20:13 +08:00
parent aafed7b434 97b7661f6e
commit ec3b4349d3
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/drivers/Kconfig
View File

@ -125,7 +125,6 @@ config RT_USING_PM
config RT_USING_RTC config RT_USING_RTC
bool "Using RTC device drivers" bool "Using RTC device drivers"
select RT_USING_LIBC
default n default n
if RT_USING_RTC if RT_USING_RTC

2
components/drivers/usb/usbdevice/class/rndis.c
View File

@ -421,7 +421,7 @@ static rt_err_t _rndis_query_response(ufunction_t func,rndis_query_msg_t msg)
case OID_GEN_LINK_SPEED: case OID_GEN_LINK_SPEED:
resp = _create_resp(4); resp = _create_resp(4);
if(resp == RT_NULL) break; 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; break;
case OID_GEN_MEDIA_CONNECT_STATUS: case OID_GEN_MEDIA_CONNECT_STATUS:

1
components/utilities/Kconfig
View File

@ -146,7 +146,6 @@ config RT_USING_ULOG
config ULOG_TIME_USING_TIMESTAMP config ULOG_TIME_USING_TIMESTAMP
bool "Enable timestamp format for time." bool "Enable timestamp format for time."
default n default n
select RT_USING_LIBC
depends on ULOG_OUTPUT_TIME depends on ULOG_OUTPUT_TIME
config ULOG_OUTPUT_LEVEL config ULOG_OUTPUT_LEVEL

6
src/thread.c
View File

@ -107,11 +107,11 @@ void rt_thread_exit(void)
rt_list_insert_after(&rt_thread_defunct, &(thread->tlist)); rt_list_insert_after(&rt_thread_defunct, &(thread->tlist));
} }
/* enable interrupt */
rt_hw_interrupt_enable(level);
/* switch to next task */ /* switch to next task */
rt_schedule(); rt_schedule();
/* enable interrupt */
rt_hw_interrupt_enable(level);
} }
static rt_err_t _rt_thread_init(struct rt_thread *thread, static rt_err_t _rt_thread_init(struct rt_thread *thread,