libs/rt-thread-official
libs/rt-thread-official
4
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-01-18 18:43:31 +08:00
Code Issues Releases Wiki Activity

修改函数出错时返回值为负值

Browse Source
This commit is contained in:
tyustli 2019-06-14 09:03:07 +08:00
parent 116b7880c3
commit 06051905f0
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
components/drivers/touch/touch.c
View File

@ -15,9 +15,13 @@
#define DBG_LVL DBG_INFO #define DBG_LVL DBG_INFO
#include <rtdbg.h> #include <rtdbg.h>
/* touch interrupt handler function */ /* ISR for touch interrupt */
static void rt_touch_cb(rt_touch_t touch) static void irq_callback(void *args)
{ {
rt_touch_t touch;
touch = (rt_touch_t)args;
if (touch->parent.rx_indicate == RT_NULL) if (touch->parent.rx_indicate == RT_NULL)
{ {
return; return;
@ -31,22 +35,12 @@ static void rt_touch_cb(rt_touch_t touch)
touch->parent.rx_indicate(&touch->parent, 1); touch->parent.rx_indicate(&touch->parent, 1);
} }
/* ISR for touch interrupt */
static void irq_callback(void *args)
{
rt_touch_t touch;
touch = (rt_touch_t)args;
rt_touch_cb(touch);
}
/* touch interrupt initialization function */ /* touch interrupt initialization function */
static rt_err_t rt_touch_irq_init(rt_touch_t touch) static rt_err_t rt_touch_irq_init(rt_touch_t touch)
{ {
if (touch->config.irq_pin.pin == RT_PIN_NONE) if (touch->config.irq_pin.pin == RT_PIN_NONE)
{ {
return RT_EINVAL; return -RT_EINVAL;
} }
rt_pin_mode(touch->config.irq_pin.pin, touch->config.irq_pin.mode); rt_pin_mode(touch->config.irq_pin.pin, touch->config.irq_pin.mode);
@ -147,7 +141,7 @@ static rt_err_t rt_touch_control(rt_device_t dev, int cmd, void *args)
} }
else else
{ {
result = RT_ERROR; result = -RT_ERROR;
} }
break; break;
@ -158,7 +152,7 @@ static rt_err_t rt_touch_control(rt_device_t dev, int cmd, void *args)
} }
else else
{ {
result = RT_ERROR; result = -RT_ERROR;
} }
break; break;
@ -203,7 +197,7 @@ static rt_err_t rt_touch_control(rt_device_t dev, int cmd, void *args)
rt_touch_irq_enable(touch); rt_touch_irq_enable(touch);
break; break;
default: default:
return RT_ERROR; return -RT_ERROR;
} }
return result; return result;