diff options
| author | Bernard Xiong <[email protected]> | 2018-03-04 20:42:58 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-03-04 20:42:58 +0800 |
| commit | e6f2081aa9c49c157ebea319127e50d7fd74ed6e (patch) | |
| tree | 2c821eb3d3328f6442c6b2ff234a649d2ed1dd0d /components | |
| parent | bb2eb41b447de46029c9024fe38c4e0783f43a0f (diff) | |
| parent | f6a7136226cd225a76dcdc7d19450ea3bfb51859 (diff) | |
Merge pull request #1257 from RT-Thread/fix_libc
rename fls to __rt_fls in MMC.
Diffstat (limited to 'components')
| -rw-r--r-- | components/drivers/include/drivers/mmcsd_core.h | 2 | ||||
| -rw-r--r-- | components/drivers/sdio/mmcsd_core.c | 2 | ||||
| -rw-r--r-- | components/finsh/msh.c | 5 | ||||
| -rw-r--r-- | components/libc/Kconfig | 6 |
4 files changed, 12 insertions, 3 deletions
diff --git a/components/drivers/include/drivers/mmcsd_core.h b/components/drivers/include/drivers/mmcsd_core.h index 36d71efeb2..424f9a0c85 100644 --- a/components/drivers/include/drivers/mmcsd_core.h +++ b/components/drivers/include/drivers/mmcsd_core.h @@ -185,7 +185,7 @@ struct rt_mmcsd_req { * 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; diff --git a/components/drivers/sdio/mmcsd_core.c b/components/drivers/sdio/mmcsd_core.c index d240dca400..edf4002ac7 100644 --- a/components/drivers/sdio/mmcsd_core.c +++ b/components/drivers/sdio/mmcsd_core.c @@ -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) { - int bit = fls(host->valid_ocr) - 1; + int bit = __rt_fls(host->valid_ocr) - 1; host->io_cfg.vdd = bit; if (controller_is_spi(host)) diff --git a/components/finsh/msh.c b/components/finsh/msh.c index f7e40c8841..f308e70ace 100644 --- a/components/finsh/msh.c +++ b/components/finsh/msh.c @@ -405,7 +405,10 @@ void msh_auto_complete_path(char *path) ptr = path; 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; diff --git a/components/libc/Kconfig b/components/libc/Kconfig index 6f82bfbe8e..852bb5cfc9 100644 --- a/components/libc/Kconfig +++ b/components/libc/Kconfig @@ -29,4 +29,10 @@ if RT_USING_LIBC && RT_USING_DFS 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 |