From b723b0c697979d1157ff8e48a419c7c2fb614cd8 Mon Sep 17 00:00:00 2001
From: Arian <arian.kulmer@web.de>
Date: Thu, 25 Jul 2024 01:10:23 +0200
Subject: [PATCH] sm8450-common: Use kernel provided xiaomi_touch.h

Change-Id: Ib235946a1233b4965fc4a90c9b2b01b7644775e9
---
 sensors/Android.bp        |  4 +++
 sensors/NonUiNotifier.cpp |  5 +---
 sensors/xiaomi_touch.h    | 56 ---------------------------------------
 udfps/UdfpsHandler.cpp    |  8 ++----
 udfps/xiaomi_touch.h      | 56 ---------------------------------------
 5 files changed, 7 insertions(+), 122 deletions(-)
 delete mode 100644 sensors/xiaomi_touch.h
 delete mode 100644 udfps/xiaomi_touch.h

diff --git a/sensors/Android.bp b/sensors/Android.bp
index 8ef9379..4668f61 100644
--- a/sensors/Android.bp
+++ b/sensors/Android.bp
@@ -20,4 +20,8 @@ cc_binary {
         "libutils",
         "android.frameworks.sensorservice@1.0",
     ],
+
+    header_libs: [
+        "generated_kernel_headers",
+    ],
 }
diff --git a/sensors/NonUiNotifier.cpp b/sensors/NonUiNotifier.cpp
index de2c060..c91ba29 100644
--- a/sensors/NonUiNotifier.cpp
+++ b/sensors/NonUiNotifier.cpp
@@ -13,7 +13,7 @@
 #include <poll.h>
 #include <sys/ioctl.h>
 
-#include "xiaomi_touch.h"
+#include <linux/xiaomi_touch.h>
 
 #define SENSOR_NAME_XIAOMI_SENSOR_NONUI "xiaomi.sensor.nonui"
 
@@ -30,9 +30,6 @@ using android::hardware::sensors::V1_0::SensorInfo;
 using android::hardware::sensors::V1_0::SensorType;
 
 #define TOUCH_DEV_PATH "/dev/xiaomi-touch"
