Set debug print level to 0x80400042. Move some really verbose message to

level DEBUG_VERBOSE*2.
CloverHackyColor · Jan 15, 2024 · c7d13f3 · c7d13f3
1 parent 1feeaa7
commit c7d13f3
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 27 deletions.
diff --git a/Include/Acidanthera/Library/OcAppleKeyMapLib.h b/Include/Acidanthera/Library/OcAppleKeyMapLib.h
@@ -12,7 +12,7 @@
 #include <Library/DebugLib.h>
 
 #if !defined (OC_TRACE_UPDOWNKEYS)
-#define OC_TRACE_UPDOWNKEYS  DEBUG_VERBOSE
+#define OC_TRACE_UPDOWNKEYS  0
 #endif
 
 /**

diff --git a/Include/Acidanthera/Library/OcTypingLib.h b/Include/Acidanthera/Library/OcTypingLib.h
@@ -11,7 +11,7 @@
 #include <Library/DebugLib.h>
 
 #if !defined (OC_TRACE_TYPING)
-#define OC_TRACE_TYPING  DEBUG_VERBOSE
+#define OC_TRACE_TYPING  0
 #endif
 
 //

diff --git a/Library/OcAppleEventLib/AppleKeyMap.c b/Library/OcAppleEventLib/AppleKeyMap.c
@@ -503,7 +503,7 @@ EventInputKeyFromAppleKeyCode (
   UINTN                 Index;
   APPLE_KEY_DESCRIPTOR  *Key;
 
-  DEBUG ((DEBUG_VERBOSE, "EventInputKeyFromAppleKeyCode\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "EventInputKeyFromAppleKeyCode\n"));
 
   Key = &mAppleKeyMap[0];
 

diff --git a/Library/OcAppleEventLib/EventQueue.c b/Library/OcAppleEventLib/EventQueue.c
@@ -86,7 +86,7 @@ InternalQueueEventNotifyFunction (
   LIST_ENTRY         *EventQueueEntry;
   APPLE_EVENT_QUEUE  *EventQueue;
 
-  DEBUG ((DEBUG_VERBOSE, "InternalQueueEventNotifyFunction\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "InternalQueueEventNotifyFunction\n"));
 
   if (mQueueEventCreated) {
     do {
@@ -157,7 +157,7 @@ EventCreateAppleEventQueueInfo (
   APPLE_EVENT_INFORMATION  *QueueInfo;
   EFI_TIME                 CreationTime;
 
-  DEBUG ((DEBUG_VERBOSE, "EventCreateAppleEventQueueInfo\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "EventCreateAppleEventQueueInfo\n"));
 
   QueueInfo = AllocateZeroPool (sizeof (*QueueInfo));
 
@@ -198,7 +198,7 @@ EventAddEventToQueue (
   EFI_STATUS         Status;
   APPLE_EVENT_QUEUE  *EventQueue;
 
-  DEBUG ((DEBUG_VERBOSE, "EventAddEventToQueue\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "EventAddEventToQueue\n"));
 
   if (mQueueEventCreated) {
     do {
@@ -232,7 +232,7 @@ EventCreateEventQueue (
   EFI_STATUS               Status;
   APPLE_EVENT_INFORMATION  *Information;
 
-  DEBUG ((DEBUG_VERBOSE, "EventCreateEventQueue\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "EventCreateEventQueue\n"));
 
   Status = EFI_INVALID_PARAMETER;
 

diff --git a/Library/OcAppleEventLib/KeyHandler.c b/Library/OcAppleEventLib/KeyHandler.c
@@ -186,7 +186,7 @@ InternalGetModifierStrokes (
   UINTN               NumberOfKeyCodes;
   APPLE_KEY_CODE      *KeyCodes;
 
-  DEBUG ((DEBUG_VERBOSE, "InternalGetModifierStrokes\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "InternalGetModifierStrokes\n"));
 
   Status = InternalGetAppleKeyStrokes (
              &Modifiers,
@@ -217,7 +217,7 @@ InternalAppleKeyEventDataFromInputKey (
   EFI_STATUS            Status;
   APPLE_KEY_EVENT_DATA  *KeyEventData;
 
-  DEBUG ((DEBUG_VERBOSE, "InternalAppleKeyEventDataFromInputKey\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "InternalAppleKeyEventDataFromInputKey\n"));
 
   Status = EFI_INVALID_PARAMETER;
 
@@ -259,7 +259,7 @@ InternalGetAndRemoveReleasedKeys (
   APPLE_KEY_CODE  ReleasedKeysBuffer[12];
   UINTN           ReleasedKeysSize;
 
-  DEBUG ((DEBUG_VERBOSE, "InternalGetAndRemoveReleasedKeys\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "InternalGetAndRemoveReleasedKeys\n"));
 
   NumberOfReleasedKeys = 0;
 
@@ -335,7 +335,7 @@ InternalIsCLockOn (
   UINTN                   Index2;
   KEY_STROKE_INFORMATION  *KeyInfo;
 
-  DEBUG ((DEBUG_VERBOSE, "InternalIsCLockOn\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "InternalIsCLockOn\n"));
 
   //
   // Check against invalid usage
@@ -383,7 +383,7 @@ InternalGetCurrentStroke (
   KEY_STROKE_INFORMATION  *KeyInfo;
   UINTN                   Index;
 
-  DEBUG ((DEBUG_VERBOSE, "InternalGetCurrentStroke\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "InternalGetCurrentStroke\n"));
 
   KeyInfo = NULL;
 
@@ -421,7 +421,7 @@ InternalGetCurrentKeyStroke (
   BOOLEAN                 AcceptStroke;
   BOOLEAN                 Shifted;
 
-  DEBUG ((DEBUG_VERBOSE, "InternalGetCurrentKeyStroke\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "InternalGetCurrentKeyStroke\n"));
 
   if (mModifiers != Modifiers) {
     for (Index = 0; Index < ARRAY_SIZE (mKeyStrokeInfo); ++Index) {
@@ -586,7 +586,7 @@ InternalAppleEventDataFromCurrentKeyStroke (
   EFI_CONSOLE_CONTROL_SCREEN_MODE  Mode;
   UINTN                            Index;
 
-  DEBUG ((DEBUG_VERBOSE, "InternalAppleEventDataFromCurrentKeyStroke\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "InternalAppleEventDataFromCurrentKeyStroke\n"));
 
   ZeroMem (&InputKey, sizeof (InputKey));
 
@@ -675,7 +675,7 @@ InternalKeyStrokePollNotifyFunction (
   APPLE_MODIFIER_MAP  Modifiers;
   APPLE_MODIFIER_MAP  PartialModifers;
 
-  DEBUG ((DEBUG_VERBOSE, "InternalKeyStrokePollNotifyFunction\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "InternalKeyStrokePollNotifyFunction\n"));
 
   EventData.KeyData = NULL;
   Modifiers         = 0;

diff --git a/Library/OcAppleEventLib/OcAppleEventLib.c b/Library/OcAppleEventLib/OcAppleEventLib.c
@@ -183,7 +183,7 @@ InternalFlagAllEventsReady (
   LIST_ENTRY                  *EventHandleEntry;
   APPLE_EVENT_HANDLE_PRIVATE  *EventHandle;
 
-  DEBUG ((DEBUG_VERBOSE, "InternalFlagAllEventsReady\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "InternalFlagAllEventsReady\n"));
 
   EventHandleEntry = GetFirstNode (&mEventHandles);
 
@@ -209,7 +209,7 @@ InternalSignalEvents (
   LIST_ENTRY                  *EventHandleEntry;
   APPLE_EVENT_HANDLE_PRIVATE  *EventHandle;
 
-  DEBUG ((DEBUG_VERBOSE, "InternalSignalEvents\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "InternalSignalEvents\n"));
 
   EventHandleEntry = GetFirstNode (&mEventHandles);
 
@@ -244,7 +244,7 @@ InternalRemoveUnregisteredEvents (
   LIST_ENTRY                  *NextEventHandleEntry;
   APPLE_EVENT_HANDLE_PRIVATE  *EventHandle;
 
-  DEBUG ((DEBUG_VERBOSE, "InternalRemoveUnregisteredEvents\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "InternalRemoveUnregisteredEvents\n"));
 
   EventHandleEntry = GetFirstNode (&mEventHandles);
 

diff --git a/Library/OcAppleEventLib/PointerHandler.c b/Library/OcAppleEventLib/PointerHandler.c
@@ -613,7 +613,7 @@ InternalGetUiScaleData (
   INTN   Value;
   INT64  Factor;
 
-  DEBUG ((DEBUG_VERBOSE, "InternalGetUiScaleData\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "InternalGetUiScaleData\n"));
 
   AbsoluteValue = ABS (Movement);
   Value         = HighBitSet64 ((UINT64)(AbsoluteValue));
@@ -676,7 +676,7 @@ InternalHandleButtonInteraction (
   INT32                    VerticalMovement;
   APPLE_EVENT_TYPE         EventType;
 
-  DEBUG ((DEBUG_VERBOSE, "InternalHandleButtonInteraction\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "InternalHandleButtonInteraction\n"));
 
   if (!EFI_ERROR (PointerStatus)) {
     if (!Pointer->PreviousButton) {
@@ -876,7 +876,7 @@ InternalSimplePointerPollNotifyFunction (
 
   StartTime = GetPerformanceCounter ();
 
-  DEBUG ((DEBUG_VERBOSE, "InternalSimplePointerPollNotifyFunction\n"));
+  DEBUG ((DEBUG_VERBOSE*2, "InternalSimplePointerPollNotifyFunction\n"));
 
   Modifiers = InternalGetModifierStrokes ();
 

diff --git a/Library/OcInputLib/Keycode/AIKShim.c b/Library/OcInputLib/Keycode/AIKShim.c
@@ -60,8 +60,8 @@ AIKShimTextInputReadKeyStroke (
   AMI_EFI_KEY_DATA  AmiKeyData;
 
   DEBUG ((
-    DEBUG_VERBOSE,
-    "AIKTextInputReadKeyStroke %p %p ours %p event %d",
+    DEBUG_VERBOSE*2,
+    "AIKTextInputReadKeyStroke %p %p ours %p event %d\n",
     This,
     Key,
     gAikSelf.Source.TextInput,
@@ -107,8 +107,8 @@ AIKShimTextInputReadKeyStrokeEx (
   AMI_EFI_KEY_DATA  AmiKeyData;
 
   DEBUG ((
-    DEBUG_VERBOSE,
-    "AIKTextInputReadKeyStrokeEx %p %p ours %p event %d",
+    DEBUG_VERBOSE*2,
+    "AIKTextInputReadKeyStrokeEx %p %p ours %p event %d\n",
     This,
     KeyData,
     gAikSelf.Source.TextInputEx,

diff --git a/OpenCorePkg.dsc b/OpenCorePkg.dsc
@@ -389,8 +389,8 @@
   # DEBUG_ASSERT_ENABLED | DEBUG_PRINT_ENABLED | DEBUG_CODE_ENABLED | CLEAR_MEMORY_ENABLED | ASSERT_DEADLOOP_ENABLED
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2f
   # DEBUG_ERROR | DEBUG_WARN | DEBUG_INFO
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000042
-  gEfiMdePkgTokenSpaceGuid.PcdFixedDebugPrintErrorLevel|0x80000042
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80400042
+  gEfiMdePkgTokenSpaceGuid.PcdFixedDebugPrintErrorLevel|0x80400042
 !endif
   gOpenCorePkgTokenSpaceGuid.PcdCanaryAllowRdtscFallback|TRUE