LineageOS/android_vendor_qcom_opensource_power
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

power: conversion from hidl to aidl

Browse Source 
Added aidl specific changes

Change-Id: Iaba27ba991db960b8e0721047910de4da1c20934
This commit is contained in:
Rajeswari N
2020-06-30 10:27:46 +05:30
parent 9407a03e0e
commit dbf22f7b1a
8 changed files with 114 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Android.mk
View File

@@ -7,10 +7,10 @@ ifeq ($(call is-vendor-board-platform,QCOM),true)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libxml2 libbase libhidlbase libhidltransport libutils android.hardware.power@1.2 LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libxml2 libbase libutils android.hardware.power-ndk_platform libbinder_ndk
LOCAL_HEADER_LIBRARIES += libutils_headers LOCAL_HEADER_LIBRARIES += libutils_headers
LOCAL_HEADER_LIBRARIES += libhardware_headers LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_SRC_FILES := power-common.c metadata-parser.c utils.c list.c hint-data.c powerhintparser.c service.cpp Power.cpp 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 \ LOCAL_C_INCLUDES := external/libxml2/include \
external/icu/icu4c/source/common external/icu/icu4c/source/common
@@ -92,11 +92,12 @@ LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-variable
LOCAL_VENDOR_MODULE := true LOCAL_VENDOR_MODULE := true
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
else else
LOCAL_MODULE := android.hardware.power@1.2-service LOCAL_MODULE := android.hardware.power-service
LOCAL_INIT_RC := android.hardware.power@1.2-service.rc LOCAL_INIT_RC := android.hardware.power-service.rc
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-variable LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-variable
LOCAL_VENDOR_MODULE := true LOCAL_VENDOR_MODULE := true
LOCAL_VINTF_FRAGMENTS := power.xml
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
endif endif

