Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2301_76519099
rt-thread
提交
2553dd0a
R
rt-thread
项目概览
2301_76519099
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
3
Star
1
Fork
1
代码
文件
提交
分支
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,发现更多精彩内容 >>
未验证
提交
2553dd0a
编写于
12月 11, 2017
作者:
B
Bernard Xiong
提交者:
GitHub
12月 11, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1095 from armink/fix_sfud
Fix sfud
上级
3f6f872c
8768f31f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
9 deletion
+10
-9
components/drivers/spi/SConscript
components/drivers/spi/SConscript
+7
-1
components/drivers/spi/spi_flash_sfud.c
components/drivers/spi/spi_flash_sfud.c
+3
-8
未找到文件。
components/drivers/spi/SConscript
浏览文件 @
2553dd0a
from
building
import
*
from
building
import
*
import
rtconfig
cwd
=
GetCurrentDir
()
cwd
=
GetCurrentDir
()
src
=
[
'spi_core.c'
,
'spi_dev.c'
]
src
=
[
'spi_core.c'
,
'spi_dev.c'
]
CPPPATH
=
[
cwd
,
cwd
+
'/../include'
]
CPPPATH
=
[
cwd
,
cwd
+
'/../include'
]
LOCAL_CCFLAGS
=
''
src_device
=
[]
src_device
=
[]
...
@@ -32,9 +34,13 @@ if GetDepend('RT_USING_SFUD'):
...
@@ -32,9 +34,13 @@ if GetDepend('RT_USING_SFUD'):
CPPPATH
+=
[
cwd
+
'/sfud/inc'
]
CPPPATH
+=
[
cwd
+
'/sfud/inc'
]
if
GetDepend
(
'RT_SFUD_USING_SFDP'
):
if
GetDepend
(
'RT_SFUD_USING_SFDP'
):
src_device
+=
[
'sfud/src/sfud_sfdp.c'
]
src_device
+=
[
'sfud/src/sfud_sfdp.c'
]
if
rtconfig
.
CROSS_TOOL
==
'gcc'
:
LOCAL_CCFLAGS
+=
' -std=c99'
elif
rtconfig
.
CROSS_TOOL
==
'keil'
:
LOCAL_CCFLAGS
+=
' --c99'
src
+=
src_device
src
+=
src_device
group
=
DefineGroup
(
'DeviceDrivers'
,
src
,
depend
=
[
'RT_USING_SPI'
],
CPPPATH
=
CPPPATH
)
group
=
DefineGroup
(
'DeviceDrivers'
,
src
,
depend
=
[
'RT_USING_SPI'
],
CPPPATH
=
CPPPATH
,
LOCAL_CCFLAGS
=
LOCAL_CCFLAGS
)
Return
(
'group'
)
Return
(
'group'
)
components/drivers/spi/spi_flash_sfud.c
浏览文件 @
2553dd0a
...
@@ -165,11 +165,6 @@ static void spi_unlock(const sfud_spi *spi) {
...
@@ -165,11 +165,6 @@ static void spi_unlock(const sfud_spi *spi) {
rt_mutex_release
(
&
(
rtt_dev
->
lock
));
rt_mutex_release
(
&
(
rtt_dev
->
lock
));
}
}
static
void
retry_delay_ms
(
void
)
{
/* millisecond delay */
rt_tick_from_millisecond
(
1
);
}
static
void
retry_delay_100us
(
void
)
{
static
void
retry_delay_100us
(
void
)
{
/* 100 microsecond delay */
/* 100 microsecond delay */
rt_thread_delay
((
RT_TICK_PER_SECOND
*
1
+
9999
)
/
10000
);
rt_thread_delay
((
RT_TICK_PER_SECOND
*
1
+
9999
)
/
10000
);
...
@@ -242,6 +237,9 @@ rt_spi_flash_device_t rt_sfud_flash_probe(const char *spi_flash_dev_name, const
...
@@ -242,6 +237,9 @@ rt_spi_flash_device_t rt_sfud_flash_probe(const char *spi_flash_dev_name, const
rt_spi_flash_device_t
rtt_dev
=
RT_NULL
;
rt_spi_flash_device_t
rtt_dev
=
RT_NULL
;
sfud_flash
*
sfud_dev
=
RT_NULL
;
sfud_flash
*
sfud_dev
=
RT_NULL
;
char
*
spi_flash_dev_name_bak
=
RT_NULL
,
*
spi_dev_name_bak
=
RT_NULL
;
char
*
spi_flash_dev_name_bak
=
RT_NULL
,
*
spi_dev_name_bak
=
RT_NULL
;
/* using default flash SPI configuration for initialize SPI Flash
* @note you also can change the SPI to other configuration after initialized finish */
struct
rt_spi_configuration
cfg
=
RT_SFUD_DEFAULT_SPI_CFG
;
extern
sfud_err
sfud_device_init
(
sfud_flash
*
flash
);
extern
sfud_err
sfud_device_init
(
sfud_flash
*
flash
);
RT_ASSERT
(
spi_flash_dev_name
);
RT_ASSERT
(
spi_flash_dev_name
);
...
@@ -269,9 +267,6 @@ rt_spi_flash_device_t rt_sfud_flash_probe(const char *spi_flash_dev_name, const
...
@@ -269,9 +267,6 @@ rt_spi_flash_device_t rt_sfud_flash_probe(const char *spi_flash_dev_name, const
goto
error
;
goto
error
;
}
}
sfud_dev
->
spi
.
name
=
spi_dev_name_bak
;
sfud_dev
->
spi
.
name
=
spi_dev_name_bak
;
/* using default flash SPI configuration for initialize SPI Flash
* @note you also can change the SPI to other configuration after initialized finish */
struct
rt_spi_configuration
cfg
=
RT_SFUD_DEFAULT_SPI_CFG
;
rt_spi_configure
(
rtt_dev
->
rt_spi_device
,
&
cfg
);
rt_spi_configure
(
rtt_dev
->
rt_spi_device
,
&
cfg
);
/* initialize lock */
/* initialize lock */
rt_mutex_init
(
&
(
rtt_dev
->
lock
),
spi_flash_dev_name
,
RT_IPC_FLAG_FIFO
);
rt_mutex_init
(
&
(
rtt_dev
->
lock
),
spi_flash_dev_name
,
RT_IPC_FLAG_FIFO
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录