summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com>2022-06-05 18:37:37 -0700
committerSecurityBot <android-nexus-securitybot@system.gserviceaccount.com>2022-06-05 18:37:37 -0700
commitea0eac0dede3ee6584a7487131d0992f1051685e (patch)
treed99d11984b16bd711223f020940fd36a6b30babc
parent50a97b618825b101134dfb7bf596f145b6070813 (diff)
parentf54aace77a30bb8b6564ac12b2743be3457a1f8b (diff)
downloadaoc-ea0eac0dede3ee6584a7487131d0992f1051685e.tar.gz
Merge android13-gs-pixel-5.10-gs101-tm into android13-gs-pixel-5.10-gs101-tm-qpr1
SBMerger: 442815275 Change-Id: Ia8664007cd15ebd8f61c579debefdcc48d018e31 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
-rw-r--r--aoc-interface.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/aoc-interface.h b/aoc-interface.h
index bb5e6d1..39caea0 100644
--- a/aoc-interface.h
+++ b/aoc-interface.h
@@ -18,7 +18,7 @@
* Autogenerated AoC interface matching AoC source code
* associated with the following source code:
*
- * hash: ede7b1eb1d4f457fad63edf1f46c242211ec3cf0
+ * hash: 698aaad3abc598971fbc0a9ec967a6afe1c0e91d
*
* DO NOT MODIFY THIS FILE
*
@@ -288,6 +288,8 @@ enum AOC_COMMAND {
CMD_AUDIO_INPUT_MEDIA_COMMANDS_WRITE_MODEL_ID = 334, /* [0x014e] -> struct CMD_AUDIO_INPUT_MEDIA_COMMANDS_WRITE_MODEL */
CMD_AUDIO_INPUT_MEDIA_COMMANDS_LOAD_MODEL_ID = 335, /* [0x014f] -> struct CMD_HDR */
CMD_AUDIO_INPUT_MEDIA_COMMANDS_UNLOAD_MODEL_ID = 336, /* [0x0150] -> struct CMD_HDR */
+ CMD_AUDIO_INPUT_CAPTURE_INJECTION_START_ID = 340, /* [0x0154] -> struct CMD_HDR */
+ CMD_AUDIO_INPUT_CAPTURE_INJECTION_STOP_ID = 341, /* [0x0155] -> struct CMD_HDR */
};
/**
@@ -380,6 +382,8 @@ struct CONTAINER_HDR {
* CMD_AUDIO_INPUT_MEDIA_COMMANDS_STOP_ID, UUID: 410cce288e21fe1ff93043032c00c09a
* CMD_AUDIO_INPUT_MEDIA_COMMANDS_LOAD_MODEL_ID, UUID: 8901499206271379464b5520db355a58
* CMD_AUDIO_INPUT_MEDIA_COMMANDS_UNLOAD_MODEL_ID, UUID: 3c720d5f387a33a62552d630638dbdd1
+ * CMD_AUDIO_INPUT_CAPTURE_INJECTION_START_ID, UUID: d1129af39a0c1baa17e7a318dab310ad
+ * CMD_AUDIO_INPUT_CAPTURE_INJECTION_STOP_ID, UUID: a08b4b576785aeaa5765bd6ed5331c6b
*/
struct CMD_HDR {
struct CONTAINER_HDR parent;
@@ -2357,7 +2361,7 @@ static inline void AocCmdHdrSet(struct CMD_HDR * cmd, uint16_t id, uint16_t leng
/**
* Total number of UUID strings to check against the FW image.
*/
-#define AOC_UUID_ENTRIES (249)
+#define AOC_UUID_ENTRIES (251)
/**
* UUID entry size.
@@ -2545,6 +2549,7 @@ static inline int AocInterfaceCheck(const void * addr, int size) {
{ 0xa0, 0x05, 0x3b, 0xf6, 0xa4, 0x98, 0xc6, 0xe8, 0x34, 0x68, 0xef, 0x77, 0xd5, 0x9c, 0x66, 0x9e},
{ 0xa0, 0x15, 0xe7, 0xf1, 0x0a, 0x66, 0xfd, 0x56, 0x7b, 0x22, 0xb0, 0x18, 0x6c, 0xc2, 0x23, 0xac},
{ 0xa0, 0x6a, 0xac, 0xfb, 0x2c, 0x78, 0x20, 0xdb, 0x5f, 0xe6, 0xe8, 0xb6, 0x4b, 0xa8, 0xd1, 0xe1},
+ { 0xa0, 0x8b, 0x4b, 0x57, 0x67, 0x85, 0xae, 0xaa, 0x57, 0x65, 0xbd, 0x6e, 0xd5, 0x33, 0x1c, 0x6b},
{ 0xa1, 0xab, 0x30, 0x9b, 0x64, 0x2f, 0xe7, 0x63, 0xe3, 0x3e, 0x72, 0x77, 0xca, 0xc5, 0x96, 0xa1},
{ 0xa2, 0x88, 0xd7, 0xad, 0xe0, 0xd6, 0xa8, 0x3f, 0x4c, 0x1a, 0x3c, 0xdc, 0x08, 0x9f, 0x01, 0x75},
{ 0xa2, 0xa1, 0xd1, 0xf5, 0xe0, 0xb7, 0x8f, 0x3a, 0x35, 0x47, 0x02, 0x23, 0x1c, 0xf3, 0x86, 0x4c},
@@ -2583,6 +2588,7 @@ static inline int AocInterfaceCheck(const void * addr, int size) {
{ 0xce, 0xc4, 0xf3, 0xb0, 0x3b, 0xdd, 0x0a, 0x37, 0xf4, 0xc4, 0x35, 0x3e, 0x26, 0xba, 0x25, 0x02},
{ 0xd0, 0x15, 0x77, 0xd8, 0x96, 0xb1, 0xce, 0x3c, 0x54, 0x06, 0xf9, 0x37, 0x68, 0xbb, 0xcc, 0xb4},
{ 0xd0, 0x96, 0x98, 0xe3, 0xa1, 0x8a, 0x70, 0xee, 0x08, 0x98, 0x78, 0x4a, 0xc8, 0x3c, 0x94, 0x61},
+ { 0xd1, 0x12, 0x9a, 0xf3, 0x9a, 0x0c, 0x1b, 0xaa, 0x17, 0xe7, 0xa3, 0x18, 0xda, 0xb3, 0x10, 0xad},
{ 0xd1, 0xc9, 0x58, 0x02, 0x7b, 0x2e, 0xd6, 0xf8, 0xa4, 0xbf, 0xab, 0x4e, 0x29, 0xde, 0xb0, 0x1f},
{ 0xd3, 0x5a, 0xf9, 0x49, 0x3e, 0x8b, 0x73, 0x46, 0xf3, 0x22, 0x65, 0x18, 0x55, 0x96, 0x1d, 0x21},
{ 0xd3, 0xa5, 0x2c, 0xad, 0x71, 0x78, 0x26, 0x91, 0x8f, 0x48, 0x4e, 0xf6, 0x48, 0x74, 0xd1, 0x81},