aoc: sync aoc-interface headerandroid-u-qpr1-beta-2.2_r0.7android-u-qpr1-beta-2.1_r0.8android-14.0.0_r0.45android-14.0.0_r0.38android-gs-shusky-5.15-u-qpr1-beta2android-gs-shusky-5.15-android14-qpr1-betaandroid-gs-shusky-5.15-android14-qpr1

Bug: 269221858
Change-Id: I4454054a6d559b203539043f1f4dfdfc3f15a29e
Signed-off-by: vincenttew <vincenttew@google.com>

1 files changed, 68 insertions, 3 deletions

diff --git a/aoc-interface-zuma.h b/aoc-interface-zuma.h
index a0952a2..87ffafd 100644
--- a/aoc-interface-zuma.h
+++ b/aoc-interface-zuma.h
@@ -18,7 +18,7 @@
  * Autogenerated AoC interface matching AoC source code
  * associated with the following source code:
  *
- *   hash: 9c8591f8ea2347c8e49c66be8fa1b1a97c0eafe9
+ *   hash: fdcd6ef6ffd092616e0726a2b82d8deafbd903c5
  *
  * DO NOT MODIFY THIS FILE
  *
@@ -263,10 +263,15 @@ enum AOC_COMMAND {
   CMD_AUDIO_INPUT_MIC_RECORD_AP_START_PREPARE_ID = 292, /* [0x0124] ->  struct CMD_HDR */
   CMD_AUDIO_OUTPUT_VOICE_DISABLE_CCA_ON_VOIP_ID = 292, /* [0x0124] ->  struct CMD_HDR */
   CMD_AUDIO_INPUT_MIC_RECORD_AP_START_DATA_ID = 293, /* [0x0125] ->  struct CMD_HDR */
+  CMD_AUDIO_OUTPUT_MEL_STATE_ID = 293, /* [0x0125] ->  struct CMD_AUDIO_OUTPUT_MEL_STATE */
   CMD_AUDIO_INPUT_MIC_MMAP_ENABLE_ID = 294, /* [0x0126] ->  struct CMD_AUDIO_INPUT_AP_INPUT_START */
+  CMD_AUDIO_OUTPUT_MEL_SET_RS2_ID = 294, /* [0x0126] ->  struct CMD_AUDIO_OUTPUT_MEL_RS2 */
   CMD_AUDIO_INPUT_MIC_MMAP_DISABLE_ID = 295, /* [0x0127] ->  struct CMD_HDR */
+  CMD_AUDIO_OUTPUT_MEL_GET_RS2_ID = 295, /* [0x0127] ->  struct CMD_AUDIO_OUTPUT_MEL_RS2 */
   CMD_AUDIO_INPUT_GET_CHRE_GAIN_ID = 296, /* [0x0128] ->  struct CMD_AUDIO_INPUT_GET_CHRE_GAIN */
+  CMD_AUDIO_OUTPUT_MEL_TRIGGER_ID = 296, /* [0x0128] ->  struct CMD_AUDIO_OUTPUT_MEL_TRIGGER */
   CMD_AUDIO_INPUT_SET_CHRE_GAIN_ID = 297, /* [0x0129] ->  struct CMD_AUDIO_INPUT_SET_CHRE_GAIN */
+  CMD_AUDIO_OUTPUT_MEL_GET_VALUE_ID = 297, /* [0x0129] ->  struct CMD_AUDIO_OUTPUT_MEL_GET_VALUE */
   CMD_AUDIO_INPUT_HOTWORD_GET_CLEANER_POST_GAIN_ID = 298, /* [0x012a] ->  struct CMD_AUDIO_INPUT_HOTWORD_GET_CLEANER_POST_GAIN */
   CMD_AUDIO_INPUT_HOTWORD_SET_CLEANER_POST_GAIN_ID = 299, /* [0x012b] ->  struct CMD_AUDIO_INPUT_HOTWORD_SET_CLEANER_POST_GAIN */
   CMD_AUDIO_INPUT_WNR_START_ID = 301, /* [0x012d] ->  struct CMD_HDR */
@@ -1133,6 +1138,8 @@ enum ASP_MODULE_ID {
   ASP_ID_APMG3,
   ASP_ID_POKEBOWL,
   ASP_ID_CTC,
+  ASP_ID_CAF,
+  ASP_ID_MEL,
   ASP_ID_GAIN_DB = 30,
   ASP_ID_VP_MCPS,
   ASP_ID_DRC,
@@ -1153,6 +1160,7 @@ enum AUDIO_BLOCK_ID {
   ABLOCK_BT,
   ABLOCK_MODEM,
   ABLOCK_USB,
+  ABLOCK_CCA,
   AUDIO_BLOCK_ID_END,
 };
 
@@ -1602,7 +1610,8 @@ enum AUDIO_OUTPUT_BT_A2DP_ENC_CODEC {
   AUDIO_OUTPUT_BT_BLE_ENC_CODEC_LC3 = 32,
   AUDIO_OUTPUT_BT_A2DP_ENC_CODEC_OPUS = 64,
   AUDIO_OUTPUT_BT_BLE_DEC_CODEC_LC3 = 2147483650,
-  AUDIO_OUTPUT_BT_BLE_ENC_CODEC_LC3_DYN_CHG = 4026531842,
+  AUDIO_OUTPUT_BT_A2DP_ENC_CODEC_AAC_DYN_CHG = 4026531841,
+  AUDIO_OUTPUT_BT_BLE_ENC_CODEC_LC3_DYN_CHG,
 };
 
 struct AUDIO_OUTPUT_BT_A2DP_ENC_CFG {
@@ -2507,6 +2516,56 @@ struct CMD_AUDIO_INPUT_HOTWORD_GET_BUFFER_TIMESTAMP {
   uint64_t timestamp_ticks;
 } __attribute__((packed));
 
+/**
+ * Structure associated with the following commands:
+ *
+ *   CMD_AUDIO_OUTPUT_MEL_STATE_ID, UUID: 89f53f6d95f7a78c3afebb6775c9bc27
+ */
+struct CMD_AUDIO_OUTPUT_MEL_STATE {
+  struct CMD_HDR parent;
+  uint8_t enable;
+} __attribute__((packed));
+
+/**
+ * Structure associated with the following commands:
+ *
+ *   CMD_AUDIO_OUTPUT_MEL_SET_RS2_ID, UUID: 3ea25e761948837bf715b83912a8c6ba
+ *   CMD_AUDIO_OUTPUT_MEL_GET_RS2_ID, UUID: 120e10d404ffa402dee05fd81086b671
+ */
+struct CMD_AUDIO_OUTPUT_MEL_RS2 {
+  struct CMD_HDR parent;
+  float rs2_value;
+} __attribute__((packed));
+
+/**
+ * Structure associated with the following commands:
+ *
+ *   CMD_AUDIO_OUTPUT_MEL_TRIGGER_ID, UUID: f32ed38b051caa0836f480a6fb1d2366
+ */
+struct CMD_AUDIO_OUTPUT_MEL_TRIGGER {
+  struct CMD_HDR parent;
+  uint64_t timestamp;
+  float mel_value;
+  uint8_t block;
+  uint8_t component;
+} __attribute__((packed));
+
+#define MAX_MEL_VALUE_SIZE (120) /* UUID: fe50b0e773e56fcc9fa7a8d1caa11e82 */
+
+/**
+ * Structure associated with the following commands:
+ *
+ *   CMD_AUDIO_OUTPUT_MEL_GET_VALUE_ID, UUID: 22e2b9f970d44ad413564d599919d13b
+ */
+struct CMD_AUDIO_OUTPUT_MEL_GET_VALUE {
+  struct CMD_HDR parent;
+  uint64_t timestamp;
+  float mel_value[MAX_MEL_VALUE_SIZE];
+  uint32_t count;
+  uint8_t block;
+  uint8_t component;
+} __attribute__((packed));
+
 struct NOTIF_HDR {
   struct CONTAINER_HDR parent;
   uint32_t id;
@@ -2574,7 +2633,7 @@ static inline void AocCmdNoAckHdrSet(struct CMD_HDR * cmd, uint16_t id, uint16_t
 /**
  * Total number of UUID strings to check against the FW image.
  */
-#define AOC_UUID_ENTRIES (272)
+#define AOC_UUID_ENTRIES (278)
 
 /**
  * UUID entry size.
@@ -2613,6 +2672,7 @@ static inline int AocInterfaceCheck(const void * addr, int size) {
       { 0x0e, 0x5f, 0x7c, 0x97, 0xaa, 0x5d, 0xfa, 0x4e, 0x27, 0xae, 0xa3, 0x60, 0x6f, 0xee, 0x68, 0xe4},
       { 0x10, 0xaa, 0x17, 0xf6, 0x01, 0x2e, 0x86, 0x30, 0x9e, 0x2f, 0xd0, 0x59, 0xee, 0x03, 0x25, 0x3a},
       { 0x11, 0x76, 0x82, 0xaf, 0x13, 0x45, 0x5a, 0x3d, 0xe0, 0xf0, 0xf0, 0x1a, 0x02, 0xa3, 0xd4, 0x66},
+      { 0x12, 0x0e, 0x10, 0xd4, 0x04, 0xff, 0xa4, 0x02, 0xde, 0xe0, 0x5f, 0xd8, 0x10, 0x86, 0xb6, 0x71},
       { 0x12, 0x89, 0x2d, 0xad, 0xd9, 0xba, 0x4d, 0x23, 0xea, 0xe4, 0x85, 0xd3, 0xd5, 0x9f, 0xcc, 0xf0},
       { 0x13, 0x27, 0x03, 0xc5, 0x1b, 0xb0, 0x18, 0xbb, 0xf2, 0xc9, 0xa8, 0x70, 0xe8, 0xb9, 0x74, 0xd8},
       { 0x14, 0x40, 0x6b, 0x26, 0x35, 0x21, 0x56, 0xfc, 0x3f, 0xd4, 0x5d, 0xbd, 0x2a, 0xfe, 0x8f, 0x21},
@@ -2634,6 +2694,7 @@ static inline int AocInterfaceCheck(const void * addr, int size) {
       { 0x21, 0xd2, 0x3b, 0x51, 0x10, 0x75, 0x47, 0xec, 0x3a, 0x08, 0x33, 0x80, 0xca, 0xce, 0x82, 0x5e},
       { 0x22, 0x25, 0xe4, 0xb1, 0x79, 0xa5, 0xdf, 0xbc, 0x0a, 0xd4, 0x56, 0xc8, 0x11, 0x04, 0x59, 0x09},
       { 0x22, 0x8b, 0x2b, 0x4c, 0x01, 0xe7, 0xc1, 0x26, 0x65, 0x80, 0x56, 0xa5, 0x96, 0xac, 0x4e, 0x5c},
+      { 0x22, 0xe2, 0xb9, 0xf9, 0x70, 0xd4, 0x4a, 0xd4, 0x13, 0x56, 0x4d, 0x59, 0x99, 0x19, 0xd1, 0x3b},
       { 0x24, 0x9a, 0xda, 0x53, 0xf8, 0xb6, 0xce, 0x22, 0x6b, 0xa9, 0xaa, 0x73, 0xda, 0xbb, 0xf5, 0xe6},
       { 0x25, 0xd1, 0x6d, 0x03, 0x7a, 0x41, 0xa1, 0xf8, 0x54, 0x06, 0xa0, 0x02, 0x90, 0x17, 0xa0, 0x2a},
       { 0x26, 0xbd, 0xe6, 0x3c, 0xaf, 0xfd, 0x54, 0x4e, 0x58, 0x1a, 0x72, 0x93, 0xf1, 0xcf, 0x79, 0x3c},
@@ -2663,6 +2724,7 @@ static inline int AocInterfaceCheck(const void * addr, int size) {
       { 0x3b, 0xfa, 0x87, 0x99, 0x9f, 0xaf, 0x40, 0xdf, 0x0f, 0xee, 0xf2, 0x3d, 0xd9, 0x4c, 0xc5, 0x94},
       { 0x3c, 0x71, 0xe6, 0x4c, 0x26, 0x7c, 0x6e, 0x4a, 0x4e, 0x2e, 0x67, 0x53, 0x5d, 0xe0, 0xb5, 0xbd},
       { 0x3e, 0x8d, 0xad, 0xc9, 0x9d, 0x9d, 0x30, 0xff, 0xd9, 0xca, 0x03, 0x59, 0xb4, 0x81, 0xae, 0xfd},
+      { 0x3e, 0xa2, 0x5e, 0x76, 0x19, 0x48, 0x83, 0x7b, 0xf7, 0x15, 0xb8, 0x39, 0x12, 0xa8, 0xc6, 0xba},
       { 0x3f, 0x7e, 0x21, 0x28, 0x19, 0x4a, 0xbb, 0x2c, 0x20, 0x72, 0xf2, 0xb8, 0x95, 0xfa, 0xd9, 0xf3},
       { 0x40, 0xbd, 0xd5, 0x3e, 0x16, 0x32, 0x96, 0x23, 0x34, 0x59, 0x4c, 0xb1, 0xf0, 0xf9, 0x2d, 0xa5},
       { 0x43, 0xfd, 0x27, 0xea, 0x86, 0xc0, 0xab, 0x09, 0x71, 0xba, 0x99, 0x27, 0x5d, 0xbe, 0xc1, 0x61},
@@ -2727,6 +2789,7 @@ static inline int AocInterfaceCheck(const void * addr, int size) {
       { 0x85, 0x57, 0x57, 0xd7, 0x97, 0x53, 0x30, 0x15, 0xc3, 0x2d, 0x35, 0x2f, 0x66, 0xe0, 0x46, 0x79},
       { 0x85, 0x8d, 0xde, 0x9a, 0xb4, 0xa9, 0x0a, 0x99, 0xfb, 0xb9, 0x8e, 0x0a, 0x99, 0x1a, 0xfa, 0x1f},
       { 0x88, 0xa3, 0x45, 0x93, 0x5c, 0xad, 0x7a, 0x95, 0xcb, 0x30, 0xce, 0xb0, 0x92, 0xd9, 0x48, 0xd3},
+      { 0x89, 0xf5, 0x3f, 0x6d, 0x95, 0xf7, 0xa7, 0x8c, 0x3a, 0xfe, 0xbb, 0x67, 0x75, 0xc9, 0xbc, 0x27},
       { 0x8c, 0x6f, 0x6a, 0xb3, 0x9a, 0xed, 0x0b, 0x4f, 0xc8, 0x98, 0xf4, 0x2a, 0xef, 0x3d, 0x4b, 0xa4},
       { 0x8d, 0x0a, 0x76, 0xb0, 0x19, 0x7e, 0xbe, 0x63, 0x88, 0x03, 0xcc, 0x59, 0x74, 0xc4, 0x9e, 0xce},
       { 0x8d, 0x12, 0x14, 0x21, 0x54, 0x8f, 0x26, 0x5e, 0x4f, 0x29, 0x6a, 0xcb, 0xf3, 0x00, 0xfe, 0x33},
@@ -2845,6 +2908,7 @@ static inline int AocInterfaceCheck(const void * addr, int size) {
       { 0xf0, 0xb6, 0x4e, 0xd4, 0x02, 0x4e, 0x01, 0x98, 0x84, 0xbc, 0x79, 0x7a, 0x3a, 0x4f, 0x18, 0x3d},
       { 0xf0, 0xd0, 0xab, 0x26, 0xcd, 0x62, 0x0a, 0x32, 0xc7, 0xf2, 0x7f, 0x88, 0x62, 0x43, 0x4e, 0x7c},
       { 0xf2, 0x5d, 0xfd, 0xe2, 0xfb, 0x0b, 0xf9, 0x67, 0xc2, 0x67, 0xbe, 0x45, 0xc8, 0x23, 0x2b, 0xb6},
+      { 0xf3, 0x2e, 0xd3, 0x8b, 0x05, 0x1c, 0xaa, 0x08, 0x36, 0xf4, 0x80, 0xa6, 0xfb, 0x1d, 0x23, 0x66},
       { 0xf3, 0x66, 0x28, 0x25, 0xcd, 0x66, 0xdd, 0x6f, 0xf3, 0x64, 0x25, 0xec, 0xcf, 0x6c, 0xe2, 0x3b},
       { 0xf5, 0x49, 0x60, 0x54, 0x47, 0x2a, 0x5b, 0xe7, 0x03, 0xa3, 0x2e, 0x46, 0x20, 0x6c, 0x74, 0xab},
       { 0xf5, 0xe3, 0xd3, 0xb2, 0x11, 0x78, 0x74, 0x4d, 0x12, 0x7e, 0xd7, 0x62, 0x1b, 0xe1, 0x37, 0xd4},
@@ -2863,6 +2927,7 @@ static inline int AocInterfaceCheck(const void * addr, int size) {
       { 0xfd, 0xc9, 0x9d, 0x0d, 0x19, 0xfd, 0xae, 0x73, 0xc0, 0xdd, 0x4f, 0x2a, 0x21, 0xc9, 0x4b, 0xe6},
       { 0xfd, 0xe7, 0x82, 0xe5, 0xf1, 0x43, 0x15, 0x73, 0xbd, 0x86, 0x7d, 0x16, 0x3f, 0xbf, 0x43, 0xa1},
       { 0xfe, 0x23, 0xe6, 0xae, 0xa7, 0xfe, 0x94, 0x1c, 0x7d, 0x37, 0x66, 0x55, 0x32, 0x88, 0xb3, 0x27},
+      { 0xfe, 0x50, 0xb0, 0xe7, 0x73, 0xe5, 0x6f, 0xcc, 0x9f, 0xa7, 0xa8, 0xd1, 0xca, 0xa1, 0x1e, 0x82},
       { 0xff, 0xa1, 0x93, 0x53, 0x44, 0x54, 0x31, 0x28, 0x29, 0x8b, 0x05, 0xf3, 0x1c, 0x2d, 0xb4, 0xfa},
     };
   int start = 0;