power stuff

.clang-format

@@ -0,0 +1 @@
+../../../../build/soong/scripts/system-clang-format

Android.mk

@@ -2,45 +2,80 @@ LOCAL_PATH := $(call my-dir)
 
 ifeq ($(call is-vendor-board-platform,QCOM),true)
 
-# HAL module implemenation stored in
-# hw/<POWERS_HARDWARE_MODULE_ID>.<ro.hardware>.so
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libxml2 libbase libutils android.hardware.power-ndk_platform libbinder_ndk
-LOCAL_HEADER_LIBRARIES += libutils_headers
-LOCAL_HEADER_LIBRARIES += libhardware_headers
-LOCAL_SRC_FILES := power-common.c metadata-parser.c utils.c list.c hint-data.c powerhintparser.c Power.cpp main.cpp
-LOCAL_C_INCLUDES := external/libxml2/include \
-                    external/icu/icu4c/source/common
+
+LOCAL_SHARED_LIBRARIES := \
+    liblog \
+    libcutils \
+    libdl \
+    libbase \
+    libutils \
+    android.hardware.power-ndk_platform \
+    libbinder_ndk
+
+LOCAL_HEADER_LIBRARIES := \
+    libhardware_headers
+
+LOCAL_SRC_FILES := \
+    power-common.c \
+    metadata-parser.c \
+    utils.c \
+    list.c \
+    hint-data.c \
+    Power.cpp \
+    main.cpp
+
+LOCAL_CFLAGS += -Wall -Wextra -Werror
+
+ifneq ($(BOARD_POWER_CUSTOM_BOARD_LIB),)
+    LOCAL_WHOLE_STATIC_LIBRARIES += $(BOARD_POWER_CUSTOM_BOARD_LIB)
+else
 
 # Include target-specific files.
-ifeq ($(call is-board-platform-in-list, msm8974), true)
+ifeq ($(call is-board-platform-in-list,msm8960), true)
+LOCAL_SRC_FILES += power-8960.c
+endif
+
+ifeq ($(call is-board-platform-in-list,msm8974), true)
 LOCAL_SRC_FILES += power-8974.c
 endif
 
-ifeq ($(call is-board-platform-in-list, msm8226), true)
+ifeq ($(call is-board-platform-in-list,msm8226), true)
 LOCAL_SRC_FILES += power-8226.c
 endif
 
-ifeq ($(call is-board-platform-in-list, msm8610), true)
+ifeq ($(call is-board-platform-in-list,msm8610), true)
 LOCAL_SRC_FILES += power-8610.c
 endif
 
 ifeq ($(call is-board-platform-in-list, apq8084), true)
 LOCAL_SRC_FILES += power-8084.c
 endif
 
-ifeq ($(call is-board-platform-in-list, msm8994), true)
+ifeq ($(call is-board-platform-in-list,msm8909), true)
+LOCAL_SRC_FILES += power-8909.c
+endif
+
+ifeq ($(call is-board-platform-in-list,msm8916), true)
+LOCAL_SRC_FILES += power-8916.c
+endif
+
+ifeq ($(call is-board-platform-in-list,msm8992), true)
+LOCAL_SRC_FILES += power-8992.c
+endif
+
+ifeq ($(call is-board-platform-in-list,msm8994), true)
 LOCAL_SRC_FILES += power-8994.c
 endif
 
-ifeq ($(call is-board-platform-in-list, msm8996), true)
+ifeq ($(call is-board-platform-in-list,msm8996), true)
 LOCAL_SRC_FILES += power-8996.c
 endif
 
 ifeq ($(call is-board-platform-in-list,msm8937), true)
-LOCAL_SRC_FILES += power-8952.c
+LOCAL_SRC_FILES += power-8937.c
 endif
 
 ifeq ($(call is-board-platform-in-list,msm8952), true)
@@ -75,6 +110,18 @@ ifeq ($(call is-board-platform-in-list,msmnile), true)
 LOCAL_SRC_FILES += power-msmnile.c
 endif
 
+endif # End of board specific list
+
+ifneq ($(TARGET_POWERHAL_MODE_EXT),)
+    LOCAL_CFLAGS += -DMODE_EXT
+    LOCAL_SRC_FILES += ../../../../$(TARGET_POWERHAL_MODE_EXT)
+endif
+
+ifneq ($(TARGET_POWERHAL_SET_INTERACTIVE_EXT),)
+    LOCAL_CFLAGS += -DSET_INTERACTIVE_EXT
+    LOCAL_SRC_FILES += ../../../../$(TARGET_POWERHAL_SET_INTERACTIVE_EXT)
+endif
+
 ifneq ($(TARGET_TAP_TO_WAKE_NODE),)
     LOCAL_CFLAGS += -DTAP_TO_WAKE_NODE=\"$(TARGET_TAP_TO_WAKE_NODE)\"
 endif
@@ -83,12 +130,20 @@ ifeq ($(TARGET_USES_INTERACTION_BOOST),true)
     LOCAL_CFLAGS += -DINTERACTION_BOOST
 endif
 
