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

use PIN_IRQ_PIN_NONE to replace RT_PIN_NONE

Browse Source
This commit is contained in:
Meco Man 2022-12-25 03:22:11 -05:00 committed by Man, Jianting (Meco)
parent 2570fab0e1
commit 20a6f14e89
10 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsp/allwinner/libraries/drivers/touch/drv_touch.c
View File

@ -264,7 +264,7 @@ int rt_touch_init(void)
else if (TOUCH_POLL_MODE == current_driver->check_mode) else if (TOUCH_POLL_MODE == current_driver->check_mode)
{ {
rt_thread_t thread; rt_thread_t thread;
irq_pin = RT_PIN_NONE; // No interrupt pins are used irq_pin = PIN_IRQ_PIN_NONE; // No interrupt pins are used
thread = rt_thread_create("touch", touch_poll_entry, RT_NULL, 2048, 16, 20); thread = rt_thread_create("touch", touch_poll_entry, RT_NULL, 2048, 16, 20);
if (thread == RT_NULL) if (thread == RT_NULL)
{ {

2
bsp/nuvoton/numaker-iot-m467/board/board_dev.c
View File

@ -167,7 +167,7 @@ int rt_hw_nct7717u_port(void)
struct rt_sensor_config cfg; struct rt_sensor_config cfg;
cfg.intf.dev_name = "i2c2"; cfg.intf.dev_name = "i2c2";
cfg.irq_pin.pin = RT_PIN_NONE; cfg.irq_pin.pin = PIN_IRQ_PIN_NONE;
return rt_hw_nct7717u_init("nct7717u", &cfg); return rt_hw_nct7717u_init("nct7717u", &cfg);
} }

4
bsp/nuvoton/numaker-iot-m487/board/board_dev.c
View File

@ -159,7 +159,7 @@ int rt_hw_max31875_port(void)
cfg.intf.dev_name = "i2c1"; cfg.intf.dev_name = "i2c1";
cfg.intf.user_data = (void *)MAX31875_I2C_SLAVE_ADR_R0; cfg.intf.user_data = (void *)MAX31875_I2C_SLAVE_ADR_R0;
cfg.irq_pin.pin = RT_PIN_NONE; cfg.irq_pin.pin = PIN_IRQ_PIN_NONE;
rt_hw_max31875_init("max31875", &cfg); rt_hw_max31875_init("max31875", &cfg);
return 0; return 0;
@ -175,7 +175,7 @@ int rt_hw_bmx055_port(void)
struct rt_sensor_config cfg; struct rt_sensor_config cfg;
cfg.intf.dev_name = "i2c2"; cfg.intf.dev_name = "i2c2";
cfg.intf.user_data = (void *)0; cfg.intf.user_data = (void *)0;
cfg.irq_pin.pin = RT_PIN_NONE; cfg.irq_pin.pin = PIN_IRQ_PIN_NONE;
rt_hw_bmx055_init("bmx055", &cfg); rt_hw_bmx055_init("bmx055", &cfg);
return 0; return 0;

2
bsp/nuvoton/numaker-m467hj/board/board_dev.c
View File

@ -347,7 +347,7 @@ int rt_hw_nct7717u_port(void)
struct rt_sensor_config cfg; struct rt_sensor_config cfg;
cfg.intf.dev_name = "i2c2"; cfg.intf.dev_name = "i2c2";
cfg.irq_pin.pin = RT_PIN_NONE; cfg.irq_pin.pin = PIN_IRQ_PIN_NONE;
return rt_hw_nct7717u_init("nct7717u", &cfg); return rt_hw_nct7717u_init("nct7717u", &cfg);
} }

4
bsp/nuvoton/numaker-pfm-m487/board/board_dev.c
View File

