Merge branch 'master' of https://github.com/RT-Thread/rt-thread into renhaibo-branch
This commit is contained in:
commit
ec3b4349d3
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue