npdmtool: be friendlier about disable das field

SciresM · fincs · commit 72b9e5cc857d · 2020-12-02T02:55:22.000+01:00
diff --git a/src/npdmtool.c b/src/npdmtool.c
@@ -362,12 +362,10 @@ int CreateNpdm(const char *json, void **dst, u32 *dst_size) {
     }
     header.MmuFlags |= is_64_bit;
 
-    int disable_device_address_space_merge;
-    if (!cJSON_GetBoolean(npdm_json, "disable_device_address_space_merge", &disable_device_address_space_merge)) {
-        status = 0;
-        goto NPDM_BUILD_END;
+    int disable_device_address_space_merge; // optional
+    if (cJSON_GetBoolean(npdm_json, "disable_device_address_space_merge", &disable_device_address_space_merge)) {
+        header.MmuFlags |= ((disable_device_address_space_merge & 1) << 5);
     }
-    header.MmuFlags |= ((disable_device_address_space_merge & 1) << 5);
 
     /* ACID. */
     memset(acid->Signature, 0, sizeof(acid->Signature));

Original file line number	Diff line number	Diff line change
`@@ -362,12 +362,10 @@ int CreateNpdm(const char json, void dst, u32 dst_size) {`
`362`	`362`	`}`
`363`	`363`	`header.MmuFlags \|= is_64_bit;`
`364`	`364`
`365`		`- int disable_device_address_space_merge;`
`366`		`- if (!cJSON_GetBoolean(npdm_json, "disable_device_address_space_merge", &disable_device_address_space_merge)) {`
`367`		`- status = 0;`
`368`		`- goto NPDM_BUILD_END;`
	`365`	`+ int disable_device_address_space_merge; // optional`
	`366`	`+ if (cJSON_GetBoolean(npdm_json, "disable_device_address_space_merge", &disable_device_address_space_merge)) {`
	`367`	`+ header.MmuFlags \|= ((disable_device_address_space_merge & 1) << 5);`
`369`	`368`	`}`
`370`		`- header.MmuFlags \|= ((disable_device_address_space_merge & 1) << 5);`
`371`	`369`
`372`	`370`	`/* ACID. */`
`373`	`371`	`memset(acid->Signature, 0, sizeof(acid->Signature));`