@ -183,7 +183,7 @@ int rt_hw_max31875_port(void)
cfg.intf.dev_name = "i2c1"; cfg.intf.dev_name = "i2c1";
cfg.intf.user_data = (void *)MAX31875_I2C_SLAVE_ADR_R0; cfg.intf.user_data = (void *)MAX31875_I2C_SLAVE_ADR_R0;
cfg.irq_pin.pin = RT_PIN_NONE; cfg.irq_pin.pin = PIN_IRQ_PIN_NONE;
rt_hw_max31875_init("max31875", &cfg); rt_hw_max31875_init("max31875", &cfg);
return 0; return 0;
@ -199,7 +199,7 @@ int rt_hw_mpu6500_port(void)
cfg.intf.dev_name = "i2c2"; cfg.intf.dev_name = "i2c2";
cfg.intf.user_data = (void *)MPU6XXX_ADDR_DEFAULT; cfg.intf.user_data = (void *)MPU6XXX_ADDR_DEFAULT;
cfg.irq_pin.pin = RT_PIN_NONE; cfg.irq_pin.pin = PIN_IRQ_PIN_NONE;
rt_hw_mpu6xxx_init("mpu", &cfg); rt_hw_mpu6xxx_init("mpu", &cfg);
return 0; return 0;

6
bsp/stm32/stm32l475-atk-pandora/board/ports/sensor_port.c
View File

@ -20,7 +20,7 @@ static int rt_hw_icm20608_port(void)
cfg.intf.dev_name = "i2c3"; cfg.intf.dev_name = "i2c3";
cfg.intf.type = RT_SENSOR_INTF_I2C; cfg.intf.type = RT_SENSOR_INTF_I2C;
cfg.intf.arg = (void *)MPU6XXX_ADDR_DEFAULT; cfg.intf.arg = (void *)MPU6XXX_ADDR_DEFAULT;
cfg.irq_pin.pin = RT_PIN_NONE; cfg.irq_pin.pin = PIN_IRQ_PIN_NONE;
rt_hw_mpu6xxx_init("icm", &cfg); rt_hw_mpu6xxx_init("icm", &cfg);
@ -39,7 +39,7 @@ static int rt_hw_ap3216c_port(void)
cfg.intf.dev_name = "i2c3"; cfg.intf.dev_name = "i2c3";
cfg.intf.type = RT_SENSOR_INTF_I2C; cfg.intf.type = RT_SENSOR_INTF_I2C;
cfg.intf.arg = RT_NULL; cfg.intf.arg = RT_NULL;
cfg.irq_pin.pin = RT_PIN_NONE; cfg.irq_pin.pin = PIN_IRQ_PIN_NONE;
rt_hw_ap3216c_init("ap3216c", &cfg); rt_hw_ap3216c_init("ap3216c", &cfg);
@ -58,7 +58,7 @@ static int rt_hw_aht10_port(void)
cfg.intf.dev_name = "i2c4"; cfg.intf.dev_name = "i2c4";
cfg.intf.type = RT_SENSOR_INTF_I2C; cfg.intf.type = RT_SENSOR_INTF_I2C;
cfg.intf.arg = (void *)AHT10_I2C_ADDR; cfg.intf.arg = (void *)AHT10_I2C_ADDR;
cfg.irq_pin.pin = RT_PIN_NONE; cfg.irq_pin.pin = PIN_IRQ_PIN_NONE;
rt_hw_aht10_init("aht10", &cfg); rt_hw_aht10_init("aht10", &cfg);

1
components/drivers/include/drivers/sensor.h
View File