-#define TOUCH_MAGIC 'T'
-#define TOUCH_IOC_SET_CUR_VALUE _IO(TOUCH_MAGIC, SET_CUR_VALUE)
-#define TOUCH_IOC_GET_CUR_VALUE _IO(TOUCH_MAGIC, GET_CUR_VALUE)
 
 namespace {
 
diff --git a/sensors/xiaomi_touch.h b/sensors/xiaomi_touch.h
deleted file mode 100644
index 14bddfa..0000000
--- a/sensors/xiaomi_touch.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2022 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-
-/*CUR,DEFAULT,MIN,MAX*/
-#define VALUE_TYPE_SIZE 6
-#define VALUE_GRIP_SIZE 9
-#define MAX_BUF_SIZE 256
-#define BTN_INFO 0x152
-#define MAX_TOUCH_ID 10
-#define RAW_BUF_NUM 4
-#define THP_CMD_BASE 1000
-
-enum MODE_CMD {
-    SET_CUR_VALUE = 0,
-    GET_CUR_VALUE,
-    GET_DEF_VALUE,
-    GET_MIN_VALUE,
-    GET_MAX_VALUE,
-    GET_MODE_VALUE,
-    RESET_MODE,
-    SET_LONG_VALUE,
-};
-
-enum MODE_TYPE {
-    Touch_Game_Mode = 0,
-    Touch_Active_MODE = 1,
-    Touch_UP_THRESHOLD = 2,
-    Touch_Tolerance = 3,
-    Touch_Aim_Sensitivity = 4,
-    Touch_Tap_Stability = 5,
-    Touch_Expert_Mode = 6,
-    Touch_Edge_Filter = 7,
-    Touch_Panel_Orientation = 8,
-    Touch_Report_Rate = 9,
-    Touch_Fod_Enable = 10,
-    Touch_Aod_Enable = 11,
-    Touch_Resist_RF = 12,
-    Touch_Idle_Time = 13,
-    Touch_Doubletap_Mode = 14,
-    Touch_Grip_Mode = 15,
-    Touch_FodIcon_Enable = 16,
-    Touch_Nonui_Mode = 17,
-    Touch_Debug_Level = 18,
-    Touch_Power_Status = 19,
-    Touch_Mode_NUM = 20,
-    THP_LOCK_SCAN_MODE = THP_CMD_BASE + 0,
-    THP_FOD_DOWNUP_CTL = THP_CMD_BASE + 1,
-    THP_SELF_CAP_SCAN = THP_CMD_BASE + 2,
-    THP_REPORT_POINT_SWITCH = THP_CMD_BASE + 3,
-    THP_HAL_INIT_READY = THP_CMD_BASE + 4,
-};
diff --git a/udfps/UdfpsHandler.cpp b/udfps/UdfpsHandler.cpp
index 8767d36..7f09835 100644
--- a/udfps/UdfpsHandler.cpp
+++ b/udfps/UdfpsHandler.cpp
@@ -16,9 +16,9 @@
 #include <thread>
 
 #include <display/drm/mi_disp.h>
+#include <linux/xiaomi_touch.h>
 
 #include "UdfpsHandler.h"
-#include "xiaomi_touch.h"
 
 #define COMMAND_NIT 10
 #define TARGET_BRIGHTNESS_OFF 0
@@ -33,12 +33,8 @@
 #define PARAM_FOD_PRESSED 1
 #define PARAM_FOD_RELEASED 0
 
-#define TOUCH_DEV_PATH "/dev/xiaomi-touch"
-#define TOUCH_MAGIC 'T'
-#define TOUCH_IOC_SET_CUR_VALUE _IO(TOUCH_MAGIC, SET_CUR_VALUE)
-#define TOUCH_IOC_GET_CUR_VALUE _IO(TOUCH_MAGIC, GET_CUR_VALUE)
-
 #define DISP_FEATURE_PATH "/dev/mi_display/disp_feature"
+#define TOUCH_DEV_PATH "/dev/xiaomi-touch"
 
 #define FOD_PRESS_STATUS_PATH "/sys/class/touch/touch_dev/fod_press_status"
 
diff --git a/udfps/xiaomi_touch.h b/udfps/xiaomi_touch.h
deleted file mode 100644
index 14bddfa..0000000
--- a/udfps/xiaomi_touch.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2022 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-
-/*CUR,DEFAULT,MIN,MAX*/
-#define VALUE_TYPE_SIZE 6
-#define VALUE_GRIP_SIZE 9
-#define MAX_BUF_SIZE 256
-#define BTN_INFO 0x152
-#define MAX_TOUCH_ID 10
-#define RAW_BUF_NUM 4
-#define THP_CMD_BASE 1000
-
-enum MODE_CMD {
-    SET_CUR_VALUE = 0,
-    GET_CUR_VALUE,
-    GET_DEF_VALUE,
-    GET_MIN_VALUE,
-    GET_MAX_VALUE,
-    GET_MODE_VALUE,
-    RESET_MODE,
-    SET_LONG_VALUE,
-};
-
-enum MODE_TYPE {
-    Touch_Game_Mode = 0,
-    Touch_Active_MODE = 1,
-    Touch_UP_THRESHOLD = 2,
-    Touch_Tolerance = 3,
-    Touch_Aim_Sensitivity = 4,
-    Touch_Tap_Stability = 5,
-    Touch_Expert_Mode = 6,
-    Touch_Edge_Filter = 7,
-    Touch_Panel_Orientation = 8,
-    Touch_Report_Rate = 9,
-    Touch_Fod_Enable = 10,
-    Touch_Aod_Enable = 11,
-    Touch_Resist_RF = 12,
-    Touch_Idle_Time = 13,
-    Touch_Doubletap_Mode = 14,
-    Touch_Grip_Mode = 15,
-    Touch_FodIcon_Enable = 16,
-    Touch_Nonui_Mode = 17,
-    Touch_Debug_Level = 18,
-    Touch_Power_Status = 19,
-    Touch_Mode_NUM = 20,
-    THP_LOCK_SCAN_MODE = THP_CMD_BASE + 0,
-    THP_FOD_DOWNUP_CTL = THP_CMD_BASE + 1,
-    THP_SELF_CAP_SCAN = THP_CMD_BASE + 2,
-    THP_REPORT_POINT_SWITCH = THP_CMD_BASE + 3,
-    THP_HAL_INIT_READY = THP_CMD_BASE + 4,
-};