115
Power.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019, The Linux Foundation. All rights reserved. * Copyright (c) 2019,2020 The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@@ -29,74 +29,83 @@
#define LOG_TAG "QTI PowerHAL" #define LOG_TAG "QTI PowerHAL"
#include <android/log.h>
#include <utils/Log.h>
#include "Power.h" #include "Power.h"
#include "power-common.h"
#include <android-base/logging.h>
#include <aidl/android/hardware/power/BnPower.h>
#include <android-base/logging.h>
#include <android/binder_manager.h>
#include <android/binder_process.h>
using ::aidl::android::hardware::power::BnPower;
using ::aidl::android::hardware::power::IPower;
using ::aidl::android::hardware::power::Mode;
using ::aidl::android::hardware::power::Boost;
using ::ndk::ScopedAStatus;
using ::ndk::SharedRefBase;
namespace aidl {
namespace android { namespace android {
namespace hardware { namespace hardware {
namespace power { namespace power {
namespace V1_2 { namespace impl {
namespace implementation {
using ::android::hardware::power::V1_0::Feature; void setInteractive(bool interactive) {
using ::android::hardware::power::V1_0::PowerHint; set_interactive(interactive ? 1:0);
using ::android::hardware::power::V1_0::PowerStatePlatformSleepState;
using ::android::hardware::power::V1_0::Status;
using ::android::hardware::power::V1_1::PowerStateSubsystem;
using ::android::hardware::hidl_vec;
using ::android::hardware::Return;
using ::android::hardware::Void;
Power::Power() {
power_init();
} }
Return<void> Power::setInteractive(bool interactive) { ndk::ScopedAStatus Power::setMode(Mode type, bool enabled) {
set_interactive(interactive ? 1:0); LOG(INFO) << "Power setMode: " << static_cast<int32_t>(type) << " to: " << enabled;
return Void(); switch(type){
case Mode::DOUBLE_TAP_TO_WAKE:
case Mode::LOW_POWER:
case Mode::FIXED_PERFORMANCE:
case Mode::LAUNCH:
case Mode::EXPENSIVE_RENDERING:
case Mode::DEVICE_IDLE:
case Mode::DISPLAY_INACTIVE:
case Mode::AUDIO_STREAMING_LOW_LATENCY:
case Mode::CAMERA_STREAMING_SECURE:
case Mode::CAMERA_STREAMING_LOW:
case Mode::CAMERA_STREAMING_MID:
case Mode::CAMERA_STREAMING_HIGH:
case Mode::VR:
LOG(INFO) << "Mode " << static_cast<int32_t>(type) << "Not Supported";
break;
case Mode::INTERACTIVE:
setInteractive(enabled);
power_hint(POWER_HINT_INTERACTION, NULL);
break;
case Mode::SUSTAINED_PERFORMANCE:
power_hint(POWER_HINT_SUSTAINED_PERFORMANCE, NULL);
break;
}
return ndk::ScopedAStatus::ok();
} }
Return<void> Power::powerHint(PowerHint_1_0 hint, int32_t data) { ndk::ScopedAStatus Power::isModeSupported(Mode type, bool* _aidl_return) {
LOG(INFO) << "Power isModeSupported: " << static_cast<int32_t>(type);
power_hint(static_cast<power_hint_t>(hint), data ? (&data) : NULL); *_aidl_return = false;
return Void(); return ndk::ScopedAStatus::ok();
} }
Return<void> Power::setFeature(Feature feature, bool activate) { ndk::ScopedAStatus Power::setBoost(Boost type, int32_t durationMs) {
return Void(); LOG(INFO) << "Power setBoost: " << static_cast<int32_t>(type)
<< ", duration: " << durationMs;
return ndk::ScopedAStatus::ok();
} }
Return<void> Power::getPlatformLowPowerStats(getPlatformLowPowerStats_cb _hidl_cb) { ndk::ScopedAStatus Power::isBoostSupported(Boost type, bool* _aidl_return) {
LOG(INFO) << "Power isBoostSupported: " << static_cast<int32_t>(type);
hidl_vec<PowerStatePlatformSleepState> states; *_aidl_return = false;
states.resize(0); return ndk::ScopedAStatus::ok();
_hidl_cb(states, Status::SUCCESS);
return Void();
} }
Return<void> Power::getSubsystemLowPowerStats(getSubsystemLowPowerStats_cb _hidl_cb) { } // namespace impl
hidl_vec<PowerStateSubsystem> subsystems;
_hidl_cb(subsystems, Status::SUCCESS);
return Void();
}
Return<void> Power::powerHintAsync(PowerHint_1_0 hint, int32_t data) {
return powerHint(hint, data);
}
Return<void> Power::powerHintAsync_1_2(PowerHint_1_2 hint, int32_t data) {
return powerHint(static_cast<PowerHint_1_0> (hint), data);
}
} // namespace implementation
} // namespace V1_2
} // namespace power } // namespace power
} // namespace hardware } // namespace hardware
} // namespace android } // namespace android
} // namespace aidl

54
Power.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019, The Linux Foundation. All rights reserved. * Copyright (c) 2019,2020 The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@@ -27,48 +27,32 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef ANDROID_HARDWARE_POWER_V1_2_POWER_H #ifndef ANDROID_HARDWARE_POWER_POWER_H
#define ANDROID_HARDWARE_POWER_V1_2_POWER_H #define ANDROID_HARDWARE_POWER_POWER_H
#include <android/hardware/power/1.2/IPower.h> #include <aidl/android/hardware/power/BnPower.h>
#include <hidl/MQDescriptor.h> #include "power-common.h"
#include <hidl/Status.h>
#include <hardware/power.h>
namespace aidl {
namespace android { namespace android {
namespace hardware { namespace hardware {
namespace power { namespace power {
namespace V1_2 { namespace impl {
namespace implementation {
using ::android::hardware::power::V1_0::Feature; class Power : public BnPower {
using PowerHint_1_0 = ::android::hardware::power::V1_0::PowerHint; public:
using PowerHint_1_2 = ::android::hardware::power::V1_2::PowerHint; Power() : BnPower(){
using ::android::hardware::power::V1_2::IPower; power_init();
using ::android::hardware::Return; }
using ::android::hardware::Void; ndk::ScopedAStatus setMode(Mode type, bool enabled) override;
ndk::ScopedAStatus isModeSupported(Mode type, bool* _aidl_return) override;
struct Power : public IPower { ndk::ScopedAStatus setBoost(Boost type, int32_t durationMs) override;
// Methods from ::android::hardware::power::V1_0::IPower follow. ndk::ScopedAStatus isBoostSupported(Boost type, bool* _aidl_return) override;
Power();
Return<void> setInteractive(bool interactive) override;
Return<void> powerHint(PowerHint_1_0 hint, int32_t data) override;
Return<void> setFeature(Feature feature, bool activate) override;
Return<void> getPlatformLowPowerStats(getPlatformLowPowerStats_cb _hidl_cb) override;
// Methods from ::android::hardware::power::V1_1::IPower follow
Return<void> getSubsystemLowPowerStats(getSubsystemLowPowerStats_cb _hidl_cb) override;
Return<void> powerHintAsync(PowerHint_1_0 hint, int32_t data) override;
// Methods from ::android::hardware::power::V1_2::IPower follow
Return<void> powerHintAsync_1_2(PowerHint_1_2 hint, int32_t data) override;
}; };
} // namespace implementation } // namespace impl
} // namespace V1_2
} // namespace power } // namespace power
} // namespace hardware } // namespace hardware
} // namespace android } // namespace android
} // namespace aidl
#endif // ANDROID_HARDWARE_POWER_V1_2_POWER_H #endif // ANDROID_HARDWARE_POWER_POWER_H

4
android.hardware.power-service.rc Normal file
View File

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

4
android.hardware.power@1.2-service.rc
View File

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

60
service.cpp → main.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019, The Linux Foundation. All rights reserved. * Copyright (c) 2020, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@@ -27,55 +27,25 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#define LOG_TAG "android.hardware.power@1.2-service"
#include <android/log.h>
#include <hidl/HidlTransportSupport.h>
#include <hardware/power.h>
#include "Power.h" #include "Power.h"
using android::sp; #include <android-base/logging.h>
using android::status_t; #include <android/binder_manager.h>
using android::OK; #include <android/binder_process.h>
// libhwbinder: using aidl::android::hardware::power::impl::Power;
using android::hardware::configureRpcThreadpool;
using android::hardware::joinRpcThreadpool;
// Generated HIDL files
using android::hardware::power::V1_2::IPower;
using android::hardware::power::V1_2::implementation::Power;
int main() { int main() {
ABinderProcess_setThreadPoolMaxThreadCount(0);
status_t status; std::shared_ptr<Power> vib = ndk::SharedRefBase::make<Power>();
android::sp<IPower> service = nullptr; const std::string instance = std::string() + Power::descriptor + "/default";
LOG(INFO) << "Instance " << instance;
ALOGI("Power HAL Service 1.2 is starting."); binder_status_t status = AServiceManager_addService(vib->asBinder().get(), instance.c_str());
LOG(INFO) << "Status " << status;
service = new Power(); if(status != STATUS_OK){
if (service == nullptr) { LOG(ERROR) << "Could not register" << instance;
ALOGE("Can not create an instance of Power HAL interface.");
goto shutdown;
} }
configureRpcThreadpool(1, true /*callerWillJoin*/); ABinderProcess_joinThreadPool();
return 1; // should not reach
status = service->registerAsService();
if (status != OK) {
ALOGE("Could not register service for Power HAL(%d).", status);
goto shutdown;
}
ALOGI("Power Service is ready");
joinRpcThreadpool();
//Should not pass this line
shutdown:
// In normal operation, we don't expect the thread pool to exit
ALOGE("Power Service is shutting down");
return 1;
} }

4
power-vendor-product.mk
View File

@@ -1,6 +1,6 @@
#Power product definitions #Power product definitions
PRODUCT_PACKAGES += android.hardware.power@1.2-impl PRODUCT_PACKAGES += android.hardware.power-service
PRODUCT_PACKAGES += android.hardware.power@1.2-service PRODUCT_PACKAGES += android.hardware.power-impl
#Powerhint File #Powerhint File
ifeq ($(TARGET_BOARD_PLATFORM),msmnile) ifeq ($(TARGET_BOARD_PLATFORM),msmnile)

6
power.xml Normal file
View File

@@ -0,0 +1,6 @@
<manifest version="1.0" type="device">
<hal format="aidl">
<name>android.hardware.power</name>
<fqname>IPower/default</fqname>
</hal>
</manifest>