@ -25,7 +25,6 @@ extern "C" {
#define rt_sensor_get_ts() rt_tick_get() /* API for the sensor to get the timestamp */ #define rt_sensor_get_ts() rt_tick_get() /* API for the sensor to get the timestamp */
#endif #endif
#define RT_PIN_NONE 0xFFFF /* RT PIN NONE */
#define RT_DEVICE_FLAG_FIFO_RX 0x200 /* Flag to use when the sensor is open by fifo mode */ #define RT_DEVICE_FLAG_FIFO_RX 0x200 /* Flag to use when the sensor is open by fifo mode */
#define RT_SENSOR_MODULE_MAX (3) /* The maximum number of members of a sensor module */ #define RT_SENSOR_MODULE_MAX (3) /* The maximum number of members of a sensor module */

2
components/drivers/include/drivers/touch.h
View File

@ -24,8 +24,6 @@ extern "C" {
#define rt_touch_get_ts() rt_tick_get() /* API for the touch to get the timestamp */ #define rt_touch_get_ts() rt_tick_get() /* API for the touch to get the timestamp */
#endif #endif
#define RT_PIN_NONE 0xFFFF /* RT PIN NONE */
/* Touch vendor types */ /* Touch vendor types */
#define RT_TOUCH_VENDOR_UNKNOWN (0) /* unknown */ #define RT_TOUCH_VENDOR_UNKNOWN (0) /* unknown */
#define RT_TOUCH_VENDOR_GT (1) /* GTxx series */ #define RT_TOUCH_VENDOR_GT (1) /* GTxx series */

4
components/drivers/sensor/sensor.c
View File

@ -96,7 +96,7 @@ static void _irq_callback(void *args)
/* Sensor interrupt initialization function */ /* Sensor interrupt initialization function */
static rt_err_t _sensor_irq_init(rt_sensor_t sensor) static rt_err_t _sensor_irq_init(rt_sensor_t sensor)
{ {
if (sensor->config.irq_pin.pin == RT_PIN_NONE) if (sensor->config.irq_pin.pin == PIN_IRQ_PIN_NONE)
{ {
return -RT_EINVAL; return -RT_EINVAL;
} }
@ -269,7 +269,7 @@ static rt_err_t _sensor_close(rt_device_t dev)
if (RT_SENSOR_MODE_GET_FETCH(sensor->info.mode) != RT_SENSOR_MODE_FETCH_POLLING) if (RT_SENSOR_MODE_GET_FETCH(sensor->info.mode) != RT_SENSOR_MODE_FETCH_POLLING)
{ {
/* Sensor disable interrupt */ /* Sensor disable interrupt */
if (sensor->config.irq_pin.pin != RT_PIN_NONE) if (sensor->config.irq_pin.pin != PIN_IRQ_PIN_NONE)
{ {
rt_pin_irq_enable(sensor->config.irq_pin.pin, RT_FALSE); rt_pin_irq_enable(sensor->config.irq_pin.pin, RT_FALSE);
} }

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

@ -43,7 +43,7 @@ static void touch_irq_callback(void *param)
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 #ifdef RT_TOUCH_PIN_IRQ
if (touch->config.irq_pin.pin == RT_PIN_NONE) if (touch->config.irq_pin.pin == PIN_IRQ_PIN_NONE)
{ {
return -RT_EINVAL; return -RT_EINVAL;
} }
@ -73,7 +73,7 @@ static rt_err_t rt_touch_irq_init(rt_touch_t touch)
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 #ifdef RT_TOUCH_PIN_IRQ
if (touch->config.irq_pin.pin != RT_PIN_NONE) if (touch->config.irq_pin.pin != PIN_IRQ_PIN_NONE)
{ {
rt_pin_irq_enable(touch->config.irq_pin.pin, RT_TRUE); rt_pin_irq_enable(touch->config.irq_pin.pin, RT_TRUE);
} }
@ -86,7 +86,7 @@ static void rt_touch_irq_enable(rt_touch_t touch)
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 #ifdef RT_TOUCH_PIN_IRQ
if (touch->config.irq_pin.pin != RT_PIN_NONE) if (touch->config.irq_pin.pin != PIN_IRQ_PIN_NONE)
{ {
rt_pin_irq_enable(touch->config.irq_pin.pin, RT_FALSE); rt_pin_irq_enable(touch->config.irq_pin.pin, RT_FALSE);
} }