touch: Move device specfic defines to a header

Change-Id: I81dcbea5393cf3426357e659f89ede050cf567fb

diff --git a/hidl/touch/Android.bp b/hidl/touch/Android.bp
index 0197b6cb6783b4bd4e2bcfba345b24e4a3851f1d..37ed613337acfa9c01b5a7d634897ce948dc01b6 100644 (file)
--- a/hidl/touch/Android.bp
+++ b/hidl/touch/Android.bp
@@ -20,6 +20,7 @@ cc_binary {
     // FIXME: this should be 'vendor: true' for modules that will eventually be
     // on AOSP.
     proprietary: true,
+    local_include_dirs: ["include"],
     srcs: [
         "GloveMode.cpp",
         "KeyDisabler.cpp",

diff --git a/hidl/touch/GloveMode.cpp b/hidl/touch/GloveMode.cpp
index f059b61eab479ec6038f8c13205bb2a609e7b79b..124bca971999e2222e4c4af62cb0ec8bd147ed50 100644 (file)
--- a/hidl/touch/GloveMode.cpp
+++ b/hidl/touch/GloveMode.cpp
@@ -25,7 +25,7 @@ namespace V1_0 {
 namespace samsung {
 
 bool GloveMode::isSupported() {
-    std::ifstream file("/sys/class/sec/tsp/cmd_list");
+    std::ifstream file(TSP_CMD_LIST_NODE);
     if (file.is_open()) {
         std::string line;
         while (getline(file, line)) {
@@ -38,7 +38,7 @@ bool GloveMode::isSupported() {
 
 // Methods from ::vendor::lineage::touch::V1_0::IGloveMode follow.
 Return<bool> GloveMode::isEnabled() {
-    std::ifstream file("/sys/class/sec/tsp/cmd_result");
+    std::ifstream file(TSP_CMD_RESULT_NODE);
     if (file.is_open()) {
         std::string line;
         getline(file, line);
@@ -49,7 +49,7 @@ Return<bool> GloveMode::isEnabled() {
 }
 
 Return<bool> GloveMode::setEnabled(bool enabled) {
-    std::ofstream file("/sys/class/sec/tsp/cmd");
+    std::ofstream file(TSP_CMD_NODE);
     file << "glove_mode," << (enabled ? "1" : "0");
     return true;
 }

diff --git a/hidl/touch/GloveMode.h b/hidl/touch/GloveMode.h
index 25489bc4e993f5b0b70c0277111b8b3fa3d050d1..38a522c1c6d173033ddfa5eddb7c3533cadfa995 100644 (file)
--- a/hidl/touch/GloveMode.h
+++ b/hidl/touch/GloveMode.h
@@ -20,6 +20,7 @@
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
 #include <vendor/lineage/touch/1.0/IGloveMode.h>
+#include "samsung_touch.h"
 
 namespace vendor {
 namespace lineage {

diff --git a/hidl/touch/KeyDisabler.cpp b/hidl/touch/KeyDisabler.cpp
index 54691a0028c4254df1fc5ce677ca1f0afe88d27f..b94658b2b53ff76822843feeb65ecb565091825c 100644 (file)
--- a/hidl/touch/KeyDisabler.cpp
+++ b/hidl/touch/KeyDisabler.cpp
@@ -25,13 +25,13 @@ namespace V1_0 {
 namespace samsung {
 
 bool KeyDisabler::isSupported() {
-    std::ofstream file("/sys/class/sec/sec_touchkey/input/enabled");
+    std::ofstream file(KEY_DISABLER_NODE);
     return file.good();
 }
 
 // Methods from ::vendor::lineage::touch::V1_0::IKeyDisabler follow.
 Return<bool> KeyDisabler::isEnabled() {
-    std::ifstream file("/sys/class/sec/sec_touchkey/input/enabled");
+    std::ifstream file(KEY_DISABLER_NODE);
     int status = -1;
 
     if (file.is_open()) {
@@ -42,7 +42,7 @@ Return<bool> KeyDisabler::isEnabled() {
 }
 
 Return<bool> KeyDisabler::setEnabled(bool enabled) {
-    std::ofstream file("/sys/class/sec/sec_touchkey/input/enabled");
+    std::ofstream file(KEY_DISABLER_NODE);
     file << (enabled ? "0" : "1");
     return true;
 }

diff --git a/hidl/touch/KeyDisabler.h b/hidl/touch/KeyDisabler.h
index 9cab414d2e4a83a1588f3be697ed6039406a6ac5..e6309efdf670bdd7197b0004c77e6333839272da 100644 (file)
--- a/hidl/touch/KeyDisabler.h
+++ b/hidl/touch/KeyDisabler.h
@@ -20,6 +20,7 @@
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
 #include <vendor/lineage/touch/1.0/IKeyDisabler.h>
+#include "samsung_touch.h"
 
 namespace vendor {
 namespace lineage {

diff --git a/hidl/touch/StylusMode.cpp b/hidl/touch/StylusMode.cpp
index e3190dbd3f4227be20f06caeb5536669fc5496c4..6a2bfd3c4870d7a8fcb4b831311e8a2098b8e4ca 100644 (file)
--- a/hidl/touch/StylusMode.cpp
+++ b/hidl/touch/StylusMode.cpp
@@ -25,7 +25,7 @@ namespace V1_0 {
 namespace samsung {
 
 bool StylusMode::isSupported() {
-    std::ifstream file("/sys/class/sec/tsp/cmd_list");
+    std::ifstream file(TSP_CMD_LIST_NODE);
     if (file.is_open()) {
         std::string line;
         while (getline(file, line)) {
@@ -38,7 +38,7 @@ bool StylusMode::isSupported() {
 
 // Methods from ::vendor::lineage::touch::V1_0::IStylusMode follow.
 Return<bool> StylusMode::isEnabled() {
-    std::ifstream file("/sys/class/sec/tsp/cmd_result");
+    std::ifstream file(TSP_CMD_RESULT_NODE);
     if (file.is_open()) {
         std::string line;
         getline(file, line);
@@ -49,7 +49,7 @@ Return<bool> StylusMode::isEnabled() {
 }
 
 Return<bool> StylusMode::setEnabled(bool enabled) {
-    std::ofstream file("/sys/class/sec/tsp/cmd");
+    std::ofstream file(TSP_CMD_NODE);
     file << "hover_enable," << (enabled ? "1" : "0");
     return true;
 }

diff --git a/hidl/touch/StylusMode.h b/hidl/touch/StylusMode.h
index 6226ca5adca735f1f362cb05af3de3d5920e3e82..c9b12b2c185b4253063cf6405519e73ccf49fb9b 100644 (file)
--- a/hidl/touch/StylusMode.h
+++ b/hidl/touch/StylusMode.h
@@ -20,6 +20,7 @@
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
 #include <vendor/lineage/touch/1.0/IStylusMode.h>
+#include "samsung_touch.h"
 
 namespace vendor {
 namespace lineage {

diff --git a/hidl/touch/TouchscreenGesture.cpp b/hidl/touch/TouchscreenGesture.cpp
index c0091a6d57d7bf37a671f7bc70d481873b8349af..113741eeba478e70010d9d674cc775d75ae189bc 100644 (file)
--- a/hidl/touch/TouchscreenGesture.cpp
+++ b/hidl/touch/TouchscreenGesture.cpp
@@ -24,7 +24,7 @@ namespace touch {
 namespace V1_0 {
 namespace samsung {
 
-static constexpr const char* kGeasturePath = "/sys/class/sec/sec_epen/epen_gestures";
+static constexpr const char* kGeasturePath = TOUCHSCREEN_GESTURE_NODE;
 
 const std::map<int32_t, TouchscreenGesture::GestureInfo> TouchscreenGesture::kGestureInfoMap = {
     // clang-format off

diff --git a/hidl/touch/TouchscreenGesture.h b/hidl/touch/TouchscreenGesture.h
index 35517f1b2a15bad97404c34f413c86bedbd1c132..4d40847b8cca84a500a94eec43b0454953446187 100644 (file)
--- a/hidl/touch/TouchscreenGesture.h
+++ b/hidl/touch/TouchscreenGesture.h
@@ -20,6 +20,7 @@
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
 #include <vendor/lineage/touch/1.0/ITouchscreenGesture.h>
+#include "samsung_touch.h"
 
 namespace vendor {
 namespace lineage {

diff --git a/hidl/touch/include/samsung_touch.h b/hidl/touch/include/samsung_touch.h
new file mode 100644 (file)
index 0000000..e44b1e0
--- /dev/null
+++ b/hidl/touch/include/samsung_touch.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2021 The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SAMSUNG_TOUCH_H
+#define SAMSUNG_TOUCH_H
+
+/*
+ * Board specific nodes
+ *
+ * If your kernel exposes these controls in another place, you can either
+ * symlink to the locations given here, or override this header in your
+ * device tree.
+ */
+
+// For GloveMode and StylusMode
+#define TSP_CMD_LIST_NODE "/sys/class/sec/tsp/cmd_list"
+#define TSP_CMD_RESULT_NODE "/sys/class/sec/tsp/cmd_result"
+#define TSP_CMD_NODE "/sys/class/sec/tsp/cmd"
+
+// For KeyDisabler
+#define KEY_DISABLER_NODE "/sys/class/sec/sec_touchkey/input/enabled"
+
+//For TouchscreenGesture
+#define TOUCHSCREEN_GESTURE_NODE "/sys/class/sec/sec_epen/epen_gestures"
+
+#endif  // SAMSUNG_TOUCH_H