Refactor size-related info into addInfoRecursive, now only item-specific info should be supplied to addItem

Author: NikolajSchlej

UEFITool/uefitool.cpp

@@ -348,11 +348,11 @@ void UEFITool::populateUi(const QModelIndex &current)
     // Set info text
     ui->infoEdit->setPlainText(model->info(current));
     enableDock(ui->infoDock, true);
-
+    
     // Set Hex view
     selectedHexView.clearMetadata();
     selectedHexView.setBackground(0, model->header(current).size(),
-        model->markingDarkMode() ? Qt::darkGreen : Qt::green);
+                                  model->markingDarkMode() ? Qt::darkGreen : Qt::green);
     selectedHexView.setData(model->entire(current));
     enableDock(ui->hexViewDock, true);
 
@@ -364,7 +364,7 @@ void UEFITool::populateUi(const QModelIndex &current)
     ui->menuVolumeActions->setEnabled(type == Types::Volume);
     ui->menuFileActions->setEnabled(type == Types::File);
     ui->menuSectionActions->setEnabled(type == Types::Section);
-    ui->menuEntryActions->setEnabled(type == Types::Microcode
+    ui->menuEntryActions->setEnabled(type == Types::IntelMicrocode
                                      || type == Types::SlicData
                                      || type == Types::NvarEntry
                                      || type == Types::VssEntry
@@ -384,6 +384,7 @@ void UEFITool::populateUi(const QModelIndex &current)
                                      || type == Types::CpdExtension
                                      || type == Types::CpdSpiEntry
                                      || type == Types::StartupApDataEntry
+                                     || type == Types::AmdMicrocode
                                      );
     ui->menuStoreActions->setEnabled(type == Types::VssStore
                                      || type == Types::Vss2Store

common/amd_microcode.cpp

@@ -1,17 +1,17 @@
 #include "amd_microcode.h"
 #include "basetypes.h"
 
-UINT32 getDataSizeMicrocodeAmd(const AMD_MICROCODE_HEADER *ucodeHeader) {
+UINT32 amdMicrocodeGetDataSize(const AMD_MICROCODE_HEADER *ucodeHeader) {
     if (ucodeHeader->LoaderID >= 0x8005) {
         return ((ucodeHeader->InitializationFlag << 8) | ucodeHeader->DataSize) * 0x10;
     }
 
     return ucodeHeader->DataSize;
 }
 
-UINT32 getSizeMicrocodeAmd(const AMD_MICROCODE_HEADER *ucodeHeader) {
-    UINT32 microcodeDataLen = getDataSizeMicrocodeAmd(ucodeHeader);
-    UINT32 cpuIdByte = (getCpuIdMicrocodeAmd(ucodeHeader) >> 16) & 0xFF;
+UINT32 amdMicrocodeGetSize(const AMD_MICROCODE_HEADER *ucodeHeader) {
+    UINT32 microcodeDataLen = amdMicrocodeGetDataSize(ucodeHeader);
+    UINT32 cpuIdByte = (amdMicrocodeGetCpuId(ucodeHeader) >> 16) & 0xFF;
     UINT32 microcodeLen = 0;
 
     if (microcodeDataLen == 0x20) {
@@ -41,34 +41,34 @@ UINT32 getSizeMicrocodeAmd(const AMD_MICROCODE_HEADER *ucodeHeader) {
     return microcodeLen;
 }
 
-UINT32 getCpuIdMicrocodeAmd(const AMD_MICROCODE_HEADER *ucodeHeader) {
+UINT32 amdMicrocodeGetCpuId(const AMD_MICROCODE_HEADER *ucodeHeader) {
     return (((ucodeHeader->ProcessorSignature >> 8) & 0xFF) << 16) | (0x0f << 8) |
            (ucodeHeader->ProcessorSignature & 0xff);
 }
 
-UINT16 getYearMicrocodeAmd(const AMD_MICROCODE_HEADER *ucodeHeader) {
-    if (getCpuIdMicrocodeAmd(ucodeHeader) == 0x00800F11 && ucodeHeader->UpdateRevision == 0x8001105 &&
+UINT16 amdMicrocodeGetYear(const AMD_MICROCODE_HEADER *ucodeHeader) {
+    if (amdMicrocodeGetCpuId(ucodeHeader) == 0x00800F11 && ucodeHeader->UpdateRevision == 0x8001105 &&
         ucodeHeader->DateYear == 0x2016) {
         return 0x2017;
     }
 
     return ucodeHeader->DateYear;
 }
 
-UINT8 getMonthMicrocodeAmd(const AMD_MICROCODE_HEADER *ucodeHeader) {
-    if (getCpuIdMicrocodeAmd(ucodeHeader) == 0x00300F10 && ucodeHeader->UpdateRevision == 0x3000027 &&
+UINT8 amdMicrocodeGetMonth(const AMD_MICROCODE_HEADER *ucodeHeader) {
+    if (amdMicrocodeGetCpuId(ucodeHeader) == 0x00300F10 && ucodeHeader->UpdateRevision == 0x3000027 &&
         ucodeHeader->DateMonth == 0x13) {
         return 0x12;
-    } else if (getCpuIdMicrocodeAmd(ucodeHeader) == 0x00730F01 && ucodeHeader->UpdateRevision == 0x7030106 &&
+    } else if (amdMicrocodeGetCpuId(ucodeHeader) == 0x00730F01 && ucodeHeader->UpdateRevision == 0x7030106 &&
                ucodeHeader->DateMonth == 0x09) {
         return 0x02;
     }
 
     return ucodeHeader->DateMonth;
 }
 
-UINT8 getDayMicrocodeAmd(const AMD_MICROCODE_HEADER *ucodeHeader) {
-    if (getCpuIdMicrocodeAmd(ucodeHeader) == 0x00730F01 && ucodeHeader->UpdateRevision == 0x7030106 &&
+UINT8 amdMicrocodeGetDay(const AMD_MICROCODE_HEADER *ucodeHeader) {
+    if (amdMicrocodeGetCpuId(ucodeHeader) == 0x00730F01 && ucodeHeader->UpdateRevision == 0x7030106 &&
         ucodeHeader->DateDay == 0x02) {
         return 0x09;
     }

common/amd_microcode.h

@@ -29,12 +29,12 @@ typedef struct AMD_MICROCODE_HEADER_ {
     UINT8  Reserved_1F;
 } AMD_MICROCODE_HEADER;
 
-UINT32 getDataSizeMicrocodeAmd(const AMD_MICROCODE_HEADER *ucodeHeader);
-UINT32 getSizeMicrocodeAmd(const AMD_MICROCODE_HEADER *ucodeHeader);
-UINT32 getCpuIdMicrocodeAmd(const AMD_MICROCODE_HEADER *ucodeHeader);
-UINT16 getYearMicrocodeAmd(const AMD_MICROCODE_HEADER *ucodeHeader);
-UINT8  getMonthMicrocodeAmd(const AMD_MICROCODE_HEADER *ucodeHeader);
-UINT8  getDayMicrocodeAmd(const AMD_MICROCODE_HEADER *ucodeHeader);
+UINT32 amdMicrocodeGetDataSize(const AMD_MICROCODE_HEADER *ucodeHeader);
+UINT32 amdMicrocodeGetSize(const AMD_MICROCODE_HEADER *ucodeHeader);
+UINT32 amdMicrocodeGetCpuId(const AMD_MICROCODE_HEADER *ucodeHeader);
+UINT16 amdMicrocodeGetYear(const AMD_MICROCODE_HEADER *ucodeHeader);
+UINT8  amdMicrocodeGetMonth(const AMD_MICROCODE_HEADER *ucodeHeader);
+UINT8  amdMicrocodeGetDay(const AMD_MICROCODE_HEADER *ucodeHeader);
 
 #pragma pack(pop)