From 214b356f84da7b67f4d9bcb88874756ec50e2609 Mon Sep 17 00:00:00 2001 From: Nikolaj Schlej Date: Wed, 12 Feb 2025 08:50:50 +0100 Subject: [PATCH] Add AMIC A25LQ64 to internal JEDEC ID database --- UEFITool/uefitool.cpp | 2 +- common/descriptor.cpp | 1 + common/ffsparser.cpp | 7 +++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/UEFITool/uefitool.cpp b/UEFITool/uefitool.cpp index 92caf1c..4c8011d 100644 --- a/UEFITool/uefitool.cpp +++ b/UEFITool/uefitool.cpp @@ -943,7 +943,7 @@ void UEFITool::readSettings() // Set monospace font QString fontName; int fontSize; -#if defined Q_OS_OSX +#if defined Q_OS_MACOS fontName = settings.value("mainWindow/fontName", QString("Menlo")).toString(); fontSize = settings.value("mainWindow/fontSize", 10).toInt(); #elif defined Q_OS_WIN diff --git a/common/descriptor.cpp b/common/descriptor.cpp index c65510f..a6099eb 100644 --- a/common/descriptor.cpp +++ b/common/descriptor.cpp @@ -220,6 +220,7 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1) case 0x373016: return UString("AMIC A25L032"); case 0x374015: return UString("AMIC A25LQ16"); case 0x374016: return UString("AMIC A25LQ32A"); + case 0x374017: return UString("AMIC A25LQ64"); // PMC case 0x9DF713: return UString("PMC Pm25LV080B"); diff --git a/common/ffsparser.cpp b/common/ffsparser.cpp index 4a02d82..46181c1 100644 --- a/common/ffsparser.cpp +++ b/common/ffsparser.cpp @@ -4676,10 +4676,9 @@ make_partition_table_consistent: UModelIndex partitionIndex = model->addItem(localOffset + partitions[i].ptEntry.Offset.Offset, Types::CpdPartition, Subtypes::ManifestCpdPartition, name, UString(), info, header, body, UByteArray(), Fixed, parent); // Parse data as extensions area - // Add the header size as a local offset - // Since the body starts after the - // header length - parseCpdExtensionsArea(partitionIndex, header.size()); + // Add the header size as a local offset + // Since the body starts after the header length + parseCpdExtensionsArea(partitionIndex, (UINT32)header.size()); } } }