commit 9a686366f401d796d1421e5956a33c488f89df0a
author Potin Lai <potin.lai@quantatw.com> Tue Sep 05 09:27:53 2023 +0800
committer Vernon Mauery <vernon.mauery@linux.intel.com> Wed Sep 27 20:50:57 2023 +0000
tree 99b8f38fe2eb736bfe22f607c5ca5921bf9a01d6
parent 7197b347bb0a11d60b1180683c66ae99e6e47030

apphandler: avoid aux version overwriteen by dev_id.json

Aux bytes are supportted get from software version by setting
`matches-map`. If matches-map defines Aux bytes indexes (not 0), then
skip aux bytes assigned from dev_id.json.

Change-Id: I3cc5ca9b6fb19a81a1a0341ee5af5c70156b0976
Signed-off-by: Potin Lai <potin.lai@quantatw.com>

apphandler.cpp

diff --git a/apphandler.cpp b/apphandler.cpp
index c4798e2..c4cdc2b 100644
--- a/apphandler.cpp
+++ b/apphandler.cpp
@@ -673,7 +673,13 @@
                 devId.addnDevSupport = data.value("addn_dev_support", 0);
                 devId.manufId = data.value("manuf_id", 0);
                 devId.prodId = data.value("prod_id", 0);
-                devId.aux = data.value("aux", 0);
+#ifdef GET_DBUS_ACTIVE_SOFTWARE
+                if (!(AUX_0_MATCH_INDEX || AUX_1_MATCH_INDEX ||
+                      AUX_2_MATCH_INDEX || AUX_3_MATCH_INDEX))
+#endif
+                {
+                    devId.aux = data.value("aux", 0);
+                }
 
                 if (data.contains("firmware_revision"))
                 {