[components/drivers][touch]删除多余的touch.h (#7090)

* [components/drivers][touch]删除多余的touch.h * 将touc.h替换为rtdevice.h
2023-03-24 23:47:28 +08:00 · 2023-03-24 23:47:28 +08:00 · b0c247fb59
parent 6095d65679
commit b0c247fb59
30 changed files with 10 additions and 41 deletions
--- a/bsp/allwinner/libraries/drivers/touch/drv_touch.h
+++ b/bsp/allwinner/libraries/drivers/touch/drv_touch.h
@ -12,7 +12,6 @@
 #include <stddef.h>
 #include "rtthread.h"
 #include "rtdevice.h"
-#include <touch.h>

 #define TOUCH_POLL_MODE (1 << 0)
 #define TOUCH_INT_MODE (1 << 1)
--- 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 <rtthread.h>
 #include <rtdevice.h>
-#include <touch.h>
 #include "drv_touch.h"
 #include "string.h"
 #include "drv_pin.h"
--- 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 <rtdevice.h>
 #endif

 typedef enum
--- 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 <rtdevice.h>
 #endif

 typedef enum
--- 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 <stdio.h>
 #include <sys/stat.h>
 #include <sys/statfs.h>
-#include "touch.h"
 //#include "drv_adc.h"
 #include "adc_touch.h"

--- 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 ---------------------------------------------------------------*/
--- 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 <rtthread.h>
-#include "touch.h"
+#include <rtdevice.h>

 typedef enum
 {
--- 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 <rtdevice.h>

 int rt_hw_ili_tpc_init(const char *name, struct rt_touch_config *cfg);

--- 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 <rtdevice.h>

 #define FT_REGITER_LEN           1
 #define FT_MAX_TOUCH             5
--- 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 <rtdbg.h>

-#include "touch.h"
 #include "gt911.h"

 static struct rt_i2c_client gt911_client;
--- 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 <rtdevice.h>

 #define GT911_ADDR_LEN          2
 #define GT911_REGITER_LEN       2
--- 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 <rtdevice.h>

 int rt_hw_ili_tpc_init(const char *name, struct rt_touch_config *cfg);

--- 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 <rtdevice.h>

 #define ST_REGITER_LEN           1
 #define ST_MAX_TOUCH             5
--- 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 <rtthread.h>
 #include <rtdevice.h>
-#include "touch.h"

 #define THREAD_PRIORITY   5
 #define THREAD_STACK_SIZE 2048
--- 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 <rtdevice.h>
 #endif

 typedef enum
--- 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 <lvgl.h>
 #include <stdbool.h>
 #include <rtdevice.h>
-#include "touch.h"

 static lv_indev_state_t last_state = LV_INDEV_STATE_REL;
 static rt_int16_t last_x = 0;
--- 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 <lvgl.h>
 #include <stdbool.h>
 #include <rtdevice.h>
-#include "touch.h"

 static lv_indev_state_t last_state = LV_INDEV_STATE_REL;
 static rt_int16_t last_x = 0;
--- 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 <lvgl.h>
 #include <stdbool.h>
 #include <rtdevice.h>
-#include "touch.h"

 static lv_indev_state_t last_state = LV_INDEV_STATE_REL;
 static rt_int16_t last_x = 0;
--- 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 <lvgl.h>
 #include <stdbool.h>
 #include <rtdevice.h>
-#include "touch.h"

 static lv_indev_state_t last_state = LV_INDEV_STATE_REL;
 static rt_int16_t last_x = 0;
--- 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 <lvgl.h>
 #include <stdbool.h>
 #include <rtdevice.h>
-#include "touch.h"

 static lv_indev_state_t last_state = LV_INDEV_STATE_REL;
 static rt_int16_t last_x = 0;
--- 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 <lvgl.h>
 #include <stdbool.h>
 #include <rtdevice.h>
-#include "touch.h"

 static lv_indev_state_t last_state = LV_INDEV_STATE_REL;
 static rt_int16_t last_x = 0;
--- 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 <lvgl.h>
 #include <stdbool.h>
 #include <rtdevice.h>
-#include "touch.h"

 static lv_indev_state_t last_state = LV_INDEV_STATE_REL;
 static rt_int16_t last_x = 0;
--- 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 <lvgl.h>
 #include <stdbool.h>
 #include <rtdevice.h>
-#include "touch.h"

 static lv_indev_state_t last_state = LV_INDEV_STATE_REL;
 static rt_int16_t last_x = 0;
--- 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 <lvgl.h>
 #include <stdbool.h>
 #include <rtdevice.h>
-#include "touch.h"

 static lv_indev_state_t last_state = LV_INDEV_STATE_REL;
 static rt_int16_t last_x = 0;
--- 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 <rtthread.h>
 #include <rtdevice.h>
-#include <touch.h>

 #include "mbox.h"
 #include "drv_dsi_touch.h"
--- 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 <rtthread.h>
 #include <rtdevice.h>
-#include <touch.h>

 #include "drv_xpt2046.h"
 //http://www.lcdwiki.com/MHS-3.5inch_RPi_Display
--- 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 <rtthread.h>
 #include <rtdevice.h>
-#include "touch.h"

 #ifdef BSP_USING_TOUCH_RES

--- 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 <lvgl.h>
 #include <rtdevice.h>
-#include <touch.h>
 #include <lcd_port.h>

 #define DBG_TAG    "LVGL.port.indev"
--- 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 <rtdevice.h>
 #include <string.h>

 #define DBG_TAG  "touch"
--- a/components/drivers/touch/touch.h
+++ b/components/drivers/touch/touch.h
@ -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 <rtthread.h>
-#include <rtdevice.h>