From b0c247fb59156cc368b32dd8edb66da023ab2339 Mon Sep 17 00:00:00 2001 From: yangjie11 <39754270+yangjie11@users.noreply.github.com> Date: Fri, 24 Mar 2023 23:47:28 +0800 Subject: [PATCH] =?UTF-8?q?[components/drivers][touch]=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84touch.h=20(#7090)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [components/drivers][touch]删除多余的touch.h * 将touc.h替换为rtdevice.h --- bsp/allwinner/libraries/drivers/touch/drv_touch.h | 1 - .../libraries/drivers/touch/drv_touch_gt9xx.c | 1 - bsp/nuvoton/libraries/ma35/rtt_port/drv_adc.h | 2 +- bsp/nuvoton/libraries/n9h30/rtt_port/drv_adc.h | 2 +- .../libraries/nu_packages/ADC_TOUCH/adc_touch.c | 1 - .../libraries/nu_packages/ADC_TOUCH/touch_sw.c | 1 - .../libraries/nu_packages/ADC_TOUCH/touch_sw.h | 2 +- bsp/nuvoton/libraries/nu_packages/ILI_TPC/ili.h | 2 +- bsp/nuvoton/libraries/nu_packages/TPC/ft5446.h | 2 +- bsp/nuvoton/libraries/nu_packages/TPC/gt911.c | 1 - bsp/nuvoton/libraries/nu_packages/TPC/gt911.h | 2 +- bsp/nuvoton/libraries/nu_packages/TPC/ili.h | 2 +- bsp/nuvoton/libraries/nu_packages/TPC/st1663i.h | 2 +- bsp/nuvoton/libraries/nu_packages/TPC/tpc_worker.c | 1 - bsp/nuvoton/libraries/nuc980/rtt_port/drv_adc.h | 2 +- .../nk-980iot/applications/lvgl/lv_port_indev.c | 1 - .../nk-n9h30/applications/lvgl/lv_port_indev.c | 1 - .../applications/lvgl/lv_port_indev.c | 1 - .../applications/lvgl/lv_port_indev.c | 1 - .../applications/lvgl/lv_port_indev.c | 1 - .../numaker-m032ki/applications/lvgl/lv_port_indev.c | 1 - .../numaker-m2354/applications/lvgl/lv_port_indev.c | 1 - .../numaker-m467hj/applications/lvgl/lv_port_indev.c | 1 - .../applications/lvgl/lv_port_indev.c | 1 - .../raspi4-32/driver/touch/drv_dsi_touch.c | 1 - .../raspi4-32/driver/touch/drv_xpt2046.c | 1 - .../board/ports/touch/drv_touch_xpt.h | 1 - .../applications/lvgl/lv_port_indev.c | 1 - components/drivers/touch/touch.c | 2 +- components/drivers/touch/touch.h | 12 ------------ 30 files changed, 10 insertions(+), 41 deletions(-) delete mode 100644 components/drivers/touch/touch.h diff --git a/bsp/allwinner/libraries/drivers/touch/drv_touch.h b/bsp/allwinner/libraries/drivers/touch/drv_touch.h index a4c203f156..e7c6e7e0fb 100644 --- a/bsp/allwinner/libraries/drivers/touch/drv_touch.h +++ b/bsp/allwinner/libraries/drivers/touch/drv_touch.h @@ -12,7 +12,6 @@ #include #include "rtthread.h" #include "rtdevice.h" -#include #define TOUCH_POLL_MODE (1 << 0) #define TOUCH_INT_MODE (1 << 1) diff --git a/bsp/allwinner/libraries/drivers/touch/drv_touch_gt9xx.c b/bsp/allwinner/libraries/drivers/touch/drv_touch_gt9xx.c index 4bfb24de0e..4e2b47081a 100644 --- a/bsp/allwinner/libraries/drivers/touch/drv_touch_gt9xx.c +++ b/bsp/allwinner/libraries/drivers/touch/drv_touch_gt9xx.c @@ -13,7 +13,6 @@ */ #include #include -#include #include "drv_touch.h" #include "string.h" #include "drv_pin.h" diff --git a/bsp/nuvoton/libraries/ma35/rtt_port/drv_adc.h b/bsp/nuvoton/libraries/ma35/rtt_port/drv_adc.h index 1ccba61d18..9d335352c7 100644 --- a/bsp/nuvoton/libraries/ma35/rtt_port/drv_adc.h +++ b/bsp/nuvoton/libraries/ma35/rtt_port/drv_adc.h @@ -17,7 +17,7 @@ #include "nu_adc.h" #if defined(BSP_USING_ADC_TOUCH) - #include "touch.h" + #include #endif typedef enum diff --git a/bsp/nuvoton/libraries/n9h30/rtt_port/drv_adc.h b/bsp/nuvoton/libraries/n9h30/rtt_port/drv_adc.h index 1ccba61d18..9d335352c7 100644 --- a/bsp/nuvoton/libraries/n9h30/rtt_port/drv_adc.h +++ b/bsp/nuvoton/libraries/n9h30/rtt_port/drv_adc.h @@ -17,7 +17,7 @@ #include "nu_adc.h" #if defined(BSP_USING_ADC_TOUCH) - #include "touch.h" + #include #endif typedef enum diff --git a/bsp/nuvoton/libraries/nu_packages/ADC_TOUCH/adc_touch.c b/bsp/nuvoton/libraries/nu_packages/ADC_TOUCH/adc_touch.c index 6a687144ca..bb97dfcd69 100644 --- a/bsp/nuvoton/libraries/nu_packages/ADC_TOUCH/adc_touch.c +++ b/bsp/nuvoton/libraries/nu_packages/ADC_TOUCH/adc_touch.c @@ -20,7 +20,6 @@ #include #include #include -#include "touch.h" //#include "drv_adc.h" #include "adc_touch.h" diff --git a/bsp/nuvoton/libraries/nu_packages/ADC_TOUCH/touch_sw.c b/bsp/nuvoton/libraries/nu_packages/ADC_TOUCH/touch_sw.c index c64a9eea0f..9de3022e60 100644 --- a/bsp/nuvoton/libraries/nu_packages/ADC_TOUCH/touch_sw.c +++ b/bsp/nuvoton/libraries/nu_packages/ADC_TOUCH/touch_sw.c @@ -14,7 +14,6 @@ #if defined(NU_PKG_USING_ADC_TOUCH_SW) #include "rtdevice.h" -#include "touch.h" #include "touch_sw.h" /* Private define ---------------------------------------------------------------*/ diff --git a/bsp/nuvoton/libraries/nu_packages/ADC_TOUCH/touch_sw.h b/bsp/nuvoton/libraries/nu_packages/ADC_TOUCH/touch_sw.h index 487729fba9..418bfcf7f8 100644 --- a/bsp/nuvoton/libraries/nu_packages/ADC_TOUCH/touch_sw.h +++ b/bsp/nuvoton/libraries/nu_packages/ADC_TOUCH/touch_sw.h @@ -14,7 +14,7 @@ #define __TOUCH_SW_H__ #include -#include "touch.h" +#include typedef enum { diff --git a/bsp/nuvoton/libraries/nu_packages/ILI_TPC/ili.h b/bsp/nuvoton/libraries/nu_packages/ILI_TPC/ili.h index 88b1c5f3e1..baabbcadbb 100644 --- a/bsp/nuvoton/libraries/nu_packages/ILI_TPC/ili.h +++ b/bsp/nuvoton/libraries/nu_packages/ILI_TPC/ili.h @@ -11,7 +11,7 @@ #ifndef __ILI_H__ #define __ILI_H__ -#include "touch.h" +#include int rt_hw_ili_tpc_init(const char *name, struct rt_touch_config *cfg); diff --git a/bsp/nuvoton/libraries/nu_packages/TPC/ft5446.h b/bsp/nuvoton/libraries/nu_packages/TPC/ft5446.h index 8e4a34396c..8932a28a14 100644 --- a/bsp/nuvoton/libraries/nu_packages/TPC/ft5446.h +++ b/bsp/nuvoton/libraries/nu_packages/TPC/ft5446.h @@ -11,7 +11,7 @@ #ifndef __FT5446_H__ #define __FT5446_H__ -#include "touch.h" +#include #define FT_REGITER_LEN 1 #define FT_MAX_TOUCH 5 diff --git a/bsp/nuvoton/libraries/nu_packages/TPC/gt911.c b/bsp/nuvoton/libraries/nu_packages/TPC/gt911.c index e3afd090da..bad4b0df32 100644 --- a/bsp/nuvoton/libraries/nu_packages/TPC/gt911.c +++ b/bsp/nuvoton/libraries/nu_packages/TPC/gt911.c @@ -16,7 +16,6 @@ #define DBG_LVL DBG_INFO #include -#include "touch.h" #include "gt911.h" static struct rt_i2c_client gt911_client; diff --git a/bsp/nuvoton/libraries/nu_packages/TPC/gt911.h b/bsp/nuvoton/libraries/nu_packages/TPC/gt911.h index 5137af55fd..f66b17b95c 100644 --- a/bsp/nuvoton/libraries/nu_packages/TPC/gt911.h +++ b/bsp/nuvoton/libraries/nu_packages/TPC/gt911.h @@ -11,7 +11,7 @@ #ifndef __GT911_H__ #define __GT911_H__ -#include "touch.h" +#include #define GT911_ADDR_LEN 2 #define GT911_REGITER_LEN 2 diff --git a/bsp/nuvoton/libraries/nu_packages/TPC/ili.h b/bsp/nuvoton/libraries/nu_packages/TPC/ili.h index 88b1c5f3e1..baabbcadbb 100644 --- a/bsp/nuvoton/libraries/nu_packages/TPC/ili.h +++ b/bsp/nuvoton/libraries/nu_packages/TPC/ili.h @@ -11,7 +11,7 @@ #ifndef __ILI_H__ #define __ILI_H__ -#include "touch.h" +#include int rt_hw_ili_tpc_init(const char *name, struct rt_touch_config *cfg); diff --git a/bsp/nuvoton/libraries/nu_packages/TPC/st1663i.h b/bsp/nuvoton/libraries/nu_packages/TPC/st1663i.h index bb71abf38c..5468c84b38 100644 --- a/bsp/nuvoton/libraries/nu_packages/TPC/st1663i.h +++ b/bsp/nuvoton/libraries/nu_packages/TPC/st1663i.h @@ -11,7 +11,7 @@ #ifndef __ST1663I_H__ #define __ST1663I_H__ -#include "touch.h" +#include #define ST_REGITER_LEN 1 #define ST_MAX_TOUCH 5 diff --git a/bsp/nuvoton/libraries/nu_packages/TPC/tpc_worker.c b/bsp/nuvoton/libraries/nu_packages/TPC/tpc_worker.c index 6691230eaf..87b3de2cbe 100644 --- a/bsp/nuvoton/libraries/nu_packages/TPC/tpc_worker.c +++ b/bsp/nuvoton/libraries/nu_packages/TPC/tpc_worker.c @@ -10,7 +10,6 @@ #include #include -#include "touch.h" #define THREAD_PRIORITY 5 #define THREAD_STACK_SIZE 2048 diff --git a/bsp/nuvoton/libraries/nuc980/rtt_port/drv_adc.h b/bsp/nuvoton/libraries/nuc980/rtt_port/drv_adc.h index 1ccba61d18..9d335352c7 100644 --- a/bsp/nuvoton/libraries/nuc980/rtt_port/drv_adc.h +++ b/bsp/nuvoton/libraries/nuc980/rtt_port/drv_adc.h @@ -17,7 +17,7 @@ #include "nu_adc.h" #if defined(BSP_USING_ADC_TOUCH) - #include "touch.h" + #include #endif typedef enum diff --git a/bsp/nuvoton/nk-980iot/applications/lvgl/lv_port_indev.c b/bsp/nuvoton/nk-980iot/applications/lvgl/lv_port_indev.c index b1f2e4c4b4..a0ca13acf0 100644 --- a/bsp/nuvoton/nk-980iot/applications/lvgl/lv_port_indev.c +++ b/bsp/nuvoton/nk-980iot/applications/lvgl/lv_port_indev.c @@ -11,7 +11,6 @@ #include #include #include -#include "touch.h" static lv_indev_state_t last_state = LV_INDEV_STATE_REL; static rt_int16_t last_x = 0; diff --git a/bsp/nuvoton/nk-n9h30/applications/lvgl/lv_port_indev.c b/bsp/nuvoton/nk-n9h30/applications/lvgl/lv_port_indev.c index b1f2e4c4b4..a0ca13acf0 100644 --- a/bsp/nuvoton/nk-n9h30/applications/lvgl/lv_port_indev.c +++ b/bsp/nuvoton/nk-n9h30/applications/lvgl/lv_port_indev.c @@ -11,7 +11,6 @@ #include #include #include -#include "touch.h" static lv_indev_state_t last_state = LV_INDEV_STATE_REL; static rt_int16_t last_x = 0; diff --git a/bsp/nuvoton/numaker-hmi-ma35d1/applications/lvgl/lv_port_indev.c b/bsp/nuvoton/numaker-hmi-ma35d1/applications/lvgl/lv_port_indev.c index b1f2e4c4b4..a0ca13acf0 100644 --- a/bsp/nuvoton/numaker-hmi-ma35d1/applications/lvgl/lv_port_indev.c +++ b/bsp/nuvoton/numaker-hmi-ma35d1/applications/lvgl/lv_port_indev.c @@ -11,7 +11,6 @@ #include #include #include -#include "touch.h" static lv_indev_state_t last_state = LV_INDEV_STATE_REL; static rt_int16_t last_x = 0; diff --git a/bsp/nuvoton/numaker-iot-m467/applications/lvgl/lv_port_indev.c b/bsp/nuvoton/numaker-iot-m467/applications/lvgl/lv_port_indev.c index b1f2e4c4b4..a0ca13acf0 100644 --- a/bsp/nuvoton/numaker-iot-m467/applications/lvgl/lv_port_indev.c +++ b/bsp/nuvoton/numaker-iot-m467/applications/lvgl/lv_port_indev.c @@ -11,7 +11,6 @@ #include #include #include -#include "touch.h" static lv_indev_state_t last_state = LV_INDEV_STATE_REL; static rt_int16_t last_x = 0; diff --git a/bsp/nuvoton/numaker-iot-m487/applications/lvgl/lv_port_indev.c b/bsp/nuvoton/numaker-iot-m487/applications/lvgl/lv_port_indev.c index b1f2e4c4b4..a0ca13acf0 100644 --- a/bsp/nuvoton/numaker-iot-m487/applications/lvgl/lv_port_indev.c +++ b/bsp/nuvoton/numaker-iot-m487/applications/lvgl/lv_port_indev.c @@ -11,7 +11,6 @@ #include #include #include -#include "touch.h" static lv_indev_state_t last_state = LV_INDEV_STATE_REL; static rt_int16_t last_x = 0; diff --git a/bsp/nuvoton/numaker-m032ki/applications/lvgl/lv_port_indev.c b/bsp/nuvoton/numaker-m032ki/applications/lvgl/lv_port_indev.c index b1f2e4c4b4..a0ca13acf0 100644 --- a/bsp/nuvoton/numaker-m032ki/applications/lvgl/lv_port_indev.c +++ b/bsp/nuvoton/numaker-m032ki/applications/lvgl/lv_port_indev.c @@ -11,7 +11,6 @@ #include #include #include -#include "touch.h" static lv_indev_state_t last_state = LV_INDEV_STATE_REL; static rt_int16_t last_x = 0; diff --git a/bsp/nuvoton/numaker-m2354/applications/lvgl/lv_port_indev.c b/bsp/nuvoton/numaker-m2354/applications/lvgl/lv_port_indev.c index b1f2e4c4b4..a0ca13acf0 100644 --- a/bsp/nuvoton/numaker-m2354/applications/lvgl/lv_port_indev.c +++ b/bsp/nuvoton/numaker-m2354/applications/lvgl/lv_port_indev.c @@ -11,7 +11,6 @@ #include #include #include -#include "touch.h" static lv_indev_state_t last_state = LV_INDEV_STATE_REL; static rt_int16_t last_x = 0; diff --git a/bsp/nuvoton/numaker-m467hj/applications/lvgl/lv_port_indev.c b/bsp/nuvoton/numaker-m467hj/applications/lvgl/lv_port_indev.c index b1f2e4c4b4..a0ca13acf0 100644 --- a/bsp/nuvoton/numaker-m467hj/applications/lvgl/lv_port_indev.c +++ b/bsp/nuvoton/numaker-m467hj/applications/lvgl/lv_port_indev.c @@ -11,7 +11,6 @@ #include #include #include -#include "touch.h" static lv_indev_state_t last_state = LV_INDEV_STATE_REL; static rt_int16_t last_x = 0; diff --git a/bsp/nuvoton/numaker-pfm-m487/applications/lvgl/lv_port_indev.c b/bsp/nuvoton/numaker-pfm-m487/applications/lvgl/lv_port_indev.c index b1f2e4c4b4..a0ca13acf0 100644 --- a/bsp/nuvoton/numaker-pfm-m487/applications/lvgl/lv_port_indev.c +++ b/bsp/nuvoton/numaker-pfm-m487/applications/lvgl/lv_port_indev.c @@ -11,7 +11,6 @@ #include #include #include -#include "touch.h" static lv_indev_state_t last_state = LV_INDEV_STATE_REL; static rt_int16_t last_x = 0; diff --git a/bsp/raspberry-pi/raspi4-32/driver/touch/drv_dsi_touch.c b/bsp/raspberry-pi/raspi4-32/driver/touch/drv_dsi_touch.c index 66e10f867b..df89f394cf 100644 --- a/bsp/raspberry-pi/raspi4-32/driver/touch/drv_dsi_touch.c +++ b/bsp/raspberry-pi/raspi4-32/driver/touch/drv_dsi_touch.c @@ -9,7 +9,6 @@ */ #include #include -#include #include "mbox.h" #include "drv_dsi_touch.h" diff --git a/bsp/raspberry-pi/raspi4-32/driver/touch/drv_xpt2046.c b/bsp/raspberry-pi/raspi4-32/driver/touch/drv_xpt2046.c index 84d72c0242..7dcb4805c6 100644 --- a/bsp/raspberry-pi/raspi4-32/driver/touch/drv_xpt2046.c +++ b/bsp/raspberry-pi/raspi4-32/driver/touch/drv_xpt2046.c @@ -10,7 +10,6 @@ #include #include -#include #include "drv_xpt2046.h" //http://www.lcdwiki.com/MHS-3.5inch_RPi_Display diff --git a/bsp/stm32/stm32f407-atk-explorer/board/ports/touch/drv_touch_xpt.h b/bsp/stm32/stm32f407-atk-explorer/board/ports/touch/drv_touch_xpt.h index e6a9c51741..a6b012d571 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/ports/touch/drv_touch_xpt.h +++ b/bsp/stm32/stm32f407-atk-explorer/board/ports/touch/drv_touch_xpt.h @@ -13,7 +13,6 @@ #include #include -#include "touch.h" #ifdef BSP_USING_TOUCH_RES diff --git a/bsp/stm32/stm32f469-st-disco/applications/lvgl/lv_port_indev.c b/bsp/stm32/stm32f469-st-disco/applications/lvgl/lv_port_indev.c index 9cce5aafc1..88c6db1b24 100644 --- a/bsp/stm32/stm32f469-st-disco/applications/lvgl/lv_port_indev.c +++ b/bsp/stm32/stm32f469-st-disco/applications/lvgl/lv_port_indev.c @@ -10,7 +10,6 @@ */ #include #include -#include #include #define DBG_TAG "LVGL.port.indev" diff --git a/components/drivers/touch/touch.c b/components/drivers/touch/touch.c index e15ebf5b05..daec7e0286 100644 --- a/components/drivers/touch/touch.c +++ b/components/drivers/touch/touch.c @@ -8,7 +8,7 @@ * 2019-05-20 tyustli the first version */ -#include "touch.h" +#include #include #define DBG_TAG "touch" diff --git a/components/drivers/touch/touch.h b/components/drivers/touch/touch.h deleted file mode 100644 index ed920c0121..0000000000 --- a/components/drivers/touch/touch.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (c) 2006-2021, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2019-05-20 tyustli the first version - */ - -#include -#include