未验证 提交 e6f2081a 编写于 作者: B Bernard Xiong 提交者: GitHub

Merge pull request #1257 from RT-Thread/fix_libc

rename fls to __rt_fls in MMC.
此差异已折叠。
...@@ -185,7 +185,7 @@ struct rt_mmcsd_req { ...@@ -185,7 +185,7 @@ struct rt_mmcsd_req {
* Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32. * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
*/ */
rt_inline rt_uint32_t fls(rt_uint32_t val) rt_inline rt_uint32_t __rt_fls(rt_uint32_t val)
{ {
rt_uint32_t bit = 32; rt_uint32_t bit = 32;
......
...@@ -548,7 +548,7 @@ rt_uint32_t mmcsd_select_voltage(struct rt_mmcsd_host *host, rt_uint32_t ocr) ...@@ -548,7 +548,7 @@ rt_uint32_t mmcsd_select_voltage(struct rt_mmcsd_host *host, rt_uint32_t ocr)
static void mmcsd_power_up(struct rt_mmcsd_host *host) static void mmcsd_power_up(struct rt_mmcsd_host *host)
{ {
int bit = fls(host->valid_ocr) - 1; int bit = __rt_fls(host->valid_ocr) - 1;
host->io_cfg.vdd = bit; host->io_cfg.vdd = bit;
if (controller_is_spi(host)) if (controller_is_spi(host))
......
...@@ -405,7 +405,10 @@ void msh_auto_complete_path(char *path) ...@@ -405,7 +405,10 @@ void msh_auto_complete_path(char *path)
ptr = path; ptr = path;
for (;;) for (;;)
{ {
if (*ptr == '/') index = ptr + 1; if (!*ptr) break; ptr ++; if (*ptr == '/') index = ptr + 1;
if (!*ptr) break;
ptr ++;
} }
if (index == RT_NULL) index = path; if (index == RT_NULL) index = path;
......
...@@ -29,4 +29,10 @@ if RT_USING_LIBC && RT_USING_DFS ...@@ -29,4 +29,10 @@ if RT_USING_LIBC && RT_USING_DFS
endif endif
endif endif
config HAVE_SYS_SIGNALS
bool "Toolchains/libc has sigval/sigevent structure definitions"
default n
help
Toolchains/libc has sigval/sigevent/siginfo_t definitions.
endmenu endmenu
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册