From fbf6afdfc8ddc780a358ff40a35aeff88d039c92 Mon Sep 17 00:00:00 2001 From: Nikolaj Schlej Date: Mon, 10 Mar 2025 16:51:34 +0700 Subject: [PATCH] Expand Type column of the report to fit new FlashDeviceMap store and entry types --- common/ffsreport.cpp | 4 ++-- common/nvram.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/common/ffsreport.cpp b/common/ffsreport.cpp index 0954185..901fe35 100644 --- a/common/ffsreport.cpp +++ b/common/ffsreport.cpp @@ -33,7 +33,7 @@ std::vector FfsReport::generate() } // Generate report recursive - report.push_back(UString(" Type | Subtype | Base | Size | CRC32 | Name ")); + report.push_back(UString(" Type | Subtype | Base | Size | CRC32 | Name ")); USTATUS result = generateRecursive(report, root); if (result) { report.push_back(usprintf("%s: generateRecursive returned ", __FUNCTION__) + errorCodeToUString(result)); @@ -59,7 +59,7 @@ USTATUS FfsReport::generateRecursive(std::vector & report, const UModel } report.push_back( - UString(" ") + itemTypeToUString(model->type(index)).leftJustified(16) + UString(" ") + itemTypeToUString(model->type(index)).leftJustified(20) + UString("| ") + itemSubtypeToUString(model->type(index), model->subtype(index)).leftJustified(22) + offset + usprintf("| %08X | %08X | ", (UINT32)data.size(), crc) diff --git a/common/nvram.h b/common/nvram.h index c7ff85d..d3a98c4 100755 --- a/common/nvram.h +++ b/common/nvram.h @@ -70,7 +70,6 @@ extern const UByteArray NVRAM_ADDITIONAL_STORE_VOLUME_GUID; // 00504624-8A59-4EE #define NVRAM_VSS_STORE_SIGNATURE 0x53535624 // $VSS #define NVRAM_APPLE_SVS_STORE_SIGNATURE 0x53565324 // $SVS #define NVRAM_APPLE_NSS_STORE_SIGNATURE 0x53534E24 // $NSS -#define NVRAM_VSS_VARIABLE_START_ID 0x55AA // Variable store header flags #define NVRAM_VSS_VARIABLE_STORE_FORMATTED 0x5a