-LOCAL_MODULE := android.hardware.power-service
-LOCAL_INIT_RC := android.hardware.power-service.rc
+ifeq ($(call is-board-platform-in-list,trinket), true)
+LOCAL_MODULE := power.qcom
+LOCAL_MODULE_TAGS := optional
+LOCAL_VENDOR_MODULE := true
+include $(BUILD_SHARED_LIBRARY)
+else
+LOCAL_MODULE := android.hardware.power-service-qti
+LOCAL_INIT_RC := android.hardware.power-service-qti.rc
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-variable
 LOCAL_VENDOR_MODULE := true
 LOCAL_VINTF_FRAGMENTS := power.xml
+
 include $(BUILD_EXECUTABLE)
 endif
 
+endif

Power.cpp

@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define LOG_TAG "QTI PowerHAL"
+#define LOG_TAG "android.hardware.power-service-qti"
 
 #include "Power.h"
 
@@ -41,9 +41,9 @@
 #include <android/binder_process.h>
 
 using ::aidl::android::hardware::power::BnPower;
+using ::aidl::android::hardware::power::Boost;
 using ::aidl::android::hardware::power::IPower;
 using ::aidl::android::hardware::power::Mode;
-using ::aidl::android::hardware::power::Boost;
 
 using ::ndk::ScopedAStatus;
 using ::ndk::SharedRefBase;
