]> git.proxmox.com Git - mirror_edk2.git/blobdiff - NetworkPkg/HttpBootDxe/HttpBootDxe.c
NetworkPkg: Apply uncrustify changes
[mirror_edk2.git] / NetworkPkg / HttpBootDxe / HttpBootDxe.c
index 5d9c24f4a22ad8efb77b78ab4836a40911286289..168d4b7c1004ccdd39729892f9999d60373b54b5 100644 (file)
@@ -11,7 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 ///\r
 /// Driver Binding Protocol instance\r
 ///\r
-EFI_DRIVER_BINDING_PROTOCOL gHttpBootIp4DxeDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gHttpBootIp4DxeDriverBinding = {\r
   HttpBootIp4DxeDriverBindingSupported,\r
   HttpBootIp4DxeDriverBindingStart,\r
   HttpBootIp4DxeDriverBindingStop,\r
@@ -20,7 +20,7 @@ EFI_DRIVER_BINDING_PROTOCOL gHttpBootIp4DxeDriverBinding = {
   NULL\r
 };\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gHttpBootIp6DxeDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gHttpBootIp6DxeDriverBinding = {\r
   HttpBootIp6DxeDriverBindingSupported,\r
   HttpBootIp6DxeDriverBindingStart,\r
   HttpBootIp6DxeDriverBindingStop,\r
@@ -29,8 +29,6 @@ EFI_DRIVER_BINDING_PROTOCOL gHttpBootIp6DxeDriverBinding = {
   NULL\r
 };\r
 \r
-\r
-\r
 /**\r
   Check whether UNDI protocol supports IPv6.\r
 \r
@@ -43,19 +41,19 @@ EFI_DRIVER_BINDING_PROTOCOL gHttpBootIp6DxeDriverBinding = {
 **/\r
 EFI_STATUS\r
 HttpBootCheckIpv6Support (\r
-  IN  HTTP_BOOT_PRIVATE_DATA       *Private,\r
-  OUT BOOLEAN                      *Ipv6Support\r
+  IN  HTTP_BOOT_PRIVATE_DATA  *Private,\r
+  OUT BOOLEAN                 *Ipv6Support\r
   )\r
 {\r
-  EFI_HANDLE                       Handle;\r
-  EFI_ADAPTER_INFORMATION_PROTOCOL *Aip;\r
-  EFI_STATUS                       Status;\r
-  EFI_GUID                         *InfoTypesBuffer;\r
-  UINTN                            InfoTypeBufferCount;\r
-  UINTN                            TypeIndex;\r
-  BOOLEAN                          Supported;\r
-  VOID                             *InfoBlock;\r
-  UINTN                            InfoBlockSize;\r
+  EFI_HANDLE                        Handle;\r
+  EFI_ADAPTER_INFORMATION_PROTOCOL  *Aip;\r
+  EFI_STATUS                        Status;\r
+  EFI_GUID                          *InfoTypesBuffer;\r
+  UINTN                             InfoTypeBufferCount;\r
+  UINTN                             TypeIndex;\r
+  BOOLEAN                           Supported;\r
+  VOID                              *InfoBlock;\r
+  UINTN                             InfoBlockSize;\r
 \r
   ASSERT (Private != NULL && Ipv6Support != NULL);\r
 \r
@@ -79,16 +77,16 @@ HttpBootCheckIpv6Support (
   Status = gBS->HandleProtocol (\r
                   Handle,\r
                   &gEfiAdapterInformationProtocolGuid,\r
-                  (VOID *) &Aip\r
+                  (VOID *)&Aip\r
                   );\r
-  if (EFI_ERROR (Status) || Aip == NULL) {\r
+  if (EFI_ERROR (Status) || (Aip == NULL)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
   InfoTypesBuffer     = NULL;\r
   InfoTypeBufferCount = 0;\r
-  Status = Aip->GetSupportedTypes (Aip, &InfoTypesBuffer, &InfoTypeBufferCount);\r
-  if (EFI_ERROR (Status) || InfoTypesBuffer == NULL) {\r
+  Status              = Aip->GetSupportedTypes (Aip, &InfoTypesBuffer, &InfoTypeBufferCount);\r
+  if (EFI_ERROR (Status) || (InfoTypesBuffer == NULL)) {\r
     FreePool (InfoTypesBuffer);\r
     return EFI_NOT_FOUND;\r
   }\r
@@ -111,13 +109,13 @@ HttpBootCheckIpv6Support (
   //\r
   InfoBlock     = NULL;\r
   InfoBlockSize = 0;\r
-  Status = Aip->GetInformation (Aip, &gEfiAdapterInfoUndiIpv6SupportGuid, &InfoBlock, &InfoBlockSize);\r
-  if (EFI_ERROR (Status) || InfoBlock == NULL) {\r
+  Status        = Aip->GetInformation (Aip, &gEfiAdapterInfoUndiIpv6SupportGuid, &InfoBlock, &InfoBlockSize);\r
+  if (EFI_ERROR (Status) || (InfoBlock == NULL)) {\r
     FreePool (InfoBlock);\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  *Ipv6Support = ((EFI_ADAPTER_INFO_UNDI_IPV6_SUPPORT *) InfoBlock)->Ipv6Support;\r
+  *Ipv6Support = ((EFI_ADAPTER_INFO_UNDI_IPV6_SUPPORT *)InfoBlock)->Ipv6Support;\r
   FreePool (InfoBlock);\r
 \r
   return EFI_SUCCESS;\r
@@ -155,13 +153,12 @@ HttpBootDestroyIp4Children (
       );\r
   }\r
 \r
-  if (Private->Ip6Nic == NULL && Private->HttpCreated) {\r
+  if ((Private->Ip6Nic == NULL) && Private->HttpCreated) {\r
     HttpIoDestroyIo (&Private->HttpIo);\r
     Private->HttpCreated = FALSE;\r
   }\r
 \r
   if (Private->Ip4Nic != NULL) {\r
-\r
     gBS->CloseProtocol (\r
            Private->Controller,\r
            &gEfiCallerIdGuid,\r
@@ -180,7 +177,6 @@ HttpBootDestroyIp4Children (
     FreePool (Private->Ip4Nic);\r
     Private->Ip4Nic = NULL;\r
   }\r
-\r
 }\r
 \r
 /**\r
@@ -231,13 +227,12 @@ HttpBootDestroyIp6Children (
       );\r
   }\r
 \r
-  if (Private->Ip4Nic == NULL && Private->HttpCreated) {\r
-    HttpIoDestroyIo(&Private->HttpIo);\r
+  if ((Private->Ip4Nic == NULL) && Private->HttpCreated) {\r
+    HttpIoDestroyIo (&Private->HttpIo);\r
     Private->HttpCreated = FALSE;\r
   }\r
 \r
   if (Private->Ip6Nic != NULL) {\r
-\r
     gBS->CloseProtocol (\r
            Private->Controller,\r
            &gEfiCallerIdGuid,\r
@@ -308,7 +303,7 @@ HttpBootIp4DxeDriverBindingSupported (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Try to open the DHCP4, HTTP4 and Device Path protocol.\r
@@ -349,7 +344,6 @@ HttpBootIp4DxeDriverBindingSupported (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Starts a device controller or a bus controller.\r
 \r
@@ -393,26 +387,26 @@ HttpBootIp4DxeDriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                 Status;\r
-  HTTP_BOOT_PRIVATE_DATA     *Private;\r
-  EFI_DEV_PATH               *Node;\r
-  EFI_DEVICE_PATH_PROTOCOL   *DevicePath;\r
-  UINT32                     *Id;\r
-  BOOLEAN                    FirstStart;\r
+  EFI_STATUS                Status;\r
+  HTTP_BOOT_PRIVATE_DATA    *Private;\r
+  EFI_DEV_PATH              *Node;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
+  UINT32                    *Id;\r
+  BOOLEAN                   FirstStart;\r
 \r
   FirstStart = FALSE;\r
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiCallerIdGuid,\r
-                  (VOID **) &Id,\r
+                  (VOID **)&Id,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
                   );\r
 \r
   if (!EFI_ERROR (Status)) {\r
-    Private = HTTP_BOOT_PRIVATE_DATA_FROM_ID(Id);\r
+    Private = HTTP_BOOT_PRIVATE_DATA_FROM_ID (Id);\r
   } else {\r
     FirstStart = TRUE;\r
 \r
@@ -423,7 +417,8 @@ HttpBootIp4DxeDriverBindingStart (
     if (Private == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-    Private->Signature = HTTP_BOOT_PRIVATE_DATA_SIGNATURE;\r
+\r
+    Private->Signature  = HTTP_BOOT_PRIVATE_DATA_SIGNATURE;\r
     Private->Controller = ControllerHandle;\r
     InitializeListHead (&Private->CacheList);\r
     //\r
@@ -432,7 +427,7 @@ HttpBootIp4DxeDriverBindingStart (
     Status = gBS->OpenProtocol (\r
                     ControllerHandle,\r
                     &gEfiNetworkInterfaceIdentifierProtocolGuid_31,\r
-                    (VOID **) &Private->Nii,\r
+                    (VOID **)&Private->Nii,\r
                     This->DriverBindingHandle,\r
                     ControllerHandle,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -447,7 +442,7 @@ HttpBootIp4DxeDriverBindingStart (
     Status = gBS->OpenProtocol (\r
                     ControllerHandle,\r
                     &gEfiDevicePathProtocolGuid,\r
-                    (VOID **) &Private->ParentDevicePath,\r
+                    (VOID **)&Private->ParentDevicePath,\r
                     This->DriverBindingHandle,\r
                     ControllerHandle,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -477,7 +472,6 @@ HttpBootIp4DxeDriverBindingStart (
     if (EFI_ERROR (Status)) {\r
       goto ON_ERROR;\r
     }\r
-\r
   }\r
 \r
   if (Private->Ip4Nic != NULL) {\r
@@ -492,6 +486,7 @@ HttpBootIp4DxeDriverBindingStart (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_ERROR;\r
   }\r
+\r
   Private->Ip4Nic->Private     = Private;\r
   Private->Ip4Nic->ImageHandle = This->DriverBindingHandle;\r
   Private->Ip4Nic->Signature   = HTTP_BOOT_VIRTUAL_NIC_SIGNATURE;\r
@@ -512,7 +507,7 @@ HttpBootIp4DxeDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   Private->Dhcp4Child,\r
                   &gEfiDhcp4ProtocolGuid,\r
-                  (VOID **) &Private->Dhcp4,\r
+                  (VOID **)&Private->Dhcp4,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -527,7 +522,7 @@ HttpBootIp4DxeDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiIp4Config2ProtocolGuid,\r
-                  (VOID **) &Private->Ip4Config2,\r
+                  (VOID **)&Private->Ip4Config2,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -544,11 +539,12 @@ HttpBootIp4DxeDriverBindingStart (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_ERROR;\r
   }\r
-  Node->Ipv4.Header.Type = MESSAGING_DEVICE_PATH;\r
+\r
+  Node->Ipv4.Header.Type    = MESSAGING_DEVICE_PATH;\r
   Node->Ipv4.Header.SubType = MSG_IPv4_DP;\r
   SetDevicePathNodeLength (Node, sizeof (IPv4_DEVICE_PATH));\r
   Node->Ipv4.StaticIpAddress = FALSE;\r
-  DevicePath = AppendDevicePathNode (Private->ParentDevicePath, (EFI_DEVICE_PATH_PROTOCOL*) Node);\r
+  DevicePath                 = AppendDevicePathNode (Private->ParentDevicePath, (EFI_DEVICE_PATH_PROTOCOL *)Node);\r
   FreePool (Node);\r
   if (DevicePath == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
@@ -563,10 +559,11 @@ HttpBootIp4DxeDriverBindingStart (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_ERROR;\r
   }\r
-  Node->DevPath.Type = MESSAGING_DEVICE_PATH;\r
+\r
+  Node->DevPath.Type    = MESSAGING_DEVICE_PATH;\r
   Node->DevPath.SubType = MSG_URI_DP;\r
   SetDevicePathNodeLength (Node, sizeof (EFI_DEVICE_PATH_PROTOCOL));\r
-  Private->Ip4Nic->DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL*) Node);\r
+  Private->Ip4Nic->DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *)Node);\r
   FreePool (Node);\r
   FreePool (DevicePath);\r
   if (Private->Ip4Nic->DevicePath == NULL) {\r
@@ -597,7 +594,7 @@ HttpBootIp4DxeDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiCallerIdGuid,\r
-                  (VOID **) &Id,\r
+                  (VOID **)&Id,\r
                   This->DriverBindingHandle,\r
                   Private->Ip4Nic->Controller,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -629,7 +626,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Stops a device controller or a bus controller.\r
 \r
@@ -665,11 +661,11 @@ HttpBootIp4DxeDriverBindingStop (
   IN EFI_HANDLE                   *ChildHandleBuffer OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_LOAD_FILE_PROTOCOL          *LoadFile;\r
-  HTTP_BOOT_PRIVATE_DATA          *Private;\r
-  EFI_HANDLE                      NicHandle;\r
-  UINT32                          *Id;\r
+  EFI_STATUS              Status;\r
+  EFI_LOAD_FILE_PROTOCOL  *LoadFile;\r
+  HTTP_BOOT_PRIVATE_DATA  *Private;\r
+  EFI_HANDLE              NicHandle;\r
+  UINT32                  *Id;\r
 \r
   //\r
   // Try to get the Load File Protocol from the controller handle.\r
@@ -677,7 +673,7 @@ HttpBootIp4DxeDriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiLoadFileProtocolGuid,\r
-                  (VOID **) &LoadFile,\r
+                  (VOID **)&LoadFile,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -697,7 +693,7 @@ HttpBootIp4DxeDriverBindingStop (
     Status = gBS->OpenProtocol (\r
                     NicHandle,\r
                     &gEfiCallerIdGuid,\r
-                    (VOID **) &Id,\r
+                    (VOID **)&Id,\r
                     This->DriverBindingHandle,\r
                     ControllerHandle,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -705,9 +701,10 @@ HttpBootIp4DxeDriverBindingStop (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     Private = HTTP_BOOT_PRIVATE_DATA_FROM_ID (Id);\r
   } else {\r
-    Private = HTTP_BOOT_PRIVATE_DATA_FROM_LOADFILE (LoadFile);\r
+    Private   = HTTP_BOOT_PRIVATE_DATA_FROM_LOADFILE (LoadFile);\r
     NicHandle = Private->Controller;\r
   }\r
 \r
@@ -715,7 +712,7 @@ HttpBootIp4DxeDriverBindingStop (
   // Disable the HTTP boot function.\r
   //\r
   Status = HttpBootStop (Private);\r
-  if (Status != EFI_SUCCESS && Status != EFI_NOT_STARTED) {\r
+  if ((Status != EFI_SUCCESS) && (Status != EFI_NOT_STARTED)) {\r
     return Status;\r
   }\r
 \r
@@ -724,7 +721,7 @@ HttpBootIp4DxeDriverBindingStop (
   //\r
   HttpBootDestroyIp4Children (This, Private);\r
 \r
-  if (Private->Ip4Nic == NULL && Private->Ip6Nic == NULL) {\r
+  if ((Private->Ip4Nic == NULL) && (Private->Ip6Nic == NULL)) {\r
     //\r
     // Release the cached data.\r
     //\r
@@ -741,7 +738,6 @@ HttpBootIp4DxeDriverBindingStop (
            &Private->Id\r
            );\r
     FreePool (Private);\r
-\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -797,7 +793,7 @@ HttpBootIp6DxeDriverBindingSupported (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Try to open the DHCP6, HTTP and Device Path protocol.\r
@@ -836,7 +832,6 @@ HttpBootIp6DxeDriverBindingSupported (
                   );\r
 \r
   return Status;\r
-\r
 }\r
 \r
 /**\r
@@ -882,27 +877,27 @@ HttpBootIp6DxeDriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                 Status;\r
-  HTTP_BOOT_PRIVATE_DATA     *Private;\r
-  EFI_DEV_PATH               *Node;\r
-  EFI_DEVICE_PATH_PROTOCOL   *DevicePath;\r
-  UINT32                     *Id;\r
-  BOOLEAN                    Ipv6Available;\r
-  BOOLEAN                    FirstStart;\r
+  EFI_STATUS                Status;\r
+  HTTP_BOOT_PRIVATE_DATA    *Private;\r
+  EFI_DEV_PATH              *Node;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
+  UINT32                    *Id;\r
+  BOOLEAN                   Ipv6Available;\r
+  BOOLEAN                   FirstStart;\r
 \r
   FirstStart = FALSE;\r
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiCallerIdGuid,\r
-                  (VOID **) &Id,\r
+                  (VOID **)&Id,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
                   );\r
 \r
   if (!EFI_ERROR (Status)) {\r
-    Private = HTTP_BOOT_PRIVATE_DATA_FROM_ID(Id);\r
+    Private = HTTP_BOOT_PRIVATE_DATA_FROM_ID (Id);\r
   } else {\r
     FirstStart = TRUE;\r
 \r
@@ -913,7 +908,8 @@ HttpBootIp6DxeDriverBindingStart (
     if (Private == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-    Private->Signature = HTTP_BOOT_PRIVATE_DATA_SIGNATURE;\r
+\r
+    Private->Signature  = HTTP_BOOT_PRIVATE_DATA_SIGNATURE;\r
     Private->Controller = ControllerHandle;\r
     InitializeListHead (&Private->CacheList);\r
     //\r
@@ -922,7 +918,7 @@ HttpBootIp6DxeDriverBindingStart (
     Status = gBS->OpenProtocol (\r
                     ControllerHandle,\r
                     &gEfiNetworkInterfaceIdentifierProtocolGuid_31,\r
-                    (VOID **) &Private->Nii,\r
+                    (VOID **)&Private->Nii,\r
                     This->DriverBindingHandle,\r
                     ControllerHandle,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -937,7 +933,7 @@ HttpBootIp6DxeDriverBindingStart (
     Status = gBS->OpenProtocol (\r
                     ControllerHandle,\r
                     &gEfiDevicePathProtocolGuid,\r
-                    (VOID **) &Private->ParentDevicePath,\r
+                    (VOID **)&Private->ParentDevicePath,\r
                     This->DriverBindingHandle,\r
                     ControllerHandle,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -967,7 +963,6 @@ HttpBootIp6DxeDriverBindingStart (
     if (EFI_ERROR (Status)) {\r
       goto ON_ERROR;\r
     }\r
-\r
   }\r
 \r
   //\r
@@ -999,6 +994,7 @@ HttpBootIp6DxeDriverBindingStart (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_ERROR;\r
   }\r
+\r
   Private->Ip6Nic->Private     = Private;\r
   Private->Ip6Nic->ImageHandle = This->DriverBindingHandle;\r
   Private->Ip6Nic->Signature   = HTTP_BOOT_VIRTUAL_NIC_SIGNATURE;\r
@@ -1018,7 +1014,7 @@ HttpBootIp6DxeDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   Private->Dhcp6Child,\r
                   &gEfiDhcp6ProtocolGuid,\r
-                  (VOID **) &Private->Dhcp6,\r
+                  (VOID **)&Private->Dhcp6,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -1031,11 +1027,11 @@ HttpBootIp6DxeDriverBindingStart (
   // Create Ip6 child and open Ip6 protocol for background ICMP packets.\r
   //\r
   Status = NetLibCreateServiceChild (\r
-              ControllerHandle,\r
-              This->DriverBindingHandle,\r
-              &gEfiIp6ServiceBindingProtocolGuid,\r
-              &Private->Ip6Child\r
-              );\r
+             ControllerHandle,\r
+             This->DriverBindingHandle,\r
+             &gEfiIp6ServiceBindingProtocolGuid,\r
+             &Private->Ip6Child\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
   }\r
@@ -1043,7 +1039,7 @@ HttpBootIp6DxeDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   Private->Ip6Child,\r
                   &gEfiIp6ProtocolGuid,\r
-                  (VOID **) &Private->Ip6,\r
+                  (VOID **)&Private->Ip6,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -1058,7 +1054,7 @@ HttpBootIp6DxeDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiIp6ConfigProtocolGuid,\r
-                  (VOID **) &Private->Ip6Config,\r
+                  (VOID **)&Private->Ip6Config,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1075,12 +1071,13 @@ HttpBootIp6DxeDriverBindingStart (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_ERROR;\r
   }\r
-  Node->Ipv6.Header.Type = MESSAGING_DEVICE_PATH;\r
+\r
+  Node->Ipv6.Header.Type    = MESSAGING_DEVICE_PATH;\r
   Node->Ipv6.Header.SubType = MSG_IPv6_DP;\r
-  Node->Ipv6.PrefixLength = IP6_PREFIX_LENGTH;\r
+  Node->Ipv6.PrefixLength   = IP6_PREFIX_LENGTH;\r
   SetDevicePathNodeLength (Node, sizeof (IPv6_DEVICE_PATH));\r
-  DevicePath = AppendDevicePathNode(Private->ParentDevicePath, (EFI_DEVICE_PATH*) Node);\r
-  FreePool(Node);\r
+  DevicePath = AppendDevicePathNode (Private->ParentDevicePath, (EFI_DEVICE_PATH *)Node);\r
+  FreePool (Node);\r
   if (DevicePath == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_ERROR;\r
@@ -1094,10 +1091,11 @@ HttpBootIp6DxeDriverBindingStart (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_ERROR;\r
   }\r
-  Node->DevPath.Type = MESSAGING_DEVICE_PATH;\r
+\r
+  Node->DevPath.Type    = MESSAGING_DEVICE_PATH;\r
   Node->DevPath.SubType = MSG_URI_DP;\r
   SetDevicePathNodeLength (Node, sizeof (EFI_DEVICE_PATH_PROTOCOL));\r
-  Private->Ip6Nic->DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL*) Node);\r
+  Private->Ip6Nic->DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *)Node);\r
   FreePool (Node);\r
   FreePool (DevicePath);\r
   if (Private->Ip6Nic->DevicePath == NULL) {\r
@@ -1128,7 +1126,7 @@ HttpBootIp6DxeDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiCallerIdGuid,\r
-                  (VOID **) &Id,\r
+                  (VOID **)&Id,\r
                   This->DriverBindingHandle,\r
                   Private->Ip6Nic->Controller,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -1149,7 +1147,7 @@ ON_ERROR:
              );\r
     }\r
 \r
-    HttpBootDestroyIp6Children(This, Private);\r
+    HttpBootDestroyIp6Children (This, Private);\r
     HttpBootConfigFormUnload (Private);\r
 \r
     if (FirstStart) {\r
@@ -1195,11 +1193,11 @@ HttpBootIp6DxeDriverBindingStop (
   IN EFI_HANDLE                   *ChildHandleBuffer OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_LOAD_FILE_PROTOCOL          *LoadFile;\r
-  HTTP_BOOT_PRIVATE_DATA          *Private;\r
-  EFI_HANDLE                      NicHandle;\r
-  UINT32                          *Id;\r
+  EFI_STATUS              Status;\r
+  EFI_LOAD_FILE_PROTOCOL  *LoadFile;\r
+  HTTP_BOOT_PRIVATE_DATA  *Private;\r
+  EFI_HANDLE              NicHandle;\r
+  UINT32                  *Id;\r
 \r
   //\r
   // Try to get the Load File Protocol from the controller handle.\r
@@ -1207,7 +1205,7 @@ HttpBootIp6DxeDriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiLoadFileProtocolGuid,\r
-                  (VOID **) &LoadFile,\r
+                  (VOID **)&LoadFile,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1227,7 +1225,7 @@ HttpBootIp6DxeDriverBindingStop (
     Status = gBS->OpenProtocol (\r
                     NicHandle,\r
                     &gEfiCallerIdGuid,\r
-                    (VOID **) &Id,\r
+                    (VOID **)&Id,\r
                     This->DriverBindingHandle,\r
                     ControllerHandle,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1235,9 +1233,10 @@ HttpBootIp6DxeDriverBindingStop (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     Private = HTTP_BOOT_PRIVATE_DATA_FROM_ID (Id);\r
   } else {\r
-    Private = HTTP_BOOT_PRIVATE_DATA_FROM_LOADFILE (LoadFile);\r
+    Private   = HTTP_BOOT_PRIVATE_DATA_FROM_LOADFILE (LoadFile);\r
     NicHandle = Private->Controller;\r
   }\r
 \r
@@ -1245,7 +1244,7 @@ HttpBootIp6DxeDriverBindingStop (
   // Disable the HTTP boot function.\r
   //\r
   Status = HttpBootStop (Private);\r
-  if (Status != EFI_SUCCESS && Status != EFI_NOT_STARTED) {\r
+  if ((Status != EFI_SUCCESS) && (Status != EFI_NOT_STARTED)) {\r
     return Status;\r
   }\r
 \r
@@ -1254,7 +1253,7 @@ HttpBootIp6DxeDriverBindingStop (
   //\r
   HttpBootDestroyIp6Children (This, Private);\r
 \r
-  if (Private->Ip4Nic == NULL && Private->Ip6Nic == NULL) {\r
+  if ((Private->Ip4Nic == NULL) && (Private->Ip6Nic == NULL)) {\r
     //\r
     // Release the cached data.\r
     //\r
@@ -1271,11 +1270,11 @@ HttpBootIp6DxeDriverBindingStop (
            &Private->Id\r
            );\r
     FreePool (Private);\r
-\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
+\r
 /**\r
   This is the declaration of an EFI image entry point. This entry point is\r
   the same for UEFI Applications, UEFI OS Loaders, and UEFI Drivers including\r
@@ -1295,7 +1294,7 @@ HttpBootDxeDriverEntryPoint (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS   Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Install UEFI Driver Model protocol(s).\r
@@ -1321,12 +1320,12 @@ HttpBootDxeDriverEntryPoint (
              &gHttpBootDxeComponentName2\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    EfiLibUninstallDriverBindingComponentName2(\r
+    EfiLibUninstallDriverBindingComponentName2 (\r
       &gHttpBootIp4DxeDriverBinding,\r
       &gHttpBootDxeComponentName,\r
       &gHttpBootDxeComponentName2\r
       );\r
   }\r
+\r
   return Status;\r
 }\r
-\r