diff options
| author | Wei Wang <wvw@google.com> | 2018-12-10 09:46:49 -0800 |
|---|---|---|
| committer | Wei Wang <wvw@google.com> | 2018-12-10 10:41:53 -0800 |
| commit | be9759eb470f87f5bb81ddb93858bb909fb7a182 (patch) | |
| tree | 8322e94f8c0c552c0c88132546506f18a54e31d8 | |
| parent | c6b34d6bfbaf9dc7c926e1c5730392215342ab81 (diff) | |
| download | platform_hardware_interfaces-be9759eb470f87f5bb81ddb93858bb909fb7a182.tar.gz platform_hardware_interfaces-be9759eb470f87f5bb81ddb93858bb909fb7a182.tar.bz2 platform_hardware_interfaces-be9759eb470f87f5bb81ddb93858bb909fb7a182.zip | |
Add NPU type sensor type
Also changed to use new enum#API expression
Bug: 119888807
Test: Build
Change-Id: I4b6a9c867cc2c93c47a21ffce33ce135152e31b0
| -rw-r--r-- | thermal/2.0/Android.bp | 1 | ||||
| -rw-r--r-- | thermal/2.0/types.hal | 14 | ||||
| -rw-r--r-- | thermal/2.0/vts/functional/VtsHalThermalV2_0TargetTest.cpp | 1 |
3 files changed, 7 insertions, 9 deletions
diff --git a/thermal/2.0/Android.bp b/thermal/2.0/Android.bp index 6eb4da0762..c513739e49 100644 --- a/thermal/2.0/Android.bp +++ b/thermal/2.0/Android.bp @@ -22,7 +22,6 @@ hidl_interface { "TemperatureThreshold", "TemperatureType", "ThrottlingSeverity", - "ThrottlingSeverityCount", ], gen_java: true, } diff --git a/thermal/2.0/types.hal b/thermal/2.0/types.hal index a1c0325472..3fc3fdc180 100644 --- a/thermal/2.0/types.hal +++ b/thermal/2.0/types.hal @@ -22,12 +22,14 @@ import android.hardware.thermal@1.0::types; enum TemperatureType : @1.0::TemperatureType { USB_PORT = 4, POWER_AMPLIFIER = 5, - /** - * Battery Charge Limit - virtual thermal sensors - */ + + /** Battery Charge Limit - virtual thermal sensors */ BCL_VOLTAGE = 6, BCL_CURRENT = 7, BCL_PERCENTAGE = 8, + + /** Neural Processing Unit */ + NPU = 9, }; @@ -82,8 +84,6 @@ enum ThrottlingSeverity : uint32_t { SHUTDOWN, }; -enum ThrottlingSeverityCount : uint32_t {NUM_THROTTLING_LEVELS = 7}; - struct TemperatureThreshold { /** * This temperature's type. @@ -103,7 +103,7 @@ struct TemperatureThreshold { * happens when temperature >= threshold. If not available, set to NAN. * Unit is same as Temperature's value. */ - float[ThrottlingSeverityCount:NUM_THROTTLING_LEVELS] hotThrottlingThresholds; + float[ThrottlingSeverity#len] hotThrottlingThresholds; /** * Cold throttling temperature constant for this temperature sensor in @@ -111,7 +111,7 @@ struct TemperatureThreshold { * happens when temperature <= threshold. If not available, set to NAN. * Unit is same as Temperature's value. */ - float[ThrottlingSeverityCount:NUM_THROTTLING_LEVELS] coldThrottlingThresholds; + float[ThrottlingSeverity#len] coldThrottlingThresholds; /** * Threshold temperature above which the VR mode clockrate minimums cannot diff --git a/thermal/2.0/vts/functional/VtsHalThermalV2_0TargetTest.cpp b/thermal/2.0/vts/functional/VtsHalThermalV2_0TargetTest.cpp index cf1956dab3..3893014e20 100644 --- a/thermal/2.0/vts/functional/VtsHalThermalV2_0TargetTest.cpp +++ b/thermal/2.0/vts/functional/VtsHalThermalV2_0TargetTest.cpp @@ -37,7 +37,6 @@ using ::android::hardware::thermal::V2_0::Temperature; using ::android::hardware::thermal::V2_0::TemperatureThreshold; using ::android::hardware::thermal::V2_0::TemperatureType; using ::android::hardware::thermal::V2_0::ThrottlingSeverity; -using ::android::hardware::thermal::V2_0::ThrottlingSeverityCount; constexpr char kCallbackNameNotifyThrottling[] = "notifyThrottling"; static const Temperature kThrottleTemp = { |