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

Merge pull request #1257 from RT-Thread/fix_libc 

rename fls to __rt_fls in MMC.
This commit is contained in:
Bernard Xiong 2018-03-04 20:42:58 +08:00 committed by GitHub
parent bb2eb41b44 f6a7136226
commit e6f2081aa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 598 additions and 588 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1115
bsp/mini4020/drivers/sdcard.c
View File

File diff suppressed because it is too large Load Diff

56
bsp/mini4020/drivers/sdcard.h
View File

@ -17,43 +17,43 @@
#include <rtthread.h> #include <rtthread.h>
#ifdef RT_USING_DFS #ifdef RT_USING_DFS
#include <sep4020.h> #include <sep4020.h>
#define INICLK 300000 #define INICLK 300000
#define SDCLK 24000000 //PCLK=49.392MHz #define SDCLK 24000000 //PCLK=49.392MHz
#define MMCCLK 15000000 //PCLK=49.392MHz #define MMCCLK 15000000 //PCLK=49.392MHz
/*struct of the SDC*/ /*struct of the SDC*/
struct sd_c struct sd_c
{ {
__IO rt_uint32_t clk_ctl; __IO rt_uint32_t clk_ctl;
__IO rt_uint32_t soft_rst; __IO rt_uint32_t soft_rst;
__IO rt_uint32_t arg; __IO rt_uint32_t arg;
__IO rt_uint32_t cmd; __IO rt_uint32_t cmd;
__IO rt_uint32_t blk_sz; __IO rt_uint32_t blk_sz;
__IO rt_uint32_t blk_cnt; __IO rt_uint32_t blk_cnt;
__IO rt_uint32_t trans_mode; __IO rt_uint32_t trans_mode;
__O rt_uint32_t response0; __O rt_uint32_t response0;
__O rt_uint32_t response1; __O rt_uint32_t response1;
__O rt_uint32_t response2; __O rt_uint32_t response2;
__O rt_uint32_t response3; __O rt_uint32_t response3;
__IO rt_uint32_t rd_to_ctl; __IO rt_uint32_t rd_to_ctl;
__IO rt_uint32_t int_stat; __IO rt_uint32_t int_stat;
__IO rt_uint32_t int_stat_mask; __IO rt_uint32_t int_stat_mask;
__O rt_uint32_t rx_fifo; __O rt_uint32_t rx_fifo;
__I rt_uint32_t tx_fifo; __I rt_uint32_t tx_fifo;
}; };
/*sdcard driver structure*/ /*sdcard driver structure*/
struct sd_device struct sd_device
{ {
struct rt_device *device; /*rt_device*/ struct rt_device *device; /*rt_device*/
struct sd_c *sdc; /*SDCARD register*/ struct sd_c *sdc; /*SDCARD register*/
struct dfs_partition *part; /*dfs partitions*/ struct dfs_partition *part; /*dfs partitions*/
rt_uint8_t *sec_buf; /*sdcard buffer*/ rt_uint8_t *sec_buf; /*sdcard buffer*/
rt_uint32_t part_num; /*partiont numbers*/ rt_uint32_t part_num; /*partiont numbers*/
rt_uint32_t buf_size; /*buffer size*/ rt_uint32_t buf_size; /*buffer size*/
}; };
#endif #endif

2
components/drivers/include/drivers/mmcsd_core.h
View File

@ -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;

2
components/drivers/sdio/mmcsd_core.c
View File

@ -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))

5
components/finsh/msh.c
View File

@ -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;

6
components/libc/Kconfig
View File

@ -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