libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

【修改】解耦 touch 和 pin

This commit is contained in:
tyustli 2020-12-25 17:31:16 +08:00
parent 9a59737b5f
commit 48d7cf4af9
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/drivers/Kconfig
View File

@ -291,6 +291,11 @@ endif
config RT_USING_TOUCH config RT_USING_TOUCH
bool "Using Touch device drivers" bool "Using Touch device drivers"
default n default n
if RT_USING_TOUCH
config RT_TOUCH_PIN_IRQ
bool "touch irq use pin irq"
default n
endif
menuconfig RT_USING_HWCRYPTO menuconfig RT_USING_HWCRYPTO
bool "Using Hardware Crypto drivers" bool "Using Hardware Crypto drivers"

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

@ -16,12 +16,9 @@
#include <rtdbg.h> #include <rtdbg.h>
/* ISR for touch interrupt */ /* ISR for touch interrupt */
static void irq_callback(void *args) void rt_hw_touch_isr(rt_touch_t touch)
{ {
rt_touch_t touch; RT_ASSERT(touch);
touch = (rt_touch_t)args;
if (touch->parent.rx_indicate == RT_NULL) if (touch->parent.rx_indicate == RT_NULL)
{ {
return; return;
@ -35,9 +32,17 @@ static void irq_callback(void *args)
touch->parent.rx_indicate(&touch->parent, 1); touch->parent.rx_indicate(&touch->parent, 1);
} }
#ifdef RT_TOUCH_PIN_IRQ
static void touch_irq_callback(void *param)
{
rt_hw_touch_isr((rt_touch_t)param);
}
#endif
/* 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)
{ {
#ifdef RT_TOUCH_PIN_IRQ
if (touch->config.irq_pin.pin == RT_PIN_NONE) if (touch->config.irq_pin.pin == RT_PIN_NONE)
{ {
return -RT_EINVAL; return -RT_EINVAL;
@ -47,18 +52,19 @@ static rt_err_t rt_touch_irq_init(rt_touch_t touch)
if (touch->config.irq_pin.mode == PIN_MODE_INPUT_PULLDOWN) if (touch->config.irq_pin.mode == PIN_MODE_INPUT_PULLDOWN)
{ {
rt_pin_attach_irq(touch->config.irq_pin.pin, PIN_IRQ_MODE_RISING, irq_callback, (void *)touch); rt_pin_attach_irq(touch->config.irq_pin.pin, PIN_IRQ_MODE_RISING, touch_irq_callback, (void *)touch);
} }
else if (touch->config.irq_pin.mode == PIN_MODE_INPUT_PULLUP) else if (touch->config.irq_pin.mode == PIN_MODE_INPUT_PULLUP)
{ {
rt_pin_attach_irq(touch->config.irq_pin.pin, PIN_IRQ_MODE_FALLING, irq_callback, (void *)touch); rt_pin_attach_irq(touch->config.irq_pin.pin, PIN_IRQ_MODE_FALLING, touch_irq_callback, (void *)touch);
} }
else if (touch->config.irq_pin.mode == PIN_MODE_INPUT) else if (touch->config.irq_pin.mode == PIN_MODE_INPUT)
{ {
rt_pin_attach_irq(touch->config.irq_pin.pin, PIN_IRQ_MODE_RISING_FALLING, irq_callback, (void *)touch); rt_pin_attach_irq(touch->config.irq_pin.pin, PIN_IRQ_MODE_RISING_FALLING, touch_irq_callback, (void *)touch);
} }
rt_pin_irq_enable(touch->config.irq_pin.pin, PIN_IRQ_ENABLE); rt_pin_irq_enable(touch->config.irq_pin.pin, PIN_IRQ_ENABLE);
#endif
return RT_EOK; return RT_EOK;
} }
@ -66,19 +72,23 @@ static rt_err_t rt_touch_irq_init(rt_touch_t touch)
/* touch interrupt enable */ /* touch interrupt enable */
static void rt_touch_irq_enable(rt_touch_t touch) static void rt_touch_irq_enable(rt_touch_t touch)
{ {
#ifdef RT_TOUCH_PIN_IRQ
if (touch->config.irq_pin.pin != RT_PIN_NONE) if (touch->config.irq_pin.pin != RT_PIN_NONE)
{ {
rt_pin_irq_enable(touch->config.irq_pin.pin, RT_TRUE); rt_pin_irq_enable(touch->config.irq_pin.pin, RT_TRUE);
} }
#endif
} }
/* touch interrupt disable */ /* touch interrupt disable */
static void rt_touch_irq_disable(rt_touch_t touch) static void rt_touch_irq_disable(rt_touch_t touch)
{ {
#ifdef RT_TOUCH_PIN_IRQ
if (touch->config.irq_pin.pin != RT_PIN_NONE) if (touch->config.irq_pin.pin != RT_PIN_NONE)
{ {
rt_pin_irq_enable(touch->config.irq_pin.pin, RT_FALSE); rt_pin_irq_enable(touch->config.irq_pin.pin, RT_FALSE);
} }
#endif
} }
static rt_err_t rt_touch_open(rt_device_t dev, rt_uint16_t oflag) static rt_err_t rt_touch_open(rt_device_t dev, rt_uint16_t oflag)

5
components/drivers/touch/touch.h
View File

@ -66,7 +66,9 @@ struct rt_touch_info
struct rt_touch_config struct rt_touch_config
{ {
#ifdef RT_TOUCH_PIN_IRQ
struct rt_device_pin_mode irq_pin; /* Interrupt pin, The purpose of this pin is to notification read data */ struct rt_device_pin_mode irq_pin; /* Interrupt pin, The purpose of this pin is to notification read data */
#endif
char *dev_name; /* The name of the communication device */ char *dev_name; /* The name of the communication device */
void *user_data; void *user_data;
}; };
@ -103,6 +105,9 @@ int rt_hw_touch_register(rt_touch_t touch,
rt_uint32_t flag, rt_uint32_t flag,
void *data); void *data);
/* if you doesn't use pin device. you must call this function in your touch irq callback */
void rt_hw_touch_isr(rt_touch_t touch);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif