From 71a1c4bd065136587dd1339692511924b31e6e99 Mon Sep 17 00:00:00 2001 From: SGCMarkus Date: Sun, 13 Mar 2022 15:32:03 +0100 Subject: [PATCH] pstar: touch: GloveMode -> HighTouchPollingRate --- touch/Android.bp | 2 +- touch/{GloveMode.cpp => HighTouchPollingRate.cpp} | 8 ++++---- touch/{GloveMode.h => HighTouchPollingRate.h} | 6 +++--- touch/service.cpp | 12 ++++++------ touch/vendor.lineage.touch@1.0-service.pstar.rc | 2 +- touch/vendor.lineage.touch@1.0-service.pstar.xml | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) rename touch/{GloveMode.cpp => HighTouchPollingRate.cpp} (86%) rename touch/{GloveMode.h => HighTouchPollingRate.h} (83%) diff --git a/touch/Android.bp b/touch/Android.bp index 6ac7dc1..d85f1a8 100644 --- a/touch/Android.bp +++ b/touch/Android.bp @@ -21,7 +21,7 @@ cc_binary { relative_install_path: "hw", proprietary: true, srcs: [ - "GloveMode.cpp", + "HighTouchPollingRate.cpp", "service.cpp", ], shared_libs: [ diff --git a/touch/GloveMode.cpp b/touch/HighTouchPollingRate.cpp similarity index 86% rename from touch/GloveMode.cpp rename to touch/HighTouchPollingRate.cpp index fbdb062..bfa9152 100644 --- a/touch/GloveMode.cpp +++ b/touch/HighTouchPollingRate.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#define LOG_TAG "GloveModeService" +#define LOG_TAG "HighTouchPollingRateService" -#include "GloveMode.h" +#include "HighTouchPollingRate.h" #include @@ -28,7 +28,7 @@ namespace implementation { const std::string kInterpolationPath = "/sys/class/touchscreen/primary/interpolation"; -Return GloveMode::isEnabled() { +Return HighTouchPollingRate::isEnabled() { std::ifstream file(kInterpolationPath); int enabled; file >> enabled; @@ -39,7 +39,7 @@ Return GloveMode::isEnabled() { return false; } -Return GloveMode::setEnabled(bool enabled) { +Return HighTouchPollingRate::setEnabled(bool enabled) { std::ofstream file(kInterpolationPath); file << (enabled ? "1" : "0"); return !file.fail(); diff --git a/touch/GloveMode.h b/touch/HighTouchPollingRate.h similarity index 83% rename from touch/GloveMode.h rename to touch/HighTouchPollingRate.h index 20f08e3..548654a 100644 --- a/touch/GloveMode.h +++ b/touch/HighTouchPollingRate.h @@ -16,7 +16,7 @@ #pragma once -#include +#include namespace vendor { namespace lineage { @@ -26,9 +26,9 @@ namespace implementation { using ::android::hardware::Return; -class GloveMode : public IGloveMode { +class HighTouchPollingRate : public IHighTouchPollingRate { public: - // Methods from ::vendor::lineage::touch::V1_0::IGloveMode follow. + // Methods from ::vendor::lineage::touch::V1_0::IHighTouchPollingRate follow. Return isEnabled() override; Return setEnabled(bool enabled) override; }; diff --git a/touch/service.cpp b/touch/service.cpp index 359b0ff..db6f55f 100644 --- a/touch/service.cpp +++ b/touch/service.cpp @@ -19,18 +19,18 @@ #include #include -#include "GloveMode.h" +#include "HighTouchPollingRate.h" -using ::vendor::lineage::touch::V1_0::IGloveMode; -using ::vendor::lineage::touch::V1_0::implementation::GloveMode; +using ::vendor::lineage::touch::V1_0::IHighTouchPollingRate; +using ::vendor::lineage::touch::V1_0::implementation::HighTouchPollingRate; int main() { - android::sp gloveMode = new GloveMode(); + android::sp highTouchPollingRate = new HighTouchPollingRate(); android::hardware::configureRpcThreadpool(1, true /*callerWillJoin*/); - if (gloveMode->registerAsService() != android::OK) { - LOG(ERROR) << "Cannot register touchscreen glove HAL service."; + if (highTouchPollingRate->registerAsService() != android::OK) { + LOG(ERROR) << "Cannot register touchscreen high polling rate HAL service."; return 1; } diff --git a/touch/vendor.lineage.touch@1.0-service.pstar.rc b/touch/vendor.lineage.touch@1.0-service.pstar.rc index 815d85c..44a737e 100644 --- a/touch/vendor.lineage.touch@1.0-service.pstar.rc +++ b/touch/vendor.lineage.touch@1.0-service.pstar.rc @@ -1,5 +1,5 @@ service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.pstar - interface vendor.lineage.touch@1.0::IGloveMode default + interface vendor.lineage.touch@1.0::IHighTouchPollingRate default class hal user system group system diff --git a/touch/vendor.lineage.touch@1.0-service.pstar.xml b/touch/vendor.lineage.touch@1.0-service.pstar.xml index 4636329..0a42036 100644 --- a/touch/vendor.lineage.touch@1.0-service.pstar.xml +++ b/touch/vendor.lineage.touch@1.0-service.pstar.xml @@ -4,7 +4,7 @@ hwbinder 1.0 - IGloveMode + IHighTouchPollingRate default