m1n1.adt: Fix the weird DAPF variant parsing

Looks like there is a flag bit for this...

Signed-off-by: Hector Martin <[email protected]>

Author: marcan

proxyclient/m1n1/adt.py

@@ -216,8 +216,20 @@
     "r0h" / Hex(Int8ul),
     "r0l" / Hex(Int8ul),
     "unk4" / Hex(Int8ul),
-    # ???
-    "pad" / If(this.r20 == 0x20, Hex(Int32ul)),
+)
+
+DAPFT8110B = Struct(
+    "start" / Hex(Int64ul),
+    "end" / Hex(Int64ul),
+    "r20" / Hex(Int32ul),
+    "unk1" / Hex(Int32ul),
+    "r4" / Hex(Int32ul),
+    "unk2" / Array(5, Hex(Int32ul)),
+    "unk3" / Hex(Int8ul),
+    "r0h" / Hex(Int8ul),
+    "r0l" / Hex(Int8ul),
+    "unk4" / Hex(Int8ul),
+    "pad" / Hex(Int32ul),
 )
 
 DEV_PROPERTIES = {
@@ -317,11 +329,6 @@
             "apcie-*-tunables": GreedyRange(TunableLocal),
         }
     },
-    "dart*": {
-        "*": {
-            "dapf-instance-*": GreedyRange(DAPFT8110),
-        }
-    },
 }
 
 def parse_prop(node, path, node_name, name, v, is_template=False):
@@ -399,6 +406,16 @@ def parse_prop(node, path, node_name, name, v, is_template=False):
         st = Hex(Int64ul) if sc == 2 else Array(sc, Hex(Int32ul))
         t = SafeGreedyRange(Struct("bus_addr" / at, "parent_addr" / pat, "size" / st))
 
+    elif name.startswith("dapf-instance-"):
+        try:
+            flags = node.dart_options
+        except AttributeError:
+            return None, v
+        if flags & 0x40:
+            t = GreedyRange(DAPFT8110B)
+        else:
+            t = GreedyRange(DAPFT8110)
+
     elif name == "interrupts":
         # parse "interrupts" as Array of Int32ul, wrong for nodes whose
         # "interrupt-parent" has "interrupt-cells" = 2