Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
rt-thread
提交
cf73f3a3
R
rt-thread
项目概览
BaiXuePrincess
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
0
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看板
未验证
提交
cf73f3a3
编写于
6月 27, 2018
作者:
B
Bernard Xiong
提交者:
GitHub
6月 27, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1574 from misonyo/dev
[components][drivers][pin module]:typo fix for pin_detach_irq
上级
37ce32e8
ef8398c2
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
23 addition
and
25 deletion
+23
-25
bsp/allwinner_tina/drivers/drv_gpio.c
bsp/allwinner_tina/drivers/drv_gpio.c
+2
-2
bsp/imxrt1052-evk/drivers/drv_pin.c
bsp/imxrt1052-evk/drivers/drv_pin.c
+2
-2
bsp/ls1cdev/drivers/drv_gpio.c
bsp/ls1cdev/drivers/drv_gpio.c
+2
-2
bsp/stm32f10x-HAL/drivers/drv_gpio.c
bsp/stm32f10x-HAL/drivers/drv_gpio.c
+2
-2
bsp/stm32f10x/drivers/gpio.c
bsp/stm32f10x/drivers/gpio.c
+2
-2
bsp/stm32f40x/drivers/gpio.c
bsp/stm32f40x/drivers/gpio.c
+2
-2
bsp/stm32f429-apollo/drivers/drv_gpio.c
bsp/stm32f429-apollo/drivers/drv_gpio.c
+2
-2
bsp/stm32f4xx-HAL/drivers/drv_gpio.c
bsp/stm32f4xx-HAL/drivers/drv_gpio.c
+2
-2
bsp/stm32l476-nucleo/drivers/drv_gpio.c
bsp/stm32l476-nucleo/drivers/drv_gpio.c
+2
-2
components/drivers/include/drivers/pin.h
components/drivers/include/drivers/pin.h
+2
-4
components/drivers/misc/pin.c
components/drivers/misc/pin.c
+3
-3
未找到文件。
bsp/allwinner_tina/drivers/drv_gpio.c
浏览文件 @
cf73f3a3
...
...
@@ -493,7 +493,7 @@ static rt_err_t pin_attach_irq(struct rt_device *device, rt_int32_t pin, rt_uint
gpio_set_irq_type
(
pin_index
[
pin
].
pin_port
,
pin_index
[
pin
].
pin
,
mode
);
return
RT_EOK
;
}
static
rt_err_t
pin_det
t
ach_irq
(
struct
rt_device
*
device
,
rt_int32_t
pin
)
static
rt_err_t
pin_detach_irq
(
struct
rt_device
*
device
,
rt_int32_t
pin
)
{
if
((
pin
>
PIN_NUM
(
pin_index
))
||
(
pin_index
[
pin
].
magic
!=
PIN_MAGIC
))
{
...
...
@@ -539,7 +539,7 @@ static const struct rt_pin_ops ops =
pin_write
,
pin_read
,
pin_attach_irq
,
pin_det
t
ach_irq
,
pin_detach_irq
,
pin_irq_enable
,
};
#endif
...
...
bsp/imxrt1052-evk/drivers/drv_pin.c
浏览文件 @
cf73f3a3
...
...
@@ -536,7 +536,7 @@ static rt_err_t rt1052_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
return
RT_EOK
;
}
static
rt_err_t
rt1052_pin_det
t
ach_irq
(
struct
rt_device
*
device
,
rt_int32_t
pin
)
static
rt_err_t
rt1052_pin_detach_irq
(
struct
rt_device
*
device
,
rt_int32_t
pin
)
{
struct
rt1052_pin
*
pin_map
=
RT_NULL
;
struct
rt1052_irq
*
irq_map
=
RT_NULL
;
...
...
@@ -675,7 +675,7 @@ int rt_hw_pin_init(void)
rt1052_pin_ops
.
pin_read
=
rt1052_pin_read
;
rt1052_pin_ops
.
pin_write
=
rt1052_pin_write
;
rt1052_pin_ops
.
pin_attach_irq
=
rt1052_pin_attach_irq
;
rt1052_pin_ops
.
pin_det
tach_irq
=
rt1052_pin_det
tach_irq
;
rt1052_pin_ops
.
pin_det
ach_irq
=
rt1052_pin_de
tach_irq
;
rt1052_pin_ops
.
pin_irq_enable
=
rt1052_pin_irq_enable
;
ret
=
rt_device_pin_register
(
"pin"
,
&
rt1052_pin_ops
,
RT_NULL
);
...
...
bsp/ls1cdev/drivers/drv_gpio.c
浏览文件 @
cf73f3a3
...
...
@@ -95,7 +95,7 @@ rt_err_t ls1c_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
return
RT_EOK
;
}
rt_err_t
ls1c_pin_det
t
ach_irq
(
struct
rt_device
*
device
,
rt_int32_t
pin
)
rt_err_t
ls1c_pin_detach_irq
(
struct
rt_device
*
device
,
rt_int32_t
pin
)
{
return
RT_EOK
;
}
...
...
@@ -119,7 +119,7 @@ const static struct rt_pin_ops _ls1c_pin_ops =
ls1c_pin_read
,
ls1c_pin_attach_irq
,
ls1c_pin_det
t
ach_irq
,
ls1c_pin_detach_irq
,
ls1c_pin_irq_enable
};
...
...
bsp/stm32f10x-HAL/drivers/drv_gpio.c
浏览文件 @
cf73f3a3
...
...
@@ -695,7 +695,7 @@ rt_err_t stm32_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
return
RT_EOK
;
}
rt_err_t
stm32_pin_det
t
ach_irq
(
struct
rt_device
*
device
,
rt_int32_t
pin
)
rt_err_t
stm32_pin_detach_irq
(
struct
rt_device
*
device
,
rt_int32_t
pin
)
{
const
struct
pin_index
*
index
;
rt_base_t
level
;
...
...
@@ -798,7 +798,7 @@ const static struct rt_pin_ops _stm32_pin_ops =
stm32_pin_write
,
stm32_pin_read
,
stm32_pin_attach_irq
,
stm32_pin_det
t
ach_irq
,
stm32_pin_detach_irq
,
stm32_pin_irq_enable
,
};
...
...
bsp/stm32f10x/drivers/gpio.c
浏览文件 @
cf73f3a3
...
...
@@ -622,7 +622,7 @@ rt_err_t stm32_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
return
RT_EOK
;
}
rt_err_t
stm32_pin_det
t
ach_irq
(
struct
rt_device
*
device
,
rt_int32_t
pin
)
rt_err_t
stm32_pin_detach_irq
(
struct
rt_device
*
device
,
rt_int32_t
pin
)
{
const
struct
pin_index
*
index
;
rt_base_t
level
;
...
...
@@ -742,7 +742,7 @@ const static struct rt_pin_ops _stm32_pin_ops =
stm32_pin_write
,
stm32_pin_read
,
stm32_pin_attach_irq
,
stm32_pin_det
t
ach_irq
,
stm32_pin_detach_irq
,
stm32_pin_irq_enable
,
};
...
...
bsp/stm32f40x/drivers/gpio.c
浏览文件 @
cf73f3a3
...
...
@@ -667,7 +667,7 @@ rt_err_t stm32_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
return
RT_EOK
;
}
rt_err_t
stm32_pin_det
t
ach_irq
(
struct
rt_device
*
device
,
rt_int32_t
pin
)
rt_err_t
stm32_pin_detach_irq
(
struct
rt_device
*
device
,
rt_int32_t
pin
)
{
const
struct
pin_index
*
index
;
rt_base_t
level
;
...
...
@@ -787,7 +787,7 @@ const static struct rt_pin_ops _stm32_pin_ops =
stm32_pin_write
,
stm32_pin_read
,
stm32_pin_attach_irq
,
stm32_pin_det
t
ach_irq
,
stm32_pin_detach_irq
,
stm32_pin_irq_enable
,
};
...
...
bsp/stm32f429-apollo/drivers/drv_gpio.c
浏览文件 @
cf73f3a3
...
...
@@ -1698,7 +1698,7 @@ rt_err_t stm32_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
return
RT_EOK
;
}
rt_err_t
stm32_pin_det
t
ach_irq
(
struct
rt_device
*
device
,
rt_int32_t
pin
)
rt_err_t
stm32_pin_detach_irq
(
struct
rt_device
*
device
,
rt_int32_t
pin
)
{
const
struct
pin_index
*
index
;
rt_base_t
level
;
...
...
@@ -1802,7 +1802,7 @@ const static struct rt_pin_ops _stm32_pin_ops =
stm32_pin_write
,
stm32_pin_read
,
stm32_pin_attach_irq
,
stm32_pin_det
t
ach_irq
,
stm32_pin_detach_irq
,
stm32_pin_irq_enable
,
};
...
...
bsp/stm32f4xx-HAL/drivers/drv_gpio.c
浏览文件 @
cf73f3a3
...
...
@@ -1701,7 +1701,7 @@ rt_err_t stm32_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
return
RT_EOK
;
}
rt_err_t
stm32_pin_det
t
ach_irq
(
struct
rt_device
*
device
,
rt_int32_t
pin
)
rt_err_t
stm32_pin_detach_irq
(
struct
rt_device
*
device
,
rt_int32_t
pin
)
{
rt_uint16_t
gpio_pin
;
rt_base_t
level
;
...
...
@@ -1802,7 +1802,7 @@ const static struct rt_pin_ops _stm32_pin_ops =
stm32_pin_write
,
stm32_pin_read
,
stm32_pin_attach_irq
,
stm32_pin_det
t
ach_irq
,
stm32_pin_detach_irq
,
stm32_pin_irq_enable
,
};
...
...
bsp/stm32l476-nucleo/drivers/drv_gpio.c
浏览文件 @
cf73f3a3
...
...
@@ -682,7 +682,7 @@ rt_err_t stm32_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
return
RT_EOK
;
}
rt_err_t
stm32_pin_det
t
ach_irq
(
struct
rt_device
*
device
,
rt_int32_t
pin
)
rt_err_t
stm32_pin_detach_irq
(
struct
rt_device
*
device
,
rt_int32_t
pin
)
{
const
struct
pin_index
*
index
;
rt_base_t
level
;
...
...
@@ -786,7 +786,7 @@ const static struct rt_pin_ops _stm32_pin_ops =
stm32_pin_write
,
stm32_pin_read
,
stm32_pin_attach_irq
,
stm32_pin_det
t
ach_irq
,
stm32_pin_detach_irq
,
stm32_pin_irq_enable
,
};
...
...
components/drivers/include/drivers/pin.h
浏览文件 @
cf73f3a3
...
...
@@ -86,7 +86,7 @@ struct rt_pin_ops
/* TODO: add GPIO interrupt */
rt_err_t
(
*
pin_attach_irq
)(
struct
rt_device
*
device
,
rt_int32_t
pin
,
rt_uint32_t
mode
,
void
(
*
hdr
)(
void
*
args
),
void
*
args
);
rt_err_t
(
*
pin_det
t
ach_irq
)(
struct
rt_device
*
device
,
rt_int32_t
pin
);
rt_err_t
(
*
pin_detach_irq
)(
struct
rt_device
*
device
,
rt_int32_t
pin
);
rt_err_t
(
*
pin_irq_enable
)(
struct
rt_device
*
device
,
rt_base_t
pin
,
rt_uint32_t
enabled
);
};
...
...
@@ -97,11 +97,9 @@ void rt_pin_write(rt_base_t pin, rt_base_t value);
int
rt_pin_read
(
rt_base_t
pin
);
rt_err_t
rt_pin_attach_irq
(
rt_int32_t
pin
,
rt_uint32_t
mode
,
void
(
*
hdr
)(
void
*
args
),
void
*
args
);
rt_err_t
rt_pin_det
t
ach_irq
(
rt_int32_t
pin
);
rt_err_t
rt_pin_detach_irq
(
rt_int32_t
pin
);
rt_err_t
rt_pin_irq_enable
(
rt_base_t
pin
,
rt_uint32_t
enabled
);
int
rt_device_pin_irq_register
(
const
char
*
name
,
const
struct
rt_pin_ops
*
ops
,
void
*
user_data
);
#ifdef __cplusplus
}
#endif
...
...
components/drivers/misc/pin.c
浏览文件 @
cf73f3a3
...
...
@@ -124,12 +124,12 @@ rt_err_t rt_pin_attach_irq(rt_int32_t pin, rt_uint32_t mode,
}
return
RT_ENOSYS
;
}
rt_err_t
rt_pin_det
t
ach_irq
(
rt_int32_t
pin
)
rt_err_t
rt_pin_detach_irq
(
rt_int32_t
pin
)
{
RT_ASSERT
(
_hw_pin
.
ops
!=
RT_NULL
);
if
(
_hw_pin
.
ops
->
pin_det
t
ach_irq
)
if
(
_hw_pin
.
ops
->
pin_detach_irq
)
{
return
_hw_pin
.
ops
->
pin_det
t
ach_irq
(
&
_hw_pin
.
parent
,
pin
);
return
_hw_pin
.
ops
->
pin_detach_irq
(
&
_hw_pin
.
parent
,
pin
);
}
return
RT_ENOSYS
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录