]> git.proxmox.com Git - mirror_edk2.git/blobdiff - NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
NetworkPkg: Apply uncrustify changes
[mirror_edk2.git] / NetworkPkg / UefiPxeBcDxe / PxeBcDriver.c
index 0e2675be3c984b7a15a37d70e627bf610dc6cdec..d84aca7e85abe581b220a2b8f0fee1322b33ace1 100644 (file)
@@ -10,8 +10,7 @@
 \r
 #include "PxeBcImpl.h"\r
 \r
-\r
-EFI_DRIVER_BINDING_PROTOCOL gPxeBcIp4DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gPxeBcIp4DriverBinding = {\r
   PxeBcIp4DriverBindingSupported,\r
   PxeBcIp4DriverBindingStart,\r
   PxeBcIp4DriverBindingStop,\r
@@ -20,7 +19,7 @@ EFI_DRIVER_BINDING_PROTOCOL gPxeBcIp4DriverBinding = {
   NULL\r
 };\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gPxeBcIp6DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gPxeBcIp6DriverBinding = {\r
   PxeBcIp6DriverBindingSupported,\r
   PxeBcIp6DriverBindingStart,\r
   PxeBcIp6DriverBindingStop,\r
@@ -39,10 +38,10 @@ EFI_DRIVER_BINDING_PROTOCOL gPxeBcIp6DriverBinding = {
 **/\r
 EFI_HANDLE\r
 PxeBcGetNicByIp4Children (\r
-  IN EFI_HANDLE                 ControllerHandle\r
+  IN EFI_HANDLE  ControllerHandle\r
   )\r
 {\r
-  EFI_HANDLE                    NicHandle;\r
+  EFI_HANDLE  NicHandle;\r
 \r
   NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiArpProtocolGuid);\r
   if (NicHandle == NULL) {\r
@@ -64,7 +63,6 @@ PxeBcGetNicByIp4Children (
   return NicHandle;\r
 }\r
 \r
-\r
 /**\r
   Get the Nic handle using any child handle in the IPv6 stack.\r
 \r
@@ -75,10 +73,10 @@ PxeBcGetNicByIp4Children (
 **/\r
 EFI_HANDLE\r
 PxeBcGetNicByIp6Children (\r
-  IN EFI_HANDLE                  ControllerHandle\r
+  IN EFI_HANDLE  ControllerHandle\r
   )\r
 {\r
-  EFI_HANDLE                     NicHandle;\r
+  EFI_HANDLE  NicHandle;\r
 \r
   NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiIp6ProtocolGuid);\r
   if (NicHandle == NULL) {\r
@@ -97,7 +95,6 @@ PxeBcGetNicByIp6Children (
   return NicHandle;\r
 }\r
 \r
-\r
 /**\r
   Destroy the opened instances based on IPv4.\r
 \r
@@ -111,7 +108,7 @@ PxeBcDestroyIp4Children (
   IN PXEBC_PRIVATE_DATA           *Private\r
   )\r
 {\r
-  ASSERT(Private != NULL);\r
+  ASSERT (Private != NULL);\r
 \r
   if (Private->ArpChild != NULL) {\r
     //\r
@@ -175,11 +172,11 @@ PxeBcDestroyIp4Children (
     // Close Udp4 for PxeBc->UdpRead and destroy the instance.\r
     //\r
     gBS->CloseProtocol (\r
-          Private->Udp4ReadChild,\r
-          &gEfiUdp4ProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          Private->Controller\r
-          );\r
+           Private->Udp4ReadChild,\r
+           &gEfiUdp4ProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           Private->Controller\r
+           );\r
 \r
     NetLibDestroyServiceChild (\r
       Private->Controller,\r
@@ -194,11 +191,11 @@ PxeBcDestroyIp4Children (
     // Close Mtftp4 for PxeBc->Mtftp4 and destroy the instance.\r
     //\r
     gBS->CloseProtocol (\r
-          Private->Mtftp4Child,\r
-          &gEfiMtftp4ProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          Private->Controller\r
-          );\r
+           Private->Mtftp4Child,\r
+           &gEfiMtftp4ProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           Private->Controller\r
+           );\r
 \r
     NetLibDestroyServiceChild (\r
       Private->Controller,\r
@@ -213,11 +210,11 @@ PxeBcDestroyIp4Children (
     // Close Dhcp4 for PxeBc->Dhcp4 and destroy the instance.\r
     //\r
     gBS->CloseProtocol (\r
-          Private->Dhcp4Child,\r
-          &gEfiDhcp4ProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          Private->Controller\r
-          );\r
+           Private->Dhcp4Child,\r
+           &gEfiDhcp4ProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           Private->Controller\r
+           );\r
 \r
     NetLibDestroyServiceChild (\r
       Private->Controller,\r
@@ -267,19 +264,19 @@ PxeBcDestroyIp4Children (
              Private->Snp\r
              );\r
     }\r
+\r
     FreePool (Private->Ip4Nic);\r
   }\r
 \r
-  Private->ArpChild         = NULL;\r
-  Private->Ip4Child         = NULL;\r
-  Private->Udp4WriteChild   = NULL;\r
-  Private->Udp4ReadChild    = NULL;\r
-  Private->Mtftp4Child      = NULL;\r
-  Private->Dhcp4Child       = NULL;\r
-  Private->Ip4Nic           = NULL;\r
+  Private->ArpChild       = NULL;\r
+  Private->Ip4Child       = NULL;\r
+  Private->Udp4WriteChild = NULL;\r
+  Private->Udp4ReadChild  = NULL;\r
+  Private->Mtftp4Child    = NULL;\r
+  Private->Dhcp4Child     = NULL;\r
+  Private->Ip4Nic         = NULL;\r
 }\r
 \r
-\r
 /**\r
   Destroy the opened instances based on IPv6.\r
 \r
@@ -293,18 +290,18 @@ PxeBcDestroyIp6Children (
   IN PXEBC_PRIVATE_DATA           *Private\r
   )\r
 {\r
-  ASSERT(Private != NULL);\r
+  ASSERT (Private != NULL);\r
 \r
   if (Private->Ip6Child != NULL) {\r
     //\r
     // Close Ip6 for Ip6->Ip6Config and destroy the instance.\r
     //\r
     gBS->CloseProtocol (\r
-          Private->Ip6Child,\r
-          &gEfiIp6ProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          Private->Controller\r
-          );\r
+           Private->Ip6Child,\r
+           &gEfiIp6ProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           Private->Controller\r
+           );\r
 \r
     NetLibDestroyServiceChild (\r
       Private->Controller,\r
@@ -337,11 +334,11 @@ PxeBcDestroyIp6Children (
     // Close Udp6 for PxeBc->UdpRead and destroy the instance.\r
     //\r
     gBS->CloseProtocol (\r
-          Private->Udp6ReadChild,\r
-          &gEfiUdp6ProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          Private->Controller\r
-          );\r
+           Private->Udp6ReadChild,\r
+           &gEfiUdp6ProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           Private->Controller\r
+           );\r
     NetLibDestroyServiceChild (\r
       Private->Controller,\r
       This->DriverBindingHandle,\r
@@ -355,11 +352,11 @@ PxeBcDestroyIp6Children (
     // Close Mtftp6 for PxeBc->Mtftp and destroy the instance.\r
     //\r
     gBS->CloseProtocol (\r
-          Private->Mtftp6Child,\r
-          &gEfiMtftp6ProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          Private->Controller\r
-          );\r
+           Private->Mtftp6Child,\r
+           &gEfiMtftp6ProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           Private->Controller\r
+           );\r
 \r
     NetLibDestroyServiceChild (\r
       Private->Controller,\r
@@ -374,11 +371,11 @@ PxeBcDestroyIp6Children (
     // Close Dhcp6 for PxeBc->Dhcp and destroy the instance.\r
     //\r
     gBS->CloseProtocol (\r
-          Private->Dhcp6Child,\r
-          &gEfiDhcp6ProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          Private->Controller\r
-          );\r
+           Private->Dhcp6Child,\r
+           &gEfiDhcp6ProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           Private->Controller\r
+           );\r
 \r
     NetLibDestroyServiceChild (\r
       Private->Controller,\r
@@ -427,6 +424,7 @@ PxeBcDestroyIp6Children (
              Private->Snp\r
              );\r
     }\r
+\r
     FreePool (Private->Ip6Nic);\r
   }\r
 \r
@@ -452,20 +450,20 @@ PxeBcDestroyIp6Children (
 **/\r
 EFI_STATUS\r
 PxeBcCheckIpv6Support (\r
-  IN  EFI_HANDLE                   ControllerHandle,\r
-  IN  PXEBC_PRIVATE_DATA           *Private,\r
-  OUT BOOLEAN                      *Ipv6Support\r
+  IN  EFI_HANDLE          ControllerHandle,\r
+  IN  PXEBC_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
@@ -493,16 +491,16 @@ PxeBcCheckIpv6Support (
   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
@@ -525,16 +523,15 @@ PxeBcCheckIpv6Support (
   //\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
   return EFI_SUCCESS;\r
-\r
 }\r
 \r
 /**\r
@@ -555,14 +552,14 @@ PxeBcCreateIp4Children (
   IN PXEBC_PRIVATE_DATA           *Private\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  IPv4_DEVICE_PATH                Ip4Node;\r
-  EFI_PXE_BASE_CODE_MODE          *Mode;\r
-  EFI_UDP4_CONFIG_DATA            *Udp4CfgData;\r
-  EFI_IP4_CONFIG_DATA             *Ip4CfgData;\r
-  EFI_IP4_MODE_DATA               Ip4ModeData;\r
-  PXEBC_PRIVATE_PROTOCOL          *Id;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL     *Snp;\r
+  EFI_STATUS                   Status;\r
+  IPv4_DEVICE_PATH             Ip4Node;\r
+  EFI_PXE_BASE_CODE_MODE       *Mode;\r
+  EFI_UDP4_CONFIG_DATA         *Udp4CfgData;\r
+  EFI_IP4_CONFIG_DATA          *Ip4CfgData;\r
+  EFI_IP4_MODE_DATA            Ip4ModeData;\r
+  PXEBC_PRIVATE_PROTOCOL       *Id;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL  *Snp;\r
 \r
   if (Private->Ip4Nic != NULL) {\r
     //\r
@@ -587,7 +584,7 @@ PxeBcCreateIp4Children (
   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
@@ -612,7 +609,7 @@ PxeBcCreateIp4Children (
   Status = gBS->OpenProtocol (\r
                   Private->Mtftp4Child,\r
                   &gEfiMtftp4ProtocolGuid,\r
-                  (VOID **) &Private->Mtftp4,\r
+                  (VOID **)&Private->Mtftp4,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -637,7 +634,7 @@ PxeBcCreateIp4Children (
   Status = gBS->OpenProtocol (\r
                   Private->Udp4ReadChild,\r
                   &gEfiUdp4ProtocolGuid,\r
-                  (VOID **) &Private->Udp4Read,\r
+                  (VOID **)&Private->Udp4Read,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -662,7 +659,7 @@ PxeBcCreateIp4Children (
   Status = gBS->OpenProtocol (\r
                   Private->Udp4WriteChild,\r
                   &gEfiUdp4ProtocolGuid,\r
-                  (VOID **) &Private->Udp4Write,\r
+                  (VOID **)&Private->Udp4Write,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -687,7 +684,7 @@ PxeBcCreateIp4Children (
   Status = gBS->OpenProtocol (\r
                   Private->ArpChild,\r
                   &gEfiArpProtocolGuid,\r
-                  (VOID **) &Private->Arp,\r
+                  (VOID **)&Private->Arp,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -712,7 +709,7 @@ PxeBcCreateIp4Children (
   Status = gBS->OpenProtocol (\r
                   Private->Ip4Child,\r
                   &gEfiIp4ProtocolGuid,\r
-                  (VOID **) &Private->Ip4,\r
+                  (VOID **)&Private->Ip4,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -739,13 +736,13 @@ PxeBcCreateIp4Children (
   Private->Ip4Nic->Private   = Private;\r
   Private->Ip4Nic->Signature = PXEBC_VIRTUAL_NIC_SIGNATURE;\r
 \r
-   //\r
+  //\r
   // Locate Ip4->Ip4Config2 and store it for set IPv4 Policy.\r
   //\r
   Status = gBS->HandleProtocol (\r
                   ControllerHandle,\r
                   &gEfiIp4Config2ProtocolGuid,\r
-                  (VOID **) &Private->Ip4Config2\r
+                  (VOID **)&Private->Ip4Config2\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
@@ -814,7 +811,7 @@ PxeBcCreateIp4Children (
     Status = gBS->OpenProtocol (\r
                     Private->Ip4Nic->Controller,\r
                     &gEfiSimpleNetworkProtocolGuid,\r
-                    (VOID **) &Snp,\r
+                    (VOID **)&Snp,\r
                     This->DriverBindingHandle,\r
                     Private->Ip4Nic->Controller,\r
                     EFI_OPEN_PROTOCOL_BY_DRIVER|EFI_OPEN_PROTOCOL_EXCLUSIVE\r
@@ -831,7 +828,7 @@ PxeBcCreateIp4Children (
   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
@@ -843,9 +840,9 @@ PxeBcCreateIp4Children (
   //\r
   // Set default configure data for Udp4Read and Ip4 instance.\r
   //\r
-  Mode                            = Private->PxeBc.Mode;\r
-  Udp4CfgData                     = &Private->Udp4CfgData;\r
-  Ip4CfgData                      = &Private->Ip4CfgData;\r
+  Mode        = Private->PxeBc.Mode;\r
+  Udp4CfgData = &Private->Udp4CfgData;\r
+  Ip4CfgData  = &Private->Ip4CfgData;\r
 \r
   Udp4CfgData->AcceptBroadcast    = FALSE;\r
   Udp4CfgData->AcceptAnyPort      = TRUE;\r
@@ -855,12 +852,12 @@ PxeBcCreateIp4Children (
   Udp4CfgData->ReceiveTimeout     = PXEBC_DEFAULT_LIFETIME;\r
   Udp4CfgData->TransmitTimeout    = PXEBC_DEFAULT_LIFETIME;\r
 \r
-  Ip4CfgData->AcceptIcmpErrors    = TRUE;\r
-  Ip4CfgData->DefaultProtocol     = EFI_IP_PROTO_ICMP;\r
-  Ip4CfgData->TypeOfService       = Mode->ToS;\r
-  Ip4CfgData->TimeToLive          = Mode->TTL;\r
-  Ip4CfgData->ReceiveTimeout      = PXEBC_DEFAULT_LIFETIME;\r
-  Ip4CfgData->TransmitTimeout     = PXEBC_DEFAULT_LIFETIME;\r
+  Ip4CfgData->AcceptIcmpErrors = TRUE;\r
+  Ip4CfgData->DefaultProtocol  = EFI_IP_PROTO_ICMP;\r
+  Ip4CfgData->TypeOfService    = Mode->ToS;\r
+  Ip4CfgData->TimeToLive       = Mode->TTL;\r
+  Ip4CfgData->ReceiveTimeout   = PXEBC_DEFAULT_LIFETIME;\r
+  Ip4CfgData->TransmitTimeout  = PXEBC_DEFAULT_LIFETIME;\r
 \r
   return EFI_SUCCESS;\r
 \r
@@ -869,7 +866,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Create the opened instances based on IPv6.\r
 \r
@@ -888,14 +884,14 @@ PxeBcCreateIp6Children (
   IN PXEBC_PRIVATE_DATA           *Private\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  IPv6_DEVICE_PATH                Ip6Node;\r
-  EFI_UDP6_CONFIG_DATA            *Udp6CfgData;\r
-  EFI_IP6_CONFIG_DATA             *Ip6CfgData;\r
-  EFI_IP6_MODE_DATA               Ip6ModeData;\r
-  PXEBC_PRIVATE_PROTOCOL          *Id;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL     *Snp;\r
-  UINTN                           Index;\r
+  EFI_STATUS                   Status;\r
+  IPv6_DEVICE_PATH             Ip6Node;\r
+  EFI_UDP6_CONFIG_DATA         *Udp6CfgData;\r
+  EFI_IP6_CONFIG_DATA          *Ip6CfgData;\r
+  EFI_IP6_MODE_DATA            Ip6ModeData;\r
+  PXEBC_PRIVATE_PROTOCOL       *Id;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL  *Snp;\r
+  UINTN                        Index;\r
 \r
   if (Private->Ip6Nic != NULL) {\r
     //\r
@@ -929,7 +925,7 @@ PxeBcCreateIp6Children (
   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
@@ -964,7 +960,7 @@ PxeBcCreateIp6Children (
   Status = gBS->OpenProtocol (\r
                   Private->Mtftp6Child,\r
                   &gEfiMtftp6ProtocolGuid,\r
-                  (VOID **) &Private->Mtftp6,\r
+                  (VOID **)&Private->Mtftp6,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -989,7 +985,7 @@ PxeBcCreateIp6Children (
   Status = gBS->OpenProtocol (\r
                   Private->Udp6ReadChild,\r
                   &gEfiUdp6ProtocolGuid,\r
-                  (VOID **) &Private->Udp6Read,\r
+                  (VOID **)&Private->Udp6Read,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -1014,7 +1010,7 @@ PxeBcCreateIp6Children (
   Status = gBS->OpenProtocol (\r
                   Private->Udp6WriteChild,\r
                   &gEfiUdp6ProtocolGuid,\r
-                  (VOID **) &Private->Udp6Write,\r
+                  (VOID **)&Private->Udp6Write,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -1039,7 +1035,7 @@ PxeBcCreateIp6Children (
   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
@@ -1088,7 +1084,7 @@ PxeBcCreateIp6Children (
   Status = gBS->HandleProtocol (\r
                   ControllerHandle,\r
                   &gEfiIp6ConfigProtocolGuid,\r
-                  (VOID **) &Private->Ip6Cfg\r
+                  (VOID **)&Private->Ip6Cfg\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
@@ -1098,9 +1094,9 @@ PxeBcCreateIp6Children (
   // Create a device path node for Ipv6 virtual nic, and append it.\r
   //\r
   ZeroMem (&Ip6Node, sizeof (IPv6_DEVICE_PATH));\r
-  Ip6Node.Header.Type     = MESSAGING_DEVICE_PATH;\r
-  Ip6Node.Header.SubType  = MSG_IPv6_DP;\r
-  Ip6Node.PrefixLength    = IP6_PREFIX_LENGTH;\r
+  Ip6Node.Header.Type    = MESSAGING_DEVICE_PATH;\r
+  Ip6Node.Header.SubType = MSG_IPv6_DP;\r
+  Ip6Node.PrefixLength   = IP6_PREFIX_LENGTH;\r
 \r
   SetDevicePathNodeLength (&Ip6Node.Header, sizeof (Ip6Node));\r
 \r
@@ -1157,7 +1153,7 @@ PxeBcCreateIp6Children (
     Status = gBS->OpenProtocol (\r
                     Private->Ip6Nic->Controller,\r
                     &gEfiSimpleNetworkProtocolGuid,\r
-                    (VOID **) &Snp,\r
+                    (VOID **)&Snp,\r
                     This->DriverBindingHandle,\r
                     Private->Ip6Nic->Controller,\r
                     EFI_OPEN_PROTOCOL_BY_DRIVER|EFI_OPEN_PROTOCOL_EXCLUSIVE\r
@@ -1174,7 +1170,7 @@ PxeBcCreateIp6Children (
   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
@@ -1192,15 +1188,15 @@ PxeBcCreateIp6Children (
     //\r
     // Fail to get the data whether UNDI supports IPv6. Set default value.\r
     //\r
-    Private->Mode.Ipv6Available   = TRUE;\r
+    Private->Mode.Ipv6Available = TRUE;\r
   }\r
 \r
   if (!Private->Mode.Ipv6Available) {\r
     goto ON_ERROR;\r
   }\r
 \r
-  Udp6CfgData                     = &Private->Udp6CfgData;\r
-  Ip6CfgData                      = &Private->Ip6CfgData;\r
+  Udp6CfgData = &Private->Udp6CfgData;\r
+  Ip6CfgData  = &Private->Ip6CfgData;\r
 \r
   Udp6CfgData->AcceptAnyPort      = TRUE;\r
   Udp6CfgData->AllowDuplicatePort = TRUE;\r
@@ -1208,11 +1204,11 @@ PxeBcCreateIp6Children (
   Udp6CfgData->ReceiveTimeout     = PXEBC_DEFAULT_LIFETIME;\r
   Udp6CfgData->TransmitTimeout    = PXEBC_DEFAULT_LIFETIME;\r
 \r
-  Ip6CfgData->AcceptIcmpErrors    = TRUE;\r
-  Ip6CfgData->DefaultProtocol     = IP6_ICMP;\r
-  Ip6CfgData->HopLimit            = PXEBC_DEFAULT_HOPLIMIT;\r
-  Ip6CfgData->ReceiveTimeout      = PXEBC_DEFAULT_LIFETIME;\r
-  Ip6CfgData->TransmitTimeout     = PXEBC_DEFAULT_LIFETIME;\r
+  Ip6CfgData->AcceptIcmpErrors = TRUE;\r
+  Ip6CfgData->DefaultProtocol  = IP6_ICMP;\r
+  Ip6CfgData->HopLimit         = PXEBC_DEFAULT_HOPLIMIT;\r
+  Ip6CfgData->ReceiveTimeout   = PXEBC_DEFAULT_LIFETIME;\r
+  Ip6CfgData->TransmitTimeout  = PXEBC_DEFAULT_LIFETIME;\r
 \r
   return EFI_SUCCESS;\r
 \r
@@ -1221,7 +1217,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   The entry point for UefiPxeBc driver that installs the driver\r
   binding and component name protocol on its image.\r
@@ -1236,13 +1231,13 @@ ON_ERROR:
 EFI_STATUS\r
 EFIAPI\r
 PxeBcDriverEntryPoint (\r
-  IN EFI_HANDLE             ImageHandle,\r
-  IN EFI_SYSTEM_TABLE       *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   EFI_STATUS  Status;\r
 \r
-  if ((PcdGet8(PcdIPv4PXESupport) == PXE_DISABLED) && (PcdGet8(PcdIPv6PXESupport) == PXE_DISABLED)) {\r
+  if ((PcdGet8 (PcdIPv4PXESupport) == PXE_DISABLED) && (PcdGet8 (PcdIPv6PXESupport) == PXE_DISABLED)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -1300,20 +1295,22 @@ PxeBcSupported (
   IN UINT8                        IpVersion\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_GUID                        *DhcpServiceBindingGuid;\r
-  EFI_GUID                        *MtftpServiceBindingGuid;\r
+  EFI_STATUS  Status;\r
+  EFI_GUID    *DhcpServiceBindingGuid;\r
+  EFI_GUID    *MtftpServiceBindingGuid;\r
 \r
   if (IpVersion == IP_VERSION_4) {\r
-    if (PcdGet8(PcdIPv4PXESupport) == PXE_DISABLED) {\r
+    if (PcdGet8 (PcdIPv4PXESupport) == PXE_DISABLED) {\r
       return EFI_UNSUPPORTED;\r
     }\r
+\r
     DhcpServiceBindingGuid  = &gEfiDhcp4ServiceBindingProtocolGuid;\r
     MtftpServiceBindingGuid = &gEfiMtftp4ServiceBindingProtocolGuid;\r
   } else {\r
-    if (PcdGet8(PcdIPv6PXESupport) == PXE_DISABLED) {\r
+    if (PcdGet8 (PcdIPv6PXESupport) == PXE_DISABLED) {\r
       return EFI_UNSUPPORTED;\r
     }\r
+\r
     DhcpServiceBindingGuid  = &gEfiDhcp6ServiceBindingProtocolGuid;\r
     MtftpServiceBindingGuid = &gEfiMtftp6ServiceBindingProtocolGuid;\r
   }\r
@@ -1322,22 +1319,22 @@ PxeBcSupported (
   // Try to open the Mtftp and Dhcp protocol to test whether IP stack is ready.\r
   //\r
   Status = gBS->OpenProtocol (\r
-                     ControllerHandle,\r
-                     DhcpServiceBindingGuid,\r
-                     NULL,\r
-                     This->DriverBindingHandle,\r
-                     ControllerHandle,\r
-                     EFI_OPEN_PROTOCOL_TEST_PROTOCOL\r
-                     );\r
+                  ControllerHandle,\r
+                  DhcpServiceBindingGuid,\r
+                  NULL,\r
+                  This->DriverBindingHandle,\r
+                  ControllerHandle,\r
+                  EFI_OPEN_PROTOCOL_TEST_PROTOCOL\r
+                  );\r
   if (!EFI_ERROR (Status)) {\r
     Status = gBS->OpenProtocol (\r
-                       ControllerHandle,\r
-                       MtftpServiceBindingGuid,\r
-                       NULL,\r
-                       This->DriverBindingHandle,\r
-                       ControllerHandle,\r
-                       EFI_OPEN_PROTOCOL_TEST_PROTOCOL\r
-                       );\r
+                    ControllerHandle,\r
+                    MtftpServiceBindingGuid,\r
+                    NULL,\r
+                    This->DriverBindingHandle,\r
+                    ControllerHandle,\r
+                    EFI_OPEN_PROTOCOL_TEST_PROTOCOL\r
+                    );\r
   }\r
 \r
   //\r
@@ -1375,20 +1372,20 @@ PxeBcStart (
   IN UINT8                        IpVersion\r
   )\r
 {\r
-  PXEBC_PRIVATE_DATA              *Private;\r
-  EFI_STATUS                      Status;\r
-  PXEBC_PRIVATE_PROTOCOL          *Id;\r
-  BOOLEAN                         FirstStart;\r
+  PXEBC_PRIVATE_DATA      *Private;\r
+  EFI_STATUS              Status;\r
+  PXEBC_PRIVATE_PROTOCOL  *Id;\r
+  BOOLEAN                 FirstStart;\r
 \r
   FirstStart = FALSE;\r
-  Status = gBS->OpenProtocol (\r
-                  ControllerHandle,\r
-                  &gEfiCallerIdGuid,\r
-                  (VOID **) &Id,\r
-                  This->DriverBindingHandle,\r
-                  ControllerHandle,\r
-                  EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
-                  );\r
+  Status     = gBS->OpenProtocol (\r
+                      ControllerHandle,\r
+                      &gEfiCallerIdGuid,\r
+                      (VOID **)&Id,\r
+                      This->DriverBindingHandle,\r
+                      ControllerHandle,\r
+                      EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                      );\r
   if (!EFI_ERROR (Status)) {\r
     //\r
     // Skip the initialization if the driver has been started already.\r
@@ -1425,7 +1422,7 @@ PxeBcStart (
     Status = gBS->OpenProtocol (\r
                     ControllerHandle,\r
                     &gEfiDevicePathProtocolGuid,\r
-                    (VOID **) &Private->DevicePath,\r
+                    (VOID **)&Private->DevicePath,\r
                     This->DriverBindingHandle,\r
                     ControllerHandle,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1441,7 +1438,7 @@ PxeBcStart (
     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
@@ -1469,7 +1466,7 @@ PxeBcStart (
     //\r
     // Try to locate SNP protocol.\r
     //\r
-    NetLibGetSnpHandle(ControllerHandle, &Private->Snp);\r
+    NetLibGetSnpHandle (ControllerHandle, &Private->Snp);\r
   }\r
 \r
   if (IpVersion == IP_VERSION_4) {\r
@@ -1483,6 +1480,7 @@ PxeBcStart (
     //\r
     Status = PxeBcCreateIp6Children (This, ControllerHandle, Private);\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     //\r
     // Failed to start PXE driver if IPv4 and IPv6 stack are both not available.\r
@@ -1508,14 +1506,13 @@ ON_ERROR:
     PxeBcDestroyIp6Children (This, Private);\r
   }\r
 \r
-  if (FirstStart && Private != NULL) {\r
+  if (FirstStart && (Private != NULL)) {\r
     FreePool (Private);\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Stop this driver on ControllerHandle. This is the worker function for\r
   PxeBcIp4(6)DriverBindingStop.\r
@@ -1542,12 +1539,12 @@ PxeBcStop (
   IN UINT8                        IpVersion\r
   )\r
 {\r
-  PXEBC_PRIVATE_DATA              *Private;\r
-  PXEBC_VIRTUAL_NIC               *VirtualNic;\r
-  EFI_LOAD_FILE_PROTOCOL          *LoadFile;\r
-  EFI_STATUS                      Status;\r
-  EFI_HANDLE                      NicHandle;\r
-  PXEBC_PRIVATE_PROTOCOL          *Id;\r
+  PXEBC_PRIVATE_DATA      *Private;\r
+  PXEBC_VIRTUAL_NIC       *VirtualNic;\r
+  EFI_LOAD_FILE_PROTOCOL  *LoadFile;\r
+  EFI_STATUS              Status;\r
+  EFI_HANDLE              NicHandle;\r
+  PXEBC_PRIVATE_PROTOCOL  *Id;\r
 \r
   Private    = NULL;\r
   NicHandle  = NULL;\r
@@ -1558,7 +1555,7 @@ PxeBcStop (
   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
@@ -1572,6 +1569,7 @@ PxeBcStop (
     } else {\r
       NicHandle = PxeBcGetNicByIp6Children (ControllerHandle);\r
     }\r
+\r
     if (NicHandle == NULL) {\r
       return EFI_SUCCESS;\r
     }\r
@@ -1582,7 +1580,7 @@ PxeBcStop (
     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
@@ -1590,8 +1588,8 @@ PxeBcStop (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
-    Private = PXEBC_PRIVATE_DATA_FROM_ID (Id);\r
 \r
+    Private = PXEBC_PRIVATE_DATA_FROM_ID (Id);\r
   } else {\r
     //\r
     // It's a virtual handle with LoadFileProtocol.\r
@@ -1599,7 +1597,7 @@ PxeBcStop (
     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
@@ -1617,20 +1615,19 @@ PxeBcStop (
   // Stop functionality of PXE Base Code protocol\r
   //\r
   Status = Private->PxeBc.Stop (&Private->PxeBc);\r
-  if (Status != EFI_SUCCESS && Status != EFI_NOT_STARTED) {\r
+  if ((Status != EFI_SUCCESS) && (Status != EFI_NOT_STARTED)) {\r
     return Status;\r
   }\r
 \r
-\r
-  if (Private->Ip4Nic != NULL && IpVersion == IP_VERSION_4) {\r
+  if ((Private->Ip4Nic != NULL) && (IpVersion == IP_VERSION_4)) {\r
     PxeBcDestroyIp4Children (This, Private);\r
   }\r
 \r
-  if (Private->Ip6Nic != NULL && IpVersion == IP_VERSION_6) {\r
+  if ((Private->Ip6Nic != NULL) && (IpVersion == IP_VERSION_6)) {\r
     PxeBcDestroyIp6Children (This, Private);\r
   }\r
 \r
-  if (Private->Ip4Nic == NULL && Private->Ip6Nic == NULL) {\r
+  if ((Private->Ip4Nic == NULL) && (Private->Ip6Nic == NULL)) {\r
     gBS->UninstallProtocolInterface (\r
            NicHandle,\r
            &gEfiCallerIdGuid,\r