diff options
| author | chengxiaohu <[email protected]> | 2019-11-20 23:38:35 +0800 |
|---|---|---|
| committer | chengxiaohu <[email protected]> | 2019-11-20 23:38:35 +0800 |
| commit | 6b8a3469f8cb69d9ee49487c524533a9516ebce1 (patch) | |
| tree | 9b51157878a815b6da9d8d691ac0bbdbb2bc1f64 /components/drivers | |
| parent | 2a512f3df0f39790a14f1984c42a97dc0a82ba09 (diff) | |
| parent | 1bf5f67e8a6c9672945d3b0a61e173ce0b6e56d3 (diff) | |
Merge branch 'master' of https://github.com/chengxiaohu/rt-thread
Diffstat (limited to 'components/drivers')
| -rwxr-xr-x | components/drivers/Kconfig | 1 | ||||
| -rw-r--r-- | components/drivers/misc/rt_drv_pwm.c | 2 | ||||
| -rw-r--r-- | components/drivers/usb/usbdevice/class/rndis.c | 2 |
3 files changed, 2 insertions, 3 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/misc/rt_drv_pwm.c b/components/drivers/misc/rt_drv_pwm.c index 2b7986b4d8..97d38d51b3 100644 --- a/components/drivers/misc/rt_drv_pwm.c +++ b/components/drivers/misc/rt_drv_pwm.c @@ -259,7 +259,7 @@ static int pwm_set(int argc, char **argv) _exit: return result; } -MSH_CMD_EXPORT(pwm_set, pwm_set 1 100 50); +MSH_CMD_EXPORT(pwm_set, pwm_set pwm1 1 100 50); #endif /* FINSH_USING_MSH */ #endif /* RT_USING_FINSH */ 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: |