Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
逆着光、寻觅
rt-thread
提交
e6f2081a
R
rt-thread
项目概览
逆着光、寻觅
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
e6f2081a
编写于
3月 04, 2018
作者:
B
Bernard Xiong
提交者:
GitHub
3月 04, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1257 from RT-Thread/fix_libc
rename fls to __rt_fls in MMC.
上级
bb2eb41b
f6a71362
变更
6
展开全部
隐藏空白更改
内联
并排
Showing
6 changed file
with
626 addition
and
616 deletion
+626
-616
bsp/mini4020/drivers/sdcard.c
bsp/mini4020/drivers/sdcard.c
+586
-585
bsp/mini4020/drivers/sdcard.h
bsp/mini4020/drivers/sdcard.h
+28
-28
components/drivers/include/drivers/mmcsd_core.h
components/drivers/include/drivers/mmcsd_core.h
+1
-1
components/drivers/sdio/mmcsd_core.c
components/drivers/sdio/mmcsd_core.c
+1
-1
components/finsh/msh.c
components/finsh/msh.c
+4
-1
components/libc/Kconfig
components/libc/Kconfig
+6
-0
未找到文件。
bsp/mini4020/drivers/sdcard.c
浏览文件 @
e6f2081a
此差异已折叠。
点击以展开。
bsp/mini4020/drivers/sdcard.h
浏览文件 @
e6f2081a
...
...
@@ -17,43 +17,43 @@
#include <rtthread.h>
#ifdef RT_USING_DFS
#include <sep4020.h>
#define INICLK
300000
#define SDCLK
24000000
//PCLK=49.392MHz
#define MMCCLK
15000000
//PCLK=49.392MHz
#define INICLK
300000
#define SDCLK
24000000
//PCLK=49.392MHz
#define MMCCLK
15000000
//PCLK=49.392MHz
/*struct of the SDC*/
struct
sd_c
struct
sd_c
{
__IO
rt_uint32_t
clk_ctl
;
__IO
rt_uint32_t
soft_rst
;
__IO
rt_uint32_t
arg
;
__IO
rt_uint32_t
cmd
;
__IO
rt_uint32_t
blk_sz
;
__IO
rt_uint32_t
blk_cnt
;
__IO
rt_uint32_t
trans_mode
;
__O
rt_uint32_t
response0
;
__O
rt_uint32_t
response1
;
__O
rt_uint32_t
response2
;
__O
rt_uint32_t
response3
;
__IO
rt_uint32_t
rd_to_ctl
;
__IO
rt_uint32_t
int_stat
;
__IO
rt_uint32_t
int_stat_mask
;
__O
rt_uint32_t
rx_fifo
;
__I
rt_uint32_t
tx_fifo
;
__IO
rt_uint32_t
clk_ctl
;
__IO
rt_uint32_t
soft_rst
;
__IO
rt_uint32_t
arg
;
__IO
rt_uint32_t
cmd
;
__IO
rt_uint32_t
blk_sz
;
__IO
rt_uint32_t
blk_cnt
;
__IO
rt_uint32_t
trans_mode
;
__O
rt_uint32_t
response0
;
__O
rt_uint32_t
response1
;
__O
rt_uint32_t
response2
;
__O
rt_uint32_t
response3
;
__IO
rt_uint32_t
rd_to_ctl
;
__IO
rt_uint32_t
int_stat
;
__IO
rt_uint32_t
int_stat_mask
;
__O
rt_uint32_t
rx_fifo
;
__I
rt_uint32_t
tx_fifo
;
};
/*sdcard driver structure*/
struct
sd_device
struct
sd_device
{
struct
rt_device
*
device
;
/*rt_device*/
struct
sd_c
*
sdc
;
/*SDCARD register*/
struct
dfs_partition
*
part
;
/*dfs partitions*/
rt_uint8_t
*
sec_buf
;
/*sdcard buffer*/
rt_uint32_t
part_num
;
/*partiont numbers*/
rt_uint32_t
buf_size
;
/*buffer size*/
struct
rt_device
*
device
;
/*rt_device*/
struct
sd_c
*
sdc
;
/*SDCARD register*/
struct
dfs_partition
*
part
;
/*dfs partitions*/
rt_uint8_t
*
sec_buf
;
/*sdcard buffer*/
rt_uint32_t
part_num
;
/*partiont numbers*/
rt_uint32_t
buf_size
;
/*buffer size*/
};
#endif
...
...
components/drivers/include/drivers/mmcsd_core.h
浏览文件 @
e6f2081a
...
...
@@ -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
;
...
...
components/drivers/sdio/mmcsd_core.c
浏览文件 @
e6f2081a
...
...
@@ -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
))
...
...
components/finsh/msh.c
浏览文件 @
e6f2081a
...
...
@@ -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
;
...
...
components/libc/Kconfig
浏览文件 @
e6f2081a
...
...
@@ -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
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录