summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-05-02 19:26:58 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-05-02 19:26:58 +0200
commit780df2aceaf89f0f3c50a3959037495289a36623 (patch)
treeaa444febad4856258f01508bee7469c1e57fe80c
parent6b67e301c12bbac49eb8d8d5fa37895de740378a (diff)
parent35627b0cf253faa03b5f7e3980ae422325cc22f4 (diff)
downloadhardware_libhardware-replicant-6.0.zip
hardware_libhardware-replicant-6.0.tar.gz
hardware_libhardware-replicant-6.0.tar.bz2
Merge branch 'cm-13.0' of https://github.com/LineageOS/android_hardware_libhardware into replicant-6.0HEADreplicant-6.0-0001replicant-6.0
-rw-r--r--include/hardware/audio_effect.h3
-rw-r--r--include/hardware/power.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/include/hardware/audio_effect.h b/include/hardware/audio_effect.h
index 41cd2e6..854f0c1 100644
--- a/include/hardware/audio_effect.h
+++ b/include/hardware/audio_effect.h
@@ -896,6 +896,9 @@ typedef struct effect_param_s {
char data[]; // Start of Parameter + Value data
} effect_param_t;
+// Maximum effect_param_t size
+#define EFFECT_PARAM_SIZE_MAX 65536
+
// structure used by EFFECT_CMD_OFFLOAD command
typedef struct effect_offload_param_s {
bool isOffload; // true if the playback thread the effect is attached to is offloaded
diff --git a/include/hardware/power.h b/include/hardware/power.h
index 2eb98fe..ca15a0b 100644
--- a/include/hardware/power.h
+++ b/include/hardware/power.h
@@ -51,8 +51,7 @@ typedef enum {
POWER_HINT_CPU_BOOST = 0x00000010,
POWER_HINT_LAUNCH_BOOST = 0x00000011,
- POWER_HINT_AUDIO = 0x00000020,
- POWER_HINT_SET_PROFILE = 0x00000030
+ POWER_HINT_SET_PROFILE = 0x00000012
} power_hint_t;