diff --git a/Library/OcAfterBootCompatLib/ServiceOverrides.c b/Library/OcAfterBootCompatLib/ServiceOverrides.c index 9606412db9e..b9f64e82ee9 100644 --- a/Library/OcAfterBootCompatLib/ServiceOverrides.c +++ b/Library/OcAfterBootCompatLib/ServiceOverrides.c @@ -1215,7 +1215,7 @@ OcStartImage ( NULL, NULL ); - DEBUG ((DEBUG_INFO, "OCABC: VMware Mac installed on %p - %r\n", ImageHandle, Status)); +// DEBUG ((DEBUG_INFO, "OCABC: VMware Mac installed on %p - %r\n", ImageHandle, Status)); BootCompat->ServiceState.AppleHibernateWake = OcIsAppleHibernateWake (); BootCompat->ServiceState.AppleCustomSlide = OcCheckArgumentFromEnv ( diff --git a/Library/OcAppleBootPolicyLib/OcAppleBootPolicyLib.c b/Library/OcAppleBootPolicyLib/OcAppleBootPolicyLib.c index f3e0129e742..4dc5b312851 100644 --- a/Library/OcAppleBootPolicyLib/OcAppleBootPolicyLib.c +++ b/Library/OcAppleBootPolicyLib/OcAppleBootPolicyLib.c @@ -199,14 +199,14 @@ InternalGetApfsSpecialFileInfo ( return EFI_NOT_FOUND; } - DEBUG (( - DEBUG_BULK_INFO, - "OCBP: APFS Volume Info - %p (%u, %g, %u)\n", - *VolumeInfo, - (*VolumeInfo)->Always1, - &(*VolumeInfo)->Uuid, - (*VolumeInfo)->Role - )); +// DEBUG (( +// DEBUG_BULK_INFO, +// "OCBP: APFS Volume Info - %p (%u, %g, %u)\n", +// *VolumeInfo, +// (*VolumeInfo)->Always1, +// &(*VolumeInfo)->Uuid, +// (*VolumeInfo)->Role +// )); } if (ContainerInfo != NULL) { @@ -226,13 +226,13 @@ InternalGetApfsSpecialFileInfo ( return EFI_NOT_FOUND; } - DEBUG (( - DEBUG_BULK_INFO, - "OCBP: APFS Container Info - %p (%u, %g)\n", - *ContainerInfo, - (*ContainerInfo)->Always1, - &(*ContainerInfo)->Uuid - )); +// DEBUG (( +// DEBUG_BULK_INFO, +// "OCBP: APFS Container Info - %p (%u, %g)\n", +// *ContainerInfo, +// (*ContainerInfo)->Always1, +// &(*ContainerInfo)->Uuid +// )); } return EFI_SUCCESS; diff --git a/Library/OcAppleEventLib/PointerHandler.c b/Library/OcAppleEventLib/PointerHandler.c index 4566c4bcdc5..ffd29cb9dd6 100644 --- a/Library/OcAppleEventLib/PointerHandler.c +++ b/Library/OcAppleEventLib/PointerHandler.c @@ -243,7 +243,7 @@ InternalRegisterSimplePointerInterface ( SIMPLE_POINTER_INSTANCE *Instance; UINTN Index; - DEBUG ((DEBUG_VERBOSE, "InternalRegisterSimplePointerInterface\n")); +// DEBUG ((DEBUG_VERBOSE, "InternalRegisterSimplePointerInterface\n")); Instance = AllocateZeroPool ( (mNumberOfPointerProtocols + 1) * sizeof (*Instance) @@ -303,7 +303,7 @@ EventSimplePointerDesctructor ( VOID ) { - DEBUG ((DEBUG_VERBOSE, "EventSimplePointerDesctructor\n")); +// DEBUG ((DEBUG_VERBOSE, "EventSimplePointerDesctructor\n")); if (mPointerProtocols != NULL) { FreePool ((VOID *)mPointerProtocols); @@ -333,7 +333,7 @@ InternalRemoveUninstalledInstances ( SIMPLE_POINTER_INSTANCE *NewInstances; UINTN NumberOfMatches; - DEBUG ((DEBUG_VERBOSE, "InternalRemoveUninstalledInstances\n")); +// DEBUG ((DEBUG_VERBOSE, "InternalRemoveUninstalledInstances\n")); OrgInstances = *InstancesPtr; @@ -426,7 +426,7 @@ InternalSimplePointerInstallNotifyFunction ( UINTN Index; EFI_SIMPLE_POINTER_PROTOCOL *SimplePointer; - DEBUG ((DEBUG_VERBOSE, "InternalSimplePointerInstallNotifyFunction\n")); +// DEBUG ((DEBUG_VERBOSE, "InternalSimplePointerInstallNotifyFunction\n")); if (Event != NULL) { Status = gBS->LocateHandleBuffer ( @@ -471,7 +471,7 @@ EventCreateSimplePointerInstallNotifyEvent ( { EFI_STATUS Status; - DEBUG ((DEBUG_VERBOSE, "EventCreateSimplePointerInstallNotifyEvent\n")); +// DEBUG ((DEBUG_VERBOSE, "EventCreateSimplePointerInstallNotifyEvent\n")); Status = gBS->CreateEvent ( EVT_NOTIFY_SIGNAL, @@ -506,7 +506,7 @@ EventCloseSimplePointerInstallNotifyEvent ( VOID ) { - DEBUG ((DEBUG_VERBOSE, "EventCloseSimplePointerInstallNotifyEvent\n")); +// DEBUG ((DEBUG_VERBOSE, "EventCloseSimplePointerInstallNotifyEvent\n")); if (mSimplePointerInstallNotifyEvent != NULL) { gBS->CloseEvent (mSimplePointerInstallNotifyEvent); diff --git a/Library/OcAppleKernelLib/Link.c b/Library/OcAppleKernelLib/Link.c index 414b6625659..62aac12437d 100644 --- a/Library/OcAppleKernelLib/Link.c +++ b/Library/OcAppleKernelLib/Link.c @@ -1762,13 +1762,13 @@ InternalPrelinkKext ( )); return EFI_LOAD_ERROR; } else { - DEBUG (( - DEBUG_VERBOSE, - "OCAK: Symbol %a was resolved for kext %a to %Lx\n", - MachoGetSymbolName (MachoContext, Symbol), - Kext->Identifier, - Context->Is32Bit ? Symbol->Symbol32.Value : Symbol->Symbol64.Value - )); +// DEBUG (( +// DEBUG_VERBOSE, +// "OCAK: Symbol %a was resolved for kext %a to %Lx\n", +// MachoGetSymbolName (MachoContext, Symbol), +// Kext->Identifier, +// Context->Is32Bit ? Symbol->Symbol32.Value : Symbol->Symbol64.Value +// )); } } diff --git a/Library/OcAppleKernelLib/PrelinkedKext.c b/Library/OcAppleKernelLib/PrelinkedKext.c index 01294e6a511..7b56a42113a 100644 --- a/Library/OcAppleKernelLib/PrelinkedKext.c +++ b/Library/OcAppleKernelLib/PrelinkedKext.c @@ -1029,7 +1029,7 @@ InternalScanPrelinkedKext ( continue; } - DEBUG ((DEBUG_VERBOSE, "OCAK: Checking dependency %a for kext %a\n", DependencyId, Kext->Identifier)); +// DEBUG ((DEBUG_VERBOSE, "OCAK: Checking dependency %a for kext %a\n", DependencyId, Kext->Identifier)); // // In 11.0 KPIs just like plist-only kexts are not present in memory and their @@ -1039,7 +1039,7 @@ InternalScanPrelinkedKext ( if ( Context->IsKernelCollection && (AsciiStrnCmp (DependencyId, "com.apple.kpi.", L_STR_LEN ("com.apple.kpi.")) == 0)) { - DEBUG ((DEBUG_VERBOSE, "OCAK: Ignoring KPI %a for kext %a in KC/state mode\n", DependencyId, Kext->Identifier)); +// DEBUG ((DEBUG_VERBOSE, "OCAK: Ignoring KPI %a for kext %a in KC/state mode\n", DependencyId, Kext->Identifier)); continue; } @@ -1049,7 +1049,7 @@ InternalScanPrelinkedKext ( // DependencyKext = InternalCachedPrelinkedKext (Context, DependencyId); if (DependencyKext == NULL) { - DEBUG ((DEBUG_INFO, "OCAK: Dependency %a was not found for kext %a\n", DependencyId, Kext->Identifier)); +// DEBUG ((DEBUG_INFO, "OCAK: Dependency %a was not found for kext %a\n", DependencyId, Kext->Identifier)); DependencyKext = InternalGetQuirkDependencyKext (DependencyId, Context); if (DependencyKext == NULL) { diff --git a/Library/OcCpuLib/OcCpuLib.c b/Library/OcCpuLib/OcCpuLib.c index acbcbc2989b..d0246d74ed9 100644 --- a/Library/OcCpuLib/OcCpuLib.c +++ b/Library/OcCpuLib/OcCpuLib.c @@ -1290,7 +1290,7 @@ OcCpuCorrectTscSync ( BOOLEAN InterruptState; if (Cpu->ThreadCount <= 1) { - DEBUG ((DEBUG_INFO, "OCCPU: Thread count is too low for sync - %u\n", Cpu->ThreadCount)); + DEBUG ((DEBUG_ERROR, "OCCPU: Thread count is too low for sync - %u\n", Cpu->ThreadCount)); return EFI_UNSUPPORTED; } @@ -1309,7 +1309,7 @@ OcCpuCorrectTscSync ( ); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_INFO, "OCCPU: Failed to find mp services - %r\n", Status)); + DEBUG ((DEBUG_ERROR, "OCCPU: Failed to find mp services - %r\n", Status)); return Status; } } @@ -1343,7 +1343,7 @@ OcCpuCorrectTscSync ( SetInterruptState (InterruptState); gBS->RestoreTPL (OldTpl); - DEBUG ((DEBUG_INFO, "OCCPU: Completed TSC sync with code - %r\n", Status)); + DEBUG ((DEBUG_ERROR, "OCCPU: Completed TSC sync with code - %r\n", Status)); return Status; } diff --git a/Library/OcDeviceMiscLib/SetResizableBar.c b/Library/OcDeviceMiscLib/SetResizableBar.c index f95da1533e8..b018ee7731f 100644 --- a/Library/OcDeviceMiscLib/SetResizableBar.c +++ b/Library/OcDeviceMiscLib/SetResizableBar.c @@ -660,7 +660,7 @@ ResizeGpuBarsPciIo ( continue; } - DEBUG ((DEBUG_VERBOSE, "OCDM: PCI device %u/%u has class %X\n", Index+1, HandleCount, ClassCode)); +// DEBUG ((DEBUG_VERBOSE, "OCDM: PCI device %u/%u has class %X\n", Index+1, HandleCount, ClassCode)); if (ClassCode.BaseCode != PCI_CLASS_DISPLAY) { continue; diff --git a/Library/OcMachoLib/HeaderX.h b/Library/OcMachoLib/HeaderX.h index e6e2f229f21..c9eb4534ba3 100644 --- a/Library/OcMachoLib/HeaderX.h +++ b/Library/OcMachoLib/HeaderX.h @@ -371,13 +371,13 @@ MACH_X ( return 0; } - DEBUG (( - DEBUG_VERBOSE, - "OCMCO: Src segment offset 0x%X size 0x%X delta 0x%X\n", - Segment->FileOffset, - Segment->FileSize, - CurrentDelta - )); +// DEBUG (( +// DEBUG_VERBOSE, +// "OCMCO: Src segment offset 0x%X size 0x%X delta 0x%X\n", +// Segment->FileOffset, +// Segment->FileSize, +// CurrentDelta +// )); // // Align delta by x86 page size, this is what our lib expects. @@ -459,13 +459,13 @@ MACH_X ( SegmentOffset = DstSegment->FileOffset + CurrentDelta; - DEBUG (( - DEBUG_VERBOSE, - "OCMCO: Dst segment offset 0x%X size 0x%X delta 0x%X\n", - SegmentOffset, - DstSegment->Size, - CurrentDelta - )); +// DEBUG (( +// DEBUG_VERBOSE, +// "OCMCO: Dst segment offset 0x%X size 0x%X delta 0x%X\n", +// SegmentOffset, +// DstSegment->Size, +// CurrentDelta +// )); if (!IsObject && (DstSegment->VirtualAddress - SegmentOffset != FirstSegment->VirtualAddress)) { return 0; @@ -552,14 +552,14 @@ MACH_X ( for (Index = 0; Index < DstSegment->NumSections; ++Index) { SectionOffset = DstSegment->Sections[Index].Offset; - DEBUG (( - DEBUG_VERBOSE, - "OCMCO: Src section %u offset 0x%X size 0x%X delta 0x%X\n", - Index, - SectionOffset, - DstSegment->Sections[Index].Size, - CurrentDelta - )); + // DEBUG (( + // DEBUG_VERBOSE, + // "OCMCO: Src section %u offset 0x%X size 0x%X delta 0x%X\n", + // Index, + // SectionOffset, + // DstSegment->Sections[Index].Size, + // CurrentDelta + // )); // // Allocate space for zero offset sections. @@ -574,14 +574,14 @@ MACH_X ( CopyFileOffset = SectionOffset + DstSegment->Sections[Index].Size; } - DEBUG (( - DEBUG_VERBOSE, - "OCMCO: Dst section %u offset 0x%X size 0x%X delta 0x%X\n", - Index, - SectionOffset, - DstSegment->Sections[Index].Size, - CurrentDelta - )); +// DEBUG (( +// DEBUG_VERBOSE, +// "OCMCO: Dst section %u offset 0x%X size 0x%X delta 0x%X\n", +// Index, +// SectionOffset, +// DstSegment->Sections[Index].Size, +// CurrentDelta +// )); if (!CalculateSizeOnly) { DstSegment->Sections[Index].Offset = SectionOffset; @@ -617,14 +617,14 @@ MACH_X ( SectionOffset = DstSegment->Sections[Index].RelocationsOffset; if (SectionOffset != 0) { - DEBUG (( - DEBUG_VERBOSE, - "OCMCO: Src section %u relocs offset 0x%X count %u delta 0x%X\n", - Index, - SectionOffset, - DstSegment->Sections[Index].NumRelocations, - CurrentDelta - )); +// DEBUG (( +// DEBUG_VERBOSE, +// "OCMCO: Src section %u relocs offset 0x%X count %u delta 0x%X\n", +// Index, +// SectionOffset, +// DstSegment->Sections[Index].NumRelocations, +// CurrentDelta +// )); CopyFileOffset = SectionOffset; RelocationsSize = DstSegment->Sections[Index].NumRelocations * sizeof (MACH_RELOCATION_INFO); @@ -639,14 +639,14 @@ MACH_X ( SectionOffset += CurrentDelta; - DEBUG (( - DEBUG_VERBOSE, - "OCMCO: Dst section %u relocs offset 0x%X count %u delta 0x%X\n", - Index, - SectionOffset, - DstSegment->Sections[Index].NumRelocations, - CurrentDelta - )); +// DEBUG (( +// DEBUG_VERBOSE, +// "OCMCO: Dst section %u relocs offset 0x%X count %u delta 0x%X\n", +// Index, +// SectionOffset, +// DstSegment->Sections[Index].NumRelocations, +// CurrentDelta +// )); if (!CalculateSizeOnly) { DstSegment->Sections[Index].RelocationsOffset = SectionOffset; @@ -670,15 +670,15 @@ MACH_X ( SymbolsOffset = Symtab->SymbolsOffset; StringsOffset = Symtab->StringsOffset; - DEBUG (( - DEBUG_VERBOSE, - "OCMCO: Src symtab 0x%X (%u symbols), strings 0x%X (size 0x%X) delta 0x%X\n", - SymbolsOffset, - Symtab->NumSymbols, - StringsOffset, - Symtab->StringsSize, - CurrentDelta - )); +// DEBUG (( +// DEBUG_VERBOSE, +// "OCMCO: Src symtab 0x%X (%u symbols), strings 0x%X (size 0x%X) delta 0x%X\n", +// SymbolsOffset, +// Symtab->NumSymbols, +// StringsOffset, +// Symtab->StringsSize, +// CurrentDelta +// )); if (!CalculateSizeOnly) { Symtab = (MACH_SYMTAB_COMMAND *)((UINT8 *)Symtab - Source + Destination); @@ -726,15 +726,15 @@ MACH_X ( } } - DEBUG (( - DEBUG_VERBOSE, - "OCMCO: Dst symtab 0x%X (%u symbols), strings 0x%X (size 0x%X) delta 0x%X\n", - SymbolsOffset, - Symtab->NumSymbols, - StringsOffset, - Symtab->StringsSize, - CurrentDelta - )); +// DEBUG (( +// DEBUG_VERBOSE, +// "OCMCO: Dst symtab 0x%X (%u symbols), strings 0x%X (size 0x%X) delta 0x%X\n", +// SymbolsOffset, +// Symtab->NumSymbols, +// StringsOffset, +// Symtab->StringsSize, +// CurrentDelta +// )); } } diff --git a/Library/OcMainLib/OpenCoreAcpi.c b/Library/OcMainLib/OpenCoreAcpi.c index c1e5d244970..697b5846814 100644 --- a/Library/OcMainLib/OpenCoreAcpi.c +++ b/Library/OcMainLib/OpenCoreAcpi.c @@ -48,6 +48,8 @@ OcAcpiAddTables ( continue; } + DEBUG ((DEBUG_INFO, "OC: add ACPI %a\n", TablePath)); + Status = OcUnicodeSafeSPrint (FullPath, sizeof (FullPath), OPEN_CORE_ACPI_PATH "%a", TablePath); if (EFI_ERROR (Status)) { DEBUG (( @@ -147,8 +149,10 @@ OcAcpiPatchTables ( UserPatch = Config->Acpi.Patch.Values[Index]; if (!UserPatch->Enabled) { + DEBUG ((DEBUG_INFO, "OC: Skipping disabled patch ACPI %a\n", OC_BLOB_GET(&Config->Acpi.Patch.Values[Index]->Comment))); continue; } + DEBUG ((DEBUG_INFO, "OC: Apply patch ACPI %a\n", OC_BLOB_GET(&Config->Acpi.Patch.Values[Index]->Comment))); Comment = OC_BLOB_GET (&UserPatch->Comment); diff --git a/Library/OcMainLib/OpenCoreKernelPatch.c b/Library/OcMainLib/OpenCoreKernelPatch.c index a8cfe183bc0..c8149578180 100644 --- a/Library/OcMainLib/OpenCoreKernelPatch.c +++ b/Library/OcMainLib/OpenCoreKernelPatch.c @@ -317,6 +317,14 @@ OcKernelApplyPatches ( )); continue; } + + DEBUG (( + DEBUG_INFO, + "OC: %a patch [%u] %a\n", + PRINT_KERNEL_CACHE_TYPE (CacheType), + Index, + AsciiStrLen(Comment) > 0 ? Comment : "no label" + )); // // Ignore patch if: diff --git a/Library/OcSerializeLib/OcSerializeLib.c b/Library/OcSerializeLib/OcSerializeLib.c index 7c25e28c12c..b618c3e5241 100644 --- a/Library/OcSerializeLib/OcSerializeLib.c +++ b/Library/OcSerializeLib/OcSerializeLib.c @@ -134,7 +134,7 @@ ParseSerializedDict ( continue; } - DEBUG ((DEBUG_VERBOSE, "OCS: Parsing serialized at %a at %u index!\n", CurrentKey, Index)); + //DEBUG ((DEBUG_VERBOSE, "OCS: Parsing serialized at %a at %u index!\n", CurrentKey, Index)); // // We do not protect from duplicating serialized entries. @@ -192,12 +192,12 @@ ParseSerializedDict ( } if (Index2 == DictSize) { - DEBUG (( - DEBUG_WARN, - "OCS: Missing key %a, context <%a>!\n", - Info->Dict.Schema[Index].Name, - Context - )); +// DEBUG (( +// DEBUG_WARN, +// "OCS: Missing key %a, context <%a>!\n", +// Info->Dict.Schema[Index].Name, +// Context +// )); if (ErrorCount != NULL) { ++*ErrorCount; } @@ -448,7 +448,7 @@ ParseSerializedArray ( for (Index = 0; Index < ArraySize; Index++) { ChildNode = PlistNodeCast (XmlNodeChild (Node, Index), Info->List.Schema->Type); - DEBUG ((DEBUG_VERBOSE, "OCS: Processing array %u/%u element\n", Index + 1, ArraySize)); +// DEBUG ((DEBUG_VERBOSE, "OCS: Processing array %u/%u element\n", Index + 1, ArraySize)); if (ChildNode == NULL) { DEBUG ((DEBUG_INFO, "OCS: Couldn't get array serialized at %u index!\n", Index)); diff --git a/Library/OcTemplateLib/OcTemplateLib.c b/Library/OcTemplateLib/OcTemplateLib.c index 02eaaf41d89..139a8273673 100644 --- a/Library/OcTemplateLib/OcTemplateLib.c +++ b/Library/OcTemplateLib/OcTemplateLib.c @@ -146,15 +146,15 @@ OcBlobAllocate ( Blob = (PRIV_OC_BLOB *)Pointer; - DEBUG (( - DEBUG_VERBOSE, - "OCTPL: Allocating %u bytes in blob %p with size %u/%u curr %p\n", - Size, - Blob, - Blob->Size, - Blob->MaxSize, - Blob->DynValue - )); +// DEBUG (( +// DEBUG_VERBOSE, +// "OCTPL: Allocating %u bytes in blob %p with size %u/%u curr %p\n", +// Size, +// Blob, +// Blob->Size, +// Blob->MaxSize, +// Blob->DynValue +// )); // // We fit into static space diff --git a/Library/OcVirtualFsLib/VirtualFile.c b/Library/OcVirtualFsLib/VirtualFile.c index f46f9828248..15c631a5285 100644 --- a/Library/OcVirtualFsLib/VirtualFile.c +++ b/Library/OcVirtualFsLib/VirtualFile.c @@ -379,17 +379,17 @@ VirtualFileGetInfo ( Buffer ); - DEBUG (( - DEBUG_VERBOSE, - "Getting file info %g with now BufferSize %u mode gave - %r\n", - InformationType, - (UINT32)*BufferSize, - Status - )); - - if (!EFI_ERROR (Status) && CompareGuid (InformationType, &gEfiFileInfoGuid)) { - DEBUG ((DEBUG_VERBOSE, "Got file size %u\n", (UINT32)((EFI_FILE_INFO *)Buffer)->FileSize)); - } +// DEBUG (( +// DEBUG_VERBOSE, +// "Getting file info %g with now BufferSize %u mode gave - %r\n", +// InformationType, +// (UINT32)*BufferSize, +// Status +// )); + +// if (!EFI_ERROR (Status) && CompareGuid (InformationType, &gEfiFileInfoGuid)) { +// DEBUG ((DEBUG_VERBOSE, "Got file size %u\n", (UINT32)((EFI_FILE_INFO *)Buffer)->FileSize)); +// } return Status; }