summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarmink <[email protected]>2017-11-07 20:53:33 +0800
committerBernard Xiong <[email protected]>2017-11-08 00:05:46 +0800
commit045f6c368c70ef5111764a21f0984bd5c3e00a69 (patch)
tree2afbce3da922dffde1fe04f2bf03ad750a8735f2
parent1e9f9824d3d001d7936a189f93cbd991c05eaaa7 (diff)
[BSP] Fix stm32f10x BSP error code.
-rwxr-xr-xbsp/stm32f10x/drivers/gpio.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/bsp/stm32f10x/drivers/gpio.c b/bsp/stm32f10x/drivers/gpio.c
index fd64151b7b..abb62311a9 100755
--- a/bsp/stm32f10x/drivers/gpio.c
+++ b/bsp/stm32f10x/drivers/gpio.c
@@ -16,8 +16,6 @@
#include <rthw.h>
#include <rtdevice.h>
#include <board.h>
-#include <gpio.h>
-#include <stm32f10x_exti.h>
#ifdef RT_USING_PIN
@@ -591,12 +589,12 @@ rt_err_t stm32_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
index = get_pin(pin);
if (index == RT_NULL)
{
- return RT_ENOSYS;
+ return -RT_ENOSYS;
}
irqindex = bit2bitno(index->pin);
if(irqindex < 0 || irqindex >= ITEM_NUM(pin_irq_map))
{
- return RT_ENOSYS;
+ return -RT_ENOSYS;
}
level = rt_hw_interrupt_disable();
@@ -612,7 +610,7 @@ rt_err_t stm32_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
if(pin_irq_hdr_tab[irqindex].pin != -1)
{
rt_hw_interrupt_enable(level);
- return RT_EBUSY;
+ return -RT_EBUSY;
}
pin_irq_hdr_tab[irqindex].pin = pin;
pin_irq_hdr_tab[irqindex].hdr = hdr;
@@ -631,12 +629,12 @@ rt_err_t stm32_pin_dettach_irq(struct rt_device *device, rt_int32_t pin)
index = get_pin(pin);
if (index == RT_NULL)
{
- return RT_ENOSYS;
+ return -RT_ENOSYS;
}
irqindex = bit2bitno(index->pin);
if(irqindex < 0 || irqindex >= ITEM_NUM(pin_irq_map))
{
- return RT_ENOSYS;
+ return -RT_ENOSYS;
}
level = rt_hw_interrupt_disable();
@@ -667,20 +665,20 @@ rt_err_t stm32_pin_irq_enable(struct rt_device *device, rt_base_t pin,
index = get_pin(pin);
if (index == RT_NULL)
{
- return RT_ENOSYS;
+ return -RT_ENOSYS;
}
if(enabled == PIN_IRQ_ENABLE)
{
irqindex = bit2bitno(index->pin);
if(irqindex < 0 || irqindex >= ITEM_NUM(pin_irq_map))
{
- return RT_ENOSYS;
+ return -RT_ENOSYS;
}
level = rt_hw_interrupt_disable();
if(pin_irq_hdr_tab[irqindex].pin == -1)
{
rt_hw_interrupt_enable(level);
- return RT_ENOSYS;
+ return -RT_ENOSYS;
}
irqmap = &pin_irq_map[irqindex];
/* GPIO Periph clock enable */
@@ -720,7 +718,7 @@ rt_err_t stm32_pin_irq_enable(struct rt_device *device, rt_base_t pin,
irqmap = get_pin_irq_map(index->pin);
if(irqmap == RT_NULL)
{
- return RT_ENOSYS;
+ return -RT_ENOSYS;
}
EXTI_InitStructure.EXTI_Line = irqmap->irqbit;
EXTI_InitStructure.EXTI_Mode = EXTI_Mode_Interrupt;
@@ -730,7 +728,7 @@ rt_err_t stm32_pin_irq_enable(struct rt_device *device, rt_base_t pin,
}
else
{
- return RT_ENOSYS;
+ return -RT_ENOSYS;
}
return RT_EOK;