MdeModulePkg: Apply uncrustify changes

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the MdeModulePkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

5 files changed, 605 insertions, 632 deletions

diff --git a/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c b/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c
index 12a2024..0b824c6 100644
--- a/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c
+++ b/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c
@@ -9,10 +9,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include "DxeMain.h"

 #include "Handle.h"

 

-

 //

 // Driver Support Functions

 //

+

 /**

   Connects one or more drivers to a controller.

 

@@ -48,22 +48,22 @@ CoreConnectController (
   IN  BOOLEAN                   Recursive

   )

 {

-  EFI_STATUS                           Status;

-  EFI_STATUS                           ReturnStatus;

-  IHANDLE                              *Handle;

-  PROTOCOL_INTERFACE                   *Prot;

-  LIST_ENTRY                           *Link;

-  LIST_ENTRY                           *ProtLink;

-  OPEN_PROTOCOL_DATA                   *OpenData;

-  EFI_DEVICE_PATH_PROTOCOL             *AlignedRemainingDevicePath;

-  EFI_HANDLE                           *ChildHandleBuffer;

-  UINTN                                ChildHandleCount;

-  UINTN                                Index;

-  UINTN                                HandleFilePathSize;

-  UINTN                                RemainingDevicePathSize;

-  EFI_DEVICE_PATH_PROTOCOL             *HandleFilePath;

-  EFI_DEVICE_PATH_PROTOCOL             *FilePath;

-  EFI_DEVICE_PATH_PROTOCOL             *TempFilePath;

+  EFI_STATUS                Status;

+  EFI_STATUS                ReturnStatus;

+  IHANDLE                   *Handle;

+  PROTOCOL_INTERFACE        *Prot;

+  LIST_ENTRY                *Link;

+  LIST_ENTRY                *ProtLink;

+  OPEN_PROTOCOL_DATA        *OpenData;

+  EFI_DEVICE_PATH_PROTOCOL  *AlignedRemainingDevicePath;

+  EFI_HANDLE                *ChildHandleBuffer;

+  UINTN                     ChildHandleCount;

+  UINTN                     Index;

+  UINTN                     HandleFilePathSize;

+  UINTN                     RemainingDevicePathSize;

+  EFI_DEVICE_PATH_PROTOCOL  *HandleFilePath;

+  EFI_DEVICE_PATH_PROTOCOL  *FilePath;

+  EFI_DEVICE_PATH_PROTOCOL  *TempFilePath;

 

   //

   // Make sure ControllerHandle is valid

@@ -87,25 +87,27 @@ CoreConnectController (
       ASSERT (HandleFilePath != NULL);

       FilePath     = HandleFilePath;

       TempFilePath = NULL;

-      if (RemainingDevicePath != NULL && !Recursive) {

+      if ((RemainingDevicePath != NULL) && !Recursive) {

         HandleFilePathSize      = GetDevicePathSize (HandleFilePath) - sizeof (EFI_DEVICE_PATH_PROTOCOL);

         RemainingDevicePathSize = GetDevicePathSize (RemainingDevicePath);

-        TempFilePath = AllocateZeroPool (HandleFilePathSize + RemainingDevicePathSize);

+        TempFilePath            = AllocateZeroPool (HandleFilePathSize + RemainingDevicePathSize);

         ASSERT (TempFilePath != NULL);

         CopyMem (TempFilePath, HandleFilePath, HandleFilePathSize);

-        CopyMem ((UINT8 *) TempFilePath + HandleFilePathSize, RemainingDevicePath, RemainingDevicePathSize);

+        CopyMem ((UINT8 *)TempFilePath + HandleFilePathSize, RemainingDevicePath, RemainingDevicePathSize);

         FilePath = TempFilePath;

       }

+

       Status = gSecurity2->FileAuthentication (

-                            gSecurity2,

-                            FilePath,

-                            NULL,

-                            0,

-                            FALSE

-                            );

+                             gSecurity2,

+                             FilePath,

+                             NULL,

+                             0,

+                             FALSE

+                             );

       if (TempFilePath != NULL) {

         FreePool (TempFilePath);

       }

+

       if (EFI_ERROR (Status)) {

         return Status;

       }

@@ -169,15 +171,15 @@ CoreConnectController (
       return ReturnStatus;

     }

 

-

     //

     // Count ControllerHandle's children

     //

     for (Link = Handle->Protocols.ForwardLink, ChildHandleCount = 0; Link != &Handle->Protocols; Link = Link->ForwardLink) {

-      Prot = CR(Link, PROTOCOL_INTERFACE, Link, PROTOCOL_INTERFACE_SIGNATURE);

+      Prot = CR (Link, PROTOCOL_INTERFACE, Link, PROTOCOL_INTERFACE_SIGNATURE);

       for (ProtLink = Prot->OpenList.ForwardLink;

-          ProtLink != &Prot->OpenList;

-          ProtLink = ProtLink->ForwardLink) {

+           ProtLink != &Prot->OpenList;

+           ProtLink = ProtLink->ForwardLink)

+      {

         OpenData = CR (ProtLink, OPEN_PROTOCOL_DATA, Link, OPEN_PROTOCOL_DATA_SIGNATURE);

         if ((OpenData->Attributes & EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER) != 0) {

           ChildHandleCount++;

@@ -188,7 +190,7 @@ CoreConnectController (
     //

     // Allocate a handle buffer for ControllerHandle's children

     //

-    ChildHandleBuffer = AllocatePool (ChildHandleCount * sizeof(EFI_HANDLE));

+    ChildHandleBuffer = AllocatePool (ChildHandleCount * sizeof (EFI_HANDLE));

     if (ChildHandleBuffer == NULL) {

       CoreReleaseProtocolLock ();

       return EFI_OUT_OF_RESOURCES;

@@ -198,10 +200,11 @@ CoreConnectController (
     // Fill in a handle buffer with ControllerHandle's children

     //

     for (Link = Handle->Protocols.ForwardLink, ChildHandleCount = 0; Link != &Handle->Protocols; Link = Link->ForwardLink) {

-      Prot = CR(Link, PROTOCOL_INTERFACE, Link, PROTOCOL_INTERFACE_SIGNATURE);

+      Prot = CR (Link, PROTOCOL_INTERFACE, Link, PROTOCOL_INTERFACE_SIGNATURE);

       for (ProtLink = Prot->OpenList.ForwardLink;

-          ProtLink != &Prot->OpenList;

-          ProtLink = ProtLink->ForwardLink) {

+           ProtLink != &Prot->OpenList;

+           ProtLink = ProtLink->ForwardLink)

+      {

         OpenData = CR (ProtLink, OPEN_PROTOCOL_DATA, Link, OPEN_PROTOCOL_DATA_SIGNATURE);

         if ((OpenData->Attributes & EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER) != 0) {

           ChildHandleBuffer[ChildHandleCount] = OpenData->ControllerHandle;

@@ -236,7 +239,6 @@ CoreConnectController (
   return ReturnStatus;

 }

 

-

 /**

   Add Driver Binding Protocols from Context Driver Image Handles to sorted

   Driver Binding Protocol list.

@@ -296,11 +298,11 @@ AddSortedDriverBindingProtocol (
       // Retrieve the Driver Binding Protocol associated with each Driver Binding Handle

       //

       Status = CoreHandleProtocol (

-                DriverBindingHandleBuffer[Index],

-                &gEfiDriverBindingProtocolGuid,

-                (VOID **) &DriverBinding

-                );

-      if (EFI_ERROR (Status) || DriverBinding == NULL) {

+                 DriverBindingHandleBuffer[Index],

+                 &gEfiDriverBindingProtocolGuid,

+                 (VOID **)&DriverBinding

+                 );

+      if (EFI_ERROR (Status) || (DriverBinding == NULL)) {

         continue;

       }

 

@@ -319,21 +321,22 @@ AddSortedDriverBindingProtocol (
           );

       }

     }

+

     return;

   }

 

   //

   // Retrieve the Driver Binding Protocol from DriverBindingHandle

   //

-  Status = CoreHandleProtocol(

+  Status = CoreHandleProtocol (

              DriverBindingHandle,

              &gEfiDriverBindingProtocolGuid,

-             (VOID **) &DriverBinding

+             (VOID **)&DriverBinding

              );

   //

   // If DriverBindingHandle does not support the Driver Binding Protocol then return

   //

-  if (EFI_ERROR (Status) || DriverBinding == NULL) {

+  if (EFI_ERROR (Status) || (DriverBinding == NULL)) {

     return;

   }

 

@@ -352,6 +355,7 @@ AddSortedDriverBindingProtocol (
   if (*NumberOfSortedDriverBindingProtocols < DriverBindingHandleCount) {

     SortedDriverBindingProtocols[*NumberOfSortedDriverBindingProtocols] = DriverBinding;

   }

+

   *NumberOfSortedDriverBindingProtocols = *NumberOfSortedDriverBindingProtocols + 1;

 

   //

@@ -364,7 +368,6 @@ AddSortedDriverBindingProtocol (
   }

 }

 

-

 /**

   Connects a controller to a driver.

 

@@ -416,12 +419,12 @@ CoreConnectSingleController (
   //

   // Initialize local variables

   //

-  DriverBindingHandleCount              = 0;

-  DriverBindingHandleBuffer             = NULL;

-  NumberOfSortedDriverBindingProtocols  = 0;

-  SortedDriverBindingProtocols          = NULL;

-  PlatformDriverOverride                = NULL;

-  NewDriverBindingHandleBuffer          = NULL;

+  DriverBindingHandleCount             = 0;

+  DriverBindingHandleBuffer            = NULL;

+  NumberOfSortedDriverBindingProtocols = 0;

+  SortedDriverBindingProtocols         = NULL;

+  PlatformDriverOverride               = NULL;

+  NewDriverBindingHandleBuffer         = NULL;

 

   //

   // Get list of all Driver Binding Protocol Instances

@@ -468,7 +471,7 @@ CoreConnectSingleController (
   Status = CoreLocateProtocol (

              &gEfiPlatformDriverOverrideProtocolGuid,

              NULL,

-             (VOID **) &PlatformDriverOverride

+             (VOID **)&PlatformDriverOverride

              );

   if (!EFI_ERROR (Status) && (PlatformDriverOverride != NULL)) {

     DriverImageHandle = NULL;

@@ -501,7 +504,7 @@ CoreConnectSingleController (
       Status = CoreHandleProtocol (

                  DriverBindingHandleBuffer[Index],

                  &gEfiDriverFamilyOverrideProtocolGuid,

-                 (VOID **) &DriverFamilyOverride

+                 (VOID **)&DriverFamilyOverride

                  );

       if (!EFI_ERROR (Status) && (DriverFamilyOverride != NULL)) {

         DriverFamilyOverrideVersion = DriverFamilyOverride->GetVersion (DriverFamilyOverride);

@@ -532,7 +535,7 @@ CoreConnectSingleController (
   Status = CoreHandleProtocol (

              ControllerHandle,

              &gEfiBusSpecificDriverOverrideProtocolGuid,

-             (VOID **) &BusSpecificDriverOverride

+             (VOID **)&BusSpecificDriverOverride

              );

   if (!EFI_ERROR (Status) && (BusSpecificDriverOverride != NULL)) {

     DriverImageHandle = NULL;

@@ -608,9 +611,10 @@ CoreConnectSingleController (
         HighestIndex   = Index;

       }

     }

+

     if (SortIndex != HighestIndex) {

-      DriverBinding = SortedDriverBindingProtocols[SortIndex];

-      SortedDriverBindingProtocols[SortIndex] = SortedDriverBindingProtocols[HighestIndex];

+      DriverBinding                              = SortedDriverBindingProtocols[SortIndex];

+      SortedDriverBindingProtocols[SortIndex]    = SortedDriverBindingProtocols[HighestIndex];

       SortedDriverBindingProtocols[HighestIndex] = DriverBinding;

     }

   }

@@ -620,19 +624,18 @@ CoreConnectSingleController (
   //

   OneStarted = FALSE;

   do {

-

     //

     // Loop through the sorted Driver Binding Protocol Instances in order, and see if

     // any of the Driver Binding Protocols support the controller specified by

     // ControllerHandle.

     //

     DriverBinding = NULL;

-    DriverFound = FALSE;

+    DriverFound   = FALSE;

     for (Index = 0; (Index < NumberOfSortedDriverBindingProtocols) && !DriverFound; Index++) {

       if (SortedDriverBindingProtocols[Index] != NULL) {

         DriverBinding = SortedDriverBindingProtocols[Index];

         PERF_DRIVER_BINDING_SUPPORT_BEGIN (DriverBinding->DriverBindingHandle, ControllerHandle);

-        Status = DriverBinding->Supported(

+        Status = DriverBinding->Supported (

                                   DriverBinding,

                                   ControllerHandle,

                                   RemainingDevicePath

@@ -640,7 +643,7 @@ CoreConnectSingleController (
         PERF_DRIVER_BINDING_SUPPORT_END (DriverBinding->DriverBindingHandle, ControllerHandle);

         if (!EFI_ERROR (Status)) {

           SortedDriverBindingProtocols[Index] = NULL;

-          DriverFound = TRUE;

+          DriverFound                         = TRUE;

 

           //

           // A driver was found that supports ControllerHandle, so attempt to start the driver

@@ -692,8 +695,6 @@ CoreConnectSingleController (
   return EFI_NOT_FOUND;

 }

 

-

-

 /**

   Disonnects a controller from a driver

 

@@ -734,24 +735,24 @@ CoreDisconnectController (
   IN  EFI_HANDLE  ChildHandle        OPTIONAL

   )

 {

-  EFI_STATUS                          Status;

-  IHANDLE                             *Handle;

-  EFI_HANDLE                          *DriverImageHandleBuffer;

-  EFI_HANDLE                          *ChildBuffer;

-  UINTN                               Index;

-  UINTN                               HandleIndex;

-  UINTN                               DriverImageHandleCount;

-  UINTN                               ChildrenToStop;

-  UINTN                               ChildBufferCount;

-  UINTN                               StopCount;

-  BOOLEAN                             Duplicate;

-  BOOLEAN                             ChildHandleValid;

-  BOOLEAN                             DriverImageHandleValid;

-  LIST_ENTRY                          *Link;

-  LIST_ENTRY                          *ProtLink;

-  OPEN_PROTOCOL_DATA                  *OpenData;

-  PROTOCOL_INTERFACE                  *Prot;

-  EFI_DRIVER_BINDING_PROTOCOL         *DriverBinding;

+  EFI_STATUS                   Status;

+  IHANDLE                      *Handle;

+  EFI_HANDLE                   *DriverImageHandleBuffer;

+  EFI_HANDLE                   *ChildBuffer;

+  UINTN                        Index;

+  UINTN                        HandleIndex;

+  UINTN                        DriverImageHandleCount;

+  UINTN                        ChildrenToStop;

+  UINTN                        ChildBufferCount;

+  UINTN                        StopCount;

+  BOOLEAN                      Duplicate;

+  BOOLEAN                      ChildHandleValid;

+  BOOLEAN                      DriverImageHandleValid;

+  LIST_ENTRY                   *Link;

+  LIST_ENTRY                   *ProtLink;

+  OPEN_PROTOCOL_DATA           *OpenData;

+  PROTOCOL_INTERFACE           *Prot;

+  EFI_DRIVER_BINDING_PROTOCOL  *DriverBinding;

 

   //

   // Make sure ControllerHandle is valid

@@ -793,16 +794,18 @@ CoreDisconnectController (
 

     CoreAcquireProtocolLock ();

     for (Link = Handle->Protocols.ForwardLink; Link != &Handle->Protocols; Link = Link->ForwardLink) {

-      Prot = CR(Link, PROTOCOL_INTERFACE, Link, PROTOCOL_INTERFACE_SIGNATURE);

+      Prot = CR (Link, PROTOCOL_INTERFACE, Link, PROTOCOL_INTERFACE_SIGNATURE);

       for (ProtLink = Prot->OpenList.ForwardLink;

            ProtLink != &Prot->OpenList;

-           ProtLink = ProtLink->ForwardLink) {

+           ProtLink = ProtLink->ForwardLink)

+      {

         OpenData = CR (ProtLink, OPEN_PROTOCOL_DATA, Link, OPEN_PROTOCOL_DATA_SIGNATURE);

         if ((OpenData->Attributes & EFI_OPEN_PROTOCOL_BY_DRIVER) != 0) {

           DriverImageHandleCount++;

         }

       }

     }

+

     CoreReleaseProtocolLock ();

 

     //

@@ -823,19 +826,21 @@ CoreDisconnectController (
 

     CoreAcquireProtocolLock ();

     for (Link = Handle->Protocols.ForwardLink; Link != &Handle->Protocols; Link = Link->ForwardLink) {

-      Prot = CR(Link, PROTOCOL_INTERFACE, Link, PROTOCOL_INTERFACE_SIGNATURE);

+      Prot = CR (Link, PROTOCOL_INTERFACE, Link, PROTOCOL_INTERFACE_SIGNATURE);

       for (ProtLink = Prot->OpenList.ForwardLink;

            ProtLink != &Prot->OpenList;

-           ProtLink = ProtLink->ForwardLink) {

+           ProtLink = ProtLink->ForwardLink)

+      {

         OpenData = CR (ProtLink, OPEN_PROTOCOL_DATA, Link, OPEN_PROTOCOL_DATA_SIGNATURE);

         if ((OpenData->Attributes & EFI_OPEN_PROTOCOL_BY_DRIVER) != 0) {

           Duplicate = FALSE;

-          for (Index = 0; Index< DriverImageHandleCount; Index++) {

+          for (Index = 0; Index < DriverImageHandleCount; Index++) {

             if (DriverImageHandleBuffer[Index] == OpenData->AgentHandle) {

               Duplicate = TRUE;

               break;

             }

           }

+

           if (!Duplicate) {

             DriverImageHandleBuffer[DriverImageHandleCount] = OpenData->AgentHandle;

             DriverImageHandleCount++;

@@ -843,12 +848,12 @@ CoreDisconnectController (
         }

       }

     }

+

     CoreReleaseProtocolLock ();

   }

 

   StopCount = 0;

   for (HandleIndex = 0; HandleIndex < DriverImageHandleCount; HandleIndex++) {

-

     if (DriverImageHandleBuffer != NULL) {

       DriverImageHandle = DriverImageHandleBuffer[HandleIndex];

     }

@@ -861,7 +866,7 @@ CoreDisconnectController (
                &gEfiDriverBindingProtocolGuid,

                (VOID **)&DriverBinding

                );

-    if (EFI_ERROR (Status) || DriverBinding == NULL) {

+    if (EFI_ERROR (Status) || (DriverBinding == NULL)) {

       Status = EFI_INVALID_PARAMETER;

       goto Done;

     }

@@ -870,30 +875,33 @@ CoreDisconnectController (
     // Look at each protocol interface for a match

     //

     DriverImageHandleValid = FALSE;

-    ChildBufferCount = 0;

+    ChildBufferCount       = 0;

 

     CoreAcquireProtocolLock ();

     for (Link = Handle->Protocols.ForwardLink; Link != &Handle->Protocols; Link = Link->ForwardLink) {

-      Prot = CR(Link, PROTOCOL_INTERFACE, Link, PROTOCOL_INTERFACE_SIGNATURE);

+      Prot = CR (Link, PROTOCOL_INTERFACE, Link, PROTOCOL_INTERFACE_SIGNATURE);

       for (ProtLink = Prot->OpenList.ForwardLink;

            ProtLink != &Prot->OpenList;

-           ProtLink = ProtLink->ForwardLink) {

+           ProtLink = ProtLink->ForwardLink)

+      {

         OpenData = CR (ProtLink, OPEN_PROTOCOL_DATA, Link, OPEN_PROTOCOL_DATA_SIGNATURE);

         if (OpenData->AgentHandle == DriverImageHandle) {

           if ((OpenData->Attributes & EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER) != 0) {

             ChildBufferCount++;

           }

+

           if ((OpenData->Attributes & EFI_OPEN_PROTOCOL_BY_DRIVER) != 0) {

             DriverImageHandleValid = TRUE;

           }

         }

       }

     }

+

     CoreReleaseProtocolLock ();

 

     if (DriverImageHandleValid) {

       ChildHandleValid = FALSE;

-      ChildBuffer = NULL;

+      ChildBuffer      = NULL;

       if (ChildBufferCount != 0) {

         ChildBuffer = AllocatePool (sizeof (EFI_HANDLE) * ChildBufferCount);

         if (ChildBuffer == NULL) {

@@ -905,13 +913,15 @@ CoreDisconnectController (
 

         CoreAcquireProtocolLock ();

         for (Link = Handle->Protocols.ForwardLink; Link != &Handle->Protocols; Link = Link->ForwardLink) {

-          Prot = CR(Link, PROTOCOL_INTERFACE, Link, PROTOCOL_INTERFACE_SIGNATURE);

+          Prot = CR (Link, PROTOCOL_INTERFACE, Link, PROTOCOL_INTERFACE_SIGNATURE);

           for (ProtLink = Prot->OpenList.ForwardLink;

                ProtLink != &Prot->OpenList;

-               ProtLink = ProtLink->ForwardLink) {

+               ProtLink = ProtLink->ForwardLink)

+          {

             OpenData = CR (ProtLink, OPEN_PROTOCOL_DATA, Link, OPEN_PROTOCOL_DATA_SIGNATURE);

             if ((OpenData->AgentHandle == DriverImageHandle) &&

-                ((OpenData->Attributes & EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER) != 0)) {

+                ((OpenData->Attributes & EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER) != 0))

+            {

               Duplicate = FALSE;

               for (Index = 0; Index < ChildBufferCount; Index++) {

                 if (ChildBuffer[Index] == OpenData->ControllerHandle) {

@@ -919,34 +929,39 @@ CoreDisconnectController (
                   break;

                 }

               }

+

               if (!Duplicate) {

                 ChildBuffer[ChildBufferCount] = OpenData->ControllerHandle;

                 if (ChildHandle == ChildBuffer[ChildBufferCount]) {

                   ChildHandleValid = TRUE;

                 }

+

                 ChildBufferCount++;

               }

             }

           }

         }

+

         CoreReleaseProtocolLock ();

       }

 

-      if (ChildHandle == NULL || ChildHandleValid) {

+      if ((ChildHandle == NULL) || ChildHandleValid) {

         ChildrenToStop = 0;

-        Status = EFI_SUCCESS;

+        Status         = EFI_SUCCESS;

         if (ChildBufferCount > 0) {

           if (ChildHandle != NULL) {

             ChildrenToStop = 1;

-            Status = DriverBinding->Stop (DriverBinding, ControllerHandle, ChildrenToStop, &ChildHandle);

+            Status         = DriverBinding->Stop (DriverBinding, ControllerHandle, ChildrenToStop, &ChildHandle);

           } else {

             ChildrenToStop = ChildBufferCount;

-            Status = DriverBinding->Stop (DriverBinding, ControllerHandle, ChildrenToStop, ChildBuffer);

+            Status         = DriverBinding->Stop (DriverBinding, ControllerHandle, ChildrenToStop, ChildBuffer);

           }

         }

+

         if (!EFI_ERROR (Status) && ((ChildHandle == NULL) || (ChildBufferCount == ChildrenToStop))) {

           Status = DriverBinding->Stop (DriverBinding, ControllerHandle, 0, NULL);

         }

+

         if (!EFI_ERROR (Status)) {

           StopCount++;

         }

diff --git a/MdeModulePkg/Core/Dxe/Hand/Handle.c b/MdeModulePkg/Core/Dxe/Hand/Handle.c
index 9297928..bd6c578 100644
--- a/MdeModulePkg/Core/Dxe/Hand/Handle.c
+++ b/MdeModulePkg/Core/Dxe/Hand/Handle.c
@@ -9,19 +9,16 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include "DxeMain.h"

 #include "Handle.h"

 

-

 //

 // mProtocolDatabase     - A list of all protocols in the system.  (simple list for now)

 // gHandleList           - A list of all the handles in the system

 // gProtocolDatabaseLock - Lock to protect the mProtocolDatabase

 // gHandleDatabaseKey    -  The Key to show that the handle has been created/modified

 //

-LIST_ENTRY      mProtocolDatabase     = INITIALIZE_LIST_HEAD_VARIABLE (mProtocolDatabase);

-LIST_ENTRY      gHandleList           = INITIALIZE_LIST_HEAD_VARIABLE (gHandleList);

-EFI_LOCK        gProtocolDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_NOTIFY);

-UINT64          gHandleDatabaseKey    = 0;

-

-

+LIST_ENTRY  mProtocolDatabase     = INITIALIZE_LIST_HEAD_VARIABLE (mProtocolDatabase);

+LIST_ENTRY  gHandleList           = INITIALIZE_LIST_HEAD_VARIABLE (gHandleList);

+EFI_LOCK    gProtocolDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_NOTIFY);

+UINT64      gHandleDatabaseKey    = 0;

 

 /**

   Acquire lock on gProtocolDatabaseLock.

@@ -35,8 +32,6 @@ CoreAcquireProtocolLock (
   CoreAcquireLock (&gProtocolDatabaseLock);

 }

 

-

-

 /**

   Release lock on gProtocolDatabaseLock.

 

@@ -49,8 +44,6 @@ CoreReleaseProtocolLock (
   CoreReleaseLock (&gProtocolDatabaseLock);

 }

 

-

-

 /**

   Check whether a handle is a valid EFI_HANDLE

   The gProtocolDatabaseLock must be owned

@@ -63,21 +56,21 @@ CoreReleaseProtocolLock (
 **/

 EFI_STATUS

 CoreValidateHandle (

-  IN  EFI_HANDLE                UserHandle

+  IN  EFI_HANDLE  UserHandle

   )

 {

-  IHANDLE             *Handle;

-  LIST_ENTRY          *Link;

+  IHANDLE     *Handle;

+  LIST_ENTRY  *Link;

 

   if (UserHandle == NULL) {

     return EFI_INVALID_PARAMETER;

   }

 

-  ASSERT_LOCKED(&gProtocolDatabaseLock);

+  ASSERT_LOCKED (&gProtocolDatabaseLock);

 

   for (Link = gHandleList.BackLink; Link != &gHandleList; Link = Link->BackLink) {

     Handle = CR (Link, IHANDLE, AllHandles, EFI_HANDLE_SIGNATURE);

-    if (Handle == (IHANDLE *) UserHandle) {

+    if (Handle == (IHANDLE *)UserHandle) {

       return EFI_SUCCESS;

     }

   }

@@ -85,8 +78,6 @@ CoreValidateHandle (
   return EFI_INVALID_PARAMETER;

 }

 

-

-

 /**

   Finds the protocol entry for the requested protocol.

   The gProtocolDatabaseLock must be owned

@@ -99,15 +90,15 @@ CoreValidateHandle (
 **/

 PROTOCOL_ENTRY  *

 CoreFindProtocolEntry (

-  IN EFI_GUID   *Protocol,

-  IN BOOLEAN    Create

+  IN EFI_GUID  *Protocol,

+  IN BOOLEAN   Create

   )

 {

-  LIST_ENTRY          *Link;

-  PROTOCOL_ENTRY      *Item;

-  PROTOCOL_ENTRY      *ProtEntry;

+  LIST_ENTRY      *Link;

+  PROTOCOL_ENTRY  *Item;

+  PROTOCOL_ENTRY  *ProtEntry;

 

-  ASSERT_LOCKED(&gProtocolDatabaseLock);

+  ASSERT_LOCKED (&gProtocolDatabaseLock);

 

   //

   // Search the database for the matching GUID

@@ -116,11 +107,10 @@ CoreFindProtocolEntry (
   ProtEntry = NULL;

   for (Link = mProtocolDatabase.ForwardLink;

        Link != &mProtocolDatabase;

-       Link = Link->ForwardLink) {

-

-    Item = CR(Link, PROTOCOL_ENTRY, AllEntries, PROTOCOL_ENTRY_SIGNATURE);

+       Link = Link->ForwardLink)

+  {

+    Item = CR (Link, PROTOCOL_ENTRY, AllEntries, PROTOCOL_ENTRY_SIGNATURE);

     if (CompareGuid (&Item->ProtocolID, Protocol)) {

-

       //

       // This is the protocol entry

       //

@@ -135,7 +125,7 @@ CoreFindProtocolEntry (
   // allocate a new entry

   //

   if ((ProtEntry == NULL) && Create) {

-    ProtEntry = AllocatePool (sizeof(PROTOCOL_ENTRY));

+    ProtEntry = AllocatePool (sizeof (PROTOCOL_ENTRY));

 

     if (ProtEntry != NULL) {

       //

@@ -156,8 +146,6 @@ CoreFindProtocolEntry (
   return ProtEntry;

 }

 

-

-

 /**

   Finds the protocol instance for the requested handle and protocol.

   Note: This function doesn't do parameters checking, it's caller's responsibility

@@ -172,16 +160,16 @@ CoreFindProtocolEntry (
 **/

 PROTOCOL_INTERFACE *

 CoreFindProtocolInterface (

-  IN IHANDLE        *Handle,

-  IN EFI_GUID       *Protocol,

-  IN VOID           *Interface

+  IN IHANDLE   *Handle,

+  IN EFI_GUID  *Protocol,

+  IN VOID      *Interface

   )

 {

   PROTOCOL_INTERFACE  *Prot;

   PROTOCOL_ENTRY      *ProtEntry;

   LIST_ENTRY          *Link;

 

-  ASSERT_LOCKED(&gProtocolDatabaseLock);

+  ASSERT_LOCKED (&gProtocolDatabaseLock);

   Prot = NULL;

 

   //

@@ -190,17 +178,15 @@ CoreFindProtocolInterface (
 

   ProtEntry = CoreFindProtocolEntry (Protocol, FALSE);

   if (ProtEntry != NULL) {

-

     //

     // Look at each protocol interface for any matches

     //

-    for (Link = Handle->Protocols.ForwardLink; Link != &Handle->Protocols; Link=Link->ForwardLink) {

-

+    for (Link = Handle->Protocols.ForwardLink; Link != &Handle->Protocols; Link = Link->ForwardLink) {

       //

       // If this protocol interface matches, remove it

       //

-      Prot = CR(Link, PROTOCOL_INTERFACE, Link, PROTOCOL_INTERFACE_SIGNATURE);

-      if (Prot->Interface == Interface && Prot->Protocol == ProtEntry) {

+      Prot = CR (Link, PROTOCOL_INTERFACE, Link, PROTOCOL_INTERFACE_SIGNATURE);

+      if ((Prot->Interface == Interface) && (Prot->Protocol == ProtEntry)) {

         break;

       }

 

@@ -211,7 +197,6 @@ CoreFindProtocolInterface (
   return Prot;

 }

 

-

 /**

   Removes an event from a register protocol notify list on a protocol.

 

@@ -224,31 +209,31 @@ CoreFindProtocolInterface (
 **/

 EFI_STATUS

 CoreUnregisterProtocolNotifyEvent (

-  IN EFI_EVENT      Event

+  IN EFI_EVENT  Event

   )

 {

-  LIST_ENTRY         *Link;

-  PROTOCOL_ENTRY     *ProtEntry;

-  LIST_ENTRY         *NotifyLink;

-  PROTOCOL_NOTIFY    *ProtNotify;

+  LIST_ENTRY       *Link;

+  PROTOCOL_ENTRY   *ProtEntry;

+  LIST_ENTRY       *NotifyLink;

+  PROTOCOL_NOTIFY  *ProtNotify;

 

   CoreAcquireProtocolLock ();

 

   for ( Link =  mProtocolDatabase.ForwardLink;

         Link != &mProtocolDatabase;

-        Link =  Link->ForwardLink) {

-

-    ProtEntry = CR(Link, PROTOCOL_ENTRY, AllEntries, PROTOCOL_ENTRY_SIGNATURE);

+        Link =  Link->ForwardLink)

+  {

+    ProtEntry = CR (Link, PROTOCOL_ENTRY, AllEntries, PROTOCOL_ENTRY_SIGNATURE);

 

     for ( NotifyLink =  ProtEntry->Notify.ForwardLink;

           NotifyLink != &ProtEntry->Notify;

-          NotifyLink =  NotifyLink->ForwardLink) {

-

-      ProtNotify = CR(NotifyLink, PROTOCOL_NOTIFY, Link, PROTOCOL_NOTIFY_SIGNATURE);

+          NotifyLink =  NotifyLink->ForwardLink)

+    {

+      ProtNotify = CR (NotifyLink, PROTOCOL_NOTIFY, Link, PROTOCOL_NOTIFY_SIGNATURE);

 

       if (ProtNotify->Event == Event) {

-        RemoveEntryList(&ProtNotify->Link);

-        CoreFreePool(ProtNotify);

+        RemoveEntryList (&ProtNotify->Link);

+        CoreFreePool (ProtNotify);

         CoreReleaseProtocolLock ();

         return EFI_SUCCESS;

       }

@@ -259,8 +244,6 @@ CoreUnregisterProtocolNotifyEvent (
   return EFI_NOT_FOUND;

 }

 

-

-

 /**

   Removes all the events in the protocol database that match Event.

 

@@ -272,10 +255,10 @@ CoreUnregisterProtocolNotifyEvent (
 **/

 EFI_STATUS

 CoreUnregisterProtocolNotify (

-  IN EFI_EVENT      Event

+  IN EFI_EVENT  Event

   )

 {

-  EFI_STATUS       Status;

+  EFI_STATUS  Status;

 

   do {

     Status = CoreUnregisterProtocolNotifyEvent (Event);

@@ -284,9 +267,6 @@ CoreUnregisterProtocolNotify (
   return EFI_SUCCESS;

 }

 

-

-

-

 /**

   Wrapper function to CoreInstallProtocolInterfaceNotify.  This is the public API which

   Calls the private one which contains a BOOLEAN parameter for notifications

@@ -304,22 +284,21 @@ CoreUnregisterProtocolNotify (
 EFI_STATUS

 EFIAPI

 CoreInstallProtocolInterface (

-  IN OUT EFI_HANDLE     *UserHandle,

-  IN EFI_GUID           *Protocol,

-  IN EFI_INTERFACE_TYPE InterfaceType,

-  IN VOID               *Interface

+  IN OUT EFI_HANDLE      *UserHandle,

+  IN EFI_GUID            *Protocol,

+  IN EFI_INTERFACE_TYPE  InterfaceType,

+  IN VOID                *Interface

   )

 {

   return CoreInstallProtocolInterfaceNotify (

-            UserHandle,

-            Protocol,

-            InterfaceType,

-            Interface,

-            TRUE

-            );

+           UserHandle,

+           Protocol,

+           InterfaceType,

+           Interface,

+           TRUE

+           );

 }

 

-

 /**

   Installs a protocol interface into the boot services environment.

 

@@ -339,11 +318,11 @@ CoreInstallProtocolInterface (
 **/

 EFI_STATUS

 CoreInstallProtocolInterfaceNotify (

-  IN OUT EFI_HANDLE     *UserHandle,

-  IN EFI_GUID           *Protocol,

-  IN EFI_INTERFACE_TYPE InterfaceType,

-  IN VOID               *Interface,

-  IN BOOLEAN            Notify

+  IN OUT EFI_HANDLE      *UserHandle,

+  IN EFI_GUID            *Protocol,

+  IN EFI_INTERFACE_TYPE  InterfaceType,

+  IN VOID                *Interface,

+  IN BOOLEAN             Notify

   )

 {

   PROTOCOL_INTERFACE  *Prot;

@@ -356,7 +335,7 @@ CoreInstallProtocolInterfaceNotify (
   // returns EFI_INVALID_PARAMETER if InterfaceType is invalid.

   // Also added check for invalid UserHandle and Protocol pointers.

   //

-  if (UserHandle == NULL || Protocol == NULL) {

+  if ((UserHandle == NULL) || (Protocol == NULL)) {

     return EFI_INVALID_PARAMETER;

   }

 

@@ -367,10 +346,10 @@ CoreInstallProtocolInterfaceNotify (
   //

   // Print debug message

   //

-  DEBUG((DEBUG_INFO, "InstallProtocolInterface: %g %p\n", Protocol, Interface));

+  DEBUG ((DEBUG_INFO, "InstallProtocolInterface: %g %p\n", Protocol, Interface));

 

   Status = EFI_OUT_OF_RESOURCES;

-  Prot = NULL;

+  Prot   = NULL;

   Handle = NULL;

 

   if (*UserHandle != NULL) {

@@ -396,7 +375,7 @@ CoreInstallProtocolInterfaceNotify (
   //

   // Allocate a new protocol interface structure

   //

-  Prot = AllocateZeroPool (sizeof(PROTOCOL_INTERFACE));

+  Prot = AllocateZeroPool (sizeof (PROTOCOL_INTERFACE));

   if (Prot == NULL) {

     Status = EFI_OUT_OF_RESOURCES;

     goto Done;

@@ -407,7 +386,7 @@ CoreInstallProtocolInterfaceNotify (
   //

   Handle = (IHANDLE *)*UserHandle;

   if (Handle == NULL) {

-    Handle = AllocateZeroPool (sizeof(IHANDLE));

+    Handle = AllocateZeroPool (sizeof (IHANDLE));

     if (Handle == NULL) {

       Status = EFI_OUT_OF_RESOURCES;

       goto Done;

@@ -433,7 +412,7 @@ CoreInstallProtocolInterfaceNotify (
   } else {

     Status = CoreValidateHandle (Handle);

     if (EFI_ERROR (Status)) {

-      DEBUG((DEBUG_ERROR, "InstallProtocolInterface: input handle at 0x%x is invalid\n", Handle));

+      DEBUG ((DEBUG_ERROR, "InstallProtocolInterface: input handle at 0x%x is invalid\n", Handle));

       goto Done;

     }

   }

@@ -447,8 +426,8 @@ CoreInstallProtocolInterfaceNotify (
   // Initialize the protocol interface structure

   //

   Prot->Signature = PROTOCOL_INTERFACE_SIGNATURE;

-  Prot->Handle = Handle;

-  Prot->Protocol = ProtEntry;

+  Prot->Handle    = Handle;

+  Prot->Protocol  = ProtEntry;

   Prot->Interface = Interface;

 

   //

@@ -475,6 +454,7 @@ CoreInstallProtocolInterfaceNotify (
   if (Notify) {

     CoreNotifyProtocolEntry (ProtEntry);

   }

+

   Status = EFI_SUCCESS;

 

 Done:

@@ -494,15 +474,13 @@ Done:
     if (Prot != NULL) {

       CoreFreePool (Prot);

     }

-    DEBUG((DEBUG_ERROR, "InstallProtocolInterface: %g %p failed with %r\n", Protocol, Interface, Status));

+

+    DEBUG ((DEBUG_ERROR, "InstallProtocolInterface: %g %p failed with %r\n", Protocol, Interface, Status));

   }

 

   return Status;

 }

 

-

-

-

 /**

   Installs a list of protocol interface into the boot services environment.

   This function calls InstallProtocolInterface() in a loop. If any error

@@ -528,7 +506,7 @@ Done:
 EFI_STATUS

 EFIAPI

 CoreInstallMultipleProtocolInterfaces (

-  IN OUT EFI_HANDLE           *Handle,

+  IN OUT EFI_HANDLE  *Handle,

   ...

   )

 {

@@ -549,7 +527,7 @@ CoreInstallMultipleProtocolInterfaces (
   //

   // Syncronize with notifcations.

   //

-  OldTpl = CoreRaiseTpl (TPL_NOTIFY);

+  OldTpl    = CoreRaiseTpl (TPL_NOTIFY);

   OldHandle = *Handle;

 

   //

@@ -573,8 +551,8 @@ CoreInstallMultipleProtocolInterfaces (
     if (CompareGuid (Protocol, &gEfiDevicePathProtocolGuid)) {

       DeviceHandle = NULL;

       DevicePath   = Interface;

-      Status = CoreLocateDevicePath (&gEfiDevicePathProtocolGuid, &DevicePath, &DeviceHandle);

-      if (!EFI_ERROR (Status) && (DeviceHandle != NULL) && IsDevicePathEnd(DevicePath)) {

+      Status       = CoreLocateDevicePath (&gEfiDevicePathProtocolGuid, &DevicePath, &DeviceHandle);

+      if (!EFI_ERROR (Status) && (DeviceHandle != NULL) && IsDevicePathEnd (DevicePath)) {

         Status = EFI_ALREADY_STARTED;

         continue;

       }

@@ -585,6 +563,7 @@ CoreInstallMultipleProtocolInterfaces (
     //

     Status = CoreInstallProtocolInterface (Handle, Protocol, EFI_NATIVE_INTERFACE, Interface);

   }

+

   VA_END (Args);

 

   //

@@ -595,11 +574,12 @@ CoreInstallMultipleProtocolInterfaces (
     // Reset the va_arg back to the first argument.

     //

     VA_START (Args, Handle);

-    for (; Index > 1; Index--) {

-      Protocol = VA_ARG (Args, EFI_GUID *);

+    for ( ; Index > 1; Index--) {

+      Protocol  = VA_ARG (Args, EFI_GUID *);

       Interface = VA_ARG (Args, VOID *);

       CoreUninstallProtocolInterface (*Handle, Protocol, Interface);

     }

+

     VA_END (Args);

 

     *Handle = OldHandle;

@@ -612,7 +592,6 @@ CoreInstallMultipleProtocolInterfaces (
   return Status;

 }

 

-

 /**

   Attempts to disconnect all drivers that are using the protocol interface being queried.

   If failed, reconnect all drivers disconnected.

@@ -629,14 +608,14 @@ CoreInstallMultipleProtocolInterfaces (
 **/

 EFI_STATUS

 CoreDisconnectControllersUsingProtocolInterface (

-  IN EFI_HANDLE           UserHandle,

-  IN PROTOCOL_INTERFACE   *Prot

+  IN EFI_HANDLE          UserHandle,

+  IN PROTOCOL_INTERFACE  *Prot

   )

 {

-  EFI_STATUS            Status;

-  BOOLEAN               ItemFound;

-  LIST_ENTRY            *Link;

-  OPEN_PROTOCOL_DATA    *OpenData;

+  EFI_STATUS          Status;

+  BOOLEAN             ItemFound;

+  LIST_ENTRY          *Link;

+  OPEN_PROTOCOL_DATA  *OpenData;

 

   Status = EFI_SUCCESS;

 

@@ -654,6 +633,7 @@ CoreDisconnectControllersUsingProtocolInterface (
         if (!EFI_ERROR (Status)) {

           ItemFound = TRUE;

         }

+

         break;

       }

     }

@@ -666,7 +646,8 @@ CoreDisconnectControllersUsingProtocolInterface (
     for (Link = Prot->OpenList.ForwardLink; Link != &Prot->OpenList;) {

       OpenData = CR (Link, OPEN_PROTOCOL_DATA, Link, OPEN_PROTOCOL_DATA_SIGNATURE);

       if ((OpenData->Attributes &

-          (EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL | EFI_OPEN_PROTOCOL_GET_PROTOCOL | EFI_OPEN_PROTOCOL_TEST_PROTOCOL)) != 0) {

+           (EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL | EFI_OPEN_PROTOCOL_GET_PROTOCOL | EFI_OPEN_PROTOCOL_TEST_PROTOCOL)) != 0)

+      {

         Link = RemoveEntryList (&OpenData->Link);

         Prot->OpenListCount--;

         CoreFreePool (OpenData);

@@ -689,8 +670,6 @@ CoreDisconnectControllersUsingProtocolInterface (
   return Status;

 }

 

-

-

 /**

   Uninstalls all instances of a protocol:interfacer from a handle.

   If the last protocol interface is remove from the handle, the

@@ -707,14 +686,14 @@ CoreDisconnectControllersUsingProtocolInterface (
 EFI_STATUS

 EFIAPI

 CoreUninstallProtocolInterface (

-  IN EFI_HANDLE       UserHandle,

-  IN EFI_GUID         *Protocol,

-  IN VOID             *Interface

+  IN EFI_HANDLE  UserHandle,

+  IN EFI_GUID    *Protocol,

+  IN VOID        *Interface

   )

 {

-  EFI_STATUS            Status;

-  IHANDLE               *Handle;

-  PROTOCOL_INTERFACE    *Prot;

+  EFI_STATUS          Status;

+  IHANDLE             *Handle;

+  PROTOCOL_INTERFACE  *Prot;

 

   //

   // Check that Protocol is valid

@@ -803,8 +782,6 @@ Done:
   return Status;

 }

 

-

-

 /**

   Uninstalls a list of protocol interface in the boot services environment.

   This function calls UninstallProtocolInterface() in a loop. This is

@@ -830,15 +807,15 @@ Done:
 EFI_STATUS

 EFIAPI

 CoreUninstallMultipleProtocolInterfaces (

-  IN EFI_HANDLE           Handle,

+  IN EFI_HANDLE  Handle,

   ...

   )

 {

-  EFI_STATUS      Status;

-  VA_LIST         Args;

-  EFI_GUID        *Protocol;

-  VOID            *Interface;

-  UINTN           Index;

+  EFI_STATUS  Status;

+  VA_LIST     Args;

+  EFI_GUID    *Protocol;

+  VOID        *Interface;

+  UINTN       Index;

 

   VA_START (Args, Handle);

   for (Index = 0, Status = EFI_SUCCESS; !EFI_ERROR (Status); Index++) {

@@ -857,6 +834,7 @@ CoreUninstallMultipleProtocolInterfaces (
     //

     Status = CoreUninstallProtocolInterface (Handle, Protocol, Interface);

   }

+

   VA_END (Args);

 

   //

@@ -868,11 +846,12 @@ CoreUninstallMultipleProtocolInterfaces (
     // Reset the va_arg back to the first argument.

     //

     VA_START (Args, Handle);

-    for (; Index > 1; Index--) {

-      Protocol = VA_ARG(Args, EFI_GUID *);

-      Interface = VA_ARG(Args, VOID *);

+    for ( ; Index > 1; Index--) {

+      Protocol  = VA_ARG (Args, EFI_GUID *);

+      Interface = VA_ARG (Args, VOID *);

       CoreInstallProtocolInterface (&Handle, Protocol, EFI_NATIVE_INTERFACE, Interface);

     }

+

     VA_END (Args);

     Status = EFI_INVALID_PARAMETER;

   }

@@ -880,7 +859,6 @@ CoreUninstallMultipleProtocolInterfaces (
   return Status;

 }

 

-

 /**

   Locate a certain GUID protocol interface in a Handle's protocols.

 

@@ -892,8 +870,8 @@ CoreUninstallMultipleProtocolInterfaces (
 **/

 PROTOCOL_INTERFACE  *

 CoreGetProtocolInterface (

-  IN  EFI_HANDLE                UserHandle,

-  IN  EFI_GUID                  *Protocol

+  IN  EFI_HANDLE  UserHandle,

+  IN  EFI_GUID    *Protocol

   )

 {

   EFI_STATUS          Status;

@@ -913,17 +891,16 @@ CoreGetProtocolInterface (
   // Look at each protocol interface for a match

   //

   for (Link = Handle->Protocols.ForwardLink; Link != &Handle->Protocols; Link = Link->ForwardLink) {

-    Prot = CR(Link, PROTOCOL_INTERFACE, Link, PROTOCOL_INTERFACE_SIGNATURE);

+    Prot      = CR (Link, PROTOCOL_INTERFACE, Link, PROTOCOL_INTERFACE_SIGNATURE);

     ProtEntry = Prot->Protocol;

     if (CompareGuid (&ProtEntry->ProtocolID, Protocol)) {

       return Prot;

     }

   }

+

   return NULL;

 }

 

-

-

 /**

   Queries a handle to determine if it supports a specified protocol.

 

@@ -942,23 +919,21 @@ CoreGetProtocolInterface (
 EFI_STATUS

 EFIAPI

 CoreHandleProtocol (

-  IN EFI_HANDLE       UserHandle,

-  IN EFI_GUID         *Protocol,

-  OUT VOID            **Interface

+  IN EFI_HANDLE  UserHandle,

+  IN EFI_GUID    *Protocol,

+  OUT VOID       **Interface

   )

 {

   return CoreOpenProtocol (

-          UserHandle,

-          Protocol,

-          Interface,

-          gDxeCoreImageHandle,

-          NULL,

-          EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL

-          );

+           UserHandle,

+           Protocol,

+           Interface,

+           gDxeCoreImageHandle,

+           NULL,

+           EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL

+           );

 }

 

-

-

 /**

   Locates the installed protocol handler for the handle, and

   invokes it to obtain the protocol interface. Usage information

@@ -982,12 +957,12 @@ CoreHandleProtocol (
 EFI_STATUS

 EFIAPI

 CoreOpenProtocol (

-  IN  EFI_HANDLE                UserHandle,

-  IN  EFI_GUID                  *Protocol,

-  OUT VOID                      **Interface OPTIONAL,

-  IN  EFI_HANDLE                ImageHandle,

-  IN  EFI_HANDLE                ControllerHandle,

-  IN  UINT32                    Attributes

+  IN  EFI_HANDLE  UserHandle,

+  IN  EFI_GUID    *Protocol,

+  OUT VOID        **Interface OPTIONAL,

+  IN  EFI_HANDLE  ImageHandle,

+  IN  EFI_HANDLE  ControllerHandle,

+  IN  UINT32      Attributes

   )

 {

   EFI_STATUS          Status;

@@ -1030,47 +1005,52 @@ CoreOpenProtocol (
   // Check for invalid Attributes

   //

   switch (Attributes) {

-  case EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER :

-    Status = CoreValidateHandle (ImageHandle);

-    if (EFI_ERROR (Status)) {

-      goto Done;

-    }

-    Status = CoreValidateHandle (ControllerHandle);

-    if (EFI_ERROR (Status)) {

-      goto Done;

-    }

-    if (UserHandle == ControllerHandle) {

+    case EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER:

+      Status = CoreValidateHandle (ImageHandle);

+      if (EFI_ERROR (Status)) {

+        goto Done;

+      }

+

+      Status = CoreValidateHandle (ControllerHandle);

+      if (EFI_ERROR (Status)) {

+        goto Done;

+      }

+

+      if (UserHandle == ControllerHandle) {

+        Status = EFI_INVALID_PARAMETER;

+        goto Done;

+      }

+

+      break;

+    case EFI_OPEN_PROTOCOL_BY_DRIVER:

+    case EFI_OPEN_PROTOCOL_BY_DRIVER | EFI_OPEN_PROTOCOL_EXCLUSIVE:

+      Status = CoreValidateHandle (ImageHandle);

+      if (EFI_ERROR (Status)) {

+        goto Done;

+      }

+

+      Status = CoreValidateHandle (ControllerHandle);

+      if (EFI_ERROR (Status)) {

+        goto Done;

+      }

+

+      break;

+    case EFI_OPEN_PROTOCOL_EXCLUSIVE:

+      Status = CoreValidateHandle (ImageHandle);

+      if (EFI_ERROR (Status)) {

+        goto Done;

+      }

+

+      break;

+    case EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL:

+    case EFI_OPEN_PROTOCOL_GET_PROTOCOL:

+    case EFI_OPEN_PROTOCOL_TEST_PROTOCOL:

+      break;

+    default:

       Status = EFI_INVALID_PARAMETER;

       goto Done;

-    }

-    break;

-  case EFI_OPEN_PROTOCOL_BY_DRIVER :

-  case EFI_OPEN_PROTOCOL_BY_DRIVER | EFI_OPEN_PROTOCOL_EXCLUSIVE :

-    Status = CoreValidateHandle (ImageHandle);

-    if (EFI_ERROR (Status)) {

-      goto Done;

-    }

-    Status = CoreValidateHandle (ControllerHandle);

-    if (EFI_ERROR (Status)) {

-      goto Done;

-    }

-    break;

-  case EFI_OPEN_PROTOCOL_EXCLUSIVE :

-    Status = CoreValidateHandle (ImageHandle);

-    if (EFI_ERROR (Status)) {

-      goto Done;

-    }

-    break;

-  case EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL :

-  case EFI_OPEN_PROTOCOL_GET_PROTOCOL :

-  case EFI_OPEN_PROTOCOL_TEST_PROTOCOL :

-    break;

-  default:

-    Status = EFI_INVALID_PARAMETER;

-    goto Done;

   }

 

-

   //

   // Look at each protocol interface for a match

   //

@@ -1082,10 +1062,10 @@ CoreOpenProtocol (
 

   Status = EFI_SUCCESS;

 

-  ByDriver        = FALSE;

-  Exclusive       = FALSE;

+  ByDriver  = FALSE;

+  Exclusive = FALSE;

   for ( Link = Prot->OpenList.ForwardLink; Link != &Prot->OpenList; Link = Link->ForwardLink) {

-    OpenData = CR (Link, OPEN_PROTOCOL_DATA, Link, OPEN_PROTOCOL_DATA_SIGNATURE);

+    OpenData   = CR (Link, OPEN_PROTOCOL_DATA, Link, OPEN_PROTOCOL_DATA_SIGNATURE);

     ExactMatch =  (BOOLEAN)((OpenData->AgentHandle == ImageHandle) &&

                             (OpenData->Attributes == Attributes)  &&

                             (OpenData->ControllerHandle == ControllerHandle));

@@ -1096,6 +1076,7 @@ CoreOpenProtocol (
         goto Done;

       }

     }

+

     if ((OpenData->Attributes & EFI_OPEN_PROTOCOL_EXCLUSIVE) != 0) {

       Exclusive = TRUE;

     } else if (ExactMatch) {

@@ -1113,62 +1094,66 @@ CoreOpenProtocol (
   //

 

   switch (Attributes) {

-  case EFI_OPEN_PROTOCOL_BY_DRIVER :

-    if (Exclusive || ByDriver) {

-      Status = EFI_ACCESS_DENIED;

-      goto Done;

-    }

-    break;

-  case EFI_OPEN_PROTOCOL_BY_DRIVER | EFI_OPEN_PROTOCOL_EXCLUSIVE :

-  case EFI_OPEN_PROTOCOL_EXCLUSIVE :

-    if (Exclusive) {

-      Status = EFI_ACCESS_DENIED;

-      goto Done;

-    }

-    if (ByDriver) {

-      do {

-        Disconnect = FALSE;

-        for (Link = Prot->OpenList.ForwardLink; Link != &Prot->OpenList; Link = Link->ForwardLink) {

-          OpenData = CR (Link, OPEN_PROTOCOL_DATA, Link, OPEN_PROTOCOL_DATA_SIGNATURE);

-          if ((OpenData->Attributes & EFI_OPEN_PROTOCOL_BY_DRIVER) != 0) {

-            Disconnect = TRUE;

-            CoreReleaseProtocolLock ();

-            Status = CoreDisconnectController (UserHandle, OpenData->AgentHandle, NULL);

-            CoreAcquireProtocolLock ();

-            if (EFI_ERROR (Status)) {

-              Status = EFI_ACCESS_DENIED;

-              goto Done;

-            } else {

-              break;

+    case EFI_OPEN_PROTOCOL_BY_DRIVER:

+      if (Exclusive || ByDriver) {

+        Status = EFI_ACCESS_DENIED;

+        goto Done;

+      }

+

+      break;

+    case EFI_OPEN_PROTOCOL_BY_DRIVER | EFI_OPEN_PROTOCOL_EXCLUSIVE:

+    case EFI_OPEN_PROTOCOL_EXCLUSIVE:

+      if (Exclusive) {

+        Status = EFI_ACCESS_DENIED;

+        goto Done;

+      }

+

+      if (ByDriver) {

+        do {

+          Disconnect = FALSE;

+          for (Link = Prot->OpenList.ForwardLink; Link != &Prot->OpenList; Link = Link->ForwardLink) {

+            OpenData = CR (Link, OPEN_PROTOCOL_DATA, Link, OPEN_PROTOCOL_DATA_SIGNATURE);

+            if ((OpenData->Attributes & EFI_OPEN_PROTOCOL_BY_DRIVER) != 0) {

+              Disconnect = TRUE;

+              CoreReleaseProtocolLock ();

+              Status = CoreDisconnectController (UserHandle, OpenData->AgentHandle, NULL);

+              CoreAcquireProtocolLock ();

+              if (EFI_ERROR (Status)) {

+                Status = EFI_ACCESS_DENIED;

+                goto Done;

+              } else {

+                break;

+              }

             }

           }

-        }

-      } while (Disconnect);

-    }

-    break;

-  case EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER :

-  case EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL :

-  case EFI_OPEN_PROTOCOL_GET_PROTOCOL :

-  case EFI_OPEN_PROTOCOL_TEST_PROTOCOL :

-    break;

+        } while (Disconnect);

+      }

+

+      break;

+    case EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER:

+    case EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL:

+    case EFI_OPEN_PROTOCOL_GET_PROTOCOL:

+    case EFI_OPEN_PROTOCOL_TEST_PROTOCOL:

+      break;

   }

 

   if (ImageHandle == NULL) {

     Status = EFI_SUCCESS;

     goto Done;

   }

+

   //

   // Create new entry

   //

-  OpenData = AllocatePool (sizeof(OPEN_PROTOCOL_DATA));

+  OpenData = AllocatePool (sizeof (OPEN_PROTOCOL_DATA));

   if (OpenData == NULL) {

     Status = EFI_OUT_OF_RESOURCES;

   } else {

-    OpenData->Signature         = OPEN_PROTOCOL_DATA_SIGNATURE;

-    OpenData->AgentHandle       = ImageHandle;

-    OpenData->ControllerHandle  = ControllerHandle;

-    OpenData->Attributes        = Attributes;

-    OpenData->OpenCount         = 1;

+    OpenData->Signature        = OPEN_PROTOCOL_DATA_SIGNATURE;

+    OpenData->AgentHandle      = ImageHandle;

+    OpenData->ControllerHandle = ControllerHandle;

+    OpenData->Attributes       = Attributes;

+    OpenData->OpenCount        = 1;

     InsertTailList (&Prot->OpenList, &OpenData->Link);

     Prot->OpenListCount++;

     Status = EFI_SUCCESS;

@@ -1181,7 +1166,7 @@ Done:
     // Keep Interface unmodified in case of any Error

     // except EFI_ALREADY_STARTED and EFI_UNSUPPORTED.

     //

-    if (!EFI_ERROR (Status) || Status == EFI_ALREADY_STARTED) {

+    if (!EFI_ERROR (Status) || (Status == EFI_ALREADY_STARTED)) {

       //

       // According to above logic, if 'Prot' is NULL, then the 'Status' must be

       // EFI_UNSUPPORTED. Here the 'Status' is not EFI_UNSUPPORTED, so 'Prot'

@@ -1211,8 +1196,6 @@ Done:
   return Status;

 }

 

-

-

 /**

   Closes a protocol on a handle that was opened using OpenProtocol().

 

@@ -1241,10 +1224,10 @@ Done:
 EFI_STATUS

 EFIAPI

 CoreCloseProtocol (

-  IN  EFI_HANDLE                UserHandle,

-  IN  EFI_GUID                  *Protocol,

-  IN  EFI_HANDLE                AgentHandle,

-  IN  EFI_HANDLE                ControllerHandle

+  IN  EFI_HANDLE  UserHandle,

+  IN  EFI_GUID    *Protocol,

+  IN  EFI_HANDLE  AgentHandle,

+  IN  EFI_HANDLE  ControllerHandle

   )

 {

   EFI_STATUS          Status;

@@ -1264,16 +1247,19 @@ CoreCloseProtocol (
   if (EFI_ERROR (Status)) {

     goto Done;

   }

+

   Status = CoreValidateHandle (AgentHandle);

   if (EFI_ERROR (Status)) {

     goto Done;

   }

+

   if (ControllerHandle != NULL) {

     Status = CoreValidateHandle (ControllerHandle);

     if (EFI_ERROR (Status)) {

       goto Done;

     }

   }

+

   if (Protocol == NULL) {

     Status = EFI_INVALID_PARAMETER;

     goto Done;

@@ -1282,7 +1268,7 @@ CoreCloseProtocol (
   //

   // Look at each protocol interface for a match

   //

-  Status = EFI_NOT_FOUND;

+  Status            = EFI_NOT_FOUND;

   ProtocolInterface = CoreGetProtocolInterface (UserHandle, Protocol);

   if (ProtocolInterface == NULL) {

     goto Done;

@@ -1294,12 +1280,12 @@ CoreCloseProtocol (
   Link = ProtocolInterface->OpenList.ForwardLink;

   while (Link != &ProtocolInterface->OpenList) {

     OpenData = CR (Link, OPEN_PROTOCOL_DATA, Link, OPEN_PROTOCOL_DATA_SIGNATURE);

-    Link = Link->ForwardLink;

+    Link     = Link->ForwardLink;

     if ((OpenData->AgentHandle == AgentHandle) && (OpenData->ControllerHandle == ControllerHandle)) {

-        RemoveEntryList (&OpenData->Link);

-        ProtocolInterface->OpenListCount--;

-        CoreFreePool (OpenData);

-        Status = EFI_SUCCESS;

+      RemoveEntryList (&OpenData->Link);

+      ProtocolInterface->OpenListCount--;

+      CoreFreePool (OpenData);

+      Status = EFI_SUCCESS;

     }

   }

 

@@ -1311,9 +1297,6 @@ Done:
   return Status;

 }

 

-

-

-

 /**

   Return information about Opened protocols in the system

 

@@ -1332,22 +1315,22 @@ Done:
 EFI_STATUS

 EFIAPI

 CoreOpenProtocolInformation (

-  IN  EFI_HANDLE                          UserHandle,

-  IN  EFI_GUID                            *Protocol,

-  OUT EFI_OPEN_PROTOCOL_INFORMATION_ENTRY **EntryBuffer,

-  OUT UINTN                               *EntryCount

+  IN  EFI_HANDLE                           UserHandle,

+  IN  EFI_GUID                             *Protocol,

+  OUT EFI_OPEN_PROTOCOL_INFORMATION_ENTRY  **EntryBuffer,

+  OUT UINTN                                *EntryCount

   )

 {

-  EFI_STATUS                          Status;

-  PROTOCOL_INTERFACE                  *ProtocolInterface;

-  LIST_ENTRY                          *Link;

-  OPEN_PROTOCOL_DATA                  *OpenData;

-  EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *Buffer;

-  UINTN                               Count;

-  UINTN                               Size;

+  EFI_STATUS                           Status;

+  PROTOCOL_INTERFACE                   *ProtocolInterface;

+  LIST_ENTRY                           *Link;

+  OPEN_PROTOCOL_DATA                   *OpenData;

+  EFI_OPEN_PROTOCOL_INFORMATION_ENTRY  *Buffer;

+  UINTN                                Count;

+  UINTN                                Size;

 

   *EntryBuffer = NULL;

-  *EntryCount = 0;

+  *EntryCount  = 0;

 

   //

   // Lock the protocol database

@@ -1357,7 +1340,7 @@ CoreOpenProtocolInformation (
   //

   // Look at each protocol interface for a match

   //

-  Status = EFI_NOT_FOUND;

+  Status            = EFI_NOT_FOUND;

   ProtocolInterface = CoreGetProtocolInterface (UserHandle, Protocol);

   if (ProtocolInterface == NULL) {

     goto Done;

@@ -1367,17 +1350,18 @@ CoreOpenProtocolInformation (
   // Count the number of Open Entries

   //

   for ( Link = ProtocolInterface->OpenList.ForwardLink, Count = 0;

-        (Link != &ProtocolInterface->OpenList) ;

-        Link = Link->ForwardLink  ) {

+        (Link != &ProtocolInterface->OpenList);

+        Link = Link->ForwardLink  )

+  {

     Count++;

   }

 

   ASSERT (Count == ProtocolInterface->OpenListCount);

 

   if (Count == 0) {

-    Size = sizeof(EFI_OPEN_PROTOCOL_INFORMATION_ENTRY);

+    Size = sizeof (EFI_OPEN_PROTOCOL_INFORMATION_ENTRY);

   } else {

-    Size = Count * sizeof(EFI_OPEN_PROTOCOL_INFORMATION_ENTRY);

+    Size = Count * sizeof (EFI_OPEN_PROTOCOL_INFORMATION_ENTRY);

   }

 

   Buffer = AllocatePool (Size);

@@ -1389,7 +1373,8 @@ CoreOpenProtocolInformation (
   Status = EFI_SUCCESS;

   for ( Link = ProtocolInterface->OpenList.ForwardLink, Count = 0;

         (Link != &ProtocolInterface->OpenList);

-        Link = Link->ForwardLink, Count++  ) {

+        Link = Link->ForwardLink, Count++  )

+  {

     OpenData = CR (Link, OPEN_PROTOCOL_DATA, Link, OPEN_PROTOCOL_DATA_SIGNATURE);

 

     Buffer[Count].AgentHandle      = OpenData->AgentHandle;

@@ -1399,7 +1384,7 @@ CoreOpenProtocolInformation (
   }

 

   *EntryBuffer = Buffer;

-  *EntryCount = Count;

+  *EntryCount  = Count;

 

 Done:

   //

@@ -1409,9 +1394,6 @@ Done:
   return Status;

 }

 

-

-

-

 /**

   Retrieves the list of protocol interface GUIDs that are installed on a handle in a buffer allocated

   from pool.

@@ -1438,17 +1420,17 @@ Done:
 EFI_STATUS

 EFIAPI

 CoreProtocolsPerHandle (

-  IN EFI_HANDLE       UserHandle,

-  OUT EFI_GUID        ***ProtocolBuffer,

-  OUT UINTN           *ProtocolBufferCount

+  IN EFI_HANDLE  UserHandle,

+  OUT EFI_GUID   ***ProtocolBuffer,

+  OUT UINTN      *ProtocolBufferCount

   )

 {

-  EFI_STATUS                          Status;

-  IHANDLE                             *Handle;

-  PROTOCOL_INTERFACE                  *Prot;

-  LIST_ENTRY                          *Link;

-  UINTN                               ProtocolCount;

-  EFI_GUID                            **Buffer;

+  EFI_STATUS          Status;

+  IHANDLE             *Handle;

+  PROTOCOL_INTERFACE  *Prot;

+  LIST_ENTRY          *Link;

+  UINTN               ProtocolCount;

+  EFI_GUID            **Buffer;

 

   if (ProtocolBuffer == NULL) {

     return EFI_INVALID_PARAMETER;

@@ -1489,15 +1471,17 @@ CoreProtocolsPerHandle (
     goto Done;

   }

 

-  *ProtocolBuffer = Buffer;

+  *ProtocolBuffer      = Buffer;

   *ProtocolBufferCount = ProtocolCount;

 

   for ( Link = Handle->Protocols.ForwardLink, ProtocolCount = 0;

         Link != &Handle->Protocols;

-        Link = Link->ForwardLink, ProtocolCount++) {

-    Prot = CR(Link, PROTOCOL_INTERFACE, Link, PROTOCOL_INTERFACE_SIGNATURE);

+        Link = Link->ForwardLink, ProtocolCount++)

+  {

+    Prot                  = CR (Link, PROTOCOL_INTERFACE, Link, PROTOCOL_INTERFACE_SIGNATURE);

     Buffer[ProtocolCount] = &(Prot->Protocol->ProtocolID);

   }

+

   Status = EFI_SUCCESS;

 

 Done:

@@ -1505,8 +1489,6 @@ Done:
   return Status;

 }

 

-

-

 /**

   return handle database key.

 

@@ -1522,8 +1504,6 @@ CoreGetHandleDatabaseKey (
   return gHandleDatabaseKey;

 }

 

-

-

 /**

   Go connect any handles that were created or modified while a image executed.

 

@@ -1536,11 +1516,11 @@ CoreConnectHandlesByKey (
   UINT64  Key

   )

 {

-  UINTN           Count;

-  LIST_ENTRY      *Link;

-  EFI_HANDLE      *HandleBuffer;

-  IHANDLE         *Handle;

-  UINTN           Index;

+  UINTN       Count;

+  LIST_ENTRY  *Link;

+  EFI_HANDLE  *HandleBuffer;

+  IHANDLE     *Handle;

+  UINTN       Index;

 

   //

   // Lock the protocol database

@@ -1579,5 +1559,5 @@ CoreConnectHandlesByKey (
     CoreConnectController (HandleBuffer[Index], NULL, NULL, TRUE);

   }

 

-  CoreFreePool(HandleBuffer);

+  CoreFreePool (HandleBuffer);

 }

diff --git a/MdeModulePkg/Core/Dxe/Hand/Handle.h b/MdeModulePkg/Core/Dxe/Hand/Handle.h
index 3f83e3a..5c66e4d 100644
--- a/MdeModulePkg/Core/Dxe/Hand/Handle.h
+++ b/MdeModulePkg/Core/Dxe/Hand/Handle.h
@@ -9,26 +9,25 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef  _HAND_H_

 #define  _HAND_H_

 

-

-#define EFI_HANDLE_SIGNATURE            SIGNATURE_32('h','n','d','l')

+#define EFI_HANDLE_SIGNATURE  SIGNATURE_32('h','n','d','l')

 

 ///

 /// IHANDLE - contains a list of protocol handles

 ///

 typedef struct {

-  UINTN               Signature;

+  UINTN         Signature;

   /// All handles list of IHANDLE

-  LIST_ENTRY          AllHandles;

+  LIST_ENTRY    AllHandles;

   /// List of PROTOCOL_INTERFACE's for this handle

-  LIST_ENTRY          Protocols;

-  UINTN               LocateRequest;

+  LIST_ENTRY    Protocols;

+  UINTN         LocateRequest;

   /// The Handle Database Key value when this handle was last created or modified

-  UINT64              Key;

+  UINT64        Key;

 } IHANDLE;

 

 #define ASSERT_IS_HANDLE(a)  ASSERT((a)->Signature == EFI_HANDLE_SIGNATURE)

 

-#define PROTOCOL_ENTRY_SIGNATURE        SIGNATURE_32('p','r','t','e')

+#define PROTOCOL_ENTRY_SIGNATURE  SIGNATURE_32('p','r','t','e')

 

 ///

 /// PROTOCOL_ENTRY - each different protocol has 1 entry in the protocol

@@ -36,18 +35,17 @@ typedef struct {
 /// with a list of registered notifies.

 ///

 typedef struct {

-  UINTN               Signature;

+  UINTN         Signature;

   /// Link Entry inserted to mProtocolDatabase

-  LIST_ENTRY          AllEntries;

+  LIST_ENTRY    AllEntries;

   /// ID of the protocol

-  EFI_GUID            ProtocolID;

+  EFI_GUID      ProtocolID;

   /// All protocol interfaces

-  LIST_ENTRY          Protocols;

+  LIST_ENTRY    Protocols;

   /// Registerd notification handlers

-  LIST_ENTRY          Notify;

+  LIST_ENTRY    Notify;

 } PROTOCOL_ENTRY;

 

-

 #define PROTOCOL_INTERFACE_SIGNATURE  SIGNATURE_32('p','i','f','c')

 

 ///

@@ -55,55 +53,51 @@ typedef struct {
 /// with a protocol interface structure

 ///

 typedef struct {

-  UINTN                       Signature;

+  UINTN             Signature;

   /// Link on IHANDLE.Protocols

-  LIST_ENTRY                  Link;

+  LIST_ENTRY        Link;

   /// Back pointer

-  IHANDLE                     *Handle;

+  IHANDLE           *Handle;

   /// Link on PROTOCOL_ENTRY.Protocols

-  LIST_ENTRY                  ByProtocol;

+  LIST_ENTRY        ByProtocol;

   /// The protocol ID

-  PROTOCOL_ENTRY              *Protocol;

+  PROTOCOL_ENTRY    *Protocol;

   /// The interface value

-  VOID                        *Interface;

+  VOID              *Interface;

   /// OPEN_PROTOCOL_DATA list

-  LIST_ENTRY                  OpenList;

-  UINTN                       OpenListCount;

-

+  LIST_ENTRY        OpenList;

+  UINTN             OpenListCount;

 } PROTOCOL_INTERFACE;

 

 #define OPEN_PROTOCOL_DATA_SIGNATURE  SIGNATURE_32('p','o','d','l')

 

 typedef struct {

-  UINTN                       Signature;

-  ///Link on PROTOCOL_INTERFACE.OpenList

-  LIST_ENTRY                  Link;

-

-  EFI_HANDLE                  AgentHandle;

-  EFI_HANDLE                  ControllerHandle;

-  UINT32                      Attributes;

-  UINT32                      OpenCount;

+  UINTN         Signature;

+  /// Link on PROTOCOL_INTERFACE.OpenList

+  LIST_ENTRY    Link;

+

+  EFI_HANDLE    AgentHandle;

+  EFI_HANDLE    ControllerHandle;

+  UINT32        Attributes;

+  UINT32        OpenCount;

 } OPEN_PROTOCOL_DATA;

 

-

-#define PROTOCOL_NOTIFY_SIGNATURE       SIGNATURE_32('p','r','t','n')

+#define PROTOCOL_NOTIFY_SIGNATURE  SIGNATURE_32('p','r','t','n')

 

 ///

 /// PROTOCOL_NOTIFY - used for each register notification for a protocol

 ///

 typedef struct {

-  UINTN               Signature;

-  PROTOCOL_ENTRY      *Protocol;

+  UINTN             Signature;

+  PROTOCOL_ENTRY    *Protocol;

   /// All notifications for this protocol

-  LIST_ENTRY          Link;

+  LIST_ENTRY        Link;

   /// Event to notify

-  EFI_EVENT           Event;

+  EFI_EVENT         Event;

   /// Last position notified

-  LIST_ENTRY          *Position;

+  LIST_ENTRY        *Position;

 } PROTOCOL_NOTIFY;

 

-

-

 /**

   Finds the protocol entry for the requested protocol.

   The gProtocolDatabaseLock must be owned

@@ -116,11 +110,10 @@ typedef struct {
 **/

 PROTOCOL_ENTRY  *

 CoreFindProtocolEntry (

-  IN EFI_GUID   *Protocol,

-  IN BOOLEAN    Create

+  IN EFI_GUID  *Protocol,

+  IN BOOLEAN   Create

   );

 

-

 /**

   Signal event for every protocol in protocol entry.

 

@@ -129,10 +122,9 @@ CoreFindProtocolEntry (
 **/

 VOID

 CoreNotifyProtocolEntry (

-  IN PROTOCOL_ENTRY   *ProtEntry

+  IN PROTOCOL_ENTRY  *ProtEntry

   );

 

-

 /**

   Finds the protocol instance for the requested handle and protocol.

   Note: This function doesn't do parameters checking, it's caller's responsibility

@@ -147,12 +139,11 @@ CoreNotifyProtocolEntry (
 **/

 PROTOCOL_INTERFACE *

 CoreFindProtocolInterface (

-  IN IHANDLE        *Handle,

-  IN EFI_GUID       *Protocol,

-  IN VOID           *Interface

+  IN IHANDLE   *Handle,

+  IN EFI_GUID  *Protocol,

+  IN VOID      *Interface

   );

 

-

 /**

   Removes Protocol from the protocol list (but not the handle list).

 

@@ -165,12 +156,11 @@ CoreFindProtocolInterface (
 **/

 PROTOCOL_INTERFACE *

 CoreRemoveInterfaceFromProtocol (

-  IN IHANDLE        *Handle,

-  IN EFI_GUID       *Protocol,

-  IN VOID           *Interface

+  IN IHANDLE   *Handle,

+  IN EFI_GUID  *Protocol,

+  IN VOID      *Interface

   );

 

-

 /**

   Connects a controller to a driver.

 

@@ -215,11 +205,10 @@ CoreConnectSingleController (
 **/

 EFI_STATUS

 CoreDisconnectControllersUsingProtocolInterface (

-  IN EFI_HANDLE           UserHandle,

-  IN PROTOCOL_INTERFACE   *Prot

+  IN EFI_HANDLE          UserHandle,

+  IN PROTOCOL_INTERFACE  *Prot

   );

 

-

 /**

   Acquire lock on gProtocolDatabaseLock.

 

@@ -229,7 +218,6 @@ CoreAcquireProtocolLock (
   VOID

   );

 

-

 /**

   Release lock on gProtocolDatabaseLock.

 

@@ -239,7 +227,6 @@ CoreReleaseProtocolLock (
   VOID

   );

 

-

 /**

   Check whether a handle is a valid EFI_HANDLE

   The gProtocolDatabaseLock must be owned

@@ -252,14 +239,14 @@ CoreReleaseProtocolLock (
 **/

 EFI_STATUS

 CoreValidateHandle (

-  IN  EFI_HANDLE                UserHandle

+  IN  EFI_HANDLE  UserHandle

   );

 

 //

 // Externs

 //

-extern EFI_LOCK         gProtocolDatabaseLock;

-extern LIST_ENTRY       gHandleList;

-extern UINT64           gHandleDatabaseKey;

+extern EFI_LOCK    gProtocolDatabaseLock;

+extern LIST_ENTRY  gHandleList;

+extern UINT64      gHandleDatabaseKey;

 

 #endif

diff --git a/MdeModulePkg/Core/Dxe/Hand/Locate.c b/MdeModulePkg/Core/Dxe/Hand/Locate.c
index 4987c04..a29010a 100644
--- a/MdeModulePkg/Core/Dxe/Hand/Locate.c
+++ b/MdeModulePkg/Core/Dxe/Hand/Locate.c
@@ -12,24 +12,24 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //

 // ProtocolRequest - Last LocateHandle request ID

 //

-UINTN mEfiLocateHandleRequest = 0;

+UINTN  mEfiLocateHandleRequest = 0;

 

 //

 // Internal prototypes

 //

 

 typedef struct {

-  EFI_GUID        *Protocol;

-  VOID            *SearchKey;

-  LIST_ENTRY      *Position;

-  PROTOCOL_ENTRY  *ProtEntry;

+  EFI_GUID          *Protocol;

+  VOID              *SearchKey;

+  LIST_ENTRY        *Position;

+  PROTOCOL_ENTRY    *ProtEntry;

 } LOCATE_POSITION;

 

 typedef

 IHANDLE *

-(* CORE_GET_NEXT) (

-  IN OUT LOCATE_POSITION    *Position,

-  OUT VOID                  **Interface

+(*CORE_GET_NEXT) (

+  IN OUT LOCATE_POSITION  *Position,

+  OUT VOID                **Interface

   );

 

 /**

@@ -45,8 +45,8 @@ IHANDLE *
 **/

 IHANDLE *

 CoreGetNextLocateAllHandles (

-  IN OUT LOCATE_POSITION    *Position,

-  OUT VOID                  **Interface

+  IN OUT LOCATE_POSITION  *Position,

+  OUT VOID                **Interface

   );

 

 /**

@@ -63,8 +63,8 @@ CoreGetNextLocateAllHandles (
 **/

 IHANDLE *

 CoreGetNextLocateByRegisterNotify (

-  IN OUT LOCATE_POSITION    *Position,

-  OUT VOID                  **Interface

+  IN OUT LOCATE_POSITION  *Position,

+  OUT VOID                **Interface

   );

 

 /**

@@ -80,11 +80,10 @@ CoreGetNextLocateByRegisterNotify (
 **/

 IHANDLE *

 CoreGetNextLocateByProtocol (

-  IN OUT LOCATE_POSITION    *Position,

-  OUT VOID                  **Interface

+  IN OUT LOCATE_POSITION  *Position,

+  OUT VOID                **Interface

   );

 

-

 /**

   Internal function for locating the requested handle(s) and returns them in Buffer.

   The caller should already have acquired the ProtocolLock.

@@ -106,21 +105,21 @@ CoreGetNextLocateByProtocol (
 **/

 EFI_STATUS

 InternalCoreLocateHandle (

-  IN EFI_LOCATE_SEARCH_TYPE   SearchType,

-  IN EFI_GUID                 *Protocol   OPTIONAL,

-  IN VOID                     *SearchKey  OPTIONAL,

-  IN OUT UINTN                *BufferSize,

-  OUT EFI_HANDLE              *Buffer

+  IN EFI_LOCATE_SEARCH_TYPE  SearchType,

+  IN EFI_GUID                *Protocol   OPTIONAL,

+  IN VOID                    *SearchKey  OPTIONAL,

+  IN OUT UINTN               *BufferSize,

+  OUT EFI_HANDLE             *Buffer

   )

 {

-  EFI_STATUS          Status;

-  LOCATE_POSITION     Position;

-  PROTOCOL_NOTIFY     *ProtNotify;

-  CORE_GET_NEXT       GetNext;

-  UINTN               ResultSize;

-  IHANDLE             *Handle;

-  IHANDLE             **ResultBuffer;

-  VOID                *Interface;

+  EFI_STATUS       Status;

+  LOCATE_POSITION  Position;

+  PROTOCOL_NOTIFY  *ProtNotify;

+  CORE_GET_NEXT    GetNext;

+  UINTN            ResultSize;

+  IHANDLE          *Handle;

+  IHANDLE          **ResultBuffer;

+  VOID             *Interface;

 

   if (BufferSize == NULL) {

     return EFI_INVALID_PARAMETER;

@@ -139,52 +138,55 @@ InternalCoreLocateHandle (
   Position.SearchKey = SearchKey;

   Position.Position  = &gHandleList;

 

-  ResultSize = 0;

-  ResultBuffer = (IHANDLE **) Buffer;

-  Status = EFI_SUCCESS;

+  ResultSize   = 0;

+  ResultBuffer = (IHANDLE **)Buffer;

+  Status       = EFI_SUCCESS;

 

   //

   // Get the search function based on type

   //

   switch (SearchType) {

-  case AllHandles:

-    GetNext = CoreGetNextLocateAllHandles;

-    break;

-

-  case ByRegisterNotify:

-    //

-    // Must have SearchKey for locate ByRegisterNotify

-    //

-    if (SearchKey == NULL) {

-      Status = EFI_INVALID_PARAMETER;

+    case AllHandles:

+      GetNext = CoreGetNextLocateAllHandles;

       break;

-    }

-    GetNext = CoreGetNextLocateByRegisterNotify;

-    break;

 

-  case ByProtocol:

-    GetNext = CoreGetNextLocateByProtocol;

-    if (Protocol == NULL) {

-      Status = EFI_INVALID_PARAMETER;

+    case ByRegisterNotify:

+      //

+      // Must have SearchKey for locate ByRegisterNotify

+      //

+      if (SearchKey == NULL) {

+        Status = EFI_INVALID_PARAMETER;

+        break;

+      }

+

+      GetNext = CoreGetNextLocateByRegisterNotify;

       break;

-    }

-    //

-    // Look up the protocol entry and set the head pointer

-    //

-    Position.ProtEntry = CoreFindProtocolEntry (Protocol, FALSE);

-    if (Position.ProtEntry == NULL) {

-      Status = EFI_NOT_FOUND;

+

+    case ByProtocol:

+      GetNext = CoreGetNextLocateByProtocol;

+      if (Protocol == NULL) {

+        Status = EFI_INVALID_PARAMETER;

+        break;

+      }

+

+      //

+      // Look up the protocol entry and set the head pointer

+      //

+      Position.ProtEntry = CoreFindProtocolEntry (Protocol, FALSE);

+      if (Position.ProtEntry == NULL) {

+        Status = EFI_NOT_FOUND;

+        break;

+      }

+

+      Position.Position = &Position.ProtEntry->Protocols;

       break;

-    }

-    Position.Position = &Position.ProtEntry->Protocols;

-    break;

 

-  default:

-    Status = EFI_INVALID_PARAMETER;

-    break;

+    default:

+      Status = EFI_INVALID_PARAMETER;

+      break;

   }

 

-  if (EFI_ERROR(Status)) {

+  if (EFI_ERROR (Status)) {

     return Status;

   }

 

@@ -193,7 +195,7 @@ InternalCoreLocateHandle (
   // Enumerate out the matching handles

   //

   mEfiLocateHandleRequest += 1;

-  for (; ;) {

+  for ( ; ;) {

     //

     // Get the next handle.  If no more handles, stop

     //

@@ -206,10 +208,10 @@ InternalCoreLocateHandle (
     // Increase the resulting buffer size, and if this handle

     // fits return it

     //

-    ResultSize += sizeof(Handle);

+    ResultSize += sizeof (Handle);

     if (ResultSize <= *BufferSize) {

-        *ResultBuffer = Handle;

-        ResultBuffer += 1;

+      *ResultBuffer = Handle;

+      ResultBuffer += 1;

     }

   }

 

@@ -230,13 +232,13 @@ InternalCoreLocateHandle (
 

     *BufferSize = ResultSize;

 

-    if (SearchType == ByRegisterNotify && !EFI_ERROR(Status)) {

+    if ((SearchType == ByRegisterNotify) && !EFI_ERROR (Status)) {

       //

       // If this is a search by register notify and a handle was

       // returned, update the register notification position

       //

       ASSERT (SearchKey != NULL);

-      ProtNotify = SearchKey;

+      ProtNotify           = SearchKey;

       ProtNotify->Position = ProtNotify->Position->ForwardLink;

     }

   }

@@ -265,25 +267,24 @@ InternalCoreLocateHandle (
 EFI_STATUS

 EFIAPI

 CoreLocateHandle (

-  IN EFI_LOCATE_SEARCH_TYPE   SearchType,

-  IN EFI_GUID                 *Protocol   OPTIONAL,

-  IN VOID                     *SearchKey  OPTIONAL,

-  IN OUT UINTN                *BufferSize,

-  OUT EFI_HANDLE              *Buffer

+  IN EFI_LOCATE_SEARCH_TYPE  SearchType,

+  IN EFI_GUID                *Protocol   OPTIONAL,

+  IN VOID                    *SearchKey  OPTIONAL,

+  IN OUT UINTN               *BufferSize,

+  OUT EFI_HANDLE             *Buffer

   )

 {

-  EFI_STATUS Status;

+  EFI_STATUS  Status;

 

   //

   // Lock the protocol database

   //

   CoreAcquireProtocolLock ();

-  Status = InternalCoreLocateHandle(SearchType, Protocol, SearchKey, BufferSize, Buffer);

+  Status = InternalCoreLocateHandle (SearchType, Protocol, SearchKey, BufferSize, Buffer);

   CoreReleaseProtocolLock ();

   return Status;

 }

 

-

 /**

   Routine to get the next Handle, when you are searching for all handles.

 

@@ -297,11 +298,11 @@ CoreLocateHandle (
 **/

 IHANDLE *

 CoreGetNextLocateAllHandles (

-  IN OUT LOCATE_POSITION    *Position,

-  OUT VOID                  **Interface

+  IN OUT LOCATE_POSITION  *Position,

+  OUT VOID                **Interface

   )

 {

-  IHANDLE     *Handle;

+  IHANDLE  *Handle;

 

   //

   // Next handle

@@ -311,8 +312,8 @@ CoreGetNextLocateAllHandles (
   //

   // If not at the end of the list, get the handle

   //

-  Handle      = NULL;

-  *Interface  = NULL;

+  Handle     = NULL;

+  *Interface = NULL;

   if (Position->Position != &gHandleList) {

     Handle = CR (Position->Position, IHANDLE, AllHandles, EFI_HANDLE_SIGNATURE);

   }

@@ -320,8 +321,6 @@ CoreGetNextLocateAllHandles (
   return Handle;

 }

 

-

-

 /**

   Routine to get the next Handle, when you are searching for register protocol

   notifies.

@@ -336,8 +335,8 @@ CoreGetNextLocateAllHandles (
 **/

 IHANDLE *

 CoreGetNextLocateByRegisterNotify (

-  IN OUT LOCATE_POSITION    *Position,

-  OUT VOID                  **Interface

+  IN OUT LOCATE_POSITION  *Position,

+  OUT VOID                **Interface

   )

 {

   IHANDLE             *Handle;

@@ -345,15 +344,15 @@ CoreGetNextLocateByRegisterNotify (
   PROTOCOL_INTERFACE  *Prot;

   LIST_ENTRY          *Link;

 

-  Handle      = NULL;

-  *Interface  = NULL;

+  Handle     = NULL;

+  *Interface = NULL;

   ProtNotify = Position->SearchKey;

 

   //

   // If this is the first request, get the next handle

   //

   if (ProtNotify != NULL) {

-    ASSERT(ProtNotify->Signature == PROTOCOL_NOTIFY_SIGNATURE);

+    ASSERT (ProtNotify->Signature == PROTOCOL_NOTIFY_SIGNATURE);

     Position->SearchKey = NULL;

 

     //

@@ -361,8 +360,8 @@ CoreGetNextLocateByRegisterNotify (
     //

     Link = ProtNotify->Position->ForwardLink;

     if (Link != &ProtNotify->Protocol->Protocols) {

-      Prot = CR (Link, PROTOCOL_INTERFACE, ByProtocol, PROTOCOL_INTERFACE_SIGNATURE);

-      Handle = Prot->Handle;

+      Prot       = CR (Link, PROTOCOL_INTERFACE, ByProtocol, PROTOCOL_INTERFACE_SIGNATURE);

+      Handle     = Prot->Handle;

       *Interface = Prot->Interface;

     }

   }

@@ -370,7 +369,6 @@ CoreGetNextLocateByRegisterNotify (
   return Handle;

 }

 

-

 /**

   Routine to get the next Handle, when you are searching for a given protocol.

 

@@ -384,21 +382,21 @@ CoreGetNextLocateByRegisterNotify (
 **/

 IHANDLE *

 CoreGetNextLocateByProtocol (

-  IN OUT LOCATE_POSITION    *Position,

-  OUT VOID                  **Interface

+  IN OUT LOCATE_POSITION  *Position,

+  OUT VOID                **Interface

   )

 {

   IHANDLE             *Handle;

   LIST_ENTRY          *Link;

   PROTOCOL_INTERFACE  *Prot;

 

-  Handle      = NULL;

-  *Interface  = NULL;

-  for (; ;) {

+  Handle     = NULL;

+  *Interface = NULL;

+  for ( ; ;) {

     //

     // Next entry

     //

-    Link = Position->Position->ForwardLink;

+    Link               = Position->Position->ForwardLink;

     Position->Position = Link;

 

     //

@@ -412,8 +410,8 @@ CoreGetNextLocateByProtocol (
     //

     // Get the handle

     //

-    Prot = CR(Link, PROTOCOL_INTERFACE, ByProtocol, PROTOCOL_INTERFACE_SIGNATURE);

-    Handle = Prot->Handle;

+    Prot       = CR (Link, PROTOCOL_INTERFACE, ByProtocol, PROTOCOL_INTERFACE_SIGNATURE);

+    Handle     = Prot->Handle;

     *Interface = Prot->Interface;

 

     //

@@ -429,7 +427,6 @@ CoreGetNextLocateByProtocol (
   return Handle;

 }

 

-

 /**

   Locates the handle to a device on the device path that supports the specified protocol.

 

@@ -449,22 +446,22 @@ CoreGetNextLocateByProtocol (
 EFI_STATUS

 EFIAPI

 CoreLocateDevicePath (

-  IN EFI_GUID                       *Protocol,

-  IN OUT EFI_DEVICE_PATH_PROTOCOL   **DevicePath,

-  OUT EFI_HANDLE                    *Device

+  IN EFI_GUID                      *Protocol,

+  IN OUT EFI_DEVICE_PATH_PROTOCOL  **DevicePath,

+  OUT EFI_HANDLE                   *Device

   )

 {

-  INTN                        SourceSize;

-  INTN                        Size;

-  INTN                        BestMatch;

-  UINTN                       HandleCount;

-  UINTN                       Index;

-  EFI_STATUS                  Status;

-  EFI_HANDLE                  *Handles;

-  EFI_HANDLE                  Handle;

-  EFI_HANDLE                  BestDevice;

-  EFI_DEVICE_PATH_PROTOCOL    *SourcePath;

-  EFI_DEVICE_PATH_PROTOCOL    *TmpDevicePath;

+  INTN                      SourceSize;

+  INTN                      Size;

+  INTN                      BestMatch;

+  UINTN                     HandleCount;

+  UINTN                     Index;

+  EFI_STATUS                Status;

+  EFI_HANDLE                *Handles;

+  EFI_HANDLE                Handle;

+  EFI_HANDLE                BestDevice;

+  EFI_DEVICE_PATH_PROTOCOL  *SourcePath;

+  EFI_DEVICE_PATH_PROTOCOL  *TmpDevicePath;

 

   if (Protocol == NULL) {

     return EFI_INVALID_PARAMETER;

@@ -474,9 +471,9 @@ CoreLocateDevicePath (
     return EFI_INVALID_PARAMETER;

   }

 

-  Handles = NULL;

-  BestDevice = NULL;

-  SourcePath = *DevicePath;

+  Handles       = NULL;

+  BestDevice    = NULL;

+  SourcePath    = *DevicePath;

   TmpDevicePath = SourcePath;

   while (!IsDevicePathEnd (TmpDevicePath)) {

     if (IsDevicePathEndInstance (TmpDevicePath)) {

@@ -486,21 +483,22 @@ CoreLocateDevicePath (
       //

       break;

     }

+

     TmpDevicePath = NextDevicePathNode (TmpDevicePath);

   }

 

-  SourceSize = (UINTN) TmpDevicePath - (UINTN) SourcePath;

+  SourceSize = (UINTN)TmpDevicePath - (UINTN)SourcePath;

 

   //

   // Get a list of all handles that support the requested protocol

   //

   Status = CoreLocateHandleBuffer (ByProtocol, Protocol, NULL, &HandleCount, &Handles);

-  if (EFI_ERROR (Status) || HandleCount == 0) {

+  if (EFI_ERROR (Status) || (HandleCount == 0)) {

     return EFI_NOT_FOUND;

   }

 

   BestMatch = -1;

-  for(Index = 0; Index < HandleCount; Index += 1) {

+  for (Index = 0; Index < HandleCount; Index += 1) {

     Handle = Handles[Index];

     Status = CoreHandleProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID **)&TmpDevicePath);

     if (EFI_ERROR (Status)) {

@@ -513,9 +511,9 @@ CoreLocateDevicePath (
     //

     // Check if DevicePath is first part of SourcePath

     //

-    Size = GetDevicePathSize (TmpDevicePath) - sizeof(EFI_DEVICE_PATH_PROTOCOL);

+    Size = GetDevicePathSize (TmpDevicePath) - sizeof (EFI_DEVICE_PATH_PROTOCOL);

     ASSERT (Size >= 0);

-    if ((Size <= SourceSize) && CompareMem (SourcePath, TmpDevicePath, (UINTN) Size) == 0) {

+    if ((Size <= SourceSize) && (CompareMem (SourcePath, TmpDevicePath, (UINTN)Size) == 0)) {

       //

       // If the size is equal to the best match, then we

       // have a duplicate device path for 2 different device

@@ -527,7 +525,7 @@ CoreLocateDevicePath (
       // We've got a match, see if it's the best match so far

       //

       if (Size > BestMatch) {

-        BestMatch = Size;

+        BestMatch  = Size;

         BestDevice = Handle;

       }

     }

@@ -544,18 +542,18 @@ CoreLocateDevicePath (
   }

 

   if (Device == NULL) {

-    return  EFI_INVALID_PARAMETER;

+    return EFI_INVALID_PARAMETER;

   }

+

   *Device = BestDevice;

 

   //

   // Return the remaining part of the device path

   //

-  *DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) (((UINT8 *) SourcePath) + BestMatch);

+  *DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)(((UINT8 *)SourcePath) + BestMatch);

   return EFI_SUCCESS;

 }

 

-

 /**

   Return the first Protocol Interface that matches the Protocol GUID. If

   Registration is passed in, return a Protocol Instance that was just add

@@ -580,17 +578,17 @@ CoreLocateProtocol (
   OUT VOID      **Interface

   )

 {

-  EFI_STATUS              Status;

-  LOCATE_POSITION         Position;

-  PROTOCOL_NOTIFY         *ProtNotify;

-  IHANDLE                 *Handle;

+  EFI_STATUS       Status;

+  LOCATE_POSITION  Position;

+  PROTOCOL_NOTIFY  *ProtNotify;

+  IHANDLE          *Handle;

 

   if ((Interface == NULL) || (Protocol == NULL)) {

     return EFI_INVALID_PARAMETER;

   }

 

   *Interface = NULL;

-  Status = EFI_SUCCESS;

+  Status     = EFI_SUCCESS;

 

   //

   // Set initial position

@@ -618,6 +616,7 @@ CoreLocateProtocol (
       Status = EFI_NOT_FOUND;

       goto Done;

     }

+

     Position.Position = &Position.ProtEntry->Protocols;

 

     Handle = CoreGetNextLocateByProtocol (&Position, Interface);

@@ -632,7 +631,7 @@ CoreLocateProtocol (
     // If this is a search by register notify and a handle was

     // returned, update the register notification position

     //

-    ProtNotify = Registration;

+    ProtNotify           = Registration;

     ProtNotify->Position = ProtNotify->Position->ForwardLink;

   }

 

@@ -666,15 +665,15 @@ Done:
 EFI_STATUS

 EFIAPI

 CoreLocateHandleBuffer (

-  IN EFI_LOCATE_SEARCH_TYPE       SearchType,

-  IN EFI_GUID                     *Protocol OPTIONAL,

-  IN VOID                         *SearchKey OPTIONAL,

-  IN OUT UINTN                    *NumberHandles,

-  OUT EFI_HANDLE                  **Buffer

+  IN EFI_LOCATE_SEARCH_TYPE  SearchType,

+  IN EFI_GUID                *Protocol OPTIONAL,

+  IN VOID                    *SearchKey OPTIONAL,

+  IN OUT UINTN               *NumberHandles,

+  OUT EFI_HANDLE             **Buffer

   )

 {

-  EFI_STATUS          Status;

-  UINTN               BufferSize;

+  EFI_STATUS  Status;

+  UINTN       BufferSize;

 

   if (NumberHandles == NULL) {

     return EFI_INVALID_PARAMETER;

@@ -684,14 +683,14 @@ CoreLocateHandleBuffer (
     return EFI_INVALID_PARAMETER;

   }

 

-  BufferSize = 0;

+  BufferSize     = 0;

   *NumberHandles = 0;

-  *Buffer = NULL;

+  *Buffer        = NULL;

 

   //

   // Lock the protocol database

   //

-  CoreAcquireProtocolLock();

+  CoreAcquireProtocolLock ();

   Status = InternalCoreLocateHandle (

              SearchType,

              Protocol,

@@ -705,10 +704,11 @@ CoreLocateHandleBuffer (
   //

   // Add code to correctly handle expected errors from CoreLocateHandle().

   //

-  if (EFI_ERROR(Status) && Status != EFI_BUFFER_TOO_SMALL) {

+  if (EFI_ERROR (Status) && (Status != EFI_BUFFER_TOO_SMALL)) {

     if (Status != EFI_INVALID_PARAMETER) {

       Status = EFI_NOT_FOUND;

     }

+

     CoreReleaseProtocolLock ();

     return Status;

   }

@@ -727,14 +727,11 @@ CoreLocateHandleBuffer (
              *Buffer

              );

 

-  *NumberHandles = BufferSize / sizeof(EFI_HANDLE);

-  if (EFI_ERROR(Status)) {

+  *NumberHandles = BufferSize / sizeof (EFI_HANDLE);

+  if (EFI_ERROR (Status)) {

     *NumberHandles = 0;

   }

 

   CoreReleaseProtocolLock ();

   return Status;

 }

-

-

-

diff --git a/MdeModulePkg/Core/Dxe/Hand/Notify.c b/MdeModulePkg/Core/Dxe/Hand/Notify.c
index d05f952..a6e20ca 100644
--- a/MdeModulePkg/Core/Dxe/Hand/Notify.c
+++ b/MdeModulePkg/Core/Dxe/Hand/Notify.c
@@ -19,22 +19,20 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/

 VOID

 CoreNotifyProtocolEntry (

-  IN PROTOCOL_ENTRY   *ProtEntry

+  IN PROTOCOL_ENTRY  *ProtEntry

   )

 {

-  PROTOCOL_NOTIFY     *ProtNotify;

-  LIST_ENTRY          *Link;

+  PROTOCOL_NOTIFY  *ProtNotify;

+  LIST_ENTRY       *Link;

 

   ASSERT_LOCKED (&gProtocolDatabaseLock);

 

-  for (Link=ProtEntry->Notify.ForwardLink; Link != &ProtEntry->Notify; Link=Link->ForwardLink) {

-    ProtNotify = CR(Link, PROTOCOL_NOTIFY, Link, PROTOCOL_NOTIFY_SIGNATURE);

+  for (Link = ProtEntry->Notify.ForwardLink; Link != &ProtEntry->Notify; Link = Link->ForwardLink) {

+    ProtNotify = CR (Link, PROTOCOL_NOTIFY, Link, PROTOCOL_NOTIFY_SIGNATURE);

     CoreSignalEvent (ProtNotify->Event);

   }

 }

 

-

-

 /**

   Removes Protocol from the protocol list (but not the handle list).

 

@@ -47,9 +45,9 @@ CoreNotifyProtocolEntry (
 **/

 PROTOCOL_INTERFACE *

 CoreRemoveInterfaceFromProtocol (

-  IN IHANDLE        *Handle,

-  IN EFI_GUID       *Protocol,

-  IN VOID           *Interface

+  IN IHANDLE   *Handle,

+  IN EFI_GUID  *Protocol,

+  IN VOID      *Interface

   )

 {

   PROTOCOL_INTERFACE  *Prot;

@@ -61,14 +59,13 @@ CoreRemoveInterfaceFromProtocol (
 

   Prot = CoreFindProtocolInterface (Handle, Protocol, Interface);

   if (Prot != NULL) {

-

     ProtEntry = Prot->Protocol;

 

     //

     // If there's a protocol notify location pointing to this entry, back it up one

     //

-    for(Link = ProtEntry->Notify.ForwardLink; Link != &ProtEntry->Notify; Link=Link->ForwardLink) {

-      ProtNotify = CR(Link, PROTOCOL_NOTIFY, Link, PROTOCOL_NOTIFY_SIGNATURE);

+    for (Link = ProtEntry->Notify.ForwardLink; Link != &ProtEntry->Notify; Link = Link->ForwardLink) {

+      ProtNotify = CR (Link, PROTOCOL_NOTIFY, Link, PROTOCOL_NOTIFY_SIGNATURE);

 

       if (ProtNotify->Position == &Prot->ByProtocol) {

         ProtNotify->Position = Prot->ByProtocol.BackLink;

@@ -84,7 +81,6 @@ CoreRemoveInterfaceFromProtocol (
   return Prot;

 }

 

-

 /**

   Add a new protocol notification record for the request protocol.

 

@@ -101,16 +97,16 @@ CoreRemoveInterfaceFromProtocol (
 EFI_STATUS

 EFIAPI

 CoreRegisterProtocolNotify (

-  IN EFI_GUID       *Protocol,

-  IN EFI_EVENT      Event,

-  OUT  VOID         **Registration

+  IN EFI_GUID   *Protocol,

+  IN EFI_EVENT  Event,

+  OUT  VOID     **Registration

   )

 {

-  PROTOCOL_ENTRY    *ProtEntry;

-  PROTOCOL_NOTIFY   *ProtNotify;

-  EFI_STATUS        Status;

+  PROTOCOL_ENTRY   *ProtEntry;

+  PROTOCOL_NOTIFY  *ProtNotify;

+  EFI_STATUS       Status;

 

-  if ((Protocol == NULL) || (Event == NULL) || (Registration == NULL))  {

+  if ((Protocol == NULL) || (Event == NULL) || (Registration == NULL)) {

     return EFI_INVALID_PARAMETER;

   }

 

@@ -124,16 +120,15 @@ CoreRegisterProtocolNotify (
 

   ProtEntry = CoreFindProtocolEntry (Protocol, TRUE);

   if (ProtEntry != NULL) {

-

     //

     // Allocate a new notification record

     //

-    ProtNotify = AllocatePool (sizeof(PROTOCOL_NOTIFY));

+    ProtNotify = AllocatePool (sizeof (PROTOCOL_NOTIFY));

     if (ProtNotify != NULL) {

       ((IEVENT *)Event)->ExFlag |= EVT_EXFLAG_EVENT_PROTOCOL_NOTIFICATION;

-      ProtNotify->Signature = PROTOCOL_NOTIFY_SIGNATURE;

-      ProtNotify->Protocol = ProtEntry;

-      ProtNotify->Event = Event;

+      ProtNotify->Signature      = PROTOCOL_NOTIFY_SIGNATURE;

+      ProtNotify->Protocol       = ProtEntry;

+      ProtNotify->Event          = Event;

       //

       // start at the begining

       //

@@ -153,13 +148,12 @@ CoreRegisterProtocolNotify (
   Status = EFI_OUT_OF_RESOURCES;

   if (ProtNotify != NULL) {

     *Registration = ProtNotify;

-    Status = EFI_SUCCESS;

+    Status        = EFI_SUCCESS;

   }

 

   return Status;

 }

 

-

 /**

   Reinstall a protocol interface on a device handle.  The OldInterface for Protocol is replaced by the NewInterface.

 

@@ -177,16 +171,16 @@ CoreRegisterProtocolNotify (
 EFI_STATUS

 EFIAPI

 CoreReinstallProtocolInterface (

-  IN EFI_HANDLE     UserHandle,

-  IN EFI_GUID       *Protocol,

-  IN VOID           *OldInterface,

-  IN VOID           *NewInterface

+  IN EFI_HANDLE  UserHandle,

+  IN EFI_GUID    *Protocol,

+  IN VOID        *OldInterface,

+  IN VOID        *NewInterface

   )

 {

-  EFI_STATUS                Status;

-  IHANDLE                   *Handle;

-  PROTOCOL_INTERFACE        *Prot;

-  PROTOCOL_ENTRY            *ProtEntry;

+  EFI_STATUS          Status;

+  IHANDLE             *Handle;

+  PROTOCOL_INTERFACE  *Prot;

+  PROTOCOL_ENTRY      *ProtEntry;

 

   if (Protocol == NULL) {

     return EFI_INVALID_PARAMETER;

@@ -202,7 +196,7 @@ CoreReinstallProtocolInterface (
     goto Done;

   }

 

-  Handle = (IHANDLE *) UserHandle;

+  Handle = (IHANDLE *)UserHandle;

   //

   // Check that Protocol exists on UserHandle, and Interface matches the interface in the database

   //