@@ -54,13 +54,23 @@ namespace hardware {
 namespace power {
 namespace impl {
 
+#ifdef MODE_EXT
+extern bool isDeviceSpecificModeSupported(Mode type, bool* _aidl_return);
+extern bool setDeviceSpecificMode(Mode type, bool enabled);
+#endif
+
 void setInteractive(bool interactive) {
-   set_interactive(interactive ? 1:0);
+    set_interactive(interactive ? 1 : 0);
 }
 
 ndk::ScopedAStatus Power::setMode(Mode type, bool enabled) {
     LOG(INFO) << "Power setMode: " << static_cast<int32_t>(type) << " to: " << enabled;
-    switch(type){
+#ifdef MODE_EXT
+    if (setDeviceSpecificMode(type, enabled)) {
+        return ndk::ScopedAStatus::ok();
+    }
+#endif
+    switch (type) {
 #ifdef TAP_TO_WAKE_NODE
         case Mode::DOUBLE_TAP_TO_WAKE:
             ::android::base::WriteStringToFile(enabled ? "1" : "0", TAP_TO_WAKE_NODE, true);
@@ -99,7 +109,13 @@ ndk::ScopedAStatus Power::setMode(Mode type, bool enabled) {
 ndk::ScopedAStatus Power::isModeSupported(Mode type, bool* _aidl_return) {
     LOG(INFO) << "Power isModeSupported: " << static_cast<int32_t>(type);
 
-    switch(type){
+#ifdef MODE_EXT
+    if (isDeviceSpecificModeSupported(type, _aidl_return)) {
+        return ndk::ScopedAStatus::ok();
+    }
+#endif
+
+    switch (type) {
 #ifdef TAP_TO_WAKE_NODE
         case Mode::DOUBLE_TAP_TO_WAKE:
 #endif
@@ -116,8 +132,7 @@ ndk::ScopedAStatus Power::isModeSupported(Mode type, bool* _aidl_return) {
 }
 
 ndk::ScopedAStatus Power::setBoost(Boost type, int32_t durationMs) {
-    LOG(INFO) << "Power setBoost: " << static_cast<int32_t>(type)
-                 << ", duration: " << durationMs;
+    LOG(INFO) << "Power setBoost: " << static_cast<int32_t>(type) << ", duration: " << durationMs;
     return ndk::ScopedAStatus::ok();
 }
 

Power.h

@@ -40,14 +40,12 @@ namespace power {
 namespace impl {
 
 class Power : public BnPower {
-    public:
-        Power() : BnPower(){
-            power_init();
-        }
-        ndk::ScopedAStatus setMode(Mode type, bool enabled) override;
-        ndk::ScopedAStatus isModeSupported(Mode type, bool* _aidl_return) override;
-        ndk::ScopedAStatus setBoost(Boost type, int32_t durationMs) override;
-        ndk::ScopedAStatus isBoostSupported(Boost type, bool* _aidl_return) override;
+  public:
+    Power() : BnPower() { power_init(); }
+    ndk::ScopedAStatus setMode(Mode type, bool enabled) override;
+    ndk::ScopedAStatus isModeSupported(Mode type, bool* _aidl_return) override;
+    ndk::ScopedAStatus setBoost(Boost type, int32_t durationMs) override;
+    ndk::ScopedAStatus isBoostSupported(Boost type, bool* _aidl_return) override;
 };
 
 }  // namespace impl

android.hardware.power-service.rc → android.hardware.power-service-qti.rc

@@ -1,4 +1,4 @@
-service vendor.power /vendor/bin/hw/android.hardware.power-service
+service vendor.power /vendor/bin/hw/android.hardware.power-service-qti
     class hal
     user system
     group system

hint-data.c

@@ -27,21 +27,20 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <utils/Log.h>
+
 #include "hint-data.h"
 
-int hint_compare(struct hint_data *first_hint,
-        struct hint_data *other_hint) {
+int hint_compare(struct hint_data* first_hint, struct hint_data* other_hint) {
     if (first_hint == other_hint) {
         return 0;
-    } else if ((first_hint && other_hint) &&
-            (first_hint->hint_id == other_hint->hint_id)) {
+    } else if ((first_hint && other_hint) && (first_hint->hint_id == other_hint->hint_id)) {
         return 0;
     } else {
         return 1;
     }
 }
 
-void hint_dump(struct hint_data *hint)
-{
-    /*ALOGI("hint_id: %lu", hint->hint_id);*/
+void hint_dump(struct hint_data* hint) {
+    ALOGV("hint_id: %lu", hint->hint_id);
 }

hint-data.h

@@ -28,33 +28,33 @@
  */
 
 /* Default use-case hint IDs */
-#define DEFAULT_VIDEO_ENCODE_HINT_ID    (0x0A00)
-#define DEFAULT_VIDEO_DECODE_HINT_ID    (0x0B00)
-#define DISPLAY_STATE_HINT_ID           (0x0C00)
-#define DISPLAY_STATE_HINT_ID_2         (0x0D00)
-#define CAM_PREVIEW_HINT_ID             (0x0E00)
-#define SUSTAINED_PERF_HINT_ID          (0x0F00)
-#define VR_MODE_HINT_ID                 (0x1000)
-#define VR_MODE_SUSTAINED_PERF_HINT_ID  (0x1001)
+#define DEFAULT_VIDEO_ENCODE_HINT_ID (0x0A00)
+#define DEFAULT_VIDEO_DECODE_HINT_ID (0x0B00)
+#define DISPLAY_STATE_HINT_ID (0x0C00)
+#define DISPLAY_STATE_HINT_ID_2 (0x0D00)
+#define CAM_PREVIEW_HINT_ID (0x0E00)
+#define SUSTAINED_PERF_HINT_ID (0x0F00)
+#define VR_MODE_HINT_ID (0x1000)
+#define VR_MODE_SUSTAINED_PERF_HINT_ID (0x1001)
 
-#define AOSP_DELTA                      (0x1200)
+#define AOSP_DELTA (0x1200)
 
-#define VSYNC_HINT                      AOSP_DELTA + POWER_HINT_VSYNC
-#define INTERACTION_HINT                AOSP_DELTA + POWER_HINT_INTERACTION
-#define VIDEO_DECODE_HINT               AOSP_DELTA + POWER_HINT_VIDEO_DECODE
-#define VIDEO_ENCODE_HINT               AOSP_DELTA + POWER_HINT_VIDEO_ENCODE
-#define LOW_POWER_HINT                  AOSP_DELTA + POWER_HINT_LOW_POWER
-#define SUSTAINED_PERF_HINT             AOSP_DELTA + POWER_HINT_SUSTAINED_PERFORMANCE
-#define VR_MODE_HINT                    AOSP_DELTA + POWER_HINT_VR_MODE
-#define LAUNCH_HINT                     AOSP_DELTA + POWER_HINT_LAUNCH
-#define DISABLE_TOUCH_HINT              AOSP_DELTA + POWER_HINT_DISABLE_TOUCH
+#define VSYNC_HINT AOSP_DELTA + POWER_HINT_VSYNC
+#define INTERACTION_HINT AOSP_DELTA + POWER_HINT_INTERACTION
+#define VIDEO_DECODE_HINT AOSP_DELTA + POWER_HINT_VIDEO_DECODE
+#define VIDEO_ENCODE_HINT AOSP_DELTA + POWER_HINT_VIDEO_ENCODE
+#define LOW_POWER_HINT AOSP_DELTA + POWER_HINT_LOW_POWER
+#define SUSTAINED_PERF_HINT AOSP_DELTA + POWER_HINT_SUSTAINED_PERFORMANCE
+#define VR_MODE_HINT AOSP_DELTA + POWER_HINT_VR_MODE
+#define LAUNCH_HINT AOSP_DELTA + POWER_HINT_LAUNCH
+#define DISABLE_TOUCH_HINT AOSP_DELTA + POWER_HINT_DISABLE_TOUCH
 
-//update NUM_HINTS if hints are added to AOSP
-#define NUM_HINTS                       (POWER_HINT_DISABLE_TOUCH +1)
+// update NUM_HINTS if hints are added to AOSP
+#define NUM_HINTS (POWER_HINT_DISABLE_TOUCH + 1)
 
-#define VR_MODE_SUSTAINED_PERF_HINT    (0x1301)
+#define VR_MODE_SUSTAINED_PERF_HINT (0x1301)
 
-struct hint_handles{
+struct hint_handles {
     int handle;
     int ref_count;
 };
@@ -64,6 +64,5 @@ struct hint_data {
     unsigned long perflock_handle;
 };
 
-int hint_compare(struct hint_data *first_hint,
-        struct hint_data *other_hint);
-void hint_dump(struct hint_data *hint);
+int hint_compare(struct hint_data* first_hint, struct hint_data* other_hint);
+void hint_dump(struct hint_data* hint);