]> git.proxmox.com Git - mirror_edk2.git/commitdiff
NetworkPkg: Apply uncrustify changes
authorMichael Kubacki <michael.kubacki@microsoft.com>
Sun, 5 Dec 2021 22:54:07 +0000 (14:54 -0800)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Tue, 7 Dec 2021 17:24:28 +0000 (17:24 +0000)
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the NetworkPkg 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: Maciej Rabeda <maciej.rabeda@linux.intel.com>
294 files changed:
NetworkPkg/Application/VConfig/VConfig.c
NetworkPkg/ArpDxe/ArpDriver.c
NetworkPkg/ArpDxe/ArpDriver.h
NetworkPkg/ArpDxe/ArpImpl.c
NetworkPkg/ArpDxe/ArpImpl.h
NetworkPkg/ArpDxe/ArpMain.c
NetworkPkg/ArpDxe/ComponentName.c
NetworkPkg/Dhcp4Dxe/ComponentName.c
NetworkPkg/Dhcp4Dxe/Dhcp4Driver.c
NetworkPkg/Dhcp4Dxe/Dhcp4Driver.h
NetworkPkg/Dhcp4Dxe/Dhcp4Impl.c
NetworkPkg/Dhcp4Dxe/Dhcp4Impl.h
NetworkPkg/Dhcp4Dxe/Dhcp4Io.c
NetworkPkg/Dhcp4Dxe/Dhcp4Io.h
NetworkPkg/Dhcp4Dxe/Dhcp4Option.c
NetworkPkg/Dhcp4Dxe/Dhcp4Option.h
NetworkPkg/Dhcp6Dxe/ComponentName.c
NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c
NetworkPkg/Dhcp6Dxe/Dhcp6Driver.h
NetworkPkg/Dhcp6Dxe/Dhcp6Impl.c
NetworkPkg/Dhcp6Dxe/Dhcp6Impl.h
NetworkPkg/Dhcp6Dxe/Dhcp6Io.c
NetworkPkg/Dhcp6Dxe/Dhcp6Io.h
NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
NetworkPkg/Dhcp6Dxe/Dhcp6Utility.h
NetworkPkg/DnsDxe/ComponentName.c
NetworkPkg/DnsDxe/DnsDhcp.c
NetworkPkg/DnsDxe/DnsDhcp.h
NetworkPkg/DnsDxe/DnsDriver.c
NetworkPkg/DnsDxe/DnsDriver.h
NetworkPkg/DnsDxe/DnsImpl.c
NetworkPkg/DnsDxe/DnsImpl.h
NetworkPkg/DnsDxe/DnsProtocol.c
NetworkPkg/DpcDxe/Dpc.c
NetworkPkg/DpcDxe/Dpc.h
NetworkPkg/HttpBootDxe/HttpBootClient.c
NetworkPkg/HttpBootDxe/HttpBootClient.h
NetworkPkg/HttpBootDxe/HttpBootComponentName.c
NetworkPkg/HttpBootDxe/HttpBootConfig.c
NetworkPkg/HttpBootDxe/HttpBootConfig.h
NetworkPkg/HttpBootDxe/HttpBootConfigNVDataStruc.h
NetworkPkg/HttpBootDxe/HttpBootDhcp4.c
NetworkPkg/HttpBootDxe/HttpBootDhcp4.h
NetworkPkg/HttpBootDxe/HttpBootDhcp6.c
NetworkPkg/HttpBootDxe/HttpBootDhcp6.h
NetworkPkg/HttpBootDxe/HttpBootDxe.c
NetworkPkg/HttpBootDxe/HttpBootDxe.h
NetworkPkg/HttpBootDxe/HttpBootImpl.c
NetworkPkg/HttpBootDxe/HttpBootImpl.h
NetworkPkg/HttpBootDxe/HttpBootSupport.c
NetworkPkg/HttpBootDxe/HttpBootSupport.h
NetworkPkg/HttpDxe/ComponentName.c
NetworkPkg/HttpDxe/HttpDns.c
NetworkPkg/HttpDxe/HttpDns.h
NetworkPkg/HttpDxe/HttpDriver.c
NetworkPkg/HttpDxe/HttpDriver.h
NetworkPkg/HttpDxe/HttpImpl.c
NetworkPkg/HttpDxe/HttpImpl.h
NetworkPkg/HttpDxe/HttpProto.c
NetworkPkg/HttpDxe/HttpProto.h
NetworkPkg/HttpDxe/HttpsSupport.c
NetworkPkg/HttpDxe/HttpsSupport.h
NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.c
NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.h
NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesProtocol.c
NetworkPkg/IScsiDxe/ComponentName.c
NetworkPkg/IScsiDxe/IScsiAuthenticationInfo.c
NetworkPkg/IScsiDxe/IScsiCHAP.c
NetworkPkg/IScsiDxe/IScsiCHAP.h
NetworkPkg/IScsiDxe/IScsiConfig.c
NetworkPkg/IScsiDxe/IScsiConfig.h
NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h
NetworkPkg/IScsiDxe/IScsiDhcp.c
NetworkPkg/IScsiDxe/IScsiDhcp.h
NetworkPkg/IScsiDxe/IScsiDhcp6.c
NetworkPkg/IScsiDxe/IScsiDhcp6.h
NetworkPkg/IScsiDxe/IScsiDns.c
NetworkPkg/IScsiDxe/IScsiDns.h
NetworkPkg/IScsiDxe/IScsiDriver.c
NetworkPkg/IScsiDxe/IScsiDriver.h
NetworkPkg/IScsiDxe/IScsiExtScsiPassThru.c
NetworkPkg/IScsiDxe/IScsiIbft.c
NetworkPkg/IScsiDxe/IScsiIbft.h
NetworkPkg/IScsiDxe/IScsiImpl.h
NetworkPkg/IScsiDxe/IScsiInitiatorName.c
NetworkPkg/IScsiDxe/IScsiMisc.c
NetworkPkg/IScsiDxe/IScsiMisc.h
NetworkPkg/IScsiDxe/IScsiProto.c
NetworkPkg/IScsiDxe/IScsiProto.h
NetworkPkg/Include/Guid/HttpBootConfigHii.h
NetworkPkg/Include/Guid/HttpTlsCipherList.h
NetworkPkg/Include/Guid/IScsiConfigHii.h
NetworkPkg/Include/Guid/Ip4Config2Hii.h
NetworkPkg/Include/Guid/Ip4IScsiConfigHii.h
NetworkPkg/Include/Guid/Ip6ConfigHii.h
NetworkPkg/Include/Guid/TlsAuthConfigHii.h
NetworkPkg/Include/Guid/TlsAuthentication.h
NetworkPkg/Include/Guid/VlanConfigHii.h
NetworkPkg/Include/Guid/WifiConnectionManagerConfigHii.h
NetworkPkg/Include/Library/HttpIoLib.h
NetworkPkg/Include/Library/HttpLib.h
NetworkPkg/Include/Library/IpIoLib.h
NetworkPkg/Include/Library/NetLib.h
NetworkPkg/Include/Library/TcpIoLib.h
NetworkPkg/Include/Library/UdpIoLib.h
NetworkPkg/Include/Protocol/Dpc.h
NetworkPkg/Include/Protocol/HttpCallback.h
NetworkPkg/Ip4Dxe/ComponentName.c
NetworkPkg/Ip4Dxe/Ip4Common.c
NetworkPkg/Ip4Dxe/Ip4Common.h
NetworkPkg/Ip4Dxe/Ip4Config2Impl.c
NetworkPkg/Ip4Dxe/Ip4Config2Impl.h
NetworkPkg/Ip4Dxe/Ip4Config2Nv.c
NetworkPkg/Ip4Dxe/Ip4Config2Nv.h
NetworkPkg/Ip4Dxe/Ip4Driver.c
NetworkPkg/Ip4Dxe/Ip4Driver.h
NetworkPkg/Ip4Dxe/Ip4Icmp.c
NetworkPkg/Ip4Dxe/Ip4Icmp.h
NetworkPkg/Ip4Dxe/Ip4If.c
NetworkPkg/Ip4Dxe/Ip4If.h
NetworkPkg/Ip4Dxe/Ip4Igmp.c
NetworkPkg/Ip4Dxe/Ip4Igmp.h
NetworkPkg/Ip4Dxe/Ip4Impl.c
NetworkPkg/Ip4Dxe/Ip4Impl.h
NetworkPkg/Ip4Dxe/Ip4Input.c
NetworkPkg/Ip4Dxe/Ip4Input.h
NetworkPkg/Ip4Dxe/Ip4NvData.h
NetworkPkg/Ip4Dxe/Ip4Option.c
NetworkPkg/Ip4Dxe/Ip4Option.h
NetworkPkg/Ip4Dxe/Ip4Output.c
NetworkPkg/Ip4Dxe/Ip4Output.h
NetworkPkg/Ip4Dxe/Ip4Route.c
NetworkPkg/Ip4Dxe/Ip4Route.h
NetworkPkg/Ip6Dxe/ComponentName.c
NetworkPkg/Ip6Dxe/Ip6Common.c
NetworkPkg/Ip6Dxe/Ip6Common.h
NetworkPkg/Ip6Dxe/Ip6ConfigImpl.c
NetworkPkg/Ip6Dxe/Ip6ConfigImpl.h
NetworkPkg/Ip6Dxe/Ip6ConfigNv.c
NetworkPkg/Ip6Dxe/Ip6ConfigNv.h
NetworkPkg/Ip6Dxe/Ip6Driver.c
NetworkPkg/Ip6Dxe/Ip6Driver.h
NetworkPkg/Ip6Dxe/Ip6Icmp.c
NetworkPkg/Ip6Dxe/Ip6Icmp.h
NetworkPkg/Ip6Dxe/Ip6If.c
NetworkPkg/Ip6Dxe/Ip6If.h
NetworkPkg/Ip6Dxe/Ip6Impl.c
NetworkPkg/Ip6Dxe/Ip6Impl.h
NetworkPkg/Ip6Dxe/Ip6Input.c
NetworkPkg/Ip6Dxe/Ip6Input.h
NetworkPkg/Ip6Dxe/Ip6Mld.c
NetworkPkg/Ip6Dxe/Ip6Mld.h
NetworkPkg/Ip6Dxe/Ip6Nd.c
NetworkPkg/Ip6Dxe/Ip6Nd.h
NetworkPkg/Ip6Dxe/Ip6NvData.h
NetworkPkg/Ip6Dxe/Ip6Option.c
NetworkPkg/Ip6Dxe/Ip6Option.h
NetworkPkg/Ip6Dxe/Ip6Output.c
NetworkPkg/Ip6Dxe/Ip6Output.h
NetworkPkg/Ip6Dxe/Ip6Route.c
NetworkPkg/Ip6Dxe/Ip6Route.h
NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c
NetworkPkg/Library/DxeHttpLib/DxeHttpLib.c
NetworkPkg/Library/DxeHttpLib/DxeHttpLib.h
NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.c
NetworkPkg/Library/DxeNetLib/DxeNetLib.c
NetworkPkg/Library/DxeNetLib/NetBuffer.c
NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.c
NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
NetworkPkg/MnpDxe/ComponentName.c
NetworkPkg/MnpDxe/ComponentName.h
NetworkPkg/MnpDxe/MnpConfig.c
NetworkPkg/MnpDxe/MnpDriver.c
NetworkPkg/MnpDxe/MnpDriver.h
NetworkPkg/MnpDxe/MnpImpl.h
NetworkPkg/MnpDxe/MnpIo.c
NetworkPkg/MnpDxe/MnpMain.c
NetworkPkg/MnpDxe/MnpVlan.c
NetworkPkg/MnpDxe/MnpVlan.h
NetworkPkg/Mtftp4Dxe/ComponentName.c
NetworkPkg/Mtftp4Dxe/Mtftp4Driver.c
NetworkPkg/Mtftp4Dxe/Mtftp4Driver.h
NetworkPkg/Mtftp4Dxe/Mtftp4Impl.c
NetworkPkg/Mtftp4Dxe/Mtftp4Impl.h
NetworkPkg/Mtftp4Dxe/Mtftp4Option.c
NetworkPkg/Mtftp4Dxe/Mtftp4Option.h
NetworkPkg/Mtftp4Dxe/Mtftp4Rrq.c
NetworkPkg/Mtftp4Dxe/Mtftp4Support.c
NetworkPkg/Mtftp4Dxe/Mtftp4Support.h
NetworkPkg/Mtftp4Dxe/Mtftp4Wrq.c
NetworkPkg/Mtftp6Dxe/ComponentName.c
NetworkPkg/Mtftp6Dxe/Mtftp6Driver.c
NetworkPkg/Mtftp6Dxe/Mtftp6Driver.h
NetworkPkg/Mtftp6Dxe/Mtftp6Impl.c
NetworkPkg/Mtftp6Dxe/Mtftp6Impl.h
NetworkPkg/Mtftp6Dxe/Mtftp6Option.c
NetworkPkg/Mtftp6Dxe/Mtftp6Option.h
NetworkPkg/Mtftp6Dxe/Mtftp6Rrq.c
NetworkPkg/Mtftp6Dxe/Mtftp6Support.c
NetworkPkg/Mtftp6Dxe/Mtftp6Support.h
NetworkPkg/Mtftp6Dxe/Mtftp6Wrq.c
NetworkPkg/SnpDxe/Callback.c
NetworkPkg/SnpDxe/ComponentName.c
NetworkPkg/SnpDxe/Get_status.c
NetworkPkg/SnpDxe/Initialize.c
NetworkPkg/SnpDxe/Mcast_ip_to_mac.c
NetworkPkg/SnpDxe/Nvdata.c
NetworkPkg/SnpDxe/Receive.c
NetworkPkg/SnpDxe/Receive_filters.c
NetworkPkg/SnpDxe/Reset.c
NetworkPkg/SnpDxe/Shutdown.c
NetworkPkg/SnpDxe/Snp.c
NetworkPkg/SnpDxe/Snp.h
NetworkPkg/SnpDxe/Start.c
NetworkPkg/SnpDxe/Station_address.c
NetworkPkg/SnpDxe/Statistics.c
NetworkPkg/SnpDxe/Stop.c
NetworkPkg/SnpDxe/Transmit.c
NetworkPkg/SnpDxe/WaitForPacket.c
NetworkPkg/TcpDxe/ComponentName.c
NetworkPkg/TcpDxe/SockImpl.c
NetworkPkg/TcpDxe/SockImpl.h
NetworkPkg/TcpDxe/SockInterface.c
NetworkPkg/TcpDxe/Socket.h
NetworkPkg/TcpDxe/TcpDispatcher.c
NetworkPkg/TcpDxe/TcpDriver.c
NetworkPkg/TcpDxe/TcpDriver.h
NetworkPkg/TcpDxe/TcpFunc.h
NetworkPkg/TcpDxe/TcpInput.c
NetworkPkg/TcpDxe/TcpIo.c
NetworkPkg/TcpDxe/TcpMain.c
NetworkPkg/TcpDxe/TcpMain.h
NetworkPkg/TcpDxe/TcpMisc.c
NetworkPkg/TcpDxe/TcpOption.c
NetworkPkg/TcpDxe/TcpOption.h
NetworkPkg/TcpDxe/TcpOutput.c
NetworkPkg/TcpDxe/TcpProto.h
NetworkPkg/TcpDxe/TcpTimer.c
NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.c
NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c
NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.h
NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigNvData.h
NetworkPkg/TlsDxe/TlsConfigProtocol.c
NetworkPkg/TlsDxe/TlsDriver.c
NetworkPkg/TlsDxe/TlsDriver.h
NetworkPkg/TlsDxe/TlsImpl.c
NetworkPkg/TlsDxe/TlsImpl.h
NetworkPkg/TlsDxe/TlsProtocol.c
NetworkPkg/Udp4Dxe/ComponentName.c
NetworkPkg/Udp4Dxe/Udp4Driver.c
NetworkPkg/Udp4Dxe/Udp4Driver.h
NetworkPkg/Udp4Dxe/Udp4Impl.c
NetworkPkg/Udp4Dxe/Udp4Impl.h
NetworkPkg/Udp4Dxe/Udp4Main.c
NetworkPkg/Udp6Dxe/ComponentName.c
NetworkPkg/Udp6Dxe/Udp6Driver.c
NetworkPkg/Udp6Dxe/Udp6Driver.h
NetworkPkg/Udp6Dxe/Udp6Impl.c
NetworkPkg/Udp6Dxe/Udp6Impl.h
NetworkPkg/Udp6Dxe/Udp6Main.c
NetworkPkg/UefiPxeBcDxe/ComponentName.c
NetworkPkg/UefiPxeBcDxe/PxeBcBoot.c
NetworkPkg/UefiPxeBcDxe/PxeBcBoot.h
NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.c
NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.h
NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
NetworkPkg/UefiPxeBcDxe/PxeBcDriver.h
NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
NetworkPkg/UefiPxeBcDxe/PxeBcImpl.h
NetworkPkg/UefiPxeBcDxe/PxeBcMtftp.c
NetworkPkg/UefiPxeBcDxe/PxeBcMtftp.h
NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
NetworkPkg/UefiPxeBcDxe/PxeBcSupport.h
NetworkPkg/VlanConfigDxe/ComponentName.c
NetworkPkg/VlanConfigDxe/VlanConfigDriver.c
NetworkPkg/VlanConfigDxe/VlanConfigImpl.c
NetworkPkg/VlanConfigDxe/VlanConfigImpl.h
NetworkPkg/VlanConfigDxe/VlanConfigNvData.h
NetworkPkg/WifiConnectionManagerDxe/EapContext.h
NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrComponentName.c
NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrConfig.h
NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrConfigNVDataStruct.h
NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrDriver.c
NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrDxe.h
NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrFileUtil.c
NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrFileUtil.h
NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrHiiConfigAccess.c
NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrHiiConfigAccess.h
NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c
NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.h
NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrMisc.c
NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrMisc.h

index b50b07b972be07739995215d4f2ed37244b797ff..2c323e377becc59db45e095abc02a1876e2bdf9d 100644 (file)
 //\r
 // String token ID of VConfig command help message text.\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_STRING_ID mStringVConfigHelpTokenId = STRING_TOKEN (STR_VCONFIG_HELP);\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_STRING_ID  mStringVConfigHelpTokenId = STRING_TOKEN (STR_VCONFIG_HELP);\r
 \r
-#define INVALID_NIC_INDEX   0xffff\r
-#define INVALID_VLAN_ID     0xffff\r
+#define INVALID_NIC_INDEX  0xffff\r
+#define INVALID_VLAN_ID    0xffff\r
 \r
 //\r
 // This is the generated String package data for all .UNI files.\r
 // This data array is ready to be used as input of HiiAddPackages() to\r
 // create a packagelist (which contains Form packages, String packages, etc).\r
 //\r
-extern UINT8      VConfigStrings[];\r
+extern UINT8  VConfigStrings[];\r
 \r
-EFI_HANDLE        mImageHandle  = NULL;\r
-EFI_HII_HANDLE    mHiiHandle    = NULL;\r
+EFI_HANDLE      mImageHandle = NULL;\r
+EFI_HII_HANDLE  mHiiHandle   = NULL;\r
 \r
 SHELL_PARAM_ITEM  mParamList[] = {\r
   {\r
@@ -66,14 +66,14 @@ SHELL_PARAM_ITEM  mParamList[] = {
 **/\r
 VOID\r
 LocateNicHandleBuffer (\r
-  OUT UINTN                       *NumberOfHandles,\r
-  OUT EFI_HANDLE                  **HandleBuffer\r
+  OUT UINTN       *NumberOfHandles,\r
+  OUT EFI_HANDLE  **HandleBuffer\r
   )\r
 {\r
   EFI_STATUS  Status;\r
 \r
-  *NumberOfHandles  = 0;\r
-  *HandleBuffer     = NULL;\r
+  *NumberOfHandles = 0;\r
+  *HandleBuffer    = NULL;\r
 \r
   Status = gBS->LocateHandleBuffer (\r
                   ByProtocol,\r
@@ -98,7 +98,7 @@ LocateNicHandleBuffer (
 **/\r
 UINTN\r
 NicNameToIndex (\r
-  IN CHAR16                   *Name\r
+  IN CHAR16  *Name\r
   )\r
 {\r
   CHAR16  *Str;\r
@@ -116,7 +116,7 @@ NicNameToIndex (
     Str++;\r
   }\r
 \r
-  return (UINT16) StrDecimalToUintn (Name + 3);\r
+  return (UINT16)StrDecimalToUintn (Name + 3);\r
 }\r
 \r
 /**\r
@@ -130,7 +130,7 @@ NicNameToIndex (
 **/\r
 EFI_HANDLE\r
 NicNameToHandle (\r
-  IN CHAR16                   *Name\r
+  IN CHAR16  *Name\r
   )\r
 {\r
   UINTN       NumberOfHandles;\r
@@ -168,7 +168,7 @@ NicNameToHandle (
 **/\r
 EFI_VLAN_CONFIG_PROTOCOL *\r
 OpenVlanConfigProtocol (\r
-  IN EFI_HANDLE                 Handle\r
+  IN EFI_HANDLE  Handle\r
   )\r
 {\r
   EFI_VLAN_CONFIG_PROTOCOL  *VlanConfig;\r
@@ -177,7 +177,7 @@ OpenVlanConfigProtocol (
   gBS->OpenProtocol (\r
          Handle,\r
          &gEfiVlanConfigProtocolGuid,\r
-         (VOID **) &VlanConfig,\r
+         (VOID **)&VlanConfig,\r
          mImageHandle,\r
          Handle,\r
          EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -194,7 +194,7 @@ OpenVlanConfigProtocol (
 **/\r
 VOID\r
 CloseVlanConfigProtocol (\r
-  IN EFI_HANDLE                 Handle\r
+  IN EFI_HANDLE  Handle\r
   )\r
 {\r
   gBS->CloseProtocol (\r
@@ -214,8 +214,8 @@ CloseVlanConfigProtocol (
 **/\r
 VOID\r
 ShowNicVlanInfo (\r
-  IN EFI_HANDLE              Handle,\r
-  IN UINTN                   NicIndex\r
+  IN EFI_HANDLE  Handle,\r
+  IN UINTN       NicIndex\r
   )\r
 {\r
   CHAR16                    *MacStr;\r
@@ -227,11 +227,11 @@ ShowNicVlanInfo (
 \r
   VlanConfig = OpenVlanConfigProtocol (Handle);\r
   if (VlanConfig == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
-  MacStr  = NULL;\r
-  Status  = NetLibGetMacString (Handle, mImageHandle, &MacStr);\r
+  MacStr = NULL;\r
+  Status = NetLibGetMacString (Handle, mImageHandle, &MacStr);\r
   if (EFI_ERROR (Status)) {\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_MAC_FAIL), mHiiHandle, Status);\r
     goto Exit;\r
@@ -281,7 +281,7 @@ Exit:
 **/\r
 VOID\r
 DisplayVlan (\r
-  IN CHAR16              *Name OPTIONAL\r
+  IN CHAR16  *Name OPTIONAL\r
   )\r
 {\r
   UINTN       NumberOfHandles;\r
@@ -295,11 +295,11 @@ DisplayVlan (
     //\r
     NicHandle = NicNameToHandle (Name);\r
     if (NicHandle == NULL) {\r
-      return ;\r
+      return;\r
     }\r
 \r
     ShowNicVlanInfo (NicHandle, 0);\r
-    return ;\r
+    return;\r
   }\r
 \r
   //\r
@@ -307,7 +307,7 @@ DisplayVlan (
   //\r
   LocateNicHandleBuffer (&NumberOfHandles, &HandleBuffer);\r
   if (NumberOfHandles == 0) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   for (Index = 0; Index < NumberOfHandles; Index++) {\r
@@ -327,7 +327,7 @@ DisplayVlan (
 **/\r
 UINT16\r
 StrToVlanId (\r
-  IN CHAR16             *String\r
+  IN CHAR16  *String\r
   )\r
 {\r
   CHAR16  *Str;\r
@@ -345,7 +345,7 @@ StrToVlanId (
     return INVALID_VLAN_ID;\r
   }\r
 \r
-  return (UINT16) StrDecimalToUintn (String);\r
+  return (UINT16)StrDecimalToUintn (String);\r
 }\r
 \r
 /**\r
@@ -356,7 +356,7 @@ StrToVlanId (
 **/\r
 VOID\r
 AddVlan (\r
-  IN CHAR16             *ParamStr\r
+  IN CHAR16  *ParamStr\r
   )\r
 {\r
   CHAR16                    *Name;\r
@@ -371,17 +371,17 @@ AddVlan (
   EFI_VLAN_CONFIG_PROTOCOL  *VlanConfig;\r
   EFI_STATUS                Status;\r
 \r
-  VlanConfig  = NULL;\r
-  Priority    = 0;\r
+  VlanConfig = NULL;\r
+  Priority   = 0;\r
 \r
   if (ParamStr == NULL) {\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_NO_IF), mHiiHandle);\r
-    return ;\r
+    return;\r
   }\r
 \r
   StrPtr = AllocateCopyPool (StrSize (ParamStr), ParamStr);\r
   if (StrPtr == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   Name        = StrPtr;\r
@@ -459,7 +459,7 @@ AddVlan (
   //\r
   // Set VLAN\r
   //\r
-  Status = VlanConfig->Set (VlanConfig, (UINT16) VlanId, (UINT8) Priority);\r
+  Status = VlanConfig->Set (VlanConfig, (UINT16)VlanId, (UINT8)Priority);\r
   if (EFI_ERROR (Status)) {\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_SET_FAIL), mHiiHandle, Status);\r
     goto Exit;\r
@@ -468,7 +468,7 @@ AddVlan (
   //\r
   // Connect the VLAN device.\r
   //\r
-  VlanHandle = NetLibGetVlanHandle (Handle, (UINT16) VlanId);\r
+  VlanHandle = NetLibGetVlanHandle (Handle, (UINT16)VlanId);\r
   if (VlanHandle != NULL) {\r
     gBS->ConnectController (VlanHandle, NULL, NULL, TRUE);\r
   }\r
@@ -491,7 +491,7 @@ Exit:
 **/\r
 VOID\r
 DeleteVlan (\r
-  IN CHAR16 *ParamStr\r
+  IN CHAR16  *ParamStr\r
   )\r
 {\r
   CHAR16                    *Name;\r
@@ -508,12 +508,12 @@ DeleteVlan (
 \r
   if (ParamStr == NULL) {\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_NO_IF), mHiiHandle);\r
-    return ;\r
+    return;\r
   }\r
 \r
   StrPtr = AllocateCopyPool (StrSize (ParamStr), ParamStr);\r
   if (StrPtr == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   Name      = StrPtr;\r
@@ -541,7 +541,7 @@ DeleteVlan (
   //\r
   // Check VLAN ID\r
   //\r
-  if (VlanIdStr == NULL || *VlanIdStr == 0) {\r
+  if ((VlanIdStr == NULL) || (*VlanIdStr == 0)) {\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_NO_VID), mHiiHandle);\r
     goto Exit;\r
   }\r
@@ -555,7 +555,7 @@ DeleteVlan (
   //\r
   // Delete VLAN.\r
   //\r
-  Status = VlanConfig->Remove (VlanConfig, (UINT16) VlanId);\r
+  Status = VlanConfig->Remove (VlanConfig, (UINT16)VlanId);\r
   if (EFI_ERROR (Status)) {\r
     if (Status == EFI_NOT_FOUND) {\r
       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_NOT_FOUND), mHiiHandle);\r
@@ -606,10 +606,10 @@ VlanConfigMain (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  LIST_ENTRY    *List;\r
-  CONST CHAR16  *Str;\r
-  EFI_HII_PACKAGE_LIST_HEADER     *PackageList;\r
-  EFI_STATUS    Status;\r
+  LIST_ENTRY                   *List;\r
+  CONST CHAR16                 *Str;\r
+  EFI_HII_PACKAGE_LIST_HEADER  *PackageList;\r
+  EFI_STATUS                   Status;\r
 \r
   mImageHandle = ImageHandle;\r
 \r
@@ -619,7 +619,7 @@ VlanConfigMain (
   Status = gBS->OpenProtocol (\r
                   ImageHandle,\r
                   &gEfiHiiPackageListProtocolGuid,\r
-                  (VOID **) &PackageList,\r
+                  (VOID **)&PackageList,\r
                   ImageHandle,\r
                   NULL,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -632,11 +632,11 @@ VlanConfigMain (
   // Publish HII package list to HII Database.\r
   //\r
   Status = gHiiDatabase->NewPackageList (\r
-                          gHiiDatabase,\r
-                          PackageList,\r
-                          NULL,\r
-                          &mHiiHandle\r
-                          );\r
+                           gHiiDatabase,\r
+                           PackageList,\r
+                           NULL,\r
+                           &mHiiHandle\r
+                           );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -654,19 +654,19 @@ VlanConfigMain (
 \r
   if (ShellCommandLineGetFlag (List, L"-l")) {\r
     Str = ShellCommandLineGetValue (List, L"-l");\r
-    DisplayVlan ((CHAR16 *) Str);\r
+    DisplayVlan ((CHAR16 *)Str);\r
     goto Exit;\r
   }\r
 \r
   if (ShellCommandLineGetFlag (List, L"-a")) {\r
     Str = ShellCommandLineGetValue (List, L"-a");\r
-    AddVlan ((CHAR16 *) Str);\r
+    AddVlan ((CHAR16 *)Str);\r
     goto Exit;\r
   }\r
 \r
   if (ShellCommandLineGetFlag (List, L"-d")) {\r
     Str = ShellCommandLineGetValue (List, L"-d");\r
-    DeleteVlan ((CHAR16 *) Str);\r
+    DeleteVlan ((CHAR16 *)Str);\r
     goto Exit;\r
   }\r
 \r
index eeef7f68e1b6c2538808d198a5f3de57c182a4ec..c80da6d828dca92f50e43cb652e735a46cafe88c 100644 (file)
@@ -9,7 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include "ArpDriver.h"\r
 #include "ArpImpl.h"\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gArpDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gArpDriverBinding = {\r
   ArpDriverBindingSupported,\r
   ArpDriverBindingStart,\r
   ArpDriverBindingStop,\r
@@ -18,7 +18,6 @@ EFI_DRIVER_BINDING_PROTOCOL gArpDriverBinding = {
   NULL\r
 };\r
 \r
-\r
 /**\r
   Create and initialize the arp service context data.\r
 \r
@@ -37,8 +36,8 @@ EFI_DRIVER_BINDING_PROTOCOL gArpDriverBinding = {
 **/\r
 EFI_STATUS\r
 ArpCreateService (\r
-  IN EFI_HANDLE        ImageHandle,\r
-  IN EFI_HANDLE        ControllerHandle,\r
+  IN EFI_HANDLE            ImageHandle,\r
+  IN EFI_HANDLE            ControllerHandle,\r
   IN OUT ARP_SERVICE_DATA  *ArpService\r
   )\r
 {\r
@@ -176,7 +175,6 @@ ERROR_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Clean the arp service context data.\r
 \r
@@ -226,7 +224,7 @@ ArpCleanService (
     //\r
     // Destroy the mnp child.\r
     //\r
-    NetLibDestroyServiceChild(\r
+    NetLibDestroyServiceChild (\r
       ArpService->ControllerHandle,\r
       ArpService->ImageHandle,\r
       &gEfiManagedNetworkServiceBindingProtocolGuid,\r
@@ -248,19 +246,19 @@ ArpCleanService (
 EFI_STATUS\r
 EFIAPI\r
 ArpDestroyChildEntryInHandleBuffer (\r
-  IN LIST_ENTRY         *Entry,\r
-  IN VOID               *Context\r
+  IN LIST_ENTRY  *Entry,\r
+  IN VOID        *Context\r
   )\r
 {\r
   ARP_INSTANCE_DATA             *Instance;\r
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
 \r
-  if (Entry == NULL || Context == NULL) {\r
+  if ((Entry == NULL) || (Context == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Instance = NET_LIST_USER_STRUCT_S (Entry, ARP_INSTANCE_DATA, List, ARP_INSTANCE_DATA_SIGNATURE);\r
-  ServiceBinding    = (EFI_SERVICE_BINDING_PROTOCOL *) Context;\r
+  Instance       = NET_LIST_USER_STRUCT_S (Entry, ARP_INSTANCE_DATA, List, ARP_INSTANCE_DATA_SIGNATURE);\r
+  ServiceBinding = (EFI_SERVICE_BINDING_PROTOCOL *)Context;\r
 \r
   return ServiceBinding->DestroyChild (ServiceBinding, Instance->Handle);\r
 }\r
@@ -334,7 +332,6 @@ ArpDriverBindingSupported (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Start this driver on ControllerHandle.\r
 \r
@@ -380,7 +377,7 @@ ArpDriverBindingStart (
   //\r
   // Allocate a zero pool for ArpService.\r
   //\r
-  ArpService = AllocateZeroPool (sizeof(ARP_SERVICE_DATA));\r
+  ArpService = AllocateZeroPool (sizeof (ARP_SERVICE_DATA));\r
   if (ArpService == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -427,7 +424,6 @@ ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Stop this driver on ControllerHandle.\r
 \r
@@ -502,7 +498,7 @@ ArpDriverBindingStop (
     //\r
     // NumberOfChildren is not zero, destroy all the ARP children instances.\r
     //\r
-    List = &ArpService->ChildrenList;\r
+    List   = &ArpService->ChildrenList;\r
     Status = NetDestroyLinkList (\r
                List,\r
                ArpDestroyChildEntryInHandleBuffer,\r
@@ -576,7 +572,7 @@ ArpServiceBindingCreateChild (
   //\r
   // Allocate memory for the instance context data.\r
   //\r
-  Instance = AllocateZeroPool (sizeof(ARP_INSTANCE_DATA));\r
+  Instance = AllocateZeroPool (sizeof (ARP_INSTANCE_DATA));\r
   if (Instance == NULL) {\r
     DEBUG ((DEBUG_ERROR, "ArpSBCreateChild: Failed to allocate memory for Instance.\n"));\r
 \r
@@ -615,7 +611,7 @@ ArpServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   ArpService->MnpChildHandle,\r
                   &gEfiManagedNetworkProtocolGuid,\r
-                  (VOID **) &Mnp,\r
+                  (VOID **)&Mnp,\r
                   gArpDriverBinding.DriverBindingHandle,\r
                   Instance->Handle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -637,7 +633,6 @@ ArpServiceBindingCreateChild (
 ERROR:\r
 \r
   if (EFI_ERROR (Status)) {\r
-\r
     gBS->CloseProtocol (\r
            ArpService->MnpChildHandle,\r
            &gEfiManagedNetworkProtocolGuid,\r
@@ -661,7 +656,6 @@ ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Destroys a child handle with a protocol installed on it.\r
 \r
@@ -746,8 +740,11 @@ ArpServiceBindingDestroyChild (
                   NULL\r
                   );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "ArpSBDestroyChild: Failed to uninstall the arp protocol, %r.\n",\r
-      Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "ArpSBDestroyChild: Failed to uninstall the arp protocol, %r.\n",\r
+      Status\r
+      ));\r
 \r
     Instance->InDestroy = FALSE;\r
     return Status;\r
index 7dbc1c187820a7f0da49702b4eae8434e5ead966..2966bac31064ff16d5502096a680fb31ac77df75 100644 (file)
@@ -9,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef _ARP_DRIVER_H_\r
 #define _ARP_DRIVER_H_\r
 \r
-\r
 #include <Uefi.h>\r
 \r
 #include <Protocol/Arp.h>\r
@@ -21,17 +20,17 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/UefiLib.h>\r
 \r
-\r
 //\r
 // Global variables\r
 //\r
-extern EFI_DRIVER_BINDING_PROTOCOL    gArpDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL    gArpComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL   gArpComponentName2;\r
+extern EFI_DRIVER_BINDING_PROTOCOL   gArpDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gArpComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gArpComponentName2;\r
 \r
 //\r
 // Function prototypes for the Driver Binding Protocol\r
 //\r
+\r
 /**\r
   Tests to see if this driver supports a given controller.\r
 \r
@@ -199,10 +198,10 @@ ArpServiceBindingDestroyChild (
   IN EFI_HANDLE                    ChildHandle\r
   );\r
 \r
-\r
 //\r
 // EFI Component Name Functions\r
 //\r
+\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
 \r
@@ -250,7 +249,6 @@ ArpComponentNameGetDriverName (
   OUT CHAR16                       **DriverName\r
   );\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r
   that is being managed by a driver.\r
@@ -322,13 +320,11 @@ ArpComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 ArpComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   );\r
 \r
-\r
 #endif\r
-\r
index ad5cb3cf7be4f3d17d3bbd7b6e0c2c7cf2e1fc72..9d0d4dcd2a33350f1aec38f9366908d8843fb586 100644 (file)
@@ -21,7 +21,6 @@ EFI_ARP_PROTOCOL  mEfiArpProtocolTemplate = {
   ArpCancel\r
 };\r
 \r
-\r
 /**\r
   Initialize the instance context data.\r
 \r
@@ -51,7 +50,6 @@ ArpInitInstance (
   InitializeListHead (&Instance->List);\r
 }\r
 \r
-\r
 /**\r
   Process the Arp packets received from Mnp, the procedure conforms to RFC826.\r
 \r
@@ -64,7 +62,7 @@ ArpInitInstance (
 VOID\r
 EFIAPI\r
 ArpOnFrameRcvdDpc (\r
-  IN VOID       *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
   EFI_STATUS                            Status;\r
@@ -119,7 +117,7 @@ ArpOnFrameRcvdDpc (
   //\r
   // Convert the byte order of the multi-byte fields.\r
   //\r
-  Head   = (ARP_HEAD *) RxData->PacketData;\r
+  Head            = (ARP_HEAD *)RxData->PacketData;\r
   Head->HwType    = NTOHS (Head->HwType);\r
   Head->ProtoType = NTOHS (Head->ProtoType);\r
   Head->OpCode    = NTOHS (Head->OpCode);\r
@@ -129,8 +127,9 @@ ArpOnFrameRcvdDpc (
   }\r
 \r
   if ((Head->HwType != ArpService->SnpMode.IfType) ||\r
-    (Head->HwAddrLen != ArpService->SnpMode.HwAddressSize) ||\r
-    (RxData->ProtocolType != ARP_ETHER_PROTO_TYPE)) {\r
+      (Head->HwAddrLen != ArpService->SnpMode.HwAddressSize) ||\r
+      (RxData->ProtocolType != ARP_ETHER_PROTO_TYPE))\r
+  {\r
     //\r
     // The hardware type or the hardware address length doesn't match.\r
     // There is a sanity check for the protocol type too.\r
@@ -182,8 +181,9 @@ ArpOnFrameRcvdDpc (
     ConfigData = &Instance->ConfigData;\r
 \r
     if ((Instance->Configured) &&\r
-      (Head->ProtoType == ConfigData->SwAddressType) &&\r
-      (Head->ProtoAddrLen == ConfigData->SwAddressLength)) {\r
+        (Head->ProtoType == ConfigData->SwAddressType) &&\r
+        (Head->ProtoAddrLen == ConfigData->SwAddressLength))\r
+    {\r
       //\r
       // The protocol type is matched for the received arp packet.\r
       //\r
@@ -192,7 +192,8 @@ ArpOnFrameRcvdDpc (
                  (VOID *)ArpAddress.TargetProtoAddr,\r
                  ConfigData->StationAddress,\r
                  ConfigData->SwAddressLength\r
-                 )) {\r
+                 ))\r
+      {\r
         //\r
         // The arp driver has the target address required by the received arp packet.\r
         //\r
@@ -226,7 +227,7 @@ ArpOnFrameRcvdDpc (
     //\r
     ArpFillAddressInCacheEntry (CacheEntry, &SenderAddress[Hardware], NULL);\r
     CacheEntry->DecayTime = CacheEntry->DefaultDecayTime;\r
-    MergeFlag = TRUE;\r
+    MergeFlag             = TRUE;\r
   }\r
 \r
   if (!IsTarget) {\r
@@ -305,10 +306,15 @@ RESTART_RECEIVE:
   Status = ArpService->Mnp->Receive (ArpService->Mnp, RxToken);\r
 \r
   DEBUG_CODE_BEGIN ();\r
-    if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "ArpOnFrameRcvd: ArpService->Mnp->Receive "\r
-        "failed, %r\n.", Status));\r
-    }\r
+  if (EFI_ERROR (Status)) {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "ArpOnFrameRcvd: ArpService->Mnp->Receive "\r
+      "failed, %r\n.",\r
+      Status\r
+      ));\r
+  }\r
+\r
   DEBUG_CODE_END ();\r
 }\r
 \r
@@ -347,7 +353,7 @@ ArpOnFrameRcvd (
 VOID\r
 EFIAPI\r
 ArpOnFrameSentDpc (\r
-  IN VOID       *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
   EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *TxToken;\r
@@ -359,9 +365,10 @@ ArpOnFrameSentDpc (
   TxData  = TxToken->Packet.TxData;\r
 \r
   DEBUG_CODE_BEGIN ();\r
-    if (EFI_ERROR (TxToken->Status)) {\r
-      DEBUG ((DEBUG_ERROR, "ArpOnFrameSent: TxToken->Status, %r.\n", TxToken->Status));\r
-    }\r
+  if (EFI_ERROR (TxToken->Status)) {\r
+    DEBUG ((DEBUG_ERROR, "ArpOnFrameSent: TxToken->Status, %r.\n", TxToken->Status));\r
+  }\r
+\r
   DEBUG_CODE_END ();\r
 \r
   //\r
@@ -396,7 +403,6 @@ ArpOnFrameSent (
   QueueDpc (TPL_CALLBACK, ArpOnFrameSentDpc, Context);\r
 }\r
 \r
-\r
 /**\r
   Process the arp cache olding and drive the retrying arp requests.\r
 \r
@@ -449,7 +455,7 @@ ArpTimerHandler (
         //\r
         // resend the ARP request.\r
         //\r
-        ASSERT (!IsListEmpty(&CacheEntry->UserRequestList));\r
+        ASSERT (!IsListEmpty (&CacheEntry->UserRequestList));\r
 \r
         ContextEntry   = CacheEntry->UserRequestList.ForwardLink;\r
         RequestContext = NET_LIST_USER_STRUCT (ContextEntry, USER_REQUEST_CONTEXT, List);\r
@@ -524,7 +530,6 @@ ArpTimerHandler (
   }\r
 }\r
 \r
-\r
 /**\r
   Match the two NET_ARP_ADDRESSes.\r
 \r
@@ -543,7 +548,8 @@ ArpMatchAddress (
   ASSERT (AddressOne != NULL && AddressTwo != NULL);\r
 \r
   if ((AddressOne->Type != AddressTwo->Type) ||\r
-    (AddressOne->Length != AddressTwo->Length)) {\r
+      (AddressOne->Length != AddressTwo->Length))\r
+  {\r
     //\r
     // Either Type or Length doesn't match.\r
     //\r
@@ -551,11 +557,12 @@ ArpMatchAddress (
   }\r
 \r
   if ((AddressOne->AddressPtr != NULL) &&\r
-    (CompareMem (\r
-      AddressOne->AddressPtr,\r
-      AddressTwo->AddressPtr,\r
-      AddressOne->Length\r
-      ) != 0)) {\r
+      (CompareMem (\r
+         AddressOne->AddressPtr,\r
+         AddressTwo->AddressPtr,\r
+         AddressOne->Length\r
+         ) != 0))\r
+  {\r
     //\r
     // The address is not the same.\r
     //\r
@@ -565,7 +572,6 @@ ArpMatchAddress (
   return TRUE;\r
 }\r
 \r
-\r
 /**\r
   Find the CacheEntry which matches the requirements in the specified CacheTable.\r
 \r
@@ -581,11 +587,11 @@ ArpMatchAddress (
 **/\r
 ARP_CACHE_ENTRY *\r
 ArpFindNextCacheEntryInTable (\r
-  IN LIST_ENTRY        *CacheTable,\r
-  IN LIST_ENTRY        *StartEntry,\r
-  IN FIND_OPTYPE       FindOpType,\r
-  IN NET_ARP_ADDRESS   *ProtocolAddress OPTIONAL,\r
-  IN NET_ARP_ADDRESS   *HardwareAddress OPTIONAL\r
+  IN LIST_ENTRY       *CacheTable,\r
+  IN LIST_ENTRY       *StartEntry,\r
+  IN FIND_OPTYPE      FindOpType,\r
+  IN NET_ARP_ADDRESS  *ProtocolAddress OPTIONAL,\r
+  IN NET_ARP_ADDRESS  *HardwareAddress OPTIONAL\r
   )\r
 {\r
   LIST_ENTRY       *Entry;\r
@@ -637,7 +643,6 @@ ArpFindNextCacheEntryInTable (
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Find the CacheEntry, using ProtocolAddress or HardwareAddress or both, as the keyword,\r
   in the DeniedCacheTable.\r
@@ -698,7 +703,6 @@ ArpFindDeniedCacheEntry (
   return CacheEntry;\r
 }\r
 \r
-\r
 /**\r
   Allocate a cache entry and initialize it.\r
 \r
@@ -734,7 +738,7 @@ ArpAllocCacheEntry (
     //\r
     // Init the address pointers to point to the concrete buffer.\r
     //\r
-    Address = &CacheEntry->Addresses[Index];\r
+    Address             = &CacheEntry->Addresses[Index];\r
     Address->AddressPtr = Address->Buffer.ProtoAddress;\r
   }\r
 \r
@@ -765,7 +769,6 @@ ArpAllocCacheEntry (
   return CacheEntry;\r
 }\r
 \r
-\r
 /**\r
   Turn the CacheEntry into the resolved status.\r
 \r
@@ -797,7 +800,8 @@ ArpAddressResolved (
     Context = NET_LIST_USER_STRUCT (Entry, USER_REQUEST_CONTEXT, List);\r
 \r
     if (((Instance == NULL) || (Context->Instance == Instance)) &&\r
-      ((UserEvent == NULL) || (Context->UserRequestEvent == UserEvent))) {\r
+        ((UserEvent == NULL) || (Context->UserRequestEvent == UserEvent)))\r
+    {\r
       //\r
       // Copy the address to the user-provided buffer and notify the user.\r
       //\r
@@ -826,7 +830,6 @@ ArpAddressResolved (
   return Count;\r
 }\r
 \r
-\r
 /**\r
   Fill the addresses in the CacheEntry using the information passed in by\r
   HwAddr and SwAddr.\r
@@ -881,7 +884,6 @@ ArpFillAddressInCacheEntry (
   }\r
 }\r
 \r
-\r
 /**\r
   Configure the instance using the ConfigData. ConfigData is already validated.\r
 \r
@@ -912,18 +914,18 @@ ArpConfigureInstance (
   OldConfigData = &Instance->ConfigData;\r
 \r
   if (ConfigData != NULL) {\r
-\r
     if (Instance->Configured) {\r
       //\r
       // The instance is configured, check the unchangeable fields.\r
       //\r
       if ((OldConfigData->SwAddressType != ConfigData->SwAddressType) ||\r
-        (OldConfigData->SwAddressLength != ConfigData->SwAddressLength) ||\r
-        (CompareMem (\r
-           OldConfigData->StationAddress,\r
-           ConfigData->StationAddress,\r
-           OldConfigData->SwAddressLength\r
-           ) != 0)) {\r
+          (OldConfigData->SwAddressLength != ConfigData->SwAddressLength) ||\r
+          (CompareMem (\r
+             OldConfigData->StationAddress,\r
+             ConfigData->StationAddress,\r
+             OldConfigData->SwAddressLength\r
+             ) != 0))\r
+      {\r
         //\r
         // Deny the unallowed changes.\r
         //\r
@@ -952,8 +954,11 @@ ArpConfigureInstance (
 \r
       OldConfigData->StationAddress = AllocatePool (OldConfigData->SwAddressLength);\r
       if (OldConfigData->StationAddress == NULL) {\r
-        DEBUG ((DEBUG_ERROR, "ArpConfigInstance: AllocatePool for the StationAddress "\r
-          "failed.\n"));\r
+        DEBUG ((\r
+          DEBUG_ERROR,\r
+          "ArpConfigInstance: AllocatePool for the StationAddress "\r
+          "failed.\n"\r
+          ));\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
 \r
@@ -976,13 +981,13 @@ ArpConfigureInstance (
     // Use the implementation specific values if the following field is zero.\r
     //\r
     OldConfigData->EntryTimeOut = (ConfigData->EntryTimeOut == 0) ?\r
-      ARP_DEFAULT_TIMEOUT_VALUE : ConfigData->EntryTimeOut;\r
+                                  ARP_DEFAULT_TIMEOUT_VALUE : ConfigData->EntryTimeOut;\r
 \r
-    OldConfigData->RetryCount   = (ConfigData->RetryCount == 0) ?\r
-      ARP_DEFAULT_RETRY_COUNT : ConfigData->RetryCount;\r
+    OldConfigData->RetryCount = (ConfigData->RetryCount == 0) ?\r
+                                ARP_DEFAULT_RETRY_COUNT : ConfigData->RetryCount;\r
 \r
     OldConfigData->RetryTimeOut = (ConfigData->RetryTimeOut == 0) ?\r
-      ARP_DEFAULT_RETRY_INTERVAL : ConfigData->RetryTimeOut;\r
+                                  ARP_DEFAULT_RETRY_INTERVAL : ConfigData->RetryTimeOut;\r
   } else {\r
     //\r
     // Reset the configuration.\r
@@ -1006,7 +1011,6 @@ ArpConfigureInstance (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Send out an arp frame using the CacheEntry and the ArpOpCode.\r
 \r
@@ -1042,7 +1046,7 @@ ArpSendFrame (
   //\r
   // Allocate memory for the TxToken.\r
   //\r
-  TxToken = AllocatePool (sizeof(EFI_MANAGED_NETWORK_COMPLETION_TOKEN));\r
+  TxToken = AllocatePool (sizeof (EFI_MANAGED_NETWORK_COMPLETION_TOKEN));\r
   if (TxToken == NULL) {\r
     DEBUG ((DEBUG_ERROR, "ArpSendFrame: Allocate memory for TxToken failed.\n"));\r
     return;\r
@@ -1070,7 +1074,7 @@ ArpSendFrame (
   //\r
   // Allocate memory for the TxData used in the TxToken.\r
   //\r
-  TxData = AllocatePool (sizeof(EFI_MANAGED_NETWORK_TRANSMIT_DATA));\r
+  TxData = AllocatePool (sizeof (EFI_MANAGED_NETWORK_TRANSMIT_DATA));\r
   if (TxData == NULL) {\r
     DEBUG ((DEBUG_ERROR, "ArpSendFrame: Allocate memory for TxData failed.\n"));\r
     goto CLEAN_EXIT;\r
@@ -1109,6 +1113,7 @@ ArpSendFrame (
       SnpMode->HwAddressSize\r
       );\r
   }\r
+\r
   TmpPtr += SnpMode->HwAddressSize;\r
 \r
   //\r
@@ -1121,18 +1126,18 @@ ArpSendFrame (
   // The ethernet protocol type.\r
   //\r
   *(UINT16 *)TmpPtr = HTONS (ARP_ETHER_PROTO_TYPE);\r
-  TmpPtr            += 2;\r
+  TmpPtr           += 2;\r
 \r
   //\r
   // The ARP Head.\r
   //\r
-  ArpHead               = (ARP_HEAD *) TmpPtr;\r
+  ArpHead               = (ARP_HEAD *)TmpPtr;\r
   ArpHead->HwType       = HTONS ((UINT16)SnpMode->IfType);\r
   ArpHead->ProtoType    = HTONS (ConfigData->SwAddressType);\r
   ArpHead->HwAddrLen    = (UINT8)SnpMode->HwAddressSize;\r
   ArpHead->ProtoAddrLen = ConfigData->SwAddressLength;\r
   ArpHead->OpCode       = HTONS (ArpOpCode);\r
-  TmpPtr                += sizeof (ARP_HEAD);\r
+  TmpPtr               += sizeof (ARP_HEAD);\r
 \r
   //\r
   // The sender hardware address.\r
@@ -1172,7 +1177,7 @@ ArpSendFrame (
   TxData->SourceAddress      = NULL;\r
   TxData->ProtocolType       = 0;\r
   TxData->DataLength         = TotalLength - SnpMode->MediaHeaderSize;\r
-  TxData->HeaderLength       = (UINT16) SnpMode->MediaHeaderSize;\r
+  TxData->HeaderLength       = (UINT16)SnpMode->MediaHeaderSize;\r
   TxData->FragmentCount      = 1;\r
 \r
   TxData->FragmentTable[0].FragmentBuffer = Packet;\r
@@ -1212,7 +1217,6 @@ CLEAN_EXIT:
   FreePool (TxToken);\r
 }\r
 \r
-\r
 /**\r
   Delete the cache entries in the specified CacheTable, using the BySwAddress,\r
   SwAddressType, AddressBuffer combination as the matching key, if Force is TRUE,\r
@@ -1231,11 +1235,11 @@ CLEAN_EXIT:
 **/\r
 UINTN\r
 ArpDeleteCacheEntryInTable (\r
-  IN LIST_ENTRY      *CacheTable,\r
-  IN BOOLEAN         BySwAddress,\r
-  IN UINT16          SwAddressType,\r
-  IN UINT8           *AddressBuffer OPTIONAL,\r
-  IN BOOLEAN         Force\r
+  IN LIST_ENTRY  *CacheTable,\r
+  IN BOOLEAN     BySwAddress,\r
+  IN UINT16      SwAddressType,\r
+  IN UINT8       *AddressBuffer OPTIONAL,\r
+  IN BOOLEAN     Force\r
   )\r
 {\r
   LIST_ENTRY       *Entry;\r
@@ -1261,11 +1265,12 @@ ArpDeleteCacheEntryInTable (
         // Protocol address type matched. Check the address.\r
         //\r
         if ((AddressBuffer == NULL) ||\r
-          (CompareMem (\r
-             AddressBuffer,\r
-             CacheEntry->Addresses[Protocol].AddressPtr,\r
-             CacheEntry->Addresses[Protocol].Length\r
-             ) == 0)) {\r
+            (CompareMem (\r
+               AddressBuffer,\r
+               CacheEntry->Addresses[Protocol].AddressPtr,\r
+               CacheEntry->Addresses[Protocol].Length\r
+               ) == 0))\r
+        {\r
           //\r
           // Address matched.\r
           //\r
@@ -1274,11 +1279,12 @@ ArpDeleteCacheEntryInTable (
       }\r
     } else {\r
       if ((AddressBuffer == NULL) ||\r
-        (CompareMem (\r
-           AddressBuffer,\r
-           CacheEntry->Addresses[Hardware].AddressPtr,\r
-           CacheEntry->Addresses[Hardware].Length\r
-           ) == 0)) {\r
+          (CompareMem (\r
+             AddressBuffer,\r
+             CacheEntry->Addresses[Hardware].AddressPtr,\r
+             CacheEntry->Addresses[Hardware].Length\r
+             ) == 0))\r
+      {\r
         //\r
         // Address matched.\r
         //\r
@@ -1303,7 +1309,6 @@ MATCHED:
   return Count;\r
 }\r
 \r
-\r
 /**\r
   Delete cache entries in all the cache tables.\r
 \r
@@ -1357,7 +1362,6 @@ ArpDeleteCacheEntry (
   return Count;\r
 }\r
 \r
-\r
 /**\r
   Cancel the arp request.\r
 \r
@@ -1392,11 +1396,12 @@ ArpCancelRequest (
     CacheEntry = NET_LIST_USER_STRUCT (Entry, ARP_CACHE_ENTRY, List);\r
 \r
     if ((TargetSwAddress == NULL) ||\r
-      (CompareMem (\r
-         TargetSwAddress,\r
-         CacheEntry->Addresses[Protocol].AddressPtr,\r
-         CacheEntry->Addresses[Protocol].Length\r
-         ) == 0)) {\r
+        (CompareMem (\r
+           TargetSwAddress,\r
+           CacheEntry->Addresses[Protocol].AddressPtr,\r
+           CacheEntry->Addresses[Protocol].Length\r
+           ) == 0))\r
+    {\r
       //\r
       // This request entry matches the TargetSwAddress or all requests are to be\r
       // cancelled as TargetSwAddress is NULL.\r
@@ -1416,7 +1421,6 @@ ArpCancelRequest (
   return Count;\r
 }\r
 \r
-\r
 /**\r
   Find the cache entry in the cache table.\r
 \r
@@ -1572,7 +1576,7 @@ ArpFindCacheEntry (
 \r
   Status = EFI_SUCCESS;\r
 \r
-  FoundCount = (UINT32) NetMapGetCount (&FoundEntries);\r
+  FoundCount = (UINT32)NetMapGetCount (&FoundEntries);\r
   if (FoundCount == 0) {\r
     Status = EFI_NOT_FOUND;\r
     goto CLEAN_EXIT;\r
@@ -1582,7 +1586,7 @@ ArpFindCacheEntry (
   // Found the entry length, make sure its 8 bytes alignment.\r
   //\r
   FoundEntryLength = (((sizeof (EFI_ARP_FIND_DATA) + Instance->ConfigData.SwAddressLength +\r
-                       ArpService->SnpMode.HwAddressSize) + 3) & ~(0x3));\r
+                        ArpService->SnpMode.HwAddressSize) + 3) & ~(0x3));\r
 \r
   if (EntryLength != NULL) {\r
     *EntryLength = FoundEntryLength;\r
index 506f3e6ef61ebda73ff9fb1371eac9401954c03f..4a528af47ba80fe1b1f1e580f1be2ddd0716c5d1 100644 (file)
@@ -9,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef _ARP_IMPL_H_\r
 #define _ARP_IMPL_H_\r
 \r
-\r
 #include <Uefi.h>\r
 \r
 #include <Protocol/Arp.h>\r
@@ -29,15 +28,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // Ethernet protocol type definitions.\r
 //\r
-#define ARP_ETHER_PROTO_TYPE         0x0806\r
-#define IPV4_ETHER_PROTO_TYPE        0x0800\r
-#define IPV6_ETHER_PROTO_TYPE        0x86DD\r
+#define ARP_ETHER_PROTO_TYPE   0x0806\r
+#define IPV4_ETHER_PROTO_TYPE  0x0800\r
+#define IPV6_ETHER_PROTO_TYPE  0x86DD\r
 \r
 //\r
 // ARP opcode definitions.\r
 //\r
-#define ARP_OPCODE_REQUEST           0x0001\r
-#define ARP_OPCODE_REPLY             0x0002\r
+#define ARP_OPCODE_REQUEST  0x0001\r
+#define ARP_OPCODE_REPLY    0x0002\r
 \r
 //\r
 // ARP timeout, retry count and interval definitions.\r
@@ -52,11 +51,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 #pragma pack(1)\r
 typedef struct {\r
-  UINT16  HwType;\r
-  UINT16  ProtoType;\r
-  UINT8   HwAddrLen;\r
-  UINT8   ProtoAddrLen;\r
-  UINT16  OpCode;\r
+  UINT16    HwType;\r
+  UINT16    ProtoType;\r
+  UINT8     HwAddrLen;\r
+  UINT8     ProtoAddrLen;\r
+  UINT16    OpCode;\r
 } ARP_HEAD;\r
 #pragma pack()\r
 \r
@@ -64,10 +63,10 @@ typedef struct {
 // ARP Address definition for internal use.\r
 //\r
 typedef struct {\r
-  UINT8  *SenderHwAddr;\r
-  UINT8  *SenderProtoAddr;\r
-  UINT8  *TargetHwAddr;\r
-  UINT8  *TargetProtoAddr;\r
+  UINT8    *SenderHwAddr;\r
+  UINT8    *SenderProtoAddr;\r
+  UINT8    *TargetHwAddr;\r
+  UINT8    *TargetProtoAddr;\r
 } ARP_ADDRESS;\r
 \r
 #define MATCH_SW_ADDRESS  0x1\r
@@ -104,20 +103,20 @@ typedef enum {
   ARP_INSTANCE_DATA_SIGNATURE \\r
   )\r
 \r
-typedef struct _ARP_SERVICE_DATA  ARP_SERVICE_DATA;\r
+typedef struct _ARP_SERVICE_DATA ARP_SERVICE_DATA;\r
 \r
 //\r
 // ARP instance context data structure.\r
 //\r
 typedef struct {\r
-  UINT32               Signature;\r
-  ARP_SERVICE_DATA     *ArpService;\r
-  EFI_HANDLE           Handle;\r
-  EFI_ARP_PROTOCOL     ArpProto;\r
-  LIST_ENTRY           List;\r
-  EFI_ARP_CONFIG_DATA  ConfigData;\r
-  BOOLEAN              Configured;\r
-  BOOLEAN              InDestroy;\r
+  UINT32                 Signature;\r
+  ARP_SERVICE_DATA       *ArpService;\r
+  EFI_HANDLE             Handle;\r
+  EFI_ARP_PROTOCOL       ArpProto;\r
+  LIST_ENTRY             List;\r
+  EFI_ARP_CONFIG_DATA    ConfigData;\r
+  BOOLEAN                Configured;\r
+  BOOLEAN                InDestroy;\r
 } ARP_INSTANCE_DATA;\r
 \r
 #define ARP_SERVICE_DATA_SIGNATURE  SIGNATURE_32('A', 'R', 'P', 'S')\r
@@ -144,55 +143,55 @@ typedef struct {
 // ARP service data structure.\r
 //\r
 struct _ARP_SERVICE_DATA {\r
-  UINT32                           Signature;\r
-  EFI_SERVICE_BINDING_PROTOCOL     ServiceBinding;\r
+  UINT32                                  Signature;\r
+  EFI_SERVICE_BINDING_PROTOCOL            ServiceBinding;\r
 \r
-  EFI_HANDLE                       MnpChildHandle;\r
-  EFI_HANDLE                       ImageHandle;\r
-  EFI_HANDLE                       ControllerHandle;\r
+  EFI_HANDLE                              MnpChildHandle;\r
+  EFI_HANDLE                              ImageHandle;\r
+  EFI_HANDLE                              ControllerHandle;\r
 \r
-  EFI_MANAGED_NETWORK_PROTOCOL          *Mnp;\r
-  EFI_MANAGED_NETWORK_CONFIG_DATA       MnpConfigData;\r
-  EFI_MANAGED_NETWORK_COMPLETION_TOKEN  RxToken;\r
+  EFI_MANAGED_NETWORK_PROTOCOL            *Mnp;\r
+  EFI_MANAGED_NETWORK_CONFIG_DATA         MnpConfigData;\r
+  EFI_MANAGED_NETWORK_COMPLETION_TOKEN    RxToken;\r
 \r
-  EFI_SIMPLE_NETWORK_MODE          SnpMode;\r
+  EFI_SIMPLE_NETWORK_MODE                 SnpMode;\r
 \r
-  UINTN                            ChildrenNumber;\r
-  LIST_ENTRY                       ChildrenList;\r
+  UINTN                                   ChildrenNumber;\r
+  LIST_ENTRY                              ChildrenList;\r
 \r
-  LIST_ENTRY                       PendingRequestTable;\r
-  LIST_ENTRY                       DeniedCacheTable;\r
-  LIST_ENTRY                       ResolvedCacheTable;\r
+  LIST_ENTRY                              PendingRequestTable;\r
+  LIST_ENTRY                              DeniedCacheTable;\r
+  LIST_ENTRY                              ResolvedCacheTable;\r
 \r
-  EFI_EVENT                        PeriodicTimer;\r
+  EFI_EVENT                               PeriodicTimer;\r
 };\r
 \r
 //\r
 // User request context structure.\r
 //\r
 typedef struct {\r
-  LIST_ENTRY         List;\r
-  ARP_INSTANCE_DATA  *Instance;\r
-  EFI_EVENT          UserRequestEvent;\r
-  VOID               *UserHwAddrBuffer;\r
+  LIST_ENTRY           List;\r
+  ARP_INSTANCE_DATA    *Instance;\r
+  EFI_EVENT            UserRequestEvent;\r
+  VOID                 *UserHwAddrBuffer;\r
 } USER_REQUEST_CONTEXT;\r
 \r
 #define ARP_MAX_PROTOCOL_ADDRESS_LEN  sizeof(EFI_IP_ADDRESS)\r
 #define ARP_MAX_HARDWARE_ADDRESS_LEN  sizeof(EFI_MAC_ADDRESS)\r
 \r
 typedef union {\r
-  UINT8  ProtoAddress[ARP_MAX_PROTOCOL_ADDRESS_LEN];\r
-  UINT8  HwAddress[ARP_MAX_HARDWARE_ADDRESS_LEN];\r
+  UINT8    ProtoAddress[ARP_MAX_PROTOCOL_ADDRESS_LEN];\r
+  UINT8    HwAddress[ARP_MAX_HARDWARE_ADDRESS_LEN];\r
 } NET_ARP_ADDRESS_UNION;\r
 \r
 //\r
 // ARP address structure in an ARP packet.\r
 //\r
 typedef struct {\r
-  UINT16                Type;\r
-  UINT8                 Length;\r
-  UINT8                 *AddressPtr;\r
-  NET_ARP_ADDRESS_UNION Buffer;\r
+  UINT16                   Type;\r
+  UINT8                    Length;\r
+  UINT8                    *AddressPtr;\r
+  NET_ARP_ADDRESS_UNION    Buffer;\r
 } NET_ARP_ADDRESS;\r
 \r
 //\r
@@ -207,16 +206,16 @@ typedef enum {
 // ARP cache entry definition.\r
 //\r
 typedef struct {\r
-  LIST_ENTRY      List;\r
+  LIST_ENTRY         List;\r
 \r
-  UINT32          RetryCount;\r
-  UINT32          DefaultDecayTime;\r
-  UINT32          DecayTime;\r
-  UINT32          NextRetryTime;\r
+  UINT32             RetryCount;\r
+  UINT32             DefaultDecayTime;\r
+  UINT32             DecayTime;\r
+  UINT32             NextRetryTime;\r
 \r
-  NET_ARP_ADDRESS  Addresses[2];\r
+  NET_ARP_ADDRESS    Addresses[2];\r
 \r
-  LIST_ENTRY      UserRequestList;\r
+  LIST_ENTRY         UserRequestList;\r
 } ARP_CACHE_ENTRY;\r
 \r
 /**\r
@@ -522,11 +521,11 @@ ArpFindDeniedCacheEntry (
 **/\r
 ARP_CACHE_ENTRY *\r
 ArpFindNextCacheEntryInTable (\r
-  IN LIST_ENTRY        *CacheTable,\r
-  IN LIST_ENTRY        *StartEntry,\r
-  IN FIND_OPTYPE       FindOpType,\r
-  IN NET_ARP_ADDRESS   *ProtocolAddress OPTIONAL,\r
-  IN NET_ARP_ADDRESS   *HardwareAddress OPTIONAL\r
+  IN LIST_ENTRY       *CacheTable,\r
+  IN LIST_ENTRY       *StartEntry,\r
+  IN FIND_OPTYPE      FindOpType,\r
+  IN NET_ARP_ADDRESS  *ProtocolAddress OPTIONAL,\r
+  IN NET_ARP_ADDRESS  *HardwareAddress OPTIONAL\r
   );\r
 \r
 /**\r
@@ -645,7 +644,7 @@ ArpInitInstance (
 VOID\r
 EFIAPI\r
 ArpOnFrameRcvdDpc (\r
-  IN VOID       *Context\r
+  IN VOID  *Context\r
   );\r
 \r
 /**\r
@@ -677,7 +676,7 @@ ArpOnFrameRcvd (
 VOID\r
 EFIAPI\r
 ArpOnFrameSentDpc (\r
-  IN VOID       *Context\r
+  IN VOID  *Context\r
   );\r
 \r
 /**\r
index 1398cdda5eabecff1b64ad8b010a8496d8223add..7c5753b6f034f851043d8b05dcf55074b4653c7a 100644 (file)
@@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "ArpImpl.h"\r
 \r
-\r
 /**\r
   This function is used to assign a station address to the ARP cache for this instance\r
   of the ARP driver.\r
@@ -53,9 +52,10 @@ ArpConfigure (
   }\r
 \r
   if ((ConfigData != NULL) &&\r
-    ((ConfigData->SwAddressLength == 0) ||\r
-    (ConfigData->StationAddress == NULL) ||\r
-    (ConfigData->SwAddressType <= 1500))) {\r
+      ((ConfigData->SwAddressLength == 0) ||\r
+       (ConfigData->StationAddress == NULL) ||\r
+       (ConfigData->SwAddressType <= 1500)))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -73,7 +73,6 @@ ArpConfigure (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is used to insert entries into the ARP cache.\r
 \r
@@ -143,8 +142,9 @@ ArpAdd (
   }\r
 \r
   if (((!DenyFlag) && ((TargetHwAddress == NULL) || (TargetSwAddress == NULL))) ||\r
-    (DenyFlag && (TargetHwAddress != NULL) && (TargetSwAddress != NULL)) ||\r
-    ((TargetHwAddress == NULL) && (TargetSwAddress == NULL))) {\r
+      (DenyFlag && (TargetHwAddress != NULL) && (TargetSwAddress != NULL)) ||\r
+      ((TargetHwAddress == NULL) && (TargetSwAddress == NULL)))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -162,7 +162,7 @@ ArpAdd (
   // Fill the hardware address part in the MatchAddress.\r
   //\r
   MatchAddress[Hardware].Type       = SnpMode->IfType;\r
-  MatchAddress[Hardware].Length     = (UINT8) SnpMode->HwAddressSize;\r
+  MatchAddress[Hardware].Length     = (UINT8)SnpMode->HwAddressSize;\r
   MatchAddress[Hardware].AddressPtr = TargetHwAddress;\r
 \r
   //\r
@@ -271,7 +271,6 @@ UNLOCK_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function searches the ARP cache for matching entries and allocates a buffer into\r
   which those entries are copied.\r
@@ -323,12 +322,13 @@ ArpFind (
   EFI_TPL            OldTpl;\r
 \r
   if ((This == NULL) ||\r
-    (!Refresh && (EntryCount == NULL) && (EntryLength == NULL)) ||\r
-    ((Entries != NULL) && ((EntryLength == NULL) || (EntryCount == NULL)))) {\r
+      (!Refresh && (EntryCount == NULL) && (EntryLength == NULL)) ||\r
+      ((Entries != NULL) && ((EntryLength == NULL) || (EntryCount == NULL))))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Instance   = ARP_INSTANCE_DATA_FROM_THIS (This);\r
+  Instance = ARP_INSTANCE_DATA_FROM_THIS (This);\r
 \r
   if (!Instance->Configured) {\r
     return EFI_NOT_STARTED;\r
@@ -354,7 +354,6 @@ ArpFind (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function removes specified ARP cache entries.\r
 \r
@@ -406,7 +405,6 @@ ArpDelete (
   return (Count == 0) ? EFI_NOT_FOUND : EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function delete all dynamic entries from the ARP cache that match the specified\r
   software protocol type.\r
@@ -451,7 +449,6 @@ ArpFlush (
   return (Count == 0) ? EFI_NOT_FOUND : EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function tries to resolve the TargetSwAddress and optionally returns a\r
   TargetHwAddress if it already exists in the ARP cache.\r
@@ -508,8 +505,9 @@ ArpRequest (
   SnpMode    = &ArpService->SnpMode;\r
 \r
   if ((TargetSwAddress == NULL) ||\r
-    ((Instance->ConfigData.SwAddressType == IPV4_ETHER_PROTO_TYPE) &&\r
-    IP4_IS_LOCAL_BROADCAST (*((UINT32 *)TargetSwAddress)))) {\r
+      ((Instance->ConfigData.SwAddressType == IPV4_ETHER_PROTO_TYPE) &&\r
+       IP4_IS_LOCAL_BROADCAST (*((UINT32 *)TargetSwAddress))))\r
+  {\r
     //\r
     // Return the hardware broadcast address.\r
     //\r
@@ -519,7 +517,8 @@ ArpRequest (
   }\r
 \r
   if ((Instance->ConfigData.SwAddressType == IPV4_ETHER_PROTO_TYPE) &&\r
-    IP4_IS_MULTICAST (NTOHL (*((UINT32 *)TargetSwAddress)))) {\r
+      IP4_IS_MULTICAST (NTOHL (*((UINT32 *)TargetSwAddress))))\r
+  {\r
     //\r
     // If the software address is an IPv4 multicast address, invoke Mnp to\r
     // resolve the address.\r
@@ -588,7 +587,7 @@ ArpRequest (
   //\r
   // Create a request context for this arp request.\r
   //\r
-  RequestContext = AllocatePool (sizeof(USER_REQUEST_CONTEXT));\r
+  RequestContext = AllocatePool (sizeof (USER_REQUEST_CONTEXT));\r
   if (RequestContext == NULL) {\r
     DEBUG ((DEBUG_ERROR, "ArpRequest: Allocate memory for RequestContext failed.\n"));\r
 \r
@@ -612,7 +611,6 @@ ArpRequest (
                  NULL\r
                  );\r
   if (CacheEntry != NULL) {\r
-\r
     CacheEntry->NextRetryTime = Instance->ConfigData.RetryTimeOut;\r
     CacheEntry->RetryCount    = Instance->ConfigData.RetryCount;\r
   } else {\r
@@ -668,7 +666,6 @@ SIGNAL_USER:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function aborts the previous ARP request (identified by This,  TargetSwAddress\r
   and ResolvedEvent) that is issued by EFI_ARP_PROTOCOL.Request().\r
@@ -709,8 +706,9 @@ ArpCancel (
   EFI_TPL            OldTpl;\r
 \r
   if ((This == NULL) ||\r
-    ((TargetSwAddress != NULL) && (ResolvedEvent == NULL)) ||\r
-    ((TargetSwAddress == NULL) && (ResolvedEvent != NULL))) {\r
+      ((TargetSwAddress != NULL) && (ResolvedEvent == NULL)) ||\r
+      ((TargetSwAddress == NULL) && (ResolvedEvent != NULL)))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
index bcee1e144445299e311a4472599580aced4452f6..0f78d6fd74a2de8f064821dddf44233dc0a41ec0 100644 (file)
@@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "ArpDriver.h"\r
 \r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
@@ -21,21 +20,20 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gArpComponentName = {
 //\r
 // EFI Component Name 2 Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gArpComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) ArpComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) ArpComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gArpComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)ArpComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)ArpComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mArpDriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mArpDriverNameTable[] = {\r
   { "eng;en", L"ARP Network Service Driver" },\r
-  { NULL, NULL }\r
+  { NULL,     NULL                          }\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mArpControllerNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mArpControllerNameTable[] = {\r
   { "eng;en", L"ARP Controller" },\r
-  { NULL, NULL }\r
+  { NULL,     NULL              }\r
 };\r
 \r
 /**\r
@@ -165,15 +163,15 @@ ArpComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 ArpComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_ARP_PROTOCOL              *Arp;\r
+  EFI_STATUS        Status;\r
+  EFI_ARP_PROTOCOL  *Arp;\r
 \r
   //\r
   // Only provide names for child handles.\r
@@ -200,7 +198,7 @@ ArpComponentNameGetControllerName (
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiArpProtocolGuid,\r
-                 (VOID **)&Arp,\r
+                  (VOID **)&Arp,\r
                   NULL,\r
                   NULL,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
index 7c404fa2675624a017921454fc6f2fa8e4acfcb2..cb4156364e7dff569b4c92566a1fff4d9060e4a8 100644 (file)
@@ -5,12 +5,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #include "Dhcp4Impl.h"\r
 \r
 //\r
 // EFI Component Name Functions\r
 //\r
+\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
 \r
@@ -58,7 +58,6 @@ DhcpComponentNameGetDriverName (
   OUT CHAR16                       **DriverName\r
   );\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r
   that is being managed by a driver.\r
@@ -130,14 +129,13 @@ DhcpComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 DhcpComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   );\r
 \r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
@@ -150,14 +148,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gDhcp4ComponentName =
 //\r
 // EFI Component Name 2 Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gDhcp4ComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) DhcpComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) DhcpComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gDhcp4ComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)DhcpComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)DhcpComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mDhcpDriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mDhcpDriverNameTable[] = {\r
   {\r
     "eng;en",\r
     L"DHCP Protocol Driver"\r
@@ -168,9 +165,9 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mDhcpDriverNameTable[] =
   }\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE    *gDhcpControllerNameTable = NULL;\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  *gDhcpControllerNameTable = NULL;\r
 \r
-CHAR16 *mDhcp4ControllerName[] = {\r
+CHAR16  *mDhcp4ControllerName[] = {\r
   L"DHCPv4 (State=0, Stopped)",\r
   L"DHCPv4 (State=1, Init)",\r
   L"DHCPv4 (State=2, Selecting)",\r
@@ -251,11 +248,11 @@ DhcpComponentNameGetDriverName (
 **/\r
 EFI_STATUS\r
 UpdateName (\r
-  IN     EFI_DHCP4_PROTOCOL             *Dhcp4\r
+  IN     EFI_DHCP4_PROTOCOL  *Dhcp4\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  EFI_DHCP4_MODE_DATA              Dhcp4ModeData;\r
+  EFI_STATUS           Status;\r
+  EFI_DHCP4_MODE_DATA  Dhcp4ModeData;\r
 \r
   if (Dhcp4 == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -369,15 +366,15 @@ UpdateName (
 EFI_STATUS\r
 EFIAPI\r
 DhcpComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_DHCP4_PROTOCOL            *Dhcp4;\r
+  EFI_STATUS          Status;\r
+  EFI_DHCP4_PROTOCOL  *Dhcp4;\r
 \r
   //\r
   // Only provide names for child handles.\r
index 970141abfe3a2c00fab925174a8f860b4dbe4f1b..8c37e93be3a8f0a8f5bf21e5165402fffd4968c4 100644 (file)
@@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include "Dhcp4Impl.h"\r
 #include "Dhcp4Driver.h"\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gDhcp4DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gDhcp4DriverBinding = {\r
   Dhcp4DriverBindingSupported,\r
   Dhcp4DriverBindingStart,\r
   Dhcp4DriverBindingStop,\r
@@ -17,7 +17,7 @@ EFI_DRIVER_BINDING_PROTOCOL gDhcp4DriverBinding = {
   NULL\r
 };\r
 \r
-EFI_SERVICE_BINDING_PROTOCOL mDhcp4ServiceBindingTemplate = {\r
+EFI_SERVICE_BINDING_PROTOCOL  mDhcp4ServiceBindingTemplate = {\r
   Dhcp4ServiceBindingCreateChild,\r
   Dhcp4ServiceBindingDestroyChild\r
 };\r
@@ -39,8 +39,8 @@ EFI_SERVICE_BINDING_PROTOCOL mDhcp4ServiceBindingTemplate = {
 EFI_STATUS\r
 EFIAPI\r
 Dhcp4DriverEntryPoint (\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
   return EfiLibInstallDriverBindingComponentName2 (\r
@@ -53,7 +53,6 @@ Dhcp4DriverEntryPoint (
            );\r
 }\r
 \r
-\r
 /**\r
   Test to see if this driver supports ControllerHandle. This service\r
   is called by the EFI boot service ConnectController(). In\r
@@ -94,8 +93,6 @@ Dhcp4DriverBindingSupported (
   return Status;\r
 }\r
 \r
-\r
-\r
 /**\r
   Configure the default UDP child to receive all the DHCP traffics\r
   on this network interface.\r
@@ -110,35 +107,33 @@ Dhcp4DriverBindingSupported (
 EFI_STATUS\r
 EFIAPI\r
 DhcpConfigUdpIo (\r
-  IN UDP_IO                 *UdpIo,\r
-  IN VOID                   *Context\r
+  IN UDP_IO  *UdpIo,\r
+  IN VOID    *Context\r
   )\r
 {\r
-  EFI_UDP4_CONFIG_DATA      UdpConfigData;\r
-\r
-  UdpConfigData.AcceptBroadcast           = TRUE;\r
-  UdpConfigData.AcceptPromiscuous         = FALSE;\r
-  UdpConfigData.AcceptAnyPort             = FALSE;\r
-  UdpConfigData.AllowDuplicatePort        = TRUE;\r
-  UdpConfigData.TypeOfService             = 0;\r
-  UdpConfigData.TimeToLive                = 64;\r
-  UdpConfigData.DoNotFragment             = FALSE;\r
-  UdpConfigData.ReceiveTimeout            = 0;\r
-  UdpConfigData.TransmitTimeout           = 0;\r
-\r
-  UdpConfigData.UseDefaultAddress         = FALSE;\r
-  UdpConfigData.StationPort               = DHCP_CLIENT_PORT;\r
-  UdpConfigData.RemotePort                = DHCP_SERVER_PORT;\r
+  EFI_UDP4_CONFIG_DATA  UdpConfigData;\r
+\r
+  UdpConfigData.AcceptBroadcast    = TRUE;\r
+  UdpConfigData.AcceptPromiscuous  = FALSE;\r
+  UdpConfigData.AcceptAnyPort      = FALSE;\r
+  UdpConfigData.AllowDuplicatePort = TRUE;\r
+  UdpConfigData.TypeOfService      = 0;\r
+  UdpConfigData.TimeToLive         = 64;\r
+  UdpConfigData.DoNotFragment      = FALSE;\r
+  UdpConfigData.ReceiveTimeout     = 0;\r
+  UdpConfigData.TransmitTimeout    = 0;\r
+\r
+  UdpConfigData.UseDefaultAddress = FALSE;\r
+  UdpConfigData.StationPort       = DHCP_CLIENT_PORT;\r
+  UdpConfigData.RemotePort        = DHCP_SERVER_PORT;\r
 \r
   ZeroMem (&UdpConfigData.StationAddress, sizeof (EFI_IPv4_ADDRESS));\r
   ZeroMem (&UdpConfigData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
   ZeroMem (&UdpConfigData.RemoteAddress, sizeof (EFI_IPv4_ADDRESS));\r
 \r
-  return UdpIo->Protocol.Udp4->Configure (UdpIo->Protocol.Udp4, &UdpConfigData);;\r
+  return UdpIo->Protocol.Udp4->Configure (UdpIo->Protocol.Udp4, &UdpConfigData);\r
 }\r
 \r
-\r
-\r
 /**\r
   Destroy the DHCP service. The Dhcp4 service may be partly initialized,\r
   or partly destroyed. If a resource is destroyed, it is marked as so in\r
@@ -151,7 +146,7 @@ DhcpConfigUdpIo (
 **/\r
 EFI_STATUS\r
 Dhcp4CloseService (\r
-  IN DHCP_SERVICE           *DhcpSb\r
+  IN DHCP_SERVICE  *DhcpSb\r
   )\r
 {\r
   DhcpCleanLease (DhcpSb);\r
@@ -171,8 +166,6 @@ Dhcp4CloseService (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
-\r
 /**\r
   Create a new DHCP service binding instance for the controller.\r
 \r
@@ -189,28 +182,28 @@ Dhcp4CloseService (
 **/\r
 EFI_STATUS\r
 Dhcp4CreateService (\r
-  IN  EFI_HANDLE            Controller,\r
-  IN  EFI_HANDLE            ImageHandle,\r
-  OUT DHCP_SERVICE          **Service\r
+  IN  EFI_HANDLE    Controller,\r
+  IN  EFI_HANDLE    ImageHandle,\r
+  OUT DHCP_SERVICE  **Service\r
   )\r
 {\r
-  DHCP_SERVICE              *DhcpSb;\r
-  EFI_STATUS                Status;\r
+  DHCP_SERVICE  *DhcpSb;\r
+  EFI_STATUS    Status;\r
 \r
-  *Service  = NULL;\r
-  DhcpSb    = AllocateZeroPool (sizeof (DHCP_SERVICE));\r
+  *Service = NULL;\r
+  DhcpSb   = AllocateZeroPool (sizeof (DHCP_SERVICE));\r
 \r
   if (DhcpSb == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  DhcpSb->Signature       = DHCP_SERVICE_SIGNATURE;\r
-  DhcpSb->ServiceState    = DHCP_UNCONFIGED;\r
-  DhcpSb->Controller      = Controller;\r
-  DhcpSb->Image           = ImageHandle;\r
+  DhcpSb->Signature    = DHCP_SERVICE_SIGNATURE;\r
+  DhcpSb->ServiceState = DHCP_UNCONFIGED;\r
+  DhcpSb->Controller   = Controller;\r
+  DhcpSb->Image        = ImageHandle;\r
   InitializeListHead (&DhcpSb->Children);\r
-  DhcpSb->DhcpState       = Dhcp4Stopped;\r
-  DhcpSb->Xid             = NET_RANDOM (NetRandomInitSeed ());\r
+  DhcpSb->DhcpState = Dhcp4Stopped;\r
+  DhcpSb->Xid       = NET_RANDOM (NetRandomInitSeed ());\r
   CopyMem (\r
     &DhcpSb->ServiceBinding,\r
     &mDhcp4ServiceBindingTemplate,\r
@@ -244,11 +237,11 @@ Dhcp4CreateService (
     goto ON_ERROR;\r
   }\r
 \r
-  DhcpSb->HwLen  = (UINT8) DhcpSb->UdpIo->SnpMode.HwAddressSize;\r
+  DhcpSb->HwLen  = (UINT8)DhcpSb->UdpIo->SnpMode.HwAddressSize;\r
   DhcpSb->HwType = DhcpSb->UdpIo->SnpMode.IfType;\r
   CopyMem (&DhcpSb->Mac, &DhcpSb->UdpIo->SnpMode.CurrentAddress, sizeof (DhcpSb->Mac));\r
 \r
-  *Service       = DhcpSb;\r
+  *Service = DhcpSb;\r
   return EFI_SUCCESS;\r
 \r
 ON_ERROR:\r
@@ -258,7 +251,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Start this driver on ControllerHandle. This service is called by the\r
   EFI boot service ConnectController(). In order to make\r
@@ -285,8 +277,8 @@ Dhcp4DriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  DHCP_SERVICE              *DhcpSb;\r
-  EFI_STATUS                Status;\r
+  DHCP_SERVICE  *DhcpSb;\r
+  EFI_STATUS    Status;\r
 \r
   //\r
   // First: test for the DHCP4 Protocol\r
@@ -309,6 +301,7 @@ Dhcp4DriverBindingStart (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   ASSERT (DhcpSb != NULL);\r
 \r
   //\r
@@ -319,6 +312,7 @@ Dhcp4DriverBindingStart (
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
   }\r
+\r
   Status = gBS->SetTimer (DhcpSb->Timer, TimerPeriodic, TICKS_PER_SECOND);\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -360,24 +354,23 @@ ON_ERROR:
 EFI_STATUS\r
 EFIAPI\r
 Dhcp4DestroyChildEntry (\r
-  IN LIST_ENTRY         *Entry,\r
-  IN VOID               *Context\r
+  IN LIST_ENTRY  *Entry,\r
+  IN VOID        *Context\r
   )\r
 {\r
-  DHCP_PROTOCOL                    *Instance;\r
-  EFI_SERVICE_BINDING_PROTOCOL     *ServiceBinding;\r
+  DHCP_PROTOCOL                 *Instance;\r
+  EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
 \r
-  if (Entry == NULL || Context == NULL) {\r
+  if ((Entry == NULL) || (Context == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Instance = NET_LIST_USER_STRUCT_S (Entry, DHCP_PROTOCOL, Link, DHCP_PROTOCOL_SIGNATURE);\r
-  ServiceBinding = (EFI_SERVICE_BINDING_PROTOCOL *) Context;\r
+  Instance       = NET_LIST_USER_STRUCT_S (Entry, DHCP_PROTOCOL, Link, DHCP_PROTOCOL_SIGNATURE);\r
+  ServiceBinding = (EFI_SERVICE_BINDING_PROTOCOL *)Context;\r
 \r
   return ServiceBinding->DestroyChild (ServiceBinding, Instance->Handle);\r
 }\r
 \r
-\r
 /**\r
   Stop this driver on ControllerHandle. This service is called by the\r
   EFI boot service DisconnectController(). In order to\r
@@ -422,10 +415,10 @@ Dhcp4DriverBindingStop (
     return EFI_SUCCESS;\r
   }\r
 \r
-   Status = gBS->OpenProtocol (\r
+  Status = gBS->OpenProtocol (\r
                   NicHandle,\r
                   &gEfiDhcp4ServiceBindingProtocolGuid,\r
-                  (VOID **) &ServiceBinding,\r
+                  (VOID **)&ServiceBinding,\r
                   This->DriverBindingHandle,\r
                   NicHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -440,23 +433,23 @@ Dhcp4DriverBindingStop (
     //\r
     // Destroy all the children instances before destroy the service.\r
     //\r
-    List = &DhcpSb->Children;\r
+    List   = &DhcpSb->Children;\r
     Status = NetDestroyLinkList (\r
                List,\r
                Dhcp4DestroyChildEntry,\r
                ServiceBinding,\r
                &ListLength\r
                );\r
-    if (EFI_ERROR (Status) || ListLength != 0) {\r
+    if (EFI_ERROR (Status) || (ListLength != 0)) {\r
       Status = EFI_DEVICE_ERROR;\r
     }\r
   }\r
 \r
-  if (NumberOfChildren == 0 && !IsListEmpty (&DhcpSb->Children)) {\r
+  if ((NumberOfChildren == 0) && !IsListEmpty (&DhcpSb->Children)) {\r
     Status = EFI_DEVICE_ERROR;\r
   }\r
 \r
-  if (NumberOfChildren == 0 && IsListEmpty (&DhcpSb->Children)) {\r
+  if ((NumberOfChildren == 0) && IsListEmpty (&DhcpSb->Children)) {\r
     //\r
     // Destroy the service itself if no child instance left.\r
     //\r
@@ -474,6 +467,7 @@ Dhcp4DriverBindingStop (
       FreeUnicodeStringTable (gDhcpControllerNameTable);\r
       gDhcpControllerNameTable = NULL;\r
     }\r
+\r
     FreePool (DhcpSb);\r
 \r
     Status = EFI_SUCCESS;\r
@@ -482,7 +476,6 @@ Dhcp4DriverBindingStop (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Initialize a new DHCP instance.\r
 \r
@@ -492,25 +485,24 @@ Dhcp4DriverBindingStop (
 **/\r
 VOID\r
 DhcpInitProtocol (\r
-  IN     DHCP_SERVICE           *DhcpSb,\r
-  IN OUT DHCP_PROTOCOL          *Instance\r
+  IN     DHCP_SERVICE   *DhcpSb,\r
+  IN OUT DHCP_PROTOCOL  *Instance\r
   )\r
 {\r
-  Instance->Signature         = DHCP_PROTOCOL_SIGNATURE;\r
+  Instance->Signature = DHCP_PROTOCOL_SIGNATURE;\r
   CopyMem (&Instance->Dhcp4Protocol, &mDhcp4ProtocolTemplate, sizeof (Instance->Dhcp4Protocol));\r
   InitializeListHead (&Instance->Link);\r
-  Instance->Handle            = NULL;\r
-  Instance->Service           = DhcpSb;\r
-  Instance->InDestroy         = FALSE;\r
-  Instance->CompletionEvent   = NULL;\r
-  Instance->RenewRebindEvent  = NULL;\r
-  Instance->Token             = NULL;\r
-  Instance->UdpIo             = NULL;\r
-  Instance->ElaspedTime       = 0;\r
+  Instance->Handle           = NULL;\r
+  Instance->Service          = DhcpSb;\r
+  Instance->InDestroy        = FALSE;\r
+  Instance->CompletionEvent  = NULL;\r
+  Instance->RenewRebindEvent = NULL;\r
+  Instance->Token            = NULL;\r
+  Instance->UdpIo            = NULL;\r
+  Instance->ElaspedTime      = 0;\r
   NetbufQueInit (&Instance->ResponseQueue);\r
 }\r
 \r
-\r
 /**\r
   Creates a child handle and installs a protocol.\r
 \r
@@ -537,11 +529,11 @@ Dhcp4ServiceBindingCreateChild (
   IN EFI_HANDLE                    *ChildHandle\r
   )\r
 {\r
-  DHCP_SERVICE              *DhcpSb;\r
-  DHCP_PROTOCOL             *Instance;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
-  VOID                      *Udp4;\r
+  DHCP_SERVICE   *DhcpSb;\r
+  DHCP_PROTOCOL  *Instance;\r
+  EFI_STATUS     Status;\r
+  EFI_TPL        OldTpl;\r
+  VOID           *Udp4;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -571,7 +563,7 @@ Dhcp4ServiceBindingCreateChild (
     return Status;\r
   }\r
 \r
-  Instance->Handle  = *ChildHandle;\r
+  Instance->Handle = *ChildHandle;\r
 \r
   //\r
   // Open the Udp4 protocol BY_CHILD.\r
@@ -579,7 +571,7 @@ Dhcp4ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   DhcpSb->UdpIo->UdpHandle,\r
                   &gEfiUdp4ProtocolGuid,\r
-                  (VOID **) &Udp4,\r
+                  (VOID **)&Udp4,\r
                   gDhcp4DriverBinding.DriverBindingHandle,\r
                   Instance->Handle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -606,7 +598,6 @@ Dhcp4ServiceBindingCreateChild (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Destroys a child handle with a protocol installed on it.\r
 \r
@@ -632,11 +623,11 @@ Dhcp4ServiceBindingDestroyChild (
   IN EFI_HANDLE                    ChildHandle\r
   )\r
 {\r
-  DHCP_SERVICE              *DhcpSb;\r
-  DHCP_PROTOCOL             *Instance;\r
-  EFI_DHCP4_PROTOCOL        *Dhcp;\r
-  EFI_TPL                   OldTpl;\r
-  EFI_STATUS                Status;\r
+  DHCP_SERVICE        *DhcpSb;\r
+  DHCP_PROTOCOL       *Instance;\r
+  EFI_DHCP4_PROTOCOL  *Dhcp;\r
+  EFI_TPL             OldTpl;\r
+  EFI_STATUS          Status;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -648,7 +639,7 @@ Dhcp4ServiceBindingDestroyChild (
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiDhcp4ProtocolGuid,\r
-                  (VOID **) &Dhcp,\r
+                  (VOID **)&Dhcp,\r
                   gDhcp4DriverBinding.DriverBindingHandle,\r
                   ChildHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -658,8 +649,8 @@ Dhcp4ServiceBindingDestroyChild (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  Instance  = DHCP_INSTANCE_FROM_THIS (Dhcp);\r
-  DhcpSb    = DHCP_SERVICE_FROM_THIS (This);\r
+  Instance = DHCP_INSTANCE_FROM_THIS (Dhcp);\r
+  DhcpSb   = DHCP_SERVICE_FROM_THIS (This);\r
 \r
   if (Instance->Service != DhcpSb) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -675,7 +666,7 @@ Dhcp4ServiceBindingDestroyChild (
     return EFI_SUCCESS;\r
   }\r
 \r
-  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl              = gBS->RaiseTPL (TPL_CALLBACK);\r
   Instance->InDestroy = TRUE;\r
 \r
   //\r
index f6370582cbd15363448f25790bcea95b8cff7a0d..7c32ef9c1e1acbc7123820d0e7f0dc6f946a25cb 100644 (file)
@@ -9,9 +9,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef __EFI_DHCP4_DRIVER_H__\r
 #define __EFI_DHCP4_DRIVER_H__\r
 \r
-extern EFI_COMPONENT_NAME_PROTOCOL  gDhcp4ComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL gDhcp4ComponentName2;\r
-extern EFI_UNICODE_STRING_TABLE     *gDhcpControllerNameTable;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gDhcp4ComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gDhcp4ComponentName2;\r
+extern EFI_UNICODE_STRING_TABLE      *gDhcpControllerNameTable;\r
 \r
 /**\r
   Test to see if this driver supports ControllerHandle. This service\r
index 82905337908d298c1bbe1fedb2c0261f1183b82d..24a069394298866bcf568dcaaa698fba1f463524 100644 (file)
@@ -6,7 +6,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #include "Dhcp4Impl.h"\r
 \r
 /**\r
@@ -25,8 +24,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp4GetModeData (\r
-  IN  EFI_DHCP4_PROTOCOL    *This,\r
-  OUT EFI_DHCP4_MODE_DATA   *Dhcp4ModeData\r
+  IN  EFI_DHCP4_PROTOCOL   *This,\r
+  OUT EFI_DHCP4_MODE_DATA  *Dhcp4ModeData\r
   );\r
 \r
 /**\r
@@ -121,8 +120,8 @@ EfiDhcp4Configure (
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp4Start (\r
-  IN EFI_DHCP4_PROTOCOL     *This,\r
-  IN EFI_EVENT              CompletionEvent   OPTIONAL\r
+  IN EFI_DHCP4_PROTOCOL  *This,\r
+  IN EFI_EVENT           CompletionEvent   OPTIONAL\r
   );\r
 \r
 /**\r
@@ -166,9 +165,9 @@ EfiDhcp4Start (
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp4RenewRebind (\r
-  IN EFI_DHCP4_PROTOCOL     *This,\r
-  IN BOOLEAN                RebindRequest,\r
-  IN EFI_EVENT              CompletionEvent   OPTIONAL\r
+  IN EFI_DHCP4_PROTOCOL  *This,\r
+  IN BOOLEAN             RebindRequest,\r
+  IN EFI_EVENT           CompletionEvent   OPTIONAL\r
   );\r
 \r
 /**\r
@@ -195,7 +194,7 @@ EfiDhcp4RenewRebind (
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp4Release (\r
-  IN EFI_DHCP4_PROTOCOL     *This\r
+  IN EFI_DHCP4_PROTOCOL  *This\r
   );\r
 \r
 /**\r
@@ -216,7 +215,7 @@ EfiDhcp4Release (
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp4Stop (\r
-  IN EFI_DHCP4_PROTOCOL     *This\r
+  IN EFI_DHCP4_PROTOCOL  *This\r
   );\r
 \r
 /**\r
@@ -314,10 +313,10 @@ EfiDhcp4TransmitReceive (
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp4Parse (\r
-  IN EFI_DHCP4_PROTOCOL       *This,\r
-  IN EFI_DHCP4_PACKET         *Packet,\r
-  IN OUT UINT32               *OptionCount,\r
-  OUT EFI_DHCP4_PACKET_OPTION *PacketOptionList[] OPTIONAL\r
+  IN EFI_DHCP4_PROTOCOL        *This,\r
+  IN EFI_DHCP4_PACKET          *Packet,\r
+  IN OUT UINT32                *OptionCount,\r
+  OUT EFI_DHCP4_PACKET_OPTION  *PacketOptionList[] OPTIONAL\r
   );\r
 \r
 EFI_DHCP4_PROTOCOL  mDhcp4ProtocolTemplate = {\r
@@ -348,15 +347,15 @@ EFI_DHCP4_PROTOCOL  mDhcp4ProtocolTemplate = {
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp4GetModeData (\r
-  IN  EFI_DHCP4_PROTOCOL    *This,\r
-  OUT EFI_DHCP4_MODE_DATA   *Dhcp4ModeData\r
+  IN  EFI_DHCP4_PROTOCOL   *This,\r
+  OUT EFI_DHCP4_MODE_DATA  *Dhcp4ModeData\r
   )\r
 {\r
-  DHCP_PROTOCOL             *Instance;\r
-  DHCP_SERVICE              *DhcpSb;\r
-  DHCP_PARAMETER            *Para;\r
-  EFI_TPL                   OldTpl;\r
-  IP4_ADDR                  Ip;\r
+  DHCP_PROTOCOL   *Instance;\r
+  DHCP_SERVICE    *DhcpSb;\r
+  DHCP_PARAMETER  *Para;\r
+  EFI_TPL         OldTpl;\r
+  IP4_ADDR        Ip;\r
 \r
   //\r
   // First validate the parameters.\r
@@ -367,14 +366,14 @@ EfiDhcp4GetModeData (
 \r
   Instance = DHCP_INSTANCE_FROM_THIS (This);\r
 \r
-  OldTpl  = gBS->RaiseTPL (TPL_CALLBACK);\r
-  DhcpSb  = Instance->Service;\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
+  DhcpSb = Instance->Service;\r
 \r
   //\r
   // Caller can use GetModeData to retrieve current DHCP states\r
   // no matter whether it is the active child or not.\r
   //\r
-  Dhcp4ModeData->State = (EFI_DHCP4_STATE) DhcpSb->DhcpState;\r
+  Dhcp4ModeData->State = (EFI_DHCP4_STATE)DhcpSb->DhcpState;\r
   CopyMem (&Dhcp4ModeData->ConfigData, &DhcpSb->ActiveConfig, sizeof (Dhcp4ModeData->ConfigData));\r
   CopyMem (&Dhcp4ModeData->ClientMacAddress, &DhcpSb->Mac, sizeof (Dhcp4ModeData->ClientMacAddress));\r
 \r
@@ -404,7 +403,6 @@ EfiDhcp4GetModeData (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Free the resource related to the configure parameters.\r
   DHCP driver will make a copy of the user's configure\r
@@ -418,7 +416,7 @@ DhcpCleanConfigure (
   IN OUT EFI_DHCP4_CONFIG_DATA  *Config\r
   )\r
 {\r
-  UINT32                    Index;\r
+  UINT32  Index;\r
 \r
   if (Config->DiscoverTimeout != NULL) {\r
     FreePool (Config->DiscoverTimeout);\r
@@ -441,7 +439,6 @@ DhcpCleanConfigure (
   ZeroMem (Config, sizeof (EFI_DHCP4_CONFIG_DATA));\r
 }\r
 \r
-\r
 /**\r
   Allocate memory for configure parameter such as timeout value for Dst,\r
   then copy the configure parameter from Src to Dst.\r
@@ -459,22 +456,22 @@ DhcpCopyConfigure (
   IN  EFI_DHCP4_CONFIG_DATA  *Src\r
   )\r
 {\r
-  EFI_DHCP4_PACKET_OPTION   **DstOptions;\r
-  EFI_DHCP4_PACKET_OPTION   **SrcOptions;\r
-  UINTN                     Len;\r
-  UINT32                    Index;\r
+  EFI_DHCP4_PACKET_OPTION  **DstOptions;\r
+  EFI_DHCP4_PACKET_OPTION  **SrcOptions;\r
+  UINTN                    Len;\r
+  UINT32                   Index;\r
 \r
   CopyMem (Dst, Src, sizeof (*Dst));\r
-  Dst->DiscoverTimeout  = NULL;\r
-  Dst->RequestTimeout   = NULL;\r
-  Dst->OptionList       = NULL;\r
+  Dst->DiscoverTimeout = NULL;\r
+  Dst->RequestTimeout  = NULL;\r
+  Dst->OptionList      = NULL;\r
 \r
   //\r
   // Allocate a memory then copy DiscoverTimeout to it\r
   //\r
   if (Src->DiscoverTimeout != NULL) {\r
-    Len                   = Src->DiscoverTryCount * sizeof (UINT32);\r
-    Dst->DiscoverTimeout  = AllocatePool (Len);\r
+    Len                  = Src->DiscoverTryCount * sizeof (UINT32);\r
+    Dst->DiscoverTimeout = AllocatePool (Len);\r
 \r
     if (Dst->DiscoverTimeout == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
@@ -513,8 +510,8 @@ DhcpCopyConfigure (
       goto ON_ERROR;\r
     }\r
 \r
-    DstOptions  = Dst->OptionList;\r
-    SrcOptions  = Src->OptionList;\r
+    DstOptions = Dst->OptionList;\r
+    SrcOptions = Src->OptionList;\r
 \r
     for (Index = 0; Index < Src->OptionCount; Index++) {\r
       Len = sizeof (EFI_DHCP4_PACKET_OPTION) + MAX (SrcOptions[Index]->Length - 1, 0);\r
@@ -536,7 +533,6 @@ ON_ERROR:
   return EFI_OUT_OF_RESOURCES;\r
 }\r
 \r
-\r
 /**\r
   Give up the control of the DHCP service to let other child\r
   resume. Don't change the service's DHCP state and the Client\r
@@ -547,21 +543,21 @@ ON_ERROR:
 **/\r
 VOID\r
 DhcpYieldControl (\r
-  IN DHCP_SERVICE           *DhcpSb\r
+  IN DHCP_SERVICE  *DhcpSb\r
   )\r
 {\r
-  EFI_DHCP4_CONFIG_DATA     *Config;\r
+  EFI_DHCP4_CONFIG_DATA  *Config;\r
 \r
-  Config    = &DhcpSb->ActiveConfig;\r
+  Config = &DhcpSb->ActiveConfig;\r
 \r
-  DhcpSb->ServiceState  = DHCP_UNCONFIGED;\r
-  DhcpSb->ActiveChild   = NULL;\r
+  DhcpSb->ServiceState = DHCP_UNCONFIGED;\r
+  DhcpSb->ActiveChild  = NULL;\r
 \r
   if (Config->DiscoverTimeout != NULL) {\r
     FreePool (Config->DiscoverTimeout);\r
 \r
-    Config->DiscoverTryCount  = 0;\r
-    Config->DiscoverTimeout   = NULL;\r
+    Config->DiscoverTryCount = 0;\r
+    Config->DiscoverTimeout  = NULL;\r
   }\r
 \r
   if (Config->RequestTimeout != NULL) {\r
@@ -575,7 +571,6 @@ DhcpYieldControl (
   Config->CallbackContext = NULL;\r
 }\r
 \r
-\r
 /**\r
   Initializes, changes, or resets the operational settings for the EFI DHCPv4 Protocol driver.\r
 \r
@@ -625,13 +620,13 @@ EfiDhcp4Configure (
   IN EFI_DHCP4_CONFIG_DATA  *Dhcp4CfgData       OPTIONAL\r
   )\r
 {\r
-  EFI_DHCP4_CONFIG_DATA     *Config;\r
-  DHCP_PROTOCOL             *Instance;\r
-  DHCP_SERVICE              *DhcpSb;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
-  UINT32                    Index;\r
-  IP4_ADDR                  Ip;\r
+  EFI_DHCP4_CONFIG_DATA  *Config;\r
+  DHCP_PROTOCOL          *Instance;\r
+  DHCP_SERVICE           *DhcpSb;\r
+  EFI_STATUS             Status;\r
+  EFI_TPL                OldTpl;\r
+  UINT32                 Index;\r
+  IP4_ADDR               Ip;\r
 \r
   //\r
   // First validate the parameters\r
@@ -654,7 +649,7 @@ EfiDhcp4Configure (
     }\r
 \r
     CopyMem (&Ip, &Dhcp4CfgData->ClientAddress, sizeof (IP4_ADDR));\r
-    if (IP4_IS_LOCAL_BROADCAST(NTOHL (Ip))) {\r
+    if (IP4_IS_LOCAL_BROADCAST (NTOHL (Ip))) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
@@ -665,18 +660,18 @@ EfiDhcp4Configure (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  OldTpl  = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
-  DhcpSb  = Instance->Service;\r
-  Config  = &DhcpSb->ActiveConfig;\r
+  DhcpSb = Instance->Service;\r
+  Config = &DhcpSb->ActiveConfig;\r
 \r
-  Status  = EFI_ACCESS_DENIED;\r
+  Status = EFI_ACCESS_DENIED;\r
 \r
   if ((DhcpSb->DhcpState != Dhcp4Stopped) &&\r
       (DhcpSb->DhcpState != Dhcp4Init) &&\r
       (DhcpSb->DhcpState != Dhcp4InitReboot) &&\r
-      (DhcpSb->DhcpState != Dhcp4Bound)) {\r
-\r
+      (DhcpSb->DhcpState != Dhcp4Bound))\r
+  {\r
     goto ON_EXIT;\r
   }\r
 \r
@@ -710,9 +705,8 @@ EfiDhcp4Configure (
       }\r
     }\r
 \r
-    DhcpSb->ServiceState  = DHCP_CONFIGED;\r
-    Status                = EFI_SUCCESS;\r
-\r
+    DhcpSb->ServiceState = DHCP_CONFIGED;\r
+    Status               = EFI_SUCCESS;\r
   } else if (DhcpSb->ActiveChild == Instance) {\r
     Status = EFI_SUCCESS;\r
     DhcpYieldControl (DhcpSb);\r
@@ -723,7 +717,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Starts the DHCP configuration process.\r
 \r
@@ -768,15 +761,15 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp4Start (\r
-  IN EFI_DHCP4_PROTOCOL     *This,\r
-  IN EFI_EVENT              CompletionEvent   OPTIONAL\r
+  IN EFI_DHCP4_PROTOCOL  *This,\r
+  IN EFI_EVENT           CompletionEvent   OPTIONAL\r
   )\r
 {\r
-  DHCP_PROTOCOL             *Instance;\r
-  DHCP_SERVICE              *DhcpSb;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
-  EFI_STATUS                MediaStatus;\r
+  DHCP_PROTOCOL  *Instance;\r
+  DHCP_SERVICE   *DhcpSb;\r
+  EFI_STATUS     Status;\r
+  EFI_TPL        OldTpl;\r
+  EFI_STATUS     MediaStatus;\r
 \r
   //\r
   // First validate the parameters\r
@@ -791,8 +784,8 @@ EfiDhcp4Start (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  OldTpl  = gBS->RaiseTPL (TPL_CALLBACK);\r
-  DhcpSb  = Instance->Service;\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
+  DhcpSb = Instance->Service;\r
 \r
   if (DhcpSb->DhcpState == Dhcp4Stopped) {\r
     Status = EFI_NOT_STARTED;\r
@@ -820,7 +813,6 @@ EfiDhcp4Start (
     goto ON_ERROR;\r
   }\r
 \r
-\r
   Instance->CompletionEvent = CompletionEvent;\r
 \r
   //\r
@@ -843,7 +835,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Extends the lease time by sending a request packet.\r
 \r
@@ -885,15 +876,15 @@ ON_ERROR:
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp4RenewRebind (\r
-  IN EFI_DHCP4_PROTOCOL     *This,\r
-  IN BOOLEAN                RebindRequest,\r
-  IN EFI_EVENT              CompletionEvent   OPTIONAL\r
+  IN EFI_DHCP4_PROTOCOL  *This,\r
+  IN BOOLEAN             RebindRequest,\r
+  IN EFI_EVENT           CompletionEvent   OPTIONAL\r
   )\r
 {\r
-  DHCP_PROTOCOL             *Instance;\r
-  DHCP_SERVICE              *DhcpSb;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
+  DHCP_PROTOCOL  *Instance;\r
+  DHCP_SERVICE   *DhcpSb;\r
+  EFI_STATUS     Status;\r
+  EFI_TPL        OldTpl;\r
 \r
   //\r
   // First validate the parameters\r
@@ -908,8 +899,8 @@ EfiDhcp4RenewRebind (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  OldTpl  = gBS->RaiseTPL (TPL_CALLBACK);\r
-  DhcpSb  = Instance->Service;\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
+  DhcpSb = Instance->Service;\r
 \r
   if (DhcpSb->DhcpState == Dhcp4Stopped) {\r
     Status = EFI_NOT_STARTED;\r
@@ -946,7 +937,7 @@ EfiDhcp4RenewRebind (
              DhcpSb->Selected,\r
              DhcpSb->Para,\r
              DHCP_MSG_REQUEST,\r
-             (UINT8 *) "Extra renew/rebind by the application"\r
+             (UINT8 *)"Extra renew/rebind by the application"\r
              );\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -954,16 +945,15 @@ EfiDhcp4RenewRebind (
     goto ON_EXIT;\r
   }\r
 \r
-  DhcpSb->ExtraRefresh        = TRUE;\r
-  DhcpSb->IoStatus            = EFI_ALREADY_STARTED;\r
-  Instance->RenewRebindEvent  = CompletionEvent;\r
+  DhcpSb->ExtraRefresh       = TRUE;\r
+  DhcpSb->IoStatus           = EFI_ALREADY_STARTED;\r
+  Instance->RenewRebindEvent = CompletionEvent;\r
 \r
   gBS->RestoreTPL (OldTpl);\r
 \r
   if (CompletionEvent == NULL) {\r
     while (DhcpSb->IoStatus == EFI_ALREADY_STARTED) {\r
       DhcpSb->UdpIo->Protocol.Udp4->Poll (DhcpSb->UdpIo->Protocol.Udp4);\r
-\r
     }\r
 \r
     return DhcpSb->IoStatus;\r
@@ -976,7 +966,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Releases the current address configuration.\r
 \r
@@ -1001,13 +990,13 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp4Release (\r
-  IN EFI_DHCP4_PROTOCOL     *This\r
+  IN EFI_DHCP4_PROTOCOL  *This\r
   )\r
 {\r
-  DHCP_PROTOCOL             *Instance;\r
-  DHCP_SERVICE              *DhcpSb;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
+  DHCP_PROTOCOL  *Instance;\r
+  DHCP_SERVICE   *DhcpSb;\r
+  EFI_STATUS     Status;\r
+  EFI_TPL        OldTpl;\r
 \r
   //\r
   // First validate the parameters\r
@@ -1022,9 +1011,9 @@ EfiDhcp4Release (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Status  = EFI_SUCCESS;\r
-  OldTpl  = gBS->RaiseTPL (TPL_CALLBACK);\r
-  DhcpSb  = Instance->Service;\r
+  Status = EFI_SUCCESS;\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
+  DhcpSb = Instance->Service;\r
 \r
   if ((DhcpSb->DhcpState != Dhcp4InitReboot) && (DhcpSb->DhcpState != Dhcp4Bound)) {\r
     Status = EFI_ACCESS_DENIED;\r
@@ -1053,7 +1042,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Stops the current address configuration.\r
 \r
@@ -1072,12 +1060,12 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp4Stop (\r
-  IN EFI_DHCP4_PROTOCOL     *This\r
+  IN EFI_DHCP4_PROTOCOL  *This\r
   )\r
 {\r
-  DHCP_PROTOCOL             *Instance;\r
-  DHCP_SERVICE              *DhcpSb;\r
-  EFI_TPL                   OldTpl;\r
+  DHCP_PROTOCOL  *Instance;\r
+  DHCP_SERVICE   *DhcpSb;\r
+  EFI_TPL        OldTpl;\r
 \r
   //\r
   // First validate the parameters\r
@@ -1092,19 +1080,18 @@ EfiDhcp4Stop (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  OldTpl  = gBS->RaiseTPL (TPL_CALLBACK);\r
-  DhcpSb  = Instance->Service;\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
+  DhcpSb = Instance->Service;\r
 \r
   DhcpCleanLease (DhcpSb);\r
 \r
-  DhcpSb->DhcpState     = Dhcp4Stopped;\r
-  DhcpSb->ServiceState  = DHCP_UNCONFIGED;\r
+  DhcpSb->DhcpState    = Dhcp4Stopped;\r
+  DhcpSb->ServiceState = DHCP_UNCONFIGED;\r
 \r
   gBS->RestoreTPL (OldTpl);\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Builds a DHCP packet, given the options to be appended or deleted or replaced.\r
 \r
@@ -1152,15 +1139,15 @@ EfiDhcp4Build (
   }\r
 \r
   if ((SeedPacket == NULL) || (SeedPacket->Dhcp4.Magik != DHCP_OPTION_MAGIC) ||\r
-      EFI_ERROR (DhcpValidateOptions (SeedPacket, NULL))) {\r
-\r
+      EFI_ERROR (DhcpValidateOptions (SeedPacket, NULL)))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   if (((DeleteCount == 0) && (AppendCount == 0)) ||\r
       ((DeleteCount != 0) && (DeleteList == NULL)) ||\r
-      ((AppendCount != 0) && (AppendList == NULL))) {\r
-\r
+      ((AppendCount != 0) && (AppendList == NULL)))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1188,8 +1175,8 @@ EfiDhcp4Build (
 EFI_STATUS\r
 EFIAPI\r
 Dhcp4InstanceConfigUdpIo (\r
-  IN UDP_IO       *UdpIo,\r
-  IN VOID         *Context\r
+  IN UDP_IO  *UdpIo,\r
+  IN VOID    *Context\r
   )\r
 {\r
   DHCP_PROTOCOL                     *Instance;\r
@@ -1201,7 +1188,7 @@ Dhcp4InstanceConfigUdpIo (
   INTN                              Class;\r
   IP4_ADDR                          SubnetMask;\r
 \r
-  Instance = (DHCP_PROTOCOL *) Context;\r
+  Instance = (DHCP_PROTOCOL *)Context;\r
   DhcpSb   = Instance->Service;\r
   Token    = Instance->Token;\r
 \r
@@ -1213,7 +1200,7 @@ Dhcp4InstanceConfigUdpIo (
   UdpConfigData.DoNotFragment      = TRUE;\r
 \r
   ClientAddr = EFI_NTOHL (Token->Packet->Dhcp4.Header.ClientAddr);\r
-  Ip = HTONL (ClientAddr);\r
+  Ip         = HTONL (ClientAddr);\r
   CopyMem (&UdpConfigData.StationAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));\r
 \r
   if (DhcpSb->Netmask == 0) {\r
@@ -1284,7 +1271,7 @@ Dhcp4InstanceCreateUdpIo (
     Status = gBS->OpenProtocol (\r
                     Instance->UdpIo->UdpHandle,\r
                     &gEfiUdp4ProtocolGuid,\r
-                    (VOID **) &Udp4,\r
+                    (VOID **)&Udp4,\r
                     Instance->Service->Image,\r
                     Instance->Handle,\r
                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -1293,6 +1280,7 @@ Dhcp4InstanceCreateUdpIo (
       UdpIoFreeIo (Instance->UdpIo);\r
       Instance->UdpIo = NULL;\r
     }\r
+\r
     return Status;\r
   }\r
 }\r
@@ -1306,7 +1294,7 @@ Dhcp4InstanceCreateUdpIo (
 VOID\r
 EFIAPI\r
 DhcpDummyExtFree (\r
-  IN VOID                   *Arg\r
+  IN VOID  *Arg\r
   )\r
 {\r
 }\r
@@ -1326,10 +1314,10 @@ DhcpDummyExtFree (
 VOID\r
 EFIAPI\r
 PxeDhcpInput (\r
-  NET_BUF                   *UdpPacket,\r
-  UDP_END_POINT             *EndPoint,\r
-  EFI_STATUS                IoStatus,\r
-  VOID                      *Context\r
+  NET_BUF        *UdpPacket,\r
+  UDP_END_POINT  *EndPoint,\r
+  EFI_STATUS     IoStatus,\r
+  VOID           *Context\r
   )\r
 {\r
   DHCP_PROTOCOL                     *Instance;\r
@@ -1341,14 +1329,14 @@ PxeDhcpInput (
   EFI_STATUS                        Status;\r
 \r
   Wrap     = NULL;\r
-  Instance = (DHCP_PROTOCOL *) Context;\r
+  Instance = (DHCP_PROTOCOL *)Context;\r
   Token    = Instance->Token;\r
 \r
   //\r
   // Don't restart receive if error occurs or DHCP is destroyed.\r
   //\r
   if (EFI_ERROR (IoStatus)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   ASSERT (UdpPacket != NULL);\r
@@ -1370,12 +1358,12 @@ PxeDhcpInput (
     goto RESTART;\r
   }\r
 \r
-  Packet         = (EFI_DHCP4_PACKET *) NetbufAllocSpace (Wrap, Len, NET_BUF_TAIL);\r
+  Packet = (EFI_DHCP4_PACKET *)NetbufAllocSpace (Wrap, Len, NET_BUF_TAIL);\r
   ASSERT (Packet != NULL);\r
 \r
   Packet->Size   = Len;\r
   Head           = &Packet->Dhcp4.Header;\r
-  Packet->Length = NetbufCopy (UdpPacket, 0, UdpPacket->TotalSize, (UINT8 *) Head);\r
+  Packet->Length = NetbufCopy (UdpPacket, 0, UdpPacket->TotalSize, (UINT8 *)Head);\r
 \r
   if (Packet->Length != UdpPacket->TotalSize) {\r
     goto RESTART;\r
@@ -1386,7 +1374,8 @@ PxeDhcpInput (
   //\r
   if ((Head->OpCode != BOOTP_REPLY) ||\r
       (Head->Xid != Token->Packet->Dhcp4.Header.Xid) ||\r
-      (CompareMem (&Token->Packet->Dhcp4.Header.ClientHwAddr[0], Head->ClientHwAddr, Head->HwAddrLen) != 0)) {\r
+      (CompareMem (&Token->Packet->Dhcp4.Header.ClientHwAddr[0], Head->ClientHwAddr, Head->HwAddrLen) != 0))\r
+  {\r
     goto RESTART;\r
   }\r
 \r
@@ -1395,8 +1384,8 @@ PxeDhcpInput (
   //\r
   if ((Packet->Length > sizeof (EFI_DHCP4_HEADER) + sizeof (UINT32)) &&\r
       (Packet->Dhcp4.Magik == DHCP_OPTION_MAGIC) &&\r
-      EFI_ERROR (DhcpValidateOptions (Packet, NULL))) {\r
-\r
+      EFI_ERROR (DhcpValidateOptions (Packet, NULL)))\r
+  {\r
     goto RESTART;\r
   }\r
 \r
@@ -1437,7 +1426,7 @@ PxeDhcpDone (
 \r
   Token->ResponseCount = Instance->ResponseQueue.BufNum;\r
   if (Token->ResponseCount != 0) {\r
-    Token->ResponseList = (EFI_DHCP4_PACKET *) AllocatePool (Instance->ResponseQueue.BufSize);\r
+    Token->ResponseList = (EFI_DHCP4_PACKET *)AllocatePool (Instance->ResponseQueue.BufSize);\r
     if (Token->ResponseList == NULL) {\r
       Token->Status = EFI_OUT_OF_RESOURCES;\r
       goto SIGNAL_USER;\r
@@ -1446,7 +1435,7 @@ PxeDhcpDone (
     //\r
     // Copy the received DHCP responses.\r
     //\r
-    NetbufQueCopy (&Instance->ResponseQueue, 0, Instance->ResponseQueue.BufSize, (UINT8 *) Token->ResponseList);\r
+    NetbufQueCopy (&Instance->ResponseQueue, 0, Instance->ResponseQueue.BufSize, (UINT8 *)Token->ResponseList);\r
     Token->Status = EFI_SUCCESS;\r
   } else {\r
     Token->ResponseList = NULL;\r
@@ -1474,7 +1463,6 @@ SIGNAL_USER:
   }\r
 }\r
 \r
-\r
 /**\r
   Transmits a DHCP formatted packet and optionally waits for responses.\r
 \r
@@ -1501,16 +1489,16 @@ EfiDhcp4TransmitReceive (
   IN EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN  *Token\r
   )\r
 {\r
-  DHCP_PROTOCOL  *Instance;\r
-  EFI_TPL        OldTpl;\r
-  EFI_STATUS     Status;\r
-  NET_FRAGMENT   Frag;\r
-  NET_BUF        *Wrap;\r
-  UDP_END_POINT  EndPoint;\r
-  IP4_ADDR       Ip;\r
-  DHCP_SERVICE   *DhcpSb;\r
-  EFI_IP_ADDRESS Gateway;\r
-  IP4_ADDR       ClientAddr;\r
+  DHCP_PROTOCOL   *Instance;\r
+  EFI_TPL         OldTpl;\r
+  EFI_STATUS      Status;\r
+  NET_FRAGMENT    Frag;\r
+  NET_BUF         *Wrap;\r
+  UDP_END_POINT   EndPoint;\r
+  IP4_ADDR        Ip;\r
+  DHCP_SERVICE    *DhcpSb;\r
+  EFI_IP_ADDRESS  Gateway;\r
+  IP4_ADDR        ClientAddr;\r
 \r
   if ((This == NULL) || (Token == NULL) || (Token->Packet == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1532,7 +1520,8 @@ EfiDhcp4TransmitReceive (
       ((Token->ListenPointCount != 0) && (Token->ListenPoints == NULL))   ||\r
       EFI_ERROR (DhcpValidateOptions (Token->Packet, NULL))               ||\r
       EFI_IP4_EQUAL (&Token->RemoteAddress, &mZeroIp4Addr)\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // The DHCP packet isn't well-formed, the Transaction ID is already used,\r
     // the timeout value is zero, the ListenPoint is invalid, or the\r
@@ -1575,7 +1564,7 @@ EfiDhcp4TransmitReceive (
   //\r
   // Wrap the DHCP packet into a net buffer.\r
   //\r
-  Frag.Bulk = (UINT8 *) &Token->Packet->Dhcp4;\r
+  Frag.Bulk = (UINT8 *)&Token->Packet->Dhcp4;\r
   Frag.Len  = Token->Packet->Length;\r
   Wrap      = NetbufFromExt (&Frag, 1, 0, 0, DhcpDummyExtFree, NULL);\r
   if (Wrap == NULL) {\r
@@ -1667,7 +1656,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Callback function for DhcpIterateOptions. This callback sets the\r
   EFI_DHCP4_PACKET_OPTION array in the DHCP_PARSE_CONTEXT to point\r
@@ -1683,15 +1671,15 @@ ON_ERROR:
 **/\r
 EFI_STATUS\r
 Dhcp4ParseCheckOption (\r
-  IN UINT8                  Tag,\r
-  IN UINT8                  Len,\r
-  IN UINT8                  *Data,\r
-  IN VOID                   *Context\r
+  IN UINT8  Tag,\r
+  IN UINT8  Len,\r
+  IN UINT8  *Data,\r
+  IN VOID   *Context\r
   )\r
 {\r
-  DHCP_PARSE_CONTEXT        *Parse;\r
+  DHCP_PARSE_CONTEXT  *Parse;\r
 \r
-  Parse = (DHCP_PARSE_CONTEXT *) Context;\r
+  Parse = (DHCP_PARSE_CONTEXT *)Context;\r
   Parse->Index++;\r
 \r
   if (Parse->Index <= Parse->OptionCount) {\r
@@ -1706,7 +1694,6 @@ Dhcp4ParseCheckOption (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Parses the packed DHCP option data.\r
 \r
@@ -1737,14 +1724,14 @@ Dhcp4ParseCheckOption (
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp4Parse (\r
-  IN EFI_DHCP4_PROTOCOL       *This,\r
-  IN EFI_DHCP4_PACKET         *Packet,\r
-  IN OUT UINT32               *OptionCount,\r
-  OUT EFI_DHCP4_PACKET_OPTION *PacketOptionList[] OPTIONAL\r
+  IN EFI_DHCP4_PROTOCOL        *This,\r
+  IN EFI_DHCP4_PACKET          *Packet,\r
+  IN OUT UINT32                *OptionCount,\r
+  OUT EFI_DHCP4_PACKET_OPTION  *PacketOptionList[] OPTIONAL\r
   )\r
 {\r
-  DHCP_PARSE_CONTEXT        Context;\r
-  EFI_STATUS                Status;\r
+  DHCP_PARSE_CONTEXT  Context;\r
+  EFI_STATUS          Status;\r
 \r
   //\r
   // First validate the parameters\r
@@ -1755,8 +1742,8 @@ EfiDhcp4Parse (
 \r
   if ((Packet->Size < Packet->Length + 2 * sizeof (UINT32)) ||\r
       (Packet->Dhcp4.Magik != DHCP_OPTION_MAGIC) ||\r
-      EFI_ERROR (DhcpValidateOptions (Packet, NULL))) {\r
-\r
+      EFI_ERROR (DhcpValidateOptions (Packet, NULL)))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1770,7 +1757,7 @@ EfiDhcp4Parse (
   Context.OptionCount = *OptionCount;\r
   Context.Index       = 0;\r
 \r
-  Status              = DhcpIterateOptions (Packet, Dhcp4ParseCheckOption, &Context);\r
+  Status = DhcpIterateOptions (Packet, Dhcp4ParseCheckOption, &Context);\r
 \r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -1794,9 +1781,9 @@ EfiDhcp4Parse (
 **/\r
 VOID\r
 SetElapsedTime (\r
-  IN     UINT16                 *Elapsed,\r
-  IN     DHCP_PROTOCOL          *Instance\r
+  IN     UINT16         *Elapsed,\r
+  IN     DHCP_PROTOCOL  *Instance\r
   )\r
 {\r
-  WriteUnaligned16 (Elapsed, HTONS(Instance->ElaspedTime));\r
+  WriteUnaligned16 (Elapsed, HTONS (Instance->ElaspedTime));\r
 }\r
index 8c2cd3dae172e6ba092c45bdcbc9583e755e0215..7e5409da0fb9bd85e79f7b6a5d8a989d9792232b 100644 (file)
@@ -14,8 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef __EFI_DHCP4_IMPL_H__\r
 #define __EFI_DHCP4_IMPL_H__\r
 \r
-\r
-\r
 #include <Uefi.h>\r
 \r
 #include <Protocol/Dhcp4.h>\r
@@ -28,8 +26,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/BaseLib.h>\r
 #include <Library/NetLib.h>\r
 \r
-typedef struct _DHCP_SERVICE  DHCP_SERVICE;\r
-typedef struct _DHCP_PROTOCOL DHCP_PROTOCOL;\r
+typedef struct _DHCP_SERVICE   DHCP_SERVICE;\r
+typedef struct _DHCP_PROTOCOL  DHCP_PROTOCOL;\r
 \r
 #include "Dhcp4Option.h"\r
 #include "Dhcp4Io.h"\r
@@ -37,7 +35,7 @@ typedef struct _DHCP_PROTOCOL DHCP_PROTOCOL;
 #define DHCP_SERVICE_SIGNATURE   SIGNATURE_32 ('D', 'H', 'C', 'P')\r
 #define DHCP_PROTOCOL_SIGNATURE  SIGNATURE_32 ('d', 'h', 'c', 'p')\r
 \r
-#define DHCP_CHECK_MEDIA_WAITING_TIME    EFI_TIMER_PERIOD_SECONDS(20)\r
+#define DHCP_CHECK_MEDIA_WAITING_TIME  EFI_TIMER_PERIOD_SECONDS(20)\r
 \r
 //\r
 // The state of the DHCP service. It starts as UNCONFIGED. If\r
@@ -46,28 +44,27 @@ typedef struct _DHCP_PROTOCOL DHCP_PROTOCOL;
 // goes back to UNCONFIGED. It becomes DESTROY if it is (partly)\r
 // destroyed.\r
 //\r
-#define DHCP_UNCONFIGED          0\r
-#define DHCP_CONFIGED            1\r
-#define DHCP_DESTROY             2\r
-\r
+#define DHCP_UNCONFIGED  0\r
+#define DHCP_CONFIGED    1\r
+#define DHCP_DESTROY     2\r
 \r
 struct _DHCP_PROTOCOL {\r
-  UINT32                            Signature;\r
-  EFI_DHCP4_PROTOCOL                Dhcp4Protocol;\r
-  LIST_ENTRY                        Link;\r
-  EFI_HANDLE                        Handle;\r
-  DHCP_SERVICE                      *Service;\r
-\r
-  BOOLEAN                           InDestroy;\r
-\r
-  EFI_EVENT                         CompletionEvent;\r
-  EFI_EVENT                         RenewRebindEvent;\r
-\r
-  EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN  *Token;\r
-  UDP_IO                            *UdpIo; // The UDP IO used for TransmitReceive.\r
-  UINT32                            Timeout;\r
-  UINT16                            ElaspedTime;\r
-  NET_BUF_QUEUE                     ResponseQueue;\r
+  UINT32                              Signature;\r
+  EFI_DHCP4_PROTOCOL                  Dhcp4Protocol;\r
+  LIST_ENTRY                          Link;\r
+  EFI_HANDLE                          Handle;\r
+  DHCP_SERVICE                        *Service;\r
+\r
+  BOOLEAN                             InDestroy;\r
+\r
+  EFI_EVENT                           CompletionEvent;\r
+  EFI_EVENT                           RenewRebindEvent;\r
+\r
+  EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN    *Token;\r
+  UDP_IO                              *UdpIo; // The UDP IO used for TransmitReceive.\r
+  UINT32                              Timeout;\r
+  UINT16                              ElaspedTime;\r
+  NET_BUF_QUEUE                       ResponseQueue;\r
 };\r
 \r
 //\r
@@ -75,62 +72,62 @@ struct _DHCP_PROTOCOL {
 // has a service binding, there can be only one active child.\r
 //\r
 struct _DHCP_SERVICE {\r
-  UINT32                        Signature;\r
-  EFI_SERVICE_BINDING_PROTOCOL  ServiceBinding;\r
+  UINT32                          Signature;\r
+  EFI_SERVICE_BINDING_PROTOCOL    ServiceBinding;\r
 \r
-  INTN                          ServiceState; // CONFIGED, UNCONFIGED, and DESTROY\r
+  INTN                            ServiceState; // CONFIGED, UNCONFIGED, and DESTROY\r
 \r
-  EFI_HANDLE                    Controller;\r
-  EFI_HANDLE                    Image;\r
+  EFI_HANDLE                      Controller;\r
+  EFI_HANDLE                      Image;\r
 \r
-  LIST_ENTRY                    Children;\r
-  UINTN                         NumChildren;\r
+  LIST_ENTRY                      Children;\r
+  UINTN                           NumChildren;\r
 \r
-  INTN                          DhcpState;\r
-  EFI_STATUS                    IoStatus;     // the result of last user operation\r
-  UINT32                        Xid;\r
+  INTN                            DhcpState;\r
+  EFI_STATUS                      IoStatus;   // the result of last user operation\r
+  UINT32                          Xid;\r
 \r
-  IP4_ADDR                      ClientAddr;   // lease IP or configured client address\r
-  IP4_ADDR                      Netmask;\r
-  IP4_ADDR                      ServerAddr;\r
+  IP4_ADDR                        ClientAddr; // lease IP or configured client address\r
+  IP4_ADDR                        Netmask;\r
+  IP4_ADDR                        ServerAddr;\r
 \r
-  EFI_DHCP4_PACKET              *LastOffer;   // The last received offer\r
-  EFI_DHCP4_PACKET              *Selected;\r
-  DHCP_PARAMETER                *Para;\r
+  EFI_DHCP4_PACKET                *LastOffer; // The last received offer\r
+  EFI_DHCP4_PACKET                *Selected;\r
+  DHCP_PARAMETER                  *Para;\r
 \r
-  UINT32                        Lease;\r
-  UINT32                        T1;\r
-  UINT32                        T2;\r
-  INTN                          ExtraRefresh; // This refresh is reqested by user\r
+  UINT32                          Lease;\r
+  UINT32                          T1;\r
+  UINT32                          T2;\r
+  INTN                            ExtraRefresh; // This refresh is reqested by user\r
 \r
-  UDP_IO                        *UdpIo;       // Udp child receiving all DHCP message\r
-  UDP_IO                        *LeaseIoPort; // Udp child with lease IP\r
-  EFI_DHCP4_PACKET              *LastPacket;  // The last sent packet for retransmission\r
-  EFI_MAC_ADDRESS               Mac;\r
-  UINT8                         HwType;\r
-  UINT8                         HwLen;\r
-  UINT8                         ClientAddressSendOut[16];\r
+  UDP_IO                          *UdpIo;       // Udp child receiving all DHCP message\r
+  UDP_IO                          *LeaseIoPort; // Udp child with lease IP\r
+  EFI_DHCP4_PACKET                *LastPacket;  // The last sent packet for retransmission\r
+  EFI_MAC_ADDRESS                 Mac;\r
+  UINT8                           HwType;\r
+  UINT8                           HwLen;\r
+  UINT8                           ClientAddressSendOut[16];\r
 \r
-  DHCP_PROTOCOL                 *ActiveChild;\r
-  EFI_DHCP4_CONFIG_DATA         ActiveConfig;\r
-  UINT32                        UserOptionLen;\r
+  DHCP_PROTOCOL                   *ActiveChild;\r
+  EFI_DHCP4_CONFIG_DATA           ActiveConfig;\r
+  UINT32                          UserOptionLen;\r
 \r
   //\r
   // Timer event and various timer\r
   //\r
-  EFI_EVENT                     Timer;\r
+  EFI_EVENT                       Timer;\r
 \r
-  UINT32                        PacketToLive; // Retransmission timer for our packets\r
-  UINT32                        LastTimeout;  // Record the init value of PacketToLive every time\r
-  INTN                          CurRetry;\r
-  INTN                          MaxRetries;\r
-  UINT32                        LeaseLife;\r
+  UINT32                          PacketToLive; // Retransmission timer for our packets\r
+  UINT32                          LastTimeout;  // Record the init value of PacketToLive every time\r
+  INTN                            CurRetry;\r
+  INTN                            MaxRetries;\r
+  UINT32                          LeaseLife;\r
 };\r
 \r
 typedef struct {\r
-  EFI_DHCP4_PACKET_OPTION       **Option;\r
-  UINT32                        OptionCount;\r
-  UINT32                        Index;\r
+  EFI_DHCP4_PACKET_OPTION    **Option;\r
+  UINT32                     OptionCount;\r
+  UINT32                     Index;\r
 } DHCP_PARSE_CONTEXT;\r
 \r
 #define DHCP_INSTANCE_FROM_THIS(Proto)  \\r
@@ -139,7 +136,7 @@ typedef struct {
 #define DHCP_SERVICE_FROM_THIS(Sb)      \\r
   CR ((Sb), DHCP_SERVICE, ServiceBinding, DHCP_SERVICE_SIGNATURE)\r
 \r
-extern EFI_DHCP4_PROTOCOL mDhcp4ProtocolTemplate;\r
+extern EFI_DHCP4_PROTOCOL  mDhcp4ProtocolTemplate;\r
 \r
 /**\r
   Give up the control of the DHCP service to let other child\r
@@ -151,7 +148,7 @@ extern EFI_DHCP4_PROTOCOL mDhcp4ProtocolTemplate;
 **/\r
 VOID\r
 DhcpYieldControl (\r
-  IN DHCP_SERVICE           *DhcpSb\r
+  IN DHCP_SERVICE  *DhcpSb\r
   );\r
 \r
 /**\r
@@ -187,7 +184,7 @@ DhcpCleanConfigure (
 VOID\r
 EFIAPI\r
 DhcpDummyExtFree (\r
-  IN VOID                   *Arg\r
+  IN VOID  *Arg\r
   );\r
 \r
 /**\r
@@ -199,8 +196,8 @@ DhcpDummyExtFree (
 **/\r
 VOID\r
 SetElapsedTime (\r
-  IN     UINT16                 *Elapsed,\r
-  IN     DHCP_PROTOCOL          *Instance\r
+  IN     UINT16         *Elapsed,\r
+  IN     DHCP_PROTOCOL  *Instance\r
   );\r
 \r
 #endif\r
index f073eed58a18f93722d29178c76ab1d860f1fcc8..238e186c5b917b1a39b18a936d1e6e15879aa57c 100644 (file)
@@ -6,12 +6,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #include "Dhcp4Impl.h"\r
 \r
 UINT32  mDhcp4DefaultTimeout[4] = { 4, 8, 16, 32 };\r
 \r
-\r
 /**\r
   Send an initial DISCOVER or REQUEST message according to the\r
   DHCP service's current state.\r
@@ -24,17 +22,17 @@ UINT32  mDhcp4DefaultTimeout[4] = { 4, 8, 16, 32 };
 **/\r
 EFI_STATUS\r
 DhcpInitRequest (\r
-  IN DHCP_SERVICE           *DhcpSb\r
+  IN DHCP_SERVICE  *DhcpSb\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   ASSERT ((DhcpSb->DhcpState == Dhcp4Init) || (DhcpSb->DhcpState == Dhcp4InitReboot));\r
 \r
   //\r
   // Clear initial time to make sure that elapsed-time is set to 0 for first Discover or REQUEST message.\r
   //\r
-  DhcpSb->ActiveChild->ElaspedTime= 0;\r
+  DhcpSb->ActiveChild->ElaspedTime = 0;\r
 \r
   if (DhcpSb->DhcpState == Dhcp4Init) {\r
     DhcpSetState (DhcpSb, Dhcp4Selecting, FALSE);\r
@@ -57,7 +55,6 @@ DhcpInitRequest (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Call user provided callback function, and return the value the\r
   function returns. If the user doesn't provide a callback, a\r
@@ -76,14 +73,14 @@ DhcpInitRequest (
 **/\r
 EFI_STATUS\r
 DhcpCallUser (\r
-  IN  DHCP_SERVICE          *DhcpSb,\r
-  IN  EFI_DHCP4_EVENT       Event,\r
-  IN  EFI_DHCP4_PACKET      *Packet       OPTIONAL,\r
-  OUT EFI_DHCP4_PACKET      **NewPacket   OPTIONAL\r
+  IN  DHCP_SERVICE      *DhcpSb,\r
+  IN  EFI_DHCP4_EVENT   Event,\r
+  IN  EFI_DHCP4_PACKET  *Packet       OPTIONAL,\r
+  OUT EFI_DHCP4_PACKET  **NewPacket   OPTIONAL\r
   )\r
 {\r
-  EFI_DHCP4_CONFIG_DATA     *Config;\r
-  EFI_STATUS                Status;\r
+  EFI_DHCP4_CONFIG_DATA  *Config;\r
+  EFI_STATUS             Status;\r
 \r
   if (NewPacket != NULL) {\r
     *NewPacket = NULL;\r
@@ -109,7 +106,7 @@ DhcpCallUser (
   Status = Config->Dhcp4Callback (\r
                      &DhcpSb->ActiveChild->Dhcp4Protocol,\r
                      Config->CallbackContext,\r
-                     (EFI_DHCP4_STATE) DhcpSb->DhcpState,\r
+                     (EFI_DHCP4_STATE)DhcpSb->DhcpState,\r
                      Event,\r
                      Packet,\r
                      NewPacket\r
@@ -127,7 +124,6 @@ DhcpCallUser (
   return EFI_ABORTED;\r
 }\r
 \r
-\r
 /**\r
   Notify the user about the operation result.\r
 \r
@@ -137,35 +133,33 @@ DhcpCallUser (
 **/\r
 VOID\r
 DhcpNotifyUser (\r
-  IN DHCP_SERVICE           *DhcpSb,\r
-  IN INTN                   Which\r
+  IN DHCP_SERVICE  *DhcpSb,\r
+  IN INTN          Which\r
   )\r
 {\r
-  DHCP_PROTOCOL             *Child;\r
+  DHCP_PROTOCOL  *Child;\r
 \r
   if ((Child = DhcpSb->ActiveChild) == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   if ((Child->CompletionEvent != NULL) &&\r
       ((Which == DHCP_NOTIFY_COMPLETION) || (Which == DHCP_NOTIFY_ALL))\r
-      ) {\r
-\r
+      )\r
+  {\r
     gBS->SignalEvent (Child->CompletionEvent);\r
     Child->CompletionEvent = NULL;\r
   }\r
 \r
   if ((Child->RenewRebindEvent != NULL) &&\r
       ((Which == DHCP_NOTIFY_RENEWREBIND) || (Which == DHCP_NOTIFY_ALL))\r
-      ) {\r
-\r
+      )\r
+  {\r
     gBS->SignalEvent (Child->RenewRebindEvent);\r
     Child->RenewRebindEvent = NULL;\r
   }\r
 }\r
 \r
-\r
-\r
 /**\r
   Set the DHCP state. If CallUser is true, it will try to notify\r
   the user before change the state by DhcpNotifyUser. It returns\r
@@ -183,25 +177,22 @@ DhcpNotifyUser (
 **/\r
 EFI_STATUS\r
 DhcpSetState (\r
-  IN OUT DHCP_SERVICE           *DhcpSb,\r
-  IN     INTN                   State,\r
-  IN     BOOLEAN                CallUser\r
+  IN OUT DHCP_SERVICE  *DhcpSb,\r
+  IN     INTN          State,\r
+  IN     BOOLEAN       CallUser\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (CallUser) {\r
     Status = EFI_SUCCESS;\r
 \r
     if (State == Dhcp4Renewing) {\r
       Status = DhcpCallUser (DhcpSb, Dhcp4EnterRenewing, NULL, NULL);\r
-\r
     } else if (State == Dhcp4Rebinding) {\r
       Status = DhcpCallUser (DhcpSb, Dhcp4EnterRebinding, NULL, NULL);\r
-\r
     } else if (State == Dhcp4Bound) {\r
       Status = DhcpCallUser (DhcpSb, Dhcp4BoundCompleted, NULL, NULL);\r
-\r
     }\r
 \r
     if (EFI_ERROR (Status)) {\r
@@ -224,14 +215,13 @@ DhcpSetState (
     DhcpSb->MaxRetries = 4;\r
   }\r
 \r
-  DhcpSb->CurRetry      = 0;\r
-  DhcpSb->PacketToLive  = 0;\r
-  DhcpSb->LastTimeout   = 0;\r
-  DhcpSb->DhcpState     = State;\r
+  DhcpSb->CurRetry     = 0;\r
+  DhcpSb->PacketToLive = 0;\r
+  DhcpSb->LastTimeout  = 0;\r
+  DhcpSb->DhcpState    = State;\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Set the retransmit timer for the packet. It will select from either\r
   the discover timeouts/request timeouts or the default timeout values.\r
@@ -241,10 +231,10 @@ DhcpSetState (
 **/\r
 VOID\r
 DhcpSetTransmitTimer (\r
-  IN OUT DHCP_SERVICE           *DhcpSb\r
+  IN OUT DHCP_SERVICE  *DhcpSb\r
   )\r
 {\r
-  UINT32                    *Times;\r
+  UINT32  *Times;\r
 \r
   ASSERT (DhcpSb->MaxRetries > DhcpSb->CurRetry);\r
 \r
@@ -275,8 +265,8 @@ DhcpSetTransmitTimer (
 **/\r
 VOID\r
 DhcpComputeLease (\r
-  IN OUT DHCP_SERVICE           *DhcpSb,\r
-  IN     DHCP_PARAMETER         *Para\r
+  IN OUT DHCP_SERVICE    *DhcpSb,\r
+  IN     DHCP_PARAMETER  *Para\r
   )\r
 {\r
   ASSERT (Para != NULL);\r
@@ -298,7 +288,6 @@ DhcpComputeLease (
   }\r
 }\r
 \r
-\r
 /**\r
   Configure a UDP IO port to use the acquired lease address.\r
   DHCP driver needs this port to unicast packet to the server\r
@@ -314,32 +303,32 @@ DhcpComputeLease (
 EFI_STATUS\r
 EFIAPI\r
 DhcpConfigLeaseIoPort (\r
-  IN UDP_IO                 *UdpIo,\r
-  IN VOID                   *Context\r
+  IN UDP_IO  *UdpIo,\r
+  IN VOID    *Context\r
   )\r
 {\r
-  EFI_UDP4_CONFIG_DATA      UdpConfigData;\r
-  EFI_IPv4_ADDRESS          Subnet;\r
-  EFI_IPv4_ADDRESS          Gateway;\r
-  DHCP_SERVICE              *DhcpSb;\r
-  EFI_STATUS                Status;\r
-  IP4_ADDR                  Ip;\r
-\r
-  DhcpSb = (DHCP_SERVICE *) Context;\r
-\r
-  UdpConfigData.AcceptBroadcast     = FALSE;\r
-  UdpConfigData.AcceptPromiscuous   = FALSE;\r
-  UdpConfigData.AcceptAnyPort       = FALSE;\r
-  UdpConfigData.AllowDuplicatePort  = TRUE;\r
-  UdpConfigData.TypeOfService       = 0;\r
-  UdpConfigData.TimeToLive          = 64;\r
-  UdpConfigData.DoNotFragment       = FALSE;\r
-  UdpConfigData.ReceiveTimeout      = 1;\r
-  UdpConfigData.TransmitTimeout     = 0;\r
-\r
-  UdpConfigData.UseDefaultAddress   = FALSE;\r
-  UdpConfigData.StationPort         = DHCP_CLIENT_PORT;\r
-  UdpConfigData.RemotePort          = DHCP_SERVER_PORT;\r
+  EFI_UDP4_CONFIG_DATA  UdpConfigData;\r
+  EFI_IPv4_ADDRESS      Subnet;\r
+  EFI_IPv4_ADDRESS      Gateway;\r
+  DHCP_SERVICE          *DhcpSb;\r
+  EFI_STATUS            Status;\r
+  IP4_ADDR              Ip;\r
+\r
+  DhcpSb = (DHCP_SERVICE *)Context;\r
+\r
+  UdpConfigData.AcceptBroadcast    = FALSE;\r
+  UdpConfigData.AcceptPromiscuous  = FALSE;\r
+  UdpConfigData.AcceptAnyPort      = FALSE;\r
+  UdpConfigData.AllowDuplicatePort = TRUE;\r
+  UdpConfigData.TypeOfService      = 0;\r
+  UdpConfigData.TimeToLive         = 64;\r
+  UdpConfigData.DoNotFragment      = FALSE;\r
+  UdpConfigData.ReceiveTimeout     = 1;\r
+  UdpConfigData.TransmitTimeout    = 0;\r
+\r
+  UdpConfigData.UseDefaultAddress = FALSE;\r
+  UdpConfigData.StationPort       = DHCP_CLIENT_PORT;\r
+  UdpConfigData.RemotePort        = DHCP_SERVER_PORT;\r
 \r
   Ip = HTONL (DhcpSb->ClientAddr);\r
   CopyMem (&UdpConfigData.StationAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));\r
@@ -370,7 +359,6 @@ DhcpConfigLeaseIoPort (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Update the lease states when a new lease is acquired. It will not only\r
   save the acquired the address and lease time, it will also create a UDP\r
@@ -384,14 +372,14 @@ DhcpConfigLeaseIoPort (
 **/\r
 EFI_STATUS\r
 DhcpLeaseAcquired (\r
-  IN OUT DHCP_SERVICE           *DhcpSb\r
+  IN OUT DHCP_SERVICE  *DhcpSb\r
   )\r
 {\r
   DhcpSb->ClientAddr = EFI_NTOHL (DhcpSb->Selected->Dhcp4.Header.YourAddr);\r
 \r
   if (DhcpSb->Para != NULL) {\r
-    DhcpSb->Netmask     = DhcpSb->Para->NetMask;\r
-    DhcpSb->ServerAddr  = DhcpSb->Para->ServerId;\r
+    DhcpSb->Netmask    = DhcpSb->Para->NetMask;\r
+    DhcpSb->ServerAddr = DhcpSb->Para->ServerId;\r
   }\r
 \r
   if (DhcpSb->Netmask == 0) {\r
@@ -426,7 +414,6 @@ DhcpLeaseAcquired (
   return DhcpSetState (DhcpSb, Dhcp4Bound, TRUE);\r
 }\r
 \r
-\r
 /**\r
   Clean up the DHCP related states, IoStatus isn't reset.\r
 \r
@@ -435,14 +422,14 @@ DhcpLeaseAcquired (
 **/\r
 VOID\r
 DhcpCleanLease (\r
-  IN DHCP_SERVICE           *DhcpSb\r
+  IN DHCP_SERVICE  *DhcpSb\r
   )\r
 {\r
-  DhcpSb->DhcpState   = Dhcp4Init;\r
-  DhcpSb->Xid         = DhcpSb->Xid + 1;\r
-  DhcpSb->ClientAddr  = 0;\r
-  DhcpSb->Netmask     = 0;\r
-  DhcpSb->ServerAddr  = 0;\r
+  DhcpSb->DhcpState  = Dhcp4Init;\r
+  DhcpSb->Xid        = DhcpSb->Xid + 1;\r
+  DhcpSb->ClientAddr = 0;\r
+  DhcpSb->Netmask    = 0;\r
+  DhcpSb->ServerAddr = 0;\r
 \r
   if (DhcpSb->LastOffer != NULL) {\r
     FreePool (DhcpSb->LastOffer);\r
@@ -459,10 +446,10 @@ DhcpCleanLease (
     DhcpSb->Para = NULL;\r
   }\r
 \r
-  DhcpSb->Lease         = 0;\r
-  DhcpSb->T1            = 0;\r
-  DhcpSb->T2            = 0;\r
-  DhcpSb->ExtraRefresh  = FALSE;\r
+  DhcpSb->Lease        = 0;\r
+  DhcpSb->T1           = 0;\r
+  DhcpSb->T2           = 0;\r
+  DhcpSb->ExtraRefresh = FALSE;\r
 \r
   if (DhcpSb->LeaseIoPort != NULL) {\r
     UdpIoFreeIo (DhcpSb->LeaseIoPort);\r
@@ -474,11 +461,11 @@ DhcpCleanLease (
     DhcpSb->LastPacket = NULL;\r
   }\r
 \r
-  DhcpSb->PacketToLive  = 0;\r
-  DhcpSb->LastTimeout   = 0;\r
-  DhcpSb->CurRetry      = 0;\r
-  DhcpSb->MaxRetries    = 0;\r
-  DhcpSb->LeaseLife     = 0;\r
+  DhcpSb->PacketToLive = 0;\r
+  DhcpSb->LastTimeout  = 0;\r
+  DhcpSb->CurRetry     = 0;\r
+  DhcpSb->MaxRetries   = 0;\r
+  DhcpSb->LeaseLife    = 0;\r
 \r
   //\r
   // Clean active config data.\r
@@ -486,7 +473,6 @@ DhcpCleanLease (
   DhcpCleanConfigure (&DhcpSb->ActiveConfig);\r
 }\r
 \r
-\r
 /**\r
   Select a offer among all the offers collected. If the offer selected is\r
   of BOOTP, the lease is recorded and user notified. If the offer is of\r
@@ -499,13 +485,13 @@ DhcpCleanLease (
 **/\r
 EFI_STATUS\r
 DhcpChooseOffer (\r
-  IN DHCP_SERVICE           *DhcpSb\r
+  IN DHCP_SERVICE  *DhcpSb\r
   )\r
 {\r
-  EFI_DHCP4_PACKET          *Selected;\r
-  EFI_DHCP4_PACKET          *NewPacket;\r
-  EFI_DHCP4_PACKET          *TempPacket;\r
-  EFI_STATUS                Status;\r
+  EFI_DHCP4_PACKET  *Selected;\r
+  EFI_DHCP4_PACKET  *NewPacket;\r
+  EFI_DHCP4_PACKET  *TempPacket;\r
+  EFI_STATUS        Status;\r
 \r
   ASSERT (DhcpSb->LastOffer != NULL);\r
 \r
@@ -524,7 +510,7 @@ DhcpChooseOffer (
   Selected = DhcpSb->LastOffer;\r
 \r
   if ((NewPacket != NULL) && !EFI_ERROR (DhcpValidateOptions (NewPacket, NULL))) {\r
-    TempPacket = (EFI_DHCP4_PACKET *) AllocatePool (NewPacket->Size);\r
+    TempPacket = (EFI_DHCP4_PACKET *)AllocatePool (NewPacket->Size);\r
     if (TempPacket != NULL) {\r
       CopyMem (TempPacket, NewPacket, NewPacket->Size);\r
       FreePool (Selected);\r
@@ -565,7 +551,6 @@ DhcpChooseOffer (
   return DhcpSendMessage (DhcpSb, Selected, DhcpSb->Para, DHCP_MSG_REQUEST, NULL);\r
 }\r
 \r
-\r
 /**\r
   Terminate the current address acquire. All the allocated resources\r
   are released. Be careful when calling this function. A rule related\r
@@ -578,8 +563,8 @@ DhcpChooseOffer (
 **/\r
 VOID\r
 DhcpEndSession (\r
-  IN DHCP_SERVICE           *DhcpSb,\r
-  IN EFI_STATUS             Status\r
+  IN DHCP_SERVICE  *DhcpSb,\r
+  IN EFI_STATUS    Status\r
   )\r
 {\r
   if (DHCP_CONNECTED (DhcpSb->DhcpState)) {\r
@@ -594,7 +579,6 @@ DhcpEndSession (
   DhcpNotifyUser (DhcpSb, DHCP_NOTIFY_ALL);\r
 }\r
 \r
-\r
 /**\r
   Handle packets in DHCP select state.\r
 \r
@@ -609,12 +593,12 @@ DhcpEndSession (
 **/\r
 EFI_STATUS\r
 DhcpHandleSelect (\r
-  IN DHCP_SERVICE           *DhcpSb,\r
-  IN EFI_DHCP4_PACKET       *Packet,\r
-  IN DHCP_PARAMETER         *Para\r
+  IN DHCP_SERVICE      *DhcpSb,\r
+  IN EFI_DHCP4_PACKET  *Packet,\r
+  IN DHCP_PARAMETER    *Para\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
@@ -626,7 +610,8 @@ DhcpHandleSelect (
   //\r
   if (!DHCP_IS_BOOTP (Para) &&\r
       ((Para->DhcpType != DHCP_MSG_OFFER) || (Para->ServerId == 0))\r
-      ) {\r
+      )\r
+  {\r
     goto ON_EXIT;\r
   }\r
 \r
@@ -646,14 +631,12 @@ DhcpHandleSelect (
     DhcpSb->LastOffer = Packet;\r
 \r
     return DhcpChooseOffer (DhcpSb);\r
-\r
   } else if (Status == EFI_NOT_READY) {\r
     if (DhcpSb->LastOffer != NULL) {\r
       FreePool (DhcpSb->LastOffer);\r
     }\r
 \r
     DhcpSb->LastOffer = Packet;\r
-\r
   } else if (Status == EFI_ABORTED) {\r
     //\r
     // DhcpInput will end the session upon error return. Remember\r
@@ -669,7 +652,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Handle packets in DHCP request state.\r
 \r
@@ -684,20 +666,20 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 DhcpHandleRequest (\r
-  IN DHCP_SERVICE           *DhcpSb,\r
-  IN EFI_DHCP4_PACKET       *Packet,\r
-  IN DHCP_PARAMETER         *Para\r
+  IN DHCP_SERVICE      *DhcpSb,\r
+  IN EFI_DHCP4_PACKET  *Packet,\r
+  IN DHCP_PARAMETER    *Para\r
   )\r
 {\r
-  EFI_DHCP4_HEADER          *Head;\r
-  EFI_DHCP4_HEADER          *Selected;\r
-  EFI_STATUS                Status;\r
-  UINT8                     *Message;\r
+  EFI_DHCP4_HEADER  *Head;\r
+  EFI_DHCP4_HEADER  *Selected;\r
+  EFI_STATUS        Status;\r
+  UINT8             *Message;\r
 \r
   ASSERT (!DHCP_IS_BOOTP (DhcpSb->Para));\r
 \r
-  Head      = &Packet->Dhcp4.Header;\r
-  Selected  = &DhcpSb->Selected->Dhcp4.Header;\r
+  Head     = &Packet->Dhcp4.Header;\r
+  Selected = &DhcpSb->Selected->Dhcp4.Header;\r
 \r
   //\r
   // Ignore the BOOTP message and DHCP messages other than DHCP ACK/NACK.\r
@@ -705,8 +687,8 @@ DhcpHandleRequest (
   if (DHCP_IS_BOOTP (Para) ||\r
       (Para->ServerId != DhcpSb->Para->ServerId) ||\r
       ((Para->DhcpType != DHCP_MSG_ACK) && (Para->DhcpType != DHCP_MSG_NAK))\r
-      ) {\r
-\r
+      )\r
+  {\r
     Status = EFI_SUCCESS;\r
     goto ON_EXIT;\r
   }\r
@@ -727,14 +709,14 @@ DhcpHandleRequest (
   Message = NULL;\r
 \r
   if (!EFI_IP4_EQUAL (&Head->YourAddr, &Selected->YourAddr)) {\r
-    Message = (UINT8 *) "Lease confirmed isn't the same as that in the offer";\r
+    Message = (UINT8 *)"Lease confirmed isn't the same as that in the offer";\r
     goto REJECT;\r
   }\r
 \r
   Status = DhcpCallUser (DhcpSb, Dhcp4RcvdAck, Packet, NULL);\r
 \r
   if (EFI_ERROR (Status)) {\r
-    Message = (UINT8 *) "Lease is denied upon received ACK";\r
+    Message = (UINT8 *)"Lease is denied upon received ACK";\r
     goto REJECT;\r
   }\r
 \r
@@ -744,7 +726,7 @@ DhcpHandleRequest (
   Status = DhcpLeaseAcquired (DhcpSb);\r
 \r
   if (EFI_ERROR (Status)) {\r
-    Message = (UINT8 *) "Lease is denied upon entering bound";\r
+    Message = (UINT8 *)"Lease is denied upon entering bound";\r
     goto REJECT;\r
   }\r
 \r
@@ -762,7 +744,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Handle packets in DHCP renew/rebound state.\r
 \r
@@ -777,19 +758,19 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 DhcpHandleRenewRebind (\r
-  IN DHCP_SERVICE           *DhcpSb,\r
-  IN EFI_DHCP4_PACKET       *Packet,\r
-  IN DHCP_PARAMETER         *Para\r
+  IN DHCP_SERVICE      *DhcpSb,\r
+  IN EFI_DHCP4_PACKET  *Packet,\r
+  IN DHCP_PARAMETER    *Para\r
   )\r
 {\r
-  EFI_DHCP4_HEADER          *Head;\r
-  EFI_DHCP4_HEADER          *Selected;\r
-  EFI_STATUS                Status;\r
+  EFI_DHCP4_HEADER  *Head;\r
+  EFI_DHCP4_HEADER  *Selected;\r
+  EFI_STATUS        Status;\r
 \r
   ASSERT (!DHCP_IS_BOOTP (DhcpSb->Para));\r
 \r
-  Head      = &Packet->Dhcp4.Header;\r
-  Selected  = &DhcpSb->Selected->Dhcp4.Header;\r
+  Head     = &Packet->Dhcp4.Header;\r
+  Selected = &DhcpSb->Selected->Dhcp4.Header;\r
 \r
   //\r
   // Ignore the BOOTP message and DHCP messages other than DHCP ACK/NACK\r
@@ -797,8 +778,8 @@ DhcpHandleRenewRebind (
   if (DHCP_IS_BOOTP (Para) ||\r
       (Para->ServerId != DhcpSb->Para->ServerId) ||\r
       ((Para->DhcpType != DHCP_MSG_ACK) && (Para->DhcpType != DHCP_MSG_NAK))\r
-      ) {\r
-\r
+      )\r
+  {\r
     Status = EFI_SUCCESS;\r
     goto ON_EXIT;\r
   }\r
@@ -835,9 +816,9 @@ DhcpHandleRenewRebind (
   DhcpSetState (DhcpSb, Dhcp4Bound, TRUE);\r
 \r
   if (DhcpSb->ExtraRefresh != 0) {\r
-    DhcpSb->ExtraRefresh  = FALSE;\r
+    DhcpSb->ExtraRefresh = FALSE;\r
 \r
-    DhcpSb->IoStatus      = EFI_SUCCESS;\r
+    DhcpSb->IoStatus = EFI_SUCCESS;\r
     DhcpNotifyUser (DhcpSb, DHCP_NOTIFY_RENEWREBIND);\r
   }\r
 \r
@@ -846,7 +827,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Handle packets in DHCP reboot state.\r
 \r
@@ -861,13 +841,13 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 DhcpHandleReboot (\r
-  IN DHCP_SERVICE           *DhcpSb,\r
-  IN EFI_DHCP4_PACKET       *Packet,\r
-  IN DHCP_PARAMETER         *Para\r
+  IN DHCP_SERVICE      *DhcpSb,\r
+  IN EFI_DHCP4_PACKET  *Packet,\r
+  IN DHCP_PARAMETER    *Para\r
   )\r
 {\r
-  EFI_DHCP4_HEADER          *Head;\r
-  EFI_STATUS                Status;\r
+  EFI_DHCP4_HEADER  *Head;\r
+  EFI_STATUS        Status;\r
 \r
   Head = &Packet->Dhcp4.Header;\r
 \r
@@ -876,8 +856,8 @@ DhcpHandleReboot (
   //\r
   if (DHCP_IS_BOOTP (Para) ||\r
       ((Para->DhcpType != DHCP_MSG_ACK) && (Para->DhcpType != DHCP_MSG_NAK))\r
-      ) {\r
-\r
+      )\r
+  {\r
     Status = EFI_SUCCESS;\r
     goto ON_EXIT;\r
   }\r
@@ -888,10 +868,10 @@ DhcpHandleReboot (
   if (Para->DhcpType == DHCP_MSG_NAK) {\r
     DhcpCallUser (DhcpSb, Dhcp4RcvdNak, Packet, NULL);\r
 \r
-    DhcpSb->ClientAddr  = 0;\r
-    DhcpSb->DhcpState   = Dhcp4Init;\r
+    DhcpSb->ClientAddr = 0;\r
+    DhcpSb->DhcpState  = Dhcp4Init;\r
 \r
-    Status              = DhcpInitRequest (DhcpSb);\r
+    Status = DhcpInitRequest (DhcpSb);\r
     goto ON_EXIT;\r
   }\r
 \r
@@ -917,8 +897,8 @@ DhcpHandleReboot (
     goto ON_EXIT;\r
   }\r
 \r
-  DhcpSb->Selected  = Packet;\r
-  Status            = DhcpLeaseAcquired (DhcpSb);\r
+  DhcpSb->Selected = Packet;\r
+  Status           = DhcpLeaseAcquired (DhcpSb);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -932,7 +912,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Handle the received DHCP packets. This function drives the DHCP\r
   state machine.\r
@@ -946,30 +925,30 @@ ON_EXIT:
 VOID\r
 EFIAPI\r
 DhcpInput (\r
-  NET_BUF                   *UdpPacket,\r
-  UDP_END_POINT             *EndPoint,\r
-  EFI_STATUS                IoStatus,\r
-  VOID                      *Context\r
+  NET_BUF        *UdpPacket,\r
+  UDP_END_POINT  *EndPoint,\r
+  EFI_STATUS     IoStatus,\r
+  VOID           *Context\r
   )\r
 {\r
-  DHCP_SERVICE              *DhcpSb;\r
-  EFI_DHCP4_HEADER          *Head;\r
-  EFI_DHCP4_PACKET          *Packet;\r
-  DHCP_PARAMETER            *Para;\r
-  EFI_STATUS                Status;\r
-  UINT32                    Len;\r
+  DHCP_SERVICE      *DhcpSb;\r
+  EFI_DHCP4_HEADER  *Head;\r
+  EFI_DHCP4_PACKET  *Packet;\r
+  DHCP_PARAMETER    *Para;\r
+  EFI_STATUS        Status;\r
+  UINT32            Len;\r
 \r
-  Packet  = NULL;\r
-  DhcpSb  = (DHCP_SERVICE *) Context;\r
+  Packet = NULL;\r
+  DhcpSb = (DHCP_SERVICE *)Context;\r
 \r
   //\r
   // Don't restart receive if error occurs or DHCP is destroyed.\r
   //\r
   if (EFI_ERROR (IoStatus)) {\r
-    return ;\r
+    return;\r
   } else if (DhcpSb->ServiceState == DHCP_DESTROY) {\r
     NetbufFree (UdpPacket);\r
-    return ;\r
+    return;\r
   }\r
 \r
   ASSERT (UdpPacket != NULL);\r
@@ -988,16 +967,16 @@ DhcpInput (
   //\r
   // Copy the DHCP message to a continuous memory block\r
   //\r
-  Len     = sizeof (EFI_DHCP4_PACKET) + UdpPacket->TotalSize - sizeof (EFI_DHCP4_HEADER);\r
-  Packet  = (EFI_DHCP4_PACKET *) AllocatePool (Len);\r
+  Len    = sizeof (EFI_DHCP4_PACKET) + UdpPacket->TotalSize - sizeof (EFI_DHCP4_HEADER);\r
+  Packet = (EFI_DHCP4_PACKET *)AllocatePool (Len);\r
 \r
   if (Packet == NULL) {\r
     goto RESTART;\r
   }\r
 \r
-  Packet->Size    = Len;\r
-  Head            = &Packet->Dhcp4.Header;\r
-  Packet->Length  = NetbufCopy (UdpPacket, 0, UdpPacket->TotalSize, (UINT8 *) Head);\r
+  Packet->Size   = Len;\r
+  Head           = &Packet->Dhcp4.Header;\r
+  Packet->Length = NetbufCopy (UdpPacket, 0, UdpPacket->TotalSize, (UINT8 *)Head);\r
 \r
   if (Packet->Length != UdpPacket->TotalSize) {\r
     goto RESTART;\r
@@ -1008,7 +987,8 @@ DhcpInput (
   //\r
   if ((Head->OpCode != BOOTP_REPLY) ||\r
       (NTOHL (Head->Xid) != DhcpSb->Xid) ||\r
-      (CompareMem (DhcpSb->ClientAddressSendOut, Head->ClientHwAddr, Head->HwAddrLen) != 0)) {\r
+      (CompareMem (DhcpSb->ClientAddressSendOut, Head->ClientHwAddr, Head->HwAddrLen) != 0))\r
+  {\r
     goto RESTART;\r
   }\r
 \r
@@ -1018,8 +998,8 @@ DhcpInput (
   Para = NULL;\r
   if ((Packet->Length > sizeof (EFI_DHCP4_HEADER) + sizeof (UINT32)) &&\r
       (Packet->Dhcp4.Magik == DHCP_OPTION_MAGIC) &&\r
-      EFI_ERROR (DhcpValidateOptions (Packet, &Para))) {\r
-\r
+      EFI_ERROR (DhcpValidateOptions (Packet, &Para)))\r
+  {\r
     goto RESTART;\r
   }\r
 \r
@@ -1035,32 +1015,32 @@ DhcpInput (
   Status = EFI_SUCCESS;\r
 \r
   switch (DhcpSb->DhcpState) {\r
-  case Dhcp4Selecting:\r
-    Status = DhcpHandleSelect (DhcpSb, Packet, Para);\r
-    break;\r
+    case Dhcp4Selecting:\r
+      Status = DhcpHandleSelect (DhcpSb, Packet, Para);\r
+      break;\r
 \r
-  case Dhcp4Requesting:\r
-    Status = DhcpHandleRequest (DhcpSb, Packet, Para);\r
-    break;\r
+    case Dhcp4Requesting:\r
+      Status = DhcpHandleRequest (DhcpSb, Packet, Para);\r
+      break;\r
 \r
-  case Dhcp4InitReboot:\r
-  case Dhcp4Init:\r
-  case Dhcp4Bound:\r
-    //\r
-    // Ignore the packet in INITREBOOT, INIT and BOUND states\r
-    //\r
-    FreePool (Packet);\r
-    Status = EFI_SUCCESS;\r
-    break;\r
+    case Dhcp4InitReboot:\r
+    case Dhcp4Init:\r
+    case Dhcp4Bound:\r
+      //\r
+      // Ignore the packet in INITREBOOT, INIT and BOUND states\r
+      //\r
+      FreePool (Packet);\r
+      Status = EFI_SUCCESS;\r
+      break;\r
 \r
-  case Dhcp4Renewing:\r
-  case Dhcp4Rebinding:\r
-    Status = DhcpHandleRenewRebind (DhcpSb, Packet, Para);\r
-    break;\r
+    case Dhcp4Renewing:\r
+    case Dhcp4Rebinding:\r
+      Status = DhcpHandleRenewRebind (DhcpSb, Packet, Para);\r
+      break;\r
 \r
-  case Dhcp4Rebooting:\r
-    Status = DhcpHandleReboot (DhcpSb, Packet, Para);\r
-    break;\r
+    case Dhcp4Rebooting:\r
+      Status = DhcpHandleReboot (DhcpSb, Packet, Para);\r
+      break;\r
   }\r
 \r
   if (Para != NULL) {\r
@@ -1073,7 +1053,7 @@ DhcpInput (
     NetbufFree (UdpPacket);\r
     UdpIoRecvDatagram (DhcpSb->UdpIo, DhcpInput, DhcpSb, 0);\r
     DhcpEndSession (DhcpSb, Status);\r
-    return ;\r
+    return;\r
   }\r
 \r
 RESTART:\r
@@ -1102,17 +1082,15 @@ RESTART:
 VOID\r
 EFIAPI\r
 DhcpOnPacketSent (\r
-  NET_BUF                   *Packet,\r
-  UDP_END_POINT             *EndPoint,\r
-  EFI_STATUS                IoStatus,\r
-  VOID                      *Context\r
+  NET_BUF        *Packet,\r
+  UDP_END_POINT  *EndPoint,\r
+  EFI_STATUS     IoStatus,\r
+  VOID           *Context\r
   )\r
 {\r
   NetbufFree (Packet);\r
 }\r
 \r
-\r
-\r
 /**\r
   Build and transmit a DHCP message according to the current states.\r
   This function implement the Table 5. of RFC 2131. Always transits\r
@@ -1134,28 +1112,28 @@ DhcpOnPacketSent (
 **/\r
 EFI_STATUS\r
 DhcpSendMessage (\r
-  IN DHCP_SERVICE           *DhcpSb,\r
-  IN EFI_DHCP4_PACKET       *Seed,\r
-  IN DHCP_PARAMETER         *Para,\r
-  IN UINT8                  Type,\r
-  IN UINT8                  *Msg\r
+  IN DHCP_SERVICE      *DhcpSb,\r
+  IN EFI_DHCP4_PACKET  *Seed,\r
+  IN DHCP_PARAMETER    *Para,\r
+  IN UINT8             Type,\r
+  IN UINT8             *Msg\r
   )\r
 {\r
-  EFI_DHCP4_CONFIG_DATA     *Config;\r
-  EFI_DHCP4_PACKET          *Packet;\r
-  EFI_DHCP4_PACKET          *NewPacket;\r
-  EFI_DHCP4_HEADER          *Head;\r
-  EFI_DHCP4_HEADER          *SeedHead;\r
-  UDP_IO                    *UdpIo;\r
-  UDP_END_POINT             EndPoint;\r
-  NET_BUF                   *Wrap;\r
-  NET_FRAGMENT              Frag;\r
-  EFI_STATUS                Status;\r
-  IP4_ADDR                  IpAddr;\r
-  UINT8                     *Buf;\r
-  UINT16                    MaxMsg;\r
-  UINT32                    Len;\r
-  UINT32                    Index;\r
+  EFI_DHCP4_CONFIG_DATA  *Config;\r
+  EFI_DHCP4_PACKET       *Packet;\r
+  EFI_DHCP4_PACKET       *NewPacket;\r
+  EFI_DHCP4_HEADER       *Head;\r
+  EFI_DHCP4_HEADER       *SeedHead;\r
+  UDP_IO                 *UdpIo;\r
+  UDP_END_POINT          EndPoint;\r
+  NET_BUF                *Wrap;\r
+  NET_FRAGMENT           Frag;\r
+  EFI_STATUS             Status;\r
+  IP4_ADDR               IpAddr;\r
+  UINT8                  *Buf;\r
+  UINT16                 MaxMsg;\r
+  UINT32                 Len;\r
+  UINT32                 Index;\r
 \r
   //\r
   // Allocate a big enough memory block to hold the DHCP packet\r
@@ -1163,7 +1141,7 @@ DhcpSendMessage (
   Len = sizeof (EFI_DHCP4_PACKET) + 128 + DhcpSb->UserOptionLen;\r
 \r
   if (Msg != NULL) {\r
-    Len += (UINT32)AsciiStrLen ((CHAR8 *) Msg);\r
+    Len += (UINT32)AsciiStrLen ((CHAR8 *)Msg);\r
   }\r
 \r
   Packet = AllocatePool (Len);\r
@@ -1172,14 +1150,14 @@ DhcpSendMessage (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Packet->Size    = Len;\r
-  Packet->Length  = sizeof (EFI_DHCP4_HEADER) + sizeof (UINT32);\r
+  Packet->Size   = Len;\r
+  Packet->Length = sizeof (EFI_DHCP4_HEADER) + sizeof (UINT32);\r
 \r
   //\r
   // Fill in the DHCP header fields\r
   //\r
-  Config    = &DhcpSb->ActiveConfig;\r
-  SeedHead  = NULL;\r
+  Config   = &DhcpSb->ActiveConfig;\r
+  SeedHead = NULL;\r
 \r
   if (Seed != NULL) {\r
     SeedHead = &Seed->Dhcp4.Header;\r
@@ -1188,11 +1166,11 @@ DhcpSendMessage (
   Head = &Packet->Dhcp4.Header;\r
   ZeroMem (Head, sizeof (EFI_DHCP4_HEADER));\r
 \r
-  Head->OpCode       = BOOTP_REQUEST;\r
-  Head->HwType       = DhcpSb->HwType;\r
-  Head->HwAddrLen    = DhcpSb->HwLen;\r
-  Head->Xid          = HTONL (DhcpSb->Xid);\r
-  Head->Reserved     = HTONS (0x8000);  //Server, broadcast the message please.\r
+  Head->OpCode    = BOOTP_REQUEST;\r
+  Head->HwType    = DhcpSb->HwType;\r
+  Head->HwAddrLen = DhcpSb->HwLen;\r
+  Head->Xid       = HTONL (DhcpSb->Xid);\r
+  Head->Reserved  = HTONS (0x8000);     // Server, broadcast the message please.\r
 \r
   EFI_IP4 (Head->ClientAddr) = HTONL (DhcpSb->ClientAddr);\r
   CopyMem (Head->ClientHwAddr, DhcpSb->Mac.Addr, DhcpSb->HwLen);\r
@@ -1205,7 +1183,7 @@ DhcpSendMessage (
     //\r
     Head->Seconds = DhcpSb->LastPacket->Dhcp4.Header.Seconds;\r
   } else {\r
-    SetElapsedTime(&Head->Seconds, DhcpSb->ActiveChild);\r
+    SetElapsedTime (&Head->Seconds, DhcpSb->ActiveChild);\r
   }\r
 \r
   //\r
@@ -1223,12 +1201,12 @@ DhcpSendMessage (
   //\r
   if ((Type == DHCP_MSG_DECLINE) || (Type == DHCP_MSG_RELEASE) ||\r
       ((Type == DHCP_MSG_REQUEST) && (DhcpSb->DhcpState == Dhcp4Requesting))\r
-      ) {\r
-\r
+      )\r
+  {\r
     ASSERT ((Para != NULL) && (Para->ServerId != 0));\r
 \r
-    IpAddr  = HTONL (Para->ServerId);\r
-    Buf     = DhcpAppendOption (Buf, DHCP4_TAG_SERVER_ID, 4, (UINT8 *) &IpAddr);\r
+    IpAddr = HTONL (Para->ServerId);\r
+    Buf    = DhcpAppendOption (Buf, DHCP4_TAG_SERVER_ID, 4, (UINT8 *)&IpAddr);\r
   }\r
 \r
   //\r
@@ -1242,19 +1220,17 @@ DhcpSendMessage (
   if (Type == DHCP_MSG_REQUEST) {\r
     if (DhcpSb->DhcpState == Dhcp4Rebooting) {\r
       IpAddr = EFI_IP4 (Config->ClientAddress);\r
-\r
     } else if (DhcpSb->DhcpState == Dhcp4Requesting) {\r
       ASSERT (SeedHead != NULL);\r
       IpAddr = EFI_IP4 (SeedHead->YourAddr);\r
     }\r
-\r
   } else if (Type == DHCP_MSG_DECLINE) {\r
     ASSERT (SeedHead != NULL);\r
     IpAddr = EFI_IP4 (SeedHead->YourAddr);\r
   }\r
 \r
   if (IpAddr != 0) {\r
-    Buf = DhcpAppendOption (Buf, DHCP4_TAG_REQUEST_IP, 4, (UINT8 *) &IpAddr);\r
+    Buf = DhcpAppendOption (Buf, DHCP4_TAG_REQUEST_IP, 4, (UINT8 *)&IpAddr);\r
   }\r
 \r
   //\r
@@ -1263,16 +1239,16 @@ DhcpSendMessage (
   // override the BOOTFILE and SERVER fields in the message head.\r
   //\r
   if ((Type != DHCP_MSG_DECLINE) && (Type != DHCP_MSG_RELEASE)) {\r
-    MaxMsg  = HTONS (0xFF00);\r
-    Buf     = DhcpAppendOption (Buf, DHCP4_TAG_MAXMSG, 2, (UINT8 *) &MaxMsg);\r
+    MaxMsg = HTONS (0xFF00);\r
+    Buf    = DhcpAppendOption (Buf, DHCP4_TAG_MAXMSG, 2, (UINT8 *)&MaxMsg);\r
   }\r
 \r
   //\r
   // Append the user's message if it isn't NULL\r
   //\r
   if (Msg != NULL) {\r
-    Len     = MIN ((UINT32) AsciiStrLen ((CHAR8 *) Msg), 255);\r
-    Buf     = DhcpAppendOption (Buf, DHCP4_TAG_MESSAGE, (UINT16) Len, Msg);\r
+    Len = MIN ((UINT32)AsciiStrLen ((CHAR8 *)Msg), 255);\r
+    Buf = DhcpAppendOption (Buf, DHCP4_TAG_MESSAGE, (UINT16)Len, Msg);\r
   }\r
 \r
   //\r
@@ -1285,7 +1261,8 @@ DhcpSendMessage (
       // if it is a DHCP decline or DHCP release .\r
       //\r
       if (((Type == DHCP_MSG_DECLINE) || (Type == DHCP_MSG_RELEASE)) &&\r
-          (Config->OptionList[Index]->OpCode != DHCP4_TAG_CLIENT_ID)) {\r
+          (Config->OptionList[Index]->OpCode != DHCP4_TAG_CLIENT_ID))\r
+      {\r
         continue;\r
       }\r
 \r
@@ -1298,8 +1275,8 @@ DhcpSendMessage (
     }\r
   }\r
 \r
-  *(Buf++) = DHCP4_TAG_EOP;\r
-  Packet->Length += (UINT32) (Buf - Packet->Dhcp4.Option);\r
+  *(Buf++)        = DHCP4_TAG_EOP;\r
+  Packet->Length += (UINT32)(Buf - Packet->Dhcp4.Option);\r
 \r
   //\r
   // OK, the message is built, call the user to override it.\r
@@ -1309,10 +1286,8 @@ DhcpSendMessage (
 \r
   if (Type == DHCP_MSG_DISCOVER) {\r
     Status = DhcpCallUser (DhcpSb, Dhcp4SendDiscover, Packet, &NewPacket);\r
-\r
   } else if (Type == DHCP_MSG_REQUEST) {\r
     Status = DhcpCallUser (DhcpSb, Dhcp4SendRequest, Packet, &NewPacket);\r
-\r
   } else if (Type == DHCP_MSG_DECLINE) {\r
     Status = DhcpCallUser (DhcpSb, Dhcp4SendDecline, Packet, &NewPacket);\r
   }\r
@@ -1339,7 +1314,7 @@ DhcpSendMessage (
   //\r
   // Wrap it into a netbuf then send it.\r
   //\r
-  Frag.Bulk = (UINT8 *) &Packet->Dhcp4.Header;\r
+  Frag.Bulk = (UINT8 *)&Packet->Dhcp4.Header;\r
   Frag.Len  = Packet->Length;\r
   Wrap      = NetbufFromExt (&Frag, 1, 0, 0, DhcpDummyExtFree, NULL);\r
 \r
@@ -1393,7 +1368,6 @@ DhcpSendMessage (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Retransmit a saved packet. Only DISCOVER and REQUEST messages\r
   will be retransmitted.\r
@@ -1406,14 +1380,14 @@ DhcpSendMessage (
 **/\r
 EFI_STATUS\r
 DhcpRetransmit (\r
-  IN DHCP_SERVICE           *DhcpSb\r
+  IN DHCP_SERVICE  *DhcpSb\r
   )\r
 {\r
-  UDP_IO                    *UdpIo;\r
-  UDP_END_POINT             EndPoint;\r
-  NET_BUF                   *Wrap;\r
-  NET_FRAGMENT              Frag;\r
-  EFI_STATUS                Status;\r
+  UDP_IO         *UdpIo;\r
+  UDP_END_POINT  EndPoint;\r
+  NET_BUF        *Wrap;\r
+  NET_FRAGMENT   Frag;\r
+  EFI_STATUS     Status;\r
 \r
   ASSERT (DhcpSb->LastPacket != NULL);\r
 \r
@@ -1421,13 +1395,13 @@ DhcpRetransmit (
   // For REQUEST message in Dhcp4Requesting state, do not change the secs fields.\r
   //\r
   if (DhcpSb->DhcpState != Dhcp4Requesting) {\r
-    SetElapsedTime(&DhcpSb->LastPacket->Dhcp4.Header.Seconds, DhcpSb->ActiveChild);\r
+    SetElapsedTime (&DhcpSb->LastPacket->Dhcp4.Header.Seconds, DhcpSb->ActiveChild);\r
   }\r
 \r
   //\r
   // Wrap it into a netbuf then send it.\r
   //\r
-  Frag.Bulk = (UINT8 *) &DhcpSb->LastPacket->Dhcp4.Header;\r
+  Frag.Bulk = (UINT8 *)&DhcpSb->LastPacket->Dhcp4.Header;\r
   Frag.Len  = DhcpSb->LastPacket->Length;\r
   Wrap      = NetbufFromExt (&Frag, 1, 0, 0, DhcpDummyExtFree, NULL);\r
 \r
@@ -1469,7 +1443,6 @@ DhcpRetransmit (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Each DHCP service has three timer. Two of them are count down timer.\r
   One for the packet retransmission. The other is to collect the offers.\r
@@ -1484,23 +1457,23 @@ DhcpRetransmit (
 VOID\r
 EFIAPI\r
 DhcpOnTimerTick (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  DHCP_SERVICE              *DhcpSb;\r
-  DHCP_PROTOCOL             *Instance;\r
-  EFI_STATUS                Status;\r
+  LIST_ENTRY     *Entry;\r
+  LIST_ENTRY     *Next;\r
+  DHCP_SERVICE   *DhcpSb;\r
+  DHCP_PROTOCOL  *Instance;\r
+  EFI_STATUS     Status;\r
 \r
-  DhcpSb   = (DHCP_SERVICE *) Context;\r
+  DhcpSb   = (DHCP_SERVICE *)Context;\r
   Instance = DhcpSb->ActiveChild;\r
 \r
   //\r
   // 0xffff is the maximum supported value for elapsed time according to RFC.\r
   //\r
-  if (Instance != NULL && Instance->ElaspedTime < 0xffff) {\r
+  if ((Instance != NULL) && (Instance->ElaspedTime < 0xffff)) {\r
     Instance->ElaspedTime++;\r
   }\r
 \r
@@ -1508,15 +1481,13 @@ DhcpOnTimerTick (
   // Check the retransmit timer\r
   //\r
   if ((DhcpSb->PacketToLive > 0) && (--DhcpSb->PacketToLive == 0)) {\r
-\r
     //\r
     // Select offer at each timeout if any offer received.\r
     //\r
-    if (DhcpSb->DhcpState == Dhcp4Selecting && DhcpSb->LastOffer != NULL) {\r
-\r
+    if ((DhcpSb->DhcpState == Dhcp4Selecting) && (DhcpSb->LastOffer != NULL)) {\r
       Status = DhcpChooseOffer (DhcpSb);\r
 \r
-      if (EFI_ERROR(Status)) {\r
+      if (EFI_ERROR (Status)) {\r
         if (DhcpSb->LastOffer != NULL) {\r
           FreePool (DhcpSb->LastOffer);\r
           DhcpSb->LastOffer = NULL;\r
@@ -1532,9 +1503,7 @@ DhcpOnTimerTick (
       //\r
       DhcpRetransmit (DhcpSb);\r
       DhcpSetTransmitTimer (DhcpSb);\r
-\r
     } else if (DHCP_CONNECTED (DhcpSb->DhcpState)) {\r
-\r
       //\r
       // Retransmission failed, if the DHCP request is initiated by\r
       // user, adjust the current state according to the lease life.\r
@@ -1545,16 +1514,12 @@ DhcpOnTimerTick (
 \r
         if (DhcpSb->LeaseLife < DhcpSb->T1) {\r
           Status = DhcpSetState (DhcpSb, Dhcp4Bound, FALSE);\r
-\r
         } else if (DhcpSb->LeaseLife < DhcpSb->T2) {\r
           Status = DhcpSetState (DhcpSb, Dhcp4Renewing, FALSE);\r
-\r
         } else if (DhcpSb->LeaseLife < DhcpSb->Lease) {\r
           Status = DhcpSetState (DhcpSb, Dhcp4Rebinding, FALSE);\r
-\r
         } else {\r
           goto END_SESSION;\r
-\r
         }\r
 \r
         DhcpSb->IoStatus = EFI_TIMEOUT;\r
@@ -1577,7 +1542,7 @@ DhcpOnTimerTick (
     // requesting extra renew/rebind. Adjust the state after that.\r
     //\r
     if (DhcpSb->ExtraRefresh != 0) {\r
-      return ;\r
+      return;\r
     }\r
 \r
     if (DhcpSb->LeaseLife == DhcpSb->Lease) {\r
@@ -1585,7 +1550,6 @@ DhcpOnTimerTick (
       // Lease expires, end the session\r
       //\r
       goto END_SESSION;\r
-\r
     } else if (DhcpSb->LeaseLife == DhcpSb->T2) {\r
       //\r
       // T2 expires, transit to rebinding then send a REQUEST to any server\r
@@ -1595,7 +1559,7 @@ DhcpOnTimerTick (
       }\r
 \r
       if (Instance != NULL) {\r
-        Instance->ElaspedTime= 0;\r
+        Instance->ElaspedTime = 0;\r
       }\r
 \r
       Status = DhcpSendMessage (\r
@@ -1609,7 +1573,6 @@ DhcpOnTimerTick (
       if (EFI_ERROR (Status)) {\r
         goto END_SESSION;\r
       }\r
-\r
     } else if (DhcpSb->LeaseLife == DhcpSb->T1) {\r
       //\r
       // T1 expires, transit to renewing, then send a REQUEST to the server\r
@@ -1619,7 +1582,7 @@ DhcpOnTimerTick (
       }\r
 \r
       if (Instance != NULL) {\r
-        Instance->ElaspedTime= 0;\r
+        Instance->ElaspedTime = 0;\r
       }\r
 \r
       Status = DhcpSendMessage (\r
@@ -1643,15 +1606,15 @@ ON_EXIT:
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &DhcpSb->Children) {\r
     Instance = NET_LIST_USER_STRUCT (Entry, DHCP_PROTOCOL, Link);\r
     Instance->Timeout--;\r
-    if (Instance->Timeout == 0 && Instance->Token != NULL) {\r
+    if ((Instance->Timeout == 0) && (Instance->Token != NULL)) {\r
       PxeDhcpDone (Instance);\r
     }\r
   }\r
 \r
-  return ;\r
+  return;\r
 \r
 END_SESSION:\r
   DhcpEndSession (DhcpSb, EFI_TIMEOUT);\r
 \r
-  return ;\r
+  return;\r
 }\r
index 0dd6b46b87d0caa094aba1317715dbfe8d8abb5e..6f7f8117fe9bca839a49b84921a982ec28187976 100644 (file)
@@ -18,37 +18,35 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 \r
-\r
-\r
-#define DHCP_WAIT_OFFER                    3  // Time to wait the offers\r
+#define DHCP_WAIT_OFFER     3                 // Time to wait the offers\r
 #define DHCP_DEFAULT_LEASE  7 * 24 * 60 * 60  // Seven days as default.\r
-#define DHCP_SERVER_PORT                  67\r
-#define DHCP_CLIENT_PORT                  68\r
+#define DHCP_SERVER_PORT    67\r
+#define DHCP_CLIENT_PORT    68\r
 \r
 //\r
 // BOOTP header "op" field\r
 //\r
-#define BOOTP_REQUEST           1\r
-#define BOOTP_REPLY             2\r
+#define BOOTP_REQUEST  1\r
+#define BOOTP_REPLY    2\r
 \r
 //\r
 // DHCP message types\r
 //\r
-#define DHCP_MSG_DISCOVER       1\r
-#define DHCP_MSG_OFFER          2\r
-#define DHCP_MSG_REQUEST        3\r
-#define DHCP_MSG_DECLINE        4\r
-#define DHCP_MSG_ACK            5\r
-#define DHCP_MSG_NAK            6\r
-#define DHCP_MSG_RELEASE        7\r
-#define DHCP_MSG_INFORM         8\r
+#define DHCP_MSG_DISCOVER  1\r
+#define DHCP_MSG_OFFER     2\r
+#define DHCP_MSG_REQUEST   3\r
+#define DHCP_MSG_DECLINE   4\r
+#define DHCP_MSG_ACK       5\r
+#define DHCP_MSG_NAK       6\r
+#define DHCP_MSG_RELEASE   7\r
+#define DHCP_MSG_INFORM    8\r
 \r
 //\r
 // DHCP notify user type\r
 //\r
-#define DHCP_NOTIFY_COMPLETION  1\r
-#define DHCP_NOTIFY_RENEWREBIND 2\r
-#define DHCP_NOTIFY_ALL         3\r
+#define DHCP_NOTIFY_COMPLETION   1\r
+#define DHCP_NOTIFY_RENEWREBIND  2\r
+#define DHCP_NOTIFY_ALL          3\r
 \r
 #define DHCP_IS_BOOTP(Parameter)  (((Parameter) == NULL) || ((Parameter)->DhcpType == 0))\r
 \r
@@ -72,9 +70,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 DhcpSetState (\r
-  IN OUT DHCP_SERVICE           *DhcpSb,\r
-  IN     INTN                   State,\r
-  IN     BOOLEAN                CallUser\r
+  IN OUT DHCP_SERVICE  *DhcpSb,\r
+  IN     INTN          State,\r
+  IN     BOOLEAN       CallUser\r
   );\r
 \r
 /**\r
@@ -98,11 +96,11 @@ DhcpSetState (
 **/\r
 EFI_STATUS\r
 DhcpSendMessage (\r
-  IN DHCP_SERVICE           *DhcpSb,\r
-  IN EFI_DHCP4_PACKET       *Seed,\r
-  IN DHCP_PARAMETER         *Para,\r
-  IN UINT8                  Type,\r
-  IN UINT8                  *Msg\r
+  IN DHCP_SERVICE      *DhcpSb,\r
+  IN EFI_DHCP4_PACKET  *Seed,\r
+  IN DHCP_PARAMETER    *Para,\r
+  IN UINT8             Type,\r
+  IN UINT8             *Msg\r
   );\r
 \r
 /**\r
@@ -119,8 +117,8 @@ DhcpSendMessage (
 VOID\r
 EFIAPI\r
 DhcpOnTimerTick (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -136,10 +134,10 @@ DhcpOnTimerTick (
 VOID\r
 EFIAPI\r
 DhcpInput (\r
-  NET_BUF                   *UdpPacket,\r
-  UDP_END_POINT             *EndPoint,\r
-  EFI_STATUS                IoStatus,\r
-  VOID                      *Context\r
+  NET_BUF        *UdpPacket,\r
+  UDP_END_POINT  *EndPoint,\r
+  EFI_STATUS     IoStatus,\r
+  VOID           *Context\r
   );\r
 \r
 /**\r
@@ -154,7 +152,7 @@ DhcpInput (
 **/\r
 EFI_STATUS\r
 DhcpInitRequest (\r
-  IN DHCP_SERVICE           *DhcpSb\r
+  IN DHCP_SERVICE  *DhcpSb\r
   );\r
 \r
 /**\r
@@ -165,7 +163,7 @@ DhcpInitRequest (
 **/\r
 VOID\r
 DhcpCleanLease (\r
-  IN DHCP_SERVICE           *DhcpSb\r
+  IN DHCP_SERVICE  *DhcpSb\r
   );\r
 \r
 /**\r
@@ -180,10 +178,10 @@ DhcpCleanLease (
 VOID\r
 EFIAPI\r
 DhcpOnPacketSent (\r
-  NET_BUF                   *Packet,\r
-  UDP_END_POINT             *EndPoint,\r
-  EFI_STATUS                IoStatus,\r
-  VOID                      *Context\r
+  NET_BUF        *Packet,\r
+  UDP_END_POINT  *EndPoint,\r
+  EFI_STATUS     IoStatus,\r
+  VOID           *Context\r
   );\r
 \r
 #endif\r
index 37a63022c55f6207f8f9a8525ed99f28efc090e5..5959eff17c53e03c8556c1bb64e3b204ee300a6b 100644 (file)
@@ -13,95 +13,94 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /// to validate a dhcp message. Refere the comments of the\r
 /// DHCP_OPTION_FORMAT structure.\r
 ///\r
-DHCP_OPTION_FORMAT DhcpOptionFormats[] = {\r
-  {DHCP4_TAG_NETMASK,        DHCP_OPTION_IP,     1, 1  , TRUE},\r
-  {DHCP4_TAG_TIME_OFFSET,    DHCP_OPTION_INT32,  1, 1  , FALSE},\r
-  {DHCP4_TAG_ROUTER,         DHCP_OPTION_IP,     1, -1 , TRUE},\r
-  {DHCP4_TAG_TIME_SERVER,    DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_NAME_SERVER,    DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_DNS_SERVER,     DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_LOG_SERVER,     DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_COOKIE_SERVER,  DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_LPR_SERVER,     DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_IMPRESS_SERVER, DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_RL_SERVER,      DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_HOSTNAME,       DHCP_OPTION_INT8,   1, -1 , FALSE},\r
-  {DHCP4_TAG_BOOTFILE_LEN,   DHCP_OPTION_INT16,  1, 1  , FALSE},\r
-  {DHCP4_TAG_DUMP,           DHCP_OPTION_INT8,   1, -1 , FALSE},\r
-  {DHCP4_TAG_DOMAINNAME,     DHCP_OPTION_INT8,   1, -1 , FALSE},\r
-  {DHCP4_TAG_SWAP_SERVER,    DHCP_OPTION_IP,     1, 1  , FALSE},\r
-  {DHCP4_TAG_ROOTPATH,       DHCP_OPTION_INT8,   1, -1 , FALSE},\r
-  {DHCP4_TAG_EXTEND_PATH,    DHCP_OPTION_INT8,   1, -1 , FALSE},\r
-\r
-  {DHCP4_TAG_IPFORWARD,      DHCP_OPTION_SWITCH, 1, 1  , FALSE},\r
-  {DHCP4_TAG_NONLOCAL_SRR,   DHCP_OPTION_SWITCH, 1, 1  , FALSE},\r
-  {DHCP4_TAG_POLICY_SRR,     DHCP_OPTION_IPPAIR, 1, -1 , FALSE},\r
-  {DHCP4_TAG_EMTU,           DHCP_OPTION_INT16,  1, 1  , FALSE},\r
-  {DHCP4_TAG_TTL,            DHCP_OPTION_INT8,   1, 1  , FALSE},\r
-  {DHCP4_TAG_PATHMTU_AGE,    DHCP_OPTION_INT32,  1, 1  , FALSE},\r
-  {DHCP4_TAG_PATHMTU_PLATEAU,DHCP_OPTION_INT16,  1, -1 , FALSE},\r
-\r
-  {DHCP4_TAG_IFMTU,          DHCP_OPTION_INT16,  1, 1  , FALSE},\r
-  {DHCP4_TAG_SUBNET_LOCAL,   DHCP_OPTION_SWITCH, 1, 1  , FALSE},\r
-  {DHCP4_TAG_BROADCAST,      DHCP_OPTION_IP,     1, 1  , FALSE},\r
-  {DHCP4_TAG_DISCOVER_MASK,  DHCP_OPTION_SWITCH, 1, 1  , FALSE},\r
-  {DHCP4_TAG_SUPPLY_MASK,    DHCP_OPTION_SWITCH, 1, 1  , FALSE},\r
-  {DHCP4_TAG_DISCOVER_ROUTE, DHCP_OPTION_SWITCH, 1, 1  , FALSE},\r
-  {DHCP4_TAG_ROUTER_SOLICIT, DHCP_OPTION_IP,     1, 1  , FALSE},\r
-  {DHCP4_TAG_STATIC_ROUTE,   DHCP_OPTION_IPPAIR, 1, -1 , FALSE},\r
-\r
-  {DHCP4_TAG_TRAILER,        DHCP_OPTION_SWITCH, 1, 1  , FALSE},\r
-  {DHCP4_TAG_ARPAGE,         DHCP_OPTION_INT32,  1, 1  , FALSE},\r
-  {DHCP4_TAG_ETHER_ENCAP,    DHCP_OPTION_SWITCH, 1, 1  , FALSE},\r
-\r
-  {DHCP4_TAG_TCP_TTL,        DHCP_OPTION_INT8,   1, 1  , FALSE},\r
-  {DHCP4_TAG_KEEP_INTERVAL,  DHCP_OPTION_INT32,  1, 1  , FALSE},\r
-  {DHCP4_TAG_KEEP_GARBAGE,   DHCP_OPTION_SWITCH, 1, 1  , FALSE},\r
-\r
-  {DHCP4_TAG_NIS_DOMAIN,     DHCP_OPTION_INT8,   1, -1 , FALSE},\r
-  {DHCP4_TAG_NIS_SERVER,     DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_NTP_SERVER,     DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_VENDOR,         DHCP_OPTION_INT8,   1, -1 , FALSE},\r
-  {DHCP4_TAG_NBNS,           DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_NBDD,           DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_NBTYPE,         DHCP_OPTION_INT8,   1, 1  , FALSE},\r
-  {DHCP4_TAG_NBSCOPE,        DHCP_OPTION_INT8,   1, -1 , FALSE},\r
-  {DHCP4_TAG_XFONT,          DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_XDM,            DHCP_OPTION_IP,     1, -1 , FALSE},\r
-\r
-  {DHCP4_TAG_REQUEST_IP,     DHCP_OPTION_IP,     1, 1  , FALSE},\r
-  {DHCP4_TAG_LEASE,          DHCP_OPTION_INT32,  1, 1  , TRUE},\r
-  {DHCP4_TAG_OVERLOAD,       DHCP_OPTION_INT8,   1, 1  , TRUE},\r
-  {DHCP4_TAG_MSG_TYPE,       DHCP_OPTION_INT8,   1, 1  , TRUE},\r
-  {DHCP4_TAG_SERVER_ID,      DHCP_OPTION_IP,     1, 1  , TRUE},\r
-  {DHCP4_TAG_PARA_LIST,      DHCP_OPTION_INT8,   1, -1 , FALSE},\r
-  {DHCP4_TAG_MESSAGE,        DHCP_OPTION_INT8,   1, -1 , FALSE},\r
-  {DHCP4_TAG_MAXMSG,         DHCP_OPTION_INT16,  1, 1  , FALSE},\r
-  {DHCP4_TAG_T1,             DHCP_OPTION_INT32,  1, 1  , TRUE},\r
-  {DHCP4_TAG_T2,             DHCP_OPTION_INT32,  1, 1  , TRUE},\r
-  {DHCP4_TAG_VENDOR_CLASS_ID,DHCP_OPTION_INT8,   1, -1 , FALSE},\r
-  {DHCP4_TAG_CLIENT_ID,      DHCP_OPTION_INT8,   2, -1 , FALSE},\r
-\r
-  {DHCP4_TAG_NISPLUS,        DHCP_OPTION_INT8,   1, -1 , FALSE},\r
-  {DHCP4_TAG_NISPLUS_SERVER, DHCP_OPTION_IP,     1, -1 , FALSE},\r
-\r
-  {DHCP4_TAG_TFTP,           DHCP_OPTION_INT8,   1, -1 , FALSE},\r
-  {DHCP4_TAG_BOOTFILE,       DHCP_OPTION_INT8,   1, -1 , FALSE},\r
-\r
-  {DHCP4_TAG_MOBILEIP,       DHCP_OPTION_IP,     0, -1 , FALSE},\r
-  {DHCP4_TAG_SMTP,           DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_POP3,           DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_NNTP,           DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_WWW,            DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_FINGER,         DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_IRC,            DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_STTALK,         DHCP_OPTION_IP,     1, -1 , FALSE},\r
-  {DHCP4_TAG_STDA,           DHCP_OPTION_IP,     1, -1 , FALSE},\r
-\r
-  {DHCP4_TAG_CLASSLESS_ROUTE,DHCP_OPTION_INT8,   5, -1 , FALSE},\r
+DHCP_OPTION_FORMAT  DhcpOptionFormats[] = {\r
+  { DHCP4_TAG_NETMASK,         DHCP_OPTION_IP,     1, 1,  TRUE  },\r
+  { DHCP4_TAG_TIME_OFFSET,     DHCP_OPTION_INT32,  1, 1,  FALSE },\r
+  { DHCP4_TAG_ROUTER,          DHCP_OPTION_IP,     1, -1, TRUE  },\r
+  { DHCP4_TAG_TIME_SERVER,     DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_NAME_SERVER,     DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_DNS_SERVER,      DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_LOG_SERVER,      DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_COOKIE_SERVER,   DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_LPR_SERVER,      DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_IMPRESS_SERVER,  DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_RL_SERVER,       DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_HOSTNAME,        DHCP_OPTION_INT8,   1, -1, FALSE },\r
+  { DHCP4_TAG_BOOTFILE_LEN,    DHCP_OPTION_INT16,  1, 1,  FALSE },\r
+  { DHCP4_TAG_DUMP,            DHCP_OPTION_INT8,   1, -1, FALSE },\r
+  { DHCP4_TAG_DOMAINNAME,      DHCP_OPTION_INT8,   1, -1, FALSE },\r
+  { DHCP4_TAG_SWAP_SERVER,     DHCP_OPTION_IP,     1, 1,  FALSE },\r
+  { DHCP4_TAG_ROOTPATH,        DHCP_OPTION_INT8,   1, -1, FALSE },\r
+  { DHCP4_TAG_EXTEND_PATH,     DHCP_OPTION_INT8,   1, -1, FALSE },\r
+\r
+  { DHCP4_TAG_IPFORWARD,       DHCP_OPTION_SWITCH, 1, 1,  FALSE },\r
+  { DHCP4_TAG_NONLOCAL_SRR,    DHCP_OPTION_SWITCH, 1, 1,  FALSE },\r
+  { DHCP4_TAG_POLICY_SRR,      DHCP_OPTION_IPPAIR, 1, -1, FALSE },\r
+  { DHCP4_TAG_EMTU,            DHCP_OPTION_INT16,  1, 1,  FALSE },\r
+  { DHCP4_TAG_TTL,             DHCP_OPTION_INT8,   1, 1,  FALSE },\r
+  { DHCP4_TAG_PATHMTU_AGE,     DHCP_OPTION_INT32,  1, 1,  FALSE },\r
+  { DHCP4_TAG_PATHMTU_PLATEAU, DHCP_OPTION_INT16,  1, -1, FALSE },\r
+\r
+  { DHCP4_TAG_IFMTU,           DHCP_OPTION_INT16,  1, 1,  FALSE },\r
+  { DHCP4_TAG_SUBNET_LOCAL,    DHCP_OPTION_SWITCH, 1, 1,  FALSE },\r
+  { DHCP4_TAG_BROADCAST,       DHCP_OPTION_IP,     1, 1,  FALSE },\r
+  { DHCP4_TAG_DISCOVER_MASK,   DHCP_OPTION_SWITCH, 1, 1,  FALSE },\r
+  { DHCP4_TAG_SUPPLY_MASK,     DHCP_OPTION_SWITCH, 1, 1,  FALSE },\r
+  { DHCP4_TAG_DISCOVER_ROUTE,  DHCP_OPTION_SWITCH, 1, 1,  FALSE },\r
+  { DHCP4_TAG_ROUTER_SOLICIT,  DHCP_OPTION_IP,     1, 1,  FALSE },\r
+  { DHCP4_TAG_STATIC_ROUTE,    DHCP_OPTION_IPPAIR, 1, -1, FALSE },\r
+\r
+  { DHCP4_TAG_TRAILER,         DHCP_OPTION_SWITCH, 1, 1,  FALSE },\r
+  { DHCP4_TAG_ARPAGE,          DHCP_OPTION_INT32,  1, 1,  FALSE },\r
+  { DHCP4_TAG_ETHER_ENCAP,     DHCP_OPTION_SWITCH, 1, 1,  FALSE },\r
+\r
+  { DHCP4_TAG_TCP_TTL,         DHCP_OPTION_INT8,   1, 1,  FALSE },\r
+  { DHCP4_TAG_KEEP_INTERVAL,   DHCP_OPTION_INT32,  1, 1,  FALSE },\r
+  { DHCP4_TAG_KEEP_GARBAGE,    DHCP_OPTION_SWITCH, 1, 1,  FALSE },\r
+\r
+  { DHCP4_TAG_NIS_DOMAIN,      DHCP_OPTION_INT8,   1, -1, FALSE },\r
+  { DHCP4_TAG_NIS_SERVER,      DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_NTP_SERVER,      DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_VENDOR,          DHCP_OPTION_INT8,   1, -1, FALSE },\r
+  { DHCP4_TAG_NBNS,            DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_NBDD,            DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_NBTYPE,          DHCP_OPTION_INT8,   1, 1,  FALSE },\r
+  { DHCP4_TAG_NBSCOPE,         DHCP_OPTION_INT8,   1, -1, FALSE },\r
+  { DHCP4_TAG_XFONT,           DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_XDM,             DHCP_OPTION_IP,     1, -1, FALSE },\r
+\r
+  { DHCP4_TAG_REQUEST_IP,      DHCP_OPTION_IP,     1, 1,  FALSE },\r
+  { DHCP4_TAG_LEASE,           DHCP_OPTION_INT32,  1, 1,  TRUE  },\r
+  { DHCP4_TAG_OVERLOAD,        DHCP_OPTION_INT8,   1, 1,  TRUE  },\r
+  { DHCP4_TAG_MSG_TYPE,        DHCP_OPTION_INT8,   1, 1,  TRUE  },\r
+  { DHCP4_TAG_SERVER_ID,       DHCP_OPTION_IP,     1, 1,  TRUE  },\r
+  { DHCP4_TAG_PARA_LIST,       DHCP_OPTION_INT8,   1, -1, FALSE },\r
+  { DHCP4_TAG_MESSAGE,         DHCP_OPTION_INT8,   1, -1, FALSE },\r
+  { DHCP4_TAG_MAXMSG,          DHCP_OPTION_INT16,  1, 1,  FALSE },\r
+  { DHCP4_TAG_T1,              DHCP_OPTION_INT32,  1, 1,  TRUE  },\r
+  { DHCP4_TAG_T2,              DHCP_OPTION_INT32,  1, 1,  TRUE  },\r
+  { DHCP4_TAG_VENDOR_CLASS_ID, DHCP_OPTION_INT8,   1, -1, FALSE },\r
+  { DHCP4_TAG_CLIENT_ID,       DHCP_OPTION_INT8,   2, -1, FALSE },\r
+\r
+  { DHCP4_TAG_NISPLUS,         DHCP_OPTION_INT8,   1, -1, FALSE },\r
+  { DHCP4_TAG_NISPLUS_SERVER,  DHCP_OPTION_IP,     1, -1, FALSE },\r
+\r
+  { DHCP4_TAG_TFTP,            DHCP_OPTION_INT8,   1, -1, FALSE },\r
+  { DHCP4_TAG_BOOTFILE,        DHCP_OPTION_INT8,   1, -1, FALSE },\r
+\r
+  { DHCP4_TAG_MOBILEIP,        DHCP_OPTION_IP,     0, -1, FALSE },\r
+  { DHCP4_TAG_SMTP,            DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_POP3,            DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_NNTP,            DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_WWW,             DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_FINGER,          DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_IRC,             DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_STTALK,          DHCP_OPTION_IP,     1, -1, FALSE },\r
+  { DHCP4_TAG_STDA,            DHCP_OPTION_IP,     1, -1, FALSE },\r
+\r
+  { DHCP4_TAG_CLASSLESS_ROUTE, DHCP_OPTION_INT8,   5, -1, FALSE },\r
 };\r
 \r
-\r
 /**\r
   Binary search the DhcpOptionFormats array to find the format\r
   information about a specific option.\r
@@ -113,12 +112,12 @@ DHCP_OPTION_FORMAT DhcpOptionFormats[] = {
 **/\r
 DHCP_OPTION_FORMAT *\r
 DhcpFindOptionFormat (\r
-  IN UINT8                  Tag\r
+  IN UINT8  Tag\r
   )\r
 {\r
-  INTN                      Left;\r
-  INTN                      Right;\r
-  INTN                      Middle;\r
+  INTN  Left;\r
+  INTN  Right;\r
+  INTN  Middle;\r
 \r
   Left  = 0;\r
   Right = sizeof (DhcpOptionFormats) / sizeof (DHCP_OPTION_FORMAT) - 1;\r
@@ -133,14 +132,13 @@ DhcpFindOptionFormat (
     if (Tag < DhcpOptionFormats[Middle].Tag) {\r
       Right = Middle - 1;\r
     } else {\r
-      Left  = Middle + 1;\r
+      Left = Middle + 1;\r
     }\r
   }\r
 \r
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Validate whether a single DHCP option is valid according to its format.\r
 \r
@@ -154,35 +152,35 @@ DhcpFindOptionFormat (
 **/\r
 BOOLEAN\r
 DhcpOptionIsValid (\r
-  IN DHCP_OPTION_FORMAT     *Format,\r
-  IN UINT8                  *OptValue,\r
-  IN INTN                   Len\r
+  IN DHCP_OPTION_FORMAT  *Format,\r
+  IN UINT8               *OptValue,\r
+  IN INTN                Len\r
   )\r
 {\r
-  INTN                      Unit;\r
-  INTN                      Occur;\r
-  INTN                      Index;\r
+  INTN  Unit;\r
+  INTN  Occur;\r
+  INTN  Index;\r
 \r
   Unit = 0;\r
 \r
   switch (Format->Type) {\r
-  case DHCP_OPTION_SWITCH:\r
-  case DHCP_OPTION_INT8:\r
-    Unit = 1;\r
-    break;\r
+    case DHCP_OPTION_SWITCH:\r
+    case DHCP_OPTION_INT8:\r
+      Unit = 1;\r
+      break;\r
 \r
-  case DHCP_OPTION_INT16:\r
-    Unit = 2;\r
-    break;\r
+    case DHCP_OPTION_INT16:\r
+      Unit = 2;\r
+      break;\r
 \r
-  case DHCP_OPTION_INT32:\r
-  case DHCP_OPTION_IP:\r
-    Unit = 4;\r
-    break;\r
+    case DHCP_OPTION_INT32:\r
+    case DHCP_OPTION_IP:\r
+      Unit = 4;\r
+      break;\r
 \r
-  case DHCP_OPTION_IPPAIR:\r
-    Unit = 8;\r
-    break;\r
+    case DHCP_OPTION_IPPAIR:\r
+      Unit = 8;\r
+      break;\r
   }\r
 \r
   ASSERT (Unit != 0);\r
@@ -201,7 +199,8 @@ DhcpOptionIsValid (
 \r
   if (((Format->MinOccur != -1) && (Occur < Format->MinOccur)) ||\r
       ((Format->MaxOccur != -1) && (Occur > Format->MaxOccur))\r
-      ) {\r
+      )\r
+  {\r
     return FALSE;\r
   }\r
 \r
@@ -219,7 +218,6 @@ DhcpOptionIsValid (
   return TRUE;\r
 }\r
 \r
-\r
 /**\r
   Extract the client interested options, all the parameters are\r
   converted to host byte order.\r
@@ -235,61 +233,62 @@ DhcpOptionIsValid (
 **/\r
 EFI_STATUS\r
 DhcpGetParameter (\r
-  IN  UINT8                  Tag,\r
-  IN  INTN                   Len,\r
-  IN  UINT8                  *Data,\r
-  OUT DHCP_PARAMETER         *Para\r
+  IN  UINT8           Tag,\r
+  IN  INTN            Len,\r
+  IN  UINT8           *Data,\r
+  OUT DHCP_PARAMETER  *Para\r
   )\r
 {\r
   switch (Tag) {\r
-  case DHCP4_TAG_NETMASK:\r
-    Para->NetMask = NetGetUint32 (Data);\r
-    break;\r
+    case DHCP4_TAG_NETMASK:\r
+      Para->NetMask = NetGetUint32 (Data);\r
+      break;\r
 \r
-  case DHCP4_TAG_ROUTER:\r
-    //\r
-    // Return the first router to consumer which is the preferred one\r
-    //\r
-    Para->Router = NetGetUint32 (Data);\r
-    break;\r
+    case DHCP4_TAG_ROUTER:\r
+      //\r
+      // Return the first router to consumer which is the preferred one\r
+      //\r
+      Para->Router = NetGetUint32 (Data);\r
+      break;\r
 \r
-  case DHCP4_TAG_LEASE:\r
-    Para->Lease = NetGetUint32 (Data);\r
-    break;\r
+    case DHCP4_TAG_LEASE:\r
+      Para->Lease = NetGetUint32 (Data);\r
+      break;\r
 \r
-  case DHCP4_TAG_OVERLOAD:\r
-    Para->Overload = *Data;\r
+    case DHCP4_TAG_OVERLOAD:\r
+      Para->Overload = *Data;\r
 \r
-    if ((Para->Overload < 1) || (Para->Overload > 3)) {\r
-      return EFI_INVALID_PARAMETER;\r
-    }\r
-    break;\r
+      if ((Para->Overload < 1) || (Para->Overload > 3)) {\r
+        return EFI_INVALID_PARAMETER;\r
+      }\r
 \r
-  case DHCP4_TAG_MSG_TYPE:\r
-    Para->DhcpType = *Data;\r
+      break;\r
 \r
-    if ((Para->DhcpType < 1) || (Para->DhcpType > 9)) {\r
-      return EFI_INVALID_PARAMETER;\r
-    }\r
-    break;\r
+    case DHCP4_TAG_MSG_TYPE:\r
+      Para->DhcpType = *Data;\r
+\r
+      if ((Para->DhcpType < 1) || (Para->DhcpType > 9)) {\r
+        return EFI_INVALID_PARAMETER;\r
+      }\r
 \r
-  case DHCP4_TAG_SERVER_ID:\r
-    Para->ServerId = NetGetUint32 (Data);\r
-    break;\r
+      break;\r
 \r
-  case DHCP4_TAG_T1:\r
-    Para->T1 = NetGetUint32 (Data);\r
-    break;\r
+    case DHCP4_TAG_SERVER_ID:\r
+      Para->ServerId = NetGetUint32 (Data);\r
+      break;\r
 \r
-  case DHCP4_TAG_T2:\r
-    Para->T2 = NetGetUint32 (Data);\r
-    break;\r
+    case DHCP4_TAG_T1:\r
+      Para->T1 = NetGetUint32 (Data);\r
+      break;\r
+\r
+    case DHCP4_TAG_T2:\r
+      Para->T2 = NetGetUint32 (Data);\r
+      break;\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Inspect all the options in a single buffer. DHCP options may be contained\r
   in several buffers, such as the BOOTP options filed, boot file or server\r
@@ -308,16 +307,16 @@ DhcpGetParameter (
 **/\r
 EFI_STATUS\r
 DhcpIterateBufferOptions (\r
-  IN  UINT8                 *Buffer,\r
-  IN  INTN                  BufLen,\r
-  IN  DHCP_CHECK_OPTION     Check             OPTIONAL,\r
-  IN  VOID                  *Context,\r
-  OUT UINT8                 *Overload         OPTIONAL\r
+  IN  UINT8              *Buffer,\r
+  IN  INTN               BufLen,\r
+  IN  DHCP_CHECK_OPTION  Check             OPTIONAL,\r
+  IN  VOID               *Context,\r
+  OUT UINT8              *Overload         OPTIONAL\r
   )\r
 {\r
-  INTN                      Cur;\r
-  UINT8                     Tag;\r
-  UINT8                     Len;\r
+  INTN   Cur;\r
+  UINT8  Tag;\r
+  UINT8  Len;\r
 \r
   Cur = 0;\r
 \r
@@ -364,7 +363,6 @@ DhcpIterateBufferOptions (
   return EFI_INVALID_PARAMETER;\r
 }\r
 \r
-\r
 /**\r
   Iterate through a DHCP message to visit each option. First inspect\r
   all the options in the OPTION field. Then if overloaded, inspect\r
@@ -382,23 +380,23 @@ DhcpIterateBufferOptions (
 **/\r
 EFI_STATUS\r
 DhcpIterateOptions (\r
-  IN  EFI_DHCP4_PACKET      *Packet,\r
-  IN  DHCP_CHECK_OPTION     Check         OPTIONAL,\r
-  IN  VOID                  *Context\r
+  IN  EFI_DHCP4_PACKET   *Packet,\r
+  IN  DHCP_CHECK_OPTION  Check         OPTIONAL,\r
+  IN  VOID               *Context\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  UINT8                     Overload;\r
+  EFI_STATUS  Status;\r
+  UINT8       Overload;\r
 \r
   Overload = 0;\r
 \r
-  Status   = DhcpIterateBufferOptions (\r
-               Packet->Dhcp4.Option,\r
-               Packet->Length - sizeof (EFI_DHCP4_HEADER) - sizeof (UINT32),\r
-               Check,\r
-               Context,\r
-               &Overload\r
-               );\r
+  Status = DhcpIterateBufferOptions (\r
+             Packet->Dhcp4.Option,\r
+             Packet->Length - sizeof (EFI_DHCP4_HEADER) - sizeof (UINT32),\r
+             Check,\r
+             Context,\r
+             &Overload\r
+             );\r
 \r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -406,7 +404,7 @@ DhcpIterateOptions (
 \r
   if ((Overload == DHCP_OVERLOAD_FILENAME) || (Overload == DHCP_OVERLOAD_BOTH)) {\r
     Status = DhcpIterateBufferOptions (\r
-               (UINT8 *) Packet->Dhcp4.Header.BootFileName,\r
+               (UINT8 *)Packet->Dhcp4.Header.BootFileName,\r
                128,\r
                Check,\r
                Context,\r
@@ -420,7 +418,7 @@ DhcpIterateOptions (
 \r
   if ((Overload == DHCP_OVERLOAD_SVRNAME) || (Overload == DHCP_OVERLOAD_BOTH)) {\r
     Status = DhcpIterateBufferOptions (\r
-               (UINT8 *) Packet->Dhcp4.Header.ServerName,\r
+               (UINT8 *)Packet->Dhcp4.Header.ServerName,\r
                64,\r
                Check,\r
                Context,\r
@@ -435,7 +433,6 @@ DhcpIterateOptions (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Call back function to DhcpIterateOptions to compute each option's\r
   length. It just adds the data length of all the occurrences of this\r
@@ -452,21 +449,20 @@ DhcpIterateOptions (
 **/\r
 EFI_STATUS\r
 DhcpGetOptionLen (\r
-  IN UINT8                  Tag,\r
-  IN UINT8                  Len,\r
-  IN UINT8                  *Data,\r
-  IN VOID                   *Context\r
+  IN UINT8  Tag,\r
+  IN UINT8  Len,\r
+  IN UINT8  *Data,\r
+  IN VOID   *Context\r
   )\r
 {\r
-  DHCP_OPTION_COUNT         *OpCount;\r
+  DHCP_OPTION_COUNT  *OpCount;\r
 \r
-  OpCount             = (DHCP_OPTION_COUNT *) Context;\r
-  OpCount[Tag].Offset = (UINT16) (OpCount[Tag].Offset + Len);\r
+  OpCount             = (DHCP_OPTION_COUNT *)Context;\r
+  OpCount[Tag].Offset = (UINT16)(OpCount[Tag].Offset + Len);\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Call back function to DhcpIterateOptions to consolidate each option's\r
   data. There are maybe several occurrence of the same option.\r
@@ -482,24 +478,24 @@ DhcpGetOptionLen (
 **/\r
 EFI_STATUS\r
 DhcpFillOption (\r
-  IN UINT8                  Tag,\r
-  IN UINT8                  Len,\r
-  IN UINT8                  *Data,\r
-  IN VOID                   *Context\r
+  IN UINT8  Tag,\r
+  IN UINT8  Len,\r
+  IN UINT8  *Data,\r
+  IN VOID   *Context\r
   )\r
 {\r
-  DHCP_OPTION_CONTEXT       *OptContext;\r
-  DHCP_OPTION_COUNT         *OptCount;\r
-  DHCP_OPTION               *Options;\r
-  UINT8                     *Buf;\r
-  UINT8                     Index;\r
+  DHCP_OPTION_CONTEXT  *OptContext;\r
+  DHCP_OPTION_COUNT    *OptCount;\r
+  DHCP_OPTION          *Options;\r
+  UINT8                *Buf;\r
+  UINT8                Index;\r
 \r
-  OptContext  = (DHCP_OPTION_CONTEXT *) Context;\r
+  OptContext = (DHCP_OPTION_CONTEXT *)Context;\r
 \r
-  OptCount    = OptContext->OpCount;\r
-  Index       = OptCount[Tag].Index;\r
-  Options     = OptContext->Options;\r
-  Buf         = OptContext->Buf;\r
+  OptCount = OptContext->OpCount;\r
+  Index    = OptCount[Tag].Index;\r
+  Options  = OptContext->Options;\r
+  Buf      = OptContext->Buf;\r
 \r
   if (Options[Index].Data == NULL) {\r
     Options[Index].Tag  = Tag;\r
@@ -508,12 +504,11 @@ DhcpFillOption (
 \r
   CopyMem (Buf + OptCount[Tag].Offset, Data, Len);\r
 \r
-  OptCount[Tag].Offset  = (UINT16) (OptCount[Tag].Offset + Len);\r
-  Options[Index].Len    = (UINT16) (Options[Index].Len + Len);\r
+  OptCount[Tag].Offset = (UINT16)(OptCount[Tag].Offset + Len);\r
+  Options[Index].Len   = (UINT16)(Options[Index].Len + Len);\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Parse the options of a DHCP packet. It supports RFC 3396: Encoding\r
   Long Options in DHCP. That is, it will combine all the option value\r
@@ -544,18 +539,18 @@ DhcpFillOption (
 **/\r
 EFI_STATUS\r
 DhcpParseOption (\r
-  IN  EFI_DHCP4_PACKET      *Packet,\r
-  OUT INTN                  *Count,\r
-  OUT DHCP_OPTION           **OptionPoint\r
+  IN  EFI_DHCP4_PACKET  *Packet,\r
+  OUT INTN              *Count,\r
+  OUT DHCP_OPTION       **OptionPoint\r
   )\r
 {\r
-  DHCP_OPTION_CONTEXT       Context;\r
-  DHCP_OPTION               *Options;\r
-  DHCP_OPTION_COUNT         *OptCount;\r
-  EFI_STATUS                Status;\r
-  UINT16                    TotalLen;\r
-  INTN                      OptNum;\r
-  INTN                      Index;\r
+  DHCP_OPTION_CONTEXT  Context;\r
+  DHCP_OPTION          *Options;\r
+  DHCP_OPTION_COUNT    *OptCount;\r
+  EFI_STATUS           Status;\r
+  UINT16               TotalLen;\r
+  INTN                 OptNum;\r
+  INTN                 Index;\r
 \r
   ASSERT ((Count != NULL) && (OptionPoint != NULL));\r
 \r
@@ -580,22 +575,22 @@ DhcpParseOption (
   // OptCount[Index].Offset specifies the offset into the continuous\r
   // option value buffer to put the data.\r
   //\r
-  TotalLen  = 0;\r
-  OptNum    = 0;\r
+  TotalLen = 0;\r
+  OptNum   = 0;\r
 \r
   for (Index = 0; Index < DHCP_MAX_OPTIONS; Index++) {\r
     if (OptCount[Index].Offset != 0) {\r
-      OptCount[Index].Index   = (UINT8) OptNum;\r
+      OptCount[Index].Index = (UINT8)OptNum;\r
 \r
-      TotalLen                = (UINT16) (TotalLen + OptCount[Index].Offset);\r
-      OptCount[Index].Offset  = (UINT16) (TotalLen - OptCount[Index].Offset);\r
+      TotalLen               = (UINT16)(TotalLen + OptCount[Index].Offset);\r
+      OptCount[Index].Offset = (UINT16)(TotalLen - OptCount[Index].Offset);\r
 \r
       OptNum++;\r
     }\r
   }\r
 \r
-  *Count        = OptNum;\r
-  *OptionPoint  = NULL;\r
+  *Count       = OptNum;\r
+  *OptionPoint = NULL;\r
 \r
   if (OptNum == 0) {\r
     goto ON_EXIT;\r
@@ -605,7 +600,7 @@ DhcpParseOption (
   // Allocate a buffer to hold the DHCP options, and after that, a\r
   // continuous buffer to put all the options' data.\r
   //\r
-  Options = AllocateZeroPool ((UINTN) (OptNum * sizeof (DHCP_OPTION)) + TotalLen);\r
+  Options = AllocateZeroPool ((UINTN)(OptNum * sizeof (DHCP_OPTION)) + TotalLen);\r
 \r
   if (Options == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
@@ -614,9 +609,9 @@ DhcpParseOption (
 \r
   Context.OpCount = OptCount;\r
   Context.Options = Options;\r
-  Context.Buf     = (UINT8 *) (Options + OptNum);\r
+  Context.Buf     = (UINT8 *)(Options + OptNum);\r
 \r
-  Status          = DhcpIterateOptions (Packet, DhcpFillOption, &Context);\r
+  Status = DhcpIterateOptions (Packet, DhcpFillOption, &Context);\r
 \r
   if (EFI_ERROR (Status)) {\r
     FreePool (Options);\r
@@ -630,7 +625,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Validate the packet's options. If necessary, allocate\r
   and fill in the interested parameters.\r
@@ -645,18 +639,18 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 DhcpValidateOptions (\r
-  IN  EFI_DHCP4_PACKET      *Packet,\r
-  OUT DHCP_PARAMETER        **Para       OPTIONAL\r
+  IN  EFI_DHCP4_PACKET  *Packet,\r
+  OUT DHCP_PARAMETER    **Para       OPTIONAL\r
   )\r
 {\r
-  DHCP_PARAMETER            Parameter;\r
-  DHCP_OPTION_FORMAT        *Format;\r
-  DHCP_OPTION               *AllOption;\r
-  DHCP_OPTION               *Option;\r
-  EFI_STATUS                Status;\r
-  BOOLEAN                   Updated;\r
-  INTN                      Count;\r
-  INTN                      Index;\r
+  DHCP_PARAMETER      Parameter;\r
+  DHCP_OPTION_FORMAT  *Format;\r
+  DHCP_OPTION         *AllOption;\r
+  DHCP_OPTION         *Option;\r
+  EFI_STATUS          Status;\r
+  BOOLEAN             Updated;\r
+  INTN                Count;\r
+  INTN                Index;\r
 \r
   if (Para != NULL) {\r
     *Para = NULL;\r
@@ -668,6 +662,7 @@ DhcpValidateOptions (
   if (EFI_ERROR (Status) || (Count == 0)) {\r
     return Status;\r
   }\r
+\r
   ASSERT (AllOption != NULL);\r
 \r
   Updated = FALSE;\r
@@ -716,8 +711,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
-\r
 /**\r
   Append an option to the memory, if the option is longer than\r
   255 bytes, splits it into several options.\r
@@ -732,31 +725,30 @@ ON_EXIT:
 **/\r
 UINT8 *\r
 DhcpAppendOption (\r
-  OUT UINT8                  *Buf,\r
-  IN  UINT8                  Tag,\r
-  IN  UINT16                 DataLen,\r
-  IN  UINT8                  *Data\r
+  OUT UINT8   *Buf,\r
+  IN  UINT8   Tag,\r
+  IN  UINT16  DataLen,\r
+  IN  UINT8   *Data\r
   )\r
 {\r
-  INTN                      Index;\r
-  INTN                      Len;\r
+  INTN  Index;\r
+  INTN  Len;\r
 \r
   ASSERT (DataLen != 0);\r
 \r
   for (Index = 0; Index < (DataLen + 254) / 255; Index++) {\r
-    Len      = MIN (255, DataLen - Index * 255);\r
+    Len = MIN (255, DataLen - Index * 255);\r
 \r
     *(Buf++) = Tag;\r
-    *(Buf++) = (UINT8) Len;\r
-    CopyMem (Buf, Data + Index * 255, (UINTN) Len);\r
+    *(Buf++) = (UINT8)Len;\r
+    CopyMem (Buf, Data + Index * 255, (UINTN)Len);\r
 \r
-    Buf     += Len;\r
+    Buf += Len;\r
   }\r
 \r
   return Buf;\r
 }\r
 \r
-\r
 /**\r
   Build a new DHCP packet from a seed packet. Options may be deleted or\r
   appended. The caller should free the NewPacket when finished using it.\r
@@ -776,22 +768,22 @@ DhcpAppendOption (
 **/\r
 EFI_STATUS\r
 DhcpBuild (\r
-  IN  EFI_DHCP4_PACKET        *SeedPacket,\r
-  IN  UINT32                  DeleteCount,\r
-  IN  UINT8                   *DeleteList     OPTIONAL,\r
-  IN  UINT32                  AppendCount,\r
-  IN  EFI_DHCP4_PACKET_OPTION *AppendList[]   OPTIONAL,\r
-  OUT EFI_DHCP4_PACKET        **NewPacket\r
+  IN  EFI_DHCP4_PACKET         *SeedPacket,\r
+  IN  UINT32                   DeleteCount,\r
+  IN  UINT8                    *DeleteList     OPTIONAL,\r
+  IN  UINT32                   AppendCount,\r
+  IN  EFI_DHCP4_PACKET_OPTION  *AppendList[]   OPTIONAL,\r
+  OUT EFI_DHCP4_PACKET         **NewPacket\r
   )\r
 {\r
-  DHCP_OPTION               *Mark;\r
-  DHCP_OPTION               *SeedOptions;\r
-  EFI_DHCP4_PACKET          *Packet;\r
-  EFI_STATUS                Status;\r
-  INTN                      Count;\r
-  UINT32                    Index;\r
-  UINT32                    Len;\r
-  UINT8                     *Buf;\r
+  DHCP_OPTION       *Mark;\r
+  DHCP_OPTION       *SeedOptions;\r
+  EFI_DHCP4_PACKET  *Packet;\r
+  EFI_STATUS        Status;\r
+  INTN              Count;\r
+  UINT32            Index;\r
+  UINT32            Len;\r
+  UINT8             *Buf;\r
 \r
   //\r
   // Use an array of DHCP_OPTION to mark the existence\r
@@ -804,7 +796,7 @@ DhcpBuild (
   }\r
 \r
   for (Index = 0; Index < DHCP_MAX_OPTIONS; Index++) {\r
-    Mark[Index].Tag = (UINT8) Index;\r
+    Mark[Index].Tag = (UINT8)Index;\r
     Mark[Index].Len = 0;\r
   }\r
 \r
@@ -820,7 +812,7 @@ DhcpBuild (
   }\r
 \r
   if (SeedOptions != NULL) {\r
-    for (Index = 0; Index < (UINT32) Count; Index++) {\r
+    for (Index = 0; Index < (UINT32)Count; Index++) {\r
       Mark[SeedOptions[Index].Tag] = SeedOptions[Index];\r
     }\r
   }\r
@@ -854,18 +846,18 @@ DhcpBuild (
     }\r
   }\r
 \r
-  Status  = EFI_OUT_OF_RESOURCES;\r
-  Packet  = (EFI_DHCP4_PACKET *) AllocatePool (Len);\r
+  Status = EFI_OUT_OF_RESOURCES;\r
+  Packet = (EFI_DHCP4_PACKET *)AllocatePool (Len);\r
 \r
   if (Packet == NULL) {\r
     goto ON_ERROR;\r
   }\r
 \r
-  Packet->Size         = Len;\r
-  Packet->Length       = 0;\r
+  Packet->Size   = Len;\r
+  Packet->Length = 0;\r
   CopyMem (&Packet->Dhcp4.Header, &SeedPacket->Dhcp4.Header, sizeof (Packet->Dhcp4.Header));\r
-  Packet->Dhcp4.Magik  = DHCP_OPTION_MAGIC;\r
-  Buf                  = Packet->Dhcp4.Option;\r
+  Packet->Dhcp4.Magik = DHCP_OPTION_MAGIC;\r
+  Buf                 = Packet->Dhcp4.Option;\r
 \r
   for (Index = 0; Index < DHCP_MAX_OPTIONS; Index++) {\r
     if (Mark[Index].Len != 0) {\r
@@ -873,12 +865,12 @@ DhcpBuild (
     }\r
   }\r
 \r
-  *(Buf++)        = DHCP4_TAG_EOP;\r
-  Packet->Length  = sizeof (EFI_DHCP4_HEADER) + sizeof (UINT32)\r
-                      + (UINT32) (Buf - Packet->Dhcp4.Option);\r
+  *(Buf++)       = DHCP4_TAG_EOP;\r
+  Packet->Length = sizeof (EFI_DHCP4_HEADER) + sizeof (UINT32)\r
+                   + (UINT32)(Buf - Packet->Dhcp4.Option);\r
 \r
-  *NewPacket      = Packet;\r
-  Status          = EFI_SUCCESS;\r
+  *NewPacket = Packet;\r
+  Status     = EFI_SUCCESS;\r
 \r
 ON_ERROR:\r
   if (SeedOptions != NULL) {\r
index a58bb1b0baa8cdd9ef3a2186b1e618270a1d3037..3234d149678bb7170d870dc4a184062d4428bdfe 100644 (file)
@@ -13,49 +13,48 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /// DHCP option tags (types)\r
 ///\r
 \r
-#define DHCP_OPTION_MAGIC         0x63538263 // Network byte order\r
-#define DHCP_MAX_OPTIONS          256\r
-\r
+#define DHCP_OPTION_MAGIC  0x63538263        // Network byte order\r
+#define DHCP_MAX_OPTIONS   256\r
 \r
 //\r
 // DHCP option types, this is used to validate the DHCP options.\r
 //\r
-#define DHCP_OPTION_SWITCH        1\r
-#define DHCP_OPTION_INT8          2\r
-#define DHCP_OPTION_INT16         3\r
-#define DHCP_OPTION_INT32         4\r
-#define DHCP_OPTION_IP            5\r
-#define DHCP_OPTION_IPPAIR        6\r
+#define DHCP_OPTION_SWITCH  1\r
+#define DHCP_OPTION_INT8    2\r
+#define DHCP_OPTION_INT16   3\r
+#define DHCP_OPTION_INT32   4\r
+#define DHCP_OPTION_IP      5\r
+#define DHCP_OPTION_IPPAIR  6\r
 \r
 //\r
 // Value of DHCP overload option\r
 //\r
-#define DHCP_OVERLOAD_FILENAME    1\r
-#define DHCP_OVERLOAD_SVRNAME     2\r
-#define DHCP_OVERLOAD_BOTH        3\r
+#define DHCP_OVERLOAD_FILENAME  1\r
+#define DHCP_OVERLOAD_SVRNAME   2\r
+#define DHCP_OVERLOAD_BOTH      3\r
 \r
 ///\r
 /// The DHCP option structure. This structure extends the EFI_DHCP_OPTION\r
 /// structure to support options longer than 255 bytes, such as classless route.\r
 ///\r
 typedef struct {\r
-  UINT8                     Tag;\r
-  UINT16                    Len;\r
-  UINT8                     *Data;\r
+  UINT8     Tag;\r
+  UINT16    Len;\r
+  UINT8     *Data;\r
 } DHCP_OPTION;\r
 \r
 ///\r
 /// Structures used to parse the DHCP options with RFC3396 support.\r
 ///\r
 typedef struct {\r
-  UINT8                     Index;\r
-  UINT16                    Offset;\r
+  UINT8     Index;\r
+  UINT16    Offset;\r
 } DHCP_OPTION_COUNT;\r
 \r
 typedef struct {\r
-  DHCP_OPTION_COUNT         *OpCount;\r
-  DHCP_OPTION               *Options;\r
-  UINT8                     *Buf;\r
+  DHCP_OPTION_COUNT    *OpCount;\r
+  DHCP_OPTION          *Options;\r
+  UINT8                *Buf;\r
 } DHCP_OPTION_CONTEXT;\r
 \r
 ///\r
@@ -64,18 +63,18 @@ typedef struct {
 /// classless route, who can parse the DHCP offer to get them.\r
 ///\r
 typedef struct {\r
-  IP4_ADDR                  NetMask;  // DHCP4_TAG_NETMASK\r
-  IP4_ADDR                  Router;   // DHCP4_TAG_ROUTER, only the first router is used\r
+  IP4_ADDR    NetMask;                // DHCP4_TAG_NETMASK\r
+  IP4_ADDR    Router;                 // DHCP4_TAG_ROUTER, only the first router is used\r
 \r
   //\r
   // DHCP specific options\r
   //\r
-  UINT8                     DhcpType; // DHCP4_TAG_MSG_TYPE\r
-  UINT8                     Overload; // DHCP4_TAG_OVERLOAD\r
-  IP4_ADDR                  ServerId; // DHCP4_TAG_SERVER_ID\r
-  UINT32                    Lease;    // DHCP4_TAG_LEASE\r
-  UINT32                    T1;       // DHCP4_TAG_T1\r
-  UINT32                    T2;       // DHCP4_TAG_T2\r
+  UINT8       DhcpType;               // DHCP4_TAG_MSG_TYPE\r
+  UINT8       Overload;               // DHCP4_TAG_OVERLOAD\r
+  IP4_ADDR    ServerId;               // DHCP4_TAG_SERVER_ID\r
+  UINT32      Lease;                  // DHCP4_TAG_LEASE\r
+  UINT32      T1;                     // DHCP4_TAG_T1\r
+  UINT32      T2;                     // DHCP4_TAG_T2\r
 } DHCP_PARAMETER;\r
 \r
 ///\r
@@ -87,20 +86,20 @@ typedef struct {
 /// inspect the option to parse DHCP_PARAMETER.\r
 ///\r
 typedef struct {\r
-  UINT8                     Tag;\r
-  INTN                      Type;\r
-  INTN                      MinOccur;\r
-  INTN                      MaxOccur;\r
-  BOOLEAN                   Alert;\r
+  UINT8      Tag;\r
+  INTN       Type;\r
+  INTN       MinOccur;\r
+  INTN       MaxOccur;\r
+  BOOLEAN    Alert;\r
 } DHCP_OPTION_FORMAT;\r
 \r
 typedef\r
 EFI_STATUS\r
 (*DHCP_CHECK_OPTION) (\r
-  IN UINT8                  Tag,\r
-  IN UINT8                  Len,\r
-  IN UINT8                  *Data,\r
-  IN VOID                   *Context\r
+  IN UINT8  Tag,\r
+  IN UINT8  Len,\r
+  IN UINT8  *Data,\r
+  IN VOID   *Context\r
   );\r
 \r
 /**\r
@@ -120,9 +119,9 @@ EFI_STATUS
 **/\r
 EFI_STATUS\r
 DhcpIterateOptions (\r
-  IN  EFI_DHCP4_PACKET      *Packet,\r
-  IN  DHCP_CHECK_OPTION     Check         OPTIONAL,\r
-  IN  VOID                  *Context\r
+  IN  EFI_DHCP4_PACKET   *Packet,\r
+  IN  DHCP_CHECK_OPTION  Check         OPTIONAL,\r
+  IN  VOID               *Context\r
   );\r
 \r
 /**\r
@@ -139,8 +138,8 @@ DhcpIterateOptions (
 **/\r
 EFI_STATUS\r
 DhcpValidateOptions (\r
-  IN  EFI_DHCP4_PACKET      *Packet,\r
-  OUT DHCP_PARAMETER        **Para       OPTIONAL\r
+  IN  EFI_DHCP4_PACKET  *Packet,\r
+  OUT DHCP_PARAMETER    **Para       OPTIONAL\r
   );\r
 \r
 /**\r
@@ -173,9 +172,9 @@ DhcpValidateOptions (
 **/\r
 EFI_STATUS\r
 DhcpParseOption (\r
-  IN  EFI_DHCP4_PACKET      *Packet,\r
-  OUT INTN                  *Count,\r
-  OUT DHCP_OPTION           **OptionPoint\r
+  IN  EFI_DHCP4_PACKET  *Packet,\r
+  OUT INTN              *Count,\r
+  OUT DHCP_OPTION       **OptionPoint\r
   );\r
 \r
 /**\r
@@ -192,10 +191,10 @@ DhcpParseOption (
 **/\r
 UINT8 *\r
 DhcpAppendOption (\r
-  OUT UINT8                  *Buf,\r
-  IN  UINT8                  Tag,\r
-  IN  UINT16                 DataLen,\r
-  IN  UINT8                  *Data\r
+  OUT UINT8   *Buf,\r
+  IN  UINT8   Tag,\r
+  IN  UINT16  DataLen,\r
+  IN  UINT8   *Data\r
   );\r
 \r
 /**\r
@@ -217,12 +216,12 @@ DhcpAppendOption (
 **/\r
 EFI_STATUS\r
 DhcpBuild (\r
-  IN  EFI_DHCP4_PACKET        *SeedPacket,\r
-  IN  UINT32                  DeleteCount,\r
-  IN  UINT8                   *DeleteList     OPTIONAL,\r
-  IN  UINT32                  AppendCount,\r
-  IN  EFI_DHCP4_PACKET_OPTION *AppendList[]   OPTIONAL,\r
-  OUT EFI_DHCP4_PACKET        **NewPacket\r
+  IN  EFI_DHCP4_PACKET         *SeedPacket,\r
+  IN  UINT32                   DeleteCount,\r
+  IN  UINT8                    *DeleteList     OPTIONAL,\r
+  IN  UINT32                   AppendCount,\r
+  IN  EFI_DHCP4_PACKET_OPTION  *AppendList[]   OPTIONAL,\r
+  OUT EFI_DHCP4_PACKET         **NewPacket\r
   );\r
 \r
 #endif\r
index c5927fbd12f53e2cfef8f24d11fe57f9dd8b6a54..6877e7c00a08520f7297728babea9048ca904bc9 100644 (file)
@@ -9,7 +9,6 @@
 \r
 #include "Dhcp6Impl.h"\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user-readable name of the driver.\r
 \r
@@ -57,7 +56,6 @@ Dhcp6ComponentNameGetDriverName (
   OUT CHAR16                       **DriverName\r
   );\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user-readable name of the controller\r
   that is being managed by a driver.\r
@@ -129,18 +127,17 @@ Dhcp6ComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 Dhcp6ComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   );\r
 \r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL    gDhcp6ComponentName = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gDhcp6ComponentName = {\r
   Dhcp6ComponentNameGetDriverName,\r
   Dhcp6ComponentNameGetControllerName,\r
   "eng"\r
@@ -149,13 +146,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL    gDhcp6ComponentName
 //\r
 // EFI Component Name 2 Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL   gDhcp6ComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) Dhcp6ComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) Dhcp6ComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gDhcp6ComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)Dhcp6ComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)Dhcp6ComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE       mDhcp6DriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mDhcp6DriverNameTable[] = {\r
   {\r
     "eng;en",\r
     L"DHCP6 Protocol Driver"\r
@@ -166,9 +163,9 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE       mDhcp6DriverNameTab
   }\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE   *gDhcp6ControllerNameTable = NULL;\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  *gDhcp6ControllerNameTable = NULL;\r
 \r
-CHAR16 *mDhcp6ControllerName[] = {\r
+CHAR16  *mDhcp6ControllerName[] = {\r
   L"DHCPv6 (State=0, Init)",\r
   L"DHCPv6 (State=1, Selecting)",\r
   L"DHCPv6 (State=2, Requesting)",\r
@@ -248,12 +245,12 @@ Dhcp6ComponentNameGetDriverName (
 **/\r
 EFI_STATUS\r
 UpdateName (\r
-  IN   EFI_DHCP6_PROTOCOL             *Dhcp6\r
+  IN   EFI_DHCP6_PROTOCOL  *Dhcp6\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  EFI_DHCP6_MODE_DATA              Dhcp6ModeData;\r
-  CHAR16                           *HandleName;\r
+  EFI_STATUS           Status;\r
+  EFI_DHCP6_MODE_DATA  Dhcp6ModeData;\r
+  CHAR16               *HandleName;\r
 \r
   if (Dhcp6 == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -278,12 +275,14 @@ UpdateName (
     if (Dhcp6ModeData.Ia->State > Dhcp6Rebinding) {\r
       return EFI_DEVICE_ERROR;\r
     }\r
+\r
     HandleName = mDhcp6ControllerName[Dhcp6ModeData.Ia->State];\r
   }\r
 \r
   if (Dhcp6ModeData.Ia != NULL) {\r
     FreePool (Dhcp6ModeData.Ia);\r
   }\r
+\r
   if (Dhcp6ModeData.ClientId != NULL) {\r
     FreePool (Dhcp6ModeData.ClientId);\r
   }\r
@@ -379,15 +378,15 @@ UpdateName (
 EFI_STATUS\r
 EFIAPI\r
 Dhcp6ComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_DHCP6_PROTOCOL            *Dhcp6;\r
+  EFI_STATUS          Status;\r
+  EFI_DHCP6_PROTOCOL  *Dhcp6;\r
 \r
   //\r
   // Only provide names for child handles.\r
@@ -439,4 +438,3 @@ Dhcp6ComponentNameGetControllerName (
            (BOOLEAN)(This == &gDhcp6ComponentName)\r
            );\r
 }\r
-\r
index f0b236835f869c621a96811f289fd7d9e5cec2df..b591a4605bc9cd991d50ac578f9cc8bd1f4a712a 100644 (file)
@@ -10,8 +10,7 @@
 \r
 #include "Dhcp6Impl.h"\r
 \r
-\r
-EFI_DRIVER_BINDING_PROTOCOL gDhcp6DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gDhcp6DriverBinding = {\r
   Dhcp6DriverBindingSupported,\r
   Dhcp6DriverBindingStart,\r
   Dhcp6DriverBindingStop,\r
@@ -20,7 +19,7 @@ EFI_DRIVER_BINDING_PROTOCOL gDhcp6DriverBinding = {
   NULL\r
 };\r
 \r
-EFI_SERVICE_BINDING_PROTOCOL gDhcp6ServiceBindingTemplate = {\r
+EFI_SERVICE_BINDING_PROTOCOL  gDhcp6ServiceBindingTemplate = {\r
   Dhcp6ServiceBindingCreateChild,\r
   Dhcp6ServiceBindingDestroyChild\r
 };\r
@@ -39,12 +38,12 @@ EFI_SERVICE_BINDING_PROTOCOL gDhcp6ServiceBindingTemplate = {
 EFI_STATUS\r
 EFIAPI\r
 Dhcp6ConfigureUdpIo (\r
-  IN UDP_IO                 *UdpIo,\r
-  IN VOID                   *Context\r
+  IN UDP_IO  *UdpIo,\r
+  IN VOID    *Context\r
   )\r
 {\r
-  EFI_UDP6_PROTOCOL         *Udp6;\r
-  EFI_UDP6_CONFIG_DATA      *Config;\r
+  EFI_UDP6_PROTOCOL     *Udp6;\r
+  EFI_UDP6_CONFIG_DATA  *Config;\r
 \r
   Udp6   = UdpIo->Protocol.Udp6;\r
   Config = &(UdpIo->Config.Udp6);\r
@@ -67,13 +66,12 @@ Dhcp6ConfigureUdpIo (
   // will be overridden later. Note that we MUST not limit RemotePort.\r
   // More details, refer to RFC 3315 section 5.2.\r
   //\r
-  Config->StationPort        = DHCP6_PORT_CLIENT;\r
-  Config->RemotePort         = 0;\r
+  Config->StationPort = DHCP6_PORT_CLIENT;\r
+  Config->RemotePort  = 0;\r
 \r
-  return Udp6->Configure (Udp6, Config);;\r
+  return Udp6->Configure (Udp6, Config);\r
 }\r
 \r
-\r
 /**\r
   Destroy the Dhcp6 service. The Dhcp6 service may be partly initialized,\r
   or partly destroyed. If a resource is destroyed, it is marked as such in\r
@@ -84,7 +82,7 @@ Dhcp6ConfigureUdpIo (
 **/\r
 VOID\r
 Dhcp6DestroyService (\r
-  IN OUT DHCP6_SERVICE          *Service\r
+  IN OUT DHCP6_SERVICE  *Service\r
   )\r
 {\r
   //\r
@@ -103,7 +101,6 @@ Dhcp6DestroyService (
   FreePool (Service);\r
 }\r
 \r
-\r
 /**\r
   Create a new Dhcp6 service for the Nic controller.\r
 \r
@@ -119,13 +116,13 @@ Dhcp6DestroyService (
 **/\r
 EFI_STATUS\r
 Dhcp6CreateService (\r
-  IN  EFI_HANDLE            Controller,\r
-  IN  EFI_HANDLE            ImageHandle,\r
-  OUT DHCP6_SERVICE         **Service\r
+  IN  EFI_HANDLE     Controller,\r
+  IN  EFI_HANDLE     ImageHandle,\r
+  OUT DHCP6_SERVICE  **Service\r
   )\r
 {\r
-  DHCP6_SERVICE             *Dhcp6Srv;\r
-  EFI_STATUS                Status;\r
+  DHCP6_SERVICE  *Dhcp6Srv;\r
+  EFI_STATUS     Status;\r
 \r
   *Service = NULL;\r
   Dhcp6Srv = AllocateZeroPool (sizeof (DHCP6_SERVICE));\r
@@ -147,10 +144,10 @@ Dhcp6CreateService (
   //\r
   // Initialize the fields of the new Dhcp6 service.\r
   //\r
-  Dhcp6Srv->Signature       = DHCP6_SERVICE_SIGNATURE;\r
-  Dhcp6Srv->Controller      = Controller;\r
-  Dhcp6Srv->Image           = ImageHandle;\r
-  Dhcp6Srv->Xid             = (0xffffff & NET_RANDOM (NetRandomInitSeed ()));\r
+  Dhcp6Srv->Signature  = DHCP6_SERVICE_SIGNATURE;\r
+  Dhcp6Srv->Controller = Controller;\r
+  Dhcp6Srv->Image      = ImageHandle;\r
+  Dhcp6Srv->Xid        = (0xffffff & NET_RANDOM (NetRandomInitSeed ()));\r
 \r
   CopyMem (\r
     &Dhcp6Srv->ServiceBinding,\r
@@ -164,7 +161,7 @@ Dhcp6CreateService (
   Status = gBS->HandleProtocol (\r
                   Controller,\r
                   &gEfiIp6ConfigProtocolGuid,\r
-                  (VOID **) &Dhcp6Srv->Ip6Cfg\r
+                  (VOID **)&Dhcp6Srv->Ip6Cfg\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     FreePool (Dhcp6Srv);\r
@@ -175,7 +172,7 @@ Dhcp6CreateService (
   // Generate client Duid: If SMBIOS system UUID is located, generate DUID in DUID-UUID format.\r
   // Otherwise, in DUID-LLT format.\r
   //\r
-  Dhcp6Srv->ClientId        = Dhcp6GenerateClientId (Dhcp6Srv->Snp->Mode);\r
+  Dhcp6Srv->ClientId = Dhcp6GenerateClientId (Dhcp6Srv->Snp->Mode);\r
 \r
   if (Dhcp6Srv->ClientId == NULL) {\r
     FreePool (Dhcp6Srv);\r
@@ -206,7 +203,6 @@ Dhcp6CreateService (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Destroy the Dhcp6 instance and recycle the resources.\r
 \r
@@ -215,7 +211,7 @@ Dhcp6CreateService (
 **/\r
 VOID\r
 Dhcp6DestroyInstance (\r
-  IN OUT DHCP6_INSTANCE         *Instance\r
+  IN OUT DHCP6_INSTANCE  *Instance\r
   )\r
 {\r
   //\r
@@ -239,6 +235,7 @@ Dhcp6DestroyInstance (
     if (Instance->IaCb.Ia->ReplyPacket != NULL) {\r
       FreePool (Instance->IaCb.Ia->ReplyPacket);\r
     }\r
+\r
     FreePool (Instance->IaCb.Ia);\r
   }\r
 \r
@@ -253,7 +250,6 @@ Dhcp6DestroyInstance (
   FreePool (Instance);\r
 }\r
 \r
-\r
 /**\r
   Create the Dhcp6 instance and initialize it.\r
 \r
@@ -266,12 +262,12 @@ Dhcp6DestroyInstance (
 **/\r
 EFI_STATUS\r
 Dhcp6CreateInstance (\r
-  IN  DHCP6_SERVICE         *Service,\r
-  OUT DHCP6_INSTANCE        **Instance\r
+  IN  DHCP6_SERVICE   *Service,\r
+  OUT DHCP6_INSTANCE  **Instance\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  DHCP6_INSTANCE            *Dhcp6Ins;\r
+  EFI_STATUS      Status;\r
+  DHCP6_INSTANCE  *Dhcp6Ins;\r
 \r
   *Instance = NULL;\r
   Dhcp6Ins  = AllocateZeroPool (sizeof (DHCP6_INSTANCE));\r
@@ -283,11 +279,11 @@ Dhcp6CreateInstance (
   //\r
   // Initialize the fields of the new Dhcp6 instance.\r
   //\r
-  Dhcp6Ins->Signature       = DHCP6_INSTANCE_SIGNATURE;\r
-  Dhcp6Ins->UdpSts          = EFI_ALREADY_STARTED;\r
-  Dhcp6Ins->Service         = Service;\r
-  Dhcp6Ins->InDestroy       = FALSE;\r
-  Dhcp6Ins->MediaPresent    = TRUE;\r
+  Dhcp6Ins->Signature    = DHCP6_INSTANCE_SIGNATURE;\r
+  Dhcp6Ins->UdpSts       = EFI_ALREADY_STARTED;\r
+  Dhcp6Ins->Service      = Service;\r
+  Dhcp6Ins->InDestroy    = FALSE;\r
+  Dhcp6Ins->MediaPresent = TRUE;\r
 \r
   CopyMem (\r
     &Dhcp6Ins->Dhcp6,\r
@@ -333,24 +329,23 @@ Dhcp6CreateInstance (
 EFI_STATUS\r
 EFIAPI\r
 Dhcp6DestroyChildEntry (\r
-  IN LIST_ENTRY         *Entry,\r
-  IN VOID               *Context\r
+  IN LIST_ENTRY  *Entry,\r
+  IN VOID        *Context\r
   )\r
 {\r
-  DHCP6_INSTANCE                   *Instance;\r
-  EFI_SERVICE_BINDING_PROTOCOL     *ServiceBinding;\r
+  DHCP6_INSTANCE                *Instance;\r
+  EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
 \r
-  if (Entry == NULL || Context == NULL) {\r
+  if ((Entry == NULL) || (Context == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Instance = NET_LIST_USER_STRUCT_S (Entry, DHCP6_INSTANCE, Link, DHCP6_INSTANCE_SIGNATURE);\r
-  ServiceBinding = (EFI_SERVICE_BINDING_PROTOCOL *) Context;\r
+  Instance       = NET_LIST_USER_STRUCT_S (Entry, DHCP6_INSTANCE, Link, DHCP6_INSTANCE_SIGNATURE);\r
+  ServiceBinding = (EFI_SERVICE_BINDING_PROTOCOL *)Context;\r
 \r
   return ServiceBinding->DestroyChild (ServiceBinding, Instance->Handle);\r
 }\r
 \r
-\r
 /**\r
   Entry point of the DHCP6 driver to install various protocols.\r
 \r
@@ -364,8 +359,8 @@ Dhcp6DestroyChildEntry (
 EFI_STATUS\r
 EFIAPI\r
 Dhcp6DriverEntryPoint (\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
   return EfiLibInstallDriverBindingComponentName2 (\r
@@ -378,7 +373,6 @@ Dhcp6DriverEntryPoint (
            );\r
 }\r
 \r
-\r
 /**\r
   Test to see if this driver supports ControllerHandle. This service\r
   is called by the EFI boot service ConnectController(). In\r
@@ -414,7 +408,6 @@ Dhcp6DriverBindingSupported (
                 );\r
 }\r
 \r
-\r
 /**\r
   Start this driver on ControllerHandle. This service is called by the\r
   EFI boot service ConnectController(). In order to make\r
@@ -441,8 +434,8 @@ Dhcp6DriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  DHCP6_SERVICE                   *Service;\r
+  EFI_STATUS     Status;\r
+  DHCP6_SERVICE  *Service;\r
 \r
   //\r
   // Check the Dhcp6 service whether already started.\r
@@ -490,7 +483,6 @@ Dhcp6DriverBindingStart (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Stop this driver on ControllerHandle. This service is called by the\r
   EFI boot service DisconnectController(). In order to\r
@@ -519,12 +511,12 @@ Dhcp6DriverBindingStop (
   IN  EFI_HANDLE                   *ChildHandleBuffer   OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  EFI_HANDLE                       NicHandle;\r
-  EFI_SERVICE_BINDING_PROTOCOL     *ServiceBinding;\r
-  DHCP6_SERVICE                    *Service;\r
-  LIST_ENTRY                       *List;\r
-  UINTN                            ListLength;\r
+  EFI_STATUS                    Status;\r
+  EFI_HANDLE                    NicHandle;\r
+  EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
+  DHCP6_SERVICE                 *Service;\r
+  LIST_ENTRY                    *List;\r
+  UINTN                         ListLength;\r
 \r
   //\r
   // Find and check the Nic handle by the controller handle.\r
@@ -538,7 +530,7 @@ Dhcp6DriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   NicHandle,\r
                   &gEfiDhcp6ServiceBindingProtocolGuid,\r
-                  (VOID **) &ServiceBinding,\r
+                  (VOID **)&ServiceBinding,\r
                   This->DriverBindingHandle,\r
                   NicHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -553,23 +545,23 @@ Dhcp6DriverBindingStop (
     //\r
     // Destroy all the children instances before destroy the service.\r
     //\r
-    List = &Service->Child;\r
+    List   = &Service->Child;\r
     Status = NetDestroyLinkList (\r
                List,\r
                Dhcp6DestroyChildEntry,\r
                ServiceBinding,\r
                &ListLength\r
                );\r
-    if (EFI_ERROR (Status) || ListLength != 0) {\r
+    if (EFI_ERROR (Status) || (ListLength != 0)) {\r
       Status = EFI_DEVICE_ERROR;\r
     }\r
   }\r
 \r
-  if (NumberOfChildren == 0 && !IsListEmpty (&Service->Child)) {\r
+  if ((NumberOfChildren == 0) && !IsListEmpty (&Service->Child)) {\r
     Status = EFI_DEVICE_ERROR;\r
   }\r
 \r
-  if (NumberOfChildren == 0 && IsListEmpty (&Service->Child)) {\r
+  if ((NumberOfChildren == 0) && IsListEmpty (&Service->Child)) {\r
     //\r
     // Destroy the service itself if no child instance left.\r
     //\r
@@ -590,7 +582,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Creates a child handle and installs a protocol.\r
 \r
@@ -615,19 +606,19 @@ Dhcp6ServiceBindingCreateChild (
   IN OUT EFI_HANDLE                    *ChildHandle\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  EFI_TPL                          OldTpl;\r
-  DHCP6_SERVICE                    *Service;\r
-  DHCP6_INSTANCE                   *Instance;\r
-  VOID                             *Udp6;\r
+  EFI_STATUS      Status;\r
+  EFI_TPL         OldTpl;\r
+  DHCP6_SERVICE   *Service;\r
+  DHCP6_INSTANCE  *Instance;\r
+  VOID            *Udp6;\r
 \r
-  if (This == NULL || ChildHandle == NULL) {\r
+  if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   Service = DHCP6_SERVICE_FROM_THIS (This);\r
 \r
-  Status  = Dhcp6CreateInstance (Service, &Instance);\r
+  Status = Dhcp6CreateInstance (Service, &Instance);\r
 \r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -670,14 +661,13 @@ Dhcp6ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   Service->UdpIo->UdpHandle,\r
                   &gEfiUdp6ProtocolGuid,\r
-                  (VOID **) &Udp6,\r
+                  (VOID **)&Udp6,\r
                   gDhcp6DriverBinding.DriverBindingHandle,\r
                   Instance->Handle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
                   );\r
 \r
   if (EFI_ERROR (Status)) {\r
-\r
     gBS->UninstallMultipleProtocolInterfaces (\r
            Instance->Handle,\r
            &gEfiDhcp6ProtocolGuid,\r
@@ -704,7 +694,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Destroys a child handle with a protocol installed on it.\r
 \r
@@ -730,13 +719,13 @@ Dhcp6ServiceBindingDestroyChild (
   IN EFI_HANDLE                    ChildHandle\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  EFI_TPL                          OldTpl;\r
-  EFI_DHCP6_PROTOCOL               *Dhcp6;\r
-  DHCP6_SERVICE                    *Service;\r
-  DHCP6_INSTANCE                   *Instance;\r
+  EFI_STATUS          Status;\r
+  EFI_TPL             OldTpl;\r
+  EFI_DHCP6_PROTOCOL  *Dhcp6;\r
+  DHCP6_SERVICE       *Service;\r
+  DHCP6_INSTANCE      *Instance;\r
 \r
-  if (This == NULL || ChildHandle == NULL) {\r
+  if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -746,7 +735,7 @@ Dhcp6ServiceBindingDestroyChild (
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiDhcp6ProtocolGuid,\r
-                  (VOID **) &Dhcp6,\r
+                  (VOID **)&Dhcp6,\r
                   gDhcp6DriverBinding.DriverBindingHandle,\r
                   ChildHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
index 1b8744b9b8d26b674d144f30f2916a3fffc59cec..c2079bc4d05c2f939697c2ef7e315af408f436ae 100644 (file)
@@ -13,9 +13,9 @@
 \r
 #include <Protocol/ServiceBinding.h>\r
 \r
-extern EFI_COMPONENT_NAME_PROTOCOL  gDhcp6ComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL gDhcp6ComponentName2;\r
-extern EFI_UNICODE_STRING_TABLE     *gDhcp6ControllerNameTable;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gDhcp6ComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gDhcp6ComponentName2;\r
+extern EFI_UNICODE_STRING_TABLE      *gDhcp6ControllerNameTable;\r
 \r
 /**\r
   Test to see if this driver supports ControllerHandle. This service\r
index bb4c1d12a987c13697db6a2d4bb5bcb79b9e17a8..61b41d0f768f41d389ef999705cd0fc3c1326e14 100644 (file)
 //\r
 //   ALL_DHCP_Relay_Agents_and_Servers address: FF02::1:2\r
 //\r
-EFI_IPv6_ADDRESS   mAllDhcpRelayAndServersAddress = {{0xFF, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2}};\r
+EFI_IPv6_ADDRESS  mAllDhcpRelayAndServersAddress = {\r
+  { 0xFF, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2 }\r
+};\r
 \r
-EFI_DHCP6_PROTOCOL gDhcp6ProtocolTemplate = {\r
+EFI_DHCP6_PROTOCOL  gDhcp6ProtocolTemplate = {\r
   EfiDhcp6GetModeData,\r
   EfiDhcp6Configure,\r
   EfiDhcp6Start,\r
@@ -61,14 +63,14 @@ EFI_DHCP6_PROTOCOL gDhcp6ProtocolTemplate = {
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp6Start (\r
-  IN EFI_DHCP6_PROTOCOL        *This\r
+  IN EFI_DHCP6_PROTOCOL  *This\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_TPL                      OldTpl;\r
-  DHCP6_INSTANCE               *Instance;\r
-  DHCP6_SERVICE                *Service;\r
-  EFI_STATUS                   MediaStatus;\r
+  EFI_STATUS      Status;\r
+  EFI_TPL         OldTpl;\r
+  DHCP6_INSTANCE  *Instance;\r
+  DHCP6_SERVICE   *Service;\r
+  EFI_STATUS      MediaStatus;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -93,7 +95,7 @@ EfiDhcp6Start (
     return EFI_ALREADY_STARTED;\r
   }\r
 \r
-  OldTpl           = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   //\r
   // Check Media Status.\r
@@ -119,7 +121,7 @@ EfiDhcp6Start (
   //\r
   // Register receive callback for the stateful exchange process.\r
   //\r
-  Status = UdpIoRecvDatagram(\r
+  Status = UdpIoRecvDatagram (\r
              Service->UdpIo,\r
              Dhcp6ReceivePacket,\r
              Service,\r
@@ -136,10 +138,10 @@ EfiDhcp6Start (
   // Poll udp out of the net tpl if synchronous call.\r
   //\r
   if (Instance->Config->IaInfoEvent == NULL) {\r
-\r
     while (Instance->UdpSts == EFI_ALREADY_STARTED) {\r
       Service->UdpIo->Protocol.Udp6->Poll (Service->UdpIo->Protocol.Udp6);\r
     }\r
+\r
     return Instance->UdpSts;\r
   }\r
 \r
@@ -151,7 +153,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Stops the DHCPv6 standard S.A.R.R. process.\r
 \r
@@ -170,14 +171,14 @@ ON_ERROR:
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp6Stop (\r
-  IN EFI_DHCP6_PROTOCOL        *This\r
+  IN EFI_DHCP6_PROTOCOL  *This\r
   )\r
 {\r
-  EFI_TPL                      OldTpl;\r
-  EFI_STATUS                   Status;\r
-  EFI_UDP6_PROTOCOL            *Udp6;\r
-  DHCP6_INSTANCE               *Instance;\r
-  DHCP6_SERVICE                *Service;\r
+  EFI_TPL            OldTpl;\r
+  EFI_STATUS         Status;\r
+  EFI_UDP6_PROTOCOL  *Udp6;\r
+  DHCP6_INSTANCE     *Instance;\r
+  DHCP6_SERVICE      *Service;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -200,10 +201,11 @@ EfiDhcp6Stop (
   //\r
   // No valid REPLY message received yet, cleanup this instance directly.\r
   //\r
-  if (Instance->IaCb.Ia->State == Dhcp6Init ||\r
-      Instance->IaCb.Ia->State == Dhcp6Selecting ||\r
-      Instance->IaCb.Ia->State == Dhcp6Requesting\r
-      ) {\r
+  if ((Instance->IaCb.Ia->State == Dhcp6Init) ||\r
+      (Instance->IaCb.Ia->State == Dhcp6Selecting) ||\r
+      (Instance->IaCb.Ia->State == Dhcp6Requesting)\r
+      )\r
+  {\r
     goto ON_EXIT;\r
   }\r
 \r
@@ -213,7 +215,7 @@ EfiDhcp6Stop (
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   Instance->UdpSts = EFI_ALREADY_STARTED;\r
-  Status = Dhcp6SendReleaseMsg (Instance, Instance->IaCb.Ia);\r
+  Status           = Dhcp6SendReleaseMsg (Instance, Instance->IaCb.Ia);\r
   gBS->RestoreTPL (OldTpl);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
@@ -227,6 +229,7 @@ EfiDhcp6Stop (
     while (Instance->UdpSts == EFI_ALREADY_STARTED) {\r
       Udp6->Poll (Udp6);\r
     }\r
+\r
     Status = Instance->UdpSts;\r
   }\r
 \r
@@ -241,7 +244,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Returns the current operating mode data for the Dhcp6 instance.\r
 \r
@@ -260,26 +262,26 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp6GetModeData (\r
-  IN  EFI_DHCP6_PROTOCOL       *This,\r
-  OUT EFI_DHCP6_MODE_DATA      *Dhcp6ModeData      OPTIONAL,\r
-  OUT EFI_DHCP6_CONFIG_DATA    *Dhcp6ConfigData    OPTIONAL\r
+  IN  EFI_DHCP6_PROTOCOL     *This,\r
+  OUT EFI_DHCP6_MODE_DATA    *Dhcp6ModeData      OPTIONAL,\r
+  OUT EFI_DHCP6_CONFIG_DATA  *Dhcp6ConfigData    OPTIONAL\r
   )\r
 {\r
-  EFI_TPL                      OldTpl;\r
-  EFI_DHCP6_IA                 *Ia;\r
-  DHCP6_INSTANCE               *Instance;\r
-  DHCP6_SERVICE                *Service;\r
-  UINT32                       IaSize;\r
-  UINT32                       IdSize;\r
-\r
-  if (This == NULL || (Dhcp6ModeData == NULL && Dhcp6ConfigData == NULL)) {\r
+  EFI_TPL         OldTpl;\r
+  EFI_DHCP6_IA    *Ia;\r
+  DHCP6_INSTANCE  *Instance;\r
+  DHCP6_SERVICE   *Service;\r
+  UINT32          IaSize;\r
+  UINT32          IdSize;\r
+\r
+  if ((This == NULL) || ((Dhcp6ModeData == NULL) && (Dhcp6ConfigData == NULL))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   Instance = DHCP6_INSTANCE_FROM_THIS (This);\r
   Service  = Instance->Service;\r
 \r
-  if (Instance->Config == NULL && Dhcp6ConfigData != NULL) {\r
+  if ((Instance->Config == NULL) && (Dhcp6ConfigData != NULL)) {\r
     return EFI_ACCESS_DENIED;\r
   }\r
 \r
@@ -291,7 +293,7 @@ EfiDhcp6GetModeData (
   // User needs a copy of instance config data.\r
   //\r
   if (Dhcp6ConfigData != NULL) {\r
-    ZeroMem (Dhcp6ConfigData, sizeof(EFI_DHCP6_CONFIG_DATA));\r
+    ZeroMem (Dhcp6ConfigData, sizeof (EFI_DHCP6_CONFIG_DATA));\r
     //\r
     // Duplicate config data, including all reference buffers.\r
     //\r
@@ -347,6 +349,7 @@ EfiDhcp6GetModeData (
         if (Dhcp6ModeData->Ia->ReplyPacket == NULL) {\r
           goto ON_ERROR;\r
         }\r
+\r
         CopyMem (\r
           Dhcp6ModeData->Ia->ReplyPacket,\r
           Ia->ReplyPacket,\r
@@ -365,15 +368,16 @@ ON_ERROR:
   if (Dhcp6ConfigData != NULL) {\r
     Dhcp6CleanupConfigData (Dhcp6ConfigData);\r
   }\r
+\r
   if (Dhcp6ModeData != NULL) {\r
     Dhcp6CleanupModeData (Dhcp6ModeData);\r
   }\r
+\r
   gBS->RestoreTPL (OldTpl);\r
 \r
   return EFI_OUT_OF_RESOURCES;\r
 }\r
 \r
-\r
 /**\r
   Initializes, changes, or resets the operational settings for the Dhcp6 instance.\r
 \r
@@ -405,17 +409,17 @@ ON_ERROR:
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp6Configure (\r
-  IN EFI_DHCP6_PROTOCOL        *This,\r
-  IN EFI_DHCP6_CONFIG_DATA     *Dhcp6CfgData    OPTIONAL\r
+  IN EFI_DHCP6_PROTOCOL     *This,\r
+  IN EFI_DHCP6_CONFIG_DATA  *Dhcp6CfgData    OPTIONAL\r
   )\r
 {\r
-  EFI_TPL                      OldTpl;\r
-  EFI_STATUS                   Status;\r
-  LIST_ENTRY                   *Entry;\r
-  DHCP6_INSTANCE               *Other;\r
-  DHCP6_INSTANCE               *Instance;\r
-  DHCP6_SERVICE                *Service;\r
-  UINTN                        Index;\r
+  EFI_TPL         OldTpl;\r
+  EFI_STATUS      Status;\r
+  LIST_ENTRY      *Entry;\r
+  DHCP6_INSTANCE  *Other;\r
+  DHCP6_INSTANCE  *Instance;\r
+  DHCP6_SERVICE   *Service;\r
+  UINTN           Index;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -428,36 +432,40 @@ EfiDhcp6Configure (
   // Check the parameter of configure data.\r
   //\r
   if (Dhcp6CfgData != NULL) {\r
-    if (Dhcp6CfgData->OptionCount > 0 && Dhcp6CfgData->OptionList == NULL) {\r
+    if ((Dhcp6CfgData->OptionCount > 0) && (Dhcp6CfgData->OptionList == NULL)) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     if (Dhcp6CfgData->OptionList != NULL) {\r
       for (Index = 0; Index < Dhcp6CfgData->OptionCount; Index++) {\r
-        if (Dhcp6CfgData->OptionList[Index]->OpCode == Dhcp6OptClientId ||\r
-            Dhcp6CfgData->OptionList[Index]->OpCode == Dhcp6OptRapidCommit ||\r
-            Dhcp6CfgData->OptionList[Index]->OpCode == Dhcp6OptReconfigureAccept ||\r
-            Dhcp6CfgData->OptionList[Index]->OpCode == Dhcp6OptIana ||\r
-            Dhcp6CfgData->OptionList[Index]->OpCode == Dhcp6OptIata\r
-            ) {\r
+        if ((Dhcp6CfgData->OptionList[Index]->OpCode == Dhcp6OptClientId) ||\r
+            (Dhcp6CfgData->OptionList[Index]->OpCode == Dhcp6OptRapidCommit) ||\r
+            (Dhcp6CfgData->OptionList[Index]->OpCode == Dhcp6OptReconfigureAccept) ||\r
+            (Dhcp6CfgData->OptionList[Index]->OpCode == Dhcp6OptIana) ||\r
+            (Dhcp6CfgData->OptionList[Index]->OpCode == Dhcp6OptIata)\r
+            )\r
+        {\r
           return EFI_INVALID_PARAMETER;\r
         }\r
       }\r
     }\r
 \r
-    if (Dhcp6CfgData->IaDescriptor.Type != EFI_DHCP6_IA_TYPE_NA &&\r
-        Dhcp6CfgData->IaDescriptor.Type != EFI_DHCP6_IA_TYPE_TA\r
-        ) {\r
+    if ((Dhcp6CfgData->IaDescriptor.Type != EFI_DHCP6_IA_TYPE_NA) &&\r
+        (Dhcp6CfgData->IaDescriptor.Type != EFI_DHCP6_IA_TYPE_TA)\r
+        )\r
+    {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
-    if (Dhcp6CfgData->IaInfoEvent == NULL && Dhcp6CfgData->SolicitRetransmission == NULL) {\r
+    if ((Dhcp6CfgData->IaInfoEvent == NULL) && (Dhcp6CfgData->SolicitRetransmission == NULL)) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
-    if (Dhcp6CfgData->SolicitRetransmission != NULL &&\r
-        Dhcp6CfgData->SolicitRetransmission->Mrc == 0 &&\r
-        Dhcp6CfgData->SolicitRetransmission->Mrd == 0\r
-        ) {\r
+    if ((Dhcp6CfgData->SolicitRetransmission != NULL) &&\r
+        (Dhcp6CfgData->SolicitRetransmission->Mrc == 0) &&\r
+        (Dhcp6CfgData->SolicitRetransmission->Mrd == 0)\r
+        )\r
+    {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
@@ -466,10 +474,11 @@ EfiDhcp6Configure (
     //\r
     NET_LIST_FOR_EACH (Entry, &Service->Child) {\r
       Other = NET_LIST_USER_STRUCT (Entry, DHCP6_INSTANCE, Link);\r
-      if (Other->IaCb.Ia != NULL &&\r
-          Other->IaCb.Ia->Descriptor.Type == Dhcp6CfgData->IaDescriptor.Type &&\r
-          Other->IaCb.Ia->Descriptor.IaId == Dhcp6CfgData->IaDescriptor.IaId\r
-          ) {\r
+      if ((Other->IaCb.Ia != NULL) &&\r
+          (Other->IaCb.Ia->Descriptor.Type == Dhcp6CfgData->IaDescriptor.Type) &&\r
+          (Other->IaCb.Ia->Descriptor.IaId == Dhcp6CfgData->IaDescriptor.IaId)\r
+          )\r
+      {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
     }\r
@@ -496,7 +505,7 @@ EfiDhcp6Configure (
     }\r
 \r
     Status = Dhcp6CopyConfigData (Instance->Config, Dhcp6CfgData);\r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       FreePool (Instance->Config);\r
       gBS->RestoreTPL (OldTpl);\r
       return EFI_OUT_OF_RESOURCES;\r
@@ -506,21 +515,20 @@ EfiDhcp6Configure (
     // Initialize the Ia descriptor from the config data, and leave the other\r
     // fields of the Ia as default value 0.\r
     //\r
-    Instance->IaCb.Ia = AllocateZeroPool (sizeof(EFI_DHCP6_IA));\r
+    Instance->IaCb.Ia = AllocateZeroPool (sizeof (EFI_DHCP6_IA));\r
     if (Instance->IaCb.Ia == NULL) {\r
       Dhcp6CleanupConfigData (Instance->Config);\r
       FreePool (Instance->Config);\r
       gBS->RestoreTPL (OldTpl);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     CopyMem (\r
       &Instance->IaCb.Ia->Descriptor,\r
       &Dhcp6CfgData->IaDescriptor,\r
-      sizeof(EFI_DHCP6_IA_DESCRIPTOR)\r
+      sizeof (EFI_DHCP6_IA_DESCRIPTOR)\r
       );\r
-\r
   } else {\r
-\r
     if (Instance->Config == NULL) {\r
       ASSERT (Instance->IaCb.Ia == NULL);\r
       gBS->RestoreTPL (OldTpl);\r
@@ -548,7 +556,6 @@ EfiDhcp6Configure (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Request configuration information without the assignment of any\r
   Ia addresses of the client.\r
@@ -604,29 +611,29 @@ EfiDhcp6InfoRequest (
   IN VOID                      *CallbackContext OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  DHCP6_INSTANCE               *Instance;\r
-  DHCP6_SERVICE                *Service;\r
-  UINTN                        Index;\r
-  EFI_EVENT                    Timer;\r
-  EFI_STATUS                   TimerStatus;\r
-  UINTN                        GetMappingTimeOut;\r
-\r
-  if (This == NULL || OptionRequest == NULL || Retransmission == NULL || ReplyCallback == NULL) {\r
+  EFI_STATUS      Status;\r
+  DHCP6_INSTANCE  *Instance;\r
+  DHCP6_SERVICE   *Service;\r
+  UINTN           Index;\r
+  EFI_EVENT       Timer;\r
+  EFI_STATUS      TimerStatus;\r
+  UINTN           GetMappingTimeOut;\r
+\r
+  if ((This == NULL) || (OptionRequest == NULL) || (Retransmission == NULL) || (ReplyCallback == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (Retransmission != NULL && Retransmission->Mrc == 0 && Retransmission->Mrd == 0) {\r
+  if ((Retransmission != NULL) && (Retransmission->Mrc == 0) && (Retransmission->Mrd == 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (OptionCount > 0 && OptionList == NULL) {\r
+  if ((OptionCount > 0) && (OptionList == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   if (OptionList != NULL) {\r
     for (Index = 0; Index < OptionCount; Index++) {\r
-      if (OptionList[Index]->OpCode == Dhcp6OptClientId || OptionList[Index]->OpCode == Dhcp6OptRequestOption) {\r
+      if ((OptionList[Index]->OpCode == Dhcp6OptClientId) || (OptionList[Index]->OpCode == Dhcp6OptRequestOption)) {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
     }\r
@@ -651,8 +658,8 @@ EfiDhcp6InfoRequest (
     // The link local address is not ready, wait for some time and restart\r
     // the DHCP6 information request process.\r
     //\r
-    Status = Dhcp6GetMappingTimeOut(Service->Ip6Cfg, &GetMappingTimeOut);\r
-    if (EFI_ERROR(Status)) {\r
+    Status = Dhcp6GetMappingTimeOut (Service->Ip6Cfg, &GetMappingTimeOut);\r
+    if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
 \r
@@ -689,6 +696,7 @@ EfiDhcp6InfoRequest (
 \r
     gBS->CloseEvent (Timer);\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -697,17 +705,16 @@ EfiDhcp6InfoRequest (
   // Poll udp out of the net tpl if synchronous call.\r
   //\r
   if (TimeoutEvent == NULL) {\r
-\r
     while (Instance->UdpSts == EFI_ALREADY_STARTED) {\r
       Service->UdpIo->Protocol.Udp6->Poll (Service->UdpIo->Protocol.Udp6);\r
     }\r
+\r
     return Instance->UdpSts;\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Manually extend the valid and preferred lifetimes for the IPv6 addresses\r
   of the configured IA and update other configuration parameters by sending a\r
@@ -756,14 +763,14 @@ EfiDhcp6InfoRequest (
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp6RenewRebind (\r
-  IN EFI_DHCP6_PROTOCOL        *This,\r
-  IN BOOLEAN                   RebindRequest\r
+  IN EFI_DHCP6_PROTOCOL  *This,\r
+  IN BOOLEAN             RebindRequest\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_TPL                      OldTpl;\r
-  DHCP6_INSTANCE               *Instance;\r
-  DHCP6_SERVICE                *Service;\r
+  EFI_STATUS      Status;\r
+  EFI_TPL         OldTpl;\r
+  DHCP6_INSTANCE  *Instance;\r
+  DHCP6_SERVICE   *Service;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -784,9 +791,10 @@ EfiDhcp6RenewRebind (
   //\r
   // The instance has already entered renewing or rebinding state.\r
   //\r
-  if ((Instance->IaCb.Ia->State == Dhcp6Rebinding && RebindRequest) ||\r
-      (Instance->IaCb.Ia->State == Dhcp6Renewing && !RebindRequest)\r
-      ) {\r
+  if (((Instance->IaCb.Ia->State == Dhcp6Rebinding) && RebindRequest) ||\r
+      ((Instance->IaCb.Ia->State == Dhcp6Renewing) && !RebindRequest)\r
+      )\r
+  {\r
     return EFI_ALREADY_STARTED;\r
   }\r
 \r
@@ -809,7 +817,7 @@ EfiDhcp6RenewRebind (
   //\r
   // Register receive callback for the stateful exchange process.\r
   //\r
-  Status = UdpIoRecvDatagram(\r
+  Status = UdpIoRecvDatagram (\r
              Service->UdpIo,\r
              Dhcp6ReceivePacket,\r
              Service,\r
@@ -826,10 +834,10 @@ EfiDhcp6RenewRebind (
   // Poll udp out of the net tpl if synchronous call.\r
   //\r
   if (Instance->Config->IaInfoEvent == NULL) {\r
-\r
     while (Instance->UdpSts == EFI_ALREADY_STARTED) {\r
       Service->UdpIo->Protocol.Udp6->Poll (Service->UdpIo->Protocol.Udp6);\r
     }\r
+\r
     return Instance->UdpSts;\r
   }\r
 \r
@@ -841,7 +849,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Inform that one or more addresses assigned by a server are already\r
   in use by another node.\r
@@ -877,18 +884,18 @@ ON_ERROR:
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp6Decline (\r
-  IN EFI_DHCP6_PROTOCOL        *This,\r
-  IN UINT32                    AddressCount,\r
-  IN EFI_IPv6_ADDRESS          *Addresses\r
+  IN EFI_DHCP6_PROTOCOL  *This,\r
+  IN UINT32              AddressCount,\r
+  IN EFI_IPv6_ADDRESS    *Addresses\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_TPL                      OldTpl;\r
-  EFI_DHCP6_IA                 *DecIa;\r
-  DHCP6_INSTANCE               *Instance;\r
-  DHCP6_SERVICE                *Service;\r
+  EFI_STATUS      Status;\r
+  EFI_TPL         OldTpl;\r
+  EFI_DHCP6_IA    *DecIa;\r
+  DHCP6_INSTANCE  *Instance;\r
+  DHCP6_SERVICE   *Service;\r
 \r
-  if (This == NULL || AddressCount == 0 || Addresses == NULL) {\r
+  if ((This == NULL) || (AddressCount == 0) || (Addresses == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -913,7 +920,7 @@ EfiDhcp6Decline (
   //\r
   Status = Dhcp6CheckAddress (Instance->IaCb.Ia, AddressCount, Addresses);\r
 \r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
@@ -943,7 +950,7 @@ EfiDhcp6Decline (
   //\r
   // Register receive callback for the stateful exchange process.\r
   //\r
-  Status = UdpIoRecvDatagram(\r
+  Status = UdpIoRecvDatagram (\r
              Service->UdpIo,\r
              Dhcp6ReceivePacket,\r
              Service,\r
@@ -961,10 +968,10 @@ EfiDhcp6Decline (
   // Poll udp out of the net tpl if synchronous call.\r
   //\r
   if (Instance->Config->IaInfoEvent == NULL) {\r
-\r
     while (Instance->UdpSts == EFI_ALREADY_STARTED) {\r
       Service->UdpIo->Protocol.Udp6->Poll (Service->UdpIo->Protocol.Udp6);\r
     }\r
+\r
     return Instance->UdpSts;\r
   }\r
 \r
@@ -975,12 +982,12 @@ ON_ERROR:
   if (DecIa != NULL) {\r
     FreePool (DecIa);\r
   }\r
+\r
   gBS->RestoreTPL (OldTpl);\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Release one or more addresses associated with the configured Ia\r
   for current instance.\r
@@ -1018,18 +1025,18 @@ ON_ERROR:
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp6Release (\r
-  IN EFI_DHCP6_PROTOCOL        *This,\r
-  IN UINT32                    AddressCount,\r
-  IN EFI_IPv6_ADDRESS          *Addresses\r
+  IN EFI_DHCP6_PROTOCOL  *This,\r
+  IN UINT32              AddressCount,\r
+  IN EFI_IPv6_ADDRESS    *Addresses\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_TPL                      OldTpl;\r
-  EFI_DHCP6_IA                 *RelIa;\r
-  DHCP6_INSTANCE               *Instance;\r
-  DHCP6_SERVICE                *Service;\r
+  EFI_STATUS      Status;\r
+  EFI_TPL         OldTpl;\r
+  EFI_DHCP6_IA    *RelIa;\r
+  DHCP6_INSTANCE  *Instance;\r
+  DHCP6_SERVICE   *Service;\r
 \r
-  if (This == NULL || (AddressCount != 0 && Addresses == NULL)) {\r
+  if ((This == NULL) || ((AddressCount != 0) && (Addresses == NULL))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1054,7 +1061,7 @@ EfiDhcp6Release (
   //\r
   Status = Dhcp6CheckAddress (Instance->IaCb.Ia, AddressCount, Addresses);\r
 \r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
@@ -1084,7 +1091,7 @@ EfiDhcp6Release (
   //\r
   // Register receive callback for the stateful exchange process.\r
   //\r
-  Status = UdpIoRecvDatagram(\r
+  Status = UdpIoRecvDatagram (\r
              Service->UdpIo,\r
              Dhcp6ReceivePacket,\r
              Service,\r
@@ -1105,6 +1112,7 @@ EfiDhcp6Release (
     while (Instance->UdpSts == EFI_ALREADY_STARTED) {\r
       Service->UdpIo->Protocol.Udp6->Poll (Service->UdpIo->Protocol.Udp6);\r
     }\r
+\r
     return Instance->UdpSts;\r
   }\r
 \r
@@ -1115,12 +1123,12 @@ ON_ERROR:
   if (RelIa != NULL) {\r
     FreePool (RelIa);\r
   }\r
+\r
   gBS->RestoreTPL (OldTpl);\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Parse the option data in the Dhcp6 packet.\r
 \r
@@ -1146,21 +1154,21 @@ EfiDhcp6Parse (
   OUT EFI_DHCP6_PACKET_OPTION  *PacketOptionList[]  OPTIONAL\r
   )\r
 {\r
-  UINT32                       OptCnt;\r
-  UINT32                       OptLen;\r
-  UINT16                       DataLen;\r
-  UINT8                        *Start;\r
-  UINT8                        *End;\r
+  UINT32  OptCnt;\r
+  UINT32  OptLen;\r
+  UINT16  DataLen;\r
+  UINT8   *Start;\r
+  UINT8   *End;\r
 \r
-  if (This == NULL || Packet == NULL || OptionCount == NULL) {\r
+  if ((This == NULL) || (Packet == NULL) || (OptionCount == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (*OptionCount != 0 && PacketOptionList == NULL) {\r
+  if ((*OptionCount != 0) && (PacketOptionList == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (Packet->Length > Packet->Size || Packet->Length < sizeof (EFI_DHCP6_HEADER)) {\r
+  if ((Packet->Length > Packet->Size) || (Packet->Length < sizeof (EFI_DHCP6_HEADER))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1185,7 +1193,7 @@ EfiDhcp6Parse (
   // Calculate the number of option in the packet.\r
   //\r
   while (Start < End) {\r
-    DataLen = ((EFI_DHCP6_PACKET_OPTION *) Start)->OpLen;\r
+    DataLen = ((EFI_DHCP6_PACKET_OPTION *)Start)->OpLen;\r
     Start  += (NTOHS (DataLen) + 4);\r
     OptCnt++;\r
   }\r
@@ -1208,13 +1216,11 @@ EfiDhcp6Parse (
   Start  = Packet->Dhcp6.Option;\r
 \r
   while (Start < End) {\r
-\r
-    PacketOptionList[OptCnt] = (EFI_DHCP6_PACKET_OPTION *) Start;\r
-    DataLen = ((EFI_DHCP6_PACKET_OPTION *) Start)->OpLen;\r
-    Start  += (NTOHS (DataLen) + 4);\r
+    PacketOptionList[OptCnt] = (EFI_DHCP6_PACKET_OPTION *)Start;\r
+    DataLen                  = ((EFI_DHCP6_PACKET_OPTION *)Start)->OpLen;\r
+    Start                   += (NTOHS (DataLen) + 4);\r
     OptCnt++;\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
-\r
index f88b00ad0482a01ed230449e62388b1bb2a562d8..0eb9c669b5a1c2f79458d8dc10c8488507c1d8f7 100644 (file)
@@ -10,7 +10,6 @@
 #ifndef __EFI_DHCP6_IMPL_H__\r
 #define __EFI_DHCP6_IMPL_H__\r
 \r
-\r
 #include <Uefi.h>\r
 \r
 #include <IndustryStandard/Dhcp.h>\r
 #include <Library/PrintLib.h>\r
 #include <Guid/ZeroGuid.h>\r
 \r
-\r
-typedef struct _DHCP6_IA_CB    DHCP6_IA_CB;\r
-typedef struct _DHCP6_INF_CB   DHCP6_INF_CB;\r
-typedef struct _DHCP6_TX_CB    DHCP6_TX_CB;\r
-typedef struct _DHCP6_SERVICE  DHCP6_SERVICE;\r
-typedef struct _DHCP6_INSTANCE DHCP6_INSTANCE;\r
+typedef struct _DHCP6_IA_CB     DHCP6_IA_CB;\r
+typedef struct _DHCP6_INF_CB    DHCP6_INF_CB;\r
+typedef struct _DHCP6_TX_CB     DHCP6_TX_CB;\r
+typedef struct _DHCP6_SERVICE   DHCP6_SERVICE;\r
+typedef struct _DHCP6_INSTANCE  DHCP6_INSTANCE;\r
 \r
 #include "Dhcp6Utility.h"\r
 #include "Dhcp6Io.h"\r
@@ -47,104 +45,104 @@ typedef struct _DHCP6_INSTANCE DHCP6_INSTANCE;
 #define DHCP6_SERVICE_SIGNATURE   SIGNATURE_32 ('D', 'H', '6', 'S')\r
 #define DHCP6_INSTANCE_SIGNATURE  SIGNATURE_32 ('D', 'H', '6', 'I')\r
 \r
-#define DHCP6_PACKET_ALL          0\r
-#define DHCP6_PACKET_STATEFUL     1\r
-#define DHCP6_PACKET_STATELESS    2\r
+#define DHCP6_PACKET_ALL        0\r
+#define DHCP6_PACKET_STATEFUL   1\r
+#define DHCP6_PACKET_STATELESS  2\r
 \r
-#define DHCP6_BASE_PACKET_SIZE    1024\r
+#define DHCP6_BASE_PACKET_SIZE  1024\r
 \r
-#define DHCP6_PORT_CLIENT         546\r
-#define DHCP6_PORT_SERVER         547\r
+#define DHCP6_PORT_CLIENT  546\r
+#define DHCP6_PORT_SERVER  547\r
 \r
-#define DHCP_CHECK_MEDIA_WAITING_TIME    EFI_TIMER_PERIOD_SECONDS(20)\r
+#define DHCP_CHECK_MEDIA_WAITING_TIME  EFI_TIMER_PERIOD_SECONDS(20)\r
 \r
-#define DHCP6_INSTANCE_FROM_THIS(Instance) CR ((Instance), DHCP6_INSTANCE, Dhcp6, DHCP6_INSTANCE_SIGNATURE)\r
-#define DHCP6_SERVICE_FROM_THIS(Service)   CR ((Service), DHCP6_SERVICE, ServiceBinding, DHCP6_SERVICE_SIGNATURE)\r
+#define DHCP6_INSTANCE_FROM_THIS(Instance)  CR ((Instance), DHCP6_INSTANCE, Dhcp6, DHCP6_INSTANCE_SIGNATURE)\r
+#define DHCP6_SERVICE_FROM_THIS(Service)    CR ((Service), DHCP6_SERVICE, ServiceBinding, DHCP6_SERVICE_SIGNATURE)\r
 \r
-extern EFI_IPv6_ADDRESS           mAllDhcpRelayAndServersAddress;\r
-extern EFI_DHCP6_PROTOCOL         gDhcp6ProtocolTemplate;\r
+extern EFI_IPv6_ADDRESS    mAllDhcpRelayAndServersAddress;\r
+extern EFI_DHCP6_PROTOCOL  gDhcp6ProtocolTemplate;\r
 \r
 //\r
 // Control block for each IA.\r
 //\r
 struct _DHCP6_IA_CB {\r
-  EFI_DHCP6_IA                  *Ia;\r
-  UINT32                        T1;\r
-  UINT32                        T2;\r
-  UINT32                        AllExpireTime;\r
-  UINT32                        LeaseTime;\r
+  EFI_DHCP6_IA    *Ia;\r
+  UINT32          T1;\r
+  UINT32          T2;\r
+  UINT32          AllExpireTime;\r
+  UINT32          LeaseTime;\r
 };\r
 \r
 //\r
 // Control block for each transmitted message.\r
 //\r
 struct _DHCP6_TX_CB {\r
-  LIST_ENTRY                    Link;\r
-  UINT32                        Xid;\r
-  EFI_DHCP6_PACKET              *TxPacket;\r
-  EFI_DHCP6_RETRANSMISSION      RetryCtl;\r
-  UINT32                        RetryCnt;\r
-  UINT32                        RetryExp;\r
-  UINT32                        RetryLos;\r
-  UINT32                        TickTime;\r
-  UINT16                        *Elapsed;\r
-  BOOLEAN                       SolicitRetry;\r
+  LIST_ENTRY                  Link;\r
+  UINT32                      Xid;\r
+  EFI_DHCP6_PACKET            *TxPacket;\r
+  EFI_DHCP6_RETRANSMISSION    RetryCtl;\r
+  UINT32                      RetryCnt;\r
+  UINT32                      RetryExp;\r
+  UINT32                      RetryLos;\r
+  UINT32                      TickTime;\r
+  UINT16                      *Elapsed;\r
+  BOOLEAN                     SolicitRetry;\r
 };\r
 \r
 //\r
 // Control block for each info-request message.\r
 //\r
 struct _DHCP6_INF_CB {\r
-  LIST_ENTRY                    Link;\r
-  UINT32                        Xid;\r
-  EFI_DHCP6_INFO_CALLBACK       ReplyCallback;\r
-  VOID                          *CallbackContext;\r
-  EFI_EVENT                     TimeoutEvent;\r
+  LIST_ENTRY                 Link;\r
+  UINT32                     Xid;\r
+  EFI_DHCP6_INFO_CALLBACK    ReplyCallback;\r
+  VOID                       *CallbackContext;\r
+  EFI_EVENT                  TimeoutEvent;\r
 };\r
 \r
 //\r
 // Control block for Dhcp6 instance, it's per configuration data.\r
 //\r
 struct _DHCP6_INSTANCE {\r
-  UINT32                        Signature;\r
-  EFI_HANDLE                    Handle;\r
-  DHCP6_SERVICE                 *Service;\r
-  LIST_ENTRY                    Link;\r
-  EFI_DHCP6_PROTOCOL            Dhcp6;\r
-  EFI_EVENT                     Timer;\r
-  EFI_DHCP6_CONFIG_DATA         *Config;\r
-  EFI_DHCP6_IA                  *CacheIa;\r
-  DHCP6_IA_CB                   IaCb;\r
-  LIST_ENTRY                    TxList;\r
-  LIST_ENTRY                    InfList;\r
-  EFI_DHCP6_PACKET              *AdSelect;\r
-  UINT8                         AdPref;\r
-  EFI_IPv6_ADDRESS              *Unicast;\r
-  volatile EFI_STATUS           UdpSts;\r
-  BOOLEAN                       InDestroy;\r
-  BOOLEAN                       MediaPresent;\r
+  UINT32                   Signature;\r
+  EFI_HANDLE               Handle;\r
+  DHCP6_SERVICE            *Service;\r
+  LIST_ENTRY               Link;\r
+  EFI_DHCP6_PROTOCOL       Dhcp6;\r
+  EFI_EVENT                Timer;\r
+  EFI_DHCP6_CONFIG_DATA    *Config;\r
+  EFI_DHCP6_IA             *CacheIa;\r
+  DHCP6_IA_CB              IaCb;\r
+  LIST_ENTRY               TxList;\r
+  LIST_ENTRY               InfList;\r
+  EFI_DHCP6_PACKET         *AdSelect;\r
+  UINT8                    AdPref;\r
+  EFI_IPv6_ADDRESS         *Unicast;\r
+  volatile EFI_STATUS      UdpSts;\r
+  BOOLEAN                  InDestroy;\r
+  BOOLEAN                  MediaPresent;\r
   //\r
   // StartTime is used to calculate the 'elapsed-time' option. Refer to RFC3315,\r
   // the elapsed-time is amount of time since the client began its current DHCP transaction.\r
   //\r
-  UINT64                        StartTime;\r
+  UINT64                   StartTime;\r
 };\r
 \r
 //\r
 // Control block for Dhcp6 service, it's per Nic handle.\r
 //\r
 struct _DHCP6_SERVICE {\r
-  UINT32                        Signature;\r
-  EFI_HANDLE                    Controller;\r
-  EFI_HANDLE                    Image;\r
-  EFI_SERVICE_BINDING_PROTOCOL  ServiceBinding;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL   *Snp;\r
-  EFI_IP6_CONFIG_PROTOCOL       *Ip6Cfg;\r
-  EFI_DHCP6_DUID                *ClientId;\r
-  UDP_IO                        *UdpIo;\r
-  UINT32                        Xid;\r
-  LIST_ENTRY                    Child;\r
-  UINTN                         NumOfChild;\r
+  UINT32                          Signature;\r
+  EFI_HANDLE                      Controller;\r
+  EFI_HANDLE                      Image;\r
+  EFI_SERVICE_BINDING_PROTOCOL    ServiceBinding;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL     *Snp;\r
+  EFI_IP6_CONFIG_PROTOCOL         *Ip6Cfg;\r
+  EFI_DHCP6_DUID                  *ClientId;\r
+  UDP_IO                          *UdpIo;\r
+  UINT32                          Xid;\r
+  LIST_ENTRY                      Child;\r
+  UINTN                           NumOfChild;\r
 };\r
 \r
 /**\r
@@ -179,7 +177,7 @@ struct _DHCP6_SERVICE {
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp6Start (\r
-  IN EFI_DHCP6_PROTOCOL        *This\r
+  IN EFI_DHCP6_PROTOCOL  *This\r
   );\r
 \r
 /**\r
@@ -200,7 +198,7 @@ EfiDhcp6Start (
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp6Stop (\r
-  IN EFI_DHCP6_PROTOCOL        *This\r
+  IN EFI_DHCP6_PROTOCOL  *This\r
   );\r
 \r
 /**\r
@@ -222,9 +220,9 @@ EfiDhcp6Stop (
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp6GetModeData (\r
-  IN  EFI_DHCP6_PROTOCOL       *This,\r
-  OUT EFI_DHCP6_MODE_DATA      *Dhcp6ModeData      OPTIONAL,\r
-  OUT EFI_DHCP6_CONFIG_DATA    *Dhcp6ConfigData    OPTIONAL\r
+  IN  EFI_DHCP6_PROTOCOL     *This,\r
+  OUT EFI_DHCP6_MODE_DATA    *Dhcp6ModeData      OPTIONAL,\r
+  OUT EFI_DHCP6_CONFIG_DATA  *Dhcp6ConfigData    OPTIONAL\r
   );\r
 \r
 /**\r
@@ -259,8 +257,8 @@ EfiDhcp6GetModeData (
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp6Configure (\r
-  IN EFI_DHCP6_PROTOCOL        *This,\r
-  IN EFI_DHCP6_CONFIG_DATA     *Dhcp6CfgData    OPTIONAL\r
+  IN EFI_DHCP6_PROTOCOL     *This,\r
+  IN EFI_DHCP6_CONFIG_DATA  *Dhcp6CfgData    OPTIONAL\r
   );\r
 \r
 /**\r
@@ -366,8 +364,8 @@ EfiDhcp6InfoRequest (
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp6RenewRebind (\r
-  IN EFI_DHCP6_PROTOCOL        *This,\r
-  IN BOOLEAN                   RebindRequest\r
+  IN EFI_DHCP6_PROTOCOL  *This,\r
+  IN BOOLEAN             RebindRequest\r
   );\r
 \r
 /**\r
@@ -405,9 +403,9 @@ EfiDhcp6RenewRebind (
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp6Decline (\r
-  IN EFI_DHCP6_PROTOCOL        *This,\r
-  IN UINT32                    AddressCount,\r
-  IN EFI_IPv6_ADDRESS          *Addresses\r
+  IN EFI_DHCP6_PROTOCOL  *This,\r
+  IN UINT32              AddressCount,\r
+  IN EFI_IPv6_ADDRESS    *Addresses\r
   );\r
 \r
 /**\r
@@ -446,9 +444,9 @@ EfiDhcp6Decline (
 EFI_STATUS\r
 EFIAPI\r
 EfiDhcp6Release (\r
-  IN EFI_DHCP6_PROTOCOL        *This,\r
-  IN UINT32                    AddressCount,\r
-  IN EFI_IPv6_ADDRESS          *Addresses\r
+  IN EFI_DHCP6_PROTOCOL  *This,\r
+  IN UINT32              AddressCount,\r
+  IN EFI_IPv6_ADDRESS    *Addresses\r
   );\r
 \r
 /**\r
index c20876d5a5d32fa550e7b3981033a55faf7a9706..dcd01e6268b14a6733aad366c545dacebb6637e6 100644 (file)
@@ -10,7 +10,6 @@
 \r
 #include "Dhcp6Impl.h"\r
 \r
-\r
 /**\r
   Enqueue the packet into the retry list in case of timeout.\r
 \r
@@ -34,8 +33,8 @@ Dhcp6EnqueueRetry (
   IN EFI_DHCP6_RETRANSMISSION  *RetryCtl     OPTIONAL\r
   )\r
 {\r
-  DHCP6_TX_CB                  *TxCb;\r
-  DHCP6_IA_CB                  *IaCb;\r
+  DHCP6_TX_CB  *TxCb;\r
+  DHCP6_IA_CB  *IaCb;\r
 \r
   ASSERT (Packet != NULL);\r
 \r
@@ -55,156 +54,156 @@ Dhcp6EnqueueRetry (
   //\r
   // Save pointer to elapsed-time value so we can update it on retransmits.\r
   //\r
-  TxCb->Elapsed  = Elapsed;\r
+  TxCb->Elapsed = Elapsed;\r
 \r
   //\r
   // Calculate the retransmission according to the message type.\r
   //\r
   switch (Packet->Dhcp6.Header.MessageType) {\r
-  case Dhcp6MsgSolicit:\r
-    //\r
-    // Calculate the retransmission threshold value for solicit packet.\r
-    // Use the default value by rfc-3315 if user doesn't configure.\r
-    //\r
-    if (RetryCtl == NULL) {\r
-      TxCb->RetryCtl.Irt = DHCP6_SOL_IRT;\r
-      TxCb->RetryCtl.Mrc = DHCP6_SOL_MRC;\r
-      TxCb->RetryCtl.Mrt = DHCP6_SOL_MRT;\r
-      TxCb->RetryCtl.Mrd = DHCP6_SOL_MRD;\r
-    } else {\r
-      TxCb->RetryCtl.Irt = (RetryCtl->Irt != 0) ? RetryCtl->Irt : DHCP6_SOL_IRT;\r
-      TxCb->RetryCtl.Mrc = (RetryCtl->Mrc != 0) ? RetryCtl->Mrc : DHCP6_SOL_MRC;\r
-      TxCb->RetryCtl.Mrt = (RetryCtl->Mrt != 0) ? RetryCtl->Mrt : DHCP6_SOL_MRT;\r
-      TxCb->RetryCtl.Mrd = (RetryCtl->Mrd != 0) ? RetryCtl->Mrd : DHCP6_SOL_MRD;\r
-    }\r
+    case Dhcp6MsgSolicit:\r
+      //\r
+      // Calculate the retransmission threshold value for solicit packet.\r
+      // Use the default value by rfc-3315 if user doesn't configure.\r
+      //\r
+      if (RetryCtl == NULL) {\r
+        TxCb->RetryCtl.Irt = DHCP6_SOL_IRT;\r
+        TxCb->RetryCtl.Mrc = DHCP6_SOL_MRC;\r
+        TxCb->RetryCtl.Mrt = DHCP6_SOL_MRT;\r
+        TxCb->RetryCtl.Mrd = DHCP6_SOL_MRD;\r
+      } else {\r
+        TxCb->RetryCtl.Irt = (RetryCtl->Irt != 0) ? RetryCtl->Irt : DHCP6_SOL_IRT;\r
+        TxCb->RetryCtl.Mrc = (RetryCtl->Mrc != 0) ? RetryCtl->Mrc : DHCP6_SOL_MRC;\r
+        TxCb->RetryCtl.Mrt = (RetryCtl->Mrt != 0) ? RetryCtl->Mrt : DHCP6_SOL_MRT;\r
+        TxCb->RetryCtl.Mrd = (RetryCtl->Mrd != 0) ? RetryCtl->Mrd : DHCP6_SOL_MRD;\r
+      }\r
+\r
+      TxCb->RetryExp = Dhcp6CalculateExpireTime (\r
+                         TxCb->RetryCtl.Irt,\r
+                         TRUE,\r
+                         FALSE\r
+                         );\r
+      break;\r
 \r
-    TxCb->RetryExp       = Dhcp6CalculateExpireTime (\r
+    case Dhcp6MsgRequest:\r
+      //\r
+      // Calculate the retransmission threshold value for request packet.\r
+      //\r
+      TxCb->RetryCtl.Irt = DHCP6_REQ_IRT;\r
+      TxCb->RetryCtl.Mrc = DHCP6_REQ_MRC;\r
+      TxCb->RetryCtl.Mrt = DHCP6_REQ_MRT;\r
+      TxCb->RetryCtl.Mrd = DHCP6_REQ_MRD;\r
+      TxCb->RetryExp     = Dhcp6CalculateExpireTime (\r
                              TxCb->RetryCtl.Irt,\r
                              TRUE,\r
-                             FALSE\r
+                             TRUE\r
                              );\r
-    break;\r
-\r
-  case Dhcp6MsgRequest:\r
-    //\r
-    // Calculate the retransmission threshold value for request packet.\r
-    //\r
-    TxCb->RetryCtl.Irt = DHCP6_REQ_IRT;\r
-    TxCb->RetryCtl.Mrc = DHCP6_REQ_MRC;\r
-    TxCb->RetryCtl.Mrt = DHCP6_REQ_MRT;\r
-    TxCb->RetryCtl.Mrd = DHCP6_REQ_MRD;\r
-    TxCb->RetryExp     = Dhcp6CalculateExpireTime (\r
-                           TxCb->RetryCtl.Irt,\r
-                           TRUE,\r
-                           TRUE\r
-                           );\r
-    break;\r
-\r
-  case Dhcp6MsgConfirm:\r
-    //\r
-    // Calculate the retransmission threshold value for confirm packet.\r
-    //\r
-    TxCb->RetryCtl.Irt = DHCP6_CNF_IRT;\r
-    TxCb->RetryCtl.Mrc = DHCP6_CNF_MRC;\r
-    TxCb->RetryCtl.Mrt = DHCP6_CNF_MRT;\r
-    TxCb->RetryCtl.Mrd = DHCP6_CNF_MRD;\r
-    TxCb->RetryExp     = Dhcp6CalculateExpireTime (\r
-                           TxCb->RetryCtl.Irt,\r
-                           TRUE,\r
-                           TRUE\r
-                           );\r
-    break;\r
-\r
-  case Dhcp6MsgRenew:\r
-    //\r
-    // Calculate the retransmission threshold value for renew packet.\r
-    //\r
-    TxCb->RetryCtl.Irt = DHCP6_REB_IRT;\r
-    TxCb->RetryCtl.Mrc = DHCP6_REB_MRC;\r
-    TxCb->RetryCtl.Mrt = DHCP6_REB_MRT;\r
-    TxCb->RetryCtl.Mrd = IaCb->T2 - IaCb->T1;\r
-    TxCb->RetryExp     = Dhcp6CalculateExpireTime (\r
-                           TxCb->RetryCtl.Irt,\r
-                           TRUE,\r
-                           TRUE\r
-                           );\r
-    break;\r
+      break;\r
 \r
-  case Dhcp6MsgRebind:\r
-    //\r
-    // Calculate the retransmission threshold value for rebind packet.\r
-    //\r
-    TxCb->RetryCtl.Irt = DHCP6_REN_IRT;\r
-    TxCb->RetryCtl.Mrc = DHCP6_REN_MRC;\r
-    TxCb->RetryCtl.Mrt = DHCP6_REN_MRT;\r
-    TxCb->RetryCtl.Mrd = IaCb->AllExpireTime - IaCb->T2;\r
-    TxCb->RetryExp     = Dhcp6CalculateExpireTime (\r
-                           TxCb->RetryCtl.Irt,\r
-                           TRUE,\r
-                           TRUE\r
-                           );\r
-    break;\r
+    case Dhcp6MsgConfirm:\r
+      //\r
+      // Calculate the retransmission threshold value for confirm packet.\r
+      //\r
+      TxCb->RetryCtl.Irt = DHCP6_CNF_IRT;\r
+      TxCb->RetryCtl.Mrc = DHCP6_CNF_MRC;\r
+      TxCb->RetryCtl.Mrt = DHCP6_CNF_MRT;\r
+      TxCb->RetryCtl.Mrd = DHCP6_CNF_MRD;\r
+      TxCb->RetryExp     = Dhcp6CalculateExpireTime (\r
+                             TxCb->RetryCtl.Irt,\r
+                             TRUE,\r
+                             TRUE\r
+                             );\r
+      break;\r
 \r
-  case Dhcp6MsgDecline:\r
-    //\r
-    // Calculate the retransmission threshold value for decline packet.\r
-    //\r
-    TxCb->RetryCtl.Irt = DHCP6_DEC_IRT;\r
-    TxCb->RetryCtl.Mrc = DHCP6_DEC_MRC;\r
-    TxCb->RetryCtl.Mrt = DHCP6_DEC_MRT;\r
-    TxCb->RetryCtl.Mrd = DHCP6_DEC_MRD;\r
-    TxCb->RetryExp     = Dhcp6CalculateExpireTime (\r
-                           TxCb->RetryCtl.Irt,\r
-                           TRUE,\r
-                           TRUE\r
-                           );\r
-    break;\r
+    case Dhcp6MsgRenew:\r
+      //\r
+      // Calculate the retransmission threshold value for renew packet.\r
+      //\r
+      TxCb->RetryCtl.Irt = DHCP6_REB_IRT;\r
+      TxCb->RetryCtl.Mrc = DHCP6_REB_MRC;\r
+      TxCb->RetryCtl.Mrt = DHCP6_REB_MRT;\r
+      TxCb->RetryCtl.Mrd = IaCb->T2 - IaCb->T1;\r
+      TxCb->RetryExp     = Dhcp6CalculateExpireTime (\r
+                             TxCb->RetryCtl.Irt,\r
+                             TRUE,\r
+                             TRUE\r
+                             );\r
+      break;\r
 \r
-  case Dhcp6MsgRelease:\r
-    //\r
-    // Calculate the retransmission threshold value for release packet.\r
-    //\r
-    TxCb->RetryCtl.Irt = DHCP6_REL_IRT;\r
-    TxCb->RetryCtl.Mrc = DHCP6_REL_MRC;\r
-    TxCb->RetryCtl.Mrt = DHCP6_REL_MRT;\r
-    TxCb->RetryCtl.Mrd = DHCP6_REL_MRD;\r
-    TxCb->RetryExp     = Dhcp6CalculateExpireTime (\r
-                           TxCb->RetryCtl.Irt,\r
-                           TRUE,\r
-                           TRUE\r
-                           );\r
-    break;\r
+    case Dhcp6MsgRebind:\r
+      //\r
+      // Calculate the retransmission threshold value for rebind packet.\r
+      //\r
+      TxCb->RetryCtl.Irt = DHCP6_REN_IRT;\r
+      TxCb->RetryCtl.Mrc = DHCP6_REN_MRC;\r
+      TxCb->RetryCtl.Mrt = DHCP6_REN_MRT;\r
+      TxCb->RetryCtl.Mrd = IaCb->AllExpireTime - IaCb->T2;\r
+      TxCb->RetryExp     = Dhcp6CalculateExpireTime (\r
+                             TxCb->RetryCtl.Irt,\r
+                             TRUE,\r
+                             TRUE\r
+                             );\r
+      break;\r
 \r
-  case Dhcp6MsgInfoRequest:\r
-    //\r
-    // Calculate the retransmission threshold value for info-request packet.\r
-    // Use the default value by rfc-3315 if user doesn't configure.\r
-    //\r
-    if (RetryCtl == NULL) {\r
-      TxCb->RetryCtl.Irt = DHCP6_INF_IRT;\r
-      TxCb->RetryCtl.Mrc = DHCP6_INF_MRC;\r
-      TxCb->RetryCtl.Mrt = DHCP6_INF_MRT;\r
-      TxCb->RetryCtl.Mrd = DHCP6_INF_MRD;\r
-    } else {\r
-      TxCb->RetryCtl.Irt = (RetryCtl->Irt != 0) ? RetryCtl->Irt : DHCP6_INF_IRT;\r
-      TxCb->RetryCtl.Mrc = (RetryCtl->Mrc != 0) ? RetryCtl->Mrc : DHCP6_INF_MRC;\r
-      TxCb->RetryCtl.Mrt = (RetryCtl->Mrt != 0) ? RetryCtl->Mrt : DHCP6_INF_MRT;\r
-      TxCb->RetryCtl.Mrd = (RetryCtl->Mrd != 0) ? RetryCtl->Mrd : DHCP6_INF_MRD;\r
-    }\r
+    case Dhcp6MsgDecline:\r
+      //\r
+      // Calculate the retransmission threshold value for decline packet.\r
+      //\r
+      TxCb->RetryCtl.Irt = DHCP6_DEC_IRT;\r
+      TxCb->RetryCtl.Mrc = DHCP6_DEC_MRC;\r
+      TxCb->RetryCtl.Mrt = DHCP6_DEC_MRT;\r
+      TxCb->RetryCtl.Mrd = DHCP6_DEC_MRD;\r
+      TxCb->RetryExp     = Dhcp6CalculateExpireTime (\r
+                             TxCb->RetryCtl.Irt,\r
+                             TRUE,\r
+                             TRUE\r
+                             );\r
+      break;\r
 \r
-    TxCb->RetryExp       = Dhcp6CalculateExpireTime (\r
+    case Dhcp6MsgRelease:\r
+      //\r
+      // Calculate the retransmission threshold value for release packet.\r
+      //\r
+      TxCb->RetryCtl.Irt = DHCP6_REL_IRT;\r
+      TxCb->RetryCtl.Mrc = DHCP6_REL_MRC;\r
+      TxCb->RetryCtl.Mrt = DHCP6_REL_MRT;\r
+      TxCb->RetryCtl.Mrd = DHCP6_REL_MRD;\r
+      TxCb->RetryExp     = Dhcp6CalculateExpireTime (\r
                              TxCb->RetryCtl.Irt,\r
                              TRUE,\r
                              TRUE\r
                              );\r
-    break;\r
+      break;\r
 \r
-  default:\r
-    //\r
-    // Unexpected message type.\r
-    //\r
-    FreePool(TxCb);\r
-    return EFI_DEVICE_ERROR;\r
+    case Dhcp6MsgInfoRequest:\r
+      //\r
+      // Calculate the retransmission threshold value for info-request packet.\r
+      // Use the default value by rfc-3315 if user doesn't configure.\r
+      //\r
+      if (RetryCtl == NULL) {\r
+        TxCb->RetryCtl.Irt = DHCP6_INF_IRT;\r
+        TxCb->RetryCtl.Mrc = DHCP6_INF_MRC;\r
+        TxCb->RetryCtl.Mrt = DHCP6_INF_MRT;\r
+        TxCb->RetryCtl.Mrd = DHCP6_INF_MRD;\r
+      } else {\r
+        TxCb->RetryCtl.Irt = (RetryCtl->Irt != 0) ? RetryCtl->Irt : DHCP6_INF_IRT;\r
+        TxCb->RetryCtl.Mrc = (RetryCtl->Mrc != 0) ? RetryCtl->Mrc : DHCP6_INF_MRC;\r
+        TxCb->RetryCtl.Mrt = (RetryCtl->Mrt != 0) ? RetryCtl->Mrt : DHCP6_INF_MRT;\r
+        TxCb->RetryCtl.Mrd = (RetryCtl->Mrd != 0) ? RetryCtl->Mrd : DHCP6_INF_MRD;\r
+      }\r
+\r
+      TxCb->RetryExp = Dhcp6CalculateExpireTime (\r
+                         TxCb->RetryCtl.Irt,\r
+                         TRUE,\r
+                         TRUE\r
+                         );\r
+      break;\r
+\r
+    default:\r
+      //\r
+      // Unexpected message type.\r
+      //\r
+      FreePool (TxCb);\r
+      return EFI_DEVICE_ERROR;\r
   }\r
 \r
   //\r
@@ -215,7 +214,6 @@ Dhcp6EnqueueRetry (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Dequeue the packet from retry list if reply received or timeout at last.\r
 \r
@@ -230,40 +228,36 @@ Dhcp6EnqueueRetry (
 **/\r
 EFI_STATUS\r
 Dhcp6DequeueRetry (\r
-  IN DHCP6_INSTANCE         *Instance,\r
-  IN UINT32                 PacketXid,\r
-  IN BOOLEAN                NeedSignal\r
+  IN DHCP6_INSTANCE  *Instance,\r
+  IN UINT32          PacketXid,\r
+  IN BOOLEAN         NeedSignal\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *NextEntry;\r
-  DHCP6_TX_CB               *TxCb;\r
-  DHCP6_INF_CB              *InfCb;\r
+  LIST_ENTRY    *Entry;\r
+  LIST_ENTRY    *NextEntry;\r
+  DHCP6_TX_CB   *TxCb;\r
+  DHCP6_INF_CB  *InfCb;\r
 \r
   //\r
   // Seek the retransmit node in the retransmit list by packet xid.\r
   //\r
   NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, &Instance->TxList) {\r
-\r
     TxCb = NET_LIST_USER_STRUCT (Entry, DHCP6_TX_CB, Link);\r
-    ASSERT(TxCb->TxPacket);\r
+    ASSERT (TxCb->TxPacket);\r
 \r
     if (TxCb->Xid == PacketXid) {\r
-\r
       if (TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgInfoRequest) {\r
-\r
         //\r
         // Seek the info-request node in the info-request list by packet xid.\r
         //\r
         NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, &Instance->InfList) {\r
-\r
           InfCb = NET_LIST_USER_STRUCT (Entry, DHCP6_INF_CB, Link);\r
 \r
           if (InfCb->Xid == PacketXid) {\r
             //\r
             // Remove the info-request node, and signal the event if timeout.\r
             //\r
-            if (InfCb->TimeoutEvent != NULL && NeedSignal) {\r
+            if ((InfCb->TimeoutEvent != NULL) && NeedSignal) {\r
               gBS->SignalEvent (InfCb->TimeoutEvent);\r
             }\r
 \r
@@ -272,11 +266,12 @@ Dhcp6DequeueRetry (
           }\r
         }\r
       }\r
+\r
       //\r
       // Remove the retransmit node.\r
       //\r
       RemoveEntryList (&TxCb->Link);\r
-      ASSERT(TxCb->TxPacket);\r
+      ASSERT (TxCb->TxPacket);\r
       FreePool (TxCb->TxPacket);\r
       FreePool (TxCb);\r
       return EFI_SUCCESS;\r
@@ -286,7 +281,6 @@ Dhcp6DequeueRetry (
   return EFI_NOT_FOUND;\r
 }\r
 \r
-\r
 /**\r
   Clean up the specific nodes in the retry list.\r
 \r
@@ -296,24 +290,22 @@ Dhcp6DequeueRetry (
 **/\r
 VOID\r
 Dhcp6CleanupRetry (\r
-  IN DHCP6_INSTANCE         *Instance,\r
-  IN UINT32                 Scope\r
+  IN DHCP6_INSTANCE  *Instance,\r
+  IN UINT32          Scope\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *NextEntry;\r
-  DHCP6_TX_CB               *TxCb;\r
-  DHCP6_INF_CB              *InfCb;\r
+  LIST_ENTRY    *Entry;\r
+  LIST_ENTRY    *NextEntry;\r
+  DHCP6_TX_CB   *TxCb;\r
+  DHCP6_INF_CB  *InfCb;\r
 \r
   //\r
   // Clean up all the stateful messages from the retransmit list.\r
   //\r
-  if (Scope == DHCP6_PACKET_STATEFUL || Scope == DHCP6_PACKET_ALL) {\r
-\r
+  if ((Scope == DHCP6_PACKET_STATEFUL) || (Scope == DHCP6_PACKET_ALL)) {\r
     NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, &Instance->TxList) {\r
-\r
       TxCb = NET_LIST_USER_STRUCT (Entry, DHCP6_TX_CB, Link);\r
-      ASSERT(TxCb->TxPacket);\r
+      ASSERT (TxCb->TxPacket);\r
 \r
       if (TxCb->TxPacket->Dhcp6.Header.MessageType != Dhcp6MsgInfoRequest) {\r
         RemoveEntryList (&TxCb->Link);\r
@@ -326,15 +318,13 @@ Dhcp6CleanupRetry (
   //\r
   // Clean up all the stateless messages from the retransmit list.\r
   //\r
-  if (Scope == DHCP6_PACKET_STATELESS || Scope == DHCP6_PACKET_ALL) {\r
-\r
+  if ((Scope == DHCP6_PACKET_STATELESS) || (Scope == DHCP6_PACKET_ALL)) {\r
     //\r
     // Clean up all the retransmit list for stateless messages.\r
     //\r
     NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, &Instance->TxList) {\r
-\r
       TxCb = NET_LIST_USER_STRUCT (Entry, DHCP6_TX_CB, Link);\r
-      ASSERT(TxCb->TxPacket);\r
+      ASSERT (TxCb->TxPacket);\r
 \r
       if (TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgInfoRequest) {\r
         RemoveEntryList (&TxCb->Link);\r
@@ -347,12 +337,12 @@ Dhcp6CleanupRetry (
     // Clean up all the info-request messages list.\r
     //\r
     NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, &Instance->InfList) {\r
-\r
       InfCb = NET_LIST_USER_STRUCT (Entry, DHCP6_INF_CB, Link);\r
 \r
       if (InfCb->TimeoutEvent != NULL) {\r
         gBS->SignalEvent (InfCb->TimeoutEvent);\r
       }\r
+\r
       RemoveEntryList (&InfCb->Link);\r
       FreePool (InfCb);\r
     }\r
@@ -371,11 +361,11 @@ Dhcp6CleanupRetry (
 **/\r
 BOOLEAN\r
 Dhcp6IsValidTxCb (\r
-  IN  DHCP6_INSTANCE          *Instance,\r
-  IN  DHCP6_TX_CB             *TxCb\r
+  IN  DHCP6_INSTANCE  *Instance,\r
+  IN  DHCP6_TX_CB     *TxCb\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
+  LIST_ENTRY  *Entry;\r
 \r
   NET_LIST_FOR_EACH (Entry, &Instance->TxList) {\r
     if (TxCb == NET_LIST_USER_STRUCT (Entry, DHCP6_TX_CB, Link)) {\r
@@ -395,15 +385,15 @@ Dhcp6IsValidTxCb (
 **/\r
 VOID\r
 Dhcp6CleanupSession (\r
-  IN OUT DHCP6_INSTANCE          *Instance,\r
-  IN     EFI_STATUS              Status\r
+  IN OUT DHCP6_INSTANCE  *Instance,\r
+  IN     EFI_STATUS      Status\r
   )\r
 {\r
-  UINTN                          Index;\r
-  EFI_DHCP6_IA                   *Ia;\r
+  UINTN         Index;\r
+  EFI_DHCP6_IA  *Ia;\r
 \r
-  ASSERT(Instance->Config);\r
-  ASSERT(Instance->IaCb.Ia);\r
+  ASSERT (Instance->Config);\r
+  ASSERT (Instance->IaCb.Ia);\r
 \r
   //\r
   // Clean up the retransmit list for stateful messages.\r
@@ -425,23 +415,23 @@ Dhcp6CleanupSession (
   //\r
   // Reinitialize the Ia fields of the instance.\r
   //\r
-  Instance->UdpSts                  = Status;\r
-  Instance->AdSelect                = NULL;\r
-  Instance->AdPref                  = 0;\r
-  Instance->Unicast                 = NULL;\r
-  Instance->IaCb.T1                 = 0;\r
-  Instance->IaCb.T2                 = 0;\r
-  Instance->IaCb.AllExpireTime      = 0;\r
-  Instance->IaCb.LeaseTime          = 0;\r
+  Instance->UdpSts             = Status;\r
+  Instance->AdSelect           = NULL;\r
+  Instance->AdPref             = 0;\r
+  Instance->Unicast            = NULL;\r
+  Instance->IaCb.T1            = 0;\r
+  Instance->IaCb.T2            = 0;\r
+  Instance->IaCb.AllExpireTime = 0;\r
+  Instance->IaCb.LeaseTime     = 0;\r
 \r
   //\r
   // Clear start time\r
   //\r
-  Instance->StartTime               = 0;\r
+  Instance->StartTime = 0;\r
 \r
-  Ia                                = Instance->IaCb.Ia;\r
-  Ia->State                         = Dhcp6Init;\r
-  Ia->ReplyPacket                   = NULL;\r
+  Ia              = Instance->IaCb.Ia;\r
+  Ia->State       = Dhcp6Init;\r
+  Ia->ReplyPacket = NULL;\r
 \r
   //\r
   // Set the addresses as zero lifetime, and then the notify\r
@@ -461,7 +451,6 @@ Dhcp6CleanupSession (
   }\r
 }\r
 \r
-\r
 /**\r
   Callback to user when Dhcp6 transmit/receive occurs.\r
 \r
@@ -477,15 +466,15 @@ Dhcp6CleanupSession (
 EFI_STATUS\r
 EFIAPI\r
 Dhcp6CallbackUser (\r
-  IN     DHCP6_INSTANCE       *Instance,\r
-  IN     EFI_DHCP6_EVENT      Event,\r
-  IN OUT EFI_DHCP6_PACKET     **Packet\r
+  IN     DHCP6_INSTANCE    *Instance,\r
+  IN     EFI_DHCP6_EVENT   Event,\r
+  IN OUT EFI_DHCP6_PACKET  **Packet\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_DHCP6_PACKET            *NewPacket;\r
-  EFI_DHCP6_CALLBACK          Callback;\r
-  VOID                        *Context;\r
+  EFI_STATUS          Status;\r
+  EFI_DHCP6_PACKET    *NewPacket;\r
+  EFI_DHCP6_CALLBACK  Callback;\r
+  VOID                *Context;\r
 \r
   ASSERT (Packet != NULL);\r
   ASSERT (Instance->Config != NULL);\r
@@ -500,7 +489,6 @@ Dhcp6CallbackUser (
   // Callback to user with the new message if has.\r
   //\r
   if (Callback != NULL) {\r
-\r
     Status = Callback (\r
                &Instance->Dhcp6,\r
                Context,\r
@@ -522,7 +510,6 @@ Dhcp6CallbackUser (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Update Ia according to the new reply message.\r
 \r
@@ -535,17 +522,17 @@ Dhcp6CallbackUser (
 **/\r
 EFI_STATUS\r
 Dhcp6UpdateIaInfo (\r
-  IN OUT DHCP6_INSTANCE           *Instance,\r
-  IN     EFI_DHCP6_PACKET         *Packet\r
+  IN OUT DHCP6_INSTANCE    *Instance,\r
+  IN     EFI_DHCP6_PACKET  *Packet\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  UINT8                       *Option;\r
-  UINT8                       *IaInnerOpt;\r
-  UINT16                      IaInnerLen;\r
-  UINT16                      StsCode;\r
-  UINT32                      T1;\r
-  UINT32                      T2;\r
+  EFI_STATUS  Status;\r
+  UINT8       *Option;\r
+  UINT8       *IaInnerOpt;\r
+  UINT16      IaInnerLen;\r
+  UINT16      StsCode;\r
+  UINT32      T1;\r
+  UINT32      T2;\r
 \r
   ASSERT (Instance->Config != NULL);\r
   //\r
@@ -611,23 +598,24 @@ Dhcp6UpdateIaInfo (
   // The inner options still start with 2 bytes option-code and 2 bytes option-len.\r
   //\r
   if (Instance->Config->IaDescriptor.Type == Dhcp6OptIana) {\r
-    T1 = NTOHL (ReadUnaligned32 ((UINT32 *) (Option + 8)));\r
-    T2 = NTOHL (ReadUnaligned32 ((UINT32 *) (Option + 12)));\r
+    T1 = NTOHL (ReadUnaligned32 ((UINT32 *)(Option + 8)));\r
+    T2 = NTOHL (ReadUnaligned32 ((UINT32 *)(Option + 12)));\r
     //\r
     // Refer to RFC3155 Chapter 22.4. If a client receives an IA_NA with T1 greater than T2,\r
     // and both T1 and T2 are greater than 0, the client discards the IA_NA option and processes\r
     // the remainder of the message as though the server had not  included the invalid IA_NA option.\r
     //\r
-    if (T1 > T2 && T2 > 0) {\r
+    if ((T1 > T2) && (T2 > 0)) {\r
       return EFI_DEVICE_ERROR;\r
     }\r
+\r
     IaInnerOpt = Option + 16;\r
-    IaInnerLen = (UINT16) (NTOHS (ReadUnaligned16 ((UINT16 *) (Option + 2))) - 12);\r
+    IaInnerLen = (UINT16)(NTOHS (ReadUnaligned16 ((UINT16 *)(Option + 2))) - 12);\r
   } else {\r
-    T1 = 0;\r
-    T2 = 0;\r
+    T1         = 0;\r
+    T2         = 0;\r
     IaInnerOpt = Option + 8;\r
-    IaInnerLen = (UINT16) (NTOHS (ReadUnaligned16 ((UINT16 *) (Option + 2))) - 4);\r
+    IaInnerLen = (UINT16)(NTOHS (ReadUnaligned16 ((UINT16 *)(Option + 2))) - 4);\r
   }\r
 \r
   //\r
@@ -653,7 +641,7 @@ Dhcp6UpdateIaInfo (
   Option  = Dhcp6SeekOption (IaInnerOpt, IaInnerLen, Dhcp6OptStatusCode);\r
 \r
   if (Option != NULL) {\r
-    StsCode = NTOHS (ReadUnaligned16 ((UINT16 *) (Option + 4)));\r
+    StsCode = NTOHS (ReadUnaligned16 ((UINT16 *)(Option + 4)));\r
     if (StsCode != Dhcp6StsSuccess) {\r
       return EFI_DEVICE_ERROR;\r
     }\r
@@ -673,8 +661,6 @@ Dhcp6UpdateIaInfo (
   return Status;\r
 }\r
 \r
-\r
-\r
 /**\r
   Seek StatusCode Option in package. A Status Code option may appear in the\r
   options field of a DHCP message and/or in the options field of another option.\r
@@ -690,14 +676,14 @@ Dhcp6UpdateIaInfo (
 **/\r
 EFI_STATUS\r
 Dhcp6SeekStsOption (\r
-  IN     DHCP6_INSTANCE           *Instance,\r
-  IN     EFI_DHCP6_PACKET         *Packet,\r
-  OUT    UINT8                    **Option\r
+  IN     DHCP6_INSTANCE    *Instance,\r
+  IN     EFI_DHCP6_PACKET  *Packet,\r
+  OUT    UINT8             **Option\r
   )\r
 {\r
-  UINT8                       *IaInnerOpt;\r
-  UINT16                      IaInnerLen;\r
-  UINT16                      StsCode;\r
+  UINT8   *IaInnerOpt;\r
+  UINT16  IaInnerLen;\r
+  UINT16  StsCode;\r
 \r
   //\r
   // Seek StatusCode option directly in DHCP message body. That is, search in\r
@@ -710,7 +696,7 @@ Dhcp6SeekStsOption (
               );\r
 \r
   if (*Option != NULL) {\r
-    StsCode = NTOHS (ReadUnaligned16 ((UINT16 *) (*Option + 4)));\r
+    StsCode = NTOHS (ReadUnaligned16 ((UINT16 *)(*Option + 4)));\r
     if (StsCode != Dhcp6StsSuccess) {\r
       return EFI_DEVICE_ERROR;\r
     }\r
@@ -771,10 +757,10 @@ Dhcp6SeekStsOption (
   //\r
   if (Instance->Config->IaDescriptor.Type == Dhcp6OptIana) {\r
     IaInnerOpt = *Option + 16;\r
-    IaInnerLen = (UINT16) (NTOHS (ReadUnaligned16 ((UINT16 *) (*Option + 2))) - 12);\r
+    IaInnerLen = (UINT16)(NTOHS (ReadUnaligned16 ((UINT16 *)(*Option + 2))) - 12);\r
   } else {\r
     IaInnerOpt = *Option + 8;\r
-    IaInnerLen = (UINT16) (NTOHS (ReadUnaligned16 ((UINT16 *) (*Option + 2))) - 4);\r
+    IaInnerLen = (UINT16)(NTOHS (ReadUnaligned16 ((UINT16 *)(*Option + 2))) - 4);\r
   }\r
 \r
   //\r
@@ -796,9 +782,9 @@ Dhcp6SeekStsOption (
   //\r
   // sizeof (option-code + option-len) = 4\r
   //\r
-  *Option  = Dhcp6SeekOption (IaInnerOpt, IaInnerLen, Dhcp6OptStatusCode);\r
+  *Option = Dhcp6SeekOption (IaInnerOpt, IaInnerLen, Dhcp6OptStatusCode);\r
   if (*Option != NULL) {\r
-    StsCode = NTOHS (ReadUnaligned16 ((UINT16 *) (*Option + 4)));\r
+    StsCode = NTOHS (ReadUnaligned16 ((UINT16 *)(*Option + 4)));\r
     if (StsCode != Dhcp6StsSuccess) {\r
       return EFI_DEVICE_ERROR;\r
     }\r
@@ -807,7 +793,6 @@ Dhcp6SeekStsOption (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Transmit Dhcp6 message by udpio.\r
 \r
@@ -822,23 +807,23 @@ Dhcp6SeekStsOption (
 **/\r
 EFI_STATUS\r
 Dhcp6TransmitPacket (\r
-  IN DHCP6_INSTANCE         *Instance,\r
-  IN EFI_DHCP6_PACKET       *Packet,\r
-  IN UINT16                 *Elapsed\r
+  IN DHCP6_INSTANCE    *Instance,\r
+  IN EFI_DHCP6_PACKET  *Packet,\r
+  IN UINT16            *Elapsed\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  NET_BUF                   *Wrap;\r
-  NET_FRAGMENT              Frag;\r
-  UDP_END_POINT             EndPt;\r
-  DHCP6_SERVICE             *Service;\r
+  EFI_STATUS     Status;\r
+  NET_BUF        *Wrap;\r
+  NET_FRAGMENT   Frag;\r
+  UDP_END_POINT  EndPt;\r
+  DHCP6_SERVICE  *Service;\r
 \r
   Service = Instance->Service;\r
 \r
   //\r
   // Wrap it into a netbuf then send it.\r
   //\r
-  Frag.Bulk = (UINT8 *) &Packet->Dhcp6.Header;\r
+  Frag.Bulk = (UINT8 *)&Packet->Dhcp6.Header;\r
   Frag.Len  = Packet->Length;\r
 \r
   //\r
@@ -899,7 +884,6 @@ Dhcp6TransmitPacket (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Create the solicit message and send it.\r
 \r
@@ -912,19 +896,19 @@ Dhcp6TransmitPacket (
 **/\r
 EFI_STATUS\r
 Dhcp6SendSolicitMsg   (\r
-  IN DHCP6_INSTANCE            *Instance\r
+  IN DHCP6_INSTANCE  *Instance\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_DHCP6_PACKET             *Packet;\r
-  EFI_DHCP6_PACKET_OPTION      *UserOpt;\r
-  EFI_DHCP6_DUID               *ClientId;\r
-  DHCP6_SERVICE                *Service;\r
-  UINT8                        *Cursor;\r
-  UINT16                       *Elapsed;\r
-  UINT32                       UserLen;\r
-  UINTN                        Index;\r
-  UINT16                       Length;\r
+  EFI_STATUS               Status;\r
+  EFI_DHCP6_PACKET         *Packet;\r
+  EFI_DHCP6_PACKET_OPTION  *UserOpt;\r
+  EFI_DHCP6_DUID           *ClientId;\r
+  DHCP6_SERVICE            *Service;\r
+  UINT8                    *Cursor;\r
+  UINT16                   *Elapsed;\r
+  UINT32                   UserLen;\r
+  UINTN                    Index;\r
+  UINT16                   Length;\r
 \r
   Service  = Instance->Service;\r
   ClientId = Service->ClientId;\r
@@ -985,9 +969,8 @@ Dhcp6SendSolicitMsg   (
   // Append user-defined when configurate Dhcp6 service.\r
   //\r
   for (Index = 0; Index < Instance->Config->OptionCount; Index++) {\r
-\r
     UserOpt = Instance->Config->OptionList[Index];\r
-    Cursor  = Dhcp6AppendOption(\r
+    Cursor  = Dhcp6AppendOption (\r
                 Cursor,\r
                 UserOpt->OpCode,\r
                 UserOpt->OpLen,\r
@@ -998,7 +981,7 @@ Dhcp6SendSolicitMsg   (
   //\r
   // Determine the size/length of packet.\r
   //\r
-  Packet->Length += (UINT32) (Cursor - Packet->Dhcp6.Option);\r
+  Packet->Length += (UINT32)(Cursor - Packet->Dhcp6.Option);\r
   ASSERT (Packet->Size > Packet->Length + 8);\r
 \r
   //\r
@@ -1051,17 +1034,16 @@ Dhcp6SendSolicitMsg   (
 **/\r
 EFI_STATUS\r
 Dhcp6InitSolicitMsg   (\r
-  IN DHCP6_INSTANCE            *Instance\r
+  IN DHCP6_INSTANCE  *Instance\r
   )\r
 {\r
-  Instance->IaCb.T1 = 0;\r
-  Instance->IaCb.T2 = 0;\r
+  Instance->IaCb.T1                 = 0;\r
+  Instance->IaCb.T2                 = 0;\r
   Instance->IaCb.Ia->IaAddressCount = 0;\r
 \r
   return Dhcp6SendSolicitMsg (Instance);\r
 }\r
 \r
-\r
 /**\r
   Create the request message and send it.\r
 \r
@@ -1075,31 +1057,31 @@ Dhcp6InitSolicitMsg   (
 **/\r
 EFI_STATUS\r
 Dhcp6SendRequestMsg (\r
-  IN DHCP6_INSTANCE            *Instance\r
+  IN DHCP6_INSTANCE  *Instance\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_DHCP6_PACKET             *Packet;\r
-  EFI_DHCP6_PACKET_OPTION      *UserOpt;\r
-  EFI_DHCP6_DUID               *ClientId;\r
-  EFI_DHCP6_DUID               *ServerId;\r
-  DHCP6_SERVICE                *Service;\r
-  UINT8                        *Option;\r
-  UINT8                        *Cursor;\r
-  UINT16                       *Elapsed;\r
-  UINT32                       UserLen;\r
-  UINTN                        Index;\r
-  UINT16                       Length;\r
-\r
-  ASSERT(Instance->AdSelect != NULL);\r
-  ASSERT(Instance->Config != NULL);\r
-  ASSERT(Instance->IaCb.Ia != NULL);\r
-  ASSERT(Instance->Service != NULL);\r
+  EFI_STATUS               Status;\r
+  EFI_DHCP6_PACKET         *Packet;\r
+  EFI_DHCP6_PACKET_OPTION  *UserOpt;\r
+  EFI_DHCP6_DUID           *ClientId;\r
+  EFI_DHCP6_DUID           *ServerId;\r
+  DHCP6_SERVICE            *Service;\r
+  UINT8                    *Option;\r
+  UINT8                    *Cursor;\r
+  UINT16                   *Elapsed;\r
+  UINT32                   UserLen;\r
+  UINTN                    Index;\r
+  UINT16                   Length;\r
+\r
+  ASSERT (Instance->AdSelect != NULL);\r
+  ASSERT (Instance->Config != NULL);\r
+  ASSERT (Instance->IaCb.Ia != NULL);\r
+  ASSERT (Instance->Service != NULL);\r
 \r
   Service  = Instance->Service;\r
   ClientId = Service->ClientId;\r
 \r
-  ASSERT(ClientId != NULL);\r
+  ASSERT (ClientId != NULL);\r
 \r
   //\r
   // Get the server Id from the selected advertisement message.\r
@@ -1113,7 +1095,7 @@ Dhcp6SendRequestMsg (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  ServerId = (EFI_DHCP6_DUID *) (Option + 2);\r
+  ServerId = (EFI_DHCP6_DUID *)(Option + 2);\r
 \r
   //\r
   // Calculate the added length of customized option list.\r
@@ -1174,9 +1156,8 @@ Dhcp6SendRequestMsg (
   // Append user-defined when configurate Dhcp6 service.\r
   //\r
   for (Index = 0; Index < Instance->Config->OptionCount; Index++) {\r
-\r
     UserOpt = Instance->Config->OptionList[Index];\r
-    Cursor  = Dhcp6AppendOption(\r
+    Cursor  = Dhcp6AppendOption (\r
                 Cursor,\r
                 UserOpt->OpCode,\r
                 UserOpt->OpLen,\r
@@ -1187,7 +1168,7 @@ Dhcp6SendRequestMsg (
   //\r
   // Determine the size/length of packet.\r
   //\r
-  Packet->Length += (UINT32) (Cursor - Packet->Dhcp6.Option);\r
+  Packet->Length += (UINT32)(Cursor - Packet->Dhcp6.Option);\r
   ASSERT (Packet->Size > Packet->Length + 8);\r
 \r
   //\r
@@ -1223,7 +1204,6 @@ Dhcp6SendRequestMsg (
   return Dhcp6EnqueueRetry (Instance, Packet, Elapsed, NULL);\r
 }\r
 \r
-\r
 /**\r
   Create the decline message and send it.\r
 \r
@@ -1238,20 +1218,20 @@ Dhcp6SendRequestMsg (
 **/\r
 EFI_STATUS\r
 Dhcp6SendDeclineMsg (\r
-  IN DHCP6_INSTANCE            *Instance,\r
-  IN EFI_DHCP6_IA              *DecIa\r
+  IN DHCP6_INSTANCE  *Instance,\r
+  IN EFI_DHCP6_IA    *DecIa\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_DHCP6_PACKET             *Packet;\r
-  EFI_DHCP6_PACKET             *LastReply;\r
-  EFI_DHCP6_DUID               *ClientId;\r
-  EFI_DHCP6_DUID               *ServerId;\r
-  DHCP6_SERVICE                *Service;\r
-  UINT8                        *Option;\r
-  UINT8                        *Cursor;\r
-  UINT16                       *Elapsed;\r
-  UINT16                       Length;\r
+  EFI_STATUS        Status;\r
+  EFI_DHCP6_PACKET  *Packet;\r
+  EFI_DHCP6_PACKET  *LastReply;\r
+  EFI_DHCP6_DUID    *ClientId;\r
+  EFI_DHCP6_DUID    *ServerId;\r
+  DHCP6_SERVICE     *Service;\r
+  UINT8             *Option;\r
+  UINT8             *Cursor;\r
+  UINT16            *Elapsed;\r
+  UINT16            Length;\r
 \r
   ASSERT (Instance->Config != NULL);\r
   ASSERT (Instance->IaCb.Ia != NULL);\r
@@ -1279,7 +1259,7 @@ Dhcp6SendDeclineMsg (
   //\r
   // EFI_DHCP6_DUID contains a length field of 2 bytes.\r
   //\r
-  ServerId = (EFI_DHCP6_DUID *) (Option + 2);\r
+  ServerId = (EFI_DHCP6_DUID *)(Option + 2);\r
 \r
   //\r
   // Create the Dhcp6 packet and initialize common fields.\r
@@ -1325,7 +1305,7 @@ Dhcp6SendDeclineMsg (
   //\r
   // Determine the size/length of packet.\r
   //\r
-  Packet->Length += (UINT32) (Cursor - Packet->Dhcp6.Option);\r
+  Packet->Length += (UINT32)(Cursor - Packet->Dhcp6.Option);\r
   ASSERT (Packet->Size > Packet->Length + 8);\r
 \r
   //\r
@@ -1361,7 +1341,6 @@ Dhcp6SendDeclineMsg (
   return Dhcp6EnqueueRetry (Instance, Packet, Elapsed, NULL);\r
 }\r
 \r
-\r
 /**\r
   Create the release message and send it.\r
 \r
@@ -1376,30 +1355,30 @@ Dhcp6SendDeclineMsg (
 **/\r
 EFI_STATUS\r
 Dhcp6SendReleaseMsg (\r
-  IN DHCP6_INSTANCE            *Instance,\r
-  IN EFI_DHCP6_IA              *RelIa\r
+  IN DHCP6_INSTANCE  *Instance,\r
+  IN EFI_DHCP6_IA    *RelIa\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_DHCP6_PACKET             *Packet;\r
-  EFI_DHCP6_PACKET             *LastReply;\r
-  EFI_DHCP6_DUID               *ClientId;\r
-  EFI_DHCP6_DUID               *ServerId;\r
-  DHCP6_SERVICE                *Service;\r
-  UINT8                        *Option;\r
-  UINT8                        *Cursor;\r
-  UINT16                       *Elapsed;\r
-  UINT16                       Length;\r
-\r
-  ASSERT(Instance->Config);\r
-  ASSERT(Instance->IaCb.Ia);\r
+  EFI_STATUS        Status;\r
+  EFI_DHCP6_PACKET  *Packet;\r
+  EFI_DHCP6_PACKET  *LastReply;\r
+  EFI_DHCP6_DUID    *ClientId;\r
+  EFI_DHCP6_DUID    *ServerId;\r
+  DHCP6_SERVICE     *Service;\r
+  UINT8             *Option;\r
+  UINT8             *Cursor;\r
+  UINT16            *Elapsed;\r
+  UINT16            Length;\r
+\r
+  ASSERT (Instance->Config);\r
+  ASSERT (Instance->IaCb.Ia);\r
 \r
   Service   = Instance->Service;\r
   ClientId  = Service->ClientId;\r
   LastReply = Instance->IaCb.Ia->ReplyPacket;\r
 \r
-  ASSERT(ClientId);\r
-  ASSERT(LastReply);\r
+  ASSERT (ClientId);\r
+  ASSERT (LastReply);\r
 \r
   //\r
   // Get the server Id from the last reply message.\r
@@ -1413,7 +1392,7 @@ Dhcp6SendReleaseMsg (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  ServerId = (EFI_DHCP6_DUID *) (Option + 2);\r
+  ServerId = (EFI_DHCP6_DUID *)(Option + 2);\r
 \r
   //\r
   // Create the Dhcp6 packet and initialize common fields.\r
@@ -1462,7 +1441,7 @@ Dhcp6SendReleaseMsg (
   //\r
   // Determine the size/length of packet\r
   //\r
-  Packet->Length += (UINT32) (Cursor - Packet->Dhcp6.Option);\r
+  Packet->Length += (UINT32)(Cursor - Packet->Dhcp6.Option);\r
   ASSERT (Packet->Size > Packet->Length + 8);\r
 \r
   //\r
@@ -1494,7 +1473,6 @@ Dhcp6SendReleaseMsg (
   return Dhcp6EnqueueRetry (Instance, Packet, Elapsed, NULL);\r
 }\r
 \r
-\r
 /**\r
   Create the renew/rebind message and send it.\r
 \r
@@ -1510,33 +1488,33 @@ Dhcp6SendReleaseMsg (
 **/\r
 EFI_STATUS\r
 Dhcp6SendRenewRebindMsg (\r
-  IN DHCP6_INSTANCE         *Instance,\r
-  IN BOOLEAN                RebindRequest\r
+  IN DHCP6_INSTANCE  *Instance,\r
+  IN BOOLEAN         RebindRequest\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_DHCP6_PACKET          *Packet;\r
-  EFI_DHCP6_PACKET          *LastReply;\r
-  EFI_DHCP6_PACKET_OPTION   *UserOpt;\r
-  EFI_DHCP6_DUID            *ClientId;\r
-  EFI_DHCP6_DUID            *ServerId;\r
-  EFI_DHCP6_STATE           State;\r
-  EFI_DHCP6_EVENT           Event;\r
-  DHCP6_SERVICE             *Service;\r
-  UINT8                     *Option;\r
-  UINT8                     *Cursor;\r
-  UINT16                    *Elapsed;\r
-  UINT32                    UserLen;\r
-  UINTN                     Index;\r
-  UINT16                    Length;\r
-\r
-  ASSERT(Instance->Config);\r
-  ASSERT(Instance->IaCb.Ia);\r
+  EFI_STATUS               Status;\r
+  EFI_DHCP6_PACKET         *Packet;\r
+  EFI_DHCP6_PACKET         *LastReply;\r
+  EFI_DHCP6_PACKET_OPTION  *UserOpt;\r
+  EFI_DHCP6_DUID           *ClientId;\r
+  EFI_DHCP6_DUID           *ServerId;\r
+  EFI_DHCP6_STATE          State;\r
+  EFI_DHCP6_EVENT          Event;\r
+  DHCP6_SERVICE            *Service;\r
+  UINT8                    *Option;\r
+  UINT8                    *Cursor;\r
+  UINT16                   *Elapsed;\r
+  UINT32                   UserLen;\r
+  UINTN                    Index;\r
+  UINT16                   Length;\r
 \r
-  Service   = Instance->Service;\r
-  ClientId  = Service->ClientId;\r
+  ASSERT (Instance->Config);\r
+  ASSERT (Instance->IaCb.Ia);\r
 \r
-  ASSERT(ClientId);\r
+  Service  = Instance->Service;\r
+  ClientId = Service->ClientId;\r
+\r
+  ASSERT (ClientId);\r
 \r
   //\r
   // Calculate the added length of customized option list.\r
@@ -1604,7 +1582,7 @@ Dhcp6SendRenewRebindMsg (
       return EFI_DEVICE_ERROR;\r
     }\r
 \r
-    ServerId = (EFI_DHCP6_DUID *) (Option + 2);\r
+    ServerId = (EFI_DHCP6_DUID *)(Option + 2);\r
 \r
     Cursor = Dhcp6AppendOption (\r
                Cursor,\r
@@ -1618,9 +1596,8 @@ Dhcp6SendRenewRebindMsg (
   // Append user-defined when configurate Dhcp6 service.\r
   //\r
   for (Index = 0; Index < Instance->Config->OptionCount; Index++) {\r
-\r
     UserOpt = Instance->Config->OptionList[Index];\r
-    Cursor  = Dhcp6AppendOption(\r
+    Cursor  = Dhcp6AppendOption (\r
                 Cursor,\r
                 UserOpt->OpCode,\r
                 UserOpt->OpLen,\r
@@ -1631,14 +1608,14 @@ Dhcp6SendRenewRebindMsg (
   //\r
   // Determine the size/length of packet.\r
   //\r
-  Packet->Length += (UINT32) (Cursor - Packet->Dhcp6.Option);\r
+  Packet->Length += (UINT32)(Cursor - Packet->Dhcp6.Option);\r
   ASSERT (Packet->Size > Packet->Length + 8);\r
 \r
   //\r
   // Callback to user with the packet to be sent and check the user's feedback.\r
   //\r
-  State  = (RebindRequest) ? Dhcp6Rebinding : Dhcp6Renewing;\r
-  Event  = (RebindRequest) ? Dhcp6EnterRebinding : Dhcp6EnterRenewing;\r
+  State = (RebindRequest) ? Dhcp6Rebinding : Dhcp6Renewing;\r
+  Event = (RebindRequest) ? Dhcp6EnterRebinding : Dhcp6EnterRenewing;\r
 \r
   Status = Dhcp6CallbackUser (Instance, Event, &Packet);\r
 \r
@@ -1707,19 +1684,19 @@ Dhcp6StartInfoRequest (
   IN VOID                      *CallbackContext OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  DHCP6_INF_CB                 *InfCb;\r
-  DHCP6_SERVICE                *Service;\r
-  EFI_TPL                      OldTpl;\r
+  EFI_STATUS     Status;\r
+  DHCP6_INF_CB   *InfCb;\r
+  DHCP6_SERVICE  *Service;\r
+  EFI_TPL        OldTpl;\r
 \r
-  Service  = Instance->Service;\r
+  Service = Instance->Service;\r
 \r
-  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl           = gBS->RaiseTPL (TPL_CALLBACK);\r
   Instance->UdpSts = EFI_ALREADY_STARTED;\r
   //\r
   // Create and initialize the control block for the info-request.\r
   //\r
-  InfCb = AllocateZeroPool (sizeof(DHCP6_INF_CB));\r
+  InfCb = AllocateZeroPool (sizeof (DHCP6_INF_CB));\r
 \r
   if (InfCb == NULL) {\r
     gBS->RestoreTPL (OldTpl);\r
@@ -1752,7 +1729,7 @@ Dhcp6StartInfoRequest (
   //\r
   // Register receive callback for the stateless exchange process.\r
   //\r
-  Status = UdpIoRecvDatagram(\r
+  Status = UdpIoRecvDatagram (\r
              Service->UdpIo,\r
              Dhcp6ReceivePacket,\r
              Service,\r
@@ -1803,24 +1780,24 @@ Dhcp6SendInfoRequestMsg (
   IN EFI_DHCP6_RETRANSMISSION  *Retransmission\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_DHCP6_PACKET             *Packet;\r
-  EFI_DHCP6_PACKET_OPTION      *UserOpt;\r
-  EFI_DHCP6_DUID               *ClientId;\r
-  DHCP6_SERVICE                *Service;\r
-  UINT8                        *Cursor;\r
-  UINT16                       *Elapsed;\r
-  UINT32                       UserLen;\r
-  UINTN                        Index;\r
-  UINT16                       Length;\r
-\r
-  ASSERT(OptionRequest);\r
+  EFI_STATUS               Status;\r
+  EFI_DHCP6_PACKET         *Packet;\r
+  EFI_DHCP6_PACKET_OPTION  *UserOpt;\r
+  EFI_DHCP6_DUID           *ClientId;\r
+  DHCP6_SERVICE            *Service;\r
+  UINT8                    *Cursor;\r
+  UINT16                   *Elapsed;\r
+  UINT32                   UserLen;\r
+  UINTN                    Index;\r
+  UINT16                   Length;\r
+\r
+  ASSERT (OptionRequest);\r
 \r
   Service  = Instance->Service;\r
   ClientId = Service->ClientId;\r
   UserLen  = NTOHS (OptionRequest->OpLen) + 4;\r
 \r
-  ASSERT(ClientId);\r
+  ASSERT (ClientId);\r
 \r
   //\r
   // Calculate the added length of customized option list.\r
@@ -1842,7 +1819,7 @@ Dhcp6SendInfoRequestMsg (
   Packet->Dhcp6.Header.MessageType   = Dhcp6MsgInfoRequest;\r
   Packet->Dhcp6.Header.TransactionId = Service->Xid++;\r
 \r
-  InfCb->Xid                         = Packet->Dhcp6.Header.TransactionId;\r
+  InfCb->Xid = Packet->Dhcp6.Header.TransactionId;\r
 \r
   //\r
   // Assembly Dhcp6 options for info-request message.\r
@@ -1876,9 +1853,8 @@ Dhcp6SendInfoRequestMsg (
   // Append user-defined when configurate Dhcp6 service.\r
   //\r
   for (Index = 0; Index < OptionCount; Index++) {\r
-\r
     UserOpt = OptionList[Index];\r
-    Cursor  = Dhcp6AppendOption(\r
+    Cursor  = Dhcp6AppendOption (\r
                 Cursor,\r
                 UserOpt->OpCode,\r
                 UserOpt->OpLen,\r
@@ -1889,7 +1865,7 @@ Dhcp6SendInfoRequestMsg (
   //\r
   // Determine the size/length of packet.\r
   //\r
-  Packet->Length += (UINT32) (Cursor - Packet->Dhcp6.Option);\r
+  Packet->Length += (UINT32)(Cursor - Packet->Dhcp6.Option);\r
   ASSERT (Packet->Size > Packet->Length + 8);\r
 \r
   //\r
@@ -1913,7 +1889,6 @@ Dhcp6SendInfoRequestMsg (
   return Dhcp6EnqueueRetry (Instance, Packet, Elapsed, Retransmission);\r
 }\r
 \r
-\r
 /**\r
   Create the Confirm message and send it.\r
 \r
@@ -1927,19 +1902,19 @@ Dhcp6SendInfoRequestMsg (
 **/\r
 EFI_STATUS\r
 Dhcp6SendConfirmMsg (\r
-  IN DHCP6_INSTANCE            *Instance\r
+  IN DHCP6_INSTANCE  *Instance\r
   )\r
 {\r
-  UINT8                        *Cursor;\r
-  UINTN                        Index;\r
-  UINT16                       Length;\r
-  UINT32                       UserLen;\r
-  EFI_STATUS                   Status;\r
-  DHCP6_SERVICE                *Service;\r
-  EFI_DHCP6_DUID               *ClientId;\r
-  EFI_DHCP6_PACKET             *Packet;\r
-  EFI_DHCP6_PACKET_OPTION      *UserOpt;\r
-  UINT16                       *Elapsed;\r
+  UINT8                    *Cursor;\r
+  UINTN                    Index;\r
+  UINT16                   Length;\r
+  UINT32                   UserLen;\r
+  EFI_STATUS               Status;\r
+  DHCP6_SERVICE            *Service;\r
+  EFI_DHCP6_DUID           *ClientId;\r
+  EFI_DHCP6_PACKET         *Packet;\r
+  EFI_DHCP6_PACKET_OPTION  *UserOpt;\r
+  UINT16                   *Elapsed;\r
 \r
   ASSERT (Instance->Config != NULL);\r
   ASSERT (Instance->IaCb.Ia != NULL);\r
@@ -2013,7 +1988,7 @@ Dhcp6SendConfirmMsg (
   //\r
   // Determine the size/length of packet.\r
   //\r
-  Packet->Length += (UINT32) (Cursor - Packet->Dhcp6.Option);\r
+  Packet->Length += (UINT32)(Cursor - Packet->Dhcp6.Option);\r
   ASSERT (Packet->Size > Packet->Length + 8);\r
 \r
   //\r
@@ -2049,8 +2024,6 @@ Dhcp6SendConfirmMsg (
   return Dhcp6EnqueueRetry (Instance, Packet, Elapsed, NULL);\r
 }\r
 \r
-\r
-\r
 /**\r
   Handle with the Dhcp6 reply message.\r
 \r
@@ -2065,13 +2038,13 @@ Dhcp6SendConfirmMsg (
 **/\r
 EFI_STATUS\r
 Dhcp6HandleReplyMsg (\r
-  IN DHCP6_INSTANCE           *Instance,\r
-  IN EFI_DHCP6_PACKET         *Packet\r
+  IN DHCP6_INSTANCE    *Instance,\r
+  IN EFI_DHCP6_PACKET  *Packet\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  UINT8                       *Option;\r
-  UINT16                      StsCode;\r
+  EFI_STATUS  Status;\r
+  UINT8       *Option;\r
+  UINT16      StsCode;\r
 \r
   ASSERT (Instance->Config != NULL);\r
   ASSERT (Instance->IaCb.Ia != NULL);\r
@@ -2096,7 +2069,7 @@ Dhcp6HandleReplyMsg (
              Dhcp6OptRapidCommit\r
              );\r
 \r
-  if ((Option != NULL && !Instance->Config->RapidCommit) || (Option == NULL && Instance->Config->RapidCommit)) {\r
+  if (((Option != NULL) && !Instance->Config->RapidCommit) || ((Option == NULL) && Instance->Config->RapidCommit)) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
@@ -2104,11 +2077,11 @@ Dhcp6HandleReplyMsg (
   // As to a valid reply packet in response to a request/renew/rebind packet,\r
   // ignore the packet if not contains the Ia option\r
   //\r
-  if (Instance->IaCb.Ia->State == Dhcp6Requesting ||\r
-      Instance->IaCb.Ia->State == Dhcp6Renewing ||\r
-      Instance->IaCb.Ia->State == Dhcp6Rebinding\r
-      ) {\r
-\r
+  if ((Instance->IaCb.Ia->State == Dhcp6Requesting) ||\r
+      (Instance->IaCb.Ia->State == Dhcp6Renewing) ||\r
+      (Instance->IaCb.Ia->State == Dhcp6Rebinding)\r
+      )\r
+  {\r
     Option = Dhcp6SeekIaOption (\r
                Packet->Dhcp6.Option,\r
                Packet->Length,\r
@@ -2133,10 +2106,9 @@ Dhcp6HandleReplyMsg (
   // the client considers the decline/release event completed regardless of the\r
   // status code.\r
   //\r
-  if (Instance->IaCb.Ia->State == Dhcp6Declining || Instance->IaCb.Ia->State == Dhcp6Releasing) {\r
-\r
+  if ((Instance->IaCb.Ia->State == Dhcp6Declining) || (Instance->IaCb.Ia->State == Dhcp6Releasing)) {\r
     if (Instance->IaCb.Ia->IaAddressCount != 0) {\r
-      Instance->IaCb.Ia->State       = Dhcp6Bound;\r
+      Instance->IaCb.Ia->State = Dhcp6Bound;\r
     } else {\r
       ASSERT (Instance->IaCb.Ia->ReplyPacket);\r
       FreePool (Instance->IaCb.Ia->ReplyPacket);\r
@@ -2159,7 +2131,7 @@ Dhcp6HandleReplyMsg (
     //\r
     // Reset start time for next exchange.\r
     //\r
-    Instance->StartTime       = 0;\r
+    Instance->StartTime = 0;\r
 \r
     Status = EFI_SUCCESS;\r
     goto ON_EXIT;\r
@@ -2186,7 +2158,7 @@ Dhcp6HandleReplyMsg (
       //\r
       // Reset start time for next exchange.\r
       //\r
-      Instance->StartTime       = 0;\r
+      Instance->StartTime = 0;\r
 \r
       //\r
       // Set bound state and store the reply packet.\r
@@ -2209,7 +2181,7 @@ Dhcp6HandleReplyMsg (
       //\r
       // For sync, set the success flag out of polling in start/renewrebind.\r
       //\r
-      Instance->UdpSts         = EFI_SUCCESS;\r
+      Instance->UdpSts = EFI_SUCCESS;\r
 \r
       //\r
       // Maybe this is a new round DHCP process due to some reason, such as NotOnLink\r
@@ -2235,70 +2207,72 @@ Dhcp6HandleReplyMsg (
     }\r
 \r
     goto ON_EXIT;\r
-\r
   } else if (Option != NULL) {\r
     //\r
     // Any error status code option is found.\r
     //\r
-    StsCode = NTOHS (ReadUnaligned16 ((UINT16 *) (Option + 4)));\r
+    StsCode = NTOHS (ReadUnaligned16 ((UINT16 *)(Option + 4)));\r
     switch (StsCode) {\r
-    case Dhcp6StsUnspecFail:\r
-      //\r
-      // It indicates the server is unable to process the message due to an\r
-      // unspecified failure condition, so just retry if possible.\r
-      //\r
-      break;\r
-\r
-    case Dhcp6StsUseMulticast:\r
-      //\r
-      // It indicates the server receives a message via unicast from a client\r
-      // to which the server has not sent a unicast option, so retry it by\r
-      // multi-cast address.\r
-      //\r
-      if (Instance->Unicast != NULL) {\r
-        FreePool (Instance->Unicast);\r
-        Instance->Unicast = NULL;\r
-      }\r
-      break;\r
-\r
-    case Dhcp6StsNotOnLink:\r
-      if (Instance->IaCb.Ia->State == Dhcp6Confirming) {\r
+      case Dhcp6StsUnspecFail:\r
         //\r
-        // Before initiate new round DHCP, cache the current IA.\r
+        // It indicates the server is unable to process the message due to an\r
+        // unspecified failure condition, so just retry if possible.\r
         //\r
-        Status = Dhcp6CacheIa (Instance);\r
-        if (EFI_ERROR (Status)) {\r
-          return  Status;\r
-        }\r
+        break;\r
 \r
+      case Dhcp6StsUseMulticast:\r
         //\r
-        // Restart S.A.R.R process to acquire new address.\r
+        // It indicates the server receives a message via unicast from a client\r
+        // to which the server has not sent a unicast option, so retry it by\r
+        // multi-cast address.\r
         //\r
-        Status = Dhcp6InitSolicitMsg (Instance);\r
-        if (EFI_ERROR (Status)) {\r
-          return Status;\r
+        if (Instance->Unicast != NULL) {\r
+          FreePool (Instance->Unicast);\r
+          Instance->Unicast = NULL;\r
         }\r
-      }\r
-      break;\r
 \r
-    case Dhcp6StsNoBinding:\r
-      if (Instance->IaCb.Ia->State == Dhcp6Renewing || Instance->IaCb.Ia->State == Dhcp6Rebinding) {\r
-        //\r
-        // Refer to RFC3315 Chapter 18.1.8, for each IA in the original Renew or Rebind message, the client\r
-        // sends a Request message if the IA contained a Status Code option with the NoBinding status.\r
-        //\r
-        Status = Dhcp6SendRequestMsg(Instance);\r
-        if (EFI_ERROR (Status)) {\r
-          return Status;\r
+        break;\r
+\r
+      case Dhcp6StsNotOnLink:\r
+        if (Instance->IaCb.Ia->State == Dhcp6Confirming) {\r
+          //\r
+          // Before initiate new round DHCP, cache the current IA.\r
+          //\r
+          Status = Dhcp6CacheIa (Instance);\r
+          if (EFI_ERROR (Status)) {\r
+            return Status;\r
+          }\r
+\r
+          //\r
+          // Restart S.A.R.R process to acquire new address.\r
+          //\r
+          Status = Dhcp6InitSolicitMsg (Instance);\r
+          if (EFI_ERROR (Status)) {\r
+            return Status;\r
+          }\r
         }\r
-      }\r
-      break;\r
 \r
-    default:\r
-      //\r
-      // The other status code, just restart solicitation.\r
-      //\r
-      break;\r
+        break;\r
+\r
+      case Dhcp6StsNoBinding:\r
+        if ((Instance->IaCb.Ia->State == Dhcp6Renewing) || (Instance->IaCb.Ia->State == Dhcp6Rebinding)) {\r
+          //\r
+          // Refer to RFC3315 Chapter 18.1.8, for each IA in the original Renew or Rebind message, the client\r
+          // sends a Request message if the IA contained a Status Code option with the NoBinding status.\r
+          //\r
+          Status = Dhcp6SendRequestMsg (Instance);\r
+          if (EFI_ERROR (Status)) {\r
+            return Status;\r
+          }\r
+        }\r
+\r
+        break;\r
+\r
+      default:\r
+        //\r
+        // The other status code, just restart solicitation.\r
+        //\r
+        break;\r
     }\r
   }\r
 \r
@@ -2306,7 +2280,7 @@ Dhcp6HandleReplyMsg (
 \r
 ON_EXIT:\r
 \r
-  if (!EFI_ERROR(Status)) {\r
+  if (!EFI_ERROR (Status)) {\r
     Status = Dhcp6DequeueRetry (\r
                Instance,\r
                Packet->Dhcp6.Header.TransactionId,\r
@@ -2317,7 +2291,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Select the appointed Dhcp6 advertisement message.\r
 \r
@@ -2331,12 +2304,12 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 Dhcp6SelectAdvertiseMsg (\r
-  IN DHCP6_INSTANCE           *Instance,\r
-  IN EFI_DHCP6_PACKET         *AdSelect\r
+  IN DHCP6_INSTANCE    *Instance,\r
+  IN EFI_DHCP6_PACKET  *AdSelect\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  UINT8                       *Option;\r
+  EFI_STATUS  Status;\r
+  UINT8       *Option;\r
 \r
   ASSERT (AdSelect != NULL);\r
 \r
@@ -2361,7 +2334,7 @@ Dhcp6SelectAdvertiseMsg (
              FALSE\r
              );\r
 \r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
@@ -2369,21 +2342,20 @@ Dhcp6SelectAdvertiseMsg (
   // Check whether there is server unicast option in the selected advertise\r
   // packet, and update it.\r
   //\r
-  Option = Dhcp6SeekOption(\r
+  Option = Dhcp6SeekOption (\r
              AdSelect->Dhcp6.Option,\r
              AdSelect->Length - 4,\r
              Dhcp6OptServerUnicast\r
              );\r
 \r
   if (Option != NULL) {\r
-\r
-    Instance->Unicast = AllocateZeroPool (sizeof(EFI_IPv6_ADDRESS));\r
+    Instance->Unicast = AllocateZeroPool (sizeof (EFI_IPv6_ADDRESS));\r
 \r
     if (Instance->Unicast == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
-    CopyMem (Instance->Unicast, Option + 4, sizeof(EFI_IPv6_ADDRESS));\r
+    CopyMem (Instance->Unicast, Option + 4, sizeof (EFI_IPv6_ADDRESS));\r
   }\r
 \r
   //\r
@@ -2401,7 +2373,6 @@ Dhcp6SelectAdvertiseMsg (
   return Dhcp6SendRequestMsg (Instance);\r
 }\r
 \r
-\r
 /**\r
   Handle with the Dhcp6 advertisement message.\r
 \r
@@ -2416,16 +2387,16 @@ Dhcp6SelectAdvertiseMsg (
 **/\r
 EFI_STATUS\r
 Dhcp6HandleAdvertiseMsg (\r
-  IN DHCP6_INSTANCE           *Instance,\r
-  IN EFI_DHCP6_PACKET         *Packet\r
+  IN DHCP6_INSTANCE    *Instance,\r
+  IN EFI_DHCP6_PACKET  *Packet\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  UINT8                       *Option;\r
-  BOOLEAN                     Timeout;\r
+  EFI_STATUS  Status;\r
+  UINT8       *Option;\r
+  BOOLEAN     Timeout;\r
 \r
-  ASSERT(Instance->Config);\r
-  ASSERT(Instance->IaCb.Ia);\r
+  ASSERT (Instance->Config);\r
+  ASSERT (Instance->IaCb.Ia);\r
 \r
   Timeout = FALSE;\r
 \r
@@ -2435,14 +2406,13 @@ Dhcp6HandleAdvertiseMsg (
   // this reply message. Or else, process the advertise messages as normal.\r
   // See details in the section-17.1.4 of rfc-3315.\r
   //\r
-  Option = Dhcp6SeekOption(\r
+  Option = Dhcp6SeekOption (\r
              Packet->Dhcp6.Option,\r
              Packet->Length - 4,\r
              Dhcp6OptRapidCommit\r
              );\r
 \r
-  if (Option != NULL && Instance->Config->RapidCommit && Packet->Dhcp6.Header.MessageType == Dhcp6MsgReply) {\r
-\r
+  if ((Option != NULL) && Instance->Config->RapidCommit && (Packet->Dhcp6.Header.MessageType == Dhcp6MsgReply)) {\r
     return Dhcp6HandleReplyMsg (Instance, Packet);\r
   }\r
 \r
@@ -2490,12 +2460,11 @@ Dhcp6HandleAdvertiseMsg (
     CopyMem (Instance->AdSelect, Packet, Packet->Size);\r
 \r
     Instance->AdPref = 0xff;\r
-\r
   } else if (Status == EFI_NOT_READY) {\r
     //\r
     // Not_ready means user wants to continue to receive more advertise packets.\r
     //\r
-    if (Instance->AdPref == 0xff && Instance->AdSelect == NULL) {\r
+    if ((Instance->AdPref == 0xff) && (Instance->AdSelect == NULL)) {\r
       //\r
       // It's a tricky point. The timer routine set adpref as 0xff if the first\r
       // rt timeout and no advertisement received, which means any advertisement\r
@@ -2508,13 +2477,13 @@ Dhcp6HandleAdvertiseMsg (
     // Check whether the current packet has a 255 preference option or not.\r
     // Take non-preference option as 0 value.\r
     //\r
-    Option = Dhcp6SeekOption(\r
+    Option = Dhcp6SeekOption (\r
                Packet->Dhcp6.Option,\r
                Packet->Length - 4,\r
                Dhcp6OptPreference\r
                );\r
 \r
-    if (Instance->AdSelect == NULL || (Option != NULL && *(Option + 4) > Instance->AdPref)) {\r
+    if ((Instance->AdSelect == NULL) || ((Option != NULL) && (*(Option + 4) > Instance->AdPref))) {\r
       //\r
       // No advertisements received before or preference is more than other\r
       // advertisements received before. Then store the new packet and the\r
@@ -2541,7 +2510,6 @@ Dhcp6HandleAdvertiseMsg (
       // preference is less than other advertisements received before.\r
       // Leave the packet alone.\r
     }\r
-\r
   } else {\r
     //\r
     // Other error status means termination.\r
@@ -2554,14 +2522,13 @@ Dhcp6HandleAdvertiseMsg (
   // RT has elapsed, or get a highest preference 255 advertise.\r
   // See details in the section-17.1.2 of rfc-3315.\r
   //\r
-  if (Instance->AdPref == 0xff || Timeout) {\r
+  if ((Instance->AdPref == 0xff) || Timeout) {\r
     Status = Dhcp6SelectAdvertiseMsg (Instance, Instance->AdSelect);\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   The Dhcp6 stateful exchange process routine.\r
 \r
@@ -2571,14 +2538,14 @@ Dhcp6HandleAdvertiseMsg (
 **/\r
 VOID\r
 Dhcp6HandleStateful (\r
-  IN DHCP6_INSTANCE         *Instance,\r
-  IN EFI_DHCP6_PACKET       *Packet\r
+  IN DHCP6_INSTANCE    *Instance,\r
+  IN EFI_DHCP6_PACKET  *Packet\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_DHCP6_DUID            *ClientId;\r
-  DHCP6_SERVICE             *Service;\r
-  UINT8                     *Option;\r
+  EFI_STATUS      Status;\r
+  EFI_DHCP6_DUID  *ClientId;\r
+  DHCP6_SERVICE   *Service;\r
+  UINT8           *Option;\r
 \r
   Service  = Instance->Service;\r
   ClientId = Service->ClientId;\r
@@ -2595,27 +2562,27 @@ Dhcp6HandleStateful (
   //\r
   // Discard the packet if not advertisement or reply packet.\r
   //\r
-  if (Packet->Dhcp6.Header.MessageType != Dhcp6MsgAdvertise && Packet->Dhcp6.Header.MessageType != Dhcp6MsgReply) {\r
+  if ((Packet->Dhcp6.Header.MessageType != Dhcp6MsgAdvertise) && (Packet->Dhcp6.Header.MessageType != Dhcp6MsgReply)) {\r
     goto ON_CONTINUE;\r
   }\r
 \r
   //\r
   // Check whether include client Id or not.\r
   //\r
-  Option = Dhcp6SeekOption(\r
+  Option = Dhcp6SeekOption (\r
              Packet->Dhcp6.Option,\r
              Packet->Length - 4,\r
              Dhcp6OptClientId\r
              );\r
 \r
-  if (Option == NULL || CompareMem (Option + 4, ClientId->Duid, ClientId->Length) != 0) {\r
+  if ((Option == NULL) || (CompareMem (Option + 4, ClientId->Duid, ClientId->Length) != 0)) {\r
     goto ON_CONTINUE;\r
   }\r
 \r
   //\r
   // Check whether include server Id or not.\r
   //\r
-  Option = Dhcp6SeekOption(\r
+  Option = Dhcp6SeekOption (\r
              Packet->Dhcp6.Option,\r
              Packet->Length - 4,\r
              Dhcp6OptServerId\r
@@ -2626,35 +2593,36 @@ Dhcp6HandleStateful (
   }\r
 \r
   switch (Instance->IaCb.Ia->State) {\r
-  case Dhcp6Selecting:\r
-    //\r
-    // Handle the advertisement message when in the Dhcp6Selecting state.\r
-    // Do not need check return status, if failed, just continue to the next.\r
-    //\r
-    Dhcp6HandleAdvertiseMsg (Instance, Packet);\r
-    break;\r
-\r
-  case Dhcp6Requesting:\r
-  case Dhcp6Confirming:\r
-  case Dhcp6Renewing:\r
-  case Dhcp6Rebinding:\r
-  case Dhcp6Releasing:\r
-  case Dhcp6Declining:\r
-    //\r
-    // Handle the reply message when in the Dhcp6Requesting,  Dhcp6Renewing\r
-    // Dhcp6Rebinding, Dhcp6Releasing and Dhcp6Declining state.\r
-    // If failed here, it should reset the current session.\r
-    //\r
-    Status = Dhcp6HandleReplyMsg (Instance, Packet);\r
-    if (EFI_ERROR (Status)) {\r
-      goto ON_EXIT;\r
-    }\r
-    break;\r
-  default:\r
-    //\r
-    // Other state has not supported yet.\r
-    //\r
-    break;\r
+    case Dhcp6Selecting:\r
+      //\r
+      // Handle the advertisement message when in the Dhcp6Selecting state.\r
+      // Do not need check return status, if failed, just continue to the next.\r
+      //\r
+      Dhcp6HandleAdvertiseMsg (Instance, Packet);\r
+      break;\r
+\r
+    case Dhcp6Requesting:\r
+    case Dhcp6Confirming:\r
+    case Dhcp6Renewing:\r
+    case Dhcp6Rebinding:\r
+    case Dhcp6Releasing:\r
+    case Dhcp6Declining:\r
+      //\r
+      // Handle the reply message when in the Dhcp6Requesting,  Dhcp6Renewing\r
+      // Dhcp6Rebinding, Dhcp6Releasing and Dhcp6Declining state.\r
+      // If failed here, it should reset the current session.\r
+      //\r
+      Status = Dhcp6HandleReplyMsg (Instance, Packet);\r
+      if (EFI_ERROR (Status)) {\r
+        goto ON_EXIT;\r
+      }\r
+\r
+      break;\r
+    default:\r
+      //\r
+      // Other state has not supported yet.\r
+      //\r
+      break;\r
   }\r
 \r
 ON_CONTINUE:\r
@@ -2673,7 +2641,6 @@ ON_EXIT:
   }\r
 }\r
 \r
-\r
 /**\r
   The Dhcp6 stateless exchange process routine.\r
 \r
@@ -2683,15 +2650,15 @@ ON_EXIT:
 **/\r
 VOID\r
 Dhcp6HandleStateless (\r
-  IN DHCP6_INSTANCE         *Instance,\r
-  IN EFI_DHCP6_PACKET       *Packet\r
+  IN DHCP6_INSTANCE    *Instance,\r
+  IN EFI_DHCP6_PACKET  *Packet\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  DHCP6_SERVICE             *Service;\r
-  DHCP6_INF_CB              *InfCb;\r
-  UINT8                     *Option;\r
-  BOOLEAN                   IsMatched;\r
+  EFI_STATUS     Status;\r
+  DHCP6_SERVICE  *Service;\r
+  DHCP6_INF_CB   *InfCb;\r
+  UINT8          *Option;\r
+  BOOLEAN        IsMatched;\r
 \r
   Service   = Instance->Service;\r
   Status    = EFI_SUCCESS;\r
@@ -2776,7 +2743,6 @@ ON_EXIT:
   }\r
 }\r
 \r
-\r
 /**\r
   The receive callback function for Dhcp6 exchange process.\r
 \r
@@ -2789,37 +2755,37 @@ ON_EXIT:
 VOID\r
 EFIAPI\r
 Dhcp6ReceivePacket (\r
-  IN NET_BUF                *Udp6Wrap,\r
-  IN UDP_END_POINT          *EndPoint,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN VOID                   *Context\r
+  IN NET_BUF        *Udp6Wrap,\r
+  IN UDP_END_POINT  *EndPoint,\r
+  IN EFI_STATUS     IoStatus,\r
+  IN VOID           *Context\r
   )\r
 {\r
-  EFI_DHCP6_HEADER          *Head;\r
-  EFI_DHCP6_PACKET          *Packet;\r
-  DHCP6_SERVICE             *Service;\r
-  DHCP6_INSTANCE            *Instance;\r
-  DHCP6_TX_CB               *TxCb;\r
-  UINT32                    Size;\r
-  BOOLEAN                   IsDispatched;\r
-  BOOLEAN                   IsStateless;\r
-  LIST_ENTRY                *Entry1;\r
-  LIST_ENTRY                *Next1;\r
-  LIST_ENTRY                *Entry2;\r
-  LIST_ENTRY                *Next2;\r
-  EFI_STATUS                Status;\r
+  EFI_DHCP6_HEADER  *Head;\r
+  EFI_DHCP6_PACKET  *Packet;\r
+  DHCP6_SERVICE     *Service;\r
+  DHCP6_INSTANCE    *Instance;\r
+  DHCP6_TX_CB       *TxCb;\r
+  UINT32            Size;\r
+  BOOLEAN           IsDispatched;\r
+  BOOLEAN           IsStateless;\r
+  LIST_ENTRY        *Entry1;\r
+  LIST_ENTRY        *Next1;\r
+  LIST_ENTRY        *Entry2;\r
+  LIST_ENTRY        *Next2;\r
+  EFI_STATUS        Status;\r
 \r
   ASSERT (Udp6Wrap != NULL);\r
   ASSERT (Context != NULL);\r
 \r
-  Service      = (DHCP6_SERVICE *) Context;\r
+  Service      = (DHCP6_SERVICE *)Context;\r
   Instance     = NULL;\r
   Packet       = NULL;\r
   IsDispatched = FALSE;\r
   IsStateless  = FALSE;\r
 \r
   if (EFI_ERROR (IoStatus)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   if (Udp6Wrap->TotalSize < sizeof (EFI_DHCP6_HEADER)) {\r
@@ -2830,7 +2796,7 @@ Dhcp6ReceivePacket (
   // Copy the net buffer received from upd6 to a Dhcp6 packet.\r
   //\r
   Size   = sizeof (EFI_DHCP6_PACKET) + Udp6Wrap->TotalSize;\r
-  Packet = (EFI_DHCP6_PACKET *) AllocateZeroPool (Size);\r
+  Packet = (EFI_DHCP6_PACKET *)AllocateZeroPool (Size);\r
 \r
   if (Packet == NULL) {\r
     goto ON_CONTINUE;\r
@@ -2838,7 +2804,7 @@ Dhcp6ReceivePacket (
 \r
   Packet->Size   = Size;\r
   Head           = &Packet->Dhcp6.Header;\r
-  Packet->Length = NetbufCopy (Udp6Wrap, 0, Udp6Wrap->TotalSize, (UINT8 *) Head);\r
+  Packet->Length = NetbufCopy (Udp6Wrap, 0, Udp6Wrap->TotalSize, (UINT8 *)Head);\r
 \r
   if (Packet->Length == 0) {\r
     goto ON_CONTINUE;\r
@@ -2848,11 +2814,9 @@ Dhcp6ReceivePacket (
   // Dispatch packet to right instance by transaction id.\r
   //\r
   NET_LIST_FOR_EACH_SAFE (Entry1, Next1, &Service->Child) {\r
-\r
     Instance = NET_LIST_USER_STRUCT (Entry1, DHCP6_INSTANCE, Link);\r
 \r
     NET_LIST_FOR_EACH_SAFE (Entry2, Next2, &Instance->TxList) {\r
-\r
       TxCb = NET_LIST_USER_STRUCT (Entry2, DHCP6_TX_CB, Link);\r
 \r
       if (Packet->Dhcp6.Header.TransactionId == TxCb->Xid) {\r
@@ -2863,7 +2827,8 @@ Dhcp6ReceivePacket (
         if (TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgInfoRequest) {\r
           IsStateless = TRUE;\r
         }\r
-        IsDispatched  = TRUE;\r
+\r
+        IsDispatched = TRUE;\r
         break;\r
       }\r
     }\r
@@ -2893,11 +2858,11 @@ ON_CONTINUE:
 \r
   if (!IsDispatched) {\r
     Status = UdpIoRecvDatagram (\r
-             Service->UdpIo,\r
-             Dhcp6ReceivePacket,\r
-             Service,\r
-             0\r
-             );\r
+               Service->UdpIo,\r
+               Dhcp6ReceivePacket,\r
+               Service,\r
+               0\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       NET_LIST_FOR_EACH_SAFE (Entry1, Next1, &Service->Child) {\r
         Instance = NET_LIST_USER_STRUCT (Entry1, DHCP6_INSTANCE, Link);\r
@@ -2929,7 +2894,7 @@ ON_CONTINUE:
 **/\r
 BOOLEAN\r
 Dhcp6LinkMovDetect (\r
-  IN  DHCP6_INSTANCE            *Instance\r
+  IN  DHCP6_INSTANCE  *Instance\r
   )\r
 {\r
   UINT32                       InterruptStatus;\r
@@ -2938,7 +2903,7 @@ Dhcp6LinkMovDetect (
   EFI_SIMPLE_NETWORK_PROTOCOL  *Snp;\r
 \r
   ASSERT (Instance != NULL);\r
-  Snp = Instance->Service->Snp;\r
+  Snp          = Instance->Service->Snp;\r
   MediaPresent = Instance->MediaPresent;\r
 \r
   //\r
@@ -2963,10 +2928,10 @@ Dhcp6LinkMovDetect (
   if (!MediaPresent && Instance->MediaPresent) {\r
     return TRUE;\r
   }\r
+\r
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   The timer routine of the Dhcp6 instance for each second.\r
 \r
@@ -2977,28 +2942,27 @@ Dhcp6LinkMovDetect (
 VOID\r
 EFIAPI\r
 Dhcp6OnTimerTick (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *NextEntry;\r
-  DHCP6_INSTANCE            *Instance;\r
-  DHCP6_TX_CB               *TxCb;\r
-  DHCP6_IA_CB               *IaCb;\r
-  UINT32                    LossTime;\r
-  EFI_STATUS                Status;\r
+  LIST_ENTRY      *Entry;\r
+  LIST_ENTRY      *NextEntry;\r
+  DHCP6_INSTANCE  *Instance;\r
+  DHCP6_TX_CB     *TxCb;\r
+  DHCP6_IA_CB     *IaCb;\r
+  UINT32          LossTime;\r
+  EFI_STATUS      Status;\r
 \r
   ASSERT (Context != NULL);\r
 \r
-  Instance = (DHCP6_INSTANCE *) Context;\r
+  Instance = (DHCP6_INSTANCE *)Context;\r
 \r
   //\r
   // 1. Loop the tx list, count live time of every tx packet to check whether\r
   //    need re-transmit or not.\r
   //\r
   NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, &Instance->TxList) {\r
-\r
     TxCb = NET_LIST_USER_STRUCT (Entry, DHCP6_TX_CB, Link);\r
 \r
     TxCb->TickTime++;\r
@@ -3007,7 +2971,7 @@ Dhcp6OnTimerTick (
       //\r
       // Handle the first rt in the transmission of solicit specially.\r
       //\r
-      if ((TxCb->RetryCnt == 0 || TxCb->SolicitRetry) && TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgSolicit) {\r
+      if (((TxCb->RetryCnt == 0) || TxCb->SolicitRetry) && (TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgSolicit)) {\r
         if (Instance->AdSelect == NULL) {\r
           //\r
           // Set adpref as 0xff here to indicate select any advertisement\r
@@ -3024,9 +2988,11 @@ Dhcp6OnTimerTick (
           } else if (EFI_ERROR (Status)) {\r
             TxCb->RetryCnt++;\r
           }\r
+\r
           return;\r
         }\r
       }\r
+\r
       //\r
       // Increase the retry count for the packet and add up the total loss time.\r
       //\r
@@ -3036,7 +3002,7 @@ Dhcp6OnTimerTick (
       //\r
       // Check whether overflow the max retry count limit for this packet\r
       //\r
-      if (TxCb->RetryCtl.Mrc != 0 && TxCb->RetryCtl.Mrc < TxCb->RetryCnt) {\r
+      if ((TxCb->RetryCtl.Mrc != 0) && (TxCb->RetryCtl.Mrc < TxCb->RetryCnt)) {\r
         Status = EFI_NO_RESPONSE;\r
         goto ON_CLOSE;\r
       }\r
@@ -3044,7 +3010,7 @@ Dhcp6OnTimerTick (
       //\r
       // Check whether overflow the max retry duration for this packet\r
       //\r
-      if (TxCb->RetryCtl.Mrd != 0 && TxCb->RetryCtl.Mrd <= TxCb->RetryLos) {\r
+      if ((TxCb->RetryCtl.Mrd != 0) && (TxCb->RetryCtl.Mrd <= TxCb->RetryLos)) {\r
         Status = EFI_NO_RESPONSE;\r
         goto ON_CLOSE;\r
       }\r
@@ -3061,7 +3027,7 @@ Dhcp6OnTimerTick (
                          TRUE\r
                          );\r
 \r
-      if (TxCb->RetryCtl.Mrt != 0 && TxCb->RetryCtl.Mrt < TxCb->RetryExp) {\r
+      if ((TxCb->RetryCtl.Mrt != 0) && (TxCb->RetryCtl.Mrt < TxCb->RetryExp)) {\r
         TxCb->RetryExp = Dhcp6CalculateExpireTime (\r
                            TxCb->RetryCtl.Mrt,\r
                            TRUE,\r
@@ -3074,7 +3040,7 @@ Dhcp6OnTimerTick (
       // duration time.\r
       //\r
       LossTime = TxCb->RetryLos + TxCb->RetryExp;\r
-      if (TxCb->RetryCtl.Mrd != 0 && TxCb->RetryCtl.Mrd < LossTime) {\r
+      if ((TxCb->RetryCtl.Mrd != 0) && (TxCb->RetryCtl.Mrd < LossTime)) {\r
         TxCb->RetryExp = TxCb->RetryCtl.Mrd - TxCb->RetryLos;\r
       }\r
 \r
@@ -3100,22 +3066,19 @@ Dhcp6OnTimerTick (
   //\r
   IaCb = &Instance->IaCb;\r
 \r
-  if (Instance->Config == NULL || IaCb->Ia == NULL) {\r
+  if ((Instance->Config == NULL) || (IaCb->Ia == NULL)) {\r
     return;\r
   }\r
 \r
-  if (IaCb->Ia->State == Dhcp6Bound || IaCb->Ia->State == Dhcp6Renewing || IaCb->Ia->State == Dhcp6Rebinding) {\r
-\r
+  if ((IaCb->Ia->State == Dhcp6Bound) || (IaCb->Ia->State == Dhcp6Renewing) || (IaCb->Ia->State == Dhcp6Rebinding)) {\r
     IaCb->LeaseTime++;\r
 \r
-    if (IaCb->LeaseTime > IaCb->T2 && IaCb->Ia->State == Dhcp6Bound) {\r
+    if ((IaCb->LeaseTime > IaCb->T2) && (IaCb->Ia->State == Dhcp6Bound)) {\r
       //\r
       // Exceed t2, send rebind packet to extend the Ia lease.\r
       //\r
       Dhcp6SendRenewRebindMsg (Instance, TRUE);\r
-\r
-    } else if (IaCb->LeaseTime > IaCb->T1 && IaCb->Ia->State == Dhcp6Bound) {\r
-\r
+    } else if ((IaCb->LeaseTime > IaCb->T1) && (IaCb->Ia->State == Dhcp6Bound)) {\r
       //\r
       // Exceed t1, send renew packet to extend the Ia lease.\r
       //\r
@@ -3133,28 +3096,32 @@ Dhcp6OnTimerTick (
 \r
   return;\r
 \r
- ON_CLOSE:\r
+ON_CLOSE:\r
 \r
   if (Dhcp6IsValidTxCb (Instance, TxCb) &&\r
-      TxCb->TxPacket != NULL &&\r
-      (TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgInfoRequest ||\r
-      TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgRenew       ||\r
-      TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgConfirm)\r
-      ) {\r
+      (TxCb->TxPacket != NULL) &&\r
+      ((TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgInfoRequest) ||\r
+       (TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgRenew) ||\r
+       (TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgConfirm))\r
+      )\r
+  {\r
     //\r
     // The failure of renew/Confirm will still switch to the bound state.\r
     //\r
     if ((TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgRenew) ||\r
-        (TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgConfirm)) {\r
+        (TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgConfirm))\r
+    {\r
       ASSERT (Instance->IaCb.Ia);\r
       Instance->IaCb.Ia->State = Dhcp6Bound;\r
     }\r
+\r
     //\r
     // The failure of info-request will return no response.\r
     //\r
     if (TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgInfoRequest) {\r
       Instance->UdpSts = EFI_NO_RESPONSE;\r
     }\r
+\r
     Dhcp6DequeueRetry (\r
       Instance,\r
       TxCb->Xid,\r
index 554f0f5e5dc71113ad3eef8e5d5f45a5c435ddde..051a652f2b1f84b81502f4e37fa32d7746c760d2 100644 (file)
@@ -10,7 +10,6 @@
 #ifndef __EFI_DHCP6_IO_H__\r
 #define __EFI_DHCP6_IO_H__\r
 \r
-\r
 /**\r
   Clean up the specific nodes in the retry list.\r
 \r
@@ -20,8 +19,8 @@
 **/\r
 VOID\r
 Dhcp6CleanupRetry (\r
-  IN DHCP6_INSTANCE         *Instance,\r
-  IN UINT32                 Scope\r
+  IN DHCP6_INSTANCE  *Instance,\r
+  IN UINT32          Scope\r
   );\r
 \r
 /**\r
@@ -33,8 +32,8 @@ Dhcp6CleanupRetry (
 **/\r
 VOID\r
 Dhcp6CleanupSession (\r
-  IN OUT DHCP6_INSTANCE          *Instance,\r
-  IN     EFI_STATUS              Status\r
+  IN OUT DHCP6_INSTANCE  *Instance,\r
+  IN     EFI_STATUS      Status\r
   );\r
 \r
 /**\r
@@ -49,7 +48,7 @@ Dhcp6CleanupSession (
 **/\r
 EFI_STATUS\r
 Dhcp6SendSolicitMsg (\r
-  IN DHCP6_INSTANCE         *Instance\r
+  IN DHCP6_INSTANCE  *Instance\r
   );\r
 \r
 /**\r
@@ -65,7 +64,7 @@ Dhcp6SendSolicitMsg (
 **/\r
 EFI_STATUS\r
 Dhcp6SendRequestMsg (\r
-  IN DHCP6_INSTANCE         *Instance\r
+  IN DHCP6_INSTANCE  *Instance\r
   );\r
 \r
 /**\r
@@ -83,8 +82,8 @@ Dhcp6SendRequestMsg (
 **/\r
 EFI_STATUS\r
 Dhcp6SendRenewRebindMsg (\r
-  IN DHCP6_INSTANCE         *Instance,\r
-  IN BOOLEAN                RebindRequest\r
+  IN DHCP6_INSTANCE  *Instance,\r
+  IN BOOLEAN         RebindRequest\r
   );\r
 \r
 /**\r
@@ -101,8 +100,8 @@ Dhcp6SendRenewRebindMsg (
 **/\r
 EFI_STATUS\r
 Dhcp6SendDeclineMsg (\r
-  IN DHCP6_INSTANCE            *Instance,\r
-  IN EFI_DHCP6_IA              *DecIa\r
+  IN DHCP6_INSTANCE  *Instance,\r
+  IN EFI_DHCP6_IA    *DecIa\r
   );\r
 \r
 /**\r
@@ -119,8 +118,8 @@ Dhcp6SendDeclineMsg (
 **/\r
 EFI_STATUS\r
 Dhcp6SendReleaseMsg (\r
-  IN DHCP6_INSTANCE            *Instance,\r
-  IN EFI_DHCP6_IA              *RelIa\r
+  IN DHCP6_INSTANCE  *Instance,\r
+  IN EFI_DHCP6_IA    *RelIa\r
   );\r
 \r
 /**\r
@@ -198,10 +197,10 @@ Dhcp6SendInfoRequestMsg (
 VOID\r
 EFIAPI\r
 Dhcp6ReceivePacket (\r
-  IN NET_BUF                *Udp6Wrap,\r
-  IN UDP_END_POINT          *EndPoint,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN VOID                   *Context\r
+  IN NET_BUF        *Udp6Wrap,\r
+  IN UDP_END_POINT  *EndPoint,\r
+  IN EFI_STATUS     IoStatus,\r
+  IN VOID           *Context\r
   );\r
 \r
 /**\r
@@ -214,8 +213,8 @@ Dhcp6ReceivePacket (
 VOID\r
 EFIAPI\r
 Dhcp6OnTimerTick (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 #endif\r
index d249a1cca7a11cb0a932b4b618bc624f432c2214..e6368b5b1c6c65f8f2387ef4a202d96286ae4a47 100644 (file)
@@ -10,7 +10,6 @@
 \r
 #include "Dhcp6Impl.h"\r
 \r
-\r
 /**\r
   Generate client Duid in the format of Duid-llt.\r
 \r
 **/\r
 EFI_DHCP6_DUID *\r
 Dhcp6GenerateClientId (\r
-  IN EFI_SIMPLE_NETWORK_MODE   *Mode\r
+  IN EFI_SIMPLE_NETWORK_MODE  *Mode\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_DHCP6_DUID            *Duid;\r
-  EFI_TIME                  Time;\r
-  UINT32                    Stamp;\r
-  EFI_GUID                  Uuid;\r
-\r
+  EFI_STATUS      Status;\r
+  EFI_DHCP6_DUID  *Duid;\r
+  EFI_TIME        Time;\r
+  UINT32          Stamp;\r
+  EFI_GUID        Uuid;\r
 \r
   //\r
   // Attempt to get client Id from variable to keep it constant.\r
   // See details in section-9 of rfc-3315.\r
   //\r
-  GetVariable2 (L"ClientId", &gEfiDhcp6ServiceBindingProtocolGuid, (VOID**)&Duid, NULL);\r
+  GetVariable2 (L"ClientId", &gEfiDhcp6ServiceBindingProtocolGuid, (VOID **)&Duid, NULL);\r
   if (Duid != NULL) {\r
     return Duid;\r
   }\r
@@ -84,17 +82,15 @@ Dhcp6GenerateClientId (
     //\r
     // sizeof (Duid-type + UUID-size) = 18 bytes\r
     //\r
-    Duid->Length = (UINT16) (18);\r
+    Duid->Length = (UINT16)(18);\r
 \r
     //\r
     // Set the Duid-type and copy UUID.\r
     //\r
-    WriteUnaligned16 ((UINT16 *) (Duid->Duid), HTONS (Dhcp6DuidTypeUuid));\r
-\r
-    CopyMem (Duid->Duid + 2, &Uuid, sizeof(EFI_GUID));\r
+    WriteUnaligned16 ((UINT16 *)(Duid->Duid), HTONS (Dhcp6DuidTypeUuid));\r
 \r
+    CopyMem (Duid->Duid + 2, &Uuid, sizeof (EFI_GUID));\r
   } else {\r
-\r
     //\r
     //\r
     //  The format of DUID-LLT:\r
@@ -116,11 +112,11 @@ Dhcp6GenerateClientId (
     //\r
     gRT->GetTime (&Time, NULL);\r
     Stamp = (UINT32)\r
-      (\r
-        ((((UINT32)(Time.Year - 2000) * 360 + (Time.Month - 1) * 30 + (Time.Day - 1)) * 24 + Time.Hour) * 60 + Time.Minute) *\r
-        60 +\r
-        Time.Second\r
-      );\r
+            (\r
+             ((((UINT32)(Time.Year - 2000) * 360 + (Time.Month - 1) * 30 + (Time.Day - 1)) * 24 + Time.Hour) * 60 + Time.Minute) *\r
+             60 +\r
+             Time.Second\r
+            );\r
 \r
     //\r
     // sizeof (option-len + Duid-type + hardware-type + time) = 10 bytes\r
@@ -133,14 +129,14 @@ Dhcp6GenerateClientId (
     //\r
     // sizeof (Duid-type + hardware-type + time) = 8 bytes\r
     //\r
-    Duid->Length = (UINT16) (Mode->HwAddressSize + 8);\r
+    Duid->Length = (UINT16)(Mode->HwAddressSize + 8);\r
 \r
     //\r
     // Set the Duid-type, hardware-type, time and copy the hardware address.\r
     //\r
-    WriteUnaligned16 ((UINT16 *) ((UINT8 *) Duid + OFFSET_OF (EFI_DHCP6_DUID, Duid)), HTONS (Dhcp6DuidTypeLlt));\r
-    WriteUnaligned16 ((UINT16 *) ((UINT8 *) Duid + OFFSET_OF (EFI_DHCP6_DUID, Duid) + 2), HTONS (NET_IFTYPE_ETHERNET));\r
-    WriteUnaligned32 ((UINT32 *) ((UINT8 *) Duid + OFFSET_OF (EFI_DHCP6_DUID, Duid) + 4), HTONL (Stamp));\r
+    WriteUnaligned16 ((UINT16 *)((UINT8 *)Duid + OFFSET_OF (EFI_DHCP6_DUID, Duid)), HTONS (Dhcp6DuidTypeLlt));\r
+    WriteUnaligned16 ((UINT16 *)((UINT8 *)Duid + OFFSET_OF (EFI_DHCP6_DUID, Duid) + 2), HTONS (NET_IFTYPE_ETHERNET));\r
+    WriteUnaligned32 ((UINT32 *)((UINT8 *)Duid + OFFSET_OF (EFI_DHCP6_DUID, Duid) + 4), HTONL (Stamp));\r
 \r
     CopyMem (Duid->Duid + 8, &Mode->CurrentAddress, Mode->HwAddressSize);\r
   }\r
@@ -150,7 +146,7 @@ Dhcp6GenerateClientId (
                   &gEfiDhcp6ServiceBindingProtocolGuid,\r
                   (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS),\r
                   Duid->Length + 2,\r
-                  (VOID *) Duid\r
+                  (VOID *)Duid\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     FreePool (Duid);\r
@@ -160,7 +156,6 @@ Dhcp6GenerateClientId (
   return Duid;\r
 }\r
 \r
-\r
 /**\r
   Copy the Dhcp6 configure data.\r
 \r
@@ -173,13 +168,13 @@ Dhcp6GenerateClientId (
 **/\r
 EFI_STATUS\r
 Dhcp6CopyConfigData (\r
-  IN EFI_DHCP6_CONFIG_DATA      *DstCfg,\r
-  IN EFI_DHCP6_CONFIG_DATA      *SorCfg\r
+  IN EFI_DHCP6_CONFIG_DATA  *DstCfg,\r
+  IN EFI_DHCP6_CONFIG_DATA  *SorCfg\r
   )\r
 {\r
-  UINTN                     Index;\r
-  UINTN                     OptionListSize;\r
-  UINTN                     OptionSize;\r
+  UINTN  Index;\r
+  UINTN  OptionListSize;\r
+  UINTN  OptionSize;\r
 \r
   CopyMem (DstCfg, SorCfg, sizeof (EFI_DHCP6_CONFIG_DATA));\r
 \r
@@ -187,7 +182,6 @@ Dhcp6CopyConfigData (
   // Allocate another buffer for solicitretransmission, and copy it.\r
   //\r
   if (SorCfg->SolicitRetransmission != NULL) {\r
-\r
     DstCfg->SolicitRetransmission = AllocateZeroPool (sizeof (EFI_DHCP6_RETRANSMISSION));\r
 \r
     if (DstCfg->SolicitRetransmission == NULL) {\r
@@ -204,8 +198,7 @@ Dhcp6CopyConfigData (
       );\r
   }\r
 \r
-  if (SorCfg->OptionList != NULL && SorCfg->OptionCount != 0) {\r
-\r
+  if ((SorCfg->OptionList != NULL) && (SorCfg->OptionCount != 0)) {\r
     OptionListSize     = SorCfg->OptionCount * sizeof (EFI_DHCP6_PACKET_OPTION *);\r
     DstCfg->OptionList = AllocateZeroPool (OptionListSize);\r
 \r
@@ -217,7 +210,6 @@ Dhcp6CopyConfigData (
     }\r
 \r
     for (Index = 0; Index < SorCfg->OptionCount; Index++) {\r
-\r
       OptionSize                = NTOHS (SorCfg->OptionList[Index]->OpLen) + 4;\r
       DstCfg->OptionList[Index] = AllocateZeroPool (OptionSize);\r
 \r
@@ -239,7 +231,6 @@ Dhcp6CopyConfigData (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Clean up the configure data.\r
 \r
@@ -248,10 +239,10 @@ Dhcp6CopyConfigData (
 **/\r
 VOID\r
 Dhcp6CleanupConfigData (\r
-  IN OUT EFI_DHCP6_CONFIG_DATA       *CfgData\r
+  IN OUT EFI_DHCP6_CONFIG_DATA  *CfgData\r
   )\r
 {\r
-  UINTN                          Index;\r
+  UINTN  Index;\r
 \r
   ASSERT (CfgData != NULL);\r
   //\r
@@ -264,6 +255,7 @@ Dhcp6CleanupConfigData (
         FreePool (CfgData->OptionList[Index]);\r
       }\r
     }\r
+\r
     FreePool (CfgData->OptionList);\r
   }\r
 \r
@@ -274,7 +266,6 @@ Dhcp6CleanupConfigData (
   ZeroMem (CfgData, sizeof (EFI_DHCP6_CONFIG_DATA));\r
 }\r
 \r
-\r
 /**\r
   Clean up the mode data.\r
 \r
@@ -283,7 +274,7 @@ Dhcp6CleanupConfigData (
 **/\r
 VOID\r
 Dhcp6CleanupModeData (\r
-  IN OUT EFI_DHCP6_MODE_DATA        *ModeData\r
+  IN OUT EFI_DHCP6_MODE_DATA  *ModeData\r
   )\r
 {\r
   ASSERT (ModeData != NULL);\r
@@ -296,17 +287,16 @@ Dhcp6CleanupModeData (
   }\r
 \r
   if (ModeData->Ia != NULL) {\r
-\r
     if (ModeData->Ia->ReplyPacket != NULL) {\r
       FreePool (ModeData->Ia->ReplyPacket);\r
     }\r
+\r
     FreePool (ModeData->Ia);\r
   }\r
 \r
   ZeroMem (ModeData, sizeof (EFI_DHCP6_MODE_DATA));\r
 }\r
 \r
-\r
 /**\r
   Calculate the expire time by the algorithm defined in rfc.\r
 \r
@@ -319,15 +309,15 @@ Dhcp6CleanupModeData (
 **/\r
 UINT32\r
 Dhcp6CalculateExpireTime (\r
-  IN UINT32                 Base,\r
-  IN BOOLEAN                IsFirstRt,\r
-  IN BOOLEAN                NeedSigned\r
+  IN UINT32   Base,\r
+  IN BOOLEAN  IsFirstRt,\r
+  IN BOOLEAN  NeedSigned\r
   )\r
 {\r
-  EFI_TIME                  Time;\r
-  BOOLEAN                   Signed;\r
-  UINT32                    Seed;\r
-  UINT32                    Expire;\r
+  EFI_TIME  Time;\r
+  BOOLEAN   Signed;\r
+  UINT32    Seed;\r
+  UINT32    Expire;\r
 \r
   //\r
   // Take the 10bits of microsecond in system time as a uniform distribution.\r
@@ -335,8 +325,8 @@ Dhcp6CalculateExpireTime (
   //\r
   gRT->GetTime (&Time, NULL);\r
   Seed   = ((Time.Nanosecond >> 10) & DHCP6_10_BIT_MASK);\r
-  Signed = (BOOLEAN) ((((Time.Nanosecond >> 9) & 0x01) != 0) ? TRUE : FALSE);\r
-  Signed = (BOOLEAN) (NeedSigned ? Signed : FALSE);\r
+  Signed = (BOOLEAN)((((Time.Nanosecond >> 9) & 0x01) != 0) ? TRUE : FALSE);\r
+  Signed = (BOOLEAN)(NeedSigned ? Signed : FALSE);\r
 \r
   //\r
   // Calculate expire by the following algo:\r
@@ -348,20 +338,13 @@ Dhcp6CalculateExpireTime (
   // The (Seed / 0x3ff / 10) is used to a random range (0, 0.1).\r
   //\r
   if (IsFirstRt && Signed) {\r
-\r
-    Expire = Base - (UINT32) (Base * Seed / DHCP6_10_BIT_MASK / 10);\r
-\r
+    Expire = Base - (UINT32)(Base * Seed / DHCP6_10_BIT_MASK / 10);\r
   } else if (IsFirstRt && !Signed) {\r
-\r
-    Expire = Base + (UINT32) (Base * Seed / DHCP6_10_BIT_MASK / 10);\r
-\r
+    Expire = Base + (UINT32)(Base * Seed / DHCP6_10_BIT_MASK / 10);\r
   } else if (!IsFirstRt && Signed) {\r
-\r
-    Expire = 2 * Base - (UINT32) (Base * Seed / DHCP6_10_BIT_MASK / 10);\r
-\r
+    Expire = 2 * Base - (UINT32)(Base * Seed / DHCP6_10_BIT_MASK / 10);\r
   } else {\r
-\r
-    Expire = 2 * Base + (UINT32) (Base * Seed / DHCP6_10_BIT_MASK / 10);\r
+    Expire = 2 * Base + (UINT32)(Base * Seed / DHCP6_10_BIT_MASK / 10);\r
   }\r
 \r
   Expire = (Expire != 0) ? Expire : 1;\r
@@ -369,7 +352,6 @@ Dhcp6CalculateExpireTime (
   return Expire;\r
 }\r
 \r
-\r
 /**\r
   Calculate the lease time by the algorithm defined in rfc.\r
 \r
@@ -378,25 +360,25 @@ Dhcp6CalculateExpireTime (
 **/\r
 VOID\r
 Dhcp6CalculateLeaseTime (\r
-  IN DHCP6_IA_CB              *IaCb\r
+  IN DHCP6_IA_CB  *IaCb\r
   )\r
 {\r
-  UINT32                      MinLt;\r
-  UINT32                      MaxLt;\r
-  UINTN                       Index;\r
+  UINT32  MinLt;\r
+  UINT32  MaxLt;\r
+  UINTN   Index;\r
 \r
   ASSERT (IaCb->Ia->IaAddressCount > 0);\r
 \r
-  MinLt    = (UINT32) (-1);\r
-  MaxLt    = 0;\r
+  MinLt = (UINT32)(-1);\r
+  MaxLt = 0;\r
 \r
   //\r
   // Calculate minlt as min of all valid life time, and maxlt as max of all\r
   // valid life time.\r
   //\r
   for (Index = 0; Index < IaCb->Ia->IaAddressCount; Index++) {\r
-    MinLt  = MIN (MinLt, IaCb->Ia->IaAddress[Index].ValidLifetime);\r
-    MaxLt  = MAX (MinLt, IaCb->Ia->IaAddress[Index].ValidLifetime);\r
+    MinLt = MIN (MinLt, IaCb->Ia->IaAddress[Index].ValidLifetime);\r
+    MaxLt = MAX (MinLt, IaCb->Ia->IaAddress[Index].ValidLifetime);\r
   }\r
 \r
   //\r
@@ -409,7 +391,6 @@ Dhcp6CalculateLeaseTime (
   IaCb->LeaseTime     = 0;\r
 }\r
 \r
-\r
 /**\r
   Check whether the addresses are all included by the configured Ia.\r
 \r
@@ -423,31 +404,29 @@ Dhcp6CalculateLeaseTime (
 **/\r
 EFI_STATUS\r
 Dhcp6CheckAddress (\r
-  IN EFI_DHCP6_IA             *Ia,\r
-  IN UINT32                   AddressCount,\r
-  IN EFI_IPv6_ADDRESS         *Addresses\r
+  IN EFI_DHCP6_IA      *Ia,\r
+  IN UINT32            AddressCount,\r
+  IN EFI_IPv6_ADDRESS  *Addresses\r
   )\r
 {\r
-  UINTN                       Index1;\r
-  UINTN                       Index2;\r
-  BOOLEAN                     Found;\r
+  UINTN    Index1;\r
+  UINTN    Index2;\r
+  BOOLEAN  Found;\r
 \r
   //\r
   // Check whether the addresses are all included by the configured IA. And it\r
   // will return success if address count is zero, which means all addresses.\r
   //\r
   for (Index1 = 0; Index1 < AddressCount; Index1++) {\r
-\r
     Found = FALSE;\r
 \r
     for (Index2 = 0; Index2 < Ia->IaAddressCount; Index2++) {\r
-\r
       if (CompareMem (\r
             &Addresses[Index1],\r
             &Ia->IaAddress[Index2],\r
             sizeof (EFI_IPv6_ADDRESS)\r
-            ) == 0) {\r
-\r
+            ) == 0)\r
+      {\r
         Found = TRUE;\r
         break;\r
       }\r
@@ -461,7 +440,6 @@ Dhcp6CheckAddress (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Deprive the addresses from current Ia, and generate another eliminated Ia.\r
 \r
@@ -475,16 +453,16 @@ Dhcp6CheckAddress (
 **/\r
 EFI_DHCP6_IA *\r
 Dhcp6DepriveAddress (\r
-  IN EFI_DHCP6_IA             *Ia,\r
-  IN UINT32                   AddressCount,\r
-  IN EFI_IPv6_ADDRESS         *Addresses\r
+  IN EFI_DHCP6_IA      *Ia,\r
+  IN UINT32            AddressCount,\r
+  IN EFI_IPv6_ADDRESS  *Addresses\r
   )\r
 {\r
-  EFI_DHCP6_IA                *IaCopy;\r
-  UINTN                       IaCopySize;\r
-  UINTN                       Index1;\r
-  UINTN                       Index2;\r
-  BOOLEAN                     Found;\r
+  EFI_DHCP6_IA  *IaCopy;\r
+  UINTN         IaCopySize;\r
+  UINTN         Index1;\r
+  UINTN         Index2;\r
+  BOOLEAN       Found;\r
 \r
   if (AddressCount == 0) {\r
     //\r
@@ -521,16 +499,15 @@ Dhcp6DepriveAddress (
   // Move the addresses from the Ia of instance to the deprived Ia.\r
   //\r
   for (Index1 = 0; Index1 < AddressCount; Index1++) {\r
-\r
     Found = FALSE;\r
 \r
     for (Index2 = 0; Index2 < Ia->IaAddressCount; Index2++) {\r
-\r
       if (CompareMem (\r
             &Addresses[Index1],\r
             &Ia->IaAddress[Index2],\r
             sizeof (EFI_IPv6_ADDRESS)\r
-            ) == 0) {\r
+            ) == 0)\r
+      {\r
         //\r
         // Copy the deprived address to the copy of Ia\r
         //\r
@@ -549,10 +526,12 @@ Dhcp6DepriveAddress (
             (Ia->IaAddressCount - Index2 - 1) * sizeof (EFI_DHCP6_IA_ADDRESS)\r
             );\r
         }\r
+\r
         Found = TRUE;\r
         break;\r
       }\r
     }\r
+\r
     ASSERT (Found == TRUE);\r
   }\r
 \r
@@ -562,7 +541,6 @@ Dhcp6DepriveAddress (
   return IaCopy;\r
 }\r
 \r
-\r
 /**\r
   The dummy ext buffer free callback routine.\r
 \r
@@ -572,12 +550,11 @@ Dhcp6DepriveAddress (
 VOID\r
 EFIAPI\r
 Dhcp6DummyExtFree (\r
-  IN VOID                      *Arg\r
+  IN VOID  *Arg\r
   )\r
 {\r
 }\r
 \r
-\r
 /**\r
   The callback routine once message transmitted.\r
 \r
@@ -590,16 +567,15 @@ Dhcp6DummyExtFree (
 VOID\r
 EFIAPI\r
 Dhcp6OnTransmitted (\r
-  IN NET_BUF                   *Wrap,\r
-  IN UDP_END_POINT             *EndPoint,\r
-  IN EFI_STATUS                IoStatus,\r
-  IN VOID                      *Context\r
+  IN NET_BUF        *Wrap,\r
+  IN UDP_END_POINT  *EndPoint,\r
+  IN EFI_STATUS     IoStatus,\r
+  IN VOID           *Context\r
   )\r
 {\r
   NetbufFree (Wrap);\r
 }\r
 \r
-\r
 /**\r
   Append the option to Buf, and move Buf to the end.\r
 \r
@@ -613,10 +589,10 @@ Dhcp6OnTransmitted (
 **/\r
 UINT8 *\r
 Dhcp6AppendOption (\r
-  IN OUT UINT8               *Buf,\r
-  IN     UINT16              OptType,\r
-  IN     UINT16              OptLen,\r
-  IN     UINT8               *Data\r
+  IN OUT UINT8   *Buf,\r
+  IN     UINT16  OptType,\r
+  IN     UINT16  OptLen,\r
+  IN     UINT8   *Data\r
   )\r
 {\r
   //\r
@@ -633,12 +609,12 @@ Dhcp6AppendOption (
 \r
   ASSERT (OptLen != 0);\r
 \r
-  WriteUnaligned16 ((UINT16 *) Buf, OptType);\r
-  Buf            += 2;\r
-  WriteUnaligned16 ((UINT16 *) Buf, OptLen);\r
-  Buf            += 2;\r
+  WriteUnaligned16 ((UINT16 *)Buf, OptType);\r
+  Buf += 2;\r
+  WriteUnaligned16 ((UINT16 *)Buf, OptLen);\r
+  Buf += 2;\r
   CopyMem (Buf, Data, NTOHS (OptLen));\r
-  Buf            += NTOHS (OptLen);\r
+  Buf += NTOHS (OptLen);\r
 \r
   return Buf;\r
 }\r
@@ -655,12 +631,11 @@ Dhcp6AppendOption (
 **/\r
 UINT8 *\r
 Dhcp6AppendIaAddrOption (\r
-  IN OUT UINT8                  *Buf,\r
-  IN     EFI_DHCP6_IA_ADDRESS   *IaAddr,\r
-  IN     UINT32                 MessageType\r
-)\r
+  IN OUT UINT8                 *Buf,\r
+  IN     EFI_DHCP6_IA_ADDRESS  *IaAddr,\r
+  IN     UINT32                MessageType\r
+  )\r
 {\r
-\r
   //  The format of the IA Address option is:\r
   //\r
   //       0                   1                   2                   3\r
@@ -685,14 +660,14 @@ Dhcp6AppendIaAddrOption (
   //\r
   // Fill the value of Ia Address option type\r
   //\r
-  WriteUnaligned16 ((UINT16 *) Buf, HTONS (Dhcp6OptIaAddr));\r
-  Buf                     += 2;\r
+  WriteUnaligned16 ((UINT16 *)Buf, HTONS (Dhcp6OptIaAddr));\r
+  Buf += 2;\r
 \r
-  WriteUnaligned16 ((UINT16 *) Buf, HTONS (sizeof (EFI_DHCP6_IA_ADDRESS)));\r
-  Buf                     += 2;\r
+  WriteUnaligned16 ((UINT16 *)Buf, HTONS (sizeof (EFI_DHCP6_IA_ADDRESS)));\r
+  Buf += 2;\r
 \r
-  CopyMem (Buf, &IaAddr->IpAddress, sizeof(EFI_IPv6_ADDRESS));\r
-  Buf                     += sizeof(EFI_IPv6_ADDRESS);\r
+  CopyMem (Buf, &IaAddr->IpAddress, sizeof (EFI_IPv6_ADDRESS));\r
+  Buf += sizeof (EFI_IPv6_ADDRESS);\r
 \r
   //\r
   // Fill the value of preferred-lifetime and valid-lifetime.\r
@@ -700,19 +675,20 @@ Dhcp6AppendIaAddrOption (
   // should set to 0 when initiate a Confirm message.\r
   //\r
   if (MessageType != Dhcp6MsgConfirm) {\r
-    WriteUnaligned32 ((UINT32 *) Buf, HTONL (IaAddr->PreferredLifetime));\r
+    WriteUnaligned32 ((UINT32 *)Buf, HTONL (IaAddr->PreferredLifetime));\r
   }\r
-  Buf                     += 4;\r
+\r
+  Buf += 4;\r
 \r
   if (MessageType != Dhcp6MsgConfirm) {\r
-    WriteUnaligned32 ((UINT32 *) Buf, HTONL (IaAddr->ValidLifetime));\r
+    WriteUnaligned32 ((UINT32 *)Buf, HTONL (IaAddr->ValidLifetime));\r
   }\r
-  Buf                     += 4;\r
+\r
+  Buf += 4;\r
 \r
   return Buf;\r
 }\r
 \r
-\r
 /**\r
   Append the appointed Ia option to Buf, and move Buf to the end.\r
 \r
@@ -727,16 +703,16 @@ Dhcp6AppendIaAddrOption (
 **/\r
 UINT8 *\r
 Dhcp6AppendIaOption (\r
-  IN OUT UINT8                  *Buf,\r
-  IN     EFI_DHCP6_IA           *Ia,\r
-  IN     UINT32                 T1,\r
-  IN     UINT32                 T2,\r
-  IN     UINT32                 MessageType\r
+  IN OUT UINT8         *Buf,\r
+  IN     EFI_DHCP6_IA  *Ia,\r
+  IN     UINT32        T1,\r
+  IN     UINT32        T2,\r
+  IN     UINT32        MessageType\r
   )\r
 {\r
-  UINT8                     *AddrOpt;\r
-  UINT16                    *Len;\r
-  UINTN                     Index;\r
+  UINT8   *AddrOpt;\r
+  UINT16  *Len;\r
+  UINTN   Index;\r
 \r
   //\r
   //  The format of IA_NA and IA_TA option:\r
@@ -760,43 +736,43 @@ Dhcp6AppendIaOption (
   //\r
   // Fill the value of Ia option type\r
   //\r
-  WriteUnaligned16 ((UINT16 *) Buf, HTONS (Ia->Descriptor.Type));\r
-  Buf                     += 2;\r
+  WriteUnaligned16 ((UINT16 *)Buf, HTONS (Ia->Descriptor.Type));\r
+  Buf += 2;\r
 \r
   //\r
   // Fill the len of Ia option later, keep the pointer first\r
   //\r
-  Len                      = (UINT16 *) Buf;\r
-  Buf                     += 2;\r
+  Len  = (UINT16 *)Buf;\r
+  Buf += 2;\r
 \r
   //\r
   // Fill the value of iaid\r
   //\r
-  WriteUnaligned32 ((UINT32 *) Buf, HTONL (Ia->Descriptor.IaId));\r
-  Buf                     += 4;\r
+  WriteUnaligned32 ((UINT32 *)Buf, HTONL (Ia->Descriptor.IaId));\r
+  Buf += 4;\r
 \r
   //\r
   // Fill the value of t1 and t2 if iana, keep it 0xffffffff if no specified.\r
   //\r
   if (Ia->Descriptor.Type == Dhcp6OptIana) {\r
-    WriteUnaligned32 ((UINT32 *) Buf, HTONL ((T1 != 0) ? T1 : 0xffffffff));\r
-    Buf                   += 4;\r
-    WriteUnaligned32 ((UINT32 *) Buf, HTONL ((T2 != 0) ? T2 : 0xffffffff));\r
-    Buf                   += 4;\r
+    WriteUnaligned32 ((UINT32 *)Buf, HTONL ((T1 != 0) ? T1 : 0xffffffff));\r
+    Buf += 4;\r
+    WriteUnaligned32 ((UINT32 *)Buf, HTONL ((T2 != 0) ? T2 : 0xffffffff));\r
+    Buf += 4;\r
   }\r
 \r
   //\r
   // Fill all the addresses belong to the Ia\r
   //\r
   for (Index = 0; Index < Ia->IaAddressCount; Index++) {\r
-    AddrOpt = (UINT8 *) Ia->IaAddress + Index * sizeof (EFI_DHCP6_IA_ADDRESS);\r
-    Buf = Dhcp6AppendIaAddrOption (Buf, (EFI_DHCP6_IA_ADDRESS *) AddrOpt, MessageType);\r
+    AddrOpt = (UINT8 *)Ia->IaAddress + Index * sizeof (EFI_DHCP6_IA_ADDRESS);\r
+    Buf     = Dhcp6AppendIaAddrOption (Buf, (EFI_DHCP6_IA_ADDRESS *)AddrOpt, MessageType);\r
   }\r
 \r
   //\r
   // Fill the value of Ia option length\r
   //\r
-  *Len = HTONS ((UINT16) (Buf - (UINT8 *) Len - 2));\r
+  *Len = HTONS ((UINT16)(Buf - (UINT8 *)Len - 2));\r
 \r
   return Buf;\r
 }\r
@@ -814,9 +790,9 @@ Dhcp6AppendIaOption (
 **/\r
 UINT8 *\r
 Dhcp6AppendETOption (\r
-  IN OUT UINT8                  *Buf,\r
-  IN     DHCP6_INSTANCE         *Instance,\r
-  OUT    UINT16                 **Elapsed\r
+  IN OUT UINT8           *Buf,\r
+  IN     DHCP6_INSTANCE  *Instance,\r
+  OUT    UINT16          **Elapsed\r
   )\r
 {\r
   //\r
@@ -833,22 +809,22 @@ Dhcp6AppendETOption (
   //\r
   // Fill the value of elapsed-time option type.\r
   //\r
-  WriteUnaligned16 ((UINT16 *) Buf, HTONS (Dhcp6OptElapsedTime));\r
-  Buf                     += 2;\r
+  WriteUnaligned16 ((UINT16 *)Buf, HTONS (Dhcp6OptElapsedTime));\r
+  Buf += 2;\r
 \r
   //\r
   // Fill the len of elapsed-time option, which is fixed.\r
   //\r
-  WriteUnaligned16 ((UINT16 *) Buf, HTONS(2));\r
-  Buf                     += 2;\r
+  WriteUnaligned16 ((UINT16 *)Buf, HTONS (2));\r
+  Buf += 2;\r
 \r
   //\r
   // Fill in elapsed time value with 0 value for now.  The actual value is\r
   // filled in later just before the packet is transmitted.\r
   //\r
-  WriteUnaligned16 ((UINT16 *) Buf, HTONS(0));\r
-  *Elapsed                  = (UINT16 *) Buf;\r
-  Buf                     += 2;\r
+  WriteUnaligned16 ((UINT16 *)Buf, HTONS (0));\r
+  *Elapsed = (UINT16 *)Buf;\r
+  Buf     += 2;\r
 \r
   return Buf;\r
 }\r
@@ -863,13 +839,13 @@ Dhcp6AppendETOption (
 **/\r
 VOID\r
 SetElapsedTime (\r
-  IN     UINT16                 *Elapsed,\r
-  IN     DHCP6_INSTANCE         *Instance\r
+  IN     UINT16          *Elapsed,\r
+  IN     DHCP6_INSTANCE  *Instance\r
   )\r
 {\r
-  EFI_TIME          Time;\r
-  UINT64            CurrentStamp;\r
-  UINT64            ElapsedTimeValue;\r
+  EFI_TIME  Time;\r
+  UINT64    CurrentStamp;\r
+  UINT64    ElapsedTimeValue;\r
 \r
   //\r
   // Generate a time stamp of the centiseconds from 2000/1/1, assume 30day/month.\r
@@ -879,7 +855,7 @@ SetElapsedTime (
                    ((((UINT32)(Time.Year - 2000) * 360 + (Time.Month - 1) * 30 + (Time.Day - 1)) * 24 + Time.Hour) * 60 + Time.Minute) * 60 + Time.Second,\r
                    100\r
                    ) +\r
-                 DivU64x32(\r
+                 DivU64x32 (\r
                    Time.Nanosecond,\r
                    10000000\r
                    );\r
@@ -890,7 +866,7 @@ SetElapsedTime (
   // gets 0 elapsed-time.  Otherwise, calculate based on StartTime.\r
   //\r
   if (Instance->StartTime == 0) {\r
-    ElapsedTimeValue = 0;\r
+    ElapsedTimeValue    = 0;\r
     Instance->StartTime = CurrentStamp;\r
   } else {\r
     ElapsedTimeValue = CurrentStamp - Instance->StartTime;\r
@@ -902,9 +878,9 @@ SetElapsedTime (
       ElapsedTimeValue = 0xffff;\r
     }\r
   }\r
-  WriteUnaligned16 (Elapsed, HTONS((UINT16) ElapsedTimeValue));\r
-}\r
 \r
+  WriteUnaligned16 (Elapsed, HTONS ((UINT16)ElapsedTimeValue));\r
+}\r
 \r
 /**\r
   Seek the address of the first byte of the option header.\r
@@ -919,15 +895,15 @@ SetElapsedTime (
 **/\r
 UINT8 *\r
 Dhcp6SeekOption (\r
-  IN UINT8           *Buf,\r
-  IN UINT32          SeekLen,\r
-  IN UINT16          OptType\r
+  IN UINT8   *Buf,\r
+  IN UINT32  SeekLen,\r
+  IN UINT16  OptType\r
   )\r
 {\r
-  UINT8              *Cursor;\r
-  UINT8              *Option;\r
-  UINT16             DataLen;\r
-  UINT16             OpCode;\r
+  UINT8   *Cursor;\r
+  UINT8   *Option;\r
+  UINT16  DataLen;\r
+  UINT16  OpCode;\r
 \r
   Option = NULL;\r
   Cursor = Buf;\r
@@ -936,19 +912,19 @@ Dhcp6SeekOption (
   // The format of Dhcp6 option refers to Dhcp6AppendOption().\r
   //\r
   while (Cursor < Buf + SeekLen) {\r
-    OpCode = ReadUnaligned16 ((UINT16 *) Cursor);\r
+    OpCode = ReadUnaligned16 ((UINT16 *)Cursor);\r
     if (OpCode == HTONS (OptType)) {\r
       Option = Cursor;\r
       break;\r
     }\r
-    DataLen = NTOHS (ReadUnaligned16 ((UINT16 *) (Cursor + 2)));\r
+\r
+    DataLen = NTOHS (ReadUnaligned16 ((UINT16 *)(Cursor + 2)));\r
     Cursor += (DataLen + 4);\r
   }\r
 \r
   return Option;\r
 }\r
 \r
-\r
 /**\r
   Seek the address of the first byte of the Ia option header.\r
 \r
@@ -967,11 +943,11 @@ Dhcp6SeekIaOption (
   IN EFI_DHCP6_IA_DESCRIPTOR  *IaDesc\r
   )\r
 {\r
-  UINT8              *Cursor;\r
-  UINT8              *Option;\r
-  UINT16             DataLen;\r
-  UINT16             OpCode;\r
-  UINT32             IaId;\r
+  UINT8   *Cursor;\r
+  UINT8   *Option;\r
+  UINT16  DataLen;\r
+  UINT16  OpCode;\r
+  UINT32  IaId;\r
 \r
   //\r
   // The format of IA_NA and IA_TA option refers to Dhcp6AppendIaOption().\r
@@ -980,13 +956,14 @@ Dhcp6SeekIaOption (
   Cursor = Buf;\r
 \r
   while (Cursor < Buf + SeekLen) {\r
-    OpCode = ReadUnaligned16 ((UINT16 *) Cursor);\r
-    IaId   = ReadUnaligned32 ((UINT32 *) (Cursor + 4));\r
-    if (OpCode == HTONS (IaDesc->Type) && IaId == HTONL (IaDesc->IaId)) {\r
+    OpCode = ReadUnaligned16 ((UINT16 *)Cursor);\r
+    IaId   = ReadUnaligned32 ((UINT32 *)(Cursor + 4));\r
+    if ((OpCode == HTONS (IaDesc->Type)) && (IaId == HTONL (IaDesc->IaId))) {\r
       Option = Cursor;\r
       break;\r
     }\r
-    DataLen = NTOHS (ReadUnaligned16 ((UINT16 *) (Cursor + 2)));\r
+\r
+    DataLen = NTOHS (ReadUnaligned16 ((UINT16 *)(Cursor + 2)));\r
     Cursor += (DataLen + 4);\r
   }\r
 \r
@@ -1006,19 +983,20 @@ Dhcp6SeekIaOption (
 **/\r
 BOOLEAN\r
 Dhcp6AddrIsInCurrentIa (\r
-  IN    EFI_DHCP6_IA_ADDRESS      *IaAddr,\r
-  IN    EFI_DHCP6_IA              *CurrentIa\r
+  IN    EFI_DHCP6_IA_ADDRESS  *IaAddr,\r
+  IN    EFI_DHCP6_IA          *CurrentIa\r
   )\r
 {\r
-  UINT32    Index;\r
+  UINT32  Index;\r
 \r
   ASSERT (IaAddr != NULL && CurrentIa != NULL);\r
 \r
   for (Index = 0; Index < CurrentIa->IaAddressCount; Index++) {\r
-    if (EFI_IP6_EQUAL(&IaAddr->IpAddress, &CurrentIa->IaAddress[Index].IpAddress)) {\r
+    if (EFI_IP6_EQUAL (&IaAddr->IpAddress, &CurrentIa->IaAddress[Index].IpAddress)) {\r
       return TRUE;\r
     }\r
   }\r
+\r
   return FALSE;\r
 }\r
 \r
@@ -1034,19 +1012,19 @@ Dhcp6AddrIsInCurrentIa (
 **/\r
 VOID\r
 Dhcp6ParseAddrOption (\r
-  IN     EFI_DHCP6_IA            *CurrentIa,\r
-  IN     UINT8                   *IaInnerOpt,\r
-  IN     UINT16                  IaInnerLen,\r
-     OUT UINT32                  *AddrNum,\r
-  IN OUT EFI_DHCP6_IA_ADDRESS    *AddrBuf\r
+  IN     EFI_DHCP6_IA          *CurrentIa,\r
+  IN     UINT8                 *IaInnerOpt,\r
+  IN     UINT16                IaInnerLen,\r
+  OUT UINT32                   *AddrNum,\r
+  IN OUT EFI_DHCP6_IA_ADDRESS  *AddrBuf\r
   )\r
 {\r
-  UINT8                       *Cursor;\r
-  UINT16                      DataLen;\r
-  UINT16                      OpCode;\r
-  UINT32                      ValidLt;\r
-  UINT32                      PreferredLt;\r
-  EFI_DHCP6_IA_ADDRESS        *IaAddr;\r
+  UINT8                 *Cursor;\r
+  UINT16                DataLen;\r
+  UINT16                OpCode;\r
+  UINT32                ValidLt;\r
+  UINT32                PreferredLt;\r
+  EFI_DHCP6_IA_ADDRESS  *IaAddr;\r
 \r
   //\r
   //  The format of the IA Address option:\r
@@ -1086,26 +1064,28 @@ Dhcp6ParseAddrOption (
     // Refer to RFC3315 Chapter 18.1.8, we need to update lifetimes for any addresses in the IA option\r
     // that the client already has recorded in the IA, and discard the Ia address option with 0 valid time.\r
     //\r
-    OpCode  = ReadUnaligned16 ((UINT16 *) Cursor);\r
-    PreferredLt = NTOHL (ReadUnaligned32 ((UINT32 *) (Cursor + 20)));\r
-    ValidLt = NTOHL (ReadUnaligned32 ((UINT32 *) (Cursor + 24)));\r
-    IaAddr = (EFI_DHCP6_IA_ADDRESS *) (Cursor + 4);\r
-    if (OpCode == HTONS (Dhcp6OptIaAddr) && ValidLt >= PreferredLt &&\r
-        (Dhcp6AddrIsInCurrentIa(IaAddr, CurrentIa) || ValidLt !=0)) {\r
+    OpCode      = ReadUnaligned16 ((UINT16 *)Cursor);\r
+    PreferredLt = NTOHL (ReadUnaligned32 ((UINT32 *)(Cursor + 20)));\r
+    ValidLt     = NTOHL (ReadUnaligned32 ((UINT32 *)(Cursor + 24)));\r
+    IaAddr      = (EFI_DHCP6_IA_ADDRESS *)(Cursor + 4);\r
+    if ((OpCode == HTONS (Dhcp6OptIaAddr)) && (ValidLt >= PreferredLt) &&\r
+        (Dhcp6AddrIsInCurrentIa (IaAddr, CurrentIa) || (ValidLt != 0)))\r
+    {\r
       if (AddrBuf != NULL) {\r
         CopyMem (AddrBuf, IaAddr, sizeof (EFI_DHCP6_IA_ADDRESS));\r
         AddrBuf->PreferredLifetime = PreferredLt;\r
         AddrBuf->ValidLifetime     = ValidLt;\r
-        AddrBuf = (EFI_DHCP6_IA_ADDRESS *) ((UINT8 *) AddrBuf + sizeof (EFI_DHCP6_IA_ADDRESS));\r
+        AddrBuf                    = (EFI_DHCP6_IA_ADDRESS *)((UINT8 *)AddrBuf + sizeof (EFI_DHCP6_IA_ADDRESS));\r
       }\r
+\r
       (*AddrNum)++;\r
     }\r
-    DataLen = NTOHS (ReadUnaligned16 ((UINT16 *) (Cursor + 2)));\r
+\r
+    DataLen = NTOHS (ReadUnaligned16 ((UINT16 *)(Cursor + 2)));\r
     Cursor += (DataLen + 4);\r
   }\r
 }\r
 \r
-\r
 /**\r
   Create a control block for the Ia according to the corresponding options.\r
 \r
@@ -1123,16 +1103,16 @@ Dhcp6ParseAddrOption (
 **/\r
 EFI_STATUS\r
 Dhcp6GenerateIaCb (\r
-  IN  DHCP6_INSTANCE           *Instance,\r
-  IN  UINT8                    *IaInnerOpt,\r
-  IN  UINT16                   IaInnerLen,\r
-  IN  UINT32                   T1,\r
-  IN  UINT32                   T2\r
+  IN  DHCP6_INSTANCE  *Instance,\r
+  IN  UINT8           *IaInnerOpt,\r
+  IN  UINT16          IaInnerLen,\r
+  IN  UINT32          T1,\r
+  IN  UINT32          T2\r
   )\r
 {\r
-  UINT32                       AddrNum;\r
-  UINT32                       IaSize;\r
-  EFI_DHCP6_IA                 *Ia;\r
+  UINT32        AddrNum;\r
+  UINT32        IaSize;\r
+  EFI_DHCP6_IA  *Ia;\r
 \r
   if (Instance->IaCb.Ia == NULL) {\r
     return EFI_DEVICE_ERROR;\r
@@ -1152,7 +1132,7 @@ Dhcp6GenerateIaCb (
   // Allocate for new IA.\r
   //\r
   IaSize = sizeof (EFI_DHCP6_IA) + (AddrNum - 1) * sizeof (EFI_DHCP6_IA_ADDRESS);\r
-  Ia = AllocateZeroPool (IaSize);\r
+  Ia     = AllocateZeroPool (IaSize);\r
 \r
   if (Ia == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
@@ -1172,19 +1152,19 @@ Dhcp6GenerateIaCb (
   if (Instance->IaCb.Ia->ReplyPacket != NULL) {\r
     FreePool (Instance->IaCb.Ia->ReplyPacket);\r
   }\r
-  FreePool (Instance->IaCb.Ia);\r
 \r
+  FreePool (Instance->IaCb.Ia);\r
 \r
   ZeroMem (&Instance->IaCb, sizeof (DHCP6_IA_CB));\r
 \r
   //\r
   // Update IaCb to use new IA.\r
   //\r
-  Instance->IaCb.Ia   = Ia;\r
+  Instance->IaCb.Ia = Ia;\r
 \r
   //\r
 \r
- // Fill in IaCb fields. Such as T1, T2, AllExpireTime and LeaseTime.\r
 // Fill in IaCb fields. Such as T1, T2, AllExpireTime and LeaseTime.\r
   //\r
   Instance->IaCb.T1 = T1;\r
   Instance->IaCb.T2 = T2;\r
@@ -1193,7 +1173,6 @@ Dhcp6GenerateIaCb (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Cache the current IA configuration information.\r
 \r
@@ -1205,11 +1184,11 @@ Dhcp6GenerateIaCb (
 **/\r
 EFI_STATUS\r
 Dhcp6CacheIa (\r
-  IN DHCP6_INSTANCE           *Instance\r
+  IN DHCP6_INSTANCE  *Instance\r
   )\r
 {\r
-  UINTN                        IaSize;\r
-  EFI_DHCP6_IA                 *Ia;\r
+  UINTN         IaSize;\r
+  EFI_DHCP6_IA  *Ia;\r
 \r
   Ia = Instance->IaCb.Ia;\r
 \r
@@ -1223,8 +1202,10 @@ Dhcp6CacheIa (
     if (Instance->CacheIa == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     CopyMem (Instance->CacheIa, Ia, IaSize);\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -1236,16 +1217,16 @@ Dhcp6CacheIa (
 **/\r
 VOID\r
 Dhcp6AppendCacheIa (\r
-  IN DHCP6_INSTANCE           *Instance\r
+  IN DHCP6_INSTANCE  *Instance\r
   )\r
 {\r
-  UINT8                        *Ptr;\r
-  UINTN                        Index;\r
-  UINTN                        IaSize;\r
-  UINTN                        NewIaSize;\r
-  EFI_DHCP6_IA                 *Ia;\r
-  EFI_DHCP6_IA                 *NewIa;\r
-  EFI_DHCP6_IA                 *CacheIa;\r
+  UINT8         *Ptr;\r
+  UINTN         Index;\r
+  UINTN         IaSize;\r
+  UINTN         NewIaSize;\r
+  EFI_DHCP6_IA  *Ia;\r
+  EFI_DHCP6_IA  *NewIa;\r
+  EFI_DHCP6_IA  *CacheIa;\r
 \r
   Ia      = Instance->IaCb.Ia;\r
   CacheIa = Instance->CacheIa;\r
@@ -1267,11 +1248,11 @@ Dhcp6AppendCacheIa (
     // Clear old address.ValidLifetime\r
     //\r
     for (Index = 0; Index < CacheIa->IaAddressCount; Index++) {\r
-      CacheIa->IaAddress[Index].ValidLifetime  = 0;\r
+      CacheIa->IaAddress[Index].ValidLifetime = 0;\r
     }\r
 \r
     NewIa->IaAddressCount += CacheIa->IaAddressCount;\r
-    Ptr   = (UINT8*)&NewIa->IaAddress[Ia->IaAddressCount];\r
+    Ptr                    = (UINT8 *)&NewIa->IaAddress[Ia->IaAddressCount];\r
     CopyMem (Ptr, CacheIa->IaAddress, CacheIa->IaAddressCount * sizeof (EFI_DHCP6_IA_ADDRESS));\r
 \r
     //\r
@@ -1279,8 +1260,8 @@ Dhcp6AppendCacheIa (
     //\r
     FreePool (Instance->CacheIa);\r
     FreePool (Instance->IaCb.Ia);\r
-    Instance->CacheIa  = NULL;\r
-    Instance->IaCb.Ia  = NewIa;\r
+    Instance->CacheIa = NULL;\r
+    Instance->IaCb.Ia = NewIa;\r
   }\r
 }\r
 \r
@@ -1295,25 +1276,25 @@ Dhcp6AppendCacheIa (
 **/\r
 EFI_STATUS\r
 Dhcp6GetMappingTimeOut (\r
-  IN  EFI_IP6_CONFIG_PROTOCOL       *Ip6Cfg,\r
-  OUT UINTN                         *TimeOut\r
+  IN  EFI_IP6_CONFIG_PROTOCOL  *Ip6Cfg,\r
+  OUT UINTN                    *TimeOut\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
-  UINTN                 DataSize;\r
-  EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS    DadXmits;\r
+  EFI_STATUS                                Status;\r
+  UINTN                                     DataSize;\r
+  EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS  DadXmits;\r
 \r
-  if (Ip6Cfg == NULL || TimeOut == NULL) {\r
+  if ((Ip6Cfg == NULL) || (TimeOut == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   DataSize = sizeof (EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS);\r
-  Status = Ip6Cfg->GetData (\r
-                     Ip6Cfg,\r
-                     Ip6ConfigDataTypeDupAddrDetectTransmits,\r
-                     &DataSize,\r
-                     &DadXmits\r
-                     );\r
+  Status   = Ip6Cfg->GetData (\r
+                       Ip6Cfg,\r
+                       Ip6ConfigDataTypeDupAddrDetectTransmits,\r
+                       &DataSize,\r
+                       &DadXmits\r
+                       );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
index 2f18eb3609572992cb37851fe371653be5afc891..046454ff4ac2cfa696f08bdf70b9c0f6d9b498d4 100644 (file)
@@ -10,9 +10,8 @@
 #ifndef __EFI_DHCP6_UTILITY_H__\r
 #define __EFI_DHCP6_UTILITY_H__\r
 \r
-\r
-#define  DHCP6_10_BIT_MASK             0x3ff\r
-#define  DHCP6_DAD_ADDITIONAL_DELAY    30000000 // 3 seconds\r
+#define  DHCP6_10_BIT_MASK           0x3ff\r
+#define  DHCP6_DAD_ADDITIONAL_DELAY  30000000   // 3 seconds\r
 \r
 /**\r
   Generate client Duid in the format of Duid-llt.\r
@@ -25,7 +24,7 @@
 **/\r
 EFI_DHCP6_DUID *\r
 Dhcp6GenerateClientId (\r
-  IN EFI_SIMPLE_NETWORK_MODE    *Mode\r
+  IN EFI_SIMPLE_NETWORK_MODE  *Mode\r
   );\r
 \r
 /**\r
@@ -40,8 +39,8 @@ Dhcp6GenerateClientId (
 **/\r
 EFI_STATUS\r
 Dhcp6CopyConfigData (\r
-  IN EFI_DHCP6_CONFIG_DATA     *DstCfg,\r
-  IN EFI_DHCP6_CONFIG_DATA     *SorCfg\r
+  IN EFI_DHCP6_CONFIG_DATA  *DstCfg,\r
+  IN EFI_DHCP6_CONFIG_DATA  *SorCfg\r
   );\r
 \r
 /**\r
@@ -52,7 +51,7 @@ Dhcp6CopyConfigData (
 **/\r
 VOID\r
 Dhcp6CleanupConfigData (\r
-  IN OUT EFI_DHCP6_CONFIG_DATA       *CfgData\r
+  IN OUT EFI_DHCP6_CONFIG_DATA  *CfgData\r
   );\r
 \r
 /**\r
@@ -63,7 +62,7 @@ Dhcp6CleanupConfigData (
 **/\r
 VOID\r
 Dhcp6CleanupModeData (\r
-  IN OUT EFI_DHCP6_MODE_DATA        *ModeData\r
+  IN OUT EFI_DHCP6_MODE_DATA  *ModeData\r
   );\r
 \r
 /**\r
@@ -78,9 +77,9 @@ Dhcp6CleanupModeData (
 **/\r
 UINT32\r
 Dhcp6CalculateExpireTime (\r
-  IN UINT32                    Base,\r
-  IN BOOLEAN                   IsFirstRt,\r
-  IN BOOLEAN                   NeedSigned\r
+  IN UINT32   Base,\r
+  IN BOOLEAN  IsFirstRt,\r
+  IN BOOLEAN  NeedSigned\r
   );\r
 \r
 /**\r
@@ -91,7 +90,7 @@ Dhcp6CalculateExpireTime (
 **/\r
 VOID\r
 Dhcp6CalculateLeaseTime (\r
-  IN DHCP6_IA_CB               *IaCb\r
+  IN DHCP6_IA_CB  *IaCb\r
   );\r
 \r
 /**\r
@@ -107,9 +106,9 @@ Dhcp6CalculateLeaseTime (
 **/\r
 EFI_STATUS\r
 Dhcp6CheckAddress (\r
-  IN EFI_DHCP6_IA              *Ia,\r
-  IN UINT32                    AddressCount,\r
-  IN EFI_IPv6_ADDRESS          *Addresses\r
+  IN EFI_DHCP6_IA      *Ia,\r
+  IN UINT32            AddressCount,\r
+  IN EFI_IPv6_ADDRESS  *Addresses\r
   );\r
 \r
 /**\r
@@ -125,9 +124,9 @@ Dhcp6CheckAddress (
 **/\r
 EFI_DHCP6_IA *\r
 Dhcp6DepriveAddress (\r
-  IN EFI_DHCP6_IA              *Ia,\r
-  IN UINT32                    AddressCount,\r
-  IN EFI_IPv6_ADDRESS          *Addresses\r
+  IN EFI_DHCP6_IA      *Ia,\r
+  IN UINT32            AddressCount,\r
+  IN EFI_IPv6_ADDRESS  *Addresses\r
   );\r
 \r
 /**\r
@@ -139,7 +138,7 @@ Dhcp6DepriveAddress (
 VOID\r
 EFIAPI\r
 Dhcp6DummyExtFree (\r
-  IN VOID                      *Arg\r
+  IN VOID  *Arg\r
   );\r
 \r
 /**\r
@@ -154,10 +153,10 @@ Dhcp6DummyExtFree (
 VOID\r
 EFIAPI\r
 Dhcp6OnTransmitted (\r
-  IN NET_BUF                   *Wrap,\r
-  IN UDP_END_POINT             *EndPoint,\r
-  IN EFI_STATUS                IoStatus,\r
-  IN VOID                      *Context\r
+  IN NET_BUF        *Wrap,\r
+  IN UDP_END_POINT  *EndPoint,\r
+  IN EFI_STATUS     IoStatus,\r
+  IN VOID           *Context\r
   );\r
 \r
 /**\r
@@ -173,10 +172,10 @@ Dhcp6OnTransmitted (
 **/\r
 UINT8 *\r
 Dhcp6AppendOption (\r
-  IN OUT UINT8                 *Buf,\r
-  IN     UINT16                OptType,\r
-  IN     UINT16                OptLen,\r
-  IN     UINT8                 *Data\r
+  IN OUT UINT8   *Buf,\r
+  IN     UINT16  OptType,\r
+  IN     UINT16  OptLen,\r
+  IN     UINT8   *Data\r
   );\r
 \r
 /**\r
@@ -193,11 +192,11 @@ Dhcp6AppendOption (
 **/\r
 UINT8 *\r
 Dhcp6AppendIaOption (\r
-  IN OUT UINT8                  *Buf,\r
-  IN     EFI_DHCP6_IA           *Ia,\r
-  IN     UINT32                 T1,\r
-  IN     UINT32                 T2,\r
-  IN     UINT32                 MessageType\r
+  IN OUT UINT8         *Buf,\r
+  IN     EFI_DHCP6_IA  *Ia,\r
+  IN     UINT32        T1,\r
+  IN     UINT32        T2,\r
+  IN     UINT32        MessageType\r
   );\r
 \r
 /**\r
@@ -213,9 +212,9 @@ Dhcp6AppendIaOption (
 **/\r
 UINT8 *\r
 Dhcp6AppendETOption (\r
-  IN OUT UINT8                  *Buf,\r
-  IN     DHCP6_INSTANCE         *Instance,\r
-  OUT    UINT16                 **Elapsed\r
+  IN OUT UINT8           *Buf,\r
+  IN     DHCP6_INSTANCE  *Instance,\r
+  OUT    UINT16          **Elapsed\r
   );\r
 \r
 /**\r
@@ -227,8 +226,8 @@ Dhcp6AppendETOption (
 **/\r
 VOID\r
 SetElapsedTime (\r
-  IN     UINT16                 *Elapsed,\r
-  IN     DHCP6_INSTANCE         *Instance\r
+  IN     UINT16          *Elapsed,\r
+  IN     DHCP6_INSTANCE  *Instance\r
   );\r
 \r
 /**\r
@@ -244,9 +243,9 @@ SetElapsedTime (
 **/\r
 UINT8 *\r
 Dhcp6SeekOption (\r
-  IN UINT8                     *Buf,\r
-  IN UINT32                    SeekLen,\r
-  IN UINT16                    OptType\r
+  IN UINT8   *Buf,\r
+  IN UINT32  SeekLen,\r
+  IN UINT16  OptType\r
   );\r
 \r
 /**\r
@@ -262,9 +261,9 @@ Dhcp6SeekOption (
 **/\r
 UINT8 *\r
 Dhcp6SeekIaOption (\r
-  IN UINT8                     *Buf,\r
-  IN UINT32                    SeekLen,\r
-  IN EFI_DHCP6_IA_DESCRIPTOR   *IaDesc\r
+  IN UINT8                    *Buf,\r
+  IN UINT32                   SeekLen,\r
+  IN EFI_DHCP6_IA_DESCRIPTOR  *IaDesc\r
   );\r
 \r
 /**\r
@@ -279,11 +278,11 @@ Dhcp6SeekIaOption (
 **/\r
 VOID\r
 Dhcp6ParseAddrOption (\r
-  IN     EFI_DHCP6_IA            *CurrentIa,\r
-  IN     UINT8                   *IaInnerOpt,\r
-  IN     UINT16                  IaInnerLen,\r
-     OUT UINT32                  *AddrNum,\r
-  IN OUT EFI_DHCP6_IA_ADDRESS    *AddrBuf\r
+  IN     EFI_DHCP6_IA          *CurrentIa,\r
+  IN     UINT8                 *IaInnerOpt,\r
+  IN     UINT16                IaInnerLen,\r
+  OUT UINT32                   *AddrNum,\r
+  IN OUT EFI_DHCP6_IA_ADDRESS  *AddrBuf\r
   );\r
 \r
 /**\r
@@ -303,14 +302,13 @@ Dhcp6ParseAddrOption (
 **/\r
 EFI_STATUS\r
 Dhcp6GenerateIaCb (\r
-  IN  DHCP6_INSTANCE           *Instance,\r
-  IN  UINT8                    *IaInnerOpt,\r
-  IN  UINT16                   IaInnerLen,\r
-  IN  UINT32                   T1,\r
-  IN  UINT32                   T2\r
+  IN  DHCP6_INSTANCE  *Instance,\r
+  IN  UINT8           *IaInnerOpt,\r
+  IN  UINT16          IaInnerLen,\r
+  IN  UINT32          T1,\r
+  IN  UINT32          T2\r
   );\r
 \r
-\r
 /**\r
   Cache the current IA configuration information.\r
 \r
@@ -322,10 +320,9 @@ Dhcp6GenerateIaCb (
 **/\r
 EFI_STATUS\r
 Dhcp6CacheIa (\r
-  IN DHCP6_INSTANCE           *Instance\r
+  IN DHCP6_INSTANCE  *Instance\r
   );\r
 \r
-\r
 /**\r
   Append CacheIa to the current IA. Meanwhile, clear CacheIa.ValidLifetime to 0.\r
 \r
@@ -334,7 +331,7 @@ Dhcp6CacheIa (
 **/\r
 VOID\r
 Dhcp6AppendCacheIa (\r
-  IN DHCP6_INSTANCE           *Instance\r
+  IN DHCP6_INSTANCE  *Instance\r
   );\r
 \r
 /**\r
@@ -348,7 +345,8 @@ Dhcp6AppendCacheIa (
 **/\r
 EFI_STATUS\r
 Dhcp6GetMappingTimeOut (\r
-  IN  EFI_IP6_CONFIG_PROTOCOL       *Ip6Cfg,\r
-  OUT UINTN                         *TimeOut\r
+  IN  EFI_IP6_CONFIG_PROTOCOL  *Ip6Cfg,\r
+  OUT UINTN                    *TimeOut\r
   );\r
+\r
 #endif\r
index e59c8704fb9df9bf7d82f841da9b07c163c807cc..32adb93f41303c63c60ffdd9344acf9dcbefdd5f 100644 (file)
@@ -11,6 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // EFI Component Name Functions\r
 //\r
+\r
 /**\r
   Retrieves a Unicode string that is the user-readable name of the EFI Driver.\r
 \r
@@ -85,13 +86,12 @@ EFI_STATUS
 EFIAPI\r
 DnsComponentNameGetControllerName (\r
   IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  EFI_HANDLE                    ControllerHandle,\r
-  IN  EFI_HANDLE                    ChildHandle        OPTIONAL,\r
-  IN  CHAR8                         *Language,\r
-  OUT CHAR16                        **ControllerName\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   );\r
 \r
-\r
 ///\r
 /// Component Name Protocol instance\r
 ///\r
@@ -107,8 +107,8 @@ EFI_COMPONENT_NAME_PROTOCOL  gDnsComponentName = {
 ///\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
 EFI_COMPONENT_NAME2_PROTOCOL  gDnsComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)     DnsComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) DnsComponentNameGetControllerName,\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)DnsComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)DnsComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
@@ -116,12 +116,12 @@ EFI_COMPONENT_NAME2_PROTOCOL  gDnsComponentName2 = {
 /// Table of driver names\r
 ///\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
-EFI_UNICODE_STRING_TABLE mDnsDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mDnsDriverNameTable[] = {\r
   { "eng;en", (CHAR16 *)L"DNS Network Service Driver" },\r
-  { NULL, NULL }\r
+  { NULL,     NULL                                    }\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE *gDnsControllerNameTable = NULL;\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  *gDnsControllerNameTable = NULL;\r
 \r
 /**\r
   Retrieves a Unicode string that is the user-readable name of the EFI Driver.\r
@@ -174,12 +174,12 @@ DnsComponentNameGetDriverName (
 **/\r
 EFI_STATUS\r
 UpdateDns4Name (\r
-  EFI_DNS4_PROTOCOL             *Dns4\r
+  EFI_DNS4_PROTOCOL  *Dns4\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  CHAR16                           HandleName[80];\r
-  EFI_DNS4_MODE_DATA               ModeData;\r
+  EFI_STATUS          Status;\r
+  CHAR16              HandleName[80];\r
+  EFI_DNS4_MODE_DATA  ModeData;\r
 \r
   if (Dns4 == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -208,6 +208,7 @@ UpdateDns4Name (
   if (ModeData.DnsCacheList != NULL) {\r
     FreePool (ModeData.DnsCacheList);\r
   }\r
+\r
   if (ModeData.DnsServerList != NULL) {\r
     FreePool (ModeData.DnsServerList);\r
   }\r
@@ -249,13 +250,13 @@ UpdateDns4Name (
 **/\r
 EFI_STATUS\r
 UpdateDns6Name (\r
-  EFI_DNS6_PROTOCOL             *Dns6\r
+  EFI_DNS6_PROTOCOL  *Dns6\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  CHAR16                           HandleName[128];\r
-  EFI_DNS6_MODE_DATA               ModeData;\r
-  CHAR16                           Address[sizeof"ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"];\r
+  EFI_STATUS          Status;\r
+  CHAR16              HandleName[128];\r
+  EFI_DNS6_MODE_DATA  ModeData;\r
+  CHAR16              Address[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"];\r
 \r
   if (Dns6 == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -274,6 +275,7 @@ UpdateDns6Name (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   UnicodeSPrint (\r
     HandleName,\r
     sizeof (HandleName),\r
@@ -285,6 +287,7 @@ UpdateDns6Name (
   if (ModeData.DnsCacheList != NULL) {\r
     FreePool (ModeData.DnsCacheList);\r
   }\r
+\r
   if (ModeData.DnsServerList != NULL) {\r
     FreePool (ModeData.DnsServerList);\r
   }\r
@@ -358,15 +361,15 @@ EFI_STATUS
 EFIAPI\r
 DnsComponentNameGetControllerName (\r
   IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  EFI_HANDLE                    ControllerHandle,\r
-  IN  EFI_HANDLE                    ChildHandle        OPTIONAL,\r
-  IN  CHAR8                         *Language,\r
-  OUT CHAR16                        **ControllerName\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_DNS4_PROTOCOL             *Dns4;\r
-  EFI_DNS6_PROTOCOL             *Dns6;\r
+  EFI_STATUS         Status;\r
+  EFI_DNS4_PROTOCOL  *Dns4;\r
+  EFI_DNS6_PROTOCOL  *Dns6;\r
 \r
   //\r
   // ChildHandle must be NULL for a Device Driver\r
index 8f8b2aab1e326ccb66eac008555e895b340f77da..933565a32df143b1edac38fa22faa327f2c12aeb 100644 (file)
@@ -19,22 +19,22 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 VOID\r
 DnsInitSeedPacket (\r
-  OUT EFI_DHCP4_PACKET               *Seed,\r
-  IN  EFI_IP4_CONFIG2_INTERFACE_INFO *InterfaceInfo\r
+  OUT EFI_DHCP4_PACKET                *Seed,\r
+  IN  EFI_IP4_CONFIG2_INTERFACE_INFO  *InterfaceInfo\r
   )\r
 {\r
-  EFI_DHCP4_HEADER           *Header;\r
+  EFI_DHCP4_HEADER  *Header;\r
 \r
   //\r
   // Get IfType and HwAddressSize from SNP mode data.\r
   //\r
-  Seed->Size            = sizeof (EFI_DHCP4_PACKET);\r
-  Seed->Length          = sizeof (Seed->Dhcp4);\r
-  Header                = &Seed->Dhcp4.Header;\r
+  Seed->Size   = sizeof (EFI_DHCP4_PACKET);\r
+  Seed->Length = sizeof (Seed->Dhcp4);\r
+  Header       = &Seed->Dhcp4.Header;\r
   ZeroMem (Header, sizeof (EFI_DHCP4_HEADER));\r
-  Header->OpCode        = DHCP4_OPCODE_REQUEST;\r
-  Header->HwType        = InterfaceInfo->IfType;\r
-  Header->HwAddrLen     = (UINT8) InterfaceInfo->HwAddressSize;\r
+  Header->OpCode    = DHCP4_OPCODE_REQUEST;\r
+  Header->HwType    = InterfaceInfo->IfType;\r
+  Header->HwAddrLen = (UINT8)InterfaceInfo->HwAddressSize;\r
   CopyMem (Header->ClientHwAddr, &(InterfaceInfo->HwAddress), Header->HwAddrLen);\r
 \r
   Seed->Dhcp4.Magik     = DHCP4_MAGIC;\r
@@ -56,10 +56,10 @@ DhcpCommonNotify (
   )\r
 {\r
   if ((Event == NULL) || (Context == NULL)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
-  *((BOOLEAN *) Context) = TRUE;\r
+  *((BOOLEAN *)Context) = TRUE;\r
 }\r
 \r
 /**\r
@@ -77,26 +77,26 @@ DhcpCommonNotify (
 **/\r
 EFI_STATUS\r
 ParseDhcp4Ack (\r
-  IN EFI_DHCP4_PROTOCOL         *Dhcp4,\r
-  IN EFI_DHCP4_PACKET           *Packet,\r
-  IN DNS4_SERVER_INFOR          *DnsServerInfor\r
+  IN EFI_DHCP4_PROTOCOL  *Dhcp4,\r
+  IN EFI_DHCP4_PACKET    *Packet,\r
+  IN DNS4_SERVER_INFOR   *DnsServerInfor\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
-  UINT32                  OptionCount;\r
-  EFI_DHCP4_PACKET_OPTION **OptionList;\r
-  UINT32                  ServerCount;\r
-  EFI_IPv4_ADDRESS        *ServerList;\r
-  UINT32                  Index;\r
-  UINT32                  Count;\r
+  EFI_STATUS               Status;\r
+  UINT32                   OptionCount;\r
+  EFI_DHCP4_PACKET_OPTION  **OptionList;\r
+  UINT32                   ServerCount;\r
+  EFI_IPv4_ADDRESS         *ServerList;\r
+  UINT32                   Index;\r
+  UINT32                   Count;\r
 \r
   ServerCount = 0;\r
-  ServerList = NULL;\r
+  ServerList  = NULL;\r
 \r
   OptionCount = 0;\r
   OptionList  = NULL;\r
 \r
-  Status      = Dhcp4->Parse (Dhcp4, Packet, &OptionCount, OptionList);\r
+  Status = Dhcp4->Parse (Dhcp4, Packet, &OptionCount, OptionList);\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
@@ -119,19 +119,18 @@ ParseDhcp4Ack (
     // Get DNS server addresses\r
     //\r
     if (OptionList[Index]->OpCode == DHCP4_TAG_DNS_SERVER) {\r
-\r
       if (((OptionList[Index]->Length & 0x3) != 0) || (OptionList[Index]->Length == 0)) {\r
         Status = EFI_DEVICE_ERROR;\r
         break;\r
       }\r
 \r
       ServerCount = OptionList[Index]->Length/4;\r
-      ServerList = AllocatePool (ServerCount * sizeof (EFI_IPv4_ADDRESS));\r
+      ServerList  = AllocatePool (ServerCount * sizeof (EFI_IPv4_ADDRESS));\r
       if (ServerList == NULL) {\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
 \r
-      for (Count=0; Count < ServerCount; Count++) {\r
+      for (Count = 0; Count < ServerCount; Count++) {\r
         CopyMem (ServerList + Count, &OptionList[Index]->Data[4 * Count], sizeof (EFI_IPv4_ADDRESS));\r
       }\r
 \r
@@ -167,25 +166,25 @@ ParseDhcp4Ack (
 EFI_STATUS\r
 EFIAPI\r
 ParseDhcp6Ack (\r
-  IN EFI_DHCP6_PROTOCOL          *This,\r
-  IN VOID                        *Context,\r
-  IN EFI_DHCP6_PACKET            *Packet\r
+  IN EFI_DHCP6_PROTOCOL  *This,\r
+  IN VOID                *Context,\r
+  IN EFI_DHCP6_PACKET    *Packet\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  UINT32                      OptionCount;\r
-  EFI_DHCP6_PACKET_OPTION     **OptionList;\r
-  DNS6_SERVER_INFOR           *DnsServerInfor;\r
-  UINT32                      ServerCount;\r
-  EFI_IPv6_ADDRESS            *ServerList;\r
-  UINT32                      Index;\r
-  UINT32                      Count;\r
+  EFI_STATUS               Status;\r
+  UINT32                   OptionCount;\r
+  EFI_DHCP6_PACKET_OPTION  **OptionList;\r
+  DNS6_SERVER_INFOR        *DnsServerInfor;\r
+  UINT32                   ServerCount;\r
+  EFI_IPv6_ADDRESS         *ServerList;\r
+  UINT32                   Index;\r
+  UINT32                   Count;\r
 \r
   OptionCount = 0;\r
   ServerCount = 0;\r
   ServerList  = NULL;\r
 \r
-  Status      = This->Parse (This, Packet, &OptionCount, NULL);\r
+  Status = This->Parse (This, Packet, &OptionCount, NULL);\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
@@ -201,7 +200,7 @@ ParseDhcp6Ack (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  DnsServerInfor = (DNS6_SERVER_INFOR *) Context;\r
+  DnsServerInfor = (DNS6_SERVER_INFOR *)Context;\r
 \r
   for (Index = 0; Index < OptionCount; Index++) {\r
     OptionList[Index]->OpCode = NTOHS (OptionList[Index]->OpCode);\r
@@ -211,7 +210,6 @@ ParseDhcp6Ack (
     // Get DNS server addresses from this reply packet.\r
     //\r
     if (OptionList[Index]->OpCode == DHCP6_TAG_DNS_SERVER) {\r
-\r
       if (((OptionList[Index]->OpLen & 0xf) != 0) || (OptionList[Index]->OpLen == 0)) {\r
         Status = EFI_DEVICE_ERROR;\r
         gBS->FreePool (OptionList);\r
@@ -219,13 +217,13 @@ ParseDhcp6Ack (
       }\r
 \r
       ServerCount = OptionList[Index]->OpLen/16;\r
-      ServerList = AllocatePool (ServerCount * sizeof (EFI_IPv6_ADDRESS));\r
+      ServerList  = AllocatePool (ServerCount * sizeof (EFI_IPv6_ADDRESS));\r
       if (ServerList == NULL) {\r
         gBS->FreePool (OptionList);\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
 \r
-      for (Count=0; Count < ServerCount; Count++) {\r
+      for (Count = 0; Count < ServerCount; Count++) {\r
         CopyMem (ServerList + Count, &OptionList[Index]->Data[16 * Count], sizeof (EFI_IPv6_ADDRESS));\r
       }\r
 \r
@@ -237,7 +235,6 @@ ParseDhcp6Ack (
   gBS->FreePool (OptionList);\r
 \r
   return Status;\r
-\r
 }\r
 \r
 /**\r
@@ -255,47 +252,47 @@ ParseDhcp6Ack (
 **/\r
 EFI_STATUS\r
 GetDns4ServerFromDhcp4 (\r
-  IN  DNS_INSTANCE               *Instance,\r
-  OUT UINT32                     *DnsServerCount,\r
-  OUT EFI_IPv4_ADDRESS           **DnsServerList\r
+  IN  DNS_INSTANCE      *Instance,\r
+  OUT UINT32            *DnsServerCount,\r
+  OUT EFI_IPv4_ADDRESS  **DnsServerList\r
   )\r
 {\r
-  EFI_STATUS                          Status;\r
-  EFI_HANDLE                          Image;\r
-  EFI_HANDLE                          Controller;\r
-  EFI_STATUS                          MediaStatus;\r
-  EFI_HANDLE                          MnpChildHandle;\r
-  EFI_MANAGED_NETWORK_PROTOCOL        *Mnp;\r
-  EFI_MANAGED_NETWORK_CONFIG_DATA     MnpConfigData;\r
-  EFI_HANDLE                          Dhcp4Handle;\r
-  EFI_DHCP4_PROTOCOL                  *Dhcp4;\r
-  EFI_IP4_CONFIG2_PROTOCOL            *Ip4Config2;\r
-  UINTN                               DataSize;\r
-  VOID                                *Data;\r
-  EFI_IP4_CONFIG2_INTERFACE_INFO      *InterfaceInfo;\r
-  EFI_DHCP4_PACKET                    SeedPacket;\r
-  EFI_DHCP4_PACKET_OPTION             *ParaList[2];\r
-  DNS4_SERVER_INFOR                   DnsServerInfor;\r
-\r
-  EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN    Token;\r
-  BOOLEAN                             IsDone;\r
-  UINTN                               Index;\r
-\r
-  Image                      = Instance->Service->ImageHandle;\r
-  Controller                 = Instance->Service->ControllerHandle;\r
-\r
-  MnpChildHandle             = NULL;\r
-  Mnp                        = NULL;\r
-\r
-  Dhcp4Handle                = NULL;\r
-  Dhcp4                      = NULL;\r
-\r
-  Ip4Config2                 = NULL;\r
-  DataSize                   = 0;\r
-  Data                       = NULL;\r
-  InterfaceInfo              = NULL;\r
-\r
-  ZeroMem ((UINT8 *) ParaList, sizeof (ParaList));\r
+  EFI_STATUS                       Status;\r
+  EFI_HANDLE                       Image;\r
+  EFI_HANDLE                       Controller;\r
+  EFI_STATUS                       MediaStatus;\r
+  EFI_HANDLE                       MnpChildHandle;\r
+  EFI_MANAGED_NETWORK_PROTOCOL     *Mnp;\r
+  EFI_MANAGED_NETWORK_CONFIG_DATA  MnpConfigData;\r
+  EFI_HANDLE                       Dhcp4Handle;\r
+  EFI_DHCP4_PROTOCOL               *Dhcp4;\r
+  EFI_IP4_CONFIG2_PROTOCOL         *Ip4Config2;\r
+  UINTN                            DataSize;\r
+  VOID                             *Data;\r
+  EFI_IP4_CONFIG2_INTERFACE_INFO   *InterfaceInfo;\r
+  EFI_DHCP4_PACKET                 SeedPacket;\r
+  EFI_DHCP4_PACKET_OPTION          *ParaList[2];\r
+  DNS4_SERVER_INFOR                DnsServerInfor;\r
+\r
+  EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN  Token;\r
+  BOOLEAN                           IsDone;\r
+  UINTN                             Index;\r
+\r
+  Image      = Instance->Service->ImageHandle;\r
+  Controller = Instance->Service->ControllerHandle;\r
+\r
+  MnpChildHandle = NULL;\r
+  Mnp            = NULL;\r
+\r
+  Dhcp4Handle = NULL;\r
+  Dhcp4       = NULL;\r
+\r
+  Ip4Config2    = NULL;\r
+  DataSize      = 0;\r
+  Data          = NULL;\r
+  InterfaceInfo = NULL;\r
+\r
+  ZeroMem ((UINT8 *)ParaList, sizeof (ParaList));\r
 \r
   ZeroMem (&MnpConfigData, sizeof (EFI_MANAGED_NETWORK_CONFIG_DATA));\r
 \r
@@ -332,7 +329,7 @@ GetDns4ServerFromDhcp4 (
   Status = gBS->OpenProtocol (\r
                   MnpChildHandle,\r
                   &gEfiManagedNetworkProtocolGuid,\r
-                  (VOID **) &Mnp,\r
+                  (VOID **)&Mnp,\r
                   Image,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -352,7 +349,7 @@ GetDns4ServerFromDhcp4 (
   MnpConfigData.EnableReceiveTimestamps   = FALSE;\r
   MnpConfigData.DisableBackgroundPolling  = FALSE;\r
 \r
-  Status = Mnp->Configure(Mnp, &MnpConfigData);\r
+  Status = Mnp->Configure (Mnp, &MnpConfigData);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
@@ -373,7 +370,7 @@ GetDns4ServerFromDhcp4 (
   Status = gBS->OpenProtocol (\r
                   Dhcp4Handle,\r
                   &gEfiDhcp4ProtocolGuid,\r
-                  (VOID **) &Dhcp4,\r
+                  (VOID **)&Dhcp4,\r
                   Image,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -385,13 +382,13 @@ GetDns4ServerFromDhcp4 (
   //\r
   // Get Ip4Config2 instance info.\r
   //\r
-  Status = gBS->HandleProtocol (Controller, &gEfiIp4Config2ProtocolGuid, (VOID **) &Ip4Config2);\r
+  Status = gBS->HandleProtocol (Controller, &gEfiIp4Config2ProtocolGuid, (VOID **)&Ip4Config2);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
 \r
   Status = Ip4Config2->GetData (Ip4Config2, Ip4Config2DataTypeInterfaceInfo, &DataSize, Data);\r
-  if (EFI_ERROR (Status) && Status != EFI_BUFFER_TOO_SMALL) {\r
+  if (EFI_ERROR (Status) && (Status != EFI_BUFFER_TOO_SMALL)) {\r
     goto ON_EXIT;\r
   }\r
 \r
@@ -470,7 +467,7 @@ GetDns4ServerFromDhcp4 (
 \r
   Status = Dhcp4->Build (Dhcp4, &SeedPacket, 0, NULL, 2, ParaList, &Token.Packet);\r
 \r
-  Token.Packet->Dhcp4.Header.Xid      = HTONL(NET_RANDOM (NetRandomInitSeed ()));\r
+  Token.Packet->Dhcp4.Header.Xid = HTONL (NET_RANDOM (NetRandomInitSeed ()));\r
 \r
   Token.Packet->Dhcp4.Header.Reserved = HTONS ((UINT16)0x8000);\r
 \r
@@ -601,10 +598,10 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 GetDns6ServerFromDhcp6 (\r
-  IN  EFI_HANDLE                 Image,\r
-  IN  EFI_HANDLE                 Controller,\r
-  OUT UINT32                     *DnsServerCount,\r
-  OUT EFI_IPv6_ADDRESS           **DnsServerList\r
+  IN  EFI_HANDLE        Image,\r
+  IN  EFI_HANDLE        Controller,\r
+  OUT UINT32            *DnsServerCount,\r
+  OUT EFI_IPv6_ADDRESS  **DnsServerList\r
   )\r
 {\r
   EFI_HANDLE                Dhcp6Handle;\r
@@ -651,7 +648,7 @@ GetDns6ServerFromDhcp6 (
   Status = gBS->OpenProtocol (\r
                   Dhcp6Handle,\r
                   &gEfiDhcp6ProtocolGuid,\r
-                  (VOID **) &Dhcp6,\r
+                  (VOID **)&Dhcp6,\r
                   Image,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -724,7 +721,7 @@ GetDns6ServerFromDhcp6 (
     } while (TimerStatus == EFI_NOT_READY);\r
   }\r
 \r
-  *DnsServerList  = DnsServerInfor.ServerList;\r
+  *DnsServerList = DnsServerInfor.ServerList;\r
 \r
 ON_EXIT:\r
 \r
@@ -753,6 +750,4 @@ ON_EXIT:
     );\r
 \r
   return Status;\r
-\r
 }\r
-\r
index 7212ba0ce4655ca365eebfad944cb5ffc5c6c5f1..c0ed7851f496f059d2d03d6abce2851d1aeaacb2 100644 (file)
@@ -14,39 +14,38 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 #pragma pack(1)\r
 \r
-#define IP4_ETHER_PROTO       0x0800\r
+#define IP4_ETHER_PROTO  0x0800\r
 \r
-#define DHCP4_OPCODE_REQUEST         1\r
-#define DHCP4_MAGIC                  0x63538263 /// network byte order\r
-#define DHCP4_TAG_EOP                255  /// End Option\r
+#define DHCP4_OPCODE_REQUEST  1\r
+#define DHCP4_MAGIC           0x63538263  /// network byte order\r
+#define DHCP4_TAG_EOP         255         /// End Option\r
 \r
-#define DHCP4_TAG_TYPE               53\r
-#define DHCP4_MSG_REQUEST            3\r
-#define DHCP4_MSG_INFORM             8\r
+#define DHCP4_TAG_TYPE     53\r
+#define DHCP4_MSG_REQUEST  3\r
+#define DHCP4_MSG_INFORM   8\r
 \r
-#define DHCP4_TAG_PARA_LIST          55\r
-#define DHCP4_TAG_DNS_SERVER         6\r
+#define DHCP4_TAG_PARA_LIST   55\r
+#define DHCP4_TAG_DNS_SERVER  6\r
 \r
+#define DHCP6_TAG_DNS_REQUEST  6\r
+#define DHCP6_TAG_DNS_SERVER   23\r
 \r
-#define DHCP6_TAG_DNS_REQUEST        6\r
-#define DHCP6_TAG_DNS_SERVER         23\r
-\r
-#define DNS_CHECK_MEDIA_GET_DHCP_WAITING_TIME    EFI_TIMER_PERIOD_SECONDS(20)\r
+#define DNS_CHECK_MEDIA_GET_DHCP_WAITING_TIME  EFI_TIMER_PERIOD_SECONDS(20)\r
 \r
 //\r
 // The required Dns4 server information.\r
 //\r
 typedef struct {\r
-  UINT32                     *ServerCount;\r
-  EFI_IPv4_ADDRESS           *ServerList;\r
+  UINT32              *ServerCount;\r
+  EFI_IPv4_ADDRESS    *ServerList;\r
 } DNS4_SERVER_INFOR;\r
 \r
 //\r
 // The required Dns6 server information.\r
 //\r
 typedef struct {\r
-  UINT32                     *ServerCount;\r
-  EFI_IPv6_ADDRESS           *ServerList;\r
+  UINT32              *ServerCount;\r
+  EFI_IPv6_ADDRESS    *ServerList;\r
 } DNS6_SERVER_INFOR;\r
 \r
 #pragma pack()\r
@@ -66,9 +65,9 @@ typedef struct {
 **/\r
 EFI_STATUS\r
 ParseDhcp4Ack (\r
-  IN EFI_DHCP4_PROTOCOL         *Dhcp4,\r
-  IN EFI_DHCP4_PACKET           *Packet,\r
-  IN DNS4_SERVER_INFOR          *DnsServerInfor\r
+  IN EFI_DHCP4_PROTOCOL  *Dhcp4,\r
+  IN EFI_DHCP4_PACKET    *Packet,\r
+  IN DNS4_SERVER_INFOR   *DnsServerInfor\r
   );\r
 \r
 /**\r
@@ -91,9 +90,9 @@ ParseDhcp4Ack (
 EFI_STATUS\r
 EFIAPI\r
 ParseDhcp6Ack (\r
-  IN EFI_DHCP6_PROTOCOL          *This,\r
-  IN VOID                        *Context,\r
-  IN EFI_DHCP6_PACKET            *Packet\r
+  IN EFI_DHCP6_PROTOCOL  *This,\r
+  IN VOID                *Context,\r
+  IN EFI_DHCP6_PACKET    *Packet\r
   );\r
 \r
 /**\r
@@ -111,9 +110,9 @@ ParseDhcp6Ack (
 **/\r
 EFI_STATUS\r
 GetDns4ServerFromDhcp4 (\r
-  IN  DNS_INSTANCE               *Instance,\r
-  OUT UINT32                     *DnsServerCount,\r
-  OUT EFI_IPv4_ADDRESS           **DnsServerList\r
+  IN  DNS_INSTANCE      *Instance,\r
+  OUT UINT32            *DnsServerCount,\r
+  OUT EFI_IPv4_ADDRESS  **DnsServerList\r
   );\r
 \r
 /**\r
@@ -132,10 +131,10 @@ GetDns4ServerFromDhcp4 (
 **/\r
 EFI_STATUS\r
 GetDns6ServerFromDhcp6 (\r
-  IN  EFI_HANDLE                 Image,\r
-  IN  EFI_HANDLE                 Controller,\r
-  OUT UINT32                     *DnsServerCount,\r
-  OUT EFI_IPv6_ADDRESS           **DnsServerList\r
+  IN  EFI_HANDLE        Image,\r
+  IN  EFI_HANDLE        Controller,\r
+  OUT UINT32            *DnsServerCount,\r
+  OUT EFI_IPv6_ADDRESS  **DnsServerList\r
   );\r
 \r
 #endif\r
index 4db0c6bdd1eb4f715d5f50f31558716233fc0f2b..466c64046f58d6ac61dc164d7584168b2b337eb6 100644 (file)
@@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "DnsImpl.h"\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gDns4DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gDns4DriverBinding = {\r
   Dns4DriverBindingSupported,\r
   Dns4DriverBindingStart,\r
   Dns4DriverBindingStop,\r
@@ -17,7 +17,7 @@ EFI_DRIVER_BINDING_PROTOCOL gDns4DriverBinding = {
   NULL\r
 };\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gDns6DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gDns6DriverBinding = {\r
   Dns6DriverBindingSupported,\r
   Dns6DriverBindingStart,\r
   Dns6DriverBindingStop,\r
@@ -26,17 +26,17 @@ EFI_DRIVER_BINDING_PROTOCOL gDns6DriverBinding = {
   NULL\r
 };\r
 \r
-EFI_SERVICE_BINDING_PROTOCOL mDns4ServiceBinding = {\r
+EFI_SERVICE_BINDING_PROTOCOL  mDns4ServiceBinding = {\r
   Dns4ServiceBindingCreateChild,\r
   Dns4ServiceBindingDestroyChild\r
 };\r
 \r
-EFI_SERVICE_BINDING_PROTOCOL mDns6ServiceBinding = {\r
+EFI_SERVICE_BINDING_PROTOCOL  mDns6ServiceBinding = {\r
   Dns6ServiceBindingCreateChild,\r
   Dns6ServiceBindingDestroyChild\r
 };\r
 \r
-DNS_DRIVER_DATA          *mDriverData = NULL;\r
+DNS_DRIVER_DATA  *mDriverData = NULL;\r
 \r
 /**\r
   Destroy the DNS instance and recycle the resources.\r
@@ -46,7 +46,7 @@ DNS_DRIVER_DATA          *mDriverData = NULL;
 **/\r
 VOID\r
 DnsDestroyInstance (\r
-  IN DNS_INSTANCE         *Instance\r
+  IN DNS_INSTANCE  *Instance\r
   )\r
 {\r
   ZeroMem (&Instance->Dns4CfgData, sizeof (EFI_DNS4_CONFIG_DATA));\r
@@ -61,7 +61,7 @@ DnsDestroyInstance (
     Dns6InstanceCancelToken (Instance, NULL);\r
   }\r
 \r
-  if (Instance->UdpIo!= NULL) {\r
+  if (Instance->UdpIo != NULL) {\r
     UdpIoFreeIo (Instance->UdpIo);\r
   }\r
 \r
@@ -80,11 +80,11 @@ DnsDestroyInstance (
 **/\r
 EFI_STATUS\r
 DnsCreateInstance (\r
-  IN  DNS_SERVICE         *Service,\r
-  OUT DNS_INSTANCE        **Instance\r
+  IN  DNS_SERVICE   *Service,\r
+  OUT DNS_INSTANCE  **Instance\r
   )\r
 {\r
-  DNS_INSTANCE            *DnsIns;\r
+  DNS_INSTANCE  *DnsIns;\r
 \r
   *Instance = NULL;\r
 \r
@@ -137,8 +137,8 @@ DnsCreateInstance (
 EFI_STATUS\r
 EFIAPI\r
 DnsDestroyChildEntryInHandleBuffer (\r
-  IN LIST_ENTRY         *Entry,\r
-  IN VOID               *Context\r
+  IN LIST_ENTRY  *Entry,\r
+  IN VOID        *Context\r
   )\r
 {\r
   DNS_INSTANCE                  *Instance;\r
@@ -146,14 +146,14 @@ DnsDestroyChildEntryInHandleBuffer (
   UINTN                         NumberOfChildren;\r
   EFI_HANDLE                    *ChildHandleBuffer;\r
 \r
-  if (Entry == NULL || Context == NULL) {\r
+  if ((Entry == NULL) || (Context == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Instance = NET_LIST_USER_STRUCT_S (Entry, DNS_INSTANCE, Link, DNS_INSTANCE_SIGNATURE);\r
-  ServiceBinding    = ((DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ServiceBinding;\r
-  NumberOfChildren  = ((DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->NumberOfChildren;\r
-  ChildHandleBuffer = ((DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ChildHandleBuffer;\r
+  Instance          = NET_LIST_USER_STRUCT_S (Entry, DNS_INSTANCE, Link, DNS_INSTANCE_SIGNATURE);\r
+  ServiceBinding    = ((DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ServiceBinding;\r
+  NumberOfChildren  = ((DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->NumberOfChildren;\r
+  ChildHandleBuffer = ((DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ChildHandleBuffer;\r
 \r
   if (!NetIsInHandleBuffer (Instance->ChildHandle, NumberOfChildren, ChildHandleBuffer)) {\r
     return EFI_SUCCESS;\r
@@ -177,8 +177,8 @@ DnsDestroyChildEntryInHandleBuffer (
 EFI_STATUS\r
 EFIAPI\r
 DnsConfigNullUdp (\r
-  IN UDP_IO                 *UdpIo,\r
-  IN VOID                   *Context\r
+  IN UDP_IO  *UdpIo,\r
+  IN VOID    *Context\r
   )\r
 {\r
   return EFI_SUCCESS;\r
@@ -192,7 +192,7 @@ DnsConfigNullUdp (
 **/\r
 VOID\r
 DnsDestroyService (\r
-  IN DNS_SERVICE     *DnsSb\r
+  IN DNS_SERVICE  *DnsSb\r
   )\r
 {\r
   UdpIoFreeIo (DnsSb->ConnectUdp);\r
@@ -227,19 +227,19 @@ DnsDestroyService (
 **/\r
 EFI_STATUS\r
 DnsCreateService (\r
-  IN     EFI_HANDLE            Controller,\r
-  IN     EFI_HANDLE            Image,\r
-  IN     UINT8                 IpVersion,\r
-     OUT DNS_SERVICE           **Service\r
+  IN     EFI_HANDLE  Controller,\r
+  IN     EFI_HANDLE  Image,\r
+  IN     UINT8       IpVersion,\r
+  OUT DNS_SERVICE    **Service\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
-  DNS_SERVICE            *DnsSb;\r
+  EFI_STATUS   Status;\r
+  DNS_SERVICE  *DnsSb;\r
 \r
-  Status    = EFI_SUCCESS;\r
-  DnsSb     = NULL;\r
+  Status = EFI_SUCCESS;\r
+  DnsSb  = NULL;\r
 \r
-  *Service  = NULL;\r
+  *Service = NULL;\r
 \r
   DnsSb = AllocateZeroPool (sizeof (DNS_SERVICE));\r
   if (DnsSb == NULL) {\r
@@ -263,11 +263,11 @@ DnsCreateService (
   DnsSb->ControllerHandle = Controller;\r
   DnsSb->ImageHandle      = Image;\r
 \r
-  DnsSb->TimerToGetMap    = NULL;\r
+  DnsSb->TimerToGetMap = NULL;\r
 \r
-  DnsSb->Timer            = NULL;\r
+  DnsSb->Timer = NULL;\r
 \r
-  DnsSb->IpVersion        = IpVersion;\r
+  DnsSb->IpVersion = IpVersion;\r
 \r
   //\r
   // Create the timer used to time out the procedure which is used to\r
@@ -299,6 +299,7 @@ DnsCreateService (
     if (DnsSb->TimerToGetMap != NULL) {\r
       gBS->CloseEvent (DnsSb->TimerToGetMap);\r
     }\r
+\r
     FreePool (DnsSb);\r
     return Status;\r
   }\r
@@ -315,6 +316,7 @@ DnsCreateService (
     if (DnsSb->TimerToGetMap != NULL) {\r
       gBS->CloseEvent (DnsSb->TimerToGetMap);\r
     }\r
+\r
     gBS->CloseEvent (DnsSb->Timer);\r
     FreePool (DnsSb);\r
     return EFI_DEVICE_ERROR;\r
@@ -341,11 +343,11 @@ DnsUnload (
 {\r
   EFI_STATUS  Status;\r
 \r
-  LIST_ENTRY                      *Entry;\r
-  DNS4_CACHE                      *ItemCache4;\r
-  DNS4_SERVER_IP                  *ItemServerIp4;\r
-  DNS6_CACHE                      *ItemCache6;\r
-  DNS6_SERVER_IP                  *ItemServerIp6;\r
+  LIST_ENTRY      *Entry;\r
+  DNS4_CACHE      *ItemCache4;\r
+  DNS4_SERVER_IP  *ItemServerIp4;\r
+  DNS6_CACHE      *ItemCache6;\r
+  DNS6_SERVER_IP  *ItemServerIp6;\r
 \r
   ItemCache4    = NULL;\r
   ItemServerIp4 = NULL;\r
@@ -355,7 +357,7 @@ DnsUnload (
   //\r
   // Disconnect the driver specified by ImageHandle\r
   //\r
-  Status = NetLibDefaultUnload(ImageHandle);\r
+  Status = NetLibDefaultUnload (ImageHandle);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -493,25 +495,25 @@ DnsDriverEntryPoint (
 \r
   return Status;\r
 \r
-  Error4:\r
-    gBS->CloseEvent (mDriverData->Timer);\r
+Error4:\r
+  gBS->CloseEvent (mDriverData->Timer);\r
 \r
-  Error3:\r
-    FreePool (mDriverData);\r
+Error3:\r
+  FreePool (mDriverData);\r
 \r
-  Error2:\r
-     EfiLibUninstallDriverBindingComponentName2 (\r
-       &gDns6DriverBinding,\r
-       &gDnsComponentName,\r
-       &gDnsComponentName2\r
-       );\r
+Error2:\r
+  EfiLibUninstallDriverBindingComponentName2 (\r
+    &gDns6DriverBinding,\r
+    &gDnsComponentName,\r
+    &gDnsComponentName2\r
+    );\r
 \r
-  Error1:\r
-    EfiLibUninstallDriverBindingComponentName2 (\r
-      &gDns4DriverBinding,\r
-      &gDnsComponentName,\r
-      &gDnsComponentName2\r
-      );\r
+Error1:\r
+  EfiLibUninstallDriverBindingComponentName2 (\r
+    &gDns4DriverBinding,\r
+    &gDnsComponentName,\r
+    &gDnsComponentName2\r
+    );\r
 \r
   return Status;\r
 }\r
@@ -641,8 +643,8 @@ Dns4DriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  DNS_SERVICE            *DnsSb;\r
-  EFI_STATUS             Status;\r
+  DNS_SERVICE  *DnsSb;\r
+  EFI_STATUS   Status;\r
 \r
   Status = DnsCreateService (ControllerHandle, This->DriverBindingHandle, IP_VERSION_4, &DnsSb);\r
   if (EFI_ERROR (Status)) {\r
@@ -712,12 +714,12 @@ Dns4DriverBindingStop (
   IN EFI_HANDLE                   *ChildHandleBuffer OPTIONAL\r
   )\r
 {\r
-  EFI_SERVICE_BINDING_PROTOCOL               *ServiceBinding;\r
-  DNS_SERVICE                                *DnsSb;\r
-  EFI_HANDLE                                 NicHandle;\r
-  EFI_STATUS                                 Status;\r
-  LIST_ENTRY                                 *List;\r
-  DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT    Context;\r
+  EFI_SERVICE_BINDING_PROTOCOL             *ServiceBinding;\r
+  DNS_SERVICE                              *DnsSb;\r
+  EFI_HANDLE                               NicHandle;\r
+  EFI_STATUS                               Status;\r
+  LIST_ENTRY                               *List;\r
+  DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT  Context;\r
 \r
   //\r
   // DNS driver opens UDP child, So, Controller is a UDP\r
@@ -733,7 +735,7 @@ Dns4DriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   NicHandle,\r
                   &gEfiDns4ServiceBindingProtocolGuid,\r
-                  (VOID **) &ServiceBinding,\r
+                  (VOID **)&ServiceBinding,\r
                   This->DriverBindingHandle,\r
                   NicHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -748,19 +750,19 @@ Dns4DriverBindingStop (
     //\r
     // Destroy the Dns child instance in ChildHandleBuffer.\r
     //\r
-    List = &DnsSb->Dns4ChildrenList;\r
+    List                      = &DnsSb->Dns4ChildrenList;\r
     Context.ServiceBinding    = ServiceBinding;\r
     Context.NumberOfChildren  = NumberOfChildren;\r
     Context.ChildHandleBuffer = ChildHandleBuffer;\r
-    Status = NetDestroyLinkList (\r
-               List,\r
-               DnsDestroyChildEntryInHandleBuffer,\r
-               &Context,\r
-               NULL\r
-               );\r
+    Status                    = NetDestroyLinkList (\r
+                                  List,\r
+                                  DnsDestroyChildEntryInHandleBuffer,\r
+                                  &Context,\r
+                                  NULL\r
+                                  );\r
   }\r
 \r
-  if (NumberOfChildren == 0 && IsListEmpty (&DnsSb->Dns4ChildrenList)) {\r
+  if ((NumberOfChildren == 0) && IsListEmpty (&DnsSb->Dns4ChildrenList)) {\r
     gBS->UninstallProtocolInterface (\r
            NicHandle,\r
            &gEfiDns4ServiceBindingProtocolGuid,\r
@@ -905,8 +907,8 @@ Dns6DriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  DNS_SERVICE            *DnsSb;\r
-  EFI_STATUS             Status;\r
+  DNS_SERVICE  *DnsSb;\r
+  EFI_STATUS   Status;\r
 \r
   Status = DnsCreateService (ControllerHandle, This->DriverBindingHandle, IP_VERSION_6, &DnsSb);\r
   if (EFI_ERROR (Status)) {\r
@@ -977,12 +979,12 @@ Dns6DriverBindingStop (
   IN EFI_HANDLE                   *ChildHandleBuffer OPTIONAL\r
   )\r
 {\r
-  EFI_SERVICE_BINDING_PROTOCOL               *ServiceBinding;\r
-  DNS_SERVICE                                *DnsSb;\r
-  EFI_HANDLE                                 NicHandle;\r
-  EFI_STATUS                                 Status;\r
-  LIST_ENTRY                                 *List;\r
-  DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT    Context;\r
+  EFI_SERVICE_BINDING_PROTOCOL             *ServiceBinding;\r
+  DNS_SERVICE                              *DnsSb;\r
+  EFI_HANDLE                               NicHandle;\r
+  EFI_STATUS                               Status;\r
+  LIST_ENTRY                               *List;\r
+  DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT  Context;\r
 \r
   //\r
   // DNS driver opens UDP child, So, Controller is a UDP\r
@@ -998,7 +1000,7 @@ Dns6DriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   NicHandle,\r
                   &gEfiDns6ServiceBindingProtocolGuid,\r
-                  (VOID **) &ServiceBinding,\r
+                  (VOID **)&ServiceBinding,\r
                   This->DriverBindingHandle,\r
                   NicHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1013,19 +1015,19 @@ Dns6DriverBindingStop (
     //\r
     // Destroy the Dns child instance in ChildHandleBuffer.\r
     //\r
-    List = &DnsSb->Dns6ChildrenList;\r
+    List                      = &DnsSb->Dns6ChildrenList;\r
     Context.ServiceBinding    = ServiceBinding;\r
     Context.NumberOfChildren  = NumberOfChildren;\r
     Context.ChildHandleBuffer = ChildHandleBuffer;\r
-    Status = NetDestroyLinkList (\r
-               List,\r
-               DnsDestroyChildEntryInHandleBuffer,\r
-               &Context,\r
-               NULL\r
-               );\r
+    Status                    = NetDestroyLinkList (\r
+                                  List,\r
+                                  DnsDestroyChildEntryInHandleBuffer,\r
+                                  &Context,\r
+                                  NULL\r
+                                  );\r
   }\r
 \r
-  if (NumberOfChildren == 0 && IsListEmpty (&DnsSb->Dns6ChildrenList)) {\r
+  if ((NumberOfChildren == 0) && IsListEmpty (&DnsSb->Dns6ChildrenList)) {\r
     gBS->UninstallProtocolInterface (\r
            NicHandle,\r
            &gEfiDns6ServiceBindingProtocolGuid,\r
@@ -1071,11 +1073,11 @@ Dns4ServiceBindingCreateChild (
   IN EFI_HANDLE                    *ChildHandle\r
   )\r
 {\r
-  DNS_SERVICE               *DnsSb;\r
-  DNS_INSTANCE              *Instance;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
-  VOID                      *Udp4;\r
+  DNS_SERVICE   *DnsSb;\r
+  DNS_INSTANCE  *Instance;\r
+  EFI_STATUS    Status;\r
+  EFI_TPL       OldTpl;\r
+  VOID          *Udp4;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1087,6 +1089,7 @@ Dns4ServiceBindingCreateChild (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   ASSERT (Instance != NULL);\r
 \r
   //\r
@@ -1110,7 +1113,7 @@ Dns4ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   DnsSb->ConnectUdp->UdpHandle,\r
                   &gEfiUdp4ProtocolGuid,\r
-                  (VOID **) &Udp4,\r
+                  (VOID **)&Udp4,\r
                   gDns4DriverBinding.DriverBindingHandle,\r
                   Instance->ChildHandle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -1132,7 +1135,7 @@ Dns4ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   Instance->UdpIo->UdpHandle,\r
                   &gEfiUdp4ProtocolGuid,\r
-                  (VOID **) &Udp4,\r
+                  (VOID **)&Udp4,\r
                   gDns4DriverBinding.DriverBindingHandle,\r
                   Instance->ChildHandle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -1148,12 +1151,12 @@ Dns4ServiceBindingCreateChild (
            *ChildHandle\r
            );\r
 \r
-     gBS->UninstallMultipleProtocolInterfaces (\r
-            Instance->ChildHandle,\r
-            &gEfiDns4ProtocolGuid,\r
-            &Instance->Dns4,\r
-            NULL\r
-            );\r
+    gBS->UninstallMultipleProtocolInterfaces (\r
+           Instance->ChildHandle,\r
+           &gEfiDns4ProtocolGuid,\r
+           &Instance->Dns4,\r
+           NULL\r
+           );\r
 \r
     goto ON_ERROR;\r
   }\r
@@ -1201,12 +1204,12 @@ Dns4ServiceBindingDestroyChild (
   IN EFI_HANDLE                    ChildHandle\r
   )\r
 {\r
-  DNS_SERVICE               *DnsSb;\r
-  DNS_INSTANCE              *Instance;\r
+  DNS_SERVICE   *DnsSb;\r
+  DNS_INSTANCE  *Instance;\r
 \r
-  EFI_DNS4_PROTOCOL         *Dns4;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
+  EFI_DNS4_PROTOCOL  *Dns4;\r
+  EFI_STATUS         Status;\r
+  EFI_TPL            OldTpl;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1218,7 +1221,7 @@ Dns4ServiceBindingDestroyChild (
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiDns4ProtocolGuid,\r
-                  (VOID **) &Dns4,\r
+                  (VOID **)&Dns4,\r
                   gDns4DriverBinding.DriverBindingHandle,\r
                   ChildHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1228,8 +1231,8 @@ Dns4ServiceBindingDestroyChild (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  Instance  = DNS_INSTANCE_FROM_THIS_PROTOCOL4 (Dns4);\r
-  DnsSb     = DNS_SERVICE_FROM_THIS (This);\r
+  Instance = DNS_INSTANCE_FROM_THIS_PROTOCOL4 (Dns4);\r
+  DnsSb    = DNS_SERVICE_FROM_THIS (This);\r
 \r
   if (Instance->Service != DnsSb) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1314,11 +1317,11 @@ Dns6ServiceBindingCreateChild (
   IN EFI_HANDLE                    *ChildHandle\r
   )\r
 {\r
-  DNS_SERVICE               *DnsSb;\r
-  DNS_INSTANCE              *Instance;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
-  VOID                      *Udp6;\r
+  DNS_SERVICE   *DnsSb;\r
+  DNS_INSTANCE  *Instance;\r
+  EFI_STATUS    Status;\r
+  EFI_TPL       OldTpl;\r
+  VOID          *Udp6;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1330,6 +1333,7 @@ Dns6ServiceBindingCreateChild (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   ASSERT (Instance != NULL);\r
 \r
   //\r
@@ -1353,7 +1357,7 @@ Dns6ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   DnsSb->ConnectUdp->UdpHandle,\r
                   &gEfiUdp6ProtocolGuid,\r
-                  (VOID **) &Udp6,\r
+                  (VOID **)&Udp6,\r
                   gDns6DriverBinding.DriverBindingHandle,\r
                   Instance->ChildHandle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -1375,7 +1379,7 @@ Dns6ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   Instance->UdpIo->UdpHandle,\r
                   &gEfiUdp6ProtocolGuid,\r
-                  (VOID **) &Udp6,\r
+                  (VOID **)&Udp6,\r
                   gDns6DriverBinding.DriverBindingHandle,\r
                   Instance->ChildHandle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -1391,12 +1395,12 @@ Dns6ServiceBindingCreateChild (
            *ChildHandle\r
            );\r
 \r
-     gBS->UninstallMultipleProtocolInterfaces (\r
-            Instance->ChildHandle,\r
-            &gEfiDns6ProtocolGuid,\r
-            &Instance->Dns6,\r
-            NULL\r
-            );\r
+    gBS->UninstallMultipleProtocolInterfaces (\r
+           Instance->ChildHandle,\r
+           &gEfiDns6ProtocolGuid,\r
+           &Instance->Dns6,\r
+           NULL\r
+           );\r
 \r
     goto ON_ERROR;\r
   }\r
@@ -1444,12 +1448,12 @@ Dns6ServiceBindingDestroyChild (
   IN EFI_HANDLE                    ChildHandle\r
   )\r
 {\r
-  DNS_SERVICE               *DnsSb;\r
-  DNS_INSTANCE              *Instance;\r
+  DNS_SERVICE   *DnsSb;\r
+  DNS_INSTANCE  *Instance;\r
 \r
-  EFI_DNS6_PROTOCOL         *Dns6;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
+  EFI_DNS6_PROTOCOL  *Dns6;\r
+  EFI_STATUS         Status;\r
+  EFI_TPL            OldTpl;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1461,7 +1465,7 @@ Dns6ServiceBindingDestroyChild (
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiDns6ProtocolGuid,\r
-                  (VOID **) &Dns6,\r
+                  (VOID **)&Dns6,\r
                   gDns6DriverBinding.DriverBindingHandle,\r
                   ChildHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1471,8 +1475,8 @@ Dns6ServiceBindingDestroyChild (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  Instance  = DNS_INSTANCE_FROM_THIS_PROTOCOL6 (Dns6);\r
-  DnsSb     = DNS_SERVICE_FROM_THIS (This);\r
+  Instance = DNS_INSTANCE_FROM_THIS_PROTOCOL6 (Dns6);\r
+  DnsSb    = DNS_SERVICE_FROM_THIS (This);\r
 \r
   if (Instance->Service != DnsSb) {\r
     return EFI_INVALID_PARAMETER;\r
index 67365ca81a1b268e374debc64082dd996e15ce0a..99123fa3c52260e0bbf043a6d28b4b8b9677780a 100644 (file)
@@ -15,84 +15,84 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 ///\r
 /// Dns service block\r
 ///\r
-typedef struct _DNS_DRIVER_DATA  DNS_DRIVER_DATA;\r
+typedef struct _DNS_DRIVER_DATA DNS_DRIVER_DATA;\r
 \r
 ///\r
 /// Dns service block\r
 ///\r
-typedef struct _DNS_SERVICE  DNS_SERVICE;\r
+typedef struct _DNS_SERVICE DNS_SERVICE;\r
 \r
 ///\r
 /// Dns instance block\r
 ///\r
 typedef struct _DNS_INSTANCE DNS_INSTANCE;\r
 \r
-#define DNS_SERVICE_SIGNATURE    SIGNATURE_32 ('D', 'N', 'S', 'S')\r
+#define DNS_SERVICE_SIGNATURE  SIGNATURE_32 ('D', 'N', 'S', 'S')\r
 \r
-#define DNS_INSTANCE_SIGNATURE   SIGNATURE_32 ('D', 'N', 'S', 'I')\r
+#define DNS_INSTANCE_SIGNATURE  SIGNATURE_32 ('D', 'N', 'S', 'I')\r
 \r
 struct _DNS_DRIVER_DATA {\r
-  EFI_EVENT                     Timer; /// Ticking timer for DNS cache update.\r
+  EFI_EVENT     Timer;                 /// Ticking timer for DNS cache update.\r
 \r
-  LIST_ENTRY                    Dns4CacheList;\r
-  LIST_ENTRY                    Dns4ServerList;\r
+  LIST_ENTRY    Dns4CacheList;\r
+  LIST_ENTRY    Dns4ServerList;\r
 \r
-  LIST_ENTRY                    Dns6CacheList;\r
-  LIST_ENTRY                    Dns6ServerList;\r
+  LIST_ENTRY    Dns6CacheList;\r
+  LIST_ENTRY    Dns6ServerList;\r
 };\r
 \r
 struct _DNS_SERVICE {\r
-  UINT32                        Signature;\r
-  EFI_SERVICE_BINDING_PROTOCOL  ServiceBinding;\r
+  UINT32                          Signature;\r
+  EFI_SERVICE_BINDING_PROTOCOL    ServiceBinding;\r
 \r
-  UINT16                        Dns4ChildrenNum;\r
-  LIST_ENTRY                    Dns4ChildrenList;\r
+  UINT16                          Dns4ChildrenNum;\r
+  LIST_ENTRY                      Dns4ChildrenList;\r
 \r
-  UINT16                        Dns6ChildrenNum;\r
-  LIST_ENTRY                    Dns6ChildrenList;\r
+  UINT16                          Dns6ChildrenNum;\r
+  LIST_ENTRY                      Dns6ChildrenList;\r
 \r
-  EFI_HANDLE                    ControllerHandle;\r
-  EFI_HANDLE                    ImageHandle;\r
+  EFI_HANDLE                      ControllerHandle;\r
+  EFI_HANDLE                      ImageHandle;\r
 \r
-  EFI_EVENT                     TimerToGetMap;\r
+  EFI_EVENT                       TimerToGetMap;\r
 \r
-  EFI_EVENT                     Timer; /// Ticking timer for packet retransmission.\r
+  EFI_EVENT                       Timer; /// Ticking timer for packet retransmission.\r
 \r
-  UINT8                         IpVersion;\r
-  UDP_IO                        *ConnectUdp;\r
+  UINT8                           IpVersion;\r
+  UDP_IO                          *ConnectUdp;\r
 };\r
 \r
 struct _DNS_INSTANCE {\r
-  UINT32                        Signature;\r
-  LIST_ENTRY                    Link;\r
+  UINT32                  Signature;\r
+  LIST_ENTRY              Link;\r
 \r
-  EFI_DNS4_PROTOCOL             Dns4;\r
-  EFI_DNS6_PROTOCOL             Dns6;\r
+  EFI_DNS4_PROTOCOL       Dns4;\r
+  EFI_DNS6_PROTOCOL       Dns6;\r
 \r
-  INTN                          State;\r
-  BOOLEAN                       InDestroy;\r
+  INTN                    State;\r
+  BOOLEAN                 InDestroy;\r
 \r
-  DNS_SERVICE                   *Service;\r
-  EFI_HANDLE                    ChildHandle;\r
+  DNS_SERVICE             *Service;\r
+  EFI_HANDLE              ChildHandle;\r
 \r
-  EFI_DNS4_CONFIG_DATA          Dns4CfgData;\r
-  EFI_DNS6_CONFIG_DATA          Dns6CfgData;\r
+  EFI_DNS4_CONFIG_DATA    Dns4CfgData;\r
+  EFI_DNS6_CONFIG_DATA    Dns6CfgData;\r
 \r
-  EFI_IP_ADDRESS                SessionDnsServer;\r
+  EFI_IP_ADDRESS          SessionDnsServer;\r
 \r
-  NET_MAP                       Dns4TxTokens;\r
-  NET_MAP                       Dns6TxTokens;\r
+  NET_MAP                 Dns4TxTokens;\r
+  NET_MAP                 Dns6TxTokens;\r
 \r
-  UDP_IO                        *UdpIo;\r
+  UDP_IO                  *UdpIo;\r
 };\r
 \r
 typedef struct {\r
-  EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
-  UINTN                         NumberOfChildren;\r
-  EFI_HANDLE                    *ChildHandleBuffer;\r
+  EFI_SERVICE_BINDING_PROTOCOL    *ServiceBinding;\r
+  UINTN                           NumberOfChildren;\r
+  EFI_HANDLE                      *ChildHandleBuffer;\r
 } DNS_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT;\r
 \r
-extern DNS_DRIVER_DATA          *mDriverData;\r
+extern DNS_DRIVER_DATA  *mDriverData;\r
 \r
 #define DNS_SERVICE_FROM_THIS(a)   \\r
   CR (a, DNS_SERVICE, ServiceBinding, DNS_SERVICE_SIGNATURE)\r
@@ -103,7 +103,6 @@ extern DNS_DRIVER_DATA          *mDriverData;
 #define DNS_INSTANCE_FROM_THIS_PROTOCOL6(a)  \\r
   CR (a, DNS_INSTANCE, Dns6, DNS_INSTANCE_SIGNATURE)\r
 \r
-\r
 /**\r
   Destroy the DNS instance and recycle the resources.\r
 \r
@@ -112,7 +111,7 @@ extern DNS_DRIVER_DATA          *mDriverData;
 **/\r
 VOID\r
 DnsDestroyInstance (\r
-  IN DNS_INSTANCE         *Instance\r
+  IN DNS_INSTANCE  *Instance\r
   );\r
 \r
 /**\r
@@ -127,8 +126,8 @@ DnsDestroyInstance (
 **/\r
 EFI_STATUS\r
 DnsCreateInstance (\r
-  IN  DNS_SERVICE         *Service,\r
-  OUT DNS_INSTANCE        **Instance\r
+  IN  DNS_SERVICE   *Service,\r
+  OUT DNS_INSTANCE  **Instance\r
   );\r
 \r
 /**\r
@@ -144,8 +143,8 @@ DnsCreateInstance (
 EFI_STATUS\r
 EFIAPI\r
 DnsDestroyChildEntryInHandleBuffer (\r
-  IN LIST_ENTRY         *Entry,\r
-  IN VOID               *Context\r
+  IN LIST_ENTRY  *Entry,\r
+  IN VOID        *Context\r
   );\r
 \r
 /**\r
@@ -163,8 +162,8 @@ DnsDestroyChildEntryInHandleBuffer (
 EFI_STATUS\r
 EFIAPI\r
 DnsConfigNullUdp (\r
-  IN UDP_IO                 *UdpIo,\r
-  IN VOID                   *Context\r
+  IN UDP_IO  *UdpIo,\r
+  IN VOID    *Context\r
   );\r
 \r
 /**\r
@@ -175,7 +174,7 @@ DnsConfigNullUdp (
 **/\r
 VOID\r
 DnsDestroyService (\r
-  IN DNS_SERVICE     *DnsSb\r
+  IN DNS_SERVICE  *DnsSb\r
   );\r
 \r
 /**\r
@@ -197,10 +196,10 @@ DnsDestroyService (
 **/\r
 EFI_STATUS\r
 DnsCreateService (\r
-  IN     EFI_HANDLE            Controller,\r
-  IN     EFI_HANDLE            Image,\r
-  IN     UINT8                 IpVersion,\r
-     OUT DNS_SERVICE           **Service\r
+  IN     EFI_HANDLE  Controller,\r
+  IN     EFI_HANDLE  Image,\r
+  IN     UINT8       IpVersion,\r
+  OUT DNS_SERVICE    **Service\r
   );\r
 \r
 /**\r
@@ -594,5 +593,4 @@ Dns6ServiceBindingDestroyChild (
   IN EFI_HANDLE                    ChildHandle\r
   );\r
 \r
-\r
 #endif\r
index 78a56f2b56512bfd3c89d467d66a23a52aa09e7d..d311812800fdc2631cff0181e999b5a0ff286c56 100644 (file)
@@ -20,8 +20,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 Dns4RemoveTokenEntry (\r
-  IN NET_MAP                    *TokenMap,\r
-  IN DNS4_TOKEN_ENTRY           *TokenEntry\r
+  IN NET_MAP           *TokenMap,\r
+  IN DNS4_TOKEN_ENTRY  *TokenEntry\r
   )\r
 {\r
   NET_MAP_ITEM  *Item;\r
@@ -29,7 +29,7 @@ Dns4RemoveTokenEntry (
   //\r
   // Find the TokenEntry first.\r
   //\r
-  Item = NetMapFindKey (TokenMap, (VOID *) TokenEntry);\r
+  Item = NetMapFindKey (TokenMap, (VOID *)TokenEntry);\r
 \r
   if (Item != NULL) {\r
     //\r
@@ -55,8 +55,8 @@ Dns4RemoveTokenEntry (
 **/\r
 EFI_STATUS\r
 Dns6RemoveTokenEntry (\r
-  IN NET_MAP                    *TokenMap,\r
-  IN DNS6_TOKEN_ENTRY           *TokenEntry\r
+  IN NET_MAP           *TokenMap,\r
+  IN DNS6_TOKEN_ENTRY  *TokenEntry\r
   )\r
 {\r
   NET_MAP_ITEM  *Item;\r
@@ -64,7 +64,7 @@ Dns6RemoveTokenEntry (
   //\r
   // Find the TokenEntry first.\r
   //\r
-  Item = NetMapFindKey (TokenMap, (VOID *) TokenEntry);\r
+  Item = NetMapFindKey (TokenMap, (VOID *)TokenEntry);\r
 \r
   if (Item != NULL) {\r
     //\r
@@ -102,9 +102,9 @@ Dns4CancelTokens (
   IN VOID          *Arg OPTIONAL\r
   )\r
 {\r
-  DNS4_TOKEN_ENTRY           *TokenEntry;\r
-  NET_BUF                    *Packet;\r
-  UDP_IO                     *UdpIo;\r
+  DNS4_TOKEN_ENTRY  *TokenEntry;\r
+  NET_BUF           *Packet;\r
+  UDP_IO            *UdpIo;\r
 \r
   if ((Arg != NULL) && (Item->Key != Arg)) {\r
     return EFI_SUCCESS;\r
@@ -115,8 +115,8 @@ Dns4CancelTokens (
     // If the TokenEntry is a transmit TokenEntry, the corresponding Packet is recorded in\r
     // Item->Value.\r
     //\r
-    Packet  = (NET_BUF *) (Item->Value);\r
-    UdpIo = (UDP_IO *) (*((UINTN *) &Packet->ProtoData[0]));\r
+    Packet = (NET_BUF *)(Item->Value);\r
+    UdpIo  = (UDP_IO *)(*((UINTN *)&Packet->ProtoData[0]));\r
 \r
     UdpIoCancelSentDatagram (UdpIo, Packet);\r
   }\r
@@ -124,7 +124,7 @@ Dns4CancelTokens (
   //\r
   // Remove TokenEntry from Dns4TxTokens.\r
   //\r
-  TokenEntry = (DNS4_TOKEN_ENTRY *) Item->Key;\r
+  TokenEntry = (DNS4_TOKEN_ENTRY *)Item->Key;\r
   if (Dns4RemoveTokenEntry (Map, TokenEntry) == EFI_SUCCESS) {\r
     TokenEntry->Token->Status = EFI_ABORTED;\r
     gBS->SignalEvent (TokenEntry->Token->Event);\r
@@ -162,9 +162,9 @@ Dns6CancelTokens (
   IN VOID          *Arg OPTIONAL\r
   )\r
 {\r
-  DNS6_TOKEN_ENTRY           *TokenEntry;\r
-  NET_BUF                    *Packet;\r
-  UDP_IO                     *UdpIo;\r
+  DNS6_TOKEN_ENTRY  *TokenEntry;\r
+  NET_BUF           *Packet;\r
+  UDP_IO            *UdpIo;\r
 \r
   if ((Arg != NULL) && (Item->Key != Arg)) {\r
     return EFI_SUCCESS;\r
@@ -175,8 +175,8 @@ Dns6CancelTokens (
     // If the TokenEntry is a transmit TokenEntry, the corresponding Packet is recorded in\r
     // Item->Value.\r
     //\r
-    Packet  = (NET_BUF *) (Item->Value);\r
-    UdpIo = (UDP_IO *) (*((UINTN *) &Packet->ProtoData[0]));\r
+    Packet = (NET_BUF *)(Item->Value);\r
+    UdpIo  = (UDP_IO *)(*((UINTN *)&Packet->ProtoData[0]));\r
 \r
     UdpIoCancelSentDatagram (UdpIo, Packet);\r
   }\r
@@ -184,7 +184,7 @@ Dns6CancelTokens (
   //\r
   // Remove TokenEntry from Dns6TxTokens.\r
   //\r
-  TokenEntry = (DNS6_TOKEN_ENTRY *) Item->Key;\r
+  TokenEntry = (DNS6_TOKEN_ENTRY *)Item->Key;\r
   if (Dns6RemoveTokenEntry (Map, TokenEntry) == EFI_SUCCESS) {\r
     TokenEntry->Token->Status = EFI_ABORTED;\r
     gBS->SignalEvent (TokenEntry->Token->Event);\r
@@ -212,18 +212,18 @@ Dns6CancelTokens (
 EFI_STATUS\r
 EFIAPI\r
 GetDns4TokenEntry (\r
-  IN     NET_MAP                   *TokensMap,\r
-  IN     EFI_DNS4_COMPLETION_TOKEN *Token,\r
-     OUT DNS4_TOKEN_ENTRY          **TokenEntry\r
+  IN     NET_MAP                    *TokensMap,\r
+  IN     EFI_DNS4_COMPLETION_TOKEN  *Token,\r
+  OUT DNS4_TOKEN_ENTRY              **TokenEntry\r
   )\r
 {\r
-  LIST_ENTRY              *Entry;\r
+  LIST_ENTRY  *Entry;\r
 \r
-  NET_MAP_ITEM            *Item;\r
+  NET_MAP_ITEM  *Item;\r
 \r
   NET_LIST_FOR_EACH (Entry, &TokensMap->Used) {\r
-    Item = NET_LIST_USER_STRUCT (Entry, NET_MAP_ITEM, Link);\r
-    *TokenEntry = (DNS4_TOKEN_ENTRY *) (Item->Key);\r
+    Item        = NET_LIST_USER_STRUCT (Entry, NET_MAP_ITEM, Link);\r
+    *TokenEntry = (DNS4_TOKEN_ENTRY *)(Item->Key);\r
     if ((*TokenEntry)->Token == Token) {\r
       return EFI_SUCCESS;\r
     }\r
@@ -248,24 +248,24 @@ GetDns4TokenEntry (
 EFI_STATUS\r
 EFIAPI\r
 GetDns6TokenEntry (\r
-  IN     NET_MAP                   *TokensMap,\r
-  IN     EFI_DNS6_COMPLETION_TOKEN *Token,\r
-     OUT DNS6_TOKEN_ENTRY          **TokenEntry\r
+  IN     NET_MAP                    *TokensMap,\r
+  IN     EFI_DNS6_COMPLETION_TOKEN  *Token,\r
+  OUT DNS6_TOKEN_ENTRY              **TokenEntry\r
   )\r
 {\r
-  LIST_ENTRY              *Entry;\r
+  LIST_ENTRY  *Entry;\r
 \r
-  NET_MAP_ITEM            *Item;\r
+  NET_MAP_ITEM  *Item;\r
 \r
   NET_LIST_FOR_EACH (Entry, &TokensMap->Used) {\r
-    Item = NET_LIST_USER_STRUCT (Entry, NET_MAP_ITEM, Link);\r
-    *TokenEntry = (DNS6_TOKEN_ENTRY *) (Item->Key);\r
+    Item        = NET_LIST_USER_STRUCT (Entry, NET_MAP_ITEM, Link);\r
+    *TokenEntry = (DNS6_TOKEN_ENTRY *)(Item->Key);\r
     if ((*TokenEntry)->Token == Token) {\r
       return EFI_SUCCESS;\r
     }\r
   }\r
 \r
-  *TokenEntry =NULL;\r
+  *TokenEntry = NULL;\r
 \r
   return EFI_NOT_FOUND;\r
 }\r
@@ -293,7 +293,7 @@ Dns4InstanceCancelToken (
 \r
   TokenEntry = NULL;\r
 \r
-  if(Token != NULL  ) {\r
+  if (Token != NULL  ) {\r
     Status = GetDns4TokenEntry (&Instance->Dns4TxTokens, Token, &TokenEntry);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
@@ -313,8 +313,9 @@ Dns4InstanceCancelToken (
     // the Dns4TxTokens and returns success.\r
     //\r
     if (NetMapIsEmpty (&Instance->Dns4TxTokens)) {\r
-       Instance->UdpIo->Protocol.Udp4->Cancel (Instance->UdpIo->Protocol.Udp4, &Instance->UdpIo->RecvRequest->Token.Udp4);\r
+      Instance->UdpIo->Protocol.Udp4->Cancel (Instance->UdpIo->Protocol.Udp4, &Instance->UdpIo->RecvRequest->Token.Udp4);\r
     }\r
+\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -350,7 +351,7 @@ Dns6InstanceCancelToken (
 \r
   TokenEntry = NULL;\r
 \r
-  if(Token != NULL  ) {\r
+  if (Token != NULL  ) {\r
     Status = GetDns6TokenEntry (&Instance->Dns6TxTokens, Token, &TokenEntry);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
@@ -370,8 +371,9 @@ Dns6InstanceCancelToken (
     // the Dns6TxTokens and returns success.\r
     //\r
     if (NetMapIsEmpty (&Instance->Dns6TxTokens)) {\r
-       Instance->UdpIo->Protocol.Udp6->Cancel (Instance->UdpIo->Protocol.Udp6, &Instance->UdpIo->RecvRequest->Token.Udp6);\r
+      Instance->UdpIo->Protocol.Udp6->Cancel (Instance->UdpIo->Protocol.Udp6, &Instance->UdpIo->RecvRequest->Token.Udp6);\r
     }\r
+\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -437,8 +439,8 @@ Dns4CopyConfigure (
   IN  EFI_DNS4_CONFIG_DATA  *Src\r
   )\r
 {\r
-  UINTN                     Len;\r
-  UINT32                    Index;\r
+  UINTN   Len;\r
+  UINT32  Index;\r
 \r
   CopyMem (Dst, Src, sizeof (*Dst));\r
   Dst->DnsServerList = NULL;\r
@@ -479,8 +481,8 @@ Dns6CopyConfigure (
   IN  EFI_DNS6_CONFIG_DATA  *Src\r
   )\r
 {\r
-  UINTN                     Len;\r
-  UINT32                    Index;\r
+  UINTN   Len;\r
+  UINT32  Index;\r
 \r
   CopyMem (Dst, Src, sizeof (*Dst));\r
   Dst->DnsServerList = NULL;\r
@@ -513,7 +515,7 @@ Dns6CopyConfigure (
 VOID\r
 EFIAPI\r
 DnsDummyExtFree (\r
-  IN VOID                   *Arg\r
+  IN VOID  *Arg\r
   )\r
 {\r
 }\r
@@ -535,15 +537,15 @@ DnsDummyExtFree (
 **/\r
 BOOLEAN\r
 Dns4GetMapping (\r
-  IN DNS_INSTANCE           *Instance,\r
-  IN UDP_IO                 *UdpIo,\r
-  IN EFI_UDP4_CONFIG_DATA   *UdpCfgData\r
+  IN DNS_INSTANCE          *Instance,\r
+  IN UDP_IO                *UdpIo,\r
+  IN EFI_UDP4_CONFIG_DATA  *UdpCfgData\r
   )\r
 {\r
-  DNS_SERVICE               *Service;\r
-  EFI_IP4_MODE_DATA         Ip4Mode;\r
-  EFI_UDP4_PROTOCOL         *Udp;\r
-  EFI_STATUS                Status;\r
+  DNS_SERVICE        *Service;\r
+  EFI_IP4_MODE_DATA  Ip4Mode;\r
+  EFI_UDP4_PROTOCOL  *Udp;\r
+  EFI_STATUS         Status;\r
 \r
   ASSERT (Instance->Dns4CfgData.UseDefaultSetting);\r
 \r
@@ -563,10 +565,10 @@ Dns4GetMapping (
     Udp->Poll (Udp);\r
 \r
     if (!EFI_ERROR (Udp->GetModeData (Udp, NULL, &Ip4Mode, NULL, NULL)) &&\r
-        Ip4Mode.IsConfigured) {\r
-\r
+        Ip4Mode.IsConfigured)\r
+    {\r
       Udp->Configure (Udp, NULL);\r
-      return (BOOLEAN) (Udp->Configure (Udp, UdpCfgData) == EFI_SUCCESS);\r
+      return (BOOLEAN)(Udp->Configure (Udp, UdpCfgData) == EFI_SUCCESS);\r
     }\r
   }\r
 \r
@@ -587,15 +589,15 @@ Dns4GetMapping (
 **/\r
 BOOLEAN\r
 Dns6GetMapping (\r
-  IN DNS_INSTANCE           *Instance,\r
-  IN UDP_IO                 *UdpIo,\r
-  IN EFI_UDP6_CONFIG_DATA   *UdpCfgData\r
+  IN DNS_INSTANCE          *Instance,\r
+  IN UDP_IO                *UdpIo,\r
+  IN EFI_UDP6_CONFIG_DATA  *UdpCfgData\r
   )\r
 {\r
-  DNS_SERVICE               *Service;\r
-  EFI_IP6_MODE_DATA         Ip6Mode;\r
-  EFI_UDP6_PROTOCOL         *Udp;\r
-  EFI_STATUS                Status;\r
+  DNS_SERVICE        *Service;\r
+  EFI_IP6_MODE_DATA  Ip6Mode;\r
+  EFI_UDP6_PROTOCOL  *Udp;\r
+  EFI_STATUS         Status;\r
 \r
   Service = Instance->Service;\r
   Udp     = UdpIo->Protocol.Udp6;\r
@@ -661,13 +663,13 @@ Dns6GetMapping (
 **/\r
 EFI_STATUS\r
 Dns4ConfigUdp (\r
-  IN DNS_INSTANCE           *Instance,\r
-  IN UDP_IO                 *UdpIo\r
+  IN DNS_INSTANCE  *Instance,\r
+  IN UDP_IO        *UdpIo\r
   )\r
 {\r
-  EFI_DNS4_CONFIG_DATA      *Config;\r
-  EFI_UDP4_CONFIG_DATA      UdpConfig;\r
-  EFI_STATUS                Status;\r
+  EFI_DNS4_CONFIG_DATA  *Config;\r
+  EFI_UDP4_CONFIG_DATA  UdpConfig;\r
+  EFI_STATUS            Status;\r
 \r
   Config = &Instance->Dns4CfgData;\r
 \r
@@ -709,13 +711,13 @@ Dns4ConfigUdp (
 **/\r
 EFI_STATUS\r
 Dns6ConfigUdp (\r
-  IN DNS_INSTANCE           *Instance,\r
-  IN UDP_IO                 *UdpIo\r
+  IN DNS_INSTANCE  *Instance,\r
+  IN UDP_IO        *UdpIo\r
   )\r
 {\r
-  EFI_DNS6_CONFIG_DATA      *Config;\r
-  EFI_UDP6_CONFIG_DATA      UdpConfig;\r
-  EFI_STATUS                Status;\r
+  EFI_DNS6_CONFIG_DATA  *Config;\r
+  EFI_UDP6_CONFIG_DATA  UdpConfig;\r
+  EFI_STATUS            Status;\r
 \r
   Config = &Instance->Dns6CfgData;\r
 \r
@@ -757,16 +759,16 @@ Dns6ConfigUdp (
 EFI_STATUS\r
 EFIAPI\r
 UpdateDns4Cache (\r
-  IN LIST_ENTRY             *Dns4CacheList,\r
-  IN BOOLEAN                DeleteFlag,\r
-  IN BOOLEAN                Override,\r
-  IN EFI_DNS4_CACHE_ENTRY   DnsCacheEntry\r
+  IN LIST_ENTRY            *Dns4CacheList,\r
+  IN BOOLEAN               DeleteFlag,\r
+  IN BOOLEAN               Override,\r
+  IN EFI_DNS4_CACHE_ENTRY  DnsCacheEntry\r
   )\r
 {\r
-  DNS4_CACHE    *NewDnsCache;\r
-  DNS4_CACHE    *Item;\r
-  LIST_ENTRY    *Entry;\r
-  LIST_ENTRY    *Next;\r
+  DNS4_CACHE  *NewDnsCache;\r
+  DNS4_CACHE  *Item;\r
+  LIST_ENTRY  *Entry;\r
+  LIST_ENTRY  *Next;\r
 \r
   NewDnsCache = NULL;\r
   Item        = NULL;\r
@@ -776,8 +778,9 @@ UpdateDns4Cache (
   //\r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, Dns4CacheList) {\r
     Item = NET_LIST_USER_STRUCT (Entry, DNS4_CACHE, AllCacheLink);\r
-    if (StrCmp (DnsCacheEntry.HostName, Item->DnsCache.HostName) == 0 && \\r
-        CompareMem (DnsCacheEntry.IpAddress, Item->DnsCache.IpAddress, sizeof (EFI_IPv4_ADDRESS)) == 0) {\r
+    if ((StrCmp (DnsCacheEntry.HostName, Item->DnsCache.HostName) == 0) && \\r
+        (CompareMem (DnsCacheEntry.IpAddress, Item->DnsCache.IpAddress, sizeof (EFI_IPv4_ADDRESS)) == 0))\r
+    {\r
       //\r
       // This is the Dns cache entry\r
       //\r
@@ -855,16 +858,16 @@ UpdateDns4Cache (
 EFI_STATUS\r
 EFIAPI\r
 UpdateDns6Cache (\r
-  IN LIST_ENTRY             *Dns6CacheList,\r
-  IN BOOLEAN                DeleteFlag,\r
-  IN BOOLEAN                Override,\r
-  IN EFI_DNS6_CACHE_ENTRY   DnsCacheEntry\r
+  IN LIST_ENTRY            *Dns6CacheList,\r
+  IN BOOLEAN               DeleteFlag,\r
+  IN BOOLEAN               Override,\r
+  IN EFI_DNS6_CACHE_ENTRY  DnsCacheEntry\r
   )\r
 {\r
-  DNS6_CACHE    *NewDnsCache;\r
-  DNS6_CACHE    *Item;\r
-  LIST_ENTRY    *Entry;\r
-  LIST_ENTRY    *Next;\r
+  DNS6_CACHE  *NewDnsCache;\r
+  DNS6_CACHE  *Item;\r
+  LIST_ENTRY  *Entry;\r
+  LIST_ENTRY  *Next;\r
 \r
   NewDnsCache = NULL;\r
   Item        = NULL;\r
@@ -874,8 +877,9 @@ UpdateDns6Cache (
   //\r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, Dns6CacheList) {\r
     Item = NET_LIST_USER_STRUCT (Entry, DNS6_CACHE, AllCacheLink);\r
-    if (StrCmp (DnsCacheEntry.HostName, Item->DnsCache.HostName) == 0 && \\r
-        CompareMem (DnsCacheEntry.IpAddress, Item->DnsCache.IpAddress, sizeof (EFI_IPv6_ADDRESS)) == 0) {\r
+    if ((StrCmp (DnsCacheEntry.HostName, Item->DnsCache.HostName) == 0) && \\r
+        (CompareMem (DnsCacheEntry.IpAddress, Item->DnsCache.IpAddress, sizeof (EFI_IPv6_ADDRESS)) == 0))\r
+    {\r
       //\r
       // This is the Dns cache entry\r
       //\r
@@ -950,14 +954,14 @@ UpdateDns6Cache (
 EFI_STATUS\r
 EFIAPI\r
 AddDns4ServerIp (\r
-  IN LIST_ENTRY                *Dns4ServerList,\r
-  IN EFI_IPv4_ADDRESS           ServerIp\r
+  IN LIST_ENTRY        *Dns4ServerList,\r
+  IN EFI_IPv4_ADDRESS  ServerIp\r
   )\r
 {\r
-  DNS4_SERVER_IP    *NewServerIp;\r
-  DNS4_SERVER_IP    *Item;\r
-  LIST_ENTRY        *Entry;\r
-  LIST_ENTRY        *Next;\r
+  DNS4_SERVER_IP  *NewServerIp;\r
+  DNS4_SERVER_IP  *Item;\r
+  LIST_ENTRY      *Entry;\r
+  LIST_ENTRY      *Next;\r
 \r
   NewServerIp = NULL;\r
   Item        = NULL;\r
@@ -1005,14 +1009,14 @@ AddDns4ServerIp (
 EFI_STATUS\r
 EFIAPI\r
 AddDns6ServerIp (\r
-  IN LIST_ENTRY                *Dns6ServerList,\r
-  IN EFI_IPv6_ADDRESS           ServerIp\r
+  IN LIST_ENTRY        *Dns6ServerList,\r
+  IN EFI_IPv6_ADDRESS  ServerIp\r
   )\r
 {\r
-  DNS6_SERVER_IP    *NewServerIp;\r
-  DNS6_SERVER_IP    *Item;\r
-  LIST_ENTRY        *Entry;\r
-  LIST_ENTRY        *Next;\r
+  DNS6_SERVER_IP  *NewServerIp;\r
+  DNS6_SERVER_IP  *Item;\r
+  LIST_ENTRY      *Entry;\r
+  LIST_ENTRY      *Next;\r
 \r
   NewServerIp = NULL;\r
   Item        = NULL;\r
@@ -1062,37 +1066,37 @@ AddDns6ServerIp (
 **/\r
 BOOLEAN\r
 IsValidDnsResponse (\r
-  IN     NET_MAP      *TokensMap,\r
-  IN     UINT16       Identification,\r
-  IN     UINT16       Type,\r
-  IN     UINT16       Class,\r
-     OUT NET_MAP_ITEM **Item\r
+  IN     NET_MAP    *TokensMap,\r
+  IN     UINT16     Identification,\r
+  IN     UINT16     Type,\r
+  IN     UINT16     Class,\r
+  OUT NET_MAP_ITEM  **Item\r
   )\r
 {\r
-  LIST_ENTRY              *Entry;\r
+  LIST_ENTRY  *Entry;\r
 \r
-  NET_BUF                 *Packet;\r
-  UINT8                   *TxString;\r
-  DNS_HEADER              *DnsHeader;\r
-  CHAR8                   *QueryName;\r
-  DNS_QUERY_SECTION       *QuerySection;\r
+  NET_BUF            *Packet;\r
+  UINT8              *TxString;\r
+  DNS_HEADER         *DnsHeader;\r
+  CHAR8              *QueryName;\r
+  DNS_QUERY_SECTION  *QuerySection;\r
 \r
   NET_LIST_FOR_EACH (Entry, &TokensMap->Used) {\r
-    *Item = NET_LIST_USER_STRUCT (Entry, NET_MAP_ITEM, Link);\r
-    Packet = (NET_BUF *) ((*Item)->Value);\r
+    *Item  = NET_LIST_USER_STRUCT (Entry, NET_MAP_ITEM, Link);\r
+    Packet = (NET_BUF *)((*Item)->Value);\r
     if (Packet == NULL) {\r
-\r
       continue;\r
     } else {\r
       TxString = NetbufGetByte (Packet, 0, NULL);\r
       ASSERT (TxString != NULL);\r
-      DnsHeader = (DNS_HEADER *) TxString;\r
-      QueryName = (CHAR8 *) (TxString + sizeof (*DnsHeader));\r
-      QuerySection = (DNS_QUERY_SECTION *) (QueryName + AsciiStrLen (QueryName) + 1);\r
-\r
-      if (NTOHS (DnsHeader->Identification) == Identification &&\r
-          NTOHS (QuerySection->Type) == Type &&\r
-          NTOHS (QuerySection->Class) == Class) {\r
+      DnsHeader    = (DNS_HEADER *)TxString;\r
+      QueryName    = (CHAR8 *)(TxString + sizeof (*DnsHeader));\r
+      QuerySection = (DNS_QUERY_SECTION *)(QueryName + AsciiStrLen (QueryName) + 1);\r
+\r
+      if ((NTOHS (DnsHeader->Identification) == Identification) &&\r
+          (NTOHS (QuerySection->Type) == Type) &&\r
+          (NTOHS (QuerySection->Class) == Class))\r
+      {\r
         return TRUE;\r
       }\r
     }\r
@@ -1117,33 +1121,33 @@ IsValidDnsResponse (
 **/\r
 EFI_STATUS\r
 ParseDnsResponse (\r
-  IN OUT DNS_INSTANCE              *Instance,\r
-  IN     UINT8                     *RxString,\r
-  IN     UINT32                    Length,\r
-     OUT BOOLEAN                   *Completed\r
+  IN OUT DNS_INSTANCE  *Instance,\r
+  IN     UINT8         *RxString,\r
+  IN     UINT32        Length,\r
+  OUT BOOLEAN          *Completed\r
   )\r
 {\r
-  DNS_HEADER            *DnsHeader;\r
+  DNS_HEADER  *DnsHeader;\r
 \r
-  CHAR8                 *QueryName;\r
-  UINT32                QueryNameLen;\r
-  DNS_QUERY_SECTION     *QuerySection;\r
+  CHAR8              *QueryName;\r
+  UINT32             QueryNameLen;\r
+  DNS_QUERY_SECTION  *QuerySection;\r
 \r
-  CHAR8                 *AnswerName;\r
-  DNS_ANSWER_SECTION    *AnswerSection;\r
-  UINT8                 *AnswerData;\r
+  CHAR8               *AnswerName;\r
+  DNS_ANSWER_SECTION  *AnswerSection;\r
+  UINT8               *AnswerData;\r
 \r
-  NET_MAP_ITEM          *Item;\r
-  DNS4_TOKEN_ENTRY      *Dns4TokenEntry;\r
-  DNS6_TOKEN_ENTRY      *Dns6TokenEntry;\r
+  NET_MAP_ITEM      *Item;\r
+  DNS4_TOKEN_ENTRY  *Dns4TokenEntry;\r
+  DNS6_TOKEN_ENTRY  *Dns6TokenEntry;\r
 \r
-  UINT32                IpCount;\r
-  UINT32                RRCount;\r
-  UINT32                AnswerSectionNum;\r
-  UINT32                CNameTtl;\r
+  UINT32  IpCount;\r
+  UINT32  RRCount;\r
+  UINT32  AnswerSectionNum;\r
+  UINT32  CNameTtl;\r
 \r
-  EFI_IPv4_ADDRESS      *HostAddr4;\r
-  EFI_IPv6_ADDRESS      *HostAddr6;\r
+  EFI_IPv4_ADDRESS  *HostAddr4;\r
+  EFI_IPv6_ADDRESS  *HostAddr6;\r
 \r
   EFI_DNS4_CACHE_ENTRY  *Dns4CacheEntry;\r
   EFI_DNS6_CACHE_ENTRY  *Dns6CacheEntry;\r
@@ -1151,32 +1155,32 @@ ParseDnsResponse (
   DNS_RESOURCE_RECORD   *Dns4RR;\r
   DNS6_RESOURCE_RECORD  *Dns6RR;\r
 \r
-  EFI_STATUS            Status;\r
-  UINT32                RemainingLength;\r
+  EFI_STATUS  Status;\r
+  UINT32      RemainingLength;\r
 \r
-  EFI_TPL               OldTpl;\r
+  EFI_TPL  OldTpl;\r
 \r
-  Item             = NULL;\r
-  Dns4TokenEntry   = NULL;\r
-  Dns6TokenEntry   = NULL;\r
+  Item           = NULL;\r
+  Dns4TokenEntry = NULL;\r
+  Dns6TokenEntry = NULL;\r
 \r
   IpCount          = 0;\r
   RRCount          = 0;\r
   AnswerSectionNum = 0;\r
   CNameTtl         = 0;\r
 \r
-  HostAddr4        = NULL;\r
-  HostAddr6        = NULL;\r
+  HostAddr4 = NULL;\r
+  HostAddr6 = NULL;\r
 \r
-  Dns4CacheEntry   = NULL;\r
-  Dns6CacheEntry   = NULL;\r
+  Dns4CacheEntry = NULL;\r
+  Dns6CacheEntry = NULL;\r
 \r
-  Dns4RR           = NULL;\r
-  Dns6RR           = NULL;\r
+  Dns4RR = NULL;\r
+  Dns6RR = NULL;\r
 \r
-  *Completed       = TRUE;\r
-  Status           = EFI_SUCCESS;\r
-  RemainingLength  = Length;\r
+  *Completed      = TRUE;\r
+  Status          = EFI_SUCCESS;\r
+  RemainingLength = Length;\r
 \r
   //\r
   // Check whether the remaining packet length is available or not.\r
@@ -1191,14 +1195,14 @@ ParseDnsResponse (
   //\r
   // Get header\r
   //\r
-  DnsHeader = (DNS_HEADER *) RxString;\r
+  DnsHeader = (DNS_HEADER *)RxString;\r
 \r
   DnsHeader->Identification = NTOHS (DnsHeader->Identification);\r
-  DnsHeader->Flags.Uint16 = NTOHS (DnsHeader->Flags.Uint16);\r
-  DnsHeader->QuestionsNum = NTOHS (DnsHeader->QuestionsNum);\r
-  DnsHeader->AnswersNum = NTOHS (DnsHeader->AnswersNum);\r
-  DnsHeader->AuthorityNum = NTOHS (DnsHeader->AuthorityNum);\r
-  DnsHeader->AditionalNum = NTOHS (DnsHeader->AditionalNum);\r
+  DnsHeader->Flags.Uint16   = NTOHS (DnsHeader->Flags.Uint16);\r
+  DnsHeader->QuestionsNum   = NTOHS (DnsHeader->QuestionsNum);\r
+  DnsHeader->AnswersNum     = NTOHS (DnsHeader->AnswersNum);\r
+  DnsHeader->AuthorityNum   = NTOHS (DnsHeader->AuthorityNum);\r
+  DnsHeader->AditionalNum   = NTOHS (DnsHeader->AditionalNum);\r
 \r
   //\r
   // There is always one QuestionsNum in DNS message. The capability to handle more\r
@@ -1212,9 +1216,9 @@ ParseDnsResponse (
   //\r
   // Get Query name\r
   //\r
-  QueryName = (CHAR8 *) (RxString + sizeof (*DnsHeader));\r
+  QueryName = (CHAR8 *)(RxString + sizeof (*DnsHeader));\r
 \r
-  QueryNameLen = (UINT32) AsciiStrLen (QueryName) + 1;\r
+  QueryNameLen = (UINT32)AsciiStrLen (QueryName) + 1;\r
 \r
   //\r
   // Check whether the remaining packet length is available or not.\r
@@ -1229,8 +1233,8 @@ ParseDnsResponse (
   //\r
   // Get query section\r
   //\r
-  QuerySection = (DNS_QUERY_SECTION *) (QueryName + QueryNameLen);\r
-  QuerySection->Type = NTOHS (QuerySection->Type);\r
+  QuerySection        = (DNS_QUERY_SECTION *)(QueryName + QueryNameLen);\r
+  QuerySection->Type  = NTOHS (QuerySection->Type);\r
   QuerySection->Class = NTOHS (QuerySection->Class);\r
 \r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
@@ -1245,13 +1249,15 @@ ParseDnsResponse (
            QuerySection->Type,\r
            QuerySection->Class,\r
            &Item\r
-           )) {\r
+           ))\r
+    {\r
       *Completed = FALSE;\r
-      Status = EFI_ABORTED;\r
+      Status     = EFI_ABORTED;\r
       goto ON_EXIT;\r
     }\r
+\r
     ASSERT (Item != NULL);\r
-    Dns4TokenEntry = (DNS4_TOKEN_ENTRY *) (Item->Key);\r
+    Dns4TokenEntry = (DNS4_TOKEN_ENTRY *)(Item->Key);\r
   } else {\r
     if (!IsValidDnsResponse (\r
            &Instance->Dns6TxTokens,\r
@@ -1259,20 +1265,23 @@ ParseDnsResponse (
            QuerySection->Type,\r
            QuerySection->Class,\r
            &Item\r
-           )) {\r
+           ))\r
+    {\r
       *Completed = FALSE;\r
-      Status = EFI_ABORTED;\r
+      Status     = EFI_ABORTED;\r
       goto ON_EXIT;\r
     }\r
+\r
     ASSERT (Item != NULL);\r
-    Dns6TokenEntry = (DNS6_TOKEN_ENTRY *) (Item->Key);\r
+    Dns6TokenEntry = (DNS6_TOKEN_ENTRY *)(Item->Key);\r
   }\r
 \r
   //\r
   // Continue Check Some Errors.\r
   //\r
-  if (DnsHeader->Flags.Bits.RCode != DNS_FLAGS_RCODE_NO_ERROR || DnsHeader->AnswersNum < 1 || \\r
-      DnsHeader->Flags.Bits.QR != DNS_FLAGS_QR_RESPONSE) {\r
+  if ((DnsHeader->Flags.Bits.RCode != DNS_FLAGS_RCODE_NO_ERROR) || (DnsHeader->AnswersNum < 1) || \\r
+      (DnsHeader->Flags.Bits.QR != DNS_FLAGS_QR_RESPONSE))\r
+  {\r
     //\r
     // The domain name referenced in the query does not exist.\r
     //\r
@@ -1300,6 +1309,7 @@ ParseDnsResponse (
         Status = EFI_OUT_OF_RESOURCES;\r
         goto ON_EXIT;\r
       }\r
+\r
       Dns4TokenEntry->Token->RspData.GLookupData->RRList = AllocateZeroPool (DnsHeader->AnswersNum * sizeof (DNS_RESOURCE_RECORD));\r
       if (Dns4TokenEntry->Token->RspData.GLookupData->RRList == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
@@ -1315,6 +1325,7 @@ ParseDnsResponse (
           Status = EFI_OUT_OF_RESOURCES;\r
           goto ON_EXIT;\r
         }\r
+\r
         Dns4TokenEntry->Token->RspData.H2AData->IpList = AllocateZeroPool (DnsHeader->AnswersNum * sizeof (EFI_IPv4_ADDRESS));\r
         if (Dns4TokenEntry->Token->RspData.H2AData->IpList == NULL) {\r
           Status = EFI_OUT_OF_RESOURCES;\r
@@ -1337,6 +1348,7 @@ ParseDnsResponse (
         Status = EFI_OUT_OF_RESOURCES;\r
         goto ON_EXIT;\r
       }\r
+\r
       Dns6TokenEntry->Token->RspData.GLookupData->RRList = AllocateZeroPool (DnsHeader->AnswersNum * sizeof (DNS_RESOURCE_RECORD));\r
       if (Dns6TokenEntry->Token->RspData.GLookupData->RRList == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
@@ -1352,6 +1364,7 @@ ParseDnsResponse (
           Status = EFI_OUT_OF_RESOURCES;\r
           goto ON_EXIT;\r
         }\r
+\r
         Dns6TokenEntry->Token->RspData.H2AData->IpList = AllocateZeroPool (DnsHeader->AnswersNum * sizeof (EFI_IPv6_ADDRESS));\r
         if (Dns6TokenEntry->Token->RspData.H2AData->IpList == NULL) {\r
           Status = EFI_OUT_OF_RESOURCES;\r
@@ -1369,7 +1382,7 @@ ParseDnsResponse (
   //\r
   // Get Answer name\r
   //\r
-  AnswerName = (CHAR8 *) QuerySection + sizeof (*QuerySection);\r
+  AnswerName = (CHAR8 *)QuerySection + sizeof (*QuerySection);\r
 \r
   //\r
   // Processing AnswerSection.\r
@@ -1380,7 +1393,7 @@ ParseDnsResponse (
     //\r
     if (RemainingLength <= sizeof (UINT16) + sizeof (DNS_ANSWER_SECTION)) {\r
       *Completed = FALSE;\r
-      Status = EFI_ABORTED;\r
+      Status     = EFI_ABORTED;\r
       goto ON_EXIT;\r
     } else {\r
       RemainingLength -= (sizeof (UINT16) + sizeof (DNS_ANSWER_SECTION));\r
@@ -1389,7 +1402,7 @@ ParseDnsResponse (
     //\r
     // Answer name should be PTR, else EFI_UNSUPPORTED returned.\r
     //\r
-    if ((*(UINT8 *) AnswerName & 0xC0) != 0xC0) {\r
+    if ((*(UINT8 *)AnswerName & 0xC0) != 0xC0) {\r
       Status = EFI_UNSUPPORTED;\r
       goto ON_EXIT;\r
     }\r
@@ -1397,10 +1410,10 @@ ParseDnsResponse (
     //\r
     // Get Answer section.\r
     //\r
-    AnswerSection = (DNS_ANSWER_SECTION *) (AnswerName + sizeof (UINT16));\r
-    AnswerSection->Type = NTOHS (AnswerSection->Type);\r
-    AnswerSection->Class = NTOHS (AnswerSection->Class);\r
-    AnswerSection->Ttl = NTOHL (AnswerSection->Ttl);\r
+    AnswerSection             = (DNS_ANSWER_SECTION *)(AnswerName + sizeof (UINT16));\r
+    AnswerSection->Type       = NTOHS (AnswerSection->Type);\r
+    AnswerSection->Class      = NTOHS (AnswerSection->Class);\r
+    AnswerSection->Ttl        = NTOHL (AnswerSection->Ttl);\r
     AnswerSection->DataLength = NTOHS (AnswerSection->DataLength);\r
 \r
     //\r
@@ -1408,7 +1421,7 @@ ParseDnsResponse (
     //\r
     if (RemainingLength < AnswerSection->DataLength) {\r
       *Completed = FALSE;\r
-      Status = EFI_ABORTED;\r
+      Status     = EFI_ABORTED;\r
       goto ON_EXIT;\r
     } else {\r
       RemainingLength -= AnswerSection->DataLength;\r
@@ -1417,9 +1430,9 @@ ParseDnsResponse (
     //\r
     // Check whether it's the GeneralLookUp querying.\r
     //\r
-    if (Instance->Service->IpVersion == IP_VERSION_4 && Dns4TokenEntry->GeneralLookUp) {\r
-      Dns4RR = Dns4TokenEntry->Token->RspData.GLookupData->RRList;\r
-      AnswerData = (UINT8 *) AnswerSection + sizeof (*AnswerSection);\r
+    if ((Instance->Service->IpVersion == IP_VERSION_4) && Dns4TokenEntry->GeneralLookUp) {\r
+      Dns4RR     = Dns4TokenEntry->Token->RspData.GLookupData->RRList;\r
+      AnswerData = (UINT8 *)AnswerSection + sizeof (*AnswerSection);\r
 \r
       //\r
       // Fill the ResourceRecord.\r
@@ -1429,23 +1442,25 @@ ParseDnsResponse (
         Status = EFI_OUT_OF_RESOURCES;\r
         goto ON_EXIT;\r
       }\r
+\r
       CopyMem (Dns4RR[RRCount].QName, QueryName, AsciiStrLen (QueryName));\r
-      Dns4RR[RRCount].QType = AnswerSection->Type;\r
-      Dns4RR[RRCount].QClass = AnswerSection->Class;\r
-      Dns4RR[RRCount].TTL = AnswerSection->Ttl;\r
+      Dns4RR[RRCount].QType      = AnswerSection->Type;\r
+      Dns4RR[RRCount].QClass     = AnswerSection->Class;\r
+      Dns4RR[RRCount].TTL        = AnswerSection->Ttl;\r
       Dns4RR[RRCount].DataLength = AnswerSection->DataLength;\r
-      Dns4RR[RRCount].RData = AllocateZeroPool (Dns4RR[RRCount].DataLength);\r
+      Dns4RR[RRCount].RData      = AllocateZeroPool (Dns4RR[RRCount].DataLength);\r
       if (Dns4RR[RRCount].RData == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
         goto ON_EXIT;\r
       }\r
+\r
       CopyMem (Dns4RR[RRCount].RData, AnswerData, Dns4RR[RRCount].DataLength);\r
 \r
-      RRCount ++;\r
+      RRCount++;\r
       Status = EFI_SUCCESS;\r
-    } else if (Instance->Service->IpVersion == IP_VERSION_6 && Dns6TokenEntry->GeneralLookUp) {\r
-      Dns6RR = Dns6TokenEntry->Token->RspData.GLookupData->RRList;\r
-      AnswerData = (UINT8 *) AnswerSection + sizeof (*AnswerSection);\r
+    } else if ((Instance->Service->IpVersion == IP_VERSION_6) && Dns6TokenEntry->GeneralLookUp) {\r
+      Dns6RR     = Dns6TokenEntry->Token->RspData.GLookupData->RRList;\r
+      AnswerData = (UINT8 *)AnswerSection + sizeof (*AnswerSection);\r
 \r
       //\r
       // Fill the ResourceRecord.\r
@@ -1455,19 +1470,21 @@ ParseDnsResponse (
         Status = EFI_OUT_OF_RESOURCES;\r
         goto ON_EXIT;\r
       }\r
+\r
       CopyMem (Dns6RR[RRCount].QName, QueryName, AsciiStrLen (QueryName));\r
-      Dns6RR[RRCount].QType = AnswerSection->Type;\r
-      Dns6RR[RRCount].QClass = AnswerSection->Class;\r
-      Dns6RR[RRCount].TTL = AnswerSection->Ttl;\r
+      Dns6RR[RRCount].QType      = AnswerSection->Type;\r
+      Dns6RR[RRCount].QClass     = AnswerSection->Class;\r
+      Dns6RR[RRCount].TTL        = AnswerSection->Ttl;\r
       Dns6RR[RRCount].DataLength = AnswerSection->DataLength;\r
-      Dns6RR[RRCount].RData = AllocateZeroPool (Dns6RR[RRCount].DataLength);\r
+      Dns6RR[RRCount].RData      = AllocateZeroPool (Dns6RR[RRCount].DataLength);\r
       if (Dns6RR[RRCount].RData == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
         goto ON_EXIT;\r
       }\r
+\r
       CopyMem (Dns6RR[RRCount].RData, AnswerData, Dns6RR[RRCount].DataLength);\r
 \r
-      RRCount ++;\r
+      RRCount++;\r
       Status = EFI_SUCCESS;\r
     } else {\r
       //\r
@@ -1475,143 +1492,149 @@ ParseDnsResponse (
       // Check the Query type, parse the response packet.\r
       //\r
       switch (AnswerSection->Type) {\r
-      case DNS_TYPE_A:\r
-        //\r
-        // This is address entry, get Data.\r
-        //\r
-        ASSERT (Dns4TokenEntry != NULL);\r
+        case DNS_TYPE_A:\r
+          //\r
+          // This is address entry, get Data.\r
+          //\r
+          ASSERT (Dns4TokenEntry != NULL);\r
 \r
-        if (AnswerSection->DataLength != 4) {\r
-          Status = EFI_ABORTED;\r
-          goto ON_EXIT;\r
-        }\r
+          if (AnswerSection->DataLength != 4) {\r
+            Status = EFI_ABORTED;\r
+            goto ON_EXIT;\r
+          }\r
 \r
-        HostAddr4 = Dns4TokenEntry->Token->RspData.H2AData->IpList;\r
-        AnswerData = (UINT8 *) AnswerSection + sizeof (*AnswerSection);\r
-        CopyMem (&HostAddr4[IpCount], AnswerData, sizeof (EFI_IPv4_ADDRESS));\r
+          HostAddr4  = Dns4TokenEntry->Token->RspData.H2AData->IpList;\r
+          AnswerData = (UINT8 *)AnswerSection + sizeof (*AnswerSection);\r
+          CopyMem (&HostAddr4[IpCount], AnswerData, sizeof (EFI_IPv4_ADDRESS));\r
 \r
-        //\r
-        // Allocate new CacheEntry pool to update DNS cache dynamically.\r
-        //\r
-        Dns4CacheEntry = AllocateZeroPool (sizeof (EFI_DNS4_CACHE_ENTRY));\r
-        if (Dns4CacheEntry == NULL) {\r
-          Status = EFI_OUT_OF_RESOURCES;\r
-          goto ON_EXIT;\r
-        }\r
-        Dns4CacheEntry->HostName = AllocateZeroPool (2 * (StrLen(Dns4TokenEntry->QueryHostName) + 1));\r
-        if (Dns4CacheEntry->HostName == NULL) {\r
-          Status = EFI_OUT_OF_RESOURCES;\r
-          goto ON_EXIT;\r
-        }\r
-        CopyMem (Dns4CacheEntry->HostName, Dns4TokenEntry->QueryHostName, 2 * (StrLen(Dns4TokenEntry->QueryHostName) + 1));\r
-        Dns4CacheEntry->IpAddress = AllocateZeroPool (sizeof (EFI_IPv4_ADDRESS));\r
-        if (Dns4CacheEntry->IpAddress == NULL) {\r
-          Status = EFI_OUT_OF_RESOURCES;\r
-          goto ON_EXIT;\r
-        }\r
-        CopyMem (Dns4CacheEntry->IpAddress, AnswerData, sizeof (EFI_IPv4_ADDRESS));\r
+          //\r
+          // Allocate new CacheEntry pool to update DNS cache dynamically.\r
+          //\r
+          Dns4CacheEntry = AllocateZeroPool (sizeof (EFI_DNS4_CACHE_ENTRY));\r
+          if (Dns4CacheEntry == NULL) {\r
+            Status = EFI_OUT_OF_RESOURCES;\r
+            goto ON_EXIT;\r
+          }\r
 \r
-        if (CNameTtl != 0 && AnswerSection->Ttl != 0) {\r
-          Dns4CacheEntry->Timeout = MIN (CNameTtl, AnswerSection->Ttl);\r
-        } else {\r
-          Dns4CacheEntry->Timeout = MAX (CNameTtl, AnswerSection->Ttl);\r
-        }\r
+          Dns4CacheEntry->HostName = AllocateZeroPool (2 * (StrLen (Dns4TokenEntry->QueryHostName) + 1));\r
+          if (Dns4CacheEntry->HostName == NULL) {\r
+            Status = EFI_OUT_OF_RESOURCES;\r
+            goto ON_EXIT;\r
+          }\r
 \r
-        UpdateDns4Cache (&mDriverData->Dns4CacheList, FALSE, TRUE, *Dns4CacheEntry);\r
+          CopyMem (Dns4CacheEntry->HostName, Dns4TokenEntry->QueryHostName, 2 * (StrLen (Dns4TokenEntry->QueryHostName) + 1));\r
+          Dns4CacheEntry->IpAddress = AllocateZeroPool (sizeof (EFI_IPv4_ADDRESS));\r
+          if (Dns4CacheEntry->IpAddress == NULL) {\r
+            Status = EFI_OUT_OF_RESOURCES;\r
+            goto ON_EXIT;\r
+          }\r
 \r
-        //\r
-        // Free allocated CacheEntry pool.\r
-        //\r
-        FreePool (Dns4CacheEntry->HostName);\r
-        Dns4CacheEntry->HostName = NULL;\r
+          CopyMem (Dns4CacheEntry->IpAddress, AnswerData, sizeof (EFI_IPv4_ADDRESS));\r
 \r
-        FreePool (Dns4CacheEntry->IpAddress);\r
-        Dns4CacheEntry->IpAddress = NULL;\r
+          if ((CNameTtl != 0) && (AnswerSection->Ttl != 0)) {\r
+            Dns4CacheEntry->Timeout = MIN (CNameTtl, AnswerSection->Ttl);\r
+          } else {\r
+            Dns4CacheEntry->Timeout = MAX (CNameTtl, AnswerSection->Ttl);\r
+          }\r
 \r
-        FreePool (Dns4CacheEntry);\r
-        Dns4CacheEntry = NULL;\r
+          UpdateDns4Cache (&mDriverData->Dns4CacheList, FALSE, TRUE, *Dns4CacheEntry);\r
 \r
-        IpCount ++;\r
-        Status = EFI_SUCCESS;\r
-        break;\r
-      case DNS_TYPE_AAAA:\r
-        //\r
-        // This is address entry, get Data.\r
-        //\r
-        ASSERT (Dns6TokenEntry != NULL);\r
+          //\r
+          // Free allocated CacheEntry pool.\r
+          //\r
+          FreePool (Dns4CacheEntry->HostName);\r
+          Dns4CacheEntry->HostName = NULL;\r
 \r
-        if (AnswerSection->DataLength != 16) {\r
-          Status = EFI_ABORTED;\r
-          goto ON_EXIT;\r
-        }\r
+          FreePool (Dns4CacheEntry->IpAddress);\r
+          Dns4CacheEntry->IpAddress = NULL;\r
 \r
-        HostAddr6 = Dns6TokenEntry->Token->RspData.H2AData->IpList;\r
-        AnswerData = (UINT8 *) AnswerSection + sizeof (*AnswerSection);\r
-        CopyMem (&HostAddr6[IpCount], AnswerData, sizeof (EFI_IPv6_ADDRESS));\r
+          FreePool (Dns4CacheEntry);\r
+          Dns4CacheEntry = NULL;\r
 \r
-        //\r
-        // Allocate new CacheEntry pool to update DNS cache dynamically.\r
-        //\r
-        Dns6CacheEntry = AllocateZeroPool (sizeof (EFI_DNS6_CACHE_ENTRY));\r
-        if (Dns6CacheEntry == NULL) {\r
-          Status = EFI_OUT_OF_RESOURCES;\r
-          goto ON_EXIT;\r
-        }\r
-        Dns6CacheEntry->HostName = AllocateZeroPool (2 * (StrLen(Dns6TokenEntry->QueryHostName) + 1));\r
-        if (Dns6CacheEntry->HostName == NULL) {\r
-          Status = EFI_OUT_OF_RESOURCES;\r
-          goto ON_EXIT;\r
-        }\r
-        CopyMem (Dns6CacheEntry->HostName, Dns6TokenEntry->QueryHostName, 2 * (StrLen(Dns6TokenEntry->QueryHostName) + 1));\r
-        Dns6CacheEntry->IpAddress = AllocateZeroPool (sizeof (EFI_IPv6_ADDRESS));\r
-        if (Dns6CacheEntry->IpAddress == NULL) {\r
-          Status = EFI_OUT_OF_RESOURCES;\r
-          goto ON_EXIT;\r
-        }\r
-        CopyMem (Dns6CacheEntry->IpAddress, AnswerData, sizeof (EFI_IPv6_ADDRESS));\r
+          IpCount++;\r
+          Status = EFI_SUCCESS;\r
+          break;\r
+        case DNS_TYPE_AAAA:\r
+          //\r
+          // This is address entry, get Data.\r
+          //\r
+          ASSERT (Dns6TokenEntry != NULL);\r
 \r
-        if (CNameTtl != 0 && AnswerSection->Ttl != 0) {\r
-          Dns6CacheEntry->Timeout = MIN (CNameTtl, AnswerSection->Ttl);\r
-        } else {\r
-          Dns6CacheEntry->Timeout = MAX (CNameTtl, AnswerSection->Ttl);\r
-        }\r
+          if (AnswerSection->DataLength != 16) {\r
+            Status = EFI_ABORTED;\r
+            goto ON_EXIT;\r
+          }\r
 \r
-        UpdateDns6Cache (&mDriverData->Dns6CacheList, FALSE, TRUE, *Dns6CacheEntry);\r
+          HostAddr6  = Dns6TokenEntry->Token->RspData.H2AData->IpList;\r
+          AnswerData = (UINT8 *)AnswerSection + sizeof (*AnswerSection);\r
+          CopyMem (&HostAddr6[IpCount], AnswerData, sizeof (EFI_IPv6_ADDRESS));\r
 \r
-        //\r
-        // Free allocated CacheEntry pool.\r
-        //\r
-        FreePool (Dns6CacheEntry->HostName);\r
-        Dns6CacheEntry->HostName = NULL;\r
+          //\r
+          // Allocate new CacheEntry pool to update DNS cache dynamically.\r
+          //\r
+          Dns6CacheEntry = AllocateZeroPool (sizeof (EFI_DNS6_CACHE_ENTRY));\r
+          if (Dns6CacheEntry == NULL) {\r
+            Status = EFI_OUT_OF_RESOURCES;\r
+            goto ON_EXIT;\r
+          }\r
 \r
-        FreePool (Dns6CacheEntry->IpAddress);\r
-        Dns6CacheEntry->IpAddress = NULL;\r
+          Dns6CacheEntry->HostName = AllocateZeroPool (2 * (StrLen (Dns6TokenEntry->QueryHostName) + 1));\r
+          if (Dns6CacheEntry->HostName == NULL) {\r
+            Status = EFI_OUT_OF_RESOURCES;\r
+            goto ON_EXIT;\r
+          }\r
 \r
-        FreePool (Dns6CacheEntry);\r
-        Dns6CacheEntry = NULL;\r
+          CopyMem (Dns6CacheEntry->HostName, Dns6TokenEntry->QueryHostName, 2 * (StrLen (Dns6TokenEntry->QueryHostName) + 1));\r
+          Dns6CacheEntry->IpAddress = AllocateZeroPool (sizeof (EFI_IPv6_ADDRESS));\r
+          if (Dns6CacheEntry->IpAddress == NULL) {\r
+            Status = EFI_OUT_OF_RESOURCES;\r
+            goto ON_EXIT;\r
+          }\r
 \r
-        IpCount ++;\r
-        Status = EFI_SUCCESS;\r
-        break;\r
-      case DNS_TYPE_CNAME:\r
-        //\r
-        // According RFC 1034 - 3.6.2, if the query name is an alias, the name server will include the CNAME\r
-        // record in the response and restart the query at the domain name specified in the data field of the\r
-        // CNAME record. So, just record the TTL value of the CNAME, then skip to parse the next record.\r
-        //\r
-        CNameTtl = AnswerSection->Ttl;\r
-        break;\r
-      default:\r
-        Status = EFI_UNSUPPORTED;\r
-        goto ON_EXIT;\r
+          CopyMem (Dns6CacheEntry->IpAddress, AnswerData, sizeof (EFI_IPv6_ADDRESS));\r
+\r
+          if ((CNameTtl != 0) && (AnswerSection->Ttl != 0)) {\r
+            Dns6CacheEntry->Timeout = MIN (CNameTtl, AnswerSection->Ttl);\r
+          } else {\r
+            Dns6CacheEntry->Timeout = MAX (CNameTtl, AnswerSection->Ttl);\r
+          }\r
+\r
+          UpdateDns6Cache (&mDriverData->Dns6CacheList, FALSE, TRUE, *Dns6CacheEntry);\r
+\r
+          //\r
+          // Free allocated CacheEntry pool.\r
+          //\r
+          FreePool (Dns6CacheEntry->HostName);\r
+          Dns6CacheEntry->HostName = NULL;\r
+\r
+          FreePool (Dns6CacheEntry->IpAddress);\r
+          Dns6CacheEntry->IpAddress = NULL;\r
+\r
+          FreePool (Dns6CacheEntry);\r
+          Dns6CacheEntry = NULL;\r
+\r
+          IpCount++;\r
+          Status = EFI_SUCCESS;\r
+          break;\r
+        case DNS_TYPE_CNAME:\r
+          //\r
+          // According RFC 1034 - 3.6.2, if the query name is an alias, the name server will include the CNAME\r
+          // record in the response and restart the query at the domain name specified in the data field of the\r
+          // CNAME record. So, just record the TTL value of the CNAME, then skip to parse the next record.\r
+          //\r
+          CNameTtl = AnswerSection->Ttl;\r
+          break;\r
+        default:\r
+          Status = EFI_UNSUPPORTED;\r
+          goto ON_EXIT;\r
       }\r
     }\r
 \r
     //\r
     // Find next one\r
     //\r
-    AnswerName = (CHAR8 *) AnswerSection + sizeof (*AnswerSection) + AnswerSection->DataLength;\r
-    AnswerSectionNum ++;\r
+    AnswerName = (CHAR8 *)AnswerSection + sizeof (*AnswerSection) + AnswerSection->DataLength;\r
+    AnswerSectionNum++;\r
   }\r
 \r
   if (Instance->Service->IpVersion == IP_VERSION_4) {\r
@@ -1646,8 +1669,8 @@ ON_COMPLETE:
   //\r
   // Parsing is complete, free the sending packet and signal Event here.\r
   //\r
-  if (Item != NULL && Item->Value != NULL) {\r
-    NetbufFree ((NET_BUF *) (Item->Value));\r
+  if ((Item != NULL) && (Item->Value != NULL)) {\r
+    NetbufFree ((NET_BUF *)(Item->Value));\r
   }\r
 \r
   if (Instance->Service->IpVersion == IP_VERSION_4) {\r
@@ -1678,7 +1701,7 @@ ON_EXIT:
         if (Dns4TokenEntry->Token->RspData.GLookupData != NULL) {\r
           if (Dns4TokenEntry->Token->RspData.GLookupData->RRList != NULL) {\r
             while (RRCount != 0) {\r
-              RRCount --;\r
+              RRCount--;\r
               if (Dns4TokenEntry->Token->RspData.GLookupData->RRList[RRCount].QName != NULL) {\r
                 FreePool (Dns4TokenEntry->Token->RspData.GLookupData->RRList[RRCount].QName);\r
               }\r
@@ -1694,7 +1717,7 @@ ON_EXIT:
           FreePool (Dns4TokenEntry->Token->RspData.GLookupData);\r
         }\r
       } else {\r
-        if (QuerySection->Type == DNS_TYPE_A && Dns4TokenEntry->Token->RspData.H2AData != NULL) {\r
+        if ((QuerySection->Type == DNS_TYPE_A) && (Dns4TokenEntry->Token->RspData.H2AData != NULL)) {\r
           if (Dns4TokenEntry->Token->RspData.H2AData->IpList != NULL) {\r
             FreePool (Dns4TokenEntry->Token->RspData.H2AData->IpList);\r
           }\r
@@ -1710,7 +1733,7 @@ ON_EXIT:
         if (Dns6TokenEntry->Token->RspData.GLookupData != NULL) {\r
           if (Dns6TokenEntry->Token->RspData.GLookupData->RRList != NULL) {\r
             while (RRCount != 0) {\r
-              RRCount --;\r
+              RRCount--;\r
               if (Dns6TokenEntry->Token->RspData.GLookupData->RRList[RRCount].QName != NULL) {\r
                 FreePool (Dns6TokenEntry->Token->RspData.GLookupData->RRList[RRCount].QName);\r
               }\r
@@ -1726,7 +1749,7 @@ ON_EXIT:
           FreePool (Dns6TokenEntry->Token->RspData.GLookupData);\r
         }\r
       } else {\r
-        if (QuerySection->Type == DNS_TYPE_AAAA && Dns6TokenEntry->Token->RspData.H2AData != NULL) {\r
+        if ((QuerySection->Type == DNS_TYPE_AAAA) && (Dns6TokenEntry->Token->RspData.H2AData != NULL)) {\r
           if (Dns6TokenEntry->Token->RspData.H2AData->IpList != NULL) {\r
             FreePool (Dns6TokenEntry->Token->RspData.H2AData->IpList);\r
           }\r
@@ -1778,20 +1801,20 @@ ON_EXIT:
 VOID\r
 EFIAPI\r
 DnsOnPacketReceived (\r
-  NET_BUF                   *Packet,\r
-  UDP_END_POINT             *EndPoint,\r
-  EFI_STATUS                IoStatus,\r
-  VOID                      *Context\r
+  NET_BUF        *Packet,\r
+  UDP_END_POINT  *EndPoint,\r
+  EFI_STATUS     IoStatus,\r
+  VOID           *Context\r
   )\r
 {\r
-  DNS_INSTANCE              *Instance;\r
+  DNS_INSTANCE  *Instance;\r
 \r
-  UINT8                     *RcvString;\r
-  UINT32                    Len;\r
+  UINT8   *RcvString;\r
+  UINT32  Len;\r
 \r
-  BOOLEAN                   Completed;\r
+  BOOLEAN  Completed;\r
 \r
-  Instance  = (DNS_INSTANCE *) Context;\r
+  Instance = (DNS_INSTANCE *)Context;\r
   NET_CHECK_SIGNATURE (Instance, DNS_INSTANCE_SIGNATURE);\r
 \r
   RcvString = NULL;\r
@@ -1836,29 +1859,29 @@ ON_EXIT:
 VOID\r
 EFIAPI\r
 DnsOnPacketSent (\r
-  NET_BUF                   *Packet,\r
-  UDP_END_POINT             *EndPoint,\r
-  EFI_STATUS                IoStatus,\r
-  VOID                      *Context\r
+  NET_BUF        *Packet,\r
+  UDP_END_POINT  *EndPoint,\r
+  EFI_STATUS     IoStatus,\r
+  VOID           *Context\r
   )\r
 {\r
-  DNS_INSTANCE              *Instance;\r
-  LIST_ENTRY                *Entry;\r
-  NET_MAP_ITEM              *Item;\r
-  DNS4_TOKEN_ENTRY          *Dns4TokenEntry;\r
-  DNS6_TOKEN_ENTRY          *Dns6TokenEntry;\r
+  DNS_INSTANCE      *Instance;\r
+  LIST_ENTRY        *Entry;\r
+  NET_MAP_ITEM      *Item;\r
+  DNS4_TOKEN_ENTRY  *Dns4TokenEntry;\r
+  DNS6_TOKEN_ENTRY  *Dns6TokenEntry;\r
 \r
   Dns4TokenEntry = NULL;\r
   Dns6TokenEntry = NULL;\r
 \r
-  Instance  = (DNS_INSTANCE *) Context;\r
+  Instance = (DNS_INSTANCE *)Context;\r
   NET_CHECK_SIGNATURE (Instance, DNS_INSTANCE_SIGNATURE);\r
 \r
   if (Instance->Service->IpVersion == IP_VERSION_4) {\r
     NET_LIST_FOR_EACH (Entry, &Instance->Dns4TxTokens.Used) {\r
       Item = NET_LIST_USER_STRUCT (Entry, NET_MAP_ITEM, Link);\r
       if (Packet == (NET_BUF *)(Item->Value)) {\r
-        Dns4TokenEntry = ((DNS4_TOKEN_ENTRY *)Item->Key);\r
+        Dns4TokenEntry               = ((DNS4_TOKEN_ENTRY *)Item->Key);\r
         Dns4TokenEntry->PacketToLive = Dns4TokenEntry->Token->RetryInterval;\r
         break;\r
       }\r
@@ -1867,7 +1890,7 @@ DnsOnPacketSent (
     NET_LIST_FOR_EACH (Entry, &Instance->Dns6TxTokens.Used) {\r
       Item = NET_LIST_USER_STRUCT (Entry, NET_MAP_ITEM, Link);\r
       if (Packet == (NET_BUF *)(Item->Value)) {\r
-        Dns6TokenEntry = ((DNS6_TOKEN_ENTRY *)Item->Key);\r
+        Dns6TokenEntry               = ((DNS6_TOKEN_ENTRY *)Item->Key);\r
         Dns6TokenEntry->PacketToLive = Dns6TokenEntry->Token->RetryInterval;\r
         break;\r
       }\r
@@ -1889,11 +1912,11 @@ DnsOnPacketSent (
 **/\r
 EFI_STATUS\r
 DoDnsQuery (\r
-  IN  DNS_INSTANCE              *Instance,\r
-  IN  NET_BUF                   *Packet\r
+  IN  DNS_INSTANCE  *Instance,\r
+  IN  NET_BUF       *Packet\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Ready to receive the DNS response.\r
@@ -1930,16 +1953,16 @@ DoDnsQuery (
 **/\r
 EFI_STATUS\r
 ConstructDNSQuery (\r
-  IN  DNS_INSTANCE              *Instance,\r
-  IN  CHAR8                     *QueryName,\r
-  IN  UINT16                    Type,\r
-  IN  UINT16                    Class,\r
-  OUT NET_BUF                   **Packet\r
+  IN  DNS_INSTANCE  *Instance,\r
+  IN  CHAR8         *QueryName,\r
+  IN  UINT16        Type,\r
+  IN  UINT16        Class,\r
+  OUT NET_BUF       **Packet\r
   )\r
 {\r
-  NET_FRAGMENT        Frag;\r
-  DNS_HEADER          *DnsHeader;\r
-  DNS_QUERY_SECTION   *DnsQuery;\r
+  NET_FRAGMENT       Frag;\r
+  DNS_HEADER         *DnsHeader;\r
+  DNS_QUERY_SECTION  *DnsQuery;\r
 \r
   //\r
   // Messages carried by UDP are restricted to 512 bytes (not counting the IP\r
@@ -1953,23 +1976,23 @@ ConstructDNSQuery (
   //\r
   // Fill header\r
   //\r
-  DnsHeader = (DNS_HEADER *) Frag.Bulk;\r
-  DnsHeader->Identification = (UINT16)NET_RANDOM (NetRandomInitSeed());\r
-  DnsHeader->Flags.Uint16 = 0x0000;\r
-  DnsHeader->Flags.Bits.RD = 1;\r
+  DnsHeader                    = (DNS_HEADER *)Frag.Bulk;\r
+  DnsHeader->Identification    = (UINT16)NET_RANDOM (NetRandomInitSeed ());\r
+  DnsHeader->Flags.Uint16      = 0x0000;\r
+  DnsHeader->Flags.Bits.RD     = 1;\r
   DnsHeader->Flags.Bits.OpCode = DNS_FLAGS_OPCODE_STANDARD;\r
-  DnsHeader->Flags.Bits.QR = DNS_FLAGS_QR_QUERY;\r
-  DnsHeader->QuestionsNum = 1;\r
-  DnsHeader->AnswersNum = 0;\r
-  DnsHeader->AuthorityNum = 0;\r
-  DnsHeader->AditionalNum = 0;\r
+  DnsHeader->Flags.Bits.QR     = DNS_FLAGS_QR_QUERY;\r
+  DnsHeader->QuestionsNum      = 1;\r
+  DnsHeader->AnswersNum        = 0;\r
+  DnsHeader->AuthorityNum      = 0;\r
+  DnsHeader->AditionalNum      = 0;\r
 \r
   DnsHeader->Identification = HTONS (DnsHeader->Identification);\r
-  DnsHeader->Flags.Uint16 = HTONS (DnsHeader->Flags.Uint16);\r
-  DnsHeader->QuestionsNum = HTONS (DnsHeader->QuestionsNum);\r
-  DnsHeader->AnswersNum = HTONS (DnsHeader->AnswersNum);\r
-  DnsHeader->AuthorityNum = HTONS (DnsHeader->AuthorityNum);\r
-  DnsHeader->AditionalNum = HTONS (DnsHeader->AditionalNum);\r
+  DnsHeader->Flags.Uint16   = HTONS (DnsHeader->Flags.Uint16);\r
+  DnsHeader->QuestionsNum   = HTONS (DnsHeader->QuestionsNum);\r
+  DnsHeader->AnswersNum     = HTONS (DnsHeader->AnswersNum);\r
+  DnsHeader->AuthorityNum   = HTONS (DnsHeader->AuthorityNum);\r
+  DnsHeader->AditionalNum   = HTONS (DnsHeader->AditionalNum);\r
 \r
   Frag.Len = sizeof (*DnsHeader);\r
 \r
@@ -1977,16 +2000,16 @@ ConstructDNSQuery (
   // Fill Query name\r
   //\r
   CopyMem (Frag.Bulk + Frag.Len, QueryName, AsciiStrLen (QueryName));\r
-  Frag.Len = (UINT32) (Frag.Len + AsciiStrLen (QueryName));\r
+  Frag.Len                = (UINT32)(Frag.Len + AsciiStrLen (QueryName));\r
   *(Frag.Bulk + Frag.Len) = 0;\r
-  Frag.Len ++;\r
+  Frag.Len++;\r
 \r
   //\r
   // Rest query section\r
   //\r
-  DnsQuery = (DNS_QUERY_SECTION *) (Frag.Bulk + Frag.Len);\r
+  DnsQuery = (DNS_QUERY_SECTION *)(Frag.Bulk + Frag.Len);\r
 \r
-  DnsQuery->Type = HTONS (Type);\r
+  DnsQuery->Type  = HTONS (Type);\r
   DnsQuery->Class = HTONS (Class);\r
 \r
   Frag.Len += sizeof (*DnsQuery);\r
@@ -2003,7 +2026,7 @@ ConstructDNSQuery (
   //\r
   // Store the UdpIo in ProtoData.\r
   //\r
-  *((UINTN *) &((*Packet)->ProtoData[0])) = (UINTN) (Instance->UdpIo);\r
+  *((UINTN *)&((*Packet)->ProtoData[0])) = (UINTN)(Instance->UdpIo);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -2020,13 +2043,13 @@ ConstructDNSQuery (
 **/\r
 EFI_STATUS\r
 DnsRetransmit (\r
-  IN DNS_INSTANCE        *Instance,\r
-  IN NET_BUF             *Packet\r
+  IN DNS_INSTANCE  *Instance,\r
+  IN NET_BUF       *Packet\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
+  EFI_STATUS  Status;\r
 \r
-  UINT8           *Buffer;\r
+  UINT8  *Buffer;\r
 \r
   ASSERT (Packet != NULL);\r
 \r
@@ -2064,26 +2087,25 @@ DnsRetransmit (
 VOID\r
 EFIAPI\r
 DnsOnTimerRetransmit (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  DNS_SERVICE                *Service;\r
+  DNS_SERVICE  *Service;\r
 \r
-  LIST_ENTRY                 *Entry;\r
-  LIST_ENTRY                 *Next;\r
+  LIST_ENTRY  *Entry;\r
+  LIST_ENTRY  *Next;\r
 \r
-  DNS_INSTANCE               *Instance;\r
-  LIST_ENTRY                 *EntryNetMap;\r
-  NET_MAP_ITEM               *ItemNetMap;\r
-  DNS4_TOKEN_ENTRY           *Dns4TokenEntry;\r
-  DNS6_TOKEN_ENTRY           *Dns6TokenEntry;\r
+  DNS_INSTANCE      *Instance;\r
+  LIST_ENTRY        *EntryNetMap;\r
+  NET_MAP_ITEM      *ItemNetMap;\r
+  DNS4_TOKEN_ENTRY  *Dns4TokenEntry;\r
+  DNS6_TOKEN_ENTRY  *Dns6TokenEntry;\r
 \r
   Dns4TokenEntry = NULL;\r
   Dns6TokenEntry = NULL;\r
 \r
-  Service = (DNS_SERVICE *) Context;\r
-\r
+  Service = (DNS_SERVICE *)Context;\r
 \r
   if (Service->IpVersion == IP_VERSION_4) {\r
     //\r
@@ -2095,9 +2117,9 @@ DnsOnTimerRetransmit (
 \r
       EntryNetMap = Instance->Dns4TxTokens.Used.ForwardLink;\r
       while (EntryNetMap != &Instance->Dns4TxTokens.Used) {\r
-        ItemNetMap = NET_LIST_USER_STRUCT (EntryNetMap, NET_MAP_ITEM, Link);\r
+        ItemNetMap     = NET_LIST_USER_STRUCT (EntryNetMap, NET_MAP_ITEM, Link);\r
         Dns4TokenEntry = (DNS4_TOKEN_ENTRY *)(ItemNetMap->Key);\r
-        if (Dns4TokenEntry->PacketToLive == 0 || (--Dns4TokenEntry->PacketToLive > 0)) {\r
+        if ((Dns4TokenEntry->PacketToLive == 0) || (--Dns4TokenEntry->PacketToLive > 0)) {\r
           EntryNetMap = EntryNetMap->ForwardLink;\r
           continue;\r
         }\r
@@ -2139,9 +2161,9 @@ DnsOnTimerRetransmit (
 \r
       EntryNetMap = Instance->Dns6TxTokens.Used.ForwardLink;\r
       while (EntryNetMap != &Instance->Dns6TxTokens.Used) {\r
-        ItemNetMap = NET_LIST_USER_STRUCT (EntryNetMap, NET_MAP_ITEM, Link);\r
-        Dns6TokenEntry = (DNS6_TOKEN_ENTRY *) (ItemNetMap->Key);\r
-        if (Dns6TokenEntry->PacketToLive == 0 || (--Dns6TokenEntry->PacketToLive > 0)) {\r
+        ItemNetMap     = NET_LIST_USER_STRUCT (EntryNetMap, NET_MAP_ITEM, Link);\r
+        Dns6TokenEntry = (DNS6_TOKEN_ENTRY *)(ItemNetMap->Key);\r
+        if ((Dns6TokenEntry->PacketToLive == 0) || (--Dns6TokenEntry->PacketToLive > 0)) {\r
           EntryNetMap = EntryNetMap->ForwardLink;\r
           continue;\r
         }\r
@@ -2151,7 +2173,7 @@ DnsOnTimerRetransmit (
         // otherwise exit the transfer.\r
         //\r
         if (++Dns6TokenEntry->RetryCounting <= Dns6TokenEntry->Token->RetryCount) {\r
-          DnsRetransmit (Instance, (NET_BUF *) ItemNetMap->Value);\r
+          DnsRetransmit (Instance, (NET_BUF *)ItemNetMap->Value);\r
           EntryNetMap = EntryNetMap->ForwardLink;\r
         } else {\r
           //\r
@@ -2166,7 +2188,7 @@ DnsOnTimerRetransmit (
           // Free the sending packet.\r
           //\r
           if (ItemNetMap->Value != NULL) {\r
-            NetbufFree ((NET_BUF *) (ItemNetMap->Value));\r
+            NetbufFree ((NET_BUF *)(ItemNetMap->Value));\r
           }\r
 \r
           EntryNetMap = Instance->Dns6TxTokens.Used.ForwardLink;\r
@@ -2186,14 +2208,14 @@ DnsOnTimerRetransmit (
 VOID\r
 EFIAPI\r
 DnsOnTimerUpdate (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  LIST_ENTRY                 *Entry;\r
-  LIST_ENTRY                 *Next;\r
-  DNS4_CACHE                 *Item4;\r
-  DNS6_CACHE                 *Item6;\r
+  LIST_ENTRY  *Entry;\r
+  LIST_ENTRY  *Next;\r
+  DNS4_CACHE  *Item4;\r
+  DNS6_CACHE  *Item6;\r
 \r
   Item4 = NULL;\r
   Item6 = NULL;\r
@@ -2242,4 +2264,3 @@ DnsOnTimerUpdate (
     }\r
   }\r
 }\r
-\r
index affbb4be8ded3d87a5d13112a552da8f46a4a3e6..c57a6747d216abb19b5ea9cd93d6f13d1f5e6d8a 100644 (file)
@@ -70,110 +70,109 @@ extern EFI_DNS6_PROTOCOL             mDns6Protocol;
 //\r
 // DNS related\r
 //\r
-#define DNS_SERVER_PORT   53\r
+#define DNS_SERVER_PORT  53\r
 \r
-#define DNS_PROTOCOL_UDP   EFI_IP_PROTO_UDP\r
-#define DNS_PROTOCOL_TCP   EFI_IP_PROTO_TCP\r
+#define DNS_PROTOCOL_UDP  EFI_IP_PROTO_UDP\r
+#define DNS_PROTOCOL_TCP  EFI_IP_PROTO_TCP\r
 \r
-#define DNS_STATE_UNCONFIGED     0\r
-#define DNS_STATE_CONFIGED       1\r
-#define DNS_STATE_DESTROY        2\r
+#define DNS_STATE_UNCONFIGED  0\r
+#define DNS_STATE_CONFIGED    1\r
+#define DNS_STATE_DESTROY     2\r
 \r
-#define DNS_DEFAULT_TIMEOUT      2\r
+#define DNS_DEFAULT_TIMEOUT  2\r
 \r
-#define DNS_TIME_TO_GETMAP       5\r
+#define DNS_TIME_TO_GETMAP  5\r
 \r
 #pragma pack(1)\r
 \r
-typedef union _DNS_FLAGS  DNS_FLAGS;\r
+typedef union _DNS_FLAGS DNS_FLAGS;\r
 \r
 typedef struct {\r
-  LIST_ENTRY             AllCacheLink;\r
-  EFI_DNS4_CACHE_ENTRY   DnsCache;\r
+  LIST_ENTRY              AllCacheLink;\r
+  EFI_DNS4_CACHE_ENTRY    DnsCache;\r
 } DNS4_CACHE;\r
 \r
 typedef struct {\r
-  LIST_ENTRY             AllCacheLink;\r
-  EFI_DNS6_CACHE_ENTRY   DnsCache;\r
+  LIST_ENTRY              AllCacheLink;\r
+  EFI_DNS6_CACHE_ENTRY    DnsCache;\r
 } DNS6_CACHE;\r
 \r
 typedef struct {\r
-  LIST_ENTRY             AllServerLink;\r
-  EFI_IPv4_ADDRESS       Dns4ServerIp;\r
+  LIST_ENTRY          AllServerLink;\r
+  EFI_IPv4_ADDRESS    Dns4ServerIp;\r
 } DNS4_SERVER_IP;\r
 \r
 typedef struct {\r
-  LIST_ENTRY             AllServerLink;\r
-  EFI_IPv6_ADDRESS       Dns6ServerIp;\r
+  LIST_ENTRY          AllServerLink;\r
+  EFI_IPv6_ADDRESS    Dns6ServerIp;\r
 } DNS6_SERVER_IP;\r
 \r
 typedef struct {\r
-  UINT32                     RetryCounting;\r
-  UINT32                     PacketToLive;\r
-  CHAR16                     *QueryHostName;\r
-  EFI_IPv4_ADDRESS           QueryIpAddress;\r
-  BOOLEAN                    GeneralLookUp;\r
-  EFI_DNS4_COMPLETION_TOKEN  *Token;\r
+  UINT32                       RetryCounting;\r
+  UINT32                       PacketToLive;\r
+  CHAR16                       *QueryHostName;\r
+  EFI_IPv4_ADDRESS             QueryIpAddress;\r
+  BOOLEAN                      GeneralLookUp;\r
+  EFI_DNS4_COMPLETION_TOKEN    *Token;\r
 } DNS4_TOKEN_ENTRY;\r
 \r
 typedef struct {\r
-  UINT32                     RetryCounting;\r
-  UINT32                     PacketToLive;\r
-  CHAR16                     *QueryHostName;\r
-  EFI_IPv6_ADDRESS           QueryIpAddress;\r
-  BOOLEAN                    GeneralLookUp;\r
-  EFI_DNS6_COMPLETION_TOKEN  *Token;\r
+  UINT32                       RetryCounting;\r
+  UINT32                       PacketToLive;\r
+  CHAR16                       *QueryHostName;\r
+  EFI_IPv6_ADDRESS             QueryIpAddress;\r
+  BOOLEAN                      GeneralLookUp;\r
+  EFI_DNS6_COMPLETION_TOKEN    *Token;\r
 } DNS6_TOKEN_ENTRY;\r
 \r
 union _DNS_FLAGS {\r
   struct {\r
-    UINT16     RCode:4;\r
-    UINT16     Zero:3;\r
-    UINT16     RA:1;\r
-    UINT16     RD:1;\r
-    UINT16     TC:1;\r
-    UINT16     AA:1;\r
-    UINT16     OpCode:4;\r
-    UINT16     QR:1;\r
+    UINT16    RCode  : 4;\r
+    UINT16    Zero   : 3;\r
+    UINT16    RA     : 1;\r
+    UINT16    RD     : 1;\r
+    UINT16    TC     : 1;\r
+    UINT16    AA     : 1;\r
+    UINT16    OpCode : 4;\r
+    UINT16    QR     : 1;\r
   } Bits;\r
-  UINT16  Uint16;\r
+  UINT16    Uint16;\r
 };\r
 \r
 #define DNS_FLAGS_QR_QUERY     0\r
 #define DNS_FLAGS_QR_RESPONSE  1\r
 \r
-#define DNS_FLAGS_OPCODE_STANDARD     0\r
-#define DNS_FLAGS_OPCODE_INVERSE      1\r
-#define DNS_FLAGS_OPCODE_SERVER_STATE 2\r
+#define DNS_FLAGS_OPCODE_STANDARD      0\r
+#define DNS_FLAGS_OPCODE_INVERSE       1\r
+#define DNS_FLAGS_OPCODE_SERVER_STATE  2\r
 \r
 #define DNS_FLAGS_RCODE_NO_ERROR    0\r
 #define DNS_FLAGS_RCODE_NAME_ERROR  3\r
 \r
 typedef struct {\r
-  UINT16      Identification;\r
-  DNS_FLAGS   Flags;\r
-  UINT16      QuestionsNum;\r
-  UINT16      AnswersNum;\r
-  UINT16      AuthorityNum;\r
-  UINT16      AditionalNum;\r
+  UINT16       Identification;\r
+  DNS_FLAGS    Flags;\r
+  UINT16       QuestionsNum;\r
+  UINT16       AnswersNum;\r
+  UINT16       AuthorityNum;\r
+  UINT16       AditionalNum;\r
 } DNS_HEADER;\r
 \r
 typedef struct {\r
-  UINT16      Type;\r
-  UINT16      Class;\r
+  UINT16    Type;\r
+  UINT16    Class;\r
 } DNS_QUERY_SECTION;\r
 \r
 typedef struct {\r
-  UINT16      Type;\r
-  UINT16      Class;\r
-  UINT32      Ttl;\r
-  UINT16      DataLength;\r
+  UINT16    Type;\r
+  UINT16    Class;\r
+  UINT32    Ttl;\r
+  UINT16    DataLength;\r
 } DNS_ANSWER_SECTION;\r
 \r
 #define DNS4_DOMAIN  L"in-addr.arpa"\r
 #define DNS6_DOMAIN  L"IP6.ARPA"\r
 \r
-\r
 #pragma pack()\r
 \r
 /**\r
@@ -188,8 +187,8 @@ typedef struct {
 **/\r
 EFI_STATUS\r
 Dns4RemoveTokenEntry (\r
-  IN NET_MAP                    *TokenMap,\r
-  IN DNS4_TOKEN_ENTRY           *TokenEntry\r
+  IN NET_MAP           *TokenMap,\r
+  IN DNS4_TOKEN_ENTRY  *TokenEntry\r
   );\r
 \r
 /**\r
@@ -204,8 +203,8 @@ Dns4RemoveTokenEntry (
 **/\r
 EFI_STATUS\r
 Dns6RemoveTokenEntry (\r
-  IN NET_MAP                    *TokenMap,\r
-  IN DNS6_TOKEN_ENTRY           *TokenEntry\r
+  IN NET_MAP           *TokenMap,\r
+  IN DNS6_TOKEN_ENTRY  *TokenEntry\r
   );\r
 \r
 /**\r
@@ -270,9 +269,9 @@ Dns6CancelTokens (
 EFI_STATUS\r
 EFIAPI\r
 GetDns4TokenEntry (\r
-  IN     NET_MAP                   *TokensMap,\r
-  IN     EFI_DNS4_COMPLETION_TOKEN *Token,\r
-     OUT DNS4_TOKEN_ENTRY          **TokenEntry\r
+  IN     NET_MAP                    *TokensMap,\r
+  IN     EFI_DNS4_COMPLETION_TOKEN  *Token,\r
+  OUT DNS4_TOKEN_ENTRY              **TokenEntry\r
   );\r
 \r
 /**\r
@@ -289,9 +288,9 @@ GetDns4TokenEntry (
 EFI_STATUS\r
 EFIAPI\r
 GetDns6TokenEntry (\r
-  IN     NET_MAP                   *TokensMap,\r
-  IN     EFI_DNS6_COMPLETION_TOKEN *Token,\r
-     OUT DNS6_TOKEN_ENTRY          **TokenEntry\r
+  IN     NET_MAP                    *TokensMap,\r
+  IN     EFI_DNS6_COMPLETION_TOKEN  *Token,\r
+  OUT DNS6_TOKEN_ENTRY              **TokenEntry\r
   );\r
 \r
 /**\r
@@ -395,7 +394,7 @@ Dns6CopyConfigure (
 VOID\r
 EFIAPI\r
 DnsDummyExtFree (\r
-  IN VOID                   *Arg\r
+  IN VOID  *Arg\r
   );\r
 \r
 /**\r
@@ -415,9 +414,9 @@ DnsDummyExtFree (
 **/\r
 BOOLEAN\r
 Dns4GetMapping (\r
-  IN DNS_INSTANCE           *Instance,\r
-  IN UDP_IO                 *UdpIo,\r
-  IN EFI_UDP4_CONFIG_DATA   *UdpCfgData\r
+  IN DNS_INSTANCE          *Instance,\r
+  IN UDP_IO                *UdpIo,\r
+  IN EFI_UDP4_CONFIG_DATA  *UdpCfgData\r
   );\r
 \r
 /**\r
@@ -434,9 +433,9 @@ Dns4GetMapping (
 **/\r
 BOOLEAN\r
 Dns6GetMapping (\r
-  IN DNS_INSTANCE           *Instance,\r
-  IN UDP_IO                 *UdpIo,\r
-  IN EFI_UDP6_CONFIG_DATA   *UdpCfgData\r
+  IN DNS_INSTANCE          *Instance,\r
+  IN UDP_IO                *UdpIo,\r
+  IN EFI_UDP6_CONFIG_DATA  *UdpCfgData\r
   );\r
 \r
 /**\r
@@ -451,8 +450,8 @@ Dns6GetMapping (
 **/\r
 EFI_STATUS\r
 Dns4ConfigUdp (\r
-  IN DNS_INSTANCE           *Instance,\r
-  IN UDP_IO                 *UdpIo\r
+  IN DNS_INSTANCE  *Instance,\r
+  IN UDP_IO        *UdpIo\r
   );\r
 \r
 /**\r
@@ -467,8 +466,8 @@ Dns4ConfigUdp (
 **/\r
 EFI_STATUS\r
 Dns6ConfigUdp (\r
-  IN DNS_INSTANCE           *Instance,\r
-  IN UDP_IO                 *UdpIo\r
+  IN DNS_INSTANCE  *Instance,\r
+  IN UDP_IO        *UdpIo\r
   );\r
 \r
 /**\r
@@ -488,10 +487,10 @@ Dns6ConfigUdp (
 EFI_STATUS\r
 EFIAPI\r
 UpdateDns4Cache (\r
-  IN LIST_ENTRY             *Dns4CacheList,\r
-  IN BOOLEAN                DeleteFlag,\r
-  IN BOOLEAN                Override,\r
-  IN EFI_DNS4_CACHE_ENTRY   DnsCacheEntry\r
+  IN LIST_ENTRY            *Dns4CacheList,\r
+  IN BOOLEAN               DeleteFlag,\r
+  IN BOOLEAN               Override,\r
+  IN EFI_DNS4_CACHE_ENTRY  DnsCacheEntry\r
   );\r
 \r
 /**\r
@@ -510,10 +509,10 @@ UpdateDns4Cache (
 EFI_STATUS\r
 EFIAPI\r
 UpdateDns6Cache (\r
-  IN LIST_ENTRY             *Dns6CacheList,\r
-  IN BOOLEAN                DeleteFlag,\r
-  IN BOOLEAN                Override,\r
-  IN EFI_DNS6_CACHE_ENTRY   DnsCacheEntry\r
+  IN LIST_ENTRY            *Dns6CacheList,\r
+  IN BOOLEAN               DeleteFlag,\r
+  IN BOOLEAN               Override,\r
+  IN EFI_DNS6_CACHE_ENTRY  DnsCacheEntry\r
   );\r
 \r
 /**\r
@@ -529,8 +528,8 @@ UpdateDns6Cache (
 EFI_STATUS\r
 EFIAPI\r
 AddDns4ServerIp (\r
-  IN LIST_ENTRY                *Dns4ServerList,\r
-  IN EFI_IPv4_ADDRESS           ServerIp\r
+  IN LIST_ENTRY        *Dns4ServerList,\r
+  IN EFI_IPv4_ADDRESS  ServerIp\r
   );\r
 \r
 /**\r
@@ -546,8 +545,8 @@ AddDns4ServerIp (
 EFI_STATUS\r
 EFIAPI\r
 AddDns6ServerIp (\r
-  IN LIST_ENTRY                *Dns6ServerList,\r
-  IN EFI_IPv6_ADDRESS           ServerIp\r
+  IN LIST_ENTRY        *Dns6ServerList,\r
+  IN EFI_IPv6_ADDRESS  ServerIp\r
   );\r
 \r
 /**\r
@@ -565,11 +564,11 @@ AddDns6ServerIp (
 **/\r
 BOOLEAN\r
 IsValidDnsResponse (\r
-  IN     NET_MAP      *TokensMap,\r
-  IN     UINT16       Identification,\r
-  IN     UINT16       Type,\r
-  IN     UINT16       Class,\r
-     OUT NET_MAP_ITEM **Item\r
+  IN     NET_MAP    *TokensMap,\r
+  IN     UINT16     Identification,\r
+  IN     UINT16     Type,\r
+  IN     UINT16     Class,\r
+  OUT NET_MAP_ITEM  **Item\r
   );\r
 \r
 /**\r
@@ -586,10 +585,10 @@ IsValidDnsResponse (
 **/\r
 EFI_STATUS\r
 ParseDnsResponse (\r
-  IN OUT DNS_INSTANCE              *Instance,\r
-  IN     UINT8                     *RxString,\r
-  IN     UINT32                    Length,\r
-     OUT BOOLEAN                   *Completed\r
+  IN OUT DNS_INSTANCE  *Instance,\r
+  IN     UINT8         *RxString,\r
+  IN     UINT32        Length,\r
+  OUT BOOLEAN          *Completed\r
   );\r
 \r
 /**\r
@@ -604,10 +603,10 @@ ParseDnsResponse (
 VOID\r
 EFIAPI\r
 DnsOnPacketReceived (\r
-  NET_BUF                   *Packet,\r
-  UDP_END_POINT             *EndPoint,\r
-  EFI_STATUS                IoStatus,\r
-  VOID                      *Context\r
+  NET_BUF        *Packet,\r
+  UDP_END_POINT  *EndPoint,\r
+  EFI_STATUS     IoStatus,\r
+  VOID           *Context\r
   );\r
 \r
 /**\r
@@ -622,10 +621,10 @@ DnsOnPacketReceived (
 VOID\r
 EFIAPI\r
 DnsOnPacketSent (\r
-  NET_BUF                   *Packet,\r
-  UDP_END_POINT             *EndPoint,\r
-  EFI_STATUS                IoStatus,\r
-  VOID                      *Context\r
+  NET_BUF        *Packet,\r
+  UDP_END_POINT  *EndPoint,\r
+  EFI_STATUS     IoStatus,\r
+  VOID           *Context\r
   );\r
 \r
 /**\r
@@ -640,8 +639,8 @@ DnsOnPacketSent (
 **/\r
 EFI_STATUS\r
 DoDnsQuery (\r
-  IN  DNS_INSTANCE              *Instance,\r
-  IN  NET_BUF                   *Packet\r
+  IN  DNS_INSTANCE  *Instance,\r
+  IN  NET_BUF       *Packet\r
   );\r
 \r
 /**\r
@@ -659,11 +658,11 @@ DoDnsQuery (
 **/\r
 EFI_STATUS\r
 ConstructDNSQuery (\r
-  IN  DNS_INSTANCE              *Instance,\r
-  IN  CHAR8                     *QueryName,\r
-  IN  UINT16                    Type,\r
-  IN  UINT16                    Class,\r
-  OUT NET_BUF                   **Packet\r
+  IN  DNS_INSTANCE  *Instance,\r
+  IN  CHAR8         *QueryName,\r
+  IN  UINT16        Type,\r
+  IN  UINT16        Class,\r
+  OUT NET_BUF       **Packet\r
   );\r
 \r
 /**\r
@@ -678,8 +677,8 @@ ConstructDNSQuery (
 **/\r
 EFI_STATUS\r
 DnsRetransmit (\r
-  IN DNS_INSTANCE        *Instance,\r
-  IN NET_BUF             *Packet\r
+  IN DNS_INSTANCE  *Instance,\r
+  IN NET_BUF       *Packet\r
   );\r
 \r
 /**\r
@@ -692,8 +691,8 @@ DnsRetransmit (
 VOID\r
 EFIAPI\r
 DnsOnTimerRetransmit (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -706,11 +705,10 @@ DnsOnTimerRetransmit (
 VOID\r
 EFIAPI\r
 DnsOnTimerUpdate (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
-\r
 /**\r
   Retrieve mode data of this DNS instance.\r
 \r
@@ -729,8 +727,8 @@ DnsOnTimerUpdate (
 EFI_STATUS\r
 EFIAPI\r
 Dns4GetModeData (\r
-  IN  EFI_DNS4_PROTOCOL          *This,\r
-  OUT EFI_DNS4_MODE_DATA         *DnsModeData\r
+  IN  EFI_DNS4_PROTOCOL   *This,\r
+  OUT EFI_DNS4_MODE_DATA  *DnsModeData\r
   );\r
 \r
 /**\r
@@ -761,8 +759,8 @@ Dns4GetModeData (
 EFI_STATUS\r
 EFIAPI\r
 Dns4Configure (\r
-  IN EFI_DNS4_PROTOCOL           *This,\r
-  IN EFI_DNS4_CONFIG_DATA        *DnsConfigData\r
+  IN EFI_DNS4_PROTOCOL     *This,\r
+  IN EFI_DNS4_CONFIG_DATA  *DnsConfigData\r
   );\r
 \r
 /**\r
@@ -789,7 +787,7 @@ EFI_STATUS
 EFIAPI\r
 Dns4HostNameToIp (\r
   IN  EFI_DNS4_PROTOCOL          *This,\r
-  IN  CHAR16                    *HostName,\r
+  IN  CHAR16                     *HostName,\r
   IN  EFI_DNS4_COMPLETION_TOKEN  *Token\r
   );\r
 \r
@@ -818,9 +816,9 @@ Dns4HostNameToIp (
 EFI_STATUS\r
 EFIAPI\r
 Dns4IpToHostName (\r
-  IN  EFI_DNS4_PROTOCOL             *This,\r
-  IN  EFI_IPv4_ADDRESS              IpAddress,\r
-  IN  EFI_DNS4_COMPLETION_TOKEN     *Token\r
+  IN  EFI_DNS4_PROTOCOL          *This,\r
+  IN  EFI_IPv4_ADDRESS           IpAddress,\r
+  IN  EFI_DNS4_COMPLETION_TOKEN  *Token\r
   );\r
 \r
 /**\r
@@ -853,11 +851,11 @@ Dns4IpToHostName (
 EFI_STATUS\r
 EFIAPI\r
 Dns4GeneralLookUp (\r
-  IN  EFI_DNS4_PROTOCOL                *This,\r
-  IN  CHAR8                            *QName,\r
-  IN  UINT16                           QType,\r
-  IN  UINT16                           QClass,\r
-  IN  EFI_DNS4_COMPLETION_TOKEN        *Token\r
+  IN  EFI_DNS4_PROTOCOL          *This,\r
+  IN  CHAR8                      *QName,\r
+  IN  UINT16                     QType,\r
+  IN  UINT16                     QClass,\r
+  IN  EFI_DNS4_COMPLETION_TOKEN  *Token\r
   );\r
 \r
 /**\r
@@ -889,10 +887,10 @@ Dns4GeneralLookUp (
 EFI_STATUS\r
 EFIAPI\r
 Dns4UpdateDnsCache (\r
-  IN EFI_DNS4_PROTOCOL      *This,\r
+  IN EFI_DNS4_PROTOCOL     *This,\r
   IN BOOLEAN               DeleteFlag,\r
   IN BOOLEAN               Override,\r
-  IN EFI_DNS4_CACHE_ENTRY   DnsCacheEntry\r
+  IN EFI_DNS4_CACHE_ENTRY  DnsCacheEntry\r
   );\r
 \r
 /**\r
@@ -919,7 +917,7 @@ Dns4UpdateDnsCache (
 EFI_STATUS\r
 EFIAPI\r
 Dns4Poll (\r
-  IN EFI_DNS4_PROTOCOL    *This\r
+  IN EFI_DNS4_PROTOCOL  *This\r
   );\r
 \r
 /**\r
@@ -954,7 +952,6 @@ Dns4Cancel (
   IN  EFI_DNS4_COMPLETION_TOKEN  *Token\r
   );\r
 \r
-\r
 /**\r
   Retrieve mode data of this DNS instance.\r
 \r
@@ -974,8 +971,8 @@ Dns4Cancel (
 EFI_STATUS\r
 EFIAPI\r
 Dns6GetModeData (\r
-  IN  EFI_DNS6_PROTOCOL          *This,\r
-  OUT EFI_DNS6_MODE_DATA         *DnsModeData\r
+  IN  EFI_DNS6_PROTOCOL   *This,\r
+  OUT EFI_DNS6_MODE_DATA  *DnsModeData\r
   );\r
 \r
 /**\r
@@ -1004,8 +1001,8 @@ Dns6GetModeData (
 EFI_STATUS\r
 EFIAPI\r
 Dns6Configure (\r
-  IN EFI_DNS6_PROTOCOL           *This,\r
-  IN EFI_DNS6_CONFIG_DATA        *DnsConfigData\r
+  IN EFI_DNS6_PROTOCOL     *This,\r
+  IN EFI_DNS6_CONFIG_DATA  *DnsConfigData\r
   );\r
 \r
 /**\r
@@ -1064,9 +1061,9 @@ Dns6HostNameToIp (
 EFI_STATUS\r
 EFIAPI\r
 Dns6IpToHostName (\r
-  IN  EFI_DNS6_PROTOCOL             *This,\r
-  IN  EFI_IPv6_ADDRESS              IpAddress,\r
-  IN  EFI_DNS6_COMPLETION_TOKEN     *Token\r
+  IN  EFI_DNS6_PROTOCOL          *This,\r
+  IN  EFI_IPv6_ADDRESS           IpAddress,\r
+  IN  EFI_DNS6_COMPLETION_TOKEN  *Token\r
   );\r
 \r
 /**\r
@@ -1101,11 +1098,11 @@ Dns6IpToHostName (
 EFI_STATUS\r
 EFIAPI\r
 Dns6GeneralLookUp (\r
-  IN  EFI_DNS6_PROTOCOL                *This,\r
-  IN  CHAR8                            *QName,\r
-  IN  UINT16                           QType,\r
-  IN  UINT16                           QClass,\r
-  IN  EFI_DNS6_COMPLETION_TOKEN        *Token\r
+  IN  EFI_DNS6_PROTOCOL          *This,\r
+  IN  CHAR8                      *QName,\r
+  IN  UINT16                     QType,\r
+  IN  UINT16                     QClass,\r
+  IN  EFI_DNS6_COMPLETION_TOKEN  *Token\r
   );\r
 \r
 /**\r
@@ -1138,10 +1135,10 @@ Dns6GeneralLookUp (
 EFI_STATUS\r
 EFIAPI\r
 Dns6UpdateDnsCache (\r
-  IN EFI_DNS6_PROTOCOL      *This,\r
+  IN EFI_DNS6_PROTOCOL     *This,\r
   IN BOOLEAN               DeleteFlag,\r
   IN BOOLEAN               Override,\r
-  IN EFI_DNS6_CACHE_ENTRY   DnsCacheEntry\r
+  IN EFI_DNS6_CACHE_ENTRY  DnsCacheEntry\r
   );\r
 \r
 /**\r
@@ -1170,7 +1167,7 @@ Dns6UpdateDnsCache (
 EFI_STATUS\r
 EFIAPI\r
 Dns6Poll (\r
-  IN EFI_DNS6_PROTOCOL    *This\r
+  IN EFI_DNS6_PROTOCOL  *This\r
   );\r
 \r
 /**\r
index a0bb58ef1db328eceb92e3bd5521001c68f27290..563c6ce723ea2a98685e4e5144bf8a640f5e207e 100644 (file)
@@ -48,24 +48,24 @@ EFI_DNS6_PROTOCOL  mDns6Protocol = {
 EFI_STATUS\r
 EFIAPI\r
 Dns4GetModeData (\r
-  IN  EFI_DNS4_PROTOCOL          *This,\r
-  OUT EFI_DNS4_MODE_DATA         *DnsModeData\r
+  IN  EFI_DNS4_PROTOCOL   *This,\r
+  OUT EFI_DNS4_MODE_DATA  *DnsModeData\r
   )\r
 {\r
-  DNS_INSTANCE         *Instance;\r
+  DNS_INSTANCE  *Instance;\r
 \r
-  EFI_TPL              OldTpl;\r
+  EFI_TPL  OldTpl;\r
 \r
-  UINTN                Index;\r
+  UINTN  Index;\r
 \r
-  LIST_ENTRY           *Entry;\r
-  LIST_ENTRY           *Next;\r
+  LIST_ENTRY  *Entry;\r
+  LIST_ENTRY  *Next;\r
 \r
-  DNS4_SERVER_IP       *ServerItem;\r
-  EFI_IPv4_ADDRESS     *ServerList;\r
-  DNS4_CACHE           *CacheItem;\r
-  EFI_DNS4_CACHE_ENTRY *CacheList;\r
-  EFI_STATUS           Status;\r
+  DNS4_SERVER_IP        *ServerItem;\r
+  EFI_IPv4_ADDRESS      *ServerList;\r
+  DNS4_CACHE            *CacheItem;\r
+  EFI_DNS4_CACHE_ENTRY  *CacheList;\r
+  EFI_STATUS            Status;\r
 \r
   ServerItem = NULL;\r
   ServerList = NULL;\r
@@ -73,7 +73,6 @@ Dns4GetModeData (
   CacheList  = NULL;\r
   Status     = EFI_SUCCESS;\r
 \r
-\r
   if ((This == NULL) || (DnsModeData == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
@@ -103,8 +102,8 @@ Dns4GetModeData (
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns4ServerList) {\r
     Index++;\r
   }\r
-  DnsModeData->DnsServerCount = (UINT32) Index;\r
-  ServerList = AllocatePool (sizeof (EFI_IPv4_ADDRESS) * DnsModeData->DnsServerCount);\r
+  DnsModeData->DnsServerCount = (UINT32)Index;\r
+  ServerList                  = AllocatePool (sizeof (EFI_IPv4_ADDRESS) * DnsModeData->DnsServerCount);\r
   if (ServerList == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     Dns4CleanConfigure (&DnsModeData->DnsConfigData);\r
@@ -122,12 +121,12 @@ Dns4GetModeData (
   //\r
   // Get the DnsCacheCount and DnsCacheList\r
   //\r
-  Index =0;\r
+  Index = 0;\r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns4CacheList) {\r
     Index++;\r
   }\r
-  DnsModeData->DnsCacheCount = (UINT32) Index;\r
-  CacheList = AllocatePool (sizeof (EFI_DNS4_CACHE_ENTRY) * DnsModeData->DnsCacheCount);\r
+  DnsModeData->DnsCacheCount = (UINT32)Index;\r
+  CacheList                  = AllocatePool (sizeof (EFI_DNS4_CACHE_ENTRY) * DnsModeData->DnsCacheCount);\r
   if (CacheList == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     Dns4CleanConfigure (&DnsModeData->DnsConfigData);\r
@@ -135,7 +134,7 @@ Dns4GetModeData (
     goto ON_EXIT;\r
   }\r
 \r
-  Index =0;\r
+  Index = 0;\r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns4CacheList) {\r
     CacheItem = NET_LIST_USER_STRUCT (Entry, DNS4_CACHE, AllCacheLink);\r
     CopyMem (CacheList + Index, &CacheItem->DnsCache, sizeof (EFI_DNS4_CACHE_ENTRY));\r
@@ -176,30 +175,31 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 Dns4Configure (\r
-  IN EFI_DNS4_PROTOCOL           *This,\r
-  IN EFI_DNS4_CONFIG_DATA        *DnsConfigData\r
+  IN EFI_DNS4_PROTOCOL     *This,\r
+  IN EFI_DNS4_CONFIG_DATA  *DnsConfigData\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  DNS_INSTANCE              *Instance;\r
+  EFI_STATUS    Status;\r
+  DNS_INSTANCE  *Instance;\r
 \r
-  EFI_TPL                   OldTpl;\r
-  IP4_ADDR                  Ip;\r
-  IP4_ADDR                  Netmask;\r
+  EFI_TPL   OldTpl;\r
+  IP4_ADDR  Ip;\r
+  IP4_ADDR  Netmask;\r
 \r
-  UINT32                    ServerListCount;\r
-  EFI_IPv4_ADDRESS          *ServerList;\r
+  UINT32            ServerListCount;\r
+  EFI_IPv4_ADDRESS  *ServerList;\r
 \r
   Status     = EFI_SUCCESS;\r
   ServerList = NULL;\r
 \r
-  if (This == NULL ||\r
-     (DnsConfigData != NULL && ((DnsConfigData->DnsServerListCount != 0 && DnsConfigData->DnsServerList == NULL) ||\r
-                                (DnsConfigData->DnsServerListCount == 0 && DnsConfigData->DnsServerList != NULL)))) {\r
+  if ((This == NULL) ||\r
+      ((DnsConfigData != NULL) && (((DnsConfigData->DnsServerListCount != 0) && (DnsConfigData->DnsServerList == NULL)) ||\r
+                                   ((DnsConfigData->DnsServerListCount == 0) && (DnsConfigData->DnsServerList != NULL)))))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (DnsConfigData != NULL && DnsConfigData->Protocol != DNS_PROTOCOL_UDP) {\r
+  if ((DnsConfigData != NULL) && (DnsConfigData->Protocol != DNS_PROTOCOL_UDP)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -213,8 +213,8 @@ Dns4Configure (
     //\r
     // Reset the Instance if ConfigData is NULL\r
     //\r
-    if (!NetMapIsEmpty(&Instance->Dns4TxTokens)) {\r
-      Dns4InstanceCancelToken(Instance, NULL);\r
+    if (!NetMapIsEmpty (&Instance->Dns4TxTokens)) {\r
+      Dns4InstanceCancelToken (Instance, NULL);\r
     }\r
 \r
     if (Instance->UdpIo != NULL) {\r
@@ -224,6 +224,7 @@ Dns4Configure (
     if (Instance->Dns4CfgData.DnsServerList != NULL) {\r
       FreePool (Instance->Dns4CfgData.DnsServerList);\r
     }\r
+\r
     ZeroMem (&Instance->Dns4CfgData, sizeof (EFI_DNS4_CONFIG_DATA));\r
 \r
     Instance->State = DNS_STATE_UNCONFIGED;\r
@@ -234,11 +235,12 @@ Dns4Configure (
     CopyMem (&Ip, &DnsConfigData->StationIp, sizeof (IP4_ADDR));\r
     CopyMem (&Netmask, &DnsConfigData->SubnetMask, sizeof (IP4_ADDR));\r
 \r
-    Ip       = NTOHL (Ip);\r
-    Netmask  = NTOHL (Netmask);\r
+    Ip      = NTOHL (Ip);\r
+    Netmask = NTOHL (Netmask);\r
 \r
     if (!DnsConfigData->UseDefaultSetting &&\r
-        ((!IP4_IS_VALID_NETMASK (Netmask) || (Netmask != 0 && !NetIp4IsUnicast (Ip, Netmask))))) {\r
+        ((!IP4_IS_VALID_NETMASK (Netmask) || ((Netmask != 0) && !NetIp4IsUnicast (Ip, Netmask)))))\r
+    {\r
       Status = EFI_INVALID_PARAMETER;\r
       goto ON_EXIT;\r
     }\r
@@ -263,7 +265,7 @@ Dns4Configure (
         return Status;\r
       }\r
 \r
-      ASSERT(ServerList != NULL);\r
+      ASSERT (ServerList != NULL);\r
 \r
       OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
@@ -281,6 +283,7 @@ Dns4Configure (
         FreePool (Instance->Dns4CfgData.DnsServerList);\r
         Instance->Dns4CfgData.DnsServerList = NULL;\r
       }\r
+\r
       goto ON_EXIT;\r
     }\r
 \r
@@ -293,6 +296,7 @@ Dns4Configure (
         FreePool (Instance->Dns4CfgData.DnsServerList);\r
         Instance->Dns4CfgData.DnsServerList = NULL;\r
       }\r
+\r
       goto ON_EXIT;\r
     }\r
 \r
@@ -332,23 +336,23 @@ Dns4HostNameToIp (
   IN  EFI_DNS4_COMPLETION_TOKEN  *Token\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
+  EFI_STATUS  Status;\r
 \r
-  DNS_INSTANCE          *Instance;\r
+  DNS_INSTANCE  *Instance;\r
 \r
   EFI_DNS4_CONFIG_DATA  *ConfigData;\r
 \r
-  UINTN                 Index;\r
-  DNS4_CACHE            *Item;\r
-  LIST_ENTRY            *Entry;\r
-  LIST_ENTRY            *Next;\r
+  UINTN       Index;\r
+  DNS4_CACHE  *Item;\r
+  LIST_ENTRY  *Entry;\r
+  LIST_ENTRY  *Next;\r
 \r
-  CHAR8                 *QueryName;\r
+  CHAR8  *QueryName;\r
 \r
-  DNS4_TOKEN_ENTRY      *TokenEntry;\r
-  NET_BUF               *Packet;\r
+  DNS4_TOKEN_ENTRY  *TokenEntry;\r
+  NET_BUF           *Packet;\r
 \r
-  EFI_TPL               OldTpl;\r
+  EFI_TPL  OldTpl;\r
 \r
   Status     = EFI_SUCCESS;\r
   Item       = NULL;\r
@@ -359,11 +363,11 @@ Dns4HostNameToIp (
   //\r
   // Validate the parameters\r
   //\r
-  if ((This == NULL) || (HostName == NULL) || Token == NULL) {\r
+  if ((This == NULL) || (HostName == NULL) || (Token == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  OldTpl   = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   Instance = DNS_INSTANCE_FROM_THIS_PROTOCOL4 (This);\r
 \r
@@ -417,7 +421,7 @@ Dns4HostNameToIp (
       }\r
 \r
       Token->RspData.H2AData->IpCount = (UINT32)Index;\r
-      Token->RspData.H2AData->IpList = AllocatePool (sizeof (EFI_IPv4_ADDRESS) * Index);\r
+      Token->RspData.H2AData->IpList  = AllocatePool (sizeof (EFI_IPv4_ADDRESS) * Index);\r
       if (Token->RspData.H2AData->IpList == NULL) {\r
         if (Token->RspData.H2AData != NULL) {\r
           FreePool (Token->RspData.H2AData);\r
@@ -430,7 +434,7 @@ Dns4HostNameToIp (
       Index = 0;\r
       NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns4CacheList) {\r
         Item = NET_LIST_USER_STRUCT (Entry, DNS4_CACHE, AllCacheLink);\r
-        if ((UINT32)Index < Token->RspData.H2AData->IpCount && StrCmp (HostName, Item->DnsCache.HostName) == 0) {\r
+        if (((UINT32)Index < Token->RspData.H2AData->IpCount) && (StrCmp (HostName, Item->DnsCache.HostName) == 0)) {\r
           CopyMem ((Token->RspData.H2AData->IpList) + Index, Item->DnsCache.IpAddress, sizeof (EFI_IPv4_ADDRESS));\r
           Index++;\r
         }\r
@@ -451,14 +455,14 @@ Dns4HostNameToIp (
   //\r
   // Construct DNS TokenEntry.\r
   //\r
-  TokenEntry = AllocateZeroPool (sizeof(DNS4_TOKEN_ENTRY));\r
+  TokenEntry = AllocateZeroPool (sizeof (DNS4_TOKEN_ENTRY));\r
   if (TokenEntry == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
   }\r
 \r
-  TokenEntry->PacketToLive = Token->RetryInterval;\r
-  TokenEntry->Token = Token;\r
+  TokenEntry->PacketToLive  = Token->RetryInterval;\r
+  TokenEntry->Token         = Token;\r
   TokenEntry->QueryHostName = AllocateZeroPool (StrSize (HostName));\r
   if (TokenEntry->QueryHostName == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
@@ -551,9 +555,9 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 Dns4IpToHostName (\r
-  IN  EFI_DNS4_PROTOCOL              *This,\r
-  IN  EFI_IPv4_ADDRESS               IpAddress,\r
-  IN  EFI_DNS4_COMPLETION_TOKEN      *Token\r
+  IN  EFI_DNS4_PROTOCOL          *This,\r
+  IN  EFI_IPv4_ADDRESS           IpAddress,\r
+  IN  EFI_DNS4_COMPLETION_TOKEN  *Token\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
@@ -589,23 +593,23 @@ Dns4IpToHostName (
 EFI_STATUS\r
 EFIAPI\r
 Dns4GeneralLookUp (\r
-  IN  EFI_DNS4_PROTOCOL                *This,\r
-  IN  CHAR8                            *QName,\r
-  IN  UINT16                           QType,\r
-  IN  UINT16                           QClass,\r
-  IN  EFI_DNS4_COMPLETION_TOKEN        *Token\r
+  IN  EFI_DNS4_PROTOCOL          *This,\r
+  IN  CHAR8                      *QName,\r
+  IN  UINT16                     QType,\r
+  IN  UINT16                     QClass,\r
+  IN  EFI_DNS4_COMPLETION_TOKEN  *Token\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
+  EFI_STATUS  Status;\r
 \r
-  DNS_INSTANCE          *Instance;\r
+  DNS_INSTANCE  *Instance;\r
 \r
   EFI_DNS4_CONFIG_DATA  *ConfigData;\r
 \r
-  DNS4_TOKEN_ENTRY      *TokenEntry;\r
-  NET_BUF               *Packet;\r
+  DNS4_TOKEN_ENTRY  *TokenEntry;\r
+  NET_BUF           *Packet;\r
 \r
-  EFI_TPL               OldTpl;\r
+  EFI_TPL  OldTpl;\r
 \r
   Status     = EFI_SUCCESS;\r
   TokenEntry = NULL;\r
@@ -614,11 +618,11 @@ Dns4GeneralLookUp (
   //\r
   // Validate the parameters\r
   //\r
-  if ((This == NULL) || (QName == NULL) || Token == NULL) {\r
+  if ((This == NULL) || (QName == NULL) || (Token == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  OldTpl   = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   Instance = DNS_INSTANCE_FROM_THIS_PROTOCOL4 (This);\r
 \r
@@ -655,15 +659,15 @@ Dns4GeneralLookUp (
   //\r
   // Construct DNS TokenEntry.\r
   //\r
-  TokenEntry = AllocateZeroPool (sizeof(DNS4_TOKEN_ENTRY));\r
+  TokenEntry = AllocateZeroPool (sizeof (DNS4_TOKEN_ENTRY));\r
   if (TokenEntry == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
   }\r
 \r
-  TokenEntry->PacketToLive = Token->RetryInterval;\r
+  TokenEntry->PacketToLive  = Token->RetryInterval;\r
   TokenEntry->GeneralLookUp = TRUE;\r
-  TokenEntry->Token = Token;\r
+  TokenEntry->Token         = Token;\r
 \r
   //\r
   // Construct DNS Query Packet.\r
@@ -741,18 +745,18 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 Dns4UpdateDnsCache (\r
-  IN EFI_DNS4_PROTOCOL      *This,\r
-  IN BOOLEAN                DeleteFlag,\r
-  IN BOOLEAN                Override,\r
-  IN EFI_DNS4_CACHE_ENTRY   DnsCacheEntry\r
+  IN EFI_DNS4_PROTOCOL     *This,\r
+  IN BOOLEAN               DeleteFlag,\r
+  IN BOOLEAN               Override,\r
+  IN EFI_DNS4_CACHE_ENTRY  DnsCacheEntry\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
-  EFI_TPL       OldTpl;\r
+  EFI_STATUS  Status;\r
+  EFI_TPL     OldTpl;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
-  if (DnsCacheEntry.HostName == NULL || DnsCacheEntry.IpAddress == NULL || DnsCacheEntry.Timeout == 0) {\r
+  if ((DnsCacheEntry.HostName == NULL) || (DnsCacheEntry.IpAddress == NULL) || (DnsCacheEntry.Timeout == 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -792,11 +796,11 @@ Dns4UpdateDnsCache (
 EFI_STATUS\r
 EFIAPI\r
 Dns4Poll (\r
-  IN EFI_DNS4_PROTOCOL    *This\r
+  IN EFI_DNS4_PROTOCOL  *This\r
   )\r
 {\r
-  DNS_INSTANCE           *Instance;\r
-  EFI_UDP4_PROTOCOL      *Udp;\r
+  DNS_INSTANCE       *Instance;\r
+  EFI_UDP4_PROTOCOL  *Udp;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -847,9 +851,9 @@ Dns4Cancel (
   IN  EFI_DNS4_COMPLETION_TOKEN  *Token\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  DNS_INSTANCE        *Instance;\r
-  EFI_TPL             OldTpl;\r
+  EFI_STATUS    Status;\r
+  DNS_INSTANCE  *Instance;\r
+  EFI_TPL       OldTpl;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -897,24 +901,24 @@ Dns4Cancel (
 EFI_STATUS\r
 EFIAPI\r
 Dns6GetModeData (\r
-  IN  EFI_DNS6_PROTOCOL          *This,\r
-  OUT EFI_DNS6_MODE_DATA         *DnsModeData\r
+  IN  EFI_DNS6_PROTOCOL   *This,\r
+  OUT EFI_DNS6_MODE_DATA  *DnsModeData\r
   )\r
 {\r
-  DNS_INSTANCE         *Instance;\r
+  DNS_INSTANCE  *Instance;\r
 \r
-  EFI_TPL              OldTpl;\r
+  EFI_TPL  OldTpl;\r
 \r
-  UINTN                Index;\r
+  UINTN  Index;\r
 \r
-  LIST_ENTRY           *Entry;\r
-  LIST_ENTRY           *Next;\r
+  LIST_ENTRY  *Entry;\r
+  LIST_ENTRY  *Next;\r
 \r
-  DNS6_SERVER_IP       *ServerItem;\r
-  EFI_IPv6_ADDRESS     *ServerList;\r
-  DNS6_CACHE           *CacheItem;\r
-  EFI_DNS6_CACHE_ENTRY *CacheList;\r
-  EFI_STATUS           Status;\r
+  DNS6_SERVER_IP        *ServerItem;\r
+  EFI_IPv6_ADDRESS      *ServerList;\r
+  DNS6_CACHE            *CacheItem;\r
+  EFI_DNS6_CACHE_ENTRY  *CacheList;\r
+  EFI_STATUS            Status;\r
 \r
   ServerItem = NULL;\r
   ServerList = NULL;\r
@@ -928,7 +932,7 @@ Dns6GetModeData (
 \r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
-  Instance  = DNS_INSTANCE_FROM_THIS_PROTOCOL6 (This);\r
+  Instance = DNS_INSTANCE_FROM_THIS_PROTOCOL6 (This);\r
   if (Instance->State == DNS_STATE_UNCONFIGED) {\r
     Status =  EFI_NOT_STARTED;\r
     goto ON_EXIT;\r
@@ -951,8 +955,8 @@ Dns6GetModeData (
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns6ServerList) {\r
     Index++;\r
   }\r
-  DnsModeData->DnsServerCount = (UINT32) Index;\r
-  ServerList = AllocatePool (sizeof(EFI_IPv6_ADDRESS) * DnsModeData->DnsServerCount);\r
+  DnsModeData->DnsServerCount = (UINT32)Index;\r
+  ServerList                  = AllocatePool (sizeof (EFI_IPv6_ADDRESS) * DnsModeData->DnsServerCount);\r
   if (ServerList == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     Dns6CleanConfigure (&DnsModeData->DnsConfigData);\r
@@ -970,12 +974,12 @@ Dns6GetModeData (
   //\r
   // Get the DnsCacheCount and DnsCacheList\r
   //\r
-  Index =0;\r
+  Index = 0;\r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns6CacheList) {\r
     Index++;\r
   }\r
-  DnsModeData->DnsCacheCount = (UINT32) Index;\r
-  CacheList = AllocatePool (sizeof(EFI_DNS6_CACHE_ENTRY) * DnsModeData->DnsCacheCount);\r
+  DnsModeData->DnsCacheCount = (UINT32)Index;\r
+  CacheList                  = AllocatePool (sizeof (EFI_DNS6_CACHE_ENTRY) * DnsModeData->DnsCacheCount);\r
   if (CacheList == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     Dns6CleanConfigure (&DnsModeData->DnsConfigData);\r
@@ -983,7 +987,7 @@ Dns6GetModeData (
     goto ON_EXIT;\r
   }\r
 \r
-  Index =0;\r
+  Index = 0;\r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns6CacheList) {\r
     CacheItem = NET_LIST_USER_STRUCT (Entry, DNS6_CACHE, AllCacheLink);\r
     CopyMem (CacheList + Index, &CacheItem->DnsCache, sizeof (EFI_DNS6_CACHE_ENTRY));\r
@@ -1022,28 +1026,29 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 Dns6Configure (\r
-  IN EFI_DNS6_PROTOCOL           *This,\r
-  IN EFI_DNS6_CONFIG_DATA        *DnsConfigData\r
+  IN EFI_DNS6_PROTOCOL     *This,\r
+  IN EFI_DNS6_CONFIG_DATA  *DnsConfigData\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  DNS_INSTANCE              *Instance;\r
+  EFI_STATUS    Status;\r
+  DNS_INSTANCE  *Instance;\r
 \r
-  EFI_TPL                   OldTpl;\r
+  EFI_TPL  OldTpl;\r
 \r
-  UINT32                    ServerListCount;\r
-  EFI_IPv6_ADDRESS          *ServerList;\r
+  UINT32            ServerListCount;\r
+  EFI_IPv6_ADDRESS  *ServerList;\r
 \r
   Status     = EFI_SUCCESS;\r
   ServerList = NULL;\r
 \r
-  if (This == NULL ||\r
-     (DnsConfigData != NULL && ((DnsConfigData->DnsServerCount != 0 && DnsConfigData->DnsServerList == NULL) ||\r
-                                (DnsConfigData->DnsServerCount == 0 && DnsConfigData->DnsServerList != NULL)))) {\r
+  if ((This == NULL) ||\r
+      ((DnsConfigData != NULL) && (((DnsConfigData->DnsServerCount != 0) && (DnsConfigData->DnsServerList == NULL)) ||\r
+                                   ((DnsConfigData->DnsServerCount == 0) && (DnsConfigData->DnsServerList != NULL)))))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (DnsConfigData != NULL && DnsConfigData->Protocol != DNS_PROTOCOL_UDP) {\r
+  if ((DnsConfigData != NULL) && (DnsConfigData->Protocol != DNS_PROTOCOL_UDP)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -1057,8 +1062,8 @@ Dns6Configure (
     //\r
     // Reset the Instance if ConfigData is NULL\r
     //\r
-    if (!NetMapIsEmpty(&Instance->Dns6TxTokens)) {\r
-      Dns6InstanceCancelToken(Instance, NULL);\r
+    if (!NetMapIsEmpty (&Instance->Dns6TxTokens)) {\r
+      Dns6InstanceCancelToken (Instance, NULL);\r
     }\r
 \r
     if (Instance->UdpIo != NULL) {\r
@@ -1068,6 +1073,7 @@ Dns6Configure (
     if (Instance->Dns6CfgData.DnsServerList != NULL) {\r
       FreePool (Instance->Dns6CfgData.DnsServerList);\r
     }\r
+\r
     ZeroMem (&Instance->Dns6CfgData, sizeof (EFI_DNS6_CONFIG_DATA));\r
 \r
     Instance->State = DNS_STATE_UNCONFIGED;\r
@@ -1089,7 +1095,7 @@ Dns6Configure (
       gBS->RestoreTPL (OldTpl);\r
 \r
       //\r
-      //The DNS instance will retrieve DNS server from DHCP Server.\r
+      // The DNS instance will retrieve DNS server from DHCP Server.\r
       //\r
       Status = GetDns6ServerFromDhcp6 (\r
                  Instance->Service->ImageHandle,\r
@@ -1101,7 +1107,7 @@ Dns6Configure (
         goto ON_EXIT;\r
       }\r
 \r
-      ASSERT(ServerList != NULL);\r
+      ASSERT (ServerList != NULL);\r
 \r
       OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
@@ -1121,6 +1127,7 @@ Dns6Configure (
         FreePool (Instance->Dns6CfgData.DnsServerList);\r
         Instance->Dns6CfgData.DnsServerList = NULL;\r
       }\r
+\r
       goto ON_EXIT;\r
     }\r
 \r
@@ -1133,6 +1140,7 @@ Dns6Configure (
         FreePool (Instance->Dns6CfgData.DnsServerList);\r
         Instance->Dns6CfgData.DnsServerList = NULL;\r
       }\r
+\r
       goto ON_EXIT;\r
     }\r
 \r
@@ -1174,23 +1182,23 @@ Dns6HostNameToIp (
   IN  EFI_DNS6_COMPLETION_TOKEN  *Token\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
+  EFI_STATUS  Status;\r
 \r
-  DNS_INSTANCE          *Instance;\r
+  DNS_INSTANCE  *Instance;\r
 \r
   EFI_DNS6_CONFIG_DATA  *ConfigData;\r
 \r
-  UINTN                 Index;\r
-  DNS6_CACHE            *Item;\r
-  LIST_ENTRY            *Entry;\r
-  LIST_ENTRY            *Next;\r
+  UINTN       Index;\r
+  DNS6_CACHE  *Item;\r
+  LIST_ENTRY  *Entry;\r
+  LIST_ENTRY  *Next;\r
 \r
-  CHAR8                 *QueryName;\r
+  CHAR8  *QueryName;\r
 \r
-  DNS6_TOKEN_ENTRY      *TokenEntry;\r
-  NET_BUF               *Packet;\r
+  DNS6_TOKEN_ENTRY  *TokenEntry;\r
+  NET_BUF           *Packet;\r
 \r
-  EFI_TPL               OldTpl;\r
+  EFI_TPL  OldTpl;\r
 \r
   Status     = EFI_SUCCESS;\r
   Item       = NULL;\r
@@ -1201,11 +1209,11 @@ Dns6HostNameToIp (
   //\r
   // Validate the parameters\r
   //\r
-  if ((This == NULL) || (HostName == NULL) || Token == NULL) {\r
+  if ((This == NULL) || (HostName == NULL) || (Token == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  OldTpl   = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   Instance = DNS_INSTANCE_FROM_THIS_PROTOCOL6 (This);\r
 \r
@@ -1259,7 +1267,7 @@ Dns6HostNameToIp (
       }\r
 \r
       Token->RspData.H2AData->IpCount = (UINT32)Index;\r
-      Token->RspData.H2AData->IpList = AllocatePool (sizeof (EFI_IPv6_ADDRESS) * Index);\r
+      Token->RspData.H2AData->IpList  = AllocatePool (sizeof (EFI_IPv6_ADDRESS) * Index);\r
       if (Token->RspData.H2AData->IpList == NULL) {\r
         if (Token->RspData.H2AData != NULL) {\r
           FreePool (Token->RspData.H2AData);\r
@@ -1272,7 +1280,7 @@ Dns6HostNameToIp (
       Index = 0;\r
       NET_LIST_FOR_EACH_SAFE (Entry, Next, &mDriverData->Dns6CacheList) {\r
         Item = NET_LIST_USER_STRUCT (Entry, DNS6_CACHE, AllCacheLink);\r
-        if ((UINT32)Index < Token->RspData.H2AData->IpCount && StrCmp (HostName, Item->DnsCache.HostName) == 0) {\r
+        if (((UINT32)Index < Token->RspData.H2AData->IpCount) && (StrCmp (HostName, Item->DnsCache.HostName) == 0)) {\r
           CopyMem ((Token->RspData.H2AData->IpList) + Index, Item->DnsCache.IpAddress, sizeof (EFI_IPv6_ADDRESS));\r
           Index++;\r
         }\r
@@ -1299,8 +1307,8 @@ Dns6HostNameToIp (
     goto ON_EXIT;\r
   }\r
 \r
-  TokenEntry->PacketToLive = Token->RetryInterval;\r
-  TokenEntry->Token = Token;\r
+  TokenEntry->PacketToLive  = Token->RetryInterval;\r
+  TokenEntry->Token         = Token;\r
   TokenEntry->QueryHostName = AllocateZeroPool (StrSize (HostName));\r
   if (TokenEntry->QueryHostName == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
@@ -1394,9 +1402,9 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 Dns6IpToHostName (\r
-  IN  EFI_DNS6_PROTOCOL              *This,\r
-  IN  EFI_IPv6_ADDRESS               IpAddress,\r
-  IN  EFI_DNS6_COMPLETION_TOKEN      *Token\r
+  IN  EFI_DNS6_PROTOCOL          *This,\r
+  IN  EFI_IPv6_ADDRESS           IpAddress,\r
+  IN  EFI_DNS6_COMPLETION_TOKEN  *Token\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
@@ -1434,23 +1442,23 @@ Dns6IpToHostName (
 EFI_STATUS\r
 EFIAPI\r
 Dns6GeneralLookUp (\r
-  IN  EFI_DNS6_PROTOCOL                 *This,\r
-  IN  CHAR8                             *QName,\r
-  IN  UINT16                            QType,\r
-  IN  UINT16                            QClass,\r
-  IN  EFI_DNS6_COMPLETION_TOKEN         *Token\r
+  IN  EFI_DNS6_PROTOCOL          *This,\r
+  IN  CHAR8                      *QName,\r
+  IN  UINT16                     QType,\r
+  IN  UINT16                     QClass,\r
+  IN  EFI_DNS6_COMPLETION_TOKEN  *Token\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
+  EFI_STATUS  Status;\r
 \r
-  DNS_INSTANCE          *Instance;\r
+  DNS_INSTANCE  *Instance;\r
 \r
   EFI_DNS6_CONFIG_DATA  *ConfigData;\r
 \r
-  DNS6_TOKEN_ENTRY      *TokenEntry;\r
-  NET_BUF               *Packet;\r
+  DNS6_TOKEN_ENTRY  *TokenEntry;\r
+  NET_BUF           *Packet;\r
 \r
-  EFI_TPL               OldTpl;\r
+  EFI_TPL  OldTpl;\r
 \r
   Status     = EFI_SUCCESS;\r
   TokenEntry = NULL;\r
@@ -1459,11 +1467,11 @@ Dns6GeneralLookUp (
   //\r
   // Validate the parameters\r
   //\r
-  if ((This == NULL) || (QName == NULL) || Token == NULL) {\r
+  if ((This == NULL) || (QName == NULL) || (Token == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  OldTpl   = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   Instance = DNS_INSTANCE_FROM_THIS_PROTOCOL6 (This);\r
 \r
@@ -1500,15 +1508,15 @@ Dns6GeneralLookUp (
   //\r
   // Construct DNS TokenEntry.\r
   //\r
-  TokenEntry = AllocateZeroPool (sizeof(DNS6_TOKEN_ENTRY));\r
+  TokenEntry = AllocateZeroPool (sizeof (DNS6_TOKEN_ENTRY));\r
   if (TokenEntry == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
   }\r
 \r
-  TokenEntry->PacketToLive = Token->RetryInterval;\r
+  TokenEntry->PacketToLive  = Token->RetryInterval;\r
   TokenEntry->GeneralLookUp = TRUE;\r
-  TokenEntry->Token = Token;\r
+  TokenEntry->Token         = Token;\r
 \r
   //\r
   // Construct DNS Query Packet.\r
@@ -1587,18 +1595,18 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 Dns6UpdateDnsCache (\r
-  IN EFI_DNS6_PROTOCOL      *This,\r
-  IN BOOLEAN                DeleteFlag,\r
-  IN BOOLEAN                Override,\r
-  IN EFI_DNS6_CACHE_ENTRY   DnsCacheEntry\r
+  IN EFI_DNS6_PROTOCOL     *This,\r
+  IN BOOLEAN               DeleteFlag,\r
+  IN BOOLEAN               Override,\r
+  IN EFI_DNS6_CACHE_ENTRY  DnsCacheEntry\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
-  EFI_TPL       OldTpl;\r
+  EFI_STATUS  Status;\r
+  EFI_TPL     OldTpl;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
-  if (DnsCacheEntry.HostName == NULL || DnsCacheEntry.IpAddress == NULL || DnsCacheEntry.Timeout == 0) {\r
+  if ((DnsCacheEntry.HostName == NULL) || (DnsCacheEntry.IpAddress == NULL) || (DnsCacheEntry.Timeout == 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1640,11 +1648,11 @@ Dns6UpdateDnsCache (
 EFI_STATUS\r
 EFIAPI\r
 Dns6Poll (\r
-  IN EFI_DNS6_PROTOCOL    *This\r
+  IN EFI_DNS6_PROTOCOL  *This\r
   )\r
 {\r
-  DNS_INSTANCE           *Instance;\r
-  EFI_UDP6_PROTOCOL      *Udp;\r
+  DNS_INSTANCE       *Instance;\r
+  EFI_UDP6_PROTOCOL  *Udp;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1696,9 +1704,9 @@ Dns6Cancel (
   IN  EFI_DNS6_COMPLETION_TOKEN  *Token\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  DNS_INSTANCE        *Instance;\r
-  EFI_TPL             OldTpl;\r
+  EFI_STATUS    Status;\r
+  DNS_INSTANCE  *Instance;\r
+  EFI_TPL       OldTpl;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1726,4 +1734,3 @@ Dns6Cancel (
 \r
   return Status;\r
 }\r
-\r
index 7c85dd8757c329d6b9e1fbda4039206f3ee48a12..33eeccc7d243ce9e9b7df6789491590426742ba7 100644 (file)
@@ -22,7 +22,7 @@ EFI_HANDLE  mDpcHandle = NULL;
 //\r
 // The EFI_DPC_PROTOCOL instances that is installed onto mDpcHandle\r
 //\r
-EFI_DPC_PROTOCOL mDpc = {\r
+EFI_DPC_PROTOCOL  mDpc = {\r
   DpcQueueDpc,\r
   DpcDispatchDpc\r
 };\r
@@ -30,7 +30,7 @@ EFI_DPC_PROTOCOL mDpc = {
 //\r
 // Global variables used to measure the DPC Queue Depths\r
 //\r
-UINTN  mDpcQueueDepth = 0;\r
+UINTN  mDpcQueueDepth    = 0;\r
 UINTN  mMaxDpcQueueDepth = 0;\r
 \r
 //\r
@@ -39,14 +39,14 @@ UINTN  mMaxDpcQueueDepth = 0;
 // If the free list is empty and a DPC is queued, the free list is grown by allocating\r
 // an additional set of DPC entries.\r
 //\r
-LIST_ENTRY      mDpcEntryFreeList = INITIALIZE_LIST_HEAD_VARIABLE(mDpcEntryFreeList);\r
+LIST_ENTRY  mDpcEntryFreeList = INITIALIZE_LIST_HEAD_VARIABLE (mDpcEntryFreeList);\r
 \r
 //\r
 // An array of DPC queues.  A DPC queue is allocated for every level EFI_TPL value.\r
 // As DPCs are queued, they are added to the end of the linked list.\r
 // As DPCs are dispatched, they are removed from the beginning of the linked list.\r
 //\r
-LIST_ENTRY      mDpcQueue[TPL_HIGH_LEVEL + 1];\r
+LIST_ENTRY  mDpcQueue[TPL_HIGH_LEVEL + 1];\r
 \r
 /**\r
   Add a Deferred Procedure Call to the end of the DPC queue.\r
@@ -81,7 +81,7 @@ DpcQueueDpc (
   //\r
   // Make sure DpcTpl is valid\r
   //\r
-  if (DpcTpl < TPL_APPLICATION || DpcTpl > TPL_HIGH_LEVEL) {\r
+  if ((DpcTpl < TPL_APPLICATION) || (DpcTpl > TPL_HIGH_LEVEL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -265,7 +265,7 @@ DpcDispatchDpc (
         //\r
         // Invoke the DPC passing in its context\r
         //\r
-        (DpcEntry->DpcProcedure) (DpcEntry->DpcContext);\r
+        (DpcEntry->DpcProcedure)(DpcEntry->DpcContext);\r
 \r
         //\r
         // At least one DPC has been invoked, so set the return status to EFI_SUCCESS\r
index a5e6f7b62f902c4f4a7ebda4a75d6bff607c7bbb..e94858e698355ddfd278e86a7f58e844303c9653 100644 (file)
@@ -28,9 +28,9 @@ Abstract:
 // list or on a DPC queue at a specific EFI_TPL.\r
 //\r
 typedef struct {\r
-  LIST_ENTRY             ListEntry;\r
-  EFI_DPC_PROCEDURE  DpcProcedure;\r
-  VOID               *DpcContext;\r
+  LIST_ENTRY           ListEntry;\r
+  EFI_DPC_PROCEDURE    DpcProcedure;\r
+  VOID                 *DpcContext;\r
 } DPC_ENTRY;\r
 \r
 /**\r
@@ -77,4 +77,3 @@ DpcDispatchDpc (
   );\r
 \r
 #endif\r
-\r
index d12076b2202c57c9926fc62380756333ba1be690..62e87238fef7bc9d577c7099ebf92355c13a503c 100644 (file)
@@ -21,15 +21,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 HttpBootUpdateDevicePath (\r
-  IN   HTTP_BOOT_PRIVATE_DATA   *Private\r
+  IN   HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_DEV_PATH               *Node;\r
-  EFI_DEVICE_PATH_PROTOCOL   *TmpIpDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL   *TmpDnsDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL   *NewDevicePath;\r
-  UINTN                      Length;\r
-  EFI_STATUS                 Status;\r
+  EFI_DEV_PATH              *Node;\r
+  EFI_DEVICE_PATH_PROTOCOL  *TmpIpDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL  *TmpDnsDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL  *NewDevicePath;\r
+  UINTN                     Length;\r
+  EFI_STATUS                Status;\r
 \r
   TmpIpDevicePath  = NULL;\r
   TmpDnsDevicePath = NULL;\r
@@ -42,6 +42,7 @@ HttpBootUpdateDevicePath (
     if (Node == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\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
@@ -56,8 +57,9 @@ HttpBootUpdateDevicePath (
     if (Node == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-    Node->Ipv6.Header.Type     = MESSAGING_DEVICE_PATH;\r
-    Node->Ipv6.Header.SubType  = MSG_IPv6_DP;\r
+\r
+    Node->Ipv6.Header.Type    = MESSAGING_DEVICE_PATH;\r
+    Node->Ipv6.Header.SubType = MSG_IPv6_DP;\r
     SetDevicePathNodeLength (Node, sizeof (IPv6_DEVICE_PATH));\r
     Node->Ipv6.PrefixLength    = IP6_PREFIX_LENGTH;\r
     Node->Ipv6.RemotePort      = Private->Port;\r
@@ -68,7 +70,7 @@ HttpBootUpdateDevicePath (
     CopyMem (&Node->Ipv6.GatewayIpAddress, &Private->GatewayIp.v6, sizeof (EFI_IPv6_ADDRESS));\r
   }\r
 \r
-  TmpIpDevicePath = AppendDevicePathNode (Private->ParentDevicePath, (EFI_DEVICE_PATH_PROTOCOL*) Node);\r
+  TmpIpDevicePath = AppendDevicePathNode (Private->ParentDevicePath, (EFI_DEVICE_PATH_PROTOCOL *)Node);\r
   FreePool (Node);\r
   if (TmpIpDevicePath == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
@@ -79,18 +81,19 @@ HttpBootUpdateDevicePath (
   //\r
   if (Private->DnsServerIp != NULL) {\r
     Length = sizeof (EFI_DEVICE_PATH_PROTOCOL) + sizeof (Node->Dns.IsIPv6) + Private->DnsServerCount * sizeof (EFI_IP_ADDRESS);\r
-    Node = AllocatePool (Length);\r
+    Node   = AllocatePool (Length);\r
     if (Node == NULL) {\r
       FreePool (TmpIpDevicePath);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     Node->DevPath.Type    = MESSAGING_DEVICE_PATH;\r
     Node->DevPath.SubType = MSG_DNS_DP;\r
     SetDevicePathNodeLength (Node, Length);\r
     Node->Dns.IsIPv6 = Private->UsingIpv6 ? 0x01 : 0x00;\r
-    CopyMem ((UINT8*) Node + sizeof (EFI_DEVICE_PATH_PROTOCOL) + sizeof (Node->Dns.IsIPv6), Private->DnsServerIp, Private->DnsServerCount * sizeof (EFI_IP_ADDRESS));\r
+    CopyMem ((UINT8 *)Node + sizeof (EFI_DEVICE_PATH_PROTOCOL) + sizeof (Node->Dns.IsIPv6), Private->DnsServerIp, Private->DnsServerCount * sizeof (EFI_IP_ADDRESS));\r
 \r
-    TmpDnsDevicePath = AppendDevicePathNode (TmpIpDevicePath, (EFI_DEVICE_PATH_PROTOCOL*) Node);\r
+    TmpDnsDevicePath = AppendDevicePathNode (TmpIpDevicePath, (EFI_DEVICE_PATH_PROTOCOL *)Node);\r
     FreePool (Node);\r
     FreePool (TmpIpDevicePath);\r
     TmpIpDevicePath = NULL;\r
@@ -103,29 +106,33 @@ HttpBootUpdateDevicePath (
   // Update the URI node with the boot file URI.\r
   //\r
   Length = sizeof (EFI_DEVICE_PATH_PROTOCOL) + AsciiStrSize (Private->BootFileUri);\r
-  Node = AllocatePool (Length);\r
+  Node   = AllocatePool (Length);\r
   if (Node == NULL) {\r
     if (TmpIpDevicePath != NULL) {\r
       FreePool (TmpIpDevicePath);\r
     }\r
+\r
     if (TmpDnsDevicePath != NULL) {\r
       FreePool (TmpDnsDevicePath);\r
     }\r
+\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   Node->DevPath.Type    = MESSAGING_DEVICE_PATH;\r
   Node->DevPath.SubType = MSG_URI_DP;\r
   SetDevicePathNodeLength (Node, Length);\r
-  CopyMem ((UINT8*) Node + sizeof (EFI_DEVICE_PATH_PROTOCOL), Private->BootFileUri, AsciiStrSize (Private->BootFileUri));\r
+  CopyMem ((UINT8 *)Node + sizeof (EFI_DEVICE_PATH_PROTOCOL), Private->BootFileUri, AsciiStrSize (Private->BootFileUri));\r
 \r
   if (TmpDnsDevicePath != NULL) {\r
-    NewDevicePath = AppendDevicePathNode (TmpDnsDevicePath, (EFI_DEVICE_PATH_PROTOCOL*) Node);\r
+    NewDevicePath = AppendDevicePathNode (TmpDnsDevicePath, (EFI_DEVICE_PATH_PROTOCOL *)Node);\r
     FreePool (TmpDnsDevicePath);\r
   } else {\r
     ASSERT (TmpIpDevicePath != NULL);\r
-    NewDevicePath = AppendDevicePathNode (TmpIpDevicePath, (EFI_DEVICE_PATH_PROTOCOL*) Node);\r
+    NewDevicePath = AppendDevicePathNode (TmpIpDevicePath, (EFI_DEVICE_PATH_PROTOCOL *)Node);\r
     FreePool (TmpIpDevicePath);\r
   }\r
+\r
   FreePool (Node);\r
   if (NewDevicePath == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
@@ -160,6 +167,7 @@ HttpBootUpdateDevicePath (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     FreePool (Private->Ip6Nic->DevicePath);\r
     Private->Ip6Nic->DevicePath = NewDevicePath;\r
   }\r
@@ -178,16 +186,16 @@ HttpBootUpdateDevicePath (
 **/\r
 EFI_STATUS\r
 HttpBootDhcp4ExtractUriInfo (\r
-  IN     HTTP_BOOT_PRIVATE_DATA   *Private\r
+  IN     HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  HTTP_BOOT_DHCP4_PACKET_CACHE    *SelectOffer;\r
-  HTTP_BOOT_DHCP4_PACKET_CACHE    *HttpOffer;\r
-  UINT32                          SelectIndex;\r
-  UINT32                          ProxyIndex;\r
-  UINT32                          DnsServerIndex;\r
-  EFI_DHCP4_PACKET_OPTION         *Option;\r
-  EFI_STATUS                      Status;\r
+  HTTP_BOOT_DHCP4_PACKET_CACHE  *SelectOffer;\r
+  HTTP_BOOT_DHCP4_PACKET_CACHE  *HttpOffer;\r
+  UINT32                        SelectIndex;\r
+  UINT32                        ProxyIndex;\r
+  UINT32                        DnsServerIndex;\r
+  EFI_DHCP4_PACKET_OPTION       *Option;\r
+  EFI_STATUS                    Status;\r
 \r
   ASSERT (Private != NULL);\r
   ASSERT (Private->SelectIndex != 0);\r
@@ -209,21 +217,23 @@ HttpBootDhcp4ExtractUriInfo (
     //\r
     if ((SelectOffer->OfferType == HttpOfferTypeDhcpIpUri) ||\r
         (SelectOffer->OfferType == HttpOfferTypeDhcpIpUriDns) ||\r
-        (SelectOffer->OfferType == HttpOfferTypeDhcpNameUriDns)) {\r
+        (SelectOffer->OfferType == HttpOfferTypeDhcpNameUriDns))\r
+    {\r
       HttpOffer = SelectOffer;\r
     } else {\r
       ASSERT (Private->SelectProxyType != HttpOfferTypeMax);\r
       ProxyIndex = Private->OfferIndex[Private->SelectProxyType][0];\r
-      HttpOffer = &Private->OfferBuffer[ProxyIndex].Dhcp4;\r
+      HttpOffer  = &Private->OfferBuffer[ProxyIndex].Dhcp4;\r
     }\r
+\r
     Private->BootFileUriParser = HttpOffer->UriParser;\r
-    Private->BootFileUri = (CHAR8*) HttpOffer->OptList[HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE]->Data;\r
+    Private->BootFileUri       = (CHAR8 *)HttpOffer->OptList[HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE]->Data;\r
   } else {\r
     //\r
     // In Home environment the BootFileUri comes from the FilePath.\r
     //\r
     Private->BootFileUriParser = Private->FilePathUriParser;\r
-    Private->BootFileUri = Private->FilePathUri;\r
+    Private->BootFileUri       = Private->FilePathUri;\r
   }\r
 \r
   //\r
@@ -237,12 +247,14 @@ HttpBootDhcp4ExtractUriInfo (
     } else if (Status == EFI_ACCESS_DENIED) {\r
       AsciiPrint ("\n  Error: Access forbidden, only HTTPS connection is allowed.\n");\r
     }\r
+\r
     return Status;\r
   }\r
 \r
   if ((SelectOffer->OfferType == HttpOfferTypeDhcpNameUriDns) ||\r
       (SelectOffer->OfferType == HttpOfferTypeDhcpDns) ||\r
-      (SelectOffer->OfferType == HttpOfferTypeDhcpIpUriDns)) {\r
+      (SelectOffer->OfferType == HttpOfferTypeDhcpIpUriDns))\r
+  {\r
     Option = SelectOffer->OptList[HTTP_BOOT_DHCP4_TAG_INDEX_DNS_SERVER];\r
     ASSERT (Option != NULL);\r
 \r
@@ -257,7 +269,7 @@ HttpBootDhcp4ExtractUriInfo (
     }\r
 \r
     for (DnsServerIndex = 0; DnsServerIndex < Private->DnsServerCount; DnsServerIndex++) {\r
-      CopyMem (&(Private->DnsServerIp[DnsServerIndex].v4), &(((EFI_IPv4_ADDRESS *) Option->Data)[DnsServerIndex]), sizeof (EFI_IPv4_ADDRESS));\r
+      CopyMem (&(Private->DnsServerIp[DnsServerIndex].v4), &(((EFI_IPv4_ADDRESS *)Option->Data)[DnsServerIndex]), sizeof (EFI_IPv4_ADDRESS));\r
     }\r
 \r
     //\r
@@ -283,7 +295,7 @@ HttpBootDhcp4ExtractUriInfo (
              Private->BootFileUriParser,\r
              &Private->Port\r
              );\r
-  if (EFI_ERROR (Status) || Private->Port == 0) {\r
+  if (EFI_ERROR (Status) || (Private->Port == 0)) {\r
     Private->Port = 80;\r
   }\r
 \r
@@ -295,7 +307,7 @@ HttpBootDhcp4ExtractUriInfo (
   // Update the device path to include the boot resource information.\r
   //\r
   Status = HttpBootUpdateDevicePath (Private);\r
-  if (EFI_ERROR (Status) && Private->DnsServerIp != NULL) {\r
+  if (EFI_ERROR (Status) && (Private->DnsServerIp != NULL)) {\r
     FreePool (Private->DnsServerIp);\r
     Private->DnsServerIp = NULL;\r
   }\r
@@ -314,20 +326,20 @@ HttpBootDhcp4ExtractUriInfo (
 **/\r
 EFI_STATUS\r
 HttpBootDhcp6ExtractUriInfo (\r
-  IN     HTTP_BOOT_PRIVATE_DATA   *Private\r
+  IN     HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  HTTP_BOOT_DHCP6_PACKET_CACHE    *SelectOffer;\r
-  HTTP_BOOT_DHCP6_PACKET_CACHE    *HttpOffer;\r
-  UINT32                          SelectIndex;\r
-  UINT32                          ProxyIndex;\r
-  UINT32                          DnsServerIndex;\r
-  EFI_DHCP6_PACKET_OPTION         *Option;\r
-  EFI_IPv6_ADDRESS                IpAddr;\r
-  CHAR8                           *HostName;\r
-  UINTN                           HostNameSize;\r
-  CHAR16                          *HostNameStr;\r
-  EFI_STATUS                      Status;\r
+  HTTP_BOOT_DHCP6_PACKET_CACHE  *SelectOffer;\r
+  HTTP_BOOT_DHCP6_PACKET_CACHE  *HttpOffer;\r
+  UINT32                        SelectIndex;\r
+  UINT32                        ProxyIndex;\r
+  UINT32                        DnsServerIndex;\r
+  EFI_DHCP6_PACKET_OPTION       *Option;\r
+  EFI_IPv6_ADDRESS              IpAddr;\r
+  CHAR8                         *HostName;\r
+  UINTN                         HostNameSize;\r
+  CHAR16                        *HostNameStr;\r
+  EFI_STATUS                    Status;\r
 \r
   ASSERT (Private != NULL);\r
   ASSERT (Private->SelectIndex != 0);\r
@@ -349,21 +361,23 @@ HttpBootDhcp6ExtractUriInfo (
     //\r
     if ((SelectOffer->OfferType == HttpOfferTypeDhcpIpUri) ||\r
         (SelectOffer->OfferType == HttpOfferTypeDhcpIpUriDns) ||\r
-        (SelectOffer->OfferType == HttpOfferTypeDhcpNameUriDns)) {\r
+        (SelectOffer->OfferType == HttpOfferTypeDhcpNameUriDns))\r
+    {\r
       HttpOffer = SelectOffer;\r
     } else {\r
       ASSERT (Private->SelectProxyType != HttpOfferTypeMax);\r
       ProxyIndex = Private->OfferIndex[Private->SelectProxyType][0];\r
-      HttpOffer = &Private->OfferBuffer[ProxyIndex].Dhcp6;\r
+      HttpOffer  = &Private->OfferBuffer[ProxyIndex].Dhcp6;\r
     }\r
+\r
     Private->BootFileUriParser = HttpOffer->UriParser;\r
-    Private->BootFileUri = (CHAR8*) HttpOffer->OptList[HTTP_BOOT_DHCP6_IDX_BOOT_FILE_URL]->Data;\r
+    Private->BootFileUri       = (CHAR8 *)HttpOffer->OptList[HTTP_BOOT_DHCP6_IDX_BOOT_FILE_URL]->Data;\r
   } else {\r
     //\r
     // In Home environment the BootFileUri comes from the FilePath.\r
     //\r
     Private->BootFileUriParser = Private->FilePathUriParser;\r
-    Private->BootFileUri = Private->FilePathUri;\r
+    Private->BootFileUri       = Private->FilePathUri;\r
   }\r
 \r
   //\r
@@ -377,6 +391,7 @@ HttpBootDhcp6ExtractUriInfo (
     } else if (Status == EFI_ACCESS_DENIED) {\r
       AsciiPrint ("\n  Error: Access forbidden, only HTTPS connection is allowed.\n");\r
     }\r
+\r
     return Status;\r
   }\r
 \r
@@ -398,7 +413,8 @@ HttpBootDhcp6ExtractUriInfo (
 \r
   if ((SelectOffer->OfferType == HttpOfferTypeDhcpNameUriDns) ||\r
       (SelectOffer->OfferType == HttpOfferTypeDhcpDns) ||\r
-      (SelectOffer->OfferType == HttpOfferTypeDhcpIpUriDns)) {\r
+      (SelectOffer->OfferType == HttpOfferTypeDhcpIpUriDns))\r
+  {\r
     Option = SelectOffer->OptList[HTTP_BOOT_DHCP6_IDX_DNS_SERVER];\r
     ASSERT (Option != NULL);\r
 \r
@@ -413,7 +429,7 @@ HttpBootDhcp6ExtractUriInfo (
     }\r
 \r
     for (DnsServerIndex = 0; DnsServerIndex < Private->DnsServerCount; DnsServerIndex++) {\r
-      CopyMem (&(Private->DnsServerIp[DnsServerIndex].v6), &(((EFI_IPv6_ADDRESS *) Option->Data)[DnsServerIndex]), sizeof (EFI_IPv6_ADDRESS));\r
+      CopyMem (&(Private->DnsServerIp[DnsServerIndex].v6), &(((EFI_IPv6_ADDRESS *)Option->Data)[DnsServerIndex]), sizeof (EFI_IPv6_ADDRESS));\r
     }\r
 \r
     //\r
@@ -453,7 +469,7 @@ HttpBootDhcp6ExtractUriInfo (
     }\r
 \r
     HostNameSize = AsciiStrSize (HostName);\r
-    HostNameStr = AllocateZeroPool (HostNameSize * sizeof (CHAR16));\r
+    HostNameStr  = AllocateZeroPool (HostNameSize * sizeof (CHAR16));\r
     if (HostNameStr == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Error;\r
@@ -483,7 +499,7 @@ HttpBootDhcp6ExtractUriInfo (
              Private->BootFileUriParser,\r
              &Private->Port\r
              );\r
-  if (EFI_ERROR (Status) || Private->Port == 0) {\r
+  if (EFI_ERROR (Status) || (Private->Port == 0)) {\r
     Private->Port = 80;\r
   }\r
 \r
@@ -510,7 +526,6 @@ Error:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Discover all the boot information for boot file.\r
 \r
@@ -522,10 +537,10 @@ Error:
 **/\r
 EFI_STATUS\r
 HttpBootDiscoverBootInfo (\r
-  IN OUT HTTP_BOOT_PRIVATE_DATA   *Private\r
+  IN OUT HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Start D.O.R.A/S.A.R.R exchange to acquire station ip address and\r
@@ -558,24 +573,26 @@ HttpBootDiscoverBootInfo (
 EFI_STATUS\r
 EFIAPI\r
 HttpBootHttpIoCallback (\r
-  IN  HTTP_IO_CALLBACK_EVENT    EventType,\r
-  IN  EFI_HTTP_MESSAGE          *Message,\r
-  IN  VOID                      *Context\r
+  IN  HTTP_IO_CALLBACK_EVENT  EventType,\r
+  IN  EFI_HTTP_MESSAGE        *Message,\r
+  IN  VOID                    *Context\r
   )\r
 {\r
-  HTTP_BOOT_PRIVATE_DATA       *Private;\r
-  EFI_STATUS                   Status;\r
-  Private = (HTTP_BOOT_PRIVATE_DATA *) Context;\r
+  HTTP_BOOT_PRIVATE_DATA  *Private;\r
+  EFI_STATUS              Status;\r
+\r
+  Private = (HTTP_BOOT_PRIVATE_DATA *)Context;\r
   if (Private->HttpBootCallback != NULL) {\r
     Status = Private->HttpBootCallback->Callback (\r
-               Private->HttpBootCallback,\r
-               EventType == HttpIoRequest ? HttpBootHttpRequest : HttpBootHttpResponse,\r
-               EventType == HttpIoRequest ? FALSE : TRUE,\r
-               sizeof (EFI_HTTP_MESSAGE),\r
-               (VOID *) Message\r
-               );\r
+                                          Private->HttpBootCallback,\r
+                                          EventType == HttpIoRequest ? HttpBootHttpRequest : HttpBootHttpResponse,\r
+                                          EventType == HttpIoRequest ? FALSE : TRUE,\r
+                                          sizeof (EFI_HTTP_MESSAGE),\r
+                                          (VOID *)Message\r
+                                          );\r
     return Status;\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -590,13 +607,13 @@ HttpBootHttpIoCallback (
 **/\r
 EFI_STATUS\r
 HttpBootCreateHttpIo (\r
-  IN     HTTP_BOOT_PRIVATE_DATA       *Private\r
+  IN     HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  HTTP_IO_CONFIG_DATA          ConfigData;\r
-  EFI_STATUS                   Status;\r
-  EFI_HANDLE                   ImageHandle;\r
-  UINT32                       TimeoutValue;\r
+  HTTP_IO_CONFIG_DATA  ConfigData;\r
+  EFI_STATUS           Status;\r
+  EFI_HANDLE           ImageHandle;\r
+  UINT32               TimeoutValue;\r
 \r
   ASSERT (Private != NULL);\r
 \r
@@ -625,7 +642,7 @@ HttpBootCreateHttpIo (
              Private->UsingIpv6 ? IP_VERSION_6 : IP_VERSION_4,\r
              &ConfigData,\r
              HttpBootHttpIoCallback,\r
-             (VOID *) Private,\r
+             (VOID *)Private,\r
              &Private->HttpIo\r
              );\r
   if (EFI_ERROR (Status)) {\r
@@ -644,13 +661,13 @@ HttpBootCreateHttpIo (
 **/\r
 VOID\r
 HttpBootFreeCache (\r
-  IN  HTTP_BOOT_CACHE_CONTENT    *Cache\r
+  IN  HTTP_BOOT_CACHE_CONTENT  *Cache\r
   )\r
 {\r
-  UINTN                       Index;\r
-  LIST_ENTRY                  *Entry;\r
-  LIST_ENTRY                  *NextEntry;\r
-  HTTP_BOOT_ENTITY_DATA       *EntityData;\r
+  UINTN                  Index;\r
+  LIST_ENTRY             *Entry;\r
+  LIST_ENTRY             *NextEntry;\r
+  HTTP_BOOT_ENTITY_DATA  *EntityData;\r
 \r
   if (Cache != NULL) {\r
     //\r
@@ -660,6 +677,7 @@ HttpBootFreeCache (
       if (Cache->RequestData->Url != NULL) {\r
         FreePool (Cache->RequestData->Url);\r
       }\r
+\r
       FreePool (Cache->RequestData);\r
     }\r
 \r
@@ -672,6 +690,7 @@ HttpBootFreeCache (
           FreePool (Cache->ResponseData->Headers[Index].FieldName);\r
           FreePool (Cache->ResponseData->Headers[Index].FieldValue);\r
         }\r
+\r
         FreePool (Cache->ResponseData->Headers);\r
       }\r
     }\r
@@ -684,6 +703,7 @@ HttpBootFreeCache (
       if (EntityData->Block != NULL) {\r
         FreePool (EntityData->Block);\r
       }\r
+\r
       RemoveEntryList (&EntityData->Link);\r
       FreePool (EntityData);\r
     }\r
@@ -700,12 +720,12 @@ HttpBootFreeCache (
 **/\r
 VOID\r
 HttpBootFreeCacheList (\r
-  IN     HTTP_BOOT_PRIVATE_DATA   *Private\r
+  IN     HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  LIST_ENTRY                  *Entry;\r
-  LIST_ENTRY                  *NextEntry;\r
-  HTTP_BOOT_CACHE_CONTENT     *Cache;\r
+  LIST_ENTRY               *Entry;\r
+  LIST_ENTRY               *NextEntry;\r
+  HTTP_BOOT_CACHE_CONTENT  *Cache;\r
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, &Private->CacheList) {\r
     Cache = NET_LIST_USER_STRUCT (Entry, HTTP_BOOT_CACHE_CONTENT, Link);\r
@@ -734,20 +754,20 @@ HttpBootFreeCacheList (
 **/\r
 EFI_STATUS\r
 HttpBootGetFileFromCache (\r
-  IN     HTTP_BOOT_PRIVATE_DATA   *Private,\r
-  IN     CHAR16                   *Uri,\r
-  IN OUT UINTN                    *BufferSize,\r
-     OUT UINT8                    *Buffer,\r
-     OUT HTTP_BOOT_IMAGE_TYPE     *ImageType\r
+  IN     HTTP_BOOT_PRIVATE_DATA  *Private,\r
+  IN     CHAR16                  *Uri,\r
+  IN OUT UINTN                   *BufferSize,\r
+  OUT UINT8                      *Buffer,\r
+  OUT HTTP_BOOT_IMAGE_TYPE       *ImageType\r
   )\r
 {\r
-  LIST_ENTRY                  *Entry;\r
-  LIST_ENTRY                  *Entry2;\r
-  HTTP_BOOT_CACHE_CONTENT     *Cache;\r
-  HTTP_BOOT_ENTITY_DATA       *EntityData;\r
-  UINTN                       CopyedSize;\r
+  LIST_ENTRY               *Entry;\r
+  LIST_ENTRY               *Entry2;\r
+  HTTP_BOOT_CACHE_CONTENT  *Cache;\r
+  HTTP_BOOT_ENTITY_DATA    *EntityData;\r
+  UINTN                    CopyedSize;\r
 \r
-  if (Uri == NULL || BufferSize == NULL || Buffer == NULL || ImageType == NULL) {\r
+  if ((Uri == NULL) || (BufferSize == NULL) || (Buffer == NULL) || (ImageType == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -758,11 +778,12 @@ HttpBootGetFileFromCache (
     //\r
     if ((Cache->RequestData != NULL) &&\r
         (Cache->RequestData->Url != NULL) &&\r
-        (StrCmp (Uri, Cache->RequestData->Url) == 0)) {\r
+        (StrCmp (Uri, Cache->RequestData->Url) == 0))\r
+    {\r
       //\r
       // Hit in cache, record image type.\r
       //\r
-      *ImageType  = Cache->ImageType;\r
+      *ImageType = Cache->ImageType;\r
 \r
       //\r
       // Check buffer size.\r
@@ -813,16 +834,16 @@ HttpBootGetFileFromCache (
 EFI_STATUS\r
 EFIAPI\r
 HttpBootGetBootFileCallback (\r
-  IN HTTP_BODY_PARSE_EVENT      EventType,\r
-  IN CHAR8                      *Data,\r
-  IN UINTN                      Length,\r
-  IN VOID                       *Context\r
+  IN HTTP_BODY_PARSE_EVENT  EventType,\r
+  IN CHAR8                  *Data,\r
+  IN UINTN                  Length,\r
+  IN VOID                   *Context\r
   )\r
 {\r
-  HTTP_BOOT_CALLBACK_DATA      *CallbackData;\r
-  HTTP_BOOT_ENTITY_DATA        *NewEntityData;\r
-  EFI_STATUS                   Status;\r
-  EFI_HTTP_BOOT_CALLBACK_PROTOCOL   *HttpBootCallback;\r
+  HTTP_BOOT_CALLBACK_DATA          *CallbackData;\r
+  HTTP_BOOT_ENTITY_DATA            *NewEntityData;\r
+  EFI_STATUS                       Status;\r
+  EFI_HTTP_BOOT_CALLBACK_PROTOCOL  *HttpBootCallback;\r
 \r
   //\r
   // We only care about the entity data.\r
@@ -831,20 +852,21 @@ HttpBootGetBootFileCallback (
     return EFI_SUCCESS;\r
   }\r
 \r
-  CallbackData = (HTTP_BOOT_CALLBACK_DATA *) Context;\r
+  CallbackData     = (HTTP_BOOT_CALLBACK_DATA *)Context;\r
   HttpBootCallback = CallbackData->Private->HttpBootCallback;\r
   if (HttpBootCallback != NULL) {\r
     Status = HttpBootCallback->Callback (\r
-               HttpBootCallback,\r
-               HttpBootHttpEntityBody,\r
-               TRUE,\r
-               (UINT32)Length,\r
-               Data\r
-               );\r
+                                 HttpBootCallback,\r
+                                 HttpBootHttpEntityBody,\r
+                                 TRUE,\r
+                                 (UINT32)Length,\r
+                                 Data\r
+                                 );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
   }\r
+\r
   //\r
   // Copy data if caller has provided a buffer.\r
   //\r
@@ -865,14 +887,17 @@ HttpBootGetBootFileCallback (
     if (NewEntityData == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     if (CallbackData->NewBlock) {\r
       NewEntityData->Block = CallbackData->Block;\r
-      CallbackData->Block = NULL;\r
+      CallbackData->Block  = NULL;\r
     }\r
+\r
     NewEntityData->DataLength = Length;\r
-    NewEntityData->DataStart  = (UINT8*) Data;\r
+    NewEntityData->DataStart  = (UINT8 *)Data;\r
     InsertTailList (&CallbackData->Cache->EntityDataList, &NewEntityData->Link);\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -902,39 +927,39 @@ HttpBootGetBootFileCallback (
 **/\r
 EFI_STATUS\r
 HttpBootGetBootFile (\r
-  IN     HTTP_BOOT_PRIVATE_DATA   *Private,\r
-  IN     BOOLEAN                  HeaderOnly,\r
-  IN OUT UINTN                    *BufferSize,\r
-     OUT UINT8                    *Buffer,\r
-     OUT HTTP_BOOT_IMAGE_TYPE     *ImageType\r
+  IN     HTTP_BOOT_PRIVATE_DATA  *Private,\r
+  IN     BOOLEAN                 HeaderOnly,\r
+  IN OUT UINTN                   *BufferSize,\r
+  OUT UINT8                      *Buffer,\r
+  OUT HTTP_BOOT_IMAGE_TYPE       *ImageType\r
   )\r
 {\r
-  EFI_STATUS                 Status;\r
-  EFI_HTTP_STATUS_CODE       StatusCode;\r
-  CHAR8                      *HostName;\r
-  EFI_HTTP_REQUEST_DATA      *RequestData;\r
-  HTTP_IO_RESPONSE_DATA      *ResponseData;\r
-  HTTP_IO_RESPONSE_DATA      ResponseBody;\r
-  HTTP_IO                    *HttpIo;\r
-  HTTP_IO_HEADER             *HttpIoHeader;\r
-  VOID                       *Parser;\r
-  HTTP_BOOT_CALLBACK_DATA    Context;\r
-  UINTN                      ContentLength;\r
-  HTTP_BOOT_CACHE_CONTENT    *Cache;\r
-  UINT8                      *Block;\r
-  UINTN                      UrlSize;\r
-  CHAR16                     *Url;\r
-  BOOLEAN                    IdentityMode;\r
-  UINTN                      ReceivedSize;\r
+  EFI_STATUS               Status;\r
+  EFI_HTTP_STATUS_CODE     StatusCode;\r
+  CHAR8                    *HostName;\r
+  EFI_HTTP_REQUEST_DATA    *RequestData;\r
+  HTTP_IO_RESPONSE_DATA    *ResponseData;\r
+  HTTP_IO_RESPONSE_DATA    ResponseBody;\r
+  HTTP_IO                  *HttpIo;\r
+  HTTP_IO_HEADER           *HttpIoHeader;\r
+  VOID                     *Parser;\r
+  HTTP_BOOT_CALLBACK_DATA  Context;\r
+  UINTN                    ContentLength;\r
+  HTTP_BOOT_CACHE_CONTENT  *Cache;\r
+  UINT8                    *Block;\r
+  UINTN                    UrlSize;\r
+  CHAR16                   *Url;\r
+  BOOLEAN                  IdentityMode;\r
+  UINTN                    ReceivedSize;\r
 \r
   ASSERT (Private != NULL);\r
   ASSERT (Private->HttpCreated);\r
 \r
-  if (BufferSize == NULL || ImageType == NULL) {\r
+  if ((BufferSize == NULL) || (ImageType == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (*BufferSize != 0 && Buffer == NULL) {\r
+  if ((*BufferSize != 0) && (Buffer == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -942,12 +967,13 @@ HttpBootGetBootFile (
   // First, check whether we already cached the requested Uri.\r
   //\r
   UrlSize = AsciiStrSize (Private->BootFileUri);\r
-  Url = AllocatePool (UrlSize * sizeof (CHAR16));\r
+  Url     = AllocatePool (UrlSize * sizeof (CHAR16));\r
   if (Url == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   AsciiStrToUnicodeStrS (Private->BootFileUri, Url, UrlSize);\r
-  if (!HeaderOnly && Buffer != NULL) {\r
+  if (!HeaderOnly && (Buffer != NULL)) {\r
     Status = HttpBootGetFileFromCache (Private, Url, BufferSize, Buffer, ImageType);\r
     if (Status != EFI_NOT_FOUND) {\r
       FreePool (Url);\r
@@ -969,6 +995,7 @@ HttpBootGetBootFile (
       Status = EFI_OUT_OF_RESOURCES;\r
       goto ERROR_1;\r
     }\r
+\r
     Cache->ImageType = ImageTypeMax;\r
     InitializeListHead (&Cache->EntityDataList);\r
   }\r
@@ -993,14 +1020,15 @@ HttpBootGetBootFile (
   // Add HTTP header field 1: Host\r
   //\r
   HostName = NULL;\r
-  Status = HttpUrlGetHostName (\r
-             Private->BootFileUri,\r
-             Private->BootFileUriParser,\r
-             &HostName\r
-             );\r
+  Status   = HttpUrlGetHostName (\r
+               Private->BootFileUri,\r
+               Private->BootFileUriParser,\r
+               &HostName\r
+               );\r
   if (EFI_ERROR (Status)) {\r
     goto ERROR_3;\r
   }\r
+\r
   Status = HttpIoSetHeader (\r
              HttpIoHeader,\r
              HTTP_HEADER_HOST,\r
@@ -1043,8 +1071,9 @@ HttpBootGetBootFile (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ERROR_3;\r
   }\r
+\r
   RequestData->Method = HeaderOnly ? HttpMethodHead : HttpMethodGet;\r
-  RequestData->Url = Url;\r
+  RequestData->Url    = Url;\r
 \r
   //\r
   // 2.3 Record the request info in a temp cache item.\r
@@ -1064,7 +1093,7 @@ HttpBootGetBootFile (
              HttpIoHeader->Headers,\r
              0,\r
              NULL\r
-            );\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto ERROR_4;\r
   }\r
@@ -1076,11 +1105,12 @@ HttpBootGetBootFile (
   //\r
   // 3.1 First step, use zero BodyLength to only receive the response headers.\r
   //\r
-  ResponseData = AllocateZeroPool (sizeof(HTTP_IO_RESPONSE_DATA));\r
+  ResponseData = AllocateZeroPool (sizeof (HTTP_IO_RESPONSE_DATA));\r
   if (ResponseData == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ERROR_4;\r
   }\r
+\r
   Status = HttpIoRecvResponse (\r
              &Private->HttpIo,\r
              TRUE,\r
@@ -1092,6 +1122,7 @@ HttpBootGetBootFile (
       HttpBootPrintErrorMessage (StatusCode);\r
       Status = ResponseData->Status;\r
     }\r
+\r
     goto ERROR_5;\r
   }\r
 \r
@@ -1114,13 +1145,13 @@ HttpBootGetBootFile (
   //\r
   if (Cache != NULL) {\r
     Cache->ResponseData = ResponseData;\r
-    Cache->ImageType = *ImageType;\r
+    Cache->ImageType    = *ImageType;\r
   }\r
 \r
   //\r
   // 3.3 Init a message-body parser from the header information.\r
   //\r
-  Parser = NULL;\r
+  Parser             = NULL;\r
   Context.NewBlock   = FALSE;\r
   Context.Block      = NULL;\r
   Context.CopyedSize = 0;\r
@@ -1128,15 +1159,15 @@ HttpBootGetBootFile (
   Context.BufferSize = *BufferSize;\r
   Context.Cache      = Cache;\r
   Context.Private    = Private;\r
-  Status = HttpInitMsgParser (\r
-             HeaderOnly ? HttpMethodHead : HttpMethodGet,\r
-             ResponseData->Response.StatusCode,\r
-             ResponseData->HeaderCount,\r
-             ResponseData->Headers,\r
-             HttpBootGetBootFileCallback,\r
-             (VOID*) &Context,\r
-             &Parser\r
-             );\r
+  Status             = HttpInitMsgParser (\r
+                         HeaderOnly ? HttpMethodHead : HttpMethodGet,\r
+                         ResponseData->Response.StatusCode,\r
+                         ResponseData->HeaderCount,\r
+                         ResponseData->Headers,\r
+                         HttpBootGetBootFileCallback,\r
+                         (VOID *)&Context,\r
+                         &Parser\r
+                         );\r
   if (EFI_ERROR (Status)) {\r
     goto ERROR_6;\r
   }\r
@@ -1150,7 +1181,7 @@ HttpBootGetBootFile (
     // 3.4.1, check whether we are in identity transfer-coding.\r
     //\r
     ContentLength = 0;\r
-    Status = HttpGetEntityLength (Parser, &ContentLength);\r
+    Status        = HttpGetEntityLength (Parser, &ContentLength);\r
     if (!EFI_ERROR (Status)) {\r
       IdentityMode = TRUE;\r
     } else {\r
@@ -1169,28 +1200,30 @@ HttpBootGetBootFile (
       //\r
       ReceivedSize = 0;\r
       while (ReceivedSize < ContentLength) {\r
-        ResponseBody.Body       = (CHAR8*) Buffer + ReceivedSize;\r
+        ResponseBody.Body       = (CHAR8 *)Buffer + ReceivedSize;\r
         ResponseBody.BodyLength = *BufferSize - ReceivedSize;\r
-        Status = HttpIoRecvResponse (\r
-                   &Private->HttpIo,\r
-                   FALSE,\r
-                   &ResponseBody\r
-                   );\r
+        Status                  = HttpIoRecvResponse (\r
+                                    &Private->HttpIo,\r
+                                    FALSE,\r
+                                    &ResponseBody\r
+                                    );\r
         if (EFI_ERROR (Status) || EFI_ERROR (ResponseBody.Status)) {\r
           if (EFI_ERROR (ResponseBody.Status)) {\r
             Status = ResponseBody.Status;\r
           }\r
+\r
           goto ERROR_6;\r
         }\r
+\r
         ReceivedSize += ResponseBody.BodyLength;\r
         if (Private->HttpBootCallback != NULL) {\r
           Status = Private->HttpBootCallback->Callback (\r
-                     Private->HttpBootCallback,\r
-                     HttpBootHttpEntityBody,\r
-                     TRUE,\r
-                     (UINT32)ResponseBody.BodyLength,\r
-                     ResponseBody.Body\r
-                     );\r
+                                                Private->HttpBootCallback,\r
+                                                HttpBootHttpEntityBody,\r
+                                                TRUE,\r
+                                                (UINT32)ResponseBody.BodyLength,\r
+                                                ResponseBody.Body\r
+                                                );\r
           if (EFI_ERROR (Status)) {\r
             goto ERROR_6;\r
           }\r
@@ -1209,29 +1242,31 @@ HttpBootGetBootFile (
         // Otherwise a buffer, the buffer in Block will be cached and we should allocate a new before\r
         // every HttpIoRecvResponse().\r
         //\r
-        if (Block == NULL || Context.BufferSize == 0) {\r
+        if ((Block == NULL) || (Context.BufferSize == 0)) {\r
           Block = AllocatePool (HTTP_BOOT_BLOCK_SIZE);\r
           if (Block == NULL) {\r
             Status = EFI_OUT_OF_RESOURCES;\r
             goto ERROR_6;\r
           }\r
+\r
           Context.NewBlock = TRUE;\r
-          Context.Block = Block;\r
+          Context.Block    = Block;\r
         } else {\r
           Context.NewBlock = FALSE;\r
         }\r
 \r
-        ResponseBody.Body       = (CHAR8*) Block;\r
+        ResponseBody.Body       = (CHAR8 *)Block;\r
         ResponseBody.BodyLength = HTTP_BOOT_BLOCK_SIZE;\r
-        Status = HttpIoRecvResponse (\r
-                   &Private->HttpIo,\r
-                   FALSE,\r
-                   &ResponseBody\r
-                   );\r
+        Status                  = HttpIoRecvResponse (\r
+                                    &Private->HttpIo,\r
+                                    FALSE,\r
+                                    &ResponseBody\r
+                                    );\r
         if (EFI_ERROR (Status) || EFI_ERROR (ResponseBody.Status)) {\r
           if (EFI_ERROR (ResponseBody.Status)) {\r
             Status = ResponseBody.Status;\r
           }\r
+\r
           goto ERROR_6;\r
         }\r
 \r
@@ -1263,6 +1298,7 @@ HttpBootGetBootFile (
   } else {\r
     Status = EFI_SUCCESS;\r
   }\r
+\r
   *BufferSize = ContentLength;\r
 \r
   //\r
@@ -1283,25 +1319,30 @@ ERROR_6:
   if (Parser != NULL) {\r
     HttpFreeMsgParser (Parser);\r
   }\r
+\r
   if (Context.Block != NULL) {\r
     FreePool (Context.Block);\r
   }\r
+\r
   HttpBootFreeCache (Cache);\r
 \r
 ERROR_5:\r
   if (ResponseData != NULL) {\r
     FreePool (ResponseData);\r
   }\r
+\r
 ERROR_4:\r
   if (RequestData != NULL) {\r
     FreePool (RequestData);\r
   }\r
+\r
 ERROR_3:\r
   HttpIoFreeHeader (HttpIoHeader);\r
 ERROR_2:\r
   if (Cache != NULL) {\r
     FreePool (Cache);\r
   }\r
+\r
 ERROR_1:\r
   if (Url != NULL) {\r
     FreePool (Url);\r
index 3a98f0f557fb260e01a291257e783df88b9c3aa4..406529dfd927e7e233d5c422a1e954484bc02f84 100644 (file)
@@ -10,29 +10,29 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef __EFI_HTTP_BOOT_HTTP_H__\r
 #define __EFI_HTTP_BOOT_HTTP_H__\r
 \r
-#define HTTP_BOOT_BLOCK_SIZE                 1500\r
-#define HTTP_USER_AGENT_EFI_HTTP_BOOT        "UefiHttpBoot/1.0"\r
+#define HTTP_BOOT_BLOCK_SIZE           1500\r
+#define HTTP_USER_AGENT_EFI_HTTP_BOOT  "UefiHttpBoot/1.0"\r
 \r
 //\r
 // Record the data length and start address of a data block.\r
 //\r
 typedef struct {\r
-  LIST_ENTRY                 Link;        // Link to the EntityDataList in HTTP_BOOT_CACHE_CONTENT\r
-  UINT8                      *Block;      // If NULL, the data is in previous data block.\r
-  UINT8                      *DataStart;  // Point to somewhere in the Block\r
-  UINTN                      DataLength;\r
+  LIST_ENTRY    Link;                     // Link to the EntityDataList in HTTP_BOOT_CACHE_CONTENT\r
+  UINT8         *Block;                   // If NULL, the data is in previous data block.\r
+  UINT8         *DataStart;               // Point to somewhere in the Block\r
+  UINTN         DataLength;\r
 } HTTP_BOOT_ENTITY_DATA;\r
 \r
 //\r
 // Structure for a cache item\r
 //\r
 typedef struct {\r
-  LIST_ENTRY                 Link;            // Link to the CacheList in driver's private data.\r
-  EFI_HTTP_REQUEST_DATA      *RequestData;\r
-  HTTP_IO_RESPONSE_DATA      *ResponseData;   // Not include any message-body data.\r
-  HTTP_BOOT_IMAGE_TYPE       ImageType;\r
-  UINTN                      EntityLength;\r
-  LIST_ENTRY                 EntityDataList;  // Entity data (message-body)\r
+  LIST_ENTRY               Link;              // Link to the CacheList in driver's private data.\r
+  EFI_HTTP_REQUEST_DATA    *RequestData;\r
+  HTTP_IO_RESPONSE_DATA    *ResponseData;     // Not include any message-body data.\r
+  HTTP_BOOT_IMAGE_TYPE     ImageType;\r
+  UINTN                    EntityLength;\r
+  LIST_ENTRY               EntityDataList;    // Entity data (message-body)\r
 } HTTP_BOOT_CACHE_CONTENT;\r
 \r
 //\r
@@ -68,7 +68,7 @@ typedef struct {
 **/\r
 EFI_STATUS\r
 HttpBootDiscoverBootInfo (\r
-  IN OUT HTTP_BOOT_PRIVATE_DATA   *Private\r
+  IN OUT HTTP_BOOT_PRIVATE_DATA  *Private\r
   );\r
 \r
 /**\r
@@ -82,7 +82,7 @@ HttpBootDiscoverBootInfo (
 **/\r
 EFI_STATUS\r
 HttpBootCreateHttpIo (\r
-  IN     HTTP_BOOT_PRIVATE_DATA       *Private\r
+  IN     HTTP_BOOT_PRIVATE_DATA  *Private\r
   );\r
 \r
 /**\r
@@ -111,11 +111,11 @@ HttpBootCreateHttpIo (
 **/\r
 EFI_STATUS\r
 HttpBootGetBootFile (\r
-  IN     HTTP_BOOT_PRIVATE_DATA   *Private,\r
-  IN     BOOLEAN                  HeaderOnly,\r
-  IN OUT UINTN                    *BufferSize,\r
-     OUT UINT8                    *Buffer,\r
-     OUT HTTP_BOOT_IMAGE_TYPE     *ImageType\r
+  IN     HTTP_BOOT_PRIVATE_DATA  *Private,\r
+  IN     BOOLEAN                 HeaderOnly,\r
+  IN OUT UINTN                   *BufferSize,\r
+  OUT UINT8                      *Buffer,\r
+  OUT HTTP_BOOT_IMAGE_TYPE       *ImageType\r
   );\r
 \r
 /**\r
@@ -126,7 +126,7 @@ HttpBootGetBootFile (
 **/\r
 VOID\r
 HttpBootFreeCacheList (\r
-  IN     HTTP_BOOT_PRIVATE_DATA   *Private\r
+  IN     HTTP_BOOT_PRIVATE_DATA  *Private\r
   );\r
 \r
 #endif\r
index dbaa944adc7a72bc6bf6bd7cb834e5608e0a1e04..bc1993df431b67c1a26b7b79a1338ca83274d472 100644 (file)
@@ -13,7 +13,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 ///\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
 EFI_COMPONENT_NAME_PROTOCOL  gHttpBootDxeComponentName = {\r
-  (EFI_COMPONENT_NAME_GET_DRIVER_NAME)    HttpBootDxeComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME_GET_DRIVER_NAME)HttpBootDxeComponentNameGetDriverName,\r
   (EFI_COMPONENT_NAME_GET_CONTROLLER_NAME)HttpBootDxeComponentNameGetControllerName,\r
   "eng"\r
 };\r
@@ -32,18 +32,18 @@ EFI_COMPONENT_NAME2_PROTOCOL  gHttpBootDxeComponentName2 = {
 /// Table of driver names\r
 ///\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
-EFI_UNICODE_STRING_TABLE mHttpBootDxeDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mHttpBootDxeDriverNameTable[] = {\r
   { "eng;en", (CHAR16 *)L"UEFI HTTP Boot Driver" },\r
-  { NULL, NULL }\r
+  { NULL,     NULL                               }\r
 };\r
 \r
 ///\r
 /// Table of controller names\r
 ///\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
-EFI_UNICODE_STRING_TABLE mHttpBootDxeControllerNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mHttpBootDxeControllerNameTable[] = {\r
   { "eng;en", (CHAR16 *)L"UEFI Http Boot Controller" },\r
-  { NULL, NULL }\r
+  { NULL,     NULL                                   }\r
 };\r
 \r
 /**\r
@@ -81,7 +81,7 @@ HttpBootDxeComponentNameGetDriverName (
            This->SupportedLanguages,\r
            mHttpBootDxeDriverNameTable,\r
            DriverName,\r
-           (BOOLEAN) (This != &gHttpBootDxeComponentName2)\r
+           (BOOLEAN)(This != &gHttpBootDxeComponentName2)\r
            );\r
 }\r
 \r
@@ -135,17 +135,17 @@ HttpBootDxeComponentNameGetControllerName (
   OUT CHAR16                        **ControllerName\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_HANDLE                      NicHandle;\r
-  UINT32                          *Id;\r
+  EFI_STATUS  Status;\r
+  EFI_HANDLE  NicHandle;\r
+  UINT32      *Id;\r
 \r
-  if (ControllerHandle == NULL || ChildHandle != NULL) {\r
+  if ((ControllerHandle == NULL) || (ChildHandle != NULL)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
   NicHandle = HttpBootGetNicByIp4Children (ControllerHandle);\r
   if (NicHandle == NULL) {\r
-    NicHandle = HttpBootGetNicByIp6Children(ControllerHandle);\r
+    NicHandle = HttpBootGetNicByIp6Children (ControllerHandle);\r
     if (NicHandle == NULL) {\r
       return EFI_UNSUPPORTED;\r
     }\r
@@ -157,7 +157,7 @@ HttpBootDxeComponentNameGetControllerName (
   Status = gBS->OpenProtocol (\r
                   NicHandle,\r
                   &gEfiCallerIdGuid,\r
-                  (VOID **) &Id,\r
+                  (VOID **)&Id,\r
                   NULL,\r
                   NULL,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -173,5 +173,4 @@ HttpBootDxeComponentNameGetControllerName (
            ControllerName,\r
            (BOOLEAN)(This != &gHttpBootDxeComponentName2)\r
            );\r
-\r
 }\r
index 795e61b5b4ff6c23c4cbec04f68d6a7f94676daa..42d3fdc1fb851b9cab0e2d1797c4d7ca322314f9 100644 (file)
@@ -9,7 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include "HttpBootDxe.h"\r
 #include <Library/UefiBootManagerLib.h>\r
 \r
-CHAR16  mHttpBootConfigStorageName[]     = L"HTTP_BOOT_CONFIG_IFR_NVDATA";\r
+CHAR16  mHttpBootConfigStorageName[] = L"HTTP_BOOT_CONFIG_IFR_NVDATA";\r
 \r
 /**\r
   Add new boot option for HTTP boot.\r
@@ -25,20 +25,20 @@ CHAR16  mHttpBootConfigStorageName[]     = L"HTTP_BOOT_CONFIG_IFR_NVDATA";
 **/\r
 EFI_STATUS\r
 HttpBootAddBootOption (\r
-  IN   HTTP_BOOT_PRIVATE_DATA   *Private,\r
-  IN   BOOLEAN                  UsingIpv6,\r
-  IN   CHAR16                   *Description,\r
-  IN   CHAR16                   *Uri\r
+  IN   HTTP_BOOT_PRIVATE_DATA  *Private,\r
+  IN   BOOLEAN                 UsingIpv6,\r
+  IN   CHAR16                  *Description,\r
+  IN   CHAR16                  *Uri\r
   )\r
 {\r
-  EFI_DEV_PATH                      *Node;\r
-  EFI_DEVICE_PATH_PROTOCOL          *TmpDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL          *NewDevicePath;\r
-  UINTN                             Length;\r
-  CHAR8                             AsciiUri[URI_STR_MAX_SIZE];\r
-  EFI_STATUS                        Status;\r
-  UINTN                             Index;\r
-  EFI_BOOT_MANAGER_LOAD_OPTION      NewOption;\r
+  EFI_DEV_PATH                  *Node;\r
+  EFI_DEVICE_PATH_PROTOCOL      *TmpDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL      *NewDevicePath;\r
+  UINTN                         Length;\r
+  CHAR8                         AsciiUri[URI_STR_MAX_SIZE];\r
+  EFI_STATUS                    Status;\r
+  UINTN                         Index;\r
+  EFI_BOOT_MANAGER_LOAD_OPTION  NewOption;\r
 \r
   NewDevicePath = NULL;\r
   Node          = NULL;\r
@@ -55,7 +55,8 @@ HttpBootAddBootOption (
     if (Uri[Index] == L':') {\r
       break;\r
     }\r
-    if (Uri[Index] >= L'A' && Uri[Index] <= L'Z') {\r
+\r
+    if ((Uri[Index] >= L'A') && (Uri[Index] <= L'Z')) {\r
       Uri[Index] -= (CHAR16)(L'A' - L'a');\r
     }\r
   }\r
@@ -77,6 +78,7 @@ HttpBootAddBootOption (
       Status = EFI_OUT_OF_RESOURCES;\r
       goto ON_EXIT;\r
     }\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
@@ -86,31 +88,35 @@ HttpBootAddBootOption (
       Status = EFI_OUT_OF_RESOURCES;\r
       goto ON_EXIT;\r
     }\r
-    Node->Ipv6.Header.Type     = MESSAGING_DEVICE_PATH;\r
-    Node->Ipv6.Header.SubType  = MSG_IPv6_DP;\r
+\r
+    Node->Ipv6.Header.Type    = MESSAGING_DEVICE_PATH;\r
+    Node->Ipv6.Header.SubType = MSG_IPv6_DP;\r
     SetDevicePathNodeLength (Node, sizeof (IPv6_DEVICE_PATH));\r
   }\r
-  TmpDevicePath = AppendDevicePathNode (Private->ParentDevicePath, (EFI_DEVICE_PATH_PROTOCOL*) Node);\r
+\r
+  TmpDevicePath = AppendDevicePathNode (Private->ParentDevicePath, (EFI_DEVICE_PATH_PROTOCOL *)Node);\r
   FreePool (Node);\r
   if (TmpDevicePath == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   //\r
   // Update the URI node with the input boot file URI.\r
   //\r
   UnicodeStrToAsciiStrS (Uri, AsciiUri, sizeof (AsciiUri));\r
   Length = sizeof (EFI_DEVICE_PATH_PROTOCOL) + AsciiStrSize (AsciiUri);\r
-  Node = AllocatePool (Length);\r
+  Node   = AllocatePool (Length);\r
   if (Node == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     FreePool (TmpDevicePath);\r
     goto ON_EXIT;\r
   }\r
+\r
   Node->DevPath.Type    = MESSAGING_DEVICE_PATH;\r
   Node->DevPath.SubType = MSG_URI_DP;\r
   SetDevicePathNodeLength (Node, Length);\r
-  CopyMem ((UINT8*) Node + sizeof (EFI_DEVICE_PATH_PROTOCOL), AsciiUri, AsciiStrSize (AsciiUri));\r
-  NewDevicePath = AppendDevicePathNode (TmpDevicePath, (EFI_DEVICE_PATH_PROTOCOL*) Node);\r
+  CopyMem ((UINT8 *)Node + sizeof (EFI_DEVICE_PATH_PROTOCOL), AsciiUri, AsciiStrSize (AsciiUri));\r
+  NewDevicePath = AppendDevicePathNode (TmpDevicePath, (EFI_DEVICE_PATH_PROTOCOL *)Node);\r
   FreePool (Node);\r
   FreePool (TmpDevicePath);\r
   if (NewDevicePath == NULL) {\r
@@ -122,20 +128,20 @@ HttpBootAddBootOption (
   // Add a new load option.\r
   //\r
   Status = EfiBootManagerInitializeLoadOption (\r
-                 &NewOption,\r
-                 LoadOptionNumberUnassigned,\r
-                 LoadOptionTypeBoot,\r
-                 LOAD_OPTION_ACTIVE,\r
-                 Description,\r
-                 NewDevicePath,\r
-                 NULL,\r
-                 0\r
-                 );\r
+             &NewOption,\r
+             LoadOptionNumberUnassigned,\r
+             LoadOptionTypeBoot,\r
+             LOAD_OPTION_ACTIVE,\r
+             Description,\r
+             NewDevicePath,\r
+             NULL,\r
+             0\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
 \r
-  Status = EfiBootManagerAddLoadOptionVariable (&NewOption, (UINTN) -1);\r
+  Status = EfiBootManagerAddLoadOptionVariable (&NewOption, (UINTN)-1);\r
   EfiBootManagerFreeLoadOption (&NewOption);\r
 \r
 ON_EXIT:\r
@@ -221,21 +227,21 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 HttpBootFormExtractConfig (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  CONST EFI_STRING                       Request,\r
-  OUT EFI_STRING                             *Progress,\r
-  OUT EFI_STRING                             *Results\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  CONST EFI_STRING                      Request,\r
+  OUT EFI_STRING                            *Progress,\r
+  OUT EFI_STRING                            *Results\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  UINTN                            BufferSize;\r
-  HTTP_BOOT_FORM_CALLBACK_INFO     *CallbackInfo;\r
-  EFI_STRING                       ConfigRequestHdr;\r
-  EFI_STRING                       ConfigRequest;\r
-  BOOLEAN                          AllocatedRequest;\r
-  UINTN                            Size;\r
-\r
-  if (Progress == NULL || Results == NULL) {\r
+  EFI_STATUS                    Status;\r
+  UINTN                         BufferSize;\r
+  HTTP_BOOT_FORM_CALLBACK_INFO  *CallbackInfo;\r
+  EFI_STRING                    ConfigRequestHdr;\r
+  EFI_STRING                    ConfigRequest;\r
+  BOOLEAN                       AllocatedRequest;\r
+  UINTN                         Size;\r
+\r
+  if ((Progress == NULL) || (Results == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -265,11 +271,12 @@ HttpBootFormExtractConfig (
     // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
     //\r
     ConfigRequestHdr = HiiConstructConfigHdr (&gHttpBootConfigGuid, mHttpBootConfigStorageName, CallbackInfo->ChildHandle);\r
-    Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
-    ConfigRequest = AllocateZeroPool (Size);\r
+    Size             = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
+    ConfigRequest    = AllocateZeroPool (Size);\r
     if (ConfigRequest == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     AllocatedRequest = TRUE;\r
     UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);\r
     FreePool (ConfigRequestHdr);\r
@@ -278,7 +285,7 @@ HttpBootFormExtractConfig (
   Status = gHiiConfigRouting->BlockToConfig (\r
                                 gHiiConfigRouting,\r
                                 ConfigRequest,\r
-                                (UINT8 *) &CallbackInfo->HttpBootNvData,\r
+                                (UINT8 *)&CallbackInfo->HttpBootNvData,\r
                                 BufferSize,\r
                                 Results,\r
                                 Progress\r
@@ -291,6 +298,7 @@ HttpBootFormExtractConfig (
     FreePool (ConfigRequest);\r
     ConfigRequest = NULL;\r
   }\r
+\r
   //\r
   // Set Progress string to the original request string.\r
   //\r
@@ -346,19 +354,20 @@ HttpBootFormExtractConfig (
 EFI_STATUS\r
 EFIAPI\r
 HttpBootFormRouteConfig (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  CONST EFI_STRING                       Configuration,\r
-  OUT EFI_STRING                             *Progress\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  CONST EFI_STRING                      Configuration,\r
+  OUT EFI_STRING                            *Progress\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  UINTN                            BufferSize;\r
-  HTTP_BOOT_FORM_CALLBACK_INFO     *CallbackInfo;\r
-  HTTP_BOOT_PRIVATE_DATA           *Private;\r
+  EFI_STATUS                    Status;\r
+  UINTN                         BufferSize;\r
+  HTTP_BOOT_FORM_CALLBACK_INFO  *CallbackInfo;\r
+  HTTP_BOOT_PRIVATE_DATA        *Private;\r
 \r
   if (Progress == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   *Progress = Configuration;\r
 \r
   if (Configuration == NULL) {\r
@@ -380,12 +389,12 @@ HttpBootFormRouteConfig (
   ZeroMem (&CallbackInfo->HttpBootNvData, BufferSize);\r
 \r
   Status = gHiiConfigRouting->ConfigToBlock (\r
-                            gHiiConfigRouting,\r
-                            Configuration,\r
-                            (UINT8 *) &CallbackInfo->HttpBootNvData,\r
-                            &BufferSize,\r
-                            Progress\r
-                            );\r
+                                gHiiConfigRouting,\r
+                                Configuration,\r
+                                (UINT8 *)&CallbackInfo->HttpBootNvData,\r
+                                &BufferSize,\r
+                                Progress\r
+                                );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -431,27 +440,27 @@ HttpBootFormRouteConfig (
 EFI_STATUS\r
 EFIAPI\r
 HttpBootFormCallback (\r
-  IN CONST  EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN        EFI_BROWSER_ACTION               Action,\r
-  IN        EFI_QUESTION_ID                  QuestionId,\r
-  IN        UINT8                            Type,\r
-  IN OUT    EFI_IFR_TYPE_VALUE               *Value,\r
-  OUT       EFI_BROWSER_ACTION_REQUEST       *ActionRequest\r
+  IN CONST  EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN        EFI_BROWSER_ACTION              Action,\r
+  IN        EFI_QUESTION_ID                 QuestionId,\r
+  IN        UINT8                           Type,\r
+  IN OUT    EFI_IFR_TYPE_VALUE              *Value,\r
+  OUT       EFI_BROWSER_ACTION_REQUEST      *ActionRequest\r
   )\r
 {\r
-  EFI_INPUT_KEY                   Key;\r
-  CHAR16                          *Uri;\r
-  UINTN                           UriLen;\r
-  CHAR8                           *AsciiUri;\r
-  HTTP_BOOT_FORM_CALLBACK_INFO    *CallbackInfo;\r
-  EFI_STATUS                      Status;\r
+  EFI_INPUT_KEY                 Key;\r
+  CHAR16                        *Uri;\r
+  UINTN                         UriLen;\r
+  CHAR8                         *AsciiUri;\r
+  HTTP_BOOT_FORM_CALLBACK_INFO  *CallbackInfo;\r
+  EFI_STATUS                    Status;\r
 \r
   Uri      = NULL;\r
   UriLen   = 0;\r
   AsciiUri = NULL;\r
   Status   = EFI_SUCCESS;\r
 \r
-  if (This == NULL || Value == NULL) {\r
+  if ((This == NULL) || (Value == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -462,68 +471,66 @@ HttpBootFormCallback (
   }\r
 \r
   switch (QuestionId) {\r
-  case KEY_INITIATOR_URI:\r
-    //\r
-    // Get user input URI string\r
-    //\r
-    Uri = HiiGetString (CallbackInfo->RegisteredHandle, Value->string, NULL);\r
-    if(Uri == NULL) {\r
-      return EFI_INVALID_PARAMETER;\r
-    }\r
-\r
-    //\r
-    // The URI should be either an empty string (for corporate environment) ,or http(s) for home environment.\r
-    // Pop up a message box for the unsupported URI.\r
-    //\r
-    if (StrLen (Uri) != 0) {\r
-      UriLen = StrLen (Uri) + 1;\r
-      AsciiUri = AllocateZeroPool (UriLen);\r
-      if (AsciiUri == NULL) {\r
-        FreePool (Uri);\r
-        return EFI_OUT_OF_RESOURCES;\r
+    case KEY_INITIATOR_URI:\r
+      //\r
+      // Get user input URI string\r
+      //\r
+      Uri = HiiGetString (CallbackInfo->RegisteredHandle, Value->string, NULL);\r
+      if (Uri == NULL) {\r
+        return EFI_INVALID_PARAMETER;\r
       }\r
 \r
-      UnicodeStrToAsciiStrS (Uri, AsciiUri, UriLen);\r
-\r
-      Status = HttpBootCheckUriScheme (AsciiUri);\r
-\r
-      if (Status == EFI_INVALID_PARAMETER) {\r
-\r
-        DEBUG ((DEBUG_ERROR, "HttpBootFormCallback: %r.\n", Status));\r
-\r
-        CreatePopUp (\r
-          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-          &Key,\r
-          L"ERROR: Unsupported URI!",\r
-          L"Only supports HTTP and HTTPS",\r
-          NULL\r
-          );\r
-      } else if (Status == EFI_ACCESS_DENIED) {\r
-\r
-        DEBUG ((DEBUG_ERROR, "HttpBootFormCallback: %r.\n", Status));\r
-\r
-        CreatePopUp (\r
-          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-          &Key,\r
-          L"ERROR: Unsupported URI!",\r
-          L"HTTP is disabled",\r
-          NULL\r
-          );\r
+      //\r
+      // The URI should be either an empty string (for corporate environment) ,or http(s) for home environment.\r
+      // Pop up a message box for the unsupported URI.\r
+      //\r
+      if (StrLen (Uri) != 0) {\r
+        UriLen   = StrLen (Uri) + 1;\r
+        AsciiUri = AllocateZeroPool (UriLen);\r
+        if (AsciiUri == NULL) {\r
+          FreePool (Uri);\r
+          return EFI_OUT_OF_RESOURCES;\r
+        }\r
+\r
+        UnicodeStrToAsciiStrS (Uri, AsciiUri, UriLen);\r
+\r
+        Status = HttpBootCheckUriScheme (AsciiUri);\r
+\r
+        if (Status == EFI_INVALID_PARAMETER) {\r
+          DEBUG ((DEBUG_ERROR, "HttpBootFormCallback: %r.\n", Status));\r
+\r
+          CreatePopUp (\r
+            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+            &Key,\r
+            L"ERROR: Unsupported URI!",\r
+            L"Only supports HTTP and HTTPS",\r
+            NULL\r
+            );\r
+        } else if (Status == EFI_ACCESS_DENIED) {\r
+          DEBUG ((DEBUG_ERROR, "HttpBootFormCallback: %r.\n", Status));\r
+\r
+          CreatePopUp (\r
+            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+            &Key,\r
+            L"ERROR: Unsupported URI!",\r
+            L"HTTP is disabled",\r
+            NULL\r
+            );\r
+        }\r
       }\r
-    }\r
 \r
-    if (Uri != NULL) {\r
-      FreePool (Uri);\r
-    }\r
+      if (Uri != NULL) {\r
+        FreePool (Uri);\r
+      }\r
 \r
-    if (AsciiUri != NULL) {\r
-      FreePool (AsciiUri);\r
-    }\r
+      if (AsciiUri != NULL) {\r
+        FreePool (AsciiUri);\r
+      }\r
 \r
-    break;\r
+      break;\r
 \r
-  default:\r
-    break;\r
+    default:\r
+      break;\r
   }\r
 \r
   return Status;\r
@@ -540,15 +547,15 @@ HttpBootFormCallback (
 **/\r
 EFI_STATUS\r
 HttpBootConfigFormInit (\r
-  IN HTTP_BOOT_PRIVATE_DATA     *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  HTTP_BOOT_FORM_CALLBACK_INFO      *CallbackInfo;\r
-  VENDOR_DEVICE_PATH                VendorDeviceNode;\r
-  CHAR16                            *MacString;\r
-  CHAR16                            *OldMenuString;\r
-  CHAR16                            MenuString[128];\r
+  EFI_STATUS                    Status;\r
+  HTTP_BOOT_FORM_CALLBACK_INFO  *CallbackInfo;\r
+  VENDOR_DEVICE_PATH            VendorDeviceNode;\r
+  CHAR16                        *MacString;\r
+  CHAR16                        *OldMenuString;\r
+  CHAR16                        MenuString[128];\r
 \r
   CallbackInfo = &Private->CallbackInfo;\r
 \r
@@ -570,7 +577,7 @@ HttpBootConfigFormInit (
   SetDevicePathNodeLength (&VendorDeviceNode.Header, sizeof (VENDOR_DEVICE_PATH));\r
   CallbackInfo->HiiVendorDevicePath = AppendDevicePathNode (\r
                                         Private->ParentDevicePath,\r
-                                        (EFI_DEVICE_PATH_PROTOCOL *) &VendorDeviceNode\r
+                                        (EFI_DEVICE_PATH_PROTOCOL *)&VendorDeviceNode\r
                                         );\r
   if (CallbackInfo->HiiVendorDevicePath == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
@@ -655,12 +662,12 @@ Error:
 **/\r
 EFI_STATUS\r
 HttpBootConfigFormUnload (\r
-  IN HTTP_BOOT_PRIVATE_DATA     *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  HTTP_BOOT_FORM_CALLBACK_INFO      *CallbackInfo;\r
+  HTTP_BOOT_FORM_CALLBACK_INFO  *CallbackInfo;\r
 \r
-  if (Private->Ip4Nic != NULL || Private->Ip6Nic != NULL) {\r
+  if ((Private->Ip4Nic != NULL) || (Private->Ip6Nic != NULL)) {\r
     //\r
     // Only unload the configuration form when both IP4 and IP6 stack are stopped.\r
     //\r
index 84eab425b04fbc6dfb8fc156ccf6dc0e0303604f..9e5f05bdd8fc9b08ff28fbf2e8cc745e440b15fa 100644 (file)
@@ -10,13 +10,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef _HTTP_BOOT_CONFIG_H_\r
 #define _HTTP_BOOT_CONFIG_H_\r
 \r
-\r
 #include "HttpBootConfigNVDataStruc.h"\r
 \r
-typedef struct _HTTP_BOOT_FORM_CALLBACK_INFO   HTTP_BOOT_FORM_CALLBACK_INFO;\r
+typedef struct _HTTP_BOOT_FORM_CALLBACK_INFO HTTP_BOOT_FORM_CALLBACK_INFO;\r
 \r
-extern   UINT8                            HttpBootDxeStrings[];\r
-extern   UINT8                            HttpBootConfigVfrBin[];\r
+extern   UINT8  HttpBootDxeStrings[];\r
+extern   UINT8  HttpBootConfigVfrBin[];\r
 \r
 #pragma pack()\r
 \r
@@ -31,13 +30,13 @@ extern   UINT8                            HttpBootConfigVfrBin[];
   )\r
 \r
 struct _HTTP_BOOT_FORM_CALLBACK_INFO {\r
-  UINT32                           Signature;\r
-  BOOLEAN                          Initialized;\r
-  EFI_HANDLE                       ChildHandle;\r
-  EFI_DEVICE_PATH_PROTOCOL         *HiiVendorDevicePath;\r
-  EFI_HII_HANDLE                   RegisteredHandle;\r
-  EFI_HII_CONFIG_ACCESS_PROTOCOL   ConfigAccess;\r
-  HTTP_BOOT_CONFIG_IFR_NVDATA      HttpBootNvData;\r
+  UINT32                            Signature;\r
+  BOOLEAN                           Initialized;\r
+  EFI_HANDLE                        ChildHandle;\r
+  EFI_DEVICE_PATH_PROTOCOL          *HiiVendorDevicePath;\r
+  EFI_HII_HANDLE                    RegisteredHandle;\r
+  EFI_HII_CONFIG_ACCESS_PROTOCOL    ConfigAccess;\r
+  HTTP_BOOT_CONFIG_IFR_NVDATA       HttpBootNvData;\r
 };\r
 \r
 /**\r
@@ -51,7 +50,7 @@ struct _HTTP_BOOT_FORM_CALLBACK_INFO {
 **/\r
 EFI_STATUS\r
 HttpBootConfigFormInit (\r
-  IN HTTP_BOOT_PRIVATE_DATA     *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   );\r
 \r
 /**\r
@@ -67,7 +66,7 @@ HttpBootConfigFormInit (
 **/\r
 EFI_STATUS\r
 HttpBootConfigFormUnload (\r
-  IN HTTP_BOOT_PRIVATE_DATA     *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   );\r
 \r
 #endif\r
index 3afa97598be2cac4eb757a10a3df299f7236e1fd..a24fa5cb08cb9c3593f7ffc964c41a5b67eb1cf2 100644 (file)
@@ -11,25 +11,25 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include <Guid/HttpBootConfigHii.h>\r
 \r
-#define HTTP_BOOT_IP_VERSION_4       0\r
-#define HTTP_BOOT_IP_VERSION_6       1\r
+#define HTTP_BOOT_IP_VERSION_4  0\r
+#define HTTP_BOOT_IP_VERSION_6  1\r
 \r
 //\r
 // Macros used for an IPv4 or an IPv6 address.\r
 //\r
-#define URI_STR_MIN_SIZE             0\r
-#define URI_STR_MAX_SIZE             255\r
+#define URI_STR_MIN_SIZE  0\r
+#define URI_STR_MAX_SIZE  255\r
 \r
-#define DESCRIPTION_STR_MIN_SIZE     6\r
-#define DESCRIPTION_STR_MAX_SIZE     75\r
+#define DESCRIPTION_STR_MIN_SIZE  6\r
+#define DESCRIPTION_STR_MAX_SIZE  75\r
 \r
-#define CONFIGURATION_VARSTORE_ID    0x1234\r
+#define CONFIGURATION_VARSTORE_ID  0x1234\r
 \r
-#define FORMID_MAIN_FORM             1\r
+#define FORMID_MAIN_FORM  1\r
 \r
-#define KEY_INITIATOR_URI            0x101\r
+#define KEY_INITIATOR_URI  0x101\r
 \r
-#define HTTP_BOOT_DEFAULT_DESCRIPTION_STR   L"UEFI HTTP"\r
+#define HTTP_BOOT_DEFAULT_DESCRIPTION_STR  L"UEFI HTTP"\r
 \r
 #pragma pack(1)\r
 typedef struct _HTTP_BOOT_CONFIG_IFR_NVDATA {\r
@@ -40,5 +40,4 @@ typedef struct _HTTP_BOOT_CONFIG_IFR_NVDATA {
 } HTTP_BOOT_CONFIG_IFR_NVDATA;\r
 #pragma pack()\r
 \r
-\r
 #endif\r
index 1da05dbf0e959d1c1a44b9a0d2989e6b4e885d47..6931a148279c4a84c77e1ca18222485172f34bdd 100644 (file)
@@ -11,7 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // This is a map from the interested DHCP4 option tags' index to the tag value.\r
 //\r
-UINT8 mInterestedDhcp4Tags[HTTP_BOOT_DHCP4_TAG_INDEX_MAX] = {\r
+UINT8  mInterestedDhcp4Tags[HTTP_BOOT_DHCP4_TAG_INDEX_MAX] = {\r
   DHCP4_TAG_BOOTFILE_LEN,\r
   DHCP4_TAG_OVERLOAD,\r
   DHCP4_TAG_MSG_TYPE,\r
@@ -24,7 +24,7 @@ UINT8 mInterestedDhcp4Tags[HTTP_BOOT_DHCP4_TAG_INDEX_MAX] = {
 //\r
 // There are 4 times retries with the value of 4, 8, 16 and 32, refers to UEFI 2.5 spec.\r
 //\r
-UINT32 mHttpDhcpTimeout[4] = {4, 8, 16, 32};\r
+UINT32  mHttpDhcpTimeout[4] = { 4, 8, 16, 32 };\r
 \r
 /**\r
   Build the options buffer for the DHCPv4 request packet.\r
@@ -38,9 +38,9 @@ UINT32 mHttpDhcpTimeout[4] = {4, 8, 16, 32};
 **/\r
 UINT32\r
 HttpBootBuildDhcp4Options (\r
-  IN  HTTP_BOOT_PRIVATE_DATA        *Private,\r
-  OUT EFI_DHCP4_PACKET_OPTION       **OptList,\r
-  IN  UINT8                         *Buffer\r
+  IN  HTTP_BOOT_PRIVATE_DATA   *Private,\r
+  OUT EFI_DHCP4_PACKET_OPTION  **OptList,\r
+  IN  UINT8                    *Buffer\r
   )\r
 {\r
   HTTP_BOOT_DHCP4_OPTION_ENTRY  OptEnt;\r
@@ -48,14 +48,14 @@ HttpBootBuildDhcp4Options (
   UINT32                        Index;\r
 \r
   Index      = 0;\r
-  OptList[0] = (EFI_DHCP4_PACKET_OPTION *) Buffer;\r
+  OptList[0] = (EFI_DHCP4_PACKET_OPTION *)Buffer;\r
 \r
   //\r
   // Append parameter request list option.\r
   //\r
   OptList[Index]->OpCode    = DHCP4_TAG_PARA_LIST;\r
   OptList[Index]->Length    = 27;\r
-  OptEnt.Para               = (HTTP_BOOT_DHCP4_OPTION_PARA *) OptList[Index]->Data;\r
+  OptEnt.Para               = (HTTP_BOOT_DHCP4_OPTION_PARA *)OptList[Index]->Data;\r
   OptEnt.Para->ParaList[0]  = DHCP4_TAG_NETMASK;\r
   OptEnt.Para->ParaList[1]  = DHCP4_TAG_TIME_OFFSET;\r
   OptEnt.Para->ParaList[2]  = DHCP4_TAG_ROUTER;\r
@@ -83,30 +83,31 @@ HttpBootBuildDhcp4Options (
   OptEnt.Para->ParaList[25] = DHCP4_TAG_BOOTFILE;\r
   OptEnt.Para->ParaList[26] = DHCP4_TAG_UUID;\r
   Index++;\r
-  OptList[Index]            = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
+  OptList[Index] = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
 \r
   //\r
   // Append UUID/Guid-based client identifier option\r
   //\r
-  OptList[Index]->OpCode  = DHCP4_TAG_UUID;\r
-  OptList[Index]->Length  = (UINT8) sizeof (HTTP_BOOT_DHCP4_OPTION_UUID);\r
-  OptEnt.Uuid             = (HTTP_BOOT_DHCP4_OPTION_UUID *) OptList[Index]->Data;\r
-  OptEnt.Uuid->Type       = 0;\r
-  if (EFI_ERROR (NetLibGetSystemGuid ((EFI_GUID *) OptEnt.Uuid->Guid))) {\r
+  OptList[Index]->OpCode = DHCP4_TAG_UUID;\r
+  OptList[Index]->Length = (UINT8)sizeof (HTTP_BOOT_DHCP4_OPTION_UUID);\r
+  OptEnt.Uuid            = (HTTP_BOOT_DHCP4_OPTION_UUID *)OptList[Index]->Data;\r
+  OptEnt.Uuid->Type      = 0;\r
+  if (EFI_ERROR (NetLibGetSystemGuid ((EFI_GUID *)OptEnt.Uuid->Guid))) {\r
     //\r
     // Zero the Guid to indicate NOT programmable if failed to get system Guid.\r
     //\r
     ZeroMem (OptEnt.Uuid->Guid, sizeof (EFI_GUID));\r
   }\r
+\r
   Index++;\r
-  OptList[Index]          = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
+  OptList[Index] = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
 \r
   //\r
   // Append client network device interface option\r
   //\r
-  OptList[Index]->OpCode  = DHCP4_TAG_UNDI;\r
-  OptList[Index]->Length  = (UINT8) sizeof (HTTP_BOOT_DHCP4_OPTION_UNDI);\r
-  OptEnt.Undi             = (HTTP_BOOT_DHCP4_OPTION_UNDI *) OptList[Index]->Data;\r
+  OptList[Index]->OpCode = DHCP4_TAG_UNDI;\r
+  OptList[Index]->Length = (UINT8)sizeof (HTTP_BOOT_DHCP4_OPTION_UNDI);\r
+  OptEnt.Undi            = (HTTP_BOOT_DHCP4_OPTION_UNDI *)OptList[Index]->Data;\r
 \r
   if (Private->Nii != NULL) {\r
     OptEnt.Undi->Type     = Private->Nii->Type;\r
@@ -124,20 +125,20 @@ HttpBootBuildDhcp4Options (
   //\r
   // Append client system architecture option\r
   //\r
-  OptList[Index]->OpCode  = DHCP4_TAG_ARCH;\r
-  OptList[Index]->Length  = (UINT8) sizeof (HTTP_BOOT_DHCP4_OPTION_ARCH);\r
-  OptEnt.Arch             = (HTTP_BOOT_DHCP4_OPTION_ARCH *) OptList[Index]->Data;\r
-  Value                   = HTONS (EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE);\r
+  OptList[Index]->OpCode = DHCP4_TAG_ARCH;\r
+  OptList[Index]->Length = (UINT8)sizeof (HTTP_BOOT_DHCP4_OPTION_ARCH);\r
+  OptEnt.Arch            = (HTTP_BOOT_DHCP4_OPTION_ARCH *)OptList[Index]->Data;\r
+  Value                  = HTONS (EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE);\r
   CopyMem (&OptEnt.Arch->Type, &Value, sizeof (UINT16));\r
   Index++;\r
-  OptList[Index]          = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
+  OptList[Index] = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
 \r
   //\r
   // Append vendor class identify option\r
   //\r
-  OptList[Index]->OpCode  = DHCP4_TAG_VENDOR_CLASS_ID;\r
-  OptList[Index]->Length  = (UINT8) sizeof (HTTP_BOOT_DHCP4_OPTION_CLID);\r
-  OptEnt.Clid             = (HTTP_BOOT_DHCP4_OPTION_CLID *) OptList[Index]->Data;\r
+  OptList[Index]->OpCode = DHCP4_TAG_VENDOR_CLASS_ID;\r
+  OptList[Index]->Length = (UINT8)sizeof (HTTP_BOOT_DHCP4_OPTION_CLID);\r
+  OptEnt.Clid            = (HTTP_BOOT_DHCP4_OPTION_CLID *)OptList[Index]->Data;\r
   CopyMem (\r
     OptEnt.Clid,\r
     DEFAULT_CLASS_ID_DATA,\r
@@ -173,19 +174,18 @@ HttpBootBuildDhcp4Options (
 **/\r
 EFI_DHCP4_PACKET_OPTION *\r
 HttpBootParseDhcp4Options (\r
-  IN UINT8                      *Buffer,\r
-  IN UINT32                     Length,\r
-  IN UINT8                      OptTag\r
+  IN UINT8   *Buffer,\r
+  IN UINT32  Length,\r
+  IN UINT8   OptTag\r
   )\r
 {\r
-  EFI_DHCP4_PACKET_OPTION       *Option;\r
-  UINT32                        Offset;\r
+  EFI_DHCP4_PACKET_OPTION  *Option;\r
+  UINT32                   Offset;\r
 \r
-  Option  = (EFI_DHCP4_PACKET_OPTION *) Buffer;\r
-  Offset  = 0;\r
+  Option = (EFI_DHCP4_PACKET_OPTION *)Buffer;\r
+  Offset = 0;\r
 \r
   while (Offset < Length && Option->OpCode != DHCP4_TAG_EOP) {\r
-\r
     if (Option->OpCode == OptTag) {\r
       //\r
       // Found the required option.\r
@@ -202,7 +202,7 @@ HttpBootParseDhcp4Options (
       Offset += Option->Length + 2;\r
     }\r
 \r
-    Option = (EFI_DHCP4_PACKET_OPTION *) (Buffer + Offset);\r
+    Option = (EFI_DHCP4_PACKET_OPTION *)(Buffer + Offset);\r
   }\r
 \r
   return NULL;\r
@@ -220,8 +220,8 @@ HttpBootParseDhcp4Options (
 **/\r
 EFI_STATUS\r
 HttpBootCacheDhcp4Packet (\r
-  IN EFI_DHCP4_PACKET     *Dst,\r
-  IN EFI_DHCP4_PACKET     *Src\r
+  IN EFI_DHCP4_PACKET  *Dst,\r
+  IN EFI_DHCP4_PACKET  *Src\r
   )\r
 {\r
   if (Dst->Size < Src->Length) {\r
@@ -245,27 +245,27 @@ HttpBootCacheDhcp4Packet (
 **/\r
 EFI_STATUS\r
 HttpBootParseDhcp4Packet (\r
-  IN HTTP_BOOT_DHCP4_PACKET_CACHE    *Cache4\r
+  IN HTTP_BOOT_DHCP4_PACKET_CACHE  *Cache4\r
   )\r
 {\r
-  EFI_DHCP4_PACKET               *Offer;\r
-  EFI_DHCP4_PACKET_OPTION        **Options;\r
-  UINTN                          Index;\r
-  EFI_DHCP4_PACKET_OPTION        *Option;\r
-  BOOLEAN                        IsProxyOffer;\r
-  BOOLEAN                        IsHttpOffer;\r
-  BOOLEAN                        IsDnsOffer;\r
-  BOOLEAN                        IpExpressedUri;\r
-  UINT8                          *Ptr8;\r
-  EFI_STATUS                     Status;\r
-  HTTP_BOOT_OFFER_TYPE           OfferType;\r
-  EFI_IPv4_ADDRESS               IpAddr;\r
-  BOOLEAN                        FileFieldOverloaded;\r
-\r
-  IsDnsOffer     = FALSE;\r
-  IpExpressedUri = FALSE;\r
-  IsProxyOffer   = FALSE;\r
-  IsHttpOffer    = FALSE;\r
+  EFI_DHCP4_PACKET         *Offer;\r
+  EFI_DHCP4_PACKET_OPTION  **Options;\r
+  UINTN                    Index;\r
+  EFI_DHCP4_PACKET_OPTION  *Option;\r
+  BOOLEAN                  IsProxyOffer;\r
+  BOOLEAN                  IsHttpOffer;\r
+  BOOLEAN                  IsDnsOffer;\r
+  BOOLEAN                  IpExpressedUri;\r
+  UINT8                    *Ptr8;\r
+  EFI_STATUS               Status;\r
+  HTTP_BOOT_OFFER_TYPE     OfferType;\r
+  EFI_IPv4_ADDRESS         IpAddr;\r
+  BOOLEAN                  FileFieldOverloaded;\r
+\r
+  IsDnsOffer          = FALSE;\r
+  IpExpressedUri      = FALSE;\r
+  IsProxyOffer        = FALSE;\r
+  IsHttpOffer         = FALSE;\r
   FileFieldOverloaded = FALSE;\r
 \r
   ZeroMem (Cache4->OptList, sizeof (Cache4->OptList));\r
@@ -284,6 +284,7 @@ HttpBootParseDhcp4Packet (
                        mInterestedDhcp4Tags[Index]\r
                        );\r
   }\r
+\r
   //\r
   // Second, Check if bootfilename and serverhostname is overloaded to carry DHCP options refers to rfc-2132.\r
   // If yes, try to parse options from the BootFileName field, then ServerName field.\r
@@ -295,18 +296,19 @@ HttpBootParseDhcp4Packet (
       for (Index = 0; Index < HTTP_BOOT_DHCP4_TAG_INDEX_MAX; Index++) {\r
         if (Options[Index] == NULL) {\r
           Options[Index] = HttpBootParseDhcp4Options (\r
-                             (UINT8 *) Offer->Dhcp4.Header.BootFileName,\r
+                             (UINT8 *)Offer->Dhcp4.Header.BootFileName,\r
                              sizeof (Offer->Dhcp4.Header.BootFileName),\r
                              mInterestedDhcp4Tags[Index]\r
                              );\r
         }\r
       }\r
     }\r
+\r
     if ((Option->Data[0] & HTTP_BOOT_DHCP4_OVERLOAD_SERVER_NAME) != 0) {\r
       for (Index = 0; Index < HTTP_BOOT_DHCP4_TAG_INDEX_MAX; Index++) {\r
         if (Options[Index] == NULL) {\r
           Options[Index] = HttpBootParseDhcp4Options (\r
-                             (UINT8 *) Offer->Dhcp4.Header.ServerName,\r
+                             (UINT8 *)Offer->Dhcp4.Header.ServerName,\r
                              sizeof (Offer->Dhcp4.Header.ServerName),\r
                              mInterestedDhcp4Tags[Index]\r
                              );\r
@@ -327,7 +329,8 @@ HttpBootParseDhcp4Packet (
   //\r
   Option = Options[HTTP_BOOT_DHCP4_TAG_INDEX_CLASS_ID];\r
   if ((Option != NULL) && (Option->Length >= 10) &&\r
-      (CompareMem (Option->Data, DEFAULT_CLASS_ID_DATA, 10) == 0)) {\r
+      (CompareMem (Option->Data, DEFAULT_CLASS_ID_DATA, 10) == 0))\r
+  {\r
     IsHttpOffer = TRUE;\r
   }\r
 \r
@@ -350,25 +353,25 @@ HttpBootParseDhcp4Packet (
     // RFC 2132, Section 9.5 does not strictly state Bootfile name (option 67) is null\r
     // terminated string. So force to append null terminated character at the end of string.\r
     //\r
-    Ptr8 =  (UINT8*)&Options[HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE]->Data[0];\r
+    Ptr8  =  (UINT8 *)&Options[HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE]->Data[0];\r
     Ptr8 += Options[HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE]->Length;\r
     if (*(Ptr8 - 1) != '\0') {\r
       *Ptr8 = '\0';\r
     }\r
-  } else if (!FileFieldOverloaded && Offer->Dhcp4.Header.BootFileName[0] != 0) {\r
+  } else if (!FileFieldOverloaded && (Offer->Dhcp4.Header.BootFileName[0] != 0)) {\r
     //\r
     // If the bootfile is not present and bootfilename is present in DHCPv4 packet, just parse it.\r
     // Do not count dhcp option header here, or else will destroy the serverhostname.\r
     //\r
     Options[HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE] = (EFI_DHCP4_PACKET_OPTION *)\r
-                                                    (&Offer->Dhcp4.Header.BootFileName[0] -\r
-                                                    OFFSET_OF (EFI_DHCP4_PACKET_OPTION, Data[0]));\r
+                                                  (&Offer->Dhcp4.Header.BootFileName[0] -\r
+                                                   OFFSET_OF (EFI_DHCP4_PACKET_OPTION, Data[0]));\r
   }\r
 \r
   //\r
   // Http offer must have a boot URI.\r
   //\r
-  if (IsHttpOffer && Options[HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE] == NULL) {\r
+  if (IsHttpOffer && (Options[HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE] == NULL)) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
@@ -377,8 +380,8 @@ HttpBootParseDhcp4Packet (
   //\r
   if (IsHttpOffer) {\r
     Status = HttpParseUrl (\r
-               (CHAR8*) Options[HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE]->Data,\r
-               (UINT32) AsciiStrLen ((CHAR8*) Options[HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE]->Data),\r
+               (CHAR8 *)Options[HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE]->Data,\r
+               (UINT32)AsciiStrLen ((CHAR8 *)Options[HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE]->Data),\r
                FALSE,\r
                &Cache4->UriParser\r
                );\r
@@ -387,7 +390,7 @@ HttpBootParseDhcp4Packet (
     }\r
 \r
     Status = HttpUrlGetIp4 (\r
-               (CHAR8*) Options[HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE]->Data,\r
+               (CHAR8 *)Options[HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE]->Data,\r
                Cache4->UriParser,\r
                &IpAddr\r
                );\r
@@ -411,7 +414,6 @@ HttpBootParseDhcp4Packet (
         OfferType = HttpOfferTypeProxyNameUri;\r
       }\r
     }\r
-\r
   } else {\r
     if (!IsProxyOffer) {\r
       OfferType = IsDnsOffer ? HttpOfferTypeDhcpDns : HttpOfferTypeDhcpOnly;\r
@@ -419,6 +421,7 @@ HttpBootParseDhcp4Packet (
       if (Cache4->UriParser != NULL) {\r
         FreePool (Cache4->UriParser);\r
       }\r
+\r
       return EFI_DEVICE_ERROR;\r
     }\r
   }\r
@@ -490,7 +493,7 @@ HttpBootSelectDhcpOffer (
   IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  Private->SelectIndex = 0;\r
+  Private->SelectIndex     = 0;\r
   Private->SelectProxyType = HttpOfferTypeMax;\r
 \r
   if (Private->FilePathUri != NULL) {\r
@@ -500,26 +503,16 @@ HttpBootSelectDhcpOffer (
     // The offer with DNS server address takes priority here.\r
     //\r
     if (Private->OfferCount[HttpOfferTypeDhcpDns] > 0) {\r
-\r
       Private->SelectIndex = Private->OfferIndex[HttpOfferTypeDhcpDns][0] + 1;\r
-\r
     } else if (Private->OfferCount[HttpOfferTypeDhcpIpUriDns] > 0) {\r
-\r
       Private->SelectIndex = Private->OfferIndex[HttpOfferTypeDhcpIpUriDns][0] + 1;\r
-\r
     } else if (Private->OfferCount[HttpOfferTypeDhcpNameUriDns] > 0) {\r
-\r
       Private->SelectIndex = Private->OfferIndex[HttpOfferTypeDhcpNameUriDns][0] + 1;\r
-\r
-    }  else if (Private->OfferCount[HttpOfferTypeDhcpOnly] > 0) {\r
-\r
+    } else if (Private->OfferCount[HttpOfferTypeDhcpOnly] > 0) {\r
       Private->SelectIndex = Private->OfferIndex[HttpOfferTypeDhcpOnly][0] + 1;\r
-\r
-    }  else if (Private->OfferCount[HttpOfferTypeDhcpIpUri] > 0) {\r
-\r
+    } else if (Private->OfferCount[HttpOfferTypeDhcpIpUri] > 0) {\r
       Private->SelectIndex = Private->OfferIndex[HttpOfferTypeDhcpIpUri][0] + 1;\r
     }\r
-\r
   } else {\r
     //\r
     // We are in corporate environment.\r
@@ -532,45 +525,35 @@ HttpBootSelectDhcpOffer (
     // Priority6: HttpOfferTypeDhcpDns  + HttpOfferTypeDhcpNameUri\r
     //\r
     if (Private->OfferCount[HttpOfferTypeDhcpIpUri] > 0) {\r
-\r
       Private->SelectIndex = Private->OfferIndex[HttpOfferTypeDhcpIpUri][0] + 1;\r
-\r
     } else if (Private->OfferCount[HttpOfferTypeDhcpIpUriDns] > 0) {\r
-\r
       Private->SelectIndex = Private->OfferIndex[HttpOfferTypeDhcpIpUriDns][0] + 1;\r
-\r
-    }else if (Private->OfferCount[HttpOfferTypeDhcpNameUriDns] > 0) {\r
-\r
+    } else if (Private->OfferCount[HttpOfferTypeDhcpNameUriDns] > 0) {\r
       Private->SelectIndex = Private->OfferIndex[HttpOfferTypeDhcpNameUriDns][0] + 1;\r
-\r
-    } else if (Private->OfferCount[HttpOfferTypeDhcpOnly] > 0 &&\r
-               Private->OfferCount[HttpOfferTypeProxyIpUri] > 0) {\r
-\r
+    } else if ((Private->OfferCount[HttpOfferTypeDhcpOnly] > 0) &&\r
+               (Private->OfferCount[HttpOfferTypeProxyIpUri] > 0))\r
+    {\r
       Private->SelectIndex     = Private->OfferIndex[HttpOfferTypeDhcpOnly][0] + 1;\r
       Private->SelectProxyType = HttpOfferTypeProxyIpUri;\r
-\r
-    } else if (Private->OfferCount[HttpOfferTypeDhcpDns] > 0 &&\r
-               Private->OfferCount[HttpOfferTypeProxyIpUri] > 0) {\r
-\r
+    } else if ((Private->OfferCount[HttpOfferTypeDhcpDns] > 0) &&\r
+               (Private->OfferCount[HttpOfferTypeProxyIpUri] > 0))\r
+    {\r
       Private->SelectIndex     = Private->OfferIndex[HttpOfferTypeDhcpDns][0] + 1;\r
       Private->SelectProxyType = HttpOfferTypeProxyIpUri;\r
-\r
-    } else if (Private->OfferCount[HttpOfferTypeDhcpDns] > 0 &&\r
-               Private->OfferCount[HttpOfferTypeProxyNameUri] > 0) {\r
-\r
+    } else if ((Private->OfferCount[HttpOfferTypeDhcpDns] > 0) &&\r
+               (Private->OfferCount[HttpOfferTypeProxyNameUri] > 0))\r
+    {\r
       Private->SelectIndex     = Private->OfferIndex[HttpOfferTypeDhcpDns][0] + 1;\r
       Private->SelectProxyType = HttpOfferTypeProxyNameUri;\r
-\r
-    } else if (Private->OfferCount[HttpOfferTypeDhcpDns] > 0 &&\r
-               Private->OfferCount[HttpOfferTypeDhcpNameUri] > 0) {\r
-\r
+    } else if ((Private->OfferCount[HttpOfferTypeDhcpDns] > 0) &&\r
+               (Private->OfferCount[HttpOfferTypeDhcpNameUri] > 0))\r
+    {\r
       Private->SelectIndex     = Private->OfferIndex[HttpOfferTypeDhcpDns][0] + 1;\r
       Private->SelectProxyType = HttpOfferTypeDhcpNameUri;\r
     }\r
   }\r
 }\r
 \r
-\r
 /**\r
   EFI_DHCP4_CALLBACK is provided by the consumer of the EFI DHCPv4 Protocol driver\r
   to intercept events that occurred in the configuration process.\r
@@ -594,29 +577,30 @@ HttpBootSelectDhcpOffer (
 EFI_STATUS\r
 EFIAPI\r
 HttpBootDhcp4CallBack (\r
-  IN  EFI_DHCP4_PROTOCOL               *This,\r
-  IN  VOID                             *Context,\r
-  IN  EFI_DHCP4_STATE                  CurrentState,\r
-  IN  EFI_DHCP4_EVENT                  Dhcp4Event,\r
-  IN  EFI_DHCP4_PACKET                 *Packet            OPTIONAL,\r
-  OUT EFI_DHCP4_PACKET                 **NewPacket        OPTIONAL\r
+  IN  EFI_DHCP4_PROTOCOL  *This,\r
+  IN  VOID                *Context,\r
+  IN  EFI_DHCP4_STATE     CurrentState,\r
+  IN  EFI_DHCP4_EVENT     Dhcp4Event,\r
+  IN  EFI_DHCP4_PACKET    *Packet            OPTIONAL,\r
+  OUT EFI_DHCP4_PACKET    **NewPacket        OPTIONAL\r
   )\r
 {\r
-  HTTP_BOOT_PRIVATE_DATA               *Private;\r
-  EFI_DHCP4_PACKET_OPTION              *MaxMsgSize;\r
-  UINT16                               Value;\r
-  EFI_STATUS                           Status;\r
-  BOOLEAN                              Received;\r
+  HTTP_BOOT_PRIVATE_DATA   *Private;\r
+  EFI_DHCP4_PACKET_OPTION  *MaxMsgSize;\r
+  UINT16                   Value;\r
+  EFI_STATUS               Status;\r
+  BOOLEAN                  Received;\r
 \r
   if ((Dhcp4Event != Dhcp4SendDiscover) &&\r
       (Dhcp4Event != Dhcp4RcvdOffer) &&\r
       (Dhcp4Event != Dhcp4SendRequest) &&\r
       (Dhcp4Event != Dhcp4RcvdAck) &&\r
-      (Dhcp4Event != Dhcp4SelectOffer)) {\r
+      (Dhcp4Event != Dhcp4SelectOffer))\r
+  {\r
     return EFI_SUCCESS;\r
   }\r
 \r
-  Private = (HTTP_BOOT_PRIVATE_DATA *) Context;\r
+  Private = (HTTP_BOOT_PRIVATE_DATA *)Context;\r
 \r
   //\r
   // Override the Maximum DHCP Message Size.\r
@@ -634,15 +618,15 @@ HttpBootDhcp4CallBack (
   //\r
   // Callback to user if any packets sent or received.\r
   //\r
-  if (Private->HttpBootCallback != NULL && Dhcp4Event != Dhcp4SelectOffer) {\r
-    Received = (BOOLEAN) (Dhcp4Event == Dhcp4RcvdOffer || Dhcp4Event == Dhcp4RcvdAck);\r
-    Status = Private->HttpBootCallback->Callback (\r
-               Private->HttpBootCallback,\r
-               HttpBootDhcp4,\r
-               Received,\r
-               Packet->Length,\r
-               &Packet->Dhcp4\r
-               );\r
+  if ((Private->HttpBootCallback != NULL) && (Dhcp4Event != Dhcp4SelectOffer)) {\r
+    Received = (BOOLEAN)(Dhcp4Event == Dhcp4RcvdOffer || Dhcp4Event == Dhcp4RcvdAck);\r
+    Status   = Private->HttpBootCallback->Callback (\r
+                                            Private->HttpBootCallback,\r
+                                            HttpBootDhcp4,\r
+                                            Received,\r
+                                            Packet->Length,\r
+                                            &Packet->Dhcp4\r
+                                            );\r
     if (EFI_ERROR (Status)) {\r
       return EFI_ABORTED;\r
     }\r
@@ -650,40 +634,43 @@ HttpBootDhcp4CallBack (
 \r
   Status = EFI_SUCCESS;\r
   switch (Dhcp4Event) {\r
-  case Dhcp4RcvdOffer:\r
-    Status = EFI_NOT_READY;\r
-    if (Packet->Length > HTTP_BOOT_DHCP4_PACKET_MAX_SIZE) {\r
-      //\r
-      // Ignore the incoming packets which exceed the maximum length.\r
-      //\r
+    case Dhcp4RcvdOffer:\r
+      Status = EFI_NOT_READY;\r
+      if (Packet->Length > HTTP_BOOT_DHCP4_PACKET_MAX_SIZE) {\r
+        //\r
+        // Ignore the incoming packets which exceed the maximum length.\r
+        //\r
+        break;\r
+      }\r
+\r
+      if (Private->OfferNum < HTTP_BOOT_OFFER_MAX_NUM) {\r
+        //\r
+        // Cache the DHCPv4 offers to OfferBuffer[] for select later, and record\r
+        // the OfferIndex and OfferCount.\r
+        // If error happens, just ignore this packet and continue to wait more offer.\r
+        //\r
+        HttpBootCacheDhcp4Offer (Private, Packet);\r
+      }\r
+\r
       break;\r
-    }\r
-    if (Private->OfferNum < HTTP_BOOT_OFFER_MAX_NUM) {\r
+\r
+    case Dhcp4SelectOffer:\r
       //\r
-      // Cache the DHCPv4 offers to OfferBuffer[] for select later, and record\r
-      // the OfferIndex and OfferCount.\r
-      // If error happens, just ignore this packet and continue to wait more offer.\r
+      // Select offer according to the priority in UEFI spec, and record the SelectIndex\r
+      // and SelectProxyType.\r
       //\r
-      HttpBootCacheDhcp4Offer (Private, Packet);\r
-    }\r
-    break;\r
+      HttpBootSelectDhcpOffer (Private);\r
 \r
-  case Dhcp4SelectOffer:\r
-    //\r
-    // Select offer according to the priority in UEFI spec, and record the SelectIndex\r
-    // and SelectProxyType.\r
-    //\r
-    HttpBootSelectDhcpOffer (Private);\r
+      if (Private->SelectIndex == 0) {\r
+        Status = EFI_ABORTED;\r
+      } else {\r
+        *NewPacket = &Private->OfferBuffer[Private->SelectIndex - 1].Dhcp4.Packet.Offer;\r
+      }\r
 \r
-    if (Private->SelectIndex == 0) {\r
-      Status = EFI_ABORTED;\r
-    } else {\r
-      *NewPacket = &Private->OfferBuffer[Private->SelectIndex - 1].Dhcp4.Packet.Offer;\r
-    }\r
-    break;\r
+      break;\r
 \r
-  default:\r
-    break;\r
+    default:\r
+      break;\r
   }\r
 \r
   return Status;\r
@@ -700,11 +687,11 @@ HttpBootDhcp4CallBack (
 **/\r
 EFI_STATUS\r
 HttpBootRegisterIp4Gateway (\r
-  IN HTTP_BOOT_PRIVATE_DATA         *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_IP4_CONFIG2_PROTOCOL        *Ip4Config2;\r
+  EFI_STATUS                Status;\r
+  EFI_IP4_CONFIG2_PROTOCOL  *Ip4Config2;\r
 \r
   ASSERT (!Private->UsingIpv6);\r
 \r
@@ -742,12 +729,12 @@ HttpBootRegisterIp4Gateway (
 **/\r
 EFI_STATUS\r
 HttpBootRegisterIp4Dns (\r
-  IN HTTP_BOOT_PRIVATE_DATA         *Private,\r
-  IN UINTN                          DataLength,\r
-  IN VOID                           *DnsServerData\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private,\r
+  IN UINTN                   DataLength,\r
+  IN VOID                    *DnsServerData\r
   )\r
 {\r
-  EFI_IP4_CONFIG2_PROTOCOL        *Ip4Config2;\r
+  EFI_IP4_CONFIG2_PROTOCOL  *Ip4Config2;\r
 \r
   ASSERT (!Private->UsingIpv6);\r
 \r
@@ -761,7 +748,6 @@ HttpBootRegisterIp4Dns (
                        );\r
 }\r
 \r
-\r
 /**\r
   This function will switch the IP4 configuration policy to Static.\r
 \r
@@ -773,35 +759,35 @@ HttpBootRegisterIp4Dns (
 **/\r
 EFI_STATUS\r
 HttpBootSetIp4Policy (\r
-  IN HTTP_BOOT_PRIVATE_DATA         *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_IP4_CONFIG2_POLICY          Policy;\r
-  EFI_STATUS                      Status;\r
-  EFI_IP4_CONFIG2_PROTOCOL        *Ip4Config2;\r
-  UINTN                           DataSize;\r
+  EFI_IP4_CONFIG2_POLICY    Policy;\r
+  EFI_STATUS                Status;\r
+  EFI_IP4_CONFIG2_PROTOCOL  *Ip4Config2;\r
+  UINTN                     DataSize;\r
 \r
   Ip4Config2 = Private->Ip4Config2;\r
 \r
   DataSize = sizeof (EFI_IP4_CONFIG2_POLICY);\r
-  Status = Ip4Config2->GetData (\r
-                         Ip4Config2,\r
-                         Ip4Config2DataTypePolicy,\r
-                         &DataSize,\r
-                         &Policy\r
-                         );\r
+  Status   = Ip4Config2->GetData (\r
+                           Ip4Config2,\r
+                           Ip4Config2DataTypePolicy,\r
+                           &DataSize,\r
+                           &Policy\r
+                           );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   if (Policy != Ip4Config2PolicyStatic) {\r
     Policy = Ip4Config2PolicyStatic;\r
-    Status= Ip4Config2->SetData (\r
-                          Ip4Config2,\r
-                          Ip4Config2DataTypePolicy,\r
-                          sizeof (EFI_IP4_CONFIG2_POLICY),\r
-                          &Policy\r
-                          );\r
+    Status = Ip4Config2->SetData (\r
+                           Ip4Config2,\r
+                           Ip4Config2DataTypePolicy,\r
+                           sizeof (EFI_IP4_CONFIG2_POLICY),\r
+                           &Policy\r
+                           );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -821,16 +807,16 @@ HttpBootSetIp4Policy (
 **/\r
 EFI_STATUS\r
 HttpBootDhcp4Dora (\r
-  IN HTTP_BOOT_PRIVATE_DATA         *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_DHCP4_PROTOCOL           *Dhcp4;\r
-  UINT32                       OptCount;\r
-  EFI_DHCP4_PACKET_OPTION      *OptList[HTTP_BOOT_DHCP4_OPTION_MAX_NUM];\r
-  UINT8                        Buffer[HTTP_BOOT_DHCP4_OPTION_MAX_SIZE];\r
-  EFI_DHCP4_CONFIG_DATA        Config;\r
-  EFI_STATUS                   Status;\r
-  EFI_DHCP4_MODE_DATA          Mode;\r
+  EFI_DHCP4_PROTOCOL       *Dhcp4;\r
+  UINT32                   OptCount;\r
+  EFI_DHCP4_PACKET_OPTION  *OptList[HTTP_BOOT_DHCP4_OPTION_MAX_NUM];\r
+  UINT8                    Buffer[HTTP_BOOT_DHCP4_OPTION_MAX_SIZE];\r
+  EFI_DHCP4_CONFIG_DATA    Config;\r
+  EFI_STATUS               Status;\r
+  EFI_DHCP4_MODE_DATA      Mode;\r
 \r
   Dhcp4 = Private->Dhcp4;\r
   ASSERT (Dhcp4 != NULL);\r
@@ -846,7 +832,7 @@ HttpBootDhcp4Dora (
   OptCount = HttpBootBuildDhcp4Options (Private, OptList, Buffer);\r
   ASSERT (OptCount > 0);\r
 \r
-  ZeroMem (&Config, sizeof(Config));\r
+  ZeroMem (&Config, sizeof (Config));\r
   Config.OptionCount      = OptCount;\r
   Config.OptionList       = OptList;\r
   Config.Dhcp4Callback    = HttpBootDhcp4CallBack;\r
index 606a466aaed8a838e198140869505b2bc1b100e1..d76f0e84d6a5aa7e3172d74232c346607eba4d05 100644 (file)
@@ -10,17 +10,17 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef __EFI_UEFI_HTTP_BOOT_DHCP4_H__\r
 #define __EFI_UEFI_HTTP_BOOT_DHCP4_H__\r
 \r
-#define HTTP_BOOT_DHCP4_OPTION_MAX_NUM         16\r
-#define HTTP_BOOT_DHCP4_OPTION_MAX_SIZE        312\r
-#define HTTP_BOOT_DHCP4_PACKET_MAX_SIZE        1472\r
+#define HTTP_BOOT_DHCP4_OPTION_MAX_NUM   16\r
+#define HTTP_BOOT_DHCP4_OPTION_MAX_SIZE  312\r
+#define HTTP_BOOT_DHCP4_PACKET_MAX_SIZE  1472\r
 \r
-#define HTTP_BOOT_DHCP4_OPCODE_REQUEST         1\r
-#define HTTP_BOOT_DHCP4_OPCODE_REPLY           2\r
-#define HTTP_BOOT_DHCP4_MSG_TYPE_REQUEST       3\r
-#define HTTP_BOOT_DHCP4_MAGIC                  0x63538263 // network byte order\r
+#define HTTP_BOOT_DHCP4_OPCODE_REQUEST    1\r
+#define HTTP_BOOT_DHCP4_OPCODE_REPLY      2\r
+#define HTTP_BOOT_DHCP4_MSG_TYPE_REQUEST  3\r
+#define HTTP_BOOT_DHCP4_MAGIC             0x63538263      // network byte order\r
 \r
-#define HTTP_BOOT_DHCP4_OVERLOAD_FILE          1\r
-#define HTTP_BOOT_DHCP4_OVERLOAD_SERVER_NAME   2\r
+#define HTTP_BOOT_DHCP4_OVERLOAD_FILE         1\r
+#define HTTP_BOOT_DHCP4_OVERLOAD_SERVER_NAME  2\r
 \r
 ///\r
 /// HTTP Tag definition that identifies the processor\r
@@ -29,17 +29,17 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /// http://www.ietf.org/assignments/dhcpv6-parameters/dhcpv6-parameters.xml\r
 ///\r
 #if defined (MDE_CPU_IA32)\r
-#define EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE    HTTP_CLIENT_ARCH_IA32\r
+#define EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE  HTTP_CLIENT_ARCH_IA32\r
 #elif defined (MDE_CPU_X64)\r
-#define EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE    HTTP_CLIENT_ARCH_X64\r
+#define EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE  HTTP_CLIENT_ARCH_X64\r
 #elif defined (MDE_CPU_ARM)\r
-#define EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE    HTTP_CLIENT_ARCH_ARM\r
+#define EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE  HTTP_CLIENT_ARCH_ARM\r
 #elif defined (MDE_CPU_AARCH64)\r
-#define EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE    HTTP_CLIENT_ARCH_AARCH64\r
+#define EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE  HTTP_CLIENT_ARCH_AARCH64\r
 #elif defined (MDE_CPU_RISCV64)\r
-#define EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE    HTTP_CLIENT_ARCH_RISCV64\r
+#define EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE  HTTP_CLIENT_ARCH_RISCV64\r
 #elif defined (MDE_CPU_EBC)\r
-#define EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE    HTTP_CLIENT_ARCH_EBC\r
+#define EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE  HTTP_CLIENT_ARCH_EBC\r
 #endif\r
 \r
 /// DHCP offer types among HTTP boot.\r
@@ -88,75 +88,75 @@ typedef enum {
   HttpOfferTypeMax\r
 } HTTP_BOOT_OFFER_TYPE;\r
 \r
-#define HTTP_BOOT_DHCP_RETRIES            4\r
-#define HTTP_BOOT_OFFER_MAX_NUM           16\r
+#define HTTP_BOOT_DHCP_RETRIES   4\r
+#define HTTP_BOOT_OFFER_MAX_NUM  16\r
 \r
 // The array index of the DHCP4 option tag interested\r
 //\r
-#define HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE_LEN 0\r
-#define HTTP_BOOT_DHCP4_TAG_INDEX_OVERLOAD     1\r
-#define HTTP_BOOT_DHCP4_TAG_INDEX_MSG_TYPE     2\r
-#define HTTP_BOOT_DHCP4_TAG_INDEX_SERVER_ID    3\r
-#define HTTP_BOOT_DHCP4_TAG_INDEX_CLASS_ID     4\r
-#define HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE     5\r
-#define HTTP_BOOT_DHCP4_TAG_INDEX_DNS_SERVER   6\r
-#define HTTP_BOOT_DHCP4_TAG_INDEX_MAX          7\r
+#define HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE_LEN  0\r
+#define HTTP_BOOT_DHCP4_TAG_INDEX_OVERLOAD      1\r
+#define HTTP_BOOT_DHCP4_TAG_INDEX_MSG_TYPE      2\r
+#define HTTP_BOOT_DHCP4_TAG_INDEX_SERVER_ID     3\r
+#define HTTP_BOOT_DHCP4_TAG_INDEX_CLASS_ID      4\r
+#define HTTP_BOOT_DHCP4_TAG_INDEX_BOOTFILE      5\r
+#define HTTP_BOOT_DHCP4_TAG_INDEX_DNS_SERVER    6\r
+#define HTTP_BOOT_DHCP4_TAG_INDEX_MAX           7\r
 \r
 #pragma pack(1)\r
 \r
 typedef struct {\r
-  UINT8 ParaList[135];\r
+  UINT8    ParaList[135];\r
 } HTTP_BOOT_DHCP4_OPTION_PARA;\r
 \r
 typedef struct {\r
-  UINT16  Size;\r
+  UINT16    Size;\r
 } HTTP_BOOT_DHCP4_OPTION_MAX_MESG_SIZE;\r
 \r
 typedef struct {\r
-  UINT8 Type;\r
-  UINT8 MajorVer;\r
-  UINT8 MinorVer;\r
+  UINT8    Type;\r
+  UINT8    MajorVer;\r
+  UINT8    MinorVer;\r
 } HTTP_BOOT_DHCP4_OPTION_UNDI;\r
 \r
 typedef struct {\r
-  UINT8 Type;\r
+  UINT8    Type;\r
 } HTTP_BOOT_DHCP4_OPTION_MESG;\r
 \r
 typedef struct {\r
-  UINT16 Type;\r
+  UINT16    Type;\r
 } HTTP_BOOT_DHCP4_OPTION_ARCH;\r
 \r
 typedef struct {\r
-  UINT8 ClassIdentifier[11];\r
-  UINT8 ArchitecturePrefix[5];\r
-  UINT8 ArchitectureType[5];\r
-  UINT8 Lit3[1];\r
-  UINT8 InterfaceName[4];\r
-  UINT8 Lit4[1];\r
-  UINT8 UndiMajor[3];\r
-  UINT8 UndiMinor[3];\r
+  UINT8    ClassIdentifier[11];\r
+  UINT8    ArchitecturePrefix[5];\r
+  UINT8    ArchitectureType[5];\r
+  UINT8    Lit3[1];\r
+  UINT8    InterfaceName[4];\r
+  UINT8    Lit4[1];\r
+  UINT8    UndiMajor[3];\r
+  UINT8    UndiMinor[3];\r
 } HTTP_BOOT_DHCP4_OPTION_CLID;\r
 \r
 typedef struct {\r
-  UINT8 Type;\r
-  UINT8 Guid[16];\r
+  UINT8    Type;\r
+  UINT8    Guid[16];\r
 } HTTP_BOOT_DHCP4_OPTION_UUID;\r
 \r
 typedef struct {\r
-  UINT16 Type;\r
-  UINT16 Layer;\r
+  UINT16    Type;\r
+  UINT16    Layer;\r
 } HTTP_BOOT_OPTION_BOOT_ITEM;\r
 \r
 #pragma pack()\r
 \r
 typedef union {\r
-  HTTP_BOOT_DHCP4_OPTION_PARA           *Para;\r
-  HTTP_BOOT_DHCP4_OPTION_UNDI           *Undi;\r
-  HTTP_BOOT_DHCP4_OPTION_ARCH           *Arch;\r
-  HTTP_BOOT_DHCP4_OPTION_CLID           *Clid;\r
-  HTTP_BOOT_DHCP4_OPTION_UUID           *Uuid;\r
-  HTTP_BOOT_DHCP4_OPTION_MESG           *Mesg;\r
-  HTTP_BOOT_DHCP4_OPTION_MAX_MESG_SIZE  *MaxMesgSize;\r
+  HTTP_BOOT_DHCP4_OPTION_PARA             *Para;\r
+  HTTP_BOOT_DHCP4_OPTION_UNDI             *Undi;\r
+  HTTP_BOOT_DHCP4_OPTION_ARCH             *Arch;\r
+  HTTP_BOOT_DHCP4_OPTION_CLID             *Clid;\r
+  HTTP_BOOT_DHCP4_OPTION_UUID             *Uuid;\r
+  HTTP_BOOT_DHCP4_OPTION_MESG             *Mesg;\r
+  HTTP_BOOT_DHCP4_OPTION_MAX_MESG_SIZE    *MaxMesgSize;\r
 } HTTP_BOOT_DHCP4_OPTION_ENTRY;\r
 \r
 #define GET_NEXT_DHCP_OPTION(Opt) \\r
@@ -166,44 +166,44 @@ typedef union {
 #define GET_OPTION_BUFFER_LEN(Pkt) \\r
   ((Pkt)->Length - sizeof (EFI_DHCP4_HEADER) - 4)\r
 \r
-#define DEFAULT_CLASS_ID_DATA "HTTPClient:Arch:xxxxx:UNDI:003000"\r
-#define DEFAULT_UNDI_TYPE     1\r
-#define DEFAULT_UNDI_MAJOR    3\r
-#define DEFAULT_UNDI_MINOR    0\r
+#define DEFAULT_CLASS_ID_DATA  "HTTPClient:Arch:xxxxx:UNDI:003000"\r
+#define DEFAULT_UNDI_TYPE      1\r
+#define DEFAULT_UNDI_MAJOR     3\r
+#define DEFAULT_UNDI_MINOR     0\r
 \r
 typedef struct {\r
-  UINT32         Reserved;\r
+  UINT32    Reserved;\r
 } HTTP_BOOT_VENDOR_OPTION;\r
 \r
 #define HTTP_CACHED_DHCP4_PACKET_MAX_SIZE  (OFFSET_OF (EFI_DHCP4_PACKET, Dhcp4) + HTTP_BOOT_DHCP4_PACKET_MAX_SIZE)\r
 \r
 typedef union {\r
-  EFI_DHCP4_PACKET        Offer;\r
-  EFI_DHCP4_PACKET        Ack;\r
-  UINT8                   Buffer[HTTP_CACHED_DHCP4_PACKET_MAX_SIZE];\r
+  EFI_DHCP4_PACKET    Offer;\r
+  EFI_DHCP4_PACKET    Ack;\r
+  UINT8               Buffer[HTTP_CACHED_DHCP4_PACKET_MAX_SIZE];\r
 } HTTP_BOOT_DHCP4_PACKET;\r
 \r
 typedef struct {\r
   //\r
   // URI component\r
   //\r
-  CHAR8                   *Scheme;\r
-  CHAR8                   *Authority;\r
-  CHAR8                   *Path;\r
-  CHAR8                   *Query;\r
-  CHAR8                   *Fragment; /// TODO: may not required in HTTP URL\r
+  CHAR8             *Scheme;\r
+  CHAR8             *Authority;\r
+  CHAR8             *Path;\r
+  CHAR8             *Query;\r
+  CHAR8             *Fragment;       /// TODO: may not required in HTTP URL\r
 \r
-  CHAR8                   *RegName; /// Point to somewhere in Authority\r
-  BOOLEAN                 AddrIsOk;\r
-  EFI_IP_ADDRESS          Address;\r
-  UINT16                  Port;\r
+  CHAR8             *RegName;       /// Point to somewhere in Authority\r
+  BOOLEAN           AddrIsOk;\r
+  EFI_IP_ADDRESS    Address;\r
+  UINT16            Port;\r
 } HTTP_BOOT_URI_CONTENT;\r
 \r
 typedef struct {\r
-  HTTP_BOOT_DHCP4_PACKET      Packet;\r
-  HTTP_BOOT_OFFER_TYPE        OfferType;\r
-  VOID                        *UriParser;\r
-  EFI_DHCP4_PACKET_OPTION     *OptList[HTTP_BOOT_DHCP4_TAG_INDEX_MAX];\r
+  HTTP_BOOT_DHCP4_PACKET     Packet;\r
+  HTTP_BOOT_OFFER_TYPE       OfferType;\r
+  VOID                       *UriParser;\r
+  EFI_DHCP4_PACKET_OPTION    *OptList[HTTP_BOOT_DHCP4_TAG_INDEX_MAX];\r
 } HTTP_BOOT_DHCP4_PACKET_CACHE;\r
 \r
 /**\r
@@ -228,7 +228,7 @@ HttpBootSelectDhcpOffer (
 **/\r
 EFI_STATUS\r
 HttpBootDhcp4Dora (\r
-  IN HTTP_BOOT_PRIVATE_DATA         *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   );\r
 \r
 /**\r
@@ -245,9 +245,9 @@ HttpBootDhcp4Dora (
 **/\r
 EFI_STATUS\r
 HttpBootRegisterIp4Dns (\r
-  IN HTTP_BOOT_PRIVATE_DATA         *Private,\r
-  IN UINTN                          DataLength,\r
-  IN VOID                           *DnsServerData\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private,\r
+  IN UINTN                   DataLength,\r
+  IN VOID                    *DnsServerData\r
   );\r
 \r
 #endif\r
index 4905bca4ad19e64d7e7a88cb32f8c03f315ebefe..b22cef4ff58743898c3ff863ab2a52f995b2dd2b 100644 (file)
@@ -20,70 +20,70 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 UINT32\r
 HttpBootBuildDhcp6Options (\r
-  IN  HTTP_BOOT_PRIVATE_DATA       *Private,\r
-  OUT EFI_DHCP6_PACKET_OPTION      **OptList,\r
-  IN  UINT8                        *Buffer\r
+  IN  HTTP_BOOT_PRIVATE_DATA   *Private,\r
+  OUT EFI_DHCP6_PACKET_OPTION  **OptList,\r
+  IN  UINT8                    *Buffer\r
   )\r
 {\r
-  HTTP_BOOT_DHCP6_OPTION_ENTRY     OptEnt;\r
-  UINT16                           Value;\r
-  UINT32                           Index;\r
+  HTTP_BOOT_DHCP6_OPTION_ENTRY  OptEnt;\r
+  UINT16                        Value;\r
+  UINT32                        Index;\r
 \r
   Index      = 0;\r
-  OptList[0] = (EFI_DHCP6_PACKET_OPTION *) Buffer;\r
+  OptList[0] = (EFI_DHCP6_PACKET_OPTION *)Buffer;\r
 \r
   //\r
   // Append client option request option\r
   //\r
-  OptList[Index]->OpCode     = HTONS (DHCP6_OPT_ORO);\r
-  OptList[Index]->OpLen      = HTONS (8);\r
-  OptEnt.Oro                 = (HTTP_BOOT_DHCP6_OPTION_ORO *) OptList[Index]->Data;\r
-  OptEnt.Oro->OpCode[0]      = HTONS(DHCP6_OPT_BOOT_FILE_URL);\r
-  OptEnt.Oro->OpCode[1]      = HTONS(DHCP6_OPT_BOOT_FILE_PARAM);\r
-  OptEnt.Oro->OpCode[2]      = HTONS(DHCP6_OPT_DNS_SERVERS);\r
-  OptEnt.Oro->OpCode[3]      = HTONS(DHCP6_OPT_VENDOR_CLASS);\r
+  OptList[Index]->OpCode = HTONS (DHCP6_OPT_ORO);\r
+  OptList[Index]->OpLen  = HTONS (8);\r
+  OptEnt.Oro             = (HTTP_BOOT_DHCP6_OPTION_ORO *)OptList[Index]->Data;\r
+  OptEnt.Oro->OpCode[0]  = HTONS (DHCP6_OPT_BOOT_FILE_URL);\r
+  OptEnt.Oro->OpCode[1]  = HTONS (DHCP6_OPT_BOOT_FILE_PARAM);\r
+  OptEnt.Oro->OpCode[2]  = HTONS (DHCP6_OPT_DNS_SERVERS);\r
+  OptEnt.Oro->OpCode[3]  = HTONS (DHCP6_OPT_VENDOR_CLASS);\r
   Index++;\r
-  OptList[Index]             = GET_NEXT_DHCP6_OPTION (OptList[Index - 1]);\r
+  OptList[Index] = GET_NEXT_DHCP6_OPTION (OptList[Index - 1]);\r
 \r
   //\r
   // Append client network device interface option\r
   //\r
-  OptList[Index]->OpCode     = HTONS (DHCP6_OPT_UNDI);\r
-  OptList[Index]->OpLen      = HTONS ((UINT16)3);\r
-  OptEnt.Undi                = (HTTP_BOOT_DHCP6_OPTION_UNDI *) OptList[Index]->Data;\r
+  OptList[Index]->OpCode = HTONS (DHCP6_OPT_UNDI);\r
+  OptList[Index]->OpLen  = HTONS ((UINT16)3);\r
+  OptEnt.Undi            = (HTTP_BOOT_DHCP6_OPTION_UNDI *)OptList[Index]->Data;\r
 \r
   if (Private->Nii != NULL) {\r
-    OptEnt.Undi->Type        = Private->Nii->Type;\r
-    OptEnt.Undi->MajorVer    = Private->Nii->MajorVer;\r
-    OptEnt.Undi->MinorVer    = Private->Nii->MinorVer;\r
+    OptEnt.Undi->Type     = Private->Nii->Type;\r
+    OptEnt.Undi->MajorVer = Private->Nii->MajorVer;\r
+    OptEnt.Undi->MinorVer = Private->Nii->MinorVer;\r
   } else {\r
-    OptEnt.Undi->Type        = DEFAULT_UNDI_TYPE;\r
-    OptEnt.Undi->MajorVer    = DEFAULT_UNDI_MAJOR;\r
-    OptEnt.Undi->MinorVer    = DEFAULT_UNDI_MINOR;\r
+    OptEnt.Undi->Type     = DEFAULT_UNDI_TYPE;\r
+    OptEnt.Undi->MajorVer = DEFAULT_UNDI_MAJOR;\r
+    OptEnt.Undi->MinorVer = DEFAULT_UNDI_MINOR;\r
   }\r
 \r
   Index++;\r
-  OptList[Index]             = GET_NEXT_DHCP6_OPTION (OptList[Index - 1]);\r
+  OptList[Index] = GET_NEXT_DHCP6_OPTION (OptList[Index - 1]);\r
 \r
   //\r
   // Append client system architecture option\r
   //\r
-  OptList[Index]->OpCode     = HTONS (DHCP6_OPT_ARCH);\r
-  OptList[Index]->OpLen      = HTONS ((UINT16) sizeof (HTTP_BOOT_DHCP6_OPTION_ARCH));\r
-  OptEnt.Arch                = (HTTP_BOOT_DHCP6_OPTION_ARCH *) OptList[Index]->Data;\r
-  Value                      = HTONS (EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE);\r
+  OptList[Index]->OpCode = HTONS (DHCP6_OPT_ARCH);\r
+  OptList[Index]->OpLen  = HTONS ((UINT16)sizeof (HTTP_BOOT_DHCP6_OPTION_ARCH));\r
+  OptEnt.Arch            = (HTTP_BOOT_DHCP6_OPTION_ARCH *)OptList[Index]->Data;\r
+  Value                  = HTONS (EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE);\r
   CopyMem (&OptEnt.Arch->Type, &Value, sizeof (UINT16));\r
   Index++;\r
-  OptList[Index]             = GET_NEXT_DHCP6_OPTION (OptList[Index - 1]);\r
+  OptList[Index] = GET_NEXT_DHCP6_OPTION (OptList[Index - 1]);\r
 \r
   //\r
   // Append vendor class identify option.\r
   //\r
   OptList[Index]->OpCode       = HTONS (DHCP6_OPT_VENDOR_CLASS);\r
-  OptList[Index]->OpLen        = HTONS ((UINT16) sizeof (HTTP_BOOT_DHCP6_OPTION_VENDOR_CLASS));\r
-  OptEnt.VendorClass           = (HTTP_BOOT_DHCP6_OPTION_VENDOR_CLASS *) OptList[Index]->Data;\r
+  OptList[Index]->OpLen        = HTONS ((UINT16)sizeof (HTTP_BOOT_DHCP6_OPTION_VENDOR_CLASS));\r
+  OptEnt.VendorClass           = (HTTP_BOOT_DHCP6_OPTION_VENDOR_CLASS *)OptList[Index]->Data;\r
   OptEnt.VendorClass->Vendor   = HTONL (HTTP_BOOT_DHCP6_ENTERPRISE_NUM);\r
-  OptEnt.VendorClass->ClassLen = HTONS ((UINT16) sizeof (HTTP_BOOT_CLASS_ID));\r
+  OptEnt.VendorClass->ClassLen = HTONS ((UINT16)sizeof (HTTP_BOOT_CLASS_ID));\r
   CopyMem (\r
     &OptEnt.VendorClass->ClassId,\r
     DEFAULT_CLASS_ID_DATA,\r
@@ -131,33 +131,30 @@ HttpBootBuildDhcp6Options (
 **/\r
 EFI_DHCP6_PACKET_OPTION *\r
 HttpBootParseDhcp6Options (\r
-  IN UINT8                       *Buffer,\r
-  IN UINT32                      Length,\r
-  IN UINT16                      OptTag\r
+  IN UINT8   *Buffer,\r
+  IN UINT32  Length,\r
+  IN UINT16  OptTag\r
   )\r
 {\r
-  EFI_DHCP6_PACKET_OPTION        *Option;\r
-  UINT32                         Offset;\r
+  EFI_DHCP6_PACKET_OPTION  *Option;\r
+  UINT32                   Offset;\r
 \r
-  Option  = (EFI_DHCP6_PACKET_OPTION *) Buffer;\r
-  Offset  = 0;\r
+  Option = (EFI_DHCP6_PACKET_OPTION *)Buffer;\r
+  Offset = 0;\r
 \r
   //\r
   // OpLen and OpCode here are both stored in network order.\r
   //\r
   while (Offset < Length) {\r
-\r
     if (NTOHS (Option->OpCode) == OptTag) {\r
-\r
       return Option;\r
     }\r
 \r
-    Offset += (NTOHS(Option->OpLen) + 4);\r
-    Option  = (EFI_DHCP6_PACKET_OPTION *) (Buffer + Offset);\r
+    Offset += (NTOHS (Option->OpLen) + 4);\r
+    Option  = (EFI_DHCP6_PACKET_OPTION *)(Buffer + Offset);\r
   }\r
 \r
   return NULL;\r
-\r
 }\r
 \r
 /**\r
@@ -171,40 +168,39 @@ HttpBootParseDhcp6Options (
 **/\r
 EFI_STATUS\r
 HttpBootParseDhcp6Packet (\r
-  IN  HTTP_BOOT_DHCP6_PACKET_CACHE    *Cache6\r
+  IN  HTTP_BOOT_DHCP6_PACKET_CACHE  *Cache6\r
   )\r
 {\r
-  EFI_DHCP6_PACKET               *Offer;\r
-  EFI_DHCP6_PACKET_OPTION        **Options;\r
-  EFI_DHCP6_PACKET_OPTION        *Option;\r
-  HTTP_BOOT_OFFER_TYPE           OfferType;\r
-  EFI_IPv6_ADDRESS               IpAddr;\r
-  BOOLEAN                        IsProxyOffer;\r
-  BOOLEAN                        IsHttpOffer;\r
-  BOOLEAN                        IsDnsOffer;\r
-  BOOLEAN                        IpExpressedUri;\r
-  EFI_STATUS                     Status;\r
-  UINT32                         Offset;\r
-  UINT32                         Length;\r
+  EFI_DHCP6_PACKET         *Offer;\r
+  EFI_DHCP6_PACKET_OPTION  **Options;\r
+  EFI_DHCP6_PACKET_OPTION  *Option;\r
+  HTTP_BOOT_OFFER_TYPE     OfferType;\r
+  EFI_IPv6_ADDRESS         IpAddr;\r
+  BOOLEAN                  IsProxyOffer;\r
+  BOOLEAN                  IsHttpOffer;\r
+  BOOLEAN                  IsDnsOffer;\r
+  BOOLEAN                  IpExpressedUri;\r
+  EFI_STATUS               Status;\r
+  UINT32                   Offset;\r
+  UINT32                   Length;\r
 \r
   IsDnsOffer     = FALSE;\r
   IpExpressedUri = FALSE;\r
   IsProxyOffer   = TRUE;\r
   IsHttpOffer    = FALSE;\r
-  Offer        = &Cache6->Packet.Offer;\r
-  Options      = Cache6->OptList;\r
+  Offer          = &Cache6->Packet.Offer;\r
+  Options        = Cache6->OptList;\r
 \r
   ZeroMem (Cache6->OptList, sizeof (Cache6->OptList));\r
 \r
-  Option  = (EFI_DHCP6_PACKET_OPTION *) (Offer->Dhcp6.Option);\r
-  Offset  = 0;\r
-  Length  = GET_DHCP6_OPTION_SIZE (Offer);\r
+  Option = (EFI_DHCP6_PACKET_OPTION *)(Offer->Dhcp6.Option);\r
+  Offset = 0;\r
+  Length = GET_DHCP6_OPTION_SIZE (Offer);\r
 \r
   //\r
   // OpLen and OpCode here are both stored in network order, since they are from original packet.\r
   //\r
   while (Offset < Length) {\r
-\r
     if (NTOHS (Option->OpCode) == DHCP6_OPT_IA_NA) {\r
       Options[HTTP_BOOT_DHCP6_IDX_IA_NA] = Option;\r
     } else if (NTOHS (Option->OpCode) == DHCP6_OPT_BOOT_FILE_URL) {\r
@@ -221,8 +217,9 @@ HttpBootParseDhcp6Packet (
     }\r
 \r
     Offset += (NTOHS (Option->OpLen) + 4);\r
-    Option  = (EFI_DHCP6_PACKET_OPTION *) (Offer->Dhcp6.Option + Offset);\r
+    Option  = (EFI_DHCP6_PACKET_OPTION *)(Offer->Dhcp6.Option + Offset);\r
   }\r
+\r
   //\r
   // The offer with assigned client address is NOT a proxy offer.\r
   // An ia_na option, embedded with valid ia_addr option and a status_code of success.\r
@@ -234,7 +231,7 @@ HttpBootParseDhcp6Packet (
                NTOHS (Option->OpLen),\r
                DHCP6_OPT_STATUS_CODE\r
                );\r
-    if ((Option != NULL && Option->Data[0] == 0) || (Option == NULL)) {\r
+    if (((Option != NULL) && (Option->Data[0] == 0)) || (Option == NULL)) {\r
       IsProxyOffer = FALSE;\r
     }\r
   }\r
@@ -244,10 +241,11 @@ HttpBootParseDhcp6Packet (
   //\r
   Option = Options[HTTP_BOOT_DHCP6_IDX_VENDOR_CLASS];\r
 \r
-  if (Option != NULL &&\r
-      NTOHS(Option->OpLen) >= 16 &&\r
-      CompareMem ((Option->Data + 6), DEFAULT_CLASS_ID_DATA, 10) == 0) {\r
-      IsHttpOffer = TRUE;\r
+  if ((Option != NULL) &&\r
+      (NTOHS (Option->OpLen) >= 16) &&\r
+      (CompareMem ((Option->Data + 6), DEFAULT_CLASS_ID_DATA, 10) == 0))\r
+  {\r
+    IsHttpOffer = TRUE;\r
   }\r
 \r
   //\r
@@ -261,7 +259,7 @@ HttpBootParseDhcp6Packet (
   //\r
   // Http offer must have a boot URI.\r
   //\r
-  if (IsHttpOffer && Options[HTTP_BOOT_DHCP6_IDX_BOOT_FILE_URL] == NULL) {\r
+  if (IsHttpOffer && (Options[HTTP_BOOT_DHCP6_IDX_BOOT_FILE_URL] == NULL)) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
@@ -270,8 +268,8 @@ HttpBootParseDhcp6Packet (
   //\r
   if (IsHttpOffer) {\r
     Status = HttpParseUrl (\r
-               (CHAR8*) Options[HTTP_BOOT_DHCP6_IDX_BOOT_FILE_URL]->Data,\r
-               (UINT32) AsciiStrLen ((CHAR8*) Options[HTTP_BOOT_DHCP6_IDX_BOOT_FILE_URL]->Data),\r
+               (CHAR8 *)Options[HTTP_BOOT_DHCP6_IDX_BOOT_FILE_URL]->Data,\r
+               (UINT32)AsciiStrLen ((CHAR8 *)Options[HTTP_BOOT_DHCP6_IDX_BOOT_FILE_URL]->Data),\r
                FALSE,\r
                &Cache6->UriParser\r
                );\r
@@ -280,7 +278,7 @@ HttpBootParseDhcp6Packet (
     }\r
 \r
     Status = HttpUrlGetIp6 (\r
-               (CHAR8*) Options[HTTP_BOOT_DHCP6_IDX_BOOT_FILE_URL]->Data,\r
+               (CHAR8 *)Options[HTTP_BOOT_DHCP6_IDX_BOOT_FILE_URL]->Data,\r
                Cache6->UriParser,\r
                &IpAddr\r
                );\r
@@ -304,7 +302,6 @@ HttpBootParseDhcp6Packet (
         OfferType = HttpOfferTypeProxyNameUri;\r
       }\r
     }\r
-\r
   } else {\r
     if (!IsProxyOffer) {\r
       OfferType = IsDnsOffer ? HttpOfferTypeDhcpDns : HttpOfferTypeDhcpOnly;\r
@@ -329,8 +326,8 @@ HttpBootParseDhcp6Packet (
 **/\r
 EFI_STATUS\r
 HttpBootCacheDhcp6Packet (\r
-  IN EFI_DHCP6_PACKET          *Dst,\r
-  IN EFI_DHCP6_PACKET          *Src\r
+  IN EFI_DHCP6_PACKET  *Dst,\r
+  IN EFI_DHCP6_PACKET  *Src\r
   )\r
 {\r
   if (Dst->Size < Src->Length) {\r
@@ -359,10 +356,10 @@ HttpBootCacheDhcp6Offer (
   IN EFI_DHCP6_PACKET        *RcvdOffer\r
   )\r
 {\r
-  HTTP_BOOT_DHCP6_PACKET_CACHE   *Cache6;\r
-  EFI_DHCP6_PACKET               *Offer;\r
-  HTTP_BOOT_OFFER_TYPE           OfferType;\r
-  EFI_STATUS                     Status;\r
+  HTTP_BOOT_DHCP6_PACKET_CACHE  *Cache6;\r
+  EFI_DHCP6_PACKET              *Offer;\r
+  HTTP_BOOT_OFFER_TYPE          OfferType;\r
+  EFI_STATUS                    Status;\r
 \r
   Cache6 = &Private->OfferBuffer[Private->OfferNum].Dhcp6;\r
   Offer  = &Cache6->Packet.Offer;\r
@@ -370,7 +367,7 @@ HttpBootCacheDhcp6Offer (
   //\r
   // Cache the content of DHCPv6 packet firstly.\r
   //\r
-  Status = HttpBootCacheDhcp6Packet(Offer, RcvdOffer);\r
+  Status = HttpBootCacheDhcp6Packet (Offer, RcvdOffer);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -417,86 +414,91 @@ HttpBootCacheDhcp6Offer (
 EFI_STATUS\r
 EFIAPI\r
 HttpBootDhcp6CallBack (\r
-  IN  EFI_DHCP6_PROTOCOL           *This,\r
-  IN  VOID                         *Context,\r
-  IN  EFI_DHCP6_STATE              CurrentState,\r
-  IN  EFI_DHCP6_EVENT              Dhcp6Event,\r
-  IN  EFI_DHCP6_PACKET             *Packet,\r
-  OUT EFI_DHCP6_PACKET             **NewPacket     OPTIONAL\r
+  IN  EFI_DHCP6_PROTOCOL  *This,\r
+  IN  VOID                *Context,\r
+  IN  EFI_DHCP6_STATE     CurrentState,\r
+  IN  EFI_DHCP6_EVENT     Dhcp6Event,\r
+  IN  EFI_DHCP6_PACKET    *Packet,\r
+  OUT EFI_DHCP6_PACKET    **NewPacket     OPTIONAL\r
   )\r
 {\r
-  HTTP_BOOT_PRIVATE_DATA          *Private;\r
-  EFI_DHCP6_PACKET                *SelectAd;\r
-  EFI_STATUS                      Status;\r
-  BOOLEAN                         Received;\r
+  HTTP_BOOT_PRIVATE_DATA  *Private;\r
+  EFI_DHCP6_PACKET        *SelectAd;\r
+  EFI_STATUS              Status;\r
+  BOOLEAN                 Received;\r
 \r
   if ((Dhcp6Event != Dhcp6SendSolicit) &&\r
-    (Dhcp6Event != Dhcp6RcvdAdvertise) &&\r
-    (Dhcp6Event != Dhcp6SendRequest) &&\r
-    (Dhcp6Event != Dhcp6RcvdReply) &&\r
-    (Dhcp6Event != Dhcp6SelectAdvertise)) {\r
+      (Dhcp6Event != Dhcp6RcvdAdvertise) &&\r
+      (Dhcp6Event != Dhcp6SendRequest) &&\r
+      (Dhcp6Event != Dhcp6RcvdReply) &&\r
+      (Dhcp6Event != Dhcp6SelectAdvertise))\r
+  {\r
     return EFI_SUCCESS;\r
   }\r
 \r
   ASSERT (Packet != NULL);\r
 \r
-  Private     = (HTTP_BOOT_PRIVATE_DATA *) Context;\r
-  Status = EFI_SUCCESS;\r
-  if (Private->HttpBootCallback != NULL && Dhcp6Event != Dhcp6SelectAdvertise) {\r
-    Received = (BOOLEAN) (Dhcp6Event == Dhcp6RcvdAdvertise || Dhcp6Event == Dhcp6RcvdReply);\r
-    Status = Private->HttpBootCallback->Callback (\r
-               Private->HttpBootCallback,\r
-               HttpBootDhcp6,\r
-               Received,\r
-               Packet->Length,\r
-               &Packet->Dhcp6\r
-               );\r
+  Private = (HTTP_BOOT_PRIVATE_DATA *)Context;\r
+  Status  = EFI_SUCCESS;\r
+  if ((Private->HttpBootCallback != NULL) && (Dhcp6Event != Dhcp6SelectAdvertise)) {\r
+    Received = (BOOLEAN)(Dhcp6Event == Dhcp6RcvdAdvertise || Dhcp6Event == Dhcp6RcvdReply);\r
+    Status   = Private->HttpBootCallback->Callback (\r
+                                            Private->HttpBootCallback,\r
+                                            HttpBootDhcp6,\r
+                                            Received,\r
+                                            Packet->Length,\r
+                                            &Packet->Dhcp6\r
+                                            );\r
     if (EFI_ERROR (Status)) {\r
       return EFI_ABORTED;\r
     }\r
   }\r
+\r
   switch (Dhcp6Event) {\r
+    case Dhcp6RcvdAdvertise:\r
+      Status = EFI_NOT_READY;\r
+      if (Packet->Length > HTTP_BOOT_DHCP6_PACKET_MAX_SIZE) {\r
+        //\r
+        // Ignore the incoming packets which exceed the maximum length.\r
+        //\r
+        break;\r
+      }\r
+\r
+      if (Private->OfferNum < HTTP_BOOT_OFFER_MAX_NUM) {\r
+        //\r
+        // Cache the dhcp offers to OfferBuffer[] for select later, and record\r
+        // the OfferIndex and OfferCount.\r
+        // If error happens, just ignore this packet and continue to wait more offer.\r
+        //\r
+        HttpBootCacheDhcp6Offer (Private, Packet);\r
+      }\r
 \r
-  case Dhcp6RcvdAdvertise:\r
-    Status = EFI_NOT_READY;\r
-    if (Packet->Length > HTTP_BOOT_DHCP6_PACKET_MAX_SIZE) {\r
-      //\r
-      // Ignore the incoming packets which exceed the maximum length.\r
-      //\r
       break;\r
-    }\r
-    if (Private->OfferNum < HTTP_BOOT_OFFER_MAX_NUM) {\r
+\r
+    case Dhcp6SelectAdvertise:\r
       //\r
-      // Cache the dhcp offers to OfferBuffer[] for select later, and record\r
-      // the OfferIndex and OfferCount.\r
-      // If error happens, just ignore this packet and continue to wait more offer.\r
+      // Select offer by the default policy or by order, and record the SelectIndex\r
+      // and SelectProxyType.\r
       //\r
-      HttpBootCacheDhcp6Offer (Private, Packet);\r
-    }\r
-    break;\r
-\r
-  case Dhcp6SelectAdvertise:\r
-    //\r
-    // Select offer by the default policy or by order, and record the SelectIndex\r
-    // and SelectProxyType.\r
-    //\r
-    HttpBootSelectDhcpOffer (Private);\r
+      HttpBootSelectDhcpOffer (Private);\r
 \r
-    if (Private->SelectIndex == 0) {\r
-      Status = EFI_ABORTED;\r
-    } else {\r
-      ASSERT (NewPacket != NULL);\r
-      SelectAd   = &Private->OfferBuffer[Private->SelectIndex - 1].Dhcp6.Packet.Offer;\r
-      *NewPacket = AllocateZeroPool (SelectAd->Size);\r
-      if (*NewPacket == NULL) {\r
-        return EFI_OUT_OF_RESOURCES;\r
+      if (Private->SelectIndex == 0) {\r
+        Status = EFI_ABORTED;\r
+      } else {\r
+        ASSERT (NewPacket != NULL);\r
+        SelectAd   = &Private->OfferBuffer[Private->SelectIndex - 1].Dhcp6.Packet.Offer;\r
+        *NewPacket = AllocateZeroPool (SelectAd->Size);\r
+        if (*NewPacket == NULL) {\r
+          return EFI_OUT_OF_RESOURCES;\r
+        }\r
+\r
+        CopyMem (*NewPacket, SelectAd, SelectAd->Size);\r
       }\r
-      CopyMem (*NewPacket, SelectAd, SelectAd->Size);\r
-    }\r
-    break;\r
 \r
-  default:\r
-    break;\r
+      break;\r
+\r
+    default:\r
+      break;\r
   }\r
 \r
   return Status;\r
@@ -519,18 +521,18 @@ HttpBootDhcp6CallBack (
 **/\r
 EFI_STATUS\r
 HttpBootCheckRouteTable (\r
-  IN  HTTP_BOOT_PRIVATE_DATA        *Private,\r
-  IN  UINTN                         TimeOutInSecond,\r
-  OUT EFI_IPv6_ADDRESS              *GatewayAddr\r
+  IN  HTTP_BOOT_PRIVATE_DATA  *Private,\r
+  IN  UINTN                   TimeOutInSecond,\r
+  OUT EFI_IPv6_ADDRESS        *GatewayAddr\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  EFI_IP6_PROTOCOL                 *Ip6;\r
-  EFI_IP6_MODE_DATA                Ip6ModeData;\r
-  UINTN                            Index;\r
-  EFI_EVENT                        TimeOutEvt;\r
-  UINTN                            RetryCount;\r
-  BOOLEAN                          GatewayIsFound;\r
+  EFI_STATUS         Status;\r
+  EFI_IP6_PROTOCOL   *Ip6;\r
+  EFI_IP6_MODE_DATA  Ip6ModeData;\r
+  UINTN              Index;\r
+  EFI_EVENT          TimeOutEvt;\r
+  UINTN              RetryCount;\r
+  BOOLEAN            GatewayIsFound;\r
 \r
   ASSERT (GatewayAddr != NULL);\r
   ASSERT (Private != NULL);\r
@@ -562,23 +564,28 @@ HttpBootCheckRouteTable (
     if (Ip6ModeData.AddressList != NULL) {\r
       FreePool (Ip6ModeData.AddressList);\r
     }\r
+\r
     if (Ip6ModeData.GroupTable != NULL) {\r
       FreePool (Ip6ModeData.GroupTable);\r
     }\r
+\r
     if (Ip6ModeData.RouteTable != NULL) {\r
       FreePool (Ip6ModeData.RouteTable);\r
     }\r
+\r
     if (Ip6ModeData.NeighborCache != NULL) {\r
       FreePool (Ip6ModeData.NeighborCache);\r
     }\r
+\r
     if (Ip6ModeData.PrefixTable != NULL) {\r
       FreePool (Ip6ModeData.PrefixTable);\r
     }\r
+\r
     if (Ip6ModeData.IcmpTypeList != NULL) {\r
       FreePool (Ip6ModeData.IcmpTypeList);\r
     }\r
 \r
-    if (GatewayIsFound || RetryCount == TimeOutInSecond) {\r
+    if (GatewayIsFound || (RetryCount == TimeOutInSecond)) {\r
       break;\r
     }\r
 \r
@@ -604,6 +611,7 @@ HttpBootCheckRouteTable (
     if (EFI_ERROR (Status)) {\r
       goto ON_EXIT;\r
     }\r
+\r
     while (EFI_ERROR (gBS->CheckEvent (TimeOutEvt))) {\r
       Ip6->Poll (Ip6);\r
     }\r
@@ -634,16 +642,16 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 HttpBootSetIp6Policy (\r
-  IN HTTP_BOOT_PRIVATE_DATA        *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_IP6_CONFIG_POLICY            Policy;\r
-  EFI_IP6_CONFIG_PROTOCOL          *Ip6Config;\r
-  EFI_STATUS                       Status;\r
-  UINTN                            DataSize;\r
+  EFI_IP6_CONFIG_POLICY    Policy;\r
+  EFI_IP6_CONFIG_PROTOCOL  *Ip6Config;\r
+  EFI_STATUS               Status;\r
+  UINTN                    DataSize;\r
 \r
-  Ip6Config       = Private->Ip6Config;\r
-  DataSize        = sizeof (EFI_IP6_CONFIG_POLICY);\r
+  Ip6Config = Private->Ip6Config;\r
+  DataSize  = sizeof (EFI_IP6_CONFIG_POLICY);\r
 \r
   //\r
   // Get and store the current policy of IP6 driver.\r
@@ -663,13 +671,14 @@ HttpBootSetIp6Policy (
     Status = Ip6Config->SetData (\r
                           Ip6Config,\r
                           Ip6ConfigDataTypePolicy,\r
-                          sizeof(EFI_IP6_CONFIG_POLICY),\r
+                          sizeof (EFI_IP6_CONFIG_POLICY),\r
                           &Policy\r
                           );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -687,12 +696,12 @@ HttpBootSetIp6Policy (
 **/\r
 EFI_STATUS\r
 HttpBootSetIp6Dns (\r
-  IN HTTP_BOOT_PRIVATE_DATA         *Private,\r
-  IN UINTN                          DataLength,\r
-  IN VOID                           *DnsServerData\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private,\r
+  IN UINTN                   DataLength,\r
+  IN VOID                    *DnsServerData\r
   )\r
 {\r
-  EFI_IP6_CONFIG_PROTOCOL        *Ip6Config;\r
+  EFI_IP6_CONFIG_PROTOCOL  *Ip6Config;\r
 \r
   ASSERT (Private->UsingIpv6);\r
 \r
@@ -717,11 +726,11 @@ HttpBootSetIp6Dns (
 **/\r
 EFI_STATUS\r
 HttpBootSetIp6Gateway (\r
-  IN HTTP_BOOT_PRIVATE_DATA         *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_IP6_CONFIG_PROTOCOL           *Ip6Config;\r
-  EFI_STATUS                        Status;\r
+  EFI_IP6_CONFIG_PROTOCOL  *Ip6Config;\r
+  EFI_STATUS               Status;\r
 \r
   ASSERT (Private->UsingIpv6);\r
   Ip6Config = Private->Ip6Config;\r
@@ -736,7 +745,7 @@ HttpBootSetIp6Gateway (
                           sizeof (EFI_IPv6_ADDRESS),\r
                           &Private->GatewayIp.v6\r
                           );\r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
   }\r
@@ -755,21 +764,21 @@ HttpBootSetIp6Gateway (
 **/\r
 EFI_STATUS\r
 HttpBootSetIp6Address (\r
-  IN HTTP_BOOT_PRIVATE_DATA         *Private\r
-)\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
+  )\r
 {\r
-  EFI_STATUS                         Status;\r
-  EFI_IP6_PROTOCOL                   *Ip6;\r
-  EFI_IP6_CONFIG_PROTOCOL            *Ip6Cfg;\r
-  EFI_IP6_CONFIG_POLICY              Policy;\r
-  EFI_IP6_CONFIG_MANUAL_ADDRESS      CfgAddr;\r
-  EFI_IPv6_ADDRESS                   *Ip6Addr;\r
-  EFI_IPv6_ADDRESS                   GatewayAddr;\r
-  EFI_IP6_CONFIG_DATA                Ip6CfgData;\r
-  EFI_EVENT                          MappedEvt;\r
-  UINTN                              DataSize;\r
-  BOOLEAN                            IsAddressOk;\r
-  UINTN                              Index;\r
+  EFI_STATUS                     Status;\r
+  EFI_IP6_PROTOCOL               *Ip6;\r
+  EFI_IP6_CONFIG_PROTOCOL        *Ip6Cfg;\r
+  EFI_IP6_CONFIG_POLICY          Policy;\r
+  EFI_IP6_CONFIG_MANUAL_ADDRESS  CfgAddr;\r
+  EFI_IPv6_ADDRESS               *Ip6Addr;\r
+  EFI_IPv6_ADDRESS               GatewayAddr;\r
+  EFI_IP6_CONFIG_DATA            Ip6CfgData;\r
+  EFI_EVENT                      MappedEvt;\r
+  UINTN                          DataSize;\r
+  BOOLEAN                        IsAddressOk;\r
+  UINTN                          Index;\r
 \r
   ASSERT (Private->UsingIpv6);\r
 \r
@@ -783,11 +792,11 @@ HttpBootSetIp6Address (
   CopyMem (&CfgAddr, &Private->StationIp.v6, sizeof (EFI_IPv6_ADDRESS));\r
   ZeroMem (&Ip6CfgData, sizeof (EFI_IP6_CONFIG_DATA));\r
 \r
-  Ip6CfgData.AcceptIcmpErrors    = TRUE;\r
-  Ip6CfgData.DefaultProtocol     = IP6_ICMP;\r
-  Ip6CfgData.HopLimit            = HTTP_BOOT_DEFAULT_HOPLIMIT;\r
-  Ip6CfgData.ReceiveTimeout      = HTTP_BOOT_DEFAULT_LIFETIME;\r
-  Ip6CfgData.TransmitTimeout     = HTTP_BOOT_DEFAULT_LIFETIME;\r
+  Ip6CfgData.AcceptIcmpErrors = TRUE;\r
+  Ip6CfgData.DefaultProtocol  = IP6_ICMP;\r
+  Ip6CfgData.HopLimit         = HTTP_BOOT_DEFAULT_HOPLIMIT;\r
+  Ip6CfgData.ReceiveTimeout   = HTTP_BOOT_DEFAULT_LIFETIME;\r
+  Ip6CfgData.TransmitTimeout  = HTTP_BOOT_DEFAULT_LIFETIME;\r
 \r
   Status = Ip6->Configure (Ip6, &Ip6CfgData);\r
   if (EFI_ERROR (Status)) {\r
@@ -811,7 +820,7 @@ HttpBootSetIp6Address (
   Status = Ip6Cfg->SetData (\r
                      Ip6Cfg,\r
                      Ip6ConfigDataTypePolicy,\r
-                     sizeof(EFI_IP6_CONFIG_POLICY),\r
+                     sizeof (EFI_IP6_CONFIG_POLICY),\r
                      &Policy\r
                      );\r
   if (EFI_ERROR (Status)) {\r
@@ -840,7 +849,7 @@ HttpBootSetIp6Address (
                      Ip6ConfigDataTypeManualAddress,\r
                      MappedEvt\r
                      );\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
 \r
@@ -850,7 +859,7 @@ HttpBootSetIp6Address (
                      sizeof (EFI_IP6_CONFIG_MANUAL_ADDRESS),\r
                      &CfgAddr\r
                      );\r
-  if (EFI_ERROR (Status) && Status != EFI_NOT_READY) {\r
+  if (EFI_ERROR (Status) && (Status != EFI_NOT_READY)) {\r
     goto ON_EXIT;\r
   } else if (Status == EFI_NOT_READY) {\r
     //\r
@@ -859,17 +868,18 @@ HttpBootSetIp6Address (
     while (!IsAddressOk) {\r
       Ip6->Poll (Ip6);\r
     }\r
+\r
     //\r
     // Check whether the Ip6 Address setting is successed.\r
     //\r
     DataSize = 0;\r
-    Status = Ip6Cfg->GetData (\r
-                       Ip6Cfg,\r
-                       Ip6ConfigDataTypeManualAddress,\r
-                       &DataSize,\r
-                       NULL\r
-                       );\r
-    if (Status != EFI_BUFFER_TOO_SMALL || DataSize == 0) {\r
+    Status   = Ip6Cfg->GetData (\r
+                         Ip6Cfg,\r
+                         Ip6ConfigDataTypeManualAddress,\r
+                         &DataSize,\r
+                         NULL\r
+                         );\r
+    if ((Status != EFI_BUFFER_TOO_SMALL) || (DataSize == 0)) {\r
       Status = EFI_DEVICE_ERROR;\r
       goto ON_EXIT;\r
     }\r
@@ -878,22 +888,24 @@ HttpBootSetIp6Address (
     if (Ip6Addr == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     Status = Ip6Cfg->GetData (\r
                        Ip6Cfg,\r
                        Ip6ConfigDataTypeManualAddress,\r
                        &DataSize,\r
-                       (VOID *) Ip6Addr\r
+                       (VOID *)Ip6Addr\r
                        );\r
     if (EFI_ERROR (Status)) {\r
       Status = EFI_DEVICE_ERROR;\r
       goto ON_EXIT;\r
     }\r
 \r
-    for (Index = 0; Index < DataSize / sizeof (EFI_IPv6_ADDRESS); Index ++) {\r
+    for (Index = 0; Index < DataSize / sizeof (EFI_IPv6_ADDRESS); Index++) {\r
       if (CompareMem (Ip6Addr + Index, &CfgAddr, sizeof (EFI_IPv6_ADDRESS)) == 0) {\r
         break;\r
       }\r
     }\r
+\r
     if (Index == DataSize / sizeof (EFI_IPv6_ADDRESS)) {\r
       Status = EFI_ABORTED;\r
       goto ON_EXIT;\r
@@ -928,17 +940,17 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 HttpBootDhcp6Sarr (\r
-  IN HTTP_BOOT_PRIVATE_DATA         *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_DHCP6_PROTOCOL               *Dhcp6;\r
-  EFI_DHCP6_CONFIG_DATA            Config;\r
-  EFI_DHCP6_MODE_DATA              Mode;\r
-  EFI_DHCP6_RETRANSMISSION         *Retransmit;\r
-  EFI_DHCP6_PACKET_OPTION          *OptList[HTTP_BOOT_DHCP6_OPTION_MAX_NUM];\r
-  UINT32                           OptCount;\r
-  UINT8                            Buffer[HTTP_BOOT_DHCP6_OPTION_MAX_SIZE];\r
-  EFI_STATUS                       Status;\r
+  EFI_DHCP6_PROTOCOL        *Dhcp6;\r
+  EFI_DHCP6_CONFIG_DATA     Config;\r
+  EFI_DHCP6_MODE_DATA       Mode;\r
+  EFI_DHCP6_RETRANSMISSION  *Retransmit;\r
+  EFI_DHCP6_PACKET_OPTION   *OptList[HTTP_BOOT_DHCP6_OPTION_MAX_NUM];\r
+  UINT32                    OptCount;\r
+  UINT8                     Buffer[HTTP_BOOT_DHCP6_OPTION_MAX_SIZE];\r
+  EFI_STATUS                Status;\r
 \r
   Dhcp6 = Private->Dhcp6;\r
   ASSERT (Dhcp6 != NULL);\r
@@ -947,7 +959,7 @@ HttpBootDhcp6Sarr (
   // Build options list for the request packet.\r
   //\r
   OptCount = HttpBootBuildDhcp6Options (Private, OptList, Buffer);\r
-  ASSERT (OptCount >0);\r
+  ASSERT (OptCount > 0);\r
 \r
   Retransmit = AllocateZeroPool (sizeof (EFI_DHCP6_RETRANSMISSION));\r
   if (Retransmit == NULL) {\r
@@ -980,11 +992,12 @@ HttpBootDhcp6Sarr (
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
+\r
   //\r
   // Initialize the record fields for DHCPv6 offer in private data.\r
   //\r
-  Private->OfferNum      = 0;\r
-  Private->SelectIndex   = 0;\r
+  Private->OfferNum    = 0;\r
+  Private->SelectIndex = 0;\r
   ZeroMem (Private->OfferCount, sizeof (Private->OfferCount));\r
   ZeroMem (Private->OfferIndex, sizeof (Private->OfferIndex));\r
 \r
@@ -1021,12 +1034,11 @@ ON_EXIT:
     if (Mode.ClientId != NULL) {\r
       FreePool (Mode.ClientId);\r
     }\r
+\r
     if (Mode.Ia != NULL) {\r
       FreePool (Mode.Ia);\r
     }\r
   }\r
 \r
   return Status;\r
-\r
 }\r
-\r
index e1a6520319763b45f163747e68d55cd639683815..4da32aadaad78ec51efdf8c0314af2facf67371e 100644 (file)
@@ -6,82 +6,81 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #ifndef __EFI_HTTP_BOOT_DHCP6_H__\r
 #define __EFI_HTTP_BOOT_DHCP6_H__\r
 \r
-#define HTTP_BOOT_OFFER_MAX_NUM                16\r
-#define HTTP_BOOT_DHCP6_OPTION_MAX_NUM         16\r
-#define HTTP_BOOT_DHCP6_OPTION_MAX_SIZE        312\r
-#define HTTP_BOOT_DHCP6_PACKET_MAX_SIZE        1472\r
-#define HTTP_BOOT_IP6_ROUTE_TABLE_TIMEOUT      10\r
-#define HTTP_BOOT_DEFAULT_HOPLIMIT             64\r
-#define HTTP_BOOT_DEFAULT_LIFETIME             50000\r
+#define HTTP_BOOT_OFFER_MAX_NUM            16\r
+#define HTTP_BOOT_DHCP6_OPTION_MAX_NUM     16\r
+#define HTTP_BOOT_DHCP6_OPTION_MAX_SIZE    312\r
+#define HTTP_BOOT_DHCP6_PACKET_MAX_SIZE    1472\r
+#define HTTP_BOOT_IP6_ROUTE_TABLE_TIMEOUT  10\r
+#define HTTP_BOOT_DEFAULT_HOPLIMIT         64\r
+#define HTTP_BOOT_DEFAULT_LIFETIME         50000\r
 \r
-#define HTTP_BOOT_DHCP6_ENTERPRISE_NUM        343   // TODO: IANA TBD: temporarily using Intel's\r
-#define HTTP_BOOT_DHCP6_MAX_BOOT_FILE_SIZE    65535 //   It's a limitation of bit length, 65535*512 bytes.\r
+#define HTTP_BOOT_DHCP6_ENTERPRISE_NUM      343     // TODO: IANA TBD: temporarily using Intel's\r
+#define HTTP_BOOT_DHCP6_MAX_BOOT_FILE_SIZE  65535   //   It's a limitation of bit length, 65535*512 bytes.\r
 \r
-#define HTTP_BOOT_DHCP6_IDX_IA_NA             0\r
-#define HTTP_BOOT_DHCP6_IDX_BOOT_FILE_URL     1\r
-#define HTTP_BOOT_DHCP6_IDX_BOOT_FILE_PARAM   2\r
-#define HTTP_BOOT_DHCP6_IDX_VENDOR_CLASS      3\r
-#define HTTP_BOOT_DHCP6_IDX_DNS_SERVER        4\r
-#define HTTP_BOOT_DHCP6_IDX_MAX               5\r
+#define HTTP_BOOT_DHCP6_IDX_IA_NA            0\r
+#define HTTP_BOOT_DHCP6_IDX_BOOT_FILE_URL    1\r
+#define HTTP_BOOT_DHCP6_IDX_BOOT_FILE_PARAM  2\r
+#define HTTP_BOOT_DHCP6_IDX_VENDOR_CLASS     3\r
+#define HTTP_BOOT_DHCP6_IDX_DNS_SERVER       4\r
+#define HTTP_BOOT_DHCP6_IDX_MAX              5\r
 \r
 #pragma pack(1)\r
 typedef struct {\r
-  UINT16 OpCode[256];\r
+  UINT16    OpCode[256];\r
 } HTTP_BOOT_DHCP6_OPTION_ORO;\r
 \r
 typedef struct {\r
-  UINT8 Type;\r
-  UINT8 MajorVer;\r
-  UINT8 MinorVer;\r
+  UINT8    Type;\r
+  UINT8    MajorVer;\r
+  UINT8    MinorVer;\r
 } HTTP_BOOT_DHCP6_OPTION_UNDI;\r
 \r
 typedef struct {\r
-  UINT16 Type;\r
+  UINT16    Type;\r
 } HTTP_BOOT_DHCP6_OPTION_ARCH;\r
 \r
 typedef struct {\r
-  UINT8 ClassIdentifier[11];\r
-  UINT8 ArchitecturePrefix[5];\r
-  UINT8 ArchitectureType[5];\r
-  UINT8 Lit3[1];\r
-  UINT8 InterfaceName[4];\r
-  UINT8 Lit4[1];\r
-  UINT8 UndiMajor[3];\r
-  UINT8 UndiMinor[3];\r
+  UINT8    ClassIdentifier[11];\r
+  UINT8    ArchitecturePrefix[5];\r
+  UINT8    ArchitectureType[5];\r
+  UINT8    Lit3[1];\r
+  UINT8    InterfaceName[4];\r
+  UINT8    Lit4[1];\r
+  UINT8    UndiMajor[3];\r
+  UINT8    UndiMinor[3];\r
 } HTTP_BOOT_CLASS_ID;\r
 \r
 typedef struct {\r
-  UINT32             Vendor;\r
-  UINT16             ClassLen;\r
-  HTTP_BOOT_CLASS_ID ClassId;\r
+  UINT32                Vendor;\r
+  UINT16                ClassLen;\r
+  HTTP_BOOT_CLASS_ID    ClassId;\r
 } HTTP_BOOT_DHCP6_OPTION_VENDOR_CLASS;\r
 \r
 #pragma pack()\r
 \r
 typedef union {\r
-  HTTP_BOOT_DHCP6_OPTION_ORO            *Oro;\r
-  HTTP_BOOT_DHCP6_OPTION_UNDI           *Undi;\r
-  HTTP_BOOT_DHCP6_OPTION_ARCH           *Arch;\r
-  HTTP_BOOT_DHCP6_OPTION_VENDOR_CLASS   *VendorClass;\r
+  HTTP_BOOT_DHCP6_OPTION_ORO             *Oro;\r
+  HTTP_BOOT_DHCP6_OPTION_UNDI            *Undi;\r
+  HTTP_BOOT_DHCP6_OPTION_ARCH            *Arch;\r
+  HTTP_BOOT_DHCP6_OPTION_VENDOR_CLASS    *VendorClass;\r
 } HTTP_BOOT_DHCP6_OPTION_ENTRY;\r
 \r
 #define HTTP_CACHED_DHCP6_PACKET_MAX_SIZE  (OFFSET_OF (EFI_DHCP6_PACKET, Dhcp6) + HTTP_BOOT_DHCP6_PACKET_MAX_SIZE)\r
 \r
 typedef union {\r
-  EFI_DHCP6_PACKET        Offer;\r
-  EFI_DHCP6_PACKET        Ack;\r
-  UINT8                   Buffer[HTTP_CACHED_DHCP6_PACKET_MAX_SIZE];\r
+  EFI_DHCP6_PACKET    Offer;\r
+  EFI_DHCP6_PACKET    Ack;\r
+  UINT8               Buffer[HTTP_CACHED_DHCP6_PACKET_MAX_SIZE];\r
 } HTTP_BOOT_DHCP6_PACKET;\r
 \r
 typedef struct {\r
-  HTTP_BOOT_DHCP6_PACKET      Packet;\r
-  HTTP_BOOT_OFFER_TYPE        OfferType;\r
-  EFI_DHCP6_PACKET_OPTION     *OptList[HTTP_BOOT_DHCP6_IDX_MAX];\r
-  VOID                        *UriParser;\r
+  HTTP_BOOT_DHCP6_PACKET     Packet;\r
+  HTTP_BOOT_OFFER_TYPE       OfferType;\r
+  EFI_DHCP6_PACKET_OPTION    *OptList[HTTP_BOOT_DHCP6_IDX_MAX];\r
+  VOID                       *UriParser;\r
 } HTTP_BOOT_DHCP6_PACKET_CACHE;\r
 \r
 #define GET_NEXT_DHCP6_OPTION(Opt) \\r
@@ -102,7 +101,7 @@ typedef struct {
 **/\r
 EFI_STATUS\r
 HttpBootDhcp6Sarr (\r
-  IN HTTP_BOOT_PRIVATE_DATA         *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   );\r
 \r
 /**\r
@@ -116,7 +115,7 @@ HttpBootDhcp6Sarr (
 **/\r
 EFI_STATUS\r
 HttpBootSetIp6Policy (\r
-  IN HTTP_BOOT_PRIVATE_DATA        *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   );\r
 \r
 /**\r
@@ -133,9 +132,9 @@ HttpBootSetIp6Policy (
 **/\r
 EFI_STATUS\r
 HttpBootSetIp6Dns (\r
-  IN HTTP_BOOT_PRIVATE_DATA         *Private,\r
-  IN UINTN                          DataLength,\r
-  IN VOID                           *DnsServerData\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private,\r
+  IN UINTN                   DataLength,\r
+  IN VOID                    *DnsServerData\r
   );\r
 \r
 /**\r
@@ -149,7 +148,7 @@ HttpBootSetIp6Dns (
 **/\r
 EFI_STATUS\r
 HttpBootSetIp6Gateway (\r
-  IN HTTP_BOOT_PRIVATE_DATA         *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   );\r
 \r
 /**\r
@@ -163,7 +162,7 @@ HttpBootSetIp6Gateway (
 **/\r
 EFI_STATUS\r
 HttpBootSetIp6Address (\r
-  IN HTTP_BOOT_PRIVATE_DATA         *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   );\r
 \r
 #endif\r
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
index d692c3ad3cd494578256f5887a48bb864ac7469b..5acbae9bfa7684902aec803150f4f387fffd43a0 100644 (file)
@@ -75,22 +75,22 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // Standard Media Types defined in\r
 // http://www.iana.org/assignments/media-types\r
 //\r
-#define HTTP_CONTENT_TYPE_APP_EFI           "application/efi"\r
-#define HTTP_CONTENT_TYPE_APP_IMG           "application/vnd.efi-img"\r
-#define HTTP_CONTENT_TYPE_APP_ISO           "application/vnd.efi-iso"\r
+#define HTTP_CONTENT_TYPE_APP_EFI  "application/efi"\r
+#define HTTP_CONTENT_TYPE_APP_IMG  "application/vnd.efi-img"\r
+#define HTTP_CONTENT_TYPE_APP_ISO  "application/vnd.efi-iso"\r
 \r
 //\r
 // Protocol instances\r
 //\r
-extern EFI_DRIVER_BINDING_PROTOCOL  gHttpBootDxeDriverBinding;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL gHttpBootDxeComponentName2;\r
-extern EFI_COMPONENT_NAME_PROTOCOL  gHttpBootDxeComponentName;\r
+extern EFI_DRIVER_BINDING_PROTOCOL   gHttpBootDxeDriverBinding;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gHttpBootDxeComponentName2;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gHttpBootDxeComponentName;\r
 \r
 //\r
 // Private data structure\r
 //\r
-typedef struct _HTTP_BOOT_PRIVATE_DATA      HTTP_BOOT_PRIVATE_DATA;\r
-typedef struct _HTTP_BOOT_VIRTUAL_NIC       HTTP_BOOT_VIRTUAL_NIC;\r
+typedef struct _HTTP_BOOT_PRIVATE_DATA  HTTP_BOOT_PRIVATE_DATA;\r
+typedef struct _HTTP_BOOT_VIRTUAL_NIC   HTTP_BOOT_VIRTUAL_NIC;\r
 \r
 typedef enum  {\r
   ImageTypeEfi,\r
@@ -111,17 +111,17 @@ typedef enum  {
 #include "HttpBootConfig.h"\r
 \r
 typedef union {\r
-  HTTP_BOOT_DHCP4_PACKET_CACHE              Dhcp4;\r
-  HTTP_BOOT_DHCP6_PACKET_CACHE              Dhcp6;\r
+  HTTP_BOOT_DHCP4_PACKET_CACHE    Dhcp4;\r
+  HTTP_BOOT_DHCP6_PACKET_CACHE    Dhcp6;\r
 } HTTP_BOOT_DHCP_PACKET_CACHE;\r
 \r
 struct _HTTP_BOOT_VIRTUAL_NIC {\r
-  UINT32                                    Signature;\r
-  EFI_HANDLE                                Controller;\r
-  EFI_HANDLE                                ImageHandle;\r
-  EFI_LOAD_FILE_PROTOCOL                    LoadFile;\r
-  EFI_DEVICE_PATH_PROTOCOL                  *DevicePath;\r
-  HTTP_BOOT_PRIVATE_DATA                    *Private;\r
+  UINT32                      Signature;\r
+  EFI_HANDLE                  Controller;\r
+  EFI_HANDLE                  ImageHandle;\r
+  EFI_LOAD_FILE_PROTOCOL      LoadFile;\r
+  EFI_DEVICE_PATH_PROTOCOL    *DevicePath;\r
+  HTTP_BOOT_PRIVATE_DATA      *Private;\r
 };\r
 \r
 #define HTTP_BOOT_PRIVATE_DATA_FROM_CALLBACK_INFO(Callback) \\r
@@ -141,87 +141,86 @@ struct _HTTP_BOOT_VIRTUAL_NIC {
     )\r
 \r
 struct _HTTP_BOOT_PRIVATE_DATA {\r
-  UINT32                                    Signature;\r
-  EFI_HANDLE                                Controller;\r
+  UINT32                                       Signature;\r
+  EFI_HANDLE                                   Controller;\r
 \r
-  HTTP_BOOT_VIRTUAL_NIC                     *Ip4Nic;\r
-  HTTP_BOOT_VIRTUAL_NIC                     *Ip6Nic;\r
+  HTTP_BOOT_VIRTUAL_NIC                        *Ip4Nic;\r
+  HTTP_BOOT_VIRTUAL_NIC                        *Ip6Nic;\r
 \r
   //\r
   // Consumed children\r
   //\r
-  EFI_HANDLE                                Ip6Child;\r
-  EFI_HANDLE                                Dhcp4Child;\r
-  EFI_HANDLE                                Dhcp6Child;\r
-  HTTP_IO                                   HttpIo;\r
-  BOOLEAN                                   HttpCreated;\r
+  EFI_HANDLE                                   Ip6Child;\r
+  EFI_HANDLE                                   Dhcp4Child;\r
+  EFI_HANDLE                                   Dhcp6Child;\r
+  HTTP_IO                                      HttpIo;\r
+  BOOLEAN                                      HttpCreated;\r
 \r
   //\r
   // Consumed protocol\r
   //\r
-  EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL *Nii;\r
-  EFI_IP6_PROTOCOL                          *Ip6;\r
-  EFI_IP4_CONFIG2_PROTOCOL                  *Ip4Config2;\r
-  EFI_IP6_CONFIG_PROTOCOL                   *Ip6Config;\r
-  EFI_DHCP4_PROTOCOL                        *Dhcp4;\r
-  EFI_DHCP6_PROTOCOL                        *Dhcp6;\r
-  EFI_DEVICE_PATH_PROTOCOL                  *ParentDevicePath;\r
-\r
+  EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL    *Nii;\r
+  EFI_IP6_PROTOCOL                             *Ip6;\r
+  EFI_IP4_CONFIG2_PROTOCOL                     *Ip4Config2;\r
+  EFI_IP6_CONFIG_PROTOCOL                      *Ip6Config;\r
+  EFI_DHCP4_PROTOCOL                           *Dhcp4;\r
+  EFI_DHCP6_PROTOCOL                           *Dhcp6;\r
+  EFI_DEVICE_PATH_PROTOCOL                     *ParentDevicePath;\r
 \r
   //\r
   // Produced protocol\r
   //\r
-  EFI_LOAD_FILE_PROTOCOL                    LoadFile;\r
-  EFI_DEVICE_PATH_PROTOCOL                  *DevicePath;\r
-  UINT32                                    Id;\r
-  EFI_HTTP_BOOT_CALLBACK_PROTOCOL           *HttpBootCallback;\r
-  EFI_HTTP_BOOT_CALLBACK_PROTOCOL           LoadFileCallback;\r
+  EFI_LOAD_FILE_PROTOCOL                       LoadFile;\r
+  EFI_DEVICE_PATH_PROTOCOL                     *DevicePath;\r
+  UINT32                                       Id;\r
+  EFI_HTTP_BOOT_CALLBACK_PROTOCOL              *HttpBootCallback;\r
+  EFI_HTTP_BOOT_CALLBACK_PROTOCOL              LoadFileCallback;\r
 \r
   //\r
   // Data for the default HTTP Boot callback protocol\r
   //\r
-  UINT64                                    FileSize;\r
-  UINT64                                    ReceivedSize;\r
-  UINT32                                    Percentage;\r
+  UINT64                                       FileSize;\r
+  UINT64                                       ReceivedSize;\r
+  UINT32                                       Percentage;\r
 \r
   //\r
   // HII callback info block\r
   //\r
-  HTTP_BOOT_FORM_CALLBACK_INFO              CallbackInfo;\r
+  HTTP_BOOT_FORM_CALLBACK_INFO                 CallbackInfo;\r
 \r
   //\r
   // Mode data\r
   //\r
-  BOOLEAN                                   UsingIpv6;\r
-  BOOLEAN                                   Started;\r
-  EFI_IP_ADDRESS                            StationIp;\r
-  EFI_IP_ADDRESS                            SubnetMask;\r
-  EFI_IP_ADDRESS                            GatewayIp;\r
-  EFI_IP_ADDRESS                            ServerIp;\r
-  UINT16                                    Port;\r
-  UINT32                                    DnsServerCount;\r
-  EFI_IP_ADDRESS                            *DnsServerIp;\r
+  BOOLEAN                                      UsingIpv6;\r
+  BOOLEAN                                      Started;\r
+  EFI_IP_ADDRESS                               StationIp;\r
+  EFI_IP_ADDRESS                               SubnetMask;\r
+  EFI_IP_ADDRESS                               GatewayIp;\r
+  EFI_IP_ADDRESS                               ServerIp;\r
+  UINT16                                       Port;\r
+  UINT32                                       DnsServerCount;\r
+  EFI_IP_ADDRESS                               *DnsServerIp;\r
 \r
   //\r
   // The URI string attempt to download through HTTP, may point to\r
   // the memory in cached DHCP offer, or to the memory in FilePathUri.\r
   //\r
-  CHAR8                                     *BootFileUri;\r
-  VOID                                      *BootFileUriParser;\r
-  UINTN                                     BootFileSize;\r
-  BOOLEAN                                   NoGateway;\r
-  HTTP_BOOT_IMAGE_TYPE                      ImageType;\r
+  CHAR8                                        *BootFileUri;\r
+  VOID                                         *BootFileUriParser;\r
+  UINTN                                        BootFileSize;\r
+  BOOLEAN                                      NoGateway;\r
+  HTTP_BOOT_IMAGE_TYPE                         ImageType;\r
 \r
   //\r
   // URI string extracted from the input FilePath parameter.\r
   //\r
-  CHAR8                                     *FilePathUri;\r
-  VOID                                      *FilePathUriParser;\r
+  CHAR8                                        *FilePathUri;\r
+  VOID                                         *FilePathUriParser;\r
 \r
   //\r
   // Cached HTTP data\r
   //\r
-  LIST_ENTRY                                CacheList;\r
+  LIST_ENTRY                                   CacheList;\r
 \r
   //\r
   // Cached DHCP offer\r
@@ -252,20 +251,20 @@ struct _HTTP_BOOT_PRIVATE_DATA {
   //   (OfferIndex is 0-based.)\r
   //\r
   //\r
-  UINT32                                    SelectIndex;\r
-  UINT32                                    SelectProxyType;\r
-  HTTP_BOOT_DHCP_PACKET_CACHE               OfferBuffer[HTTP_BOOT_OFFER_MAX_NUM];\r
-  UINT32                                    OfferNum;\r
-  UINT32                                    OfferCount[HttpOfferTypeMax];\r
-  UINT32                                    OfferIndex[HttpOfferTypeMax][HTTP_BOOT_OFFER_MAX_NUM];\r
+  UINT32                         SelectIndex;\r
+  UINT32                         SelectProxyType;\r
+  HTTP_BOOT_DHCP_PACKET_CACHE    OfferBuffer[HTTP_BOOT_OFFER_MAX_NUM];\r
+  UINT32                         OfferNum;\r
+  UINT32                         OfferCount[HttpOfferTypeMax];\r
+  UINT32                         OfferIndex[HttpOfferTypeMax][HTTP_BOOT_OFFER_MAX_NUM];\r
 };\r
 \r
-#define HTTP_BOOT_PRIVATE_DATA_SIGNATURE          SIGNATURE_32 ('H', 'B', 'P', 'D')\r
-#define HTTP_BOOT_VIRTUAL_NIC_SIGNATURE           SIGNATURE_32 ('H', 'B', 'V', 'N')\r
-#define HTTP_BOOT_PRIVATE_DATA_FROM_LOADFILE(a)   CR (a, HTTP_BOOT_PRIVATE_DATA, LoadFile, HTTP_BOOT_PRIVATE_DATA_SIGNATURE)\r
-#define HTTP_BOOT_PRIVATE_DATA_FROM_ID(a)         CR (a, HTTP_BOOT_PRIVATE_DATA, Id, HTTP_BOOT_PRIVATE_DATA_SIGNATURE)\r
-#define HTTP_BOOT_VIRTUAL_NIC_FROM_LOADFILE(a)    CR (a, HTTP_BOOT_VIRTUAL_NIC, LoadFile, HTTP_BOOT_VIRTUAL_NIC_SIGNATURE)\r
-extern EFI_LOAD_FILE_PROTOCOL               gHttpBootDxeLoadFile;\r
+#define HTTP_BOOT_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('H', 'B', 'P', 'D')\r
+#define HTTP_BOOT_VIRTUAL_NIC_SIGNATURE   SIGNATURE_32 ('H', 'B', 'V', 'N')\r
+#define HTTP_BOOT_PRIVATE_DATA_FROM_LOADFILE(a)  CR (a, HTTP_BOOT_PRIVATE_DATA, LoadFile, HTTP_BOOT_PRIVATE_DATA_SIGNATURE)\r
+#define HTTP_BOOT_PRIVATE_DATA_FROM_ID(a)        CR (a, HTTP_BOOT_PRIVATE_DATA, Id, HTTP_BOOT_PRIVATE_DATA_SIGNATURE)\r
+#define HTTP_BOOT_VIRTUAL_NIC_FROM_LOADFILE(a)   CR (a, HTTP_BOOT_VIRTUAL_NIC, LoadFile, HTTP_BOOT_VIRTUAL_NIC_SIGNATURE)\r
+extern EFI_LOAD_FILE_PROTOCOL  gHttpBootDxeLoadFile;\r
 \r
 /**\r
   Tests to see if this driver supports a given controller. If a child device is provided,\r
@@ -522,4 +521,5 @@ HttpBootIp6DxeDriverBindingStop (
   IN UINTN                        NumberOfChildren,\r
   IN EFI_HANDLE                   *ChildHandleBuffer OPTIONAL\r
   );\r
+\r
 #endif\r
index 79cc5697cc0e377bdddb4939965080ad0c118bff..3da585a29164c8c05f1c7c904730c63ae571cd4b 100644 (file)
@@ -20,11 +20,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 HttpBootInstallCallback (\r
-  IN HTTP_BOOT_PRIVATE_DATA           *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_HANDLE                  ControllerHandle;\r
+  EFI_STATUS  Status;\r
+  EFI_HANDLE  ControllerHandle;\r
 \r
   if (!Private->UsingIpv6) {\r
     ControllerHandle = Private->Ip4Nic->Controller;\r
@@ -38,10 +38,9 @@ HttpBootInstallCallback (
   Status = gBS->HandleProtocol (\r
                   ControllerHandle,\r
                   &gEfiHttpBootCallbackProtocolGuid,\r
-                  (VOID **) &Private->HttpBootCallback\r
+                  (VOID **)&Private->HttpBootCallback\r
                   );\r
   if (Status == EFI_UNSUPPORTED) {\r
-\r
     CopyMem (\r
       &Private->LoadFileCallback,\r
       &gHttpBootDxeHttpBootCallback,\r
@@ -60,6 +59,7 @@ HttpBootInstallCallback (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     Private->HttpBootCallback = &Private->LoadFileCallback;\r
   }\r
 \r
@@ -74,15 +74,15 @@ HttpBootInstallCallback (
 **/\r
 VOID\r
 HttpBootUninstallCallback (\r
-  IN HTTP_BOOT_PRIVATE_DATA           *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
   if (Private->HttpBootCallback == &Private->LoadFileCallback) {\r
     gBS->UninstallProtocolInterface (\r
-          Private->Controller,\r
-          &gEfiHttpBootCallbackProtocolGuid,\r
-          &Private->HttpBootCallback\r
-          );\r
+           Private->Controller,\r
+           &gEfiHttpBootCallbackProtocolGuid,\r
+           &Private->HttpBootCallback\r
+           );\r
     Private->HttpBootCallback = NULL;\r
   }\r
 }\r
@@ -108,18 +108,18 @@ HttpBootUninstallCallback (
 **/\r
 EFI_STATUS\r
 HttpBootStart (\r
-  IN HTTP_BOOT_PRIVATE_DATA           *Private,\r
-  IN BOOLEAN                          UsingIpv6,\r
-  IN EFI_DEVICE_PATH_PROTOCOL         *FilePath\r
+  IN HTTP_BOOT_PRIVATE_DATA    *Private,\r
+  IN BOOLEAN                   UsingIpv6,\r
+  IN EFI_DEVICE_PATH_PROTOCOL  *FilePath\r
   )\r
 {\r
-  UINTN                Index;\r
-  EFI_STATUS           Status;\r
-  CHAR8                *Uri;\r
+  UINTN       Index;\r
+  EFI_STATUS  Status;\r
+  CHAR8       *Uri;\r
 \r
   Uri = NULL;\r
 \r
-  if (Private == NULL || FilePath == NULL) {\r
+  if ((Private == NULL) || (FilePath == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -143,7 +143,8 @@ HttpBootStart (
     // recorded before.\r
     //\r
     if ((UsingIpv6 != Private->UsingIpv6) ||\r
-        ((Uri != NULL) && (AsciiStrCmp (Private->BootFileUri, Uri) != 0))) {\r
+        ((Uri != NULL) && (AsciiStrCmp (Private->BootFileUri, Uri) != 0)))\r
+    {\r
       //\r
       // Restart is required, first stop then continue this start function.\r
       //\r
@@ -152,6 +153,7 @@ HttpBootStart (
         if (Uri != NULL) {\r
           FreePool (Uri);\r
         }\r
+\r
         return Status;\r
       }\r
     } else {\r
@@ -161,6 +163,7 @@ HttpBootStart (
       if (Uri != NULL) {\r
         FreePool (Uri);\r
       }\r
+\r
       return EFI_ALREADY_STARTED;\r
     }\r
   }\r
@@ -168,14 +171,15 @@ HttpBootStart (
   //\r
   // Detect whether using ipv6 or not, and set it to the private data.\r
   //\r
-  if (UsingIpv6 && Private->Ip6Nic != NULL) {\r
+  if (UsingIpv6 && (Private->Ip6Nic != NULL)) {\r
     Private->UsingIpv6 = TRUE;\r
-  } else if (!UsingIpv6 && Private->Ip4Nic != NULL) {\r
+  } else if (!UsingIpv6 && (Private->Ip4Nic != NULL)) {\r
     Private->UsingIpv6 = FALSE;\r
   } else {\r
     if (Uri != NULL) {\r
       FreePool (Uri);\r
     }\r
+\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -186,7 +190,7 @@ HttpBootStart (
   if (Private->FilePathUri != NULL) {\r
     Status = HttpParseUrl (\r
                Private->FilePathUri,\r
-               (UINT32) AsciiStrLen (Private->FilePathUri),\r
+               (UINT32)AsciiStrLen (Private->FilePathUri),\r
                FALSE,\r
                &Private->FilePathUriParser\r
                );\r
@@ -219,7 +223,8 @@ HttpBootStart (
       return Status;\r
     }\r
   }\r
-  Private->Started   = TRUE;\r
+\r
+  Private->Started = TRUE;\r
   Print (L"\n>>Start HTTP Boot over IPv%d", Private->UsingIpv6 ? 6 : 4);\r
 \r
   return EFI_SUCCESS;\r
@@ -239,10 +244,10 @@ HttpBootStart (
 **/\r
 EFI_STATUS\r
 HttpBootDhcp (\r
-  IN HTTP_BOOT_PRIVATE_DATA           *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (Private == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -260,7 +265,7 @@ HttpBootDhcp (
     //\r
     Status = HttpBootDhcp4Dora (Private);\r
   } else {\r
-     //\r
+    //\r
     // Start S.A.R.R process to get a IPv6 address and other boot information.\r
     //\r
     Status = HttpBootDhcp6Sarr (Private);\r
@@ -294,19 +299,19 @@ HttpBootDhcp (
 **/\r
 EFI_STATUS\r
 HttpBootLoadFile (\r
-  IN     HTTP_BOOT_PRIVATE_DATA       *Private,\r
-  IN OUT UINTN                        *BufferSize,\r
-  IN     VOID                         *Buffer        OPTIONAL,\r
-     OUT HTTP_BOOT_IMAGE_TYPE         *ImageType\r
+  IN     HTTP_BOOT_PRIVATE_DATA  *Private,\r
+  IN OUT UINTN                   *BufferSize,\r
+  IN     VOID                    *Buffer        OPTIONAL,\r
+  OUT HTTP_BOOT_IMAGE_TYPE       *ImageType\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
+  EFI_STATUS  Status;\r
 \r
-  if (Private == NULL || ImageType == NULL || BufferSize == NULL ) {\r
+  if ((Private == NULL) || (ImageType == NULL) || (BufferSize == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (*BufferSize != 0 && Buffer == NULL) {\r
+  if ((*BufferSize != 0) && (Buffer == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -315,7 +320,7 @@ HttpBootLoadFile (
   }\r
 \r
   Status = HttpBootInstallCallback (Private);\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
 \r
@@ -355,7 +360,7 @@ HttpBootLoadFile (
                NULL,\r
                &Private->ImageType\r
                );\r
-    if (EFI_ERROR (Status) && Status != EFI_BUFFER_TOO_SMALL) {\r
+    if (EFI_ERROR (Status) && (Status != EFI_BUFFER_TOO_SMALL)) {\r
       //\r
       // Failed to get file size by HEAD method, may be trunked encoding, try HTTP GET method.\r
       //\r
@@ -367,7 +372,7 @@ HttpBootLoadFile (
                  NULL,\r
                  &Private->ImageType\r
                  );\r
-      if (EFI_ERROR (Status) && Status != EFI_BUFFER_TOO_SMALL) {\r
+      if (EFI_ERROR (Status) && (Status != EFI_BUFFER_TOO_SMALL)) {\r
         AsciiPrint ("\n  Error: Could not retrieve NBP file size from HTTP server.\n");\r
         goto ON_EXIT;\r
       }\r
@@ -376,8 +381,8 @@ HttpBootLoadFile (
 \r
   if (*BufferSize < Private->BootFileSize) {\r
     *BufferSize = Private->BootFileSize;\r
-    *ImageType = Private->ImageType;\r
-    Status = EFI_BUFFER_TOO_SMALL;\r
+    *ImageType  = Private->ImageType;\r
+    Status      = EFI_BUFFER_TOO_SMALL;\r
     goto ON_EXIT;\r
   }\r
 \r
@@ -398,7 +403,7 @@ ON_EXIT:
   if (EFI_ERROR (Status)) {\r
     if (Status == EFI_ACCESS_DENIED) {\r
       AsciiPrint ("\n  Error: Could not establish connection with HTTP server.\n");\r
-    } else if (Status == EFI_BUFFER_TOO_SMALL && Buffer != NULL) {\r
+    } else if ((Status == EFI_BUFFER_TOO_SMALL) && (Buffer != NULL)) {\r
       AsciiPrint ("\n  Error: Buffer size is smaller than the requested file.\n");\r
     } else if (Status == EFI_OUT_OF_RESOURCES) {\r
       AsciiPrint ("\n  Error: Could not allocate I/O buffers.\n");\r
@@ -429,10 +434,10 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 HttpBootStop (\r
-  IN HTTP_BOOT_PRIVATE_DATA           *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  UINTN            Index;\r
+  UINTN  Index;\r
 \r
   if (Private == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -451,12 +456,12 @@ HttpBootStop (
   ZeroMem (&Private->StationIp, sizeof (EFI_IP_ADDRESS));\r
   ZeroMem (&Private->SubnetMask, sizeof (EFI_IP_ADDRESS));\r
   ZeroMem (&Private->GatewayIp, sizeof (EFI_IP_ADDRESS));\r
-  Private->Port = 0;\r
-  Private->BootFileUri = NULL;\r
+  Private->Port              = 0;\r
+  Private->BootFileUri       = NULL;\r
   Private->BootFileUriParser = NULL;\r
-  Private->BootFileSize = 0;\r
-  Private->SelectIndex = 0;\r
-  Private->SelectProxyType = HttpOfferTypeMax;\r
+  Private->BootFileSize      = 0;\r
+  Private->SelectIndex       = 0;\r
+  Private->SelectProxyType   = HttpOfferTypeMax;\r
 \r
   if (!Private->UsingIpv6) {\r
     //\r
@@ -489,10 +494,10 @@ HttpBootStop (
     Private->DnsServerIp = NULL;\r
   }\r
 \r
-  if (Private->FilePathUri!= NULL) {\r
+  if (Private->FilePathUri != NULL) {\r
     FreePool (Private->FilePathUri);\r
     HttpUrlFreeParser (Private->FilePathUriParser);\r
-    Private->FilePathUri = NULL;\r
+    Private->FilePathUri       = NULL;\r
     Private->FilePathUriParser = NULL;\r
   }\r
 \r
@@ -540,21 +545,21 @@ HttpBootStop (
 EFI_STATUS\r
 EFIAPI\r
 HttpBootDxeLoadFile (\r
-  IN EFI_LOAD_FILE_PROTOCOL           *This,\r
-  IN EFI_DEVICE_PATH_PROTOCOL         *FilePath,\r
-  IN BOOLEAN                          BootPolicy,\r
-  IN OUT UINTN                        *BufferSize,\r
-  IN VOID                             *Buffer OPTIONAL\r
+  IN EFI_LOAD_FILE_PROTOCOL    *This,\r
+  IN EFI_DEVICE_PATH_PROTOCOL  *FilePath,\r
+  IN BOOLEAN                   BootPolicy,\r
+  IN OUT UINTN                 *BufferSize,\r
+  IN VOID                      *Buffer OPTIONAL\r
   )\r
 {\r
-  HTTP_BOOT_PRIVATE_DATA        *Private;\r
-  HTTP_BOOT_VIRTUAL_NIC         *VirtualNic;\r
-  EFI_STATUS                    MediaStatus;\r
-  BOOLEAN                       UsingIpv6;\r
-  EFI_STATUS                    Status;\r
-  HTTP_BOOT_IMAGE_TYPE          ImageType;\r
-\r
-  if (This == NULL || BufferSize == NULL || FilePath == NULL) {\r
+  HTTP_BOOT_PRIVATE_DATA  *Private;\r
+  HTTP_BOOT_VIRTUAL_NIC   *VirtualNic;\r
+  EFI_STATUS              MediaStatus;\r
+  BOOLEAN                 UsingIpv6;\r
+  EFI_STATUS              Status;\r
+  HTTP_BOOT_IMAGE_TYPE    ImageType;\r
+\r
+  if ((This == NULL) || (BufferSize == NULL) || (FilePath == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -566,7 +571,7 @@ HttpBootDxeLoadFile (
   }\r
 \r
   VirtualNic = HTTP_BOOT_VIRTUAL_NIC_FROM_LOADFILE (This);\r
-  Private = VirtualNic->Private;\r
+  Private    = VirtualNic->Private;\r
 \r
   //\r
   // Check media status before HTTP boot start\r
@@ -590,7 +595,7 @@ HttpBootDxeLoadFile (
   // Initialize HTTP boot.\r
   //\r
   Status = HttpBootStart (Private, UsingIpv6, FilePath);\r
-  if (Status != EFI_SUCCESS && Status != EFI_ALREADY_STARTED) {\r
+  if ((Status != EFI_SUCCESS) && (Status != EFI_ALREADY_STARTED)) {\r
     return Status;\r
   }\r
 \r
@@ -598,20 +603,21 @@ HttpBootDxeLoadFile (
   // Load the boot file.\r
   //\r
   ImageType = ImageTypeMax;\r
-  Status = HttpBootLoadFile (Private, BufferSize, Buffer, &ImageType);\r
+  Status    = HttpBootLoadFile (Private, BufferSize, Buffer, &ImageType);\r
   if (EFI_ERROR (Status)) {\r
-    if (Status == EFI_BUFFER_TOO_SMALL && (ImageType == ImageTypeVirtualCd || ImageType == ImageTypeVirtualDisk)) {\r
+    if ((Status == EFI_BUFFER_TOO_SMALL) && ((ImageType == ImageTypeVirtualCd) || (ImageType == ImageTypeVirtualDisk))) {\r
       Status = EFI_WARN_FILE_SYSTEM;\r
     } else if (Status != EFI_BUFFER_TOO_SMALL) {\r
       HttpBootStop (Private);\r
     }\r
+\r
     return Status;\r
   }\r
 \r
   //\r
   // Register the RAM Disk to the system if needed.\r
   //\r
-  if (ImageType == ImageTypeVirtualCd || ImageType == ImageTypeVirtualDisk) {\r
+  if ((ImageType == ImageTypeVirtualCd) || (ImageType == ImageTypeVirtualDisk)) {\r
     Status = HttpBootRegisterRamDisk (Private, *BufferSize, Buffer, ImageType);\r
     if (!EFI_ERROR (Status)) {\r
       Status = EFI_WARN_FILE_SYSTEM;\r
@@ -659,11 +665,11 @@ EFI_LOAD_FILE_PROTOCOL  gHttpBootDxeLoadFile = {
 EFI_STATUS\r
 EFIAPI\r
 HttpBootCallback (\r
-  IN EFI_HTTP_BOOT_CALLBACK_PROTOCOL     *This,\r
-  IN EFI_HTTP_BOOT_CALLBACK_DATA_TYPE    DataType,\r
-  IN BOOLEAN                             Received,\r
-  IN UINT32                              DataLength,\r
-  IN VOID                                *Data     OPTIONAL\r
+  IN EFI_HTTP_BOOT_CALLBACK_PROTOCOL   *This,\r
+  IN EFI_HTTP_BOOT_CALLBACK_DATA_TYPE  DataType,\r
+  IN BOOLEAN                           Received,\r
+  IN UINT32                            DataLength,\r
+  IN VOID                              *Data     OPTIONAL\r
   )\r
 {\r
   EFI_HTTP_MESSAGE        *HttpMessage;\r
@@ -671,89 +677,95 @@ HttpBootCallback (
   HTTP_BOOT_PRIVATE_DATA  *Private;\r
   UINT32                  Percentage;\r
 \r
-  Private = HTTP_BOOT_PRIVATE_DATA_FROM_CALLBACK_PROTOCOL(This);\r
+  Private = HTTP_BOOT_PRIVATE_DATA_FROM_CALLBACK_PROTOCOL (This);\r
 \r
   switch (DataType) {\r
-  case HttpBootDhcp4:\r
-  case HttpBootDhcp6:\r
-    Print (L".");\r
-    break;\r
-\r
-  case HttpBootHttpRequest:\r
-    if (Data != NULL) {\r
-      HttpMessage = (EFI_HTTP_MESSAGE *) Data;\r
-      if (HttpMessage->Data.Request->Method == HttpMethodGet &&\r
-          HttpMessage->Data.Request->Url != NULL) {\r
-        Print (L"\n  URI: %s\n", HttpMessage->Data.Request->Url);\r
+    case HttpBootDhcp4:\r
+    case HttpBootDhcp6:\r
+      Print (L".");\r
+      break;\r
+\r
+    case HttpBootHttpRequest:\r
+      if (Data != NULL) {\r
+        HttpMessage = (EFI_HTTP_MESSAGE *)Data;\r
+        if ((HttpMessage->Data.Request->Method == HttpMethodGet) &&\r
+            (HttpMessage->Data.Request->Url != NULL))\r
+        {\r
+          Print (L"\n  URI: %s\n", HttpMessage->Data.Request->Url);\r
+        }\r
+      }\r
+\r
+      break;\r
+\r
+    case HttpBootHttpResponse:\r
+      if (Data != NULL) {\r
+        HttpMessage = (EFI_HTTP_MESSAGE *)Data;\r
+\r
+        if (HttpMessage->Data.Response != NULL) {\r
+          if (HttpBootIsHttpRedirectStatusCode (HttpMessage->Data.Response->StatusCode)) {\r
+            //\r
+            // Server indicates the resource has been redirected to a different URL\r
+            // according to the section 6.4 of RFC7231 and the RFC 7538.\r
+            // Display the redirect information on the screen.\r
+            //\r
+            HttpHeader = HttpFindHeader (\r
+                           HttpMessage->HeaderCount,\r
+                           HttpMessage->Headers,\r
+                           HTTP_HEADER_LOCATION\r
+                           );\r
+            if (HttpHeader != NULL) {\r
+              Print (L"\n  HTTP ERROR: Resource Redirected.\n  New Location: %a\n", HttpHeader->FieldValue);\r
+            }\r
+\r
+            break;\r
+          }\r
+        }\r
+\r
+        HttpHeader = HttpFindHeader (\r
+                       HttpMessage->HeaderCount,\r
+                       HttpMessage->Headers,\r
+                       HTTP_HEADER_CONTENT_LENGTH\r
+                       );\r
+        if (HttpHeader != NULL) {\r
+          Private->FileSize     = AsciiStrDecimalToUintn (HttpHeader->FieldValue);\r
+          Private->ReceivedSize = 0;\r
+          Private->Percentage   = 0;\r
+        }\r
       }\r
-    }\r
-    break;\r
 \r
-  case HttpBootHttpResponse:\r
-    if (Data != NULL) {\r
-      HttpMessage = (EFI_HTTP_MESSAGE *) Data;\r
+      break;\r
 \r
-      if (HttpMessage->Data.Response != NULL) {\r
-        if (HttpBootIsHttpRedirectStatusCode (HttpMessage->Data.Response->StatusCode)) {\r
+    case HttpBootHttpEntityBody:\r
+      if (DataLength != 0) {\r
+        if (Private->FileSize != 0) {\r
           //\r
-          // Server indicates the resource has been redirected to a different URL\r
-          // according to the section 6.4 of RFC7231 and the RFC 7538.\r
-          // Display the redirect information on the screen.\r
+          // We already know the file size, print in percentage format.\r
           //\r
-          HttpHeader = HttpFindHeader (\r
-                 HttpMessage->HeaderCount,\r
-                 HttpMessage->Headers,\r
-                 HTTP_HEADER_LOCATION\r
-                 );\r
-          if (HttpHeader != NULL) {\r
-            Print (L"\n  HTTP ERROR: Resource Redirected.\n  New Location: %a\n", HttpHeader->FieldValue);\r
+          if (Private->ReceivedSize == 0) {\r
+            Print (L"  File Size: %lu Bytes\n", Private->FileSize);\r
           }\r
-          break;\r
-        }\r
-      }\r
 \r
-      HttpHeader = HttpFindHeader (\r
-                     HttpMessage->HeaderCount,\r
-                     HttpMessage->Headers,\r
-                     HTTP_HEADER_CONTENT_LENGTH\r
-                     );\r
-      if (HttpHeader != NULL) {\r
-        Private->FileSize = AsciiStrDecimalToUintn (HttpHeader->FieldValue);\r
-        Private->ReceivedSize = 0;\r
-        Private->Percentage   = 0;\r
-      }\r
-    }\r
-    break;\r
-\r
-  case HttpBootHttpEntityBody:\r
-    if (DataLength != 0) {\r
-      if (Private->FileSize != 0) {\r
-        //\r
-        // We already know the file size, print in percentage format.\r
-        //\r
-        if (Private->ReceivedSize == 0) {\r
-          Print (L"  File Size: %lu Bytes\n", Private->FileSize);\r
-        }\r
-        Private->ReceivedSize += DataLength;\r
-        Percentage = (UINT32) DivU64x64Remainder (MultU64x32 (Private->ReceivedSize, 100), Private->FileSize, NULL);\r
-        if (Private->Percentage != Percentage) {\r
-          Private->Percentage = Percentage;\r
-          Print (L"\r  Downloading...%d%%", Percentage);\r
+          Private->ReceivedSize += DataLength;\r
+          Percentage             = (UINT32)DivU64x64Remainder (MultU64x32 (Private->ReceivedSize, 100), Private->FileSize, NULL);\r
+          if (Private->Percentage != Percentage) {\r
+            Private->Percentage = Percentage;\r
+            Print (L"\r  Downloading...%d%%", Percentage);\r
+          }\r
+        } else {\r
+          //\r
+          // In some case we couldn't get the file size from the HTTP header, so we\r
+          // just print the downloaded file size.\r
+          //\r
+          Private->ReceivedSize += DataLength;\r
+          Print (L"\r  Downloading...%lu Bytes", Private->ReceivedSize);\r
         }\r
-      } else {\r
-        //\r
-        // In some case we couldn't get the file size from the HTTP header, so we\r
-        // just print the downloaded file size.\r
-        //\r
-        Private->ReceivedSize += DataLength;\r
-        Print (L"\r  Downloading...%lu Bytes", Private->ReceivedSize);\r
       }\r
-    }\r
-    break;\r
 \r
-  default:\r
-    break;\r
-  };\r
+      break;\r
+\r
+    default:\r
+      break;\r
+  }\r
 \r
   return EFI_SUCCESS;\r
 }\r
index 7b30583e243504d5d934632eeb74a574aecbec73..55adc9cb500f722662aa048c4b4cf0e066f97357 100644 (file)
@@ -5,10 +5,11 @@ Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
+\r
 #ifndef __EFI_HTTP_BOOT_IMPL_H__\r
 #define __EFI_HTTP_BOOT_IMPL_H__\r
 \r
-#define HTTP_BOOT_CHECK_MEDIA_WAITING_TIME          EFI_TIMER_PERIOD_SECONDS(20)\r
+#define HTTP_BOOT_CHECK_MEDIA_WAITING_TIME  EFI_TIMER_PERIOD_SECONDS(20)\r
 \r
 /**\r
   Attempt to complete a DHCPv4 D.O.R.A or DHCPv6 S.R.A.A sequence to retrieve the boot resource information.\r
@@ -24,7 +25,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 HttpBootDhcp (\r
-  IN HTTP_BOOT_PRIVATE_DATA           *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   );\r
 \r
 /**\r
@@ -40,7 +41,7 @@ HttpBootDhcp (
 **/\r
 EFI_STATUS\r
 HttpBootStop (\r
-  IN HTTP_BOOT_PRIVATE_DATA           *Private\r
+  IN HTTP_BOOT_PRIVATE_DATA  *Private\r
   );\r
 \r
 extern EFI_HTTP_BOOT_CALLBACK_PROTOCOL  gHttpBootDxeHttpBootCallback;\r
index 99d7fb39c7936ea579fb0b859791bbbdbb5d987e..236ef259318b4877cf18a8897bc88af1f745eade 100644 (file)
@@ -9,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "HttpBootDxe.h"\r
 \r
-\r
 /**\r
   Get the Nic handle using any child handle in the IPv4 stack.\r
 \r
@@ -21,10 +20,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_HANDLE\r
 HttpBootGetNicByIp4Children (\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, &gEfiHttpProtocolGuid);\r
   if (NicHandle == NULL) {\r
@@ -48,10 +47,11 @@ HttpBootGetNicByIp4Children (
 **/\r
 EFI_HANDLE\r
 HttpBootGetNicByIp6Children (\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, &gEfiHttpProtocolGuid);\r
   if (NicHandle == NULL) {\r
     NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiDhcp6ProtocolGuid);\r
@@ -73,17 +73,17 @@ HttpBootGetNicByIp6Children (
 **/\r
 VOID\r
 HttpBootUintnToAscDecWithFormat (\r
-  IN UINTN                       Number,\r
-  IN UINT8                       *Buffer,\r
-  IN INTN                        Length\r
+  IN UINTN  Number,\r
+  IN UINT8  *Buffer,\r
+  IN INTN   Length\r
   )\r
 {\r
-  UINTN                          Remainder;\r
+  UINTN  Remainder;\r
 \r
-  for (; Length > 0; Length--) {\r
-    Remainder      = Number % 10;\r
-    Number        /= 10;\r
-    Buffer[Length - 1] = (UINT8) ('0' + Remainder);\r
+  for ( ; Length > 0; Length--) {\r
+    Remainder          = Number % 10;\r
+    Number            /= 10;\r
+    Buffer[Length - 1] = (UINT8)('0' + Remainder);\r
   }\r
 }\r
 \r
@@ -95,10 +95,10 @@ HttpBootUintnToAscDecWithFormat (
 **/\r
 VOID\r
 HttpBootShowIp4Addr (\r
-  IN EFI_IPv4_ADDRESS   *Ip\r
+  IN EFI_IPv4_ADDRESS  *Ip\r
   )\r
 {\r
-  UINTN                 Index;\r
+  UINTN  Index;\r
 \r
   for (Index = 0; Index < 4; Index++) {\r
     AsciiPrint ("%d", Ip->Addr[Index]);\r
@@ -116,23 +116,25 @@ HttpBootShowIp4Addr (
 **/\r
 VOID\r
 HttpBootShowIp6Addr (\r
-  IN EFI_IPv6_ADDRESS   *Ip\r
+  IN EFI_IPv6_ADDRESS  *Ip\r
   )\r
 {\r
-  UINTN                 Index;\r
+  UINTN  Index;\r
 \r
   for (Index = 0; Index < 16; Index++) {\r
-\r
     if (Ip->Addr[Index] != 0) {\r
       AsciiPrint ("%x", Ip->Addr[Index]);\r
     }\r
+\r
     Index++;\r
     if (Index > 15) {\r
       return;\r
     }\r
+\r
     if (((Ip->Addr[Index] & 0xf0) == 0) && (Ip->Addr[Index - 1] != 0)) {\r
       AsciiPrint ("0");\r
     }\r
+\r
     AsciiPrint ("%x", Ip->Addr[Index]);\r
     if (Index < 15) {\r
       AsciiPrint (":");\r
@@ -148,142 +150,141 @@ HttpBootShowIp6Addr (
 **/\r
 VOID\r
 HttpBootPrintErrorMessage (\r
-  EFI_HTTP_STATUS_CODE            StatusCode\r
+  EFI_HTTP_STATUS_CODE  StatusCode\r
   )\r
 {\r
   AsciiPrint ("\n");\r
 \r
   switch (StatusCode) {\r
-  case HTTP_STATUS_300_MULTIPLE_CHOICES:\r
-    AsciiPrint ("\n  Redirection: 300 Multiple Choices");\r
-    break;\r
-\r
-  case HTTP_STATUS_301_MOVED_PERMANENTLY:\r
-    AsciiPrint ("\n  Redirection: 301 Moved Permanently");\r
-    break;\r
+    case HTTP_STATUS_300_MULTIPLE_CHOICES:\r
+      AsciiPrint ("\n  Redirection: 300 Multiple Choices");\r
+      break;\r
 \r
-  case HTTP_STATUS_302_FOUND:\r
-    AsciiPrint ("\n  Redirection: 302 Found");\r
-    break;\r
+    case HTTP_STATUS_301_MOVED_PERMANENTLY:\r
+      AsciiPrint ("\n  Redirection: 301 Moved Permanently");\r
+      break;\r
 \r
-  case HTTP_STATUS_303_SEE_OTHER:\r
-    AsciiPrint ("\n  Redirection: 303 See Other");\r
-    break;\r
+    case HTTP_STATUS_302_FOUND:\r
+      AsciiPrint ("\n  Redirection: 302 Found");\r
+      break;\r
 \r
-  case HTTP_STATUS_304_NOT_MODIFIED:\r
-    AsciiPrint ("\n  Redirection: 304 Not Modified");\r
-    break;\r
+    case HTTP_STATUS_303_SEE_OTHER:\r
+      AsciiPrint ("\n  Redirection: 303 See Other");\r
+      break;\r
 \r
-  case HTTP_STATUS_305_USE_PROXY:\r
-    AsciiPrint ("\n  Redirection: 305 Use Proxy");\r
-    break;\r
+    case HTTP_STATUS_304_NOT_MODIFIED:\r
+      AsciiPrint ("\n  Redirection: 304 Not Modified");\r
+      break;\r
 \r
-  case HTTP_STATUS_307_TEMPORARY_REDIRECT:\r
-    AsciiPrint ("\n  Redirection: 307 Temporary Redirect");\r
-    break;\r
+    case HTTP_STATUS_305_USE_PROXY:\r
+      AsciiPrint ("\n  Redirection: 305 Use Proxy");\r
+      break;\r
 \r
-  case HTTP_STATUS_308_PERMANENT_REDIRECT:\r
-    AsciiPrint ("\n  Redirection: 308 Permanent Redirect");\r
-    break;\r
+    case HTTP_STATUS_307_TEMPORARY_REDIRECT:\r
+      AsciiPrint ("\n  Redirection: 307 Temporary Redirect");\r
+      break;\r
 \r
-  case HTTP_STATUS_400_BAD_REQUEST:\r
-    AsciiPrint ("\n  Client Error: 400 Bad Request");\r
-    break;\r
+    case HTTP_STATUS_308_PERMANENT_REDIRECT:\r
+      AsciiPrint ("\n  Redirection: 308 Permanent Redirect");\r
+      break;\r
 \r
-  case HTTP_STATUS_401_UNAUTHORIZED:\r
-    AsciiPrint ("\n  Client Error: 401 Unauthorized");\r
-    break;\r
+    case HTTP_STATUS_400_BAD_REQUEST:\r
+      AsciiPrint ("\n  Client Error: 400 Bad Request");\r
+      break;\r
 \r
-  case HTTP_STATUS_402_PAYMENT_REQUIRED:\r
-    AsciiPrint ("\n  Client Error: 402 Payment Required");\r
-    break;\r
+    case HTTP_STATUS_401_UNAUTHORIZED:\r
+      AsciiPrint ("\n  Client Error: 401 Unauthorized");\r
+      break;\r
 \r
-  case HTTP_STATUS_403_FORBIDDEN:\r
-    AsciiPrint ("\n  Client Error: 403 Forbidden");\r
-    break;\r
+    case HTTP_STATUS_402_PAYMENT_REQUIRED:\r
+      AsciiPrint ("\n  Client Error: 402 Payment Required");\r
+      break;\r
 \r
-  case HTTP_STATUS_404_NOT_FOUND:\r
-    AsciiPrint ("\n  Client Error: 404 Not Found");\r
-    break;\r
+    case HTTP_STATUS_403_FORBIDDEN:\r
+      AsciiPrint ("\n  Client Error: 403 Forbidden");\r
+      break;\r
 \r
-  case HTTP_STATUS_405_METHOD_NOT_ALLOWED:\r
-    AsciiPrint ("\n  Client Error: 405 Method Not Allowed");\r
-    break;\r
+    case HTTP_STATUS_404_NOT_FOUND:\r
+      AsciiPrint ("\n  Client Error: 404 Not Found");\r
+      break;\r
 \r
-  case HTTP_STATUS_406_NOT_ACCEPTABLE:\r
-    AsciiPrint ("\n  Client Error: 406 Not Acceptable");\r
-    break;\r
+    case HTTP_STATUS_405_METHOD_NOT_ALLOWED:\r
+      AsciiPrint ("\n  Client Error: 405 Method Not Allowed");\r
+      break;\r
 \r
-  case HTTP_STATUS_407_PROXY_AUTHENTICATION_REQUIRED:\r
-    AsciiPrint ("\n  Client Error: 407 Proxy Authentication Required");\r
-    break;\r
+    case HTTP_STATUS_406_NOT_ACCEPTABLE:\r
+      AsciiPrint ("\n  Client Error: 406 Not Acceptable");\r
+      break;\r
 \r
-  case HTTP_STATUS_408_REQUEST_TIME_OUT:\r
-    AsciiPrint ("\n  Client Error: 408 Request Timeout");\r
-    break;\r
+    case HTTP_STATUS_407_PROXY_AUTHENTICATION_REQUIRED:\r
+      AsciiPrint ("\n  Client Error: 407 Proxy Authentication Required");\r
+      break;\r
 \r
-  case HTTP_STATUS_409_CONFLICT:\r
-    AsciiPrint ("\n  Client Error: 409 Conflict");\r
-    break;\r
+    case HTTP_STATUS_408_REQUEST_TIME_OUT:\r
+      AsciiPrint ("\n  Client Error: 408 Request Timeout");\r
+      break;\r
 \r
-  case HTTP_STATUS_410_GONE:\r
-    AsciiPrint ("\n  Client Error: 410 Gone");\r
-    break;\r
+    case HTTP_STATUS_409_CONFLICT:\r
+      AsciiPrint ("\n  Client Error: 409 Conflict");\r
+      break;\r
 \r
-  case HTTP_STATUS_411_LENGTH_REQUIRED:\r
-    AsciiPrint ("\n  Client Error: 411 Length Required");\r
-    break;\r
+    case HTTP_STATUS_410_GONE:\r
+      AsciiPrint ("\n  Client Error: 410 Gone");\r
+      break;\r
 \r
-  case HTTP_STATUS_412_PRECONDITION_FAILED:\r
-    AsciiPrint ("\n  Client Error: 412 Precondition Failed");\r
-    break;\r
+    case HTTP_STATUS_411_LENGTH_REQUIRED:\r
+      AsciiPrint ("\n  Client Error: 411 Length Required");\r
+      break;\r
 \r
-  case HTTP_STATUS_413_REQUEST_ENTITY_TOO_LARGE:\r
-    AsciiPrint ("\n  Client Error: 413 Request Entity Too Large");\r
-    break;\r
+    case HTTP_STATUS_412_PRECONDITION_FAILED:\r
+      AsciiPrint ("\n  Client Error: 412 Precondition Failed");\r
+      break;\r
 \r
-  case HTTP_STATUS_414_REQUEST_URI_TOO_LARGE:\r
-    AsciiPrint ("\n  Client Error: 414 Request URI Too Long");\r
-    break;\r
+    case HTTP_STATUS_413_REQUEST_ENTITY_TOO_LARGE:\r
+      AsciiPrint ("\n  Client Error: 413 Request Entity Too Large");\r
+      break;\r
 \r
-  case HTTP_STATUS_415_UNSUPPORTED_MEDIA_TYPE:\r
-    AsciiPrint ("\n  Client Error: 415 Unsupported Media Type");\r
-    break;\r
+    case HTTP_STATUS_414_REQUEST_URI_TOO_LARGE:\r
+      AsciiPrint ("\n  Client Error: 414 Request URI Too Long");\r
+      break;\r
 \r
-  case HTTP_STATUS_416_REQUESTED_RANGE_NOT_SATISFIED:\r
-    AsciiPrint ("\n  Client Error: 416 Requested Range Not Satisfiable");\r
-    break;\r
+    case HTTP_STATUS_415_UNSUPPORTED_MEDIA_TYPE:\r
+      AsciiPrint ("\n  Client Error: 415 Unsupported Media Type");\r
+      break;\r
 \r
-  case HTTP_STATUS_417_EXPECTATION_FAILED:\r
-    AsciiPrint ("\n  Client Error: 417 Expectation Failed");\r
-    break;\r
+    case HTTP_STATUS_416_REQUESTED_RANGE_NOT_SATISFIED:\r
+      AsciiPrint ("\n  Client Error: 416 Requested Range Not Satisfiable");\r
+      break;\r
 \r
-  case HTTP_STATUS_500_INTERNAL_SERVER_ERROR:\r
-    AsciiPrint ("\n  Server Error: 500 Internal Server Error");\r
-    break;\r
+    case HTTP_STATUS_417_EXPECTATION_FAILED:\r
+      AsciiPrint ("\n  Client Error: 417 Expectation Failed");\r
+      break;\r
 \r
-  case HTTP_STATUS_501_NOT_IMPLEMENTED:\r
-    AsciiPrint ("\n  Server Error: 501 Not Implemented");\r
-    break;\r
+    case HTTP_STATUS_500_INTERNAL_SERVER_ERROR:\r
+      AsciiPrint ("\n  Server Error: 500 Internal Server Error");\r
+      break;\r
 \r
-  case HTTP_STATUS_502_BAD_GATEWAY:\r
-    AsciiPrint ("\n  Server Error: 502 Bad Gateway");\r
-    break;\r
+    case HTTP_STATUS_501_NOT_IMPLEMENTED:\r
+      AsciiPrint ("\n  Server Error: 501 Not Implemented");\r
+      break;\r
 \r
-  case HTTP_STATUS_503_SERVICE_UNAVAILABLE:\r
-    AsciiPrint ("\n  Server Error: 503 Service Unavailable");\r
-    break;\r
+    case HTTP_STATUS_502_BAD_GATEWAY:\r
+      AsciiPrint ("\n  Server Error: 502 Bad Gateway");\r
+      break;\r
 \r
-  case HTTP_STATUS_504_GATEWAY_TIME_OUT:\r
-    AsciiPrint ("\n  Server Error: 504 Gateway Timeout");\r
-    break;\r
+    case HTTP_STATUS_503_SERVICE_UNAVAILABLE:\r
+      AsciiPrint ("\n  Server Error: 503 Service Unavailable");\r
+      break;\r
 \r
-  case HTTP_STATUS_505_HTTP_VERSION_NOT_SUPPORTED:\r
-    AsciiPrint ("\n  Server Error: 505 HTTP Version Not Supported");\r
-    break;\r
+    case HTTP_STATUS_504_GATEWAY_TIME_OUT:\r
+      AsciiPrint ("\n  Server Error: 504 Gateway Timeout");\r
+      break;\r
 \r
-  default: ;\r
+    case HTTP_STATUS_505_HTTP_VERSION_NOT_SUPPORTED:\r
+      AsciiPrint ("\n  Server Error: 505 HTTP Version Not Supported");\r
+      break;\r
 \r
+    default:;\r
   }\r
 }\r
 \r
@@ -297,11 +298,11 @@ HttpBootPrintErrorMessage (
 VOID\r
 EFIAPI\r
 HttpBootCommonNotify (\r
-  IN EFI_EVENT           Event,\r
-  IN VOID                *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  *((BOOLEAN *) Context) = TRUE;\r
+  *((BOOLEAN *)Context) = TRUE;\r
 }\r
 \r
 /**\r
@@ -317,38 +318,38 @@ HttpBootCommonNotify (
 **/\r
 EFI_STATUS\r
 HttpBootDns (\r
-  IN     HTTP_BOOT_PRIVATE_DATA   *Private,\r
-  IN     CHAR16                   *HostName,\r
-     OUT EFI_IPv6_ADDRESS         *IpAddress\r
+  IN     HTTP_BOOT_PRIVATE_DATA  *Private,\r
+  IN     CHAR16                  *HostName,\r
+  OUT EFI_IPv6_ADDRESS           *IpAddress\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_DNS6_PROTOCOL               *Dns6;\r
-  EFI_DNS6_CONFIG_DATA            Dns6ConfigData;\r
-  EFI_DNS6_COMPLETION_TOKEN       Token;\r
-  EFI_HANDLE                      Dns6Handle;\r
-  EFI_IP6_CONFIG_PROTOCOL         *Ip6Config;\r
-  EFI_IPv6_ADDRESS                *DnsServerList;\r
-  UINTN                           DnsServerListCount;\r
-  UINTN                           DataSize;\r
-  BOOLEAN                         IsDone;\r
-\r
-  DnsServerList       = NULL;\r
-  DnsServerListCount  = 0;\r
-  Dns6                = NULL;\r
-  Dns6Handle          = NULL;\r
+  EFI_STATUS                 Status;\r
+  EFI_DNS6_PROTOCOL          *Dns6;\r
+  EFI_DNS6_CONFIG_DATA       Dns6ConfigData;\r
+  EFI_DNS6_COMPLETION_TOKEN  Token;\r
+  EFI_HANDLE                 Dns6Handle;\r
+  EFI_IP6_CONFIG_PROTOCOL    *Ip6Config;\r
+  EFI_IPv6_ADDRESS           *DnsServerList;\r
+  UINTN                      DnsServerListCount;\r
+  UINTN                      DataSize;\r
+  BOOLEAN                    IsDone;\r
+\r
+  DnsServerList      = NULL;\r
+  DnsServerListCount = 0;\r
+  Dns6               = NULL;\r
+  Dns6Handle         = NULL;\r
   ZeroMem (&Token, sizeof (EFI_DNS6_COMPLETION_TOKEN));\r
 \r
   //\r
   // Get DNS server list from EFI IPv6 Configuration protocol.\r
   //\r
-  Status = gBS->HandleProtocol (Private->Controller, &gEfiIp6ConfigProtocolGuid, (VOID **) &Ip6Config);\r
+  Status = gBS->HandleProtocol (Private->Controller, &gEfiIp6ConfigProtocolGuid, (VOID **)&Ip6Config);\r
   if (!EFI_ERROR (Status)) {\r
     //\r
     // Get the required size.\r
     //\r
     DataSize = 0;\r
-    Status = Ip6Config->GetData (Ip6Config, Ip6ConfigDataTypeDnsServer, &DataSize, NULL);\r
+    Status   = Ip6Config->GetData (Ip6Config, Ip6ConfigDataTypeDnsServer, &DataSize, NULL);\r
     if (Status == EFI_BUFFER_TOO_SMALL) {\r
       DnsServerList = AllocatePool (DataSize);\r
       if (DnsServerList == NULL) {\r
@@ -364,6 +365,7 @@ HttpBootDns (
       }\r
     }\r
   }\r
+\r
   //\r
   // Create a DNSv6 child instance and get the protocol.\r
   //\r
@@ -380,7 +382,7 @@ HttpBootDns (
   Status = gBS->OpenProtocol (\r
                   Dns6Handle,\r
                   &gEfiDns6ProtocolGuid,\r
-                  (VOID **) &Dns6,\r
+                  (VOID **)&Dns6,\r
                   Private->Ip6Nic->ImageHandle,\r
                   Private->Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -397,11 +399,11 @@ HttpBootDns (
   Dns6ConfigData.DnsServerList  = DnsServerList;\r
   Dns6ConfigData.EnableDnsCache = TRUE;\r
   Dns6ConfigData.Protocol       = EFI_IP_PROTO_UDP;\r
-  IP6_COPY_ADDRESS (&Dns6ConfigData.StationIp,&Private->StationIp.v6);\r
+  IP6_COPY_ADDRESS (&Dns6ConfigData.StationIp, &Private->StationIp.v6);\r
   Status = Dns6->Configure (\r
-                    Dns6,\r
-                    &Dns6ConfigData\r
-                    );\r
+                   Dns6,\r
+                   &Dns6ConfigData\r
+                   );\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   }\r
@@ -443,25 +445,30 @@ HttpBootDns (
       Status = EFI_DEVICE_ERROR;\r
       goto Exit;\r
     }\r
-    if (Token.RspData.H2AData->IpCount == 0 || Token.RspData.H2AData->IpList == NULL) {\r
+\r
+    if ((Token.RspData.H2AData->IpCount == 0) || (Token.RspData.H2AData->IpList == NULL)) {\r
       Status = EFI_DEVICE_ERROR;\r
       goto Exit;\r
     }\r
+\r
     //\r
     // We just return the first IPv6 address from DNS protocol.\r
     //\r
     IP6_COPY_ADDRESS (IpAddress, Token.RspData.H2AData->IpList);\r
     Status = EFI_SUCCESS;\r
   }\r
+\r
 Exit:\r
 \r
   if (Token.Event != NULL) {\r
     gBS->CloseEvent (Token.Event);\r
   }\r
+\r
   if (Token.RspData.H2AData != NULL) {\r
     if (Token.RspData.H2AData->IpList != NULL) {\r
       FreePool (Token.RspData.H2AData->IpList);\r
     }\r
+\r
     FreePool (Token.RspData.H2AData);\r
   }\r
 \r
@@ -504,11 +511,11 @@ Exit:
 **/\r
 EFI_STATUS\r
 HttpBootCheckUriScheme (\r
-  IN      CHAR8                  *Uri\r
+  IN      CHAR8  *Uri\r
   )\r
 {\r
-  UINTN                Index;\r
-  EFI_STATUS           Status;\r
+  UINTN       Index;\r
+  EFI_STATUS  Status;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
@@ -519,7 +526,8 @@ HttpBootCheckUriScheme (
     if (Uri[Index] == ':') {\r
       break;\r
     }\r
-    if (Uri[Index] >= 'A' && Uri[Index] <= 'Z') {\r
+\r
+    if ((Uri[Index] >= 'A') && (Uri[Index] <= 'Z')) {\r
       Uri[Index] -= (CHAR8)('A' - 'a');\r
     }\r
   }\r
@@ -557,8 +565,8 @@ HttpBootCheckUriScheme (
 **/\r
 EFI_STATUS\r
 HttpBootParseFilePath (\r
-  IN     EFI_DEVICE_PATH_PROTOCOL     *FilePath,\r
-     OUT CHAR8                        **UriAddress\r
+  IN     EFI_DEVICE_PATH_PROTOCOL  *FilePath,\r
+  OUT CHAR8                        **UriAddress\r
   )\r
 {\r
   EFI_DEVICE_PATH_PROTOCOL  *TempDevicePath;\r
@@ -578,28 +586,32 @@ HttpBootParseFilePath (
   TempDevicePath = FilePath;\r
   while (!IsDevicePathEnd (TempDevicePath)) {\r
     if ((DevicePathType (TempDevicePath) == MESSAGING_DEVICE_PATH) &&\r
-        (DevicePathSubType (TempDevicePath) == MSG_URI_DP)) {\r
-      UriDevicePath = (URI_DEVICE_PATH*) TempDevicePath;\r
+        (DevicePathSubType (TempDevicePath) == MSG_URI_DP))\r
+    {\r
+      UriDevicePath = (URI_DEVICE_PATH *)TempDevicePath;\r
       //\r
       // UEFI Spec doesn't require the URI to be a NULL-terminated string\r
       // So we allocate a new buffer and always append a '\0' to it.\r
       //\r
-      UriStrLength = DevicePathNodeLength (UriDevicePath) - sizeof(EFI_DEVICE_PATH_PROTOCOL);\r
+      UriStrLength = DevicePathNodeLength (UriDevicePath) - sizeof (EFI_DEVICE_PATH_PROTOCOL);\r
       if (UriStrLength == 0) {\r
         //\r
         // return a NULL UriAddress if it's a empty URI device path node.\r
         //\r
         break;\r
       }\r
+\r
       Uri = AllocatePool (UriStrLength + 1);\r
       if (Uri == NULL) {\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
-      CopyMem (Uri, UriDevicePath->Uri, DevicePathNodeLength (UriDevicePath) - sizeof(EFI_DEVICE_PATH_PROTOCOL));\r
-      Uri[DevicePathNodeLength (UriDevicePath) - sizeof(EFI_DEVICE_PATH_PROTOCOL)] = '\0';\r
+\r
+      CopyMem (Uri, UriDevicePath->Uri, DevicePathNodeLength (UriDevicePath) - sizeof (EFI_DEVICE_PATH_PROTOCOL));\r
+      Uri[DevicePathNodeLength (UriDevicePath) - sizeof (EFI_DEVICE_PATH_PROTOCOL)] = '\0';\r
 \r
       *UriAddress = Uri;\r
     }\r
+\r
     TempDevicePath = NextDevicePathNode (TempDevicePath);\r
   }\r
 \r
@@ -625,23 +637,23 @@ HttpBootParseFilePath (
 **/\r
 EFI_STATUS\r
 HttpBootCheckImageType (\r
-  IN      CHAR8                  *Uri,\r
-  IN      VOID                   *UriParser,\r
-  IN      UINTN                  HeaderCount,\r
-  IN      EFI_HTTP_HEADER        *Headers,\r
-     OUT  HTTP_BOOT_IMAGE_TYPE   *ImageType\r
+  IN      CHAR8              *Uri,\r
+  IN      VOID               *UriParser,\r
+  IN      UINTN              HeaderCount,\r
+  IN      EFI_HTTP_HEADER    *Headers,\r
+  OUT  HTTP_BOOT_IMAGE_TYPE  *ImageType\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
-  EFI_HTTP_HEADER       *Header;\r
-  CHAR8                 *FilePath;\r
-  CHAR8                 *FilePost;\r
+  EFI_STATUS       Status;\r
+  EFI_HTTP_HEADER  *Header;\r
+  CHAR8            *FilePath;\r
+  CHAR8            *FilePost;\r
 \r
-  if (Uri == NULL || UriParser == NULL || ImageType == NULL) {\r
+  if ((Uri == NULL) || (UriParser == NULL) || (ImageType == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (HeaderCount != 0 && Headers == NULL) {\r
+  if ((HeaderCount != 0) && (Headers == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -712,22 +724,22 @@ HttpBootCheckImageType (
 **/\r
 EFI_STATUS\r
 HttpBootRegisterRamDisk (\r
-  IN  HTTP_BOOT_PRIVATE_DATA       *Private,\r
-  IN  UINTN                        BufferSize,\r
-  IN  VOID                         *Buffer,\r
-  IN  HTTP_BOOT_IMAGE_TYPE         ImageType\r
+  IN  HTTP_BOOT_PRIVATE_DATA  *Private,\r
+  IN  UINTN                   BufferSize,\r
+  IN  VOID                    *Buffer,\r
+  IN  HTTP_BOOT_IMAGE_TYPE    ImageType\r
   )\r
 {\r
-  EFI_RAM_DISK_PROTOCOL      *RamDisk;\r
-  EFI_STATUS                 Status;\r
-  EFI_DEVICE_PATH_PROTOCOL   *DevicePath;\r
-  EFI_GUID                   *RamDiskType;\r
+  EFI_RAM_DISK_PROTOCOL     *RamDisk;\r
+  EFI_STATUS                Status;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
+  EFI_GUID                  *RamDiskType;\r
 \r
   ASSERT (Private != NULL);\r
   ASSERT (Buffer != NULL);\r
   ASSERT (BufferSize != 0);\r
 \r
-  Status = gBS->LocateProtocol (&gEfiRamDiskProtocolGuid, NULL, (VOID**) &RamDisk);\r
+  Status = gBS->LocateProtocol (&gEfiRamDiskProtocolGuid, NULL, (VOID **)&RamDisk);\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "HTTP Boot: Couldn't find the RAM Disk protocol - %r\n", Status));\r
     return Status;\r
@@ -742,12 +754,12 @@ HttpBootRegisterRamDisk (
   }\r
 \r
   Status = RamDisk->Register (\r
-             (UINTN)Buffer,\r
-             (UINT64)BufferSize,\r
-             RamDiskType,\r
-             Private->UsingIpv6 ? Private->Ip6Nic->DevicePath : Private->Ip4Nic->DevicePath,\r
-             &DevicePath\r
-             );\r
+                      (UINTN)Buffer,\r
+                      (UINT64)BufferSize,\r
+                      RamDiskType,\r
+                      Private->UsingIpv6 ? Private->Ip6Nic->DevicePath : Private->Ip4Nic->DevicePath,\r
+                      &DevicePath\r
+                      );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "HTTP Boot: Failed to register RAM Disk - %r\n", Status));\r
   }\r
@@ -765,13 +777,14 @@ HttpBootRegisterRamDisk (
 **/\r
 BOOLEAN\r
 HttpBootIsHttpRedirectStatusCode (\r
-  IN   EFI_HTTP_STATUS_CODE        StatusCode\r
+  IN   EFI_HTTP_STATUS_CODE  StatusCode\r
   )\r
 {\r
-  if (StatusCode == HTTP_STATUS_301_MOVED_PERMANENTLY ||\r
-      StatusCode == HTTP_STATUS_302_FOUND ||\r
-      StatusCode == HTTP_STATUS_307_TEMPORARY_REDIRECT ||\r
-      StatusCode == HTTP_STATUS_308_PERMANENT_REDIRECT) {\r
+  if ((StatusCode == HTTP_STATUS_301_MOVED_PERMANENTLY) ||\r
+      (StatusCode == HTTP_STATUS_302_FOUND) ||\r
+      (StatusCode == HTTP_STATUS_307_TEMPORARY_REDIRECT) ||\r
+      (StatusCode == HTTP_STATUS_308_PERMANENT_REDIRECT))\r
+  {\r
     return TRUE;\r
   }\r
 \r
index c2ac1b785a8f7d56c6a6b20890c91cd2abe7b39a..3698e55936423dee2cc9fb8e1dbf07cb5737c699 100644 (file)
@@ -21,7 +21,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_HANDLE\r
 HttpBootGetNicByIp4Children (\r
-  IN EFI_HANDLE                 ControllerHandle\r
+  IN EFI_HANDLE  ControllerHandle\r
   );\r
 \r
 /**\r
@@ -35,7 +35,7 @@ HttpBootGetNicByIp4Children (
 **/\r
 EFI_HANDLE\r
 HttpBootGetNicByIp6Children (\r
-  IN EFI_HANDLE                 ControllerHandle\r
+  IN EFI_HANDLE  ControllerHandle\r
   );\r
 \r
 /**\r
@@ -48,12 +48,11 @@ HttpBootGetNicByIp6Children (
 **/\r
 VOID\r
 HttpBootUintnToAscDecWithFormat (\r
-  IN UINTN                       Number,\r
-  IN UINT8                       *Buffer,\r
-  IN INTN                        Length\r
+  IN UINTN  Number,\r
+  IN UINT8  *Buffer,\r
+  IN INTN   Length\r
   );\r
 \r
-\r
 /**\r
   This function is to display the IPv4 address.\r
 \r
@@ -62,7 +61,7 @@ HttpBootUintnToAscDecWithFormat (
 **/\r
 VOID\r
 HttpBootShowIp4Addr (\r
-  IN EFI_IPv4_ADDRESS   *Ip\r
+  IN EFI_IPv4_ADDRESS  *Ip\r
   );\r
 \r
 /**\r
@@ -73,7 +72,7 @@ HttpBootShowIp4Addr (
 **/\r
 VOID\r
 HttpBootShowIp6Addr (\r
-  IN EFI_IPv6_ADDRESS   *Ip\r
+  IN EFI_IPv6_ADDRESS  *Ip\r
   );\r
 \r
 /**\r
@@ -84,7 +83,7 @@ HttpBootShowIp6Addr (
 **/\r
 VOID\r
 HttpBootPrintErrorMessage (\r
-  EFI_HTTP_STATUS_CODE            StatusCode\r
+  EFI_HTTP_STATUS_CODE  StatusCode\r
   );\r
 \r
 /**\r
@@ -100,9 +99,9 @@ HttpBootPrintErrorMessage (
 **/\r
 EFI_STATUS\r
 HttpBootDns (\r
-  IN     HTTP_BOOT_PRIVATE_DATA   *Private,\r
-  IN     CHAR16                   *HostName,\r
-     OUT EFI_IPv6_ADDRESS         *IpAddress\r
+  IN     HTTP_BOOT_PRIVATE_DATA  *Private,\r
+  IN     CHAR16                  *HostName,\r
+  OUT EFI_IPv6_ADDRESS           *IpAddress\r
   );\r
 \r
 /**\r
@@ -115,8 +114,8 @@ HttpBootDns (
 VOID\r
 EFIAPI\r
 HttpBootCommonNotify (\r
-  IN EFI_EVENT           Event,\r
-  IN VOID                *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -131,7 +130,7 @@ HttpBootCommonNotify (
 **/\r
 EFI_STATUS\r
 HttpBootCheckUriScheme (\r
-  IN      CHAR8                  *Uri\r
+  IN      CHAR8  *Uri\r
   );\r
 \r
 /**\r
@@ -148,8 +147,8 @@ HttpBootCheckUriScheme (
 **/\r
 EFI_STATUS\r
 HttpBootParseFilePath (\r
-  IN     EFI_DEVICE_PATH_PROTOCOL     *FilePath,\r
-     OUT CHAR8                        **UriAddress\r
+  IN     EFI_DEVICE_PATH_PROTOCOL  *FilePath,\r
+  OUT CHAR8                        **UriAddress\r
   );\r
 \r
 /**\r
@@ -171,11 +170,11 @@ HttpBootParseFilePath (
 **/\r
 EFI_STATUS\r
 HttpBootCheckImageType (\r
-  IN      CHAR8                  *Uri,\r
-  IN      VOID                   *UriParser,\r
-  IN      UINTN                  HeaderCount,\r
-  IN      EFI_HTTP_HEADER        *Headers,\r
-     OUT  HTTP_BOOT_IMAGE_TYPE   *ImageType\r
+  IN      CHAR8              *Uri,\r
+  IN      VOID               *UriParser,\r
+  IN      UINTN              HeaderCount,\r
+  IN      EFI_HTTP_HEADER    *Headers,\r
+  OUT  HTTP_BOOT_IMAGE_TYPE  *ImageType\r
   );\r
 \r
 /**\r
@@ -194,10 +193,10 @@ HttpBootCheckImageType (
 **/\r
 EFI_STATUS\r
 HttpBootRegisterRamDisk (\r
-  IN  HTTP_BOOT_PRIVATE_DATA       *Private,\r
-  IN  UINTN                        BufferSize,\r
-  IN  VOID                         *Buffer,\r
-  IN  HTTP_BOOT_IMAGE_TYPE         ImageType\r
+  IN  HTTP_BOOT_PRIVATE_DATA  *Private,\r
+  IN  UINTN                   BufferSize,\r
+  IN  VOID                    *Buffer,\r
+  IN  HTTP_BOOT_IMAGE_TYPE    ImageType\r
   );\r
 \r
 /**\r
@@ -210,6 +209,7 @@ HttpBootRegisterRamDisk (
 **/\r
 BOOLEAN\r
 HttpBootIsHttpRedirectStatusCode (\r
-  IN   EFI_HTTP_STATUS_CODE        StatusCode\r
+  IN   EFI_HTTP_STATUS_CODE  StatusCode\r
   );\r
+\r
 #endif\r
index d51b55ae2e0c4fe9ad997f68a70fa6c830ff8d22..db41d582c3b22b17822dab6e3c456a57e5a57632 100644 (file)
@@ -15,8 +15,8 @@
 ///\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
 EFI_COMPONENT_NAME_PROTOCOL  gHttpDxeComponentName = {\r
-  (EFI_COMPONENT_NAME_GET_DRIVER_NAME)     HttpDxeComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME_GET_CONTROLLER_NAME) HttpDxeComponentNameGetControllerName,\r
+  (EFI_COMPONENT_NAME_GET_DRIVER_NAME)HttpDxeComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME_GET_CONTROLLER_NAME)HttpDxeComponentNameGetControllerName,\r
   "eng"\r
 };\r
 \r
@@ -34,9 +34,9 @@ EFI_COMPONENT_NAME2_PROTOCOL  gHttpDxeComponentName2 = {
 /// Table of driver names\r
 ///\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
-EFI_UNICODE_STRING_TABLE mHttpDxeDriverNameTable[] = {\r
-  { "eng;en", (CHAR16 *) L"HttpDxe" },\r
-  { NULL, NULL }\r
+EFI_UNICODE_STRING_TABLE  mHttpDxeDriverNameTable[] = {\r
+  { "eng;en", (CHAR16 *)L"HttpDxe" },\r
+  { NULL,     NULL                 }\r
 };\r
 \r
 /**\r
index 5f092c00e300837098393d5230b1331252bf82b4..59a2784e6a40ade69481e8da558f05bed7837717 100644 (file)
@@ -23,23 +23,22 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 HttpDns4 (\r
-  IN     HTTP_PROTOCOL            *HttpInstance,\r
-  IN     CHAR16                   *HostName,\r
-     OUT EFI_IPv4_ADDRESS         *IpAddress\r
+  IN     HTTP_PROTOCOL  *HttpInstance,\r
+  IN     CHAR16         *HostName,\r
+  OUT EFI_IPv4_ADDRESS  *IpAddress\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_DNS4_PROTOCOL               *Dns4;\r
-  EFI_DNS4_CONFIG_DATA            Dns4CfgData;\r
-  EFI_DNS4_COMPLETION_TOKEN       Token;\r
-  BOOLEAN                         IsDone;\r
-  HTTP_SERVICE                    *Service;\r
-  EFI_HANDLE                      Dns4Handle;\r
-  EFI_IP4_CONFIG2_PROTOCOL        *Ip4Config2;\r
-  UINTN                           DnsServerListCount;\r
-  EFI_IPv4_ADDRESS                *DnsServerList;\r
-  UINTN                           DataSize;\r
-\r
+  EFI_STATUS                 Status;\r
+  EFI_DNS4_PROTOCOL          *Dns4;\r
+  EFI_DNS4_CONFIG_DATA       Dns4CfgData;\r
+  EFI_DNS4_COMPLETION_TOKEN  Token;\r
+  BOOLEAN                    IsDone;\r
+  HTTP_SERVICE               *Service;\r
+  EFI_HANDLE                 Dns4Handle;\r
+  EFI_IP4_CONFIG2_PROTOCOL   *Ip4Config2;\r
+  UINTN                      DnsServerListCount;\r
+  EFI_IPv4_ADDRESS           *DnsServerList;\r
+  UINTN                      DataSize;\r
 \r
   Service = HttpInstance->Service;\r
   ASSERT (Service != NULL);\r
@@ -51,7 +50,7 @@ HttpDns4 (
   //\r
   // Get DNS server list from EFI IPv4 Configuration II protocol.\r
   //\r
-  Status = gBS->HandleProtocol (Service->ControllerHandle, &gEfiIp4Config2ProtocolGuid, (VOID **) &Ip4Config2);\r
+  Status = gBS->HandleProtocol (Service->ControllerHandle, &gEfiIp4Config2ProtocolGuid, (VOID **)&Ip4Config2);\r
   if (!EFI_ERROR (Status)) {\r
     //\r
     // Get the required size.\r
@@ -64,7 +63,7 @@ HttpDns4 (
         return EFI_OUT_OF_RESOURCES;\r
       }\r
 \r
-      Status   = Ip4Config2->GetData (Ip4Config2, Ip4Config2DataTypeDnsServer, &DataSize, DnsServerList);\r
+      Status = Ip4Config2->GetData (Ip4Config2, Ip4Config2DataTypeDnsServer, &DataSize, DnsServerList);\r
       if (EFI_ERROR (Status)) {\r
         FreePool (DnsServerList);\r
         DnsServerList = NULL;\r
@@ -93,7 +92,7 @@ HttpDns4 (
   Status = gBS->OpenProtocol (\r
                   Dns4Handle,\r
                   &gEfiDns4ProtocolGuid,\r
-                  (VOID **) &Dns4,\r
+                  (VOID **)&Dns4,\r
                   Service->Ip4DriverBindingHandle,\r
                   Service->ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -113,12 +112,13 @@ HttpDns4 (
     IP4_COPY_ADDRESS (&Dns4CfgData.StationIp, &HttpInstance->IPv4Node.LocalAddress);\r
     IP4_COPY_ADDRESS (&Dns4CfgData.SubnetMask, &HttpInstance->IPv4Node.LocalSubnet);\r
   }\r
-  Dns4CfgData.EnableDnsCache     = TRUE;\r
-  Dns4CfgData.Protocol           = EFI_IP_PROTO_UDP;\r
-  Status = Dns4->Configure (\r
-                   Dns4,\r
-                   &Dns4CfgData\r
-                   );\r
+\r
+  Dns4CfgData.EnableDnsCache = TRUE;\r
+  Dns4CfgData.Protocol       = EFI_IP_PROTO_UDP;\r
+  Status                     = Dns4->Configure (\r
+                                       Dns4,\r
+                                       &Dns4CfgData\r
+                                       );\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   }\r
@@ -143,7 +143,7 @@ HttpDns4 (
   //\r
   Token.Status = EFI_NOT_READY;\r
   IsDone       = FALSE;\r
-  Status = Dns4->HostNameToIp (Dns4, HostName, &Token);\r
+  Status       = Dns4->HostNameToIp (Dns4, HostName, &Token);\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   }\r
@@ -161,10 +161,12 @@ HttpDns4 (
       Status = EFI_DEVICE_ERROR;\r
       goto Exit;\r
     }\r
-    if (Token.RspData.H2AData->IpCount == 0 || Token.RspData.H2AData->IpList == NULL) {\r
+\r
+    if ((Token.RspData.H2AData->IpCount == 0) || (Token.RspData.H2AData->IpList == NULL)) {\r
       Status = EFI_DEVICE_ERROR;\r
       goto Exit;\r
     }\r
+\r
     //\r
     // We just return the first IP address from DNS protocol.\r
     //\r
@@ -177,10 +179,12 @@ Exit:
   if (Token.Event != NULL) {\r
     gBS->CloseEvent (Token.Event);\r
   }\r
+\r
   if (Token.RspData.H2AData != NULL) {\r
     if (Token.RspData.H2AData->IpList != NULL) {\r
       FreePool (Token.RspData.H2AData->IpList);\r
     }\r
+\r
     FreePool (Token.RspData.H2AData);\r
   }\r
 \r
@@ -226,43 +230,42 @@ Exit:
 **/\r
 EFI_STATUS\r
 HttpDns6 (\r
-  IN     HTTP_PROTOCOL            *HttpInstance,\r
-  IN     CHAR16                   *HostName,\r
-     OUT EFI_IPv6_ADDRESS         *IpAddress\r
+  IN     HTTP_PROTOCOL  *HttpInstance,\r
+  IN     CHAR16         *HostName,\r
+  OUT EFI_IPv6_ADDRESS  *IpAddress\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  HTTP_SERVICE                    *Service;\r
-  EFI_DNS6_PROTOCOL               *Dns6;\r
-  EFI_DNS6_CONFIG_DATA            Dns6ConfigData;\r
-  EFI_DNS6_COMPLETION_TOKEN       Token;\r
-  EFI_HANDLE                      Dns6Handle;\r
-  EFI_IP6_CONFIG_PROTOCOL         *Ip6Config;\r
-  EFI_IPv6_ADDRESS                *DnsServerList;\r
-  UINTN                           DnsServerListCount;\r
-  UINTN                           DataSize;\r
-  BOOLEAN                         IsDone;\r
-\r
+  EFI_STATUS                 Status;\r
+  HTTP_SERVICE               *Service;\r
+  EFI_DNS6_PROTOCOL          *Dns6;\r
+  EFI_DNS6_CONFIG_DATA       Dns6ConfigData;\r
+  EFI_DNS6_COMPLETION_TOKEN  Token;\r
+  EFI_HANDLE                 Dns6Handle;\r
+  EFI_IP6_CONFIG_PROTOCOL    *Ip6Config;\r
+  EFI_IPv6_ADDRESS           *DnsServerList;\r
+  UINTN                      DnsServerListCount;\r
+  UINTN                      DataSize;\r
+  BOOLEAN                    IsDone;\r
 \r
   Service = HttpInstance->Service;\r
   ASSERT (Service != NULL);\r
 \r
-  DnsServerList       = NULL;\r
-  DnsServerListCount  = 0;\r
-  Dns6                = NULL;\r
-  Dns6Handle          = NULL;\r
+  DnsServerList      = NULL;\r
+  DnsServerListCount = 0;\r
+  Dns6               = NULL;\r
+  Dns6Handle         = NULL;\r
   ZeroMem (&Token, sizeof (EFI_DNS6_COMPLETION_TOKEN));\r
 \r
   //\r
   // Get DNS server list from EFI IPv6 Configuration protocol.\r
   //\r
-  Status = gBS->HandleProtocol (Service->ControllerHandle, &gEfiIp6ConfigProtocolGuid, (VOID **) &Ip6Config);\r
+  Status = gBS->HandleProtocol (Service->ControllerHandle, &gEfiIp6ConfigProtocolGuid, (VOID **)&Ip6Config);\r
   if (!EFI_ERROR (Status)) {\r
     //\r
     // Get the required size.\r
     //\r
     DataSize = 0;\r
-    Status = Ip6Config->GetData (Ip6Config, Ip6ConfigDataTypeDnsServer, &DataSize, NULL);\r
+    Status   = Ip6Config->GetData (Ip6Config, Ip6ConfigDataTypeDnsServer, &DataSize, NULL);\r
     if (Status == EFI_BUFFER_TOO_SMALL) {\r
       DnsServerList = AllocatePool (DataSize);\r
       if (DnsServerList == NULL) {\r
@@ -295,7 +298,7 @@ HttpDns6 (
   Status = gBS->OpenProtocol (\r
                   Dns6Handle,\r
                   &gEfiDns6ProtocolGuid,\r
-                  (VOID **) &Dns6,\r
+                  (VOID **)&Dns6,\r
                   Service->Ip6DriverBindingHandle,\r
                   Service->ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -358,10 +361,12 @@ HttpDns6 (
       Status = EFI_DEVICE_ERROR;\r
       goto Exit;\r
     }\r
-    if (Token.RspData.H2AData->IpCount == 0 || Token.RspData.H2AData->IpList == NULL) {\r
+\r
+    if ((Token.RspData.H2AData->IpCount == 0) || (Token.RspData.H2AData->IpList == NULL)) {\r
       Status = EFI_DEVICE_ERROR;\r
       goto Exit;\r
     }\r
+\r
     //\r
     // We just return the first IPv6 address from DNS protocol.\r
     //\r
@@ -374,10 +379,12 @@ Exit:
   if (Token.Event != NULL) {\r
     gBS->CloseEvent (Token.Event);\r
   }\r
+\r
   if (Token.RspData.H2AData != NULL) {\r
     if (Token.RspData.H2AData->IpList != NULL) {\r
       FreePool (Token.RspData.H2AData->IpList);\r
     }\r
+\r
     FreePool (Token.RspData.H2AData);\r
   }\r
 \r
index 3ddcbdf39aee4f4e45a084b3aa909f4c17aa4ab4..11145942f4e86aca7041f110d8b912268051b2ec 100644 (file)
@@ -24,9 +24,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 HttpDns4 (\r
-  IN     HTTP_PROTOCOL            *HttpInstance,\r
-  IN     CHAR16                   *HostName,\r
-     OUT EFI_IPv4_ADDRESS         *IpAddress\r
+  IN     HTTP_PROTOCOL  *HttpInstance,\r
+  IN     CHAR16         *HostName,\r
+  OUT EFI_IPv4_ADDRESS  *IpAddress\r
   );\r
 \r
 /**\r
@@ -44,9 +44,9 @@ HttpDns4 (
 **/\r
 EFI_STATUS\r
 HttpDns6 (\r
-  IN     HTTP_PROTOCOL            *HttpInstance,\r
-  IN     CHAR16                   *HostName,\r
-     OUT EFI_IPv6_ADDRESS         *IpAddress\r
+  IN     HTTP_PROTOCOL  *HttpInstance,\r
+  IN     CHAR16         *HostName,\r
+  OUT EFI_IPv6_ADDRESS  *IpAddress\r
   );\r
 \r
 #endif\r
index a9f5c0949ffe4134d6c8ed6e96c33fdbd650549c..5d918d3c4d8b4acdfedcdf9143a21550c424894f 100644 (file)
 \r
 #include "HttpDriver.h"\r
 \r
-EFI_HTTP_UTILITIES_PROTOCOL *mHttpUtilities = NULL;\r
+EFI_HTTP_UTILITIES_PROTOCOL  *mHttpUtilities = NULL;\r
 \r
 ///\r
 /// Driver Binding Protocol instance\r
 ///\r
-EFI_DRIVER_BINDING_PROTOCOL gHttpDxeIp4DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gHttpDxeIp4DriverBinding = {\r
   HttpDxeIp4DriverBindingSupported,\r
   HttpDxeIp4DriverBindingStart,\r
   HttpDxeIp4DriverBindingStop,\r
@@ -24,7 +24,7 @@ EFI_DRIVER_BINDING_PROTOCOL gHttpDxeIp4DriverBinding = {
   NULL\r
 };\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gHttpDxeIp6DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gHttpDxeIp6DriverBinding = {\r
   HttpDxeIp6DriverBindingSupported,\r
   HttpDxeIp6DriverBindingStart,\r
   HttpDxeIp6DriverBindingStop,\r
@@ -33,7 +33,6 @@ EFI_DRIVER_BINDING_PROTOCOL gHttpDxeIp6DriverBinding = {
   NULL\r
 };\r
 \r
-\r
 /**\r
   Create a HTTP driver service binding private instance.\r
 \r
@@ -47,11 +46,11 @@ EFI_DRIVER_BINDING_PROTOCOL gHttpDxeIp6DriverBinding = {
 **/\r
 EFI_STATUS\r
 HttpCreateService (\r
-  IN  EFI_HANDLE            Controller,\r
-  OUT HTTP_SERVICE          **ServiceData\r
+  IN  EFI_HANDLE    Controller,\r
+  OUT HTTP_SERVICE  **ServiceData\r
   )\r
 {\r
-  HTTP_SERVICE     *HttpService;\r
+  HTTP_SERVICE  *HttpService;\r
 \r
   ASSERT (ServiceData != NULL);\r
   *ServiceData = NULL;\r
@@ -61,11 +60,11 @@ HttpCreateService (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  HttpService->Signature = HTTP_SERVICE_SIGNATURE;\r
-  HttpService->ServiceBinding.CreateChild = HttpServiceBindingCreateChild;\r
+  HttpService->Signature                   = HTTP_SERVICE_SIGNATURE;\r
+  HttpService->ServiceBinding.CreateChild  = HttpServiceBindingCreateChild;\r
   HttpService->ServiceBinding.DestroyChild = HttpServiceBindingDestroyChild;\r
-  HttpService->ControllerHandle = Controller;\r
-  HttpService->ChildrenNumber = 0;\r
+  HttpService->ControllerHandle            = Controller;\r
+  HttpService->ChildrenNumber              = 0;\r
   InitializeListHead (&HttpService->ChildrenList);\r
 \r
   *ServiceData = HttpService;\r
@@ -82,14 +81,14 @@ HttpCreateService (
 **/\r
 VOID\r
 HttpCleanService (\r
-  IN HTTP_SERVICE     *HttpService,\r
-  IN BOOLEAN          UsingIpv6\r
+  IN HTTP_SERVICE  *HttpService,\r
+  IN BOOLEAN       UsingIpv6\r
   )\r
 {\r
-\r
   if (HttpService == NULL) {\r
-    return ;\r
+    return;\r
   }\r
+\r
   if (!UsingIpv6) {\r
     if (HttpService->Tcp4ChildHandle != NULL) {\r
       gBS->CloseProtocol (\r
@@ -127,7 +126,6 @@ HttpCleanService (
       HttpService->Tcp6ChildHandle = NULL;\r
     }\r
   }\r
-\r
 }\r
 \r
 /**\r
@@ -148,14 +146,14 @@ HttpUtilitiesInstalledCallback (
   gBS->LocateProtocol (\r
          &gEfiHttpUtilitiesProtocolGuid,\r
          NULL,\r
-         (VOID **) &mHttpUtilities\r
+         (VOID **)&mHttpUtilities\r
          );\r
 \r
   //\r
   // Close the event if Http utilities protocol is located.\r
   //\r
-  if (mHttpUtilities != NULL && Event != NULL) {\r
-     gBS->CloseEvent (Event);\r
+  if ((mHttpUtilities != NULL) && (Event != NULL)) {\r
+    gBS->CloseEvent (Event);\r
   }\r
 }\r
 \r
@@ -178,13 +176,13 @@ HttpDxeDriverEntryPoint (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS     Status;\r
-  VOID           *Registration;\r
+  EFI_STATUS  Status;\r
+  VOID        *Registration;\r
 \r
   gBS->LocateProtocol (\r
          &gEfiHttpUtilitiesProtocolGuid,\r
          NULL,\r
-         (VOID **) &mHttpUtilities\r
+         (VOID **)&mHttpUtilities\r
          );\r
 \r
   if (mHttpUtilities == NULL) {\r
@@ -230,6 +228,7 @@ HttpDxeDriverEntryPoint (
       &gHttpDxeComponentName2\r
       );\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -247,8 +246,8 @@ HttpDxeDriverEntryPoint (
 EFI_STATUS\r
 EFIAPI\r
 HttpDestroyChildEntryInHandleBuffer (\r
-  IN LIST_ENTRY         *Entry,\r
-  IN VOID               *Context\r
+  IN LIST_ENTRY  *Entry,\r
+  IN VOID        *Context\r
   )\r
 {\r
   HTTP_PROTOCOL                 *HttpInstance;\r
@@ -256,14 +255,14 @@ HttpDestroyChildEntryInHandleBuffer (
   UINTN                         NumberOfChildren;\r
   EFI_HANDLE                    *ChildHandleBuffer;\r
 \r
-  if (Entry == NULL || Context == NULL) {\r
+  if ((Entry == NULL) || (Context == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  HttpInstance = NET_LIST_USER_STRUCT_S (Entry, HTTP_PROTOCOL, Link, HTTP_PROTOCOL_SIGNATURE);\r
-  ServiceBinding    = ((HTTP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ServiceBinding;\r
-  NumberOfChildren  = ((HTTP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->NumberOfChildren;\r
-  ChildHandleBuffer = ((HTTP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ChildHandleBuffer;\r
+  HttpInstance      = NET_LIST_USER_STRUCT_S (Entry, HTTP_PROTOCOL, Link, HTTP_PROTOCOL_SIGNATURE);\r
+  ServiceBinding    = ((HTTP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ServiceBinding;\r
+  NumberOfChildren  = ((HTTP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->NumberOfChildren;\r
+  ChildHandleBuffer = ((HTTP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ChildHandleBuffer;\r
 \r
   if (!NetIsInHandleBuffer (HttpInstance->Handle, NumberOfChildren, ChildHandleBuffer)) {\r
     return EFI_SUCCESS;\r
@@ -295,8 +294,8 @@ HttpDxeSupported (
   IN UINT8                        IpVersion\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_GUID                        *TcpServiceBindingProtocolGuid;\r
+  EFI_STATUS  Status;\r
+  EFI_GUID    *TcpServiceBindingProtocolGuid;\r
 \r
   if (IpVersion == IP_VERSION_4) {\r
     TcpServiceBindingProtocolGuid = &gEfiTcp4ServiceBindingProtocolGuid;\r
@@ -305,13 +304,13 @@ HttpDxeSupported (
   }\r
 \r
   Status = gBS->OpenProtocol (\r
-                ControllerHandle,\r
-                TcpServiceBindingProtocolGuid,\r
-                NULL,\r
-                This->DriverBindingHandle,\r
-                ControllerHandle,\r
-                EFI_OPEN_PROTOCOL_TEST_PROTOCOL\r
-                );\r
+                  ControllerHandle,\r
+                  TcpServiceBindingProtocolGuid,\r
+                  NULL,\r
+                  This->DriverBindingHandle,\r
+                  ControllerHandle,\r
+                  EFI_OPEN_PROTOCOL_TEST_PROTOCOL\r
+                  );\r
 \r
   if (EFI_ERROR (Status)) {\r
     return EFI_UNSUPPORTED;\r
@@ -345,11 +344,11 @@ HttpDxeStart (
   IN UINT8                        IpVersion\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_SERVICE_BINDING_PROTOCOL    *ServiceBinding;\r
-  HTTP_SERVICE                    *HttpService;\r
-  VOID                            *Interface;\r
-  BOOLEAN                         UsingIpv6;\r
+  EFI_STATUS                    Status;\r
+  EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
+  HTTP_SERVICE                  *HttpService;\r
+  VOID                          *Interface;\r
+  BOOLEAN                       UsingIpv6;\r
 \r
   UsingIpv6 = FALSE;\r
 \r
@@ -359,7 +358,7 @@ HttpDxeStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiHttpServiceBindingProtocolGuid,\r
-                  (VOID **) &ServiceBinding,\r
+                  (VOID **)&ServiceBinding,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -420,13 +419,11 @@ HttpDxeStart (
       if (EFI_ERROR (Status)) {\r
         goto ON_ERROR;\r
       }\r
-\r
     } else {\r
       return EFI_ALREADY_STARTED;\r
     }\r
-\r
   } else {\r
-    UsingIpv6 = TRUE;\r
+    UsingIpv6                           = TRUE;\r
     HttpService->Ip6DriverBindingHandle = This->DriverBindingHandle;\r
 \r
     if (HttpService->Tcp6ChildHandle == NULL) {\r
@@ -456,11 +453,9 @@ HttpDxeStart (
       if (EFI_ERROR (Status)) {\r
         goto ON_ERROR;\r
       }\r
-\r
     } else {\r
       return EFI_ALREADY_STARTED;\r
     }\r
-\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -469,14 +464,12 @@ ON_ERROR:
 \r
   if (HttpService != NULL) {\r
     HttpCleanService (HttpService, UsingIpv6);\r
-    if (HttpService->Tcp4ChildHandle == NULL && HttpService->Tcp6ChildHandle == NULL) {\r
+    if ((HttpService->Tcp4ChildHandle == NULL) && (HttpService->Tcp6ChildHandle == NULL)) {\r
       FreePool (HttpService);\r
     }\r
   }\r
 \r
   return Status;\r
-\r
-\r
 }\r
 \r
 /**\r
@@ -505,13 +498,13 @@ HttpDxeStop (
   IN UINT8                        IpVersion\r
   )\r
 {\r
-  EFI_HANDLE                                 NicHandle;\r
-  EFI_STATUS                                 Status;\r
-  EFI_SERVICE_BINDING_PROTOCOL               *ServiceBinding;\r
-  HTTP_SERVICE                               *HttpService;\r
-  LIST_ENTRY                                 *List;\r
-  HTTP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT   Context;\r
-  BOOLEAN                                    UsingIpv6;\r
+  EFI_HANDLE                                NicHandle;\r
+  EFI_STATUS                                Status;\r
+  EFI_SERVICE_BINDING_PROTOCOL              *ServiceBinding;\r
+  HTTP_SERVICE                              *HttpService;\r
+  LIST_ENTRY                                *List;\r
+  HTTP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT  Context;\r
+  BOOLEAN                                   UsingIpv6;\r
 \r
   //\r
   // HTTP driver opens TCP4(6) child, So, Controller is a TCP4(6)\r
@@ -533,35 +526,33 @@ HttpDxeStop (
   Status = gBS->OpenProtocol (\r
                   NicHandle,\r
                   &gEfiHttpServiceBindingProtocolGuid,\r
-                  (VOID **) &ServiceBinding,\r
+                  (VOID **)&ServiceBinding,\r
                   This->DriverBindingHandle,\r
                   NicHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
                   );\r
 \r
   if (!EFI_ERROR (Status)) {\r
-\r
     HttpService = HTTP_SERVICE_FROM_PROTOCOL (ServiceBinding);\r
 \r
     if (NumberOfChildren != 0) {\r
       //\r
       // Destroy the HTTP child instance in ChildHandleBuffer.\r
       //\r
-      List = &HttpService->ChildrenList;\r
+      List                      = &HttpService->ChildrenList;\r
       Context.ServiceBinding    = ServiceBinding;\r
       Context.NumberOfChildren  = NumberOfChildren;\r
       Context.ChildHandleBuffer = ChildHandleBuffer;\r
-      Status = NetDestroyLinkList (\r
-                 List,\r
-                 HttpDestroyChildEntryInHandleBuffer,\r
-                 &Context,\r
-                 NULL\r
-                 );\r
+      Status                    = NetDestroyLinkList (\r
+                                    List,\r
+                                    HttpDestroyChildEntryInHandleBuffer,\r
+                                    &Context,\r
+                                    NULL\r
+                                    );\r
     } else {\r
-\r
       HttpCleanService (HttpService, UsingIpv6);\r
 \r
-      if (HttpService->Tcp4ChildHandle == NULL && HttpService->Tcp6ChildHandle == NULL) {\r
+      if ((HttpService->Tcp4ChildHandle == NULL) && (HttpService->Tcp6ChildHandle == NULL)) {\r
         gBS->UninstallProtocolInterface (\r
                NicHandle,\r
                &gEfiHttpServiceBindingProtocolGuid,\r
@@ -569,12 +560,12 @@ HttpDxeStop (
                );\r
         FreePool (HttpService);\r
       }\r
+\r
       Status = EFI_SUCCESS;\r
     }\r
   }\r
 \r
   return Status;\r
-\r
 }\r
 \r
 /**\r
@@ -787,7 +778,6 @@ HttpDxeIp6DriverBindingSupported (
            RemainingDevicePath,\r
            IP_VERSION_6\r
            );\r
-\r
 }\r
 \r
 /**\r
@@ -885,6 +875,7 @@ HttpDxeIp6DriverBindingStop (
            IP_VERSION_6\r
            );\r
 }\r
+\r
 /**\r
   Creates a child handle and installs a protocol.\r
 \r
@@ -911,10 +902,10 @@ HttpServiceBindingCreateChild (
   IN OUT EFI_HANDLE                *ChildHandle\r
   )\r
 {\r
-  HTTP_SERVICE         *HttpService;\r
-  HTTP_PROTOCOL        *HttpInstance;\r
-  EFI_STATUS           Status;\r
-  EFI_TPL              OldTpl;\r
+  HTTP_SERVICE   *HttpService;\r
+  HTTP_PROTOCOL  *HttpInstance;\r
+  EFI_STATUS     Status;\r
+  EFI_TPL        OldTpl;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -928,7 +919,7 @@ HttpServiceBindingCreateChild (
 \r
   HttpInstance->Signature = HTTP_PROTOCOL_SIGNATURE;\r
   HttpInstance->Service   = HttpService;\r
-  HttpInstance->Method = HttpMethodMax;\r
+  HttpInstance->Method    = HttpMethodMax;\r
 \r
   CopyMem (&HttpInstance->Http, &mEfiHttpTemplate, sizeof (HttpInstance->Http));\r
   NetMapInit (&HttpInstance->TxTokens);\r
@@ -948,7 +939,7 @@ HttpServiceBindingCreateChild (
     goto ON_ERROR;\r
   }\r
 \r
-  HttpInstance->Handle    = *ChildHandle;\r
+  HttpInstance->Handle = *ChildHandle;\r
 \r
   //\r
   // Add it to the HTTP service's child list.\r
@@ -994,25 +985,25 @@ HttpServiceBindingDestroyChild (
   IN EFI_HANDLE                    ChildHandle\r
   )\r
 {\r
-  HTTP_SERVICE             *HttpService;\r
-  HTTP_PROTOCOL            *HttpInstance;\r
-  EFI_HTTP_PROTOCOL        *Http;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
+  HTTP_SERVICE       *HttpService;\r
+  HTTP_PROTOCOL      *HttpInstance;\r
+  EFI_HTTP_PROTOCOL  *Http;\r
+  EFI_STATUS         Status;\r
+  EFI_TPL            OldTpl;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   HttpService = HTTP_SERVICE_FROM_PROTOCOL (This);\r
-  Status = gBS->OpenProtocol (\r
-                  ChildHandle,\r
-                  &gEfiHttpProtocolGuid,\r
-                  (VOID **) &Http,\r
-                  NULL,\r
-                  NULL,\r
-                  EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
-                  );\r
+  Status      = gBS->OpenProtocol (\r
+                       ChildHandle,\r
+                       &gEfiHttpProtocolGuid,\r
+                       (VOID **)&Http,\r
+                       NULL,\r
+                       NULL,\r
+                       EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                       );\r
   if (EFI_ERROR (Status)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
index b701b808583320625bbcd18555edea21480ef7ef..01a6bb7f4b7a8c0d217ada1bd8a0f083bdb6bb2f 100644 (file)
@@ -63,7 +63,7 @@
 //\r
 // Driver Version\r
 //\r
-#define HTTP_DRIVER_VERSION 0xa\r
+#define HTTP_DRIVER_VERSION  0xa\r
 \r
 //\r
 // Protocol instances\r
@@ -71,8 +71,8 @@
 extern EFI_DRIVER_BINDING_PROTOCOL  gHttpDxeIp4DriverBinding;\r
 extern EFI_DRIVER_BINDING_PROTOCOL  gHttpDxeIp6DriverBinding;\r
 \r
-extern EFI_COMPONENT_NAME2_PROTOCOL gHttpDxeComponentName2;\r
-extern EFI_COMPONENT_NAME_PROTOCOL  gHttpDxeComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gHttpDxeComponentName2;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gHttpDxeComponentName;\r
 \r
 extern EFI_HTTP_UTILITIES_PROTOCOL  *mHttpUtilities;\r
 \r
@@ -86,9 +86,9 @@ extern EFI_HTTP_UTILITIES_PROTOCOL  *mHttpUtilities;
 #include "HttpDns.h"\r
 \r
 typedef struct {\r
-  EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
-  UINTN                         NumberOfChildren;\r
-  EFI_HANDLE                    *ChildHandleBuffer;\r
+  EFI_SERVICE_BINDING_PROTOCOL    *ServiceBinding;\r
+  UINTN                           NumberOfChildren;\r
+  EFI_HANDLE                      *ChildHandleBuffer;\r
 } HTTP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT;\r
 \r
 /**\r
index 702482151516ac90dbaa958170f5bc69676bb9a1..d64cd9e965c0d890ea5ddc2e1b2f96e73a3c0924 100644 (file)
@@ -45,11 +45,11 @@ EFI_HTTP_PROTOCOL  mEfiHttpTemplate = {
 EFI_STATUS\r
 EFIAPI\r
 EfiHttpGetModeData (\r
-  IN  EFI_HTTP_PROTOCOL         *This,\r
-  OUT EFI_HTTP_CONFIG_DATA      *HttpConfigData\r
+  IN  EFI_HTTP_PROTOCOL     *This,\r
+  OUT EFI_HTTP_CONFIG_DATA  *HttpConfigData\r
   )\r
 {\r
-  HTTP_PROTOCOL                 *HttpInstance;\r
+  HTTP_PROTOCOL  *HttpInstance;\r
 \r
   //\r
   // Check input parameters.\r
@@ -61,7 +61,8 @@ EfiHttpGetModeData (
   HttpInstance = HTTP_INSTANCE_FROM_PROTOCOL (This);\r
 \r
   if ((HttpConfigData->AccessPoint.IPv6Node == NULL) ||\r
-      (HttpConfigData->AccessPoint.IPv4Node == NULL)) {\r
+      (HttpConfigData->AccessPoint.IPv4Node == NULL))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -78,7 +79,7 @@ EfiHttpGetModeData (
       HttpConfigData->AccessPoint.IPv6Node,\r
       &HttpInstance->Ipv6Node,\r
       sizeof (HttpInstance->Ipv6Node)\r
-    );\r
+      );\r
   } else {\r
     CopyMem (\r
       HttpConfigData->AccessPoint.IPv4Node,\r
@@ -124,20 +125,21 @@ EfiHttpGetModeData (
 EFI_STATUS\r
 EFIAPI\r
 EfiHttpConfigure (\r
-  IN  EFI_HTTP_PROTOCOL         *This,\r
-  IN  EFI_HTTP_CONFIG_DATA      *HttpConfigData OPTIONAL\r
+  IN  EFI_HTTP_PROTOCOL     *This,\r
+  IN  EFI_HTTP_CONFIG_DATA  *HttpConfigData OPTIONAL\r
   )\r
 {\r
-  HTTP_PROTOCOL                 *HttpInstance;\r
-  EFI_STATUS                    Status;\r
+  HTTP_PROTOCOL  *HttpInstance;\r
+  EFI_STATUS     Status;\r
 \r
   //\r
   // Check input parameters.\r
   //\r
-  if (This == NULL ||\r
-      (HttpConfigData != NULL &&\r
-       ((HttpConfigData->LocalAddressIsIPv6 && HttpConfigData->AccessPoint.IPv6Node == NULL) ||\r
-        (!HttpConfigData->LocalAddressIsIPv6 && HttpConfigData->AccessPoint.IPv4Node == NULL)))) {\r
+  if ((This == NULL) ||\r
+      ((HttpConfigData != NULL) &&\r
+       ((HttpConfigData->LocalAddressIsIPv6 && (HttpConfigData->AccessPoint.IPv6Node == NULL)) ||\r
+        (!HttpConfigData->LocalAddressIsIPv6 && (HttpConfigData->AccessPoint.IPv4Node == NULL)))))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -145,7 +147,6 @@ EfiHttpConfigure (
   ASSERT (HttpInstance->Service != NULL);\r
 \r
   if (HttpConfigData != NULL) {\r
-\r
     if (HttpConfigData->HttpVersion >= HttpVersionUnsupported) {\r
       return EFI_UNSUPPORTED;\r
     }\r
@@ -185,7 +186,6 @@ EfiHttpConfigure (
 \r
     HttpInstance->State = HTTP_STATE_HTTP_CONFIGED;\r
     return EFI_SUCCESS;\r
-\r
   } else {\r
     //\r
     // Reset all the resources related to HttpInstance.\r
@@ -196,7 +196,6 @@ EfiHttpConfigure (
   }\r
 }\r
 \r
-\r
 /**\r
   The Request() function queues an HTTP request to this HTTP instance.\r
 \r
@@ -226,41 +225,41 @@ EfiHttpConfigure (
 EFI_STATUS\r
 EFIAPI\r
 EfiHttpRequest (\r
-  IN  EFI_HTTP_PROTOCOL         *This,\r
-  IN  EFI_HTTP_TOKEN            *Token\r
+  IN  EFI_HTTP_PROTOCOL  *This,\r
+  IN  EFI_HTTP_TOKEN     *Token\r
   )\r
 {\r
-  EFI_HTTP_MESSAGE              *HttpMsg;\r
-  EFI_HTTP_REQUEST_DATA         *Request;\r
-  VOID                          *UrlParser;\r
-  EFI_STATUS                    Status;\r
-  CHAR8                         *HostName;\r
-  UINTN                         HostNameSize;\r
-  UINT16                        RemotePort;\r
-  HTTP_PROTOCOL                 *HttpInstance;\r
-  BOOLEAN                       Configure;\r
-  BOOLEAN                       ReConfigure;\r
-  BOOLEAN                       TlsConfigure;\r
-  CHAR8                         *RequestMsg;\r
-  CHAR8                         *Url;\r
-  UINTN                         UrlLen;\r
-  CHAR16                        *HostNameStr;\r
-  HTTP_TOKEN_WRAP               *Wrap;\r
-  CHAR8                         *FileUrl;\r
-  UINTN                         RequestMsgSize;\r
-  EFI_HANDLE                    ImageHandle;\r
+  EFI_HTTP_MESSAGE       *HttpMsg;\r
+  EFI_HTTP_REQUEST_DATA  *Request;\r
+  VOID                   *UrlParser;\r
+  EFI_STATUS             Status;\r
+  CHAR8                  *HostName;\r
+  UINTN                  HostNameSize;\r
+  UINT16                 RemotePort;\r
+  HTTP_PROTOCOL          *HttpInstance;\r
+  BOOLEAN                Configure;\r
+  BOOLEAN                ReConfigure;\r
+  BOOLEAN                TlsConfigure;\r
+  CHAR8                  *RequestMsg;\r
+  CHAR8                  *Url;\r
+  UINTN                  UrlLen;\r
+  CHAR16                 *HostNameStr;\r
+  HTTP_TOKEN_WRAP        *Wrap;\r
+  CHAR8                  *FileUrl;\r
+  UINTN                  RequestMsgSize;\r
+  EFI_HANDLE             ImageHandle;\r
 \r
   //\r
   // Initializations\r
   //\r
-  Url = NULL;\r
-  UrlParser = NULL;\r
-  RemotePort = 0;\r
-  HostName = NULL;\r
-  RequestMsg = NULL;\r
-  HostNameStr = NULL;\r
-  Wrap = NULL;\r
-  FileUrl = NULL;\r
+  Url          = NULL;\r
+  UrlParser    = NULL;\r
+  RemotePort   = 0;\r
+  HostName     = NULL;\r
+  RequestMsg   = NULL;\r
+  HostNameStr  = NULL;\r
+  Wrap         = NULL;\r
+  FileUrl      = NULL;\r
   TlsConfigure = FALSE;\r
 \r
   if ((This == NULL) || (Token == NULL)) {\r
@@ -280,7 +279,8 @@ EfiHttpRequest (
   if ((Request != NULL) && (Request->Method != HttpMethodGet) &&\r
       (Request->Method != HttpMethodHead) && (Request->Method != HttpMethodDelete) &&\r
       (Request->Method != HttpMethodPut) && (Request->Method != HttpMethodPost) &&\r
-      (Request->Method != HttpMethodPatch)) {\r
+      (Request->Method != HttpMethodPatch))\r
+  {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -303,7 +303,8 @@ EfiHttpRequest (
     //\r
     if ((HttpInstance->Method != HttpMethodPut) &&\r
         (HttpInstance->Method != HttpMethodPost) &&\r
-        (HttpInstance->Method != HttpMethodPatch)) {\r
+        (HttpInstance->Method != HttpMethodPatch))\r
+    {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
@@ -317,7 +318,7 @@ EfiHttpRequest (
     //\r
     // We need to have the Message Body for sending the HTTP message across in these cases.\r
     //\r
-    if (HttpMsg->Body == NULL || HttpMsg->BodyLength == 0) {\r
+    if ((HttpMsg->Body == NULL) || (HttpMsg->BodyLength == 0)) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
@@ -337,18 +338,18 @@ EfiHttpRequest (
     //\r
     // Parse the URI of the remote host.\r
     //\r
-    Url = HttpInstance->Url;\r
+    Url    = HttpInstance->Url;\r
     UrlLen = StrLen (Request->Url) + 1;\r
     if (UrlLen > HTTP_URL_BUFFER_LEN) {\r
       Url = AllocateZeroPool (UrlLen);\r
       if (Url == NULL) {\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
+\r
       FreePool (HttpInstance->Url);\r
       HttpInstance->Url = Url;\r
     }\r
 \r
-\r
     UnicodeStrToAsciiStrS (Request->Url, Url, UrlLen);\r
 \r
     //\r
@@ -361,7 +362,6 @@ EfiHttpRequest (
     // HTTP is disabled, return directly if the URI is not HTTPS.\r
     //\r
     if (!PcdGetBool (PcdAllowHttpConnections) && !(HttpInstance->UseHttps)) {\r
-\r
       DEBUG ((DEBUG_ERROR, "EfiHttpRequest: HTTP is disabled.\n"));\r
 \r
       return EFI_ACCESS_DENIED;\r
@@ -370,7 +370,7 @@ EfiHttpRequest (
     //\r
     // Check whether we need to create Tls child and open the TLS protocol.\r
     //\r
-    if (HttpInstance->UseHttps && HttpInstance->TlsChildHandle == NULL) {\r
+    if (HttpInstance->UseHttps && (HttpInstance->TlsChildHandle == NULL)) {\r
       //\r
       // Use TlsSb to create Tls child and open the TLS protocol.\r
       //\r
@@ -394,7 +394,7 @@ EfiHttpRequest (
     }\r
 \r
     UrlParser = NULL;\r
-    Status = HttpParseUrl (Url, (UINT32) AsciiStrLen (Url), FALSE, &UrlParser);\r
+    Status    = HttpParseUrl (Url, (UINT32)AsciiStrLen (Url), FALSE, &UrlParser);\r
     if (EFI_ERROR (Status)) {\r
       goto Error1;\r
     }\r
@@ -407,7 +407,7 @@ EfiHttpRequest (
     if (HttpInstance->LocalAddressIsIPv6) {\r
       HostNameSize = AsciiStrSize (HostName);\r
 \r
-      if (HostNameSize > 2 && HostName[0] == '[' && HostName[HostNameSize - 2] == ']') {\r
+      if ((HostNameSize > 2) && (HostName[0] == '[') && (HostName[HostNameSize - 2] == ']')) {\r
         //\r
         // HostName format is expressed as IPv6, so, remove '[' and ']'.\r
         //\r
@@ -425,6 +425,7 @@ EfiHttpRequest (
         RemotePort = HTTP_DEFAULT_PORT;\r
       }\r
     }\r
+\r
     //\r
     // If Configure is TRUE, it indicates the first time to call Request();\r
     // If ReConfigure is TRUE, it indicates the request URL is not same\r
@@ -443,7 +444,8 @@ EfiHttpRequest (
           (AsciiStrCmp (HttpInstance->RemoteHost, HostName) == 0) &&\r
           (!HttpInstance->UseHttps || (HttpInstance->UseHttps &&\r
                                        !TlsConfigure &&\r
-                                       HttpInstance->TlsSessionState == EfiTlsSessionDataTransferring))) {\r
+                                       (HttpInstance->TlsSessionState == EfiTlsSessionDataTransferring))))\r
+      {\r
         //\r
         // Host Name and port number of the request URL are the same with previous call to Request().\r
         // If Https protocol used, the corresponding SessionState is EfiTlsSessionDataTransferring.\r
@@ -515,7 +517,7 @@ EfiHttpRequest (
 \r
     if (EFI_ERROR (Status)) {\r
       HostNameSize = AsciiStrSize (HostName);\r
-      HostNameStr = AllocateZeroPool (HostNameSize * sizeof (CHAR16));\r
+      HostNameStr  = AllocateZeroPool (HostNameSize * sizeof (CHAR16));\r
       if (HostNameStr == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
         goto Error1;\r
@@ -527,6 +529,7 @@ EfiHttpRequest (
       } else {\r
         Status = HttpDns6 (HttpInstance, HostNameStr, &HttpInstance->RemoteIpv6Addr);\r
       }\r
+\r
       HttpNotify (HttpEventDns, Status);\r
 \r
       FreePool (HostNameStr);\r
@@ -542,7 +545,7 @@ EfiHttpRequest (
     ASSERT (HttpInstance->RemoteHost == NULL);\r
     HttpInstance->RemotePort = RemotePort;\r
     HttpInstance->RemoteHost = HostName;\r
-    HostName = NULL;\r
+    HostName                 = NULL;\r
   }\r
 \r
   if (ReConfigure) {\r
@@ -577,8 +580,8 @@ EfiHttpRequest (
     goto Error1;\r
   }\r
 \r
-  Wrap->HttpToken      = Token;\r
-  Wrap->HttpInstance   = HttpInstance;\r
+  Wrap->HttpToken    = Token;\r
+  Wrap->HttpInstance = HttpInstance;\r
   if (Request != NULL) {\r
     Wrap->TcpWrap.Method = Request->Method;\r
   }\r
@@ -608,13 +611,14 @@ EfiHttpRequest (
   // Create request message.\r
   //\r
   FileUrl = Url;\r
-  if (Url != NULL && *FileUrl != '/') {\r
+  if ((Url != NULL) && (*FileUrl != '/')) {\r
     //\r
     // Convert the absolute-URI to the absolute-path\r
     //\r
     while (*FileUrl != ':') {\r
       FileUrl++;\r
     }\r
+\r
     if ((*(FileUrl+1) == '/') && (*(FileUrl+2) == '/')) {\r
       FileUrl += 3;\r
       while (*FileUrl != '/') {\r
@@ -628,7 +632,7 @@ EfiHttpRequest (
 \r
   Status = HttpGenRequestMessage (HttpMsg, FileUrl, &RequestMsg, &RequestMsgSize);\r
 \r
-  if (EFI_ERROR (Status) || NULL == RequestMsg) {\r
+  if (EFI_ERROR (Status) || (NULL == RequestMsg)) {\r
     goto Error3;\r
   }\r
 \r
@@ -651,7 +655,7 @@ EfiHttpRequest (
   Status = HttpTransmitTcp (\r
              HttpInstance,\r
              Wrap,\r
-             (UINT8*) RequestMsg,\r
+             (UINT8 *)RequestMsg,\r
              RequestMsgSize\r
              );\r
   if (EFI_ERROR (Status)) {\r
@@ -698,6 +702,7 @@ Error2:
     gBS->CloseEvent (Wrap->TcpWrap.Tx4Token.CompletionToken.Event);\r
     Wrap->TcpWrap.Tx4Token.CompletionToken.Event = NULL;\r
   }\r
+\r
   if (NULL != Wrap->TcpWrap.Tx6Token.CompletionToken.Event) {\r
     gBS->CloseEvent (Wrap->TcpWrap.Tx6Token.CompletionToken.Event);\r
     Wrap->TcpWrap.Tx6Token.CompletionToken.Event = NULL;\r
@@ -707,15 +712,16 @@ Error1:
   if (HostName != NULL) {\r
     FreePool (HostName);\r
   }\r
+\r
   if (Wrap != NULL) {\r
     FreePool (Wrap);\r
   }\r
+\r
   if (UrlParser != NULL) {\r
     HttpUrlFreeParser (UrlParser);\r
   }\r
 \r
   return Status;\r
-\r
 }\r
 \r
 /**\r
@@ -732,16 +738,16 @@ Error1:
 EFI_STATUS\r
 EFIAPI\r
 HttpCancelTokens (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   )\r
 {\r
-  EFI_HTTP_TOKEN            *Token;\r
-  HTTP_TOKEN_WRAP           *Wrap;\r
-  HTTP_PROTOCOL             *HttpInstance;\r
+  EFI_HTTP_TOKEN   *Token;\r
+  HTTP_TOKEN_WRAP  *Wrap;\r
+  HTTP_PROTOCOL    *HttpInstance;\r
 \r
-  Token = (EFI_HTTP_TOKEN *) Context;\r
+  Token = (EFI_HTTP_TOKEN *)Context;\r
 \r
   //\r
   // Return EFI_SUCCESS to check the next item in the map if\r
@@ -751,7 +757,7 @@ HttpCancelTokens (
     return EFI_SUCCESS;\r
   }\r
 \r
-  Wrap = (HTTP_TOKEN_WRAP *) Item->Value;\r
+  Wrap = (HTTP_TOKEN_WRAP *)Item->Value;\r
   ASSERT (Wrap != NULL);\r
   HttpInstance = Wrap->HttpInstance;\r
 \r
@@ -808,11 +814,11 @@ HttpCancelTokens (
 **/\r
 EFI_STATUS\r
 HttpCancel (\r
-  IN  HTTP_PROTOCOL             *HttpInstance,\r
-  IN  EFI_HTTP_TOKEN            *Token\r
+  IN  HTTP_PROTOCOL   *HttpInstance,\r
+  IN  EFI_HTTP_TOKEN  *Token\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // First check the tokens queued by EfiHttpRequest().\r
@@ -855,7 +861,6 @@ HttpCancel (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Abort an asynchronous HTTP request or response token.\r
 \r
@@ -881,11 +886,11 @@ HttpCancel (
 EFI_STATUS\r
 EFIAPI\r
 EfiHttpCancel (\r
-  IN  EFI_HTTP_PROTOCOL         *This,\r
-  IN  EFI_HTTP_TOKEN            *Token\r
+  IN  EFI_HTTP_PROTOCOL  *This,\r
+  IN  EFI_HTTP_TOKEN     *Token\r
   )\r
 {\r
-  HTTP_PROTOCOL                 *HttpInstance;\r
+  HTTP_PROTOCOL  *HttpInstance;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -898,7 +903,6 @@ EfiHttpCancel (
   }\r
 \r
   return HttpCancel (HttpInstance, Token);\r
-\r
 }\r
 \r
 /**\r
@@ -918,28 +922,28 @@ EfiHttpCancel (
 EFI_STATUS\r
 EFIAPI\r
 HttpBodyParserCallback (\r
-  IN HTTP_BODY_PARSE_EVENT      EventType,\r
-  IN CHAR8                      *Data,\r
-  IN UINTN                      Length,\r
-  IN VOID                       *Context\r
+  IN HTTP_BODY_PARSE_EVENT  EventType,\r
+  IN CHAR8                  *Data,\r
+  IN UINTN                  Length,\r
+  IN VOID                   *Context\r
   )\r
 {\r
-  HTTP_CALLBACK_DATA            *CallbackData;\r
-  HTTP_TOKEN_WRAP               *Wrap;\r
-  UINTN                         BodyLength;\r
-  CHAR8                         *Body;\r
+  HTTP_CALLBACK_DATA  *CallbackData;\r
+  HTTP_TOKEN_WRAP     *Wrap;\r
+  UINTN               BodyLength;\r
+  CHAR8               *Body;\r
 \r
   if (EventType != BodyParseEventOnComplete) {\r
     return EFI_SUCCESS;\r
   }\r
 \r
-  if (Data == NULL || Length != 0 || Context == NULL) {\r
+  if ((Data == NULL) || (Length != 0) || (Context == NULL)) {\r
     return EFI_SUCCESS;\r
   }\r
 \r
-  CallbackData = (HTTP_CALLBACK_DATA *) Context;\r
+  CallbackData = (HTTP_CALLBACK_DATA *)Context;\r
 \r
-  Wrap       = (HTTP_TOKEN_WRAP *) (CallbackData->Wrap);\r
+  Wrap       = (HTTP_TOKEN_WRAP *)(CallbackData->Wrap);\r
   Body       = CallbackData->ParseData;\r
   BodyLength = CallbackData->ParseDataLength;\r
 \r
@@ -965,35 +969,35 @@ HttpBodyParserCallback (
 **/\r
 EFI_STATUS\r
 HttpResponseWorker (\r
-  IN  HTTP_TOKEN_WRAP           *Wrap\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_HTTP_MESSAGE              *HttpMsg;\r
-  CHAR8                         *EndofHeader;\r
-  CHAR8                         *HttpHeaders;\r
-  UINTN                         SizeofHeaders;\r
-  UINTN                         BufferSize;\r
-  UINTN                         StatusCode;\r
-  CHAR8                         *Tmp;\r
-  CHAR8                         *HeaderTmp;\r
-  CHAR8                         *StatusCodeStr;\r
-  UINTN                         BodyLen;\r
-  HTTP_PROTOCOL                 *HttpInstance;\r
-  EFI_HTTP_TOKEN                *Token;\r
-  NET_MAP_ITEM                  *Item;\r
-  HTTP_TOKEN_WRAP               *ValueInItem;\r
-  UINTN                         HdrLen;\r
-  NET_FRAGMENT                  Fragment;\r
-  UINT32                        TimeoutValue;\r
-\r
-  if (Wrap == NULL || Wrap->HttpInstance == NULL) {\r
+  EFI_STATUS        Status;\r
+  EFI_HTTP_MESSAGE  *HttpMsg;\r
+  CHAR8             *EndofHeader;\r
+  CHAR8             *HttpHeaders;\r
+  UINTN             SizeofHeaders;\r
+  UINTN             BufferSize;\r
+  UINTN             StatusCode;\r
+  CHAR8             *Tmp;\r
+  CHAR8             *HeaderTmp;\r
+  CHAR8             *StatusCodeStr;\r
+  UINTN             BodyLen;\r
+  HTTP_PROTOCOL     *HttpInstance;\r
+  EFI_HTTP_TOKEN    *Token;\r
+  NET_MAP_ITEM      *Item;\r
+  HTTP_TOKEN_WRAP   *ValueInItem;\r
+  UINTN             HdrLen;\r
+  NET_FRAGMENT      Fragment;\r
+  UINT32            TimeoutValue;\r
+\r
+  if ((Wrap == NULL) || (Wrap->HttpInstance == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   HttpInstance = Wrap->HttpInstance;\r
-  Token = Wrap->HttpToken;\r
-  HttpMsg = Token->Message;\r
+  Token        = Wrap->HttpToken;\r
+  HttpMsg      = Token->Message;\r
 \r
   HttpInstance->EndofHeader = NULL;\r
   HttpInstance->HttpHeaders = NULL;\r
@@ -1014,7 +1018,7 @@ HttpResponseWorker (
       //\r
       // The data is stored at [NextMsg, CacheBody + CacheLen].\r
       //\r
-      HdrLen = HttpInstance->CacheBody + HttpInstance->CacheLen - HttpInstance->NextMsg;\r
+      HdrLen      = HttpInstance->CacheBody + HttpInstance->CacheLen - HttpInstance->NextMsg;\r
       HttpHeaders = AllocateZeroPool (HdrLen);\r
       if (HttpHeaders == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
@@ -1026,8 +1030,8 @@ HttpResponseWorker (
       HttpInstance->CacheBody   = NULL;\r
       HttpInstance->NextMsg     = NULL;\r
       HttpInstance->CacheOffset = 0;\r
-      SizeofHeaders = HdrLen;\r
-      BufferSize = HttpInstance->CacheLen;\r
+      SizeofHeaders             = HdrLen;\r
+      BufferSize                = HttpInstance->CacheLen;\r
 \r
       //\r
       // Check whether we cached the whole HTTP headers.\r
@@ -1038,7 +1042,6 @@ HttpResponseWorker (
     HttpInstance->EndofHeader = &EndofHeader;\r
     HttpInstance->HttpHeaders = &HttpHeaders;\r
 \r
-\r
     if (HttpInstance->TimeoutEvent == NULL) {\r
       //\r
       // Create TimeoutEvent for response\r
@@ -1131,9 +1134,9 @@ HttpResponseWorker (
     }\r
 \r
     HttpMsg->Data.Response->StatusCode = HttpMappingToStatusCode (StatusCode);\r
-    HttpInstance->StatusCode = StatusCode;\r
+    HttpInstance->StatusCode           = StatusCode;\r
 \r
-    Status = EFI_NOT_READY;\r
+    Status      = EFI_NOT_READY;\r
     ValueInItem = NULL;\r
 \r
     //\r
@@ -1144,8 +1147,8 @@ HttpResponseWorker (
     // Hence, check that case before doing a NetMapRemoveHead.\r
     //\r
     if (!NetMapIsEmpty (&HttpInstance->TxTokens)) {\r
-      NetMapRemoveHead (&HttpInstance->TxTokens, (VOID**) &ValueInItem);\r
-      if (ValueInItem == NULL)  {\r
+      NetMapRemoveHead (&HttpInstance->TxTokens, (VOID **)&ValueInItem);\r
+      if (ValueInItem == NULL) {\r
         goto Error;\r
       }\r
 \r
@@ -1193,7 +1196,6 @@ HttpResponseWorker (
       FreePool (HttpHeaders);\r
       HttpHeaders = NULL;\r
 \r
-\r
       //\r
       // Init message-body parser by header information.\r
       //\r
@@ -1203,7 +1205,7 @@ HttpResponseWorker (
                  HttpMsg->HeaderCount,\r
                  HttpMsg->Headers,\r
                  HttpBodyParserCallback,\r
-                 (VOID *) (&HttpInstance->CallbackData),\r
+                 (VOID *)(&HttpInstance->CallbackData),\r
                  &HttpInstance->MsgParser\r
                  );\r
       if (EFI_ERROR (Status)) {\r
@@ -1217,8 +1219,8 @@ HttpResponseWorker (
         //\r
         // Record the CallbackData data.\r
         //\r
-        HttpInstance->CallbackData.Wrap = (VOID *) Wrap;\r
-        HttpInstance->CallbackData.ParseData = (VOID *) HttpInstance->CacheBody;\r
+        HttpInstance->CallbackData.Wrap            = (VOID *)Wrap;\r
+        HttpInstance->CallbackData.ParseData       = (VOID *)HttpInstance->CacheBody;\r
         HttpInstance->CallbackData.ParseDataLength = HttpInstance->CacheLen;\r
 \r
         //\r
@@ -1279,7 +1281,7 @@ HttpResponseWorker (
         //\r
         CopyMem (HttpMsg->Body, HttpInstance->CacheBody + HttpInstance->CacheOffset, BodyLen);\r
         HttpInstance->CacheOffset = BodyLen + HttpInstance->CacheOffset;\r
-        HttpMsg->BodyLength = BodyLen;\r
+        HttpMsg->BodyLength       = BodyLen;\r
 \r
         if (HttpInstance->NextMsg == NULL) {\r
           //\r
@@ -1291,6 +1293,7 @@ HttpResponseWorker (
           HttpInstance->CacheOffset = 0;\r
         }\r
       }\r
+\r
       //\r
       // Return since we already received required data.\r
       //\r
@@ -1298,12 +1301,12 @@ HttpResponseWorker (
       goto Exit;\r
     }\r
 \r
-    if (BodyLen == 0 && HttpInstance->MsgParser == NULL) {\r
+    if ((BodyLen == 0) && (HttpInstance->MsgParser == NULL)) {\r
       //\r
       // We received a complete HTTP message, and we don't have more data to return to caller.\r
       //\r
       HttpMsg->BodyLength = 0;\r
-      Status = EFI_SUCCESS;\r
+      Status              = EFI_SUCCESS;\r
       goto Exit;\r
     }\r
   }\r
@@ -1319,7 +1322,6 @@ HttpResponseWorker (
     if (EFI_ERROR (Status)) {\r
       goto Error2;\r
     }\r
-\r
   } else {\r
     if (HttpInstance->TimeoutEvent == NULL) {\r
       //\r
@@ -1361,15 +1363,15 @@ HttpResponseWorker (
     //\r
     // Process the received the body packet.\r
     //\r
-    HttpMsg->BodyLength = MIN ((UINTN) Fragment.Len, HttpMsg->BodyLength);\r
+    HttpMsg->BodyLength = MIN ((UINTN)Fragment.Len, HttpMsg->BodyLength);\r
 \r
     CopyMem (HttpMsg->Body, Fragment.Bulk, HttpMsg->BodyLength);\r
 \r
     //\r
     // Record the CallbackData data.\r
     //\r
-    HttpInstance->CallbackData.Wrap = (VOID *) Wrap;\r
-    HttpInstance->CallbackData.ParseData = HttpMsg->Body;\r
+    HttpInstance->CallbackData.Wrap            = (VOID *)Wrap;\r
+    HttpInstance->CallbackData.ParseData       = HttpMsg->Body;\r
     HttpInstance->CallbackData.ParseDataLength = HttpMsg->BodyLength;\r
 \r
     //\r
@@ -1396,7 +1398,7 @@ HttpResponseWorker (
     // Check whether there is the next message header in the HttpMsg->Body.\r
     //\r
     if (HttpInstance->NextMsg != NULL) {\r
-      HttpMsg->BodyLength = HttpInstance->NextMsg - (CHAR8 *) HttpMsg->Body;\r
+      HttpMsg->BodyLength = HttpInstance->NextMsg - (CHAR8 *)HttpMsg->Body;\r
     }\r
 \r
     HttpInstance->CacheLen = Fragment.Len - HttpMsg->BodyLength;\r
@@ -1491,10 +1493,8 @@ Error:
   gBS->SignalEvent (Token->Event);\r
 \r
   return Status;\r
-\r
 }\r
 \r
-\r
 /**\r
   The Response() function queues an HTTP response to this HTTP instance, similar to\r
   Receive() function in the EFI TCP driver. When the HTTP response is received successfully,\r
@@ -1545,14 +1545,14 @@ Error:
 EFI_STATUS\r
 EFIAPI\r
 EfiHttpResponse (\r
-  IN  EFI_HTTP_PROTOCOL         *This,\r
-  IN  EFI_HTTP_TOKEN            *Token\r
+  IN  EFI_HTTP_PROTOCOL  *This,\r
+  IN  EFI_HTTP_TOKEN     *Token\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_HTTP_MESSAGE              *HttpMsg;\r
-  HTTP_PROTOCOL                 *HttpInstance;\r
-  HTTP_TOKEN_WRAP               *Wrap;\r
+  EFI_STATUS        Status;\r
+  EFI_HTTP_MESSAGE  *HttpMsg;\r
+  HTTP_PROTOCOL     *HttpInstance;\r
+  HTTP_TOKEN_WRAP   *Wrap;\r
 \r
   if ((This == NULL) || (Token == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1619,6 +1619,7 @@ Error:
     if (Wrap->TcpWrap.Rx6Token.CompletionToken.Event != NULL) {\r
       gBS->CloseEvent (Wrap->TcpWrap.Rx6Token.CompletionToken.Event);\r
     }\r
+\r
     FreePool (Wrap);\r
   }\r
 \r
@@ -1648,11 +1649,11 @@ Error:
 EFI_STATUS\r
 EFIAPI\r
 EfiHttpPoll (\r
-  IN  EFI_HTTP_PROTOCOL         *This\r
+  IN  EFI_HTTP_PROTOCOL  *This\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  HTTP_PROTOCOL                 *HttpInstance;\r
+  EFI_STATUS     Status;\r
+  HTTP_PROTOCOL  *HttpInstance;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1668,11 +1669,13 @@ EfiHttpPoll (
     if (HttpInstance->Tcp6 == NULL) {\r
       return EFI_NOT_STARTED;\r
     }\r
+\r
     Status = HttpInstance->Tcp6->Poll (HttpInstance->Tcp6);\r
   } else {\r
     if (HttpInstance->Tcp4 == NULL) {\r
       return EFI_NOT_STARTED;\r
     }\r
+\r
     Status = HttpInstance->Tcp4->Poll (HttpInstance->Tcp4);\r
   }\r
 \r
index ec6992f4aeb9df529ba35e23293a1f519a8d1f84..61fe2aaa15190dae9c1ee4ff98fd881c43192ea8 100644 (file)
 #ifndef __EFI_HTTP_IMPL_H__\r
 #define __EFI_HTTP_IMPL_H__\r
 \r
-#define HTTP_DEFAULT_PORT        80\r
-#define HTTP_END_OF_HDR_STR      "\r\n\r\n"\r
-#define HTTP_CRLF_STR            "\r\n"\r
-#define HTTP_VERSION_STR         HTTP_VERSION\r
-#define HTTP_VERSION_CRLF_STR    " HTTP/1.1\r\n"\r
-#define HTTP_ERROR_OR_NOT_SUPPORT_STATUS_CODE         300\r
-\r
+#define HTTP_DEFAULT_PORT                      80\r
+#define HTTP_END_OF_HDR_STR                    "\r\n\r\n"\r
+#define HTTP_CRLF_STR                          "\r\n"\r
+#define HTTP_VERSION_STR                       HTTP_VERSION\r
+#define HTTP_VERSION_CRLF_STR                  " HTTP/1.1\r\n"\r
+#define HTTP_ERROR_OR_NOT_SUPPORT_STATUS_CODE  300\r
 \r
 /**\r
   Returns the operational parameters for the current HTTP child instance.\r
@@ -45,8 +44,8 @@
 EFI_STATUS\r
 EFIAPI\r
 EfiHttpGetModeData (\r
-  IN  EFI_HTTP_PROTOCOL         *This,\r
-  OUT EFI_HTTP_CONFIG_DATA      *HttpConfigData\r
+  IN  EFI_HTTP_PROTOCOL     *This,\r
+  OUT EFI_HTTP_CONFIG_DATA  *HttpConfigData\r
   );\r
 \r
 /**\r
@@ -83,8 +82,8 @@ EfiHttpGetModeData (
 EFI_STATUS\r
 EFIAPI\r
 EfiHttpConfigure (\r
-  IN  EFI_HTTP_PROTOCOL         *This,\r
-  IN  EFI_HTTP_CONFIG_DATA      *HttpConfigData\r
+  IN  EFI_HTTP_PROTOCOL     *This,\r
+  IN  EFI_HTTP_CONFIG_DATA  *HttpConfigData\r
   );\r
 \r
 /**\r
@@ -116,8 +115,8 @@ EfiHttpConfigure (
 EFI_STATUS\r
 EFIAPI\r
 EfiHttpRequest (\r
-  IN  EFI_HTTP_PROTOCOL         *This,\r
-  IN  EFI_HTTP_TOKEN            *Token\r
+  IN  EFI_HTTP_PROTOCOL  *This,\r
+  IN  EFI_HTTP_TOKEN     *Token\r
   );\r
 \r
 /**\r
@@ -144,8 +143,8 @@ EfiHttpRequest (
 EFI_STATUS\r
 EFIAPI\r
 EfiHttpCancel (\r
-  IN  EFI_HTTP_PROTOCOL         *This,\r
-  IN  EFI_HTTP_TOKEN            *Token\r
+  IN  EFI_HTTP_PROTOCOL  *This,\r
+  IN  EFI_HTTP_TOKEN     *Token\r
   );\r
 \r
 /**\r
@@ -198,8 +197,8 @@ EfiHttpCancel (
 EFI_STATUS\r
 EFIAPI\r
 EfiHttpResponse (\r
-  IN  EFI_HTTP_PROTOCOL         *This,\r
-  IN  EFI_HTTP_TOKEN            *Token\r
+  IN  EFI_HTTP_PROTOCOL  *This,\r
+  IN  EFI_HTTP_TOKEN     *Token\r
   );\r
 \r
 /**\r
@@ -225,7 +224,7 @@ EfiHttpResponse (
 EFI_STATUS\r
 EFIAPI\r
 EfiHttpPoll (\r
-  IN  EFI_HTTP_PROTOCOL         *This\r
+  IN  EFI_HTTP_PROTOCOL  *This\r
   );\r
 \r
 extern EFI_HTTP_PROTOCOL  mEfiHttpTemplate;\r
index 227c093f20a1f021be9a7672bdeca54a7a8eca52..9457dd2623d3b54b522e5886193fe64f1802f6fe 100644 (file)
@@ -24,10 +24,10 @@ HttpCommonNotify (
   )\r
 {\r
   if ((Event == NULL) || (Context == NULL)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
-  *((BOOLEAN *) Context) = TRUE;\r
+  *((BOOLEAN *)Context) = TRUE;\r
 }\r
 \r
 /**\r
@@ -39,34 +39,33 @@ HttpCommonNotify (
 VOID\r
 EFIAPI\r
 HttpTcpTransmitNotifyDpc (\r
-  IN VOID       *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  HTTP_TOKEN_WRAP          *Wrap;\r
-  HTTP_PROTOCOL            *HttpInstance;\r
+  HTTP_TOKEN_WRAP  *Wrap;\r
+  HTTP_PROTOCOL    *HttpInstance;\r
 \r
   if (Context == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
-  Wrap         = (HTTP_TOKEN_WRAP *) Context;\r
+  Wrap         = (HTTP_TOKEN_WRAP *)Context;\r
   HttpInstance = Wrap->HttpInstance;\r
 \r
   if (!HttpInstance->LocalAddressIsIPv6) {\r
-      Wrap->HttpToken->Status = Wrap->TcpWrap.Tx4Token.CompletionToken.Status;\r
-      gBS->SignalEvent (Wrap->HttpToken->Event);\r
-\r
-      //\r
-      // Free resources.\r
-      //\r
-      if (Wrap->TcpWrap.Tx4Token.Packet.TxData->FragmentTable[0].FragmentBuffer != NULL) {\r
-        FreePool (Wrap->TcpWrap.Tx4Token.Packet.TxData->FragmentTable[0].FragmentBuffer);\r
-      }\r
+    Wrap->HttpToken->Status = Wrap->TcpWrap.Tx4Token.CompletionToken.Status;\r
+    gBS->SignalEvent (Wrap->HttpToken->Event);\r
 \r
-      if (Wrap->TcpWrap.Tx4Token.CompletionToken.Event != NULL) {\r
-        gBS->CloseEvent (Wrap->TcpWrap.Tx4Token.CompletionToken.Event);\r
-      }\r
+    //\r
+    // Free resources.\r
+    //\r
+    if (Wrap->TcpWrap.Tx4Token.Packet.TxData->FragmentTable[0].FragmentBuffer != NULL) {\r
+      FreePool (Wrap->TcpWrap.Tx4Token.Packet.TxData->FragmentTable[0].FragmentBuffer);\r
+    }\r
 \r
+    if (Wrap->TcpWrap.Tx4Token.CompletionToken.Event != NULL) {\r
+      gBS->CloseEvent (Wrap->TcpWrap.Tx4Token.CompletionToken.Event);\r
+    }\r
   } else {\r
     Wrap->HttpToken->Status = Wrap->TcpWrap.Tx6Token.CompletionToken.Status;\r
     gBS->SignalEvent (Wrap->HttpToken->Event);\r
@@ -83,14 +82,12 @@ HttpTcpTransmitNotifyDpc (
     }\r
   }\r
 \r
-\r
   Wrap->TcpWrap.IsTxDone = TRUE;\r
 \r
   //\r
   // Check pending TxTokens and sent out.\r
   //\r
   NetMapIterate (&Wrap->HttpInstance->TxTokens, HttpTcpTransmit, NULL);\r
-\r
 }\r
 \r
 /**\r
@@ -103,8 +100,8 @@ HttpTcpTransmitNotifyDpc (
 VOID\r
 EFIAPI\r
 HttpTcpTransmitNotify (\r
-  IN EFI_EVENT                Event,\r
-  IN VOID                     *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   //\r
@@ -122,21 +119,21 @@ HttpTcpTransmitNotify (
 VOID\r
 EFIAPI\r
 HttpTcpReceiveNotifyDpc (\r
-  IN VOID       *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  HTTP_TOKEN_WRAP          *Wrap;\r
-  NET_MAP_ITEM             *Item;\r
-  UINTN                    Length;\r
-  EFI_STATUS               Status;\r
-  HTTP_PROTOCOL            *HttpInstance;\r
-  BOOLEAN                  UsingIpv6;\r
+  HTTP_TOKEN_WRAP  *Wrap;\r
+  NET_MAP_ITEM     *Item;\r
+  UINTN            Length;\r
+  EFI_STATUS       Status;\r
+  HTTP_PROTOCOL    *HttpInstance;\r
+  BOOLEAN          UsingIpv6;\r
 \r
   if (Context == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
-  Wrap = (HTTP_TOKEN_WRAP *) Context;\r
+  Wrap         = (HTTP_TOKEN_WRAP *)Context;\r
   HttpInstance = Wrap->HttpInstance;\r
   UsingIpv6    = HttpInstance->LocalAddressIsIPv6;\r
 \r
@@ -157,9 +154,8 @@ HttpTcpReceiveNotifyDpc (
       FreePool (Wrap);\r
       Wrap = NULL;\r
 \r
-      return ;\r
+      return;\r
     }\r
-\r
   } else {\r
     gBS->CloseEvent (Wrap->TcpWrap.Rx4Token.CompletionToken.Event);\r
     Wrap->TcpWrap.Rx4Token.CompletionToken.Event = NULL;\r
@@ -177,7 +173,7 @@ HttpTcpReceiveNotifyDpc (
       FreePool (Wrap);\r
       Wrap = NULL;\r
 \r
-      return ;\r
+      return;\r
     }\r
   }\r
 \r
@@ -186,16 +182,16 @@ HttpTcpReceiveNotifyDpc (
   //\r
   ASSERT (HttpInstance->MsgParser != NULL);\r
   if (UsingIpv6) {\r
-    Length = (UINTN) Wrap->TcpWrap.Rx6Data.FragmentTable[0].FragmentLength;\r
+    Length = (UINTN)Wrap->TcpWrap.Rx6Data.FragmentTable[0].FragmentLength;\r
   } else {\r
-    Length = (UINTN) Wrap->TcpWrap.Rx4Data.FragmentTable[0].FragmentLength;\r
+    Length = (UINTN)Wrap->TcpWrap.Rx4Data.FragmentTable[0].FragmentLength;\r
   }\r
 \r
   //\r
   // Record the CallbackData data.\r
   //\r
-  HttpInstance->CallbackData.Wrap = (VOID *) Wrap;\r
-  HttpInstance->CallbackData.ParseData = Wrap->HttpToken->Message->Body;\r
+  HttpInstance->CallbackData.Wrap            = (VOID *)Wrap;\r
+  HttpInstance->CallbackData.ParseData       = Wrap->HttpToken->Message->Body;\r
   HttpInstance->CallbackData.ParseDataLength = Length;\r
 \r
   //\r
@@ -207,7 +203,7 @@ HttpTcpReceiveNotifyDpc (
              Wrap->HttpToken->Message->Body\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   if (HttpIsMessageComplete (HttpInstance->MsgParser)) {\r
@@ -225,15 +221,16 @@ HttpTcpReceiveNotifyDpc (
   //\r
   if (HttpInstance->NextMsg != NULL) {\r
     Wrap->HttpToken->Message->BodyLength = HttpInstance->NextMsg -\r
-                                           (CHAR8 *) Wrap->HttpToken->Message->Body;\r
+                                           (CHAR8 *)Wrap->HttpToken->Message->Body;\r
     HttpInstance->CacheLen = Length - Wrap->HttpToken->Message->BodyLength;\r
     if (HttpInstance->CacheLen != 0) {\r
       HttpInstance->CacheBody = AllocateZeroPool (HttpInstance->CacheLen);\r
       if (HttpInstance->CacheBody == NULL) {\r
-        return ;\r
+        return;\r
       }\r
+\r
       CopyMem (HttpInstance->CacheBody, HttpInstance->NextMsg, HttpInstance->CacheLen);\r
-      HttpInstance->NextMsg = HttpInstance->CacheBody;\r
+      HttpInstance->NextMsg     = HttpInstance->CacheBody;\r
       HttpInstance->CacheOffset = 0;\r
     }\r
   }\r
@@ -243,7 +240,6 @@ HttpTcpReceiveNotifyDpc (
     NetMapRemoveItem (&Wrap->HttpInstance->RxTokens, Item, NULL);\r
   }\r
 \r
-\r
   Wrap->TcpWrap.IsRxDone = TRUE;\r
   if (UsingIpv6) {\r
     Wrap->HttpToken->Status = Wrap->TcpWrap.Rx6Token.CompletionToken.Status;\r
@@ -251,7 +247,6 @@ HttpTcpReceiveNotifyDpc (
     Wrap->HttpToken->Status = Wrap->TcpWrap.Rx4Token.CompletionToken.Status;\r
   }\r
 \r
-\r
   gBS->SignalEvent (Wrap->HttpToken->Event);\r
 \r
   //\r
@@ -273,8 +268,8 @@ HttpTcpReceiveNotifyDpc (
 VOID\r
 EFIAPI\r
 HttpTcpReceiveNotify (\r
-  IN EFI_EVENT                Event,\r
-  IN VOID                     *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   //\r
@@ -294,10 +289,10 @@ HttpTcpReceiveNotify (
 **/\r
 EFI_STATUS\r
 HttpCreateTcpConnCloseEvent (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (!HttpInstance->LocalAddressIsIPv6) {\r
     //\r
@@ -327,7 +322,6 @@ HttpCreateTcpConnCloseEvent (
     if (EFI_ERROR (Status)) {\r
       goto ERROR;\r
     }\r
-\r
   } else {\r
     //\r
     // Create events for various asynchronous operations.\r
@@ -369,7 +363,6 @@ ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Close events in the TCP connection token and TCP close token.\r
 \r
@@ -378,7 +371,7 @@ ERROR:
 **/\r
 VOID\r
 HttpCloseTcpConnCloseEvent (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
   ASSERT (HttpInstance != NULL);\r
@@ -390,10 +383,9 @@ HttpCloseTcpConnCloseEvent (
     }\r
 \r
     if (NULL != HttpInstance->Tcp6CloseToken.CompletionToken.Event) {\r
-      gBS->CloseEvent(HttpInstance->Tcp6CloseToken.CompletionToken.Event);\r
+      gBS->CloseEvent (HttpInstance->Tcp6CloseToken.CompletionToken.Event);\r
       HttpInstance->Tcp6CloseToken.CompletionToken.Event = NULL;\r
     }\r
-\r
   } else {\r
     if (NULL != HttpInstance->Tcp4ConnToken.CompletionToken.Event) {\r
       gBS->CloseEvent (HttpInstance->Tcp4ConnToken.CompletionToken.Event);\r
@@ -401,11 +393,10 @@ HttpCloseTcpConnCloseEvent (
     }\r
 \r
     if (NULL != HttpInstance->Tcp4CloseToken.CompletionToken.Event) {\r
-      gBS->CloseEvent(HttpInstance->Tcp4CloseToken.CompletionToken.Event);\r
+      gBS->CloseEvent (HttpInstance->Tcp4CloseToken.CompletionToken.Event);\r
       HttpInstance->Tcp4CloseToken.CompletionToken.Event = NULL;\r
     }\r
   }\r
-\r
 }\r
 \r
 /**\r
@@ -419,12 +410,12 @@ HttpCloseTcpConnCloseEvent (
 **/\r
 EFI_STATUS\r
 HttpCreateTcpTxEvent (\r
-  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  HTTP_PROTOCOL            *HttpInstance;\r
-  HTTP_TCP_TOKEN_WRAP      *TcpWrap;\r
+  EFI_STATUS           Status;\r
+  HTTP_PROTOCOL        *HttpInstance;\r
+  HTTP_TCP_TOKEN_WRAP  *TcpWrap;\r
 \r
   HttpInstance = Wrap->HttpInstance;\r
   TcpWrap      = &Wrap->TcpWrap;\r
@@ -441,12 +432,11 @@ HttpCreateTcpTxEvent (
       return Status;\r
     }\r
 \r
-    TcpWrap->Tx4Data.Push = TRUE;\r
-    TcpWrap->Tx4Data.Urgent = FALSE;\r
-    TcpWrap->Tx4Data.FragmentCount = 1;\r
-    TcpWrap->Tx4Token.Packet.TxData = &Wrap->TcpWrap.Tx4Data;\r
+    TcpWrap->Tx4Data.Push                    = TRUE;\r
+    TcpWrap->Tx4Data.Urgent                  = FALSE;\r
+    TcpWrap->Tx4Data.FragmentCount           = 1;\r
+    TcpWrap->Tx4Token.Packet.TxData          = &Wrap->TcpWrap.Tx4Data;\r
     TcpWrap->Tx4Token.CompletionToken.Status = EFI_NOT_READY;\r
-\r
   } else {\r
     Status = gBS->CreateEvent (\r
                     EVT_NOTIFY_SIGNAL,\r
@@ -459,12 +449,11 @@ HttpCreateTcpTxEvent (
       return Status;\r
     }\r
 \r
-    TcpWrap->Tx6Data.Push   = TRUE;\r
-    TcpWrap->Tx6Data.Urgent = FALSE;\r
-    TcpWrap->Tx6Data.FragmentCount  = 1;\r
-    TcpWrap->Tx6Token.Packet.TxData = &Wrap->TcpWrap.Tx6Data;\r
-    TcpWrap->Tx6Token.CompletionToken.Status =EFI_NOT_READY;\r
-\r
+    TcpWrap->Tx6Data.Push                    = TRUE;\r
+    TcpWrap->Tx6Data.Urgent                  = FALSE;\r
+    TcpWrap->Tx6Data.FragmentCount           = 1;\r
+    TcpWrap->Tx6Token.Packet.TxData          = &Wrap->TcpWrap.Tx6Data;\r
+    TcpWrap->Tx6Token.CompletionToken.Status = EFI_NOT_READY;\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -481,10 +470,10 @@ HttpCreateTcpTxEvent (
 **/\r
 EFI_STATUS\r
 HttpCreateTcpRxEventForHeader (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (!HttpInstance->LocalAddressIsIPv6) {\r
     Status = gBS->CreateEvent (\r
@@ -498,10 +487,9 @@ HttpCreateTcpRxEventForHeader (
       return Status;\r
     }\r
 \r
-    HttpInstance->Rx4Data.FragmentCount = 1;\r
-    HttpInstance->Rx4Token.Packet.RxData = &HttpInstance->Rx4Data;\r
+    HttpInstance->Rx4Data.FragmentCount           = 1;\r
+    HttpInstance->Rx4Token.Packet.RxData          = &HttpInstance->Rx4Data;\r
     HttpInstance->Rx4Token.CompletionToken.Status = EFI_NOT_READY;\r
-\r
   } else {\r
     Status = gBS->CreateEvent (\r
                     EVT_NOTIFY_SIGNAL,\r
@@ -514,13 +502,11 @@ HttpCreateTcpRxEventForHeader (
       return Status;\r
     }\r
 \r
-    HttpInstance->Rx6Data.FragmentCount  =1;\r
-    HttpInstance->Rx6Token.Packet.RxData = &HttpInstance->Rx6Data;\r
+    HttpInstance->Rx6Data.FragmentCount           = 1;\r
+    HttpInstance->Rx6Token.Packet.RxData          = &HttpInstance->Rx6Data;\r
     HttpInstance->Rx6Token.CompletionToken.Status = EFI_NOT_READY;\r
-\r
   }\r
 \r
-\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -535,12 +521,12 @@ HttpCreateTcpRxEventForHeader (
 **/\r
 EFI_STATUS\r
 HttpCreateTcpRxEvent (\r
-  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  HTTP_PROTOCOL            *HttpInstance;\r
-  HTTP_TCP_TOKEN_WRAP      *TcpWrap;\r
+  EFI_STATUS           Status;\r
+  HTTP_PROTOCOL        *HttpInstance;\r
+  HTTP_TCP_TOKEN_WRAP  *TcpWrap;\r
 \r
   HttpInstance = Wrap->HttpInstance;\r
   TcpWrap      = &Wrap->TcpWrap;\r
@@ -556,10 +542,9 @@ HttpCreateTcpRxEvent (
       return Status;\r
     }\r
 \r
-    TcpWrap->Rx4Data.FragmentCount = 1;\r
-    TcpWrap->Rx4Token.Packet.RxData = &Wrap->TcpWrap.Rx4Data;\r
+    TcpWrap->Rx4Data.FragmentCount           = 1;\r
+    TcpWrap->Rx4Token.Packet.RxData          = &Wrap->TcpWrap.Rx4Data;\r
     TcpWrap->Rx4Token.CompletionToken.Status = EFI_NOT_READY;\r
-\r
   } else {\r
     Status = gBS->CreateEvent (\r
                     EVT_NOTIFY_SIGNAL,\r
@@ -572,8 +557,8 @@ HttpCreateTcpRxEvent (
       return Status;\r
     }\r
 \r
-    TcpWrap->Rx6Data.FragmentCount = 1;\r
-    TcpWrap->Rx6Token.Packet.RxData = &Wrap->TcpWrap.Rx6Data;\r
+    TcpWrap->Rx6Data.FragmentCount           = 1;\r
+    TcpWrap->Rx6Token.Packet.RxData          = &Wrap->TcpWrap.Rx6Data;\r
     TcpWrap->Rx6Token.CompletionToken.Status = EFI_NOT_READY;\r
   }\r
 \r
@@ -588,13 +573,13 @@ HttpCreateTcpRxEvent (
 **/\r
 VOID\r
 HttpCloseTcpRxEvent (\r
-  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   )\r
 {\r
-  HTTP_PROTOCOL            *HttpInstance;\r
+  HTTP_PROTOCOL  *HttpInstance;\r
 \r
   ASSERT (Wrap != NULL);\r
-  HttpInstance   = Wrap->HttpInstance;\r
+  HttpInstance = Wrap->HttpInstance;\r
 \r
   if (HttpInstance->LocalAddressIsIPv6) {\r
     if (Wrap->TcpWrap.Rx6Token.CompletionToken.Event != NULL) {\r
@@ -629,13 +614,13 @@ HttpCloseTcpRxEvent (
 **/\r
 EFI_STATUS\r
 HttpInitProtocol (\r
-  IN OUT HTTP_PROTOCOL           *HttpInstance,\r
-  IN     BOOLEAN                 IpVersion\r
+  IN OUT HTTP_PROTOCOL  *HttpInstance,\r
+  IN     BOOLEAN        IpVersion\r
   )\r
 {\r
-  EFI_STATUS                     Status;\r
-  VOID                           *Interface;\r
-  BOOLEAN                        UsingIpv6;\r
+  EFI_STATUS  Status;\r
+  VOID        *Interface;\r
+  BOOLEAN     UsingIpv6;\r
 \r
   ASSERT (HttpInstance != NULL);\r
   UsingIpv6 = IpVersion;\r
@@ -658,7 +643,7 @@ HttpInitProtocol (
     Status = gBS->OpenProtocol (\r
                     HttpInstance->Tcp4ChildHandle,\r
                     &gEfiTcp4ProtocolGuid,\r
-                    (VOID **) &Interface,\r
+                    (VOID **)&Interface,\r
                     HttpInstance->Service->Ip4DriverBindingHandle,\r
                     HttpInstance->Service->ControllerHandle,\r
                     EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -671,24 +656,24 @@ HttpInitProtocol (
     Status = gBS->OpenProtocol (\r
                     HttpInstance->Tcp4ChildHandle,\r
                     &gEfiTcp4ProtocolGuid,\r
-                    (VOID **) &HttpInstance->Tcp4,\r
+                    (VOID **)&HttpInstance->Tcp4,\r
                     HttpInstance->Service->Ip4DriverBindingHandle,\r
                     HttpInstance->Handle,\r
                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
                     );\r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       goto ON_ERROR;\r
     }\r
 \r
     Status = gBS->OpenProtocol (\r
                     HttpInstance->Service->Tcp4ChildHandle,\r
                     &gEfiTcp4ProtocolGuid,\r
-                    (VOID **) &Interface,\r
+                    (VOID **)&Interface,\r
                     HttpInstance->Service->Ip4DriverBindingHandle,\r
                     HttpInstance->Handle,\r
                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
                     );\r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       goto ON_ERROR;\r
     }\r
   } else {\r
@@ -709,7 +694,7 @@ HttpInitProtocol (
     Status = gBS->OpenProtocol (\r
                     HttpInstance->Tcp6ChildHandle,\r
                     &gEfiTcp6ProtocolGuid,\r
-                    (VOID **) &Interface,\r
+                    (VOID **)&Interface,\r
                     HttpInstance->Service->Ip6DriverBindingHandle,\r
                     HttpInstance->Service->ControllerHandle,\r
                     EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -722,26 +707,26 @@ HttpInitProtocol (
     Status = gBS->OpenProtocol (\r
                     HttpInstance->Tcp6ChildHandle,\r
                     &gEfiTcp6ProtocolGuid,\r
-                    (VOID **) &HttpInstance->Tcp6,\r
+                    (VOID **)&HttpInstance->Tcp6,\r
                     HttpInstance->Service->Ip6DriverBindingHandle,\r
                     HttpInstance->Handle,\r
                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
                     );\r
 \r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       goto ON_ERROR;\r
     }\r
 \r
     Status = gBS->OpenProtocol (\r
                     HttpInstance->Service->Tcp6ChildHandle,\r
                     &gEfiTcp6ProtocolGuid,\r
-                    (VOID **) &Interface,\r
+                    (VOID **)&Interface,\r
                     HttpInstance->Service->Ip6DriverBindingHandle,\r
                     HttpInstance->Handle,\r
                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
                     );\r
 \r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       goto ON_ERROR;\r
     }\r
   }\r
@@ -821,7 +806,6 @@ ON_ERROR:
   }\r
 \r
   return EFI_UNSUPPORTED;\r
-\r
 }\r
 \r
 /**\r
@@ -832,7 +816,7 @@ ON_ERROR:
 **/\r
 VOID\r
 HttpCleanProtocol (\r
-  IN  HTTP_PROTOCOL          *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
   HttpCloseConnection (HttpInstance);\r
@@ -868,7 +852,7 @@ HttpCleanProtocol (
   NetMapClean (&HttpInstance->TxTokens);\r
   NetMapClean (&HttpInstance->RxTokens);\r
 \r
-  if (HttpInstance->TlsSb != NULL && HttpInstance->TlsChildHandle != NULL) {\r
+  if ((HttpInstance->TlsSb != NULL) && (HttpInstance->TlsChildHandle != NULL)) {\r
     //\r
     // Destroy the TLS instance.\r
     //\r
@@ -954,18 +938,18 @@ HttpCleanProtocol (
 **/\r
 EFI_STATUS\r
 HttpCreateConnection (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Connect to Http server\r
   //\r
   if (!HttpInstance->LocalAddressIsIPv6) {\r
-    HttpInstance->IsTcp4ConnDone = FALSE;\r
+    HttpInstance->IsTcp4ConnDone                       = FALSE;\r
     HttpInstance->Tcp4ConnToken.CompletionToken.Status = EFI_NOT_READY;\r
-    Status = HttpInstance->Tcp4->Connect (HttpInstance->Tcp4, &HttpInstance->Tcp4ConnToken);\r
+    Status                                             = HttpInstance->Tcp4->Connect (HttpInstance->Tcp4, &HttpInstance->Tcp4ConnToken);\r
     HttpNotify (HttpEventConnectTcp, Status);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "HttpCreateConnection: Tcp4->Connect() = %r\n", Status));\r
@@ -977,18 +961,17 @@ HttpCreateConnection (
     }\r
 \r
     Status = HttpInstance->Tcp4ConnToken.CompletionToken.Status;\r
-\r
   } else {\r
-    HttpInstance->IsTcp6ConnDone = FALSE;\r
+    HttpInstance->IsTcp6ConnDone                       = FALSE;\r
     HttpInstance->Tcp6ConnToken.CompletionToken.Status = EFI_NOT_READY;\r
-    Status = HttpInstance->Tcp6->Connect (HttpInstance->Tcp6, &HttpInstance->Tcp6ConnToken);\r
+    Status                                             = HttpInstance->Tcp6->Connect (HttpInstance->Tcp6, &HttpInstance->Tcp6ConnToken);\r
     HttpNotify (HttpEventConnectTcp, Status);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "HttpCreateConnection: Tcp6->Connect() = %r\n", Status));\r
       return Status;\r
     }\r
 \r
-    while(!HttpInstance->IsTcp6ConnDone) {\r
+    while (!HttpInstance->IsTcp6ConnDone) {\r
       HttpInstance->Tcp6->Poll (HttpInstance->Tcp6);\r
     }\r
 \r
@@ -1013,17 +996,16 @@ HttpCreateConnection (
 **/\r
 EFI_STATUS\r
 HttpCloseConnection (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (HttpInstance->State == HTTP_STATE_TCP_CONNECTED) {\r
-\r
     if (HttpInstance->LocalAddressIsIPv6) {\r
       HttpInstance->Tcp6CloseToken.AbortOnClose = TRUE;\r
       HttpInstance->IsTcp6CloseDone             = FALSE;\r
-      Status = HttpInstance->Tcp6->Close (HttpInstance->Tcp6, &HttpInstance->Tcp6CloseToken);\r
+      Status                                    = HttpInstance->Tcp6->Close (HttpInstance->Tcp6, &HttpInstance->Tcp6CloseToken);\r
       if (EFI_ERROR (Status)) {\r
         return Status;\r
       }\r
@@ -1031,11 +1013,10 @@ HttpCloseConnection (
       while (!HttpInstance->IsTcp6CloseDone) {\r
         HttpInstance->Tcp6->Poll (HttpInstance->Tcp6);\r
       }\r
-\r
     } else {\r
       HttpInstance->Tcp4CloseToken.AbortOnClose = TRUE;\r
       HttpInstance->IsTcp4CloseDone             = FALSE;\r
-      Status = HttpInstance->Tcp4->Close (HttpInstance->Tcp4, &HttpInstance->Tcp4CloseToken);\r
+      Status                                    = HttpInstance->Tcp4->Close (HttpInstance->Tcp4, &HttpInstance->Tcp4CloseToken);\r
       if (EFI_ERROR (Status)) {\r
         return Status;\r
       }\r
@@ -1044,7 +1025,6 @@ HttpCloseConnection (
         HttpInstance->Tcp4->Poll (HttpInstance->Tcp4);\r
       }\r
     }\r
-\r
   }\r
 \r
   HttpInstance->State = HTTP_STATE_TCP_CLOSED;\r
@@ -1063,18 +1043,17 @@ HttpCloseConnection (
 **/\r
 EFI_STATUS\r
 HttpConfigureTcp4 (\r
-  IN  HTTP_PROTOCOL        *HttpInstance,\r
-  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  IN  HTTP_PROTOCOL    *HttpInstance,\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   )\r
 {\r
-  EFI_STATUS                 Status;\r
-  EFI_TCP4_CONFIG_DATA       *Tcp4CfgData;\r
-  EFI_TCP4_ACCESS_POINT      *Tcp4AP;\r
-  EFI_TCP4_OPTION            *Tcp4Option;\r
+  EFI_STATUS             Status;\r
+  EFI_TCP4_CONFIG_DATA   *Tcp4CfgData;\r
+  EFI_TCP4_ACCESS_POINT  *Tcp4AP;\r
+  EFI_TCP4_OPTION        *Tcp4Option;\r
 \r
   ASSERT (HttpInstance != NULL);\r
 \r
-\r
   Tcp4CfgData = &HttpInstance->Tcp4CfgData;\r
   ZeroMem (Tcp4CfgData, sizeof (EFI_TCP4_CONFIG_DATA));\r
 \r
@@ -1082,7 +1061,7 @@ HttpConfigureTcp4 (
   Tcp4CfgData->TimeToLive    = HTTP_TTL_DEAULT;\r
   Tcp4CfgData->ControlOption = &HttpInstance->Tcp4Option;\r
 \r
-  Tcp4AP = &Tcp4CfgData->AccessPoint;\r
+  Tcp4AP                    = &Tcp4CfgData->AccessPoint;\r
   Tcp4AP->UseDefaultAddress = HttpInstance->IPv4Node.UseDefaultAddress;\r
   if (!Tcp4AP->UseDefaultAddress) {\r
     IP4_COPY_ADDRESS (&Tcp4AP->StationAddress, &HttpInstance->IPv4Node.LocalAddress);\r
@@ -1094,18 +1073,18 @@ HttpConfigureTcp4 (
   Tcp4AP->ActiveFlag  = TRUE;\r
   IP4_COPY_ADDRESS (&Tcp4AP->RemoteAddress, &HttpInstance->RemoteAddr);\r
 \r
-  Tcp4Option = Tcp4CfgData->ControlOption;\r
-  Tcp4Option->ReceiveBufferSize      = HTTP_BUFFER_SIZE_DEAULT;\r
-  Tcp4Option->SendBufferSize         = HTTP_BUFFER_SIZE_DEAULT;\r
-  Tcp4Option->MaxSynBackLog          = HTTP_MAX_SYN_BACK_LOG;\r
-  Tcp4Option->ConnectionTimeout      = HTTP_CONNECTION_TIMEOUT;\r
-  Tcp4Option->DataRetries            = HTTP_DATA_RETRIES;\r
-  Tcp4Option->FinTimeout             = HTTP_FIN_TIMEOUT;\r
-  Tcp4Option->KeepAliveProbes        = HTTP_KEEP_ALIVE_PROBES;\r
-  Tcp4Option->KeepAliveTime          = HTTP_KEEP_ALIVE_TIME;\r
-  Tcp4Option->KeepAliveInterval      = HTTP_KEEP_ALIVE_INTERVAL;\r
-  Tcp4Option->EnableNagle            = TRUE;\r
-  Tcp4CfgData->ControlOption         = Tcp4Option;\r
+  Tcp4Option                    = Tcp4CfgData->ControlOption;\r
+  Tcp4Option->ReceiveBufferSize = HTTP_BUFFER_SIZE_DEAULT;\r
+  Tcp4Option->SendBufferSize    = HTTP_BUFFER_SIZE_DEAULT;\r
+  Tcp4Option->MaxSynBackLog     = HTTP_MAX_SYN_BACK_LOG;\r
+  Tcp4Option->ConnectionTimeout = HTTP_CONNECTION_TIMEOUT;\r
+  Tcp4Option->DataRetries       = HTTP_DATA_RETRIES;\r
+  Tcp4Option->FinTimeout        = HTTP_FIN_TIMEOUT;\r
+  Tcp4Option->KeepAliveProbes   = HTTP_KEEP_ALIVE_PROBES;\r
+  Tcp4Option->KeepAliveTime     = HTTP_KEEP_ALIVE_TIME;\r
+  Tcp4Option->KeepAliveInterval = HTTP_KEEP_ALIVE_INTERVAL;\r
+  Tcp4Option->EnableNagle       = TRUE;\r
+  Tcp4CfgData->ControlOption    = Tcp4Option;\r
 \r
   Status = HttpInstance->Tcp4->Configure (HttpInstance->Tcp4, Tcp4CfgData);\r
   if (EFI_ERROR (Status)) {\r
@@ -1140,14 +1119,14 @@ HttpConfigureTcp4 (
 **/\r
 EFI_STATUS\r
 HttpConfigureTcp6 (\r
-  IN  HTTP_PROTOCOL        *HttpInstance,\r
-  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  IN  HTTP_PROTOCOL    *HttpInstance,\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  EFI_TCP6_CONFIG_DATA     *Tcp6CfgData;\r
-  EFI_TCP6_ACCESS_POINT    *Tcp6Ap;\r
-  EFI_TCP6_OPTION          *Tcp6Option;\r
+  EFI_STATUS             Status;\r
+  EFI_TCP6_CONFIG_DATA   *Tcp6CfgData;\r
+  EFI_TCP6_ACCESS_POINT  *Tcp6Ap;\r
+  EFI_TCP6_OPTION        *Tcp6Option;\r
 \r
   ASSERT (HttpInstance != NULL);\r
 \r
@@ -1158,24 +1137,24 @@ HttpConfigureTcp6 (
   Tcp6CfgData->HopLimit      = 255;\r
   Tcp6CfgData->ControlOption = &HttpInstance->Tcp6Option;\r
 \r
-  Tcp6Ap  = &Tcp6CfgData->AccessPoint;\r
+  Tcp6Ap              = &Tcp6CfgData->AccessPoint;\r
   Tcp6Ap->ActiveFlag  = TRUE;\r
   Tcp6Ap->StationPort = HttpInstance->Ipv6Node.LocalPort;\r
   Tcp6Ap->RemotePort  = HttpInstance->RemotePort;\r
   IP6_COPY_ADDRESS (&Tcp6Ap->StationAddress, &HttpInstance->Ipv6Node.LocalAddress);\r
-  IP6_COPY_ADDRESS (&Tcp6Ap->RemoteAddress , &HttpInstance->RemoteIpv6Addr);\r
-\r
-  Tcp6Option = Tcp6CfgData->ControlOption;\r
-  Tcp6Option->ReceiveBufferSize  = HTTP_BUFFER_SIZE_DEAULT;\r
-  Tcp6Option->SendBufferSize     = HTTP_BUFFER_SIZE_DEAULT;\r
-  Tcp6Option->MaxSynBackLog      = HTTP_MAX_SYN_BACK_LOG;\r
-  Tcp6Option->ConnectionTimeout  = HTTP_CONNECTION_TIMEOUT;\r
-  Tcp6Option->DataRetries        = HTTP_DATA_RETRIES;\r
-  Tcp6Option->FinTimeout         = HTTP_FIN_TIMEOUT;\r
-  Tcp6Option->KeepAliveProbes    = HTTP_KEEP_ALIVE_PROBES;\r
-  Tcp6Option->KeepAliveTime      = HTTP_KEEP_ALIVE_TIME;\r
-  Tcp6Option->KeepAliveInterval  = HTTP_KEEP_ALIVE_INTERVAL;\r
-  Tcp6Option->EnableNagle        = TRUE;\r
+  IP6_COPY_ADDRESS (&Tcp6Ap->RemoteAddress, &HttpInstance->RemoteIpv6Addr);\r
+\r
+  Tcp6Option                    = Tcp6CfgData->ControlOption;\r
+  Tcp6Option->ReceiveBufferSize = HTTP_BUFFER_SIZE_DEAULT;\r
+  Tcp6Option->SendBufferSize    = HTTP_BUFFER_SIZE_DEAULT;\r
+  Tcp6Option->MaxSynBackLog     = HTTP_MAX_SYN_BACK_LOG;\r
+  Tcp6Option->ConnectionTimeout = HTTP_CONNECTION_TIMEOUT;\r
+  Tcp6Option->DataRetries       = HTTP_DATA_RETRIES;\r
+  Tcp6Option->FinTimeout        = HTTP_FIN_TIMEOUT;\r
+  Tcp6Option->KeepAliveProbes   = HTTP_KEEP_ALIVE_PROBES;\r
+  Tcp6Option->KeepAliveTime     = HTTP_KEEP_ALIVE_TIME;\r
+  Tcp6Option->KeepAliveInterval = HTTP_KEEP_ALIVE_INTERVAL;\r
+  Tcp6Option->EnableNagle       = TRUE;\r
 \r
   Status = HttpInstance->Tcp6->Configure (HttpInstance->Tcp6, Tcp6CfgData);\r
   if (EFI_ERROR (Status)) {\r
@@ -1196,7 +1175,6 @@ HttpConfigureTcp6 (
   HttpInstance->State = HTTP_STATE_TCP_CONFIGED;\r
 \r
   return EFI_SUCCESS;\r
-\r
 }\r
 \r
 /**\r
@@ -1212,18 +1190,17 @@ HttpConfigureTcp6 (
 **/\r
 EFI_STATUS\r
 HttpConnectTcp4 (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_TCP4_CONNECTION_STATE Tcp4State;\r
-\r
+  EFI_STATUS                 Status;\r
+  EFI_TCP4_CONNECTION_STATE  Tcp4State;\r
 \r
-  if (HttpInstance->State < HTTP_STATE_TCP_CONFIGED || HttpInstance->Tcp4 == NULL) {\r
+  if ((HttpInstance->State < HTTP_STATE_TCP_CONFIGED) || (HttpInstance->Tcp4 == NULL)) {\r
     return EFI_NOT_READY;\r
   }\r
 \r
-  Status = HttpInstance->Tcp4->GetModeData(\r
+  Status = HttpInstance->Tcp4->GetModeData (\r
                                  HttpInstance->Tcp4,\r
                                  &Tcp4State,\r
                                  NULL,\r
@@ -1231,7 +1208,7 @@ HttpConnectTcp4 (
                                  NULL,\r
                                  NULL\r
                                  );\r
-  if (EFI_ERROR(Status)){\r
+  if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "Tcp4 GetModeData fail - %x\n", Status));\r
     return Status;\r
   }\r
@@ -1239,11 +1216,11 @@ HttpConnectTcp4 (
   if (Tcp4State == Tcp4StateEstablished) {\r
     return EFI_SUCCESS;\r
   } else if (Tcp4State > Tcp4StateEstablished ) {\r
-    HttpCloseConnection(HttpInstance);\r
+    HttpCloseConnection (HttpInstance);\r
   }\r
 \r
   Status = HttpCreateConnection (HttpInstance);\r
-  if (EFI_ERROR(Status)){\r
+  if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "Tcp4 Connection fail - %x\n", Status));\r
     return Status;\r
   }\r
@@ -1305,13 +1282,13 @@ HttpConnectTcp4 (
 **/\r
 EFI_STATUS\r
 HttpConnectTcp6 (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_TCP6_CONNECTION_STATE Tcp6State;\r
+  EFI_STATUS                 Status;\r
+  EFI_TCP6_CONNECTION_STATE  Tcp6State;\r
 \r
-  if (HttpInstance->State < HTTP_STATE_TCP_CONFIGED || HttpInstance->Tcp6 == NULL) {\r
+  if ((HttpInstance->State < HTTP_STATE_TCP_CONFIGED) || (HttpInstance->Tcp6 == NULL)) {\r
     return EFI_NOT_READY;\r
   }\r
 \r
@@ -1324,19 +1301,19 @@ HttpConnectTcp6 (
                                  NULL\r
                                  );\r
 \r
-  if (EFI_ERROR(Status)){\r
-     DEBUG ((DEBUG_ERROR, "Tcp6 GetModeData fail - %x\n", Status));\r
-     return Status;\r
+  if (EFI_ERROR (Status)) {\r
+    DEBUG ((DEBUG_ERROR, "Tcp6 GetModeData fail - %x\n", Status));\r
+    return Status;\r
   }\r
 \r
   if (Tcp6State == Tcp6StateEstablished) {\r
     return EFI_SUCCESS;\r
   } else if (Tcp6State > Tcp6StateEstablished ) {\r
-    HttpCloseConnection(HttpInstance);\r
+    HttpCloseConnection (HttpInstance);\r
   }\r
 \r
   Status = HttpCreateConnection (HttpInstance);\r
-  if (EFI_ERROR(Status)){\r
+  if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "Tcp6 Connection fail - %x\n", Status));\r
     return Status;\r
   }\r
@@ -1405,7 +1382,8 @@ HttpInitSession (
   IN  BOOLEAN          TlsConfigure\r
   )\r
 {\r
-  EFI_STATUS           Status;\r
+  EFI_STATUS  Status;\r
+\r
   ASSERT (HttpInstance != NULL);\r
 \r
   //\r
@@ -1457,7 +1435,6 @@ HttpInitSession (
   }\r
 \r
   return EFI_SUCCESS;\r
-\r
 }\r
 \r
 /**\r
@@ -1480,27 +1457,27 @@ HttpTransmitTcp (
   IN  UINTN            TxStringLen\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_TCP4_IO_TOKEN             *Tx4Token;\r
-  EFI_TCP4_PROTOCOL             *Tcp4;\r
-  EFI_TCP6_IO_TOKEN             *Tx6Token;\r
-  EFI_TCP6_PROTOCOL             *Tcp6;\r
-  UINT8                         *TlsRecord;\r
-  UINT16                        PayloadSize;\r
-  NET_FRAGMENT                  TempFragment;\r
-  NET_FRAGMENT                  Fragment;\r
-  UINTN                         RecordCount;\r
-  UINTN                         RemainingLen;\r
-\r
-  Status                = EFI_SUCCESS;\r
-  TlsRecord             = NULL;\r
-  PayloadSize           = 0;\r
-  TempFragment.Len      = 0;\r
-  TempFragment.Bulk     = NULL;\r
-  Fragment.Len          = 0;\r
-  Fragment.Bulk         = NULL;\r
-  RecordCount           = 0;\r
-  RemainingLen          = 0;\r
+  EFI_STATUS         Status;\r
+  EFI_TCP4_IO_TOKEN  *Tx4Token;\r
+  EFI_TCP4_PROTOCOL  *Tcp4;\r
+  EFI_TCP6_IO_TOKEN  *Tx6Token;\r
+  EFI_TCP6_PROTOCOL  *Tcp6;\r
+  UINT8              *TlsRecord;\r
+  UINT16             PayloadSize;\r
+  NET_FRAGMENT       TempFragment;\r
+  NET_FRAGMENT       Fragment;\r
+  UINTN              RecordCount;\r
+  UINTN              RemainingLen;\r
+\r
+  Status            = EFI_SUCCESS;\r
+  TlsRecord         = NULL;\r
+  PayloadSize       = 0;\r
+  TempFragment.Len  = 0;\r
+  TempFragment.Bulk = NULL;\r
+  Fragment.Len      = 0;\r
+  Fragment.Bulk     = NULL;\r
+  RecordCount       = 0;\r
+  RemainingLen      = 0;\r
 \r
   //\r
   // Need to encrypt data.\r
@@ -1518,7 +1495,7 @@ HttpTransmitTcp (
     //\r
     // Allocate enough buffer for all TLS ciphertext records.\r
     //\r
-    RecordCount = TxStringLen / TLS_PLAINTEXT_RECORD_MAX_PAYLOAD_LENGTH + 1;\r
+    RecordCount   = TxStringLen / TLS_PLAINTEXT_RECORD_MAX_PAYLOAD_LENGTH + 1;\r
     Fragment.Bulk = AllocateZeroPool (RecordCount * (TLS_RECORD_HEADER_LENGTH + TLS_CIPHERTEXT_RECORD_MAX_PAYLOAD_LENGTH));\r
     if (Fragment.Bulk == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
@@ -1530,12 +1507,12 @@ HttpTransmitTcp (
     //\r
     RemainingLen = TxStringLen;\r
     while (RemainingLen != 0) {\r
-      PayloadSize = (UINT16) MIN (TLS_PLAINTEXT_RECORD_MAX_PAYLOAD_LENGTH, RemainingLen);\r
+      PayloadSize = (UINT16)MIN (TLS_PLAINTEXT_RECORD_MAX_PAYLOAD_LENGTH, RemainingLen);\r
 \r
-      ((TLS_RECORD_HEADER *) TlsRecord)->ContentType = TlsContentTypeApplicationData;\r
-      ((TLS_RECORD_HEADER *) TlsRecord)->Version.Major = HttpInstance->TlsConfigData.Version.Major;\r
-      ((TLS_RECORD_HEADER *) TlsRecord)->Version.Minor = HttpInstance->TlsConfigData.Version.Minor;\r
-      ((TLS_RECORD_HEADER *) TlsRecord)->Length = PayloadSize;\r
+      ((TLS_RECORD_HEADER *)TlsRecord)->ContentType   = TlsContentTypeApplicationData;\r
+      ((TLS_RECORD_HEADER *)TlsRecord)->Version.Major = HttpInstance->TlsConfigData.Version.Major;\r
+      ((TLS_RECORD_HEADER *)TlsRecord)->Version.Minor = HttpInstance->TlsConfigData.Version.Minor;\r
+      ((TLS_RECORD_HEADER *)TlsRecord)->Length        = PayloadSize;\r
 \r
       CopyMem (TlsRecord + TLS_RECORD_HEADER_LENGTH, TxString + (TxStringLen - RemainingLen), PayloadSize);\r
 \r
@@ -1560,7 +1537,7 @@ HttpTransmitTcp (
       TempFragment.Len  = 0;\r
       TempFragment.Bulk = NULL;\r
 \r
-      RemainingLen -= (UINTN) PayloadSize;\r
+      RemainingLen -= (UINTN)PayloadSize;\r
       ZeroMem (TlsRecord, TLS_RECORD_HEADER_LENGTH + TLS_PLAINTEXT_RECORD_MAX_PAYLOAD_LENGTH);\r
     }\r
 \r
@@ -1569,46 +1546,45 @@ HttpTransmitTcp (
   }\r
 \r
   if (!HttpInstance->LocalAddressIsIPv6) {\r
-    Tcp4 = HttpInstance->Tcp4;\r
+    Tcp4     = HttpInstance->Tcp4;\r
     Tx4Token = &Wrap->TcpWrap.Tx4Token;\r
 \r
     if (HttpInstance->UseHttps) {\r
-      Tx4Token->Packet.TxData->DataLength = Fragment.Len;\r
+      Tx4Token->Packet.TxData->DataLength                      = Fragment.Len;\r
       Tx4Token->Packet.TxData->FragmentTable[0].FragmentLength = Fragment.Len;\r
-      Tx4Token->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *) Fragment.Bulk;\r
+      Tx4Token->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *)Fragment.Bulk;\r
     } else {\r
-      Tx4Token->Packet.TxData->DataLength = (UINT32) TxStringLen;\r
-      Tx4Token->Packet.TxData->FragmentTable[0].FragmentLength = (UINT32) TxStringLen;\r
-      Tx4Token->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *) TxString;\r
+      Tx4Token->Packet.TxData->DataLength                      = (UINT32)TxStringLen;\r
+      Tx4Token->Packet.TxData->FragmentTable[0].FragmentLength = (UINT32)TxStringLen;\r
+      Tx4Token->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *)TxString;\r
     }\r
 \r
     Tx4Token->CompletionToken.Status = EFI_NOT_READY;\r
 \r
     Wrap->TcpWrap.IsTxDone = FALSE;\r
-    Status  = Tcp4->Transmit (Tcp4, Tx4Token);\r
+    Status                 = Tcp4->Transmit (Tcp4, Tx4Token);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "Transmit failed: %r\n", Status));\r
       goto ON_ERROR;\r
     }\r
-\r
   } else {\r
-    Tcp6 = HttpInstance->Tcp6;\r
+    Tcp6     = HttpInstance->Tcp6;\r
     Tx6Token = &Wrap->TcpWrap.Tx6Token;\r
 \r
     if (HttpInstance->UseHttps) {\r
-      Tx6Token->Packet.TxData->DataLength = Fragment.Len;\r
+      Tx6Token->Packet.TxData->DataLength                      = Fragment.Len;\r
       Tx6Token->Packet.TxData->FragmentTable[0].FragmentLength = Fragment.Len;\r
-      Tx6Token->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *) Fragment.Bulk;\r
+      Tx6Token->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *)Fragment.Bulk;\r
     } else {\r
-      Tx6Token->Packet.TxData->DataLength = (UINT32) TxStringLen;\r
-      Tx6Token->Packet.TxData->FragmentTable[0].FragmentLength = (UINT32) TxStringLen;\r
-      Tx6Token->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *) TxString;\r
+      Tx6Token->Packet.TxData->DataLength                      = (UINT32)TxStringLen;\r
+      Tx6Token->Packet.TxData->FragmentTable[0].FragmentLength = (UINT32)TxStringLen;\r
+      Tx6Token->Packet.TxData->FragmentTable[0].FragmentBuffer = (VOID *)TxString;\r
     }\r
 \r
     Tx6Token->CompletionToken.Status = EFI_NOT_READY;\r
 \r
     Wrap->TcpWrap.IsTxDone = FALSE;\r
-    Status = Tcp6->Transmit (Tcp6, Tx6Token);\r
+    Status                 = Tcp6->Transmit (Tcp6, Tx6Token);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "Transmit failed: %r\n", Status));\r
       goto ON_ERROR;\r
@@ -1651,18 +1627,18 @@ ON_ERROR:
 EFI_STATUS\r
 EFIAPI\r
 HttpTokenExist (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   )\r
 {\r
-  EFI_HTTP_TOKEN            *Token;\r
-  EFI_HTTP_TOKEN            *TokenInItem;\r
+  EFI_HTTP_TOKEN  *Token;\r
+  EFI_HTTP_TOKEN  *TokenInItem;\r
 \r
-  Token       = (EFI_HTTP_TOKEN *) Context;\r
-  TokenInItem = (EFI_HTTP_TOKEN *) Item->Key;\r
+  Token       = (EFI_HTTP_TOKEN *)Context;\r
+  TokenInItem = (EFI_HTTP_TOKEN *)Item->Key;\r
 \r
-  if (Token == TokenInItem || Token->Event == TokenInItem->Event) {\r
+  if ((Token == TokenInItem) || (Token->Event == TokenInItem->Event)) {\r
     return EFI_ACCESS_DENIED;\r
   }\r
 \r
@@ -1683,14 +1659,14 @@ HttpTokenExist (
 EFI_STATUS\r
 EFIAPI\r
 HttpTcpNotReady (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   )\r
 {\r
-  HTTP_TOKEN_WRAP           *ValueInItem;\r
+  HTTP_TOKEN_WRAP  *ValueInItem;\r
 \r
-  ValueInItem = (HTTP_TOKEN_WRAP *) Item->Value;\r
+  ValueInItem = (HTTP_TOKEN_WRAP *)Item->Value;\r
 \r
   if (!ValueInItem->TcpWrap.IsTxDone) {\r
     return EFI_NOT_READY;\r
@@ -1714,21 +1690,21 @@ HttpTcpNotReady (
 EFI_STATUS\r
 EFIAPI\r
 HttpTcpTransmit (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   )\r
 {\r
-  HTTP_TOKEN_WRAP           *ValueInItem;\r
-  EFI_STATUS                Status;\r
-  CHAR8                     *RequestMsg;\r
-  CHAR8                     *Url;\r
-  UINTN                     UrlSize;\r
-  UINTN                     RequestMsgSize;\r
+  HTTP_TOKEN_WRAP  *ValueInItem;\r
+  EFI_STATUS       Status;\r
+  CHAR8            *RequestMsg;\r
+  CHAR8            *Url;\r
+  UINTN            UrlSize;\r
+  UINTN            RequestMsgSize;\r
 \r
   RequestMsg = NULL;\r
 \r
-  ValueInItem = (HTTP_TOKEN_WRAP *) Item->Value;\r
+  ValueInItem = (HTTP_TOKEN_WRAP *)Item->Value;\r
   if (ValueInItem->TcpWrap.IsTxDone) {\r
     return EFI_SUCCESS;\r
   }\r
@@ -1737,7 +1713,7 @@ HttpTcpTransmit (
   // Parse the URI of the remote host.\r
   //\r
   UrlSize = StrLen (ValueInItem->HttpToken->Message->Data.Request->Url) + 1;\r
-  Url = AllocatePool (UrlSize);\r
+  Url     = AllocatePool (UrlSize);\r
   if (Url == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -1748,14 +1724,14 @@ HttpTcpTransmit (
   // Create request message.\r
   //\r
   Status = HttpGenRequestMessage (\r
-                 ValueInItem->HttpToken->Message,\r
-                 Url,\r
-                 &RequestMsg,\r
-                 &RequestMsgSize\r
-                 );\r
+             ValueInItem->HttpToken->Message,\r
+             Url,\r
+             &RequestMsg,\r
+             &RequestMsgSize\r
+             );\r
   FreePool (Url);\r
 \r
-  if (EFI_ERROR (Status) || NULL == RequestMsg){\r
+  if (EFI_ERROR (Status) || (NULL == RequestMsg)) {\r
     return Status;\r
   }\r
 \r
@@ -1767,7 +1743,7 @@ HttpTcpTransmit (
   Status = HttpTransmitTcp (\r
              ValueInItem->HttpInstance,\r
              ValueInItem,\r
-             (UINT8*) RequestMsg,\r
+             (UINT8 *)RequestMsg,\r
              RequestMsgSize\r
              );\r
   FreePool (RequestMsg);\r
@@ -1789,15 +1765,15 @@ HttpTcpTransmit (
 EFI_STATUS\r
 EFIAPI\r
 HttpTcpReceive (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   )\r
 {\r
   //\r
   // Process the queued HTTP response.\r
   //\r
-  return HttpResponseWorker ((HTTP_TOKEN_WRAP *) Item->Value);\r
+  return HttpResponseWorker ((HTTP_TOKEN_WRAP *)Item->Value);\r
 }\r
 \r
 /**\r
@@ -1814,31 +1790,31 @@ HttpTcpReceive (
 **/\r
 EFI_STATUS\r
 HttpTcpReceiveHeader (\r
-  IN  HTTP_PROTOCOL         *HttpInstance,\r
-  IN  OUT UINTN             *SizeofHeaders,\r
-  IN  OUT UINTN             *BufferSize,\r
-  IN  EFI_EVENT             Timeout\r
+  IN  HTTP_PROTOCOL  *HttpInstance,\r
+  IN  OUT UINTN      *SizeofHeaders,\r
+  IN  OUT UINTN      *BufferSize,\r
+  IN  EFI_EVENT      Timeout\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_TCP4_IO_TOKEN             *Rx4Token;\r
-  EFI_TCP4_PROTOCOL             *Tcp4;\r
-  EFI_TCP6_IO_TOKEN             *Rx6Token;\r
-  EFI_TCP6_PROTOCOL             *Tcp6;\r
-  CHAR8                         **EndofHeader;\r
-  CHAR8                         **HttpHeaders;\r
-  CHAR8                         *Buffer;\r
-  NET_FRAGMENT                  Fragment;\r
+  EFI_STATUS         Status;\r
+  EFI_TCP4_IO_TOKEN  *Rx4Token;\r
+  EFI_TCP4_PROTOCOL  *Tcp4;\r
+  EFI_TCP6_IO_TOKEN  *Rx6Token;\r
+  EFI_TCP6_PROTOCOL  *Tcp6;\r
+  CHAR8              **EndofHeader;\r
+  CHAR8              **HttpHeaders;\r
+  CHAR8              *Buffer;\r
+  NET_FRAGMENT       Fragment;\r
 \r
   ASSERT (HttpInstance != NULL);\r
 \r
-  EndofHeader = HttpInstance->EndofHeader;\r
-  HttpHeaders = HttpInstance->HttpHeaders;\r
-  Tcp4 = HttpInstance->Tcp4;\r
-  Tcp6 = HttpInstance->Tcp6;\r
-  Buffer      = NULL;\r
-  Rx4Token    = NULL;\r
-  Rx6Token    = NULL;\r
+  EndofHeader   = HttpInstance->EndofHeader;\r
+  HttpHeaders   = HttpInstance->HttpHeaders;\r
+  Tcp4          = HttpInstance->Tcp4;\r
+  Tcp6          = HttpInstance->Tcp6;\r
+  Buffer        = NULL;\r
+  Rx4Token      = NULL;\r
+  Rx6Token      = NULL;\r
   Fragment.Len  = 0;\r
   Fragment.Bulk = NULL;\r
 \r
@@ -1857,7 +1833,7 @@ HttpTcpReceiveHeader (
 \r
   if (!HttpInstance->LocalAddressIsIPv6) {\r
     if (!HttpInstance->UseHttps) {\r
-      Rx4Token = &HttpInstance->Rx4Token;\r
+      Rx4Token                                                 = &HttpInstance->Rx4Token;\r
       Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer = AllocateZeroPool (DEF_BUF_LEN);\r
       if (Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
@@ -1870,10 +1846,10 @@ HttpTcpReceiveHeader (
     //\r
     while (*EndofHeader == NULL) {\r
       if (!HttpInstance->UseHttps) {\r
-        HttpInstance->IsRxDone = FALSE;\r
-        Rx4Token->Packet.RxData->DataLength = DEF_BUF_LEN;\r
+        HttpInstance->IsRxDone                                   = FALSE;\r
+        Rx4Token->Packet.RxData->DataLength                      = DEF_BUF_LEN;\r
         Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength = DEF_BUF_LEN;\r
-        Status = Tcp4->Receive (Tcp4, Rx4Token);\r
+        Status                                                   = Tcp4->Receive (Tcp4, Rx4Token);\r
         if (EFI_ERROR (Status)) {\r
           DEBUG ((DEBUG_ERROR, "Tcp4 receive failed: %r\n", Status));\r
           return Status;\r
@@ -1898,7 +1874,7 @@ HttpTcpReceiveHeader (
         }\r
 \r
         Fragment.Len  = Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength;\r
-        Fragment.Bulk = (UINT8 *) Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer;\r
+        Fragment.Bulk = (UINT8 *)Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer;\r
       } else {\r
         if (Fragment.Bulk != NULL) {\r
           FreePool (Fragment.Bulk);\r
@@ -1933,22 +1909,22 @@ HttpTcpReceiveHeader (
         Fragment.Len\r
         );\r
       *(Buffer + *BufferSize) = '\0';\r
-      *HttpHeaders   = Buffer;\r
-      *SizeofHeaders = *BufferSize;\r
+      *HttpHeaders            = Buffer;\r
+      *SizeofHeaders          = *BufferSize;\r
 \r
       //\r
       // Check whether we received end of HTTP headers.\r
       //\r
       *EndofHeader = AsciiStrStr (*HttpHeaders, HTTP_END_OF_HDR_STR);\r
-    };\r
+    }\r
 \r
     //\r
     // Free the buffer.\r
     //\r
-    if (Rx4Token != NULL && Rx4Token->Packet.RxData != NULL && Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer != NULL) {\r
+    if ((Rx4Token != NULL) && (Rx4Token->Packet.RxData != NULL) && (Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer != NULL)) {\r
       FreePool (Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer);\r
       Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer = NULL;\r
-      Fragment.Bulk = NULL;\r
+      Fragment.Bulk                                            = NULL;\r
     }\r
 \r
     if (Fragment.Bulk != NULL) {\r
@@ -1957,7 +1933,7 @@ HttpTcpReceiveHeader (
     }\r
   } else {\r
     if (!HttpInstance->UseHttps) {\r
-      Rx6Token = &HttpInstance->Rx6Token;\r
+      Rx6Token                                                 = &HttpInstance->Rx6Token;\r
       Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer = AllocateZeroPool (DEF_BUF_LEN);\r
       if (Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
@@ -1970,10 +1946,10 @@ HttpTcpReceiveHeader (
     //\r
     while (*EndofHeader == NULL) {\r
       if (!HttpInstance->UseHttps) {\r
-        HttpInstance->IsRxDone = FALSE;\r
-        Rx6Token->Packet.RxData->DataLength = DEF_BUF_LEN;\r
+        HttpInstance->IsRxDone                                   = FALSE;\r
+        Rx6Token->Packet.RxData->DataLength                      = DEF_BUF_LEN;\r
         Rx6Token->Packet.RxData->FragmentTable[0].FragmentLength = DEF_BUF_LEN;\r
-        Status = Tcp6->Receive (Tcp6, Rx6Token);\r
+        Status                                                   = Tcp6->Receive (Tcp6, Rx6Token);\r
         if (EFI_ERROR (Status)) {\r
           DEBUG ((DEBUG_ERROR, "Tcp6 receive failed: %r\n", Status));\r
           return Status;\r
@@ -1998,7 +1974,7 @@ HttpTcpReceiveHeader (
         }\r
 \r
         Fragment.Len  = Rx6Token->Packet.RxData->FragmentTable[0].FragmentLength;\r
-        Fragment.Bulk = (UINT8 *) Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer;\r
+        Fragment.Bulk = (UINT8 *)Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer;\r
       } else {\r
         if (Fragment.Bulk != NULL) {\r
           FreePool (Fragment.Bulk);\r
@@ -2033,22 +2009,22 @@ HttpTcpReceiveHeader (
         Fragment.Len\r
         );\r
       *(Buffer + *BufferSize) = '\0';\r
-      *HttpHeaders   = Buffer;\r
-      *SizeofHeaders = *BufferSize;\r
+      *HttpHeaders            = Buffer;\r
+      *SizeofHeaders          = *BufferSize;\r
 \r
       //\r
       // Check whether we received end of HTTP headers.\r
       //\r
       *EndofHeader = AsciiStrStr (*HttpHeaders, HTTP_END_OF_HDR_STR);\r
-    };\r
+    }\r
 \r
     //\r
     // Free the buffer.\r
     //\r
-    if (Rx6Token != NULL && Rx6Token->Packet.RxData != NULL && Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer != NULL) {\r
+    if ((Rx6Token != NULL) && (Rx6Token->Packet.RxData != NULL) && (Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer != NULL)) {\r
       FreePool (Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer);\r
       Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer = NULL;\r
-      Fragment.Bulk = NULL;\r
+      Fragment.Bulk                                            = NULL;\r
     }\r
 \r
     if (Fragment.Bulk != NULL) {\r
@@ -2079,22 +2055,22 @@ HttpTcpReceiveHeader (
 **/\r
 EFI_STATUS\r
 HttpTcpReceiveBody (\r
-  IN  HTTP_TOKEN_WRAP       *Wrap,\r
-  IN  EFI_HTTP_MESSAGE      *HttpMsg\r
+  IN  HTTP_TOKEN_WRAP   *Wrap,\r
+  IN  EFI_HTTP_MESSAGE  *HttpMsg\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  HTTP_PROTOCOL             *HttpInstance;\r
-  EFI_TCP6_PROTOCOL         *Tcp6;\r
-  EFI_TCP6_IO_TOKEN         *Rx6Token;\r
-  EFI_TCP4_PROTOCOL         *Tcp4;\r
-  EFI_TCP4_IO_TOKEN         *Rx4Token;\r
-\r
-  HttpInstance   = Wrap->HttpInstance;\r
-  Tcp4 = HttpInstance->Tcp4;\r
-  Tcp6 = HttpInstance->Tcp6;\r
-  Rx4Token       = NULL;\r
-  Rx6Token       = NULL;\r
+  EFI_STATUS         Status;\r
+  HTTP_PROTOCOL      *HttpInstance;\r
+  EFI_TCP6_PROTOCOL  *Tcp6;\r
+  EFI_TCP6_IO_TOKEN  *Rx6Token;\r
+  EFI_TCP4_PROTOCOL  *Tcp4;\r
+  EFI_TCP4_IO_TOKEN  *Rx4Token;\r
+\r
+  HttpInstance = Wrap->HttpInstance;\r
+  Tcp4         = HttpInstance->Tcp4;\r
+  Tcp6         = HttpInstance->Tcp6;\r
+  Rx4Token     = NULL;\r
+  Rx6Token     = NULL;\r
 \r
   if (HttpInstance->LocalAddressIsIPv6) {\r
     ASSERT (Tcp6 != NULL);\r
@@ -2103,11 +2079,11 @@ HttpTcpReceiveBody (
   }\r
 \r
   if (HttpInstance->LocalAddressIsIPv6) {\r
-    Rx6Token = &Wrap->TcpWrap.Rx6Token;\r
-    Rx6Token ->Packet.RxData->DataLength = (UINT32) MIN (MAX_UINT32, HttpMsg->BodyLength);\r
-    Rx6Token ->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32) MIN (MAX_UINT32, HttpMsg->BodyLength);\r
-    Rx6Token ->Packet.RxData->FragmentTable[0].FragmentBuffer = (VOID *) HttpMsg->Body;\r
-    Rx6Token->CompletionToken.Status = EFI_NOT_READY;\r
+    Rx6Token                                                 = &Wrap->TcpWrap.Rx6Token;\r
+    Rx6Token->Packet.RxData->DataLength                      = (UINT32)MIN (MAX_UINT32, HttpMsg->BodyLength);\r
+    Rx6Token->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32)MIN (MAX_UINT32, HttpMsg->BodyLength);\r
+    Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer = (VOID *)HttpMsg->Body;\r
+    Rx6Token->CompletionToken.Status                         = EFI_NOT_READY;\r
 \r
     Status = Tcp6->Receive (Tcp6, Rx6Token);\r
     if (EFI_ERROR (Status)) {\r
@@ -2115,13 +2091,13 @@ HttpTcpReceiveBody (
       return Status;\r
     }\r
   } else {\r
-    Rx4Token = &Wrap->TcpWrap.Rx4Token;\r
-    Rx4Token->Packet.RxData->DataLength = (UINT32) MIN (MAX_UINT32, HttpMsg->BodyLength);\r
-    Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32) MIN (MAX_UINT32, HttpMsg->BodyLength);\r
-    Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer = (VOID *) HttpMsg->Body;\r
+    Rx4Token                                                 = &Wrap->TcpWrap.Rx4Token;\r
+    Rx4Token->Packet.RxData->DataLength                      = (UINT32)MIN (MAX_UINT32, HttpMsg->BodyLength);\r
+    Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32)MIN (MAX_UINT32, HttpMsg->BodyLength);\r
+    Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer = (VOID *)HttpMsg->Body;\r
 \r
     Rx4Token->CompletionToken.Status = EFI_NOT_READY;\r
-    Status = Tcp4->Receive (Tcp4, Rx4Token);\r
+    Status                           = Tcp4->Receive (Tcp4, Rx4Token);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "Tcp4 receive failed: %r\n", Status));\r
       return Status;\r
@@ -2129,7 +2105,6 @@ HttpTcpReceiveBody (
   }\r
 \r
   return EFI_SUCCESS;\r
-\r
 }\r
 \r
 /**\r
@@ -2140,17 +2115,17 @@ HttpTcpReceiveBody (
 **/\r
 VOID\r
 HttpTcpTokenCleanup (\r
-  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   )\r
 {\r
-  HTTP_PROTOCOL            *HttpInstance;\r
-  EFI_TCP4_IO_TOKEN        *Rx4Token;\r
-  EFI_TCP6_IO_TOKEN        *Rx6Token;\r
+  HTTP_PROTOCOL      *HttpInstance;\r
+  EFI_TCP4_IO_TOKEN  *Rx4Token;\r
+  EFI_TCP6_IO_TOKEN  *Rx6Token;\r
 \r
   ASSERT (Wrap != NULL);\r
-  HttpInstance   = Wrap->HttpInstance;\r
-  Rx4Token       = NULL;\r
-  Rx6Token       = NULL;\r
+  HttpInstance = Wrap->HttpInstance;\r
+  Rx4Token     = NULL;\r
+  Rx6Token     = NULL;\r
 \r
   if (HttpInstance->LocalAddressIsIPv6) {\r
     Rx6Token = &Wrap->TcpWrap.Rx6Token;\r
@@ -2173,7 +2148,6 @@ HttpTcpTokenCleanup (
       FreePool (Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer);\r
       Rx6Token->Packet.RxData->FragmentTable[0].FragmentBuffer = NULL;\r
     }\r
-\r
   } else {\r
     Rx4Token = &Wrap->TcpWrap.Rx4Token;\r
 \r
@@ -2191,13 +2165,11 @@ HttpTcpTokenCleanup (
       Rx4Token->CompletionToken.Event = NULL;\r
     }\r
 \r
-\r
     if (Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer != NULL) {\r
       FreePool (Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer);\r
       Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer = NULL;\r
     }\r
   }\r
-\r
 }\r
 \r
 /**\r
@@ -2209,45 +2181,46 @@ HttpTcpTokenCleanup (
 **/\r
 VOID\r
 HttpNotify (\r
-  IN  EDKII_HTTP_CALLBACK_EVENT         Event,\r
-  IN  EFI_STATUS                        EventStatus\r
+  IN  EDKII_HTTP_CALLBACK_EVENT  Event,\r
+  IN  EFI_STATUS                 EventStatus\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_HANDLE                      *Handles;\r
-  UINTN                           Index;\r
-  UINTN                           HandleCount;\r
-  EFI_HANDLE                      Handle;\r
-  EDKII_HTTP_CALLBACK_PROTOCOL    *HttpCallback;\r
+  EFI_STATUS                    Status;\r
+  EFI_HANDLE                    *Handles;\r
+  UINTN                         Index;\r
+  UINTN                         HandleCount;\r
+  EFI_HANDLE                    Handle;\r
+  EDKII_HTTP_CALLBACK_PROTOCOL  *HttpCallback;\r
 \r
   DEBUG ((DEBUG_INFO, "HttpNotify: Event - %d, EventStatus - %r\n", Event, EventStatus));\r
 \r
-  Handles = NULL;\r
+  Handles     = NULL;\r
   HandleCount = 0;\r
-  Status = gBS->LocateHandleBuffer (\r
-                  ByProtocol,\r
-                  &gEdkiiHttpCallbackProtocolGuid,\r
-                  NULL,\r
-                  &HandleCount,\r
-                  &Handles\r
-                  );\r
+  Status      = gBS->LocateHandleBuffer (\r
+                       ByProtocol,\r
+                       &gEdkiiHttpCallbackProtocolGuid,\r
+                       NULL,\r
+                       &HandleCount,\r
+                       &Handles\r
+                       );\r
   if (Status == EFI_SUCCESS) {\r
     for (Index = 0; Index < HandleCount; Index++) {\r
       Handle = Handles[Index];\r
       Status = gBS->HandleProtocol (\r
                       Handle,\r
                       &gEdkiiHttpCallbackProtocolGuid,\r
-                      (VOID **) &HttpCallback\r
+                      (VOID **)&HttpCallback\r
                       );\r
       if (Status == EFI_SUCCESS) {\r
         DEBUG ((DEBUG_INFO, "HttpNotify: Notifying %p\n", HttpCallback));\r
         HttpCallback->Callback (\r
-                HttpCallback,\r
-                Event,\r
-                EventStatus\r
-                );\r
+                        HttpCallback,\r
+                        Event,\r
+                        EventStatus\r
+                        );\r
       }\r
     }\r
+\r
     FreePool (Handles);\r
   }\r
 }\r
index 637d35053993fc9e685809e191bef30b0ab907ed..8ed99c7a02d3365f4723388c618af9131d75b238 100644 (file)
@@ -10,7 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef __EFI_HTTP_PROTO_H__\r
 #define __EFI_HTTP_PROTO_H__\r
 \r
-#define DEF_BUF_LEN                         2048\r
+#define DEF_BUF_LEN  2048\r
 \r
 #define HTTP_SERVICE_SIGNATURE  SIGNATURE_32('H', 't', 't', 'S')\r
 \r
@@ -22,188 +22,186 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
   HTTP_SERVICE_SIGNATURE \\r
   )\r
 \r
-\r
 //\r
 // The state of HTTP protocol. It starts from UNCONFIGED.\r
 //\r
-#define HTTP_STATE_UNCONFIGED        0\r
-#define HTTP_STATE_HTTP_CONFIGED     1\r
-#define HTTP_STATE_TCP_CONFIGED      2\r
-#define HTTP_STATE_TCP_UNCONFIGED    3\r
-#define HTTP_STATE_TCP_CONNECTED     4\r
-#define HTTP_STATE_TCP_CLOSED        5\r
+#define HTTP_STATE_UNCONFIGED      0\r
+#define HTTP_STATE_HTTP_CONFIGED   1\r
+#define HTTP_STATE_TCP_CONFIGED    2\r
+#define HTTP_STATE_TCP_UNCONFIGED  3\r
+#define HTTP_STATE_TCP_CONNECTED   4\r
+#define HTTP_STATE_TCP_CLOSED      5\r
 \r
 //\r
 // TCP configured data.\r
 //\r
-#define HTTP_TOS_DEAULT              8\r
-#define HTTP_TTL_DEAULT              255\r
-#define HTTP_BUFFER_SIZE_DEAULT      65535\r
-#define HTTP_MAX_SYN_BACK_LOG        5\r
-#define HTTP_CONNECTION_TIMEOUT      60\r
-#define HTTP_DATA_RETRIES            12\r
-#define HTTP_FIN_TIMEOUT             2\r
-#define HTTP_KEEP_ALIVE_PROBES       6\r
-#define HTTP_KEEP_ALIVE_TIME         7200\r
-#define HTTP_KEEP_ALIVE_INTERVAL     30\r
-\r
-#define HTTP_URL_BUFFER_LEN          4096\r
+#define HTTP_TOS_DEAULT           8\r
+#define HTTP_TTL_DEAULT           255\r
+#define HTTP_BUFFER_SIZE_DEAULT   65535\r
+#define HTTP_MAX_SYN_BACK_LOG     5\r
+#define HTTP_CONNECTION_TIMEOUT   60\r
+#define HTTP_DATA_RETRIES         12\r
+#define HTTP_FIN_TIMEOUT          2\r
+#define HTTP_KEEP_ALIVE_PROBES    6\r
+#define HTTP_KEEP_ALIVE_TIME      7200\r
+#define HTTP_KEEP_ALIVE_INTERVAL  30\r
+\r
+#define HTTP_URL_BUFFER_LEN  4096\r
 \r
 typedef struct _HTTP_SERVICE {\r
-  UINT32                        Signature;\r
-  EFI_SERVICE_BINDING_PROTOCOL  ServiceBinding;\r
-  EFI_HANDLE                    Ip4DriverBindingHandle;\r
-  EFI_HANDLE                    Ip6DriverBindingHandle;\r
-  EFI_HANDLE                    ControllerHandle;\r
-  EFI_HANDLE                    Tcp4ChildHandle;\r
-  EFI_HANDLE                    Tcp6ChildHandle;\r
-  LIST_ENTRY                    ChildrenList;\r
-  UINTN                         ChildrenNumber;\r
-  INTN                          State;\r
+  UINT32                          Signature;\r
+  EFI_SERVICE_BINDING_PROTOCOL    ServiceBinding;\r
+  EFI_HANDLE                      Ip4DriverBindingHandle;\r
+  EFI_HANDLE                      Ip6DriverBindingHandle;\r
+  EFI_HANDLE                      ControllerHandle;\r
+  EFI_HANDLE                      Tcp4ChildHandle;\r
+  EFI_HANDLE                      Tcp6ChildHandle;\r
+  LIST_ENTRY                      ChildrenList;\r
+  UINTN                           ChildrenNumber;\r
+  INTN                            State;\r
 } HTTP_SERVICE;\r
 \r
 typedef struct {\r
-  EFI_TCP4_IO_TOKEN             Tx4Token;\r
-  EFI_TCP4_TRANSMIT_DATA        Tx4Data;\r
-  EFI_TCP6_IO_TOKEN             Tx6Token;\r
-  EFI_TCP6_TRANSMIT_DATA        Tx6Data;\r
-  EFI_TCP4_IO_TOKEN             Rx4Token;\r
-  EFI_TCP4_RECEIVE_DATA         Rx4Data;\r
-  EFI_TCP6_IO_TOKEN             Rx6Token;\r
-  EFI_TCP6_RECEIVE_DATA         Rx6Data;\r
-  BOOLEAN                       IsTxDone;\r
-  BOOLEAN                       IsRxDone;\r
-  UINTN                         BodyLen;\r
-  EFI_HTTP_METHOD               Method;\r
+  EFI_TCP4_IO_TOKEN         Tx4Token;\r
+  EFI_TCP4_TRANSMIT_DATA    Tx4Data;\r
+  EFI_TCP6_IO_TOKEN         Tx6Token;\r
+  EFI_TCP6_TRANSMIT_DATA    Tx6Data;\r
+  EFI_TCP4_IO_TOKEN         Rx4Token;\r
+  EFI_TCP4_RECEIVE_DATA     Rx4Data;\r
+  EFI_TCP6_IO_TOKEN         Rx6Token;\r
+  EFI_TCP6_RECEIVE_DATA     Rx6Data;\r
+  BOOLEAN                   IsTxDone;\r
+  BOOLEAN                   IsRxDone;\r
+  UINTN                     BodyLen;\r
+  EFI_HTTP_METHOD           Method;\r
 } HTTP_TCP_TOKEN_WRAP;\r
 \r
 typedef struct {\r
-  EFI_TLS_VERSION               Version;\r
-  EFI_TLS_CONNECTION_END        ConnectionEnd;\r
-  EFI_TLS_VERIFY                VerifyMethod;\r
-  EFI_TLS_VERIFY_HOST           VerifyHost;\r
-  EFI_TLS_SESSION_STATE         SessionState;\r
+  EFI_TLS_VERSION           Version;\r
+  EFI_TLS_CONNECTION_END    ConnectionEnd;\r
+  EFI_TLS_VERIFY            VerifyMethod;\r
+  EFI_TLS_VERIFY_HOST       VerifyHost;\r
+  EFI_TLS_SESSION_STATE     SessionState;\r
 } TLS_CONFIG_DATA;\r
 \r
 //\r
 // Callback data for HTTP_PARSER_CALLBACK()\r
 //\r
 typedef struct {\r
-  UINTN                         ParseDataLength;\r
-  VOID                          *ParseData;\r
-  VOID                          *Wrap;\r
+  UINTN    ParseDataLength;\r
+  VOID     *ParseData;\r
+  VOID     *Wrap;\r
 } HTTP_CALLBACK_DATA;\r
 \r
 typedef struct _HTTP_PROTOCOL {\r
-  UINT32                        Signature;\r
-  EFI_HTTP_PROTOCOL             Http;\r
-  EFI_HANDLE                    Handle;\r
-  HTTP_SERVICE                  *Service;\r
-  LIST_ENTRY                    Link;   // Link to all HTTP instance from the service.\r
-  BOOLEAN                       InDestroy;\r
-  INTN                          State;\r
-  EFI_HTTP_METHOD               Method;\r
-\r
-  UINTN                         StatusCode;\r
-\r
-  EFI_EVENT                     TimeoutEvent;\r
-\r
-  EFI_HANDLE                    Tcp4ChildHandle;\r
-  EFI_TCP4_PROTOCOL             *Tcp4;\r
-  EFI_TCP4_CONFIG_DATA          Tcp4CfgData;\r
-  EFI_TCP4_OPTION               Tcp4Option;\r
-\r
-  EFI_TCP4_CONNECTION_TOKEN     Tcp4ConnToken;\r
-  BOOLEAN                       IsTcp4ConnDone;\r
-  EFI_TCP4_CLOSE_TOKEN          Tcp4CloseToken;\r
-  BOOLEAN                       IsTcp4CloseDone;\r
-  CHAR8                         *RemoteHost;\r
-  UINT16                        RemotePort;\r
-  EFI_IPv4_ADDRESS              RemoteAddr;\r
-\r
-  EFI_HANDLE                    Tcp6ChildHandle;\r
-  EFI_TCP6_PROTOCOL             *Tcp6;\r
-  EFI_TCP6_CONFIG_DATA          Tcp6CfgData;\r
-  EFI_TCP6_OPTION               Tcp6Option;\r
-\r
-  EFI_TCP6_CONNECTION_TOKEN     Tcp6ConnToken;\r
-  BOOLEAN                       IsTcp6ConnDone;\r
-  EFI_TCP6_CLOSE_TOKEN          Tcp6CloseToken;\r
-  BOOLEAN                       IsTcp6CloseDone;\r
-  EFI_IPv6_ADDRESS              RemoteIpv6Addr;\r
+  UINT32                            Signature;\r
+  EFI_HTTP_PROTOCOL                 Http;\r
+  EFI_HANDLE                        Handle;\r
+  HTTP_SERVICE                      *Service;\r
+  LIST_ENTRY                        Link; // Link to all HTTP instance from the service.\r
+  BOOLEAN                           InDestroy;\r
+  INTN                              State;\r
+  EFI_HTTP_METHOD                   Method;\r
+\r
+  UINTN                             StatusCode;\r
+\r
+  EFI_EVENT                         TimeoutEvent;\r
+\r
+  EFI_HANDLE                        Tcp4ChildHandle;\r
+  EFI_TCP4_PROTOCOL                 *Tcp4;\r
+  EFI_TCP4_CONFIG_DATA              Tcp4CfgData;\r
+  EFI_TCP4_OPTION                   Tcp4Option;\r
+\r
+  EFI_TCP4_CONNECTION_TOKEN         Tcp4ConnToken;\r
+  BOOLEAN                           IsTcp4ConnDone;\r
+  EFI_TCP4_CLOSE_TOKEN              Tcp4CloseToken;\r
+  BOOLEAN                           IsTcp4CloseDone;\r
+  CHAR8                             *RemoteHost;\r
+  UINT16                            RemotePort;\r
+  EFI_IPv4_ADDRESS                  RemoteAddr;\r
+\r
+  EFI_HANDLE                        Tcp6ChildHandle;\r
+  EFI_TCP6_PROTOCOL                 *Tcp6;\r
+  EFI_TCP6_CONFIG_DATA              Tcp6CfgData;\r
+  EFI_TCP6_OPTION                   Tcp6Option;\r
+\r
+  EFI_TCP6_CONNECTION_TOKEN         Tcp6ConnToken;\r
+  BOOLEAN                           IsTcp6ConnDone;\r
+  EFI_TCP6_CLOSE_TOKEN              Tcp6CloseToken;\r
+  BOOLEAN                           IsTcp6CloseDone;\r
+  EFI_IPv6_ADDRESS                  RemoteIpv6Addr;\r
 \r
   //\r
   // Rx4Token or Rx6Token used for receiving HTTP header.\r
   //\r
-  EFI_TCP4_IO_TOKEN             Rx4Token;\r
-  EFI_TCP4_RECEIVE_DATA         Rx4Data;\r
-  EFI_TCP6_IO_TOKEN             Rx6Token;\r
-  EFI_TCP6_RECEIVE_DATA         Rx6Data;\r
-  BOOLEAN                       IsRxDone;\r
-\r
-  CHAR8                         **EndofHeader;\r
-  CHAR8                         **HttpHeaders;\r
-  CHAR8                         *CacheBody;\r
-  CHAR8                         *NextMsg;\r
-  UINTN                         CacheLen;\r
-  UINTN                         CacheOffset;\r
+  EFI_TCP4_IO_TOKEN                 Rx4Token;\r
+  EFI_TCP4_RECEIVE_DATA             Rx4Data;\r
+  EFI_TCP6_IO_TOKEN                 Rx6Token;\r
+  EFI_TCP6_RECEIVE_DATA             Rx6Data;\r
+  BOOLEAN                           IsRxDone;\r
+\r
+  CHAR8                             **EndofHeader;\r
+  CHAR8                             **HttpHeaders;\r
+  CHAR8                             *CacheBody;\r
+  CHAR8                             *NextMsg;\r
+  UINTN                             CacheLen;\r
+  UINTN                             CacheOffset;\r
 \r
   //\r
   // HTTP message-body parser.\r
   //\r
-  VOID                          *MsgParser;\r
-  HTTP_CALLBACK_DATA            CallbackData;\r
+  VOID                              *MsgParser;\r
+  HTTP_CALLBACK_DATA                CallbackData;\r
 \r
-  EFI_HTTP_VERSION              HttpVersion;\r
-  UINT32                        TimeOutMillisec;\r
-  BOOLEAN                       LocalAddressIsIPv6;\r
+  EFI_HTTP_VERSION                  HttpVersion;\r
+  UINT32                            TimeOutMillisec;\r
+  BOOLEAN                           LocalAddressIsIPv6;\r
 \r
-  EFI_HTTPv4_ACCESS_POINT       IPv4Node;\r
-  EFI_HTTPv6_ACCESS_POINT       Ipv6Node;\r
+  EFI_HTTPv4_ACCESS_POINT           IPv4Node;\r
+  EFI_HTTPv6_ACCESS_POINT           Ipv6Node;\r
 \r
-  NET_MAP                       TxTokens;\r
-  NET_MAP                       RxTokens;\r
+  NET_MAP                           TxTokens;\r
+  NET_MAP                           RxTokens;\r
 \r
-  CHAR8                         *Url;\r
+  CHAR8                             *Url;\r
 \r
   //\r
   // Https Support\r
   //\r
-  BOOLEAN                          UseHttps;\r
+  BOOLEAN                           UseHttps;\r
 \r
-  EFI_SERVICE_BINDING_PROTOCOL     *TlsSb;\r
-  EFI_HANDLE                       TlsChildHandle; /// Tls ChildHandle\r
-  TLS_CONFIG_DATA                  TlsConfigData;\r
-  EFI_TLS_PROTOCOL                 *Tls;\r
-  EFI_TLS_CONFIGURATION_PROTOCOL   *TlsConfiguration;\r
-  EFI_TLS_SESSION_STATE            TlsSessionState;\r
+  EFI_SERVICE_BINDING_PROTOCOL      *TlsSb;\r
+  EFI_HANDLE                        TlsChildHandle; /// Tls ChildHandle\r
+  TLS_CONFIG_DATA                   TlsConfigData;\r
+  EFI_TLS_PROTOCOL                  *Tls;\r
+  EFI_TLS_CONFIGURATION_PROTOCOL    *TlsConfiguration;\r
+  EFI_TLS_SESSION_STATE             TlsSessionState;\r
 \r
   //\r
   // TlsTxData used for transmitting TLS related messages.\r
   //\r
-  EFI_TCP4_IO_TOKEN                Tcp4TlsTxToken;\r
-  EFI_TCP4_TRANSMIT_DATA           Tcp4TlsTxData;\r
-  EFI_TCP6_IO_TOKEN                Tcp6TlsTxToken;\r
-  EFI_TCP6_TRANSMIT_DATA           Tcp6TlsTxData;\r
-  BOOLEAN                          TlsIsTxDone;\r
+  EFI_TCP4_IO_TOKEN                 Tcp4TlsTxToken;\r
+  EFI_TCP4_TRANSMIT_DATA            Tcp4TlsTxData;\r
+  EFI_TCP6_IO_TOKEN                 Tcp6TlsTxToken;\r
+  EFI_TCP6_TRANSMIT_DATA            Tcp6TlsTxData;\r
+  BOOLEAN                           TlsIsTxDone;\r
 \r
   //\r
   // TlsRxData used for receiving TLS related messages.\r
   //\r
-  EFI_TCP4_IO_TOKEN                Tcp4TlsRxToken;\r
-  EFI_TCP4_RECEIVE_DATA            Tcp4TlsRxData;\r
-  EFI_TCP6_IO_TOKEN                Tcp6TlsRxToken;\r
-  EFI_TCP6_RECEIVE_DATA            Tcp6TlsRxData;\r
-  BOOLEAN                          TlsIsRxDone;\r
+  EFI_TCP4_IO_TOKEN                 Tcp4TlsRxToken;\r
+  EFI_TCP4_RECEIVE_DATA             Tcp4TlsRxData;\r
+  EFI_TCP6_IO_TOKEN                 Tcp6TlsRxToken;\r
+  EFI_TCP6_RECEIVE_DATA             Tcp6TlsRxData;\r
+  BOOLEAN                           TlsIsRxDone;\r
 } HTTP_PROTOCOL;\r
 \r
 typedef struct {\r
-  EFI_HTTP_TOKEN                *HttpToken;\r
-  HTTP_PROTOCOL                 *HttpInstance;\r
-  HTTP_TCP_TOKEN_WRAP           TcpWrap;\r
+  EFI_HTTP_TOKEN         *HttpToken;\r
+  HTTP_PROTOCOL          *HttpInstance;\r
+  HTTP_TCP_TOKEN_WRAP    TcpWrap;\r
 } HTTP_TOKEN_WRAP;\r
 \r
-\r
 #define HTTP_PROTOCOL_SIGNATURE  SIGNATURE_32('H', 't', 't', 'P')\r
 \r
 #define HTTP_INSTANCE_FROM_PROTOCOL(a) \\r
@@ -239,7 +237,7 @@ HttpCommonNotify (
 **/\r
 EFI_STATUS\r
 HttpCreateTcpConnCloseEvent (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   );\r
 \r
 /**\r
@@ -250,7 +248,7 @@ HttpCreateTcpConnCloseEvent (
 **/\r
 VOID\r
 HttpCloseTcpConnCloseEvent (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   );\r
 \r
 /**\r
@@ -264,7 +262,7 @@ HttpCloseTcpConnCloseEvent (
 **/\r
 EFI_STATUS\r
 HttpCreateTcpTxEvent (\r
-  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   );\r
 \r
 /**\r
@@ -278,7 +276,7 @@ HttpCreateTcpTxEvent (
 **/\r
 EFI_STATUS\r
 HttpCreateTcpRxEventForHeader (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   );\r
 \r
 /**\r
@@ -292,7 +290,7 @@ HttpCreateTcpRxEventForHeader (
 **/\r
 EFI_STATUS\r
 HttpCreateTcpRxEvent (\r
-  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   );\r
 \r
 /**\r
@@ -303,7 +301,7 @@ HttpCreateTcpRxEvent (
 **/\r
 VOID\r
 HttpCloseTcpRxEvent (\r
-  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   );\r
 \r
 /**\r
@@ -318,8 +316,8 @@ HttpCloseTcpRxEvent (
 **/\r
 EFI_STATUS\r
 HttpInitProtocol (\r
-  IN OUT HTTP_PROTOCOL           *HttpInstance,\r
-  IN     BOOLEAN                 IpVersion\r
+  IN OUT HTTP_PROTOCOL  *HttpInstance,\r
+  IN     BOOLEAN        IpVersion\r
   );\r
 \r
 /**\r
@@ -330,7 +328,7 @@ HttpInitProtocol (
 **/\r
 VOID\r
 HttpCleanProtocol (\r
-  IN  HTTP_PROTOCOL          *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   );\r
 \r
 /**\r
@@ -344,7 +342,7 @@ HttpCleanProtocol (
 **/\r
 EFI_STATUS\r
 HttpCreateConnection (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   );\r
 \r
 /**\r
@@ -358,7 +356,7 @@ HttpCreateConnection (
 **/\r
 EFI_STATUS\r
 HttpCloseConnection (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   );\r
 \r
 /**\r
@@ -373,8 +371,8 @@ HttpCloseConnection (
 **/\r
 EFI_STATUS\r
 HttpConfigureTcp4 (\r
-  IN  HTTP_PROTOCOL        *HttpInstance,\r
-  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  IN  HTTP_PROTOCOL    *HttpInstance,\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   );\r
 \r
 /**\r
@@ -389,8 +387,8 @@ HttpConfigureTcp4 (
 **/\r
 EFI_STATUS\r
 HttpConfigureTcp6 (\r
-  IN  HTTP_PROTOCOL        *HttpInstance,\r
-  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  IN  HTTP_PROTOCOL    *HttpInstance,\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   );\r
 \r
 /**\r
@@ -406,7 +404,7 @@ HttpConfigureTcp6 (
 **/\r
 EFI_STATUS\r
 HttpConnectTcp4 (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   );\r
 \r
 /**\r
@@ -422,7 +420,7 @@ HttpConnectTcp4 (
 **/\r
 EFI_STATUS\r
 HttpConnectTcp6 (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   );\r
 \r
 /**\r
@@ -462,9 +460,9 @@ HttpTransmitTcp (
 EFI_STATUS\r
 EFIAPI\r
 HttpTokenExist (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   );\r
 \r
 /**\r
@@ -481,9 +479,9 @@ HttpTokenExist (
 EFI_STATUS\r
 EFIAPI\r
 HttpTcpNotReady (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   );\r
 \r
 /**\r
@@ -521,9 +519,9 @@ HttpInitSession (
 EFI_STATUS\r
 EFIAPI\r
 HttpTcpTransmit (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   );\r
 \r
 /**\r
@@ -541,9 +539,9 @@ HttpTcpTransmit (
 EFI_STATUS\r
 EFIAPI\r
 HttpTcpReceive (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   );\r
 \r
 /**\r
@@ -560,10 +558,10 @@ HttpTcpReceive (
 **/\r
 EFI_STATUS\r
 HttpTcpReceiveHeader (\r
-  IN  HTTP_PROTOCOL         *HttpInstance,\r
-  IN  OUT UINTN             *SizeofHeaders,\r
-  IN  OUT UINTN             *BufferSize,\r
-  IN  EFI_EVENT             Timeout\r
+  IN  HTTP_PROTOCOL  *HttpInstance,\r
+  IN  OUT UINTN      *SizeofHeaders,\r
+  IN  OUT UINTN      *BufferSize,\r
+  IN  EFI_EVENT      Timeout\r
   );\r
 \r
 /**\r
@@ -578,8 +576,8 @@ HttpTcpReceiveHeader (
 **/\r
 EFI_STATUS\r
 HttpTcpReceiveBody (\r
-  IN  HTTP_TOKEN_WRAP       *Wrap,\r
-  IN  EFI_HTTP_MESSAGE      *HttpMsg\r
+  IN  HTTP_TOKEN_WRAP   *Wrap,\r
+  IN  EFI_HTTP_MESSAGE  *HttpMsg\r
   );\r
 \r
 /**\r
@@ -590,7 +588,7 @@ HttpTcpReceiveBody (
 **/\r
 VOID\r
 HttpTcpTokenCleanup (\r
-  IN  HTTP_TOKEN_WRAP      *Wrap\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   );\r
 \r
 /**\r
@@ -605,7 +603,7 @@ HttpTcpTokenCleanup (
 **/\r
 EFI_STATUS\r
 HttpResponseWorker (\r
-  IN  HTTP_TOKEN_WRAP           *Wrap\r
+  IN  HTTP_TOKEN_WRAP  *Wrap\r
   );\r
 \r
 /**\r
@@ -617,8 +615,8 @@ HttpResponseWorker (
 **/\r
 VOID\r
 HttpNotify (\r
-  IN  EDKII_HTTP_CALLBACK_EVENT         Event,\r
-  IN  EFI_STATUS                        EventStatus\r
+  IN  EDKII_HTTP_CALLBACK_EVENT  Event,\r
+  IN  EFI_STATUS                 EventStatus\r
   );\r
 \r
 #endif\r
index d503e38515abbc8ec668eed2a0231faf5cbf27d4..ad611e7c383688ab253d862b46fed10c7611309b 100644 (file)
@@ -31,15 +31,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 CHAR8 *\r
 AsciiStrCaseStr (\r
-  IN      CONST CHAR8               *String,\r
-  IN      CONST CHAR8               *SearchString\r
+  IN      CONST CHAR8  *String,\r
+  IN      CONST CHAR8  *SearchString\r
   )\r
 {\r
-  CONST CHAR8 *FirstMatch;\r
-  CONST CHAR8 *SearchStringTmp;\r
+  CONST CHAR8  *FirstMatch;\r
+  CONST CHAR8  *SearchStringTmp;\r
 \r
-  CHAR8 Src;\r
-  CHAR8 Dst;\r
+  CHAR8  Src;\r
+  CHAR8  Dst;\r
 \r
   //\r
   // ASSERT both strings are less long than PcdMaximumAsciiStringLength\r
@@ -48,15 +48,16 @@ AsciiStrCaseStr (
   ASSERT (AsciiStrSize (SearchString) != 0);\r
 \r
   if (*SearchString == '\0') {\r
-    return (CHAR8 *) String;\r
+    return (CHAR8 *)String;\r
   }\r
 \r
   while (*String != '\0') {\r
     SearchStringTmp = SearchString;\r
-    FirstMatch = String;\r
+    FirstMatch      = String;\r
 \r
-    while ((*SearchStringTmp != '\0')\r
-            && (*String != '\0')) {\r
+    while (  (*SearchStringTmp != '\0')\r
+          && (*String != '\0'))\r
+    {\r
       Src = *String;\r
       Dst = *SearchStringTmp;\r
 \r
@@ -77,7 +78,7 @@ AsciiStrCaseStr (
     }\r
 \r
     if (*SearchStringTmp == '\0') {\r
-      return (CHAR8 *) FirstMatch;\r
+      return (CHAR8 *)FirstMatch;\r
     }\r
 \r
     String = FirstMatch + 1;\r
@@ -95,12 +96,12 @@ AsciiStrCaseStr (
 VOID\r
 EFIAPI\r
 FreeNbufList (\r
-  IN VOID *Arg\r
+  IN VOID  *Arg\r
   )\r
 {\r
   ASSERT (Arg != NULL);\r
 \r
-  NetbufFreeList ((LIST_ENTRY *) Arg);\r
+  NetbufFreeList ((LIST_ENTRY *)Arg);\r
   FreePool (Arg);\r
 }\r
 \r
@@ -115,7 +116,7 @@ FreeNbufList (
 **/\r
 BOOLEAN\r
 IsHttpsUrl (\r
-  IN CHAR8    *Url\r
+  IN CHAR8  *Url\r
   )\r
 {\r
   CHAR8  *Tmp;\r
@@ -123,7 +124,7 @@ IsHttpsUrl (
   Tmp = NULL;\r
 \r
   Tmp = AsciiStrCaseStr (Url, HTTPS_FLAG);\r
-  if (Tmp != NULL && Tmp == Url) {\r
+  if ((Tmp != NULL) && (Tmp == Url)) {\r
     return TRUE;\r
   }\r
 \r
@@ -144,14 +145,14 @@ IsHttpsUrl (
 EFI_HANDLE\r
 EFIAPI\r
 TlsCreateChild (\r
-  IN  EFI_HANDLE                     ImageHandle,\r
-  OUT EFI_SERVICE_BINDING_PROTOCOL   **TlsSb,\r
-  OUT EFI_TLS_PROTOCOL               **TlsProto,\r
-  OUT EFI_TLS_CONFIGURATION_PROTOCOL **TlsConfiguration\r
+  IN  EFI_HANDLE                      ImageHandle,\r
+  OUT EFI_SERVICE_BINDING_PROTOCOL    **TlsSb,\r
+  OUT EFI_TLS_PROTOCOL                **TlsProto,\r
+  OUT EFI_TLS_CONFIGURATION_PROTOCOL  **TlsConfiguration\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_HANDLE                    TlsChildHandle;\r
+  EFI_STATUS  Status;\r
+  EFI_HANDLE  TlsChildHandle;\r
 \r
   TlsChildHandle = 0;\r
 \r
@@ -159,10 +160,10 @@ TlsCreateChild (
   // Locate TlsServiceBinding protocol.\r
   //\r
   gBS->LocateProtocol (\r
-     &gEfiTlsServiceBindingProtocolGuid,\r
-     NULL,\r
-     (VOID **) TlsSb\r
-     );\r
+         &gEfiTlsServiceBindingProtocolGuid,\r
+         NULL,\r
+         (VOID **)TlsSb\r
+         );\r
   if (*TlsSb == NULL) {\r
     return NULL;\r
   }\r
@@ -175,7 +176,7 @@ TlsCreateChild (
   Status = gBS->OpenProtocol (\r
                   TlsChildHandle,\r
                   &gEfiTlsProtocolGuid,\r
-                  (VOID **) TlsProto,\r
+                  (VOID **)TlsProto,\r
                   ImageHandle,\r
                   TlsChildHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -188,7 +189,7 @@ TlsCreateChild (
   Status = gBS->OpenProtocol (\r
                   TlsChildHandle,\r
                   &gEfiTlsConfigurationProtocolGuid,\r
-                  (VOID **) TlsConfiguration,\r
+                  (VOID **)TlsConfiguration,\r
                   ImageHandle,\r
                   TlsChildHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -214,10 +215,10 @@ TlsCreateChild (
 EFI_STATUS\r
 EFIAPI\r
 TlsCreateTxRxEvent (\r
-  IN OUT HTTP_PROTOCOL      *HttpInstance\r
+  IN OUT HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (!HttpInstance->LocalAddressIsIPv6) {\r
     //\r
@@ -234,14 +235,14 @@ TlsCreateTxRxEvent (
       goto ERROR;\r
     }\r
 \r
-    HttpInstance->Tcp4TlsTxData.Push = TRUE;\r
-    HttpInstance->Tcp4TlsTxData.Urgent = FALSE;\r
-    HttpInstance->Tcp4TlsTxData.DataLength = 0;\r
-    HttpInstance->Tcp4TlsTxData.FragmentCount = 1;\r
+    HttpInstance->Tcp4TlsTxData.Push                            = TRUE;\r
+    HttpInstance->Tcp4TlsTxData.Urgent                          = FALSE;\r
+    HttpInstance->Tcp4TlsTxData.DataLength                      = 0;\r
+    HttpInstance->Tcp4TlsTxData.FragmentCount                   = 1;\r
     HttpInstance->Tcp4TlsTxData.FragmentTable[0].FragmentLength = HttpInstance->Tcp4TlsTxData.DataLength;\r
     HttpInstance->Tcp4TlsTxData.FragmentTable[0].FragmentBuffer = NULL;\r
-    HttpInstance->Tcp4TlsTxToken.Packet.TxData = &HttpInstance->Tcp4TlsTxData;\r
-    HttpInstance->Tcp4TlsTxToken.CompletionToken.Status = EFI_NOT_READY;\r
+    HttpInstance->Tcp4TlsTxToken.Packet.TxData                  = &HttpInstance->Tcp4TlsTxData;\r
+    HttpInstance->Tcp4TlsTxToken.CompletionToken.Status         = EFI_NOT_READY;\r
 \r
     //\r
     // For Tcp4TlsRxToken.\r
@@ -257,12 +258,12 @@ TlsCreateTxRxEvent (
       goto ERROR;\r
     }\r
 \r
-    HttpInstance->Tcp4TlsRxData.DataLength                       = 0;\r
-    HttpInstance->Tcp4TlsRxData.FragmentCount                    = 1;\r
-    HttpInstance->Tcp4TlsRxData.FragmentTable[0].FragmentLength  = HttpInstance->Tcp4TlsRxData.DataLength ;\r
-    HttpInstance->Tcp4TlsRxData.FragmentTable[0].FragmentBuffer  = NULL;\r
-    HttpInstance->Tcp4TlsRxToken.Packet.RxData          = &HttpInstance->Tcp4TlsRxData;\r
-    HttpInstance->Tcp4TlsRxToken.CompletionToken.Status = EFI_NOT_READY;\r
+    HttpInstance->Tcp4TlsRxData.DataLength                      = 0;\r
+    HttpInstance->Tcp4TlsRxData.FragmentCount                   = 1;\r
+    HttpInstance->Tcp4TlsRxData.FragmentTable[0].FragmentLength = HttpInstance->Tcp4TlsRxData.DataLength;\r
+    HttpInstance->Tcp4TlsRxData.FragmentTable[0].FragmentBuffer = NULL;\r
+    HttpInstance->Tcp4TlsRxToken.Packet.RxData                  = &HttpInstance->Tcp4TlsRxData;\r
+    HttpInstance->Tcp4TlsRxToken.CompletionToken.Status         = EFI_NOT_READY;\r
   } else {\r
     //\r
     // For Tcp6TlsTxToken.\r
@@ -278,14 +279,14 @@ TlsCreateTxRxEvent (
       goto ERROR;\r
     }\r
 \r
-    HttpInstance->Tcp6TlsTxData.Push = TRUE;\r
-    HttpInstance->Tcp6TlsTxData.Urgent = FALSE;\r
-    HttpInstance->Tcp6TlsTxData.DataLength = 0;\r
-    HttpInstance->Tcp6TlsTxData.FragmentCount = 1;\r
+    HttpInstance->Tcp6TlsTxData.Push                            = TRUE;\r
+    HttpInstance->Tcp6TlsTxData.Urgent                          = FALSE;\r
+    HttpInstance->Tcp6TlsTxData.DataLength                      = 0;\r
+    HttpInstance->Tcp6TlsTxData.FragmentCount                   = 1;\r
     HttpInstance->Tcp6TlsTxData.FragmentTable[0].FragmentLength = HttpInstance->Tcp6TlsTxData.DataLength;\r
     HttpInstance->Tcp6TlsTxData.FragmentTable[0].FragmentBuffer = NULL;\r
-    HttpInstance->Tcp6TlsTxToken.Packet.TxData = &HttpInstance->Tcp6TlsTxData;\r
-    HttpInstance->Tcp6TlsTxToken.CompletionToken.Status = EFI_NOT_READY;\r
+    HttpInstance->Tcp6TlsTxToken.Packet.TxData                  = &HttpInstance->Tcp6TlsTxData;\r
+    HttpInstance->Tcp6TlsTxToken.CompletionToken.Status         = EFI_NOT_READY;\r
 \r
     //\r
     // For Tcp6TlsRxToken.\r
@@ -301,12 +302,12 @@ TlsCreateTxRxEvent (
       goto ERROR;\r
     }\r
 \r
-    HttpInstance->Tcp6TlsRxData.DataLength                       = 0;\r
-    HttpInstance->Tcp6TlsRxData.FragmentCount                    = 1;\r
-    HttpInstance->Tcp6TlsRxData.FragmentTable[0].FragmentLength  = HttpInstance->Tcp6TlsRxData.DataLength ;\r
-    HttpInstance->Tcp6TlsRxData.FragmentTable[0].FragmentBuffer  = NULL;\r
-    HttpInstance->Tcp6TlsRxToken.Packet.RxData          = &HttpInstance->Tcp6TlsRxData;\r
-    HttpInstance->Tcp6TlsRxToken.CompletionToken.Status = EFI_NOT_READY;\r
+    HttpInstance->Tcp6TlsRxData.DataLength                      = 0;\r
+    HttpInstance->Tcp6TlsRxData.FragmentCount                   = 1;\r
+    HttpInstance->Tcp6TlsRxData.FragmentTable[0].FragmentLength = HttpInstance->Tcp6TlsRxData.DataLength;\r
+    HttpInstance->Tcp6TlsRxData.FragmentTable[0].FragmentBuffer = NULL;\r
+    HttpInstance->Tcp6TlsRxToken.Packet.RxData                  = &HttpInstance->Tcp6TlsRxData;\r
+    HttpInstance->Tcp6TlsRxToken.CompletionToken.Status         = EFI_NOT_READY;\r
   }\r
 \r
   return Status;\r
@@ -329,13 +330,13 @@ ERROR:
 VOID\r
 EFIAPI\r
 TlsCloseTxRxEvent (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
   ASSERT (HttpInstance != NULL);\r
   if (!HttpInstance->LocalAddressIsIPv6) {\r
     if (NULL != HttpInstance->Tcp4TlsTxToken.CompletionToken.Event) {\r
-      gBS->CloseEvent(HttpInstance->Tcp4TlsTxToken.CompletionToken.Event);\r
+      gBS->CloseEvent (HttpInstance->Tcp4TlsTxToken.CompletionToken.Event);\r
       HttpInstance->Tcp4TlsTxToken.CompletionToken.Event = NULL;\r
     }\r
 \r
@@ -345,7 +346,7 @@ TlsCloseTxRxEvent (
     }\r
   } else {\r
     if (NULL != HttpInstance->Tcp6TlsTxToken.CompletionToken.Event) {\r
-      gBS->CloseEvent(HttpInstance->Tcp6TlsTxToken.CompletionToken.Event);\r
+      gBS->CloseEvent (HttpInstance->Tcp6TlsTxToken.CompletionToken.Event);\r
       HttpInstance->Tcp6TlsTxToken.CompletionToken.Event = NULL;\r
     }\r
 \r
@@ -369,7 +370,7 @@ TlsCloseTxRxEvent (
 **/\r
 EFI_STATUS\r
 TlsConfigCertificate (\r
-  IN OUT HTTP_PROTOCOL      *HttpInstance\r
+  IN OUT HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
   EFI_STATUS          Status;\r
@@ -388,15 +389,15 @@ TlsConfigCertificate (
   //\r
   // Try to read the TlsCaCertificate variable.\r
   //\r
-  Status  = gRT->GetVariable (\r
-                   EFI_TLS_CA_CERTIFICATE_VARIABLE,\r
-                   &gEfiTlsCaCertificateGuid,\r
-                   NULL,\r
-                   &CACertSize,\r
-                   NULL\r
-                   );\r
+  Status = gRT->GetVariable (\r
+                  EFI_TLS_CA_CERTIFICATE_VARIABLE,\r
+                  &gEfiTlsCaCertificateGuid,\r
+                  NULL,\r
+                  &CACertSize,\r
+                  NULL\r
+                  );\r
 \r
-  if (EFI_ERROR (Status) && Status != EFI_BUFFER_TOO_SMALL) {\r
+  if (EFI_ERROR (Status) && (Status != EFI_BUFFER_TOO_SMALL)) {\r
     return Status;\r
   }\r
 \r
@@ -427,62 +428,82 @@ TlsConfigCertificate (
   //\r
   // Sanity check\r
   //\r
-  Status = EFI_INVALID_PARAMETER;\r
-  CertCount = 0;\r
-  ItemDataSize = (UINT32) CACertSize;\r
+  Status       = EFI_INVALID_PARAMETER;\r
+  CertCount    = 0;\r
+  ItemDataSize = (UINT32)CACertSize;\r
   while (ItemDataSize > 0) {\r
     if (ItemDataSize < sizeof (EFI_SIGNATURE_LIST)) {\r
-      DEBUG ((DEBUG_ERROR, "%a: truncated EFI_SIGNATURE_LIST header\n",\r
-        __FUNCTION__));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: truncated EFI_SIGNATURE_LIST header\n",\r
+        __FUNCTION__\r
+        ));\r
       goto FreeCACert;\r
     }\r
 \r
-    CertList = (EFI_SIGNATURE_LIST *) (CACert + (CACertSize - ItemDataSize));\r
+    CertList = (EFI_SIGNATURE_LIST *)(CACert + (CACertSize - ItemDataSize));\r
 \r
     if (CertList->SignatureListSize < sizeof (EFI_SIGNATURE_LIST)) {\r
-      DEBUG ((DEBUG_ERROR,\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
         "%a: SignatureListSize too small for EFI_SIGNATURE_LIST\n",\r
-        __FUNCTION__));\r
+        __FUNCTION__\r
+        ));\r
       goto FreeCACert;\r
     }\r
 \r
     if (CertList->SignatureListSize > ItemDataSize) {\r
-      DEBUG ((DEBUG_ERROR, "%a: truncated EFI_SIGNATURE_LIST body\n",\r
-        __FUNCTION__));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: truncated EFI_SIGNATURE_LIST body\n",\r
+        __FUNCTION__\r
+        ));\r
       goto FreeCACert;\r
     }\r
 \r
     if (!CompareGuid (&CertList->SignatureType, &gEfiCertX509Guid)) {\r
-      DEBUG ((DEBUG_ERROR, "%a: only X509 certificates are supported\n",\r
-        __FUNCTION__));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: only X509 certificates are supported\n",\r
+        __FUNCTION__\r
+        ));\r
       Status = EFI_UNSUPPORTED;\r
       goto FreeCACert;\r
     }\r
 \r
     if (CertList->SignatureHeaderSize != 0) {\r
-      DEBUG ((DEBUG_ERROR, "%a: SignatureHeaderSize must be 0 for X509\n",\r
-        __FUNCTION__));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: SignatureHeaderSize must be 0 for X509\n",\r
+        __FUNCTION__\r
+        ));\r
       goto FreeCACert;\r
     }\r
 \r
     if (CertList->SignatureSize < sizeof (EFI_SIGNATURE_DATA)) {\r
-      DEBUG ((DEBUG_ERROR,\r
-        "%a: SignatureSize too small for EFI_SIGNATURE_DATA\n", __FUNCTION__));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: SignatureSize too small for EFI_SIGNATURE_DATA\n",\r
+        __FUNCTION__\r
+        ));\r
       goto FreeCACert;\r
     }\r
 \r
     CertArraySizeInBytes = (CertList->SignatureListSize -\r
                             sizeof (EFI_SIGNATURE_LIST));\r
     if (CertArraySizeInBytes % CertList->SignatureSize != 0) {\r
-      DEBUG ((DEBUG_ERROR,\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
         "%a: EFI_SIGNATURE_DATA array not a multiple of SignatureSize\n",\r
-        __FUNCTION__));\r
+        __FUNCTION__\r
+        ));\r
       goto FreeCACert;\r
     }\r
 \r
-    CertCount += CertArraySizeInBytes / CertList->SignatureSize;\r
+    CertCount    += CertArraySizeInBytes / CertList->SignatureSize;\r
     ItemDataSize -= CertList->SignatureListSize;\r
   }\r
+\r
   if (CertCount == 0) {\r
     DEBUG ((DEBUG_ERROR, "%a: no X509 certificates provided\n", __FUNCTION__));\r
     goto FreeCACert;\r
@@ -491,11 +512,11 @@ TlsConfigCertificate (
   //\r
   // Enumerate all data and erasing the target item.\r
   //\r
-  ItemDataSize = (UINT32) CACertSize;\r
-  CertList = (EFI_SIGNATURE_LIST *) CACert;\r
+  ItemDataSize = (UINT32)CACertSize;\r
+  CertList     = (EFI_SIGNATURE_LIST *)CACert;\r
   while ((ItemDataSize > 0) && (ItemDataSize >= CertList->SignatureListSize)) {\r
-    Cert = (EFI_SIGNATURE_DATA *) ((UINT8 *) CertList + sizeof (EFI_SIGNATURE_LIST) + CertList->SignatureHeaderSize);\r
-    CertCount  = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) - CertList->SignatureHeaderSize) / CertList->SignatureSize;\r
+    Cert      = (EFI_SIGNATURE_DATA *)((UINT8 *)CertList + sizeof (EFI_SIGNATURE_LIST) + CertList->SignatureHeaderSize);\r
+    CertCount = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) - CertList->SignatureHeaderSize) / CertList->SignatureSize;\r
     for (Index = 0; Index < CertCount; Index++) {\r
       //\r
       // EfiTlsConfigDataTypeCACertificate\r
@@ -510,11 +531,11 @@ TlsConfigCertificate (
         goto FreeCACert;\r
       }\r
 \r
-      Cert = (EFI_SIGNATURE_DATA *) ((UINT8 *) Cert + CertList->SignatureSize);\r
+      Cert = (EFI_SIGNATURE_DATA *)((UINT8 *)Cert + CertList->SignatureSize);\r
     }\r
 \r
     ItemDataSize -= CertList->SignatureListSize;\r
-    CertList = (EFI_SIGNATURE_LIST *) ((UINT8 *) CertList + CertList->SignatureListSize);\r
+    CertList      = (EFI_SIGNATURE_LIST *)((UINT8 *)CertList + CertList->SignatureListSize);\r
   }\r
 \r
 FreeCACert:\r
@@ -537,12 +558,12 @@ FreeCACert:
 **/\r
 EFI_STATUS\r
 TlsConfigCipherList (\r
-  IN OUT HTTP_PROTOCOL      *HttpInstance\r
+  IN OUT HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  UINT8               *CipherList;\r
-  UINTN               CipherListSize;\r
+  EFI_STATUS  Status;\r
+  UINT8       *CipherList;\r
+  UINTN       CipherListSize;\r
 \r
   CipherList     = NULL;\r
   CipherListSize = 0;\r
@@ -550,13 +571,13 @@ TlsConfigCipherList (
   //\r
   // Try to read the HttpTlsCipherList variable.\r
   //\r
-  Status  = gRT->GetVariable (\r
-                   EDKII_HTTP_TLS_CIPHER_LIST_VARIABLE,\r
-                   &gEdkiiHttpTlsCipherListGuid,\r
-                   NULL,\r
-                   &CipherListSize,\r
-                   NULL\r
-                   );\r
+  Status = gRT->GetVariable (\r
+                  EDKII_HTTP_TLS_CIPHER_LIST_VARIABLE,\r
+                  &gEdkiiHttpTlsCipherListGuid,\r
+                  NULL,\r
+                  &CipherListSize,\r
+                  NULL\r
+                  );\r
   ASSERT (EFI_ERROR (Status));\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     return Status;\r
@@ -615,10 +636,10 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 TlsConfigureSession (\r
-  IN OUT HTTP_PROTOCOL      *HttpInstance\r
+  IN OUT HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
-  EFI_STATUS                 Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // TlsConfigData initialization\r
@@ -679,7 +700,7 @@ TlsConfigureSession (
   // Tls Cipher List\r
   //\r
   Status = TlsConfigCipherList (HttpInstance);\r
-  if (EFI_ERROR (Status) && Status != EFI_NOT_FOUND) {\r
+  if (EFI_ERROR (Status) && (Status != EFI_NOT_FOUND)) {\r
     DEBUG ((DEBUG_ERROR, "TlsConfigCipherList: return %r error.\n", Status));\r
     return Status;\r
   }\r
@@ -725,13 +746,13 @@ ERROR:
 EFI_STATUS\r
 EFIAPI\r
 TlsCommonTransmit (\r
-  IN OUT HTTP_PROTOCOL      *HttpInstance,\r
-  IN     NET_BUF            *Packet\r
+  IN OUT HTTP_PROTOCOL  *HttpInstance,\r
+  IN     NET_BUF        *Packet\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  VOID                      *Data;\r
-  UINTN                     Size;\r
+  EFI_STATUS  Status;\r
+  VOID        *Data;\r
+  UINTN       Size;\r
 \r
   if ((HttpInstance == NULL) || (Packet == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -751,29 +772,29 @@ TlsCommonTransmit (
   }\r
 \r
   if (!HttpInstance->LocalAddressIsIPv6) {\r
-    ((EFI_TCP4_TRANSMIT_DATA *) Data)->Push        = TRUE;\r
-    ((EFI_TCP4_TRANSMIT_DATA *) Data)->Urgent      = FALSE;\r
-    ((EFI_TCP4_TRANSMIT_DATA *) Data)->DataLength  = Packet->TotalSize;\r
+    ((EFI_TCP4_TRANSMIT_DATA *)Data)->Push       = TRUE;\r
+    ((EFI_TCP4_TRANSMIT_DATA *)Data)->Urgent     = FALSE;\r
+    ((EFI_TCP4_TRANSMIT_DATA *)Data)->DataLength = Packet->TotalSize;\r
 \r
     //\r
     // Build the fragment table.\r
     //\r
-    ((EFI_TCP4_TRANSMIT_DATA *) Data)->FragmentCount = Packet->BlockOpNum;\r
+    ((EFI_TCP4_TRANSMIT_DATA *)Data)->FragmentCount = Packet->BlockOpNum;\r
 \r
     NetbufBuildExt (\r
       Packet,\r
-      (NET_FRAGMENT *) &((EFI_TCP4_TRANSMIT_DATA *) Data)->FragmentTable[0],\r
-      &((EFI_TCP4_TRANSMIT_DATA *) Data)->FragmentCount\r
+      (NET_FRAGMENT *)&((EFI_TCP4_TRANSMIT_DATA *)Data)->FragmentTable[0],\r
+      &((EFI_TCP4_TRANSMIT_DATA *)Data)->FragmentCount\r
       );\r
 \r
-    HttpInstance->Tcp4TlsTxToken.Packet.TxData = (EFI_TCP4_TRANSMIT_DATA *) Data;\r
+    HttpInstance->Tcp4TlsTxToken.Packet.TxData = (EFI_TCP4_TRANSMIT_DATA *)Data;\r
 \r
     Status = EFI_DEVICE_ERROR;\r
 \r
     //\r
     // Transmit the packet.\r
     //\r
-    Status  = HttpInstance->Tcp4->Transmit (HttpInstance->Tcp4, &HttpInstance->Tcp4TlsTxToken);\r
+    Status = HttpInstance->Tcp4->Transmit (HttpInstance->Tcp4, &HttpInstance->Tcp4TlsTxToken);\r
     if (EFI_ERROR (Status)) {\r
       goto ON_EXIT;\r
     }\r
@@ -783,31 +804,31 @@ TlsCommonTransmit (
     }\r
 \r
     HttpInstance->TlsIsTxDone = FALSE;\r
-    Status = HttpInstance->Tcp4TlsTxToken.CompletionToken.Status;\r
+    Status                    = HttpInstance->Tcp4TlsTxToken.CompletionToken.Status;\r
   } else {\r
-    ((EFI_TCP6_TRANSMIT_DATA *) Data)->Push        = TRUE;\r
-    ((EFI_TCP6_TRANSMIT_DATA *) Data)->Urgent      = FALSE;\r
-    ((EFI_TCP6_TRANSMIT_DATA *) Data)->DataLength  = Packet->TotalSize;\r
+    ((EFI_TCP6_TRANSMIT_DATA *)Data)->Push       = TRUE;\r
+    ((EFI_TCP6_TRANSMIT_DATA *)Data)->Urgent     = FALSE;\r
+    ((EFI_TCP6_TRANSMIT_DATA *)Data)->DataLength = Packet->TotalSize;\r
 \r
     //\r
     // Build the fragment table.\r
     //\r
-    ((EFI_TCP6_TRANSMIT_DATA *) Data)->FragmentCount = Packet->BlockOpNum;\r
+    ((EFI_TCP6_TRANSMIT_DATA *)Data)->FragmentCount = Packet->BlockOpNum;\r
 \r
     NetbufBuildExt (\r
       Packet,\r
-      (NET_FRAGMENT *) &((EFI_TCP6_TRANSMIT_DATA *) Data)->FragmentTable[0],\r
-      &((EFI_TCP6_TRANSMIT_DATA *) Data)->FragmentCount\r
+      (NET_FRAGMENT *)&((EFI_TCP6_TRANSMIT_DATA *)Data)->FragmentTable[0],\r
+      &((EFI_TCP6_TRANSMIT_DATA *)Data)->FragmentCount\r
       );\r
 \r
-    HttpInstance->Tcp6TlsTxToken.Packet.TxData = (EFI_TCP6_TRANSMIT_DATA *) Data;\r
+    HttpInstance->Tcp6TlsTxToken.Packet.TxData = (EFI_TCP6_TRANSMIT_DATA *)Data;\r
 \r
     Status = EFI_DEVICE_ERROR;\r
 \r
     //\r
     // Transmit the packet.\r
     //\r
-    Status  = HttpInstance->Tcp6->Transmit (HttpInstance->Tcp6, &HttpInstance->Tcp6TlsTxToken);\r
+    Status = HttpInstance->Tcp6->Transmit (HttpInstance->Tcp6, &HttpInstance->Tcp6TlsTxToken);\r
     if (EFI_ERROR (Status)) {\r
       goto ON_EXIT;\r
     }\r
@@ -817,7 +838,7 @@ TlsCommonTransmit (
     }\r
 \r
     HttpInstance->TlsIsTxDone = FALSE;\r
-    Status = HttpInstance->Tcp6TlsTxToken.CompletionToken.Status;\r
+    Status                    = HttpInstance->Tcp6TlsTxToken.CompletionToken.Status;\r
   }\r
 \r
 ON_EXIT:\r
@@ -843,17 +864,17 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 TlsCommonReceive (\r
-  IN OUT HTTP_PROTOCOL      *HttpInstance,\r
-  IN     NET_BUF            *Packet,\r
-  IN     EFI_EVENT          Timeout\r
+  IN OUT HTTP_PROTOCOL  *HttpInstance,\r
+  IN     NET_BUF        *Packet,\r
+  IN     EFI_EVENT      Timeout\r
   )\r
 {\r
-  EFI_TCP4_RECEIVE_DATA     *Tcp4RxData;\r
-  EFI_TCP6_RECEIVE_DATA     *Tcp6RxData;\r
-  EFI_STATUS                Status;\r
-  NET_FRAGMENT              *Fragment;\r
-  UINT32                    FragmentCount;\r
-  UINT32                    CurrentFragment;\r
+  EFI_TCP4_RECEIVE_DATA  *Tcp4RxData;\r
+  EFI_TCP6_RECEIVE_DATA  *Tcp6RxData;\r
+  EFI_STATUS             Status;\r
+  NET_FRAGMENT           *Fragment;\r
+  UINT32                 FragmentCount;\r
+  UINT32                 CurrentFragment;\r
 \r
   Tcp4RxData = NULL;\r
   Tcp6RxData = NULL;\r
@@ -879,30 +900,33 @@ TlsCommonReceive (
     if (Tcp4RxData == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
-    Tcp4RxData->FragmentCount         = 1;\r
+\r
+    Tcp4RxData->FragmentCount = 1;\r
   } else {\r
     Tcp6RxData = HttpInstance->Tcp6TlsRxToken.Packet.RxData;\r
     if (Tcp6RxData == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
-    Tcp6RxData->FragmentCount         = 1;\r
+\r
+    Tcp6RxData->FragmentCount = 1;\r
   }\r
 \r
-  CurrentFragment               = 0;\r
-  Status                        = EFI_SUCCESS;\r
+  CurrentFragment = 0;\r
+  Status          = EFI_SUCCESS;\r
 \r
   while (CurrentFragment < FragmentCount) {\r
     if (!HttpInstance->LocalAddressIsIPv6) {\r
-      Tcp4RxData->DataLength                       = Fragment[CurrentFragment].Len;\r
-      Tcp4RxData->FragmentTable[0].FragmentLength  = Fragment[CurrentFragment].Len;\r
-      Tcp4RxData->FragmentTable[0].FragmentBuffer  = Fragment[CurrentFragment].Bulk;\r
-      Status = HttpInstance->Tcp4->Receive (HttpInstance->Tcp4, &HttpInstance->Tcp4TlsRxToken);\r
+      Tcp4RxData->DataLength                      = Fragment[CurrentFragment].Len;\r
+      Tcp4RxData->FragmentTable[0].FragmentLength = Fragment[CurrentFragment].Len;\r
+      Tcp4RxData->FragmentTable[0].FragmentBuffer = Fragment[CurrentFragment].Bulk;\r
+      Status                                      = HttpInstance->Tcp4->Receive (HttpInstance->Tcp4, &HttpInstance->Tcp4TlsRxToken);\r
     } else {\r
-      Tcp6RxData->DataLength                       = Fragment[CurrentFragment].Len;\r
-      Tcp6RxData->FragmentTable[0].FragmentLength  = Fragment[CurrentFragment].Len;\r
-      Tcp6RxData->FragmentTable[0].FragmentBuffer  = Fragment[CurrentFragment].Bulk;\r
-      Status = HttpInstance->Tcp6->Receive (HttpInstance->Tcp6, &HttpInstance->Tcp6TlsRxToken);\r
+      Tcp6RxData->DataLength                      = Fragment[CurrentFragment].Len;\r
+      Tcp6RxData->FragmentTable[0].FragmentLength = Fragment[CurrentFragment].Len;\r
+      Tcp6RxData->FragmentTable[0].FragmentBuffer = Fragment[CurrentFragment].Bulk;\r
+      Status                                      = HttpInstance->Tcp6->Receive (HttpInstance->Tcp6, &HttpInstance->Tcp6TlsRxToken);\r
     }\r
+\r
     if (EFI_ERROR (Status)) {\r
       goto ON_EXIT;\r
     }\r
@@ -988,22 +1012,22 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 TlsReceiveOnePdu (\r
-  IN OUT HTTP_PROTOCOL      *HttpInstance,\r
-     OUT NET_BUF            **Pdu,\r
-  IN     EFI_EVENT          Timeout\r
+  IN OUT HTTP_PROTOCOL  *HttpInstance,\r
+  OUT NET_BUF           **Pdu,\r
+  IN     EFI_EVENT      Timeout\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
+  EFI_STATUS  Status;\r
 \r
-  LIST_ENTRY      *NbufList;\r
+  LIST_ENTRY  *NbufList;\r
 \r
-  UINT32          Len;\r
+  UINT32  Len;\r
 \r
-  NET_BUF           *PduHdr;\r
-  UINT8             *Header;\r
-  TLS_RECORD_HEADER RecordHeader;\r
+  NET_BUF            *PduHdr;\r
+  UINT8              *Header;\r
+  TLS_RECORD_HEADER  RecordHeader;\r
 \r
-  NET_BUF           *DataSeg;\r
+  NET_BUF  *DataSeg;\r
 \r
   NbufList = NULL;\r
   PduHdr   = NULL;\r
@@ -1020,8 +1044,8 @@ TlsReceiveOnePdu (
   //\r
   // Allocate buffer to receive one TLS header.\r
   //\r
-  Len     = TLS_RECORD_HEADER_LENGTH;\r
-  PduHdr  = NetbufAlloc (Len);\r
+  Len    = TLS_RECORD_HEADER_LENGTH;\r
+  PduHdr = NetbufAlloc (Len);\r
   if (PduHdr == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
@@ -1041,23 +1065,24 @@ TlsReceiveOnePdu (
     goto ON_EXIT;\r
   }\r
 \r
-  RecordHeader = *(TLS_RECORD_HEADER *) Header;\r
-  if ((RecordHeader.ContentType == TlsContentTypeHandshake ||\r
-    RecordHeader.ContentType == TlsContentTypeAlert ||\r
-    RecordHeader.ContentType == TlsContentTypeChangeCipherSpec ||\r
-    RecordHeader.ContentType == TlsContentTypeApplicationData) &&\r
-    (RecordHeader.Version.Major == 0x03) && /// Major versions are same.\r
-    (RecordHeader.Version.Minor == TLS10_PROTOCOL_VERSION_MINOR ||\r
-    RecordHeader.Version.Minor ==TLS11_PROTOCOL_VERSION_MINOR ||\r
-    RecordHeader.Version.Minor == TLS12_PROTOCOL_VERSION_MINOR)\r
-   ) {\r
+  RecordHeader = *(TLS_RECORD_HEADER *)Header;\r
+  if (((RecordHeader.ContentType == TlsContentTypeHandshake) ||\r
+       (RecordHeader.ContentType == TlsContentTypeAlert) ||\r
+       (RecordHeader.ContentType == TlsContentTypeChangeCipherSpec) ||\r
+       (RecordHeader.ContentType == TlsContentTypeApplicationData)) &&\r
+      (RecordHeader.Version.Major == 0x03) && /// Major versions are same.\r
+      ((RecordHeader.Version.Minor == TLS10_PROTOCOL_VERSION_MINOR) ||\r
+       (RecordHeader.Version.Minor == TLS11_PROTOCOL_VERSION_MINOR) ||\r
+       (RecordHeader.Version.Minor == TLS12_PROTOCOL_VERSION_MINOR))\r
+      )\r
+  {\r
     InsertTailList (NbufList, &PduHdr->List);\r
   } else {\r
     Status = EFI_PROTOCOL_ERROR;\r
     goto ON_EXIT;\r
   }\r
 \r
-  Len = SwapBytes16(RecordHeader.Length);\r
+  Len = SwapBytes16 (RecordHeader.Length);\r
   if (Len == 0) {\r
     //\r
     // No TLS payload.\r
@@ -1122,37 +1147,37 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 TlsConnectSession (\r
-  IN  HTTP_PROTOCOL            *HttpInstance,\r
-  IN  EFI_EVENT                Timeout\r
+  IN  HTTP_PROTOCOL  *HttpInstance,\r
+  IN  EFI_EVENT      Timeout\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
-  UINT8                   *BufferOut;\r
-  UINTN                   BufferOutSize;\r
-  NET_BUF                 *PacketOut;\r
-  UINT8                   *DataOut;\r
-  NET_BUF                 *Pdu;\r
-  UINT8                   *BufferIn;\r
-  UINTN                   BufferInSize;\r
-  UINT8                   *GetSessionDataBuffer;\r
-  UINTN                   GetSessionDataBufferSize;\r
-\r
-  BufferOut    = NULL;\r
-  PacketOut    = NULL;\r
-  DataOut      = NULL;\r
-  Pdu          = NULL;\r
-  BufferIn     = NULL;\r
+  EFI_STATUS  Status;\r
+  UINT8       *BufferOut;\r
+  UINTN       BufferOutSize;\r
+  NET_BUF     *PacketOut;\r
+  UINT8       *DataOut;\r
+  NET_BUF     *Pdu;\r
+  UINT8       *BufferIn;\r
+  UINTN       BufferInSize;\r
+  UINT8       *GetSessionDataBuffer;\r
+  UINTN       GetSessionDataBufferSize;\r
+\r
+  BufferOut = NULL;\r
+  PacketOut = NULL;\r
+  DataOut   = NULL;\r
+  Pdu       = NULL;\r
+  BufferIn  = NULL;\r
 \r
   //\r
   // Initialize TLS state.\r
   //\r
   HttpInstance->TlsSessionState = EfiTlsSessionNotStarted;\r
-  Status = HttpInstance->Tls->SetSessionData (\r
-                                HttpInstance->Tls,\r
-                                EfiTlsSessionState,\r
-                                &(HttpInstance->TlsSessionState),\r
-                                sizeof (EFI_TLS_SESSION_STATE)\r
-                                );\r
+  Status                        = HttpInstance->Tls->SetSessionData (\r
+                                                       HttpInstance->Tls,\r
+                                                       EfiTlsSessionState,\r
+                                                       &(HttpInstance->TlsSessionState),\r
+                                                       sizeof (EFI_TLS_SESSION_STATE)\r
+                                                       );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -1161,7 +1186,7 @@ TlsConnectSession (
   // Create ClientHello\r
   //\r
   BufferOutSize = DEF_BUF_LEN;\r
-  BufferOut = AllocateZeroPool (BufferOutSize);\r
+  BufferOut     = AllocateZeroPool (BufferOutSize);\r
   if (BufferOut == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     return Status;\r
@@ -1190,6 +1215,7 @@ TlsConnectSession (
                                   &BufferOutSize\r
                                   );\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     FreePool (BufferOut);\r
     return Status;\r
@@ -1198,8 +1224,8 @@ TlsConnectSession (
   //\r
   // Transmit ClientHello\r
   //\r
-  PacketOut = NetbufAlloc ((UINT32) BufferOutSize);\r
-  DataOut = NetbufAllocSpace (PacketOut, (UINT32) BufferOutSize, NET_BUF_TAIL);\r
+  PacketOut = NetbufAlloc ((UINT32)BufferOutSize);\r
+  DataOut   = NetbufAllocSpace (PacketOut, (UINT32)BufferOutSize, NET_BUF_TAIL);\r
   if (DataOut == NULL) {\r
     FreePool (BufferOut);\r
     return EFI_OUT_OF_RESOURCES;\r
@@ -1215,8 +1241,9 @@ TlsConnectSession (
     return Status;\r
   }\r
 \r
-  while(HttpInstance->TlsSessionState != EfiTlsSessionDataTransferring && \\r
-    ((Timeout == NULL) || EFI_ERROR (gBS->CheckEvent (Timeout)))) {\r
+  while (HttpInstance->TlsSessionState != EfiTlsSessionDataTransferring && \\r
+         ((Timeout == NULL) || EFI_ERROR (gBS->CheckEvent (Timeout))))\r
+  {\r
     //\r
     // Receive one TLS record.\r
     //\r
@@ -1226,7 +1253,7 @@ TlsConnectSession (
     }\r
 \r
     BufferInSize = Pdu->TotalSize;\r
-    BufferIn = AllocateZeroPool (BufferInSize);\r
+    BufferIn     = AllocateZeroPool (BufferInSize);\r
     if (BufferIn == NULL) {\r
       NetbufFree (Pdu);\r
       Status = EFI_OUT_OF_RESOURCES;\r
@@ -1241,7 +1268,7 @@ TlsConnectSession (
     // Handle Receive data.\r
     //\r
     BufferOutSize = DEF_BUF_LEN;\r
-    BufferOut = AllocateZeroPool (BufferOutSize);\r
+    BufferOut     = AllocateZeroPool (BufferOutSize);\r
     if (BufferOut == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       return Status;\r
@@ -1255,21 +1282,21 @@ TlsConnectSession (
                                   &BufferOutSize\r
                                   );\r
     if (Status == EFI_BUFFER_TOO_SMALL) {\r
-       FreePool (BufferOut);\r
-       BufferOut = AllocateZeroPool (BufferOutSize);\r
-       if (BufferOut == NULL) {\r
-         FreePool (BufferIn);\r
-         Status = EFI_OUT_OF_RESOURCES;\r
-         return Status;\r
-       }\r
-\r
-       Status = HttpInstance->Tls->BuildResponsePacket (\r
-                                     HttpInstance->Tls,\r
-                                     BufferIn,\r
-                                     BufferInSize,\r
-                                     BufferOut,\r
-                                     &BufferOutSize\r
-                                     );\r
+      FreePool (BufferOut);\r
+      BufferOut = AllocateZeroPool (BufferOutSize);\r
+      if (BufferOut == NULL) {\r
+        FreePool (BufferIn);\r
+        Status = EFI_OUT_OF_RESOURCES;\r
+        return Status;\r
+      }\r
+\r
+      Status = HttpInstance->Tls->BuildResponsePacket (\r
+                                    HttpInstance->Tls,\r
+                                    BufferIn,\r
+                                    BufferInSize,\r
+                                    BufferOut,\r
+                                    &BufferOutSize\r
+                                    );\r
     }\r
 \r
     FreePool (BufferIn);\r
@@ -1283,8 +1310,8 @@ TlsConnectSession (
       //\r
       // Transmit the response packet.\r
       //\r
-      PacketOut = NetbufAlloc ((UINT32) BufferOutSize);\r
-      DataOut = NetbufAllocSpace (PacketOut, (UINT32) BufferOutSize, NET_BUF_TAIL);\r
+      PacketOut = NetbufAlloc ((UINT32)BufferOutSize);\r
+      DataOut   = NetbufAllocSpace (PacketOut, (UINT32)BufferOutSize, NET_BUF_TAIL);\r
       if (DataOut == NULL) {\r
         FreePool (BufferOut);\r
         return EFI_OUT_OF_RESOURCES;\r
@@ -1308,7 +1335,7 @@ TlsConnectSession (
     // Get the session state, then decide whether need to continue handle received packet.\r
     //\r
     GetSessionDataBufferSize = DEF_BUF_LEN;\r
-    GetSessionDataBuffer = AllocateZeroPool (GetSessionDataBufferSize);\r
+    GetSessionDataBuffer     = AllocateZeroPool (GetSessionDataBufferSize);\r
     if (GetSessionDataBuffer == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       return Status;\r
@@ -1321,31 +1348,32 @@ TlsConnectSession (
                                   &GetSessionDataBufferSize\r
                                   );\r
     if (Status == EFI_BUFFER_TOO_SMALL) {\r
-       FreePool (GetSessionDataBuffer);\r
-       GetSessionDataBuffer = AllocateZeroPool (GetSessionDataBufferSize);\r
-       if (GetSessionDataBuffer == NULL) {\r
-         Status = EFI_OUT_OF_RESOURCES;\r
-         return Status;\r
-       }\r
-\r
-       Status = HttpInstance->Tls->GetSessionData (\r
-                                     HttpInstance->Tls,\r
-                                     EfiTlsSessionState,\r
-                                     GetSessionDataBuffer,\r
-                                     &GetSessionDataBufferSize\r
-                                     );\r
+      FreePool (GetSessionDataBuffer);\r
+      GetSessionDataBuffer = AllocateZeroPool (GetSessionDataBufferSize);\r
+      if (GetSessionDataBuffer == NULL) {\r
+        Status = EFI_OUT_OF_RESOURCES;\r
+        return Status;\r
+      }\r
+\r
+      Status = HttpInstance->Tls->GetSessionData (\r
+                                    HttpInstance->Tls,\r
+                                    EfiTlsSessionState,\r
+                                    GetSessionDataBuffer,\r
+                                    &GetSessionDataBufferSize\r
+                                    );\r
     }\r
+\r
     if (EFI_ERROR (Status)) {\r
-      FreePool(GetSessionDataBuffer);\r
+      FreePool (GetSessionDataBuffer);\r
       return Status;\r
     }\r
 \r
-    ASSERT(GetSessionDataBufferSize == sizeof (EFI_TLS_SESSION_STATE));\r
-    HttpInstance->TlsSessionState = *(EFI_TLS_SESSION_STATE *) GetSessionDataBuffer;\r
+    ASSERT (GetSessionDataBufferSize == sizeof (EFI_TLS_SESSION_STATE));\r
+    HttpInstance->TlsSessionState = *(EFI_TLS_SESSION_STATE *)GetSessionDataBuffer;\r
 \r
     FreePool (GetSessionDataBuffer);\r
 \r
-    if(HttpInstance->TlsSessionState == EfiTlsSessionError) {\r
+    if (HttpInstance->TlsSessionState == EfiTlsSessionError) {\r
       return EFI_ABORTED;\r
     }\r
   }\r
@@ -1371,16 +1399,16 @@ TlsConnectSession (
 EFI_STATUS\r
 EFIAPI\r
 TlsCloseSession (\r
-  IN  HTTP_PROTOCOL            *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
+  EFI_STATUS  Status;\r
 \r
-  UINT8           *BufferOut;\r
-  UINTN           BufferOutSize;\r
+  UINT8  *BufferOut;\r
+  UINTN  BufferOutSize;\r
 \r
-  NET_BUF         *PacketOut;\r
-  UINT8           *DataOut;\r
+  NET_BUF  *PacketOut;\r
+  UINT8    *DataOut;\r
 \r
   Status    = EFI_SUCCESS;\r
   BufferOut = NULL;\r
@@ -1404,7 +1432,7 @@ TlsCloseSession (
   }\r
 \r
   BufferOutSize = DEF_BUF_LEN;\r
-  BufferOut = AllocateZeroPool (BufferOutSize);\r
+  BufferOut     = AllocateZeroPool (BufferOutSize);\r
   if (BufferOut == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     return Status;\r
@@ -1439,8 +1467,8 @@ TlsCloseSession (
     return Status;\r
   }\r
 \r
-  PacketOut = NetbufAlloc ((UINT32) BufferOutSize);\r
-  DataOut = NetbufAllocSpace (PacketOut, (UINT32) BufferOutSize, NET_BUF_TAIL);\r
+  PacketOut = NetbufAlloc ((UINT32)BufferOutSize);\r
+  DataOut   = NetbufAllocSpace (PacketOut, (UINT32)BufferOutSize, NET_BUF_TAIL);\r
   if (DataOut == NULL) {\r
     FreePool (BufferOut);\r
     return EFI_OUT_OF_RESOURCES;\r
@@ -1482,28 +1510,28 @@ TlsCloseSession (
 EFI_STATUS\r
 EFIAPI\r
 TlsProcessMessage (\r
-  IN     HTTP_PROTOCOL            *HttpInstance,\r
-  IN     UINT8                    *Message,\r
-  IN     UINTN                    MessageSize,\r
-  IN     EFI_TLS_CRYPT_MODE       ProcessMode,\r
-  IN OUT NET_FRAGMENT             *Fragment\r
+  IN     HTTP_PROTOCOL       *HttpInstance,\r
+  IN     UINT8               *Message,\r
+  IN     UINTN               MessageSize,\r
+  IN     EFI_TLS_CRYPT_MODE  ProcessMode,\r
+  IN OUT NET_FRAGMENT        *Fragment\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  UINT8                           *Buffer;\r
-  UINT32                          BufferSize;\r
-  UINT32                          BytesCopied;\r
-  EFI_TLS_FRAGMENT_DATA           *FragmentTable;\r
-  UINT32                          FragmentCount;\r
-  EFI_TLS_FRAGMENT_DATA           *OriginalFragmentTable;\r
-  UINTN                           Index;\r
-\r
-  Status                   = EFI_SUCCESS;\r
-  Buffer                   = NULL;\r
-  BufferSize               = 0;\r
-  BytesCopied              = 0;\r
-  FragmentTable            = NULL;\r
-  OriginalFragmentTable    = NULL;\r
+  EFI_STATUS             Status;\r
+  UINT8                  *Buffer;\r
+  UINT32                 BufferSize;\r
+  UINT32                 BytesCopied;\r
+  EFI_TLS_FRAGMENT_DATA  *FragmentTable;\r
+  UINT32                 FragmentCount;\r
+  EFI_TLS_FRAGMENT_DATA  *OriginalFragmentTable;\r
+  UINTN                  Index;\r
+\r
+  Status                = EFI_SUCCESS;\r
+  Buffer                = NULL;\r
+  BufferSize            = 0;\r
+  BytesCopied           = 0;\r
+  FragmentTable         = NULL;\r
+  OriginalFragmentTable = NULL;\r
 \r
   //\r
   // Rebuild fragment table from BufferIn.\r
@@ -1515,7 +1543,7 @@ TlsProcessMessage (
     goto ON_EXIT;\r
   }\r
 \r
-  FragmentTable->FragmentLength = (UINT32) MessageSize;\r
+  FragmentTable->FragmentLength = (UINT32)MessageSize;\r
   FragmentTable->FragmentBuffer = Message;\r
 \r
   //\r
@@ -1575,9 +1603,10 @@ TlsProcessMessage (
 ON_EXIT:\r
 \r
   if (OriginalFragmentTable != NULL) {\r
-    if( FragmentTable == OriginalFragmentTable) {\r
+    if ( FragmentTable == OriginalFragmentTable) {\r
       FragmentTable = NULL;\r
     }\r
+\r
     FreePool (OriginalFragmentTable);\r
     OriginalFragmentTable = NULL;\r
   }\r
@@ -1609,23 +1638,23 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 HttpsReceive (\r
-  IN     HTTP_PROTOCOL         *HttpInstance,\r
-  IN OUT NET_FRAGMENT          *Fragment,\r
-  IN     EFI_EVENT             Timeout\r
+  IN     HTTP_PROTOCOL  *HttpInstance,\r
+  IN OUT NET_FRAGMENT   *Fragment,\r
+  IN     EFI_EVENT      Timeout\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  NET_BUF                         *Pdu;\r
-  TLS_RECORD_HEADER               RecordHeader;\r
-  UINT8                           *BufferIn;\r
-  UINTN                           BufferInSize;\r
-  NET_FRAGMENT                    TempFragment;\r
-  UINT8                           *BufferOut;\r
-  UINTN                           BufferOutSize;\r
-  NET_BUF                         *PacketOut;\r
-  UINT8                           *DataOut;\r
-  UINT8                           *GetSessionDataBuffer;\r
-  UINTN                           GetSessionDataBufferSize;\r
+  EFI_STATUS         Status;\r
+  NET_BUF            *Pdu;\r
+  TLS_RECORD_HEADER  RecordHeader;\r
+  UINT8              *BufferIn;\r
+  UINTN              BufferInSize;\r
+  NET_FRAGMENT       TempFragment;\r
+  UINT8              *BufferOut;\r
+  UINTN              BufferOutSize;\r
+  NET_BUF            *PacketOut;\r
+  UINT8              *DataOut;\r
+  UINT8              *GetSessionDataBuffer;\r
+  UINTN              GetSessionDataBufferSize;\r
 \r
   Status                   = EFI_SUCCESS;\r
   Pdu                      = NULL;\r
@@ -1647,28 +1676,29 @@ HttpsReceive (
   }\r
 \r
   BufferInSize = Pdu->TotalSize;\r
-  BufferIn = AllocateZeroPool (BufferInSize);\r
+  BufferIn     = AllocateZeroPool (BufferInSize);\r
   if (BufferIn == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     NetbufFree (Pdu);\r
     return Status;\r
   }\r
 \r
-  NetbufCopy (Pdu, 0, (UINT32) BufferInSize, BufferIn);\r
+  NetbufCopy (Pdu, 0, (UINT32)BufferInSize, BufferIn);\r
 \r
   NetbufFree (Pdu);\r
 \r
   //\r
   // Handle Receive data.\r
   //\r
-  RecordHeader = *(TLS_RECORD_HEADER *) BufferIn;\r
+  RecordHeader = *(TLS_RECORD_HEADER *)BufferIn;\r
 \r
   if ((RecordHeader.ContentType == TlsContentTypeApplicationData) &&\r
-    (RecordHeader.Version.Major == 0x03) &&\r
-    (RecordHeader.Version.Minor == TLS10_PROTOCOL_VERSION_MINOR ||\r
-    RecordHeader.Version.Minor == TLS11_PROTOCOL_VERSION_MINOR ||\r
-    RecordHeader.Version.Minor == TLS12_PROTOCOL_VERSION_MINOR)\r
-  ) {\r
+      (RecordHeader.Version.Major == 0x03) &&\r
+      ((RecordHeader.Version.Minor == TLS10_PROTOCOL_VERSION_MINOR) ||\r
+       (RecordHeader.Version.Minor == TLS11_PROTOCOL_VERSION_MINOR) ||\r
+       (RecordHeader.Version.Minor == TLS12_PROTOCOL_VERSION_MINOR))\r
+      )\r
+  {\r
     //\r
     // Decrypt Packet.\r
     //\r
@@ -1689,7 +1719,7 @@ HttpsReceive (
         // BuildResponsePacket() will be called to generate Error Alert message and send it out.\r
         //\r
         BufferOutSize = DEF_BUF_LEN;\r
-        BufferOut = AllocateZeroPool (BufferOutSize);\r
+        BufferOut     = AllocateZeroPool (BufferOutSize);\r
         if (BufferOut == NULL) {\r
           Status = EFI_OUT_OF_RESOURCES;\r
           return Status;\r
@@ -1718,14 +1748,15 @@ HttpsReceive (
                                         &BufferOutSize\r
                                         );\r
         }\r
+\r
         if (EFI_ERROR (Status)) {\r
-          FreePool(BufferOut);\r
+          FreePool (BufferOut);\r
           return Status;\r
         }\r
 \r
         if (BufferOutSize != 0) {\r
           PacketOut = NetbufAlloc ((UINT32)BufferOutSize);\r
-          DataOut = NetbufAllocSpace (PacketOut, (UINT32) BufferOutSize, NET_BUF_TAIL);\r
+          DataOut   = NetbufAllocSpace (PacketOut, (UINT32)BufferOutSize, NET_BUF_TAIL);\r
           if (DataOut == NULL) {\r
             FreePool (BufferOut);\r
             return EFI_OUT_OF_RESOURCES;\r
@@ -1738,7 +1769,7 @@ HttpsReceive (
           NetbufFree (PacketOut);\r
         }\r
 \r
-        FreePool(BufferOut);\r
+        FreePool (BufferOut);\r
 \r
         if (EFI_ERROR (Status)) {\r
           return Status;\r
@@ -1753,10 +1784,10 @@ HttpsReceive (
     //\r
     // Parsing buffer.\r
     //\r
-    ASSERT (((TLS_RECORD_HEADER *) (TempFragment.Bulk))->ContentType == TlsContentTypeApplicationData);\r
+    ASSERT (((TLS_RECORD_HEADER *)(TempFragment.Bulk))->ContentType == TlsContentTypeApplicationData);\r
 \r
-    BufferInSize = ((TLS_RECORD_HEADER *) (TempFragment.Bulk))->Length;\r
-    BufferIn = AllocateZeroPool (BufferInSize);\r
+    BufferInSize = ((TLS_RECORD_HEADER *)(TempFragment.Bulk))->Length;\r
+    BufferIn     = AllocateZeroPool (BufferInSize);\r
     if (BufferIn == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       return Status;\r
@@ -1768,15 +1799,15 @@ HttpsReceive (
     // Free the buffer in TempFragment.\r
     //\r
     FreePool (TempFragment.Bulk);\r
-\r
   } else if ((RecordHeader.ContentType == TlsContentTypeAlert) &&\r
-    (RecordHeader.Version.Major == 0x03) &&\r
-    (RecordHeader.Version.Minor == TLS10_PROTOCOL_VERSION_MINOR ||\r
-    RecordHeader.Version.Minor == TLS11_PROTOCOL_VERSION_MINOR ||\r
-    RecordHeader.Version.Minor == TLS12_PROTOCOL_VERSION_MINOR)\r
-    ) {\r
+             (RecordHeader.Version.Major == 0x03) &&\r
+             ((RecordHeader.Version.Minor == TLS10_PROTOCOL_VERSION_MINOR) ||\r
+              (RecordHeader.Version.Minor == TLS11_PROTOCOL_VERSION_MINOR) ||\r
+              (RecordHeader.Version.Minor == TLS12_PROTOCOL_VERSION_MINOR))\r
+             )\r
+  {\r
     BufferOutSize = DEF_BUF_LEN;\r
-    BufferOut = AllocateZeroPool (BufferOutSize);\r
+    BufferOut     = AllocateZeroPool (BufferOutSize);\r
     if (BufferOut == NULL) {\r
       FreePool (BufferIn);\r
       Status = EFI_OUT_OF_RESOURCES;\r
@@ -1816,8 +1847,8 @@ HttpsReceive (
     }\r
 \r
     if (BufferOutSize != 0) {\r
-      PacketOut = NetbufAlloc ((UINT32) BufferOutSize);\r
-      DataOut = NetbufAllocSpace (PacketOut, (UINT32) BufferOutSize, NET_BUF_TAIL);\r
+      PacketOut = NetbufAlloc ((UINT32)BufferOutSize);\r
+      DataOut   = NetbufAllocSpace (PacketOut, (UINT32)BufferOutSize, NET_BUF_TAIL);\r
       if (DataOut == NULL) {\r
         FreePool (BufferOut);\r
         return EFI_OUT_OF_RESOURCES;\r
@@ -1836,7 +1867,7 @@ HttpsReceive (
     // Get the session state.\r
     //\r
     GetSessionDataBufferSize = DEF_BUF_LEN;\r
-    GetSessionDataBuffer = AllocateZeroPool (GetSessionDataBufferSize);\r
+    GetSessionDataBuffer     = AllocateZeroPool (GetSessionDataBufferSize);\r
     if (GetSessionDataBuffer == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       return Status;\r
@@ -1849,41 +1880,42 @@ HttpsReceive (
                                   &GetSessionDataBufferSize\r
                                   );\r
     if (Status == EFI_BUFFER_TOO_SMALL) {\r
-       FreePool (GetSessionDataBuffer);\r
-       GetSessionDataBuffer = AllocateZeroPool (GetSessionDataBufferSize);\r
-       if (GetSessionDataBuffer == NULL) {\r
-         Status = EFI_OUT_OF_RESOURCES;\r
-         return Status;\r
-       }\r
-\r
-       Status = HttpInstance->Tls->GetSessionData (\r
-                                     HttpInstance->Tls,\r
-                                     EfiTlsSessionState,\r
-                                     GetSessionDataBuffer,\r
-                                     &GetSessionDataBufferSize\r
-                                     );\r
+      FreePool (GetSessionDataBuffer);\r
+      GetSessionDataBuffer = AllocateZeroPool (GetSessionDataBufferSize);\r
+      if (GetSessionDataBuffer == NULL) {\r
+        Status = EFI_OUT_OF_RESOURCES;\r
+        return Status;\r
+      }\r
+\r
+      Status = HttpInstance->Tls->GetSessionData (\r
+                                    HttpInstance->Tls,\r
+                                    EfiTlsSessionState,\r
+                                    GetSessionDataBuffer,\r
+                                    &GetSessionDataBufferSize\r
+                                    );\r
     }\r
+\r
     if (EFI_ERROR (Status)) {\r
       FreePool (GetSessionDataBuffer);\r
       return Status;\r
     }\r
 \r
-    ASSERT(GetSessionDataBufferSize == sizeof (EFI_TLS_SESSION_STATE));\r
-    HttpInstance->TlsSessionState = *(EFI_TLS_SESSION_STATE *) GetSessionDataBuffer;\r
+    ASSERT (GetSessionDataBufferSize == sizeof (EFI_TLS_SESSION_STATE));\r
+    HttpInstance->TlsSessionState = *(EFI_TLS_SESSION_STATE *)GetSessionDataBuffer;\r
 \r
     FreePool (GetSessionDataBuffer);\r
 \r
-    if(HttpInstance->TlsSessionState == EfiTlsSessionError) {\r
+    if (HttpInstance->TlsSessionState == EfiTlsSessionError) {\r
       DEBUG ((DEBUG_ERROR, "TLS Session State Error!\n"));\r
       return EFI_ABORTED;\r
     }\r
 \r
-    BufferIn = NULL;\r
+    BufferIn     = NULL;\r
     BufferInSize = 0;\r
   }\r
 \r
   Fragment->Bulk = BufferIn;\r
-  Fragment->Len = (UINT32) BufferInSize;\r
+  Fragment->Len  = (UINT32)BufferInSize;\r
 \r
   return Status;\r
 }\r
index 6851ceea75a52334d84c3d7b970b9e455afe3514..3c70825e8c3a2cab50f496154f309e4e4b479c65 100644 (file)
@@ -9,9 +9,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef __EFI_HTTPS_SUPPORT_H__\r
 #define __EFI_HTTPS_SUPPORT_H__\r
 \r
-#define HTTPS_DEFAULT_PORT       443\r
+#define HTTPS_DEFAULT_PORT  443\r
 \r
-#define HTTPS_FLAG               "https://"\r
+#define HTTPS_FLAG  "https://"\r
 \r
 /**\r
   Check whether the Url is from Https.\r
@@ -24,7 +24,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 BOOLEAN\r
 IsHttpsUrl (\r
-  IN CHAR8    *Url\r
+  IN CHAR8  *Url\r
   );\r
 \r
 /**\r
@@ -41,10 +41,10 @@ IsHttpsUrl (
 EFI_HANDLE\r
 EFIAPI\r
 TlsCreateChild (\r
-  IN  EFI_HANDLE                     ImageHandle,\r
-  OUT EFI_SERVICE_BINDING_PROTOCOL   **TlsSb,\r
-  OUT EFI_TLS_PROTOCOL               **TlsProto,\r
-  OUT EFI_TLS_CONFIGURATION_PROTOCOL **TlsConfiguration\r
+  IN  EFI_HANDLE                      ImageHandle,\r
+  OUT EFI_SERVICE_BINDING_PROTOCOL    **TlsSb,\r
+  OUT EFI_TLS_PROTOCOL                **TlsProto,\r
+  OUT EFI_TLS_CONFIGURATION_PROTOCOL  **TlsConfiguration\r
   );\r
 \r
 /**\r
@@ -60,7 +60,7 @@ TlsCreateChild (
 EFI_STATUS\r
 EFIAPI\r
 TlsCreateTxRxEvent (\r
-  IN OUT HTTP_PROTOCOL      *HttpInstance\r
+  IN OUT HTTP_PROTOCOL  *HttpInstance\r
   );\r
 \r
 /**\r
@@ -72,7 +72,7 @@ TlsCreateTxRxEvent (
 VOID\r
 EFIAPI\r
 TlsCloseTxRxEvent (\r
-  IN  HTTP_PROTOCOL        *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   );\r
 \r
 /**\r
@@ -88,7 +88,7 @@ TlsCloseTxRxEvent (
 **/\r
 EFI_STATUS\r
 TlsConfigCertificate (\r
-  IN OUT HTTP_PROTOCOL      *HttpInstance\r
+  IN OUT HTTP_PROTOCOL  *HttpInstance\r
   );\r
 \r
 /**\r
@@ -103,7 +103,7 @@ TlsConfigCertificate (
 EFI_STATUS\r
 EFIAPI\r
 TlsConfigureSession (\r
-  IN OUT HTTP_PROTOCOL      *HttpInstance\r
+  IN OUT HTTP_PROTOCOL  *HttpInstance\r
   );\r
 \r
 /**\r
@@ -122,8 +122,8 @@ TlsConfigureSession (
 EFI_STATUS\r
 EFIAPI\r
 TlsCommonTransmit (\r
-  IN OUT HTTP_PROTOCOL      *HttpInstance,\r
-  IN     NET_BUF            *Packet\r
+  IN OUT HTTP_PROTOCOL  *HttpInstance,\r
+  IN     NET_BUF        *Packet\r
   );\r
 \r
 /**\r
@@ -143,9 +143,9 @@ TlsCommonTransmit (
 EFI_STATUS\r
 EFIAPI\r
 TlsCommonReceive (\r
-  IN OUT HTTP_PROTOCOL      *HttpInstance,\r
-  IN     NET_BUF            *Packet,\r
-  IN     EFI_EVENT          Timeout\r
+  IN OUT HTTP_PROTOCOL  *HttpInstance,\r
+  IN     NET_BUF        *Packet,\r
+  IN     EFI_EVENT      Timeout\r
   );\r
 \r
 /**\r
@@ -166,9 +166,9 @@ TlsCommonReceive (
 EFI_STATUS\r
 EFIAPI\r
 TlsReceiveOnePdu (\r
-  IN OUT HTTP_PROTOCOL      *HttpInstance,\r
-     OUT NET_BUF            **Pdu,\r
-  IN     EFI_EVENT          Timeout\r
+  IN OUT HTTP_PROTOCOL  *HttpInstance,\r
+  OUT NET_BUF           **Pdu,\r
+  IN     EFI_EVENT      Timeout\r
   );\r
 \r
 /**\r
@@ -186,8 +186,8 @@ TlsReceiveOnePdu (
 EFI_STATUS\r
 EFIAPI\r
 TlsConnectSession (\r
-  IN  HTTP_PROTOCOL            *HttpInstance,\r
-  IN  EFI_EVENT                Timeout\r
+  IN  HTTP_PROTOCOL  *HttpInstance,\r
+  IN  EFI_EVENT      Timeout\r
   );\r
 \r
 /**\r
@@ -204,7 +204,7 @@ TlsConnectSession (
 EFI_STATUS\r
 EFIAPI\r
 TlsCloseSession (\r
-  IN  HTTP_PROTOCOL            *HttpInstance\r
+  IN  HTTP_PROTOCOL  *HttpInstance\r
   );\r
 \r
 /**\r
@@ -233,11 +233,11 @@ TlsCloseSession (
 EFI_STATUS\r
 EFIAPI\r
 TlsProcessMessage (\r
-  IN     HTTP_PROTOCOL            *HttpInstance,\r
-  IN     UINT8                    *Message,\r
-  IN     UINTN                    MessageSize,\r
-  IN     EFI_TLS_CRYPT_MODE       ProcessMode,\r
-  IN OUT NET_FRAGMENT             *Fragment\r
+  IN     HTTP_PROTOCOL       *HttpInstance,\r
+  IN     UINT8               *Message,\r
+  IN     UINTN               MessageSize,\r
+  IN     EFI_TLS_CRYPT_MODE  ProcessMode,\r
+  IN OUT NET_FRAGMENT        *Fragment\r
   );\r
 \r
 /**\r
@@ -256,10 +256,9 @@ TlsProcessMessage (
 EFI_STATUS\r
 EFIAPI\r
 HttpsReceive (\r
-  IN     HTTP_PROTOCOL         *HttpInstance,\r
-  IN OUT NET_FRAGMENT          *Fragment,\r
-  IN     EFI_EVENT             Timeout\r
+  IN     HTTP_PROTOCOL  *HttpInstance,\r
+  IN OUT NET_FRAGMENT   *Fragment,\r
+  IN     EFI_EVENT      Timeout\r
   );\r
 \r
 #endif\r
-\r
index 4c1e44d24cc0520aa1e5401376877f709f529227..a3e1ea4691ef4948b490058bb44f4808c4c4e93a 100644 (file)
@@ -9,7 +9,6 @@
 \r
 #include "HttpUtilitiesDxe.h"\r
 \r
-\r
 /**\r
   Unloads an image.\r
 \r
@@ -25,14 +24,13 @@ HttpUtilitiesDxeUnload (
   IN EFI_HANDLE  ImageHandle\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  UINTN                           HandleNum;\r
-  EFI_HANDLE                      *HandleBuffer;\r
-  UINT32                          Index;\r
-  EFI_HTTP_UTILITIES_PROTOCOL     *HttpUtilitiesProtocol;\r
-\r
+  EFI_STATUS                   Status;\r
+  UINTN                        HandleNum;\r
+  EFI_HANDLE                   *HandleBuffer;\r
+  UINT32                       Index;\r
+  EFI_HTTP_UTILITIES_PROTOCOL  *HttpUtilitiesProtocol;\r
 \r
-  HandleBuffer   = NULL;\r
+  HandleBuffer = NULL;\r
 \r
   //\r
   // Locate all the handles with HttpUtilities protocol.\r
@@ -55,7 +53,7 @@ HttpUtilitiesDxeUnload (
     Status = gBS->OpenProtocol (\r
                     HandleBuffer[Index],\r
                     &gEfiHttpUtilitiesProtocolGuid,\r
-                    (VOID **) &HttpUtilitiesProtocol,\r
+                    (VOID **)&HttpUtilitiesProtocol,\r
                     ImageHandle,\r
                     NULL,\r
                     EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL\r
@@ -69,7 +67,8 @@ HttpUtilitiesDxeUnload (
     //\r
     Status = gBS->UninstallMultipleProtocolInterfaces (\r
                     HandleBuffer[Index],\r
-                    &gEfiHttpUtilitiesProtocolGuid, HttpUtilitiesProtocol,\r
+                    &gEfiHttpUtilitiesProtocolGuid,\r
+                    HttpUtilitiesProtocol,\r
                     NULL\r
                     );\r
     if (EFI_ERROR (Status)) {\r
@@ -80,7 +79,6 @@ HttpUtilitiesDxeUnload (
   return EFI_SUCCESS;\r
 }\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
@@ -99,9 +97,9 @@ HttpUtilitiesDxeDriverEntryPoint (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
+  EFI_STATUS  Status;\r
 \r
-  EFI_HANDLE             Handle;\r
+  EFI_HANDLE  Handle;\r
 \r
   Handle = NULL;\r
 \r
@@ -117,4 +115,3 @@ HttpUtilitiesDxeDriverEntryPoint (
 \r
   return Status;\r
 }\r
-\r
index ce9895ded1f5303a21ad4dec816bc3a8ece4e139..c9cf966c75e44bdeb0420beb43d246ba9ad88233 100644 (file)
@@ -33,7 +33,7 @@
 //\r
 // Protocol instances\r
 //\r
-extern EFI_HTTP_UTILITIES_PROTOCOL mHttpUtilitiesProtocol;\r
+extern EFI_HTTP_UTILITIES_PROTOCOL  mHttpUtilitiesProtocol;\r
 \r
 /**\r
   Create HTTP header based on a combination of seed header, fields\r
@@ -70,18 +70,17 @@ extern EFI_HTTP_UTILITIES_PROTOCOL mHttpUtilitiesProtocol;
 EFI_STATUS\r
 EFIAPI\r
 HttpUtilitiesBuild (\r
-  IN     EFI_HTTP_UTILITIES_PROTOCOL *This,\r
-  IN     UINTN                       SeedMessageSize,\r
-  IN     VOID                        *SeedMessage  OPTIONAL,\r
-  IN     UINTN                       DeleteCount,\r
-  IN     CHAR8                       *DeleteList[]  OPTIONAL,\r
-  IN     UINTN                       AppendCount,\r
-  IN     EFI_HTTP_HEADER             *AppendList[]  OPTIONAL,\r
-     OUT UINTN                       *NewMessageSize,\r
-     OUT VOID                        **NewMessage\r
+  IN     EFI_HTTP_UTILITIES_PROTOCOL  *This,\r
+  IN     UINTN                        SeedMessageSize,\r
+  IN     VOID                         *SeedMessage  OPTIONAL,\r
+  IN     UINTN                        DeleteCount,\r
+  IN     CHAR8                        *DeleteList[]  OPTIONAL,\r
+  IN     UINTN                        AppendCount,\r
+  IN     EFI_HTTP_HEADER              *AppendList[]  OPTIONAL,\r
+  OUT UINTN                           *NewMessageSize,\r
+  OUT VOID                            **NewMessage\r
   );\r
 \r
-\r
 /**\r
   Parses HTTP header and produces an array of key/value pairs.\r
 \r
index efa4091135bd78a2a43d6d126beebac66acb9183..c7d43576ea62c0db8a2d7d78d9b3027dd5abe720 100644 (file)
@@ -9,12 +9,11 @@
 \r
 #include "HttpUtilitiesDxe.h"\r
 \r
-EFI_HTTP_UTILITIES_PROTOCOL mHttpUtilitiesProtocol = {\r
+EFI_HTTP_UTILITIES_PROTOCOL  mHttpUtilitiesProtocol = {\r
   HttpUtilitiesBuild,\r
   HttpUtilitiesParse\r
 };\r
 \r
-\r
 /**\r
   Create HTTP header based on a combination of seed header, fields\r
   to delete, and fields to append.\r
@@ -50,28 +49,28 @@ EFI_HTTP_UTILITIES_PROTOCOL mHttpUtilitiesProtocol = {
 EFI_STATUS\r
 EFIAPI\r
 HttpUtilitiesBuild (\r
-  IN     EFI_HTTP_UTILITIES_PROTOCOL *This,\r
-  IN     UINTN                       SeedMessageSize,\r
-  IN     VOID                        *SeedMessage  OPTIONAL,\r
-  IN     UINTN                       DeleteCount,\r
-  IN     CHAR8                       *DeleteList[]  OPTIONAL,\r
-  IN     UINTN                       AppendCount,\r
-  IN     EFI_HTTP_HEADER             *AppendList[]  OPTIONAL,\r
-     OUT UINTN                       *NewMessageSize,\r
-     OUT VOID                        **NewMessage\r
+  IN     EFI_HTTP_UTILITIES_PROTOCOL  *This,\r
+  IN     UINTN                        SeedMessageSize,\r
+  IN     VOID                         *SeedMessage  OPTIONAL,\r
+  IN     UINTN                        DeleteCount,\r
+  IN     CHAR8                        *DeleteList[]  OPTIONAL,\r
+  IN     UINTN                        AppendCount,\r
+  IN     EFI_HTTP_HEADER              *AppendList[]  OPTIONAL,\r
+  OUT UINTN                           *NewMessageSize,\r
+  OUT VOID                            **NewMessage\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_HTTP_HEADER           *SeedHeaderFields;\r
-  UINTN                     SeedFieldCount;\r
-  UINTN                     Index;\r
-  EFI_HTTP_HEADER           *TempHeaderFields;\r
-  UINTN                     TempFieldCount;\r
-  EFI_HTTP_HEADER           *NewHeaderFields;\r
-  UINTN                     NewFieldCount;\r
-  EFI_HTTP_HEADER           *HttpHeader;\r
-  UINTN                     StrLength;\r
-  UINT8                     *NewMessagePtr;\r
+  EFI_STATUS       Status;\r
+  EFI_HTTP_HEADER  *SeedHeaderFields;\r
+  UINTN            SeedFieldCount;\r
+  UINTN            Index;\r
+  EFI_HTTP_HEADER  *TempHeaderFields;\r
+  UINTN            TempFieldCount;\r
+  EFI_HTTP_HEADER  *NewHeaderFields;\r
+  UINTN            NewFieldCount;\r
+  EFI_HTTP_HEADER  *HttpHeader;\r
+  UINTN            StrLength;\r
+  UINT8            *NewMessagePtr;\r
 \r
   SeedHeaderFields = NULL;\r
   SeedFieldCount   = 0;\r
@@ -80,11 +79,11 @@ HttpUtilitiesBuild (
   NewHeaderFields  = NULL;\r
   NewFieldCount    = 0;\r
 \r
-  HttpHeader       = NULL;\r
-  StrLength        = 0;\r
-  NewMessagePtr    = NULL;\r
-  *NewMessageSize  = 0;\r
-  Status           = EFI_SUCCESS;\r
+  HttpHeader      = NULL;\r
+  StrLength       = 0;\r
+  NewMessagePtr   = NULL;\r
+  *NewMessageSize = 0;\r
+  Status          = EFI_SUCCESS;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -106,8 +105,8 @@ HttpUtilitiesBuild (
   //\r
   // Handle DeleteList\r
   //\r
-  if (SeedFieldCount != 0 && DeleteCount != 0) {\r
-    TempHeaderFields = AllocateZeroPool (SeedFieldCount * sizeof(EFI_HTTP_HEADER));\r
+  if ((SeedFieldCount != 0) && (DeleteCount != 0)) {\r
+    TempHeaderFields = AllocateZeroPool (SeedFieldCount * sizeof (EFI_HTTP_HEADER));\r
     if (TempHeaderFields == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto ON_EXIT;\r
@@ -117,7 +116,7 @@ HttpUtilitiesBuild (
       //\r
       // Check whether each SeedHeaderFields member is in DeleteList\r
       //\r
-      if (HttpIsValidHttpHeaderDeleteList, DeleteCount, SeedHeaderFields[Index].FieldName)) {\r
+      if (HttpIsValidHttpHeader (DeleteList, DeleteCount, SeedHeaderFields[Index].FieldName)) {\r
         Status = HttpSetFieldNameAndValue (\r
                    &TempHeaderFields[TempFieldCount],\r
                    SeedHeaderFields[Index].FieldName,\r
@@ -126,12 +125,13 @@ HttpUtilitiesBuild (
         if (EFI_ERROR (Status)) {\r
           goto ON_EXIT;\r
         }\r
+\r
         TempFieldCount++;\r
       }\r
     }\r
   } else {\r
     TempHeaderFields = SeedHeaderFields;\r
-    TempFieldCount = SeedFieldCount;\r
+    TempFieldCount   = SeedFieldCount;\r
   }\r
 \r
   //\r
@@ -176,6 +176,7 @@ HttpUtilitiesBuild (
       if (EFI_ERROR (Status)) {\r
         goto ON_EXIT;\r
       }\r
+\r
       NewFieldCount++;\r
     }\r
   }\r
@@ -186,19 +187,20 @@ HttpUtilitiesBuild (
   for (Index = 0; Index < NewFieldCount; Index++) {\r
     HttpHeader = &NewHeaderFields[Index];\r
 \r
-    StrLength = AsciiStrLen (HttpHeader->FieldName);\r
+    StrLength        = AsciiStrLen (HttpHeader->FieldName);\r
     *NewMessageSize += StrLength;\r
 \r
-    StrLength = sizeof(": ") - 1;\r
+    StrLength        = sizeof (": ") - 1;\r
     *NewMessageSize += StrLength;\r
 \r
-    StrLength = AsciiStrLen (HttpHeader->FieldValue);\r
+    StrLength        = AsciiStrLen (HttpHeader->FieldValue);\r
     *NewMessageSize += StrLength;\r
 \r
-    StrLength = sizeof("\r\n") - 1;\r
+    StrLength        = sizeof ("\r\n") - 1;\r
     *NewMessageSize += StrLength;\r
   }\r
-  StrLength = sizeof("\r\n") - 1;\r
+\r
+  StrLength        = sizeof ("\r\n") - 1;\r
   *NewMessageSize += StrLength;\r
 \r
   *NewMessage = AllocateZeroPool (*NewMessageSize);\r
@@ -216,7 +218,7 @@ HttpUtilitiesBuild (
     CopyMem (NewMessagePtr, HttpHeader->FieldName, StrLength);\r
     NewMessagePtr += StrLength;\r
 \r
-    StrLength = sizeof(": ") - 1;\r
+    StrLength = sizeof (": ") - 1;\r
     CopyMem (NewMessagePtr, ": ", StrLength);\r
     NewMessagePtr += StrLength;\r
 \r
@@ -224,11 +226,12 @@ HttpUtilitiesBuild (
     CopyMem (NewMessagePtr, HttpHeader->FieldValue, StrLength);\r
     NewMessagePtr += StrLength;\r
 \r
-    StrLength = sizeof("\r\n") - 1;\r
+    StrLength = sizeof ("\r\n") - 1;\r
     CopyMem (NewMessagePtr, "\r\n", StrLength);\r
     NewMessagePtr += StrLength;\r
   }\r
-  StrLength = sizeof("\r\n") - 1;\r
+\r
+  StrLength = sizeof ("\r\n") - 1;\r
   CopyMem (NewMessagePtr, "\r\n", StrLength);\r
   NewMessagePtr += StrLength;\r
 \r
@@ -239,21 +242,20 @@ HttpUtilitiesBuild (
   //\r
 ON_EXIT:\r
   if (SeedHeaderFields != NULL) {\r
-    HttpFreeHeaderFields(SeedHeaderFields, SeedFieldCount);\r
+    HttpFreeHeaderFields (SeedHeaderFields, SeedFieldCount);\r
   }\r
 \r
   if (TempHeaderFields != NULL) {\r
-    HttpFreeHeaderFields(TempHeaderFields, TempFieldCount);\r
+    HttpFreeHeaderFields (TempHeaderFields, TempFieldCount);\r
   }\r
 \r
   if (NewHeaderFields != NULL) {\r
-    HttpFreeHeaderFields(NewHeaderFields, NewFieldCount);\r
+    HttpFreeHeaderFields (NewHeaderFields, NewFieldCount);\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Parses HTTP header and produces an array of key/value pairs.\r
 \r
@@ -285,14 +287,14 @@ HttpUtilitiesParse (
   OUT UINTN                        *FieldCount\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  CHAR8                     *TempHttpMessage;\r
-  CHAR8                     *Token;\r
-  CHAR8                     *NextToken;\r
-  CHAR8                     *FieldName;\r
-  CHAR8                     *FieldValue;\r
-  UINTN                     Index;\r
-  UINTN                     HttpBufferSize;\r
+  EFI_STATUS  Status;\r
+  CHAR8       *TempHttpMessage;\r
+  CHAR8       *Token;\r
+  CHAR8       *NextToken;\r
+  CHAR8       *FieldName;\r
+  CHAR8       *FieldValue;\r
+  UINTN       Index;\r
+  UINTN       HttpBufferSize;\r
 \r
   Status          = EFI_SUCCESS;\r
   TempHttpMessage = NULL;\r
@@ -302,14 +304,14 @@ HttpUtilitiesParse (
   FieldValue      = NULL;\r
   Index           = 0;\r
 \r
-  if (This == NULL || HttpMessage == NULL || HeaderFields == NULL || FieldCount == NULL) {\r
+  if ((This == NULL) || (HttpMessage == NULL) || (HeaderFields == NULL) || (FieldCount == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   //\r
   // Append the http response string along with a Null-terminator.\r
   //\r
-  HttpBufferSize = HttpMessageSize + 1;\r
+  HttpBufferSize  = HttpMessageSize + 1;\r
   TempHttpMessage = AllocatePool (HttpBufferSize);\r
   if (TempHttpMessage == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
@@ -322,13 +324,13 @@ HttpUtilitiesParse (
   // Get header number\r
   //\r
   *FieldCount = 0;\r
-  Token = TempHttpMessage;\r
+  Token       = TempHttpMessage;\r
   while (TRUE) {\r
-    FieldName     = NULL;\r
-    FieldValue    = NULL;\r
-    NextToken = HttpGetFieldNameAndValue (Token, &FieldName, &FieldValue);\r
-    Token     = NextToken;\r
-    if (FieldName == NULL || FieldValue == NULL) {\r
+    FieldName  = NULL;\r
+    FieldValue = NULL;\r
+    NextToken  = HttpGetFieldNameAndValue (Token, &FieldName, &FieldValue);\r
+    Token      = NextToken;\r
+    if ((FieldName == NULL) || (FieldValue == NULL)) {\r
       break;\r
     }\r
 \r
@@ -343,10 +345,10 @@ HttpUtilitiesParse (
   //\r
   // Allocate buffer for header\r
   //\r
-  *HeaderFields = AllocateZeroPool ((*FieldCount) * sizeof(EFI_HTTP_HEADER));\r
+  *HeaderFields = AllocateZeroPool ((*FieldCount) * sizeof (EFI_HTTP_HEADER));\r
   if (*HeaderFields == NULL) {\r
     *FieldCount = 0;\r
-    Status = EFI_OUT_OF_RESOURCES;\r
+    Status      = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
   }\r
 \r
@@ -357,11 +359,11 @@ HttpUtilitiesParse (
   //\r
   Token = TempHttpMessage;\r
   while (Index < *FieldCount) {\r
-    FieldName     = NULL;\r
-    FieldValue    = NULL;\r
-    NextToken = HttpGetFieldNameAndValue (Token, &FieldName, &FieldValue);\r
-    Token     = NextToken;\r
-    if (FieldName == NULL || FieldValue == NULL) {\r
+    FieldName  = NULL;\r
+    FieldValue = NULL;\r
+    NextToken  = HttpGetFieldNameAndValue (Token, &FieldName, &FieldValue);\r
+    Token      = NextToken;\r
+    if ((FieldName == NULL) || (FieldValue == NULL)) {\r
       break;\r
     }\r
 \r
index 8572ac281d1d300f3dcdc6d75bf4e5b49e20105c..2e1324c5695e7069b7696024856d79500a695163 100644 (file)
@@ -11,7 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // EFI Component Name Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gIScsiComponentName = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gIScsiComponentName = {\r
   IScsiComponentNameGetDriverName,\r
   IScsiComponentNameGetControllerName,\r
   "eng"\r
@@ -20,13 +20,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gIScsiComponentName =
 //\r
 // EFI Component Name 2 Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gIScsiComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) IScsiComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) IScsiComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gIScsiComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)IScsiComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)IScsiComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE     mIScsiDriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mIScsiDriverNameTable[] = {\r
   {\r
     "eng;en",\r
     L"iSCSI Driver"\r
@@ -81,9 +81,9 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  *gIScsiControllerNameTab
 EFI_STATUS\r
 EFIAPI\r
 IScsiComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL   *This,\r
-  IN  CHAR8                         *Language,\r
-  OUT CHAR16                        **DriverName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
   )\r
 {\r
   return LookupUnicodeString2 (\r
@@ -91,7 +91,7 @@ IScsiComponentNameGetDriverName (
            This->SupportedLanguages,\r
            mIScsiDriverNameTable,\r
            DriverName,\r
-           (BOOLEAN) (This == &gIScsiComponentName)\r
+           (BOOLEAN)(This == &gIScsiComponentName)\r
            );\r
 }\r
 \r
@@ -108,14 +108,14 @@ IScsiComponentNameGetDriverName (
 **/\r
 EFI_STATUS\r
 UpdateName (\r
-  IN   EFI_EXT_SCSI_PASS_THRU_PROTOCOL *IScsiExtScsiPassThru,\r
-  IN   BOOLEAN     Ipv6Flag\r
+  IN   EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *IScsiExtScsiPassThru,\r
+  IN   BOOLEAN                          Ipv6Flag\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  CHAR16                           HandleName[80];\r
-  ISCSI_DRIVER_DATA                *Private;\r
-  UINT8                            NicIndex;\r
+  EFI_STATUS         Status;\r
+  CHAR16             HandleName[80];\r
+  ISCSI_DRIVER_DATA  *Private;\r
+  UINT8              NicIndex;\r
 \r
   if (IScsiExtScsiPassThru == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -130,7 +130,7 @@ UpdateName (
     L"iSCSI (%s, NicIndex=%d)",\r
     Ipv6Flag ? L"IPv6" : L"IPv4",\r
     NicIndex\r
-  );\r
+    );\r
 \r
   if (gIScsiControllerNameTable != NULL) {\r
     FreeUnicodeStringTable (gIScsiControllerNameTable);\r
@@ -228,21 +228,21 @@ UpdateName (
 EFI_STATUS\r
 EFIAPI\r
 IScsiComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL   *This,\r
-  IN  EFI_HANDLE                    ControllerHandle,\r
-  IN  EFI_HANDLE                    ChildHandle        OPTIONAL,\r
-  IN  CHAR8                         *Language,\r
-  OUT CHAR16                        **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
+  EFI_STATUS  Status;\r
 \r
-  EFI_HANDLE                      IScsiController;\r
-  BOOLEAN                         Ipv6Flag;\r
-  EFI_GUID                        *IScsiPrivateGuid;\r
-  ISCSI_PRIVATE_PROTOCOL          *IScsiIdentifier;\r
+  EFI_HANDLE              IScsiController;\r
+  BOOLEAN                 Ipv6Flag;\r
+  EFI_GUID                *IScsiPrivateGuid;\r
+  ISCSI_PRIVATE_PROTOCOL  *IScsiIdentifier;\r
 \r
-  EFI_EXT_SCSI_PASS_THRU_PROTOCOL *IScsiExtScsiPassThru;\r
+  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *IScsiExtScsiPassThru;\r
 \r
   if (ControllerHandle == NULL) {\r
     return EFI_UNSUPPORTED;\r
@@ -254,12 +254,12 @@ IScsiComponentNameGetControllerName (
   IScsiController = NetLibGetNicHandle (ControllerHandle, &gEfiTcp4ProtocolGuid);\r
   if (IScsiController != NULL) {\r
     IScsiPrivateGuid = &gIScsiV4PrivateGuid;\r
-    Ipv6Flag = FALSE;\r
+    Ipv6Flag         = FALSE;\r
   } else {\r
     IScsiController = NetLibGetNicHandle (ControllerHandle, &gEfiTcp6ProtocolGuid);\r
     if (IScsiController != NULL) {\r
       IScsiPrivateGuid = &gIScsiV6PrivateGuid;\r
-      Ipv6Flag = TRUE;\r
+      Ipv6Flag         = TRUE;\r
     } else {\r
       return EFI_UNSUPPORTED;\r
     }\r
@@ -268,7 +268,7 @@ IScsiComponentNameGetControllerName (
   Status = gBS->OpenProtocol (\r
                   IScsiController,\r
                   IScsiPrivateGuid,\r
-                  (VOID **) &IScsiIdentifier,\r
+                  (VOID **)&IScsiIdentifier,\r
                   NULL,\r
                   NULL,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -277,8 +277,8 @@ IScsiComponentNameGetControllerName (
     return Status;\r
   }\r
 \r
-  if(ChildHandle != NULL) {\r
-    if(!Ipv6Flag) {\r
+  if (ChildHandle != NULL) {\r
+    if (!Ipv6Flag) {\r
       //\r
       // Make sure this driver produced ChildHandle\r
       //\r
@@ -310,7 +310,7 @@ IScsiComponentNameGetControllerName (
     Status = gBS->OpenProtocol (\r
                     ChildHandle,\r
                     &gEfiExtScsiPassThruProtocolGuid,\r
-                   (VOID **)&IScsiExtScsiPassThru,\r
+                    (VOID **)&IScsiExtScsiPassThru,\r
                     NULL,\r
                     NULL,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
index aeff6461564f2afcf35f653f3b02ba332ca5b5a7..de62ae8dbdcfa0065a38eea9ee25db85aa05a795 100644 (file)
@@ -9,7 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "IScsiImpl.h"\r
 \r
-EFI_AUTHENTICATION_INFO_PROTOCOL gIScsiAuthenticationInfo = {\r
+EFI_AUTHENTICATION_INFO_PROTOCOL  gIScsiAuthenticationInfo = {\r
   IScsiGetAuthenticationInfo,\r
   IScsiSetAuthenticationInfo\r
 };\r
@@ -30,9 +30,9 @@ EFI_AUTHENTICATION_INFO_PROTOCOL gIScsiAuthenticationInfo = {
 EFI_STATUS\r
 EFIAPI\r
 IScsiGetAuthenticationInfo (\r
-  IN  EFI_AUTHENTICATION_INFO_PROTOCOL *This,\r
-  IN  EFI_HANDLE                       ControllerHandle,\r
-  OUT VOID                             **Buffer\r
+  IN  EFI_AUTHENTICATION_INFO_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                        ControllerHandle,\r
+  OUT VOID                              **Buffer\r
   )\r
 {\r
   return EFI_DEVICE_ERROR;\r
index 0491ef42db95e57390f9045ca25adaf933c2499f..b507f11cd45e258a038427ef0f125476df816711 100644 (file)
@@ -14,7 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // macros. CHAP_HASH structures at lower subscripts in the array are preferred\r
 // by the initiator.\r
 //\r
-STATIC CONST CHAP_HASH mChapHash[] = {\r
+STATIC CONST CHAP_HASH  mChapHash[] = {\r
   {\r
     ISCSI_CHAP_ALGORITHM_SHA256,\r
     SHA256_DIGEST_SIZE,\r
@@ -23,7 +23,7 @@ STATIC CONST CHAP_HASH mChapHash[] = {
     Sha256Update,\r
     Sha256Final\r
   },\r
-#ifdef ENABLE_MD5_DEPRECATED_INTERFACES\r
+ #ifdef ENABLE_MD5_DEPRECATED_INTERFACES\r
   //\r
   // Keep the deprecated MD5 entry at the end of the array (making MD5 the\r
   // least preferred choice of the initiator).\r
@@ -36,7 +36,7 @@ STATIC CONST CHAP_HASH mChapHash[] = {
     Md5Update,\r
     Md5Final\r
   },\r
-#endif // ENABLE_MD5_DEPRECATED_INTERFACES\r
+ #endif // ENABLE_MD5_DEPRECATED_INTERFACES\r
 };\r
 \r
 //\r
@@ -44,17 +44,17 @@ STATIC CONST CHAP_HASH mChapHash[] = {
 // CHAP_A=<A1,A2...> value string, by the IScsiCHAPInitHashList() function. It\r
 // is sent by the initiator in ISCSI_CHAP_STEP_ONE.\r
 //\r
-STATIC CHAR8 mChapHashListString[\r
-               3 +                                      // UINT8 identifier in\r
-                                                        //   decimal\r
-               (1 + 3) * (ARRAY_SIZE (mChapHash) - 1) + // comma prepended for\r
-                                                        //   entries after the\r
-                                                        //   first\r
-               1 +                                      // extra character for\r
-                                                        //   AsciiSPrint()\r
-                                                        //   truncation check\r
-               1                                        // terminating NUL\r
-               ];\r
+STATIC CHAR8  mChapHashListString[\r
+                                  3 +                                      // UINT8 identifier in\r
+                                                                           //   decimal\r
+                                  (1 + 3) * (ARRAY_SIZE (mChapHash) - 1) + // comma prepended for\r
+                                                                           //   entries after the\r
+                                                                           //   first\r
+                                  1 +                                      // extra character for\r
+                                                                           //   AsciiSPrint()\r
+                                                                           //   truncation check\r
+                                  1                                        // terminating NUL\r
+];\r
 \r
 /**\r
   Initiator calculates its own expected hash value.\r
@@ -82,13 +82,13 @@ STATIC CHAR8 mChapHashListString[
 **/\r
 EFI_STATUS\r
 IScsiCHAPCalculateResponse (\r
-  IN  UINT32          ChapIdentifier,\r
-  IN  CHAR8           *ChapSecret,\r
-  IN  UINT32          SecretLength,\r
-  IN  UINT8           *ChapChallenge,\r
-  IN  UINT32          ChallengeLength,\r
-  IN  CONST CHAP_HASH *Hash,\r
-  OUT UINT8           *ChapResponse\r
+  IN  UINT32           ChapIdentifier,\r
+  IN  CHAR8            *ChapSecret,\r
+  IN  UINT32           SecretLength,\r
+  IN  UINT8            *ChapChallenge,\r
+  IN  UINT32           ChallengeLength,\r
+  IN  CONST CHAP_HASH  *Hash,\r
+  OUT UINT8            *ChapResponse\r
   )\r
 {\r
   UINTN       ContextSize;\r
@@ -103,7 +103,7 @@ IScsiCHAPCalculateResponse (
   ASSERT (Hash != NULL);\r
 \r
   ContextSize = Hash->GetContextSize ();\r
-  Ctx = AllocatePool (ContextSize);\r
+  Ctx         = AllocatePool (ContextSize);\r
   if (Ctx == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -117,7 +117,7 @@ IScsiCHAPCalculateResponse (
   //\r
   // Hash Identifier - Only calculate 1 byte data (RFC1994)\r
   //\r
-  IdByte[0] = (CHAR8) ChapIdentifier;\r
+  IdByte[0] = (CHAR8)ChapIdentifier;\r
   if (!Hash->Update (Ctx, IdByte, 1)) {\r
     goto Exit;\r
   }\r
@@ -170,9 +170,9 @@ IScsiCHAPAuthTarget (
   UINT8       VerifyRsp[ISCSI_CHAP_MAX_DIGEST_SIZE];\r
   INTN        Mismatch;\r
 \r
-  Status      = EFI_SUCCESS;\r
+  Status = EFI_SUCCESS;\r
 \r
-  SecretSize  = (UINT32) AsciiStrLen (AuthData->AuthConfig->ReverseCHAPSecret);\r
+  SecretSize = (UINT32)AsciiStrLen (AuthData->AuthConfig->ReverseCHAPSecret);\r
 \r
   ASSERT (AuthData->Hash != NULL);\r
 \r
@@ -198,7 +198,6 @@ IScsiCHAPAuthTarget (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function checks the received iSCSI Login Response during the security\r
   negotiation stage.\r
@@ -216,33 +215,34 @@ IScsiCHAPOnRspReceived (
   IN ISCSI_CONNECTION  *Conn\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  ISCSI_SESSION               *Session;\r
-  ISCSI_CHAP_AUTH_DATA        *AuthData;\r
-  CHAR8                       *Value;\r
-  UINT8                       *Data;\r
-  UINT32                      Len;\r
-  LIST_ENTRY                  *KeyValueList;\r
-  UINTN                       Algorithm;\r
-  CHAR8                       *Identifier;\r
-  CHAR8                       *Challenge;\r
-  CHAR8                       *Name;\r
-  CHAR8                       *Response;\r
-  UINT8                       TargetRsp[ISCSI_CHAP_MAX_DIGEST_SIZE];\r
-  UINT32                      RspLen;\r
-  UINTN                       Result;\r
-  UINTN                       HashIndex;\r
+  EFI_STATUS            Status;\r
+  ISCSI_SESSION         *Session;\r
+  ISCSI_CHAP_AUTH_DATA  *AuthData;\r
+  CHAR8                 *Value;\r
+  UINT8                 *Data;\r
+  UINT32                Len;\r
+  LIST_ENTRY            *KeyValueList;\r
+  UINTN                 Algorithm;\r
+  CHAR8                 *Identifier;\r
+  CHAR8                 *Challenge;\r
+  CHAR8                 *Name;\r
+  CHAR8                 *Response;\r
+  UINT8                 TargetRsp[ISCSI_CHAP_MAX_DIGEST_SIZE];\r
+  UINT32                RspLen;\r
+  UINTN                 Result;\r
+  UINTN                 HashIndex;\r
 \r
   ASSERT (Conn->CurrentStage == ISCSI_SECURITY_NEGOTIATION);\r
   ASSERT (Conn->RspQue.BufNum != 0);\r
 \r
-  Session     = Conn->Session;\r
-  AuthData    = &Session->AuthData.CHAP;\r
-  Len         = Conn->RspQue.BufSize;\r
-  Data        = AllocateZeroPool (Len);\r
+  Session  = Conn->Session;\r
+  AuthData = &Session->AuthData.CHAP;\r
+  Len      = Conn->RspQue.BufSize;\r
+  Data     = AllocateZeroPool (Len);\r
   if (Data == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   //\r
   // Copy the data in case the data spans over multiple PDUs.\r
   //\r
@@ -251,7 +251,7 @@ IScsiCHAPOnRspReceived (
   //\r
   // Build the key-value list from the data segment of the Login Response.\r
   //\r
-  KeyValueList = IScsiBuildKeyValueList ((CHAR8 *) Data, Len);\r
+  KeyValueList = IScsiBuildKeyValueList ((CHAR8 *)Data, Len);\r
   if (KeyValueList == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
@@ -260,179 +260,184 @@ IScsiCHAPOnRspReceived (
   Status = EFI_PROTOCOL_ERROR;\r
 \r
   switch (Conn->AuthStep) {\r
-  case ISCSI_AUTH_INITIAL:\r
-    //\r
-    // The first Login Response.\r
-    //\r
-    Value = IScsiGetValueByKeyFromList (\r
-              KeyValueList,\r
-              ISCSI_KEY_TARGET_PORTAL_GROUP_TAG\r
-              );\r
-    if (Value == NULL) {\r
-      goto ON_EXIT;\r
-    }\r
-\r
-    Result = IScsiNetNtoi (Value);\r
-    if (Result > 0xFFFF) {\r
-      goto ON_EXIT;\r
-    }\r
-\r
-    Session->TargetPortalGroupTag = (UINT16) Result;\r
-\r
-    Value                         = IScsiGetValueByKeyFromList (\r
-                                      KeyValueList,\r
-                                      ISCSI_KEY_AUTH_METHOD\r
-                                      );\r
-    if (Value == NULL) {\r
-      goto ON_EXIT;\r
-    }\r
-    //\r
-    // Initiator mandates CHAP authentication but target replies without\r
-    // "CHAP", or initiator suggets "None" but target replies with some kind of\r
-    // auth method.\r
-    //\r
-    if (Session->AuthType == ISCSI_AUTH_TYPE_NONE) {\r
-      if (AsciiStrCmp (Value, ISCSI_KEY_VALUE_NONE) != 0) {\r
+    case ISCSI_AUTH_INITIAL:\r
+      //\r
+      // The first Login Response.\r
+      //\r
+      Value = IScsiGetValueByKeyFromList (\r
+                KeyValueList,\r
+                ISCSI_KEY_TARGET_PORTAL_GROUP_TAG\r
+                );\r
+      if (Value == NULL) {\r
         goto ON_EXIT;\r
       }\r
-    } else if (Session->AuthType == ISCSI_AUTH_TYPE_CHAP) {\r
-      if (AsciiStrCmp (Value, ISCSI_AUTH_METHOD_CHAP) != 0) {\r
+\r
+      Result = IScsiNetNtoi (Value);\r
+      if (Result > 0xFFFF) {\r
         goto ON_EXIT;\r
       }\r
-    } else {\r
-      goto ON_EXIT;\r
-    }\r
 \r
-    //\r
-    // Transit to CHAP step one.\r
-    //\r
-    Conn->AuthStep  = ISCSI_CHAP_STEP_ONE;\r
-    Status          = EFI_SUCCESS;\r
-    break;\r
+      Session->TargetPortalGroupTag = (UINT16)Result;\r
 \r
-  case ISCSI_CHAP_STEP_TWO:\r
-    //\r
-    // The Target replies with CHAP_A=<A> CHAP_I=<I> CHAP_C=<C>\r
-    //\r
-    Value = IScsiGetValueByKeyFromList (\r
-              KeyValueList,\r
-              ISCSI_KEY_CHAP_ALGORITHM\r
-              );\r
-    if (Value == NULL) {\r
-      goto ON_EXIT;\r
-    }\r
-\r
-    Algorithm = IScsiNetNtoi (Value);\r
-    for (HashIndex = 0; HashIndex < ARRAY_SIZE (mChapHash); HashIndex++) {\r
-      if (Algorithm == mChapHash[HashIndex].Algorithm) {\r
-        break;\r
+      Value = IScsiGetValueByKeyFromList (\r
+                KeyValueList,\r
+                ISCSI_KEY_AUTH_METHOD\r
+                );\r
+      if (Value == NULL) {\r
+        goto ON_EXIT;\r
       }\r
-    }\r
-    if (HashIndex == ARRAY_SIZE (mChapHash)) {\r
+\r
       //\r
-      // Unsupported algorithm is chosen by target.\r
+      // Initiator mandates CHAP authentication but target replies without\r
+      // "CHAP", or initiator suggets "None" but target replies with some kind of\r
+      // auth method.\r
       //\r
-      goto ON_EXIT;\r
-    }\r
-    //\r
-    // Remember the target's chosen hash algorithm.\r
-    //\r
-    ASSERT (AuthData->Hash == NULL);\r
-    AuthData->Hash = &mChapHash[HashIndex];\r
+      if (Session->AuthType == ISCSI_AUTH_TYPE_NONE) {\r
+        if (AsciiStrCmp (Value, ISCSI_KEY_VALUE_NONE) != 0) {\r
+          goto ON_EXIT;\r
+        }\r
+      } else if (Session->AuthType == ISCSI_AUTH_TYPE_CHAP) {\r
+        if (AsciiStrCmp (Value, ISCSI_AUTH_METHOD_CHAP) != 0) {\r
+          goto ON_EXIT;\r
+        }\r
+      } else {\r
+        goto ON_EXIT;\r
+      }\r
 \r
-    Identifier = IScsiGetValueByKeyFromList (\r
-                   KeyValueList,\r
-                   ISCSI_KEY_CHAP_IDENTIFIER\r
-                   );\r
-    if (Identifier == NULL) {\r
-      goto ON_EXIT;\r
-    }\r
-\r
-    Challenge = IScsiGetValueByKeyFromList (\r
-                  KeyValueList,\r
-                  ISCSI_KEY_CHAP_CHALLENGE\r
-                  );\r
-    if (Challenge == NULL) {\r
-      goto ON_EXIT;\r
-    }\r
-    //\r
-    // Process the CHAP identifier and CHAP Challenge from Target.\r
-    // Calculate Response value.\r
-    //\r
-    Result = IScsiNetNtoi (Identifier);\r
-    if (Result > 0xFF) {\r
-      goto ON_EXIT;\r
-    }\r
-\r
-    AuthData->InIdentifier      = (UINT32) Result;\r
-    AuthData->InChallengeLength = (UINT32) sizeof (AuthData->InChallenge);\r
-    Status = IScsiHexToBin (\r
-               (UINT8 *) AuthData->InChallenge,\r
-               &AuthData->InChallengeLength,\r
-               Challenge\r
-               );\r
-    if (EFI_ERROR (Status)) {\r
-      Status = EFI_PROTOCOL_ERROR;\r
-      goto ON_EXIT;\r
-    }\r
-    Status = IScsiCHAPCalculateResponse (\r
-               AuthData->InIdentifier,\r
-               AuthData->AuthConfig->CHAPSecret,\r
-               (UINT32) AsciiStrLen (AuthData->AuthConfig->CHAPSecret),\r
-               AuthData->InChallenge,\r
-               AuthData->InChallengeLength,\r
-               AuthData->Hash,\r
-               AuthData->CHAPResponse\r
-               );\r
+      //\r
+      // Transit to CHAP step one.\r
+      //\r
+      Conn->AuthStep = ISCSI_CHAP_STEP_ONE;\r
+      Status         = EFI_SUCCESS;\r
+      break;\r
 \r
-    //\r
-    // Transit to next step.\r
-    //\r
-    Conn->AuthStep = ISCSI_CHAP_STEP_THREE;\r
-    break;\r
+    case ISCSI_CHAP_STEP_TWO:\r
+      //\r
+      // The Target replies with CHAP_A=<A> CHAP_I=<I> CHAP_C=<C>\r
+      //\r
+      Value = IScsiGetValueByKeyFromList (\r
+                KeyValueList,\r
+                ISCSI_KEY_CHAP_ALGORITHM\r
+                );\r
+      if (Value == NULL) {\r
+        goto ON_EXIT;\r
+      }\r
 \r
-  case ISCSI_CHAP_STEP_THREE:\r
-    //\r
-    // One way CHAP authentication and the target would like to\r
-    // authenticate us.\r
-    //\r
-    Status = EFI_SUCCESS;\r
-    break;\r
+      Algorithm = IScsiNetNtoi (Value);\r
+      for (HashIndex = 0; HashIndex < ARRAY_SIZE (mChapHash); HashIndex++) {\r
+        if (Algorithm == mChapHash[HashIndex].Algorithm) {\r
+          break;\r
+        }\r
+      }\r
 \r
-  case ISCSI_CHAP_STEP_FOUR:\r
-    ASSERT (AuthData->AuthConfig->CHAPType == ISCSI_CHAP_MUTUAL);\r
-    //\r
-    // The forth step, CHAP_N=<N> CHAP_R=<R> is received from Target.\r
-    //\r
-    Name = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_CHAP_NAME);\r
-    if (Name == NULL) {\r
-      goto ON_EXIT;\r
-    }\r
-\r
-    Response = IScsiGetValueByKeyFromList (\r
-                 KeyValueList,\r
-                 ISCSI_KEY_CHAP_RESPONSE\r
+      if (HashIndex == ARRAY_SIZE (mChapHash)) {\r
+        //\r
+        // Unsupported algorithm is chosen by target.\r
+        //\r
+        goto ON_EXIT;\r
+      }\r
+\r
+      //\r
+      // Remember the target's chosen hash algorithm.\r
+      //\r
+      ASSERT (AuthData->Hash == NULL);\r
+      AuthData->Hash = &mChapHash[HashIndex];\r
+\r
+      Identifier = IScsiGetValueByKeyFromList (\r
+                     KeyValueList,\r
+                     ISCSI_KEY_CHAP_IDENTIFIER\r
+                     );\r
+      if (Identifier == NULL) {\r
+        goto ON_EXIT;\r
+      }\r
+\r
+      Challenge = IScsiGetValueByKeyFromList (\r
+                    KeyValueList,\r
+                    ISCSI_KEY_CHAP_CHALLENGE\r
+                    );\r
+      if (Challenge == NULL) {\r
+        goto ON_EXIT;\r
+      }\r
+\r
+      //\r
+      // Process the CHAP identifier and CHAP Challenge from Target.\r
+      // Calculate Response value.\r
+      //\r
+      Result = IScsiNetNtoi (Identifier);\r
+      if (Result > 0xFF) {\r
+        goto ON_EXIT;\r
+      }\r
+\r
+      AuthData->InIdentifier      = (UINT32)Result;\r
+      AuthData->InChallengeLength = (UINT32)sizeof (AuthData->InChallenge);\r
+      Status                      = IScsiHexToBin (\r
+                                      (UINT8 *)AuthData->InChallenge,\r
+                                      &AuthData->InChallengeLength,\r
+                                      Challenge\r
+                                      );\r
+      if (EFI_ERROR (Status)) {\r
+        Status = EFI_PROTOCOL_ERROR;\r
+        goto ON_EXIT;\r
+      }\r
+\r
+      Status = IScsiCHAPCalculateResponse (\r
+                 AuthData->InIdentifier,\r
+                 AuthData->AuthConfig->CHAPSecret,\r
+                 (UINT32)AsciiStrLen (AuthData->AuthConfig->CHAPSecret),\r
+                 AuthData->InChallenge,\r
+                 AuthData->InChallengeLength,\r
+                 AuthData->Hash,\r
+                 AuthData->CHAPResponse\r
                  );\r
-    if (Response == NULL) {\r
-      goto ON_EXIT;\r
-    }\r
-\r
-    ASSERT (AuthData->Hash != NULL);\r
-    RspLen = AuthData->Hash->DigestSize;\r
-    Status = IScsiHexToBin (TargetRsp, &RspLen, Response);\r
-    if (EFI_ERROR (Status) || RspLen != AuthData->Hash->DigestSize) {\r
-      Status = EFI_PROTOCOL_ERROR;\r
-      goto ON_EXIT;\r
-    }\r
 \r
-    //\r
-    // Check the CHAP Name and Response replied by Target.\r
-    //\r
-    Status = IScsiCHAPAuthTarget (AuthData, TargetRsp);\r
-    break;\r
+      //\r
+      // Transit to next step.\r
+      //\r
+      Conn->AuthStep = ISCSI_CHAP_STEP_THREE;\r
+      break;\r
+\r
+    case ISCSI_CHAP_STEP_THREE:\r
+      //\r
+      // One way CHAP authentication and the target would like to\r
+      // authenticate us.\r
+      //\r
+      Status = EFI_SUCCESS;\r
+      break;\r
+\r
+    case ISCSI_CHAP_STEP_FOUR:\r
+      ASSERT (AuthData->AuthConfig->CHAPType == ISCSI_CHAP_MUTUAL);\r
+      //\r
+      // The forth step, CHAP_N=<N> CHAP_R=<R> is received from Target.\r
+      //\r
+      Name = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_CHAP_NAME);\r
+      if (Name == NULL) {\r
+        goto ON_EXIT;\r
+      }\r
+\r
+      Response = IScsiGetValueByKeyFromList (\r
+                   KeyValueList,\r
+                   ISCSI_KEY_CHAP_RESPONSE\r
+                   );\r
+      if (Response == NULL) {\r
+        goto ON_EXIT;\r
+      }\r
 \r
-  default:\r
-    break;\r
+      ASSERT (AuthData->Hash != NULL);\r
+      RspLen = AuthData->Hash->DigestSize;\r
+      Status = IScsiHexToBin (TargetRsp, &RspLen, Response);\r
+      if (EFI_ERROR (Status) || (RspLen != AuthData->Hash->DigestSize)) {\r
+        Status = EFI_PROTOCOL_ERROR;\r
+        goto ON_EXIT;\r
+      }\r
+\r
+      //\r
+      // Check the CHAP Name and Response replied by Target.\r
+      //\r
+      Status = IScsiCHAPAuthTarget (AuthData, TargetRsp);\r
+      break;\r
+\r
+    default:\r
+      break;\r
   }\r
 \r
 ON_EXIT:\r
@@ -446,7 +451,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function fills the CHAP authentication information into the login PDU\r
   during the security negotiation stage in the iSCSI connection login.\r
@@ -467,140 +471,142 @@ IScsiCHAPToSendReq (
   IN OUT  NET_BUF           *Pdu\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  ISCSI_SESSION               *Session;\r
-  ISCSI_LOGIN_REQUEST         *LoginReq;\r
-  ISCSI_CHAP_AUTH_DATA        *AuthData;\r
-  CHAR8                       *Value;\r
-  CHAR8                       ValueStr[256];\r
-  CHAR8                       *Response;\r
-  UINT32                      RspLen;\r
-  CHAR8                       *Challenge;\r
-  UINT32                      ChallengeLen;\r
-  EFI_STATUS                  BinToHexStatus;\r
+  EFI_STATUS            Status;\r
+  ISCSI_SESSION         *Session;\r
+  ISCSI_LOGIN_REQUEST   *LoginReq;\r
+  ISCSI_CHAP_AUTH_DATA  *AuthData;\r
+  CHAR8                 *Value;\r
+  CHAR8                 ValueStr[256];\r
+  CHAR8                 *Response;\r
+  UINT32                RspLen;\r
+  CHAR8                 *Challenge;\r
+  UINT32                ChallengeLen;\r
+  EFI_STATUS            BinToHexStatus;\r
 \r
   ASSERT (Conn->CurrentStage == ISCSI_SECURITY_NEGOTIATION);\r
 \r
-  Session     = Conn->Session;\r
-  AuthData    = &Session->AuthData.CHAP;\r
-  LoginReq    = (ISCSI_LOGIN_REQUEST *) NetbufGetByte (Pdu, 0, 0);\r
+  Session  = Conn->Session;\r
+  AuthData = &Session->AuthData.CHAP;\r
+  LoginReq = (ISCSI_LOGIN_REQUEST *)NetbufGetByte (Pdu, 0, 0);\r
   if (LoginReq == NULL) {\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
-  Status      = EFI_SUCCESS;\r
 \r
-  RspLen      = 2 * ISCSI_CHAP_MAX_DIGEST_SIZE + 3;\r
-  Response    = AllocateZeroPool (RspLen);\r
+  Status = EFI_SUCCESS;\r
+\r
+  RspLen   = 2 * ISCSI_CHAP_MAX_DIGEST_SIZE + 3;\r
+  Response = AllocateZeroPool (RspLen);\r
   if (Response == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  ChallengeLen  = 2 * ISCSI_CHAP_MAX_DIGEST_SIZE + 3;\r
-  Challenge     = AllocateZeroPool (ChallengeLen);\r
+  ChallengeLen = 2 * ISCSI_CHAP_MAX_DIGEST_SIZE + 3;\r
+  Challenge    = AllocateZeroPool (ChallengeLen);\r
   if (Challenge == NULL) {\r
     FreePool (Response);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   switch (Conn->AuthStep) {\r
-  case ISCSI_AUTH_INITIAL:\r
-    //\r
-    // It's the initial Login Request. Fill in the key=value pairs mandatory\r
-    // for the initial Login Request.\r
-    //\r
-    IScsiAddKeyValuePair (\r
-      Pdu,\r
-      ISCSI_KEY_INITIATOR_NAME,\r
-      mPrivate->InitiatorName\r
-      );\r
-    IScsiAddKeyValuePair (Pdu, ISCSI_KEY_SESSION_TYPE, "Normal");\r
-    IScsiAddKeyValuePair (\r
-      Pdu,\r
-      ISCSI_KEY_TARGET_NAME,\r
-      Session->ConfigData->SessionConfigData.TargetName\r
-      );\r
-\r
-    if (Session->AuthType == ISCSI_AUTH_TYPE_NONE) {\r
-      Value = ISCSI_KEY_VALUE_NONE;\r
-      ISCSI_SET_FLAG (LoginReq, ISCSI_LOGIN_REQ_PDU_FLAG_TRANSIT);\r
-    } else {\r
-      Value = ISCSI_AUTH_METHOD_CHAP;\r
-    }\r
-\r
-    IScsiAddKeyValuePair (Pdu, ISCSI_KEY_AUTH_METHOD, Value);\r
+    case ISCSI_AUTH_INITIAL:\r
+      //\r
+      // It's the initial Login Request. Fill in the key=value pairs mandatory\r
+      // for the initial Login Request.\r
+      //\r
+      IScsiAddKeyValuePair (\r
+        Pdu,\r
+        ISCSI_KEY_INITIATOR_NAME,\r
+        mPrivate->InitiatorName\r
+        );\r
+      IScsiAddKeyValuePair (Pdu, ISCSI_KEY_SESSION_TYPE, "Normal");\r
+      IScsiAddKeyValuePair (\r
+        Pdu,\r
+        ISCSI_KEY_TARGET_NAME,\r
+        Session->ConfigData->SessionConfigData.TargetName\r
+        );\r
 \r
-    break;\r
+      if (Session->AuthType == ISCSI_AUTH_TYPE_NONE) {\r
+        Value = ISCSI_KEY_VALUE_NONE;\r
+        ISCSI_SET_FLAG (LoginReq, ISCSI_LOGIN_REQ_PDU_FLAG_TRANSIT);\r
+      } else {\r
+        Value = ISCSI_AUTH_METHOD_CHAP;\r
+      }\r
 \r
-  case ISCSI_CHAP_STEP_ONE:\r
-    //\r
-    // First step, send the Login Request with CHAP_A=<A1,A2...> key-value\r
-    // pair.\r
-    //\r
-    IScsiAddKeyValuePair (Pdu, ISCSI_KEY_CHAP_ALGORITHM, mChapHashListString);\r
+      IScsiAddKeyValuePair (Pdu, ISCSI_KEY_AUTH_METHOD, Value);\r
 \r
-    Conn->AuthStep = ISCSI_CHAP_STEP_TWO;\r
-    break;\r
+      break;\r
 \r
-  case ISCSI_CHAP_STEP_THREE:\r
-    //\r
-    // Third step, send the Login Request with CHAP_N=<N> CHAP_R=<R> or\r
-    // CHAP_N=<N> CHAP_R=<R> CHAP_I=<I> CHAP_C=<C> if target authentication is\r
-    // required too.\r
-    //\r
-    // CHAP_N=<N>\r
-    //\r
-    IScsiAddKeyValuePair (\r
-      Pdu,\r
-      ISCSI_KEY_CHAP_NAME,\r
-      (CHAR8 *) &AuthData->AuthConfig->CHAPName\r
-      );\r
-    //\r
-    // CHAP_R=<R>\r
-    //\r
-    ASSERT (AuthData->Hash != NULL);\r
-    BinToHexStatus = IScsiBinToHex (\r
-                       (UINT8 *) AuthData->CHAPResponse,\r
-                       AuthData->Hash->DigestSize,\r
-                       Response,\r
-                       &RspLen\r
-                       );\r
-    ASSERT_EFI_ERROR (BinToHexStatus);\r
-    IScsiAddKeyValuePair (Pdu, ISCSI_KEY_CHAP_RESPONSE, Response);\r
-\r
-    if (AuthData->AuthConfig->CHAPType == ISCSI_CHAP_MUTUAL) {\r
+    case ISCSI_CHAP_STEP_ONE:\r
       //\r
-      // CHAP_I=<I>\r
+      // First step, send the Login Request with CHAP_A=<A1,A2...> key-value\r
+      // pair.\r
       //\r
-      IScsiGenRandom ((UINT8 *) &AuthData->OutIdentifier, 1);\r
-      AsciiSPrint (ValueStr, sizeof (ValueStr), "%d", AuthData->OutIdentifier);\r
-      IScsiAddKeyValuePair (Pdu, ISCSI_KEY_CHAP_IDENTIFIER, ValueStr);\r
+      IScsiAddKeyValuePair (Pdu, ISCSI_KEY_CHAP_ALGORITHM, mChapHashListString);\r
+\r
+      Conn->AuthStep = ISCSI_CHAP_STEP_TWO;\r
+      break;\r
+\r
+    case ISCSI_CHAP_STEP_THREE:\r
       //\r
-      // CHAP_C=<C>\r
+      // Third step, send the Login Request with CHAP_N=<N> CHAP_R=<R> or\r
+      // CHAP_N=<N> CHAP_R=<R> CHAP_I=<I> CHAP_C=<C> if target authentication is\r
+      // required too.\r
       //\r
-      IScsiGenRandom (\r
-        (UINT8 *) AuthData->OutChallenge,\r
-        AuthData->Hash->DigestSize\r
+      // CHAP_N=<N>\r
+      //\r
+      IScsiAddKeyValuePair (\r
+        Pdu,\r
+        ISCSI_KEY_CHAP_NAME,\r
+        (CHAR8 *)&AuthData->AuthConfig->CHAPName\r
         );\r
+      //\r
+      // CHAP_R=<R>\r
+      //\r
+      ASSERT (AuthData->Hash != NULL);\r
       BinToHexStatus = IScsiBinToHex (\r
-                         (UINT8 *) AuthData->OutChallenge,\r
+                         (UINT8 *)AuthData->CHAPResponse,\r
                          AuthData->Hash->DigestSize,\r
-                         Challenge,\r
-                         &ChallengeLen\r
+                         Response,\r
+                         &RspLen\r
                          );\r
       ASSERT_EFI_ERROR (BinToHexStatus);\r
-      IScsiAddKeyValuePair (Pdu, ISCSI_KEY_CHAP_CHALLENGE, Challenge);\r
+      IScsiAddKeyValuePair (Pdu, ISCSI_KEY_CHAP_RESPONSE, Response);\r
+\r
+      if (AuthData->AuthConfig->CHAPType == ISCSI_CHAP_MUTUAL) {\r
+        //\r
+        // CHAP_I=<I>\r
+        //\r
+        IScsiGenRandom ((UINT8 *)&AuthData->OutIdentifier, 1);\r
+        AsciiSPrint (ValueStr, sizeof (ValueStr), "%d", AuthData->OutIdentifier);\r
+        IScsiAddKeyValuePair (Pdu, ISCSI_KEY_CHAP_IDENTIFIER, ValueStr);\r
+        //\r
+        // CHAP_C=<C>\r
+        //\r
+        IScsiGenRandom (\r
+          (UINT8 *)AuthData->OutChallenge,\r
+          AuthData->Hash->DigestSize\r
+          );\r
+        BinToHexStatus = IScsiBinToHex (\r
+                           (UINT8 *)AuthData->OutChallenge,\r
+                           AuthData->Hash->DigestSize,\r
+                           Challenge,\r
+                           &ChallengeLen\r
+                           );\r
+        ASSERT_EFI_ERROR (BinToHexStatus);\r
+        IScsiAddKeyValuePair (Pdu, ISCSI_KEY_CHAP_CHALLENGE, Challenge);\r
+\r
+        Conn->AuthStep = ISCSI_CHAP_STEP_FOUR;\r
+      }\r
 \r
-      Conn->AuthStep = ISCSI_CHAP_STEP_FOUR;\r
-    }\r
-    //\r
-    // Set the stage transition flag.\r
-    //\r
-    ISCSI_SET_FLAG (LoginReq, ISCSI_LOGIN_REQ_PDU_FLAG_TRANSIT);\r
-    break;\r
+      //\r
+      // Set the stage transition flag.\r
+      //\r
+      ISCSI_SET_FLAG (LoginReq, ISCSI_LOGIN_REQ_PDU_FLAG_TRANSIT);\r
+      break;\r
 \r
-  default:\r
-    Status = EFI_PROTOCOL_ERROR;\r
-    break;\r
+    default:\r
+      Status = EFI_PROTOCOL_ERROR;\r
+      break;\r
   }\r
 \r
   FreePool (Response);\r
@@ -621,14 +627,14 @@ IScsiCHAPInitHashList (
   VOID\r
   )\r
 {\r
-  CHAR8           *Position;\r
-  UINTN           Left;\r
-  UINTN           HashIndex;\r
-  CONST CHAP_HASH *Hash;\r
-  UINTN           Printed;\r
+  CHAR8            *Position;\r
+  UINTN            Left;\r
+  UINTN            HashIndex;\r
+  CONST CHAP_HASH  *Hash;\r
+  UINTN            Printed;\r
 \r
   Position = mChapHashListString;\r
-  Left = sizeof (mChapHashListString);\r
+  Left     = sizeof (mChapHashListString);\r
   for (HashIndex = 0; HashIndex < ARRAY_SIZE (mChapHash); HashIndex++) {\r
     Hash = &mChapHash[HashIndex];\r
 \r
@@ -657,7 +663,7 @@ IScsiCHAPInitHashList (
     ASSERT (Printed + 1 < Left);\r
 \r
     Position += Printed;\r
-    Left -= Printed;\r
+    Left     -= Printed;\r
 \r
     //\r
     // Sanity-check the digest size for Hash.\r
index e2df634c4e67064333ba43be1b70ef3650b8c0ec..1be85d39789cde18a7688c9d0cd024ae5463c59e 100644 (file)
@@ -9,41 +9,40 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef _ISCSI_CHAP_H_\r
 #define _ISCSI_CHAP_H_\r
 \r
-#define ISCSI_AUTH_METHOD_CHAP                    "CHAP"\r
+#define ISCSI_AUTH_METHOD_CHAP  "CHAP"\r
 \r
-#define ISCSI_KEY_CHAP_ALGORITHM                  "CHAP_A"\r
-#define ISCSI_KEY_CHAP_IDENTIFIER                 "CHAP_I"\r
-#define ISCSI_KEY_CHAP_CHALLENGE                  "CHAP_C"\r
-#define ISCSI_KEY_CHAP_NAME                       "CHAP_N"\r
-#define ISCSI_KEY_CHAP_RESPONSE                   "CHAP_R"\r
+#define ISCSI_KEY_CHAP_ALGORITHM   "CHAP_A"\r
+#define ISCSI_KEY_CHAP_IDENTIFIER  "CHAP_I"\r
+#define ISCSI_KEY_CHAP_CHALLENGE   "CHAP_C"\r
+#define ISCSI_KEY_CHAP_NAME        "CHAP_N"\r
+#define ISCSI_KEY_CHAP_RESPONSE    "CHAP_R"\r
 \r
 //\r
 // Identifiers of supported CHAP hash algorithms:\r
 // https://www.iana.org/assignments/ppp-numbers/ppp-numbers.xhtml#ppp-numbers-9\r
 //\r
-#define ISCSI_CHAP_ALGORITHM_MD5                  5\r
-#define ISCSI_CHAP_ALGORITHM_SHA256               7\r
+#define ISCSI_CHAP_ALGORITHM_MD5     5\r
+#define ISCSI_CHAP_ALGORITHM_SHA256  7\r
 \r
 //\r
 // Byte count of the largest digest over the above-listed\r
 // ISCSI_CHAP_ALGORITHM_* hash algorithms.\r
 //\r
-#define ISCSI_CHAP_MAX_DIGEST_SIZE                SHA256_DIGEST_SIZE\r
-\r
-#define ISCSI_CHAP_STEP_ONE                       1\r
-#define ISCSI_CHAP_STEP_TWO                       2\r
-#define ISCSI_CHAP_STEP_THREE                     3\r
-#define ISCSI_CHAP_STEP_FOUR                      4\r
+#define ISCSI_CHAP_MAX_DIGEST_SIZE  SHA256_DIGEST_SIZE\r
 \r
+#define ISCSI_CHAP_STEP_ONE    1\r
+#define ISCSI_CHAP_STEP_TWO    2\r
+#define ISCSI_CHAP_STEP_THREE  3\r
+#define ISCSI_CHAP_STEP_FOUR   4\r
 \r
 #pragma pack(1)\r
 \r
 typedef struct _ISCSI_CHAP_AUTH_CONFIG_NVDATA {\r
-  UINT8 CHAPType;\r
-  CHAR8 CHAPName[ISCSI_CHAP_NAME_STORAGE];\r
-  CHAR8 CHAPSecret[ISCSI_CHAP_SECRET_STORAGE];\r
-  CHAR8 ReverseCHAPName[ISCSI_CHAP_NAME_STORAGE];\r
-  CHAR8 ReverseCHAPSecret[ISCSI_CHAP_SECRET_STORAGE];\r
+  UINT8    CHAPType;\r
+  CHAR8    CHAPName[ISCSI_CHAP_NAME_STORAGE];\r
+  CHAR8    CHAPSecret[ISCSI_CHAP_SECRET_STORAGE];\r
+  CHAR8    ReverseCHAPName[ISCSI_CHAP_NAME_STORAGE];\r
+  CHAR8    ReverseCHAPSecret[ISCSI_CHAP_SECRET_STORAGE];\r
 } ISCSI_CHAP_AUTH_CONFIG_NVDATA;\r
 \r
 #pragma pack()\r
@@ -53,19 +52,19 @@ typedef struct _ISCSI_CHAP_AUTH_CONFIG_NVDATA {
 //\r
 typedef\r
 UINTN\r
-(EFIAPI *CHAP_HASH_GET_CONTEXT_SIZE) (\r
+(EFIAPI *CHAP_HASH_GET_CONTEXT_SIZE)(\r
   VOID\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
-(EFIAPI *CHAP_HASH_INIT) (\r
+(EFIAPI *CHAP_HASH_INIT)(\r
   OUT VOID *Context\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
-(EFIAPI *CHAP_HASH_UPDATE) (\r
+(EFIAPI *CHAP_HASH_UPDATE)(\r
   IN OUT VOID       *Context,\r
   IN     CONST VOID *Data,\r
   IN     UINTN      DataSize\r
@@ -73,37 +72,37 @@ BOOLEAN
 \r
 typedef\r
 BOOLEAN\r
-(EFIAPI *CHAP_HASH_FINAL) (\r
+(EFIAPI *CHAP_HASH_FINAL)(\r
   IN OUT VOID  *Context,\r
   OUT    UINT8 *HashValue\r
   );\r
 \r
 typedef struct {\r
-  UINT8                      Algorithm;      // ISCSI_CHAP_ALGORITHM_*, CHAP_A\r
-  UINT32                     DigestSize;\r
-  CHAP_HASH_GET_CONTEXT_SIZE GetContextSize;\r
-  CHAP_HASH_INIT             Init;\r
-  CHAP_HASH_UPDATE           Update;\r
-  CHAP_HASH_FINAL            Final;\r
+  UINT8                         Algorithm;   // ISCSI_CHAP_ALGORITHM_*, CHAP_A\r
+  UINT32                        DigestSize;\r
+  CHAP_HASH_GET_CONTEXT_SIZE    GetContextSize;\r
+  CHAP_HASH_INIT                Init;\r
+  CHAP_HASH_UPDATE              Update;\r
+  CHAP_HASH_FINAL               Final;\r
 } CHAP_HASH;\r
 \r
 ///\r
 /// ISCSI CHAP Authentication Data\r
 ///\r
 typedef struct _ISCSI_CHAP_AUTH_DATA {\r
-  ISCSI_CHAP_AUTH_CONFIG_NVDATA *AuthConfig;\r
-  UINT32                        InIdentifier;\r
-  UINT8                         InChallenge[1024];\r
-  UINT32                        InChallengeLength;\r
+  ISCSI_CHAP_AUTH_CONFIG_NVDATA    *AuthConfig;\r
+  UINT32                           InIdentifier;\r
+  UINT8                            InChallenge[1024];\r
+  UINT32                           InChallengeLength;\r
   //\r
   // The hash algorithm (CHAP_A) that the target selects in\r
   // ISCSI_CHAP_STEP_TWO.\r
   //\r
-  CONST CHAP_HASH               *Hash;\r
+  CONST CHAP_HASH                  *Hash;\r
   //\r
   // Calculated CHAP Response (CHAP_R) value.\r
   //\r
-  UINT8                         CHAPResponse[ISCSI_CHAP_MAX_DIGEST_SIZE];\r
+  UINT8                            CHAPResponse[ISCSI_CHAP_MAX_DIGEST_SIZE];\r
 \r
   //\r
   // Auth-data to be sent out for mutual authentication.\r
@@ -113,8 +112,8 @@ typedef struct _ISCSI_CHAP_AUTH_DATA {
   // digest size. In other words, it's good practice to feed *at least as many\r
   // bytes* to the hashing algorithm as the hashing algorithm will output.\r
   //\r
-  UINT32                        OutIdentifier;\r
-  UINT8                         OutChallenge[ISCSI_CHAP_MAX_DIGEST_SIZE];\r
+  UINT32    OutIdentifier;\r
+  UINT8     OutChallenge[ISCSI_CHAP_MAX_DIGEST_SIZE];\r
 } ISCSI_CHAP_AUTH_DATA;\r
 \r
 /**\r
@@ -133,6 +132,7 @@ EFI_STATUS
 IScsiCHAPOnRspReceived (\r
   IN ISCSI_CONNECTION  *Conn\r
   );\r
+\r
 /**\r
   This function fills the CHAP authentication information into the login PDU\r
   during the security negotiation stage in the iSCSI connection login.\r
@@ -164,4 +164,5 @@ VOID
 IScsiCHAPInitHashList (\r
   VOID\r
   );\r
+\r
 #endif\r
index 326b1da39ea300b2e6e6d2f24bbaf227d6ee3d14..37f6255af0e9f74e4a12e35a73b4d6fd793c9d30 100644 (file)
@@ -8,8 +8,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "IScsiImpl.h"\r
 \r
-CHAR16          mVendorStorageName[]     = L"ISCSI_CONFIG_IFR_NVDATA";\r
-ISCSI_FORM_CALLBACK_INFO  *mCallbackInfo = NULL;\r
+CHAR16                    mVendorStorageName[] = L"ISCSI_CONFIG_IFR_NVDATA";\r
+ISCSI_FORM_CALLBACK_INFO  *mCallbackInfo       = NULL;\r
 \r
 HII_VENDOR_DEVICE_PATH  mIScsiHiiVendorDevicePath = {\r
   {\r
@@ -17,8 +17,8 @@ HII_VENDOR_DEVICE_PATH  mIScsiHiiVendorDevicePath = {
       HARDWARE_DEVICE_PATH,\r
       HW_VENDOR_DP,\r
       {\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     ISCSI_CONFIG_GUID\r
@@ -27,13 +27,12 @@ HII_VENDOR_DEVICE_PATH  mIScsiHiiVendorDevicePath = {
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
     {\r
-      (UINT8) (END_DEVICE_PATH_LENGTH),\r
-      (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
+      (UINT8)(END_DEVICE_PATH_LENGTH),\r
+      (UINT8)((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r
   }\r
 };\r
 \r
-\r
 /**\r
   Convert the IP address into a dotted string.\r
 \r
@@ -44,32 +43,32 @@ HII_VENDOR_DEVICE_PATH  mIScsiHiiVendorDevicePath = {
 **/\r
 VOID\r
 IScsiIpToStr (\r
-  IN  EFI_IP_ADDRESS    *Ip,\r
-  IN  BOOLEAN           Ipv6Flag,\r
-  OUT CHAR16            *Str\r
+  IN  EFI_IP_ADDRESS  *Ip,\r
+  IN  BOOLEAN         Ipv6Flag,\r
+  OUT CHAR16          *Str\r
   )\r
 {\r
-  EFI_IPv4_ADDRESS      *Ip4;\r
-  EFI_IPv6_ADDRESS      *Ip6;\r
-  UINTN                 Index;\r
-  BOOLEAN               Short;\r
-  UINTN                 Number;\r
-  CHAR16                FormatString[8];\r
+  EFI_IPv4_ADDRESS  *Ip4;\r
+  EFI_IPv6_ADDRESS  *Ip6;\r
+  UINTN             Index;\r
+  BOOLEAN           Short;\r
+  UINTN             Number;\r
+  CHAR16            FormatString[8];\r
 \r
   if (!Ipv6Flag) {\r
     Ip4 = &Ip->v4;\r
 \r
     UnicodeSPrint (\r
       Str,\r
-      (UINTN) 2 * IP4_STR_MAX_SIZE,\r
+      (UINTN)2 * IP4_STR_MAX_SIZE,\r
       L"%d.%d.%d.%d",\r
-      (UINTN) Ip4->Addr[0],\r
-      (UINTN) Ip4->Addr[1],\r
-      (UINTN) Ip4->Addr[2],\r
-      (UINTN) Ip4->Addr[3]\r
+      (UINTN)Ip4->Addr[0],\r
+      (UINTN)Ip4->Addr[1],\r
+      (UINTN)Ip4->Addr[2],\r
+      (UINTN)Ip4->Addr[3]\r
       );\r
 \r
-    return ;\r
+    return;\r
   }\r
 \r
   Ip6   = &Ip->v6;\r
@@ -77,10 +76,11 @@ IScsiIpToStr (
 \r
   for (Index = 0; Index < 15; Index = Index + 2) {\r
     if (!Short &&\r
-        Index % 2 == 0 &&\r
-        Ip6->Addr[Index] == 0 &&\r
-        Ip6->Addr[Index + 1] == 0\r
-        ) {\r
+        (Index % 2 == 0) &&\r
+        (Ip6->Addr[Index] == 0) &&\r
+        (Ip6->Addr[Index + 1] == 0)\r
+        )\r
+    {\r
       //\r
       // Deal with the case of ::.\r
       //\r
@@ -89,8 +89,8 @@ IScsiIpToStr (
         *(Str + 1) = L':';\r
         Str        = Str + 2;\r
       } else {\r
-        *Str       = L':';\r
-        Str        = Str + 1;\r
+        *Str = L':';\r
+        Str  = Str + 1;\r
       }\r
 \r
       while ((Index < 15) && (Ip6->Addr[Index] == 0) && (Ip6->Addr[Index + 1] == 0)) {\r
@@ -111,7 +111,7 @@ IScsiIpToStr (
     ASSERT (Index < 15);\r
 \r
     if (Ip6->Addr[Index] == 0) {\r
-      Number = UnicodeSPrint (Str, 2 * IP_STR_MAX_SIZE, L"%x:", (UINTN) Ip6->Addr[Index + 1]);\r
+      Number = UnicodeSPrint (Str, 2 * IP_STR_MAX_SIZE, L"%x:", (UINTN)Ip6->Addr[Index + 1]);\r
     } else {\r
       if (Ip6->Addr[Index + 1] < 0x10) {\r
         CopyMem (FormatString, L"%x0%x:", StrSize (L"%x0%x:"));\r
@@ -122,9 +122,9 @@ IScsiIpToStr (
       Number = UnicodeSPrint (\r
                  Str,\r
                  2 * IP_STR_MAX_SIZE,\r
-                 (CONST CHAR16 *) FormatString,\r
-                 (UINTN) Ip6->Addr[Index],\r
-                 (UINTN) Ip6->Addr[Index + 1]\r
+                 (CONST CHAR16 *)FormatString,\r
+                 (UINTN)Ip6->Addr[Index],\r
+                 (UINTN)Ip6->Addr[Index + 1]\r
                  );\r
     }\r
 \r
@@ -151,14 +151,15 @@ IScsiIpToStr (
 **/\r
 BOOLEAN\r
 IpIsUnicast (\r
-  IN EFI_IP_ADDRESS *Ip,\r
+  IN EFI_IP_ADDRESS  *Ip,\r
   IN  UINT8          IpMode\r
   )\r
 {\r
   if (IpMode == IP_MODE_IP4) {\r
-    if (IP4_IS_UNSPECIFIED (NTOHL (Ip->Addr[0])) || IP4_IS_LOCAL_BROADCAST (NTOHL (Ip->Addr[0])))   {\r
+    if (IP4_IS_UNSPECIFIED (NTOHL (Ip->Addr[0])) || IP4_IS_LOCAL_BROADCAST (NTOHL (Ip->Addr[0]))) {\r
       return FALSE;\r
     }\r
+\r
     return TRUE;\r
   } else if (IpMode == IP_MODE_IP6) {\r
     return NetIp6IsValidUnicast (&Ip->v6);\r
@@ -180,27 +181,27 @@ IpIsUnicast (
 **/\r
 EFI_STATUS\r
 IScsiParseIsIdFromString (\r
-  IN CONST CHAR16                    *String,\r
-  IN OUT   UINT8                     *IsId\r
+  IN CONST CHAR16  *String,\r
+  IN OUT   UINT8   *IsId\r
   )\r
 {\r
-  UINT8                          Index;\r
-  CHAR16                         *IsIdStr;\r
-  CHAR16                         TempStr[3];\r
-  UINTN                          NodeVal;\r
-  CHAR16                         PortString[ISCSI_NAME_IFR_MAX_SIZE];\r
-  EFI_INPUT_KEY                  Key;\r
+  UINT8          Index;\r
+  CHAR16         *IsIdStr;\r
+  CHAR16         TempStr[3];\r
+  UINTN          NodeVal;\r
+  CHAR16         PortString[ISCSI_NAME_IFR_MAX_SIZE];\r
+  EFI_INPUT_KEY  Key;\r
 \r
   if ((String == NULL) || (IsId == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  IsIdStr = (CHAR16 *) String;\r
+  IsIdStr = (CHAR16 *)String;\r
 \r
-  if (StrLen (IsIdStr) != 6 && StrLen (IsIdStr) != 12) {\r
+  if ((StrLen (IsIdStr) != 6) && (StrLen (IsIdStr) != 12)) {\r
     UnicodeSPrint (\r
       PortString,\r
-      (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+      (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
       L"Error! Only last 3 bytes are configurable, please input 6 hex numbers for last 3 bytes only or 12 hex numbers for full SSID!\n"\r
       );\r
 \r
@@ -228,7 +229,7 @@ IScsiParseIsIdFromString (
     //\r
     NodeVal = StrHexToUintn (TempStr);\r
 \r
-    IsId[Index] = (UINT8) NodeVal;\r
+    IsId[Index] = (UINT8)NodeVal;\r
 \r
     IsIdStr = IsIdStr + 2;\r
   }\r
@@ -248,12 +249,12 @@ IScsiParseIsIdFromString (
 **/\r
 EFI_STATUS\r
 IScsiConvertIsIdToString (\r
-  OUT CHAR16                         *String,\r
-  IN  UINT8                          *IsId\r
+  OUT CHAR16  *String,\r
+  IN  UINT8   *IsId\r
   )\r
 {\r
-  UINT8                          Index;\r
-  UINTN                          Number;\r
+  UINT8  Index;\r
+  UINTN  Number;\r
 \r
   if ((String == NULL) || (IsId == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -265,16 +266,15 @@ IScsiConvertIsIdToString (
                  String,\r
                  2 * ISID_CONFIGURABLE_STORAGE,\r
                  L"0%X",\r
-                 (UINTN) IsId[Index]\r
+                 (UINTN)IsId[Index]\r
                  );\r
     } else {\r
       Number = UnicodeSPrint (\r
                  String,\r
                  2 * ISID_CONFIGURABLE_STORAGE,\r
                  L"%X",\r
-                 (UINTN) IsId[Index]\r
+                 (UINTN)IsId[Index]\r
                  );\r
-\r
     }\r
 \r
     String = String + Number;\r
@@ -301,36 +301,37 @@ IScsiConvertIsIdToString (
 **/\r
 EFI_STATUS\r
 IScsiGetValue (\r
-  IN  CONST EFI_STRING             Configuration,\r
-  IN  CHAR16                       *String,\r
-  OUT UINTN                        *Value\r
+  IN  CONST EFI_STRING  Configuration,\r
+  IN  CHAR16            *String,\r
+  OUT UINTN             *Value\r
   )\r
 {\r
-  CHAR16                           *StringPtr;\r
-  CHAR16                           *TmpPtr;\r
-  CHAR16                           *Str;\r
-  CHAR16                           TmpStr[2];\r
-  UINTN                            Length;\r
-  UINTN                            Len;\r
-  UINTN                            Index;\r
-  UINT8                            *Buf;\r
-  UINT8                            DigitUint8;\r
-  EFI_STATUS                       Status;\r
+  CHAR16      *StringPtr;\r
+  CHAR16      *TmpPtr;\r
+  CHAR16      *Str;\r
+  CHAR16      TmpStr[2];\r
+  UINTN       Length;\r
+  UINTN       Len;\r
+  UINTN       Index;\r
+  UINT8       *Buf;\r
+  UINT8       DigitUint8;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Get Value.\r
   //\r
-  Buf = NULL;\r
+  Buf       = NULL;\r
   StringPtr = StrStr (Configuration, String);\r
-  ASSERT(StringPtr != NULL);\r
+  ASSERT (StringPtr != NULL);\r
   StringPtr += StrLen (String);\r
-  TmpPtr = StringPtr;\r
+  TmpPtr     = StringPtr;\r
 \r
   while (*StringPtr != L'\0' && *StringPtr != L'&') {\r
-    StringPtr ++;\r
+    StringPtr++;\r
   }\r
+\r
   Length = StringPtr - TmpPtr;\r
-  Len = Length + 1;\r
+  Len    = Length + 1;\r
 \r
   Str = AllocateZeroPool (Len * sizeof (CHAR16));\r
   if (Str == NULL) {\r
@@ -342,20 +343,20 @@ IScsiGetValue (
   *(Str + Length) = L'\0';\r
 \r
   Len = (Len + 1) / 2;\r
-  Buf = (UINT8 *) AllocateZeroPool (Len);\r
+  Buf = (UINT8 *)AllocateZeroPool (Len);\r
   if (Buf == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Exit;\r
   }\r
 \r
   ZeroMem (TmpStr, sizeof (TmpStr));\r
-  for (Index = 0; Index < Length; Index ++) {\r
-    TmpStr[0] = Str[Length - Index - 1];\r
-    DigitUint8 = (UINT8) StrHexToUint64 (TmpStr);\r
+  for (Index = 0; Index < Length; Index++) {\r
+    TmpStr[0]  = Str[Length - Index - 1];\r
+    DigitUint8 = (UINT8)StrHexToUint64 (TmpStr);\r
     if ((Index & 1) == 0) {\r
-      Buf [Index/2] = DigitUint8;\r
+      Buf[Index/2] = DigitUint8;\r
     } else {\r
-      Buf [Index/2] = (UINT8) ((DigitUint8 << 4) + Buf [Index/2]);\r
+      Buf[Index/2] = (UINT8)((DigitUint8 << 4) + Buf[Index/2]);\r
     }\r
   }\r
 \r
@@ -388,7 +389,7 @@ Exit:
 **/\r
 ISCSI_ATTEMPT_CONFIG_NVDATA *\r
 IScsiConfigGetAttemptByConfigIndex (\r
-  IN UINT8                     AttemptConfigIndex\r
+  IN UINT8  AttemptConfigIndex\r
   )\r
 {\r
   LIST_ENTRY                   *Entry;\r
@@ -404,7 +405,6 @@ IScsiConfigGetAttemptByConfigIndex (
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Get the existing attempt config data from global structure by the NicIndex.\r
 \r
@@ -419,8 +419,8 @@ IScsiConfigGetAttemptByConfigIndex (
 **/\r
 ISCSI_ATTEMPT_CONFIG_NVDATA *\r
 IScsiConfigGetAttemptByNic (\r
-  IN ISCSI_ATTEMPT_CONFIG_NVDATA *NewAttempt,\r
-  IN UINT8                       IScsiMode\r
+  IN ISCSI_ATTEMPT_CONFIG_NVDATA  *NewAttempt,\r
+  IN UINT8                        IScsiMode\r
   )\r
 {\r
   LIST_ENTRY                   *Entry;\r
@@ -428,8 +428,9 @@ IScsiConfigGetAttemptByNic (
 \r
   NET_LIST_FOR_EACH (Entry, &mPrivate->AttemptConfigs) {\r
     Attempt = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);\r
-    if (Attempt != NewAttempt && Attempt->NicIndex == NewAttempt->NicIndex &&\r
-        Attempt->SessionConfigData.Enabled == IScsiMode) {\r
+    if ((Attempt != NewAttempt) && (Attempt->NicIndex == NewAttempt->NicIndex) &&\r
+        (Attempt->SessionConfigData.Enabled == IScsiMode))\r
+    {\r
       return Attempt;\r
     }\r
   }\r
@@ -451,16 +452,16 @@ IScsiConfigGetAttemptByNic (
 **/\r
 EFI_STATUS\r
 IScsiGetAttemptIndexList (\r
-  IN      CHAR16                    *AttemptNameList,\r
-     OUT  UINT8                     *AttemptIndexList,\r
-  IN      BOOLEAN                   IsAddAttempts\r
-)\r
+  IN      CHAR16   *AttemptNameList,\r
+  OUT  UINT8       *AttemptIndexList,\r
+  IN      BOOLEAN  IsAddAttempts\r
+  )\r
 {\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA   *AttemptConfigData;\r
-  CHAR16                        *AttemptStr;\r
-  UINT8                         AttemptIndex;\r
-  UINTN                         Len;\r
-  UINTN                         Index;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *AttemptConfigData;\r
+  CHAR16                       *AttemptStr;\r
+  UINT8                        AttemptIndex;\r
+  UINTN                        Len;\r
+  UINTN                        Index;\r
 \r
   Index = 0;\r
 \r
@@ -469,16 +470,17 @@ IScsiGetAttemptIndexList (
   }\r
 \r
   AttemptStr = AttemptNameList;\r
-  Len = StrLen (L"attempt:");\r
+  Len        = StrLen (L"attempt:");\r
 \r
   while (*AttemptStr != L'\0') {\r
     AttemptStr = StrStr (AttemptStr, L"attempt:");\r
     if (AttemptStr == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
-    AttemptStr += Len;\r
-    AttemptIndex = (UINT8)(*AttemptStr - L'0');\r
-    AttemptConfigData  = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+\r
+    AttemptStr       += Len;\r
+    AttemptIndex      = (UINT8)(*AttemptStr - L'0');\r
+    AttemptConfigData = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
     if (IsAddAttempts) {\r
       if ((AttemptConfigData != NULL) || ((AttemptIndex) > PcdGet8 (PcdMaxIScsiAttemptNumber))) {\r
         return EFI_INVALID_PARAMETER;\r
@@ -490,9 +492,10 @@ IScsiGetAttemptIndexList (
     }\r
 \r
     AttemptIndexList[Index] = AttemptIndex;\r
-    Index ++;\r
+    Index++;\r
     AttemptStr += 2;\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -509,22 +512,22 @@ IScsiConvertAttemptConfigDataToIfrNvData (
   IN OUT ISCSI_CONFIG_IFR_NVDATA  *IfrNvData\r
   )\r
 {\r
-  ISCSI_SESSION_CONFIG_NVDATA   *SessionConfigData;\r
-  ISCSI_CHAP_AUTH_CONFIG_NVDATA *AuthConfigData;\r
-  EFI_IP_ADDRESS                Ip;\r
-  BOOLEAN                       DnsMode;\r
+  ISCSI_SESSION_CONFIG_NVDATA    *SessionConfigData;\r
+  ISCSI_CHAP_AUTH_CONFIG_NVDATA  *AuthConfigData;\r
+  EFI_IP_ADDRESS                 Ip;\r
+  BOOLEAN                        DnsMode;\r
 \r
   //\r
   // Normal session configuration parameters.\r
   //\r
-  SessionConfigData                 = &Attempt->SessionConfigData;\r
-  IfrNvData->Enabled                = SessionConfigData->Enabled;\r
-  IfrNvData->IpMode                 = SessionConfigData->IpMode;\r
-  DnsMode                           = SessionConfigData->DnsMode;\r
+  SessionConfigData  = &Attempt->SessionConfigData;\r
+  IfrNvData->Enabled = SessionConfigData->Enabled;\r
+  IfrNvData->IpMode  = SessionConfigData->IpMode;\r
+  DnsMode            = SessionConfigData->DnsMode;\r
 \r
-  IfrNvData->InitiatorInfoFromDhcp  = SessionConfigData->InitiatorInfoFromDhcp;\r
-  IfrNvData->TargetInfoFromDhcp     = SessionConfigData->TargetInfoFromDhcp;\r
-  IfrNvData->TargetPort             = SessionConfigData->TargetPort;\r
+  IfrNvData->InitiatorInfoFromDhcp = SessionConfigData->InitiatorInfoFromDhcp;\r
+  IfrNvData->TargetInfoFromDhcp    = SessionConfigData->TargetInfoFromDhcp;\r
+  IfrNvData->TargetPort            = SessionConfigData->TargetPort;\r
 \r
   if (IfrNvData->IpMode == IP_MODE_IP4) {\r
     CopyMem (&Ip.v4, &SessionConfigData->LocalIp, sizeof (EFI_IPv4_ADDRESS));\r
@@ -538,7 +541,6 @@ IScsiConvertAttemptConfigDataToIfrNvData (
       CopyMem (&Ip.v4, &SessionConfigData->TargetIp, sizeof (EFI_IPv4_ADDRESS));\r
       IScsiIpToStr (&Ip, FALSE, IfrNvData->TargetIp);\r
     }\r
-\r
   } else if (IfrNvData->IpMode == IP_MODE_IP6) {\r
     ZeroMem (IfrNvData->TargetIp, sizeof (IfrNvData->TargetIp));\r
     if (SessionConfigData->TargetIp.v6.Addr[0] != '\0') {\r
@@ -620,16 +622,16 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (
   IN OUT ISCSI_CONFIG_IFR_NVDATA  *IfrNvData\r
   )\r
 {\r
-  LIST_ENTRY                    *Entry;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA   *Attempt;\r
-  ISCSI_SESSION_CONFIG_NVDATA   *SessionConfigData;\r
-  ISCSI_CHAP_AUTH_CONFIG_NVDATA *AuthConfigData;\r
-  CHAR16                        AttemptNameList[ATTEMPT_NAME_LIST_SIZE];\r
-  ISCSI_NIC_INFO                *NicInfo;\r
-  CHAR16                        MacString[ISCSI_MAX_MAC_STRING_LEN];\r
-  EFI_IP_ADDRESS                Ip;\r
-  UINTN                         Index;\r
-  UINTN                         StringLen;\r
+  LIST_ENTRY                     *Entry;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA    *Attempt;\r
+  ISCSI_SESSION_CONFIG_NVDATA    *SessionConfigData;\r
+  ISCSI_CHAP_AUTH_CONFIG_NVDATA  *AuthConfigData;\r
+  CHAR16                         AttemptNameList[ATTEMPT_NAME_LIST_SIZE];\r
+  ISCSI_NIC_INFO                 *NicInfo;\r
+  CHAR16                         MacString[ISCSI_MAX_MAC_STRING_LEN];\r
+  EFI_IP_ADDRESS                 Ip;\r
+  UINTN                          Index;\r
+  UINTN                          StringLen;\r
 \r
   NicInfo = NULL;\r
   ZeroMem (AttemptNameList, sizeof (AttemptNameList));\r
@@ -640,10 +642,10 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (
       //\r
       // Normal session configuration parameters.\r
       //\r
-      SessionConfigData                 = &Attempt->SessionConfigData;\r
+      SessionConfigData = &Attempt->SessionConfigData;\r
 \r
       ASSERT ((Attempt->AttemptConfigIndex > 0) && (Attempt->AttemptConfigIndex <= FixedPcdGet8 (PcdMaxIScsiAttemptNumber)));\r
-      Index   = Attempt->AttemptConfigIndex - 1;\r
+      Index = Attempt->AttemptConfigIndex - 1;\r
 \r
       //\r
       // Save the attempt to AttemptNameList as Attempt:1 Attempt:2\r
@@ -652,7 +654,7 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (
         Attempt->AttemptName,\r
         AttemptNameList + StrLen (AttemptNameList),\r
         ATTEMPT_NAME_LIST_SIZE - StrLen (AttemptNameList)\r
-      );\r
+        );\r
 \r
       StringLen = StrLen (AttemptNameList);\r
       ASSERT (StringLen > 2);\r
@@ -663,16 +665,16 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (
         Attempt->AttemptName,\r
         IfrNvData->ISCSIAttemptName  + ATTEMPT_NAME_SIZE * Index,\r
         ATTEMPT_NAME_LIST_SIZE - ATTEMPT_NAME_SIZE * Index\r
-      );\r
+        );\r
 \r
-      IfrNvData->ISCSIBootEnableList[Index]          = SessionConfigData->Enabled;\r
-      IfrNvData->ISCSIIpAddressTypeList[Index]       = SessionConfigData->IpMode;\r
+      IfrNvData->ISCSIBootEnableList[Index]    = SessionConfigData->Enabled;\r
+      IfrNvData->ISCSIIpAddressTypeList[Index] = SessionConfigData->IpMode;\r
 \r
-      IfrNvData->ISCSIInitiatorInfoViaDHCP[Index]    = SessionConfigData->InitiatorInfoFromDhcp;\r
-      IfrNvData->ISCSITargetInfoViaDHCP[Index]       = SessionConfigData->TargetInfoFromDhcp;\r
-      IfrNvData->ISCSIConnectRetry[Index]            = SessionConfigData->ConnectRetryCount;\r
-      IfrNvData->ISCSIConnectTimeout[Index]          = SessionConfigData->ConnectTimeout;\r
-      IfrNvData->ISCSITargetTcpPort[Index]           = SessionConfigData->TargetPort;\r
+      IfrNvData->ISCSIInitiatorInfoViaDHCP[Index] = SessionConfigData->InitiatorInfoFromDhcp;\r
+      IfrNvData->ISCSITargetInfoViaDHCP[Index]    = SessionConfigData->TargetInfoFromDhcp;\r
+      IfrNvData->ISCSIConnectRetry[Index]         = SessionConfigData->ConnectRetryCount;\r
+      IfrNvData->ISCSIConnectTimeout[Index]       = SessionConfigData->ConnectTimeout;\r
+      IfrNvData->ISCSITargetTcpPort[Index]        = SessionConfigData->TargetPort;\r
 \r
       if (SessionConfigData->IpMode == IP_MODE_IP4) {\r
         CopyMem (&Ip.v4, &SessionConfigData->LocalIp, sizeof (EFI_IPv4_ADDRESS));\r
@@ -710,10 +712,10 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (
       IScsiLunToUnicodeStr (SessionConfigData->BootLun, IfrNvData->Keyword[Index].ISCSILun);\r
       IScsiConvertIsIdToString (IfrNvData->Keyword[Index].ISCSIIsId, SessionConfigData->IsId);\r
 \r
-      IfrNvData->ISCSIAuthenticationMethod[Index]    = Attempt->AuthenticationType;\r
+      IfrNvData->ISCSIAuthenticationMethod[Index] = Attempt->AuthenticationType;\r
 \r
       if (Attempt->AuthenticationType == ISCSI_AUTH_TYPE_CHAP) {\r
-        AuthConfigData      = &Attempt->AuthConfigData.CHAP;\r
+        AuthConfigData                  = &Attempt->AuthConfigData.CHAP;\r
         IfrNvData->ISCSIChapType[Index] = AuthConfigData->CHAPType;\r
         AsciiStrToUnicodeStrS (\r
           AuthConfigData->CHAPName,\r
@@ -740,7 +742,7 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (
           );\r
       }\r
     }\r
-    CopyMem(IfrNvData->ISCSIDisplayAttemptList, AttemptNameList, ATTEMPT_NAME_LIST_SIZE);\r
+    CopyMem (IfrNvData->ISCSIDisplayAttemptList, AttemptNameList, ATTEMPT_NAME_LIST_SIZE);\r
 \r
     ZeroMem (IfrNvData->ISCSIMacAddr, sizeof (IfrNvData->ISCSIMacAddr));\r
     NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {\r
@@ -786,34 +788,34 @@ IScsiConvertIfrNvDataToAttemptConfigData (
   IN OUT ISCSI_ATTEMPT_CONFIG_NVDATA  *Attempt\r
   )\r
 {\r
-  EFI_IP_ADDRESS              HostIp;\r
-  EFI_IP_ADDRESS              SubnetMask;\r
-  EFI_IP_ADDRESS              Gateway;\r
-  CHAR16                      *MacString;\r
-  CHAR16                      *AttemptName1;\r
-  CHAR16                      *AttemptName2;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA *ExistAttempt;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA *SameNicAttempt;\r
-  CHAR16                      IScsiMode[64];\r
-  CHAR16                      IpMode[64];\r
-  ISCSI_NIC_INFO              *NicInfo;\r
-  EFI_INPUT_KEY               Key;\r
-  UINT8                       *AttemptConfigOrder;\r
-  UINTN                       AttemptConfigOrderSize;\r
-  UINT8                       *AttemptOrderTmp;\r
-  UINTN                       TotalNumber;\r
-  EFI_STATUS                  Status;\r
-\r
-  if (IfrNvData == NULL || Attempt == NULL) {\r
+  EFI_IP_ADDRESS               HostIp;\r
+  EFI_IP_ADDRESS               SubnetMask;\r
+  EFI_IP_ADDRESS               Gateway;\r
+  CHAR16                       *MacString;\r
+  CHAR16                       *AttemptName1;\r
+  CHAR16                       *AttemptName2;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *ExistAttempt;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *SameNicAttempt;\r
+  CHAR16                       IScsiMode[64];\r
+  CHAR16                       IpMode[64];\r
+  ISCSI_NIC_INFO               *NicInfo;\r
+  EFI_INPUT_KEY                Key;\r
+  UINT8                        *AttemptConfigOrder;\r
+  UINTN                        AttemptConfigOrderSize;\r
+  UINT8                        *AttemptOrderTmp;\r
+  UINTN                        TotalNumber;\r
+  EFI_STATUS                   Status;\r
+\r
+  if ((IfrNvData == NULL) || (Attempt == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   //\r
   // Update those fields which don't have INTERACTIVE attribute.\r
   //\r
-  Attempt->SessionConfigData.ConnectRetryCount     = IfrNvData->ConnectRetryCount;\r
-  Attempt->SessionConfigData.ConnectTimeout        = IfrNvData->ConnectTimeout;\r
-  Attempt->SessionConfigData.IpMode                = IfrNvData->IpMode;\r
+  Attempt->SessionConfigData.ConnectRetryCount = IfrNvData->ConnectRetryCount;\r
+  Attempt->SessionConfigData.ConnectTimeout    = IfrNvData->ConnectTimeout;\r
+  Attempt->SessionConfigData.IpMode            = IfrNvData->IpMode;\r
 \r
   if (IfrNvData->IpMode < IP_MODE_AUTOCONFIG) {\r
     Attempt->SessionConfigData.InitiatorInfoFromDhcp = IfrNvData->InitiatorInfoFromDhcp;\r
@@ -878,10 +880,11 @@ IScsiConvertIfrNvDataToAttemptConfigData (
         }\r
       }\r
     }\r
+\r
     //\r
     // Validate target configuration if DHCP isn't deployed.\r
     //\r
-    if (!Attempt->SessionConfigData.TargetInfoFromDhcp && Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) {\r
+    if (!Attempt->SessionConfigData.TargetInfoFromDhcp && (Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG)) {\r
       if (!Attempt->SessionConfigData.DnsMode) {\r
         if (!IpIsUnicast (&Attempt->SessionConfigData.TargetIp, IfrNvData->IpMode)) {\r
           CreatePopUp (\r
@@ -937,7 +940,8 @@ IScsiConvertIfrNvDataToAttemptConfigData (
 \r
       if ((IfrNvData->CHAPType == ISCSI_CHAP_MUTUAL) &&\r
           ((IfrNvData->ReverseCHAPName[0] == '\0') || (IfrNvData->ReverseCHAPSecret[0] == '\0'))\r
-          ) {\r
+          )\r
+      {\r
         CreatePopUp (\r
           EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
           &Key,\r
@@ -953,12 +957,12 @@ IScsiConvertIfrNvDataToAttemptConfigData (
     //\r
     SameNicAttempt = IScsiConfigGetAttemptByNic (Attempt, IfrNvData->Enabled);\r
     if (SameNicAttempt != NULL) {\r
-      AttemptName1 = (CHAR16 *) AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
+      AttemptName1 = (CHAR16 *)AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
       if (AttemptName1 == NULL) {\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
 \r
-      AttemptName2 = (CHAR16 *) AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
+      AttemptName2 = (CHAR16 *)AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
       if (AttemptName2 == NULL) {\r
         FreePool (AttemptName1);\r
         return EFI_OUT_OF_RESOURCES;\r
@@ -969,7 +973,7 @@ IScsiConvertIfrNvDataToAttemptConfigData (
 \r
       UnicodeSPrint (\r
         mPrivate->PortString,\r
-        (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+        (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
         L"Warning! Attempt \"%s\" uses same NIC as Attempt \"%s\".",\r
         AttemptName1,\r
         AttemptName2\r
@@ -1011,7 +1015,7 @@ IScsiConvertIfrNvDataToAttemptConfigData (
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  MacString = (CHAR16 *) AllocateZeroPool (ISCSI_MAX_MAC_STRING_LEN * sizeof (CHAR16));\r
+  MacString = (CHAR16 *)AllocateZeroPool (ISCSI_MAX_MAC_STRING_LEN * sizeof (CHAR16));\r
   if (MacString == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -1020,7 +1024,7 @@ IScsiConvertIfrNvDataToAttemptConfigData (
 \r
   UnicodeSPrint (\r
     mPrivate->PortString,\r
-    (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+    (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
     L"MAC: %s, PFA: Bus %d | Dev %d | Func %d, iSCSI mode: %s, IP version: %s",\r
     MacString,\r
     NicInfo->BusNumber,\r
@@ -1048,9 +1052,9 @@ IScsiConvertIfrNvDataToAttemptConfigData (
   if (ExistAttempt != NULL) {\r
     ASSERT (ExistAttempt == Attempt);\r
 \r
-    if (IfrNvData->Enabled == ISCSI_DISABLED &&\r
-        Attempt->SessionConfigData.Enabled != ISCSI_DISABLED) {\r
-\r
+    if ((IfrNvData->Enabled == ISCSI_DISABLED) &&\r
+        (Attempt->SessionConfigData.Enabled != ISCSI_DISABLED))\r
+    {\r
       //\r
       // User updates the Attempt from "Enabled"/"Enabled for MPIO" to "Disabled".\r
       //\r
@@ -1066,11 +1070,12 @@ IScsiConvertIfrNvDataToAttemptConfigData (
         if (mPrivate->SinglePathCount < 1) {\r
           return EFI_ABORTED;\r
         }\r
+\r
         mPrivate->SinglePathCount--;\r
       }\r
-\r
-    } else if (IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO &&\r
-               Attempt->SessionConfigData.Enabled == ISCSI_ENABLED) {\r
+    } else if ((IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO) &&\r
+               (Attempt->SessionConfigData.Enabled == ISCSI_ENABLED))\r
+    {\r
       //\r
       // User updates the Attempt from "Enabled" to "Enabled for MPIO".\r
       //\r
@@ -1081,9 +1086,9 @@ IScsiConvertIfrNvDataToAttemptConfigData (
       mPrivate->EnableMpio = TRUE;\r
       mPrivate->MpioCount++;\r
       mPrivate->SinglePathCount--;\r
-\r
-    } else if (IfrNvData->Enabled == ISCSI_ENABLED &&\r
-               Attempt->SessionConfigData.Enabled == ISCSI_ENABLED_FOR_MPIO) {\r
+    } else if ((IfrNvData->Enabled == ISCSI_ENABLED) &&\r
+               (Attempt->SessionConfigData.Enabled == ISCSI_ENABLED_FOR_MPIO))\r
+    {\r
       //\r
       // User updates the Attempt from "Enabled for MPIO" to "Enabled".\r
       //\r
@@ -1094,22 +1099,21 @@ IScsiConvertIfrNvDataToAttemptConfigData (
       if (--mPrivate->MpioCount == 0) {\r
         mPrivate->EnableMpio = FALSE;\r
       }\r
-      mPrivate->SinglePathCount++;\r
 \r
-    } else if (IfrNvData->Enabled != ISCSI_DISABLED &&\r
-               Attempt->SessionConfigData.Enabled == ISCSI_DISABLED) {\r
+      mPrivate->SinglePathCount++;\r
+    } else if ((IfrNvData->Enabled != ISCSI_DISABLED) &&\r
+               (Attempt->SessionConfigData.Enabled == ISCSI_DISABLED))\r
+    {\r
       //\r
       // User updates the Attempt from "Disabled" to "Enabled"/"Enabled for MPIO".\r
       //\r
       if (IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO) {\r
         mPrivate->EnableMpio = TRUE;\r
         mPrivate->MpioCount++;\r
-\r
       } else if (IfrNvData->Enabled == ISCSI_ENABLED) {\r
         mPrivate->SinglePathCount++;\r
       }\r
     }\r
-\r
   } else if (ExistAttempt == NULL) {\r
     //\r
     // When a new attempt is created, pointer of the attempt is saved to\r
@@ -1138,6 +1142,7 @@ IScsiConvertIfrNvDataToAttemptConfigData (
       if (AttemptConfigOrder != NULL) {\r
         FreePool (AttemptConfigOrder);\r
       }\r
+\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
@@ -1180,12 +1185,13 @@ IScsiConvertIfrNvDataToAttemptConfigData (
 \r
     IScsiConfigUpdateAttempt ();\r
   }\r
+\r
   Attempt->SessionConfigData.Enabled = IfrNvData->Enabled;\r
 \r
   //\r
   // Record the user configuration information in NVR.\r
   //\r
-  UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", Attempt->AttemptConfigIndex);\r
+  UnicodeSPrint (mPrivate->PortString, (UINTN)ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", Attempt->AttemptConfigIndex);\r
 \r
   FreePool (MacString);\r
 \r
@@ -1210,40 +1216,40 @@ IScsiConvertIfrNvDataToAttemptConfigData (
 **/\r
 EFI_STATUS\r
 IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (\r
-  IN ISCSI_CONFIG_IFR_NVDATA          *IfrNvData,\r
-  IN UINTN                             OffSet\r
+  IN ISCSI_CONFIG_IFR_NVDATA  *IfrNvData,\r
+  IN UINTN                    OffSet\r
   )\r
 {\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA      *Attempt;\r
-  UINT8                            AttemptIndex;\r
-  UINT8                            Index;\r
-  UINT8                            ChapSecretLen;\r
-  UINT8                            ReverseChapSecretLen;\r
-  CHAR16                           *AttemptName1;\r
-  CHAR16                           *AttemptName2;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA      *SameNicAttempt;\r
-  CHAR8                            LunString[ISCSI_LUN_STR_MAX_LEN];\r
-  CHAR8                            IScsiName[ISCSI_NAME_MAX_SIZE];\r
-  CHAR8                            IpString[IP_STR_MAX_SIZE];\r
-  EFI_IP_ADDRESS                   HostIp;\r
-  EFI_IP_ADDRESS                   SubnetMask;\r
-  EFI_IP_ADDRESS                   Gateway;\r
-  EFI_INPUT_KEY                    Key;\r
-  UINT64                           Lun;\r
-  EFI_STATUS                       Status;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *Attempt;\r
+  UINT8                        AttemptIndex;\r
+  UINT8                        Index;\r
+  UINT8                        ChapSecretLen;\r
+  UINT8                        ReverseChapSecretLen;\r
+  CHAR16                       *AttemptName1;\r
+  CHAR16                       *AttemptName2;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *SameNicAttempt;\r
+  CHAR8                        LunString[ISCSI_LUN_STR_MAX_LEN];\r
+  CHAR8                        IScsiName[ISCSI_NAME_MAX_SIZE];\r
+  CHAR8                        IpString[IP_STR_MAX_SIZE];\r
+  EFI_IP_ADDRESS               HostIp;\r
+  EFI_IP_ADDRESS               SubnetMask;\r
+  EFI_IP_ADDRESS               Gateway;\r
+  EFI_INPUT_KEY                Key;\r
+  UINT64                       Lun;\r
+  EFI_STATUS                   Status;\r
 \r
   Attempt = NULL;\r
   ZeroMem (IScsiName, sizeof (IScsiName));\r
 \r
   if (OffSet < ATTEMPT_BOOTENABLE_VAR_OFFSET) {\r
     return EFI_SUCCESS;\r
-\r
   } else if ((OffSet >= ATTEMPT_BOOTENABLE_VAR_OFFSET) && (OffSet < ATTEMPT_ADDRESS_TYPE_VAR_OFFSET)) {\r
-    AttemptIndex = (UINT8) ((OffSet - ATTEMPT_BOOTENABLE_VAR_OFFSET) + 1);\r
-    Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+    AttemptIndex = (UINT8)((OffSet - ATTEMPT_BOOTENABLE_VAR_OFFSET) + 1);\r
+    Attempt      = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
     if (Attempt == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     IfrNvData->Enabled = IfrNvData->ISCSIBootEnableList[AttemptIndex - 1];\r
     //\r
     // Validate the configuration of attempt.\r
@@ -1254,12 +1260,12 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
       //\r
       SameNicAttempt = IScsiConfigGetAttemptByNic (Attempt, IfrNvData->Enabled);\r
       if (SameNicAttempt != NULL) {\r
-        AttemptName1 = (CHAR16 *) AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
+        AttemptName1 = (CHAR16 *)AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
         if (AttemptName1 == NULL) {\r
           return EFI_OUT_OF_RESOURCES;\r
         }\r
 \r
-        AttemptName2 = (CHAR16 *) AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
+        AttemptName2 = (CHAR16 *)AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
         if (AttemptName2 == NULL) {\r
           FreePool (AttemptName1);\r
           return EFI_OUT_OF_RESOURCES;\r
@@ -1270,7 +1276,7 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
 \r
         UnicodeSPrint (\r
           mPrivate->PortString,\r
-          (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+          (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
           L"Warning! \"%s\" uses same NIC as Attempt \"%s\".",\r
           AttemptName1,\r
           AttemptName2\r
@@ -1288,9 +1294,9 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
       }\r
     }\r
 \r
-    if (IfrNvData->Enabled == ISCSI_DISABLED &&\r
-        Attempt->SessionConfigData.Enabled != ISCSI_DISABLED) {\r
-\r
+    if ((IfrNvData->Enabled == ISCSI_DISABLED) &&\r
+        (Attempt->SessionConfigData.Enabled != ISCSI_DISABLED))\r
+    {\r
       //\r
       // User updates the Attempt from "Enabled"/"Enabled for MPIO" to "Disabled".\r
       //\r
@@ -1306,11 +1312,12 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
         if (mPrivate->SinglePathCount < 1) {\r
           return EFI_ABORTED;\r
         }\r
+\r
         mPrivate->SinglePathCount--;\r
       }\r
-\r
-    } else if (IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO &&\r
-               Attempt->SessionConfigData.Enabled == ISCSI_ENABLED) {\r
+    } else if ((IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO) &&\r
+               (Attempt->SessionConfigData.Enabled == ISCSI_ENABLED))\r
+    {\r
       //\r
       // User updates the Attempt from "Enabled" to "Enabled for MPIO".\r
       //\r
@@ -1321,9 +1328,9 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
       mPrivate->EnableMpio = TRUE;\r
       mPrivate->MpioCount++;\r
       mPrivate->SinglePathCount--;\r
-\r
-    } else if (IfrNvData->Enabled == ISCSI_ENABLED &&\r
-               Attempt->SessionConfigData.Enabled == ISCSI_ENABLED_FOR_MPIO) {\r
+    } else if ((IfrNvData->Enabled == ISCSI_ENABLED) &&\r
+               (Attempt->SessionConfigData.Enabled == ISCSI_ENABLED_FOR_MPIO))\r
+    {\r
       //\r
       // User updates the Attempt from "Enabled for MPIO" to "Enabled".\r
       //\r
@@ -1334,61 +1341,62 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
       if (--mPrivate->MpioCount == 0) {\r
         mPrivate->EnableMpio = FALSE;\r
       }\r
-      mPrivate->SinglePathCount++;\r
 \r
-    } else if (IfrNvData->Enabled != ISCSI_DISABLED &&\r
-               Attempt->SessionConfigData.Enabled == ISCSI_DISABLED) {\r
+      mPrivate->SinglePathCount++;\r
+    } else if ((IfrNvData->Enabled != ISCSI_DISABLED) &&\r
+               (Attempt->SessionConfigData.Enabled == ISCSI_DISABLED))\r
+    {\r
       //\r
       // User updates the Attempt from "Disabled" to "Enabled"/"Enabled for MPIO".\r
       //\r
       if (IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO) {\r
         mPrivate->EnableMpio = TRUE;\r
         mPrivate->MpioCount++;\r
-\r
       } else if (IfrNvData->Enabled == ISCSI_ENABLED) {\r
         mPrivate->SinglePathCount++;\r
       }\r
     }\r
-    Attempt->SessionConfigData.Enabled = IfrNvData->Enabled;\r
 \r
+    Attempt->SessionConfigData.Enabled = IfrNvData->Enabled;\r
   } else if ((OffSet >= ATTEMPT_ADDRESS_TYPE_VAR_OFFSET) && (OffSet < ATTEMPT_CONNECT_RETRY_VAR_OFFSET)) {\r
-    AttemptIndex = (UINT8) ((OffSet - ATTEMPT_ADDRESS_TYPE_VAR_OFFSET) + 1);\r
-    Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+    AttemptIndex = (UINT8)((OffSet - ATTEMPT_ADDRESS_TYPE_VAR_OFFSET) + 1);\r
+    Attempt      = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
     if (Attempt == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     Attempt->SessionConfigData.IpMode = IfrNvData->ISCSIIpAddressTypeList[AttemptIndex - 1];\r
     if (Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) {\r
       Attempt->AutoConfigureMode = 0;\r
     }\r
-\r
   } else if ((OffSet >= ATTEMPT_CONNECT_RETRY_VAR_OFFSET) && (OffSet < ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET)) {\r
-    AttemptIndex = (UINT8) ((OffSet - ATTEMPT_CONNECT_RETRY_VAR_OFFSET) + 1);\r
-    Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+    AttemptIndex = (UINT8)((OffSet - ATTEMPT_CONNECT_RETRY_VAR_OFFSET) + 1);\r
+    Attempt      = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
     if (Attempt == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
     if (IfrNvData->ISCSIConnectRetry[AttemptIndex - 1] > CONNECT_MAX_RETRY) {\r
       CreatePopUp (\r
-          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-          &Key,\r
-          L"The minimum value is 0 and the maximum is 16. 0 means no retry.",\r
-          NULL\r
-          );\r
+        EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+        &Key,\r
+        L"The minimum value is 0 and the maximum is 16. 0 means no retry.",\r
+        NULL\r
+        );\r
       return EFI_INVALID_PARAMETER;\r
     }\r
-    Attempt->SessionConfigData.ConnectRetryCount = IfrNvData->ISCSIConnectRetry[AttemptIndex - 1];\r
 \r
+    Attempt->SessionConfigData.ConnectRetryCount = IfrNvData->ISCSIConnectRetry[AttemptIndex - 1];\r
   } else if ((OffSet >= ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET)) {\r
-    AttemptIndex = (UINT8) ((OffSet - ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET) / 2 + 1);\r
-    Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+    AttemptIndex = (UINT8)((OffSet - ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET) / 2 + 1);\r
+    Attempt      = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
     if (Attempt == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
     if ((IfrNvData->ISCSIConnectTimeout[AttemptIndex - 1] < CONNECT_MIN_TIMEOUT) ||\r
-        (IfrNvData->ISCSIConnectTimeout[AttemptIndex - 1] > CONNECT_MAX_TIMEOUT)) {\r
+        (IfrNvData->ISCSIConnectTimeout[AttemptIndex - 1] > CONNECT_MAX_TIMEOUT))\r
+    {\r
       CreatePopUp (\r
         EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
         &Key,\r
@@ -1402,18 +1410,17 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
     if (Attempt->SessionConfigData.ConnectTimeout == 0) {\r
       Attempt->SessionConfigData.ConnectTimeout = CONNECT_DEFAULT_TIMEOUT;\r
     }\r
-\r
   } else if ((OffSet >= ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET) && (OffSet < ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET)) {\r
-    AttemptIndex = (UINT8) ((OffSet - ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET) + 1);\r
-    Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+    AttemptIndex = (UINT8)((OffSet - ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET) + 1);\r
+    Attempt      = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
     if (Attempt == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
-    Attempt->SessionConfigData.InitiatorInfoFromDhcp = IfrNvData->ISCSIInitiatorInfoViaDHCP[AttemptIndex - 1];\r
 \r
+    Attempt->SessionConfigData.InitiatorInfoFromDhcp = IfrNvData->ISCSIInitiatorInfoViaDHCP[AttemptIndex - 1];\r
   } else if ((OffSet >= ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET) && (OffSet < ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET)) {\r
-    AttemptIndex = (UINT8) ((OffSet - ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET) + 1);\r
-    Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+    AttemptIndex = (UINT8)((OffSet - ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET) + 1);\r
+    Attempt      = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
     if (Attempt == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
@@ -1429,13 +1436,13 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
         );\r
       return EFI_INVALID_PARAMETER;\r
     }\r
-\r
   } else if ((OffSet >= ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET) && (OffSet < ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET)) {\r
-    AttemptIndex = (UINT8) ((OffSet - ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET) / 2 + 1);\r
-    Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+    AttemptIndex = (UINT8)((OffSet - ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET) / 2 + 1);\r
+    Attempt      = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
     if (Attempt == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     if ((Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) && (!Attempt->SessionConfigData.TargetInfoFromDhcp)) {\r
       Attempt->SessionConfigData.TargetPort = IfrNvData->ISCSITargetTcpPort[AttemptIndex - 1];\r
       if (Attempt->SessionConfigData.TargetPort == 0) {\r
@@ -1450,30 +1457,28 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
         );\r
       return EFI_INVALID_PARAMETER;\r
     }\r
-\r
   } else if ((OffSet >= ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET) && (OffSet < ATTEMPT_CHARTYPE_VAR_OFFSET)) {\r
-    AttemptIndex = (UINT8) ((OffSet - ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET) + 1);\r
-    Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+    AttemptIndex = (UINT8)((OffSet - ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET) + 1);\r
+    Attempt      = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
     if (Attempt == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
     Attempt->AuthenticationType = IfrNvData->ISCSIAuthenticationMethod[AttemptIndex - 1];\r
-\r
   } else if ((OffSet >= ATTEMPT_CHARTYPE_VAR_OFFSET) && (OffSet < ATTEMPT_ISID_VAR_OFFSET)) {\r
-    AttemptIndex = (UINT8) ((OffSet - ATTEMPT_CHARTYPE_VAR_OFFSET) + 1);\r
-    Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+    AttemptIndex = (UINT8)((OffSet - ATTEMPT_CHARTYPE_VAR_OFFSET) + 1);\r
+    Attempt      = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
     if (Attempt == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     if (Attempt->AuthenticationType == ISCSI_AUTH_TYPE_CHAP) {\r
       Attempt->AuthConfigData.CHAP.CHAPType = IfrNvData->ISCSIChapType[AttemptIndex - 1];\r
     }\r
-\r
   } else if (OffSet >= ATTEMPT_ISID_VAR_OFFSET) {\r
-    Index = (UINT8) ((OffSet - ATTEMPT_ISID_VAR_OFFSET) / sizeof (KEYWORD_STR));\r
+    Index        = (UINT8)((OffSet - ATTEMPT_ISID_VAR_OFFSET) / sizeof (KEYWORD_STR));\r
     AttemptIndex = Index + 1;\r
-    Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+    Attempt      = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
     if (Attempt == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
@@ -1482,15 +1487,15 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
 \r
     if ((OffSet >= ATTEMPT_ISID_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_IP_ADDRESS_VAR_OFFSET)) {\r
       IScsiParseIsIdFromString (IfrNvData->Keyword[Index].ISCSIIsId, Attempt->SessionConfigData.IsId);\r
-\r
-    }  else if ((OffSet >= ATTEMPT_INITIATOR_IP_ADDRESS_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_NET_MASK_VAR_OFFSET)) {\r
+    } else if ((OffSet >= ATTEMPT_INITIATOR_IP_ADDRESS_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_NET_MASK_VAR_OFFSET)) {\r
       if ((Attempt->SessionConfigData.IpMode == IP_MODE_IP4) && (!Attempt->SessionConfigData.InitiatorInfoFromDhcp)) {\r
         //\r
         // Config Local ip\r
         //\r
         Status = NetLibStrToIp4 (IfrNvData->Keyword[Index].ISCSIInitiatorIpAddress, &HostIp.v4);\r
         if (EFI_ERROR (Status) || ((Attempt->SessionConfigData.SubnetMask.Addr[0] != 0) &&\r
-             !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), NTOHL(*(UINT32*)Attempt->SessionConfigData.SubnetMask.Addr)))) {\r
+                                   !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), NTOHL (*(UINT32 *)Attempt->SessionConfigData.SubnetMask.Addr))))\r
+        {\r
           CreatePopUp (\r
             EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
             &Key,\r
@@ -1510,7 +1515,6 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
           );\r
         return EFI_INVALID_PARAMETER;\r
       }\r
-\r
     } else if ((OffSet >= ATTEMPT_INITIATOR_NET_MASK_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_GATE_WAY_VAR_OFFSET)) {\r
       if ((Attempt->SessionConfigData.IpMode == IP_MODE_IP4) && (!Attempt->SessionConfigData.InitiatorInfoFromDhcp)) {\r
         Status = NetLibStrToIp4 (IfrNvData->Keyword[Index].ISCSIInitiatorNetmask, &SubnetMask.v4);\r
@@ -1534,13 +1538,13 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
           );\r
         return EFI_INVALID_PARAMETER;\r
       }\r
-\r
     } else if ((OffSet >= ATTEMPT_INITIATOR_GATE_WAY_VAR_OFFSET) && (OffSet < ATTEMPT_TARGET_NAME_VAR_OFFSET)) {\r
       if ((Attempt->SessionConfigData.IpMode == IP_MODE_IP4) && (!Attempt->SessionConfigData.InitiatorInfoFromDhcp)) {\r
         Status = NetLibStrToIp4 (IfrNvData->Keyword[Index].ISCSIInitiatorGateway, &Gateway.v4);\r
         if (EFI_ERROR (Status) ||\r
-          ((Gateway.Addr[0] != 0) && (Attempt->SessionConfigData.SubnetMask.Addr[0] != 0) &&\r
-             !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL(*(UINT32*)Attempt->SessionConfigData.SubnetMask.Addr)))) {\r
+            ((Gateway.Addr[0] != 0) && (Attempt->SessionConfigData.SubnetMask.Addr[0] != 0) &&\r
+             !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL (*(UINT32 *)Attempt->SessionConfigData.SubnetMask.Addr))))\r
+        {\r
           CreatePopUp (\r
             EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
             &Key,\r
@@ -1560,7 +1564,6 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
           );\r
         return EFI_INVALID_PARAMETER;\r
       }\r
-\r
     } else if ((OffSet >= ATTEMPT_TARGET_NAME_VAR_OFFSET) && (OffSet < ATTEMPT_TARGET_IP_ADDRESS_VAR_OFFSET)) {\r
       if ((Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) && (!Attempt->SessionConfigData.TargetInfoFromDhcp)) {\r
         UnicodeStrToAsciiStrS (IfrNvData->Keyword[Index].ISCSITargetName, IScsiName, ISCSI_NAME_MAX_SIZE);\r
@@ -1575,6 +1578,7 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
         } else {\r
           AsciiStrCpyS (Attempt->SessionConfigData.TargetName, ISCSI_NAME_MAX_SIZE, IScsiName);\r
         }\r
+\r
         if (Attempt->SessionConfigData.Enabled != ISCSI_DISABLED) {\r
           if (Attempt->SessionConfigData.TargetName[0] == L'\0') {\r
             CreatePopUp (\r
@@ -1595,7 +1599,6 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
           );\r
         return EFI_INVALID_PARAMETER;\r
       }\r
-\r
     } else if ((OffSet >= ATTEMPT_TARGET_IP_ADDRESS_VAR_OFFSET) && (OffSet < ATTEMPT_LUN_VAR_OFFSET)) {\r
       if ((Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) && (!Attempt->SessionConfigData.TargetInfoFromDhcp)) {\r
         UnicodeStrToAsciiStrS (IfrNvData->Keyword[Index].ISCSITargetIpAddress, IpString, sizeof (IpString));\r
@@ -1617,14 +1620,13 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
           );\r
         return EFI_INVALID_PARAMETER;\r
       }\r
-\r
     } else if ((OffSet >= ATTEMPT_LUN_VAR_OFFSET) && (OffSet < ATTEMPT_CHAR_USER_NAME_VAR_OFFSET)) {\r
       if ((Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) && (Attempt->SessionConfigData.TargetInfoFromDhcp == 0)) {\r
         //\r
         // Config LUN.\r
         //\r
         UnicodeStrToAsciiStrS (IfrNvData->Keyword[Index].ISCSILun, LunString, ISCSI_LUN_STR_MAX_LEN);\r
-        Status = IScsiAsciiStrToLun (LunString, (UINT8 *) &Lun);\r
+        Status = IScsiAsciiStrToLun (LunString, (UINT8 *)&Lun);\r
         if (EFI_ERROR (Status)) {\r
           CreatePopUp (\r
             EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
@@ -1644,7 +1646,6 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
           );\r
         return EFI_INVALID_PARAMETER;\r
       }\r
-\r
     } else if ((OffSet >= ATTEMPT_CHAR_USER_NAME_VAR_OFFSET) && (OffSet < ATTEMPT_CHAR_SECRET_VAR_OFFSET)) {\r
       if (Attempt->AuthenticationType == ISCSI_AUTH_TYPE_CHAP) {\r
         UnicodeStrToAsciiStrS (\r
@@ -1673,7 +1674,6 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
           );\r
         return EFI_INVALID_PARAMETER;\r
       }\r
-\r
     } else if ((OffSet >= ATTEMPT_CHAR_SECRET_VAR_OFFSET) && (OffSet < ATTEMPT_CHAR_REVERSE_USER_NAME_VAR_OFFSET)) {\r
       if (Attempt->AuthenticationType == ISCSI_AUTH_TYPE_CHAP) {\r
         ChapSecretLen = (UINT8)StrLen (IfrNvData->Keyword[Index].ISCSIChapSecret);\r
@@ -1703,7 +1703,6 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
           );\r
         return EFI_INVALID_PARAMETER;\r
       }\r
-\r
     } else if ((OffSet >= ATTEMPT_CHAR_REVERSE_USER_NAME_VAR_OFFSET) && (OffSet < ATTEMPT_CHAR_REVERSE_SECRET_VAR_OFFSET)) {\r
       if (Attempt->AuthConfigData.CHAP.CHAPType == ISCSI_CHAP_MUTUAL) {\r
         UnicodeStrToAsciiStrS (\r
@@ -1731,7 +1730,6 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
           );\r
         return EFI_INVALID_PARAMETER;\r
       }\r
-\r
     } else if (OffSet >= ATTEMPT_CHAR_REVERSE_SECRET_VAR_OFFSET) {\r
       if (Attempt->AuthConfigData.CHAP.CHAPType == ISCSI_CHAP_MUTUAL) {\r
         ReverseChapSecretLen = (UINT8)StrLen (IfrNvData->Keyword[Index].ISCSIReverseChapSecret);\r
@@ -1764,13 +1762,11 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
     }\r
   }\r
 \r
-\r
-\r
   //\r
   // Record the user configuration information in NVR.\r
   //\r
   ASSERT (Attempt != NULL);\r
-  UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", Attempt->AttemptConfigIndex);\r
+  UnicodeSPrint (mPrivate->PortString, (UINTN)ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", Attempt->AttemptConfigIndex);\r
   return gRT->SetVariable (\r
                 mPrivate->PortString,\r
                 &gEfiIScsiInitiatorNameProtocolGuid,\r
@@ -1778,7 +1774,6 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
                 sizeof (ISCSI_ATTEMPT_CONFIG_NVDATA),\r
                 Attempt\r
                 );\r
-\r
 }\r
 \r
 /**\r
@@ -1799,18 +1794,18 @@ IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (
 **/\r
 EFI_STATUS\r
 IScsiCreateOpCode (\r
-  IN  UINT16                        StartLabelNumber,\r
-  OUT VOID                          **StartOpCodeHandle,\r
-  OUT EFI_IFR_GUID_LABEL            **StartLabel,\r
-  OUT VOID                          **EndOpCodeHandle,\r
-  OUT EFI_IFR_GUID_LABEL            **EndLabel\r
+  IN  UINT16              StartLabelNumber,\r
+  OUT VOID                **StartOpCodeHandle,\r
+  OUT EFI_IFR_GUID_LABEL  **StartLabel,\r
+  OUT VOID                **EndOpCodeHandle,\r
+  OUT EFI_IFR_GUID_LABEL  **EndLabel\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  EFI_IFR_GUID_LABEL                *InternalStartLabel;\r
-  EFI_IFR_GUID_LABEL                *InternalEndLabel;\r
+  EFI_STATUS          Status;\r
+  EFI_IFR_GUID_LABEL  *InternalStartLabel;\r
+  EFI_IFR_GUID_LABEL  *InternalEndLabel;\r
 \r
-  if (StartOpCodeHandle == NULL || StartLabel == NULL || EndOpCodeHandle == NULL || EndLabel == NULL) {\r
+  if ((StartOpCodeHandle == NULL) || (StartLabel == NULL) || (EndOpCodeHandle == NULL) || (EndLabel == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1834,12 +1829,12 @@ IScsiCreateOpCode (
   //\r
   // Create Hii Extend Label OpCode as the start opcode.\r
   //\r
-  InternalStartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                                *StartOpCodeHandle,\r
-                                                &gEfiIfrTianoGuid,\r
-                                                NULL,\r
-                                                sizeof (EFI_IFR_GUID_LABEL)\r
-                                                );\r
+  InternalStartLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                               *StartOpCodeHandle,\r
+                                               &gEfiIfrTianoGuid,\r
+                                               NULL,\r
+                                               sizeof (EFI_IFR_GUID_LABEL)\r
+                                               );\r
   if (InternalStartLabel == NULL) {\r
     goto Exit;\r
   }\r
@@ -1850,12 +1845,12 @@ IScsiCreateOpCode (
   //\r
   // Create Hii Extend Label OpCode as the end opcode.\r
   //\r
-  InternalEndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                              *EndOpCodeHandle,\r
-                                              &gEfiIfrTianoGuid,\r
-                                              NULL,\r
-                                              sizeof (EFI_IFR_GUID_LABEL)\r
-                                              );\r
+  InternalEndLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                             *EndOpCodeHandle,\r
+                                             &gEfiIfrTianoGuid,\r
+                                             NULL,\r
+                                             sizeof (EFI_IFR_GUID_LABEL)\r
+                                             );\r
   if (InternalEndLabel == NULL) {\r
     goto Exit;\r
   }\r
@@ -1877,6 +1872,7 @@ Exit:
   if (*EndOpCodeHandle != NULL) {\r
     HiiFreeOpCodeHandle (*EndOpCodeHandle);\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -1889,13 +1885,13 @@ IScsiConfigUpdateAttempt (
   VOID\r
   )\r
 {\r
-  LIST_ENTRY                    *Entry;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA   *AttemptConfigData;\r
-  VOID                          *StartOpCodeHandle;\r
-  EFI_IFR_GUID_LABEL            *StartLabel;\r
-  VOID                          *EndOpCodeHandle;\r
-  EFI_IFR_GUID_LABEL            *EndLabel;\r
-  EFI_STATUS                    Status;\r
+  LIST_ENTRY                   *Entry;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *AttemptConfigData;\r
+  VOID                         *StartOpCodeHandle;\r
+  EFI_IFR_GUID_LABEL           *StartLabel;\r
+  VOID                         *EndOpCodeHandle;\r
+  EFI_IFR_GUID_LABEL           *EndLabel;\r
+  EFI_STATUS                   Status;\r
 \r
   Status = IScsiCreateOpCode (\r
              ATTEMPT_ENTRY_LABEL,\r
@@ -1905,7 +1901,7 @@ IScsiConfigUpdateAttempt (
              &EndLabel\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   NET_LIST_FOR_EACH (Entry, &mPrivate->AttemptConfigs) {\r
@@ -1914,7 +1910,7 @@ IScsiConfigUpdateAttempt (
       //\r
       // Update Attempt Help Info.\r
       //\r
-      UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", (UINTN) AttemptConfigData->AttemptConfigIndex);\r
+      UnicodeSPrint (mPrivate->PortString, (UINTN)ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", (UINTN)AttemptConfigData->AttemptConfigIndex);\r
       AttemptConfigData->AttemptTitleToken = HiiSetString (\r
                                                mCallbackInfo->RegisteredHandle,\r
                                                0,\r
@@ -1922,16 +1918,16 @@ IScsiConfigUpdateAttempt (
                                                NULL\r
                                                );\r
       if (AttemptConfigData->AttemptTitleToken == 0) {\r
-        return ;\r
+        return;\r
       }\r
 \r
       HiiCreateGotoOpCode (\r
-        StartOpCodeHandle,                         // Container for dynamic created opcodes\r
-        FORMID_ATTEMPT_FORM,                       // Form ID\r
-        AttemptConfigData->AttemptTitleToken,      // Prompt text\r
-        AttemptConfigData->AttemptTitleHelpToken,  // Help text\r
-        EFI_IFR_FLAG_CALLBACK,                     // Question flag\r
-        (UINT16) (KEY_ATTEMPT_ENTRY_BASE + AttemptConfigData->AttemptConfigIndex)   // Question ID\r
+        StartOpCodeHandle,                                                       // Container for dynamic created opcodes\r
+        FORMID_ATTEMPT_FORM,                                                     // Form ID\r
+        AttemptConfigData->AttemptTitleToken,                                    // Prompt text\r
+        AttemptConfigData->AttemptTitleHelpToken,                                // Help text\r
+        EFI_IFR_FLAG_CALLBACK,                                                   // Question flag\r
+        (UINT16)(KEY_ATTEMPT_ENTRY_BASE + AttemptConfigData->AttemptConfigIndex) // Question ID\r
         );\r
     }\r
   }\r
@@ -1942,7 +1938,7 @@ IScsiConfigUpdateAttempt (
     FORMID_MAIN_FORM,                // Form ID\r
     StartOpCodeHandle,               // Label for where to insert opcodes\r
     EndOpCodeHandle                  // Replace data\r
-  );\r
+    );\r
 \r
   HiiFreeOpCodeHandle (StartOpCodeHandle);\r
   HiiFreeOpCodeHandle (EndOpCodeHandle);\r
@@ -1961,16 +1957,16 @@ IScsiConfigAddAttempt (
   VOID\r
   )\r
 {\r
-  LIST_ENTRY                    *Entry;\r
-  ISCSI_NIC_INFO                *NicInfo;\r
-  EFI_STRING_ID                 PortTitleToken;\r
-  EFI_STRING_ID                 PortTitleHelpToken;\r
-  CHAR16                        MacString[ISCSI_MAX_MAC_STRING_LEN];\r
-  EFI_STATUS                    Status;\r
-  VOID                          *StartOpCodeHandle;\r
-  EFI_IFR_GUID_LABEL            *StartLabel;\r
-  VOID                          *EndOpCodeHandle;\r
-  EFI_IFR_GUID_LABEL            *EndLabel;\r
+  LIST_ENTRY          *Entry;\r
+  ISCSI_NIC_INFO      *NicInfo;\r
+  EFI_STRING_ID       PortTitleToken;\r
+  EFI_STRING_ID       PortTitleHelpToken;\r
+  CHAR16              MacString[ISCSI_MAX_MAC_STRING_LEN];\r
+  EFI_STATUS          Status;\r
+  VOID                *StartOpCodeHandle;\r
+  EFI_IFR_GUID_LABEL  *StartLabel;\r
+  VOID                *EndOpCodeHandle;\r
+  EFI_IFR_GUID_LABEL  *EndLabel;\r
 \r
   Status = IScsiCreateOpCode (\r
              MAC_ENTRY_LABEL,\r
@@ -1995,7 +1991,7 @@ IScsiConfigAddAttempt (
       MacString\r
       );\r
 \r
-    UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"MAC %s", MacString);\r
+    UnicodeSPrint (mPrivate->PortString, (UINTN)ISCSI_NAME_IFR_MAX_SIZE, L"MAC %s", MacString);\r
     PortTitleToken = HiiSetString (\r
                        mCallbackInfo->RegisteredHandle,\r
                        0,\r
@@ -2009,7 +2005,7 @@ IScsiConfigAddAttempt (
 \r
     UnicodeSPrint (\r
       mPrivate->PortString,\r
-      (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+      (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
       L"PFA: Bus %d | Dev %d | Func %d",\r
       NicInfo->BusNumber,\r
       NicInfo->DeviceNumber,\r
@@ -2027,7 +2023,7 @@ IScsiConfigAddAttempt (
       PortTitleToken,\r
       PortTitleHelpToken,\r
       EFI_IFR_FLAG_CALLBACK,                  // Question flag\r
-      (UINT16) (KEY_MAC_ENTRY_BASE + NicInfo->NicIndex)\r
+      (UINT16)(KEY_MAC_ENTRY_BASE + NicInfo->NicIndex)\r
       );\r
   }\r
 \r
@@ -2062,24 +2058,24 @@ Exit:
 **/\r
 EFI_STATUS\r
 IScsiConfigAddAttemptsByKeywords (\r
-  IN UINT8                   *AttemptList\r
+  IN UINT8  *AttemptList\r
   )\r
 {\r
-  UINT8                       Index;\r
-  UINT8                       Number;\r
-  UINTN                       TotalNumber;\r
-  UINT8                       Nic;\r
-  UINT8                       *AttemptConfigOrder;\r
-  UINTN                       AttemptConfigOrderSize;\r
-  UINT8                       *AttemptConfigOrderTmp;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
-  ISCSI_NIC_INFO              *NicInfo;\r
-  CHAR16                      MacString[ISCSI_MAX_MAC_STRING_LEN];\r
-  CHAR16                      IScsiMode[64];\r
-  CHAR16                      IpMode[64];\r
-  EFI_STATUS                  Status;\r
-\r
-  Nic = mPrivate->CurrentNic;\r
+  UINT8                        Index;\r
+  UINT8                        Number;\r
+  UINTN                        TotalNumber;\r
+  UINT8                        Nic;\r
+  UINT8                        *AttemptConfigOrder;\r
+  UINTN                        AttemptConfigOrderSize;\r
+  UINT8                        *AttemptConfigOrderTmp;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *AttemptConfigData;\r
+  ISCSI_NIC_INFO               *NicInfo;\r
+  CHAR16                       MacString[ISCSI_MAX_MAC_STRING_LEN];\r
+  CHAR16                       IScsiMode[64];\r
+  CHAR16                       IpMode[64];\r
+  EFI_STATUS                   Status;\r
+\r
+  Nic     = mPrivate->CurrentNic;\r
   NicInfo = IScsiGetNicInfoByIndex (Nic);\r
   if (NicInfo == NULL) {\r
     return EFI_NOT_FOUND;\r
@@ -2107,22 +2103,22 @@ IScsiConfigAddAttemptsByKeywords (
 \r
     UnicodeSPrint (\r
       mPrivate->PortString,\r
-      (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+      (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
       L"Attempt %d",\r
       Number\r
       );\r
 \r
     GetVariable2 (\r
-           mPrivate->PortString,\r
-           &gEfiIScsiInitiatorNameProtocolGuid,\r
-           (VOID**)&AttemptConfigData,\r
-           NULL\r
-           );\r
-    if (AttemptConfigData == NULL || AttemptConfigData->Actived == ISCSI_ACTIVE_ENABLED) {\r
+      mPrivate->PortString,\r
+      &gEfiIScsiInitiatorNameProtocolGuid,\r
+      (VOID **)&AttemptConfigData,\r
+      NULL\r
+      );\r
+    if ((AttemptConfigData == NULL) || (AttemptConfigData->Actived == ISCSI_ACTIVE_ENABLED)) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
-    AttemptConfigData->Actived = ISCSI_ACTIVE_ENABLED;\r
+    AttemptConfigData->Actived  = ISCSI_ACTIVE_ENABLED;\r
     AttemptConfigData->NicIndex = NicInfo->NicIndex;\r
     UnicodeStrToAsciiStrS (MacString, AttemptConfigData->MacString, ISCSI_MAX_MAC_STRING_LEN);\r
 \r
@@ -2131,7 +2127,7 @@ IScsiConfigAddAttemptsByKeywords (
     //\r
     CopyMem (AttemptConfigData->SessionConfigData.IsId, &NicInfo->PermanentAddress, 6);\r
     AttemptConfigData->SessionConfigData.IsId[0] =\r
-      (UINT8) (AttemptConfigData->SessionConfigData.IsId[0] & 0x3F);\r
+      (UINT8)(AttemptConfigData->SessionConfigData.IsId[0] & 0x3F);\r
 \r
     //\r
     // Configure the iSCSI Mode and IpMode to default.\r
@@ -2141,7 +2137,7 @@ IScsiConfigAddAttemptsByKeywords (
     UnicodeSPrint (IpMode, 64, L"IP4");\r
     UnicodeSPrint (\r
       mPrivate->PortString,\r
-      (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+      (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
       L"MAC: %s, PFA: Bus %d | Dev %d | Func %d, iSCSI mode: %s, IP version: %s",\r
       MacString,\r
       NicInfo->BusNumber,\r
@@ -2180,16 +2176,18 @@ IScsiConfigAddAttemptsByKeywords (
       if (AttemptConfigOrder != NULL) {\r
         FreePool (AttemptConfigOrder);\r
       }\r
+\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     if (AttemptConfigOrder != NULL) {\r
       CopyMem (AttemptConfigOrderTmp, AttemptConfigOrder, AttemptConfigOrderSize);\r
       FreePool (AttemptConfigOrder);\r
     }\r
 \r
     AttemptConfigOrderTmp[TotalNumber - 1] = Number;\r
-    AttemptConfigOrder               = AttemptConfigOrderTmp;\r
-    AttemptConfigOrderSize           = TotalNumber * sizeof (UINT8);\r
+    AttemptConfigOrder                     = AttemptConfigOrderTmp;\r
+    AttemptConfigOrderSize                 = TotalNumber * sizeof (UINT8);\r
 \r
     Status = gRT->SetVariable (\r
                     L"AttemptOrder",\r
@@ -2208,7 +2206,7 @@ IScsiConfigAddAttemptsByKeywords (
     //\r
     InsertTailList (&mPrivate->AttemptConfigs, &AttemptConfigData->Link);\r
     mPrivate->AttemptCount++;\r
-    UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", AttemptConfigData->AttemptConfigIndex);\r
+    UnicodeSPrint (mPrivate->PortString, (UINTN)ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", AttemptConfigData->AttemptConfigIndex);\r
     gRT->SetVariable (\r
            mPrivate->PortString,\r
            &gEfiIScsiInitiatorNameProtocolGuid,\r
@@ -2216,7 +2214,6 @@ IScsiConfigAddAttemptsByKeywords (
            sizeof (ISCSI_ATTEMPT_CONFIG_NVDATA),\r
            AttemptConfigData\r
            );\r
-\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -2240,22 +2237,22 @@ IScsiConfigDeleteAttempts (
   IN ISCSI_CONFIG_IFR_NVDATA  *IfrNvData\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  UINTN                         Index;\r
-  UINTN                         NewIndex;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA   *AttemptConfigData;\r
-  UINT8                         *AttemptConfigOrder;\r
-  UINTN                         AttemptConfigOrderSize;\r
-  UINT8                         *AttemptNewOrder;\r
-  UINT8                         AttemptConfigIndex;\r
-  UINT32                        Attribute;\r
-  UINTN                         Total;\r
-  UINTN                         NewTotal;\r
-  LIST_ENTRY                    *Entry;\r
-  LIST_ENTRY                    *NextEntry;\r
-  ISCSI_SESSION_CONFIG_NVDATA   *ConfigData;\r
-\r
-  Index     = 0;\r
+  EFI_STATUS                   Status;\r
+  UINTN                        Index;\r
+  UINTN                        NewIndex;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *AttemptConfigData;\r
+  UINT8                        *AttemptConfigOrder;\r
+  UINTN                        AttemptConfigOrderSize;\r
+  UINT8                        *AttemptNewOrder;\r
+  UINT8                        AttemptConfigIndex;\r
+  UINT32                       Attribute;\r
+  UINTN                        Total;\r
+  UINTN                        NewTotal;\r
+  LIST_ENTRY                   *Entry;\r
+  LIST_ENTRY                   *NextEntry;\r
+  ISCSI_SESSION_CONFIG_NVDATA  *ConfigData;\r
+\r
+  Index = 0;\r
 \r
   AttemptConfigOrder = IScsiGetVariableAndSize (\r
                          L"AttemptOrder",\r
@@ -2324,6 +2321,7 @@ IScsiConfigDeleteAttempts (
     if (AttemptConfigData == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     ConfigData                    = &AttemptConfigData->SessionConfigData;\r
     ConfigData->TargetPort        = ISCSI_WELL_KNOWN_PORT;\r
     ConfigData->ConnectTimeout    = CONNECT_DEFAULT_TIMEOUT;\r
@@ -2341,9 +2339,9 @@ IScsiConfigDeleteAttempts (
     //\r
     UnicodeSPrint (\r
       mPrivate->PortString,\r
-      (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+      (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
       L"Attempt %d",\r
-      (UINTN) AttemptConfigData->AttemptConfigIndex\r
+      (UINTN)AttemptConfigData->AttemptConfigIndex\r
       );\r
     UnicodeStrToAsciiStrS (mPrivate->PortString, AttemptConfigData->AttemptName, ATTEMPT_NAME_SIZE);\r
     gRT->SetVariable (\r
@@ -2368,6 +2366,7 @@ IScsiConfigDeleteAttempts (
     if (mCallbackInfo->Current == AttemptConfigData) {\r
       mCallbackInfo->Current = NULL;\r
     }\r
+\r
     FreePool (AttemptConfigData);\r
 \r
     //\r
@@ -2411,7 +2410,6 @@ Error:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Callback function when user presses "Delete Attempts".\r
 \r
@@ -2427,17 +2425,16 @@ IScsiConfigDisplayDeleteAttempts (
   IN ISCSI_CONFIG_IFR_NVDATA  *IfrNvData\r
   )\r
 {\r
-\r
-  UINT8                       *AttemptConfigOrder;\r
-  UINTN                       AttemptConfigOrderSize;\r
-  LIST_ENTRY                  *Entry;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
-  UINT8                       Index;\r
-  VOID                        *StartOpCodeHandle;\r
-  EFI_IFR_GUID_LABEL          *StartLabel;\r
-  VOID                        *EndOpCodeHandle;\r
-  EFI_IFR_GUID_LABEL          *EndLabel;\r
-  EFI_STATUS                  Status;\r
+  UINT8                        *AttemptConfigOrder;\r
+  UINTN                        AttemptConfigOrderSize;\r
+  LIST_ENTRY                   *Entry;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *AttemptConfigData;\r
+  UINT8                        Index;\r
+  VOID                         *StartOpCodeHandle;\r
+  EFI_IFR_GUID_LABEL           *StartLabel;\r
+  VOID                         *EndOpCodeHandle;\r
+  EFI_IFR_GUID_LABEL           *EndLabel;\r
+  EFI_STATUS                   Status;\r
 \r
   Status = IScsiCreateOpCode (\r
              DELETE_ENTRY_LABEL,\r
@@ -2462,14 +2459,14 @@ IScsiConfigDisplayDeleteAttempts (
     Index = 0;\r
 \r
     NET_LIST_FOR_EACH (Entry, &mPrivate->AttemptConfigs) {\r
-      AttemptConfigData = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);\r
+      AttemptConfigData                   = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);\r
       IfrNvData->DeleteAttemptList[Index] = 0x00;\r
 \r
-      HiiCreateCheckBoxOpCode(\r
+      HiiCreateCheckBoxOpCode (\r
         StartOpCodeHandle,\r
-        (EFI_QUESTION_ID) (ATTEMPT_DEL_QUESTION_ID + Index),\r
+        (EFI_QUESTION_ID)(ATTEMPT_DEL_QUESTION_ID + Index),\r
         CONFIGURATION_VARSTORE_ID,\r
-        (UINT16) (ATTEMPT_DEL_VAR_OFFSET + Index),\r
+        (UINT16)(ATTEMPT_DEL_VAR_OFFSET + Index),\r
         AttemptConfigData->AttemptTitleToken,\r
         AttemptConfigData->AttemptTitleHelpToken,\r
         0,\r
@@ -2501,7 +2498,6 @@ IScsiConfigDisplayDeleteAttempts (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Callback function when user presses "Change Attempt Order".\r
 \r
@@ -2516,15 +2512,15 @@ IScsiConfigDisplayOrderAttempts (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  UINT8                       Index;\r
-  LIST_ENTRY                  *Entry;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
-  VOID                        *StartOpCodeHandle;\r
-  EFI_IFR_GUID_LABEL          *StartLabel;\r
-  VOID                        *EndOpCodeHandle;\r
-  EFI_IFR_GUID_LABEL          *EndLabel;\r
-  VOID                        *OptionsOpCodeHandle;\r
+  EFI_STATUS                   Status;\r
+  UINT8                        Index;\r
+  LIST_ENTRY                   *Entry;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *AttemptConfigData;\r
+  VOID                         *StartOpCodeHandle;\r
+  EFI_IFR_GUID_LABEL           *StartLabel;\r
+  VOID                         *EndOpCodeHandle;\r
+  EFI_IFR_GUID_LABEL           *EndLabel;\r
+  VOID                         *OptionsOpCodeHandle;\r
 \r
   Status = IScsiCreateOpCode (\r
              ORDER_ENTRY_LABEL,\r
@@ -2536,6 +2532,7 @@ IScsiConfigDisplayOrderAttempts (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   ASSERT (StartOpCodeHandle != NULL);\r
 \r
   OptionsOpCodeHandle = NULL;\r
@@ -2622,14 +2619,14 @@ IScsiConfigOrderAttempts (
   IN ISCSI_CONFIG_IFR_NVDATA  *IfrNvData\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  UINTN                       Index;\r
-  UINTN                       Indexj;\r
-  UINT8                       AttemptConfigIndex;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
-  UINT8                       *AttemptConfigOrder;\r
-  UINT8                       *AttemptConfigOrderTmp;\r
-  UINTN                       AttemptConfigOrderSize;\r
+  EFI_STATUS                   Status;\r
+  UINTN                        Index;\r
+  UINTN                        Indexj;\r
+  UINT8                        AttemptConfigIndex;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *AttemptConfigData;\r
+  UINT8                        *AttemptConfigOrder;\r
+  UINT8                        *AttemptConfigOrderTmp;\r
+  UINTN                        AttemptConfigOrderSize;\r
 \r
   AttemptConfigOrder = IScsiGetVariableAndSize (\r
                          L"AttemptOrder",\r
@@ -2683,7 +2680,7 @@ IScsiConfigOrderAttempts (
   //\r
   // Adjust the attempt order in NVR.\r
   //\r
-  for (; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {\r
+  for ( ; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {\r
     for (Indexj = 0; Indexj < AttemptConfigOrderSize / sizeof (UINT8); Indexj++) {\r
       if (AttemptConfigOrder[Indexj] != 0) {\r
         AttemptConfigOrderTmp[Index] = AttemptConfigOrder[Indexj];\r
@@ -2710,7 +2707,6 @@ Exit:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Callback function when a user presses "Attempt *" or when a user selects a NIC to\r
   create the new attempt.\r
@@ -2729,20 +2725,20 @@ Exit:
 **/\r
 EFI_STATUS\r
 IScsiConfigProcessDefault (\r
-  IN  EFI_QUESTION_ID              KeyValue,\r
-  IN  ISCSI_CONFIG_IFR_NVDATA      *IfrNvData\r
+  IN  EFI_QUESTION_ID          KeyValue,\r
+  IN  ISCSI_CONFIG_IFR_NVDATA  *IfrNvData\r
   )\r
 {\r
-  BOOLEAN                     NewAttempt;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
-  UINT8                       CurrentAttemptConfigIndex;\r
-  ISCSI_NIC_INFO              *NicInfo;\r
-  UINT8                       NicIndex;\r
-  CHAR16                      MacString[ISCSI_MAX_MAC_STRING_LEN];\r
-  UINT8                       *AttemptConfigOrder;\r
-  UINTN                       AttemptConfigOrderSize;\r
-  UINTN                       Index;\r
-  EFI_INPUT_KEY               Key;\r
+  BOOLEAN                      NewAttempt;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *AttemptConfigData;\r
+  UINT8                        CurrentAttemptConfigIndex;\r
+  ISCSI_NIC_INFO               *NicInfo;\r
+  UINT8                        NicIndex;\r
+  CHAR16                       MacString[ISCSI_MAX_MAC_STRING_LEN];\r
+  UINT8                        *AttemptConfigOrder;\r
+  UINTN                        AttemptConfigOrderSize;\r
+  UINTN                        Index;\r
+  EFI_INPUT_KEY                Key;\r
 \r
   AttemptConfigData = NULL;\r
   //\r
@@ -2751,14 +2747,15 @@ IScsiConfigProcessDefault (
   NewAttempt = FALSE;\r
 \r
   if ((KeyValue >= KEY_MAC_ENTRY_BASE) &&\r
-      (KeyValue <= (UINT16) (mPrivate->MaxNic + KEY_MAC_ENTRY_BASE))) {\r
+      (KeyValue <= (UINT16)(mPrivate->MaxNic + KEY_MAC_ENTRY_BASE)))\r
+  {\r
     //\r
     // User has pressed "Add an Attempt" and then selects a NIC.\r
     //\r
     NewAttempt = TRUE;\r
   } else if ((KeyValue >= KEY_ATTEMPT_ENTRY_BASE) &&\r
-             (KeyValue < (ISCSI_MAX_ATTEMPTS_NUM + KEY_ATTEMPT_ENTRY_BASE))) {\r
-\r
+             (KeyValue < (ISCSI_MAX_ATTEMPTS_NUM + KEY_ATTEMPT_ENTRY_BASE)))\r
+  {\r
     //\r
     // User has pressed "Attempt *".\r
     //\r
@@ -2774,8 +2771,8 @@ IScsiConfigProcessDefault (
     //\r
     // Determine which NIC user has selected for the new created attempt.\r
     //\r
-    NicIndex = (UINT8) (KeyValue - KEY_MAC_ENTRY_BASE);\r
-    NicInfo = IScsiGetNicInfoByIndex (NicIndex);\r
+    NicIndex = (UINT8)(KeyValue - KEY_MAC_ENTRY_BASE);\r
+    NicInfo  = IScsiGetNicInfoByIndex (NicIndex);\r
     if (NicInfo == NULL) {\r
       return EFI_NOT_FOUND;\r
     }\r
@@ -2796,17 +2793,17 @@ IScsiConfigProcessDefault (
     for (Index = 0; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {\r
       UnicodeSPrint (\r
         mPrivate->PortString,\r
-        (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+        (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
         L"Attempt %d",\r
-        (UINTN) AttemptConfigOrder[Index]\r
+        (UINTN)AttemptConfigOrder[Index]\r
         );\r
       GetVariable2 (\r
-                   mPrivate->PortString,\r
-                   &gEfiIScsiInitiatorNameProtocolGuid,\r
-                   (VOID**)&AttemptConfigData,\r
-                   NULL\r
-                   );\r
-      if (AttemptConfigData == NULL || AttemptConfigData->Actived == ISCSI_ACTIVE_ENABLED) {\r
+        mPrivate->PortString,\r
+        &gEfiIScsiInitiatorNameProtocolGuid,\r
+        (VOID **)&AttemptConfigData,\r
+        NULL\r
+        );\r
+      if ((AttemptConfigData == NULL) || (AttemptConfigData->Actived == ISCSI_ACTIVE_ENABLED)) {\r
         continue;\r
       }\r
 \r
@@ -2840,21 +2837,21 @@ IScsiConfigProcessDefault (
     ASSERT (AttemptConfigData != NULL);\r
     UnicodeStrToAsciiStrS (MacString, AttemptConfigData->MacString, sizeof (AttemptConfigData->MacString));\r
     AttemptConfigData->NicIndex = NicIndex;\r
-    AttemptConfigData->Actived = ISCSI_ACTIVE_ENABLED;\r
+    AttemptConfigData->Actived  = ISCSI_ACTIVE_ENABLED;\r
 \r
     //\r
     // Generate OUI-format ISID based on MAC address.\r
     //\r
     CopyMem (AttemptConfigData->SessionConfigData.IsId, &NicInfo->PermanentAddress, 6);\r
     AttemptConfigData->SessionConfigData.IsId[0] =\r
-      (UINT8) (AttemptConfigData->SessionConfigData.IsId[0] & 0x3F);\r
+      (UINT8)(AttemptConfigData->SessionConfigData.IsId[0] & 0x3F);\r
 \r
     //\r
     // Add the help info for the new attempt.\r
     //\r
     UnicodeSPrint (\r
       mPrivate->PortString,\r
-      (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+      (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
       L"MAC: %s, PFA: Bus %d | Dev %d | Func %d",\r
       MacString,\r
       NicInfo->BusNumber,\r
@@ -2862,23 +2859,22 @@ IScsiConfigProcessDefault (
       NicInfo->FunctionNumber\r
       );\r
 \r
-    AttemptConfigData->AttemptTitleHelpToken  = HiiSetString (\r
-                                                  mCallbackInfo->RegisteredHandle,\r
-                                                  0,\r
-                                                  mPrivate->PortString,\r
-                                                  NULL\r
-                                                  );\r
+    AttemptConfigData->AttemptTitleHelpToken = HiiSetString (\r
+                                                 mCallbackInfo->RegisteredHandle,\r
+                                                 0,\r
+                                                 mPrivate->PortString,\r
+                                                 NULL\r
+                                                 );\r
     if (AttemptConfigData->AttemptTitleHelpToken == 0) {\r
       FreePool (AttemptConfigData);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-\r
   } else {\r
     //\r
     // Determine which Attempt user has selected to configure.\r
     // Get the attempt configuration data.\r
     //\r
-    CurrentAttemptConfigIndex = (UINT8) (KeyValue - KEY_ATTEMPT_ENTRY_BASE);\r
+    CurrentAttemptConfigIndex = (UINT8)(KeyValue - KEY_ATTEMPT_ENTRY_BASE);\r
 \r
     AttemptConfigData = IScsiConfigGetAttemptByConfigIndex (CurrentAttemptConfigIndex);\r
     if (AttemptConfigData == NULL) {\r
@@ -2907,7 +2903,6 @@ IScsiConfigProcessDefault (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
 \r
   This function allows the caller to request the current\r
@@ -2982,23 +2977,23 @@ IScsiConfigProcessDefault (
 EFI_STATUS\r
 EFIAPI\r
 IScsiFormExtractConfig (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  CONST EFI_STRING                       Request,\r
-  OUT EFI_STRING                             *Progress,\r
-  OUT EFI_STRING                             *Results\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  CONST EFI_STRING                      Request,\r
+  OUT EFI_STRING                            *Progress,\r
+  OUT EFI_STRING                            *Results\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  CHAR8                            *InitiatorName;\r
-  UINTN                            BufferSize;\r
-  ISCSI_CONFIG_IFR_NVDATA          *IfrNvData;\r
-  ISCSI_FORM_CALLBACK_INFO         *Private;\r
-  EFI_STRING                       ConfigRequestHdr;\r
-  EFI_STRING                       ConfigRequest;\r
-  BOOLEAN                          AllocatedRequest;\r
-  UINTN                            Size;\r
-\r
-  if (This == NULL || Progress == NULL || Results == NULL) {\r
+  EFI_STATUS                Status;\r
+  CHAR8                     *InitiatorName;\r
+  UINTN                     BufferSize;\r
+  ISCSI_CONFIG_IFR_NVDATA   *IfrNvData;\r
+  ISCSI_FORM_CALLBACK_INFO  *Private;\r
+  EFI_STRING                ConfigRequestHdr;\r
+  EFI_STRING                ConfigRequest;\r
+  BOOLEAN                   AllocatedRequest;\r
+  UINTN                     Size;\r
+\r
+  if ((This == NULL) || (Progress == NULL) || (Results == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -3012,14 +3007,13 @@ IScsiFormExtractConfig (
   AllocatedRequest = FALSE;\r
   Size             = 0;\r
 \r
-  Private = ISCSI_FORM_CALLBACK_INFO_FROM_FORM_CALLBACK (This);\r
+  Private   = ISCSI_FORM_CALLBACK_INFO_FROM_FORM_CALLBACK (This);\r
   IfrNvData = AllocateZeroPool (sizeof (ISCSI_CONFIG_IFR_NVDATA));\r
   if (IfrNvData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-\r
-  if (Private->Current!= NULL) {\r
+  if (Private->Current != NULL) {\r
     IScsiConvertAttemptConfigDataToIfrNvData (Private->Current, IfrNvData);\r
   }\r
 \r
@@ -3029,7 +3023,7 @@ IScsiFormExtractConfig (
   IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (IfrNvData);\r
 \r
   BufferSize    = ISCSI_NAME_MAX_SIZE;\r
-  InitiatorName = (CHAR8 *) AllocateZeroPool (BufferSize);\r
+  InitiatorName = (CHAR8 *)AllocateZeroPool (BufferSize);\r
   if (InitiatorName == NULL) {\r
     FreePool (IfrNvData);\r
     return EFI_OUT_OF_RESOURCES;\r
@@ -3049,7 +3043,7 @@ IScsiFormExtractConfig (
   //\r
   // Convert buffer data to <ConfigResp> by helper function BlockToConfig().\r
   //\r
-  BufferSize = sizeof (ISCSI_CONFIG_IFR_NVDATA);\r
+  BufferSize    = sizeof (ISCSI_CONFIG_IFR_NVDATA);\r
   ConfigRequest = Request;\r
   if ((Request == NULL) || (StrStr (Request, L"OFFSET") == NULL)) {\r
     //\r
@@ -3058,13 +3052,14 @@ IScsiFormExtractConfig (
     // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
     //\r
     ConfigRequestHdr = HiiConstructConfigHdr (&gIScsiConfigGuid, mVendorStorageName, Private->DriverHandle);\r
-    Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
-    ConfigRequest = AllocateZeroPool (Size);\r
+    Size             = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
+    ConfigRequest    = AllocateZeroPool (Size);\r
     if (ConfigRequest == NULL) {\r
       FreePool (IfrNvData);\r
       FreePool (InitiatorName);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     AllocatedRequest = TRUE;\r
     UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);\r
     FreePool (ConfigRequestHdr);\r
@@ -3073,7 +3068,7 @@ IScsiFormExtractConfig (
   Status = gHiiConfigRouting->BlockToConfig (\r
                                 gHiiConfigRouting,\r
                                 ConfigRequest,\r
-                                (UINT8 *) IfrNvData,\r
+                                (UINT8 *)IfrNvData,\r
                                 BufferSize,\r
                                 Results,\r
                                 Progress\r
@@ -3088,6 +3083,7 @@ IScsiFormExtractConfig (
     FreePool (ConfigRequest);\r
     ConfigRequest = NULL;\r
   }\r
+\r
   //\r
   // Set Progress string to the original request string.\r
   //\r
@@ -3100,7 +3096,6 @@ IScsiFormExtractConfig (
   return Status;\r
 }\r
 \r
-\r
 /**\r
 \r
   This function applies changes in a driver's configuration.\r
@@ -3144,33 +3139,33 @@ IScsiFormExtractConfig (
 EFI_STATUS\r
 EFIAPI\r
 IScsiFormRouteConfig (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  CONST EFI_STRING                       Configuration,\r
-  OUT EFI_STRING                             *Progress\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  CONST EFI_STRING                      Configuration,\r
+  OUT EFI_STRING                            *Progress\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  ISCSI_CONFIG_IFR_NVDATA          *IfrNvData;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA      *AttemptConfigData;\r
-  LIST_ENTRY                       *Entry;\r
-  LIST_ENTRY                       *NextEntry;\r
-  ISCSI_NIC_INFO                   *NicInfo;\r
-  EFI_INPUT_KEY                    Key;\r
-  CHAR16                           MacString[ISCSI_MAX_MAC_STRING_LEN];\r
-  CHAR8                            *InitiatorName;\r
-  UINT8                            *AttemptList;\r
-  UINTN                            BufferSize;\r
-  UINTN                            OffSet;\r
-  UINTN                            Index;\r
-  UINTN                            Index2;\r
-\r
-  Index   = 0;\r
-  Index2  = 0;\r
-  NicInfo = NULL;\r
+  EFI_STATUS                   Status;\r
+  ISCSI_CONFIG_IFR_NVDATA      *IfrNvData;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *AttemptConfigData;\r
+  LIST_ENTRY                   *Entry;\r
+  LIST_ENTRY                   *NextEntry;\r
+  ISCSI_NIC_INFO               *NicInfo;\r
+  EFI_INPUT_KEY                Key;\r
+  CHAR16                       MacString[ISCSI_MAX_MAC_STRING_LEN];\r
+  CHAR8                        *InitiatorName;\r
+  UINT8                        *AttemptList;\r
+  UINTN                        BufferSize;\r
+  UINTN                        OffSet;\r
+  UINTN                        Index;\r
+  UINTN                        Index2;\r
+\r
+  Index       = 0;\r
+  Index2      = 0;\r
+  NicInfo     = NULL;\r
   AttemptList = NULL;\r
-  Status = EFI_SUCCESS;\r
+  Status      = EFI_SUCCESS;\r
 \r
-  if (This == NULL || Configuration == NULL || Progress == NULL) {\r
+  if ((This == NULL) || (Configuration == NULL) || (Progress == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -3189,7 +3184,7 @@ IScsiFormRouteConfig (
   }\r
 \r
   BufferSize    = ISCSI_NAME_MAX_SIZE;\r
-  InitiatorName = (CHAR8 *) AllocateZeroPool (BufferSize);\r
+  InitiatorName = (CHAR8 *)AllocateZeroPool (BufferSize);\r
   if (InitiatorName == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Exit;\r
@@ -3199,22 +3194,22 @@ IScsiFormRouteConfig (
   // Convert <ConfigResp> to buffer data by helper function ConfigToBlock().\r
   //\r
   BufferSize = sizeof (ISCSI_CONFIG_IFR_NVDATA);\r
-  Status = gHiiConfigRouting->ConfigToBlock (\r
-                             gHiiConfigRouting,\r
-                             Configuration,\r
-                             (UINT8 *) IfrNvData,\r
-                             &BufferSize,\r
-                             Progress\r
-                             );\r
+  Status     = gHiiConfigRouting->ConfigToBlock (\r
+                                    gHiiConfigRouting,\r
+                                    Configuration,\r
+                                    (UINT8 *)IfrNvData,\r
+                                    &BufferSize,\r
+                                    Progress\r
+                                    );\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   }\r
 \r
   if (IfrNvData->InitiatorName[0] != L'\0') {\r
     UnicodeStrToAsciiStrS (IfrNvData->InitiatorName, InitiatorName, ISCSI_NAME_MAX_SIZE);\r
-    BufferSize  = AsciiStrSize (InitiatorName);\r
+    BufferSize = AsciiStrSize (InitiatorName);\r
 \r
-    Status      = gIScsiInitiatorName.Set (&gIScsiInitiatorName, &BufferSize, InitiatorName);\r
+    Status = gIScsiInitiatorName.Set (&gIScsiInitiatorName, &BufferSize, InitiatorName);\r
     if (EFI_ERROR (Status)) {\r
       CreatePopUp (\r
         EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
@@ -3246,14 +3241,14 @@ IScsiFormRouteConfig (
     }\r
 \r
     if (IfrNvData->ISCSIAddAttemptList[0] != L'\0') {\r
-      Status =IScsiGetAttemptIndexList (IfrNvData->ISCSIAddAttemptList, IfrNvData->AddAttemptList, TRUE);\r
+      Status = IScsiGetAttemptIndexList (IfrNvData->ISCSIAddAttemptList, IfrNvData->AddAttemptList, TRUE);\r
       if (EFI_ERROR (Status)) {\r
-          CreatePopUp (\r
-            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-            &Key,\r
-            L"Error: The add attempt list is invalid",\r
-            NULL\r
-            );\r
+        CreatePopUp (\r
+          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+          &Key,\r
+          L"Error: The add attempt list is invalid",\r
+          NULL\r
+          );\r
         goto Exit;\r
       }\r
 \r
@@ -3261,21 +3256,21 @@ IScsiFormRouteConfig (
       if (EFI_ERROR (Status)) {\r
         goto Exit;\r
       }\r
-\r
     } else if (IfrNvData->ISCSIDeleteAttemptList[0] != L'\0') {\r
-      AttemptList =(UINT8 *) AllocateZeroPool ((ISCSI_MAX_ATTEMPTS_NUM + 1) * sizeof (UINT8));\r
+      AttemptList = (UINT8 *)AllocateZeroPool ((ISCSI_MAX_ATTEMPTS_NUM + 1) * sizeof (UINT8));\r
       if (AttemptList == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
         goto Exit;\r
       }\r
+\r
       Status = IScsiGetAttemptIndexList (IfrNvData->ISCSIDeleteAttemptList, AttemptList, FALSE);\r
       if (EFI_ERROR (Status)) {\r
-          CreatePopUp (\r
-            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-            &Key,\r
-            L"Error: The delete attempt list is invalid",\r
-            NULL\r
-            );\r
+        CreatePopUp (\r
+          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+          &Key,\r
+          L"Error: The delete attempt list is invalid",\r
+          NULL\r
+          );\r
         goto Exit;\r
       }\r
 \r
@@ -3289,9 +3284,11 @@ IScsiFormRouteConfig (
             IfrNvData->DeleteAttemptList[Index2] = 1;\r
             break;\r
           }\r
-          Index ++;\r
+\r
+          Index++;\r
         }\r
-        Index2 ++;\r
+\r
+        Index2++;\r
         Index = 0;\r
       }\r
 \r
@@ -3301,16 +3298,15 @@ IScsiFormRouteConfig (
       }\r
 \r
       FreePool (AttemptList);\r
-\r
     } else if (IfrNvData->ISCSIAttemptOrder[0] != L'\0') {\r
       Status = IScsiGetAttemptIndexList (IfrNvData->ISCSIAttemptOrder, IfrNvData->DynamicOrderedList, FALSE);\r
       if (EFI_ERROR (Status)) {\r
-          CreatePopUp (\r
-            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-            &Key,\r
-            L"Error: The new attempt order list is invalid",\r
-            NULL\r
-            );\r
+        CreatePopUp (\r
+          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+          &Key,\r
+          L"Error: The new attempt order list is invalid",\r
+          NULL\r
+          );\r
         goto Exit;\r
       }\r
 \r
@@ -3318,17 +3314,16 @@ IScsiFormRouteConfig (
       if (EFI_ERROR (Status)) {\r
         goto Exit;\r
       }\r
-\r
     } else if (IfrNvData->ISCSIMacAddr[0] != L'\0') {\r
       NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {\r
         NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);\r
         IScsiMacAddrToStr (\r
-        &NicInfo->PermanentAddress,\r
-        NicInfo->HwAddressSize,\r
-        NicInfo->VlanId,\r
-        MacString\r
-        );\r
-        if (!StrCmp(MacString, IfrNvData->ISCSIMacAddr)) {\r
+          &NicInfo->PermanentAddress,\r
+          NicInfo->HwAddressSize,\r
+          NicInfo->VlanId,\r
+          MacString\r
+          );\r
+        if (!StrCmp (MacString, IfrNvData->ISCSIMacAddr)) {\r
           mPrivate->CurrentNic = NicInfo->NicIndex;\r
           break;\r
         }\r
@@ -3338,7 +3333,6 @@ IScsiFormRouteConfig (
         Status = EFI_NOT_FOUND;\r
         goto Exit;\r
       }\r
-\r
     } else {\r
       Status = IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (IfrNvData, OffSet);\r
       if (EFI_ERROR (Status)) {\r
@@ -3389,28 +3383,28 @@ Exit:
 EFI_STATUS\r
 EFIAPI\r
 IScsiFormCallback (\r
-  IN CONST  EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN        EFI_BROWSER_ACTION               Action,\r
-  IN        EFI_QUESTION_ID                  QuestionId,\r
-  IN        UINT8                            Type,\r
-  IN OUT    EFI_IFR_TYPE_VALUE               *Value,\r
-  OUT       EFI_BROWSER_ACTION_REQUEST       *ActionRequest\r
+  IN CONST  EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN        EFI_BROWSER_ACTION              Action,\r
+  IN        EFI_QUESTION_ID                 QuestionId,\r
+  IN        UINT8                           Type,\r
+  IN OUT    EFI_IFR_TYPE_VALUE              *Value,\r
+  OUT       EFI_BROWSER_ACTION_REQUEST      *ActionRequest\r
   )\r
 {\r
-  ISCSI_FORM_CALLBACK_INFO    *Private;\r
-  UINTN                       BufferSize;\r
-  CHAR8                       *IScsiName;\r
-  CHAR8                       IpString[ISCSI_NAME_MAX_SIZE];\r
-  CHAR8                       LunString[ISCSI_LUN_STR_MAX_LEN];\r
-  UINT64                      Lun;\r
-  EFI_IP_ADDRESS              HostIp;\r
-  EFI_IP_ADDRESS              SubnetMask;\r
-  EFI_IP_ADDRESS              Gateway;\r
-  ISCSI_CONFIG_IFR_NVDATA     *IfrNvData;\r
-  ISCSI_CONFIG_IFR_NVDATA     OldIfrNvData;\r
-  EFI_STATUS                  Status;\r
-  EFI_INPUT_KEY               Key;\r
-  ISCSI_NIC_INFO              *NicInfo;\r
+  ISCSI_FORM_CALLBACK_INFO  *Private;\r
+  UINTN                     BufferSize;\r
+  CHAR8                     *IScsiName;\r
+  CHAR8                     IpString[ISCSI_NAME_MAX_SIZE];\r
+  CHAR8                     LunString[ISCSI_LUN_STR_MAX_LEN];\r
+  UINT64                    Lun;\r
+  EFI_IP_ADDRESS            HostIp;\r
+  EFI_IP_ADDRESS            SubnetMask;\r
+  EFI_IP_ADDRESS            Gateway;\r
+  ISCSI_CONFIG_IFR_NVDATA   *IfrNvData;\r
+  ISCSI_CONFIG_IFR_NVDATA   OldIfrNvData;\r
+  EFI_STATUS                Status;\r
+  EFI_INPUT_KEY             Key;\r
+  ISCSI_NIC_INFO            *NicInfo;\r
 \r
   NicInfo = NULL;\r
 \r
@@ -3439,12 +3433,12 @@ IScsiFormCallback (
   //\r
 \r
   BufferSize = sizeof (ISCSI_CONFIG_IFR_NVDATA);\r
-  IfrNvData = AllocateZeroPool (BufferSize);\r
+  IfrNvData  = AllocateZeroPool (BufferSize);\r
   if (IfrNvData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  IScsiName = (CHAR8 *) AllocateZeroPool (ISCSI_NAME_MAX_SIZE);\r
+  IScsiName = (CHAR8 *)AllocateZeroPool (ISCSI_NAME_MAX_SIZE);\r
   if (IScsiName == NULL) {\r
     FreePool (IfrNvData);\r
     return EFI_OUT_OF_RESOURCES;\r
@@ -3454,332 +3448,334 @@ IScsiFormCallback (
 \r
   ZeroMem (&OldIfrNvData, BufferSize);\r
 \r
-  HiiGetBrowserData (NULL, NULL, BufferSize, (UINT8 *) IfrNvData);\r
+  HiiGetBrowserData (NULL, NULL, BufferSize, (UINT8 *)IfrNvData);\r
 \r
   CopyMem (&OldIfrNvData, IfrNvData, BufferSize);\r
 \r
   if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
     switch (QuestionId) {\r
-    case KEY_ADD_ATTEMPT:\r
-      //\r
-      // Check whether iSCSI initiator name is configured already.\r
-      //\r
-      mPrivate->InitiatorNameLength = ISCSI_NAME_MAX_SIZE;\r
-      Status = gIScsiInitiatorName.Get (\r
-                                     &gIScsiInitiatorName,\r
-                                     &mPrivate->InitiatorNameLength,\r
-                                     mPrivate->InitiatorName\r
-                                     );\r
-      if (EFI_ERROR (Status)) {\r
-        CreatePopUp (\r
-          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-          &Key,\r
-          L"Error: please configure iSCSI initiator name first!",\r
-          NULL\r
-          );\r
-        break;\r
-      }\r
+      case KEY_ADD_ATTEMPT:\r
+        //\r
+        // Check whether iSCSI initiator name is configured already.\r
+        //\r
+        mPrivate->InitiatorNameLength = ISCSI_NAME_MAX_SIZE;\r
+        Status                        = gIScsiInitiatorName.Get (\r
+                                                              &gIScsiInitiatorName,\r
+                                                              &mPrivate->InitiatorNameLength,\r
+                                                              mPrivate->InitiatorName\r
+                                                              );\r
+        if (EFI_ERROR (Status)) {\r
+          CreatePopUp (\r
+            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+            &Key,\r
+            L"Error: please configure iSCSI initiator name first!",\r
+            NULL\r
+            );\r
+          break;\r
+        }\r
 \r
-      Status = IScsiConfigAddAttempt ();\r
-      break;\r
+        Status = IScsiConfigAddAttempt ();\r
+        break;\r
 \r
-    case KEY_DELETE_ATTEMPT:\r
-      CopyMem (\r
-        OldIfrNvData.DeleteAttemptList,\r
-        IfrNvData->DeleteAttemptList,\r
-        sizeof (IfrNvData->DeleteAttemptList)\r
-        );\r
-      Status = IScsiConfigDisplayDeleteAttempts (IfrNvData);\r
-      break;\r
+      case KEY_DELETE_ATTEMPT:\r
+        CopyMem (\r
+          OldIfrNvData.DeleteAttemptList,\r
+          IfrNvData->DeleteAttemptList,\r
+          sizeof (IfrNvData->DeleteAttemptList)\r
+          );\r
+        Status = IScsiConfigDisplayDeleteAttempts (IfrNvData);\r
+        break;\r
 \r
-    case KEY_ORDER_ATTEMPT_CONFIG:\r
-      //\r
-      // Order the attempt according to user input.\r
-      //\r
-      CopyMem (\r
-        OldIfrNvData.DynamicOrderedList,\r
-        IfrNvData->DynamicOrderedList,\r
-        sizeof (IfrNvData->DynamicOrderedList)\r
-        );\r
-      IScsiConfigDisplayOrderAttempts ();\r
-      break;\r
+      case KEY_ORDER_ATTEMPT_CONFIG:\r
+        //\r
+        // Order the attempt according to user input.\r
+        //\r
+        CopyMem (\r
+          OldIfrNvData.DynamicOrderedList,\r
+          IfrNvData->DynamicOrderedList,\r
+          sizeof (IfrNvData->DynamicOrderedList)\r
+          );\r
+        IScsiConfigDisplayOrderAttempts ();\r
+        break;\r
 \r
-    default:\r
-      Status = IScsiConfigProcessDefault (QuestionId, IfrNvData);\r
-      break;\r
+      default:\r
+        Status = IScsiConfigProcessDefault (QuestionId, IfrNvData);\r
+        break;\r
     }\r
   } else if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
     switch (QuestionId) {\r
-    case KEY_INITIATOR_NAME:\r
-      UnicodeStrToAsciiStrS (IfrNvData->InitiatorName, IScsiName, ISCSI_NAME_MAX_SIZE);\r
-      BufferSize  = AsciiStrSize (IScsiName);\r
+      case KEY_INITIATOR_NAME:\r
+        UnicodeStrToAsciiStrS (IfrNvData->InitiatorName, IScsiName, ISCSI_NAME_MAX_SIZE);\r
+        BufferSize = AsciiStrSize (IScsiName);\r
 \r
-      Status      = gIScsiInitiatorName.Set (&gIScsiInitiatorName, &BufferSize, IScsiName);\r
-      if (EFI_ERROR (Status)) {\r
-        CreatePopUp (\r
-          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-          &Key,\r
-          L"Invalid iSCSI Name!",\r
-          NULL\r
-          );\r
-      }\r
+        Status = gIScsiInitiatorName.Set (&gIScsiInitiatorName, &BufferSize, IScsiName);\r
+        if (EFI_ERROR (Status)) {\r
+          CreatePopUp (\r
+            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+            &Key,\r
+            L"Invalid iSCSI Name!",\r
+            NULL\r
+            );\r
+        }\r
 \r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
-      break;\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
+        break;\r
 \r
-    case KEY_SAVE_ATTEMPT_CONFIG:\r
-      Status = IScsiConvertIfrNvDataToAttemptConfigData (IfrNvData, Private->Current);\r
-      if (EFI_ERROR (Status)) {\r
+      case KEY_SAVE_ATTEMPT_CONFIG:\r
+        Status = IScsiConvertIfrNvDataToAttemptConfigData (IfrNvData, Private->Current);\r
+        if (EFI_ERROR (Status)) {\r
+          break;\r
+        }\r
+\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
         break;\r
-      }\r
 \r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
-      break;\r
+      case KEY_SAVE_ORDER_CHANGES:\r
+        //\r
+        // Sync the Attempt Order to NVR.\r
+        //\r
+        Status = IScsiConfigOrderAttempts (IfrNvData);\r
+        if (EFI_ERROR (Status)) {\r
+          break;\r
+        }\r
 \r
-    case KEY_SAVE_ORDER_CHANGES:\r
-      //\r
-      // Sync the Attempt Order to NVR.\r
-      //\r
-      Status = IScsiConfigOrderAttempts (IfrNvData);\r
-      if (EFI_ERROR (Status)) {\r
+        IScsiConfigUpdateAttempt ();\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
         break;\r
-      }\r
 \r
-      IScsiConfigUpdateAttempt ();\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
-      break;\r
+      case KEY_IGNORE_ORDER_CHANGES:\r
+        CopyMem (\r
+          IfrNvData->DynamicOrderedList,\r
+          OldIfrNvData.DynamicOrderedList,\r
+          sizeof (IfrNvData->DynamicOrderedList)\r
+          );\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
+        break;\r
 \r
-    case KEY_IGNORE_ORDER_CHANGES:\r
-      CopyMem (\r
-        IfrNvData->DynamicOrderedList,\r
-        OldIfrNvData.DynamicOrderedList,\r
-        sizeof (IfrNvData->DynamicOrderedList)\r
-        );\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
-      break;\r
+      case KEY_SAVE_DELETE_ATTEMPT:\r
+        //\r
+        // Delete the Attempt Order from NVR\r
+        //\r
+        Status = IScsiConfigDeleteAttempts (IfrNvData);\r
+        if (EFI_ERROR (Status)) {\r
+          break;\r
+        }\r
 \r
-    case KEY_SAVE_DELETE_ATTEMPT:\r
-      //\r
-      // Delete the Attempt Order from NVR\r
-      //\r
-      Status = IScsiConfigDeleteAttempts (IfrNvData);\r
-      if (EFI_ERROR (Status)) {\r
+        IScsiConfigUpdateAttempt ();\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
         break;\r
-      }\r
 \r
-      IScsiConfigUpdateAttempt ();\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
-      break;\r
+      case KEY_IGNORE_DELETE_ATTEMPT:\r
+        CopyMem (\r
+          IfrNvData->DeleteAttemptList,\r
+          OldIfrNvData.DeleteAttemptList,\r
+          sizeof (IfrNvData->DeleteAttemptList)\r
+          );\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
+        break;\r
 \r
-    case KEY_IGNORE_DELETE_ATTEMPT:\r
-      CopyMem (\r
-        IfrNvData->DeleteAttemptList,\r
-        OldIfrNvData.DeleteAttemptList,\r
-        sizeof (IfrNvData->DeleteAttemptList)\r
-        );\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
-      break;\r
+      case KEY_IP_MODE:\r
+        switch (Value->u8) {\r
+          case IP_MODE_IP6:\r
+            NicInfo = IScsiGetNicInfoByIndex (Private->Current->NicIndex);\r
+            if (NicInfo == NULL) {\r
+              break;\r
+            }\r
+\r
+            if (!NicInfo->Ipv6Available) {\r
+              //\r
+              // Current NIC doesn't Support IPv6, hence use IPv4.\r
+              //\r
+              IfrNvData->IpMode = IP_MODE_IP4;\r
+\r
+              CreatePopUp (\r
+                EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+                &Key,\r
+                L"Current NIC doesn't Support IPv6!",\r
+                NULL\r
+                );\r
+            }\r
+\r
+          case IP_MODE_IP4:\r
+            ZeroMem (IfrNvData->LocalIp, sizeof (IfrNvData->LocalIp));\r
+            ZeroMem (IfrNvData->SubnetMask, sizeof (IfrNvData->SubnetMask));\r
+            ZeroMem (IfrNvData->Gateway, sizeof (IfrNvData->Gateway));\r
+            ZeroMem (IfrNvData->TargetIp, sizeof (IfrNvData->TargetIp));\r
+            Private->Current->AutoConfigureMode = 0;\r
+            ZeroMem (&Private->Current->SessionConfigData.LocalIp, sizeof (EFI_IP_ADDRESS));\r
+            ZeroMem (&Private->Current->SessionConfigData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
+            ZeroMem (&Private->Current->SessionConfigData.Gateway, sizeof (EFI_IP_ADDRESS));\r
+            ZeroMem (&Private->Current->SessionConfigData.TargetIp, sizeof (EFI_IP_ADDRESS));\r
 \r
-    case KEY_IP_MODE:\r
-      switch (Value->u8) {\r
-      case IP_MODE_IP6:\r
-        NicInfo = IScsiGetNicInfoByIndex (Private->Current->NicIndex);\r
-        if(NicInfo == NULL) {\r
-          break;\r
+            break;\r
         }\r
 \r
-        if(!NicInfo->Ipv6Available) {\r
-          //\r
-          // Current NIC doesn't Support IPv6, hence use IPv4.\r
-          //\r
-          IfrNvData->IpMode = IP_MODE_IP4;\r
+        break;\r
 \r
+      case KEY_LOCAL_IP:\r
+        Status = NetLibStrToIp4 (IfrNvData->LocalIp, &HostIp.v4);\r
+        if (EFI_ERROR (Status) ||\r
+            ((Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&\r
+             !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), NTOHL (*(UINT32 *)Private->Current->SessionConfigData.SubnetMask.Addr))))\r
+        {\r
           CreatePopUp (\r
             EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
             &Key,\r
-            L"Current NIC doesn't Support IPv6!",\r
+            L"Invalid IP address!",\r
             NULL\r
             );\r
-        }\r
 \r
-      case IP_MODE_IP4:\r
-        ZeroMem (IfrNvData->LocalIp, sizeof (IfrNvData->LocalIp));\r
-        ZeroMem (IfrNvData->SubnetMask, sizeof (IfrNvData->SubnetMask));\r
-        ZeroMem (IfrNvData->Gateway, sizeof (IfrNvData->Gateway));\r
-        ZeroMem (IfrNvData->TargetIp, sizeof (IfrNvData->TargetIp));\r
-        Private->Current->AutoConfigureMode = 0;\r
-        ZeroMem (&Private->Current->SessionConfigData.LocalIp, sizeof (EFI_IP_ADDRESS));\r
-        ZeroMem (&Private->Current->SessionConfigData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
-        ZeroMem (&Private->Current->SessionConfigData.Gateway, sizeof (EFI_IP_ADDRESS));\r
-        ZeroMem (&Private->Current->SessionConfigData.TargetIp, sizeof (EFI_IP_ADDRESS));\r
+          Status = EFI_INVALID_PARAMETER;\r
+        } else {\r
+          CopyMem (&Private->Current->SessionConfigData.LocalIp, &HostIp.v4, sizeof (HostIp.v4));\r
+        }\r
 \r
         break;\r
-      }\r
 \r
-      break;\r
+      case KEY_SUBNET_MASK:\r
+        Status = NetLibStrToIp4 (IfrNvData->SubnetMask, &SubnetMask.v4);\r
+        if (EFI_ERROR (Status) || ((SubnetMask.Addr[0] != 0) && (IScsiGetSubnetMaskPrefixLength (&SubnetMask.v4) == 0))) {\r
+          CreatePopUp (\r
+            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+            &Key,\r
+            L"Invalid Subnet Mask!",\r
+            NULL\r
+            );\r
 \r
-    case KEY_LOCAL_IP:\r
-      Status = NetLibStrToIp4 (IfrNvData->LocalIp, &HostIp.v4);\r
-      if (EFI_ERROR (Status) ||\r
-          ((Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&\r
-           !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), NTOHL(*(UINT32*)Private->Current->SessionConfigData.SubnetMask.Addr)))) {\r
-        CreatePopUp (\r
-          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-          &Key,\r
-          L"Invalid IP address!",\r
-          NULL\r
-          );\r
+          Status = EFI_INVALID_PARAMETER;\r
+        } else {\r
+          CopyMem (&Private->Current->SessionConfigData.SubnetMask, &SubnetMask.v4, sizeof (SubnetMask.v4));\r
+        }\r
 \r
-        Status = EFI_INVALID_PARAMETER;\r
-      } else {\r
-        CopyMem (&Private->Current->SessionConfigData.LocalIp, &HostIp.v4, sizeof (HostIp.v4));\r
-      }\r
+        break;\r
 \r
-      break;\r
+      case KEY_GATE_WAY:\r
+        Status = NetLibStrToIp4 (IfrNvData->Gateway, &Gateway.v4);\r
+        if (EFI_ERROR (Status) ||\r
+            ((Gateway.Addr[0] != 0) &&\r
+             (Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&\r
+             !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL (*(UINT32 *)Private->Current->SessionConfigData.SubnetMask.Addr))))\r
+        {\r
+          CreatePopUp (\r
+            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+            &Key,\r
+            L"Invalid Gateway!",\r
+            NULL\r
+            );\r
+          Status = EFI_INVALID_PARAMETER;\r
+        } else {\r
+          CopyMem (&Private->Current->SessionConfigData.Gateway, &Gateway.v4, sizeof (Gateway.v4));\r
+        }\r
 \r
-    case KEY_SUBNET_MASK:\r
-      Status = NetLibStrToIp4 (IfrNvData->SubnetMask, &SubnetMask.v4);\r
-      if (EFI_ERROR (Status) || ((SubnetMask.Addr[0] != 0) && (IScsiGetSubnetMaskPrefixLength (&SubnetMask.v4) == 0))) {\r
-        CreatePopUp (\r
-          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-          &Key,\r
-          L"Invalid Subnet Mask!",\r
-          NULL\r
-          );\r
+        break;\r
 \r
-        Status = EFI_INVALID_PARAMETER;\r
-      } else {\r
-        CopyMem (&Private->Current->SessionConfigData.SubnetMask, &SubnetMask.v4, sizeof (SubnetMask.v4));\r
-      }\r
+      case KEY_TARGET_IP:\r
+        UnicodeStrToAsciiStrS (IfrNvData->TargetIp, IpString, sizeof (IpString));\r
+        Status = IScsiAsciiStrToIp (IpString, IfrNvData->IpMode, &HostIp);\r
+        if (EFI_ERROR (Status) || !IpIsUnicast (&HostIp, IfrNvData->IpMode)) {\r
+          //\r
+          // The target is expressed in URL format or an invalid Ip address, just save.\r
+          //\r
+          Private->Current->SessionConfigData.DnsMode = TRUE;\r
+          ZeroMem (&Private->Current->SessionConfigData.TargetIp, sizeof (Private->Current->SessionConfigData.TargetIp));\r
+          UnicodeStrToAsciiStrS (IfrNvData->TargetIp, Private->Current->SessionConfigData.TargetUrl, ISCSI_NAME_MAX_SIZE);\r
+        } else {\r
+          Private->Current->SessionConfigData.DnsMode = FALSE;\r
+          CopyMem (&Private->Current->SessionConfigData.TargetIp, &HostIp, sizeof (HostIp));\r
+        }\r
 \r
-      break;\r
+        break;\r
 \r
-    case KEY_GATE_WAY:\r
-      Status = NetLibStrToIp4 (IfrNvData->Gateway, &Gateway.v4);\r
-      if (EFI_ERROR (Status) ||\r
-          ((Gateway.Addr[0] != 0) &&\r
-           (Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&\r
-           !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL(*(UINT32*)Private->Current->SessionConfigData.SubnetMask.Addr)))) {\r
-        CreatePopUp (\r
-          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-          &Key,\r
-          L"Invalid Gateway!",\r
-          NULL\r
-          );\r
-        Status = EFI_INVALID_PARAMETER;\r
-      } else {\r
-        CopyMem (&Private->Current->SessionConfigData.Gateway, &Gateway.v4, sizeof (Gateway.v4));\r
-      }\r
+      case KEY_TARGET_NAME:\r
+        UnicodeStrToAsciiStrS (IfrNvData->TargetName, IScsiName, ISCSI_NAME_MAX_SIZE);\r
+        Status = IScsiNormalizeName (IScsiName, AsciiStrLen (IScsiName));\r
+        if (EFI_ERROR (Status)) {\r
+          CreatePopUp (\r
+            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+            &Key,\r
+            L"Invalid iSCSI Name!",\r
+            NULL\r
+            );\r
+        } else {\r
+          AsciiStrCpyS (Private->Current->SessionConfigData.TargetName, ISCSI_NAME_MAX_SIZE, IScsiName);\r
+        }\r
 \r
-      break;\r
+        break;\r
 \r
-    case KEY_TARGET_IP:\r
-      UnicodeStrToAsciiStrS (IfrNvData->TargetIp, IpString, sizeof (IpString));\r
-      Status = IScsiAsciiStrToIp (IpString, IfrNvData->IpMode, &HostIp);\r
-      if (EFI_ERROR (Status) || !IpIsUnicast (&HostIp, IfrNvData->IpMode)) {\r
-      //\r
-      // The target is expressed in URL format or an invalid Ip address, just save.\r
-      //\r
-      Private->Current->SessionConfigData.DnsMode = TRUE;\r
-      ZeroMem (&Private->Current->SessionConfigData.TargetIp, sizeof (Private->Current->SessionConfigData.TargetIp));\r
-      UnicodeStrToAsciiStrS (IfrNvData->TargetIp, Private->Current->SessionConfigData.TargetUrl, ISCSI_NAME_MAX_SIZE);\r
-      } else {\r
-        Private->Current->SessionConfigData.DnsMode = FALSE;\r
-        CopyMem (&Private->Current->SessionConfigData.TargetIp, &HostIp, sizeof (HostIp));\r
-      }\r
+      case KEY_DHCP_ENABLE:\r
+        if (IfrNvData->InitiatorInfoFromDhcp == 0) {\r
+          IfrNvData->TargetInfoFromDhcp = 0;\r
+        }\r
 \r
-      break;\r
+        break;\r
 \r
-    case KEY_TARGET_NAME:\r
-      UnicodeStrToAsciiStrS (IfrNvData->TargetName, IScsiName, ISCSI_NAME_MAX_SIZE);\r
-      Status = IScsiNormalizeName (IScsiName, AsciiStrLen (IScsiName));\r
-      if (EFI_ERROR (Status)) {\r
-        CreatePopUp (\r
-          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-          &Key,\r
-          L"Invalid iSCSI Name!",\r
-          NULL\r
-          );\r
-      } else {\r
-        AsciiStrCpyS (Private->Current->SessionConfigData.TargetName, ISCSI_NAME_MAX_SIZE, IScsiName);\r
-      }\r
+      case KEY_BOOT_LUN:\r
+        UnicodeStrToAsciiStrS (IfrNvData->BootLun, LunString, sizeof (LunString));\r
+        Status = IScsiAsciiStrToLun (LunString, (UINT8 *)&Lun);\r
+        if (EFI_ERROR (Status)) {\r
+          CreatePopUp (\r
+            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+            &Key,\r
+            L"Invalid LUN string!",\r
+            NULL\r
+            );\r
+        } else {\r
+          CopyMem (Private->Current->SessionConfigData.BootLun, &Lun, sizeof (Lun));\r
+        }\r
 \r
-      break;\r
+        break;\r
 \r
-    case KEY_DHCP_ENABLE:\r
-      if (IfrNvData->InitiatorInfoFromDhcp == 0) {\r
-        IfrNvData->TargetInfoFromDhcp = 0;\r
-      }\r
+      case KEY_AUTH_TYPE:\r
+        switch (Value->u8) {\r
+          case ISCSI_AUTH_TYPE_CHAP:\r
+            IfrNvData->CHAPType = ISCSI_CHAP_UNI;\r
+            break;\r
+          default:\r
+            break;\r
+        }\r
 \r
-      break;\r
+        break;\r
 \r
-    case KEY_BOOT_LUN:\r
-      UnicodeStrToAsciiStrS (IfrNvData->BootLun, LunString, sizeof (LunString));\r
-      Status = IScsiAsciiStrToLun (LunString, (UINT8 *) &Lun);\r
-      if (EFI_ERROR (Status)) {\r
-        CreatePopUp (\r
-          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-          &Key,\r
-          L"Invalid LUN string!",\r
-          NULL\r
+      case KEY_CHAP_NAME:\r
+        UnicodeStrToAsciiStrS (\r
+          IfrNvData->CHAPName,\r
+          Private->Current->AuthConfigData.CHAP.CHAPName,\r
+          sizeof (Private->Current->AuthConfigData.CHAP.CHAPName)\r
           );\r
-      } else {\r
-        CopyMem (Private->Current->SessionConfigData.BootLun, &Lun, sizeof (Lun));\r
-      }\r
-\r
-      break;\r
-\r
-    case KEY_AUTH_TYPE:\r
-      switch (Value->u8) {\r
-      case ISCSI_AUTH_TYPE_CHAP:\r
-        IfrNvData->CHAPType = ISCSI_CHAP_UNI;\r
-        break;\r
-      default:\r
         break;\r
-      }\r
-\r
-      break;\r
 \r
-    case KEY_CHAP_NAME:\r
-      UnicodeStrToAsciiStrS (\r
-        IfrNvData->CHAPName,\r
-        Private->Current->AuthConfigData.CHAP.CHAPName,\r
-        sizeof (Private->Current->AuthConfigData.CHAP.CHAPName)\r
-        );\r
-      break;\r
-\r
-    case KEY_CHAP_SECRET:\r
-      UnicodeStrToAsciiStrS (\r
-        IfrNvData->CHAPSecret,\r
-        Private->Current->AuthConfigData.CHAP.CHAPSecret,\r
-        sizeof (Private->Current->AuthConfigData.CHAP.CHAPSecret)\r
-        );\r
-      break;\r
+      case KEY_CHAP_SECRET:\r
+        UnicodeStrToAsciiStrS (\r
+          IfrNvData->CHAPSecret,\r
+          Private->Current->AuthConfigData.CHAP.CHAPSecret,\r
+          sizeof (Private->Current->AuthConfigData.CHAP.CHAPSecret)\r
+          );\r
+        break;\r
 \r
-    case KEY_REVERSE_CHAP_NAME:\r
-      UnicodeStrToAsciiStrS (\r
-        IfrNvData->ReverseCHAPName,\r
-        Private->Current->AuthConfigData.CHAP.ReverseCHAPName,\r
-        sizeof (Private->Current->AuthConfigData.CHAP.ReverseCHAPName)\r
-        );\r
-      break;\r
+      case KEY_REVERSE_CHAP_NAME:\r
+        UnicodeStrToAsciiStrS (\r
+          IfrNvData->ReverseCHAPName,\r
+          Private->Current->AuthConfigData.CHAP.ReverseCHAPName,\r
+          sizeof (Private->Current->AuthConfigData.CHAP.ReverseCHAPName)\r
+          );\r
+        break;\r
 \r
-    case KEY_REVERSE_CHAP_SECRET:\r
-      UnicodeStrToAsciiStrS (\r
-        IfrNvData->ReverseCHAPSecret,\r
-        Private->Current->AuthConfigData.CHAP.ReverseCHAPSecret,\r
-        sizeof (Private->Current->AuthConfigData.CHAP.ReverseCHAPSecret)\r
-        );\r
-      break;\r
+      case KEY_REVERSE_CHAP_SECRET:\r
+        UnicodeStrToAsciiStrS (\r
+          IfrNvData->ReverseCHAPSecret,\r
+          Private->Current->AuthConfigData.CHAP.ReverseCHAPSecret,\r
+          sizeof (Private->Current->AuthConfigData.CHAP.ReverseCHAPSecret)\r
+          );\r
+        break;\r
 \r
-    case KEY_CONFIG_ISID:\r
-      IScsiParseIsIdFromString (IfrNvData->IsId, Private->Current->SessionConfigData.IsId);\r
-      IScsiConvertIsIdToString (IfrNvData->IsId, Private->Current->SessionConfigData.IsId);\r
+      case KEY_CONFIG_ISID:\r
+        IScsiParseIsIdFromString (IfrNvData->IsId, Private->Current->SessionConfigData.IsId);\r
+        IScsiConvertIsIdToString (IfrNvData->IsId, Private->Current->SessionConfigData.IsId);\r
 \r
-      break;\r
+        break;\r
 \r
-    default:\r
-      break;\r
+      default:\r
+        break;\r
     }\r
   }\r
 \r
@@ -3788,7 +3784,7 @@ IScsiFormCallback (
     // Pass changed uncommitted data back to Form Browser.\r
     //\r
     BufferSize = sizeof (ISCSI_CONFIG_IFR_NVDATA);\r
-    HiiSetBrowserData (NULL, NULL, BufferSize, (UINT8 *) IfrNvData, NULL);\r
+    HiiSetBrowserData (NULL, NULL, BufferSize, (UINT8 *)IfrNvData, NULL);\r
   }\r
 \r
   FreePool (IfrNvData);\r
@@ -3797,7 +3793,6 @@ IScsiFormCallback (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Initialize the iSCSI configuration form.\r
 \r
@@ -3812,16 +3807,16 @@ IScsiConfigFormInit (
   IN EFI_HANDLE  DriverBindingHandle\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  ISCSI_FORM_CALLBACK_INFO    *CallbackInfo;\r
+  EFI_STATUS                Status;\r
+  ISCSI_FORM_CALLBACK_INFO  *CallbackInfo;\r
 \r
-  CallbackInfo = (ISCSI_FORM_CALLBACK_INFO *) AllocateZeroPool (sizeof (ISCSI_FORM_CALLBACK_INFO));\r
+  CallbackInfo = (ISCSI_FORM_CALLBACK_INFO *)AllocateZeroPool (sizeof (ISCSI_FORM_CALLBACK_INFO));\r
   if (CallbackInfo == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  CallbackInfo->Signature   = ISCSI_FORM_CALLBACK_INFO_SIGNATURE;\r
-  CallbackInfo->Current     = NULL;\r
+  CallbackInfo->Signature = ISCSI_FORM_CALLBACK_INFO_SIGNATURE;\r
+  CallbackInfo->Current   = NULL;\r
 \r
   CallbackInfo->ConfigAccess.ExtractConfig = IScsiFormExtractConfig;\r
   CallbackInfo->ConfigAccess.RouteConfig   = IScsiFormRouteConfig;\r
@@ -3859,7 +3854,7 @@ IScsiConfigFormInit (
            &CallbackInfo->ConfigAccess,\r
            NULL\r
            );\r
-    FreePool(CallbackInfo);\r
+    FreePool (CallbackInfo);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
@@ -3868,7 +3863,6 @@ IScsiConfigFormInit (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Unload the iSCSI configuration form, this includes: delete all the iSCSI\r
   configuration entries, uninstall the form callback protocol, and\r
@@ -3885,13 +3879,13 @@ IScsiConfigFormUnload (
   IN EFI_HANDLE  DriverBindingHandle\r
   )\r
 {\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
-  ISCSI_NIC_INFO              *NicInfo;\r
-  LIST_ENTRY                  *Entry;\r
-  EFI_STATUS                  Status;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *AttemptConfigData;\r
+  ISCSI_NIC_INFO               *NicInfo;\r
+  LIST_ENTRY                   *Entry;\r
+  EFI_STATUS                   Status;\r
 \r
   while (!IsListEmpty (&mPrivate->AttemptConfigs)) {\r
-    Entry = NetListRemoveHead (&mPrivate->AttemptConfigs);\r
+    Entry             = NetListRemoveHead (&mPrivate->AttemptConfigs);\r
     AttemptConfigData = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);\r
     FreePool (AttemptConfigData);\r
     mPrivate->AttemptCount--;\r
@@ -3900,7 +3894,7 @@ IScsiConfigFormUnload (
   ASSERT (mPrivate->AttemptCount == 0);\r
 \r
   while (!IsListEmpty (&mPrivate->NicInfoList)) {\r
-    Entry = NetListRemoveHead (&mPrivate->NicInfoList);\r
+    Entry   = NetListRemoveHead (&mPrivate->NicInfoList);\r
     NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);\r
     FreePool (NicInfo);\r
     mPrivate->NicCount--;\r
index 2125351ce8526077c0820fcd9fe614175d7e1647..1f9ec1fdb7da6146babc9ba030d98484bb9102e7 100644 (file)
@@ -14,10 +14,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 typedef struct _ISCSI_FORM_CALLBACK_INFO ISCSI_FORM_CALLBACK_INFO;\r
 \r
-extern UINT8                       IScsiConfigVfrBin[];\r
-extern UINT8                       IScsiDxeStrings[];\r
-extern ISCSI_FORM_CALLBACK_INFO    *mCallbackInfo;\r
-\r
+extern UINT8                     IScsiConfigVfrBin[];\r
+extern UINT8                     IScsiDxeStrings[];\r
+extern ISCSI_FORM_CALLBACK_INFO  *mCallbackInfo;\r
 \r
 #define VAR_OFFSET(Field)    \\r
   ((UINT16) ((UINTN) &(((ISCSI_CONFIG_IFR_NVDATA *) 0)->Field)))\r
@@ -25,65 +24,64 @@ extern ISCSI_FORM_CALLBACK_INFO    *mCallbackInfo;
 #define QUESTION_ID(Field)   \\r
   ((UINT16) (VAR_OFFSET (Field) + CONFIG_OPTION_OFFSET))\r
 \r
-#define DYNAMIC_ONE_OF_VAR_OFFSET           VAR_OFFSET  (Enabled)\r
-#define DYNAMIC_ORDERED_LIST_QUESTION_ID    QUESTION_ID (DynamicOrderedList)\r
-#define DYNAMIC_ORDERED_LIST_VAR_OFFSET     VAR_OFFSET  (DynamicOrderedList)\r
-#define ATTEMPT_DEL_QUESTION_ID             QUESTION_ID (DeleteAttemptList)\r
-#define ATTEMPT_DEL_VAR_OFFSET              VAR_OFFSET  (DeleteAttemptList)\r
-#define ATTEMPT_ADD_QUESTION_ID             QUESTION_ID (AddAttemptList)\r
-#define ATTEMPT_ADD_VAR_OFFSET              VAR_OFFSET  (AddAttemptList)\r
+#define DYNAMIC_ONE_OF_VAR_OFFSET         VAR_OFFSET  (Enabled)\r
+#define DYNAMIC_ORDERED_LIST_QUESTION_ID  QUESTION_ID (DynamicOrderedList)\r
+#define DYNAMIC_ORDERED_LIST_VAR_OFFSET   VAR_OFFSET  (DynamicOrderedList)\r
+#define ATTEMPT_DEL_QUESTION_ID           QUESTION_ID (DeleteAttemptList)\r
+#define ATTEMPT_DEL_VAR_OFFSET            VAR_OFFSET  (DeleteAttemptList)\r
+#define ATTEMPT_ADD_QUESTION_ID           QUESTION_ID (AddAttemptList)\r
+#define ATTEMPT_ADD_VAR_OFFSET            VAR_OFFSET  (AddAttemptList)\r
 \r
 //\r
 // Define QuestionId and OffSet for Keywords.\r
 //\r
-#define ATTEMPT_MAC_ADDR_VAR_OFFSET                  VAR_OFFSET  (ISCSIMacAddr)\r
-#define ATTEMPT_ATTEMPT_NAME_QUESTION_ID             QUESTION_ID (ISCSIAttemptName)\r
-#define ATTEMPT_ATTEMPT_NAME_VAR_OFFSET              VAR_OFFSET  (ISCSIAttemptName)\r
-#define ATTEMPT_BOOTENABLE_QUESTION_ID               QUESTION_ID (ISCSIBootEnableList)\r
-#define ATTEMPT_BOOTENABLE_VAR_OFFSET                VAR_OFFSET  (ISCSIBootEnableList)\r
-#define ATTEMPT_ADDRESS_TYPE_QUESTION_ID             QUESTION_ID (ISCSIIpAddressTypeList)\r
-#define ATTEMPT_ADDRESS_TYPE_VAR_OFFSET              VAR_OFFSET  (ISCSIIpAddressTypeList)\r
-#define ATTEMPT_CONNECT_RETRY_QUESTION_ID            QUESTION_ID (ISCSIConnectRetry)\r
-#define ATTEMPT_CONNECT_RETRY_VAR_OFFSET             VAR_OFFSET  (ISCSIConnectRetry)\r
-#define ATTEMPT_CONNECT_TIMEOUT_QUESTION_ID          QUESTION_ID (ISCSIConnectTimeout)\r
-#define ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET           VAR_OFFSET  (ISCSIConnectTimeout)\r
-#define ATTEMPT_ISID_QUESTION_ID                     QUESTION_ID (Keyword->ISCSIIsId)\r
-#define ATTEMPT_ISID_VAR_OFFSET                      VAR_OFFSET  (Keyword->ISCSIIsId)\r
-#define ATTEMPT_INITIATOR_VIA_DHCP_QUESTION_ID       QUESTION_ID (ISCSIInitiatorInfoViaDHCP)\r
-#define ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET        VAR_OFFSET  (ISCSIInitiatorInfoViaDHCP)\r
-#define ATTEMPT_INITIATOR_IP_ADDRESS_QUESTION_ID     QUESTION_ID (Keyword->ISCSIInitiatorIpAddress)\r
-#define ATTEMPT_INITIATOR_IP_ADDRESS_VAR_OFFSET      VAR_OFFSET  (Keyword->ISCSIInitiatorIpAddress)\r
-#define ATTEMPT_INITIATOR_NET_MASK_QUESTION_ID       QUESTION_ID (Keyword->ISCSIInitiatorNetmask)\r
-#define ATTEMPT_INITIATOR_NET_MASK_VAR_OFFSET        VAR_OFFSET  (Keyword->ISCSIInitiatorNetmask)\r
-#define ATTEMPT_INITIATOR_GATE_WAY_QUESTION_ID       QUESTION_ID (Keyword->ISCSIInitiatorGateway)\r
-#define ATTEMPT_INITIATOR_GATE_WAY_VAR_OFFSET        VAR_OFFSET  (Keyword->ISCSIInitiatorGateway)\r
-#define ATTEMPT_TARGET_VIA_DHCP_QUESTION_ID          QUESTION_ID (ISCSITargetInfoViaDHCP)\r
-#define ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET           VAR_OFFSET  (ISCSITargetInfoViaDHCP)\r
-#define ATTEMPT_TARGET_NAME_QUESTION_ID              QUESTION_ID (Keyword->ISCSITargetName)\r
-#define ATTEMPT_TARGET_NAME_VAR_OFFSET               VAR_OFFSET  (Keyword->ISCSITargetName)\r
-#define ATTEMPT_TARGET_IP_ADDRESS_QUESTION_ID        QUESTION_ID (Keyword->ISCSITargetIpAddress)\r
-#define ATTEMPT_TARGET_IP_ADDRESS_VAR_OFFSET         VAR_OFFSET  (Keyword->ISCSITargetIpAddress)\r
-#define ATTEMPT_TARGET_TCP_PORT_QUESTION_ID          QUESTION_ID (ISCSITargetTcpPort)\r
-#define ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET           VAR_OFFSET  (ISCSITargetTcpPort)\r
-#define ATTEMPT_LUN_QUESTION_ID                      QUESTION_ID (Keyword->ISCSILun)\r
-#define ATTEMPT_LUN_VAR_OFFSET                       VAR_OFFSET  (Keyword->ISCSILun)\r
-#define ATTEMPT_AUTHENTICATION_METHOD_QUESTION_ID    QUESTION_ID (ISCSIAuthenticationMethod)\r
-#define ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET     VAR_OFFSET  (ISCSIAuthenticationMethod)\r
-#define ATTEMPT_CHARTYPE_QUESTION_ID                 QUESTION_ID (ISCSIChapType)\r
-#define ATTEMPT_CHARTYPE_VAR_OFFSET                  VAR_OFFSET  (ISCSIChapType)\r
-#define ATTEMPT_CHAR_USER_NAME_QUESTION_ID           QUESTION_ID (Keyword->ISCSIChapUsername)\r
-#define ATTEMPT_CHAR_USER_NAME_VAR_OFFSET            VAR_OFFSET  (Keyword->ISCSIChapUsername)\r
-#define ATTEMPT_CHAR_SECRET_QUESTION_ID              QUESTION_ID (Keyword->ISCSIChapSecret)\r
-#define ATTEMPT_CHAR_SECRET_VAR_OFFSET               VAR_OFFSET  (Keyword->ISCSIChapSecret)\r
-#define ATTEMPT_CHAR_REVERSE_USER_NAME_QUESTION_ID   QUESTION_ID (Keyword->ISCSIReverseChapUsername)\r
-#define ATTEMPT_CHAR_REVERSE_USER_NAME_VAR_OFFSET    VAR_OFFSET  (Keyword->ISCSIReverseChapUsername)\r
-#define ATTEMPT_CHAR_REVERSE_SECRET_QUESTION_ID      QUESTION_ID (Keyword->ISCSIReverseChapSecret)\r
-#define ATTEMPT_CHAR_REVERSE_SECRET_VAR_OFFSET       VAR_OFFSET  (Keyword->ISCSIReverseChapSecret)\r
-\r
-\r
-#define ISCSI_INITATOR_NAME_VAR_NAME        L"I_NAME"\r
-\r
-#define ISCSI_CONFIG_VAR_ATTR               (EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE)\r
+#define ATTEMPT_MAC_ADDR_VAR_OFFSET                 VAR_OFFSET  (ISCSIMacAddr)\r
+#define ATTEMPT_ATTEMPT_NAME_QUESTION_ID            QUESTION_ID (ISCSIAttemptName)\r
+#define ATTEMPT_ATTEMPT_NAME_VAR_OFFSET             VAR_OFFSET  (ISCSIAttemptName)\r
+#define ATTEMPT_BOOTENABLE_QUESTION_ID              QUESTION_ID (ISCSIBootEnableList)\r
+#define ATTEMPT_BOOTENABLE_VAR_OFFSET               VAR_OFFSET  (ISCSIBootEnableList)\r
+#define ATTEMPT_ADDRESS_TYPE_QUESTION_ID            QUESTION_ID (ISCSIIpAddressTypeList)\r
+#define ATTEMPT_ADDRESS_TYPE_VAR_OFFSET             VAR_OFFSET  (ISCSIIpAddressTypeList)\r
+#define ATTEMPT_CONNECT_RETRY_QUESTION_ID           QUESTION_ID (ISCSIConnectRetry)\r
+#define ATTEMPT_CONNECT_RETRY_VAR_OFFSET            VAR_OFFSET  (ISCSIConnectRetry)\r
+#define ATTEMPT_CONNECT_TIMEOUT_QUESTION_ID         QUESTION_ID (ISCSIConnectTimeout)\r
+#define ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET          VAR_OFFSET  (ISCSIConnectTimeout)\r
+#define ATTEMPT_ISID_QUESTION_ID                    QUESTION_ID (Keyword->ISCSIIsId)\r
+#define ATTEMPT_ISID_VAR_OFFSET                     VAR_OFFSET  (Keyword->ISCSIIsId)\r
+#define ATTEMPT_INITIATOR_VIA_DHCP_QUESTION_ID      QUESTION_ID (ISCSIInitiatorInfoViaDHCP)\r
+#define ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET       VAR_OFFSET  (ISCSIInitiatorInfoViaDHCP)\r
+#define ATTEMPT_INITIATOR_IP_ADDRESS_QUESTION_ID    QUESTION_ID (Keyword->ISCSIInitiatorIpAddress)\r
+#define ATTEMPT_INITIATOR_IP_ADDRESS_VAR_OFFSET     VAR_OFFSET  (Keyword->ISCSIInitiatorIpAddress)\r
+#define ATTEMPT_INITIATOR_NET_MASK_QUESTION_ID      QUESTION_ID (Keyword->ISCSIInitiatorNetmask)\r
+#define ATTEMPT_INITIATOR_NET_MASK_VAR_OFFSET       VAR_OFFSET  (Keyword->ISCSIInitiatorNetmask)\r
+#define ATTEMPT_INITIATOR_GATE_WAY_QUESTION_ID      QUESTION_ID (Keyword->ISCSIInitiatorGateway)\r
+#define ATTEMPT_INITIATOR_GATE_WAY_VAR_OFFSET       VAR_OFFSET  (Keyword->ISCSIInitiatorGateway)\r
+#define ATTEMPT_TARGET_VIA_DHCP_QUESTION_ID         QUESTION_ID (ISCSITargetInfoViaDHCP)\r
+#define ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET          VAR_OFFSET  (ISCSITargetInfoViaDHCP)\r
+#define ATTEMPT_TARGET_NAME_QUESTION_ID             QUESTION_ID (Keyword->ISCSITargetName)\r
+#define ATTEMPT_TARGET_NAME_VAR_OFFSET              VAR_OFFSET  (Keyword->ISCSITargetName)\r
+#define ATTEMPT_TARGET_IP_ADDRESS_QUESTION_ID       QUESTION_ID (Keyword->ISCSITargetIpAddress)\r
+#define ATTEMPT_TARGET_IP_ADDRESS_VAR_OFFSET        VAR_OFFSET  (Keyword->ISCSITargetIpAddress)\r
+#define ATTEMPT_TARGET_TCP_PORT_QUESTION_ID         QUESTION_ID (ISCSITargetTcpPort)\r
+#define ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET          VAR_OFFSET  (ISCSITargetTcpPort)\r
+#define ATTEMPT_LUN_QUESTION_ID                     QUESTION_ID (Keyword->ISCSILun)\r
+#define ATTEMPT_LUN_VAR_OFFSET                      VAR_OFFSET  (Keyword->ISCSILun)\r
+#define ATTEMPT_AUTHENTICATION_METHOD_QUESTION_ID   QUESTION_ID (ISCSIAuthenticationMethod)\r
+#define ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET    VAR_OFFSET  (ISCSIAuthenticationMethod)\r
+#define ATTEMPT_CHARTYPE_QUESTION_ID                QUESTION_ID (ISCSIChapType)\r
+#define ATTEMPT_CHARTYPE_VAR_OFFSET                 VAR_OFFSET  (ISCSIChapType)\r
+#define ATTEMPT_CHAR_USER_NAME_QUESTION_ID          QUESTION_ID (Keyword->ISCSIChapUsername)\r
+#define ATTEMPT_CHAR_USER_NAME_VAR_OFFSET           VAR_OFFSET  (Keyword->ISCSIChapUsername)\r
+#define ATTEMPT_CHAR_SECRET_QUESTION_ID             QUESTION_ID (Keyword->ISCSIChapSecret)\r
+#define ATTEMPT_CHAR_SECRET_VAR_OFFSET              VAR_OFFSET  (Keyword->ISCSIChapSecret)\r
+#define ATTEMPT_CHAR_REVERSE_USER_NAME_QUESTION_ID  QUESTION_ID (Keyword->ISCSIReverseChapUsername)\r
+#define ATTEMPT_CHAR_REVERSE_USER_NAME_VAR_OFFSET   VAR_OFFSET  (Keyword->ISCSIReverseChapUsername)\r
+#define ATTEMPT_CHAR_REVERSE_SECRET_QUESTION_ID     QUESTION_ID (Keyword->ISCSIReverseChapSecret)\r
+#define ATTEMPT_CHAR_REVERSE_SECRET_VAR_OFFSET      VAR_OFFSET  (Keyword->ISCSIReverseChapSecret)\r
+\r
+#define ISCSI_INITATOR_NAME_VAR_NAME  L"I_NAME"\r
+\r
+#define ISCSI_CONFIG_VAR_ATTR  (EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE)\r
 \r
 #define ISCSI_FORM_CALLBACK_INFO_SIGNATURE  SIGNATURE_32 ('I', 'f', 'c', 'i')\r
 \r
@@ -97,47 +95,47 @@ extern ISCSI_FORM_CALLBACK_INFO    *mCallbackInfo;
 \r
 #pragma pack(1)\r
 struct _ISCSI_ATTEMPT_CONFIG_NVDATA {\r
-  LIST_ENTRY                       Link;\r
-  UINT8                            NicIndex;\r
-  UINT8                            AttemptConfigIndex;\r
-  BOOLEAN                          DhcpSuccess;\r
-  BOOLEAN                          ValidiBFTPath;\r
-  BOOLEAN                          ValidPath;\r
-  UINT8                            AutoConfigureMode;\r
-  EFI_STRING_ID                    AttemptTitleToken;\r
-  EFI_STRING_ID                    AttemptTitleHelpToken;\r
-  CHAR8                            AttemptName[ATTEMPT_NAME_SIZE];\r
-  CHAR8                            MacString[ISCSI_MAX_MAC_STRING_LEN];\r
-  EFI_IP_ADDRESS                   PrimaryDns;\r
-  EFI_IP_ADDRESS                   SecondaryDns;\r
-  EFI_IP_ADDRESS                   DhcpServer;\r
-  ISCSI_SESSION_CONFIG_NVDATA      SessionConfigData;\r
-  UINT8                            AuthenticationType;\r
+  LIST_ENTRY                     Link;\r
+  UINT8                          NicIndex;\r
+  UINT8                          AttemptConfigIndex;\r
+  BOOLEAN                        DhcpSuccess;\r
+  BOOLEAN                        ValidiBFTPath;\r
+  BOOLEAN                        ValidPath;\r
+  UINT8                          AutoConfigureMode;\r
+  EFI_STRING_ID                  AttemptTitleToken;\r
+  EFI_STRING_ID                  AttemptTitleHelpToken;\r
+  CHAR8                          AttemptName[ATTEMPT_NAME_SIZE];\r
+  CHAR8                          MacString[ISCSI_MAX_MAC_STRING_LEN];\r
+  EFI_IP_ADDRESS                 PrimaryDns;\r
+  EFI_IP_ADDRESS                 SecondaryDns;\r
+  EFI_IP_ADDRESS                 DhcpServer;\r
+  ISCSI_SESSION_CONFIG_NVDATA    SessionConfigData;\r
+  UINT8                          AuthenticationType;\r
   union {\r
-    ISCSI_CHAP_AUTH_CONFIG_NVDATA  CHAP;\r
+    ISCSI_CHAP_AUTH_CONFIG_NVDATA    CHAP;\r
   } AuthConfigData;\r
-  BOOLEAN                          AutoConfigureSuccess;\r
-  UINT8                            Actived;\r
+  BOOLEAN                        AutoConfigureSuccess;\r
+  UINT8                          Actived;\r
 };\r
 \r
 ///\r
 /// HII specific Vendor Device Path definition.\r
 ///\r
 typedef struct {\r
-  VENDOR_DEVICE_PATH               VendorDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL         End;\r
+  VENDOR_DEVICE_PATH          VendorDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL    End;\r
 } HII_VENDOR_DEVICE_PATH;\r
 \r
 #pragma pack()\r
 \r
 struct _ISCSI_FORM_CALLBACK_INFO {\r
-  UINT32                           Signature;\r
-  EFI_HANDLE                       DriverHandle;\r
-  EFI_HII_CONFIG_ACCESS_PROTOCOL   ConfigAccess;\r
-  UINT16                           *KeyList;\r
-  VOID                             *FormBuffer;\r
-  EFI_HII_HANDLE                   RegisteredHandle;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA      *Current;\r
+  UINT32                            Signature;\r
+  EFI_HANDLE                        DriverHandle;\r
+  EFI_HII_CONFIG_ACCESS_PROTOCOL    ConfigAccess;\r
+  UINT16                            *KeyList;\r
+  VOID                              *FormBuffer;\r
+  EFI_HII_HANDLE                    RegisteredHandle;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA       *Current;\r
 };\r
 \r
 /**\r
@@ -158,11 +156,11 @@ struct _ISCSI_FORM_CALLBACK_INFO {
 **/\r
 EFI_STATUS\r
 IScsiCreateOpCode (\r
-  IN  UINT16                        StartLabelNumber,\r
-  OUT VOID                          **StartOpCodeHandle,\r
-  OUT EFI_IFR_GUID_LABEL            **StartLabel,\r
-  OUT VOID                          **EndOpCodeHandle,\r
-  OUT EFI_IFR_GUID_LABEL            **EndLabel\r
+  IN  UINT16              StartLabelNumber,\r
+  OUT VOID                **StartOpCodeHandle,\r
+  OUT EFI_IFR_GUID_LABEL  **StartLabel,\r
+  OUT VOID                **EndOpCodeHandle,\r
+  OUT EFI_IFR_GUID_LABEL  **EndLabel\r
   );\r
 \r
 /**\r
@@ -215,7 +213,7 @@ IScsiConfigUpdateAttempt (
 **/\r
 ISCSI_ATTEMPT_CONFIG_NVDATA *\r
 IScsiConfigGetAttemptByConfigIndex (\r
-  IN UINT8                     AttemptConfigIndex\r
+  IN UINT8  AttemptConfigIndex\r
   );\r
 \r
 #endif\r
index 688fb03bf56567f3ea61539eb97f68d7a1176320..bcc892320047804376b58fc948324ced3a53e7d8 100644 (file)
@@ -11,139 +11,139 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include <Guid/IScsiConfigHii.h>\r
 \r
-#define VAR_EQ_TEST_NAME          0x100\r
-#define CONFIGURATION_VARSTORE_ID 0x6666\r
+#define VAR_EQ_TEST_NAME           0x100\r
+#define CONFIGURATION_VARSTORE_ID  0x6666\r
 \r
-#define FORMID_MAIN_FORM          1\r
-#define FORMID_MAC_FORM           2\r
-#define FORMID_ATTEMPT_FORM       3\r
-#define FORMID_ORDER_FORM         4\r
-#define FORMID_DELETE_FORM        5\r
+#define FORMID_MAIN_FORM     1\r
+#define FORMID_MAC_FORM      2\r
+#define FORMID_ATTEMPT_FORM  3\r
+#define FORMID_ORDER_FORM    4\r
+#define FORMID_DELETE_FORM   5\r
 \r
-#define ISCSI_MAX_ATTEMPTS_NUM    FixedPcdGet8 (PcdMaxIScsiAttemptNumber)\r
+#define ISCSI_MAX_ATTEMPTS_NUM  FixedPcdGet8 (PcdMaxIScsiAttemptNumber)\r
 \r
-#define ISCSI_NAME_IFR_MIN_SIZE   4\r
-#define ISCSI_NAME_IFR_MAX_SIZE   223\r
-#define ISCSI_NAME_MAX_SIZE       224\r
+#define ISCSI_NAME_IFR_MIN_SIZE  4\r
+#define ISCSI_NAME_IFR_MAX_SIZE  223\r
+#define ISCSI_NAME_MAX_SIZE      224\r
 \r
-#define ATTEMPT_NAME_LIST_SIZE    96\r
-#define ATTEMPT_NAME_SIZE         12\r
+#define ATTEMPT_NAME_LIST_SIZE  96\r
+#define ATTEMPT_NAME_SIZE       12\r
 \r
-#define CONNECT_MIN_RETRY         0\r
-#define CONNECT_MAX_RETRY         16\r
+#define CONNECT_MIN_RETRY  0\r
+#define CONNECT_MAX_RETRY  16\r
 \r
-#define CONNECT_MIN_TIMEOUT       100\r
-#define CONNECT_MAX_TIMEOUT       20000\r
-#define CONNECT_DEFAULT_TIMEOUT   1000\r
+#define CONNECT_MIN_TIMEOUT      100\r
+#define CONNECT_MAX_TIMEOUT      20000\r
+#define CONNECT_DEFAULT_TIMEOUT  1000\r
 \r
-#define ISCSI_ACTIVE_DISABLED     0\r
-#define ISCSI_ACTIVE_ENABLED      1\r
+#define ISCSI_ACTIVE_DISABLED  0\r
+#define ISCSI_ACTIVE_ENABLED   1\r
 \r
-#define ISCSI_DISABLED            0\r
-#define ISCSI_ENABLED             1\r
-#define ISCSI_ENABLED_FOR_MPIO    2\r
+#define ISCSI_DISABLED          0\r
+#define ISCSI_ENABLED           1\r
+#define ISCSI_ENABLED_FOR_MPIO  2\r
 \r
-#define IP_MODE_IP4               0\r
-#define IP_MODE_IP6               1\r
-#define IP_MODE_AUTOCONFIG        2\r
+#define IP_MODE_IP4         0\r
+#define IP_MODE_IP6         1\r
+#define IP_MODE_AUTOCONFIG  2\r
 \r
-#define ISCSI_AUTH_TYPE_NONE      0\r
-#define ISCSI_AUTH_TYPE_CHAP      1\r
-#define ISCSI_AUTH_TYPE_KRB       2\r
+#define ISCSI_AUTH_TYPE_NONE  0\r
+#define ISCSI_AUTH_TYPE_CHAP  1\r
+#define ISCSI_AUTH_TYPE_KRB   2\r
 \r
-#define IP4_MIN_SIZE              7\r
-#define IP4_MAX_SIZE              15\r
-#define IP4_STR_MAX_SIZE          16\r
+#define IP4_MIN_SIZE      7\r
+#define IP4_MAX_SIZE      15\r
+#define IP4_STR_MAX_SIZE  16\r
 \r
 //\r
 // Macros used for an IPv4 or an IPv6 address.\r
 //\r
-#define IP_MIN_SIZE               2\r
-#define IP_MAX_SIZE               39\r
-#define IP_STR_MAX_SIZE           40\r
-\r
-#define LUN_MIN_SIZE              1\r
-#define LUN_MAX_SIZE              20\r
-#define ISCSI_LUN_STR_MAX_LEN     21\r
-\r
-#define ISCSI_CHAP_UNI            0\r
-#define ISCSI_CHAP_MUTUAL         1\r
-\r
-#define TARGET_PORT_MIN_NUM       0\r
-#define TARGET_PORT_MAX_NUM       65535\r
-#define LABEL_END                 0xffff\r
-\r
-#define KEY_INITIATOR_NAME        0x101\r
-#define KEY_DHCP_ENABLE           0x102\r
-#define KEY_LOCAL_IP              0x103\r
-#define KEY_SUBNET_MASK           0x104\r
-#define KEY_GATE_WAY              0x105\r
-#define KEY_TARGET_IP             0x106\r
-#define KEY_CHAP_NAME             0x107\r
-#define KEY_CHAP_SECRET           0x108\r
-#define KEY_REVERSE_CHAP_NAME     0x109\r
-#define KEY_REVERSE_CHAP_SECRET   0x10a\r
-#define KEY_SAVE_CHANGES          0x10b\r
-#define KEY_TARGET_NAME           0x10c\r
-#define KEY_BOOT_LUN              0x10d\r
-\r
-#define KEY_ADD_ATTEMPT           0x10e\r
-#define KEY_SAVE_ATTEMPT_CONFIG   0x10f\r
-#define KEY_ORDER_ATTEMPT_CONFIG  0x110\r
-#define KEY_SAVE_ORDER_CHANGES    0x111\r
-#define KEY_IGNORE_ORDER_CHANGES  0x112\r
-#define KEY_ATTEMPT_NAME          0x113\r
-#define KEY_SAVE_DELETE_ATTEMPT   0x114\r
-#define KEY_IGNORE_DELETE_ATTEMPT 0x115\r
-#define KEY_DELETE_ATTEMPT        0x116\r
-\r
-#define KEY_IP_MODE               0x11c\r
-#define KEY_AUTH_TYPE             0x11d\r
-#define KEY_CONFIG_ISID           0x11e\r
-\r
-#define ATTEMPT_ENTRY_LABEL       0x9000\r
-#define KEY_ATTEMPT_ENTRY_BASE    0xa000\r
-#define KEY_DE_ATTEMPT_ENTRY_BASE 0xb000\r
-\r
-#define KEY_DEVICE_ENTRY_BASE     0x1000\r
-#define KEY_MAC_ENTRY_BASE        0x2000\r
-#define MAC_ENTRY_LABEL           0x3000\r
-#define ORDER_ENTRY_LABEL         0x4000\r
-#define DELETE_ENTRY_LABEL        0x5000\r
-#define KEYWORD_ENTRY_LABEL       0x6000\r
-#define CONFIG_OPTION_OFFSET      0x9000\r
-\r
-#define ISCSI_CHAP_SECRET_MIN_LEN 12\r
-#define ISCSI_CHAP_SECRET_MAX_LEN 16\r
+#define IP_MIN_SIZE      2\r
+#define IP_MAX_SIZE      39\r
+#define IP_STR_MAX_SIZE  40\r
+\r
+#define LUN_MIN_SIZE           1\r
+#define LUN_MAX_SIZE           20\r
+#define ISCSI_LUN_STR_MAX_LEN  21\r
+\r
+#define ISCSI_CHAP_UNI     0\r
+#define ISCSI_CHAP_MUTUAL  1\r
+\r
+#define TARGET_PORT_MIN_NUM  0\r
+#define TARGET_PORT_MAX_NUM  65535\r
+#define LABEL_END            0xffff\r
+\r
+#define KEY_INITIATOR_NAME       0x101\r
+#define KEY_DHCP_ENABLE          0x102\r
+#define KEY_LOCAL_IP             0x103\r
+#define KEY_SUBNET_MASK          0x104\r
+#define KEY_GATE_WAY             0x105\r
+#define KEY_TARGET_IP            0x106\r
+#define KEY_CHAP_NAME            0x107\r
+#define KEY_CHAP_SECRET          0x108\r
+#define KEY_REVERSE_CHAP_NAME    0x109\r
+#define KEY_REVERSE_CHAP_SECRET  0x10a\r
+#define KEY_SAVE_CHANGES         0x10b\r
+#define KEY_TARGET_NAME          0x10c\r
+#define KEY_BOOT_LUN             0x10d\r
+\r
+#define KEY_ADD_ATTEMPT            0x10e\r
+#define KEY_SAVE_ATTEMPT_CONFIG    0x10f\r
+#define KEY_ORDER_ATTEMPT_CONFIG   0x110\r
+#define KEY_SAVE_ORDER_CHANGES     0x111\r
+#define KEY_IGNORE_ORDER_CHANGES   0x112\r
+#define KEY_ATTEMPT_NAME           0x113\r
+#define KEY_SAVE_DELETE_ATTEMPT    0x114\r
+#define KEY_IGNORE_DELETE_ATTEMPT  0x115\r
+#define KEY_DELETE_ATTEMPT         0x116\r
+\r
+#define KEY_IP_MODE      0x11c\r
+#define KEY_AUTH_TYPE    0x11d\r
+#define KEY_CONFIG_ISID  0x11e\r
+\r
+#define ATTEMPT_ENTRY_LABEL        0x9000\r
+#define KEY_ATTEMPT_ENTRY_BASE     0xa000\r
+#define KEY_DE_ATTEMPT_ENTRY_BASE  0xb000\r
+\r
+#define KEY_DEVICE_ENTRY_BASE  0x1000\r
+#define KEY_MAC_ENTRY_BASE     0x2000\r
+#define MAC_ENTRY_LABEL        0x3000\r
+#define ORDER_ENTRY_LABEL      0x4000\r
+#define DELETE_ENTRY_LABEL     0x5000\r
+#define KEYWORD_ENTRY_LABEL    0x6000\r
+#define CONFIG_OPTION_OFFSET   0x9000\r
+\r
+#define ISCSI_CHAP_SECRET_MIN_LEN  12\r
+#define ISCSI_CHAP_SECRET_MAX_LEN  16\r
 //\r
 // ISCSI_CHAP_SECRET_STORAGE = ISCSI_CHAP_SECRET_MAX_LEN + sizeof (NULL-Terminator)\r
 //\r
 #define ISCSI_CHAP_SECRET_STORAGE  17\r
 \r
-#define ISCSI_CHAP_NAME_MAX_LEN    126\r
-#define ISCSI_CHAP_NAME_STORAGE    127\r
+#define ISCSI_CHAP_NAME_MAX_LEN  126\r
+#define ISCSI_CHAP_NAME_STORAGE  127\r
 \r
-#define KERBEROS_SECRET_MIN_LEN   12\r
-#define KERBEROS_SECRET_MAX_LEN   16\r
-#define KERBEROS_SECRET_STORAGE   17\r
-#define KERBEROS_NAME_MAX_LEN     96\r
-#define KERBEROS_KDC_PORT_MIN_NUM 0\r
-#define KERBEROS_KDC_PORT_MAX_NUM 65535\r
+#define KERBEROS_SECRET_MIN_LEN    12\r
+#define KERBEROS_SECRET_MAX_LEN    16\r
+#define KERBEROS_SECRET_STORAGE    17\r
+#define KERBEROS_NAME_MAX_LEN      96\r
+#define KERBEROS_KDC_PORT_MIN_NUM  0\r
+#define KERBEROS_KDC_PORT_MAX_NUM  65535\r
 \r
-#define ISID_CONFIGURABLE_MIN_LEN 6\r
-#define ISID_CONFIGURABLE_MAX_LEN 12\r
-#define ISID_CONFIGURABLE_STORAGE 13\r
+#define ISID_CONFIGURABLE_MIN_LEN  6\r
+#define ISID_CONFIGURABLE_MAX_LEN  12\r
+#define ISID_CONFIGURABLE_STORAGE  13\r
 \r
 //\r
 // sizeof (EFI_MAC_ADDRESS) * 3\r
 //\r
-#define ISCSI_MAX_MAC_STRING_LEN            96\r
+#define ISCSI_MAX_MAC_STRING_LEN  96\r
 \r
 ///\r
 /// Macro used for target Url.\r
 ///\r
-#define ISCSI_TARGET_URI_MIN_SIZE     0\r
-#define ISCSI_TARGET_URI_MAX_SIZE     255\r
+#define ISCSI_TARGET_URI_MIN_SIZE  0\r
+#define ISCSI_TARGET_URI_MAX_SIZE  255\r
 \r
 #pragma pack(1)\r
 \r
@@ -151,81 +151,81 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // Used by keyword.\r
 //\r
 typedef struct {\r
-  CHAR16  ISCSIIsId[ISID_CONFIGURABLE_STORAGE];\r
-  CHAR16  ISCSIInitiatorIpAddress[IP4_STR_MAX_SIZE];\r
-  CHAR16  ISCSIInitiatorNetmask[IP4_STR_MAX_SIZE];\r
-  CHAR16  ISCSIInitiatorGateway[IP4_STR_MAX_SIZE];\r
-  CHAR16  ISCSITargetName[ISCSI_NAME_MAX_SIZE];\r
-  CHAR16  ISCSITargetIpAddress[ISCSI_TARGET_URI_MAX_SIZE];\r
-  CHAR16  ISCSILun[ISCSI_LUN_STR_MAX_LEN];\r
-  CHAR16  ISCSIChapUsername[ISCSI_CHAP_NAME_STORAGE];\r
-  CHAR16  ISCSIChapSecret[ISCSI_CHAP_SECRET_STORAGE];\r
-  CHAR16  ISCSIReverseChapUsername[ISCSI_CHAP_NAME_STORAGE];\r
-  CHAR16  ISCSIReverseChapSecret[ISCSI_CHAP_SECRET_STORAGE];\r
+  CHAR16    ISCSIIsId[ISID_CONFIGURABLE_STORAGE];\r
+  CHAR16    ISCSIInitiatorIpAddress[IP4_STR_MAX_SIZE];\r
+  CHAR16    ISCSIInitiatorNetmask[IP4_STR_MAX_SIZE];\r
+  CHAR16    ISCSIInitiatorGateway[IP4_STR_MAX_SIZE];\r
+  CHAR16    ISCSITargetName[ISCSI_NAME_MAX_SIZE];\r
+  CHAR16    ISCSITargetIpAddress[ISCSI_TARGET_URI_MAX_SIZE];\r
+  CHAR16    ISCSILun[ISCSI_LUN_STR_MAX_LEN];\r
+  CHAR16    ISCSIChapUsername[ISCSI_CHAP_NAME_STORAGE];\r
+  CHAR16    ISCSIChapSecret[ISCSI_CHAP_SECRET_STORAGE];\r
+  CHAR16    ISCSIReverseChapUsername[ISCSI_CHAP_NAME_STORAGE];\r
+  CHAR16    ISCSIReverseChapSecret[ISCSI_CHAP_SECRET_STORAGE];\r
 } KEYWORD_STR;\r
 \r
 typedef struct _ISCSI_CONFIG_IFR_NVDATA {\r
-  CHAR16  InitiatorName[ISCSI_NAME_MAX_SIZE];\r
-  CHAR16  AttemptName[ATTEMPT_NAME_SIZE];\r
-  UINT8   Enabled;\r
-  UINT8   IpMode;\r
-\r
-  UINT8   ConnectRetryCount;\r
-  UINT8   Padding1;\r
-  UINT16  ConnectTimeout; // Timeout value in milliseconds.\r
-\r
-  UINT8   InitiatorInfoFromDhcp;\r
-  UINT8   TargetInfoFromDhcp;\r
-  CHAR16  LocalIp[IP4_STR_MAX_SIZE];\r
-  CHAR16  SubnetMask[IP4_STR_MAX_SIZE];\r
-  CHAR16  Gateway[IP4_STR_MAX_SIZE];\r
-\r
-  CHAR16  TargetName[ISCSI_NAME_MAX_SIZE];\r
-  CHAR16  TargetIp[ISCSI_TARGET_URI_MAX_SIZE];\r
-  UINT16  TargetPort;\r
-  CHAR16  BootLun[ISCSI_LUN_STR_MAX_LEN];\r
-\r
-  UINT8   AuthenticationType;\r
-\r
-  UINT8   CHAPType;\r
-  CHAR16  CHAPName[ISCSI_CHAP_NAME_STORAGE];\r
-  CHAR16  CHAPSecret[ISCSI_CHAP_SECRET_STORAGE];\r
-  CHAR16  ReverseCHAPName[ISCSI_CHAP_NAME_STORAGE];\r
-  CHAR16  ReverseCHAPSecret[ISCSI_CHAP_SECRET_STORAGE];\r
-\r
-  BOOLEAN MutualRequired;\r
-  UINT8   Padding2;\r
-  CHAR16  KerberosUserName[KERBEROS_NAME_MAX_LEN];\r
-  CHAR16  KerberosUserSecret[KERBEROS_SECRET_STORAGE];\r
-  CHAR16  KerberosKDCName[KERBEROS_NAME_MAX_LEN];\r
-  CHAR16  KerberosKDCRealm[KERBEROS_NAME_MAX_LEN];\r
-  CHAR16  KerberosKDCIp[IP_STR_MAX_SIZE];\r
-  UINT16  KerberosKDCPort;\r
-\r
-  UINT8   DynamicOrderedList[ISCSI_MAX_ATTEMPTS_NUM];\r
-  UINT8   DeleteAttemptList[ISCSI_MAX_ATTEMPTS_NUM];\r
-  UINT8   AddAttemptList[ISCSI_MAX_ATTEMPTS_NUM];\r
-  CHAR16  IsId[ISID_CONFIGURABLE_STORAGE];\r
+  CHAR16         InitiatorName[ISCSI_NAME_MAX_SIZE];\r
+  CHAR16         AttemptName[ATTEMPT_NAME_SIZE];\r
+  UINT8          Enabled;\r
+  UINT8          IpMode;\r
+\r
+  UINT8          ConnectRetryCount;\r
+  UINT8          Padding1;\r
+  UINT16         ConnectTimeout; // Timeout value in milliseconds.\r
+\r
+  UINT8          InitiatorInfoFromDhcp;\r
+  UINT8          TargetInfoFromDhcp;\r
+  CHAR16         LocalIp[IP4_STR_MAX_SIZE];\r
+  CHAR16         SubnetMask[IP4_STR_MAX_SIZE];\r
+  CHAR16         Gateway[IP4_STR_MAX_SIZE];\r
+\r
+  CHAR16         TargetName[ISCSI_NAME_MAX_SIZE];\r
+  CHAR16         TargetIp[ISCSI_TARGET_URI_MAX_SIZE];\r
+  UINT16         TargetPort;\r
+  CHAR16         BootLun[ISCSI_LUN_STR_MAX_LEN];\r
+\r
+  UINT8          AuthenticationType;\r
+\r
+  UINT8          CHAPType;\r
+  CHAR16         CHAPName[ISCSI_CHAP_NAME_STORAGE];\r
+  CHAR16         CHAPSecret[ISCSI_CHAP_SECRET_STORAGE];\r
+  CHAR16         ReverseCHAPName[ISCSI_CHAP_NAME_STORAGE];\r
+  CHAR16         ReverseCHAPSecret[ISCSI_CHAP_SECRET_STORAGE];\r
+\r
+  BOOLEAN        MutualRequired;\r
+  UINT8          Padding2;\r
+  CHAR16         KerberosUserName[KERBEROS_NAME_MAX_LEN];\r
+  CHAR16         KerberosUserSecret[KERBEROS_SECRET_STORAGE];\r
+  CHAR16         KerberosKDCName[KERBEROS_NAME_MAX_LEN];\r
+  CHAR16         KerberosKDCRealm[KERBEROS_NAME_MAX_LEN];\r
+  CHAR16         KerberosKDCIp[IP_STR_MAX_SIZE];\r
+  UINT16         KerberosKDCPort;\r
+\r
+  UINT8          DynamicOrderedList[ISCSI_MAX_ATTEMPTS_NUM];\r
+  UINT8          DeleteAttemptList[ISCSI_MAX_ATTEMPTS_NUM];\r
+  UINT8          AddAttemptList[ISCSI_MAX_ATTEMPTS_NUM];\r
+  CHAR16         IsId[ISID_CONFIGURABLE_STORAGE];\r
 \r
   //\r
   // This will be used by keywords.\r
   //\r
-  CHAR16  ISCSIMacAddr[ISCSI_MAX_MAC_STRING_LEN];\r
-  CHAR16  ISCSIAttemptOrder[ATTEMPT_NAME_LIST_SIZE];\r
-  CHAR16  ISCSIAddAttemptList[ATTEMPT_NAME_LIST_SIZE];\r
-  CHAR16  ISCSIDeleteAttemptList[ATTEMPT_NAME_LIST_SIZE];\r
-  CHAR16  ISCSIDisplayAttemptList[ATTEMPT_NAME_LIST_SIZE];\r
-  CHAR16  ISCSIAttemptName[ATTEMPT_NAME_LIST_SIZE];\r
-  UINT8   ISCSIBootEnableList[ISCSI_MAX_ATTEMPTS_NUM];\r
-  UINT8   ISCSIIpAddressTypeList[ISCSI_MAX_ATTEMPTS_NUM];\r
-  UINT8   ISCSIConnectRetry[ISCSI_MAX_ATTEMPTS_NUM];\r
-  UINT16  ISCSIConnectTimeout[ISCSI_MAX_ATTEMPTS_NUM];\r
-  UINT8   ISCSIInitiatorInfoViaDHCP[ISCSI_MAX_ATTEMPTS_NUM];\r
-  UINT8   ISCSITargetInfoViaDHCP[ISCSI_MAX_ATTEMPTS_NUM];\r
-  UINT16  ISCSITargetTcpPort[ISCSI_MAX_ATTEMPTS_NUM];\r
-  UINT8   ISCSIAuthenticationMethod[ISCSI_MAX_ATTEMPTS_NUM];\r
-  UINT8   ISCSIChapType[ISCSI_MAX_ATTEMPTS_NUM];\r
-  KEYWORD_STR Keyword[ISCSI_MAX_ATTEMPTS_NUM];\r
+  CHAR16         ISCSIMacAddr[ISCSI_MAX_MAC_STRING_LEN];\r
+  CHAR16         ISCSIAttemptOrder[ATTEMPT_NAME_LIST_SIZE];\r
+  CHAR16         ISCSIAddAttemptList[ATTEMPT_NAME_LIST_SIZE];\r
+  CHAR16         ISCSIDeleteAttemptList[ATTEMPT_NAME_LIST_SIZE];\r
+  CHAR16         ISCSIDisplayAttemptList[ATTEMPT_NAME_LIST_SIZE];\r
+  CHAR16         ISCSIAttemptName[ATTEMPT_NAME_LIST_SIZE];\r
+  UINT8          ISCSIBootEnableList[ISCSI_MAX_ATTEMPTS_NUM];\r
+  UINT8          ISCSIIpAddressTypeList[ISCSI_MAX_ATTEMPTS_NUM];\r
+  UINT8          ISCSIConnectRetry[ISCSI_MAX_ATTEMPTS_NUM];\r
+  UINT16         ISCSIConnectTimeout[ISCSI_MAX_ATTEMPTS_NUM];\r
+  UINT8          ISCSIInitiatorInfoViaDHCP[ISCSI_MAX_ATTEMPTS_NUM];\r
+  UINT8          ISCSITargetInfoViaDHCP[ISCSI_MAX_ATTEMPTS_NUM];\r
+  UINT16         ISCSITargetTcpPort[ISCSI_MAX_ATTEMPTS_NUM];\r
+  UINT8          ISCSIAuthenticationMethod[ISCSI_MAX_ATTEMPTS_NUM];\r
+  UINT8          ISCSIChapType[ISCSI_MAX_ATTEMPTS_NUM];\r
+  KEYWORD_STR    Keyword[ISCSI_MAX_ATTEMPTS_NUM];\r
 } ISCSI_CONFIG_IFR_NVDATA;\r
 #pragma pack()\r
 \r
index 2c77e99f983397f4b62db8391f52937410d9e4d0..4af01a18a83bb2cf1d75fd2a08a70442fe61a018 100644 (file)
@@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "IScsiImpl.h"\r
 \r
-\r
 /**\r
   Extract the Root Path option and get the required target information.\r
 \r
@@ -27,46 +26,47 @@ EFI_STATUS
 IScsiDhcpExtractRootPath (\r
   IN      CHAR8                        *RootPath,\r
   IN      UINT8                        Length,\r
-  IN OUT  ISCSI_ATTEMPT_CONFIG_NVDATA *ConfigData\r
+  IN OUT  ISCSI_ATTEMPT_CONFIG_NVDATA  *ConfigData\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  UINT8                       IScsiRootPathIdLen;\r
-  CHAR8                       *TmpStr;\r
-  ISCSI_ROOT_PATH_FIELD       Fields[RP_FIELD_IDX_MAX];\r
-  ISCSI_ROOT_PATH_FIELD       *Field;\r
-  UINT32                      FieldIndex;\r
-  UINT8                       Index;\r
-  ISCSI_SESSION_CONFIG_NVDATA *ConfigNvData;\r
-  EFI_IP_ADDRESS              Ip;\r
-  UINT8                       IpMode;\r
+  EFI_STATUS                   Status;\r
+  UINT8                        IScsiRootPathIdLen;\r
+  CHAR8                        *TmpStr;\r
+  ISCSI_ROOT_PATH_FIELD        Fields[RP_FIELD_IDX_MAX];\r
+  ISCSI_ROOT_PATH_FIELD        *Field;\r
+  UINT32                       FieldIndex;\r
+  UINT8                        Index;\r
+  ISCSI_SESSION_CONFIG_NVDATA  *ConfigNvData;\r
+  EFI_IP_ADDRESS               Ip;\r
+  UINT8                        IpMode;\r
 \r
   ConfigNvData = &ConfigData->SessionConfigData;\r
 \r
   //\r
   // "iscsi:"<servername>":"<protocol>":"<port>":"<LUN>":"<targetname>\r
   //\r
-  IScsiRootPathIdLen = (UINT8) AsciiStrLen (ISCSI_ROOT_PATH_ID);\r
+  IScsiRootPathIdLen = (UINT8)AsciiStrLen (ISCSI_ROOT_PATH_ID);\r
 \r
   if ((Length <= IScsiRootPathIdLen) || (CompareMem (RootPath, ISCSI_ROOT_PATH_ID, IScsiRootPathIdLen) != 0)) {\r
     return EFI_NOT_FOUND;\r
   }\r
+\r
   //\r
   // Skip the iSCSI RootPath ID "iscsi:".\r
   //\r
   RootPath += IScsiRootPathIdLen;\r
-  Length  = (UINT8) (Length - IScsiRootPathIdLen);\r
+  Length    = (UINT8)(Length - IScsiRootPathIdLen);\r
 \r
-  TmpStr  = (CHAR8 *) AllocatePool (Length + 1);\r
+  TmpStr = (CHAR8 *)AllocatePool (Length + 1);\r
   if (TmpStr == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   CopyMem (TmpStr, RootPath, Length);\r
-  TmpStr[Length]  = '\0';\r
+  TmpStr[Length] = '\0';\r
 \r
-  Index           = 0;\r
-  FieldIndex      = RP_FIELD_IDX_SERVERNAME;\r
+  Index      = 0;\r
+  FieldIndex = RP_FIELD_IDX_SERVERNAME;\r
   ZeroMem (&Fields[0], sizeof (Fields));\r
 \r
   //\r
@@ -88,7 +88,7 @@ IScsiDhcpExtractRootPath (
       }\r
 \r
       if (Fields[FieldIndex].Str != NULL) {\r
-        Fields[FieldIndex].Len = (UINT8) AsciiStrLen (Fields[FieldIndex].Str);\r
+        Fields[FieldIndex].Len = (UINT8)AsciiStrLen (Fields[FieldIndex].Str);\r
       }\r
     }\r
   }\r
@@ -101,15 +101,16 @@ IScsiDhcpExtractRootPath (
   if ((Fields[RP_FIELD_IDX_SERVERNAME].Str == NULL) ||\r
       (Fields[RP_FIELD_IDX_TARGETNAME].Str == NULL) ||\r
       (Fields[RP_FIELD_IDX_PROTOCOL].Len > 1)\r
-      ) {\r
-\r
+      )\r
+  {\r
     Status = EFI_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
   }\r
+\r
   //\r
   // Get the IP address of the target.\r
   //\r
-  Field   = &Fields[RP_FIELD_IDX_SERVERNAME];\r
+  Field = &Fields[RP_FIELD_IDX_SERVERNAME];\r
 \r
   if (ConfigNvData->IpMode < IP_MODE_AUTOCONFIG) {\r
     IpMode = ConfigNvData->IpMode;\r
@@ -125,11 +126,12 @@ IScsiDhcpExtractRootPath (
     if ((Field->Len + 2) > sizeof (ConfigNvData->TargetUrl)) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     CopyMem (&ConfigNvData->TargetUrl, Field->Str, Field->Len);\r
     ConfigNvData->TargetUrl[Field->Len + 1] = '\0';\r
   } else {\r
     ConfigNvData->DnsMode = FALSE;\r
-    ZeroMem(ConfigNvData->TargetUrl, sizeof (ConfigNvData->TargetUrl));\r
+    ZeroMem (ConfigNvData->TargetUrl, sizeof (ConfigNvData->TargetUrl));\r
     Status = IScsiAsciiStrToIp (Field->Str, IpMode, &Ip);\r
     CopyMem (&ConfigNvData->TargetIp, &Ip, sizeof (EFI_IP_ADDRESS));\r
 \r
@@ -137,6 +139,7 @@ IScsiDhcpExtractRootPath (
       goto ON_EXIT;\r
     }\r
   }\r
+\r
   //\r
   // Check the protocol type.\r
   //\r
@@ -145,15 +148,17 @@ IScsiDhcpExtractRootPath (
     Status = EFI_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
   }\r
+\r
   //\r
   // Get the port of the iSCSI target.\r
   //\r
   Field = &Fields[RP_FIELD_IDX_PORT];\r
   if (Field->Str != NULL) {\r
-    ConfigNvData->TargetPort = (UINT16) AsciiStrDecimalToUintn (Field->Str);\r
+    ConfigNvData->TargetPort = (UINT16)AsciiStrDecimalToUintn (Field->Str);\r
   } else {\r
     ConfigNvData->TargetPort = ISCSI_WELL_KNOWN_PORT;\r
   }\r
+\r
   //\r
   // Get the LUN.\r
   //\r
@@ -166,6 +171,7 @@ IScsiDhcpExtractRootPath (
   } else {\r
     ZeroMem (ConfigNvData->BootLun, sizeof (ConfigNvData->BootLun));\r
   }\r
+\r
   //\r
   // Get the target iSCSI Name.\r
   //\r
@@ -175,6 +181,7 @@ IScsiDhcpExtractRootPath (
     Status = EFI_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
   }\r
+\r
   //\r
   // Validate the iSCSI name.\r
   //\r
@@ -220,10 +227,10 @@ IScsiDhcpSelectOffer (
   OUT EFI_DHCP4_PACKET    **NewPacket OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
-  UINT32                  OptionCount;\r
-  EFI_DHCP4_PACKET_OPTION **OptionList;\r
-  UINT32                  Index;\r
+  EFI_STATUS               Status;\r
+  UINT32                   OptionCount;\r
+  EFI_DHCP4_PACKET_OPTION  **OptionList;\r
+  UINT32                   Index;\r
 \r
   if ((Dhcp4Event != Dhcp4RcvdOffer) && (Dhcp4Event != Dhcp4SelectOffer)) {\r
     return EFI_SUCCESS;\r
@@ -231,7 +238,7 @@ IScsiDhcpSelectOffer (
 \r
   OptionCount = 0;\r
 \r
-  Status      = This->Parse (This, Packet, &OptionCount, NULL);\r
+  Status = This->Parse (This, Packet, &OptionCount, NULL);\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     return EFI_NOT_READY;\r
   }\r
@@ -253,9 +260,9 @@ IScsiDhcpSelectOffer (
     }\r
 \r
     Status = IScsiDhcpExtractRootPath (\r
-               (CHAR8 *) &OptionList[Index]->Data[0],\r
+               (CHAR8 *)&OptionList[Index]->Data[0],\r
                OptionList[Index]->Length,\r
-               (ISCSI_ATTEMPT_CONFIG_NVDATA *) Context\r
+               (ISCSI_ATTEMPT_CONFIG_NVDATA *)Context\r
                );\r
 \r
     break;\r
@@ -285,16 +292,16 @@ IScsiDhcpSelectOffer (
 **/\r
 EFI_STATUS\r
 IScsiParseDhcpAck (\r
-  IN     EFI_DHCP4_PROTOCOL          *Dhcp4,\r
-  IN OUT ISCSI_ATTEMPT_CONFIG_NVDATA *ConfigData\r
+  IN     EFI_DHCP4_PROTOCOL           *Dhcp4,\r
+  IN OUT ISCSI_ATTEMPT_CONFIG_NVDATA  *ConfigData\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_DHCP4_MODE_DATA           Dhcp4ModeData;\r
-  UINT32                        OptionCount;\r
-  EFI_DHCP4_PACKET_OPTION       **OptionList;\r
-  UINT32                        Index;\r
-  ISCSI_SESSION_CONFIG_NVDATA   *NvData;\r
+  EFI_STATUS                   Status;\r
+  EFI_DHCP4_MODE_DATA          Dhcp4ModeData;\r
+  UINT32                       OptionCount;\r
+  EFI_DHCP4_PACKET_OPTION      **OptionList;\r
+  UINT32                       Index;\r
+  ISCSI_SESSION_CONFIG_NVDATA  *NvData;\r
 \r
   Status = Dhcp4->GetModeData (Dhcp4, &Dhcp4ModeData);\r
   if (EFI_ERROR (Status)) {\r
@@ -314,7 +321,7 @@ IScsiParseDhcpAck (
   OptionCount = 0;\r
   OptionList  = NULL;\r
 \r
-  Status      = Dhcp4->Parse (Dhcp4, Dhcp4ModeData.ReplyPacket, &OptionCount, OptionList);\r
+  Status = Dhcp4->Parse (Dhcp4, Dhcp4ModeData.ReplyPacket, &OptionCount, OptionList);\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
@@ -335,11 +342,11 @@ IScsiParseDhcpAck (
     // Get DNS server addresses and DHCP server address from this offer.\r
     //\r
     if (OptionList[Index]->OpCode == DHCP4_TAG_DNS_SERVER) {\r
-\r
       if (((OptionList[Index]->Length & 0x3) != 0) || (OptionList[Index]->Length == 0)) {\r
         Status = EFI_INVALID_PARAMETER;\r
         break;\r
       }\r
+\r
       //\r
       // Primary DNS server address.\r
       //\r
@@ -377,32 +384,32 @@ IScsiParseDhcpAck (
 **/\r
 EFI_STATUS\r
 IScsiSetIp4Policy (\r
-  IN EFI_IP4_CONFIG2_PROTOCOL        *Ip4Config2\r
+  IN EFI_IP4_CONFIG2_PROTOCOL  *Ip4Config2\r
   )\r
 {\r
-  EFI_IP4_CONFIG2_POLICY          Policy;\r
-  EFI_STATUS                      Status;\r
-  UINTN                           DataSize;\r
+  EFI_IP4_CONFIG2_POLICY  Policy;\r
+  EFI_STATUS              Status;\r
+  UINTN                   DataSize;\r
 \r
   DataSize = sizeof (EFI_IP4_CONFIG2_POLICY);\r
-  Status = Ip4Config2->GetData (\r
-                         Ip4Config2,\r
-                         Ip4Config2DataTypePolicy,\r
-                         &DataSize,\r
-                         &Policy\r
-                         );\r
+  Status   = Ip4Config2->GetData (\r
+                           Ip4Config2,\r
+                           Ip4Config2DataTypePolicy,\r
+                           &DataSize,\r
+                           &Policy\r
+                           );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   if (Policy != Ip4Config2PolicyStatic) {\r
     Policy = Ip4Config2PolicyStatic;\r
-    Status= Ip4Config2->SetData (\r
-                          Ip4Config2,\r
-                          Ip4Config2DataTypePolicy,\r
-                          sizeof (EFI_IP4_CONFIG2_POLICY),\r
-                          &Policy\r
-                          );\r
+    Status = Ip4Config2->SetData (\r
+                           Ip4Config2,\r
+                           Ip4Config2DataTypePolicy,\r
+                           sizeof (EFI_IP4_CONFIG2_POLICY),\r
+                           &Policy\r
+                           );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -426,19 +433,19 @@ IScsiSetIp4Policy (
 **/\r
 EFI_STATUS\r
 IScsiDoDhcp (\r
-  IN     EFI_HANDLE                  Image,\r
-  IN     EFI_HANDLE                  Controller,\r
-  IN OUT ISCSI_ATTEMPT_CONFIG_NVDATA *ConfigData\r
+  IN     EFI_HANDLE                   Image,\r
+  IN     EFI_HANDLE                   Controller,\r
+  IN OUT ISCSI_ATTEMPT_CONFIG_NVDATA  *ConfigData\r
   )\r
 {\r
-  EFI_HANDLE                    Dhcp4Handle;\r
-  EFI_IP4_CONFIG2_PROTOCOL      *Ip4Config2;\r
-  EFI_DHCP4_PROTOCOL            *Dhcp4;\r
-  EFI_STATUS                    Status;\r
-  EFI_DHCP4_PACKET_OPTION       *ParaList;\r
-  EFI_DHCP4_CONFIG_DATA         Dhcp4ConfigData;\r
-  ISCSI_SESSION_CONFIG_NVDATA   *NvData;\r
-  EFI_STATUS                    MediaStatus;\r
+  EFI_HANDLE                   Dhcp4Handle;\r
+  EFI_IP4_CONFIG2_PROTOCOL     *Ip4Config2;\r
+  EFI_DHCP4_PROTOCOL           *Dhcp4;\r
+  EFI_STATUS                   Status;\r
+  EFI_DHCP4_PACKET_OPTION      *ParaList;\r
+  EFI_DHCP4_CONFIG_DATA        Dhcp4ConfigData;\r
+  ISCSI_SESSION_CONFIG_NVDATA  *NvData;\r
+  EFI_STATUS                   MediaStatus;\r
 \r
   Dhcp4Handle = NULL;\r
   Ip4Config2  = NULL;\r
@@ -450,7 +457,7 @@ IScsiDoDhcp (
   //\r
   MediaStatus = EFI_SUCCESS;\r
   NetLibDetectMediaWaitTimeout (Controller, ISCSI_CHECK_MEDIA_GET_DHCP_WAITING_TIME, &MediaStatus);\r
-  if (MediaStatus!= EFI_SUCCESS) {\r
+  if (MediaStatus != EFI_SUCCESS) {\r
     AsciiPrint ("\n  Error: Could not detect network connection.\n");\r
     return EFI_NO_MEDIA;\r
   }\r
@@ -462,7 +469,7 @@ IScsiDoDhcp (
   // will not be in the right state for the iSCSI to start a new round D.O.R.A.\r
   // So, we need to switch its policy to static.\r
   //\r
-  Status = gBS->HandleProtocol (Controller, &gEfiIp4Config2ProtocolGuid, (VOID **) &Ip4Config2);\r
+  Status = gBS->HandleProtocol (Controller, &gEfiIp4Config2ProtocolGuid, (VOID **)&Ip4Config2);\r
   if (!EFI_ERROR (Status)) {\r
     Status = IScsiSetIp4Policy (Ip4Config2);\r
     if (EFI_ERROR (Status)) {\r
@@ -486,7 +493,7 @@ IScsiDoDhcp (
   Status = gBS->OpenProtocol (\r
                   Dhcp4Handle,\r
                   &gEfiDhcp4ProtocolGuid,\r
-                  (VOID **) &Dhcp4,\r
+                  (VOID **)&Dhcp4,\r
                   Image,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -495,7 +502,7 @@ IScsiDoDhcp (
     goto ON_EXIT;\r
   }\r
 \r
-  NvData   = &ConfigData->SessionConfigData;\r
+  NvData = &ConfigData->SessionConfigData;\r
 \r
   ParaList = AllocatePool (sizeof (EFI_DHCP4_PACKET_OPTION) + 3);\r
   if (ParaList == NULL) {\r
@@ -507,7 +514,7 @@ IScsiDoDhcp (
   // Ask the server to reply with Netmask, Router, DNS, and RootPath options.\r
   //\r
   ParaList->OpCode  = DHCP4_TAG_PARA_LIST;\r
-  ParaList->Length  = (UINT8) (NvData->TargetInfoFromDhcp ? 4 : 3);\r
+  ParaList->Length  = (UINT8)(NvData->TargetInfoFromDhcp ? 4 : 3);\r
   ParaList->Data[0] = DHCP4_TAG_NETMASK;\r
   ParaList->Data[1] = DHCP4_TAG_ROUTER;\r
   ParaList->Data[2] = DHCP4_TAG_DNS_SERVER;\r
@@ -534,6 +541,7 @@ IScsiDoDhcp (
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
+\r
   //\r
   // Parse the ACK to get required information.\r
   //\r
index 69b501d63068457e53680f128af250ea970778ed..9a0d5d27e5fe1736b05dd3005cf4a410dd1b2870 100644 (file)
@@ -9,21 +9,21 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef _ISCSI_DHCP_H_\r
 #define _ISCSI_DHCP_H_\r
 \r
-#define ISCSI_ROOT_PATH_ID              "iscsi:"\r
-#define ISCSI_ROOT_PATH_FIELD_DELIMITER ':'\r
+#define ISCSI_ROOT_PATH_ID               "iscsi:"\r
+#define ISCSI_ROOT_PATH_FIELD_DELIMITER  ':'\r
 \r
-#define RP_FIELD_IDX_SERVERNAME         0\r
-#define RP_FIELD_IDX_PROTOCOL           1\r
-#define RP_FIELD_IDX_PORT               2\r
-#define RP_FIELD_IDX_LUN                3\r
-#define RP_FIELD_IDX_TARGETNAME         4\r
-#define RP_FIELD_IDX_MAX                5\r
+#define RP_FIELD_IDX_SERVERNAME  0\r
+#define RP_FIELD_IDX_PROTOCOL    1\r
+#define RP_FIELD_IDX_PORT        2\r
+#define RP_FIELD_IDX_LUN         3\r
+#define RP_FIELD_IDX_TARGETNAME  4\r
+#define RP_FIELD_IDX_MAX         5\r
 \r
 typedef struct _ISCSI_ATTEMPT_CONFIG_NVDATA ISCSI_ATTEMPT_CONFIG_NVDATA;\r
 \r
 typedef struct _ISCSI_ROOT_PATH_FIELD {\r
-  CHAR8 *Str;\r
-  UINT8 Len;\r
+  CHAR8    *Str;\r
+  UINT8    Len;\r
 } ISCSI_ROOT_PATH_FIELD;\r
 \r
 /**\r
@@ -41,9 +41,9 @@ typedef struct _ISCSI_ROOT_PATH_FIELD {
 **/\r
 EFI_STATUS\r
 IScsiDoDhcp (\r
-  IN     EFI_HANDLE                  Image,\r
-  IN     EFI_HANDLE                  Controller,\r
-  IN OUT ISCSI_ATTEMPT_CONFIG_NVDATA *ConfigData\r
+  IN     EFI_HANDLE                   Image,\r
+  IN     EFI_HANDLE                   Controller,\r
+  IN OUT ISCSI_ATTEMPT_CONFIG_NVDATA  *ConfigData\r
   );\r
 \r
 #endif\r
index 691650b7334fdd70883c0c18cfea08d7cb6e12c1..8ca92b20d1ab526ab6f8c61a2f2734a0c2b6bf63 100644 (file)
@@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "IScsiImpl.h"\r
 \r
-\r
 /**\r
   Extract the Root Path option and get the required target information from\r
   Boot File Uniform Resource Locator (URL) Option.\r
@@ -29,47 +28,49 @@ EFI_STATUS
 IScsiDhcp6ExtractRootPath (\r
   IN     CHAR8                        *RootPath,\r
   IN     UINT16                       Length,\r
-  IN OUT ISCSI_ATTEMPT_CONFIG_NVDATA *ConfigData\r
+  IN OUT ISCSI_ATTEMPT_CONFIG_NVDATA  *ConfigData\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  UINT16                      IScsiRootPathIdLen;\r
-  CHAR8                       *TmpStr;\r
-  ISCSI_ROOT_PATH_FIELD       Fields[RP_FIELD_IDX_MAX];\r
-  ISCSI_ROOT_PATH_FIELD       *Field;\r
-  UINT32                      FieldIndex;\r
-  UINT8                       Index;\r
-  ISCSI_SESSION_CONFIG_NVDATA *ConfigNvData;\r
-  EFI_IP_ADDRESS              Ip;\r
-  UINT8                       IpMode;\r
-\r
-  ConfigNvData = &ConfigData->SessionConfigData;\r
+  EFI_STATUS                   Status;\r
+  UINT16                       IScsiRootPathIdLen;\r
+  CHAR8                        *TmpStr;\r
+  ISCSI_ROOT_PATH_FIELD        Fields[RP_FIELD_IDX_MAX];\r
+  ISCSI_ROOT_PATH_FIELD        *Field;\r
+  UINT32                       FieldIndex;\r
+  UINT8                        Index;\r
+  ISCSI_SESSION_CONFIG_NVDATA  *ConfigNvData;\r
+  EFI_IP_ADDRESS               Ip;\r
+  UINT8                        IpMode;\r
+\r
+  ConfigNvData          = &ConfigData->SessionConfigData;\r
   ConfigNvData->DnsMode = FALSE;\r
   //\r
   // "iscsi:"<servername>":"<protocol>":"<port>":"<LUN>":"<targetname>\r
   //\r
-  IScsiRootPathIdLen = (UINT16) AsciiStrLen (ISCSI_ROOT_PATH_ID);\r
+  IScsiRootPathIdLen = (UINT16)AsciiStrLen (ISCSI_ROOT_PATH_ID);\r
 \r
   if ((Length <= IScsiRootPathIdLen) ||\r
-      (CompareMem (RootPath, ISCSI_ROOT_PATH_ID, IScsiRootPathIdLen) != 0)) {\r
+      (CompareMem (RootPath, ISCSI_ROOT_PATH_ID, IScsiRootPathIdLen) != 0))\r
+  {\r
     return EFI_NOT_FOUND;\r
   }\r
+\r
   //\r
   // Skip the iSCSI RootPath ID "iscsi:".\r
   //\r
   RootPath = RootPath + IScsiRootPathIdLen;\r
-  Length   = (UINT16) (Length - IScsiRootPathIdLen);\r
+  Length   = (UINT16)(Length - IScsiRootPathIdLen);\r
 \r
-  TmpStr   = (CHAR8 *) AllocatePool (Length + 1);\r
+  TmpStr = (CHAR8 *)AllocatePool (Length + 1);\r
   if (TmpStr == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   CopyMem (TmpStr, RootPath, Length);\r
-  TmpStr[Length]  = '\0';\r
+  TmpStr[Length] = '\0';\r
 \r
-  Index           = 0;\r
-  FieldIndex      = 0;\r
+  Index      = 0;\r
+  FieldIndex = 0;\r
   ZeroMem (&Fields[0], sizeof (Fields));\r
 \r
   //\r
@@ -87,7 +88,7 @@ IScsiDhcp6ExtractRootPath (
   Fields[RP_FIELD_IDX_SERVERNAME].Str = &TmpStr[Index];\r
 \r
   if (!ConfigNvData->DnsMode) {\r
-    while ((TmpStr[Index] != ISCSI_ROOT_PATH_ADDR_END_DELIMITER)&& (Index < Length)) {\r
+    while ((TmpStr[Index] != ISCSI_ROOT_PATH_ADDR_END_DELIMITER) && (Index < Length)) {\r
       Index++;\r
     }\r
 \r
@@ -95,25 +96,25 @@ IScsiDhcp6ExtractRootPath (
     // Skip ']' and ':'.\r
     //\r
     TmpStr[Index] = '\0';\r
-    Index += 2;\r
+    Index        += 2;\r
   } else {\r
     while ((TmpStr[Index] != ISCSI_ROOT_PATH_FIELD_DELIMITER) && (Index < Length)) {\r
       Index++;\r
     }\r
+\r
     //\r
     // Skip ':'.\r
     //\r
     TmpStr[Index] = '\0';\r
-    Index += 1;\r
+    Index        += 1;\r
   }\r
 \r
-  Fields[RP_FIELD_IDX_SERVERNAME].Len = (UINT8) AsciiStrLen (Fields[RP_FIELD_IDX_SERVERNAME].Str);\r
+  Fields[RP_FIELD_IDX_SERVERNAME].Len = (UINT8)AsciiStrLen (Fields[RP_FIELD_IDX_SERVERNAME].Str);\r
 \r
   //\r
   // Extract others fields in the Root Path option string.\r
   //\r
   for (FieldIndex = 1; (FieldIndex < RP_FIELD_IDX_MAX) && (Index < Length); FieldIndex++) {\r
-\r
     if (TmpStr[Index] != ISCSI_ROOT_PATH_FIELD_DELIMITER) {\r
       Fields[FieldIndex].Str = &TmpStr[Index];\r
     }\r
@@ -129,7 +130,7 @@ IScsiDhcp6ExtractRootPath (
       }\r
 \r
       if (Fields[FieldIndex].Str != NULL) {\r
-        Fields[FieldIndex].Len = (UINT8) AsciiStrLen (Fields[FieldIndex].Str);\r
+        Fields[FieldIndex].Len = (UINT8)AsciiStrLen (Fields[FieldIndex].Str);\r
       }\r
     }\r
   }\r
@@ -142,15 +143,16 @@ IScsiDhcp6ExtractRootPath (
   if ((Fields[RP_FIELD_IDX_SERVERNAME].Str == NULL) ||\r
       (Fields[RP_FIELD_IDX_TARGETNAME].Str == NULL) ||\r
       (Fields[RP_FIELD_IDX_PROTOCOL].Len > 1)\r
-      ) {\r
-\r
+      )\r
+  {\r
     Status = EFI_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
   }\r
+\r
   //\r
   // Get the IP address of the target.\r
   //\r
-  Field   = &Fields[RP_FIELD_IDX_SERVERNAME];\r
+  Field = &Fields[RP_FIELD_IDX_SERVERNAME];\r
   if (ConfigNvData->IpMode < IP_MODE_AUTOCONFIG) {\r
     IpMode = ConfigNvData->IpMode;\r
   } else {\r
@@ -164,10 +166,11 @@ IScsiDhcp6ExtractRootPath (
     if ((Field->Len + 2) > sizeof (ConfigNvData->TargetUrl)) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     CopyMem (&ConfigNvData->TargetUrl, Field->Str, Field->Len);\r
     ConfigNvData->TargetUrl[Field->Len + 1] = '\0';\r
   } else {\r
-    ZeroMem(&ConfigNvData->TargetUrl, sizeof (ConfigNvData->TargetUrl));\r
+    ZeroMem (&ConfigNvData->TargetUrl, sizeof (ConfigNvData->TargetUrl));\r
     Status = IScsiAsciiStrToIp (Field->Str, IpMode, &Ip);\r
     CopyMem (&ConfigNvData->TargetIp, &Ip, sizeof (EFI_IP_ADDRESS));\r
 \r
@@ -184,15 +187,17 @@ IScsiDhcp6ExtractRootPath (
     Status = EFI_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
   }\r
+\r
   //\r
   // Get the port of the iSCSI target.\r
   //\r
   Field = &Fields[RP_FIELD_IDX_PORT];\r
   if (Field->Str != NULL) {\r
-    ConfigNvData->TargetPort = (UINT16) AsciiStrDecimalToUintn (Field->Str);\r
+    ConfigNvData->TargetPort = (UINT16)AsciiStrDecimalToUintn (Field->Str);\r
   } else {\r
     ConfigNvData->TargetPort = ISCSI_WELL_KNOWN_PORT;\r
   }\r
+\r
   //\r
   // Get the LUN.\r
   //\r
@@ -205,6 +210,7 @@ IScsiDhcp6ExtractRootPath (
   } else {\r
     ZeroMem (ConfigNvData->BootLun, sizeof (ConfigNvData->BootLun));\r
   }\r
+\r
   //\r
   // Get the target iSCSI Name.\r
   //\r
@@ -214,6 +220,7 @@ IScsiDhcp6ExtractRootPath (
     Status = EFI_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
   }\r
+\r
   //\r
   // Validate the iSCSI name.\r
   //\r
@@ -258,23 +265,23 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 IScsiDhcp6ParseReply (\r
-  IN EFI_DHCP6_PROTOCOL          *This,\r
-  IN VOID                        *Context,\r
-  IN EFI_DHCP6_PACKET            *Packet\r
+  IN EFI_DHCP6_PROTOCOL  *This,\r
+  IN VOID                *Context,\r
+  IN EFI_DHCP6_PACKET    *Packet\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  UINT32                      Index;\r
-  UINT32                      OptionCount;\r
-  EFI_DHCP6_PACKET_OPTION     *BootFileOpt;\r
-  EFI_DHCP6_PACKET_OPTION     **OptionList;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA *ConfigData;\r
-  UINT16                      ParaLen;\r
+  EFI_STATUS                   Status;\r
+  UINT32                       Index;\r
+  UINT32                       OptionCount;\r
+  EFI_DHCP6_PACKET_OPTION      *BootFileOpt;\r
+  EFI_DHCP6_PACKET_OPTION      **OptionList;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *ConfigData;\r
+  UINT16                       ParaLen;\r
 \r
   OptionCount = 0;\r
   BootFileOpt = NULL;\r
 \r
-  Status      = This->Parse (This, Packet, &OptionCount, NULL);\r
+  Status = This->Parse (This, Packet, &OptionCount, NULL);\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     return EFI_NOT_READY;\r
   }\r
@@ -290,7 +297,7 @@ IScsiDhcp6ParseReply (
     goto Exit;\r
   }\r
 \r
-  ConfigData = (ISCSI_ATTEMPT_CONFIG_NVDATA *) Context;\r
+  ConfigData = (ISCSI_ATTEMPT_CONFIG_NVDATA *)Context;\r
 \r
   for (Index = 0; Index < OptionCount; Index++) {\r
     OptionList[Index]->OpCode = NTOHS (OptionList[Index]->OpCode);\r
@@ -300,11 +307,11 @@ IScsiDhcp6ParseReply (
     // Get DNS server addresses from this reply packet.\r
     //\r
     if (OptionList[Index]->OpCode == DHCP6_OPT_DNS_SERVERS) {\r
-\r
       if (((OptionList[Index]->OpLen & 0xf) != 0) || (OptionList[Index]->OpLen == 0)) {\r
         Status = EFI_UNSUPPORTED;\r
         goto Exit;\r
       }\r
+\r
       //\r
       // Primary DNS server address.\r
       //\r
@@ -316,7 +323,6 @@ IScsiDhcp6ParseReply (
         //\r
         CopyMem (&ConfigData->SecondaryDns, &OptionList[Index]->Data[16], sizeof (EFI_IPv6_ADDRESS));\r
       }\r
-\r
     } else if (OptionList[Index]->OpCode == DHCP6_OPT_BOOT_FILE_URL) {\r
       //\r
       // The server sends this option to inform the client about an URL to a boot file.\r
@@ -330,6 +336,7 @@ IScsiDhcp6ParseReply (
         Status = EFI_UNSUPPORTED;\r
         goto Exit;\r
       }\r
+\r
       //\r
       // Check param-len 1, should be 16 bytes.\r
       //\r
@@ -352,7 +359,7 @@ IScsiDhcp6ParseReply (
   // Get iSCSI root path from Boot File Uniform Resource Locator (URL) Option\r
   //\r
   Status = IScsiDhcp6ExtractRootPath (\r
-             (CHAR8 *) BootFileOpt->Data,\r
+             (CHAR8 *)BootFileOpt->Data,\r
              BootFileOpt->OpLen,\r
              ConfigData\r
              );\r
@@ -363,7 +370,6 @@ Exit:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Parse the DHCP ACK to get the address configuration and DNS information.\r
 \r
@@ -383,9 +389,9 @@ Exit:
 **/\r
 EFI_STATUS\r
 IScsiDoDhcp6 (\r
-  IN     EFI_HANDLE                  Image,\r
-  IN     EFI_HANDLE                  Controller,\r
-  IN OUT ISCSI_ATTEMPT_CONFIG_NVDATA *ConfigData\r
+  IN     EFI_HANDLE                   Image,\r
+  IN     EFI_HANDLE                   Controller,\r
+  IN OUT ISCSI_ATTEMPT_CONFIG_NVDATA  *ConfigData\r
   )\r
 {\r
   EFI_HANDLE                Dhcp6Handle;\r
@@ -435,7 +441,7 @@ IScsiDoDhcp6 (
   Status = gBS->OpenProtocol (\r
                   Dhcp6Handle,\r
                   &gEfiDhcp6ProtocolGuid,\r
-                  (VOID **) &Dhcp6,\r
+                  (VOID **)&Dhcp6,\r
                   Image,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -493,7 +499,6 @@ IScsiDoDhcp6 (
     }\r
 \r
     do {\r
-\r
       TimerStatus = gBS->CheckEvent (Timer);\r
 \r
       if (!EFI_ERROR (TimerStatus)) {\r
@@ -509,9 +514,7 @@ IScsiDoDhcp6 (
                           ConfigData\r
                           );\r
       }\r
-\r
     } while (TimerStatus == EFI_NOT_READY);\r
-\r
   }\r
 \r
 ON_EXIT:\r
@@ -542,4 +545,3 @@ ON_EXIT:
 \r
   return Status;\r
 }\r
-\r
index 666338c7d24dc29b4d1a14777df1c3bbff256cae..d086a69459df2423aa6e058c9fd0507a98a4345f 100644 (file)
@@ -9,11 +9,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef _ISCSI_DHCP6_H_\r
 #define _ISCSI_DHCP6_H_\r
 \r
-#define ISCSI_ROOT_PATH_ID                   "iscsi:"\r
-#define ISCSI_ROOT_PATH_FIELD_DELIMITER      ':'\r
-#define ISCSI_ROOT_PATH_ADDR_START_DELIMITER '['\r
-#define ISCSI_ROOT_PATH_ADDR_END_DELIMITER   ']'\r
-\r
+#define ISCSI_ROOT_PATH_ID                    "iscsi:"\r
+#define ISCSI_ROOT_PATH_FIELD_DELIMITER       ':'\r
+#define ISCSI_ROOT_PATH_ADDR_START_DELIMITER  '['\r
+#define ISCSI_ROOT_PATH_ADDR_END_DELIMITER    ']'\r
 \r
 /**\r
   Extract the Root Path option and get the required target information from\r
@@ -35,7 +34,7 @@ EFI_STATUS
 IScsiDhcp6ExtractRootPath (\r
   IN     CHAR8                        *RootPath,\r
   IN     UINT16                       Length,\r
-  IN OUT ISCSI_ATTEMPT_CONFIG_NVDATA *ConfigData\r
+  IN OUT ISCSI_ATTEMPT_CONFIG_NVDATA  *ConfigData\r
   );\r
 \r
 /**\r
@@ -57,9 +56,9 @@ IScsiDhcp6ExtractRootPath (
 **/\r
 EFI_STATUS\r
 IScsiDoDhcp6 (\r
-  IN     EFI_HANDLE                  Image,\r
-  IN     EFI_HANDLE                  Controller,\r
-  IN OUT ISCSI_ATTEMPT_CONFIG_NVDATA *ConfigData\r
+  IN     EFI_HANDLE                   Image,\r
+  IN     EFI_HANDLE                   Controller,\r
+  IN OUT ISCSI_ATTEMPT_CONFIG_NVDATA  *ConfigData\r
   );\r
 \r
 #endif\r
index f407c2bbc4044324226af3d4392586d333a56b96..7725dcbc1889a079e2bec418efb3ab2a41d82ada 100644 (file)
@@ -18,11 +18,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 VOID\r
 EFIAPI\r
 IScsiCommonNotify (\r
-  IN EFI_EVENT           Event,\r
-  IN VOID                *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  *((BOOLEAN *) Context) = TRUE;\r
+  *((BOOLEAN *)Context) = TRUE;\r
 }\r
 \r
 /**\r
@@ -40,22 +40,22 @@ IScsiCommonNotify (
 **/\r
 EFI_STATUS\r
 IScsiDns4 (\r
-  IN     EFI_HANDLE                      Image,\r
-  IN     EFI_HANDLE                      Controller,\r
-  IN OUT ISCSI_SESSION_CONFIG_NVDATA     *NvData\r
+  IN     EFI_HANDLE                   Image,\r
+  IN     EFI_HANDLE                   Controller,\r
+  IN OUT ISCSI_SESSION_CONFIG_NVDATA  *NvData\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_DNS4_PROTOCOL               *Dns4;\r
-  EFI_DNS4_CONFIG_DATA            Dns4CfgData;\r
-  EFI_DNS4_COMPLETION_TOKEN       Token;\r
-  BOOLEAN                         IsDone;\r
-  EFI_HANDLE                      Dns4Handle;\r
-  EFI_IP4_CONFIG2_PROTOCOL        *Ip4Config2;\r
-  EFI_IPv4_ADDRESS                *DnsServerList;\r
-  UINTN                           DnsServerListCount;\r
-  UINTN                           DataSize;\r
-  CHAR16                          *HostName;\r
+  EFI_STATUS                 Status;\r
+  EFI_DNS4_PROTOCOL          *Dns4;\r
+  EFI_DNS4_CONFIG_DATA       Dns4CfgData;\r
+  EFI_DNS4_COMPLETION_TOKEN  Token;\r
+  BOOLEAN                    IsDone;\r
+  EFI_HANDLE                 Dns4Handle;\r
+  EFI_IP4_CONFIG2_PROTOCOL   *Ip4Config2;\r
+  EFI_IPv4_ADDRESS           *DnsServerList;\r
+  UINTN                      DnsServerListCount;\r
+  UINTN                      DataSize;\r
+  CHAR16                     *HostName;\r
 \r
   DnsServerList      = NULL;\r
   DnsServerListCount = 0;\r
@@ -66,7 +66,7 @@ IScsiDns4 (
   //\r
   // Get DNS server list from EFI IPv4 Configuration II protocol.\r
   //\r
-  Status = gBS->HandleProtocol (Controller, &gEfiIp4Config2ProtocolGuid, (VOID **) &Ip4Config2);\r
+  Status = gBS->HandleProtocol (Controller, &gEfiIp4Config2ProtocolGuid, (VOID **)&Ip4Config2);\r
   if (!EFI_ERROR (Status)) {\r
     //\r
     // Get the required size.\r
@@ -79,7 +79,7 @@ IScsiDns4 (
         return EFI_OUT_OF_RESOURCES;\r
       }\r
 \r
-      Status   = Ip4Config2->GetData (Ip4Config2, Ip4Config2DataTypeDnsServer, &DataSize, DnsServerList);\r
+      Status = Ip4Config2->GetData (Ip4Config2, Ip4Config2DataTypeDnsServer, &DataSize, DnsServerList);\r
       if (EFI_ERROR (Status)) {\r
         FreePool (DnsServerList);\r
         DnsServerList = NULL;\r
@@ -89,7 +89,6 @@ IScsiDns4 (
     }\r
   }\r
 \r
-\r
   //\r
   // Create a DNS child instance and get the protocol.\r
   //\r
@@ -106,7 +105,7 @@ IScsiDns4 (
   Status = gBS->OpenProtocol (\r
                   Dns4Handle,\r
                   &gEfiDns4ProtocolGuid,\r
-                  (VOID **) &Dns4,\r
+                  (VOID **)&Dns4,\r
                   Image,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -124,11 +123,11 @@ IScsiDns4 (
   Dns4CfgData.EnableDnsCache     = TRUE;\r
   IP4_COPY_ADDRESS (&Dns4CfgData.StationIp, &NvData->LocalIp);\r
   IP4_COPY_ADDRESS (&Dns4CfgData.SubnetMask, &NvData->SubnetMask);\r
-  Dns4CfgData.Protocol           = EFI_IP_PROTO_UDP;\r
-  Status = Dns4->Configure (\r
-                   Dns4,\r
-                   &Dns4CfgData\r
-                   );\r
+  Dns4CfgData.Protocol = EFI_IP_PROTO_UDP;\r
+  Status               = Dns4->Configure (\r
+                                 Dns4,\r
+                                 &Dns4CfgData\r
+                                 );\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   }\r
@@ -154,7 +153,7 @@ IScsiDns4 (
   Token.Status = EFI_NOT_READY;\r
   IsDone       = FALSE;\r
 \r
-  HostName = (CHAR16 *) AllocateZeroPool (ISCSI_NAME_MAX_SIZE);\r
+  HostName = (CHAR16 *)AllocateZeroPool (ISCSI_NAME_MAX_SIZE);\r
   if (HostName == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -183,10 +182,12 @@ IScsiDns4 (
       Status = EFI_DEVICE_ERROR;\r
       goto Exit;\r
     }\r
-    if (Token.RspData.H2AData->IpCount == 0 || Token.RspData.H2AData->IpList == NULL) {\r
+\r
+    if ((Token.RspData.H2AData->IpCount == 0) || (Token.RspData.H2AData->IpList == NULL)) {\r
       Status = EFI_DEVICE_ERROR;\r
       goto Exit;\r
     }\r
+\r
     //\r
     // We just return the first IP address from DNS protocol.\r
     //\r
@@ -199,10 +200,12 @@ Exit:
   if (Token.Event != NULL) {\r
     gBS->CloseEvent (Token.Event);\r
   }\r
+\r
   if (Token.RspData.H2AData != NULL) {\r
     if (Token.RspData.H2AData->IpList != NULL) {\r
       FreePool (Token.RspData.H2AData->IpList);\r
     }\r
+\r
     FreePool (Token.RspData.H2AData);\r
   }\r
 \r
@@ -244,39 +247,39 @@ Exit:
 **/\r
 EFI_STATUS\r
 IScsiDns6 (\r
-  IN     EFI_HANDLE                      Image,\r
-  IN     EFI_HANDLE                      Controller,\r
-  IN OUT ISCSI_SESSION_CONFIG_NVDATA     *NvData\r
+  IN     EFI_HANDLE                   Image,\r
+  IN     EFI_HANDLE                   Controller,\r
+  IN OUT ISCSI_SESSION_CONFIG_NVDATA  *NvData\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_DNS6_PROTOCOL               *Dns6;\r
-  EFI_DNS6_CONFIG_DATA            Dns6ConfigData;\r
-  EFI_DNS6_COMPLETION_TOKEN       Token;\r
-  EFI_HANDLE                      Dns6Handle;\r
-  EFI_IP6_CONFIG_PROTOCOL         *Ip6Config;\r
-  EFI_IPv6_ADDRESS                *DnsServerList;\r
-  UINTN                           DnsServerListCount;\r
-  UINTN                           DataSize;\r
-  BOOLEAN                         IsDone;\r
-  CHAR16                          *HostName;\r
-\r
-  DnsServerList       = NULL;\r
-  DnsServerListCount  = 0;\r
-  Dns6                = NULL;\r
-  Dns6Handle          = NULL;\r
+  EFI_STATUS                 Status;\r
+  EFI_DNS6_PROTOCOL          *Dns6;\r
+  EFI_DNS6_CONFIG_DATA       Dns6ConfigData;\r
+  EFI_DNS6_COMPLETION_TOKEN  Token;\r
+  EFI_HANDLE                 Dns6Handle;\r
+  EFI_IP6_CONFIG_PROTOCOL    *Ip6Config;\r
+  EFI_IPv6_ADDRESS           *DnsServerList;\r
+  UINTN                      DnsServerListCount;\r
+  UINTN                      DataSize;\r
+  BOOLEAN                    IsDone;\r
+  CHAR16                     *HostName;\r
+\r
+  DnsServerList      = NULL;\r
+  DnsServerListCount = 0;\r
+  Dns6               = NULL;\r
+  Dns6Handle         = NULL;\r
   ZeroMem (&Token, sizeof (EFI_DNS6_COMPLETION_TOKEN));\r
 \r
   //\r
   // Get DNS server list from EFI IPv6 Configuration protocol.\r
   //\r
-  Status = gBS->HandleProtocol (Controller, &gEfiIp6ConfigProtocolGuid, (VOID **) &Ip6Config);\r
+  Status = gBS->HandleProtocol (Controller, &gEfiIp6ConfigProtocolGuid, (VOID **)&Ip6Config);\r
   if (!EFI_ERROR (Status)) {\r
     //\r
     // Get the required size.\r
     //\r
     DataSize = 0;\r
-    Status = Ip6Config->GetData (Ip6Config, Ip6ConfigDataTypeDnsServer, &DataSize, NULL);\r
+    Status   = Ip6Config->GetData (Ip6Config, Ip6ConfigDataTypeDnsServer, &DataSize, NULL);\r
     if (Status == EFI_BUFFER_TOO_SMALL) {\r
       DnsServerList = AllocatePool (DataSize);\r
       if (DnsServerList == NULL) {\r
@@ -309,7 +312,7 @@ IScsiDns6 (
   Status = gBS->OpenProtocol (\r
                   Dns6Handle,\r
                   &gEfiDns6ProtocolGuid,\r
-                  (VOID **) &Dns6,\r
+                  (VOID **)&Dns6,\r
                   Image,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -326,10 +329,10 @@ IScsiDns6 (
   Dns6ConfigData.DnsServerList  = DnsServerList;\r
   Dns6ConfigData.EnableDnsCache = TRUE;\r
   Dns6ConfigData.Protocol       = EFI_IP_PROTO_UDP;\r
-  Status = Dns6->Configure (\r
-                   Dns6,\r
-                   &Dns6ConfigData\r
-                   );\r
+  Status                        = Dns6->Configure (\r
+                                          Dns6,\r
+                                          &Dns6ConfigData\r
+                                          );\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   }\r
@@ -353,7 +356,7 @@ IScsiDns6 (
   //\r
   // Start asynchronous name resolution.\r
   //\r
-  HostName = (CHAR16 *) AllocateZeroPool (ISCSI_NAME_MAX_SIZE);\r
+  HostName = (CHAR16 *)AllocateZeroPool (ISCSI_NAME_MAX_SIZE);\r
   if (HostName == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -381,10 +384,12 @@ IScsiDns6 (
       Status = EFI_DEVICE_ERROR;\r
       goto Exit;\r
     }\r
-    if (Token.RspData.H2AData->IpCount == 0 || Token.RspData.H2AData->IpList == NULL) {\r
+\r
+    if ((Token.RspData.H2AData->IpCount == 0) || (Token.RspData.H2AData->IpList == NULL)) {\r
       Status = EFI_DEVICE_ERROR;\r
       goto Exit;\r
     }\r
+\r
     //\r
     // We just return the first IPv6 address from DNS protocol.\r
     //\r
@@ -397,10 +402,12 @@ Exit:
   if (Token.Event != NULL) {\r
     gBS->CloseEvent (Token.Event);\r
   }\r
+\r
   if (Token.RspData.H2AData != NULL) {\r
     if (Token.RspData.H2AData->IpList != NULL) {\r
       FreePool (Token.RspData.H2AData->IpList);\r
     }\r
+\r
     FreePool (Token.RspData.H2AData);\r
   }\r
 \r
@@ -426,4 +433,3 @@ Exit:
 \r
   return Status;\r
 }\r
-\r
index 2e02309745bca8b5db52446d4aacd6a41963df6d..07efc6c6f90e8887406c98be8e2af883215b599c 100644 (file)
@@ -25,9 +25,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 IScsiDns4 (\r
-  IN     EFI_HANDLE                      Image,\r
-  IN     EFI_HANDLE                      Controller,\r
-  IN OUT ISCSI_SESSION_CONFIG_NVDATA     *NvData\r
+  IN     EFI_HANDLE                   Image,\r
+  IN     EFI_HANDLE                   Controller,\r
+  IN OUT ISCSI_SESSION_CONFIG_NVDATA  *NvData\r
   );\r
 \r
 /**\r
@@ -45,9 +45,9 @@ IScsiDns4 (
 **/\r
 EFI_STATUS\r
 IScsiDns6 (\r
-  IN     EFI_HANDLE                      Image,\r
-  IN     EFI_HANDLE                      Controller,\r
-  IN OUT ISCSI_SESSION_CONFIG_NVDATA     *NvData\r
+  IN     EFI_HANDLE                   Image,\r
+  IN     EFI_HANDLE                   Controller,\r
+  IN OUT ISCSI_SESSION_CONFIG_NVDATA  *NvData\r
   );\r
 \r
 #endif\r
index 485c929721138ce4e70553441924ebd1a4738bfa..ba4abd4ef585e86c7a681ec5601fa775031798b6 100644 (file)
@@ -11,7 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "IScsiImpl.h"\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gIScsiIp4DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gIScsiIp4DriverBinding = {\r
   IScsiIp4DriverBindingSupported,\r
   IScsiIp4DriverBindingStart,\r
   IScsiIp4DriverBindingStop,\r
@@ -20,7 +20,7 @@ EFI_DRIVER_BINDING_PROTOCOL gIScsiIp4DriverBinding = {
   NULL\r
 };\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gIScsiIp6DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gIScsiIp6DriverBinding = {\r
   IScsiIp6DriverBindingSupported,\r
   IScsiIp6DriverBindingStart,\r
   IScsiIp6DriverBindingStop,\r
@@ -29,9 +29,9 @@ EFI_DRIVER_BINDING_PROTOCOL gIScsiIp6DriverBinding = {
   NULL\r
 };\r
 \r
-EFI_GUID                    gIScsiV4PrivateGuid = ISCSI_V4_PRIVATE_GUID;\r
-EFI_GUID                    gIScsiV6PrivateGuid = ISCSI_V6_PRIVATE_GUID;\r
-ISCSI_PRIVATE_DATA          *mPrivate           = NULL;\r
+EFI_GUID            gIScsiV4PrivateGuid = ISCSI_V4_PRIVATE_GUID;\r
+EFI_GUID            gIScsiV6PrivateGuid = ISCSI_V6_PRIVATE_GUID;\r
+ISCSI_PRIVATE_DATA  *mPrivate           = NULL;\r
 \r
 /**\r
   Tests to see if this driver supports the RemainingDevicePath.\r
@@ -50,7 +50,7 @@ ISCSI_PRIVATE_DATA          *mPrivate           = NULL;
 **/\r
 EFI_STATUS\r
 IScsiIsDevicePathSupported (\r
-  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
+  IN EFI_DEVICE_PATH_PROTOCOL  *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
   EFI_DEVICE_PATH_PROTOCOL  *CurrentDevicePath;\r
@@ -85,34 +85,34 @@ IScsiCheckAip (
   VOID\r
   )\r
 {\r
-  UINTN                            AipHandleCount;\r
-  EFI_HANDLE                       *AipHandleBuffer;\r
-  UINTN                            AipIndex;\r
-  EFI_ADAPTER_INFORMATION_PROTOCOL *Aip;\r
-  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *ExtScsiPassThru;\r
-  EFI_GUID                         *InfoTypesBuffer;\r
-  UINTN                            InfoTypeBufferCount;\r
-  UINTN                            TypeIndex;\r
-  VOID                             *InfoBlock;\r
-  UINTN                            InfoBlockSize;\r
-  BOOLEAN                          Supported;\r
-  EFI_ADAPTER_INFO_NETWORK_BOOT    *NetworkBoot;\r
-  EFI_STATUS                       Status;\r
-  UINT8                            NetworkBootPolicy;\r
+  UINTN                             AipHandleCount;\r
+  EFI_HANDLE                        *AipHandleBuffer;\r
+  UINTN                             AipIndex;\r
+  EFI_ADAPTER_INFORMATION_PROTOCOL  *Aip;\r
+  EFI_EXT_SCSI_PASS_THRU_PROTOCOL   *ExtScsiPassThru;\r
+  EFI_GUID                          *InfoTypesBuffer;\r
+  UINTN                             InfoTypeBufferCount;\r
+  UINTN                             TypeIndex;\r
+  VOID                              *InfoBlock;\r
+  UINTN                             InfoBlockSize;\r
+  BOOLEAN                           Supported;\r
+  EFI_ADAPTER_INFO_NETWORK_BOOT     *NetworkBoot;\r
+  EFI_STATUS                        Status;\r
+  UINT8                             NetworkBootPolicy;\r
 \r
   //\r
   // Check any AIP instances exist in system.\r
   //\r
   AipHandleCount  = 0;\r
   AipHandleBuffer = NULL;\r
-  Status = gBS->LocateHandleBuffer (\r
-                  ByProtocol,\r
-                  &gEfiAdapterInformationProtocolGuid,\r
-                  NULL,\r
-                  &AipHandleCount,\r
-                  &AipHandleBuffer\r
-                  );\r
-  if (EFI_ERROR (Status) || AipHandleCount == 0) {\r
+  Status          = gBS->LocateHandleBuffer (\r
+                           ByProtocol,\r
+                           &gEfiAdapterInformationProtocolGuid,\r
+                           NULL,\r
+                           &AipHandleCount,\r
+                           &AipHandleBuffer\r
+                           );\r
+  if (EFI_ERROR (Status) || (AipHandleCount == 0)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -124,7 +124,7 @@ IScsiCheckAip (
     Status = gBS->HandleProtocol (\r
                     AipHandleBuffer[AipIndex],\r
                     &gEfiAdapterInformationProtocolGuid,\r
-                    (VOID *) &Aip\r
+                    (VOID *)&Aip\r
                     );\r
     ASSERT_EFI_ERROR (Status);\r
     ASSERT (Aip != NULL);\r
@@ -132,18 +132,19 @@ IScsiCheckAip (
     Status = gBS->HandleProtocol (\r
                     AipHandleBuffer[AipIndex],\r
                     &gEfiExtScsiPassThruProtocolGuid,\r
-                    (VOID *) &ExtScsiPassThru\r
+                    (VOID *)&ExtScsiPassThru\r
                     );\r
-    if (EFI_ERROR (Status) || ExtScsiPassThru == NULL) {\r
+    if (EFI_ERROR (Status) || (ExtScsiPassThru == NULL)) {\r
       continue;\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
       continue;\r
     }\r
+\r
     //\r
     // Check whether the AIP instance has Network boot information block.\r
     //\r
@@ -165,33 +166,35 @@ IScsiCheckAip (
     //\r
     InfoBlock     = NULL;\r
     InfoBlockSize = 0;\r
-    Status = Aip->GetInformation (Aip, &gEfiAdapterInfoNetworkBootGuid, &InfoBlock, &InfoBlockSize);\r
-    if (EFI_ERROR (Status) || InfoBlock == NULL) {\r
+    Status        = Aip->GetInformation (Aip, &gEfiAdapterInfoNetworkBootGuid, &InfoBlock, &InfoBlockSize);\r
+    if (EFI_ERROR (Status) || (InfoBlock == NULL)) {\r
       continue;\r
     }\r
 \r
     //\r
     // Check whether the network boot policy matches.\r
     //\r
-    NetworkBoot = (EFI_ADAPTER_INFO_NETWORK_BOOT *) InfoBlock;\r
+    NetworkBoot       = (EFI_ADAPTER_INFO_NETWORK_BOOT *)InfoBlock;\r
     NetworkBootPolicy = PcdGet8 (PcdIScsiAIPNetworkBootPolicy);\r
 \r
     if (NetworkBootPolicy == STOP_UEFI_ISCSI_IF_HBA_INSTALL_AIP) {\r
       Status = EFI_SUCCESS;\r
       goto Exit;\r
     }\r
-    if (((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_SUPPORT_IP4) != 0 &&\r
+\r
+    if ((((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_SUPPORT_IP4) != 0) &&\r
          !NetworkBoot->iScsiIpv4BootCapablity) ||\r
-         ((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_SUPPORT_IP6) != 0 &&\r
+        (((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_SUPPORT_IP6) != 0) &&\r
          !NetworkBoot->iScsiIpv6BootCapablity) ||\r
-         ((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_SUPPORT_OFFLOAD) != 0 &&\r
+        (((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_SUPPORT_OFFLOAD) != 0) &&\r
          !NetworkBoot->OffloadCapability) ||\r
-         ((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_SUPPORT_MPIO) != 0 &&\r
+        (((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_SUPPORT_MPIO) != 0) &&\r
          !NetworkBoot->iScsiMpioCapability) ||\r
-         ((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_CONFIGURED_IP4) != 0 &&\r
+        (((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_CONFIGURED_IP4) != 0) &&\r
          !NetworkBoot->iScsiIpv4Boot) ||\r
-         ((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_CONFIGURED_IP6) != 0 &&\r
-         !NetworkBoot->iScsiIpv6Boot)) {\r
+        (((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_CONFIGURED_IP6) != 0) &&\r
+         !NetworkBoot->iScsiIpv6Boot))\r
+    {\r
       FreePool (InfoBlock);\r
       continue;\r
     }\r
@@ -206,9 +209,11 @@ Exit:
   if (InfoBlock != NULL) {\r
     FreePool (InfoBlock);\r
   }\r
+\r
   if (AipHandleBuffer != NULL) {\r
     FreePool (AipHandleBuffer);\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -246,23 +251,22 @@ IScsiSupported (
   IN UINT8                        IpVersion\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_GUID                  *IScsiServiceBindingGuid;\r
-  EFI_GUID                  *TcpServiceBindingGuid;\r
-  EFI_GUID                  *DhcpServiceBindingGuid;\r
-  EFI_GUID                  *DnsServiceBindingGuid;\r
+  EFI_STATUS  Status;\r
+  EFI_GUID    *IScsiServiceBindingGuid;\r
+  EFI_GUID    *TcpServiceBindingGuid;\r
+  EFI_GUID    *DhcpServiceBindingGuid;\r
+  EFI_GUID    *DnsServiceBindingGuid;\r
 \r
   if (IpVersion == IP_VERSION_4) {\r
-    IScsiServiceBindingGuid  = &gIScsiV4PrivateGuid;\r
-    TcpServiceBindingGuid    = &gEfiTcp4ServiceBindingProtocolGuid;\r
-    DhcpServiceBindingGuid   = &gEfiDhcp4ServiceBindingProtocolGuid;\r
-    DnsServiceBindingGuid    = &gEfiDns4ServiceBindingProtocolGuid;\r
-\r
+    IScsiServiceBindingGuid = &gIScsiV4PrivateGuid;\r
+    TcpServiceBindingGuid   = &gEfiTcp4ServiceBindingProtocolGuid;\r
+    DhcpServiceBindingGuid  = &gEfiDhcp4ServiceBindingProtocolGuid;\r
+    DnsServiceBindingGuid   = &gEfiDns4ServiceBindingProtocolGuid;\r
   } else {\r
-    IScsiServiceBindingGuid  = &gIScsiV6PrivateGuid;\r
-    TcpServiceBindingGuid    = &gEfiTcp6ServiceBindingProtocolGuid;\r
-    DhcpServiceBindingGuid   = &gEfiDhcp6ServiceBindingProtocolGuid;\r
-    DnsServiceBindingGuid    = &gEfiDns6ServiceBindingProtocolGuid;\r
+    IScsiServiceBindingGuid = &gIScsiV6PrivateGuid;\r
+    TcpServiceBindingGuid   = &gEfiTcp6ServiceBindingProtocolGuid;\r
+    DhcpServiceBindingGuid  = &gEfiDhcp6ServiceBindingProtocolGuid;\r
+    DnsServiceBindingGuid   = &gEfiDns6ServiceBindingProtocolGuid;\r
   }\r
 \r
   Status = gBS->OpenProtocol (\r
@@ -325,7 +329,6 @@ IScsiSupported (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Start to manage the controller. This is the worker function for\r
   IScsiIp4(6)DriverBindingStart.\r
@@ -347,33 +350,33 @@ IScsiSupported (
 **/\r
 EFI_STATUS\r
 IScsiStart (\r
-  IN EFI_HANDLE                   Image,\r
-  IN EFI_HANDLE                   ControllerHandle,\r
-  IN UINT8                        IpVersion\r
+  IN EFI_HANDLE  Image,\r
+  IN EFI_HANDLE  ControllerHandle,\r
+  IN UINT8       IpVersion\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  ISCSI_DRIVER_DATA               *Private;\r
-  LIST_ENTRY                      *Entry;\r
-  LIST_ENTRY                      *NextEntry;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA     *AttemptConfigData;\r
-  ISCSI_SESSION                   *Session;\r
-  UINT8                           Index;\r
-  EFI_EXT_SCSI_PASS_THRU_PROTOCOL *ExistIScsiExtScsiPassThru;\r
-  ISCSI_DRIVER_DATA               *ExistPrivate;\r
-  UINT8                           *AttemptConfigOrder;\r
-  UINTN                           AttemptConfigOrderSize;\r
-  UINT8                           BootSelected;\r
-  EFI_HANDLE                      *HandleBuffer;\r
-  UINTN                           NumberOfHandles;\r
-  EFI_DEVICE_PATH_PROTOCOL        *DevicePath;\r
-  EFI_GUID                        *IScsiPrivateGuid;\r
-  EFI_GUID                        *TcpServiceBindingGuid;\r
-  BOOLEAN                         NeedUpdate;\r
-  VOID                            *Interface;\r
-  EFI_GUID                        *ProtocolGuid;\r
-  UINT8                           NetworkBootPolicy;\r
-  ISCSI_SESSION_CONFIG_NVDATA     *NvData;\r
+  EFI_STATUS                       Status;\r
+  ISCSI_DRIVER_DATA                *Private;\r
+  LIST_ENTRY                       *Entry;\r
+  LIST_ENTRY                       *NextEntry;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA      *AttemptConfigData;\r
+  ISCSI_SESSION                    *Session;\r
+  UINT8                            Index;\r
+  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *ExistIScsiExtScsiPassThru;\r
+  ISCSI_DRIVER_DATA                *ExistPrivate;\r
+  UINT8                            *AttemptConfigOrder;\r
+  UINTN                            AttemptConfigOrderSize;\r
+  UINT8                            BootSelected;\r
+  EFI_HANDLE                       *HandleBuffer;\r
+  UINTN                            NumberOfHandles;\r
+  EFI_DEVICE_PATH_PROTOCOL         *DevicePath;\r
+  EFI_GUID                         *IScsiPrivateGuid;\r
+  EFI_GUID                         *TcpServiceBindingGuid;\r
+  BOOLEAN                          NeedUpdate;\r
+  VOID                             *Interface;\r
+  EFI_GUID                         *ProtocolGuid;\r
+  UINT8                            NetworkBootPolicy;\r
+  ISCSI_SESSION_CONFIG_NVDATA      *NvData;\r
 \r
   //\r
   // Test to see if iSCSI driver supports the given controller.\r
@@ -518,7 +521,7 @@ IScsiStart (
   if (mPrivate->OneSessionEstablished && mPrivate->EnableMpio) {\r
     AttemptConfigData = NULL;\r
     NET_LIST_FOR_EACH (Entry, &mPrivate->AttemptConfigs) {\r
-     AttemptConfigData = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);\r
+      AttemptConfigData = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);\r
       if (AttemptConfigData->SessionConfigData.Enabled == ISCSI_ENABLED_FOR_MPIO) {\r
         break;\r
       }\r
@@ -558,7 +561,7 @@ IScsiStart (
       Status = gBS->HandleProtocol (\r
                       HandleBuffer[Index],\r
                       &gEfiDevicePathProtocolGuid,\r
-                      (VOID **) &DevicePath\r
+                      (VOID **)&DevicePath\r
                       );\r
       if (EFI_ERROR (Status)) {\r
         continue;\r
@@ -572,7 +575,7 @@ IScsiStart (
           Status = gBS->HandleProtocol (\r
                           HandleBuffer[Index],\r
                           &gEfiExtScsiPassThruProtocolGuid,\r
-                          (VOID **) &ExistIScsiExtScsiPassThru\r
+                          (VOID **)&ExistIScsiExtScsiPassThru\r
                           );\r
           ASSERT_EFI_ERROR (Status);\r
           break;\r
@@ -622,9 +625,10 @@ IScsiStart (
     // Don't process the attempt that does not associate with the current NIC or\r
     // this attempt is disabled or established.\r
     //\r
-    if (AttemptConfigData->NicIndex != mPrivate->CurrentNic ||\r
-        AttemptConfigData->SessionConfigData.Enabled == ISCSI_DISABLED ||\r
-        AttemptConfigData->ValidPath) {\r
+    if ((AttemptConfigData->NicIndex != mPrivate->CurrentNic) ||\r
+        (AttemptConfigData->SessionConfigData.Enabled == ISCSI_DISABLED) ||\r
+        AttemptConfigData->ValidPath)\r
+    {\r
       continue;\r
     }\r
 \r
@@ -633,9 +637,10 @@ IScsiStart (
     // In default single path mode, don't process attempts configured for multipath.\r
     //\r
     if ((mPrivate->EnableMpio &&\r
-         AttemptConfigData->SessionConfigData.Enabled != ISCSI_ENABLED_FOR_MPIO) ||\r
+         (AttemptConfigData->SessionConfigData.Enabled != ISCSI_ENABLED_FOR_MPIO)) ||\r
         (!mPrivate->EnableMpio &&\r
-         AttemptConfigData->SessionConfigData.Enabled != ISCSI_ENABLED)) {\r
+         (AttemptConfigData->SessionConfigData.Enabled != ISCSI_ENABLED)))\r
+    {\r
       continue;\r
     }\r
 \r
@@ -643,18 +648,21 @@ IScsiStart (
     // Don't process the attempt that fails to get the init/target information from DHCP.\r
     //\r
     if (AttemptConfigData->SessionConfigData.InitiatorInfoFromDhcp &&\r
-        !AttemptConfigData->DhcpSuccess) {\r
-      if (!mPrivate->EnableMpio && mPrivate->ValidSinglePathCount > 0) {\r
+        !AttemptConfigData->DhcpSuccess)\r
+    {\r
+      if (!mPrivate->EnableMpio && (mPrivate->ValidSinglePathCount > 0)) {\r
         mPrivate->ValidSinglePathCount--;\r
       }\r
+\r
       continue;\r
     }\r
 \r
     //\r
     // Don't process the autoconfigure path if it is already established.\r
     //\r
-    if (AttemptConfigData->SessionConfigData.IpMode == IP_MODE_AUTOCONFIG &&\r
-        AttemptConfigData->AutoConfigureSuccess) {\r
+    if ((AttemptConfigData->SessionConfigData.IpMode == IP_MODE_AUTOCONFIG) &&\r
+        AttemptConfigData->AutoConfigureSuccess)\r
+    {\r
       continue;\r
     }\r
 \r
@@ -665,16 +673,20 @@ IScsiStart (
       if (AttemptConfigData->SessionConfigData.IpMode == IP_MODE_IP6) {\r
         continue;\r
       }\r
-      if (AttemptConfigData->SessionConfigData.IpMode == IP_MODE_AUTOCONFIG &&\r
-          AttemptConfigData->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP6) {\r
+\r
+      if ((AttemptConfigData->SessionConfigData.IpMode == IP_MODE_AUTOCONFIG) &&\r
+          (AttemptConfigData->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP6))\r
+      {\r
         continue;\r
       }\r
     } else {\r
       if (AttemptConfigData->SessionConfigData.IpMode == IP_MODE_IP4) {\r
         continue;\r
       }\r
-      if (AttemptConfigData->SessionConfigData.IpMode == IP_MODE_AUTOCONFIG &&\r
-          AttemptConfigData->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP4) {\r
+\r
+      if ((AttemptConfigData->SessionConfigData.IpMode == IP_MODE_AUTOCONFIG) &&\r
+          (AttemptConfigData->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP4))\r
+      {\r
         continue;\r
       }\r
     }\r
@@ -682,7 +694,7 @@ IScsiStart (
     //\r
     // Fill in the Session and init it.\r
     //\r
-    Session = (ISCSI_SESSION *) AllocateZeroPool (sizeof (ISCSI_SESSION));\r
+    Session = (ISCSI_SESSION *)AllocateZeroPool (sizeof (ISCSI_SESSION));\r
     if (Session == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto ON_ERROR;\r
@@ -694,9 +706,9 @@ IScsiStart (
 \r
     UnicodeSPrint (\r
       mPrivate->PortString,\r
-      (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+      (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
       L"Attempt %d",\r
-      (UINTN) AttemptConfigData->AttemptConfigIndex\r
+      (UINTN)AttemptConfigData->AttemptConfigIndex\r
       );\r
 \r
     if (Session->AuthType == ISCSI_AUTH_TYPE_CHAP) {\r
@@ -742,12 +754,11 @@ IScsiStart (
       // In Single path mode, only the successful attempt will be recorded in iBFT;\r
       // in multi-path mode, all the attempt entries in MPIO will be recorded in iBFT.\r
       //\r
-      if (!mPrivate->EnableMpio && mPrivate->ValidSinglePathCount > 0) {\r
+      if (!mPrivate->EnableMpio && (mPrivate->ValidSinglePathCount > 0)) {\r
         mPrivate->ValidSinglePathCount--;\r
       }\r
 \r
       FreePool (Session);\r
-\r
     } else {\r
       AttemptConfigData->ValidPath = TRUE;\r
 \r
@@ -756,7 +767,7 @@ IScsiStart (
       // TODO: record KRB5 attempt information in the iSCSI device path.\r
       //\r
       if (Session->AuthType == ISCSI_AUTH_TYPE_KRB) {\r
-        if (!mPrivate->EnableMpio && mPrivate->ValidSinglePathCount > 0) {\r
+        if (!mPrivate->EnableMpio && (mPrivate->ValidSinglePathCount > 0)) {\r
           mPrivate->ValidSinglePathCount--;\r
         }\r
 \r
@@ -814,7 +825,7 @@ IScsiStart (
     //\r
     // Reinstall the original ExtScsiPassThru back.\r
     //\r
-    if (mPrivate->OneSessionEstablished && ExistPrivate != NULL) {\r
+    if (mPrivate->OneSessionEstablished && (ExistPrivate != NULL)) {\r
       Status = gBS->InstallProtocolInterface (\r
                       &ExistPrivate->ExtScsiPassThruHandle,\r
                       &gEfiExtScsiPassThruProtocolGuid,\r
@@ -837,8 +848,7 @@ IScsiStart (
   //\r
   // More than one attempt successes.\r
   //\r
-  if (Private->Session != NULL && mPrivate->OneSessionEstablished) {\r
-\r
+  if ((Private->Session != NULL) && mPrivate->OneSessionEstablished) {\r
     AttemptConfigOrder = IScsiGetVariableAndSize (\r
                            L"AttemptOrder",\r
                            &gIScsiConfigGuid,\r
@@ -847,9 +857,11 @@ IScsiStart (
     if (AttemptConfigOrder == NULL) {\r
       goto ON_ERROR;\r
     }\r
+\r
     for (Index = 0; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {\r
-      if (AttemptConfigOrder[Index] == mPrivate->BootSelectedIndex ||\r
-          AttemptConfigOrder[Index] == BootSelected) {\r
+      if ((AttemptConfigOrder[Index] == mPrivate->BootSelectedIndex) ||\r
+          (AttemptConfigOrder[Index] == BootSelected))\r
+      {\r
         break;\r
       }\r
     }\r
@@ -887,6 +899,7 @@ IScsiStart (
         if (AttemptConfigOrder[Index] != BootSelected) {\r
           goto ON_ERROR;\r
         }\r
+\r
         mPrivate->BootSelectedIndex = BootSelected;\r
         //\r
         // Clear the resource in ExistPrivate.\r
@@ -917,7 +930,6 @@ IScsiStart (
 \r
         gBS->CloseEvent (ExistPrivate->ExitBootServiceEvent);\r
         FreePool (ExistPrivate);\r
-\r
       }\r
     } else {\r
       //\r
@@ -927,7 +939,6 @@ IScsiStart (
         NeedUpdate = FALSE;\r
       }\r
     }\r
-\r
   }\r
 \r
   if (NeedUpdate) {\r
@@ -945,6 +956,7 @@ IScsiStart (
     Status = EFI_DEVICE_ERROR;\r
     goto ON_ERROR;\r
   }\r
+\r
   //\r
   // Install the updated device path onto the ExtScsiPassThruHandle.\r
   //\r
@@ -1032,16 +1044,15 @@ IScsiStop (
   IN UINT8                        IpVersion\r
   )\r
 {\r
-  EFI_HANDLE                      IScsiController;\r
-  EFI_STATUS                      Status;\r
-  ISCSI_PRIVATE_PROTOCOL          *IScsiIdentifier;\r
-  ISCSI_DRIVER_DATA               *Private;\r
-  EFI_EXT_SCSI_PASS_THRU_PROTOCOL *PassThru;\r
-  ISCSI_CONNECTION                *Conn;\r
-  EFI_GUID                        *ProtocolGuid;\r
-  EFI_GUID                        *TcpServiceBindingGuid;\r
-  EFI_GUID                        *TcpProtocolGuid;\r
-\r
+  EFI_HANDLE                       IScsiController;\r
+  EFI_STATUS                       Status;\r
+  ISCSI_PRIVATE_PROTOCOL           *IScsiIdentifier;\r
+  ISCSI_DRIVER_DATA                *Private;\r
+  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *PassThru;\r
+  ISCSI_CONNECTION                 *Conn;\r
+  EFI_GUID                         *ProtocolGuid;\r
+  EFI_GUID                         *TcpServiceBindingGuid;\r
+  EFI_GUID                         *TcpProtocolGuid;\r
 \r
   if (NumberOfChildren != 0) {\r
     //\r
@@ -1050,7 +1061,7 @@ IScsiStop (
     Status = gBS->OpenProtocol (\r
                     ChildHandleBuffer[0],\r
                     &gEfiExtScsiPassThruProtocolGuid,\r
-                    (VOID **) &PassThru,\r
+                    (VOID **)&PassThru,\r
                     This->DriverBindingHandle,\r
                     ControllerHandle,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1094,14 +1105,15 @@ IScsiStop (
   // Get the handle of the controller we are controlling.\r
   //\r
   if (IpVersion == IP_VERSION_4) {\r
-    ProtocolGuid            = &gIScsiV4PrivateGuid;\r
-    TcpProtocolGuid         = &gEfiTcp4ProtocolGuid;\r
-    TcpServiceBindingGuid   = &gEfiTcp4ServiceBindingProtocolGuid;\r
+    ProtocolGuid          = &gIScsiV4PrivateGuid;\r
+    TcpProtocolGuid       = &gEfiTcp4ProtocolGuid;\r
+    TcpServiceBindingGuid = &gEfiTcp4ServiceBindingProtocolGuid;\r
   } else {\r
-    ProtocolGuid            = &gIScsiV6PrivateGuid;\r
-    TcpProtocolGuid         = &gEfiTcp6ProtocolGuid;\r
-    TcpServiceBindingGuid   = &gEfiTcp6ServiceBindingProtocolGuid;\r
+    ProtocolGuid          = &gIScsiV6PrivateGuid;\r
+    TcpProtocolGuid       = &gEfiTcp6ProtocolGuid;\r
+    TcpServiceBindingGuid = &gEfiTcp6ServiceBindingProtocolGuid;\r
   }\r
+\r
   IScsiController = NetLibGetNicHandle (ControllerHandle, TcpProtocolGuid);\r
   if (IScsiController == NULL) {\r
     return EFI_SUCCESS;\r
@@ -1110,7 +1122,7 @@ IScsiStop (
   Status = gBS->OpenProtocol (\r
                   IScsiController,\r
                   ProtocolGuid,\r
-                  (VOID **) &IScsiIdentifier,\r
+                  (VOID **)&IScsiIdentifier,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1272,7 +1284,7 @@ IScsiIp4DriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS        Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = IScsiStart (This->DriverBindingHandle, ControllerHandle, IP_VERSION_4);\r
   if (Status == EFI_ALREADY_STARTED) {\r
@@ -1427,7 +1439,7 @@ IScsiIp6DriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS        Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = IScsiStart (This->DriverBindingHandle, ControllerHandle, IP_VERSION_6);\r
   if (Status == EFI_ALREADY_STARTED) {\r
@@ -1496,12 +1508,12 @@ IScsiUnload (
   IN EFI_HANDLE  ImageHandle\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  UINTN                             DeviceHandleCount;\r
-  EFI_HANDLE                        *DeviceHandleBuffer;\r
-  UINTN                             Index;\r
-  EFI_COMPONENT_NAME_PROTOCOL       *ComponentName;\r
-  EFI_COMPONENT_NAME2_PROTOCOL      *ComponentName2;\r
+  EFI_STATUS                    Status;\r
+  UINTN                         DeviceHandleCount;\r
+  EFI_HANDLE                    *DeviceHandleBuffer;\r
+  UINTN                         Index;\r
+  EFI_COMPONENT_NAME_PROTOCOL   *ComponentName;\r
+  EFI_COMPONENT_NAME2_PROTOCOL  *ComponentName2;\r
 \r
   //\r
   // Try to disconnect the driver from the devices it's controlling.\r
@@ -1524,11 +1536,13 @@ IScsiUnload (
     Status = IScsiTestManagedDevice (\r
                DeviceHandleBuffer[Index],\r
                gIScsiIp4DriverBinding.DriverBindingHandle,\r
-               &gEfiTcp4ProtocolGuid)\r
-               ;\r
+               &gEfiTcp4ProtocolGuid\r
+               )\r
+    ;\r
     if (EFI_ERROR (Status)) {\r
       continue;\r
     }\r
+\r
     Status = gBS->DisconnectController (\r
                     DeviceHandleBuffer[Index],\r
                     gIScsiIp4DriverBinding.DriverBindingHandle,\r
@@ -1551,6 +1565,7 @@ IScsiUnload (
     if (EFI_ERROR (Status)) {\r
       continue;\r
     }\r
+\r
     Status = gBS->DisconnectController (\r
                     DeviceHandleBuffer[Index],\r
                     gIScsiIp6DriverBinding.DriverBindingHandle,\r
@@ -1582,11 +1597,12 @@ IScsiUnload (
     goto ON_EXIT;\r
   }\r
 \r
-  if (gIScsiControllerNameTable!= NULL) {\r
+  if (gIScsiControllerNameTable != NULL) {\r
     Status = FreeUnicodeStringTable (gIScsiControllerNameTable);\r
     if (EFI_ERROR (Status)) {\r
       goto ON_EXIT;\r
     }\r
+\r
     gIScsiControllerNameTable = NULL;\r
   }\r
 \r
@@ -1597,15 +1613,15 @@ IScsiUnload (
   Status = gBS->HandleProtocol (\r
                   gIScsiIp4DriverBinding.DriverBindingHandle,\r
                   &gEfiComponentNameProtocolGuid,\r
-                  (VOID **) &ComponentName\r
+                  (VOID **)&ComponentName\r
                   );\r
   if (!EFI_ERROR (Status)) {\r
     Status = gBS->UninstallMultipleProtocolInterfaces (\r
-           gIScsiIp4DriverBinding.DriverBindingHandle,\r
-           &gEfiComponentNameProtocolGuid,\r
-           ComponentName,\r
-           NULL\r
-           );\r
+                    gIScsiIp4DriverBinding.DriverBindingHandle,\r
+                    &gEfiComponentNameProtocolGuid,\r
+                    ComponentName,\r
+                    NULL\r
+                    );\r
     if (EFI_ERROR (Status)) {\r
       goto ON_EXIT;\r
     }\r
@@ -1614,7 +1630,7 @@ IScsiUnload (
   Status = gBS->HandleProtocol (\r
                   gIScsiIp4DriverBinding.DriverBindingHandle,\r
                   &gEfiComponentName2ProtocolGuid,\r
-                  (VOID **) &ComponentName2\r
+                  (VOID **)&ComponentName2\r
                   );\r
   if (!EFI_ERROR (Status)) {\r
     gBS->UninstallMultipleProtocolInterfaces (\r
@@ -1635,15 +1651,15 @@ IScsiUnload (
   Status = gBS->HandleProtocol (\r
                   gIScsiIp6DriverBinding.DriverBindingHandle,\r
                   &gEfiComponentNameProtocolGuid,\r
-                  (VOID **) &ComponentName\r
+                  (VOID **)&ComponentName\r
                   );\r
   if (!EFI_ERROR (Status)) {\r
     Status = gBS->UninstallMultipleProtocolInterfaces (\r
-           gIScsiIp6DriverBinding.DriverBindingHandle,\r
-           &gEfiComponentNameProtocolGuid,\r
-           ComponentName,\r
-           NULL\r
-           );\r
+                    gIScsiIp6DriverBinding.DriverBindingHandle,\r
+                    &gEfiComponentNameProtocolGuid,\r
+                    ComponentName,\r
+                    NULL\r
+                    );\r
     if (EFI_ERROR (Status)) {\r
       goto ON_EXIT;\r
     }\r
@@ -1652,7 +1668,7 @@ IScsiUnload (
   Status = gBS->HandleProtocol (\r
                   gIScsiIp6DriverBinding.DriverBindingHandle,\r
                   &gEfiComponentName2ProtocolGuid,\r
-                  (VOID **) &ComponentName2\r
+                  (VOID **)&ComponentName2\r
                   );\r
   if (!EFI_ERROR (Status)) {\r
     gBS->UninstallMultipleProtocolInterfaces (\r
@@ -1716,8 +1732,8 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 IScsiDriverEntryPoint (\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
@@ -1730,7 +1746,7 @@ IScsiDriverEntryPoint (
   Status = gBS->LocateProtocol (\r
                   &gEfiIScsiInitiatorNameProtocolGuid,\r
                   NULL,\r
-                  (VOID **) &IScsiInitiatorName\r
+                  (VOID **)&IScsiInitiatorName\r
                   );\r
   if (!EFI_ERROR (Status)) {\r
     return EFI_ACCESS_DENIED;\r
@@ -1821,7 +1837,7 @@ IScsiDriverEntryPoint (
   Status = gBS->LocateProtocol (\r
                   &gEfiAuthenticationInfoProtocolGuid,\r
                   NULL,\r
-                  (VOID **) &AuthenticationInfo\r
+                  (VOID **)&AuthenticationInfo\r
                   );\r
   if (Status == EFI_NOT_FOUND) {\r
     Status = gBS->InstallProtocolInterface (\r
@@ -1873,4 +1889,3 @@ Error1:
 \r
   return Status;\r
 }\r
-\r
index 070dbbad75209cfd484fb01e976a00015e6530aa..bc8b147f0e082e0582a0039f7ad557fa45b1741f 100644 (file)
@@ -21,10 +21,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
     0x28be27e5, 0x66cc, 0x4a31, { 0xa3, 0x15, 0xdb, 0x14, 0xc3, 0x74, 0x4d, 0x85 } \\r
   }\r
 \r
-#define ISCSI_INITIATOR_NAME_VAR_NAME L"I_NAME"\r
+#define ISCSI_INITIATOR_NAME_VAR_NAME  L"I_NAME"\r
 \r
-#define IP_MODE_AUTOCONFIG_IP4     3\r
-#define IP_MODE_AUTOCONFIG_IP6     4\r
+#define IP_MODE_AUTOCONFIG_IP4                      3\r
+#define IP_MODE_AUTOCONFIG_IP6                      4\r
 #define ALWAYS_USE_UEFI_ISCSI_AND_IGNORE_ISCSI_HBA  0x00\r
 #define STOP_UEFI_ISCSI_IF_HBA_INSTALL_AIP          0x01\r
 #define STOP_UEFI_ISCSI_IF_AIP_SUPPORT_IP4          0x02\r
@@ -45,41 +45,41 @@ extern EFI_GUID                           gIScsiV4PrivateGuid;
 extern EFI_GUID                           gIScsiV6PrivateGuid;\r
 \r
 typedef struct {\r
-  CHAR16          PortString[ISCSI_NAME_IFR_MAX_SIZE];\r
-  LIST_ENTRY      NicInfoList;\r
-  UINT8           NicCount;\r
-  UINT8           CurrentNic;\r
-  UINT8           MaxNic;\r
-  BOOLEAN         Ipv6Flag;\r
-  BOOLEAN         OneSessionEstablished;\r
-  BOOLEAN         EnableMpio;\r
-  UINT8           MpioCount;            // The number of attempts in MPIO.\r
-  UINT8           Krb5MpioCount;        // The number of attempts login with KRB5 in MPIO.\r
-  UINT8           SinglePathCount;      // The number of single path attempts.\r
-  UINT8           ValidSinglePathCount; // The number of valid single path attempts.\r
-  UINT8           BootSelectedIndex;\r
-  UINT8           AttemptCount;\r
-  LIST_ENTRY      AttemptConfigs;       // User configured Attempt list.\r
-  CHAR8           InitiatorName[ISCSI_NAME_MAX_SIZE];\r
-  UINTN           InitiatorNameLength;\r
+  CHAR16        PortString[ISCSI_NAME_IFR_MAX_SIZE];\r
+  LIST_ENTRY    NicInfoList;\r
+  UINT8         NicCount;\r
+  UINT8         CurrentNic;\r
+  UINT8         MaxNic;\r
+  BOOLEAN       Ipv6Flag;\r
+  BOOLEAN       OneSessionEstablished;\r
+  BOOLEAN       EnableMpio;\r
+  UINT8         MpioCount;              // The number of attempts in MPIO.\r
+  UINT8         Krb5MpioCount;          // The number of attempts login with KRB5 in MPIO.\r
+  UINT8         SinglePathCount;        // The number of single path attempts.\r
+  UINT8         ValidSinglePathCount;   // The number of valid single path attempts.\r
+  UINT8         BootSelectedIndex;\r
+  UINT8         AttemptCount;\r
+  LIST_ENTRY    AttemptConfigs;         // User configured Attempt list.\r
+  CHAR8         InitiatorName[ISCSI_NAME_MAX_SIZE];\r
+  UINTN         InitiatorNameLength;\r
 } ISCSI_PRIVATE_DATA;\r
 \r
-extern ISCSI_PRIVATE_DATA                 *mPrivate;\r
+extern ISCSI_PRIVATE_DATA  *mPrivate;\r
 \r
 typedef struct {\r
-  LIST_ENTRY      Link;\r
-  UINT32          HwAddressSize;\r
-  EFI_MAC_ADDRESS PermanentAddress;\r
-  UINT8           NicIndex;\r
-  UINT16          VlanId;\r
-  UINTN           BusNumber;\r
-  UINTN           DeviceNumber;\r
-  UINTN           FunctionNumber;\r
-  BOOLEAN         Ipv6Available;\r
+  LIST_ENTRY         Link;\r
+  UINT32             HwAddressSize;\r
+  EFI_MAC_ADDRESS    PermanentAddress;\r
+  UINT8              NicIndex;\r
+  UINT16             VlanId;\r
+  UINTN              BusNumber;\r
+  UINTN              DeviceNumber;\r
+  UINTN              FunctionNumber;\r
+  BOOLEAN            Ipv6Available;\r
 } ISCSI_NIC_INFO;\r
 \r
 typedef struct _ISCSI_PRIVATE_PROTOCOL {\r
-  UINT32  Reserved;\r
+  UINT32    Reserved;\r
 } ISCSI_PRIVATE_PROTOCOL;\r
 \r
 //\r
@@ -388,9 +388,9 @@ IScsiIp6DriverBindingStop (
 EFI_STATUS\r
 EFIAPI\r
 IScsiComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL   *This,\r
-  IN  CHAR8                         *Language,\r
-  OUT CHAR16                        **DriverName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
   );\r
 \r
 /**\r
@@ -465,11 +465,11 @@ IScsiComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 IScsiComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL   *This,\r
-  IN  EFI_HANDLE                    ControllerHandle,\r
-  IN  EFI_HANDLE                    ChildHandle        OPTIONAL,\r
-  IN  CHAR8                         *Language,\r
-  OUT CHAR16                        **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   );\r
 \r
 //\r
@@ -560,9 +560,9 @@ IScsiSetInitiatorName (
 EFI_STATUS\r
 EFIAPI\r
 IScsiGetAuthenticationInfo (\r
-  IN  EFI_AUTHENTICATION_INFO_PROTOCOL *This,\r
-  IN  EFI_HANDLE                       ControllerHandle,\r
-  OUT VOID                             **Buffer\r
+  IN  EFI_AUTHENTICATION_INFO_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                        ControllerHandle,\r
+  OUT VOID                              **Buffer\r
   );\r
 \r
 /**\r
@@ -641,11 +641,11 @@ IScsiSetAuthenticationInfo (
 EFI_STATUS\r
 EFIAPI\r
 IScsiExtScsiPassThruFunction (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                          *This,\r
-  IN UINT8                                                    *Target,\r
-  IN UINT64                                                   Lun,\r
-  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET           *Packet,\r
-  IN EFI_EVENT                                                Event     OPTIONAL\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                 *This,\r
+  IN UINT8                                           *Target,\r
+  IN UINT64                                          Lun,\r
+  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet,\r
+  IN EFI_EVENT                                       Event     OPTIONAL\r
   );\r
 \r
 /**\r
index 06fcf92bbe71ffe7e3ed9f7bd68f5549552f95b0..fde47221f61a60ebc63dd19aed9b00644b42fa8b 100644 (file)
@@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "IScsiImpl.h"\r
 \r
-EFI_EXT_SCSI_PASS_THRU_PROTOCOL gIScsiExtScsiPassThruProtocolTemplate = {\r
+EFI_EXT_SCSI_PASS_THRU_PROTOCOL  gIScsiExtScsiPassThruProtocolTemplate = {\r
   NULL,\r
   IScsiExtScsiPassThruFunction,\r
   IScsiExtScsiPassThruGetNextTargetLun,\r
@@ -19,7 +19,6 @@ EFI_EXT_SCSI_PASS_THRU_PROTOCOL gIScsiExtScsiPassThruProtocolTemplate = {
   IScsiExtScsiPassThruGetNextTarget\r
 };\r
 \r
-\r
 /**\r
   Sends a SCSI Request Packet to a SCSI device that is attached to the SCSI channel.\r
   This function supports both blocking I/O and nonblocking I/O. The blocking I/O\r
@@ -73,11 +72,11 @@ EFI_EXT_SCSI_PASS_THRU_PROTOCOL gIScsiExtScsiPassThruProtocolTemplate = {
 EFI_STATUS\r
 EFIAPI\r
 IScsiExtScsiPassThruFunction (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                          *This,\r
-  IN UINT8                                                    *Target,\r
-  IN UINT64                                                   Lun,\r
-  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET           *Packet,\r
-  IN EFI_EVENT                                                Event     OPTIONAL\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                 *This,\r
+  IN UINT8                                           *Target,\r
+  IN UINT64                                          Lun,\r
+  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet,\r
+  IN EFI_EVENT                                       Event     OPTIONAL\r
   )\r
 {\r
   EFI_STATUS         Status;\r
@@ -107,7 +106,6 @@ IScsiExtScsiPassThruFunction (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Used to retrieve the list of legal Target IDs and LUNs for SCSI devices on\r
   a SCSI channel. These can either be the list SCSI devices that are actually\r
@@ -145,14 +143,14 @@ IScsiExtScsiPassThruGetNextTargetLun (
   IN OUT UINT64                       *Lun\r
   )\r
 {\r
-  ISCSI_DRIVER_DATA           *Private;\r
-  ISCSI_SESSION_CONFIG_NVDATA *ConfigNvData;\r
-  UINT8                       TargetId[TARGET_MAX_BYTES];\r
+  ISCSI_DRIVER_DATA            *Private;\r
+  ISCSI_SESSION_CONFIG_NVDATA  *ConfigNvData;\r
+  UINT8                        TargetId[TARGET_MAX_BYTES];\r
 \r
-  Private       = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (This);\r
-  ConfigNvData  = &Private->Session->ConfigData->SessionConfigData;\r
+  Private      = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (This);\r
+  ConfigNvData = &Private->Session->ConfigData->SessionConfigData;\r
 \r
-  if ((*Target)[0] == 0 && (CompareMem (Lun, ConfigNvData->BootLun, sizeof (UINT64)) == 0)) {\r
+  if (((*Target)[0] == 0) && (CompareMem (Lun, ConfigNvData->BootLun, sizeof (UINT64)) == 0)) {\r
     //\r
     // Only one <Target, Lun> pair per iSCSI Driver instance.\r
     //\r
@@ -170,7 +168,6 @@ IScsiExtScsiPassThruGetNextTargetLun (
   return EFI_INVALID_PARAMETER;\r
 }\r
 \r
-\r
 /**\r
   Allocate and build a device path node for a SCSI device on a SCSI channel.\r
 \r
@@ -206,12 +203,12 @@ IScsiExtScsiPassThruBuildDevicePath (
   IN OUT EFI_DEVICE_PATH_PROTOCOL     **DevicePath\r
   )\r
 {\r
-  ISCSI_DRIVER_DATA             *Private;\r
-  ISCSI_SESSION                 *Session;\r
-  ISCSI_SESSION_CONFIG_NVDATA   *ConfigNvData;\r
-  ISCSI_CHAP_AUTH_CONFIG_NVDATA *AuthConfig;\r
-  EFI_DEV_PATH                  *Node;\r
-  UINTN                         DevPathNodeLen;\r
+  ISCSI_DRIVER_DATA              *Private;\r
+  ISCSI_SESSION                  *Session;\r
+  ISCSI_SESSION_CONFIG_NVDATA    *ConfigNvData;\r
+  ISCSI_CHAP_AUTH_CONFIG_NVDATA  *AuthConfig;\r
+  EFI_DEV_PATH                   *Node;\r
+  UINTN                          DevPathNodeLen;\r
 \r
   if (DevicePath == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -221,17 +218,17 @@ IScsiExtScsiPassThruBuildDevicePath (
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  Private       = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (This);\r
-  Session       = Private->Session;\r
-  ConfigNvData  = &Session->ConfigData->SessionConfigData;\r
-  AuthConfig    = Session->AuthData.CHAP.AuthConfig;\r
+  Private      = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (This);\r
+  Session      = Private->Session;\r
+  ConfigNvData = &Session->ConfigData->SessionConfigData;\r
+  AuthConfig   = Session->AuthData.CHAP.AuthConfig;\r
 \r
   if (CompareMem (&Lun, ConfigNvData->BootLun, sizeof (UINT64)) != 0) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  DevPathNodeLen  = sizeof (ISCSI_DEVICE_PATH) + AsciiStrLen (ConfigNvData->TargetName) + 1;\r
-  Node            = AllocateZeroPool (DevPathNodeLen);\r
+  DevPathNodeLen = sizeof (ISCSI_DEVICE_PATH) + AsciiStrLen (ConfigNvData->TargetName) + 1;\r
+  Node           = AllocateZeroPool (DevPathNodeLen);\r
   if (Node == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -245,36 +242,36 @@ IScsiExtScsiPassThruBuildDevicePath (
   //\r
   Node->Iscsi.NetworkProtocol = 0;\r
 \r
-  Node->Iscsi.LoginOption     = 0;\r
+  Node->Iscsi.LoginOption = 0;\r
 \r
   switch (Session->AuthType) {\r
-  case ISCSI_AUTH_TYPE_NONE:\r
-    Node->Iscsi.LoginOption |= 0x0800;\r
-    break;\r
-\r
-  case ISCSI_AUTH_TYPE_CHAP:\r
-    //\r
-    // Bit12: 0=CHAP_BI, 1=CHAP_UNI\r
-    //\r
-    if (AuthConfig->CHAPType == ISCSI_CHAP_UNI) {\r
-      Node->Iscsi.LoginOption |= 0x1000;\r
-    }\r
-    break;\r
-\r
-  default:\r
-    break;\r
+    case ISCSI_AUTH_TYPE_NONE:\r
+      Node->Iscsi.LoginOption |= 0x0800;\r
+      break;\r
+\r
+    case ISCSI_AUTH_TYPE_CHAP:\r
+      //\r
+      // Bit12: 0=CHAP_BI, 1=CHAP_UNI\r
+      //\r
+      if (AuthConfig->CHAPType == ISCSI_CHAP_UNI) {\r
+        Node->Iscsi.LoginOption |= 0x1000;\r
+      }\r
+\r
+      break;\r
+\r
+    default:\r
+      break;\r
   }\r
 \r
   CopyMem (&Node->Iscsi.Lun, ConfigNvData->BootLun, sizeof (UINT64));\r
   Node->Iscsi.TargetPortalGroupTag = Session->TargetPortalGroupTag;\r
-  AsciiStrCpyS ((CHAR8 *) Node + sizeof (ISCSI_DEVICE_PATH), AsciiStrLen (ConfigNvData->TargetName) + 1, ConfigNvData->TargetName);\r
+  AsciiStrCpyS ((CHAR8 *)Node + sizeof (ISCSI_DEVICE_PATH), AsciiStrLen (ConfigNvData->TargetName) + 1, ConfigNvData->TargetName);\r
 \r
-  *DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) Node;\r
+  *DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)Node;\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Translate a device path node to a Target ID and LUN.\r
 \r
@@ -305,8 +302,8 @@ IScsiExtScsiPassThruGetTargetLun (
   OUT UINT64                          *Lun\r
   )\r
 {\r
-  ISCSI_DRIVER_DATA           *Private;\r
-  ISCSI_SESSION_CONFIG_NVDATA *ConfigNvData;\r
+  ISCSI_DRIVER_DATA            *Private;\r
+  ISCSI_SESSION_CONFIG_NVDATA  *ConfigNvData;\r
 \r
   if ((DevicePath == NULL) || (Target == NULL) || (Lun == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -315,17 +312,18 @@ IScsiExtScsiPassThruGetTargetLun (
   if ((DevicePath->Type != MESSAGING_DEVICE_PATH) ||\r
       (DevicePath->SubType != MSG_ISCSI_DP) ||\r
       (DevicePathNodeLength (DevicePath) <= sizeof (ISCSI_DEVICE_PATH))\r
-      ) {\r
+      )\r
+  {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  Private       = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (This);\r
-  ConfigNvData  = &Private->Session->ConfigData->SessionConfigData;\r
+  Private      = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (This);\r
+  ConfigNvData = &Private->Session->ConfigData->SessionConfigData;\r
 \r
   SetMem (*Target, TARGET_MAX_BYTES, 0xFF);\r
   (*Target)[0] = 0;\r
 \r
-  if (AsciiStrCmp (ConfigNvData->TargetName, (CHAR8 *) DevicePath + sizeof (ISCSI_DEVICE_PATH)) != 0) {\r
+  if (AsciiStrCmp (ConfigNvData->TargetName, (CHAR8 *)DevicePath + sizeof (ISCSI_DEVICE_PATH)) != 0) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -334,7 +332,6 @@ IScsiExtScsiPassThruGetTargetLun (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Resets a SCSI channel. This operation resets all the SCSI devices connected to\r
   the SCSI channel.\r
@@ -353,7 +350,6 @@ IScsiExtScsiPassThruResetChannel (
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-\r
 /**\r
   Resets a SCSI device that is connected to a SCSI channel.\r
 \r
@@ -403,7 +399,7 @@ IScsiExtScsiPassThruGetNextTarget (
   IN OUT UINT8                        **Target\r
   )\r
 {\r
-  UINT8 TargetId[TARGET_MAX_BYTES];\r
+  UINT8  TargetId[TARGET_MAX_BYTES];\r
 \r
   SetMem (TargetId, TARGET_MAX_BYTES, 0xFF);\r
 \r
@@ -416,4 +412,3 @@ IScsiExtScsiPassThruGetNextTarget (
     return EFI_INVALID_PARAMETER;\r
   }\r
 }\r
-\r
index b2f82cb9b114c7f48fb2c499723019c4cc0c871f..155ecad554bc598c08705ba3581290845c9dccd7 100644 (file)
@@ -8,8 +8,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "IScsiImpl.h"\r
 \r
-BOOLEAN mIbftInstalled = FALSE;\r
-UINTN   mTableKey;\r
+BOOLEAN  mIbftInstalled = FALSE;\r
+UINTN    mTableKey;\r
 \r
 /**\r
   Initialize the header of the iSCSI Boot Firmware Table.\r
@@ -21,9 +21,9 @@ UINTN   mTableKey;
 **/\r
 VOID\r
 IScsiInitIbfTableHeader (\r
-  OUT EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_HEADER   *Header,\r
-  IN  UINT8                                       *OemId,\r
-  IN  UINT64                                      *OemTableId\r
+  OUT EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_HEADER  *Header,\r
+  IN  UINT8                                      *OemId,\r
+  IN  UINT64                                     *OemTableId\r
   )\r
 {\r
   Header->Signature = EFI_ACPI_3_0_ISCSI_BOOT_FIRMWARE_TABLE_SIGNATURE;\r
@@ -35,7 +35,6 @@ IScsiInitIbfTableHeader (
   CopyMem (&Header->OemTableId, OemTableId, sizeof (UINT64));\r
 }\r
 \r
-\r
 /**\r
   Initialize the control section of the iSCSI Boot Firmware Table.\r
 \r
@@ -50,11 +49,11 @@ IScsiInitControlSection (
   EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE  *Control;\r
   UINTN                                                 NumOffset;\r
 \r
-  Control = (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE *) (Table + 1);\r
+  Control = (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE *)(Table + 1);\r
 \r
   Control->Header.StructureId = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE_ID;\r
   Control->Header.Version     = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE_VERSION;\r
-  Control->Header.Length      = (UINT16) sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE);\r
+  Control->Header.Length      = (UINT16)sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE);\r
 \r
   //\r
   // If in multipathing mode, enable the Boot Failover Flag.\r
@@ -65,7 +64,7 @@ IScsiInitControlSection (
   //\r
   if (mPrivate->EnableMpio) {\r
     Control->Header.Flags = 0;\r
-    NumOffset = 2 * (mPrivate->MpioCount - mPrivate->Krb5MpioCount);\r
+    NumOffset             = 2 * (mPrivate->MpioCount - mPrivate->Krb5MpioCount);\r
   } else {\r
     NumOffset = 2 * mPrivate->ValidSinglePathCount;\r
   }\r
@@ -79,11 +78,10 @@ IScsiInitControlSection (
     // Need expand the control section if more than 2 NIC/Target attempts\r
     // exist.\r
     //\r
-    Control->Header.Length = (UINT16) (Control->Header.Length + (NumOffset - 4) * sizeof (UINT16));\r
+    Control->Header.Length = (UINT16)(Control->Header.Length + (NumOffset - 4) * sizeof (UINT16));\r
   }\r
 }\r
 \r
-\r
 /**\r
   Add one item into the heap.\r
 \r
@@ -109,7 +107,6 @@ IScsiAddHeapItem (
   *(*Heap + Len) = 0;\r
 }\r
 \r
-\r
 /**\r
   Fill the Initiator section of the iSCSI Boot Firmware Table.\r
 \r
@@ -126,19 +123,19 @@ IScsiFillInitiatorSection (
   EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE    *Control;\r
   EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE  *Initiator;\r
 \r
-  Control = (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE *) (Table + 1);\r
+  Control = (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE *)(Table + 1);\r
 \r
   //\r
   // Initiator section immediately follows the control section.\r
   //\r
   Initiator = (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE *)\r
-              ((UINT8 *) Control + IBFT_ROUNDUP (Control->Header.Length));\r
+              ((UINT8 *)Control + IBFT_ROUNDUP (Control->Header.Length));\r
 \r
-  Control->InitiatorOffset = (UINT16) ((UINTN) Initiator - (UINTN) Table);\r
+  Control->InitiatorOffset = (UINT16)((UINTN)Initiator - (UINTN)Table);\r
 \r
   Initiator->Header.StructureId = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_ID;\r
   Initiator->Header.Version     = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_VERSION;\r
-  Initiator->Header.Length      = (UINT16) sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE);\r
+  Initiator->Header.Length      = (UINT16)sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE);\r
   Initiator->Header.Flags       = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_FLAG_BLOCK_VALID |\r
                                   EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_FLAG_BOOT_SELECTED;\r
 \r
@@ -147,11 +144,10 @@ IScsiFillInitiatorSection (
   //\r
   IScsiAddHeapItem (Heap, mPrivate->InitiatorName, mPrivate->InitiatorNameLength - 1);\r
 \r
-  Initiator->IScsiNameLength  = (UINT16) (mPrivate->InitiatorNameLength - 1);\r
-  Initiator->IScsiNameOffset  = (UINT16) ((UINTN) *Heap - (UINTN) Table);\r
+  Initiator->IScsiNameLength = (UINT16)(mPrivate->InitiatorNameLength - 1);\r
+  Initiator->IScsiNameOffset = (UINT16)((UINTN)*Heap - (UINTN)Table);\r
 }\r
 \r
-\r
 /**\r
   Map the v4 IP address into v6 IP address.\r
 \r
@@ -161,23 +157,22 @@ IScsiFillInitiatorSection (
 **/\r
 VOID\r
 IScsiMapV4ToV6Addr (\r
-  IN  EFI_IPv4_ADDRESS *V4,\r
-  OUT EFI_IPv6_ADDRESS *V6\r
+  IN  EFI_IPv4_ADDRESS  *V4,\r
+  OUT EFI_IPv6_ADDRESS  *V6\r
   )\r
 {\r
-  UINTN Index;\r
+  UINTN  Index;\r
 \r
   ZeroMem (V6, sizeof (EFI_IPv6_ADDRESS));\r
 \r
-  V6->Addr[10]  = 0xff;\r
-  V6->Addr[11]  = 0xff;\r
+  V6->Addr[10] = 0xff;\r
+  V6->Addr[11] = 0xff;\r
 \r
   for (Index = 0; Index < 4; Index++) {\r
     V6->Addr[12 + Index] = V4->Addr[Index];\r
   }\r
 }\r
 \r
-\r
 /**\r
   Fill the NIC and target sections in iSCSI Boot Firmware Table.\r
 \r
@@ -208,11 +203,11 @@ IScsiFillNICAndTargetSections (
   //\r
   // Get the offset of the first Nic and Target section.\r
   //\r
-  Control = (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE *) (Table + 1);\r
-  Nic     = (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE *) ((UINTN) Table +\r
-          Control->InitiatorOffset + IBFT_ROUNDUP (sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE)));\r
-  Target  = (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE *) ((UINTN) Nic +\r
-          IBFT_ROUNDUP (sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE)));\r
+  Control = (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE *)(Table + 1);\r
+  Nic     = (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE *)((UINTN)Table +\r
+                                                                 Control->InitiatorOffset + IBFT_ROUNDUP (sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE)));\r
+  Target = (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE *)((UINTN)Nic +\r
+                                                                   IBFT_ROUNDUP (sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE)));\r
 \r
   SectionOffset = &Control->NIC0Offset;\r
 \r
@@ -233,11 +228,10 @@ IScsiFillNICAndTargetSections (
       }\r
 \r
       ASSERT (Attempt->SessionConfigData.Enabled != ISCSI_DISABLED);\r
-\r
     } else {\r
-      if (Index == 1 && Flag) {\r
+      if ((Index == 1) && Flag) {\r
         Entry = mPrivate->AttemptConfigs.ForwardLink;\r
-        Flag = FALSE;\r
+        Flag  = FALSE;\r
       }\r
 \r
       Attempt = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);\r
@@ -260,7 +254,7 @@ IScsiFillNICAndTargetSections (
     //\r
     // If multipath mode is enabled, only the attempts in MPIO will be recorded in iBFT.\r
     //\r
-    if (mPrivate->EnableMpio && Attempt->SessionConfigData.Enabled != ISCSI_ENABLED_FOR_MPIO) {\r
+    if (mPrivate->EnableMpio && (Attempt->SessionConfigData.Enabled != ISCSI_ENABLED_FOR_MPIO)) {\r
       continue;\r
     }\r
 \r
@@ -280,13 +274,13 @@ IScsiFillNICAndTargetSections (
 \r
     Nic->Header.StructureId = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_ID;\r
     Nic->Header.Version     = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_VERSION;\r
-    Nic->Header.Length      = (UINT16) sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE);\r
-    Nic->Header.Index       = (UINT8) Index;\r
+    Nic->Header.Length      = (UINT16)sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE);\r
+    Nic->Header.Index       = (UINT8)Index;\r
     Nic->Header.Flags       = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_FLAG_BLOCK_VALID |\r
-                            EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_FLAG_GLOBAL;\r
+                              EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_FLAG_GLOBAL;\r
 \r
     if (Index == 0) {\r
-      Nic->Header.Flags    |= EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_FLAG_BOOT_SELECTED;\r
+      Nic->Header.Flags |= EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_FLAG_BOOT_SELECTED;\r
     }\r
 \r
     if (NvData->InitiatorInfoFromDhcp) {\r
@@ -295,7 +289,7 @@ IScsiFillNICAndTargetSections (
       Nic->Origin = IpPrefixOriginManual;\r
     }\r
 \r
-    if (NvData->IpMode == IP_MODE_IP4 || NvData->IpMode == IP_MODE_AUTOCONFIG) {\r
+    if ((NvData->IpMode == IP_MODE_IP4) || (NvData->IpMode == IP_MODE_AUTOCONFIG)) {\r
       //\r
       // Get the subnet mask prefix length.\r
       //\r
@@ -309,16 +303,13 @@ IScsiFillNICAndTargetSections (
       IScsiMapV4ToV6Addr (&Attempt->PrimaryDns.v4, &Nic->PrimaryDns);\r
       IScsiMapV4ToV6Addr (&Attempt->SecondaryDns.v4, &Nic->SecondaryDns);\r
       IScsiMapV4ToV6Addr (&Attempt->DhcpServer.v4, &Nic->DhcpServer);\r
-\r
-    } else if (NvData->IpMode == IP_MODE_IP6 || NvData->IpMode == IP_MODE_AUTOCONFIG) {\r
-\r
+    } else if ((NvData->IpMode == IP_MODE_IP6) || (NvData->IpMode == IP_MODE_AUTOCONFIG)) {\r
       Nic->SubnetMaskPrefixLength = NvData->PrefixLength;\r
       CopyMem (&Nic->Ip, &NvData->LocalIp, sizeof (EFI_IPv6_ADDRESS));\r
       CopyMem (&Nic->Gateway, &NvData->Gateway, sizeof (EFI_IPv6_ADDRESS));\r
       CopyMem (&Nic->PrimaryDns, &Attempt->PrimaryDns, sizeof (EFI_IPv6_ADDRESS));\r
       CopyMem (&Nic->SecondaryDns, &Attempt->SecondaryDns, sizeof (EFI_IPv6_ADDRESS));\r
       CopyMem (&Nic->DhcpServer, &Attempt->DhcpServer, sizeof (EFI_IPv6_ADDRESS));\r
-\r
     } else {\r
       ASSERT (FALSE);\r
     }\r
@@ -331,26 +322,26 @@ IScsiFillNICAndTargetSections (
 \r
     Nic->VLanTag = NicInfo->VlanId;\r
     CopyMem (Nic->Mac, &NicInfo->PermanentAddress, sizeof (Nic->Mac));\r
-    Nic->PciLocation = (UINT16) ((NicInfo->BusNumber << 8)    |\r
-                                 (NicInfo->DeviceNumber << 3) | NicInfo->FunctionNumber);\r
-    *SectionOffset    = (UINT16) ((UINTN) Nic - (UINTN) Table);\r
+    Nic->PciLocation = (UINT16)((NicInfo->BusNumber << 8)    |\r
+                                (NicInfo->DeviceNumber << 3) | NicInfo->FunctionNumber);\r
+    *SectionOffset = (UINT16)((UINTN)Nic - (UINTN)Table);\r
     SectionOffset++;\r
 \r
     //\r
     // Fill the Target section.\r
     //\r
 \r
-    Target->Header.StructureId  = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_ID;\r
-    Target->Header.Version      = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_VERSION;\r
-    Target->Header.Length       = (UINT16) sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE);\r
-    Target->Header.Index        = (UINT8) Index;\r
-    Target->Header.Flags        = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_BLOCK_VALID;\r
+    Target->Header.StructureId = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_ID;\r
+    Target->Header.Version     = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_VERSION;\r
+    Target->Header.Length      = (UINT16)sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE);\r
+    Target->Header.Index       = (UINT8)Index;\r
+    Target->Header.Flags       = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_BLOCK_VALID;\r
 \r
     if (Index == 0) {\r
-      Target->Header.Flags     |= EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_BOOT_SELECTED;\r
+      Target->Header.Flags |= EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_BOOT_SELECTED;\r
     }\r
 \r
-    Target->Port                = NvData->TargetPort;\r
+    Target->Port = NvData->TargetPort;\r
 \r
     if (Attempt->AuthenticationType == ISCSI_AUTH_TYPE_CHAP) {\r
       if (AuthConfig->CHAPType == ISCSI_CHAP_UNI) {\r
@@ -362,11 +353,11 @@ IScsiFillNICAndTargetSections (
       Target->CHAPType = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_CHAP_TYPE_NO_CHAP;\r
     }\r
 \r
-    Target->NicIndex            = (UINT8) Index;\r
+    Target->NicIndex = (UINT8)Index;\r
 \r
-    if (NvData->IpMode == IP_MODE_IP4 || NvData->IpMode == IP_MODE_AUTOCONFIG) {\r
+    if ((NvData->IpMode == IP_MODE_IP4) || (NvData->IpMode == IP_MODE_AUTOCONFIG)) {\r
       IScsiMapV4ToV6Addr (&NvData->TargetIp.v4, &Target->Ip);\r
-    } else if (NvData->IpMode == IP_MODE_IP6 || NvData->IpMode == IP_MODE_AUTOCONFIG) {\r
+    } else if ((NvData->IpMode == IP_MODE_IP6) || (NvData->IpMode == IP_MODE_AUTOCONFIG)) {\r
       CopyMem (&Target->Ip, &NvData->TargetIp, sizeof (EFI_IPv6_ADDRESS));\r
     } else {\r
       ASSERT (FALSE);\r
@@ -377,64 +368,63 @@ IScsiFillNICAndTargetSections (
     //\r
     // Target iSCSI Name, CHAP name/secret, reverse CHAP name/secret.\r
     //\r
-    Length = (UINT16) AsciiStrLen (NvData->TargetName);\r
+    Length = (UINT16)AsciiStrLen (NvData->TargetName);\r
     IScsiAddHeapItem (Heap, NvData->TargetName, Length);\r
 \r
     Target->IScsiNameLength = Length;\r
-    Target->IScsiNameOffset = (UINT16) ((UINTN) *Heap - (UINTN) Table);\r
+    Target->IScsiNameOffset = (UINT16)((UINTN)*Heap - (UINTN)Table);\r
 \r
     if (Attempt->AuthenticationType == ISCSI_AUTH_TYPE_CHAP) {\r
       //\r
       // CHAP Name\r
       //\r
-      Length = (UINT16) AsciiStrLen (AuthConfig->CHAPName);\r
+      Length = (UINT16)AsciiStrLen (AuthConfig->CHAPName);\r
       IScsiAddHeapItem (Heap, AuthConfig->CHAPName, Length);\r
-      Target->CHAPNameLength  = Length;\r
-      Target->CHAPNameOffset  = (UINT16) ((UINTN) *Heap - (UINTN) Table);\r
+      Target->CHAPNameLength = Length;\r
+      Target->CHAPNameOffset = (UINT16)((UINTN)*Heap - (UINTN)Table);\r
 \r
       //\r
       // CHAP Secret\r
       //\r
-      Length = (UINT16) AsciiStrLen (AuthConfig->CHAPSecret);\r
+      Length = (UINT16)AsciiStrLen (AuthConfig->CHAPSecret);\r
       IScsiAddHeapItem (Heap, AuthConfig->CHAPSecret, Length);\r
-      Target->CHAPSecretLength  = Length;\r
-      Target->CHAPSecretOffset  = (UINT16) ((UINTN) *Heap - (UINTN) Table);\r
+      Target->CHAPSecretLength = Length;\r
+      Target->CHAPSecretOffset = (UINT16)((UINTN)*Heap - (UINTN)Table);\r
 \r
       if (Target->CHAPType == EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_CHAP_TYPE_MUTUAL_CHAP) {\r
         //\r
         // Reverse CHAP Name.\r
         //\r
-        Length = (UINT16) AsciiStrLen (AuthConfig->ReverseCHAPName);\r
+        Length = (UINT16)AsciiStrLen (AuthConfig->ReverseCHAPName);\r
         IScsiAddHeapItem (Heap, AuthConfig->ReverseCHAPName, Length);\r
         Target->ReverseCHAPNameLength = Length;\r
-        Target->ReverseCHAPNameOffset = (UINT16) ((UINTN) *Heap - (UINTN) Table);\r
+        Target->ReverseCHAPNameOffset = (UINT16)((UINTN)*Heap - (UINTN)Table);\r
 \r
         //\r
         // Reverse CHAP Secret.\r
         //\r
-        Length = (UINT16) AsciiStrLen (AuthConfig->ReverseCHAPSecret);\r
+        Length = (UINT16)AsciiStrLen (AuthConfig->ReverseCHAPSecret);\r
         IScsiAddHeapItem (Heap, AuthConfig->ReverseCHAPSecret, Length);\r
         Target->ReverseCHAPSecretLength = Length;\r
-        Target->ReverseCHAPSecretOffset = (UINT16) ((UINTN) *Heap - (UINTN) Table);\r
+        Target->ReverseCHAPSecretOffset = (UINT16)((UINTN)*Heap - (UINTN)Table);\r
       }\r
     }\r
 \r
-    *SectionOffset = (UINT16) ((UINTN) Target - (UINTN) Table);\r
+    *SectionOffset = (UINT16)((UINTN)Target - (UINTN)Table);\r
     SectionOffset++;\r
 \r
     //\r
     // Advance to the next NIC/Target pair.\r
     //\r
-    Nic    = (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE *) ((UINTN) Target +\r
-           IBFT_ROUNDUP (sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE)));\r
-    Target = (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE *) ((UINTN) Nic +\r
-           IBFT_ROUNDUP (sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE)));\r
+    Nic = (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE *)((UINTN)Target +\r
+                                                               IBFT_ROUNDUP (sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE)));\r
+    Target = (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE *)((UINTN)Nic +\r
+                                                                     IBFT_ROUNDUP (sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE)));\r
 \r
     Index++;\r
   }\r
 }\r
 \r
-\r
 /**\r
   Publish and remove the iSCSI Boot Firmware Table according to the iSCSI\r
   session status.\r
@@ -457,29 +447,29 @@ IScsiPublishIbft (
   Rsdt = NULL;\r
   Xsdt = NULL;\r
 \r
-  Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, (VOID **) &AcpiTableProtocol);\r
+  Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, (VOID **)&AcpiTableProtocol);\r
   if (EFI_ERROR (Status)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   //\r
   // Find ACPI table RSD_PTR from the system table.\r
   //\r
-  Status = EfiGetSystemConfigurationTable (&gEfiAcpiTableGuid, (VOID **) &Rsdp);\r
+  Status = EfiGetSystemConfigurationTable (&gEfiAcpiTableGuid, (VOID **)&Rsdp);\r
   if (EFI_ERROR (Status)) {\r
-    Status = EfiGetSystemConfigurationTable (&gEfiAcpi10TableGuid, (VOID **) &Rsdp);\r
+    Status = EfiGetSystemConfigurationTable (&gEfiAcpi10TableGuid, (VOID **)&Rsdp);\r
   }\r
 \r
   if (EFI_ERROR (Status) || (Rsdp == NULL)) {\r
-    return ;\r
-  } else if (Rsdp->Revision >= EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION && Rsdp->XsdtAddress != 0) {\r
-    Xsdt = (EFI_ACPI_DESCRIPTION_HEADER *) (UINTN) Rsdp->XsdtAddress;\r
+    return;\r
+  } else if ((Rsdp->Revision >= EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION) && (Rsdp->XsdtAddress != 0)) {\r
+    Xsdt = (EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Rsdp->XsdtAddress;\r
   } else if (Rsdp->RsdtAddress != 0) {\r
-    Rsdt = (EFI_ACPI_DESCRIPTION_HEADER *) (UINTN) Rsdp->RsdtAddress;\r
+    Rsdt = (EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Rsdp->RsdtAddress;\r
   }\r
 \r
   if ((Xsdt == NULL) && (Rsdt == NULL)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   if (mIbftInstalled) {\r
@@ -488,17 +478,19 @@ IScsiPublishIbft (
                                   mTableKey\r
                                   );\r
     if (EFI_ERROR (Status)) {\r
-      return ;\r
+      return;\r
     }\r
+\r
     mIbftInstalled = FALSE;\r
   }\r
 \r
   //\r
   // If there is no valid attempt configuration, just return.\r
   //\r
-  if ((!mPrivate->EnableMpio && mPrivate->ValidSinglePathCount == 0) ||\r
-      (mPrivate->EnableMpio && mPrivate->MpioCount <= mPrivate->Krb5MpioCount)) {\r
-    return ;\r
+  if ((!mPrivate->EnableMpio && (mPrivate->ValidSinglePathCount == 0)) ||\r
+      (mPrivate->EnableMpio && (mPrivate->MpioCount <= mPrivate->Krb5MpioCount)))\r
+  {\r
+    return;\r
   }\r
 \r
   //\r
@@ -506,10 +498,10 @@ IScsiPublishIbft (
   //\r
   Table = AllocateZeroPool (IBFT_MAX_SIZE);\r
   if (Table == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
-  Heap = (UINT8 *) Table + IBFT_HEAP_OFFSET;\r
+  Heap = (UINT8 *)Table + IBFT_HEAP_OFFSET;\r
 \r
   //\r
   // Fill in the various section of the iSCSI Boot Firmware Table.\r
@@ -524,7 +516,7 @@ IScsiPublishIbft (
   IScsiFillInitiatorSection (Table, &Heap);\r
   IScsiFillNICAndTargetSections (Table, &Heap);\r
 \r
-  Checksum = CalculateCheckSum8((UINT8 *)Table, Table->Length);\r
+  Checksum        = CalculateCheckSum8 ((UINT8 *)Table, Table->Length);\r
   Table->Checksum = Checksum;\r
 \r
   //\r
@@ -536,7 +528,7 @@ IScsiPublishIbft (
                                 Table->Length,\r
                                 &mTableKey\r
                                 );\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     return;\r
   }\r
 \r
index 98eb56e5c558f70ddae8bec7c06aab70a11550cc..168734d3f1f479a1d0f7974eb6e7bd720b336885 100644 (file)
@@ -14,9 +14,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Protocol/AcpiTable.h>\r
 #include <Protocol/PciIo.h>\r
 \r
-#define IBFT_TABLE_VAR_NAME L"iBFT"\r
-#define IBFT_MAX_SIZE       4096\r
-#define IBFT_HEAP_OFFSET    2048\r
+#define IBFT_TABLE_VAR_NAME  L"iBFT"\r
+#define IBFT_MAX_SIZE        4096\r
+#define IBFT_HEAP_OFFSET     2048\r
 \r
 #define IBFT_ROUNDUP(size)  NET_ROUNDUP ((size), EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_STRUCTURE_ALIGNMENT)\r
 \r
index ac3a25730efb265b371b59e39365d468d0ac3cfd..1d1a170c0e049e5771fe4fd3b1a111e631272557 100644 (file)
@@ -67,105 +67,105 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include "IScsiDns.h"\r
 #include "IScsiConfig.h"\r
 \r
-#define ISCSI_AUTH_INITIAL        0\r
+#define ISCSI_AUTH_INITIAL  0\r
 \r
-#define ISCSI_SESSION_SIGNATURE   SIGNATURE_32 ('I', 'S', 'S', 'N')\r
+#define ISCSI_SESSION_SIGNATURE  SIGNATURE_32 ('I', 'S', 'S', 'N')\r
 ///\r
 /// 10 seconds\r
 ///\r
-#define ISCSI_GET_MAPPING_TIMEOUT 100000000U\r
+#define ISCSI_GET_MAPPING_TIMEOUT  100000000U\r
 ///\r
 /// 3 seconds\r
 ///\r
 #define ISCSI_WAIT_IPSEC_TIMEOUT  30000000U\r
 \r
 struct _ISCSI_SESSION {\r
-  UINT32                      Signature;\r
+  UINT32                         Signature;\r
 \r
-  ISCSI_DRIVER_DATA           *Private;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA *ConfigData;\r
+  ISCSI_DRIVER_DATA              *Private;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA    *ConfigData;\r
 \r
-  UINT8                       AuthType;\r
+  UINT8                          AuthType;\r
   union {\r
-    ISCSI_CHAP_AUTH_DATA      CHAP;\r
+    ISCSI_CHAP_AUTH_DATA    CHAP;\r
   } AuthData;\r
 \r
-  UINT8                       State;\r
+  UINT8                          State;\r
 \r
-  UINT8                       Isid[6];\r
-  UINT16                      Tsih;\r
+  UINT8                          Isid[6];\r
+  UINT16                         Tsih;\r
 \r
-  UINT32                      CmdSN;\r
-  UINT32                      ExpCmdSN;\r
-  UINT32                      MaxCmdSN;\r
+  UINT32                         CmdSN;\r
+  UINT32                         ExpCmdSN;\r
+  UINT32                         MaxCmdSN;\r
 \r
-  UINT32                      InitiatorTaskTag;\r
-  UINT16                      NextCid;\r
+  UINT32                         InitiatorTaskTag;\r
+  UINT16                         NextCid;\r
 \r
-  LIST_ENTRY                  Conns;\r
-  UINT32                      NumConns;\r
+  LIST_ENTRY                     Conns;\r
+  UINT32                         NumConns;\r
 \r
-  LIST_ENTRY                  TcbList;\r
+  LIST_ENTRY                     TcbList;\r
 \r
   //\r
   // Session-wide parameters\r
   //\r
-  UINT16                      TargetPortalGroupTag;\r
-  UINT32                      MaxConnections;\r
-  BOOLEAN                     InitialR2T;\r
-  BOOLEAN                     ImmediateData;\r
-  UINT32                      MaxBurstLength;\r
-  UINT32                      FirstBurstLength;\r
-  UINT32                      DefaultTime2Wait;\r
-  UINT32                      DefaultTime2Retain;\r
-  UINT16                      MaxOutstandingR2T;\r
-  BOOLEAN                     DataPDUInOrder;\r
-  BOOLEAN                     DataSequenceInOrder;\r
-  UINT8                       ErrorRecoveryLevel;\r
+  UINT16                         TargetPortalGroupTag;\r
+  UINT32                         MaxConnections;\r
+  BOOLEAN                        InitialR2T;\r
+  BOOLEAN                        ImmediateData;\r
+  UINT32                         MaxBurstLength;\r
+  UINT32                         FirstBurstLength;\r
+  UINT32                         DefaultTime2Wait;\r
+  UINT32                         DefaultTime2Retain;\r
+  UINT16                         MaxOutstandingR2T;\r
+  BOOLEAN                        DataPDUInOrder;\r
+  BOOLEAN                        DataSequenceInOrder;\r
+  UINT8                          ErrorRecoveryLevel;\r
 };\r
 \r
 #define ISCSI_CONNECTION_SIGNATURE  SIGNATURE_32 ('I', 'S', 'C', 'N')\r
 \r
 struct _ISCSI_CONNECTION {\r
-  UINT32            Signature;\r
-  LIST_ENTRY        Link;\r
+  UINT32               Signature;\r
+  LIST_ENTRY           Link;\r
 \r
-  EFI_EVENT         TimeoutEvent;\r
+  EFI_EVENT            TimeoutEvent;\r
 \r
-  ISCSI_SESSION     *Session;\r
+  ISCSI_SESSION        *Session;\r
 \r
-  UINT8             State;\r
-  UINT8             CurrentStage;\r
-  UINT8             NextStage;\r
+  UINT8                State;\r
+  UINT8                CurrentStage;\r
+  UINT8                NextStage;\r
 \r
-  UINT8             AuthStep;\r
+  UINT8                AuthStep;\r
 \r
-  BOOLEAN           PartialReqSent;\r
-  BOOLEAN           PartialRspRcvd;\r
+  BOOLEAN              PartialReqSent;\r
+  BOOLEAN              PartialRspRcvd;\r
 \r
-  BOOLEAN           TransitInitiated;\r
-  BOOLEAN           ParamNegotiated;\r
+  BOOLEAN              TransitInitiated;\r
+  BOOLEAN              ParamNegotiated;\r
 \r
-  UINT16            Cid;\r
-  UINT32            ExpStatSN;\r
+  UINT16               Cid;\r
+  UINT32               ExpStatSN;\r
 \r
   //\r
   // Queues...\r
   //\r
-  NET_BUF_QUEUE     RspQue;\r
+  NET_BUF_QUEUE        RspQue;\r
 \r
-  BOOLEAN           Ipv6Flag;\r
-  TCP_IO            TcpIo;\r
+  BOOLEAN              Ipv6Flag;\r
+  TCP_IO               TcpIo;\r
 \r
   //\r
   // Connection-only parameters.\r
   //\r
-  UINT32            MaxRecvDataSegmentLength;\r
-  ISCSI_DIGEST_TYPE HeaderDigest;\r
-  ISCSI_DIGEST_TYPE DataDigest;\r
+  UINT32               MaxRecvDataSegmentLength;\r
+  ISCSI_DIGEST_TYPE    HeaderDigest;\r
+  ISCSI_DIGEST_TYPE    DataDigest;\r
 };\r
 \r
-#define ISCSI_DRIVER_DATA_SIGNATURE SIGNATURE_32 ('I', 'S', 'D', 'A')\r
+#define ISCSI_DRIVER_DATA_SIGNATURE  SIGNATURE_32 ('I', 'S', 'D', 'A')\r
 \r
 #define ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU(PassThru) \\r
   CR ( \\r
@@ -184,19 +184,19 @@ struct _ISCSI_CONNECTION {
   )\r
 \r
 struct _ISCSI_DRIVER_DATA {\r
-  UINT32                          Signature;\r
-  EFI_HANDLE                      Image;\r
-  EFI_HANDLE                      Controller;\r
-  ISCSI_PRIVATE_PROTOCOL          IScsiIdentifier;\r
-\r
-  EFI_EVENT                       ExitBootServiceEvent;\r
-\r
-  EFI_EXT_SCSI_PASS_THRU_PROTOCOL IScsiExtScsiPassThru;\r
-  EFI_EXT_SCSI_PASS_THRU_MODE     ExtScsiPassThruMode;\r
-  EFI_HANDLE                      ExtScsiPassThruHandle;\r
-  EFI_DEVICE_PATH_PROTOCOL        *DevicePath;\r
-  EFI_HANDLE                      ChildHandle;\r
-  ISCSI_SESSION                   *Session;\r
+  UINT32                             Signature;\r
+  EFI_HANDLE                         Image;\r
+  EFI_HANDLE                         Controller;\r
+  ISCSI_PRIVATE_PROTOCOL             IScsiIdentifier;\r
+\r
+  EFI_EVENT                          ExitBootServiceEvent;\r
+\r
+  EFI_EXT_SCSI_PASS_THRU_PROTOCOL    IScsiExtScsiPassThru;\r
+  EFI_EXT_SCSI_PASS_THRU_MODE        ExtScsiPassThruMode;\r
+  EFI_HANDLE                         ExtScsiPassThruHandle;\r
+  EFI_DEVICE_PATH_PROTOCOL           *DevicePath;\r
+  EFI_HANDLE                         ChildHandle;\r
+  ISCSI_SESSION                      *Session;\r
 };\r
 \r
 #endif\r
index 0d332e5c6ca4662eb4a80322a47092331d91a585..3eee10ba294c053ed598201386a7aee1b9eb5bee 100644 (file)
@@ -8,12 +8,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "IScsiImpl.h"\r
 \r
-EFI_ISCSI_INITIATOR_NAME_PROTOCOL gIScsiInitiatorName = {\r
+EFI_ISCSI_INITIATOR_NAME_PROTOCOL  gIScsiInitiatorName = {\r
   IScsiGetInitiatorName,\r
   IScsiSetInitiatorName\r
 };\r
 \r
-\r
 /**\r
   Retrieves the current set value of iSCSI Initiator Name.\r
 \r
@@ -64,7 +63,6 @@ IScsiGetInitiatorName (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Sets the iSSI Initiator Name.\r
 \r
@@ -110,10 +108,11 @@ IScsiSetInitiatorName (
     *BufferSize = ISCSI_NAME_MAX_SIZE;\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   //\r
   // Only support iqn iSCSI names.\r
   //\r
-  Status = IScsiNormalizeName ((CHAR8 *) Buffer, *BufferSize - 1);\r
+  Status = IScsiNormalizeName ((CHAR8 *)Buffer, *BufferSize - 1);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
index 4069547867513f50e97799e1294e9068835cd806..b3ea90158f51848776568cbfe2ca849f5efc2d4f 100644 (file)
@@ -21,22 +21,21 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8  IScsiHexString[] = "0123456789ABCDEFa
 **/\r
 VOID\r
 IScsiStrTrim (\r
-  IN OUT CHAR16   *Str,\r
-  IN     CHAR16   CharC\r
+  IN OUT CHAR16  *Str,\r
+  IN     CHAR16  CharC\r
   )\r
 {\r
   CHAR16  *Pointer1;\r
   CHAR16  *Pointer2;\r
 \r
   if (*Str == 0) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   //\r
   // Trim off the leading and trailing characters c\r
   //\r
   for (Pointer1 = Str; (*Pointer1 != 0) && (*Pointer1 == CharC); Pointer1++) {\r
-    ;\r
   }\r
 \r
   Pointer2 = Str;\r
@@ -47,18 +46,18 @@ IScsiStrTrim (
     }\r
   } else {\r
     while (*Pointer1 != 0) {\r
-    *Pointer2 = *Pointer1;\r
-    Pointer1++;\r
-    Pointer2++;\r
+      *Pointer2 = *Pointer1;\r
+      Pointer1++;\r
+      Pointer2++;\r
     }\r
+\r
     *Pointer2 = 0;\r
   }\r
 \r
-\r
-  for (Pointer1 = Str + StrLen(Str) - 1; Pointer1 >= Str && *Pointer1 == CharC; Pointer1--) {\r
-    ;\r
+  for (Pointer1 = Str + StrLen (Str) - 1; Pointer1 >= Str && *Pointer1 == CharC; Pointer1--) {\r
   }\r
-  if  (Pointer1 !=  Str + StrLen(Str) - 1) {\r
+\r
+  if (Pointer1 !=  Str + StrLen (Str) - 1) {\r
     *(Pointer1 + 1) = 0;\r
   }\r
 }\r
@@ -101,10 +100,9 @@ IScsiGetSubnetMaskPrefixLength (
     Len++;\r
   }\r
 \r
-  return (UINT8) (32 - Len);\r
+  return (UINT8)(32 - Len);\r
 }\r
 \r
-\r
 /**\r
   Convert the hexadecimal encoded LUN string into the 64-bit LUN.\r
 \r
@@ -128,15 +126,15 @@ IScsiAsciiStrToLun (
 \r
   ZeroMem (Lun, 8);\r
   ZeroMem (TemStr, 2);\r
-  ZeroMem ((UINT8 *) Value, sizeof (Value));\r
+  ZeroMem ((UINT8 *)Value, sizeof (Value));\r
   SizeStr    = AsciiStrLen (Str);\r
   IndexValue = 0;\r
   IndexNum   = 0;\r
 \r
-  for (Index = 0; Index < SizeStr; Index ++) {\r
+  for (Index = 0; Index < SizeStr; Index++) {\r
     TemStr[0] = Str[Index];\r
-    TemValue = (UINT8) AsciiStrHexToUint64 (TemStr);\r
-    if (TemValue == 0 && TemStr[0] != '0') {\r
+    TemValue  = (UINT8)AsciiStrHexToUint64 (TemStr);\r
+    if ((TemValue == 0) && (TemStr[0] != '0')) {\r
       if ((TemStr[0] != '-') || (IndexNum == 0)) {\r
         //\r
         // Invalid Lun Char.\r
@@ -155,6 +153,7 @@ IScsiAsciiStrToLun (
         //\r
         return EFI_INVALID_PARAMETER;\r
       }\r
+\r
       //\r
       // Restart str index for the next lun value.\r
       //\r
@@ -172,11 +171,11 @@ IScsiAsciiStrToLun (
     //\r
     // Combine UINT16 value.\r
     //\r
-    Value[IndexValue] = (UINT16) ((Value[IndexValue] << 4) + TemValue);\r
+    Value[IndexValue] = (UINT16)((Value[IndexValue] << 4) + TemValue);\r
   }\r
 \r
-  for (Index = 0; Index <= IndexValue; Index ++) {\r
-    *((UINT16 *) &Lun[Index * 2]) =  HTONS (Value[Index]);\r
+  for (Index = 0; Index <= IndexValue; Index++) {\r
+    *((UINT16 *)&Lun[Index * 2]) =  HTONS (Value[Index]);\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -201,26 +200,26 @@ IScsiLunToUnicodeStr (
   TempStr = Str;\r
 \r
   for (Index = 0; Index < 4; Index++) {\r
-\r
     if ((Lun[2 * Index] | Lun[2 * Index + 1]) == 0) {\r
       CopyMem (TempStr, L"0-", sizeof (L"0-"));\r
     } else {\r
-      TempStr[0]  = (CHAR16) IScsiHexString[Lun[2 * Index] >> 4];\r
-      TempStr[1]  = (CHAR16) IScsiHexString[Lun[2 * Index] & 0x0F];\r
-      TempStr[2]  = (CHAR16) IScsiHexString[Lun[2 * Index + 1] >> 4];\r
-      TempStr[3]  = (CHAR16) IScsiHexString[Lun[2 * Index + 1] & 0x0F];\r
-      TempStr[4]  = L'-';\r
-      TempStr[5]  = 0;\r
+      TempStr[0] = (CHAR16)IScsiHexString[Lun[2 * Index] >> 4];\r
+      TempStr[1] = (CHAR16)IScsiHexString[Lun[2 * Index] & 0x0F];\r
+      TempStr[2] = (CHAR16)IScsiHexString[Lun[2 * Index + 1] >> 4];\r
+      TempStr[3] = (CHAR16)IScsiHexString[Lun[2 * Index + 1] & 0x0F];\r
+      TempStr[4] = L'-';\r
+      TempStr[5] = 0;\r
 \r
       IScsiStrTrim (TempStr, L'0');\r
     }\r
 \r
     TempStr += StrLen (TempStr);\r
   }\r
+\r
   //\r
   // Remove the last '-'\r
   //\r
-  ASSERT (StrLen(Str) >= 1);\r
+  ASSERT (StrLen (Str) >= 1);\r
   Str[StrLen (Str) - 1] = 0;\r
 \r
   for (Index = StrLen (Str) - 1; Index > 1; Index = Index - 2) {\r
@@ -246,26 +245,24 @@ IScsiLunToUnicodeStr (
 **/\r
 EFI_STATUS\r
 IScsiAsciiStrToIp (\r
-  IN  CHAR8             *Str,\r
-  IN  UINT8             IpMode,\r
-  OUT EFI_IP_ADDRESS    *Ip\r
+  IN  CHAR8           *Str,\r
+  IN  UINT8           IpMode,\r
+  OUT EFI_IP_ADDRESS  *Ip\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
+  EFI_STATUS  Status;\r
 \r
-  if (IpMode == IP_MODE_IP4 || IpMode == IP_MODE_AUTOCONFIG_IP4) {\r
+  if ((IpMode == IP_MODE_IP4) || (IpMode == IP_MODE_AUTOCONFIG_IP4)) {\r
     return NetLibAsciiStrToIp4 (Str, &Ip->v4);\r
-\r
-  } else if (IpMode == IP_MODE_IP6 || IpMode == IP_MODE_AUTOCONFIG_IP6) {\r
+  } else if ((IpMode == IP_MODE_IP6) || (IpMode == IP_MODE_AUTOCONFIG_IP6)) {\r
     return NetLibAsciiStrToIp6 (Str, &Ip->v6);\r
-\r
   } else if (IpMode == IP_MODE_AUTOCONFIG) {\r
     Status = NetLibAsciiStrToIp4 (Str, &Ip->v4);\r
     if (!EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
-    return NetLibAsciiStrToIp6 (Str, &Ip->v6);\r
 \r
+    return NetLibAsciiStrToIp6 (Str, &Ip->v6);\r
   }\r
 \r
   return EFI_INVALID_PARAMETER;\r
@@ -292,14 +289,14 @@ IScsiMacAddrToStr (
   CHAR16  *String;\r
 \r
   for (Index = 0; Index < Len; Index++) {\r
-    Str[3 * Index]      = (CHAR16) IScsiHexString[(Mac->Addr[Index] >> 4) & 0x0F];\r
-    Str[3 * Index + 1]  = (CHAR16) IScsiHexString[Mac->Addr[Index] & 0x0F];\r
-    Str[3 * Index + 2]  = L':';\r
+    Str[3 * Index]     = (CHAR16)IScsiHexString[(Mac->Addr[Index] >> 4) & 0x0F];\r
+    Str[3 * Index + 1] = (CHAR16)IScsiHexString[Mac->Addr[Index] & 0x0F];\r
+    Str[3 * Index + 2] = L':';\r
   }\r
 \r
-  String = &Str[3 * Index - 1] ;\r
+  String = &Str[3 * Index - 1];\r
   if (VlanId != 0) {\r
-    String += UnicodeSPrint (String, 6 * sizeof (CHAR16), L"\\%04x", (UINTN) VlanId);\r
+    String += UnicodeSPrint (String, 6 * sizeof (CHAR16), L"\\%04x", (UINTN)VlanId);\r
   }\r
 \r
   *String = L'\0';\r
@@ -322,15 +319,15 @@ IScsiMacAddrToStr (
 **/\r
 EFI_STATUS\r
 IScsiBinToHex (\r
-  IN     UINT8  *BinBuffer,\r
-  IN     UINT32 BinLength,\r
-  IN OUT CHAR8  *HexStr,\r
-  IN OUT UINT32 *HexLength\r
+  IN     UINT8   *BinBuffer,\r
+  IN     UINT32  BinLength,\r
+  IN OUT CHAR8   *HexStr,\r
+  IN OUT UINT32  *HexLength\r
   )\r
 {\r
-  UINT32 HexLengthMin;\r
-  UINT32 HexLengthProvided;\r
-  UINT32 Index;\r
+  UINT32  HexLengthMin;\r
+  UINT32  HexLengthProvided;\r
+  UINT32  Index;\r
 \r
   if ((HexStr == NULL) || (BinBuffer == NULL) || (BinLength == 0)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -340,12 +337,13 @@ IScsiBinToHex (
   // Safely calculate: HexLengthMin := BinLength * 2 + 3.\r
   //\r
   if (RETURN_ERROR (SafeUint32Mult (BinLength, 2, &HexLengthMin)) ||\r
-      RETURN_ERROR (SafeUint32Add (HexLengthMin, 3, &HexLengthMin))) {\r
+      RETURN_ERROR (SafeUint32Add (HexLengthMin, 3, &HexLengthMin)))\r
+  {\r
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
   HexLengthProvided = *HexLength;\r
-  *HexLength = HexLengthMin;\r
+  *HexLength        = HexLengthMin;\r
   if (HexLengthProvided < HexLengthMin) {\r
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
@@ -366,7 +364,6 @@ IScsiBinToHex (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Convert the hexadecimal string into a binary encoded buffer.\r
 \r
@@ -385,9 +382,9 @@ IScsiBinToHex (
 **/\r
 EFI_STATUS\r
 IScsiHexToBin (\r
-  IN OUT UINT8  *BinBuffer,\r
-  IN OUT UINT32 *BinLength,\r
-  IN     CHAR8  *HexStr\r
+  IN OUT UINT8   *BinBuffer,\r
+  IN OUT UINT32  *BinLength,\r
+  IN     CHAR8   *HexStr\r
   )\r
 {\r
   UINTN   BinLengthMin;\r
@@ -411,9 +408,10 @@ IScsiHexToBin (
   //\r
   // Reject an empty hex string; reject a stray nibble.\r
   //\r
-  if (Length == 0 || Length % 2 != 0) {\r
+  if ((Length == 0) || (Length % 2 != 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   //\r
   // Check if the caller provides enough room for the decoded blob.\r
   //\r
@@ -421,31 +419,33 @@ IScsiHexToBin (
   if (BinLengthMin > MAX_UINT32) {\r
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
+\r
   BinLengthProvided = *BinLength;\r
-  *BinLength = (UINT32)BinLengthMin;\r
+  *BinLength        = (UINT32)BinLengthMin;\r
   if (BinLengthProvided < BinLengthMin) {\r
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
 \r
-  for (Index = 0; Index < Length; Index ++) {\r
+  for (Index = 0; Index < Length; Index++) {\r
     TemStr[0] = HexStr[Index];\r
-    Digit = (UINT8) AsciiStrHexToUint64 (TemStr);\r
-    if (Digit == 0 && TemStr[0] != '0') {\r
+    Digit     = (UINT8)AsciiStrHexToUint64 (TemStr);\r
+    if ((Digit == 0) && (TemStr[0] != '0')) {\r
       //\r
       // Invalid Hex Char.\r
       //\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     if ((Index & 1) == 0) {\r
-      BinBuffer [Index/2] = Digit;\r
+      BinBuffer[Index/2] = Digit;\r
     } else {\r
-      BinBuffer [Index/2] = (UINT8) ((BinBuffer [Index/2] << 4) + Digit);\r
+      BinBuffer[Index/2] = (UINT8)((BinBuffer[Index/2] << 4) + Digit);\r
     }\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Convert the decimal-constant string or hex-constant string into a numerical value.\r
 \r
@@ -468,7 +468,6 @@ IScsiNetNtoi (
   return AsciiStrDecimalToUintn (Str);\r
 }\r
 \r
-\r
 /**\r
   Generate random numbers.\r
 \r
@@ -486,12 +485,11 @@ IScsiGenRandom (
 \r
   while (RandLength > 0) {\r
     Random  = NET_RANDOM (NetRandomInitSeed ());\r
-    *Rand++ = (UINT8) (Random);\r
+    *Rand++ = (UINT8)(Random);\r
     RandLength--;\r
   }\r
 }\r
 \r
-\r
 /**\r
   Check whether UNDI protocol supports IPv6.\r
 \r
@@ -505,22 +503,22 @@ IScsiGenRandom (
 **/\r
 EFI_STATUS\r
 IScsiCheckIpv6Support (\r
-  IN  EFI_HANDLE                   ControllerHandle,\r
-  IN  EFI_HANDLE                   Image,\r
-  OUT BOOLEAN                      *Ipv6Support\r
+  IN  EFI_HANDLE  ControllerHandle,\r
+  IN  EFI_HANDLE  Image,\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
-\r
-  EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL *Nii;\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
+  EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL  *Nii;\r
 \r
   ASSERT (Ipv6Support != NULL);\r
 \r
@@ -530,7 +528,7 @@ IScsiCheckIpv6Support (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiNetworkInterfaceIdentifierProtocolGuid_31,\r
-                  (VOID **) &Nii,\r
+                  (VOID **)&Nii,\r
                   Image,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -552,16 +550,16 @@ IScsiCheckIpv6Support (
   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
@@ -584,13 +582,13 @@ IScsiCheckIpv6Support (
   //\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
@@ -613,12 +611,12 @@ IScsiAddNic (
   IN EFI_HANDLE  Image\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  ISCSI_NIC_INFO              *NicInfo;\r
-  LIST_ENTRY                  *Entry;\r
-  EFI_MAC_ADDRESS             MacAddr;\r
-  UINTN                       HwAddressSize;\r
-  UINT16                      VlanId;\r
+  EFI_STATUS       Status;\r
+  ISCSI_NIC_INFO   *NicInfo;\r
+  LIST_ENTRY       *Entry;\r
+  EFI_MAC_ADDRESS  MacAddr;\r
+  UINTN            HwAddressSize;\r
+  UINT16           VlanId;\r
 \r
   //\r
   // Get MAC address of this network device.\r
@@ -638,9 +636,10 @@ IScsiAddNic (
   //\r
   NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {\r
     NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);\r
-    if (NicInfo->HwAddressSize == HwAddressSize &&\r
-        CompareMem (&NicInfo->PermanentAddress, MacAddr.Addr, HwAddressSize) == 0 &&\r
-        NicInfo->VlanId == VlanId) {\r
+    if ((NicInfo->HwAddressSize == HwAddressSize) &&\r
+        (CompareMem (&NicInfo->PermanentAddress, MacAddr.Addr, HwAddressSize) == 0) &&\r
+        (NicInfo->VlanId == VlanId))\r
+    {\r
       mPrivate->CurrentNic = NicInfo->NicIndex;\r
 \r
       //\r
@@ -672,10 +671,10 @@ IScsiAddNic (
   }\r
 \r
   CopyMem (&NicInfo->PermanentAddress, MacAddr.Addr, HwAddressSize);\r
-  NicInfo->HwAddressSize  = (UINT32) HwAddressSize;\r
-  NicInfo->VlanId         = VlanId;\r
-  NicInfo->NicIndex       = (UINT8) (mPrivate->MaxNic + 1);\r
-  mPrivate->MaxNic        = NicInfo->NicIndex;\r
+  NicInfo->HwAddressSize = (UINT32)HwAddressSize;\r
+  NicInfo->VlanId        = VlanId;\r
+  NicInfo->NicIndex      = (UINT8)(mPrivate->MaxNic + 1);\r
+  mPrivate->MaxNic       = NicInfo->NicIndex;\r
 \r
   //\r
   // Set IPv6 available flag.\r
@@ -706,7 +705,6 @@ IScsiAddNic (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Delete the recorded NIC info from global structure. Also delete corresponding\r
   attempts.\r
@@ -722,15 +720,15 @@ IScsiRemoveNic (
   IN EFI_HANDLE  Controller\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  ISCSI_NIC_INFO              *NicInfo;\r
-  LIST_ENTRY                  *Entry;\r
-  LIST_ENTRY                  *NextEntry;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
-  ISCSI_NIC_INFO              *ThisNic;\r
-  EFI_MAC_ADDRESS             MacAddr;\r
-  UINTN                       HwAddressSize;\r
-  UINT16                      VlanId;\r
+  EFI_STATUS                   Status;\r
+  ISCSI_NIC_INFO               *NicInfo;\r
+  LIST_ENTRY                   *Entry;\r
+  LIST_ENTRY                   *NextEntry;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *AttemptConfigData;\r
+  ISCSI_NIC_INFO               *ThisNic;\r
+  EFI_MAC_ADDRESS              MacAddr;\r
+  UINTN                        HwAddressSize;\r
+  UINT16                       VlanId;\r
 \r
   //\r
   // Get MAC address of this network device.\r
@@ -752,10 +750,10 @@ IScsiRemoveNic (
 \r
   NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {\r
     NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);\r
-    if (NicInfo->HwAddressSize == HwAddressSize &&\r
-        CompareMem (&NicInfo->PermanentAddress, MacAddr.Addr, HwAddressSize) == 0 &&\r
-        NicInfo->VlanId == VlanId) {\r
-\r
+    if ((NicInfo->HwAddressSize == HwAddressSize) &&\r
+        (CompareMem (&NicInfo->PermanentAddress, MacAddr.Addr, HwAddressSize) == 0) &&\r
+        (NicInfo->VlanId == VlanId))\r
+    {\r
       ThisNic = NicInfo;\r
       break;\r
     }\r
@@ -780,16 +778,15 @@ IScsiRemoveNic (
       RemoveEntryList (&AttemptConfigData->Link);\r
       mPrivate->AttemptCount--;\r
 \r
-      if (AttemptConfigData->SessionConfigData.Enabled == ISCSI_ENABLED_FOR_MPIO && mPrivate->MpioCount > 0) {\r
+      if ((AttemptConfigData->SessionConfigData.Enabled == ISCSI_ENABLED_FOR_MPIO) && (mPrivate->MpioCount > 0)) {\r
         if (--mPrivate->MpioCount == 0) {\r
           mPrivate->EnableMpio = FALSE;\r
         }\r
 \r
-        if (AttemptConfigData->AuthenticationType == ISCSI_AUTH_TYPE_KRB && mPrivate->Krb5MpioCount > 0) {\r
+        if ((AttemptConfigData->AuthenticationType == ISCSI_AUTH_TYPE_KRB) && (mPrivate->Krb5MpioCount > 0)) {\r
           mPrivate->Krb5MpioCount--;\r
         }\r
-\r
-      } else if (AttemptConfigData->SessionConfigData.Enabled == ISCSI_ENABLED && mPrivate->SinglePathCount > 0) {\r
+      } else if ((AttemptConfigData->SessionConfigData.Enabled == ISCSI_ENABLED) && (mPrivate->SinglePathCount > 0)) {\r
         mPrivate->SinglePathCount--;\r
 \r
         if (mPrivate->ValidSinglePathCount > 0) {\r
@@ -815,19 +812,19 @@ IScsiRemoveNic (
 **/\r
 EFI_STATUS\r
 IScsiCreateAttempts (\r
-  IN UINTN            AttemptNum\r
-)\r
+  IN UINTN  AttemptNum\r
+  )\r
 {\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA   *AttemptConfigData;\r
-  ISCSI_SESSION_CONFIG_NVDATA   *ConfigData;\r
-  UINT8                         *AttemptConfigOrder;\r
-  UINTN                         AttemptConfigOrderSize;\r
-  UINT8                         *AttemptOrderTmp;\r
-  UINTN                         TotalNumber;\r
-  UINT8                         Index;\r
-  EFI_STATUS                    Status;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *AttemptConfigData;\r
+  ISCSI_SESSION_CONFIG_NVDATA  *ConfigData;\r
+  UINT8                        *AttemptConfigOrder;\r
+  UINTN                        AttemptConfigOrderSize;\r
+  UINT8                        *AttemptOrderTmp;\r
+  UINTN                        TotalNumber;\r
+  UINT8                        Index;\r
+  EFI_STATUS                   Status;\r
 \r
-  for (Index = 1; Index <= AttemptNum; Index ++) {\r
+  for (Index = 1; Index <= AttemptNum; Index++) {\r
     //\r
     // Get the initialized attempt order. This is used to essure creating attempts by order.\r
     //\r
@@ -841,6 +838,7 @@ IScsiCreateAttempts (
       Status = EFI_SUCCESS;\r
       break;\r
     }\r
+\r
     TotalNumber++;\r
 \r
     //\r
@@ -851,6 +849,7 @@ IScsiCreateAttempts (
       if (AttemptConfigOrder != NULL) {\r
         FreePool (AttemptConfigOrder);\r
       }\r
+\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
@@ -872,10 +871,14 @@ IScsiCreateAttempts (
                     );\r
     FreePool (AttemptConfigOrder);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR,\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
         "%a: Failed to set 'InitialAttemptOrder' with Guid (%g): "\r
         "%r\n",\r
-        __FUNCTION__, &gIScsiConfigGuid, Status));\r
+        __FUNCTION__,\r
+        &gIScsiConfigGuid,\r
+        Status\r
+        ));\r
       return Status;\r
     }\r
 \r
@@ -886,6 +889,7 @@ IScsiCreateAttempts (
     if (AttemptConfigData == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     ConfigData                    = &AttemptConfigData->SessionConfigData;\r
     ConfigData->TargetPort        = ISCSI_WELL_KNOWN_PORT;\r
     ConfigData->ConnectTimeout    = CONNECT_DEFAULT_TIMEOUT;\r
@@ -903,9 +907,9 @@ IScsiCreateAttempts (
     //\r
     UnicodeSPrint (\r
       mPrivate->PortString,\r
-      (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+      (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
       L"Attempt %d",\r
-      (UINTN) AttemptConfigData->AttemptConfigIndex\r
+      (UINTN)AttemptConfigData->AttemptConfigIndex\r
       );\r
     UnicodeStrToAsciiStrS (mPrivate->PortString, AttemptConfigData->AttemptName, ATTEMPT_NAME_SIZE);\r
 \r
@@ -918,10 +922,14 @@ IScsiCreateAttempts (
                     );\r
     FreePool (AttemptConfigData);\r
     if (EFI_ERROR (Status)) {\r
-        DEBUG ((DEBUG_ERROR,\r
-          "%a: Failed to set variable (mPrivate->PortString) with Guid (%g): "\r
-          "%r\n",\r
-          __FUNCTION__, &gEfiIScsiInitiatorNameProtocolGuid, Status));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Failed to set variable (mPrivate->PortString) with Guid (%g): "\r
+        "%r\n",\r
+        __FUNCTION__,\r
+        &gEfiIScsiInitiatorNameProtocolGuid,\r
+        Status\r
+        ));\r
       return Status;\r
     }\r
   }\r
@@ -941,18 +949,18 @@ IScsiCreateAttempts (
 **/\r
 EFI_STATUS\r
 IScsiCreateKeywords (\r
-  IN UINTN            KeywordNum\r
-)\r
+  IN UINTN  KeywordNum\r
+  )\r
 {\r
-  VOID                          *StartOpCodeHandle;\r
-  EFI_IFR_GUID_LABEL            *StartLabel;\r
-  VOID                          *EndOpCodeHandle;\r
-  EFI_IFR_GUID_LABEL            *EndLabel;\r
-  UINTN                         Index;\r
-  EFI_STRING_ID                 StringToken;\r
-  CHAR16                        StringId[64];\r
-  CHAR16                        KeywordId[32];\r
-  EFI_STATUS                    Status;\r
+  VOID                *StartOpCodeHandle;\r
+  EFI_IFR_GUID_LABEL  *StartLabel;\r
+  VOID                *EndOpCodeHandle;\r
+  EFI_IFR_GUID_LABEL  *EndLabel;\r
+  UINTN               Index;\r
+  EFI_STRING_ID       StringToken;\r
+  CHAR16              StringId[64];\r
+  CHAR16              KeywordId[32];\r
+  EFI_STATUS          Status;\r
 \r
   Status = IScsiCreateOpCode (\r
              KEYWORD_ENTRY_LABEL,\r
@@ -965,7 +973,7 @@ IScsiCreateKeywords (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  for (Index = 1; Index <= KeywordNum; Index ++) {\r
+  for (Index = 1; Index <= KeywordNum; Index++) {\r
     //\r
     // Create iSCSIAttemptName Keyword.\r
     //\r
@@ -980,9 +988,9 @@ IScsiCreateKeywords (
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateStringOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (ATTEMPT_ATTEMPT_NAME_QUESTION_ID + (Index - 1)),\r
+      (EFI_QUESTION_ID)(ATTEMPT_ATTEMPT_NAME_QUESTION_ID + (Index - 1)),\r
       CONFIGURATION_VARSTORE_ID,\r
-      (UINT16) (ATTEMPT_ATTEMPT_NAME_VAR_OFFSET + ATTEMPT_NAME_SIZE * (Index - 1) * sizeof (CHAR16)),\r
+      (UINT16)(ATTEMPT_ATTEMPT_NAME_VAR_OFFSET + ATTEMPT_NAME_SIZE * (Index - 1) * sizeof (CHAR16)),\r
       StringToken,\r
       StringToken,\r
       EFI_IFR_FLAG_READ_ONLY,\r
@@ -1006,9 +1014,9 @@ IScsiCreateKeywords (
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateNumericOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (ATTEMPT_BOOTENABLE_QUESTION_ID + (Index - 1)),\r
+      (EFI_QUESTION_ID)(ATTEMPT_BOOTENABLE_QUESTION_ID + (Index - 1)),\r
       CONFIGURATION_VARSTORE_ID,\r
-      (UINT16) (ATTEMPT_BOOTENABLE_VAR_OFFSET + (Index - 1)),\r
+      (UINT16)(ATTEMPT_BOOTENABLE_VAR_OFFSET + (Index - 1)),\r
       StringToken,\r
       StringToken,\r
       0,\r
@@ -1033,9 +1041,9 @@ IScsiCreateKeywords (
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateNumericOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (ATTEMPT_ADDRESS_TYPE_QUESTION_ID + (Index - 1)),\r
+      (EFI_QUESTION_ID)(ATTEMPT_ADDRESS_TYPE_QUESTION_ID + (Index - 1)),\r
       CONFIGURATION_VARSTORE_ID,\r
-      (UINT16) (ATTEMPT_ADDRESS_TYPE_VAR_OFFSET + (Index - 1)),\r
+      (UINT16)(ATTEMPT_ADDRESS_TYPE_VAR_OFFSET + (Index - 1)),\r
       StringToken,\r
       StringToken,\r
       0,\r
@@ -1060,9 +1068,9 @@ IScsiCreateKeywords (
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateNumericOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (ATTEMPT_CONNECT_RETRY_QUESTION_ID + (Index - 1)),\r
+      (EFI_QUESTION_ID)(ATTEMPT_CONNECT_RETRY_QUESTION_ID + (Index - 1)),\r
       CONFIGURATION_VARSTORE_ID,\r
-      (UINT16) (ATTEMPT_CONNECT_RETRY_VAR_OFFSET + (Index - 1)),\r
+      (UINT16)(ATTEMPT_CONNECT_RETRY_VAR_OFFSET + (Index - 1)),\r
       StringToken,\r
       StringToken,\r
       0,\r
@@ -1087,9 +1095,9 @@ IScsiCreateKeywords (
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateNumericOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (ATTEMPT_CONNECT_TIMEOUT_QUESTION_ID + (Index - 1)),\r
+      (EFI_QUESTION_ID)(ATTEMPT_CONNECT_TIMEOUT_QUESTION_ID + (Index - 1)),\r
       CONFIGURATION_VARSTORE_ID,\r
-      (UINT16) (ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET + 2 * (Index - 1)),\r
+      (UINT16)(ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET + 2 * (Index - 1)),\r
       StringToken,\r
       StringToken,\r
       0,\r
@@ -1114,9 +1122,9 @@ IScsiCreateKeywords (
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateStringOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (ATTEMPT_ISID_QUESTION_ID + (Index - 1)),\r
+      (EFI_QUESTION_ID)(ATTEMPT_ISID_QUESTION_ID + (Index - 1)),\r
       CONFIGURATION_VARSTORE_ID,\r
-      (UINT16) (ATTEMPT_ISID_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
+      (UINT16)(ATTEMPT_ISID_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
       StringToken,\r
       STRING_TOKEN (STR_ISCSI_ISID_HELP),\r
       0,\r
@@ -1139,19 +1147,19 @@ IScsiCreateKeywords (
     UnicodeSPrint (KeywordId, sizeof (KeywordId), L"iSCSIInitiatorInfoViaDHCP:%d", Index);\r
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateNumericOpCode (\r
-    StartOpCodeHandle,\r
-    (EFI_QUESTION_ID) (ATTEMPT_INITIATOR_VIA_DHCP_QUESTION_ID + (Index - 1)),\r
-    CONFIGURATION_VARSTORE_ID,\r
-    (UINT16) (ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET + (Index - 1)),\r
-    StringToken,\r
-    StringToken,\r
-    0,\r
-    0,\r
-    0,\r
-    1,\r
-    0,\r
-    NULL\r
-    );\r
+      StartOpCodeHandle,\r
+      (EFI_QUESTION_ID)(ATTEMPT_INITIATOR_VIA_DHCP_QUESTION_ID + (Index - 1)),\r
+      CONFIGURATION_VARSTORE_ID,\r
+      (UINT16)(ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET + (Index - 1)),\r
+      StringToken,\r
+      StringToken,\r
+      0,\r
+      0,\r
+      0,\r
+      1,\r
+      0,\r
+      NULL\r
+      );\r
 \r
     //\r
     // Create iSCSIInitiatorIpAddress Keyword.\r
@@ -1167,9 +1175,9 @@ IScsiCreateKeywords (
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateStringOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (ATTEMPT_INITIATOR_IP_ADDRESS_QUESTION_ID + (Index - 1)),\r
+      (EFI_QUESTION_ID)(ATTEMPT_INITIATOR_IP_ADDRESS_QUESTION_ID + (Index - 1)),\r
       CONFIGURATION_VARSTORE_ID,\r
-      (UINT16) (ATTEMPT_INITIATOR_IP_ADDRESS_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
+      (UINT16)(ATTEMPT_INITIATOR_IP_ADDRESS_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
       StringToken,\r
       StringToken,\r
       0,\r
@@ -1193,9 +1201,9 @@ IScsiCreateKeywords (
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateStringOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (ATTEMPT_INITIATOR_NET_MASK_QUESTION_ID + (Index - 1)),\r
+      (EFI_QUESTION_ID)(ATTEMPT_INITIATOR_NET_MASK_QUESTION_ID + (Index - 1)),\r
       CONFIGURATION_VARSTORE_ID,\r
-      (UINT16) (ATTEMPT_INITIATOR_NET_MASK_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
+      (UINT16)(ATTEMPT_INITIATOR_NET_MASK_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
       StringToken,\r
       StringToken,\r
       0,\r
@@ -1219,9 +1227,9 @@ IScsiCreateKeywords (
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateStringOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (ATTEMPT_INITIATOR_GATE_WAY_QUESTION_ID + (Index - 1)),\r
+      (EFI_QUESTION_ID)(ATTEMPT_INITIATOR_GATE_WAY_QUESTION_ID + (Index - 1)),\r
       CONFIGURATION_VARSTORE_ID,\r
-      (UINT16) (ATTEMPT_INITIATOR_GATE_WAY_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
+      (UINT16)(ATTEMPT_INITIATOR_GATE_WAY_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
       StringToken,\r
       StringToken,\r
       0,\r
@@ -1244,19 +1252,19 @@ IScsiCreateKeywords (
     UnicodeSPrint (KeywordId, sizeof (KeywordId), L"iSCSITargetInfoViaDHCP:%d", Index);\r
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateNumericOpCode (\r
-    StartOpCodeHandle,\r
-    (EFI_QUESTION_ID) (ATTEMPT_TARGET_VIA_DHCP_QUESTION_ID + (Index - 1)),\r
-    CONFIGURATION_VARSTORE_ID,\r
-    (UINT16) (ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET + (Index - 1)),\r
-    StringToken,\r
-    StringToken,\r
-    0,\r
-    0,\r
-    0,\r
-    1,\r
-    0,\r
-    NULL\r
-    );\r
+      StartOpCodeHandle,\r
+      (EFI_QUESTION_ID)(ATTEMPT_TARGET_VIA_DHCP_QUESTION_ID + (Index - 1)),\r
+      CONFIGURATION_VARSTORE_ID,\r
+      (UINT16)(ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET + (Index - 1)),\r
+      StringToken,\r
+      StringToken,\r
+      0,\r
+      0,\r
+      0,\r
+      1,\r
+      0,\r
+      NULL\r
+      );\r
 \r
     //\r
     // Create iSCSITargetTcpPort Keyword.\r
@@ -1272,9 +1280,9 @@ IScsiCreateKeywords (
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateNumericOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (ATTEMPT_TARGET_TCP_PORT_QUESTION_ID + (Index - 1)),\r
+      (EFI_QUESTION_ID)(ATTEMPT_TARGET_TCP_PORT_QUESTION_ID + (Index - 1)),\r
       CONFIGURATION_VARSTORE_ID,\r
-      (UINT16) (ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET + 2 * (Index - 1)),\r
+      (UINT16)(ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET + 2 * (Index - 1)),\r
       StringToken,\r
       StringToken,\r
       0,\r
@@ -1299,9 +1307,9 @@ IScsiCreateKeywords (
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateStringOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (ATTEMPT_TARGET_NAME_QUESTION_ID + (Index - 1)),\r
+      (EFI_QUESTION_ID)(ATTEMPT_TARGET_NAME_QUESTION_ID + (Index - 1)),\r
       CONFIGURATION_VARSTORE_ID,\r
-      (UINT16) (ATTEMPT_TARGET_NAME_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
+      (UINT16)(ATTEMPT_TARGET_NAME_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
       StringToken,\r
       StringToken,\r
       0,\r
@@ -1325,9 +1333,9 @@ IScsiCreateKeywords (
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateStringOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (ATTEMPT_TARGET_IP_ADDRESS_QUESTION_ID + (Index - 1)),\r
+      (EFI_QUESTION_ID)(ATTEMPT_TARGET_IP_ADDRESS_QUESTION_ID + (Index - 1)),\r
       CONFIGURATION_VARSTORE_ID,\r
-      (UINT16) (ATTEMPT_TARGET_IP_ADDRESS_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
+      (UINT16)(ATTEMPT_TARGET_IP_ADDRESS_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
       StringToken,\r
       StringToken,\r
       0,\r
@@ -1351,9 +1359,9 @@ IScsiCreateKeywords (
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateStringOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (ATTEMPT_LUN_QUESTION_ID + (Index - 1)),\r
+      (EFI_QUESTION_ID)(ATTEMPT_LUN_QUESTION_ID + (Index - 1)),\r
       CONFIGURATION_VARSTORE_ID,\r
-      (UINT16) (ATTEMPT_LUN_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
+      (UINT16)(ATTEMPT_LUN_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
       StringToken,\r
       StringToken,\r
       0,\r
@@ -1376,19 +1384,19 @@ IScsiCreateKeywords (
     UnicodeSPrint (KeywordId, sizeof (KeywordId), L"iSCSIAuthenticationMethod:%d", Index);\r
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateNumericOpCode (\r
-    StartOpCodeHandle,\r
-    (EFI_QUESTION_ID) (ATTEMPT_AUTHENTICATION_METHOD_QUESTION_ID + (Index - 1)),\r
-    CONFIGURATION_VARSTORE_ID,\r
-    (UINT16) (ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET + (Index - 1)),\r
-    StringToken,\r
-    StringToken,\r
-    0,\r
-    0,\r
-    0,\r
-    1,\r
-    0,\r
-    NULL\r
-    );\r
+      StartOpCodeHandle,\r
+      (EFI_QUESTION_ID)(ATTEMPT_AUTHENTICATION_METHOD_QUESTION_ID + (Index - 1)),\r
+      CONFIGURATION_VARSTORE_ID,\r
+      (UINT16)(ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET + (Index - 1)),\r
+      StringToken,\r
+      StringToken,\r
+      0,\r
+      0,\r
+      0,\r
+      1,\r
+      0,\r
+      NULL\r
+      );\r
 \r
     //\r
     // Create iSCSIChapType Keyword.\r
@@ -1403,19 +1411,19 @@ IScsiCreateKeywords (
     UnicodeSPrint (KeywordId, sizeof (KeywordId), L"iSCSIChapType:%d", Index);\r
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateNumericOpCode (\r
-    StartOpCodeHandle,\r
-    (EFI_QUESTION_ID) (ATTEMPT_CHARTYPE_QUESTION_ID + (Index - 1)),\r
-    CONFIGURATION_VARSTORE_ID,\r
-    (UINT16) (ATTEMPT_CHARTYPE_VAR_OFFSET + (Index - 1)),\r
-    StringToken,\r
-    StringToken,\r
-    0,\r
-    0,\r
-    0,\r
-    1,\r
-    0,\r
-    NULL\r
-    );\r
+      StartOpCodeHandle,\r
+      (EFI_QUESTION_ID)(ATTEMPT_CHARTYPE_QUESTION_ID + (Index - 1)),\r
+      CONFIGURATION_VARSTORE_ID,\r
+      (UINT16)(ATTEMPT_CHARTYPE_VAR_OFFSET + (Index - 1)),\r
+      StringToken,\r
+      StringToken,\r
+      0,\r
+      0,\r
+      0,\r
+      1,\r
+      0,\r
+      NULL\r
+      );\r
 \r
     //\r
     // Create iSCSIChapUsername Keyword.\r
@@ -1431,9 +1439,9 @@ IScsiCreateKeywords (
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateStringOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (ATTEMPT_CHAR_USER_NAME_QUESTION_ID + (Index - 1)),\r
+      (EFI_QUESTION_ID)(ATTEMPT_CHAR_USER_NAME_QUESTION_ID + (Index - 1)),\r
       CONFIGURATION_VARSTORE_ID,\r
-      (UINT16) (ATTEMPT_CHAR_USER_NAME_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
+      (UINT16)(ATTEMPT_CHAR_USER_NAME_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
       StringToken,\r
       StringToken,\r
       0,\r
@@ -1457,9 +1465,9 @@ IScsiCreateKeywords (
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateStringOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (ATTEMPT_CHAR_SECRET_QUESTION_ID + (Index - 1)),\r
+      (EFI_QUESTION_ID)(ATTEMPT_CHAR_SECRET_QUESTION_ID + (Index - 1)),\r
       CONFIGURATION_VARSTORE_ID,\r
-      (UINT16) (ATTEMPT_CHAR_SECRET_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
+      (UINT16)(ATTEMPT_CHAR_SECRET_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
       StringToken,\r
       StringToken,\r
       0,\r
@@ -1483,9 +1491,9 @@ IScsiCreateKeywords (
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateStringOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (ATTEMPT_CHAR_REVERSE_USER_NAME_QUESTION_ID + (Index - 1)),\r
+      (EFI_QUESTION_ID)(ATTEMPT_CHAR_REVERSE_USER_NAME_QUESTION_ID + (Index - 1)),\r
       CONFIGURATION_VARSTORE_ID,\r
-      (UINT16) (ATTEMPT_CHAR_REVERSE_USER_NAME_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
+      (UINT16)(ATTEMPT_CHAR_REVERSE_USER_NAME_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
       StringToken,\r
       StringToken,\r
       0,\r
@@ -1509,9 +1517,9 @@ IScsiCreateKeywords (
     HiiSetString (mCallbackInfo->RegisteredHandle, StringToken, KeywordId, "x-UEFI-ns");\r
     HiiCreateStringOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (ATTEMPT_CHAR_REVERSE_SECRET_QUESTION_ID + (Index - 1)),\r
+      (EFI_QUESTION_ID)(ATTEMPT_CHAR_REVERSE_SECRET_QUESTION_ID + (Index - 1)),\r
       CONFIGURATION_VARSTORE_ID,\r
-      (UINT16) (ATTEMPT_CHAR_REVERSE_SECRET_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
+      (UINT16)(ATTEMPT_CHAR_REVERSE_SECRET_VAR_OFFSET + sizeof (KEYWORD_STR) * (Index - 1)),\r
       StringToken,\r
       StringToken,\r
       0,\r
@@ -1544,12 +1552,12 @@ IScsiCreateKeywords (
 VOID\r
 IScsiCleanAttemptVariable (\r
   IN   VOID\r
-)\r
+  )\r
 {\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA   *AttemptConfigData;\r
-  UINT8                         *AttemptConfigOrder;\r
-  UINTN                         AttemptConfigOrderSize;\r
-  UINTN                         Index;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *AttemptConfigData;\r
+  UINT8                        *AttemptConfigOrder;\r
+  UINTN                        AttemptConfigOrderSize;\r
+  UINTN                        Index;\r
 \r
   //\r
   // Get the initialized attempt order.\r
@@ -1559,14 +1567,14 @@ IScsiCleanAttemptVariable (
                          &gIScsiConfigGuid,\r
                          &AttemptConfigOrderSize\r
                          );\r
-  if (AttemptConfigOrder == NULL || AttemptConfigOrderSize == 0) {\r
+  if ((AttemptConfigOrder == NULL) || (AttemptConfigOrderSize == 0)) {\r
     return;\r
   }\r
 \r
   for (Index = 1; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {\r
     UnicodeSPrint (\r
       mPrivate->PortString,\r
-      (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+      (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
       L"Attempt %d",\r
       Index\r
       );\r
@@ -1574,7 +1582,7 @@ IScsiCleanAttemptVariable (
     GetVariable2 (\r
       mPrivate->PortString,\r
       &gEfiIScsiInitiatorNameProtocolGuid,\r
-      (VOID**)&AttemptConfigData,\r
+      (VOID **)&AttemptConfigData,\r
       NULL\r
       );\r
 \r
@@ -1588,6 +1596,7 @@ IScsiCleanAttemptVariable (
              );\r
     }\r
   }\r
+\r
   return;\r
 }\r
 \r
@@ -1601,11 +1610,11 @@ IScsiCleanAttemptVariable (
 **/\r
 ISCSI_NIC_INFO *\r
 IScsiGetNicInfoByIndex (\r
-  IN UINT8      NicIndex\r
+  IN UINT8  NicIndex\r
   )\r
 {\r
-  LIST_ENTRY        *Entry;\r
-  ISCSI_NIC_INFO    *NicInfo;\r
+  LIST_ENTRY      *Entry;\r
+  ISCSI_NIC_INFO  *NicInfo;\r
 \r
   NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {\r
     NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);\r
@@ -1617,7 +1626,6 @@ IScsiGetNicInfoByIndex (
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Get the NIC's PCI location and return it according to the composited\r
   format defined in iSCSI Boot Firmware Table.\r
@@ -1647,7 +1655,7 @@ IScsiGetNICPciLocation (
   Status = gBS->HandleProtocol (\r
                   Controller,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &DevicePath\r
+                  (VOID **)&DevicePath\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return 0;\r
@@ -1662,7 +1670,7 @@ IScsiGetNICPciLocation (
     return 0;\r
   }\r
 \r
-  Status = gBS->HandleProtocol (PciIoHandle, &gEfiPciIoProtocolGuid, (VOID **) &PciIo);\r
+  Status = gBS->HandleProtocol (PciIoHandle, &gEfiPciIoProtocolGuid, (VOID **)&PciIo);\r
   if (EFI_ERROR (Status)) {\r
     return 0;\r
   }\r
@@ -1672,10 +1680,9 @@ IScsiGetNICPciLocation (
     return 0;\r
   }\r
 \r
-  return (UINT16) ((*Bus << 8) | (*Device << 3) | *Function);\r
+  return (UINT16)((*Bus << 8) | (*Device << 3) | *Function);\r
 }\r
 \r
-\r
 /**\r
   Read the EFI variable (VendorGuid/Name) and return a dynamically allocated\r
   buffer, and the size of the buffer. If failure, return NULL.\r
@@ -1691,9 +1698,9 @@ IScsiGetNICPciLocation (
 **/\r
 VOID *\r
 IScsiGetVariableAndSize (\r
-  IN  CHAR16              *Name,\r
-  IN  EFI_GUID            *VendorGuid,\r
-  OUT UINTN               *VariableSize\r
+  IN  CHAR16    *Name,\r
+  IN  EFI_GUID  *VendorGuid,\r
+  OUT UINTN     *VariableSize\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -1705,8 +1712,8 @@ IScsiGetVariableAndSize (
   //\r
   // Pass in a zero size buffer to find the required buffer size.\r
   //\r
-  BufferSize  = 0;\r
-  Status      = gRT->GetVariable (Name, VendorGuid, NULL, &BufferSize, Buffer);\r
+  BufferSize = 0;\r
+  Status     = gRT->GetVariable (Name, VendorGuid, NULL, &BufferSize, Buffer);\r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
     //\r
     // Allocate the buffer to return\r
@@ -1715,6 +1722,7 @@ IScsiGetVariableAndSize (
     if (Buffer == NULL) {\r
       return NULL;\r
     }\r
+\r
     //\r
     // Read variable into the allocated buffer.\r
     //\r
@@ -1728,7 +1736,6 @@ IScsiGetVariableAndSize (
   return Buffer;\r
 }\r
 \r
-\r
 /**\r
   Create the iSCSI driver data.\r
 \r
@@ -1745,8 +1752,8 @@ IScsiCreateDriverData (
   IN EFI_HANDLE  Controller\r
   )\r
 {\r
-  ISCSI_DRIVER_DATA *Private;\r
-  EFI_STATUS        Status;\r
+  ISCSI_DRIVER_DATA  *Private;\r
+  EFI_STATUS         Status;\r
 \r
   Private = AllocateZeroPool (sizeof (ISCSI_DRIVER_DATA));\r
   if (Private == NULL) {\r
@@ -1776,7 +1783,7 @@ IScsiCreateDriverData (
   }\r
 \r
   Private->ExtScsiPassThruHandle = NULL;\r
-  CopyMem(&Private->IScsiExtScsiPassThru, &gIScsiExtScsiPassThruProtocolTemplate, sizeof(EFI_EXT_SCSI_PASS_THRU_PROTOCOL));\r
+  CopyMem (&Private->IScsiExtScsiPassThru, &gIScsiExtScsiPassThruProtocolTemplate, sizeof (EFI_EXT_SCSI_PASS_THRU_PROTOCOL));\r
 \r
   //\r
   // 0 is designated to the TargetId, so use another value for the AdapterId.\r
@@ -1789,7 +1796,6 @@ IScsiCreateDriverData (
   return Private;\r
 }\r
 \r
-\r
 /**\r
   Clean the iSCSI driver data.\r
 \r
@@ -1804,7 +1810,7 @@ IScsiCleanDriverData (
   IN ISCSI_DRIVER_DATA  *Private\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
@@ -1859,24 +1865,24 @@ IScsiDhcpIsConfigured (
   IN UINT8       IpVersion\r
   )\r
 {\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptTmp;\r
-  UINT8                       *AttemptConfigOrder;\r
-  UINTN                       AttemptConfigOrderSize;\r
-  UINTN                       Index;\r
-  EFI_STATUS                  Status;\r
-  EFI_MAC_ADDRESS             MacAddr;\r
-  UINTN                       HwAddressSize;\r
-  UINT16                      VlanId;\r
-  CHAR16                      MacString[ISCSI_MAX_MAC_STRING_LEN];\r
-  CHAR16                      AttemptMacString[ISCSI_MAX_MAC_STRING_LEN];\r
-  CHAR16                      AttemptName[ISCSI_NAME_IFR_MAX_SIZE];\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *AttemptTmp;\r
+  UINT8                        *AttemptConfigOrder;\r
+  UINTN                        AttemptConfigOrderSize;\r
+  UINTN                        Index;\r
+  EFI_STATUS                   Status;\r
+  EFI_MAC_ADDRESS              MacAddr;\r
+  UINTN                        HwAddressSize;\r
+  UINT16                       VlanId;\r
+  CHAR16                       MacString[ISCSI_MAX_MAC_STRING_LEN];\r
+  CHAR16                       AttemptMacString[ISCSI_MAX_MAC_STRING_LEN];\r
+  CHAR16                       AttemptName[ISCSI_NAME_IFR_MAX_SIZE];\r
 \r
   AttemptConfigOrder = IScsiGetVariableAndSize (\r
                          L"AttemptOrder",\r
                          &gIScsiConfigGuid,\r
                          &AttemptConfigOrderSize\r
                          );\r
-  if (AttemptConfigOrder == NULL || AttemptConfigOrderSize == 0) {\r
+  if ((AttemptConfigOrder == NULL) || (AttemptConfigOrderSize == 0)) {\r
     return FALSE;\r
   }\r
 \r
@@ -1884,29 +1890,30 @@ IScsiDhcpIsConfigured (
   // Get MAC address of this network device.\r
   //\r
   Status = NetLibGetMacAddress (Controller, &MacAddr, &HwAddressSize);\r
-  if(EFI_ERROR (Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     return FALSE;\r
   }\r
+\r
   //\r
   // Get VLAN ID of this network device.\r
   //\r
   VlanId = NetLibGetVlanId (Controller);\r
-  IScsiMacAddrToStr (&MacAddr, (UINT32) HwAddressSize, VlanId, MacString);\r
+  IScsiMacAddrToStr (&MacAddr, (UINT32)HwAddressSize, VlanId, MacString);\r
 \r
   for (Index = 0; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {\r
     UnicodeSPrint (\r
       AttemptName,\r
-      (UINTN) 128,\r
+      (UINTN)128,\r
       L"Attempt %d",\r
-      (UINTN) AttemptConfigOrder[Index]\r
+      (UINTN)AttemptConfigOrder[Index]\r
       );\r
     Status = GetVariable2 (\r
                AttemptName,\r
                &gEfiIScsiInitiatorNameProtocolGuid,\r
-               (VOID**)&AttemptTmp,\r
+               (VOID **)&AttemptTmp,\r
                NULL\r
                );\r
-    if(AttemptTmp == NULL || EFI_ERROR (Status)) {\r
+    if ((AttemptTmp == NULL) || EFI_ERROR (Status)) {\r
       continue;\r
     }\r
 \r
@@ -1917,21 +1924,23 @@ IScsiDhcpIsConfigured (
       continue;\r
     }\r
 \r
-    if (AttemptTmp->SessionConfigData.IpMode != IP_MODE_AUTOCONFIG &&\r
-        AttemptTmp->SessionConfigData.IpMode != ((IpVersion == IP_VERSION_4) ? IP_MODE_IP4 : IP_MODE_IP6)) {\r
+    if ((AttemptTmp->SessionConfigData.IpMode != IP_MODE_AUTOCONFIG) &&\r
+        (AttemptTmp->SessionConfigData.IpMode != ((IpVersion == IP_VERSION_4) ? IP_MODE_IP4 : IP_MODE_IP6)))\r
+    {\r
       FreePool (AttemptTmp);\r
       continue;\r
     }\r
 \r
     AsciiStrToUnicodeStrS (AttemptTmp->MacString, AttemptMacString, sizeof (AttemptMacString) / sizeof (AttemptMacString[0]));\r
 \r
-    if (AttemptTmp->Actived == ISCSI_ACTIVE_DISABLED || StrCmp (MacString, AttemptMacString)) {\r
+    if ((AttemptTmp->Actived == ISCSI_ACTIVE_DISABLED) || StrCmp (MacString, AttemptMacString)) {\r
       continue;\r
     }\r
 \r
-    if(AttemptTmp->SessionConfigData.IpMode == IP_MODE_AUTOCONFIG ||\r
-       AttemptTmp->SessionConfigData.InitiatorInfoFromDhcp == TRUE ||\r
-       AttemptTmp->SessionConfigData.TargetInfoFromDhcp == TRUE) {\r
+    if ((AttemptTmp->SessionConfigData.IpMode == IP_MODE_AUTOCONFIG) ||\r
+        (AttemptTmp->SessionConfigData.InitiatorInfoFromDhcp == TRUE) ||\r
+        (AttemptTmp->SessionConfigData.TargetInfoFromDhcp == TRUE))\r
+    {\r
       FreePool (AttemptTmp);\r
       FreePool (AttemptConfigOrder);\r
       return TRUE;\r
@@ -1958,24 +1967,24 @@ IScsiDnsIsConfigured (
   IN EFI_HANDLE  Controller\r
   )\r
 {\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptTmp;\r
-  UINT8                       *AttemptConfigOrder;\r
-  UINTN                       AttemptConfigOrderSize;\r
-  UINTN                       Index;\r
-  EFI_STATUS                  Status;\r
-  EFI_MAC_ADDRESS             MacAddr;\r
-  UINTN                       HwAddressSize;\r
-  UINT16                      VlanId;\r
-  CHAR16                      AttemptMacString[ISCSI_MAX_MAC_STRING_LEN];\r
-  CHAR16                      MacString[ISCSI_MAX_MAC_STRING_LEN];\r
-  CHAR16                      AttemptName[ISCSI_NAME_IFR_MAX_SIZE];\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *AttemptTmp;\r
+  UINT8                        *AttemptConfigOrder;\r
+  UINTN                        AttemptConfigOrderSize;\r
+  UINTN                        Index;\r
+  EFI_STATUS                   Status;\r
+  EFI_MAC_ADDRESS              MacAddr;\r
+  UINTN                        HwAddressSize;\r
+  UINT16                       VlanId;\r
+  CHAR16                       AttemptMacString[ISCSI_MAX_MAC_STRING_LEN];\r
+  CHAR16                       MacString[ISCSI_MAX_MAC_STRING_LEN];\r
+  CHAR16                       AttemptName[ISCSI_NAME_IFR_MAX_SIZE];\r
 \r
   AttemptConfigOrder = IScsiGetVariableAndSize (\r
                          L"AttemptOrder",\r
                          &gIScsiConfigGuid,\r
                          &AttemptConfigOrderSize\r
                          );\r
-  if (AttemptConfigOrder == NULL || AttemptConfigOrderSize == 0) {\r
+  if ((AttemptConfigOrder == NULL) || (AttemptConfigOrderSize == 0)) {\r
     return FALSE;\r
   }\r
 \r
@@ -1983,30 +1992,31 @@ IScsiDnsIsConfigured (
   // Get MAC address of this network device.\r
   //\r
   Status = NetLibGetMacAddress (Controller, &MacAddr, &HwAddressSize);\r
-  if(EFI_ERROR (Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     return FALSE;\r
   }\r
+\r
   //\r
   // Get VLAN ID of this network device.\r
   //\r
   VlanId = NetLibGetVlanId (Controller);\r
-  IScsiMacAddrToStr (&MacAddr, (UINT32) HwAddressSize, VlanId, MacString);\r
+  IScsiMacAddrToStr (&MacAddr, (UINT32)HwAddressSize, VlanId, MacString);\r
 \r
   for (Index = 0; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {\r
     UnicodeSPrint (\r
       AttemptName,\r
-      (UINTN) 128,\r
+      (UINTN)128,\r
       L"Attempt %d",\r
-      (UINTN) AttemptConfigOrder[Index]\r
+      (UINTN)AttemptConfigOrder[Index]\r
       );\r
 \r
     Status = GetVariable2 (\r
                AttemptName,\r
                &gEfiIScsiInitiatorNameProtocolGuid,\r
-               (VOID**)&AttemptTmp,\r
+               (VOID **)&AttemptTmp,\r
                NULL\r
                );\r
-    if(AttemptTmp == NULL || EFI_ERROR (Status)) {\r
+    if ((AttemptTmp == NULL) || EFI_ERROR (Status)) {\r
       continue;\r
     }\r
 \r
@@ -2014,7 +2024,7 @@ IScsiDnsIsConfigured (
 \r
     AsciiStrToUnicodeStrS (AttemptTmp->MacString, AttemptMacString, sizeof (AttemptMacString) / sizeof (AttemptMacString[0]));\r
 \r
-    if (AttemptTmp->SessionConfigData.Enabled == ISCSI_DISABLED || StrCmp (MacString, AttemptMacString)) {\r
+    if ((AttemptTmp->SessionConfigData.Enabled == ISCSI_DISABLED) || StrCmp (MacString, AttemptMacString)) {\r
       FreePool (AttemptTmp);\r
       continue;\r
     }\r
@@ -2027,12 +2037,10 @@ IScsiDnsIsConfigured (
       FreePool (AttemptTmp);\r
       continue;\r
     }\r
-\r
   }\r
 \r
   FreePool (AttemptConfigOrder);\r
   return FALSE;\r
-\r
 }\r
 \r
 /**\r
@@ -2050,17 +2058,17 @@ IScsiGetConfigData (
   IN ISCSI_DRIVER_DATA  *Private\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  CHAR16                      MacString[ISCSI_MAX_MAC_STRING_LEN];\r
-  CHAR16                      AttemptMacString[ISCSI_MAX_MAC_STRING_LEN];\r
-  UINTN                       Index;\r
-  ISCSI_NIC_INFO              *NicInfo;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
-  ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptTmp;\r
-  UINT8                       *AttemptConfigOrder;\r
-  UINTN                       AttemptConfigOrderSize;\r
-  CHAR16                      IScsiMode[64];\r
-  CHAR16                      IpMode[64];\r
+  EFI_STATUS                   Status;\r
+  CHAR16                       MacString[ISCSI_MAX_MAC_STRING_LEN];\r
+  CHAR16                       AttemptMacString[ISCSI_MAX_MAC_STRING_LEN];\r
+  UINTN                        Index;\r
+  ISCSI_NIC_INFO               *NicInfo;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *AttemptConfigData;\r
+  ISCSI_ATTEMPT_CONFIG_NVDATA  *AttemptTmp;\r
+  UINT8                        *AttemptConfigOrder;\r
+  UINTN                        AttemptConfigOrderSize;\r
+  CHAR16                       IScsiMode[64];\r
+  CHAR16                       IpMode[64];\r
 \r
   //\r
   // There should be at least one attempt configured.\r
@@ -2070,19 +2078,19 @@ IScsiGetConfigData (
                          &gIScsiConfigGuid,\r
                          &AttemptConfigOrderSize\r
                          );\r
-  if (AttemptConfigOrder == NULL || AttemptConfigOrderSize == 0) {\r
+  if ((AttemptConfigOrder == NULL) || (AttemptConfigOrderSize == 0)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
   //\r
   // Get the iSCSI Initiator Name.\r
   //\r
-  mPrivate->InitiatorNameLength  = ISCSI_NAME_MAX_SIZE;\r
-  Status = gIScsiInitiatorName.Get (\r
-                                 &gIScsiInitiatorName,\r
-                                 &mPrivate->InitiatorNameLength,\r
-                                 mPrivate->InitiatorName\r
-                                 );\r
+  mPrivate->InitiatorNameLength = ISCSI_NAME_MAX_SIZE;\r
+  Status                        = gIScsiInitiatorName.Get (\r
+                                                        &gIScsiInitiatorName,\r
+                                                        &mPrivate->InitiatorNameLength,\r
+                                                        mPrivate->InitiatorName\r
+                                                        );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -2091,27 +2099,29 @@ IScsiGetConfigData (
   // Get the normal configuration.\r
   //\r
   for (Index = 0; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {\r
-\r
     //\r
     // Check whether the attempt exists in AttemptConfig.\r
     //\r
     AttemptTmp = IScsiConfigGetAttemptByConfigIndex (AttemptConfigOrder[Index]);\r
-    if (AttemptTmp != NULL && AttemptTmp->SessionConfigData.Enabled == ISCSI_DISABLED) {\r
+    if ((AttemptTmp != NULL) && (AttemptTmp->SessionConfigData.Enabled == ISCSI_DISABLED)) {\r
       continue;\r
-    } else if (AttemptTmp != NULL && AttemptTmp->SessionConfigData.Enabled != ISCSI_DISABLED) {\r
+    } else if ((AttemptTmp != NULL) && (AttemptTmp->SessionConfigData.Enabled != ISCSI_DISABLED)) {\r
       //\r
       // Check the autoconfig path to see whether it should be retried.\r
       //\r
-      if (AttemptTmp->SessionConfigData.IpMode == IP_MODE_AUTOCONFIG &&\r
-          !AttemptTmp->AutoConfigureSuccess) {\r
+      if ((AttemptTmp->SessionConfigData.IpMode == IP_MODE_AUTOCONFIG) &&\r
+          !AttemptTmp->AutoConfigureSuccess)\r
+      {\r
         if (mPrivate->Ipv6Flag &&\r
-            AttemptTmp->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP6) {\r
+            (AttemptTmp->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP6))\r
+        {\r
           //\r
           // Autoconfigure for IP6 already attempted but failed. Do not try again.\r
           //\r
           continue;\r
         } else if (!mPrivate->Ipv6Flag &&\r
-                   AttemptTmp->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP4) {\r
+                   (AttemptTmp->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP4))\r
+        {\r
           //\r
           // Autoconfigure for IP4  already attempted but failed. Do not try again.\r
           //\r
@@ -2121,7 +2131,7 @@ IScsiGetConfigData (
           // Try another approach for this autoconfigure path.\r
           //\r
           AttemptTmp->AutoConfigureMode =\r
-            (UINT8) (mPrivate->Ipv6Flag ? IP_MODE_AUTOCONFIG_IP6 : IP_MODE_AUTOCONFIG_IP4);\r
+            (UINT8)(mPrivate->Ipv6Flag ? IP_MODE_AUTOCONFIG_IP6 : IP_MODE_AUTOCONFIG_IP4);\r
           AttemptTmp->SessionConfigData.InitiatorInfoFromDhcp = TRUE;\r
           AttemptTmp->SessionConfigData.TargetInfoFromDhcp    = TRUE;\r
           AttemptTmp->DhcpSuccess                             = FALSE;\r
@@ -2146,9 +2156,9 @@ IScsiGetConfigData (
           //\r
           UnicodeSPrint (\r
             mPrivate->PortString,\r
-            (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+            (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
             L"Attempt %d",\r
-            (UINTN) AttemptTmp->AttemptConfigIndex\r
+            (UINTN)AttemptTmp->AttemptConfigIndex\r
             );\r
 \r
           gRT->SetVariable (\r
@@ -2163,7 +2173,8 @@ IScsiGetConfigData (
         }\r
       } else if (AttemptTmp->SessionConfigData.InitiatorInfoFromDhcp &&\r
                  !AttemptTmp->ValidPath &&\r
-                 AttemptTmp->NicIndex == mPrivate->CurrentNic) {\r
+                 (AttemptTmp->NicIndex == mPrivate->CurrentNic))\r
+      {\r
         //\r
         // If the attempt associates with the current NIC, we can\r
         // get DHCP information for already added, but failed, attempt.\r
@@ -2186,9 +2197,9 @@ IScsiGetConfigData (
         //\r
         UnicodeSPrint (\r
           mPrivate->PortString,\r
-          (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+          (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
           L"Attempt %d",\r
-          (UINTN) AttemptTmp->AttemptConfigIndex\r
+          (UINTN)AttemptTmp->AttemptConfigIndex\r
           );\r
 \r
         gRT->SetVariable (\r
@@ -2200,7 +2211,6 @@ IScsiGetConfigData (
                );\r
 \r
         continue;\r
-\r
       } else {\r
         continue;\r
       }\r
@@ -2215,21 +2225,22 @@ IScsiGetConfigData (
     IScsiMacAddrToStr (&NicInfo->PermanentAddress, NicInfo->HwAddressSize, NicInfo->VlanId, MacString);\r
     UnicodeSPrint (\r
       mPrivate->PortString,\r
-      (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+      (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
       L"Attempt %d",\r
-      (UINTN) AttemptConfigOrder[Index]\r
+      (UINTN)AttemptConfigOrder[Index]\r
       );\r
 \r
     GetVariable2 (\r
       mPrivate->PortString,\r
       &gEfiIScsiInitiatorNameProtocolGuid,\r
-      (VOID**)&AttemptConfigData,\r
+      (VOID **)&AttemptConfigData,\r
       NULL\r
       );\r
     AsciiStrToUnicodeStrS (AttemptConfigData->MacString, AttemptMacString, sizeof (AttemptMacString) / sizeof (AttemptMacString[0]));\r
 \r
-    if (AttemptConfigData == NULL || AttemptConfigData->Actived == ISCSI_ACTIVE_DISABLED ||\r
-        StrCmp (MacString, AttemptMacString)) {\r
+    if ((AttemptConfigData == NULL) || (AttemptConfigData->Actived == ISCSI_ACTIVE_DISABLED) ||\r
+        StrCmp (MacString, AttemptMacString))\r
+    {\r
       continue;\r
     }\r
 \r
@@ -2237,7 +2248,7 @@ IScsiGetConfigData (
 \r
     AttemptConfigData->NicIndex      = NicInfo->NicIndex;\r
     AttemptConfigData->DhcpSuccess   = FALSE;\r
-    AttemptConfigData->ValidiBFTPath = (BOOLEAN) (mPrivate->EnableMpio ? TRUE : FALSE);\r
+    AttemptConfigData->ValidiBFTPath = (BOOLEAN)(mPrivate->EnableMpio ? TRUE : FALSE);\r
     AttemptConfigData->ValidPath     = FALSE;\r
 \r
     if (AttemptConfigData->SessionConfigData.IpMode == IP_MODE_AUTOCONFIG) {\r
@@ -2245,26 +2256,28 @@ IScsiGetConfigData (
       AttemptConfigData->SessionConfigData.TargetInfoFromDhcp    = TRUE;\r
 \r
       AttemptConfigData->AutoConfigureMode =\r
-        (UINT8) (mPrivate->Ipv6Flag ? IP_MODE_AUTOCONFIG_IP6 : IP_MODE_AUTOCONFIG_IP4);\r
+        (UINT8)(mPrivate->Ipv6Flag ? IP_MODE_AUTOCONFIG_IP6 : IP_MODE_AUTOCONFIG_IP4);\r
       AttemptConfigData->AutoConfigureSuccess = FALSE;\r
     }\r
 \r
     //\r
     // Get some information from dhcp server.\r
     //\r
-    if (AttemptConfigData->SessionConfigData.Enabled != ISCSI_DISABLED &&\r
-        AttemptConfigData->SessionConfigData.InitiatorInfoFromDhcp) {\r
-\r
+    if ((AttemptConfigData->SessionConfigData.Enabled != ISCSI_DISABLED) &&\r
+        AttemptConfigData->SessionConfigData.InitiatorInfoFromDhcp)\r
+    {\r
       if (!mPrivate->Ipv6Flag &&\r
-          (AttemptConfigData->SessionConfigData.IpMode == IP_MODE_IP4 ||\r
-           AttemptConfigData->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP4)) {\r
+          ((AttemptConfigData->SessionConfigData.IpMode == IP_MODE_IP4) ||\r
+           (AttemptConfigData->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP4)))\r
+      {\r
         Status = IScsiDoDhcp (Private->Image, Private->Controller, AttemptConfigData);\r
         if (!EFI_ERROR (Status)) {\r
           AttemptConfigData->DhcpSuccess = TRUE;\r
         }\r
       } else if (mPrivate->Ipv6Flag &&\r
-                (AttemptConfigData->SessionConfigData.IpMode == IP_MODE_IP6 ||\r
-                 AttemptConfigData->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP6)) {\r
+                 ((AttemptConfigData->SessionConfigData.IpMode == IP_MODE_IP6) ||\r
+                  (AttemptConfigData->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP6)))\r
+      {\r
         Status = IScsiDoDhcp6 (Private->Image, Private->Controller, AttemptConfigData);\r
         if (!EFI_ERROR (Status)) {\r
           AttemptConfigData->DhcpSuccess = TRUE;\r
@@ -2276,9 +2289,9 @@ IScsiGetConfigData (
       //\r
       UnicodeSPrint (\r
         mPrivate->PortString,\r
-        (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+        (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
         L"Attempt %d",\r
-        (UINTN) AttemptConfigData->AttemptConfigIndex\r
+        (UINTN)AttemptConfigData->AttemptConfigIndex\r
         );\r
 \r
       gRT->SetVariable (\r
@@ -2312,7 +2325,7 @@ IScsiGetConfigData (
 \r
     UnicodeSPrint (\r
       mPrivate->PortString,\r
-      (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+      (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
       L"MAC: %s, PFA: Bus %d | Dev %d | Func %d, iSCSI mode: %s, IP version: %s",\r
       MacString,\r
       NicInfo->BusNumber,\r
@@ -2377,13 +2390,13 @@ IScsiGetConfigData (
     if (mPrivate->SinglePathCount == 0) {\r
       return EFI_NOT_FOUND;\r
     }\r
+\r
     mPrivate->ValidSinglePathCount = mPrivate->SinglePathCount;\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Get the device path of the iSCSI tcp connection and update it.\r
 \r
@@ -2395,7 +2408,7 @@ IScsiGetConfigData (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 IScsiGetTcpConnDevicePath (\r
-  IN ISCSI_SESSION      *Session\r
+  IN ISCSI_SESSION  *Session\r
   )\r
 {\r
   ISCSI_CONNECTION          *Conn;\r
@@ -2418,28 +2431,29 @@ IScsiGetTcpConnDevicePath (
   Status = gBS->HandleProtocol (\r
                   Conn->TcpIo.Handle,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &DevicePath\r
+                  (VOID **)&DevicePath\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return NULL;\r
   }\r
+\r
   //\r
   // Duplicate it.\r
   //\r
-  DevicePath  = DuplicateDevicePath (DevicePath);\r
+  DevicePath = DuplicateDevicePath (DevicePath);\r
   if (DevicePath == NULL) {\r
     return NULL;\r
   }\r
 \r
-  DPathNode   = (EFI_DEV_PATH *) DevicePath;\r
+  DPathNode = (EFI_DEV_PATH *)DevicePath;\r
 \r
   while (!IsDevicePathEnd (&DPathNode->DevPath)) {\r
     if (DevicePathType (&DPathNode->DevPath) == MESSAGING_DEVICE_PATH) {\r
-      if (!Conn->Ipv6Flag && DevicePathSubType (&DPathNode->DevPath) == MSG_IPv4_DP) {\r
-        DPathNode->Ipv4.LocalPort       = 0;\r
+      if (!Conn->Ipv6Flag && (DevicePathSubType (&DPathNode->DevPath) == MSG_IPv4_DP)) {\r
+        DPathNode->Ipv4.LocalPort = 0;\r
 \r
         DPathNode->Ipv4.StaticIpAddress =\r
-          (BOOLEAN) (!Session->ConfigData->SessionConfigData.InitiatorInfoFromDhcp);\r
+          (BOOLEAN)(!Session->ConfigData->SessionConfigData.InitiatorInfoFromDhcp);\r
 \r
         //\r
         //  Add a judgement here to support previous versions of IPv4_DEVICE_PATH.\r
@@ -2451,7 +2465,6 @@ IScsiGetTcpConnDevicePath (
         PathLen = DevicePathNodeLength (&DPathNode->Ipv4);\r
 \r
         if (PathLen == IP4_NODE_LEN_NEW_VERSIONS) {\r
-\r
           IP4_COPY_ADDRESS (\r
             &DPathNode->Ipv4.GatewayIpAddress,\r
             &Session->ConfigData->SessionConfigData.Gateway\r
@@ -2464,8 +2477,8 @@ IScsiGetTcpConnDevicePath (
         }\r
 \r
         break;\r
-      } else if (Conn->Ipv6Flag && DevicePathSubType (&DPathNode->DevPath) == MSG_IPv6_DP) {\r
-        DPathNode->Ipv6.LocalPort       = 0;\r
+      } else if (Conn->Ipv6Flag && (DevicePathSubType (&DPathNode->DevPath) == MSG_IPv6_DP)) {\r
+        DPathNode->Ipv6.LocalPort = 0;\r
 \r
         //\r
         //  Add a judgement here to support previous versions of IPv6_DEVICE_PATH.\r
@@ -2478,32 +2491,28 @@ IScsiGetTcpConnDevicePath (
         PathLen = DevicePathNodeLength (&DPathNode->Ipv6);\r
 \r
         if (PathLen == IP6_NODE_LEN_NEW_VERSIONS ) {\r
-\r
           DPathNode->Ipv6.IpAddressOrigin = 0;\r
           DPathNode->Ipv6.PrefixLength    = IP6_PREFIX_LENGTH;\r
           ZeroMem (&DPathNode->Ipv6.GatewayIpAddress, sizeof (EFI_IPv6_ADDRESS));\r
-        }\r
-        else if (PathLen == IP6_NODE_LEN_OLD_VERSIONS) {\r
-\r
+        } else if (PathLen == IP6_NODE_LEN_OLD_VERSIONS) {\r
           //\r
           //  StaticIPAddress is a field in old versions of IPv6_DEVICE_PATH, while ignored in new\r
           //  version. Set StaticIPAddress through its' offset in old IPv6_DEVICE_PATH.\r
           //\r
           *((UINT8 *)(&DPathNode->Ipv6) + IP6_OLD_IPADDRESS_OFFSET) =\r
-            (BOOLEAN) (!Session->ConfigData->SessionConfigData.InitiatorInfoFromDhcp);\r
+            (BOOLEAN)(!Session->ConfigData->SessionConfigData.InitiatorInfoFromDhcp);\r
         }\r
 \r
         break;\r
       }\r
     }\r
 \r
-    DPathNode = (EFI_DEV_PATH *) NextDevicePathNode (&DPathNode->DevPath);\r
+    DPathNode = (EFI_DEV_PATH *)NextDevicePathNode (&DPathNode->DevPath);\r
   }\r
 \r
   return DevicePath;\r
 }\r
 \r
-\r
 /**\r
   Abort the session when the transition from BS to RT is initiated.\r
 \r
@@ -2518,9 +2527,9 @@ IScsiOnExitBootService (
   IN VOID       *Context\r
   )\r
 {\r
-  ISCSI_DRIVER_DATA *Private;\r
+  ISCSI_DRIVER_DATA  *Private;\r
 \r
-  Private = (ISCSI_DRIVER_DATA *) Context;\r
+  Private = (ISCSI_DRIVER_DATA *)Context;\r
 \r
   gBS->CloseEvent (Private->ExitBootServiceEvent);\r
   Private->ExitBootServiceEvent = NULL;\r
@@ -2556,14 +2565,14 @@ IScsiOnExitBootService (
 EFI_STATUS\r
 EFIAPI\r
 IScsiTestManagedDevice (\r
-  IN  EFI_HANDLE       ControllerHandle,\r
-  IN  EFI_HANDLE       DriverBindingHandle,\r
-  IN  EFI_GUID         *ProtocolGuid\r
+  IN  EFI_HANDLE  ControllerHandle,\r
+  IN  EFI_HANDLE  DriverBindingHandle,\r
+  IN  EFI_GUID    *ProtocolGuid\r
   )\r
 {\r
-  EFI_STATUS     Status;\r
-  VOID           *ManagedInterface;\r
-  EFI_HANDLE     NicControllerHandle;\r
+  EFI_STATUS  Status;\r
+  VOID        *ManagedInterface;\r
+  EFI_HANDLE  NicControllerHandle;\r
 \r
   ASSERT (ProtocolGuid != NULL);\r
 \r
@@ -2574,7 +2583,7 @@ IScsiTestManagedDevice (
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
-                  (EFI_GUID *) ProtocolGuid,\r
+                  (EFI_GUID *)ProtocolGuid,\r
                   &ManagedInterface,\r
                   DriverBindingHandle,\r
                   NicControllerHandle,\r
@@ -2583,7 +2592,7 @@ IScsiTestManagedDevice (
   if (!EFI_ERROR (Status)) {\r
     gBS->CloseProtocol (\r
            ControllerHandle,\r
-           (EFI_GUID *) ProtocolGuid,\r
+           (EFI_GUID *)ProtocolGuid,\r
            DriverBindingHandle,\r
            NicControllerHandle\r
            );\r
index fddef4f466dc6dd1a1751cc71403f21a84633726..a951eee70ec96c6d52447f32255365650ea61488 100644 (file)
@@ -14,49 +14,47 @@ typedef struct _ISCSI_DRIVER_DATA ISCSI_DRIVER_DATA;
 ///\r
 /// IPv4 Device Path Node Length\r
 ///\r
-#define IP4_NODE_LEN_NEW_VERSIONS    27\r
+#define IP4_NODE_LEN_NEW_VERSIONS  27\r
 \r
 ///\r
 /// IPv6 Device Path Node Length\r
 ///\r
-#define IP6_NODE_LEN_OLD_VERSIONS    43\r
-#define IP6_NODE_LEN_NEW_VERSIONS    60\r
+#define IP6_NODE_LEN_OLD_VERSIONS  43\r
+#define IP6_NODE_LEN_NEW_VERSIONS  60\r
 \r
 ///\r
 /// The ignored field StaticIpAddress's offset in old IPv6 Device Path\r
 ///\r
-#define IP6_OLD_IPADDRESS_OFFSET      42\r
-\r
+#define IP6_OLD_IPADDRESS_OFFSET  42\r
 \r
 #pragma pack(1)\r
 typedef struct _ISCSI_SESSION_CONFIG_NVDATA {\r
-  UINT16            TargetPort;\r
-  UINT8             Enabled;\r
-  UINT8             IpMode;\r
-\r
-  EFI_IP_ADDRESS    LocalIp;\r
-  EFI_IPv4_ADDRESS  SubnetMask;\r
-  EFI_IP_ADDRESS    Gateway;\r
+  UINT16              TargetPort;\r
+  UINT8               Enabled;\r
+  UINT8               IpMode;\r
 \r
-  BOOLEAN           InitiatorInfoFromDhcp;\r
-  BOOLEAN           TargetInfoFromDhcp;\r
+  EFI_IP_ADDRESS      LocalIp;\r
+  EFI_IPv4_ADDRESS    SubnetMask;\r
+  EFI_IP_ADDRESS      Gateway;\r
 \r
-  CHAR8             TargetName[ISCSI_NAME_MAX_SIZE];\r
-  EFI_IP_ADDRESS    TargetIp;\r
-  UINT8             PrefixLength;\r
-  UINT8             BootLun[8];\r
+  BOOLEAN             InitiatorInfoFromDhcp;\r
+  BOOLEAN             TargetInfoFromDhcp;\r
 \r
-  UINT16            ConnectTimeout; ///< timeout value in milliseconds.\r
-  UINT8             ConnectRetryCount;\r
-  UINT8             IsId[6];\r
+  CHAR8               TargetName[ISCSI_NAME_MAX_SIZE];\r
+  EFI_IP_ADDRESS      TargetIp;\r
+  UINT8               PrefixLength;\r
+  UINT8               BootLun[8];\r
 \r
-  BOOLEAN           RedirectFlag;\r
-  UINT16            OriginalTargetPort;     // The port of proxy/virtual target.\r
-  EFI_IP_ADDRESS    OriginalTargetIp;       // The address of proxy/virtual target.\r
+  UINT16              ConnectTimeout; ///< timeout value in milliseconds.\r
+  UINT8               ConnectRetryCount;\r
+  UINT8               IsId[6];\r
 \r
-  BOOLEAN           DnsMode;  // Flag indicate whether the Target address is expressed as URL format.\r
-  CHAR8             TargetUrl[ISCSI_TARGET_URI_MAX_SIZE];\r
+  BOOLEAN             RedirectFlag;\r
+  UINT16              OriginalTargetPort;   // The port of proxy/virtual target.\r
+  EFI_IP_ADDRESS      OriginalTargetIp;     // The address of proxy/virtual target.\r
 \r
+  BOOLEAN             DnsMode; // Flag indicate whether the Target address is expressed as URL format.\r
+  CHAR8               TargetUrl[ISCSI_TARGET_URI_MAX_SIZE];\r
 } ISCSI_SESSION_CONFIG_NVDATA;\r
 #pragma pack()\r
 \r
@@ -134,9 +132,9 @@ IScsiMacAddrToStr (
 **/\r
 EFI_STATUS\r
 IScsiAsciiStrToIp (\r
-  IN  CHAR8             *Str,\r
-  IN  UINT8             IpMode,\r
-  OUT EFI_IP_ADDRESS    *Ip\r
+  IN  CHAR8           *Str,\r
+  IN  UINT8           IpMode,\r
+  OUT EFI_IP_ADDRESS  *Ip\r
   );\r
 \r
 /**\r
@@ -156,10 +154,10 @@ IScsiAsciiStrToIp (
 **/\r
 EFI_STATUS\r
 IScsiBinToHex (\r
-  IN     UINT8  *BinBuffer,\r
-  IN     UINT32 BinLength,\r
-  IN OUT CHAR8  *HexStr,\r
-  IN OUT UINT32 *HexLength\r
+  IN     UINT8   *BinBuffer,\r
+  IN     UINT32  BinLength,\r
+  IN OUT CHAR8   *HexStr,\r
+  IN OUT UINT32  *HexLength\r
   );\r
 \r
 /**\r
@@ -180,12 +178,11 @@ IScsiBinToHex (
 **/\r
 EFI_STATUS\r
 IScsiHexToBin (\r
-  IN OUT UINT8  *BinBuffer,\r
-  IN OUT UINT32 *BinLength,\r
-  IN     CHAR8  *HexStr\r
+  IN OUT UINT8   *BinBuffer,\r
+  IN OUT UINT32  *BinLength,\r
+  IN     CHAR8   *HexStr\r
   );\r
 \r
-\r
 /**\r
   Convert the decimal-constant string or hex-constant string into a numerical value.\r
 \r
@@ -255,7 +252,7 @@ IScsiRemoveNic (
 **/\r
 EFI_STATUS\r
 IScsiCreateAttempts (\r
-  IN UINTN            AttemptNum\r
+  IN UINTN  AttemptNum\r
   );\r
 \r
 /**\r
@@ -269,7 +266,7 @@ IScsiCreateAttempts (
 **/\r
 EFI_STATUS\r
 IScsiCreateKeywords (\r
-  IN UINTN            KeywordNum\r
+  IN UINTN  KeywordNum\r
   );\r
 \r
 /**\r
@@ -292,10 +289,9 @@ IScsiCleanAttemptVariable (
 **/\r
 ISCSI_NIC_INFO *\r
 IScsiGetNicInfoByIndex (\r
-  IN UINT8      NicIndex\r
+  IN UINT8  NicIndex\r
   );\r
 \r
-\r
 /**\r
   Get the NIC's PCI location and return it according to the composited\r
   format defined in iSCSI Boot Firmware Table.\r
@@ -331,9 +327,9 @@ IScsiGetNICPciLocation (
 **/\r
 VOID *\r
 IScsiGetVariableAndSize (\r
-  IN  CHAR16              *Name,\r
-  IN  EFI_GUID            *VendorGuid,\r
-  OUT UINTN               *VariableSize\r
+  IN  CHAR16    *Name,\r
+  IN  EFI_GUID  *VendorGuid,\r
+  OUT UINTN     *VariableSize\r
   );\r
 \r
 /**\r
@@ -422,7 +418,7 @@ IScsiGetConfigData (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 IScsiGetTcpConnDevicePath (\r
-  IN ISCSI_SESSION      *Session\r
+  IN ISCSI_SESSION  *Session\r
   );\r
 \r
 /**\r
@@ -465,8 +461,9 @@ IScsiOnExitBootService (
 EFI_STATUS\r
 EFIAPI\r
 IScsiTestManagedDevice (\r
-  IN  EFI_HANDLE       ControllerHandle,\r
-  IN  EFI_HANDLE       DriverBindingHandle,\r
-  IN  EFI_GUID         *ProtocolGuid\r
+  IN  EFI_HANDLE  ControllerHandle,\r
+  IN  EFI_HANDLE  DriverBindingHandle,\r
+  IN  EFI_GUID    *ProtocolGuid\r
   );\r
+\r
 #endif\r
index 215f275a2d4257c6b07398bd502d4d2ba9381fc7..ef587649a05ed193851b49d1e24d56aef1c65b85 100644 (file)
@@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "IScsiImpl.h"\r
 \r
-UINT32 mDataSegPad = 0;\r
+UINT32  mDataSegPad = 0;\r
 \r
 /**\r
   Attach the iSCSI connection to the iSCSI session.\r
@@ -44,7 +44,6 @@ IScsiDetatchConnection (
   Conn->Session = NULL;\r
 }\r
 \r
-\r
 /**\r
   Check the sequence number according to RFC3720.\r
 \r
@@ -80,7 +79,6 @@ IScsiCheckSN (
   }\r
 }\r
 \r
-\r
 /**\r
   Update the sequence numbers for the iSCSI command.\r
 \r
@@ -97,7 +95,7 @@ IScsiUpdateCmdSN (
   )\r
 {\r
   if (ISCSI_SEQ_LT (MaxCmdSN, ExpCmdSN - 1)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   if (ISCSI_SEQ_GT (MaxCmdSN, Session->MaxCmdSN)) {\r
@@ -109,7 +107,6 @@ IScsiUpdateCmdSN (
   }\r
 }\r
 \r
-\r
 /**\r
   This function does the iSCSI connection login.\r
 \r
@@ -123,8 +120,8 @@ IScsiUpdateCmdSN (
 **/\r
 EFI_STATUS\r
 IScsiConnLogin (\r
-  IN OUT ISCSI_CONNECTION    *Conn,\r
-  IN     UINT16              Timeout\r
+  IN OUT ISCSI_CONNECTION  *Conn,\r
+  IN     UINT16            Timeout\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -171,7 +168,6 @@ IScsiConnLogin (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Reset the iSCSI connection.\r
 \r
@@ -186,7 +182,6 @@ IScsiConnReset (
   TcpIoReset (&Conn->TcpIo);\r
 }\r
 \r
-\r
 /**\r
   Create a TCP connection for the iSCSI session.\r
 \r
@@ -197,7 +192,7 @@ IScsiConnReset (
 **/\r
 ISCSI_CONNECTION *\r
 IScsiCreateConnection (\r
-  IN ISCSI_SESSION      *Session\r
+  IN ISCSI_SESSION  *Session\r
   )\r
 {\r
   ISCSI_DRIVER_DATA            *Private;\r
@@ -245,9 +240,9 @@ IScsiCreateConnection (
   //\r
   // Set the default connection-only parameters.\r
   //\r
-  Conn->MaxRecvDataSegmentLength  = DEFAULT_MAX_RECV_DATA_SEG_LEN;\r
-  Conn->HeaderDigest              = IScsiDigestNone;\r
-  Conn->DataDigest                = IScsiDigestNone;\r
+  Conn->MaxRecvDataSegmentLength = DEFAULT_MAX_RECV_DATA_SEG_LEN;\r
+  Conn->HeaderDigest             = IScsiDigestNone;\r
+  Conn->DataDigest               = IScsiDigestNone;\r
 \r
   if (NvData->DnsMode) {\r
     //\r
@@ -259,7 +254,7 @@ IScsiCreateConnection (
       Status = IScsiDns6 (Private->Image, Private->Controller, NvData);\r
     }\r
 \r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "The configuration of Target address or DNS server address is invalid!\n"));\r
       FreePool (Conn);\r
       return NULL;\r
@@ -292,7 +287,7 @@ IScsiCreateConnection (
   Status = TcpIoCreateSocket (\r
              Private->Image,\r
              Private->Controller,\r
-             (UINT8) (!Conn->Ipv6Flag ? TCP_VERSION_4: TCP_VERSION_6),\r
+             (UINT8)(!Conn->Ipv6Flag ? TCP_VERSION_4 : TCP_VERSION_6),\r
              &TcpIoConfig,\r
              &Conn->TcpIo\r
              );\r
@@ -305,7 +300,6 @@ IScsiCreateConnection (
   return Conn;\r
 }\r
 \r
-\r
 /**\r
   Destroy an iSCSI connection.\r
 \r
@@ -381,15 +375,16 @@ IScsiGetIp6NicInfo (
   }\r
 \r
   SubnetPrefixLength = 0;\r
-  RouteEntry = Ip6ModeData.RouteCount;\r
+  RouteEntry         = Ip6ModeData.RouteCount;\r
   for (Index = 0; Index < Ip6ModeData.RouteCount; Index++) {\r
     if (NetIp6IsNetEqual (TargetIp, &Ip6ModeData.RouteTable[Index].Destination, Ip6ModeData.RouteTable[Index].PrefixLength)) {\r
       if (SubnetPrefixLength < Ip6ModeData.RouteTable[Index].PrefixLength) {\r
         SubnetPrefixLength = Ip6ModeData.RouteTable[Index].PrefixLength;\r
-        RouteEntry = Index;\r
+        RouteEntry         = Index;\r
       }\r
     }\r
   }\r
+\r
   if (RouteEntry != Ip6ModeData.RouteCount) {\r
     IP6_COPY_ADDRESS (&NvData->Gateway, &Ip6ModeData.RouteTable[RouteEntry].Gateway);\r
   }\r
@@ -398,19 +393,24 @@ ON_EXIT:
   if (Ip6ModeData.AddressList != NULL) {\r
     FreePool (Ip6ModeData.AddressList);\r
   }\r
-  if (Ip6ModeData.GroupTable!= NULL) {\r
+\r
+  if (Ip6ModeData.GroupTable != NULL) {\r
     FreePool (Ip6ModeData.GroupTable);\r
   }\r
-  if (Ip6ModeData.RouteTable!= NULL) {\r
+\r
+  if (Ip6ModeData.RouteTable != NULL) {\r
     FreePool (Ip6ModeData.RouteTable);\r
   }\r
-  if (Ip6ModeData.NeighborCache!= NULL) {\r
+\r
+  if (Ip6ModeData.NeighborCache != NULL) {\r
     FreePool (Ip6ModeData.NeighborCache);\r
   }\r
-  if (Ip6ModeData.PrefixTable!= NULL) {\r
+\r
+  if (Ip6ModeData.PrefixTable != NULL) {\r
     FreePool (Ip6ModeData.PrefixTable);\r
   }\r
-  if (Ip6ModeData.IcmpTypeList!= NULL) {\r
+\r
+  if (Ip6ModeData.IcmpTypeList != NULL) {\r
     FreePool (Ip6ModeData.IcmpTypeList);\r
   }\r
 \r
@@ -429,7 +429,7 @@ ON_EXIT:
 STATIC\r
 VOID\r
 IScsiSessionResetAuthData (\r
-  IN OUT ISCSI_SESSION *Session\r
+  IN OUT ISCSI_SESSION  *Session\r
   )\r
 {\r
   if (Session->AuthType == ISCSI_AUTH_TYPE_CHAP) {\r
@@ -517,7 +517,7 @@ IScsiSessionLogin (
     Status = gBS->OpenProtocol (\r
                     Conn->TcpIo.Handle,\r
                     ProtocolGuid,\r
-                    (VOID **) &Tcp,\r
+                    (VOID **)&Tcp,\r
                     Session->Private->Image,\r
                     Session->Private->ExtScsiPassThruHandle,\r
                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -533,7 +533,6 @@ IScsiSessionLogin (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Wait for IPsec negotiation, then try to login the iSCSI session again.\r
 \r
@@ -549,10 +548,9 @@ IScsiSessionReLogin (
   IN ISCSI_SESSION  *Session\r
   )\r
 {\r
-\r
-  EFI_STATUS                Status;\r
-  EFI_STATUS                TimerStatus;\r
-  EFI_EVENT                 Timer;\r
+  EFI_STATUS  Status;\r
+  EFI_STATUS  TimerStatus;\r
+  EFI_EVENT   Timer;\r
 \r
   Status = gBS->CreateEvent (EVT_TIMER, TPL_CALLBACK, NULL, NULL, &Timer);\r
   if (EFI_ERROR (Status)) {\r
@@ -571,20 +569,17 @@ IScsiSessionReLogin (
   }\r
 \r
   do {\r
-\r
     TimerStatus = gBS->CheckEvent (Timer);\r
 \r
     if (!EFI_ERROR (TimerStatus)) {\r
       Status = IScsiSessionLogin (Session);\r
     }\r
-\r
   } while (TimerStatus == EFI_NOT_READY);\r
 \r
   gBS->CloseEvent (Timer);\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Build and send the iSCSI login request to the iSCSI target according to\r
   the current login stage.\r
@@ -612,6 +607,7 @@ IScsiSendLoginReq (
   if (Pdu == NULL) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
+\r
   //\r
   // Send it to the iSCSI target.\r
   //\r
@@ -622,7 +618,6 @@ IScsiSendLoginReq (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Receive and process the iSCSI login response.\r
 \r
@@ -649,6 +644,7 @@ IScsiReceiveLoginRsp (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   ASSERT (Pdu != NULL);\r
 \r
   //\r
@@ -661,7 +657,6 @@ IScsiReceiveLoginRsp (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Add an iSCSI key-value pair as a string into the data segment of the Login Request PDU.\r
   The DataSegmentLength and the actual size of the net buffer containing this PDU will be\r
@@ -680,26 +675,27 @@ IScsiReceiveLoginRsp (
 **/\r
 EFI_STATUS\r
 IScsiAddKeyValuePair (\r
-  IN OUT NET_BUF      *Pdu,\r
-  IN CHAR8            *Key,\r
-  IN CHAR8            *Value\r
+  IN OUT NET_BUF  *Pdu,\r
+  IN CHAR8        *Key,\r
+  IN CHAR8        *Value\r
   )\r
 {\r
-  UINT32              DataSegLen;\r
-  UINT32              KeyLen;\r
-  UINT32              ValueLen;\r
-  UINT32              TotalLen;\r
-  ISCSI_LOGIN_REQUEST *LoginReq;\r
-  CHAR8               *Data;\r
-\r
-  LoginReq    = (ISCSI_LOGIN_REQUEST *) NetbufGetByte (Pdu, 0, NULL);\r
+  UINT32               DataSegLen;\r
+  UINT32               KeyLen;\r
+  UINT32               ValueLen;\r
+  UINT32               TotalLen;\r
+  ISCSI_LOGIN_REQUEST  *LoginReq;\r
+  CHAR8                *Data;\r
+\r
+  LoginReq = (ISCSI_LOGIN_REQUEST *)NetbufGetByte (Pdu, 0, NULL);\r
   if (LoginReq == NULL) {\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
-  DataSegLen  = NTOH24 (LoginReq->DataSegmentLength);\r
 \r
-  KeyLen      = (UINT32) AsciiStrLen (Key);\r
-  ValueLen    = (UINT32) AsciiStrLen (Value);\r
+  DataSegLen = NTOH24 (LoginReq->DataSegmentLength);\r
+\r
+  KeyLen   = (UINT32)AsciiStrLen (Key);\r
+  ValueLen = (UINT32)AsciiStrLen (Value);\r
 \r
   //\r
   // 1 byte for the key value separator '=' and 1 byte for the null\r
@@ -710,10 +706,11 @@ IScsiAddKeyValuePair (
   //\r
   // Allocate the space for the key-value pair.\r
   //\r
-  Data = (CHAR8 *) NetbufAllocSpace (Pdu, TotalLen, NET_BUF_TAIL);\r
+  Data = (CHAR8 *)NetbufAllocSpace (Pdu, TotalLen, NET_BUF_TAIL);\r
   if (Data == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   //\r
   // Add the key.\r
   //\r
@@ -739,7 +736,6 @@ IScsiAddKeyValuePair (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Prepare the iSCSI login request to be sent according to the current login status.\r
 \r
@@ -754,23 +750,24 @@ IScsiPrepareLoginReq (
   IN OUT ISCSI_CONNECTION  *Conn\r
   )\r
 {\r
-  ISCSI_SESSION       *Session;\r
-  NET_BUF             *Nbuf;\r
-  ISCSI_LOGIN_REQUEST *LoginReq;\r
-  EFI_STATUS          Status;\r
+  ISCSI_SESSION        *Session;\r
+  NET_BUF              *Nbuf;\r
+  ISCSI_LOGIN_REQUEST  *LoginReq;\r
+  EFI_STATUS           Status;\r
 \r
   Session = Conn->Session;\r
 \r
-  Nbuf    = NetbufAlloc (sizeof (ISCSI_LOGIN_REQUEST) + DEFAULT_MAX_RECV_DATA_SEG_LEN);\r
+  Nbuf = NetbufAlloc (sizeof (ISCSI_LOGIN_REQUEST) + DEFAULT_MAX_RECV_DATA_SEG_LEN);\r
   if (Nbuf == NULL) {\r
     return NULL;\r
   }\r
 \r
-  LoginReq = (ISCSI_LOGIN_REQUEST *) NetbufAllocSpace (Nbuf, sizeof (ISCSI_LOGIN_REQUEST), NET_BUF_TAIL);\r
+  LoginReq = (ISCSI_LOGIN_REQUEST *)NetbufAllocSpace (Nbuf, sizeof (ISCSI_LOGIN_REQUEST), NET_BUF_TAIL);\r
   if (LoginReq == NULL) {\r
     NetbufFree (Nbuf);\r
     return NULL;\r
   }\r
+\r
   ZeroMem (LoginReq, sizeof (ISCSI_LOGIN_REQUEST));\r
 \r
   //\r
@@ -778,12 +775,12 @@ IScsiPrepareLoginReq (
   //\r
   ISCSI_SET_OPCODE (LoginReq, ISCSI_OPCODE_LOGIN_REQ, ISCSI_REQ_IMMEDIATE);\r
   ISCSI_SET_STAGES (LoginReq, Conn->CurrentStage, Conn->NextStage);\r
-  LoginReq->VersionMax        = ISCSI_VERSION_MAX;\r
-  LoginReq->VersionMin        = ISCSI_VERSION_MIN;\r
-  LoginReq->Tsih              = HTONS (Session->Tsih);\r
-  LoginReq->InitiatorTaskTag  = HTONL (Session->InitiatorTaskTag);\r
-  LoginReq->Cid               = HTONS (Conn->Cid);\r
-  LoginReq->CmdSN             = HTONL (Session->CmdSN);\r
+  LoginReq->VersionMax       = ISCSI_VERSION_MAX;\r
+  LoginReq->VersionMin       = ISCSI_VERSION_MIN;\r
+  LoginReq->Tsih             = HTONS (Session->Tsih);\r
+  LoginReq->InitiatorTaskTag = HTONL (Session->InitiatorTaskTag);\r
+  LoginReq->Cid              = HTONS (Conn->Cid);\r
+  LoginReq->CmdSN            = HTONL (Session->CmdSN);\r
 \r
   //\r
   // For the first Login Request on a connection this is ExpStatSN for the\r
@@ -805,34 +802,34 @@ IScsiPrepareLoginReq (
   Status = EFI_SUCCESS;\r
 \r
   switch (Conn->CurrentStage) {\r
-  case ISCSI_SECURITY_NEGOTIATION:\r
-    //\r
-    // Both none authentication and CHAP authentication share the CHAP path.\r
-    //\r
-    //\r
-    if (Session->AuthType != ISCSI_AUTH_TYPE_KRB) {\r
-      Status = IScsiCHAPToSendReq (Conn, Nbuf);\r
-    }\r
+    case ISCSI_SECURITY_NEGOTIATION:\r
+      //\r
+      // Both none authentication and CHAP authentication share the CHAP path.\r
+      //\r
+      //\r
+      if (Session->AuthType != ISCSI_AUTH_TYPE_KRB) {\r
+        Status = IScsiCHAPToSendReq (Conn, Nbuf);\r
+      }\r
 \r
-    break;\r
+      break;\r
 \r
-  case ISCSI_LOGIN_OPERATIONAL_NEGOTIATION:\r
-    //\r
-    // Only negotiate the parameter once.\r
-    //\r
-    if (!Conn->ParamNegotiated) {\r
-      IScsiFillOpParams (Conn, Nbuf);\r
-    }\r
+    case ISCSI_LOGIN_OPERATIONAL_NEGOTIATION:\r
+      //\r
+      // Only negotiate the parameter once.\r
+      //\r
+      if (!Conn->ParamNegotiated) {\r
+        IScsiFillOpParams (Conn, Nbuf);\r
+      }\r
 \r
-    ISCSI_SET_FLAG (LoginReq, ISCSI_LOGIN_REQ_PDU_FLAG_TRANSIT);\r
-    break;\r
+      ISCSI_SET_FLAG (LoginReq, ISCSI_LOGIN_REQ_PDU_FLAG_TRANSIT);\r
+      break;\r
 \r
-  default:\r
-    //\r
-    // An error occurs...\r
-    //\r
-    Status = EFI_DEVICE_ERROR;\r
-    break;\r
+    default:\r
+      //\r
+      // An error occurs...\r
+      //\r
+      Status = EFI_DEVICE_ERROR;\r
+      break;\r
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -852,7 +849,6 @@ IScsiPrepareLoginReq (
   return Nbuf;\r
 }\r
 \r
-\r
 /**\r
   Process the iSCSI Login Response.\r
 \r
@@ -881,19 +877,21 @@ IScsiProcessLoginRsp (
   UINT8                 *DataSeg;\r
   UINT32                DataSegLen;\r
 \r
-  Status   = EFI_SUCCESS;\r
-  Session   = Conn->Session;\r
+  Status  = EFI_SUCCESS;\r
+  Session = Conn->Session;\r
 \r
-  LoginRsp  = (ISCSI_LOGIN_RESPONSE *) NetbufGetByte (Pdu, 0, NULL);\r
+  LoginRsp = (ISCSI_LOGIN_RESPONSE *)NetbufGetByte (Pdu, 0, NULL);\r
   if (LoginRsp == NULL) {\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
+\r
   if (!ISCSI_CHECK_OPCODE (LoginRsp, ISCSI_OPCODE_LOGIN_RSP)) {\r
     //\r
     // It is not a Login Response.\r
     //\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
+\r
   //\r
   // Get the data segment, if any.\r
   //\r
@@ -903,53 +901,57 @@ IScsiProcessLoginRsp (
   } else {\r
     DataSeg = NULL;\r
   }\r
+\r
   //\r
   // Check the status class in the login response PDU.\r
   //\r
   switch (LoginRsp->StatusClass) {\r
-  case ISCSI_LOGIN_STATUS_SUCCESS:\r
-    //\r
-    // Just break here; the response and the data segment will be processed later.\r
-    //\r
-    break;\r
+    case ISCSI_LOGIN_STATUS_SUCCESS:\r
+      //\r
+      // Just break here; the response and the data segment will be processed later.\r
+      //\r
+      break;\r
 \r
-  case ISCSI_LOGIN_STATUS_REDIRECTION:\r
-    //\r
-    // The target may be moved to a different address.\r
-    //\r
-    if (DataSeg == NULL) {\r
-      return EFI_PROTOCOL_ERROR;\r
-    }\r
-    //\r
-    // Process the TargetAddress key-value strings in the data segment to update the\r
-    // target address info.\r
-    //\r
-    Status = IScsiUpdateTargetAddress (Session, (CHAR8 *) DataSeg, DataSegLen);\r
-    if (EFI_ERROR (Status)) {\r
-      return Status;\r
-    }\r
-    //\r
-    // Session will be restarted on this error status because the Target is\r
-    // redirected by this Login Response.\r
-    //\r
-    return EFI_MEDIA_CHANGED;\r
+    case ISCSI_LOGIN_STATUS_REDIRECTION:\r
+      //\r
+      // The target may be moved to a different address.\r
+      //\r
+      if (DataSeg == NULL) {\r
+        return EFI_PROTOCOL_ERROR;\r
+      }\r
 \r
-  default:\r
-    //\r
-    // Initiator Error, Target Error, or any other undefined error code.\r
-    //\r
-    return EFI_PROTOCOL_ERROR;\r
+      //\r
+      // Process the TargetAddress key-value strings in the data segment to update the\r
+      // target address info.\r
+      //\r
+      Status = IScsiUpdateTargetAddress (Session, (CHAR8 *)DataSeg, DataSegLen);\r
+      if (EFI_ERROR (Status)) {\r
+        return Status;\r
+      }\r
+\r
+      //\r
+      // Session will be restarted on this error status because the Target is\r
+      // redirected by this Login Response.\r
+      //\r
+      return EFI_MEDIA_CHANGED;\r
+\r
+    default:\r
+      //\r
+      // Initiator Error, Target Error, or any other undefined error code.\r
+      //\r
+      return EFI_PROTOCOL_ERROR;\r
   }\r
+\r
   //\r
   // The status is success; extract the wanted fields from the header segment.\r
   //\r
-  Transit                     = ISCSI_FLAG_ON (LoginRsp, ISCSI_LOGIN_RSP_PDU_FLAG_TRANSIT);\r
-  Continue                    = ISCSI_FLAG_ON (LoginRsp, ISCSI_LOGIN_RSP_PDU_FLAG_CONTINUE);\r
+  Transit  = ISCSI_FLAG_ON (LoginRsp, ISCSI_LOGIN_RSP_PDU_FLAG_TRANSIT);\r
+  Continue = ISCSI_FLAG_ON (LoginRsp, ISCSI_LOGIN_RSP_PDU_FLAG_CONTINUE);\r
 \r
-  CurrentStage                = ISCSI_GET_CURRENT_STAGE (LoginRsp);\r
-  NextStage                   = ISCSI_GET_NEXT_STAGE (LoginRsp);\r
+  CurrentStage = ISCSI_GET_CURRENT_STAGE (LoginRsp);\r
+  NextStage    = ISCSI_GET_NEXT_STAGE (LoginRsp);\r
 \r
-  LoginRsp->InitiatorTaskTag  = NTOHL (LoginRsp->InitiatorTaskTag);\r
+  LoginRsp->InitiatorTaskTag = NTOHL (LoginRsp->InitiatorTaskTag);\r
 \r
   if ((Transit && Continue) ||\r
       (CurrentStage != Conn->CurrentStage) ||\r
@@ -957,7 +959,8 @@ IScsiProcessLoginRsp (
       (Transit && (NextStage != Conn->NextStage)) ||\r
       (CompareMem (Session->Isid, LoginRsp->Isid, sizeof (LoginRsp->Isid)) != 0) ||\r
       (LoginRsp->InitiatorTaskTag != Session->InitiatorTaskTag)\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // A Login Response with the C bit set to 1 MUST have the T bit set to 0.\r
     // The CSG in the Login Response MUST be the same with the I-end of this connection.\r
@@ -969,9 +972,9 @@ IScsiProcessLoginRsp (
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
-  LoginRsp->StatSN    = NTOHL (LoginRsp->StatSN);\r
-  LoginRsp->ExpCmdSN  = NTOHL (LoginRsp->ExpCmdSN);\r
-  LoginRsp->MaxCmdSN  = NTOHL (LoginRsp->MaxCmdSN);\r
+  LoginRsp->StatSN   = NTOHL (LoginRsp->StatSN);\r
+  LoginRsp->ExpCmdSN = NTOHL (LoginRsp->ExpCmdSN);\r
+  LoginRsp->MaxCmdSN = NTOHL (LoginRsp->MaxCmdSN);\r
 \r
   if ((Conn->CurrentStage == ISCSI_SECURITY_NEGOTIATION) && (Conn->AuthStep == ISCSI_AUTH_INITIAL)) {\r
     //\r
@@ -1003,6 +1006,7 @@ IScsiProcessLoginRsp (
       return Status;\r
     }\r
   }\r
+\r
   //\r
   // Trim off the header segment.\r
   //\r
@@ -1026,32 +1030,33 @@ IScsiProcessLoginRsp (
   }\r
 \r
   switch (CurrentStage) {\r
-  case ISCSI_SECURITY_NEGOTIATION:\r
-    //\r
-    // In security negotiation stage, let CHAP module handle it.\r
-    //\r
-    if (Session->AuthType != ISCSI_AUTH_TYPE_KRB) {\r
-      Status = IScsiCHAPOnRspReceived (Conn);\r
-    }\r
-    break;\r
+    case ISCSI_SECURITY_NEGOTIATION:\r
+      //\r
+      // In security negotiation stage, let CHAP module handle it.\r
+      //\r
+      if (Session->AuthType != ISCSI_AUTH_TYPE_KRB) {\r
+        Status = IScsiCHAPOnRspReceived (Conn);\r
+      }\r
 \r
-  case ISCSI_LOGIN_OPERATIONAL_NEGOTIATION:\r
-    //\r
-    // Response received with negotiation response on iSCSI parameters: check them.\r
-    //\r
-    Status = IScsiCheckOpParams (Conn);\r
-    if (!EFI_ERROR (Status)) {\r
-      Conn->ParamNegotiated = TRUE;\r
-    }\r
+      break;\r
 \r
-    break;\r
+    case ISCSI_LOGIN_OPERATIONAL_NEGOTIATION:\r
+      //\r
+      // Response received with negotiation response on iSCSI parameters: check them.\r
+      //\r
+      Status = IScsiCheckOpParams (Conn);\r
+      if (!EFI_ERROR (Status)) {\r
+        Conn->ParamNegotiated = TRUE;\r
+      }\r
 \r
-  default:\r
-    //\r
-    // Should never get here.\r
-    //\r
-    Status = EFI_PROTOCOL_ERROR;\r
-    break;\r
+      break;\r
+\r
+    default:\r
+      //\r
+      // Should never get here.\r
+      //\r
+      Status = EFI_PROTOCOL_ERROR;\r
+      break;\r
   }\r
 \r
   if (Transit && (Status == EFI_SUCCESS)) {\r
@@ -1070,6 +1075,7 @@ IScsiProcessLoginRsp (
       Session->Tsih = NTOHS (LoginRsp->Tsih);\r
     }\r
   }\r
+\r
   //\r
   // Flush the response(s) received.\r
   //\r
@@ -1078,7 +1084,6 @@ IScsiProcessLoginRsp (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Updated the target information according the data received in the iSCSI\r
   login response with an target redirection status.\r
@@ -1096,9 +1101,9 @@ IScsiProcessLoginRsp (
 **/\r
 EFI_STATUS\r
 IScsiUpdateTargetAddress (\r
-  IN OUT ISCSI_SESSION         *Session,\r
-  IN     CHAR8                 *Data,\r
-  IN     UINT32                Len\r
+  IN OUT ISCSI_SESSION  *Session,\r
+  IN     CHAR8          *Data,\r
+  IN     UINT32         Len\r
   )\r
 {\r
   LIST_ENTRY                   *KeyValueList;\r
@@ -1140,11 +1145,11 @@ IScsiUpdateTargetAddress (
         //\r
         TargetAddress++;\r
       }\r
-    } else if (*TargetAddress == ISCSI_REDIRECT_ADDR_START_DELIMITER){\r
+    } else if (*TargetAddress == ISCSI_REDIRECT_ADDR_START_DELIMITER) {\r
       //\r
       // The domainname of the target is presented in a bracketed IPv6 address format.\r
       //\r
-      TargetAddress ++;\r
+      TargetAddress++;\r
       IpStr = TargetAddress;\r
       while ((*TargetAddress != '\0') && (*TargetAddress != ISCSI_REDIRECT_ADDR_END_DELIMITER)) {\r
         //\r
@@ -1158,8 +1163,7 @@ IScsiUpdateTargetAddress (
       }\r
 \r
       *TargetAddress = '\0';\r
-      TargetAddress ++;\r
-\r
+      TargetAddress++;\r
     } else {\r
       //\r
       // The domainname of the target is presented in the format of a DNS host name.\r
@@ -1169,6 +1173,7 @@ IScsiUpdateTargetAddress (
       while ((*TargetAddress != '\0') && (*TargetAddress != ':') && (*TargetAddress != ',')) {\r
         TargetAddress++;\r
       }\r
+\r
       NvData->DnsMode = TRUE;\r
     }\r
 \r
@@ -1192,7 +1197,7 @@ IScsiUpdateTargetAddress (
       if (Number > 0xFFFF) {\r
         continue;\r
       } else {\r
-        NvData->TargetPort = (UINT16) Number;\r
+        NvData->TargetPort = (UINT16)Number;\r
       }\r
     } else {\r
       //\r
@@ -1220,9 +1225,10 @@ IScsiUpdateTargetAddress (
       // Target address is expressed as URL format, just save it and\r
       // do DNS resolution when creating a TCP connection.\r
       //\r
-      if (AsciiStrSize (IpStr) > sizeof (Session->ConfigData->SessionConfigData.TargetUrl)){\r
+      if (AsciiStrSize (IpStr) > sizeof (Session->ConfigData->SessionConfigData.TargetUrl)) {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
+\r
       CopyMem (&Session->ConfigData->SessionConfigData.TargetUrl, IpStr, AsciiStrSize (IpStr));\r
     } else {\r
       Status = IScsiAsciiStrToIp (\r
@@ -1245,7 +1251,6 @@ IScsiUpdateTargetAddress (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   The callback function to free the net buffer list.\r
 \r
@@ -1255,16 +1260,15 @@ IScsiUpdateTargetAddress (
 VOID\r
 EFIAPI\r
 IScsiFreeNbufList (\r
-  VOID *Arg\r
+  VOID  *Arg\r
   )\r
 {\r
   ASSERT (Arg != NULL);\r
 \r
-  NetbufFreeList ((LIST_ENTRY *) Arg);\r
+  NetbufFreeList ((LIST_ENTRY *)Arg);\r
   FreePool (Arg);\r
 }\r
 \r
-\r
 /**\r
   The callback function called in NetBufFree; it does nothing.\r
 \r
@@ -1274,12 +1278,11 @@ IScsiFreeNbufList (
 VOID\r
 EFIAPI\r
 IScsiNbufExtFree (\r
-  VOID *Arg\r
+  VOID  *Arg\r
   )\r
 {\r
 }\r
 \r
-\r
 /**\r
   Receive an iSCSI response PDU. An iSCSI response PDU contains an iSCSI PDU header and\r
   an optional data segment. The two parts will be put into two blocks of buffers in the\r
@@ -1302,25 +1305,25 @@ IScsiNbufExtFree (
 **/\r
 EFI_STATUS\r
 IScsiReceivePdu (\r
-  IN ISCSI_CONNECTION                      *Conn,\r
-  OUT NET_BUF                              **Pdu,\r
-  IN ISCSI_IN_BUFFER_CONTEXT               *Context  OPTIONAL,\r
-  IN BOOLEAN                               HeaderDigest,\r
-  IN BOOLEAN                               DataDigest,\r
-  IN EFI_EVENT                             TimeoutEvent OPTIONAL\r
+  IN ISCSI_CONNECTION         *Conn,\r
+  OUT NET_BUF                 **Pdu,\r
+  IN ISCSI_IN_BUFFER_CONTEXT  *Context  OPTIONAL,\r
+  IN BOOLEAN                  HeaderDigest,\r
+  IN BOOLEAN                  DataDigest,\r
+  IN EFI_EVENT                TimeoutEvent OPTIONAL\r
   )\r
 {\r
-  LIST_ENTRY      *NbufList;\r
-  UINT32          Len;\r
-  NET_BUF         *PduHdr;\r
-  UINT8           *Header;\r
-  EFI_STATUS      Status;\r
-  UINT32          PadLen;\r
-  UINT32          InDataOffset;\r
-  NET_FRAGMENT    Fragment[2];\r
-  UINT32          FragmentCount;\r
-  NET_BUF         *DataSeg;\r
-  UINT32          PadAndCRC32[2];\r
+  LIST_ENTRY    *NbufList;\r
+  UINT32        Len;\r
+  NET_BUF       *PduHdr;\r
+  UINT8         *Header;\r
+  EFI_STATUS    Status;\r
+  UINT32        PadLen;\r
+  UINT32        InDataOffset;\r
+  NET_FRAGMENT  Fragment[2];\r
+  UINT32        FragmentCount;\r
+  NET_BUF       *DataSeg;\r
+  UINT32        PadAndCRC32[2];\r
 \r
   NbufList = AllocatePool (sizeof (LIST_ENTRY));\r
   if (NbufList == NULL) {\r
@@ -1332,8 +1335,8 @@ IScsiReceivePdu (
   //\r
   // The header digest will be received together with the PDU header, if exists.\r
   //\r
-  Len     = sizeof (ISCSI_BASIC_HEADER) + (HeaderDigest ? sizeof (UINT32) : 0);\r
-  PduHdr  = NetbufAlloc (Len);\r
+  Len    = sizeof (ISCSI_BASIC_HEADER) + (HeaderDigest ? sizeof (UINT32) : 0);\r
+  PduHdr = NetbufAlloc (Len);\r
   if (PduHdr == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
@@ -1344,6 +1347,7 @@ IScsiReceivePdu (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
   }\r
+\r
   InsertTailList (NbufList, &PduHdr->List);\r
 \r
   //\r
@@ -1372,72 +1376,73 @@ IScsiReceivePdu (
     //\r
     goto FORM_PDU;\r
   }\r
+\r
   //\r
   // Get the length of the padding bytes of the data segment.\r
   //\r
   PadLen = ISCSI_GET_PAD_LEN (Len);\r
 \r
   switch (ISCSI_GET_OPCODE (Header)) {\r
-  case ISCSI_OPCODE_SCSI_DATA_IN:\r
-    //\r
-    // To reduce memory copy overhead, try to use the buffer described by Context\r
-    // if the PDU is an iSCSI SCSI data.\r
-    //\r
-    InDataOffset = ISCSI_GET_BUFFER_OFFSET (Header);\r
-    if ((Context == NULL) || ((InDataOffset + Len) > Context->InDataLen)) {\r
-      Status = EFI_PROTOCOL_ERROR;\r
-      goto ON_EXIT;\r
-    }\r
-\r
-    Fragment[0].Len   = Len;\r
-    Fragment[0].Bulk  = Context->InData + InDataOffset;\r
-\r
-    if (DataDigest || (PadLen != 0)) {\r
+    case ISCSI_OPCODE_SCSI_DATA_IN:\r
       //\r
-      // The data segment is padded. Use two fragments to receive it:\r
-      // the first to receive the useful data; the second to receive the padding.\r
+      // To reduce memory copy overhead, try to use the buffer described by Context\r
+      // if the PDU is an iSCSI SCSI data.\r
       //\r
-      Fragment[1].Len   = PadLen + (DataDigest ? sizeof (UINT32) : 0);\r
-      Fragment[1].Bulk  = (UINT8 *)PadAndCRC32 + (4 - PadLen);\r
+      InDataOffset = ISCSI_GET_BUFFER_OFFSET (Header);\r
+      if ((Context == NULL) || ((InDataOffset + Len) > Context->InDataLen)) {\r
+        Status = EFI_PROTOCOL_ERROR;\r
+        goto ON_EXIT;\r
+      }\r
 \r
-      FragmentCount     = 2;\r
-    } else {\r
-      FragmentCount = 1;\r
-    }\r
+      Fragment[0].Len  = Len;\r
+      Fragment[0].Bulk = Context->InData + InDataOffset;\r
 \r
-    DataSeg = NetbufFromExt (&Fragment[0], FragmentCount, 0, 0, IScsiNbufExtFree, NULL);\r
-    if (DataSeg == NULL) {\r
-      Status = EFI_OUT_OF_RESOURCES;\r
-      goto ON_EXIT;\r
-    }\r
+      if (DataDigest || (PadLen != 0)) {\r
+        //\r
+        // The data segment is padded. Use two fragments to receive it:\r
+        // the first to receive the useful data; the second to receive the padding.\r
+        //\r
+        Fragment[1].Len  = PadLen + (DataDigest ? sizeof (UINT32) : 0);\r
+        Fragment[1].Bulk = (UINT8 *)PadAndCRC32 + (4 - PadLen);\r
+\r
+        FragmentCount = 2;\r
+      } else {\r
+        FragmentCount = 1;\r
+      }\r
 \r
-    break;\r
+      DataSeg = NetbufFromExt (&Fragment[0], FragmentCount, 0, 0, IScsiNbufExtFree, NULL);\r
+      if (DataSeg == NULL) {\r
+        Status = EFI_OUT_OF_RESOURCES;\r
+        goto ON_EXIT;\r
+      }\r
 \r
-  case ISCSI_OPCODE_SCSI_RSP:\r
-  case ISCSI_OPCODE_NOP_IN:\r
-  case ISCSI_OPCODE_LOGIN_RSP:\r
-  case ISCSI_OPCODE_TEXT_RSP:\r
-  case ISCSI_OPCODE_ASYNC_MSG:\r
-  case ISCSI_OPCODE_REJECT:\r
-  case ISCSI_OPCODE_VENDOR_T0:\r
-  case ISCSI_OPCODE_VENDOR_T1:\r
-  case ISCSI_OPCODE_VENDOR_T2:\r
-    //\r
-    // Allocate buffer to receive the data segment.\r
-    //\r
-    Len += PadLen + (DataDigest ? sizeof (UINT32) : 0);\r
-    DataSeg = NetbufAlloc (Len);\r
-    if (DataSeg == NULL) {\r
-      Status = EFI_OUT_OF_RESOURCES;\r
-      goto ON_EXIT;\r
-    }\r
+      break;\r
 \r
-    NetbufAllocSpace (DataSeg, Len, NET_BUF_TAIL);\r
-    break;\r
+    case ISCSI_OPCODE_SCSI_RSP:\r
+    case ISCSI_OPCODE_NOP_IN:\r
+    case ISCSI_OPCODE_LOGIN_RSP:\r
+    case ISCSI_OPCODE_TEXT_RSP:\r
+    case ISCSI_OPCODE_ASYNC_MSG:\r
+    case ISCSI_OPCODE_REJECT:\r
+    case ISCSI_OPCODE_VENDOR_T0:\r
+    case ISCSI_OPCODE_VENDOR_T1:\r
+    case ISCSI_OPCODE_VENDOR_T2:\r
+      //\r
+      // Allocate buffer to receive the data segment.\r
+      //\r
+      Len    += PadLen + (DataDigest ? sizeof (UINT32) : 0);\r
+      DataSeg = NetbufAlloc (Len);\r
+      if (DataSeg == NULL) {\r
+        Status = EFI_OUT_OF_RESOURCES;\r
+        goto ON_EXIT;\r
+      }\r
 \r
-  default:\r
-    Status = EFI_PROTOCOL_ERROR;\r
-    goto ON_EXIT;\r
+      NetbufAllocSpace (DataSeg, Len, NET_BUF_TAIL);\r
+      break;\r
+\r
+    default:\r
+      Status = EFI_PROTOCOL_ERROR;\r
+      goto ON_EXIT;\r
   }\r
 \r
   InsertTailList (NbufList, &DataSeg->List);\r
@@ -1486,7 +1491,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Check and get the result of the parameter negotiation.\r
 \r
@@ -1502,25 +1506,25 @@ IScsiCheckOpParams (
   IN OUT ISCSI_CONNECTION  *Conn\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
-  LIST_ENTRY      *KeyValueList;\r
-  CHAR8           *Data;\r
-  UINT32          Len;\r
-  ISCSI_SESSION   *Session;\r
-  CHAR8           *Value;\r
-  UINTN           NumericValue;\r
+  EFI_STATUS     Status;\r
+  LIST_ENTRY     *KeyValueList;\r
+  CHAR8          *Data;\r
+  UINT32         Len;\r
+  ISCSI_SESSION  *Session;\r
+  CHAR8          *Value;\r
+  UINTN          NumericValue;\r
 \r
   ASSERT (Conn->RspQue.BufNum != 0);\r
 \r
   Session = Conn->Session;\r
 \r
-  Len     = Conn->RspQue.BufSize;\r
-  Data    = AllocatePool (Len);\r
+  Len  = Conn->RspQue.BufSize;\r
+  Data = AllocatePool (Len);\r
   if (Data == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  NetbufQueCopy (&Conn->RspQue, 0, Len, (UINT8 *) Data);\r
+  NetbufQueCopy (&Conn->RspQue, 0, Len, (UINT8 *)Data);\r
 \r
   Status = EFI_PROTOCOL_ERROR;\r
 \r
@@ -1532,6 +1536,7 @@ IScsiCheckOpParams (
     FreePool (Data);\r
     return Status;\r
   }\r
+\r
   //\r
   // HeaderDigest\r
   //\r
@@ -1549,6 +1554,7 @@ IScsiCheckOpParams (
   } else {\r
     goto ON_ERROR;\r
   }\r
+\r
   //\r
   // DataDigest\r
   //\r
@@ -1566,6 +1572,7 @@ IScsiCheckOpParams (
   } else {\r
     goto ON_ERROR;\r
   }\r
+\r
   //\r
   // ErrorRecoveryLevel: result function is Minimum.\r
   //\r
@@ -1579,7 +1586,7 @@ IScsiCheckOpParams (
     goto ON_ERROR;\r
   }\r
 \r
-  Session->ErrorRecoveryLevel = (UINT8) MIN (Session->ErrorRecoveryLevel, NumericValue);\r
+  Session->ErrorRecoveryLevel = (UINT8)MIN (Session->ErrorRecoveryLevel, NumericValue);\r
 \r
   //\r
   // InitialR2T: result function is OR.\r
@@ -1590,7 +1597,7 @@ IScsiCheckOpParams (
       goto ON_ERROR;\r
     }\r
 \r
-    Session->InitialR2T = (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0);\r
+    Session->InitialR2T = (BOOLEAN)(AsciiStrCmp (Value, "Yes") == 0);\r
   }\r
 \r
   //\r
@@ -1601,15 +1608,16 @@ IScsiCheckOpParams (
     goto ON_ERROR;\r
   }\r
 \r
-  Session->ImmediateData = (BOOLEAN) (Session->ImmediateData && (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0));\r
+  Session->ImmediateData = (BOOLEAN)(Session->ImmediateData && (BOOLEAN)(AsciiStrCmp (Value, "Yes") == 0));\r
 \r
   //\r
   // MaxRecvDataSegmentLength is declarative.\r
   //\r
   Value = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_MAX_RECV_DATA_SEGMENT_LENGTH);\r
   if (Value != NULL) {\r
-    Conn->MaxRecvDataSegmentLength = (UINT32) IScsiNetNtoi (Value);\r
+    Conn->MaxRecvDataSegmentLength = (UINT32)IScsiNetNtoi (Value);\r
   }\r
+\r
   //\r
   // MaxBurstLength: result function is Minimum.\r
   //\r
@@ -1619,7 +1627,7 @@ IScsiCheckOpParams (
   }\r
 \r
   NumericValue            = IScsiNetNtoi (Value);\r
-  Session->MaxBurstLength = (UINT32) MIN (Session->MaxBurstLength, NumericValue);\r
+  Session->MaxBurstLength = (UINT32)MIN (Session->MaxBurstLength, NumericValue);\r
 \r
   //\r
   // FirstBurstLength: result function is Minimum. Irrelevant when InitialR2T=Yes and\r
@@ -1632,7 +1640,7 @@ IScsiCheckOpParams (
     }\r
 \r
     NumericValue              = IScsiNetNtoi (Value);\r
-    Session->FirstBurstLength = (UINT32) MIN (Session->FirstBurstLength, NumericValue);\r
+    Session->FirstBurstLength = (UINT32)MIN (Session->FirstBurstLength, NumericValue);\r
   }\r
 \r
   //\r
@@ -1648,7 +1656,7 @@ IScsiCheckOpParams (
     goto ON_ERROR;\r
   }\r
 \r
-  Session->MaxConnections = (UINT32) MIN (Session->MaxConnections, NumericValue);\r
+  Session->MaxConnections = (UINT32)MIN (Session->MaxConnections, NumericValue);\r
 \r
   //\r
   // DataPDUInOrder: result function is OR.\r
@@ -1659,7 +1667,7 @@ IScsiCheckOpParams (
       goto ON_ERROR;\r
     }\r
 \r
-    Session->DataPDUInOrder = (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0);\r
+    Session->DataPDUInOrder = (BOOLEAN)(AsciiStrCmp (Value, "Yes") == 0);\r
   }\r
 \r
   //\r
@@ -1671,7 +1679,7 @@ IScsiCheckOpParams (
       goto ON_ERROR;\r
     }\r
 \r
-    Session->DataSequenceInOrder = (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0);\r
+    Session->DataSequenceInOrder = (BOOLEAN)(AsciiStrCmp (Value, "Yes") == 0);\r
   }\r
 \r
   //\r
@@ -1688,8 +1696,9 @@ IScsiCheckOpParams (
   } else if (NumericValue > 3600) {\r
     goto ON_ERROR;\r
   } else {\r
-    Session->DefaultTime2Wait = (UINT32) MAX (Session->DefaultTime2Wait, NumericValue);\r
+    Session->DefaultTime2Wait = (UINT32)MAX (Session->DefaultTime2Wait, NumericValue);\r
   }\r
+\r
   //\r
   // DefaultTime2Retain: result function is Minimum.\r
   //\r
@@ -1704,8 +1713,9 @@ IScsiCheckOpParams (
   } else if (NumericValue > 3600) {\r
     goto ON_ERROR;\r
   } else {\r
-    Session->DefaultTime2Retain = (UINT32) MIN (Session->DefaultTime2Retain, NumericValue);\r
+    Session->DefaultTime2Retain = (UINT32)MIN (Session->DefaultTime2Retain, NumericValue);\r
   }\r
+\r
   //\r
   // MaxOutstandingR2T: result function is Minimum.\r
   //\r
@@ -1719,7 +1729,7 @@ IScsiCheckOpParams (
     goto ON_ERROR;\r
   }\r
 \r
-  Session->MaxOutstandingR2T = (UINT16) MIN (Session->MaxOutstandingR2T, NumericValue);\r
+  Session->MaxOutstandingR2T = (UINT16)MIN (Session->MaxOutstandingR2T, NumericValue);\r
 \r
   //\r
   // Remove declarative key-value pairs, if any.\r
@@ -1728,7 +1738,6 @@ IScsiCheckOpParams (
   IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_TARGET_ALIAS);\r
   IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_TARGET_PORTAL_GROUP_TAG);\r
 \r
-\r
   //\r
   // Remove the key-value that may not needed for result function is OR.\r
   //\r
@@ -1759,7 +1768,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Fill the operational parameters.\r
 \r
@@ -1773,8 +1781,8 @@ IScsiFillOpParams (
   IN OUT NET_BUF           *Pdu\r
   )\r
 {\r
-  ISCSI_SESSION *Session;\r
-  CHAR8         Value[256];\r
+  ISCSI_SESSION  *Session;\r
+  CHAR8          Value[256];\r
 \r
   Session = Conn->Session;\r
 \r
@@ -1821,7 +1829,6 @@ IScsiFillOpParams (
   IScsiAddKeyValuePair (Pdu, ISCSI_KEY_MAX_OUTSTANDING_R2T, Value);\r
 }\r
 \r
-\r
 /**\r
   Pad the iSCSI AHS or data segment to an integer number of 4 byte words.\r
 \r
@@ -1834,8 +1841,8 @@ IScsiFillOpParams (
 **/\r
 EFI_STATUS\r
 IScsiPadSegment (\r
-  IN OUT NET_BUF      *Pdu,\r
-  IN     UINT32       Len\r
+  IN OUT NET_BUF  *Pdu,\r
+  IN     UINT32   Len\r
   )\r
 {\r
   UINT32  PadLen;\r
@@ -1855,7 +1862,6 @@ IScsiPadSegment (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Build a key-value list from the data segment.\r
 \r
@@ -1868,8 +1874,8 @@ IScsiPadSegment (
 **/\r
 LIST_ENTRY *\r
 IScsiBuildKeyValueList (\r
-  IN CHAR8  *Data,\r
-  IN UINT32 Len\r
+  IN CHAR8   *Data,\r
+  IN UINT32  Len\r
   )\r
 {\r
   LIST_ENTRY            *ListHead;\r
@@ -1909,10 +1915,10 @@ IScsiBuildKeyValueList (
 \r
     KeyValuePair->Value = Data;\r
 \r
-    InsertTailList (ListHead, &KeyValuePair->List);;\r
+    InsertTailList (ListHead, &KeyValuePair->List);\r
 \r
     Data += AsciiStrLen (KeyValuePair->Value) + 1;\r
-    Len -= (UINT32) AsciiStrLen (KeyValuePair->Value) + 1;\r
+    Len  -= (UINT32)AsciiStrLen (KeyValuePair->Value) + 1;\r
   }\r
 \r
   return ListHead;\r
@@ -1924,7 +1930,6 @@ ON_ERROR:
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Get the value string by the key name from the key-value list. If found,\r
   the key-value entry will be removed from the list.\r
@@ -1938,8 +1943,8 @@ ON_ERROR:
 **/\r
 CHAR8 *\r
 IScsiGetValueByKeyFromList (\r
-  IN OUT LIST_ENTRY     *KeyValueList,\r
-  IN     CHAR8          *Key\r
+  IN OUT LIST_ENTRY  *KeyValueList,\r
+  IN     CHAR8       *Key\r
   )\r
 {\r
   LIST_ENTRY            *Entry;\r
@@ -1963,7 +1968,6 @@ IScsiGetValueByKeyFromList (
   return Value;\r
 }\r
 \r
-\r
 /**\r
   Free the key-value list.\r
 \r
@@ -1972,15 +1976,15 @@ IScsiGetValueByKeyFromList (
 **/\r
 VOID\r
 IScsiFreeKeyValueList (\r
-  IN LIST_ENTRY      *KeyValueList\r
+  IN LIST_ENTRY  *KeyValueList\r
   )\r
 {\r
   LIST_ENTRY            *Entry;\r
   ISCSI_KEY_VALUE_PAIR  *KeyValuePair;\r
 \r
   while (!IsListEmpty (KeyValueList)) {\r
-    Entry         = NetListRemoveHead (KeyValueList);\r
-    KeyValuePair  = NET_LIST_USER_STRUCT (Entry, ISCSI_KEY_VALUE_PAIR, List);\r
+    Entry        = NetListRemoveHead (KeyValueList);\r
+    KeyValuePair = NET_LIST_USER_STRUCT (Entry, ISCSI_KEY_VALUE_PAIR, List);\r
 \r
     FreePool (KeyValuePair);\r
   }\r
@@ -1988,7 +1992,6 @@ IScsiFreeKeyValueList (
   FreePool (KeyValueList);\r
 }\r
 \r
-\r
 /**\r
   Normalize the iSCSI name according to RFC.\r
 \r
@@ -2001,18 +2004,18 @@ IScsiFreeKeyValueList (
 **/\r
 EFI_STATUS\r
 IScsiNormalizeName (\r
-  IN OUT CHAR8      *Name,\r
-  IN     UINTN      Len\r
+  IN OUT CHAR8  *Name,\r
+  IN     UINTN  Len\r
   )\r
 {\r
-  UINTN Index;\r
+  UINTN  Index;\r
 \r
   for (Index = 0; Index < Len; Index++) {\r
     if (NET_IS_UPPER_CASE_CHAR (Name[Index])) {\r
       //\r
       // Convert the upper-case characters to lower-case ones.\r
       //\r
-      Name[Index] = (CHAR8) (Name[Index] - 'A' + 'a');\r
+      Name[Index] = (CHAR8)(Name[Index] - 'A' + 'a');\r
     }\r
 \r
     if (!NET_IS_LOWER_CASE_CHAR (Name[Index]) &&\r
@@ -2020,7 +2023,8 @@ IScsiNormalizeName (
         (Name[Index] != '-') &&\r
         (Name[Index] != '.') &&\r
         (Name[Index] != ':')\r
-        ) {\r
+        )\r
+    {\r
       //\r
       // ASCII dash, dot, colon lower-case characters and digit characters\r
       // are allowed.\r
@@ -2039,7 +2043,6 @@ IScsiNormalizeName (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Create an iSCSI task control block.\r
 \r
@@ -2057,8 +2060,8 @@ IScsiNewTcb (
   OUT ISCSI_TCB         **Tcb\r
   )\r
 {\r
-  ISCSI_SESSION *Session;\r
-  ISCSI_TCB     *NewTcb;\r
+  ISCSI_SESSION  *Session;\r
+  ISCSI_TCB      *NewTcb;\r
 \r
   ASSERT (Tcb != NULL);\r
 \r
@@ -2075,10 +2078,10 @@ IScsiNewTcb (
 \r
   InitializeListHead (&NewTcb->Link);\r
 \r
-  NewTcb->SoFarInOrder      = TRUE;\r
-  NewTcb->InitiatorTaskTag  = Session->InitiatorTaskTag;\r
-  NewTcb->CmdSN             = Session->CmdSN;\r
-  NewTcb->Conn              = Conn;\r
+  NewTcb->SoFarInOrder     = TRUE;\r
+  NewTcb->InitiatorTaskTag = Session->InitiatorTaskTag;\r
+  NewTcb->CmdSN            = Session->CmdSN;\r
+  NewTcb->Conn             = Conn;\r
 \r
   InsertTailList (&Session->TcbList, &NewTcb->Link);\r
 \r
@@ -2093,7 +2096,6 @@ IScsiNewTcb (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Delete the tcb from the connection and destroy it.\r
 \r
@@ -2110,7 +2112,6 @@ IScsiDelTcb (
   FreePool (Tcb);\r
 }\r
 \r
-\r
 /**\r
   Create a data segment, pad it, and calculate the CRC if needed.\r
 \r
@@ -2133,15 +2134,15 @@ IScsiNewDataSegment (
   UINT32        PadLen;\r
   NET_BUF       *DataSeg;\r
 \r
-  Fragment[0].Len   = Len;\r
-  Fragment[0].Bulk  = Data;\r
+  Fragment[0].Len  = Len;\r
+  Fragment[0].Bulk = Data;\r
 \r
-  PadLen            = ISCSI_GET_PAD_LEN (Len);\r
+  PadLen = ISCSI_GET_PAD_LEN (Len);\r
   if (PadLen != 0) {\r
-    Fragment[1].Len   = PadLen;\r
-    Fragment[1].Bulk  = (UINT8 *) &mDataSegPad;\r
+    Fragment[1].Len  = PadLen;\r
+    Fragment[1].Bulk = (UINT8 *)&mDataSegPad;\r
 \r
-    FragmentCount     = 2;\r
+    FragmentCount = 2;\r
   } else {\r
     FragmentCount = 1;\r
   }\r
@@ -2151,7 +2152,6 @@ IScsiNewDataSegment (
   return DataSeg;\r
 }\r
 \r
-\r
 /**\r
   Create a iSCSI SCSI command PDU to encapsulate the command issued\r
   by SCSI through the EXT SCSI PASS THRU Protocol.\r
@@ -2166,9 +2166,9 @@ IScsiNewDataSegment (
 **/\r
 NET_BUF *\r
 IScsiNewScsiCmdPdu (\r
-  IN EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,\r
-  IN UINT64                                     Lun,\r
-  IN ISCSI_TCB                                  *Tcb\r
+  IN EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet,\r
+  IN UINT64                                      Lun,\r
+  IN ISCSI_TCB                                   *Tcb\r
   )\r
 {\r
   LIST_ENTRY                      *NbufList;\r
@@ -2197,7 +2197,7 @@ IScsiNewScsiCmdPdu (
     //\r
     // The CDB exceeds 16 bytes. An extended CDB AHS is required.\r
     //\r
-    AHSLength = (UINT8) (AHSLength + ISCSI_ROUNDUP (Packet->CdbLength - 16) + sizeof (ISCSI_ADDITIONAL_HEADER));\r
+    AHSLength = (UINT8)(AHSLength + ISCSI_ROUNDUP (Packet->CdbLength - 16) + sizeof (ISCSI_ADDITIONAL_HEADER));\r
   }\r
 \r
   Length    = sizeof (SCSI_COMMAND) + AHSLength;\r
@@ -2206,12 +2206,13 @@ IScsiNewScsiCmdPdu (
     return NULL;\r
   }\r
 \r
-  ScsiCmd = (SCSI_COMMAND *) NetbufAllocSpace (PduHeader, Length, NET_BUF_TAIL);\r
+  ScsiCmd = (SCSI_COMMAND *)NetbufAllocSpace (PduHeader, Length, NET_BUF_TAIL);\r
   if (ScsiCmd == NULL) {\r
     NetbufFree (PduHeader);\r
     return NULL;\r
   }\r
-  Header  = (ISCSI_ADDITIONAL_HEADER *) (ScsiCmd + 1);\r
+\r
+  Header = (ISCSI_ADDITIONAL_HEADER *)(ScsiCmd + 1);\r
 \r
   ZeroMem (ScsiCmd, Length);\r
 \r
@@ -2222,31 +2223,31 @@ IScsiNewScsiCmdPdu (
   // Set the READ/WRITE flags according to the IO type of this request.\r
   //\r
   switch (Packet->DataDirection) {\r
-  case DataIn:\r
-    ISCSI_SET_FLAG (ScsiCmd, SCSI_CMD_PDU_FLAG_READ);\r
-    ScsiCmd->ExpDataXferLength = NTOHL (Packet->InTransferLength);\r
-    break;\r
+    case DataIn:\r
+      ISCSI_SET_FLAG (ScsiCmd, SCSI_CMD_PDU_FLAG_READ);\r
+      ScsiCmd->ExpDataXferLength = NTOHL (Packet->InTransferLength);\r
+      break;\r
 \r
-  case DataOut:\r
-    ISCSI_SET_FLAG (ScsiCmd, SCSI_CMD_PDU_FLAG_WRITE);\r
-    ScsiCmd->ExpDataXferLength = NTOHL (Packet->OutTransferLength);\r
-    break;\r
+    case DataOut:\r
+      ISCSI_SET_FLAG (ScsiCmd, SCSI_CMD_PDU_FLAG_WRITE);\r
+      ScsiCmd->ExpDataXferLength = NTOHL (Packet->OutTransferLength);\r
+      break;\r
 \r
-  case DataBi:\r
-    ISCSI_SET_FLAG (ScsiCmd, SCSI_CMD_PDU_FLAG_READ | SCSI_CMD_PDU_FLAG_WRITE);\r
-    ScsiCmd->ExpDataXferLength = NTOHL (Packet->OutTransferLength);\r
+    case DataBi:\r
+      ISCSI_SET_FLAG (ScsiCmd, SCSI_CMD_PDU_FLAG_READ | SCSI_CMD_PDU_FLAG_WRITE);\r
+      ScsiCmd->ExpDataXferLength = NTOHL (Packet->OutTransferLength);\r
 \r
-    //\r
-    // Fill the bidirectional expected read data length AHS.\r
-    //\r
-    BiExpReadDataLenAHS                     = (ISCSI_BI_EXP_READ_DATA_LEN_AHS *) Header;\r
-    Header = (ISCSI_ADDITIONAL_HEADER *) (BiExpReadDataLenAHS + 1);\r
+      //\r
+      // Fill the bidirectional expected read data length AHS.\r
+      //\r
+      BiExpReadDataLenAHS = (ISCSI_BI_EXP_READ_DATA_LEN_AHS *)Header;\r
+      Header              = (ISCSI_ADDITIONAL_HEADER *)(BiExpReadDataLenAHS + 1);\r
 \r
-    BiExpReadDataLenAHS->Length = NTOHS (5);\r
-    BiExpReadDataLenAHS->Type = ISCSI_AHS_TYPE_BI_EXP_READ_DATA_LEN;\r
-    BiExpReadDataLenAHS->ExpReadDataLength = NTOHL (Packet->InTransferLength);\r
+      BiExpReadDataLenAHS->Length            = NTOHS (5);\r
+      BiExpReadDataLenAHS->Type              = ISCSI_AHS_TYPE_BI_EXP_READ_DATA_LEN;\r
+      BiExpReadDataLenAHS->ExpReadDataLength = NTOHL (Packet->InTransferLength);\r
 \r
-    break;\r
+      break;\r
   }\r
 \r
   ScsiCmd->TotalAHSLength = AHSLength;\r
@@ -2258,15 +2259,15 @@ IScsiNewScsiCmdPdu (
   CopyMem (ScsiCmd->Cdb, Packet->Cdb, sizeof (ScsiCmd->Cdb));\r
 \r
   if (Packet->CdbLength > 16) {\r
-    Header->Length  = NTOHS ((UINT16) (Packet->CdbLength - 15));\r
-    Header->Type    = ISCSI_AHS_TYPE_EXT_CDB;\r
+    Header->Length = NTOHS ((UINT16)(Packet->CdbLength - 15));\r
+    Header->Type   = ISCSI_AHS_TYPE_EXT_CDB;\r
 \r
-    CopyMem (Header + 1, (UINT8 *) Packet->Cdb + 16, Packet->CdbLength - 16);\r
+    CopyMem (Header + 1, (UINT8 *)Packet->Cdb + 16, Packet->CdbLength - 16);\r
   }\r
 \r
-  Pdu               = PduHeader;\r
-  Session           = Tcb->Conn->Session;\r
-  ImmediateDataLen  = 0;\r
+  Pdu              = PduHeader;\r
+  Session          = Tcb->Conn->Session;\r
+  ImmediateDataLen = 0;\r
 \r
   if (Session->ImmediateData && (Packet->OutTransferLength != 0)) {\r
     //\r
@@ -2274,8 +2275,8 @@ IScsiNewScsiCmdPdu (
     // data is the minimum of FirstBurstLength, the data length to be xfered, and\r
     // the MaxRecvdataSegmentLength on this connection.\r
     //\r
-    ImmediateDataLen  = MIN (Session->FirstBurstLength, Packet->OutTransferLength);\r
-    ImmediateDataLen  = MIN (ImmediateDataLen, Tcb->Conn->MaxRecvDataSegmentLength);\r
+    ImmediateDataLen = MIN (Session->FirstBurstLength, Packet->OutTransferLength);\r
+    ImmediateDataLen = MIN (ImmediateDataLen, Tcb->Conn->MaxRecvDataSegmentLength);\r
 \r
     //\r
     // Update the data segment length in the PDU header.\r
@@ -2285,7 +2286,7 @@ IScsiNewScsiCmdPdu (
     //\r
     // Create the data segment.\r
     //\r
-    DataSeg = IScsiNewDataSegment ((UINT8 *) Packet->OutDataBuffer, ImmediateDataLen, FALSE);\r
+    DataSeg = IScsiNewDataSegment ((UINT8 *)Packet->OutDataBuffer, ImmediateDataLen, FALSE);\r
     if (DataSeg == NULL) {\r
       NetbufFree (PduHeader);\r
       Pdu = NULL;\r
@@ -2314,7 +2315,8 @@ IScsiNewScsiCmdPdu (
   if (Session->InitialR2T ||\r
       (ImmediateDataLen == Session->FirstBurstLength) ||\r
       (ImmediateDataLen == Packet->OutTransferLength)\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // Unsolicited data out sequence is not allowed,\r
     // or FirstBustLength data is already sent out by immediate data,\r
@@ -2330,7 +2332,6 @@ ON_EXIT:
   return Pdu;\r
 }\r
 \r
-\r
 /**\r
   Create a new iSCSI SCSI Data Out PDU.\r
 \r
@@ -2353,12 +2354,12 @@ IScsiNewDataOutPdu (
   IN UINT64     Lun\r
   )\r
 {\r
-  LIST_ENTRY          *NbufList;\r
-  NET_BUF             *PduHdr;\r
-  NET_BUF             *DataSeg;\r
-  NET_BUF             *Pdu;\r
-  ISCSI_SCSI_DATA_OUT *DataOutHdr;\r
-  ISCSI_XFER_CONTEXT  *XferContext;\r
+  LIST_ENTRY           *NbufList;\r
+  NET_BUF              *PduHdr;\r
+  NET_BUF              *DataSeg;\r
+  NET_BUF              *Pdu;\r
+  ISCSI_SCSI_DATA_OUT  *DataOutHdr;\r
+  ISCSI_XFER_CONTEXT   *XferContext;\r
 \r
   NbufList = AllocatePool (sizeof (LIST_ENTRY));\r
   if (NbufList == NULL) {\r
@@ -2375,16 +2376,18 @@ IScsiNewDataOutPdu (
     FreePool (NbufList);\r
     return NULL;\r
   }\r
+\r
   //\r
   // Insert the BHS into the buffer list.\r
   //\r
   InsertTailList (NbufList, &PduHdr->List);\r
 \r
-  DataOutHdr  = (ISCSI_SCSI_DATA_OUT *) NetbufAllocSpace (PduHdr, sizeof (ISCSI_SCSI_DATA_OUT), NET_BUF_TAIL);\r
+  DataOutHdr = (ISCSI_SCSI_DATA_OUT *)NetbufAllocSpace (PduHdr, sizeof (ISCSI_SCSI_DATA_OUT), NET_BUF_TAIL);\r
   if (DataOutHdr == NULL) {\r
     IScsiFreeNbufList (NbufList);\r
     return NULL;\r
   }\r
+\r
   XferContext = &Tcb->XferContext;\r
 \r
   ZeroMem (DataOutHdr, sizeof (ISCSI_SCSI_DATA_OUT));\r
@@ -2404,6 +2407,7 @@ IScsiNewDataOutPdu (
   if (XferContext->TargetTransferTag != ISCSI_RESERVED_TAG) {\r
     CopyMem (&DataOutHdr->Lun, &Lun, sizeof (DataOutHdr->Lun));\r
   }\r
+\r
   //\r
   // Build the data segment for this Data Out PDU.\r
   //\r
@@ -2412,6 +2416,7 @@ IScsiNewDataOutPdu (
     IScsiFreeNbufList (NbufList);\r
     return NULL;\r
   }\r
+\r
   //\r
   // Put the data segment into the buffer list and combine it with the BHS\r
   // into a full Data Out PDU.\r
@@ -2425,7 +2430,6 @@ IScsiNewDataOutPdu (
   return Pdu;\r
 }\r
 \r
-\r
 /**\r
   Generate a consecutive sequence of iSCSI SCSI Data Out PDUs.\r
 \r
@@ -2486,11 +2490,12 @@ IScsiGenerateDataOutPduSequence (
     //\r
     // Update the context and DataSN.\r
     //\r
-    Data += DataLen;\r
-    XferContext->Offset += DataLen;\r
+    Data                       += DataLen;\r
+    XferContext->Offset        += DataLen;\r
     XferContext->DesiredLength -= DataLen;\r
     DataSN++;\r
   }\r
+\r
   //\r
   // Set the F bit for the last data out PDU in this sequence.\r
   //\r
@@ -2527,10 +2532,10 @@ IScsiSendDataOutPduSequence (
   IN ISCSI_TCB  *Tcb\r
   )\r
 {\r
-  LIST_ENTRY      *DataOutPduList;\r
-  LIST_ENTRY      *Entry;\r
-  NET_BUF         *Pdu;\r
-  EFI_STATUS      Status;\r
+  LIST_ENTRY  *DataOutPduList;\r
+  LIST_ENTRY  *Entry;\r
+  NET_BUF     *Pdu;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Generate the Data Out PDU sequence.\r
@@ -2546,7 +2551,7 @@ IScsiSendDataOutPduSequence (
   // Send the Data Out PDU's one by one.\r
   //\r
   NET_LIST_FOR_EACH (Entry, DataOutPduList) {\r
-    Pdu     = NET_LIST_USER_STRUCT (Entry, NET_BUF, List);\r
+    Pdu = NET_LIST_USER_STRUCT (Entry, NET_BUF, List);\r
 \r
     Status = TcpIoTransmit (&Tcb->Conn->TcpIo, Pdu);\r
 \r
@@ -2560,7 +2565,6 @@ IScsiSendDataOutPduSequence (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Process the received iSCSI SCSI Data In PDU.\r
 \r
@@ -2585,7 +2589,7 @@ IScsiOnDataInRcvd (
   ISCSI_SCSI_DATA_IN  *DataInHdr;\r
   EFI_STATUS          Status;\r
 \r
-  DataInHdr                   = (ISCSI_SCSI_DATA_IN *) NetbufGetByte (Pdu, 0, NULL);\r
+  DataInHdr = (ISCSI_SCSI_DATA_IN *)NetbufGetByte (Pdu, 0, NULL);\r
   if (DataInHdr == NULL) {\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
@@ -2606,6 +2610,7 @@ IScsiOnDataInRcvd (
   if (DataInHdr->InitiatorTaskTag != Tcb->InitiatorTaskTag) {\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
+\r
   //\r
   // Update the command related sequence numbers.\r
   //\r
@@ -2627,6 +2632,7 @@ IScsiOnDataInRcvd (
       //\r
       return EFI_PROTOCOL_ERROR;\r
     }\r
+\r
     //\r
     // S bit is on, the StatSN is valid.\r
     //\r
@@ -2640,7 +2646,7 @@ IScsiOnDataInRcvd (
 \r
     if (ISCSI_FLAG_ON (DataInHdr, SCSI_RSP_PDU_FLAG_OVERFLOW)) {\r
       Packet->InTransferLength += NTOHL (DataInHdr->ResidualCount);\r
-      Status = EFI_BAD_BUFFER_SIZE;\r
+      Status                    = EFI_BAD_BUFFER_SIZE;\r
     }\r
 \r
     if (ISCSI_FLAG_ON (DataInHdr, SCSI_RSP_PDU_FLAG_UNDERFLOW)) {\r
@@ -2651,7 +2657,6 @@ IScsiOnDataInRcvd (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Process the received iSCSI R2T PDU.\r
 \r
@@ -2673,26 +2678,27 @@ IScsiOnR2TRcvd (
   IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet\r
   )\r
 {\r
-  ISCSI_READY_TO_TRANSFER *R2THdr;\r
-  EFI_STATUS              Status;\r
-  ISCSI_XFER_CONTEXT      *XferContext;\r
-  UINT8                   *Data;\r
+  ISCSI_READY_TO_TRANSFER  *R2THdr;\r
+  EFI_STATUS               Status;\r
+  ISCSI_XFER_CONTEXT       *XferContext;\r
+  UINT8                    *Data;\r
 \r
-  R2THdr = (ISCSI_READY_TO_TRANSFER *) NetbufGetByte (Pdu, 0, NULL);\r
+  R2THdr = (ISCSI_READY_TO_TRANSFER *)NetbufGetByte (Pdu, 0, NULL);\r
   if (R2THdr == NULL) {\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
-  R2THdr->InitiatorTaskTag = NTOHL (R2THdr->InitiatorTaskTag);\r
-  R2THdr->TargetTransferTag = NTOHL (R2THdr->TargetTransferTag);\r
-  R2THdr->StatSN = NTOHL (R2THdr->StatSN);\r
-  R2THdr->R2TSeqNum = NTOHL (R2THdr->R2TSeqNum);\r
-  R2THdr->BufferOffset = NTOHL (R2THdr->BufferOffset);\r
+  R2THdr->InitiatorTaskTag          = NTOHL (R2THdr->InitiatorTaskTag);\r
+  R2THdr->TargetTransferTag         = NTOHL (R2THdr->TargetTransferTag);\r
+  R2THdr->StatSN                    = NTOHL (R2THdr->StatSN);\r
+  R2THdr->R2TSeqNum                 = NTOHL (R2THdr->R2TSeqNum);\r
+  R2THdr->BufferOffset              = NTOHL (R2THdr->BufferOffset);\r
   R2THdr->DesiredDataTransferLength = NTOHL (R2THdr->DesiredDataTransferLength);\r
 \r
   if ((R2THdr->InitiatorTaskTag != Tcb->InitiatorTaskTag) || !ISCSI_SEQ_EQ (R2THdr->StatSN, Tcb->Conn->ExpStatSN)) {\r
-    return EFI_PROTOCOL_ERROR;;\r
+    return EFI_PROTOCOL_ERROR;\r
   }\r
+\r
   //\r
   // Check the sequence number.\r
   //\r
@@ -2701,26 +2707,27 @@ IScsiOnR2TRcvd (
     return Status;\r
   }\r
 \r
-  XferContext                     = &Tcb->XferContext;\r
-  XferContext->TargetTransferTag  = R2THdr->TargetTransferTag;\r
-  XferContext->Offset             = R2THdr->BufferOffset;\r
-  XferContext->DesiredLength      = R2THdr->DesiredDataTransferLength;\r
+  XferContext                    = &Tcb->XferContext;\r
+  XferContext->TargetTransferTag = R2THdr->TargetTransferTag;\r
+  XferContext->Offset            = R2THdr->BufferOffset;\r
+  XferContext->DesiredLength     = R2THdr->DesiredDataTransferLength;\r
 \r
   if (((XferContext->Offset + XferContext->DesiredLength) > Packet->OutTransferLength) ||\r
       (XferContext->DesiredLength > Tcb->Conn->Session->MaxBurstLength)\r
-      ) {\r
+      )\r
+  {\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
+\r
   //\r
   // Send the data solicited by this R2T.\r
   //\r
-  Data    = (UINT8 *) Packet->OutDataBuffer + XferContext->Offset;\r
-  Status  = IScsiSendDataOutPduSequence (Data, Lun, Tcb);\r
+  Data   = (UINT8 *)Packet->OutDataBuffer + XferContext->Offset;\r
+  Status = IScsiSendDataOutPduSequence (Data, Lun, Tcb);\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Process the received iSCSI SCSI Response PDU.\r
 \r
@@ -2746,28 +2753,28 @@ IScsiOnScsiRspRcvd (
   EFI_STATUS        Status;\r
   UINT32            DataSegLen;\r
 \r
-  ScsiRspHdr                    = (SCSI_RESPONSE *) NetbufGetByte (Pdu, 0, NULL);\r
+  ScsiRspHdr = (SCSI_RESPONSE *)NetbufGetByte (Pdu, 0, NULL);\r
   if (ScsiRspHdr == NULL) {\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
-  ScsiRspHdr->InitiatorTaskTag  = NTOHL (ScsiRspHdr->InitiatorTaskTag);\r
+  ScsiRspHdr->InitiatorTaskTag = NTOHL (ScsiRspHdr->InitiatorTaskTag);\r
   if (ScsiRspHdr->InitiatorTaskTag != Tcb->InitiatorTaskTag) {\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
-  ScsiRspHdr->StatSN  = NTOHL (ScsiRspHdr->StatSN);\r
+  ScsiRspHdr->StatSN = NTOHL (ScsiRspHdr->StatSN);\r
 \r
-  Status              = IScsiCheckSN (&Tcb->Conn->ExpStatSN, ScsiRspHdr->StatSN);\r
+  Status = IScsiCheckSN (&Tcb->Conn->ExpStatSN, ScsiRspHdr->StatSN);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  ScsiRspHdr->MaxCmdSN  = NTOHL (ScsiRspHdr->MaxCmdSN);\r
-  ScsiRspHdr->ExpCmdSN  = NTOHL (ScsiRspHdr->ExpCmdSN);\r
+  ScsiRspHdr->MaxCmdSN = NTOHL (ScsiRspHdr->MaxCmdSN);\r
+  ScsiRspHdr->ExpCmdSN = NTOHL (ScsiRspHdr->ExpCmdSN);\r
   IScsiUpdateCmdSN (Tcb->Conn->Session, ScsiRspHdr->MaxCmdSN, ScsiRspHdr->ExpCmdSN);\r
 \r
-  Tcb->StatusXferd          = TRUE;\r
+  Tcb->StatusXferd = TRUE;\r
 \r
   Packet->HostAdapterStatus = ScsiRspHdr->Response;\r
   if (Packet->HostAdapterStatus != ISCSI_SERVICE_RSP_COMMAND_COMPLETE_AT_TARGET) {\r
@@ -2778,13 +2785,14 @@ IScsiOnScsiRspRcvd (
 \r
   if (ISCSI_FLAG_ON (ScsiRspHdr, SCSI_RSP_PDU_FLAG_BI_READ_OVERFLOW | SCSI_RSP_PDU_FLAG_BI_READ_UNDERFLOW) ||\r
       ISCSI_FLAG_ON (ScsiRspHdr, SCSI_RSP_PDU_FLAG_OVERFLOW | SCSI_RSP_PDU_FLAG_UNDERFLOW)\r
-        ) {\r
+      )\r
+  {\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
   if (ISCSI_FLAG_ON (ScsiRspHdr, SCSI_RSP_PDU_FLAG_BI_READ_OVERFLOW)) {\r
     Packet->InTransferLength += NTOHL (ScsiRspHdr->BiReadResidualCount);\r
-    Status = EFI_BAD_BUFFER_SIZE;\r
+    Status                    = EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
   if (ISCSI_FLAG_ON (ScsiRspHdr, SCSI_RSP_PDU_FLAG_BI_READ_UNDERFLOW)) {\r
@@ -2811,14 +2819,14 @@ IScsiOnScsiRspRcvd (
 \r
   DataSegLen = ISCSI_GET_DATASEG_LEN (ScsiRspHdr);\r
   if (DataSegLen != 0) {\r
-    SenseData               = (ISCSI_SENSE_DATA *) NetbufGetByte (Pdu, sizeof (SCSI_RESPONSE), NULL);\r
+    SenseData = (ISCSI_SENSE_DATA *)NetbufGetByte (Pdu, sizeof (SCSI_RESPONSE), NULL);\r
     if (SenseData == NULL) {\r
       return EFI_PROTOCOL_ERROR;\r
     }\r
 \r
-    SenseData->Length       = NTOHS (SenseData->Length);\r
+    SenseData->Length = NTOHS (SenseData->Length);\r
 \r
-    Packet->SenseDataLength = (UINT8) MIN (SenseData->Length, Packet->SenseDataLength);\r
+    Packet->SenseDataLength = (UINT8)MIN (SenseData->Length, Packet->SenseDataLength);\r
     if (Packet->SenseDataLength != 0) {\r
       CopyMem (Packet->SenseData, &SenseData->Data[0], Packet->SenseDataLength);\r
     }\r
@@ -2829,7 +2837,6 @@ IScsiOnScsiRspRcvd (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Process the received NOP In PDU.\r
 \r
@@ -2850,14 +2857,14 @@ IScsiOnNopInRcvd (
   ISCSI_NOP_IN  *NopInHdr;\r
   EFI_STATUS    Status;\r
 \r
-  NopInHdr            = (ISCSI_NOP_IN *) NetbufGetByte (Pdu, 0, NULL);\r
+  NopInHdr = (ISCSI_NOP_IN *)NetbufGetByte (Pdu, 0, NULL);\r
   if (NopInHdr == NULL) {\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
-  NopInHdr->StatSN    = NTOHL (NopInHdr->StatSN);\r
-  NopInHdr->ExpCmdSN  = NTOHL (NopInHdr->ExpCmdSN);\r
-  NopInHdr->MaxCmdSN  = NTOHL (NopInHdr->MaxCmdSN);\r
+  NopInHdr->StatSN   = NTOHL (NopInHdr->StatSN);\r
+  NopInHdr->ExpCmdSN = NTOHL (NopInHdr->ExpCmdSN);\r
+  NopInHdr->MaxCmdSN = NTOHL (NopInHdr->MaxCmdSN);\r
 \r
   if (NopInHdr->InitiatorTaskTag == ISCSI_RESERVED_TAG) {\r
     if (NopInHdr->StatSN != Tcb->Conn->ExpStatSN) {\r
@@ -2875,7 +2882,6 @@ IScsiOnNopInRcvd (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Execute the SCSI command issued through the EXT SCSI PASS THRU protocol.\r
 \r
@@ -2902,25 +2908,25 @@ IScsiExecuteScsiCommand (
   IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
-  ISCSI_DRIVER_DATA       *Private;\r
-  ISCSI_SESSION           *Session;\r
-  EFI_EVENT               TimeoutEvent;\r
-  ISCSI_CONNECTION        *Conn;\r
-  ISCSI_TCB               *Tcb;\r
-  NET_BUF                 *Pdu;\r
-  ISCSI_XFER_CONTEXT      *XferContext;\r
-  UINT8                   *Data;\r
-  ISCSI_IN_BUFFER_CONTEXT InBufferContext;\r
-  UINT64                  Timeout;\r
-  UINT8                   *PduHdr;\r
-\r
-  Private       = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (PassThru);\r
-  Session       = Private->Session;\r
-  Status        = EFI_SUCCESS;\r
-  Tcb           = NULL;\r
-  TimeoutEvent  = NULL;\r
-  Timeout       = 0;\r
+  EFI_STATUS               Status;\r
+  ISCSI_DRIVER_DATA        *Private;\r
+  ISCSI_SESSION            *Session;\r
+  EFI_EVENT                TimeoutEvent;\r
+  ISCSI_CONNECTION         *Conn;\r
+  ISCSI_TCB                *Tcb;\r
+  NET_BUF                  *Pdu;\r
+  ISCSI_XFER_CONTEXT       *XferContext;\r
+  UINT8                    *Data;\r
+  ISCSI_IN_BUFFER_CONTEXT  InBufferContext;\r
+  UINT64                   Timeout;\r
+  UINT8                    *PduHdr;\r
+\r
+  Private      = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (PassThru);\r
+  Session      = Private->Session;\r
+  Status       = EFI_SUCCESS;\r
+  Tcb          = NULL;\r
+  TimeoutEvent = NULL;\r
+  Timeout      = 0;\r
 \r
   if (Session->State != SESSION_STATE_LOGGED_IN) {\r
     Status = EFI_DEVICE_ERROR;\r
@@ -2942,6 +2948,7 @@ IScsiExecuteScsiCommand (
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
+\r
   //\r
   // Encapsulate the SCSI request packet into an iSCSI SCSI Command PDU.\r
   //\r
@@ -2951,13 +2958,14 @@ IScsiExecuteScsiCommand (
     goto ON_EXIT;\r
   }\r
 \r
-  XferContext         = &Tcb->XferContext;\r
-  PduHdr              = NetbufGetByte (Pdu, 0, NULL);\r
+  XferContext = &Tcb->XferContext;\r
+  PduHdr      = NetbufGetByte (Pdu, 0, NULL);\r
   if (PduHdr == NULL) {\r
     Status = EFI_PROTOCOL_ERROR;\r
     NetbufFree (Pdu);\r
     goto ON_EXIT;\r
   }\r
+\r
   XferContext->Offset = ISCSI_GET_DATASEG_LEN (PduHdr);\r
 \r
   //\r
@@ -2974,25 +2982,26 @@ IScsiExecuteScsiCommand (
   if (!Session->InitialR2T &&\r
       (XferContext->Offset < Session->FirstBurstLength) &&\r
       (XferContext->Offset < Packet->OutTransferLength)\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // Unsolicited Data-Out sequence is allowed. There is remaining SCSI\r
     // OUT data, and the limit of FirstBurstLength is not reached.\r
     //\r
     XferContext->TargetTransferTag = ISCSI_RESERVED_TAG;\r
-    XferContext->DesiredLength = MIN (\r
-                                   Session->FirstBurstLength,\r
-                                   Packet->OutTransferLength - XferContext->Offset\r
-                                   );\r
+    XferContext->DesiredLength     = MIN (\r
+                                       Session->FirstBurstLength,\r
+                                       Packet->OutTransferLength - XferContext->Offset\r
+                                       );\r
 \r
-    Data    = (UINT8 *) Packet->OutDataBuffer + XferContext->Offset;\r
-    Status  = IScsiSendDataOutPduSequence (Data, Lun, Tcb);\r
+    Data   = (UINT8 *)Packet->OutDataBuffer + XferContext->Offset;\r
+    Status = IScsiSendDataOutPduSequence (Data, Lun, Tcb);\r
     if (EFI_ERROR (Status)) {\r
       goto ON_EXIT;\r
     }\r
   }\r
 \r
-  InBufferContext.InData    = (UINT8 *) Packet->InDataBuffer;\r
+  InBufferContext.InData    = (UINT8 *)Packet->InDataBuffer;\r
   InBufferContext.InDataLen = Packet->InTransferLength;\r
 \r
   while (!Tcb->StatusXferd) {\r
@@ -3022,34 +3031,35 @@ IScsiExecuteScsiCommand (
       NetbufFree (Pdu);\r
       goto ON_EXIT;\r
     }\r
+\r
     switch (ISCSI_GET_OPCODE (PduHdr)) {\r
-    case ISCSI_OPCODE_SCSI_DATA_IN:\r
-      Status = IScsiOnDataInRcvd (Pdu, Tcb, Packet);\r
-      break;\r
+      case ISCSI_OPCODE_SCSI_DATA_IN:\r
+        Status = IScsiOnDataInRcvd (Pdu, Tcb, Packet);\r
+        break;\r
 \r
-    case ISCSI_OPCODE_R2T:\r
-      Status = IScsiOnR2TRcvd (Pdu, Tcb, Lun, Packet);\r
-      break;\r
+      case ISCSI_OPCODE_R2T:\r
+        Status = IScsiOnR2TRcvd (Pdu, Tcb, Lun, Packet);\r
+        break;\r
 \r
-    case ISCSI_OPCODE_SCSI_RSP:\r
-      Status = IScsiOnScsiRspRcvd (Pdu, Tcb, Packet);\r
-      break;\r
+      case ISCSI_OPCODE_SCSI_RSP:\r
+        Status = IScsiOnScsiRspRcvd (Pdu, Tcb, Packet);\r
+        break;\r
 \r
-    case ISCSI_OPCODE_NOP_IN:\r
-      Status = IScsiOnNopInRcvd (Pdu, Tcb);\r
-      break;\r
+      case ISCSI_OPCODE_NOP_IN:\r
+        Status = IScsiOnNopInRcvd (Pdu, Tcb);\r
+        break;\r
 \r
-    case ISCSI_OPCODE_VENDOR_T0:\r
-    case ISCSI_OPCODE_VENDOR_T1:\r
-    case ISCSI_OPCODE_VENDOR_T2:\r
-      //\r
-      // These messages are vendor specific. Skip them.\r
-      //\r
-      break;\r
+      case ISCSI_OPCODE_VENDOR_T0:\r
+      case ISCSI_OPCODE_VENDOR_T1:\r
+      case ISCSI_OPCODE_VENDOR_T2:\r
+        //\r
+        // These messages are vendor specific. Skip them.\r
+        //\r
+        break;\r
 \r
-    default:\r
-      Status = EFI_PROTOCOL_ERROR;\r
-      break;\r
+      default:\r
+        Status = EFI_PROTOCOL_ERROR;\r
+        break;\r
     }\r
 \r
     NetbufFree (Pdu);\r
@@ -3072,7 +3082,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Reinstate the session on some error.\r
 \r
@@ -3087,7 +3096,7 @@ IScsiSessionReinstatement (
   IN ISCSI_SESSION  *Session\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
+  EFI_STATUS  Status;\r
 \r
   ASSERT (Session->State != SESSION_STATE_FREE);\r
 \r
@@ -3105,7 +3114,6 @@ IScsiSessionReinstatement (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Initialize some session parameters before login.\r
 \r
@@ -3120,18 +3128,18 @@ IScsiSessionInit (
   )\r
 {\r
   if (!Recovery) {\r
-    Session->Signature  = ISCSI_SESSION_SIGNATURE;\r
-    Session->State      = SESSION_STATE_FREE;\r
+    Session->Signature = ISCSI_SESSION_SIGNATURE;\r
+    Session->State     = SESSION_STATE_FREE;\r
 \r
     InitializeListHead (&Session->Conns);\r
     InitializeListHead (&Session->TcbList);\r
   }\r
 \r
-  Session->Tsih                 = 0;\r
+  Session->Tsih = 0;\r
 \r
-  Session->CmdSN                = 1;\r
-  Session->InitiatorTaskTag     = 1;\r
-  Session->NextCid              = 1;\r
+  Session->CmdSN            = 1;\r
+  Session->InitiatorTaskTag = 1;\r
+  Session->NextCid          = 1;\r
 \r
   Session->TargetPortalGroupTag = 0;\r
   Session->MaxConnections       = ISCSI_MAX_CONNS_PER_SESSION;\r
@@ -3147,7 +3155,6 @@ IScsiSessionInit (
   Session->ErrorRecoveryLevel   = 0;\r
 }\r
 \r
-\r
 /**\r
   Abort the iSCSI session. That is, reset all the connection(s), and free the\r
   resources.\r
@@ -3164,7 +3171,7 @@ IScsiSessionAbort (
   EFI_GUID          *ProtocolGuid;\r
 \r
   if (Session->State != SESSION_STATE_LOGGED_IN) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   ASSERT (!IsListEmpty (&Session->Conns));\r
@@ -3197,5 +3204,5 @@ IScsiSessionAbort (
 \r
   Session->State = SESSION_STATE_FAILED;\r
 \r
-  return ;\r
+  return;\r
 }\r
index a5792a8bae680bb6ca5e837f8d7782baad4d019e..4848f88b04d5fe625706cc7009ae7d6890e4d9e7 100644 (file)
@@ -24,21 +24,21 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
       (((INT32) (s1) > (INT32) (s2)) && (s1 - s2) < ((UINT32) 1 << 31)) \\r
     )\r
 \r
-#define ISCSI_WELL_KNOWN_PORT                   3260\r
-#define ISCSI_MAX_CONNS_PER_SESSION             1\r
+#define ISCSI_WELL_KNOWN_PORT        3260\r
+#define ISCSI_MAX_CONNS_PER_SESSION  1\r
 \r
-#define DEFAULT_MAX_RECV_DATA_SEG_LEN           8192\r
-#define MAX_RECV_DATA_SEG_LEN_IN_FFP            65536\r
-#define DEFAULT_MAX_OUTSTANDING_R2T             1\r
+#define DEFAULT_MAX_RECV_DATA_SEG_LEN  8192\r
+#define MAX_RECV_DATA_SEG_LEN_IN_FFP   65536\r
+#define DEFAULT_MAX_OUTSTANDING_R2T    1\r
 \r
-#define ISCSI_VERSION_MAX                       0x00\r
-#define ISCSI_VERSION_MIN                       0x00\r
+#define ISCSI_VERSION_MAX  0x00\r
+#define ISCSI_VERSION_MIN  0x00\r
 \r
-#define ISCSI_CHECK_MEDIA_LOGIN_WAITING_TIME       EFI_TIMER_PERIOD_SECONDS(20)\r
-#define ISCSI_CHECK_MEDIA_GET_DHCP_WAITING_TIME    EFI_TIMER_PERIOD_SECONDS(20)\r
+#define ISCSI_CHECK_MEDIA_LOGIN_WAITING_TIME     EFI_TIMER_PERIOD_SECONDS(20)\r
+#define ISCSI_CHECK_MEDIA_GET_DHCP_WAITING_TIME  EFI_TIMER_PERIOD_SECONDS(20)\r
 \r
-#define ISCSI_REDIRECT_ADDR_START_DELIMITER     '['\r
-#define ISCSI_REDIRECT_ADDR_END_DELIMITER       ']'\r
+#define ISCSI_REDIRECT_ADDR_START_DELIMITER  '['\r
+#define ISCSI_REDIRECT_ADDR_END_DELIMITER    ']'\r
 \r
 #define ISCSI_KEY_AUTH_METHOD                   "AuthMethod"\r
 #define ISCSI_KEY_HEADER_DIGEST                 "HeaderDigest"\r
@@ -63,32 +63,32 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define ISCSI_KEY_SESSION_TYPE                  "SessionType"\r
 #define ISCSI_KEY_MAX_RECV_DATA_SEGMENT_LENGTH  "MaxRecvDataSegmentLength"\r
 \r
-#define ISCSI_KEY_VALUE_NONE                    "None"\r
+#define ISCSI_KEY_VALUE_NONE  "None"\r
 \r
 ///\r
 /// connection state for initiator\r
 ///\r
 \r
-#define CONN_STATE_FREE                         0\r
-#define CONN_STATE_XPT_WAIT                     1\r
-#define CONN_STATE_IN_LOGIN                     2\r
-#define CONN_STATE_LOGGED_IN                    3\r
-#define CONN_STATE_IN_LOGOUT                    4\r
-#define CONN_STATE_LOGOUT_REQUESTED             5\r
-#define CONN_STATE_CLEANUP_WAIT                 6\r
-#define CONN_STATE_IN_CLEANUP                   7\r
+#define CONN_STATE_FREE              0\r
+#define CONN_STATE_XPT_WAIT          1\r
+#define CONN_STATE_IN_LOGIN          2\r
+#define CONN_STATE_LOGGED_IN         3\r
+#define CONN_STATE_IN_LOGOUT         4\r
+#define CONN_STATE_LOGOUT_REQUESTED  5\r
+#define CONN_STATE_CLEANUP_WAIT      6\r
+#define CONN_STATE_IN_CLEANUP        7\r
 \r
 ///\r
 /// session state for initiator\r
 ///\r
-#define SESSION_STATE_FREE                      0\r
-#define SESSION_STATE_LOGGED_IN                 1\r
-#define SESSION_STATE_FAILED                    2\r
+#define SESSION_STATE_FREE       0\r
+#define SESSION_STATE_LOGGED_IN  1\r
+#define SESSION_STATE_FAILED     2\r
 \r
-#define ISCSI_RESERVED_TAG                      0xffffffff\r
+#define ISCSI_RESERVED_TAG  0xffffffff\r
 \r
-#define ISCSI_REQ_IMMEDIATE                     0x40\r
-#define ISCSI_OPCODE_MASK                       0x3F\r
+#define ISCSI_REQ_IMMEDIATE  0x40\r
+#define ISCSI_OPCODE_MASK    0x3F\r
 \r
 #define ISCSI_SET_OPCODE(PduHdr, Op, Flgs)  ((((ISCSI_BASIC_HEADER *) (PduHdr))->OpCode) = ((Op) | (Flgs)))\r
 #define ISCSI_GET_OPCODE(PduHdr)            ((((ISCSI_BASIC_HEADER *) (PduHdr))->OpCode) & ISCSI_OPCODE_MASK)\r
@@ -101,8 +101,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define ISCSI_GET_CURRENT_STAGE(PduHdr)     ((UINT8) (((PduHdr)->Flags >> 2) & 0x3))\r
 #define ISCSI_GET_NEXT_STAGE(PduHdr)        ((UINT8) (((PduHdr)->Flags) & 0x3))\r
 \r
-#define ISCSI_GET_PAD_LEN(DataLen)          ((~(DataLen) + 1) & 0x3)\r
-#define ISCSI_ROUNDUP(DataLen)              (((DataLen) + 3) &~(0x3))\r
+#define ISCSI_GET_PAD_LEN(DataLen)  ((~(DataLen) + 1) & 0x3)\r
+#define ISCSI_ROUNDUP(DataLen)      (((DataLen) + 3) &~(0x3))\r
 \r
 #define HTON24(Dst, Src) \\r
   do { \\r
@@ -111,7 +111,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
     (Dst)[2]  = (UINT8) ((UINT8) (Src) & 0xFF); \\r
   } while (0);\r
 \r
-#define NTOH24(src)                         (((src)[0] << 16) | ((src)[1] << 8) | ((src)[2]))\r
+#define NTOH24(src)  (((src)[0] << 16) | ((src)[1] << 8) | ((src)[2]))\r
 \r
 #define ISCSI_GET_DATASEG_LEN(PduHdr)       NTOH24 (((ISCSI_BASIC_HEADER *) (PduHdr))->DataSegmentLength)\r
 #define ISCSI_SET_DATASEG_LEN(PduHdr, Len)  HTON24 (((ISCSI_BASIC_HEADER *) (PduHdr))->DataSegmentLength, (Len))\r
@@ -135,30 +135,30 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // Target opcodes.\r
 //\r
-#define ISCSI_OPCODE_NOP_IN       0x20\r
-#define ISCSI_OPCODE_SCSI_RSP     0x21\r
-#define ISCSI_OPCODE_SCSI_TMF_RSP 0x22\r
-#define ISCSI_OPCODE_LOGIN_RSP    0x23\r
-#define ISCSI_OPCODE_TEXT_RSP     0x24\r
-#define ISCSI_OPCODE_SCSI_DATA_IN 0x25\r
-#define ISCSI_OPCODE_LOGOUT_RSP   0x26\r
-#define ISCSI_OPCODE_R2T          0x31\r
-#define ISCSI_OPCODE_ASYNC_MSG    0x32\r
-#define ISCSI_OPCODE_VENDOR_T0    0x3c\r
-#define ISCSI_OPCODE_VENDOR_T1    0x3d\r
-#define ISCSI_OPCODE_VENDOR_T2    0x3e\r
-#define ISCSI_OPCODE_REJECT       0x3f\r
-\r
-#define ISCSI_BHS_FLAG_FINAL      0x80\r
+#define ISCSI_OPCODE_NOP_IN        0x20\r
+#define ISCSI_OPCODE_SCSI_RSP      0x21\r
+#define ISCSI_OPCODE_SCSI_TMF_RSP  0x22\r
+#define ISCSI_OPCODE_LOGIN_RSP     0x23\r
+#define ISCSI_OPCODE_TEXT_RSP      0x24\r
+#define ISCSI_OPCODE_SCSI_DATA_IN  0x25\r
+#define ISCSI_OPCODE_LOGOUT_RSP    0x26\r
+#define ISCSI_OPCODE_R2T           0x31\r
+#define ISCSI_OPCODE_ASYNC_MSG     0x32\r
+#define ISCSI_OPCODE_VENDOR_T0     0x3c\r
+#define ISCSI_OPCODE_VENDOR_T1     0x3d\r
+#define ISCSI_OPCODE_VENDOR_T2     0x3e\r
+#define ISCSI_OPCODE_REJECT        0x3f\r
+\r
+#define ISCSI_BHS_FLAG_FINAL  0x80\r
 \r
 //\r
 // Defined AHS types, others are reserved.\r
 //\r
-#define ISCSI_AHS_TYPE_EXT_CDB              0x1\r
-#define ISCSI_AHS_TYPE_BI_EXP_READ_DATA_LEN 0x2\r
+#define ISCSI_AHS_TYPE_EXT_CDB               0x1\r
+#define ISCSI_AHS_TYPE_BI_EXP_READ_DATA_LEN  0x2\r
 \r
-#define SCSI_CMD_PDU_FLAG_READ        0x40\r
-#define SCSI_CMD_PDU_FLAG_WRITE       0x20\r
+#define SCSI_CMD_PDU_FLAG_READ   0x40\r
+#define SCSI_CMD_PDU_FLAG_WRITE  0x20\r
 \r
 #define ISCSI_CMD_PDU_TASK_ATTR_MASK  0x07\r
 \r
@@ -174,10 +174,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // Flag bit definitions in SCSI response.\r
 //\r
-#define SCSI_RSP_PDU_FLAG_BI_READ_OVERFLOW  0x10\r
-#define SCSI_RSP_PDU_FLAG_BI_READ_UNDERFLOW 0x08\r
-#define SCSI_RSP_PDU_FLAG_OVERFLOW          0x04\r
-#define SCSI_RSP_PDU_FLAG_UNDERFLOW         0x02\r
+#define SCSI_RSP_PDU_FLAG_BI_READ_OVERFLOW   0x10\r
+#define SCSI_RSP_PDU_FLAG_BI_READ_UNDERFLOW  0x08\r
+#define SCSI_RSP_PDU_FLAG_OVERFLOW           0x04\r
+#define SCSI_RSP_PDU_FLAG_UNDERFLOW          0x02\r
 \r
 //\r
 // iSCSI service response codes.\r
@@ -185,25 +185,25 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define ISCSI_SERVICE_RSP_COMMAND_COMPLETE_AT_TARGET  0x00\r
 #define ISCSI_SERVICE_RSP_TARGET_FAILURE              0x01\r
 \r
-#define ISCSI_TMF_RSP_PDU_RSP_FUNCTION_COMPLETE           0\r
-#define ISCSI_TMF_RSP_PDU_RSP_TASK_NOT_EXIST              1\r
-#define ISCSI_TMF_RSP_PDU_RSP_LUN_NOT_EXIST               2\r
-#define ISCSI_TMF_RSP_PDU_RSP_TASK_STILL_ALLEGIANT        3\r
-#define ISCSI_TMF_RSP_PDU_RSP_TASK_REASSGIN_NOT_SUPPORTED 4\r
-#define ISCSI_TMF_RSP_PDU_RSP_NOT_SUPPORTED               5\r
-#define ISCSI_TMF_RSP_PDU_RSP_FUNCTION_AHTH_FAILED        6\r
-#define ISCSI_TMF_RSP_PDU_RSP_FUNCTION_REJECTED           255\r
+#define ISCSI_TMF_RSP_PDU_RSP_FUNCTION_COMPLETE            0\r
+#define ISCSI_TMF_RSP_PDU_RSP_TASK_NOT_EXIST               1\r
+#define ISCSI_TMF_RSP_PDU_RSP_LUN_NOT_EXIST                2\r
+#define ISCSI_TMF_RSP_PDU_RSP_TASK_STILL_ALLEGIANT         3\r
+#define ISCSI_TMF_RSP_PDU_RSP_TASK_REASSGIN_NOT_SUPPORTED  4\r
+#define ISCSI_TMF_RSP_PDU_RSP_NOT_SUPPORTED                5\r
+#define ISCSI_TMF_RSP_PDU_RSP_FUNCTION_AHTH_FAILED         6\r
+#define ISCSI_TMF_RSP_PDU_RSP_FUNCTION_REJECTED            255\r
 \r
 #define SCSI_DATA_IN_PDU_FLAG_ACKKNOWLEDGE  0x40\r
 #define SCSI_DATA_IN_PDU_FLAG_OVERFLOW      SCSI_RSP_PDU_FLAG_OVERFLOW\r
 #define SCSI_DATA_IN_PDU_FLAG_UNDERFLOW     SCSI_RSP_PDU_FLAG_UNDERFLOW\r
 #define SCSI_DATA_IN_PDU_FLAG_STATUS_VALID  0x01\r
 \r
-#define ISCSI_LOGIN_REQ_PDU_FLAG_TRANSIT  0x80\r
-#define ISCSI_LOGIN_REQ_PDU_FLAG_CONTINUE 0x40\r
+#define ISCSI_LOGIN_REQ_PDU_FLAG_TRANSIT   0x80\r
+#define ISCSI_LOGIN_REQ_PDU_FLAG_CONTINUE  0x40\r
 \r
-#define ISCSI_LOGIN_RSP_PDU_FLAG_TRANSIT    ISCSI_LOGIN_REQ_PDU_FLAG_TRANSIT\r
-#define ISCSI_LOGIN_RSP_PDU_FLAG_CONTINUE   ISCSI_LOGIN_REQ_PDU_FLAG_CONTINUE\r
+#define ISCSI_LOGIN_RSP_PDU_FLAG_TRANSIT   ISCSI_LOGIN_REQ_PDU_FLAG_TRANSIT\r
+#define ISCSI_LOGIN_RSP_PDU_FLAG_CONTINUE  ISCSI_LOGIN_REQ_PDU_FLAG_CONTINUE\r
 \r
 #define ISCSI_LOGIN_STATUS_SUCCESS          0\r
 #define ISCSI_LOGIN_STATUS_REDIRECTION      1\r
@@ -224,12 +224,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define ISCSI_SNACK_REQUEST_TYPE_DATA_ACK     2\r
 #define ISCSI_SNACK_REQUEST_TYPE_RDATA        3\r
 \r
-#define ISCSI_SECURITY_NEGOTIATION          0\r
-#define ISCSI_LOGIN_OPERATIONAL_NEGOTIATION 1\r
-#define ISCSI_FULL_FEATURE_PHASE            3\r
+#define ISCSI_SECURITY_NEGOTIATION           0\r
+#define ISCSI_LOGIN_OPERATIONAL_NEGOTIATION  1\r
+#define ISCSI_FULL_FEATURE_PHASE             3\r
 \r
-typedef struct _ISCSI_SESSION               ISCSI_SESSION;\r
-typedef struct _ISCSI_CONNECTION            ISCSI_CONNECTION;\r
+typedef struct _ISCSI_SESSION     ISCSI_SESSION;\r
+typedef struct _ISCSI_CONNECTION  ISCSI_CONNECTION;\r
 \r
 typedef enum {\r
   DataIn  = 0,\r
@@ -241,340 +241,340 @@ typedef enum {
 /// iSCSI Basic Header Segment\r
 ///\r
 typedef struct _ISCSI_BASIC_HEADER {\r
-  UINT8   OpCode;\r
-  UINT8   Flags;\r
-  UINT16  OpCodeSpecific1;\r
-  UINT8   TotalAHSLength;\r
-  UINT8   DataSegmentLength[3];\r
-  UINT8   Lun[8];\r
-  UINT32  InitiatorTaskTag;\r
-  UINT32  OpCodeSpecific2[7];\r
+  UINT8     OpCode;\r
+  UINT8     Flags;\r
+  UINT16    OpCodeSpecific1;\r
+  UINT8     TotalAHSLength;\r
+  UINT8     DataSegmentLength[3];\r
+  UINT8     Lun[8];\r
+  UINT32    InitiatorTaskTag;\r
+  UINT32    OpCodeSpecific2[7];\r
 } ISCSI_BASIC_HEADER;\r
 \r
 typedef struct _ISCSI_ADDTIONAL_HEADER {\r
-  UINT16  Length;\r
-  UINT8   Type;\r
-  UINT8   TypeSpecific[1];\r
+  UINT16    Length;\r
+  UINT8     Type;\r
+  UINT8     TypeSpecific[1];\r
 } ISCSI_ADDITIONAL_HEADER;\r
 \r
 typedef struct _ISCSI_BI_EXP_READ_DATA_LEN_AHS {\r
-  UINT16  Length;\r
-  UINT8   Type;\r
-  UINT8   Reserved;\r
-  UINT32  ExpReadDataLength;\r
+  UINT16    Length;\r
+  UINT8     Type;\r
+  UINT8     Reserved;\r
+  UINT32    ExpReadDataLength;\r
 } ISCSI_BI_EXP_READ_DATA_LEN_AHS;\r
 \r
 ///\r
 /// SCSI Command\r
 ///\r
 typedef struct _SCSI_COMMAND {\r
-  UINT8   OpCode;\r
-  UINT8   Flags;\r
-  UINT16  Reserved;\r
-  UINT8   TotalAHSLength;\r
-  UINT8   DataSegmentLength[3];\r
-  UINT8   Lun[8];\r
-  UINT32  InitiatorTaskTag;\r
-  UINT32  ExpDataXferLength;\r
-  UINT32  CmdSN;\r
-  UINT32  ExpStatSN;\r
-  UINT8   Cdb[16];\r
+  UINT8     OpCode;\r
+  UINT8     Flags;\r
+  UINT16    Reserved;\r
+  UINT8     TotalAHSLength;\r
+  UINT8     DataSegmentLength[3];\r
+  UINT8     Lun[8];\r
+  UINT32    InitiatorTaskTag;\r
+  UINT32    ExpDataXferLength;\r
+  UINT32    CmdSN;\r
+  UINT32    ExpStatSN;\r
+  UINT8     Cdb[16];\r
 } SCSI_COMMAND;\r
 \r
 ///\r
 /// SCSI Response\r
 ///\r
 typedef struct _SCSI_RESPONSE {\r
-  UINT8   OpCode;\r
-  UINT8   Flags;\r
-  UINT8   Response;\r
-  UINT8   Status;\r
-  UINT8   TotalAHSLength;\r
-  UINT8   DataSegmentLength[3];\r
-  UINT8   Reserved[8];\r
-  UINT32  InitiatorTaskTag;\r
-  UINT32  SNACKTag;\r
-  UINT32  StatSN;\r
-  UINT32  ExpCmdSN;\r
-  UINT32  MaxCmdSN;\r
-  UINT32  ExpDataSN;\r
-  UINT32  BiReadResidualCount;\r
-  UINT32  ResidualCount;\r
+  UINT8     OpCode;\r
+  UINT8     Flags;\r
+  UINT8     Response;\r
+  UINT8     Status;\r
+  UINT8     TotalAHSLength;\r
+  UINT8     DataSegmentLength[3];\r
+  UINT8     Reserved[8];\r
+  UINT32    InitiatorTaskTag;\r
+  UINT32    SNACKTag;\r
+  UINT32    StatSN;\r
+  UINT32    ExpCmdSN;\r
+  UINT32    MaxCmdSN;\r
+  UINT32    ExpDataSN;\r
+  UINT32    BiReadResidualCount;\r
+  UINT32    ResidualCount;\r
 } SCSI_RESPONSE;\r
 \r
 typedef struct _ISCSI_SENSE_DATA {\r
-  UINT16  Length;\r
-  UINT8   Data[2];\r
+  UINT16    Length;\r
+  UINT8     Data[2];\r
 } ISCSI_SENSE_DATA;\r
 \r
 ///\r
 /// iSCSI Task Management Function Request.\r
 ///\r
 typedef struct _ISCSI_TMF_REQUEST {\r
-  UINT8   OpCode;\r
-  UINT8   Fuction;\r
-  UINT16  Reserved1;\r
-  UINT8   TotalAHSLength;\r
-  UINT8   DataSegmentLength[3];\r
-  UINT8   Lun[8];\r
-  UINT32  InitiatorTaskTag;\r
-  UINT32  ReferencedTaskTag;\r
-  UINT32  CmdSN;\r
-  UINT32  ExpStatSN;\r
-  UINT32  RefCmdSN;\r
-  UINT32  ExpDataSN;\r
-  UINT32  Reserved2[2];\r
+  UINT8     OpCode;\r
+  UINT8     Fuction;\r
+  UINT16    Reserved1;\r
+  UINT8     TotalAHSLength;\r
+  UINT8     DataSegmentLength[3];\r
+  UINT8     Lun[8];\r
+  UINT32    InitiatorTaskTag;\r
+  UINT32    ReferencedTaskTag;\r
+  UINT32    CmdSN;\r
+  UINT32    ExpStatSN;\r
+  UINT32    RefCmdSN;\r
+  UINT32    ExpDataSN;\r
+  UINT32    Reserved2[2];\r
 } ISCSI_TMF_REQUEST;\r
 \r
 ///\r
 /// iSCSI Task Management Function Response.\r
 ///\r
 typedef struct _ISCSI_TMF_RESPONSE {\r
-  UINT8   OpCode;\r
-  UINT8   Reserved1;\r
-  UINT8   Response;\r
-  UINT8   Reserved2;\r
-  UINT8   TotalAHSLength;\r
-  UINT8   DataSegmentLength[3];\r
-  UINT32  Reserver3[2];\r
-  UINT32  InitiatorTaskTag;\r
-  UINT32  Reserved4;\r
-  UINT32  StatSN;\r
-  UINT32  ExpCmdSN;\r
-  UINT32  MaxCmdSN;\r
-  UINT32  Reserved[3];\r
+  UINT8     OpCode;\r
+  UINT8     Reserved1;\r
+  UINT8     Response;\r
+  UINT8     Reserved2;\r
+  UINT8     TotalAHSLength;\r
+  UINT8     DataSegmentLength[3];\r
+  UINT32    Reserver3[2];\r
+  UINT32    InitiatorTaskTag;\r
+  UINT32    Reserved4;\r
+  UINT32    StatSN;\r
+  UINT32    ExpCmdSN;\r
+  UINT32    MaxCmdSN;\r
+  UINT32    Reserved[3];\r
 } ISCSI_TMF_RESPONSE;\r
 \r
 ///\r
 /// SCSI Data-Out\r
 ///\r
 typedef struct _ISCSI_SCSI_DATA_OUT {\r
-  UINT8   OpCode;\r
-  UINT8   Reserved1[3];\r
-  UINT8   TotalAHSLength;\r
-  UINT8   DataSegmentLength[3];\r
-  UINT8   Lun[8];\r
-  UINT32  InitiatorTaskTag;\r
-  UINT32  TargetTransferTag;\r
-  UINT32  Reserved2;\r
-  UINT32  ExpStatSN;\r
-  UINT32  Reserved3;\r
-  UINT32  DataSN;\r
-  UINT32  BufferOffset;\r
-  UINT32  Reserved4;\r
+  UINT8     OpCode;\r
+  UINT8     Reserved1[3];\r
+  UINT8     TotalAHSLength;\r
+  UINT8     DataSegmentLength[3];\r
+  UINT8     Lun[8];\r
+  UINT32    InitiatorTaskTag;\r
+  UINT32    TargetTransferTag;\r
+  UINT32    Reserved2;\r
+  UINT32    ExpStatSN;\r
+  UINT32    Reserved3;\r
+  UINT32    DataSN;\r
+  UINT32    BufferOffset;\r
+  UINT32    Reserved4;\r
 } ISCSI_SCSI_DATA_OUT;\r
 \r
 ///\r
 /// SCSI Data-In\r
 ///\r
 typedef struct _ISCSI_SCSI_DATA_IN {\r
-  UINT8   OpCode;\r
-  UINT8   Flags;\r
-  UINT8   Reserved1;\r
-  UINT8   Status;\r
-  UINT8   TotalAHSLength;\r
-  UINT8   DataSegmentLength[3];\r
-  UINT8   Lun[8];\r
-  UINT32  InitiatorTaskTag;\r
-  UINT32  TargetTransferTag;\r
-  UINT32  StatSN;\r
-  UINT32  ExpCmdSN;\r
-  UINT32  MaxCmdSN;\r
-  UINT32  DataSN;\r
-  UINT32  BufferOffset;\r
-  UINT32  ResidualCount;\r
+  UINT8     OpCode;\r
+  UINT8     Flags;\r
+  UINT8     Reserved1;\r
+  UINT8     Status;\r
+  UINT8     TotalAHSLength;\r
+  UINT8     DataSegmentLength[3];\r
+  UINT8     Lun[8];\r
+  UINT32    InitiatorTaskTag;\r
+  UINT32    TargetTransferTag;\r
+  UINT32    StatSN;\r
+  UINT32    ExpCmdSN;\r
+  UINT32    MaxCmdSN;\r
+  UINT32    DataSN;\r
+  UINT32    BufferOffset;\r
+  UINT32    ResidualCount;\r
 } ISCSI_SCSI_DATA_IN;\r
 \r
 ///\r
 /// Ready To Transfer.\r
 ///\r
 typedef struct _ISCSI_READY_TO_TRANSFER {\r
-  UINT8   OpCode;\r
-  UINT8   Reserved1[3];\r
-  UINT8   TotalAHSLength;\r
-  UINT8   DataSegmentLength[3];\r
-  UINT8   Lun[8];\r
-  UINT32  InitiatorTaskTag;\r
-  UINT32  TargetTransferTag;\r
-  UINT32  StatSN;\r
-  UINT32  ExpCmdSN;\r
-  UINT32  MaxCmdSN;\r
-  UINT32  R2TSeqNum;\r
-  UINT32  BufferOffset;\r
-  UINT32  DesiredDataTransferLength;\r
+  UINT8     OpCode;\r
+  UINT8     Reserved1[3];\r
+  UINT8     TotalAHSLength;\r
+  UINT8     DataSegmentLength[3];\r
+  UINT8     Lun[8];\r
+  UINT32    InitiatorTaskTag;\r
+  UINT32    TargetTransferTag;\r
+  UINT32    StatSN;\r
+  UINT32    ExpCmdSN;\r
+  UINT32    MaxCmdSN;\r
+  UINT32    R2TSeqNum;\r
+  UINT32    BufferOffset;\r
+  UINT32    DesiredDataTransferLength;\r
 } ISCSI_READY_TO_TRANSFER;\r
 \r
 typedef struct _ISCSI_ASYNC_MESSAGE {\r
-  UINT8   OpCode;\r
-  UINT8   Reserved1[8];\r
-  UINT8   TotalAHSLength;\r
-  UINT8   DataSegmentLength[3];\r
-  UINT8   Lun[8];\r
-  UINT32  InitiatorTaskTag;\r
-  UINT32  Reserved2;\r
-  UINT32  StatSN;\r
-  UINT32  ExpCmdSN;\r
-  UINT32  MaxCmdSN;\r
-  UINT8   AsyncEvent;\r
-  UINT8   AsyncVCode;\r
-  UINT16  Parameter1;\r
-  UINT16  Parameter2;\r
-  UINT16  Parameter3;\r
-  UINT32  Reserved3;\r
+  UINT8     OpCode;\r
+  UINT8     Reserved1[8];\r
+  UINT8     TotalAHSLength;\r
+  UINT8     DataSegmentLength[3];\r
+  UINT8     Lun[8];\r
+  UINT32    InitiatorTaskTag;\r
+  UINT32    Reserved2;\r
+  UINT32    StatSN;\r
+  UINT32    ExpCmdSN;\r
+  UINT32    MaxCmdSN;\r
+  UINT8     AsyncEvent;\r
+  UINT8     AsyncVCode;\r
+  UINT16    Parameter1;\r
+  UINT16    Parameter2;\r
+  UINT16    Parameter3;\r
+  UINT32    Reserved3;\r
 } ISCSI_ASYNC_MESSAGE;\r
 \r
 ///\r
 /// Login Request.\r
 ///\r
 typedef struct _ISCSI_LOGIN_REQUEST {\r
-  UINT8   OpCode;\r
-  UINT8   Flags;\r
-  UINT8   VersionMax;\r
-  UINT8   VersionMin;\r
-  UINT8   TotalAHSLength;\r
-  UINT8   DataSegmentLength[3];\r
-  UINT8   Isid[6];\r
-  UINT16  Tsih;\r
-  UINT32  InitiatorTaskTag;\r
-  UINT16  Cid;\r
-  UINT16  Reserved1;\r
-  UINT32  CmdSN;\r
-  UINT32  ExpStatSN;\r
-  UINT32  Reserved2[4];\r
+  UINT8     OpCode;\r
+  UINT8     Flags;\r
+  UINT8     VersionMax;\r
+  UINT8     VersionMin;\r
+  UINT8     TotalAHSLength;\r
+  UINT8     DataSegmentLength[3];\r
+  UINT8     Isid[6];\r
+  UINT16    Tsih;\r
+  UINT32    InitiatorTaskTag;\r
+  UINT16    Cid;\r
+  UINT16    Reserved1;\r
+  UINT32    CmdSN;\r
+  UINT32    ExpStatSN;\r
+  UINT32    Reserved2[4];\r
 } ISCSI_LOGIN_REQUEST;\r
 \r
 ///\r
 /// Login Response.\r
 ///\r
 typedef struct _ISCSI_LOGIN_RESPONSE {\r
-  UINT8   OpCode;\r
-  UINT8   Flags;\r
-  UINT8   VersionMax;\r
-  UINT8   VersionActive;\r
-  UINT8   TotalAHSLength;\r
-  UINT8   DataSegmentLength[3];\r
-  UINT8   Isid[6];\r
-  UINT16  Tsih;\r
-  UINT32  InitiatorTaskTag;\r
-  UINT32  Reserved1;\r
-  UINT32  StatSN;\r
-  UINT32  ExpCmdSN;\r
-  UINT32  MaxCmdSN;\r
-  UINT8   StatusClass;\r
-  UINT8   StatusDetail;\r
-  UINT8   Reserved2[10];\r
+  UINT8     OpCode;\r
+  UINT8     Flags;\r
+  UINT8     VersionMax;\r
+  UINT8     VersionActive;\r
+  UINT8     TotalAHSLength;\r
+  UINT8     DataSegmentLength[3];\r
+  UINT8     Isid[6];\r
+  UINT16    Tsih;\r
+  UINT32    InitiatorTaskTag;\r
+  UINT32    Reserved1;\r
+  UINT32    StatSN;\r
+  UINT32    ExpCmdSN;\r
+  UINT32    MaxCmdSN;\r
+  UINT8     StatusClass;\r
+  UINT8     StatusDetail;\r
+  UINT8     Reserved2[10];\r
 } ISCSI_LOGIN_RESPONSE;\r
 \r
 ///\r
 /// Logout Request.\r
 ///\r
 typedef struct _ISCSI_LOGOUT_REQUEST {\r
-  UINT8   OpCode;\r
-  UINT8   ReasonCode;\r
-  UINT16  Reserved1;\r
-  UINT8   TotalAHSLength;\r
-  UINT8   DataSegmentLength[3];\r
-  UINT32  Reserved2[2];\r
-  UINT32  InitiatorTaskTag;\r
-  UINT16  Cid;\r
-  UINT16  Reserved3;\r
-  UINT32  CmdSN;\r
-  UINT32  ExpStatSN;\r
-  UINT32  Reserved4[4];\r
+  UINT8     OpCode;\r
+  UINT8     ReasonCode;\r
+  UINT16    Reserved1;\r
+  UINT8     TotalAHSLength;\r
+  UINT8     DataSegmentLength[3];\r
+  UINT32    Reserved2[2];\r
+  UINT32    InitiatorTaskTag;\r
+  UINT16    Cid;\r
+  UINT16    Reserved3;\r
+  UINT32    CmdSN;\r
+  UINT32    ExpStatSN;\r
+  UINT32    Reserved4[4];\r
 } ISCSI_LOGOUT_REQUEST;\r
 \r
 ///\r
 /// Logout Response.\r
 ///\r
 typedef struct _ISCSI_LOGOUT_RESPONSE {\r
-  UINT8   OpCode;\r
-  UINT8   Reserved1;\r
-  UINT8   Response;\r
-  UINT8   Reserved2;\r
-  UINT8   TotalAHSLength;\r
-  UINT8   DataSegmentLength[3];\r
-  UINT32  Reserved3[2];\r
-  UINT32  InitiatorTaskTag;\r
-  UINT32  Reserved4;\r
-  UINT32  StatSN;\r
-  UINT32  ExpCmdSN;\r
-  UINT32  MaxCmdSN;\r
-  UINT32  Reserved5;\r
-  UINT16  Time2Wait;\r
-  UINT16  Time2Retain;\r
-  UINT32  Reserved6;\r
+  UINT8     OpCode;\r
+  UINT8     Reserved1;\r
+  UINT8     Response;\r
+  UINT8     Reserved2;\r
+  UINT8     TotalAHSLength;\r
+  UINT8     DataSegmentLength[3];\r
+  UINT32    Reserved3[2];\r
+  UINT32    InitiatorTaskTag;\r
+  UINT32    Reserved4;\r
+  UINT32    StatSN;\r
+  UINT32    ExpCmdSN;\r
+  UINT32    MaxCmdSN;\r
+  UINT32    Reserved5;\r
+  UINT16    Time2Wait;\r
+  UINT16    Time2Retain;\r
+  UINT32    Reserved6;\r
 } ISCSI_LOGOUT_RESPONSE;\r
 \r
 ///\r
 /// SNACK Request.\r
 ///\r
 typedef struct _ISCSI_SNACK_REQUEST {\r
-  UINT8   OpCode;\r
-  UINT8   Type;\r
-  UINT16  Reserved1;\r
-  UINT8   TotalAHSLength;\r
-  UINT8   DataSegmentLength[3];\r
-  UINT8   Lun[8];\r
-  UINT32  InitiatorTaskTag;\r
-  UINT32  TargetTransferTag;\r
-  UINT32  Reserved2;\r
-  UINT32  ExpStatSN;\r
-  UINT32  Reserved[2];\r
-  UINT32  BegRun;\r
-  UINT32  RunLength;\r
+  UINT8     OpCode;\r
+  UINT8     Type;\r
+  UINT16    Reserved1;\r
+  UINT8     TotalAHSLength;\r
+  UINT8     DataSegmentLength[3];\r
+  UINT8     Lun[8];\r
+  UINT32    InitiatorTaskTag;\r
+  UINT32    TargetTransferTag;\r
+  UINT32    Reserved2;\r
+  UINT32    ExpStatSN;\r
+  UINT32    Reserved[2];\r
+  UINT32    BegRun;\r
+  UINT32    RunLength;\r
 } ISCSI_SNACK_REQUEST;\r
 \r
 ///\r
 /// Reject.\r
 ///\r
 typedef struct _ISCSI_REJECT {\r
-  UINT8   OpCode;\r
-  UINT8   Reserved1;\r
-  UINT8   Reason;\r
-  UINT8   Reserved2;\r
-  UINT8   TotalAHSLength;\r
-  UINT8   DataSegmentLength[3];\r
-  UINT32  Reserved3[2];\r
-  UINT32  InitiatorTaskTag;\r
-  UINT32  Reserved4;\r
-  UINT32  StatSN;\r
-  UINT32  ExpCmdSN;\r
-  UINT32  MaxCmdSN;\r
-  UINT32  DataSN;\r
-  UINT32  Reserved5[2];\r
+  UINT8     OpCode;\r
+  UINT8     Reserved1;\r
+  UINT8     Reason;\r
+  UINT8     Reserved2;\r
+  UINT8     TotalAHSLength;\r
+  UINT8     DataSegmentLength[3];\r
+  UINT32    Reserved3[2];\r
+  UINT32    InitiatorTaskTag;\r
+  UINT32    Reserved4;\r
+  UINT32    StatSN;\r
+  UINT32    ExpCmdSN;\r
+  UINT32    MaxCmdSN;\r
+  UINT32    DataSN;\r
+  UINT32    Reserved5[2];\r
 } ISCSI_REJECT;\r
 \r
 ///\r
 /// NOP-Out.\r
 ///\r
 typedef struct _ISCSI_NOP_OUT {\r
-  UINT8   OpCode;\r
-  UINT8   Reserved1[3];\r
-  UINT8   TotalAHSLength;\r
-  UINT8   DataSegmentLength[3];\r
-  UINT8   Lun[8];\r
-  UINT32  InitiatorTaskTag;\r
-  UINT32  TargetTransferTag;\r
-  UINT32  CmdSN;\r
-  UINT32  ExpStatSN;\r
-  UINT32  Reserved2[4];\r
+  UINT8     OpCode;\r
+  UINT8     Reserved1[3];\r
+  UINT8     TotalAHSLength;\r
+  UINT8     DataSegmentLength[3];\r
+  UINT8     Lun[8];\r
+  UINT32    InitiatorTaskTag;\r
+  UINT32    TargetTransferTag;\r
+  UINT32    CmdSN;\r
+  UINT32    ExpStatSN;\r
+  UINT32    Reserved2[4];\r
 } ISCSI_NOP_OUT;\r
 \r
 ///\r
 /// NOP-In.\r
 ///\r
 typedef struct _ISCSI_NOP_IN {\r
-  UINT8   OpCode;\r
-  UINT8   Reserved1[3];\r
-  UINT8   TotalAHSLength;\r
-  UINT8   DataSegmentLength[3];\r
-  UINT8   Lun[8];\r
-  UINT32  InitiatorTaskTag;\r
-  UINT32  TargetTransferTag;\r
-  UINT32  StatSN;\r
-  UINT32  ExpCmdSN;\r
-  UINT32  MaxCmdSN;\r
-  UINT32  Reserved2[3];\r
+  UINT8     OpCode;\r
+  UINT8     Reserved1[3];\r
+  UINT8     TotalAHSLength;\r
+  UINT8     DataSegmentLength[3];\r
+  UINT8     Lun[8];\r
+  UINT32    InitiatorTaskTag;\r
+  UINT32    TargetTransferTag;\r
+  UINT32    StatSN;\r
+  UINT32    ExpCmdSN;\r
+  UINT32    MaxCmdSN;\r
+  UINT32    Reserved2[3];\r
 } ISCSI_NOP_IN;\r
 \r
 typedef enum {\r
@@ -583,41 +583,41 @@ typedef enum {
 } ISCSI_DIGEST_TYPE;\r
 \r
 typedef struct _ISCSI_XFER_CONTEXT {\r
-  UINT32  TargetTransferTag;\r
-  UINT32  Offset;\r
-  UINT32  DesiredLength;\r
-  UINT32  ExpDataSN;\r
+  UINT32    TargetTransferTag;\r
+  UINT32    Offset;\r
+  UINT32    DesiredLength;\r
+  UINT32    ExpDataSN;\r
 } ISCSI_XFER_CONTEXT;\r
 \r
 typedef struct _ISCSI_IN_BUFFER_CONTEXT {\r
-  UINT8   *InData;\r
-  UINT32  InDataLen;\r
+  UINT8     *InData;\r
+  UINT32    InDataLen;\r
 } ISCSI_IN_BUFFER_CONTEXT;\r
 \r
 typedef struct _ISCSI_TCB {\r
-  LIST_ENTRY          Link;\r
-\r
-  BOOLEAN             SoFarInOrder;\r
-  UINT32              ExpDataSN;\r
-  BOOLEAN             FbitReceived;\r
-  BOOLEAN             StatusXferd;\r
-  UINT32              ActiveR2Ts;\r
-  UINT32              Response;\r
-  CHAR8               *Reason;\r
-  UINT32              InitiatorTaskTag;\r
-  UINT32              CmdSN;\r
-  UINT32              SNACKTag;\r
-\r
-  ISCSI_XFER_CONTEXT  XferContext;\r
-\r
-  ISCSI_CONNECTION    *Conn;\r
+  LIST_ENTRY            Link;\r
+\r
+  BOOLEAN               SoFarInOrder;\r
+  UINT32                ExpDataSN;\r
+  BOOLEAN               FbitReceived;\r
+  BOOLEAN               StatusXferd;\r
+  UINT32                ActiveR2Ts;\r
+  UINT32                Response;\r
+  CHAR8                 *Reason;\r
+  UINT32                InitiatorTaskTag;\r
+  UINT32                CmdSN;\r
+  UINT32                SNACKTag;\r
+\r
+  ISCSI_XFER_CONTEXT    XferContext;\r
+\r
+  ISCSI_CONNECTION      *Conn;\r
 } ISCSI_TCB;\r
 \r
 typedef struct _ISCSI_KEY_VALUE_PAIR {\r
-  LIST_ENTRY      List;\r
+  LIST_ENTRY    List;\r
 \r
-  CHAR8           *Key;\r
-  CHAR8           *Value;\r
+  CHAR8         *Key;\r
+  CHAR8         *Value;\r
 } ISCSI_KEY_VALUE_PAIR;\r
 \r
 /**\r
@@ -657,8 +657,8 @@ IScsiDetatchConnection (
 **/\r
 EFI_STATUS\r
 IScsiConnLogin (\r
-  IN OUT ISCSI_CONNECTION    *Conn,\r
-  IN     UINT16              Timeout\r
+  IN OUT ISCSI_CONNECTION  *Conn,\r
+  IN     UINT16            Timeout\r
   );\r
 \r
 /**\r
@@ -671,7 +671,7 @@ IScsiConnLogin (
 **/\r
 ISCSI_CONNECTION *\r
 IScsiCreateConnection (\r
-  IN ISCSI_SESSION      *Session\r
+  IN ISCSI_SESSION  *Session\r
   );\r
 \r
 /**\r
@@ -764,9 +764,9 @@ IScsiReceiveLoginRsp (
 **/\r
 EFI_STATUS\r
 IScsiAddKeyValuePair (\r
-  IN OUT NET_BUF      *Pdu,\r
-  IN CHAR8            *Key,\r
-  IN CHAR8            *Value\r
+  IN OUT NET_BUF  *Pdu,\r
+  IN CHAR8        *Key,\r
+  IN CHAR8        *Value\r
   );\r
 \r
 /**\r
@@ -818,9 +818,9 @@ IScsiProcessLoginRsp (
 **/\r
 EFI_STATUS\r
 IScsiUpdateTargetAddress (\r
-  IN OUT ISCSI_SESSION         *Session,\r
-  IN     CHAR8                 *Data,\r
-  IN     UINT32                Len\r
+  IN OUT ISCSI_SESSION  *Session,\r
+  IN     CHAR8          *Data,\r
+  IN     UINT32         Len\r
   );\r
 \r
 /**\r
@@ -832,7 +832,7 @@ IScsiUpdateTargetAddress (
 VOID\r
 EFIAPI\r
 IScsiFreeNbufList (\r
-  VOID *Arg\r
+  VOID  *Arg\r
   );\r
 \r
 /**\r
@@ -857,12 +857,12 @@ IScsiFreeNbufList (
 **/\r
 EFI_STATUS\r
 IScsiReceivePdu (\r
-  IN ISCSI_CONNECTION                      *Conn,\r
-  OUT NET_BUF                              **Pdu,\r
-  IN ISCSI_IN_BUFFER_CONTEXT               *Context  OPTIONAL,\r
-  IN BOOLEAN                               HeaderDigest,\r
-  IN BOOLEAN                               DataDigest,\r
-  IN EFI_EVENT                             TimeoutEvent OPTIONAL\r
+  IN ISCSI_CONNECTION         *Conn,\r
+  OUT NET_BUF                 **Pdu,\r
+  IN ISCSI_IN_BUFFER_CONTEXT  *Context  OPTIONAL,\r
+  IN BOOLEAN                  HeaderDigest,\r
+  IN BOOLEAN                  DataDigest,\r
+  IN EFI_EVENT                TimeoutEvent OPTIONAL\r
   );\r
 \r
 /**\r
@@ -905,8 +905,8 @@ IScsiFillOpParams (
 **/\r
 EFI_STATUS\r
 IScsiPadSegment (\r
-  IN OUT NET_BUF      *Pdu,\r
-  IN     UINT32       Len\r
+  IN OUT NET_BUF  *Pdu,\r
+  IN     UINT32   Len\r
   );\r
 \r
 /**\r
@@ -921,8 +921,8 @@ IScsiPadSegment (
 **/\r
 LIST_ENTRY *\r
 IScsiBuildKeyValueList (\r
-  IN CHAR8  *Data,\r
-  IN UINT32 Len\r
+  IN CHAR8   *Data,\r
+  IN UINT32  Len\r
   );\r
 \r
 /**\r
@@ -938,8 +938,8 @@ IScsiBuildKeyValueList (
 **/\r
 CHAR8 *\r
 IScsiGetValueByKeyFromList (\r
-  IN OUT LIST_ENTRY     *KeyValueList,\r
-  IN     CHAR8          *Key\r
+  IN OUT LIST_ENTRY  *KeyValueList,\r
+  IN     CHAR8       *Key\r
   );\r
 \r
 /**\r
@@ -950,7 +950,7 @@ IScsiGetValueByKeyFromList (
 **/\r
 VOID\r
 IScsiFreeKeyValueList (\r
-  IN LIST_ENTRY      *KeyValueList\r
+  IN LIST_ENTRY  *KeyValueList\r
   );\r
 \r
 /**\r
@@ -965,8 +965,8 @@ IScsiFreeKeyValueList (
 **/\r
 EFI_STATUS\r
 IScsiNormalizeName (\r
-  IN OUT CHAR8      *Name,\r
-  IN     UINTN      Len\r
+  IN OUT CHAR8  *Name,\r
+  IN     UINTN  Len\r
   );\r
 \r
 /**\r
index 88fd42256756d7d436e990f7032f14afb60c9489..1db0d5abaf3e450b309d2db390cce45190ffdf5f 100644 (file)
@@ -14,6 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
     0x4d20583a, 0x7765, 0x4e7a, { 0x8a, 0x67, 0xdc, 0xde, 0x74, 0xee, 0x3e, 0xc5 } \\r
   }\r
 \r
-extern EFI_GUID gHttpBootConfigGuid;\r
+extern EFI_GUID  gHttpBootConfigGuid;\r
 \r
 #endif\r
index 1dffe9497aaa9a3c6f1e916d06371f54097ef2dc..0ead068831e3bf37728db1ffc1622a861fe18a35 100644 (file)
@@ -24,9 +24,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
     0x46ddb415, 0x5244, 0x49c7, { 0x93, 0x74, 0xf0, 0xe2, 0x98, 0xe7, 0xd3, 0x86 } \\r
   }\r
 \r
-#define EDKII_HTTP_TLS_CIPHER_LIST_VARIABLE       L"HttpTlsCipherList"\r
+#define EDKII_HTTP_TLS_CIPHER_LIST_VARIABLE  L"HttpTlsCipherList"\r
 \r
-extern EFI_GUID gEdkiiHttpTlsCipherListGuid;\r
+extern EFI_GUID  gEdkiiHttpTlsCipherListGuid;\r
 \r
 #endif\r
-\r
index d63ef208b13da818bf699ad9a9f511c86184d349..f21e25956e6d4a3e77481013713bb4be169e6f14 100644 (file)
@@ -15,6 +15,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
     0x4b47d616, 0xa8d6, 0x4552, { 0x9d, 0x44, 0xcc, 0xad, 0x2e, 0xf, 0x4c, 0xf9 } \\r
   }\r
 \r
-extern EFI_GUID gIScsiConfigGuid;\r
+extern EFI_GUID  gIScsiConfigGuid;\r
 \r
 #endif\r
index fe431f8c00efa7cb8e339a3a72d52fecde2041af..06b9d76f7d5021542aab510401851b12062546fb 100644 (file)
@@ -14,6 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
     0x9b942747, 0x154e, 0x4d29, { 0xa4, 0x36, 0xbf, 0x71, 0x0, 0xc8, 0xb5, 0x3b } \\r
   }\r
 \r
-extern EFI_GUID gIp4Config2NvDataGuid;\r
+extern EFI_GUID  gIp4Config2NvDataGuid;\r
 \r
 #endif\r
index 18d67ae601073cdbf048f4c383ef017f034fbb1c..c74110de69006b839138c64788e7103d7cd58b1d 100644 (file)
@@ -19,7 +19,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
     0x786ec0ac, 0x65ae, 0x4d1b, {0xb1, 0x37, 0xd, 0x11, 0xa, 0x48, 0x37, 0x97} \\r
   }\r
 \r
-extern EFI_GUID gIp4IScsiConfigGuid;\r
-extern EFI_GUID gIScsiCHAPAuthInfoGuid;\r
+extern EFI_GUID  gIp4IScsiConfigGuid;\r
+extern EFI_GUID  gIScsiCHAPAuthInfoGuid;\r
 \r
 #endif\r
index da26d03069d905590622ebd12de53fdd4a95b782..e60c7f944a004c84a22afdb25835baeb2b25836d 100644 (file)
@@ -14,6 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
     0x2eea107, 0x98db, 0x400e, { 0x98, 0x30, 0x46, 0xa, 0x15, 0x42, 0xd7, 0x99 } \\r
   }\r
 \r
-extern EFI_GUID gIp6ConfigNvDataGuid;\r
+extern EFI_GUID  gIp6ConfigNvDataGuid;\r
 \r
 #endif\r
index fd2de001af56a3ba281f1a6c2a5511f24b817e0c..9ae3ccd8c0b7053cad3e0f20650e9370bc1b30fc 100644 (file)
@@ -14,7 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
     0xb0eae4f8, 0x9a04, 0x4c6d, { 0xa7, 0x48, 0x79, 0x3d, 0xaa, 0xf, 0x65, 0xdf } \\r
   }\r
 \r
-extern EFI_GUID gTlsAuthConfigGuid;\r
+extern EFI_GUID  gTlsAuthConfigGuid;\r
 \r
 #endif\r
-\r
index e6646a65ef2ec59de2ee759ee65364027237cb81..4584a360860ea8c2975102f624041b78c96bf5ba 100644 (file)
@@ -16,9 +16,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
     0xfd2340D0, 0x3dab, 0x4349, { 0xa6, 0xc7, 0x3b, 0x4f, 0x12, 0xb4, 0x8e, 0xae } \\r
   }\r
 \r
-#define EFI_TLS_CA_CERTIFICATE_VARIABLE       L"TlsCaCertificate"\r
+#define EFI_TLS_CA_CERTIFICATE_VARIABLE  L"TlsCaCertificate"\r
 \r
-extern EFI_GUID gEfiTlsCaCertificateGuid;\r
+extern EFI_GUID  gEfiTlsCaCertificateGuid;\r
 \r
 #endif\r
-\r
index 9f74e4d592950ac7c593a5b051444c126a77ccab..3474e15fca1bc7b5382ef2ca4478a1aa644780e1 100644 (file)
@@ -14,6 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
     0xd79df6b0, 0xef44, 0x43bd, {0x97, 0x97, 0x43, 0xe9, 0x3b, 0xcf, 0x5f, 0xa8 } \\r
   }\r
 \r
-extern EFI_GUID gVlanConfigFormSetGuid;\r
+extern EFI_GUID  gVlanConfigFormSetGuid;\r
 \r
 #endif\r
index 6d2b1344b08913c9b637bc4143faf870dfeb43a2..962a761a0997a070508499ab4c450bdd6d031537 100644 (file)
@@ -14,6 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
     0x9f94d327, 0x0b18, 0x4245, { 0x8f, 0xf2, 0x83, 0x2e, 0x30, 0xd, 0x2c, 0xef } \\r
   }\r
 \r
-extern EFI_GUID gWifiConfigGuid;\r
+extern EFI_GUID  gWifiConfigGuid;\r
 \r
 #endif\r
index ccddc547a5caf0819a7135c1a42a42da060c113d..72f9b0313be91f1a0715ad34315de505e6012007 100644 (file)
@@ -15,9 +15,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/HttpLib.h>\r
 #include <Library/NetLib.h>\r
 \r
-#define HTTP_IO_MAX_SEND_PAYLOAD                    1024\r
-#define HTTP_IO_CHUNK_SIZE_STRING_LEN               50\r
-#define HTTP_IO_CHUNKED_TRANSFER_CODING_DATA_LENGTH 256\r
+#define HTTP_IO_MAX_SEND_PAYLOAD                     1024\r
+#define HTTP_IO_CHUNK_SIZE_STRING_LEN                50\r
+#define HTTP_IO_CHUNKED_TRANSFER_CODING_DATA_LENGTH  256\r
 \r
 ///\r
 /// HTTP_IO_CALLBACK_EVENT\r
@@ -39,7 +39,7 @@ typedef enum {
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI * HTTP_IO_CALLBACK) (\r
+(EFIAPI *HTTP_IO_CALLBACK)(\r
   IN  HTTP_IO_CALLBACK_EVENT    EventType,\r
   IN  EFI_HTTP_MESSAGE          *Message,\r
   IN  VOID                      *Context\r
@@ -49,70 +49,70 @@ EFI_STATUS
 /// A wrapper structure to hold the received HTTP response data.\r
 ///\r
 typedef struct {\r
-  EFI_HTTP_RESPONSE_DATA      Response;\r
-  UINTN                       HeaderCount;\r
-  EFI_HTTP_HEADER             *Headers;\r
-  UINTN                       BodyLength;\r
-  CHAR8                       *Body;\r
-  EFI_STATUS                  Status;\r
+  EFI_HTTP_RESPONSE_DATA    Response;\r
+  UINTN                     HeaderCount;\r
+  EFI_HTTP_HEADER           *Headers;\r
+  UINTN                     BodyLength;\r
+  CHAR8                     *Body;\r
+  EFI_STATUS                Status;\r
 } HTTP_IO_RESPONSE_DATA;\r
 \r
 ///\r
 /// HTTP_IO configuration data for IPv4\r
 ///\r
 typedef struct {\r
-  EFI_HTTP_VERSION          HttpVersion;\r
-  UINT32                    RequestTimeOut;  ///< In milliseconds.\r
-  UINT32                    ResponseTimeOut; ///< In milliseconds.\r
-  BOOLEAN                   UseDefaultAddress;\r
-  EFI_IPv4_ADDRESS          LocalIp;\r
-  EFI_IPv4_ADDRESS          SubnetMask;\r
-  UINT16                    LocalPort;\r
+  EFI_HTTP_VERSION    HttpVersion;\r
+  UINT32              RequestTimeOut;        ///< In milliseconds.\r
+  UINT32              ResponseTimeOut;       ///< In milliseconds.\r
+  BOOLEAN             UseDefaultAddress;\r
+  EFI_IPv4_ADDRESS    LocalIp;\r
+  EFI_IPv4_ADDRESS    SubnetMask;\r
+  UINT16              LocalPort;\r
 } HTTP4_IO_CONFIG_DATA;\r
 \r
 ///\r
 /// HTTP_IO configuration data for IPv6\r
 ///\r
 typedef struct {\r
-  EFI_HTTP_VERSION          HttpVersion;\r
-  UINT32                    RequestTimeOut;  ///< In milliseconds.\r
-  BOOLEAN                   UseDefaultAddress;\r
-  EFI_IPv6_ADDRESS          LocalIp;\r
-  UINT16                    LocalPort;\r
+  EFI_HTTP_VERSION    HttpVersion;\r
+  UINT32              RequestTimeOut;        ///< In milliseconds.\r
+  BOOLEAN             UseDefaultAddress;\r
+  EFI_IPv6_ADDRESS    LocalIp;\r
+  UINT16              LocalPort;\r
 } HTTP6_IO_CONFIG_DATA;\r
 \r
 ///\r
 /// HTTP_IO configuration\r
 ///\r
 typedef union {\r
-  HTTP4_IO_CONFIG_DATA       Config4;\r
-  HTTP6_IO_CONFIG_DATA       Config6;\r
+  HTTP4_IO_CONFIG_DATA    Config4;\r
+  HTTP6_IO_CONFIG_DATA    Config6;\r
 } HTTP_IO_CONFIG_DATA;\r
 \r
 ///\r
 /// HTTP_IO wrapper of the EFI HTTP service.\r
 ///\r
 typedef struct {\r
-  UINT8                     IpVersion;\r
-  EFI_HANDLE                Image;\r
-  EFI_HANDLE                Controller;\r
-  EFI_HANDLE                Handle;\r
+  UINT8                IpVersion;\r
+  EFI_HANDLE           Image;\r
+  EFI_HANDLE           Controller;\r
+  EFI_HANDLE           Handle;\r
 \r
-  EFI_HTTP_PROTOCOL         *Http;\r
+  EFI_HTTP_PROTOCOL    *Http;\r
 \r
-  HTTP_IO_CALLBACK          Callback;\r
-  VOID                      *Context;\r
+  HTTP_IO_CALLBACK     Callback;\r
+  VOID                 *Context;\r
 \r
-  EFI_HTTP_TOKEN            ReqToken;\r
-  EFI_HTTP_MESSAGE          ReqMessage;\r
-  EFI_HTTP_TOKEN            RspToken;\r
-  EFI_HTTP_MESSAGE          RspMessage;\r
+  EFI_HTTP_TOKEN       ReqToken;\r
+  EFI_HTTP_MESSAGE     ReqMessage;\r
+  EFI_HTTP_TOKEN       RspToken;\r
+  EFI_HTTP_MESSAGE     RspMessage;\r
 \r
-  BOOLEAN                   IsTxDone;\r
-  BOOLEAN                   IsRxDone;\r
+  BOOLEAN              IsTxDone;\r
+  BOOLEAN              IsRxDone;\r
 \r
-  EFI_EVENT                 TimeoutEvent;\r
-  UINT32                    Timeout;\r
+  EFI_EVENT            TimeoutEvent;\r
+  UINT32               Timeout;\r
 } HTTP_IO;\r
 \r
 ///\r
@@ -140,9 +140,9 @@ typedef enum  {
 /// Chunk links for HTTP chunked transfer coding.\r
 ///\r
 typedef struct {\r
-  LIST_ENTRY  NextChunk;\r
-  UINTN       Length;\r
-  CHAR8       *Data;\r
+  LIST_ENTRY    NextChunk;\r
+  UINTN         Length;\r
+  CHAR8         *Data;\r
 } HTTP_IO_CHUNKS;\r
 \r
 /**\r
@@ -154,7 +154,7 @@ typedef struct {
 VOID\r
 EFIAPI\r
 HttpIoNotifyDpc (\r
-  IN VOID                *Context\r
+  IN VOID  *Context\r
   );\r
 \r
 /**\r
@@ -167,8 +167,8 @@ HttpIoNotifyDpc (
 VOID\r
 EFIAPI\r
 HttpIoNotify (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -179,7 +179,7 @@ HttpIoNotify (
 **/\r
 VOID\r
 HttpIoDestroyIo (\r
-  IN HTTP_IO                *HttpIo\r
+  IN HTTP_IO  *HttpIo\r
   );\r
 \r
 /**\r
@@ -205,13 +205,13 @@ HttpIoDestroyIo (
 **/\r
 EFI_STATUS\r
 HttpIoCreateIo (\r
-  IN EFI_HANDLE             Image,\r
-  IN EFI_HANDLE             Controller,\r
-  IN UINT8                  IpVersion,\r
-  IN HTTP_IO_CONFIG_DATA    *ConfigData,\r
-  IN HTTP_IO_CALLBACK       Callback,\r
-  IN VOID                   *Context,\r
-  OUT HTTP_IO               *HttpIo\r
+  IN EFI_HANDLE           Image,\r
+  IN EFI_HANDLE           Controller,\r
+  IN UINT8                IpVersion,\r
+  IN HTTP_IO_CONFIG_DATA  *ConfigData,\r
+  IN HTTP_IO_CALLBACK     Callback,\r
+  IN VOID                 *Context,\r
+  OUT HTTP_IO             *HttpIo\r
   );\r
 \r
 /**\r
@@ -258,9 +258,9 @@ HttpIoSendRequest (
 **/\r
 EFI_STATUS\r
 HttpIoRecvResponse (\r
-  IN      HTTP_IO                  *HttpIo,\r
-  IN      BOOLEAN                  RecvMsgHeader,\r
-  OUT     HTTP_IO_RESPONSE_DATA    *ResponseData\r
+  IN      HTTP_IO                *HttpIo,\r
+  IN      BOOLEAN                RecvMsgHeader,\r
+  OUT     HTTP_IO_RESPONSE_DATA  *ResponseData\r
   );\r
 \r
 /**\r
@@ -276,9 +276,9 @@ HttpIoRecvResponse (
 **/\r
 EFI_STATUS\r
 HttpIoGetContentLength (\r
-  IN     UINTN                HeaderCount,\r
-  IN     EFI_HTTP_HEADER      *Headers,\r
-  OUT    UINTN                *ContentLength\r
+  IN     UINTN            HeaderCount,\r
+  IN     EFI_HTTP_HEADER  *Headers,\r
+  OUT    UINTN            *ContentLength\r
   );\r
 \r
 /**\r
@@ -301,11 +301,11 @@ HttpIoGetContentLength (
 **/\r
 EFI_STATUS\r
 HttpIoGetChunkedTransferContent (\r
-  IN     HTTP_IO              *HttpIo,\r
-  IN     UINTN                HeaderCount,\r
-  IN     EFI_HTTP_HEADER      *Headers,\r
-  OUT    LIST_ENTRY           **ChunkListHead,\r
-  OUT    UINTN                *ContentLength\r
+  IN     HTTP_IO          *HttpIo,\r
+  IN     UINTN            HeaderCount,\r
+  IN     EFI_HTTP_HEADER  *Headers,\r
+  OUT    LIST_ENTRY       **ChunkListHead,\r
+  OUT    UINTN            *ContentLength\r
   );\r
 \r
 /**\r
@@ -321,8 +321,9 @@ HttpIoGetChunkedTransferContent (
 **/\r
 EFI_STATUS\r
 HttpIoSendChunkedTransfer (\r
-  IN  HTTP_IO                    *HttpIo,\r
-  IN  HTTP_IO_SEND_CHUNK_PROCESS *SendChunkProcess,\r
-  IN  EFI_HTTP_MESSAGE           *RequestMessage\r
-);\r
+  IN  HTTP_IO                     *HttpIo,\r
+  IN  HTTP_IO_SEND_CHUNK_PROCESS  *SendChunkProcess,\r
+  IN  EFI_HTTP_MESSAGE            *RequestMessage\r
+  );\r
+\r
 #endif\r
index 2c3367fb01976e91f25a9ee9f8127b1596d5a9a0..f8505ab4d7ea13603975bfb23131cc1184f2d8dc 100644 (file)
@@ -13,7 +13,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include <Protocol/Http.h>\r
 \r
-\r
 /**\r
   Decode a percent-encoded URI component to the ASCII character.\r
 \r
@@ -33,10 +32,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 EFI_STATUS\r
 EFIAPI\r
 UriPercentDecode (\r
-  IN      CHAR8            *Buffer,\r
-  IN      UINT32            BufferLength,\r
-     OUT  CHAR8            *ResultBuffer,\r
-     OUT  UINT32           *ResultLength\r
+  IN      CHAR8   *Buffer,\r
+  IN      UINT32  BufferLength,\r
+  OUT  CHAR8      *ResultBuffer,\r
+  OUT  UINT32     *ResultLength\r
   );\r
 \r
 /**\r
@@ -60,10 +59,10 @@ UriPercentDecode (
 EFI_STATUS\r
 EFIAPI\r
 HttpParseUrl (\r
-  IN      CHAR8              *Url,\r
-  IN      UINT32             Length,\r
-  IN      BOOLEAN            IsConnectMethod,\r
-     OUT  VOID               **UrlParser\r
+  IN      CHAR8    *Url,\r
+  IN      UINT32   Length,\r
+  IN      BOOLEAN  IsConnectMethod,\r
+  OUT  VOID        **UrlParser\r
   );\r
 \r
 /**\r
@@ -85,9 +84,9 @@ HttpParseUrl (
 EFI_STATUS\r
 EFIAPI\r
 HttpUrlGetHostName (\r
-  IN      CHAR8              *Url,\r
-  IN      VOID               *UrlParser,\r
-     OUT  CHAR8              **HostName\r
+  IN      CHAR8  *Url,\r
+  IN      VOID   *UrlParser,\r
+  OUT  CHAR8     **HostName\r
   );\r
 \r
 /**\r
@@ -108,9 +107,9 @@ HttpUrlGetHostName (
 EFI_STATUS\r
 EFIAPI\r
 HttpUrlGetIp4 (\r
-  IN      CHAR8              *Url,\r
-  IN      VOID               *UrlParser,\r
-     OUT  EFI_IPv4_ADDRESS   *Ip4Address\r
+  IN      CHAR8          *Url,\r
+  IN      VOID           *UrlParser,\r
+  OUT  EFI_IPv4_ADDRESS  *Ip4Address\r
   );\r
 \r
 /**\r
@@ -131,9 +130,9 @@ HttpUrlGetIp4 (
 EFI_STATUS\r
 EFIAPI\r
 HttpUrlGetIp6 (\r
-  IN      CHAR8              *Url,\r
-  IN      VOID               *UrlParser,\r
-     OUT  EFI_IPv6_ADDRESS   *Ip6Address\r
+  IN      CHAR8          *Url,\r
+  IN      VOID           *UrlParser,\r
+  OUT  EFI_IPv6_ADDRESS  *Ip6Address\r
   );\r
 \r
 /**\r
@@ -154,9 +153,9 @@ HttpUrlGetIp6 (
 EFI_STATUS\r
 EFIAPI\r
 HttpUrlGetPort (\r
-  IN      CHAR8              *Url,\r
-  IN      VOID               *UrlParser,\r
-     OUT  UINT16             *Port\r
+  IN      CHAR8  *Url,\r
+  IN      VOID   *UrlParser,\r
+  OUT  UINT16    *Port\r
   );\r
 \r
 /**\r
@@ -178,9 +177,9 @@ HttpUrlGetPort (
 EFI_STATUS\r
 EFIAPI\r
 HttpUrlGetPath (\r
-  IN      CHAR8              *Url,\r
-  IN      VOID               *UrlParser,\r
-     OUT  CHAR8              **Path\r
+  IN      CHAR8  *Url,\r
+  IN      VOID   *UrlParser,\r
+  OUT  CHAR8     **Path\r
   );\r
 \r
 /**\r
@@ -192,7 +191,7 @@ HttpUrlGetPath (
 VOID\r
 EFIAPI\r
 HttpUrlFreeParser (\r
-  IN      VOID               *UrlParser\r
+  IN      VOID  *UrlParser\r
   );\r
 \r
 //\r
@@ -229,12 +228,12 @@ typedef enum {
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *HTTP_BODY_PARSER_CALLBACK) (\r
+(EFIAPI *HTTP_BODY_PARSER_CALLBACK)(\r
   IN HTTP_BODY_PARSE_EVENT      EventType,\r
   IN CHAR8                      *Data,\r
   IN UINTN                      Length,\r
   IN VOID                       *Context\r
-);\r
+  );\r
 \r
 /**\r
   Initialize a HTTP message-body parser.\r
@@ -260,13 +259,13 @@ EFI_STATUS
 EFI_STATUS\r
 EFIAPI\r
 HttpInitMsgParser (\r
-  IN     EFI_HTTP_METHOD               Method,\r
-  IN     EFI_HTTP_STATUS_CODE          StatusCode,\r
-  IN     UINTN                         HeaderCount,\r
-  IN     EFI_HTTP_HEADER               *Headers,\r
-  IN     HTTP_BODY_PARSER_CALLBACK     Callback,\r
-  IN     VOID                          *Context,\r
-    OUT  VOID                          **MsgParser\r
+  IN     EFI_HTTP_METHOD            Method,\r
+  IN     EFI_HTTP_STATUS_CODE       StatusCode,\r
+  IN     UINTN                      HeaderCount,\r
+  IN     EFI_HTTP_HEADER            *Headers,\r
+  IN     HTTP_BODY_PARSER_CALLBACK  Callback,\r
+  IN     VOID                       *Context,\r
+  OUT  VOID                         **MsgParser\r
   );\r
 \r
 /**\r
@@ -287,9 +286,9 @@ HttpInitMsgParser (
 EFI_STATUS\r
 EFIAPI\r
 HttpParseMessageBody (\r
-  IN OUT VOID              *MsgParser,\r
-  IN     UINTN             BodyLength,\r
-  IN     CHAR8             *Body\r
+  IN OUT VOID   *MsgParser,\r
+  IN     UINTN  BodyLength,\r
+  IN     CHAR8  *Body\r
   );\r
 \r
 /**\r
@@ -304,7 +303,7 @@ HttpParseMessageBody (
 BOOLEAN\r
 EFIAPI\r
 HttpIsMessageComplete (\r
-  IN VOID           *MsgParser\r
+  IN VOID  *MsgParser\r
   );\r
 \r
 /**\r
@@ -323,8 +322,8 @@ HttpIsMessageComplete (
 EFI_STATUS\r
 EFIAPI\r
 HttpGetEntityLength (\r
-  IN  VOID           *MsgParser,\r
-  OUT UINTN          *ContentLength\r
+  IN  VOID   *MsgParser,\r
+  OUT UINTN  *ContentLength\r
   );\r
 \r
 /**\r
@@ -336,10 +335,9 @@ HttpGetEntityLength (
 VOID\r
 EFIAPI\r
 HttpFreeMsgParser (\r
-  IN  VOID           *MsgParser\r
+  IN  VOID  *MsgParser\r
   );\r
 \r
-\r
 /**\r
   Find a specified header field according to the field name.\r
 \r
@@ -353,9 +351,9 @@ HttpFreeMsgParser (
 EFI_HTTP_HEADER *\r
 EFIAPI\r
 HttpFindHeader (\r
-  IN  UINTN                HeaderCount,\r
-  IN  EFI_HTTP_HEADER      *Headers,\r
-  IN  CHAR8                *FieldName\r
+  IN  UINTN            HeaderCount,\r
+  IN  EFI_HTTP_HEADER  *Headers,\r
+  IN  CHAR8            *FieldName\r
   );\r
 \r
 /**\r
@@ -374,9 +372,9 @@ HttpFindHeader (
 EFI_STATUS\r
 EFIAPI\r
 HttpSetFieldNameAndValue (\r
-   IN  OUT   EFI_HTTP_HEADER       *HttpHeader,\r
-   IN  CONST CHAR8                 *FieldName,\r
-   IN  CONST CHAR8                 *FieldValue\r
+  IN  OUT   EFI_HTTP_HEADER  *HttpHeader,\r
+  IN  CONST CHAR8            *FieldName,\r
+  IN  CONST CHAR8            *FieldValue\r
   );\r
 \r
 /**\r
@@ -393,9 +391,9 @@ HttpSetFieldNameAndValue (
 CHAR8 *\r
 EFIAPI\r
 HttpGetFieldNameAndValue (\r
-  IN     CHAR8   *String,\r
-     OUT CHAR8   **FieldName,\r
-     OUT CHAR8   **FieldValue\r
+  IN     CHAR8  *String,\r
+  OUT CHAR8     **FieldName,\r
+  OUT CHAR8     **FieldValue\r
   );\r
 \r
 /**\r
@@ -436,10 +434,10 @@ HttpFreeHeaderFields (
 EFI_STATUS\r
 EFIAPI\r
 HttpGenRequestMessage (\r
-  IN     CONST EFI_HTTP_MESSAGE        *Message,\r
-  IN     CONST CHAR8                   *Url,\r
-     OUT CHAR8                         **RequestMsg,\r
-     OUT UINTN                         *RequestMsgSize\r
+  IN     CONST EFI_HTTP_MESSAGE  *Message,\r
+  IN     CONST CHAR8             *Url,\r
+  OUT CHAR8                      **RequestMsg,\r
+  OUT UINTN                      *RequestMsgSize\r
   );\r
 \r
 /**\r
@@ -454,7 +452,7 @@ HttpGenRequestMessage (
 EFI_HTTP_STATUS_CODE\r
 EFIAPI\r
 HttpMappingToStatusCode (\r
-  IN UINTN                  StatusCode\r
+  IN UINTN  StatusCode\r
   );\r
 \r
 /**\r
@@ -471,21 +469,20 @@ HttpMappingToStatusCode (
 BOOLEAN\r
 EFIAPI\r
 HttpIsValidHttpHeader (\r
-  IN  CHAR8            *DeleteList[],\r
-  IN  UINTN            DeleteCount,\r
-  IN  CHAR8            *FieldName\r
+  IN  CHAR8  *DeleteList[],\r
+  IN  UINTN  DeleteCount,\r
+  IN  CHAR8  *FieldName\r
   );\r
 \r
 //\r
 // A wrapper structure to hold the HTTP headers.\r
 //\r
 typedef struct {\r
-  UINTN                       MaxHeaderCount;\r
-  UINTN                       HeaderCount;\r
-  EFI_HTTP_HEADER             *Headers;\r
+  UINTN              MaxHeaderCount;\r
+  UINTN              HeaderCount;\r
+  EFI_HTTP_HEADER    *Headers;\r
 } HTTP_IO_HEADER;\r
 \r
-\r
 /**\r
   Create a HTTP_IO_HEADER to hold the HTTP header items.\r
 \r
@@ -496,7 +493,7 @@ typedef struct {
 **/\r
 HTTP_IO_HEADER *\r
 HttpIoCreateHeader (\r
-  UINTN                     MaxHeaderCount\r
+  UINTN  MaxHeaderCount\r
   );\r
 \r
 /**\r
@@ -507,7 +504,7 @@ HttpIoCreateHeader (
 **/\r
 VOID\r
 HttpIoFreeHeader (\r
-  IN  HTTP_IO_HEADER       *HttpIoHeader\r
+  IN  HTTP_IO_HEADER  *HttpIoHeader\r
   );\r
 \r
 /**\r
@@ -525,10 +522,9 @@ HttpIoFreeHeader (
 **/\r
 EFI_STATUS\r
 HttpIoSetHeader (\r
-  IN  HTTP_IO_HEADER       *HttpIoHeader,\r
-  IN  CHAR8                *FieldName,\r
-  IN  CHAR8                *FieldValue\r
+  IN  HTTP_IO_HEADER  *HttpIoHeader,\r
+  IN  CHAR8           *FieldName,\r
+  IN  CHAR8           *FieldValue\r
   );\r
 \r
 #endif\r
-\r
index d95413e87eb1f203342f7784f8d7fbcbd1f1e0d5..c8fd626ea2915ff7dfe45a8f0940e4323d6d4f40 100644 (file)
@@ -19,24 +19,24 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // type and code define for ICMP protocol error\r
 // from IP\r
 //\r
-#define ICMP_TYPE_UNREACH              3\r
-#define ICMP_TYPE_TIMXCEED             11\r
-#define ICMP_TYPE_PARAMPROB            12\r
-#define ICMP_TYPE_SOURCEQUENCH         4\r
-\r
-#define ICMP_CODE_UNREACH_NET          0\r
-#define ICMP_CODE_UNREACH_HOST         1\r
-#define ICMP_CODE_UNREACH_PROTOCOL     2\r
-#define ICMP_CODE_UNREACH_PORT         3\r
-#define ICMP_CODE_UNREACH_NEEDFRAG     4\r
-#define ICMP_CODE_UNREACH_SRCFAIL      5\r
-#define ICMP_CODE_UNREACH_NET_UNKNOWN  6\r
-#define ICMP_CODE_UNREACH_HOST_UNKNOWN 7\r
-#define ICMP_CODE_UNREACH_ISOLATED     8\r
-#define ICMP_CODE_UNREACH_NET_PROHIB   9\r
-#define ICMP_CODE_UNREACH_HOST_PROHIB  10\r
-#define ICMP_CODE_UNREACH_TOSNET       11\r
-#define ICMP_CODE_UNREACH_TOSHOST      12\r
+#define ICMP_TYPE_UNREACH       3\r
+#define ICMP_TYPE_TIMXCEED      11\r
+#define ICMP_TYPE_PARAMPROB     12\r
+#define ICMP_TYPE_SOURCEQUENCH  4\r
+\r
+#define ICMP_CODE_UNREACH_NET           0\r
+#define ICMP_CODE_UNREACH_HOST          1\r
+#define ICMP_CODE_UNREACH_PROTOCOL      2\r
+#define ICMP_CODE_UNREACH_PORT          3\r
+#define ICMP_CODE_UNREACH_NEEDFRAG      4\r
+#define ICMP_CODE_UNREACH_SRCFAIL       5\r
+#define ICMP_CODE_UNREACH_NET_UNKNOWN   6\r
+#define ICMP_CODE_UNREACH_HOST_UNKNOWN  7\r
+#define ICMP_CODE_UNREACH_ISOLATED      8\r
+#define ICMP_CODE_UNREACH_NET_PROHIB    9\r
+#define ICMP_CODE_UNREACH_HOST_PROHIB   10\r
+#define ICMP_CODE_UNREACH_TOSNET        11\r
+#define ICMP_CODE_UNREACH_TOSHOST       12\r
 \r
 /**\r
   Get the IP header length from the struct EFI_IP4_HEADER. HeaderLength is\r
@@ -47,7 +47,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
   @return The IP header length.\r
 **/\r
-#define EFI_IP4_HEADER_LEN(HdrPtr) ((HdrPtr)->HeaderLength << 2)\r
+#define EFI_IP4_HEADER_LEN(HdrPtr)  ((HdrPtr)->HeaderLength << 2)\r
 \r
 /**\r
   To types of ICMP error which consist of ICMP header, IP header and original\r
@@ -71,100 +71,98 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 #define NET_PROTO_HDR(Buf, Type)  ((Type *) ((Buf)->BlockOp[0].Head))\r
 \r
-\r
 extern EFI_IP4_CONFIG_DATA  mIp4IoDefaultIpConfigData;\r
 extern EFI_IP6_CONFIG_DATA  mIp6IoDefaultIpConfigData;\r
 \r
-\r
 ///\r
 /// This error will be delivered to the\r
 /// listening transportation layer protocol\r
 /// that consumes IpIO.\r
 ///\r
 \r
-#define  ICMP_ERR_UNREACH_NET           0\r
-#define  ICMP_ERR_UNREACH_HOST          1\r
-#define  ICMP_ERR_UNREACH_PROTOCOL      2\r
-#define  ICMP_ERR_UNREACH_PORT          3\r
-#define  ICMP_ERR_MSGSIZE               4\r
-#define  ICMP_ERR_UNREACH_SRCFAIL       5\r
-#define  ICMP_ERR_TIMXCEED_INTRANS      6\r
-#define  ICMP_ERR_TIMXCEED_REASS        7\r
-#define  ICMP_ERR_QUENCH                8\r
-#define  ICMP_ERR_PARAMPROB             9\r
-\r
-#define  ICMP6_ERR_UNREACH_NET          0\r
-#define  ICMP6_ERR_UNREACH_HOST         1\r
-#define  ICMP6_ERR_UNREACH_PROTOCOL     2\r
-#define  ICMP6_ERR_UNREACH_PORT         3\r
-#define  ICMP6_ERR_PACKAGE_TOOBIG       4\r
-#define  ICMP6_ERR_TIMXCEED_HOPLIMIT    5\r
-#define  ICMP6_ERR_TIMXCEED_REASS       6\r
-#define  ICMP6_ERR_PARAMPROB_HEADER     7\r
-#define  ICMP6_ERR_PARAMPROB_NEXHEADER  8\r
-#define  ICMP6_ERR_PARAMPROB_IPV6OPTION 9\r
+#define  ICMP_ERR_UNREACH_NET       0\r
+#define  ICMP_ERR_UNREACH_HOST      1\r
+#define  ICMP_ERR_UNREACH_PROTOCOL  2\r
+#define  ICMP_ERR_UNREACH_PORT      3\r
+#define  ICMP_ERR_MSGSIZE           4\r
+#define  ICMP_ERR_UNREACH_SRCFAIL   5\r
+#define  ICMP_ERR_TIMXCEED_INTRANS  6\r
+#define  ICMP_ERR_TIMXCEED_REASS    7\r
+#define  ICMP_ERR_QUENCH            8\r
+#define  ICMP_ERR_PARAMPROB         9\r
+\r
+#define  ICMP6_ERR_UNREACH_NET           0\r
+#define  ICMP6_ERR_UNREACH_HOST          1\r
+#define  ICMP6_ERR_UNREACH_PROTOCOL      2\r
+#define  ICMP6_ERR_UNREACH_PORT          3\r
+#define  ICMP6_ERR_PACKAGE_TOOBIG        4\r
+#define  ICMP6_ERR_TIMXCEED_HOPLIMIT     5\r
+#define  ICMP6_ERR_TIMXCEED_REASS        6\r
+#define  ICMP6_ERR_PARAMPROB_HEADER      7\r
+#define  ICMP6_ERR_PARAMPROB_NEXHEADER   8\r
+#define  ICMP6_ERR_PARAMPROB_IPV6OPTION  9\r
 \r
 ///\r
 /// The helper struct for IpIoGetIcmpErrStatus(). It is for internal use only.\r
 ///\r
 typedef struct {\r
-  BOOLEAN                   IsHard;\r
-  BOOLEAN                   Notify;\r
+  BOOLEAN    IsHard;\r
+  BOOLEAN    Notify;\r
 } ICMP_ERROR_INFO;\r
 \r
 typedef union {\r
-  EFI_IP4_COMPLETION_TOKEN  Ip4Token;\r
-  EFI_IP6_COMPLETION_TOKEN  Ip6Token;\r
+  EFI_IP4_COMPLETION_TOKEN    Ip4Token;\r
+  EFI_IP6_COMPLETION_TOKEN    Ip6Token;\r
 } IP_IO_IP_COMPLETION_TOKEN;\r
 \r
 typedef union {\r
-  EFI_IP4_TRANSMIT_DATA     Ip4TxData;\r
-  EFI_IP6_TRANSMIT_DATA     Ip6TxData;\r
+  EFI_IP4_TRANSMIT_DATA    Ip4TxData;\r
+  EFI_IP6_TRANSMIT_DATA    Ip6TxData;\r
 } IP_IO_IP_TX_DATA;\r
 \r
 typedef union {\r
-  EFI_IP4_RECEIVE_DATA      Ip4RxData;\r
-  EFI_IP6_RECEIVE_DATA      Ip6RxData;\r
+  EFI_IP4_RECEIVE_DATA    Ip4RxData;\r
+  EFI_IP6_RECEIVE_DATA    Ip6RxData;\r
 } IP_IO_IP_RX_DATA;\r
 \r
 typedef union {\r
-  EFI_IP4_OVERRIDE_DATA     Ip4OverrideData;\r
-  EFI_IP6_OVERRIDE_DATA     Ip6OverrideData;\r
+  EFI_IP4_OVERRIDE_DATA    Ip4OverrideData;\r
+  EFI_IP6_OVERRIDE_DATA    Ip6OverrideData;\r
 } IP_IO_OVERRIDE;\r
 \r
 typedef union {\r
-  EFI_IP4_CONFIG_DATA       Ip4CfgData;\r
-  EFI_IP6_CONFIG_DATA       Ip6CfgData;\r
+  EFI_IP4_CONFIG_DATA    Ip4CfgData;\r
+  EFI_IP6_CONFIG_DATA    Ip6CfgData;\r
 } IP_IO_IP_CONFIG_DATA;\r
 \r
 typedef union {\r
-  EFI_IP4_HEADER            *Ip4Hdr;\r
-  EFI_IP6_HEADER            *Ip6Hdr;\r
+  EFI_IP4_HEADER    *Ip4Hdr;\r
+  EFI_IP6_HEADER    *Ip6Hdr;\r
 } IP_IO_IP_HEADER;\r
 \r
 typedef union {\r
-  IP4_ADDR                  SubnetMask;\r
-  UINT8                     PrefixLength;\r
+  IP4_ADDR    SubnetMask;\r
+  UINT8       PrefixLength;\r
 } IP_IO_IP_MASK;\r
 \r
 typedef union {\r
-  EFI_IP4_PROTOCOL  *Ip4;\r
-  EFI_IP6_PROTOCOL  *Ip6;\r
+  EFI_IP4_PROTOCOL    *Ip4;\r
+  EFI_IP6_PROTOCOL    *Ip6;\r
 } IP_IO_IP_PROTOCOL;\r
 \r
 ///\r
 /// The IP session for an IP receive packet.\r
 ///\r
 typedef struct _EFI_NET_SESSION_DATA {\r
-  EFI_IP_ADDRESS        Source;     ///< Source IP of the received packet.\r
-  EFI_IP_ADDRESS        Dest;       ///< Destination IP of the received packet.\r
-  IP_IO_IP_HEADER       IpHdr;      ///< IP header of the received packet.\r
-  UINT32                IpHdrLen;   ///< IP header length of the received packet.\r
+  EFI_IP_ADDRESS     Source;        ///< Source IP of the received packet.\r
+  EFI_IP_ADDRESS     Dest;          ///< Destination IP of the received packet.\r
+  IP_IO_IP_HEADER    IpHdr;         ///< IP header of the received packet.\r
+  UINT32             IpHdrLen;      ///< IP header length of the received packet.\r
                                     ///< For IPv6, it includes the IP6 header\r
                                     ///< length and extension header length. For\r
                                     ///< IPv4, it includes the IP4 header length\r
                                     ///< and options length.\r
-  UINT8                 IpVersion;  ///< The IP version of the received packet.\r
+  UINT8              IpVersion;     ///< The IP version of the received packet.\r
 } EFI_NET_SESSION_DATA;\r
 \r
 /**\r
@@ -180,7 +178,7 @@ typedef struct _EFI_NET_SESSION_DATA {
 **/\r
 typedef\r
 VOID\r
-(EFIAPI *PKT_RCVD_NOTIFY) (\r
+(EFIAPI *PKT_RCVD_NOTIFY)(\r
   IN EFI_STATUS           Status,\r
   IN UINT8                IcmpErr,\r
   IN EFI_NET_SESSION_DATA *NetSession,\r
@@ -201,7 +199,7 @@ VOID
 **/\r
 typedef\r
 VOID\r
-(EFIAPI *PKT_SENT_NOTIFY) (\r
+(EFIAPI *PKT_SENT_NOTIFY)(\r
   IN EFI_STATUS        Status,\r
   IN VOID              *Context,\r
   IN IP_IO_IP_PROTOCOL Sender,\r
@@ -216,47 +214,47 @@ typedef struct _IP_IO {
   ///\r
   /// The node used to link this IpIo to the active IpIo list.\r
   ///\r
-  LIST_ENTRY                    Entry;\r
+  LIST_ENTRY                   Entry;\r
 \r
   ///\r
   /// The list used to maintain the IP instance for different sending purpose.\r
   ///\r
-  LIST_ENTRY                    IpList;\r
+  LIST_ENTRY                   IpList;\r
 \r
-  EFI_HANDLE                    Controller;\r
-  EFI_HANDLE                    Image;\r
-  EFI_HANDLE                    ChildHandle;\r
+  EFI_HANDLE                   Controller;\r
+  EFI_HANDLE                   Image;\r
+  EFI_HANDLE                   ChildHandle;\r
   //\r
   // The IP instance consumed by this IP_IO\r
   //\r
-  IP_IO_IP_PROTOCOL             Ip;\r
-  BOOLEAN                       IsConfigured;\r
+  IP_IO_IP_PROTOCOL            Ip;\r
+  BOOLEAN                      IsConfigured;\r
 \r
   ///\r
   /// Some ip configuration data can be changed.\r
   ///\r
-  UINT8                         Protocol;\r
+  UINT8                        Protocol;\r
 \r
   ///\r
   /// Token and event used to get data from IP.\r
   ///\r
-  IP_IO_IP_COMPLETION_TOKEN     RcvToken;\r
+  IP_IO_IP_COMPLETION_TOKEN    RcvToken;\r
 \r
   ///\r
   /// List entry used to link the token passed to IP_IO.\r
   ///\r
-  LIST_ENTRY                    PendingSndList;\r
+  LIST_ENTRY                   PendingSndList;\r
 \r
   //\r
   // User interface used to get notify from IP_IO\r
   //\r
-  VOID                          *RcvdContext;    ///< See IP_IO_OPEN_DATA::RcvdContext.\r
-  VOID                          *SndContext;     ///< See IP_IO_OPEN_DATA::SndContext.\r
-  PKT_RCVD_NOTIFY               PktRcvdNotify;   ///< See IP_IO_OPEN_DATA::PktRcvdNotify.\r
-  PKT_SENT_NOTIFY               PktSentNotify;   ///< See IP_IO_OPEN_DATA::PktSentNotify.\r
-  UINT8                         IpVersion;\r
-  IP4_ADDR                      StationIp;\r
-  IP4_ADDR                      SubnetMask;\r
+  VOID                         *RcvdContext;     ///< See IP_IO_OPEN_DATA::RcvdContext.\r
+  VOID                         *SndContext;      ///< See IP_IO_OPEN_DATA::SndContext.\r
+  PKT_RCVD_NOTIFY              PktRcvdNotify;    ///< See IP_IO_OPEN_DATA::PktRcvdNotify.\r
+  PKT_SENT_NOTIFY              PktSentNotify;    ///< See IP_IO_OPEN_DATA::PktSentNotify.\r
+  UINT8                        IpVersion;\r
+  IP4_ADDR                     StationIp;\r
+  IP4_ADDR                     SubnetMask;\r
 } IP_IO;\r
 \r
 ///\r
@@ -264,11 +262,11 @@ typedef struct _IP_IO {
 /// It is used by IpIoOpen().\r
 ///\r
 typedef struct _IP_IO_OPEN_DATA {\r
-  IP_IO_IP_CONFIG_DATA IpConfigData;    ///< Configuration of the IP instance.\r
-  VOID                 *RcvdContext;    ///< Context data used by receive callback.\r
-  VOID                 *SndContext;     ///< Context data used by send callback.\r
-  PKT_RCVD_NOTIFY      PktRcvdNotify;   ///< Receive callback.\r
-  PKT_SENT_NOTIFY      PktSentNotify;   ///< Send callback.\r
+  IP_IO_IP_CONFIG_DATA    IpConfigData;  ///< Configuration of the IP instance.\r
+  VOID                    *RcvdContext;  ///< Context data used by receive callback.\r
+  VOID                    *SndContext;   ///< Context data used by send callback.\r
+  PKT_RCVD_NOTIFY         PktRcvdNotify; ///< Receive callback.\r
+  PKT_SENT_NOTIFY         PktSentNotify; ///< Send callback.\r
 } IP_IO_OPEN_DATA;\r
 \r
 ///\r
@@ -278,13 +276,13 @@ typedef struct _IP_IO_OPEN_DATA {
 /// IP_IO via IpIoSend().\r
 ///\r
 typedef struct _IP_IO_SEND_ENTRY {\r
-  LIST_ENTRY                Entry;\r
-  IP_IO                     *IpIo;\r
-  VOID                      *Context;\r
-  VOID                      *NotifyData;\r
-  IP_IO_IP_PROTOCOL         Ip;\r
-  NET_BUF                   *Pkt;\r
-  IP_IO_IP_COMPLETION_TOKEN SndToken;\r
+  LIST_ENTRY                   Entry;\r
+  IP_IO                        *IpIo;\r
+  VOID                         *Context;\r
+  VOID                         *NotifyData;\r
+  IP_IO_IP_PROTOCOL            Ip;\r
+  NET_BUF                      *Pkt;\r
+  IP_IO_IP_COMPLETION_TOKEN    SndToken;\r
 } IP_IO_SEND_ENTRY;\r
 \r
 ///\r
@@ -292,14 +290,14 @@ typedef struct _IP_IO_SEND_ENTRY {
 /// in IP_IO.\r
 ///\r
 typedef struct _IP_IO_IP_INFO {\r
-  EFI_IP_ADDRESS            Addr;\r
-  IP_IO_IP_MASK             PreMask;\r
-  LIST_ENTRY                Entry;\r
-  EFI_HANDLE                ChildHandle;\r
-  IP_IO_IP_PROTOCOL         Ip;\r
-  IP_IO_IP_COMPLETION_TOKEN DummyRcvToken;\r
-  INTN                      RefCnt;\r
-  UINT8                     IpVersion;\r
+  EFI_IP_ADDRESS               Addr;\r
+  IP_IO_IP_MASK                PreMask;\r
+  LIST_ENTRY                   Entry;\r
+  EFI_HANDLE                   ChildHandle;\r
+  IP_IO_IP_PROTOCOL            Ip;\r
+  IP_IO_IP_COMPLETION_TOKEN    DummyRcvToken;\r
+  INTN                         RefCnt;\r
+  UINT8                        IpVersion;\r
 } IP_IO_IP_INFO;\r
 \r
 /**\r
@@ -323,9 +321,9 @@ typedef struct _IP_IO_IP_INFO {
 IP_IO *\r
 EFIAPI\r
 IpIoCreate (\r
-  IN EFI_HANDLE Image,\r
-  IN EFI_HANDLE Controller,\r
-  IN UINT8      IpVersion\r
+  IN EFI_HANDLE  Image,\r
+  IN EFI_HANDLE  Controller,\r
+  IN UINT8       IpVersion\r
   );\r
 \r
 /**\r
@@ -344,7 +342,7 @@ IpIoCreate (
 EFI_STATUS\r
 EFIAPI\r
 IpIoDestroy (\r
-  IN OUT IP_IO *IpIo\r
+  IN OUT IP_IO  *IpIo\r
   );\r
 \r
 /**\r
@@ -365,7 +363,7 @@ IpIoDestroy (
 EFI_STATUS\r
 EFIAPI\r
 IpIoStop (\r
-  IN OUT IP_IO *IpIo\r
+  IN OUT IP_IO  *IpIo\r
   );\r
 \r
 /**\r
@@ -394,8 +392,8 @@ IpIoStop (
 EFI_STATUS\r
 EFIAPI\r
 IpIoOpen (\r
-  IN OUT IP_IO           *IpIo,\r
-  IN     IP_IO_OPEN_DATA *OpenData\r
+  IN OUT IP_IO            *IpIo,\r
+  IN     IP_IO_OPEN_DATA  *OpenData\r
   );\r
 \r
 /**\r
@@ -427,13 +425,13 @@ IpIoOpen (
 EFI_STATUS\r
 EFIAPI\r
 IpIoSend (\r
-  IN OUT IP_IO          *IpIo,\r
-  IN OUT NET_BUF        *Pkt,\r
-  IN     IP_IO_IP_INFO  *Sender        OPTIONAL,\r
-  IN     VOID           *Context       OPTIONAL,\r
-  IN     VOID           *NotifyData    OPTIONAL,\r
-  IN     EFI_IP_ADDRESS *Dest          OPTIONAL,\r
-  IN     IP_IO_OVERRIDE *OverrideData  OPTIONAL\r
+  IN OUT IP_IO           *IpIo,\r
+  IN OUT NET_BUF         *Pkt,\r
+  IN     IP_IO_IP_INFO   *Sender        OPTIONAL,\r
+  IN     VOID            *Context       OPTIONAL,\r
+  IN     VOID            *NotifyData    OPTIONAL,\r
+  IN     EFI_IP_ADDRESS  *Dest          OPTIONAL,\r
+  IN     IP_IO_OVERRIDE  *OverrideData  OPTIONAL\r
   );\r
 \r
 /**\r
@@ -496,8 +494,8 @@ IpIoAddIp (
 EFI_STATUS\r
 EFIAPI\r
 IpIoConfigIp (\r
-  IN OUT IP_IO_IP_INFO        *IpInfo,\r
-  IN OUT VOID                 *IpConfigData OPTIONAL\r
+  IN OUT IP_IO_IP_INFO  *IpInfo,\r
+  IN OUT VOID           *IpConfigData OPTIONAL\r
   );\r
 \r
 /**\r
@@ -517,8 +515,8 @@ IpIoConfigIp (
 VOID\r
 EFIAPI\r
 IpIoRemoveIp (\r
-  IN IP_IO            *IpIo,\r
-  IN IP_IO_IP_INFO    *IpInfo\r
+  IN IP_IO          *IpIo,\r
+  IN IP_IO_IP_INFO  *IpInfo\r
   );\r
 \r
 /**\r
@@ -564,10 +562,10 @@ IpIoFindSender (
 EFI_STATUS\r
 EFIAPI\r
 IpIoGetIcmpErrStatus (\r
-  IN  UINT8       IcmpError,\r
-  IN  UINT8       IpVersion,\r
-  OUT BOOLEAN     *IsHard  OPTIONAL,\r
-  OUT BOOLEAN     *Notify  OPTIONAL\r
+  IN  UINT8    IcmpError,\r
+  IN  UINT8    IpVersion,\r
+  OUT BOOLEAN  *IsHard  OPTIONAL,\r
+  OUT BOOLEAN  *Notify  OPTIONAL\r
   );\r
 \r
 /**\r
@@ -604,4 +602,3 @@ IpIoRefreshNeighbor (
   );\r
 \r
 #endif\r
-\r
index a6d7a3b5380b2f59dfce9a3609de54cf7974f6e1..8c0e62b3889c110d295f9d1e0c7444d9a37c38e3 100644 (file)
@@ -15,16 +15,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 \r
-typedef UINT32          IP4_ADDR;\r
-typedef UINT32          TCP_SEQNO;\r
-typedef UINT16          TCP_PORTNO;\r
+typedef UINT32  IP4_ADDR;\r
+typedef UINT32  TCP_SEQNO;\r
+typedef UINT16  TCP_PORTNO;\r
 \r
+#define  NET_ETHER_ADDR_LEN   6\r
+#define  NET_IFTYPE_ETHERNET  0x01\r
 \r
-#define  NET_ETHER_ADDR_LEN    6\r
-#define  NET_IFTYPE_ETHERNET   0x01\r
-\r
-#define  NET_VLAN_TAG_LEN      4\r
-#define  ETHER_TYPE_VLAN       0x8100\r
+#define  NET_VLAN_TAG_LEN  4\r
+#define  ETHER_TYPE_VLAN   0x8100\r
 \r
 #define  EFI_IP_PROTO_UDP      0x11\r
 #define  EFI_IP_PROTO_TCP      0x06\r
@@ -37,73 +36,72 @@ typedef UINT16          TCP_PORTNO;
 //\r
 // The address classification\r
 //\r
-#define  IP4_ADDR_CLASSA       1     // Deprecated\r
-#define  IP4_ADDR_CLASSB       2     // Deprecated\r
-#define  IP4_ADDR_CLASSC       3     // Deprecated\r
-#define  IP4_ADDR_CLASSD       4\r
-#define  IP4_ADDR_CLASSE       5\r
+#define  IP4_ADDR_CLASSA  1          // Deprecated\r
+#define  IP4_ADDR_CLASSB  2          // Deprecated\r
+#define  IP4_ADDR_CLASSC  3          // Deprecated\r
+#define  IP4_ADDR_CLASSD  4\r
+#define  IP4_ADDR_CLASSE  5\r
 \r
-#define  IP4_MASK_NUM          33\r
-#define  IP6_PREFIX_NUM        129\r
+#define  IP4_MASK_NUM    33\r
+#define  IP6_PREFIX_NUM  129\r
 \r
-#define  IP4_MASK_MAX          32\r
-#define  IP6_PREFIX_MAX        128\r
+#define  IP4_MASK_MAX    32\r
+#define  IP6_PREFIX_MAX  128\r
 \r
-#define  IP6_HOP_BY_HOP        0\r
-#define  IP6_DESTINATION       60\r
-#define  IP6_ROUTING           43\r
-#define  IP6_FRAGMENT          44\r
-#define  IP6_AH                51\r
-#define  IP6_ESP               50\r
-#define  IP6_NO_NEXT_HEADER    59\r
+#define  IP6_HOP_BY_HOP      0\r
+#define  IP6_DESTINATION     60\r
+#define  IP6_ROUTING         43\r
+#define  IP6_FRAGMENT        44\r
+#define  IP6_AH              51\r
+#define  IP6_ESP             50\r
+#define  IP6_NO_NEXT_HEADER  59\r
 \r
-#define  IP_VERSION_4          4\r
-#define  IP_VERSION_6          6\r
+#define  IP_VERSION_4  4\r
+#define  IP_VERSION_6  6\r
 \r
-#define  IP6_PREFIX_LENGTH     64\r
+#define  IP6_PREFIX_LENGTH  64\r
 \r
 //\r
 // DNS QTYPE values\r
 //\r
-#define  DNS_TYPE_A            1\r
-#define  DNS_TYPE_NS           2\r
-#define  DNS_TYPE_CNAME        5\r
-#define  DNS_TYPE_SOA          6\r
-#define  DNS_TYPE_WKS          11\r
-#define  DNS_TYPE_PTR          12\r
-#define  DNS_TYPE_HINFO        13\r
-#define  DNS_TYPE_MINFO        14\r
-#define  DNS_TYPE_MX           15\r
-#define  DNS_TYPE_TXT          16\r
-#define  DNS_TYPE_AAAA         28\r
-#define  DNS_TYPE_SRV_RR       33\r
-#define  DNS_TYPE_AXFR         252\r
-#define  DNS_TYPE_MAILB        253\r
-#define  DNS_TYPE_ANY          255\r
+#define  DNS_TYPE_A       1\r
+#define  DNS_TYPE_NS      2\r
+#define  DNS_TYPE_CNAME   5\r
+#define  DNS_TYPE_SOA     6\r
+#define  DNS_TYPE_WKS     11\r
+#define  DNS_TYPE_PTR     12\r
+#define  DNS_TYPE_HINFO   13\r
+#define  DNS_TYPE_MINFO   14\r
+#define  DNS_TYPE_MX      15\r
+#define  DNS_TYPE_TXT     16\r
+#define  DNS_TYPE_AAAA    28\r
+#define  DNS_TYPE_SRV_RR  33\r
+#define  DNS_TYPE_AXFR    252\r
+#define  DNS_TYPE_MAILB   253\r
+#define  DNS_TYPE_ANY     255\r
 \r
 //\r
 // DNS QCLASS values\r
 //\r
-#define  DNS_CLASS_INET        1\r
-#define  DNS_CLASS_CH          3\r
-#define  DNS_CLASS_HS          4\r
-#define  DNS_CLASS_ANY         255\r
+#define  DNS_CLASS_INET  1\r
+#define  DNS_CLASS_CH    3\r
+#define  DNS_CLASS_HS    4\r
+#define  DNS_CLASS_ANY   255\r
 \r
 //\r
 // Number of 100ns units time Interval for network media state detect\r
 //\r
 #define MEDIA_STATE_DETECT_TIME_INTERVAL  1000000U\r
 \r
-\r
 #pragma pack(1)\r
 \r
 //\r
 // Ethernet head definition\r
 //\r
 typedef struct {\r
-  UINT8                 DstMac [NET_ETHER_ADDR_LEN];\r
-  UINT8                 SrcMac [NET_ETHER_ADDR_LEN];\r
-  UINT16                EtherType;\r
+  UINT8     DstMac[NET_ETHER_ADDR_LEN];\r
+  UINT8     SrcMac[NET_ETHER_ADDR_LEN];\r
+  UINT16    EtherType;\r
 } ETHER_HEAD;\r
 \r
 //\r
@@ -111,11 +109,11 @@ typedef struct {
 //\r
 typedef union {\r
   struct {\r
-    UINT16              Vid      : 12;  // Unique VLAN identifier (0 to 4094)\r
-    UINT16              Cfi      : 1;   // Canonical Format Indicator\r
-    UINT16              Priority : 3;   // 802.1Q priority level (0 to 7)\r
+    UINT16    Vid      : 12;            // Unique VLAN identifier (0 to 4094)\r
+    UINT16    Cfi      : 1;             // Canonical Format Indicator\r
+    UINT16    Priority : 3;             // 802.1Q priority level (0 to 7)\r
   } Bits;\r
-  UINT16                Uint16;\r
+  UINT16    Uint16;\r
 } VLAN_TCI;\r
 \r
 #define VLAN_TCI_CFI_CANONICAL_MAC      0\r
@@ -128,83 +126,82 @@ typedef union {
 // directly. This is why there is an internal representation.\r
 //\r
 typedef struct {\r
-  UINT8                 HeadLen : 4;\r
-  UINT8                 Ver     : 4;\r
-  UINT8                 Tos;\r
-  UINT16                TotalLen;\r
-  UINT16                Id;\r
-  UINT16                Fragment;\r
-  UINT8                 Ttl;\r
-  UINT8                 Protocol;\r
-  UINT16                Checksum;\r
-  IP4_ADDR              Src;\r
-  IP4_ADDR              Dst;\r
+  UINT8       HeadLen : 4;\r
+  UINT8       Ver     : 4;\r
+  UINT8       Tos;\r
+  UINT16      TotalLen;\r
+  UINT16      Id;\r
+  UINT16      Fragment;\r
+  UINT8       Ttl;\r
+  UINT8       Protocol;\r
+  UINT16      Checksum;\r
+  IP4_ADDR    Src;\r
+  IP4_ADDR    Dst;\r
 } IP4_HEAD;\r
 \r
-\r
 //\r
 // ICMP head definition. Each ICMP message is categorized as either an error\r
 // message or query message. Two message types have their own head format.\r
 //\r
 typedef struct {\r
-  UINT8                 Type;\r
-  UINT8                 Code;\r
-  UINT16                Checksum;\r
+  UINT8     Type;\r
+  UINT8     Code;\r
+  UINT16    Checksum;\r
 } IP4_ICMP_HEAD;\r
 \r
 typedef struct {\r
-  IP4_ICMP_HEAD         Head;\r
-  UINT32                Fourth; // 4th filed of the head, it depends on Type.\r
-  IP4_HEAD              IpHead;\r
+  IP4_ICMP_HEAD    Head;\r
+  UINT32           Fourth;      // 4th filed of the head, it depends on Type.\r
+  IP4_HEAD         IpHead;\r
 } IP4_ICMP_ERROR_HEAD;\r
 \r
 typedef struct {\r
-  IP4_ICMP_HEAD         Head;\r
-  UINT16                Id;\r
-  UINT16                Seq;\r
+  IP4_ICMP_HEAD    Head;\r
+  UINT16           Id;\r
+  UINT16           Seq;\r
 } IP4_ICMP_QUERY_HEAD;\r
 \r
 typedef struct {\r
-  UINT8                 Type;\r
-  UINT8                 Code;\r
-  UINT16                Checksum;\r
+  UINT8     Type;\r
+  UINT8     Code;\r
+  UINT16    Checksum;\r
 } IP6_ICMP_HEAD;\r
 \r
 typedef struct {\r
-  IP6_ICMP_HEAD         Head;\r
-  UINT32                Fourth;\r
-  EFI_IP6_HEADER        IpHead;\r
+  IP6_ICMP_HEAD     Head;\r
+  UINT32            Fourth;\r
+  EFI_IP6_HEADER    IpHead;\r
 } IP6_ICMP_ERROR_HEAD;\r
 \r
 typedef struct {\r
-  IP6_ICMP_HEAD         Head;\r
-  UINT32                Fourth;\r
+  IP6_ICMP_HEAD    Head;\r
+  UINT32           Fourth;\r
 } IP6_ICMP_INFORMATION_HEAD;\r
 \r
 //\r
 // UDP header definition\r
 //\r
 typedef struct {\r
-  UINT16                SrcPort;\r
-  UINT16                DstPort;\r
-  UINT16                Length;\r
-  UINT16                Checksum;\r
+  UINT16    SrcPort;\r
+  UINT16    DstPort;\r
+  UINT16    Length;\r
+  UINT16    Checksum;\r
 } EFI_UDP_HEADER;\r
 \r
 //\r
 // TCP header definition\r
 //\r
 typedef struct {\r
-  TCP_PORTNO            SrcPort;\r
-  TCP_PORTNO            DstPort;\r
-  TCP_SEQNO             Seq;\r
-  TCP_SEQNO             Ack;\r
-  UINT8                 Res     : 4;\r
-  UINT8                 HeadLen : 4;\r
-  UINT8                 Flag;\r
-  UINT16                Wnd;\r
-  UINT16                Checksum;\r
-  UINT16                Urg;\r
+  TCP_PORTNO    SrcPort;\r
+  TCP_PORTNO    DstPort;\r
+  TCP_SEQNO     Seq;\r
+  TCP_SEQNO     Ack;\r
+  UINT8         Res     : 4;\r
+  UINT8         HeadLen : 4;\r
+  UINT8         Flag;\r
+  UINT16        Wnd;\r
+  UINT16        Checksum;\r
+  UINT16        Urg;\r
 } TCP_HEAD;\r
 \r
 #pragma pack()\r
@@ -221,11 +218,11 @@ typedef struct {
 \r
 #define NTOHS(x)  SwapBytes16 (x)\r
 \r
-#define HTONS(x)   NTOHS(x)\r
-#define NTOHLL(x)  SwapBytes64 (x)\r
-#define HTONLL(x)  NTOHLL(x)\r
-#define NTOHLLL(x) Ip6Swap128 (x)\r
-#define HTONLLL(x) NTOHLLL(x)\r
+#define HTONS(x)    NTOHS(x)\r
+#define NTOHLL(x)   SwapBytes64 (x)\r
+#define HTONLL(x)   NTOHLL(x)\r
+#define NTOHLLL(x)  Ip6Swap128 (x)\r
+#define HTONLLL(x)  NTOHLLL(x)\r
 \r
 //\r
 // Test the IP's attribute, All the IPs are in host byte order.\r
@@ -236,7 +233,7 @@ typedef struct {
 #define IP4_NET_EQUAL(Ip1, Ip2, NetMask)  (((Ip1) & (NetMask)) == ((Ip2) & (NetMask)))\r
 #define IP4_IS_VALID_NETMASK(Ip)          (NetGetMaskLength (Ip) != (IP4_MASK_MAX + 1))\r
 \r
-#define IP6_IS_MULTICAST(Ip6)             (((Ip6)->Addr[0]) == 0xFF)\r
+#define IP6_IS_MULTICAST(Ip6)  (((Ip6)->Addr[0]) == 0xFF)\r
 \r
 //\r
 // Convert the EFI_IP4_ADDRESS to plain UINT32 IP4 address.\r
@@ -247,17 +244,17 @@ typedef struct {
 \r
 #define EFI_IP6_EQUAL(Ip1, Ip2)  (CompareMem ((Ip1), (Ip2), sizeof (EFI_IPv6_ADDRESS)) == 0)\r
 \r
-#define IP4_COPY_ADDRESS(Dest, Src) (CopyMem ((Dest), (Src), sizeof (EFI_IPv4_ADDRESS)))\r
-#define IP6_COPY_ADDRESS(Dest, Src) (CopyMem ((Dest), (Src), sizeof (EFI_IPv6_ADDRESS)))\r
-#define IP6_COPY_LINK_ADDRESS(Mac1, Mac2) (CopyMem ((Mac1), (Mac2), sizeof (EFI_MAC_ADDRESS)))\r
+#define IP4_COPY_ADDRESS(Dest, Src)        (CopyMem ((Dest), (Src), sizeof (EFI_IPv4_ADDRESS)))\r
+#define IP6_COPY_ADDRESS(Dest, Src)        (CopyMem ((Dest), (Src), sizeof (EFI_IPv6_ADDRESS)))\r
+#define IP6_COPY_LINK_ADDRESS(Mac1, Mac2)  (CopyMem ((Mac1), (Mac2), sizeof (EFI_MAC_ADDRESS)))\r
 \r
 //\r
 // The debug level definition. This value is also used as the\r
 // syslog's severity level. Don't change it.\r
 //\r
-#define NETDEBUG_LEVEL_TRACE   5\r
-#define NETDEBUG_LEVEL_WARNING 4\r
-#define NETDEBUG_LEVEL_ERROR   3\r
+#define NETDEBUG_LEVEL_TRACE    5\r
+#define NETDEBUG_LEVEL_WARNING  4\r
+#define NETDEBUG_LEVEL_ERROR    3\r
 \r
 //\r
 // Network debug message is sent out as syslog packet.\r
@@ -326,7 +323,7 @@ typedef struct {
 CHAR8 *\r
 EFIAPI\r
 NetDebugASPrint (\r
-  IN CHAR8                  *Format,\r
+  IN CHAR8  *Format,\r
   ...\r
   );\r
 \r
@@ -350,14 +347,13 @@ NetDebugASPrint (
 EFI_STATUS\r
 EFIAPI\r
 NetDebugOutput (\r
-  IN UINT32                    Level,\r
-  IN UINT8                     *Module,\r
-  IN UINT8                     *File,\r
-  IN UINT32                    Line,\r
-  IN UINT8                     *Message\r
+  IN UINT32  Level,\r
+  IN UINT8   *Module,\r
+  IN UINT8   *File,\r
+  IN UINT32  Line,\r
+  IN UINT8   *Message\r
   );\r
 \r
-\r
 /**\r
   Return the length of the mask.\r
 \r
@@ -373,7 +369,7 @@ NetDebugOutput (
 INTN\r
 EFIAPI\r
 NetGetMaskLength (\r
-  IN IP4_ADDR               NetMask\r
+  IN IP4_ADDR  NetMask\r
   );\r
 \r
 /**\r
@@ -405,7 +401,7 @@ NetGetMaskLength (
 INTN\r
 EFIAPI\r
 NetGetIpClass (\r
-  IN IP4_ADDR               Addr\r
+  IN IP4_ADDR  Addr\r
   );\r
 \r
 /**\r
@@ -428,8 +424,8 @@ NetGetIpClass (
 BOOLEAN\r
 EFIAPI\r
 NetIp4IsUnicast (\r
-  IN IP4_ADDR               Ip,\r
-  IN IP4_ADDR               NetMask\r
+  IN IP4_ADDR  Ip,\r
+  IN IP4_ADDR  NetMask\r
   );\r
 \r
 /**\r
@@ -451,10 +447,9 @@ NetIp4IsUnicast (
 BOOLEAN\r
 EFIAPI\r
 NetIp6IsValidUnicast (\r
-  IN EFI_IPv6_ADDRESS       *Ip6\r
+  IN EFI_IPv6_ADDRESS  *Ip6\r
   );\r
 \r
-\r
 /**\r
   Check whether the incoming Ipv6 address is the unspecified address or not.\r
 \r
@@ -469,7 +464,7 @@ NetIp6IsValidUnicast (
 BOOLEAN\r
 EFIAPI\r
 NetIp6IsUnspecifiedAddr (\r
-  IN EFI_IPv6_ADDRESS       *Ip6\r
+  IN EFI_IPv6_ADDRESS  *Ip6\r
   );\r
 \r
 /**\r
@@ -486,7 +481,7 @@ NetIp6IsUnspecifiedAddr (
 BOOLEAN\r
 EFIAPI\r
 NetIp6IsLinkLocalAddr (\r
-  IN EFI_IPv6_ADDRESS *Ip6\r
+  IN EFI_IPv6_ADDRESS  *Ip6\r
   );\r
 \r
 /**\r
@@ -506,9 +501,9 @@ NetIp6IsLinkLocalAddr (
 BOOLEAN\r
 EFIAPI\r
 NetIp6IsNetEqual (\r
-  EFI_IPv6_ADDRESS *Ip1,\r
-  EFI_IPv6_ADDRESS *Ip2,\r
-  UINT8            PrefixLength\r
+  EFI_IPv6_ADDRESS  *Ip1,\r
+  EFI_IPv6_ADDRESS  *Ip2,\r
+  UINT8             PrefixLength\r
   );\r
 \r
 /**\r
@@ -528,11 +523,10 @@ NetIp6IsNetEqual (
 EFI_IPv6_ADDRESS *\r
 EFIAPI\r
 Ip6Swap128 (\r
-  EFI_IPv6_ADDRESS *Ip6\r
+  EFI_IPv6_ADDRESS  *Ip6\r
   );\r
 \r
-extern IP4_ADDR gIp4AllMasks[IP4_MASK_NUM];\r
-\r
+extern IP4_ADDR  gIp4AllMasks[IP4_MASK_NUM];\r
 \r
 extern EFI_IPv4_ADDRESS  mZeroIp4Addr;\r
 \r
@@ -542,10 +536,10 @@ extern EFI_IPv4_ADDRESS  mZeroIp4Addr;
 #define NET_IS_LOWER_CASE_CHAR(Ch)  (('a' <= (Ch)) && ((Ch) <= 'z'))\r
 #define NET_IS_UPPER_CASE_CHAR(Ch)  (('A' <= (Ch)) && ((Ch) <= 'Z'))\r
 \r
-#define TICKS_PER_MS            10000U\r
-#define TICKS_PER_SECOND        10000000U\r
+#define TICKS_PER_MS      10000U\r
+#define TICKS_PER_SECOND  10000000U\r
 \r
-#define NET_RANDOM(Seed)        ((UINT32) ((UINT32) (Seed) * 1103515245UL + 12345) % 4294967295UL)\r
+#define NET_RANDOM(Seed)  ((UINT32) ((UINT32) (Seed) * 1103515245UL + 12345) % 4294967295UL)\r
 \r
 /**\r
   Extract a UINT32 from a byte stream.\r
@@ -563,7 +557,7 @@ extern EFI_IPv4_ADDRESS  mZeroIp4Addr;
 UINT32\r
 EFIAPI\r
 NetGetUint32 (\r
-  IN UINT8                  *Buf\r
+  IN UINT8  *Buf\r
   );\r
 \r
 /**\r
@@ -581,8 +575,8 @@ NetGetUint32 (
 VOID\r
 EFIAPI\r
 NetPutUint32 (\r
-  IN OUT UINT8                 *Buf,\r
-  IN     UINT32                Data\r
+  IN OUT UINT8   *Buf,\r
+  IN     UINT32  Data\r
   );\r
 \r
 /**\r
@@ -601,7 +595,6 @@ NetRandomInitSeed (
   VOID\r
   );\r
 \r
-\r
 #define NET_LIST_USER_STRUCT(Entry, Type, Field)        \\r
           BASE_CR(Entry, Type, Field)\r
 \r
@@ -635,7 +628,6 @@ NetRandomInitSeed (
 #define NET_LIST_TAIL(ListHead, Type, Field)  \\r
           NET_LIST_USER_STRUCT((ListHead)->BackLink, Type, Field)\r
 \r
-\r
 /**\r
   Remove the first node entry on the list, and return the removed node entry.\r
 \r
@@ -657,7 +649,7 @@ NetRandomInitSeed (
 LIST_ENTRY *\r
 EFIAPI\r
 NetListRemoveHead (\r
-  IN OUT LIST_ENTRY            *Head\r
+  IN OUT LIST_ENTRY  *Head\r
   );\r
 \r
 /**\r
@@ -681,7 +673,7 @@ NetListRemoveHead (
 LIST_ENTRY *\r
 EFIAPI\r
 NetListRemoveTail (\r
-  IN OUT LIST_ENTRY            *Head\r
+  IN OUT LIST_ENTRY  *Head\r
   );\r
 \r
 /**\r
@@ -699,8 +691,8 @@ NetListRemoveTail (
 VOID\r
 EFIAPI\r
 NetListInsertAfter (\r
-  IN OUT LIST_ENTRY         *PrevEntry,\r
-  IN OUT LIST_ENTRY         *NewEntry\r
+  IN OUT LIST_ENTRY  *PrevEntry,\r
+  IN OUT LIST_ENTRY  *NewEntry\r
   );\r
 \r
 /**\r
@@ -718,8 +710,8 @@ NetListInsertAfter (
 VOID\r
 EFIAPI\r
 NetListInsertBefore (\r
-  IN OUT LIST_ENTRY     *PostEntry,\r
-  IN OUT LIST_ENTRY     *NewEntry\r
+  IN OUT LIST_ENTRY  *PostEntry,\r
+  IN OUT LIST_ENTRY  *NewEntry\r
   );\r
 \r
 /**\r
@@ -734,7 +726,7 @@ NetListInsertBefore (
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *NET_DESTROY_LINK_LIST_CALLBACK) (\r
+(EFIAPI *NET_DESTROY_LINK_LIST_CALLBACK)(\r
   IN LIST_ENTRY         *Entry,\r
   IN VOID               *Context   OPTIONAL\r
   );\r
@@ -764,10 +756,10 @@ EFI_STATUS
 EFI_STATUS\r
 EFIAPI\r
 NetDestroyLinkList (\r
-  IN   LIST_ENTRY                       *List,\r
-  IN   NET_DESTROY_LINK_LIST_CALLBACK   CallBack,\r
-  IN   VOID                             *Context     OPTIONAL,\r
-  OUT  UINTN                            *ListLength  OPTIONAL\r
+  IN   LIST_ENTRY                      *List,\r
+  IN   NET_DESTROY_LINK_LIST_CALLBACK  CallBack,\r
+  IN   VOID                            *Context     OPTIONAL,\r
+  OUT  UINTN                           *ListLength  OPTIONAL\r
   );\r
 \r
 /**\r
@@ -785,9 +777,9 @@ NetDestroyLinkList (
 BOOLEAN\r
 EFIAPI\r
 NetIsInHandleBuffer (\r
-  IN  EFI_HANDLE          Handle,\r
-  IN  UINTN               NumberOfChildren,\r
-  IN  EFI_HANDLE          *ChildHandleBuffer OPTIONAL\r
+  IN  EFI_HANDLE  Handle,\r
+  IN  UINTN       NumberOfChildren,\r
+  IN  EFI_HANDLE  *ChildHandleBuffer OPTIONAL\r
   );\r
 \r
 //\r
@@ -795,15 +787,15 @@ NetIsInHandleBuffer (
 // tokens. The drivers can share code to manage those objects.\r
 //\r
 typedef struct {\r
-  LIST_ENTRY                Link;\r
-  VOID                      *Key;\r
-  VOID                      *Value;\r
+  LIST_ENTRY    Link;\r
+  VOID          *Key;\r
+  VOID          *Value;\r
 } NET_MAP_ITEM;\r
 \r
 typedef struct {\r
-  LIST_ENTRY                Used;\r
-  LIST_ENTRY                Recycled;\r
-  UINTN                     Count;\r
+  LIST_ENTRY    Used;\r
+  LIST_ENTRY    Recycled;\r
+  UINTN         Count;\r
 } NET_MAP;\r
 \r
 #define NET_MAP_INCREAMENT  64\r
@@ -825,7 +817,7 @@ typedef struct {
 VOID\r
 EFIAPI\r
 NetMapInit (\r
-  IN OUT NET_MAP                *Map\r
+  IN OUT NET_MAP  *Map\r
   );\r
 \r
 /**\r
@@ -843,7 +835,7 @@ NetMapInit (
 VOID\r
 EFIAPI\r
 NetMapClean (\r
-  IN OUT NET_MAP            *Map\r
+  IN OUT NET_MAP  *Map\r
   );\r
 \r
 /**\r
@@ -861,7 +853,7 @@ NetMapClean (
 BOOLEAN\r
 EFIAPI\r
 NetMapIsEmpty (\r
-  IN NET_MAP                *Map\r
+  IN NET_MAP  *Map\r
   );\r
 \r
 /**\r
@@ -877,7 +869,7 @@ NetMapIsEmpty (
 UINTN\r
 EFIAPI\r
 NetMapGetCount (\r
-  IN NET_MAP                *Map\r
+  IN NET_MAP  *Map\r
   );\r
 \r
 /**\r
@@ -901,9 +893,9 @@ NetMapGetCount (
 EFI_STATUS\r
 EFIAPI\r
 NetMapInsertHead (\r
-  IN OUT NET_MAP            *Map,\r
-  IN VOID                   *Key,\r
-  IN VOID                   *Value    OPTIONAL\r
+  IN OUT NET_MAP  *Map,\r
+  IN VOID         *Key,\r
+  IN VOID         *Value    OPTIONAL\r
   );\r
 \r
 /**\r
@@ -927,9 +919,9 @@ NetMapInsertHead (
 EFI_STATUS\r
 EFIAPI\r
 NetMapInsertTail (\r
-  IN OUT NET_MAP            *Map,\r
-  IN VOID                   *Key,\r
-  IN VOID                   *Value    OPTIONAL\r
+  IN OUT NET_MAP  *Map,\r
+  IN VOID         *Key,\r
+  IN VOID         *Value    OPTIONAL\r
   );\r
 \r
 /**\r
@@ -950,8 +942,8 @@ NetMapInsertTail (
 NET_MAP_ITEM *\r
 EFIAPI\r
 NetMapFindKey (\r
-  IN  NET_MAP               *Map,\r
-  IN  VOID                  *Key\r
+  IN  NET_MAP  *Map,\r
+  IN  VOID     *Key\r
   );\r
 \r
 /**\r
@@ -976,9 +968,9 @@ NetMapFindKey (
 VOID *\r
 EFIAPI\r
 NetMapRemoveItem (\r
-  IN  OUT NET_MAP             *Map,\r
-  IN  OUT NET_MAP_ITEM        *Item,\r
-  OUT VOID                    **Value           OPTIONAL\r
+  IN  OUT NET_MAP       *Map,\r
+  IN  OUT NET_MAP_ITEM  *Item,\r
+  OUT VOID              **Value           OPTIONAL\r
   );\r
 \r
 /**\r
@@ -1001,8 +993,8 @@ NetMapRemoveItem (
 VOID *\r
 EFIAPI\r
 NetMapRemoveHead (\r
-  IN OUT NET_MAP            *Map,\r
-  OUT VOID                  **Value         OPTIONAL\r
+  IN OUT NET_MAP  *Map,\r
+  OUT VOID        **Value         OPTIONAL\r
   );\r
 \r
 /**\r
@@ -1025,13 +1017,13 @@ NetMapRemoveHead (
 VOID *\r
 EFIAPI\r
 NetMapRemoveTail (\r
-  IN OUT NET_MAP            *Map,\r
-  OUT VOID                  **Value       OPTIONAL\r
+  IN OUT NET_MAP  *Map,\r
+  OUT VOID        **Value       OPTIONAL\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *NET_MAP_CALLBACK) (\r
+(EFIAPI *NET_MAP_CALLBACK)(\r
   IN NET_MAP                *Map,\r
   IN NET_MAP_ITEM           *Item,\r
   IN VOID                   *Arg\r
@@ -1059,15 +1051,15 @@ EFI_STATUS
 EFI_STATUS\r
 EFIAPI\r
 NetMapIterate (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_CALLBACK       CallBack,\r
-  IN VOID                   *Arg      OPTIONAL\r
+  IN NET_MAP           *Map,\r
+  IN NET_MAP_CALLBACK  CallBack,\r
+  IN VOID              *Arg      OPTIONAL\r
   );\r
 \r
-\r
 //\r
 // Helper functions to implement driver binding and service binding protocols.\r
 //\r
+\r
 /**\r
   Create a child of the service that is identified by ServiceBindingGuid.\r
 \r
@@ -1088,10 +1080,10 @@ NetMapIterate (
 EFI_STATUS\r
 EFIAPI\r
 NetLibCreateServiceChild (\r
-  IN  EFI_HANDLE            Controller,\r
-  IN  EFI_HANDLE            Image,\r
-  IN  EFI_GUID              *ServiceBindingGuid,\r
-  IN  OUT EFI_HANDLE        *ChildHandle\r
+  IN  EFI_HANDLE      Controller,\r
+  IN  EFI_HANDLE      Image,\r
+  IN  EFI_GUID        *ServiceBindingGuid,\r
+  IN  OUT EFI_HANDLE  *ChildHandle\r
   );\r
 \r
 /**\r
@@ -1113,10 +1105,10 @@ NetLibCreateServiceChild (
 EFI_STATUS\r
 EFIAPI\r
 NetLibDestroyServiceChild (\r
-  IN  EFI_HANDLE            Controller,\r
-  IN  EFI_HANDLE            Image,\r
-  IN  EFI_GUID              *ServiceBindingGuid,\r
-  IN  EFI_HANDLE            ChildHandle\r
+  IN  EFI_HANDLE  Controller,\r
+  IN  EFI_HANDLE  Image,\r
+  IN  EFI_GUID    *ServiceBindingGuid,\r
+  IN  EFI_HANDLE  ChildHandle\r
   );\r
 \r
 /**\r
@@ -1138,8 +1130,8 @@ NetLibDestroyServiceChild (
 EFI_HANDLE\r
 EFIAPI\r
 NetLibGetSnpHandle (\r
-  IN   EFI_HANDLE                  ServiceHandle,\r
-  OUT  EFI_SIMPLE_NETWORK_PROTOCOL **Snp  OPTIONAL\r
+  IN   EFI_HANDLE                   ServiceHandle,\r
+  OUT  EFI_SIMPLE_NETWORK_PROTOCOL  **Snp  OPTIONAL\r
   );\r
 \r
 /**\r
@@ -1158,7 +1150,7 @@ NetLibGetSnpHandle (
 UINT16\r
 EFIAPI\r
 NetLibGetVlanId (\r
-  IN EFI_HANDLE             ServiceHandle\r
+  IN EFI_HANDLE  ServiceHandle\r
   );\r
 \r
 /**\r
@@ -1178,8 +1170,8 @@ NetLibGetVlanId (
 EFI_HANDLE\r
 EFIAPI\r
 NetLibGetVlanHandle (\r
-  IN EFI_HANDLE             ControllerHandle,\r
-  IN UINT16                 VlanId\r
+  IN EFI_HANDLE  ControllerHandle,\r
+  IN UINT16      VlanId\r
   );\r
 \r
 /**\r
@@ -1204,9 +1196,9 @@ NetLibGetVlanHandle (
 EFI_STATUS\r
 EFIAPI\r
 NetLibGetMacAddress (\r
-  IN  EFI_HANDLE            ServiceHandle,\r
-  OUT EFI_MAC_ADDRESS       *MacAddress,\r
-  OUT UINTN                 *AddressSize\r
+  IN  EFI_HANDLE       ServiceHandle,\r
+  OUT EFI_MAC_ADDRESS  *MacAddress,\r
+  OUT UINTN            *AddressSize\r
   );\r
 \r
 /**\r
@@ -1236,9 +1228,9 @@ NetLibGetMacAddress (
 EFI_STATUS\r
 EFIAPI\r
 NetLibGetMacString (\r
-  IN  EFI_HANDLE            ServiceHandle,\r
-  IN  EFI_HANDLE            ImageHandle  OPTIONAL,\r
-  OUT CHAR16                **MacString\r
+  IN  EFI_HANDLE  ServiceHandle,\r
+  IN  EFI_HANDLE  ImageHandle  OPTIONAL,\r
+  OUT CHAR16      **MacString\r
   );\r
 \r
 /**\r
@@ -1274,8 +1266,8 @@ NetLibGetMacString (
 EFI_STATUS\r
 EFIAPI\r
 NetLibDetectMedia (\r
-  IN  EFI_HANDLE            ServiceHandle,\r
-  OUT BOOLEAN               *MediaPresent\r
+  IN  EFI_HANDLE  ServiceHandle,\r
+  OUT BOOLEAN     *MediaPresent\r
   );\r
 \r
 /**\r
@@ -1305,12 +1297,11 @@ NetLibDetectMedia (
 EFI_STATUS\r
 EFIAPI\r
 NetLibDetectMediaWaitTimeout (\r
-  IN  EFI_HANDLE            ServiceHandle,\r
-  IN  UINT64                Timeout,\r
-  OUT EFI_STATUS            *MediaState\r
+  IN  EFI_HANDLE  ServiceHandle,\r
+  IN  UINT64      Timeout,\r
+  OUT EFI_STATUS  *MediaState\r
   );\r
 \r
-\r
 /**\r
   Create an IPv4 device path node.\r
 \r
@@ -1377,7 +1368,6 @@ NetLibCreateIPv6DPathNode (
   IN UINT16                Protocol\r
   );\r
 \r
-\r
 /**\r
   Find the UNDI/SNP handle from controller and protocol GUID.\r
 \r
@@ -1400,8 +1390,8 @@ NetLibCreateIPv6DPathNode (
 EFI_HANDLE\r
 EFIAPI\r
 NetLibGetNicHandle (\r
-  IN EFI_HANDLE             Controller,\r
-  IN EFI_GUID               *ProtocolGuid\r
+  IN EFI_HANDLE  Controller,\r
+  IN EFI_GUID    *ProtocolGuid\r
   );\r
 \r
 /**\r
@@ -1419,7 +1409,7 @@ NetLibGetNicHandle (
 EFI_STATUS\r
 EFIAPI\r
 NetLibDefaultUnload (\r
-  IN EFI_HANDLE             ImageHandle\r
+  IN EFI_HANDLE  ImageHandle\r
   );\r
 \r
 /**\r
@@ -1435,8 +1425,8 @@ NetLibDefaultUnload (
 EFI_STATUS\r
 EFIAPI\r
 NetLibAsciiStrToIp4 (\r
-  IN CONST CHAR8                 *String,\r
-  OUT      EFI_IPv4_ADDRESS      *Ip4Address\r
+  IN CONST CHAR8             *String,\r
+  OUT      EFI_IPv4_ADDRESS  *Ip4Address\r
   );\r
 \r
 /**\r
@@ -1453,8 +1443,8 @@ NetLibAsciiStrToIp4 (
 EFI_STATUS\r
 EFIAPI\r
 NetLibAsciiStrToIp6 (\r
-  IN CONST CHAR8                 *String,\r
-  OUT      EFI_IPv6_ADDRESS      *Ip6Address\r
+  IN CONST CHAR8             *String,\r
+  OUT      EFI_IPv6_ADDRESS  *Ip6Address\r
   );\r
 \r
 /**\r
@@ -1470,8 +1460,8 @@ NetLibAsciiStrToIp6 (
 EFI_STATUS\r
 EFIAPI\r
 NetLibStrToIp4 (\r
-  IN CONST CHAR16                *String,\r
-  OUT      EFI_IPv4_ADDRESS      *Ip4Address\r
+  IN CONST CHAR16            *String,\r
+  OUT      EFI_IPv4_ADDRESS  *Ip4Address\r
   );\r
 \r
 /**\r
@@ -1488,8 +1478,8 @@ NetLibStrToIp4 (
 EFI_STATUS\r
 EFIAPI\r
 NetLibStrToIp6 (\r
-  IN CONST CHAR16                *String,\r
-  OUT      EFI_IPv6_ADDRESS      *Ip6Address\r
+  IN CONST CHAR16            *String,\r
+  OUT      EFI_IPv6_ADDRESS  *Ip6Address\r
   );\r
 \r
 /**\r
@@ -1508,9 +1498,9 @@ NetLibStrToIp6 (
 EFI_STATUS\r
 EFIAPI\r
 NetLibStrToIp6andPrefix (\r
-  IN CONST CHAR16                *String,\r
-  OUT      EFI_IPv6_ADDRESS      *Ip6Address,\r
-  OUT      UINT8                 *PrefixLength\r
+  IN CONST CHAR16            *String,\r
+  OUT      EFI_IPv6_ADDRESS  *Ip6Address,\r
+  OUT      UINT8             *PrefixLength\r
   );\r
 \r
 /**\r
@@ -1530,23 +1520,22 @@ NetLibStrToIp6andPrefix (
 EFI_STATUS\r
 EFIAPI\r
 NetLibIp6ToStr (\r
-  IN         EFI_IPv6_ADDRESS      *Ip6Address,\r
-  OUT        CHAR16                *String,\r
-  IN         UINTN                 StringSize\r
+  IN         EFI_IPv6_ADDRESS  *Ip6Address,\r
+  OUT        CHAR16            *String,\r
+  IN         UINTN             StringSize\r
   );\r
 \r
 //\r
 // Various signatures\r
 //\r
-#define  NET_BUF_SIGNATURE    SIGNATURE_32 ('n', 'b', 'u', 'f')\r
-#define  NET_VECTOR_SIGNATURE SIGNATURE_32 ('n', 'v', 'e', 'c')\r
-#define  NET_QUE_SIGNATURE    SIGNATURE_32 ('n', 'b', 'q', 'u')\r
-\r
+#define  NET_BUF_SIGNATURE     SIGNATURE_32 ('n', 'b', 'u', 'f')\r
+#define  NET_VECTOR_SIGNATURE  SIGNATURE_32 ('n', 'v', 'e', 'c')\r
+#define  NET_QUE_SIGNATURE     SIGNATURE_32 ('n', 'b', 'q', 'u')\r
 \r
-#define  NET_PROTO_DATA       64   // Opaque buffer for protocols\r
-#define  NET_BUF_HEAD         1    // Trim or allocate space from head\r
-#define  NET_BUF_TAIL         0    // Trim or allocate space from tail\r
-#define  NET_VECTOR_OWN_FIRST 0x01  // We allocated the 1st block in the vector\r
+#define  NET_PROTO_DATA        64   // Opaque buffer for protocols\r
+#define  NET_BUF_HEAD          1    // Trim or allocate space from head\r
+#define  NET_BUF_TAIL          0    // Trim or allocate space from tail\r
+#define  NET_VECTOR_OWN_FIRST  0x01 // We allocated the 1st block in the vector\r
 \r
 #define NET_CHECK_SIGNATURE(PData, SIGNATURE) \\r
   ASSERT (((PData) != NULL) && ((PData)->Signature == (SIGNATURE)))\r
@@ -1555,39 +1544,39 @@ NetLibIp6ToStr (
 // Single memory block in the vector.\r
 //\r
 typedef struct {\r
-  UINT32              Len;        // The block's length\r
-  UINT8               *Bulk;      // The block's Data\r
+  UINT32    Len;                  // The block's length\r
+  UINT8     *Bulk;                // The block's Data\r
 } NET_BLOCK;\r
 \r
-typedef VOID (EFIAPI *NET_VECTOR_EXT_FREE) (VOID *Arg);\r
+typedef VOID (EFIAPI *NET_VECTOR_EXT_FREE)(VOID *Arg);\r
 \r
 //\r
-//NET_VECTOR contains several blocks to hold all packet's\r
-//fragments and other house-keeping stuff for sharing. It\r
-//doesn't specify the where actual packet fragment begins.\r
+// NET_VECTOR contains several blocks to hold all packet's\r
+// fragments and other house-keeping stuff for sharing. It\r
+// doesn't specify the where actual packet fragment begins.\r
 //\r
 typedef struct {\r
-  UINT32              Signature;\r
-  INTN                RefCnt;  // Reference count to share NET_VECTOR.\r
-  NET_VECTOR_EXT_FREE Free;    // external function to free NET_VECTOR\r
-  VOID                *Arg;    // opaque argument to Free\r
-  UINT32              Flag;    // Flags, NET_VECTOR_OWN_FIRST\r
-  UINT32              Len;     // Total length of the associated BLOCKs\r
-\r
-  UINT32              BlockNum;\r
-  NET_BLOCK           Block[1];\r
+  UINT32                 Signature;\r
+  INTN                   RefCnt; // Reference count to share NET_VECTOR.\r
+  NET_VECTOR_EXT_FREE    Free;   // external function to free NET_VECTOR\r
+  VOID                   *Arg;   // opaque argument to Free\r
+  UINT32                 Flag;   // Flags, NET_VECTOR_OWN_FIRST\r
+  UINT32                 Len;    // Total length of the associated BLOCKs\r
+\r
+  UINT32                 BlockNum;\r
+  NET_BLOCK              Block[1];\r
 } NET_VECTOR;\r
 \r
 //\r
-//NET_BLOCK_OP operates on the NET_BLOCK. It specifies\r
-//where the actual fragment begins and ends\r
+// NET_BLOCK_OP operates on the NET_BLOCK. It specifies\r
+// where the actual fragment begins and ends\r
 //\r
 typedef struct {\r
-  UINT8               *BlockHead;   // Block's head, or the smallest valid Head\r
-  UINT8               *BlockTail;   // Block's tail. BlockTail-BlockHead=block length\r
-  UINT8               *Head;        // 1st byte of the data in the block\r
-  UINT8               *Tail;        // Tail of the data in the block, Tail-Head=Size\r
-  UINT32              Size;         // The size of the data\r
+  UINT8     *BlockHead;             // Block's head, or the smallest valid Head\r
+  UINT8     *BlockTail;             // Block's tail. BlockTail-BlockHead=block length\r
+  UINT8     *Head;                  // 1st byte of the data in the block\r
+  UINT8     *Tail;                  // Tail of the data in the block, Tail-Head=Size\r
+  UINT32    Size;                   // The size of the data\r
 } NET_BLOCK_OP;\r
 \r
 typedef union {\r
@@ -1596,44 +1585,44 @@ typedef union {
 } NET_IP_HEAD;\r
 \r
 //\r
-//NET_BUF is the buffer manage structure used by the\r
-//network stack. Every network packet may be fragmented. The Vector points to\r
-//memory blocks used by each fragment, and BlockOp\r
-//specifies where each fragment begins and ends.\r
+// NET_BUF is the buffer manage structure used by the\r
+// network stack. Every network packet may be fragmented. The Vector points to\r
+// memory blocks used by each fragment, and BlockOp\r
+// specifies where each fragment begins and ends.\r
 //\r
-//It also contains an opaque area for the protocol to store\r
-//per-packet information. Protocol must be careful not\r
-//to overwrite the members after that.\r
+// It also contains an opaque area for the protocol to store\r
+// per-packet information. Protocol must be careful not\r
+// to overwrite the members after that.\r
 //\r
 typedef struct {\r
-  UINT32         Signature;\r
-  INTN           RefCnt;\r
-  LIST_ENTRY     List;                       // The List this NET_BUF is on\r
+  UINT32            Signature;\r
+  INTN              RefCnt;\r
+  LIST_ENTRY        List;                    // The List this NET_BUF is on\r
 \r
-  NET_IP_HEAD    Ip;                         // Network layer header, for fast access\r
-  TCP_HEAD       *Tcp;                       // Transport layer header, for fast access\r
-  EFI_UDP_HEADER *Udp;                       // User Datagram Protocol header\r
-  UINT8          ProtoData [NET_PROTO_DATA]; //Protocol specific data\r
+  NET_IP_HEAD       Ip;                        // Network layer header, for fast access\r
+  TCP_HEAD          *Tcp;                      // Transport layer header, for fast access\r
+  EFI_UDP_HEADER    *Udp;                      // User Datagram Protocol header\r
+  UINT8             ProtoData[NET_PROTO_DATA]; // Protocol specific data\r
 \r
-  NET_VECTOR     *Vector;                    // The vector containing the packet\r
+  NET_VECTOR        *Vector;                 // The vector containing the packet\r
 \r
-  UINT32         BlockOpNum;                 // Total number of BlockOp in the buffer\r
-  UINT32         TotalSize;                  // Total size of the actual packet\r
-  NET_BLOCK_OP   BlockOp[1];                 // Specify the position of actual packet\r
+  UINT32            BlockOpNum;              // Total number of BlockOp in the buffer\r
+  UINT32            TotalSize;               // Total size of the actual packet\r
+  NET_BLOCK_OP      BlockOp[1];              // Specify the position of actual packet\r
 } NET_BUF;\r
 \r
 //\r
-//A queue of NET_BUFs. It is a thin extension of\r
-//NET_BUF functions.\r
+// A queue of NET_BUFs. It is a thin extension of\r
+// NET_BUF functions.\r
 //\r
 typedef struct {\r
-  UINT32              Signature;\r
-  INTN                RefCnt;\r
-  LIST_ENTRY          List;       // The List this buffer queue is on\r
+  UINT32        Signature;\r
+  INTN          RefCnt;\r
+  LIST_ENTRY    List;             // The List this buffer queue is on\r
 \r
-  LIST_ENTRY          BufList;    // list of queued buffers\r
-  UINT32              BufSize;    // total length of DATA in the buffers\r
-  UINT32              BufNum;     // total number of buffers on the chain\r
+  LIST_ENTRY    BufList;          // list of queued buffers\r
+  UINT32        BufSize;          // total length of DATA in the buffers\r
+  UINT32        BufNum;           // total number of buffers on the chain\r
 } NET_BUF_QUEUE;\r
 \r
 //\r
@@ -1641,19 +1630,19 @@ typedef struct {
 //\r
 #pragma pack(1)\r
 typedef struct {\r
-  IP4_ADDR            SrcIp;\r
-  IP4_ADDR            DstIp;\r
-  UINT8               Reserved;\r
-  UINT8               Protocol;\r
-  UINT16              Len;\r
+  IP4_ADDR    SrcIp;\r
+  IP4_ADDR    DstIp;\r
+  UINT8       Reserved;\r
+  UINT8       Protocol;\r
+  UINT16      Len;\r
 } NET_PSEUDO_HDR;\r
 \r
 typedef struct {\r
   EFI_IPv6_ADDRESS    SrcIp;\r
   EFI_IPv6_ADDRESS    DstIp;\r
   UINT32              Len;\r
-  UINT32              Reserved:24;\r
-  UINT32              NextHeader:8;\r
+  UINT32              Reserved   : 24;\r
+  UINT32              NextHeader : 8;\r
 } NET_IP6_PSEUDO_HDR;\r
 #pragma pack()\r
 \r
@@ -1663,13 +1652,13 @@ typedef struct {
 // the two in case that NET_BLOCK be enhanced later.\r
 //\r
 typedef struct {\r
-  UINT32              Len;\r
-  UINT8               *Bulk;\r
+  UINT32    Len;\r
+  UINT8     *Bulk;\r
 } NET_FRAGMENT;\r
 \r
-#define NET_GET_REF(PData)      ((PData)->RefCnt++)\r
-#define NET_PUT_REF(PData)      ((PData)->RefCnt--)\r
-#define NETBUF_FROM_PROTODATA(Info) BASE_CR((Info), NET_BUF, ProtoData)\r
+#define NET_GET_REF(PData)           ((PData)->RefCnt++)\r
+#define NET_PUT_REF(PData)           ((PData)->RefCnt--)\r
+#define NETBUF_FROM_PROTODATA(Info)  BASE_CR((Info), NET_BUF, ProtoData)\r
 \r
 #define NET_BUF_SHARED(Buf) \\r
   (((Buf)->RefCnt > 1) || ((Buf)->Vector->RefCnt > 1))\r
@@ -1699,7 +1688,7 @@ typedef struct {
 NET_BUF  *\r
 EFIAPI\r
 NetbufAlloc (\r
-  IN UINT32                 Len\r
+  IN UINT32  Len\r
   );\r
 \r
 /**\r
@@ -1717,7 +1706,7 @@ NetbufAlloc (
 VOID\r
 EFIAPI\r
 NetbufFree (\r
-  IN NET_BUF                *Nbuf\r
+  IN NET_BUF  *Nbuf\r
   );\r
 \r
 /**\r
@@ -1740,9 +1729,9 @@ NetbufFree (
 UINT8  *\r
 EFIAPI\r
 NetbufGetByte (\r
-  IN  NET_BUF               *Nbuf,\r
-  IN  UINT32                Offset,\r
-  OUT UINT32                *Index  OPTIONAL\r
+  IN  NET_BUF  *Nbuf,\r
+  IN  UINT32   Offset,\r
+  OUT UINT32   *Index  OPTIONAL\r
   );\r
 \r
 /**\r
@@ -1760,7 +1749,7 @@ NetbufGetByte (
 NET_BUF *\r
 EFIAPI\r
 NetbufClone (\r
-  IN NET_BUF                *Nbuf\r
+  IN NET_BUF  *Nbuf\r
   );\r
 \r
 /**\r
@@ -1782,9 +1771,9 @@ NetbufClone (
 NET_BUF  *\r
 EFIAPI\r
 NetbufDuplicate (\r
-  IN NET_BUF                *Nbuf,\r
-  IN OUT NET_BUF            *Duplicate        OPTIONAL,\r
-  IN UINT32                 HeadSpace\r
+  IN NET_BUF      *Nbuf,\r
+  IN OUT NET_BUF  *Duplicate        OPTIONAL,\r
+  IN UINT32       HeadSpace\r
   );\r
 \r
 /**\r
@@ -1807,10 +1796,10 @@ NetbufDuplicate (
 NET_BUF  *\r
 EFIAPI\r
 NetbufGetFragment (\r
-  IN NET_BUF                *Nbuf,\r
-  IN UINT32                 Offset,\r
-  IN UINT32                 Len,\r
-  IN UINT32                 HeadSpace\r
+  IN NET_BUF  *Nbuf,\r
+  IN UINT32   Offset,\r
+  IN UINT32   Len,\r
+  IN UINT32   HeadSpace\r
   );\r
 \r
 /**\r
@@ -1828,8 +1817,8 @@ NetbufGetFragment (
 VOID\r
 EFIAPI\r
 NetbufReserve (\r
-  IN OUT NET_BUF            *Nbuf,\r
-  IN UINT32                 Len\r
+  IN OUT NET_BUF  *Nbuf,\r
+  IN UINT32       Len\r
   );\r
 \r
 /**\r
@@ -1844,12 +1833,12 @@ NetbufReserve (
                               or NULL, if there is no sufficient space.\r
 \r
 **/\r
-UINT8*\r
+UINT8 *\r
 EFIAPI\r
 NetbufAllocSpace (\r
-  IN OUT NET_BUF            *Nbuf,\r
-  IN UINT32                 Len,\r
-  IN BOOLEAN                FromHead\r
+  IN OUT NET_BUF  *Nbuf,\r
+  IN UINT32       Len,\r
+  IN BOOLEAN      FromHead\r
   );\r
 \r
 /**\r
@@ -1867,9 +1856,9 @@ NetbufAllocSpace (
 UINT32\r
 EFIAPI\r
 NetbufTrim (\r
-  IN OUT NET_BUF            *Nbuf,\r
-  IN UINT32                 Len,\r
-  IN BOOLEAN                FromHead\r
+  IN OUT NET_BUF  *Nbuf,\r
+  IN UINT32       Len,\r
+  IN BOOLEAN      FromHead\r
   );\r
 \r
 /**\r
@@ -1890,10 +1879,10 @@ NetbufTrim (
 UINT32\r
 EFIAPI\r
 NetbufCopy (\r
-  IN NET_BUF                *Nbuf,\r
-  IN UINT32                 Offset,\r
-  IN UINT32                 Len,\r
-  IN UINT8                  *Dest\r
+  IN NET_BUF  *Nbuf,\r
+  IN UINT32   Offset,\r
+  IN UINT32   Len,\r
+  IN UINT8    *Dest\r
   );\r
 \r
 /**\r
@@ -1921,12 +1910,12 @@ NetbufCopy (
 NET_BUF  *\r
 EFIAPI\r
 NetbufFromExt (\r
-  IN NET_FRAGMENT           *ExtFragment,\r
-  IN UINT32                 ExtNum,\r
-  IN UINT32                 HeadSpace,\r
-  IN UINT32                 HeadLen,\r
-  IN NET_VECTOR_EXT_FREE    ExtFree,\r
-  IN VOID                   *Arg          OPTIONAL\r
+  IN NET_FRAGMENT         *ExtFragment,\r
+  IN UINT32               ExtNum,\r
+  IN UINT32               HeadSpace,\r
+  IN UINT32               HeadLen,\r
+  IN NET_VECTOR_EXT_FREE  ExtFree,\r
+  IN VOID                 *Arg          OPTIONAL\r
   );\r
 \r
 /**\r
@@ -1945,9 +1934,9 @@ NetbufFromExt (
 EFI_STATUS\r
 EFIAPI\r
 NetbufBuildExt (\r
-  IN NET_BUF                *Nbuf,\r
-  IN OUT NET_FRAGMENT       *ExtFragment,\r
-  IN OUT UINT32             *ExtNum\r
+  IN NET_BUF           *Nbuf,\r
+  IN OUT NET_FRAGMENT  *ExtFragment,\r
+  IN OUT UINT32        *ExtNum\r
   );\r
 \r
 /**\r
@@ -1970,11 +1959,11 @@ NetbufBuildExt (
 NET_BUF  *\r
 EFIAPI\r
 NetbufFromBufList (\r
-  IN LIST_ENTRY             *BufList,\r
-  IN UINT32                 HeadSpace,\r
-  IN UINT32                 HeaderLen,\r
-  IN NET_VECTOR_EXT_FREE    ExtFree,\r
-  IN VOID                   *Arg              OPTIONAL\r
+  IN LIST_ENTRY           *BufList,\r
+  IN UINT32               HeadSpace,\r
+  IN UINT32               HeaderLen,\r
+  IN NET_VECTOR_EXT_FREE  ExtFree,\r
+  IN VOID                 *Arg              OPTIONAL\r
   );\r
 \r
 /**\r
@@ -1986,7 +1975,7 @@ NetbufFromBufList (
 VOID\r
 EFIAPI\r
 NetbufFreeList (\r
-  IN OUT LIST_ENTRY         *Head\r
+  IN OUT LIST_ENTRY  *Head\r
   );\r
 \r
 /**\r
@@ -1998,7 +1987,7 @@ NetbufFreeList (
 VOID\r
 EFIAPI\r
 NetbufQueInit (\r
-  IN OUT NET_BUF_QUEUE          *NbufQue\r
+  IN OUT NET_BUF_QUEUE  *NbufQue\r
   );\r
 \r
 /**\r
@@ -2027,7 +2016,7 @@ NetbufQueAlloc (
 VOID\r
 EFIAPI\r
 NetbufQueFree (\r
-  IN NET_BUF_QUEUE          *NbufQue\r
+  IN NET_BUF_QUEUE  *NbufQue\r
   );\r
 \r
 /**\r
@@ -2042,7 +2031,7 @@ NetbufQueFree (
 NET_BUF  *\r
 EFIAPI\r
 NetbufQueRemove (\r
-  IN OUT NET_BUF_QUEUE          *NbufQue\r
+  IN OUT NET_BUF_QUEUE  *NbufQue\r
   );\r
 \r
 /**\r
@@ -2055,8 +2044,8 @@ NetbufQueRemove (
 VOID\r
 EFIAPI\r
 NetbufQueAppend (\r
-  IN OUT NET_BUF_QUEUE          *NbufQue,\r
-  IN OUT NET_BUF                *Nbuf\r
+  IN OUT NET_BUF_QUEUE  *NbufQue,\r
+  IN OUT NET_BUF        *Nbuf\r
   );\r
 \r
 /**\r
@@ -2078,10 +2067,10 @@ NetbufQueAppend (
 UINT32\r
 EFIAPI\r
 NetbufQueCopy (\r
-  IN NET_BUF_QUEUE          *NbufQue,\r
-  IN UINT32                 Offset,\r
-  IN UINT32                 Len,\r
-  OUT UINT8                 *Dest\r
+  IN NET_BUF_QUEUE  *NbufQue,\r
+  IN UINT32         Offset,\r
+  IN UINT32         Len,\r
+  OUT UINT8         *Dest\r
   );\r
 \r
 /**\r
@@ -2100,11 +2089,10 @@ NetbufQueCopy (
 UINT32\r
 EFIAPI\r
 NetbufQueTrim (\r
-  IN OUT NET_BUF_QUEUE      *NbufQue,\r
-  IN UINT32                 Len\r
+  IN OUT NET_BUF_QUEUE  *NbufQue,\r
+  IN UINT32             Len\r
   );\r
 \r
-\r
 /**\r
   Flush the net buffer queue.\r
 \r
@@ -2114,7 +2102,7 @@ NetbufQueTrim (
 VOID\r
 EFIAPI\r
 NetbufQueFlush (\r
-  IN OUT NET_BUF_QUEUE          *NbufQue\r
+  IN OUT NET_BUF_QUEUE  *NbufQue\r
   );\r
 \r
 /**\r
@@ -2129,8 +2117,8 @@ NetbufQueFlush (
 UINT16\r
 EFIAPI\r
 NetblockChecksum (\r
-  IN UINT8                  *Bulk,\r
-  IN UINT32                 Len\r
+  IN UINT8   *Bulk,\r
+  IN UINT32  Len\r
   );\r
 \r
 /**\r
@@ -2145,8 +2133,8 @@ NetblockChecksum (
 UINT16\r
 EFIAPI\r
 NetAddChecksum (\r
-  IN UINT16                 Checksum1,\r
-  IN UINT16                 Checksum2\r
+  IN UINT16  Checksum1,\r
+  IN UINT16  Checksum2\r
   );\r
 \r
 /**\r
@@ -2160,7 +2148,7 @@ NetAddChecksum (
 UINT16\r
 EFIAPI\r
 NetbufChecksum (\r
-  IN NET_BUF                *Nbuf\r
+  IN NET_BUF  *Nbuf\r
   );\r
 \r
 /**\r
@@ -2179,10 +2167,10 @@ NetbufChecksum (
 UINT16\r
 EFIAPI\r
 NetPseudoHeadChecksum (\r
-  IN IP4_ADDR               Src,\r
-  IN IP4_ADDR               Dst,\r
-  IN UINT8                  Proto,\r
-  IN UINT16                 Len\r
+  IN IP4_ADDR  Src,\r
+  IN IP4_ADDR  Dst,\r
+  IN UINT8     Proto,\r
+  IN UINT16    Len\r
   );\r
 \r
 /**\r
@@ -2201,10 +2189,10 @@ NetPseudoHeadChecksum (
 UINT16\r
 EFIAPI\r
 NetIp6PseudoHeadChecksum (\r
-  IN EFI_IPv6_ADDRESS       *Src,\r
-  IN EFI_IPv6_ADDRESS       *Dst,\r
-  IN UINT8                  NextHeader,\r
-  IN UINT32                 Len\r
+  IN EFI_IPv6_ADDRESS  *Src,\r
+  IN EFI_IPv6_ADDRESS  *Dst,\r
+  IN UINT8             NextHeader,\r
+  IN UINT32            Len\r
   );\r
 \r
 /**\r
@@ -2220,7 +2208,7 @@ NetIp6PseudoHeadChecksum (
 **/\r
 VOID\r
 NetIpSecNetbufFree (\r
-  NET_BUF   *Nbuf\r
+  NET_BUF  *Nbuf\r
   );\r
 \r
 /**\r
@@ -2237,7 +2225,7 @@ NetIpSecNetbufFree (
 EFI_STATUS\r
 EFIAPI\r
 NetLibGetSystemGuid (\r
-  OUT EFI_GUID              *SystemGuid\r
+  OUT EFI_GUID  *SystemGuid\r
   );\r
 \r
 /**\r
@@ -2260,7 +2248,7 @@ NetLibGetSystemGuid (
 CHAR8 *\r
 EFIAPI\r
 NetLibCreateDnsQName (\r
-  IN  CHAR16              *DomainName\r
+  IN  CHAR16  *DomainName\r
   );\r
 \r
 #endif\r
index 13c163ce99206c38d7da32f5f08ae492f1e747c5..a5764f7413238cbed3ad83a67ca26b679100146c 100644 (file)
@@ -10,89 +10,86 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef _TCP_IO_H_\r
 #define _TCP_IO_H_\r
 \r
-\r
 #include <Protocol/Tcp4.h>\r
 #include <Protocol/Tcp6.h>\r
 \r
 #include <Library/NetLib.h>\r
 \r
-#define TCP_VERSION_4 IP_VERSION_4\r
-#define TCP_VERSION_6 IP_VERSION_6\r
+#define TCP_VERSION_4  IP_VERSION_4\r
+#define TCP_VERSION_6  IP_VERSION_6\r
 \r
 ///\r
 /// 10 seconds\r
 ///\r
-#define TCP_GET_MAPPING_TIMEOUT 100000000U\r
-\r
+#define TCP_GET_MAPPING_TIMEOUT  100000000U\r
 \r
 typedef struct {\r
-  EFI_IPv4_ADDRESS          LocalIp;\r
-  EFI_IPv4_ADDRESS          SubnetMask;\r
-  EFI_IPv4_ADDRESS          Gateway;\r
-\r
-  UINT16                    StationPort;\r
-  EFI_IPv4_ADDRESS          RemoteIp;\r
-  UINT16                    RemotePort;\r
-  BOOLEAN                   ActiveFlag;\r
+  EFI_IPv4_ADDRESS    LocalIp;\r
+  EFI_IPv4_ADDRESS    SubnetMask;\r
+  EFI_IPv4_ADDRESS    Gateway;\r
+\r
+  UINT16              StationPort;\r
+  EFI_IPv4_ADDRESS    RemoteIp;\r
+  UINT16              RemotePort;\r
+  BOOLEAN             ActiveFlag;\r
 } TCP4_IO_CONFIG_DATA;\r
 \r
 typedef struct {\r
-  UINT16                    StationPort;\r
-  EFI_IPv6_ADDRESS          RemoteIp;\r
-  UINT16                    RemotePort;\r
-  BOOLEAN                   ActiveFlag;\r
+  UINT16              StationPort;\r
+  EFI_IPv6_ADDRESS    RemoteIp;\r
+  UINT16              RemotePort;\r
+  BOOLEAN             ActiveFlag;\r
 } TCP6_IO_CONFIG_DATA;\r
 \r
 typedef union {\r
-  TCP4_IO_CONFIG_DATA       Tcp4IoConfigData;\r
-  TCP6_IO_CONFIG_DATA       Tcp6IoConfigData;\r
+  TCP4_IO_CONFIG_DATA    Tcp4IoConfigData;\r
+  TCP6_IO_CONFIG_DATA    Tcp6IoConfigData;\r
 } TCP_IO_CONFIG_DATA;\r
 \r
 typedef union {\r
-  EFI_TCP4_PROTOCOL         *Tcp4;\r
-  EFI_TCP6_PROTOCOL         *Tcp6;\r
+  EFI_TCP4_PROTOCOL    *Tcp4;\r
+  EFI_TCP6_PROTOCOL    *Tcp6;\r
 } TCP_IO_PROTOCOL;\r
 \r
 typedef union {\r
-  EFI_TCP4_CONNECTION_TOKEN Tcp4Token;\r
-  EFI_TCP6_CONNECTION_TOKEN Tcp6Token;\r
+  EFI_TCP4_CONNECTION_TOKEN    Tcp4Token;\r
+  EFI_TCP6_CONNECTION_TOKEN    Tcp6Token;\r
 } TCP_IO_CONNECTION_TOKEN;\r
 \r
 typedef union {\r
-  EFI_TCP4_IO_TOKEN         Tcp4Token;\r
-  EFI_TCP6_IO_TOKEN         Tcp6Token;\r
+  EFI_TCP4_IO_TOKEN    Tcp4Token;\r
+  EFI_TCP6_IO_TOKEN    Tcp6Token;\r
 } TCP_IO_IO_TOKEN;\r
 \r
 typedef union {\r
-  EFI_TCP4_CLOSE_TOKEN      Tcp4Token;\r
-  EFI_TCP6_CLOSE_TOKEN      Tcp6Token;\r
+  EFI_TCP4_CLOSE_TOKEN    Tcp4Token;\r
+  EFI_TCP6_CLOSE_TOKEN    Tcp6Token;\r
 } TCP_IO_CLOSE_TOKEN;\r
 \r
 typedef union {\r
-  EFI_TCP4_LISTEN_TOKEN     Tcp4Token;\r
-  EFI_TCP6_LISTEN_TOKEN     Tcp6Token;\r
+  EFI_TCP4_LISTEN_TOKEN    Tcp4Token;\r
+  EFI_TCP6_LISTEN_TOKEN    Tcp6Token;\r
 } TCP_IO_LISTEN_TOKEN;\r
 \r
-\r
 typedef struct {\r
-  UINT8                     TcpVersion;\r
-  EFI_HANDLE                Image;\r
-  EFI_HANDLE                Controller;\r
-  EFI_HANDLE                Handle;\r
-\r
-  TCP_IO_PROTOCOL           Tcp;\r
-  TCP_IO_PROTOCOL           NewTcp;\r
-  TCP_IO_CONNECTION_TOKEN   ConnToken;\r
-  TCP_IO_IO_TOKEN           TxToken;\r
-  TCP_IO_IO_TOKEN           RxToken;\r
-  TCP_IO_CLOSE_TOKEN        CloseToken;\r
-  TCP_IO_LISTEN_TOKEN       ListenToken;\r
-\r
-  BOOLEAN                   IsConnDone;\r
-  BOOLEAN                   IsTxDone;\r
-  BOOLEAN                   IsRxDone;\r
-  BOOLEAN                   IsCloseDone;\r
-  BOOLEAN                   IsListenDone;\r
+  UINT8                      TcpVersion;\r
+  EFI_HANDLE                 Image;\r
+  EFI_HANDLE                 Controller;\r
+  EFI_HANDLE                 Handle;\r
+\r
+  TCP_IO_PROTOCOL            Tcp;\r
+  TCP_IO_PROTOCOL            NewTcp;\r
+  TCP_IO_CONNECTION_TOKEN    ConnToken;\r
+  TCP_IO_IO_TOKEN            TxToken;\r
+  TCP_IO_IO_TOKEN            RxToken;\r
+  TCP_IO_CLOSE_TOKEN         CloseToken;\r
+  TCP_IO_LISTEN_TOKEN        ListenToken;\r
+\r
+  BOOLEAN                    IsConnDone;\r
+  BOOLEAN                    IsTxDone;\r
+  BOOLEAN                    IsRxDone;\r
+  BOOLEAN                    IsCloseDone;\r
+  BOOLEAN                    IsListenDone;\r
 } TCP_IO;\r
 \r
 /**\r
@@ -115,11 +112,11 @@ typedef struct {
 EFI_STATUS\r
 EFIAPI\r
 TcpIoCreateSocket (\r
-  IN EFI_HANDLE             Image,\r
-  IN EFI_HANDLE             Controller,\r
-  IN UINT8                  TcpVersion,\r
-  IN TCP_IO_CONFIG_DATA     *ConfigData,\r
-  OUT TCP_IO                *TcpIo\r
+  IN EFI_HANDLE          Image,\r
+  IN EFI_HANDLE          Controller,\r
+  IN UINT8               TcpVersion,\r
+  IN TCP_IO_CONFIG_DATA  *ConfigData,\r
+  OUT TCP_IO             *TcpIo\r
   );\r
 \r
 /**\r
@@ -131,7 +128,7 @@ TcpIoCreateSocket (
 VOID\r
 EFIAPI\r
 TcpIoDestroySocket (\r
-  IN TCP_IO                 *TcpIo\r
+  IN TCP_IO  *TcpIo\r
   );\r
 \r
 /**\r
@@ -153,8 +150,8 @@ TcpIoDestroySocket (
 EFI_STATUS\r
 EFIAPI\r
 TcpIoConnect (\r
-  IN OUT TCP_IO             *TcpIo,\r
-  IN     EFI_EVENT          Timeout        OPTIONAL\r
+  IN OUT TCP_IO     *TcpIo,\r
+  IN     EFI_EVENT  Timeout        OPTIONAL\r
   );\r
 \r
 /**\r
@@ -178,8 +175,8 @@ TcpIoConnect (
 EFI_STATUS\r
 EFIAPI\r
 TcpIoAccept (\r
-  IN OUT TCP_IO             *TcpIo,\r
-  IN     EFI_EVENT          Timeout        OPTIONAL\r
+  IN OUT TCP_IO     *TcpIo,\r
+  IN     EFI_EVENT  Timeout        OPTIONAL\r
   );\r
 \r
 /**\r
@@ -191,7 +188,7 @@ TcpIoAccept (
 VOID\r
 EFIAPI\r
 TcpIoReset (\r
-  IN OUT TCP_IO             *TcpIo\r
+  IN OUT TCP_IO  *TcpIo\r
   );\r
 \r
 /**\r
@@ -212,8 +209,8 @@ TcpIoReset (
 EFI_STATUS\r
 EFIAPI\r
 TcpIoTransmit (\r
-  IN TCP_IO                 *TcpIo,\r
-  IN NET_BUF                *Packet\r
+  IN TCP_IO   *TcpIo,\r
+  IN NET_BUF  *Packet\r
   );\r
 \r
 /**\r
@@ -237,11 +234,10 @@ TcpIoTransmit (
 EFI_STATUS\r
 EFIAPI\r
 TcpIoReceive (\r
-  IN OUT TCP_IO             *TcpIo,\r
-  IN     NET_BUF            *Packet,\r
-  IN     BOOLEAN            AsyncMode,\r
-  IN     EFI_EVENT          Timeout       OPTIONAL\r
+  IN OUT TCP_IO     *TcpIo,\r
+  IN     NET_BUF    *Packet,\r
+  IN     BOOLEAN    AsyncMode,\r
+  IN     EFI_EVENT  Timeout       OPTIONAL\r
   );\r
 \r
 #endif\r
-\r
index de5174efbc4d4704314ab0b376597c6e0f3b06fc..d88332380f411ba60aa831d7a25d89a45e7e5517 100644 (file)
@@ -32,10 +32,10 @@ typedef struct _UDP_IO UDP_IO;
 /// The UDP address pair.\r
 ///\r
 typedef struct {\r
-  EFI_IP_ADDRESS            LocalAddr;\r
-  UINT16                    LocalPort;\r
-  EFI_IP_ADDRESS            RemoteAddr;\r
-  UINT16                    RemotePort;\r
+  EFI_IP_ADDRESS    LocalAddr;\r
+  UINT16            LocalPort;\r
+  EFI_IP_ADDRESS    RemoteAddr;\r
+  UINT16            RemotePort;\r
 } UDP_END_POINT;\r
 \r
 /**\r
@@ -54,7 +54,7 @@ typedef struct {
 **/\r
 typedef\r
 VOID\r
-(EFIAPI *UDP_IO_CALLBACK) (\r
+(EFIAPI *UDP_IO_CALLBACK)(\r
   IN NET_BUF                *Packet,\r
   IN UDP_END_POINT          *EndPoint,\r
   IN EFI_STATUS             IoStatus,\r
@@ -70,23 +70,21 @@ VOID
 /// make the application's header continuous before delivering up.\r
 ///\r
 typedef union {\r
-  EFI_UDP4_COMPLETION_TOKEN   Udp4;\r
-  EFI_UDP6_COMPLETION_TOKEN   Udp6;\r
+  EFI_UDP4_COMPLETION_TOKEN    Udp4;\r
+  EFI_UDP6_COMPLETION_TOKEN    Udp6;\r
 } UDP_COMPLETION_TOKEN;\r
 \r
 typedef struct {\r
-  UINT32                      Signature;\r
-  UDP_IO                      *UdpIo;\r
+  UINT32                  Signature;\r
+  UDP_IO                  *UdpIo;\r
 \r
-  UDP_IO_CALLBACK             CallBack;\r
-  VOID                        *Context;\r
-  UINT32                      HeadLen;\r
+  UDP_IO_CALLBACK         CallBack;\r
+  VOID                    *Context;\r
+  UINT32                  HeadLen;\r
 \r
-  UDP_COMPLETION_TOKEN        Token;\r
+  UDP_COMPLETION_TOKEN    Token;\r
 } UDP_RX_TOKEN;\r
 \r
-\r
-\r
 ///\r
 /// This structure is used internally by UdpIo Library.\r
 ///\r
@@ -96,26 +94,26 @@ typedef struct {
 ///\r
 \r
 typedef union {\r
-  EFI_UDP4_SESSION_DATA       Udp4;\r
-  EFI_UDP6_SESSION_DATA       Udp6;\r
+  EFI_UDP4_SESSION_DATA    Udp4;\r
+  EFI_UDP6_SESSION_DATA    Udp6;\r
 } UDP_SESSION_DATA;\r
 \r
 typedef union {\r
-  EFI_UDP4_TRANSMIT_DATA      Udp4;\r
-  EFI_UDP6_TRANSMIT_DATA      Udp6;\r
+  EFI_UDP4_TRANSMIT_DATA    Udp4;\r
+  EFI_UDP6_TRANSMIT_DATA    Udp6;\r
 } UDP_TRANSMIT_DATA;\r
 \r
 typedef struct {\r
-  UINT32                      Signature;\r
-  LIST_ENTRY                  Link;\r
-  UDP_IO                      *UdpIo;\r
-  UDP_IO_CALLBACK             CallBack;\r
-  NET_BUF                     *Packet;\r
-  VOID                        *Context;\r
-  EFI_IPv4_ADDRESS            Gateway;\r
-  UDP_SESSION_DATA            Session;\r
-  UDP_COMPLETION_TOKEN        Token;\r
-  UDP_TRANSMIT_DATA           Data;\r
+  UINT32                  Signature;\r
+  LIST_ENTRY              Link;\r
+  UDP_IO                  *UdpIo;\r
+  UDP_IO_CALLBACK         CallBack;\r
+  NET_BUF                 *Packet;\r
+  VOID                    *Context;\r
+  EFI_IPv4_ADDRESS        Gateway;\r
+  UDP_SESSION_DATA        Session;\r
+  UDP_COMPLETION_TOKEN    Token;\r
+  UDP_TRANSMIT_DATA       Data;\r
 } UDP_TX_TOKEN;\r
 \r
 ///\r
@@ -125,26 +123,26 @@ typedef struct {
 /// UdpIo Library uses this structure for all Udp4 or Udp6 operations.\r
 ///\r
 struct _UDP_IO {\r
-  UINT32                    Signature;\r
-  LIST_ENTRY                Link;\r
-  INTN                      RefCnt;\r
-  UINT8                     UdpVersion;\r
+  UINT32                     Signature;\r
+  LIST_ENTRY                 Link;\r
+  INTN                       RefCnt;\r
+  UINT8                      UdpVersion;\r
 \r
   //\r
   // Handle used to create/destroy UDP child\r
   //\r
-  EFI_HANDLE                Controller;\r
-  EFI_HANDLE                Image;\r
-  EFI_HANDLE                UdpHandle;\r
+  EFI_HANDLE                 Controller;\r
+  EFI_HANDLE                 Image;\r
+  EFI_HANDLE                 UdpHandle;\r
 \r
-  EFI_SIMPLE_NETWORK_MODE   SnpMode;\r
+  EFI_SIMPLE_NETWORK_MODE    SnpMode;\r
 \r
-  LIST_ENTRY                SentDatagram;   ///< A list of UDP_TX_TOKEN.\r
-  UDP_RX_TOKEN              *RecvRequest;\r
+  LIST_ENTRY                 SentDatagram;  ///< A list of UDP_TX_TOKEN.\r
+  UDP_RX_TOKEN               *RecvRequest;\r
 \r
   union {\r
-    EFI_UDP4_PROTOCOL       *Udp4;\r
-    EFI_UDP6_PROTOCOL       *Udp6;\r
+    EFI_UDP4_PROTOCOL    *Udp4;\r
+    EFI_UDP6_PROTOCOL    *Udp6;\r
   } Protocol;\r
 \r
   union {\r
@@ -167,7 +165,7 @@ struct _UDP_IO {
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *UDP_IO_CONFIG) (\r
+(EFIAPI *UDP_IO_CONFIG)(\r
   IN UDP_IO                 *UdpIo,\r
   IN VOID                   *Context\r
   );\r
@@ -184,7 +182,7 @@ EFI_STATUS
 **/\r
 typedef\r
 BOOLEAN\r
-(EFIAPI *UDP_IO_TO_CANCEL) (\r
+(EFIAPI *UDP_IO_TO_CANCEL)(\r
   IN UDP_TX_TOKEN           *Token,\r
   IN VOID                   *Context\r
   );\r
@@ -205,10 +203,10 @@ BOOLEAN
 VOID\r
 EFIAPI\r
 UdpIoCancelDgrams (\r
-  IN UDP_IO                 *UdpIo,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN UDP_IO_TO_CANCEL       ToCancel         OPTIONAL,\r
-  IN VOID                   *Context         OPTIONAL\r
+  IN UDP_IO            *UdpIo,\r
+  IN EFI_STATUS        IoStatus,\r
+  IN UDP_IO_TO_CANCEL  ToCancel         OPTIONAL,\r
+  IN VOID              *Context         OPTIONAL\r
   );\r
 \r
 /**\r
@@ -236,11 +234,11 @@ UdpIoCancelDgrams (
 UDP_IO *\r
 EFIAPI\r
 UdpIoCreateIo (\r
-  IN  EFI_HANDLE            Controller,\r
-  IN  EFI_HANDLE            ImageHandle,\r
-  IN  UDP_IO_CONFIG         Configure,\r
-  IN  UINT8                 UdpVersion,\r
-  IN  VOID                  *Context\r
+  IN  EFI_HANDLE     Controller,\r
+  IN  EFI_HANDLE     ImageHandle,\r
+  IN  UDP_IO_CONFIG  Configure,\r
+  IN  UINT8          UdpVersion,\r
+  IN  VOID           *Context\r
   );\r
 \r
 /**\r
@@ -259,7 +257,7 @@ UdpIoCreateIo (
 EFI_STATUS\r
 EFIAPI\r
 UdpIoFreeIo (\r
-  IN  UDP_IO                *UdpIo\r
+  IN  UDP_IO  *UdpIo\r
   );\r
 \r
 /**\r
@@ -276,7 +274,7 @@ UdpIoFreeIo (
 VOID\r
 EFIAPI\r
 UdpIoCleanIo (\r
-  IN  UDP_IO                *UdpIo\r
+  IN  UDP_IO  *UdpIo\r
   );\r
 \r
 /**\r
@@ -305,12 +303,12 @@ UdpIoCleanIo (
 EFI_STATUS\r
 EFIAPI\r
 UdpIoSendDatagram (\r
-  IN  UDP_IO                *UdpIo,\r
-  IN  NET_BUF               *Packet,\r
-  IN  UDP_END_POINT         *EndPoint OPTIONAL,\r
-  IN  EFI_IP_ADDRESS        *Gateway  OPTIONAL,\r
-  IN  UDP_IO_CALLBACK       CallBack,\r
-  IN  VOID                  *Context\r
+  IN  UDP_IO           *UdpIo,\r
+  IN  NET_BUF          *Packet,\r
+  IN  UDP_END_POINT    *EndPoint OPTIONAL,\r
+  IN  EFI_IP_ADDRESS   *Gateway  OPTIONAL,\r
+  IN  UDP_IO_CALLBACK  CallBack,\r
+  IN  VOID             *Context\r
   );\r
 \r
 /**\r
@@ -323,8 +321,8 @@ UdpIoSendDatagram (
 VOID\r
 EFIAPI\r
 UdpIoCancelSentDatagram (\r
-  IN  UDP_IO                *UdpIo,\r
-  IN  NET_BUF               *Packet\r
+  IN  UDP_IO   *UdpIo,\r
+  IN  NET_BUF  *Packet\r
   );\r
 \r
 /**\r
@@ -353,10 +351,10 @@ UdpIoCancelSentDatagram (
 EFI_STATUS\r
 EFIAPI\r
 UdpIoRecvDatagram (\r
-  IN  UDP_IO                *UdpIo,\r
-  IN  UDP_IO_CALLBACK       CallBack,\r
-  IN  VOID                  *Context,\r
-  IN  UINT32                HeadLen\r
+  IN  UDP_IO           *UdpIo,\r
+  IN  UDP_IO_CALLBACK  CallBack,\r
+  IN  VOID             *Context,\r
+  IN  UINT32           HeadLen\r
   );\r
 \r
 #endif\r
index 5e50f6cf308c2fd9d3c8492b90fe2fb2b665e7c2..5af4cc9e3bfc2b9ede29271468bc3e3c1662ba12 100644 (file)
@@ -7,7 +7,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #ifndef __DPC_H__\r
 #define __DPC_H__\r
 \r
@@ -22,8 +21,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // Forward reference for pure ANSI compatibility\r
 //\r
-typedef struct _EFI_DPC_PROTOCOL  EFI_DPC_PROTOCOL;\r
-\r
+typedef struct _EFI_DPC_PROTOCOL EFI_DPC_PROTOCOL;\r
 \r
 /**\r
   Invoke a Deferred Procedure Call.\r
@@ -86,13 +84,13 @@ EFI_STATUS
 /// DPC Protocol structure.\r
 ///\r
 struct _EFI_DPC_PROTOCOL {\r
-  EFI_DPC_QUEUE_DPC     QueueDpc;\r
-  EFI_DPC_DISPATCH_DPC  DispatchDpc;\r
+  EFI_DPC_QUEUE_DPC       QueueDpc;\r
+  EFI_DPC_DISPATCH_DPC    DispatchDpc;\r
 };\r
 \r
 ///\r
 /// DPC Protocol GUID variable.\r
 ///\r
-extern EFI_GUID gEfiDpcProtocolGuid;\r
+extern EFI_GUID  gEfiDpcProtocolGuid;\r
 \r
 #endif\r
index 7e3f82ae7584f74075ed784bcd545335b2548b87..3accd2f842419834d3d08b4c42ceea9759f25d57 100644 (file)
@@ -13,7 +13,7 @@
     0x611114f1, 0xa37b, 0x4468, {0xa4, 0x36, 0x5b, 0xdd, 0xa1, 0x6a, 0xa2, 0x40} \\r
   }\r
 \r
-typedef struct _EDKII_HTTP_CALLBACK_PROTOCOL  EDKII_HTTP_CALLBACK_PROTOCOL;\r
+typedef struct _EDKII_HTTP_CALLBACK_PROTOCOL EDKII_HTTP_CALLBACK_PROTOCOL;\r
 \r
 ///\r
 /// EDKII_HTTP_CALLBACK_EVENT\r
@@ -67,19 +67,19 @@ typedef enum {
 **/\r
 typedef\r
 VOID\r
-(EFIAPI * EDKII_HTTP_CALLBACK) (\r
+(EFIAPI *EDKII_HTTP_CALLBACK)(\r
   IN EDKII_HTTP_CALLBACK_PROTOCOL     *This,\r
   IN EDKII_HTTP_CALLBACK_EVENT        Event,\r
   IN EFI_STATUS                       EventStatus\r
- );\r
 );\r
 \r
 ///\r
 /// EFI HTTP Callback Protocol is invoked when HTTP event occurs.\r
 ///\r
 struct _EDKII_HTTP_CALLBACK_PROTOCOL {\r
-  EDKII_HTTP_CALLBACK Callback;\r
+  EDKII_HTTP_CALLBACK    Callback;\r
 };\r
 \r
-extern EFI_GUID gEdkiiHttpCallbackProtocolGuid;\r
+extern EFI_GUID  gEdkiiHttpCallbackProtocolGuid;\r
 \r
 #endif /* EDKII_HTTP_CALLBACK_H_ */\r
index 3461ab2a89a0e8dbd0c6349e36b50adb3e849fb6..fe4a6a6d30fbf97cb240c856df871121518a1b5a 100644 (file)
@@ -10,6 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // EFI Component Name Functions\r
 //\r
+\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
 \r
@@ -57,7 +58,6 @@ Ip4ComponentNameGetDriverName (
   OUT CHAR16                       **DriverName\r
   );\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r
   that is being managed by a driver.\r
@@ -129,14 +129,13 @@ Ip4ComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 Ip4ComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   );\r
 \r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
@@ -149,14 +148,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gIp4ComponentName = {
 //\r
 // EFI Component Name 2 Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gIp4ComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) Ip4ComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) Ip4ComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gIp4ComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)Ip4ComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)Ip4ComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mIp4DriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mIp4DriverNameTable[] = {\r
   {\r
     "eng;en",\r
     L"IP4 Network Service Driver"\r
@@ -223,7 +221,6 @@ Ip4ComponentNameGetDriverName (
            DriverName,\r
            (BOOLEAN)(This == &gIp4ComponentName)\r
            );\r
-\r
 }\r
 \r
 /**\r
@@ -238,12 +235,12 @@ Ip4ComponentNameGetDriverName (
 **/\r
 EFI_STATUS\r
 UpdateName (\r
-  IN     EFI_IP4_PROTOCOL         *Ip4\r
+  IN     EFI_IP4_PROTOCOL  *Ip4\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  CHAR16                           HandleName[80];\r
-  EFI_IP4_MODE_DATA                Ip4ModeData;\r
+  EFI_STATUS         Status;\r
+  CHAR16             HandleName[80];\r
+  EFI_IP4_MODE_DATA  Ip4ModeData;\r
 \r
   if (Ip4 == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -261,7 +258,9 @@ UpdateName (
   if (!Ip4ModeData.IsStarted || !Ip4ModeData.IsConfigured) {\r
     UnicodeSPrint (HandleName, sizeof (HandleName), L"IPv4 (Not started)");\r
   } else {\r
-    UnicodeSPrint (HandleName, sizeof (HandleName),\r
+    UnicodeSPrint (\r
+      HandleName,\r
+      sizeof (HandleName),\r
       L"IPv4 (SrcIP=%d.%d.%d.%d)",\r
       Ip4ModeData.ConfigData.StationAddress.Addr[0],\r
       Ip4ModeData.ConfigData.StationAddress.Addr[1],\r
@@ -274,6 +273,7 @@ UpdateName (
     FreeUnicodeStringTable (gIp4ControllerNameTable);\r
     gIp4ControllerNameTable = NULL;\r
   }\r
+\r
   Status = AddUnicodeString2 (\r
              "eng",\r
              gIp4ComponentName.SupportedLanguages,\r
@@ -365,15 +365,15 @@ UpdateName (
 EFI_STATUS\r
 EFIAPI\r
 Ip4ComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_IP4_PROTOCOL              *Ip4;\r
+  EFI_STATUS        Status;\r
+  EFI_IP4_PROTOCOL  *Ip4;\r
 \r
   //\r
   // Only provide names for child handles.\r
@@ -425,4 +425,3 @@ Ip4ComponentNameGetControllerName (
            (BOOLEAN)(This == &gIp4ComponentName)\r
            );\r
 }\r
-\r
index f4269b8ea49520b58b5f5ad69cd58713cf47dee9..930321866d22b35fc691b49d698e2d6c677cac7f 100644 (file)
@@ -7,7 +7,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Ip4Impl.h"\r
 \r
-\r
 /**\r
   Return the cast type (Unicast/Broadcast) specific to an\r
   interface. All the addresses are host byte ordered.\r
@@ -25,25 +24,21 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 INTN\r
 Ip4GetNetCast (\r
-  IN  IP4_ADDR          IpAddr,\r
-  IN  IP4_INTERFACE     *IpIf\r
+  IN  IP4_ADDR       IpAddr,\r
+  IN  IP4_INTERFACE  *IpIf\r
   )\r
 {\r
   if (IpAddr == IpIf->Ip) {\r
     return IP4_LOCAL_HOST;\r
-\r
   } else if (IpAddr == IpIf->SubnetBrdcast) {\r
     return IP4_SUBNET_BROADCAST;\r
-\r
   } else if (IpAddr == IpIf->NetBrdcast) {\r
     return IP4_NET_BROADCAST;\r
-\r
   }\r
 \r
   return 0;\r
 }\r
 \r
-\r
 /**\r
   Find the cast type of the packet related to the local host.\r
   This isn't the same as link layer cast type. For example, DHCP\r
@@ -62,15 +57,15 @@ Ip4GetNetCast (
 **/\r
 INTN\r
 Ip4GetHostCast (\r
-  IN  IP4_SERVICE       *IpSb,\r
-  IN  IP4_ADDR          Dst,\r
-  IN  IP4_ADDR          Src\r
+  IN  IP4_SERVICE  *IpSb,\r
+  IN  IP4_ADDR     Dst,\r
+  IN  IP4_ADDR     Src\r
   )\r
 {\r
-  LIST_ENTRY            *Entry;\r
-  IP4_INTERFACE         *IpIf;\r
-  INTN                  Type;\r
-  INTN                  Class;\r
+  LIST_ENTRY     *Entry;\r
+  IP4_INTERFACE  *IpIf;\r
+  INTN           Type;\r
+  INTN           Class;\r
 \r
   Type = 0;\r
 \r
@@ -106,18 +101,16 @@ Ip4GetHostCast (
   if (Dst == IP4_ALLONE_ADDRESS) {\r
     IpIf = Ip4FindNet (IpSb, Src);\r
 \r
-    if (IpIf != NULL && !IP4_IS_BROADCAST (Ip4GetNetCast (Src, IpIf))) {\r
+    if ((IpIf != NULL) && !IP4_IS_BROADCAST (Ip4GetNetCast (Src, IpIf))) {\r
       return IP4_LOCAL_BROADCAST;\r
     }\r
-\r
-  } else if (IP4_IS_MULTICAST (Dst) && Ip4FindGroup (&IpSb->IgmpCtrl, Dst) != NULL) {\r
+  } else if (IP4_IS_MULTICAST (Dst) && (Ip4FindGroup (&IpSb->IgmpCtrl, Dst) != NULL)) {\r
     return IP4_MULTICAST;\r
   }\r
 \r
   return Type;\r
 }\r
 \r
-\r
 /**\r
   Find an interface whose configured IP address is Ip.\r
 \r
@@ -129,12 +122,12 @@ Ip4GetHostCast (
 **/\r
 IP4_INTERFACE *\r
 Ip4FindInterface (\r
-  IN IP4_SERVICE        *IpSb,\r
-  IN IP4_ADDR           Ip\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_ADDR     Ip\r
   )\r
 {\r
-  LIST_ENTRY            *Entry;\r
-  IP4_INTERFACE         *IpIf;\r
+  LIST_ENTRY     *Entry;\r
+  IP4_INTERFACE  *IpIf;\r
 \r
   NET_LIST_FOR_EACH (Entry, &IpSb->Interfaces) {\r
     IpIf = NET_LIST_USER_STRUCT (Entry, IP4_INTERFACE, Link);\r
@@ -147,7 +140,6 @@ Ip4FindInterface (
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Find an interface that Ip is on that connected network.\r
 \r
@@ -159,12 +151,12 @@ Ip4FindInterface (
 **/\r
 IP4_INTERFACE *\r
 Ip4FindNet (\r
-  IN IP4_SERVICE        *IpSb,\r
-  IN IP4_ADDR           Ip\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_ADDR     Ip\r
   )\r
 {\r
-  LIST_ENTRY            *Entry;\r
-  IP4_INTERFACE         *IpIf;\r
+  LIST_ENTRY     *Entry;\r
+  IP4_INTERFACE  *IpIf;\r
 \r
   NET_LIST_FOR_EACH (Entry, &IpSb->Interfaces) {\r
     IpIf = NET_LIST_USER_STRUCT (Entry, IP4_INTERFACE, Link);\r
@@ -177,7 +169,6 @@ Ip4FindNet (
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Find an interface of the service with the same Ip/Netmask pair.\r
 \r
@@ -190,13 +181,13 @@ Ip4FindNet (
 **/\r
 IP4_INTERFACE *\r
 Ip4FindStationAddress (\r
-  IN IP4_SERVICE        *IpSb,\r
-  IN IP4_ADDR           Ip,\r
-  IN IP4_ADDR           Netmask\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_ADDR     Ip,\r
+  IN IP4_ADDR     Netmask\r
   )\r
 {\r
-  LIST_ENTRY      *Entry;\r
-  IP4_INTERFACE   *IpIf;\r
+  LIST_ENTRY     *Entry;\r
+  IP4_INTERFACE  *IpIf;\r
 \r
   NET_LIST_FOR_EACH (Entry, &IpSb->Interfaces) {\r
     IpIf = NET_LIST_USER_STRUCT (Entry, IP4_INTERFACE, Link);\r
@@ -209,7 +200,6 @@ Ip4FindStationAddress (
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Get the MAC address for a multicast IP address. Call\r
   Mnp's McastIpToMac to find the MAC address in stead of\r
@@ -226,18 +216,17 @@ Ip4FindStationAddress (
 **/\r
 EFI_STATUS\r
 Ip4GetMulticastMac (\r
-  IN  EFI_MANAGED_NETWORK_PROTOCOL *Mnp,\r
-  IN  IP4_ADDR                     Multicast,\r
-  OUT EFI_MAC_ADDRESS              *Mac\r
+  IN  EFI_MANAGED_NETWORK_PROTOCOL  *Mnp,\r
+  IN  IP4_ADDR                      Multicast,\r
+  OUT EFI_MAC_ADDRESS               *Mac\r
   )\r
 {\r
-  EFI_IP_ADDRESS        EfiIp;\r
+  EFI_IP_ADDRESS  EfiIp;\r
 \r
   EFI_IP4 (EfiIp.v4) = HTONL (Multicast);\r
   return Mnp->McastIpToMac (Mnp, FALSE, &EfiIp, Mac);\r
 }\r
 \r
-\r
 /**\r
   Convert the multibyte field in IP header's byter order.\r
   In spite of its name, it can also be used to convert from\r
@@ -250,19 +239,18 @@ Ip4GetMulticastMac (
 **/\r
 IP4_HEAD *\r
 Ip4NtohHead (\r
-  IN IP4_HEAD           *Head\r
+  IN IP4_HEAD  *Head\r
   )\r
 {\r
-  Head->TotalLen  = NTOHS (Head->TotalLen);\r
-  Head->Id        = NTOHS (Head->Id);\r
-  Head->Fragment  = NTOHS (Head->Fragment);\r
-  Head->Src       = NTOHL (Head->Src);\r
-  Head->Dst       = NTOHL (Head->Dst);\r
+  Head->TotalLen = NTOHS (Head->TotalLen);\r
+  Head->Id       = NTOHS (Head->Id);\r
+  Head->Fragment = NTOHS (Head->Fragment);\r
+  Head->Src      = NTOHL (Head->Src);\r
+  Head->Dst      = NTOHL (Head->Dst);\r
 \r
   return Head;\r
 }\r
 \r
-\r
 /**\r
   Validate that Ip/Netmask pair is OK to be used as station\r
   address. Only continuous netmasks are supported. and check\r
@@ -277,15 +265,15 @@ Ip4NtohHead (
 **/\r
 BOOLEAN\r
 Ip4StationAddressValid (\r
-  IN IP4_ADDR               Ip,\r
-  IN IP4_ADDR               Netmask\r
+  IN IP4_ADDR  Ip,\r
+  IN IP4_ADDR  Netmask\r
   )\r
 {\r
   //\r
   // Only support the station address with 0.0.0.0/0 to enable DHCP client.\r
   //\r
   if (Netmask == IP4_ALLZERO_ADDRESS) {\r
-    return (BOOLEAN) (Ip == IP4_ALLZERO_ADDRESS);\r
+    return (BOOLEAN)(Ip == IP4_ALLZERO_ADDRESS);\r
   }\r
 \r
   //\r
index a84602d45ac0632fa1574574127d28d7e348e23d..7228c3ca46dd9c8242a2c63d4c7685d93443d4a5 100644 (file)
@@ -13,14 +13,14 @@ typedef struct _IP4_INTERFACE  IP4_INTERFACE;
 typedef struct _IP4_PROTOCOL   IP4_PROTOCOL;\r
 typedef struct _IP4_SERVICE    IP4_SERVICE;\r
 \r
-#define IP4_ETHER_PROTO       0x0800\r
+#define IP4_ETHER_PROTO  0x0800\r
 \r
 //\r
 // The packet is received as link level broadcast/multicast/promiscuous.\r
 //\r
-#define IP4_LINK_BROADCAST    0x00000001\r
-#define IP4_LINK_MULTICAST    0x00000002\r
-#define IP4_LINK_PROMISC      0x00000004\r
+#define IP4_LINK_BROADCAST  0x00000001\r
+#define IP4_LINK_MULTICAST  0x00000002\r
+#define IP4_LINK_PROMISC    0x00000004\r
 \r
 //\r
 // IP4 address cast type classification. Keep it true that any\r
@@ -40,10 +40,10 @@ typedef struct _IP4_SERVICE    IP4_SERVICE;
 #define IP4_HEAD_MF_MASK      0x2000\r
 #define IP4_HEAD_OFFSET_MASK  0x1fff\r
 \r
-#define IP4_ALLZERO_ADDRESS   0x00000000u\r
-#define IP4_ALLONE_ADDRESS    0xFFFFFFFFu\r
-#define IP4_ALLSYSTEM_ADDRESS 0xE0000001u\r
-#define IP4_ALLROUTER_ADDRESS 0xE0000002u\r
+#define IP4_ALLZERO_ADDRESS    0x00000000u\r
+#define IP4_ALLONE_ADDRESS     0xFFFFFFFFu\r
+#define IP4_ALLSYSTEM_ADDRESS  0xE0000001u\r
+#define IP4_ALLROUTER_ADDRESS  0xE0000002u\r
 \r
 ///\r
 /// Compose the fragment field to be used in the IP4 header.\r
@@ -60,13 +60,13 @@ typedef struct _IP4_SERVICE    IP4_SERVICE;
 #define IP4_DO_NOT_FRAGMENT(FragmentField) \\r
           ((BOOLEAN)(((FragmentField) & IP4_HEAD_DF_MASK) == IP4_HEAD_DF_MASK))\r
 \r
-#define IP4_IS_BROADCAST(CastType) ((CastType) >= IP4_LOCAL_BROADCAST)\r
+#define IP4_IS_BROADCAST(CastType)  ((CastType) >= IP4_LOCAL_BROADCAST)\r
 \r
 ///\r
 /// Convert the Microsecond to second. IP transmit/receive time is\r
 /// in the unit of microsecond. IP ticks once per second.\r
 ///\r
-#define IP4_US_TO_SEC(Us) (((Us) + 999999) / 1000000)\r
+#define IP4_US_TO_SEC(Us)  (((Us) + 999999) / 1000000)\r
 \r
 /**\r
   Return the cast type (Unicast/Broadcast) specific to an\r
@@ -85,8 +85,8 @@ typedef struct _IP4_SERVICE    IP4_SERVICE;
 **/\r
 INTN\r
 Ip4GetNetCast (\r
-  IN  IP4_ADDR          IpAddr,\r
-  IN  IP4_INTERFACE     *IpIf\r
+  IN  IP4_ADDR       IpAddr,\r
+  IN  IP4_INTERFACE  *IpIf\r
   );\r
 \r
 /**\r
@@ -107,9 +107,9 @@ Ip4GetNetCast (
 **/\r
 INTN\r
 Ip4GetHostCast (\r
-  IN  IP4_SERVICE       *IpSb,\r
-  IN  IP4_ADDR          Dst,\r
-  IN  IP4_ADDR          Src\r
+  IN  IP4_SERVICE  *IpSb,\r
+  IN  IP4_ADDR     Dst,\r
+  IN  IP4_ADDR     Src\r
   );\r
 \r
 /**\r
@@ -123,8 +123,8 @@ Ip4GetHostCast (
 **/\r
 IP4_INTERFACE *\r
 Ip4FindInterface (\r
-  IN IP4_SERVICE        *IpSb,\r
-  IN IP4_ADDR           Ip\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_ADDR     Ip\r
   );\r
 \r
 /**\r
@@ -138,8 +138,8 @@ Ip4FindInterface (
 **/\r
 IP4_INTERFACE *\r
 Ip4FindNet (\r
-  IN IP4_SERVICE        *IpSb,\r
-  IN IP4_ADDR           Ip\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_ADDR     Ip\r
   );\r
 \r
 /**\r
@@ -154,9 +154,9 @@ Ip4FindNet (
 **/\r
 IP4_INTERFACE *\r
 Ip4FindStationAddress (\r
-  IN IP4_SERVICE        *IpSb,\r
-  IN IP4_ADDR           Ip,\r
-  IN IP4_ADDR           Netmask\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_ADDR     Ip,\r
+  IN IP4_ADDR     Netmask\r
   );\r
 \r
 /**\r
@@ -175,9 +175,9 @@ Ip4FindStationAddress (
 **/\r
 EFI_STATUS\r
 Ip4GetMulticastMac (\r
-  IN  EFI_MANAGED_NETWORK_PROTOCOL *Mnp,\r
-  IN  IP4_ADDR                     Multicast,\r
-  OUT EFI_MAC_ADDRESS              *Mac\r
+  IN  EFI_MANAGED_NETWORK_PROTOCOL  *Mnp,\r
+  IN  IP4_ADDR                      Multicast,\r
+  OUT EFI_MAC_ADDRESS               *Mac\r
   );\r
 \r
 /**\r
@@ -192,10 +192,9 @@ Ip4GetMulticastMac (
 **/\r
 IP4_HEAD *\r
 Ip4NtohHead (\r
-  IN IP4_HEAD           *Head\r
+  IN IP4_HEAD  *Head\r
   );\r
 \r
-\r
 /**\r
   Validate that Ip/Netmask pair is OK to be used as station\r
   address. Only continuous netmasks are supported. and check\r
@@ -210,8 +209,8 @@ Ip4NtohHead (
 **/\r
 BOOLEAN\r
 Ip4StationAddressValid (\r
-  IN IP4_ADDR               Ip,\r
-  IN IP4_ADDR               Netmask\r
+  IN IP4_ADDR  Ip,\r
+  IN IP4_ADDR  Netmask\r
   );\r
 \r
 #endif\r
index 9cfad5916d1037cc8451cf65f8fd8023a78eede0..0d9f8a8fe62bceb5afc311eb17a6e03717494f5b 100644 (file)
@@ -10,7 +10,7 @@
 \r
 #include "Ip4Impl.h"\r
 \r
-LIST_ENTRY  mIp4Config2InstanceList = {&mIp4Config2InstanceList, &mIp4Config2InstanceList};\r
+LIST_ENTRY  mIp4Config2InstanceList = { &mIp4Config2InstanceList, &mIp4Config2InstanceList };\r
 \r
 /**\r
   The event process routine when the DHCPv4 service binding protocol is installed\r
@@ -41,9 +41,9 @@ Ip4Config2DestroyDhcp4 (
   IN OUT IP4_CONFIG2_INSTANCE  *Instance\r
   )\r
 {\r
-  IP4_SERVICE                 *IpSb;\r
-  EFI_STATUS                  Status;\r
-  EFI_DHCP4_PROTOCOL          *Dhcp4;\r
+  IP4_SERVICE         *IpSb;\r
+  EFI_STATUS          Status;\r
+  EFI_DHCP4_PROTOCOL  *Dhcp4;\r
 \r
   Dhcp4 = Instance->Dhcp4;\r
   ASSERT (Dhcp4 != NULL);\r
@@ -90,12 +90,12 @@ Ip4Config2DestroyDhcp4 (
 **/\r
 VOID\r
 Ip4Config2OnPolicyChanged (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN EFI_IP4_CONFIG2_POLICY NewPolicy\r
+  IN IP4_SERVICE             *IpSb,\r
+  IN EFI_IP4_CONFIG2_POLICY  NewPolicy\r
   )\r
 {\r
-  IP4_INTERFACE   *IpIf;\r
-  IP4_ROUTE_TABLE *RouteTable;\r
+  IP4_INTERFACE    *IpIf;\r
+  IP4_ROUTE_TABLE  *RouteTable;\r
 \r
   //\r
   // Currently there are only two policies: static and dhcp. Regardless of\r
@@ -122,21 +122,21 @@ Ip4Config2OnPolicyChanged (
   //\r
   IpIf = Ip4CreateInterface (IpSb->Mnp, IpSb->Controller, IpSb->Image);\r
   if (IpIf == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   RouteTable = Ip4CreateRouteTable ();\r
   if (RouteTable == NULL) {\r
     Ip4FreeInterface (IpIf, NULL);\r
-    return ;\r
+    return;\r
   }\r
 \r
-  IpSb->DefaultInterface  = IpIf;\r
+  IpSb->DefaultInterface = IpIf;\r
   InsertHeadList (&IpSb->Interfaces, &IpIf->Link);\r
   IpSb->DefaultRouteTable = RouteTable;\r
   Ip4ReceiveFrame (IpIf, NULL, Ip4AccpetFrame, IpSb);\r
 \r
-  if (IpSb->State == IP4_SERVICE_CONFIGED || IpSb->State == IP4_SERVICE_STARTED) {\r
+  if ((IpSb->State == IP4_SERVICE_CONFIGED) || (IpSb->State == IP4_SERVICE_STARTED)) {\r
     IpSb->State = IP4_SERVICE_UNSTARTED;\r
   }\r
 \r
@@ -146,7 +146,6 @@ Ip4Config2OnPolicyChanged (
   if (NewPolicy == Ip4Config2PolicyDhcp) {\r
     Ip4StartAutoConfig (&IpSb->Ip4Config2Instance);\r
   }\r
-\r
 }\r
 \r
 /**\r
@@ -161,12 +160,12 @@ Ip4Config2OnPolicyChanged (
 EFI_STATUS\r
 EFIAPI\r
 Ip4Config2SignalEvent (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Arg\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Arg\r
   )\r
 {\r
-  gBS->SignalEvent ((EFI_EVENT) Item->Key);\r
+  gBS->SignalEvent ((EFI_EVENT)Item->Key);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -187,17 +186,17 @@ Ip4Config2SignalEvent (
 **/\r
 EFI_STATUS\r
 Ip4Config2ReadConfigData (\r
-  IN     CHAR16               *VarName,\r
-  IN OUT IP4_CONFIG2_INSTANCE *Instance\r
+  IN     CHAR16                *VarName,\r
+  IN OUT IP4_CONFIG2_INSTANCE  *Instance\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
-  UINTN                   VarSize;\r
-  IP4_CONFIG2_VARIABLE    *Variable;\r
-  IP4_CONFIG2_DATA_ITEM   *DataItem;\r
-  UINTN                   Index;\r
-  IP4_CONFIG2_DATA_RECORD DataRecord;\r
-  CHAR8                   *Data;\r
+  EFI_STATUS               Status;\r
+  UINTN                    VarSize;\r
+  IP4_CONFIG2_VARIABLE     *Variable;\r
+  IP4_CONFIG2_DATA_ITEM    *DataItem;\r
+  UINTN                    Index;\r
+  IP4_CONFIG2_DATA_RECORD  DataRecord;\r
+  CHAR8                    *Data;\r
 \r
   //\r
   // Try to read the configuration variable.\r
@@ -227,7 +226,7 @@ Ip4Config2ReadConfigData (
                     &VarSize,\r
                     Variable\r
                     );\r
-    if (EFI_ERROR (Status) || (UINT16) (~NetblockChecksum ((UINT8 *) Variable, (UINT32) VarSize)) != 0) {\r
+    if (EFI_ERROR (Status) || ((UINT16)(~NetblockChecksum ((UINT8 *)Variable, (UINT32)VarSize)) != 0)) {\r
       //\r
       // GetVariable still error or the variable is corrupted.\r
       // Fall back to the default value.\r
@@ -249,15 +248,14 @@ Ip4Config2ReadConfigData (
       return EFI_NOT_FOUND;\r
     }\r
 \r
-\r
     for (Index = 0; Index < Variable->DataRecordCount; Index++) {\r
-\r
       CopyMem (&DataRecord, &Variable->DataRecord[Index], sizeof (DataRecord));\r
 \r
       DataItem = &Instance->DataItem[DataRecord.DataType];\r
       if (DATA_ATTRIB_SET (DataItem->Attribute, DATA_ATTRIB_SIZE_FIXED) &&\r
           (DataItem->DataSize != DataRecord.DataSize)\r
-          ) {\r
+          )\r
+      {\r
         //\r
         // Perhaps a corrupted data record...\r
         //\r
@@ -277,7 +275,7 @@ Ip4Config2ReadConfigData (
         }\r
       }\r
 \r
-      Data = (CHAR8 *) Variable + DataRecord.Offset;\r
+      Data = (CHAR8 *)Variable + DataRecord.Offset;\r
       CopyMem (DataItem->Data.Ptr, Data, DataRecord.DataSize);\r
 \r
       DataItem->DataSize = DataRecord.DataSize;\r
@@ -303,25 +301,23 @@ Ip4Config2ReadConfigData (
 **/\r
 EFI_STATUS\r
 Ip4Config2WriteConfigData (\r
-  IN CHAR16               *VarName,\r
-  IN IP4_CONFIG2_INSTANCE *Instance\r
+  IN CHAR16                *VarName,\r
+  IN IP4_CONFIG2_INSTANCE  *Instance\r
   )\r
 {\r
-  UINTN                   Index;\r
-  UINTN                   VarSize;\r
-  IP4_CONFIG2_DATA_ITEM   *DataItem;\r
-  IP4_CONFIG2_VARIABLE    *Variable;\r
-  IP4_CONFIG2_DATA_RECORD *DataRecord;\r
-  CHAR8                   *Heap;\r
-  EFI_STATUS              Status;\r
+  UINTN                    Index;\r
+  UINTN                    VarSize;\r
+  IP4_CONFIG2_DATA_ITEM    *DataItem;\r
+  IP4_CONFIG2_VARIABLE     *Variable;\r
+  IP4_CONFIG2_DATA_RECORD  *DataRecord;\r
+  CHAR8                    *Heap;\r
+  EFI_STATUS               Status;\r
 \r
   VarSize = sizeof (IP4_CONFIG2_VARIABLE) - sizeof (IP4_CONFIG2_DATA_RECORD);\r
 \r
   for (Index = 0; Index < Ip4Config2DataTypeMaximum; Index++) {\r
-\r
     DataItem = &Instance->DataItem[Index];\r
     if (!DATA_ATTRIB_SET (DataItem->Attribute, DATA_ATTRIB_VOLATILE) && !EFI_ERROR (DataItem->Status)) {\r
-\r
       VarSize += sizeof (IP4_CONFIG2_DATA_RECORD) + DataItem->DataSize;\r
     }\r
   }\r
@@ -331,28 +327,26 @@ Ip4Config2WriteConfigData (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Heap                      = (CHAR8 *) Variable + VarSize;\r
+  Heap                      = (CHAR8 *)Variable + VarSize;\r
   Variable->DataRecordCount = 0;\r
 \r
   for (Index = 0; Index < Ip4Config2DataTypeMaximum; Index++) {\r
-\r
     DataItem = &Instance->DataItem[Index];\r
     if (!DATA_ATTRIB_SET (DataItem->Attribute, DATA_ATTRIB_VOLATILE) && !EFI_ERROR (DataItem->Status)) {\r
-\r
       Heap -= DataItem->DataSize;\r
       CopyMem (Heap, DataItem->Data.Ptr, DataItem->DataSize);\r
 \r
       DataRecord           = &Variable->DataRecord[Variable->DataRecordCount];\r
-      DataRecord->DataType = (EFI_IP4_CONFIG2_DATA_TYPE) Index;\r
-      DataRecord->DataSize = (UINT32) DataItem->DataSize;\r
-      DataRecord->Offset   = (UINT16) (Heap - (CHAR8 *) Variable);\r
+      DataRecord->DataType = (EFI_IP4_CONFIG2_DATA_TYPE)Index;\r
+      DataRecord->DataSize = (UINT32)DataItem->DataSize;\r
+      DataRecord->Offset   = (UINT16)(Heap - (CHAR8 *)Variable);\r
 \r
       Variable->DataRecordCount++;\r
     }\r
   }\r
 \r
   Variable->Checksum = 0;\r
-  Variable->Checksum = (UINT16) ~NetblockChecksum ((UINT8 *) Variable, (UINT32) VarSize);\r
+  Variable->Checksum = (UINT16) ~NetblockChecksum ((UINT8 *)Variable, (UINT32)VarSize);\r
 \r
   Status = gRT->SetVariable (\r
                   VarName,\r
@@ -367,7 +361,6 @@ Ip4Config2WriteConfigData (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Build a EFI_IP4_ROUTE_TABLE to be returned to the caller of GetModeData.\r
   The EFI_IP4_ROUTE_TABLE is clumsy to use in the internal operation of the\r
@@ -382,14 +375,14 @@ Ip4Config2WriteConfigData (
 **/\r
 EFI_STATUS\r
 Ip4Config2BuildDefaultRouteTable (\r
-  IN  IP4_SERVICE               *IpSb,\r
-  OUT EFI_IP4_ROUTE_TABLE       *Table\r
+  IN  IP4_SERVICE          *IpSb,\r
+  OUT EFI_IP4_ROUTE_TABLE  *Table\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  IP4_ROUTE_ENTRY           *RtEntry;\r
-  UINT32                    Count;\r
-  INT32                     Index;\r
+  LIST_ENTRY       *Entry;\r
+  IP4_ROUTE_ENTRY  *RtEntry;\r
+  UINT32           Count;\r
+  INT32            Index;\r
 \r
   if (IpSb->DefaultRouteTable == NULL) {\r
     return EFI_NOT_FOUND;\r
@@ -410,7 +403,6 @@ Ip4Config2BuildDefaultRouteTable (
   Count = 0;\r
 \r
   for (Index = IP4_MASK_MAX; Index >= 0; Index--) {\r
-\r
     NET_LIST_FOR_EACH (Entry, &(IpSb->DefaultRouteTable->RouteArea[Index])) {\r
       RtEntry = NET_LIST_USER_STRUCT (Entry, IP4_ROUTE_ENTRY, Link);\r
 \r
@@ -420,7 +412,6 @@ Ip4Config2BuildDefaultRouteTable (
 \r
       Count++;\r
     }\r
-\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -443,13 +434,13 @@ Ip4Config2OnDhcp4SbInstalled (
 {\r
   IP4_CONFIG2_INSTANCE  *Instance;\r
 \r
-  Instance = (IP4_CONFIG2_INSTANCE *) Context;\r
+  Instance = (IP4_CONFIG2_INSTANCE *)Context;\r
 \r
   if ((Instance->Dhcp4Handle != NULL) || (Instance->Policy != Ip4Config2PolicyDhcp)) {\r
     //\r
     // The DHCP4 child is already created or the policy is no longer DHCP.\r
     //\r
-    return ;\r
+    return;\r
   }\r
 \r
   Ip4StartAutoConfig (Instance);\r
@@ -468,18 +459,18 @@ Ip4Config2OnDhcp4SbInstalled (
 **/\r
 EFI_STATUS\r
 Ip4Config2SetDefaultAddr (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_ADDR               StationAddress,\r
-  IN IP4_ADDR               SubnetMask\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_ADDR     StationAddress,\r
+  IN IP4_ADDR     SubnetMask\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  IP4_INTERFACE             *IpIf;\r
-  IP4_PROTOCOL              *Ip4Instance;\r
-  EFI_ARP_PROTOCOL          *Arp;\r
-  LIST_ENTRY                *Entry;\r
-  IP4_ADDR                  Subnet;\r
-  IP4_ROUTE_TABLE           *RouteTable;\r
+  EFI_STATUS        Status;\r
+  IP4_INTERFACE     *IpIf;\r
+  IP4_PROTOCOL      *Ip4Instance;\r
+  EFI_ARP_PROTOCOL  *Arp;\r
+  LIST_ENTRY        *Entry;\r
+  IP4_ADDR          Subnet;\r
+  IP4_ROUTE_TABLE   *RouteTable;\r
 \r
   IpIf = IpSb->DefaultInterface;\r
   ASSERT (IpIf != NULL);\r
@@ -515,7 +506,7 @@ Ip4Config2SetDefaultAddr (
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
-    IpSb->DefaultInterface  = IpIf;\r
+    IpSb->DefaultInterface = IpIf;\r
     InsertHeadList (&IpSb->Interfaces, &IpIf->Link);\r
     IpSb->DefaultRouteTable = RouteTable;\r
     Ip4ReceiveFrame (IpIf, NULL, Ip4AccpetFrame, IpSb);\r
@@ -539,14 +530,14 @@ Ip4Config2SetDefaultAddr (
     Arp = NULL;\r
     NET_LIST_FOR_EACH (Entry, &IpIf->IpInstances) {\r
       Ip4Instance = NET_LIST_USER_STRUCT_S (Entry, IP4_PROTOCOL, AddrLink, IP4_PROTOCOL_SIGNATURE);\r
-      Status = gBS->OpenProtocol (\r
-                      IpIf->ArpHandle,\r
-                      &gEfiArpProtocolGuid,\r
-                      (VOID **) &Arp,\r
-                      gIp4DriverBinding.DriverBindingHandle,\r
-                      Ip4Instance->Handle,\r
-                      EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
-                      );\r
+      Status      = gBS->OpenProtocol (\r
+                           IpIf->ArpHandle,\r
+                           &gEfiArpProtocolGuid,\r
+                           (VOID **)&Arp,\r
+                           gIp4DriverBinding.DriverBindingHandle,\r
+                           Ip4Instance->Handle,\r
+                           EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+                           );\r
       if (EFI_ERROR (Status)) {\r
         return Status;\r
       }\r
@@ -565,7 +556,7 @@ Ip4Config2SetDefaultAddr (
     IP4_ALLZERO_ADDRESS\r
     );\r
 \r
-  IpSb->State = IP4_SERVICE_CONFIGED;\r
+  IpSb->State    = IP4_SERVICE_CONFIGED;\r
   IpSb->Reconfig = FALSE;\r
 \r
   return EFI_SUCCESS;\r
@@ -585,14 +576,14 @@ Ip4Config2SetDefaultAddr (
 **/\r
 EFI_STATUS\r
 Ip4Config2SetDefaultIf (\r
-  IN IP4_CONFIG2_INSTANCE   *Instance,\r
-  IN IP4_ADDR               StationAddress,\r
-  IN IP4_ADDR               SubnetMask,\r
-  IN IP4_ADDR               GatewayAddress\r
+  IN IP4_CONFIG2_INSTANCE  *Instance,\r
+  IN IP4_ADDR              StationAddress,\r
+  IN IP4_ADDR              SubnetMask,\r
+  IN IP4_ADDR              GatewayAddress\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  IP4_SERVICE               *IpSb;\r
+  EFI_STATUS   Status;\r
+  IP4_SERVICE  *IpSb;\r
 \r
   IpSb = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);\r
 \r
@@ -623,7 +614,6 @@ Ip4Config2SetDefaultIf (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Release all the DHCP related resources.\r
 \r
@@ -634,10 +624,10 @@ Ip4Config2SetDefaultIf (
 **/\r
 VOID\r
 Ip4Config2CleanDhcp4 (\r
-  IN IP4_CONFIG2_INSTANCE   *Instance\r
+  IN IP4_CONFIG2_INSTANCE  *Instance\r
   )\r
 {\r
-  IP4_SERVICE               *IpSb;\r
+  IP4_SERVICE  *IpSb;\r
 \r
   IpSb = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);\r
 \r
@@ -645,11 +635,11 @@ Ip4Config2CleanDhcp4 (
     Instance->Dhcp4->Stop (Instance->Dhcp4);\r
 \r
     gBS->CloseProtocol (\r
-          Instance->Dhcp4Handle,\r
-          &gEfiDhcp4ProtocolGuid,\r
-          IpSb->Image,\r
-          IpSb->Controller\r
-          );\r
+           Instance->Dhcp4Handle,\r
+           &gEfiDhcp4ProtocolGuid,\r
+           IpSb->Image,\r
+           IpSb->Controller\r
+           );\r
 \r
     Instance->Dhcp4 = NULL;\r
   }\r
@@ -692,28 +682,28 @@ Ip4Config2CleanDhcp4 (
 **/\r
 EFI_STATUS\r
 Ip4Config2SetDnsServerWorker (\r
-  IN IP4_CONFIG2_INSTANCE    *Instance,\r
-  IN UINTN                   DataSize,\r
-  IN VOID                    *Data\r
+  IN IP4_CONFIG2_INSTANCE  *Instance,\r
+  IN UINTN                 DataSize,\r
+  IN VOID                  *Data\r
   )\r
 {\r
-  UINTN                 OldIndex;\r
-  UINTN                 NewIndex;\r
-  EFI_IPv4_ADDRESS      *OldDns;\r
-  EFI_IPv4_ADDRESS      *NewDns;\r
-  UINTN                 OldDnsCount;\r
-  UINTN                 NewDnsCount;\r
-  IP4_CONFIG2_DATA_ITEM *Item;\r
-  BOOLEAN               OneAdded;\r
-  VOID                  *Tmp;\r
-  IP4_ADDR              DnsAddress;\r
+  UINTN                  OldIndex;\r
+  UINTN                  NewIndex;\r
+  EFI_IPv4_ADDRESS       *OldDns;\r
+  EFI_IPv4_ADDRESS       *NewDns;\r
+  UINTN                  OldDnsCount;\r
+  UINTN                  NewDnsCount;\r
+  IP4_CONFIG2_DATA_ITEM  *Item;\r
+  BOOLEAN                OneAdded;\r
+  VOID                   *Tmp;\r
+  IP4_ADDR               DnsAddress;\r
 \r
   if ((DataSize % sizeof (EFI_IPv4_ADDRESS) != 0) || (DataSize == 0)) {\r
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
   Item        = &Instance->DataItem[Ip4Config2DataTypeDnsServer];\r
-  NewDns      = (EFI_IPv4_ADDRESS *) Data;\r
+  NewDns      = (EFI_IPv4_ADDRESS *)Data;\r
   OldDns      = Item->Data.DnsServers;\r
   NewDnsCount = DataSize / sizeof (EFI_IPv4_ADDRESS);\r
   OldDnsCount = Item->DataSize / sizeof (EFI_IPv4_ADDRESS);\r
@@ -737,6 +727,7 @@ Ip4Config2SetDnsServerWorker (
       if (Tmp != NULL) {\r
         FreePool (Tmp);\r
       }\r
+\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
@@ -773,6 +764,7 @@ Ip4Config2SetDnsServerWorker (
       if (Item->Data.Ptr != NULL) {\r
         FreePool (Item->Data.Ptr);\r
       }\r
+\r
       Item->Data.Ptr = Tmp;\r
     }\r
 \r
@@ -783,8 +775,6 @@ Ip4Config2SetDnsServerWorker (
   }\r
 }\r
 \r
-\r
-\r
 /**\r
   Callback function when DHCP process finished. It will save the\r
   retrieved IP configure parameter from DHCP to the NVRam.\r
@@ -798,21 +788,21 @@ Ip4Config2SetDnsServerWorker (
 VOID\r
 EFIAPI\r
 Ip4Config2OnDhcp4Complete (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  IP4_CONFIG2_INSTANCE      *Instance;\r
-  EFI_DHCP4_MODE_DATA       Dhcp4Mode;\r
-  EFI_STATUS                Status;\r
-  IP4_ADDR                  StationAddress;\r
-  IP4_ADDR                  SubnetMask;\r
-  IP4_ADDR                  GatewayAddress;\r
-  UINT32                    Index;\r
-  UINT32                    OptionCount;\r
-  EFI_DHCP4_PACKET_OPTION   **OptionList;\r
-\r
-  Instance = (IP4_CONFIG2_INSTANCE *) Context;\r
+  IP4_CONFIG2_INSTANCE     *Instance;\r
+  EFI_DHCP4_MODE_DATA      Dhcp4Mode;\r
+  EFI_STATUS               Status;\r
+  IP4_ADDR                 StationAddress;\r
+  IP4_ADDR                 SubnetMask;\r
+  IP4_ADDR                 GatewayAddress;\r
+  UINT32                   Index;\r
+  UINT32                   OptionCount;\r
+  EFI_DHCP4_PACKET_OPTION  **OptionList;\r
+\r
+  Instance = (IP4_CONFIG2_INSTANCE *)Context;\r
   ASSERT (Instance->Dhcp4 != NULL);\r
 \r
   //\r
@@ -826,7 +816,7 @@ Ip4Config2OnDhcp4Complete (
 \r
   if (Dhcp4Mode.State == Dhcp4Bound) {\r
     StationAddress = EFI_NTOHL (Dhcp4Mode.ClientAddress);\r
-    SubnetMask = EFI_NTOHL (Dhcp4Mode.SubnetMask);\r
+    SubnetMask     = EFI_NTOHL (Dhcp4Mode.SubnetMask);\r
     GatewayAddress = EFI_NTOHL (Dhcp4Mode.RouterAddress);\r
 \r
     Status = Ip4Config2SetDefaultIf (Instance, StationAddress, SubnetMask, GatewayAddress);\r
@@ -840,7 +830,7 @@ Ip4Config2OnDhcp4Complete (
     OptionCount = 0;\r
     OptionList  = NULL;\r
 \r
-    Status      = Instance->Dhcp4->Parse (Instance->Dhcp4, Dhcp4Mode.ReplyPacket, &OptionCount, OptionList);\r
+    Status = Instance->Dhcp4->Parse (Instance->Dhcp4, Dhcp4Mode.ReplyPacket, &OptionCount, OptionList);\r
     if (Status != EFI_BUFFER_TOO_SMALL) {\r
       goto Exit;\r
     }\r
@@ -880,7 +870,6 @@ Exit:
   DispatchDpc ();\r
 }\r
 \r
-\r
 /**\r
   Start the DHCP configuration for this IP service instance.\r
   It will locates the EFI_IP4_CONFIG2_PROTOCOL, then start the\r
@@ -894,15 +883,15 @@ Exit:
 **/\r
 EFI_STATUS\r
 Ip4StartAutoConfig (\r
-  IN IP4_CONFIG2_INSTANCE   *Instance\r
+  IN IP4_CONFIG2_INSTANCE  *Instance\r
   )\r
 {\r
-  IP4_SERVICE                    *IpSb;\r
-  EFI_DHCP4_PROTOCOL             *Dhcp4;\r
-  EFI_DHCP4_MODE_DATA            Dhcp4Mode;\r
-  EFI_DHCP4_PACKET_OPTION        *OptionList[1];\r
-  IP4_CONFIG2_DHCP4_OPTION       ParaList;\r
-  EFI_STATUS                     Status;\r
+  IP4_SERVICE               *IpSb;\r
+  EFI_DHCP4_PROTOCOL        *Dhcp4;\r
+  EFI_DHCP4_MODE_DATA       Dhcp4Mode;\r
+  EFI_DHCP4_PACKET_OPTION   *OptionList[1];\r
+  IP4_CONFIG2_DHCP4_OPTION  ParaList;\r
+  EFI_STATUS                Status;\r
 \r
   IpSb = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);\r
 \r
@@ -934,7 +923,7 @@ Ip4StartAutoConfig (
                                        &gEfiDhcp4ServiceBindingProtocolGuid,\r
                                        TPL_CALLBACK,\r
                                        Ip4Config2OnDhcp4SbInstalled,\r
-                                       (VOID *) Instance,\r
+                                       (VOID *)Instance,\r
                                        &Instance->Registration\r
                                        );\r
     }\r
@@ -951,7 +940,7 @@ Ip4StartAutoConfig (
   Status = gBS->OpenProtocol (\r
                   Instance->Dhcp4Handle,\r
                   &gEfiDhcp4ProtocolGuid,\r
-                  (VOID **) &Instance->Dhcp4,\r
+                  (VOID **)&Instance->Dhcp4,\r
                   IpSb->Image,\r
                   IpSb->Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -1048,8 +1037,6 @@ Ip4StartAutoConfig (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
-\r
 /**\r
   The work function is to get the interface information of the communication\r
   device this IP4_CONFIG2_INSTANCE manages.\r
@@ -1069,16 +1056,16 @@ Ip4StartAutoConfig (
 **/\r
 EFI_STATUS\r
 Ip4Config2GetIfInfo (\r
-  IN IP4_CONFIG2_INSTANCE *Instance,\r
-  IN OUT UINTN            *DataSize,\r
-  IN VOID                 *Data      OPTIONAL\r
+  IN IP4_CONFIG2_INSTANCE  *Instance,\r
+  IN OUT UINTN             *DataSize,\r
+  IN VOID                  *Data      OPTIONAL\r
   )\r
 {\r
-  IP4_SERVICE                    *IpSb;\r
-  UINTN                          Length;\r
-  IP4_CONFIG2_DATA_ITEM          *Item;\r
-  EFI_IP4_CONFIG2_INTERFACE_INFO *IfInfo;\r
-  IP4_ADDR                       Address;\r
+  IP4_SERVICE                     *IpSb;\r
+  UINTN                           Length;\r
+  IP4_CONFIG2_DATA_ITEM           *Item;\r
+  EFI_IP4_CONFIG2_INTERFACE_INFO  *IfInfo;\r
+  IP4_ADDR                        Address;\r
 \r
   IpSb   = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);\r
   Length = sizeof (EFI_IP4_CONFIG2_INTERFACE_INFO);\r
@@ -1095,8 +1082,8 @@ Ip4Config2GetIfInfo (
   //\r
   // Copy the fixed size part of the interface info.\r
   //\r
-  Item = &Instance->DataItem[Ip4Config2DataTypeInterfaceInfo];\r
-  IfInfo = (EFI_IP4_CONFIG2_INTERFACE_INFO *) Data;\r
+  Item   = &Instance->DataItem[Ip4Config2DataTypeInterfaceInfo];\r
+  IfInfo = (EFI_IP4_CONFIG2_INTERFACE_INFO *)Data;\r
   CopyMem (IfInfo, Item->Data.Ptr, sizeof (EFI_IP4_CONFIG2_INTERFACE_INFO));\r
 \r
   //\r
@@ -1111,7 +1098,7 @@ Ip4Config2GetIfInfo (
 \r
   if (IpSb->DefaultRouteTable != NULL) {\r
     IfInfo->RouteTableSize = IpSb->DefaultRouteTable->TotalNum;\r
-    IfInfo->RouteTable   = (EFI_IP4_ROUTE_TABLE *) ((UINT8 *) Data + sizeof (EFI_IP4_CONFIG2_INTERFACE_INFO));\r
+    IfInfo->RouteTable     = (EFI_IP4_ROUTE_TABLE *)((UINT8 *)Data + sizeof (EFI_IP4_CONFIG2_INTERFACE_INFO));\r
 \r
     Ip4Config2BuildDefaultRouteTable (IpSb, IfInfo->RouteTable);\r
   }\r
@@ -1137,27 +1124,27 @@ Ip4Config2GetIfInfo (
 **/\r
 EFI_STATUS\r
 Ip4Config2SetPolicy (\r
-  IN IP4_CONFIG2_INSTANCE *Instance,\r
-  IN UINTN                DataSize,\r
-  IN VOID                 *Data\r
+  IN IP4_CONFIG2_INSTANCE  *Instance,\r
+  IN UINTN                 DataSize,\r
+  IN VOID                  *Data\r
   )\r
 {\r
-  EFI_IP4_CONFIG2_POLICY NewPolicy;\r
-  IP4_CONFIG2_DATA_ITEM  *DataItem;\r
-  IP4_SERVICE            *IpSb;\r
+  EFI_IP4_CONFIG2_POLICY  NewPolicy;\r
+  IP4_CONFIG2_DATA_ITEM   *DataItem;\r
+  IP4_SERVICE             *IpSb;\r
 \r
   if (DataSize != sizeof (EFI_IP4_CONFIG2_POLICY)) {\r
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
-  NewPolicy = *((EFI_IP4_CONFIG2_POLICY *) Data);\r
+  NewPolicy = *((EFI_IP4_CONFIG2_POLICY *)Data);\r
 \r
   if (NewPolicy >= Ip4Config2PolicyMax) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   if (NewPolicy == Instance->Policy) {\r
-    if (NewPolicy != Ip4Config2PolicyDhcp || Instance->DhcpSuccess) {\r
+    if ((NewPolicy != Ip4Config2PolicyDhcp) || Instance->DhcpSuccess) {\r
       return EFI_ABORTED;\r
     }\r
   } else {\r
@@ -1165,28 +1152,31 @@ Ip4Config2SetPolicy (
     // The policy is changed. Clean the ManualAddress, Gateway and DnsServers,\r
     // shrink the variable data size, and fire up all the related events.\r
     //\r
-    DataItem           = &Instance->DataItem[Ip4Config2DataTypeManualAddress];\r
+    DataItem = &Instance->DataItem[Ip4Config2DataTypeManualAddress];\r
     if (DataItem->Data.Ptr != NULL) {\r
       FreePool (DataItem->Data.Ptr);\r
     }\r
+\r
     DataItem->Data.Ptr = NULL;\r
     DataItem->DataSize = 0;\r
     DataItem->Status   = EFI_NOT_FOUND;\r
     NetMapIterate (&DataItem->EventMap, Ip4Config2SignalEvent, NULL);\r
 \r
-    DataItem           = &Instance->DataItem[Ip4Config2DataTypeGateway];\r
+    DataItem = &Instance->DataItem[Ip4Config2DataTypeGateway];\r
     if (DataItem->Data.Ptr != NULL) {\r
       FreePool (DataItem->Data.Ptr);\r
     }\r
+\r
     DataItem->Data.Ptr = NULL;\r
     DataItem->DataSize = 0;\r
     DataItem->Status   = EFI_NOT_FOUND;\r
     NetMapIterate (&DataItem->EventMap, Ip4Config2SignalEvent, NULL);\r
 \r
-    DataItem           = &Instance->DataItem[Ip4Config2DataTypeDnsServer];\r
+    DataItem = &Instance->DataItem[Ip4Config2DataTypeDnsServer];\r
     if (DataItem->Data.Ptr != NULL) {\r
       FreePool (DataItem->Data.Ptr);\r
     }\r
+\r
     DataItem->Data.Ptr = NULL;\r
     DataItem->DataSize = 0;\r
     DataItem->Status   = EFI_NOT_FOUND;\r
@@ -1244,20 +1234,20 @@ Ip4Config2SetPolicy (
 **/\r
 EFI_STATUS\r
 Ip4Config2SetManualAddress (\r
-  IN IP4_CONFIG2_INSTANCE *Instance,\r
-  IN UINTN                DataSize,\r
-  IN VOID                 *Data\r
+  IN IP4_CONFIG2_INSTANCE  *Instance,\r
+  IN UINTN                 DataSize,\r
+  IN VOID                  *Data\r
   )\r
 {\r
-  EFI_IP4_CONFIG2_MANUAL_ADDRESS NewAddress;\r
-  IP4_CONFIG2_DATA_ITEM          *DataItem;\r
-  EFI_STATUS                     Status;\r
-  IP4_ADDR                       StationAddress;\r
-  IP4_ADDR                       SubnetMask;\r
-  VOID                           *Ptr;\r
-  IP4_SERVICE                    *IpSb;\r
-  IP4_INTERFACE                  *IpIf;\r
-  IP4_ROUTE_TABLE                *RouteTable;\r
+  EFI_IP4_CONFIG2_MANUAL_ADDRESS  NewAddress;\r
+  IP4_CONFIG2_DATA_ITEM           *DataItem;\r
+  EFI_STATUS                      Status;\r
+  IP4_ADDR                        StationAddress;\r
+  IP4_ADDR                        SubnetMask;\r
+  VOID                            *Ptr;\r
+  IP4_SERVICE                     *IpSb;\r
+  IP4_INTERFACE                   *IpIf;\r
+  IP4_ROUTE_TABLE                 *RouteTable;\r
 \r
   DataItem   = NULL;\r
   Status     = EFI_SUCCESS;\r
@@ -1279,11 +1269,11 @@ Ip4Config2SetManualAddress (
 \r
   DataItem = &Instance->DataItem[Ip4Config2DataTypeManualAddress];\r
 \r
-  if (Data != NULL && DataSize != 0) {\r
-    NewAddress = *((EFI_IP4_CONFIG2_MANUAL_ADDRESS *) Data);\r
+  if ((Data != NULL) && (DataSize != 0)) {\r
+    NewAddress = *((EFI_IP4_CONFIG2_MANUAL_ADDRESS *)Data);\r
 \r
     StationAddress = EFI_NTOHL (NewAddress.Address);\r
-    SubnetMask = EFI_NTOHL (NewAddress.SubnetMask);\r
+    SubnetMask     = EFI_NTOHL (NewAddress.SubnetMask);\r
 \r
     //\r
     // Check whether the StationAddress/SubnetMask pair is valid.\r
@@ -1310,14 +1300,15 @@ Ip4Config2SetManualAddress (
     DataItem->Status   = EFI_NOT_READY;\r
 \r
     IpSb->Reconfig = TRUE;\r
-    Status = Ip4Config2SetDefaultAddr (IpSb, StationAddress, SubnetMask);\r
+    Status         = Ip4Config2SetDefaultAddr (IpSb, StationAddress, SubnetMask);\r
 \r
     DataItem->Status = Status;\r
 \r
-    if (EFI_ERROR (DataItem->Status) && DataItem->Status != EFI_NOT_READY) {\r
+    if (EFI_ERROR (DataItem->Status) && (DataItem->Status != EFI_NOT_READY)) {\r
       if (Ptr != NULL) {\r
         FreePool (Ptr);\r
       }\r
+\r
       DataItem->Data.Ptr = NULL;\r
     }\r
   } else {\r
@@ -1327,6 +1318,7 @@ Ip4Config2SetManualAddress (
     if (DataItem->Data.Ptr != NULL) {\r
       FreePool (DataItem->Data.Ptr);\r
     }\r
+\r
     DataItem->Data.Ptr = NULL;\r
     DataItem->DataSize = 0;\r
     DataItem->Status   = EFI_NOT_FOUND;\r
@@ -1362,7 +1354,7 @@ Ip4Config2SetManualAddress (
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
-    IpSb->DefaultInterface  = IpIf;\r
+    IpSb->DefaultInterface = IpIf;\r
     InsertHeadList (&IpSb->Interfaces, &IpIf->Link);\r
     IpSb->DefaultRouteTable = RouteTable;\r
     Ip4ReceiveFrame (IpIf, NULL, Ip4AccpetFrame, IpSb);\r
@@ -1370,7 +1362,7 @@ Ip4Config2SetManualAddress (
     //\r
     // Reset the State to unstarted.\r
     //\r
-    if (IpSb->State == IP4_SERVICE_CONFIGED || IpSb->State == IP4_SERVICE_STARTED) {\r
+    if ((IpSb->State == IP4_SERVICE_CONFIGED) || (IpSb->State == IP4_SERVICE_STARTED)) {\r
       IpSb->State = IP4_SERVICE_UNSTARTED;\r
     }\r
   }\r
@@ -1402,30 +1394,30 @@ Ip4Config2SetManualAddress (
 **/\r
 EFI_STATUS\r
 Ip4Config2SetGateway (\r
-  IN IP4_CONFIG2_INSTANCE *Instance,\r
-  IN UINTN                DataSize,\r
-  IN VOID                 *Data\r
+  IN IP4_CONFIG2_INSTANCE  *Instance,\r
+  IN UINTN                 DataSize,\r
+  IN VOID                  *Data\r
   )\r
 {\r
-  IP4_SERVICE                    *IpSb;\r
-  IP4_CONFIG2_DATA_ITEM          *DataItem;\r
-  IP4_ADDR                       Gateway;\r
-\r
-  UINTN                 Index1;\r
-  UINTN                 Index2;\r
-  EFI_IPv4_ADDRESS      *OldGateway;\r
-  EFI_IPv4_ADDRESS      *NewGateway;\r
-  UINTN                 OldGatewayCount;\r
-  UINTN                 NewGatewayCount;\r
-  BOOLEAN               OneRemoved;\r
-  BOOLEAN               OneAdded;\r
-  VOID                  *Tmp;\r
-\r
-  OldGateway      = NULL;\r
-  NewGateway      = NULL;\r
-  OneRemoved      = FALSE;\r
-  OneAdded        = FALSE;\r
-  Tmp             = NULL;\r
+  IP4_SERVICE            *IpSb;\r
+  IP4_CONFIG2_DATA_ITEM  *DataItem;\r
+  IP4_ADDR               Gateway;\r
+\r
+  UINTN             Index1;\r
+  UINTN             Index2;\r
+  EFI_IPv4_ADDRESS  *OldGateway;\r
+  EFI_IPv4_ADDRESS  *NewGateway;\r
+  UINTN             OldGatewayCount;\r
+  UINTN             NewGatewayCount;\r
+  BOOLEAN           OneRemoved;\r
+  BOOLEAN           OneAdded;\r
+  VOID              *Tmp;\r
+\r
+  OldGateway = NULL;\r
+  NewGateway = NULL;\r
+  OneRemoved = FALSE;\r
+  OneAdded   = FALSE;\r
+  Tmp        = NULL;\r
 \r
   if ((DataSize != 0) && (DataSize % sizeof (EFI_IPv4_ADDRESS) != 0)) {\r
     return EFI_BAD_BUFFER_SIZE;\r
@@ -1455,14 +1447,15 @@ Ip4Config2SetGateway (
     OneRemoved = TRUE;\r
   }\r
 \r
-  if (Data != NULL && DataSize != 0) {\r
-    NewGateway      = (EFI_IPv4_ADDRESS *) Data;\r
+  if ((Data != NULL) && (DataSize != 0)) {\r
+    NewGateway      = (EFI_IPv4_ADDRESS *)Data;\r
     NewGatewayCount = DataSize / sizeof (EFI_IPv4_ADDRESS);\r
     for (Index1 = 0; Index1 < NewGatewayCount; Index1++) {\r
       CopyMem (&Gateway, NewGateway + Index1, sizeof (IP4_ADDR));\r
 \r
       if ((IpSb->DefaultInterface->SubnetMask != 0) &&\r
-          !NetIp4IsUnicast (NTOHL (Gateway), IpSb->DefaultInterface->SubnetMask)) {\r
+          !NetIp4IsUnicast (NTOHL (Gateway), IpSb->DefaultInterface->SubnetMask))\r
+      {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
 \r
@@ -1505,6 +1498,7 @@ Ip4Config2SetGateway (
         if (DataItem->Data.Ptr != NULL) {\r
           FreePool (DataItem->Data.Ptr);\r
         }\r
+\r
         DataItem->Data.Ptr = Tmp;\r
       }\r
 \r
@@ -1519,6 +1513,7 @@ Ip4Config2SetGateway (
     if (DataItem->Data.Ptr != NULL) {\r
       FreePool (DataItem->Data.Ptr);\r
     }\r
+\r
     DataItem->Data.Ptr = NULL;\r
     DataItem->DataSize = 0;\r
     DataItem->Status   = EFI_NOT_FOUND;\r
@@ -1551,13 +1546,13 @@ Ip4Config2SetGateway (
 **/\r
 EFI_STATUS\r
 Ip4Config2SetDnsServer (\r
-  IN IP4_CONFIG2_INSTANCE *Instance,\r
-  IN UINTN                DataSize,\r
-  IN VOID                 *Data\r
+  IN IP4_CONFIG2_INSTANCE  *Instance,\r
+  IN UINTN                 DataSize,\r
+  IN VOID                  *Data\r
   )\r
 {\r
-  EFI_STATUS                     Status;\r
-  IP4_CONFIG2_DATA_ITEM          *Item;\r
+  EFI_STATUS             Status;\r
+  IP4_CONFIG2_DATA_ITEM  *Item;\r
 \r
   Status = EFI_SUCCESS;\r
   Item   = NULL;\r
@@ -1572,7 +1567,7 @@ Ip4Config2SetDnsServer (
     REMOVE_DATA_ATTRIB (Item->Attribute, DATA_ATTRIB_VOLATILE);\r
   }\r
 \r
-  if (Data != NULL && DataSize != 0) {\r
+  if ((Data != NULL) && (DataSize != 0)) {\r
     Status = Ip4Config2SetDnsServerWorker (Instance, DataSize, Data);\r
   } else {\r
     //\r
@@ -1581,6 +1576,7 @@ Ip4Config2SetDnsServer (
     if (Item->Data.Ptr != NULL) {\r
       FreePool (Item->Data.Ptr);\r
     }\r
+\r
     Item->Data.Ptr = NULL;\r
     Item->DataSize = 0;\r
     Item->Status   = EFI_NOT_FOUND;\r
@@ -1599,8 +1595,8 @@ Ip4Config2SetDnsServer (
 **/\r
 VOID\r
 Ip4Config2InitIfInfo (\r
-  IN  IP4_SERVICE                    *IpSb,\r
-  OUT EFI_IP4_CONFIG2_INTERFACE_INFO *IfInfo\r
+  IN  IP4_SERVICE                     *IpSb,\r
+  OUT EFI_IP4_CONFIG2_INTERFACE_INFO  *IfInfo\r
   )\r
 {\r
   UnicodeSPrint (\r
@@ -1608,15 +1604,13 @@ Ip4Config2InitIfInfo (
     EFI_IP4_CONFIG2_INTERFACE_INFO_NAME_SIZE,\r
     L"eth%d",\r
     IpSb->Ip4Config2Instance.IfIndex\r
-  );\r
+    );\r
 \r
   IfInfo->IfType        = IpSb->SnpMode.IfType;\r
   IfInfo->HwAddressSize = IpSb->SnpMode.HwAddressSize;\r
   CopyMem (&IfInfo->HwAddress, &IpSb->SnpMode.CurrentAddress, IfInfo->HwAddressSize);\r
 }\r
 \r
-\r
-\r
 /**\r
   Set the configuration for the EFI IPv4 network stack running on the communication\r
   device this EFI_IP4_CONFIG2_PROTOCOL instance manages.\r
@@ -1673,12 +1667,12 @@ EfiIp4Config2SetData (
   IN VOID                       *Data\r
   )\r
 {\r
-  EFI_TPL              OldTpl;\r
-  EFI_STATUS           Status;\r
-  IP4_CONFIG2_INSTANCE *Instance;\r
-  IP4_SERVICE          *IpSb;\r
+  EFI_TPL               OldTpl;\r
+  EFI_STATUS            Status;\r
+  IP4_CONFIG2_INSTANCE  *Instance;\r
+  IP4_SERVICE           *IpSb;\r
 \r
-  if ((This == NULL) || (Data == NULL && DataSize != 0) || (Data != NULL && DataSize == 0)) {\r
+  if ((This == NULL) || ((Data == NULL) && (DataSize != 0)) || ((Data != NULL) && (DataSize == 0))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1690,19 +1684,16 @@ EfiIp4Config2SetData (
   IpSb     = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);\r
   NET_CHECK_SIGNATURE (IpSb, IP4_SERVICE_SIGNATURE);\r
 \r
-\r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   Status = Instance->DataItem[DataType].Status;\r
   if (Status != EFI_NOT_READY) {\r
-\r
     if (Instance->DataItem[DataType].SetData == NULL) {\r
       //\r
       // This type of data is readonly.\r
       //\r
       Status = EFI_WRITE_PROTECTED;\r
     } else {\r
-\r
       Status = Instance->DataItem[DataType].SetData (Instance, DataSize, Data);\r
       if (!EFI_ERROR (Status)) {\r
         //\r
@@ -1778,10 +1769,10 @@ EfiIp4Config2GetData (
   IN VOID                       *Data   OPTIONAL\r
   )\r
 {\r
-  EFI_TPL               OldTpl;\r
-  EFI_STATUS            Status;\r
-  IP4_CONFIG2_INSTANCE  *Instance;\r
-  IP4_CONFIG2_DATA_ITEM *DataItem;\r
+  EFI_TPL                OldTpl;\r
+  EFI_STATUS             Status;\r
+  IP4_CONFIG2_INSTANCE   *Instance;\r
+  IP4_CONFIG2_DATA_ITEM  *DataItem;\r
 \r
   if ((This == NULL) || (DataSize == NULL) || ((*DataSize != 0) && (Data == NULL))) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1796,11 +1787,9 @@ EfiIp4Config2GetData (
   Instance = IP4_CONFIG2_INSTANCE_FROM_PROTOCOL (This);\r
   DataItem = &Instance->DataItem[DataType];\r
 \r
-  Status   = Instance->DataItem[DataType].Status;\r
+  Status = Instance->DataItem[DataType].Status;\r
   if (!EFI_ERROR (Status)) {\r
-\r
     if (DataItem->GetData != NULL) {\r
-\r
       Status = DataItem->GetData (Instance, DataSize, Data);\r
     } else if (*DataSize < Instance->DataItem[DataType].DataSize) {\r
       //\r
@@ -1809,7 +1798,6 @@ EfiIp4Config2GetData (
       *DataSize = Instance->DataItem[DataType].DataSize;\r
       Status    = EFI_BUFFER_TOO_SMALL;\r
     } else {\r
-\r
       *DataSize = Instance->DataItem[DataType].DataSize;\r
       CopyMem (Data, Instance->DataItem[DataType].Data.Ptr, *DataSize);\r
     }\r
@@ -1850,11 +1838,11 @@ EfiIp4Config2RegisterDataNotify (
   IN EFI_EVENT                  Event\r
   )\r
 {\r
-  EFI_TPL              OldTpl;\r
-  EFI_STATUS           Status;\r
-  IP4_CONFIG2_INSTANCE *Instance;\r
-  NET_MAP              *EventMap;\r
-  NET_MAP_ITEM         *Item;\r
+  EFI_TPL               OldTpl;\r
+  EFI_STATUS            Status;\r
+  IP4_CONFIG2_INSTANCE  *Instance;\r
+  NET_MAP               *EventMap;\r
+  NET_MAP_ITEM          *Item;\r
 \r
   if ((This == NULL) || (Event == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1864,26 +1852,22 @@ EfiIp4Config2RegisterDataNotify (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  OldTpl    = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
-  Instance  = IP4_CONFIG2_INSTANCE_FROM_PROTOCOL (This);\r
-  EventMap  = &Instance->DataItem[DataType].EventMap;\r
+  Instance = IP4_CONFIG2_INSTANCE_FROM_PROTOCOL (This);\r
+  EventMap = &Instance->DataItem[DataType].EventMap;\r
 \r
   //\r
   // Check whether this event is already registered for this DataType.\r
   //\r
   Item = NetMapFindKey (EventMap, Event);\r
   if (Item == NULL) {\r
-\r
     Status = NetMapInsertTail (EventMap, Event, NULL);\r
 \r
     if (EFI_ERROR (Status)) {\r
-\r
       Status = EFI_OUT_OF_RESOURCES;\r
     }\r
-\r
   } else {\r
-\r
     Status = EFI_ACCESS_DENIED;\r
   }\r
 \r
@@ -1915,10 +1899,10 @@ EfiIp4Config2UnregisterDataNotify (
   IN EFI_EVENT                  Event\r
   )\r
 {\r
-  EFI_TPL              OldTpl;\r
-  EFI_STATUS           Status;\r
-  IP4_CONFIG2_INSTANCE *Instance;\r
-  NET_MAP_ITEM         *Item;\r
+  EFI_TPL               OldTpl;\r
+  EFI_STATUS            Status;\r
+  IP4_CONFIG2_INSTANCE  *Instance;\r
+  NET_MAP_ITEM          *Item;\r
 \r
   if ((This == NULL) || (Event == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1934,11 +1918,9 @@ EfiIp4Config2UnregisterDataNotify (
 \r
   Item = NetMapFindKey (&Instance->DataItem[DataType].EventMap, Event);\r
   if (Item != NULL) {\r
-\r
     NetMapRemoveItem (&Instance->DataItem[DataType].EventMap, Item, NULL);\r
     Status = EFI_SUCCESS;\r
   } else {\r
-\r
     Status = EFI_NOT_FOUND;\r
   }\r
 \r
@@ -1961,20 +1943,18 @@ Ip4Config2InitInstance (
   OUT IP4_CONFIG2_INSTANCE  *Instance\r
   )\r
 {\r
-  IP4_SERVICE           *IpSb;\r
-  IP4_CONFIG2_INSTANCE  *TmpInstance;\r
-  LIST_ENTRY            *Entry;\r
-  EFI_STATUS            Status;\r
-  UINTN                 Index;\r
-  UINT16                IfIndex;\r
-  IP4_CONFIG2_DATA_ITEM *DataItem;\r
-\r
+  IP4_SERVICE            *IpSb;\r
+  IP4_CONFIG2_INSTANCE   *TmpInstance;\r
+  LIST_ENTRY             *Entry;\r
+  EFI_STATUS             Status;\r
+  UINTN                  Index;\r
+  UINT16                 IfIndex;\r
+  IP4_CONFIG2_DATA_ITEM  *DataItem;\r
 \r
   IpSb = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);\r
 \r
   Instance->Signature = IP4_CONFIG2_INSTANCE_SIGNATURE;\r
 \r
-\r
   //\r
   // Determine the index of this interface.\r
   //\r
@@ -2002,7 +1982,6 @@ Ip4Config2InitInstance (
     NetMapInit (&Instance->DataItem[Index].EventMap);\r
   }\r
 \r
-\r
   //\r
   // Initialize each data type: associate storage and set data size for the\r
   // fixed size data types, hook the SetData function, set the data attribute.\r
@@ -2021,19 +2000,19 @@ Ip4Config2InitInstance (
   Instance->Policy   = Ip4Config2PolicyStatic;\r
   SET_DATA_ATTRIB (DataItem->Attribute, DATA_ATTRIB_SIZE_FIXED);\r
 \r
-  DataItem           = &Instance->DataItem[Ip4Config2DataTypeManualAddress];\r
-  DataItem->SetData  = Ip4Config2SetManualAddress;\r
-  DataItem->Status   = EFI_NOT_FOUND;\r
+  DataItem          = &Instance->DataItem[Ip4Config2DataTypeManualAddress];\r
+  DataItem->SetData = Ip4Config2SetManualAddress;\r
+  DataItem->Status  = EFI_NOT_FOUND;\r
 \r
-  DataItem           = &Instance->DataItem[Ip4Config2DataTypeGateway];\r
-  DataItem->SetData  = Ip4Config2SetGateway;\r
-  DataItem->Status   = EFI_NOT_FOUND;\r
+  DataItem          = &Instance->DataItem[Ip4Config2DataTypeGateway];\r
+  DataItem->SetData = Ip4Config2SetGateway;\r
+  DataItem->Status  = EFI_NOT_FOUND;\r
 \r
-  DataItem           = &Instance->DataItem[Ip4Config2DataTypeDnsServer];\r
-  DataItem->SetData  = Ip4Config2SetDnsServer;\r
-  DataItem->Status   = EFI_NOT_FOUND;\r
+  DataItem          = &Instance->DataItem[Ip4Config2DataTypeDnsServer];\r
+  DataItem->SetData = Ip4Config2SetDnsServer;\r
+  DataItem->Status  = EFI_NOT_FOUND;\r
 \r
-  Instance->Configured  = TRUE;\r
+  Instance->Configured = TRUE;\r
 \r
   //\r
   // Try to read the config data from NV variable.\r
@@ -2060,7 +2039,6 @@ Ip4Config2InitInstance (
   return Ip4Config2FormInit (Instance);\r
 }\r
 \r
-\r
 /**\r
   Release an IP4_CONFIG2_INSTANCE.\r
 \r
@@ -2072,19 +2050,18 @@ Ip4Config2CleanInstance (
   IN OUT IP4_CONFIG2_INSTANCE  *Instance\r
   )\r
 {\r
-  UINTN                 Index;\r
-  IP4_CONFIG2_DATA_ITEM *DataItem;\r
+  UINTN                  Index;\r
+  IP4_CONFIG2_DATA_ITEM  *DataItem;\r
 \r
   if (Instance->DeclineAddress != NULL) {\r
     FreePool (Instance->DeclineAddress);\r
   }\r
 \r
   if (!Instance->Configured) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   if (Instance->Dhcp4Handle != NULL) {\r
-\r
     Ip4Config2DestroyDhcp4 (Instance);\r
   }\r
 \r
@@ -2097,13 +2074,13 @@ Ip4Config2CleanInstance (
   }\r
 \r
   for (Index = 0; Index < Ip4Config2DataTypeMaximum; Index++) {\r
-\r
     DataItem = &Instance->DataItem[Index];\r
 \r
     if (!DATA_ATTRIB_SET (DataItem->Attribute, DATA_ATTRIB_SIZE_FIXED)) {\r
       if (DataItem->Data.Ptr != NULL) {\r
         FreePool (DataItem->Data.Ptr);\r
       }\r
+\r
       DataItem->Data.Ptr = NULL;\r
       DataItem->DataSize = 0;\r
     }\r
@@ -2126,12 +2103,12 @@ Ip4Config2CleanInstance (
 VOID\r
 EFIAPI\r
 Ip4AutoReconfigCallBackDpc (\r
-  IN VOID                   *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  IP4_SERVICE               *IpSb;\r
+  IP4_SERVICE  *IpSb;\r
 \r
-  IpSb      = (IP4_SERVICE *) Context;\r
+  IpSb = (IP4_SERVICE *)Context;\r
   NET_CHECK_SIGNATURE (IpSb, IP4_SERVICE_SIGNATURE);\r
 \r
   if (IpSb->State > IP4_SERVICE_UNSTARTED) {\r
@@ -2142,10 +2119,9 @@ Ip4AutoReconfigCallBackDpc (
 \r
   Ip4StartAutoConfig (&IpSb->Ip4Config2Instance);\r
 \r
-  return ;\r
+  return;\r
 }\r
 \r
-\r
 /**\r
   Request Ip4AutoReconfigCallBackDpc as a DPC at TPL_CALLBACK.\r
 \r
@@ -2156,8 +2132,8 @@ Ip4AutoReconfigCallBackDpc (
 VOID\r
 EFIAPI\r
 Ip4AutoReconfigCallBack (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   //\r
@@ -2165,4 +2141,3 @@ Ip4AutoReconfigCallBack (
   //\r
   QueueDpc (TPL_CALLBACK, Ip4AutoReconfigCallBackDpc, Context);\r
 }\r
-\r
index 0e4639e77c7898482c161c86e45dcd1267a3034d..f8de08b8c93bd6163937eb72db30737c0cc573f3 100644 (file)
 #define IP4_CONFIG2_INSTANCE_SIGNATURE    SIGNATURE_32 ('I', 'P', 'C', '2')\r
 #define IP4_FORM_CALLBACK_INFO_SIGNATURE  SIGNATURE_32 ('I', 'F', 'C', 'I')\r
 \r
-#define IP4_CONFIG2_VARIABLE_ATTRIBUTE    (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS)\r
+#define IP4_CONFIG2_VARIABLE_ATTRIBUTE  (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS)\r
 \r
-#define DATA_ATTRIB_SIZE_FIXED              0x1\r
-#define DATA_ATTRIB_VOLATILE                0x2\r
+#define DATA_ATTRIB_SIZE_FIXED  0x1\r
+#define DATA_ATTRIB_VOLATILE    0x2\r
 \r
-#define DATA_ATTRIB_SET(Attrib, Bits)       (BOOLEAN)((Attrib) & (Bits))\r
-#define SET_DATA_ATTRIB(Attrib, Bits)       ((Attrib) |= (Bits))\r
-#define REMOVE_DATA_ATTRIB(Attrib, Bits)    ((Attrib) &= (~Bits))\r
+#define DATA_ATTRIB_SET(Attrib, Bits)     (BOOLEAN)((Attrib) & (Bits))\r
+#define SET_DATA_ATTRIB(Attrib, Bits)     ((Attrib) |= (Bits))\r
+#define REMOVE_DATA_ATTRIB(Attrib, Bits)  ((Attrib) &= (~Bits))\r
 \r
 typedef struct _IP4_CONFIG2_INSTANCE IP4_CONFIG2_INSTANCE;\r
 \r
@@ -69,9 +69,9 @@ typedef struct _IP4_CONFIG2_INSTANCE IP4_CONFIG2_INSTANCE;
 typedef\r
 EFI_STATUS\r
 (*IP4_CONFIG2_SET_DATA) (\r
-  IN IP4_CONFIG2_INSTANCE *Instance,\r
-  IN UINTN                DataSize,\r
-  IN VOID                 *Data\r
+  IN IP4_CONFIG2_INSTANCE  *Instance,\r
+  IN UINTN                 DataSize,\r
+  IN VOID                  *Data\r
   );\r
 \r
 /**\r
@@ -93,34 +93,34 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (*IP4_CONFIG2_GET_DATA) (\r
-  IN IP4_CONFIG2_INSTANCE *Instance,\r
-  IN OUT UINTN            *DataSize,\r
-  IN VOID                 *Data      OPTIONAL\r
+  IN IP4_CONFIG2_INSTANCE  *Instance,\r
+  IN OUT UINTN             *DataSize,\r
+  IN VOID                  *Data      OPTIONAL\r
   );\r
 \r
 typedef union {\r
-  VOID                                      *Ptr;\r
-  EFI_IP4_CONFIG2_INTERFACE_INFO            *IfInfo;\r
-  EFI_IP4_CONFIG2_POLICY                    *Policy;\r
-  EFI_IP4_CONFIG2_MANUAL_ADDRESS            *ManualAddress;\r
-  EFI_IPv4_ADDRESS                          *Gateway;\r
-  EFI_IPv4_ADDRESS                          *DnsServers;\r
+  VOID                              *Ptr;\r
+  EFI_IP4_CONFIG2_INTERFACE_INFO    *IfInfo;\r
+  EFI_IP4_CONFIG2_POLICY            *Policy;\r
+  EFI_IP4_CONFIG2_MANUAL_ADDRESS    *ManualAddress;\r
+  EFI_IPv4_ADDRESS                  *Gateway;\r
+  EFI_IPv4_ADDRESS                  *DnsServers;\r
 } IP4_CONFIG2_DATA;\r
 \r
 typedef struct {\r
-  IP4_CONFIG2_SET_DATA SetData;\r
-  IP4_CONFIG2_GET_DATA GetData;\r
-  EFI_STATUS           Status;\r
-  UINT8                Attribute;\r
-  NET_MAP              EventMap;\r
-  IP4_CONFIG2_DATA     Data;\r
-  UINTN                DataSize;\r
+  IP4_CONFIG2_SET_DATA    SetData;\r
+  IP4_CONFIG2_GET_DATA    GetData;\r
+  EFI_STATUS              Status;\r
+  UINT8                   Attribute;\r
+  NET_MAP                 EventMap;\r
+  IP4_CONFIG2_DATA        Data;\r
+  UINTN                   DataSize;\r
 } IP4_CONFIG2_DATA_ITEM;\r
 \r
 typedef struct {\r
-  UINT16                    Offset;\r
-  UINT32                    DataSize;\r
-  EFI_IP4_CONFIG2_DATA_TYPE DataType;\r
+  UINT16                       Offset;\r
+  UINT32                       DataSize;\r
+  EFI_IP4_CONFIG2_DATA_TYPE    DataType;\r
 } IP4_CONFIG2_DATA_RECORD;\r
 \r
 #pragma pack(1)\r
@@ -137,57 +137,57 @@ typedef struct {
 //  EFI_IPv4_ADDRESS                          DnsServers[];\r
 //\r
 typedef struct {\r
-  UINT16                  Checksum;\r
-  UINT16                  DataRecordCount;\r
-  IP4_CONFIG2_DATA_RECORD DataRecord[1];\r
+  UINT16                     Checksum;\r
+  UINT16                     DataRecordCount;\r
+  IP4_CONFIG2_DATA_RECORD    DataRecord[1];\r
 } IP4_CONFIG2_VARIABLE;\r
 \r
 #pragma pack()\r
 \r
 typedef struct {\r
-  EFI_IP4_CONFIG2_POLICY                   Policy;               ///< manual or automatic\r
-  EFI_IP4_CONFIG2_MANUAL_ADDRESS           *ManualAddress;       ///< IP addresses\r
-  UINT32                                   ManualAddressCount;   ///< IP addresses count\r
-  EFI_IPv4_ADDRESS                         *GatewayAddress;      ///< Gateway address\r
-  UINT32                                   GatewayAddressCount;  ///< Gateway address count\r
-  EFI_IPv4_ADDRESS                         *DnsAddress;          ///< DNS server address\r
-  UINT32                                   DnsAddressCount;      ///< DNS server address count\r
+  EFI_IP4_CONFIG2_POLICY            Policy;                      ///< manual or automatic\r
+  EFI_IP4_CONFIG2_MANUAL_ADDRESS    *ManualAddress;              ///< IP addresses\r
+  UINT32                            ManualAddressCount;          ///< IP addresses count\r
+  EFI_IPv4_ADDRESS                  *GatewayAddress;             ///< Gateway address\r
+  UINT32                            GatewayAddressCount;         ///< Gateway address count\r
+  EFI_IPv4_ADDRESS                  *DnsAddress;                 ///< DNS server address\r
+  UINT32                            DnsAddressCount;             ///< DNS server address count\r
 } IP4_CONFIG2_NVDATA;\r
 \r
 typedef struct _IP4_FORM_CALLBACK_INFO {\r
-  UINT32                           Signature;\r
-  EFI_HANDLE                       ChildHandle;\r
-  EFI_HII_CONFIG_ACCESS_PROTOCOL   HiiConfigAccessProtocol;\r
-  EFI_DEVICE_PATH_PROTOCOL         *HiiVendorDevicePath;\r
-  EFI_HII_HANDLE                   RegisteredHandle;\r
+  UINT32                            Signature;\r
+  EFI_HANDLE                        ChildHandle;\r
+  EFI_HII_CONFIG_ACCESS_PROTOCOL    HiiConfigAccessProtocol;\r
+  EFI_DEVICE_PATH_PROTOCOL          *HiiVendorDevicePath;\r
+  EFI_HII_HANDLE                    RegisteredHandle;\r
 } IP4_FORM_CALLBACK_INFO;\r
 \r
 struct _IP4_CONFIG2_INSTANCE {\r
-  UINT32                                    Signature;\r
-  BOOLEAN                                   Configured;\r
-  LIST_ENTRY                                Link;\r
-  UINT16                                    IfIndex;\r
-\r
-  EFI_IP4_CONFIG2_PROTOCOL                  Ip4Config2;\r
-\r
-  EFI_IP4_CONFIG2_INTERFACE_INFO            InterfaceInfo;\r
-  EFI_IP4_CONFIG2_POLICY                    Policy;\r
-  IP4_CONFIG2_DATA_ITEM                     DataItem[Ip4Config2DataTypeMaximum];\r
-\r
-  EFI_EVENT                                 Dhcp4SbNotifyEvent;\r
-  VOID                                      *Registration;\r
-  EFI_HANDLE                                Dhcp4Handle;\r
-  EFI_DHCP4_PROTOCOL                        *Dhcp4;\r
-  BOOLEAN                                   DhcpSuccess;\r
-  BOOLEAN                                   OtherInfoOnly;\r
-  EFI_EVENT                                 Dhcp4Event;\r
-  UINT32                                    FailedIaAddressCount;\r
-  EFI_IPv4_ADDRESS                          *DeclineAddress;\r
-  UINT32                                    DeclineAddressCount;\r
-\r
-  IP4_FORM_CALLBACK_INFO                    CallbackInfo;\r
-\r
-  IP4_CONFIG2_NVDATA                        Ip4NvData;\r
+  UINT32                            Signature;\r
+  BOOLEAN                           Configured;\r
+  LIST_ENTRY                        Link;\r
+  UINT16                            IfIndex;\r
+\r
+  EFI_IP4_CONFIG2_PROTOCOL          Ip4Config2;\r
+\r
+  EFI_IP4_CONFIG2_INTERFACE_INFO    InterfaceInfo;\r
+  EFI_IP4_CONFIG2_POLICY            Policy;\r
+  IP4_CONFIG2_DATA_ITEM             DataItem[Ip4Config2DataTypeMaximum];\r
+\r
+  EFI_EVENT                         Dhcp4SbNotifyEvent;\r
+  VOID                              *Registration;\r
+  EFI_HANDLE                        Dhcp4Handle;\r
+  EFI_DHCP4_PROTOCOL                *Dhcp4;\r
+  BOOLEAN                           DhcpSuccess;\r
+  BOOLEAN                           OtherInfoOnly;\r
+  EFI_EVENT                         Dhcp4Event;\r
+  UINT32                            FailedIaAddressCount;\r
+  EFI_IPv4_ADDRESS                  *DeclineAddress;\r
+  UINT32                            DeclineAddressCount;\r
+\r
+  IP4_FORM_CALLBACK_INFO            CallbackInfo;\r
+\r
+  IP4_CONFIG2_NVDATA                Ip4NvData;\r
 };\r
 \r
 //\r
@@ -196,9 +196,9 @@ struct _IP4_CONFIG2_INSTANCE {
 //\r
 #pragma pack(1)\r
 typedef struct {\r
-  EFI_DHCP4_PACKET_OPTION Head;\r
-  UINT8                   Route;\r
-  UINT8                   Dns;\r
+  EFI_DHCP4_PACKET_OPTION    Head;\r
+  UINT8                      Route;\r
+  UINT8                      Dns;\r
 } IP4_CONFIG2_DHCP4_OPTION;\r
 #pragma pack()\r
 \r
@@ -218,8 +218,8 @@ typedef struct {
 **/\r
 EFI_STATUS\r
 Ip4Config2ReadConfigData (\r
-  IN     CHAR16               *VarName,\r
-  IN OUT IP4_CONFIG2_INSTANCE *Instance\r
+  IN     CHAR16                *VarName,\r
+  IN OUT IP4_CONFIG2_INSTANCE  *Instance\r
   );\r
 \r
 /**\r
@@ -235,7 +235,7 @@ Ip4Config2ReadConfigData (
 **/\r
 EFI_STATUS\r
 Ip4StartAutoConfig (\r
-  IN IP4_CONFIG2_INSTANCE   *Instance\r
+  IN IP4_CONFIG2_INSTANCE  *Instance\r
   );\r
 \r
 /**\r
@@ -273,8 +273,8 @@ Ip4Config2CleanInstance (
 VOID\r
 EFIAPI\r
 Ip4AutoReconfigCallBack (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
index 63014ca3190755e2390a0a198486001d38783089..e0b6a4d4a92f132486e6c57046dc1696edb678db 100644 (file)
@@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Ip4Impl.h"\r
 \r
-CHAR16    mIp4Config2StorageName[]     = L"IP4_CONFIG2_IFR_NVDATA";\r
+CHAR16  mIp4Config2StorageName[] = L"IP4_CONFIG2_IFR_NVDATA";\r
 \r
 /**\r
   Calculate the prefix length of the IPv4 subnet mask.\r
@@ -48,7 +48,7 @@ GetSubnetMaskPrefixLength (
     Len++;\r
   }\r
 \r
-  return (UINT8) (32 - Len);\r
+  return (UINT8)(32 - Len);\r
 }\r
 \r
 /**\r
@@ -67,13 +67,12 @@ Ip4Config2StrToIp (
   OUT EFI_IPv4_ADDRESS  *Ip\r
   )\r
 {\r
-  UINTN Index;\r
-  UINTN Number;\r
+  UINTN  Index;\r
+  UINTN  Number;\r
 \r
   Index = 0;\r
 \r
   while (*Str != L'\0') {\r
-\r
     if (Index > 3) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
@@ -88,7 +87,7 @@ Ip4Config2StrToIp (
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
-    Ip->Addr[Index] = (UINT8) Number;\r
+    Ip->Addr[Index] = (UINT8)Number;\r
 \r
     if ((*Str != L'\0') && (*Str != L'.')) {\r
       //\r
@@ -134,12 +133,12 @@ Ip4Config2StrToIpList (
   OUT UINTN             *IpCount\r
   )\r
 {\r
-  UINTN              BeginIndex;\r
-  UINTN              EndIndex;\r
-  UINTN              Index;\r
-  UINTN              IpIndex;\r
-  CHAR16             *StrTemp;\r
-  BOOLEAN            SpaceTag;\r
+  UINTN    BeginIndex;\r
+  UINTN    EndIndex;\r
+  UINTN    Index;\r
+  UINTN    IpIndex;\r
+  CHAR16   *StrTemp;\r
+  BOOLEAN  SpaceTag;\r
 \r
   BeginIndex = 0;\r
   EndIndex   = BeginIndex;\r
@@ -178,7 +177,7 @@ Ip4Config2StrToIpList (
   //\r
   // Allocate buffer for IpList.\r
   //\r
-  *PtrIpList = AllocateZeroPool(*IpCount * sizeof(EFI_IPv4_ADDRESS));\r
+  *PtrIpList = AllocateZeroPool (*IpCount * sizeof (EFI_IPv4_ADDRESS));\r
   if (*PtrIpList == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -189,30 +188,30 @@ Ip4Config2StrToIpList (
   Index = 0;\r
   while (*(Str + Index) != L'\0') {\r
     if (*(Str + Index) == L' ') {\r
-      if(!SpaceTag) {\r
-        StrTemp = AllocateZeroPool((EndIndex - BeginIndex + 1) * sizeof(CHAR16));\r
+      if (!SpaceTag) {\r
+        StrTemp = AllocateZeroPool ((EndIndex - BeginIndex + 1) * sizeof (CHAR16));\r
         if (StrTemp == NULL) {\r
-          FreePool(*PtrIpList);\r
+          FreePool (*PtrIpList);\r
           *PtrIpList = NULL;\r
-          *IpCount = 0;\r
+          *IpCount   = 0;\r
           return EFI_OUT_OF_RESOURCES;\r
         }\r
 \r
-        CopyMem (StrTemp, Str + BeginIndex, (EndIndex - BeginIndex) * sizeof(CHAR16));\r
+        CopyMem (StrTemp, Str + BeginIndex, (EndIndex - BeginIndex) * sizeof (CHAR16));\r
         *(StrTemp + (EndIndex - BeginIndex)) = L'\0';\r
 \r
         if (Ip4Config2StrToIp (StrTemp, &((*PtrIpList)[IpIndex])) != EFI_SUCCESS) {\r
-          FreePool(StrTemp);\r
-          FreePool(*PtrIpList);\r
+          FreePool (StrTemp);\r
+          FreePool (*PtrIpList);\r
           *PtrIpList = NULL;\r
-          *IpCount = 0;\r
+          *IpCount   = 0;\r
           return EFI_INVALID_PARAMETER;\r
         }\r
 \r
         BeginIndex = EndIndex;\r
         IpIndex++;\r
 \r
-        FreePool(StrTemp);\r
+        FreePool (StrTemp);\r
       }\r
 \r
       BeginIndex++;\r
@@ -227,26 +226,26 @@ Ip4Config2StrToIpList (
 \r
     if (*(Str + Index) == L'\0') {\r
       if (!SpaceTag) {\r
-        StrTemp = AllocateZeroPool((EndIndex - BeginIndex + 1) * sizeof(CHAR16));\r
+        StrTemp = AllocateZeroPool ((EndIndex - BeginIndex + 1) * sizeof (CHAR16));\r
         if (StrTemp == NULL) {\r
-          FreePool(*PtrIpList);\r
+          FreePool (*PtrIpList);\r
           *PtrIpList = NULL;\r
-          *IpCount = 0;\r
+          *IpCount   = 0;\r
           return EFI_OUT_OF_RESOURCES;\r
         }\r
 \r
-        CopyMem (StrTemp, Str + BeginIndex, (EndIndex - BeginIndex) * sizeof(CHAR16));\r
+        CopyMem (StrTemp, Str + BeginIndex, (EndIndex - BeginIndex) * sizeof (CHAR16));\r
         *(StrTemp + (EndIndex - BeginIndex)) = L'\0';\r
 \r
         if (Ip4Config2StrToIp (StrTemp, &((*PtrIpList)[IpIndex])) != EFI_SUCCESS) {\r
-          FreePool(StrTemp);\r
-          FreePool(*PtrIpList);\r
+          FreePool (StrTemp);\r
+          FreePool (*PtrIpList);\r
           *PtrIpList = NULL;\r
-          *IpCount = 0;\r
+          *IpCount   = 0;\r
           return EFI_INVALID_PARAMETER;\r
         }\r
 \r
-        FreePool(StrTemp);\r
+        FreePool (StrTemp);\r
       }\r
     }\r
   }\r
@@ -278,7 +277,6 @@ Ip4Config2IpToStr (
     );\r
 }\r
 \r
-\r
 /**\r
   Convert the IPv4 address list into string consists of several decimal\r
   dotted IPv4 addresses separated by space.\r
@@ -299,11 +297,11 @@ Ip4Config2IpListToStr (
   OUT CHAR16            *Str\r
   )\r
 {\r
-  UINTN            Index;\r
-  UINTN            TemIndex;\r
-  UINTN            StrIndex;\r
-  CHAR16           *TempStr;\r
-  EFI_IPv4_ADDRESS *TempIp;\r
+  UINTN             Index;\r
+  UINTN             TemIndex;\r
+  UINTN             StrIndex;\r
+  CHAR16            *TempStr;\r
+  EFI_IPv4_ADDRESS  *TempIp;\r
 \r
   Index    = 0;\r
   TemIndex = 0;\r
@@ -311,10 +309,10 @@ Ip4Config2IpListToStr (
   TempStr  = NULL;\r
   TempIp   = NULL;\r
 \r
-  for (Index = 0; Index < IpCount; Index ++) {\r
+  for (Index = 0; Index < IpCount; Index++) {\r
     TempIp = Ip + Index;\r
     if (TempStr == NULL) {\r
-      TempStr = AllocateZeroPool(2 * IP4_STR_MAX_SIZE);\r
+      TempStr = AllocateZeroPool (2 * IP4_STR_MAX_SIZE);\r
       if (TempStr == NULL) {\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
@@ -330,13 +328,14 @@ Ip4Config2IpListToStr (
       TempIp->Addr[3]\r
       );\r
 \r
-    for (TemIndex = 0; TemIndex < IP4_STR_MAX_SIZE; TemIndex ++) {\r
+    for (TemIndex = 0; TemIndex < IP4_STR_MAX_SIZE; TemIndex++) {\r
       if (*(TempStr + TemIndex) == L'\0') {\r
         if (Index == IpCount - 1) {\r
           Str[StrIndex++] = L'\0';\r
         } else {\r
           Str[StrIndex++] = L' ';\r
         }\r
+\r
         break;\r
       } else {\r
         Str[StrIndex++] = *(TempStr + TemIndex);\r
@@ -345,7 +344,7 @@ Ip4Config2IpListToStr (
   }\r
 \r
   if (TempStr != NULL) {\r
-    FreePool(TempStr);\r
+    FreePool (TempStr);\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -361,11 +360,11 @@ Ip4Config2IpListToStr (
 VOID\r
 EFIAPI\r
 Ip4Config2ManualAddressNotify (\r
-  IN EFI_EVENT    Event,\r
-  IN VOID         *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  *((BOOLEAN *) Context) = TRUE;\r
+  *((BOOLEAN *)Context) = TRUE;\r
 }\r
 \r
 /**\r
@@ -382,21 +381,21 @@ Ip4Config2ManualAddressNotify (
 **/\r
 EFI_STATUS\r
 Ip4Config2ConvertConfigNvDataToIfrNvData (\r
-  IN     IP4_CONFIG2_INSTANCE       *Instance,\r
-  IN OUT IP4_CONFIG2_IFR_NVDATA     *IfrNvData\r
+  IN     IP4_CONFIG2_INSTANCE    *Instance,\r
+  IN OUT IP4_CONFIG2_IFR_NVDATA  *IfrNvData\r
   )\r
 {\r
-  IP4_SERVICE                                *IpSb;\r
-  EFI_IP4_CONFIG2_PROTOCOL                   *Ip4Config2;\r
-  EFI_IP4_CONFIG2_INTERFACE_INFO             *Ip4Info;\r
-  EFI_IP4_CONFIG2_POLICY                     Policy;\r
-  UINTN                                      DataSize;\r
-  UINTN                                      GatewaySize;\r
-  EFI_IPv4_ADDRESS                           GatewayAddress;\r
-  EFI_STATUS                                 Status;\r
-  UINTN                                      DnsSize;\r
-  UINTN                                      DnsCount;\r
-  EFI_IPv4_ADDRESS                           *DnsAddress;\r
+  IP4_SERVICE                     *IpSb;\r
+  EFI_IP4_CONFIG2_PROTOCOL        *Ip4Config2;\r
+  EFI_IP4_CONFIG2_INTERFACE_INFO  *Ip4Info;\r
+  EFI_IP4_CONFIG2_POLICY          Policy;\r
+  UINTN                           DataSize;\r
+  UINTN                           GatewaySize;\r
+  EFI_IPv4_ADDRESS                GatewayAddress;\r
+  EFI_STATUS                      Status;\r
+  UINTN                           DnsSize;\r
+  UINTN                           DnsCount;\r
+  EFI_IPv4_ADDRESS                *DnsAddress;\r
 \r
   Status      = EFI_SUCCESS;\r
   Ip4Config2  = &Instance->Ip4Config2;\r
@@ -443,13 +442,13 @@ Ip4Config2ConvertConfigNvDataToIfrNvData (
   //\r
   // Get the interface info.\r
   //\r
-  DataSize    = 0;\r
-  Status = Ip4Config2->GetData (\r
-                         Ip4Config2,\r
-                         Ip4Config2DataTypeInterfaceInfo,\r
-                         &DataSize,\r
-                         NULL\r
-                         );\r
+  DataSize = 0;\r
+  Status   = Ip4Config2->GetData (\r
+                           Ip4Config2,\r
+                           Ip4Config2DataTypeInterfaceInfo,\r
+                           &DataSize,\r
+                           NULL\r
+                           );\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     return Status;\r
   }\r
@@ -487,20 +486,20 @@ Ip4Config2ConvertConfigNvDataToIfrNvData (
   // Get the Dns info.\r
   //\r
   DnsSize = 0;\r
-  Status = Ip4Config2->GetData (\r
-                         Ip4Config2,\r
-                         Ip4Config2DataTypeDnsServer,\r
-                         &DnsSize,\r
-                         NULL\r
-                         );\r
+  Status  = Ip4Config2->GetData (\r
+                          Ip4Config2,\r
+                          Ip4Config2DataTypeDnsServer,\r
+                          &DnsSize,\r
+                          NULL\r
+                          );\r
   if ((Status != EFI_BUFFER_TOO_SMALL) && (Status != EFI_NOT_FOUND)) {\r
     goto Exit;\r
   }\r
 \r
-  DnsCount = (UINT32) (DnsSize / sizeof (EFI_IPv4_ADDRESS));\r
+  DnsCount = (UINT32)(DnsSize / sizeof (EFI_IPv4_ADDRESS));\r
 \r
   if (DnsSize > 0) {\r
-    DnsAddress = AllocateZeroPool(DnsSize);\r
+    DnsAddress = AllocateZeroPool (DnsSize);\r
     if (DnsAddress == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Exit;\r
@@ -525,11 +524,11 @@ Ip4Config2ConvertConfigNvDataToIfrNvData (
 Exit:\r
 \r
   if (DnsAddress != NULL) {\r
-    FreePool(DnsAddress);\r
+    FreePool (DnsAddress);\r
   }\r
 \r
   if (Ip4Info != NULL) {\r
-    FreePool(Ip4Info);\r
+    FreePool (Ip4Info);\r
   }\r
 \r
   return Status;\r
@@ -550,41 +549,39 @@ Exit:
 **/\r
 EFI_STATUS\r
 Ip4Config2ConvertIfrNvDataToConfigNvData (\r
-  IN     IP4_CONFIG2_IFR_NVDATA     *IfrFormNvData,\r
-  IN OUT IP4_CONFIG2_INSTANCE       *Instance\r
+  IN     IP4_CONFIG2_IFR_NVDATA  *IfrFormNvData,\r
+  IN OUT IP4_CONFIG2_INSTANCE    *Instance\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  EFI_IP4_CONFIG2_PROTOCOL         *Ip4Cfg2;\r
-  IP4_CONFIG2_NVDATA               *Ip4NvData;\r
-\r
-  EFI_IP_ADDRESS                   StationAddress;\r
-  EFI_IP_ADDRESS                   SubnetMask;\r
-  EFI_IP_ADDRESS                   Gateway;\r
-  IP4_ADDR                         Ip;\r
-  EFI_IPv4_ADDRESS                 *DnsAddress;\r
-  UINTN                            DnsCount;\r
-  UINTN                            Index;\r
-\r
-  EFI_EVENT                        TimeoutEvent;\r
-  EFI_EVENT                        SetAddressEvent;\r
-  BOOLEAN                          IsAddressOk;\r
-  UINTN                            DataSize;\r
-  EFI_INPUT_KEY                    Key;\r
-\r
-  Status          = EFI_SUCCESS;\r
-  Ip4Cfg2         = &Instance->Ip4Config2;\r
-  Ip4NvData       = &Instance->Ip4NvData;\r
-\r
-  DnsCount        = 0;\r
-  DnsAddress      = NULL;\r
+  EFI_STATUS                Status;\r
+  EFI_IP4_CONFIG2_PROTOCOL  *Ip4Cfg2;\r
+  IP4_CONFIG2_NVDATA        *Ip4NvData;\r
+\r
+  EFI_IP_ADDRESS    StationAddress;\r
+  EFI_IP_ADDRESS    SubnetMask;\r
+  EFI_IP_ADDRESS    Gateway;\r
+  IP4_ADDR          Ip;\r
+  EFI_IPv4_ADDRESS  *DnsAddress;\r
+  UINTN             DnsCount;\r
+  UINTN             Index;\r
+\r
+  EFI_EVENT      TimeoutEvent;\r
+  EFI_EVENT      SetAddressEvent;\r
+  BOOLEAN        IsAddressOk;\r
+  UINTN          DataSize;\r
+  EFI_INPUT_KEY  Key;\r
+\r
+  Status    = EFI_SUCCESS;\r
+  Ip4Cfg2   = &Instance->Ip4Config2;\r
+  Ip4NvData = &Instance->Ip4NvData;\r
+\r
+  DnsCount   = 0;\r
+  DnsAddress = NULL;\r
 \r
   TimeoutEvent    = NULL;\r
   SetAddressEvent = NULL;\r
 \r
-\r
-\r
-  if (Instance == NULL || IfrFormNvData == NULL) {\r
+  if ((Instance == NULL) || (IfrFormNvData == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -601,7 +598,7 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
                         sizeof (EFI_IP4_CONFIG2_POLICY),\r
                         &Ip4NvData->Policy\r
                         );\r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
   } else {\r
@@ -618,26 +615,28 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
 \r
     Status = Ip4Config2StrToIp (IfrFormNvData->StationAddress, &StationAddress.v4);\r
     if (EFI_ERROR (Status) ||\r
-        (SubnetMask.Addr[0] != 0 && !NetIp4IsUnicast (NTOHL (StationAddress.Addr[0]), NTOHL (SubnetMask.Addr[0]))) ||\r
-        !Ip4StationAddressValid (NTOHL (StationAddress.Addr[0]), NTOHL (SubnetMask.Addr[0]))) {\r
+        ((SubnetMask.Addr[0] != 0) && !NetIp4IsUnicast (NTOHL (StationAddress.Addr[0]), NTOHL (SubnetMask.Addr[0]))) ||\r
+        !Ip4StationAddressValid (NTOHL (StationAddress.Addr[0]), NTOHL (SubnetMask.Addr[0])))\r
+    {\r
       CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
     Status = Ip4Config2StrToIp (IfrFormNvData->GatewayAddress, &Gateway.v4);\r
     if (EFI_ERROR (Status) ||\r
-        (Gateway.Addr[0] != 0 && SubnetMask.Addr[0] != 0 && !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL (SubnetMask.Addr[0])))) {\r
+        ((Gateway.Addr[0] != 0) && (SubnetMask.Addr[0] != 0) && !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL (SubnetMask.Addr[0]))))\r
+    {\r
       CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
     Status = Ip4Config2StrToIpList (IfrFormNvData->DnsAddress, &DnsAddress, &DnsCount);\r
-    if (!EFI_ERROR (Status) && DnsCount > 0) {\r
-      for (Index = 0; Index < DnsCount; Index ++) {\r
+    if (!EFI_ERROR (Status) && (DnsCount > 0)) {\r
+      for (Index = 0; Index < DnsCount; Index++) {\r
         CopyMem (&Ip, &DnsAddress[Index], sizeof (IP4_ADDR));\r
         if (IP4_IS_UNSPECIFIED (NTOHL (Ip)) || IP4_IS_LOCAL_BROADCAST (NTOHL (Ip))) {\r
           CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);\r
-          FreePool(DnsAddress);\r
+          FreePool (DnsAddress);\r
           return EFI_INVALID_PARAMETER;\r
         }\r
       }\r
@@ -648,37 +647,43 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
     }\r
 \r
     if (Ip4NvData->ManualAddress != NULL) {\r
-      FreePool(Ip4NvData->ManualAddress);\r
+      FreePool (Ip4NvData->ManualAddress);\r
     }\r
+\r
     Ip4NvData->ManualAddressCount = 1;\r
-    Ip4NvData->ManualAddress = AllocateZeroPool(sizeof(EFI_IP4_CONFIG2_MANUAL_ADDRESS));\r
+    Ip4NvData->ManualAddress      = AllocateZeroPool (sizeof (EFI_IP4_CONFIG2_MANUAL_ADDRESS));\r
     if (Ip4NvData->ManualAddress == NULL) {\r
       if (DnsAddress != NULL) {\r
-        FreePool(DnsAddress);\r
+        FreePool (DnsAddress);\r
       }\r
 \r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-    CopyMem(&Ip4NvData->ManualAddress->Address, &StationAddress.v4, sizeof(EFI_IPv4_ADDRESS));\r
-    CopyMem(&Ip4NvData->ManualAddress->SubnetMask, &SubnetMask.v4, sizeof(EFI_IPv4_ADDRESS));\r
+\r
+    CopyMem (&Ip4NvData->ManualAddress->Address, &StationAddress.v4, sizeof (EFI_IPv4_ADDRESS));\r
+    CopyMem (&Ip4NvData->ManualAddress->SubnetMask, &SubnetMask.v4, sizeof (EFI_IPv4_ADDRESS));\r
 \r
     if (Ip4NvData->GatewayAddress != NULL) {\r
-      FreePool(Ip4NvData->GatewayAddress);\r
+      FreePool (Ip4NvData->GatewayAddress);\r
     }\r
+\r
     Ip4NvData->GatewayAddressCount = 1;\r
-    Ip4NvData->GatewayAddress = AllocateZeroPool(sizeof(EFI_IPv4_ADDRESS));\r
+    Ip4NvData->GatewayAddress      = AllocateZeroPool (sizeof (EFI_IPv4_ADDRESS));\r
     if (Ip4NvData->GatewayAddress == NULL) {\r
       if (DnsAddress != NULL) {\r
-        FreePool(DnsAddress);\r
+        FreePool (DnsAddress);\r
       }\r
+\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-    CopyMem(Ip4NvData->GatewayAddress, &Gateway.v4, sizeof(EFI_IPv4_ADDRESS));\r
+\r
+    CopyMem (Ip4NvData->GatewayAddress, &Gateway.v4, sizeof (EFI_IPv4_ADDRESS));\r
 \r
     if (Ip4NvData->DnsAddress != NULL) {\r
-      FreePool(Ip4NvData->DnsAddress);\r
+      FreePool (Ip4NvData->DnsAddress);\r
     }\r
-    Ip4NvData->DnsAddressCount = (UINT32) DnsCount;\r
+\r
+    Ip4NvData->DnsAddressCount = (UINT32)DnsCount;\r
     Ip4NvData->DnsAddress      = DnsAddress;\r
 \r
     //\r
@@ -690,7 +695,7 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
                         sizeof (EFI_IP4_CONFIG2_POLICY),\r
                         &Ip4NvData->Policy\r
                         );\r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
 \r
@@ -734,12 +739,12 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
     // Set ManualAddress.\r
     //\r
     DataSize = Ip4NvData->ManualAddressCount * sizeof (EFI_IP4_CONFIG2_MANUAL_ADDRESS);\r
-    Status = Ip4Cfg2->SetData (\r
-                        Ip4Cfg2,\r
-                        Ip4Config2DataTypeManualAddress,\r
-                        DataSize,\r
-                        (VOID *) Ip4NvData->ManualAddress\r
-                        );\r
+    Status   = Ip4Cfg2->SetData (\r
+                          Ip4Cfg2,\r
+                          Ip4Config2DataTypeManualAddress,\r
+                          DataSize,\r
+                          (VOID *)Ip4NvData->ManualAddress\r
+                          );\r
 \r
     if (Status == EFI_NOT_READY) {\r
       gBS->SetTimer (TimeoutEvent, TimerRelative, 50000000);\r
@@ -764,12 +769,12 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
     // Set gateway.\r
     //\r
     DataSize = Ip4NvData->GatewayAddressCount * sizeof (EFI_IPv4_ADDRESS);\r
-    Status = Ip4Cfg2->SetData (\r
-                        Ip4Cfg2,\r
-                        Ip4Config2DataTypeGateway,\r
-                        DataSize,\r
-                        Ip4NvData->GatewayAddress\r
-                        );\r
+    Status   = Ip4Cfg2->SetData (\r
+                          Ip4Cfg2,\r
+                          Ip4Config2DataTypeGateway,\r
+                          DataSize,\r
+                          Ip4NvData->GatewayAddress\r
+                          );\r
     if (EFI_ERROR (Status)) {\r
       goto Exit;\r
     }\r
@@ -777,14 +782,14 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
     //\r
     // Set DNS addresses.\r
     //\r
-    if (Ip4NvData->DnsAddressCount > 0 && Ip4NvData->DnsAddress != NULL) {\r
+    if ((Ip4NvData->DnsAddressCount > 0) && (Ip4NvData->DnsAddress != NULL)) {\r
       DataSize = Ip4NvData->DnsAddressCount * sizeof (EFI_IPv4_ADDRESS);\r
-      Status = Ip4Cfg2->SetData (\r
-                          Ip4Cfg2,\r
-                          Ip4Config2DataTypeDnsServer,\r
-                          DataSize,\r
-                          Ip4NvData->DnsAddress\r
-                          );\r
+      Status   = Ip4Cfg2->SetData (\r
+                            Ip4Cfg2,\r
+                            Ip4Config2DataTypeDnsServer,\r
+                            DataSize,\r
+                            Ip4NvData->DnsAddress\r
+                            );\r
 \r
       if (EFI_ERROR (Status)) {\r
         goto Exit;\r
@@ -863,24 +868,24 @@ Exit:
 EFI_STATUS\r
 EFIAPI\r
 Ip4FormExtractConfig (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  CONST EFI_STRING                       Request,\r
-  OUT EFI_STRING                             *Progress,\r
-  OUT EFI_STRING                             *Results\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  CONST EFI_STRING                      Request,\r
+  OUT EFI_STRING                            *Progress,\r
+  OUT EFI_STRING                            *Results\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  IP4_CONFIG2_INSTANCE             *Ip4Config2Instance;\r
-  IP4_FORM_CALLBACK_INFO           *Private;\r
-  IP4_CONFIG2_IFR_NVDATA           *IfrFormNvData;\r
-  EFI_STRING                       ConfigRequestHdr;\r
-  EFI_STRING                       ConfigRequest;\r
-  BOOLEAN                          AllocatedRequest;\r
-  EFI_STRING                       FormResult;\r
-  UINTN                            Size;\r
-  UINTN                            BufferSize;\r
-\r
-  if (Progress == NULL || Results == NULL) {\r
+  EFI_STATUS              Status;\r
+  IP4_CONFIG2_INSTANCE    *Ip4Config2Instance;\r
+  IP4_FORM_CALLBACK_INFO  *Private;\r
+  IP4_CONFIG2_IFR_NVDATA  *IfrFormNvData;\r
+  EFI_STRING              ConfigRequestHdr;\r
+  EFI_STRING              ConfigRequest;\r
+  BOOLEAN                 AllocatedRequest;\r
+  EFI_STRING              FormResult;\r
+  UINTN                   Size;\r
+  UINTN                   BufferSize;\r
+\r
+  if ((Progress == NULL) || (Results == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -891,8 +896,8 @@ Ip4FormExtractConfig (
   Size               = 0;\r
   AllocatedRequest   = FALSE;\r
   ConfigRequest      = Request;\r
-  Private            = IP4_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS(This);\r
-  Ip4Config2Instance = IP4_CONFIG2_INSTANCE_FROM_FORM_CALLBACK(Private);\r
+  Private            = IP4_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS (This);\r
+  Ip4Config2Instance = IP4_CONFIG2_INSTANCE_FROM_FORM_CALLBACK (Private);\r
   BufferSize         = sizeof (IP4_CONFIG2_IFR_NVDATA);\r
   *Progress          = Request;\r
 \r
@@ -914,12 +919,13 @@ Ip4FormExtractConfig (
       // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
       //\r
       ConfigRequestHdr = HiiConstructConfigHdr (&gIp4Config2NvDataGuid, mIp4Config2StorageName, Private->ChildHandle);\r
-      Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
-      ConfigRequest = AllocateZeroPool (Size);\r
+      Size             = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
+      ConfigRequest    = AllocateZeroPool (Size);\r
       if (ConfigRequest == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
         goto Failure;\r
       }\r
+\r
       AllocatedRequest = TRUE;\r
 \r
       UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);\r
@@ -932,7 +938,7 @@ Ip4FormExtractConfig (
     Status = gHiiConfigRouting->BlockToConfig (\r
                                   gHiiConfigRouting,\r
                                   ConfigRequest,\r
-                                  (UINT8 *) IfrFormNvData,\r
+                                  (UINT8 *)IfrFormNvData,\r
                                   BufferSize,\r
                                   &FormResult,\r
                                   Progress\r
@@ -953,7 +959,7 @@ Ip4FormExtractConfig (
     }\r
   }\r
 \r
-  if (Request == NULL || HiiIsConfigHdrMatch (Request, &gIp4Config2NvDataGuid, mIp4Config2StorageName)) {\r
+  if ((Request == NULL) || HiiIsConfigHdrMatch (Request, &gIp4Config2NvDataGuid, mIp4Config2StorageName)) {\r
     *Results = FormResult;\r
   } else {\r
     return EFI_NOT_FOUND;\r
@@ -1008,28 +1014,28 @@ Failure:
 EFI_STATUS\r
 EFIAPI\r
 Ip4FormRouteConfig (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  CONST EFI_STRING                       Configuration,\r
-  OUT EFI_STRING                             *Progress\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  CONST EFI_STRING                      Configuration,\r
+  OUT EFI_STRING                            *Progress\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  UINTN                            BufferSize;\r
-  IP4_CONFIG2_IFR_NVDATA           *IfrFormNvData;\r
-  IP4_CONFIG2_INSTANCE             *Ip4Config2Instance;\r
-  IP4_FORM_CALLBACK_INFO           *Private;\r
+  EFI_STATUS              Status;\r
+  UINTN                   BufferSize;\r
+  IP4_CONFIG2_IFR_NVDATA  *IfrFormNvData;\r
+  IP4_CONFIG2_INSTANCE    *Ip4Config2Instance;\r
+  IP4_FORM_CALLBACK_INFO  *Private;\r
 \r
   Status        = EFI_SUCCESS;\r
   IfrFormNvData = NULL;\r
 \r
-  if (Configuration == NULL || Progress == NULL) {\r
+  if ((Configuration == NULL) || (Progress == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   *Progress = Configuration;\r
 \r
-  Private            = IP4_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS(This);\r
-  Ip4Config2Instance = IP4_CONFIG2_INSTANCE_FROM_FORM_CALLBACK(Private);\r
+  Private            = IP4_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS (This);\r
+  Ip4Config2Instance = IP4_CONFIG2_INSTANCE_FROM_FORM_CALLBACK (Private);\r
 \r
   //\r
   // Check Routing data in <ConfigHdr>.\r
@@ -1048,7 +1054,7 @@ Ip4FormRouteConfig (
     Status = gHiiConfigRouting->ConfigToBlock (\r
                                   gHiiConfigRouting,\r
                                   Configuration,\r
-                                  (UINT8 *) IfrFormNvData,\r
+                                  (UINT8 *)IfrFormNvData,\r
                                   &BufferSize,\r
                                   Progress\r
                                   );\r
@@ -1059,7 +1065,7 @@ Ip4FormRouteConfig (
     Status = gHiiConfigRouting->ConfigToBlock (\r
                                   gHiiConfigRouting,\r
                                   Configuration,\r
-                                  (UINT8 *) IfrFormNvData,\r
+                                  (UINT8 *)IfrFormNvData,\r
                                   &BufferSize,\r
                                   Progress\r
                                   );\r
@@ -1073,7 +1079,6 @@ Ip4FormRouteConfig (
   }\r
 \r
   return Status;\r
-\r
 }\r
 \r
 /**\r
@@ -1106,35 +1111,35 @@ Ip4FormRouteConfig (
 EFI_STATUS\r
 EFIAPI\r
 Ip4FormCallback (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  EFI_BROWSER_ACTION                     Action,\r
-  IN  EFI_QUESTION_ID                        QuestionId,\r
-  IN  UINT8                                  Type,\r
-  IN  EFI_IFR_TYPE_VALUE                     *Value,\r
-  OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  EFI_BROWSER_ACTION                    Action,\r
+  IN  EFI_QUESTION_ID                       QuestionId,\r
+  IN  UINT8                                 Type,\r
+  IN  EFI_IFR_TYPE_VALUE                    *Value,\r
+  OUT EFI_BROWSER_ACTION_REQUEST            *ActionRequest\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  IP4_CONFIG2_INSTANCE      *Instance;\r
-  IP4_CONFIG2_IFR_NVDATA    *IfrFormNvData;\r
-  IP4_FORM_CALLBACK_INFO    *Private;\r
-\r
-  EFI_IP_ADDRESS            StationAddress;\r
-  EFI_IP_ADDRESS            SubnetMask;\r
-  EFI_IP_ADDRESS            Gateway;\r
-  IP4_ADDR                  Ip;\r
-  EFI_IPv4_ADDRESS          *DnsAddress;\r
-  UINTN                     DnsCount;\r
-  UINTN                     Index;\r
-  EFI_INPUT_KEY             Key;\r
+  EFI_STATUS              Status;\r
+  IP4_CONFIG2_INSTANCE    *Instance;\r
+  IP4_CONFIG2_IFR_NVDATA  *IfrFormNvData;\r
+  IP4_FORM_CALLBACK_INFO  *Private;\r
+\r
+  EFI_IP_ADDRESS    StationAddress;\r
+  EFI_IP_ADDRESS    SubnetMask;\r
+  EFI_IP_ADDRESS    Gateway;\r
+  IP4_ADDR          Ip;\r
+  EFI_IPv4_ADDRESS  *DnsAddress;\r
+  UINTN             DnsCount;\r
+  UINTN             Index;\r
+  EFI_INPUT_KEY     Key;\r
 \r
   IfrFormNvData = NULL;\r
   DnsCount      = 0;\r
   DnsAddress    = NULL;\r
 \r
   if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
-    Private = IP4_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS(This);\r
-    Instance = IP4_CONFIG2_INSTANCE_FROM_FORM_CALLBACK(Private);\r
+    Private  = IP4_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS (This);\r
+    Instance = IP4_CONFIG2_INSTANCE_FROM_FORM_CALLBACK (Private);\r
 \r
     IfrFormNvData = AllocateZeroPool (sizeof (IP4_CONFIG2_IFR_NVDATA));\r
     if (IfrFormNvData == NULL) {\r
@@ -1144,7 +1149,7 @@ Ip4FormCallback (
     //\r
     // Retrieve uncommitted data from Browser\r
     //\r
-    if (!HiiGetBrowserData (&gIp4Config2NvDataGuid, mIp4Config2StorageName, sizeof (IP4_CONFIG2_IFR_NVDATA), (UINT8 *) IfrFormNvData)) {\r
+    if (!HiiGetBrowserData (&gIp4Config2NvDataGuid, mIp4Config2StorageName, sizeof (IP4_CONFIG2_IFR_NVDATA), (UINT8 *)IfrFormNvData)) {\r
       FreePool (IfrFormNvData);\r
       return EFI_NOT_FOUND;\r
     }\r
@@ -1152,59 +1157,63 @@ Ip4FormCallback (
     Status = EFI_SUCCESS;\r
 \r
     switch (QuestionId) {\r
-    case KEY_LOCAL_IP:\r
-      Status = Ip4Config2StrToIp (IfrFormNvData->StationAddress, &StationAddress.v4);\r
-      if (EFI_ERROR (Status) || IP4_IS_UNSPECIFIED (NTOHL (StationAddress.Addr[0])) || IP4_IS_LOCAL_BROADCAST (NTOHL (StationAddress.Addr[0]))) {\r
-        CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);\r
-        Status = EFI_INVALID_PARAMETER;\r
-      }\r
-      break;\r
+      case KEY_LOCAL_IP:\r
+        Status = Ip4Config2StrToIp (IfrFormNvData->StationAddress, &StationAddress.v4);\r
+        if (EFI_ERROR (Status) || IP4_IS_UNSPECIFIED (NTOHL (StationAddress.Addr[0])) || IP4_IS_LOCAL_BROADCAST (NTOHL (StationAddress.Addr[0]))) {\r
+          CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);\r
+          Status = EFI_INVALID_PARAMETER;\r
+        }\r
 \r
-    case KEY_SUBNET_MASK:\r
-      Status = Ip4Config2StrToIp (IfrFormNvData->SubnetMask, &SubnetMask.v4);\r
-      if (EFI_ERROR (Status) || ((SubnetMask.Addr[0] != 0) && (GetSubnetMaskPrefixLength (&SubnetMask.v4) == 0))) {\r
-        CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Subnet Mask!", NULL);\r
-        Status = EFI_INVALID_PARAMETER;\r
-      }\r
-      break;\r
+        break;\r
 \r
-    case KEY_GATE_WAY:\r
-      Status = Ip4Config2StrToIp (IfrFormNvData->GatewayAddress, &Gateway.v4);\r
-      if (EFI_ERROR (Status) || IP4_IS_LOCAL_BROADCAST(NTOHL(Gateway.Addr[0]))) {\r
-        CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);\r
-        Status = EFI_INVALID_PARAMETER;\r
-      }\r
-      break;\r
-\r
-    case KEY_DNS:\r
-      Status = Ip4Config2StrToIpList (IfrFormNvData->DnsAddress, &DnsAddress, &DnsCount);\r
-      if (!EFI_ERROR (Status) && DnsCount > 0) {\r
-        for (Index = 0; Index < DnsCount; Index ++) {\r
-          CopyMem (&Ip, &DnsAddress[Index], sizeof (IP4_ADDR));\r
-          if (IP4_IS_UNSPECIFIED (NTOHL (Ip)) || IP4_IS_LOCAL_BROADCAST (NTOHL (Ip))) {\r
+      case KEY_SUBNET_MASK:\r
+        Status = Ip4Config2StrToIp (IfrFormNvData->SubnetMask, &SubnetMask.v4);\r
+        if (EFI_ERROR (Status) || ((SubnetMask.Addr[0] != 0) && (GetSubnetMaskPrefixLength (&SubnetMask.v4) == 0))) {\r
+          CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Subnet Mask!", NULL);\r
+          Status = EFI_INVALID_PARAMETER;\r
+        }\r
+\r
+        break;\r
+\r
+      case KEY_GATE_WAY:\r
+        Status = Ip4Config2StrToIp (IfrFormNvData->GatewayAddress, &Gateway.v4);\r
+        if (EFI_ERROR (Status) || IP4_IS_LOCAL_BROADCAST (NTOHL (Gateway.Addr[0]))) {\r
+          CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);\r
+          Status = EFI_INVALID_PARAMETER;\r
+        }\r
+\r
+        break;\r
+\r
+      case KEY_DNS:\r
+        Status = Ip4Config2StrToIpList (IfrFormNvData->DnsAddress, &DnsAddress, &DnsCount);\r
+        if (!EFI_ERROR (Status) && (DnsCount > 0)) {\r
+          for (Index = 0; Index < DnsCount; Index++) {\r
+            CopyMem (&Ip, &DnsAddress[Index], sizeof (IP4_ADDR));\r
+            if (IP4_IS_UNSPECIFIED (NTOHL (Ip)) || IP4_IS_LOCAL_BROADCAST (NTOHL (Ip))) {\r
+              CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);\r
+              Status = EFI_INVALID_PARAMETER;\r
+              break;\r
+            }\r
+          }\r
+        } else {\r
+          if (EFI_ERROR (Status)) {\r
             CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);\r
-            Status = EFI_INVALID_PARAMETER;\r
-            break;\r
           }\r
         }\r
-      } else {\r
-        if (EFI_ERROR (Status)) {\r
-          CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);\r
+\r
+        if (DnsAddress != NULL) {\r
+          FreePool (DnsAddress);\r
         }\r
-      }\r
 \r
-      if(DnsAddress != NULL) {\r
-        FreePool(DnsAddress);\r
-      }\r
-      break;\r
+        break;\r
 \r
-    case KEY_SAVE_CHANGES:\r
-      Status = Ip4Config2ConvertIfrNvDataToConfigNvData (IfrFormNvData, Instance);\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
-      break;\r
+      case KEY_SAVE_CHANGES:\r
+        Status         = Ip4Config2ConvertIfrNvDataToConfigNvData (IfrFormNvData, Instance);\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
+        break;\r
 \r
-    default:\r
-      break;\r
+      default:\r
+        break;\r
     }\r
 \r
     FreePool (IfrFormNvData);\r
@@ -1230,20 +1239,20 @@ Ip4FormCallback (
 **/\r
 EFI_STATUS\r
 Ip4Config2FormInit (\r
-  IN OUT IP4_CONFIG2_INSTANCE     *Instance\r
+  IN OUT IP4_CONFIG2_INSTANCE  *Instance\r
   )\r
 {\r
-  EFI_STATUS                     Status;\r
-  IP4_SERVICE                    *IpSb;\r
-  IP4_FORM_CALLBACK_INFO         *CallbackInfo;\r
-  EFI_HII_CONFIG_ACCESS_PROTOCOL *ConfigAccess;\r
-  VENDOR_DEVICE_PATH             VendorDeviceNode;\r
-  EFI_SERVICE_BINDING_PROTOCOL   *MnpSb;\r
-  CHAR16                         *MacString;\r
-  CHAR16                         MenuString[128];\r
-  CHAR16                         PortString[128];\r
-  CHAR16                         *OldMenuString;\r
-  EFI_DEVICE_PATH_PROTOCOL       *ParentDevicePath;\r
+  EFI_STATUS                      Status;\r
+  IP4_SERVICE                     *IpSb;\r
+  IP4_FORM_CALLBACK_INFO          *CallbackInfo;\r
+  EFI_HII_CONFIG_ACCESS_PROTOCOL  *ConfigAccess;\r
+  VENDOR_DEVICE_PATH              VendorDeviceNode;\r
+  EFI_SERVICE_BINDING_PROTOCOL    *MnpSb;\r
+  CHAR16                          *MacString;\r
+  CHAR16                          MenuString[128];\r
+  CHAR16                          PortString[128];\r
+  CHAR16                          *OldMenuString;\r
+  EFI_DEVICE_PATH_PROTOCOL        *ParentDevicePath;\r
 \r
   IpSb = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);\r
   ASSERT (IpSb != NULL);\r
@@ -1255,7 +1264,7 @@ Ip4Config2FormInit (
   Status = gBS->HandleProtocol (\r
                   IpSb->Controller,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &ParentDevicePath\r
+                  (VOID **)&ParentDevicePath\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -1275,7 +1284,7 @@ Ip4Config2FormInit (
   SetDevicePathNodeLength (&VendorDeviceNode.Header, sizeof (VENDOR_DEVICE_PATH));\r
   CallbackInfo->HiiVendorDevicePath = AppendDevicePathNode (\r
                                         ParentDevicePath,\r
-                                        (EFI_DEVICE_PATH_PROTOCOL *) &VendorDeviceNode\r
+                                        (EFI_DEVICE_PATH_PROTOCOL *)&VendorDeviceNode\r
                                         );\r
   if (CallbackInfo->HiiVendorDevicePath == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
@@ -1306,7 +1315,7 @@ Ip4Config2FormInit (
     Status = gBS->OpenProtocol (\r
                     IpSb->Controller,\r
                     &gEfiManagedNetworkServiceBindingProtocolGuid,\r
-                    (VOID **) &MnpSb,\r
+                    (VOID **)&MnpSb,\r
                     IpSb->Image,\r
                     CallbackInfo->ChildHandle,\r
                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -1377,12 +1386,12 @@ Error:
 **/\r
 VOID\r
 Ip4Config2FormUnload (\r
-  IN OUT IP4_CONFIG2_INSTANCE     *Instance\r
+  IN OUT IP4_CONFIG2_INSTANCE  *Instance\r
   )\r
 {\r
-  IP4_SERVICE                    *IpSb;\r
-  IP4_FORM_CALLBACK_INFO         *CallbackInfo;\r
-  IP4_CONFIG2_NVDATA             *Ip4NvData;\r
+  IP4_SERVICE             *IpSb;\r
+  IP4_FORM_CALLBACK_INFO  *CallbackInfo;\r
+  IP4_CONFIG2_NVDATA      *Ip4NvData;\r
 \r
   IpSb = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);\r
   ASSERT (IpSb != NULL);\r
@@ -1426,16 +1435,16 @@ Ip4Config2FormUnload (
 \r
   Ip4NvData = &Instance->Ip4NvData;\r
 \r
-  if(Ip4NvData->ManualAddress != NULL) {\r
-    FreePool(Ip4NvData->ManualAddress);\r
+  if (Ip4NvData->ManualAddress != NULL) {\r
+    FreePool (Ip4NvData->ManualAddress);\r
   }\r
 \r
-  if(Ip4NvData->GatewayAddress != NULL) {\r
-    FreePool(Ip4NvData->GatewayAddress);\r
+  if (Ip4NvData->GatewayAddress != NULL) {\r
+    FreePool (Ip4NvData->GatewayAddress);\r
   }\r
 \r
-  if(Ip4NvData->DnsAddress != NULL) {\r
-    FreePool(Ip4NvData->DnsAddress);\r
+  if (Ip4NvData->DnsAddress != NULL) {\r
+    FreePool (Ip4NvData->DnsAddress);\r
   }\r
 \r
   Ip4NvData->ManualAddressCount  = 0;\r
index f453e19e9b2a6724c9529e18cd9f1b6ca5fd57fe..0a1e8007a02ec7882c9c05dc3a4c3afb9864480d 100644 (file)
@@ -14,7 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 extern UINT8  Ip4Config2Bin[];\r
 extern UINT8  Ip4DxeStrings[];\r
 \r
-#define NIC_ITEM_CONFIG_SIZE   (sizeof (IP4_CONFIG2_INSTANCE) + (sizeof (EFI_IPv4_ADDRESS) * MAX_IP4_CONFIG_DNS))\r
+#define NIC_ITEM_CONFIG_SIZE  (sizeof (IP4_CONFIG2_INSTANCE) + (sizeof (EFI_IPv4_ADDRESS) * MAX_IP4_CONFIG_DNS))\r
 \r
 /**\r
   Install HII Config Access protocol for network device and allocate resource.\r
@@ -28,7 +28,7 @@ extern UINT8  Ip4DxeStrings[];
 **/\r
 EFI_STATUS\r
 Ip4Config2FormInit (\r
-  IN OUT IP4_CONFIG2_INSTANCE     *Instance\r
+  IN OUT IP4_CONFIG2_INSTANCE  *Instance\r
   );\r
 \r
 /**\r
@@ -39,7 +39,7 @@ Ip4Config2FormInit (
 **/\r
 VOID\r
 Ip4Config2FormUnload (\r
-  IN OUT IP4_CONFIG2_INSTANCE     *Instance\r
+  IN OUT IP4_CONFIG2_INSTANCE  *Instance\r
   );\r
 \r
 #endif\r
index 7fed659ca101d90708674030b422e9529d4ec214..ec483ff01fa9ae1969c226c675295e4965560623 100644 (file)
@@ -10,7 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Ip4Impl.h"\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gIp4DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gIp4DriverBinding = {\r
   Ip4DriverBindingSupported,\r
   Ip4DriverBindingStart,\r
   Ip4DriverBindingStop,\r
@@ -35,13 +35,14 @@ IpSec2InstalledCallback (
   IN VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
+  EFI_STATUS  Status;\r
+\r
   //\r
   // Test if protocol was even found.\r
   // Notification function will be called at least once.\r
   //\r
   Status = gBS->LocateProtocol (&gEfiIpSec2ProtocolGuid, NULL, (VOID **)&mIpSec);\r
-  if (Status == EFI_SUCCESS && mIpSec != NULL) {\r
+  if ((Status == EFI_SUCCESS) && (mIpSec != NULL)) {\r
     //\r
     // Close the event so it does not get called again.\r
     //\r
@@ -69,11 +70,11 @@ IpSec2InstalledCallback (
 EFI_STATUS\r
 EFIAPI\r
 Ip4DriverEntryPoint (\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
-  VOID            *Registration;\r
+  VOID  *Registration;\r
 \r
   EfiCreateProtocolNotifyEvent (\r
     &gEfiIpSec2ProtocolGuid,\r
@@ -114,12 +115,12 @@ Ip4DriverEntryPoint (
 EFI_STATUS\r
 EFIAPI\r
 Ip4DriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL  * This,\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN EFI_HANDLE                   ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL     * RemainingDevicePath OPTIONAL\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Test for the MNP service binding Protocol\r
@@ -167,10 +168,9 @@ Ip4DriverBindingSupported (
 **/\r
 EFI_STATUS\r
 Ip4CleanService (\r
-  IN IP4_SERVICE            *IpSb\r
+  IN IP4_SERVICE  *IpSb\r
   );\r
 \r
-\r
 /**\r
   Create a new IP4 driver service binding private instance.\r
 \r
@@ -187,13 +187,13 @@ Ip4CleanService (
 **/\r
 EFI_STATUS\r
 Ip4CreateService (\r
-  IN  EFI_HANDLE            Controller,\r
-  IN  EFI_HANDLE            ImageHandle,\r
-  OUT IP4_SERVICE           **Service\r
+  IN  EFI_HANDLE   Controller,\r
+  IN  EFI_HANDLE   ImageHandle,\r
+  OUT IP4_SERVICE  **Service\r
   )\r
 {\r
-  IP4_SERVICE               *IpSb;\r
-  EFI_STATUS                Status;\r
+  IP4_SERVICE  *IpSb;\r
+  EFI_STATUS   Status;\r
 \r
   ASSERT (Service != NULL);\r
 \r
@@ -215,23 +215,23 @@ Ip4CreateService (
   IpSb->ServiceBinding.DestroyChild = Ip4ServiceBindingDestroyChild;\r
   IpSb->State                       = IP4_SERVICE_UNSTARTED;\r
 \r
-  IpSb->NumChildren                 = 0;\r
+  IpSb->NumChildren = 0;\r
   InitializeListHead (&IpSb->Children);\r
 \r
   InitializeListHead (&IpSb->Interfaces);\r
-  IpSb->DefaultInterface            = NULL;\r
-  IpSb->DefaultRouteTable           = NULL;\r
+  IpSb->DefaultInterface  = NULL;\r
+  IpSb->DefaultRouteTable = NULL;\r
 \r
   Ip4InitAssembleTable (&IpSb->Assemble);\r
 \r
-  IpSb->IgmpCtrl.Igmpv1QuerySeen    = 0;\r
+  IpSb->IgmpCtrl.Igmpv1QuerySeen = 0;\r
   InitializeListHead (&IpSb->IgmpCtrl.Groups);\r
 \r
-  IpSb->Image                       = ImageHandle;\r
-  IpSb->Controller                  = Controller;\r
+  IpSb->Image      = ImageHandle;\r
+  IpSb->Controller = Controller;\r
 \r
-  IpSb->MnpChildHandle              = NULL;\r
-  IpSb->Mnp                         = NULL;\r
+  IpSb->MnpChildHandle = NULL;\r
+  IpSb->Mnp            = NULL;\r
 \r
   IpSb->MnpConfigData.ReceivedQueueTimeoutValue = 0;\r
   IpSb->MnpConfigData.TransmitQueueTimeoutValue = 0;\r
@@ -246,7 +246,7 @@ Ip4CreateService (
 \r
   ZeroMem (&IpSb->SnpMode, sizeof (EFI_SIMPLE_NETWORK_MODE));\r
 \r
-  IpSb->Timer = NULL;\r
+  IpSb->Timer              = NULL;\r
   IpSb->ReconfigCheckTimer = NULL;\r
 \r
   IpSb->ReconfigEvent = NULL;\r
@@ -316,7 +316,7 @@ Ip4CreateService (
   Status = gBS->OpenProtocol (\r
                   IpSb->MnpChildHandle,\r
                   &gEfiManagedNetworkProtocolGuid,\r
-                  (VOID **) &IpSb->Mnp,\r
+                  (VOID **)&IpSb->Mnp,\r
                   ImageHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -345,7 +345,7 @@ Ip4CreateService (
   }\r
 \r
   IpSb->MacString = NULL;\r
-  Status = NetLibGetMacString (IpSb->Controller, IpSb->Image, &IpSb->MacString);\r
+  Status          = NetLibGetMacString (IpSb->Controller, IpSb->Image, &IpSb->MacString);\r
 \r
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
@@ -375,8 +375,9 @@ Ip4CreateService (
     //\r
     IpSb->MaxPacketSize -= NET_VLAN_TAG_LEN;\r
   }\r
+\r
   IpSb->OldMaxPacketSize = IpSb->MaxPacketSize;\r
-  *Service = IpSb;\r
+  *Service               = IpSb;\r
 \r
   return EFI_SUCCESS;\r
 \r
@@ -387,7 +388,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Clean up a IP4 service binding instance. It will release all\r
   the resource allocated by the instance. The instance may be\r
@@ -403,12 +403,12 @@ ON_ERROR:
 **/\r
 EFI_STATUS\r
 Ip4CleanService (\r
-  IN IP4_SERVICE            *IpSb\r
+  IN IP4_SERVICE  *IpSb\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
-  IpSb->State     = IP4_SERVICE_DESTROY;\r
+  IpSb->State = IP4_SERVICE_DESTROY;\r
 \r
   if (IpSb->Timer != NULL) {\r
     gBS->SetTimer (IpSb->Timer, TimerCancel, 0);\r
@@ -493,8 +493,8 @@ Ip4CleanService (
 EFI_STATUS\r
 EFIAPI\r
 Ip4DestroyChildEntryInHandleBuffer (\r
-  IN LIST_ENTRY         *Entry,\r
-  IN VOID               *Context\r
+  IN LIST_ENTRY  *Entry,\r
+  IN VOID        *Context\r
   )\r
 {\r
   IP4_PROTOCOL                  *IpInstance;\r
@@ -502,14 +502,14 @@ Ip4DestroyChildEntryInHandleBuffer (
   UINTN                         NumberOfChildren;\r
   EFI_HANDLE                    *ChildHandleBuffer;\r
 \r
-  if (Entry == NULL || Context == NULL) {\r
+  if ((Entry == NULL) || (Context == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  IpInstance = NET_LIST_USER_STRUCT_S (Entry, IP4_PROTOCOL, Link, IP4_PROTOCOL_SIGNATURE);\r
-  ServiceBinding    = ((IP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ServiceBinding;\r
-  NumberOfChildren  = ((IP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->NumberOfChildren;\r
-  ChildHandleBuffer = ((IP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ChildHandleBuffer;\r
+  IpInstance        = NET_LIST_USER_STRUCT_S (Entry, IP4_PROTOCOL, Link, IP4_PROTOCOL_SIGNATURE);\r
+  ServiceBinding    = ((IP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ServiceBinding;\r
+  NumberOfChildren  = ((IP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->NumberOfChildren;\r
+  ChildHandleBuffer = ((IP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ChildHandleBuffer;\r
 \r
   if (!NetIsInHandleBuffer (IpInstance->Handle, NumberOfChildren, ChildHandleBuffer)) {\r
     return EFI_SUCCESS;\r
@@ -544,11 +544,11 @@ Ip4DriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  IP4_SERVICE                   *IpSb;\r
-  EFI_IP4_CONFIG2_PROTOCOL      *Ip4Cfg2;\r
-  UINTN                         Index;\r
-  IP4_CONFIG2_DATA_ITEM         *DataItem;\r
+  EFI_STATUS                Status;\r
+  IP4_SERVICE               *IpSb;\r
+  EFI_IP4_CONFIG2_PROTOCOL  *Ip4Cfg2;\r
+  UINTN                     Index;\r
+  IP4_CONFIG2_DATA_ITEM     *DataItem;\r
 \r
   IpSb     = NULL;\r
   Ip4Cfg2  = NULL;\r
@@ -578,7 +578,7 @@ Ip4DriverBindingStart (
 \r
   ASSERT (IpSb != NULL);\r
 \r
-  Ip4Cfg2  = &IpSb->Ip4Config2Instance.Ip4Config2;\r
+  Ip4Cfg2 = &IpSb->Ip4Config2Instance.Ip4Config2;\r
 \r
   //\r
   // Install the Ip4ServiceBinding Protocol onto ControllerHandle\r
@@ -617,11 +617,11 @@ Ip4DriverBindingStart (
                           DataItem->DataSize,\r
                           DataItem->Data.Ptr\r
                           );\r
-      if (EFI_ERROR(Status)) {\r
+      if (EFI_ERROR (Status)) {\r
         goto UNINSTALL_PROTOCOL;\r
       }\r
 \r
-      if (Index == Ip4Config2DataTypePolicy && (*(DataItem->Data.Policy) == Ip4Config2PolicyDhcp)) {\r
+      if ((Index == Ip4Config2DataTypePolicy) && (*(DataItem->Data.Policy) == Ip4Config2PolicyDhcp)) {\r
         break;\r
       }\r
     }\r
@@ -634,7 +634,7 @@ Ip4DriverBindingStart (
   //\r
   Status = Ip4ReceiveFrame (IpSb->DefaultInterface, NULL, Ip4AccpetFrame, IpSb);\r
 \r
-  if (EFI_ERROR (Status) && Status != EFI_ALREADY_STARTED) {\r
+  if (EFI_ERROR (Status) && (Status != EFI_ALREADY_STARTED)) {\r
     goto UNINSTALL_PROTOCOL;\r
   }\r
 \r
@@ -673,7 +673,6 @@ FREE_SERVICE:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Stop this driver on ControllerHandle. This service is called by the\r
   EFI boot service DisconnectController(). In order to\r
@@ -711,9 +710,9 @@ Ip4DriverBindingStop (
   IP4_INTERFACE                            *IpIf;\r
   IP4_ROUTE_TABLE                          *RouteTable;\r
 \r
-  BOOLEAN                                  IsDhcp4;\r
+  BOOLEAN  IsDhcp4;\r
 \r
-  IsDhcp4   = FALSE;\r
+  IsDhcp4 = FALSE;\r
 \r
   NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiManagedNetworkProtocolGuid);\r
   if (NicHandle == NULL) {\r
@@ -731,7 +730,7 @@ Ip4DriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   NicHandle,\r
                   &gEfiIp4ServiceBindingProtocolGuid,\r
-                  (VOID **) &ServiceBinding,\r
+                  (VOID **)&ServiceBinding,\r
                   This->DriverBindingHandle,\r
                   NicHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -747,18 +746,17 @@ Ip4DriverBindingStop (
     gBS->CloseEvent (IpSb->Ip4Config2Instance.Dhcp4Event);\r
     IpSb->Ip4Config2Instance.Dhcp4Event = NULL;\r
   } else if (NumberOfChildren != 0) {\r
-    List = &IpSb->Children;\r
+    List                      = &IpSb->Children;\r
     Context.ServiceBinding    = ServiceBinding;\r
     Context.NumberOfChildren  = NumberOfChildren;\r
     Context.ChildHandleBuffer = ChildHandleBuffer;\r
-    Status = NetDestroyLinkList (\r
-               List,\r
-               Ip4DestroyChildEntryInHandleBuffer,\r
-               &Context,\r
-               NULL\r
-               );\r
+    Status                    = NetDestroyLinkList (\r
+                                  List,\r
+                                  Ip4DestroyChildEntryInHandleBuffer,\r
+                                  &Context,\r
+                                  NULL\r
+                                  );\r
   } else if (IpSb->DefaultInterface->ArpHandle == ControllerHandle) {\r
-\r
     //\r
     // The ARP protocol for the default interface is being uninstalled and all\r
     // its IP child handles should have been destroyed before. So, release the\r
@@ -772,21 +770,21 @@ Ip4DriverBindingStop (
     if (IpIf == NULL) {\r
       goto ON_ERROR;\r
     }\r
+\r
     RouteTable = Ip4CreateRouteTable ();\r
     if (RouteTable == NULL) {\r
       Ip4FreeInterface (IpIf, NULL);\r
-      goto ON_ERROR;;\r
+      goto ON_ERROR;\r
     }\r
 \r
-    IpSb->DefaultInterface  = IpIf;\r
+    IpSb->DefaultInterface = IpIf;\r
     InsertHeadList (&IpSb->Interfaces, &IpIf->Link);\r
     IpSb->DefaultRouteTable = RouteTable;\r
     Ip4ReceiveFrame (IpIf, NULL, Ip4AccpetFrame, IpSb);\r
 \r
     IpSb->State = IP4_SERVICE_UNSTARTED;\r
-\r
   } else if (IsListEmpty (&IpSb->Children)) {\r
-    State           = IpSb->State;\r
+    State = IpSb->State;\r
     //\r
     // OK, clean other resources then uninstall the service binding protocol.\r
     //\r
@@ -809,6 +807,7 @@ Ip4DriverBindingStop (
       FreeUnicodeStringTable (gIp4ControllerNameTable);\r
       gIp4ControllerNameTable = NULL;\r
     }\r
+\r
     FreePool (IpSb);\r
   }\r
 \r
@@ -816,7 +815,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Creates a child handle and installs a protocol.\r
 \r
@@ -843,11 +841,11 @@ Ip4ServiceBindingCreateChild (
   IN OUT EFI_HANDLE                *ChildHandle\r
   )\r
 {\r
-  IP4_SERVICE               *IpSb;\r
-  IP4_PROTOCOL              *IpInstance;\r
-  EFI_TPL                   OldTpl;\r
-  EFI_STATUS                Status;\r
-  VOID                      *Mnp;\r
+  IP4_SERVICE   *IpSb;\r
+  IP4_PROTOCOL  *IpInstance;\r
+  EFI_TPL       OldTpl;\r
+  EFI_STATUS    Status;\r
+  VOID          *Mnp;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -884,7 +882,7 @@ Ip4ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   IpSb->MnpChildHandle,\r
                   &gEfiManagedNetworkProtocolGuid,\r
-                  (VOID **) &Mnp,\r
+                  (VOID **)&Mnp,\r
                   gIp4DriverBinding.DriverBindingHandle,\r
                   IpInstance->Handle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -913,7 +911,6 @@ Ip4ServiceBindingCreateChild (
 ON_ERROR:\r
 \r
   if (EFI_ERROR (Status)) {\r
-\r
     Ip4CleanProtocol (IpInstance);\r
 \r
     FreePool (IpInstance);\r
@@ -922,7 +919,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Destroys a child handle with a protocol installed on it.\r
 \r
@@ -948,11 +944,11 @@ Ip4ServiceBindingDestroyChild (
   IN EFI_HANDLE                    ChildHandle\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  IP4_SERVICE               *IpSb;\r
-  IP4_PROTOCOL              *IpInstance;\r
-  EFI_IP4_PROTOCOL          *Ip4;\r
-  EFI_TPL                   OldTpl;\r
+  EFI_STATUS        Status;\r
+  IP4_SERVICE       *IpSb;\r
+  IP4_PROTOCOL      *IpInstance;\r
+  EFI_IP4_PROTOCOL  *Ip4;\r
+  EFI_TPL           OldTpl;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -961,12 +957,12 @@ Ip4ServiceBindingDestroyChild (
   //\r
   // Retrieve the private context data structures\r
   //\r
-  IpSb   = IP4_SERVICE_FROM_PROTOCOL (This);\r
+  IpSb = IP4_SERVICE_FROM_PROTOCOL (This);\r
 \r
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiIp4ProtocolGuid,\r
-                  (VOID **) &Ip4,\r
+                  (VOID **)&Ip4,\r
                   gIp4DriverBinding.DriverBindingHandle,\r
                   ChildHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1007,7 +1003,7 @@ Ip4ServiceBindingDestroyChild (
          ChildHandle\r
          );\r
 \r
-  if (IpInstance->Interface != NULL && IpInstance->Interface->Arp != NULL) {\r
+  if ((IpInstance->Interface != NULL) && (IpInstance->Interface->Arp != NULL)) {\r
     gBS->CloseProtocol (\r
            IpInstance->Interface->ArpHandle,\r
            &gEfiArpProtocolGuid,\r
index d94bdf3bdec17837603222eedc68f58562628ff8..36cd0c21c9d523b3521c937672995a4ad43a44be 100644 (file)
@@ -16,14 +16,15 @@ extern EFI_COMPONENT_NAME2_PROTOCOL  gIp4ComponentName2;
 extern EFI_UNICODE_STRING_TABLE      *gIp4ControllerNameTable;\r
 \r
 typedef struct {\r
-  EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
-  UINTN                         NumberOfChildren;\r
-  EFI_HANDLE                    *ChildHandleBuffer;\r
+  EFI_SERVICE_BINDING_PROTOCOL    *ServiceBinding;\r
+  UINTN                           NumberOfChildren;\r
+  EFI_HANDLE                      *ChildHandleBuffer;\r
 } IP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT;\r
 \r
 //\r
 // Function prototype for the driver's entry point\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
@@ -42,13 +43,14 @@ typedef struct {
 EFI_STATUS\r
 EFIAPI\r
 Ip4DriverEntryPoint (\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
 //\r
 // Function prototypes for the Driver Binding Protocol\r
 //\r
+\r
 /**\r
   Test to see if this driver supports ControllerHandle. This service\r
   is called by the EFI boot service ConnectController(). In\r
@@ -70,9 +72,9 @@ Ip4DriverEntryPoint (
 EFI_STATUS\r
 EFIAPI\r
 Ip4DriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL  * This,\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN EFI_HANDLE                   ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL     * RemainingDevicePath OPTIONAL\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   );\r
 \r
 /**\r
@@ -96,9 +98,9 @@ Ip4DriverBindingSupported (
 EFI_STATUS\r
 EFIAPI\r
 Ip4DriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL  * This,\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN EFI_HANDLE                   ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL     * RemainingDevicePath OPTIONAL\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   );\r
 \r
 /**\r
@@ -131,6 +133,7 @@ Ip4DriverBindingStop (
 //\r
 // Function prototypes for the ServiceBinding Protocol\r
 //\r
+\r
 /**\r
   Creates a child handle and installs a protocol.\r
 \r
@@ -181,4 +184,5 @@ Ip4ServiceBindingDestroyChild (
   IN EFI_SERVICE_BINDING_PROTOCOL  *This,\r
   IN EFI_HANDLE                    ChildHandle\r
   );\r
+\r
 #endif\r
index 833ffa74ff0dd25199cc6076f67de65bf21adf0b..01dbb176294ece6852451173ac3f5d048a96b67f 100644 (file)
@@ -8,61 +8,59 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include "Ip4Impl.h"\r
 \r
 IP4_ICMP_CLASS\r
-mIcmpClass[] = {\r
-  {ICMP_ECHO_REPLY,         ICMP_QUERY_MESSAGE  },\r
-  {1,                       ICMP_INVALID_MESSAGE},\r
-  {2,                       ICMP_INVALID_MESSAGE},\r
-  {ICMP_DEST_UNREACHABLE,   ICMP_ERROR_MESSAGE  },\r
-  {ICMP_SOURCE_QUENCH,      ICMP_ERROR_MESSAGE  },\r
-  {ICMP_REDIRECT,           ICMP_ERROR_MESSAGE  },\r
-  {6,                       ICMP_INVALID_MESSAGE},\r
-  {7,                       ICMP_INVALID_MESSAGE},\r
-  {ICMP_ECHO_REQUEST,       ICMP_QUERY_MESSAGE  },\r
-  {9,                       ICMP_INVALID_MESSAGE},\r
-  {10,                      ICMP_INVALID_MESSAGE},\r
-  {ICMP_TIME_EXCEEDED,      ICMP_ERROR_MESSAGE  },\r
-  {ICMP_PARAMETER_PROBLEM,  ICMP_ERROR_MESSAGE  },\r
-  {ICMP_TIMESTAMP ,         ICMP_QUERY_MESSAGE  },\r
-  {14,                      ICMP_INVALID_MESSAGE},\r
-  {ICMP_INFO_REQUEST ,      ICMP_QUERY_MESSAGE  },\r
-  {ICMP_INFO_REPLY ,        ICMP_QUERY_MESSAGE  },\r
+  mIcmpClass[] = {\r
+  { ICMP_ECHO_REPLY,        ICMP_QUERY_MESSAGE   },\r
+  { 1,                      ICMP_INVALID_MESSAGE },\r
+  { 2,                      ICMP_INVALID_MESSAGE },\r
+  { ICMP_DEST_UNREACHABLE,  ICMP_ERROR_MESSAGE   },\r
+  { ICMP_SOURCE_QUENCH,     ICMP_ERROR_MESSAGE   },\r
+  { ICMP_REDIRECT,          ICMP_ERROR_MESSAGE   },\r
+  { 6,                      ICMP_INVALID_MESSAGE },\r
+  { 7,                      ICMP_INVALID_MESSAGE },\r
+  { ICMP_ECHO_REQUEST,      ICMP_QUERY_MESSAGE   },\r
+  { 9,                      ICMP_INVALID_MESSAGE },\r
+  { 10,                     ICMP_INVALID_MESSAGE },\r
+  { ICMP_TIME_EXCEEDED,     ICMP_ERROR_MESSAGE   },\r
+  { ICMP_PARAMETER_PROBLEM, ICMP_ERROR_MESSAGE   },\r
+  { ICMP_TIMESTAMP,         ICMP_QUERY_MESSAGE   },\r
+  { 14,                     ICMP_INVALID_MESSAGE },\r
+  { ICMP_INFO_REQUEST,      ICMP_QUERY_MESSAGE   },\r
+  { ICMP_INFO_REPLY,        ICMP_QUERY_MESSAGE   },\r
 };\r
 \r
 EFI_IP4_ICMP_TYPE\r
-mIp4SupportedIcmp[23] = {\r
-  {ICMP_ECHO_REPLY,        ICMP_DEFAULT_CODE        },\r
-\r
-  {ICMP_DEST_UNREACHABLE,  ICMP_NET_UNREACHABLE     },\r
-  {ICMP_DEST_UNREACHABLE,  ICMP_HOST_UNREACHABLE    },\r
-  {ICMP_DEST_UNREACHABLE,  ICMP_PROTO_UNREACHABLE   },\r
-  {ICMP_DEST_UNREACHABLE,  ICMP_PORT_UNREACHABLE    },\r
-  {ICMP_DEST_UNREACHABLE,  ICMP_FRAGMENT_FAILED     },\r
-  {ICMP_DEST_UNREACHABLE,  ICMP_SOURCEROUTE_FAILED  },\r
-  {ICMP_DEST_UNREACHABLE,  ICMP_NET_UNKNOWN         },\r
-  {ICMP_DEST_UNREACHABLE,  ICMP_HOST_UNKNOWN        },\r
-  {ICMP_DEST_UNREACHABLE,  ICMP_SOURCE_ISOLATED     },\r
-  {ICMP_DEST_UNREACHABLE,  ICMP_NET_PROHIBITED      },\r
-  {ICMP_DEST_UNREACHABLE,  ICMP_HOST_PROHIBITED     },\r
-  {ICMP_DEST_UNREACHABLE,  ICMP_NET_UNREACHABLE_TOS },\r
-  {ICMP_DEST_UNREACHABLE,  ICMP_HOST_UNREACHABLE_TOS},\r
-\r
-  {ICMP_SOURCE_QUENCH,     ICMP_DEFAULT_CODE        },\r
-\r
-  {ICMP_REDIRECT,          ICMP_NET_REDIRECT        },\r
-  {ICMP_REDIRECT,          ICMP_HOST_REDIRECT       },\r
-  {ICMP_REDIRECT,          ICMP_NET_TOS_REDIRECT    },\r
-  {ICMP_REDIRECT,          ICMP_HOST_TOS_REDIRECT   },\r
-\r
-  {ICMP_ECHO_REQUEST,      ICMP_DEFAULT_CODE        },\r
-\r
-  {ICMP_TIME_EXCEEDED,     ICMP_TIMEOUT_IN_TRANSIT  },\r
-  {ICMP_TIME_EXCEEDED,     ICMP_TIMEOUT_REASSEMBLE  },\r
-\r
-  {ICMP_PARAMETER_PROBLEM, ICMP_DEFAULT_CODE        },\r
+  mIp4SupportedIcmp[23] = {\r
+  { ICMP_ECHO_REPLY,        ICMP_DEFAULT_CODE         },\r
+\r
+  { ICMP_DEST_UNREACHABLE,  ICMP_NET_UNREACHABLE      },\r
+  { ICMP_DEST_UNREACHABLE,  ICMP_HOST_UNREACHABLE     },\r
+  { ICMP_DEST_UNREACHABLE,  ICMP_PROTO_UNREACHABLE    },\r
+  { ICMP_DEST_UNREACHABLE,  ICMP_PORT_UNREACHABLE     },\r
+  { ICMP_DEST_UNREACHABLE,  ICMP_FRAGMENT_FAILED      },\r
+  { ICMP_DEST_UNREACHABLE,  ICMP_SOURCEROUTE_FAILED   },\r
+  { ICMP_DEST_UNREACHABLE,  ICMP_NET_UNKNOWN          },\r
+  { ICMP_DEST_UNREACHABLE,  ICMP_HOST_UNKNOWN         },\r
+  { ICMP_DEST_UNREACHABLE,  ICMP_SOURCE_ISOLATED      },\r
+  { ICMP_DEST_UNREACHABLE,  ICMP_NET_PROHIBITED       },\r
+  { ICMP_DEST_UNREACHABLE,  ICMP_HOST_PROHIBITED      },\r
+  { ICMP_DEST_UNREACHABLE,  ICMP_NET_UNREACHABLE_TOS  },\r
+  { ICMP_DEST_UNREACHABLE,  ICMP_HOST_UNREACHABLE_TOS },\r
+\r
+  { ICMP_SOURCE_QUENCH,     ICMP_DEFAULT_CODE         },\r
+\r
+  { ICMP_REDIRECT,          ICMP_NET_REDIRECT         },\r
+  { ICMP_REDIRECT,          ICMP_HOST_REDIRECT        },\r
+  { ICMP_REDIRECT,          ICMP_NET_TOS_REDIRECT     },\r
+  { ICMP_REDIRECT,          ICMP_HOST_TOS_REDIRECT    },\r
+\r
+  { ICMP_ECHO_REQUEST,      ICMP_DEFAULT_CODE         },\r
+\r
+  { ICMP_TIME_EXCEEDED,     ICMP_TIMEOUT_IN_TRANSIT   },\r
+  { ICMP_TIME_EXCEEDED,     ICMP_TIMEOUT_REASSEMBLE   },\r
+\r
+  { ICMP_PARAMETER_PROBLEM, ICMP_DEFAULT_CODE         },\r
 };\r
 \r
-\r
-\r
 /**\r
   Process the ICMP redirect. Find the instance then update\r
   its route cache.\r
@@ -88,19 +86,19 @@ mIp4SupportedIcmp[23] = {
 **/\r
 EFI_STATUS\r
 Ip4ProcessIcmpRedirect (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_HEAD               *Head,\r
-  IN NET_BUF                *Packet,\r
-  IN IP4_ICMP_ERROR_HEAD    *Icmp\r
+  IN IP4_SERVICE          *IpSb,\r
+  IN IP4_HEAD             *Head,\r
+  IN NET_BUF              *Packet,\r
+  IN IP4_ICMP_ERROR_HEAD  *Icmp\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  IP4_PROTOCOL              *Ip4Instance;\r
-  IP4_ROUTE_CACHE_ENTRY     *CacheEntry;\r
-  IP4_INTERFACE             *IpIf;\r
-  IP4_ADDR                  Gateway;\r
-  IP4_ADDR                  Src;\r
-  IP4_ADDR                  Dst;\r
+  LIST_ENTRY             *Entry;\r
+  IP4_PROTOCOL           *Ip4Instance;\r
+  IP4_ROUTE_CACHE_ENTRY  *CacheEntry;\r
+  IP4_INTERFACE          *IpIf;\r
+  IP4_ADDR               Gateway;\r
+  IP4_ADDR               Src;\r
+  IP4_ADDR               Dst;\r
 \r
   //\r
   // Find the interface whose IP address is the source of the\r
@@ -129,8 +127,8 @@ Ip4ProcessIcmpRedirect (
       continue;\r
     }\r
 \r
-    Dst = NTOHL (Icmp->IpHead.Dst);\r
-    Src = NTOHL (Icmp->IpHead.Src);\r
+    Dst        = NTOHL (Icmp->IpHead.Dst);\r
+    Src        = NTOHL (Icmp->IpHead.Src);\r
     CacheEntry = Ip4FindRouteCache (Ip4Instance->RouteTable, Dst, Src);\r
 \r
     //\r
@@ -146,7 +144,6 @@ Ip4ProcessIcmpRedirect (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Process the ICMP error packet. If it is an ICMP redirect packet,\r
   update call Ip4ProcessIcmpRedirect to update the IP instance's\r
@@ -164,19 +161,19 @@ Ip4ProcessIcmpRedirect (
 **/\r
 EFI_STATUS\r
 Ip4ProcessIcmpError (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_HEAD               *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_HEAD     *Head,\r
+  IN NET_BUF      *Packet\r
   )\r
 {\r
-  IP4_ICMP_ERROR_HEAD       Icmp;\r
+  IP4_ICMP_ERROR_HEAD  Icmp;\r
 \r
   if (Packet->TotalSize < sizeof (Icmp)) {\r
     NetbufFree (Packet);\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *) &Icmp);\r
+  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *)&Icmp);\r
 \r
   //\r
   // If it is an ICMP redirect error, update the route cache\r
@@ -190,7 +187,6 @@ Ip4ProcessIcmpError (
   return Ip4Demultiplex (IpSb, Head, Packet, NULL, 0);\r
 }\r
 \r
-\r
 /**\r
   Replay an ICMP echo request.\r
 \r
@@ -206,15 +202,15 @@ Ip4ProcessIcmpError (
 **/\r
 EFI_STATUS\r
 Ip4IcmpReplyEcho (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_HEAD               *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_HEAD     *Head,\r
+  IN NET_BUF      *Packet\r
   )\r
 {\r
-  IP4_ICMP_QUERY_HEAD       *Icmp;\r
-  NET_BUF                   *Data;\r
-  EFI_STATUS                Status;\r
-  IP4_HEAD                  ReplyHead;\r
+  IP4_ICMP_QUERY_HEAD  *Icmp;\r
+  NET_BUF              *Data;\r
+  EFI_STATUS           Status;\r
+  IP4_HEAD             ReplyHead;\r
 \r
   //\r
   // make a copy the packet, it is really a bad idea to\r
@@ -233,17 +229,17 @@ Ip4IcmpReplyEcho (
   // use specific destination. See RFC1122. SRR/RR option\r
   // update is omitted.\r
   //\r
-  Icmp                = (IP4_ICMP_QUERY_HEAD *) NetbufGetByte (Data, 0, NULL);\r
+  Icmp = (IP4_ICMP_QUERY_HEAD *)NetbufGetByte (Data, 0, NULL);\r
   ASSERT (Icmp != NULL);\r
   Icmp->Head.Type     = ICMP_ECHO_REPLY;\r
   Icmp->Head.Checksum = 0;\r
-  Icmp->Head.Checksum = (UINT16) (~NetblockChecksum ((UINT8 *) Icmp, Data->TotalSize));\r
+  Icmp->Head.Checksum = (UINT16)(~NetblockChecksum ((UINT8 *)Icmp, Data->TotalSize));\r
 \r
-  ReplyHead.Tos       = 0;\r
-  ReplyHead.Fragment  = 0;\r
-  ReplyHead.Ttl       = 64;\r
-  ReplyHead.Protocol  = EFI_IP_PROTO_ICMP;\r
-  ReplyHead.Src       = 0;\r
+  ReplyHead.Tos      = 0;\r
+  ReplyHead.Fragment = 0;\r
+  ReplyHead.Ttl      = 64;\r
+  ReplyHead.Protocol = EFI_IP_PROTO_ICMP;\r
+  ReplyHead.Src      = 0;\r
 \r
   //\r
   // Ip4Output will select a source for us\r
@@ -270,7 +266,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Process the ICMP query message. If it is an ICMP echo\r
   request, answer it. Otherwise deliver it to upper layer.\r
@@ -287,19 +282,19 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 Ip4ProcessIcmpQuery (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_HEAD               *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_HEAD     *Head,\r
+  IN NET_BUF      *Packet\r
   )\r
 {\r
-  IP4_ICMP_QUERY_HEAD       Icmp;\r
+  IP4_ICMP_QUERY_HEAD  Icmp;\r
 \r
   if (Packet->TotalSize < sizeof (Icmp)) {\r
     NetbufFree (Packet);\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *) &Icmp);\r
+  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *)&Icmp);\r
 \r
   if (Icmp.Head.Type == ICMP_ECHO_REQUEST) {\r
     return Ip4IcmpReplyEcho (IpSb, Head, Packet);\r
@@ -308,7 +303,6 @@ Ip4ProcessIcmpQuery (
   return Ip4Demultiplex (IpSb, Head, Packet, NULL, 0);\r
 }\r
 \r
-\r
 /**\r
   Handle the ICMP packet. First validate the message format,\r
   then according to the message types, process it as query or\r
@@ -326,35 +320,33 @@ Ip4ProcessIcmpQuery (
 **/\r
 EFI_STATUS\r
 Ip4IcmpHandle (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_HEAD               *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_HEAD     *Head,\r
+  IN NET_BUF      *Packet\r
   )\r
 {\r
-  IP4_ICMP_HEAD             Icmp;\r
-  UINT16                    Checksum;\r
+  IP4_ICMP_HEAD  Icmp;\r
+  UINT16         Checksum;\r
 \r
   if (Packet->TotalSize < sizeof (Icmp)) {\r
     goto DROP;\r
   }\r
 \r
-  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *) &Icmp);\r
+  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *)&Icmp);\r
 \r
   if (Icmp.Type > ICMP_TYPE_MAX) {\r
     goto DROP;\r
   }\r
 \r
-  Checksum = (UINT16) (~NetbufChecksum (Packet));\r
+  Checksum = (UINT16)(~NetbufChecksum (Packet));\r
   if ((Icmp.Checksum != 0) && (Checksum != 0)) {\r
     goto DROP;\r
   }\r
 \r
   if (mIcmpClass[Icmp.Type].IcmpClass == ICMP_ERROR_MESSAGE) {\r
     return Ip4ProcessIcmpError (IpSb, Head, Packet);\r
-\r
   } else if (mIcmpClass[Icmp.Type].IcmpClass == ICMP_QUERY_MESSAGE) {\r
     return Ip4ProcessIcmpQuery (IpSb, Head, Packet);\r
-\r
   }\r
 \r
 DROP:\r
index a23952dbdded029d6c259fd8146364bcdaddaf8f..7eea9d5e9f668178d8a365f1ba14e04fd2140eae 100644 (file)
@@ -9,26 +9,26 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef __EFI_IP4_ICMP_H__\r
 #define __EFI_IP4_ICMP_H__\r
 \r
-  //\r
-  // ICMP type definitions\r
-  //\r
-#define ICMP_ECHO_REPLY            0\r
-#define ICMP_DEST_UNREACHABLE      3\r
-#define ICMP_SOURCE_QUENCH         4\r
-#define ICMP_REDIRECT              5\r
-#define ICMP_ECHO_REQUEST          8\r
-#define ICMP_TIME_EXCEEDED         11\r
-#define ICMP_PARAMETER_PROBLEM     12\r
-#define ICMP_TIMESTAMP             13\r
-#define ICMP_INFO_REQUEST          15\r
-#define ICMP_INFO_REPLY            16\r
-#define ICMP_TYPE_MAX              ICMP_INFO_REPLY\r
-\r
-#define ICMP_DEFAULT_CODE          0\r
-\r
-  //\r
-  // ICMP code definitions for ICMP_DEST_UNREACHABLE\r
-  //\r
+//\r
+// ICMP type definitions\r
+//\r
+#define ICMP_ECHO_REPLY         0\r
+#define ICMP_DEST_UNREACHABLE   3\r
+#define ICMP_SOURCE_QUENCH      4\r
+#define ICMP_REDIRECT           5\r
+#define ICMP_ECHO_REQUEST       8\r
+#define ICMP_TIME_EXCEEDED      11\r
+#define ICMP_PARAMETER_PROBLEM  12\r
+#define ICMP_TIMESTAMP          13\r
+#define ICMP_INFO_REQUEST       15\r
+#define ICMP_INFO_REPLY         16\r
+#define ICMP_TYPE_MAX           ICMP_INFO_REPLY\r
+\r
+#define ICMP_DEFAULT_CODE  0\r
+\r
+//\r
+// ICMP code definitions for ICMP_DEST_UNREACHABLE\r
+//\r
 #define ICMP_NET_UNREACHABLE       0\r
 #define ICMP_HOST_UNREACHABLE      1\r
 #define ICMP_PROTO_UNREACHABLE     2  // Host may generate\r
@@ -43,31 +43,31 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define ICMP_NET_UNREACHABLE_TOS   11\r
 #define ICMP_HOST_UNREACHABLE_TOS  12\r
 \r
-  //\r
-  // ICMP code definitions for ICMP_TIME_EXCEEDED\r
-  //\r
-#define ICMP_TIMEOUT_IN_TRANSIT    0\r
-#define ICMP_TIMEOUT_REASSEMBLE    1  // Host may generate\r
-\r
-  //\r
-  // ICMP code definitions for ICMP_TIME_EXCEEDED\r
-  //\r
-#define ICMP_NET_REDIRECT          0\r
-#define ICMP_HOST_REDIRECT         1\r
-#define ICMP_NET_TOS_REDIRECT      2\r
-#define ICMP_HOST_TOS_REDIRECT     3\r
-\r
-  //\r
-  // ICMP message classes, each class of ICMP message shares\r
-  // a common message format. INVALID_MESSAGE is only a flag.\r
-  //\r
-#define ICMP_INVALID_MESSAGE       0\r
-#define ICMP_ERROR_MESSAGE         1\r
-#define ICMP_QUERY_MESSAGE         2\r
+//\r
+// ICMP code definitions for ICMP_TIME_EXCEEDED\r
+//\r
+#define ICMP_TIMEOUT_IN_TRANSIT  0\r
+#define ICMP_TIMEOUT_REASSEMBLE  1    // Host may generate\r
+\r
+//\r
+// ICMP code definitions for ICMP_TIME_EXCEEDED\r
+//\r
+#define ICMP_NET_REDIRECT       0\r
+#define ICMP_HOST_REDIRECT      1\r
+#define ICMP_NET_TOS_REDIRECT   2\r
+#define ICMP_HOST_TOS_REDIRECT  3\r
+\r
+//\r
+// ICMP message classes, each class of ICMP message shares\r
+// a common message format. INVALID_MESSAGE is only a flag.\r
+//\r
+#define ICMP_INVALID_MESSAGE  0\r
+#define ICMP_ERROR_MESSAGE    1\r
+#define ICMP_QUERY_MESSAGE    2\r
 \r
 typedef struct {\r
-  UINT8                   IcmpType;\r
-  UINT8                   IcmpClass;\r
+  UINT8    IcmpType;\r
+  UINT8    IcmpClass;\r
 } IP4_ICMP_CLASS;\r
 \r
 extern IP4_ICMP_CLASS     mIcmpClass[];\r
@@ -90,8 +90,9 @@ extern EFI_IP4_ICMP_TYPE  mIp4SupportedIcmp[];
 **/\r
 EFI_STATUS\r
 Ip4IcmpHandle (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_HEAD               *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_HEAD     *Head,\r
+  IN NET_BUF      *Packet\r
   );\r
+\r
 #endif\r
index edb0b197ca3edbf452281596931d0184670edec8..b312017d2227301c047669c5e24f27bac3fa99da 100644 (file)
@@ -24,7 +24,7 @@ EFI_MAC_ADDRESS  mZeroMacAddress;
 VOID\r
 EFIAPI\r
 Ip4OnFrameSentDpc (\r
-  IN VOID                    *Context\r
+  IN VOID  *Context\r
   );\r
 \r
 /**\r
@@ -37,8 +37,8 @@ Ip4OnFrameSentDpc (
 VOID\r
 EFIAPI\r
 Ip4OnFrameSent (\r
-  IN EFI_EVENT               Event,\r
-  IN VOID                    *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -53,7 +53,7 @@ Ip4OnFrameSent (
 VOID\r
 EFIAPI\r
 Ip4OnArpResolvedDpc (\r
-  IN VOID                   *Context\r
+  IN VOID  *Context\r
   );\r
 \r
 /**\r
@@ -67,8 +67,8 @@ Ip4OnArpResolvedDpc (
 VOID\r
 EFIAPI\r
 Ip4OnArpResolved (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -85,7 +85,7 @@ Ip4OnArpResolved (
 VOID\r
 EFIAPI\r
 Ip4OnFrameReceivedDpc (\r
-  IN VOID                     *Context\r
+  IN VOID  *Context\r
   );\r
 \r
 /**\r
@@ -98,8 +98,8 @@ Ip4OnFrameReceivedDpc (
 VOID\r
 EFIAPI\r
 Ip4OnFrameReceived (\r
-  IN EFI_EVENT                Event,\r
-  IN VOID                     *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -115,13 +115,12 @@ Ip4OnFrameReceived (
 **/\r
 VOID\r
 Ip4CancelFrameArp (\r
-  IN IP4_ARP_QUE            *ArpQue,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN IP4_FRAME_TO_CANCEL    FrameToCancel  OPTIONAL,\r
-  IN VOID                   *Context\r
+  IN IP4_ARP_QUE          *ArpQue,\r
+  IN EFI_STATUS           IoStatus,\r
+  IN IP4_FRAME_TO_CANCEL  FrameToCancel  OPTIONAL,\r
+  IN VOID                 *Context\r
   );\r
 \r
-\r
 /**\r
   Wrap a transmit request into a newly allocated IP4_LINK_TX_TOKEN.\r
 \r
@@ -140,12 +139,12 @@ Ip4CancelFrameArp (
 **/\r
 IP4_LINK_TX_TOKEN *\r
 Ip4WrapLinkTxToken (\r
-  IN IP4_INTERFACE          *Interface,\r
-  IN IP4_PROTOCOL           *IpInstance     OPTIONAL,\r
-  IN NET_BUF                *Packet,\r
-  IN IP4_FRAME_CALLBACK     CallBack,\r
-  IN VOID                   *Context,\r
-  IN IP4_SERVICE            *IpSb\r
+  IN IP4_INTERFACE       *Interface,\r
+  IN IP4_PROTOCOL        *IpInstance     OPTIONAL,\r
+  IN NET_BUF             *Packet,\r
+  IN IP4_FRAME_CALLBACK  CallBack,\r
+  IN VOID                *Context,\r
+  IN IP4_SERVICE         *IpSb\r
   )\r
 {\r
   EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *MnpToken;\r
@@ -154,8 +153,10 @@ Ip4WrapLinkTxToken (
   EFI_STATUS                            Status;\r
   UINT32                                Count;\r
 \r
-  Token = AllocatePool (sizeof (IP4_LINK_TX_TOKEN) + \\r
-            (Packet->BlockOpNum - 1) * sizeof (EFI_MANAGED_NETWORK_FRAGMENT_DATA));\r
+  Token = AllocatePool (\r
+            sizeof (IP4_LINK_TX_TOKEN) + \\r
+            (Packet->BlockOpNum - 1) * sizeof (EFI_MANAGED_NETWORK_FRAGMENT_DATA)\r
+            );\r
 \r
   if (Token == NULL) {\r
     return NULL;\r
@@ -173,8 +174,8 @@ Ip4WrapLinkTxToken (
   CopyMem (&Token->DstMac, &mZeroMacAddress, sizeof (Token->DstMac));\r
   CopyMem (&Token->SrcMac, &Interface->Mac, sizeof (Token->SrcMac));\r
 \r
-  MnpToken          = &(Token->MnpToken);\r
-  MnpToken->Status  = EFI_NOT_READY;\r
+  MnpToken         = &(Token->MnpToken);\r
+  MnpToken->Status = EFI_NOT_READY;\r
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
@@ -189,8 +190,8 @@ Ip4WrapLinkTxToken (
     return NULL;\r
   }\r
 \r
-  MnpTxData                     = &Token->MnpTxData;\r
-  MnpToken->Packet.TxData       = MnpTxData;\r
+  MnpTxData               = &Token->MnpTxData;\r
+  MnpToken->Packet.TxData = MnpTxData;\r
 \r
   MnpTxData->DestinationAddress = &Token->DstMac;\r
   MnpTxData->SourceAddress      = &Token->SrcMac;\r
@@ -198,15 +199,14 @@ Ip4WrapLinkTxToken (
   MnpTxData->DataLength         = Packet->TotalSize;\r
   MnpTxData->HeaderLength       = 0;\r
 \r
-  Count                         = Packet->BlockOpNum;\r
+  Count = Packet->BlockOpNum;\r
 \r
-  NetbufBuildExt (Packet, (NET_FRAGMENT *) MnpTxData->FragmentTable, &Count);\r
-  MnpTxData->FragmentCount      = (UINT16)Count;\r
+  NetbufBuildExt (Packet, (NET_FRAGMENT *)MnpTxData->FragmentTable, &Count);\r
+  MnpTxData->FragmentCount = (UINT16)Count;\r
 \r
   return Token;\r
 }\r
 \r
-\r
 /**\r
   Free the link layer transmit token. It will close the event\r
   then free the memory used.\r
@@ -216,7 +216,7 @@ Ip4WrapLinkTxToken (
 **/\r
 VOID\r
 Ip4FreeLinkTxToken (\r
-  IN IP4_LINK_TX_TOKEN      *Token\r
+  IN IP4_LINK_TX_TOKEN  *Token\r
   )\r
 {\r
   NET_CHECK_SIGNATURE (Token, IP4_FRAME_TX_SIGNATURE);\r
@@ -225,7 +225,6 @@ Ip4FreeLinkTxToken (
   FreePool (Token);\r
 }\r
 \r
-\r
 /**\r
   Create an IP_ARP_QUE structure to request ARP service.\r
 \r
@@ -238,12 +237,12 @@ Ip4FreeLinkTxToken (
 **/\r
 IP4_ARP_QUE *\r
 Ip4CreateArpQue (\r
-  IN IP4_INTERFACE          *Interface,\r
-  IN IP4_ADDR               DestIp\r
+  IN IP4_INTERFACE  *Interface,\r
+  IN IP4_ADDR       DestIp\r
   )\r
 {\r
-  IP4_ARP_QUE               *ArpQue;\r
-  EFI_STATUS                Status;\r
+  IP4_ARP_QUE  *ArpQue;\r
+  EFI_STATUS   Status;\r
 \r
   ArpQue = AllocatePool (sizeof (IP4_ARP_QUE));\r
 \r
@@ -270,13 +269,12 @@ Ip4CreateArpQue (
     return NULL;\r
   }\r
 \r
-  ArpQue->Ip  = DestIp;\r
+  ArpQue->Ip = DestIp;\r
   CopyMem (&ArpQue->Mac, &mZeroMacAddress, sizeof (ArpQue->Mac));\r
 \r
   return ArpQue;\r
 }\r
 \r
-\r
 /**\r
   Remove all the transmit requests queued on the ARP queue, then free it.\r
 \r
@@ -287,8 +285,8 @@ Ip4CreateArpQue (
 **/\r
 VOID\r
 Ip4FreeArpQue (\r
-  IN IP4_ARP_QUE            *ArpQue,\r
-  IN EFI_STATUS             IoStatus\r
+  IN IP4_ARP_QUE  *ArpQue,\r
+  IN EFI_STATUS   IoStatus\r
   )\r
 {\r
   NET_CHECK_SIGNATURE (ArpQue, IP4_FRAME_ARP_SIGNATURE);\r
@@ -302,7 +300,6 @@ Ip4FreeArpQue (
   FreePool (ArpQue);\r
 }\r
 \r
-\r
 /**\r
   Create a link layer receive token to wrap the receive request\r
 \r
@@ -317,10 +314,10 @@ Ip4FreeArpQue (
 **/\r
 IP4_LINK_RX_TOKEN *\r
 Ip4CreateLinkRxToken (\r
-  IN IP4_INTERFACE          *Interface,\r
-  IN IP4_PROTOCOL           *IpInstance,\r
-  IN IP4_FRAME_CALLBACK     CallBack,\r
-  IN VOID                   *Context\r
+  IN IP4_INTERFACE       *Interface,\r
+  IN IP4_PROTOCOL        *IpInstance,\r
+  IN IP4_FRAME_CALLBACK  CallBack,\r
+  IN VOID                *Context\r
   )\r
 {\r
   EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *MnpToken;\r
@@ -338,8 +335,8 @@ Ip4CreateLinkRxToken (
   Token->CallBack   = CallBack;\r
   Token->Context    = Context;\r
 \r
-  MnpToken          = &Token->MnpToken;\r
-  MnpToken->Status  = EFI_NOT_READY;\r
+  MnpToken         = &Token->MnpToken;\r
+  MnpToken->Status = EFI_NOT_READY;\r
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
@@ -358,7 +355,6 @@ Ip4CreateLinkRxToken (
   return Token;\r
 }\r
 \r
-\r
 /**\r
   Free the link layer request token. It will close the event\r
   then free the memory used.\r
@@ -368,17 +364,15 @@ Ip4CreateLinkRxToken (
 **/\r
 VOID\r
 Ip4FreeFrameRxToken (\r
-  IN IP4_LINK_RX_TOKEN      *Token\r
+  IN IP4_LINK_RX_TOKEN  *Token\r
   )\r
 {\r
-\r
   NET_CHECK_SIGNATURE (Token, IP4_FRAME_RX_SIGNATURE);\r
 \r
   gBS->CloseEvent (Token->MnpToken.Event);\r
   FreePool (Token);\r
 }\r
 \r
-\r
 /**\r
   Remove all the frames on the ARP queue that pass the FrameToCancel,\r
   that is, either FrameToCancel is NULL or it returns true for the frame.\r
@@ -392,15 +386,15 @@ Ip4FreeFrameRxToken (
 **/\r
 VOID\r
 Ip4CancelFrameArp (\r
-  IN IP4_ARP_QUE            *ArpQue,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN IP4_FRAME_TO_CANCEL    FrameToCancel  OPTIONAL,\r
-  IN VOID                   *Context\r
+  IN IP4_ARP_QUE          *ArpQue,\r
+  IN EFI_STATUS           IoStatus,\r
+  IN IP4_FRAME_TO_CANCEL  FrameToCancel  OPTIONAL,\r
+  IN VOID                 *Context\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP4_LINK_TX_TOKEN         *Token;\r
+  LIST_ENTRY         *Entry;\r
+  LIST_ENTRY         *Next;\r
+  IP4_LINK_TX_TOKEN  *Token;\r
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &ArpQue->Frames) {\r
     Token = NET_LIST_USER_STRUCT (Entry, IP4_LINK_TX_TOKEN, Link);\r
@@ -414,7 +408,6 @@ Ip4CancelFrameArp (
   }\r
 }\r
 \r
-\r
 /**\r
   Remove all the frames on the interface that pass the FrameToCancel,\r
   either queued on ARP queues or that have already been delivered to\r
@@ -430,16 +423,16 @@ Ip4CancelFrameArp (
 **/\r
 VOID\r
 Ip4CancelFrames (\r
-  IN IP4_INTERFACE          *Interface,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN IP4_FRAME_TO_CANCEL    FrameToCancel    OPTIONAL,\r
-  IN VOID                   *Context\r
+  IN IP4_INTERFACE        *Interface,\r
+  IN EFI_STATUS           IoStatus,\r
+  IN IP4_FRAME_TO_CANCEL  FrameToCancel    OPTIONAL,\r
+  IN VOID                 *Context\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP4_ARP_QUE               *ArpQue;\r
-  IP4_LINK_TX_TOKEN         *Token;\r
+  LIST_ENTRY         *Entry;\r
+  LIST_ENTRY         *Next;\r
+  IP4_ARP_QUE        *ArpQue;\r
+  IP4_LINK_TX_TOKEN  *Token;\r
 \r
   //\r
   // Cancel all the pending frames on ARP requests\r
@@ -467,7 +460,6 @@ Ip4CancelFrames (
   }\r
 }\r
 \r
-\r
 /**\r
   Create an IP4_INTERFACE. Delay the creation of ARP instance until\r
   the interface is configured.\r
@@ -488,8 +480,8 @@ Ip4CreateInterface (
   IN  EFI_HANDLE                    ImageHandle\r
   )\r
 {\r
-  IP4_INTERFACE             *Interface;\r
-  EFI_SIMPLE_NETWORK_MODE   SnpMode;\r
+  IP4_INTERFACE            *Interface;\r
+  EFI_SIMPLE_NETWORK_MODE  SnpMode;\r
 \r
   if (Mnp == NULL) {\r
     return NULL;\r
@@ -503,7 +495,7 @@ Ip4CreateInterface (
 \r
   Interface->Signature = IP4_INTERFACE_SIGNATURE;\r
   InitializeListHead (&Interface->Link);\r
-  Interface->RefCnt     = 1;\r
+  Interface->RefCnt = 1;\r
 \r
   Interface->Ip         = IP4_ALLZERO_ADDRESS;\r
   Interface->SubnetMask = IP4_ALLZERO_ADDRESS;\r
@@ -530,7 +522,7 @@ Ip4CreateInterface (
 \r
   CopyMem (&Interface->Mac, &SnpMode.CurrentAddress, sizeof (Interface->Mac));\r
   CopyMem (&Interface->BroadcastMac, &SnpMode.BroadcastAddress, sizeof (Interface->BroadcastMac));\r
-  Interface->HwaddrLen    = SnpMode.HwAddressSize;\r
+  Interface->HwaddrLen = SnpMode.HwAddressSize;\r
 \r
   InitializeListHead (&Interface->IpInstances);\r
   Interface->PromiscRecv = FALSE;\r
@@ -538,7 +530,6 @@ Ip4CreateInterface (
   return Interface;\r
 }\r
 \r
-\r
 /**\r
   Set the interface's address, create and configure\r
   the ARP child if necessary.\r
@@ -554,13 +545,13 @@ Ip4CreateInterface (
 **/\r
 EFI_STATUS\r
 Ip4SetAddress (\r
-  IN OUT IP4_INTERFACE      *Interface,\r
-  IN     IP4_ADDR           IpAddr,\r
-  IN     IP4_ADDR           SubnetMask\r
+  IN OUT IP4_INTERFACE  *Interface,\r
+  IN     IP4_ADDR       IpAddr,\r
+  IN     IP4_ADDR       SubnetMask\r
   )\r
 {\r
-  EFI_ARP_CONFIG_DATA       ArpConfig;\r
-  EFI_STATUS                Status;\r
+  EFI_ARP_CONFIG_DATA  ArpConfig;\r
+  EFI_STATUS           Status;\r
 \r
   NET_CHECK_SIGNATURE (Interface, IP4_INTERFACE_SIGNATURE);\r
 \r
@@ -572,10 +563,10 @@ Ip4SetAddress (
   // RFC793. If that isn't the case, we are aggregating the\r
   // networks, use the subnet's mask instead.\r
   //\r
-  Interface->Ip             = IpAddr;\r
-  Interface->SubnetMask     = SubnetMask;\r
-  Interface->SubnetBrdcast  = (IpAddr | ~SubnetMask);\r
-  Interface->NetBrdcast     = (IpAddr | ~SubnetMask);\r
+  Interface->Ip            = IpAddr;\r
+  Interface->SubnetMask    = SubnetMask;\r
+  Interface->SubnetBrdcast = (IpAddr | ~SubnetMask);\r
+  Interface->NetBrdcast    = (IpAddr | ~SubnetMask);\r
 \r
   //\r
   // Do clean up for Arp child\r
@@ -621,7 +612,7 @@ Ip4SetAddress (
     Status = gBS->OpenProtocol (\r
                     Interface->ArpHandle,\r
                     &gEfiArpProtocolGuid,\r
-                    (VOID **) &Interface->Arp,\r
+                    (VOID **)&Interface->Arp,\r
                     Interface->Image,\r
                     Interface->Controller,\r
                     EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -667,7 +658,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Filter function to cancel all the frame related to an IP instance.\r
 \r
@@ -682,19 +672,17 @@ ON_ERROR:
 **/\r
 BOOLEAN\r
 Ip4CancelInstanceFrame (\r
-  IN IP4_LINK_TX_TOKEN *Frame,\r
-  IN VOID              *Context\r
+  IN IP4_LINK_TX_TOKEN  *Frame,\r
+  IN VOID               *Context\r
   )\r
 {\r
-  if (Frame->IpInstance == (IP4_PROTOCOL *) Context) {\r
+  if (Frame->IpInstance == (IP4_PROTOCOL *)Context) {\r
     return TRUE;\r
   }\r
 \r
   return FALSE;\r
 }\r
 \r
-\r
-\r
 /**\r
   If there is a pending receive request, cancel it. Don't call\r
   the receive request's callback because this function can be only\r
@@ -709,11 +697,11 @@ Ip4CancelInstanceFrame (
 **/\r
 VOID\r
 Ip4CancelReceive (\r
-  IN IP4_INTERFACE          *Interface\r
+  IN IP4_INTERFACE  *Interface\r
   )\r
 {\r
-  EFI_TPL                   OldTpl;\r
-  IP4_LINK_RX_TOKEN         *Token;\r
+  EFI_TPL            OldTpl;\r
+  IP4_LINK_RX_TOKEN  *Token;\r
 \r
   if ((Token = Interface->RecvRequest) != NULL) {\r
     OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
@@ -725,7 +713,6 @@ Ip4CancelReceive (
   }\r
 }\r
 \r
-\r
 /**\r
   Free the interface used by IpInstance. All the IP instance with\r
   the same Ip/Netmask pair share the same interface. It is reference\r
@@ -742,8 +729,8 @@ Ip4CancelReceive (
 **/\r
 EFI_STATUS\r
 Ip4FreeInterface (\r
-  IN  IP4_INTERFACE         *Interface,\r
-  IN  IP4_PROTOCOL          *IpInstance           OPTIONAL\r
+  IN  IP4_INTERFACE  *Interface,\r
+  IN  IP4_PROTOCOL   *IpInstance           OPTIONAL\r
   )\r
 {\r
   NET_CHECK_SIGNATURE (Interface, IP4_INTERFACE_SIGNATURE);\r
@@ -773,11 +760,11 @@ Ip4FreeInterface (
 \r
   if (Interface->Arp != NULL) {\r
     gBS->CloseProtocol (\r
-          Interface->ArpHandle,\r
-          &gEfiArpProtocolGuid,\r
-          Interface->Image,\r
-          Interface->Controller\r
-          );\r
+           Interface->ArpHandle,\r
+           &gEfiArpProtocolGuid,\r
+           Interface->Image,\r
+           Interface->Controller\r
+           );\r
 \r
     NetLibDestroyServiceChild (\r
       Interface->Controller,\r
@@ -805,16 +792,16 @@ Ip4FreeInterface (
 **/\r
 EFI_STATUS\r
 Ip4SendFrameToDefaultRoute (\r
-  IN  IP4_ARP_QUE               *ArpQue\r
+  IN  IP4_ARP_QUE  *ArpQue\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP4_ROUTE_CACHE_ENTRY     *RtCacheEntry;\r
-  IP4_LINK_TX_TOKEN         *Token;\r
-  IP4_ADDR                  Gateway;\r
-  EFI_STATUS                Status;\r
-  IP4_ROUTE_ENTRY           *DefaultRoute;\r
+  LIST_ENTRY             *Entry;\r
+  LIST_ENTRY             *Next;\r
+  IP4_ROUTE_CACHE_ENTRY  *RtCacheEntry;\r
+  IP4_LINK_TX_TOKEN      *Token;\r
+  IP4_ADDR               Gateway;\r
+  EFI_STATUS             Status;\r
+  IP4_ROUTE_ENTRY        *DefaultRoute;\r
 \r
   //\r
   // ARP resolve failed when using /32 subnet mask.\r
@@ -830,18 +817,22 @@ Ip4SendFrameToDefaultRoute (
     if (Token->IpInstance != NULL) {\r
       RtCacheEntry = Ip4FindRouteCache (Token->IpInstance->RouteTable, NTOHL (ArpQue->Ip), Token->Interface->Ip);\r
     }\r
+\r
     if (RtCacheEntry == NULL) {\r
       RtCacheEntry = Ip4FindRouteCache (Token->IpSb->DefaultRouteTable, NTOHL (ArpQue->Ip), Token->Interface->Ip);\r
     }\r
+\r
     if (RtCacheEntry == NULL) {\r
-      Status= EFI_NO_MAPPING;\r
+      Status = EFI_NO_MAPPING;\r
       goto ON_ERROR;\r
     }\r
-    DefaultRoute = (IP4_ROUTE_ENTRY*)RtCacheEntry->Tag;\r
+\r
+    DefaultRoute = (IP4_ROUTE_ENTRY *)RtCacheEntry->Tag;\r
     if (DefaultRoute == NULL) {\r
-      Status= EFI_NO_MAPPING;\r
+      Status = EFI_NO_MAPPING;\r
       goto ON_ERROR;\r
     }\r
+\r
     //\r
     // Try to send the frame to the default route.\r
     //\r
@@ -850,15 +841,17 @@ Ip4SendFrameToDefaultRoute (
       //\r
       // ARP resolve for the default route is failed, return error to caller.\r
       //\r
-      Status= EFI_NO_MAPPING;\r
+      Status = EFI_NO_MAPPING;\r
       goto ON_ERROR;\r
     }\r
+\r
     RtCacheEntry->NextHop = Gateway;\r
-    Status = Ip4SendFrame (Token->Interface,Token->IpInstance,Token->Packet,Gateway,Token->CallBack,Token->Context,Token->IpSb);\r
+    Status                = Ip4SendFrame (Token->Interface, Token->IpInstance, Token->Packet, Gateway, Token->CallBack, Token->Context, Token->IpSb);\r
     if (EFI_ERROR (Status)) {\r
-      Status= EFI_NO_MAPPING;\r
+      Status = EFI_NO_MAPPING;\r
       goto ON_ERROR;\r
     }\r
+\r
     Ip4FreeRouteCacheEntry (RtCacheEntry);\r
   }\r
 \r
@@ -868,12 +861,12 @@ ON_ERROR:
   if (RtCacheEntry != NULL) {\r
     Ip4FreeRouteCacheEntry (RtCacheEntry);\r
   }\r
+\r
   Token->CallBack (Token->IpInstance, Token->Packet, Status, 0, Token->Context);\r
   Ip4FreeLinkTxToken (Token);\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Callback function when ARP request are finished. It will cancel\r
   all the queued frame if the ARP requests failed. Or transmit them\r
@@ -886,18 +879,18 @@ ON_ERROR:
 VOID\r
 EFIAPI\r
 Ip4OnArpResolvedDpc (\r
-  IN VOID                   *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP4_ARP_QUE               *ArpQue;\r
-  IP4_INTERFACE             *Interface;\r
-  IP4_LINK_TX_TOKEN         *Token;\r
-  EFI_STATUS                Status;\r
-  EFI_STATUS                IoStatus;\r
-\r
-  ArpQue = (IP4_ARP_QUE *) Context;\r
+  LIST_ENTRY         *Entry;\r
+  LIST_ENTRY         *Next;\r
+  IP4_ARP_QUE        *ArpQue;\r
+  IP4_INTERFACE      *Interface;\r
+  IP4_LINK_TX_TOKEN  *Token;\r
+  EFI_STATUS         Status;\r
+  EFI_STATUS         IoStatus;\r
+\r
+  ArpQue = (IP4_ARP_QUE *)Context;\r
   NET_CHECK_SIGNATURE (ArpQue, IP4_FRAME_ARP_SIGNATURE);\r
 \r
   RemoveEntryList (&ArpQue->Link);\r
@@ -919,6 +912,7 @@ Ip4OnArpResolvedDpc (
       //\r
       IoStatus = Ip4SendFrameToDefaultRoute (ArpQue);\r
     }\r
+\r
     goto ON_EXIT;\r
   }\r
 \r
@@ -927,13 +921,13 @@ Ip4OnArpResolvedDpc (
   // queue. It isn't necessary for us to cache the ARP binding because\r
   // we always check the ARP cache first before transmit.\r
   //\r
-  IoStatus = EFI_SUCCESS;\r
+  IoStatus  = EFI_SUCCESS;\r
   Interface = ArpQue->Interface;\r
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &ArpQue->Frames) {\r
     RemoveEntryList (Entry);\r
 \r
-    Token         = NET_LIST_USER_STRUCT (Entry, IP4_LINK_TX_TOKEN, Link);\r
+    Token = NET_LIST_USER_STRUCT (Entry, IP4_LINK_TX_TOKEN, Link);\r
     CopyMem (&Token->DstMac, &ArpQue->Mac, sizeof (Token->DstMac));\r
 \r
     //\r
@@ -970,8 +964,8 @@ ON_EXIT:
 VOID\r
 EFIAPI\r
 Ip4OnArpResolved (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   //\r
@@ -980,8 +974,6 @@ Ip4OnArpResolved (
   QueueDpc (TPL_CALLBACK, Ip4OnArpResolvedDpc, Context);\r
 }\r
 \r
-\r
-\r
 /**\r
   Callback function when frame transmission is finished. It will\r
   call the frame owner's callback function to tell it the result.\r
@@ -992,23 +984,23 @@ Ip4OnArpResolved (
 VOID\r
 EFIAPI\r
 Ip4OnFrameSentDpc (\r
-  IN VOID                    *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  IP4_LINK_TX_TOKEN         *Token;\r
+  IP4_LINK_TX_TOKEN  *Token;\r
 \r
-  Token = (IP4_LINK_TX_TOKEN *) Context;\r
+  Token = (IP4_LINK_TX_TOKEN *)Context;\r
   NET_CHECK_SIGNATURE (Token, IP4_FRAME_TX_SIGNATURE);\r
 \r
   RemoveEntryList (&Token->Link);\r
 \r
   Token->CallBack (\r
-          Token->IpInstance,\r
-          Token->Packet,\r
-          Token->MnpToken.Status,\r
-          0,\r
-          Token->Context\r
-          );\r
+           Token->IpInstance,\r
+           Token->Packet,\r
+           Token->MnpToken.Status,\r
+           0,\r
+           Token->Context\r
+           );\r
 \r
   Ip4FreeLinkTxToken (Token);\r
 }\r
@@ -1023,8 +1015,8 @@ Ip4OnFrameSentDpc (
 VOID\r
 EFIAPI\r
 Ip4OnFrameSent (\r
-  IN EFI_EVENT               Event,\r
-  IN VOID                    *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   //\r
@@ -1033,8 +1025,6 @@ Ip4OnFrameSent (
   QueueDpc (TPL_CALLBACK, Ip4OnFrameSentDpc, Context);\r
 }\r
 \r
-\r
-\r
 /**\r
   Send a frame from the interface. If the next hop is broadcast or\r
   multicast address, it is transmitted immediately. If the next hop\r
@@ -1060,20 +1050,20 @@ Ip4OnFrameSent (
 **/\r
 EFI_STATUS\r
 Ip4SendFrame (\r
-  IN  IP4_INTERFACE         *Interface,\r
-  IN  IP4_PROTOCOL          *IpInstance       OPTIONAL,\r
-  IN  NET_BUF               *Packet,\r
-  IN  IP4_ADDR              NextHop,\r
-  IN  IP4_FRAME_CALLBACK    CallBack,\r
-  IN  VOID                  *Context,\r
-  IN IP4_SERVICE            *IpSb\r
+  IN  IP4_INTERFACE       *Interface,\r
+  IN  IP4_PROTOCOL        *IpInstance       OPTIONAL,\r
+  IN  NET_BUF             *Packet,\r
+  IN  IP4_ADDR            NextHop,\r
+  IN  IP4_FRAME_CALLBACK  CallBack,\r
+  IN  VOID                *Context,\r
+  IN IP4_SERVICE          *IpSb\r
   )\r
 {\r
-  IP4_LINK_TX_TOKEN         *Token;\r
-  LIST_ENTRY                *Entry;\r
-  IP4_ARP_QUE               *ArpQue;\r
-  EFI_ARP_PROTOCOL          *Arp;\r
-  EFI_STATUS                Status;\r
+  IP4_LINK_TX_TOKEN  *Token;\r
+  LIST_ENTRY         *Entry;\r
+  IP4_ARP_QUE        *ArpQue;\r
+  EFI_ARP_PROTOCOL   *Arp;\r
+  EFI_STATUS         Status;\r
 \r
   ASSERT (Interface->Configured);\r
 \r
@@ -1092,9 +1082,7 @@ Ip4SendFrame (
   if (NextHop == IP4_ALLONE_ADDRESS) {\r
     CopyMem (&Token->DstMac, &Interface->BroadcastMac, sizeof (Token->DstMac));\r
     goto SEND_NOW;\r
-\r
   } else if (IP4_IS_MULTICAST (NextHop)) {\r
-\r
     Status = Ip4GetMulticastMac (Interface->Mnp, NextHop, &Token->DstMac);\r
 \r
     if (EFI_ERROR (Status)) {\r
@@ -1120,7 +1108,6 @@ Ip4SendFrame (
 \r
   if (Status == EFI_SUCCESS) {\r
     goto SEND_NOW;\r
-\r
   } else if (Status != EFI_NOT_READY) {\r
     goto ON_ERROR;\r
   }\r
@@ -1187,7 +1174,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Call back function when the received packet is freed.\r
   Check Ip4OnFrameReceived for information.\r
@@ -1198,19 +1184,18 @@ ON_ERROR:
 VOID\r
 EFIAPI\r
 Ip4RecycleFrame (\r
-  IN VOID                   *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  IP4_LINK_RX_TOKEN         *Frame;\r
+  IP4_LINK_RX_TOKEN  *Frame;\r
 \r
-  Frame = (IP4_LINK_RX_TOKEN *) Context;\r
+  Frame = (IP4_LINK_RX_TOKEN *)Context;\r
   NET_CHECK_SIGNATURE (Frame, IP4_FRAME_RX_SIGNATURE);\r
 \r
   gBS->SignalEvent (Frame->MnpToken.Packet.RxData->RecycleEvent);\r
   Ip4FreeFrameRxToken (Frame);\r
 }\r
 \r
-\r
 /**\r
   Received a frame from MNP, wrap it in net buffer then deliver\r
   it to IP's input function. The ownship of the packet also\r
@@ -1225,7 +1210,7 @@ Ip4RecycleFrame (
 VOID\r
 EFIAPI\r
 Ip4OnFrameReceivedDpc (\r
-  IN VOID                     *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
   EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *MnpToken;\r
@@ -1235,7 +1220,7 @@ Ip4OnFrameReceivedDpc (
   NET_BUF                               *Packet;\r
   UINT32                                Flag;\r
 \r
-  Token = (IP4_LINK_RX_TOKEN *) Context;\r
+  Token = (IP4_LINK_RX_TOKEN *)Context;\r
   NET_CHECK_SIGNATURE (Token, IP4_FRAME_RX_SIGNATURE);\r
 \r
   //\r
@@ -1251,7 +1236,7 @@ Ip4OnFrameReceivedDpc (
     Token->CallBack (Token->IpInstance, NULL, MnpToken->Status, 0, Token->Context);\r
     Ip4FreeFrameRxToken (Token);\r
 \r
-    return ;\r
+    return;\r
   }\r
 \r
   //\r
@@ -1269,7 +1254,7 @@ Ip4OnFrameReceivedDpc (
     Token->CallBack (Token->IpInstance, NULL, EFI_OUT_OF_RESOURCES, 0, Token->Context);\r
     Ip4FreeFrameRxToken (Token);\r
 \r
-    return ;\r
+    return;\r
   }\r
 \r
   Flag  = (MnpRxData->BroadcastFlag ? IP4_LINK_BROADCAST : 0);\r
@@ -1289,8 +1274,8 @@ Ip4OnFrameReceivedDpc (
 VOID\r
 EFIAPI\r
 Ip4OnFrameReceived (\r
-  IN EFI_EVENT                Event,\r
-  IN VOID                     *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   //\r
@@ -1299,7 +1284,6 @@ Ip4OnFrameReceived (
   QueueDpc (TPL_CALLBACK, Ip4OnFrameReceivedDpc, Context);\r
 }\r
 \r
-\r
 /**\r
   Request to receive the packet from the interface.\r
 \r
@@ -1317,14 +1301,14 @@ Ip4OnFrameReceived (
 **/\r
 EFI_STATUS\r
 Ip4ReceiveFrame (\r
-  IN  IP4_INTERFACE         *Interface,\r
-  IN  IP4_PROTOCOL          *IpInstance       OPTIONAL,\r
-  IN  IP4_FRAME_CALLBACK    CallBack,\r
-  IN  VOID                  *Context\r
+  IN  IP4_INTERFACE       *Interface,\r
+  IN  IP4_PROTOCOL        *IpInstance       OPTIONAL,\r
+  IN  IP4_FRAME_CALLBACK  CallBack,\r
+  IN  VOID                *Context\r
   )\r
 {\r
-  IP4_LINK_RX_TOKEN *Token;\r
-  EFI_STATUS        Status;\r
+  IP4_LINK_RX_TOKEN  *Token;\r
+  EFI_STATUS         Status;\r
 \r
   NET_CHECK_SIGNATURE (Interface, IP4_INTERFACE_SIGNATURE);\r
 \r
@@ -1339,11 +1323,12 @@ Ip4ReceiveFrame (
   }\r
 \r
   Interface->RecvRequest = Token;\r
-  Status = Interface->Mnp->Receive (Interface->Mnp, &Token->MnpToken);\r
+  Status                 = Interface->Mnp->Receive (Interface->Mnp, &Token->MnpToken);\r
   if (EFI_ERROR (Status)) {\r
     Interface->RecvRequest = NULL;\r
     Ip4FreeFrameRxToken (Token);\r
     return Status;\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
index ec951d30434e2bf1175be48d3a8ec92dc1ccf8a0..8169529021ec6b87229e6e6925d2631332ec4e3b 100644 (file)
@@ -9,10 +9,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef __EFI_IP4_IF_H__\r
 #define __EFI_IP4_IF_H__\r
 \r
-#define IP4_FRAME_RX_SIGNATURE  SIGNATURE_32 ('I', 'P', 'F', 'R')\r
-#define IP4_FRAME_TX_SIGNATURE  SIGNATURE_32 ('I', 'P', 'F', 'T')\r
-#define IP4_FRAME_ARP_SIGNATURE SIGNATURE_32 ('I', 'P', 'F', 'A')\r
-#define IP4_INTERFACE_SIGNATURE SIGNATURE_32 ('I', 'P', 'I', 'F')\r
+#define IP4_FRAME_RX_SIGNATURE   SIGNATURE_32 ('I', 'P', 'F', 'R')\r
+#define IP4_FRAME_TX_SIGNATURE   SIGNATURE_32 ('I', 'P', 'F', 'T')\r
+#define IP4_FRAME_ARP_SIGNATURE  SIGNATURE_32 ('I', 'P', 'F', 'A')\r
+#define IP4_INTERFACE_SIGNATURE  SIGNATURE_32 ('I', 'P', 'I', 'F')\r
 \r
 /**\r
   This prototype is used by both receive and transmission.\r
@@ -40,11 +40,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 typedef\r
 VOID\r
 (*IP4_FRAME_CALLBACK)(\r
-  IN IP4_PROTOCOL              *IpInstance       OPTIONAL,\r
-  IN NET_BUF                   *Packet,\r
-  IN EFI_STATUS                IoStatus,\r
-  IN UINT32                    LinkFlag,\r
-  IN VOID                      *Context\r
+  IN IP4_PROTOCOL  *IpInstance       OPTIONAL,\r
+  IN NET_BUF       *Packet,\r
+  IN EFI_STATUS    IoStatus,\r
+  IN UINT32        LinkFlag,\r
+  IN VOID          *Context\r
   );\r
 \r
 ///\r
@@ -54,14 +54,14 @@ VOID
 /// Reference MNP's spec for information.\r
 ///\r
 typedef struct {\r
-  UINT32                                Signature;\r
-  IP4_INTERFACE                         *Interface;\r
+  UINT32                                  Signature;\r
+  IP4_INTERFACE                           *Interface;\r
 \r
-  IP4_PROTOCOL                          *IpInstance;\r
-  IP4_FRAME_CALLBACK                    CallBack;\r
-  VOID                                  *Context;\r
+  IP4_PROTOCOL                            *IpInstance;\r
+  IP4_FRAME_CALLBACK                      CallBack;\r
+  VOID                                    *Context;\r
 \r
-  EFI_MANAGED_NETWORK_COMPLETION_TOKEN  MnpToken;\r
+  EFI_MANAGED_NETWORK_COMPLETION_TOKEN    MnpToken;\r
 } IP4_LINK_RX_TOKEN;\r
 \r
 ///\r
@@ -69,22 +69,22 @@ typedef struct {
 /// Upon completion, the Callback will be called.\r
 ///\r
 typedef struct {\r
-  UINT32                                Signature;\r
-  LIST_ENTRY                            Link;\r
+  UINT32                                  Signature;\r
+  LIST_ENTRY                              Link;\r
 \r
-  IP4_INTERFACE                         *Interface;\r
-  IP4_SERVICE                           *IpSb;\r
+  IP4_INTERFACE                           *Interface;\r
+  IP4_SERVICE                             *IpSb;\r
 \r
-  IP4_PROTOCOL                          *IpInstance;\r
-  IP4_FRAME_CALLBACK                    CallBack;\r
-  NET_BUF                               *Packet;\r
-  VOID                                  *Context;\r
+  IP4_PROTOCOL                            *IpInstance;\r
+  IP4_FRAME_CALLBACK                      CallBack;\r
+  NET_BUF                                 *Packet;\r
+  VOID                                    *Context;\r
 \r
-  EFI_MAC_ADDRESS                       DstMac;\r
-  EFI_MAC_ADDRESS                       SrcMac;\r
+  EFI_MAC_ADDRESS                         DstMac;\r
+  EFI_MAC_ADDRESS                         SrcMac;\r
 \r
-  EFI_MANAGED_NETWORK_COMPLETION_TOKEN  MnpToken;\r
-  EFI_MANAGED_NETWORK_TRANSMIT_DATA     MnpTxData;\r
+  EFI_MANAGED_NETWORK_COMPLETION_TOKEN    MnpToken;\r
+  EFI_MANAGED_NETWORK_TRANSMIT_DATA       MnpTxData;\r
 } IP4_LINK_TX_TOKEN;\r
 \r
 ///\r
@@ -94,18 +94,18 @@ typedef struct {
 /// be sent all at once the ARP requests succeed.\r
 ///\r
 typedef struct {\r
-  UINT32                  Signature;\r
-  LIST_ENTRY              Link;\r
+  UINT32             Signature;\r
+  LIST_ENTRY         Link;\r
 \r
-  LIST_ENTRY              Frames;\r
-  IP4_INTERFACE           *Interface;\r
+  LIST_ENTRY         Frames;\r
+  IP4_INTERFACE      *Interface;\r
 \r
   //\r
   // ARP requesting staffs\r
   //\r
-  EFI_EVENT               OnResolved;\r
-  IP4_ADDR                Ip;\r
-  EFI_MAC_ADDRESS         Mac;\r
+  EFI_EVENT          OnResolved;\r
+  IP4_ADDR           Ip;\r
+  EFI_MAC_ADDRESS    Mac;\r
 } IP4_ARP_QUE;\r
 \r
 /**\r
@@ -121,8 +121,8 @@ typedef struct {
 typedef\r
 BOOLEAN\r
 (*IP4_FRAME_TO_CANCEL)(\r
-  IP4_LINK_TX_TOKEN       *Frame,\r
-  VOID                    *Context\r
+  IP4_LINK_TX_TOKEN  *Frame,\r
+  VOID               *Context\r
   );\r
 \r
 //\r
@@ -133,53 +133,53 @@ BOOLEAN
 // with 0.0.0.0/0.0.0.0.\r
 //\r
 struct _IP4_INTERFACE {\r
-  UINT32                        Signature;\r
-  LIST_ENTRY                    Link;\r
-  INTN                          RefCnt;\r
+  UINT32                          Signature;\r
+  LIST_ENTRY                      Link;\r
+  INTN                            RefCnt;\r
 \r
   //\r
   // IP address and subnet mask of the interface. It also contains\r
   // the subnet/net broadcast address for quick access. The fields\r
   // are invalid if (Configured == FALSE)\r
   //\r
-  IP4_ADDR                      Ip;\r
-  IP4_ADDR                      SubnetMask;\r
-  IP4_ADDR                      SubnetBrdcast;\r
-  IP4_ADDR                      NetBrdcast;\r
-  BOOLEAN                       Configured;\r
+  IP4_ADDR                        Ip;\r
+  IP4_ADDR                        SubnetMask;\r
+  IP4_ADDR                        SubnetBrdcast;\r
+  IP4_ADDR                        NetBrdcast;\r
+  BOOLEAN                         Configured;\r
 \r
   //\r
   // Handle used to create/destroy ARP child. All the IP children\r
   // share one MNP which is owned by IP service binding.\r
   //\r
-  EFI_HANDLE                    Controller;\r
-  EFI_HANDLE                    Image;\r
+  EFI_HANDLE                      Controller;\r
+  EFI_HANDLE                      Image;\r
 \r
-  EFI_MANAGED_NETWORK_PROTOCOL  *Mnp;\r
-  EFI_ARP_PROTOCOL              *Arp;\r
-  EFI_HANDLE                    ArpHandle;\r
+  EFI_MANAGED_NETWORK_PROTOCOL    *Mnp;\r
+  EFI_ARP_PROTOCOL                *Arp;\r
+  EFI_HANDLE                      ArpHandle;\r
 \r
   //\r
   // Queues to keep the frames sent and waiting ARP request.\r
   //\r
-  LIST_ENTRY                    ArpQues;\r
-  LIST_ENTRY                    SentFrames;\r
-  IP4_LINK_RX_TOKEN             *RecvRequest;\r
+  LIST_ENTRY                      ArpQues;\r
+  LIST_ENTRY                      SentFrames;\r
+  IP4_LINK_RX_TOKEN               *RecvRequest;\r
 \r
   //\r
   // The interface's MAC and broadcast MAC address.\r
   //\r
-  EFI_MAC_ADDRESS               Mac;\r
-  EFI_MAC_ADDRESS               BroadcastMac;\r
-  UINT32                        HwaddrLen;\r
+  EFI_MAC_ADDRESS                 Mac;\r
+  EFI_MAC_ADDRESS                 BroadcastMac;\r
+  UINT32                          HwaddrLen;\r
 \r
   //\r
   // All the IP instances that have the same IP/SubnetMask are linked\r
   // together through IpInstances. If any of the instance enables\r
   // promiscuous receive, PromiscRecv is true.\r
   //\r
-  LIST_ENTRY                    IpInstances;\r
-  BOOLEAN                       PromiscRecv;\r
+  LIST_ENTRY                      IpInstances;\r
+  BOOLEAN                         PromiscRecv;\r
 };\r
 \r
 /**\r
@@ -217,9 +217,9 @@ Ip4CreateInterface (
 **/\r
 EFI_STATUS\r
 Ip4SetAddress (\r
-  IN OUT IP4_INTERFACE      *Interface,\r
-  IN     IP4_ADDR           IpAddr,\r
-  IN     IP4_ADDR           SubnetMask\r
+  IN OUT IP4_INTERFACE  *Interface,\r
+  IN     IP4_ADDR       IpAddr,\r
+  IN     IP4_ADDR       SubnetMask\r
   );\r
 \r
 /**\r
@@ -238,8 +238,8 @@ Ip4SetAddress (
 **/\r
 EFI_STATUS\r
 Ip4FreeInterface (\r
-  IN  IP4_INTERFACE         *Interface,\r
-  IN  IP4_PROTOCOL          *IpInstance           OPTIONAL\r
+  IN  IP4_INTERFACE  *Interface,\r
+  IN  IP4_PROTOCOL   *IpInstance           OPTIONAL\r
   );\r
 \r
 /**\r
@@ -267,13 +267,13 @@ Ip4FreeInterface (
 **/\r
 EFI_STATUS\r
 Ip4SendFrame (\r
-  IN  IP4_INTERFACE         *Interface,\r
-  IN  IP4_PROTOCOL          *IpInstance       OPTIONAL,\r
-  IN  NET_BUF               *Packet,\r
-  IN  IP4_ADDR              NextHop,\r
-  IN  IP4_FRAME_CALLBACK    CallBack,\r
-  IN  VOID                  *Context,\r
-  IN IP4_SERVICE            *IpSb\r
+  IN  IP4_INTERFACE       *Interface,\r
+  IN  IP4_PROTOCOL        *IpInstance       OPTIONAL,\r
+  IN  NET_BUF             *Packet,\r
+  IN  IP4_ADDR            NextHop,\r
+  IN  IP4_FRAME_CALLBACK  CallBack,\r
+  IN  VOID                *Context,\r
+  IN IP4_SERVICE          *IpSb\r
   );\r
 \r
 /**\r
@@ -291,10 +291,10 @@ Ip4SendFrame (
 **/\r
 VOID\r
 Ip4CancelFrames (\r
-  IN IP4_INTERFACE          *Interface,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN IP4_FRAME_TO_CANCEL    FrameToCancel    OPTIONAL,\r
-  IN VOID                   *Context\r
+  IN IP4_INTERFACE        *Interface,\r
+  IN EFI_STATUS           IoStatus,\r
+  IN IP4_FRAME_TO_CANCEL  FrameToCancel    OPTIONAL,\r
+  IN VOID                 *Context\r
   );\r
 \r
 /**\r
@@ -311,7 +311,7 @@ Ip4CancelFrames (
 **/\r
 VOID\r
 Ip4CancelReceive (\r
-  IN IP4_INTERFACE          *Interface\r
+  IN IP4_INTERFACE  *Interface\r
   );\r
 \r
 /**\r
@@ -331,10 +331,10 @@ Ip4CancelReceive (
 **/\r
 EFI_STATUS\r
 Ip4ReceiveFrame (\r
-  IN  IP4_INTERFACE         *Interface,\r
-  IN  IP4_PROTOCOL          *IpInstance       OPTIONAL,\r
-  IN  IP4_FRAME_CALLBACK    CallBack,\r
-  IN  VOID                  *Context\r
+  IN  IP4_INTERFACE       *Interface,\r
+  IN  IP4_PROTOCOL        *IpInstance       OPTIONAL,\r
+  IN  IP4_FRAME_CALLBACK  CallBack,\r
+  IN  VOID                *Context\r
   );\r
 \r
 #endif\r
index f69ba762fe4dedf03afc8c72e7fdd6a1031b390a..e66dae70afc09b55b52543f32de73e82598da704 100644 (file)
@@ -14,7 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 UINT32  mRouteAlertOption = 0x00000494;\r
 \r
-\r
 /**\r
   Init the IGMP control data of the IP4 service instance, configure\r
   MNP to receive ALL SYSTEM multicast.\r
@@ -28,7 +27,7 @@ UINT32  mRouteAlertOption = 0x00000494;
 **/\r
 EFI_STATUS\r
 Ip4InitIgmp (\r
-  IN OUT IP4_SERVICE            *IpSb\r
+  IN OUT IP4_SERVICE  *IpSb\r
   )\r
 {\r
   IGMP_SERVICE_DATA             *IgmpCtrl;\r
@@ -41,13 +40,13 @@ Ip4InitIgmp (
   //\r
   // Configure MNP to receive ALL_SYSTEM multicast\r
   //\r
-  Group    = AllocatePool (sizeof (IGMP_GROUP));\r
+  Group = AllocatePool (sizeof (IGMP_GROUP));\r
 \r
   if (Group == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Mnp               = IpSb->Mnp;\r
+  Mnp = IpSb->Mnp;\r
 \r
   Group->Address    = IP4_ALLSYSTEM_ADDRESS;\r
   Group->RefCnt     = 1;\r
@@ -74,7 +73,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Find the IGMP_GROUP structure which contains the status of multicast\r
   group Address in this IGMP control block\r
@@ -89,12 +87,12 @@ ON_ERROR:
 **/\r
 IGMP_GROUP *\r
 Ip4FindGroup (\r
-  IN IGMP_SERVICE_DATA      *IgmpCtrl,\r
-  IN IP4_ADDR               Address\r
+  IN IGMP_SERVICE_DATA  *IgmpCtrl,\r
+  IN IP4_ADDR           Address\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  IGMP_GROUP                *Group;\r
+  LIST_ENTRY  *Entry;\r
+  IGMP_GROUP  *Group;\r
 \r
   NET_LIST_FOR_EACH (Entry, &IgmpCtrl->Groups) {\r
     Group = NET_LIST_USER_STRUCT (Entry, IGMP_GROUP, Link);\r
@@ -107,7 +105,6 @@ Ip4FindGroup (
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Count the number of IP4 multicast groups that are mapped to the\r
   same MAC address. Several IP4 multicast address may be mapped to\r
@@ -122,13 +119,13 @@ Ip4FindGroup (
 **/\r
 INTN\r
 Ip4FindMac (\r
-  IN IGMP_SERVICE_DATA      *IgmpCtrl,\r
-  IN EFI_MAC_ADDRESS        *Mac\r
+  IN IGMP_SERVICE_DATA  *IgmpCtrl,\r
+  IN EFI_MAC_ADDRESS    *Mac\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  IGMP_GROUP                *Group;\r
-  INTN                      Count;\r
+  LIST_ENTRY  *Entry;\r
+  IGMP_GROUP  *Group;\r
+  INTN        Count;\r
 \r
   Count = 0;\r
 \r
@@ -143,7 +140,6 @@ Ip4FindMac (
   return Count;\r
 }\r
 \r
-\r
 /**\r
   Send an IGMP protocol message to the Dst, such as IGMP v1 membership report.\r
 \r
@@ -161,15 +157,15 @@ Ip4FindMac (
 **/\r
 EFI_STATUS\r
 Ip4SendIgmpMessage (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_ADDR               Dst,\r
-  IN UINT8                  Type,\r
-  IN IP4_ADDR               Group\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_ADDR     Dst,\r
+  IN UINT8        Type,\r
+  IN IP4_ADDR     Group\r
   )\r
 {\r
-  IP4_HEAD                  Head;\r
-  NET_BUF                   *Packet;\r
-  IGMP_HEAD                 *Igmp;\r
+  IP4_HEAD   Head;\r
+  NET_BUF    *Packet;\r
+  IGMP_HEAD  *Igmp;\r
 \r
   //\r
   // Allocate a net buffer to hold the message\r
@@ -185,7 +181,7 @@ Ip4SendIgmpMessage (
   //\r
   NetbufReserve (Packet, IP4_MAX_HEADLEN);\r
 \r
-  Igmp = (IGMP_HEAD *) NetbufAllocSpace (Packet, sizeof (IGMP_HEAD), FALSE);\r
+  Igmp = (IGMP_HEAD *)NetbufAllocSpace (Packet, sizeof (IGMP_HEAD), FALSE);\r
   if (Igmp == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -194,21 +190,21 @@ Ip4SendIgmpMessage (
   Igmp->MaxRespTime = 0;\r
   Igmp->Checksum    = 0;\r
   Igmp->Group       = HTONL (Group);\r
-  Igmp->Checksum    = (UINT16) (~NetblockChecksum ((UINT8 *) Igmp, sizeof (IGMP_HEAD)));\r
+  Igmp->Checksum    = (UINT16)(~NetblockChecksum ((UINT8 *)Igmp, sizeof (IGMP_HEAD)));\r
 \r
-  Head.Tos          = 0;\r
-  Head.Protocol     = IP4_PROTO_IGMP;\r
-  Head.Ttl          = 1;\r
-  Head.Fragment     = 0;\r
-  Head.Dst          = Dst;\r
-  Head.Src          = IP4_ALLZERO_ADDRESS;\r
+  Head.Tos      = 0;\r
+  Head.Protocol = IP4_PROTO_IGMP;\r
+  Head.Ttl      = 1;\r
+  Head.Fragment = 0;\r
+  Head.Dst      = Dst;\r
+  Head.Src      = IP4_ALLZERO_ADDRESS;\r
 \r
   return Ip4Output (\r
            IpSb,\r
            NULL,\r
            Packet,\r
            &Head,\r
-           (UINT8 *) &mRouteAlertOption,\r
+           (UINT8 *)&mRouteAlertOption,\r
            sizeof (UINT32),\r
            IP4_ALLZERO_ADDRESS,\r
            Ip4SysPacketSent,\r
@@ -216,7 +212,6 @@ Ip4SendIgmpMessage (
            );\r
 }\r
 \r
-\r
 /**\r
   Send an IGMP membership report. Depends on whether the server is\r
   v1 or v2, it will send either a V1 or V2 membership report.\r
@@ -232,8 +227,8 @@ Ip4SendIgmpMessage (
 **/\r
 EFI_STATUS\r
 Ip4SendIgmpReport (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_ADDR               Group\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_ADDR     Group\r
   )\r
 {\r
   if (IpSb->IgmpCtrl.Igmpv1QuerySeen != 0) {\r
@@ -243,7 +238,6 @@ Ip4SendIgmpReport (
   }\r
 }\r
 \r
-\r
 /**\r
   Join the multicast group on behalf of this IP4 child\r
 \r
@@ -257,8 +251,8 @@ Ip4SendIgmpReport (
 **/\r
 EFI_STATUS\r
 Ip4JoinGroup (\r
-  IN IP4_PROTOCOL           *IpInstance,\r
-  IN IP4_ADDR               Address\r
+  IN IP4_PROTOCOL  *IpInstance,\r
+  IN IP4_ADDR      Address\r
   )\r
 {\r
   EFI_MANAGED_NETWORK_PROTOCOL  *Mnp;\r
@@ -267,15 +261,15 @@ Ip4JoinGroup (
   IGMP_GROUP                    *Group;\r
   EFI_STATUS                    Status;\r
 \r
-  IpSb      = IpInstance->Service;\r
-  IgmpCtrl  = &IpSb->IgmpCtrl;\r
-  Mnp       = IpSb->Mnp;\r
+  IpSb     = IpInstance->Service;\r
+  IgmpCtrl = &IpSb->IgmpCtrl;\r
+  Mnp      = IpSb->Mnp;\r
 \r
   //\r
   // If the IP service already is a member in the group, just\r
   // increase the reference count and return.\r
   //\r
-  Group     = Ip4FindGroup (IgmpCtrl, Address);\r
+  Group = Ip4FindGroup (IgmpCtrl, Address);\r
 \r
   if (Group != NULL) {\r
     Group->RefCnt++;\r
@@ -323,7 +317,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Leave the IP4 multicast group on behalf of IpInstance.\r
 \r
@@ -338,8 +331,8 @@ ON_ERROR:
 **/\r
 EFI_STATUS\r
 Ip4LeaveGroup (\r
-  IN IP4_PROTOCOL           *IpInstance,\r
-  IN IP4_ADDR               Address\r
+  IN IP4_PROTOCOL  *IpInstance,\r
+  IN IP4_ADDR      Address\r
   )\r
 {\r
   EFI_MANAGED_NETWORK_PROTOCOL  *Mnp;\r
@@ -348,11 +341,11 @@ Ip4LeaveGroup (
   IGMP_GROUP                    *Group;\r
   EFI_STATUS                    Status;\r
 \r
-  IpSb      = IpInstance->Service;\r
-  IgmpCtrl  = &IpSb->IgmpCtrl;\r
-  Mnp       = IpSb->Mnp;\r
+  IpSb     = IpInstance->Service;\r
+  IgmpCtrl = &IpSb->IgmpCtrl;\r
+  Mnp      = IpSb->Mnp;\r
 \r
-  Group     = Ip4FindGroup (IgmpCtrl, Address);\r
+  Group = Ip4FindGroup (IgmpCtrl, Address);\r
 \r
   if (Group == NULL) {\r
     return EFI_NOT_FOUND;\r
@@ -383,7 +376,7 @@ Ip4LeaveGroup (
   // Send a leave report if the membership is reported by us\r
   // and we are talking IGMPv2.\r
   //\r
-  if (Group->ReportByUs && IgmpCtrl->Igmpv1QuerySeen == 0) {\r
+  if (Group->ReportByUs && (IgmpCtrl->Igmpv1QuerySeen == 0)) {\r
     Ip4SendIgmpMessage (IpSb, IP4_ALLROUTER_ADDRESS, IGMP_LEAVE_GROUP, Group->Address);\r
   }\r
 \r
@@ -393,7 +386,6 @@ Ip4LeaveGroup (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Handle the received IGMP message for the IP4 service instance.\r
 \r
@@ -407,16 +399,16 @@ Ip4LeaveGroup (
 **/\r
 EFI_STATUS\r
 Ip4IgmpHandle (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_HEAD               *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_HEAD     *Head,\r
+  IN NET_BUF      *Packet\r
   )\r
 {\r
-  IGMP_SERVICE_DATA         *IgmpCtrl;\r
-  IGMP_HEAD                 Igmp;\r
-  IGMP_GROUP                *Group;\r
-  IP4_ADDR                  Address;\r
-  LIST_ENTRY                *Entry;\r
+  IGMP_SERVICE_DATA  *IgmpCtrl;\r
+  IGMP_HEAD          Igmp;\r
+  IGMP_GROUP         *Group;\r
+  IP4_ADDR           Address;\r
+  LIST_ENTRY         *Entry;\r
 \r
   IgmpCtrl = &IpSb->IgmpCtrl;\r
 \r
@@ -436,65 +428,64 @@ Ip4IgmpHandle (
   NetbufCopy (Packet, 0, sizeof (IGMP_HEAD), (UINT8 *)&Igmp);\r
 \r
   switch (Igmp.Type) {\r
-  case IGMP_MEMBERSHIP_QUERY:\r
-    //\r
-    // If MaxRespTime is zero, it is most likely that we are\r
-    // talking to a V1 router\r
-    //\r
-    if (Igmp.MaxRespTime == 0) {\r
-      IgmpCtrl->Igmpv1QuerySeen = IGMP_V1ROUTER_PRESENT;\r
-      Igmp.MaxRespTime          = 100;\r
-    }\r
+    case IGMP_MEMBERSHIP_QUERY:\r
+      //\r
+      // If MaxRespTime is zero, it is most likely that we are\r
+      // talking to a V1 router\r
+      //\r
+      if (Igmp.MaxRespTime == 0) {\r
+        IgmpCtrl->Igmpv1QuerySeen = IGMP_V1ROUTER_PRESENT;\r
+        Igmp.MaxRespTime          = 100;\r
+      }\r
 \r
-    //\r
-    // Igmp is ticking once per second but MaxRespTime is in\r
-    // the unit of 100ms.\r
-    //\r
-    Igmp.MaxRespTime /= 10;\r
-    Address = NTOHL (Igmp.Group);\r
+      //\r
+      // Igmp is ticking once per second but MaxRespTime is in\r
+      // the unit of 100ms.\r
+      //\r
+      Igmp.MaxRespTime /= 10;\r
+      Address           = NTOHL (Igmp.Group);\r
 \r
-    if (Address == IP4_ALLSYSTEM_ADDRESS) {\r
-      break;\r
-    }\r
+      if (Address == IP4_ALLSYSTEM_ADDRESS) {\r
+        break;\r
+      }\r
 \r
-    NET_LIST_FOR_EACH (Entry, &IgmpCtrl->Groups) {\r
-      Group = NET_LIST_USER_STRUCT (Entry, IGMP_GROUP, Link);\r
+      NET_LIST_FOR_EACH (Entry, &IgmpCtrl->Groups) {\r
+        Group = NET_LIST_USER_STRUCT (Entry, IGMP_GROUP, Link);\r
 \r
-      //\r
-      // If address is all zero, all the memberships will be reported.\r
-      // otherwise only one is reported.\r
-      //\r
-      if ((Address == IP4_ALLZERO_ADDRESS) || (Address == Group->Address)) {\r
         //\r
-        // If the timer is pending, only update it if the time left\r
-        // is longer than the MaxRespTime. TODO: randomize the DelayTime.\r
+        // If address is all zero, all the memberships will be reported.\r
+        // otherwise only one is reported.\r
         //\r
-        if ((Group->DelayTime == 0) || (Group->DelayTime > Igmp.MaxRespTime)) {\r
-          Group->DelayTime = MAX (1, Igmp.MaxRespTime);\r
+        if ((Address == IP4_ALLZERO_ADDRESS) || (Address == Group->Address)) {\r
+          //\r
+          // If the timer is pending, only update it if the time left\r
+          // is longer than the MaxRespTime. TODO: randomize the DelayTime.\r
+          //\r
+          if ((Group->DelayTime == 0) || (Group->DelayTime > Igmp.MaxRespTime)) {\r
+            Group->DelayTime = MAX (1, Igmp.MaxRespTime);\r
+          }\r
         }\r
       }\r
-    }\r
 \r
-    break;\r
+      break;\r
 \r
-  case IGMP_V1_MEMBERSHIP_REPORT:\r
-  case IGMP_V2_MEMBERSHIP_REPORT:\r
-    Address = NTOHL (Igmp.Group);\r
-    Group   = Ip4FindGroup (IgmpCtrl, Address);\r
+    case IGMP_V1_MEMBERSHIP_REPORT:\r
+    case IGMP_V2_MEMBERSHIP_REPORT:\r
+      Address = NTOHL (Igmp.Group);\r
+      Group   = Ip4FindGroup (IgmpCtrl, Address);\r
 \r
-    if ((Group != NULL) && (Group->DelayTime > 0)) {\r
-      Group->DelayTime  = 0;\r
-      Group->ReportByUs = FALSE;\r
-    }\r
+      if ((Group != NULL) && (Group->DelayTime > 0)) {\r
+        Group->DelayTime  = 0;\r
+        Group->ReportByUs = FALSE;\r
+      }\r
 \r
-    break;\r
+      break;\r
   }\r
 \r
   NetbufFree (Packet);\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   The periodical timer function for IGMP. It does the following\r
   things:\r
@@ -508,12 +499,12 @@ Ip4IgmpHandle (
 **/\r
 VOID\r
 Ip4IgmpTicking (\r
-  IN IP4_SERVICE            *IpSb\r
+  IN IP4_SERVICE  *IpSb\r
   )\r
 {\r
-  IGMP_SERVICE_DATA         *IgmpCtrl;\r
-  LIST_ENTRY                *Entry;\r
-  IGMP_GROUP                *Group;\r
+  IGMP_SERVICE_DATA  *IgmpCtrl;\r
+  LIST_ENTRY         *Entry;\r
+  IGMP_GROUP         *Group;\r
 \r
   IgmpCtrl = &IpSb->IgmpCtrl;\r
 \r
@@ -539,7 +530,6 @@ Ip4IgmpTicking (
   }\r
 }\r
 \r
-\r
 /**\r
   Add a group address to the array of group addresses.\r
   The caller should make sure that no duplicated address\r
@@ -557,12 +547,12 @@ Ip4IgmpTicking (
 **/\r
 IP4_ADDR *\r
 Ip4CombineGroups (\r
-  IN  IP4_ADDR              *Source,\r
-  IN  UINT32                Count,\r
-  IN  IP4_ADDR              Addr\r
+  IN  IP4_ADDR  *Source,\r
+  IN  UINT32    Count,\r
+  IN  IP4_ADDR  Addr\r
   )\r
 {\r
-  IP4_ADDR                  *Groups;\r
+  IP4_ADDR  *Groups;\r
 \r
   Groups = AllocatePool (sizeof (IP4_ADDR) * (Count + 1));\r
 \r
@@ -576,7 +566,6 @@ Ip4CombineGroups (
   return Groups;\r
 }\r
 \r
-\r
 /**\r
   Remove a group address from the array of group addresses.\r
   Although the function doesn't assume the byte order of the\r
@@ -593,12 +582,12 @@ Ip4CombineGroups (
 **/\r
 INTN\r
 Ip4RemoveGroupAddr (\r
-  IN OUT IP4_ADDR               *Groups,\r
-  IN     UINT32                 Count,\r
-  IN     IP4_ADDR               Addr\r
+  IN OUT IP4_ADDR  *Groups,\r
+  IN     UINT32    Count,\r
+  IN     IP4_ADDR  Addr\r
   )\r
 {\r
-  UINT32                    Index;\r
+  UINT32  Index;\r
 \r
   for (Index = 0; Index < Count; Index++) {\r
     if (Groups[Index] == Addr) {\r
index 56631bd4afb359a57f45072044f06f9f27f73638..d5028aea7c214daf8b3ac696d2ef5830edc1baf2 100644 (file)
@@ -16,15 +16,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define IGMP_V2_MEMBERSHIP_REPORT  0x16\r
 #define IGMP_LEAVE_GROUP           0x17\r
 \r
-#define IGMP_V1ROUTER_PRESENT      400\r
-#define IGMP_UNSOLICIATED_REPORT   10\r
+#define IGMP_V1ROUTER_PRESENT     400\r
+#define IGMP_UNSOLICIATED_REPORT  10\r
 \r
 #pragma pack(1)\r
 typedef struct {\r
-  UINT8                   Type;\r
-  UINT8                   MaxRespTime;\r
-  UINT16                  Checksum;\r
-  IP4_ADDR                Group;\r
+  UINT8       Type;\r
+  UINT8       MaxRespTime;\r
+  UINT16      Checksum;\r
+  IP4_ADDR    Group;\r
 } IGMP_HEAD;\r
 #pragma pack()\r
 \r
@@ -35,12 +35,12 @@ typedef struct {
 /// "idle member" state.\r
 ///\r
 typedef struct {\r
-  LIST_ENTRY              Link;\r
-  INTN                    RefCnt;\r
-  IP4_ADDR                Address;\r
-  INTN                    DelayTime;\r
-  BOOLEAN                 ReportByUs;\r
-  EFI_MAC_ADDRESS         Mac;\r
+  LIST_ENTRY         Link;\r
+  INTN               RefCnt;\r
+  IP4_ADDR           Address;\r
+  INTN               DelayTime;\r
+  BOOLEAN            ReportByUs;\r
+  EFI_MAC_ADDRESS    Mac;\r
 } IGMP_GROUP;\r
 \r
 ///\r
@@ -49,8 +49,8 @@ typedef struct {
 /// connected network is v1 or v2.\r
 ///\r
 typedef struct {\r
-  INTN                    Igmpv1QuerySeen;\r
-  LIST_ENTRY              Groups;\r
+  INTN          Igmpv1QuerySeen;\r
+  LIST_ENTRY    Groups;\r
 } IGMP_SERVICE_DATA;\r
 \r
 /**\r
@@ -66,7 +66,7 @@ typedef struct {
 **/\r
 EFI_STATUS\r
 Ip4InitIgmp (\r
-  IN OUT IP4_SERVICE            *IpSb\r
+  IN OUT IP4_SERVICE  *IpSb\r
   );\r
 \r
 /**\r
@@ -82,8 +82,8 @@ Ip4InitIgmp (
 **/\r
 EFI_STATUS\r
 Ip4JoinGroup (\r
-  IN IP4_PROTOCOL           *IpInstance,\r
-  IN IP4_ADDR               Address\r
+  IN IP4_PROTOCOL  *IpInstance,\r
+  IN IP4_ADDR      Address\r
   );\r
 \r
 /**\r
@@ -100,8 +100,8 @@ Ip4JoinGroup (
 **/\r
 EFI_STATUS\r
 Ip4LeaveGroup (\r
-  IN IP4_PROTOCOL           *IpInstance,\r
-  IN IP4_ADDR               Address\r
+  IN IP4_PROTOCOL  *IpInstance,\r
+  IN IP4_ADDR      Address\r
   );\r
 \r
 /**\r
@@ -117,9 +117,9 @@ Ip4LeaveGroup (
 **/\r
 EFI_STATUS\r
 Ip4IgmpHandle (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_HEAD               *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_HEAD     *Head,\r
+  IN NET_BUF      *Packet\r
   );\r
 \r
 /**\r
@@ -135,7 +135,7 @@ Ip4IgmpHandle (
 **/\r
 VOID\r
 Ip4IgmpTicking (\r
-  IN IP4_SERVICE            *IpSb\r
+  IN IP4_SERVICE  *IpSb\r
   );\r
 \r
 /**\r
@@ -155,9 +155,9 @@ Ip4IgmpTicking (
 **/\r
 IP4_ADDR *\r
 Ip4CombineGroups (\r
-  IN  IP4_ADDR              *Source,\r
-  IN  UINT32                Count,\r
-  IN  IP4_ADDR              Addr\r
+  IN  IP4_ADDR  *Source,\r
+  IN  UINT32    Count,\r
+  IN  IP4_ADDR  Addr\r
   );\r
 \r
 /**\r
@@ -176,9 +176,9 @@ Ip4CombineGroups (
 **/\r
 INTN\r
 Ip4RemoveGroupAddr (\r
-  IN OUT IP4_ADDR               *Groups,\r
-  IN     UINT32                 Count,\r
-  IN     IP4_ADDR               Addr\r
+  IN OUT IP4_ADDR  *Groups,\r
+  IN     UINT32    Count,\r
+  IN     IP4_ADDR  Addr\r
   );\r
 \r
 /**\r
@@ -195,7 +195,8 @@ Ip4RemoveGroupAddr (
 **/\r
 IGMP_GROUP *\r
 Ip4FindGroup (\r
-  IN IGMP_SERVICE_DATA      *IgmpCtrl,\r
-  IN IP4_ADDR               Address\r
+  IN IGMP_SERVICE_DATA  *IgmpCtrl,\r
+  IN IP4_ADDR           Address\r
   );\r
+\r
 #endif\r
index 5935d405dd59af9110b11c775447ded7ed27033c..4786214b12774e4e6ba24a67b2561f580ca9dd28 100644 (file)
@@ -7,7 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Ip4Impl.h"\r
 \r
-EFI_IPSEC2_PROTOCOL    *mIpSec = NULL;\r
+EFI_IPSEC2_PROTOCOL  *mIpSec = NULL;\r
 \r
 /**\r
   Gets the current operational settings for this instance of the EFI IPv4 Protocol driver.\r
@@ -30,10 +30,10 @@ EFI_IPSEC2_PROTOCOL    *mIpSec = NULL;
 EFI_STATUS\r
 EFIAPI\r
 EfiIp4GetModeData (\r
-  IN  CONST EFI_IP4_PROTOCOL                *This,\r
-  OUT       EFI_IP4_MODE_DATA               *Ip4ModeData     OPTIONAL,\r
-  OUT       EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData   OPTIONAL,\r
-  OUT       EFI_SIMPLE_NETWORK_MODE         *SnpModeData     OPTIONAL\r
+  IN  CONST EFI_IP4_PROTOCOL                 *This,\r
+  OUT       EFI_IP4_MODE_DATA                *Ip4ModeData     OPTIONAL,\r
+  OUT       EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData   OPTIONAL,\r
+  OUT       EFI_SIMPLE_NETWORK_MODE          *SnpModeData     OPTIONAL\r
   );\r
 \r
 /**\r
@@ -82,8 +82,8 @@ EfiIp4GetModeData (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp4Configure (\r
-  IN EFI_IP4_PROTOCOL       *This,\r
-  IN EFI_IP4_CONFIG_DATA    *IpConfigData       OPTIONAL\r
+  IN EFI_IP4_PROTOCOL     *This,\r
+  IN EFI_IP4_CONFIG_DATA  *IpConfigData       OPTIONAL\r
   );\r
 \r
 /**\r
@@ -119,9 +119,9 @@ EfiIp4Configure (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp4Groups (\r
-  IN EFI_IP4_PROTOCOL       *This,\r
-  IN BOOLEAN                JoinFlag,\r
-  IN EFI_IPv4_ADDRESS       *GroupAddress     OPTIONAL\r
+  IN EFI_IP4_PROTOCOL  *This,\r
+  IN BOOLEAN           JoinFlag,\r
+  IN EFI_IPv4_ADDRESS  *GroupAddress     OPTIONAL\r
   );\r
 \r
 /**\r
@@ -177,11 +177,11 @@ EfiIp4Groups (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp4Routes (\r
-  IN EFI_IP4_PROTOCOL       *This,\r
-  IN BOOLEAN                DeleteRoute,\r
-  IN EFI_IPv4_ADDRESS       *SubnetAddress,\r
-  IN EFI_IPv4_ADDRESS       *SubnetMask,\r
-  IN EFI_IPv4_ADDRESS       *GatewayAddress\r
+  IN EFI_IP4_PROTOCOL  *This,\r
+  IN BOOLEAN           DeleteRoute,\r
+  IN EFI_IPv4_ADDRESS  *SubnetAddress,\r
+  IN EFI_IPv4_ADDRESS  *SubnetMask,\r
+  IN EFI_IPv4_ADDRESS  *GatewayAddress\r
   );\r
 \r
 /**\r
@@ -216,8 +216,8 @@ EfiIp4Routes (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp4Transmit (\r
-  IN EFI_IP4_PROTOCOL         *This,\r
-  IN EFI_IP4_COMPLETION_TOKEN *Token\r
+  IN EFI_IP4_PROTOCOL          *This,\r
+  IN EFI_IP4_COMPLETION_TOKEN  *Token\r
   );\r
 \r
 /**\r
@@ -255,8 +255,8 @@ EfiIp4Transmit (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp4Receive (\r
-  IN EFI_IP4_PROTOCOL         *This,\r
-  IN EFI_IP4_COMPLETION_TOKEN *Token\r
+  IN EFI_IP4_PROTOCOL          *This,\r
+  IN EFI_IP4_COMPLETION_TOKEN  *Token\r
   );\r
 \r
 /**\r
@@ -291,8 +291,8 @@ EfiIp4Receive (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp4Cancel (\r
-  IN EFI_IP4_PROTOCOL         *This,\r
-  IN EFI_IP4_COMPLETION_TOKEN *Token    OPTIONAL\r
+  IN EFI_IP4_PROTOCOL          *This,\r
+  IN EFI_IP4_COMPLETION_TOKEN  *Token    OPTIONAL\r
   );\r
 \r
 /**\r
@@ -325,11 +325,11 @@ EfiIp4Cancel (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp4Poll (\r
-  IN EFI_IP4_PROTOCOL       *This\r
+  IN EFI_IP4_PROTOCOL  *This\r
   );\r
 \r
 EFI_IP4_PROTOCOL\r
-mEfiIp4ProtocolTemplete = {\r
+  mEfiIp4ProtocolTemplete = {\r
   EfiIp4GetModeData,\r
   EfiIp4Configure,\r
   EfiIp4Groups,\r
@@ -361,18 +361,18 @@ mEfiIp4ProtocolTemplete = {
 EFI_STATUS\r
 EFIAPI\r
 EfiIp4GetModeData (\r
-  IN  CONST EFI_IP4_PROTOCOL                *This,\r
-  OUT       EFI_IP4_MODE_DATA               *Ip4ModeData     OPTIONAL,\r
-  OUT       EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData   OPTIONAL,\r
-  OUT       EFI_SIMPLE_NETWORK_MODE         *SnpModeData     OPTIONAL\r
+  IN  CONST EFI_IP4_PROTOCOL                 *This,\r
+  OUT       EFI_IP4_MODE_DATA                *Ip4ModeData     OPTIONAL,\r
+  OUT       EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData   OPTIONAL,\r
+  OUT       EFI_SIMPLE_NETWORK_MODE          *SnpModeData     OPTIONAL\r
   )\r
 {\r
-  IP4_PROTOCOL              *IpInstance;\r
-  IP4_SERVICE               *IpSb;\r
-  EFI_IP4_CONFIG_DATA       *Config;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
-  IP4_ADDR                  Ip;\r
+  IP4_PROTOCOL         *IpInstance;\r
+  IP4_SERVICE          *IpSb;\r
+  EFI_IP4_CONFIG_DATA  *Config;\r
+  EFI_STATUS           Status;\r
+  EFI_TPL              OldTpl;\r
+  IP4_ADDR             Ip;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -387,18 +387,18 @@ EfiIp4GetModeData (
     // IsStarted is "whether the EfiIp4Configure has been called".\r
     // IsConfigured is "whether the station address has been configured"\r
     //\r
-    Ip4ModeData->IsStarted     = (BOOLEAN)(IpInstance->State == IP4_STATE_CONFIGED);\r
+    Ip4ModeData->IsStarted = (BOOLEAN)(IpInstance->State == IP4_STATE_CONFIGED);\r
     CopyMem (&Ip4ModeData->ConfigData, &IpInstance->ConfigData, sizeof (Ip4ModeData->ConfigData));\r
-    Ip4ModeData->IsConfigured  = FALSE;\r
+    Ip4ModeData->IsConfigured = FALSE;\r
 \r
-    Ip4ModeData->GroupCount    = IpInstance->GroupCount;\r
-    Ip4ModeData->GroupTable    = (EFI_IPv4_ADDRESS *) IpInstance->Groups;\r
+    Ip4ModeData->GroupCount = IpInstance->GroupCount;\r
+    Ip4ModeData->GroupTable = (EFI_IPv4_ADDRESS *)IpInstance->Groups;\r
 \r
     Ip4ModeData->IcmpTypeCount = 23;\r
     Ip4ModeData->IcmpTypeList  = mIp4SupportedIcmp;\r
 \r
-    Ip4ModeData->RouteTable    = NULL;\r
-    Ip4ModeData->RouteCount    = 0;\r
+    Ip4ModeData->RouteTable = NULL;\r
+    Ip4ModeData->RouteCount = 0;\r
 \r
     Ip4ModeData->MaxPacketSize = IpSb->MaxPacketSize;\r
 \r
@@ -409,7 +409,7 @@ EfiIp4GetModeData (
     // using the default one, such as a ftp server.\r
     //\r
     if (Ip4ModeData->IsStarted) {\r
-      Config  = &Ip4ModeData->ConfigData;\r
+      Config = &Ip4ModeData->ConfigData;\r
 \r
       Ip = HTONL (IpInstance->Interface->Ip);\r
       CopyMem (&Config->StationAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));\r
@@ -443,7 +443,6 @@ EfiIp4GetModeData (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Config the MNP parameter used by IP. The IP driver use one MNP\r
   child to transmit/receive frames. By default, it configures MNP\r
@@ -464,17 +463,17 @@ EfiIp4GetModeData (
 **/\r
 EFI_STATUS\r
 Ip4ServiceConfigMnp (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN BOOLEAN                Force\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN BOOLEAN      Force\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *ProtoEntry;\r
-  IP4_INTERFACE             *IpIf;\r
-  IP4_PROTOCOL              *IpInstance;\r
-  BOOLEAN                   Reconfig;\r
-  BOOLEAN                   PromiscReceive;\r
-  EFI_STATUS                Status;\r
+  LIST_ENTRY     *Entry;\r
+  LIST_ENTRY     *ProtoEntry;\r
+  IP4_INTERFACE  *IpIf;\r
+  IP4_PROTOCOL   *IpInstance;\r
+  BOOLEAN        Reconfig;\r
+  BOOLEAN        PromiscReceive;\r
+  EFI_STATUS     Status;\r
 \r
   Reconfig       = FALSE;\r
   PromiscReceive = FALSE;\r
@@ -486,7 +485,6 @@ Ip4ServiceConfigMnp (
     // filter also.\r
     //\r
     NET_LIST_FOR_EACH (Entry, &IpSb->Interfaces) {\r
-\r
       IpIf              = NET_LIST_USER_STRUCT (Entry, IP4_INTERFACE, Link);\r
       IpIf->PromiscRecv = FALSE;\r
 \r
@@ -507,7 +505,7 @@ Ip4ServiceConfigMnp (
       return EFI_SUCCESS;\r
     }\r
 \r
-    Reconfig  = TRUE;\r
+    Reconfig                                     = TRUE;\r
     IpSb->MnpConfigData.EnablePromiscuousReceive = PromiscReceive;\r
   }\r
 \r
@@ -523,7 +521,6 @@ Ip4ServiceConfigMnp (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Initialize the IP4_PROTOCOL structure to the unconfigured states.\r
 \r
@@ -533,8 +530,8 @@ Ip4ServiceConfigMnp (
 **/\r
 VOID\r
 Ip4InitProtocol (\r
-  IN     IP4_SERVICE            *IpSb,\r
-  IN OUT IP4_PROTOCOL           *IpInstance\r
+  IN     IP4_SERVICE   *IpSb,\r
+  IN OUT IP4_PROTOCOL  *IpInstance\r
   )\r
 {\r
   ASSERT ((IpSb != NULL) && (IpInstance != NULL));\r
@@ -544,12 +541,12 @@ Ip4InitProtocol (
   IpInstance->Signature = IP4_PROTOCOL_SIGNATURE;\r
   CopyMem (&IpInstance->Ip4Proto, &mEfiIp4ProtocolTemplete, sizeof (IpInstance->Ip4Proto));\r
   IpInstance->State     = IP4_STATE_UNCONFIGED;\r
-  IpInstance->InDestroy   = FALSE;\r
+  IpInstance->InDestroy = FALSE;\r
   IpInstance->Service   = IpSb;\r
 \r
   InitializeListHead (&IpInstance->Link);\r
-  NetMapInit  (&IpInstance->RxTokens);\r
-  NetMapInit  (&IpInstance->TxTokens);\r
+  NetMapInit (&IpInstance->RxTokens);\r
+  NetMapInit (&IpInstance->TxTokens);\r
   InitializeListHead (&IpInstance->Received);\r
   InitializeListHead (&IpInstance->Delivered);\r
   InitializeListHead (&IpInstance->AddrLink);\r
@@ -557,7 +554,6 @@ Ip4InitProtocol (
   EfiInitializeLock (&IpInstance->RecycleLock, TPL_NOTIFY);\r
 }\r
 \r
-\r
 /**\r
   Configure the IP4 child. If the child is already configured,\r
   change the configuration parameter. Otherwise configure it\r
@@ -595,7 +591,7 @@ Ip4ConfigProtocol (
 \r
   IpSb = IpInstance->Service;\r
 \r
-  Ip4Config2  = NULL;\r
+  Ip4Config2 = NULL;\r
 \r
   //\r
   // User is changing packet filters. It must be stopped\r
@@ -646,7 +642,6 @@ Ip4ConfigProtocol (
 \r
     if (IpIf != NULL) {\r
       NET_GET_REF (IpIf);\r
-\r
     } else {\r
       IpIf = Ip4CreateInterface (IpSb->Mnp, IpSb->Controller, IpSb->Image);\r
 \r
@@ -686,13 +681,13 @@ Ip4ConfigProtocol (
       Policy = IpSb->Ip4Config2Instance.Policy;\r
       if (Policy != Ip4Config2PolicyDhcp) {\r
         Ip4Config2 = &IpSb->Ip4Config2Instance.Ip4Config2;\r
-        Policy = Ip4Config2PolicyDhcp;\r
-        Status= Ip4Config2->SetData (\r
-                              Ip4Config2,\r
-                              Ip4Config2DataTypePolicy,\r
-                              sizeof (EFI_IP4_CONFIG2_POLICY),\r
-                              &Policy\r
-                              );\r
+        Policy     = Ip4Config2PolicyDhcp;\r
+        Status     = Ip4Config2->SetData (\r
+                                   Ip4Config2,\r
+                                   Ip4Config2DataTypePolicy,\r
+                                   sizeof (EFI_IP4_CONFIG2_POLICY),\r
+                                   &Policy\r
+                                   );\r
         if (EFI_ERROR (Status)) {\r
           goto ON_ERROR;\r
         }\r
@@ -715,11 +710,11 @@ Ip4ConfigProtocol (
 \r
   IpInstance->Interface = IpIf;\r
   if (IpIf->Arp != NULL) {\r
-    Arp = NULL;\r
+    Arp    = NULL;\r
     Status = gBS->OpenProtocol (\r
                     IpIf->ArpHandle,\r
                     &gEfiArpProtocolGuid,\r
-                    (VOID **) &Arp,\r
+                    (VOID **)&Arp,\r
                     gIp4DriverBinding.DriverBindingHandle,\r
                     IpInstance->Handle,\r
                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -729,10 +724,11 @@ Ip4ConfigProtocol (
       goto ON_ERROR;\r
     }\r
   }\r
+\r
   InsertTailList (&IpIf->IpInstances, &IpInstance->AddrLink);\r
 \r
   CopyMem (&IpInstance->ConfigData, Config, sizeof (IpInstance->ConfigData));\r
-  IpInstance->State       = IP4_STATE_CONFIGED;\r
+  IpInstance->State = IP4_STATE_CONFIGED;\r
 \r
   //\r
   // Although EFI_NO_MAPPING is an error code, the IP child has been\r
@@ -751,7 +747,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Clean up the IP4 child, release all the resources used by it.\r
 \r
@@ -763,7 +758,7 @@ ON_ERROR:
 **/\r
 EFI_STATUS\r
 Ip4CleanProtocol (\r
-  IN  IP4_PROTOCOL          *IpInstance\r
+  IN  IP4_PROTOCOL  *IpInstance\r
   )\r
 {\r
   if (EFI_ERROR (Ip4Cancel (IpInstance, NULL))) {\r
@@ -780,7 +775,6 @@ Ip4CleanProtocol (
   // hasn't been called. Just leave it alone.\r
   //\r
   if (!IsListEmpty (&IpInstance->Delivered)) {\r
-    ;\r
   }\r
 \r
   if (IpInstance->Interface != NULL) {\r
@@ -793,6 +787,7 @@ Ip4CleanProtocol (
              IpInstance->Handle\r
              );\r
     }\r
+\r
     Ip4FreeInterface (IpInstance->Interface, IpInstance);\r
     IpInstance->Interface = NULL;\r
   }\r
@@ -814,8 +809,8 @@ Ip4CleanProtocol (
 \r
   if (IpInstance->Groups != NULL) {\r
     FreePool (IpInstance->Groups);\r
-    IpInstance->Groups      = NULL;\r
-    IpInstance->GroupCount  = 0;\r
+    IpInstance->Groups     = NULL;\r
+    IpInstance->GroupCount = 0;\r
   }\r
 \r
   NetMapClean (&IpInstance->TxTokens);\r
@@ -825,7 +820,6 @@ Ip4CleanProtocol (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Assigns an IPv4 address and subnet mask to this EFI IPv4 Protocol driver instance.\r
 \r
@@ -872,17 +866,17 @@ Ip4CleanProtocol (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp4Configure (\r
-  IN EFI_IP4_PROTOCOL       *This,\r
-  IN EFI_IP4_CONFIG_DATA    *IpConfigData       OPTIONAL\r
+  IN EFI_IP4_PROTOCOL     *This,\r
+  IN EFI_IP4_CONFIG_DATA  *IpConfigData       OPTIONAL\r
   )\r
 {\r
-  IP4_PROTOCOL              *IpInstance;\r
-  EFI_IP4_CONFIG_DATA       *Current;\r
-  EFI_TPL                   OldTpl;\r
-  EFI_STATUS                Status;\r
-  BOOLEAN                   AddrOk;\r
-  IP4_ADDR                  IpAddress;\r
-  IP4_ADDR                  SubnetMask;\r
+  IP4_PROTOCOL         *IpInstance;\r
+  EFI_IP4_CONFIG_DATA  *Current;\r
+  EFI_TPL              OldTpl;\r
+  EFI_STATUS           Status;\r
+  BOOLEAN              AddrOk;\r
+  IP4_ADDR             IpAddress;\r
+  IP4_ADDR             SubnetMask;\r
 \r
   //\r
   // First, validate the parameters\r
@@ -898,7 +892,6 @@ EfiIp4Configure (
   // Validate the configuration first.\r
   //\r
   if (IpConfigData != NULL) {\r
-\r
     CopyMem (&IpAddress, &IpConfigData->StationAddress, sizeof (IP4_ADDR));\r
     CopyMem (&SubnetMask, &IpConfigData->SubnetMask, sizeof (IP4_ADDR));\r
 \r
@@ -931,8 +924,9 @@ EfiIp4Configure (
       }\r
 \r
       if (!Current->UseDefaultAddress &&\r
-         (!EFI_IP4_EQUAL (&Current->StationAddress, &IpConfigData->StationAddress) ||\r
-          !EFI_IP4_EQUAL (&Current->SubnetMask, &IpConfigData->SubnetMask))) {\r
+          (!EFI_IP4_EQUAL (&Current->StationAddress, &IpConfigData->StationAddress) ||\r
+           !EFI_IP4_EQUAL (&Current->SubnetMask, &IpConfigData->SubnetMask)))\r
+      {\r
         Status = EFI_ALREADY_STARTED;\r
         goto ON_EXIT;\r
       }\r
@@ -971,10 +965,8 @@ EfiIp4Configure (
 ON_EXIT:\r
   gBS->RestoreTPL (OldTpl);\r
   return Status;\r
-\r
 }\r
 \r
-\r
 /**\r
   Change the IP4 child's multicast setting. The caller\r
   should make sure that the parameters is valid.\r
@@ -992,14 +984,14 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 Ip4Groups (\r
-  IN IP4_PROTOCOL           *IpInstance,\r
-  IN BOOLEAN                JoinFlag,\r
-  IN EFI_IPv4_ADDRESS       *GroupAddress       OPTIONAL\r
+  IN IP4_PROTOCOL      *IpInstance,\r
+  IN BOOLEAN           JoinFlag,\r
+  IN EFI_IPv4_ADDRESS  *GroupAddress       OPTIONAL\r
   )\r
 {\r
-  IP4_ADDR                  *Members;\r
-  IP4_ADDR                  Group;\r
-  UINT32                    Index;\r
+  IP4_ADDR  *Members;\r
+  IP4_ADDR  Group;\r
+  UINT32    Index;\r
 \r
   //\r
   // Add it to the instance's Groups, and join the group by IGMP.\r
@@ -1045,7 +1037,7 @@ Ip4Groups (
   // Must iterate from the end to the beginning because the GroupCount\r
   // is decremented each time an address is removed..\r
   //\r
-  for (Index = IpInstance->GroupCount; Index > 0 ; Index--) {\r
+  for (Index = IpInstance->GroupCount; Index > 0; Index--) {\r
     ASSERT (IpInstance->Groups != NULL);\r
     Group = IpInstance->Groups[Index - 1];\r
     if ((GroupAddress == NULL) || EFI_IP4_EQUAL (&Group, GroupAddress)) {\r
@@ -1072,7 +1064,6 @@ Ip4Groups (
   return ((GroupAddress != NULL) ? EFI_NOT_FOUND : EFI_SUCCESS);\r
 }\r
 \r
-\r
 /**\r
   Joins and leaves multicast groups.\r
 \r
@@ -1106,15 +1097,15 @@ Ip4Groups (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp4Groups (\r
-  IN EFI_IP4_PROTOCOL       *This,\r
-  IN BOOLEAN                JoinFlag,\r
-  IN EFI_IPv4_ADDRESS       *GroupAddress     OPTIONAL\r
+  IN EFI_IP4_PROTOCOL  *This,\r
+  IN BOOLEAN           JoinFlag,\r
+  IN EFI_IPv4_ADDRESS  *GroupAddress     OPTIONAL\r
   )\r
 {\r
-  IP4_PROTOCOL              *IpInstance;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
-  IP4_ADDR                  McastIp;\r
+  IP4_PROTOCOL  *IpInstance;\r
+  EFI_STATUS    Status;\r
+  EFI_TPL       OldTpl;\r
+  IP4_ADDR      McastIp;\r
 \r
   if ((This == NULL) || (JoinFlag && (GroupAddress == NULL))) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1148,7 +1139,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Adds and deletes routing table entries.\r
 \r
@@ -1202,26 +1192,27 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 EfiIp4Routes (\r
-  IN EFI_IP4_PROTOCOL       *This,\r
-  IN BOOLEAN                DeleteRoute,\r
-  IN EFI_IPv4_ADDRESS       *SubnetAddress,\r
-  IN EFI_IPv4_ADDRESS       *SubnetMask,\r
-  IN EFI_IPv4_ADDRESS       *GatewayAddress\r
+  IN EFI_IP4_PROTOCOL  *This,\r
+  IN BOOLEAN           DeleteRoute,\r
+  IN EFI_IPv4_ADDRESS  *SubnetAddress,\r
+  IN EFI_IPv4_ADDRESS  *SubnetMask,\r
+  IN EFI_IPv4_ADDRESS  *GatewayAddress\r
   )\r
 {\r
-  IP4_PROTOCOL              *IpInstance;\r
-  IP4_INTERFACE             *IpIf;\r
-  IP4_ADDR                  Dest;\r
-  IP4_ADDR                  Netmask;\r
-  IP4_ADDR                  Nexthop;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
+  IP4_PROTOCOL   *IpInstance;\r
+  IP4_INTERFACE  *IpIf;\r
+  IP4_ADDR       Dest;\r
+  IP4_ADDR       Netmask;\r
+  IP4_ADDR       Nexthop;\r
+  EFI_STATUS     Status;\r
+  EFI_TPL        OldTpl;\r
 \r
   //\r
   // First, validate the parameters\r
   //\r
   if ((This == NULL) || (SubnetAddress == NULL) ||\r
-      (SubnetMask == NULL) || (GatewayAddress == NULL)) {\r
+      (SubnetMask == NULL) || (GatewayAddress == NULL))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1246,7 +1237,7 @@ EfiIp4Routes (
   Netmask = NTOHL (Netmask);\r
   Nexthop = NTOHL (Nexthop);\r
 \r
-  IpIf    = IpInstance->Interface;\r
+  IpIf = IpInstance->Interface;\r
 \r
   if (!IP4_IS_VALID_NETMASK (Netmask)) {\r
     Status = EFI_INVALID_PARAMETER;\r
@@ -1257,9 +1248,9 @@ EfiIp4Routes (
   // the gateway address must be a unicast on the connected network if not zero.\r
   //\r
   if ((Nexthop != IP4_ALLZERO_ADDRESS) &&\r
-      ((IpIf->SubnetMask != IP4_ALLONE_ADDRESS && !IP4_NET_EQUAL (Nexthop, IpIf->Ip, IpIf->SubnetMask)) ||\r
-        IP4_IS_BROADCAST (Ip4GetNetCast (Nexthop, IpIf)))) {\r
-\r
+      (((IpIf->SubnetMask != IP4_ALLONE_ADDRESS) && !IP4_NET_EQUAL (Nexthop, IpIf->Ip, IpIf->SubnetMask)) ||\r
+       IP4_IS_BROADCAST (Ip4GetNetCast (Nexthop, IpIf))))\r
+  {\r
     Status = EFI_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
   }\r
@@ -1275,7 +1266,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Check whether the user's token or event has already\r
   been enqueued on IP4's list.\r
@@ -1293,16 +1283,16 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 Ip4TokenExist (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   )\r
 {\r
   EFI_IP4_COMPLETION_TOKEN  *Token;\r
   EFI_IP4_COMPLETION_TOKEN  *TokenInItem;\r
 \r
-  Token       = (EFI_IP4_COMPLETION_TOKEN *) Context;\r
-  TokenInItem = (EFI_IP4_COMPLETION_TOKEN *) Item->Key;\r
+  Token       = (EFI_IP4_COMPLETION_TOKEN *)Context;\r
+  TokenInItem = (EFI_IP4_COMPLETION_TOKEN *)Item->Key;\r
 \r
   if ((Token == TokenInItem) || (Token->Event == TokenInItem->Event)) {\r
     return EFI_ACCESS_DENIED;\r
@@ -1325,18 +1315,18 @@ Ip4TokenExist (
 **/\r
 EFI_STATUS\r
 Ip4TxTokenValid (\r
-  IN EFI_IP4_COMPLETION_TOKEN   *Token,\r
-  IN IP4_INTERFACE              *IpIf,\r
-  IN BOOLEAN                    RawData\r
+  IN EFI_IP4_COMPLETION_TOKEN  *Token,\r
+  IN IP4_INTERFACE             *IpIf,\r
+  IN BOOLEAN                   RawData\r
   )\r
 {\r
-  EFI_IP4_TRANSMIT_DATA     *TxData;\r
-  EFI_IP4_OVERRIDE_DATA     *Override;\r
-  IP4_ADDR                  Src;\r
-  IP4_ADDR                  Gateway;\r
-  UINT32                    Offset;\r
-  UINT32                    Index;\r
-  UINT32                    HeadLen;\r
+  EFI_IP4_TRANSMIT_DATA  *TxData;\r
+  EFI_IP4_OVERRIDE_DATA  *Override;\r
+  IP4_ADDR               Src;\r
+  IP4_ADDR               Gateway;\r
+  UINT32                 Offset;\r
+  UINT32                 Index;\r
+  UINT32                 HeadLen;\r
 \r
   if ((Token == NULL) || (Token->Event == NULL) || (Token->Packet.TxData == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1359,8 +1349,8 @@ Ip4TxTokenValid (
 \r
   for (Index = 0; Index < TxData->FragmentCount; Index++) {\r
     if ((TxData->FragmentTable[Index].FragmentBuffer == NULL) ||\r
-        (TxData->FragmentTable[Index].FragmentLength == 0)) {\r
-\r
+        (TxData->FragmentTable[Index].FragmentLength == 0))\r
+    {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
@@ -1407,8 +1397,8 @@ Ip4TxTokenValid (
 \r
     if ((NetGetIpClass (Src) > IP4_ADDR_CLASSC) ||\r
         (Src == IP4_ALLONE_ADDRESS) ||\r
-        IP4_IS_BROADCAST (Ip4GetNetCast (Src, IpIf))) {\r
-\r
+        IP4_IS_BROADCAST (Ip4GetNetCast (Src, IpIf)))\r
+    {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
@@ -1419,8 +1409,8 @@ Ip4TxTokenValid (
     if ((Gateway != IP4_ALLZERO_ADDRESS) &&\r
         ((NetGetIpClass (Gateway) > IP4_ADDR_CLASSC) ||\r
          !IP4_NET_EQUAL (Gateway, IpIf->Ip, IpIf->SubnetMask) ||\r
-         IP4_IS_BROADCAST (Ip4GetNetCast (Gateway, IpIf)))) {\r
-\r
+         IP4_IS_BROADCAST (Ip4GetNetCast (Gateway, IpIf))))\r
+    {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
@@ -1431,15 +1421,14 @@ Ip4TxTokenValid (
   HeadLen = sizeof (IP4_HEAD) + ((TxData->OptionsLength + 3) &~0x03);\r
 \r
   if ((HeadLen > IP4_MAX_HEADLEN) ||\r
-      (TxData->TotalDataLength + HeadLen > IP4_MAX_PACKET_SIZE)) {\r
-\r
+      (TxData->TotalDataLength + HeadLen > IP4_MAX_PACKET_SIZE))\r
+  {\r
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   The callback function for the net buffer which wraps the user's\r
   transmit token. Although it seems this function is pretty simple,\r
@@ -1464,13 +1453,13 @@ Ip4TxTokenValid (
 VOID\r
 EFIAPI\r
 Ip4FreeTxToken (\r
-  IN VOID                   *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  IP4_TXTOKEN_WRAP          *Wrap;\r
-  NET_MAP_ITEM              *Item;\r
+  IP4_TXTOKEN_WRAP  *Wrap;\r
+  NET_MAP_ITEM      *Item;\r
 \r
-  Wrap = (IP4_TXTOKEN_WRAP *) Context;\r
+  Wrap = (IP4_TXTOKEN_WRAP *)Context;\r
 \r
   //\r
   // Signal IpSecRecycleEvent to inform IPsec free the memory\r
@@ -1501,7 +1490,6 @@ Ip4FreeTxToken (
   FreePool (Wrap);\r
 }\r
 \r
-\r
 /**\r
   The callback function to Ip4Output to update the transmit status.\r
 \r
@@ -1514,14 +1502,14 @@ Ip4FreeTxToken (
 **/\r
 VOID\r
 Ip4OnPacketSent (\r
-  IP4_PROTOCOL              *Ip4Instance,\r
-  NET_BUF                   *Packet,\r
-  EFI_STATUS                IoStatus,\r
-  UINT32                    Flag,\r
-  VOID                      *Context\r
+  IP4_PROTOCOL  *Ip4Instance,\r
+  NET_BUF       *Packet,\r
+  EFI_STATUS    IoStatus,\r
+  UINT32        Flag,\r
+  VOID          *Context\r
   )\r
 {\r
-  IP4_TXTOKEN_WRAP          *Wrap;\r
+  IP4_TXTOKEN_WRAP  *Wrap;\r
 \r
   //\r
   // This is the transmission request from upper layer,\r
@@ -1536,13 +1524,12 @@ Ip4OnPacketSent (
   // release when all the fragments are release. Check the comments\r
   // in Ip4FreeTxToken and Ip4Output for information.\r
   //\r
-  Wrap                = (IP4_TXTOKEN_WRAP *) Context;\r
+  Wrap                = (IP4_TXTOKEN_WRAP *)Context;\r
   Wrap->Token->Status = IoStatus;\r
 \r
   NetbufFree (Wrap->Packet);\r
 }\r
 \r
-\r
 /**\r
   Places outgoing data packets into the transmit queue.\r
 \r
@@ -1575,27 +1562,27 @@ Ip4OnPacketSent (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp4Transmit (\r
-  IN EFI_IP4_PROTOCOL         *This,\r
-  IN EFI_IP4_COMPLETION_TOKEN *Token\r
+  IN EFI_IP4_PROTOCOL          *This,\r
+  IN EFI_IP4_COMPLETION_TOKEN  *Token\r
   )\r
 {\r
-  IP4_SERVICE               *IpSb;\r
-  IP4_PROTOCOL              *IpInstance;\r
-  IP4_INTERFACE             *IpIf;\r
-  IP4_TXTOKEN_WRAP          *Wrap;\r
-  EFI_IP4_TRANSMIT_DATA     *TxData;\r
-  EFI_IP4_CONFIG_DATA       *Config;\r
-  EFI_IP4_OVERRIDE_DATA     *Override;\r
-  IP4_HEAD                  Head;\r
-  IP4_ADDR                  GateWay;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
-  BOOLEAN                   DontFragment;\r
-  UINT32                    HeadLen;\r
-  UINT8                     RawHdrLen;\r
-  UINT32                    OptionsLength;\r
-  UINT8                     *OptionsBuffer;\r
-  VOID                      *FirstFragment;\r
+  IP4_SERVICE            *IpSb;\r
+  IP4_PROTOCOL           *IpInstance;\r
+  IP4_INTERFACE          *IpIf;\r
+  IP4_TXTOKEN_WRAP       *Wrap;\r
+  EFI_IP4_TRANSMIT_DATA  *TxData;\r
+  EFI_IP4_CONFIG_DATA    *Config;\r
+  EFI_IP4_OVERRIDE_DATA  *Override;\r
+  IP4_HEAD               Head;\r
+  IP4_ADDR               GateWay;\r
+  EFI_STATUS             Status;\r
+  EFI_TPL                OldTpl;\r
+  BOOLEAN                DontFragment;\r
+  UINT32                 HeadLen;\r
+  UINT8                  RawHdrLen;\r
+  UINT32                 OptionsLength;\r
+  UINT8                  *OptionsBuffer;\r
+  VOID                   *FirstFragment;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1607,11 +1594,11 @@ EfiIp4Transmit (
     return EFI_NOT_STARTED;\r
   }\r
 \r
-  OldTpl  = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
-  IpSb    = IpInstance->Service;\r
-  IpIf    = IpInstance->Interface;\r
-  Config  = &IpInstance->ConfigData;\r
+  IpSb   = IpInstance->Service;\r
+  IpIf   = IpInstance->Interface;\r
+  Config = &IpInstance->ConfigData;\r
 \r
   if (Config->UseDefaultAddress && IP4_NO_MAPPING (IpInstance)) {\r
     Status = EFI_NO_MAPPING;\r
@@ -1651,13 +1638,13 @@ EfiIp4Transmit (
     FirstFragment = TxData->FragmentTable[0].FragmentBuffer;\r
     CopyMem (&RawHdrLen, FirstFragment, sizeof (UINT8));\r
 \r
-    RawHdrLen = (UINT8) (RawHdrLen & 0x0f);\r
+    RawHdrLen = (UINT8)(RawHdrLen & 0x0f);\r
     if (RawHdrLen < 5) {\r
       Status = EFI_INVALID_PARAMETER;\r
       goto ON_EXIT;\r
     }\r
 \r
-    RawHdrLen = (UINT8) (RawHdrLen << 2);\r
+    RawHdrLen = (UINT8)(RawHdrLen << 2);\r
 \r
     CopyMem (&Head, FirstFragment, IP4_MIN_HEADLEN);\r
 \r
@@ -1680,13 +1667,13 @@ EfiIp4Transmit (
       OptionsBuffer = NULL;\r
     } else {\r
       OptionsLength = RawHdrLen - IP4_MIN_HEADLEN;\r
-      OptionsBuffer = (UINT8 *) FirstFragment + IP4_MIN_HEADLEN;\r
+      OptionsBuffer = (UINT8 *)FirstFragment + IP4_MIN_HEADLEN;\r
     }\r
 \r
     //\r
     // Trim off IPv4 header and options from first fragment.\r
     //\r
-    TxData->FragmentTable[0].FragmentBuffer = (UINT8 *) FirstFragment + RawHdrLen;\r
+    TxData->FragmentTable[0].FragmentBuffer = (UINT8 *)FirstFragment + RawHdrLen;\r
     TxData->FragmentTable[0].FragmentLength = TxData->FragmentTable[0].FragmentLength - RawHdrLen;\r
   } else {\r
     CopyMem (&Head.Dst, &TxData->DestinationAddress, sizeof (IP4_ADDR));\r
@@ -1717,7 +1704,7 @@ EfiIp4Transmit (
     HeadLen       = (TxData->OptionsLength + 3) & (~0x03);\r
 \r
     OptionsLength = TxData->OptionsLength;\r
-    OptionsBuffer = (UINT8 *) (TxData->OptionsBuffer);\r
+    OptionsBuffer = (UINT8 *)(TxData->OptionsBuffer);\r
   }\r
 \r
   //\r
@@ -1738,18 +1725,18 @@ EfiIp4Transmit (
     goto ON_EXIT;\r
   }\r
 \r
-  Wrap->IpInstance  = IpInstance;\r
-  Wrap->Token       = Token;\r
-  Wrap->Sent        = FALSE;\r
-  Wrap->Life        = IP4_US_TO_SEC (Config->TransmitTimeout);\r
-  Wrap->Packet      = NetbufFromExt (\r
-                        (NET_FRAGMENT *) TxData->FragmentTable,\r
-                        TxData->FragmentCount,\r
-                        IP4_MAX_HEADLEN,\r
-                        0,\r
-                        Ip4FreeTxToken,\r
-                        Wrap\r
-                        );\r
+  Wrap->IpInstance = IpInstance;\r
+  Wrap->Token      = Token;\r
+  Wrap->Sent       = FALSE;\r
+  Wrap->Life       = IP4_US_TO_SEC (Config->TransmitTimeout);\r
+  Wrap->Packet     = NetbufFromExt (\r
+                       (NET_FRAGMENT *)TxData->FragmentTable,\r
+                       TxData->FragmentCount,\r
+                       IP4_MAX_HEADLEN,\r
+                       0,\r
+                       Ip4FreeTxToken,\r
+                       Wrap\r
+                       );\r
 \r
   if (Wrap->Packet == NULL) {\r
     FreePool (Wrap);\r
@@ -1768,7 +1755,7 @@ EfiIp4Transmit (
       //\r
       // Restore pointer of first fragment in RawData mode.\r
       //\r
-      TxData->FragmentTable[0].FragmentBuffer = (UINT8 *) FirstFragment;\r
+      TxData->FragmentTable[0].FragmentBuffer = (UINT8 *)FirstFragment;\r
     }\r
 \r
     NetbufFree (Wrap->Packet);\r
@@ -1800,7 +1787,7 @@ EfiIp4Transmit (
       //\r
       // Restore pointer of first fragment in RawData mode.\r
       //\r
-      TxData->FragmentTable[0].FragmentBuffer = (UINT8 *) FirstFragment;\r
+      TxData->FragmentTable[0].FragmentBuffer = (UINT8 *)FirstFragment;\r
     }\r
 \r
     NetbufFree (Wrap->Packet);\r
@@ -1810,7 +1797,7 @@ EfiIp4Transmit (
     //\r
     // Restore pointer of first fragment in RawData mode.\r
     //\r
-    TxData->FragmentTable[0].FragmentBuffer = (UINT8 *) FirstFragment;\r
+    TxData->FragmentTable[0].FragmentBuffer = (UINT8 *)FirstFragment;\r
   }\r
 \r
 ON_EXIT:\r
@@ -1818,7 +1805,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Places a receiving request into the receiving queue.\r
 \r
@@ -1854,13 +1840,13 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 EfiIp4Receive (\r
-  IN EFI_IP4_PROTOCOL         *This,\r
-  IN EFI_IP4_COMPLETION_TOKEN *Token\r
+  IN EFI_IP4_PROTOCOL          *This,\r
+  IN EFI_IP4_COMPLETION_TOKEN  *Token\r
   )\r
 {\r
-  IP4_PROTOCOL              *IpInstance;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
+  IP4_PROTOCOL  *IpInstance;\r
+  EFI_STATUS    Status;\r
+  EFI_TPL       OldTpl;\r
 \r
   //\r
   // First validate the parameters\r
@@ -1910,7 +1896,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Cancel the transmitted but not recycled packet. If a matching\r
   token is found, it will call Ip4CancelPacket to cancel the\r
@@ -1931,15 +1916,15 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 Ip4CancelTxTokens (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   )\r
 {\r
   EFI_IP4_COMPLETION_TOKEN  *Token;\r
   IP4_TXTOKEN_WRAP          *Wrap;\r
 \r
-  Token = (EFI_IP4_COMPLETION_TOKEN *) Context;\r
+  Token = (EFI_IP4_COMPLETION_TOKEN *)Context;\r
 \r
   //\r
   // Return EFI_SUCCESS to check the next item in the map if\r
@@ -1949,7 +1934,7 @@ Ip4CancelTxTokens (
     return EFI_SUCCESS;\r
   }\r
 \r
-  Wrap = (IP4_TXTOKEN_WRAP *) Item->Value;\r
+  Wrap = (IP4_TXTOKEN_WRAP *)Item->Value;\r
   ASSERT (Wrap != NULL);\r
 \r
   //\r
@@ -1969,7 +1954,6 @@ Ip4CancelTxTokens (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Cancel the receive request. This is quiet simple, because\r
   it is only enqueued in our local receive map.\r
@@ -1987,15 +1971,15 @@ Ip4CancelTxTokens (
 EFI_STATUS\r
 EFIAPI\r
 Ip4CancelRxTokens (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   )\r
 {\r
   EFI_IP4_COMPLETION_TOKEN  *Token;\r
   EFI_IP4_COMPLETION_TOKEN  *This;\r
 \r
-  Token = (EFI_IP4_COMPLETION_TOKEN *) Context;\r
+  Token = (EFI_IP4_COMPLETION_TOKEN *)Context;\r
   This  = Item->Key;\r
 \r
   if ((Token != NULL) && (Token != This)) {\r
@@ -2015,7 +1999,6 @@ Ip4CancelRxTokens (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Cancel the user's receive/transmit request.\r
 \r
@@ -2031,11 +2014,11 @@ Ip4CancelRxTokens (
 **/\r
 EFI_STATUS\r
 Ip4Cancel (\r
-  IN IP4_PROTOCOL             *IpInstance,\r
-  IN EFI_IP4_COMPLETION_TOKEN *Token          OPTIONAL\r
+  IN IP4_PROTOCOL              *IpInstance,\r
+  IN EFI_IP4_COMPLETION_TOKEN  *Token          OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // First check the transmitted packet. Ip4CancelTxTokens returns\r
@@ -2083,15 +2066,14 @@ Ip4Cancel (
   // all of them are cancelled.\r
   //\r
   if (!NetMapIsEmpty (&IpInstance->TxTokens) ||\r
-      !NetMapIsEmpty (&IpInstance->RxTokens)) {\r
-\r
+      !NetMapIsEmpty (&IpInstance->RxTokens))\r
+  {\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Abort an asynchronous transmit or receive request.\r
 \r
@@ -2124,13 +2106,13 @@ Ip4Cancel (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp4Cancel (\r
-  IN EFI_IP4_PROTOCOL         *This,\r
-  IN EFI_IP4_COMPLETION_TOKEN *Token    OPTIONAL\r
+  IN EFI_IP4_PROTOCOL          *This,\r
+  IN EFI_IP4_COMPLETION_TOKEN  *Token    OPTIONAL\r
   )\r
 {\r
-  IP4_PROTOCOL              *IpInstance;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
+  IP4_PROTOCOL  *IpInstance;\r
+  EFI_STATUS    Status;\r
+  EFI_TPL       OldTpl;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -2157,7 +2139,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r
 \r
@@ -2188,7 +2169,7 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 EfiIp4Poll (\r
-  IN EFI_IP4_PROTOCOL       *This\r
+  IN EFI_IP4_PROTOCOL  *This\r
   )\r
 {\r
   IP4_PROTOCOL                  *IpInstance;\r
@@ -2230,14 +2211,14 @@ EfiIp4Poll (
 EFI_STATUS\r
 EFIAPI\r
 Ip4SentPacketTicking (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   )\r
 {\r
-  IP4_TXTOKEN_WRAP          *Wrap;\r
+  IP4_TXTOKEN_WRAP  *Wrap;\r
 \r
-  Wrap = (IP4_TXTOKEN_WRAP *) Item->Value;\r
+  Wrap = (IP4_TXTOKEN_WRAP *)Item->Value;\r
   ASSERT (Wrap != NULL);\r
 \r
   if ((Wrap->Life > 0) && (--Wrap->Life == 0)) {\r
@@ -2259,13 +2240,13 @@ Ip4SentPacketTicking (
 VOID\r
 EFIAPI\r
 Ip4TimerTicking (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  IP4_SERVICE               *IpSb;\r
+  IP4_SERVICE  *IpSb;\r
 \r
-  IpSb = (IP4_SERVICE *) Context;\r
+  IpSb = (IP4_SERVICE *)Context;\r
   NET_CHECK_SIGNATURE (IpSb, IP4_SERVICE_SIGNATURE);\r
 \r
   Ip4PacketTimerTicking (IpSb);\r
@@ -2287,16 +2268,16 @@ Ip4TimerTicking (
 VOID\r
 EFIAPI\r
 Ip4TimerReconfigChecking (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  IP4_SERVICE               *IpSb;\r
-  BOOLEAN                   OldMediaPresent;\r
-  EFI_STATUS                Status;\r
-  EFI_SIMPLE_NETWORK_MODE   SnpModeData;\r
+  IP4_SERVICE              *IpSb;\r
+  BOOLEAN                  OldMediaPresent;\r
+  EFI_STATUS               Status;\r
+  EFI_SIMPLE_NETWORK_MODE  SnpModeData;\r
 \r
-  IpSb = (IP4_SERVICE *) Context;\r
+  IpSb = (IP4_SERVICE *)Context;\r
   NET_CHECK_SIGNATURE (IpSb, IP4_SERVICE_SIGNATURE);\r
 \r
   OldMediaPresent = IpSb->MediaPresent;\r
index e8ff33d38adc0c523056f7a06f68177d7fbf6949..18d317220592eee3922e5d05918570f6c691cb19 100644 (file)
@@ -60,8 +60,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // successfully configured, it goes to CONFIGED. if configure NULL\r
 // is called, it becomes UNCONFIGED again.\r
 //\r
-#define IP4_STATE_UNCONFIGED    0\r
-#define IP4_STATE_CONFIGED      1\r
+#define IP4_STATE_UNCONFIGED  0\r
+#define IP4_STATE_CONFIGED    1\r
 \r
 //\r
 // The state of IP4 service. It starts from UNSTARTED. It transits\r
@@ -69,11 +69,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // configured, it becomes CONFIGED. and if partly destroyed, it goes\r
 // to DESTROY.\r
 //\r
-#define IP4_SERVICE_UNSTARTED   0\r
-#define IP4_SERVICE_STARTED     1\r
-#define IP4_SERVICE_CONFIGED    2\r
-#define IP4_SERVICE_DESTROY     3\r
-\r
+#define IP4_SERVICE_UNSTARTED  0\r
+#define IP4_SERVICE_STARTED    1\r
+#define IP4_SERVICE_CONFIGED   2\r
+#define IP4_SERVICE_DESTROY    3\r
 \r
 ///\r
 /// IP4_TXTOKEN_WRAP wraps the upper layer's transmit token.\r
@@ -85,12 +84,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /// user's event signalled.\r
 ///\r
 typedef struct {\r
-  IP4_PROTOCOL              *IpInstance;\r
-  EFI_IP4_COMPLETION_TOKEN  *Token;\r
-  EFI_EVENT                 IpSecRecycleSignal;\r
-  NET_BUF                   *Packet;\r
-  BOOLEAN                   Sent;\r
-  INTN                      Life;\r
+  IP4_PROTOCOL                *IpInstance;\r
+  EFI_IP4_COMPLETION_TOKEN    *Token;\r
+  EFI_EVENT                   IpSecRecycleSignal;\r
+  NET_BUF                     *Packet;\r
+  BOOLEAN                     Sent;\r
+  INTN                        Life;\r
 } IP4_TXTOKEN_WRAP;\r
 \r
 ///\r
@@ -100,8 +99,8 @@ typedef struct {
 /// to notice IPsec to free the resources.\r
 ///\r
 typedef struct {\r
-  EFI_EVENT                 IpSecRecycleSignal;\r
-  NET_BUF                   *Packet;\r
+  EFI_EVENT    IpSecRecycleSignal;\r
+  NET_BUF      *Packet;\r
 } IP4_IPSEC_WRAP;\r
 \r
 ///\r
@@ -114,111 +113,109 @@ typedef struct {
 /// fragments will be freed at last.\r
 ///\r
 typedef struct {\r
-  LIST_ENTRY                Link;\r
-  IP4_PROTOCOL              *IpInstance;\r
-  NET_BUF                   *Packet;\r
-  EFI_IP4_RECEIVE_DATA      RxData;\r
+  LIST_ENTRY              Link;\r
+  IP4_PROTOCOL            *IpInstance;\r
+  NET_BUF                 *Packet;\r
+  EFI_IP4_RECEIVE_DATA    RxData;\r
 } IP4_RXDATA_WRAP;\r
 \r
-\r
 struct _IP4_PROTOCOL {\r
-  UINT32                    Signature;\r
+  UINT32                 Signature;\r
 \r
-  EFI_IP4_PROTOCOL          Ip4Proto;\r
-  EFI_HANDLE                Handle;\r
-  INTN                      State;\r
+  EFI_IP4_PROTOCOL       Ip4Proto;\r
+  EFI_HANDLE             Handle;\r
+  INTN                   State;\r
 \r
-  BOOLEAN                   InDestroy;\r
+  BOOLEAN                InDestroy;\r
 \r
-  IP4_SERVICE               *Service;\r
-  LIST_ENTRY                Link;       // Link to all the IP protocol from the service\r
+  IP4_SERVICE            *Service;\r
+  LIST_ENTRY             Link;          // Link to all the IP protocol from the service\r
 \r
   //\r
   // User's transmit/receive tokens, and received/delivered packets\r
   //\r
-  NET_MAP                   RxTokens;\r
-  NET_MAP                   TxTokens;   // map between (User's Token, IP4_TXTOKE_WRAP)\r
-  LIST_ENTRY                Received;   // Received but not delivered packet\r
-  LIST_ENTRY                Delivered;  // Delivered and to be recycled packets\r
-  EFI_LOCK                  RecycleLock;\r
+  NET_MAP                RxTokens;\r
+  NET_MAP                TxTokens;      // map between (User's Token, IP4_TXTOKE_WRAP)\r
+  LIST_ENTRY             Received;      // Received but not delivered packet\r
+  LIST_ENTRY             Delivered;     // Delivered and to be recycled packets\r
+  EFI_LOCK               RecycleLock;\r
 \r
   //\r
   // Instance's address and route tables. There are two route tables.\r
   // RouteTable is used by the IP4 driver to route packet. EfiRouteTable\r
   // is used to communicate the current route info to the upper layer.\r
   //\r
-  IP4_INTERFACE             *Interface;\r
-  LIST_ENTRY                AddrLink;   // Ip instances with the same IP address.\r
-  IP4_ROUTE_TABLE           *RouteTable;\r
+  IP4_INTERFACE          *Interface;\r
+  LIST_ENTRY             AddrLink;      // Ip instances with the same IP address.\r
+  IP4_ROUTE_TABLE        *RouteTable;\r
 \r
-  EFI_IP4_ROUTE_TABLE       *EfiRouteTable;\r
-  UINT32                    EfiRouteCount;\r
+  EFI_IP4_ROUTE_TABLE    *EfiRouteTable;\r
+  UINT32                 EfiRouteCount;\r
 \r
   //\r
   // IGMP data for this instance\r
   //\r
-  IP4_ADDR                  *Groups;    // stored in network byte order\r
-  UINT32                    GroupCount;\r
-\r
-  EFI_IP4_CONFIG_DATA       ConfigData;\r
+  IP4_ADDR               *Groups;       // stored in network byte order\r
+  UINT32                 GroupCount;\r
 \r
+  EFI_IP4_CONFIG_DATA    ConfigData;\r
 };\r
 \r
 struct _IP4_SERVICE {\r
-  UINT32                          Signature;\r
-  EFI_SERVICE_BINDING_PROTOCOL    ServiceBinding;\r
-  INTN                            State;\r
+  UINT32                             Signature;\r
+  EFI_SERVICE_BINDING_PROTOCOL       ServiceBinding;\r
+  INTN                               State;\r
 \r
   //\r
   // List of all the IP instances and interfaces, and default\r
   // interface and route table and caches.\r
   //\r
-  UINTN                           NumChildren;\r
-  LIST_ENTRY                      Children;\r
+  UINTN                              NumChildren;\r
+  LIST_ENTRY                         Children;\r
 \r
-  LIST_ENTRY                      Interfaces;\r
+  LIST_ENTRY                         Interfaces;\r
 \r
-  IP4_INTERFACE                   *DefaultInterface;\r
-  IP4_ROUTE_TABLE                 *DefaultRouteTable;\r
+  IP4_INTERFACE                      *DefaultInterface;\r
+  IP4_ROUTE_TABLE                    *DefaultRouteTable;\r
 \r
   //\r
   // Ip reassemble utilities, and IGMP data\r
   //\r
-  IP4_ASSEMBLE_TABLE              Assemble;\r
-  IGMP_SERVICE_DATA               IgmpCtrl;\r
+  IP4_ASSEMBLE_TABLE                 Assemble;\r
+  IGMP_SERVICE_DATA                  IgmpCtrl;\r
 \r
   //\r
   // Low level protocol used by this service instance\r
   //\r
-  EFI_HANDLE                      Image;\r
-  EFI_HANDLE                      Controller;\r
+  EFI_HANDLE                         Image;\r
+  EFI_HANDLE                         Controller;\r
 \r
-  EFI_HANDLE                      MnpChildHandle;\r
-  EFI_MANAGED_NETWORK_PROTOCOL    *Mnp;\r
+  EFI_HANDLE                         MnpChildHandle;\r
+  EFI_MANAGED_NETWORK_PROTOCOL       *Mnp;\r
 \r
-  EFI_MANAGED_NETWORK_CONFIG_DATA MnpConfigData;\r
-  EFI_SIMPLE_NETWORK_MODE         SnpMode;\r
+  EFI_MANAGED_NETWORK_CONFIG_DATA    MnpConfigData;\r
+  EFI_SIMPLE_NETWORK_MODE            SnpMode;\r
 \r
-  EFI_EVENT                       Timer;\r
-  EFI_EVENT                       ReconfigCheckTimer;\r
-  EFI_EVENT                       ReconfigEvent;\r
+  EFI_EVENT                          Timer;\r
+  EFI_EVENT                          ReconfigCheckTimer;\r
+  EFI_EVENT                          ReconfigEvent;\r
 \r
-  BOOLEAN                         Reconfig;\r
+  BOOLEAN                            Reconfig;\r
 \r
   //\r
   // Underlying media present status.\r
   //\r
-  BOOLEAN                         MediaPresent;\r
+  BOOLEAN                            MediaPresent;\r
 \r
   //\r
   // IPv4 Configuration II Protocol instance\r
   //\r
-  IP4_CONFIG2_INSTANCE            Ip4Config2Instance;\r
+  IP4_CONFIG2_INSTANCE               Ip4Config2Instance;\r
 \r
-  CHAR16                          *MacString;\r
+  CHAR16                             *MacString;\r
 \r
-  UINT32                          MaxPacketSize;\r
-  UINT32                          OldMaxPacketSize; ///< The MTU before IPsec enable.\r
+  UINT32                             MaxPacketSize;\r
+  UINT32                             OldMaxPacketSize; ///< The MTU before IPsec enable.\r
 };\r
 \r
 #define IP4_INSTANCE_FROM_PROTOCOL(Ip4) \\r
@@ -230,10 +227,9 @@ struct _IP4_SERVICE {
 #define IP4_SERVICE_FROM_CONFIG2_INSTANCE(This) \\r
   CR (This, IP4_SERVICE, Ip4Config2Instance, IP4_SERVICE_SIGNATURE)\r
 \r
+#define IP4_NO_MAPPING(IpInstance)  (!(IpInstance)->Interface->Configured)\r
 \r
-#define IP4_NO_MAPPING(IpInstance) (!(IpInstance)->Interface->Configured)\r
-\r
-extern EFI_IP4_PROTOCOL mEfiIp4ProtocolTemplete;\r
+extern EFI_IP4_PROTOCOL  mEfiIp4ProtocolTemplete;\r
 \r
 /**\r
   Config the MNP parameter used by IP. The IP driver use one MNP\r
@@ -255,8 +251,8 @@ extern EFI_IP4_PROTOCOL mEfiIp4ProtocolTemplete;
 **/\r
 EFI_STATUS\r
 Ip4ServiceConfigMnp (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN BOOLEAN                Force\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN BOOLEAN      Force\r
   );\r
 \r
 /**\r
@@ -268,8 +264,8 @@ Ip4ServiceConfigMnp (
 **/\r
 VOID\r
 Ip4InitProtocol (\r
-  IN     IP4_SERVICE            *IpSb,\r
-  IN OUT IP4_PROTOCOL           *IpInstance\r
+  IN     IP4_SERVICE   *IpSb,\r
+  IN OUT IP4_PROTOCOL  *IpInstance\r
   );\r
 \r
 /**\r
@@ -283,7 +279,7 @@ Ip4InitProtocol (
 **/\r
 EFI_STATUS\r
 Ip4CleanProtocol (\r
-  IN  IP4_PROTOCOL          *IpInstance\r
+  IN  IP4_PROTOCOL  *IpInstance\r
   );\r
 \r
 /**\r
@@ -301,8 +297,8 @@ Ip4CleanProtocol (
 **/\r
 EFI_STATUS\r
 Ip4Cancel (\r
-  IN IP4_PROTOCOL             *IpInstance,\r
-  IN EFI_IP4_COMPLETION_TOKEN *Token          OPTIONAL\r
+  IN IP4_PROTOCOL              *IpInstance,\r
+  IN EFI_IP4_COMPLETION_TOKEN  *Token          OPTIONAL\r
   );\r
 \r
 /**\r
@@ -322,9 +318,9 @@ Ip4Cancel (
 **/\r
 EFI_STATUS\r
 Ip4Groups (\r
-  IN IP4_PROTOCOL           *IpInstance,\r
-  IN BOOLEAN                JoinFlag,\r
-  IN EFI_IPv4_ADDRESS       *GroupAddress       OPTIONAL\r
+  IN IP4_PROTOCOL      *IpInstance,\r
+  IN BOOLEAN           JoinFlag,\r
+  IN EFI_IPv4_ADDRESS  *GroupAddress       OPTIONAL\r
   );\r
 \r
 /**\r
@@ -339,8 +335,8 @@ Ip4Groups (
 VOID\r
 EFIAPI\r
 Ip4TimerTicking (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -358,8 +354,8 @@ Ip4TimerTicking (
 VOID\r
 EFIAPI\r
 Ip4TimerReconfigChecking (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -379,9 +375,9 @@ Ip4TimerReconfigChecking (
 EFI_STATUS\r
 EFIAPI\r
 Ip4SentPacketTicking (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   );\r
 \r
 /**\r
@@ -408,10 +404,10 @@ Ip4SentPacketTicking (
 VOID\r
 EFIAPI\r
 Ip4FreeTxToken (\r
-  IN VOID                   *Context\r
+  IN VOID  *Context\r
   );\r
 \r
-extern EFI_IPSEC2_PROTOCOL   *mIpSec;\r
-extern BOOLEAN               mIpSec2Installed;\r
+extern EFI_IPSEC2_PROTOCOL  *mIpSec;\r
+extern BOOLEAN              mIpSec2Installed;\r
 \r
 #endif\r
index 868f04812c8bb238ee0a6f40fc911648ab03919d..1d12b3d816d049fd012bb782a076a00a726955e8 100644 (file)
@@ -10,7 +10,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Ip4Impl.h"\r
 \r
-\r
 /**\r
   Create an empty assemble entry for the packet identified by\r
   (Dst, Src, Id, Protocol). The default life for the packet is\r
@@ -27,14 +26,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 IP4_ASSEMBLE_ENTRY *\r
 Ip4CreateAssembleEntry (\r
-  IN IP4_ADDR               Dst,\r
-  IN IP4_ADDR               Src,\r
-  IN UINT16                 Id,\r
-  IN UINT8                  Protocol\r
+  IN IP4_ADDR  Dst,\r
+  IN IP4_ADDR  Src,\r
+  IN UINT16    Id,\r
+  IN UINT8     Protocol\r
   )\r
 {\r
-\r
-  IP4_ASSEMBLE_ENTRY        *Assemble;\r
+  IP4_ASSEMBLE_ENTRY  *Assemble;\r
 \r
   Assemble = AllocatePool (sizeof (IP4_ASSEMBLE_ENTRY));\r
 \r
@@ -58,7 +56,6 @@ Ip4CreateAssembleEntry (
   return Assemble;\r
 }\r
 \r
-\r
 /**\r
   Release all the fragments of a packet, then free the assemble entry.\r
 \r
@@ -67,12 +64,12 @@ Ip4CreateAssembleEntry (
 **/\r
 VOID\r
 Ip4FreeAssembleEntry (\r
-  IN IP4_ASSEMBLE_ENTRY     *Assemble\r
+  IN IP4_ASSEMBLE_ENTRY  *Assemble\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  NET_BUF                   *Fragment;\r
+  LIST_ENTRY  *Entry;\r
+  LIST_ENTRY  *Next;\r
+  NET_BUF     *Fragment;\r
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &Assemble->Fragments) {\r
     Fragment = NET_LIST_USER_STRUCT (Entry, NET_BUF, List);\r
@@ -84,7 +81,6 @@ Ip4FreeAssembleEntry (
   FreePool (Assemble);\r
 }\r
 \r
-\r
 /**\r
   Initialize an already allocated assemble table. This is generally\r
   the assemble table embedded in the IP4 service instance.\r
@@ -94,17 +90,16 @@ Ip4FreeAssembleEntry (
 **/\r
 VOID\r
 Ip4InitAssembleTable (\r
-  IN OUT IP4_ASSEMBLE_TABLE     *Table\r
+  IN OUT IP4_ASSEMBLE_TABLE  *Table\r
   )\r
 {\r
-  UINT32                    Index;\r
+  UINT32  Index;\r
 \r
   for (Index = 0; Index < IP4_ASSEMLE_HASH_SIZE; Index++) {\r
     InitializeListHead (&Table->Bucket[Index]);\r
   }\r
 }\r
 \r
-\r
 /**\r
   Clean up the assemble table: remove all the fragments\r
   and assemble entries.\r
@@ -114,13 +109,13 @@ Ip4InitAssembleTable (
 **/\r
 VOID\r
 Ip4CleanAssembleTable (\r
-  IN IP4_ASSEMBLE_TABLE     *Table\r
+  IN IP4_ASSEMBLE_TABLE  *Table\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP4_ASSEMBLE_ENTRY        *Assemble;\r
-  UINT32                    Index;\r
+  LIST_ENTRY          *Entry;\r
+  LIST_ENTRY          *Next;\r
+  IP4_ASSEMBLE_ENTRY  *Assemble;\r
+  UINT32              Index;\r
 \r
   for (Index = 0; Index < IP4_ASSEMLE_HASH_SIZE; Index++) {\r
     NET_LIST_FOR_EACH_SAFE (Entry, Next, &Table->Bucket[Index]) {\r
@@ -132,7 +127,6 @@ Ip4CleanAssembleTable (
   }\r
 }\r
 \r
-\r
 /**\r
   Trim the packet to fit in [Start, End), and update the per\r
   packet information.\r
@@ -144,23 +138,23 @@ Ip4CleanAssembleTable (
 **/\r
 VOID\r
 Ip4TrimPacket (\r
-  IN OUT NET_BUF                *Packet,\r
-  IN     INTN                   Start,\r
-  IN     INTN                   End\r
+  IN OUT NET_BUF  *Packet,\r
+  IN     INTN     Start,\r
+  IN     INTN     End\r
   )\r
 {\r
-  IP4_CLIP_INFO             *Info;\r
-  INTN                      Len;\r
+  IP4_CLIP_INFO  *Info;\r
+  INTN           Len;\r
 \r
   Info = IP4_GET_CLIP_INFO (Packet);\r
 \r
   ASSERT (Info->Start + Info->Length == Info->End);\r
   ASSERT ((Info->Start < End) && (Start < Info->End));\r
 \r
-   if (Info->Start < Start) {\r
+  if (Info->Start < Start) {\r
     Len = Start - Info->Start;\r
 \r
-    NetbufTrim (Packet, (UINT32) Len, NET_BUF_HEAD);\r
+    NetbufTrim (Packet, (UINT32)Len, NET_BUF_HEAD);\r
     Info->Start   = Start;\r
     Info->Length -= Len;\r
   }\r
@@ -168,13 +162,12 @@ Ip4TrimPacket (
   if (End < Info->End) {\r
     Len = End - Info->End;\r
 \r
-    NetbufTrim (Packet, (UINT32) Len, NET_BUF_TAIL);\r
+    NetbufTrim (Packet, (UINT32)Len, NET_BUF_TAIL);\r
     Info->End     = End;\r
     Info->Length -= Len;\r
   }\r
 }\r
 \r
-\r
 /**\r
   Release all the fragments of the packet. This is the callback for\r
   the assembled packet's OnFree. It will free the assemble entry,\r
@@ -186,13 +179,12 @@ Ip4TrimPacket (
 VOID\r
 EFIAPI\r
 Ip4OnFreeFragments (\r
-  IN VOID                   *Arg\r
+  IN VOID  *Arg\r
   )\r
 {\r
-  Ip4FreeAssembleEntry ((IP4_ASSEMBLE_ENTRY *) Arg);\r
+  Ip4FreeAssembleEntry ((IP4_ASSEMBLE_ENTRY *)Arg);\r
 }\r
 \r
-\r
 /**\r
   Reassemble the IP fragments. If all the fragments of the packet\r
   have been received, it will wrap the packet in a net buffer then\r
@@ -210,37 +202,38 @@ Ip4OnFreeFragments (
 **/\r
 NET_BUF *\r
 Ip4Reassemble (\r
-  IN OUT IP4_ASSEMBLE_TABLE     *Table,\r
-  IN OUT NET_BUF                *Packet\r
+  IN OUT IP4_ASSEMBLE_TABLE  *Table,\r
+  IN OUT NET_BUF             *Packet\r
   )\r
 {\r
-  IP4_HEAD                  *IpHead;\r
-  IP4_CLIP_INFO             *This;\r
-  IP4_CLIP_INFO             *Node;\r
-  IP4_ASSEMBLE_ENTRY        *Assemble;\r
-  LIST_ENTRY                *Head;\r
-  LIST_ENTRY                *Prev;\r
-  LIST_ENTRY                *Cur;\r
-  NET_BUF                   *Fragment;\r
-  NET_BUF                   *NewPacket;\r
-  INTN                      Index;\r
-\r
-  IpHead  = Packet->Ip.Ip4;\r
-  This    = IP4_GET_CLIP_INFO (Packet);\r
+  IP4_HEAD            *IpHead;\r
+  IP4_CLIP_INFO       *This;\r
+  IP4_CLIP_INFO       *Node;\r
+  IP4_ASSEMBLE_ENTRY  *Assemble;\r
+  LIST_ENTRY          *Head;\r
+  LIST_ENTRY          *Prev;\r
+  LIST_ENTRY          *Cur;\r
+  NET_BUF             *Fragment;\r
+  NET_BUF             *NewPacket;\r
+  INTN                Index;\r
+\r
+  IpHead = Packet->Ip.Ip4;\r
+  This   = IP4_GET_CLIP_INFO (Packet);\r
 \r
   ASSERT (IpHead != NULL);\r
 \r
   //\r
   // First: find the related assemble entry\r
   //\r
-  Assemble  = NULL;\r
-  Index     = IP4_ASSEMBLE_HASH (IpHead->Dst, IpHead->Src, IpHead->Id, IpHead->Protocol);\r
+  Assemble = NULL;\r
+  Index    = IP4_ASSEMBLE_HASH (IpHead->Dst, IpHead->Src, IpHead->Id, IpHead->Protocol);\r
 \r
   NET_LIST_FOR_EACH (Cur, &Table->Bucket[Index]) {\r
     Assemble = NET_LIST_USER_STRUCT (Cur, IP4_ASSEMBLE_ENTRY, Link);\r
 \r
     if ((Assemble->Dst == IpHead->Dst) && (Assemble->Src == IpHead->Src) &&\r
-        (Assemble->Id == IpHead->Id)   && (Assemble->Protocol == IpHead->Protocol)) {\r
+        (Assemble->Id == IpHead->Id)   && (Assemble->Protocol == IpHead->Protocol))\r
+    {\r
       break;\r
     }\r
   }\r
@@ -262,6 +255,7 @@ Ip4Reassemble (
 \r
     InsertHeadList (&Table->Bucket[Index], &Assemble->Link);\r
   }\r
+\r
   //\r
   // Assemble shouldn't be NULL here\r
   //\r
@@ -289,8 +283,8 @@ Ip4Reassemble (
   // overlaps, trim the overlapped part off THIS fragment.\r
   //\r
   if ((Prev = Cur->BackLink) != Head) {\r
-    Fragment  = NET_LIST_USER_STRUCT (Prev, NET_BUF, List);\r
-    Node      = IP4_GET_CLIP_INFO (Fragment);\r
+    Fragment = NET_LIST_USER_STRUCT (Prev, NET_BUF, List);\r
+    Node     = IP4_GET_CLIP_INFO (Fragment);\r
 \r
     if (This->Start < Node->End) {\r
       if (This->End <= Node->End) {\r
@@ -364,8 +358,8 @@ Ip4Reassemble (
     //\r
     ASSERT (Assemble->Head == NULL);\r
 \r
-    Assemble->Head  = IpHead;\r
-    Assemble->Info  = IP4_GET_CLIP_INFO (Packet);\r
+    Assemble->Head = IpHead;\r
+    Assemble->Info = IP4_GET_CLIP_INFO (Packet);\r
   }\r
 \r
   //\r
@@ -383,7 +377,6 @@ Ip4Reassemble (
   //     queue ends at the total length, all data is received.\r
   //\r
   if ((Assemble->TotalLen != 0) && (Assemble->CurLen >= Assemble->TotalLen)) {\r
-\r
     RemoveEntryList (&Assemble->Link);\r
 \r
     //\r
@@ -444,12 +437,12 @@ DROP:
 VOID\r
 EFIAPI\r
 Ip4IpSecFree (\r
-  IN VOID                   *Arg\r
+  IN VOID  *Arg\r
   )\r
 {\r
-  IP4_IPSEC_WRAP            *Wrap;\r
+  IP4_IPSEC_WRAP  *Wrap;\r
 \r
-  Wrap = (IP4_IPSEC_WRAP *) Arg;\r
+  Wrap = (IP4_IPSEC_WRAP *)Arg;\r
 \r
   if (Wrap->IpSecRecycleSignal != NULL) {\r
     gBS->SignalEvent (Wrap->IpSecRecycleSignal);\r
@@ -496,29 +489,30 @@ Ip4IpSecProcessPacket (
   IN     VOID                   *Context\r
   )\r
 {\r
-  NET_FRAGMENT              *FragmentTable;\r
-  NET_FRAGMENT              *OriginalFragmentTable;\r
-  UINT32                    FragmentCount;\r
-  UINT32                    OriginalFragmentCount;\r
-  EFI_EVENT                 RecycleEvent;\r
-  NET_BUF                   *Packet;\r
-  IP4_TXTOKEN_WRAP          *TxWrap;\r
-  IP4_IPSEC_WRAP            *IpSecWrap;\r
-  EFI_STATUS                Status;\r
-  IP4_HEAD                  ZeroHead;\r
-\r
-  Status        = EFI_SUCCESS;\r
+  NET_FRAGMENT      *FragmentTable;\r
+  NET_FRAGMENT      *OriginalFragmentTable;\r
+  UINT32            FragmentCount;\r
+  UINT32            OriginalFragmentCount;\r
+  EFI_EVENT         RecycleEvent;\r
+  NET_BUF           *Packet;\r
+  IP4_TXTOKEN_WRAP  *TxWrap;\r
+  IP4_IPSEC_WRAP    *IpSecWrap;\r
+  EFI_STATUS        Status;\r
+  IP4_HEAD          ZeroHead;\r
+\r
+  Status = EFI_SUCCESS;\r
 \r
   if (!mIpSec2Installed) {\r
     goto ON_EXIT;\r
   }\r
+\r
   ASSERT (mIpSec != NULL);\r
 \r
   Packet        = *Netbuf;\r
   RecycleEvent  = NULL;\r
   IpSecWrap     = NULL;\r
   FragmentTable = NULL;\r
-  TxWrap        = (IP4_TXTOKEN_WRAP *) Context;\r
+  TxWrap        = (IP4_TXTOKEN_WRAP *)Context;\r
   FragmentCount = Packet->BlockOpNum;\r
 \r
   ZeroMem (&ZeroHead, sizeof (IP4_HEAD));\r
@@ -571,11 +565,11 @@ Ip4IpSecProcessPacket (
                      mIpSec,\r
                      IpSb->Controller,\r
                      IP_VERSION_4,\r
-                     (VOID *) (*Head),\r
+                     (VOID *)(*Head),\r
                      &(*Head)->Protocol,\r
-                     (VOID **) Options,\r
+                     (VOID **)Options,\r
                      OptionsLen,\r
-                     (EFI_IPSEC_FRAGMENT_DATA **) (&FragmentTable),\r
+                     (EFI_IPSEC_FRAGMENT_DATA **)(&FragmentTable),\r
                      &FragmentCount,\r
                      Direction,\r
                      &RecycleEvent\r
@@ -590,7 +584,7 @@ Ip4IpSecProcessPacket (
     goto ON_EXIT;\r
   }\r
 \r
-  if (OriginalFragmentTable == FragmentTable && OriginalFragmentCount == FragmentCount) {\r
+  if ((OriginalFragmentTable == FragmentTable) && (OriginalFragmentCount == FragmentCount)) {\r
     //\r
     // For ByPass Packet\r
     //\r
@@ -603,8 +597,7 @@ Ip4IpSecProcessPacket (
     FreePool (OriginalFragmentTable);\r
   }\r
 \r
-  if (Direction == EfiIPsecOutBound && TxWrap != NULL) {\r
-\r
+  if ((Direction == EfiIPsecOutBound) && (TxWrap != NULL)) {\r
     TxWrap->IpSecRecycleSignal = RecycleEvent;\r
     TxWrap->Packet             = NetbufFromExt (\r
                                    FragmentTable,\r
@@ -620,7 +613,7 @@ Ip4IpSecProcessPacket (
       // the TxWrap.\r
       //\r
       TxWrap->Packet = *Netbuf;\r
-      Status = EFI_OUT_OF_RESOURCES;\r
+      Status         = EFI_OUT_OF_RESOURCES;\r
       goto ON_EXIT;\r
     }\r
 \r
@@ -629,9 +622,7 @@ Ip4IpSecProcessPacket (
     //\r
     NetIpSecNetbufFree (*Netbuf);\r
     *Netbuf = TxWrap->Packet;\r
-\r
   } else {\r
-\r
     IpSecWrap = AllocateZeroPool (sizeof (IP4_IPSEC_WRAP));\r
 \r
     if (IpSecWrap == NULL) {\r
@@ -659,7 +650,7 @@ Ip4IpSecProcessPacket (
       goto ON_EXIT;\r
     }\r
 \r
-    if (Direction == EfiIPsecInBound && 0 != CompareMem (*Head, &ZeroHead, sizeof (IP4_HEAD))) {\r
+    if ((Direction == EfiIPsecInBound) && (0 != CompareMem (*Head, &ZeroHead, sizeof (IP4_HEAD)))) {\r
       Ip4PrependHead (Packet, *Head, *Options, *OptionsLen);\r
       Ip4NtohHead (Packet->Ip.Ip4);\r
       NetbufTrim (Packet, ((*Head)->HeadLen << 2), TRUE);\r
@@ -670,6 +661,7 @@ Ip4IpSecProcessPacket (
         sizeof (IP4_CLIP_INFO)\r
         );\r
     }\r
+\r
     *Netbuf = Packet;\r
   }\r
 \r
@@ -695,18 +687,18 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 Ip4PreProcessPacket (\r
-  IN     IP4_SERVICE    *IpSb,\r
-  IN OUT NET_BUF        **Packet,\r
-  IN     IP4_HEAD       *Head,\r
-  IN     UINT8          *Option,\r
-  IN     UINT32         OptionLen,\r
-  IN     UINT32         Flag\r
+  IN     IP4_SERVICE  *IpSb,\r
+  IN OUT NET_BUF      **Packet,\r
+  IN     IP4_HEAD     *Head,\r
+  IN     UINT8        *Option,\r
+  IN     UINT32       OptionLen,\r
+  IN     UINT32       Flag\r
   )\r
 {\r
-  IP4_CLIP_INFO             *Info;\r
-  UINT32                    HeadLen;\r
-  UINT32                    TotalLen;\r
-  UINT16                    Checksum;\r
+  IP4_CLIP_INFO  *Info;\r
+  UINT32         HeadLen;\r
+  UINT32         TotalLen;\r
+  UINT16         Checksum;\r
 \r
   //\r
   // Check if the IP4 header is correctly formatted.\r
@@ -722,14 +714,15 @@ Ip4PreProcessPacket (
   }\r
 \r
   if ((Head->Ver != 4) || (HeadLen < IP4_MIN_HEADLEN) ||\r
-      (TotalLen < HeadLen) || (TotalLen != (*Packet)->TotalSize)) {\r
+      (TotalLen < HeadLen) || (TotalLen != (*Packet)->TotalSize))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   //\r
   // Some OS may send IP packets without checksum.\r
   //\r
-  Checksum = (UINT16) (~NetblockChecksum ((UINT8 *) Head, HeadLen));\r
+  Checksum = (UINT16)(~NetblockChecksum ((UINT8 *)Head, HeadLen));\r
 \r
   if ((Head->Checksum != 0) && (Checksum != 0)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -738,15 +731,15 @@ Ip4PreProcessPacket (
   //\r
   // Convert the IP header to host byte order, then get the per packet info.\r
   //\r
-  (*Packet)->Ip.Ip4  = Ip4NtohHead (Head);\r
+  (*Packet)->Ip.Ip4 = Ip4NtohHead (Head);\r
 \r
-  Info            = IP4_GET_CLIP_INFO (*Packet);\r
-  Info->LinkFlag  = Flag;\r
-  Info->CastType  = Ip4GetHostCast (IpSb, Head->Dst, Head->Src);\r
-  Info->Start     = (Head->Fragment & IP4_HEAD_OFFSET_MASK) << 3;\r
-  Info->Length    = Head->TotalLen - HeadLen;\r
-  Info->End       = Info->Start + Info->Length;\r
-  Info->Status    = EFI_SUCCESS;\r
+  Info           = IP4_GET_CLIP_INFO (*Packet);\r
+  Info->LinkFlag = Flag;\r
+  Info->CastType = Ip4GetHostCast (IpSb, Head->Dst, Head->Src);\r
+  Info->Start    = (Head->Fragment & IP4_HEAD_OFFSET_MASK) << 3;\r
+  Info->Length   = Head->TotalLen - HeadLen;\r
+  Info->End      = Info->Start + Info->Length;\r
+  Info->Status   = EFI_SUCCESS;\r
 \r
   //\r
   // The packet is destinated to us if the CastType is non-zero.\r
@@ -815,7 +808,7 @@ Ip4PreProcessPacket (
 **/\r
 BOOLEAN\r
 Ip4IsValidPacketLength (\r
-  IN NET_BUF        *Packet\r
+  IN NET_BUF  *Packet\r
   )\r
 {\r
   //\r
@@ -843,21 +836,21 @@ Ip4IsValidPacketLength (
 **/\r
 VOID\r
 Ip4AccpetFrame (\r
-  IN IP4_PROTOCOL           *Ip4Instance,\r
-  IN NET_BUF                *Packet,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN UINT32                 Flag,\r
-  IN VOID                   *Context\r
+  IN IP4_PROTOCOL  *Ip4Instance,\r
+  IN NET_BUF       *Packet,\r
+  IN EFI_STATUS    IoStatus,\r
+  IN UINT32        Flag,\r
+  IN VOID          *Context\r
   )\r
 {\r
-  IP4_SERVICE               *IpSb;\r
-  IP4_HEAD                  *Head;\r
-  EFI_STATUS                Status;\r
-  IP4_HEAD                  ZeroHead;\r
-  UINT8                     *Option;\r
-  UINT32                    OptionLen;\r
-\r
-  IpSb   = (IP4_SERVICE *) Context;\r
+  IP4_SERVICE  *IpSb;\r
+  IP4_HEAD     *Head;\r
+  EFI_STATUS   Status;\r
+  IP4_HEAD     ZeroHead;\r
+  UINT8        *Option;\r
+  UINT32       OptionLen;\r
+\r
+  IpSb   = (IP4_SERVICE *)Context;\r
   Option = NULL;\r
 \r
   if (EFI_ERROR (IoStatus) || (IpSb->State == IP4_SERVICE_DESTROY)) {\r
@@ -868,11 +861,11 @@ Ip4AccpetFrame (
     goto RESTART;\r
   }\r
 \r
-  Head      = (IP4_HEAD *) NetbufGetByte (Packet, 0, NULL);\r
+  Head = (IP4_HEAD *)NetbufGetByte (Packet, 0, NULL);\r
   ASSERT (Head != NULL);\r
   OptionLen = (Head->HeadLen << 2) - IP4_MIN_HEADLEN;\r
   if (OptionLen > 0) {\r
-    Option = (UINT8 *) (Head + 1);\r
+    Option = (UINT8 *)(Head + 1);\r
   }\r
 \r
   //\r
@@ -922,7 +915,7 @@ Ip4AccpetFrame (
       goto RESTART;\r
     }\r
 \r
-    Head = (IP4_HEAD *) NetbufGetByte (Packet, 0, NULL);\r
+    Head = (IP4_HEAD *)NetbufGetByte (Packet, 0, NULL);\r
     ASSERT (Head != NULL);\r
     Status = Ip4PreProcessPacket (\r
                IpSb,\r
@@ -938,20 +931,20 @@ Ip4AccpetFrame (
   }\r
 \r
   ASSERT (Packet != NULL);\r
-  Head  = Packet->Ip.Ip4;\r
+  Head                               = Packet->Ip.Ip4;\r
   IP4_GET_CLIP_INFO (Packet)->Status = EFI_SUCCESS;\r
 \r
   switch (Head->Protocol) {\r
-  case EFI_IP_PROTO_ICMP:\r
-    Ip4IcmpHandle (IpSb, Head, Packet);\r
-    break;\r
+    case EFI_IP_PROTO_ICMP:\r
+      Ip4IcmpHandle (IpSb, Head, Packet);\r
+      break;\r
 \r
-  case IP4_PROTO_IGMP:\r
-    Ip4IgmpHandle (IpSb, Head, Packet);\r
-    break;\r
+    case IP4_PROTO_IGMP:\r
+      Ip4IgmpHandle (IpSb, Head, Packet);\r
+      break;\r
 \r
-  default:\r
-    Ip4Demultiplex (IpSb, Head, Packet, Option, OptionLen);\r
+    default:\r
+      Ip4Demultiplex (IpSb, Head, Packet, Option, OptionLen);\r
   }\r
 \r
   Packet = NULL;\r
@@ -970,10 +963,9 @@ DROP:
     NetbufFree (Packet);\r
   }\r
 \r
-  return ;\r
+  return;\r
 }\r
 \r
-\r
 /**\r
   Check whether this IP child accepts the packet.\r
 \r
@@ -987,16 +979,16 @@ DROP:
 **/\r
 BOOLEAN\r
 Ip4InstanceFrameAcceptable (\r
-  IN IP4_PROTOCOL           *IpInstance,\r
-  IN IP4_HEAD               *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP4_PROTOCOL  *IpInstance,\r
+  IN IP4_HEAD      *Head,\r
+  IN NET_BUF       *Packet\r
   )\r
 {\r
-  IP4_ICMP_ERROR_HEAD       Icmp;\r
-  EFI_IP4_CONFIG_DATA       *Config;\r
-  IP4_CLIP_INFO             *Info;\r
-  UINT16                    Proto;\r
-  UINT32                    Index;\r
+  IP4_ICMP_ERROR_HEAD  Icmp;\r
+  EFI_IP4_CONFIG_DATA  *Config;\r
+  IP4_CLIP_INFO        *Info;\r
+  UINT16               Proto;\r
+  UINT32               Index;\r
 \r
   Config = &IpInstance->ConfigData;\r
 \r
@@ -1024,14 +1016,14 @@ Ip4InstanceFrameAcceptable (
   Proto = Head->Protocol;\r
 \r
   if ((Proto == EFI_IP_PROTO_ICMP) && (!Config->AcceptAnyProtocol) && (Proto != Config->DefaultProtocol)) {\r
-    NetbufCopy (Packet, 0, sizeof (Icmp.Head), (UINT8 *) &Icmp.Head);\r
+    NetbufCopy (Packet, 0, sizeof (Icmp.Head), (UINT8 *)&Icmp.Head);\r
 \r
     if (mIcmpClass[Icmp.Head.Type].IcmpClass == ICMP_ERROR_MESSAGE) {\r
       if (!Config->AcceptIcmpErrors) {\r
         return FALSE;\r
       }\r
 \r
-      NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *) &Icmp);\r
+      NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *)&Icmp);\r
       Proto = Icmp.IpHead.Protocol;\r
     }\r
   }\r
@@ -1076,7 +1068,6 @@ Ip4InstanceFrameAcceptable (
   return TRUE;\r
 }\r
 \r
-\r
 /**\r
   Enqueue a shared copy of the packet to the IP4 child if the\r
   packet is acceptable to it. Here the data of the packet is\r
@@ -1094,13 +1085,13 @@ Ip4InstanceFrameAcceptable (
 **/\r
 EFI_STATUS\r
 Ip4InstanceEnquePacket (\r
-  IN IP4_PROTOCOL           *IpInstance,\r
-  IN IP4_HEAD               *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP4_PROTOCOL  *IpInstance,\r
+  IN IP4_HEAD      *Head,\r
+  IN NET_BUF       *Packet\r
   )\r
 {\r
-  IP4_CLIP_INFO             *Info;\r
-  NET_BUF                   *Clone;\r
+  IP4_CLIP_INFO  *Info;\r
+  NET_BUF        *Clone;\r
 \r
   //\r
   // Check whether the packet is acceptable to this instance.\r
@@ -1126,14 +1117,13 @@ Ip4InstanceEnquePacket (
   // Set the receive time out for the assembled packet. If it expires,\r
   // packet will be removed from the queue.\r
   //\r
-  Info        = IP4_GET_CLIP_INFO (Clone);\r
-  Info->Life  = IP4_US_TO_SEC (IpInstance->ConfigData.ReceiveTimeout);\r
+  Info       = IP4_GET_CLIP_INFO (Clone);\r
+  Info->Life = IP4_US_TO_SEC (IpInstance->ConfigData.ReceiveTimeout);\r
 \r
   InsertTailList (&IpInstance->Received, &Clone->List);\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   The signal handle of IP4's recycle event. It is called back\r
   when the upper layer release the packet.\r
@@ -1146,13 +1136,13 @@ Ip4InstanceEnquePacket (
 VOID\r
 EFIAPI\r
 Ip4OnRecyclePacket (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  IP4_RXDATA_WRAP           *Wrap;\r
+  IP4_RXDATA_WRAP  *Wrap;\r
 \r
-  Wrap = (IP4_RXDATA_WRAP *) Context;\r
+  Wrap = (IP4_RXDATA_WRAP *)Context;\r
 \r
   EfiAcquireLockOrFail (&Wrap->IpInstance->RecycleLock);\r
   RemoveEntryList (&Wrap->Link);\r
@@ -1165,7 +1155,6 @@ Ip4OnRecyclePacket (
   FreePool (Wrap);\r
 }\r
 \r
-\r
 /**\r
   Wrap the received packet to a IP4_RXDATA_WRAP, which will be\r
   delivered to the upper layer. Each IP4 child that accepts the\r
@@ -1183,14 +1172,14 @@ Ip4OnRecyclePacket (
 **/\r
 IP4_RXDATA_WRAP *\r
 Ip4WrapRxData (\r
-  IN IP4_PROTOCOL           *IpInstance,\r
-  IN NET_BUF                *Packet\r
+  IN IP4_PROTOCOL  *IpInstance,\r
+  IN NET_BUF       *Packet\r
   )\r
 {\r
-  IP4_RXDATA_WRAP           *Wrap;\r
-  EFI_IP4_RECEIVE_DATA      *RxData;\r
-  EFI_STATUS                Status;\r
-  BOOLEAN                   RawData;\r
+  IP4_RXDATA_WRAP       *Wrap;\r
+  EFI_IP4_RECEIVE_DATA  *RxData;\r
+  EFI_STATUS            Status;\r
+  BOOLEAN               RawData;\r
 \r
   Wrap = AllocatePool (IP4_RXDATA_WRAP_SIZE (Packet->BlockOpNum));\r
 \r
@@ -1200,9 +1189,9 @@ Ip4WrapRxData (
 \r
   InitializeListHead (&Wrap->Link);\r
 \r
-  Wrap->IpInstance  = IpInstance;\r
-  Wrap->Packet      = Packet;\r
-  RxData            = &Wrap->RxData;\r
+  Wrap->IpInstance = IpInstance;\r
+  Wrap->Packet     = Packet;\r
+  RxData           = &Wrap->RxData;\r
 \r
   ZeroMem (RxData, sizeof (EFI_IP4_RECEIVE_DATA));\r
 \r
@@ -1229,27 +1218,26 @@ Ip4WrapRxData (
   //\r
   if (!RawData) {\r
     RxData->HeaderLength  = (Packet->Ip.Ip4->HeadLen << 2);\r
-    RxData->Header        = (EFI_IP4_HEADER *) Ip4NtohHead (Packet->Ip.Ip4);\r
+    RxData->Header        = (EFI_IP4_HEADER *)Ip4NtohHead (Packet->Ip.Ip4);\r
     RxData->OptionsLength = RxData->HeaderLength - IP4_MIN_HEADLEN;\r
     RxData->Options       = NULL;\r
 \r
     if (RxData->OptionsLength != 0) {\r
-      RxData->Options = (VOID *) (RxData->Header + 1);\r
+      RxData->Options = (VOID *)(RxData->Header + 1);\r
     }\r
   }\r
 \r
-  RxData->DataLength  = Packet->TotalSize;\r
+  RxData->DataLength = Packet->TotalSize;\r
 \r
   //\r
   // Build the fragment table to be delivered up.\r
   //\r
   RxData->FragmentCount = Packet->BlockOpNum;\r
-  NetbufBuildExt (Packet, (NET_FRAGMENT *) RxData->FragmentTable, &RxData->FragmentCount);\r
+  NetbufBuildExt (Packet, (NET_FRAGMENT *)RxData->FragmentTable, &RxData->FragmentCount);\r
 \r
   return Wrap;\r
 }\r
 \r
-\r
 /**\r
   Deliver the received packets to upper layer if there are both received\r
   requests and enqueued packets. If the enqueued packet is shared, it will\r
@@ -1266,7 +1254,7 @@ Ip4WrapRxData (
 **/\r
 EFI_STATUS\r
 Ip4InstanceDeliverPacket (\r
-  IN IP4_PROTOCOL           *IpInstance\r
+  IN IP4_PROTOCOL  *IpInstance\r
   )\r
 {\r
   EFI_IP4_COMPLETION_TOKEN  *Token;\r
@@ -1280,8 +1268,8 @@ Ip4InstanceDeliverPacket (
   // Deliver a packet if there are both a packet and a receive token.\r
   //\r
   while (!IsListEmpty (&IpInstance->Received) &&\r
-         !NetMapIsEmpty (&IpInstance->RxTokens)) {\r
-\r
+         !NetMapIsEmpty (&IpInstance->RxTokens))\r
+  {\r
     Packet = NET_LIST_HEAD (&IpInstance->Received, NET_BUF, List);\r
 \r
     if (!NET_BUF_SHARED (Packet)) {\r
@@ -1295,7 +1283,6 @@ Ip4InstanceDeliverPacket (
       }\r
 \r
       RemoveEntryList (&Packet->List);\r
-\r
     } else {\r
       //\r
       // Create a duplicated packet if this packet is shared\r
@@ -1321,7 +1308,7 @@ Ip4InstanceDeliverPacket (
         Head = NetbufAllocSpace (Dup, IP4_MAX_HEADLEN, NET_BUF_HEAD);\r
         ASSERT (Head != NULL);\r
 \r
-        Dup->Ip.Ip4 = (IP4_HEAD *) Head;\r
+        Dup->Ip.Ip4 = (IP4_HEAD *)Head;\r
 \r
         CopyMem (Head, Packet->Ip.Ip4, Packet->Ip.Ip4->HeadLen << 2);\r
         NetbufTrim (Dup, IP4_MAX_HEADLEN, TRUE);\r
@@ -1358,7 +1345,6 @@ Ip4InstanceDeliverPacket (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Enqueue a received packet to all the IP children that share\r
   the same interface.\r
@@ -1375,20 +1361,20 @@ Ip4InstanceDeliverPacket (
 **/\r
 INTN\r
 Ip4InterfaceEnquePacket (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_HEAD               *Head,\r
-  IN NET_BUF                *Packet,\r
-  IN UINT8                  *Option,\r
-  IN UINT32                 OptionLen,\r
-  IN IP4_INTERFACE          *IpIf\r
+  IN IP4_SERVICE    *IpSb,\r
+  IN IP4_HEAD       *Head,\r
+  IN NET_BUF        *Packet,\r
+  IN UINT8          *Option,\r
+  IN UINT32         OptionLen,\r
+  IN IP4_INTERFACE  *IpIf\r
   )\r
 {\r
-  IP4_PROTOCOL              *IpInstance;\r
-  IP4_CLIP_INFO             *Info;\r
-  LIST_ENTRY                *Entry;\r
-  INTN                      Enqueued;\r
-  INTN                      LocalType;\r
-  INTN                      SavedType;\r
+  IP4_PROTOCOL   *IpInstance;\r
+  IP4_CLIP_INFO  *Info;\r
+  LIST_ENTRY     *Entry;\r
+  INTN           Enqueued;\r
+  INTN           LocalType;\r
+  INTN           SavedType;\r
 \r
   //\r
   // First, check that the packet is acceptable to this interface\r
@@ -1406,7 +1392,6 @@ Ip4InterfaceEnquePacket (
     // that later.\r
     //\r
     LocalType = Info->CastType;\r
-\r
   } else {\r
     //\r
     // Check the destination against local IP. If the station\r
@@ -1416,7 +1401,6 @@ Ip4InterfaceEnquePacket (
     //\r
     if (IpIf->Ip == IP4_ALLZERO_ADDRESS) {\r
       LocalType = IP4_LOCAL_HOST;\r
-\r
     } else {\r
       LocalType = Ip4GetNetCast (Head->Dst, IpIf);\r
 \r
@@ -1436,10 +1420,10 @@ Ip4InterfaceEnquePacket (
   // and pass the local cast type to the IP children on the\r
   // interface. The global cast type will be restored later.\r
   //\r
-  SavedType       = Info->CastType;\r
-  Info->CastType  = LocalType;\r
+  SavedType      = Info->CastType;\r
+  Info->CastType = LocalType;\r
 \r
-  Enqueued        = 0;\r
+  Enqueued = 0;\r
 \r
   NET_LIST_FOR_EACH (Entry, &IpIf->IpInstances) {\r
     IpInstance = NET_LIST_USER_STRUCT (Entry, IP4_PROTOCOL, AddrLink);\r
@@ -1448,7 +1432,7 @@ Ip4InterfaceEnquePacket (
     //\r
     // In RawData mode, add IPv4 headers and options back to packet.\r
     //\r
-    if ((IpInstance->ConfigData.RawData) && (Option != NULL) && (OptionLen != 0)){\r
+    if ((IpInstance->ConfigData.RawData) && (Option != NULL) && (OptionLen != 0)) {\r
       Ip4PrependHead (Packet, Head, Option, OptionLen);\r
     }\r
 \r
@@ -1461,7 +1445,6 @@ Ip4InterfaceEnquePacket (
   return Enqueued;\r
 }\r
 \r
-\r
 /**\r
   Deliver the packet for each IP4 child on the interface.\r
 \r
@@ -1473,12 +1456,12 @@ Ip4InterfaceEnquePacket (
 **/\r
 EFI_STATUS\r
 Ip4InterfaceDeliverPacket (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_INTERFACE          *IpIf\r
+  IN IP4_SERVICE    *IpSb,\r
+  IN IP4_INTERFACE  *IpIf\r
   )\r
 {\r
-  IP4_PROTOCOL              *Ip4Instance;\r
-  LIST_ENTRY                *Entry;\r
+  IP4_PROTOCOL  *Ip4Instance;\r
+  LIST_ENTRY    *Entry;\r
 \r
   NET_LIST_FOR_EACH (Entry, &IpIf->IpInstances) {\r
     Ip4Instance = NET_LIST_USER_STRUCT (Entry, IP4_PROTOCOL, AddrLink);\r
@@ -1488,7 +1471,6 @@ Ip4InterfaceDeliverPacket (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Demultiple the packet. the packet delivery is processed in two\r
   passes. The first pass will enqueue a shared copy of the packet\r
@@ -1511,16 +1493,16 @@ Ip4InterfaceDeliverPacket (
 **/\r
 EFI_STATUS\r
 Ip4Demultiplex (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_HEAD               *Head,\r
-  IN NET_BUF                *Packet,\r
-  IN UINT8                  *Option,\r
-  IN UINT32                 OptionLen\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_HEAD     *Head,\r
+  IN NET_BUF      *Packet,\r
+  IN UINT8        *Option,\r
+  IN UINT32       OptionLen\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  IP4_INTERFACE             *IpIf;\r
-  INTN                      Enqueued;\r
+  LIST_ENTRY     *Entry;\r
+  IP4_INTERFACE  *IpIf;\r
+  INTN           Enqueued;\r
 \r
   //\r
   // Two pass delivery: first, enqueue a shared copy of the packet\r
@@ -1565,7 +1547,6 @@ Ip4Demultiplex (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Timeout the fragment and enqueued packets.\r
 \r
@@ -1574,17 +1555,17 @@ Ip4Demultiplex (
 **/\r
 VOID\r
 Ip4PacketTimerTicking (\r
-  IN IP4_SERVICE            *IpSb\r
+  IN IP4_SERVICE  *IpSb\r
   )\r
 {\r
-  LIST_ENTRY                *InstanceEntry;\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP4_PROTOCOL              *IpInstance;\r
-  IP4_ASSEMBLE_ENTRY        *Assemble;\r
-  NET_BUF                   *Packet;\r
-  IP4_CLIP_INFO             *Info;\r
-  UINT32                    Index;\r
+  LIST_ENTRY          *InstanceEntry;\r
+  LIST_ENTRY          *Entry;\r
+  LIST_ENTRY          *Next;\r
+  IP4_PROTOCOL        *IpInstance;\r
+  IP4_ASSEMBLE_ENTRY  *Assemble;\r
+  NET_BUF             *Packet;\r
+  IP4_CLIP_INFO       *Info;\r
+  UINT32              Index;\r
 \r
   //\r
   // First, time out the fragments. The packet's life is counting down\r
index 9bd86e15c9cfe66e0c133bf46f007b0057bde09c..668719d4abfe891104e10ebd026725e2262a96d2 100644 (file)
@@ -8,8 +8,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef __EFI_IP4_INPUT_H__\r
 #define __EFI_IP4_INPUT_H__\r
 \r
-#define IP4_MIN_HEADLEN        20\r
-#define IP4_MAX_HEADLEN        60\r
+#define IP4_MIN_HEADLEN  20\r
+#define IP4_MAX_HEADLEN  60\r
 ///\r
 /// 8(ESP header) + 16(max IV) + 16(max padding) + 2(ESP tail) + 12(max ICV) = 54\r
 ///\r
@@ -30,37 +30,37 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /// life. If it isn't consumed before Life reaches zero, the packet is released.\r
 ///\r
 typedef struct {\r
-  UINTN                     LinkFlag;\r
-  INTN                      CastType;\r
-  INTN                      Start;\r
-  INTN                      End;\r
-  INTN                      Length;\r
-  UINT32                    Life;\r
-  EFI_STATUS                Status;\r
+  UINTN         LinkFlag;\r
+  INTN          CastType;\r
+  INTN          Start;\r
+  INTN          End;\r
+  INTN          Length;\r
+  UINT32        Life;\r
+  EFI_STATUS    Status;\r
 } IP4_CLIP_INFO;\r
 \r
 ///\r
 /// Structure used to assemble IP packets.\r
 ///\r
 typedef struct {\r
-  LIST_ENTRY                Link;\r
+  LIST_ENTRY       Link;\r
 \r
   //\r
   // Identity of one IP4 packet. Each fragment of a packet has\r
   // the same (Dst, Src, Id, Protocol).\r
   //\r
-  IP4_ADDR                  Dst;\r
-  IP4_ADDR                  Src;\r
-  UINT16                    Id;\r
-  UINT8                     Protocol;\r
-\r
-  INTN                      TotalLen;\r
-  INTN                      CurLen;\r
-  LIST_ENTRY                Fragments;  // List of all the fragments of this packet\r
-\r
-  IP4_HEAD                  *Head;      // IP head of the first fragment\r
-  IP4_CLIP_INFO             *Info;      // Per packet info of the first fragment\r
-  INTN                      Life;       // Count down life for the packet.\r
+  IP4_ADDR         Dst;\r
+  IP4_ADDR         Src;\r
+  UINT16           Id;\r
+  UINT8            Protocol;\r
+\r
+  INTN             TotalLen;\r
+  INTN             CurLen;\r
+  LIST_ENTRY       Fragments;           // List of all the fragments of this packet\r
+\r
+  IP4_HEAD         *Head;               // IP head of the first fragment\r
+  IP4_CLIP_INFO    *Info;               // Per packet info of the first fragment\r
+  INTN             Life;                // Count down life for the packet.\r
 } IP4_ASSEMBLE_ENTRY;\r
 \r
 ///\r
@@ -69,10 +69,10 @@ typedef struct {
 /// as hash table.\r
 ///\r
 typedef struct {\r
-  LIST_ENTRY      Bucket[IP4_ASSEMLE_HASH_SIZE];\r
+  LIST_ENTRY    Bucket[IP4_ASSEMLE_HASH_SIZE];\r
 } IP4_ASSEMBLE_TABLE;\r
 \r
-#define IP4_GET_CLIP_INFO(Packet) ((IP4_CLIP_INFO *) ((Packet)->ProtoData))\r
+#define IP4_GET_CLIP_INFO(Packet)  ((IP4_CLIP_INFO *) ((Packet)->ProtoData))\r
 \r
 #define IP4_ASSEMBLE_HASH(Dst, Src, Id, Proto)  \\r
           (((Dst) + (Src) + ((Id) << 16) + (Proto)) % IP4_ASSEMLE_HASH_SIZE)\r
@@ -89,7 +89,7 @@ typedef struct {
 **/\r
 VOID\r
 Ip4InitAssembleTable (\r
-  IN OUT IP4_ASSEMBLE_TABLE     *Table\r
+  IN OUT IP4_ASSEMBLE_TABLE  *Table\r
   );\r
 \r
 /**\r
@@ -101,7 +101,7 @@ Ip4InitAssembleTable (
 **/\r
 VOID\r
 Ip4CleanAssembleTable (\r
-  IN IP4_ASSEMBLE_TABLE     *Table\r
+  IN IP4_ASSEMBLE_TABLE  *Table\r
   );\r
 \r
 /**\r
@@ -119,11 +119,11 @@ Ip4CleanAssembleTable (
 **/\r
 VOID\r
 Ip4AccpetFrame (\r
-  IN IP4_PROTOCOL           *Ip4Instance,\r
-  IN NET_BUF                *Packet,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN UINT32                 Flag,\r
-  IN VOID                   *Context\r
+  IN IP4_PROTOCOL  *Ip4Instance,\r
+  IN NET_BUF       *Packet,\r
+  IN EFI_STATUS    IoStatus,\r
+  IN UINT32        Flag,\r
+  IN VOID          *Context\r
   );\r
 \r
 /**\r
@@ -148,11 +148,11 @@ Ip4AccpetFrame (
 **/\r
 EFI_STATUS\r
 Ip4Demultiplex (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_HEAD               *Head,\r
-  IN NET_BUF                *Packet,\r
-  IN UINT8                  *Option,\r
-  IN UINT32                 OptionLen\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_HEAD     *Head,\r
+  IN NET_BUF      *Packet,\r
+  IN UINT8        *Option,\r
+  IN UINT32       OptionLen\r
   );\r
 \r
 /**\r
@@ -171,12 +171,12 @@ Ip4Demultiplex (
 **/\r
 INTN\r
 Ip4InterfaceEnquePacket (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_HEAD               *Head,\r
-  IN NET_BUF                *Packet,\r
-  IN UINT8                  *Option,\r
-  IN UINT32                 OptionLen,\r
-  IN IP4_INTERFACE          *IpIf\r
+  IN IP4_SERVICE    *IpSb,\r
+  IN IP4_HEAD       *Head,\r
+  IN NET_BUF        *Packet,\r
+  IN UINT8          *Option,\r
+  IN UINT32         OptionLen,\r
+  IN IP4_INTERFACE  *IpIf\r
   );\r
 \r
 /**\r
@@ -195,7 +195,7 @@ Ip4InterfaceEnquePacket (
 **/\r
 EFI_STATUS\r
 Ip4InstanceDeliverPacket (\r
-  IN IP4_PROTOCOL           *IpInstance\r
+  IN IP4_PROTOCOL  *IpInstance\r
   );\r
 \r
 /**\r
@@ -206,7 +206,7 @@ Ip4InstanceDeliverPacket (
 **/\r
 VOID\r
 Ip4PacketTimerTicking (\r
-  IN IP4_SERVICE            *IpSb\r
+  IN IP4_SERVICE  *IpSb\r
   );\r
 \r
 /**\r
index d161c1c8c54b8a7c5d622bfcf66cb81ad8d8b6ed..869b08fce6feb392ecd9b819ea3f3bb0658845e0 100644 (file)
@@ -14,32 +14,31 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define FORMID_MAIN_FORM    1\r
 #define FORMID_DEVICE_FORM  2\r
 \r
-#define KEY_ENABLE                0x100\r
-#define KEY_DHCP_ENABLE           0x101\r
-#define KEY_LOCAL_IP              0x102\r
-#define KEY_SUBNET_MASK           0x103\r
-#define KEY_GATE_WAY              0x104\r
-#define KEY_DNS                   0x105\r
-#define KEY_SAVE_CHANGES          0x106\r
-\r
-#define IP_MIN_SIZE               7\r
-#define IP_MAX_SIZE               15\r
-#define IP4_STR_MAX_SIZE          16\r
-#define ADDRESS_STR_MAX_SIZE      255\r
-#define MAX_IP4_CONFIG_DNS        16\r
+#define KEY_ENABLE        0x100\r
+#define KEY_DHCP_ENABLE   0x101\r
+#define KEY_LOCAL_IP      0x102\r
+#define KEY_SUBNET_MASK   0x103\r
+#define KEY_GATE_WAY      0x104\r
+#define KEY_DNS           0x105\r
+#define KEY_SAVE_CHANGES  0x106\r
+\r
+#define IP_MIN_SIZE           7\r
+#define IP_MAX_SIZE           15\r
+#define IP4_STR_MAX_SIZE      16\r
+#define ADDRESS_STR_MAX_SIZE  255\r
+#define MAX_IP4_CONFIG_DNS    16\r
 \r
 ///\r
 /// IP4_CONFIG2_IFR_NVDATA contains the IP4 configure\r
 /// parameters for that NIC.\r
 ///\r
 typedef struct {\r
-  UINT8           Configure;                         ///< NIC configure status\r
-  UINT8           DhcpEnable;                        ///< Static or DHCP\r
-  CHAR16          StationAddress[IP4_STR_MAX_SIZE];  ///< IP addresses\r
-  CHAR16          SubnetMask[IP4_STR_MAX_SIZE];      ///< Subnet address\r
-  CHAR16          GatewayAddress[IP4_STR_MAX_SIZE];  ///< Gateway address\r
-  CHAR16          DnsAddress[ADDRESS_STR_MAX_SIZE];  ///< DNS server address\r
+  UINT8     Configure;                               ///< NIC configure status\r
+  UINT8     DhcpEnable;                              ///< Static or DHCP\r
+  CHAR16    StationAddress[IP4_STR_MAX_SIZE];        ///< IP addresses\r
+  CHAR16    SubnetMask[IP4_STR_MAX_SIZE];            ///< Subnet address\r
+  CHAR16    GatewayAddress[IP4_STR_MAX_SIZE];        ///< Gateway address\r
+  CHAR16    DnsAddress[ADDRESS_STR_MAX_SIZE];        ///< DNS server address\r
 } IP4_CONFIG2_IFR_NVDATA;\r
 \r
 #endif\r
-\r
index 34c7ff2560b36391116582c4aeb359e61a8e19d9..c72d5d7c7322d5e88181d68c39c7dec163dd0b55 100644 (file)
@@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Ip4Impl.h"\r
 \r
-\r
 /**\r
   Validate the IP4 option format for both the packets we received\r
   and will transmit.\r
@@ -24,75 +23,73 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 BOOLEAN\r
 Ip4OptionIsValid (\r
-  IN UINT8                  *Option,\r
-  IN UINT32                 OptionLen,\r
-  IN BOOLEAN                Rcvd\r
+  IN UINT8    *Option,\r
+  IN UINT32   OptionLen,\r
+  IN BOOLEAN  Rcvd\r
   )\r
 {\r
-  UINT32                    Cur;\r
-  UINT32                    Len;\r
-  UINT32                    Point;\r
+  UINT32  Cur;\r
+  UINT32  Len;\r
+  UINT32  Point;\r
 \r
-  Cur       = 0;\r
+  Cur = 0;\r
 \r
   while (Cur < OptionLen) {\r
     switch (Option[Cur]) {\r
-    case IP4_OPTION_NOP:\r
-      Cur++;\r
-      break;\r
-\r
-    case IP4_OPTION_EOP:\r
-      Cur = OptionLen;\r
-      break;\r
-\r
-    case IP4_OPTION_LSRR:\r
-    case IP4_OPTION_SSRR:\r
-    case IP4_OPTION_RR:\r
-      Len   = Option[Cur + 1];\r
-      Point = Option[Cur + 2];\r
-\r
-      //\r
-      // SRR/RR options are formatted as |Type|Len|Point|Ip1|Ip2|...\r
-      //\r
-      if ((OptionLen - Cur < Len) || (Len < 3) || ((Len - 3) % 4 != 0)) {\r
-        return FALSE;\r
-      }\r
-\r
-      if ((Point > Len + 1) || (Point % 4 != 0)) {\r
-        return FALSE;\r
-      }\r
-\r
-      //\r
-      // The Point must point pass the last entry if the packet is received\r
-      // by us. It must point to 4 if the packet is to be sent by us for\r
-      // source route option.\r
-      //\r
-      if ((Option[Cur] != IP4_OPTION_RR) &&\r
-          ((Rcvd && (Point != Len + 1)) || (!Rcvd && (Point != 4)))) {\r
-\r
-        return FALSE;\r
-      }\r
-\r
-      Cur += Len;\r
-      break;\r
-\r
-    default:\r
-      Len = Option[Cur + 1];\r
-\r
-      if ((OptionLen - Cur < Len) || (Len < 2)) {\r
-        return FALSE;\r
-      }\r
-\r
-      Cur = Cur + Len;\r
-      break;\r
+      case IP4_OPTION_NOP:\r
+        Cur++;\r
+        break;\r
+\r
+      case IP4_OPTION_EOP:\r
+        Cur = OptionLen;\r
+        break;\r
+\r
+      case IP4_OPTION_LSRR:\r
+      case IP4_OPTION_SSRR:\r
+      case IP4_OPTION_RR:\r
+        Len   = Option[Cur + 1];\r
+        Point = Option[Cur + 2];\r
+\r
+        //\r
+        // SRR/RR options are formatted as |Type|Len|Point|Ip1|Ip2|...\r
+        //\r
+        if ((OptionLen - Cur < Len) || (Len < 3) || ((Len - 3) % 4 != 0)) {\r
+          return FALSE;\r
+        }\r
+\r
+        if ((Point > Len + 1) || (Point % 4 != 0)) {\r
+          return FALSE;\r
+        }\r
+\r
+        //\r
+        // The Point must point pass the last entry if the packet is received\r
+        // by us. It must point to 4 if the packet is to be sent by us for\r
+        // source route option.\r
+        //\r
+        if ((Option[Cur] != IP4_OPTION_RR) &&\r
+            ((Rcvd && (Point != Len + 1)) || (!Rcvd && (Point != 4))))\r
+        {\r
+          return FALSE;\r
+        }\r
+\r
+        Cur += Len;\r
+        break;\r
+\r
+      default:\r
+        Len = Option[Cur + 1];\r
+\r
+        if ((OptionLen - Cur < Len) || (Len < 2)) {\r
+          return FALSE;\r
+        }\r
+\r
+        Cur = Cur + Len;\r
+        break;\r
     }\r
-\r
   }\r
 \r
   return TRUE;\r
 }\r
 \r
-\r
 /**\r
   Copy the option from the original option to buffer. It\r
   handles the details such as:\r
@@ -112,27 +109,27 @@ Ip4OptionIsValid (
 **/\r
 EFI_STATUS\r
 Ip4CopyOption (\r
-  IN     UINT8              *Option,\r
-  IN     UINT32             OptionLen,\r
-  IN     BOOLEAN            FirstFragment,\r
-  IN OUT UINT8              *Buf            OPTIONAL,\r
-  IN OUT UINT32             *BufLen\r
+  IN     UINT8    *Option,\r
+  IN     UINT32   OptionLen,\r
+  IN     BOOLEAN  FirstFragment,\r
+  IN OUT UINT8    *Buf            OPTIONAL,\r
+  IN OUT UINT32   *BufLen\r
   )\r
 {\r
-  UINT8                     OptBuf[40];\r
-  UINT32                    Cur;\r
-  UINT32                    Next;\r
-  UINT8                     Type;\r
-  UINT32                    Len;\r
+  UINT8   OptBuf[40];\r
+  UINT32  Cur;\r
+  UINT32  Next;\r
+  UINT8   Type;\r
+  UINT32  Len;\r
 \r
   ASSERT ((BufLen != NULL) && (OptionLen <= 40));\r
 \r
-  Cur   = 0;\r
-  Next  = 0;\r
+  Cur  = 0;\r
+  Next = 0;\r
 \r
   while (Cur < OptionLen) {\r
-    Type  = Option[Cur];\r
-    Len   = Option[Cur + 1];\r
+    Type = Option[Cur];\r
+    Len  = Option[Cur + 1];\r
 \r
     if (Type == IP4_OPTION_NOP) {\r
       //\r
@@ -142,18 +139,16 @@ Ip4CopyOption (
       OptBuf[Next] = IP4_OPTION_NOP;\r
       Next++;\r
       Cur++;\r
-\r
     } else if (Type == IP4_OPTION_EOP) {\r
       //\r
       // Don't append the EOP to avoid including only a EOP option\r
       //\r
       break;\r
-\r
     } else {\r
       //\r
       // don't copy options that is only valid for the first fragment\r
       //\r
-      if (FirstFragment || (Type & IP4_OPTION_COPY_MASK) != 0) {\r
+      if (FirstFragment || ((Type & IP4_OPTION_COPY_MASK) != 0)) {\r
         CopyMem (OptBuf + Next, Option + Cur, Len);\r
         Next += Len;\r
       }\r
index 05b1bdb9734936e35a4eed479a317f3b341f3b19..a8988db8a8bcd1a29bfcde400c67f465ecae91b9 100644 (file)
@@ -9,11 +9,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef __EFI_IP4_OPTION_H__\r
 #define __EFI_IP4_OPTION_H__\r
 \r
-#define IP4_OPTION_EOP        0\r
-#define IP4_OPTION_NOP        1\r
-#define IP4_OPTION_LSRR       131  // Loss source and record routing,   10000011\r
-#define IP4_OPTION_SSRR       137  // Strict source and record routing, 10001001\r
-#define IP4_OPTION_RR         7    // Record routing, 00000111\r
+#define IP4_OPTION_EOP   0\r
+#define IP4_OPTION_NOP   1\r
+#define IP4_OPTION_LSRR  131       // Loss source and record routing,   10000011\r
+#define IP4_OPTION_SSRR  137       // Strict source and record routing, 10001001\r
+#define IP4_OPTION_RR    7         // Record routing, 00000111\r
 \r
 #define IP4_OPTION_COPY_MASK  0x80\r
 \r
@@ -33,9 +33,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 BOOLEAN\r
 Ip4OptionIsValid (\r
-  IN UINT8                  *Option,\r
-  IN UINT32                 OptionLen,\r
-  IN BOOLEAN                Rcvd\r
+  IN UINT8    *Option,\r
+  IN UINT32   OptionLen,\r
+  IN BOOLEAN  Rcvd\r
   );\r
 \r
 /**\r
@@ -57,10 +57,11 @@ Ip4OptionIsValid (
 **/\r
 EFI_STATUS\r
 Ip4CopyOption (\r
-  IN     UINT8              *Option,\r
-  IN     UINT32             OptionLen,\r
-  IN     BOOLEAN            FirstFragment,\r
-  IN OUT UINT8              *Buf            OPTIONAL,\r
-  IN OUT UINT32             *BufLen\r
+  IN     UINT8    *Option,\r
+  IN     UINT32   OptionLen,\r
+  IN     BOOLEAN  FirstFragment,\r
+  IN OUT UINT8    *Buf            OPTIONAL,\r
+  IN OUT UINT32   *BufLen\r
   );\r
+\r
 #endif\r
index c161b72542be08d3162dbac2fb468d8702c4486c..b8da0b0511311b7011ab67f6d2e1af01cf0a7652 100644 (file)
@@ -10,7 +10,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 UINT16  mIp4Id;\r
 \r
-\r
 /**\r
   Prepend an IP4 head to the Packet. It will copy the options and\r
   build the IP4 header fields. Used for IP4 fragmentation.\r
@@ -31,16 +30,16 @@ UINT16  mIp4Id;
 **/\r
 EFI_STATUS\r
 Ip4PrependHead (\r
-  IN OUT NET_BUF                *Packet,\r
-  IN     IP4_HEAD               *Head,\r
-  IN     UINT8                  *Option,\r
-  IN     UINT32                 OptLen\r
+  IN OUT NET_BUF   *Packet,\r
+  IN     IP4_HEAD  *Head,\r
+  IN     UINT8     *Option,\r
+  IN     UINT32    OptLen\r
   )\r
 {\r
-  UINT32                    HeadLen;\r
-  UINT32                    Len;\r
-  IP4_HEAD                  *PacketHead;\r
-  BOOLEAN                   FirstFragment;\r
+  UINT32    HeadLen;\r
+  UINT32    Len;\r
+  IP4_HEAD  *PacketHead;\r
+  BOOLEAN   FirstFragment;\r
 \r
   //\r
   // Prepend the options: first get the option length, then copy it over.\r
@@ -53,35 +52,34 @@ Ip4PrependHead (
   HeadLen = IP4_MIN_HEADLEN + Len;\r
   ASSERT (((Len % 4) == 0) && (HeadLen <= IP4_MAX_HEADLEN));\r
 \r
-  PacketHead = (IP4_HEAD *) NetbufAllocSpace (Packet, HeadLen, NET_BUF_HEAD);\r
+  PacketHead = (IP4_HEAD *)NetbufAllocSpace (Packet, HeadLen, NET_BUF_HEAD);\r
 \r
   if (PacketHead == NULL) {\r
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
-  Ip4CopyOption (Option, OptLen, FirstFragment, (UINT8 *) (PacketHead + 1), &Len);\r
+  Ip4CopyOption (Option, OptLen, FirstFragment, (UINT8 *)(PacketHead + 1), &Len);\r
 \r
   //\r
   // Set the head up, convert the host byte order to network byte order\r
   //\r
-  PacketHead->Ver       = 4;\r
-  PacketHead->HeadLen   = (UINT8) (HeadLen >> 2);\r
-  PacketHead->Tos       = Head->Tos;\r
-  PacketHead->TotalLen  = HTONS ((UINT16) Packet->TotalSize);\r
-  PacketHead->Id        = HTONS (Head->Id);\r
-  PacketHead->Fragment  = HTONS (Head->Fragment);\r
-  PacketHead->Checksum  = 0;\r
-  PacketHead->Ttl       = Head->Ttl;\r
-  PacketHead->Protocol  = Head->Protocol;\r
-  PacketHead->Src       = HTONL (Head->Src);\r
-  PacketHead->Dst       = HTONL (Head->Dst);\r
-  PacketHead->Checksum  = (UINT16) (~NetblockChecksum ((UINT8 *) PacketHead, HeadLen));\r
-\r
-  Packet->Ip.Ip4        = PacketHead;\r
+  PacketHead->Ver      = 4;\r
+  PacketHead->HeadLen  = (UINT8)(HeadLen >> 2);\r
+  PacketHead->Tos      = Head->Tos;\r
+  PacketHead->TotalLen = HTONS ((UINT16)Packet->TotalSize);\r
+  PacketHead->Id       = HTONS (Head->Id);\r
+  PacketHead->Fragment = HTONS (Head->Fragment);\r
+  PacketHead->Checksum = 0;\r
+  PacketHead->Ttl      = Head->Ttl;\r
+  PacketHead->Protocol = Head->Protocol;\r
+  PacketHead->Src      = HTONL (Head->Src);\r
+  PacketHead->Dst      = HTONL (Head->Dst);\r
+  PacketHead->Checksum = (UINT16)(~NetblockChecksum ((UINT8 *)PacketHead, HeadLen));\r
+\r
+  Packet->Ip.Ip4 = PacketHead;\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Select an interface to send the packet generated in the IP4 driver\r
   itself, that is, not by the requests of IP4 child's consumer. Such\r
@@ -97,14 +95,14 @@ Ip4PrependHead (
 **/\r
 IP4_INTERFACE *\r
 Ip4SelectInterface (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_ADDR               Dst,\r
-  IN IP4_ADDR               Src\r
+  IN IP4_SERVICE  *IpSb,\r
+  IN IP4_ADDR     Dst,\r
+  IN IP4_ADDR     Src\r
   )\r
 {\r
-  IP4_INTERFACE             *IpIf;\r
-  IP4_INTERFACE             *Selected;\r
-  LIST_ENTRY                *Entry;\r
+  IP4_INTERFACE  *IpIf;\r
+  IP4_INTERFACE  *Selected;\r
+  LIST_ENTRY     *Entry;\r
 \r
   //\r
   // Select the interface the Dst is on if one of the connected\r
@@ -143,7 +141,6 @@ Ip4SelectInterface (
   return Selected;\r
 }\r
 \r
-\r
 /**\r
   The default callback function for system generated packet.\r
   It will free the packet.\r
@@ -159,17 +156,16 @@ Ip4SelectInterface (
 **/\r
 VOID\r
 Ip4SysPacketSent (\r
-  IP4_PROTOCOL              *Ip4Instance,\r
-  NET_BUF                   *Packet,\r
-  EFI_STATUS                IoStatus,\r
-  UINT32                    LinkFlag,\r
-  VOID                      *Context\r
+  IP4_PROTOCOL  *Ip4Instance,\r
+  NET_BUF       *Packet,\r
+  EFI_STATUS    IoStatus,\r
+  UINT32        LinkFlag,\r
+  VOID          *Context\r
   )\r
 {\r
   NetbufFree (Packet);\r
 }\r
 \r
-\r
 /**\r
   Transmit an IP4 packet. The packet comes either from the IP4\r
   child's consumer (IpInstance != NULL) or the IP4 driver itself\r
@@ -207,29 +203,29 @@ Ip4SysPacketSent (
 **/\r
 EFI_STATUS\r
 Ip4Output (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_PROTOCOL           *IpInstance  OPTIONAL,\r
-  IN NET_BUF                *Packet,\r
-  IN IP4_HEAD               *Head,\r
-  IN UINT8                  *Option,\r
-  IN UINT32                 OptLen,\r
-  IN IP4_ADDR               GateWay,\r
-  IN IP4_FRAME_CALLBACK     Callback,\r
-  IN VOID                   *Context\r
+  IN IP4_SERVICE         *IpSb,\r
+  IN IP4_PROTOCOL        *IpInstance  OPTIONAL,\r
+  IN NET_BUF             *Packet,\r
+  IN IP4_HEAD            *Head,\r
+  IN UINT8               *Option,\r
+  IN UINT32              OptLen,\r
+  IN IP4_ADDR            GateWay,\r
+  IN IP4_FRAME_CALLBACK  Callback,\r
+  IN VOID                *Context\r
   )\r
 {\r
-  IP4_INTERFACE             *IpIf;\r
-  IP4_ROUTE_CACHE_ENTRY     *CacheEntry;\r
-  IP4_ADDR                  Dest;\r
-  EFI_STATUS                Status;\r
-  NET_BUF                   *Fragment;\r
-  UINT32                    Index;\r
-  UINT32                    HeadLen;\r
-  UINT32                    PacketLen;\r
-  UINT32                    Offset;\r
-  UINT32                    Mtu;\r
-  UINT32                    Num;\r
-  BOOLEAN                   RawData;\r
+  IP4_INTERFACE          *IpIf;\r
+  IP4_ROUTE_CACHE_ENTRY  *CacheEntry;\r
+  IP4_ADDR               Dest;\r
+  EFI_STATUS             Status;\r
+  NET_BUF                *Fragment;\r
+  UINT32                 Index;\r
+  UINT32                 HeadLen;\r
+  UINT32                 PacketLen;\r
+  UINT32                 Offset;\r
+  UINT32                 Mtu;\r
+  UINT32                 Num;\r
+  BOOLEAN                RawData;\r
 \r
   //\r
   // Select an interface/source for system packet, application\r
@@ -256,12 +252,12 @@ Ip4Output (
   HeadLen = sizeof (IP4_HEAD) + ((OptLen + 3) & (~0x03));\r
 \r
   if ((IpInstance != NULL) && IpInstance->ConfigData.RawData) {\r
-    RawData        = TRUE;\r
+    RawData = TRUE;\r
   } else {\r
-    Head->HeadLen  = (UINT8) (HeadLen >> 2);\r
-    Head->Id       = mIp4Id++;\r
-    Head->Ver      = 4;\r
-    RawData        = FALSE;\r
+    Head->HeadLen = (UINT8)(HeadLen >> 2);\r
+    Head->Id      = mIp4Id++;\r
+    Head->Ver     = 4;\r
+    RawData       = FALSE;\r
   }\r
 \r
   //\r
@@ -277,7 +273,7 @@ Ip4Output (
              Context\r
              );\r
 \r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
@@ -289,7 +285,6 @@ Ip4Output (
     // it is local broadcast.\r
     //\r
     GateWay = IP4_ALLONE_ADDRESS;\r
-\r
   } else if (IP4_IS_MULTICAST (Dest)) {\r
     //\r
     // Set the gateway to the destination if it is an multicast\r
@@ -297,7 +292,6 @@ Ip4Output (
     // broadcast and multicast.\r
     //\r
     GateWay = Head->Dst;\r
-\r
   } else if (GateWay == IP4_ALLZERO_ADDRESS) {\r
     //\r
     // Route the packet unless overridden, that is, GateWay isn't zero.\r
@@ -343,8 +337,8 @@ Ip4Output (
     // fragment is NOT sent in this loop. First compute how many\r
     // fragments there are.\r
     //\r
-    Mtu       = (Mtu - HeadLen) & (~0x07);\r
-    Num       = (Packet->TotalSize + Mtu - 1) / Mtu;\r
+    Mtu = (Mtu - HeadLen) & (~0x07);\r
+    Num = (Packet->TotalSize + Mtu - 1) / Mtu;\r
 \r
     //\r
     // Initialize the packet length and Offset. Other than the last\r
@@ -437,7 +431,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   The filter function to find a packet and all its fragments.\r
   The packet's fragments have their Context set to the packet.\r
@@ -451,18 +444,17 @@ ON_ERROR:
 **/\r
 BOOLEAN\r
 Ip4CancelPacketFragments (\r
-  IN IP4_LINK_TX_TOKEN   *Frame,\r
-  IN VOID                *Context\r
+  IN IP4_LINK_TX_TOKEN  *Frame,\r
+  IN VOID               *Context\r
   )\r
 {\r
-  if ((Frame->Packet == (NET_BUF *) Context) || (Frame->Context == Context)) {\r
+  if ((Frame->Packet == (NET_BUF *)Context) || (Frame->Context == Context)) {\r
     return TRUE;\r
   }\r
 \r
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   Cancel the Packet and all its fragments.\r
 \r
@@ -473,9 +465,9 @@ Ip4CancelPacketFragments (
 **/\r
 VOID\r
 Ip4CancelPacket (\r
-  IN IP4_INTERFACE    *IpIf,\r
-  IN NET_BUF          *Packet,\r
-  IN EFI_STATUS       IoStatus\r
+  IN IP4_INTERFACE  *IpIf,\r
+  IN NET_BUF        *Packet,\r
+  IN EFI_STATUS     IoStatus\r
   )\r
 {\r
   Ip4CancelFrames (IpIf, IoStatus, Ip4CancelPacketFragments, Packet);\r
index bb6fa641b090121004d1d9d11b26a3244fb0a0d7..4bd9baa147593923e3ab85e1c2969684f5e25857 100644 (file)
@@ -23,11 +23,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 VOID\r
 Ip4SysPacketSent (\r
-  IP4_PROTOCOL              *Ip4Instance,\r
-  NET_BUF                   *Packet,\r
-  EFI_STATUS                IoStatus,\r
-  UINT32                    LinkFlag,\r
-  VOID                      *Context\r
+  IP4_PROTOCOL  *Ip4Instance,\r
+  NET_BUF       *Packet,\r
+  EFI_STATUS    IoStatus,\r
+  UINT32        LinkFlag,\r
+  VOID          *Context\r
   );\r
 \r
 /**\r
@@ -63,15 +63,15 @@ Ip4SysPacketSent (
 **/\r
 EFI_STATUS\r
 Ip4Output (\r
-  IN IP4_SERVICE            *IpSb,\r
-  IN IP4_PROTOCOL           *IpInstance  OPTIONAL,\r
-  IN NET_BUF                *Packet,\r
-  IN IP4_HEAD               *Head,\r
-  IN UINT8                  *Option,\r
-  IN UINT32                 OptLen,\r
-  IN IP4_ADDR               GateWay,\r
-  IN IP4_FRAME_CALLBACK     Callback,\r
-  IN VOID                   *Context\r
+  IN IP4_SERVICE         *IpSb,\r
+  IN IP4_PROTOCOL        *IpInstance  OPTIONAL,\r
+  IN NET_BUF             *Packet,\r
+  IN IP4_HEAD            *Head,\r
+  IN UINT8               *Option,\r
+  IN UINT32              OptLen,\r
+  IN IP4_ADDR            GateWay,\r
+  IN IP4_FRAME_CALLBACK  Callback,\r
+  IN VOID                *Context\r
   );\r
 \r
 /**\r
@@ -84,9 +84,9 @@ Ip4Output (
 **/\r
 VOID\r
 Ip4CancelPacket (\r
-  IN IP4_INTERFACE    *IpIf,\r
-  IN NET_BUF          *Packet,\r
-  IN EFI_STATUS       IoStatus\r
+  IN IP4_INTERFACE  *IpIf,\r
+  IN NET_BUF        *Packet,\r
+  IN EFI_STATUS     IoStatus\r
   );\r
 \r
 /**\r
@@ -109,10 +109,10 @@ Ip4CancelPacket (
 **/\r
 EFI_STATUS\r
 Ip4PrependHead (\r
-  IN OUT NET_BUF                *Packet,\r
-  IN     IP4_HEAD               *Head,\r
-  IN     UINT8                  *Option,\r
-  IN     UINT32                 OptLen\r
+  IN OUT NET_BUF   *Packet,\r
+  IN     IP4_HEAD  *Head,\r
+  IN     UINT8     *Option,\r
+  IN     UINT32    OptLen\r
   );\r
 \r
 extern UINT16  mIp4Id;\r
index 386011934b192324e9448b05e15316a4a2274057..0a9225414158cba792a11dc499d9db68f05373cc 100644 (file)
@@ -7,7 +7,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Ip4Impl.h"\r
 \r
-\r
 /**\r
   Allocate a route entry then initialize it with the Dest/Netmask\r
   and Gateway.\r
@@ -22,12 +21,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 IP4_ROUTE_ENTRY *\r
 Ip4CreateRouteEntry (\r
-  IN IP4_ADDR               Dest,\r
-  IN IP4_ADDR               Netmask,\r
-  IN IP4_ADDR               GateWay\r
+  IN IP4_ADDR  Dest,\r
+  IN IP4_ADDR  Netmask,\r
+  IN IP4_ADDR  GateWay\r
   )\r
 {\r
-  IP4_ROUTE_ENTRY           *RtEntry;\r
+  IP4_ROUTE_ENTRY  *RtEntry;\r
 \r
   RtEntry = AllocatePool (sizeof (IP4_ROUTE_ENTRY));\r
 \r
@@ -46,7 +45,6 @@ Ip4CreateRouteEntry (
   return RtEntry;\r
 }\r
 \r
-\r
 /**\r
   Free the route table entry. It is reference counted.\r
 \r
@@ -55,7 +53,7 @@ Ip4CreateRouteEntry (
 **/\r
 VOID\r
 Ip4FreeRouteEntry (\r
-  IN IP4_ROUTE_ENTRY    *RtEntry\r
+  IN IP4_ROUTE_ENTRY  *RtEntry\r
   )\r
 {\r
   ASSERT (RtEntry->RefCnt > 0);\r
@@ -65,7 +63,6 @@ Ip4FreeRouteEntry (
   }\r
 }\r
 \r
-\r
 /**\r
   Allocate and initialize an IP4 route cache entry.\r
 \r
@@ -81,13 +78,13 @@ Ip4FreeRouteEntry (
 **/\r
 IP4_ROUTE_CACHE_ENTRY *\r
 Ip4CreateRouteCacheEntry (\r
-  IN IP4_ADDR               Dst,\r
-  IN IP4_ADDR               Src,\r
-  IN IP4_ADDR               GateWay,\r
-  IN UINTN                  Tag\r
+  IN IP4_ADDR  Dst,\r
+  IN IP4_ADDR  Src,\r
+  IN IP4_ADDR  GateWay,\r
+  IN UINTN     Tag\r
   )\r
 {\r
-  IP4_ROUTE_CACHE_ENTRY     *RtCacheEntry;\r
+  IP4_ROUTE_CACHE_ENTRY  *RtCacheEntry;\r
 \r
   RtCacheEntry = AllocatePool (sizeof (IP4_ROUTE_CACHE_ENTRY));\r
 \r
@@ -106,7 +103,6 @@ Ip4CreateRouteCacheEntry (
   return RtCacheEntry;\r
 }\r
 \r
-\r
 /**\r
   Free the route cache entry. It is reference counted.\r
 \r
@@ -125,7 +121,6 @@ Ip4FreeRouteCacheEntry (
   }\r
 }\r
 \r
-\r
 /**\r
   Initialize an empty route cache table.\r
 \r
@@ -134,17 +129,16 @@ Ip4FreeRouteCacheEntry (
 **/\r
 VOID\r
 Ip4InitRouteCache (\r
-  IN OUT IP4_ROUTE_CACHE        *RtCache\r
+  IN OUT IP4_ROUTE_CACHE  *RtCache\r
   )\r
 {\r
-  UINT32                    Index;\r
+  UINT32  Index;\r
 \r
   for (Index = 0; Index < IP4_ROUTE_CACHE_HASH_VALUE; Index++) {\r
     InitializeListHead (&(RtCache->CacheBucket[Index]));\r
   }\r
 }\r
 \r
-\r
 /**\r
   Clean up a route cache, that is free all the route cache\r
   entries enqueued in the cache.\r
@@ -154,13 +148,13 @@ Ip4InitRouteCache (
 **/\r
 VOID\r
 Ip4CleanRouteCache (\r
-  IN IP4_ROUTE_CACHE        *RtCache\r
+  IN IP4_ROUTE_CACHE  *RtCache\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP4_ROUTE_CACHE_ENTRY     *RtCacheEntry;\r
-  UINT32                    Index;\r
+  LIST_ENTRY             *Entry;\r
+  LIST_ENTRY             *Next;\r
+  IP4_ROUTE_CACHE_ENTRY  *RtCacheEntry;\r
+  UINT32                 Index;\r
 \r
   for (Index = 0; Index < IP4_ROUTE_CACHE_HASH_VALUE; Index++) {\r
     NET_LIST_FOR_EACH_SAFE (Entry, Next, &(RtCache->CacheBucket[Index])) {\r
@@ -172,8 +166,6 @@ Ip4CleanRouteCache (
   }\r
 }\r
 \r
-\r
-\r
 /**\r
   Create an empty route table, includes its internal route cache\r
 \r
@@ -186,8 +178,8 @@ Ip4CreateRouteTable (
   VOID\r
   )\r
 {\r
-  IP4_ROUTE_TABLE           *RtTable;\r
-  UINT32                    Index;\r
+  IP4_ROUTE_TABLE  *RtTable;\r
+  UINT32           Index;\r
 \r
   RtTable = AllocatePool (sizeof (IP4_ROUTE_TABLE));\r
 \r
@@ -208,7 +200,6 @@ Ip4CreateRouteTable (
   return RtTable;\r
 }\r
 \r
-\r
 /**\r
   Free the route table and its associated route cache. Route\r
   table is reference counted.\r
@@ -218,18 +209,18 @@ Ip4CreateRouteTable (
 **/\r
 VOID\r
 Ip4FreeRouteTable (\r
-  IN IP4_ROUTE_TABLE        *RtTable\r
+  IN IP4_ROUTE_TABLE  *RtTable\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP4_ROUTE_ENTRY           *RtEntry;\r
-  UINT32                    Index;\r
+  LIST_ENTRY       *Entry;\r
+  LIST_ENTRY       *Next;\r
+  IP4_ROUTE_ENTRY  *RtEntry;\r
+  UINT32           Index;\r
 \r
   ASSERT (RtTable->RefCnt > 0);\r
 \r
   if (--RtTable->RefCnt > 0) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   //\r
@@ -249,8 +240,6 @@ Ip4FreeRouteTable (
   FreePool (RtTable);\r
 }\r
 \r
-\r
-\r
 /**\r
   Remove all the cache entries bearing the Tag. When a route cache\r
   entry is created, it is tagged with the address of route entry\r
@@ -263,18 +252,17 @@ Ip4FreeRouteTable (
 **/\r
 VOID\r
 Ip4PurgeRouteCache (\r
-  IN OUT IP4_ROUTE_CACHE        *RtCache,\r
-  IN     UINTN                  Tag\r
+  IN OUT IP4_ROUTE_CACHE  *RtCache,\r
+  IN     UINTN            Tag\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP4_ROUTE_CACHE_ENTRY     *RtCacheEntry;\r
-  UINT32                    Index;\r
+  LIST_ENTRY             *Entry;\r
+  LIST_ENTRY             *Next;\r
+  IP4_ROUTE_CACHE_ENTRY  *RtCacheEntry;\r
+  UINT32                 Index;\r
 \r
   for (Index = 0; Index < IP4_ROUTE_CACHE_HASH_VALUE; Index++) {\r
     NET_LIST_FOR_EACH_SAFE (Entry, Next, &RtCache->CacheBucket[Index]) {\r
-\r
       RtCacheEntry = NET_LIST_USER_STRUCT (Entry, IP4_ROUTE_CACHE_ENTRY, Link);\r
 \r
       if (RtCacheEntry->Tag == Tag) {\r
@@ -285,7 +273,6 @@ Ip4PurgeRouteCache (
   }\r
 }\r
 \r
-\r
 /**\r
   Add a route entry to the route table. All the IP4_ADDRs are in\r
   host byte order.\r
@@ -302,15 +289,15 @@ Ip4PurgeRouteCache (
 **/\r
 EFI_STATUS\r
 Ip4AddRoute (\r
-  IN OUT IP4_ROUTE_TABLE        *RtTable,\r
-  IN     IP4_ADDR               Dest,\r
-  IN     IP4_ADDR               Netmask,\r
-  IN     IP4_ADDR               Gateway\r
+  IN OUT IP4_ROUTE_TABLE  *RtTable,\r
+  IN     IP4_ADDR         Dest,\r
+  IN     IP4_ADDR         Netmask,\r
+  IN     IP4_ADDR         Gateway\r
   )\r
 {\r
-  LIST_ENTRY                *Head;\r
-  LIST_ENTRY                *Entry;\r
-  IP4_ROUTE_ENTRY           *RtEntry;\r
+  LIST_ENTRY       *Head;\r
+  LIST_ENTRY       *Entry;\r
+  IP4_ROUTE_ENTRY  *RtEntry;\r
 \r
   //\r
   // All the route entries with the same netmask length are\r
@@ -348,7 +335,6 @@ Ip4AddRoute (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Remove a route entry and all the route caches spawn from it.\r
 \r
@@ -364,16 +350,16 @@ Ip4AddRoute (
 **/\r
 EFI_STATUS\r
 Ip4DelRoute (\r
-  IN OUT IP4_ROUTE_TABLE      *RtTable,\r
-  IN     IP4_ADDR             Dest,\r
-  IN     IP4_ADDR             Netmask,\r
-  IN     IP4_ADDR             Gateway\r
+  IN OUT IP4_ROUTE_TABLE  *RtTable,\r
+  IN     IP4_ADDR         Dest,\r
+  IN     IP4_ADDR         Netmask,\r
+  IN     IP4_ADDR         Gateway\r
   )\r
 {\r
-  LIST_ENTRY                *Head;\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP4_ROUTE_ENTRY           *RtEntry;\r
+  LIST_ENTRY       *Head;\r
+  LIST_ENTRY       *Entry;\r
+  LIST_ENTRY       *Next;\r
+  IP4_ROUTE_ENTRY  *RtEntry;\r
 \r
   Head = &(RtTable->RouteArea[NetGetMaskLength (Netmask)]);\r
 \r
@@ -381,9 +367,9 @@ Ip4DelRoute (
     RtEntry = NET_LIST_USER_STRUCT (Entry, IP4_ROUTE_ENTRY, Link);\r
 \r
     if (IP4_NET_EQUAL (RtEntry->Dest, Dest, Netmask) && (RtEntry->NextHop == Gateway)) {\r
-      Ip4PurgeRouteCache (&RtTable->Cache, (UINTN) RtEntry);\r
+      Ip4PurgeRouteCache (&RtTable->Cache, (UINTN)RtEntry);\r
       RemoveEntryList (Entry);\r
-      Ip4FreeRouteEntry  (RtEntry);\r
+      Ip4FreeRouteEntry (RtEntry);\r
 \r
       RtTable->TotalNum--;\r
       return EFI_SUCCESS;\r
@@ -393,7 +379,6 @@ Ip4DelRoute (
   return EFI_NOT_FOUND;\r
 }\r
 \r
-\r
 /**\r
   Find a route cache with the dst and src. This is used by ICMP\r
   redirect message process. All kinds of redirect is treated as\r
@@ -410,14 +395,14 @@ Ip4DelRoute (
 **/\r
 IP4_ROUTE_CACHE_ENTRY *\r
 Ip4FindRouteCache (\r
-  IN IP4_ROUTE_TABLE        *RtTable,\r
-  IN IP4_ADDR               Dest,\r
-  IN IP4_ADDR               Src\r
+  IN IP4_ROUTE_TABLE  *RtTable,\r
+  IN IP4_ADDR         Dest,\r
+  IN IP4_ADDR         Src\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  IP4_ROUTE_CACHE_ENTRY     *RtCacheEntry;\r
-  UINT32                    Index;\r
+  LIST_ENTRY             *Entry;\r
+  IP4_ROUTE_CACHE_ENTRY  *RtCacheEntry;\r
+  UINT32                 Index;\r
 \r
   Index = IP4_ROUTE_CACHE_HASH (Dest, Src);\r
 \r
@@ -433,7 +418,6 @@ Ip4FindRouteCache (
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Search the route table for a most specific match to the Dst. It searches\r
   from the longest route area (mask length == 32) to the shortest route area\r
@@ -452,14 +436,14 @@ Ip4FindRouteCache (
 **/\r
 IP4_ROUTE_ENTRY *\r
 Ip4FindRouteEntry (\r
-  IN IP4_ROUTE_TABLE        *RtTable,\r
-  IN IP4_ADDR               Dst\r
+  IN IP4_ROUTE_TABLE  *RtTable,\r
+  IN IP4_ADDR         Dst\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  IP4_ROUTE_ENTRY           *RtEntry;\r
-  IP4_ROUTE_TABLE           *Table;\r
-  INTN                      Index;\r
+  LIST_ENTRY       *Entry;\r
+  IP4_ROUTE_ENTRY  *RtEntry;\r
+  IP4_ROUTE_TABLE  *Table;\r
+  INTN             Index;\r
 \r
   RtEntry = NULL;\r
 \r
@@ -476,11 +460,9 @@ Ip4FindRouteEntry (
     }\r
   }\r
 \r
-\r
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Search the route table to route the packet. Return/create a route\r
   cache if there is a route to the destination.\r
@@ -500,26 +482,26 @@ Ip4FindRouteEntry (
 **/\r
 IP4_ROUTE_CACHE_ENTRY *\r
 Ip4Route (\r
-  IN IP4_ROUTE_TABLE        *RtTable,\r
-  IN IP4_ADDR               Dest,\r
-  IN IP4_ADDR               Src,\r
-  IN IP4_ADDR               SubnetMask,\r
-  IN BOOLEAN                AlwaysTryDestAddr\r
+  IN IP4_ROUTE_TABLE  *RtTable,\r
+  IN IP4_ADDR         Dest,\r
+  IN IP4_ADDR         Src,\r
+  IN IP4_ADDR         SubnetMask,\r
+  IN BOOLEAN          AlwaysTryDestAddr\r
   )\r
 {\r
-  LIST_ENTRY                *Head;\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP4_ROUTE_CACHE_ENTRY     *RtCacheEntry;\r
-  IP4_ROUTE_CACHE_ENTRY     *Cache;\r
-  IP4_ROUTE_ENTRY           *RtEntry;\r
-  IP4_ADDR                  NextHop;\r
-  UINT32                    Count;\r
+  LIST_ENTRY             *Head;\r
+  LIST_ENTRY             *Entry;\r
+  LIST_ENTRY             *Next;\r
+  IP4_ROUTE_CACHE_ENTRY  *RtCacheEntry;\r
+  IP4_ROUTE_CACHE_ENTRY  *Cache;\r
+  IP4_ROUTE_ENTRY        *RtEntry;\r
+  IP4_ADDR               NextHop;\r
+  UINT32                 Count;\r
 \r
   ASSERT (RtTable != NULL);\r
 \r
-  Head          = &RtTable->Cache.CacheBucket[IP4_ROUTE_CACHE_HASH (Dest, Src)];\r
-  RtCacheEntry  = Ip4FindRouteCache (RtTable, Dest, Src);\r
+  Head         = &RtTable->Cache.CacheBucket[IP4_ROUTE_CACHE_HASH (Dest, Src)];\r
+  RtCacheEntry = Ip4FindRouteCache (RtTable, Dest, Src);\r
 \r
   //\r
   // If found, promote the cache entry to the head of the hash bucket. LRU\r
@@ -552,7 +534,7 @@ Ip4Route (
   // When using /32 subnet mask, the packet will always be sent to the direct\r
   // destination first, if we can't find a matching route cache.\r
   //\r
-  if (SubnetMask == IP4_ALLONE_ADDRESS || ((RtEntry->Flag & IP4_DIRECT_ROUTE) != 0)) {\r
+  if ((SubnetMask == IP4_ALLONE_ADDRESS) || ((RtEntry->Flag & IP4_DIRECT_ROUTE) != 0)) {\r
     NextHop = Dest;\r
   } else {\r
     NextHop = RtEntry->NextHop;\r
@@ -567,7 +549,7 @@ Ip4Route (
   // For /32 subnet mask, the default route in RtEntry will be used if failed\r
   // to send the packet to driect destination address.\r
   //\r
-  RtCacheEntry = Ip4CreateRouteCacheEntry (Dest, Src, NextHop, (UINTN) RtEntry);\r
+  RtCacheEntry = Ip4CreateRouteCacheEntry (Dest, Src, NextHop, (UINTN)RtEntry);\r
 \r
   if (RtCacheEntry == NULL) {\r
     return NULL;\r
@@ -596,7 +578,6 @@ Ip4Route (
   return RtCacheEntry;\r
 }\r
 \r
-\r
 /**\r
   Build a EFI_IP4_ROUTE_TABLE to be returned to the caller of\r
   GetModeData. The EFI_IP4_ROUTE_TABLE is clumsy to use in the\r
@@ -610,15 +591,15 @@ Ip4Route (
 **/\r
 EFI_STATUS\r
 Ip4BuildEfiRouteTable (\r
-  IN IP4_PROTOCOL           *IpInstance\r
+  IN IP4_PROTOCOL  *IpInstance\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  IP4_ROUTE_TABLE           *RtTable;\r
-  IP4_ROUTE_ENTRY           *RtEntry;\r
-  EFI_IP4_ROUTE_TABLE       *Table;\r
-  UINT32                    Count;\r
-  INT32                     Index;\r
+  LIST_ENTRY           *Entry;\r
+  IP4_ROUTE_TABLE      *RtTable;\r
+  IP4_ROUTE_ENTRY      *RtEntry;\r
+  EFI_IP4_ROUTE_TABLE  *Table;\r
+  UINT32               Count;\r
+  INT32                Index;\r
 \r
   RtTable = IpInstance->RouteTable;\r
 \r
index b4d91667e9597f65afd2b6b8f9c0b06917fa3621..fc4026275b4e231ec73252d63d6031661845ad6e 100644 (file)
@@ -11,10 +11,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Ip4Common.h"\r
 \r
-#define IP4_DIRECT_ROUTE       0x00000001\r
+#define IP4_DIRECT_ROUTE  0x00000001\r
 \r
-#define IP4_ROUTE_CACHE_HASH_VALUE 31\r
-#define IP4_ROUTE_CACHE_MAX        64  // Max NO. of cache entry per hash bucket\r
+#define IP4_ROUTE_CACHE_HASH_VALUE  31\r
+#define IP4_ROUTE_CACHE_MAX         64 // Max NO. of cache entry per hash bucket\r
 \r
 #define IP4_ROUTE_CACHE_HASH(Dst, Src)  (((Dst) ^ (Src)) % IP4_ROUTE_CACHE_HASH_VALUE)\r
 \r
@@ -26,12 +26,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /// enties of the connected network have the flag on.\r
 ///\r
 typedef struct {\r
-  LIST_ENTRY                Link;\r
-  INTN                      RefCnt;\r
-  IP4_ADDR                  Dest;\r
-  IP4_ADDR                  Netmask;\r
-  IP4_ADDR                  NextHop;\r
-  UINT32                    Flag;\r
+  LIST_ENTRY    Link;\r
+  INTN          RefCnt;\r
+  IP4_ADDR      Dest;\r
+  IP4_ADDR      Netmask;\r
+  IP4_ADDR      NextHop;\r
+  UINT32        Flag;\r
 } IP4_ROUTE_ENTRY;\r
 \r
 ///\r
@@ -45,12 +45,12 @@ typedef struct {
 /// to-be-deleted route entry.\r
 ///\r
 typedef struct {\r
-  LIST_ENTRY                Link;\r
-  INTN                      RefCnt;\r
-  IP4_ADDR                  Dest;\r
-  IP4_ADDR                  Src;\r
-  IP4_ADDR                  NextHop;\r
-  UINTN                     Tag;\r
+  LIST_ENTRY    Link;\r
+  INTN          RefCnt;\r
+  IP4_ADDR      Dest;\r
+  IP4_ADDR      Src;\r
+  IP4_ADDR      NextHop;\r
+  UINTN         Tag;\r
 } IP4_ROUTE_CACHE_ENTRY;\r
 \r
 ///\r
@@ -61,7 +61,7 @@ typedef struct {
 /// detach them later.\r
 ///\r
 typedef struct {\r
-  LIST_ENTRY                CacheBucket[IP4_ROUTE_CACHE_HASH_VALUE];\r
+  LIST_ENTRY    CacheBucket[IP4_ROUTE_CACHE_HASH_VALUE];\r
 } IP4_ROUTE_CACHE;\r
 \r
 ///\r
@@ -75,11 +75,11 @@ typedef struct {
 typedef struct _IP4_ROUTE_TABLE IP4_ROUTE_TABLE;\r
 \r
 struct _IP4_ROUTE_TABLE {\r
-  INTN                      RefCnt;\r
-  UINT32                    TotalNum;\r
-  LIST_ENTRY                RouteArea[IP4_MASK_NUM];\r
-  IP4_ROUTE_TABLE           *Next;\r
-  IP4_ROUTE_CACHE           Cache;\r
+  INTN               RefCnt;\r
+  UINT32             TotalNum;\r
+  LIST_ENTRY         RouteArea[IP4_MASK_NUM];\r
+  IP4_ROUTE_TABLE    *Next;\r
+  IP4_ROUTE_CACHE    Cache;\r
 };\r
 \r
 /**\r
@@ -103,7 +103,7 @@ Ip4CreateRouteTable (
 **/\r
 VOID\r
 Ip4FreeRouteTable (\r
-  IN IP4_ROUTE_TABLE        *RtTable\r
+  IN IP4_ROUTE_TABLE  *RtTable\r
   );\r
 \r
 /**\r
@@ -122,10 +122,10 @@ Ip4FreeRouteTable (
 **/\r
 EFI_STATUS\r
 Ip4AddRoute (\r
-  IN OUT IP4_ROUTE_TABLE        *RtTable,\r
-  IN     IP4_ADDR               Dest,\r
-  IN     IP4_ADDR               Netmask,\r
-  IN     IP4_ADDR               Gateway\r
+  IN OUT IP4_ROUTE_TABLE  *RtTable,\r
+  IN     IP4_ADDR         Dest,\r
+  IN     IP4_ADDR         Netmask,\r
+  IN     IP4_ADDR         Gateway\r
   );\r
 \r
 /**\r
@@ -143,10 +143,10 @@ Ip4AddRoute (
 **/\r
 EFI_STATUS\r
 Ip4DelRoute (\r
-  IN OUT IP4_ROUTE_TABLE      *RtTable,\r
-  IN     IP4_ADDR             Dest,\r
-  IN     IP4_ADDR             Netmask,\r
-  IN     IP4_ADDR             Gateway\r
+  IN OUT IP4_ROUTE_TABLE  *RtTable,\r
+  IN     IP4_ADDR         Dest,\r
+  IN     IP4_ADDR         Netmask,\r
+  IN     IP4_ADDR         Gateway\r
   );\r
 \r
 /**\r
@@ -165,9 +165,9 @@ Ip4DelRoute (
 **/\r
 IP4_ROUTE_CACHE_ENTRY *\r
 Ip4FindRouteCache (\r
-  IN IP4_ROUTE_TABLE        *RtTable,\r
-  IN IP4_ADDR               Dest,\r
-  IN IP4_ADDR               Src\r
+  IN IP4_ROUTE_TABLE  *RtTable,\r
+  IN IP4_ADDR         Dest,\r
+  IN IP4_ADDR         Src\r
   );\r
 \r
 /**\r
@@ -200,11 +200,11 @@ Ip4FreeRouteCacheEntry (
 **/\r
 IP4_ROUTE_CACHE_ENTRY *\r
 Ip4Route (\r
-  IN IP4_ROUTE_TABLE        *RtTable,\r
-  IN IP4_ADDR               Dest,\r
-  IN IP4_ADDR               Src,\r
-  IN IP4_ADDR               SubnetMask,\r
-  IN BOOLEAN                AlwaysTryDestAddr\r
+  IN IP4_ROUTE_TABLE  *RtTable,\r
+  IN IP4_ADDR         Dest,\r
+  IN IP4_ADDR         Src,\r
+  IN IP4_ADDR         SubnetMask,\r
+  IN BOOLEAN          AlwaysTryDestAddr\r
   );\r
 \r
 /**\r
@@ -220,6 +220,7 @@ Ip4Route (
 **/\r
 EFI_STATUS\r
 Ip4BuildEfiRouteTable (\r
-  IN IP4_PROTOCOL           *IpInstance\r
+  IN IP4_PROTOCOL  *IpInstance\r
   );\r
+\r
 #endif\r
index e57fe5e605d55650b3345fdacb1eb4442ac4a7cf..b59c6d2a22feec77f2598c2008d0b1c185b5b69b 100644 (file)
@@ -132,17 +132,17 @@ Ip6ComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 Ip6ComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   );\r
 \r
 //\r
 // EFI Component Name Protocol.\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL   gIp6ComponentName = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gIp6ComponentName = {\r
   Ip6ComponentNameGetDriverName,\r
   Ip6ComponentNameGetControllerName,\r
   "eng"\r
@@ -152,12 +152,12 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL   gIp6ComponentName =
 // EFI Component Name 2 Protocol.\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gIp6ComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) Ip6ComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) Ip6ComponentNameGetControllerName,\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)Ip6ComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)Ip6ComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE      mIp6DriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mIp6DriverNameTable[] = {\r
   {\r
     "eng;en",\r
     L"IP6 Network Service Driver"\r
@@ -168,7 +168,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE      mIp6DriverNameTable[
   }\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE      *gIp6ControllerNameTable = NULL;\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  *gIp6ControllerNameTable = NULL;\r
 \r
 /**\r
   Retrieves a Unicode string that is the user-readable name of the driver.\r
@@ -218,13 +218,12 @@ Ip6ComponentNameGetDriverName (
   )\r
 {\r
   return LookupUnicodeString2 (\r
-          Language,\r
-          This->SupportedLanguages,\r
-          mIp6DriverNameTable,\r
-          DriverName,\r
-          (BOOLEAN) (This == &gIp6ComponentName)\r
-          );\r
-\r
+           Language,\r
+           This->SupportedLanguages,\r
+           mIp6DriverNameTable,\r
+           DriverName,\r
+           (BOOLEAN)(This == &gIp6ComponentName)\r
+           );\r
 }\r
 \r
 /**\r
@@ -239,14 +238,14 @@ Ip6ComponentNameGetDriverName (
 **/\r
 EFI_STATUS\r
 UpdateName (\r
-  IN    EFI_IP6_PROTOCOL         *Ip6\r
+  IN    EFI_IP6_PROTOCOL  *Ip6\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  CHAR16                           HandleName[128];\r
-  EFI_IP6_MODE_DATA                Ip6ModeData;\r
-  UINTN                            Offset;\r
-  CHAR16                           Address[sizeof"ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"];\r
+  EFI_STATUS         Status;\r
+  CHAR16             HandleName[128];\r
+  EFI_IP6_MODE_DATA  Ip6ModeData;\r
+  UINTN              Offset;\r
+  CHAR16             Address[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"];\r
 \r
   if (Ip6 == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -284,35 +283,37 @@ UpdateName (
   }\r
 \r
   if (!EFI_ERROR (Status) && Ip6ModeData.IsStarted) {\r
-    Status = NetLibIp6ToStr (&Ip6ModeData.ConfigData.StationAddress, Address, sizeof(Address));\r
+    Status = NetLibIp6ToStr (&Ip6ModeData.ConfigData.StationAddress, Address, sizeof (Address));\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     Offset += UnicodeSPrint (\r
                 HandleName,\r
-                sizeof(HandleName),\r
+                sizeof (HandleName),\r
                 L"IPv6(StationAddress=%s, ",\r
                 Address\r
                 );\r
-    Status = NetLibIp6ToStr (&Ip6ModeData.ConfigData.DestinationAddress, Address, sizeof(Address));\r
+    Status = NetLibIp6ToStr (&Ip6ModeData.ConfigData.DestinationAddress, Address, sizeof (Address));\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     UnicodeSPrint (\r
       HandleName + Offset,\r
-      sizeof(HandleName) - Offset * sizeof (CHAR16),\r
+      sizeof (HandleName) - Offset * sizeof (CHAR16),\r
       L"DestinationAddress=%s)",\r
       Address\r
       );\r
   } else if (!Ip6ModeData.IsStarted) {\r
-    UnicodeSPrint (HandleName, sizeof(HandleName), L"IPv6(Not started)");\r
+    UnicodeSPrint (HandleName, sizeof (HandleName), L"IPv6(Not started)");\r
   } else {\r
-    UnicodeSPrint (HandleName, sizeof(HandleName), L"IPv6(%r)", Status);\r
+    UnicodeSPrint (HandleName, sizeof (HandleName), L"IPv6(%r)", Status);\r
   }\r
 \r
   if (gIp6ControllerNameTable != NULL) {\r
-      FreeUnicodeStringTable (gIp6ControllerNameTable);\r
-      gIp6ControllerNameTable = NULL;\r
+    FreeUnicodeStringTable (gIp6ControllerNameTable);\r
+    gIp6ControllerNameTable = NULL;\r
   }\r
 \r
   Status = AddUnicodeString2 (\r
@@ -406,15 +407,15 @@ UpdateName (
 EFI_STATUS\r
 EFIAPI\r
 Ip6ComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_IP6_PROTOCOL              *Ip6;\r
+  EFI_STATUS        Status;\r
+  EFI_IP6_PROTOCOL  *Ip6;\r
 \r
   //\r
   // Only provide names for child handles.\r
index 840fff0e72e5c25f3173100c43a063a9e413a0f7..6622cf838b840fdd1a990724096e5680f39f7dd0 100644 (file)
@@ -101,16 +101,16 @@ Ip6BuildEfiAddressList (
 **/\r
 EFI_STATUS\r
 Ip6SetToAllNodeMulticast (\r
-  IN  BOOLEAN          Router,\r
-  IN  UINT8            Scope,\r
-  OUT EFI_IPv6_ADDRESS *Ip6Addr\r
+  IN  BOOLEAN           Router,\r
+  IN  UINT8             Scope,\r
+  OUT EFI_IPv6_ADDRESS  *Ip6Addr\r
   )\r
 {\r
   if (Ip6Addr == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (!Router && Scope == IP6_SITE_LOCAL_SCOPE) {\r
+  if (!Router && (Scope == IP6_SITE_LOCAL_SCOPE)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -140,13 +140,13 @@ Ip6SetToAllNodeMulticast (
 **/\r
 UINT8 *\r
 Ip6CreateInterfaceID (\r
-  IN OUT IP6_SERVICE         *IpSb\r
+  IN OUT IP6_SERVICE  *IpSb\r
   )\r
 {\r
-  UINT8                      InterfaceId[8];\r
-  UINT8                      Byte;\r
-  EFI_MAC_ADDRESS            *MacAddr;\r
-  UINT32                     AddrLen;\r
+  UINT8            InterfaceId[8];\r
+  UINT8            Byte;\r
+  EFI_MAC_ADDRESS  *MacAddr;\r
+  UINT32           AddrLen;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
 \r
@@ -155,7 +155,7 @@ Ip6CreateInterfaceID (
   //\r
   // Currently only IEEE 802 48-bit MACs are supported to create link local address.\r
   //\r
-  if (AddrLen != IP6_MAC_LEN || IpSb->InterfaceIdLen != IP6_IF_ID_LEN) {\r
+  if ((AddrLen != IP6_MAC_LEN) || (IpSb->InterfaceIdLen != IP6_IF_ID_LEN)) {\r
     return NULL;\r
   }\r
 \r
@@ -171,7 +171,7 @@ Ip6CreateInterfaceID (
   InterfaceId[4] = 0xFE;\r
   CopyMem (&InterfaceId[5], &MacAddr->Addr[3], 3);\r
 \r
-  Byte = (UINT8) (InterfaceId[0] & IP6_U_BIT);\r
+  Byte = (UINT8)(InterfaceId[0] & IP6_U_BIT);\r
   if (Byte == IP6_U_BIT) {\r
     InterfaceId[0] &= ~IP6_U_BIT;\r
   } else {\r
@@ -198,7 +198,7 @@ Ip6CreateInterfaceID (
 **/\r
 EFI_IPv6_ADDRESS *\r
 Ip6CreateLinkLocalAddr (\r
-  IN OUT IP6_SERVICE           *IpSb\r
+  IN OUT IP6_SERVICE  *IpSb\r
   )\r
 {\r
   EFI_IPv6_ADDRESS             *Ip6Addr;\r
@@ -289,8 +289,8 @@ Ip6CreateLinkLocalAddr (
 **/\r
 VOID\r
 Ip6CreateSNMulticastAddr (\r
-  IN EFI_IPv6_ADDRESS  *Ip6Addr,\r
-  OUT EFI_IPv6_ADDRESS *MulticastAddr\r
+  IN EFI_IPv6_ADDRESS   *Ip6Addr,\r
+  OUT EFI_IPv6_ADDRESS  *MulticastAddr\r
   )\r
 {\r
   ASSERT (Ip6Addr != NULL && MulticastAddr != NULL);\r
@@ -314,8 +314,8 @@ Ip6CreateSNMulticastAddr (
 **/\r
 VOID\r
 Ip6AddAddr (\r
-  IN OUT IP6_INTERFACE *IpIf,\r
-  IN IP6_ADDRESS_INFO  *AddrInfo\r
+  IN OUT IP6_INTERFACE  *IpIf,\r
+  IN IP6_ADDRESS_INFO   *AddrInfo\r
   )\r
 {\r
   InsertHeadList (&IpIf->AddressList, &AddrInfo->Link);\r
@@ -335,17 +335,17 @@ Ip6AddAddr (
 EFI_STATUS\r
 EFIAPI\r
 Ip6DestroyChildEntryByAddr (\r
-  IN LIST_ENTRY         *Entry,\r
-  IN VOID               *Context\r
+  IN LIST_ENTRY  *Entry,\r
+  IN VOID        *Context\r
   )\r
 {\r
   IP6_PROTOCOL                  *Instance;\r
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
   EFI_IPv6_ADDRESS              *Address;\r
 \r
-  Instance = NET_LIST_USER_STRUCT_S (Entry, IP6_PROTOCOL, Link, IP6_PROTOCOL_SIGNATURE);\r
-  ServiceBinding = ((IP6_DESTROY_CHILD_BY_ADDR_CALLBACK_CONTEXT*) Context)->ServiceBinding;\r
-  Address = ((IP6_DESTROY_CHILD_BY_ADDR_CALLBACK_CONTEXT*) Context)->Address;\r
+  Instance       = NET_LIST_USER_STRUCT_S (Entry, IP6_PROTOCOL, Link, IP6_PROTOCOL_SIGNATURE);\r
+  ServiceBinding = ((IP6_DESTROY_CHILD_BY_ADDR_CALLBACK_CONTEXT *)Context)->ServiceBinding;\r
+  Address        = ((IP6_DESTROY_CHILD_BY_ADDR_CALLBACK_CONTEXT *)Context)->Address;\r
 \r
   if ((Instance->State == IP6_STATE_CONFIGED) && EFI_IP6_EQUAL (&Instance->ConfigData.StationAddress, Address)) {\r
     return ServiceBinding->DestroyChild (ServiceBinding, Instance->Handle);\r
@@ -368,14 +368,14 @@ Ip6DestroyInstanceByAddress (
   IN EFI_IPv6_ADDRESS  *Address\r
   )\r
 {\r
-  LIST_ENTRY                    *List;\r
+  LIST_ENTRY                                  *List;\r
   IP6_DESTROY_CHILD_BY_ADDR_CALLBACK_CONTEXT  Context;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
 \r
-  List = &IpSb->Children;\r
+  List                   = &IpSb->Children;\r
   Context.ServiceBinding = &IpSb->ServiceBinding;\r
-  Context.Address = Address;\r
+  Context.Address        = Address;\r
   NetDestroyLinkList (\r
     List,\r
     Ip6DestroyChildEntryByAddr,\r
@@ -416,13 +416,13 @@ Ip6RemoveAddr (
   IN UINT8             PrefixLength\r
   )\r
 {\r
-  EFI_STATUS           Status;\r
-  LIST_ENTRY           *Entry;\r
-  LIST_ENTRY           *Next;\r
-  IP6_ADDRESS_INFO     *AddrInfo;\r
-  EFI_IPv6_ADDRESS     SnMCastAddr;\r
+  EFI_STATUS        Status;\r
+  LIST_ENTRY        *Entry;\r
+  LIST_ENTRY        *Next;\r
+  IP6_ADDRESS_INFO  *AddrInfo;\r
+  EFI_IPv6_ADDRESS  SnMCastAddr;\r
 \r
-  if (IsListEmpty (AddressList) || *AddressCount < 1 || PrefixLength > IP6_PREFIX_MAX) {\r
+  if (IsListEmpty (AddressList) || (*AddressCount < 1) || (PrefixLength > IP6_PREFIX_MAX)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -431,10 +431,11 @@ Ip6RemoveAddr (
   NET_LIST_FOR_EACH_SAFE (Entry, Next, AddressList) {\r
     AddrInfo = NET_LIST_USER_STRUCT_S (Entry, IP6_ADDRESS_INFO, Link, IP6_ADDR_INFO_SIGNATURE);\r
 \r
-    if (Prefix == NULL ||\r
-        (PrefixLength == 128 && EFI_IP6_EQUAL (Prefix, &AddrInfo->Address)) ||\r
-        (PrefixLength == AddrInfo->PrefixLength && NetIp6IsNetEqual (Prefix, &AddrInfo->Address, PrefixLength))\r
-        ) {\r
+    if ((Prefix == NULL) ||\r
+        ((PrefixLength == 128) && EFI_IP6_EQUAL (Prefix, &AddrInfo->Address)) ||\r
+        ((PrefixLength == AddrInfo->PrefixLength) && NetIp6IsNetEqual (Prefix, &AddrInfo->Address, PrefixLength))\r
+        )\r
+    {\r
       if (IpSb != NULL) {\r
         NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
         Ip6CreateSNMulticastAddr (&AddrInfo->Address, &SnMCastAddr);\r
@@ -468,11 +469,11 @@ Ip6RemoveAddr (
 **/\r
 BOOLEAN\r
 Ip6IsSNMulticastAddr (\r
-  IN EFI_IPv6_ADDRESS *Ip6\r
+  IN EFI_IPv6_ADDRESS  *Ip6\r
   )\r
 {\r
-  EFI_IPv6_ADDRESS    Sn;\r
-  BOOLEAN             Flag;\r
+  EFI_IPv6_ADDRESS  Sn;\r
+  BOOLEAN           Flag;\r
 \r
   Ip6CreateSNMulticastAddr (Ip6, &Sn);\r
   Flag = FALSE;\r
@@ -501,16 +502,16 @@ Ip6IsSNMulticastAddr (
 **/\r
 BOOLEAN\r
 Ip6IsOneOfSetAddress (\r
-  IN  IP6_SERVICE           *IpSb,\r
-  IN  EFI_IPv6_ADDRESS      *Address,\r
-  OUT IP6_INTERFACE         **Interface   OPTIONAL,\r
-  OUT IP6_ADDRESS_INFO      **AddressInfo OPTIONAL\r
+  IN  IP6_SERVICE       *IpSb,\r
+  IN  EFI_IPv6_ADDRESS  *Address,\r
+  OUT IP6_INTERFACE     **Interface   OPTIONAL,\r
+  OUT IP6_ADDRESS_INFO  **AddressInfo OPTIONAL\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Entry2;\r
-  IP6_INTERFACE             *IpIf;\r
-  IP6_ADDRESS_INFO          *TmpAddressInfo;\r
+  LIST_ENTRY        *Entry;\r
+  LIST_ENTRY        *Entry2;\r
+  IP6_INTERFACE     *IpIf;\r
+  IP6_ADDRESS_INFO  *TmpAddressInfo;\r
 \r
   //\r
   // Check link-local address first\r
@@ -566,7 +567,7 @@ Ip6IsValidLinkAddress (
   IN  EFI_MAC_ADDRESS  *LinkAddress\r
   )\r
 {\r
-  UINT32               Index;\r
+  UINT32  Index;\r
 \r
   //\r
   // TODO: might be updated later to be more acceptable.\r
@@ -590,29 +591,29 @@ Ip6IsValidLinkAddress (
 **/\r
 VOID\r
 Ip6CopyAddressByPrefix (\r
-  OUT EFI_IPv6_ADDRESS *Dest,\r
-  IN  EFI_IPv6_ADDRESS *Src,\r
-  IN  UINT8            PrefixLength\r
+  OUT EFI_IPv6_ADDRESS  *Dest,\r
+  IN  EFI_IPv6_ADDRESS  *Src,\r
+  IN  UINT8             PrefixLength\r
   )\r
 {\r
-  UINT8 Byte;\r
-  UINT8 Bit;\r
-  UINT8 Mask;\r
+  UINT8  Byte;\r
+  UINT8  Bit;\r
+  UINT8  Mask;\r
 \r
   ASSERT (Dest != NULL && Src != NULL);\r
   ASSERT (PrefixLength <= IP6_PREFIX_MAX);\r
 \r
-  Byte = (UINT8) (PrefixLength / 8);\r
-  Bit  = (UINT8) (PrefixLength % 8);\r
+  Byte = (UINT8)(PrefixLength / 8);\r
+  Bit  = (UINT8)(PrefixLength % 8);\r
 \r
   ZeroMem (Dest, sizeof (EFI_IPv6_ADDRESS));\r
 \r
   CopyMem (Dest, Src, Byte);\r
 \r
   if (Bit > 0) {\r
-    Mask = (UINT8) (0xFF << (8 - Bit));\r
+    Mask = (UINT8)(0xFF << (8 - Bit));\r
     ASSERT (Byte < 16);\r
-    Dest->Addr[Byte] = (UINT8) (Src->Addr[Byte] & Mask);\r
+    Dest->Addr[Byte] = (UINT8)(Src->Addr[Byte] & Mask);\r
   }\r
 }\r
 \r
@@ -632,12 +633,12 @@ Ip6CopyAddressByPrefix (
 **/\r
 EFI_STATUS\r
 Ip6GetMulticastMac (\r
-  IN  EFI_MANAGED_NETWORK_PROTOCOL *Mnp,\r
-  IN  EFI_IPv6_ADDRESS             *Multicast,\r
-  OUT EFI_MAC_ADDRESS              *Mac\r
+  IN  EFI_MANAGED_NETWORK_PROTOCOL  *Mnp,\r
+  IN  EFI_IPv6_ADDRESS              *Multicast,\r
+  OUT EFI_MAC_ADDRESS               *Mac\r
   )\r
 {\r
-  EFI_IP_ADDRESS        EfiIp;\r
+  EFI_IP_ADDRESS  EfiIp;\r
 \r
   IP6_COPY_ADDRESS (&EfiIp.v6, Multicast);\r
 \r
@@ -656,7 +657,7 @@ Ip6GetMulticastMac (
 **/\r
 EFI_IP6_HEADER *\r
 Ip6NtohHead (\r
-  IN OUT EFI_IP6_HEADER *Head\r
+  IN OUT EFI_IP6_HEADER  *Head\r
   )\r
 {\r
   Head->FlowLabelL    = NTOHS (Head->FlowLabelL);\r
@@ -664,4 +665,3 @@ Ip6NtohHead (
 \r
   return Head;\r
 }\r
-\r
index 18723f84e75a68fd69ff126611b9de1d926299ff..cfa9bb5e2afc7c0b686ef32f9f1cdb0e3c1c153a 100644 (file)
 #ifndef __EFI_IP6_COMMON_H__\r
 #define __EFI_IP6_COMMON_H__\r
 \r
-#define IP6_LINK_EQUAL(Mac1, Mac2) (CompareMem ((Mac1), (Mac2), sizeof (EFI_MAC_ADDRESS)) == 0)\r
+#define IP6_LINK_EQUAL(Mac1, Mac2)  (CompareMem ((Mac1), (Mac2), sizeof (EFI_MAC_ADDRESS)) == 0)\r
 \r
 //\r
 // Convert the Microsecond to second. IP transmit/receive time is\r
 // in the unit of microsecond. IP ticks once per second.\r
 //\r
-#define IP6_US_TO_SEC(Us)              (((Us) + 999999) / 1000000)\r
+#define IP6_US_TO_SEC(Us)  (((Us) + 999999) / 1000000)\r
 \r
-#define IP6_ETHER_PROTO                0x86DD\r
+#define IP6_ETHER_PROTO  0x86DD\r
 \r
-#define IP6_MAC_LEN                    6\r
-#define IP6_IF_ID_LEN                  8\r
+#define IP6_MAC_LEN    6\r
+#define IP6_IF_ID_LEN  8\r
 \r
-#define IP6_INTERFACE_LOCAL_SCOPE      1\r
-#define IP6_LINK_LOCAL_SCOPE           2\r
-#define IP6_SITE_LOCAL_SCOPE           5\r
+#define IP6_INTERFACE_LOCAL_SCOPE  1\r
+#define IP6_LINK_LOCAL_SCOPE       2\r
+#define IP6_SITE_LOCAL_SCOPE       5\r
 \r
-#define IP6_INFINIT_LIFETIME           0xFFFFFFFF\r
+#define IP6_INFINIT_LIFETIME  0xFFFFFFFF\r
 \r
-#define IP6_HOP_LIMIT                  255\r
+#define IP6_HOP_LIMIT  255\r
 //\r
 // Make it to 64 since all 54 bits are zero.\r
 //\r
-#define IP6_LINK_LOCAL_PREFIX_LENGTH   64\r
+#define IP6_LINK_LOCAL_PREFIX_LENGTH  64\r
 \r
-#define IP6_TIMER_INTERVAL_IN_MS       100\r
-#define IP6_ONE_SECOND_IN_MS           1000\r
+#define IP6_TIMER_INTERVAL_IN_MS  100\r
+#define IP6_ONE_SECOND_IN_MS      1000\r
 \r
 //\r
 // The packet is received as link level broadcast/multicast/promiscuous.\r
 //\r
-#define IP6_LINK_BROADCAST             0x00000001\r
-#define IP6_LINK_MULTICAST             0x00000002\r
-#define IP6_LINK_PROMISC               0x00000004\r
+#define IP6_LINK_BROADCAST  0x00000001\r
+#define IP6_LINK_MULTICAST  0x00000002\r
+#define IP6_LINK_PROMISC    0x00000004\r
 \r
-#define IP6_U_BIT                      0x02\r
+#define IP6_U_BIT  0x02\r
 \r
 typedef enum {\r
-  Ip6Promiscuous                     = 1,\r
+  Ip6Promiscuous = 1,\r
   Ip6Unicast,\r
   Ip6Multicast,\r
   Ip6AnyCast\r
 } IP6_ADDRESS_TYPE;\r
 \r
 typedef struct {\r
-  EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
-  EFI_IPv6_ADDRESS              *Address;\r
+  EFI_SERVICE_BINDING_PROTOCOL    *ServiceBinding;\r
+  EFI_IPv6_ADDRESS                *Address;\r
 } IP6_DESTROY_CHILD_BY_ADDR_CALLBACK_CONTEXT;\r
 \r
-typedef struct _IP6_INTERFACE    IP6_INTERFACE;\r
-typedef struct _IP6_PROTOCOL     IP6_PROTOCOL;\r
-typedef struct _IP6_SERVICE      IP6_SERVICE;\r
-typedef struct _IP6_ADDRESS_INFO IP6_ADDRESS_INFO;\r
+typedef struct _IP6_INTERFACE     IP6_INTERFACE;\r
+typedef struct _IP6_PROTOCOL      IP6_PROTOCOL;\r
+typedef struct _IP6_SERVICE       IP6_SERVICE;\r
+typedef struct _IP6_ADDRESS_INFO  IP6_ADDRESS_INFO;\r
 \r
 /**\r
   Build a array of EFI_IP6_ADDRESS_INFO to be returned to the caller. The number\r
@@ -105,9 +105,9 @@ Ip6BuildEfiAddressList (
 **/\r
 EFI_STATUS\r
 Ip6SetToAllNodeMulticast (\r
-  IN  BOOLEAN          Router,\r
-  IN  UINT8            Scope,\r
-  OUT EFI_IPv6_ADDRESS *Ip6Addr\r
+  IN  BOOLEAN           Router,\r
+  IN  UINT8             Scope,\r
+  OUT EFI_IPv6_ADDRESS  *Ip6Addr\r
   );\r
 \r
 /**\r
@@ -123,7 +123,7 @@ Ip6SetToAllNodeMulticast (
 **/\r
 UINT8 *\r
 Ip6CreateInterfaceID (\r
-  IN OUT IP6_SERVICE         *IpSb\r
+  IN OUT IP6_SERVICE  *IpSb\r
   );\r
 \r
 /**\r
@@ -140,7 +140,7 @@ Ip6CreateInterfaceID (
 **/\r
 EFI_IPv6_ADDRESS *\r
 Ip6CreateLinkLocalAddr (\r
-  IN OUT IP6_SERVICE         *IpSb\r
+  IN OUT IP6_SERVICE  *IpSb\r
   );\r
 \r
 /**\r
@@ -155,8 +155,8 @@ Ip6CreateLinkLocalAddr (
 **/\r
 VOID\r
 Ip6CreateSNMulticastAddr (\r
-  IN EFI_IPv6_ADDRESS  *Ip6Addr,\r
-  OUT EFI_IPv6_ADDRESS *MulticastAddr\r
+  IN EFI_IPv6_ADDRESS   *Ip6Addr,\r
+  OUT EFI_IPv6_ADDRESS  *MulticastAddr\r
   );\r
 \r
 /**\r
@@ -170,7 +170,7 @@ Ip6CreateSNMulticastAddr (
 **/\r
 BOOLEAN\r
 Ip6IsSNMulticastAddr (\r
-  IN EFI_IPv6_ADDRESS *Ip6\r
+  IN EFI_IPv6_ADDRESS  *Ip6\r
   );\r
 \r
 /**\r
@@ -190,10 +190,10 @@ Ip6IsSNMulticastAddr (
 **/\r
 BOOLEAN\r
 Ip6IsOneOfSetAddress (\r
-  IN  IP6_SERVICE           *IpSb,\r
-  IN  EFI_IPv6_ADDRESS      *Address,\r
-  OUT IP6_INTERFACE         **Interface   OPTIONAL,\r
-  OUT IP6_ADDRESS_INFO      **AddressInfo OPTIONAL\r
+  IN  IP6_SERVICE       *IpSb,\r
+  IN  EFI_IPv6_ADDRESS  *Address,\r
+  OUT IP6_INTERFACE     **Interface   OPTIONAL,\r
+  OUT IP6_ADDRESS_INFO  **AddressInfo OPTIONAL\r
   );\r
 \r
 /**\r
@@ -212,7 +212,6 @@ Ip6IsValidLinkAddress (
   IN  EFI_MAC_ADDRESS  *LinkAddress\r
   );\r
 \r
-\r
 /**\r
   Copy the PrefixLength bits from Src to Dest.\r
 \r
@@ -223,9 +222,9 @@ Ip6IsValidLinkAddress (
 **/\r
 VOID\r
 Ip6CopyAddressByPrefix (\r
-  OUT EFI_IPv6_ADDRESS *Dest,\r
-  IN  EFI_IPv6_ADDRESS *Src,\r
-  IN  UINT8            PrefixLength\r
+  OUT EFI_IPv6_ADDRESS  *Dest,\r
+  IN  EFI_IPv6_ADDRESS  *Src,\r
+  IN  UINT8             PrefixLength\r
   );\r
 \r
 /**\r
@@ -237,8 +236,8 @@ Ip6CopyAddressByPrefix (
 **/\r
 VOID\r
 Ip6AddAddr (\r
-  IN OUT IP6_INTERFACE *IpIf,\r
-  IN IP6_ADDRESS_INFO  *AddrInfo\r
+  IN OUT IP6_INTERFACE  *IpIf,\r
+  IN IP6_ADDRESS_INFO   *AddrInfo\r
   );\r
 \r
 /**\r
@@ -289,9 +288,9 @@ Ip6RemoveAddr (
 **/\r
 EFI_STATUS\r
 Ip6GetMulticastMac (\r
-  IN  EFI_MANAGED_NETWORK_PROTOCOL *Mnp,\r
-  IN  EFI_IPv6_ADDRESS             *Multicast,\r
-  OUT EFI_MAC_ADDRESS              *Mac\r
+  IN  EFI_MANAGED_NETWORK_PROTOCOL  *Mnp,\r
+  IN  EFI_IPv6_ADDRESS              *Multicast,\r
+  OUT EFI_MAC_ADDRESS               *Mac\r
   );\r
 \r
 /**\r
@@ -306,7 +305,7 @@ Ip6GetMulticastMac (
 **/\r
 EFI_IP6_HEADER *\r
 Ip6NtohHead (\r
-  IN OUT EFI_IP6_HEADER *Head\r
+  IN OUT EFI_IP6_HEADER  *Head\r
   );\r
 \r
 #endif\r
index ab3801336912fde819f8a5883054314666a61cce..70e232ce6c4d232a26ab4aa818286f2a8c521ee8 100644 (file)
@@ -10,7 +10,7 @@
 \r
 #include "Ip6Impl.h"\r
 \r
-LIST_ENTRY  mIp6ConfigInstanceList = {&mIp6ConfigInstanceList, &mIp6ConfigInstanceList};\r
+LIST_ENTRY  mIp6ConfigInstanceList = { &mIp6ConfigInstanceList, &mIp6ConfigInstanceList };\r
 \r
 /**\r
   The event process routine when the DHCPv6 service binding protocol is installed\r
@@ -42,15 +42,15 @@ Ip6ConfigOnPolicyChanged (
   IN EFI_IP6_CONFIG_POLICY  NewPolicy\r
   )\r
 {\r
-  LIST_ENTRY          *Entry;\r
-  LIST_ENTRY          *Entry2;\r
-  LIST_ENTRY          *Next;\r
-  IP6_INTERFACE       *IpIf;\r
-  IP6_DAD_ENTRY       *DadEntry;\r
-  IP6_DELAY_JOIN_LIST *DelayNode;\r
-  IP6_ADDRESS_INFO    *AddrInfo;\r
-  IP6_PROTOCOL        *Instance;\r
-  BOOLEAN             Recovery;\r
+  LIST_ENTRY           *Entry;\r
+  LIST_ENTRY           *Entry2;\r
+  LIST_ENTRY           *Next;\r
+  IP6_INTERFACE        *IpIf;\r
+  IP6_DAD_ENTRY        *DadEntry;\r
+  IP6_DELAY_JOIN_LIST  *DelayNode;\r
+  IP6_ADDRESS_INFO     *AddrInfo;\r
+  IP6_PROTOCOL         *Instance;\r
+  BOOLEAN              Recovery;\r
 \r
   Recovery = FALSE;\r
 \r
@@ -73,14 +73,14 @@ Ip6ConfigOnPolicyChanged (
     Ip6CreatePrefixListEntry (\r
       IpSb,\r
       TRUE,\r
-      (UINT32) IP6_INFINIT_LIFETIME,\r
-      (UINT32) IP6_INFINIT_LIFETIME,\r
+      (UINT32)IP6_INFINIT_LIFETIME,\r
+      (UINT32)IP6_INFINIT_LIFETIME,\r
       IP6_LINK_LOCAL_PREFIX_LENGTH,\r
       &IpSb->LinkLocalAddr\r
       );\r
   }\r
 \r
-  if (!IsListEmpty (&IpSb->DefaultInterface->AddressList) && IpSb->DefaultInterface->AddressCount > 0) {\r
+  if (!IsListEmpty (&IpSb->DefaultInterface->AddressList) && (IpSb->DefaultInterface->AddressCount > 0)) {\r
     //\r
     // If any IPv6 children (Instance) in configured state and use global unicast address, it will be\r
     // destroyed in Ip6RemoveAddr() function later. Then, the upper layer driver's Stop() function will be\r
@@ -114,7 +114,7 @@ Ip6ConfigOnPolicyChanged (
       0\r
       );\r
 \r
-    if (IpSb->Controller != NULL && Recovery) {\r
+    if ((IpSb->Controller != NULL) && Recovery) {\r
       //\r
       // ConnectController() to recover the upper layer network stacks.\r
       //\r
@@ -122,7 +122,6 @@ Ip6ConfigOnPolicyChanged (
     }\r
   }\r
 \r
-\r
   NET_LIST_FOR_EACH (Entry, &IpSb->Interfaces) {\r
     //\r
     // remove all pending delay node and DAD entries for the global addresses.\r
@@ -158,7 +157,7 @@ Ip6ConfigOnPolicyChanged (
     //\r
     // delay 1 second\r
     //\r
-    IpSb->Ticks                   = (UINT32) IP6_GET_TICKS (IP6_ONE_SECOND_IN_MS);\r
+    IpSb->Ticks = (UINT32)IP6_GET_TICKS (IP6_ONE_SECOND_IN_MS);\r
   }\r
 }\r
 \r
@@ -216,7 +215,7 @@ Ip6ConfigStartStatefulAutoConfig (
                                        &gEfiDhcp6ServiceBindingProtocolGuid,\r
                                        TPL_CALLBACK,\r
                                        Ip6ConfigOnDhcp6SbInstalled,\r
-                                       (VOID *) Instance,\r
+                                       (VOID *)Instance,\r
                                        &Instance->Registration\r
                                        );\r
     }\r
@@ -233,7 +232,7 @@ Ip6ConfigStartStatefulAutoConfig (
   Status = gBS->OpenProtocol (\r
                   Instance->Dhcp6Handle,\r
                   &gEfiDhcp6ProtocolGuid,\r
-                  (VOID **) &Instance->Dhcp6,\r
+                  (VOID **)&Instance->Dhcp6,\r
                   IpSb->Image,\r
                   IpSb->Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -247,13 +246,13 @@ Ip6ConfigStartStatefulAutoConfig (
   // Set the exta options to send. Here we only want the option request option\r
   // with DNS SERVERS.\r
   //\r
-  Oro                         = (EFI_DHCP6_PACKET_OPTION *) OptBuf;\r
-  Oro->OpCode                 = HTONS (DHCP6_OPT_ORO);\r
-  Oro->OpLen                  = HTONS (2);\r
-  *((UINT16 *) &Oro->Data[0]) = HTONS (DHCP6_OPT_DNS_SERVERS);\r
-  OptList[0]                  = Oro;\r
+  Oro                        = (EFI_DHCP6_PACKET_OPTION *)OptBuf;\r
+  Oro->OpCode                = HTONS (DHCP6_OPT_ORO);\r
+  Oro->OpLen                 = HTONS (2);\r
+  *((UINT16 *)&Oro->Data[0]) = HTONS (DHCP6_OPT_DNS_SERVERS);\r
+  OptList[0]                 = Oro;\r
 \r
-  Status                      = EFI_SUCCESS;\r
+  Status = EFI_SUCCESS;\r
 \r
   if (!OtherInfoOnly) {\r
     //\r
@@ -273,13 +272,11 @@ Ip6ConfigStartStatefulAutoConfig (
     Status = Dhcp6->Configure (Dhcp6, &Dhcp6CfgData);\r
 \r
     if (!EFI_ERROR (Status)) {\r
-\r
       if (IpSb->LinkLocalOk) {\r
         Status = Dhcp6->Start (Dhcp6);\r
       } else {\r
         IpSb->Dhcp6NeedStart = TRUE;\r
       }\r
-\r
     }\r
   } else {\r
     //\r
@@ -306,7 +303,6 @@ Ip6ConfigStartStatefulAutoConfig (
     } else {\r
       IpSb->Dhcp6NeedInfoRequest = TRUE;\r
     }\r
-\r
   }\r
 \r
   return Status;\r
@@ -323,12 +319,12 @@ Ip6ConfigStartStatefulAutoConfig (
 EFI_STATUS\r
 EFIAPI\r
 Ip6ConfigSignalEvent (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Arg\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Arg\r
   )\r
 {\r
-  gBS->SignalEvent ((EFI_EVENT) Item->Key);\r
+  gBS->SignalEvent ((EFI_EVENT)Item->Key);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -389,7 +385,7 @@ Ip6ConfigReadConfigData (
                     &VarSize,\r
                     Variable\r
                     );\r
-    if (EFI_ERROR (Status) || (UINT16) (~NetblockChecksum ((UINT8 *) Variable, (UINT32) VarSize)) != 0) {\r
+    if (EFI_ERROR (Status) || ((UINT16)(~NetblockChecksum ((UINT8 *)Variable, (UINT32)VarSize)) != 0)) {\r
       //\r
       // GetVariable error or the variable is corrupted.\r
       //\r
@@ -402,13 +398,13 @@ Ip6ConfigReadConfigData (
     Instance->IaId = Variable->IaId;\r
 \r
     for (Index = 0; Index < Variable->DataRecordCount; Index++) {\r
-\r
       CopyMem (&DataRecord, &Variable->DataRecord[Index], sizeof (DataRecord));\r
 \r
       DataItem = &Instance->DataItem[DataRecord.DataType];\r
       if (DATA_ATTRIB_SET (DataItem->Attribute, DATA_ATTRIB_SIZE_FIXED) &&\r
           (DataItem->DataSize != DataRecord.DataSize)\r
-          ) {\r
+          )\r
+      {\r
         //\r
         // Perhaps a corrupted data record...\r
         //\r
@@ -433,7 +429,7 @@ Ip6ConfigReadConfigData (
         }\r
       }\r
 \r
-      Data = (CHAR8 *) Variable + DataRecord.Offset;\r
+      Data = (CHAR8 *)Variable + DataRecord.Offset;\r
       CopyMem (DataItem->Data.Ptr, Data, DataRecord.DataSize);\r
 \r
       DataItem->DataSize = DataRecord.DataSize;\r
@@ -496,10 +492,8 @@ Ip6ConfigWriteConfigData (
   VarSize = sizeof (IP6_CONFIG_VARIABLE) - sizeof (IP6_CONFIG_DATA_RECORD);\r
 \r
   for (Index = 0; Index < Ip6ConfigDataTypeMaximum; Index++) {\r
-\r
     DataItem = &Instance->DataItem[Index];\r
     if (!DATA_ATTRIB_SET (DataItem->Attribute, DATA_ATTRIB_VOLATILE) && !EFI_ERROR (DataItem->Status)) {\r
-\r
       VarSize += sizeof (IP6_CONFIG_DATA_RECORD) + DataItem->DataSize;\r
     }\r
   }\r
@@ -510,28 +504,26 @@ Ip6ConfigWriteConfigData (
   }\r
 \r
   Variable->IaId            = Instance->IaId;\r
-  Heap                      = (CHAR8 *) Variable + VarSize;\r
+  Heap                      = (CHAR8 *)Variable + VarSize;\r
   Variable->DataRecordCount = 0;\r
 \r
   for (Index = 0; Index < Ip6ConfigDataTypeMaximum; Index++) {\r
-\r
     DataItem = &Instance->DataItem[Index];\r
     if (!DATA_ATTRIB_SET (DataItem->Attribute, DATA_ATTRIB_VOLATILE) && !EFI_ERROR (DataItem->Status)) {\r
-\r
       Heap -= DataItem->DataSize;\r
       CopyMem (Heap, DataItem->Data.Ptr, DataItem->DataSize);\r
 \r
       DataRecord           = &Variable->DataRecord[Variable->DataRecordCount];\r
-      DataRecord->DataType = (EFI_IP6_CONFIG_DATA_TYPE) Index;\r
-      DataRecord->DataSize = (UINT32) DataItem->DataSize;\r
-      DataRecord->Offset   = (UINT16) (Heap - (CHAR8 *) Variable);\r
+      DataRecord->DataType = (EFI_IP6_CONFIG_DATA_TYPE)Index;\r
+      DataRecord->DataSize = (UINT32)DataItem->DataSize;\r
+      DataRecord->Offset   = (UINT16)(Heap - (CHAR8 *)Variable);\r
 \r
       Variable->DataRecordCount++;\r
     }\r
   }\r
 \r
   Variable->Checksum = 0;\r
-  Variable->Checksum = (UINT16) ~NetblockChecksum ((UINT8 *) Variable, (UINT32) VarSize);\r
+  Variable->Checksum = (UINT16) ~NetblockChecksum ((UINT8 *)Variable, (UINT32)VarSize);\r
 \r
   Status = gRT->SetVariable (\r
                   VarName,\r
@@ -597,20 +589,20 @@ Ip6ConfigGetIfInfo (
   //\r
   // Copy the fixed size part of the interface info.\r
   //\r
-  Item = &Instance->DataItem[Ip6ConfigDataTypeInterfaceInfo];\r
-  IfInfo = (EFI_IP6_CONFIG_INTERFACE_INFO *) Data;\r
+  Item   = &Instance->DataItem[Ip6ConfigDataTypeInterfaceInfo];\r
+  IfInfo = (EFI_IP6_CONFIG_INTERFACE_INFO *)Data;\r
   CopyMem (IfInfo, Item->Data.Ptr, sizeof (EFI_IP6_CONFIG_INTERFACE_INFO));\r
 \r
   //\r
   // AddressInfo\r
   //\r
-  IfInfo->AddressInfo = (EFI_IP6_ADDRESS_INFO *) (IfInfo + 1);\r
+  IfInfo->AddressInfo = (EFI_IP6_ADDRESS_INFO *)(IfInfo + 1);\r
   Ip6BuildEfiAddressList (IpSb, &IfInfo->AddressInfoCount, &IfInfo->AddressInfo);\r
 \r
   //\r
   // RouteTable\r
   //\r
-  IfInfo->RouteTable = (EFI_IP6_ROUTE_TABLE *) (IfInfo->AddressInfo + IfInfo->AddressInfoCount);\r
+  IfInfo->RouteTable = (EFI_IP6_ROUTE_TABLE *)(IfInfo->AddressInfo + IfInfo->AddressInfoCount);\r
   Ip6BuildEfiRouteTable (IpSb->RouteTable, &IfInfo->RouteCount, &IfInfo->RouteTable);\r
 \r
   if (IfInfo->AddressInfoCount == 0) {\r
@@ -657,7 +649,7 @@ Ip6ConfigSetAltIfId (
 \r
   DataItem = &Instance->DataItem[Ip6ConfigDataTypeAltInterfaceId];\r
   OldIfId  = DataItem->Data.AltIfId;\r
-  NewIfId  = (EFI_IP6_CONFIG_INTERFACE_ID *) Data;\r
+  NewIfId  = (EFI_IP6_CONFIG_INTERFACE_ID *)Data;\r
 \r
   CopyMem (OldIfId, NewIfId, DataSize);\r
   DataItem->Status = EFI_SUCCESS;\r
@@ -696,33 +688,34 @@ Ip6ConfigSetPolicy (
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
-  NewPolicy = *((EFI_IP6_CONFIG_POLICY *) Data);\r
+  NewPolicy = *((EFI_IP6_CONFIG_POLICY *)Data);\r
 \r
   if (NewPolicy > Ip6ConfigPolicyAutomatic) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   if (NewPolicy == Instance->Policy) {\r
-\r
     return EFI_ABORTED;\r
   } else {\r
     //\r
     // Clean the ManualAddress, Gateway and DnsServers, shrink the variable\r
     // data size, and fire up all the related events.\r
     //\r
-    DataItem           = &Instance->DataItem[Ip6ConfigDataTypeManualAddress];\r
+    DataItem = &Instance->DataItem[Ip6ConfigDataTypeManualAddress];\r
     if (DataItem->Data.Ptr != NULL) {\r
       FreePool (DataItem->Data.Ptr);\r
     }\r
+\r
     DataItem->Data.Ptr = NULL;\r
     DataItem->DataSize = 0;\r
     DataItem->Status   = EFI_NOT_FOUND;\r
     NetMapIterate (&DataItem->EventMap, Ip6ConfigSignalEvent, NULL);\r
 \r
-    DataItem           = &Instance->DataItem[Ip6ConfigDataTypeGateway];\r
+    DataItem = &Instance->DataItem[Ip6ConfigDataTypeGateway];\r
     if (DataItem->Data.Ptr != NULL) {\r
       FreePool (DataItem->Data.Ptr);\r
     }\r
+\r
     DataItem->Data.Ptr = NULL;\r
     DataItem->DataSize = 0;\r
     DataItem->Status   = EFI_NOT_FOUND;\r
@@ -784,12 +777,10 @@ Ip6ConfigSetDadXmits (
 \r
   OldDadXmits = Instance->DataItem[Ip6ConfigDataTypeDupAddrDetectTransmits].Data.DadXmits;\r
 \r
-  if ((*(UINT32 *) Data) == OldDadXmits->DupAddrDetectTransmits) {\r
-\r
+  if ((*(UINT32 *)Data) == OldDadXmits->DupAddrDetectTransmits) {\r
     return EFI_ABORTED;\r
   } else {\r
-\r
-    OldDadXmits->DupAddrDetectTransmits = *((UINT32 *) Data);\r
+    OldDadXmits->DupAddrDetectTransmits = *((UINT32 *)Data);\r
     return EFI_SUCCESS;\r
   }\r
 }\r
@@ -820,7 +811,7 @@ Ip6ManualAddrDadCallback (
   UINTN                          DadFailCount;\r
   IP6_SERVICE                    *IpSb;\r
 \r
-  Instance   = (IP6_CONFIG_INSTANCE *) Context;\r
+  Instance = (IP6_CONFIG_INSTANCE *)Context;\r
   NET_CHECK_SIGNATURE (Instance, IP6_CONFIG_INSTANCE_SIGNATURE);\r
   Item       = &Instance->DataItem[Ip6ConfigDataTypeManualAddress];\r
   ManualAddr = NULL;\r
@@ -872,20 +863,20 @@ Ip6ManualAddrDadCallback (
         // Part of addresses are detected to be duplicates, so update the\r
         // data with those passed.\r
         //\r
-        PassedAddr = (EFI_IP6_CONFIG_MANUAL_ADDRESS *) AllocatePool (Item->DataSize);\r
+        PassedAddr = (EFI_IP6_CONFIG_MANUAL_ADDRESS *)AllocatePool (Item->DataSize);\r
         ASSERT (PassedAddr != NULL);\r
 \r
         Item->Data.Ptr = PassedAddr;\r
         Item->Status   = EFI_SUCCESS;\r
 \r
         while (!NetMapIsEmpty (&Instance->DadPassedMap)) {\r
-          ManualAddr = (EFI_IP6_CONFIG_MANUAL_ADDRESS *) NetMapRemoveHead (&Instance->DadPassedMap, NULL);\r
+          ManualAddr = (EFI_IP6_CONFIG_MANUAL_ADDRESS *)NetMapRemoveHead (&Instance->DadPassedMap, NULL);\r
           CopyMem (PassedAddr, ManualAddr, sizeof (EFI_IP6_CONFIG_MANUAL_ADDRESS));\r
 \r
           PassedAddr++;\r
         }\r
 \r
-        ASSERT ((UINTN) PassedAddr - (UINTN) Item->Data.Ptr == Item->DataSize);\r
+        ASSERT ((UINTN)PassedAddr - (UINTN)Item->Data.Ptr == Item->DataSize);\r
       }\r
     } else {\r
       //\r
@@ -991,16 +982,16 @@ Ip6ConfigSetManualAddress (
 \r
   DataItem = &Instance->DataItem[Ip6ConfigDataTypeManualAddress];\r
 \r
-  if (Data != NULL && DataSize != 0) {\r
+  if ((Data != NULL) && (DataSize != 0)) {\r
     NewAddressCount = DataSize / sizeof (EFI_IP6_CONFIG_MANUAL_ADDRESS);\r
-    NewAddress      = (EFI_IP6_CONFIG_MANUAL_ADDRESS *) Data;\r
+    NewAddress      = (EFI_IP6_CONFIG_MANUAL_ADDRESS *)Data;\r
 \r
     for (Index1 = 0; Index1 < NewAddressCount; Index1++, NewAddress++) {\r
-\r
       if (NetIp6IsLinkLocalAddr (&NewAddress->Address)    ||\r
           !NetIp6IsValidUnicast (&NewAddress->Address)    ||\r
           (NewAddress->PrefixLength > 128)\r
-          ) {\r
+          )\r
+      {\r
         //\r
         // make sure the IPv6 address is unicast and not link-local address &&\r
         // the prefix length is valid.\r
@@ -1014,7 +1005,6 @@ Ip6ConfigSetManualAddress (
         // Any two addresses in the array can't be equal.\r
         //\r
         if (EFI_IP6_EQUAL (&TmpAddress->Address, &NewAddress->Address)) {\r
-\r
           return EFI_INVALID_PARAMETER;\r
         }\r
       }\r
@@ -1032,7 +1022,7 @@ Ip6ConfigSetManualAddress (
       NET_LIST_FOR_EACH (Entry2, &IpIf->AddressList) {\r
         CurrentAddrInfo = NET_LIST_USER_STRUCT_S (Entry2, IP6_ADDRESS_INFO, Link, IP6_ADDR_INFO_SIGNATURE);\r
 \r
-        Copy            = AllocateCopyPool (sizeof (IP6_ADDRESS_INFO), CurrentAddrInfo);\r
+        Copy = AllocateCopyPool (sizeof (IP6_ADDRESS_INFO), CurrentAddrInfo);\r
         if (Copy == NULL) {\r
           break;\r
         }\r
@@ -1059,6 +1049,7 @@ Ip6ConfigSetManualAddress (
     if (DataItem->Data.Ptr != NULL) {\r
       FreePool (DataItem->Data.Ptr);\r
     }\r
+\r
     DataItem->Data.Ptr = NewAddress;\r
     DataItem->DataSize = DataSize;\r
     DataItem->Status   = EFI_NOT_READY;\r
@@ -1066,7 +1057,7 @@ Ip6ConfigSetManualAddress (
     //\r
     // Trigger DAD, it's an asynchronous process.\r
     //\r
-    IsUpdated  = FALSE;\r
+    IsUpdated = FALSE;\r
 \r
     for (Index1 = 0; Index1 < NewAddressCount; Index1++, NewAddress++) {\r
       if (Ip6IsOneOfSetAddress (IpSb, &NewAddress->Address, NULL, &CurrentAddrInfo)) {\r
@@ -1113,7 +1104,7 @@ Ip6ConfigSetManualAddress (
           // Save the prefix length.\r
           //\r
           CurrentAddrInfo->PrefixLength = NewAddress->PrefixLength;\r
-          IsUpdated = TRUE;\r
+          IsUpdated                     = TRUE;\r
         }\r
 \r
         //\r
@@ -1129,8 +1120,8 @@ Ip6ConfigSetManualAddress (
           Ip6CreatePrefixListEntry (\r
             IpSb,\r
             TRUE,\r
-            (UINT32) IP6_INFINIT_LIFETIME,\r
-            (UINT32) IP6_INFINIT_LIFETIME,\r
+            (UINT32)IP6_INFINIT_LIFETIME,\r
+            (UINT32)IP6_INFINIT_LIFETIME,\r
             NewAddress->PrefixLength,\r
             &NewAddress->Address\r
             );\r
@@ -1156,8 +1147,8 @@ Ip6ConfigSetManualAddress (
           &NewAddress->Address,\r
           NewAddress->IsAnycast,\r
           NewAddress->PrefixLength,\r
-          (UINT32) IP6_INFINIT_LIFETIME,\r
-          (UINT32) IP6_INFINIT_LIFETIME,\r
+          (UINT32)IP6_INFINIT_LIFETIME,\r
+          (UINT32)IP6_INFINIT_LIFETIME,\r
           Ip6ManualAddrDadCallback,\r
           Instance\r
           );\r
@@ -1230,6 +1221,7 @@ Ip6ConfigSetManualAddress (
     if (DataItem->Data.Ptr != NULL) {\r
       FreePool (DataItem->Data.Ptr);\r
     }\r
+\r
     DataItem->Data.Ptr = NULL;\r
     DataItem->DataSize = 0;\r
     DataItem->Status   = EFI_NOT_FOUND;\r
@@ -1243,8 +1235,8 @@ Ip6ConfigSetManualAddress (
       Ip6CreatePrefixListEntry (\r
         IpSb,\r
         TRUE,\r
-        (UINT32) IP6_INFINIT_LIFETIME,\r
-        (UINT32) IP6_INFINIT_LIFETIME,\r
+        (UINT32)IP6_INFINIT_LIFETIME,\r
+        (UINT32)IP6_INFINIT_LIFETIME,\r
         IP6_LINK_LOCAL_PREFIX_LENGTH,\r
         &IpSb->LinkLocalAddr\r
         );\r
@@ -1330,13 +1322,13 @@ Ip6ConfigSetGateway (
   IP6_DEFAULT_ROUTER    *DefaultRouter;\r
   VOID                  *Tmp;\r
 \r
-  OldGateway      = NULL;\r
-  NewGateway      = NULL;\r
-  Item            = NULL;\r
-  DefaultRouter   = NULL;\r
-  Tmp             = NULL;\r
-  OneRemoved      = FALSE;\r
-  OneAdded        = FALSE;\r
+  OldGateway    = NULL;\r
+  NewGateway    = NULL;\r
+  Item          = NULL;\r
+  DefaultRouter = NULL;\r
+  Tmp           = NULL;\r
+  OneRemoved    = FALSE;\r
+  OneAdded      = FALSE;\r
 \r
   if ((DataSize != 0) && (DataSize % sizeof (EFI_IPv6_ADDRESS) != 0)) {\r
     return EFI_BAD_BUFFER_SIZE;\r
@@ -1362,13 +1354,11 @@ Ip6ConfigSetGateway (
     }\r
   }\r
 \r
-  if (Data != NULL && DataSize != 0) {\r
-    NewGateway      = (EFI_IPv6_ADDRESS *) Data;\r
+  if ((Data != NULL) && (DataSize != 0)) {\r
+    NewGateway      = (EFI_IPv6_ADDRESS *)Data;\r
     NewGatewayCount = DataSize / sizeof (EFI_IPv6_ADDRESS);\r
     for (Index1 = 0; Index1 < NewGatewayCount; Index1++) {\r
-\r
       if (!NetIp6IsValidUnicast (NewGateway + Index1)) {\r
-\r
         return EFI_INVALID_PARAMETER;\r
       }\r
 \r
@@ -1389,7 +1379,6 @@ Ip6ConfigSetGateway (
     }\r
 \r
     for (Index1 = 0; Index1 < NewGatewayCount; Index1++) {\r
-\r
       DefaultRouter = Ip6FindDefaultRouter (IpSb, NewGateway + Index1);\r
       if (DefaultRouter == NULL) {\r
         Ip6CreateDefaultRouter (IpSb, NewGateway + Index1, IP6_INF_ROUTER_LIFETIME);\r
@@ -1401,11 +1390,11 @@ Ip6ConfigSetGateway (
       Item->Status = EFI_SUCCESS;\r
       return EFI_ABORTED;\r
     } else {\r
-\r
       if (Tmp != NULL) {\r
         if (Item->Data.Ptr != NULL) {\r
           FreePool (Item->Data.Ptr);\r
         }\r
+\r
         Item->Data.Ptr = Tmp;\r
       }\r
 \r
@@ -1421,6 +1410,7 @@ Ip6ConfigSetGateway (
     if (Item->Data.Ptr != NULL) {\r
       FreePool (Item->Data.Ptr);\r
     }\r
+\r
     Item->Data.Ptr = NULL;\r
     Item->DataSize = 0;\r
     Item->Status   = EFI_NOT_FOUND;\r
@@ -1483,8 +1473,8 @@ Ip6ConfigSetDnsServer (
 \r
   Item = &Instance->DataItem[Ip6ConfigDataTypeDnsServer];\r
 \r
-  if (Data != NULL && DataSize != 0) {\r
-    NewDns      = (EFI_IPv6_ADDRESS *) Data;\r
+  if ((Data != NULL) && (DataSize != 0)) {\r
+    NewDns      = (EFI_IPv6_ADDRESS *)Data;\r
     OldDns      = Item->Data.DnsServers;\r
     NewDnsCount = DataSize / sizeof (EFI_IPv6_ADDRESS);\r
     OldDnsCount = Item->DataSize / sizeof (EFI_IPv6_ADDRESS);\r
@@ -1500,7 +1490,6 @@ Ip6ConfigSetDnsServer (
     }\r
 \r
     for (NewIndex = 0; NewIndex < NewDnsCount; NewIndex++) {\r
-\r
       if (!NetIp6IsValidUnicast (NewDns + NewIndex)) {\r
         //\r
         // The dns server address must be unicast.\r
@@ -1508,6 +1497,7 @@ Ip6ConfigSetDnsServer (
         if (Tmp != NULL) {\r
           FreePool (Tmp);\r
         }\r
+\r
         return EFI_INVALID_PARAMETER;\r
       }\r
 \r
@@ -1544,6 +1534,7 @@ Ip6ConfigSetDnsServer (
         if (Item->Data.Ptr != NULL) {\r
           FreePool (Item->Data.Ptr);\r
         }\r
+\r
         Item->Data.Ptr = Tmp;\r
       }\r
 \r
@@ -1551,13 +1542,14 @@ Ip6ConfigSetDnsServer (
       Item->DataSize = DataSize;\r
       Item->Status   = EFI_SUCCESS;\r
     }\r
-  } else  {\r
+  } else {\r
     //\r
     // DataSize is 0 and Data is NULL, clean up the DnsServer address.\r
     //\r
     if (Item->Data.Ptr != NULL) {\r
       FreePool (Item->Data.Ptr);\r
     }\r
+\r
     Item->Data.Ptr = NULL;\r
     Item->DataSize = 0;\r
     Item->Status   = EFI_NOT_FOUND;\r
@@ -1585,7 +1577,7 @@ Ip6ConfigInitIfInfo (
     sizeof (IfInfo->Name),\r
     L"eth%d",\r
     IpSb->Ip6ConfigInstance.IfIndex\r
-  );\r
+    );\r
 \r
   IfInfo->IfType        = IpSb->SnpMode.IfType;\r
   IfInfo->HwAddressSize = IpSb->SnpMode.HwAddressSize;\r
@@ -1607,9 +1599,9 @@ Ip6ConfigInitIfInfo (
 **/\r
 EFI_STATUS\r
 Ip6ConfigParseDhcpReply (\r
-  IN     EFI_DHCP6_PROTOCOL  *Dhcp6,\r
-  IN OUT IP6_CONFIG_INSTANCE *Instance,\r
-  IN     EFI_DHCP6_PACKET    *Reply\r
+  IN     EFI_DHCP6_PROTOCOL   *Dhcp6,\r
+  IN OUT IP6_CONFIG_INSTANCE  *Instance,\r
+  IN     EFI_DHCP6_PACKET     *Reply\r
   )\r
 {\r
   EFI_STATUS               Status;\r
@@ -1669,7 +1661,7 @@ Ip6ConfigParseDhcpReply (
       //\r
       // Validate the DnsServers: whether they are unicast addresses.\r
       //\r
-      DnsServer = (EFI_IPv6_ADDRESS *) OptList[Index]->Data;\r
+      DnsServer = (EFI_IPv6_ADDRESS *)OptList[Index]->Data;\r
       for (Index2 = 0; Index2 < Length / sizeof (EFI_IPv6_ADDRESS); Index2++) {\r
         if (!NetIp6IsValidUnicast (DnsServer)) {\r
           Status = EFI_NOT_READY;\r
@@ -1728,7 +1720,7 @@ Ip6ConfigSetStatefulAddrCallback (
 {\r
   IP6_CONFIG_INSTANCE  *Instance;\r
 \r
-  Instance = (IP6_CONFIG_INSTANCE *) Context;\r
+  Instance = (IP6_CONFIG_INSTANCE *)Context;\r
   NET_CHECK_SIGNATURE (Instance, IP6_CONFIG_INSTANCE_SIGNATURE);\r
 \r
   //\r
@@ -1769,6 +1761,7 @@ Ip6ConfigSetStatefulAddrCallback (
     if (Instance->DeclineAddress != NULL) {\r
       FreePool (Instance->DeclineAddress);\r
     }\r
+\r
     Instance->DeclineAddress      = NULL;\r
     Instance->DeclineAddressCount = 0;\r
   }\r
@@ -1788,25 +1781,25 @@ Ip6ConfigOnDhcp6Event (
   IN VOID       *Context\r
   )\r
 {\r
-  IP6_CONFIG_INSTANCE      *Instance;\r
-  EFI_DHCP6_PROTOCOL       *Dhcp6;\r
-  EFI_STATUS               Status;\r
-  EFI_DHCP6_MODE_DATA      Dhcp6ModeData;\r
-  EFI_DHCP6_IA             *Ia;\r
-  EFI_DHCP6_IA_ADDRESS     *IaAddr;\r
-  UINT32                   Index;\r
-  IP6_SERVICE              *IpSb;\r
-  IP6_ADDRESS_INFO         *AddrInfo;\r
-  IP6_INTERFACE            *IpIf;\r
+  IP6_CONFIG_INSTANCE   *Instance;\r
+  EFI_DHCP6_PROTOCOL    *Dhcp6;\r
+  EFI_STATUS            Status;\r
+  EFI_DHCP6_MODE_DATA   Dhcp6ModeData;\r
+  EFI_DHCP6_IA          *Ia;\r
+  EFI_DHCP6_IA_ADDRESS  *IaAddr;\r
+  UINT32                Index;\r
+  IP6_SERVICE           *IpSb;\r
+  IP6_ADDRESS_INFO      *AddrInfo;\r
+  IP6_INTERFACE         *IpIf;\r
 \r
-  Instance = (IP6_CONFIG_INSTANCE *) Context;\r
+  Instance = (IP6_CONFIG_INSTANCE *)Context;\r
 \r
   if ((Instance->Policy != Ip6ConfigPolicyAutomatic) || Instance->OtherInfoOnly) {\r
     //\r
     // IPv6 is not operating in the automatic policy now or\r
     // the DHCPv6 information request message exchange is aborted.\r
     //\r
-    return ;\r
+    return;\r
   }\r
 \r
   //\r
@@ -1816,7 +1809,7 @@ Ip6ConfigOnDhcp6Event (
 \r
   Status = Dhcp6->GetModeData (Dhcp6, &Dhcp6ModeData, NULL);\r
   if (EFI_ERROR (Status)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   IpSb   = IP6_SERVICE_FROM_IP6_CONFIG_INSTANCE (Instance);\r
@@ -1828,16 +1821,16 @@ Ip6ConfigOnDhcp6Event (
     FreePool (Instance->DeclineAddress);\r
   }\r
 \r
-  Instance->DeclineAddress = (EFI_IPv6_ADDRESS *) AllocatePool (Ia->IaAddressCount * sizeof (EFI_IPv6_ADDRESS));\r
+  Instance->DeclineAddress = (EFI_IPv6_ADDRESS *)AllocatePool (Ia->IaAddressCount * sizeof (EFI_IPv6_ADDRESS));\r
   if (Instance->DeclineAddress == NULL) {\r
     goto ON_EXIT;\r
   }\r
 \r
   Instance->FailedIaAddressCount = Ia->IaAddressCount;\r
-  Instance->DeclineAddressCount   = 0;\r
+  Instance->DeclineAddressCount  = 0;\r
 \r
   for (Index = 0; Index < Ia->IaAddressCount; Index++, IaAddr++) {\r
-    if (Ia->IaAddress[Index].ValidLifetime != 0 && Ia->State == Dhcp6Bound) {\r
+    if ((Ia->IaAddress[Index].ValidLifetime != 0) && (Ia->State == Dhcp6Bound)) {\r
       //\r
       // Set this address, either it's a new address or with updated lifetimes.\r
       // An appropriate prefix length will be set.\r
@@ -1908,7 +1901,7 @@ Ip6ConfigOnDhcp6Reply (
   IN EFI_DHCP6_PACKET    *Packet\r
   )\r
 {\r
-  return Ip6ConfigParseDhcpReply (This, (IP6_CONFIG_INSTANCE *) Context, Packet);\r
+  return Ip6ConfigParseDhcpReply (This, (IP6_CONFIG_INSTANCE *)Context, Packet);\r
 }\r
 \r
 /**\r
@@ -1928,13 +1921,13 @@ Ip6ConfigOnDhcp6SbInstalled (
 {\r
   IP6_CONFIG_INSTANCE  *Instance;\r
 \r
-  Instance = (IP6_CONFIG_INSTANCE *) Context;\r
+  Instance = (IP6_CONFIG_INSTANCE *)Context;\r
 \r
   if ((Instance->Dhcp6Handle != NULL) || (Instance->Policy != Ip6ConfigPolicyAutomatic)) {\r
     //\r
     // The DHCP6 child is already created or the policy is no longer AUTOMATIC.\r
     //\r
-    return ;\r
+    return;\r
   }\r
 \r
   Ip6ConfigStartStatefulAutoConfig (Instance, Instance->OtherInfoOnly);\r
@@ -1990,10 +1983,10 @@ Ip6ConfigOnDhcp6SbInstalled (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp6ConfigSetData (\r
-  IN EFI_IP6_CONFIG_PROTOCOL    *This,\r
-  IN EFI_IP6_CONFIG_DATA_TYPE   DataType,\r
-  IN UINTN                      DataSize,\r
-  IN VOID                       *Data\r
+  IN EFI_IP6_CONFIG_PROTOCOL   *This,\r
+  IN EFI_IP6_CONFIG_DATA_TYPE  DataType,\r
+  IN UINTN                     DataSize,\r
+  IN VOID                      *Data\r
   )\r
 {\r
   EFI_TPL              OldTpl;\r
@@ -2001,7 +1994,7 @@ EfiIp6ConfigSetData (
   IP6_CONFIG_INSTANCE  *Instance;\r
   IP6_SERVICE          *IpSb;\r
 \r
-  if ((This == NULL) || (Data == NULL && DataSize != 0) || (Data != NULL && DataSize == 0)) {\r
+  if ((This == NULL) || ((Data == NULL) && (DataSize != 0)) || ((Data != NULL) && (DataSize == 0))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -2021,14 +2014,12 @@ EfiIp6ConfigSetData (
 \r
   Status = Instance->DataItem[DataType].Status;\r
   if (Status != EFI_NOT_READY) {\r
-\r
     if (Instance->DataItem[DataType].SetData == NULL) {\r
       //\r
       // This type of data is readonly.\r
       //\r
       Status = EFI_WRITE_PROTECTED;\r
     } else {\r
-\r
       Status = Instance->DataItem[DataType].SetData (Instance, DataSize, Data);\r
       if (!EFI_ERROR (Status)) {\r
         //\r
@@ -2098,10 +2089,10 @@ EfiIp6ConfigSetData (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp6ConfigGetData (\r
-  IN EFI_IP6_CONFIG_PROTOCOL    *This,\r
-  IN EFI_IP6_CONFIG_DATA_TYPE   DataType,\r
-  IN OUT UINTN                  *DataSize,\r
-  IN VOID                       *Data   OPTIONAL\r
+  IN EFI_IP6_CONFIG_PROTOCOL   *This,\r
+  IN EFI_IP6_CONFIG_DATA_TYPE  DataType,\r
+  IN OUT UINTN                 *DataSize,\r
+  IN VOID                      *Data   OPTIONAL\r
   )\r
 {\r
   EFI_TPL               OldTpl;\r
@@ -2122,11 +2113,9 @@ EfiIp6ConfigGetData (
   Instance = IP6_CONFIG_INSTANCE_FROM_PROTOCOL (This);\r
   DataItem = &Instance->DataItem[DataType];\r
 \r
-  Status   = Instance->DataItem[DataType].Status;\r
+  Status = Instance->DataItem[DataType].Status;\r
   if (!EFI_ERROR (Status)) {\r
-\r
     if (DataItem->GetData != NULL) {\r
-\r
       Status = DataItem->GetData (Instance, DataSize, Data);\r
     } else if (*DataSize < Instance->DataItem[DataType].DataSize) {\r
       //\r
@@ -2135,7 +2124,6 @@ EfiIp6ConfigGetData (
       *DataSize = Instance->DataItem[DataType].DataSize;\r
       Status    = EFI_BUFFER_TOO_SMALL;\r
     } else {\r
-\r
       *DataSize = Instance->DataItem[DataType].DataSize;\r
       CopyMem (Data, Instance->DataItem[DataType].Data.Ptr, *DataSize);\r
     }\r
@@ -2171,9 +2159,9 @@ EfiIp6ConfigGetData (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp6ConfigRegisterDataNotify (\r
-  IN EFI_IP6_CONFIG_PROTOCOL    *This,\r
-  IN EFI_IP6_CONFIG_DATA_TYPE   DataType,\r
-  IN EFI_EVENT                  Event\r
+  IN EFI_IP6_CONFIG_PROTOCOL   *This,\r
+  IN EFI_IP6_CONFIG_DATA_TYPE  DataType,\r
+  IN EFI_EVENT                 Event\r
   )\r
 {\r
   EFI_TPL              OldTpl;\r
@@ -2190,26 +2178,22 @@ EfiIp6ConfigRegisterDataNotify (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  OldTpl    = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
-  Instance  = IP6_CONFIG_INSTANCE_FROM_PROTOCOL (This);\r
-  EventMap  = &Instance->DataItem[DataType].EventMap;\r
+  Instance = IP6_CONFIG_INSTANCE_FROM_PROTOCOL (This);\r
+  EventMap = &Instance->DataItem[DataType].EventMap;\r
 \r
   //\r
   // Check whether this event is already registered for this DataType.\r
   //\r
   Item = NetMapFindKey (EventMap, Event);\r
   if (Item == NULL) {\r
-\r
     Status = NetMapInsertTail (EventMap, Event, NULL);\r
 \r
     if (EFI_ERROR (Status)) {\r
-\r
       Status = EFI_OUT_OF_RESOURCES;\r
     }\r
-\r
   } else {\r
-\r
     Status = EFI_ACCESS_DENIED;\r
   }\r
 \r
@@ -2236,9 +2220,9 @@ EfiIp6ConfigRegisterDataNotify (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp6ConfigUnregisterDataNotify (\r
-  IN EFI_IP6_CONFIG_PROTOCOL    *This,\r
-  IN EFI_IP6_CONFIG_DATA_TYPE   DataType,\r
-  IN EFI_EVENT                  Event\r
+  IN EFI_IP6_CONFIG_PROTOCOL   *This,\r
+  IN EFI_IP6_CONFIG_DATA_TYPE  DataType,\r
+  IN EFI_EVENT                 Event\r
   )\r
 {\r
   EFI_TPL              OldTpl;\r
@@ -2260,11 +2244,9 @@ EfiIp6ConfigUnregisterDataNotify (
 \r
   Item = NetMapFindKey (&Instance->DataItem[DataType].EventMap, Event);\r
   if (Item != NULL) {\r
-\r
     NetMapRemoveItem (&Instance->DataItem[DataType].EventMap, Item, NULL);\r
     Status = EFI_SUCCESS;\r
   } else {\r
-\r
     Status = EFI_NOT_FOUND;\r
   }\r
 \r
@@ -2357,24 +2339,24 @@ Ip6ConfigInitInstance (
   Instance->Policy   = Ip6ConfigPolicyManual;\r
   SET_DATA_ATTRIB (DataItem->Attribute, DATA_ATTRIB_SIZE_FIXED);\r
 \r
-  DataItem           = &Instance->DataItem[Ip6ConfigDataTypeDupAddrDetectTransmits];\r
-  DataItem->SetData  = Ip6ConfigSetDadXmits;\r
-  DataItem->Data.Ptr = &Instance->DadXmits;\r
-  DataItem->DataSize = sizeof (Instance->DadXmits);\r
+  DataItem                                  = &Instance->DataItem[Ip6ConfigDataTypeDupAddrDetectTransmits];\r
+  DataItem->SetData                         = Ip6ConfigSetDadXmits;\r
+  DataItem->Data.Ptr                        = &Instance->DadXmits;\r
+  DataItem->DataSize                        = sizeof (Instance->DadXmits);\r
   Instance->DadXmits.DupAddrDetectTransmits = IP6_CONFIG_DEFAULT_DAD_XMITS;\r
   SET_DATA_ATTRIB (DataItem->Attribute, DATA_ATTRIB_SIZE_FIXED);\r
 \r
-  DataItem           = &Instance->DataItem[Ip6ConfigDataTypeManualAddress];\r
-  DataItem->SetData  = Ip6ConfigSetManualAddress;\r
-  DataItem->Status   = EFI_NOT_FOUND;\r
+  DataItem          = &Instance->DataItem[Ip6ConfigDataTypeManualAddress];\r
+  DataItem->SetData = Ip6ConfigSetManualAddress;\r
+  DataItem->Status  = EFI_NOT_FOUND;\r
 \r
-  DataItem           = &Instance->DataItem[Ip6ConfigDataTypeGateway];\r
-  DataItem->SetData  = Ip6ConfigSetGateway;\r
-  DataItem->Status   = EFI_NOT_FOUND;\r
+  DataItem          = &Instance->DataItem[Ip6ConfigDataTypeGateway];\r
+  DataItem->SetData = Ip6ConfigSetGateway;\r
+  DataItem->Status  = EFI_NOT_FOUND;\r
 \r
-  DataItem           = &Instance->DataItem[Ip6ConfigDataTypeDnsServer];\r
-  DataItem->SetData  = Ip6ConfigSetDnsServer;\r
-  DataItem->Status   = EFI_NOT_FOUND;\r
+  DataItem          = &Instance->DataItem[Ip6ConfigDataTypeDnsServer];\r
+  DataItem->SetData = Ip6ConfigSetDnsServer;\r
+  DataItem->Status  = EFI_NOT_FOUND;\r
 \r
   //\r
   // Create the event used for DHCP.\r
@@ -2388,7 +2370,7 @@ Ip6ConfigInitInstance (
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Instance->Configured  = TRUE;\r
+  Instance->Configured = TRUE;\r
 \r
   //\r
   // Try to read the config data from NV variable.\r
@@ -2415,7 +2397,6 @@ Ip6ConfigInitInstance (
   Instance->Ip6Config.RegisterDataNotify   = EfiIp6ConfigRegisterDataNotify;\r
   Instance->Ip6Config.UnregisterDataNotify = EfiIp6ConfigUnregisterDataNotify;\r
 \r
-\r
   //\r
   // Publish the IP6 configuration form\r
   //\r
@@ -2441,11 +2422,10 @@ Ip6ConfigCleanInstance (
   }\r
 \r
   if (!Instance->Configured) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   if (Instance->Dhcp6Handle != NULL) {\r
-\r
     Ip6ConfigDestroyDhcp6 (Instance);\r
   }\r
 \r
@@ -2460,13 +2440,13 @@ Ip6ConfigCleanInstance (
   NetMapClean (&Instance->DadFailedMap);\r
 \r
   for (Index = 0; Index < Ip6ConfigDataTypeMaximum; Index++) {\r
-\r
     DataItem = &Instance->DataItem[Index];\r
 \r
     if (!DATA_ATTRIB_SET (DataItem->Attribute, DATA_ATTRIB_SIZE_FIXED)) {\r
       if (DataItem->Data.Ptr != NULL) {\r
         FreePool (DataItem->Data.Ptr);\r
       }\r
+\r
       DataItem->Data.Ptr = NULL;\r
       DataItem->DataSize = 0;\r
     }\r
@@ -2493,9 +2473,9 @@ Ip6ConfigDestroyDhcp6 (
   IN OUT IP6_CONFIG_INSTANCE  *Instance\r
   )\r
 {\r
-  IP6_SERVICE                 *IpSb;\r
-  EFI_STATUS                  Status;\r
-  EFI_DHCP6_PROTOCOL          *Dhcp6;\r
+  IP6_SERVICE         *IpSb;\r
+  EFI_STATUS          Status;\r
+  EFI_DHCP6_PROTOCOL  *Dhcp6;\r
 \r
   Dhcp6 = Instance->Dhcp6;\r
   ASSERT (Dhcp6 != NULL);\r
@@ -2530,4 +2510,3 @@ Ip6ConfigDestroyDhcp6 (
 \r
   return Status;\r
 }\r
-\r
index 1c2eede2ab21ad052a4af51470cdb57e5db62c20..66b730a32d1d049448a5fa69a643ff35c07bb3bd 100644 (file)
 #ifndef __IP6_CONFIG_IMPL_H__\r
 #define __IP6_CONFIG_IMPL_H__\r
 \r
-#define IP6_CONFIG_INSTANCE_SIGNATURE    SIGNATURE_32 ('I', 'P', '6', 'C')\r
-#define IP6_FORM_CALLBACK_INFO_SIGNATURE SIGNATURE_32 ('I', 'F', 'C', 'I')\r
-#define IP6_CONFIG_VARIABLE_ATTRIBUTE    (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS)\r
+#define IP6_CONFIG_INSTANCE_SIGNATURE     SIGNATURE_32 ('I', 'P', '6', 'C')\r
+#define IP6_FORM_CALLBACK_INFO_SIGNATURE  SIGNATURE_32 ('I', 'F', 'C', 'I')\r
+#define IP6_CONFIG_VARIABLE_ATTRIBUTE     (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS)\r
 \r
-#define IP6_CONFIG_DEFAULT_DAD_XMITS        1\r
+#define IP6_CONFIG_DEFAULT_DAD_XMITS  1\r
 \r
-#define DATA_ATTRIB_SIZE_FIXED              0x1\r
-#define DATA_ATTRIB_VOLATILE                0x2\r
+#define DATA_ATTRIB_SIZE_FIXED  0x1\r
+#define DATA_ATTRIB_VOLATILE    0x2\r
 \r
-#define DATA_ATTRIB_SET(Attrib, Bits)       (BOOLEAN)((Attrib) & (Bits))\r
-#define SET_DATA_ATTRIB(Attrib, Bits)       ((Attrib) |= (Bits))\r
+#define DATA_ATTRIB_SET(Attrib, Bits)  (BOOLEAN)((Attrib) & (Bits))\r
+#define SET_DATA_ATTRIB(Attrib, Bits)  ((Attrib) |= (Bits))\r
 \r
 typedef struct _IP6_CONFIG_INSTANCE IP6_CONFIG_INSTANCE;\r
 \r
@@ -31,7 +31,6 @@ typedef struct _IP6_CONFIG_INSTANCE IP6_CONFIG_INSTANCE;
       IP6_CONFIG_INSTANCE_SIGNATURE \\r
       )\r
 \r
-\r
 #define IP6_CONFIG_INSTANCE_FROM_FORM_CALLBACK(Callback) \\r
   CR ((Callback), \\r
       IP6_CONFIG_INSTANCE, \\r
@@ -99,30 +98,30 @@ EFI_STATUS
   );\r
 \r
 typedef union {\r
-  VOID                                      *Ptr;\r
-  EFI_IP6_CONFIG_INTERFACE_INFO             *IfInfo;\r
-  EFI_IP6_CONFIG_INTERFACE_ID               *AltIfId;\r
-  EFI_IP6_CONFIG_POLICY                     *Policy;\r
-  EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS  *DadXmits;\r
-  EFI_IP6_CONFIG_MANUAL_ADDRESS             *ManualAddress;\r
-  EFI_IPv6_ADDRESS                          *Gateway;\r
-  EFI_IPv6_ADDRESS                          *DnsServers;\r
+  VOID                                        *Ptr;\r
+  EFI_IP6_CONFIG_INTERFACE_INFO               *IfInfo;\r
+  EFI_IP6_CONFIG_INTERFACE_ID                 *AltIfId;\r
+  EFI_IP6_CONFIG_POLICY                       *Policy;\r
+  EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS    *DadXmits;\r
+  EFI_IP6_CONFIG_MANUAL_ADDRESS               *ManualAddress;\r
+  EFI_IPv6_ADDRESS                            *Gateway;\r
+  EFI_IPv6_ADDRESS                            *DnsServers;\r
 } IP6_CONFIG_DATA;\r
 \r
 typedef struct {\r
-  IP6_CONFIG_SET_DATA  SetData;\r
-  IP6_CONFIG_GET_DATA  GetData;\r
-  EFI_STATUS           Status;\r
-  UINT8                Attribute;\r
-  NET_MAP              EventMap;\r
-  IP6_CONFIG_DATA      Data;\r
-  UINTN                DataSize;\r
+  IP6_CONFIG_SET_DATA    SetData;\r
+  IP6_CONFIG_GET_DATA    GetData;\r
+  EFI_STATUS             Status;\r
+  UINT8                  Attribute;\r
+  NET_MAP                EventMap;\r
+  IP6_CONFIG_DATA        Data;\r
+  UINTN                  DataSize;\r
 } IP6_CONFIG_DATA_ITEM;\r
 \r
 typedef struct {\r
-  UINT16                    Offset;\r
-  UINT32                    DataSize;\r
-  EFI_IP6_CONFIG_DATA_TYPE  DataType;\r
+  UINT16                      Offset;\r
+  UINT32                      DataSize;\r
+  EFI_IP6_CONFIG_DATA_TYPE    DataType;\r
 } IP6_CONFIG_DATA_RECORD;\r
 \r
 #pragma pack(1)\r
@@ -142,69 +141,69 @@ typedef struct {
 //  EFI_IPv6_ADDRESS                          DnsServers[];\r
 //\r
 typedef struct {\r
-  UINT32                  IaId;\r
-  UINT16                  Checksum;\r
-  UINT16                  DataRecordCount;\r
-  IP6_CONFIG_DATA_RECORD  DataRecord[1];\r
+  UINT32                    IaId;\r
+  UINT16                    Checksum;\r
+  UINT16                    DataRecordCount;\r
+  IP6_CONFIG_DATA_RECORD    DataRecord[1];\r
 } IP6_CONFIG_VARIABLE;\r
 \r
 #pragma pack()\r
 \r
 typedef struct {\r
-  LIST_ENTRY                  Link;\r
-  EFI_IP6_ADDRESS_INFO        AddrInfo;\r
+  LIST_ENTRY              Link;\r
+  EFI_IP6_ADDRESS_INFO    AddrInfo;\r
 } IP6_ADDRESS_INFO_ENTRY;\r
 \r
 typedef struct {\r
-  EFI_IP6_CONFIG_POLICY                    Policy;              ///< manual or automatic\r
-  EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS DadTransmitCount;    ///< dad transmits count\r
-  EFI_IP6_CONFIG_INTERFACE_ID              InterfaceId;         ///< alternative interface id\r
-  LIST_ENTRY                               ManualAddress;       ///< IP addresses\r
-  UINT32                                   ManualAddressCount;  ///< IP addresses count\r
-  LIST_ENTRY                               GatewayAddress;      ///< Gateway address\r
-  UINT32                                   GatewayAddressCount; ///< Gateway address count\r
-  LIST_ENTRY                               DnsAddress;          ///< DNS server address\r
-  UINT32                                   DnsAddressCount;     ///< DNS server address count\r
+  EFI_IP6_CONFIG_POLICY                       Policy;              ///< manual or automatic\r
+  EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS    DadTransmitCount;    ///< dad transmits count\r
+  EFI_IP6_CONFIG_INTERFACE_ID                 InterfaceId;         ///< alternative interface id\r
+  LIST_ENTRY                                  ManualAddress;       ///< IP addresses\r
+  UINT32                                      ManualAddressCount;  ///< IP addresses count\r
+  LIST_ENTRY                                  GatewayAddress;      ///< Gateway address\r
+  UINT32                                      GatewayAddressCount; ///< Gateway address count\r
+  LIST_ENTRY                                  DnsAddress;          ///< DNS server address\r
+  UINT32                                      DnsAddressCount;     ///< DNS server address count\r
 } IP6_CONFIG_NVDATA;\r
 \r
 typedef struct _IP6_FORM_CALLBACK_INFO {\r
-  UINT32                           Signature;\r
-  EFI_HANDLE                       ChildHandle;\r
-  EFI_HII_CONFIG_ACCESS_PROTOCOL   HiiConfigAccess;\r
-  EFI_DEVICE_PATH_PROTOCOL         *HiiVendorDevicePath;\r
-  EFI_HII_HANDLE                   RegisteredHandle;\r
+  UINT32                            Signature;\r
+  EFI_HANDLE                        ChildHandle;\r
+  EFI_HII_CONFIG_ACCESS_PROTOCOL    HiiConfigAccess;\r
+  EFI_DEVICE_PATH_PROTOCOL          *HiiVendorDevicePath;\r
+  EFI_HII_HANDLE                    RegisteredHandle;\r
 } IP6_FORM_CALLBACK_INFO;\r
 \r
 struct _IP6_CONFIG_INSTANCE {\r
-  UINT32                                    Signature;\r
-  BOOLEAN                                   Configured;\r
-  LIST_ENTRY                                Link;\r
-  UINT16                                    IfIndex;\r
-\r
-  EFI_IP6_CONFIG_INTERFACE_INFO             InterfaceInfo;\r
-  EFI_IP6_CONFIG_INTERFACE_ID               AltIfId;\r
-  EFI_IP6_CONFIG_POLICY                     Policy;\r
-  EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS  DadXmits;\r
-\r
-  IP6_CONFIG_DATA_ITEM                      DataItem[Ip6ConfigDataTypeMaximum];\r
-  NET_MAP                                   DadFailedMap;\r
-  NET_MAP                                   DadPassedMap;\r
-\r
-  EFI_IP6_CONFIG_PROTOCOL                   Ip6Config;\r
-\r
-  EFI_EVENT                                 Dhcp6SbNotifyEvent;\r
-  VOID                                      *Registration;\r
-  EFI_HANDLE                                Dhcp6Handle;\r
-  EFI_DHCP6_PROTOCOL                        *Dhcp6;\r
-  BOOLEAN                                   OtherInfoOnly;\r
-  UINT32                                    IaId;\r
-  EFI_EVENT                                 Dhcp6Event;\r
-  UINT32                                    FailedIaAddressCount;\r
-  EFI_IPv6_ADDRESS                          *DeclineAddress;\r
-  UINT32                                    DeclineAddressCount;\r
-\r
-  IP6_FORM_CALLBACK_INFO                    CallbackInfo;\r
-  IP6_CONFIG_NVDATA                         Ip6NvData;\r
+  UINT32                                      Signature;\r
+  BOOLEAN                                     Configured;\r
+  LIST_ENTRY                                  Link;\r
+  UINT16                                      IfIndex;\r
+\r
+  EFI_IP6_CONFIG_INTERFACE_INFO               InterfaceInfo;\r
+  EFI_IP6_CONFIG_INTERFACE_ID                 AltIfId;\r
+  EFI_IP6_CONFIG_POLICY                       Policy;\r
+  EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS    DadXmits;\r
+\r
+  IP6_CONFIG_DATA_ITEM                        DataItem[Ip6ConfigDataTypeMaximum];\r
+  NET_MAP                                     DadFailedMap;\r
+  NET_MAP                                     DadPassedMap;\r
+\r
+  EFI_IP6_CONFIG_PROTOCOL                     Ip6Config;\r
+\r
+  EFI_EVENT                                   Dhcp6SbNotifyEvent;\r
+  VOID                                        *Registration;\r
+  EFI_HANDLE                                  Dhcp6Handle;\r
+  EFI_DHCP6_PROTOCOL                          *Dhcp6;\r
+  BOOLEAN                                     OtherInfoOnly;\r
+  UINT32                                      IaId;\r
+  EFI_EVENT                                   Dhcp6Event;\r
+  UINT32                                      FailedIaAddressCount;\r
+  EFI_IPv6_ADDRESS                            *DeclineAddress;\r
+  UINT32                                      DeclineAddressCount;\r
+\r
+  IP6_FORM_CALLBACK_INFO                      CallbackInfo;\r
+  IP6_CONFIG_NVDATA                           Ip6NvData;\r
 };\r
 \r
 /**\r
index a0727d2666e9121e9abfa75e449d4718c693c5f4..1ed403934968ba96a202fdef1ac9a061352abe66 100644 (file)
@@ -9,7 +9,7 @@
 \r
 #include "Ip6Impl.h"\r
 \r
-CHAR16    mIp6ConfigStorageName[]     = L"IP6_CONFIG_IFR_NVDATA";\r
+CHAR16  mIp6ConfigStorageName[] = L"IP6_CONFIG_IFR_NVDATA";\r
 \r
 /**\r
   The notify function of create event when performing a manual configuration.\r
@@ -21,11 +21,11 @@ CHAR16    mIp6ConfigStorageName[]     = L"IP6_CONFIG_IFR_NVDATA";
 VOID\r
 EFIAPI\r
 Ip6ConfigManualAddressNotify (\r
-  IN EFI_EVENT    Event,\r
-  IN VOID         *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  *((BOOLEAN *) Context) = TRUE;\r
+  *((BOOLEAN *)Context) = TRUE;\r
 }\r
 \r
 /**\r
@@ -52,27 +52,27 @@ Ip6ConfigManualAddressNotify (
 **/\r
 EFI_STATUS\r
 Ip6ConfigNvGetData (\r
-  IN  EFI_IP6_CONFIG_PROTOCOL                *Ip6Config,\r
-  IN  EFI_IP6_CONFIG_DATA_TYPE               DataType,\r
-  OUT UINTN                                  *DataSize,\r
-  OUT VOID                                   **Data\r
+  IN  EFI_IP6_CONFIG_PROTOCOL   *Ip6Config,\r
+  IN  EFI_IP6_CONFIG_DATA_TYPE  DataType,\r
+  OUT UINTN                     *DataSize,\r
+  OUT VOID                      **Data\r
   )\r
 {\r
-  UINTN                   BufferSize;\r
-  VOID                    *Buffer;\r
-  EFI_STATUS              Status;\r
+  UINTN       BufferSize;\r
+  VOID        *Buffer;\r
+  EFI_STATUS  Status;\r
 \r
   if ((Ip6Config == NULL) || (Data == NULL) || (DataSize == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   BufferSize = 0;\r
-  Status = Ip6Config->GetData (\r
-                        Ip6Config,\r
-                        DataType,\r
-                        &BufferSize,\r
-                        NULL\r
-                        );\r
+  Status     = Ip6Config->GetData (\r
+                            Ip6Config,\r
+                            DataType,\r
+                            &BufferSize,\r
+                            NULL\r
+                            );\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     return Status;\r
   }\r
@@ -108,12 +108,12 @@ Ip6ConfigNvGetData (
 **/\r
 VOID\r
 Ip6FreeAddressInfoList (\r
-  IN LIST_ENTRY                  *ListHead\r
+  IN LIST_ENTRY  *ListHead\r
   )\r
 {\r
-  IP6_ADDRESS_INFO_ENTRY         *Node;\r
-  LIST_ENTRY                     *Entry;\r
-  LIST_ENTRY                     *NextEntry;\r
+  IP6_ADDRESS_INFO_ENTRY  *Node;\r
+  LIST_ENTRY              *Entry;\r
+  LIST_ENTRY              *NextEntry;\r
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, ListHead) {\r
     Node = NET_LIST_USER_STRUCT (Entry, IP6_ADDRESS_INFO_ENTRY, Link);\r
@@ -135,19 +135,20 @@ Ip6ToStr (
   OUT CHAR16            *Str\r
   )\r
 {\r
-  UINTN                 Index;\r
-  BOOLEAN               Short;\r
-  UINTN                 Number;\r
-  CHAR16                FormatString[8];\r
+  UINTN    Index;\r
+  BOOLEAN  Short;\r
+  UINTN    Number;\r
+  CHAR16   FormatString[8];\r
 \r
   Short = FALSE;\r
 \r
   for (Index = 0; Index < 15; Index = Index + 2) {\r
     if (!Short &&\r
-        Index % 2 == 0 &&\r
-        Ip6->Addr[Index] == 0 &&\r
-        Ip6->Addr[Index + 1] == 0\r
-        ) {\r
+        (Index % 2 == 0) &&\r
+        (Ip6->Addr[Index] == 0) &&\r
+        (Ip6->Addr[Index + 1] == 0)\r
+        )\r
+    {\r
       //\r
       // Deal with the case of ::.\r
       //\r
@@ -156,8 +157,8 @@ Ip6ToStr (
         *(Str + 1) = L':';\r
         Str        = Str + 2;\r
       } else {\r
-        *Str       = L':';\r
-        Str        = Str + 1;\r
+        *Str = L':';\r
+        Str  = Str + 1;\r
       }\r
 \r
       while ((Index < 15) && (Ip6->Addr[Index] == 0) && (Ip6->Addr[Index + 1] == 0)) {\r
@@ -178,7 +179,7 @@ Ip6ToStr (
     ASSERT (Index < 15);\r
 \r
     if (Ip6->Addr[Index] == 0) {\r
-      Number = UnicodeSPrint (Str, 2 * IP6_STR_MAX_SIZE, L"%x:", (UINTN) Ip6->Addr[Index + 1]);\r
+      Number = UnicodeSPrint (Str, 2 * IP6_STR_MAX_SIZE, L"%x:", (UINTN)Ip6->Addr[Index + 1]);\r
     } else {\r
       if (Ip6->Addr[Index + 1] < 0x10) {\r
         CopyMem (FormatString, L"%x0%x:", StrSize (L"%x0%x:"));\r
@@ -189,9 +190,9 @@ Ip6ToStr (
       Number = UnicodeSPrint (\r
                  Str,\r
                  2 * IP6_STR_MAX_SIZE,\r
-                 (CONST CHAR16 *) FormatString,\r
-                 (UINTN) Ip6->Addr[Index],\r
-                 (UINTN) Ip6->Addr[Index + 1]\r
+                 (CONST CHAR16 *)FormatString,\r
+                 (UINTN)Ip6->Addr[Index],\r
+                 (UINTN)Ip6->Addr[Index + 1]\r
                  );\r
     }\r
 \r
@@ -218,12 +219,12 @@ Ip6ToStr (
 **/\r
 EFI_STATUS\r
 Ip6ConvertInterfaceIdToString (\r
-  OUT CHAR16                         *String,\r
-  IN  EFI_IP6_CONFIG_INTERFACE_ID    *IfId\r
+  OUT CHAR16                       *String,\r
+  IN  EFI_IP6_CONFIG_INTERFACE_ID  *IfId\r
   )\r
 {\r
-  UINT8                          Index;\r
-  UINTN                          Number;\r
+  UINT8  Index;\r
+  UINTN  Number;\r
 \r
   if ((String == NULL) || (IfId == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -234,7 +235,7 @@ Ip6ConvertInterfaceIdToString (
                String,\r
                2 * INTERFACE_ID_STR_STORAGE,\r
                L"%x:",\r
-               (UINTN) IfId->Id[Index]\r
+               (UINTN)IfId->Id[Index]\r
                );\r
     String = String + Number;\r
   }\r
@@ -256,20 +257,20 @@ Ip6ConvertInterfaceIdToString (
 **/\r
 EFI_STATUS\r
 Ip6ParseInterfaceIdFromString (\r
-  IN CONST CHAR16                    *String,\r
-  OUT EFI_IP6_CONFIG_INTERFACE_ID    *IfId\r
+  IN CONST CHAR16                  *String,\r
+  OUT EFI_IP6_CONFIG_INTERFACE_ID  *IfId\r
   )\r
 {\r
-  UINT8                          Index;\r
-  CHAR16                         *IfIdStr;\r
-  CHAR16                         *TempStr;\r
-  UINTN                          NodeVal;\r
+  UINT8   Index;\r
+  CHAR16  *IfIdStr;\r
+  CHAR16  *TempStr;\r
+  UINTN   NodeVal;\r
 \r
   if ((String == NULL) || (IfId == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  IfIdStr = (CHAR16 *) String;\r
+  IfIdStr = (CHAR16 *)String;\r
 \r
   ZeroMem (IfId, sizeof (EFI_IP6_CONFIG_INTERFACE_ID));\r
 \r
@@ -297,7 +298,7 @@ Ip6ParseInterfaceIdFromString (
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
-    IfId->Id[Index] = (UINT8) NodeVal;\r
+    IfId->Id[Index] = (UINT8)NodeVal;\r
 \r
     IfIdStr++;\r
   }\r
@@ -323,18 +324,18 @@ Ip6ParseInterfaceIdFromString (
 **/\r
 EFI_STATUS\r
 Ip6CreateOpCode (\r
-  IN  UINT16                        StartLabelNumber,\r
-  OUT VOID                          **StartOpCodeHandle,\r
-  OUT EFI_IFR_GUID_LABEL            **StartLabel,\r
-  OUT VOID                          **EndOpCodeHandle,\r
-  OUT EFI_IFR_GUID_LABEL            **EndLabel\r
+  IN  UINT16              StartLabelNumber,\r
+  OUT VOID                **StartOpCodeHandle,\r
+  OUT EFI_IFR_GUID_LABEL  **StartLabel,\r
+  OUT VOID                **EndOpCodeHandle,\r
+  OUT EFI_IFR_GUID_LABEL  **EndLabel\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  EFI_IFR_GUID_LABEL                *InternalStartLabel;\r
-  EFI_IFR_GUID_LABEL                *InternalEndLabel;\r
+  EFI_STATUS          Status;\r
+  EFI_IFR_GUID_LABEL  *InternalStartLabel;\r
+  EFI_IFR_GUID_LABEL  *InternalEndLabel;\r
 \r
-  if (StartOpCodeHandle == NULL || StartLabel == NULL || EndOpCodeHandle == NULL || EndLabel == NULL) {\r
+  if ((StartOpCodeHandle == NULL) || (StartLabel == NULL) || (EndOpCodeHandle == NULL) || (EndLabel == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -358,12 +359,12 @@ Ip6CreateOpCode (
   //\r
   // Create Hii Extend Label OpCode as the start opcode.\r
   //\r
-  InternalStartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                                *StartOpCodeHandle,\r
-                                                &gEfiIfrTianoGuid,\r
-                                                NULL,\r
-                                                sizeof (EFI_IFR_GUID_LABEL)\r
-                                                );\r
+  InternalStartLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                               *StartOpCodeHandle,\r
+                                               &gEfiIfrTianoGuid,\r
+                                               NULL,\r
+                                               sizeof (EFI_IFR_GUID_LABEL)\r
+                                               );\r
   if (InternalStartLabel == NULL) {\r
     goto Exit;\r
   }\r
@@ -374,12 +375,12 @@ Ip6CreateOpCode (
   //\r
   // Create Hii Extend Label OpCode as the end opcode.\r
   //\r
-  InternalEndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                              *EndOpCodeHandle,\r
-                                              &gEfiIfrTianoGuid,\r
-                                              NULL,\r
-                                              sizeof (EFI_IFR_GUID_LABEL)\r
-                                              );\r
+  InternalEndLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                             *EndOpCodeHandle,\r
+                                             &gEfiIfrTianoGuid,\r
+                                             NULL,\r
+                                             sizeof (EFI_IFR_GUID_LABEL)\r
+                                             );\r
   if (InternalEndLabel == NULL) {\r
     goto Exit;\r
   }\r
@@ -429,26 +430,26 @@ Exit:
 **/\r
 EFI_STATUS\r
 Ip6ConvertAddressListToString (\r
-  IN OUT CHAR16                         *String,\r
-  IN     EFI_HII_HANDLE                 HiiHandle,\r
-  IN     IP6_CONFIG_NV_ADDRESS_TYPE     AddressType,\r
-  IN     VOID                           *AddressInfo,\r
-  IN     UINTN                          AddressCount\r
+  IN OUT CHAR16                      *String,\r
+  IN     EFI_HII_HANDLE              HiiHandle,\r
+  IN     IP6_CONFIG_NV_ADDRESS_TYPE  AddressType,\r
+  IN     VOID                        *AddressInfo,\r
+  IN     UINTN                       AddressCount\r
   )\r
 {\r
-  UINTN                          Index;\r
-  UINTN                          Number;\r
-  CHAR16                         *TempStr;\r
-  EFI_STATUS                     Status;\r
-  VOID                           *StartOpCodeHandle;\r
-  EFI_IFR_GUID_LABEL             *StartLabel;\r
-  VOID                           *EndOpCodeHandle;\r
-  EFI_IFR_GUID_LABEL             *EndLabel;\r
-  UINT16                         StartLabelNumber;\r
-  EFI_STRING_ID                  TextTwo;\r
-  UINT8                          *AddressHead;\r
-  UINT8                          PrefixLength;\r
-  EFI_IPv6_ADDRESS               *Address;\r
+  UINTN               Index;\r
+  UINTN               Number;\r
+  CHAR16              *TempStr;\r
+  EFI_STATUS          Status;\r
+  VOID                *StartOpCodeHandle;\r
+  EFI_IFR_GUID_LABEL  *StartLabel;\r
+  VOID                *EndOpCodeHandle;\r
+  EFI_IFR_GUID_LABEL  *EndLabel;\r
+  UINT16              StartLabelNumber;\r
+  EFI_STRING_ID       TextTwo;\r
+  UINT8               *AddressHead;\r
+  UINT8               PrefixLength;\r
+  EFI_IPv6_ADDRESS    *Address;\r
 \r
   if ((String == NULL) || (HiiHandle == NULL) || (AddressInfo == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -478,15 +479,15 @@ Ip6ConvertAddressListToString (
     return Status;\r
   }\r
 \r
-  AddressHead = (UINT8 *) AddressInfo;\r
+  AddressHead = (UINT8 *)AddressInfo;\r
 \r
   for (Index = 0; Index < AddressCount; Index++) {\r
     if (AddressType == Ip6ConfigNvHostAddress) {\r
       AddressInfo = AddressHead + sizeof (EFI_IP6_ADDRESS_INFO) * Index;\r
-      Address     = &((EFI_IP6_ADDRESS_INFO *) AddressInfo)->Address;\r
+      Address     = &((EFI_IP6_ADDRESS_INFO *)AddressInfo)->Address;\r
     } else if (AddressType == Ip6ConfigNvRouteTable) {\r
       AddressInfo = AddressHead + sizeof (EFI_IP6_ROUTE_TABLE) * Index;\r
-      Address     = &((EFI_IP6_ROUTE_TABLE *) AddressInfo)->Destination;\r
+      Address     = &((EFI_IP6_ROUTE_TABLE *)AddressInfo)->Destination;\r
     } else {\r
       AddressInfo = AddressHead + sizeof (EFI_IPv6_ADDRESS) * Index;\r
       Address     = AddressInfo;\r
@@ -500,9 +501,9 @@ Ip6ConvertAddressListToString (
 \r
     if ((AddressType == Ip6ConfigNvHostAddress) || (AddressType == Ip6ConfigNvRouteTable)) {\r
       if (AddressType == Ip6ConfigNvHostAddress) {\r
-        PrefixLength = ((EFI_IP6_ADDRESS_INFO *) AddressInfo)->PrefixLength;\r
+        PrefixLength = ((EFI_IP6_ADDRESS_INFO *)AddressInfo)->PrefixLength;\r
       } else {\r
-        PrefixLength = ((EFI_IP6_ROUTE_TABLE *) AddressInfo)->PrefixLength;\r
+        PrefixLength = ((EFI_IP6_ROUTE_TABLE *)AddressInfo)->PrefixLength;\r
       }\r
 \r
       //\r
@@ -518,13 +519,13 @@ Ip6ConvertAddressListToString (
       //\r
       // Append " >> " to the string.\r
       //\r
-      Number   = UnicodeSPrint (TempStr, 8, L" >>  ");\r
-      TempStr  = TempStr + Number;\r
+      Number  = UnicodeSPrint (TempStr, 8, L" >>  ");\r
+      TempStr = TempStr + Number;\r
 \r
       //\r
       // Append the gateway address to the string.\r
       //\r
-      Ip6ToStr (&((EFI_IP6_ROUTE_TABLE *) AddressInfo)->Gateway, TempStr);\r
+      Ip6ToStr (&((EFI_IP6_ROUTE_TABLE *)AddressInfo)->Gateway, TempStr);\r
       TempStr = TempStr + StrLen (TempStr);\r
     }\r
 \r
@@ -539,7 +540,7 @@ Ip6ConvertAddressListToString (
 \r
     HiiCreateTextOpCode (StartOpCodeHandle, STR_NULL, STR_NULL, TextTwo);\r
 \r
-    String = TempStr;\r
+    String  = TempStr;\r
     *String = IP6_ADDRESS_DELIMITER;\r
     String++;\r
   }\r
@@ -576,26 +577,26 @@ Exit:
 **/\r
 EFI_STATUS\r
 Ip6ParseAddressListFromString (\r
-  IN CONST CHAR16                    *String,\r
-  OUT LIST_ENTRY                     *ListHead,\r
-  OUT UINT32                         *AddressCount\r
+  IN CONST CHAR16  *String,\r
+  OUT LIST_ENTRY   *ListHead,\r
+  OUT UINT32       *AddressCount\r
   )\r
 {\r
-  EFI_STATUS                     Status;\r
-  CHAR16                         *LocalString;\r
-  CHAR16                         *Temp;\r
-  CHAR16                         *TempStr;\r
-  EFI_IP6_ADDRESS_INFO           AddressInfo;\r
-  IP6_ADDRESS_INFO_ENTRY         *Node;\r
-  BOOLEAN                        Last;\r
-  UINT32                         Count;\r
+  EFI_STATUS              Status;\r
+  CHAR16                  *LocalString;\r
+  CHAR16                  *Temp;\r
+  CHAR16                  *TempStr;\r
+  EFI_IP6_ADDRESS_INFO    AddressInfo;\r
+  IP6_ADDRESS_INFO_ENTRY  *Node;\r
+  BOOLEAN                 Last;\r
+  UINT32                  Count;\r
 \r
   if ((String == NULL) || (ListHead == NULL) || (AddressCount == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   ZeroMem (&AddressInfo, sizeof (EFI_IP6_ADDRESS_INFO));\r
-  LocalString = (CHAR16 *) AllocateCopyPool (StrSize (String), String);\r
+  LocalString = (CHAR16 *)AllocateCopyPool (StrSize (String), String);\r
   if (LocalString == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -684,12 +685,12 @@ Ip6ConvertInterfaceInfoToString (
   IN OUT IP6_CONFIG_IFR_NVDATA          *IfrNvData\r
   )\r
 {\r
-  UINT32                         Index;\r
-  UINTN                          Number;\r
-  CHAR16                         *String;\r
-  CHAR16                         PortString[ADDRESS_STR_MAX_SIZE];\r
-  CHAR16                         FormatString[8];\r
-  EFI_STRING_ID                  StringId;\r
+  UINT32         Index;\r
+  UINTN          Number;\r
+  CHAR16         *String;\r
+  CHAR16         PortString[ADDRESS_STR_MAX_SIZE];\r
+  CHAR16         FormatString[8];\r
+  EFI_STRING_ID  StringId;\r
 \r
   if ((IfInfo == NULL) || (HiiHandle == NULL) || (IfrNvData == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -739,7 +740,6 @@ Ip6ConvertInterfaceInfoToString (
   ASSERT (IfInfo->HwAddressSize <= 32);\r
 \r
   for (Index = 0; Index < IfInfo->HwAddressSize; Index++) {\r
-\r
     if (IfInfo->HwAddress.Addr[Index] < 0x10) {\r
       CopyMem (FormatString, L"0%x-", sizeof (L"0%x-"));\r
     } else {\r
@@ -749,8 +749,8 @@ Ip6ConvertInterfaceInfoToString (
     Number = UnicodeSPrint (\r
                String,\r
                8,\r
-               (CONST CHAR16 *) FormatString,\r
-               (UINTN) IfInfo->HwAddress.Addr[Index]\r
+               (CONST CHAR16 *)FormatString,\r
+               (UINTN)IfInfo->HwAddress.Addr[Index]\r
                );\r
     String = String + Number;\r
   }\r
@@ -792,21 +792,21 @@ Ip6ConvertInterfaceInfoToString (
 **/\r
 EFI_STATUS\r
 Ip6BuildNvAddressInfo (\r
-  IN  IP6_CONFIG_INSTANCE            *Instance,\r
-  IN  IP6_CONFIG_NV_ADDRESS_TYPE     AddressType,\r
-  OUT VOID                           **AddressInfo,\r
-  OUT UINTN                          *AddressSize\r
+  IN  IP6_CONFIG_INSTANCE         *Instance,\r
+  IN  IP6_CONFIG_NV_ADDRESS_TYPE  AddressType,\r
+  OUT VOID                        **AddressInfo,\r
+  OUT UINTN                       *AddressSize\r
   )\r
 {\r
-  IP6_CONFIG_NVDATA                  *Ip6NvData;\r
-  LIST_ENTRY                         *Entry;\r
-  LIST_ENTRY                         *ListHead;\r
-  IP6_ADDRESS_INFO_ENTRY             *Node;\r
-  VOID                               *AddressList;\r
-  VOID                               *TmpStr;\r
-  UINTN                              DataSize;\r
-  EFI_IPv6_ADDRESS                   *Ip6Address;\r
-  EFI_IP6_CONFIG_MANUAL_ADDRESS      *ManualAddress;\r
+  IP6_CONFIG_NVDATA              *Ip6NvData;\r
+  LIST_ENTRY                     *Entry;\r
+  LIST_ENTRY                     *ListHead;\r
+  IP6_ADDRESS_INFO_ENTRY         *Node;\r
+  VOID                           *AddressList;\r
+  VOID                           *TmpStr;\r
+  UINTN                          DataSize;\r
+  EFI_IPv6_ADDRESS               *Ip6Address;\r
+  EFI_IP6_CONFIG_MANUAL_ADDRESS  *ManualAddress;\r
 \r
   if ((Instance == NULL) || (AddressInfo == NULL) || (AddressSize == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -839,14 +839,14 @@ Ip6BuildNvAddressInfo (
   NET_LIST_FOR_EACH (Entry, ListHead) {\r
     Node = NET_LIST_USER_STRUCT (Entry, IP6_ADDRESS_INFO_ENTRY, Link);\r
     if (AddressType == Ip6ConfigNvHostAddress) {\r
-      ManualAddress = (EFI_IP6_CONFIG_MANUAL_ADDRESS *) AddressList;\r
+      ManualAddress = (EFI_IP6_CONFIG_MANUAL_ADDRESS *)AddressList;\r
       IP6_COPY_ADDRESS (&ManualAddress->Address, &Node->AddrInfo.Address);\r
       ManualAddress->PrefixLength = Node->AddrInfo.PrefixLength;\r
-      AddressList = (UINT8 *) AddressList + sizeof (EFI_IP6_CONFIG_MANUAL_ADDRESS);\r
+      AddressList                 = (UINT8 *)AddressList + sizeof (EFI_IP6_CONFIG_MANUAL_ADDRESS);\r
     } else {\r
-      Ip6Address = (EFI_IPv6_ADDRESS *) AddressList;\r
+      Ip6Address = (EFI_IPv6_ADDRESS *)AddressList;\r
       IP6_COPY_ADDRESS (Ip6Address, &Node->AddrInfo.Address);\r
-      AddressList = (UINT8 *) AddressList + sizeof (EFI_IPv6_ADDRESS);\r
+      AddressList = (UINT8 *)AddressList + sizeof (EFI_IPv6_ADDRESS);\r
     }\r
   }\r
 \r
@@ -869,18 +869,18 @@ Ip6BuildNvAddressInfo (
 **/\r
 EFI_STATUS\r
 Ip6ConvertConfigNvDataToIfrNvData (\r
-  IN OUT IP6_CONFIG_IFR_NVDATA       *IfrNvData,\r
-  IN     IP6_CONFIG_INSTANCE         *Instance\r
+  IN OUT IP6_CONFIG_IFR_NVDATA  *IfrNvData,\r
+  IN     IP6_CONFIG_INSTANCE    *Instance\r
   )\r
 {\r
-  IP6_CONFIG_NVDATA                          *Ip6NvData;\r
-  EFI_IP6_CONFIG_PROTOCOL                    *Ip6Config;\r
-  UINTN                                      DataSize;\r
-  VOID                                       *Data;\r
-  EFI_STATUS                                 Status;\r
-  EFI_IP6_CONFIG_POLICY                      Policy;\r
-  EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS   DadXmits;\r
-  EFI_HII_HANDLE                             HiiHandle;\r
+  IP6_CONFIG_NVDATA                         *Ip6NvData;\r
+  EFI_IP6_CONFIG_PROTOCOL                   *Ip6Config;\r
+  UINTN                                     DataSize;\r
+  VOID                                      *Data;\r
+  EFI_STATUS                                Status;\r
+  EFI_IP6_CONFIG_POLICY                     Policy;\r
+  EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS  DadXmits;\r
+  EFI_HII_HANDLE                            HiiHandle;\r
 \r
   if ((IfrNvData == NULL) || (Instance == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -901,7 +901,7 @@ Ip6ConvertConfigNvDataToIfrNvData (
              Ip6Config,\r
              Ip6ConfigDataTypeInterfaceInfo,\r
              &DataSize,\r
-             (VOID **) &Data\r
+             (VOID **)&Data\r
              );\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
@@ -911,7 +911,7 @@ Ip6ConvertConfigNvDataToIfrNvData (
   // Convert the interface info to string and print.\r
   //\r
   Status = Ip6ConvertInterfaceInfoToString (\r
-             (EFI_IP6_CONFIG_INTERFACE_INFO *) Data,\r
+             (EFI_IP6_CONFIG_INTERFACE_INFO *)Data,\r
              HiiHandle,\r
              IfrNvData\r
              );\r
@@ -980,7 +980,7 @@ Ip6ConvertConfigNvDataToIfrNvData (
 \r
 Exit:\r
   if (Data != NULL) {\r
-     FreePool (Data);\r
+    FreePool (Data);\r
   }\r
 \r
   return Status;\r
@@ -1000,13 +1000,13 @@ Exit:
 **/\r
 EFI_STATUS\r
 Ip6ConvertIfrNvDataToConfigNvDataGeneral (\r
-  IN     IP6_CONFIG_IFR_NVDATA       *IfrNvData,\r
-  IN OUT IP6_CONFIG_INSTANCE         *Instance\r
+  IN     IP6_CONFIG_IFR_NVDATA  *IfrNvData,\r
+  IN OUT IP6_CONFIG_INSTANCE    *Instance\r
   )\r
 {\r
-  IP6_CONFIG_NVDATA                  *Ip6NvData;\r
-  EFI_IP6_CONFIG_PROTOCOL            *Ip6Config;\r
-  EFI_STATUS                         Status;\r
+  IP6_CONFIG_NVDATA        *Ip6NvData;\r
+  EFI_IP6_CONFIG_PROTOCOL  *Ip6Config;\r
+  EFI_STATUS               Status;\r
 \r
   if ((IfrNvData == NULL) || (Instance == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1083,19 +1083,19 @@ Ip6ConvertIfrNvDataToConfigNvDataGeneral (
 **/\r
 EFI_STATUS\r
 Ip6ConvertIfrNvDataToConfigNvDataAdvanced (\r
-  IN     IP6_CONFIG_IFR_NVDATA       *IfrNvData,\r
-  IN OUT IP6_CONFIG_INSTANCE         *Instance\r
+  IN     IP6_CONFIG_IFR_NVDATA  *IfrNvData,\r
+  IN OUT IP6_CONFIG_INSTANCE    *Instance\r
   )\r
 {\r
-  IP6_CONFIG_NVDATA                  *Ip6NvData;\r
-  EFI_IP6_CONFIG_PROTOCOL            *Ip6Config;\r
-  EFI_STATUS                         Status;\r
-  EFI_IP6_CONFIG_MANUAL_ADDRESS      *ManualAddress;\r
-  EFI_IPv6_ADDRESS                   *Address;\r
-  BOOLEAN                            IsAddressOk;\r
-  EFI_EVENT                          SetAddressEvent;\r
-  EFI_EVENT                          TimeoutEvent;\r
-  UINTN                              DataSize;\r
+  IP6_CONFIG_NVDATA              *Ip6NvData;\r
+  EFI_IP6_CONFIG_PROTOCOL        *Ip6Config;\r
+  EFI_STATUS                     Status;\r
+  EFI_IP6_CONFIG_MANUAL_ADDRESS  *ManualAddress;\r
+  EFI_IPv6_ADDRESS               *Address;\r
+  BOOLEAN                        IsAddressOk;\r
+  EFI_EVENT                      SetAddressEvent;\r
+  EFI_EVENT                      TimeoutEvent;\r
+  UINTN                          DataSize;\r
 \r
   if ((IfrNvData == NULL) || (Instance == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1164,7 +1164,7 @@ Ip6ConvertIfrNvDataToConfigNvDataAdvanced (
     Status = Ip6BuildNvAddressInfo (\r
                Instance,\r
                Ip6ConfigNvHostAddress,\r
-               (VOID **) &ManualAddress,\r
+               (VOID **)&ManualAddress,\r
                &DataSize\r
                );\r
     if (EFI_ERROR (Status)) {\r
@@ -1186,7 +1186,7 @@ Ip6ConvertIfrNvDataToConfigNvDataAdvanced (
                           Ip6Config,\r
                           Ip6ConfigDataTypeManualAddress,\r
                           DataSize,\r
-                          (VOID *) ManualAddress\r
+                          (VOID *)ManualAddress\r
                           );\r
     if (Status == EFI_NOT_READY) {\r
       gBS->SetTimer (TimeoutEvent, TimerRelative, 50000000);\r
@@ -1194,6 +1194,7 @@ Ip6ConvertIfrNvDataToConfigNvDataAdvanced (
         if (IsAddressOk) {\r
           Status = EFI_SUCCESS;\r
         }\r
+\r
         break;\r
       }\r
     }\r
@@ -1215,7 +1216,7 @@ Ip6ConvertIfrNvDataToConfigNvDataAdvanced (
     Status = Ip6BuildNvAddressInfo (\r
                Instance,\r
                Ip6ConfigNvGatewayAddress,\r
-               (VOID **) &Address,\r
+               (VOID **)&Address,\r
                &DataSize\r
                );\r
     if (EFI_ERROR (Status)) {\r
@@ -1226,7 +1227,7 @@ Ip6ConvertIfrNvDataToConfigNvDataAdvanced (
                           Ip6Config,\r
                           Ip6ConfigDataTypeGateway,\r
                           DataSize,\r
-                          (VOID *) Address\r
+                          (VOID *)Address\r
                           );\r
     if (EFI_ERROR (Status)) {\r
       goto Exit;\r
@@ -1243,7 +1244,7 @@ Ip6ConvertIfrNvDataToConfigNvDataAdvanced (
     Status = Ip6BuildNvAddressInfo (\r
                Instance,\r
                Ip6ConfigNvDnsAddress,\r
-               (VOID **) &Address,\r
+               (VOID **)&Address,\r
                &DataSize\r
                );\r
     if (EFI_ERROR (Status)) {\r
@@ -1254,7 +1255,7 @@ Ip6ConvertIfrNvDataToConfigNvDataAdvanced (
                           Ip6Config,\r
                           Ip6ConfigDataTypeDnsServer,\r
                           DataSize,\r
-                          (VOID *) Address\r
+                          (VOID *)Address\r
                           );\r
     if (EFI_ERROR (Status)) {\r
       goto Exit;\r
@@ -1283,7 +1284,6 @@ Exit:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function allows the caller to request the current\r
   configuration for one or more named elements. The resulting\r
@@ -1349,30 +1349,30 @@ Exit:
 EFI_STATUS\r
 EFIAPI\r
 Ip6FormExtractConfig (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  CONST EFI_STRING                       Request,\r
-  OUT EFI_STRING                             *Progress,\r
-  OUT EFI_STRING                             *Results\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  CONST EFI_STRING                      Request,\r
+  OUT EFI_STRING                            *Progress,\r
+  OUT EFI_STRING                            *Results\r
   )\r
 {\r
+  EFI_STATUS              Status;\r
+  IP6_FORM_CALLBACK_INFO  *Private;\r
+  IP6_CONFIG_INSTANCE     *Ip6ConfigInstance;\r
+  IP6_CONFIG_IFR_NVDATA   *IfrNvData;\r
+  EFI_STRING              ConfigRequestHdr;\r
+  EFI_STRING              ConfigRequest;\r
+  BOOLEAN                 AllocatedRequest;\r
+  UINTN                   Size;\r
+  UINTN                   BufferSize;\r
 \r
-  EFI_STATUS                                 Status;\r
-  IP6_FORM_CALLBACK_INFO                     *Private;\r
-  IP6_CONFIG_INSTANCE                        *Ip6ConfigInstance;\r
-  IP6_CONFIG_IFR_NVDATA                      *IfrNvData;\r
-  EFI_STRING                                 ConfigRequestHdr;\r
-  EFI_STRING                                 ConfigRequest;\r
-  BOOLEAN                                    AllocatedRequest;\r
-  UINTN                                      Size;\r
-  UINTN                                      BufferSize;\r
-\r
-  if (This == NULL || Progress == NULL || Results == NULL) {\r
+  if ((This == NULL) || (Progress == NULL) || (Results == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   *Progress = Request;\r
   if ((Request != NULL) &&\r
-      !HiiIsConfigHdrMatch (Request, &gIp6ConfigNvDataGuid, mIp6ConfigStorageName)) {\r
+      !HiiIsConfigHdrMatch (Request, &gIp6ConfigNvDataGuid, mIp6ConfigStorageName))\r
+  {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -1381,11 +1381,11 @@ Ip6FormExtractConfig (
   AllocatedRequest = FALSE;\r
   Size             = 0;\r
 \r
-  Private = IP6_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS (This);\r
+  Private           = IP6_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS (This);\r
   Ip6ConfigInstance = IP6_CONFIG_INSTANCE_FROM_FORM_CALLBACK (Private);\r
-  BufferSize = sizeof (IP6_CONFIG_IFR_NVDATA);\r
+  BufferSize        = sizeof (IP6_CONFIG_IFR_NVDATA);\r
 \r
-  IfrNvData = (IP6_CONFIG_IFR_NVDATA *) AllocateZeroPool (BufferSize);\r
+  IfrNvData = (IP6_CONFIG_IFR_NVDATA *)AllocateZeroPool (BufferSize);\r
   if (IfrNvData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -1407,7 +1407,7 @@ Ip6FormExtractConfig (
                          mIp6ConfigStorageName,\r
                          Private->ChildHandle\r
                          );\r
-    Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
+    Size          = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
     ConfigRequest = AllocateZeroPool (Size);\r
     ASSERT (ConfigRequest != NULL);\r
     AllocatedRequest = TRUE;\r
@@ -1416,7 +1416,7 @@ Ip6FormExtractConfig (
       Size,\r
       L"%s&OFFSET=0&WIDTH=%016LX",\r
       ConfigRequestHdr,\r
-      (UINT64) BufferSize\r
+      (UINT64)BufferSize\r
       );\r
     FreePool (ConfigRequestHdr);\r
   }\r
@@ -1427,7 +1427,7 @@ Ip6FormExtractConfig (
   Status = gHiiConfigRouting->BlockToConfig (\r
                                 gHiiConfigRouting,\r
                                 ConfigRequest,\r
-                                (UINT8 *) IfrNvData,\r
+                                (UINT8 *)IfrNvData,\r
                                 BufferSize,\r
                                 Results,\r
                                 Progress\r
@@ -1442,6 +1442,7 @@ Exit:
     FreePool (ConfigRequest);\r
     ConfigRequest = NULL;\r
   }\r
+\r
   //\r
   // Set Progress string to the original request string.\r
   //\r
@@ -1490,12 +1491,12 @@ Exit:
 EFI_STATUS\r
 EFIAPI\r
 Ip6FormRouteConfig (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  CONST EFI_STRING                       Configuration,\r
-  OUT EFI_STRING                             *Progress\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  CONST EFI_STRING                      Configuration,\r
+  OUT EFI_STRING                            *Progress\r
   )\r
 {\r
-  if (This == NULL || Configuration == NULL || Progress == NULL) {\r
+  if ((This == NULL) || (Configuration == NULL) || (Progress == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1525,17 +1526,16 @@ Ip6FormRouteConfig (
 **/\r
 EFI_STATUS\r
 Ip6GetCurrentSetting (\r
-  IN IP6_CONFIG_INSTANCE        *Instance\r
+  IN IP6_CONFIG_INSTANCE  *Instance\r
   )\r
 {\r
-  EFI_IP6_CONFIG_PROTOCOL       *Ip6Config;\r
-  EFI_HII_HANDLE                HiiHandle;\r
-  EFI_IP6_CONFIG_INTERFACE_INFO *Data;\r
-  UINTN                         DataSize;\r
-  EFI_STATUS                    Status;\r
-  CHAR16                        PortString[ADDRESS_STR_MAX_SIZE];\r
-  EFI_IP6_CONFIG_INTERFACE_INFO *IfInfo;\r
-\r
+  EFI_IP6_CONFIG_PROTOCOL        *Ip6Config;\r
+  EFI_HII_HANDLE                 HiiHandle;\r
+  EFI_IP6_CONFIG_INTERFACE_INFO  *Data;\r
+  UINTN                          DataSize;\r
+  EFI_STATUS                     Status;\r
+  CHAR16                         PortString[ADDRESS_STR_MAX_SIZE];\r
+  EFI_IP6_CONFIG_INTERFACE_INFO  *IfInfo;\r
 \r
   Ip6Config = &Instance->Ip6Config;\r
   HiiHandle = Instance->CallbackInfo.RegisteredHandle;\r
@@ -1548,7 +1548,7 @@ Ip6GetCurrentSetting (
              Ip6Config,\r
              Ip6ConfigDataTypeInterfaceInfo,\r
              &DataSize,\r
-             (VOID **) &Data\r
+             (VOID **)&Data\r
              );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -1557,7 +1557,7 @@ Ip6GetCurrentSetting (
   //\r
   // Generate dynamic text opcode for host address and draw it.\r
   //\r
-  IfInfo = (EFI_IP6_CONFIG_INTERFACE_INFO *) Data;\r
+  IfInfo = (EFI_IP6_CONFIG_INTERFACE_INFO *)Data;\r
   Status = Ip6ConvertAddressListToString (\r
              PortString,\r
              HiiHandle,\r
@@ -1590,17 +1590,18 @@ Ip6GetCurrentSetting (
   //\r
   FreePool (Data);\r
   DataSize = 0;\r
-  Data = NULL;\r
-  Status = Ip6ConfigNvGetData (\r
-             Ip6Config,\r
-             Ip6ConfigDataTypeDnsServer,\r
-             &DataSize,\r
-             (VOID **) &Data\r
-             );\r
+  Data     = NULL;\r
+  Status   = Ip6ConfigNvGetData (\r
+               Ip6Config,\r
+               Ip6ConfigDataTypeDnsServer,\r
+               &DataSize,\r
+               (VOID **)&Data\r
+               );\r
   if (EFI_ERROR (Status) && (Status != EFI_NOT_FOUND)) {\r
     if (Data != NULL) {\r
       FreePool (Data);\r
     }\r
+\r
     return Status;\r
   }\r
 \r
@@ -1629,17 +1630,18 @@ Ip6GetCurrentSetting (
   }\r
 \r
   DataSize = 0;\r
-  Data = NULL;\r
-  Status = Ip6ConfigNvGetData (\r
-             Ip6Config,\r
-             Ip6ConfigDataTypeGateway,\r
-             &DataSize,\r
-             (VOID **) &Data\r
-             );\r
+  Data     = NULL;\r
+  Status   = Ip6ConfigNvGetData (\r
+               Ip6Config,\r
+               Ip6ConfigDataTypeGateway,\r
+               &DataSize,\r
+               (VOID **)&Data\r
+               );\r
   if (EFI_ERROR (Status) && (Status != EFI_NOT_FOUND)) {\r
     if (Data != NULL) {\r
       FreePool (Data);\r
     }\r
+\r
     return Status;\r
   }\r
 \r
@@ -1697,21 +1699,21 @@ Ip6GetCurrentSetting (
 EFI_STATUS\r
 EFIAPI\r
 Ip6FormCallback (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  EFI_BROWSER_ACTION                     Action,\r
-  IN  EFI_QUESTION_ID                        QuestionId,\r
-  IN  UINT8                                  Type,\r
-  IN  EFI_IFR_TYPE_VALUE                     *Value,\r
-  OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  EFI_BROWSER_ACTION                    Action,\r
+  IN  EFI_QUESTION_ID                       QuestionId,\r
+  IN  UINT8                                 Type,\r
+  IN  EFI_IFR_TYPE_VALUE                    *Value,\r
+  OUT EFI_BROWSER_ACTION_REQUEST            *ActionRequest\r
   )\r
 {\r
-  IP6_FORM_CALLBACK_INFO        *Private;\r
-  UINTN                         BufferSize;\r
-  IP6_CONFIG_IFR_NVDATA         *IfrNvData;\r
-  EFI_STATUS                    Status;\r
-  EFI_INPUT_KEY                 Key;\r
-  IP6_CONFIG_INSTANCE           *Instance;\r
-  IP6_CONFIG_NVDATA             *Ip6NvData;\r
+  IP6_FORM_CALLBACK_INFO  *Private;\r
+  UINTN                   BufferSize;\r
+  IP6_CONFIG_IFR_NVDATA   *IfrNvData;\r
+  EFI_STATUS              Status;\r
+  EFI_INPUT_KEY           Key;\r
+  IP6_CONFIG_INSTANCE     *Instance;\r
+  IP6_CONFIG_NVDATA       *Ip6NvData;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1721,11 +1723,11 @@ Ip6FormCallback (
   Instance  = IP6_CONFIG_INSTANCE_FROM_FORM_CALLBACK (Private);\r
   Ip6NvData = &Instance->Ip6NvData;\r
 \r
-  if ((Action == EFI_BROWSER_ACTION_FORM_OPEN) || (Action == EFI_BROWSER_ACTION_FORM_CLOSE)){\r
+  if ((Action == EFI_BROWSER_ACTION_FORM_OPEN) || (Action == EFI_BROWSER_ACTION_FORM_CLOSE)) {\r
     return EFI_SUCCESS;\r
   }\r
 \r
-  if (Action != EFI_BROWSER_ACTION_CHANGING && Action != EFI_BROWSER_ACTION_CHANGED) {\r
+  if ((Action != EFI_BROWSER_ACTION_CHANGING) && (Action != EFI_BROWSER_ACTION_CHANGED)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -1738,123 +1740,124 @@ Ip6FormCallback (
   //\r
 \r
   BufferSize = sizeof (IP6_CONFIG_IFR_NVDATA);\r
-  IfrNvData = AllocateZeroPool (BufferSize);\r
+  IfrNvData  = AllocateZeroPool (BufferSize);\r
   if (IfrNvData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   Status = EFI_SUCCESS;\r
 \r
-  HiiGetBrowserData (NULL, NULL, BufferSize, (UINT8 *) IfrNvData);\r
+  HiiGetBrowserData (NULL, NULL, BufferSize, (UINT8 *)IfrNvData);\r
 \r
   if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
     switch (QuestionId) {\r
-    case KEY_GET_CURRENT_SETTING:\r
-      Status = Ip6GetCurrentSetting (Instance);\r
-      break;\r
+      case KEY_GET_CURRENT_SETTING:\r
+        Status = Ip6GetCurrentSetting (Instance);\r
+        break;\r
 \r
-    default:\r
-      break;\r
+      default:\r
+        break;\r
     }\r
   } else if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
     switch (QuestionId) {\r
-    case KEY_SAVE_CONFIG_CHANGES:\r
-      Status = Ip6ConvertIfrNvDataToConfigNvDataAdvanced (IfrNvData, Instance);\r
-      if (EFI_ERROR (Status)) {\r
-        break;\r
-      }\r
+      case KEY_SAVE_CONFIG_CHANGES:\r
+        Status = Ip6ConvertIfrNvDataToConfigNvDataAdvanced (IfrNvData, Instance);\r
+        if (EFI_ERROR (Status)) {\r
+          break;\r
+        }\r
 \r
-      Status = Ip6GetCurrentSetting (Instance);\r
+        Status = Ip6GetCurrentSetting (Instance);\r
 \r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
-      break;\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
+        break;\r
 \r
-    case KEY_IGNORE_CONFIG_CHANGES:\r
-      Ip6FreeAddressInfoList (&Ip6NvData->ManualAddress);\r
-      Ip6FreeAddressInfoList (&Ip6NvData->GatewayAddress);\r
-      Ip6FreeAddressInfoList (&Ip6NvData->DnsAddress);\r
+      case KEY_IGNORE_CONFIG_CHANGES:\r
+        Ip6FreeAddressInfoList (&Ip6NvData->ManualAddress);\r
+        Ip6FreeAddressInfoList (&Ip6NvData->GatewayAddress);\r
+        Ip6FreeAddressInfoList (&Ip6NvData->DnsAddress);\r
 \r
-      Ip6NvData->ManualAddressCount  = 0;\r
-      Ip6NvData->GatewayAddressCount = 0;\r
-      Ip6NvData->DnsAddressCount     = 0;\r
+        Ip6NvData->ManualAddressCount  = 0;\r
+        Ip6NvData->GatewayAddressCount = 0;\r
+        Ip6NvData->DnsAddressCount     = 0;\r
 \r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
-      break;\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
+        break;\r
+\r
+      case KEY_SAVE_CHANGES:\r
+        Status = Ip6ConvertIfrNvDataToConfigNvDataGeneral (IfrNvData, Instance);\r
+        if (EFI_ERROR (Status)) {\r
+          break;\r
+        }\r
 \r
-    case KEY_SAVE_CHANGES:\r
-      Status = Ip6ConvertIfrNvDataToConfigNvDataGeneral (IfrNvData, Instance);\r
-      if (EFI_ERROR (Status)) {\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
         break;\r
-      }\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
-      break;\r
 \r
-    case KEY_INTERFACE_ID:\r
-      Status = Ip6ParseInterfaceIdFromString (IfrNvData->InterfaceId, &Ip6NvData->InterfaceId);\r
-      if (EFI_ERROR (Status)) {\r
-        CreatePopUp (\r
-          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-          &Key,\r
-          L"Invalid Interface ID!",\r
-          NULL\r
-          );\r
-      }\r
+      case KEY_INTERFACE_ID:\r
+        Status = Ip6ParseInterfaceIdFromString (IfrNvData->InterfaceId, &Ip6NvData->InterfaceId);\r
+        if (EFI_ERROR (Status)) {\r
+          CreatePopUp (\r
+            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+            &Key,\r
+            L"Invalid Interface ID!",\r
+            NULL\r
+            );\r
+        }\r
 \r
-      break;\r
+        break;\r
 \r
-    case KEY_MANUAL_ADDRESS:\r
-      Status = Ip6ParseAddressListFromString (\r
-                 IfrNvData->ManualAddress,\r
-                 &Ip6NvData->ManualAddress,\r
-                 &Ip6NvData->ManualAddressCount\r
-                 );\r
-      if (EFI_ERROR (Status)) {\r
-        CreatePopUp (\r
-          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-          &Key,\r
-          L"Invalid Host Addresses!",\r
-          NULL\r
-          );\r
-      }\r
+      case KEY_MANUAL_ADDRESS:\r
+        Status = Ip6ParseAddressListFromString (\r
+                   IfrNvData->ManualAddress,\r
+                   &Ip6NvData->ManualAddress,\r
+                   &Ip6NvData->ManualAddressCount\r
+                   );\r
+        if (EFI_ERROR (Status)) {\r
+          CreatePopUp (\r
+            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+            &Key,\r
+            L"Invalid Host Addresses!",\r
+            NULL\r
+            );\r
+        }\r
 \r
-      break;\r
+        break;\r
 \r
-    case KEY_GATEWAY_ADDRESS:\r
-      Status = Ip6ParseAddressListFromString (\r
-                 IfrNvData->GatewayAddress,\r
-                 &Ip6NvData->GatewayAddress,\r
-                 &Ip6NvData->GatewayAddressCount\r
-                 );\r
-      if (EFI_ERROR (Status)) {\r
-        CreatePopUp (\r
-          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-          &Key,\r
-          L"Invalid Gateway Addresses!",\r
-          NULL\r
-          );\r
-      }\r
+      case KEY_GATEWAY_ADDRESS:\r
+        Status = Ip6ParseAddressListFromString (\r
+                   IfrNvData->GatewayAddress,\r
+                   &Ip6NvData->GatewayAddress,\r
+                   &Ip6NvData->GatewayAddressCount\r
+                   );\r
+        if (EFI_ERROR (Status)) {\r
+          CreatePopUp (\r
+            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+            &Key,\r
+            L"Invalid Gateway Addresses!",\r
+            NULL\r
+            );\r
+        }\r
 \r
-      break;\r
+        break;\r
 \r
-    case KEY_DNS_ADDRESS:\r
-      Status = Ip6ParseAddressListFromString (\r
-                 IfrNvData->DnsAddress,\r
-                 &Ip6NvData->DnsAddress,\r
-                 &Ip6NvData->DnsAddressCount\r
-                 );\r
-      if (EFI_ERROR (Status)) {\r
-        CreatePopUp (\r
-          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-          &Key,\r
-          L"Invalid DNS Addresses!",\r
-          NULL\r
-          );\r
-      }\r
+      case KEY_DNS_ADDRESS:\r
+        Status = Ip6ParseAddressListFromString (\r
+                   IfrNvData->DnsAddress,\r
+                   &Ip6NvData->DnsAddress,\r
+                   &Ip6NvData->DnsAddressCount\r
+                   );\r
+        if (EFI_ERROR (Status)) {\r
+          CreatePopUp (\r
+            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+            &Key,\r
+            L"Invalid DNS Addresses!",\r
+            NULL\r
+            );\r
+        }\r
 \r
-      break;\r
+        break;\r
 \r
-    default:\r
-      break;\r
+      default:\r
+        break;\r
     }\r
   }\r
 \r
@@ -1863,7 +1866,7 @@ Ip6FormCallback (
     // Pass changed uncommitted data back to Form Browser.\r
     //\r
     BufferSize = sizeof (IP6_CONFIG_IFR_NVDATA);\r
-    HiiSetBrowserData (NULL, NULL, BufferSize, (UINT8 *) IfrNvData, NULL);\r
+    HiiSetBrowserData (NULL, NULL, BufferSize, (UINT8 *)IfrNvData, NULL);\r
   }\r
 \r
   FreePool (IfrNvData);\r
@@ -1882,20 +1885,20 @@ Ip6FormCallback (
 **/\r
 EFI_STATUS\r
 Ip6ConfigFormInit (\r
-  IN OUT IP6_CONFIG_INSTANCE     *Instance\r
+  IN OUT IP6_CONFIG_INSTANCE  *Instance\r
   )\r
 {\r
-  EFI_STATUS                     Status;\r
-  IP6_SERVICE                    *IpSb;\r
-  IP6_FORM_CALLBACK_INFO         *CallbackInfo;\r
-  EFI_HII_CONFIG_ACCESS_PROTOCOL *ConfigAccess;\r
-  VENDOR_DEVICE_PATH             VendorDeviceNode;\r
-  EFI_SERVICE_BINDING_PROTOCOL   *MnpSb;\r
-  CHAR16                         *MacString;\r
-  CHAR16                         MenuString[128];\r
-  CHAR16                         PortString[128];\r
-  CHAR16                         *OldMenuString;\r
-  EFI_DEVICE_PATH_PROTOCOL       *ParentDevicePath;\r
+  EFI_STATUS                      Status;\r
+  IP6_SERVICE                     *IpSb;\r
+  IP6_FORM_CALLBACK_INFO          *CallbackInfo;\r
+  EFI_HII_CONFIG_ACCESS_PROTOCOL  *ConfigAccess;\r
+  VENDOR_DEVICE_PATH              VendorDeviceNode;\r
+  EFI_SERVICE_BINDING_PROTOCOL    *MnpSb;\r
+  CHAR16                          *MacString;\r
+  CHAR16                          MenuString[128];\r
+  CHAR16                          PortString[128];\r
+  CHAR16                          *OldMenuString;\r
+  EFI_DEVICE_PATH_PROTOCOL        *ParentDevicePath;\r
 \r
   IpSb = IP6_SERVICE_FROM_IP6_CONFIG_INSTANCE (Instance);\r
   ASSERT (IpSb != NULL);\r
@@ -1903,13 +1906,13 @@ Ip6ConfigFormInit (
   Status = gBS->HandleProtocol (\r
                   IpSb->Controller,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &ParentDevicePath\r
+                  (VOID **)&ParentDevicePath\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  CallbackInfo = &Instance->CallbackInfo;\r
+  CallbackInfo            = &Instance->CallbackInfo;\r
   CallbackInfo->Signature = IP6_FORM_CALLBACK_INFO_SIGNATURE;\r
 \r
   //\r
@@ -1926,7 +1929,7 @@ Ip6ConfigFormInit (
   SetDevicePathNodeLength (&VendorDeviceNode.Header, sizeof (VENDOR_DEVICE_PATH));\r
   CallbackInfo->HiiVendorDevicePath = AppendDevicePathNode (\r
                                         ParentDevicePath,\r
-                                        (EFI_DEVICE_PATH_PROTOCOL *) &VendorDeviceNode\r
+                                        (EFI_DEVICE_PATH_PROTOCOL *)&VendorDeviceNode\r
                                         );\r
   if (CallbackInfo->HiiVendorDevicePath == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
@@ -1956,7 +1959,7 @@ Ip6ConfigFormInit (
     Status = gBS->OpenProtocol (\r
                     IpSb->Controller,\r
                     &gEfiManagedNetworkServiceBindingProtocolGuid,\r
-                    (VOID **) &MnpSb,\r
+                    (VOID **)&MnpSb,\r
                     IpSb->Image,\r
                     CallbackInfo->ChildHandle,\r
                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -1990,8 +1993,9 @@ Ip6ConfigFormInit (
     OldMenuString = HiiGetString (\r
                       CallbackInfo->RegisteredHandle,\r
                       STRING_TOKEN (STR_IP6_CONFIG_FORM_HELP),\r
-                      NULL)\r
-                      ;\r
+                      NULL\r
+                      )\r
+    ;\r
     UnicodeSPrint (MenuString, 128, L"%s (MAC:%s)", OldMenuString, MacString);\r
     HiiSetString (\r
       CallbackInfo->RegisteredHandle,\r
@@ -2030,12 +2034,12 @@ Error:
 **/\r
 VOID\r
 Ip6ConfigFormUnload (\r
-  IN OUT IP6_CONFIG_INSTANCE     *Instance\r
+  IN OUT IP6_CONFIG_INSTANCE  *Instance\r
   )\r
 {\r
-  IP6_SERVICE                    *IpSb;\r
-  IP6_FORM_CALLBACK_INFO         *CallbackInfo;\r
-  IP6_CONFIG_NVDATA              *Ip6NvData;\r
+  IP6_SERVICE             *IpSb;\r
+  IP6_FORM_CALLBACK_INFO  *CallbackInfo;\r
+  IP6_CONFIG_NVDATA       *Ip6NvData;\r
 \r
   IpSb = IP6_SERVICE_FROM_IP6_CONFIG_INSTANCE (Instance);\r
   ASSERT (IpSb != NULL);\r
@@ -2043,7 +2047,6 @@ Ip6ConfigFormUnload (
   CallbackInfo = &Instance->CallbackInfo;\r
 \r
   if (CallbackInfo->ChildHandle != NULL) {\r
-\r
     //\r
     // Close the child handle\r
     //\r
index d4840270cbfa9fcf9c2e22647c66dcf1bcadad19..063bc8e461e65d7a398efdb59755bfc35ff66f62 100644 (file)
 extern UINT8  Ip6ConfigBin[];\r
 extern UINT8  Ip6DxeStrings[];\r
 \r
-#define IP6_ETHERNET              L"Ethernet"\r
-#define IP6_EXPERIMENTAL_ETHERNET L"Experimental Ethernet"\r
-#define IP6_ADDRESS_DELIMITER     L' '\r
-#define IP6_LINK_LOCAL_PREFIX     L"FE80::"\r
+#define IP6_ETHERNET               L"Ethernet"\r
+#define IP6_EXPERIMENTAL_ETHERNET  L"Experimental Ethernet"\r
+#define IP6_ADDRESS_DELIMITER      L' '\r
+#define IP6_LINK_LOCAL_PREFIX      L"FE80::"\r
 \r
 typedef enum {\r
   Ip6InterfaceTypeEthernet = 1,\r
@@ -45,7 +45,7 @@ typedef enum {
 **/\r
 EFI_STATUS\r
 Ip6ConfigFormInit (\r
-  IN OUT IP6_CONFIG_INSTANCE     *Instance\r
+  IN OUT IP6_CONFIG_INSTANCE  *Instance\r
   );\r
 \r
 /**\r
@@ -56,7 +56,7 @@ Ip6ConfigFormInit (
 **/\r
 VOID\r
 Ip6ConfigFormUnload (\r
-  IN OUT IP6_CONFIG_INSTANCE     *Instance\r
+  IN OUT IP6_CONFIG_INSTANCE  *Instance\r
   );\r
 \r
 #endif\r
index 80ce5b5d0a89cd40673c10311d9a5bd57457d568..b483a7d136d975ca5d6aea94c87cc2158465f303 100644 (file)
@@ -10,7 +10,7 @@
 \r
 #include "Ip6Impl.h"\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gIp6DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gIp6DriverBinding = {\r
   Ip6DriverBindingSupported,\r
   Ip6DriverBindingStart,\r
   Ip6DriverBindingStop,\r
@@ -35,13 +35,14 @@ IpSec2InstalledCallback (
   IN VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
+  EFI_STATUS  Status;\r
+\r
   //\r
   // Test if protocol was even found.\r
   // Notification function will be called at least once.\r
   //\r
   Status = gBS->LocateProtocol (&gEfiIpSec2ProtocolGuid, NULL, (VOID **)&mIpSec);\r
-  if (Status == EFI_SUCCESS && mIpSec != NULL) {\r
+  if ((Status == EFI_SUCCESS) && (mIpSec != NULL)) {\r
     //\r
     // Close the event so it does not get called again.\r
     //\r
@@ -69,11 +70,11 @@ IpSec2InstalledCallback (
 EFI_STATUS\r
 EFIAPI\r
 Ip6DriverEntryPoint (\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
-  VOID            *Registration;\r
+  VOID  *Registration;\r
 \r
   EfiCreateProtocolNotifyEvent (\r
     &gEfiIpSec2ProtocolGuid,\r
@@ -142,14 +143,14 @@ Ip6DriverBindingSupported (
 **/\r
 EFI_STATUS\r
 Ip6CleanService (\r
-  IN IP6_SERVICE            *IpSb\r
+  IN IP6_SERVICE  *IpSb\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_IPv6_ADDRESS          AllNodes;\r
-  IP6_NEIGHBOR_ENTRY        *NeighborCache;\r
+  EFI_STATUS          Status;\r
+  EFI_IPv6_ADDRESS    AllNodes;\r
+  IP6_NEIGHBOR_ENTRY  *NeighborCache;\r
 \r
-  IpSb->State     = IP6_SERVICE_DESTROY;\r
+  IpSb->State = IP6_SERVICE_DESTROY;\r
 \r
   if (IpSb->Timer != NULL) {\r
     gBS->SetTimer (IpSb->Timer, TimerCancel, 0);\r
@@ -207,11 +208,11 @@ Ip6CleanService (
       IpSb->Mnp->Cancel (IpSb->Mnp, NULL);\r
       IpSb->Mnp->Configure (IpSb->Mnp, NULL);\r
       gBS->CloseProtocol (\r
-            IpSb->MnpChildHandle,\r
-            &gEfiManagedNetworkProtocolGuid,\r
-            IpSb->Image,\r
-            IpSb->Controller\r
-            );\r
+             IpSb->MnpChildHandle,\r
+             &gEfiManagedNetworkProtocolGuid,\r
+             IpSb->Image,\r
+             IpSb->Controller\r
+             );\r
 \r
       IpSb->Mnp = NULL;\r
     }\r
@@ -256,9 +257,9 @@ Ip6CleanService (
 **/\r
 EFI_STATUS\r
 Ip6CreateService (\r
-  IN  EFI_HANDLE            Controller,\r
-  IN  EFI_HANDLE            ImageHandle,\r
-  OUT IP6_SERVICE           **Service\r
+  IN  EFI_HANDLE   Controller,\r
+  IN  EFI_HANDLE   ImageHandle,\r
+  OUT IP6_SERVICE  **Service\r
   )\r
 {\r
   IP6_SERVICE                           *IpSb;\r
@@ -286,60 +287,60 @@ Ip6CreateService (
   IpSb->ServiceBinding.DestroyChild = Ip6ServiceBindingDestroyChild;\r
   IpSb->State                       = IP6_SERVICE_UNSTARTED;\r
 \r
-  IpSb->NumChildren                 = 0;\r
+  IpSb->NumChildren = 0;\r
   InitializeListHead (&IpSb->Children);\r
 \r
   InitializeListHead (&IpSb->Interfaces);\r
-  IpSb->DefaultInterface            = NULL;\r
-  IpSb->RouteTable                  = NULL;\r
+  IpSb->DefaultInterface = NULL;\r
+  IpSb->RouteTable       = NULL;\r
 \r
-  IpSb->RecvRequest.Signature       = IP6_LINK_RX_SIGNATURE;\r
-  IpSb->RecvRequest.CallBack        = NULL;\r
-  IpSb->RecvRequest.Context         = NULL;\r
-  MnpToken                          = &IpSb->RecvRequest.MnpToken;\r
-  MnpToken->Event                   = NULL;\r
-  MnpToken->Status                  = EFI_NOT_READY;\r
-  MnpToken->Packet.RxData           = NULL;\r
+  IpSb->RecvRequest.Signature = IP6_LINK_RX_SIGNATURE;\r
+  IpSb->RecvRequest.CallBack  = NULL;\r
+  IpSb->RecvRequest.Context   = NULL;\r
+  MnpToken                    = &IpSb->RecvRequest.MnpToken;\r
+  MnpToken->Event             = NULL;\r
+  MnpToken->Status            = EFI_NOT_READY;\r
+  MnpToken->Packet.RxData     = NULL;\r
 \r
   Ip6CreateAssembleTable (&IpSb->Assemble);\r
 \r
-  IpSb->MldCtrl.Mldv1QuerySeen      = 0;\r
+  IpSb->MldCtrl.Mldv1QuerySeen = 0;\r
   InitializeListHead (&IpSb->MldCtrl.Groups);\r
 \r
   ZeroMem (&IpSb->LinkLocalAddr, sizeof (EFI_IPv6_ADDRESS));\r
-  IpSb->LinkLocalOk                 = FALSE;\r
-  IpSb->LinkLocalDadFail            = FALSE;\r
-  IpSb->Dhcp6NeedStart              = FALSE;\r
-  IpSb->Dhcp6NeedInfoRequest        = FALSE;\r
-\r
-  IpSb->CurHopLimit                 = IP6_HOP_LIMIT;\r
-  IpSb->LinkMTU                     = IP6_MIN_LINK_MTU;\r
-  IpSb->BaseReachableTime           = IP6_REACHABLE_TIME;\r
+  IpSb->LinkLocalOk          = FALSE;\r
+  IpSb->LinkLocalDadFail     = FALSE;\r
+  IpSb->Dhcp6NeedStart       = FALSE;\r
+  IpSb->Dhcp6NeedInfoRequest = FALSE;\r
+\r
+  IpSb->CurHopLimit       = IP6_HOP_LIMIT;\r
+  IpSb->LinkMTU           = IP6_MIN_LINK_MTU;\r
+  IpSb->BaseReachableTime = IP6_REACHABLE_TIME;\r
   Ip6UpdateReachableTime (IpSb);\r
   //\r
   // RFC4861 RETRANS_TIMER: 1,000 milliseconds\r
   //\r
-  IpSb->RetransTimer                = IP6_RETRANS_TIMER;\r
+  IpSb->RetransTimer = IP6_RETRANS_TIMER;\r
 \r
-  IpSb->RoundRobin                  = 0;\r
+  IpSb->RoundRobin = 0;\r
 \r
   InitializeListHead (&IpSb->NeighborTable);\r
   InitializeListHead (&IpSb->DefaultRouterList);\r
   InitializeListHead (&IpSb->OnlinkPrefix);\r
   InitializeListHead (&IpSb->AutonomousPrefix);\r
 \r
-  IpSb->InterfaceIdLen              = IP6_IF_ID_LEN;\r
-  IpSb->InterfaceId                 = NULL;\r
+  IpSb->InterfaceIdLen = IP6_IF_ID_LEN;\r
+  IpSb->InterfaceId    = NULL;\r
 \r
-  IpSb->RouterAdvertiseReceived     = FALSE;\r
-  IpSb->SolicitTimer                = IP6_MAX_RTR_SOLICITATIONS;\r
-  IpSb->Ticks                       = 0;\r
+  IpSb->RouterAdvertiseReceived = FALSE;\r
+  IpSb->SolicitTimer            = IP6_MAX_RTR_SOLICITATIONS;\r
+  IpSb->Ticks                   = 0;\r
 \r
-  IpSb->Image                       = ImageHandle;\r
-  IpSb->Controller                  = Controller;\r
+  IpSb->Image      = ImageHandle;\r
+  IpSb->Controller = Controller;\r
 \r
-  IpSb->MnpChildHandle              = NULL;\r
-  IpSb->Mnp                         = NULL;\r
+  IpSb->MnpChildHandle = NULL;\r
+  IpSb->Mnp            = NULL;\r
 \r
   Config                            = &IpSb->MnpConfigData;\r
   Config->ReceivedQueueTimeoutValue = 0;\r
@@ -355,12 +356,12 @@ Ip6CreateService (
 \r
   ZeroMem (&IpSb->SnpMode, sizeof (EFI_SIMPLE_NETWORK_MODE));\r
 \r
-  IpSb->Timer                       = NULL;\r
-  IpSb->FasterTimer                 = NULL;\r
+  IpSb->Timer       = NULL;\r
+  IpSb->FasterTimer = NULL;\r
 \r
   ZeroMem (&IpSb->Ip6ConfigInstance, sizeof (IP6_CONFIG_INSTANCE));\r
 \r
-  IpSb->MacString                   = NULL;\r
+  IpSb->MacString = NULL;\r
 \r
   //\r
   // Create various resources. First create the route table, timer\r
@@ -408,7 +409,7 @@ Ip6CreateService (
   Status = gBS->OpenProtocol (\r
                   IpSb->MnpChildHandle,\r
                   &gEfiManagedNetworkProtocolGuid,\r
-                  (VOID **) (&IpSb->Mnp),\r
+                  (VOID **)(&IpSb->Mnp),\r
                   ImageHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -434,6 +435,7 @@ Ip6CreateService (
     //\r
     IpSb->MaxPacketSize -= NET_VLAN_TAG_LEN;\r
   }\r
+\r
   IpSb->OldMaxPacketSize = IpSb->MaxPacketSize;\r
 \r
   //\r
@@ -489,7 +491,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Start this driver on ControllerHandle.\r
 \r
@@ -511,10 +512,10 @@ Ip6DriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  IP6_SERVICE               *IpSb;\r
-  EFI_STATUS                Status;\r
-  EFI_IP6_CONFIG_PROTOCOL   *Ip6Cfg;\r
-  IP6_CONFIG_DATA_ITEM      *DataItem;\r
+  IP6_SERVICE              *IpSb;\r
+  EFI_STATUS               Status;\r
+  EFI_IP6_CONFIG_PROTOCOL  *Ip6Cfg;\r
+  IP6_CONFIG_DATA_ITEM     *DataItem;\r
 \r
   IpSb     = NULL;\r
   Ip6Cfg   = NULL;\r
@@ -544,7 +545,7 @@ Ip6DriverBindingStart (
 \r
   ASSERT (IpSb != NULL);\r
 \r
-  Ip6Cfg  = &IpSb->Ip6ConfigInstance.Ip6Config;\r
+  Ip6Cfg = &IpSb->Ip6ConfigInstance.Ip6Config;\r
 \r
   //\r
   // Install the Ip6ServiceBinding Protocol onto ControllerHandle\r
@@ -581,7 +582,7 @@ Ip6DriverBindingStart (
                        DataItem->DataSize,\r
                        DataItem->Data.Ptr\r
                        );\r
-    if (Status == EFI_INVALID_PARAMETER || Status == EFI_BAD_BUFFER_SIZE) {\r
+    if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_BAD_BUFFER_SIZE)) {\r
       //\r
       // Clean the invalid ManualAddress configuration.\r
       //\r
@@ -606,7 +607,7 @@ Ip6DriverBindingStart (
                        DataItem->DataSize,\r
                        DataItem->Data.Ptr\r
                        );\r
-    if (Status == EFI_INVALID_PARAMETER || Status == EFI_BAD_BUFFER_SIZE) {\r
+    if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_BAD_BUFFER_SIZE)) {\r
       //\r
       // Clean the invalid Gateway configuration.\r
       //\r
@@ -688,8 +689,8 @@ FREE_SERVICE:
 EFI_STATUS\r
 EFIAPI\r
 Ip6DestroyChildEntryInHandleBuffer (\r
-  IN LIST_ENTRY         *Entry,\r
-  IN VOID               *Context\r
+  IN LIST_ENTRY  *Entry,\r
+  IN VOID        *Context\r
   )\r
 {\r
   IP6_PROTOCOL                  *IpInstance;\r
@@ -697,14 +698,14 @@ Ip6DestroyChildEntryInHandleBuffer (
   UINTN                         NumberOfChildren;\r
   EFI_HANDLE                    *ChildHandleBuffer;\r
 \r
-  if (Entry == NULL || Context == NULL) {\r
+  if ((Entry == NULL) || (Context == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  IpInstance = NET_LIST_USER_STRUCT_S (Entry, IP6_PROTOCOL, Link, IP6_PROTOCOL_SIGNATURE);\r
-  ServiceBinding    = ((IP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ServiceBinding;\r
-  NumberOfChildren  = ((IP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->NumberOfChildren;\r
-  ChildHandleBuffer = ((IP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ChildHandleBuffer;\r
+  IpInstance        = NET_LIST_USER_STRUCT_S (Entry, IP6_PROTOCOL, Link, IP6_PROTOCOL_SIGNATURE);\r
+  ServiceBinding    = ((IP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ServiceBinding;\r
+  NumberOfChildren  = ((IP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->NumberOfChildren;\r
+  ChildHandleBuffer = ((IP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ChildHandleBuffer;\r
 \r
   if (!NetIsInHandleBuffer (IpInstance->Handle, NumberOfChildren, ChildHandleBuffer)) {\r
     return EFI_SUCCESS;\r
@@ -736,14 +737,14 @@ Ip6DriverBindingStop (
   IN  EFI_HANDLE                   *ChildHandleBuffer OPTIONAL\r
   )\r
 {\r
-  EFI_SERVICE_BINDING_PROTOCOL            *ServiceBinding;\r
-  IP6_SERVICE                             *IpSb;\r
-  EFI_HANDLE                              NicHandle;\r
-  EFI_STATUS                              Status;\r
-  LIST_ENTRY                              *List;\r
-  INTN                                    State;\r
-  BOOLEAN                                 IsDhcp6;\r
-  IP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT Context;\r
+  EFI_SERVICE_BINDING_PROTOCOL             *ServiceBinding;\r
+  IP6_SERVICE                              *IpSb;\r
+  EFI_HANDLE                               NicHandle;\r
+  EFI_STATUS                               Status;\r
+  LIST_ENTRY                               *List;\r
+  INTN                                     State;\r
+  BOOLEAN                                  IsDhcp6;\r
+  IP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT  Context;\r
 \r
   IsDhcp6   = FALSE;\r
   NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiManagedNetworkProtocolGuid);\r
@@ -759,7 +760,7 @@ Ip6DriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   NicHandle,\r
                   &gEfiIp6ServiceBindingProtocolGuid,\r
-                  (VOID **) &ServiceBinding,\r
+                  (VOID **)&ServiceBinding,\r
                   This->DriverBindingHandle,\r
                   NicHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -778,18 +779,18 @@ Ip6DriverBindingStop (
     //\r
     // NumberOfChildren is not zero, destroy the IP6 children instances in ChildHandleBuffer.\r
     //\r
-    List = &IpSb->Children;\r
+    List                      = &IpSb->Children;\r
     Context.ServiceBinding    = ServiceBinding;\r
     Context.NumberOfChildren  = NumberOfChildren;\r
     Context.ChildHandleBuffer = ChildHandleBuffer;\r
-    Status = NetDestroyLinkList (\r
-               List,\r
-               Ip6DestroyChildEntryInHandleBuffer,\r
-               &Context,\r
-               NULL\r
-               );\r
+    Status                    = NetDestroyLinkList (\r
+                                  List,\r
+                                  Ip6DestroyChildEntryInHandleBuffer,\r
+                                  &Context,\r
+                                  NULL\r
+                                  );\r
   } else if (IsListEmpty (&IpSb->Children)) {\r
-    State           = IpSb->State;\r
+    State  = IpSb->State;\r
     Status = Ip6CleanService (IpSb);\r
     if (EFI_ERROR (Status)) {\r
       IpSb->State = State;\r
@@ -813,7 +814,6 @@ Exit:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Creates a child handle with a set of I/O services.\r
 \r
@@ -836,17 +836,17 @@ Ip6ServiceBindingCreateChild (
   IN EFI_HANDLE                    *ChildHandle\r
   )\r
 {\r
-  IP6_SERVICE               *IpSb;\r
-  IP6_PROTOCOL              *IpInstance;\r
-  EFI_TPL                   OldTpl;\r
-  EFI_STATUS                Status;\r
-  VOID                      *Mnp;\r
+  IP6_SERVICE   *IpSb;\r
+  IP6_PROTOCOL  *IpInstance;\r
+  EFI_TPL       OldTpl;\r
+  EFI_STATUS    Status;\r
+  VOID          *Mnp;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  IpSb       = IP6_SERVICE_FROM_PROTOCOL (This);\r
+  IpSb = IP6_SERVICE_FROM_PROTOCOL (This);\r
 \r
   if (IpSb->LinkLocalDadFail) {\r
     return EFI_DEVICE_ERROR;\r
@@ -881,7 +881,7 @@ Ip6ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   IpSb->MnpChildHandle,\r
                   &gEfiManagedNetworkProtocolGuid,\r
-                  (VOID **) &Mnp,\r
+                  (VOID **)&Mnp,\r
                   gIp6DriverBinding.DriverBindingHandle,\r
                   IpInstance->Handle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -910,7 +910,6 @@ Ip6ServiceBindingCreateChild (
 ON_ERROR:\r
 \r
   if (EFI_ERROR (Status)) {\r
-\r
     Ip6CleanProtocol (IpInstance);\r
 \r
     FreePool (IpInstance);\r
@@ -942,11 +941,11 @@ Ip6ServiceBindingDestroyChild (
   IN EFI_HANDLE                    ChildHandle\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  IP6_SERVICE               *IpSb;\r
-  IP6_PROTOCOL              *IpInstance;\r
-  EFI_IP6_PROTOCOL          *Ip6;\r
-  EFI_TPL                   OldTpl;\r
+  EFI_STATUS        Status;\r
+  IP6_SERVICE       *IpSb;\r
+  IP6_PROTOCOL      *IpInstance;\r
+  EFI_IP6_PROTOCOL  *Ip6;\r
+  EFI_TPL           OldTpl;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -955,12 +954,12 @@ Ip6ServiceBindingDestroyChild (
   //\r
   // Retrieve the private context data structures\r
   //\r
-  IpSb   = IP6_SERVICE_FROM_PROTOCOL (This);\r
+  IpSb = IP6_SERVICE_FROM_PROTOCOL (This);\r
 \r
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiIp6ProtocolGuid,\r
-                  (VOID **) &Ip6,\r
+                  (VOID **)&Ip6,\r
                   gIp6DriverBinding.DriverBindingHandle,\r
                   ChildHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
index 007f687c6e25be8890ea9d032e686542f8159b02..996dbe4f7a6929e2e89f9fa46aa2b0b877141895 100644 (file)
 #ifndef __EFI_IP6_DRIVER_H__\r
 #define __EFI_IP6_DRIVER_H__\r
 \r
-extern EFI_DRIVER_BINDING_PROTOCOL  gIp6DriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL  gIp6ComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL gIp6ComponentName2;\r
-extern EFI_UNICODE_STRING_TABLE     *gIp6ControllerNameTable;\r
+extern EFI_DRIVER_BINDING_PROTOCOL   gIp6DriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gIp6ComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gIp6ComponentName2;\r
+extern EFI_UNICODE_STRING_TABLE      *gIp6ControllerNameTable;\r
 \r
 typedef struct {\r
-  EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
-  UINTN                         NumberOfChildren;\r
-  EFI_HANDLE                    *ChildHandleBuffer;\r
-}IP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT;\r
+  EFI_SERVICE_BINDING_PROTOCOL    *ServiceBinding;\r
+  UINTN                           NumberOfChildren;\r
+  EFI_HANDLE                      *ChildHandleBuffer;\r
+} IP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT;\r
 \r
 /**\r
   Clean up an IP6 service binding instance. It releases all\r
@@ -36,7 +36,7 @@ typedef struct {
 **/\r
 EFI_STATUS\r
 Ip6CleanService (\r
-  IN IP6_SERVICE            *IpSb\r
+  IN IP6_SERVICE  *IpSb\r
   );\r
 \r
 //\r
@@ -61,8 +61,8 @@ Ip6CleanService (
 EFI_STATUS\r
 EFIAPI\r
 Ip6DriverEntryPoint (\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
 //\r
index d43121e4cb9ee2df5fcc0d7d8fead1ad93fc22ad..a0e4d25db774c7f857f0ee8c88d61756b2f5d1b5 100644 (file)
@@ -10,8 +10,7 @@
 \r
 #include "Ip6Impl.h"\r
 \r
-EFI_IP6_ICMP_TYPE mIp6SupportedIcmp[23] = {\r
-\r
+EFI_IP6_ICMP_TYPE  mIp6SupportedIcmp[23] = {\r
   {\r
     ICMP_V6_DEST_UNREACHABLE,\r
     ICMP_V6_NO_ROUTE_TO_DEST\r
@@ -127,15 +126,15 @@ EFI_IP6_ICMP_TYPE mIp6SupportedIcmp[23] = {
 **/\r
 EFI_STATUS\r
 Ip6IcmpReplyEcho (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   )\r
 {\r
-  IP6_ICMP_INFORMATION_HEAD *Icmp;\r
-  NET_BUF                   *Data;\r
-  EFI_STATUS                Status;\r
-  EFI_IP6_HEADER            ReplyHead;\r
+  IP6_ICMP_INFORMATION_HEAD  *Icmp;\r
+  NET_BUF                    *Data;\r
+  EFI_STATUS                 Status;\r
+  EFI_IP6_HEADER             ReplyHead;\r
 \r
   Status = EFI_OUT_OF_RESOURCES;\r
   //\r
@@ -153,7 +152,7 @@ Ip6IcmpReplyEcho (
   // use specific destination. See RFC1122. SRR/RR option\r
   // update is omitted.\r
   //\r
-  Icmp = (IP6_ICMP_INFORMATION_HEAD *) NetbufGetByte (Data, 0, NULL);\r
+  Icmp = (IP6_ICMP_INFORMATION_HEAD *)NetbufGetByte (Data, 0, NULL);\r
   if (Icmp == NULL) {\r
     NetbufFree (Data);\r
     goto Exit;\r
@@ -169,9 +168,9 @@ Ip6IcmpReplyEcho (
   //\r
   ZeroMem (&ReplyHead, sizeof (EFI_IP6_HEADER));\r
 \r
-  ReplyHead.PayloadLength  = HTONS ((UINT16) (Packet->TotalSize));\r
-  ReplyHead.NextHeader     = IP6_ICMP;\r
-  ReplyHead.HopLimit       = IpSb->CurHopLimit;\r
+  ReplyHead.PayloadLength = HTONS ((UINT16)(Packet->TotalSize));\r
+  ReplyHead.NextHeader    = IP6_ICMP;\r
+  ReplyHead.HopLimit      = IpSb->CurHopLimit;\r
   IP6_COPY_ADDRESS (&ReplyHead.DestinationAddress, &Head->SourceAddress);\r
 \r
   if (Ip6IsOneOfSetAddress (IpSb, &Head->DestinationAddress, NULL, NULL)) {\r
@@ -218,17 +217,17 @@ Exit:
 **/\r
 EFI_STATUS\r
 Ip6ProcessPacketTooBig (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   )\r
 {\r
-  IP6_ICMP_ERROR_HEAD       Icmp;\r
-  UINT32                    Mtu;\r
-  IP6_ROUTE_ENTRY           *RouteEntry;\r
-  EFI_IPv6_ADDRESS          *DestAddress;\r
+  IP6_ICMP_ERROR_HEAD  Icmp;\r
+  UINT32               Mtu;\r
+  IP6_ROUTE_ENTRY      *RouteEntry;\r
+  EFI_IPv6_ADDRESS     *DestAddress;\r
 \r
-  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *) &Icmp);\r
+  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *)&Icmp);\r
   Mtu         = NTOHL (Icmp.Fourth);\r
   DestAddress = &Icmp.IpHead.DestinationAddress;\r
 \r
@@ -280,12 +279,12 @@ Ip6ProcessPacketTooBig (
 **/\r
 EFI_STATUS\r
 Ip6ProcessIcmpError (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   )\r
 {\r
-  IP6_ICMP_ERROR_HEAD       Icmp;\r
+  IP6_ICMP_ERROR_HEAD  Icmp;\r
 \r
   //\r
   // Check the validity of the packet\r
@@ -294,7 +293,7 @@ Ip6ProcessIcmpError (
     goto DROP;\r
   }\r
 \r
-  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *) &Icmp);\r
+  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *)&Icmp);\r
   if (Icmp.Head.Type == ICMP_V6_PACKET_TOO_BIG) {\r
     return Ip6ProcessPacketTooBig (IpSb, Head, Packet);\r
   }\r
@@ -329,55 +328,56 @@ DROP:
 **/\r
 EFI_STATUS\r
 Ip6ProcessIcmpInformation (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   )\r
 {\r
-  IP6_ICMP_INFORMATION_HEAD Icmp;\r
-  EFI_STATUS                Status;\r
+  IP6_ICMP_INFORMATION_HEAD  Icmp;\r
+  EFI_STATUS                 Status;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
   NET_CHECK_SIGNATURE (Packet, NET_BUF_SIGNATURE);\r
   ASSERT (Head != NULL);\r
 \r
-  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *) &Icmp);\r
+  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *)&Icmp);\r
   Status = EFI_INVALID_PARAMETER;\r
 \r
   switch (Icmp.Head.Type) {\r
-  case ICMP_V6_ECHO_REQUEST:\r
-    //\r
-    // If ICMPv6 echo, reply it\r
-    //\r
-    if (Icmp.Head.Code == 0) {\r
-      Status = Ip6IcmpReplyEcho (IpSb, Head, Packet);\r
-    }\r
-    break;\r
-  case ICMP_V6_LISTENER_QUERY:\r
-    Status = Ip6ProcessMldQuery (IpSb, Head, Packet);\r
-    break;\r
-  case ICMP_V6_LISTENER_REPORT:\r
-  case ICMP_V6_LISTENER_REPORT_2:\r
-    Status = Ip6ProcessMldReport (IpSb, Head, Packet);\r
-    break;\r
-  case ICMP_V6_NEIGHBOR_SOLICIT:\r
-    Status = Ip6ProcessNeighborSolicit (IpSb, Head, Packet);\r
-    break;\r
-  case ICMP_V6_NEIGHBOR_ADVERTISE:\r
-    Status = Ip6ProcessNeighborAdvertise (IpSb, Head, Packet);\r
-    break;\r
-  case ICMP_V6_ROUTER_ADVERTISE:\r
-    Status = Ip6ProcessRouterAdvertise (IpSb, Head, Packet);\r
-    break;\r
-  case ICMP_V6_REDIRECT:\r
-    Status = Ip6ProcessRedirect (IpSb, Head, Packet);\r
-    break;\r
-  case ICMP_V6_ECHO_REPLY:\r
-    Status = Ip6Demultiplex (IpSb, Head, Packet);\r
-    break;\r
-  default:\r
-    Status = EFI_INVALID_PARAMETER;\r
-    break;\r
+    case ICMP_V6_ECHO_REQUEST:\r
+      //\r
+      // If ICMPv6 echo, reply it\r
+      //\r
+      if (Icmp.Head.Code == 0) {\r
+        Status = Ip6IcmpReplyEcho (IpSb, Head, Packet);\r
+      }\r
+\r
+      break;\r
+    case ICMP_V6_LISTENER_QUERY:\r
+      Status = Ip6ProcessMldQuery (IpSb, Head, Packet);\r
+      break;\r
+    case ICMP_V6_LISTENER_REPORT:\r
+    case ICMP_V6_LISTENER_REPORT_2:\r
+      Status = Ip6ProcessMldReport (IpSb, Head, Packet);\r
+      break;\r
+    case ICMP_V6_NEIGHBOR_SOLICIT:\r
+      Status = Ip6ProcessNeighborSolicit (IpSb, Head, Packet);\r
+      break;\r
+    case ICMP_V6_NEIGHBOR_ADVERTISE:\r
+      Status = Ip6ProcessNeighborAdvertise (IpSb, Head, Packet);\r
+      break;\r
+    case ICMP_V6_ROUTER_ADVERTISE:\r
+      Status = Ip6ProcessRouterAdvertise (IpSb, Head, Packet);\r
+      break;\r
+    case ICMP_V6_REDIRECT:\r
+      Status = Ip6ProcessRedirect (IpSb, Head, Packet);\r
+      break;\r
+    case ICMP_V6_ECHO_REPLY:\r
+      Status = Ip6Demultiplex (IpSb, Head, Packet);\r
+      break;\r
+    default:\r
+      Status = EFI_INVALID_PARAMETER;\r
+      break;\r
   }\r
 \r
   return Status;\r
@@ -400,14 +400,14 @@ Ip6ProcessIcmpInformation (
 **/\r
 EFI_STATUS\r
 Ip6IcmpHandle (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   )\r
 {\r
-  IP6_ICMP_HEAD             Icmp;\r
-  UINT16                    PseudoCheckSum;\r
-  UINT16                    CheckSum;\r
+  IP6_ICMP_HEAD  Icmp;\r
+  UINT16         PseudoCheckSum;\r
+  UINT16         CheckSum;\r
 \r
   //\r
   // Check the validity of the incoming packet.\r
@@ -416,7 +416,7 @@ Ip6IcmpHandle (
     goto DROP;\r
   }\r
 \r
-  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *) &Icmp);\r
+  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *)&Icmp);\r
 \r
   //\r
   // Make sure checksum is valid.\r
@@ -458,28 +458,28 @@ DROP:
 **/\r
 VOID\r
 Ip6GetPrefix (\r
-  IN     UINT8              PrefixLength,\r
-  IN OUT EFI_IPv6_ADDRESS   *Prefix\r
+  IN     UINT8             PrefixLength,\r
+  IN OUT EFI_IPv6_ADDRESS  *Prefix\r
   )\r
 {\r
-  UINT8                     Byte;\r
-  UINT8                     Bit;\r
-  UINT8                     Mask;\r
-  UINT8                     Value;\r
+  UINT8  Byte;\r
+  UINT8  Bit;\r
+  UINT8  Mask;\r
+  UINT8  Value;\r
 \r
   ASSERT ((Prefix != NULL) && (PrefixLength < IP6_PREFIX_MAX));\r
 \r
   if (PrefixLength == 0) {\r
     ZeroMem (Prefix, sizeof (EFI_IPv6_ADDRESS));\r
-    return ;\r
+    return;\r
   }\r
 \r
   if (PrefixLength >= IP6_PREFIX_MAX) {\r
-    return ;\r
+    return;\r
   }\r
 \r
-  Byte  = (UINT8) (PrefixLength / 8);\r
-  Bit   = (UINT8) (PrefixLength % 8);\r
+  Byte  = (UINT8)(PrefixLength / 8);\r
+  Bit   = (UINT8)(PrefixLength % 8);\r
   Value = Prefix->Addr[Byte];\r
 \r
   if (Byte > 0) {\r
@@ -487,10 +487,9 @@ Ip6GetPrefix (
   }\r
 \r
   if (Bit > 0) {\r
-    Mask = (UINT8) (0xFF << (8 - Bit));\r
-    Prefix->Addr[Byte] = (UINT8) (Value & Mask);\r
+    Mask               = (UINT8)(0xFF << (8 - Bit));\r
+    Prefix->Addr[Byte] = (UINT8)(Value & Mask);\r
   }\r
-\r
 }\r
 \r
 /**\r
@@ -505,13 +504,13 @@ Ip6GetPrefix (
 **/\r
 BOOLEAN\r
 Ip6IsAnycast (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *DestinationAddress\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *DestinationAddress\r
   )\r
 {\r
-  IP6_PREFIX_LIST_ENTRY     *PrefixEntry;\r
-  EFI_IPv6_ADDRESS          Prefix;\r
-  BOOLEAN                   Flag;\r
+  IP6_PREFIX_LIST_ENTRY  *PrefixEntry;\r
+  EFI_IPv6_ADDRESS       Prefix;\r
+  BOOLEAN                Flag;\r
 \r
   ZeroMem (&Prefix, sizeof (EFI_IPv6_ADDRESS));\r
 \r
@@ -563,21 +562,21 @@ Ip6IsAnycast (
 **/\r
 EFI_STATUS\r
 Ip6SendIcmpError (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN NET_BUF                *Packet,\r
-  IN EFI_IPv6_ADDRESS       *SourceAddress       OPTIONAL,\r
-  IN EFI_IPv6_ADDRESS       *DestinationAddress,\r
-  IN UINT8                  Type,\r
-  IN UINT8                  Code,\r
-  IN UINT32                 *Pointer             OPTIONAL\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN NET_BUF           *Packet,\r
+  IN EFI_IPv6_ADDRESS  *SourceAddress       OPTIONAL,\r
+  IN EFI_IPv6_ADDRESS  *DestinationAddress,\r
+  IN UINT8             Type,\r
+  IN UINT8             Code,\r
+  IN UINT32            *Pointer             OPTIONAL\r
   )\r
 {\r
-  UINT32                    PacketLen;\r
-  NET_BUF                   *ErrorMsg;\r
-  UINT16                    PayloadLen;\r
-  EFI_IP6_HEADER            Head;\r
-  IP6_ICMP_INFORMATION_HEAD *IcmpHead;\r
-  UINT8                     *ErrorBody;\r
+  UINT32                     PacketLen;\r
+  NET_BUF                    *ErrorMsg;\r
+  UINT16                     PayloadLen;\r
+  EFI_IP6_HEADER             Head;\r
+  IP6_ICMP_INFORMATION_HEAD  *IcmpHead;\r
+  UINT8                      *ErrorBody;\r
 \r
   if (DestinationAddress == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -592,24 +591,25 @@ Ip6SendIcmpError (
   if (NetIp6IsUnspecifiedAddr (DestinationAddress) ||\r
       IP6_IS_MULTICAST (DestinationAddress)        ||\r
       Ip6IsAnycast (IpSb, DestinationAddress)\r
-      ) {\r
+      )\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   switch (Type) {\r
-  case ICMP_V6_DEST_UNREACHABLE:\r
-  case ICMP_V6_TIME_EXCEEDED:\r
-    break;\r
+    case ICMP_V6_DEST_UNREACHABLE:\r
+    case ICMP_V6_TIME_EXCEEDED:\r
+      break;\r
 \r
-  case ICMP_V6_PARAMETER_PROBLEM:\r
-    if (Pointer == NULL) {\r
-      return EFI_INVALID_PARAMETER;\r
-    }\r
+    case ICMP_V6_PARAMETER_PROBLEM:\r
+      if (Pointer == NULL) {\r
+        return EFI_INVALID_PARAMETER;\r
+      }\r
 \r
-    break;\r
+      break;\r
 \r
-  default:\r
-    return EFI_INVALID_PARAMETER;\r
+    default:\r
+      return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   PacketLen = sizeof (IP6_ICMP_ERROR_HEAD) + Packet->TotalSize;\r
@@ -623,16 +623,16 @@ Ip6SendIcmpError (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  PayloadLen = (UINT16) (PacketLen - sizeof (EFI_IP6_HEADER));\r
+  PayloadLen = (UINT16)(PacketLen - sizeof (EFI_IP6_HEADER));\r
 \r
   //\r
   // Create the basic IPv6 header.\r
   //\r
   ZeroMem (&Head, sizeof (EFI_IP6_HEADER));\r
 \r
-  Head.PayloadLength  = HTONS (PayloadLen);\r
-  Head.NextHeader     = IP6_ICMP;\r
-  Head.HopLimit       = IpSb->CurHopLimit;\r
+  Head.PayloadLength = HTONS (PayloadLen);\r
+  Head.NextHeader    = IP6_ICMP;\r
+  Head.HopLimit      = IpSb->CurHopLimit;\r
 \r
   if (SourceAddress != NULL) {\r
     IP6_COPY_ADDRESS (&Head.SourceAddress, SourceAddress);\r
@@ -647,7 +647,7 @@ Ip6SendIcmpError (
   //\r
   // Fill in the ICMP error message head\r
   //\r
-  IcmpHead = (IP6_ICMP_INFORMATION_HEAD *) NetbufAllocSpace (ErrorMsg, sizeof (IP6_ICMP_INFORMATION_HEAD), FALSE);\r
+  IcmpHead = (IP6_ICMP_INFORMATION_HEAD *)NetbufAllocSpace (ErrorMsg, sizeof (IP6_ICMP_INFORMATION_HEAD), FALSE);\r
   if (IcmpHead == NULL) {\r
     NetbufFree (ErrorMsg);\r
     return EFI_OUT_OF_RESOURCES;\r
@@ -665,7 +665,7 @@ Ip6SendIcmpError (
   // Fill in the ICMP error message body\r
   //\r
   PayloadLen -= sizeof (IP6_ICMP_INFORMATION_HEAD);\r
-  ErrorBody =  NetbufAllocSpace (ErrorMsg, PayloadLen, FALSE);\r
+  ErrorBody   =  NetbufAllocSpace (ErrorMsg, PayloadLen, FALSE);\r
   if (ErrorBody != NULL) {\r
     ZeroMem (ErrorBody, PayloadLen);\r
     NetbufCopy (Packet, 0, PayloadLen, ErrorBody);\r
@@ -676,4 +676,3 @@ Ip6SendIcmpError (
   //\r
   return Ip6Output (IpSb, NULL, NULL, ErrorMsg, &Head, NULL, 0, Ip6SysPacketSent, NULL);\r
 }\r
-\r
index c63adb00951958cc30b5623f91052c9f5c6f82b3..09a06ac6df1c04f704ec17b8b88fab732dbe1efc 100644 (file)
 #ifndef __EFI_IP6_ICMP_H__\r
 #define __EFI_IP6_ICMP_H__\r
 \r
-#define ICMP_V6_DEFAULT_CODE          0\r
+#define ICMP_V6_DEFAULT_CODE  0\r
 \r
-#define ICMP_V6_ERROR_MAX             127\r
+#define ICMP_V6_ERROR_MAX  127\r
 \r
 //\r
 // ICMPv6 message classes, each class of ICMPv6 message shares\r
 // a common message format. INVALID_MESSAGE is only a flag.\r
 //\r
-#define ICMP_V6_INVALID_MESSAGE       0\r
-#define ICMP_V6_ERROR_MESSAGE         1\r
-#define ICMP_V6_INFORMATION_MESSAGE   2\r
-\r
+#define ICMP_V6_INVALID_MESSAGE      0\r
+#define ICMP_V6_ERROR_MESSAGE        1\r
+#define ICMP_V6_INFORMATION_MESSAGE  2\r
 \r
 extern EFI_IP6_ICMP_TYPE  mIp6SupportedIcmp[];\r
 \r
@@ -42,9 +41,9 @@ extern EFI_IP6_ICMP_TYPE  mIp6SupportedIcmp[];
 **/\r
 EFI_STATUS\r
 Ip6IcmpHandle (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   );\r
 \r
 /**\r
@@ -59,8 +58,8 @@ Ip6IcmpHandle (
 **/\r
 BOOLEAN\r
 Ip6IsAnycast (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *DestinationAddress\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *DestinationAddress\r
   );\r
 \r
 /**\r
@@ -89,14 +88,13 @@ Ip6IsAnycast (
 **/\r
 EFI_STATUS\r
 Ip6SendIcmpError (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN NET_BUF                *Packet,\r
-  IN EFI_IPv6_ADDRESS       *SourceAddress       OPTIONAL,\r
-  IN EFI_IPv6_ADDRESS       *DestinationAddress,\r
-  IN UINT8                  Type,\r
-  IN UINT8                  Code,\r
-  IN UINT32                 *Pointer             OPTIONAL\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN NET_BUF           *Packet,\r
+  IN EFI_IPv6_ADDRESS  *SourceAddress       OPTIONAL,\r
+  IN EFI_IPv6_ADDRESS  *DestinationAddress,\r
+  IN UINT8             Type,\r
+  IN UINT8             Code,\r
+  IN UINT32            *Pointer             OPTIONAL\r
   );\r
 \r
 #endif\r
-\r
index 5b469710572cd9f3a24262f2c1ba655805b1fab6..4629c05f25a09b89ace18b508d4b3443d6754416 100644 (file)
@@ -19,8 +19,8 @@
 VOID\r
 EFIAPI\r
 Ip6OnFrameSent (\r
-  IN EFI_EVENT               Event,\r
-  IN VOID                    *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -37,11 +37,11 @@ Ip6OnFrameSent (
 **/\r
 BOOLEAN\r
 Ip6CancelInstanceFrame (\r
-  IN IP6_LINK_TX_TOKEN *Frame,\r
-  IN VOID              *Context\r
+  IN IP6_LINK_TX_TOKEN  *Frame,\r
+  IN VOID               *Context\r
   )\r
 {\r
-  if (Frame->IpInstance == (IP6_PROTOCOL *) Context) {\r
+  if (Frame->IpInstance == (IP6_PROTOCOL *)Context) {\r
     return TRUE;\r
   }\r
 \r
@@ -73,14 +73,14 @@ Ip6CancelInstanceFrame (
 **/\r
 EFI_STATUS\r
 Ip6SetAddress (\r
-  IN IP6_INTERFACE          *Interface,\r
-  IN EFI_IPv6_ADDRESS       *Ip6Addr,\r
-  IN BOOLEAN                IsAnycast,\r
-  IN UINT8                  PrefixLength,\r
-  IN UINT32                 ValidLifetime,\r
-  IN UINT32                 PreferredLifetime,\r
-  IN IP6_DAD_CALLBACK       DadCallback  OPTIONAL,\r
-  IN VOID                   *Context     OPTIONAL\r
+  IN IP6_INTERFACE     *Interface,\r
+  IN EFI_IPv6_ADDRESS  *Ip6Addr,\r
+  IN BOOLEAN           IsAnycast,\r
+  IN UINT8             PrefixLength,\r
+  IN UINT32            ValidLifetime,\r
+  IN UINT32            PreferredLifetime,\r
+  IN IP6_DAD_CALLBACK  DadCallback  OPTIONAL,\r
+  IN VOID              *Context     OPTIONAL\r
   )\r
 {\r
   IP6_SERVICE            *IpSb;\r
@@ -109,12 +109,12 @@ Ip6SetAddress (
     return EFI_SUCCESS;\r
   }\r
 \r
-  AddressInfo = (IP6_ADDRESS_INFO *) AllocatePool (sizeof (IP6_ADDRESS_INFO));\r
+  AddressInfo = (IP6_ADDRESS_INFO *)AllocatePool (sizeof (IP6_ADDRESS_INFO));\r
   if (AddressInfo == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  AddressInfo->Signature         = IP6_ADDR_INFO_SIGNATURE;\r
+  AddressInfo->Signature = IP6_ADDR_INFO_SIGNATURE;\r
   IP6_COPY_ADDRESS (&AddressInfo->Address, Ip6Addr);\r
   AddressInfo->IsAnycast         = IsAnycast;\r
   AddressInfo->PrefixLength      = PrefixLength;\r
@@ -158,24 +158,23 @@ Ip6SetAddress (
     AddressInfo->PrefixLength = IP6_LINK_LOCAL_PREFIX_LENGTH;\r
   }\r
 \r
-\r
   //\r
   // Node should delay joining the solicited-node multicast address by a random delay\r
   // between 0 and MAX_RTR_SOLICITATION_DELAY (1 second).\r
   // Thus queue the address to be processed in Duplicate Address Detection module\r
   // after the delay time (in milliseconds).\r
   //\r
-  Delay = (UINT64) NET_RANDOM (NetRandomInitSeed ());\r
+  Delay = (UINT64)NET_RANDOM (NetRandomInitSeed ());\r
   Delay = MultU64x32 (Delay, IP6_ONE_SECOND_IN_MS);\r
   Delay = RShiftU64 (Delay, 32);\r
 \r
-  DelayNode = (IP6_DELAY_JOIN_LIST *) AllocatePool (sizeof (IP6_DELAY_JOIN_LIST));\r
+  DelayNode = (IP6_DELAY_JOIN_LIST *)AllocatePool (sizeof (IP6_DELAY_JOIN_LIST));\r
   if (DelayNode == NULL) {\r
     FreePool (AddressInfo);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  DelayNode->DelayTime   = (UINT32) (DivU64x32 (Delay, IP6_TIMER_INTERVAL_IN_MS));\r
+  DelayNode->DelayTime   = (UINT32)(DivU64x32 (Delay, IP6_TIMER_INTERVAL_IN_MS));\r
   DelayNode->Interface   = Interface;\r
   DelayNode->AddressInfo = AddressInfo;\r
   DelayNode->DadCallback = DadCallback;\r
@@ -197,13 +196,13 @@ Ip6SetAddress (
 **/\r
 IP6_INTERFACE *\r
 Ip6CreateInterface (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN BOOLEAN                LinkLocal\r
+  IN IP6_SERVICE  *IpSb,\r
+  IN BOOLEAN      LinkLocal\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  IP6_INTERFACE             *Interface;\r
-  EFI_IPv6_ADDRESS          *Ip6Addr;\r
+  EFI_STATUS        Status;\r
+  IP6_INTERFACE     *Interface;\r
+  EFI_IPv6_ADDRESS  *Ip6Addr;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
 \r
@@ -212,27 +211,27 @@ Ip6CreateInterface (
     return NULL;\r
   }\r
 \r
-  Interface->Signature        = IP6_INTERFACE_SIGNATURE;\r
-  Interface->RefCnt           = 1;\r
+  Interface->Signature = IP6_INTERFACE_SIGNATURE;\r
+  Interface->RefCnt    = 1;\r
 \r
   InitializeListHead (&Interface->AddressList);\r
-  Interface->AddressCount     = 0;\r
-  Interface->Configured       = FALSE;\r
+  Interface->AddressCount = 0;\r
+  Interface->Configured   = FALSE;\r
 \r
-  Interface->Service          = IpSb;\r
-  Interface->Controller       = IpSb->Controller;\r
-  Interface->Image            = IpSb->Image;\r
+  Interface->Service    = IpSb;\r
+  Interface->Controller = IpSb->Controller;\r
+  Interface->Image      = IpSb->Image;\r
 \r
   InitializeListHead (&Interface->ArpQues);\r
   InitializeListHead (&Interface->SentFrames);\r
 \r
-  Interface->DupAddrDetect    = IpSb->Ip6ConfigInstance.DadXmits.DupAddrDetectTransmits;\r
+  Interface->DupAddrDetect = IpSb->Ip6ConfigInstance.DadXmits.DupAddrDetectTransmits;\r
   InitializeListHead (&Interface->DupAddrDetectList);\r
 \r
   InitializeListHead (&Interface->DelayJoinList);\r
 \r
   InitializeListHead (&Interface->IpInstances);\r
-  Interface->PromiscRecv      = FALSE;\r
+  Interface->PromiscRecv = FALSE;\r
 \r
   if (!LinkLocal) {\r
     return Interface;\r
@@ -254,8 +253,8 @@ Ip6CreateInterface (
              Ip6Addr,\r
              FALSE,\r
              IP6_LINK_LOCAL_PREFIX_LENGTH,\r
-             (UINT32) IP6_INFINIT_LIFETIME,\r
-             (UINT32) IP6_INFINIT_LIFETIME,\r
+             (UINT32)IP6_INFINIT_LIFETIME,\r
+             (UINT32)IP6_INFINIT_LIFETIME,\r
              NULL,\r
              NULL\r
              );\r
@@ -288,12 +287,12 @@ ON_ERROR:
 **/\r
 VOID\r
 Ip6CleanInterface (\r
-  IN  IP6_INTERFACE         *Interface,\r
-  IN  IP6_PROTOCOL          *IpInstance           OPTIONAL\r
+  IN  IP6_INTERFACE  *Interface,\r
+  IN  IP6_PROTOCOL   *IpInstance           OPTIONAL\r
   )\r
 {\r
-  IP6_DAD_ENTRY             *Duplicate;\r
-  IP6_DELAY_JOIN_LIST       *Delay;\r
+  IP6_DAD_ENTRY        *Duplicate;\r
+  IP6_DELAY_JOIN_LIST  *Delay;\r
 \r
   NET_CHECK_SIGNATURE (Interface, IP6_INTERFACE_SIGNATURE);\r
   ASSERT (Interface->RefCnt > 0);\r
@@ -352,11 +351,11 @@ Ip6CleanInterface (
 **/\r
 IP6_LINK_TX_TOKEN *\r
 Ip6CreateLinkTxToken (\r
-  IN IP6_INTERFACE          *Interface,\r
-  IN IP6_PROTOCOL           *IpInstance    OPTIONAL,\r
-  IN NET_BUF                *Packet,\r
-  IN IP6_FRAME_CALLBACK     CallBack,\r
-  IN VOID                   *Context\r
+  IN IP6_INTERFACE       *Interface,\r
+  IN IP6_PROTOCOL        *IpInstance    OPTIONAL,\r
+  IN NET_BUF             *Packet,\r
+  IN IP6_FRAME_CALLBACK  CallBack,\r
+  IN VOID                *Context\r
   )\r
 {\r
   EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *MnpToken;\r
@@ -381,8 +380,8 @@ Ip6CreateLinkTxToken (
   ZeroMem (&Token->DstMac, sizeof (EFI_MAC_ADDRESS));\r
   IP6_COPY_LINK_ADDRESS (&Token->SrcMac, &Interface->Service->SnpMode.CurrentAddress);\r
 \r
-  MnpToken          = &(Token->MnpToken);\r
-  MnpToken->Status  = EFI_NOT_READY;\r
+  MnpToken         = &(Token->MnpToken);\r
+  MnpToken->Status = EFI_NOT_READY;\r
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
@@ -397,8 +396,8 @@ Ip6CreateLinkTxToken (
     return NULL;\r
   }\r
 \r
-  MnpTxData                     = &Token->MnpTxData;\r
-  MnpToken->Packet.TxData       = MnpTxData;\r
+  MnpTxData               = &Token->MnpTxData;\r
+  MnpToken->Packet.TxData = MnpTxData;\r
 \r
   MnpTxData->DestinationAddress = &Token->DstMac;\r
   MnpTxData->SourceAddress      = &Token->SrcMac;\r
@@ -406,10 +405,10 @@ Ip6CreateLinkTxToken (
   MnpTxData->DataLength         = Packet->TotalSize;\r
   MnpTxData->HeaderLength       = 0;\r
 \r
-  Count                         = Packet->BlockOpNum;\r
+  Count = Packet->BlockOpNum;\r
 \r
-  NetbufBuildExt (Packet, (NET_FRAGMENT *) MnpTxData->FragmentTable, &Count);\r
-  MnpTxData->FragmentCount      = (UINT16)Count;\r
+  NetbufBuildExt (Packet, (NET_FRAGMENT *)MnpTxData->FragmentTable, &Count);\r
+  MnpTxData->FragmentCount = (UINT16)Count;\r
 \r
   return Token;\r
 }\r
@@ -423,7 +422,7 @@ Ip6CreateLinkTxToken (
 **/\r
 VOID\r
 Ip6FreeLinkTxToken (\r
-  IN IP6_LINK_TX_TOKEN      *Token\r
+  IN IP6_LINK_TX_TOKEN  *Token\r
   )\r
 {\r
   NET_CHECK_SIGNATURE (Token, IP6_LINK_TX_SIGNATURE);\r
@@ -442,12 +441,12 @@ Ip6FreeLinkTxToken (
 VOID\r
 EFIAPI\r
 Ip6RecycleFrame (\r
-  IN VOID                   *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
   EFI_MANAGED_NETWORK_RECEIVE_DATA  *RxData;\r
 \r
-  RxData = (EFI_MANAGED_NETWORK_RECEIVE_DATA *) Context;\r
+  RxData = (EFI_MANAGED_NETWORK_RECEIVE_DATA *)Context;\r
 \r
   gBS->SignalEvent (RxData->RecycleEvent);\r
 }\r
@@ -466,7 +465,7 @@ Ip6RecycleFrame (
 VOID\r
 EFIAPI\r
 Ip6OnFrameReceivedDpc (\r
-  IN VOID                     *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
   EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *MnpToken;\r
@@ -477,23 +476,22 @@ Ip6OnFrameReceivedDpc (
   UINT32                                Flag;\r
   IP6_SERVICE                           *IpSb;\r
 \r
-  Token = (IP6_LINK_RX_TOKEN *) Context;\r
+  Token = (IP6_LINK_RX_TOKEN *)Context;\r
   NET_CHECK_SIGNATURE (Token, IP6_LINK_RX_SIGNATURE);\r
 \r
   //\r
   // First clear the interface's receive request in case the\r
   // caller wants to call Ip6ReceiveFrame in the callback.\r
   //\r
-  IpSb = (IP6_SERVICE *) Token->Context;\r
+  IpSb = (IP6_SERVICE *)Token->Context;\r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
 \r
-\r
   MnpToken  = &Token->MnpToken;\r
   MnpRxData = MnpToken->Packet.RxData;\r
 \r
   if (EFI_ERROR (MnpToken->Status) || (MnpRxData == NULL)) {\r
     Token->CallBack (NULL, MnpToken->Status, 0, Token->Context);\r
-    return ;\r
+    return;\r
   }\r
 \r
   //\r
@@ -510,7 +508,7 @@ Ip6OnFrameReceivedDpc (
 \r
     Token->CallBack (NULL, EFI_OUT_OF_RESOURCES, 0, Token->Context);\r
 \r
-    return ;\r
+    return;\r
   }\r
 \r
   Flag  = (MnpRxData->BroadcastFlag ? IP6_LINK_BROADCAST : 0);\r
@@ -530,8 +528,8 @@ Ip6OnFrameReceivedDpc (
 VOID\r
 EFIAPI\r
 Ip6OnFrameReceived (\r
-  IN EFI_EVENT                Event,\r
-  IN VOID                     *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   //\r
@@ -553,18 +551,18 @@ Ip6OnFrameReceived (
 **/\r
 EFI_STATUS\r
 Ip6ReceiveFrame (\r
-  IN  IP6_FRAME_CALLBACK    CallBack,\r
-  IN  IP6_SERVICE           *IpSb\r
+  IN  IP6_FRAME_CALLBACK  CallBack,\r
+  IN  IP6_SERVICE         *IpSb\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  IP6_LINK_RX_TOKEN         *Token;\r
+  EFI_STATUS         Status;\r
+  IP6_LINK_RX_TOKEN  *Token;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
 \r
   Token           = &IpSb->RecvRequest;\r
   Token->CallBack = CallBack;\r
-  Token->Context  = (VOID *) IpSb;\r
+  Token->Context  = (VOID *)IpSb;\r
 \r
   Status = IpSb->Mnp->Receive (IpSb->Mnp, &Token->MnpToken);\r
   if (EFI_ERROR (Status)) {\r
@@ -584,22 +582,22 @@ Ip6ReceiveFrame (
 VOID\r
 EFIAPI\r
 Ip6OnFrameSentDpc (\r
-  IN VOID                    *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  IP6_LINK_TX_TOKEN         *Token;\r
+  IP6_LINK_TX_TOKEN  *Token;\r
 \r
-  Token = (IP6_LINK_TX_TOKEN *) Context;\r
+  Token = (IP6_LINK_TX_TOKEN *)Context;\r
   NET_CHECK_SIGNATURE (Token, IP6_LINK_TX_SIGNATURE);\r
 \r
   RemoveEntryList (&Token->Link);\r
 \r
   Token->CallBack (\r
-          Token->Packet,\r
-          Token->MnpToken.Status,\r
-          0,\r
-          Token->Context\r
-          );\r
+           Token->Packet,\r
+           Token->MnpToken.Status,\r
+           0,\r
+           Token->Context\r
+           );\r
 \r
   Ip6FreeLinkTxToken (Token);\r
 }\r
@@ -614,8 +612,8 @@ Ip6OnFrameSentDpc (
 VOID\r
 EFIAPI\r
 Ip6OnFrameSent (\r
-  IN EFI_EVENT               Event,\r
-  IN VOID                    *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   //\r
@@ -646,20 +644,20 @@ Ip6OnFrameSent (
 **/\r
 EFI_STATUS\r
 Ip6SendFrame (\r
-  IN  IP6_INTERFACE         *Interface,\r
-  IN  IP6_PROTOCOL          *IpInstance      OPTIONAL,\r
-  IN  NET_BUF               *Packet,\r
-  IN  EFI_IPv6_ADDRESS      *NextHop,\r
-  IN  IP6_FRAME_CALLBACK    CallBack,\r
-  IN  VOID                  *Context\r
+  IN  IP6_INTERFACE       *Interface,\r
+  IN  IP6_PROTOCOL        *IpInstance      OPTIONAL,\r
+  IN  NET_BUF             *Packet,\r
+  IN  EFI_IPv6_ADDRESS    *NextHop,\r
+  IN  IP6_FRAME_CALLBACK  CallBack,\r
+  IN  VOID                *Context\r
   )\r
 {\r
-  IP6_SERVICE               *IpSb;\r
-  IP6_LINK_TX_TOKEN         *Token;\r
-  EFI_STATUS                Status;\r
-  IP6_NEIGHBOR_ENTRY        *NeighborCache;\r
-  LIST_ENTRY                *Entry;\r
-  IP6_NEIGHBOR_ENTRY        *ArpQue;\r
+  IP6_SERVICE         *IpSb;\r
+  IP6_LINK_TX_TOKEN   *Token;\r
+  EFI_STATUS          Status;\r
+  IP6_NEIGHBOR_ENTRY  *NeighborCache;\r
+  LIST_ENTRY          *Entry;\r
+  IP6_NEIGHBOR_ENTRY  *ArpQue;\r
 \r
   IpSb = Interface->Service;\r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
@@ -706,21 +704,21 @@ Ip6SendFrame (
   }\r
 \r
   switch (NeighborCache->State) {\r
-  case EfiNeighborStale:\r
-    NeighborCache->State = EfiNeighborDelay;\r
-    NeighborCache->Ticks = (UINT32) IP6_GET_TICKS (IP6_DELAY_FIRST_PROBE_TIME);\r
+    case EfiNeighborStale:\r
+      NeighborCache->State = EfiNeighborDelay;\r
+      NeighborCache->Ticks = (UINT32)IP6_GET_TICKS (IP6_DELAY_FIRST_PROBE_TIME);\r
     //\r
     // Fall through\r
     //\r
-  case EfiNeighborReachable:\r
-  case EfiNeighborDelay:\r
-  case EfiNeighborProbe:\r
-    IP6_COPY_LINK_ADDRESS (&Token->DstMac, &NeighborCache->LinkAddress);\r
-    goto SendNow;\r
-    break;\r
-\r
-  default:\r
-    break;\r
+    case EfiNeighborReachable:\r
+    case EfiNeighborDelay:\r
+    case EfiNeighborProbe:\r
+      IP6_COPY_LINK_ADDRESS (&Token->DstMac, &NeighborCache->LinkAddress);\r
+      goto SendNow;\r
+      break;\r
+\r
+    default:\r
+      break;\r
   }\r
 \r
   //\r
@@ -747,7 +745,7 @@ Ip6SendFrame (
   return EFI_SUCCESS;\r
 \r
 SendNow:\r
- //\r
 //\r
   // Insert the tx token into the SentFrames list before calling Mnp->Transmit.\r
   // Remove it if the returned status is not EFI_SUCCESS.\r
   //\r
@@ -777,13 +775,13 @@ Error:
 VOID\r
 EFIAPI\r
 Ip6TimerTicking (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  IP6_SERVICE               *IpSb;\r
+  IP6_SERVICE  *IpSb;\r
 \r
-  IpSb = (IP6_SERVICE *) Context;\r
+  IpSb = (IP6_SERVICE *)Context;\r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
 \r
   Ip6PacketTimerTicking (IpSb);\r
index ab43d8ea592a5cadd2807130338c55d3e7cb5c65..1f058e244e45f986b445f35233750c24ea423cb0 100644 (file)
 #ifndef __EFI_IP6_IF_H__\r
 #define __EFI_IP6_IF_H__\r
 \r
-#define IP6_LINK_RX_SIGNATURE   SIGNATURE_32 ('I', 'P', '6', 'R')\r
-#define IP6_LINK_TX_SIGNATURE   SIGNATURE_32 ('I', 'P', '6', 'T')\r
-#define IP6_INTERFACE_SIGNATURE SIGNATURE_32 ('I', 'P', '6', 'I')\r
-#define IP6_ADDR_INFO_SIGNATURE SIGNATURE_32 ('I', 'P', 'A', 'I')\r
+#define IP6_LINK_RX_SIGNATURE    SIGNATURE_32 ('I', 'P', '6', 'R')\r
+#define IP6_LINK_TX_SIGNATURE    SIGNATURE_32 ('I', 'P', '6', 'T')\r
+#define IP6_INTERFACE_SIGNATURE  SIGNATURE_32 ('I', 'P', '6', 'I')\r
+#define IP6_ADDR_INFO_SIGNATURE  SIGNATURE_32 ('I', 'P', 'A', 'I')\r
 \r
 //\r
 // This prototype is used by both receive and transmission.\r
 typedef\r
 VOID\r
 (*IP6_FRAME_CALLBACK) (\r
-  NET_BUF                   *Packet,\r
-  EFI_STATUS                IoStatus,\r
-  UINT32                    LinkFlag,\r
-  VOID                      *Context\r
+  NET_BUF     *Packet,\r
+  EFI_STATUS  IoStatus,\r
+  UINT32      LinkFlag,\r
+  VOID        *Context\r
   );\r
 \r
 //\r
@@ -46,10 +46,10 @@ VOID
 // Reference MNP's spec for information.\r
 //\r
 typedef struct {\r
-  UINT32                                Signature;\r
-  IP6_FRAME_CALLBACK                    CallBack;\r
-  VOID                                  *Context;\r
-  EFI_MANAGED_NETWORK_COMPLETION_TOKEN  MnpToken;\r
+  UINT32                                  Signature;\r
+  IP6_FRAME_CALLBACK                      CallBack;\r
+  VOID                                    *Context;\r
+  EFI_MANAGED_NETWORK_COMPLETION_TOKEN    MnpToken;\r
 } IP6_LINK_RX_TOKEN;\r
 \r
 //\r
@@ -57,29 +57,29 @@ typedef struct {
 // Upon completion, the Callback will be called.\r
 //\r
 typedef struct {\r
-  UINT32                                Signature;\r
-  LIST_ENTRY                            Link;\r
+  UINT32                                  Signature;\r
+  LIST_ENTRY                              Link;\r
 \r
-  IP6_PROTOCOL                          *IpInstance;\r
-  IP6_FRAME_CALLBACK                    CallBack;\r
-  NET_BUF                               *Packet;\r
-  VOID                                  *Context;\r
+  IP6_PROTOCOL                            *IpInstance;\r
+  IP6_FRAME_CALLBACK                      CallBack;\r
+  NET_BUF                                 *Packet;\r
+  VOID                                    *Context;\r
 \r
-  EFI_MAC_ADDRESS                       DstMac;\r
-  EFI_MAC_ADDRESS                       SrcMac;\r
+  EFI_MAC_ADDRESS                         DstMac;\r
+  EFI_MAC_ADDRESS                         SrcMac;\r
 \r
-  EFI_MANAGED_NETWORK_COMPLETION_TOKEN  MnpToken;\r
-  EFI_MANAGED_NETWORK_TRANSMIT_DATA     MnpTxData;\r
+  EFI_MANAGED_NETWORK_COMPLETION_TOKEN    MnpToken;\r
+  EFI_MANAGED_NETWORK_TRANSMIT_DATA       MnpTxData;\r
 } IP6_LINK_TX_TOKEN;\r
 \r
 struct _IP6_ADDRESS_INFO {\r
-  UINT32                  Signature;\r
-  LIST_ENTRY              Link;\r
-  EFI_IPv6_ADDRESS        Address;\r
-  BOOLEAN                 IsAnycast;\r
-  UINT8                   PrefixLength;\r
-  UINT32                  ValidLifetime;\r
-  UINT32                  PreferredLifetime;\r
+  UINT32              Signature;\r
+  LIST_ENTRY          Link;\r
+  EFI_IPv6_ADDRESS    Address;\r
+  BOOLEAN             IsAnycast;\r
+  UINT8               PrefixLength;\r
+  UINT32              ValidLifetime;\r
+  UINT32              PreferredLifetime;\r
 };\r
 \r
 //\r
@@ -89,50 +89,48 @@ struct _IP6_ADDRESS_INFO {
 typedef\r
 BOOLEAN\r
 (*IP6_FRAME_TO_CANCEL) (\r
-  IP6_LINK_TX_TOKEN       *Frame,\r
-  VOID                    *Context\r
+  IP6_LINK_TX_TOKEN  *Frame,\r
+  VOID               *Context\r
   );\r
 \r
 struct _IP6_INTERFACE {\r
-  UINT32                        Signature;\r
-  LIST_ENTRY                    Link;\r
-  INTN                          RefCnt;\r
+  UINT32         Signature;\r
+  LIST_ENTRY     Link;\r
+  INTN           RefCnt;\r
 \r
   //\r
   // IP address and prefix length of the interface.  The fileds\r
   // are invalid if (Configured == FALSE)\r
   //\r
-  LIST_ENTRY                    AddressList;\r
-  UINT32                        AddressCount;\r
-  BOOLEAN                       Configured;\r
+  LIST_ENTRY     AddressList;\r
+  UINT32         AddressCount;\r
+  BOOLEAN        Configured;\r
 \r
-  IP6_SERVICE                   *Service;\r
-\r
-  EFI_HANDLE                    Controller;\r
-  EFI_HANDLE                    Image;\r
+  IP6_SERVICE    *Service;\r
 \r
+  EFI_HANDLE     Controller;\r
+  EFI_HANDLE     Image;\r
 \r
   //\r
   // Queues to keep the frames sent and waiting ARP request.\r
   //\r
-  LIST_ENTRY                    ArpQues;\r
-  LIST_ENTRY                    SentFrames;\r
-\r
+  LIST_ENTRY     ArpQues;\r
+  LIST_ENTRY     SentFrames;\r
 \r
   //\r
   // The interface's configuration variables\r
   //\r
-  UINT32                        DupAddrDetect;\r
-  LIST_ENTRY                    DupAddrDetectList;\r
-  LIST_ENTRY                    DelayJoinList;\r
+  UINT32         DupAddrDetect;\r
+  LIST_ENTRY     DupAddrDetectList;\r
+  LIST_ENTRY     DelayJoinList;\r
 \r
   //\r
   // All the IP instances that have the same IP/SubnetMask are linked\r
   // together through IpInstances. If any of the instance enables\r
   // promiscuous receive, PromiscRecv is true.\r
   //\r
-  LIST_ENTRY                    IpInstances;\r
-  BOOLEAN                       PromiscRecv;\r
+  LIST_ENTRY     IpInstances;\r
+  BOOLEAN        PromiscRecv;\r
 };\r
 \r
 /**\r
@@ -147,8 +145,8 @@ struct _IP6_INTERFACE {
 **/\r
 IP6_INTERFACE *\r
 Ip6CreateInterface (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN BOOLEAN                LinkLocal\r
+  IN IP6_SERVICE  *IpSb,\r
+  IN BOOLEAN      LinkLocal\r
   );\r
 \r
 /**\r
@@ -165,8 +163,8 @@ Ip6CreateInterface (
 **/\r
 VOID\r
 Ip6CleanInterface (\r
-  IN  IP6_INTERFACE         *Interface,\r
-  IN  IP6_PROTOCOL          *IpInstance           OPTIONAL\r
+  IN  IP6_INTERFACE  *Interface,\r
+  IN  IP6_PROTOCOL   *IpInstance           OPTIONAL\r
   );\r
 \r
 /**\r
@@ -178,7 +176,7 @@ Ip6CleanInterface (
 **/\r
 VOID\r
 Ip6FreeLinkTxToken (\r
-  IN IP6_LINK_TX_TOKEN      *Token\r
+  IN IP6_LINK_TX_TOKEN  *Token\r
   );\r
 \r
 /**\r
@@ -191,8 +189,8 @@ Ip6FreeLinkTxToken (
 VOID\r
 EFIAPI\r
 Ip6OnFrameReceived (\r
-  IN EFI_EVENT                Event,\r
-  IN VOID                     *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -208,8 +206,8 @@ Ip6OnFrameReceived (
 **/\r
 EFI_STATUS\r
 Ip6ReceiveFrame (\r
-  IN  IP6_FRAME_CALLBACK    CallBack,\r
-  IN  IP6_SERVICE           *IpSb\r
+  IN  IP6_FRAME_CALLBACK  CallBack,\r
+  IN  IP6_SERVICE         *IpSb\r
   );\r
 \r
 /**\r
@@ -234,12 +232,12 @@ Ip6ReceiveFrame (
 **/\r
 EFI_STATUS\r
 Ip6SendFrame (\r
-  IN  IP6_INTERFACE         *Interface,\r
-  IN  IP6_PROTOCOL          *IpInstance      OPTIONAL,\r
-  IN  NET_BUF               *Packet,\r
-  IN  EFI_IPv6_ADDRESS      *NextHop,\r
-  IN  IP6_FRAME_CALLBACK    CallBack,\r
-  IN  VOID                  *Context\r
+  IN  IP6_INTERFACE       *Interface,\r
+  IN  IP6_PROTOCOL        *IpInstance      OPTIONAL,\r
+  IN  NET_BUF             *Packet,\r
+  IN  EFI_IPv6_ADDRESS    *NextHop,\r
+  IN  IP6_FRAME_CALLBACK  CallBack,\r
+  IN  VOID                *Context\r
   );\r
 \r
 /**\r
@@ -254,8 +252,8 @@ Ip6SendFrame (
 VOID\r
 EFIAPI\r
 Ip6TimerTicking (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 #endif\r
index 826a5c252f1ade7ade948a108abf109eadd719e0..a4bfd0f9a3037f4e4926c39d3584ee1bc63cd5df 100644 (file)
@@ -10,9 +10,9 @@
 \r
 #include "Ip6Impl.h"\r
 \r
-EFI_IPSEC2_PROTOCOL    *mIpSec = NULL;\r
+EFI_IPSEC2_PROTOCOL  *mIpSec = NULL;\r
 \r
-EFI_IP6_PROTOCOL mEfiIp6ProtocolTemplete = {\r
+EFI_IP6_PROTOCOL  mEfiIp6ProtocolTemplete = {\r
   EfiIp6GetModeData,\r
   EfiIp6Configure,\r
   EfiIp6Groups,\r
@@ -44,18 +44,18 @@ EFI_IP6_PROTOCOL mEfiIp6ProtocolTemplete = {
 EFI_STATUS\r
 EFIAPI\r
 EfiIp6GetModeData (\r
-  IN EFI_IP6_PROTOCOL                 *This,\r
-  OUT EFI_IP6_MODE_DATA               *Ip6ModeData     OPTIONAL,\r
-  OUT EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData   OPTIONAL,\r
-  OUT EFI_SIMPLE_NETWORK_MODE         *SnpModeData     OPTIONAL\r
+  IN EFI_IP6_PROTOCOL                  *This,\r
+  OUT EFI_IP6_MODE_DATA                *Ip6ModeData     OPTIONAL,\r
+  OUT EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData   OPTIONAL,\r
+  OUT EFI_SIMPLE_NETWORK_MODE          *SnpModeData     OPTIONAL\r
   )\r
 {\r
-  IP6_PROTOCOL              *IpInstance;\r
-  IP6_SERVICE               *IpSb;\r
-  IP6_INTERFACE             *IpIf;\r
-  EFI_IP6_CONFIG_DATA       *Config;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
+  IP6_PROTOCOL         *IpInstance;\r
+  IP6_SERVICE          *IpSb;\r
+  IP6_INTERFACE        *IpIf;\r
+  EFI_IP6_CONFIG_DATA  *Config;\r
+  EFI_STATUS           Status;\r
+  EFI_TPL              OldTpl;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -75,25 +75,25 @@ EfiIp6GetModeData (
     // IsStarted is "whether the EfiIp6Configure has been called".\r
     // IsConfigured is "whether the station address has been configured"\r
     //\r
-    Ip6ModeData->IsStarted     = (BOOLEAN) (IpInstance->State == IP6_STATE_CONFIGED);\r
+    Ip6ModeData->IsStarted     = (BOOLEAN)(IpInstance->State == IP6_STATE_CONFIGED);\r
     Ip6ModeData->MaxPacketSize = IpSb->MaxPacketSize;\r
     CopyMem (&Ip6ModeData->ConfigData, &IpInstance->ConfigData, sizeof (EFI_IP6_CONFIG_DATA));\r
-    Ip6ModeData->IsConfigured  = FALSE;\r
+    Ip6ModeData->IsConfigured = FALSE;\r
 \r
-    Ip6ModeData->AddressCount  = 0;\r
-    Ip6ModeData->AddressList   = NULL;\r
+    Ip6ModeData->AddressCount = 0;\r
+    Ip6ModeData->AddressList  = NULL;\r
 \r
-    Ip6ModeData->GroupCount    = IpInstance->GroupCount;\r
-    Ip6ModeData->GroupTable    = NULL;\r
+    Ip6ModeData->GroupCount = IpInstance->GroupCount;\r
+    Ip6ModeData->GroupTable = NULL;\r
 \r
-    Ip6ModeData->RouteCount    = 0;\r
-    Ip6ModeData->RouteTable    = NULL;\r
+    Ip6ModeData->RouteCount = 0;\r
+    Ip6ModeData->RouteTable = NULL;\r
 \r
     Ip6ModeData->NeighborCount = 0;\r
     Ip6ModeData->NeighborCache = NULL;\r
 \r
-    Ip6ModeData->PrefixCount   = 0;\r
-    Ip6ModeData->PrefixTable   = NULL;\r
+    Ip6ModeData->PrefixCount = 0;\r
+    Ip6ModeData->PrefixTable = NULL;\r
 \r
     Ip6ModeData->IcmpTypeCount = 23;\r
     Ip6ModeData->IcmpTypeList  = AllocateCopyPool (\r
@@ -160,6 +160,7 @@ EfiIp6GetModeData (
           goto Error;\r
         }\r
       }\r
+\r
       //\r
       // Return the neighbor cache entries\r
       //\r
@@ -183,7 +184,6 @@ EfiIp6GetModeData (
       if (EFI_ERROR (Status)) {\r
         goto Error;\r
       }\r
-\r
     }\r
   }\r
 \r
@@ -242,15 +242,16 @@ Exit:
 **/\r
 BOOLEAN\r
 Ip6IsValidAddress (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *Ip,\r
-  IN BOOLEAN                Flag\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *Ip,\r
+  IN BOOLEAN           Flag\r
   )\r
 {\r
   if (!NetIp6IsUnspecifiedAddr (Ip)) {\r
-    if (!NetIp6IsValidUnicast(Ip)) {\r
+    if (!NetIp6IsValidUnicast (Ip)) {\r
       return FALSE;\r
     }\r
+\r
     if (Ip6IsOneOfSetAddress (IpSb, Ip, NULL, NULL)) {\r
       return Flag;\r
     }\r
@@ -273,14 +274,14 @@ Ip6IsValidAddress (
 **/\r
 BOOLEAN\r
 Ip6IsIllegalProtocol (\r
-  IN UINT8                  Protocol\r
+  IN UINT8  Protocol\r
   )\r
 {\r
-  if (Protocol == IP6_HOP_BY_HOP || Protocol == EFI_IP_PROTO_ICMP || Protocol == IP4_PROTO_IGMP) {\r
+  if ((Protocol == IP6_HOP_BY_HOP) || (Protocol == EFI_IP_PROTO_ICMP) || (Protocol == IP4_PROTO_IGMP)) {\r
     return TRUE;\r
   }\r
 \r
-  if (Protocol == 41 || Protocol == 43 || Protocol == 44 || Protocol == 59 || Protocol == 60 || Protocol == 124) {\r
+  if ((Protocol == 41) || (Protocol == 43) || (Protocol == 44) || (Protocol == 59) || (Protocol == 60) || (Protocol == 124)) {\r
     return TRUE;\r
   }\r
 \r
@@ -296,8 +297,8 @@ Ip6IsIllegalProtocol (
 **/\r
 VOID\r
 Ip6InitProtocol (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN OUT IP6_PROTOCOL       *IpInstance\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN OUT IP6_PROTOCOL  *IpInstance\r
   )\r
 {\r
   ASSERT ((IpSb != NULL) && (IpInstance != NULL));\r
@@ -310,8 +311,8 @@ Ip6InitProtocol (
   IpInstance->GroupList = NULL;\r
   CopyMem (&IpInstance->Ip6Proto, &mEfiIp6ProtocolTemplete, sizeof (EFI_IP6_PROTOCOL));\r
 \r
-  NetMapInit  (&IpInstance->RxTokens);\r
-  NetMapInit  (&IpInstance->TxTokens);\r
+  NetMapInit (&IpInstance->RxTokens);\r
+  NetMapInit (&IpInstance->TxTokens);\r
   InitializeListHead (&IpInstance->Received);\r
   InitializeListHead (&IpInstance->Delivered);\r
 \r
@@ -340,19 +341,19 @@ Ip6InitProtocol (
 **/\r
 EFI_STATUS\r
 Ip6ConfigProtocol (\r
-  IN OUT IP6_PROTOCOL        *IpInstance,\r
-  IN     EFI_IP6_CONFIG_DATA *Config\r
+  IN OUT IP6_PROTOCOL         *IpInstance,\r
+  IN     EFI_IP6_CONFIG_DATA  *Config\r
   )\r
 {\r
-  IP6_SERVICE               *IpSb;\r
-  IP6_INTERFACE             *IpIf;\r
-  EFI_STATUS                Status;\r
-  EFI_IP6_CONFIG_DATA       *Current;\r
-  IP6_ADDRESS_INFO          *AddressInfo;\r
-  BOOLEAN                   StationZero;\r
-  BOOLEAN                   DestZero;\r
-  EFI_IPv6_ADDRESS          Source;\r
-  BOOLEAN                   AddrOk;\r
+  IP6_SERVICE          *IpSb;\r
+  IP6_INTERFACE        *IpIf;\r
+  EFI_STATUS           Status;\r
+  EFI_IP6_CONFIG_DATA  *Current;\r
+  IP6_ADDRESS_INFO     *AddressInfo;\r
+  BOOLEAN              StationZero;\r
+  BOOLEAN              DestZero;\r
+  EFI_IPv6_ADDRESS     Source;\r
+  BOOLEAN              AddrOk;\r
 \r
   IpSb    = IpInstance->Service;\r
   Current = &IpInstance->ConfigData;\r
@@ -419,7 +420,6 @@ Ip6ConfigProtocol (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-\r
   NET_GET_REF (IpIf);\r
   IpInstance->Interface = IpIf;\r
   InsertTailList (&IpIf->IpInstances, &IpInstance->AddrLink);\r
@@ -442,7 +442,7 @@ Ip6ConfigProtocol (
 **/\r
 EFI_STATUS\r
 Ip6CleanProtocol (\r
-  IN OUT IP6_PROTOCOL            *IpInstance\r
+  IN OUT IP6_PROTOCOL  *IpInstance\r
   )\r
 {\r
   if (EFI_ERROR (Ip6Cancel (IpInstance, NULL))) {\r
@@ -459,7 +459,6 @@ Ip6CleanProtocol (
   // hasn't been called. Just leave it alone.\r
   //\r
   if (!IsListEmpty (&IpInstance->Delivered)) {\r
-    ;\r
   }\r
 \r
   if (IpInstance->Interface != NULL) {\r
@@ -470,8 +469,8 @@ Ip6CleanProtocol (
 \r
   if (IpInstance->GroupList != NULL) {\r
     FreePool (IpInstance->GroupList);\r
-    IpInstance->GroupList   = NULL;\r
-    IpInstance->GroupCount  = 0;\r
+    IpInstance->GroupList  = NULL;\r
+    IpInstance->GroupCount = 0;\r
   }\r
 \r
   NetMapClean (&IpInstance->TxTokens);\r
@@ -501,17 +500,17 @@ Ip6CleanProtocol (
 **/\r
 EFI_STATUS\r
 Ip6ServiceConfigMnp (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN BOOLEAN                Force\r
+  IN IP6_SERVICE  *IpSb,\r
+  IN BOOLEAN      Force\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *ProtoEntry;\r
-  IP6_INTERFACE             *IpIf;\r
-  IP6_PROTOCOL              *IpInstance;\r
-  BOOLEAN                   Reconfig;\r
-  BOOLEAN                   PromiscReceive;\r
-  EFI_STATUS                Status;\r
+  LIST_ENTRY     *Entry;\r
+  LIST_ENTRY     *ProtoEntry;\r
+  IP6_INTERFACE  *IpIf;\r
+  IP6_PROTOCOL   *IpInstance;\r
+  BOOLEAN        Reconfig;\r
+  BOOLEAN        PromiscReceive;\r
+  EFI_STATUS     Status;\r
 \r
   Reconfig       = FALSE;\r
   PromiscReceive = FALSE;\r
@@ -523,7 +522,6 @@ Ip6ServiceConfigMnp (
     // filter also.\r
     //\r
     NET_LIST_FOR_EACH (Entry, &IpSb->Interfaces) {\r
-\r
       IpIf              = NET_LIST_USER_STRUCT (Entry, IP6_INTERFACE, Link);\r
       IpIf->PromiscRecv = FALSE;\r
 \r
@@ -544,7 +542,7 @@ Ip6ServiceConfigMnp (
       return EFI_SUCCESS;\r
     }\r
 \r
-    Reconfig  = TRUE;\r
+    Reconfig                                     = TRUE;\r
     IpSb->MnpConfigData.EnablePromiscuousReceive = PromiscReceive;\r
   }\r
 \r
@@ -610,15 +608,15 @@ Ip6ServiceConfigMnp (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp6Configure (\r
-  IN EFI_IP6_PROTOCOL          *This,\r
-  IN EFI_IP6_CONFIG_DATA       *Ip6ConfigData OPTIONAL\r
+  IN EFI_IP6_PROTOCOL     *This,\r
+  IN EFI_IP6_CONFIG_DATA  *Ip6ConfigData OPTIONAL\r
   )\r
 {\r
-  IP6_PROTOCOL              *IpInstance;\r
-  EFI_IP6_CONFIG_DATA       *Current;\r
-  EFI_TPL                   OldTpl;\r
-  EFI_STATUS                Status;\r
-  IP6_SERVICE               *IpSb;\r
+  IP6_PROTOCOL         *IpInstance;\r
+  EFI_IP6_CONFIG_DATA  *Current;\r
+  EFI_TPL              OldTpl;\r
+  EFI_STATUS           Status;\r
+  IP6_SERVICE          *IpSb;\r
 \r
   //\r
   // First, validate the parameters\r
@@ -630,13 +628,13 @@ EfiIp6Configure (
   IpInstance = IP6_INSTANCE_FROM_PROTOCOL (This);\r
   IpSb       = IpInstance->Service;\r
 \r
-  if (IpSb->LinkLocalDadFail && Ip6ConfigData != NULL) {\r
+  if (IpSb->LinkLocalDadFail && (Ip6ConfigData != NULL)) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  OldTpl     = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
-  Status     = EFI_INVALID_PARAMETER;\r
+  Status = EFI_INVALID_PARAMETER;\r
 \r
   //\r
   // Validate the configuration first.\r
@@ -646,8 +644,9 @@ EfiIp6Configure (
     // Check whether the station address is valid.\r
     //\r
     if (!Ip6IsValidAddress (IpSb, &Ip6ConfigData->StationAddress, TRUE)) {\r
-       goto Exit;\r
+      goto Exit;\r
     }\r
+\r
     //\r
     // Check whether the default protocol is valid.\r
     //\r
@@ -744,16 +743,16 @@ EfiIp6Groups (
   IN EFI_IPv6_ADDRESS  *GroupAddress  OPTIONAL\r
   )\r
 {\r
-  EFI_TPL                   OldTpl;\r
-  EFI_STATUS                Status;\r
-  IP6_PROTOCOL              *IpInstance;\r
-  IP6_SERVICE               *IpSb;\r
+  EFI_TPL       OldTpl;\r
+  EFI_STATUS    Status;\r
+  IP6_PROTOCOL  *IpInstance;\r
+  IP6_SERVICE   *IpSb;\r
 \r
-  if ((This == NULL) || (JoinFlag && GroupAddress == NULL)) {\r
+  if ((This == NULL) || (JoinFlag && (GroupAddress == NULL))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (GroupAddress != NULL && !IP6_IS_MULTICAST (GroupAddress)) {\r
+  if ((GroupAddress != NULL) && !IP6_IS_MULTICAST (GroupAddress)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -764,7 +763,7 @@ EfiIp6Groups (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  OldTpl     = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   if (IpInstance->State != IP6_STATE_CONFIGED) {\r
     Status = EFI_NOT_STARTED;\r
@@ -824,17 +823,17 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 EfiIp6Routes (\r
-  IN EFI_IP6_PROTOCOL    *This,\r
-  IN BOOLEAN             DeleteRoute,\r
-  IN EFI_IPv6_ADDRESS    *Destination    OPTIONAL,\r
-  IN UINT8               PrefixLength,\r
-  IN EFI_IPv6_ADDRESS    *GatewayAddress OPTIONAL\r
+  IN EFI_IP6_PROTOCOL  *This,\r
+  IN BOOLEAN           DeleteRoute,\r
+  IN EFI_IPv6_ADDRESS  *Destination    OPTIONAL,\r
+  IN UINT8             PrefixLength,\r
+  IN EFI_IPv6_ADDRESS  *GatewayAddress OPTIONAL\r
   )\r
 {\r
-  IP6_PROTOCOL              *IpInstance;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
-  IP6_SERVICE               *IpSb;\r
+  IP6_PROTOCOL  *IpInstance;\r
+  EFI_STATUS    Status;\r
+  EFI_TPL       OldTpl;\r
+  IP6_SERVICE   *IpSb;\r
 \r
   if ((This == NULL) || (PrefixLength > IP6_PREFIX_MAX)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -855,7 +854,7 @@ EfiIp6Routes (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (!DeleteRoute && (Destination == NULL || GatewayAddress == NULL)) {\r
+  if (!DeleteRoute && ((Destination == NULL) || (GatewayAddress == NULL))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -866,7 +865,8 @@ EfiIp6Routes (
 \r
     if (!NetIp6IsUnspecifiedAddr (GatewayAddress) &&\r
         !NetIp6IsNetEqual (GatewayAddress, &IpInstance->ConfigData.StationAddress, PrefixLength)\r
-          ) {\r
+        )\r
+    {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
@@ -935,20 +935,20 @@ EfiIp6Routes (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp6Neighbors (\r
-  IN EFI_IP6_PROTOCOL          *This,\r
-  IN BOOLEAN                   DeleteFlag,\r
-  IN EFI_IPv6_ADDRESS          *TargetIp6Address,\r
-  IN EFI_MAC_ADDRESS           *TargetLinkAddress OPTIONAL,\r
-  IN UINT32                    Timeout,\r
-  IN BOOLEAN                   Override\r
+  IN EFI_IP6_PROTOCOL  *This,\r
+  IN BOOLEAN           DeleteFlag,\r
+  IN EFI_IPv6_ADDRESS  *TargetIp6Address,\r
+  IN EFI_MAC_ADDRESS   *TargetLinkAddress OPTIONAL,\r
+  IN UINT32            Timeout,\r
+  IN BOOLEAN           Override\r
   )\r
 {\r
-  EFI_TPL                   OldTpl;\r
-  EFI_STATUS                Status;\r
-  IP6_PROTOCOL              *IpInstance;\r
-  IP6_SERVICE               *IpSb;\r
+  EFI_TPL       OldTpl;\r
+  EFI_STATUS    Status;\r
+  IP6_PROTOCOL  *IpInstance;\r
+  IP6_SERVICE   *IpSb;\r
 \r
-  if (This == NULL || TargetIp6Address == NULL) {\r
+  if ((This == NULL) || (TargetIp6Address == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1011,18 +1011,18 @@ Exit:
 EFI_STATUS\r
 EFIAPI\r
 Ip6TokenExist (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   )\r
 {\r
   EFI_IP6_COMPLETION_TOKEN  *Token;\r
   EFI_IP6_COMPLETION_TOKEN  *TokenInItem;\r
 \r
-  Token       = (EFI_IP6_COMPLETION_TOKEN *) Context;\r
-  TokenInItem = (EFI_IP6_COMPLETION_TOKEN *) Item->Key;\r
+  Token       = (EFI_IP6_COMPLETION_TOKEN *)Context;\r
+  TokenInItem = (EFI_IP6_COMPLETION_TOKEN *)Item->Key;\r
 \r
-  if (Token == TokenInItem || Token->Event == TokenInItem->Event) {\r
+  if ((Token == TokenInItem) || (Token->Event == TokenInItem->Event)) {\r
     return EFI_ACCESS_DENIED;\r
   }\r
 \r
@@ -1041,29 +1041,29 @@ Ip6TokenExist (
 **/\r
 EFI_STATUS\r
 Ip6TxTokenValid (\r
-  IN EFI_IP6_COMPLETION_TOKEN   *Token\r
+  IN EFI_IP6_COMPLETION_TOKEN  *Token\r
   )\r
 {\r
-  EFI_IP6_TRANSMIT_DATA     *TxData;\r
-  UINT32                    Index;\r
-  UINT32                    DataLength;\r
+  EFI_IP6_TRANSMIT_DATA  *TxData;\r
+  UINT32                 Index;\r
+  UINT32                 DataLength;\r
 \r
-  if (Token == NULL || Token->Event == NULL) {\r
+  if ((Token == NULL) || (Token->Event == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   TxData = Token->Packet.TxData;\r
 \r
-  if (TxData == NULL || (TxData->ExtHdrsLength != 0 && TxData->ExtHdrs == NULL)) {\r
+  if ((TxData == NULL) || ((TxData->ExtHdrsLength != 0) && (TxData->ExtHdrs == NULL))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (TxData->FragmentCount == 0 || TxData->DataLength == 0) {\r
+  if ((TxData->FragmentCount == 0) || (TxData->DataLength == 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   for (DataLength = 0, Index = 0; Index < TxData->FragmentCount; Index++) {\r
-    if (TxData->FragmentTable[Index].FragmentLength == 0 || TxData->FragmentTable[Index].FragmentBuffer == NULL) {\r
+    if ((TxData->FragmentTable[Index].FragmentLength == 0) || (TxData->FragmentTable[Index].FragmentBuffer == NULL)) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
@@ -1115,13 +1115,13 @@ Ip6TxTokenValid (
 VOID\r
 EFIAPI\r
 Ip6FreeTxToken (\r
-  IN VOID                   *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  IP6_TXTOKEN_WRAP          *Wrap;\r
-  NET_MAP_ITEM              *Item;\r
+  IP6_TXTOKEN_WRAP  *Wrap;\r
+  NET_MAP_ITEM      *Item;\r
 \r
-  Wrap = (IP6_TXTOKEN_WRAP *) Context;\r
+  Wrap = (IP6_TXTOKEN_WRAP *)Context;\r
 \r
   //\r
   // Signal IpSecRecycleEvent to inform IPsec free the memory\r
@@ -1152,7 +1152,6 @@ Ip6FreeTxToken (
   FreePool (Wrap);\r
 }\r
 \r
-\r
 /**\r
   The callback function to Ip6Output to update the transmit status.\r
 \r
@@ -1164,19 +1163,19 @@ Ip6FreeTxToken (
 **/\r
 VOID\r
 Ip6OnPacketSent (\r
-  IN NET_BUF                   *Packet,\r
-  IN EFI_STATUS                IoStatus,\r
-  IN UINT32                    Flag,\r
-  IN VOID                      *Context\r
+  IN NET_BUF     *Packet,\r
+  IN EFI_STATUS  IoStatus,\r
+  IN UINT32      Flag,\r
+  IN VOID        *Context\r
   )\r
 {\r
-  IP6_TXTOKEN_WRAP             *Wrap;\r
+  IP6_TXTOKEN_WRAP  *Wrap;\r
 \r
   //\r
   // This is the transmission request from upper layer,\r
   // not the IP6 driver itself.\r
   //\r
-  Wrap                = (IP6_TXTOKEN_WRAP *) Context;\r
+  Wrap                = (IP6_TXTOKEN_WRAP *)Context;\r
   Wrap->Token->Status = IoStatus;\r
 \r
   NetbufFree (Wrap->Packet);\r
@@ -1241,16 +1240,16 @@ EfiIp6Transmit (
   IN EFI_IP6_COMPLETION_TOKEN  *Token\r
   )\r
 {\r
-  IP6_SERVICE               *IpSb;\r
-  IP6_PROTOCOL              *IpInstance;\r
-  EFI_IP6_CONFIG_DATA       *Config;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
-  EFI_IP6_HEADER            Head;\r
-  EFI_IP6_TRANSMIT_DATA     *TxData;\r
-  EFI_IP6_OVERRIDE_DATA     *Override;\r
-  IP6_TXTOKEN_WRAP          *Wrap;\r
-  UINT8                     *ExtHdrs;\r
+  IP6_SERVICE            *IpSb;\r
+  IP6_PROTOCOL           *IpInstance;\r
+  EFI_IP6_CONFIG_DATA    *Config;\r
+  EFI_STATUS             Status;\r
+  EFI_TPL                OldTpl;\r
+  EFI_IP6_HEADER         Head;\r
+  EFI_IP6_TRANSMIT_DATA  *TxData;\r
+  EFI_IP6_OVERRIDE_DATA  *Override;\r
+  IP6_TXTOKEN_WRAP       *Wrap;\r
+  UINT8                  *ExtHdrs;\r
 \r
   //\r
   // Check input parameters.\r
@@ -1273,7 +1272,7 @@ EfiIp6Transmit (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  OldTpl     = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   if (IpInstance->State != IP6_STATE_CONFIGED) {\r
     Status = EFI_NOT_STARTED;\r
@@ -1293,7 +1292,7 @@ EfiIp6Transmit (
   //\r
   // Build the IP header, fill in the information from ConfigData or OverrideData\r
   //\r
-  ZeroMem (&Head, sizeof(EFI_IP6_HEADER));\r
+  ZeroMem (&Head, sizeof (EFI_IP6_HEADER));\r
   TxData = Token->Packet.TxData;\r
   IP6_COPY_ADDRESS (&Head.SourceAddress, &Config->StationAddress);\r
   IP6_COPY_ADDRESS (&Head.DestinationAddress, &Config->DestinationAddress);\r
@@ -1306,7 +1305,6 @@ EfiIp6Transmit (
     }\r
 \r
     ASSERT (!NetIp6IsUnspecifiedAddr (&Config->StationAddress));\r
-\r
   } else {\r
     //\r
     // StationAddress is unspecified only when ConfigData.Dest is unspecified.\r
@@ -1342,15 +1340,15 @@ EfiIp6Transmit (
     Override        = TxData->OverrideData;\r
     Head.NextHeader = Override->Protocol;\r
     Head.HopLimit   = Override->HopLimit;\r
-    Head.FlowLabelL = HTONS ((UINT16) Override->FlowLabel);\r
-    Head.FlowLabelH = (UINT8) ((Override->FlowLabel >> 16) & 0x0F);\r
+    Head.FlowLabelL = HTONS ((UINT16)Override->FlowLabel);\r
+    Head.FlowLabelH = (UINT8)((Override->FlowLabel >> 16) & 0x0F);\r
   } else {\r
     Head.HopLimit   = Config->HopLimit;\r
-    Head.FlowLabelL = HTONS ((UINT16) Config->FlowLabel);\r
-    Head.FlowLabelH = (UINT8) ((Config->FlowLabel >> 16) & 0x0F);\r
+    Head.FlowLabelL = HTONS ((UINT16)Config->FlowLabel);\r
+    Head.FlowLabelH = (UINT8)((Config->FlowLabel >> 16) & 0x0F);\r
   }\r
 \r
-  Head.PayloadLength = HTONS ((UINT16) (TxData->ExtHdrsLength + TxData->DataLength));\r
+  Head.PayloadLength = HTONS ((UINT16)(TxData->ExtHdrsLength + TxData->DataLength));\r
 \r
   //\r
   // OK, it survives all the validation check. Wrap the token in\r
@@ -1362,18 +1360,18 @@ EfiIp6Transmit (
     goto Exit;\r
   }\r
 \r
-  Wrap->IpInstance  = IpInstance;\r
-  Wrap->Token       = Token;\r
-  Wrap->Sent        = FALSE;\r
-  Wrap->Life        = IP6_US_TO_SEC (Config->TransmitTimeout);\r
-  Wrap->Packet      = NetbufFromExt (\r
-                        (NET_FRAGMENT *) TxData->FragmentTable,\r
-                        TxData->FragmentCount,\r
-                        IP6_MAX_HEADLEN,\r
-                        0,\r
-                        Ip6FreeTxToken,\r
-                        Wrap\r
-                        );\r
+  Wrap->IpInstance = IpInstance;\r
+  Wrap->Token      = Token;\r
+  Wrap->Sent       = FALSE;\r
+  Wrap->Life       = IP6_US_TO_SEC (Config->TransmitTimeout);\r
+  Wrap->Packet     = NetbufFromExt (\r
+                       (NET_FRAGMENT *)TxData->FragmentTable,\r
+                       TxData->FragmentCount,\r
+                       IP6_MAX_HEADLEN,\r
+                       0,\r
+                       Ip6FreeTxToken,\r
+                       Wrap\r
+                       );\r
 \r
   if (Wrap->Packet == NULL) {\r
     FreePool (Wrap);\r
@@ -1397,8 +1395,8 @@ EfiIp6Transmit (
   // Allocate a new buffer to store IPv6 extension headers to avoid updating\r
   // the original data in EFI_IP6_COMPLETION_TOKEN.\r
   //\r
-  if (TxData->ExtHdrsLength != 0 && TxData->ExtHdrs != NULL) {\r
-    ExtHdrs = (UINT8 *) AllocateCopyPool (TxData->ExtHdrsLength, TxData->ExtHdrs);\r
+  if ((TxData->ExtHdrsLength != 0) && (TxData->ExtHdrs != NULL)) {\r
+    ExtHdrs = (UINT8 *)AllocateCopyPool (TxData->ExtHdrsLength, TxData->ExtHdrs);\r
     if (ExtHdrs == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Exit;\r
@@ -1485,12 +1483,12 @@ EfiIp6Receive (
   IN EFI_IP6_COMPLETION_TOKEN  *Token\r
   )\r
 {\r
-  IP6_PROTOCOL              *IpInstance;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
-  IP6_SERVICE               *IpSb;\r
+  IP6_PROTOCOL  *IpInstance;\r
+  EFI_STATUS    Status;\r
+  EFI_TPL       OldTpl;\r
+  IP6_SERVICE   *IpSb;\r
 \r
-  if (This == NULL || Token == NULL || Token->Event == NULL) {\r
+  if ((This == NULL) || (Token == NULL) || (Token->Event == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1540,7 +1538,6 @@ Exit:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Cancel the transmitted but not recycled packet. If a matching\r
   token is found, it will call Ip6CancelPacket to cancel the\r
@@ -1561,15 +1558,15 @@ Exit:
 EFI_STATUS\r
 EFIAPI\r
 Ip6CancelTxTokens (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   )\r
 {\r
   EFI_IP6_COMPLETION_TOKEN  *Token;\r
   IP6_TXTOKEN_WRAP          *Wrap;\r
 \r
-  Token = (EFI_IP6_COMPLETION_TOKEN *) Context;\r
+  Token = (EFI_IP6_COMPLETION_TOKEN *)Context;\r
 \r
   //\r
   // Return EFI_SUCCESS to check the next item in the map if\r
@@ -1579,7 +1576,7 @@ Ip6CancelTxTokens (
     return EFI_SUCCESS;\r
   }\r
 \r
-  Wrap = (IP6_TXTOKEN_WRAP *) Item->Value;\r
+  Wrap = (IP6_TXTOKEN_WRAP *)Item->Value;\r
   ASSERT (Wrap != NULL);\r
 \r
   //\r
@@ -1599,7 +1596,6 @@ Ip6CancelTxTokens (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Cancel the receive request. This is simple, because\r
   it is only enqueued in our local receive map.\r
@@ -1618,15 +1614,15 @@ Ip6CancelTxTokens (
 EFI_STATUS\r
 EFIAPI\r
 Ip6CancelRxTokens (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   )\r
 {\r
   EFI_IP6_COMPLETION_TOKEN  *Token;\r
   EFI_IP6_COMPLETION_TOKEN  *This;\r
 \r
-  Token = (EFI_IP6_COMPLETION_TOKEN *) Context;\r
+  Token = (EFI_IP6_COMPLETION_TOKEN *)Context;\r
   This  = Item->Key;\r
 \r
   if ((Token != NULL) && (Token != This)) {\r
@@ -1662,11 +1658,11 @@ Ip6CancelRxTokens (
 **/\r
 EFI_STATUS\r
 Ip6Cancel (\r
-  IN IP6_PROTOCOL             *IpInstance,\r
-  IN EFI_IP6_COMPLETION_TOKEN *Token          OPTIONAL\r
+  IN IP6_PROTOCOL              *IpInstance,\r
+  IN EFI_IP6_COMPLETION_TOKEN  *Token          OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // First check the transmitted packet. Ip6CancelTxTokens returns\r
@@ -1713,7 +1709,6 @@ Ip6Cancel (
   // all of them are cancelled.\r
   //\r
   if (!NetMapIsEmpty (&IpInstance->TxTokens) || !NetMapIsEmpty (&IpInstance->RxTokens)) {\r
-\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
@@ -1755,9 +1750,9 @@ EfiIp6Cancel (
   IN EFI_IP6_COMPLETION_TOKEN  *Token    OPTIONAL\r
   )\r
 {\r
-  IP6_PROTOCOL              *IpInstance;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
+  IP6_PROTOCOL  *IpInstance;\r
+  EFI_STATUS    Status;\r
+  EFI_TPL       OldTpl;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1807,7 +1802,7 @@ Exit:
 EFI_STATUS\r
 EFIAPI\r
 EfiIp6Poll (\r
-  IN EFI_IP6_PROTOCOL          *This\r
+  IN EFI_IP6_PROTOCOL  *This\r
   )\r
 {\r
   IP6_PROTOCOL                  *IpInstance;\r
@@ -1836,6 +1831,4 @@ EfiIp6Poll (
   // the packet polled up.\r
   //\r
   return Mnp->Poll (Mnp);\r
-\r
 }\r
-\r
index 8919e9448900f89789434447a6bdec8266655c17..9802c33b55712eefc299a82fc37127aab0a8e10f 100644 (file)
@@ -54,8 +54,8 @@
 #include "Ip6ConfigNv.h"\r
 #include "Ip6ConfigImpl.h"\r
 \r
-#define IP6_PROTOCOL_SIGNATURE SIGNATURE_32 ('I', 'P', '6', 'P')\r
-#define IP6_SERVICE_SIGNATURE  SIGNATURE_32 ('I', 'P', '6', 'S')\r
+#define IP6_PROTOCOL_SIGNATURE  SIGNATURE_32 ('I', 'P', '6', 'P')\r
+#define IP6_SERVICE_SIGNATURE   SIGNATURE_32 ('I', 'P', '6', 'S')\r
 \r
 //\r
 // The state of IP6 protocol. It starts from UNCONFIGED. if it is\r
@@ -63,8 +63,8 @@
 // is called, it becomes UNCONFIGED again. If (partly) destroyed, it\r
 // becomes DESTROY.\r
 //\r
-#define IP6_STATE_UNCONFIGED   0\r
-#define IP6_STATE_CONFIGED     1\r
+#define IP6_STATE_UNCONFIGED  0\r
+#define IP6_STATE_CONFIGED    1\r
 \r
 //\r
 // The state of IP6 service. It starts from UNSTARTED. It transits\r
 #define IP6_SERVICE_FROM_PROTOCOL(Sb)   \\r
           CR ((Sb), IP6_SERVICE, ServiceBinding, IP6_SERVICE_SIGNATURE)\r
 \r
-#define IP6_NO_MAPPING(IpInstance) (!(IpInstance)->Interface->Configured)\r
+#define IP6_NO_MAPPING(IpInstance)  (!(IpInstance)->Interface->Configured)\r
 \r
-extern EFI_IPSEC2_PROTOCOL *mIpSec;\r
-extern BOOLEAN             mIpSec2Installed;\r
+extern EFI_IPSEC2_PROTOCOL  *mIpSec;\r
+extern BOOLEAN              mIpSec2Installed;\r
 \r
 //\r
 // IP6_TXTOKEN_WRAP wraps the upper layer's transmit token.\r
@@ -98,17 +98,17 @@ extern BOOLEAN             mIpSec2Installed;
 // user's event signalled.\r
 //\r
 typedef struct {\r
-  IP6_PROTOCOL              *IpInstance;\r
-  EFI_IP6_COMPLETION_TOKEN  *Token;\r
-  EFI_EVENT                 IpSecRecycleSignal;\r
-  NET_BUF                   *Packet;\r
-  BOOLEAN                   Sent;\r
-  INTN                      Life;\r
+  IP6_PROTOCOL                *IpInstance;\r
+  EFI_IP6_COMPLETION_TOKEN    *Token;\r
+  EFI_EVENT                   IpSecRecycleSignal;\r
+  NET_BUF                     *Packet;\r
+  BOOLEAN                     Sent;\r
+  INTN                        Life;\r
 } IP6_TXTOKEN_WRAP;\r
 \r
 typedef struct {\r
-  EFI_EVENT                 IpSecRecycleSignal;\r
-  NET_BUF                   *Packet;\r
+  EFI_EVENT    IpSecRecycleSignal;\r
+  NET_BUF      *Packet;\r
 } IP6_IPSEC_WRAP;\r
 \r
 //\r
@@ -121,123 +121,123 @@ typedef struct {
 // fragments will be freed at last.\r
 //\r
 typedef struct {\r
-  LIST_ENTRY                Link;\r
-  IP6_PROTOCOL              *IpInstance;\r
-  NET_BUF                   *Packet;\r
-  EFI_IP6_RECEIVE_DATA      RxData;\r
+  LIST_ENTRY              Link;\r
+  IP6_PROTOCOL            *IpInstance;\r
+  NET_BUF                 *Packet;\r
+  EFI_IP6_RECEIVE_DATA    RxData;\r
 } IP6_RXDATA_WRAP;\r
 \r
 struct _IP6_PROTOCOL {\r
-  UINT32                    Signature;\r
+  UINT32                 Signature;\r
 \r
-  EFI_IP6_PROTOCOL          Ip6Proto;\r
-  EFI_HANDLE                Handle;\r
-  INTN                      State;\r
+  EFI_IP6_PROTOCOL       Ip6Proto;\r
+  EFI_HANDLE             Handle;\r
+  INTN                   State;\r
 \r
-  IP6_SERVICE               *Service;\r
-  LIST_ENTRY                Link; // Link to all the IP protocol from the service\r
+  IP6_SERVICE            *Service;\r
+  LIST_ENTRY             Link;    // Link to all the IP protocol from the service\r
 \r
-  UINT8                     PrefixLength; // PrefixLength of the configured station address.\r
+  UINT8                  PrefixLength;    // PrefixLength of the configured station address.\r
   //\r
   // User's transmit/receive tokens, and received/delivered packets\r
   //\r
-  NET_MAP                   RxTokens;\r
-  NET_MAP                   TxTokens;   // map between (User's Token, IP6_TXTOKE_WRAP)\r
-  LIST_ENTRY                Received;   // Received but not delivered packet\r
-  LIST_ENTRY                Delivered;  // Delivered and to be recycled packets\r
-  EFI_LOCK                  RecycleLock;\r
+  NET_MAP                RxTokens;\r
+  NET_MAP                TxTokens;      // map between (User's Token, IP6_TXTOKE_WRAP)\r
+  LIST_ENTRY             Received;      // Received but not delivered packet\r
+  LIST_ENTRY             Delivered;     // Delivered and to be recycled packets\r
+  EFI_LOCK               RecycleLock;\r
 \r
-  IP6_INTERFACE             *Interface;\r
-  LIST_ENTRY                AddrLink;   // Ip instances with the same IP address.\r
+  IP6_INTERFACE          *Interface;\r
+  LIST_ENTRY             AddrLink;      // Ip instances with the same IP address.\r
 \r
-  EFI_IPv6_ADDRESS          *GroupList; // stored in network order.\r
-  UINT32                    GroupCount;\r
+  EFI_IPv6_ADDRESS       *GroupList;    // stored in network order.\r
+  UINT32                 GroupCount;\r
 \r
-  EFI_IP6_CONFIG_DATA       ConfigData;\r
-  BOOLEAN                   InDestroy;\r
+  EFI_IP6_CONFIG_DATA    ConfigData;\r
+  BOOLEAN                InDestroy;\r
 };\r
 \r
 struct _IP6_SERVICE {\r
-  UINT32                          Signature;\r
-  EFI_SERVICE_BINDING_PROTOCOL    ServiceBinding;\r
-  INTN                            State;\r
+  UINT32                             Signature;\r
+  EFI_SERVICE_BINDING_PROTOCOL       ServiceBinding;\r
+  INTN                               State;\r
 \r
   //\r
   // List of all the IP instances and interfaces, and default\r
   // interface and route table and caches.\r
   //\r
-  UINTN                           NumChildren;\r
-  LIST_ENTRY                      Children;\r
+  UINTN                              NumChildren;\r
+  LIST_ENTRY                         Children;\r
 \r
-  LIST_ENTRY                      Interfaces;\r
+  LIST_ENTRY                         Interfaces;\r
 \r
-  IP6_INTERFACE                   *DefaultInterface;\r
-  IP6_ROUTE_TABLE                 *RouteTable;\r
+  IP6_INTERFACE                      *DefaultInterface;\r
+  IP6_ROUTE_TABLE                    *RouteTable;\r
 \r
-  IP6_LINK_RX_TOKEN               RecvRequest;\r
+  IP6_LINK_RX_TOKEN                  RecvRequest;\r
 \r
   //\r
   // Ip reassemble utilities and MLD data\r
   //\r
-  IP6_ASSEMBLE_TABLE              Assemble;\r
-  IP6_MLD_SERVICE_DATA            MldCtrl;\r
+  IP6_ASSEMBLE_TABLE                 Assemble;\r
+  IP6_MLD_SERVICE_DATA               MldCtrl;\r
 \r
-  EFI_IPv6_ADDRESS                LinkLocalAddr;\r
-  BOOLEAN                         LinkLocalOk;\r
-  BOOLEAN                         LinkLocalDadFail;\r
-  BOOLEAN                         Dhcp6NeedStart;\r
-  BOOLEAN                         Dhcp6NeedInfoRequest;\r
+  EFI_IPv6_ADDRESS                   LinkLocalAddr;\r
+  BOOLEAN                            LinkLocalOk;\r
+  BOOLEAN                            LinkLocalDadFail;\r
+  BOOLEAN                            Dhcp6NeedStart;\r
+  BOOLEAN                            Dhcp6NeedInfoRequest;\r
 \r
   //\r
   // ND data\r
   //\r
-  UINT8                           CurHopLimit;\r
-  UINT32                          LinkMTU;\r
-  UINT32                          BaseReachableTime;\r
-  UINT32                          ReachableTime;\r
-  UINT32                          RetransTimer;\r
-  LIST_ENTRY                      NeighborTable;\r
+  UINT8                              CurHopLimit;\r
+  UINT32                             LinkMTU;\r
+  UINT32                             BaseReachableTime;\r
+  UINT32                             ReachableTime;\r
+  UINT32                             RetransTimer;\r
+  LIST_ENTRY                         NeighborTable;\r
 \r
-  LIST_ENTRY                      OnlinkPrefix;\r
-  LIST_ENTRY                      AutonomousPrefix;\r
+  LIST_ENTRY                         OnlinkPrefix;\r
+  LIST_ENTRY                         AutonomousPrefix;\r
 \r
-  LIST_ENTRY                      DefaultRouterList;\r
-  UINT32                          RoundRobin;\r
+  LIST_ENTRY                         DefaultRouterList;\r
+  UINT32                             RoundRobin;\r
 \r
-  UINT8                           InterfaceIdLen;\r
-  UINT8                           *InterfaceId;\r
+  UINT8                              InterfaceIdLen;\r
+  UINT8                              *InterfaceId;\r
 \r
-  BOOLEAN                         RouterAdvertiseReceived;\r
-  UINT8                           SolicitTimer;\r
-  UINT32                          Ticks;\r
+  BOOLEAN                            RouterAdvertiseReceived;\r
+  UINT8                              SolicitTimer;\r
+  UINT32                             Ticks;\r
 \r
   //\r
   // Low level protocol used by this service instance\r
   //\r
-  EFI_HANDLE                      Image;\r
-  EFI_HANDLE                      Controller;\r
+  EFI_HANDLE                         Image;\r
+  EFI_HANDLE                         Controller;\r
 \r
-  EFI_HANDLE                      MnpChildHandle;\r
-  EFI_MANAGED_NETWORK_PROTOCOL    *Mnp;\r
+  EFI_HANDLE                         MnpChildHandle;\r
+  EFI_MANAGED_NETWORK_PROTOCOL       *Mnp;\r
 \r
-  EFI_MANAGED_NETWORK_CONFIG_DATA MnpConfigData;\r
-  EFI_SIMPLE_NETWORK_MODE         SnpMode;\r
+  EFI_MANAGED_NETWORK_CONFIG_DATA    MnpConfigData;\r
+  EFI_SIMPLE_NETWORK_MODE            SnpMode;\r
 \r
-  EFI_EVENT                       Timer;\r
-  EFI_EVENT                       FasterTimer;\r
+  EFI_EVENT                          Timer;\r
+  EFI_EVENT                          FasterTimer;\r
 \r
   //\r
   // IPv6 Configuration Protocol instance\r
   //\r
-  IP6_CONFIG_INSTANCE             Ip6ConfigInstance;\r
+  IP6_CONFIG_INSTANCE                Ip6ConfigInstance;\r
 \r
   //\r
   // The string representation of the current mac address of the\r
   // NIC this IP6_SERVICE works on.\r
   //\r
-  CHAR16                          *MacString;\r
-  UINT32                          MaxPacketSize;\r
-  UINT32                          OldMaxPacketSize;\r
+  CHAR16                             *MacString;\r
+  UINT32                             MaxPacketSize;\r
+  UINT32                             OldMaxPacketSize;\r
 };\r
 \r
 /**\r
@@ -264,7 +264,7 @@ struct _IP6_SERVICE {
 VOID\r
 EFIAPI\r
 Ip6FreeTxToken (\r
-  IN VOID                   *Context\r
+  IN VOID  *Context\r
   );\r
 \r
 /**\r
@@ -287,8 +287,8 @@ Ip6FreeTxToken (
 **/\r
 EFI_STATUS\r
 Ip6ServiceConfigMnp (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN BOOLEAN                Force\r
+  IN IP6_SERVICE  *IpSb,\r
+  IN BOOLEAN      Force\r
   );\r
 \r
 /**\r
@@ -307,8 +307,8 @@ Ip6ServiceConfigMnp (
 **/\r
 EFI_STATUS\r
 Ip6Cancel (\r
-  IN IP6_PROTOCOL             *IpInstance,\r
-  IN EFI_IP6_COMPLETION_TOKEN *Token          OPTIONAL\r
+  IN IP6_PROTOCOL              *IpInstance,\r
+  IN EFI_IP6_COMPLETION_TOKEN  *Token          OPTIONAL\r
   );\r
 \r
 /**\r
@@ -320,8 +320,8 @@ Ip6Cancel (
 **/\r
 VOID\r
 Ip6InitProtocol (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN OUT IP6_PROTOCOL       *IpInstance\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN OUT IP6_PROTOCOL  *IpInstance\r
   );\r
 \r
 /**\r
@@ -335,7 +335,7 @@ Ip6InitProtocol (
 **/\r
 EFI_STATUS\r
 Ip6CleanProtocol (\r
-  IN OUT IP6_PROTOCOL            *IpInstance\r
+  IN OUT IP6_PROTOCOL  *IpInstance\r
   );\r
 \r
 //\r
@@ -362,10 +362,10 @@ Ip6CleanProtocol (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp6GetModeData (\r
-  IN EFI_IP6_PROTOCOL                 *This,\r
-  OUT EFI_IP6_MODE_DATA               *Ip6ModeData     OPTIONAL,\r
-  OUT EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData   OPTIONAL,\r
-  OUT EFI_SIMPLE_NETWORK_MODE         *SnpModeData     OPTIONAL\r
+  IN EFI_IP6_PROTOCOL                  *This,\r
+  OUT EFI_IP6_MODE_DATA                *Ip6ModeData     OPTIONAL,\r
+  OUT EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData   OPTIONAL,\r
+  OUT EFI_SIMPLE_NETWORK_MODE          *SnpModeData     OPTIONAL\r
   );\r
 \r
 /**\r
@@ -418,8 +418,8 @@ EfiIp6GetModeData (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp6Configure (\r
-  IN EFI_IP6_PROTOCOL          *This,\r
-  IN EFI_IP6_CONFIG_DATA       *Ip6ConfigData OPTIONAL\r
+  IN EFI_IP6_PROTOCOL     *This,\r
+  IN EFI_IP6_CONFIG_DATA  *Ip6ConfigData OPTIONAL\r
   );\r
 \r
 /**\r
@@ -507,11 +507,11 @@ EfiIp6Groups (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp6Routes (\r
-  IN EFI_IP6_PROTOCOL    *This,\r
-  IN BOOLEAN             DeleteRoute,\r
-  IN EFI_IPv6_ADDRESS    *Destination    OPTIONAL,\r
-  IN UINT8               PrefixLength,\r
-  IN EFI_IPv6_ADDRESS    *GatewayAddress OPTIONAL\r
+  IN EFI_IP6_PROTOCOL  *This,\r
+  IN BOOLEAN           DeleteRoute,\r
+  IN EFI_IPv6_ADDRESS  *Destination    OPTIONAL,\r
+  IN UINT8             PrefixLength,\r
+  IN EFI_IPv6_ADDRESS  *GatewayAddress OPTIONAL\r
   );\r
 \r
 /**\r
@@ -563,12 +563,12 @@ EfiIp6Routes (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp6Neighbors (\r
-  IN EFI_IP6_PROTOCOL          *This,\r
-  IN BOOLEAN                   DeleteFlag,\r
-  IN EFI_IPv6_ADDRESS          *TargetIp6Address,\r
-  IN EFI_MAC_ADDRESS           *TargetLinkAddress OPTIONAL,\r
-  IN UINT32                    Timeout,\r
-  IN BOOLEAN                   Override\r
+  IN EFI_IP6_PROTOCOL  *This,\r
+  IN BOOLEAN           DeleteFlag,\r
+  IN EFI_IPv6_ADDRESS  *TargetIp6Address,\r
+  IN EFI_MAC_ADDRESS   *TargetLinkAddress OPTIONAL,\r
+  IN UINT32            Timeout,\r
+  IN BOOLEAN           Override\r
   );\r
 \r
 /**\r
@@ -742,7 +742,7 @@ EfiIp6Cancel (
 EFI_STATUS\r
 EFIAPI\r
 EfiIp6Poll (\r
-  IN EFI_IP6_PROTOCOL          *This\r
+  IN EFI_IP6_PROTOCOL  *This\r
   );\r
 \r
 #endif\r
index c42baa35b6b6641f281ddbd6f36bea6b316a005f..fe6a3648e187a2d07ca66d968f5bb49cda8deaf9 100644 (file)
 **/\r
 IP6_ASSEMBLE_ENTRY *\r
 Ip6CreateAssembleEntry (\r
-  IN EFI_IPv6_ADDRESS       *Dst,\r
-  IN EFI_IPv6_ADDRESS       *Src,\r
-  IN UINT32                 Id\r
+  IN EFI_IPv6_ADDRESS  *Dst,\r
+  IN EFI_IPv6_ADDRESS  *Src,\r
+  IN UINT32            Id\r
   )\r
 {\r
-  IP6_ASSEMBLE_ENTRY        *Assemble;\r
+  IP6_ASSEMBLE_ENTRY  *Assemble;\r
 \r
   Assemble = AllocatePool (sizeof (IP6_ASSEMBLE_ENTRY));\r
   if (Assemble == NULL) {\r
@@ -40,8 +40,8 @@ Ip6CreateAssembleEntry (
   IP6_COPY_ADDRESS (&Assemble->Src, Src);\r
   InitializeListHead (&Assemble->Fragments);\r
 \r
-  Assemble->Id       = Id;\r
-  Assemble->Life     = IP6_FRAGMENT_LIFE + 1;\r
+  Assemble->Id   = Id;\r
+  Assemble->Life = IP6_FRAGMENT_LIFE + 1;\r
 \r
   Assemble->TotalLen = 0;\r
   Assemble->CurLen   = 0;\r
@@ -60,12 +60,12 @@ Ip6CreateAssembleEntry (
 **/\r
 VOID\r
 Ip6FreeAssembleEntry (\r
-  IN IP6_ASSEMBLE_ENTRY     *Assemble\r
+  IN IP6_ASSEMBLE_ENTRY  *Assemble\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  NET_BUF                   *Fragment;\r
+  LIST_ENTRY  *Entry;\r
+  LIST_ENTRY  *Next;\r
+  NET_BUF     *Fragment;\r
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &Assemble->Fragments) {\r
     Fragment = NET_LIST_USER_STRUCT (Entry, NET_BUF, List);\r
@@ -92,10 +92,10 @@ Ip6FreeAssembleEntry (
 VOID\r
 EFIAPI\r
 Ip6OnFreeFragments (\r
-  IN VOID                   *Arg\r
+  IN VOID  *Arg\r
   )\r
 {\r
-  Ip6FreeAssembleEntry ((IP6_ASSEMBLE_ENTRY *) Arg);\r
+  Ip6FreeAssembleEntry ((IP6_ASSEMBLE_ENTRY *)Arg);\r
 }\r
 \r
 /**\r
@@ -109,33 +109,33 @@ Ip6OnFreeFragments (
 **/\r
 VOID\r
 Ip6TrimPacket (\r
-  IN OUT NET_BUF            *Packet,\r
-  IN INTN                   Start,\r
-  IN INTN                   End\r
+  IN OUT NET_BUF  *Packet,\r
+  IN INTN         Start,\r
+  IN INTN         End\r
   )\r
 {\r
-  IP6_CLIP_INFO             *Info;\r
-  INTN                      Len;\r
+  IP6_CLIP_INFO  *Info;\r
+  INTN           Len;\r
 \r
   Info = IP6_GET_CLIP_INFO (Packet);\r
 \r
   ASSERT (Info->Start + Info->Length == Info->End);\r
   ASSERT ((Info->Start < End) && (Start < Info->End));\r
 \r
-   if (Info->Start < Start) {\r
+  if (Info->Start < Start) {\r
     Len = Start - Info->Start;\r
 \r
-    NetbufTrim (Packet, (UINT32) Len, NET_BUF_HEAD);\r
-    Info->Start   = (UINT32) Start;\r
-    Info->Length -= (UINT32) Len;\r
+    NetbufTrim (Packet, (UINT32)Len, NET_BUF_HEAD);\r
+    Info->Start   = (UINT32)Start;\r
+    Info->Length -= (UINT32)Len;\r
   }\r
 \r
   if (End < Info->End) {\r
     Len = End - Info->End;\r
 \r
-    NetbufTrim (Packet, (UINT32) Len, NET_BUF_TAIL);\r
-    Info->End     = (UINT32) End;\r
-    Info->Length -= (UINT32) Len;\r
+    NetbufTrim (Packet, (UINT32)Len, NET_BUF_TAIL);\r
+    Info->End     = (UINT32)End;\r
+    Info->Length -= (UINT32)Len;\r
   }\r
 }\r
 \r
@@ -156,26 +156,26 @@ Ip6TrimPacket (
 **/\r
 NET_BUF *\r
 Ip6Reassemble (\r
-  IN OUT IP6_ASSEMBLE_TABLE *Table,\r
-  IN NET_BUF                *Packet\r
+  IN OUT IP6_ASSEMBLE_TABLE  *Table,\r
+  IN NET_BUF                 *Packet\r
   )\r
 {\r
-  EFI_IP6_HEADER            *Head;\r
-  IP6_CLIP_INFO             *This;\r
-  IP6_CLIP_INFO             *Node;\r
-  IP6_ASSEMBLE_ENTRY        *Assemble;\r
-  IP6_ASSEMBLE_ENTRY        *Entry;\r
-  LIST_ENTRY                *ListHead;\r
-  LIST_ENTRY                *Prev;\r
-  LIST_ENTRY                *Cur;\r
-  NET_BUF                   *Fragment;\r
-  NET_BUF                   *TmpPacket;\r
-  NET_BUF                   *NewPacket;\r
-  NET_BUF                   *Duplicate;\r
-  UINT8                     *DupHead;\r
-  INTN                      Index;\r
-  UINT16                    UnFragmentLen;\r
-  UINT8                     *NextHeader;\r
+  EFI_IP6_HEADER      *Head;\r
+  IP6_CLIP_INFO       *This;\r
+  IP6_CLIP_INFO       *Node;\r
+  IP6_ASSEMBLE_ENTRY  *Assemble;\r
+  IP6_ASSEMBLE_ENTRY  *Entry;\r
+  LIST_ENTRY          *ListHead;\r
+  LIST_ENTRY          *Prev;\r
+  LIST_ENTRY          *Cur;\r
+  NET_BUF             *Fragment;\r
+  NET_BUF             *TmpPacket;\r
+  NET_BUF             *NewPacket;\r
+  NET_BUF             *Duplicate;\r
+  UINT8               *DupHead;\r
+  INTN                Index;\r
+  UINT16              UnFragmentLen;\r
+  UINT8               *NextHeader;\r
 \r
   Head = Packet->Ip.Ip6;\r
   This = IP6_GET_CLIP_INFO (Packet);\r
@@ -185,16 +185,17 @@ Ip6Reassemble (
   //\r
   // Find the corresponding assemble entry by (Dst, Src, Id)\r
   //\r
-  Assemble  = NULL;\r
-  Index     = IP6_ASSEMBLE_HASH (&Head->DestinationAddress, &Head->SourceAddress, This->Id);\r
+  Assemble = NULL;\r
+  Index    = IP6_ASSEMBLE_HASH (&Head->DestinationAddress, &Head->SourceAddress, This->Id);\r
 \r
   NET_LIST_FOR_EACH (Cur, &Table->Bucket[Index]) {\r
     Entry = NET_LIST_USER_STRUCT (Cur, IP6_ASSEMBLE_ENTRY, Link);\r
 \r
-    if (Entry->Id == This->Id &&\r
+    if ((Entry->Id == This->Id) &&\r
         EFI_IP6_EQUAL (&Entry->Src, &Head->SourceAddress) &&\r
         EFI_IP6_EQUAL (&Entry->Dst, &Head->DestinationAddress)\r
-          ) {\r
+        )\r
+    {\r
       Assemble = Entry;\r
       break;\r
     }\r
@@ -239,8 +240,8 @@ Ip6Reassemble (
   // overlaps, trim the overlapped part off THIS fragment.\r
   //\r
   if ((Prev = Cur->BackLink) != ListHead) {\r
-    Fragment  = NET_LIST_USER_STRUCT (Prev, NET_BUF, List);\r
-    Node      = IP6_GET_CLIP_INFO (Fragment);\r
+    Fragment = NET_LIST_USER_STRUCT (Prev, NET_BUF, List);\r
+    Node     = IP6_GET_CLIP_INFO (Fragment);\r
 \r
     if (This->Start < Node->End) {\r
       if (This->End <= Node->End) {\r
@@ -331,13 +332,13 @@ Ip6Reassemble (
     //\r
     DupHead = NetbufGetByte (Duplicate, 0, NULL);\r
     ASSERT (DupHead != NULL);\r
-    Duplicate->Ip.Ip6 = Ip6NtohHead ((EFI_IP6_HEADER *) DupHead);\r
+    Duplicate->Ip.Ip6 = Ip6NtohHead ((EFI_IP6_HEADER *)DupHead);\r
     Assemble->Packet  = Duplicate;\r
 \r
     //\r
     // Adjust the unfragmentable part in first fragment\r
     //\r
-    UnFragmentLen = (UINT16) (This->HeadLen - sizeof (EFI_IP6_HEADER));\r
+    UnFragmentLen = (UINT16)(This->HeadLen - sizeof (EFI_IP6_HEADER));\r
     if (UnFragmentLen == 0) {\r
       //\r
       // There is not any unfragmentable extension header.\r
@@ -376,7 +377,6 @@ Ip6Reassemble (
   //     queue ends at the total length, all data is received.\r
   //\r
   if ((Assemble->TotalLen != 0) && (Assemble->CurLen >= Assemble->TotalLen)) {\r
-\r
     RemoveEntryList (&Assemble->Link);\r
 \r
     //\r
@@ -385,7 +385,7 @@ Ip6Reassemble (
     // is a fake, drop it now.\r
     //\r
     Fragment = NET_LIST_USER_STRUCT (ListHead->BackLink, NET_BUF, List);\r
-    if (IP6_GET_CLIP_INFO (Fragment)->End != (INTN) Assemble->TotalLen) {\r
+    if (IP6_GET_CLIP_INFO (Fragment)->End != (INTN)Assemble->TotalLen) {\r
       Ip6FreeAssembleEntry (Assemble);\r
       goto Error;\r
     }\r
@@ -441,7 +441,6 @@ Error:
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   The callback function for the net buffer that wraps the packet processed by\r
   IPsec. It releases the wrap packet and also signals IPsec to free the resources.\r
@@ -452,12 +451,12 @@ Error:
 VOID\r
 EFIAPI\r
 Ip6IpSecFree (\r
-  IN VOID                   *Arg\r
+  IN VOID  *Arg\r
   )\r
 {\r
-  IP6_IPSEC_WRAP            *Wrap;\r
+  IP6_IPSEC_WRAP  *Wrap;\r
 \r
-  Wrap = (IP6_IPSEC_WRAP *) Arg;\r
+  Wrap = (IP6_IPSEC_WRAP *)Arg;\r
 \r
   if (Wrap->IpSecRecycleSignal != NULL) {\r
     gBS->SignalEvent (Wrap->IpSecRecycleSignal);\r
@@ -506,24 +505,25 @@ Ip6IpSecProcessPacket (
   IN     VOID                   *Context\r
   )\r
 {\r
-  NET_FRAGMENT              *FragmentTable;\r
-  NET_FRAGMENT              *OriginalFragmentTable;\r
-  UINT32                    FragmentCount;\r
-  UINT32                    OriginalFragmentCount;\r
-  EFI_EVENT                 RecycleEvent;\r
-  NET_BUF                   *Packet;\r
-  IP6_TXTOKEN_WRAP          *TxWrap;\r
-  IP6_IPSEC_WRAP            *IpSecWrap;\r
-  EFI_STATUS                Status;\r
-  EFI_IP6_HEADER            *PacketHead;\r
-  UINT8                     *Buf;\r
-  EFI_IP6_HEADER            ZeroHead;\r
-\r
-  Status        = EFI_SUCCESS;\r
+  NET_FRAGMENT      *FragmentTable;\r
+  NET_FRAGMENT      *OriginalFragmentTable;\r
+  UINT32            FragmentCount;\r
+  UINT32            OriginalFragmentCount;\r
+  EFI_EVENT         RecycleEvent;\r
+  NET_BUF           *Packet;\r
+  IP6_TXTOKEN_WRAP  *TxWrap;\r
+  IP6_IPSEC_WRAP    *IpSecWrap;\r
+  EFI_STATUS        Status;\r
+  EFI_IP6_HEADER    *PacketHead;\r
+  UINT8             *Buf;\r
+  EFI_IP6_HEADER    ZeroHead;\r
+\r
+  Status = EFI_SUCCESS;\r
 \r
   if (!mIpSec2Installed) {\r
     goto ON_EXIT;\r
   }\r
+\r
   ASSERT (mIpSec != NULL);\r
 \r
   Packet        = *Netbuf;\r
@@ -532,7 +532,7 @@ Ip6IpSecProcessPacket (
   FragmentTable = NULL;\r
   PacketHead    = NULL;\r
   Buf           = NULL;\r
-  TxWrap        = (IP6_TXTOKEN_WRAP *) Context;\r
+  TxWrap        = (IP6_TXTOKEN_WRAP *)Context;\r
   FragmentCount = Packet->BlockOpNum;\r
   ZeroMem (&ZeroHead, sizeof (EFI_IP6_HEADER));\r
 \r
@@ -552,7 +552,6 @@ Ip6IpSecProcessPacket (
     IpSb->MaxPacketSize = IpSb->OldMaxPacketSize - IP6_MAX_IPSEC_HEADLEN;\r
   }\r
 \r
-\r
   //\r
   // Bypass all multicast inbound or outbound traffic.\r
   //\r
@@ -570,11 +569,11 @@ Ip6IpSecProcessPacket (
     goto ON_EXIT;\r
   }\r
 \r
-  Status = NetbufBuildExt (Packet, FragmentTable, &FragmentCount);\r
+  Status                = NetbufBuildExt (Packet, FragmentTable, &FragmentCount);\r
   OriginalFragmentTable = FragmentTable;\r
   OriginalFragmentCount = FragmentCount;\r
 \r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     FreePool (FragmentTable);\r
     goto ON_EXIT;\r
   }\r
@@ -588,11 +587,11 @@ Ip6IpSecProcessPacket (
                      mIpSec,\r
                      IpSb->Controller,\r
                      IP_VERSION_6,\r
-                     (VOID *) (*Head),\r
+                     (VOID *)(*Head),\r
                      LastHead,\r
-                     (VOID **) ExtHdrs,\r
+                     (VOID **)ExtHdrs,\r
                      ExtHdrsLen,\r
-                     (EFI_IPSEC_FRAGMENT_DATA  **) (&FragmentTable),\r
+                     (EFI_IPSEC_FRAGMENT_DATA  **)(&FragmentTable),\r
                      &FragmentCount,\r
                      Direction,\r
                      &RecycleEvent\r
@@ -607,7 +606,7 @@ Ip6IpSecProcessPacket (
     goto ON_EXIT;\r
   }\r
 \r
-  if (OriginalFragmentCount == FragmentCount && OriginalFragmentTable == FragmentTable) {\r
+  if ((OriginalFragmentCount == FragmentCount) && (OriginalFragmentTable == FragmentTable)) {\r
     //\r
     // For ByPass Packet\r
     //\r
@@ -620,7 +619,7 @@ Ip6IpSecProcessPacket (
     FreePool (OriginalFragmentTable);\r
   }\r
 \r
-  if (Direction == EfiIPsecOutBound && TxWrap != NULL) {\r
+  if ((Direction == EfiIPsecOutBound) && (TxWrap != NULL)) {\r
     TxWrap->IpSecRecycleSignal = RecycleEvent;\r
     TxWrap->Packet             = NetbufFromExt (\r
                                    FragmentTable,\r
@@ -632,7 +631,7 @@ Ip6IpSecProcessPacket (
                                    );\r
     if (TxWrap->Packet == NULL) {\r
       TxWrap->Packet = *Netbuf;\r
-      Status = EFI_OUT_OF_RESOURCES;\r
+      Status         = EFI_OUT_OF_RESOURCES;\r
       goto ON_EXIT;\r
     }\r
 \r
@@ -642,11 +641,9 @@ Ip6IpSecProcessPacket (
       sizeof (IP6_CLIP_INFO)\r
       );\r
 \r
-    NetIpSecNetbufFree(Packet);\r
+    NetIpSecNetbufFree (Packet);\r
     *Netbuf = TxWrap->Packet;\r
-\r
   } else {\r
-\r
     IpSecWrap = AllocateZeroPool (sizeof (IP6_IPSEC_WRAP));\r
 \r
     if (IpSecWrap == NULL) {\r
@@ -674,13 +671,12 @@ Ip6IpSecProcessPacket (
       goto ON_EXIT;\r
     }\r
 \r
-    if (Direction == EfiIPsecInBound && 0 != CompareMem (&ZeroHead, *Head, sizeof (EFI_IP6_HEADER))) {\r
-\r
-      PacketHead = (EFI_IP6_HEADER *) NetbufAllocSpace (\r
-                                        Packet,\r
-                                        sizeof (EFI_IP6_HEADER) + *ExtHdrsLen,\r
-                                        NET_BUF_HEAD\r
-                                        );\r
+    if ((Direction == EfiIPsecInBound) && (0 != CompareMem (&ZeroHead, *Head, sizeof (EFI_IP6_HEADER)))) {\r
+      PacketHead = (EFI_IP6_HEADER *)NetbufAllocSpace (\r
+                                       Packet,\r
+                                       sizeof (EFI_IP6_HEADER) + *ExtHdrsLen,\r
+                                       NET_BUF_HEAD\r
+                                       );\r
       if (PacketHead == NULL) {\r
         *Netbuf = Packet;\r
         Status  = EFI_OUT_OF_RESOURCES;\r
@@ -688,11 +684,11 @@ Ip6IpSecProcessPacket (
       }\r
 \r
       CopyMem (PacketHead, *Head, sizeof (EFI_IP6_HEADER));\r
-      *Head = PacketHead;\r
+      *Head          = PacketHead;\r
       Packet->Ip.Ip6 = PacketHead;\r
 \r
       if (*ExtHdrs != NULL) {\r
-        Buf = (UINT8 *) (PacketHead + 1);\r
+        Buf = (UINT8 *)(PacketHead + 1);\r
         CopyMem (Buf, *ExtHdrs, *ExtHdrsLen);\r
       }\r
 \r
@@ -703,6 +699,7 @@ Ip6IpSecProcessPacket (
         sizeof (IP6_CLIP_INFO)\r
         );\r
     }\r
+\r
     *Netbuf = Packet;\r
   }\r
 \r
@@ -733,25 +730,25 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 Ip6PreProcessPacket (\r
-  IN     IP6_SERVICE     *IpSb,\r
-  IN OUT NET_BUF         **Packet,\r
-  IN     UINT32          Flag,\r
-     OUT UINT8           **Payload,\r
-     OUT UINT8           **LastHead,\r
-     OUT UINT32          *ExtHdrsLen,\r
-     OUT UINT32          *UnFragmentLen,\r
-     OUT BOOLEAN         *Fragmented,\r
-     OUT EFI_IP6_HEADER  **Head\r
+  IN     IP6_SERVICE  *IpSb,\r
+  IN OUT NET_BUF      **Packet,\r
+  IN     UINT32       Flag,\r
+  OUT UINT8           **Payload,\r
+  OUT UINT8           **LastHead,\r
+  OUT UINT32          *ExtHdrsLen,\r
+  OUT UINT32          *UnFragmentLen,\r
+  OUT BOOLEAN         *Fragmented,\r
+  OUT EFI_IP6_HEADER  **Head\r
   )\r
 {\r
-  UINT16                    PayloadLen;\r
-  UINT16                    TotalLen;\r
-  UINT32                    FormerHeadOffset;\r
-  UINT32                    HeadLen;\r
-  IP6_FRAGMENT_HEADER       *FragmentHead;\r
-  UINT16                    FragmentOffset;\r
-  IP6_CLIP_INFO             *Info;\r
-  EFI_IPv6_ADDRESS          Loopback;\r
+  UINT16               PayloadLen;\r
+  UINT16               TotalLen;\r
+  UINT32               FormerHeadOffset;\r
+  UINT32               HeadLen;\r
+  IP6_FRAGMENT_HEADER  *FragmentHead;\r
+  UINT16               FragmentOffset;\r
+  IP6_CLIP_INFO        *Info;\r
+  EFI_IPv6_ADDRESS     Loopback;\r
 \r
   HeadLen    = 0;\r
   PayloadLen = 0;\r
@@ -765,7 +762,7 @@ Ip6PreProcessPacket (
   //\r
   // Get header information of the packet.\r
   //\r
-  *Head = (EFI_IP6_HEADER *) NetbufGetByte (*Packet, 0, NULL);\r
+  *Head = (EFI_IP6_HEADER *)NetbufGetByte (*Packet, 0, NULL);\r
   if (*Head == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
@@ -783,7 +780,8 @@ Ip6PreProcessPacket (
   ZeroMem (&Loopback, sizeof (EFI_IPv6_ADDRESS));\r
   Loopback.Addr[15] = 0x1;\r
   if ((CompareMem (&Loopback, &(*Head)->DestinationAddress, sizeof (EFI_IPv6_ADDRESS)) == 0) ||\r
-      (NetIp6IsUnspecifiedAddr (&(*Head)->DestinationAddress))) {\r
+      (NetIp6IsUnspecifiedAddr (&(*Head)->DestinationAddress)))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -818,17 +816,16 @@ Ip6PreProcessPacket (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-\r
   PayloadLen = (*Head)->PayloadLength;\r
 \r
   Info->Start    = 0;\r
   Info->Length   = PayloadLen;\r
   Info->End      = Info->Start + Info->Length;\r
-  Info->HeadLen  = (UINT16) sizeof (EFI_IP6_HEADER);\r
+  Info->HeadLen  = (UINT16)sizeof (EFI_IP6_HEADER);\r
   Info->Status   = EFI_SUCCESS;\r
   Info->LastFrag = FALSE;\r
 \r
-  TotalLen   = (UINT16) (PayloadLen + sizeof (EFI_IP6_HEADER));\r
+  TotalLen = (UINT16)(PayloadLen + sizeof (EFI_IP6_HEADER));\r
 \r
   //\r
   // Mnp may deliver frame trailer sequence up, trim it off.\r
@@ -845,7 +842,7 @@ Ip6PreProcessPacket (
   // Check the extension headers, if exist validate them\r
   //\r
   if (PayloadLen != 0) {\r
-    *Payload = AllocatePool ((UINTN) PayloadLen);\r
+    *Payload = AllocatePool ((UINTN)PayloadLen);\r
     if (*Payload == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
@@ -858,24 +855,25 @@ Ip6PreProcessPacket (
          *Packet,\r
          &(*Head)->NextHeader,\r
          *Payload,\r
-         (UINT32) PayloadLen,\r
+         (UINT32)PayloadLen,\r
          TRUE,\r
          &FormerHeadOffset,\r
          LastHead,\r
          ExtHdrsLen,\r
          UnFragmentLen,\r
          Fragmented\r
-         )) {\r
+         ))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  HeadLen        = sizeof (EFI_IP6_HEADER) + *UnFragmentLen;\r
+  HeadLen = sizeof (EFI_IP6_HEADER) + *UnFragmentLen;\r
 \r
   if (*Fragmented) {\r
     //\r
     // Get the fragment offset from the Fragment header\r
     //\r
-    FragmentHead = (IP6_FRAGMENT_HEADER *) NetbufGetByte (*Packet, HeadLen, NULL);\r
+    FragmentHead = (IP6_FRAGMENT_HEADER *)NetbufGetByte (*Packet, HeadLen, NULL);\r
     if (FragmentHead == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
@@ -895,10 +893,10 @@ Ip6PreProcessPacket (
       Info->NextHeader = FragmentHead->NextHeader;\r
     }\r
 \r
-    Info->HeadLen          = (UINT16) HeadLen;\r
-    HeadLen                += sizeof (IP6_FRAGMENT_HEADER);\r
+    Info->HeadLen          = (UINT16)HeadLen;\r
+    HeadLen               += sizeof (IP6_FRAGMENT_HEADER);\r
     Info->Start            = FragmentOffset;\r
-    Info->Length           = TotalLen - (UINT16) HeadLen;\r
+    Info->Length           = TotalLen - (UINT16)HeadLen;\r
     Info->End              = Info->Start + Info->Length;\r
     Info->Id               = FragmentHead->Identification;\r
     Info->FormerNextHeader = FormerHeadOffset;\r
@@ -921,14 +919,14 @@ Ip6PreProcessPacket (
     //\r
     // Re-check the assembled packet to get the right values.\r
     //\r
-    *Head       = (*Packet)->Ip.Ip6;\r
-    PayloadLen  = (*Head)->PayloadLength;\r
+    *Head      = (*Packet)->Ip.Ip6;\r
+    PayloadLen = (*Head)->PayloadLength;\r
     if (PayloadLen != 0) {\r
       if (*Payload != NULL) {\r
         FreePool (*Payload);\r
       }\r
 \r
-      *Payload = AllocatePool ((UINTN) PayloadLen);\r
+      *Payload = AllocatePool ((UINTN)PayloadLen);\r
       if (*Payload == NULL) {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
@@ -941,14 +939,15 @@ Ip6PreProcessPacket (
            *Packet,\r
            &(*Head)->NextHeader,\r
            *Payload,\r
-           (UINT32) PayloadLen,\r
+           (UINT32)PayloadLen,\r
            TRUE,\r
            NULL,\r
            LastHead,\r
            ExtHdrsLen,\r
            UnFragmentLen,\r
            Fragmented\r
-           )) {\r
+           ))\r
+    {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
@@ -975,23 +974,23 @@ Ip6PreProcessPacket (
 **/\r
 VOID\r
 Ip6AcceptFrame (\r
-  IN NET_BUF                *Packet,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN UINT32                 Flag,\r
-  IN VOID                   *Context\r
+  IN NET_BUF     *Packet,\r
+  IN EFI_STATUS  IoStatus,\r
+  IN UINT32      Flag,\r
+  IN VOID        *Context\r
   )\r
 {\r
-  IP6_SERVICE               *IpSb;\r
-  EFI_IP6_HEADER            *Head;\r
-  UINT8                     *Payload;\r
-  UINT8                     *LastHead;\r
-  UINT32                    UnFragmentLen;\r
-  UINT32                    ExtHdrsLen;\r
-  BOOLEAN                   Fragmented;\r
-  EFI_STATUS                Status;\r
-  EFI_IP6_HEADER            ZeroHead;\r
-\r
-  IpSb = (IP6_SERVICE *) Context;\r
+  IP6_SERVICE     *IpSb;\r
+  EFI_IP6_HEADER  *Head;\r
+  UINT8           *Payload;\r
+  UINT8           *LastHead;\r
+  UINT32          UnFragmentLen;\r
+  UINT32          ExtHdrsLen;\r
+  BOOLEAN         Fragmented;\r
+  EFI_STATUS      Status;\r
+  EFI_IP6_HEADER  ZeroHead;\r
+\r
+  IpSb = (IP6_SERVICE *)Context;\r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
 \r
   Payload  = NULL;\r
@@ -1021,6 +1020,7 @@ Ip6AcceptFrame (
   if (EFI_ERROR (Status)) {\r
     goto Restart;\r
   }\r
+\r
   //\r
   // After trim off, the packet is a esp/ah/udp/tcp/icmp6 net buffer,\r
   // and no need consider any other ahead ext headers.\r
@@ -1072,15 +1072,15 @@ Ip6AcceptFrame (
   // Packet may have been changed. The ownership of the packet\r
   // is transferred to the packet process logic.\r
   //\r
-  Head  = Packet->Ip.Ip6;\r
+  Head                               = Packet->Ip.Ip6;\r
   IP6_GET_CLIP_INFO (Packet)->Status = EFI_SUCCESS;\r
 \r
   switch (*LastHead) {\r
-  case IP6_ICMP:\r
-    Ip6IcmpHandle (IpSb, Head, Packet);\r
-    break;\r
-  default:\r
-    Ip6Demultiplex (IpSb, Head, Packet);\r
+    case IP6_ICMP:\r
+      Ip6IcmpHandle (IpSb, Head, Packet);\r
+      break;\r
+    default:\r
+      Ip6Demultiplex (IpSb, Head, Packet);\r
   }\r
 \r
   Packet = NULL;\r
@@ -1103,7 +1103,7 @@ Drop:
     NetbufFree (Packet);\r
   }\r
 \r
-  return ;\r
+  return;\r
 }\r
 \r
 /**\r
@@ -1115,10 +1115,10 @@ Drop:
 **/\r
 VOID\r
 Ip6CreateAssembleTable (\r
-  IN OUT IP6_ASSEMBLE_TABLE *Table\r
+  IN OUT IP6_ASSEMBLE_TABLE  *Table\r
   )\r
 {\r
-  UINT32                    Index;\r
+  UINT32  Index;\r
 \r
   for (Index = 0; Index < IP6_ASSEMLE_HASH_SIZE; Index++) {\r
     InitializeListHead (&Table->Bucket[Index]);\r
@@ -1134,13 +1134,13 @@ Ip6CreateAssembleTable (
 **/\r
 VOID\r
 Ip6CleanAssembleTable (\r
-  IN OUT IP6_ASSEMBLE_TABLE *Table\r
+  IN OUT IP6_ASSEMBLE_TABLE  *Table\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP6_ASSEMBLE_ENTRY        *Assemble;\r
-  UINT32                    Index;\r
+  LIST_ENTRY          *Entry;\r
+  LIST_ENTRY          *Next;\r
+  IP6_ASSEMBLE_ENTRY  *Assemble;\r
+  UINT32              Index;\r
 \r
   for (Index = 0; Index < IP6_ASSEMLE_HASH_SIZE; Index++) {\r
     NET_LIST_FOR_EACH_SAFE (Entry, Next, &Table->Bucket[Index]) {\r
@@ -1152,7 +1152,6 @@ Ip6CleanAssembleTable (
   }\r
 }\r
 \r
-\r
 /**\r
   The signal handle of IP6's recycle event. It is called back\r
   when the upper layer releases the packet.\r
@@ -1164,13 +1163,13 @@ Ip6CleanAssembleTable (
 VOID\r
 EFIAPI\r
 Ip6OnRecyclePacket (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  IP6_RXDATA_WRAP           *Wrap;\r
+  IP6_RXDATA_WRAP  *Wrap;\r
 \r
-  Wrap = (IP6_RXDATA_WRAP *) Context;\r
+  Wrap = (IP6_RXDATA_WRAP *)Context;\r
 \r
   EfiAcquireLockOrFail (&Wrap->IpInstance->RecycleLock);\r
   RemoveEntryList (&Wrap->Link);\r
@@ -1199,13 +1198,13 @@ Ip6OnRecyclePacket (
 **/\r
 IP6_RXDATA_WRAP *\r
 Ip6WrapRxData (\r
-  IN IP6_PROTOCOL           *IpInstance,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_PROTOCOL  *IpInstance,\r
+  IN NET_BUF       *Packet\r
   )\r
 {\r
-  IP6_RXDATA_WRAP           *Wrap;\r
-  EFI_IP6_RECEIVE_DATA      *RxData;\r
-  EFI_STATUS                Status;\r
+  IP6_RXDATA_WRAP       *Wrap;\r
+  EFI_IP6_RECEIVE_DATA  *RxData;\r
+  EFI_STATUS            Status;\r
 \r
   Wrap = AllocatePool (IP6_RXDATA_WRAP_SIZE (Packet->BlockOpNum));\r
 \r
@@ -1215,9 +1214,9 @@ Ip6WrapRxData (
 \r
   InitializeListHead (&Wrap->Link);\r
 \r
-  Wrap->IpInstance  = IpInstance;\r
-  Wrap->Packet      = Packet;\r
-  RxData            = &Wrap->RxData;\r
+  Wrap->IpInstance = IpInstance;\r
+  Wrap->Packet     = Packet;\r
+  RxData           = &Wrap->RxData;\r
 \r
   ZeroMem (&RxData->TimeStamp, sizeof (EFI_TIME));\r
 \r
@@ -1239,15 +1238,15 @@ Ip6WrapRxData (
   //\r
   // The application expects a network byte order header.\r
   //\r
-  RxData->HeaderLength  = sizeof (EFI_IP6_HEADER);\r
-  RxData->Header        = (EFI_IP6_HEADER *) Ip6NtohHead (Packet->Ip.Ip6);\r
-  RxData->DataLength    = Packet->TotalSize;\r
+  RxData->HeaderLength = sizeof (EFI_IP6_HEADER);\r
+  RxData->Header       = (EFI_IP6_HEADER *)Ip6NtohHead (Packet->Ip.Ip6);\r
+  RxData->DataLength   = Packet->TotalSize;\r
 \r
   //\r
   // Build the fragment table to be delivered up.\r
   //\r
   RxData->FragmentCount = Packet->BlockOpNum;\r
-  NetbufBuildExt (Packet, (NET_FRAGMENT *) RxData->FragmentTable, &RxData->FragmentCount);\r
+  NetbufBuildExt (Packet, (NET_FRAGMENT *)RxData->FragmentTable, &RxData->FragmentCount);\r
 \r
   return Wrap;\r
 }\r
@@ -1265,19 +1264,19 @@ Ip6WrapRxData (
 **/\r
 BOOLEAN\r
 Ip6InstanceFrameAcceptable (\r
-  IN IP6_PROTOCOL           *IpInstance,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_PROTOCOL    *IpInstance,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   )\r
 {\r
-  IP6_ICMP_ERROR_HEAD       Icmp;\r
-  EFI_IP6_CONFIG_DATA       *Config;\r
-  IP6_CLIP_INFO             *Info;\r
-  UINT8                     *Proto;\r
-  UINT32                    Index;\r
-  UINT8                     *ExtHdrs;\r
-  UINT16                    ErrMsgPayloadLen;\r
-  UINT8                     *ErrMsgPayload;\r
+  IP6_ICMP_ERROR_HEAD  Icmp;\r
+  EFI_IP6_CONFIG_DATA  *Config;\r
+  IP6_CLIP_INFO        *Info;\r
+  UINT8                *Proto;\r
+  UINT32               Index;\r
+  UINT8                *ExtHdrs;\r
+  UINT16               ErrMsgPayloadLen;\r
+  UINT8                *ErrMsgPayload;\r
 \r
   Config = &IpInstance->ConfigData;\r
   Proto  = NULL;\r
@@ -1308,14 +1307,15 @@ Ip6InstanceFrameAcceptable (
          Packet,\r
          &Head->NextHeader,\r
          ExtHdrs,\r
-         (UINT32) Head->PayloadLength,\r
+         (UINT32)Head->PayloadLength,\r
          TRUE,\r
          NULL,\r
          &Proto,\r
          NULL,\r
          NULL,\r
          NULL\r
-         )) {\r
+         ))\r
+  {\r
     return FALSE;\r
   }\r
 \r
@@ -1324,7 +1324,7 @@ Ip6InstanceFrameAcceptable (
   // invoked by its packet, like UDP.\r
   //\r
   if ((*Proto == IP6_ICMP) && (!Config->AcceptAnyProtocol) && (*Proto != Config->DefaultProtocol)) {\r
-    NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *) &Icmp);\r
+    NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *)&Icmp);\r
 \r
     if (Icmp.Head.Type <= ICMP_V6_ERROR_MAX) {\r
       if (!Config->AcceptIcmpErrors) {\r
@@ -1349,7 +1349,8 @@ Ip6InstanceFrameAcceptable (
              NULL,\r
              NULL,\r
              NULL\r
-             )) {\r
+             ))\r
+      {\r
         return FALSE;\r
       }\r
     }\r
@@ -1408,13 +1409,13 @@ Ip6InstanceFrameAcceptable (
 **/\r
 EFI_STATUS\r
 Ip6InstanceEnquePacket (\r
-  IN IP6_PROTOCOL           *IpInstance,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_PROTOCOL    *IpInstance,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   )\r
 {\r
-  IP6_CLIP_INFO             *Info;\r
-  NET_BUF                   *Clone;\r
+  IP6_CLIP_INFO  *Info;\r
+  NET_BUF        *Clone;\r
 \r
   //\r
   // Check whether the packet is acceptable to this instance.\r
@@ -1440,8 +1441,8 @@ Ip6InstanceEnquePacket (
   // Set the receive time out for the assembled packet. If it expires,\r
   // packet will be removed from the queue.\r
   //\r
-  Info        = IP6_GET_CLIP_INFO (Clone);\r
-  Info->Life  = IP6_US_TO_SEC (IpInstance->ConfigData.ReceiveTimeout);\r
+  Info       = IP6_GET_CLIP_INFO (Clone);\r
+  Info->Life = IP6_US_TO_SEC (IpInstance->ConfigData.ReceiveTimeout);\r
 \r
   InsertTailList (&IpInstance->Received, &Clone->List);\r
   return EFI_SUCCESS;\r
@@ -1463,7 +1464,7 @@ Ip6InstanceEnquePacket (
 **/\r
 EFI_STATUS\r
 Ip6InstanceDeliverPacket (\r
-  IN IP6_PROTOCOL           *IpInstance\r
+  IN IP6_PROTOCOL  *IpInstance\r
   )\r
 {\r
   EFI_IP6_COMPLETION_TOKEN  *Token;\r
@@ -1476,7 +1477,6 @@ Ip6InstanceDeliverPacket (
   // Deliver a packet if there are both a packet and a receive token.\r
   //\r
   while (!IsListEmpty (&IpInstance->Received) && !NetMapIsEmpty (&IpInstance->RxTokens)) {\r
-\r
     Packet = NET_LIST_HEAD (&IpInstance->Received, NET_BUF, List);\r
 \r
     if (!NET_BUF_SHARED (Packet)) {\r
@@ -1490,7 +1490,6 @@ Ip6InstanceDeliverPacket (
       }\r
 \r
       RemoveEntryList (&Packet->List);\r
-\r
     } else {\r
       //\r
       // Create a duplicated packet if this packet is shared\r
@@ -1506,9 +1505,9 @@ Ip6InstanceDeliverPacket (
       // headless. Trim the head off after copy. The IP head\r
       // may be not continuous before the data.\r
       //\r
-      Head        = NetbufAllocSpace (Dup, sizeof (EFI_IP6_HEADER), NET_BUF_HEAD);\r
+      Head = NetbufAllocSpace (Dup, sizeof (EFI_IP6_HEADER), NET_BUF_HEAD);\r
       ASSERT (Head != NULL);\r
-      Dup->Ip.Ip6 = (EFI_IP6_HEADER *) Head;\r
+      Dup->Ip.Ip6 = (EFI_IP6_HEADER *)Head;\r
 \r
       CopyMem (Head, Packet->Ip.Ip6, sizeof (EFI_IP6_HEADER));\r
       NetbufTrim (Dup, sizeof (EFI_IP6_HEADER), TRUE);\r
@@ -1558,18 +1557,18 @@ Ip6InstanceDeliverPacket (
 **/\r
 INTN\r
 Ip6InterfaceEnquePacket (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet,\r
-  IN IP6_INTERFACE          *IpIf\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet,\r
+  IN IP6_INTERFACE   *IpIf\r
   )\r
 {\r
-  IP6_PROTOCOL              *IpInstance;\r
-  IP6_CLIP_INFO             *Info;\r
-  LIST_ENTRY                *Entry;\r
-  INTN                      Enqueued;\r
-  INTN                      LocalType;\r
-  INTN                      SavedType;\r
+  IP6_PROTOCOL   *IpInstance;\r
+  IP6_CLIP_INFO  *Info;\r
+  LIST_ENTRY     *Entry;\r
+  INTN           Enqueued;\r
+  INTN           LocalType;\r
+  INTN           SavedType;\r
 \r
   //\r
   // First, check that the packet is acceptable to this interface\r
@@ -1590,10 +1589,10 @@ Ip6InterfaceEnquePacket (
   // and pass the local cast type to the IP children on the\r
   // interface. The global cast type will be restored later.\r
   //\r
-  SavedType       = Info->CastType;\r
-  Info->CastType  = (UINT32) LocalType;\r
+  SavedType      = Info->CastType;\r
+  Info->CastType = (UINT32)LocalType;\r
 \r
-  Enqueued        = 0;\r
+  Enqueued = 0;\r
 \r
   NET_LIST_FOR_EACH (Entry, &IpIf->IpInstances) {\r
     IpInstance = NET_LIST_USER_STRUCT (Entry, IP6_PROTOCOL, AddrLink);\r
@@ -1604,7 +1603,7 @@ Ip6InterfaceEnquePacket (
     }\r
   }\r
 \r
-  Info->CastType = (UINT32) SavedType;\r
+  Info->CastType = (UINT32)SavedType;\r
   return Enqueued;\r
 }\r
 \r
@@ -1617,12 +1616,12 @@ Ip6InterfaceEnquePacket (
 **/\r
 VOID\r
 Ip6InterfaceDeliverPacket (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN IP6_INTERFACE          *IpIf\r
+  IN IP6_SERVICE    *IpSb,\r
+  IN IP6_INTERFACE  *IpIf\r
   )\r
 {\r
-  IP6_PROTOCOL              *IpInstance;\r
-  LIST_ENTRY                *Entry;\r
+  IP6_PROTOCOL  *IpInstance;\r
+  LIST_ENTRY    *Entry;\r
 \r
   NET_LIST_FOR_EACH (Entry, &IpIf->IpInstances) {\r
     IpInstance = NET_LIST_USER_STRUCT (Entry, IP6_PROTOCOL, AddrLink);\r
@@ -1650,15 +1649,14 @@ Ip6InterfaceDeliverPacket (
 **/\r
 EFI_STATUS\r
 Ip6Demultiplex (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   )\r
 {\r
-\r
-  LIST_ENTRY                *Entry;\r
-  IP6_INTERFACE             *IpIf;\r
-  INTN                      Enqueued;\r
+  LIST_ENTRY     *Entry;\r
+  IP6_INTERFACE  *IpIf;\r
+  INTN           Enqueued;\r
 \r
   //\r
   // Two pass delivery: first, enqueue a shared copy of the packet\r
@@ -1714,14 +1712,14 @@ Ip6Demultiplex (
 EFI_STATUS\r
 EFIAPI\r
 Ip6SentPacketTicking (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item,\r
-  IN VOID                   *Context\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Context\r
   )\r
 {\r
-  IP6_TXTOKEN_WRAP          *Wrap;\r
+  IP6_TXTOKEN_WRAP  *Wrap;\r
 \r
-  Wrap = (IP6_TXTOKEN_WRAP *) Item->Value;\r
+  Wrap = (IP6_TXTOKEN_WRAP *)Item->Value;\r
   ASSERT (Wrap != NULL);\r
 \r
   if ((Wrap->Life > 0) && (--Wrap->Life == 0)) {\r
@@ -1739,17 +1737,17 @@ Ip6SentPacketTicking (
 **/\r
 VOID\r
 Ip6PacketTimerTicking (\r
-  IN IP6_SERVICE            *IpSb\r
+  IN IP6_SERVICE  *IpSb\r
   )\r
 {\r
-  LIST_ENTRY                *InstanceEntry;\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP6_PROTOCOL              *IpInstance;\r
-  IP6_ASSEMBLE_ENTRY        *Assemble;\r
-  NET_BUF                   *Packet;\r
-  IP6_CLIP_INFO             *Info;\r
-  UINT32                    Index;\r
+  LIST_ENTRY          *InstanceEntry;\r
+  LIST_ENTRY          *Entry;\r
+  LIST_ENTRY          *Next;\r
+  IP6_PROTOCOL        *IpInstance;\r
+  IP6_ASSEMBLE_ENTRY  *Assemble;\r
+  NET_BUF             *Packet;\r
+  IP6_CLIP_INFO       *Info;\r
+  UINT32              Index;\r
 \r
   //\r
   // First, time out the fragments. The packet's life is counting down\r
@@ -1766,7 +1764,8 @@ Ip6PacketTimerTicking (
         // Time Exceeded message should be sent to the source of that fragment.\r
         //\r
         if ((Assemble->Packet != NULL) &&\r
-            !IP6_IS_MULTICAST (&Assemble->Head->DestinationAddress)) {\r
+            !IP6_IS_MULTICAST (&Assemble->Head->DestinationAddress))\r
+        {\r
           Ip6SendIcmpError (\r
             IpSb,\r
             Assemble->Packet,\r
@@ -1812,4 +1811,3 @@ Ip6PacketTimerTicking (
     NetMapIterate (&IpInstance->TxTokens, Ip6SentPacketTicking, NULL);\r
   }\r
 }\r
-\r
index 76a4edb54c3cc67f7144c11863f37e9ce8482927..5fcf4af31da1a66dab0eb3d0f961a16fc32f0f93 100644 (file)
 #ifndef __EFI_IP6_INPUT_H__\r
 #define __EFI_IP6_INPUT_H__\r
 \r
-#define IP6_MIN_HEADLEN       40\r
-#define IP6_MAX_HEADLEN       120\r
+#define IP6_MIN_HEADLEN  40\r
+#define IP6_MAX_HEADLEN  120\r
 ///\r
 /// 8(ESP header) + 16(max IV) + 16(max padding) + 2(ESP tail) + 12(max ICV) = 54\r
 ///\r
-#define IP6_MAX_IPSEC_HEADLEN 54\r
+#define IP6_MAX_IPSEC_HEADLEN  54\r
 \r
-\r
-#define IP6_ASSEMLE_HASH_SIZE 127\r
+#define IP6_ASSEMLE_HASH_SIZE  127\r
 ///\r
 /// Lift time in seconds.\r
 ///\r
-#define IP6_FRAGMENT_LIFE     60\r
-#define IP6_MAX_PACKET_SIZE   65535\r
-\r
+#define IP6_FRAGMENT_LIFE    60\r
+#define IP6_MAX_PACKET_SIZE  65535\r
 \r
-#define IP6_GET_CLIP_INFO(Packet) ((IP6_CLIP_INFO *) ((Packet)->ProtoData))\r
+#define IP6_GET_CLIP_INFO(Packet)  ((IP6_CLIP_INFO *) ((Packet)->ProtoData))\r
 \r
 #define IP6_ASSEMBLE_HASH(Dst, Src, Id)  \\r
           ((*((UINT32 *) (Dst)) + *((UINT32 *) (Src)) + (Id)) % IP6_ASSEMLE_HASH_SIZE)\r
 // life. If it isn't consumed before Life reaches zero, the packet is released.\r
 //\r
 typedef struct {\r
-  UINT32                    LinkFlag;\r
-  INT32                     CastType;\r
-  INT32                     Start;\r
-  INT32                     End;\r
-  INT32                     Length;\r
-  UINT32                    Life;\r
-  EFI_STATUS                Status;\r
-  UINT32                    Id;\r
-  UINT16                    HeadLen;\r
-  UINT8                     NextHeader;\r
-  UINT8                     LastFrag;\r
-  UINT32                    FormerNextHeader;\r
+  UINT32        LinkFlag;\r
+  INT32         CastType;\r
+  INT32         Start;\r
+  INT32         End;\r
+  INT32         Length;\r
+  UINT32        Life;\r
+  EFI_STATUS    Status;\r
+  UINT32        Id;\r
+  UINT16        HeadLen;\r
+  UINT8         NextHeader;\r
+  UINT8         LastFrag;\r
+  UINT32        FormerNextHeader;\r
 } IP6_CLIP_INFO;\r
 \r
 //\r
 // Structure used to assemble IP packets.\r
 //\r
 typedef struct {\r
-  LIST_ENTRY                Link;\r
-  LIST_ENTRY                Fragments;  // List of all the fragments of this packet\r
+  LIST_ENTRY          Link;\r
+  LIST_ENTRY          Fragments;        // List of all the fragments of this packet\r
 \r
   //\r
   // Identity of one IP6 packet. Each fragment of a packet has\r
   // the same (Dst, Src, Id).\r
   //\r
-  EFI_IPv6_ADDRESS          Dst;\r
-  EFI_IPv6_ADDRESS          Src;\r
-  UINT32                    Id;\r
+  EFI_IPv6_ADDRESS    Dst;\r
+  EFI_IPv6_ADDRESS    Src;\r
+  UINT32              Id;\r
 \r
-  UINT32                    TotalLen;\r
-  UINT32                    CurLen;\r
-  UINT32                    Life;       // Count down life for the packet.\r
+  UINT32              TotalLen;\r
+  UINT32              CurLen;\r
+  UINT32              Life;             // Count down life for the packet.\r
 \r
-  EFI_IP6_HEADER            *Head;      // IP head of the first fragment\r
-  IP6_CLIP_INFO             *Info;      // Per packet information of the first fragment\r
-  NET_BUF                   *Packet;    // The first fragment of the packet\r
+  EFI_IP6_HEADER      *Head;            // IP head of the first fragment\r
+  IP6_CLIP_INFO       *Info;            // Per packet information of the first fragment\r
+  NET_BUF             *Packet;          // The first fragment of the packet\r
 } IP6_ASSEMBLE_ENTRY;\r
 \r
 //\r
@@ -89,7 +87,7 @@ typedef struct {
 // as hash table.\r
 //\r
 typedef struct {\r
-  LIST_ENTRY  Bucket[IP6_ASSEMLE_HASH_SIZE];\r
+  LIST_ENTRY    Bucket[IP6_ASSEMLE_HASH_SIZE];\r
 } IP6_ASSEMBLE_TABLE;\r
 \r
 /**\r
@@ -105,10 +103,10 @@ typedef struct {
 **/\r
 VOID\r
 Ip6AcceptFrame (\r
-  IN NET_BUF                *Packet,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN UINT32                 Flag,\r
-  IN VOID                   *Context\r
+  IN NET_BUF     *Packet,\r
+  IN EFI_STATUS  IoStatus,\r
+  IN UINT32      Flag,\r
+  IN VOID        *Context\r
   );\r
 \r
 /**\r
@@ -127,7 +125,7 @@ Ip6AcceptFrame (
 **/\r
 EFI_STATUS\r
 Ip6InstanceDeliverPacket (\r
-  IN IP6_PROTOCOL           *IpInstance\r
+  IN IP6_PROTOCOL  *IpInstance\r
   );\r
 \r
 /**\r
@@ -175,7 +173,7 @@ Ip6IpSecProcessPacket (
 **/\r
 VOID\r
 Ip6CreateAssembleTable (\r
-  IN OUT IP6_ASSEMBLE_TABLE *Table\r
+  IN OUT IP6_ASSEMBLE_TABLE  *Table\r
   );\r
 \r
 /**\r
@@ -187,7 +185,7 @@ Ip6CreateAssembleTable (
 **/\r
 VOID\r
 Ip6CleanAssembleTable (\r
-  IN OUT IP6_ASSEMBLE_TABLE *Table\r
+  IN OUT IP6_ASSEMBLE_TABLE  *Table\r
   );\r
 \r
 /**\r
@@ -210,9 +208,9 @@ Ip6CleanAssembleTable (
 **/\r
 EFI_STATUS\r
 Ip6Demultiplex (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   );\r
 \r
 /**\r
@@ -223,7 +221,7 @@ Ip6Demultiplex (
 **/\r
 VOID\r
 Ip6PacketTimerTicking (\r
-  IN IP6_SERVICE            *IpSb\r
+  IN IP6_SERVICE  *IpSb\r
   );\r
 \r
 #endif\r
index ba12089dee25f4750a9f13ff56ae355b25fc952e..e6b2b653e29570de84914eeb5c531f7c57b5b582 100644 (file)
 **/\r
 IP6_MLD_GROUP *\r
 Ip6CreateMldEntry (\r
-  IN OUT IP6_SERVICE        *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *MulticastAddr,\r
-  IN UINT32                 DelayTimer\r
+  IN OUT IP6_SERVICE   *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *MulticastAddr,\r
+  IN UINT32            DelayTimer\r
   )\r
 {\r
-  IP6_MLD_GROUP             *Entry;\r
+  IP6_MLD_GROUP  *Entry;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
   ASSERT (MulticastAddr != NULL && IP6_IS_MULTICAST (MulticastAddr));\r
@@ -54,12 +54,12 @@ Ip6CreateMldEntry (
 **/\r
 IP6_MLD_GROUP *\r
 Ip6FindMldEntry (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *MulticastAddr\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *MulticastAddr\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  IP6_MLD_GROUP             *Group;\r
+  LIST_ENTRY     *Entry;\r
+  IP6_MLD_GROUP  *Group;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
   ASSERT (MulticastAddr != NULL && IP6_IS_MULTICAST (MulticastAddr));\r
@@ -88,13 +88,13 @@ Ip6FindMldEntry (
 **/\r
 INTN\r
 Ip6FindMac (\r
-  IN IP6_MLD_SERVICE_DATA   *MldCtrl,\r
-  IN EFI_MAC_ADDRESS        *Mac\r
+  IN IP6_MLD_SERVICE_DATA  *MldCtrl,\r
+  IN EFI_MAC_ADDRESS       *Mac\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  IP6_MLD_GROUP             *Group;\r
-  INTN                      Count;\r
+  LIST_ENTRY     *Entry;\r
+  IP6_MLD_GROUP  *Group;\r
+  INTN           Count;\r
 \r
   Count = 0;\r
 \r
@@ -125,20 +125,20 @@ Ip6FindMac (
 **/\r
 EFI_STATUS\r
 Ip6SendMldReport (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN IP6_INTERFACE          *Interface OPTIONAL,\r
-  IN EFI_IPv6_ADDRESS       *MulticastAddr\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN IP6_INTERFACE     *Interface OPTIONAL,\r
+  IN EFI_IPv6_ADDRESS  *MulticastAddr\r
   )\r
 {\r
-  IP6_MLD_HEAD              *MldHead;\r
-  NET_BUF                   *Packet;\r
-  EFI_IP6_HEADER            Head;\r
-  UINT16                    PayloadLen;\r
-  UINTN                     OptionLen;\r
-  UINT8                     *Options;\r
-  EFI_STATUS                Status;\r
-  UINT16                    HeadChecksum;\r
-  UINT16                    PseudoChecksum;\r
+  IP6_MLD_HEAD    *MldHead;\r
+  NET_BUF         *Packet;\r
+  EFI_IP6_HEADER  Head;\r
+  UINT16          PayloadLen;\r
+  UINTN           OptionLen;\r
+  UINT8           *Options;\r
+  EFI_STATUS      Status;\r
+  UINT16          HeadChecksum;\r
+  UINT16          PseudoChecksum;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
   ASSERT (MulticastAddr != NULL && IP6_IS_MULTICAST (MulticastAddr));\r
@@ -149,11 +149,11 @@ Ip6SendMldReport (
   //\r
 \r
   OptionLen = 0;\r
-  Status = Ip6FillHopByHop (NULL, &OptionLen, IP6_ICMP);\r
+  Status    = Ip6FillHopByHop (NULL, &OptionLen, IP6_ICMP);\r
   ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r
 \r
-  PayloadLen = (UINT16) (OptionLen + sizeof (IP6_MLD_HEAD));\r
-  Packet = NetbufAlloc (sizeof (EFI_IP6_HEADER) + (UINT32) PayloadLen);\r
+  PayloadLen = (UINT16)(OptionLen + sizeof (IP6_MLD_HEAD));\r
+  Packet     = NetbufAlloc (sizeof (EFI_IP6_HEADER) + (UINT32)PayloadLen);\r
   if (Packet == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -163,11 +163,11 @@ Ip6SendMldReport (
   // RFC3590: Use link-local address as source address if it is available,\r
   // otherwise use the unspecified address.\r
   //\r
-  Head.FlowLabelL     = 0;\r
-  Head.FlowLabelH     = 0;\r
-  Head.PayloadLength  = HTONS (PayloadLen);\r
-  Head.NextHeader     = IP6_HOP_BY_HOP;\r
-  Head.HopLimit       = 1;\r
+  Head.FlowLabelL    = 0;\r
+  Head.FlowLabelH    = 0;\r
+  Head.PayloadLength = HTONS (PayloadLen);\r
+  Head.NextHeader    = IP6_HOP_BY_HOP;\r
+  Head.HopLimit      = 1;\r
   IP6_COPY_ADDRESS (&Head.DestinationAddress, MulticastAddr);\r
 \r
   //\r
@@ -180,7 +180,7 @@ Ip6SendMldReport (
   //\r
   // Fill a IPv6 Router Alert option in a Hop-by-Hop Options Header\r
   //\r
-  Options = NetbufAllocSpace (Packet, (UINT32) OptionLen, FALSE);\r
+  Options = NetbufAllocSpace (Packet, (UINT32)OptionLen, FALSE);\r
   ASSERT (Options != NULL);\r
   Status = Ip6FillHopByHop (Options, &OptionLen, IP6_ICMP);\r
   if (EFI_ERROR (Status)) {\r
@@ -192,14 +192,14 @@ Ip6SendMldReport (
   //\r
   // Fill in MLD message - Report\r
   //\r
-  MldHead = (IP6_MLD_HEAD *) NetbufAllocSpace (Packet, sizeof (IP6_MLD_HEAD), FALSE);\r
+  MldHead = (IP6_MLD_HEAD *)NetbufAllocSpace (Packet, sizeof (IP6_MLD_HEAD), FALSE);\r
   ASSERT (MldHead != NULL);\r
   ZeroMem (MldHead, sizeof (IP6_MLD_HEAD));\r
   MldHead->Head.Type = ICMP_V6_LISTENER_REPORT;\r
   MldHead->Head.Code = 0;\r
   IP6_COPY_ADDRESS (&MldHead->Group, MulticastAddr);\r
 \r
-  HeadChecksum   = NetblockChecksum ((UINT8 *) MldHead, sizeof (IP6_MLD_HEAD));\r
+  HeadChecksum   = NetblockChecksum ((UINT8 *)MldHead, sizeof (IP6_MLD_HEAD));\r
   PseudoChecksum = NetIp6PseudoHeadChecksum (\r
                      &Head.SourceAddress,\r
                      &Head.DestinationAddress,\r
@@ -229,20 +229,20 @@ Ip6SendMldReport (
 **/\r
 EFI_STATUS\r
 Ip6SendMldDone (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *MulticastAddr\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *MulticastAddr\r
   )\r
 {\r
-  IP6_MLD_HEAD              *MldHead;\r
-  NET_BUF                   *Packet;\r
-  EFI_IP6_HEADER            Head;\r
-  UINT16                    PayloadLen;\r
-  UINTN                     OptionLen;\r
-  UINT8                     *Options;\r
-  EFI_STATUS                Status;\r
-  EFI_IPv6_ADDRESS          Destination;\r
-  UINT16                    HeadChecksum;\r
-  UINT16                    PseudoChecksum;\r
+  IP6_MLD_HEAD      *MldHead;\r
+  NET_BUF           *Packet;\r
+  EFI_IP6_HEADER    Head;\r
+  UINT16            PayloadLen;\r
+  UINTN             OptionLen;\r
+  UINT8             *Options;\r
+  EFI_STATUS        Status;\r
+  EFI_IPv6_ADDRESS  Destination;\r
+  UINT16            HeadChecksum;\r
+  UINT16            PseudoChecksum;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
   ASSERT (MulticastAddr != NULL && IP6_IS_MULTICAST (MulticastAddr));\r
@@ -253,11 +253,11 @@ Ip6SendMldDone (
   //\r
 \r
   OptionLen = 0;\r
-  Status = Ip6FillHopByHop (NULL, &OptionLen, IP6_ICMP);\r
+  Status    = Ip6FillHopByHop (NULL, &OptionLen, IP6_ICMP);\r
   ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r
 \r
-  PayloadLen = (UINT16) (OptionLen + sizeof (IP6_MLD_HEAD));\r
-  Packet = NetbufAlloc (sizeof (EFI_IP6_HEADER) + (UINT32) PayloadLen);\r
+  PayloadLen = (UINT16)(OptionLen + sizeof (IP6_MLD_HEAD));\r
+  Packet     = NetbufAlloc (sizeof (EFI_IP6_HEADER) + (UINT32)PayloadLen);\r
   if (Packet == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -265,11 +265,11 @@ Ip6SendMldDone (
   //\r
   // Create the basic IPv6 header.\r
   //\r
-  Head.FlowLabelL     = 0;\r
-  Head.FlowLabelH     = 0;\r
-  Head.PayloadLength  = HTONS (PayloadLen);\r
-  Head.NextHeader     = IP6_HOP_BY_HOP;\r
-  Head.HopLimit       = 1;\r
+  Head.FlowLabelL    = 0;\r
+  Head.FlowLabelH    = 0;\r
+  Head.PayloadLength = HTONS (PayloadLen);\r
+  Head.NextHeader    = IP6_HOP_BY_HOP;\r
+  Head.HopLimit      = 1;\r
 \r
   //\r
   // If Link-Local address is not ready, we use unspecified address.\r
@@ -284,7 +284,7 @@ Ip6SendMldDone (
   //\r
   // Fill a IPv6 Router Alert option in a Hop-by-Hop Options Header\r
   //\r
-  Options = NetbufAllocSpace (Packet, (UINT32) OptionLen, FALSE);\r
+  Options = NetbufAllocSpace (Packet, (UINT32)OptionLen, FALSE);\r
   ASSERT (Options != NULL);\r
   Status = Ip6FillHopByHop (Options, &OptionLen, IP6_ICMP);\r
   if (EFI_ERROR (Status)) {\r
@@ -296,14 +296,14 @@ Ip6SendMldDone (
   //\r
   // Fill in MLD message - Done\r
   //\r
-  MldHead = (IP6_MLD_HEAD *) NetbufAllocSpace (Packet, sizeof (IP6_MLD_HEAD), FALSE);\r
+  MldHead = (IP6_MLD_HEAD *)NetbufAllocSpace (Packet, sizeof (IP6_MLD_HEAD), FALSE);\r
   ASSERT (MldHead != NULL);\r
   ZeroMem (MldHead, sizeof (IP6_MLD_HEAD));\r
   MldHead->Head.Type = ICMP_V6_LISTENER_DONE;\r
   MldHead->Head.Code = 0;\r
   IP6_COPY_ADDRESS (&MldHead->Group, MulticastAddr);\r
 \r
-  HeadChecksum   = NetblockChecksum ((UINT8 *) MldHead, sizeof (IP6_MLD_HEAD));\r
+  HeadChecksum   = NetblockChecksum ((UINT8 *)MldHead, sizeof (IP6_MLD_HEAD));\r
   PseudoChecksum = NetIp6PseudoHeadChecksum (\r
                      &Head.SourceAddress,\r
                      &Head.DestinationAddress,\r
@@ -332,12 +332,12 @@ Ip6SendMldDone (
 **/\r
 EFI_STATUS\r
 Ip6InitMld (\r
-  IN IP6_SERVICE            *IpSb\r
+  IN IP6_SERVICE  *IpSb\r
   )\r
 {\r
-  EFI_IPv6_ADDRESS          AllNodes;\r
-  IP6_MLD_GROUP             *Group;\r
-  EFI_STATUS                Status;\r
+  EFI_IPv6_ADDRESS  AllNodes;\r
+  IP6_MLD_GROUP     *Group;\r
+  EFI_STATUS        Status;\r
 \r
   //\r
   // Join the link-scope all-nodes multicast address (FF02::1).\r
@@ -347,7 +347,7 @@ Ip6InitMld (
 \r
   Ip6SetToAllNodeMulticast (FALSE, IP6_LINK_LOCAL_SCOPE, &AllNodes);\r
 \r
-  Group = Ip6CreateMldEntry (IpSb, &AllNodes, (UINT32) IP6_INFINIT_LIFETIME);\r
+  Group = Ip6CreateMldEntry (IpSb, &AllNodes, (UINT32)IP6_INFINIT_LIFETIME);\r
   if (Group == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -388,11 +388,11 @@ ERROR:
 **/\r
 EFI_STATUS\r
 Ip6CombineGroups (\r
-  IN OUT IP6_PROTOCOL *IpInstance,\r
-  IN EFI_IPv6_ADDRESS *Group\r
+  IN OUT IP6_PROTOCOL  *IpInstance,\r
+  IN EFI_IPv6_ADDRESS  *Group\r
   )\r
 {\r
-  EFI_IPv6_ADDRESS     *GroupList;\r
+  EFI_IPv6_ADDRESS  *GroupList;\r
 \r
   NET_CHECK_SIGNATURE (IpInstance, IP6_PROTOCOL_SIGNATURE);\r
   ASSERT (Group != NULL && IP6_IS_MULTICAST (Group));\r
@@ -437,12 +437,12 @@ Ip6CombineGroups (
 **/\r
 EFI_STATUS\r
 Ip6RemoveGroup (\r
-  IN OUT IP6_PROTOCOL *IpInstance,\r
-  IN EFI_IPv6_ADDRESS *Group\r
+  IN OUT IP6_PROTOCOL  *IpInstance,\r
+  IN EFI_IPv6_ADDRESS  *Group\r
   )\r
 {\r
-  UINT32                    Index;\r
-  UINT32                    Count;\r
+  UINT32  Index;\r
+  UINT32  Count;\r
 \r
   Count = IpInstance->GroupCount;\r
 \r
@@ -481,13 +481,13 @@ Ip6RemoveGroup (
 **/\r
 EFI_STATUS\r
 Ip6JoinGroup (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN IP6_INTERFACE          *Interface,\r
-  IN EFI_IPv6_ADDRESS       *Address\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN IP6_INTERFACE     *Interface,\r
+  IN EFI_IPv6_ADDRESS  *Address\r
   )\r
 {\r
-  IP6_MLD_GROUP            *Group;\r
-  EFI_STATUS               Status;\r
+  IP6_MLD_GROUP  *Group;\r
+  EFI_STATUS     Status;\r
 \r
   Group = Ip6FindMldEntry (IpSb, Address);\r
   if (Group != NULL) {\r
@@ -545,12 +545,12 @@ ERROR:
 **/\r
 EFI_STATUS\r
 Ip6LeaveGroup (\r
IN IP6_SERVICE            *IpSb,\r
IN EFI_IPv6_ADDRESS       *Address\r
 IN IP6_SERVICE       *IpSb,\r
 IN EFI_IPv6_ADDRESS  *Address\r
   )\r
 {\r
-  IP6_MLD_GROUP            *Group;\r
-  EFI_STATUS               Status;\r
+  IP6_MLD_GROUP  *Group;\r
+  EFI_STATUS     Status;\r
 \r
   Group = Ip6FindMldEntry (IpSb, Address);\r
   if (Group == NULL) {\r
@@ -611,15 +611,15 @@ Ip6LeaveGroup (
 **/\r
 EFI_STATUS\r
 Ip6Groups (\r
-  IN IP6_PROTOCOL           *IpInstance,\r
-  IN BOOLEAN                JoinFlag,\r
-  IN EFI_IPv6_ADDRESS       *GroupAddress       OPTIONAL\r
+  IN IP6_PROTOCOL      *IpInstance,\r
+  IN BOOLEAN           JoinFlag,\r
+  IN EFI_IPv6_ADDRESS  *GroupAddress       OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  IP6_SERVICE               *IpSb;\r
-  UINT32                    Index;\r
-  EFI_IPv6_ADDRESS          *Group;\r
+  EFI_STATUS        Status;\r
+  IP6_SERVICE       *IpSb;\r
+  UINT32            Index;\r
+  EFI_IPv6_ADDRESS  *Group;\r
 \r
   IpSb = IpInstance->Service;\r
 \r
@@ -690,13 +690,13 @@ Ip6Groups (
 **/\r
 EFI_STATUS\r
 Ip6UpdateDelayTimer (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN UINT16                 MaxRespDelay,\r
-  IN EFI_IPv6_ADDRESS       *MulticastAddr,\r
-  IN OUT IP6_MLD_GROUP      *Group\r
+  IN IP6_SERVICE        *IpSb,\r
+  IN UINT16             MaxRespDelay,\r
+  IN EFI_IPv6_ADDRESS   *MulticastAddr,\r
+  IN OUT IP6_MLD_GROUP  *Group\r
   )\r
 {\r
-  UINT32                    Delay;\r
+  UINT32  Delay;\r
 \r
   //\r
   // If the Query packet specifies a Maximum Response Delay of zero, perform timer\r
@@ -707,14 +707,14 @@ Ip6UpdateDelayTimer (
     return Ip6SendMldReport (IpSb, NULL, MulticastAddr);\r
   }\r
 \r
-  Delay = (UINT32) (MaxRespDelay / 1000);\r
+  Delay = (UINT32)(MaxRespDelay / 1000);\r
 \r
   //\r
   // Sets a delay timer to a random value selected from the range [0, Maximum Response Delay]\r
   // If a timer is already running, resets it if the request Maximum Response Delay\r
   // is less than the remaining value of the running timer.\r
   //\r
-  if (Group->DelayTimer == 0 || Delay < Group->DelayTimer) {\r
+  if ((Group->DelayTimer == 0) || (Delay < Group->DelayTimer)) {\r
     Group->DelayTimer = Delay / 4294967295UL * NET_RANDOM (NetRandomInitSeed ());\r
   }\r
 \r
@@ -736,16 +736,16 @@ Ip6UpdateDelayTimer (
 **/\r
 EFI_STATUS\r
 Ip6ProcessMldQuery (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   )\r
 {\r
-  EFI_IPv6_ADDRESS          AllNodes;\r
-  IP6_MLD_GROUP             *Group;\r
-  IP6_MLD_HEAD              MldPacket;\r
-  LIST_ENTRY                *Entry;\r
-  EFI_STATUS                Status;\r
+  EFI_IPv6_ADDRESS  AllNodes;\r
+  IP6_MLD_GROUP     *Group;\r
+  IP6_MLD_HEAD      MldPacket;\r
+  LIST_ENTRY        *Entry;\r
+  EFI_STATUS        Status;\r
 \r
   Status = EFI_INVALID_PARAMETER;\r
 \r
@@ -756,14 +756,14 @@ Ip6ProcessMldQuery (
     goto Exit;\r
   }\r
 \r
-  if (Head->HopLimit != 1 || !IP6_IS_MULTICAST (&Head->DestinationAddress)) {\r
+  if ((Head->HopLimit != 1) || !IP6_IS_MULTICAST (&Head->DestinationAddress)) {\r
     goto Exit;\r
   }\r
 \r
   //\r
   // The Packet points to MLD report raw data without Hop-By-Hop option.\r
   //\r
-  NetbufCopy (Packet, 0, sizeof (IP6_MLD_HEAD), (UINT8 *) &MldPacket);\r
+  NetbufCopy (Packet, 0, sizeof (IP6_MLD_HEAD), (UINT8 *)&MldPacket);\r
   MldPacket.MaxRespDelay = NTOHS (MldPacket.MaxRespDelay);\r
 \r
   Ip6SetToAllNodeMulticast (FALSE, IP6_LINK_LOCAL_SCOPE, &AllNodes);\r
@@ -774,6 +774,7 @@ Ip6ProcessMldQuery (
     if (!EFI_IP6_EQUAL (&Head->DestinationAddress, &MldPacket.Group)) {\r
       goto Exit;\r
     }\r
+\r
     //\r
     // The node is not listening but it receives the specific query. Just return.\r
     //\r
@@ -824,14 +825,14 @@ Exit:
 **/\r
 EFI_STATUS\r
 Ip6ProcessMldReport (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   )\r
 {\r
-  IP6_MLD_HEAD              MldPacket;\r
-  IP6_MLD_GROUP             *Group;\r
-  EFI_STATUS                Status;\r
+  IP6_MLD_HEAD   MldPacket;\r
+  IP6_MLD_GROUP  *Group;\r
+  EFI_STATUS     Status;\r
 \r
   Status = EFI_INVALID_PARAMETER;\r
 \r
@@ -842,14 +843,14 @@ Ip6ProcessMldReport (
     goto Exit;\r
   }\r
 \r
-  if (Head->HopLimit != 1 || !IP6_IS_MULTICAST (&Head->DestinationAddress)) {\r
+  if ((Head->HopLimit != 1) || !IP6_IS_MULTICAST (&Head->DestinationAddress)) {\r
     goto Exit;\r
   }\r
 \r
   //\r
   // The Packet points to MLD report raw data without Hop-By-Hop option.\r
   //\r
-  NetbufCopy (Packet, 0, sizeof (IP6_MLD_HEAD), (UINT8 *) &MldPacket);\r
+  NetbufCopy (Packet, 0, sizeof (IP6_MLD_HEAD), (UINT8 *)&MldPacket);\r
   if (!EFI_IP6_EQUAL (&Head->DestinationAddress, &MldPacket.Group)) {\r
     goto Exit;\r
   }\r
@@ -883,11 +884,11 @@ Exit:
 **/\r
 VOID\r
 Ip6MldTimerTicking (\r
-  IN IP6_SERVICE            *IpSb\r
+  IN IP6_SERVICE  *IpSb\r
   )\r
 {\r
-  IP6_MLD_GROUP             *Group;\r
-  LIST_ENTRY                *Entry;\r
+  IP6_MLD_GROUP  *Group;\r
+  LIST_ENTRY     *Entry;\r
 \r
   //\r
   // Send solicited report when timer expires\r
@@ -899,4 +900,3 @@ Ip6MldTimerTicking (
     }\r
   }\r
 }\r
-\r
index 89dd6c21fb64fe97fd44958ddedc2699b081388b..0b1fa21c3830d32e42b9cf1be9decee6830b4b0c 100644 (file)
 #ifndef __EFI_IP6_MLD_H__\r
 #define __EFI_IP6_MLD_H__\r
 \r
-#define IP6_UNSOLICITED_REPORT_INTERVAL 10\r
+#define IP6_UNSOLICITED_REPORT_INTERVAL  10\r
 \r
 #pragma pack(1)\r
 typedef struct {\r
-  IP6_ICMP_HEAD           Head;\r
-  UINT16                  MaxRespDelay;\r
-  UINT16                  Reserved;\r
-  EFI_IPv6_ADDRESS        Group;\r
+  IP6_ICMP_HEAD       Head;\r
+  UINT16              MaxRespDelay;\r
+  UINT16              Reserved;\r
+  EFI_IPv6_ADDRESS    Group;\r
 } IP6_MLD_HEAD;\r
 #pragma pack()\r
 \r
@@ -28,12 +28,12 @@ typedef struct {
 // "idle listener" state.\r
 //\r
 typedef struct {\r
-  LIST_ENTRY              Link;\r
-  INTN                    RefCnt;\r
-  EFI_IPv6_ADDRESS        Address;\r
-  UINT32                  DelayTimer;\r
-  BOOLEAN                 SendByUs;\r
-  EFI_MAC_ADDRESS         Mac;\r
+  LIST_ENTRY          Link;\r
+  INTN                RefCnt;\r
+  EFI_IPv6_ADDRESS    Address;\r
+  UINT32              DelayTimer;\r
+  BOOLEAN             SendByUs;\r
+  EFI_MAC_ADDRESS     Mac;\r
 } IP6_MLD_GROUP;\r
 \r
 //\r
@@ -42,8 +42,8 @@ typedef struct {
 // connected network is v1 or v2.\r
 //\r
 typedef struct {\r
-  INTN                    Mldv1QuerySeen;\r
-  LIST_ENTRY              Groups;\r
+  INTN          Mldv1QuerySeen;\r
+  LIST_ENTRY    Groups;\r
 } IP6_MLD_SERVICE_DATA;\r
 \r
 /**\r
@@ -57,8 +57,8 @@ typedef struct {
 **/\r
 IP6_MLD_GROUP *\r
 Ip6FindMldEntry (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *MulticastAddr\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *MulticastAddr\r
   );\r
 \r
 /**\r
@@ -74,7 +74,7 @@ Ip6FindMldEntry (
 **/\r
 EFI_STATUS\r
 Ip6InitMld (\r
-  IN IP6_SERVICE            *IpSb\r
+  IN IP6_SERVICE  *IpSb\r
   );\r
 \r
 /**\r
@@ -91,9 +91,9 @@ Ip6InitMld (
 **/\r
 EFI_STATUS\r
 Ip6JoinGroup (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN IP6_INTERFACE          *Interface,\r
-  IN EFI_IPv6_ADDRESS       *Address\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN IP6_INTERFACE     *Interface,\r
+  IN EFI_IPv6_ADDRESS  *Address\r
   );\r
 \r
 /**\r
@@ -109,8 +109,8 @@ Ip6JoinGroup (
 **/\r
 EFI_STATUS\r
 Ip6LeaveGroup (\r
IN IP6_SERVICE            *IpSb,\r
IN EFI_IPv6_ADDRESS       *Address\r
 IN IP6_SERVICE       *IpSb,\r
 IN EFI_IPv6_ADDRESS  *Address\r
   );\r
 \r
 /**\r
@@ -131,9 +131,9 @@ Ip6LeaveGroup (
 **/\r
 EFI_STATUS\r
 Ip6Groups (\r
-  IN IP6_PROTOCOL           *IpInstance,\r
-  IN BOOLEAN                JoinFlag,\r
-  IN EFI_IPv6_ADDRESS       *GroupAddress       OPTIONAL\r
+  IN IP6_PROTOCOL      *IpInstance,\r
+  IN BOOLEAN           JoinFlag,\r
+  IN EFI_IPv6_ADDRESS  *GroupAddress       OPTIONAL\r
   );\r
 \r
 /**\r
@@ -151,9 +151,9 @@ Ip6Groups (
 **/\r
 EFI_STATUS\r
 Ip6ProcessMldQuery (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   );\r
 \r
 /**\r
@@ -170,12 +170,11 @@ Ip6ProcessMldQuery (
 **/\r
 EFI_STATUS\r
 Ip6ProcessMldReport (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   );\r
 \r
-\r
 /**\r
   The heartbeat timer of the MLD module. It sends out solicited MLD report when\r
   DelayTimer expires.\r
@@ -185,8 +184,7 @@ Ip6ProcessMldReport (
 **/\r
 VOID\r
 Ip6MldTimerTicking (\r
-  IN IP6_SERVICE            *IpSb\r
+  IN IP6_SERVICE  *IpSb\r
   );\r
 \r
 #endif\r
-\r
index 0780a98cb3253897d2260714f8dc25ca37e8e474..c10c7017f88dcbb4d4e5027f0c3f2456d8c5fcaa 100644 (file)
@@ -9,7 +9,7 @@
 \r
 #include "Ip6Impl.h"\r
 \r
-EFI_MAC_ADDRESS mZeroMacAddress;\r
+EFI_MAC_ADDRESS  mZeroMacAddress;\r
 \r
 /**\r
   Update the ReachableTime in IP6 service binding instance data, in milliseconds.\r
@@ -22,10 +22,10 @@ Ip6UpdateReachableTime (
   IN OUT IP6_SERVICE  *IpSb\r
   )\r
 {\r
-  UINT32              Random;\r
+  UINT32  Random;\r
 \r
-  Random = (NetRandomInitSeed () / 4294967295UL) * IP6_RANDOM_FACTOR_SCALE;\r
-  Random = Random + IP6_MIN_RANDOM_FACTOR_SCALED;\r
+  Random              = (NetRandomInitSeed () / 4294967295UL) * IP6_RANDOM_FACTOR_SCALE;\r
+  Random              = Random + IP6_MIN_RANDOM_FACTOR_SCALED;\r
   IpSb->ReachableTime = (IpSb->BaseReachableTime * Random) / IP6_RANDOM_FACTOR_SCALE;\r
 }\r
 \r
@@ -43,17 +43,17 @@ Ip6UpdateReachableTime (
 **/\r
 EFI_STATUS\r
 Ip6BuildEfiNeighborCache (\r
-  IN IP6_PROTOCOL            *IpInstance,\r
-  OUT UINT32                 *NeighborCount,\r
-  OUT EFI_IP6_NEIGHBOR_CACHE **NeighborCache\r
+  IN IP6_PROTOCOL             *IpInstance,\r
+  OUT UINT32                  *NeighborCount,\r
+  OUT EFI_IP6_NEIGHBOR_CACHE  **NeighborCache\r
   )\r
 {\r
-  IP6_NEIGHBOR_ENTRY        *Neighbor;\r
-  LIST_ENTRY                *Entry;\r
-  IP6_SERVICE               *IpSb;\r
-  UINT32                    Count;\r
-  EFI_IP6_NEIGHBOR_CACHE    *EfiNeighborCache;\r
-  EFI_IP6_NEIGHBOR_CACHE    *NeighborCacheTmp;\r
+  IP6_NEIGHBOR_ENTRY      *Neighbor;\r
+  LIST_ENTRY              *Entry;\r
+  IP6_SERVICE             *IpSb;\r
+  UINT32                  Count;\r
+  EFI_IP6_NEIGHBOR_CACHE  *EfiNeighborCache;\r
+  EFI_IP6_NEIGHBOR_CACHE  *NeighborCacheTmp;\r
 \r
   NET_CHECK_SIGNATURE (IpInstance, IP6_PROTOCOL_SIGNATURE);\r
   ASSERT (NeighborCount != NULL && NeighborCache != NULL);\r
@@ -82,7 +82,7 @@ Ip6BuildEfiNeighborCache (
 \r
     EfiNeighborCache = NeighborCacheTmp + Count;\r
 \r
-   EfiNeighborCache->State = Neighbor->State;\r
+    EfiNeighborCache->State = Neighbor->State;\r
     IP6_COPY_ADDRESS (&EfiNeighborCache->Neighbor, &Neighbor->Neighbor);\r
     IP6_COPY_LINK_ADDRESS (&EfiNeighborCache->LinkAddress, &Neighbor->LinkAddress);\r
 \r
@@ -114,12 +114,12 @@ Ip6BuildPrefixTable (
   OUT EFI_IP6_ADDRESS_INFO  **PrefixTable\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  IP6_SERVICE               *IpSb;\r
-  UINT32                    Count;\r
-  IP6_PREFIX_LIST_ENTRY     *PrefixList;\r
-  EFI_IP6_ADDRESS_INFO      *EfiPrefix;\r
-  EFI_IP6_ADDRESS_INFO      *PrefixTableTmp;\r
+  LIST_ENTRY             *Entry;\r
+  IP6_SERVICE            *IpSb;\r
+  UINT32                 Count;\r
+  IP6_PREFIX_LIST_ENTRY  *PrefixList;\r
+  EFI_IP6_ADDRESS_INFO   *EfiPrefix;\r
+  EFI_IP6_ADDRESS_INFO   *PrefixTableTmp;\r
 \r
   NET_CHECK_SIGNATURE (IpInstance, IP6_PROTOCOL_SIGNATURE);\r
   ASSERT (PrefixCount != NULL && PrefixTable != NULL);\r
@@ -178,21 +178,21 @@ Ip6BuildPrefixTable (
 **/\r
 IP6_PREFIX_LIST_ENTRY *\r
 Ip6CreatePrefixListEntry (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN BOOLEAN                OnLinkOrAuto,\r
-  IN UINT32                 ValidLifetime,\r
-  IN UINT32                 PreferredLifetime,\r
-  IN UINT8                  PrefixLength,\r
-  IN EFI_IPv6_ADDRESS       *Prefix\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN BOOLEAN           OnLinkOrAuto,\r
+  IN UINT32            ValidLifetime,\r
+  IN UINT32            PreferredLifetime,\r
+  IN UINT8             PrefixLength,\r
+  IN EFI_IPv6_ADDRESS  *Prefix\r
   )\r
 {\r
-  IP6_PREFIX_LIST_ENTRY     *PrefixEntry;\r
-  IP6_ROUTE_ENTRY           *RtEntry;\r
-  LIST_ENTRY                *ListHead;\r
-  LIST_ENTRY                *Entry;\r
-  IP6_PREFIX_LIST_ENTRY     *TmpPrefixEntry;\r
+  IP6_PREFIX_LIST_ENTRY  *PrefixEntry;\r
+  IP6_ROUTE_ENTRY        *RtEntry;\r
+  LIST_ENTRY             *ListHead;\r
+  LIST_ENTRY             *Entry;\r
+  IP6_PREFIX_LIST_ENTRY  *TmpPrefixEntry;\r
 \r
-  if (Prefix == NULL || PreferredLifetime > ValidLifetime || PrefixLength > IP6_PREFIX_MAX) {\r
+  if ((Prefix == NULL) || (PreferredLifetime > ValidLifetime) || (PrefixLength > IP6_PREFIX_MAX)) {\r
     return NULL;\r
   }\r
 \r
@@ -205,7 +205,7 @@ Ip6CreatePrefixListEntry (
                   Prefix\r
                   );\r
   if (PrefixEntry != NULL) {\r
-    PrefixEntry->RefCnt ++;\r
+    PrefixEntry->RefCnt++;\r
     return PrefixEntry;\r
   }\r
 \r
@@ -242,7 +242,7 @@ Ip6CreatePrefixListEntry (
   // is put ahead in the list.\r
   //\r
   NET_LIST_FOR_EACH (Entry, ListHead) {\r
-    TmpPrefixEntry = NET_LIST_USER_STRUCT(Entry, IP6_PREFIX_LIST_ENTRY, Link);\r
+    TmpPrefixEntry = NET_LIST_USER_STRUCT (Entry, IP6_PREFIX_LIST_ENTRY, Link);\r
 \r
     if (TmpPrefixEntry->PrefixLength < PrefixEntry->PrefixLength) {\r
       break;\r
@@ -274,26 +274,26 @@ Ip6DestroyPrefixListEntry (
   IN BOOLEAN                ImmediateDelete\r
   )\r
 {\r
-  LIST_ENTRY      *Entry;\r
-  IP6_INTERFACE   *IpIf;\r
-  EFI_STATUS      Status;\r
+  LIST_ENTRY     *Entry;\r
+  IP6_INTERFACE  *IpIf;\r
+  EFI_STATUS     Status;\r
 \r
   if ((!ImmediateDelete) && (PrefixEntry->RefCnt > 0) && ((--PrefixEntry->RefCnt) > 0)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   if (OnLinkOrAuto) {\r
-      //\r
-      // Remove the direct route for onlink prefix from route table.\r
-      //\r
-      do {\r
-        Status = Ip6DelRoute (\r
-                   IpSb->RouteTable,\r
-                   &PrefixEntry->Prefix,\r
-                   PrefixEntry->PrefixLength,\r
-                   NULL\r
-                   );\r
-      } while (Status != EFI_NOT_FOUND);\r
+    //\r
+    // Remove the direct route for onlink prefix from route table.\r
+    //\r
+    do {\r
+      Status = Ip6DelRoute (\r
+                 IpSb->RouteTable,\r
+                 &PrefixEntry->Prefix,\r
+                 PrefixEntry->PrefixLength,\r
+                 NULL\r
+                 );\r
+    } while (Status != EFI_NOT_FOUND);\r
   } else {\r
     //\r
     // Remove the corresponding addresses generated from this autonomous prefix.\r
@@ -324,15 +324,15 @@ Ip6DestroyPrefixListEntry (
 **/\r
 IP6_PREFIX_LIST_ENTRY *\r
 Ip6FindPrefixListEntry (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN BOOLEAN                OnLinkOrAuto,\r
-  IN UINT8                  PrefixLength,\r
-  IN EFI_IPv6_ADDRESS       *Prefix\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN BOOLEAN           OnLinkOrAuto,\r
+  IN UINT8             PrefixLength,\r
+  IN EFI_IPv6_ADDRESS  *Prefix\r
   )\r
 {\r
-  IP6_PREFIX_LIST_ENTRY     *PrefixList;\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *ListHead;\r
+  IP6_PREFIX_LIST_ENTRY  *PrefixList;\r
+  LIST_ENTRY             *Entry;\r
+  LIST_ENTRY             *ListHead;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
   ASSERT (Prefix != NULL);\r
@@ -349,8 +349,9 @@ Ip6FindPrefixListEntry (
       //\r
       // Perform exactly prefix match.\r
       //\r
-      if (PrefixList->PrefixLength == PrefixLength &&\r
-        NetIp6IsNetEqual (&PrefixList->Prefix, Prefix, PrefixLength)) {\r
+      if ((PrefixList->PrefixLength == PrefixLength) &&\r
+          NetIp6IsNetEqual (&PrefixList->Prefix, Prefix, PrefixLength))\r
+      {\r
         return PrefixList;\r
       }\r
     } else {\r
@@ -377,14 +378,14 @@ Ip6FindPrefixListEntry (
 **/\r
 VOID\r
 Ip6CleanPrefixListTable (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN LIST_ENTRY             *ListHead\r
+  IN IP6_SERVICE  *IpSb,\r
+  IN LIST_ENTRY   *ListHead\r
   )\r
 {\r
-  IP6_PREFIX_LIST_ENTRY     *PrefixList;\r
-  BOOLEAN                   OnLink;\r
+  IP6_PREFIX_LIST_ENTRY  *PrefixList;\r
+  BOOLEAN                OnLink;\r
 \r
-  OnLink = (BOOLEAN) (ListHead == &IpSb->OnlinkPrefix);\r
+  OnLink = (BOOLEAN)(ListHead == &IpSb->OnlinkPrefix);\r
 \r
   while (!IsListEmpty (ListHead)) {\r
     PrefixList = NET_LIST_HEAD (ListHead, IP6_PREFIX_LIST_ENTRY, Link);\r
@@ -402,25 +403,25 @@ Ip6CleanPrefixListTable (
 **/\r
 VOID\r
 Ip6OnArpResolved (\r
-  IN VOID                   *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP6_NEIGHBOR_ENTRY        *ArpQue;\r
-  IP6_SERVICE               *IpSb;\r
-  IP6_LINK_TX_TOKEN         *Token;\r
-  EFI_STATUS                Status;\r
-  BOOLEAN                   Sent;\r
-\r
-  ArpQue = (IP6_NEIGHBOR_ENTRY *) Context;\r
+  LIST_ENTRY          *Entry;\r
+  LIST_ENTRY          *Next;\r
+  IP6_NEIGHBOR_ENTRY  *ArpQue;\r
+  IP6_SERVICE         *IpSb;\r
+  IP6_LINK_TX_TOKEN   *Token;\r
+  EFI_STATUS          Status;\r
+  BOOLEAN             Sent;\r
+\r
+  ArpQue = (IP6_NEIGHBOR_ENTRY *)Context;\r
   if ((ArpQue == NULL) || (ArpQue->Interface == NULL)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
-  IpSb   = ArpQue->Interface->Service;\r
+  IpSb = ArpQue->Interface->Service;\r
   if ((IpSb == NULL) || (IpSb->Signature != IP6_SERVICE_SIGNATURE)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   //\r
@@ -430,7 +431,7 @@ Ip6OnArpResolved (
   //\r
   if (NET_MAC_EQUAL (&ArpQue->LinkAddress, &mZeroMacAddress, IpSb->SnpMode.HwAddressSize)) {\r
     Ip6FreeNeighborEntry (IpSb, ArpQue, FALSE, TRUE, EFI_NO_MAPPING, NULL, NULL);\r
-    return ;\r
+    return;\r
   }\r
 \r
   //\r
@@ -471,7 +472,7 @@ Ip6OnArpResolved (
 \r
   if (Sent && (ArpQue->State == EfiNeighborStale)) {\r
     ArpQue->State = EfiNeighborDelay;\r
-    ArpQue->Ticks = (UINT32) IP6_GET_TICKS (IP6_DELAY_FIRST_PROBE_TIME);\r
+    ArpQue->Ticks = (UINT32)IP6_GET_TICKS (IP6_DELAY_FIRST_PROBE_TIME);\r
   }\r
 }\r
 \r
@@ -491,17 +492,17 @@ Ip6OnArpResolved (
 **/\r
 IP6_NEIGHBOR_ENTRY *\r
 Ip6CreateNeighborEntry (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN IP6_ARP_CALLBACK       CallBack,\r
-  IN EFI_IPv6_ADDRESS       *Ip6Address,\r
-  IN EFI_MAC_ADDRESS        *LinkAddress OPTIONAL\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN IP6_ARP_CALLBACK  CallBack,\r
+  IN EFI_IPv6_ADDRESS  *Ip6Address,\r
+  IN EFI_MAC_ADDRESS   *LinkAddress OPTIONAL\r
   )\r
 {\r
-  IP6_NEIGHBOR_ENTRY        *Entry;\r
-  IP6_DEFAULT_ROUTER        *DefaultRouter;\r
+  IP6_NEIGHBOR_ENTRY  *Entry;\r
+  IP6_DEFAULT_ROUTER  *DefaultRouter;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
-  ASSERT (Ip6Address!= NULL);\r
+  ASSERT (Ip6Address != NULL);\r
 \r
   Entry = AllocateZeroPool (sizeof (IP6_NEIGHBOR_ENTRY));\r
   if (Entry == NULL) {\r
@@ -552,13 +553,13 @@ Ip6CreateNeighborEntry (
 **/\r
 IP6_NEIGHBOR_ENTRY *\r
 Ip6FindNeighborEntry (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *Ip6Address\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *Ip6Address\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP6_NEIGHBOR_ENTRY        *Neighbor;\r
+  LIST_ENTRY          *Entry;\r
+  LIST_ENTRY          *Next;\r
+  IP6_NEIGHBOR_ENTRY  *Neighbor;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
   ASSERT (Ip6Address != NULL);\r
@@ -599,25 +600,25 @@ Ip6FindNeighborEntry (
 **/\r
 EFI_STATUS\r
 Ip6FreeNeighborEntry (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN IP6_NEIGHBOR_ENTRY     *NeighborCache,\r
-  IN BOOLEAN                SendIcmpError,\r
-  IN BOOLEAN                FullFree,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN IP6_FRAME_TO_CANCEL    FrameToCancel OPTIONAL,\r
-  IN VOID                   *Context      OPTIONAL\r
+  IN IP6_SERVICE          *IpSb,\r
+  IN IP6_NEIGHBOR_ENTRY   *NeighborCache,\r
+  IN BOOLEAN              SendIcmpError,\r
+  IN BOOLEAN              FullFree,\r
+  IN EFI_STATUS           IoStatus,\r
+  IN IP6_FRAME_TO_CANCEL  FrameToCancel OPTIONAL,\r
+  IN VOID                 *Context      OPTIONAL\r
   )\r
 {\r
-  IP6_LINK_TX_TOKEN         *TxToken;\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP6_DEFAULT_ROUTER        *DefaultRouter;\r
+  IP6_LINK_TX_TOKEN   *TxToken;\r
+  LIST_ENTRY          *Entry;\r
+  LIST_ENTRY          *Next;\r
+  IP6_DEFAULT_ROUTER  *DefaultRouter;\r
 \r
   //\r
   // If FrameToCancel fails, the token will not be released.\r
   // To avoid the memory leak, stop this usage model.\r
   //\r
-  if (FullFree && FrameToCancel != NULL) {\r
+  if (FullFree && (FrameToCancel != NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -677,13 +678,13 @@ Ip6FreeNeighborEntry (
 **/\r
 IP6_DEFAULT_ROUTER *\r
 Ip6CreateDefaultRouter (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *Ip6Address,\r
-  IN UINT16                 RouterLifetime\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *Ip6Address,\r
+  IN UINT16            RouterLifetime\r
   )\r
 {\r
-  IP6_DEFAULT_ROUTER        *Entry;\r
-  IP6_ROUTE_ENTRY           *RtEntry;\r
+  IP6_DEFAULT_ROUTER  *Entry;\r
+  IP6_ROUTE_ENTRY     *RtEntry;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
   ASSERT (Ip6Address != NULL);\r
@@ -724,11 +725,11 @@ Ip6CreateDefaultRouter (
 **/\r
 VOID\r
 Ip6DestroyDefaultRouter (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN IP6_DEFAULT_ROUTER     *DefaultRouter\r
+  IN IP6_SERVICE         *IpSb,\r
+  IN IP6_DEFAULT_ROUTER  *DefaultRouter\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   RemoveEntryList (&DefaultRouter->Link);\r
 \r
@@ -751,10 +752,10 @@ Ip6DestroyDefaultRouter (
 **/\r
 VOID\r
 Ip6CleanDefaultRouterList (\r
-  IN IP6_SERVICE            *IpSb\r
+  IN IP6_SERVICE  *IpSb\r
   )\r
 {\r
-  IP6_DEFAULT_ROUTER        *DefaultRouter;\r
+  IP6_DEFAULT_ROUTER  *DefaultRouter;\r
 \r
   while (!IsListEmpty (&IpSb->DefaultRouterList)) {\r
     DefaultRouter = NET_LIST_HEAD (&IpSb->DefaultRouterList, IP6_DEFAULT_ROUTER, Link);\r
@@ -774,12 +775,12 @@ Ip6CleanDefaultRouterList (
 **/\r
 IP6_DEFAULT_ROUTER *\r
 Ip6FindDefaultRouter (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *Ip6Address\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *Ip6Address\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  IP6_DEFAULT_ROUTER        *DefaultRouter;\r
+  LIST_ENTRY          *Entry;\r
+  IP6_DEFAULT_ROUTER  *DefaultRouter;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
   ASSERT (Ip6Address != NULL);\r
@@ -846,10 +847,10 @@ Ip6OnDADFinished (
         // Set the exta options to send. Here we only want the option request option\r
         // with DNS SERVERS.\r
         //\r
-        Oro         = (EFI_DHCP6_PACKET_OPTION *) OptBuf;\r
-        Oro->OpCode = HTONS (DHCP6_OPT_ORO);\r
-        Oro->OpLen  = HTONS (2);\r
-        *((UINT16 *) &Oro->Data[0]) = HTONS (DHCP6_OPT_DNS_SERVERS);\r
+        Oro                        = (EFI_DHCP6_PACKET_OPTION *)OptBuf;\r
+        Oro->OpCode                = HTONS (DHCP6_OPT_ORO);\r
+        Oro->OpLen                 = HTONS (2);\r
+        *((UINT16 *)&Oro->Data[0]) = HTONS (DHCP6_OPT_DNS_SERVERS);\r
 \r
         InfoReqReXmit.Irt = 4;\r
         InfoReqReXmit.Mrc = 64;\r
@@ -875,12 +876,11 @@ Ip6OnDADFinished (
       Ip6CreatePrefixListEntry (\r
         IpSb,\r
         TRUE,\r
-        (UINT32) IP6_INFINIT_LIFETIME,\r
-        (UINT32) IP6_INFINIT_LIFETIME,\r
+        (UINT32)IP6_INFINIT_LIFETIME,\r
+        (UINT32)IP6_INFINIT_LIFETIME,\r
         IP6_LINK_LOCAL_PREFIX_LENGTH,\r
         &IpSb->LinkLocalAddr\r
         );\r
-\r
     } else {\r
       //\r
       // Global scope unicast address.\r
@@ -928,7 +928,7 @@ Ip6OnDADFinished (
     IpSb->Mnp->Configure (IpSb->Mnp, NULL);\r
     gBS->SetTimer (IpSb->Timer, TimerCancel, 0);\r
     gBS->SetTimer (IpSb->FasterTimer, TimerCancel, 0);\r
-    return ;\r
+    return;\r
   }\r
 \r
   if (!IsDadPassed || NetIp6IsLinkLocalAddr (&AddrInfo->Address)) {\r
@@ -961,10 +961,10 @@ Ip6OnDADFinished (
 **/\r
 EFI_STATUS\r
 Ip6InitDADProcess (\r
-  IN IP6_INTERFACE          *IpIf,\r
-  IN IP6_ADDRESS_INFO       *AddressInfo,\r
-  IN IP6_DAD_CALLBACK       Callback  OPTIONAL,\r
-  IN VOID                   *Context  OPTIONAL\r
+  IN IP6_INTERFACE     *IpIf,\r
+  IN IP6_ADDRESS_INFO  *AddressInfo,\r
+  IN IP6_DAD_CALLBACK  Callback  OPTIONAL,\r
+  IN VOID              *Context  OPTIONAL\r
   )\r
 {\r
   IP6_DAD_ENTRY                             *Entry;\r
@@ -1009,15 +1009,15 @@ Ip6InitDADProcess (
     return Status;\r
   }\r
 \r
-  Entry->Signature    = IP6_DAD_ENTRY_SIGNATURE;\r
-  Entry->MaxTransmit  = DadXmits->DupAddrDetectTransmits;\r
-  Entry->Transmit     = 0;\r
-  Entry->Receive      = 0;\r
-  MaxDelayTick        = IP6_MAX_RTR_SOLICITATION_DELAY / IP6_TIMER_INTERVAL_IN_MS;\r
-  Entry->RetransTick  = (MaxDelayTick * ((NET_RANDOM (NetRandomInitSeed ()) % 5) + 1)) / 5;\r
-  Entry->AddressInfo  = AddressInfo;\r
-  Entry->Callback     = Callback;\r
-  Entry->Context      = Context;\r
+  Entry->Signature   = IP6_DAD_ENTRY_SIGNATURE;\r
+  Entry->MaxTransmit = DadXmits->DupAddrDetectTransmits;\r
+  Entry->Transmit    = 0;\r
+  Entry->Receive     = 0;\r
+  MaxDelayTick       = IP6_MAX_RTR_SOLICITATION_DELAY / IP6_TIMER_INTERVAL_IN_MS;\r
+  Entry->RetransTick = (MaxDelayTick * ((NET_RANDOM (NetRandomInitSeed ()) % 5) + 1)) / 5;\r
+  Entry->AddressInfo = AddressInfo;\r
+  Entry->Callback    = Callback;\r
+  Entry->Context     = Context;\r
   InsertTailList (&IpIf->DupAddrDetectList, &Entry->Link);\r
 \r
   if (Entry->MaxTransmit == 0) {\r
@@ -1044,16 +1044,16 @@ Ip6InitDADProcess (
 **/\r
 IP6_DAD_ENTRY *\r
 Ip6FindDADEntry (\r
-  IN  IP6_SERVICE      *IpSb,\r
-  IN  EFI_IPv6_ADDRESS *Target,\r
-  OUT IP6_INTERFACE    **Interface OPTIONAL\r
+  IN  IP6_SERVICE       *IpSb,\r
+  IN  EFI_IPv6_ADDRESS  *Target,\r
+  OUT IP6_INTERFACE     **Interface OPTIONAL\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Entry2;\r
-  IP6_INTERFACE             *IpIf;\r
-  IP6_DAD_ENTRY             *DupAddrDetect;\r
-  IP6_ADDRESS_INFO          *AddrInfo;\r
+  LIST_ENTRY        *Entry;\r
+  LIST_ENTRY        *Entry2;\r
+  IP6_INTERFACE     *IpIf;\r
+  IP6_DAD_ENTRY     *DupAddrDetect;\r
+  IP6_ADDRESS_INFO  *AddrInfo;\r
 \r
   NET_LIST_FOR_EACH (Entry, &IpSb->Interfaces) {\r
     IpIf = NET_LIST_USER_STRUCT (Entry, IP6_INTERFACE, Link);\r
@@ -1065,6 +1065,7 @@ Ip6FindDADEntry (
         if (Interface != NULL) {\r
           *Interface = IpIf;\r
         }\r
+\r
         return DupAddrDetect;\r
       }\r
     }\r
@@ -1093,24 +1094,24 @@ Ip6FindDADEntry (
 **/\r
 EFI_STATUS\r
 Ip6SendRouterSolicit (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN IP6_INTERFACE          *Interface          OPTIONAL,\r
-  IN EFI_IPv6_ADDRESS       *SourceAddress      OPTIONAL,\r
-  IN EFI_IPv6_ADDRESS       *DestinationAddress OPTIONAL,\r
-  IN EFI_MAC_ADDRESS        *SourceLinkAddress  OPTIONAL\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN IP6_INTERFACE     *Interface          OPTIONAL,\r
+  IN EFI_IPv6_ADDRESS  *SourceAddress      OPTIONAL,\r
+  IN EFI_IPv6_ADDRESS  *DestinationAddress OPTIONAL,\r
+  IN EFI_MAC_ADDRESS   *SourceLinkAddress  OPTIONAL\r
   )\r
 {\r
-  NET_BUF                   *Packet;\r
-  EFI_IP6_HEADER            Head;\r
-  IP6_ICMP_INFORMATION_HEAD *IcmpHead;\r
-  IP6_ETHER_ADDR_OPTION     *LinkLayerOption;\r
-  UINT16                    PayloadLen;\r
-  IP6_INTERFACE             *IpIf;\r
+  NET_BUF                    *Packet;\r
+  EFI_IP6_HEADER             Head;\r
+  IP6_ICMP_INFORMATION_HEAD  *IcmpHead;\r
+  IP6_ETHER_ADDR_OPTION      *LinkLayerOption;\r
+  UINT16                     PayloadLen;\r
+  IP6_INTERFACE              *IpIf;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
 \r
   IpIf = Interface;\r
-  if (IpIf == NULL && IpSb->DefaultInterface != NULL) {\r
+  if ((IpIf == NULL) && (IpSb->DefaultInterface != NULL)) {\r
     IpIf = IpSb->DefaultInterface;\r
   }\r
 \r
@@ -1118,12 +1119,12 @@ Ip6SendRouterSolicit (
   // Generate the packet to be sent\r
   //\r
 \r
-  PayloadLen = (UINT16) sizeof (IP6_ICMP_INFORMATION_HEAD);\r
+  PayloadLen = (UINT16)sizeof (IP6_ICMP_INFORMATION_HEAD);\r
   if (SourceLinkAddress != NULL) {\r
     PayloadLen += sizeof (IP6_ETHER_ADDR_OPTION);\r
   }\r
 \r
-  Packet = NetbufAlloc (sizeof (EFI_IP6_HEADER) + (UINT32) PayloadLen);\r
+  Packet = NetbufAlloc (sizeof (EFI_IP6_HEADER) + (UINT32)PayloadLen);\r
   if (Packet == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -1131,11 +1132,11 @@ Ip6SendRouterSolicit (
   //\r
   // Create the basic IPv6 header.\r
   //\r
-  Head.FlowLabelL     = 0;\r
-  Head.FlowLabelH     = 0;\r
-  Head.PayloadLength  = HTONS (PayloadLen);\r
-  Head.NextHeader     = IP6_ICMP;\r
-  Head.HopLimit       = IP6_HOP_LIMIT;\r
+  Head.FlowLabelL    = 0;\r
+  Head.FlowLabelH    = 0;\r
+  Head.PayloadLength = HTONS (PayloadLen);\r
+  Head.NextHeader    = IP6_ICMP;\r
+  Head.HopLimit      = IP6_HOP_LIMIT;\r
 \r
   if (SourceAddress != NULL) {\r
     IP6_COPY_ADDRESS (&Head.SourceAddress, SourceAddress);\r
@@ -1143,7 +1144,6 @@ Ip6SendRouterSolicit (
     ZeroMem (&Head.SourceAddress, sizeof (EFI_IPv6_ADDRESS));\r
   }\r
 \r
-\r
   if (DestinationAddress != NULL) {\r
     IP6_COPY_ADDRESS (&Head.DestinationAddress, DestinationAddress);\r
   } else {\r
@@ -1156,7 +1156,7 @@ Ip6SendRouterSolicit (
   // Fill in the ICMP header, and Source link-layer address if contained.\r
   //\r
 \r
-  IcmpHead = (IP6_ICMP_INFORMATION_HEAD *) NetbufAllocSpace (Packet, sizeof (IP6_ICMP_INFORMATION_HEAD), FALSE);\r
+  IcmpHead = (IP6_ICMP_INFORMATION_HEAD *)NetbufAllocSpace (Packet, sizeof (IP6_ICMP_INFORMATION_HEAD), FALSE);\r
   ASSERT (IcmpHead != NULL);\r
   ZeroMem (IcmpHead, sizeof (IP6_ICMP_INFORMATION_HEAD));\r
   IcmpHead->Head.Type = ICMP_V6_ROUTER_SOLICIT;\r
@@ -1164,14 +1164,14 @@ Ip6SendRouterSolicit (
 \r
   LinkLayerOption = NULL;\r
   if (SourceLinkAddress != NULL) {\r
-    LinkLayerOption = (IP6_ETHER_ADDR_OPTION *) NetbufAllocSpace (\r
-                                                  Packet,\r
-                                                  sizeof (IP6_ETHER_ADDR_OPTION),\r
-                                                  FALSE\r
-                                                  );\r
+    LinkLayerOption = (IP6_ETHER_ADDR_OPTION *)NetbufAllocSpace (\r
+                                                 Packet,\r
+                                                 sizeof (IP6_ETHER_ADDR_OPTION),\r
+                                                 FALSE\r
+                                                 );\r
     ASSERT (LinkLayerOption != NULL);\r
     LinkLayerOption->Type   = Ip6OptionEtherSource;\r
-    LinkLayerOption->Length = (UINT8) sizeof (IP6_ETHER_ADDR_OPTION);\r
+    LinkLayerOption->Length = (UINT8)sizeof (IP6_ETHER_ADDR_OPTION);\r
     CopyMem (LinkLayerOption->EtherAddr, SourceLinkAddress, 6);\r
   }\r
 \r
@@ -1205,22 +1205,22 @@ Ip6SendRouterSolicit (
 **/\r
 EFI_STATUS\r
 Ip6SendNeighborAdvertise (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *SourceAddress,\r
-  IN EFI_IPv6_ADDRESS       *DestinationAddress,\r
-  IN EFI_IPv6_ADDRESS       *TargetIp6Address,\r
-  IN EFI_MAC_ADDRESS        *TargetLinkAddress,\r
-  IN BOOLEAN                IsRouter,\r
-  IN BOOLEAN                Override,\r
-  IN BOOLEAN                Solicited\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *SourceAddress,\r
+  IN EFI_IPv6_ADDRESS  *DestinationAddress,\r
+  IN EFI_IPv6_ADDRESS  *TargetIp6Address,\r
+  IN EFI_MAC_ADDRESS   *TargetLinkAddress,\r
+  IN BOOLEAN           IsRouter,\r
+  IN BOOLEAN           Override,\r
+  IN BOOLEAN           Solicited\r
   )\r
 {\r
-  NET_BUF                   *Packet;\r
-  EFI_IP6_HEADER            Head;\r
-  IP6_ICMP_INFORMATION_HEAD *IcmpHead;\r
-  IP6_ETHER_ADDR_OPTION     *LinkLayerOption;\r
-  EFI_IPv6_ADDRESS          *Target;\r
-  UINT16                    PayloadLen;\r
+  NET_BUF                    *Packet;\r
+  EFI_IP6_HEADER             Head;\r
+  IP6_ICMP_INFORMATION_HEAD  *IcmpHead;\r
+  IP6_ETHER_ADDR_OPTION      *LinkLayerOption;\r
+  EFI_IPv6_ADDRESS           *Target;\r
+  UINT16                     PayloadLen;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
 \r
@@ -1232,13 +1232,13 @@ Ip6SendNeighborAdvertise (
   //\r
   ASSERT (DestinationAddress != NULL && TargetIp6Address != NULL && TargetLinkAddress != NULL);\r
 \r
-  PayloadLen = (UINT16) (sizeof (IP6_ICMP_INFORMATION_HEAD) + sizeof (EFI_IPv6_ADDRESS) + sizeof (IP6_ETHER_ADDR_OPTION));\r
+  PayloadLen = (UINT16)(sizeof (IP6_ICMP_INFORMATION_HEAD) + sizeof (EFI_IPv6_ADDRESS) + sizeof (IP6_ETHER_ADDR_OPTION));\r
 \r
   //\r
   // Generate the packet to be sent\r
   //\r
 \r
-  Packet = NetbufAlloc (sizeof (EFI_IP6_HEADER) + (UINT32) PayloadLen);\r
+  Packet = NetbufAlloc (sizeof (EFI_IP6_HEADER) + (UINT32)PayloadLen);\r
   if (Packet == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -1246,11 +1246,11 @@ Ip6SendNeighborAdvertise (
   //\r
   // Create the basic IPv6 header.\r
   //\r
-  Head.FlowLabelL     = 0;\r
-  Head.FlowLabelH     = 0;\r
-  Head.PayloadLength  = HTONS (PayloadLen);\r
-  Head.NextHeader     = IP6_ICMP;\r
-  Head.HopLimit       = IP6_HOP_LIMIT;\r
+  Head.FlowLabelL    = 0;\r
+  Head.FlowLabelH    = 0;\r
+  Head.PayloadLength = HTONS (PayloadLen);\r
+  Head.NextHeader    = IP6_ICMP;\r
+  Head.HopLimit      = IP6_HOP_LIMIT;\r
 \r
   IP6_COPY_ADDRESS (&Head.SourceAddress, SourceAddress);\r
   IP6_COPY_ADDRESS (&Head.DestinationAddress, DestinationAddress);\r
@@ -1262,7 +1262,7 @@ Ip6SendNeighborAdvertise (
   // Set the Router flag, Solicited flag and Override flag.\r
   //\r
 \r
-  IcmpHead = (IP6_ICMP_INFORMATION_HEAD *) NetbufAllocSpace (Packet, sizeof (IP6_ICMP_INFORMATION_HEAD), FALSE);\r
+  IcmpHead = (IP6_ICMP_INFORMATION_HEAD *)NetbufAllocSpace (Packet, sizeof (IP6_ICMP_INFORMATION_HEAD), FALSE);\r
   ASSERT (IcmpHead != NULL);\r
   ZeroMem (IcmpHead, sizeof (IP6_ICMP_INFORMATION_HEAD));\r
   IcmpHead->Head.Type = ICMP_V6_NEIGHBOR_ADVERTISE;\r
@@ -1280,15 +1280,15 @@ Ip6SendNeighborAdvertise (
     IcmpHead->Fourth |= IP6_OVERRIDE_FLAG;\r
   }\r
 \r
-  Target = (EFI_IPv6_ADDRESS *) NetbufAllocSpace (Packet, sizeof (EFI_IPv6_ADDRESS), FALSE);\r
+  Target = (EFI_IPv6_ADDRESS *)NetbufAllocSpace (Packet, sizeof (EFI_IPv6_ADDRESS), FALSE);\r
   ASSERT (Target != NULL);\r
   IP6_COPY_ADDRESS (Target, TargetIp6Address);\r
 \r
-  LinkLayerOption = (IP6_ETHER_ADDR_OPTION *) NetbufAllocSpace (\r
-                                                Packet,\r
-                                                sizeof (IP6_ETHER_ADDR_OPTION),\r
-                                                FALSE\r
-                                                );\r
+  LinkLayerOption = (IP6_ETHER_ADDR_OPTION *)NetbufAllocSpace (\r
+                                               Packet,\r
+                                               sizeof (IP6_ETHER_ADDR_OPTION),\r
+                                               FALSE\r
+                                               );\r
   ASSERT (LinkLayerOption != NULL);\r
   LinkLayerOption->Type   = Ip6OptionEtherTarget;\r
   LinkLayerOption->Length = 1;\r
@@ -1320,33 +1320,33 @@ Ip6SendNeighborAdvertise (
 **/\r
 EFI_STATUS\r
 Ip6SendNeighborSolicit (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *SourceAddress,\r
-  IN EFI_IPv6_ADDRESS       *DestinationAddress,\r
-  IN EFI_IPv6_ADDRESS       *TargetIp6Address,\r
-  IN EFI_MAC_ADDRESS        *SourceLinkAddress OPTIONAL\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *SourceAddress,\r
+  IN EFI_IPv6_ADDRESS  *DestinationAddress,\r
+  IN EFI_IPv6_ADDRESS  *TargetIp6Address,\r
+  IN EFI_MAC_ADDRESS   *SourceLinkAddress OPTIONAL\r
   )\r
 {\r
-  NET_BUF                   *Packet;\r
-  EFI_IP6_HEADER            Head;\r
-  IP6_ICMP_INFORMATION_HEAD *IcmpHead;\r
-  IP6_ETHER_ADDR_OPTION     *LinkLayerOption;\r
-  EFI_IPv6_ADDRESS          *Target;\r
-  BOOLEAN                   IsDAD;\r
-  UINT16                    PayloadLen;\r
-  IP6_NEIGHBOR_ENTRY        *Neighbor;\r
+  NET_BUF                    *Packet;\r
+  EFI_IP6_HEADER             Head;\r
+  IP6_ICMP_INFORMATION_HEAD  *IcmpHead;\r
+  IP6_ETHER_ADDR_OPTION      *LinkLayerOption;\r
+  EFI_IPv6_ADDRESS           *Target;\r
+  BOOLEAN                    IsDAD;\r
+  UINT16                     PayloadLen;\r
+  IP6_NEIGHBOR_ENTRY         *Neighbor;\r
 \r
   //\r
   // Check input parameters\r
   //\r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
-  if (DestinationAddress == NULL || TargetIp6Address == NULL) {\r
+  if ((DestinationAddress == NULL) || (TargetIp6Address == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   IsDAD = FALSE;\r
 \r
-  if (SourceAddress == NULL || (SourceAddress != NULL && NetIp6IsUnspecifiedAddr (SourceAddress))) {\r
+  if ((SourceAddress == NULL) || ((SourceAddress != NULL) && NetIp6IsUnspecifiedAddr (SourceAddress))) {\r
     IsDAD = TRUE;\r
   }\r
 \r
@@ -1355,21 +1355,21 @@ Ip6SendNeighborSolicit (
   // if the solicitation is not sent by performing DAD - Duplicate Address Detection.\r
   // Otherwise must not include it.\r
   //\r
-  PayloadLen = (UINT16) (sizeof (IP6_ICMP_INFORMATION_HEAD) + sizeof (EFI_IPv6_ADDRESS));\r
+  PayloadLen = (UINT16)(sizeof (IP6_ICMP_INFORMATION_HEAD) + sizeof (EFI_IPv6_ADDRESS));\r
 \r
   if (!IsDAD) {\r
     if (SourceLinkAddress == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
-    PayloadLen = (UINT16) (PayloadLen + sizeof (IP6_ETHER_ADDR_OPTION));\r
+    PayloadLen = (UINT16)(PayloadLen + sizeof (IP6_ETHER_ADDR_OPTION));\r
   }\r
 \r
   //\r
   // Generate the packet to be sent\r
   //\r
 \r
-  Packet = NetbufAlloc (sizeof (EFI_IP6_HEADER) + (UINT32) PayloadLen);\r
+  Packet = NetbufAlloc (sizeof (EFI_IP6_HEADER) + (UINT32)PayloadLen);\r
   if (Packet == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -1377,11 +1377,11 @@ Ip6SendNeighborSolicit (
   //\r
   // Create the basic IPv6 header\r
   //\r
-  Head.FlowLabelL     = 0;\r
-  Head.FlowLabelH     = 0;\r
-  Head.PayloadLength  = HTONS (PayloadLen);\r
-  Head.NextHeader     = IP6_ICMP;\r
-  Head.HopLimit       = IP6_HOP_LIMIT;\r
+  Head.FlowLabelL    = 0;\r
+  Head.FlowLabelH    = 0;\r
+  Head.PayloadLength = HTONS (PayloadLen);\r
+  Head.NextHeader    = IP6_ICMP;\r
+  Head.HopLimit      = IP6_HOP_LIMIT;\r
 \r
   if (SourceAddress != NULL) {\r
     IP6_COPY_ADDRESS (&Head.SourceAddress, SourceAddress);\r
@@ -1396,27 +1396,26 @@ Ip6SendNeighborSolicit (
   //\r
   // Fill in the ICMP header, Target address, and Source link-layer address.\r
   //\r
-  IcmpHead = (IP6_ICMP_INFORMATION_HEAD *) NetbufAllocSpace (Packet, sizeof (IP6_ICMP_INFORMATION_HEAD), FALSE);\r
+  IcmpHead = (IP6_ICMP_INFORMATION_HEAD *)NetbufAllocSpace (Packet, sizeof (IP6_ICMP_INFORMATION_HEAD), FALSE);\r
   ASSERT (IcmpHead != NULL);\r
   ZeroMem (IcmpHead, sizeof (IP6_ICMP_INFORMATION_HEAD));\r
   IcmpHead->Head.Type = ICMP_V6_NEIGHBOR_SOLICIT;\r
   IcmpHead->Head.Code = 0;\r
 \r
-  Target = (EFI_IPv6_ADDRESS *) NetbufAllocSpace (Packet, sizeof (EFI_IPv6_ADDRESS), FALSE);\r
+  Target = (EFI_IPv6_ADDRESS *)NetbufAllocSpace (Packet, sizeof (EFI_IPv6_ADDRESS), FALSE);\r
   ASSERT (Target != NULL);\r
   IP6_COPY_ADDRESS (Target, TargetIp6Address);\r
 \r
   LinkLayerOption = NULL;\r
   if (!IsDAD) {\r
-\r
     //\r
     // Fill in the source link-layer address option\r
     //\r
-    LinkLayerOption = (IP6_ETHER_ADDR_OPTION *) NetbufAllocSpace (\r
-                                                  Packet,\r
-                                                  sizeof (IP6_ETHER_ADDR_OPTION),\r
-                                                  FALSE\r
-                                                  );\r
+    LinkLayerOption = (IP6_ETHER_ADDR_OPTION *)NetbufAllocSpace (\r
+                                                 Packet,\r
+                                                 sizeof (IP6_ETHER_ADDR_OPTION),\r
+                                                 FALSE\r
+                                                 );\r
     ASSERT (LinkLayerOption != NULL);\r
     LinkLayerOption->Type   = Ip6OptionEtherSource;\r
     LinkLayerOption->Length = 1;\r
@@ -1457,30 +1456,30 @@ Ip6SendNeighborSolicit (
 **/\r
 EFI_STATUS\r
 Ip6ProcessNeighborSolicit (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   )\r
 {\r
-  IP6_ICMP_INFORMATION_HEAD Icmp;\r
-  EFI_IPv6_ADDRESS          Target;\r
-  IP6_ETHER_ADDR_OPTION     LinkLayerOption;\r
-  BOOLEAN                   IsDAD;\r
-  BOOLEAN                   IsUnicast;\r
-  BOOLEAN                   IsMaintained;\r
-  IP6_DAD_ENTRY             *DupAddrDetect;\r
-  IP6_INTERFACE             *IpIf;\r
-  IP6_NEIGHBOR_ENTRY        *Neighbor;\r
-  BOOLEAN                   Solicited;\r
-  BOOLEAN                   UpdateCache;\r
-  EFI_IPv6_ADDRESS          Dest;\r
-  UINT16                    OptionLen;\r
-  UINT8                     *Option;\r
-  BOOLEAN                   Provided;\r
-  EFI_STATUS                Status;\r
-  VOID                      *MacAddress;\r
-\r
-  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *) &Icmp);\r
+  IP6_ICMP_INFORMATION_HEAD  Icmp;\r
+  EFI_IPv6_ADDRESS           Target;\r
+  IP6_ETHER_ADDR_OPTION      LinkLayerOption;\r
+  BOOLEAN                    IsDAD;\r
+  BOOLEAN                    IsUnicast;\r
+  BOOLEAN                    IsMaintained;\r
+  IP6_DAD_ENTRY              *DupAddrDetect;\r
+  IP6_INTERFACE              *IpIf;\r
+  IP6_NEIGHBOR_ENTRY         *Neighbor;\r
+  BOOLEAN                    Solicited;\r
+  BOOLEAN                    UpdateCache;\r
+  EFI_IPv6_ADDRESS           Dest;\r
+  UINT16                     OptionLen;\r
+  UINT8                      *Option;\r
+  BOOLEAN                    Provided;\r
+  EFI_STATUS                 Status;\r
+  VOID                       *MacAddress;\r
+\r
+  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *)&Icmp);\r
   NetbufCopy (Packet, sizeof (Icmp), sizeof (Target), Target.Addr);\r
 \r
   //\r
@@ -1492,7 +1491,7 @@ Ip6ProcessNeighborSolicit (
   //\r
   Status = EFI_INVALID_PARAMETER;\r
 \r
-  if (Head->HopLimit != IP6_HOP_LIMIT || Icmp.Head.Code != 0 || !NetIp6IsValidUnicast (&Target)) {\r
+  if ((Head->HopLimit != IP6_HOP_LIMIT) || (Icmp.Head.Code != 0) || !NetIp6IsValidUnicast (&Target)) {\r
     goto Exit;\r
   }\r
 \r
@@ -1503,9 +1502,9 @@ Ip6ProcessNeighborSolicit (
   if (Head->PayloadLength < IP6_ND_LENGTH) {\r
     goto Exit;\r
   } else {\r
-    OptionLen = (UINT16) (Head->PayloadLength - IP6_ND_LENGTH);\r
+    OptionLen = (UINT16)(Head->PayloadLength - IP6_ND_LENGTH);\r
     if (OptionLen != 0) {\r
-      Option    = NetbufGetByte (Packet, IP6_ND_LENGTH, NULL);\r
+      Option = NetbufGetByte (Packet, IP6_ND_LENGTH, NULL);\r
       ASSERT (Option != NULL);\r
 \r
       //\r
@@ -1527,7 +1526,7 @@ Ip6ProcessNeighborSolicit (
       Packet,\r
       IP6_ND_LENGTH,\r
       sizeof (IP6_ETHER_ADDR_OPTION),\r
-      (UINT8 *) &LinkLayerOption\r
+      (UINT8 *)&LinkLayerOption\r
       );\r
     //\r
     // The solicitation for neighbor discovery should include a source link-layer\r
@@ -1591,7 +1590,8 @@ Ip6ProcessNeighborSolicit (
               MacAddress,\r
               &IpSb->SnpMode.CurrentAddress,\r
               IpSb->SnpMode.HwAddressSize\r
-              ) != 0) {\r
+              ) != 0)\r
+        {\r
           //\r
           // The NS is from another node to performing DAD on the same address.\r
           // Fail DAD for the tentative address.\r
@@ -1607,6 +1607,7 @@ Ip6ProcessNeighborSolicit (
         }\r
       }\r
     }\r
+\r
     goto Exit;\r
   }\r
 \r
@@ -1624,6 +1625,7 @@ Ip6ProcessNeighborSolicit (
         Status = EFI_OUT_OF_RESOURCES;\r
         goto Exit;\r
       }\r
+\r
       UpdateCache = TRUE;\r
     } else {\r
       if (CompareMem (Neighbor->LinkAddress.Addr, LinkLayerOption.EtherAddr, 6) != 0) {\r
@@ -1633,12 +1635,12 @@ Ip6ProcessNeighborSolicit (
 \r
     if (UpdateCache) {\r
       Neighbor->State = EfiNeighborStale;\r
-      Neighbor->Ticks = (UINT32) IP6_INFINIT_LIFETIME;\r
+      Neighbor->Ticks = (UINT32)IP6_INFINIT_LIFETIME;\r
       CopyMem (Neighbor->LinkAddress.Addr, LinkLayerOption.EtherAddr, 6);\r
       //\r
       // Send queued packets if exist.\r
       //\r
-      Neighbor->CallBack ((VOID *) Neighbor);\r
+      Neighbor->CallBack ((VOID *)Neighbor);\r
     }\r
   }\r
 \r
@@ -1686,28 +1688,28 @@ Exit:
 **/\r
 EFI_STATUS\r
 Ip6ProcessNeighborAdvertise (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   )\r
 {\r
-  IP6_ICMP_INFORMATION_HEAD Icmp;\r
-  EFI_IPv6_ADDRESS          Target;\r
-  IP6_ETHER_ADDR_OPTION     LinkLayerOption;\r
-  BOOLEAN                   Provided;\r
-  INTN                      Compare;\r
-  IP6_NEIGHBOR_ENTRY        *Neighbor;\r
-  IP6_DEFAULT_ROUTER        *DefaultRouter;\r
-  BOOLEAN                   Solicited;\r
-  BOOLEAN                   IsRouter;\r
-  BOOLEAN                   Override;\r
-  IP6_DAD_ENTRY             *DupAddrDetect;\r
-  IP6_INTERFACE             *IpIf;\r
-  UINT16                    OptionLen;\r
-  UINT8                     *Option;\r
-  EFI_STATUS                Status;\r
-\r
-  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *) &Icmp);\r
+  IP6_ICMP_INFORMATION_HEAD  Icmp;\r
+  EFI_IPv6_ADDRESS           Target;\r
+  IP6_ETHER_ADDR_OPTION      LinkLayerOption;\r
+  BOOLEAN                    Provided;\r
+  INTN                       Compare;\r
+  IP6_NEIGHBOR_ENTRY         *Neighbor;\r
+  IP6_DEFAULT_ROUTER         *DefaultRouter;\r
+  BOOLEAN                    Solicited;\r
+  BOOLEAN                    IsRouter;\r
+  BOOLEAN                    Override;\r
+  IP6_DAD_ENTRY              *DupAddrDetect;\r
+  IP6_INTERFACE              *IpIf;\r
+  UINT16                     OptionLen;\r
+  UINT8                      *Option;\r
+  EFI_STATUS                 Status;\r
+\r
+  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *)&Icmp);\r
   NetbufCopy (Packet, sizeof (Icmp), sizeof (Target), Target.Addr);\r
 \r
   //\r
@@ -1720,7 +1722,7 @@ Ip6ProcessNeighborAdvertise (
   // ICMP Code is 0.\r
   // Target Address is not a multicast address.\r
   //\r
-  if (Head->HopLimit != IP6_HOP_LIMIT || Icmp.Head.Code != 0 || !NetIp6IsValidUnicast (&Target)) {\r
+  if ((Head->HopLimit != IP6_HOP_LIMIT) || (Icmp.Head.Code != 0) || !NetIp6IsValidUnicast (&Target)) {\r
     goto Exit;\r
   }\r
 \r
@@ -1732,9 +1734,9 @@ Ip6ProcessNeighborAdvertise (
   if (Head->PayloadLength < IP6_ND_LENGTH) {\r
     goto Exit;\r
   } else {\r
-    OptionLen = (UINT16) (Head->PayloadLength - IP6_ND_LENGTH);\r
+    OptionLen = (UINT16)(Head->PayloadLength - IP6_ND_LENGTH);\r
     if (OptionLen != 0) {\r
-      Option    = NetbufGetByte (Packet, IP6_ND_LENGTH, NULL);\r
+      Option = NetbufGetByte (Packet, IP6_ND_LENGTH, NULL);\r
       ASSERT (Option != NULL);\r
 \r
       //\r
@@ -1753,6 +1755,7 @@ Ip6ProcessNeighborAdvertise (
   if ((Icmp.Fourth & IP6_SOLICITED_FLAG) == IP6_SOLICITED_FLAG) {\r
     Solicited = TRUE;\r
   }\r
+\r
   if (IP6_IS_MULTICAST (&Head->DestinationAddress) && Solicited) {\r
     goto Exit;\r
   }\r
@@ -1787,6 +1790,7 @@ Ip6ProcessNeighborAdvertise (
   if ((Icmp.Fourth & IP6_IS_ROUTER_FLAG) == IP6_IS_ROUTER_FLAG) {\r
     IsRouter = TRUE;\r
   }\r
+\r
   if ((Icmp.Fourth & IP6_OVERRIDE_FLAG) == IP6_OVERRIDE_FLAG) {\r
     Override = TRUE;\r
   }\r
@@ -1799,7 +1803,7 @@ Ip6ProcessNeighborAdvertise (
       Packet,\r
       IP6_ND_LENGTH,\r
       sizeof (IP6_ETHER_ADDR_OPTION),\r
-      (UINT8 *) &LinkLayerOption\r
+      (UINT8 *)&LinkLayerOption\r
       );\r
 \r
     if (LinkLayerOption.Type == Ip6OptionEtherTarget) {\r
@@ -1828,6 +1832,7 @@ Ip6ProcessNeighborAdvertise (
     if (!Provided) {\r
       goto Exit;\r
     }\r
+\r
     //\r
     // Update the Neighbor Cache\r
     //\r
@@ -1837,17 +1842,16 @@ Ip6ProcessNeighborAdvertise (
       Neighbor->Ticks = IP6_GET_TICKS (IpSb->ReachableTime);\r
     } else {\r
       Neighbor->State = EfiNeighborStale;\r
-      Neighbor->Ticks = (UINT32) IP6_INFINIT_LIFETIME;\r
+      Neighbor->Ticks = (UINT32)IP6_INFINIT_LIFETIME;\r
       //\r
       // Send any packets queued for the neighbor awaiting address resolution.\r
       //\r
-      Neighbor->CallBack ((VOID *) Neighbor);\r
+      Neighbor->CallBack ((VOID *)Neighbor);\r
     }\r
 \r
     Neighbor->IsRouter = IsRouter;\r
-\r
   } else {\r
-    if (!Override && Compare != 0) {\r
+    if (!Override && (Compare != 0)) {\r
       //\r
       // When the Override Flag is clear and supplied link-layer address differs from\r
       // that in the cache, if the state of the entry is not REACHABLE, ignore the\r
@@ -1856,12 +1860,13 @@ Ip6ProcessNeighborAdvertise (
       //\r
       if (Neighbor->State == EfiNeighborReachable) {\r
         Neighbor->State = EfiNeighborStale;\r
-        Neighbor->Ticks = (UINT32) IP6_INFINIT_LIFETIME;\r
+        Neighbor->Ticks = (UINT32)IP6_INFINIT_LIFETIME;\r
       }\r
     } else {\r
       if (Compare != 0) {\r
         CopyMem (Neighbor->LinkAddress.Addr, LinkLayerOption.EtherAddr, 6);\r
       }\r
+\r
       //\r
       // Update the entry's state\r
       //\r
@@ -1871,7 +1876,7 @@ Ip6ProcessNeighborAdvertise (
       } else {\r
         if (Compare != 0) {\r
           Neighbor->State = EfiNeighborStale;\r
-          Neighbor->Ticks = (UINT32) IP6_INFINIT_LIFETIME;\r
+          Neighbor->Ticks = (UINT32)IP6_INFINIT_LIFETIME;\r
         }\r
       }\r
 \r
@@ -1892,7 +1897,7 @@ Ip6ProcessNeighborAdvertise (
   }\r
 \r
   if (Neighbor->State == EfiNeighborReachable) {\r
-    Neighbor->CallBack ((VOID *) Neighbor);\r
+    Neighbor->CallBack ((VOID *)Neighbor);\r
   }\r
 \r
   Status = EFI_SUCCESS;\r
@@ -1918,36 +1923,36 @@ Exit:
 **/\r
 EFI_STATUS\r
 Ip6ProcessRouterAdvertise (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   )\r
 {\r
-  IP6_ICMP_INFORMATION_HEAD Icmp;\r
-  UINT32                    ReachableTime;\r
-  UINT32                    RetransTimer;\r
-  UINT16                    RouterLifetime;\r
-  UINT32                    Offset;\r
-  UINT8                     Type;\r
-  UINT8                     Length;\r
-  IP6_ETHER_ADDR_OPTION     LinkLayerOption;\r
-  UINT32                    Fourth;\r
-  UINT8                     CurHopLimit;\r
-  BOOLEAN                   Mflag;\r
-  BOOLEAN                   Oflag;\r
-  IP6_DEFAULT_ROUTER        *DefaultRouter;\r
-  IP6_NEIGHBOR_ENTRY        *NeighborCache;\r
-  EFI_MAC_ADDRESS           LinkLayerAddress;\r
-  IP6_MTU_OPTION            MTUOption;\r
-  IP6_PREFIX_INFO_OPTION    PrefixOption;\r
-  IP6_PREFIX_LIST_ENTRY     *PrefixList;\r
-  BOOLEAN                   OnLink;\r
-  BOOLEAN                   Autonomous;\r
-  EFI_IPv6_ADDRESS          StatelessAddress;\r
-  EFI_STATUS                Status;\r
-  UINT16                    OptionLen;\r
-  UINT8                     *Option;\r
-  INTN                      Result;\r
+  IP6_ICMP_INFORMATION_HEAD  Icmp;\r
+  UINT32                     ReachableTime;\r
+  UINT32                     RetransTimer;\r
+  UINT16                     RouterLifetime;\r
+  UINT32                     Offset;\r
+  UINT8                      Type;\r
+  UINT8                      Length;\r
+  IP6_ETHER_ADDR_OPTION      LinkLayerOption;\r
+  UINT32                     Fourth;\r
+  UINT8                      CurHopLimit;\r
+  BOOLEAN                    Mflag;\r
+  BOOLEAN                    Oflag;\r
+  IP6_DEFAULT_ROUTER         *DefaultRouter;\r
+  IP6_NEIGHBOR_ENTRY         *NeighborCache;\r
+  EFI_MAC_ADDRESS            LinkLayerAddress;\r
+  IP6_MTU_OPTION             MTUOption;\r
+  IP6_PREFIX_INFO_OPTION     PrefixOption;\r
+  IP6_PREFIX_LIST_ENTRY      *PrefixList;\r
+  BOOLEAN                    OnLink;\r
+  BOOLEAN                    Autonomous;\r
+  EFI_IPv6_ADDRESS           StatelessAddress;\r
+  EFI_STATUS                 Status;\r
+  UINT16                     OptionLen;\r
+  UINT8                      *Option;\r
+  INTN                       Result;\r
 \r
   Status = EFI_INVALID_PARAMETER;\r
 \r
@@ -1958,7 +1963,7 @@ Ip6ProcessRouterAdvertise (
     goto Exit;\r
   }\r
 \r
-  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *) &Icmp);\r
+  NetbufCopy (Packet, 0, sizeof (Icmp), (UINT8 *)&Icmp);\r
 \r
   //\r
   // Validate the incoming Router Advertisement\r
@@ -1970,23 +1975,25 @@ Ip6ProcessRouterAdvertise (
   if (!NetIp6IsLinkLocalAddr (&Head->SourceAddress)) {\r
     goto Exit;\r
   }\r
+\r
   //\r
   // The IP Hop Limit field has a value of 255, i.e. the packet\r
   // could not possibly have been forwarded by a router.\r
   // ICMP Code is 0.\r
   // ICMP length (derived from the IP length) is 16 or more octets.\r
   //\r
-  if (Head->HopLimit != IP6_HOP_LIMIT || Icmp.Head.Code != 0 ||\r
-      Head->PayloadLength < IP6_RA_LENGTH) {\r
+  if ((Head->HopLimit != IP6_HOP_LIMIT) || (Icmp.Head.Code != 0) ||\r
+      (Head->PayloadLength < IP6_RA_LENGTH))\r
+  {\r
     goto Exit;\r
   }\r
 \r
   //\r
   // All included options have a length that is greater than zero.\r
   //\r
-  OptionLen = (UINT16) (Head->PayloadLength - IP6_RA_LENGTH);\r
+  OptionLen = (UINT16)(Head->PayloadLength - IP6_RA_LENGTH);\r
   if (OptionLen != 0) {\r
-    Option    = NetbufGetByte (Packet, IP6_RA_LENGTH, NULL);\r
+    Option = NetbufGetByte (Packet, IP6_RA_LENGTH, NULL);\r
     ASSERT (Option != NULL);\r
 \r
     if (!Ip6IsNDOptionValid (Option, OptionLen)) {\r
@@ -2035,17 +2042,17 @@ Ip6ProcessRouterAdvertise (
     }\r
   }\r
 \r
-  CurHopLimit = *((UINT8 *) &Fourth + 3);\r
+  CurHopLimit = *((UINT8 *)&Fourth + 3);\r
   if (CurHopLimit != 0) {\r
     IpSb->CurHopLimit = CurHopLimit;\r
   }\r
 \r
   Mflag = FALSE;\r
   Oflag = FALSE;\r
-  if ((*((UINT8 *) &Fourth + 2) & IP6_M_ADDR_CONFIG_FLAG) == IP6_M_ADDR_CONFIG_FLAG) {\r
+  if ((*((UINT8 *)&Fourth + 2) & IP6_M_ADDR_CONFIG_FLAG) == IP6_M_ADDR_CONFIG_FLAG) {\r
     Mflag = TRUE;\r
   } else {\r
-    if ((*((UINT8 *) &Fourth + 2) & IP6_O_CONFIG_FLAG) == IP6_O_CONFIG_FLAG) {\r
+    if ((*((UINT8 *)&Fourth + 2) & IP6_O_CONFIG_FLAG) == IP6_O_CONFIG_FLAG) {\r
       Oflag = TRUE;\r
     }\r
   }\r
@@ -2060,12 +2067,12 @@ Ip6ProcessRouterAdvertise (
   //\r
   // Process Reachable Time and Retrans Timer fields.\r
   //\r
-  NetbufCopy (Packet, sizeof (Icmp), sizeof (UINT32), (UINT8 *) &ReachableTime);\r
-  NetbufCopy (Packet, sizeof (Icmp) + sizeof (UINT32), sizeof (UINT32), (UINT8 *) &RetransTimer);\r
+  NetbufCopy (Packet, sizeof (Icmp), sizeof (UINT32), (UINT8 *)&ReachableTime);\r
+  NetbufCopy (Packet, sizeof (Icmp) + sizeof (UINT32), sizeof (UINT32), (UINT8 *)&RetransTimer);\r
   ReachableTime = NTOHL (ReachableTime);\r
   RetransTimer  = NTOHL (RetransTimer);\r
 \r
-  if (ReachableTime != 0 && ReachableTime != IpSb->BaseReachableTime) {\r
+  if ((ReachableTime != 0) && (ReachableTime != IpSb->BaseReachableTime)) {\r
     //\r
     // If new value is not unspecified and differs from the previous one, record it\r
     // in BaseReachableTime and recompute a ReachableTime.\r
@@ -2098,262 +2105,266 @@ Ip6ProcessRouterAdvertise (
   // fit within the input packet.\r
   //\r
   Offset = 16;\r
-  while (Offset < (UINT32) Head->PayloadLength) {\r
+  while (Offset < (UINT32)Head->PayloadLength) {\r
     NetbufCopy (Packet, Offset, sizeof (UINT8), &Type);\r
     switch (Type) {\r
-    case Ip6OptionEtherSource:\r
-      //\r
-      // Update the neighbor cache\r
-      //\r
-      NetbufCopy (Packet, Offset, sizeof (IP6_ETHER_ADDR_OPTION), (UINT8 *) &LinkLayerOption);\r
+      case Ip6OptionEtherSource:\r
+        //\r
+        // Update the neighbor cache\r
+        //\r
+        NetbufCopy (Packet, Offset, sizeof (IP6_ETHER_ADDR_OPTION), (UINT8 *)&LinkLayerOption);\r
 \r
-      //\r
-      // Option size validity ensured by Ip6IsNDOptionValid().\r
-      //\r
-      ASSERT (LinkLayerOption.Length != 0);\r
-      ASSERT (Offset + (UINT32) LinkLayerOption.Length * 8 <= (UINT32) Head->PayloadLength);\r
+        //\r
+        // Option size validity ensured by Ip6IsNDOptionValid().\r
+        //\r
+        ASSERT (LinkLayerOption.Length != 0);\r
+        ASSERT (Offset + (UINT32)LinkLayerOption.Length * 8 <= (UINT32)Head->PayloadLength);\r
 \r
-      ZeroMem (&LinkLayerAddress, sizeof (EFI_MAC_ADDRESS));\r
-      CopyMem (&LinkLayerAddress, LinkLayerOption.EtherAddr, 6);\r
+        ZeroMem (&LinkLayerAddress, sizeof (EFI_MAC_ADDRESS));\r
+        CopyMem (&LinkLayerAddress, LinkLayerOption.EtherAddr, 6);\r
 \r
-      if (NeighborCache == NULL) {\r
-        NeighborCache = Ip6CreateNeighborEntry (\r
-                          IpSb,\r
-                          Ip6OnArpResolved,\r
-                          &Head->SourceAddress,\r
-                          &LinkLayerAddress\r
-                          );\r
         if (NeighborCache == NULL) {\r
-          Status = EFI_OUT_OF_RESOURCES;\r
-          goto Exit;\r
+          NeighborCache = Ip6CreateNeighborEntry (\r
+                            IpSb,\r
+                            Ip6OnArpResolved,\r
+                            &Head->SourceAddress,\r
+                            &LinkLayerAddress\r
+                            );\r
+          if (NeighborCache == NULL) {\r
+            Status = EFI_OUT_OF_RESOURCES;\r
+            goto Exit;\r
+          }\r
+\r
+          NeighborCache->IsRouter = TRUE;\r
+          NeighborCache->State    = EfiNeighborStale;\r
+          NeighborCache->Ticks    = (UINT32)IP6_INFINIT_LIFETIME;\r
+        } else {\r
+          Result = CompareMem (&LinkLayerAddress, &NeighborCache->LinkAddress, 6);\r
+\r
+          //\r
+          // If the link-local address is the same as that already in the cache,\r
+          // the cache entry's state remains unchanged. Otherwise update the\r
+          // reachability state to STALE.\r
+          //\r
+          if ((NeighborCache->State == EfiNeighborInComplete) || (Result != 0)) {\r
+            CopyMem (&NeighborCache->LinkAddress, &LinkLayerAddress, 6);\r
+\r
+            NeighborCache->Ticks = (UINT32)IP6_INFINIT_LIFETIME;\r
+\r
+            if (NeighborCache->State == EfiNeighborInComplete) {\r
+              //\r
+              // Send queued packets if exist.\r
+              //\r
+              NeighborCache->State = EfiNeighborStale;\r
+              NeighborCache->CallBack ((VOID *)NeighborCache);\r
+            } else {\r
+              NeighborCache->State = EfiNeighborStale;\r
+            }\r
+          }\r
         }\r
-        NeighborCache->IsRouter = TRUE;\r
-        NeighborCache->State    = EfiNeighborStale;\r
-        NeighborCache->Ticks    = (UINT32) IP6_INFINIT_LIFETIME;\r
-      } else {\r
-        Result = CompareMem (&LinkLayerAddress, &NeighborCache->LinkAddress, 6);\r
+\r
+        Offset += (UINT32)LinkLayerOption.Length * 8;\r
+        break;\r
+      case Ip6OptionPrefixInfo:\r
+        NetbufCopy (Packet, Offset, sizeof (IP6_PREFIX_INFO_OPTION), (UINT8 *)&PrefixOption);\r
 \r
         //\r
-        // If the link-local address is the same as that already in the cache,\r
-        // the cache entry's state remains unchanged. Otherwise update the\r
-        // reachability state to STALE.\r
+        // Option size validity ensured by Ip6IsNDOptionValid().\r
         //\r
-        if ((NeighborCache->State == EfiNeighborInComplete) || (Result != 0)) {\r
-          CopyMem (&NeighborCache->LinkAddress, &LinkLayerAddress, 6);\r
+        ASSERT (PrefixOption.Length == 4);\r
+        ASSERT (Offset + (UINT32)PrefixOption.Length * 8 <= (UINT32)Head->PayloadLength);\r
 \r
-          NeighborCache->Ticks = (UINT32) IP6_INFINIT_LIFETIME;\r
+        PrefixOption.ValidLifetime     = NTOHL (PrefixOption.ValidLifetime);\r
+        PrefixOption.PreferredLifetime = NTOHL (PrefixOption.PreferredLifetime);\r
 \r
-          if (NeighborCache->State == EfiNeighborInComplete) {\r
-            //\r
-            // Send queued packets if exist.\r
-            //\r
-            NeighborCache->State = EfiNeighborStale;\r
-            NeighborCache->CallBack ((VOID *) NeighborCache);\r
-          } else {\r
-            NeighborCache->State = EfiNeighborStale;\r
-          }\r
+        //\r
+        // Get L and A flag, recorded in the lower 2 bits of Reserved1\r
+        //\r
+        OnLink = FALSE;\r
+        if ((PrefixOption.Reserved1 & IP6_ON_LINK_FLAG) == IP6_ON_LINK_FLAG) {\r
+          OnLink = TRUE;\r
         }\r
-      }\r
-\r
-      Offset += (UINT32) LinkLayerOption.Length * 8;\r
-      break;\r
-    case Ip6OptionPrefixInfo:\r
-      NetbufCopy (Packet, Offset, sizeof (IP6_PREFIX_INFO_OPTION), (UINT8 *) &PrefixOption);\r
 \r
-      //\r
-      // Option size validity ensured by Ip6IsNDOptionValid().\r
-      //\r
-      ASSERT (PrefixOption.Length == 4);\r
-      ASSERT (Offset + (UINT32) PrefixOption.Length * 8 <= (UINT32) Head->PayloadLength);\r
-\r
-      PrefixOption.ValidLifetime     = NTOHL (PrefixOption.ValidLifetime);\r
-      PrefixOption.PreferredLifetime = NTOHL (PrefixOption.PreferredLifetime);\r
+        Autonomous = FALSE;\r
+        if ((PrefixOption.Reserved1 & IP6_AUTO_CONFIG_FLAG) == IP6_AUTO_CONFIG_FLAG) {\r
+          Autonomous = TRUE;\r
+        }\r
 \r
-      //\r
-      // Get L and A flag, recorded in the lower 2 bits of Reserved1\r
-      //\r
-      OnLink = FALSE;\r
-      if ((PrefixOption.Reserved1 & IP6_ON_LINK_FLAG) == IP6_ON_LINK_FLAG) {\r
-        OnLink = TRUE;\r
-      }\r
-      Autonomous = FALSE;\r
-      if ((PrefixOption.Reserved1 & IP6_AUTO_CONFIG_FLAG) == IP6_AUTO_CONFIG_FLAG) {\r
-        Autonomous = TRUE;\r
-      }\r
+        //\r
+        // If the prefix is the link-local prefix, silently ignore the prefix option.\r
+        //\r
+        if ((PrefixOption.PrefixLength == IP6_LINK_LOCAL_PREFIX_LENGTH) &&\r
+            NetIp6IsLinkLocalAddr (&PrefixOption.Prefix)\r
+            )\r
+        {\r
+          Offset += sizeof (IP6_PREFIX_INFO_OPTION);\r
+          break;\r
+        }\r
 \r
-      //\r
-      // If the prefix is the link-local prefix, silently ignore the prefix option.\r
-      //\r
-      if (PrefixOption.PrefixLength == IP6_LINK_LOCAL_PREFIX_LENGTH &&\r
-          NetIp6IsLinkLocalAddr (&PrefixOption.Prefix)\r
-          ) {\r
-        Offset += sizeof (IP6_PREFIX_INFO_OPTION);\r
-        break;\r
-      }\r
-      //\r
-      // Do following if on-link flag is set according to RFC4861.\r
-      //\r
-      if (OnLink) {\r
-        PrefixList = Ip6FindPrefixListEntry (\r
-                       IpSb,\r
-                       TRUE,\r
-                       PrefixOption.PrefixLength,\r
-                       &PrefixOption.Prefix\r
-                       );\r
         //\r
-        // Create a new entry for the prefix, if the ValidLifetime is zero,\r
-        // silently ignore the prefix option.\r
+        // Do following if on-link flag is set according to RFC4861.\r
         //\r
-        if (PrefixList == NULL && PrefixOption.ValidLifetime != 0) {\r
-          PrefixList = Ip6CreatePrefixListEntry (\r
+        if (OnLink) {\r
+          PrefixList = Ip6FindPrefixListEntry (\r
                          IpSb,\r
                          TRUE,\r
-                         PrefixOption.ValidLifetime,\r
-                         PrefixOption.PreferredLifetime,\r
                          PrefixOption.PrefixLength,\r
                          &PrefixOption.Prefix\r
                          );\r
-          if (PrefixList == NULL) {\r
-            Status = EFI_OUT_OF_RESOURCES;\r
-            goto Exit;\r
-          }\r
-        } else if (PrefixList != NULL) {\r
-          if (PrefixOption.ValidLifetime != 0) {\r
-            PrefixList->ValidLifetime = PrefixOption.ValidLifetime;\r
-          } else {\r
-            //\r
-            // If the prefix exists and incoming ValidLifetime is zero, immediately\r
-            // remove the prefix.\r
-            Ip6DestroyPrefixListEntry (IpSb, PrefixList, OnLink, TRUE);\r
-          }\r
-        }\r
-      }\r
-\r
-      //\r
-      // Do following if Autonomous flag is set according to RFC4862.\r
-      //\r
-      if (Autonomous && PrefixOption.PreferredLifetime <= PrefixOption.ValidLifetime) {\r
-        PrefixList = Ip6FindPrefixListEntry (\r
-                       IpSb,\r
-                       FALSE,\r
-                       PrefixOption.PrefixLength,\r
-                       &PrefixOption.Prefix\r
-                       );\r
-        //\r
-        // Create a new entry for the prefix, and form an address by prefix + interface id\r
-        // If the sum of the prefix length and interface identifier length\r
-        // does not equal 128 bits, the Prefix Information option MUST be ignored.\r
-        //\r
-        if (PrefixList == NULL &&\r
-            PrefixOption.ValidLifetime != 0 &&\r
-            PrefixOption.PrefixLength + IpSb->InterfaceIdLen * 8 == 128\r
-            ) {\r
           //\r
-          // Form the address in network order.\r
+          // Create a new entry for the prefix, if the ValidLifetime is zero,\r
+          // silently ignore the prefix option.\r
           //\r
-          CopyMem (&StatelessAddress, &PrefixOption.Prefix, sizeof (UINT64));\r
-          CopyMem (&StatelessAddress.Addr[8], IpSb->InterfaceId, sizeof (UINT64));\r
-\r
-          //\r
-          // If the address is not yet in the assigned address list, adds it into.\r
-          //\r
-          if (!Ip6IsOneOfSetAddress (IpSb, &StatelessAddress, NULL, NULL)) {\r
-            //\r
-            // And also not in the DAD process, check its uniqueness firstly.\r
-            //\r
-            if (Ip6FindDADEntry (IpSb, &StatelessAddress, NULL) == NULL) {\r
-              Status = Ip6SetAddress (\r
-                         IpSb->DefaultInterface,\r
-                         &StatelessAddress,\r
-                         FALSE,\r
-                         PrefixOption.PrefixLength,\r
-                         PrefixOption.ValidLifetime,\r
-                         PrefixOption.PreferredLifetime,\r
-                         NULL,\r
-                         NULL\r
-                         );\r
-              if (EFI_ERROR (Status)) {\r
-                goto Exit;\r
-              }\r
+          if ((PrefixList == NULL) && (PrefixOption.ValidLifetime != 0)) {\r
+            PrefixList = Ip6CreatePrefixListEntry (\r
+                           IpSb,\r
+                           TRUE,\r
+                           PrefixOption.ValidLifetime,\r
+                           PrefixOption.PreferredLifetime,\r
+                           PrefixOption.PrefixLength,\r
+                           &PrefixOption.Prefix\r
+                           );\r
+            if (PrefixList == NULL) {\r
+              Status = EFI_OUT_OF_RESOURCES;\r
+              goto Exit;\r
+            }\r
+          } else if (PrefixList != NULL) {\r
+            if (PrefixOption.ValidLifetime != 0) {\r
+              PrefixList->ValidLifetime = PrefixOption.ValidLifetime;\r
+            } else {\r
+              //\r
+              // If the prefix exists and incoming ValidLifetime is zero, immediately\r
+              // remove the prefix.\r
+              Ip6DestroyPrefixListEntry (IpSb, PrefixList, OnLink, TRUE);\r
             }\r
           }\r
+        }\r
 \r
-          //\r
-          // Adds the prefix option to stateless prefix option list.\r
-          //\r
-          PrefixList = Ip6CreatePrefixListEntry (\r
+        //\r
+        // Do following if Autonomous flag is set according to RFC4862.\r
+        //\r
+        if (Autonomous && (PrefixOption.PreferredLifetime <= PrefixOption.ValidLifetime)) {\r
+          PrefixList = Ip6FindPrefixListEntry (\r
                          IpSb,\r
                          FALSE,\r
-                         PrefixOption.ValidLifetime,\r
-                         PrefixOption.PreferredLifetime,\r
                          PrefixOption.PrefixLength,\r
                          &PrefixOption.Prefix\r
                          );\r
-          if (PrefixList == NULL) {\r
-            Status = EFI_OUT_OF_RESOURCES;\r
-            goto Exit;\r
-          }\r
-        } else if (PrefixList != NULL) {\r
-\r
           //\r
-          // Reset the preferred lifetime of the address if the advertised prefix exists.\r
-          // Perform specific action to valid lifetime together.\r
+          // Create a new entry for the prefix, and form an address by prefix + interface id\r
+          // If the sum of the prefix length and interface identifier length\r
+          // does not equal 128 bits, the Prefix Information option MUST be ignored.\r
           //\r
-          PrefixList->PreferredLifetime = PrefixOption.PreferredLifetime;\r
-          if ((PrefixOption.ValidLifetime > 7200) ||\r
-              (PrefixOption.ValidLifetime > PrefixList->ValidLifetime)) {\r
+          if ((PrefixList == NULL) &&\r
+              (PrefixOption.ValidLifetime != 0) &&\r
+              (PrefixOption.PrefixLength + IpSb->InterfaceIdLen * 8 == 128)\r
+              )\r
+          {\r
             //\r
-            // If the received Valid Lifetime is greater than 2 hours or\r
-            // greater than RemainingLifetime, set the valid lifetime of the\r
-            // corresponding address to the advertised Valid Lifetime.\r
+            // Form the address in network order.\r
             //\r
-            PrefixList->ValidLifetime = PrefixOption.ValidLifetime;\r
+            CopyMem (&StatelessAddress, &PrefixOption.Prefix, sizeof (UINT64));\r
+            CopyMem (&StatelessAddress.Addr[8], IpSb->InterfaceId, sizeof (UINT64));\r
 \r
-          } else if (PrefixList->ValidLifetime <= 7200) {\r
             //\r
-            // If RemainingLifetime is less than or equals to 2 hours, ignore the\r
-            // Prefix Information option with regards to the valid lifetime.\r
-            // TODO: If this option has been authenticated, set the valid lifetime.\r
+            // If the address is not yet in the assigned address list, adds it into.\r
             //\r
-          } else {\r
+            if (!Ip6IsOneOfSetAddress (IpSb, &StatelessAddress, NULL, NULL)) {\r
+              //\r
+              // And also not in the DAD process, check its uniqueness firstly.\r
+              //\r
+              if (Ip6FindDADEntry (IpSb, &StatelessAddress, NULL) == NULL) {\r
+                Status = Ip6SetAddress (\r
+                           IpSb->DefaultInterface,\r
+                           &StatelessAddress,\r
+                           FALSE,\r
+                           PrefixOption.PrefixLength,\r
+                           PrefixOption.ValidLifetime,\r
+                           PrefixOption.PreferredLifetime,\r
+                           NULL,\r
+                           NULL\r
+                           );\r
+                if (EFI_ERROR (Status)) {\r
+                  goto Exit;\r
+                }\r
+              }\r
+            }\r
+\r
             //\r
-            // Otherwise, reset the valid lifetime of the corresponding\r
-            // address to 2 hours.\r
+            // Adds the prefix option to stateless prefix option list.\r
+            //\r
+            PrefixList = Ip6CreatePrefixListEntry (\r
+                           IpSb,\r
+                           FALSE,\r
+                           PrefixOption.ValidLifetime,\r
+                           PrefixOption.PreferredLifetime,\r
+                           PrefixOption.PrefixLength,\r
+                           &PrefixOption.Prefix\r
+                           );\r
+            if (PrefixList == NULL) {\r
+              Status = EFI_OUT_OF_RESOURCES;\r
+              goto Exit;\r
+            }\r
+          } else if (PrefixList != NULL) {\r
             //\r
-            PrefixList->ValidLifetime = 7200;\r
+            // Reset the preferred lifetime of the address if the advertised prefix exists.\r
+            // Perform specific action to valid lifetime together.\r
+            //\r
+            PrefixList->PreferredLifetime = PrefixOption.PreferredLifetime;\r
+            if ((PrefixOption.ValidLifetime > 7200) ||\r
+                (PrefixOption.ValidLifetime > PrefixList->ValidLifetime))\r
+            {\r
+              //\r
+              // If the received Valid Lifetime is greater than 2 hours or\r
+              // greater than RemainingLifetime, set the valid lifetime of the\r
+              // corresponding address to the advertised Valid Lifetime.\r
+              //\r
+              PrefixList->ValidLifetime = PrefixOption.ValidLifetime;\r
+            } else if (PrefixList->ValidLifetime <= 7200) {\r
+              //\r
+              // If RemainingLifetime is less than or equals to 2 hours, ignore the\r
+              // Prefix Information option with regards to the valid lifetime.\r
+              // TODO: If this option has been authenticated, set the valid lifetime.\r
+              //\r
+            } else {\r
+              //\r
+              // Otherwise, reset the valid lifetime of the corresponding\r
+              // address to 2 hours.\r
+              //\r
+              PrefixList->ValidLifetime = 7200;\r
+            }\r
           }\r
         }\r
-      }\r
 \r
-      Offset += sizeof (IP6_PREFIX_INFO_OPTION);\r
-      break;\r
-    case Ip6OptionMtu:\r
-      NetbufCopy (Packet, Offset, sizeof (IP6_MTU_OPTION), (UINT8 *) &MTUOption);\r
+        Offset += sizeof (IP6_PREFIX_INFO_OPTION);\r
+        break;\r
+      case Ip6OptionMtu:\r
+        NetbufCopy (Packet, Offset, sizeof (IP6_MTU_OPTION), (UINT8 *)&MTUOption);\r
 \r
-      //\r
-      // Option size validity ensured by Ip6IsNDOptionValid().\r
-      //\r
-      ASSERT (MTUOption.Length == 1);\r
-      ASSERT (Offset + (UINT32) MTUOption.Length * 8 <= (UINT32) Head->PayloadLength);\r
+        //\r
+        // Option size validity ensured by Ip6IsNDOptionValid().\r
+        //\r
+        ASSERT (MTUOption.Length == 1);\r
+        ASSERT (Offset + (UINT32)MTUOption.Length * 8 <= (UINT32)Head->PayloadLength);\r
 \r
-      //\r
-      // Use IPv6 minimum link MTU 1280 bytes as the maximum packet size in order\r
-      // to omit implementation of Path MTU Discovery. Thus ignore the MTU option\r
-      // in Router Advertisement.\r
-      //\r
+        //\r
+        // Use IPv6 minimum link MTU 1280 bytes as the maximum packet size in order\r
+        // to omit implementation of Path MTU Discovery. Thus ignore the MTU option\r
+        // in Router Advertisement.\r
+        //\r
 \r
-      Offset += sizeof (IP6_MTU_OPTION);\r
-      break;\r
-    default:\r
-      //\r
-      // Silently ignore unrecognized options\r
-      //\r
-      NetbufCopy (Packet, Offset + sizeof (UINT8), sizeof (UINT8), &Length);\r
+        Offset += sizeof (IP6_MTU_OPTION);\r
+        break;\r
+      default:\r
+        //\r
+        // Silently ignore unrecognized options\r
+        //\r
+        NetbufCopy (Packet, Offset + sizeof (UINT8), sizeof (UINT8), &Length);\r
 \r
-      ASSERT (Length != 0);\r
+        ASSERT (Length != 0);\r
 \r
-      Offset += (UINT32) Length * 8;\r
-      break;\r
+        Offset += (UINT32)Length * 8;\r
+        break;\r
     }\r
   }\r
 \r
@@ -2382,31 +2393,31 @@ Exit:
 **/\r
 EFI_STATUS\r
 Ip6ProcessRedirect (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   )\r
 {\r
-  IP6_ICMP_INFORMATION_HEAD *Icmp;\r
-  EFI_IPv6_ADDRESS          *Target;\r
-  EFI_IPv6_ADDRESS          *IcmpDest;\r
-  UINT8                     *Option;\r
-  UINT16                    OptionLen;\r
-  IP6_ROUTE_ENTRY           *RouteEntry;\r
-  IP6_ROUTE_CACHE_ENTRY     *RouteCache;\r
-  IP6_NEIGHBOR_ENTRY        *NeighborCache;\r
-  INT32                     Length;\r
-  UINT8                     OptLen;\r
-  IP6_ETHER_ADDR_OPTION     *LinkLayerOption;\r
-  EFI_MAC_ADDRESS           Mac;\r
-  UINT32                    Index;\r
-  BOOLEAN                   IsRouter;\r
-  EFI_STATUS                Status;\r
-  INTN                      Result;\r
+  IP6_ICMP_INFORMATION_HEAD  *Icmp;\r
+  EFI_IPv6_ADDRESS           *Target;\r
+  EFI_IPv6_ADDRESS           *IcmpDest;\r
+  UINT8                      *Option;\r
+  UINT16                     OptionLen;\r
+  IP6_ROUTE_ENTRY            *RouteEntry;\r
+  IP6_ROUTE_CACHE_ENTRY      *RouteCache;\r
+  IP6_NEIGHBOR_ENTRY         *NeighborCache;\r
+  INT32                      Length;\r
+  UINT8                      OptLen;\r
+  IP6_ETHER_ADDR_OPTION      *LinkLayerOption;\r
+  EFI_MAC_ADDRESS            Mac;\r
+  UINT32                     Index;\r
+  BOOLEAN                    IsRouter;\r
+  EFI_STATUS                 Status;\r
+  INTN                       Result;\r
 \r
   Status = EFI_INVALID_PARAMETER;\r
 \r
-  Icmp = (IP6_ICMP_INFORMATION_HEAD *) NetbufGetByte (Packet, 0, NULL);\r
+  Icmp = (IP6_ICMP_INFORMATION_HEAD *)NetbufGetByte (Packet, 0, NULL);\r
   if (Icmp == NULL) {\r
     goto Exit;\r
   }\r
@@ -2421,8 +2432,9 @@ Ip6ProcessRedirect (
   // ICMP Code is 0.\r
   // ICMP length (derived from the IP length) is 40 or more octets.\r
   //\r
-  if (Head->HopLimit != IP6_HOP_LIMIT || Icmp->Head.Code != 0 ||\r
-      Head->PayloadLength < IP6_REDITECT_LENGTH) {\r
+  if ((Head->HopLimit != IP6_HOP_LIMIT) || (Icmp->Head.Code != 0) ||\r
+      (Head->PayloadLength < IP6_REDITECT_LENGTH))\r
+  {\r
     goto Exit;\r
   }\r
 \r
@@ -2443,9 +2455,9 @@ Ip6ProcessRedirect (
   //\r
   // All included options have a length that is greater than zero.\r
   //\r
-  OptionLen = (UINT16) (Head->PayloadLength - IP6_REDITECT_LENGTH);\r
+  OptionLen = (UINT16)(Head->PayloadLength - IP6_REDITECT_LENGTH);\r
   if (OptionLen != 0) {\r
-    Option    = NetbufGetByte (Packet, IP6_REDITECT_LENGTH, NULL);\r
+    Option = NetbufGetByte (Packet, IP6_REDITECT_LENGTH, NULL);\r
     ASSERT (Option != NULL);\r
 \r
     if (!Ip6IsNDOptionValid (Option, OptionLen)) {\r
@@ -2453,7 +2465,7 @@ Ip6ProcessRedirect (
     }\r
   }\r
 \r
-  Target   = (EFI_IPv6_ADDRESS *) (Icmp + 1);\r
+  Target   = (EFI_IPv6_ADDRESS *)(Icmp + 1);\r
   IcmpDest = Target + 1;\r
 \r
   //\r
@@ -2479,32 +2491,34 @@ Ip6ProcessRedirect (
   // address option.\r
   //\r
   Length          = Packet->TotalSize - 40;\r
-  Option          = (UINT8 *) (IcmpDest + 1);\r
+  Option          = (UINT8 *)(IcmpDest + 1);\r
   LinkLayerOption = NULL;\r
   while (Length > 0) {\r
     switch (*Option) {\r
-    case Ip6OptionEtherTarget:\r
+      case Ip6OptionEtherTarget:\r
 \r
-      LinkLayerOption = (IP6_ETHER_ADDR_OPTION *) Option;\r
-      OptLen          = LinkLayerOption->Length;\r
-      if (OptLen != 1) {\r
-        //\r
-        // For ethernet, the length must be 1.\r
-        //\r
-        goto Exit;\r
-      }\r
-      break;\r
+        LinkLayerOption = (IP6_ETHER_ADDR_OPTION *)Option;\r
+        OptLen          = LinkLayerOption->Length;\r
+        if (OptLen != 1) {\r
+          //\r
+          // For ethernet, the length must be 1.\r
+          //\r
+          goto Exit;\r
+        }\r
 \r
-    default:\r
+        break;\r
 \r
-      OptLen = *(Option + 1);\r
-      if (OptLen == 0) {\r
-        //\r
-        // A length of 0 is invalid.\r
-        //\r
-        goto Exit;\r
-      }\r
-      break;\r
+      default:\r
+\r
+        OptLen = *(Option + 1);\r
+        if (OptLen == 0) {\r
+          //\r
+          // A length of 0 is invalid.\r
+          //\r
+          goto Exit;\r
+        }\r
+\r
+        break;\r
     }\r
 \r
     Length -= 8 * OptLen;\r
@@ -2535,10 +2549,9 @@ Ip6ProcessRedirect (
     IP6_COPY_ADDRESS (&RouteCache->NextHop, Target);\r
 \r
     if (!IsRouter) {\r
-      RouteEntry = (IP6_ROUTE_ENTRY *) RouteCache->Tag;\r
+      RouteEntry       = (IP6_ROUTE_ENTRY *)RouteCache->Tag;\r
       RouteEntry->Flag = RouteEntry->Flag | IP6_DIRECT_ROUTE;\r
     }\r
-\r
   } else {\r
     //\r
     // Get the Route Entry.\r
@@ -2563,7 +2576,7 @@ Ip6ProcessRedirect (
                    IcmpDest,\r
                    &Head->DestinationAddress,\r
                    Target,\r
-                   (UINTN) RouteEntry\r
+                   (UINTN)RouteEntry\r
                    );\r
     if (RouteCache == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
@@ -2600,7 +2613,7 @@ Ip6ProcessRedirect (
       }\r
 \r
       NeighborCache->State = EfiNeighborStale;\r
-      NeighborCache->Ticks = (UINT32) IP6_INFINIT_LIFETIME;\r
+      NeighborCache->Ticks = (UINT32)IP6_INFINIT_LIFETIME;\r
     } else {\r
       Result = CompareMem (LinkLayerOption->EtherAddr, &NeighborCache->LinkAddress, 6);\r
 \r
@@ -2612,14 +2625,14 @@ Ip6ProcessRedirect (
       if ((NeighborCache->State == EfiNeighborInComplete) || (Result != 0)) {\r
         CopyMem (&NeighborCache->LinkAddress, LinkLayerOption->EtherAddr, 6);\r
 \r
-        NeighborCache->Ticks = (UINT32) IP6_INFINIT_LIFETIME;\r
+        NeighborCache->Ticks = (UINT32)IP6_INFINIT_LIFETIME;\r
 \r
         if (NeighborCache->State == EfiNeighborInComplete) {\r
           //\r
           // Send queued packets if exist.\r
           //\r
           NeighborCache->State = EfiNeighborStale;\r
-          NeighborCache->CallBack ((VOID *) NeighborCache);\r
+          NeighborCache->CallBack ((VOID *)NeighborCache);\r
         } else {\r
           NeighborCache->State = EfiNeighborStale;\r
         }\r
@@ -2627,7 +2640,7 @@ Ip6ProcessRedirect (
     }\r
   }\r
 \r
-  if (NeighborCache != NULL && IsRouter) {\r
+  if ((NeighborCache != NULL) && IsRouter) {\r
     //\r
     // The Target is a router, set IsRouter to TRUE.\r
     //\r
@@ -2667,14 +2680,14 @@ Exit:
 **/\r
 EFI_STATUS\r
 Ip6AddNeighbor (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *TargetIp6Address,\r
-  IN EFI_MAC_ADDRESS        *TargetLinkAddress OPTIONAL,\r
-  IN UINT32                 Timeout,\r
-  IN BOOLEAN                Override\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *TargetIp6Address,\r
+  IN EFI_MAC_ADDRESS   *TargetLinkAddress OPTIONAL,\r
+  IN UINT32            Timeout,\r
+  IN BOOLEAN           Override\r
   )\r
 {\r
-  IP6_NEIGHBOR_ENTRY        *Neighbor;\r
+  IP6_NEIGHBOR_ENTRY  *Neighbor;\r
 \r
   Neighbor = Ip6FindNeighborEntry (IpSb, TargetIp6Address);\r
   if (Neighbor != NULL) {\r
@@ -2702,7 +2715,7 @@ Ip6AddNeighbor (
     Neighbor->Ticks   = IP6_GET_TICKS (Timeout / TICKS_PER_MS);\r
     Neighbor->Dynamic = TRUE;\r
   } else {\r
-    Neighbor->Ticks   = (UINT32) IP6_INFINIT_LIFETIME;\r
+    Neighbor->Ticks = (UINT32)IP6_INFINIT_LIFETIME;\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -2729,14 +2742,14 @@ Ip6AddNeighbor (
 **/\r
 EFI_STATUS\r
 Ip6DelNeighbor (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *TargetIp6Address,\r
-  IN EFI_MAC_ADDRESS        *TargetLinkAddress OPTIONAL,\r
-  IN UINT32                 Timeout,\r
-  IN BOOLEAN                Override\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *TargetIp6Address,\r
+  IN EFI_MAC_ADDRESS   *TargetLinkAddress OPTIONAL,\r
+  IN UINT32            Timeout,\r
+  IN BOOLEAN           Override\r
   )\r
 {\r
-  IP6_NEIGHBOR_ENTRY        *Neighbor;\r
+  IP6_NEIGHBOR_ENTRY  *Neighbor;\r
 \r
   Neighbor = Ip6FindNeighborEntry (IpSb, TargetIp6Address);\r
   if (Neighbor == NULL) {\r
@@ -2761,24 +2774,24 @@ Ip6DelNeighbor (
 VOID\r
 EFIAPI\r
 Ip6NdFasterTimerTicking (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  LIST_ENTRY                *Entry2;\r
-  IP6_INTERFACE             *IpIf;\r
-  IP6_DELAY_JOIN_LIST       *DelayNode;\r
-  EFI_IPv6_ADDRESS          Source;\r
-  IP6_DAD_ENTRY             *DupAddrDetect;\r
-  EFI_STATUS                Status;\r
-  IP6_NEIGHBOR_ENTRY        *NeighborCache;\r
-  EFI_IPv6_ADDRESS          Destination;\r
-  IP6_SERVICE               *IpSb;\r
-  BOOLEAN                   Flag;\r
-\r
-  IpSb = (IP6_SERVICE *) Context;\r
+  LIST_ENTRY           *Entry;\r
+  LIST_ENTRY           *Next;\r
+  LIST_ENTRY           *Entry2;\r
+  IP6_INTERFACE        *IpIf;\r
+  IP6_DELAY_JOIN_LIST  *DelayNode;\r
+  EFI_IPv6_ADDRESS     Source;\r
+  IP6_DAD_ENTRY        *DupAddrDetect;\r
+  EFI_STATUS           Status;\r
+  IP6_NEIGHBOR_ENTRY   *NeighborCache;\r
+  EFI_IPv6_ADDRESS     Destination;\r
+  IP6_SERVICE          *IpSb;\r
+  BOOLEAN              Flag;\r
+\r
+  IpSb = (IP6_SERVICE *)Context;\r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
 \r
   ZeroMem (&Source, sizeof (EFI_IPv6_ADDRESS));\r
@@ -2790,13 +2803,14 @@ Ip6NdFasterTimerTicking (
   //\r
   if ((IpSb->Ip6ConfigInstance.Policy == Ip6ConfigPolicyAutomatic) &&\r
       !IpSb->RouterAdvertiseReceived &&\r
-      IpSb->SolicitTimer > 0\r
-      ) {\r
+      (IpSb->SolicitTimer > 0)\r
+      )\r
+  {\r
     if ((IpSb->Ticks == 0) || (--IpSb->Ticks == 0)) {\r
       Status = Ip6SendRouterSolicit (IpSb, NULL, NULL, NULL, NULL);\r
       if (!EFI_ERROR (Status)) {\r
         IpSb->SolicitTimer--;\r
-        IpSb->Ticks = (UINT32) IP6_GET_TICKS (IP6_RTR_SOLICITATION_INTERVAL);\r
+        IpSb->Ticks = (UINT32)IP6_GET_TICKS (IP6_RTR_SOLICITATION_INTERVAL);\r
       }\r
     }\r
   }\r
@@ -2864,7 +2878,8 @@ Ip6NdFasterTimerTicking (
           //\r
           Flag = FALSE;\r
           if ((DupAddrDetect->Receive == 0) ||\r
-              (DupAddrDetect->Transmit <= DupAddrDetect->Receive)) {\r
+              (DupAddrDetect->Transmit <= DupAddrDetect->Receive))\r
+          {\r
             Flag = TRUE;\r
           }\r
 \r
@@ -2881,149 +2896,111 @@ Ip6NdFasterTimerTicking (
     NeighborCache = NET_LIST_USER_STRUCT (Entry, IP6_NEIGHBOR_ENTRY, Link);\r
 \r
     switch (NeighborCache->State) {\r
-    case EfiNeighborInComplete:\r
-      if (NeighborCache->Ticks > 0) {\r
-        --NeighborCache->Ticks;\r
-      }\r
-\r
-      //\r
-      // Retransmit Neighbor Solicitation messages approximately every\r
-      // RetransTimer milliseconds while awaiting a response.\r
-      //\r
-      if (NeighborCache->Ticks == 0) {\r
-        if (NeighborCache->Transmit > 1) {\r
-          //\r
-          // Send out multicast neighbor solicitation for address resolution.\r
-          // After last neighbor solicitation message has been sent out, wait\r
-          // for RetransTimer and then remove entry if no response is received.\r
-          //\r
-          Ip6CreateSNMulticastAddr (&NeighborCache->Neighbor, &Destination);\r
-          Status = Ip6SelectSourceAddress (IpSb, &NeighborCache->Neighbor, &Source);\r
-          if (EFI_ERROR (Status)) {\r
-            return;\r
-          }\r
-\r
-          Status = Ip6SendNeighborSolicit (\r
-                     IpSb,\r
-                     &Source,\r
-                     &Destination,\r
-                     &NeighborCache->Neighbor,\r
-                     &IpSb->SnpMode.CurrentAddress\r
-                     );\r
-          if (EFI_ERROR (Status)) {\r
-            return;\r
-          }\r
+      case EfiNeighborInComplete:\r
+        if (NeighborCache->Ticks > 0) {\r
+          --NeighborCache->Ticks;\r
         }\r
 \r
         //\r
-        // Update the retransmit times.\r
+        // Retransmit Neighbor Solicitation messages approximately every\r
+        // RetransTimer milliseconds while awaiting a response.\r
         //\r
-        if (NeighborCache->Transmit > 0) {\r
-          --NeighborCache->Transmit;\r
-          NeighborCache->Ticks = IP6_GET_TICKS (IpSb->RetransTimer);\r
-        }\r
-      }\r
-\r
-      if (NeighborCache->Transmit == 0) {\r
-        //\r
-        // Timeout, send ICMP destination unreachable packet and then remove entry\r
-        //\r
-        Status = Ip6FreeNeighborEntry (\r
-                   IpSb,\r
-                   NeighborCache,\r
-                   TRUE,\r
-                   TRUE,\r
-                   EFI_ICMP_ERROR,\r
-                   NULL,\r
-                   NULL\r
-                   );\r
-        if (EFI_ERROR (Status)) {\r
-          return;\r
-        }\r
-      }\r
+        if (NeighborCache->Ticks == 0) {\r
+          if (NeighborCache->Transmit > 1) {\r
+            //\r
+            // Send out multicast neighbor solicitation for address resolution.\r
+            // After last neighbor solicitation message has been sent out, wait\r
+            // for RetransTimer and then remove entry if no response is received.\r
+            //\r
+            Ip6CreateSNMulticastAddr (&NeighborCache->Neighbor, &Destination);\r
+            Status = Ip6SelectSourceAddress (IpSb, &NeighborCache->Neighbor, &Source);\r
+            if (EFI_ERROR (Status)) {\r
+              return;\r
+            }\r
 \r
-      break;\r
+            Status = Ip6SendNeighborSolicit (\r
+                       IpSb,\r
+                       &Source,\r
+                       &Destination,\r
+                       &NeighborCache->Neighbor,\r
+                       &IpSb->SnpMode.CurrentAddress\r
+                       );\r
+            if (EFI_ERROR (Status)) {\r
+              return;\r
+            }\r
+          }\r
 \r
-    case EfiNeighborReachable:\r
-      //\r
-      // This entry is inserted by EfiIp6Neighbors() as static entry\r
-      // and will not timeout.\r
-      //\r
-      if (!NeighborCache->Dynamic && (NeighborCache->Ticks == IP6_INFINIT_LIFETIME)) {\r
-        break;\r
-      }\r
+          //\r
+          // Update the retransmit times.\r
+          //\r
+          if (NeighborCache->Transmit > 0) {\r
+            --NeighborCache->Transmit;\r
+            NeighborCache->Ticks = IP6_GET_TICKS (IpSb->RetransTimer);\r
+          }\r
+        }\r
 \r
-      if ((NeighborCache->Ticks == 0) || (--NeighborCache->Ticks == 0)) {\r
-        if (NeighborCache->Dynamic) {\r
+        if (NeighborCache->Transmit == 0) {\r
           //\r
-          // This entry is inserted by EfiIp6Neighbors() as dynamic entry\r
-          // and will be deleted after timeout.\r
+          // Timeout, send ICMP destination unreachable packet and then remove entry\r
           //\r
           Status = Ip6FreeNeighborEntry (\r
                      IpSb,\r
                      NeighborCache,\r
-                     FALSE,\r
                      TRUE,\r
-                     EFI_TIMEOUT,\r
+                     TRUE,\r
+                     EFI_ICMP_ERROR,\r
                      NULL,\r
                      NULL\r
                      );\r
           if (EFI_ERROR (Status)) {\r
             return;\r
           }\r
-        } else {\r
-          NeighborCache->State = EfiNeighborStale;\r
-          NeighborCache->Ticks = (UINT32) IP6_INFINIT_LIFETIME;\r
         }\r
-      }\r
 \r
-      break;\r
-\r
-    case EfiNeighborDelay:\r
-      if ((NeighborCache->Ticks == 0) || (--NeighborCache->Ticks == 0)) {\r
+        break;\r
 \r
-        NeighborCache->State    = EfiNeighborProbe;\r
-        NeighborCache->Ticks    = IP6_GET_TICKS (IpSb->RetransTimer);\r
-        NeighborCache->Transmit = IP6_MAX_UNICAST_SOLICIT + 1;\r
+      case EfiNeighborReachable:\r
         //\r
-        // Send out unicast neighbor solicitation for Neighbor Unreachability Detection\r
+        // This entry is inserted by EfiIp6Neighbors() as static entry\r
+        // and will not timeout.\r
         //\r
-        Status = Ip6SelectSourceAddress (IpSb, &NeighborCache->Neighbor, &Source);\r
-        if (EFI_ERROR (Status)) {\r
-          return;\r
+        if (!NeighborCache->Dynamic && (NeighborCache->Ticks == IP6_INFINIT_LIFETIME)) {\r
+          break;\r
         }\r
 \r
-        Status = Ip6SendNeighborSolicit (\r
-                   IpSb,\r
-                   &Source,\r
-                   &NeighborCache->Neighbor,\r
-                   &NeighborCache->Neighbor,\r
-                   &IpSb->SnpMode.CurrentAddress\r
-                   );\r
-        if (EFI_ERROR (Status)) {\r
-          return;\r
+        if ((NeighborCache->Ticks == 0) || (--NeighborCache->Ticks == 0)) {\r
+          if (NeighborCache->Dynamic) {\r
+            //\r
+            // This entry is inserted by EfiIp6Neighbors() as dynamic entry\r
+            // and will be deleted after timeout.\r
+            //\r
+            Status = Ip6FreeNeighborEntry (\r
+                       IpSb,\r
+                       NeighborCache,\r
+                       FALSE,\r
+                       TRUE,\r
+                       EFI_TIMEOUT,\r
+                       NULL,\r
+                       NULL\r
+                       );\r
+            if (EFI_ERROR (Status)) {\r
+              return;\r
+            }\r
+          } else {\r
+            NeighborCache->State = EfiNeighborStale;\r
+            NeighborCache->Ticks = (UINT32)IP6_INFINIT_LIFETIME;\r
+          }\r
         }\r
 \r
-        NeighborCache->Transmit--;\r
-      }\r
-\r
-      break;\r
-\r
-    case EfiNeighborProbe:\r
-      if (NeighborCache->Ticks > 0) {\r
-        --NeighborCache->Ticks;\r
-      }\r
+        break;\r
 \r
-      //\r
-      // Retransmit Neighbor Solicitation messages approximately every\r
-      // RetransTimer milliseconds while awaiting a response.\r
-      //\r
-      if (NeighborCache->Ticks == 0) {\r
-        if (NeighborCache->Transmit > 1) {\r
+      case EfiNeighborDelay:\r
+        if ((NeighborCache->Ticks == 0) || (--NeighborCache->Ticks == 0)) {\r
+          NeighborCache->State    = EfiNeighborProbe;\r
+          NeighborCache->Ticks    = IP6_GET_TICKS (IpSb->RetransTimer);\r
+          NeighborCache->Transmit = IP6_MAX_UNICAST_SOLICIT + 1;\r
           //\r
-          // Send out unicast neighbor solicitation for Neighbor Unreachability\r
-          // Detection. After last neighbor solicitation message has been sent out,\r
-          // wait for RetransTimer and then remove entry if no response is received.\r
+          // Send out unicast neighbor solicitation for Neighbor Unreachability Detection\r
           //\r
           Status = Ip6SelectSourceAddress (IpSb, &NeighborCache->Neighbor, &Source);\r
           if (EFI_ERROR (Status)) {\r
@@ -3040,39 +3017,76 @@ Ip6NdFasterTimerTicking (
           if (EFI_ERROR (Status)) {\r
             return;\r
           }\r
+\r
+          NeighborCache->Transmit--;\r
         }\r
 \r
-        //\r
-        // Update the retransmit times.\r
-        //\r
-        if (NeighborCache->Transmit > 0) {\r
-          --NeighborCache->Transmit;\r
-          NeighborCache->Ticks = IP6_GET_TICKS (IpSb->RetransTimer);\r
+        break;\r
+\r
+      case EfiNeighborProbe:\r
+        if (NeighborCache->Ticks > 0) {\r
+          --NeighborCache->Ticks;\r
         }\r
-      }\r
 \r
-      if (NeighborCache->Transmit == 0) {\r
         //\r
-        // Delete the neighbor entry.\r
+        // Retransmit Neighbor Solicitation messages approximately every\r
+        // RetransTimer milliseconds while awaiting a response.\r
         //\r
-        Status = Ip6FreeNeighborEntry (\r
-                   IpSb,\r
-                   NeighborCache,\r
-                   FALSE,\r
-                   TRUE,\r
-                   EFI_TIMEOUT,\r
-                   NULL,\r
-                   NULL\r
-                   );\r
-        if (EFI_ERROR (Status)) {\r
-          return;\r
+        if (NeighborCache->Ticks == 0) {\r
+          if (NeighborCache->Transmit > 1) {\r
+            //\r
+            // Send out unicast neighbor solicitation for Neighbor Unreachability\r
+            // Detection. After last neighbor solicitation message has been sent out,\r
+            // wait for RetransTimer and then remove entry if no response is received.\r
+            //\r
+            Status = Ip6SelectSourceAddress (IpSb, &NeighborCache->Neighbor, &Source);\r
+            if (EFI_ERROR (Status)) {\r
+              return;\r
+            }\r
+\r
+            Status = Ip6SendNeighborSolicit (\r
+                       IpSb,\r
+                       &Source,\r
+                       &NeighborCache->Neighbor,\r
+                       &NeighborCache->Neighbor,\r
+                       &IpSb->SnpMode.CurrentAddress\r
+                       );\r
+            if (EFI_ERROR (Status)) {\r
+              return;\r
+            }\r
+          }\r
+\r
+          //\r
+          // Update the retransmit times.\r
+          //\r
+          if (NeighborCache->Transmit > 0) {\r
+            --NeighborCache->Transmit;\r
+            NeighborCache->Ticks = IP6_GET_TICKS (IpSb->RetransTimer);\r
+          }\r
         }\r
-      }\r
 \r
-      break;\r
+        if (NeighborCache->Transmit == 0) {\r
+          //\r
+          // Delete the neighbor entry.\r
+          //\r
+          Status = Ip6FreeNeighborEntry (\r
+                     IpSb,\r
+                     NeighborCache,\r
+                     FALSE,\r
+                     TRUE,\r
+                     EFI_TIMEOUT,\r
+                     NULL,\r
+                     NULL\r
+                     );\r
+          if (EFI_ERROR (Status)) {\r
+            return;\r
+          }\r
+        }\r
 \r
-    default:\r
-      break;\r
+        break;\r
+\r
+      default:\r
+        break;\r
     }\r
   }\r
 }\r
@@ -3087,15 +3101,15 @@ Ip6NdFasterTimerTicking (
 **/\r
 VOID\r
 Ip6NdTimerTicking (\r
-  IN IP6_SERVICE            *IpSb\r
+  IN IP6_SERVICE  *IpSb\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP6_DEFAULT_ROUTER        *DefaultRouter;\r
-  IP6_PREFIX_LIST_ENTRY     *PrefixOption;\r
-  UINT8                     Index;\r
-  IP6_ROUTE_CACHE_ENTRY     *RouteCache;\r
+  LIST_ENTRY             *Entry;\r
+  LIST_ENTRY             *Next;\r
+  IP6_DEFAULT_ROUTER     *DefaultRouter;\r
+  IP6_PREFIX_LIST_ENTRY  *PrefixOption;\r
+  UINT8                  Index;\r
+  IP6_ROUTE_CACHE_ENTRY  *RouteCache;\r
 \r
   //\r
   // Decrease the lifetime of default router, if expires remove it from default router list.\r
@@ -3114,11 +3128,12 @@ Ip6NdTimerTicking (
   //\r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &IpSb->AutonomousPrefix) {\r
     PrefixOption = NET_LIST_USER_STRUCT (Entry, IP6_PREFIX_LIST_ENTRY, Link);\r
-    if (PrefixOption->ValidLifetime != (UINT32) IP6_INFINIT_LIFETIME) {\r
+    if (PrefixOption->ValidLifetime != (UINT32)IP6_INFINIT_LIFETIME) {\r
       if ((PrefixOption->ValidLifetime > 0) && (--PrefixOption->ValidLifetime > 0)) {\r
-        if ((PrefixOption->PreferredLifetime != (UINT32) IP6_INFINIT_LIFETIME) &&\r
+        if ((PrefixOption->PreferredLifetime != (UINT32)IP6_INFINIT_LIFETIME) &&\r
             (PrefixOption->PreferredLifetime > 0)\r
-            ) {\r
+            )\r
+        {\r
           --PrefixOption->PreferredLifetime;\r
         }\r
       } else {\r
@@ -3129,7 +3144,7 @@ Ip6NdTimerTicking (
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &IpSb->OnlinkPrefix) {\r
     PrefixOption = NET_LIST_USER_STRUCT (Entry, IP6_PREFIX_LIST_ENTRY, Link);\r
-    if (PrefixOption->ValidLifetime != (UINT32) IP6_INFINIT_LIFETIME) {\r
+    if (PrefixOption->ValidLifetime != (UINT32)IP6_INFINIT_LIFETIME) {\r
       if ((PrefixOption->ValidLifetime == 0) || (--PrefixOption->ValidLifetime == 0)) {\r
         Ip6DestroyPrefixListEntry (IpSb, PrefixOption, TRUE, TRUE);\r
       }\r
@@ -3156,4 +3171,3 @@ Ip6NdTimerTicking (
     }\r
   }\r
 }\r
-\r
index 5f1bd6fb922a7faeb4d687e543d37f1a9c1ea5a9..860934a167ebb0a245c16035f92a31d11d387d94 100644 (file)
 #define IP6_GET_TICKS(Ms)  (((Ms) + IP6_TIMER_INTERVAL_IN_MS - 1) / IP6_TIMER_INTERVAL_IN_MS)\r
 \r
 enum {\r
-  IP6_INF_ROUTER_LIFETIME        = 0xFFFF,\r
+  IP6_INF_ROUTER_LIFETIME = 0xFFFF,\r
 \r
   IP6_MAX_RTR_SOLICITATION_DELAY = 1000, ///< 1000 milliseconds\r
   IP6_MAX_RTR_SOLICITATIONS      = 3,\r
   IP6_RTR_SOLICITATION_INTERVAL  = 4000,\r
 \r
-  IP6_MIN_RANDOM_FACTOR_SCALED   = 1,\r
-  IP6_MAX_RANDOM_FACTOR_SCALED   = 3,\r
-  IP6_RANDOM_FACTOR_SCALE        = 2,\r
+  IP6_MIN_RANDOM_FACTOR_SCALED = 1,\r
+  IP6_MAX_RANDOM_FACTOR_SCALED = 3,\r
+  IP6_RANDOM_FACTOR_SCALE      = 2,\r
 \r
-  IP6_MAX_MULTICAST_SOLICIT      = 3,\r
-  IP6_MAX_UNICAST_SOLICIT        = 3,\r
-  IP6_MAX_ANYCAST_DELAY_TIME     = 1,\r
-  IP6_MAX_NEIGHBOR_ADV           = 3,\r
-  IP6_REACHABLE_TIME             = 30000,\r
-  IP6_RETRANS_TIMER              = 1000,\r
-  IP6_DELAY_FIRST_PROBE_TIME     = 5000,\r
+  IP6_MAX_MULTICAST_SOLICIT  = 3,\r
+  IP6_MAX_UNICAST_SOLICIT    = 3,\r
+  IP6_MAX_ANYCAST_DELAY_TIME = 1,\r
+  IP6_MAX_NEIGHBOR_ADV       = 3,\r
+  IP6_REACHABLE_TIME         = 30000,\r
+  IP6_RETRANS_TIMER          = 1000,\r
+  IP6_DELAY_FIRST_PROBE_TIME = 5000,\r
 \r
-  IP6_MIN_LINK_MTU               = 1280,\r
-  IP6_MAX_LINK_MTU               = 1500,\r
+  IP6_MIN_LINK_MTU = 1280,\r
+  IP6_MAX_LINK_MTU = 1500,\r
 \r
-  IP6_IS_ROUTER_FLAG             = 0x80,\r
-  IP6_SOLICITED_FLAG             = 0x40,\r
-  IP6_OVERRIDE_FLAG              = 0x20,\r
+  IP6_IS_ROUTER_FLAG = 0x80,\r
+  IP6_SOLICITED_FLAG = 0x40,\r
+  IP6_OVERRIDE_FLAG  = 0x20,\r
 \r
-  IP6_M_ADDR_CONFIG_FLAG         = 0x80,\r
-  IP6_O_CONFIG_FLAG              = 0x40,\r
+  IP6_M_ADDR_CONFIG_FLAG = 0x80,\r
+  IP6_O_CONFIG_FLAG      = 0x40,\r
 \r
-  IP6_ON_LINK_FLAG               = 0x80,\r
-  IP6_AUTO_CONFIG_FLAG           = 0x40,\r
+  IP6_ON_LINK_FLAG     = 0x80,\r
+  IP6_AUTO_CONFIG_FLAG = 0x40,\r
 \r
-  IP6_ND_LENGTH                  = 24,\r
-  IP6_RA_LENGTH                  = 16,\r
-  IP6_REDITECT_LENGTH            = 40,\r
-  IP6_DAD_ENTRY_SIGNATURE        = SIGNATURE_32 ('I', 'P', 'D', 'E')\r
+  IP6_ND_LENGTH           = 24,\r
+  IP6_RA_LENGTH           = 16,\r
+  IP6_REDITECT_LENGTH     = 40,\r
+  IP6_DAD_ENTRY_SIGNATURE = SIGNATURE_32 ('I', 'P', 'D', 'E')\r
 };\r
 \r
 typedef\r
 VOID\r
 (*IP6_ARP_CALLBACK) (\r
-  VOID                      *Context\r
+  VOID  *Context\r
   );\r
 \r
 typedef struct _IP6_OPTION_HEADER {\r
-  UINT8                     Type;\r
-  UINT8                     Length;\r
+  UINT8    Type;\r
+  UINT8    Length;\r
 } IP6_OPTION_HEADER;\r
 \r
 STATIC_ASSERT (sizeof (IP6_OPTION_HEADER) == 2, "IP6_OPTION_HEADER is expected to be exactly 2 bytes long.");\r
 \r
 typedef struct _IP6_ETHE_ADDR_OPTION {\r
-  UINT8                     Type;\r
-  UINT8                     Length;\r
-  UINT8                     EtherAddr[6];\r
+  UINT8    Type;\r
+  UINT8    Length;\r
+  UINT8    EtherAddr[6];\r
 } IP6_ETHER_ADDR_OPTION;\r
 \r
 STATIC_ASSERT (sizeof (IP6_ETHER_ADDR_OPTION) == 8, "IP6_ETHER_ADDR_OPTION is expected to be exactly 8 bytes long.");\r
 \r
 typedef struct _IP6_MTU_OPTION {\r
-  UINT8                     Type;\r
-  UINT8                     Length;\r
-  UINT16                    Reserved;\r
-  UINT32                    Mtu;\r
+  UINT8     Type;\r
+  UINT8     Length;\r
+  UINT16    Reserved;\r
+  UINT32    Mtu;\r
 } IP6_MTU_OPTION;\r
 \r
 STATIC_ASSERT (sizeof (IP6_MTU_OPTION) == 8, "IP6_MTU_OPTION is expected to be exactly 8 bytes long.");\r
 \r
 typedef struct _IP6_PREFIX_INFO_OPTION {\r
-  UINT8                     Type;\r
-  UINT8                     Length;\r
-  UINT8                     PrefixLength;\r
-  UINT8                     Reserved1;\r
-  UINT32                    ValidLifetime;\r
-  UINT32                    PreferredLifetime;\r
-  UINT32                    Reserved2;\r
-  EFI_IPv6_ADDRESS          Prefix;\r
+  UINT8               Type;\r
+  UINT8               Length;\r
+  UINT8               PrefixLength;\r
+  UINT8               Reserved1;\r
+  UINT32              ValidLifetime;\r
+  UINT32              PreferredLifetime;\r
+  UINT32              Reserved2;\r
+  EFI_IPv6_ADDRESS    Prefix;\r
 } IP6_PREFIX_INFO_OPTION;\r
 \r
 STATIC_ASSERT (sizeof (IP6_PREFIX_INFO_OPTION) == 32, "IP6_PREFIX_INFO_OPTION is expected to be exactly 32 bytes long.");\r
@@ -102,25 +102,25 @@ VOID
   );\r
 \r
 typedef struct _IP6_DAD_ENTRY {\r
-  UINT32                    Signature;\r
-  LIST_ENTRY                Link;\r
-  UINT32                    MaxTransmit;\r
-  UINT32                    Transmit;\r
-  UINT32                    Receive;\r
-  UINT32                    RetransTick;\r
-  IP6_ADDRESS_INFO          *AddressInfo;\r
-  EFI_IPv6_ADDRESS          Destination;\r
-  IP6_DAD_CALLBACK          Callback;\r
-  VOID                      *Context;\r
+  UINT32              Signature;\r
+  LIST_ENTRY          Link;\r
+  UINT32              MaxTransmit;\r
+  UINT32              Transmit;\r
+  UINT32              Receive;\r
+  UINT32              RetransTick;\r
+  IP6_ADDRESS_INFO    *AddressInfo;\r
+  EFI_IPv6_ADDRESS    Destination;\r
+  IP6_DAD_CALLBACK    Callback;\r
+  VOID                *Context;\r
 } IP6_DAD_ENTRY;\r
 \r
 typedef struct _IP6_DELAY_JOIN_LIST {\r
-  LIST_ENTRY                Link;\r
-  UINT32                    DelayTime; ///< in tick per 50 milliseconds\r
-  IP6_INTERFACE             *Interface;\r
-  IP6_ADDRESS_INFO          *AddressInfo;\r
-  IP6_DAD_CALLBACK          DadCallback;\r
-  VOID                      *Context;\r
+  LIST_ENTRY          Link;\r
+  UINT32              DelayTime;       ///< in tick per 50 milliseconds\r
+  IP6_INTERFACE       *Interface;\r
+  IP6_ADDRESS_INFO    *AddressInfo;\r
+  IP6_DAD_CALLBACK    DadCallback;\r
+  VOID                *Context;\r
 } IP6_DELAY_JOIN_LIST;\r
 \r
 typedef struct _IP6_NEIGHBOR_ENTRY {\r
@@ -142,20 +142,20 @@ typedef struct _IP6_NEIGHBOR_ENTRY {
 } IP6_NEIGHBOR_ENTRY;\r
 \r
 typedef struct _IP6_DEFAULT_ROUTER {\r
-  LIST_ENTRY                Link;\r
-  INTN                      RefCnt;\r
-  UINT16                    Lifetime;\r
-  EFI_IPv6_ADDRESS          Router;\r
-  IP6_NEIGHBOR_ENTRY        *NeighborCache;\r
+  LIST_ENTRY            Link;\r
+  INTN                  RefCnt;\r
+  UINT16                Lifetime;\r
+  EFI_IPv6_ADDRESS      Router;\r
+  IP6_NEIGHBOR_ENTRY    *NeighborCache;\r
 } IP6_DEFAULT_ROUTER;\r
 \r
 typedef struct _IP6_PREFIX_LIST_ENTRY {\r
-  LIST_ENTRY                Link;\r
-  INTN                      RefCnt;\r
-  UINT32                    ValidLifetime;\r
-  UINT32                    PreferredLifetime;\r
-  UINT8                     PrefixLength;\r
-  EFI_IPv6_ADDRESS          Prefix;\r
+  LIST_ENTRY          Link;\r
+  INTN                RefCnt;\r
+  UINT32              ValidLifetime;\r
+  UINT32              PreferredLifetime;\r
+  UINT8               PrefixLength;\r
+  EFI_IPv6_ADDRESS    Prefix;\r
 } IP6_PREFIX_LIST_ENTRY;\r
 \r
 /**\r
@@ -172,9 +172,9 @@ typedef struct _IP6_PREFIX_LIST_ENTRY {
 **/\r
 EFI_STATUS\r
 Ip6BuildEfiNeighborCache (\r
-  IN IP6_PROTOCOL            *IpInstance,\r
-  OUT UINT32                 *NeighborCount,\r
-  OUT EFI_IP6_NEIGHBOR_CACHE **NeighborCache\r
+  IN IP6_PROTOCOL             *IpInstance,\r
+  OUT UINT32                  *NeighborCount,\r
+  OUT EFI_IP6_NEIGHBOR_CACHE  **NeighborCache\r
   );\r
 \r
 /**\r
@@ -210,9 +210,9 @@ Ip6BuildPrefixTable (
 **/\r
 IP6_DEFAULT_ROUTER *\r
 Ip6CreateDefaultRouter (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *Ip6Address,\r
-  IN UINT16                 RouterLifetime\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *Ip6Address,\r
+  IN UINT16            RouterLifetime\r
   );\r
 \r
 /**\r
@@ -224,8 +224,8 @@ Ip6CreateDefaultRouter (
 **/\r
 VOID\r
 Ip6DestroyDefaultRouter (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN IP6_DEFAULT_ROUTER     *DefaultRouter\r
+  IN IP6_SERVICE         *IpSb,\r
+  IN IP6_DEFAULT_ROUTER  *DefaultRouter\r
   );\r
 \r
 /**\r
@@ -236,7 +236,7 @@ Ip6DestroyDefaultRouter (
 **/\r
 VOID\r
 Ip6CleanDefaultRouterList (\r
-  IN IP6_SERVICE            *IpSb\r
+  IN IP6_SERVICE  *IpSb\r
   );\r
 \r
 /**\r
@@ -251,8 +251,8 @@ Ip6CleanDefaultRouterList (
 **/\r
 IP6_DEFAULT_ROUTER *\r
 Ip6FindDefaultRouter (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *Ip6Address\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *Ip6Address\r
   );\r
 \r
 /**\r
@@ -289,10 +289,10 @@ Ip6OnDADFinished (
 **/\r
 EFI_STATUS\r
 Ip6InitDADProcess (\r
-  IN IP6_INTERFACE          *IpIf,\r
-  IN IP6_ADDRESS_INFO       *AddressInfo,\r
-  IN IP6_DAD_CALLBACK       Callback  OPTIONAL,\r
-  IN VOID                   *Context  OPTIONAL\r
+  IN IP6_INTERFACE     *IpIf,\r
+  IN IP6_ADDRESS_INFO  *AddressInfo,\r
+  IN IP6_DAD_CALLBACK  Callback  OPTIONAL,\r
+  IN VOID              *Context  OPTIONAL\r
   );\r
 \r
 /**\r
@@ -309,9 +309,9 @@ Ip6InitDADProcess (
 **/\r
 IP6_DAD_ENTRY *\r
 Ip6FindDADEntry (\r
-  IN  IP6_SERVICE      *IpSb,\r
-  IN  EFI_IPv6_ADDRESS *Target,\r
-  OUT IP6_INTERFACE    **Interface OPTIONAL\r
+  IN  IP6_SERVICE       *IpSb,\r
+  IN  EFI_IPv6_ADDRESS  *Target,\r
+  OUT IP6_INTERFACE     **Interface OPTIONAL\r
   );\r
 \r
 /**\r
@@ -334,12 +334,12 @@ Ip6FindDADEntry (
 **/\r
 IP6_PREFIX_LIST_ENTRY *\r
 Ip6CreatePrefixListEntry (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN BOOLEAN                OnLinkOrAuto,\r
-  IN UINT32                 ValidLifetime,\r
-  IN UINT32                 PreferredLifetime,\r
-  IN UINT8                  PrefixLength,\r
-  IN EFI_IPv6_ADDRESS       *Prefix\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN BOOLEAN           OnLinkOrAuto,\r
+  IN UINT32            ValidLifetime,\r
+  IN UINT32            PreferredLifetime,\r
+  IN UINT8             PrefixLength,\r
+  IN EFI_IPv6_ADDRESS  *Prefix\r
   );\r
 \r
 /**\r
@@ -377,10 +377,10 @@ Ip6DestroyPrefixListEntry (
 **/\r
 IP6_PREFIX_LIST_ENTRY *\r
 Ip6FindPrefixListEntry (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN BOOLEAN                OnLinkOrAuto,\r
-  IN UINT8                  PrefixLength,\r
-  IN EFI_IPv6_ADDRESS       *Prefix\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN BOOLEAN           OnLinkOrAuto,\r
+  IN UINT8             PrefixLength,\r
+  IN EFI_IPv6_ADDRESS  *Prefix\r
   );\r
 \r
 /**\r
@@ -393,8 +393,8 @@ Ip6FindPrefixListEntry (
 **/\r
 VOID\r
 Ip6CleanPrefixListTable (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN LIST_ENTRY             *ListHead\r
+  IN IP6_SERVICE  *IpSb,\r
+  IN LIST_ENTRY   *ListHead\r
   );\r
 \r
 /**\r
@@ -413,10 +413,10 @@ Ip6CleanPrefixListTable (
 **/\r
 IP6_NEIGHBOR_ENTRY *\r
 Ip6CreateNeighborEntry (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN IP6_ARP_CALLBACK       CallBack,\r
-  IN EFI_IPv6_ADDRESS       *Ip6Address,\r
-  IN EFI_MAC_ADDRESS        *LinkAddress OPTIONAL\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN IP6_ARP_CALLBACK  CallBack,\r
+  IN EFI_IPv6_ADDRESS  *Ip6Address,\r
+  IN EFI_MAC_ADDRESS   *LinkAddress OPTIONAL\r
   );\r
 \r
 /**\r
@@ -431,8 +431,8 @@ Ip6CreateNeighborEntry (
 **/\r
 IP6_NEIGHBOR_ENTRY *\r
 Ip6FindNeighborEntry (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *Ip6Address\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *Ip6Address\r
   );\r
 \r
 /**\r
@@ -458,13 +458,13 @@ Ip6FindNeighborEntry (
 **/\r
 EFI_STATUS\r
 Ip6FreeNeighborEntry (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN IP6_NEIGHBOR_ENTRY     *NeighborCache,\r
-  IN BOOLEAN                SendIcmpError,\r
-  IN BOOLEAN                FullFree,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN IP6_FRAME_TO_CANCEL    FrameToCancel OPTIONAL,\r
-  IN VOID                   *Context      OPTIONAL\r
+  IN IP6_SERVICE          *IpSb,\r
+  IN IP6_NEIGHBOR_ENTRY   *NeighborCache,\r
+  IN BOOLEAN              SendIcmpError,\r
+  IN BOOLEAN              FullFree,\r
+  IN EFI_STATUS           IoStatus,\r
+  IN IP6_FRAME_TO_CANCEL  FrameToCancel OPTIONAL,\r
+  IN VOID                 *Context      OPTIONAL\r
   );\r
 \r
 /**\r
@@ -493,11 +493,11 @@ Ip6FreeNeighborEntry (
 **/\r
 EFI_STATUS\r
 Ip6AddNeighbor (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *TargetIp6Address,\r
-  IN EFI_MAC_ADDRESS        *TargetLinkAddress OPTIONAL,\r
-  IN UINT32                 Timeout,\r
-  IN BOOLEAN                Override\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *TargetIp6Address,\r
+  IN EFI_MAC_ADDRESS   *TargetLinkAddress OPTIONAL,\r
+  IN UINT32            Timeout,\r
+  IN BOOLEAN           Override\r
   );\r
 \r
 /**\r
@@ -521,11 +521,11 @@ Ip6AddNeighbor (
 **/\r
 EFI_STATUS\r
 Ip6DelNeighbor (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *TargetIp6Address,\r
-  IN EFI_MAC_ADDRESS        *TargetLinkAddress OPTIONAL,\r
-  IN UINT32                 Timeout,\r
-  IN BOOLEAN                Override\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *TargetIp6Address,\r
+  IN EFI_MAC_ADDRESS   *TargetLinkAddress OPTIONAL,\r
+  IN UINT32            Timeout,\r
+  IN BOOLEAN           Override\r
   );\r
 \r
 /**\r
@@ -544,9 +544,9 @@ Ip6DelNeighbor (
 **/\r
 EFI_STATUS\r
 Ip6ProcessNeighborSolicit (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   );\r
 \r
 /**\r
@@ -564,9 +564,9 @@ Ip6ProcessNeighborSolicit (
 **/\r
 EFI_STATUS\r
 Ip6ProcessNeighborAdvertise (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   );\r
 \r
 /**\r
@@ -584,9 +584,9 @@ Ip6ProcessNeighborAdvertise (
 **/\r
 EFI_STATUS\r
 Ip6ProcessRouterAdvertise (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   );\r
 \r
 /**\r
@@ -607,9 +607,9 @@ Ip6ProcessRouterAdvertise (
 **/\r
 EFI_STATUS\r
 Ip6ProcessRedirect (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN NET_BUF                *Packet\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN NET_BUF         *Packet\r
   );\r
 \r
 /**\r
@@ -631,11 +631,11 @@ Ip6ProcessRedirect (
 **/\r
 EFI_STATUS\r
 Ip6SendRouterSolicit (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN IP6_INTERFACE          *Interface          OPTIONAL,\r
-  IN EFI_IPv6_ADDRESS       *SourceAddress      OPTIONAL,\r
-  IN EFI_IPv6_ADDRESS       *DestinationAddress OPTIONAL,\r
-  IN EFI_MAC_ADDRESS        *SourceLinkAddress  OPTIONAL\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN IP6_INTERFACE     *Interface          OPTIONAL,\r
+  IN EFI_IPv6_ADDRESS  *SourceAddress      OPTIONAL,\r
+  IN EFI_IPv6_ADDRESS  *DestinationAddress OPTIONAL,\r
+  IN EFI_MAC_ADDRESS   *SourceLinkAddress  OPTIONAL\r
   );\r
 \r
 /**\r
@@ -658,11 +658,11 @@ Ip6SendRouterSolicit (
 **/\r
 EFI_STATUS\r
 Ip6SendNeighborSolicit (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *SourceAddress,\r
-  IN EFI_IPv6_ADDRESS       *DestinationAddress,\r
-  IN EFI_IPv6_ADDRESS       *TargetIp6Address,\r
-  IN EFI_MAC_ADDRESS        *SourceLinkAddress OPTIONAL\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *SourceAddress,\r
+  IN EFI_IPv6_ADDRESS  *DestinationAddress,\r
+  IN EFI_IPv6_ADDRESS  *TargetIp6Address,\r
+  IN EFI_MAC_ADDRESS   *SourceLinkAddress OPTIONAL\r
   );\r
 \r
 /**\r
@@ -690,14 +690,14 @@ Ip6SendNeighborSolicit (
 **/\r
 EFI_STATUS\r
 Ip6SetAddress (\r
-  IN IP6_INTERFACE          *Interface,\r
-  IN EFI_IPv6_ADDRESS       *Ip6Addr,\r
-  IN BOOLEAN                IsAnycast,\r
-  IN UINT8                  PrefixLength,\r
-  IN UINT32                 ValidLifetime,\r
-  IN UINT32                 PreferredLifetime,\r
-  IN IP6_DAD_CALLBACK       DadCallback  OPTIONAL,\r
-  IN VOID                   *Context     OPTIONAL\r
+  IN IP6_INTERFACE     *Interface,\r
+  IN EFI_IPv6_ADDRESS  *Ip6Addr,\r
+  IN BOOLEAN           IsAnycast,\r
+  IN UINT8             PrefixLength,\r
+  IN UINT32            ValidLifetime,\r
+  IN UINT32            PreferredLifetime,\r
+  IN IP6_DAD_CALLBACK  DadCallback  OPTIONAL,\r
+  IN VOID              *Context     OPTIONAL\r
   );\r
 \r
 /**\r
@@ -712,8 +712,8 @@ Ip6SetAddress (
 VOID\r
 EFIAPI\r
 Ip6NdFasterTimerTicking (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -726,7 +726,7 @@ Ip6NdFasterTimerTicking (
 **/\r
 VOID\r
 Ip6NdTimerTicking (\r
-  IN IP6_SERVICE            *IpSb\r
+  IN IP6_SERVICE  *IpSb\r
   );\r
 \r
 /**\r
@@ -739,7 +739,7 @@ Ip6NdTimerTicking (
 **/\r
 VOID\r
 Ip6OnArpResolved (\r
-  IN VOID                   *Context\r
+  IN VOID  *Context\r
   );\r
 \r
 /**\r
index eb36d7ed4cd58c2b77194c09a27291ad8dfe96a6..d1c1c13345f7bdccc5e039dd86b7e8d284724c26 100644 (file)
 \r
 #include <Guid/Ip6ConfigHii.h>\r
 \r
-#define FORMID_MAIN_FORM          1\r
-#define FORMID_MANUAL_CONFIG_FORM 2\r
-#define FORMID_HEAD_FORM          3\r
-\r
-#define IP6_POLICY_AUTO           0\r
-#define IP6_POLICY_MANUAL         1\r
-#define DAD_MAX_TRANSMIT_COUNT    10\r
-\r
-#define KEY_INTERFACE_ID          0x101\r
-#define KEY_MANUAL_ADDRESS        0x102\r
-#define KEY_GATEWAY_ADDRESS       0x103\r
-#define KEY_DNS_ADDRESS           0x104\r
-#define KEY_SAVE_CHANGES          0x105\r
-#define KEY_SAVE_CONFIG_CHANGES   0x106\r
-#define KEY_IGNORE_CONFIG_CHANGES 0x107\r
-#define KEY_GET_CURRENT_SETTING   0x108\r
-\r
-#define HOST_ADDRESS_LABEL        0x9000\r
-#define ROUTE_TABLE_LABEL         0xa000\r
-#define GATEWAY_ADDRESS_LABEL     0xb000\r
-#define DNS_ADDRESS_LABEL         0xc000\r
-#define LABEL_END                 0xffff\r
-\r
-#define INTERFACE_ID_STR_MIN_SIZE 1\r
-#define INTERFACE_ID_STR_MAX_SIZE 23\r
-#define INTERFACE_ID_STR_STORAGE  25\r
-#define IP6_STR_MAX_SIZE          40\r
-#define ADDRESS_STR_MIN_SIZE      2\r
-#define ADDRESS_STR_MAX_SIZE      255\r
+#define FORMID_MAIN_FORM           1\r
+#define FORMID_MANUAL_CONFIG_FORM  2\r
+#define FORMID_HEAD_FORM           3\r
+\r
+#define IP6_POLICY_AUTO         0\r
+#define IP6_POLICY_MANUAL       1\r
+#define DAD_MAX_TRANSMIT_COUNT  10\r
+\r
+#define KEY_INTERFACE_ID           0x101\r
+#define KEY_MANUAL_ADDRESS         0x102\r
+#define KEY_GATEWAY_ADDRESS        0x103\r
+#define KEY_DNS_ADDRESS            0x104\r
+#define KEY_SAVE_CHANGES           0x105\r
+#define KEY_SAVE_CONFIG_CHANGES    0x106\r
+#define KEY_IGNORE_CONFIG_CHANGES  0x107\r
+#define KEY_GET_CURRENT_SETTING    0x108\r
+\r
+#define HOST_ADDRESS_LABEL     0x9000\r
+#define ROUTE_TABLE_LABEL      0xa000\r
+#define GATEWAY_ADDRESS_LABEL  0xb000\r
+#define DNS_ADDRESS_LABEL      0xc000\r
+#define LABEL_END              0xffff\r
+\r
+#define INTERFACE_ID_STR_MIN_SIZE  1\r
+#define INTERFACE_ID_STR_MAX_SIZE  23\r
+#define INTERFACE_ID_STR_STORAGE   25\r
+#define IP6_STR_MAX_SIZE           40\r
+#define ADDRESS_STR_MIN_SIZE       2\r
+#define ADDRESS_STR_MAX_SIZE       255\r
 \r
 ///\r
 /// IP6_CONFIG_IFR_NVDATA contains the IP6 configure\r
 ///\r
 #pragma pack(1)\r
 typedef struct {\r
-  UINT8           IfType;                                 ///< interface type\r
-  UINT8           Padding[3];\r
-  UINT32          Policy;                                 ///< manual or automatic\r
-  UINT32          DadTransmitCount;                       ///< dad transmits count\r
-  CHAR16          InterfaceId[INTERFACE_ID_STR_STORAGE];  ///< alternative interface id\r
-  CHAR16          ManualAddress[ADDRESS_STR_MAX_SIZE];    ///< IP addresses\r
-  CHAR16          GatewayAddress[ADDRESS_STR_MAX_SIZE];   ///< Gateway address\r
-  CHAR16          DnsAddress[ADDRESS_STR_MAX_SIZE];       ///< DNS server address\r
+  UINT8     IfType;                                       ///< interface type\r
+  UINT8     Padding[3];\r
+  UINT32    Policy;                                       ///< manual or automatic\r
+  UINT32    DadTransmitCount;                             ///< dad transmits count\r
+  CHAR16    InterfaceId[INTERFACE_ID_STR_STORAGE];        ///< alternative interface id\r
+  CHAR16    ManualAddress[ADDRESS_STR_MAX_SIZE];          ///< IP addresses\r
+  CHAR16    GatewayAddress[ADDRESS_STR_MAX_SIZE];         ///< Gateway address\r
+  CHAR16    DnsAddress[ADDRESS_STR_MAX_SIZE];             ///< DNS server address\r
 } IP6_CONFIG_IFR_NVDATA;\r
 #pragma pack()\r
 \r
 #endif\r
-\r
index 6b4b029d14791c1643ed607fb7775d4c0745da2c..199eea124dfeddac6f1a1ce5e7d5103193b04723 100644 (file)
 **/\r
 BOOLEAN\r
 Ip6IsOptionValid (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN NET_BUF                *Packet,\r
-  IN UINT8                  *Option,\r
-  IN UINT8                  OptionLen,\r
-  IN UINT32                 Pointer\r
+  IN IP6_SERVICE  *IpSb,\r
+  IN NET_BUF      *Packet,\r
+  IN UINT8        *Option,\r
+  IN UINT8        OptionLen,\r
+  IN UINT32       Pointer\r
   )\r
 {\r
-  UINT8                      Offset;\r
-  UINT8                      OptionType;\r
+  UINT8  Offset;\r
+  UINT8  OptionType;\r
 \r
   Offset = 0;\r
 \r
@@ -44,68 +44,67 @@ Ip6IsOptionValid (
     OptionType = *(Option + Offset);\r
 \r
     switch (OptionType) {\r
-    case Ip6OptionPad1:\r
-      //\r
-      // It is a Pad1 option\r
-      //\r
-      Offset++;\r
-      break;\r
-    case Ip6OptionPadN:\r
-      //\r
-      // It is a PadN option\r
-      //\r
-      Offset = (UINT8) (Offset + *(Option + Offset + 1) + 2);\r
-      break;\r
-    case Ip6OptionRouterAlert:\r
-      //\r
-      // It is a Router Alert Option\r
-      //\r
-      Offset += 4;\r
-      break;\r
-    default:\r
-      //\r
-      // The highest-order two bits specify the action must be taken if\r
-      // the processing IPv6 node does not recognize the option type.\r
-      //\r
-      switch (OptionType & Ip6OptionMask) {\r
-      case Ip6OptionSkip:\r
-        Offset = (UINT8) (Offset + *(Option + Offset + 1));\r
+      case Ip6OptionPad1:\r
+        //\r
+        // It is a Pad1 option\r
+        //\r
+        Offset++;\r
         break;\r
-      case Ip6OptionDiscard:\r
-        return FALSE;\r
-      case Ip6OptionParameterProblem:\r
-        Pointer = Pointer + Offset + sizeof (EFI_IP6_HEADER);\r
-        Ip6SendIcmpError (\r
-          IpSb,\r
-          Packet,\r
-          NULL,\r
-          &Packet->Ip.Ip6->SourceAddress,\r
-          ICMP_V6_PARAMETER_PROBLEM,\r
-          2,\r
-          &Pointer\r
-          );\r
-        return FALSE;\r
-      case Ip6OptionMask:\r
-        if (!IP6_IS_MULTICAST (&Packet->Ip.Ip6->DestinationAddress)) {\r
-          Pointer = Pointer + Offset + sizeof (EFI_IP6_HEADER);\r
-          Ip6SendIcmpError (\r
-            IpSb,\r
-            Packet,\r
-            NULL,\r
-            &Packet->Ip.Ip6->SourceAddress,\r
-            ICMP_V6_PARAMETER_PROBLEM,\r
-            2,\r
-            &Pointer\r
-            );\r
+      case Ip6OptionPadN:\r
+        //\r
+        // It is a PadN option\r
+        //\r
+        Offset = (UINT8)(Offset + *(Option + Offset + 1) + 2);\r
+        break;\r
+      case Ip6OptionRouterAlert:\r
+        //\r
+        // It is a Router Alert Option\r
+        //\r
+        Offset += 4;\r
+        break;\r
+      default:\r
+        //\r
+        // The highest-order two bits specify the action must be taken if\r
+        // the processing IPv6 node does not recognize the option type.\r
+        //\r
+        switch (OptionType & Ip6OptionMask) {\r
+          case Ip6OptionSkip:\r
+            Offset = (UINT8)(Offset + *(Option + Offset + 1));\r
+            break;\r
+          case Ip6OptionDiscard:\r
+            return FALSE;\r
+          case Ip6OptionParameterProblem:\r
+            Pointer = Pointer + Offset + sizeof (EFI_IP6_HEADER);\r
+            Ip6SendIcmpError (\r
+              IpSb,\r
+              Packet,\r
+              NULL,\r
+              &Packet->Ip.Ip6->SourceAddress,\r
+              ICMP_V6_PARAMETER_PROBLEM,\r
+              2,\r
+              &Pointer\r
+              );\r
+            return FALSE;\r
+          case Ip6OptionMask:\r
+            if (!IP6_IS_MULTICAST (&Packet->Ip.Ip6->DestinationAddress)) {\r
+              Pointer = Pointer + Offset + sizeof (EFI_IP6_HEADER);\r
+              Ip6SendIcmpError (\r
+                IpSb,\r
+                Packet,\r
+                NULL,\r
+                &Packet->Ip.Ip6->SourceAddress,\r
+                ICMP_V6_PARAMETER_PROBLEM,\r
+                2,\r
+                &Pointer\r
+                );\r
+            }\r
+\r
+            return FALSE;\r
+            break;\r
         }\r
 \r
-        return FALSE;\r
         break;\r
-      }\r
-\r
-      break;\r
     }\r
-\r
   }\r
 \r
   return TRUE;\r
@@ -125,13 +124,13 @@ Ip6IsOptionValid (
 **/\r
 BOOLEAN\r
 Ip6IsNDOptionValid (\r
-  IN UINT8                  *Option,\r
-  IN UINT16                 OptionLen\r
+  IN UINT8   *Option,\r
+  IN UINT16  OptionLen\r
   )\r
 {\r
-  UINT32                    Offset;\r
-  UINT16                    Length;\r
-  IP6_OPTION_HEADER         *OptionHeader;\r
+  UINT32             Offset;\r
+  UINT16             Length;\r
+  IP6_OPTION_HEADER  *OptionHeader;\r
 \r
   if (Option == NULL) {\r
     ASSERT (Option != NULL);\r
@@ -146,50 +145,54 @@ Ip6IsNDOptionValid (
   // fit within the input buffer.\r
   //\r
   while (Offset + sizeof (IP6_OPTION_HEADER) - 1 < OptionLen) {\r
-    OptionHeader  = (IP6_OPTION_HEADER*) (Option + Offset);\r
-    Length        = (UINT16) OptionHeader->Length * 8;\r
+    OptionHeader = (IP6_OPTION_HEADER *)(Option + Offset);\r
+    Length       = (UINT16)OptionHeader->Length * 8;\r
 \r
     switch (OptionHeader->Type) {\r
-    case Ip6OptionPrefixInfo:\r
-      if (Length != 32) {\r
-        return FALSE;\r
-      }\r
-      break;\r
+      case Ip6OptionPrefixInfo:\r
+        if (Length != 32) {\r
+          return FALSE;\r
+        }\r
 \r
-    case Ip6OptionMtu:\r
-      if (Length != 8) {\r
-        return FALSE;\r
-      }\r
-      break;\r
+        break;\r
 \r
-    default:\r
-      // RFC 4861 states that Length field cannot be 0.\r
-      if (Length == 0) {\r
-        return FALSE;\r
-      }\r
-      break;\r
+      case Ip6OptionMtu:\r
+        if (Length != 8) {\r
+          return FALSE;\r
+        }\r
+\r
+        break;\r
+\r
+      default:\r
+        // RFC 4861 states that Length field cannot be 0.\r
+        if (Length == 0) {\r
+          return FALSE;\r
+        }\r
+\r
+        break;\r
     }\r
 \r
     //\r
     // Check whether recognized options are within the input buffer's scope.\r
     //\r
     switch (OptionHeader->Type) {\r
-    case Ip6OptionEtherSource:\r
-    case Ip6OptionEtherTarget:\r
-    case Ip6OptionPrefixInfo:\r
-    case Ip6OptionRedirected:\r
-    case Ip6OptionMtu:\r
-      if (Offset + Length > (UINT32) OptionLen) {\r
-        return FALSE;\r
-      }\r
-      break;\r
+      case Ip6OptionEtherSource:\r
+      case Ip6OptionEtherTarget:\r
+      case Ip6OptionPrefixInfo:\r
+      case Ip6OptionRedirected:\r
+      case Ip6OptionMtu:\r
+        if (Offset + Length > (UINT32)OptionLen) {\r
+          return FALSE;\r
+        }\r
 \r
-    default:\r
-      //\r
-      // Unrecognized options can be either valid (but unused) or invalid\r
-      // (garbage in between or right after valid options). Silently ignore.\r
-      //\r
-      break;\r
+        break;\r
+\r
+      default:\r
+        //\r
+        // Unrecognized options can be either valid (but unused) or invalid\r
+        // (garbage in between or right after valid options). Silently ignore.\r
+        //\r
+        break;\r
     }\r
 \r
     //\r
@@ -202,7 +205,6 @@ Ip6IsNDOptionValid (
   return TRUE;\r
 }\r
 \r
-\r
 /**\r
   Validate whether the NextHeader is a known valid protocol or one of the user configured\r
   protocols from the upper layer.\r
@@ -216,18 +218,19 @@ Ip6IsNDOptionValid (
 **/\r
 BOOLEAN\r
 Ip6IsValidProtocol (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN UINT8                  NextHeader\r
+  IN IP6_SERVICE  *IpSb,\r
+  IN UINT8        NextHeader\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  IP6_PROTOCOL              *IpInstance;\r
-\r
-  if (NextHeader == EFI_IP_PROTO_TCP ||\r
-      NextHeader == EFI_IP_PROTO_UDP ||\r
-      NextHeader == IP6_ICMP ||\r
-      NextHeader == IP6_ESP\r
-      ) {\r
+  LIST_ENTRY    *Entry;\r
+  IP6_PROTOCOL  *IpInstance;\r
+\r
+  if ((NextHeader == EFI_IP_PROTO_TCP) ||\r
+      (NextHeader == EFI_IP_PROTO_UDP) ||\r
+      (NextHeader == IP6_ICMP) ||\r
+      (NextHeader == IP6_ESP)\r
+      )\r
+  {\r
     return TRUE;\r
   }\r
 \r
@@ -281,29 +284,29 @@ Ip6IsValidProtocol (
 **/\r
 BOOLEAN\r
 Ip6IsExtsValid (\r
-  IN IP6_SERVICE            *IpSb           OPTIONAL,\r
-  IN NET_BUF                *Packet         OPTIONAL,\r
-  IN UINT8                  *NextHeader,\r
-  IN UINT8                  *ExtHdrs,\r
-  IN UINT32                 ExtHdrsLen,\r
-  IN BOOLEAN                Rcvd,\r
-  OUT UINT32                *FormerHeader   OPTIONAL,\r
-  OUT UINT8                 **LastHeader,\r
-  OUT UINT32                *RealExtsLen    OPTIONAL,\r
-  OUT UINT32                *UnFragmentLen  OPTIONAL,\r
-  OUT BOOLEAN               *Fragmented     OPTIONAL\r
+  IN IP6_SERVICE  *IpSb           OPTIONAL,\r
+  IN NET_BUF      *Packet         OPTIONAL,\r
+  IN UINT8        *NextHeader,\r
+  IN UINT8        *ExtHdrs,\r
+  IN UINT32       ExtHdrsLen,\r
+  IN BOOLEAN      Rcvd,\r
+  OUT UINT32      *FormerHeader   OPTIONAL,\r
+  OUT UINT8       **LastHeader,\r
+  OUT UINT32      *RealExtsLen    OPTIONAL,\r
+  OUT UINT32      *UnFragmentLen  OPTIONAL,\r
+  OUT BOOLEAN     *Fragmented     OPTIONAL\r
   )\r
 {\r
-  UINT32                     Pointer;\r
-  UINT32                     Offset;\r
-  UINT8                      *Option;\r
-  UINT8                      OptionLen;\r
-  BOOLEAN                    Flag;\r
-  UINT8                      CountD;\r
-  UINT8                      CountA;\r
-  IP6_FRAGMENT_HEADER        *FragmentHead;\r
-  UINT16                     FragmentOffset;\r
-  IP6_ROUTING_HEADER         *RoutingHead;\r
+  UINT32               Pointer;\r
+  UINT32               Offset;\r
+  UINT8                *Option;\r
+  UINT8                OptionLen;\r
+  BOOLEAN              Flag;\r
+  UINT8                CountD;\r
+  UINT8                CountA;\r
+  IP6_FRAGMENT_HEADER  *FragmentHead;\r
+  UINT16               FragmentOffset;\r
+  IP6_ROUTING_HEADER   *RoutingHead;\r
 \r
   if (RealExtsLen != NULL) {\r
     *RealExtsLen = 0;\r
@@ -319,11 +322,11 @@ Ip6IsExtsValid (
 \r
   *LastHeader = NextHeader;\r
 \r
-  if (ExtHdrs == NULL && ExtHdrsLen == 0) {\r
+  if ((ExtHdrs == NULL) && (ExtHdrsLen == 0)) {\r
     return TRUE;\r
   }\r
 \r
-  if ((ExtHdrs == NULL && ExtHdrsLen != 0) || (ExtHdrs != NULL && ExtHdrsLen == 0)) {\r
+  if (((ExtHdrs == NULL) && (ExtHdrsLen != 0)) || ((ExtHdrs != NULL) && (ExtHdrsLen == 0))) {\r
     return FALSE;\r
   }\r
 \r
@@ -334,236 +337,240 @@ Ip6IsExtsValid (
   CountA  = 0;\r
 \r
   while (Offset <= ExtHdrsLen) {\r
-\r
     switch (*NextHeader) {\r
-    case IP6_HOP_BY_HOP:\r
-      if (Offset != 0) {\r
-        if (!Rcvd) {\r
+      case IP6_HOP_BY_HOP:\r
+        if (Offset != 0) {\r
+          if (!Rcvd) {\r
+            return FALSE;\r
+          }\r
+\r
+          //\r
+          // Hop-by-Hop Options header is restricted to appear immediately after an IPv6 header only.\r
+          // If not, generate a ICMP parameter problem message with code value of 1.\r
+          //\r
+          if (Pointer == 0) {\r
+            Pointer = sizeof (EFI_IP6_HEADER);\r
+          } else {\r
+            Pointer = Offset + sizeof (EFI_IP6_HEADER);\r
+          }\r
+\r
+          if ((IpSb != NULL) && (Packet != NULL) &&\r
+              !IP6_IS_MULTICAST (&Packet->Ip.Ip6->DestinationAddress))\r
+          {\r
+            Ip6SendIcmpError (\r
+              IpSb,\r
+              Packet,\r
+              NULL,\r
+              &Packet->Ip.Ip6->SourceAddress,\r
+              ICMP_V6_PARAMETER_PROBLEM,\r
+              1,\r
+              &Pointer\r
+              );\r
+          }\r
+\r
           return FALSE;\r
         }\r
-        //\r
-        // Hop-by-Hop Options header is restricted to appear immediately after an IPv6 header only.\r
-        // If not, generate a ICMP parameter problem message with code value of 1.\r
-        //\r
-        if (Pointer == 0) {\r
-          Pointer = sizeof (EFI_IP6_HEADER);\r
-        } else {\r
-          Pointer = Offset + sizeof (EFI_IP6_HEADER);\r
+\r
+        Flag = TRUE;\r
+\r
+      //\r
+      // Fall through\r
+      //\r
+      case IP6_DESTINATION:\r
+        if (*NextHeader == IP6_DESTINATION) {\r
+          CountD++;\r
         }\r
 \r
-        if ((IpSb != NULL) && (Packet != NULL) &&\r
-            !IP6_IS_MULTICAST (&Packet->Ip.Ip6->DestinationAddress)) {\r
-          Ip6SendIcmpError (\r
-            IpSb,\r
-            Packet,\r
-            NULL,\r
-            &Packet->Ip.Ip6->SourceAddress,\r
-            ICMP_V6_PARAMETER_PROBLEM,\r
-            1,\r
-            &Pointer\r
-            );\r
+        if (CountD > 2) {\r
+          return FALSE;\r
         }\r
-        return FALSE;\r
-      }\r
 \r
-      Flag = TRUE;\r
+        NextHeader = ExtHdrs + Offset;\r
+        Pointer    = Offset;\r
 \r
-    //\r
-    // Fall through\r
-    //\r
-    case IP6_DESTINATION:\r
-      if (*NextHeader == IP6_DESTINATION) {\r
-        CountD++;\r
-      }\r
+        Offset++;\r
+        Option    = ExtHdrs + Offset;\r
+        OptionLen = (UINT8)((*Option + 1) * 8 - 2);\r
+        Option++;\r
+        Offset++;\r
 \r
-      if (CountD > 2) {\r
-        return FALSE;\r
-      }\r
+        if ((IpSb != NULL) && (Packet != NULL) && !Ip6IsOptionValid (IpSb, Packet, Option, OptionLen, Offset)) {\r
+          return FALSE;\r
+        }\r
 \r
-      NextHeader = ExtHdrs + Offset;\r
-      Pointer    = Offset;\r
+        Offset = Offset + OptionLen;\r
 \r
-      Offset++;\r
-      Option     = ExtHdrs + Offset;\r
-      OptionLen  = (UINT8) ((*Option + 1) * 8 - 2);\r
-      Option++;\r
-      Offset++;\r
+        if (Flag) {\r
+          if (UnFragmentLen != NULL) {\r
+            *UnFragmentLen = Offset;\r
+          }\r
 \r
-      if (IpSb != NULL && Packet != NULL && !Ip6IsOptionValid (IpSb, Packet, Option, OptionLen, Offset)) {\r
-        return FALSE;\r
-      }\r
+          Flag = FALSE;\r
+        }\r
+\r
+        break;\r
 \r
-      Offset = Offset + OptionLen;\r
+      case IP6_ROUTING:\r
+        NextHeader  = ExtHdrs + Offset;\r
+        RoutingHead = (IP6_ROUTING_HEADER *)NextHeader;\r
 \r
-      if (Flag) {\r
-        if (UnFragmentLen != NULL) {\r
-          *UnFragmentLen = Offset;\r
+        //\r
+        // Type 0 routing header is defined in RFC2460 and deprecated in RFC5095.\r
+        // Thus all routing types are processed as unrecognized.\r
+        //\r
+        if (RoutingHead->SegmentsLeft == 0) {\r
+          //\r
+          // Ignore the routing header and proceed to process the next header.\r
+          //\r
+          Offset = Offset + (RoutingHead->HeaderLen + 1) * 8;\r
+\r
+          if (UnFragmentLen != NULL) {\r
+            *UnFragmentLen = Offset;\r
+          }\r
+        } else {\r
+          //\r
+          // Discard the packet and send an ICMP Parameter Problem, Code 0, message\r
+          // to the packet's source address, pointing to the unrecognized routing\r
+          // type.\r
+          //\r
+          Pointer = Offset + 2 + sizeof (EFI_IP6_HEADER);\r
+          if ((IpSb != NULL) && (Packet != NULL) &&\r
+              !IP6_IS_MULTICAST (&Packet->Ip.Ip6->DestinationAddress))\r
+          {\r
+            Ip6SendIcmpError (\r
+              IpSb,\r
+              Packet,\r
+              NULL,\r
+              &Packet->Ip.Ip6->SourceAddress,\r
+              ICMP_V6_PARAMETER_PROBLEM,\r
+              0,\r
+              &Pointer\r
+              );\r
+          }\r
+\r
+          return FALSE;\r
         }\r
 \r
-        Flag = FALSE;\r
-      }\r
+        break;\r
 \r
-      break;\r
+      case IP6_FRAGMENT:\r
 \r
-    case IP6_ROUTING:\r
-      NextHeader = ExtHdrs + Offset;\r
-      RoutingHead = (IP6_ROUTING_HEADER *) NextHeader;\r
+        //\r
+        // RFC2402, AH header should after fragment header.\r
+        //\r
+        if (CountA > 1) {\r
+          return FALSE;\r
+        }\r
 \r
-      //\r
-      // Type 0 routing header is defined in RFC2460 and deprecated in RFC5095.\r
-      // Thus all routing types are processed as unrecognized.\r
-      //\r
-      if (RoutingHead->SegmentsLeft == 0) {\r
         //\r
-        // Ignore the routing header and proceed to process the next header.\r
+        // RFC2460, ICMP Parameter Problem message with code 0 should be sent\r
+        // if the length of a fragment is not a multiple of 8 octets and the M\r
+        // flag of that fragment is 1, pointing to the Payload length field of the\r
+        // fragment packet.\r
         //\r
-        Offset = Offset + (RoutingHead->HeaderLen + 1) * 8;\r
+        if ((IpSb != NULL) && (Packet != NULL) && ((ExtHdrsLen % 8) != 0)) {\r
+          //\r
+          // Check whether it is the last fragment.\r
+          //\r
+          FragmentHead = (IP6_FRAGMENT_HEADER *)(ExtHdrs + Offset);\r
+          if (FragmentHead == NULL) {\r
+            return FALSE;\r
+          }\r
+\r
+          FragmentOffset = NTOHS (FragmentHead->FragmentOffset);\r
+\r
+          if (((FragmentOffset & 0x1) == 0x1) &&\r
+              !IP6_IS_MULTICAST (&Packet->Ip.Ip6->DestinationAddress))\r
+          {\r
+            Pointer = sizeof (UINT32);\r
+            Ip6SendIcmpError (\r
+              IpSb,\r
+              Packet,\r
+              NULL,\r
+              &Packet->Ip.Ip6->SourceAddress,\r
+              ICMP_V6_PARAMETER_PROBLEM,\r
+              0,\r
+              &Pointer\r
+              );\r
+            return FALSE;\r
+          }\r
+        }\r
+\r
+        if (Fragmented != NULL) {\r
+          *Fragmented = TRUE;\r
+        }\r
+\r
+        if (Rcvd && (FormerHeader != NULL)) {\r
+          *FormerHeader = (UINT32)(NextHeader - ExtHdrs);\r
+        }\r
+\r
+        NextHeader = ExtHdrs + Offset;\r
+        Offset     = Offset + 8;\r
+        break;\r
 \r
-        if (UnFragmentLen != NULL) {\r
-          *UnFragmentLen = Offset;\r
+      case IP6_AH:\r
+        if (++CountA > 1) {\r
+          return FALSE;\r
         }\r
 \r
-      } else {\r
+        Option     = ExtHdrs + Offset;\r
+        NextHeader = Option;\r
+        Option++;\r
         //\r
-        // Discard the packet and send an ICMP Parameter Problem, Code 0, message\r
-        // to the packet's source address, pointing to the unrecognized routing\r
-        // type.\r
+        // RFC2402, Payload length is specified in 32-bit words, minus "2".\r
         //\r
-        Pointer = Offset + 2 + sizeof (EFI_IP6_HEADER);\r
-        if ((IpSb != NULL) && (Packet != NULL) &&\r
-            !IP6_IS_MULTICAST (&Packet->Ip.Ip6->DestinationAddress)) {\r
-          Ip6SendIcmpError (\r
-            IpSb,\r
-            Packet,\r
-            NULL,\r
-            &Packet->Ip.Ip6->SourceAddress,\r
-            ICMP_V6_PARAMETER_PROBLEM,\r
-            0,\r
-            &Pointer\r
-            );\r
-        }\r
+        OptionLen = (UINT8)((*Option + 2) * 4);\r
+        Offset    = Offset + OptionLen;\r
+        break;\r
 \r
+      case IP6_NO_NEXT_HEADER:\r
+        *LastHeader = NextHeader;\r
         return FALSE;\r
-      }\r
+        break;\r
 \r
-      break;\r
+      default:\r
+        if (Ip6IsValidProtocol (IpSb, *NextHeader)) {\r
+          *LastHeader = NextHeader;\r
 \r
-    case IP6_FRAGMENT:\r
+          if (RealExtsLen != NULL) {\r
+            *RealExtsLen = Offset;\r
+          }\r
 \r
-      //\r
-      // RFC2402, AH header should after fragment header.\r
-      //\r
-      if (CountA > 1) {\r
-        return FALSE;\r
-      }\r
+          return TRUE;\r
+        }\r
 \r
-      //\r
-      // RFC2460, ICMP Parameter Problem message with code 0 should be sent\r
-      // if the length of a fragment is not a multiple of 8 octets and the M\r
-      // flag of that fragment is 1, pointing to the Payload length field of the\r
-      // fragment packet.\r
-      //\r
-      if (IpSb != NULL && Packet != NULL && (ExtHdrsLen % 8) != 0) {\r
         //\r
-        // Check whether it is the last fragment.\r
+        // The Next Header value is unrecognized by the node, discard the packet and\r
+        // send an ICMP parameter problem message with code value of 1.\r
         //\r
-        FragmentHead = (IP6_FRAGMENT_HEADER *) (ExtHdrs + Offset);\r
-        if (FragmentHead == NULL) {\r
-          return FALSE;\r
+        if (Offset == 0) {\r
+          //\r
+          // The Next Header directly follows IPv6 basic header.\r
+          //\r
+          Pointer = 6;\r
+        } else {\r
+          if (Pointer == 0) {\r
+            Pointer = sizeof (EFI_IP6_HEADER);\r
+          } else {\r
+            Pointer = Offset + sizeof (EFI_IP6_HEADER);\r
+          }\r
         }\r
 \r
-        FragmentOffset = NTOHS (FragmentHead->FragmentOffset);\r
-\r
-        if (((FragmentOffset & 0x1) == 0x1) &&\r
-            !IP6_IS_MULTICAST (&Packet->Ip.Ip6->DestinationAddress)) {\r
-          Pointer = sizeof (UINT32);\r
+        if ((IpSb != NULL) && (Packet != NULL) &&\r
+            !IP6_IS_MULTICAST (&Packet->Ip.Ip6->DestinationAddress))\r
+        {\r
           Ip6SendIcmpError (\r
             IpSb,\r
             Packet,\r
             NULL,\r
             &Packet->Ip.Ip6->SourceAddress,\r
             ICMP_V6_PARAMETER_PROBLEM,\r
-            0,\r
+            1,\r
             &Pointer\r
             );\r
-          return FALSE;\r
         }\r
-      }\r
-\r
-      if (Fragmented != NULL) {\r
-        *Fragmented = TRUE;\r
-      }\r
 \r
-      if (Rcvd && FormerHeader != NULL) {\r
-        *FormerHeader = (UINT32) (NextHeader - ExtHdrs);\r
-      }\r
-\r
-      NextHeader = ExtHdrs + Offset;\r
-      Offset     = Offset + 8;\r
-      break;\r
-\r
-    case IP6_AH:\r
-      if (++CountA > 1) {\r
         return FALSE;\r
-      }\r
-\r
-      Option     = ExtHdrs + Offset;\r
-      NextHeader = Option;\r
-      Option++;\r
-      //\r
-      // RFC2402, Payload length is specified in 32-bit words, minus "2".\r
-      //\r
-      OptionLen  = (UINT8) ((*Option + 2) * 4);\r
-      Offset     = Offset + OptionLen;\r
-      break;\r
-\r
-    case IP6_NO_NEXT_HEADER:\r
-      *LastHeader = NextHeader;\r
-      return FALSE;\r
-      break;\r
-\r
-    default:\r
-      if (Ip6IsValidProtocol (IpSb, *NextHeader)) {\r
-\r
-        *LastHeader = NextHeader;\r
-\r
-        if (RealExtsLen != NULL) {\r
-          *RealExtsLen = Offset;\r
-        }\r
-\r
-        return TRUE;\r
-      }\r
-\r
-      //\r
-      // The Next Header value is unrecognized by the node, discard the packet and\r
-      // send an ICMP parameter problem message with code value of 1.\r
-      //\r
-      if (Offset == 0) {\r
-        //\r
-        // The Next Header directly follows IPv6 basic header.\r
-        //\r
-        Pointer = 6;\r
-      } else {\r
-        if (Pointer == 0) {\r
-          Pointer = sizeof (EFI_IP6_HEADER);\r
-        } else {\r
-          Pointer = Offset + sizeof (EFI_IP6_HEADER);\r
-        }\r
-      }\r
-\r
-      if ((IpSb != NULL) && (Packet != NULL) &&\r
-          !IP6_IS_MULTICAST (&Packet->Ip.Ip6->DestinationAddress)) {\r
-        Ip6SendIcmpError (\r
-          IpSb,\r
-          Packet,\r
-          NULL,\r
-          &Packet->Ip.Ip6->SourceAddress,\r
-          ICMP_V6_PARAMETER_PROBLEM,\r
-          1,\r
-          &Pointer\r
-          );\r
-      }\r
-      return FALSE;\r
     }\r
   }\r
 \r
@@ -592,12 +599,12 @@ Ip6IsExtsValid (
 **/\r
 EFI_STATUS\r
 Ip6FillHopByHop (\r
-  OUT UINT8                  *Buffer,\r
-  IN OUT UINTN               *BufferLen,\r
-  IN UINT8                   NextHeader\r
+  OUT UINT8     *Buffer,\r
+  IN OUT UINTN  *BufferLen,\r
+  IN UINT8      NextHeader\r
   )\r
 {\r
-  UINT8                      BufferArray[8];\r
+  UINT8  BufferArray[8];\r
 \r
   if (*BufferLen < 8) {\r
     *BufferLen = 8;\r
@@ -640,23 +647,23 @@ Ip6FillHopByHop (
 **/\r
 EFI_STATUS\r
 Ip6FillFragmentHeader (\r
-  IN  IP6_SERVICE           *IpSb,\r
-  IN  UINT8                 NextHeader,\r
-  IN  UINT8                 LastHeader,\r
-  IN  UINT8                 *ExtHdrs,\r
-  IN  UINT32                ExtHdrsLen,\r
-  IN  UINT16                FragmentOffset,\r
-  OUT UINT8                 **UpdatedExtHdrs\r
+  IN  IP6_SERVICE  *IpSb,\r
+  IN  UINT8        NextHeader,\r
+  IN  UINT8        LastHeader,\r
+  IN  UINT8        *ExtHdrs,\r
+  IN  UINT32       ExtHdrsLen,\r
+  IN  UINT16       FragmentOffset,\r
+  OUT UINT8        **UpdatedExtHdrs\r
   )\r
 {\r
-  UINT32                    Length;\r
-  UINT8                     *Buffer;\r
-  UINT32                    FormerHeader;\r
-  UINT32                    Offset;\r
-  UINT32                    Part1Len;\r
-  UINT32                    HeaderLen;\r
-  UINT8                     Current;\r
-  IP6_FRAGMENT_HEADER       FragmentHead;\r
+  UINT32               Length;\r
+  UINT8                *Buffer;\r
+  UINT32               FormerHeader;\r
+  UINT32               Offset;\r
+  UINT32               Part1Len;\r
+  UINT32               HeaderLen;\r
+  UINT8                Current;\r
+  IP6_FRAGMENT_HEADER  FragmentHead;\r
 \r
   if (UpdatedExtHdrs == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -668,82 +675,81 @@ Ip6FillFragmentHeader (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Offset         = 0;\r
-  Part1Len       = 0;\r
-  FormerHeader   = 0;\r
-  Current        = NextHeader;\r
+  Offset       = 0;\r
+  Part1Len     = 0;\r
+  FormerHeader = 0;\r
+  Current      = NextHeader;\r
 \r
   while ((ExtHdrs != NULL) && (Offset <= ExtHdrsLen)) {\r
     switch (NextHeader) {\r
-    case IP6_ROUTING:\r
-    case IP6_HOP_BY_HOP:\r
-    case IP6_DESTINATION:\r
-      Current      = NextHeader;\r
-      NextHeader   = *(ExtHdrs + Offset);\r
+      case IP6_ROUTING:\r
+      case IP6_HOP_BY_HOP:\r
+      case IP6_DESTINATION:\r
+        Current    = NextHeader;\r
+        NextHeader = *(ExtHdrs + Offset);\r
+\r
+        if ((Current == IP6_DESTINATION) && (NextHeader != IP6_ROUTING)) {\r
+          //\r
+          // Destination Options header should occur at most twice, once before\r
+          // a Routing header and once before the upper-layer header. Here we\r
+          // find the one before the upper-layer header. Insert the Fragment\r
+          // Header before it.\r
+          //\r
+          CopyMem (Buffer, ExtHdrs, Part1Len);\r
+          *(Buffer + FormerHeader) = IP6_FRAGMENT;\r
+          //\r
+          // Exit the loop.\r
+          //\r
+          Offset = ExtHdrsLen + 1;\r
+          break;\r
+        }\r
 \r
-      if ((Current == IP6_DESTINATION) && (NextHeader != IP6_ROUTING)) {\r
-        //\r
-        // Destination Options header should occur at most twice, once before\r
-        // a Routing header and once before the upper-layer header. Here we\r
-        // find the one before the upper-layer header. Insert the Fragment\r
-        // Header before it.\r
-        //\r
-        CopyMem (Buffer, ExtHdrs, Part1Len);\r
-        *(Buffer + FormerHeader) = IP6_FRAGMENT;\r
-        //\r
-        // Exit the loop.\r
-        //\r
-        Offset = ExtHdrsLen + 1;\r
+        FormerHeader = Offset;\r
+        HeaderLen    = (*(ExtHdrs + Offset + 1) + 1) * 8;\r
+        Part1Len     = Part1Len + HeaderLen;\r
+        Offset       = Offset + HeaderLen;\r
         break;\r
-      }\r
-\r
 \r
-      FormerHeader = Offset;\r
-      HeaderLen    = (*(ExtHdrs + Offset + 1) + 1) * 8;\r
-      Part1Len     = Part1Len + HeaderLen;\r
-      Offset       = Offset + HeaderLen;\r
-      break;\r
-\r
-    case IP6_FRAGMENT:\r
-      Current    = NextHeader;\r
-\r
-      if (Part1Len != 0) {\r
-        CopyMem (Buffer, ExtHdrs, Part1Len);\r
-      }\r
-\r
-      *(Buffer + FormerHeader) = IP6_FRAGMENT;\r
-\r
-      //\r
-      // Exit the loop.\r
-      //\r
-      Offset = ExtHdrsLen + 1;\r
-      break;\r
+      case IP6_FRAGMENT:\r
+        Current = NextHeader;\r
 \r
-    case IP6_AH:\r
-      Current    = NextHeader;\r
-      NextHeader = *(ExtHdrs + Offset);\r
-      //\r
-      // RFC2402, Payload length is specified in 32-bit words, minus "2".\r
-      //\r
-      HeaderLen  = (*(ExtHdrs + Offset + 1) + 2) * 4;\r
-      Part1Len   = Part1Len + HeaderLen;\r
-      Offset     = Offset + HeaderLen;\r
-      break;\r
+        if (Part1Len != 0) {\r
+          CopyMem (Buffer, ExtHdrs, Part1Len);\r
+        }\r
 \r
-    default:\r
-      if (Ip6IsValidProtocol (IpSb, NextHeader)) {\r
-        Current = NextHeader;\r
-        CopyMem (Buffer, ExtHdrs, Part1Len);\r
         *(Buffer + FormerHeader) = IP6_FRAGMENT;\r
+\r
         //\r
         // Exit the loop.\r
         //\r
         Offset = ExtHdrsLen + 1;\r
         break;\r
-      }\r
 \r
-      FreePool (Buffer);\r
-      return EFI_UNSUPPORTED;\r
+      case IP6_AH:\r
+        Current    = NextHeader;\r
+        NextHeader = *(ExtHdrs + Offset);\r
+        //\r
+        // RFC2402, Payload length is specified in 32-bit words, minus "2".\r
+        //\r
+        HeaderLen = (*(ExtHdrs + Offset + 1) + 2) * 4;\r
+        Part1Len  = Part1Len + HeaderLen;\r
+        Offset    = Offset + HeaderLen;\r
+        break;\r
+\r
+      default:\r
+        if (Ip6IsValidProtocol (IpSb, NextHeader)) {\r
+          Current = NextHeader;\r
+          CopyMem (Buffer, ExtHdrs, Part1Len);\r
+          *(Buffer + FormerHeader) = IP6_FRAGMENT;\r
+          //\r
+          // Exit the loop.\r
+          //\r
+          Offset = ExtHdrsLen + 1;\r
+          break;\r
+        }\r
+\r
+        FreePool (Buffer);\r
+        return EFI_UNSUPPORTED;\r
     }\r
   }\r
 \r
@@ -778,4 +784,3 @@ Ip6FillFragmentHeader (
 \r
   return EFI_SUCCESS;\r
 }\r
-\r
index c81b3fda2fec05060f282a78d14c3956cdf6730b..bd8e223c8a676eded4a6cfa962f59c2fa5e81fb1 100644 (file)
 #ifndef __EFI_IP6_OPTION_H__\r
 #define __EFI_IP6_OPTION_H__\r
 \r
-#define IP6_FRAGMENT_OFFSET_MASK (~0x3)\r
+#define IP6_FRAGMENT_OFFSET_MASK  (~0x3)\r
 \r
 typedef struct _IP6_FRAGMENT_HEADER {\r
-  UINT8                     NextHeader;\r
-  UINT8                     Reserved;\r
-  UINT16                    FragmentOffset;\r
-  UINT32                    Identification;\r
+  UINT8     NextHeader;\r
+  UINT8     Reserved;\r
+  UINT16    FragmentOffset;\r
+  UINT32    Identification;\r
 } IP6_FRAGMENT_HEADER;\r
 \r
 typedef struct _IP6_ROUTING_HEADER {\r
-  UINT8                     NextHeader;\r
-  UINT8                     HeaderLen;\r
-  UINT8                     RoutingType;\r
-  UINT8                     SegmentsLeft;\r
+  UINT8    NextHeader;\r
+  UINT8    HeaderLen;\r
+  UINT8    RoutingType;\r
+  UINT8    SegmentsLeft;\r
 } IP6_ROUTING_HEADER;\r
 \r
 typedef enum {\r
@@ -35,11 +35,11 @@ typedef enum {
   Ip6OptionParameterProblem = 0x80,\r
   Ip6OptionMask             = 0xc0,\r
 \r
-  Ip6OptionEtherSource      = 1,\r
-  Ip6OptionEtherTarget      = 2,\r
-  Ip6OptionPrefixInfo       = 3,\r
-  Ip6OptionRedirected       = 4,\r
-  Ip6OptionMtu              = 5\r
+  Ip6OptionEtherSource = 1,\r
+  Ip6OptionEtherTarget = 2,\r
+  Ip6OptionPrefixInfo  = 3,\r
+  Ip6OptionRedirected  = 4,\r
+  Ip6OptionMtu         = 5\r
 } IP6_OPTION_TYPE;\r
 \r
 /**\r
@@ -72,17 +72,17 @@ typedef enum {
 **/\r
 BOOLEAN\r
 Ip6IsExtsValid (\r
-  IN IP6_SERVICE            *IpSb           OPTIONAL,\r
-  IN NET_BUF                *Packet         OPTIONAL,\r
-  IN UINT8                  *NextHeader,\r
-  IN UINT8                  *ExtHdrs,\r
-  IN UINT32                 ExtHdrsLen,\r
-  IN BOOLEAN                Rcvd,\r
-  OUT UINT32                *FormerHeader   OPTIONAL,\r
-  OUT UINT8                 **LastHeader,\r
-  OUT UINT32                *RealExtsLen    OPTIONAL,\r
-  OUT UINT32                *UnFragmentLen  OPTIONAL,\r
-  OUT BOOLEAN               *Fragmented     OPTIONAL\r
+  IN IP6_SERVICE  *IpSb           OPTIONAL,\r
+  IN NET_BUF      *Packet         OPTIONAL,\r
+  IN UINT8        *NextHeader,\r
+  IN UINT8        *ExtHdrs,\r
+  IN UINT32       ExtHdrsLen,\r
+  IN BOOLEAN      Rcvd,\r
+  OUT UINT32      *FormerHeader   OPTIONAL,\r
+  OUT UINT8       **LastHeader,\r
+  OUT UINT32      *RealExtsLen    OPTIONAL,\r
+  OUT UINT32      *UnFragmentLen  OPTIONAL,\r
+  OUT BOOLEAN     *Fragmented     OPTIONAL\r
   );\r
 \r
 /**\r
@@ -101,9 +101,9 @@ Ip6IsExtsValid (
 **/\r
 EFI_STATUS\r
 Ip6FillHopByHop (\r
-  OUT UINT8                  *Buffer,\r
-  IN OUT UINTN               *BufferLen,\r
-  IN UINT8                   NextHeader\r
+  OUT UINT8     *Buffer,\r
+  IN OUT UINTN  *BufferLen,\r
+  IN UINT8      NextHeader\r
   );\r
 \r
 /**\r
@@ -127,13 +127,13 @@ Ip6FillHopByHop (
 **/\r
 EFI_STATUS\r
 Ip6FillFragmentHeader (\r
-  IN  IP6_SERVICE           *IpSb,\r
-  IN  UINT8                 NextHeader,\r
-  IN  UINT8                 LastHeader,\r
-  IN  UINT8                 *ExtHdrs,\r
-  IN  UINT32                ExtHdrsLen,\r
-  IN  UINT16                FragmentOffset,\r
-  OUT UINT8                 **UpdatedExtHdrs\r
+  IN  IP6_SERVICE  *IpSb,\r
+  IN  UINT8        NextHeader,\r
+  IN  UINT8        LastHeader,\r
+  IN  UINT8        *ExtHdrs,\r
+  IN  UINT32       ExtHdrsLen,\r
+  IN  UINT16       FragmentOffset,\r
+  OUT UINT8        **UpdatedExtHdrs\r
   );\r
 \r
 /**\r
@@ -155,13 +155,13 @@ Ip6FillFragmentHeader (
 **/\r
 EFI_STATUS\r
 Ip6CopyExts (\r
-  IN UINT8                  NextHeader,\r
-  IN UINT8                  *ExtHdrs,\r
-  IN UINT8                  *LastHeader,\r
-  IN UINT16                 FragmentOffset,\r
-  IN UINT32                 UnFragmentHdrLen,\r
-  IN OUT UINT8              *Buf,\r
-  IN OUT UINT32             *BufLen\r
+  IN UINT8       NextHeader,\r
+  IN UINT8       *ExtHdrs,\r
+  IN UINT8       *LastHeader,\r
+  IN UINT16      FragmentOffset,\r
+  IN UINT32      UnFragmentHdrLen,\r
+  IN OUT UINT8   *Buf,\r
+  IN OUT UINT32  *BufLen\r
   );\r
 \r
 /**\r
@@ -178,8 +178,8 @@ Ip6CopyExts (
 **/\r
 BOOLEAN\r
 Ip6IsNDOptionValid (\r
-  IN UINT8                  *Option,\r
-  IN UINT16                 OptionLen\r
+  IN UINT8   *Option,\r
+  IN UINT16  OptionLen\r
   );\r
 \r
 #endif\r
index 2a2eae4b854f4f58934941c212a14440664af419..9a100f1c720cd80d4156694d10cb321c96d2573f 100644 (file)
@@ -9,7 +9,7 @@
 \r
 #include "Ip6Impl.h"\r
 \r
-UINT32 mIp6Id;\r
+UINT32  mIp6Id;\r
 \r
 /**\r
   Output all the available source addresses to a list entry head SourceList. The\r
@@ -28,16 +28,16 @@ UINT32 mIp6Id;
 **/\r
 EFI_STATUS\r
 Ip6CandidateSource (\r
-  IN IP6_SERVICE            *IpSb,\r
-  OUT LIST_ENTRY            *SourceList,\r
-  OUT UINT32                *SourceCount\r
+  IN IP6_SERVICE  *IpSb,\r
+  OUT LIST_ENTRY  *SourceList,\r
+  OUT UINT32      *SourceCount\r
   )\r
 {\r
-  IP6_INTERFACE             *IpIf;\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Entry2;\r
-  IP6_ADDRESS_INFO          *AddrInfo;\r
-  IP6_ADDRESS_INFO          *Copy;\r
+  IP6_INTERFACE     *IpIf;\r
+  LIST_ENTRY        *Entry;\r
+  LIST_ENTRY        *Entry2;\r
+  IP6_ADDRESS_INFO  *AddrInfo;\r
+  IP6_ADDRESS_INFO  *Copy;\r
 \r
   *SourceCount = 0;\r
 \r
@@ -47,12 +47,12 @@ Ip6CandidateSource (
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
-    Copy->Signature         = IP6_ADDR_INFO_SIGNATURE;\r
+    Copy->Signature = IP6_ADDR_INFO_SIGNATURE;\r
     IP6_COPY_ADDRESS (&Copy->Address, &IpSb->LinkLocalAddr);\r
     Copy->IsAnycast         = FALSE;\r
     Copy->PrefixLength      = IP6_LINK_LOCAL_PREFIX_LENGTH;\r
-    Copy->ValidLifetime     = (UINT32) IP6_INFINIT_LIFETIME;\r
-    Copy->PreferredLifetime = (UINT32) IP6_INFINIT_LIFETIME;\r
+    Copy->ValidLifetime     = (UINT32)IP6_INFINIT_LIFETIME;\r
+    Copy->PreferredLifetime = (UINT32)IP6_INFINIT_LIFETIME;\r
 \r
     InsertTailList (SourceList, &Copy->Link);\r
     (*SourceCount)++;\r
@@ -95,15 +95,15 @@ Ip6CandidateSource (
 **/\r
 UINT8\r
 Ip6CommonPrefixLen (\r
-  IN EFI_IPv6_ADDRESS       *AddressA,\r
-  IN EFI_IPv6_ADDRESS       *AddressB\r
+  IN EFI_IPv6_ADDRESS  *AddressA,\r
+  IN EFI_IPv6_ADDRESS  *AddressB\r
   )\r
 {\r
-  UINT8                     Count;\r
-  UINT8                     Index;\r
-  UINT8                     ByteA;\r
-  UINT8                     ByteB;\r
-  UINT8                     NumBits;\r
+  UINT8  Count;\r
+  UINT8  Index;\r
+  UINT8  ByteA;\r
+  UINT8  ByteB;\r
+  UINT8  NumBits;\r
 \r
   Count = 0;\r
   Index = 0;\r
@@ -122,14 +122,14 @@ Ip6CommonPrefixLen (
     // Check how many bits are common between the two bytes.\r
     //\r
     NumBits = 8;\r
-    ByteA   = (UINT8) (ByteA ^ ByteB);\r
+    ByteA   = (UINT8)(ByteA ^ ByteB);\r
 \r
     while (ByteA != 0) {\r
       NumBits--;\r
-      ByteA = (UINT8) (ByteA >> 1);\r
+      ByteA = (UINT8)(ByteA >> 1);\r
     }\r
 \r
-    return (UINT8) (Count + NumBits);\r
+    return (UINT8)(Count + NumBits);\r
   }\r
 \r
   return Count;\r
@@ -151,21 +151,21 @@ Ip6CommonPrefixLen (
 **/\r
 EFI_STATUS\r
 Ip6SelectSourceAddress (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *Destination,\r
-  OUT EFI_IPv6_ADDRESS      *Source\r
+  IN IP6_SERVICE        *IpSb,\r
+  IN EFI_IPv6_ADDRESS   *Destination,\r
+  OUT EFI_IPv6_ADDRESS  *Source\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  LIST_ENTRY                SourceList;\r
-  UINT32                    SourceCount;\r
-  UINT8                     ScopeD;\r
-  LIST_ENTRY                *Entry;\r
-  IP6_ADDRESS_INFO          *AddrInfo;\r
-  IP6_PREFIX_LIST_ENTRY     *Prefix;\r
-  UINT8                     LastCommonLength;\r
-  UINT8                     CurrentCommonLength;\r
-  EFI_IPv6_ADDRESS          *TmpAddress;\r
+  EFI_STATUS             Status;\r
+  LIST_ENTRY             SourceList;\r
+  UINT32                 SourceCount;\r
+  UINT8                  ScopeD;\r
+  LIST_ENTRY             *Entry;\r
+  IP6_ADDRESS_INFO       *AddrInfo;\r
+  IP6_PREFIX_LIST_ENTRY  *Prefix;\r
+  UINT8                  LastCommonLength;\r
+  UINT8                  CurrentCommonLength;\r
+  EFI_IPv6_ADDRESS       *TmpAddress;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
 \r
@@ -188,7 +188,7 @@ Ip6SelectSourceAddress (
   // Rule 2: Prefer appropriate scope.\r
   //\r
   if (IP6_IS_MULTICAST (Destination)) {\r
-    ScopeD = (UINT8) (Destination->Addr[1] >> 4);\r
+    ScopeD = (UINT8)(Destination->Addr[1] >> 4);\r
   } else if (NetIp6IsLinkLocalAddr (Destination)) {\r
     ScopeD = 0x2;\r
   } else {\r
@@ -284,15 +284,15 @@ Exit:
 **/\r
 IP6_INTERFACE *\r
 Ip6SelectInterface (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *Destination,\r
-  IN OUT EFI_IPv6_ADDRESS   *Source\r
+  IN IP6_SERVICE           *IpSb,\r
+  IN EFI_IPv6_ADDRESS      *Destination,\r
+  IN OUT EFI_IPv6_ADDRESS  *Source\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_IPv6_ADDRESS          SelectedSource;\r
-  IP6_INTERFACE             *IpIf;\r
-  BOOLEAN                   Exist;\r
+  EFI_STATUS        Status;\r
+  EFI_IPv6_ADDRESS  SelectedSource;\r
+  IP6_INTERFACE     *IpIf;\r
+  BOOLEAN           Exist;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
   ASSERT (Destination != NULL && Source != NULL);\r
@@ -335,10 +335,10 @@ Ip6SelectInterface (
 **/\r
 VOID\r
 Ip6SysPacketSent (\r
-  NET_BUF                   *Packet,\r
-  EFI_STATUS                IoStatus,\r
-  UINT32                    LinkFlag,\r
-  VOID                      *Context\r
+  NET_BUF     *Packet,\r
+  EFI_STATUS  IoStatus,\r
+  UINT32      LinkFlag,\r
+  VOID        *Context\r
   )\r
 {\r
   NetbufFree (Packet);\r
@@ -365,22 +365,22 @@ Ip6SysPacketSent (
 **/\r
 EFI_STATUS\r
 Ip6PrependHead (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN NET_BUF                *Packet,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN UINT16                 FragmentOffset,\r
-  IN UINT8                  *ExtHdrs,\r
-  IN UINT32                 ExtHdrsLen,\r
-  IN UINT8                  LastHeader,\r
-  IN UINT32                 HeadLen\r
+  IN IP6_SERVICE     *IpSb,\r
+  IN NET_BUF         *Packet,\r
+  IN EFI_IP6_HEADER  *Head,\r
+  IN UINT16          FragmentOffset,\r
+  IN UINT8           *ExtHdrs,\r
+  IN UINT32          ExtHdrsLen,\r
+  IN UINT8           LastHeader,\r
+  IN UINT32          HeadLen\r
   )\r
 {\r
-  UINT32                    Len;\r
-  UINT32                    UnFragExtHdrsLen;\r
-  EFI_IP6_HEADER            *PacketHead;\r
-  UINT8                     *UpdatedExtHdrs;\r
-  EFI_STATUS                Status;\r
-  UINT8                     NextHeader;\r
+  UINT32          Len;\r
+  UINT32          UnFragExtHdrsLen;\r
+  EFI_IP6_HEADER  *PacketHead;\r
+  UINT8           *UpdatedExtHdrs;\r
+  EFI_STATUS      Status;\r
+  UINT8           NextHeader;\r
 \r
   UpdatedExtHdrs = NULL;\r
 \r
@@ -388,7 +388,7 @@ Ip6PrependHead (
   // HeadLen is the length of the fixed part of the sequences of fragments, i.e.\r
   // the unfragment part.\r
   //\r
-  PacketHead = (EFI_IP6_HEADER *) NetbufAllocSpace (Packet, HeadLen, NET_BUF_HEAD);\r
+  PacketHead = (EFI_IP6_HEADER *)NetbufAllocSpace (Packet, HeadLen, NET_BUF_HEAD);\r
   if (PacketHead == NULL) {\r
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
@@ -397,7 +397,7 @@ Ip6PrependHead (
   // Set the head up, convert the host byte order to network byte order\r
   //\r
   CopyMem (PacketHead, Head, sizeof (EFI_IP6_HEADER));\r
-  PacketHead->PayloadLength = HTONS ((UINT16) (Packet->TotalSize - sizeof (EFI_IP6_HEADER)));\r
+  PacketHead->PayloadLength = HTONS ((UINT16)(Packet->TotalSize - sizeof (EFI_IP6_HEADER)));\r
   Packet->Ip.Ip6            = PacketHead;\r
 \r
   Len              = HeadLen - sizeof (EFI_IP6_HEADER);\r
@@ -431,7 +431,7 @@ Ip6PrependHead (
   }\r
 \r
   CopyMem (\r
-    (UINT8 *) (PacketHead + 1),\r
+    (UINT8 *)(PacketHead + 1),\r
     UpdatedExtHdrs,\r
     UnFragExtHdrsLen + sizeof (IP6_FRAGMENT_HEADER)\r
     );\r
@@ -474,52 +474,52 @@ Ip6PrependHead (
 **/\r
 EFI_STATUS\r
 Ip6Output (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN IP6_INTERFACE          *Interface   OPTIONAL,\r
-  IN IP6_PROTOCOL           *IpInstance  OPTIONAL,\r
-  IN NET_BUF                *Packet,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN UINT8                  *ExtHdrs,\r
-  IN UINT32                 ExtHdrsLen,\r
-  IN IP6_FRAME_CALLBACK     Callback,\r
-  IN VOID                   *Context\r
+  IN IP6_SERVICE         *IpSb,\r
+  IN IP6_INTERFACE       *Interface   OPTIONAL,\r
+  IN IP6_PROTOCOL        *IpInstance  OPTIONAL,\r
+  IN NET_BUF             *Packet,\r
+  IN EFI_IP6_HEADER      *Head,\r
+  IN UINT8               *ExtHdrs,\r
+  IN UINT32              ExtHdrsLen,\r
+  IN IP6_FRAME_CALLBACK  Callback,\r
+  IN VOID                *Context\r
   )\r
 {\r
-  IP6_INTERFACE             *IpIf;\r
-  EFI_IPv6_ADDRESS          NextHop;\r
-  IP6_NEIGHBOR_ENTRY        *NeighborCache;\r
-  IP6_ROUTE_CACHE_ENTRY     *RouteCache;\r
-  EFI_STATUS                Status;\r
-  UINT32                    Mtu;\r
-  UINT32                    HeadLen;\r
-  UINT16                    FragmentOffset;\r
-  UINT8                     *LastHeader;\r
-  UINT32                    UnFragmentLen;\r
-  UINT32                    UnFragmentHdrsLen;\r
-  UINT32                    FragmentHdrsLen;\r
-  UINT16                    *Checksum;\r
-  UINT16                    PacketChecksum;\r
-  UINT16                    PseudoChecksum;\r
-  UINT32                    Index;\r
-  UINT32                    PacketLen;\r
-  UINT32                    RealExtLen;\r
-  UINT32                    Offset;\r
-  NET_BUF                   *TmpPacket;\r
-  NET_BUF                   *Fragment;\r
-  UINT32                    Num;\r
-  UINT8                     *Buf;\r
-  EFI_IP6_HEADER            *PacketHead;\r
-  IP6_ICMP_HEAD             *IcmpHead;\r
-  IP6_TXTOKEN_WRAP          *Wrap;\r
-  IP6_ROUTE_ENTRY           *RouteEntry;\r
-  UINT8                     *UpdatedExtHdrs;\r
-  UINT8                     NextHeader;\r
-  UINT8                     LastHeaderBackup;\r
-  BOOLEAN                   FragmentHeadInserted;\r
-  UINT8                     *ExtHdrsBackup;\r
-  UINT8                     NextHeaderBackup;\r
-  EFI_IPv6_ADDRESS          Source;\r
-  EFI_IPv6_ADDRESS          Destination;\r
+  IP6_INTERFACE          *IpIf;\r
+  EFI_IPv6_ADDRESS       NextHop;\r
+  IP6_NEIGHBOR_ENTRY     *NeighborCache;\r
+  IP6_ROUTE_CACHE_ENTRY  *RouteCache;\r
+  EFI_STATUS             Status;\r
+  UINT32                 Mtu;\r
+  UINT32                 HeadLen;\r
+  UINT16                 FragmentOffset;\r
+  UINT8                  *LastHeader;\r
+  UINT32                 UnFragmentLen;\r
+  UINT32                 UnFragmentHdrsLen;\r
+  UINT32                 FragmentHdrsLen;\r
+  UINT16                 *Checksum;\r
+  UINT16                 PacketChecksum;\r
+  UINT16                 PseudoChecksum;\r
+  UINT32                 Index;\r
+  UINT32                 PacketLen;\r
+  UINT32                 RealExtLen;\r
+  UINT32                 Offset;\r
+  NET_BUF                *TmpPacket;\r
+  NET_BUF                *Fragment;\r
+  UINT32                 Num;\r
+  UINT8                  *Buf;\r
+  EFI_IP6_HEADER         *PacketHead;\r
+  IP6_ICMP_HEAD          *IcmpHead;\r
+  IP6_TXTOKEN_WRAP       *Wrap;\r
+  IP6_ROUTE_ENTRY        *RouteEntry;\r
+  UINT8                  *UpdatedExtHdrs;\r
+  UINT8                  NextHeader;\r
+  UINT8                  LastHeaderBackup;\r
+  BOOLEAN                FragmentHeadInserted;\r
+  UINT8                  *ExtHdrsBackup;\r
+  UINT8                  NextHeaderBackup;\r
+  EFI_IPv6_ADDRESS       Source;\r
+  EFI_IPv6_ADDRESS       Destination;\r
 \r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
 \r
@@ -557,7 +557,7 @@ Ip6Output (
     // IpInstance->Interface is NULL when IpInstance is configured with both stationaddress\r
     // and destinationaddress is unspecified.\r
     //\r
-    if (IpInstance == NULL || IpInstance->Interface == NULL) {\r
+    if ((IpInstance == NULL) || (IpInstance->Interface == NULL)) {\r
       IpIf = Ip6SelectInterface (IpSb, &Head->DestinationAddress, &Head->SourceAddress);\r
       if (IpInstance != NULL) {\r
         IpInstance->Interface = IpIf;\r
@@ -578,43 +578,46 @@ Ip6Output (
   Head->TrafficClassL = 0;\r
   Head->TrafficClassH = 0;\r
 \r
-  Checksum            = NULL;\r
-  NextHeader          = *LastHeader;\r
+  Checksum   = NULL;\r
+  NextHeader = *LastHeader;\r
 \r
   switch (NextHeader) {\r
-  case EFI_IP_PROTO_UDP:\r
-    Packet->Udp = (EFI_UDP_HEADER *) NetbufGetByte (Packet, 0, NULL);\r
-    ASSERT (Packet->Udp != NULL);\r
-    if (Packet->Udp->Checksum == 0) {\r
-      Checksum = &Packet->Udp->Checksum;\r
-    }\r
-    break;\r
+    case EFI_IP_PROTO_UDP:\r
+      Packet->Udp = (EFI_UDP_HEADER *)NetbufGetByte (Packet, 0, NULL);\r
+      ASSERT (Packet->Udp != NULL);\r
+      if (Packet->Udp->Checksum == 0) {\r
+        Checksum = &Packet->Udp->Checksum;\r
+      }\r
 \r
-  case EFI_IP_PROTO_TCP:\r
-    Packet->Tcp = (TCP_HEAD *) NetbufGetByte (Packet, 0, NULL);\r
-    ASSERT (Packet->Tcp != NULL);\r
-    if (Packet->Tcp->Checksum == 0) {\r
-      Checksum = &Packet->Tcp->Checksum;\r
-    }\r
-    break;\r
+      break;\r
 \r
-  case IP6_ICMP:\r
-    //\r
-    // Don't send ICMP packet to an IPv6 anycast address.\r
-    //\r
-    if (Ip6IsAnycast (IpSb, &Head->DestinationAddress)) {\r
-      return EFI_INVALID_PARAMETER;\r
-    }\r
+    case EFI_IP_PROTO_TCP:\r
+      Packet->Tcp = (TCP_HEAD *)NetbufGetByte (Packet, 0, NULL);\r
+      ASSERT (Packet->Tcp != NULL);\r
+      if (Packet->Tcp->Checksum == 0) {\r
+        Checksum = &Packet->Tcp->Checksum;\r
+      }\r
 \r
-    IcmpHead = (IP6_ICMP_HEAD *) NetbufGetByte (Packet, 0, NULL);\r
-    ASSERT (IcmpHead != NULL);\r
-    if (IcmpHead->Checksum == 0) {\r
-      Checksum = &IcmpHead->Checksum;\r
-    }\r
-    break;\r
+      break;\r
 \r
-  default:\r
-    break;\r
+    case IP6_ICMP:\r
+      //\r
+      // Don't send ICMP packet to an IPv6 anycast address.\r
+      //\r
+      if (Ip6IsAnycast (IpSb, &Head->DestinationAddress)) {\r
+        return EFI_INVALID_PARAMETER;\r
+      }\r
+\r
+      IcmpHead = (IP6_ICMP_HEAD *)NetbufGetByte (Packet, 0, NULL);\r
+      ASSERT (IcmpHead != NULL);\r
+      if (IcmpHead->Checksum == 0) {\r
+        Checksum = &IcmpHead->Checksum;\r
+      }\r
+\r
+      break;\r
+\r
+    default:\r
+      break;\r
   }\r
 \r
   if (Checksum != NULL) {\r
@@ -624,11 +627,11 @@ Ip6Output (
     //\r
     PacketChecksum = NetbufChecksum (Packet);\r
     PseudoChecksum = NetIp6PseudoHeadChecksum (\r
-                      &Head->SourceAddress,\r
-                      &Head->DestinationAddress,\r
-                      NextHeader,\r
-                      Packet->TotalSize\r
-                      );\r
+                       &Head->SourceAddress,\r
+                       &Head->DestinationAddress,\r
+                       NextHeader,\r
+                       Packet->TotalSize\r
+                       );\r
     *Checksum = (UINT16) ~NetAddChecksum (PacketChecksum, PseudoChecksum);\r
   }\r
 \r
@@ -643,7 +646,7 @@ Ip6Output (
              Context\r
              );\r
 \r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
@@ -663,7 +666,8 @@ Ip6Output (
          &RealExtLen,\r
          &UnFragmentHdrsLen,\r
          NULL\r
-         )) {\r
+         ))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -762,7 +766,6 @@ Ip6Output (
                  );\r
   if (RouteEntry != NULL) {\r
     if ((RouteEntry->Flag & IP6_PACKET_TOO_BIG) == IP6_PACKET_TOO_BIG) {\r
-\r
       //\r
       // FragmentHead is inserted after Hop-by-Hop Options header, Destination\r
       // Options header (first occur), Routing header, and before Fragment header,\r
@@ -787,10 +790,10 @@ Ip6Output (
         Head->NextHeader = IP6_FRAGMENT;\r
       }\r
 \r
-      ExtHdrsBackup    = ExtHdrs;\r
-      ExtHdrs          = UpdatedExtHdrs;\r
-      ExtHdrsLen       = ExtHdrsLen + sizeof (IP6_FRAGMENT_HEADER);\r
-      RealExtLen       = RealExtLen + sizeof (IP6_FRAGMENT_HEADER);\r
+      ExtHdrsBackup = ExtHdrs;\r
+      ExtHdrs       = UpdatedExtHdrs;\r
+      ExtHdrsLen    = ExtHdrsLen + sizeof (IP6_FRAGMENT_HEADER);\r
+      RealExtLen    = RealExtLen + sizeof (IP6_FRAGMENT_HEADER);\r
 \r
       mIp6Id++;\r
 \r
@@ -879,8 +882,8 @@ Ip6Output (
         goto Error;\r
       }\r
 \r
-      FragmentOffset = (UINT16) ((UINT16) Offset | 0x1);\r
-      if (Index == Num - 1){\r
+      FragmentOffset = (UINT16)((UINT16)Offset | 0x1);\r
+      if (Index == Num - 1) {\r
         //\r
         // The last fragment, clear the M flag.\r
         //\r
@@ -915,11 +918,11 @@ Ip6Output (
       // The last fragment of upper layer packet, update the IP6 token status.\r
       //\r
       if ((Index == Num -1) && (Context != NULL)) {\r
-        Wrap                = (IP6_TXTOKEN_WRAP *) Context;\r
+        Wrap                = (IP6_TXTOKEN_WRAP *)Context;\r
         Wrap->Token->Status = Status;\r
       }\r
 \r
-      Offset    += PacketLen;\r
+      Offset   += PacketLen;\r
       PacketLen = Packet->TotalSize - Offset;\r
       if (PacketLen > Mtu) {\r
         PacketLen = Mtu;\r
@@ -939,7 +942,7 @@ Ip6Output (
   //\r
   // Need not fragment the packet, send it in one frame.\r
   //\r
-  PacketHead = (EFI_IP6_HEADER *) NetbufAllocSpace (Packet, HeadLen, NET_BUF_HEAD);\r
+  PacketHead = (EFI_IP6_HEADER *)NetbufAllocSpace (Packet, HeadLen, NET_BUF_HEAD);\r
   if (PacketHead == NULL) {\r
     Status = EFI_BAD_BUFFER_SIZE;\r
     goto Error;\r
@@ -949,7 +952,7 @@ Ip6Output (
   Packet->Ip.Ip6 = PacketHead;\r
 \r
   if (ExtHdrs != NULL) {\r
-    Buf = (UINT8 *) (PacketHead + 1);\r
+    Buf = (UINT8 *)(PacketHead + 1);\r
     CopyMem (Buf, ExtHdrs, ExtHdrsLen);\r
   }\r
 \r
@@ -957,8 +960,8 @@ Ip6Output (
     //\r
     // A Fragment Header is inserted to the packet, update the payload length.\r
     //\r
-    PacketHead->PayloadLength = (UINT16) (NTOHS (PacketHead->PayloadLength) +\r
-                                sizeof (IP6_FRAGMENT_HEADER));\r
+    PacketHead->PayloadLength = (UINT16)(NTOHS (PacketHead->PayloadLength) +\r
+                                         sizeof (IP6_FRAGMENT_HEADER));\r
     PacketHead->PayloadLength = HTONS (PacketHead->PayloadLength);\r
     FreePool (UpdatedExtHdrs);\r
   }\r
@@ -976,6 +979,7 @@ Error:
   if (UpdatedExtHdrs != NULL) {\r
     FreePool (UpdatedExtHdrs);\r
   }\r
+\r
   Ip6CancelPacket (IpIf, Packet, Status);\r
   return Status;\r
 }\r
@@ -993,11 +997,11 @@ Error:
 **/\r
 BOOLEAN\r
 Ip6CancelPacketFragments (\r
-  IN IP6_LINK_TX_TOKEN   *Frame,\r
-  IN VOID                *Context\r
+  IN IP6_LINK_TX_TOKEN  *Frame,\r
+  IN VOID               *Context\r
   )\r
 {\r
-  if ((Frame->Packet == (NET_BUF *) Context) || (Frame->Context == Context)) {\r
+  if ((Frame->Packet == (NET_BUF *)Context) || (Frame->Context == Context)) {\r
     return TRUE;\r
   }\r
 \r
@@ -1018,18 +1022,18 @@ Ip6CancelPacketFragments (
 **/\r
 VOID\r
 Ip6CancelFrames (\r
-  IN IP6_INTERFACE          *Interface,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN IP6_FRAME_TO_CANCEL    FrameToCancel   OPTIONAL,\r
-  IN VOID                   *Context        OPTIONAL\r
+  IN IP6_INTERFACE        *Interface,\r
+  IN EFI_STATUS           IoStatus,\r
+  IN IP6_FRAME_TO_CANCEL  FrameToCancel   OPTIONAL,\r
+  IN VOID                 *Context        OPTIONAL\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP6_LINK_TX_TOKEN         *Token;\r
-  IP6_SERVICE               *IpSb;\r
-  IP6_NEIGHBOR_ENTRY        *ArpQue;\r
-  EFI_STATUS                Status;\r
+  LIST_ENTRY          *Entry;\r
+  LIST_ENTRY          *Next;\r
+  IP6_LINK_TX_TOKEN   *Token;\r
+  IP6_SERVICE         *IpSb;\r
+  IP6_NEIGHBOR_ENTRY  *ArpQue;\r
+  EFI_STATUS          Status;\r
 \r
   IpSb = Interface->Service;\r
   NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);\r
@@ -1075,11 +1079,10 @@ Ip6CancelFrames (
 **/\r
 VOID\r
 Ip6CancelPacket (\r
-  IN IP6_INTERFACE    *IpIf,\r
-  IN NET_BUF          *Packet,\r
-  IN EFI_STATUS       IoStatus\r
+  IN IP6_INTERFACE  *IpIf,\r
+  IN NET_BUF        *Packet,\r
+  IN EFI_STATUS     IoStatus\r
   )\r
 {\r
   Ip6CancelFrames (IpIf, IoStatus, Ip6CancelPacketFragments, Packet);\r
 }\r
-\r
index a2aa579d47bc4dd74630ab1de7cfe3dd72c8555c..6ac50037899d955c9bafca1abb20ea678e197396 100644 (file)
@@ -10,7 +10,7 @@
 #ifndef __EFI_IP6_OUTPUT_H__\r
 #define __EFI_IP6_OUTPUT_H__\r
 \r
-extern UINT32 mIp6Id;\r
+extern UINT32  mIp6Id;\r
 \r
 /**\r
   Output all the available source addresses to the list entry head SourceList. The\r
@@ -28,9 +28,9 @@ extern UINT32 mIp6Id;
 **/\r
 EFI_STATUS\r
 Ip6SelectSourceAddress (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *Destination,\r
-  OUT EFI_IPv6_ADDRESS      *Source\r
+  IN IP6_SERVICE        *IpSb,\r
+  IN EFI_IPv6_ADDRESS   *Destination,\r
+  OUT EFI_IPv6_ADDRESS  *Source\r
   );\r
 \r
 /**\r
@@ -46,10 +46,10 @@ Ip6SelectSourceAddress (
 **/\r
 VOID\r
 Ip6SysPacketSent (\r
-  NET_BUF                   *Packet,\r
-  EFI_STATUS                IoStatus,\r
-  UINT32                    LinkFlag,\r
-  VOID                      *Context\r
+  NET_BUF     *Packet,\r
+  EFI_STATUS  IoStatus,\r
+  UINT32      LinkFlag,\r
+  VOID        *Context\r
   );\r
 \r
 /**\r
@@ -86,15 +86,15 @@ Ip6SysPacketSent (
 **/\r
 EFI_STATUS\r
 Ip6Output (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN IP6_INTERFACE          *Interface   OPTIONAL,\r
-  IN IP6_PROTOCOL           *IpInstance  OPTIONAL,\r
-  IN NET_BUF                *Packet,\r
-  IN EFI_IP6_HEADER         *Head,\r
-  IN UINT8                  *ExtHdrs,\r
-  IN UINT32                 ExtHdrsLen,\r
-  IN IP6_FRAME_CALLBACK     Callback,\r
-  IN VOID                   *Context\r
+  IN IP6_SERVICE         *IpSb,\r
+  IN IP6_INTERFACE       *Interface   OPTIONAL,\r
+  IN IP6_PROTOCOL        *IpInstance  OPTIONAL,\r
+  IN NET_BUF             *Packet,\r
+  IN EFI_IP6_HEADER      *Head,\r
+  IN UINT8               *ExtHdrs,\r
+  IN UINT32              ExtHdrsLen,\r
+  IN IP6_FRAME_CALLBACK  Callback,\r
+  IN VOID                *Context\r
   );\r
 \r
 /**\r
@@ -111,10 +111,10 @@ Ip6Output (
 **/\r
 VOID\r
 Ip6CancelFrames (\r
-  IN IP6_INTERFACE          *Interface,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN IP6_FRAME_TO_CANCEL    FrameToCancel   OPTIONAL,\r
-  IN VOID                   *Context        OPTIONAL\r
+  IN IP6_INTERFACE        *Interface,\r
+  IN EFI_STATUS           IoStatus,\r
+  IN IP6_FRAME_TO_CANCEL  FrameToCancel   OPTIONAL,\r
+  IN VOID                 *Context        OPTIONAL\r
   );\r
 \r
 /**\r
@@ -127,9 +127,9 @@ Ip6CancelFrames (
 **/\r
 VOID\r
 Ip6CancelPacket (\r
-  IN IP6_INTERFACE    *IpIf,\r
-  IN NET_BUF          *Packet,\r
-  IN EFI_STATUS       IoStatus\r
+  IN IP6_INTERFACE  *IpIf,\r
+  IN NET_BUF        *Packet,\r
+  IN EFI_STATUS     IoStatus\r
   );\r
 \r
 #endif\r
index c24361d2957c31505c1c72d12ca4b7ee8fb31e2e..2f91ba9ef5334c3c5f3f25b0b44fbcbe077acb59 100644 (file)
 **/\r
 UINT32\r
 Ip6RouteCacheHash (\r
-  IN EFI_IPv6_ADDRESS       *Ip1,\r
-  IN EFI_IPv6_ADDRESS       *Ip2\r
+  IN EFI_IPv6_ADDRESS  *Ip1,\r
+  IN EFI_IPv6_ADDRESS  *Ip2\r
   )\r
 {\r
-  UINT32 Prefix1;\r
-  UINT32 Prefix2;\r
+  UINT32  Prefix1;\r
+  UINT32  Prefix2;\r
 \r
-  Prefix1 = *((UINT32 *) ((UINTN *) (Ip1)));\r
-  Prefix2 = *((UINT32 *) ((UINTN *) (Ip2)));\r
+  Prefix1 = *((UINT32 *)((UINTN *)(Ip1)));\r
+  Prefix2 = *((UINT32 *)((UINTN *)(Ip2)));\r
 \r
-  return ((UINT32) (Prefix1 ^ Prefix2) % IP6_ROUTE_CACHE_HASH_SIZE);\r
+  return ((UINT32)(Prefix1 ^ Prefix2) % IP6_ROUTE_CACHE_HASH_SIZE);\r
 }\r
 \r
 /**\r
@@ -49,12 +49,12 @@ Ip6RouteCacheHash (
 **/\r
 IP6_ROUTE_ENTRY *\r
 Ip6CreateRouteEntry (\r
-  IN EFI_IPv6_ADDRESS       *Destination    OPTIONAL,\r
-  IN UINT8                  PrefixLength,\r
-  IN EFI_IPv6_ADDRESS       *GatewayAddress OPTIONAL\r
+  IN EFI_IPv6_ADDRESS  *Destination    OPTIONAL,\r
+  IN UINT8             PrefixLength,\r
+  IN EFI_IPv6_ADDRESS  *GatewayAddress OPTIONAL\r
   )\r
 {\r
-  IP6_ROUTE_ENTRY           *RtEntry;\r
+  IP6_ROUTE_ENTRY  *RtEntry;\r
 \r
   RtEntry = AllocateZeroPool (sizeof (IP6_ROUTE_ENTRY));\r
 \r
@@ -85,7 +85,7 @@ Ip6CreateRouteEntry (
 **/\r
 VOID\r
 Ip6FreeRouteEntry (\r
-  IN OUT IP6_ROUTE_ENTRY    *RtEntry\r
+  IN OUT IP6_ROUTE_ENTRY  *RtEntry\r
   )\r
 {\r
   ASSERT ((RtEntry != NULL) && (RtEntry->RefCnt > 0));\r
@@ -116,14 +116,14 @@ Ip6FreeRouteEntry (
 **/\r
 IP6_ROUTE_ENTRY *\r
 Ip6FindRouteEntry (\r
-  IN IP6_ROUTE_TABLE        *RtTable,\r
-  IN EFI_IPv6_ADDRESS       *Destination OPTIONAL,\r
-  IN EFI_IPv6_ADDRESS       *NextHop     OPTIONAL\r
+  IN IP6_ROUTE_TABLE   *RtTable,\r
+  IN EFI_IPv6_ADDRESS  *Destination OPTIONAL,\r
+  IN EFI_IPv6_ADDRESS  *NextHop     OPTIONAL\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  IP6_ROUTE_ENTRY           *RtEntry;\r
-  INTN                      Index;\r
+  LIST_ENTRY       *Entry;\r
+  IP6_ROUTE_ENTRY  *RtEntry;\r
+  INTN             Index;\r
 \r
   ASSERT (Destination != NULL || NextHop != NULL);\r
 \r
@@ -144,7 +144,6 @@ Ip6FindRouteEntry (
           return RtEntry;\r
         }\r
       }\r
-\r
     }\r
   }\r
 \r
@@ -166,13 +165,13 @@ Ip6FindRouteEntry (
 **/\r
 IP6_ROUTE_CACHE_ENTRY *\r
 Ip6CreateRouteCacheEntry (\r
-  IN EFI_IPv6_ADDRESS       *Dst,\r
-  IN EFI_IPv6_ADDRESS       *Src,\r
-  IN EFI_IPv6_ADDRESS       *GateWay,\r
-  IN UINTN                  Tag\r
+  IN EFI_IPv6_ADDRESS  *Dst,\r
+  IN EFI_IPv6_ADDRESS  *Src,\r
+  IN EFI_IPv6_ADDRESS  *GateWay,\r
+  IN UINTN             Tag\r
   )\r
 {\r
-  IP6_ROUTE_CACHE_ENTRY     *RtCacheEntry;\r
+  IP6_ROUTE_CACHE_ENTRY  *RtCacheEntry;\r
 \r
   RtCacheEntry = AllocatePool (sizeof (IP6_ROUTE_CACHE_ENTRY));\r
 \r
@@ -222,21 +221,21 @@ Ip6FreeRouteCacheEntry (
 **/\r
 IP6_ROUTE_CACHE_ENTRY *\r
 Ip6FindRouteCache (\r
-  IN IP6_ROUTE_TABLE        *RtTable,\r
-  IN EFI_IPv6_ADDRESS       *Dest,\r
-  IN EFI_IPv6_ADDRESS       *Src\r
+  IN IP6_ROUTE_TABLE   *RtTable,\r
+  IN EFI_IPv6_ADDRESS  *Dest,\r
+  IN EFI_IPv6_ADDRESS  *Src\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  IP6_ROUTE_CACHE_ENTRY     *RtCacheEntry;\r
-  UINT32                    Index;\r
+  LIST_ENTRY             *Entry;\r
+  IP6_ROUTE_CACHE_ENTRY  *RtCacheEntry;\r
+  UINT32                 Index;\r
 \r
   Index = IP6_ROUTE_CACHE_HASH (Dest, Src);\r
 \r
   NET_LIST_FOR_EACH (Entry, &RtTable->Cache.CacheBucket[Index]) {\r
     RtCacheEntry = NET_LIST_USER_STRUCT (Entry, IP6_ROUTE_CACHE_ENTRY, Link);\r
 \r
-    if (EFI_IP6_EQUAL (Dest, &RtCacheEntry->Destination)&& EFI_IP6_EQUAL (Src, &RtCacheEntry->Source)) {\r
+    if (EFI_IP6_EQUAL (Dest, &RtCacheEntry->Destination) && EFI_IP6_EQUAL (Src, &RtCacheEntry->Source)) {\r
       NET_GET_REF (RtCacheEntry);\r
       return RtCacheEntry;\r
     }\r
@@ -260,16 +259,16 @@ Ip6FindRouteCache (
 **/\r
 EFI_STATUS\r
 Ip6BuildEfiRouteTable (\r
-  IN IP6_ROUTE_TABLE        *RouteTable,\r
-  OUT UINT32                *EfiRouteCount,\r
-  OUT EFI_IP6_ROUTE_TABLE   **EfiRouteTable OPTIONAL\r
+  IN IP6_ROUTE_TABLE       *RouteTable,\r
+  OUT UINT32               *EfiRouteCount,\r
+  OUT EFI_IP6_ROUTE_TABLE  **EfiRouteTable OPTIONAL\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  IP6_ROUTE_ENTRY           *RtEntry;\r
-  EFI_IP6_ROUTE_TABLE       *EfiTable;\r
-  UINT32                    Count;\r
-  INT32                     Index;\r
+  LIST_ENTRY           *Entry;\r
+  IP6_ROUTE_ENTRY      *RtEntry;\r
+  EFI_IP6_ROUTE_TABLE  *EfiTable;\r
+  UINT32               Count;\r
+  INT32                Index;\r
 \r
   ASSERT (EfiRouteCount != NULL);\r
 \r
@@ -295,7 +294,6 @@ Ip6BuildEfiRouteTable (
   Count = 0;\r
 \r
   for (Index = IP6_PREFIX_MAX; Index >= 0; Index--) {\r
-\r
     NET_LIST_FOR_EACH (Entry, &(RouteTable->RouteArea[Index])) {\r
       RtEntry = NET_LIST_USER_STRUCT (Entry, IP6_ROUTE_ENTRY, Link);\r
 \r
@@ -329,8 +327,8 @@ Ip6CreateRouteTable (
   VOID\r
   )\r
 {\r
-  IP6_ROUTE_TABLE           *RtTable;\r
-  UINT32                    Index;\r
+  IP6_ROUTE_TABLE  *RtTable;\r
+  UINT32           Index;\r
 \r
   RtTable = AllocatePool (sizeof (IP6_ROUTE_TABLE));\r
   if (RtTable == NULL) {\r
@@ -361,19 +359,19 @@ Ip6CreateRouteTable (
 **/\r
 VOID\r
 Ip6CleanRouteTable (\r
-  IN OUT IP6_ROUTE_TABLE        *RtTable\r
+  IN OUT IP6_ROUTE_TABLE  *RtTable\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP6_ROUTE_ENTRY           *RtEntry;\r
-  IP6_ROUTE_CACHE_ENTRY     *RtCacheEntry;\r
-  UINT32                    Index;\r
+  LIST_ENTRY             *Entry;\r
+  LIST_ENTRY             *Next;\r
+  IP6_ROUTE_ENTRY        *RtEntry;\r
+  IP6_ROUTE_CACHE_ENTRY  *RtCacheEntry;\r
+  UINT32                 Index;\r
 \r
   ASSERT (RtTable->RefCnt > 0);\r
 \r
   if (--RtTable->RefCnt > 0) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   //\r
@@ -410,18 +408,17 @@ Ip6CleanRouteTable (
 **/\r
 VOID\r
 Ip6PurgeRouteCache (\r
-  IN IP6_ROUTE_CACHE        *RtCache,\r
-  IN UINTN                  Tag\r
+  IN IP6_ROUTE_CACHE  *RtCache,\r
+  IN UINTN            Tag\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP6_ROUTE_CACHE_ENTRY     *RtCacheEntry;\r
-  UINT32                    Index;\r
+  LIST_ENTRY             *Entry;\r
+  LIST_ENTRY             *Next;\r
+  IP6_ROUTE_CACHE_ENTRY  *RtCacheEntry;\r
+  UINT32                 Index;\r
 \r
   for (Index = 0; Index < IP6_ROUTE_CACHE_HASH_SIZE; Index++) {\r
     NET_LIST_FOR_EACH_SAFE (Entry, Next, &RtCache->CacheBucket[Index]) {\r
-\r
       RtCacheEntry = NET_LIST_USER_STRUCT (Entry, IP6_ROUTE_CACHE_ENTRY, Link);\r
 \r
       if (RtCacheEntry->Tag == Tag) {\r
@@ -447,15 +444,15 @@ Ip6PurgeRouteCache (
 **/\r
 EFI_STATUS\r
 Ip6AddRoute (\r
-  IN OUT IP6_ROUTE_TABLE    *RtTable,\r
-  IN EFI_IPv6_ADDRESS       *Destination,\r
-  IN UINT8                  PrefixLength,\r
-  IN EFI_IPv6_ADDRESS       *GatewayAddress\r
+  IN OUT IP6_ROUTE_TABLE  *RtTable,\r
+  IN EFI_IPv6_ADDRESS     *Destination,\r
+  IN UINT8                PrefixLength,\r
+  IN EFI_IPv6_ADDRESS     *GatewayAddress\r
   )\r
 {\r
-  LIST_ENTRY                *ListHead;\r
-  LIST_ENTRY                *Entry;\r
-  IP6_ROUTE_ENTRY           *Route;\r
+  LIST_ENTRY       *ListHead;\r
+  LIST_ENTRY       *Entry;\r
+  IP6_ROUTE_ENTRY  *Route;\r
 \r
   ListHead = &RtTable->RouteArea[PrefixLength];\r
 \r
@@ -466,7 +463,8 @@ Ip6AddRoute (
     Route = NET_LIST_USER_STRUCT (Entry, IP6_ROUTE_ENTRY, Link);\r
 \r
     if (NetIp6IsNetEqual (Destination, &Route->Destination, PrefixLength) &&\r
-        EFI_IP6_EQUAL (GatewayAddress, &Route->NextHop)) {\r
+        EFI_IP6_EQUAL (GatewayAddress, &Route->NextHop))\r
+    {\r
       return EFI_ACCESS_DENIED;\r
     }\r
   }\r
@@ -506,17 +504,17 @@ Ip6AddRoute (
 **/\r
 EFI_STATUS\r
 Ip6DelRoute (\r
-  IN OUT IP6_ROUTE_TABLE    *RtTable,\r
-  IN EFI_IPv6_ADDRESS       *Destination,\r
-  IN UINT8                  PrefixLength,\r
-  IN EFI_IPv6_ADDRESS       *GatewayAddress\r
+  IN OUT IP6_ROUTE_TABLE  *RtTable,\r
+  IN EFI_IPv6_ADDRESS     *Destination,\r
+  IN UINT8                PrefixLength,\r
+  IN EFI_IPv6_ADDRESS     *GatewayAddress\r
   )\r
 {\r
-  LIST_ENTRY                *ListHead;\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  IP6_ROUTE_ENTRY           *Route;\r
-  UINT32                    TotalNum;\r
+  LIST_ENTRY       *ListHead;\r
+  LIST_ENTRY       *Entry;\r
+  LIST_ENTRY       *Next;\r
+  IP6_ROUTE_ENTRY  *Route;\r
+  UINT32           TotalNum;\r
 \r
   ListHead = &RtTable->RouteArea[PrefixLength];\r
   TotalNum = RtTable->TotalNum;\r
@@ -524,14 +522,15 @@ Ip6DelRoute (
   NET_LIST_FOR_EACH_SAFE (Entry, Next, ListHead) {\r
     Route = NET_LIST_USER_STRUCT (Entry, IP6_ROUTE_ENTRY, Link);\r
 \r
-    if (Destination != NULL && !NetIp6IsNetEqual (Destination, &Route->Destination, PrefixLength)) {\r
+    if ((Destination != NULL) && !NetIp6IsNetEqual (Destination, &Route->Destination, PrefixLength)) {\r
       continue;\r
     }\r
-    if (GatewayAddress != NULL && !EFI_IP6_EQUAL (GatewayAddress, &Route->NextHop)) {\r
+\r
+    if ((GatewayAddress != NULL) && !EFI_IP6_EQUAL (GatewayAddress, &Route->NextHop)) {\r
       continue;\r
     }\r
 \r
-    Ip6PurgeRouteCache (&RtTable->Cache, (UINTN) Route);\r
+    Ip6PurgeRouteCache (&RtTable->Cache, (UINTN)Route);\r
     RemoveEntryList (Entry);\r
     Ip6FreeRouteEntry (Route);\r
 \r
@@ -556,17 +555,17 @@ Ip6DelRoute (
 **/\r
 IP6_ROUTE_CACHE_ENTRY *\r
 Ip6Route (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *Dest,\r
-  IN EFI_IPv6_ADDRESS       *Src\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *Dest,\r
+  IN EFI_IPv6_ADDRESS  *Src\r
   )\r
 {\r
-  IP6_ROUTE_TABLE           *RtTable;\r
-  LIST_ENTRY                *ListHead;\r
-  IP6_ROUTE_CACHE_ENTRY     *RtCacheEntry;\r
-  IP6_ROUTE_ENTRY           *RtEntry;\r
-  EFI_IPv6_ADDRESS          NextHop;\r
-  UINT32                    Index;\r
+  IP6_ROUTE_TABLE        *RtTable;\r
+  LIST_ENTRY             *ListHead;\r
+  IP6_ROUTE_CACHE_ENTRY  *RtCacheEntry;\r
+  IP6_ROUTE_ENTRY        *RtEntry;\r
+  EFI_IPv6_ADDRESS       NextHop;\r
+  UINT32                 Index;\r
 \r
   RtTable = IpSb->RouteTable;\r
 \r
@@ -614,7 +613,7 @@ Ip6Route (
   //\r
   // Create a route cache entry, and tag it as spawned from this route entry\r
   //\r
-  RtCacheEntry = Ip6CreateRouteCacheEntry (Dest, Src, &NextHop, (UINTN) RtEntry);\r
+  RtCacheEntry = Ip6CreateRouteCacheEntry (Dest, Src, &NextHop, (UINTN)RtEntry);\r
 \r
   if (RtCacheEntry == NULL) {\r
     return NULL;\r
@@ -626,4 +625,3 @@ Ip6Route (
 \r
   return RtCacheEntry;\r
 }\r
-\r
index af20dbb149b03fcc0f2410048a0ba93ac8797118..9023b217d1c990b124585bdcca2c453831d518aa 100644 (file)
 #ifndef __EFI_IP6_ROUTE_H__\r
 #define __EFI_IP6_ROUTE_H__\r
 \r
-#define IP6_DIRECT_ROUTE          0x00000001\r
-#define IP6_PACKET_TOO_BIG        0x00000010\r
+#define IP6_DIRECT_ROUTE    0x00000001\r
+#define IP6_PACKET_TOO_BIG  0x00000010\r
 \r
-#define IP6_ROUTE_CACHE_HASH_SIZE 31\r
+#define IP6_ROUTE_CACHE_HASH_SIZE  31\r
 ///\r
 /// Max NO. of cache entry per hash bucket\r
 ///\r
-#define IP6_ROUTE_CACHE_MAX       32\r
+#define IP6_ROUTE_CACHE_MAX  32\r
 \r
-#define IP6_ROUTE_CACHE_HASH(Ip1, Ip2) Ip6RouteCacheHash ((Ip1), (Ip2))\r
+#define IP6_ROUTE_CACHE_HASH(Ip1, Ip2)  Ip6RouteCacheHash ((Ip1), (Ip2))\r
 \r
 typedef struct {\r
-  LIST_ENTRY                Link;\r
-  INTN                      RefCnt;\r
-  UINT32                    Flag;\r
-  UINT8                     PrefixLength;\r
-  EFI_IPv6_ADDRESS          Destination;\r
-  EFI_IPv6_ADDRESS          NextHop;\r
+  LIST_ENTRY          Link;\r
+  INTN                RefCnt;\r
+  UINT32              Flag;\r
+  UINT8               PrefixLength;\r
+  EFI_IPv6_ADDRESS    Destination;\r
+  EFI_IPv6_ADDRESS    NextHop;\r
 } IP6_ROUTE_ENTRY;\r
 \r
 typedef struct {\r
-  LIST_ENTRY                Link;\r
-  INTN                      RefCnt;\r
-  UINTN                     Tag;\r
-  EFI_IPv6_ADDRESS          Destination;\r
-  EFI_IPv6_ADDRESS          Source;\r
-  EFI_IPv6_ADDRESS          NextHop;\r
+  LIST_ENTRY          Link;\r
+  INTN                RefCnt;\r
+  UINTN               Tag;\r
+  EFI_IPv6_ADDRESS    Destination;\r
+  EFI_IPv6_ADDRESS    Source;\r
+  EFI_IPv6_ADDRESS    NextHop;\r
 } IP6_ROUTE_CACHE_ENTRY;\r
 \r
 typedef struct {\r
-  LIST_ENTRY                CacheBucket[IP6_ROUTE_CACHE_HASH_SIZE];\r
-  UINT8                     CacheNum[IP6_ROUTE_CACHE_HASH_SIZE];\r
+  LIST_ENTRY    CacheBucket[IP6_ROUTE_CACHE_HASH_SIZE];\r
+  UINT8         CacheNum[IP6_ROUTE_CACHE_HASH_SIZE];\r
 } IP6_ROUTE_CACHE;\r
 \r
 //\r
@@ -54,10 +54,10 @@ typedef struct {
 //\r
 \r
 typedef struct _IP6_ROUTE_TABLE {\r
-  INTN                      RefCnt;\r
-  UINT32                    TotalNum;\r
-  LIST_ENTRY                RouteArea[IP6_PREFIX_NUM];\r
-  IP6_ROUTE_CACHE           Cache;\r
+  INTN               RefCnt;\r
+  UINT32             TotalNum;\r
+  LIST_ENTRY         RouteArea[IP6_PREFIX_NUM];\r
+  IP6_ROUTE_CACHE    Cache;\r
 } IP6_ROUTE_TABLE;\r
 \r
 /**\r
@@ -72,8 +72,8 @@ typedef struct _IP6_ROUTE_TABLE {
 **/\r
 UINT32\r
 Ip6RouteCacheHash (\r
-  IN EFI_IPv6_ADDRESS       *Ip1,\r
-  IN EFI_IPv6_ADDRESS       *Ip2\r
+  IN EFI_IPv6_ADDRESS  *Ip1,\r
+  IN EFI_IPv6_ADDRESS  *Ip2\r
   );\r
 \r
 /**\r
@@ -91,10 +91,10 @@ Ip6RouteCacheHash (
 **/\r
 IP6_ROUTE_CACHE_ENTRY *\r
 Ip6CreateRouteCacheEntry (\r
-  IN EFI_IPv6_ADDRESS       *Dst,\r
-  IN EFI_IPv6_ADDRESS       *Src,\r
-  IN EFI_IPv6_ADDRESS       *GateWay,\r
-  IN UINTN                  Tag\r
+  IN EFI_IPv6_ADDRESS  *Dst,\r
+  IN EFI_IPv6_ADDRESS  *Src,\r
+  IN EFI_IPv6_ADDRESS  *GateWay,\r
+  IN UINTN             Tag\r
   );\r
 \r
 /**\r
@@ -122,9 +122,9 @@ Ip6FreeRouteCacheEntry (
 **/\r
 IP6_ROUTE_CACHE_ENTRY *\r
 Ip6FindRouteCache (\r
-  IN IP6_ROUTE_TABLE        *RtTable,\r
-  IN EFI_IPv6_ADDRESS       *Dest,\r
-  IN EFI_IPv6_ADDRESS       *Src\r
+  IN IP6_ROUTE_TABLE   *RtTable,\r
+  IN EFI_IPv6_ADDRESS  *Dest,\r
+  IN EFI_IPv6_ADDRESS  *Src\r
   );\r
 \r
 /**\r
@@ -142,9 +142,9 @@ Ip6FindRouteCache (
 **/\r
 EFI_STATUS\r
 Ip6BuildEfiRouteTable (\r
-  IN IP6_ROUTE_TABLE        *RouteTable,\r
-  OUT UINT32                *EfiRouteCount,\r
-  OUT EFI_IP6_ROUTE_TABLE   **EfiRouteTable OPTIONAL\r
+  IN IP6_ROUTE_TABLE       *RouteTable,\r
+  OUT UINT32               *EfiRouteCount,\r
+  OUT EFI_IP6_ROUTE_TABLE  **EfiRouteTable OPTIONAL\r
   );\r
 \r
 /**\r
@@ -168,7 +168,7 @@ Ip6CreateRouteTable (
 **/\r
 VOID\r
 Ip6CleanRouteTable (\r
-  IN OUT IP6_ROUTE_TABLE        *RtTable\r
+  IN OUT IP6_ROUTE_TABLE  *RtTable\r
   );\r
 \r
 /**\r
@@ -186,9 +186,9 @@ Ip6CleanRouteTable (
 **/\r
 IP6_ROUTE_ENTRY *\r
 Ip6CreateRouteEntry (\r
-  IN EFI_IPv6_ADDRESS       *Destination    OPTIONAL,\r
-  IN UINT8                  PrefixLength,\r
-  IN EFI_IPv6_ADDRESS       *GatewayAddress OPTIONAL\r
+  IN EFI_IPv6_ADDRESS  *Destination    OPTIONAL,\r
+  IN UINT8             PrefixLength,\r
+  IN EFI_IPv6_ADDRESS  *GatewayAddress OPTIONAL\r
   );\r
 \r
 /**\r
@@ -212,9 +212,9 @@ Ip6CreateRouteEntry (
 **/\r
 IP6_ROUTE_ENTRY *\r
 Ip6FindRouteEntry (\r
-  IN IP6_ROUTE_TABLE        *RtTable,\r
-  IN EFI_IPv6_ADDRESS       *Destination OPTIONAL,\r
-  IN EFI_IPv6_ADDRESS       *NextHop     OPTIONAL\r
+  IN IP6_ROUTE_TABLE   *RtTable,\r
+  IN EFI_IPv6_ADDRESS  *Destination OPTIONAL,\r
+  IN EFI_IPv6_ADDRESS  *NextHop     OPTIONAL\r
   );\r
 \r
 /**\r
@@ -225,7 +225,7 @@ Ip6FindRouteEntry (
 **/\r
 VOID\r
 Ip6FreeRouteEntry (\r
-  IN OUT IP6_ROUTE_ENTRY    *RtEntry\r
+  IN OUT IP6_ROUTE_ENTRY  *RtEntry\r
   );\r
 \r
 /**\r
@@ -243,10 +243,10 @@ Ip6FreeRouteEntry (
 **/\r
 EFI_STATUS\r
 Ip6AddRoute (\r
-  IN OUT IP6_ROUTE_TABLE    *RtTable,\r
-  IN EFI_IPv6_ADDRESS       *Destination,\r
-  IN UINT8                  PrefixLength,\r
-  IN EFI_IPv6_ADDRESS       *GatewayAddress\r
+  IN OUT IP6_ROUTE_TABLE  *RtTable,\r
+  IN EFI_IPv6_ADDRESS     *Destination,\r
+  IN UINT8                PrefixLength,\r
+  IN EFI_IPv6_ADDRESS     *GatewayAddress\r
   );\r
 \r
 /**\r
@@ -265,10 +265,10 @@ Ip6AddRoute (
 **/\r
 EFI_STATUS\r
 Ip6DelRoute (\r
-  IN OUT IP6_ROUTE_TABLE    *RtTable,\r
-  IN EFI_IPv6_ADDRESS       *Destination,\r
-  IN UINT8                  PrefixLength,\r
-  IN EFI_IPv6_ADDRESS       *GatewayAddress\r
+  IN OUT IP6_ROUTE_TABLE  *RtTable,\r
+  IN EFI_IPv6_ADDRESS     *Destination,\r
+  IN UINT8                PrefixLength,\r
+  IN EFI_IPv6_ADDRESS     *GatewayAddress\r
   );\r
 \r
 /**\r
@@ -285,9 +285,9 @@ Ip6DelRoute (
 **/\r
 IP6_ROUTE_CACHE_ENTRY *\r
 Ip6Route (\r
-  IN IP6_SERVICE            *IpSb,\r
-  IN EFI_IPv6_ADDRESS       *Dest,\r
-  IN EFI_IPv6_ADDRESS       *Src\r
+  IN IP6_SERVICE       *IpSb,\r
+  IN EFI_IPv6_ADDRESS  *Dest,\r
+  IN EFI_IPv6_ADDRESS  *Src\r
   );\r
 \r
 #endif\r
index 134bd72266729b903e7391b5a54ed608a78ebeb5..509a13cbdabfea239a53cfb93586cb1e3e8c9d59 100644 (file)
 VOID\r
 EFIAPI\r
 HttpIoNotifyDpc (\r
-  IN VOID                *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  *((BOOLEAN *) Context) = TRUE;\r
+  *((BOOLEAN *)Context) = TRUE;\r
 }\r
 \r
 /**\r
@@ -42,8 +42,8 @@ HttpIoNotifyDpc (
 VOID\r
 EFIAPI\r
 HttpIoNotify (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   //\r
@@ -60,11 +60,11 @@ HttpIoNotify (
 **/\r
 VOID\r
 HttpIoDestroyIo (\r
-  IN HTTP_IO                *HttpIo\r
+  IN HTTP_IO  *HttpIo\r
   )\r
 {\r
-  EFI_HTTP_PROTOCOL         *Http;\r
-  EFI_EVENT                 Event;\r
+  EFI_HTTP_PROTOCOL  *Http;\r
+  EFI_EVENT          Event;\r
 \r
   if (HttpIo == NULL) {\r
     return;\r
@@ -128,27 +128,27 @@ HttpIoDestroyIo (
 **/\r
 EFI_STATUS\r
 HttpIoCreateIo (\r
-  IN EFI_HANDLE             Image,\r
-  IN EFI_HANDLE             Controller,\r
-  IN UINT8                  IpVersion,\r
-  IN HTTP_IO_CONFIG_DATA    *ConfigData  OPTIONAL,\r
-  IN HTTP_IO_CALLBACK       Callback,\r
-  IN VOID                   *Context,\r
-  OUT HTTP_IO               *HttpIo\r
+  IN EFI_HANDLE           Image,\r
+  IN EFI_HANDLE           Controller,\r
+  IN UINT8                IpVersion,\r
+  IN HTTP_IO_CONFIG_DATA  *ConfigData  OPTIONAL,\r
+  IN HTTP_IO_CALLBACK     Callback,\r
+  IN VOID                 *Context,\r
+  OUT HTTP_IO             *HttpIo\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_HTTP_CONFIG_DATA      HttpConfigData;\r
-  EFI_HTTPv4_ACCESS_POINT   Http4AccessPoint;\r
-  EFI_HTTPv6_ACCESS_POINT   Http6AccessPoint;\r
-  EFI_HTTP_PROTOCOL         *Http;\r
-  EFI_EVENT                 Event;\r
+  EFI_STATUS               Status;\r
+  EFI_HTTP_CONFIG_DATA     HttpConfigData;\r
+  EFI_HTTPv4_ACCESS_POINT  Http4AccessPoint;\r
+  EFI_HTTPv6_ACCESS_POINT  Http6AccessPoint;\r
+  EFI_HTTP_PROTOCOL        *Http;\r
+  EFI_EVENT                Event;\r
 \r
   if ((Image == NULL) || (Controller == NULL) || (HttpIo == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (IpVersion != IP_VERSION_4 && IpVersion != IP_VERSION_6) {\r
+  if ((IpVersion != IP_VERSION_4) && (IpVersion != IP_VERSION_6)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -171,7 +171,7 @@ HttpIoCreateIo (
   Status = gBS->OpenProtocol (\r
                   HttpIo->Handle,\r
                   &gEfiHttpProtocolGuid,\r
-                  (VOID **) &Http,\r
+                  (VOID **)&Http,\r
                   Image,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -183,19 +183,19 @@ HttpIoCreateIo (
   //\r
   // Init the configuration data and configure the HTTP child.\r
   //\r
-  HttpIo->Image       = Image;\r
-  HttpIo->Controller  = Controller;\r
-  HttpIo->IpVersion   = IpVersion;\r
-  HttpIo->Http        = Http;\r
-  HttpIo->Callback    = Callback;\r
-  HttpIo->Context     = Context;\r
-  HttpIo->Timeout     = PcdGet32 (PcdHttpIoTimeout);\r
+  HttpIo->Image      = Image;\r
+  HttpIo->Controller = Controller;\r
+  HttpIo->IpVersion  = IpVersion;\r
+  HttpIo->Http       = Http;\r
+  HttpIo->Callback   = Callback;\r
+  HttpIo->Context    = Context;\r
+  HttpIo->Timeout    = PcdGet32 (PcdHttpIoTimeout);\r
 \r
   if (ConfigData != NULL) {\r
     if (HttpIo->IpVersion == IP_VERSION_4) {\r
-      HttpConfigData.LocalAddressIsIPv6  = FALSE;\r
-      HttpConfigData.HttpVersion         = ConfigData->Config4.HttpVersion;\r
-      HttpConfigData.TimeOutMillisec     = ConfigData->Config4.RequestTimeOut;\r
+      HttpConfigData.LocalAddressIsIPv6 = FALSE;\r
+      HttpConfigData.HttpVersion        = ConfigData->Config4.HttpVersion;\r
+      HttpConfigData.TimeOutMillisec    = ConfigData->Config4.RequestTimeOut;\r
 \r
       Http4AccessPoint.UseDefaultAddress = ConfigData->Config4.UseDefaultAddress;\r
       Http4AccessPoint.LocalPort         = ConfigData->Config4.LocalPort;\r
@@ -204,10 +204,10 @@ HttpIoCreateIo (
       HttpConfigData.AccessPoint.IPv4Node = &Http4AccessPoint;\r
     } else {\r
       HttpConfigData.LocalAddressIsIPv6 = TRUE;\r
-      HttpConfigData.HttpVersion         = ConfigData->Config6.HttpVersion;\r
-      HttpConfigData.TimeOutMillisec     = ConfigData->Config6.RequestTimeOut;\r
+      HttpConfigData.HttpVersion        = ConfigData->Config6.HttpVersion;\r
+      HttpConfigData.TimeOutMillisec    = ConfigData->Config6.RequestTimeOut;\r
 \r
-      Http6AccessPoint.LocalPort         = ConfigData->Config6.LocalPort;\r
+      Http6AccessPoint.LocalPort = ConfigData->Config6.LocalPort;\r
       IP6_COPY_ADDRESS (&Http6AccessPoint.LocalAddress, &ConfigData->Config6.LocalIp);\r
       HttpConfigData.AccessPoint.IPv6Node = &Http6AccessPoint;\r
     }\r
@@ -231,7 +231,8 @@ HttpIoCreateIo (
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
   }\r
-  HttpIo->ReqToken.Event = Event;\r
+\r
+  HttpIo->ReqToken.Event   = Event;\r
   HttpIo->ReqToken.Message = &HttpIo->ReqMessage;\r
 \r
   Status = gBS->CreateEvent (\r
@@ -244,7 +245,8 @@ HttpIoCreateIo (
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
   }\r
-  HttpIo->RspToken.Event = Event;\r
+\r
+  HttpIo->RspToken.Event   = Event;\r
   HttpIo->RspToken.Message = &HttpIo->RspMessage;\r
 \r
   //\r
@@ -260,6 +262,7 @@ HttpIoCreateIo (
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
   }\r
+\r
   HttpIo->TimeoutEvent = Event;\r
   return EFI_SUCCESS;\r
 \r
@@ -296,14 +299,14 @@ HttpIoSendRequest (
   IN  VOID                   *Body\r
   )\r
 {\r
-  EFI_STATUS                 Status;\r
-  EFI_HTTP_PROTOCOL          *Http;\r
+  EFI_STATUS         Status;\r
+  EFI_HTTP_PROTOCOL  *Http;\r
 \r
-  if (HttpIo == NULL || HttpIo->Http == NULL) {\r
+  if ((HttpIo == NULL) || (HttpIo->Http == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  HttpIo->ReqToken.Status  = EFI_NOT_READY;\r
+  HttpIo->ReqToken.Status                = EFI_NOT_READY;\r
   HttpIo->ReqToken.Message->Data.Request = Request;\r
   HttpIo->ReqToken.Message->HeaderCount  = HeaderCount;\r
   HttpIo->ReqToken.Message->Headers      = Headers;\r
@@ -312,10 +315,10 @@ HttpIoSendRequest (
 \r
   if (HttpIo->Callback != NULL) {\r
     Status = HttpIo->Callback (\r
-               HttpIoRequest,\r
-               HttpIo->ReqToken.Message,\r
-               HttpIo->Context\r
-               );\r
+                       HttpIoRequest,\r
+                       HttpIo->ReqToken.Message,\r
+                       HttpIo->Context\r
+                       );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -324,12 +327,12 @@ HttpIoSendRequest (
   //\r
   // Queue the request token to HTTP instances.\r
   //\r
-  Http = HttpIo->Http;\r
+  Http             = HttpIo->Http;\r
   HttpIo->IsTxDone = FALSE;\r
-  Status = Http->Request (\r
-                   Http,\r
-                   &HttpIo->ReqToken\r
-                   );\r
+  Status           = Http->Request (\r
+                             Http,\r
+                             &HttpIo->ReqToken\r
+                             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -361,33 +364,34 @@ HttpIoSendRequest (
 **/\r
 EFI_STATUS\r
 HttpIoRecvResponse (\r
-  IN      HTTP_IO                  *HttpIo,\r
-  IN      BOOLEAN                  RecvMsgHeader,\r
-  OUT     HTTP_IO_RESPONSE_DATA    *ResponseData\r
+  IN      HTTP_IO                *HttpIo,\r
+  IN      BOOLEAN                RecvMsgHeader,\r
+  OUT     HTTP_IO_RESPONSE_DATA  *ResponseData\r
   )\r
 {\r
-  EFI_STATUS                 Status;\r
-  EFI_HTTP_PROTOCOL          *Http;\r
+  EFI_STATUS         Status;\r
+  EFI_HTTP_PROTOCOL  *Http;\r
 \r
-  if (HttpIo == NULL || HttpIo->Http == NULL || ResponseData == NULL) {\r
+  if ((HttpIo == NULL) || (HttpIo->Http == NULL) || (ResponseData == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   //\r
   // Queue the response token to HTTP instances.\r
   //\r
-  HttpIo->RspToken.Status  = EFI_NOT_READY;\r
+  HttpIo->RspToken.Status = EFI_NOT_READY;\r
   if (RecvMsgHeader) {\r
     HttpIo->RspToken.Message->Data.Response = &ResponseData->Response;\r
   } else {\r
     HttpIo->RspToken.Message->Data.Response = NULL;\r
   }\r
-  HttpIo->RspToken.Message->HeaderCount   = 0;\r
-  HttpIo->RspToken.Message->Headers       = NULL;\r
-  HttpIo->RspToken.Message->BodyLength    = ResponseData->BodyLength;\r
-  HttpIo->RspToken.Message->Body          = ResponseData->Body;\r
 \r
-  Http = HttpIo->Http;\r
+  HttpIo->RspToken.Message->HeaderCount = 0;\r
+  HttpIo->RspToken.Message->Headers     = NULL;\r
+  HttpIo->RspToken.Message->BodyLength  = ResponseData->BodyLength;\r
+  HttpIo->RspToken.Message->Body        = ResponseData->Body;\r
+\r
+  Http             = HttpIo->Http;\r
   HttpIo->IsRxDone = FALSE;\r
 \r
   //\r
@@ -437,12 +441,13 @@ HttpIoRecvResponse (
   }\r
 \r
   if ((HttpIo->Callback != NULL) &&\r
-      (HttpIo->RspToken.Status == EFI_SUCCESS || HttpIo->RspToken.Status == EFI_HTTP_ERROR)) {\r
+      ((HttpIo->RspToken.Status == EFI_SUCCESS) || (HttpIo->RspToken.Status == EFI_HTTP_ERROR)))\r
+  {\r
     Status = HttpIo->Callback (\r
-               HttpIoResponse,\r
-               HttpIo->RspToken.Message,\r
-               HttpIo->Context\r
-               );\r
+                       HttpIoResponse,\r
+                       HttpIo->RspToken.Message,\r
+                       HttpIo->Context\r
+                       );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -451,7 +456,7 @@ HttpIoRecvResponse (
   //\r
   // Store the received data into the wrapper.\r
   //\r
-  ResponseData->Status = HttpIo->RspToken.Status;\r
+  ResponseData->Status      = HttpIo->RspToken.Status;\r
   ResponseData->HeaderCount = HttpIo->RspToken.Message->HeaderCount;\r
   ResponseData->Headers     = HttpIo->RspToken.Message->Headers;\r
   ResponseData->BodyLength  = HttpIo->RspToken.Message->BodyLength;\r
@@ -472,20 +477,21 @@ HttpIoRecvResponse (
 **/\r
 EFI_STATUS\r
 HttpIoGetContentLength (\r
-  IN     UINTN                HeaderCount,\r
-  IN     EFI_HTTP_HEADER      *Headers,\r
-  OUT    UINTN                *ContentLength\r
+  IN     UINTN            HeaderCount,\r
+  IN     EFI_HTTP_HEADER  *Headers,\r
+  OUT    UINTN            *ContentLength\r
   )\r
 {\r
-  EFI_HTTP_HEADER       *Header;\r
+  EFI_HTTP_HEADER  *Header;\r
 \r
   Header = HttpFindHeader (HeaderCount, Headers, HTTP_HEADER_CONTENT_LENGTH);\r
   if (Header == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  return AsciiStrDecimalToUintnS (Header->FieldValue, (CHAR8 **) NULL, ContentLength);\r
+  return AsciiStrDecimalToUintnS (Header->FieldValue, (CHAR8 **)NULL, ContentLength);\r
 }\r
+\r
 /**\r
   Send HTTP request in chunks.\r
 \r
@@ -499,21 +505,21 @@ HttpIoGetContentLength (
 **/\r
 EFI_STATUS\r
 HttpIoSendChunkedTransfer (\r
-  IN  HTTP_IO                    *HttpIo,\r
-  IN  HTTP_IO_SEND_CHUNK_PROCESS *SendChunkProcess,\r
-  IN  EFI_HTTP_MESSAGE           *RequestMessage\r
-)\r
+  IN  HTTP_IO                     *HttpIo,\r
+  IN  HTTP_IO_SEND_CHUNK_PROCESS  *SendChunkProcess,\r
+  IN  EFI_HTTP_MESSAGE            *RequestMessage\r
+  )\r
 {\r
-  EFI_STATUS            Status;\r
-  EFI_HTTP_HEADER       *NewHeaders;\r
-  EFI_HTTP_HEADER       *ContentLengthHeader;\r
-  UINTN                 AddNewHeader;\r
-  UINTN                 HeaderCount;\r
-  CHAR8                 *MessageBody;\r
-  UINTN                 MessageBodyLength;\r
-  UINTN                 ChunkLength;\r
-  CHAR8                 ChunkLengthStr [HTTP_IO_CHUNK_SIZE_STRING_LEN];\r
-  EFI_HTTP_REQUEST_DATA *SentRequestData;\r
+  EFI_STATUS             Status;\r
+  EFI_HTTP_HEADER        *NewHeaders;\r
+  EFI_HTTP_HEADER        *ContentLengthHeader;\r
+  UINTN                  AddNewHeader;\r
+  UINTN                  HeaderCount;\r
+  CHAR8                  *MessageBody;\r
+  UINTN                  MessageBodyLength;\r
+  UINTN                  ChunkLength;\r
+  CHAR8                  ChunkLengthStr[HTTP_IO_CHUNK_SIZE_STRING_LEN];\r
+  EFI_HTTP_REQUEST_DATA  *SentRequestData;\r
 \r
   AddNewHeader        = 0;\r
   NewHeaders          = NULL;\r
@@ -522,75 +528,79 @@ HttpIoSendChunkedTransfer (
   MessageBodyLength   = 0;\r
 \r
   switch (*SendChunkProcess) {\r
-  case HttpIoSendChunkHeaderZeroContent:\r
+    case HttpIoSendChunkHeaderZeroContent:\r
       ContentLengthHeader = HttpFindHeader (RequestMessage->HeaderCount, RequestMessage->Headers, HTTP_HEADER_CONTENT_LENGTH);\r
       if (ContentLengthHeader == NULL) {\r
         AddNewHeader = 1;\r
       }\r
 \r
-      NewHeaders = AllocateZeroPool ((RequestMessage->HeaderCount + AddNewHeader) * sizeof(EFI_HTTP_HEADER));\r
-      CopyMem ((VOID*)NewHeaders, (VOID *)RequestMessage->Headers, RequestMessage->HeaderCount * sizeof (EFI_HTTP_HEADER));\r
+      NewHeaders = AllocateZeroPool ((RequestMessage->HeaderCount + AddNewHeader) * sizeof (EFI_HTTP_HEADER));\r
+      CopyMem ((VOID *)NewHeaders, (VOID *)RequestMessage->Headers, RequestMessage->HeaderCount * sizeof (EFI_HTTP_HEADER));\r
       if (AddNewHeader == 0) {\r
         //\r
         // Override content-length to Transfer-Encoding.\r
         //\r
-        ContentLengthHeader = HttpFindHeader (RequestMessage->HeaderCount, NewHeaders, HTTP_HEADER_CONTENT_LENGTH);\r
-        ContentLengthHeader->FieldName = NULL;\r
+        ContentLengthHeader             = HttpFindHeader (RequestMessage->HeaderCount, NewHeaders, HTTP_HEADER_CONTENT_LENGTH);\r
+        ContentLengthHeader->FieldName  = NULL;\r
         ContentLengthHeader->FieldValue = NULL;\r
       } else {\r
         ContentLengthHeader = NewHeaders + RequestMessage->HeaderCount;\r
       }\r
+\r
       HttpSetFieldNameAndValue (ContentLengthHeader, HTTP_HEADER_TRANSFER_ENCODING, HTTP_HEADER_TRANSFER_ENCODING_CHUNKED);\r
-      HeaderCount = RequestMessage->HeaderCount + AddNewHeader;\r
+      HeaderCount       = RequestMessage->HeaderCount + AddNewHeader;\r
       MessageBodyLength = 0;\r
-      MessageBody = NULL;\r
-      SentRequestData = RequestMessage->Data.Request;\r
+      MessageBody       = NULL;\r
+      SentRequestData   = RequestMessage->Data.Request;\r
       break;\r
 \r
-  case HttpIoSendChunkContent:\r
-      HeaderCount = 0;\r
-      NewHeaders = NULL;\r
+    case HttpIoSendChunkContent:\r
+      HeaderCount     = 0;\r
+      NewHeaders      = NULL;\r
       SentRequestData = NULL;\r
       if (RequestMessage->BodyLength > HTTP_IO_MAX_SEND_PAYLOAD) {\r
         MessageBodyLength = HTTP_IO_MAX_SEND_PAYLOAD;\r
       } else {\r
         MessageBodyLength = RequestMessage->BodyLength;\r
       }\r
+\r
       AsciiSPrint (\r
-          ChunkLengthStr,\r
-          HTTP_IO_CHUNK_SIZE_STRING_LEN,\r
-          "%x%c%c",\r
-          MessageBodyLength,\r
-          CHUNKED_TRANSFER_CODING_CR,\r
-          CHUNKED_TRANSFER_CODING_LF\r
-          );\r
+        ChunkLengthStr,\r
+        HTTP_IO_CHUNK_SIZE_STRING_LEN,\r
+        "%x%c%c",\r
+        MessageBodyLength,\r
+        CHUNKED_TRANSFER_CODING_CR,\r
+        CHUNKED_TRANSFER_CODING_LF\r
+        );\r
       ChunkLength = AsciiStrLen (ChunkLengthStr);\r
       MessageBody = AllocatePool (ChunkLength + MessageBodyLength + 2);\r
       if (MessageBody == NULL) {\r
-        DEBUG((DEBUG_ERROR, "Not enough memory for chunk transfer\n"));\r
+        DEBUG ((DEBUG_ERROR, "Not enough memory for chunk transfer\n"));\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
+\r
       //\r
       // Build up the chunk transfer paylaod.\r
       //\r
       CopyMem (MessageBody, ChunkLengthStr, ChunkLength);\r
       CopyMem (MessageBody + ChunkLength, RequestMessage->Body, MessageBodyLength);\r
-      *(MessageBody + ChunkLength + MessageBodyLength) = CHUNKED_TRANSFER_CODING_CR;\r
+      *(MessageBody + ChunkLength + MessageBodyLength)     = CHUNKED_TRANSFER_CODING_CR;\r
       *(MessageBody + ChunkLength + MessageBodyLength + 1) = CHUNKED_TRANSFER_CODING_LF;\r
       //\r
       // Change variables for the next chunk trasnfer.\r
       //\r
       RequestMessage->BodyLength -= MessageBodyLength;\r
-      RequestMessage->Body = (VOID *)((CHAR8 *)RequestMessage->Body + MessageBodyLength);\r
-      MessageBodyLength += (ChunkLength + 2);\r
+      RequestMessage->Body        = (VOID *)((CHAR8 *)RequestMessage->Body + MessageBodyLength);\r
+      MessageBodyLength          += (ChunkLength + 2);\r
       if (RequestMessage->BodyLength == 0) {\r
         *SendChunkProcess = HttpIoSendChunkEndChunk;\r
       }\r
+\r
       break;\r
 \r
-  case HttpIoSendChunkEndChunk:\r
-      HeaderCount = 0;\r
-      NewHeaders = NULL;\r
+    case HttpIoSendChunkEndChunk:\r
+      HeaderCount     = 0;\r
+      NewHeaders      = NULL;\r
       SentRequestData = NULL;\r
       AsciiSPrint (\r
         ChunkLengthStr,\r
@@ -601,17 +611,18 @@ HttpIoSendChunkedTransfer (
         CHUNKED_TRANSFER_CODING_CR,\r
         CHUNKED_TRANSFER_CODING_LF\r
         );\r
-      MessageBody = AllocatePool (AsciiStrLen(ChunkLengthStr));\r
+      MessageBody = AllocatePool (AsciiStrLen (ChunkLengthStr));\r
       if (MessageBody == NULL) {\r
-        DEBUG((DEBUG_ERROR, "Not enough memory for the end chunk transfer\n"));\r
+        DEBUG ((DEBUG_ERROR, "Not enough memory for the end chunk transfer\n"));\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
+\r
       CopyMem (MessageBody, ChunkLengthStr, AsciiStrLen (ChunkLengthStr));\r
       MessageBodyLength = AsciiStrLen (ChunkLengthStr);\r
       *SendChunkProcess = HttpIoSendChunkFinish;\r
       break;\r
 \r
-  default:\r
+    default:\r
       return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -627,16 +638,20 @@ HttpIoSendChunkedTransfer (
     if (ContentLengthHeader->FieldName != NULL) {\r
       FreePool (ContentLengthHeader->FieldName);\r
     }\r
+\r
     if (ContentLengthHeader->FieldValue != NULL) {\r
       FreePool (ContentLengthHeader->FieldValue);\r
     }\r
   }\r
+\r
   if (NewHeaders != NULL) {\r
     FreePool (NewHeaders);\r
   }\r
+\r
   if (MessageBody != NULL) {\r
     FreePool (MessageBody);\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -661,30 +676,30 @@ HttpIoSendChunkedTransfer (
 **/\r
 EFI_STATUS\r
 HttpIoGetChunkedTransferContent (\r
-  IN     HTTP_IO              *HttpIo,\r
-  IN     UINTN                HeaderCount,\r
-  IN     EFI_HTTP_HEADER      *Headers,\r
-  OUT    LIST_ENTRY           **ChunkListHead,\r
-  OUT    UINTN                *ContentLength\r
+  IN     HTTP_IO          *HttpIo,\r
+  IN     UINTN            HeaderCount,\r
+  IN     EFI_HTTP_HEADER  *Headers,\r
+  OUT    LIST_ENTRY       **ChunkListHead,\r
+  OUT    UINTN            *ContentLength\r
   )\r
 {\r
-  EFI_HTTP_HEADER       *Header;\r
-  CHAR8                 ChunkSizeAscii [256];\r
-  EFI_STATUS            Status;\r
-  UINTN                 Index;\r
-  HTTP_IO_RESPONSE_DATA ResponseData;\r
-  UINTN                 TotalLength;\r
-  UINTN                 MaxTotalLength;\r
-  LIST_ENTRY            *HttpChunks;\r
-  HTTP_IO_CHUNKS        *ThisChunk;\r
-  LIST_ENTRY            *ThisListEntry;\r
-\r
-  if (ChunkListHead == NULL || ContentLength == NULL) {\r
+  EFI_HTTP_HEADER        *Header;\r
+  CHAR8                  ChunkSizeAscii[256];\r
+  EFI_STATUS             Status;\r
+  UINTN                  Index;\r
+  HTTP_IO_RESPONSE_DATA  ResponseData;\r
+  UINTN                  TotalLength;\r
+  UINTN                  MaxTotalLength;\r
+  LIST_ENTRY             *HttpChunks;\r
+  HTTP_IO_CHUNKS         *ThisChunk;\r
+  LIST_ENTRY             *ThisListEntry;\r
+\r
+  if ((ChunkListHead == NULL) || (ContentLength == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   *ContentLength = 0;\r
-  Header = HttpFindHeader (HeaderCount, Headers, HTTP_HEADER_TRANSFER_ENCODING);\r
+  Header         = HttpFindHeader (HeaderCount, Headers, HTTP_HEADER_TRANSFER_ENCODING);\r
   if (Header == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
@@ -692,30 +707,33 @@ HttpIoGetChunkedTransferContent (
   if (AsciiStrCmp (Header->FieldValue, HTTP_HEADER_TRANSFER_ENCODING_CHUNKED) != 0) {\r
     return EFI_NOT_FOUND;\r
   }\r
+\r
   //\r
   // Loop to get all chunks.\r
   //\r
-  TotalLength = 0;\r
+  TotalLength    = 0;\r
   MaxTotalLength = PcdGet32 (PcdMaxHttpChunkTransfer);\r
-  HttpChunks = (LIST_ENTRY *)AllocateZeroPool (sizeof (LIST_ENTRY));\r
+  HttpChunks     = (LIST_ENTRY *)AllocateZeroPool (sizeof (LIST_ENTRY));\r
   if (HttpChunks == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ExitDeleteChunks;\r
   }\r
+\r
   InitializeListHead (HttpChunks);\r
   DEBUG ((DEBUG_INFO, "     Chunked transfer\n"));\r
   while (TRUE) {\r
-    ZeroMem((VOID *)&ResponseData, sizeof(HTTP_IO_RESPONSE_DATA));\r
+    ZeroMem ((VOID *)&ResponseData, sizeof (HTTP_IO_RESPONSE_DATA));\r
     ResponseData.BodyLength = HTTP_IO_CHUNKED_TRANSFER_CODING_DATA_LENGTH;\r
-    ResponseData.Body = ChunkSizeAscii;\r
-    Status = HttpIoRecvResponse (\r
-               HttpIo,\r
-               FALSE,\r
-               &ResponseData\r
-               );\r
+    ResponseData.Body       = ChunkSizeAscii;\r
+    Status                  = HttpIoRecvResponse (\r
+                                HttpIo,\r
+                                FALSE,\r
+                                &ResponseData\r
+                                );\r
     if (EFI_ERROR (Status)) {\r
       goto ExitDeleteChunks;\r
     }\r
+\r
     //\r
     // Decoding Chunked Transfer Coding.\r
     // Only decode chunk-size and last chunk.\r
@@ -724,13 +742,14 @@ HttpIoGetChunkedTransferContent (
     //\r
     // Break if this is last chunk.\r
     //\r
-    if (ChunkSizeAscii [0] == CHUNKED_TRANSFER_CODING_LAST_CHUNK) {\r
+    if (ChunkSizeAscii[0] == CHUNKED_TRANSFER_CODING_LAST_CHUNK) {\r
       //\r
       // Check if this is a valid Last-Chunk.\r
       //\r
-      if ((ChunkSizeAscii [1] != CHUNKED_TRANSFER_CODING_CR) ||\r
-          (ChunkSizeAscii [2] != CHUNKED_TRANSFER_CODING_LF)\r
-          ) {\r
+      if ((ChunkSizeAscii[1] != CHUNKED_TRANSFER_CODING_CR) ||\r
+          (ChunkSizeAscii[2] != CHUNKED_TRANSFER_CODING_LF)\r
+          )\r
+      {\r
         DEBUG ((DEBUG_ERROR, "     This is an invalid Last-chunk\n"));\r
         Status = EFI_INVALID_PARAMETER;\r
         goto ExitDeleteChunks;\r
@@ -746,12 +765,13 @@ HttpIoGetChunkedTransferContent (
 \r
       InitializeListHead (&ThisChunk->NextChunk);\r
       ThisChunk->Length = ResponseData.BodyLength - 1 - 2; // Minus sizeof '0' and CRLF.\r
-      ThisChunk->Data = (CHAR8 *)AllocatePool (ThisChunk->Length);\r
+      ThisChunk->Data   = (CHAR8 *)AllocatePool (ThisChunk->Length);\r
       if (ThisChunk->Data == NULL) {\r
         FreePool ((UINT8 *)ThisChunk);\r
         Status = EFI_OUT_OF_RESOURCES;\r
         goto ExitDeleteChunks;\r
       }\r
+\r
       CopyMem ((UINT8 *)ThisChunk->Data, (UINT8 *)ResponseData.Body + 1, ThisChunk->Length);\r
       TotalLength += ThisChunk->Length;\r
       InsertTailList (HttpChunks, &ThisChunk->NextChunk);\r
@@ -762,16 +782,18 @@ HttpIoGetChunkedTransferContent (
     // Get the chunk length\r
     //\r
     Index = 0;\r
-    while ((ChunkSizeAscii [Index] != CHUNKED_TRANSFER_CODING_EXTENSION_SEPARATOR) &&\r
-           (ChunkSizeAscii [Index] != (CHAR8)CHUNKED_TRANSFER_CODING_CR) &&\r
-           (Index != HTTP_IO_CHUNKED_TRANSFER_CODING_DATA_LENGTH)) {\r
-      Index ++;\r
+    while ((ChunkSizeAscii[Index] != CHUNKED_TRANSFER_CODING_EXTENSION_SEPARATOR) &&\r
+           (ChunkSizeAscii[Index] != (CHAR8)CHUNKED_TRANSFER_CODING_CR) &&\r
+           (Index != HTTP_IO_CHUNKED_TRANSFER_CODING_DATA_LENGTH))\r
+    {\r
+      Index++;\r
     }\r
 \r
     if (Index == HTTP_IO_CHUNKED_TRANSFER_CODING_DATA_LENGTH) {\r
       Status = EFI_NOT_FOUND;\r
       goto ExitDeleteChunks;\r
     }\r
+\r
     ChunkSizeAscii[Index] = 0;\r
     AsciiStrHexToUintnS (ChunkSizeAscii, NULL, ContentLength);\r
     DEBUG ((DEBUG_INFO, "     Length of this chunk %d\n", *ContentLength));\r
@@ -783,16 +805,18 @@ HttpIoGetChunkedTransferContent (
       Status = EFI_OUT_OF_RESOURCES;\r
       goto ExitDeleteChunks;\r
     }\r
+\r
     ResponseData.BodyLength = *ContentLength;\r
-    ResponseData.Body = (CHAR8 *)AllocatePool (*ContentLength);\r
+    ResponseData.Body       = (CHAR8 *)AllocatePool (*ContentLength);\r
     if (ResponseData.Body == NULL) {\r
       FreePool (ThisChunk);\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto ExitDeleteChunks;\r
     }\r
+\r
     InitializeListHead (&ThisChunk->NextChunk);\r
     ThisChunk->Length = *ContentLength;\r
-    ThisChunk->Data = ResponseData.Body;\r
+    ThisChunk->Data   = ResponseData.Body;\r
     InsertTailList (HttpChunks, &ThisChunk->NextChunk);\r
     Status = HttpIoRecvResponse (\r
                HttpIo,\r
@@ -802,33 +826,37 @@ HttpIoGetChunkedTransferContent (
     if (EFI_ERROR (Status)) {\r
       goto ExitDeleteChunks;\r
     }\r
+\r
     //\r
     // Read CRLF\r
     //\r
-    ZeroMem((VOID *)&ResponseData, sizeof(HTTP_IO_RESPONSE_DATA));\r
+    ZeroMem ((VOID *)&ResponseData, sizeof (HTTP_IO_RESPONSE_DATA));\r
     ResponseData.BodyLength = 2;\r
-    ResponseData.Body = ChunkSizeAscii;\r
-    Status = HttpIoRecvResponse (\r
-               HttpIo,\r
-               FALSE,\r
-               &ResponseData\r
-               );\r
+    ResponseData.Body       = ChunkSizeAscii;\r
+    Status                  = HttpIoRecvResponse (\r
+                                HttpIo,\r
+                                FALSE,\r
+                                &ResponseData\r
+                                );\r
     if (EFI_ERROR (Status)) {\r
       goto ExitDeleteChunks;\r
     }\r
+\r
     //\r
     // Verify the end of chunk payload.\r
     //\r
-    if ((ChunkSizeAscii [0] != CHUNKED_TRANSFER_CODING_CR) ||\r
-        (ChunkSizeAscii [1] != CHUNKED_TRANSFER_CODING_LF)\r
-       ) {\r
-       DEBUG ((DEBUG_ERROR, "     This is an invalid End-of-chunk notation.\n"));\r
-       goto ExitDeleteChunks;\r
+    if ((ChunkSizeAscii[0] != CHUNKED_TRANSFER_CODING_CR) ||\r
+        (ChunkSizeAscii[1] != CHUNKED_TRANSFER_CODING_LF)\r
+        )\r
+    {\r
+      DEBUG ((DEBUG_ERROR, "     This is an invalid End-of-chunk notation.\n"));\r
+      goto ExitDeleteChunks;\r
     }\r
+\r
     TotalLength += *ContentLength;\r
     if (TotalLength > MaxTotalLength) {\r
-       DEBUG ((DEBUG_ERROR, "     Total chunk transfer payload exceeds the size defined by PcdMaxHttpChunkTransfer.\n"));\r
-       goto ExitDeleteChunks;\r
+      DEBUG ((DEBUG_ERROR, "     Total chunk transfer payload exceeds the size defined by PcdMaxHttpChunkTransfer.\n"));\r
+      goto ExitDeleteChunks;\r
     }\r
   }\r
 \r
@@ -839,16 +867,19 @@ HttpIoGetChunkedTransferContent (
 \r
 ExitDeleteChunks:\r
   if (HttpChunks != NULL) {\r
-    while (!IsListEmpty(HttpChunks)) {\r
+    while (!IsListEmpty (HttpChunks)) {\r
       ThisListEntry = GetFirstNode (HttpChunks);\r
       RemoveEntryList (ThisListEntry);\r
       ThisChunk = (HTTP_IO_CHUNKS *)ThisListEntry;\r
       if (ThisChunk->Data != NULL) {\r
         FreePool (ThisChunk->Data);\r
       }\r
-      FreePool(ThisListEntry);\r
+\r
+      FreePool (ThisListEntry);\r
     }\r
+\r
     FreePool (HttpChunks);\r
   }\r
+\r
   return Status;\r
 }\r
index 0bbe0fc5d7ce1fa61dcedc853a96b68a280a05eb..6a5d78629bb30ea1d835413ba064c7bef7cce69d 100644 (file)
@@ -10,8 +10,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "DxeHttpLib.h"\r
 \r
-\r
-\r
 /**\r
   Decode a percent-encoded URI component to the ASCII character.\r
 \r
@@ -31,41 +29,44 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 EFI_STATUS\r
 EFIAPI\r
 UriPercentDecode (\r
-  IN      CHAR8            *Buffer,\r
-  IN      UINT32            BufferLength,\r
-     OUT  CHAR8            *ResultBuffer,\r
-     OUT  UINT32           *ResultLength\r
+  IN      CHAR8   *Buffer,\r
+  IN      UINT32  BufferLength,\r
+  OUT  CHAR8      *ResultBuffer,\r
+  OUT  UINT32     *ResultLength\r
   )\r
 {\r
-  UINTN           Index;\r
-  UINTN           Offset;\r
-  CHAR8           HexStr[3];\r
+  UINTN  Index;\r
+  UINTN  Offset;\r
+  CHAR8  HexStr[3];\r
 \r
-  if (Buffer == NULL || BufferLength == 0 || ResultBuffer == NULL) {\r
+  if ((Buffer == NULL) || (BufferLength == 0) || (ResultBuffer == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Index = 0;\r
-  Offset = 0;\r
+  Index     = 0;\r
+  Offset    = 0;\r
   HexStr[2] = '\0';\r
   while (Index < BufferLength) {\r
     if (Buffer[Index] == '%') {\r
-      if (Index + 1 >= BufferLength || Index + 2 >= BufferLength ||\r
-          !NET_IS_HEX_CHAR (Buffer[Index+1]) || !NET_IS_HEX_CHAR (Buffer[Index+2])) {\r
+      if ((Index + 1 >= BufferLength) || (Index + 2 >= BufferLength) ||\r
+          !NET_IS_HEX_CHAR (Buffer[Index+1]) || !NET_IS_HEX_CHAR (Buffer[Index+2]))\r
+      {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
-      HexStr[0] = Buffer[Index+1];\r
-      HexStr[1] = Buffer[Index+2];\r
-      ResultBuffer[Offset] = (CHAR8) AsciiStrHexToUintn (HexStr);\r
-      Index += 3;\r
+\r
+      HexStr[0]            = Buffer[Index+1];\r
+      HexStr[1]            = Buffer[Index+2];\r
+      ResultBuffer[Offset] = (CHAR8)AsciiStrHexToUintn (HexStr);\r
+      Index               += 3;\r
     } else {\r
       ResultBuffer[Offset] = Buffer[Index];\r
       Index++;\r
     }\r
+\r
     Offset++;\r
   }\r
 \r
-  *ResultLength = (UINT32) Offset;\r
+  *ResultLength = (UINT32)Offset;\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -83,19 +84,18 @@ UriPercentDecode (
 **/\r
 HTTP_URL_PARSE_STATE\r
 NetHttpParseAuthorityChar (\r
-  IN  CHAR8                  Char,\r
-  IN  HTTP_URL_PARSE_STATE   State,\r
-  IN  BOOLEAN                *IsRightBracket\r
+  IN  CHAR8                 Char,\r
+  IN  HTTP_URL_PARSE_STATE  State,\r
+  IN  BOOLEAN               *IsRightBracket\r
   )\r
 {\r
-\r
   //\r
   // RFC 3986:\r
   // The authority component is preceded by a double slash ("//") and is\r
   // terminated by the next slash ("/"), question mark ("?"), or number\r
   // sign ("#") character, or by the end of the URI.\r
   //\r
-  if (Char == ' ' || Char == '\r' || Char == '\n') {\r
+  if ((Char == ' ') || (Char == '\r') || (Char == '\n')) {\r
     return UrlParserStateMax;\r
   }\r
 \r
@@ -103,40 +103,42 @@ NetHttpParseAuthorityChar (
   // authority   = [ userinfo "@" ] host [ ":" port ]\r
   //\r
   switch (State) {\r
-  case UrlParserUserInfo:\r
-    if (Char == '@') {\r
-      return UrlParserHostStart;\r
-    }\r
-    break;\r
+    case UrlParserUserInfo:\r
+      if (Char == '@') {\r
+        return UrlParserHostStart;\r
+      }\r
 \r
-  case UrlParserHost:\r
-  case UrlParserHostStart:\r
-    if (Char == '[') {\r
-      return UrlParserHostIpv6;\r
-    }\r
+      break;\r
 \r
-    if (Char == ':') {\r
-      return UrlParserPortStart;\r
-    }\r
+    case UrlParserHost:\r
+    case UrlParserHostStart:\r
+      if (Char == '[') {\r
+        return UrlParserHostIpv6;\r
+      }\r
 \r
-    return UrlParserHost;\r
+      if (Char == ':') {\r
+        return UrlParserPortStart;\r
+      }\r
 \r
-  case UrlParserHostIpv6:\r
-    if (Char == ']') {\r
-      *IsRightBracket = TRUE;\r
-    }\r
+      return UrlParserHost;\r
 \r
-    if (Char == ':' && *IsRightBracket) {\r
-      return UrlParserPortStart;\r
-    }\r
-    return UrlParserHostIpv6;\r
+    case UrlParserHostIpv6:\r
+      if (Char == ']') {\r
+        *IsRightBracket = TRUE;\r
+      }\r
+\r
+      if ((Char == ':') && *IsRightBracket) {\r
+        return UrlParserPortStart;\r
+      }\r
 \r
-  case UrlParserPort:\r
-  case UrlParserPortStart:\r
-    return UrlParserPort;\r
+      return UrlParserHostIpv6;\r
+\r
+    case UrlParserPort:\r
+    case UrlParserPortStart:\r
+      return UrlParserPort;\r
 \r
-  default:\r
-    break;\r
+    default:\r
+      break;\r
   }\r
 \r
   return State;\r
@@ -155,9 +157,9 @@ NetHttpParseAuthorityChar (
 **/\r
 EFI_STATUS\r
 NetHttpParseAuthority (\r
-  IN      CHAR8              *Url,\r
-  IN      BOOLEAN            FoundAt,\r
-  IN OUT  HTTP_URL_PARSER    *UrlParser\r
+  IN      CHAR8            *Url,\r
+  IN      BOOLEAN          FoundAt,\r
+  IN OUT  HTTP_URL_PARSER  *UrlParser\r
   )\r
 {\r
   CHAR8                 *Char;\r
@@ -180,38 +182,38 @@ NetHttpParseAuthority (
   }\r
 \r
   IsrightBracket = FALSE;\r
-  Field = HTTP_URI_FIELD_MAX;\r
-  OldField = Field;\r
-  Authority = Url + UrlParser->FieldData[HTTP_URI_FIELD_AUTHORITY].Offset;\r
-  Length = UrlParser->FieldData[HTTP_URI_FIELD_AUTHORITY].Length;\r
+  Field          = HTTP_URI_FIELD_MAX;\r
+  OldField       = Field;\r
+  Authority      = Url + UrlParser->FieldData[HTTP_URI_FIELD_AUTHORITY].Offset;\r
+  Length         = UrlParser->FieldData[HTTP_URI_FIELD_AUTHORITY].Length;\r
   for (Char = Authority; Char < Authority + Length; Char++) {\r
     State = NetHttpParseAuthorityChar (*Char, State, &IsrightBracket);\r
     switch (State) {\r
-    case UrlParserStateMax:\r
-      return EFI_INVALID_PARAMETER;\r
+      case UrlParserStateMax:\r
+        return EFI_INVALID_PARAMETER;\r
 \r
-    case UrlParserHostStart:\r
-    case UrlParserPortStart:\r
-      continue;\r
+      case UrlParserHostStart:\r
+      case UrlParserPortStart:\r
+        continue;\r
 \r
-    case UrlParserUserInfo:\r
-      Field = HTTP_URI_FIELD_USERINFO;\r
-      break;\r
+      case UrlParserUserInfo:\r
+        Field = HTTP_URI_FIELD_USERINFO;\r
+        break;\r
 \r
-    case UrlParserHost:\r
-      Field = HTTP_URI_FIELD_HOST;\r
-      break;\r
+      case UrlParserHost:\r
+        Field = HTTP_URI_FIELD_HOST;\r
+        break;\r
 \r
-    case UrlParserHostIpv6:\r
-      Field = HTTP_URI_FIELD_HOST;\r
-      break;\r
+      case UrlParserHostIpv6:\r
+        Field = HTTP_URI_FIELD_HOST;\r
+        break;\r
 \r
-    case UrlParserPort:\r
-      Field = HTTP_URI_FIELD_PORT;\r
-      break;\r
+      case UrlParserPort:\r
+        Field = HTTP_URI_FIELD_PORT;\r
+        break;\r
 \r
-    default:\r
-      ASSERT (FALSE);\r
+      default:\r
+        ASSERT (FALSE);\r
     }\r
 \r
     //\r
@@ -226,10 +228,10 @@ NetHttpParseAuthority (
     //\r
     // New field start\r
     //\r
-    UrlParser->FieldBitMap |= BIT (Field);\r
-    UrlParser->FieldData[Field].Offset = (UINT32) (Char - Url);\r
+    UrlParser->FieldBitMap            |= BIT (Field);\r
+    UrlParser->FieldData[Field].Offset = (UINT32)(Char - Url);\r
     UrlParser->FieldData[Field].Length = 1;\r
-    OldField = Field;\r
+    OldField                           = Field;\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -246,11 +248,11 @@ NetHttpParseAuthority (
 **/\r
 HTTP_URL_PARSE_STATE\r
 NetHttpParseUrlChar (\r
-  IN  CHAR8                  Char,\r
-  IN  HTTP_URL_PARSE_STATE   State\r
+  IN  CHAR8                 Char,\r
+  IN  HTTP_URL_PARSE_STATE  State\r
   )\r
 {\r
-  if (Char == ' ' || Char == '\r' || Char == '\n') {\r
+  if ((Char == ' ') || (Char == '\r') || (Char == '\n')) {\r
     return UrlParserStateMax;\r
   }\r
 \r
@@ -264,76 +266,88 @@ NetHttpParseUrlChar (
   // authority   = [ userinfo "@" ] host [ ":" port ]\r
   //\r
   switch (State) {\r
-  case UrlParserUrlStart:\r
-    if (Char == '*' || Char == '/') {\r
-      return UrlParserPath;\r
-    }\r
-    return UrlParserScheme;\r
+    case UrlParserUrlStart:\r
+      if ((Char == '*') || (Char == '/')) {\r
+        return UrlParserPath;\r
+      }\r
 \r
-  case UrlParserScheme:\r
-    if (Char == ':') {\r
-      return UrlParserSchemeColon;\r
-    }\r
-    break;\r
+      return UrlParserScheme;\r
 \r
-  case UrlParserSchemeColon:\r
-    if (Char == '/') {\r
-      return UrlParserSchemeColonSlash;\r
-    }\r
-    break;\r
+    case UrlParserScheme:\r
+      if (Char == ':') {\r
+        return UrlParserSchemeColon;\r
+      }\r
 \r
-  case UrlParserSchemeColonSlash:\r
-    if (Char == '/') {\r
-      return UrlParserSchemeColonSlashSlash;\r
-    }\r
-    break;\r
+      break;\r
 \r
-  case UrlParserAtInAuthority:\r
-    if (Char == '@') {\r
-      return UrlParserStateMax;\r
-    }\r
+    case UrlParserSchemeColon:\r
+      if (Char == '/') {\r
+        return UrlParserSchemeColonSlash;\r
+      }\r
 \r
-  case UrlParserAuthority:\r
-  case UrlParserSchemeColonSlashSlash:\r
-    if (Char == '@') {\r
-      return UrlParserAtInAuthority;\r
-    }\r
-    if (Char == '/') {\r
-      return UrlParserPath;\r
-    }\r
-    if (Char == '?') {\r
-      return UrlParserQueryStart;\r
-    }\r
-    if (Char == '#') {\r
-      return UrlParserFragmentStart;\r
-    }\r
-    return UrlParserAuthority;\r
+      break;\r
 \r
-  case UrlParserPath:\r
-    if (Char == '?') {\r
-      return UrlParserQueryStart;\r
-    }\r
-    if (Char == '#') {\r
-      return UrlParserFragmentStart;\r
-    }\r
-    break;\r
+    case UrlParserSchemeColonSlash:\r
+      if (Char == '/') {\r
+        return UrlParserSchemeColonSlashSlash;\r
+      }\r
 \r
-  case UrlParserQuery:\r
-  case UrlParserQueryStart:\r
-    if (Char == '#') {\r
-      return UrlParserFragmentStart;\r
-    }\r
-    return UrlParserQuery;\r
+      break;\r
+\r
+    case UrlParserAtInAuthority:\r
+      if (Char == '@') {\r
+        return UrlParserStateMax;\r
+      }\r
 \r
-  case UrlParserFragmentStart:\r
-    return UrlParserFragment;\r
+    case UrlParserAuthority:\r
+    case UrlParserSchemeColonSlashSlash:\r
+      if (Char == '@') {\r
+        return UrlParserAtInAuthority;\r
+      }\r
+\r
+      if (Char == '/') {\r
+        return UrlParserPath;\r
+      }\r
+\r
+      if (Char == '?') {\r
+        return UrlParserQueryStart;\r
+      }\r
+\r
+      if (Char == '#') {\r
+        return UrlParserFragmentStart;\r
+      }\r
+\r
+      return UrlParserAuthority;\r
+\r
+    case UrlParserPath:\r
+      if (Char == '?') {\r
+        return UrlParserQueryStart;\r
+      }\r
+\r
+      if (Char == '#') {\r
+        return UrlParserFragmentStart;\r
+      }\r
+\r
+      break;\r
+\r
+    case UrlParserQuery:\r
+    case UrlParserQueryStart:\r
+      if (Char == '#') {\r
+        return UrlParserFragmentStart;\r
+      }\r
 \r
-  default:\r
-    break;\r
+      return UrlParserQuery;\r
+\r
+    case UrlParserFragmentStart:\r
+      return UrlParserFragment;\r
+\r
+    default:\r
+      break;\r
   }\r
 \r
   return State;\r
 }\r
+\r
 /**\r
   Create a URL parser for the input URL string.\r
 \r
@@ -354,10 +368,10 @@ NetHttpParseUrlChar (
 EFI_STATUS\r
 EFIAPI\r
 HttpParseUrl (\r
-  IN      CHAR8              *Url,\r
-  IN      UINT32             Length,\r
-  IN      BOOLEAN            IsConnectMethod,\r
-     OUT  VOID               **UrlParser\r
+  IN      CHAR8    *Url,\r
+  IN      UINT32   Length,\r
+  IN      BOOLEAN  IsConnectMethod,\r
+  OUT  VOID        **UrlParser\r
   )\r
 {\r
   HTTP_URL_PARSE_STATE  State;\r
@@ -370,7 +384,7 @@ HttpParseUrl (
 \r
   Parser = NULL;\r
 \r
-  if (Url == NULL || Length == 0 || UrlParser == NULL) {\r
+  if ((Url == NULL) || (Length == 0) || (UrlParser == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -388,9 +402,9 @@ HttpParseUrl (
     State = UrlParserUrlStart;\r
   }\r
 \r
-  Field = HTTP_URI_FIELD_MAX;\r
+  Field    = HTTP_URI_FIELD_MAX;\r
   OldField = Field;\r
-  FoundAt = FALSE;\r
+  FoundAt  = FALSE;\r
   for (Char = Url; Char < Url + Length; Char++) {\r
     //\r
     // Update state machine according to next char.\r
@@ -398,44 +412,44 @@ HttpParseUrl (
     State = NetHttpParseUrlChar (*Char, State);\r
 \r
     switch (State) {\r
-    case UrlParserStateMax:\r
-      FreePool (Parser);\r
-      return EFI_INVALID_PARAMETER;\r
+      case UrlParserStateMax:\r
+        FreePool (Parser);\r
+        return EFI_INVALID_PARAMETER;\r
 \r
-    case UrlParserSchemeColon:\r
-    case UrlParserSchemeColonSlash:\r
-    case UrlParserSchemeColonSlashSlash:\r
-    case UrlParserQueryStart:\r
-    case UrlParserFragmentStart:\r
-      //\r
-      // Skip all the delimiting char: "://" "?" "@"\r
-      //\r
-      continue;\r
+      case UrlParserSchemeColon:\r
+      case UrlParserSchemeColonSlash:\r
+      case UrlParserSchemeColonSlashSlash:\r
+      case UrlParserQueryStart:\r
+      case UrlParserFragmentStart:\r
+        //\r
+        // Skip all the delimiting char: "://" "?" "@"\r
+        //\r
+        continue;\r
 \r
-    case UrlParserScheme:\r
-      Field = HTTP_URI_FIELD_SCHEME;\r
-      break;\r
+      case UrlParserScheme:\r
+        Field = HTTP_URI_FIELD_SCHEME;\r
+        break;\r
 \r
-    case UrlParserAtInAuthority:\r
-      FoundAt = TRUE;\r
-    case UrlParserAuthority:\r
-      Field = HTTP_URI_FIELD_AUTHORITY;\r
-      break;\r
+      case UrlParserAtInAuthority:\r
+        FoundAt = TRUE;\r
+      case UrlParserAuthority:\r
+        Field = HTTP_URI_FIELD_AUTHORITY;\r
+        break;\r
 \r
-    case UrlParserPath:\r
-      Field = HTTP_URI_FIELD_PATH;\r
-      break;\r
+      case UrlParserPath:\r
+        Field = HTTP_URI_FIELD_PATH;\r
+        break;\r
 \r
-    case UrlParserQuery:\r
-      Field = HTTP_URI_FIELD_QUERY;\r
-      break;\r
+      case UrlParserQuery:\r
+        Field = HTTP_URI_FIELD_QUERY;\r
+        break;\r
 \r
-    case UrlParserFragment:\r
-      Field = HTTP_URI_FIELD_FRAGMENT;\r
-      break;\r
+      case UrlParserFragment:\r
+        Field = HTTP_URI_FIELD_FRAGMENT;\r
+        break;\r
 \r
-    default:\r
-      ASSERT (FALSE);\r
+      default:\r
+        ASSERT (FALSE);\r
     }\r
 \r
     //\r
@@ -450,10 +464,10 @@ HttpParseUrl (
     //\r
     // New field start\r
     //\r
-    Parser->FieldBitMap |= BIT (Field);\r
-    Parser->FieldData[Field].Offset = (UINT32) (Char - Url);\r
+    Parser->FieldBitMap            |= BIT (Field);\r
+    Parser->FieldData[Field].Offset = (UINT32)(Char - Url);\r
     Parser->FieldData[Field].Length = 1;\r
-    OldField = Field;\r
+    OldField                        = Field;\r
   }\r
 \r
   //\r
@@ -490,21 +504,21 @@ HttpParseUrl (
 EFI_STATUS\r
 EFIAPI\r
 HttpUrlGetHostName (\r
-  IN      CHAR8              *Url,\r
-  IN      VOID               *UrlParser,\r
-     OUT  CHAR8              **HostName\r
+  IN      CHAR8  *Url,\r
+  IN      VOID   *UrlParser,\r
+  OUT  CHAR8     **HostName\r
   )\r
 {\r
-  CHAR8                *Name;\r
-  EFI_STATUS           Status;\r
-  UINT32               ResultLength;\r
-  HTTP_URL_PARSER      *Parser;\r
+  CHAR8            *Name;\r
+  EFI_STATUS       Status;\r
+  UINT32           ResultLength;\r
+  HTTP_URL_PARSER  *Parser;\r
 \r
-  if (Url == NULL || UrlParser == NULL || HostName == NULL) {\r
+  if ((Url == NULL) || (UrlParser == NULL) || (HostName == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Parser = (HTTP_URL_PARSER *) UrlParser;\r
+  Parser = (HTTP_URL_PARSER *)UrlParser;\r
 \r
   if ((Parser->FieldBitMap & BIT (HTTP_URI_FIELD_HOST)) == 0) {\r
     return EFI_NOT_FOUND;\r
@@ -527,11 +541,10 @@ HttpUrlGetHostName (
   }\r
 \r
   Name[ResultLength] = '\0';\r
-  *HostName = Name;\r
+  *HostName          = Name;\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Get the IPv4 address from a HTTP URL.\r
 \r
@@ -550,21 +563,21 @@ HttpUrlGetHostName (
 EFI_STATUS\r
 EFIAPI\r
 HttpUrlGetIp4 (\r
-  IN      CHAR8              *Url,\r
-  IN      VOID               *UrlParser,\r
-     OUT  EFI_IPv4_ADDRESS   *Ip4Address\r
+  IN      CHAR8          *Url,\r
+  IN      VOID           *UrlParser,\r
+  OUT  EFI_IPv4_ADDRESS  *Ip4Address\r
   )\r
 {\r
-  CHAR8                *Ip4String;\r
-  EFI_STATUS           Status;\r
-  UINT32               ResultLength;\r
-  HTTP_URL_PARSER      *Parser;\r
+  CHAR8            *Ip4String;\r
+  EFI_STATUS       Status;\r
+  UINT32           ResultLength;\r
+  HTTP_URL_PARSER  *Parser;\r
 \r
-  if (Url == NULL || UrlParser == NULL || Ip4Address == NULL) {\r
+  if ((Url == NULL) || (UrlParser == NULL) || (Ip4Address == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Parser = (HTTP_URL_PARSER *) UrlParser;\r
+  Parser = (HTTP_URL_PARSER *)UrlParser;\r
 \r
   if ((Parser->FieldBitMap & BIT (HTTP_URI_FIELD_HOST)) == 0) {\r
     return EFI_NOT_FOUND;\r
@@ -587,7 +600,7 @@ HttpUrlGetIp4 (
   }\r
 \r
   Ip4String[ResultLength] = '\0';\r
-  Status = NetLibAsciiStrToIp4 (Ip4String, Ip4Address);\r
+  Status                  = NetLibAsciiStrToIp4 (Ip4String, Ip4Address);\r
   FreePool (Ip4String);\r
 \r
   return Status;\r
@@ -611,23 +624,23 @@ HttpUrlGetIp4 (
 EFI_STATUS\r
 EFIAPI\r
 HttpUrlGetIp6 (\r
-  IN      CHAR8              *Url,\r
-  IN      VOID               *UrlParser,\r
-     OUT  EFI_IPv6_ADDRESS   *Ip6Address\r
+  IN      CHAR8          *Url,\r
+  IN      VOID           *UrlParser,\r
+  OUT  EFI_IPv6_ADDRESS  *Ip6Address\r
   )\r
 {\r
-  CHAR8                *Ip6String;\r
-  CHAR8                *Ptr;\r
-  UINT32               Length;\r
-  EFI_STATUS           Status;\r
-  UINT32               ResultLength;\r
-  HTTP_URL_PARSER      *Parser;\r
-\r
-  if (Url == NULL || UrlParser == NULL || Ip6Address == NULL) {\r
+  CHAR8            *Ip6String;\r
+  CHAR8            *Ptr;\r
+  UINT32           Length;\r
+  EFI_STATUS       Status;\r
+  UINT32           ResultLength;\r
+  HTTP_URL_PARSER  *Parser;\r
+\r
+  if ((Url == NULL) || (UrlParser == NULL) || (Ip6Address == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Parser = (HTTP_URL_PARSER *) UrlParser;\r
+  Parser = (HTTP_URL_PARSER *)UrlParser;\r
 \r
   if ((Parser->FieldBitMap & BIT (HTTP_URI_FIELD_HOST)) == 0) {\r
     return EFI_NOT_FOUND;\r
@@ -641,7 +654,7 @@ HttpUrlGetIp6 (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Ptr    = Url + Parser->FieldData[HTTP_URI_FIELD_HOST].Offset;\r
+  Ptr = Url + Parser->FieldData[HTTP_URI_FIELD_HOST].Offset;\r
   if ((Ptr[0] != '[') || (Ptr[Length - 1] != ']')) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
@@ -663,7 +676,7 @@ HttpUrlGetIp6 (
   }\r
 \r
   Ip6String[ResultLength] = '\0';\r
-  Status = NetLibAsciiStrToIp6 (Ip6String, Ip6Address);\r
+  Status                  = NetLibAsciiStrToIp6 (Ip6String, Ip6Address);\r
   FreePool (Ip6String);\r
 \r
   return Status;\r
@@ -687,26 +700,26 @@ HttpUrlGetIp6 (
 EFI_STATUS\r
 EFIAPI\r
 HttpUrlGetPort (\r
-  IN      CHAR8              *Url,\r
-  IN      VOID               *UrlParser,\r
-     OUT  UINT16             *Port\r
+  IN      CHAR8  *Url,\r
+  IN      VOID   *UrlParser,\r
+  OUT  UINT16    *Port\r
   )\r
 {\r
-  CHAR8                *PortString;\r
-  EFI_STATUS           Status;\r
-  UINTN                Index;\r
-  UINTN                Data;\r
-  UINT32               ResultLength;\r
-  HTTP_URL_PARSER      *Parser;\r
-\r
-  if (Url == NULL || UrlParser == NULL || Port == NULL) {\r
+  CHAR8            *PortString;\r
+  EFI_STATUS       Status;\r
+  UINTN            Index;\r
+  UINTN            Data;\r
+  UINT32           ResultLength;\r
+  HTTP_URL_PARSER  *Parser;\r
+\r
+  if ((Url == NULL) || (UrlParser == NULL) || (Port == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   *Port = 0;\r
   Index = 0;\r
 \r
-  Parser = (HTTP_URL_PARSER *) UrlParser;\r
+  Parser = (HTTP_URL_PARSER *)UrlParser;\r
 \r
   if ((Parser->FieldBitMap & BIT (HTTP_URI_FIELD_PORT)) == 0) {\r
     return EFI_NOT_FOUND;\r
@@ -734,17 +747,18 @@ HttpUrlGetPort (
       Status = EFI_INVALID_PARAMETER;\r
       goto ON_EXIT;\r
     }\r
-    Index ++;\r
+\r
+    Index++;\r
   }\r
 \r
-  Status =  AsciiStrDecimalToUintnS (Url + Parser->FieldData[HTTP_URI_FIELD_PORT].Offset, (CHAR8 **) NULL, &Data);\r
+  Status =  AsciiStrDecimalToUintnS (Url + Parser->FieldData[HTTP_URI_FIELD_PORT].Offset, (CHAR8 **)NULL, &Data);\r
 \r
   if (Data > HTTP_URI_PORT_MAX_NUM) {\r
     Status = EFI_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
   }\r
 \r
-  *Port = (UINT16) Data;\r
+  *Port = (UINT16)Data;\r
 \r
 ON_EXIT:\r
   FreePool (PortString);\r
@@ -770,21 +784,21 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 HttpUrlGetPath (\r
-  IN      CHAR8              *Url,\r
-  IN      VOID               *UrlParser,\r
-     OUT  CHAR8              **Path\r
+  IN      CHAR8  *Url,\r
+  IN      VOID   *UrlParser,\r
+  OUT  CHAR8     **Path\r
   )\r
 {\r
-  CHAR8                *PathStr;\r
-  EFI_STATUS           Status;\r
-  UINT32               ResultLength;\r
-  HTTP_URL_PARSER      *Parser;\r
+  CHAR8            *PathStr;\r
+  EFI_STATUS       Status;\r
+  UINT32           ResultLength;\r
+  HTTP_URL_PARSER  *Parser;\r
 \r
-  if (Url == NULL || UrlParser == NULL || Path == NULL) {\r
+  if ((Url == NULL) || (UrlParser == NULL) || (Path == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Parser = (HTTP_URL_PARSER *) UrlParser;\r
+  Parser = (HTTP_URL_PARSER *)UrlParser;\r
 \r
   if ((Parser->FieldBitMap & BIT (HTTP_URI_FIELD_PATH)) == 0) {\r
     return EFI_NOT_FOUND;\r
@@ -807,7 +821,7 @@ HttpUrlGetPath (
   }\r
 \r
   PathStr[ResultLength] = '\0';\r
-  *Path = PathStr;\r
+  *Path                 = PathStr;\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -820,7 +834,7 @@ HttpUrlGetPath (
 VOID\r
 EFIAPI\r
 HttpUrlFreeParser (\r
-  IN      VOID               *UrlParser\r
+  IN      VOID  *UrlParser\r
   )\r
 {\r
   FreePool (UrlParser);\r
@@ -839,18 +853,18 @@ HttpUrlFreeParser (
 EFI_HTTP_HEADER *\r
 EFIAPI\r
 HttpFindHeader (\r
-  IN  UINTN                HeaderCount,\r
-  IN  EFI_HTTP_HEADER      *Headers,\r
-  IN  CHAR8                *FieldName\r
+  IN  UINTN            HeaderCount,\r
+  IN  EFI_HTTP_HEADER  *Headers,\r
+  IN  CHAR8            *FieldName\r
   )\r
 {\r
-  UINTN                 Index;\r
+  UINTN  Index;\r
 \r
-  if (HeaderCount == 0 || Headers == NULL || FieldName == NULL) {\r
+  if ((HeaderCount == 0) || (Headers == NULL) || (FieldName == NULL)) {\r
     return NULL;\r
   }\r
 \r
-  for (Index = 0; Index < HeaderCount; Index++){\r
+  for (Index = 0; Index < HeaderCount; Index++) {\r
     //\r
     // Field names are case-insensitive (RFC 2616).\r
     //\r
@@ -858,6 +872,7 @@ HttpFindHeader (
       return &Headers[Index];\r
     }\r
   }\r
+\r
   return NULL;\r
 }\r
 \r
@@ -879,17 +894,17 @@ typedef enum {
 } HTTP_BODY_PARSE_STATE;\r
 \r
 typedef struct {\r
-  BOOLEAN                       IgnoreBody;    // "MUST NOT" include a message-body\r
-  BOOLEAN                       IsChunked;     // "chunked" transfer-coding.\r
-  BOOLEAN                       ContentLengthIsValid;\r
-  UINTN                         ContentLength; // Entity length (not the message-body length), invalid until ContentLengthIsValid is TRUE\r
-\r
-  HTTP_BODY_PARSER_CALLBACK     Callback;\r
-  VOID                          *Context;\r
-  UINTN                         ParsedBodyLength;\r
-  HTTP_BODY_PARSE_STATE         State;\r
-  UINTN                         CurrentChunkSize;\r
-  UINTN                         CurrentChunkParsedSize;\r
+  BOOLEAN                      IgnoreBody;     // "MUST NOT" include a message-body\r
+  BOOLEAN                      IsChunked;      // "chunked" transfer-coding.\r
+  BOOLEAN                      ContentLengthIsValid;\r
+  UINTN                        ContentLength;  // Entity length (not the message-body length), invalid until ContentLengthIsValid is TRUE\r
+\r
+  HTTP_BODY_PARSER_CALLBACK    Callback;\r
+  VOID                         *Context;\r
+  UINTN                        ParsedBodyLength;\r
+  HTTP_BODY_PARSE_STATE        State;\r
+  UINTN                        CurrentChunkSize;\r
+  UINTN                        CurrentChunkParsedSize;\r
 } HTTP_BODY_PARSER;\r
 \r
 /**\r
@@ -902,10 +917,10 @@ typedef struct {
 **/\r
 UINTN\r
 HttpIoHexCharToUintn (\r
-  IN CHAR8           Char\r
+  IN CHAR8  Char\r
   )\r
 {\r
-  if (Char >= '0' && Char <= '9') {\r
+  if ((Char >= '0') && (Char <= '9')) {\r
     return Char - '0';\r
   }\r
 \r
@@ -925,19 +940,19 @@ HttpIoHexCharToUintn (
 **/\r
 EFI_STATUS\r
 HttpIoParseContentLengthHeader (\r
-  IN     UINTN                HeaderCount,\r
-  IN     EFI_HTTP_HEADER      *Headers,\r
-     OUT UINTN                *ContentLength\r
+  IN     UINTN            HeaderCount,\r
+  IN     EFI_HTTP_HEADER  *Headers,\r
+  OUT UINTN               *ContentLength\r
   )\r
 {\r
-  EFI_HTTP_HEADER       *Header;\r
+  EFI_HTTP_HEADER  *Header;\r
 \r
   Header = HttpFindHeader (HeaderCount, Headers, HTTP_HEADER_CONTENT_LENGTH);\r
   if (Header == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  return AsciiStrDecimalToUintnS (Header->FieldValue, (CHAR8 **) NULL, ContentLength);\r
+  return AsciiStrDecimalToUintnS (Header->FieldValue, (CHAR8 **)NULL, ContentLength);\r
 }\r
 \r
 /**\r
@@ -952,12 +967,11 @@ HttpIoParseContentLengthHeader (
 **/\r
 BOOLEAN\r
 HttpIoIsChunked (\r
-  IN   UINTN                    HeaderCount,\r
-  IN   EFI_HTTP_HEADER          *Headers\r
+  IN   UINTN            HeaderCount,\r
+  IN   EFI_HTTP_HEADER  *Headers\r
   )\r
 {\r
-  EFI_HTTP_HEADER       *Header;\r
-\r
+  EFI_HTTP_HEADER  *Header;\r
 \r
   Header = HttpFindHeader (HeaderCount, Headers, HTTP_HEADER_TRANSFER_ENCODING);\r
   if (Header == NULL) {\r
@@ -982,8 +996,8 @@ HttpIoIsChunked (
 **/\r
 BOOLEAN\r
 HttpIoNoMessageBody (\r
-  IN   EFI_HTTP_METHOD          Method,\r
-  IN   EFI_HTTP_STATUS_CODE     StatusCode\r
+  IN   EFI_HTTP_METHOD       Method,\r
+  IN   EFI_HTTP_STATUS_CODE  StatusCode\r
   )\r
 {\r
   //\r
@@ -1034,19 +1048,19 @@ HttpIoNoMessageBody (
 EFI_STATUS\r
 EFIAPI\r
 HttpInitMsgParser (\r
-  IN     EFI_HTTP_METHOD               Method,\r
-  IN     EFI_HTTP_STATUS_CODE          StatusCode,\r
-  IN     UINTN                         HeaderCount,\r
-  IN     EFI_HTTP_HEADER               *Headers,\r
-  IN     HTTP_BODY_PARSER_CALLBACK     Callback,\r
-  IN     VOID                          *Context,\r
-    OUT  VOID                          **MsgParser\r
+  IN     EFI_HTTP_METHOD            Method,\r
+  IN     EFI_HTTP_STATUS_CODE       StatusCode,\r
+  IN     UINTN                      HeaderCount,\r
+  IN     EFI_HTTP_HEADER            *Headers,\r
+  IN     HTTP_BODY_PARSER_CALLBACK  Callback,\r
+  IN     VOID                       *Context,\r
+  OUT  VOID                         **MsgParser\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
-  HTTP_BODY_PARSER      *Parser;\r
+  EFI_STATUS        Status;\r
+  HTTP_BODY_PARSER  *Parser;\r
 \r
-  if (HeaderCount != 0 && Headers == NULL) {\r
+  if ((HeaderCount != 0) && (Headers == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1069,7 +1083,7 @@ HttpInitMsgParser (
   //\r
   // 2. Check whether the message using "chunked" transfer-coding.\r
   //\r
-  Parser->IsChunked  = HttpIoIsChunked (HeaderCount, Headers);\r
+  Parser->IsChunked = HttpIoIsChunked (HeaderCount, Headers);\r
   //\r
   // 3. Check whether the message has a Content-Length header field.\r
   //\r
@@ -1077,6 +1091,7 @@ HttpInitMsgParser (
   if (!EFI_ERROR (Status)) {\r
     Parser->ContentLengthIsValid = TRUE;\r
   }\r
+\r
   //\r
   // 4. Range header is not supported now, so we won't meet media type "multipart/byteranges".\r
   // 5. By server closing the connection\r
@@ -1114,19 +1129,19 @@ HttpInitMsgParser (
 EFI_STATUS\r
 EFIAPI\r
 HttpParseMessageBody (\r
-  IN OUT VOID              *MsgParser,\r
-  IN     UINTN             BodyLength,\r
-  IN     CHAR8             *Body\r
+  IN OUT VOID   *MsgParser,\r
+  IN     UINTN  BodyLength,\r
+  IN     CHAR8  *Body\r
   )\r
 {\r
-  CHAR8                 *Char;\r
-  UINTN                 RemainderLengthInThis;\r
-  UINTN                 LengthForCallback;\r
-  UINTN                 PortionLength;\r
-  EFI_STATUS            Status;\r
-  HTTP_BODY_PARSER      *Parser;\r
-\r
-  if (BodyLength == 0 || Body == NULL) {\r
+  CHAR8             *Char;\r
+  UINTN             RemainderLengthInThis;\r
+  UINTN             LengthForCallback;\r
+  UINTN             PortionLength;\r
+  EFI_STATUS        Status;\r
+  HTTP_BODY_PARSER  *Parser;\r
+\r
+  if ((BodyLength == 0) || (Body == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1134,7 +1149,7 @@ HttpParseMessageBody (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Parser = (HTTP_BODY_PARSER *) MsgParser;\r
+  Parser = (HTTP_BODY_PARSER *)MsgParser;\r
 \r
   if (Parser->IgnoreBody) {\r
     Parser->State = BodyParserComplete;\r
@@ -1149,6 +1164,7 @@ HttpParseMessageBody (
         return Status;\r
       }\r
     }\r
+\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -1165,202 +1181,213 @@ HttpParseMessageBody (
   // The message body might be truncated in anywhere, so we need to parse is byte-by-byte.\r
   //\r
   for (Char = Body; Char < Body + BodyLength; ) {\r
-\r
     switch (Parser->State) {\r
-    case BodyParserStateMax:\r
-      return EFI_ABORTED;\r
+      case BodyParserStateMax:\r
+        return EFI_ABORTED;\r
 \r
-    case BodyParserBodyIdentity:\r
-      //\r
-      // Identity transfer-coding, just notify user to save the body data.\r
-      //\r
-      PortionLength = MIN (\r
-                        BodyLength,\r
-                        Parser->ContentLength - Parser->ParsedBodyLength\r
-                        );\r
-      if (PortionLength == 0) {\r
+      case BodyParserBodyIdentity:\r
         //\r
-        // Got BodyLength, but no ContentLength. Use BodyLength.\r
+        // Identity transfer-coding, just notify user to save the body data.\r
         //\r
-        PortionLength = BodyLength;\r
-        Parser->ContentLength = PortionLength;\r
-      }\r
-\r
-      if (Parser->Callback != NULL) {\r
-        Status = Parser->Callback (\r
-                           BodyParseEventOnData,\r
-                           Char,\r
-                           PortionLength,\r
-                           Parser->Context\r
-                           );\r
-        if (EFI_ERROR (Status)) {\r
-          return Status;\r
+        PortionLength = MIN (\r
+                          BodyLength,\r
+                          Parser->ContentLength - Parser->ParsedBodyLength\r
+                          );\r
+        if (PortionLength == 0) {\r
+          //\r
+          // Got BodyLength, but no ContentLength. Use BodyLength.\r
+          //\r
+          PortionLength         = BodyLength;\r
+          Parser->ContentLength = PortionLength;\r
         }\r
-      }\r
-      Char += PortionLength;\r
-      Parser->ParsedBodyLength += PortionLength;\r
-      if (Parser->ParsedBodyLength == Parser->ContentLength) {\r
-        Parser->State = BodyParserComplete;\r
+\r
         if (Parser->Callback != NULL) {\r
           Status = Parser->Callback (\r
-                             BodyParseEventOnComplete,\r
+                             BodyParseEventOnData,\r
                              Char,\r
-                             0,\r
+                             PortionLength,\r
                              Parser->Context\r
                              );\r
           if (EFI_ERROR (Status)) {\r
             return Status;\r
           }\r
         }\r
-      }\r
-      break;\r
 \r
-    case BodyParserChunkSizeStart:\r
-      //\r
-      // First byte of chunk-size, the chunk-size might be truncated.\r
-      //\r
-      Parser->CurrentChunkSize = 0;\r
-      Parser->State = BodyParserChunkSize;\r
-    case BodyParserChunkSize:\r
-      if (!NET_IS_HEX_CHAR (*Char)) {\r
-        if (*Char == ';') {\r
-          Parser->State = BodyParserChunkExtStart;\r
-          Char++;\r
-        } else if (*Char == '\r') {\r
-          Parser->State = BodyParserChunkSizeEndCR;\r
-          Char++;\r
-        } else {\r
-          Parser->State = BodyParserStateMax;\r
+        Char                     += PortionLength;\r
+        Parser->ParsedBodyLength += PortionLength;\r
+        if (Parser->ParsedBodyLength == Parser->ContentLength) {\r
+          Parser->State = BodyParserComplete;\r
+          if (Parser->Callback != NULL) {\r
+            Status = Parser->Callback (\r
+                               BodyParseEventOnComplete,\r
+                               Char,\r
+                               0,\r
+                               Parser->Context\r
+                               );\r
+            if (EFI_ERROR (Status)) {\r
+              return Status;\r
+            }\r
+          }\r
         }\r
+\r
         break;\r
-      }\r
 \r
-      if (Parser->CurrentChunkSize > (((~((UINTN) 0)) - 16) / 16)) {\r
-        return EFI_INVALID_PARAMETER;\r
-      }\r
-      Parser->CurrentChunkSize = Parser->CurrentChunkSize * 16 + HttpIoHexCharToUintn (*Char);\r
-      Char++;\r
-      break;\r
+      case BodyParserChunkSizeStart:\r
+        //\r
+        // First byte of chunk-size, the chunk-size might be truncated.\r
+        //\r
+        Parser->CurrentChunkSize = 0;\r
+        Parser->State            = BodyParserChunkSize;\r
+      case BodyParserChunkSize:\r
+        if (!NET_IS_HEX_CHAR (*Char)) {\r
+          if (*Char == ';') {\r
+            Parser->State = BodyParserChunkExtStart;\r
+            Char++;\r
+          } else if (*Char == '\r') {\r
+            Parser->State = BodyParserChunkSizeEndCR;\r
+            Char++;\r
+          } else {\r
+            Parser->State = BodyParserStateMax;\r
+          }\r
 \r
-    case BodyParserChunkExtStart:\r
-      //\r
-      // Ignore all the chunk extensions.\r
-      //\r
-      if (*Char == '\r') {\r
-        Parser->State = BodyParserChunkSizeEndCR;\r
-       }\r
-      Char++;\r
-      break;\r
+          break;\r
+        }\r
+\r
+        if (Parser->CurrentChunkSize > (((~((UINTN)0)) - 16) / 16)) {\r
+          return EFI_INVALID_PARAMETER;\r
+        }\r
 \r
-    case BodyParserChunkSizeEndCR:\r
-      if (*Char != '\n') {\r
-        Parser->State = BodyParserStateMax;\r
+        Parser->CurrentChunkSize = Parser->CurrentChunkSize * 16 + HttpIoHexCharToUintn (*Char);\r
+        Char++;\r
         break;\r
-      }\r
-      Char++;\r
-      if (Parser->CurrentChunkSize == 0) {\r
+\r
+      case BodyParserChunkExtStart:\r
         //\r
-        // The last chunk has been parsed and now assumed the state\r
-        // of HttpBodyParse is ParserLastCRLF. So it need to decide\r
-        // whether the rest message is trailer or last CRLF in the next round.\r
+        // Ignore all the chunk extensions.\r
         //\r
-        Parser->ContentLengthIsValid = TRUE;\r
-        Parser->State = BodyParserLastCRLF;\r
-        break;\r
-      }\r
-      Parser->State = BodyParserChunkDataStart;\r
-      Parser->CurrentChunkParsedSize = 0;\r
-      break;\r
+        if (*Char == '\r') {\r
+          Parser->State = BodyParserChunkSizeEndCR;\r
+        }\r
 \r
-    case BodyParserLastCRLF:\r
-      //\r
-      // Judge the byte is belong to the Last CRLF or trailer, and then\r
-      // configure the state of HttpBodyParse to corresponding state.\r
-      //\r
-      if (*Char == '\r') {\r
         Char++;\r
-        Parser->State = BodyParserLastCRLFEnd;\r
         break;\r
-      } else {\r
-        Parser->State = BodyParserTrailer;\r
+\r
+      case BodyParserChunkSizeEndCR:\r
+        if (*Char != '\n') {\r
+          Parser->State = BodyParserStateMax;\r
+          break;\r
+        }\r
+\r
+        Char++;\r
+        if (Parser->CurrentChunkSize == 0) {\r
+          //\r
+          // The last chunk has been parsed and now assumed the state\r
+          // of HttpBodyParse is ParserLastCRLF. So it need to decide\r
+          // whether the rest message is trailer or last CRLF in the next round.\r
+          //\r
+          Parser->ContentLengthIsValid = TRUE;\r
+          Parser->State                = BodyParserLastCRLF;\r
+          break;\r
+        }\r
+\r
+        Parser->State                  = BodyParserChunkDataStart;\r
+        Parser->CurrentChunkParsedSize = 0;\r
         break;\r
-      }\r
 \r
-    case BodyParserLastCRLFEnd:\r
-      if (*Char == '\n') {\r
-        Parser->State = BodyParserComplete;\r
+      case BodyParserLastCRLF:\r
+        //\r
+        // Judge the byte is belong to the Last CRLF or trailer, and then\r
+        // configure the state of HttpBodyParse to corresponding state.\r
+        //\r
+        if (*Char == '\r') {\r
+          Char++;\r
+          Parser->State = BodyParserLastCRLFEnd;\r
+          break;\r
+        } else {\r
+          Parser->State = BodyParserTrailer;\r
+          break;\r
+        }\r
+\r
+      case BodyParserLastCRLFEnd:\r
+        if (*Char == '\n') {\r
+          Parser->State = BodyParserComplete;\r
+          Char++;\r
+          if (Parser->Callback != NULL) {\r
+            Status = Parser->Callback (\r
+                               BodyParseEventOnComplete,\r
+                               Char,\r
+                               0,\r
+                               Parser->Context\r
+                               );\r
+            if (EFI_ERROR (Status)) {\r
+              return Status;\r
+            }\r
+          }\r
+\r
+          break;\r
+        } else {\r
+          Parser->State = BodyParserStateMax;\r
+          break;\r
+        }\r
+\r
+      case BodyParserTrailer:\r
+        if (*Char == '\r') {\r
+          Parser->State = BodyParserChunkSizeEndCR;\r
+        }\r
+\r
         Char++;\r
+        break;\r
+\r
+      case BodyParserChunkDataStart:\r
+        //\r
+        // First byte of chunk-data, the chunk data also might be truncated.\r
+        //\r
+        RemainderLengthInThis = BodyLength - (Char - Body);\r
+        LengthForCallback     = MIN (Parser->CurrentChunkSize - Parser->CurrentChunkParsedSize, RemainderLengthInThis);\r
         if (Parser->Callback != NULL) {\r
           Status = Parser->Callback (\r
-                             BodyParseEventOnComplete,\r
+                             BodyParseEventOnData,\r
                              Char,\r
-                             0,\r
+                             LengthForCallback,\r
                              Parser->Context\r
                              );\r
           if (EFI_ERROR (Status)) {\r
             return Status;\r
           }\r
         }\r
-        break;\r
-      } else {\r
-        Parser->State = BodyParserStateMax;\r
-        break;\r
-      }\r
 \r
-    case BodyParserTrailer:\r
-      if (*Char == '\r') {\r
-        Parser->State = BodyParserChunkSizeEndCR;\r
-      }\r
-      Char++;\r
-      break;\r
+        Char                           += LengthForCallback;\r
+        Parser->ContentLength          += LengthForCallback;\r
+        Parser->CurrentChunkParsedSize += LengthForCallback;\r
+        if (Parser->CurrentChunkParsedSize == Parser->CurrentChunkSize) {\r
+          Parser->State = BodyParserChunkDataEnd;\r
+        }\r
 \r
-    case BodyParserChunkDataStart:\r
-      //\r
-      // First byte of chunk-data, the chunk data also might be truncated.\r
-      //\r
-      RemainderLengthInThis = BodyLength - (Char - Body);\r
-      LengthForCallback = MIN (Parser->CurrentChunkSize - Parser->CurrentChunkParsedSize, RemainderLengthInThis);\r
-      if (Parser->Callback != NULL) {\r
-        Status = Parser->Callback (\r
-                           BodyParseEventOnData,\r
-                           Char,\r
-                           LengthForCallback,\r
-                           Parser->Context\r
-                           );\r
-        if (EFI_ERROR (Status)) {\r
-          return Status;\r
+        break;\r
+\r
+      case BodyParserChunkDataEnd:\r
+        if (*Char == '\r') {\r
+          Parser->State = BodyParserChunkDataEndCR;\r
+        } else {\r
+          Parser->State = BodyParserStateMax;\r
         }\r
-      }\r
-      Char += LengthForCallback;\r
-      Parser->ContentLength += LengthForCallback;\r
-      Parser->CurrentChunkParsedSize += LengthForCallback;\r
-      if (Parser->CurrentChunkParsedSize == Parser->CurrentChunkSize) {\r
-        Parser->State = BodyParserChunkDataEnd;\r
-      }\r
-      break;\r
 \r
-    case BodyParserChunkDataEnd:\r
-      if (*Char == '\r') {\r
-        Parser->State = BodyParserChunkDataEndCR;\r
-      } else {\r
-        Parser->State = BodyParserStateMax;\r
-      }\r
-      Char++;\r
-      break;\r
+        Char++;\r
+        break;\r
+\r
+      case BodyParserChunkDataEndCR:\r
+        if (*Char != '\n') {\r
+          Parser->State = BodyParserStateMax;\r
+          break;\r
+        }\r
 \r
-    case BodyParserChunkDataEndCR:\r
-      if (*Char != '\n') {\r
-        Parser->State = BodyParserStateMax;\r
+        Char++;\r
+        Parser->State = BodyParserChunkSizeStart;\r
         break;\r
-      }\r
-      Char++;\r
-      Parser->State = BodyParserChunkSizeStart;\r
-      break;\r
 \r
-    default:\r
-      break;\r
+      default:\r
+        break;\r
     }\r
-\r
   }\r
 \r
   if (Parser->State == BodyParserStateMax) {\r
@@ -1382,20 +1409,21 @@ HttpParseMessageBody (
 BOOLEAN\r
 EFIAPI\r
 HttpIsMessageComplete (\r
-  IN VOID              *MsgParser\r
+  IN VOID  *MsgParser\r
   )\r
 {\r
-  HTTP_BODY_PARSER      *Parser;\r
+  HTTP_BODY_PARSER  *Parser;\r
 \r
   if (MsgParser == NULL) {\r
     return FALSE;\r
   }\r
 \r
-  Parser = (HTTP_BODY_PARSER *) MsgParser;\r
+  Parser = (HTTP_BODY_PARSER *)MsgParser;\r
 \r
   if (Parser->State == BodyParserComplete) {\r
     return TRUE;\r
   }\r
+\r
   return FALSE;\r
 }\r
 \r
@@ -1415,17 +1443,17 @@ HttpIsMessageComplete (
 EFI_STATUS\r
 EFIAPI\r
 HttpGetEntityLength (\r
-  IN  VOID              *MsgParser,\r
-  OUT UINTN             *ContentLength\r
+  IN  VOID   *MsgParser,\r
+  OUT UINTN  *ContentLength\r
   )\r
 {\r
-  HTTP_BODY_PARSER      *Parser;\r
+  HTTP_BODY_PARSER  *Parser;\r
 \r
-  if (MsgParser == NULL || ContentLength == NULL) {\r
+  if ((MsgParser == NULL) || (ContentLength == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Parser = (HTTP_BODY_PARSER *) MsgParser;\r
+  Parser = (HTTP_BODY_PARSER *)MsgParser;\r
 \r
   if (!Parser->ContentLengthIsValid) {\r
     return EFI_NOT_READY;\r
@@ -1444,13 +1472,12 @@ HttpGetEntityLength (
 VOID\r
 EFIAPI\r
 HttpFreeMsgParser (\r
-  IN  VOID           *MsgParser\r
+  IN  VOID  *MsgParser\r
   )\r
 {\r
   FreePool (MsgParser);\r
 }\r
 \r
-\r
 /**\r
   Get the next string, which is distinguished by specified separator.\r
 \r
@@ -1464,20 +1491,22 @@ HttpFreeMsgParser (
 **/\r
 CHAR8 *\r
 AsciiStrGetNextToken (\r
-  IN CONST CHAR8 *String,\r
-  IN       CHAR8 Separator\r
+  IN CONST CHAR8  *String,\r
+  IN       CHAR8  Separator\r
   )\r
 {\r
-  CONST CHAR8 *Token;\r
+  CONST CHAR8  *Token;\r
 \r
   Token = String;\r
   while (TRUE) {\r
     if (*Token == 0) {\r
       return NULL;\r
     }\r
+\r
     if (*Token == Separator) {\r
       return (CHAR8 *)(Token + 1);\r
     }\r
+\r
     Token++;\r
   }\r
 }\r
@@ -1498,39 +1527,42 @@ AsciiStrGetNextToken (
 EFI_STATUS\r
 EFIAPI\r
 HttpSetFieldNameAndValue (\r
-  IN  OUT   EFI_HTTP_HEADER       *HttpHeader,\r
-  IN  CONST CHAR8                 *FieldName,\r
-  IN  CONST CHAR8                 *FieldValue\r
+  IN  OUT   EFI_HTTP_HEADER  *HttpHeader,\r
+  IN  CONST CHAR8            *FieldName,\r
+  IN  CONST CHAR8            *FieldValue\r
   )\r
 {\r
-  UINTN                       FieldNameSize;\r
-  UINTN                       FieldValueSize;\r
+  UINTN  FieldNameSize;\r
+  UINTN  FieldValueSize;\r
 \r
-  if (HttpHeader == NULL || FieldName == NULL || FieldValue == NULL) {\r
+  if ((HttpHeader == NULL) || (FieldName == NULL) || (FieldValue == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   if (HttpHeader->FieldName != NULL) {\r
     FreePool (HttpHeader->FieldName);\r
   }\r
+\r
   if (HttpHeader->FieldValue != NULL) {\r
     FreePool (HttpHeader->FieldValue);\r
   }\r
 \r
-  FieldNameSize = AsciiStrSize (FieldName);\r
+  FieldNameSize         = AsciiStrSize (FieldName);\r
   HttpHeader->FieldName = AllocateZeroPool (FieldNameSize);\r
   if (HttpHeader->FieldName == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   CopyMem (HttpHeader->FieldName, FieldName, FieldNameSize);\r
   HttpHeader->FieldName[FieldNameSize - 1] = 0;\r
 \r
-  FieldValueSize = AsciiStrSize (FieldValue);\r
+  FieldValueSize         = AsciiStrSize (FieldValue);\r
   HttpHeader->FieldValue = AllocateZeroPool (FieldValueSize);\r
   if (HttpHeader->FieldValue == NULL) {\r
     FreePool (HttpHeader->FieldName);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   CopyMem (HttpHeader->FieldValue, FieldValue, FieldValueSize);\r
   HttpHeader->FieldValue[FieldValueSize - 1] = 0;\r
 \r
@@ -1551,9 +1583,9 @@ HttpSetFieldNameAndValue (
 CHAR8 *\r
 EFIAPI\r
 HttpGetFieldNameAndValue (\r
-  IN     CHAR8   *String,\r
-     OUT CHAR8   **FieldName,\r
-     OUT CHAR8   **FieldValue\r
+  IN     CHAR8  *String,\r
+  OUT CHAR8     **FieldName,\r
+  OUT CHAR8     **FieldValue\r
   )\r
 {\r
   CHAR8  *FieldNameStr;\r
@@ -1561,7 +1593,7 @@ HttpGetFieldNameAndValue (
   CHAR8  *StrPtr;\r
   CHAR8  *EndofHeader;\r
 \r
-  if (String == NULL || FieldName == NULL || FieldValue == NULL) {\r
+  if ((String == NULL) || (FieldName == NULL) || (FieldValue == NULL)) {\r
     return NULL;\r
   }\r
 \r
@@ -1572,7 +1604,6 @@ HttpGetFieldNameAndValue (
   StrPtr        = NULL;\r
   EndofHeader   = NULL;\r
 \r
-\r
   //\r
   // Check whether the raw HTTP header string is valid or not.\r
   //\r
@@ -1596,7 +1627,7 @@ HttpGetFieldNameAndValue (
   //       SP   = ' '.\r
   //       HT   = '\t' (Tab).\r
   //\r
-  FieldNameStr = String;\r
+  FieldNameStr  = String;\r
   FieldValueStr = AsciiStrGetNextToken (FieldNameStr, ':');\r
   if (FieldValueStr == NULL) {\r
     return NULL;\r
@@ -1611,23 +1642,23 @@ HttpGetFieldNameAndValue (
   // Handle FieldValueStr, skip all the preceded LWS.\r
   //\r
   while (TRUE) {\r
-    if (*FieldValueStr == ' ' || *FieldValueStr == '\t') {\r
+    if ((*FieldValueStr == ' ') || (*FieldValueStr == '\t')) {\r
       //\r
       // Boundary condition check.\r
       //\r
-      if ((UINTN) EndofHeader - (UINTN) FieldValueStr < 1) {\r
+      if ((UINTN)EndofHeader - (UINTN)FieldValueStr < 1) {\r
         //\r
         // Wrong String format!\r
         //\r
         return NULL;\r
       }\r
 \r
-      FieldValueStr ++;\r
+      FieldValueStr++;\r
     } else if (*FieldValueStr == '\r') {\r
       //\r
       // Boundary condition check.\r
       //\r
-      if ((UINTN) EndofHeader - (UINTN) FieldValueStr < 3) {\r
+      if ((UINTN)EndofHeader - (UINTN)FieldValueStr < 3) {\r
         //\r
         // No more preceded LWS, so break here.\r
         //\r
@@ -1635,7 +1666,7 @@ HttpGetFieldNameAndValue (
       }\r
 \r
       if (*(FieldValueStr + 1) == '\n' ) {\r
-        if (*(FieldValueStr + 2) == ' ' || *(FieldValueStr + 2) == '\t') {\r
+        if ((*(FieldValueStr + 2) == ' ') || (*(FieldValueStr + 2) == '\t')) {\r
           FieldValueStr = FieldValueStr + 3;\r
         } else {\r
           //\r
@@ -1663,7 +1694,7 @@ HttpGetFieldNameAndValue (
     // Handle the LWS within the field value.\r
     //\r
     StrPtr = AsciiStrGetNextToken (StrPtr, '\r');\r
-    if (StrPtr == NULL || *StrPtr != '\n') {\r
+    if ((StrPtr == NULL) || (*StrPtr != '\n')) {\r
       //\r
       // Wrong String format!\r
       //\r
@@ -1681,7 +1712,7 @@ HttpGetFieldNameAndValue (
   //\r
   // Get FieldName and FieldValue.\r
   //\r
-  *FieldName = FieldNameStr;\r
+  *FieldName  = FieldNameStr;\r
   *FieldValue = FieldValueStr;\r
 \r
   return StrPtr;\r
@@ -1701,13 +1732,14 @@ HttpFreeHeaderFields (
   IN  UINTN            FieldCount\r
   )\r
 {\r
-  UINTN                       Index;\r
+  UINTN  Index;\r
 \r
   if (HeaderFields != NULL) {\r
     for (Index = 0; Index < FieldCount; Index++) {\r
       if (HeaderFields[Index].FieldName != NULL) {\r
         FreePool (HeaderFields[Index].FieldName);\r
       }\r
+\r
       if (HeaderFields[Index].FieldValue != NULL) {\r
         FreePool (HeaderFields[Index].FieldValue);\r
       }\r
@@ -1741,22 +1773,22 @@ HttpFreeHeaderFields (
 EFI_STATUS\r
 EFIAPI\r
 HttpGenRequestMessage (\r
-  IN     CONST EFI_HTTP_MESSAGE        *Message,\r
-  IN     CONST CHAR8                   *Url,\r
-     OUT CHAR8                         **RequestMsg,\r
-     OUT UINTN                         *RequestMsgSize\r
+  IN     CONST EFI_HTTP_MESSAGE  *Message,\r
+  IN     CONST CHAR8             *Url,\r
+  OUT CHAR8                      **RequestMsg,\r
+  OUT UINTN                      *RequestMsgSize\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  UINTN                            StrLength;\r
-  CHAR8                            *RequestPtr;\r
-  UINTN                            HttpHdrSize;\r
-  UINTN                            MsgSize;\r
-  BOOLEAN                          Success;\r
-  VOID                             *HttpHdr;\r
-  EFI_HTTP_HEADER                  **AppendList;\r
-  UINTN                            Index;\r
-  EFI_HTTP_UTILITIES_PROTOCOL      *HttpUtilitiesProtocol;\r
+  EFI_STATUS                   Status;\r
+  UINTN                        StrLength;\r
+  CHAR8                        *RequestPtr;\r
+  UINTN                        HttpHdrSize;\r
+  UINTN                        MsgSize;\r
+  BOOLEAN                      Success;\r
+  VOID                         *HttpHdr;\r
+  EFI_HTTP_HEADER              **AppendList;\r
+  UINTN                        Index;\r
+  EFI_HTTP_UTILITIES_PROTOCOL  *HttpUtilitiesProtocol;\r
 \r
   Status                = EFI_SUCCESS;\r
   HttpHdrSize           = 0;\r
@@ -1772,11 +1804,12 @@ HttpGenRequestMessage (
   // 3. If we do not have a Request, HeaderCount should be zero\r
   // 4. If we do not have Request and Headers, we need at least a message-body\r
   //\r
-  if ((Message == NULL || RequestMsg == NULL || RequestMsgSize == NULL) ||\r
-      (Message->Data.Request != NULL && Url == NULL) ||\r
-      (Message->Data.Request != NULL && Message->HeaderCount == 0) ||\r
-      (Message->Data.Request == NULL && Message->HeaderCount != 0) ||\r
-      (Message->Data.Request == NULL && Message->HeaderCount == 0 && Message->BodyLength == 0)) {\r
+  if (((Message == NULL) || (RequestMsg == NULL) || (RequestMsgSize == NULL)) ||\r
+      ((Message->Data.Request != NULL) && (Url == NULL)) ||\r
+      ((Message->Data.Request != NULL) && (Message->HeaderCount == 0)) ||\r
+      ((Message->Data.Request == NULL) && (Message->HeaderCount != 0)) ||\r
+      ((Message->Data.Request == NULL) && (Message->HeaderCount == 0) && (Message->BodyLength == 0)))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1787,11 +1820,11 @@ HttpGenRequestMessage (
     Status = gBS->LocateProtocol (\r
                     &gEfiHttpUtilitiesProtocolGuid,\r
                     NULL,\r
-                    (VOID **) &HttpUtilitiesProtocol\r
+                    (VOID **)&HttpUtilitiesProtocol\r
                     );\r
 \r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR,"Failed to locate Http Utilities protocol. Status = %r.\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "Failed to locate Http Utilities protocol. Status = %r.\n", Status));\r
       return Status;\r
     }\r
 \r
@@ -1803,7 +1836,7 @@ HttpGenRequestMessage (
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
-    for(Index = 0; Index < Message->HeaderCount; Index++){\r
+    for (Index = 0; Index < Message->HeaderCount; Index++) {\r
       AppendList[Index] = &Message->Headers[Index];\r
     }\r
 \r
@@ -1824,7 +1857,7 @@ HttpGenRequestMessage (
 \r
     FreePool (AppendList);\r
 \r
-    if (EFI_ERROR (Status) || HttpHdr == NULL){\r
+    if (EFI_ERROR (Status) || (HttpHdr == NULL)) {\r
       return Status;\r
     }\r
   }\r
@@ -1843,7 +1876,6 @@ HttpGenRequestMessage (
     MsgSize += HTTP_METHOD_MAXIMUM_LEN + AsciiStrLen (HTTP_VERSION_CRLF_STR) + AsciiStrLen (Url);\r
   }\r
 \r
-\r
   //\r
   // If we have a message body to be sent, account for it.\r
   //\r
@@ -1865,43 +1897,43 @@ HttpGenRequestMessage (
   //\r
   if (Message->Data.Request != NULL) {\r
     switch (Message->Data.Request->Method) {\r
-    case HttpMethodGet:\r
-      StrLength = sizeof (HTTP_METHOD_GET) - 1;\r
-      CopyMem (RequestPtr, HTTP_METHOD_GET, StrLength);\r
-      RequestPtr += StrLength;\r
-      break;\r
-    case HttpMethodPut:\r
-      StrLength = sizeof (HTTP_METHOD_PUT) - 1;\r
-      CopyMem (RequestPtr, HTTP_METHOD_PUT, StrLength);\r
-      RequestPtr += StrLength;\r
-      break;\r
-    case HttpMethodPatch:\r
-      StrLength = sizeof (HTTP_METHOD_PATCH) - 1;\r
-      CopyMem (RequestPtr, HTTP_METHOD_PATCH, StrLength);\r
-      RequestPtr += StrLength;\r
-      break;\r
-    case HttpMethodPost:\r
-      StrLength = sizeof (HTTP_METHOD_POST) - 1;\r
-      CopyMem (RequestPtr, HTTP_METHOD_POST, StrLength);\r
-      RequestPtr += StrLength;\r
-      break;\r
-    case HttpMethodHead:\r
-      StrLength = sizeof (HTTP_METHOD_HEAD) - 1;\r
-      CopyMem (RequestPtr, HTTP_METHOD_HEAD, StrLength);\r
-      RequestPtr += StrLength;\r
-      break;\r
-    case HttpMethodDelete:\r
-      StrLength = sizeof (HTTP_METHOD_DELETE) - 1;\r
-      CopyMem (RequestPtr, HTTP_METHOD_DELETE, StrLength);\r
-      RequestPtr += StrLength;\r
-      break;\r
-    default:\r
-      ASSERT (FALSE);\r
-      Status = EFI_INVALID_PARAMETER;\r
-      goto Exit;\r
+      case HttpMethodGet:\r
+        StrLength = sizeof (HTTP_METHOD_GET) - 1;\r
+        CopyMem (RequestPtr, HTTP_METHOD_GET, StrLength);\r
+        RequestPtr += StrLength;\r
+        break;\r
+      case HttpMethodPut:\r
+        StrLength = sizeof (HTTP_METHOD_PUT) - 1;\r
+        CopyMem (RequestPtr, HTTP_METHOD_PUT, StrLength);\r
+        RequestPtr += StrLength;\r
+        break;\r
+      case HttpMethodPatch:\r
+        StrLength = sizeof (HTTP_METHOD_PATCH) - 1;\r
+        CopyMem (RequestPtr, HTTP_METHOD_PATCH, StrLength);\r
+        RequestPtr += StrLength;\r
+        break;\r
+      case HttpMethodPost:\r
+        StrLength = sizeof (HTTP_METHOD_POST) - 1;\r
+        CopyMem (RequestPtr, HTTP_METHOD_POST, StrLength);\r
+        RequestPtr += StrLength;\r
+        break;\r
+      case HttpMethodHead:\r
+        StrLength = sizeof (HTTP_METHOD_HEAD) - 1;\r
+        CopyMem (RequestPtr, HTTP_METHOD_HEAD, StrLength);\r
+        RequestPtr += StrLength;\r
+        break;\r
+      case HttpMethodDelete:\r
+        StrLength = sizeof (HTTP_METHOD_DELETE) - 1;\r
+        CopyMem (RequestPtr, HTTP_METHOD_DELETE, StrLength);\r
+        RequestPtr += StrLength;\r
+        break;\r
+      default:\r
+        ASSERT (FALSE);\r
+        Status = EFI_INVALID_PARAMETER;\r
+        goto Exit;\r
     }\r
 \r
-    StrLength = AsciiStrLen(EMPTY_SPACE);\r
+    StrLength = AsciiStrLen (EMPTY_SPACE);\r
     CopyMem (RequestPtr, EMPTY_SPACE, StrLength);\r
     RequestPtr += StrLength;\r
 \r
@@ -1934,7 +1966,7 @@ HttpGenRequestMessage (
   // Done\r
   //\r
   (*RequestMsgSize) = (UINTN)(RequestPtr) - (UINTN)(*RequestMsg);\r
-  Success     = TRUE;\r
+  Success           = TRUE;\r
 \r
 Exit:\r
 \r
@@ -1942,6 +1974,7 @@ Exit:
     if (*RequestMsg != NULL) {\r
       FreePool (*RequestMsg);\r
     }\r
+\r
     *RequestMsg = NULL;\r
     return Status;\r
   }\r
@@ -1965,95 +1998,95 @@ Exit:
 EFI_HTTP_STATUS_CODE\r
 EFIAPI\r
 HttpMappingToStatusCode (\r
-  IN UINTN                  StatusCode\r
+  IN UINTN  StatusCode\r
   )\r
 {\r
   switch (StatusCode) {\r
-  case 100:\r
-    return HTTP_STATUS_100_CONTINUE;\r
-  case 101:\r
-    return HTTP_STATUS_101_SWITCHING_PROTOCOLS;\r
-  case 200:\r
-    return HTTP_STATUS_200_OK;\r
-  case 201:\r
-    return HTTP_STATUS_201_CREATED;\r
-  case 202:\r
-    return HTTP_STATUS_202_ACCEPTED;\r
-  case 203:\r
-    return HTTP_STATUS_203_NON_AUTHORITATIVE_INFORMATION;\r
-  case 204:\r
-    return HTTP_STATUS_204_NO_CONTENT;\r
-  case 205:\r
-    return HTTP_STATUS_205_RESET_CONTENT;\r
-  case 206:\r
-    return HTTP_STATUS_206_PARTIAL_CONTENT;\r
-  case 300:\r
-    return HTTP_STATUS_300_MULTIPLE_CHOICES;\r
-  case 301:\r
-    return HTTP_STATUS_301_MOVED_PERMANENTLY;\r
-  case 302:\r
-    return HTTP_STATUS_302_FOUND;\r
-  case 303:\r
-    return HTTP_STATUS_303_SEE_OTHER;\r
-  case 304:\r
-    return HTTP_STATUS_304_NOT_MODIFIED;\r
-  case 305:\r
-    return HTTP_STATUS_305_USE_PROXY;\r
-  case 307:\r
-    return HTTP_STATUS_307_TEMPORARY_REDIRECT;\r
-  case 308:\r
-    return HTTP_STATUS_308_PERMANENT_REDIRECT;\r
-  case 400:\r
-    return HTTP_STATUS_400_BAD_REQUEST;\r
-  case 401:\r
-    return HTTP_STATUS_401_UNAUTHORIZED;\r
-  case 402:\r
-    return HTTP_STATUS_402_PAYMENT_REQUIRED;\r
-  case 403:\r
-    return HTTP_STATUS_403_FORBIDDEN;\r
-  case 404:\r
-    return HTTP_STATUS_404_NOT_FOUND;\r
-  case 405:\r
-    return HTTP_STATUS_405_METHOD_NOT_ALLOWED;\r
-  case 406:\r
-    return HTTP_STATUS_406_NOT_ACCEPTABLE;\r
-  case 407:\r
-    return HTTP_STATUS_407_PROXY_AUTHENTICATION_REQUIRED;\r
-  case 408:\r
-    return HTTP_STATUS_408_REQUEST_TIME_OUT;\r
-  case 409:\r
-    return HTTP_STATUS_409_CONFLICT;\r
-  case 410:\r
-    return HTTP_STATUS_410_GONE;\r
-  case 411:\r
-    return HTTP_STATUS_411_LENGTH_REQUIRED;\r
-  case 412:\r
-    return HTTP_STATUS_412_PRECONDITION_FAILED;\r
-  case 413:\r
-    return HTTP_STATUS_413_REQUEST_ENTITY_TOO_LARGE;\r
-  case 414:\r
-    return HTTP_STATUS_414_REQUEST_URI_TOO_LARGE;\r
-  case 415:\r
-    return HTTP_STATUS_415_UNSUPPORTED_MEDIA_TYPE;\r
-  case 416:\r
-    return HTTP_STATUS_416_REQUESTED_RANGE_NOT_SATISFIED;\r
-  case 417:\r
-    return HTTP_STATUS_417_EXPECTATION_FAILED;\r
-  case 500:\r
-    return HTTP_STATUS_500_INTERNAL_SERVER_ERROR;\r
-  case 501:\r
-    return HTTP_STATUS_501_NOT_IMPLEMENTED;\r
-  case 502:\r
-    return HTTP_STATUS_502_BAD_GATEWAY;\r
-  case 503:\r
-    return HTTP_STATUS_503_SERVICE_UNAVAILABLE;\r
-  case 504:\r
-    return HTTP_STATUS_504_GATEWAY_TIME_OUT;\r
-  case 505:\r
-    return HTTP_STATUS_505_HTTP_VERSION_NOT_SUPPORTED;\r
-\r
-  default:\r
-    return HTTP_STATUS_UNSUPPORTED_STATUS;\r
+    case 100:\r
+      return HTTP_STATUS_100_CONTINUE;\r
+    case 101:\r
+      return HTTP_STATUS_101_SWITCHING_PROTOCOLS;\r
+    case 200:\r
+      return HTTP_STATUS_200_OK;\r
+    case 201:\r
+      return HTTP_STATUS_201_CREATED;\r
+    case 202:\r
+      return HTTP_STATUS_202_ACCEPTED;\r
+    case 203:\r
+      return HTTP_STATUS_203_NON_AUTHORITATIVE_INFORMATION;\r
+    case 204:\r
+      return HTTP_STATUS_204_NO_CONTENT;\r
+    case 205:\r
+      return HTTP_STATUS_205_RESET_CONTENT;\r
+    case 206:\r
+      return HTTP_STATUS_206_PARTIAL_CONTENT;\r
+    case 300:\r
+      return HTTP_STATUS_300_MULTIPLE_CHOICES;\r
+    case 301:\r
+      return HTTP_STATUS_301_MOVED_PERMANENTLY;\r
+    case 302:\r
+      return HTTP_STATUS_302_FOUND;\r
+    case 303:\r
+      return HTTP_STATUS_303_SEE_OTHER;\r
+    case 304:\r
+      return HTTP_STATUS_304_NOT_MODIFIED;\r
+    case 305:\r
+      return HTTP_STATUS_305_USE_PROXY;\r
+    case 307:\r
+      return HTTP_STATUS_307_TEMPORARY_REDIRECT;\r
+    case 308:\r
+      return HTTP_STATUS_308_PERMANENT_REDIRECT;\r
+    case 400:\r
+      return HTTP_STATUS_400_BAD_REQUEST;\r
+    case 401:\r
+      return HTTP_STATUS_401_UNAUTHORIZED;\r
+    case 402:\r
+      return HTTP_STATUS_402_PAYMENT_REQUIRED;\r
+    case 403:\r
+      return HTTP_STATUS_403_FORBIDDEN;\r
+    case 404:\r
+      return HTTP_STATUS_404_NOT_FOUND;\r
+    case 405:\r
+      return HTTP_STATUS_405_METHOD_NOT_ALLOWED;\r
+    case 406:\r
+      return HTTP_STATUS_406_NOT_ACCEPTABLE;\r
+    case 407:\r
+      return HTTP_STATUS_407_PROXY_AUTHENTICATION_REQUIRED;\r
+    case 408:\r
+      return HTTP_STATUS_408_REQUEST_TIME_OUT;\r
+    case 409:\r
+      return HTTP_STATUS_409_CONFLICT;\r
+    case 410:\r
+      return HTTP_STATUS_410_GONE;\r
+    case 411:\r
+      return HTTP_STATUS_411_LENGTH_REQUIRED;\r
+    case 412:\r
+      return HTTP_STATUS_412_PRECONDITION_FAILED;\r
+    case 413:\r
+      return HTTP_STATUS_413_REQUEST_ENTITY_TOO_LARGE;\r
+    case 414:\r
+      return HTTP_STATUS_414_REQUEST_URI_TOO_LARGE;\r
+    case 415:\r
+      return HTTP_STATUS_415_UNSUPPORTED_MEDIA_TYPE;\r
+    case 416:\r
+      return HTTP_STATUS_416_REQUESTED_RANGE_NOT_SATISFIED;\r
+    case 417:\r
+      return HTTP_STATUS_417_EXPECTATION_FAILED;\r
+    case 500:\r
+      return HTTP_STATUS_500_INTERNAL_SERVER_ERROR;\r
+    case 501:\r
+      return HTTP_STATUS_501_NOT_IMPLEMENTED;\r
+    case 502:\r
+      return HTTP_STATUS_502_BAD_GATEWAY;\r
+    case 503:\r
+      return HTTP_STATUS_503_SERVICE_UNAVAILABLE;\r
+    case 504:\r
+      return HTTP_STATUS_504_GATEWAY_TIME_OUT;\r
+    case 505:\r
+      return HTTP_STATUS_505_HTTP_VERSION_NOT_SUPPORTED;\r
+\r
+    default:\r
+      return HTTP_STATUS_UNSUPPORTED_STATUS;\r
   }\r
 }\r
 \r
@@ -2071,12 +2104,12 @@ HttpMappingToStatusCode (
 BOOLEAN\r
 EFIAPI\r
 HttpIsValidHttpHeader (\r
-  IN  CHAR8            *DeleteList[],\r
-  IN  UINTN            DeleteCount,\r
-  IN  CHAR8            *FieldName\r
+  IN  CHAR8  *DeleteList[],\r
+  IN  UINTN  DeleteCount,\r
+  IN  CHAR8  *FieldName\r
   )\r
 {\r
-  UINTN                       Index;\r
+  UINTN  Index;\r
 \r
   if (FieldName == NULL) {\r
     return FALSE;\r
@@ -2095,7 +2128,6 @@ HttpIsValidHttpHeader (
   return TRUE;\r
 }\r
 \r
-\r
 /**\r
   Create a HTTP_IO_HEADER to hold the HTTP header items.\r
 \r
@@ -2106,10 +2138,10 @@ HttpIsValidHttpHeader (
 **/\r
 HTTP_IO_HEADER *\r
 HttpIoCreateHeader (\r
-  UINTN                     MaxHeaderCount\r
+  UINTN  MaxHeaderCount\r
   )\r
 {\r
-  HTTP_IO_HEADER        *HttpIoHeader;\r
+  HTTP_IO_HEADER  *HttpIoHeader;\r
 \r
   if (MaxHeaderCount == 0) {\r
     return NULL;\r
@@ -2121,7 +2153,7 @@ HttpIoCreateHeader (
   }\r
 \r
   HttpIoHeader->MaxHeaderCount = MaxHeaderCount;\r
-  HttpIoHeader->Headers = (EFI_HTTP_HEADER *) (HttpIoHeader + 1);\r
+  HttpIoHeader->Headers        = (EFI_HTTP_HEADER *)(HttpIoHeader + 1);\r
 \r
   return HttpIoHeader;\r
 }\r
@@ -2134,10 +2166,10 @@ HttpIoCreateHeader (
 **/\r
 VOID\r
 HttpIoFreeHeader (\r
-  IN  HTTP_IO_HEADER       *HttpIoHeader\r
+  IN  HTTP_IO_HEADER  *HttpIoHeader\r
   )\r
 {\r
-  UINTN      Index;\r
+  UINTN  Index;\r
 \r
   if (HttpIoHeader != NULL) {\r
     if (HttpIoHeader->HeaderCount != 0) {\r
@@ -2147,6 +2179,7 @@ HttpIoFreeHeader (
         FreePool (HttpIoHeader->Headers[Index].FieldValue);\r
       }\r
     }\r
+\r
     FreePool (HttpIoHeader);\r
   }\r
 }\r
@@ -2166,16 +2199,16 @@ HttpIoFreeHeader (
 **/\r
 EFI_STATUS\r
 HttpIoSetHeader (\r
-  IN  HTTP_IO_HEADER       *HttpIoHeader,\r
-  IN  CHAR8                *FieldName,\r
-  IN  CHAR8                *FieldValue\r
+  IN  HTTP_IO_HEADER  *HttpIoHeader,\r
+  IN  CHAR8           *FieldName,\r
+  IN  CHAR8           *FieldValue\r
   )\r
 {\r
-  EFI_HTTP_HEADER       *Header;\r
-  UINTN                 StrSize;\r
-  CHAR8                 *NewFieldValue;\r
+  EFI_HTTP_HEADER  *Header;\r
+  UINTN            StrSize;\r
+  CHAR8            *NewFieldValue;\r
 \r
-  if (HttpIoHeader == NULL || FieldName == NULL || FieldValue == NULL) {\r
+  if ((HttpIoHeader == NULL) || (FieldName == NULL) || (FieldValue == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -2187,22 +2220,25 @@ HttpIoSetHeader (
     if (HttpIoHeader->HeaderCount >= HttpIoHeader->MaxHeaderCount) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     Header = &HttpIoHeader->Headers[HttpIoHeader->HeaderCount];\r
 \r
-    StrSize = AsciiStrSize (FieldName);\r
+    StrSize           = AsciiStrSize (FieldName);\r
     Header->FieldName = AllocatePool (StrSize);\r
     if (Header->FieldName == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     CopyMem (Header->FieldName, FieldName, StrSize);\r
     Header->FieldName[StrSize -1] = '\0';\r
 \r
-    StrSize = AsciiStrSize (FieldValue);\r
+    StrSize            = AsciiStrSize (FieldValue);\r
     Header->FieldValue = AllocatePool (StrSize);\r
     if (Header->FieldValue == NULL) {\r
       FreePool (Header->FieldName);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     CopyMem (Header->FieldValue, FieldValue, StrSize);\r
     Header->FieldValue[StrSize -1] = '\0';\r
 \r
@@ -2211,17 +2247,19 @@ HttpIoSetHeader (
     //\r
     // Update an existing one.\r
     //\r
-    StrSize = AsciiStrSize (FieldValue);\r
+    StrSize       = AsciiStrSize (FieldValue);\r
     NewFieldValue = AllocatePool (StrSize);\r
     if (NewFieldValue == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     CopyMem (NewFieldValue, FieldValue, StrSize);\r
     NewFieldValue[StrSize -1] = '\0';\r
 \r
     if (Header->FieldValue != NULL) {\r
       FreePool (Header->FieldValue);\r
     }\r
+\r
     Header->FieldValue = NewFieldValue;\r
   }\r
 \r
index d064a98438065b72cf848fc33fc08e15ad3b5e25..6752475ce22cb4439b2d7972e02c98b46c76ae8f 100644 (file)
@@ -34,29 +34,29 @@ Header file for HttpLib.
 //\r
 // Field index of the HTTP URL parse result.\r
 //\r
-#define   HTTP_URI_FIELD_SCHEME           0\r
-#define   HTTP_URI_FIELD_AUTHORITY        1\r
-#define   HTTP_URI_FIELD_PATH             2\r
-#define   HTTP_URI_FIELD_QUERY            3\r
-#define   HTTP_URI_FIELD_FRAGMENT         4\r
-#define   HTTP_URI_FIELD_USERINFO         5\r
-#define   HTTP_URI_FIELD_HOST             6\r
-#define   HTTP_URI_FIELD_PORT             7\r
-#define   HTTP_URI_FIELD_MAX              8\r
+#define   HTTP_URI_FIELD_SCHEME     0\r
+#define   HTTP_URI_FIELD_AUTHORITY  1\r
+#define   HTTP_URI_FIELD_PATH       2\r
+#define   HTTP_URI_FIELD_QUERY      3\r
+#define   HTTP_URI_FIELD_FRAGMENT   4\r
+#define   HTTP_URI_FIELD_USERINFO   5\r
+#define   HTTP_URI_FIELD_HOST       6\r
+#define   HTTP_URI_FIELD_PORT       7\r
+#define   HTTP_URI_FIELD_MAX        8\r
 \r
-#define   HTTP_URI_PORT_MAX_NUM           65535\r
+#define   HTTP_URI_PORT_MAX_NUM  65535\r
 \r
 //\r
 // Structure to store the parse result of a HTTP URL.\r
 //\r
 typedef struct {\r
-  UINT32      Offset;\r
-  UINT32      Length;\r
+  UINT32    Offset;\r
+  UINT32    Length;\r
 } HTTP_URL_FILED_DATA;\r
 \r
 typedef struct {\r
-  UINT16                  FieldBitMap;\r
-  HTTP_URL_FILED_DATA     FieldData[HTTP_URI_FIELD_MAX];\r
+  UINT16                 FieldBitMap;\r
+  HTTP_URL_FILED_DATA    FieldData[HTTP_URI_FIELD_MAX];\r
 } HTTP_URL_PARSER;\r
 \r
 typedef enum {\r
@@ -82,4 +82,3 @@ typedef enum {
 } HTTP_URL_PARSE_STATE;\r
 \r
 #endif\r
-\r
index 0a816da001409953b363a07ebe8c24d8b2df1bda..d53411b64a8b8ae6fb6df077cf5214b82aa0c270 100644 (file)
@@ -18,7 +18,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/DpcLib.h>\r
 \r
-\r
 GLOBAL_REMOVE_IF_UNREFERENCED LIST_ENTRY  mActiveIpIoList = {\r
   &mActiveIpIoList,\r
   &mActiveIpIoList\r
@@ -31,8 +30,12 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_IP4_CONFIG_DATA  mIp4IoDefaultIpConfigData = {
   FALSE,\r
   FALSE,\r
   FALSE,\r
-  {{0, 0, 0, 0}},\r
-  {{0, 0, 0, 0}},\r
+  {\r
+    { 0,           0,  0, 0 }\r
+  },\r
+  {\r
+    { 0,           0,  0, 0 }\r
+  },\r
   0,\r
   255,\r
   FALSE,\r
@@ -46,8 +49,12 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_IP6_CONFIG_DATA  mIp6IoDefaultIpConfigData = {
   FALSE,\r
   TRUE,\r
   FALSE,\r
-  {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},\r
-  {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},\r
+  {\r
+    { 0,           0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }\r
+  },\r
+  {\r
+    { 0,           0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }\r
+  },\r
   0,\r
   255,\r
   0,\r
@@ -56,32 +63,31 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_IP6_CONFIG_DATA  mIp6IoDefaultIpConfigData = {
 };\r
 \r
 GLOBAL_REMOVE_IF_UNREFERENCED ICMP_ERROR_INFO  mIcmpErrMap[10] = {\r
-  {FALSE, TRUE }, // ICMP_ERR_UNREACH_NET\r
-  {FALSE, TRUE }, // ICMP_ERR_UNREACH_HOST\r
-  {TRUE,  TRUE }, // ICMP_ERR_UNREACH_PROTOCOL\r
-  {TRUE,  TRUE }, // ICMP_ERR_UNREACH_PORT\r
-  {TRUE,  TRUE }, // ICMP_ERR_MSGSIZE\r
-  {FALSE, TRUE }, // ICMP_ERR_UNREACH_SRCFAIL\r
-  {FALSE, TRUE }, // ICMP_ERR_TIMXCEED_INTRANS\r
-  {FALSE, TRUE }, // ICMP_ERR_TIMEXCEED_REASS\r
-  {FALSE, FALSE}, // ICMP_ERR_QUENCH\r
-  {FALSE, TRUE }  // ICMP_ERR_PARAMPROB\r
+  { FALSE, TRUE  }, // ICMP_ERR_UNREACH_NET\r
+  { FALSE, TRUE  }, // ICMP_ERR_UNREACH_HOST\r
+  { TRUE,  TRUE  }, // ICMP_ERR_UNREACH_PROTOCOL\r
+  { TRUE,  TRUE  }, // ICMP_ERR_UNREACH_PORT\r
+  { TRUE,  TRUE  }, // ICMP_ERR_MSGSIZE\r
+  { FALSE, TRUE  }, // ICMP_ERR_UNREACH_SRCFAIL\r
+  { FALSE, TRUE  }, // ICMP_ERR_TIMXCEED_INTRANS\r
+  { FALSE, TRUE  }, // ICMP_ERR_TIMEXCEED_REASS\r
+  { FALSE, FALSE }, // ICMP_ERR_QUENCH\r
+  { FALSE, TRUE  } // ICMP_ERR_PARAMPROB\r
 };\r
 \r
 GLOBAL_REMOVE_IF_UNREFERENCED ICMP_ERROR_INFO  mIcmp6ErrMap[10] = {\r
-  {FALSE, TRUE}, // ICMP6_ERR_UNREACH_NET\r
-  {FALSE, TRUE}, // ICMP6_ERR_UNREACH_HOST\r
-  {TRUE,  TRUE}, // ICMP6_ERR_UNREACH_PROTOCOL\r
-  {TRUE,  TRUE}, // ICMP6_ERR_UNREACH_PORT\r
-  {TRUE,  TRUE}, // ICMP6_ERR_PACKAGE_TOOBIG\r
-  {FALSE, TRUE}, // ICMP6_ERR_TIMXCEED_HOPLIMIT\r
-  {FALSE, TRUE}, // ICMP6_ERR_TIMXCEED_REASS\r
-  {FALSE, TRUE}, // ICMP6_ERR_PARAMPROB_HEADER\r
-  {FALSE, TRUE}, // ICMP6_ERR_PARAMPROB_NEXHEADER\r
-  {FALSE, TRUE}  // ICMP6_ERR_PARAMPROB_IPV6OPTION\r
+  { FALSE, TRUE }, // ICMP6_ERR_UNREACH_NET\r
+  { FALSE, TRUE }, // ICMP6_ERR_UNREACH_HOST\r
+  { TRUE,  TRUE }, // ICMP6_ERR_UNREACH_PROTOCOL\r
+  { TRUE,  TRUE }, // ICMP6_ERR_UNREACH_PORT\r
+  { TRUE,  TRUE }, // ICMP6_ERR_PACKAGE_TOOBIG\r
+  { FALSE, TRUE }, // ICMP6_ERR_TIMXCEED_HOPLIMIT\r
+  { FALSE, TRUE }, // ICMP6_ERR_TIMXCEED_REASS\r
+  { FALSE, TRUE }, // ICMP6_ERR_PARAMPROB_HEADER\r
+  { FALSE, TRUE }, // ICMP6_ERR_PARAMPROB_NEXHEADER\r
+  { FALSE, TRUE }  // ICMP6_ERR_PARAMPROB_IPV6OPTION\r
 };\r
 \r
-\r
 /**\r
   Notify function for IP transmit token.\r
 \r
@@ -91,10 +97,9 @@ GLOBAL_REMOVE_IF_UNREFERENCED ICMP_ERROR_INFO  mIcmp6ErrMap[10] = {
 VOID\r
 EFIAPI\r
 IpIoTransmitHandlerDpc (\r
-  IN VOID      *Context\r
+  IN VOID  *Context\r
   );\r
 \r
-\r
 /**\r
   Notify function for IP transmit token.\r
 \r
@@ -105,11 +110,10 @@ IpIoTransmitHandlerDpc (
 VOID\r
 EFIAPI\r
 IpIoTransmitHandler (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
-\r
 /**\r
   This function create an IP child ,open the IP protocol, and return the opened\r
   IP protocol as Interface.\r
@@ -143,7 +147,7 @@ IpIoCreateIpChildOpenProtocol (
   if (IpVersion == IP_VERSION_4) {\r
     ServiceBindingGuid = &gEfiIp4ServiceBindingProtocolGuid;\r
     IpProtocolGuid     = &gEfiIp4ProtocolGuid;\r
-  } else if (IpVersion == IP_VERSION_6){\r
+  } else if (IpVersion == IP_VERSION_6) {\r
     ServiceBindingGuid = &gEfiIp6ServiceBindingProtocolGuid;\r
     IpProtocolGuid     = &gEfiIp6ProtocolGuid;\r
   } else {\r
@@ -189,7 +193,6 @@ IpIoCreateIpChildOpenProtocol (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function close the previously opened IP protocol and destroy the IP child.\r
 \r
@@ -265,9 +268,9 @@ IpIoCloseProtocolDestroyIpChild (
 **/\r
 EFI_STATUS\r
 IpIoIcmpv4Handler (\r
-  IN     IP_IO                *IpIo,\r
-  IN OUT NET_BUF              *Pkt,\r
-  IN     EFI_NET_SESSION_DATA *Session\r
+  IN     IP_IO                 *IpIo,\r
+  IN OUT NET_BUF               *Pkt,\r
+  IN     EFI_NET_SESSION_DATA  *Session\r
   )\r
 {\r
   IP4_ICMP_ERROR_HEAD  *IcmpHdr;\r
@@ -291,10 +294,9 @@ IpIoIcmpv4Handler (
   }\r
 \r
   IcmpHdr = NET_PROTO_HDR (Pkt, IP4_ICMP_ERROR_HEAD);\r
-  IpHdr   = (EFI_IP4_HEADER *) (&IcmpHdr->IpHead);\r
+  IpHdr   = (EFI_IP4_HEADER *)(&IcmpHdr->IpHead);\r
 \r
   if (Pkt->TotalSize < ICMP_ERRLEN (IpHdr)) {\r
-\r
     return EFI_ABORTED;\r
   }\r
 \r
@@ -305,80 +307,80 @@ IpIoIcmpv4Handler (
   // Analyze the ICMP Error in this ICMP pkt\r
   //\r
   switch (Type) {\r
-  case ICMP_TYPE_UNREACH:\r
-    switch (Code) {\r
-    case ICMP_CODE_UNREACH_NET:\r
-    case ICMP_CODE_UNREACH_HOST:\r
-    case ICMP_CODE_UNREACH_PROTOCOL:\r
-    case ICMP_CODE_UNREACH_PORT:\r
-    case ICMP_CODE_UNREACH_SRCFAIL:\r
-      IcmpErr = (UINT8) (ICMP_ERR_UNREACH_NET + Code);\r
+    case ICMP_TYPE_UNREACH:\r
+      switch (Code) {\r
+        case ICMP_CODE_UNREACH_NET:\r
+        case ICMP_CODE_UNREACH_HOST:\r
+        case ICMP_CODE_UNREACH_PROTOCOL:\r
+        case ICMP_CODE_UNREACH_PORT:\r
+        case ICMP_CODE_UNREACH_SRCFAIL:\r
+          IcmpErr = (UINT8)(ICMP_ERR_UNREACH_NET + Code);\r
 \r
-      break;\r
+          break;\r
 \r
-    case ICMP_CODE_UNREACH_NEEDFRAG:\r
-      IcmpErr = ICMP_ERR_MSGSIZE;\r
+        case ICMP_CODE_UNREACH_NEEDFRAG:\r
+          IcmpErr = ICMP_ERR_MSGSIZE;\r
 \r
-      break;\r
+          break;\r
 \r
-    case ICMP_CODE_UNREACH_NET_UNKNOWN:\r
-    case ICMP_CODE_UNREACH_NET_PROHIB:\r
-    case ICMP_CODE_UNREACH_TOSNET:\r
-      IcmpErr = ICMP_ERR_UNREACH_NET;\r
+        case ICMP_CODE_UNREACH_NET_UNKNOWN:\r
+        case ICMP_CODE_UNREACH_NET_PROHIB:\r
+        case ICMP_CODE_UNREACH_TOSNET:\r
+          IcmpErr = ICMP_ERR_UNREACH_NET;\r
 \r
-      break;\r
+          break;\r
 \r
-    case ICMP_CODE_UNREACH_HOST_UNKNOWN:\r
-    case ICMP_CODE_UNREACH_ISOLATED:\r
-    case ICMP_CODE_UNREACH_HOST_PROHIB:\r
-    case ICMP_CODE_UNREACH_TOSHOST:\r
-      IcmpErr = ICMP_ERR_UNREACH_HOST;\r
+        case ICMP_CODE_UNREACH_HOST_UNKNOWN:\r
+        case ICMP_CODE_UNREACH_ISOLATED:\r
+        case ICMP_CODE_UNREACH_HOST_PROHIB:\r
+        case ICMP_CODE_UNREACH_TOSHOST:\r
+          IcmpErr = ICMP_ERR_UNREACH_HOST;\r
 \r
-      break;\r
+          break;\r
 \r
-    default:\r
-      return EFI_ABORTED;\r
-    }\r
+        default:\r
+          return EFI_ABORTED;\r
+      }\r
 \r
-    break;\r
+      break;\r
 \r
-  case ICMP_TYPE_TIMXCEED:\r
-    if (Code > 1) {\r
-      return EFI_ABORTED;\r
-    }\r
+    case ICMP_TYPE_TIMXCEED:\r
+      if (Code > 1) {\r
+        return EFI_ABORTED;\r
+      }\r
 \r
-    IcmpErr = (UINT8) (Code + ICMP_ERR_TIMXCEED_INTRANS);\r
+      IcmpErr = (UINT8)(Code + ICMP_ERR_TIMXCEED_INTRANS);\r
 \r
-    break;\r
+      break;\r
 \r
-  case ICMP_TYPE_PARAMPROB:\r
-    if (Code > 1) {\r
-      return EFI_ABORTED;\r
-    }\r
+    case ICMP_TYPE_PARAMPROB:\r
+      if (Code > 1) {\r
+        return EFI_ABORTED;\r
+      }\r
 \r
-    IcmpErr = ICMP_ERR_PARAMPROB;\r
+      IcmpErr = ICMP_ERR_PARAMPROB;\r
 \r
-    break;\r
+      break;\r
 \r
-  case ICMP_TYPE_SOURCEQUENCH:\r
-    if (Code != 0) {\r
-      return EFI_ABORTED;\r
-    }\r
+    case ICMP_TYPE_SOURCEQUENCH:\r
+      if (Code != 0) {\r
+        return EFI_ABORTED;\r
+      }\r
 \r
-    IcmpErr = ICMP_ERR_QUENCH;\r
+      IcmpErr = ICMP_ERR_QUENCH;\r
 \r
-    break;\r
+      break;\r
 \r
-  default:\r
-    return EFI_ABORTED;\r
+    default:\r
+      return EFI_ABORTED;\r
   }\r
 \r
   //\r
   // Notify user the ICMP pkt only containing payload except\r
   // IP and ICMP header\r
   //\r
-  PayLoadHdr = (UINT8 *) ((UINT8 *) IpHdr + EFI_IP4_HEADER_LEN (IpHdr));\r
-  TrimBytes  = (UINT32) (PayLoadHdr - (UINT8 *) IcmpHdr);\r
+  PayLoadHdr = (UINT8 *)((UINT8 *)IpHdr + EFI_IP4_HEADER_LEN (IpHdr));\r
+  TrimBytes  = (UINT32)(PayLoadHdr - (UINT8 *)IcmpHdr);\r
 \r
   NetbufTrim (Pkt, TrimBytes, TRUE);\r
 \r
@@ -407,9 +409,9 @@ IpIoIcmpv4Handler (
 **/\r
 EFI_STATUS\r
 IpIoIcmpv6Handler (\r
-  IN     IP_IO                *IpIo,\r
-  IN OUT NET_BUF              *Pkt,\r
-  IN     EFI_NET_SESSION_DATA *Session\r
+  IN     IP_IO                 *IpIo,\r
+  IN OUT NET_BUF               *Pkt,\r
+  IN     EFI_NET_SESSION_DATA  *Session\r
   )\r
 {\r
   IP6_ICMP_ERROR_HEAD  *IcmpHdr;\r
@@ -431,7 +433,6 @@ IpIoIcmpv6Handler (
   // Check the ICMPv6 packet length.\r
   //\r
   if (Pkt->TotalSize < sizeof (IP6_ICMP_ERROR_HEAD)) {\r
-\r
     return EFI_ABORTED;\r
   }\r
 \r
@@ -443,112 +444,112 @@ IpIoIcmpv6Handler (
   // Analyze the ICMPv6 Error in this ICMPv6 packet\r
   //\r
   switch (Type) {\r
-  case ICMP_V6_DEST_UNREACHABLE:\r
-    switch (Code) {\r
-    case ICMP_V6_NO_ROUTE_TO_DEST:\r
-    case ICMP_V6_BEYOND_SCOPE:\r
-    case ICMP_V6_ROUTE_REJECTED:\r
-      IcmpErr = ICMP6_ERR_UNREACH_NET;\r
+    case ICMP_V6_DEST_UNREACHABLE:\r
+      switch (Code) {\r
+        case ICMP_V6_NO_ROUTE_TO_DEST:\r
+        case ICMP_V6_BEYOND_SCOPE:\r
+        case ICMP_V6_ROUTE_REJECTED:\r
+          IcmpErr = ICMP6_ERR_UNREACH_NET;\r
 \r
-      break;\r
+          break;\r
 \r
-    case ICMP_V6_COMM_PROHIBITED:\r
-    case ICMP_V6_ADDR_UNREACHABLE:\r
-    case ICMP_V6_SOURCE_ADDR_FAILED:\r
-      IcmpErr = ICMP6_ERR_UNREACH_HOST;\r
+        case ICMP_V6_COMM_PROHIBITED:\r
+        case ICMP_V6_ADDR_UNREACHABLE:\r
+        case ICMP_V6_SOURCE_ADDR_FAILED:\r
+          IcmpErr = ICMP6_ERR_UNREACH_HOST;\r
 \r
-      break;\r
+          break;\r
 \r
-    case ICMP_V6_PORT_UNREACHABLE:\r
-      IcmpErr = ICMP6_ERR_UNREACH_PORT;\r
+        case ICMP_V6_PORT_UNREACHABLE:\r
+          IcmpErr = ICMP6_ERR_UNREACH_PORT;\r
 \r
-      break;\r
+          break;\r
 \r
-     default:\r
-      return EFI_ABORTED;\r
-    }\r
+        default:\r
+          return EFI_ABORTED;\r
+      }\r
 \r
-    break;\r
+      break;\r
 \r
-  case ICMP_V6_PACKET_TOO_BIG:\r
-    if (Code >= 1) {\r
-      return EFI_ABORTED;\r
-    }\r
+    case ICMP_V6_PACKET_TOO_BIG:\r
+      if (Code >= 1) {\r
+        return EFI_ABORTED;\r
+      }\r
 \r
-    IcmpErr = ICMP6_ERR_PACKAGE_TOOBIG;\r
+      IcmpErr = ICMP6_ERR_PACKAGE_TOOBIG;\r
 \r
-    break;\r
+      break;\r
 \r
-  case ICMP_V6_TIME_EXCEEDED:\r
-    if (Code > 1) {\r
-      return EFI_ABORTED;\r
-    }\r
+    case ICMP_V6_TIME_EXCEEDED:\r
+      if (Code > 1) {\r
+        return EFI_ABORTED;\r
+      }\r
 \r
-    IcmpErr = (UINT8) (ICMP6_ERR_TIMXCEED_HOPLIMIT + Code);\r
+      IcmpErr = (UINT8)(ICMP6_ERR_TIMXCEED_HOPLIMIT + Code);\r
 \r
-    break;\r
+      break;\r
 \r
-  case ICMP_V6_PARAMETER_PROBLEM:\r
-    if (Code > 3) {\r
-      return EFI_ABORTED;\r
-    }\r
+    case ICMP_V6_PARAMETER_PROBLEM:\r
+      if (Code > 3) {\r
+        return EFI_ABORTED;\r
+      }\r
 \r
-    IcmpErr = (UINT8) (ICMP6_ERR_PARAMPROB_HEADER + Code);\r
+      IcmpErr = (UINT8)(ICMP6_ERR_PARAMPROB_HEADER + Code);\r
 \r
-    break;\r
+      break;\r
 \r
-   default:\r
+    default:\r
 \r
-     return EFI_ABORTED;\r
-   }\r
+      return EFI_ABORTED;\r
+  }\r
 \r
   //\r
   // Notify user the ICMPv6 packet only containing payload except\r
   // IPv6 basic header, extension header and ICMP header\r
   //\r
 \r
-  IpHdr      = (EFI_IP6_HEADER *) (&IcmpHdr->IpHead);\r
+  IpHdr      = (EFI_IP6_HEADER *)(&IcmpHdr->IpHead);\r
   NextHeader = IpHdr->NextHeader;\r
-  PayLoadHdr = (UINT8 *) ((UINT8 *) IcmpHdr + sizeof (IP6_ICMP_ERROR_HEAD));\r
+  PayLoadHdr = (UINT8 *)((UINT8 *)IcmpHdr + sizeof (IP6_ICMP_ERROR_HEAD));\r
   Flag       = TRUE;\r
 \r
   do {\r
     switch (NextHeader) {\r
-    case EFI_IP_PROTO_UDP:\r
-    case EFI_IP_PROTO_TCP:\r
-    case EFI_IP_PROTO_ICMP:\r
-    case IP6_NO_NEXT_HEADER:\r
-      Flag = FALSE;\r
+      case EFI_IP_PROTO_UDP:\r
+      case EFI_IP_PROTO_TCP:\r
+      case EFI_IP_PROTO_ICMP:\r
+      case IP6_NO_NEXT_HEADER:\r
+        Flag = FALSE;\r
 \r
-      break;\r
+        break;\r
 \r
-    case IP6_HOP_BY_HOP:\r
-    case IP6_DESTINATION:\r
-      //\r
-      // The Hdr Ext Len is 8-bit unsigned integer in 8-octet units, not including\r
-      // the first 8 octets.\r
-      //\r
-      NextHeader = *(PayLoadHdr);\r
-      PayLoadHdr = (UINT8 *) (PayLoadHdr + (*(PayLoadHdr + 1) + 1) * 8);\r
+      case IP6_HOP_BY_HOP:\r
+      case IP6_DESTINATION:\r
+        //\r
+        // The Hdr Ext Len is 8-bit unsigned integer in 8-octet units, not including\r
+        // the first 8 octets.\r
+        //\r
+        NextHeader = *(PayLoadHdr);\r
+        PayLoadHdr = (UINT8 *)(PayLoadHdr + (*(PayLoadHdr + 1) + 1) * 8);\r
 \r
-      break;\r
+        break;\r
 \r
-    case IP6_FRAGMENT:\r
-      //\r
-      // The Fragment Header Length is 8 octets.\r
-      //\r
-      NextHeader = *(PayLoadHdr);\r
-      PayLoadHdr = (UINT8 *) (PayLoadHdr + 8);\r
+      case IP6_FRAGMENT:\r
+        //\r
+        // The Fragment Header Length is 8 octets.\r
+        //\r
+        NextHeader = *(PayLoadHdr);\r
+        PayLoadHdr = (UINT8 *)(PayLoadHdr + 8);\r
 \r
-      break;\r
+        break;\r
 \r
-    default:\r
+      default:\r
 \r
-      return EFI_ABORTED;\r
+        return EFI_ABORTED;\r
     }\r
   } while (Flag);\r
 \r
-  TrimBytes = (UINT32) (PayLoadHdr - (UINT8 *) IcmpHdr);\r
+  TrimBytes = (UINT32)(PayLoadHdr - (UINT8 *)IcmpHdr);\r
 \r
   NetbufTrim (Pkt, TrimBytes, TRUE);\r
 \r
@@ -577,27 +578,20 @@ IpIoIcmpv6Handler (
 **/\r
 EFI_STATUS\r
 IpIoIcmpHandler (\r
-  IN     IP_IO                *IpIo,\r
-  IN OUT NET_BUF              *Pkt,\r
-  IN     EFI_NET_SESSION_DATA *Session\r
+  IN     IP_IO                 *IpIo,\r
+  IN OUT NET_BUF               *Pkt,\r
+  IN     EFI_NET_SESSION_DATA  *Session\r
   )\r
 {\r
-\r
   if (IpIo->IpVersion == IP_VERSION_4) {\r
-\r
     return IpIoIcmpv4Handler (IpIo, Pkt, Session);\r
-\r
   } else if (IpIo->IpVersion == IP_VERSION_6) {\r
-\r
     return IpIoIcmpv6Handler (IpIo, Pkt, Session);\r
-\r
   } else {\r
-\r
     return EFI_UNSUPPORTED;\r
   }\r
 }\r
 \r
-\r
 /**\r
   Free function for receive token of IP_IO. It is used to\r
   signal the recycle event to notify IP to recycle the\r
@@ -612,10 +606,9 @@ IpIoExtFree (
   IN VOID  *Event\r
   )\r
 {\r
-  gBS->SignalEvent ((EFI_EVENT) Event);\r
+  gBS->SignalEvent ((EFI_EVENT)Event);\r
 }\r
 \r
-\r
 /**\r
   Create a send entry to wrap a packet before sending\r
   out it through IP.\r
@@ -634,24 +627,24 @@ IpIoExtFree (
 **/\r
 IP_IO_SEND_ENTRY *\r
 IpIoCreateSndEntry (\r
-  IN OUT IP_IO             *IpIo,\r
-  IN OUT NET_BUF           *Pkt,\r
-  IN     IP_IO_IP_PROTOCOL Sender,\r
-  IN     VOID              *Context    OPTIONAL,\r
-  IN     VOID              *NotifyData OPTIONAL,\r
-  IN     EFI_IP_ADDRESS    *Dest       OPTIONAL,\r
-  IN     IP_IO_OVERRIDE    *Override\r
+  IN OUT IP_IO              *IpIo,\r
+  IN OUT NET_BUF            *Pkt,\r
+  IN     IP_IO_IP_PROTOCOL  Sender,\r
+  IN     VOID               *Context    OPTIONAL,\r
+  IN     VOID               *NotifyData OPTIONAL,\r
+  IN     EFI_IP_ADDRESS     *Dest       OPTIONAL,\r
+  IN     IP_IO_OVERRIDE     *Override\r
   )\r
 {\r
-  IP_IO_SEND_ENTRY          *SndEntry;\r
-  EFI_EVENT                 Event;\r
-  EFI_STATUS                Status;\r
-  NET_FRAGMENT              *ExtFragment;\r
-  UINT32                    FragmentCount;\r
-  IP_IO_OVERRIDE            *OverrideData;\r
-  IP_IO_IP_TX_DATA          *TxData;\r
-  EFI_IP4_TRANSMIT_DATA     *Ip4TxData;\r
-  EFI_IP6_TRANSMIT_DATA     *Ip6TxData;\r
+  IP_IO_SEND_ENTRY       *SndEntry;\r
+  EFI_EVENT              Event;\r
+  EFI_STATUS             Status;\r
+  NET_FRAGMENT           *ExtFragment;\r
+  UINT32                 FragmentCount;\r
+  IP_IO_OVERRIDE         *OverrideData;\r
+  IP_IO_IP_TX_DATA       *TxData;\r
+  EFI_IP4_TRANSMIT_DATA  *Ip4TxData;\r
+  EFI_IP6_TRANSMIT_DATA  *Ip6TxData;\r
 \r
   if ((IpIo->IpVersion != IP_VERSION_4) && (IpIo->IpVersion != IP_VERSION_6)) {\r
     return NULL;\r
@@ -685,9 +678,9 @@ IpIoCreateSndEntry (
   //\r
   // Allocate resource for TxData\r
   //\r
-  TxData = (IP_IO_IP_TX_DATA *) AllocatePool (\r
-    sizeof (IP_IO_IP_TX_DATA) + sizeof (NET_FRAGMENT) * (FragmentCount - 1)\r
-    );\r
+  TxData = (IP_IO_IP_TX_DATA *)AllocatePool (\r
+                                 sizeof (IP_IO_IP_TX_DATA) + sizeof (NET_FRAGMENT) * (FragmentCount - 1)\r
+                                 );\r
 \r
   if (NULL == TxData) {\r
     goto ON_ERROR;\r
@@ -697,19 +690,17 @@ IpIoCreateSndEntry (
   // Build a fragment table to contain the fragments in the packet.\r
   //\r
   if (IpIo->IpVersion == IP_VERSION_4) {\r
-    ExtFragment = (NET_FRAGMENT *) TxData->Ip4TxData.FragmentTable;\r
+    ExtFragment = (NET_FRAGMENT *)TxData->Ip4TxData.FragmentTable;\r
   } else {\r
-    ExtFragment = (NET_FRAGMENT *) TxData->Ip6TxData.FragmentTable;\r
+    ExtFragment = (NET_FRAGMENT *)TxData->Ip6TxData.FragmentTable;\r
   }\r
 \r
   NetbufBuildExt (Pkt, ExtFragment, &FragmentCount);\r
 \r
-\r
   //\r
   // Allocate resource for OverrideData if needed\r
   //\r
   if (NULL != Override) {\r
-\r
     OverrideData = AllocateCopyPool (sizeof (IP_IO_OVERRIDE), Override);\r
     if (NULL == OverrideData) {\r
       goto ON_ERROR;\r
@@ -720,7 +711,6 @@ IpIoCreateSndEntry (
   // Set other fields of TxData except the fragment table\r
   //\r
   if (IpIo->IpVersion == IP_VERSION_4) {\r
-\r
     Ip4TxData = &TxData->Ip4TxData;\r
 \r
     IP4_COPY_ADDRESS (&Ip4TxData->DestinationAddress, Dest);\r
@@ -737,7 +727,6 @@ IpIoCreateSndEntry (
     SndEntry->SndToken.Ip4Token.Event         = Event;\r
     SndEntry->SndToken.Ip4Token.Packet.TxData = Ip4TxData;\r
   } else {\r
-\r
     Ip6TxData = &TxData->Ip6TxData;\r
 \r
     if (Dest != NULL) {\r
@@ -762,12 +751,12 @@ IpIoCreateSndEntry (
   //\r
   // Set the fields of SndEntry\r
   //\r
-  SndEntry->IpIo        = IpIo;\r
-  SndEntry->Ip          = Sender;\r
-  SndEntry->Context     = Context;\r
-  SndEntry->NotifyData  = NotifyData;\r
+  SndEntry->IpIo       = IpIo;\r
+  SndEntry->Ip         = Sender;\r
+  SndEntry->Context    = Context;\r
+  SndEntry->NotifyData = NotifyData;\r
 \r
-  SndEntry->Pkt         = Pkt;\r
+  SndEntry->Pkt = Pkt;\r
   NET_GET_REF (Pkt);\r
 \r
   InsertTailList (&IpIo->PendingSndList, &SndEntry->Entry);\r
@@ -795,7 +784,6 @@ ON_ERROR:
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Destroy the SndEntry.\r
 \r
@@ -814,15 +802,15 @@ IpIoDestroySndEntry (
   IP_IO_OVERRIDE    *Override;\r
 \r
   if (SndEntry->IpIo->IpVersion == IP_VERSION_4) {\r
-    Event              = SndEntry->SndToken.Ip4Token.Event;\r
-    TxData             = (IP_IO_IP_TX_DATA *) SndEntry->SndToken.Ip4Token.Packet.TxData;\r
-    Override           = (IP_IO_OVERRIDE *) TxData->Ip4TxData.OverrideData;\r
+    Event    = SndEntry->SndToken.Ip4Token.Event;\r
+    TxData   = (IP_IO_IP_TX_DATA *)SndEntry->SndToken.Ip4Token.Packet.TxData;\r
+    Override = (IP_IO_OVERRIDE *)TxData->Ip4TxData.OverrideData;\r
   } else if (SndEntry->IpIo->IpVersion == IP_VERSION_6) {\r
-    Event              = SndEntry->SndToken.Ip6Token.Event;\r
-    TxData             = (IP_IO_IP_TX_DATA *) SndEntry->SndToken.Ip6Token.Packet.TxData;\r
-    Override           = (IP_IO_OVERRIDE *) TxData->Ip6TxData.OverrideData;\r
+    Event    = SndEntry->SndToken.Ip6Token.Event;\r
+    TxData   = (IP_IO_IP_TX_DATA *)SndEntry->SndToken.Ip6Token.Packet.TxData;\r
+    Override = (IP_IO_OVERRIDE *)TxData->Ip6TxData.OverrideData;\r
   } else {\r
-    return ;\r
+    return;\r
   }\r
 \r
   gBS->CloseEvent (Event);\r
@@ -840,7 +828,6 @@ IpIoDestroySndEntry (
   FreePool (SndEntry);\r
 }\r
 \r
-\r
 /**\r
   Notify function for IP transmit token.\r
 \r
@@ -850,23 +837,23 @@ IpIoDestroySndEntry (
 VOID\r
 EFIAPI\r
 IpIoTransmitHandlerDpc (\r
-  IN VOID      *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
   IP_IO             *IpIo;\r
   IP_IO_SEND_ENTRY  *SndEntry;\r
   EFI_STATUS        Status;\r
 \r
-  SndEntry  = (IP_IO_SEND_ENTRY *) Context;\r
+  SndEntry = (IP_IO_SEND_ENTRY *)Context;\r
 \r
-  IpIo      = SndEntry->IpIo;\r
+  IpIo = SndEntry->IpIo;\r
 \r
   if (IpIo->IpVersion == IP_VERSION_4) {\r
     Status = SndEntry->SndToken.Ip4Token.Status;\r
-  } else if (IpIo->IpVersion == IP_VERSION_6){\r
+  } else if (IpIo->IpVersion == IP_VERSION_6) {\r
     Status = SndEntry->SndToken.Ip6Token.Status;\r
   } else {\r
-    return ;\r
+    return;\r
   }\r
 \r
   if ((IpIo->PktSentNotify != NULL) && (SndEntry->NotifyData != NULL)) {\r
@@ -881,7 +868,6 @@ IpIoTransmitHandlerDpc (
   IpIoDestroySndEntry (SndEntry);\r
 }\r
 \r
-\r
 /**\r
   Notify function for IP transmit token.\r
 \r
@@ -892,8 +878,8 @@ IpIoTransmitHandlerDpc (
 VOID\r
 EFIAPI\r
 IpIoTransmitHandler (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   //\r
@@ -902,7 +888,6 @@ IpIoTransmitHandler (
   QueueDpc (TPL_CALLBACK, IpIoTransmitHandlerDpc, Context);\r
 }\r
 \r
-\r
 /**\r
   The dummy handler for the dummy IP receive token.\r
 \r
@@ -912,17 +897,17 @@ IpIoTransmitHandler (
 VOID\r
 EFIAPI\r
 IpIoDummyHandlerDpc (\r
-  IN VOID      *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  IP_IO_IP_INFO             *IpInfo;\r
-  EFI_STATUS                 Status;\r
-  EFI_EVENT                  RecycleEvent;\r
+  IP_IO_IP_INFO  *IpInfo;\r
+  EFI_STATUS     Status;\r
+  EFI_EVENT      RecycleEvent;\r
 \r
-  IpInfo      = (IP_IO_IP_INFO *) Context;\r
+  IpInfo = (IP_IO_IP_INFO *)Context;\r
 \r
   if ((IpInfo->IpVersion != IP_VERSION_4) && (IpInfo->IpVersion != IP_VERSION_6)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   RecycleEvent = NULL;\r
@@ -941,8 +926,6 @@ IpIoDummyHandlerDpc (
     }\r
   }\r
 \r
-\r
-\r
   if (EFI_ABORTED == Status) {\r
     //\r
     // The reception is actively aborted by the consumer, directly return.\r
@@ -973,7 +956,6 @@ IpIoDummyHandlerDpc (
   }\r
 }\r
 \r
-\r
 /**\r
   This function add IpIoDummyHandlerDpc to the end of the DPC queue.\r
 \r
@@ -984,8 +966,8 @@ IpIoDummyHandlerDpc (
 VOID\r
 EFIAPI\r
 IpIoDummyHandler (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   //\r
@@ -994,7 +976,6 @@ IpIoDummyHandler (
   QueueDpc (TPL_CALLBACK, IpIoDummyHandlerDpc, Context);\r
 }\r
 \r
-\r
 /**\r
   Notify function for the IP receive token, used to process\r
   the received IP packets.\r
@@ -1005,7 +986,7 @@ IpIoDummyHandler (
 VOID\r
 EFIAPI\r
 IpIoListenHandlerDpc (\r
-  IN VOID      *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
   IP_IO                 *IpIo;\r
@@ -1014,14 +995,14 @@ IpIoListenHandlerDpc (
   EFI_NET_SESSION_DATA  Session;\r
   NET_BUF               *Pkt;\r
 \r
-  IpIo = (IP_IO *) Context;\r
+  IpIo = (IP_IO *)Context;\r
 \r
   if (IpIo->IpVersion == IP_VERSION_4) {\r
     Status = IpIo->RcvToken.Ip4Token.Status;\r
-    RxData = (IP_IO_IP_RX_DATA *) IpIo->RcvToken.Ip4Token.Packet.RxData;\r
+    RxData = (IP_IO_IP_RX_DATA *)IpIo->RcvToken.Ip4Token.Packet.RxData;\r
   } else if (IpIo->IpVersion == IP_VERSION_6) {\r
     Status = IpIo->RcvToken.Ip6Token.Status;\r
-    RxData = (IP_IO_IP_RX_DATA *) IpIo->RcvToken.Ip6Token.Packet.RxData;\r
+    RxData = (IP_IO_IP_RX_DATA *)IpIo->RcvToken.Ip6Token.Packet.RxData;\r
   } else {\r
     return;\r
   }\r
@@ -1064,10 +1045,12 @@ IpIoListenHandlerDpc (
       //\r
       goto CleanUp;\r
     }\r
+\r
     if ((EFI_IP4 (RxData->Ip4RxData.Header->SourceAddress) != 0) &&\r
         (IpIo->SubnetMask != 0) &&\r
-        IP4_NET_EQUAL (IpIo->StationIp, EFI_NTOHL (((EFI_IP4_RECEIVE_DATA *) RxData)->Header->SourceAddress), IpIo->SubnetMask) &&\r
-        !NetIp4IsUnicast (EFI_NTOHL (((EFI_IP4_RECEIVE_DATA *) RxData)->Header->SourceAddress), IpIo->SubnetMask)) {\r
+        IP4_NET_EQUAL (IpIo->StationIp, EFI_NTOHL (((EFI_IP4_RECEIVE_DATA *)RxData)->Header->SourceAddress), IpIo->SubnetMask) &&\r
+        !NetIp4IsUnicast (EFI_NTOHL (((EFI_IP4_RECEIVE_DATA *)RxData)->Header->SourceAddress), IpIo->SubnetMask))\r
+    {\r
       //\r
       // The source address doesn't match StationIp and it's not a unicast IP address, discard it.\r
       //\r
@@ -1090,7 +1073,7 @@ IpIoListenHandlerDpc (
     // Create a netbuffer representing IPv4 packet\r
     //\r
     Pkt = NetbufFromExt (\r
-            (NET_FRAGMENT *) RxData->Ip4RxData.FragmentTable,\r
+            (NET_FRAGMENT *)RxData->Ip4RxData.FragmentTable,\r
             RxData->Ip4RxData.FragmentCount,\r
             0,\r
             0,\r
@@ -1111,7 +1094,7 @@ IpIoListenHandlerDpc (
     Session.IpVersion      = IP_VERSION_4;\r
   } else {\r
     ASSERT (RxData->Ip6RxData.Header != NULL);\r
-    if (!NetIp6IsValidUnicast(&RxData->Ip6RxData.Header->SourceAddress)) {\r
+    if (!NetIp6IsValidUnicast (&RxData->Ip6RxData.Header->SourceAddress)) {\r
       goto CleanUp;\r
     }\r
 \r
@@ -1131,7 +1114,7 @@ IpIoListenHandlerDpc (
     // Create a netbuffer representing IPv6 packet\r
     //\r
     Pkt = NetbufFromExt (\r
-            (NET_FRAGMENT *) RxData->Ip6RxData.FragmentTable,\r
+            (NET_FRAGMENT *)RxData->Ip6RxData.FragmentTable,\r
             RxData->Ip6RxData.FragmentCount,\r
             0,\r
             0,\r
@@ -1148,12 +1131,12 @@ IpIoListenHandlerDpc (
     CopyMem (\r
       &Session.Source,\r
       &RxData->Ip6RxData.Header->SourceAddress,\r
-      sizeof(EFI_IPv6_ADDRESS)\r
+      sizeof (EFI_IPv6_ADDRESS)\r
       );\r
     CopyMem (\r
       &Session.Dest,\r
       &RxData->Ip6RxData.Header->DestinationAddress,\r
-      sizeof(EFI_IPv6_ADDRESS)\r
+      sizeof (EFI_IPv6_ADDRESS)\r
       );\r
     Session.IpHdr.Ip6Hdr = RxData->Ip6RxData.Header;\r
     Session.IpHdrLen     = RxData->Ip6RxData.HeaderLength;\r
@@ -1161,7 +1144,6 @@ IpIoListenHandlerDpc (
   }\r
 \r
   if (EFI_SUCCESS == Status) {\r
-\r
     IpIo->PktRcvdNotify (EFI_SUCCESS, 0, &Session, Pkt, IpIo->RcvdContext);\r
   } else {\r
     //\r
@@ -1177,7 +1159,7 @@ IpIoListenHandlerDpc (
 \r
 CleanUp:\r
 \r
-  if (IpIo->IpVersion == IP_VERSION_4){\r
+  if (IpIo->IpVersion == IP_VERSION_4) {\r
     gBS->SignalEvent (RxData->Ip4RxData.RecycleSignal);\r
   } else {\r
     gBS->SignalEvent (RxData->Ip6RxData.RecycleSignal);\r
@@ -1185,7 +1167,7 @@ CleanUp:
 \r
 Resume:\r
 \r
-  if (IpIo->IpVersion == IP_VERSION_4){\r
+  if (IpIo->IpVersion == IP_VERSION_4) {\r
     IpIo->Ip.Ip4->Receive (IpIo->Ip.Ip4, &(IpIo->RcvToken.Ip4Token));\r
   } else {\r
     IpIo->Ip.Ip6->Receive (IpIo->Ip.Ip6, &(IpIo->RcvToken.Ip6Token));\r
@@ -1202,8 +1184,8 @@ Resume:
 VOID\r
 EFIAPI\r
 IpIoListenHandler (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   //\r
@@ -1212,7 +1194,6 @@ IpIoListenHandler (
   QueueDpc (TPL_CALLBACK, IpIoListenHandlerDpc, Context);\r
 }\r
 \r
-\r
 /**\r
   Create a new IP_IO instance.\r
 \r
@@ -1234,9 +1215,9 @@ IpIoListenHandler (
 IP_IO *\r
 EFIAPI\r
 IpIoCreate (\r
-  IN EFI_HANDLE Image,\r
-  IN EFI_HANDLE Controller,\r
-  IN UINT8      IpVersion\r
+  IN EFI_HANDLE  Image,\r
+  IN EFI_HANDLE  Controller,\r
+  IN UINT8       IpVersion\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -1252,10 +1233,10 @@ IpIoCreate (
 \r
   InitializeListHead (&(IpIo->PendingSndList));\r
   InitializeListHead (&(IpIo->IpList));\r
-  IpIo->Controller  = Controller;\r
-  IpIo->Image       = Image;\r
-  IpIo->IpVersion   = IpVersion;\r
-  Event             = NULL;\r
+  IpIo->Controller = Controller;\r
+  IpIo->Image      = Image;\r
+  IpIo->IpVersion  = IpVersion;\r
+  Event            = NULL;\r
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
@@ -1282,7 +1263,7 @@ IpIoCreate (
              Image,\r
              &IpIo->ChildHandle,\r
              IpVersion,\r
-             (VOID **) & (IpIo->Ip)\r
+             (VOID **)&(IpIo->Ip)\r
              );\r
   if (EFI_ERROR (Status)) {\r
     goto ReleaseIpIo;\r
@@ -1301,7 +1282,6 @@ ReleaseIpIo:
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Open an IP_IO instance for use.\r
 \r
@@ -1328,14 +1308,14 @@ ReleaseIpIo:
 EFI_STATUS\r
 EFIAPI\r
 IpIoOpen (\r
-  IN OUT IP_IO           *IpIo,\r
-  IN     IP_IO_OPEN_DATA *OpenData\r
+  IN OUT IP_IO            *IpIo,\r
+  IN     IP_IO_OPEN_DATA  *OpenData\r
   )\r
 {\r
-  EFI_STATUS        Status;\r
-  UINT8             IpVersion;\r
+  EFI_STATUS  Status;\r
+  UINT8       IpVersion;\r
 \r
-  if (IpIo == NULL || OpenData == NULL) {\r
+  if ((IpIo == NULL) || (OpenData == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1350,7 +1330,7 @@ IpIoOpen (
   //\r
   // configure ip\r
   //\r
-  if (IpVersion == IP_VERSION_4){\r
+  if (IpVersion == IP_VERSION_4) {\r
     //\r
     // RawData mode is no supported.\r
     //\r
@@ -1360,7 +1340,7 @@ IpIoOpen (
     }\r
 \r
     if (!OpenData->IpConfigData.Ip4CfgData.UseDefaultAddress) {\r
-      IpIo->StationIp = EFI_NTOHL (OpenData->IpConfigData.Ip4CfgData.StationAddress);\r
+      IpIo->StationIp  = EFI_NTOHL (OpenData->IpConfigData.Ip4CfgData.StationAddress);\r
       IpIo->SubnetMask = EFI_NTOHL (OpenData->IpConfigData.Ip4CfgData.SubnetMask);\r
     }\r
 \r
@@ -1369,7 +1349,6 @@ IpIoOpen (
                              &OpenData->IpConfigData.Ip4CfgData\r
                              );\r
   } else {\r
-\r
     Status = IpIo->Ip.Ip6->Configure (\r
                              IpIo->Ip.Ip6,\r
                              &OpenData->IpConfigData.Ip6CfgData\r
@@ -1385,7 +1364,7 @@ IpIoOpen (
   // @bug (0.0.0.0, 0.0.0.0, 0.0.0.0). Delete this statement if Ip modified\r
   // @bug its code\r
   //\r
-  if (IpVersion == IP_VERSION_4){\r
+  if (IpVersion == IP_VERSION_4) {\r
     Status = IpIo->Ip.Ip4->Routes (\r
                              IpIo->Ip.Ip4,\r
                              TRUE,\r
@@ -1402,10 +1381,10 @@ IpIoOpen (
   IpIo->PktRcvdNotify = OpenData->PktRcvdNotify;\r
   IpIo->PktSentNotify = OpenData->PktSentNotify;\r
 \r
-  IpIo->RcvdContext   = OpenData->RcvdContext;\r
-  IpIo->SndContext    = OpenData->SndContext;\r
+  IpIo->RcvdContext = OpenData->RcvdContext;\r
+  IpIo->SndContext  = OpenData->SndContext;\r
 \r
-  if (IpVersion == IP_VERSION_4){\r
+  if (IpVersion == IP_VERSION_4) {\r
     IpIo->Protocol = OpenData->IpConfigData.Ip4CfgData.DefaultProtocol;\r
 \r
     //\r
@@ -1419,14 +1398,12 @@ IpIoOpen (
       IpIo->Ip.Ip4->Configure (IpIo->Ip.Ip4, NULL);\r
       return Status;\r
     }\r
-\r
   } else {\r
-\r
     IpIo->Protocol = OpenData->IpConfigData.Ip6CfgData.DefaultProtocol;\r
-    Status = IpIo->Ip.Ip6->Receive (\r
-                             IpIo->Ip.Ip6,\r
-                             &(IpIo->RcvToken.Ip6Token)\r
-                             );\r
+    Status         = IpIo->Ip.Ip6->Receive (\r
+                                     IpIo->Ip.Ip6,\r
+                                     &(IpIo->RcvToken.Ip6Token)\r
+                                     );\r
     if (EFI_ERROR (Status)) {\r
       IpIo->Ip.Ip6->Configure (IpIo->Ip.Ip6, NULL);\r
       return Status;\r
@@ -1439,7 +1416,6 @@ IpIoOpen (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Stop an IP_IO instance.\r
 \r
@@ -1458,12 +1434,12 @@ IpIoOpen (
 EFI_STATUS\r
 EFIAPI\r
 IpIoStop (\r
-  IN OUT IP_IO *IpIo\r
+  IN OUT IP_IO  *IpIo\r
   )\r
 {\r
-  EFI_STATUS        Status;\r
-  IP_IO_IP_INFO     *IpInfo;\r
-  UINT8             IpVersion;\r
+  EFI_STATUS     Status;\r
+  IP_IO_IP_INFO  *IpInfo;\r
+  UINT8          IpVersion;\r
 \r
   if (IpIo == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1490,6 +1466,7 @@ IpIoStop (
   } else {\r
     Status = IpIo->Ip.Ip6->Configure (IpIo->Ip.Ip6, NULL);\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -1514,7 +1491,7 @@ IpIoStop (
   //\r
   // Close the receive event.\r
   //\r
-  if (IpVersion == IP_VERSION_4){\r
+  if (IpVersion == IP_VERSION_4) {\r
     gBS->CloseEvent (IpIo->RcvToken.Ip4Token.Event);\r
   } else {\r
     gBS->CloseEvent (IpIo->RcvToken.Ip6Token.Event);\r
@@ -1523,7 +1500,6 @@ IpIoStop (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Destroy an IP_IO instance.\r
 \r
@@ -1540,10 +1516,10 @@ IpIoStop (
 EFI_STATUS\r
 EFIAPI\r
 IpIoDestroy (\r
-  IN OUT IP_IO *IpIo\r
+  IN OUT IP_IO  *IpIo\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Stop the IpIo.\r
@@ -1571,7 +1547,6 @@ IpIoDestroy (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Send out an IP packet.\r
 \r
@@ -1601,18 +1576,18 @@ IpIoDestroy (
 EFI_STATUS\r
 EFIAPI\r
 IpIoSend (\r
-  IN OUT IP_IO          *IpIo,\r
-  IN OUT NET_BUF        *Pkt,\r
-  IN     IP_IO_IP_INFO  *Sender        OPTIONAL,\r
-  IN     VOID           *Context       OPTIONAL,\r
-  IN     VOID           *NotifyData    OPTIONAL,\r
-  IN     EFI_IP_ADDRESS *Dest          OPTIONAL,\r
-  IN     IP_IO_OVERRIDE *OverrideData  OPTIONAL\r
+  IN OUT IP_IO           *IpIo,\r
+  IN OUT NET_BUF         *Pkt,\r
+  IN     IP_IO_IP_INFO   *Sender        OPTIONAL,\r
+  IN     VOID            *Context       OPTIONAL,\r
+  IN     VOID            *NotifyData    OPTIONAL,\r
+  IN     EFI_IP_ADDRESS  *Dest          OPTIONAL,\r
+  IN     IP_IO_OVERRIDE  *OverrideData  OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS        Status;\r
-  IP_IO_IP_PROTOCOL Ip;\r
-  IP_IO_SEND_ENTRY  *SndEntry;\r
+  EFI_STATUS         Status;\r
+  IP_IO_IP_PROTOCOL  Ip;\r
+  IP_IO_SEND_ENTRY   *SndEntry;\r
 \r
   if ((IpIo == NULL) || (Pkt == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1639,7 +1614,7 @@ IpIoSend (
   //\r
   // Send this Packet\r
   //\r
-  if (IpIo->IpVersion == IP_VERSION_4){\r
+  if (IpIo->IpVersion == IP_VERSION_4) {\r
     Status = Ip.Ip4->Transmit (\r
                        Ip.Ip4,\r
                        &SndEntry->SndToken.Ip4Token\r
@@ -1658,7 +1633,6 @@ IpIoSend (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Cancel the IP transmit token which wraps this Packet.\r
 \r
@@ -1676,18 +1650,16 @@ IpIoCancelTxToken (
   IN VOID   *Packet\r
   )\r
 {\r
-  LIST_ENTRY        *Node;\r
-  IP_IO_SEND_ENTRY  *SndEntry;\r
-  IP_IO_IP_PROTOCOL Ip;\r
+  LIST_ENTRY         *Node;\r
+  IP_IO_SEND_ENTRY   *SndEntry;\r
+  IP_IO_IP_PROTOCOL  Ip;\r
 \r
   ASSERT ((IpIo != NULL) && (Packet != NULL));\r
 \r
   NET_LIST_FOR_EACH (Node, &IpIo->PendingSndList) {\r
-\r
     SndEntry = NET_LIST_USER_STRUCT (Node, IP_IO_SEND_ENTRY, Entry);\r
 \r
     if (SndEntry->Pkt == Packet) {\r
-\r
       Ip = SndEntry->Ip;\r
 \r
       if (IpIo->IpVersion == IP_VERSION_4) {\r
@@ -1705,10 +1677,8 @@ IpIoCancelTxToken (
       break;\r
     }\r
   }\r
-\r
 }\r
 \r
-\r
 /**\r
   Add a new IP instance for sending data.\r
 \r
@@ -1763,7 +1733,7 @@ IpIoAddIp (
              IpIo->Image,\r
              &IpInfo->ChildHandle,\r
              IpInfo->IpVersion,\r
-             (VOID **) &IpInfo->Ip\r
+             (VOID **)&IpInfo->Ip\r
              );\r
   if (EFI_ERROR (Status)) {\r
     goto ReleaseIpInfo;\r
@@ -1812,7 +1782,6 @@ ReleaseIpInfo:
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Configure the IP instance of this IpInfo and start the receiving if IpConfigData\r
   is not NULL.\r
@@ -1835,8 +1804,8 @@ ReleaseIpInfo:
 EFI_STATUS\r
 EFIAPI\r
 IpIoConfigIp (\r
-  IN OUT IP_IO_IP_INFO        *IpInfo,\r
-  IN OUT VOID                 *IpConfigData OPTIONAL\r
+  IN OUT IP_IO_IP_INFO  *IpInfo,\r
+  IN OUT VOID           *IpConfigData OPTIONAL\r
   )\r
 {\r
   EFI_STATUS         Status;\r
@@ -1874,8 +1843,7 @@ IpIoConfigIp (
 \r
   if (IpConfigData != NULL) {\r
     if (IpInfo->IpVersion == IP_VERSION_4) {\r
-\r
-      if (((EFI_IP4_CONFIG_DATA *) IpConfigData)->UseDefaultAddress) {\r
+      if (((EFI_IP4_CONFIG_DATA *)IpConfigData)->UseDefaultAddress) {\r
         Status = Ip.Ip4->GetModeData (\r
                            Ip.Ip4,\r
                            &Ip4ModeData,\r
@@ -1887,18 +1855,18 @@ IpIoConfigIp (
           return Status;\r
         }\r
 \r
-        IP4_COPY_ADDRESS (&((EFI_IP4_CONFIG_DATA*) IpConfigData)->StationAddress, &Ip4ModeData.ConfigData.StationAddress);\r
-        IP4_COPY_ADDRESS (&((EFI_IP4_CONFIG_DATA*) IpConfigData)->SubnetMask, &Ip4ModeData.ConfigData.SubnetMask);\r
+        IP4_COPY_ADDRESS (&((EFI_IP4_CONFIG_DATA *)IpConfigData)->StationAddress, &Ip4ModeData.ConfigData.StationAddress);\r
+        IP4_COPY_ADDRESS (&((EFI_IP4_CONFIG_DATA *)IpConfigData)->SubnetMask, &Ip4ModeData.ConfigData.SubnetMask);\r
       }\r
 \r
       CopyMem (\r
         &IpInfo->Addr.Addr,\r
-        &((EFI_IP4_CONFIG_DATA *) IpConfigData)->StationAddress,\r
+        &((EFI_IP4_CONFIG_DATA *)IpConfigData)->StationAddress,\r
         sizeof (IP4_ADDR)\r
         );\r
       CopyMem (\r
         &IpInfo->PreMask.SubnetMask,\r
-        &((EFI_IP4_CONFIG_DATA *) IpConfigData)->SubnetMask,\r
+        &((EFI_IP4_CONFIG_DATA *)IpConfigData)->SubnetMask,\r
         sizeof (IP4_ADDR)\r
         );\r
 \r
@@ -1923,7 +1891,7 @@ IpIoConfigIp (
 \r
       if (Ip6ModeData.IsConfigured) {\r
         CopyMem (\r
-          &((EFI_IP6_CONFIG_DATA *) IpConfigData)->StationAddress,\r
+          &((EFI_IP6_CONFIG_DATA *)IpConfigData)->StationAddress,\r
           &Ip6ModeData.ConfigData.StationAddress,\r
           sizeof (EFI_IPv6_ADDRESS)\r
           );\r
@@ -1951,7 +1919,6 @@ IpIoConfigIp (
         if (Ip6ModeData.IcmpTypeList != NULL) {\r
           FreePool (Ip6ModeData.IcmpTypeList);\r
         }\r
-\r
       } else {\r
         Status = EFI_NO_MAPPING;\r
         return Status;\r
@@ -1982,7 +1949,6 @@ IpIoConfigIp (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Destroy an IP instance maintained in IpIo->IpList for\r
   sending purpose.\r
@@ -2000,14 +1966,13 @@ IpIoConfigIp (
 VOID\r
 EFIAPI\r
 IpIoRemoveIp (\r
-  IN IP_IO            *IpIo,\r
-  IN IP_IO_IP_INFO    *IpInfo\r
+  IN IP_IO          *IpIo,\r
+  IN IP_IO_IP_INFO  *IpInfo\r
   )\r
 {\r
+  UINT8  IpVersion;\r
 \r
-  UINT8               IpVersion;\r
-\r
-  if (IpIo == NULL || IpInfo == NULL) {\r
+  if ((IpIo == NULL) || (IpInfo == NULL)) {\r
     return;\r
   }\r
 \r
@@ -2016,7 +1981,6 @@ IpIoRemoveIp (
   NET_PUT_REF (IpInfo);\r
 \r
   if (IpInfo->RefCnt > 0) {\r
-\r
     return;\r
   }\r
 \r
@@ -2026,7 +1990,7 @@ IpIoRemoveIp (
 \r
   RemoveEntryList (&IpInfo->Entry);\r
 \r
-  if (IpVersion == IP_VERSION_4){\r
+  if (IpVersion == IP_VERSION_4) {\r
     IpInfo->Ip.Ip4->Configure (\r
                       IpInfo->Ip.Ip4,\r
                       NULL\r
@@ -2039,9 +2003,7 @@ IpIoRemoveIp (
       );\r
 \r
     gBS->CloseEvent (IpInfo->DummyRcvToken.Ip4Token.Event);\r
-\r
   } else {\r
-\r
     IpInfo->Ip.Ip6->Configure (\r
                       IpInfo->Ip.Ip6,\r
                       NULL\r
@@ -2060,7 +2022,6 @@ IpIoRemoveIp (
   FreePool (IpInfo);\r
 }\r
 \r
-\r
 /**\r
   Find the first IP protocol maintained in IpIo whose local\r
   address is the same as Src.\r
@@ -2085,12 +2046,12 @@ IpIoFindSender (
   IN     EFI_IP_ADDRESS  *Src\r
   )\r
 {\r
-  LIST_ENTRY      *IpIoEntry;\r
-  IP_IO           *IpIoPtr;\r
-  LIST_ENTRY      *IpInfoEntry;\r
-  IP_IO_IP_INFO   *IpInfo;\r
+  LIST_ENTRY     *IpIoEntry;\r
+  IP_IO          *IpIoPtr;\r
+  LIST_ENTRY     *IpInfoEntry;\r
+  IP_IO_IP_INFO  *IpInfo;\r
 \r
-  if (IpIo == NULL || Src == NULL) {\r
+  if ((IpIo == NULL) || (Src == NULL)) {\r
     return NULL;\r
   }\r
 \r
@@ -2107,15 +2068,12 @@ IpIoFindSender (
 \r
     NET_LIST_FOR_EACH (IpInfoEntry, &IpIoPtr->IpList) {\r
       IpInfo = NET_LIST_USER_STRUCT (IpInfoEntry, IP_IO_IP_INFO, Entry);\r
-      if (IpInfo->IpVersion == IP_VERSION_4){\r
-\r
+      if (IpInfo->IpVersion == IP_VERSION_4) {\r
         if (EFI_IP4_EQUAL (&IpInfo->Addr.v4, &Src->v4)) {\r
           *IpIo = IpIoPtr;\r
           return IpInfo;\r
         }\r
-\r
       } else {\r
-\r
         if (EFI_IP6_EQUAL (&IpInfo->Addr.v6, &Src->v6)) {\r
           *IpIo = IpIoPtr;\r
           return IpInfo;\r
@@ -2130,7 +2088,6 @@ IpIoFindSender (
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Get the ICMP error map information.\r
 \r
@@ -2150,10 +2107,10 @@ IpIoFindSender (
 EFI_STATUS\r
 EFIAPI\r
 IpIoGetIcmpErrStatus (\r
-  IN  UINT8       IcmpError,\r
-  IN  UINT8       IpVersion,\r
-  OUT BOOLEAN     *IsHard  OPTIONAL,\r
-  OUT BOOLEAN     *Notify  OPTIONAL\r
+  IN  UINT8    IcmpError,\r
+  IN  UINT8    IpVersion,\r
+  OUT BOOLEAN  *IsHard  OPTIONAL,\r
+  OUT BOOLEAN  *Notify  OPTIONAL\r
   )\r
 {\r
   if (IpVersion == IP_VERSION_4 ) {\r
@@ -2168,33 +2125,31 @@ IpIoGetIcmpErrStatus (
     }\r
 \r
     switch (IcmpError) {\r
-    case ICMP_ERR_UNREACH_NET:\r
-      return  EFI_NETWORK_UNREACHABLE;\r
+      case ICMP_ERR_UNREACH_NET:\r
+        return EFI_NETWORK_UNREACHABLE;\r
 \r
-    case ICMP_ERR_TIMXCEED_INTRANS:\r
-    case ICMP_ERR_TIMXCEED_REASS:\r
-    case ICMP_ERR_UNREACH_HOST:\r
-      return  EFI_HOST_UNREACHABLE;\r
+      case ICMP_ERR_TIMXCEED_INTRANS:\r
+      case ICMP_ERR_TIMXCEED_REASS:\r
+      case ICMP_ERR_UNREACH_HOST:\r
+        return EFI_HOST_UNREACHABLE;\r
 \r
-    case ICMP_ERR_UNREACH_PROTOCOL:\r
-      return  EFI_PROTOCOL_UNREACHABLE;\r
+      case ICMP_ERR_UNREACH_PROTOCOL:\r
+        return EFI_PROTOCOL_UNREACHABLE;\r
 \r
-    case ICMP_ERR_UNREACH_PORT:\r
-      return  EFI_PORT_UNREACHABLE;\r
+      case ICMP_ERR_UNREACH_PORT:\r
+        return EFI_PORT_UNREACHABLE;\r
 \r
-    case ICMP_ERR_MSGSIZE:\r
-    case ICMP_ERR_UNREACH_SRCFAIL:\r
-    case ICMP_ERR_QUENCH:\r
-    case ICMP_ERR_PARAMPROB:\r
-      return  EFI_ICMP_ERROR;\r
+      case ICMP_ERR_MSGSIZE:\r
+      case ICMP_ERR_UNREACH_SRCFAIL:\r
+      case ICMP_ERR_QUENCH:\r
+      case ICMP_ERR_PARAMPROB:\r
+        return EFI_ICMP_ERROR;\r
 \r
-    default:\r
-      ASSERT (FALSE);\r
-      return EFI_UNSUPPORTED;\r
+      default:\r
+        ASSERT (FALSE);\r
+        return EFI_UNSUPPORTED;\r
     }\r
-\r
   } else if (IpVersion == IP_VERSION_6) {\r
-\r
     ASSERT (IcmpError <= ICMP6_ERR_PARAMPROB_IPV6OPTION);\r
 \r
     if (IsHard != NULL) {\r
@@ -2206,31 +2161,30 @@ IpIoGetIcmpErrStatus (
     }\r
 \r
     switch (IcmpError) {\r
-    case ICMP6_ERR_UNREACH_NET:\r
-      return EFI_NETWORK_UNREACHABLE;\r
+      case ICMP6_ERR_UNREACH_NET:\r
+        return EFI_NETWORK_UNREACHABLE;\r
 \r
-    case ICMP6_ERR_UNREACH_HOST:\r
-    case ICMP6_ERR_TIMXCEED_HOPLIMIT:\r
-    case ICMP6_ERR_TIMXCEED_REASS:\r
-      return EFI_HOST_UNREACHABLE;\r
+      case ICMP6_ERR_UNREACH_HOST:\r
+      case ICMP6_ERR_TIMXCEED_HOPLIMIT:\r
+      case ICMP6_ERR_TIMXCEED_REASS:\r
+        return EFI_HOST_UNREACHABLE;\r
 \r
-    case ICMP6_ERR_UNREACH_PROTOCOL:\r
-      return EFI_PROTOCOL_UNREACHABLE;\r
+      case ICMP6_ERR_UNREACH_PROTOCOL:\r
+        return EFI_PROTOCOL_UNREACHABLE;\r
 \r
-    case ICMP6_ERR_UNREACH_PORT:\r
-      return EFI_PORT_UNREACHABLE;\r
+      case ICMP6_ERR_UNREACH_PORT:\r
+        return EFI_PORT_UNREACHABLE;\r
 \r
-    case ICMP6_ERR_PACKAGE_TOOBIG:\r
-    case ICMP6_ERR_PARAMPROB_HEADER:\r
-    case ICMP6_ERR_PARAMPROB_NEXHEADER:\r
-    case ICMP6_ERR_PARAMPROB_IPV6OPTION:\r
-      return EFI_ICMP_ERROR;\r
+      case ICMP6_ERR_PACKAGE_TOOBIG:\r
+      case ICMP6_ERR_PARAMPROB_HEADER:\r
+      case ICMP6_ERR_PARAMPROB_NEXHEADER:\r
+      case ICMP6_ERR_PARAMPROB_IPV6OPTION:\r
+        return EFI_ICMP_ERROR;\r
 \r
-    default:\r
-      ASSERT (FALSE);\r
-      return EFI_UNSUPPORTED;\r
+      default:\r
+        ASSERT (FALSE);\r
+        return EFI_UNSUPPORTED;\r
     }\r
-\r
   } else {\r
     //\r
     // Should never be here\r
@@ -2240,7 +2194,6 @@ IpIoGetIcmpErrStatus (
   }\r
 }\r
 \r
-\r
 /**\r
   Refresh the remote peer's Neighbor Cache entries.\r
 \r
@@ -2288,4 +2241,3 @@ IpIoRefreshNeighbor (
 \r
   return Ip->Neighbors (Ip, FALSE, &Neighbor->v6, NULL, Timeout, TRUE);\r
 }\r
-\r
index 41e8b30e36a4c711c0d3a22b2e8a48b46f109d68..fd4a9e15a892cb26f3d94dfdca95705f6e0cab1f 100644 (file)
@@ -32,8 +32,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/PrintLib.h>\r
 #include <Library/UefiLib.h>\r
 \r
-#define NIC_ITEM_CONFIG_SIZE   (sizeof (NIC_IP4_CONFIG_INFO) + sizeof (EFI_IP4_ROUTE_TABLE) * MAX_IP4_CONFIG_IN_VARIABLE)\r
-#define DEFAULT_ZERO_START     ((UINTN) ~0)\r
+#define NIC_ITEM_CONFIG_SIZE  (sizeof (NIC_IP4_CONFIG_INFO) + sizeof (EFI_IP4_ROUTE_TABLE) * MAX_IP4_CONFIG_IN_VARIABLE)\r
+#define DEFAULT_ZERO_START    ((UINTN) ~0)\r
 \r
 //\r
 // All the supported IP4 masks in host byte order.\r
@@ -77,25 +77,27 @@ GLOBAL_REMOVE_IF_UNREFERENCED IP4_ADDR  gIp4AllMasks[IP4_MASK_NUM] = {
   0xFFFFFFFF,\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_IPv4_ADDRESS  mZeroIp4Addr = {{0, 0, 0, 0}};\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_IPv4_ADDRESS  mZeroIp4Addr = {\r
+  { 0, 0, 0, 0 }\r
+};\r
 \r
 //\r
 // Any error level digitally larger than mNetDebugLevelMax\r
 // will be silently discarded.\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED UINTN  mNetDebugLevelMax = NETDEBUG_LEVEL_ERROR;\r
-GLOBAL_REMOVE_IF_UNREFERENCED UINT32 mSyslogPacketSeq  = 0xDEADBEEF;\r
+GLOBAL_REMOVE_IF_UNREFERENCED UINTN   mNetDebugLevelMax = NETDEBUG_LEVEL_ERROR;\r
+GLOBAL_REMOVE_IF_UNREFERENCED UINT32  mSyslogPacketSeq  = 0xDEADBEEF;\r
 \r
 //\r
 // You can change mSyslogDstMac mSyslogDstIp and mSyslogSrcIp\r
 // here to direct the syslog packets to the syslog deamon. The\r
 // default is broadcast to both the ethernet and IP.\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED UINT8  mSyslogDstMac[NET_ETHER_ADDR_LEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};\r
-GLOBAL_REMOVE_IF_UNREFERENCED UINT32 mSyslogDstIp                      = 0xffffffff;\r
-GLOBAL_REMOVE_IF_UNREFERENCED UINT32 mSyslogSrcIp                      = 0;\r
+GLOBAL_REMOVE_IF_UNREFERENCED UINT8   mSyslogDstMac[NET_ETHER_ADDR_LEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };\r
+GLOBAL_REMOVE_IF_UNREFERENCED UINT32  mSyslogDstIp                      = 0xffffffff;\r
+GLOBAL_REMOVE_IF_UNREFERENCED UINT32  mSyslogSrcIp                      = 0;\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED CHAR8 *mMonthName[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CHAR8  *mMonthName[] = {\r
   "Jan",\r
   "Feb",\r
   "Mar",\r
@@ -113,13 +115,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED CHAR8 *mMonthName[] = {
 //\r
 // VLAN device path node template\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED VLAN_DEVICE_PATH mNetVlanDevicePathTemplate = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED VLAN_DEVICE_PATH  mNetVlanDevicePathTemplate = {\r
   {\r
     MESSAGING_DEVICE_PATH,\r
     MSG_VLAN_DP,\r
     {\r
-      (UINT8) (sizeof (VLAN_DEVICE_PATH)),\r
-      (UINT8) ((sizeof (VLAN_DEVICE_PATH)) >> 8)\r
+      (UINT8)(sizeof (VLAN_DEVICE_PATH)),\r
+      (UINT8)((sizeof (VLAN_DEVICE_PATH)) >> 8)\r
     }\r
   },\r
   0\r
@@ -138,11 +140,11 @@ SyslogLocateSnp (
   VOID\r
   )\r
 {\r
-  EFI_SIMPLE_NETWORK_PROTOCOL *Snp;\r
-  EFI_STATUS                  Status;\r
-  EFI_HANDLE                  *Handles;\r
-  UINTN                       HandleCount;\r
-  UINTN                       Index;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL  *Snp;\r
+  EFI_STATUS                   Status;\r
+  EFI_HANDLE                   *Handles;\r
+  UINTN                        HandleCount;\r
+  UINTN                        Index;\r
 \r
   //\r
   // Locate the handles which has SNP installed.\r
@@ -169,13 +171,13 @@ SyslogLocateSnp (
     Status = gBS->HandleProtocol (\r
                     Handles[Index],\r
                     &gEfiSimpleNetworkProtocolGuid,\r
-                    (VOID **) &Snp\r
+                    (VOID **)&Snp\r
                     );\r
 \r
     if ((Status == EFI_SUCCESS) && (Snp != NULL) &&\r
         (Snp->Mode->IfType == NET_IFTYPE_ETHERNET) &&\r
-        (Snp->Mode->MaxPacketSize >= NET_SYSLOG_PACKET_LEN)) {\r
-\r
+        (Snp->Mode->MaxPacketSize >= NET_SYSLOG_PACKET_LEN))\r
+    {\r
       break;\r
     }\r
 \r
@@ -204,15 +206,15 @@ SyslogLocateSnp (
 **/\r
 EFI_STATUS\r
 SyslogSendPacket (\r
-  IN CHAR8                    *Packet,\r
-  IN UINT32                   Length\r
+  IN CHAR8   *Packet,\r
+  IN UINT32  Length\r
   )\r
 {\r
-  EFI_SIMPLE_NETWORK_PROTOCOL *Snp;\r
-  ETHER_HEAD                  *Ether;\r
-  EFI_STATUS                  Status;\r
-  EFI_EVENT                   TimeoutEvent;\r
-  UINT8                       *TxBuf;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL  *Snp;\r
+  ETHER_HEAD                   *Ether;\r
+  EFI_STATUS                   Status;\r
+  EFI_EVENT                    TimeoutEvent;\r
+  UINT8                        *TxBuf;\r
 \r
   ASSERT (Packet != NULL);\r
 \r
@@ -222,7 +224,7 @@ SyslogSendPacket (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  Ether = (ETHER_HEAD *) Packet;\r
+  Ether = (ETHER_HEAD *)Packet;\r
   CopyMem (Ether->SrcMac, Snp->Mode->CurrentAddress.Addr, NET_ETHER_ADDR_LEN);\r
 \r
   //\r
@@ -246,7 +248,7 @@ SyslogSendPacket (
     goto ON_EXIT;\r
   }\r
 \r
-  for (;;) {\r
+  for ( ; ;) {\r
     //\r
     // Transmit the packet through SNP.\r
     //\r
@@ -268,13 +270,12 @@ SyslogSendPacket (
       //\r
       // Get the recycled transmit buffer status.\r
       //\r
-      Snp->GetStatus (Snp, NULL, (VOID **) &TxBuf);\r
+      Snp->GetStatus (Snp, NULL, (VOID **)&TxBuf);\r
 \r
       if (!EFI_ERROR (gBS->CheckEvent (TimeoutEvent))) {\r
         Status = EFI_TIMEOUT;\r
         break;\r
       }\r
-\r
     } while (TxBuf == NULL);\r
 \r
     if ((Status == EFI_SUCCESS) || (Status == EFI_TIMEOUT)) {\r
@@ -312,71 +313,71 @@ ON_EXIT:
 **/\r
 UINT32\r
 SyslogBuildPacket (\r
-  IN  UINT32                Level,\r
-  IN  UINT8                 *Module,\r
-  IN  UINT8                 *File,\r
-  IN  UINT32                Line,\r
-  IN  UINT8                 *Message,\r
-  IN  UINT32                BufLen,\r
-  OUT CHAR8                 *Buf\r
+  IN  UINT32  Level,\r
+  IN  UINT8   *Module,\r
+  IN  UINT8   *File,\r
+  IN  UINT32  Line,\r
+  IN  UINT8   *Message,\r
+  IN  UINT32  BufLen,\r
+  OUT CHAR8   *Buf\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  ETHER_HEAD                *Ether;\r
-  IP4_HEAD                  *Ip4;\r
-  EFI_UDP_HEADER            *Udp4;\r
-  EFI_TIME                  Time;\r
-  UINT32                    Pri;\r
-  UINT32                    Len;\r
+  EFI_STATUS      Status;\r
+  ETHER_HEAD      *Ether;\r
+  IP4_HEAD        *Ip4;\r
+  EFI_UDP_HEADER  *Udp4;\r
+  EFI_TIME        Time;\r
+  UINT32          Pri;\r
+  UINT32          Len;\r
 \r
   //\r
   // Fill in the Ethernet header. Leave alone the source MAC.\r
   // SyslogSendPacket will fill in the address for us.\r
   //\r
-  Ether = (ETHER_HEAD *) Buf;\r
+  Ether = (ETHER_HEAD *)Buf;\r
   CopyMem (Ether->DstMac, mSyslogDstMac, NET_ETHER_ADDR_LEN);\r
   ZeroMem (Ether->SrcMac, NET_ETHER_ADDR_LEN);\r
 \r
   Ether->EtherType = HTONS (0x0800);    // IPv4 protocol\r
 \r
-  Buf             += sizeof (ETHER_HEAD);\r
-  BufLen          -= sizeof (ETHER_HEAD);\r
+  Buf    += sizeof (ETHER_HEAD);\r
+  BufLen -= sizeof (ETHER_HEAD);\r
 \r
   //\r
   // Fill in the IP header\r
   //\r
-  Ip4              = (IP4_HEAD *) Buf;\r
-  Ip4->HeadLen     = 5;\r
-  Ip4->Ver         = 4;\r
-  Ip4->Tos         = 0;\r
-  Ip4->TotalLen    = 0;\r
-  Ip4->Id          = (UINT16) mSyslogPacketSeq;\r
-  Ip4->Fragment    = 0;\r
-  Ip4->Ttl         = 16;\r
-  Ip4->Protocol    = 0x11;\r
-  Ip4->Checksum    = 0;\r
-  Ip4->Src         = mSyslogSrcIp;\r
-  Ip4->Dst         = mSyslogDstIp;\r
+  Ip4           = (IP4_HEAD *)Buf;\r
+  Ip4->HeadLen  = 5;\r
+  Ip4->Ver      = 4;\r
+  Ip4->Tos      = 0;\r
+  Ip4->TotalLen = 0;\r
+  Ip4->Id       = (UINT16)mSyslogPacketSeq;\r
+  Ip4->Fragment = 0;\r
+  Ip4->Ttl      = 16;\r
+  Ip4->Protocol = 0x11;\r
+  Ip4->Checksum = 0;\r
+  Ip4->Src      = mSyslogSrcIp;\r
+  Ip4->Dst      = mSyslogDstIp;\r
 \r
-  Buf             += sizeof (IP4_HEAD);\r
-  BufLen          -= sizeof (IP4_HEAD);\r
+  Buf    += sizeof (IP4_HEAD);\r
+  BufLen -= sizeof (IP4_HEAD);\r
 \r
   //\r
   // Fill in the UDP header, Udp checksum is optional. Leave it zero.\r
   //\r
-  Udp4             = (EFI_UDP_HEADER *) Buf;\r
-  Udp4->SrcPort    = HTONS (514);\r
-  Udp4->DstPort    = HTONS (514);\r
-  Udp4->Length     = 0;\r
-  Udp4->Checksum   = 0;\r
+  Udp4           = (EFI_UDP_HEADER *)Buf;\r
+  Udp4->SrcPort  = HTONS (514);\r
+  Udp4->DstPort  = HTONS (514);\r
+  Udp4->Length   = 0;\r
+  Udp4->Checksum = 0;\r
 \r
-  Buf             += sizeof (EFI_UDP_HEADER);\r
-  BufLen          -= sizeof (EFI_UDP_HEADER);\r
+  Buf    += sizeof (EFI_UDP_HEADER);\r
+  BufLen -= sizeof (EFI_UDP_HEADER);\r
 \r
   //\r
   // Build the syslog message body with <PRI> Timestamp  machine module Message\r
   //\r
-  Pri = ((NET_SYSLOG_FACILITY & 31) << 3) | (Level & 7);\r
+  Pri    = ((NET_SYSLOG_FACILITY & 31) << 3) | (Level & 7);\r
   Status = gRT->GetTime (&Time, NULL);\r
   if (EFI_ERROR (Status)) {\r
     return 0;\r
@@ -386,38 +387,38 @@ SyslogBuildPacket (
   // Use %a to format the ASCII strings, %s to format UNICODE strings\r
   //\r
   Len  = 0;\r
-  Len += (UINT32) AsciiSPrint (\r
-                    Buf,\r
-                    BufLen,\r
-                    "<%d> %a %d %d:%d:%d ",\r
-                    Pri,\r
-                    mMonthName [Time.Month-1],\r
-                    Time.Day,\r
-                    Time.Hour,\r
-                    Time.Minute,\r
-                    Time.Second\r
-                    );\r
+  Len += (UINT32)AsciiSPrint (\r
+                   Buf,\r
+                   BufLen,\r
+                   "<%d> %a %d %d:%d:%d ",\r
+                   Pri,\r
+                   mMonthName[Time.Month-1],\r
+                   Time.Day,\r
+                   Time.Hour,\r
+                   Time.Minute,\r
+                   Time.Second\r
+                   );\r
 \r
-  Len += (UINT32) AsciiSPrint (\r
-                    Buf + Len,\r
-                    BufLen - Len,\r
-                    "Tiano %a: %a (Line: %d File: %a)",\r
-                    Module,\r
-                    Message,\r
-                    Line,\r
-                    File\r
-                    );\r
-  Len ++;\r
+  Len += (UINT32)AsciiSPrint (\r
+                   Buf + Len,\r
+                   BufLen - Len,\r
+                   "Tiano %a: %a (Line: %d File: %a)",\r
+                   Module,\r
+                   Message,\r
+                   Line,\r
+                   File\r
+                   );\r
+  Len++;\r
 \r
   //\r
   // OK, patch the IP length/checksum and UDP length fields.\r
   //\r
-  Len           += sizeof (EFI_UDP_HEADER);\r
-  Udp4->Length   = HTONS ((UINT16) Len);\r
+  Len         += sizeof (EFI_UDP_HEADER);\r
+  Udp4->Length = HTONS ((UINT16)Len);\r
 \r
-  Len           += sizeof (IP4_HEAD);\r
-  Ip4->TotalLen  = HTONS ((UINT16) Len);\r
-  Ip4->Checksum  = (UINT16) (~NetblockChecksum ((UINT8 *) Ip4, sizeof (IP4_HEAD)));\r
+  Len          += sizeof (IP4_HEAD);\r
+  Ip4->TotalLen = HTONS ((UINT16)Len);\r
+  Ip4->Checksum = (UINT16)(~NetblockChecksum ((UINT8 *)Ip4, sizeof (IP4_HEAD)));\r
 \r
   return Len + sizeof (ETHER_HEAD);\r
 }\r
@@ -451,16 +452,16 @@ SyslogBuildPacket (
 CHAR8 *\r
 EFIAPI\r
 NetDebugASPrint (\r
-  IN CHAR8                  *Format,\r
+  IN CHAR8  *Format,\r
   ...\r
   )\r
 {\r
-  VA_LIST                   Marker;\r
-  CHAR8                     *Buf;\r
+  VA_LIST  Marker;\r
+  CHAR8    *Buf;\r
 \r
   ASSERT (Format != NULL);\r
 \r
-  Buf = (CHAR8 *) AllocatePool (NET_DEBUG_MSG_LEN);\r
+  Buf = (CHAR8 *)AllocatePool (NET_DEBUG_MSG_LEN);\r
 \r
   if (Buf == NULL) {\r
     return NULL;\r
@@ -494,21 +495,21 @@ NetDebugASPrint (
 EFI_STATUS\r
 EFIAPI\r
 NetDebugOutput (\r
-  IN UINT32                    Level,\r
-  IN UINT8                     *Module,\r
-  IN UINT8                     *File,\r
-  IN UINT32                    Line,\r
-  IN UINT8                     *Message\r
+  IN UINT32  Level,\r
+  IN UINT8   *Module,\r
+  IN UINT8   *File,\r
+  IN UINT32  Line,\r
+  IN UINT8   *Message\r
   )\r
 {\r
-  CHAR8                        *Packet;\r
-  UINT32                       Len;\r
-  EFI_STATUS                   Status;\r
+  CHAR8       *Packet;\r
+  UINT32      Len;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Check whether the message should be sent out\r
   //\r
-  if (Message == NULL || File == NULL || Module == NULL) {\r
+  if ((Message == NULL) || (File == NULL) || (Module == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -522,7 +523,7 @@ NetDebugOutput (
   // that the message plus the ethernet/ip/udp header is shorter\r
   // than this\r
   //\r
-  Packet = (CHAR8 *) AllocatePool (NET_SYSLOG_PACKET_LEN);\r
+  Packet = (CHAR8 *)AllocatePool (NET_SYSLOG_PACKET_LEN);\r
 \r
   if (Packet == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
@@ -554,6 +555,7 @@ ON_EXIT:
   FreePool (Message);\r
   return Status;\r
 }\r
+\r
 /**\r
   Return the length of the mask.\r
 \r
@@ -569,10 +571,10 @@ ON_EXIT:
 INTN\r
 EFIAPI\r
 NetGetMaskLength (\r
-  IN IP4_ADDR               NetMask\r
+  IN IP4_ADDR  NetMask\r
   )\r
 {\r
-  INTN                      Index;\r
+  INTN  Index;\r
 \r
   for (Index = 0; Index <= IP4_MASK_MAX; Index++) {\r
     if (NetMask == gIp4AllMasks[Index]) {\r
@@ -583,8 +585,6 @@ NetGetMaskLength (
   return Index;\r
 }\r
 \r
-\r
-\r
 /**\r
   Return the class of the IP address, such as class A, B, C.\r
   Addr is in host byte order.\r
@@ -614,32 +614,26 @@ NetGetMaskLength (
 INTN\r
 EFIAPI\r
 NetGetIpClass (\r
-  IN IP4_ADDR               Addr\r
+  IN IP4_ADDR  Addr\r
   )\r
 {\r
-  UINT8                     ByteOne;\r
+  UINT8  ByteOne;\r
 \r
-  ByteOne = (UINT8) (Addr >> 24);\r
+  ByteOne = (UINT8)(Addr >> 24);\r
 \r
   if ((ByteOne & 0x80) == 0) {\r
     return IP4_ADDR_CLASSA;\r
-\r
   } else if ((ByteOne & 0xC0) == 0x80) {\r
     return IP4_ADDR_CLASSB;\r
-\r
   } else if ((ByteOne & 0xE0) == 0xC0) {\r
     return IP4_ADDR_CLASSC;\r
-\r
   } else if ((ByteOne & 0xF0) == 0xE0) {\r
     return IP4_ADDR_CLASSD;\r
-\r
   } else {\r
     return IP4_ADDR_CLASSE;\r
-\r
   }\r
 }\r
 \r
-\r
 /**\r
   Check whether the IP is a valid unicast address according to\r
   the netmask.\r
@@ -660,15 +654,15 @@ NetGetIpClass (
 BOOLEAN\r
 EFIAPI\r
 NetIp4IsUnicast (\r
-  IN IP4_ADDR               Ip,\r
-  IN IP4_ADDR               NetMask\r
+  IN IP4_ADDR  Ip,\r
+  IN IP4_ADDR  NetMask\r
   )\r
 {\r
-  INTN   MaskLength;\r
+  INTN  MaskLength;\r
 \r
   ASSERT (NetMask != 0);\r
 \r
-  if (Ip == 0 || IP4_IS_LOCAL_BROADCAST (Ip)) {\r
+  if ((Ip == 0) || IP4_IS_LOCAL_BROADCAST (Ip)) {\r
     return FALSE;\r
   }\r
 \r
@@ -702,11 +696,11 @@ NetIp4IsUnicast (
 BOOLEAN\r
 EFIAPI\r
 NetIp6IsValidUnicast (\r
-  IN EFI_IPv6_ADDRESS       *Ip6\r
+  IN EFI_IPv6_ADDRESS  *Ip6\r
   )\r
 {\r
-  UINT8 Byte;\r
-  UINT8 Index;\r
+  UINT8  Byte;\r
+  UINT8  Index;\r
 \r
   ASSERT (Ip6 != NULL);\r
 \r
@@ -722,7 +716,7 @@ NetIp6IsValidUnicast (
 \r
   Byte = Ip6->Addr[Index];\r
 \r
-  if (Byte == 0x0 || Byte == 0x1) {\r
+  if ((Byte == 0x0) || (Byte == 0x1)) {\r
     return FALSE;\r
   }\r
 \r
@@ -743,10 +737,10 @@ NetIp6IsValidUnicast (
 BOOLEAN\r
 EFIAPI\r
 NetIp6IsUnspecifiedAddr (\r
-  IN EFI_IPv6_ADDRESS       *Ip6\r
+  IN EFI_IPv6_ADDRESS  *Ip6\r
   )\r
 {\r
-  UINT8 Index;\r
+  UINT8  Index;\r
 \r
   ASSERT (Ip6 != NULL);\r
 \r
@@ -773,10 +767,10 @@ NetIp6IsUnspecifiedAddr (
 BOOLEAN\r
 EFIAPI\r
 NetIp6IsLinkLocalAddr (\r
-  IN EFI_IPv6_ADDRESS *Ip6\r
+  IN EFI_IPv6_ADDRESS  *Ip6\r
   )\r
 {\r
-  UINT8 Index;\r
+  UINT8  Index;\r
 \r
   ASSERT (Ip6 != NULL);\r
 \r
@@ -814,14 +808,14 @@ NetIp6IsLinkLocalAddr (
 BOOLEAN\r
 EFIAPI\r
 NetIp6IsNetEqual (\r
-  EFI_IPv6_ADDRESS *Ip1,\r
-  EFI_IPv6_ADDRESS *Ip2,\r
-  UINT8            PrefixLength\r
+  EFI_IPv6_ADDRESS  *Ip1,\r
+  EFI_IPv6_ADDRESS  *Ip2,\r
+  UINT8             PrefixLength\r
   )\r
 {\r
-  UINT8 Byte;\r
-  UINT8 Bit;\r
-  UINT8 Mask;\r
+  UINT8  Byte;\r
+  UINT8  Bit;\r
+  UINT8  Mask;\r
 \r
   ASSERT ((Ip1 != NULL) && (Ip2 != NULL) && (PrefixLength < IP6_PREFIX_MAX));\r
 \r
@@ -829,20 +823,21 @@ NetIp6IsNetEqual (
     return TRUE;\r
   }\r
 \r
-  Byte = (UINT8) (PrefixLength / 8);\r
-  Bit  = (UINT8) (PrefixLength % 8);\r
+  Byte = (UINT8)(PrefixLength / 8);\r
+  Bit  = (UINT8)(PrefixLength % 8);\r
 \r
   if (CompareMem (Ip1, Ip2, Byte) != 0) {\r
     return FALSE;\r
   }\r
 \r
   if (Bit > 0) {\r
-    Mask = (UINT8) (0xFF << (8 - Bit));\r
+    Mask = (UINT8)(0xFF << (8 - Bit));\r
 \r
     ASSERT (Byte < 16);\r
     if (Byte >= 16) {\r
       return FALSE;\r
     }\r
+\r
     if ((Ip1->Addr[Byte] & Mask) != (Ip2->Addr[Byte] & Mask)) {\r
       return FALSE;\r
     }\r
@@ -851,7 +846,6 @@ NetIp6IsNetEqual (
   return TRUE;\r
 }\r
 \r
-\r
 /**\r
   Switches the endianess of an IPv6 address\r
 \r
@@ -869,11 +863,11 @@ NetIp6IsNetEqual (
 EFI_IPv6_ADDRESS *\r
 EFIAPI\r
 Ip6Swap128 (\r
-  EFI_IPv6_ADDRESS *Ip6\r
+  EFI_IPv6_ADDRESS  *Ip6\r
   )\r
 {\r
-  UINT64 High;\r
-  UINT64 Low;\r
+  UINT64  High;\r
+  UINT64  Low;\r
 \r
   ASSERT (Ip6 != NULL);\r
 \r
@@ -905,22 +899,21 @@ NetRandomInitSeed (
   VOID\r
   )\r
 {\r
-  EFI_TIME                  Time;\r
-  UINT32                    Seed;\r
-  UINT64                    MonotonicCount;\r
+  EFI_TIME  Time;\r
+  UINT32    Seed;\r
+  UINT64    MonotonicCount;\r
 \r
   gRT->GetTime (&Time, NULL);\r
-  Seed = (Time.Hour << 24 | Time.Day << 16 | Time.Minute << 8 | Time.Second);\r
+  Seed  = (Time.Hour << 24 | Time.Day << 16 | Time.Minute << 8 | Time.Second);\r
   Seed ^= Time.Nanosecond;\r
   Seed ^= Time.Year << 7;\r
 \r
   gBS->GetNextMonotonicCount (&MonotonicCount);\r
-  Seed += (UINT32) MonotonicCount;\r
+  Seed += (UINT32)MonotonicCount;\r
 \r
   return Seed;\r
 }\r
 \r
-\r
 /**\r
   Extract a UINT32 from a byte stream.\r
 \r
@@ -937,10 +930,10 @@ NetRandomInitSeed (
 UINT32\r
 EFIAPI\r
 NetGetUint32 (\r
-  IN UINT8                  *Buf\r
+  IN UINT8  *Buf\r
   )\r
 {\r
-  UINT32                    Value;\r
+  UINT32  Value;\r
 \r
   ASSERT (Buf != NULL);\r
 \r
@@ -948,7 +941,6 @@ NetGetUint32 (
   return NTOHL (Value);\r
 }\r
 \r
-\r
 /**\r
   Put a UINT32 to the byte stream in network byte order.\r
 \r
@@ -964,8 +956,8 @@ NetGetUint32 (
 VOID\r
 EFIAPI\r
 NetPutUint32 (\r
-  IN OUT UINT8                 *Buf,\r
-  IN     UINT32                Data\r
+  IN OUT UINT8   *Buf,\r
+  IN     UINT32  Data\r
   )\r
 {\r
   ASSERT (Buf != NULL);\r
@@ -974,7 +966,6 @@ NetPutUint32 (
   CopyMem (Buf, &Data, sizeof (UINT32));\r
 }\r
 \r
-\r
 /**\r
   Remove the first node entry on the list, and return the removed node entry.\r
 \r
@@ -996,10 +987,10 @@ NetPutUint32 (
 LIST_ENTRY *\r
 EFIAPI\r
 NetListRemoveHead (\r
-  IN OUT LIST_ENTRY            *Head\r
+  IN OUT LIST_ENTRY  *Head\r
   )\r
 {\r
-  LIST_ENTRY            *First;\r
+  LIST_ENTRY  *First;\r
 \r
   ASSERT (Head != NULL);\r
 \r
@@ -1007,19 +998,18 @@ NetListRemoveHead (
     return NULL;\r
   }\r
 \r
-  First                         = Head->ForwardLink;\r
-  Head->ForwardLink             = First->ForwardLink;\r
-  First->ForwardLink->BackLink  = Head;\r
+  First                        = Head->ForwardLink;\r
+  Head->ForwardLink            = First->ForwardLink;\r
+  First->ForwardLink->BackLink = Head;\r
 \r
   DEBUG_CODE (\r
-    First->ForwardLink  = (LIST_ENTRY *) NULL;\r
-    First->BackLink     = (LIST_ENTRY *) NULL;\r
-  );\r
+    First->ForwardLink = (LIST_ENTRY *)NULL;\r
+    First->BackLink    = (LIST_ENTRY *)NULL;\r
+    );\r
 \r
   return First;\r
 }\r
 \r
-\r
 /**\r
   Remove the last node entry on the list and and return the removed node entry.\r
 \r
@@ -1041,10 +1031,10 @@ NetListRemoveHead (
 LIST_ENTRY *\r
 EFIAPI\r
 NetListRemoveTail (\r
-  IN OUT LIST_ENTRY            *Head\r
+  IN OUT LIST_ENTRY  *Head\r
   )\r
 {\r
-  LIST_ENTRY            *Last;\r
+  LIST_ENTRY  *Last;\r
 \r
   ASSERT (Head != NULL);\r
 \r
@@ -1057,14 +1047,13 @@ NetListRemoveTail (
   Last->BackLink->ForwardLink = Head;\r
 \r
   DEBUG_CODE (\r
-    Last->ForwardLink = (LIST_ENTRY *) NULL;\r
-    Last->BackLink    = (LIST_ENTRY *) NULL;\r
-  );\r
+    Last->ForwardLink = (LIST_ENTRY *)NULL;\r
+    Last->BackLink    = (LIST_ENTRY *)NULL;\r
+    );\r
 \r
   return Last;\r
 }\r
 \r
-\r
 /**\r
   Insert a new node entry after a designated node entry of a doubly linked list.\r
 \r
@@ -1080,19 +1069,18 @@ NetListRemoveTail (
 VOID\r
 EFIAPI\r
 NetListInsertAfter (\r
-  IN OUT LIST_ENTRY         *PrevEntry,\r
-  IN OUT LIST_ENTRY         *NewEntry\r
+  IN OUT LIST_ENTRY  *PrevEntry,\r
+  IN OUT LIST_ENTRY  *NewEntry\r
   )\r
 {\r
   ASSERT (PrevEntry != NULL && NewEntry != NULL);\r
 \r
-  NewEntry->BackLink                = PrevEntry;\r
-  NewEntry->ForwardLink             = PrevEntry->ForwardLink;\r
-  PrevEntry->ForwardLink->BackLink  = NewEntry;\r
-  PrevEntry->ForwardLink            = NewEntry;\r
+  NewEntry->BackLink               = PrevEntry;\r
+  NewEntry->ForwardLink            = PrevEntry->ForwardLink;\r
+  PrevEntry->ForwardLink->BackLink = NewEntry;\r
+  PrevEntry->ForwardLink           = NewEntry;\r
 }\r
 \r
-\r
 /**\r
   Insert a new node entry before a designated node entry of a doubly linked list.\r
 \r
@@ -1108,16 +1096,16 @@ NetListInsertAfter (
 VOID\r
 EFIAPI\r
 NetListInsertBefore (\r
-  IN OUT LIST_ENTRY     *PostEntry,\r
-  IN OUT LIST_ENTRY     *NewEntry\r
+  IN OUT LIST_ENTRY  *PostEntry,\r
+  IN OUT LIST_ENTRY  *NewEntry\r
   )\r
 {\r
   ASSERT (PostEntry != NULL && NewEntry != NULL);\r
 \r
-  NewEntry->ForwardLink             = PostEntry;\r
-  NewEntry->BackLink                = PostEntry->BackLink;\r
-  PostEntry->BackLink->ForwardLink  = NewEntry;\r
-  PostEntry->BackLink               = NewEntry;\r
+  NewEntry->ForwardLink            = PostEntry;\r
+  NewEntry->BackLink               = PostEntry->BackLink;\r
+  PostEntry->BackLink->ForwardLink = NewEntry;\r
+  PostEntry->BackLink              = NewEntry;\r
 }\r
 \r
 /**\r
@@ -1145,31 +1133,32 @@ NetListInsertBefore (
 EFI_STATUS\r
 EFIAPI\r
 NetDestroyLinkList (\r
-  IN   LIST_ENTRY                       *List,\r
-  IN   NET_DESTROY_LINK_LIST_CALLBACK   CallBack,\r
-  IN   VOID                             *Context     OPTIONAL,\r
-  OUT  UINTN                            *ListLength  OPTIONAL\r
+  IN   LIST_ENTRY                      *List,\r
+  IN   NET_DESTROY_LINK_LIST_CALLBACK  CallBack,\r
+  IN   VOID                            *Context     OPTIONAL,\r
+  OUT  UINTN                           *ListLength  OPTIONAL\r
   )\r
 {\r
-  UINTN                         PreviousLength;\r
-  LIST_ENTRY                    *Entry;\r
-  LIST_ENTRY                    *Ptr;\r
-  UINTN                         Length;\r
-  EFI_STATUS                    Status;\r
+  UINTN       PreviousLength;\r
+  LIST_ENTRY  *Entry;\r
+  LIST_ENTRY  *Ptr;\r
+  UINTN       Length;\r
+  EFI_STATUS  Status;\r
 \r
-  if (List == NULL || CallBack == NULL) {\r
+  if ((List == NULL) || (CallBack == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   Length = 0;\r
   do {\r
     PreviousLength = Length;\r
-    Entry = GetFirstNode (List);\r
+    Entry          = GetFirstNode (List);\r
     while (!IsNull (List, Entry)) {\r
       Status = CallBack (Entry, Context);\r
       if (EFI_ERROR (Status)) {\r
         return Status;\r
       }\r
+\r
       //\r
       // Walk through the list to see whether the Entry has been removed or not.\r
       // If the Entry still exists, just try to destroy the next one.\r
@@ -1180,18 +1169,22 @@ NetDestroyLinkList (
           break;\r
         }\r
       }\r
+\r
       if (Ptr == Entry) {\r
         Entry = GetNextNode (List, Entry);\r
       } else {\r
         Entry = GetFirstNode (List);\r
       }\r
     }\r
-    for (Length = 0, Ptr = List->ForwardLink; Ptr != List; Length++, Ptr = Ptr->ForwardLink);\r
+\r
+    for (Length = 0, Ptr = List->ForwardLink; Ptr != List; Length++, Ptr = Ptr->ForwardLink) {\r
+    }\r
   } while (Length != PreviousLength);\r
 \r
   if (ListLength != NULL) {\r
     *ListLength = Length;\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -1210,14 +1203,14 @@ NetDestroyLinkList (
 BOOLEAN\r
 EFIAPI\r
 NetIsInHandleBuffer (\r
-  IN  EFI_HANDLE          Handle,\r
-  IN  UINTN               NumberOfChildren,\r
-  IN  EFI_HANDLE          *ChildHandleBuffer OPTIONAL\r
+  IN  EFI_HANDLE  Handle,\r
+  IN  UINTN       NumberOfChildren,\r
+  IN  EFI_HANDLE  *ChildHandleBuffer OPTIONAL\r
   )\r
 {\r
-  UINTN     Index;\r
+  UINTN  Index;\r
 \r
-  if (NumberOfChildren == 0 || ChildHandleBuffer == NULL) {\r
+  if ((NumberOfChildren == 0) || (ChildHandleBuffer == NULL)) {\r
     return FALSE;\r
   }\r
 \r
@@ -1230,7 +1223,6 @@ NetIsInHandleBuffer (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   Initialize the netmap. Netmap is a reposity to keep the <Key, Value> pairs.\r
 \r
@@ -1248,7 +1240,7 @@ NetIsInHandleBuffer (
 VOID\r
 EFIAPI\r
 NetMapInit (\r
-  IN OUT NET_MAP                *Map\r
+  IN OUT NET_MAP  *Map\r
   )\r
 {\r
   ASSERT (Map != NULL);\r
@@ -1258,7 +1250,6 @@ NetMapInit (
   Map->Count = 0;\r
 }\r
 \r
-\r
 /**\r
   To clean up the netmap, that is, release allocated memories.\r
 \r
@@ -1274,12 +1265,12 @@ NetMapInit (
 VOID\r
 EFIAPI\r
 NetMapClean (\r
-  IN OUT NET_MAP            *Map\r
+  IN OUT NET_MAP  *Map\r
   )\r
 {\r
-  NET_MAP_ITEM              *Item;\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
+  NET_MAP_ITEM  *Item;\r
+  LIST_ENTRY    *Entry;\r
+  LIST_ENTRY    *Next;\r
 \r
   ASSERT (Map != NULL);\r
 \r
@@ -1304,7 +1295,6 @@ NetMapClean (
   ASSERT (IsListEmpty (&Map->Recycled));\r
 }\r
 \r
-\r
 /**\r
   Test whether the netmap is empty and return true if it is.\r
 \r
@@ -1320,14 +1310,13 @@ NetMapClean (
 BOOLEAN\r
 EFIAPI\r
 NetMapIsEmpty (\r
-  IN NET_MAP                *Map\r
+  IN NET_MAP  *Map\r
   )\r
 {\r
   ASSERT (Map != NULL);\r
-  return (BOOLEAN) (Map->Count == 0);\r
+  return (BOOLEAN)(Map->Count == 0);\r
 }\r
 \r
-\r
 /**\r
   Return the number of the <Key, Value> pairs in the netmap.\r
 \r
@@ -1341,14 +1330,13 @@ NetMapIsEmpty (
 UINTN\r
 EFIAPI\r
 NetMapGetCount (\r
-  IN NET_MAP                *Map\r
+  IN NET_MAP  *Map\r
   )\r
 {\r
   ASSERT (Map != NULL);\r
   return Map->Count;\r
 }\r
 \r
-\r
 /**\r
   Return one allocated item.\r
 \r
@@ -1367,12 +1355,12 @@ NetMapGetCount (
 **/\r
 NET_MAP_ITEM *\r
 NetMapAllocItem (\r
-  IN OUT NET_MAP            *Map\r
+  IN OUT NET_MAP  *Map\r
   )\r
 {\r
-  NET_MAP_ITEM              *Item;\r
-  LIST_ENTRY                *Head;\r
-  UINTN                     Index;\r
+  NET_MAP_ITEM  *Item;\r
+  LIST_ENTRY    *Head;\r
+  UINTN         Index;\r
 \r
   ASSERT (Map != NULL);\r
 \r
@@ -1400,7 +1388,6 @@ NetMapAllocItem (
   return Item;\r
 }\r
 \r
-\r
 /**\r
   Allocate an item to save the <Key, Value> pair to the head of the netmap.\r
 \r
@@ -1422,12 +1409,12 @@ NetMapAllocItem (
 EFI_STATUS\r
 EFIAPI\r
 NetMapInsertHead (\r
-  IN OUT NET_MAP            *Map,\r
-  IN VOID                   *Key,\r
-  IN VOID                   *Value    OPTIONAL\r
+  IN OUT NET_MAP  *Map,\r
+  IN VOID         *Key,\r
+  IN VOID         *Value    OPTIONAL\r
   )\r
 {\r
-  NET_MAP_ITEM              *Item;\r
+  NET_MAP_ITEM  *Item;\r
 \r
   ASSERT (Map != NULL && Key != NULL);\r
 \r
@@ -1445,7 +1432,6 @@ NetMapInsertHead (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Allocate an item to save the <Key, Value> pair to the tail of the netmap.\r
 \r
@@ -1467,12 +1453,12 @@ NetMapInsertHead (
 EFI_STATUS\r
 EFIAPI\r
 NetMapInsertTail (\r
-  IN OUT NET_MAP            *Map,\r
-  IN VOID                   *Key,\r
-  IN VOID                   *Value    OPTIONAL\r
+  IN OUT NET_MAP  *Map,\r
+  IN VOID         *Key,\r
+  IN VOID         *Value    OPTIONAL\r
   )\r
 {\r
-  NET_MAP_ITEM              *Item;\r
+  NET_MAP_ITEM  *Item;\r
 \r
   ASSERT (Map != NULL && Key != NULL);\r
 \r
@@ -1491,7 +1477,6 @@ NetMapInsertTail (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Check whether the item is in the Map and return TRUE if it is.\r
 \r
@@ -1506,11 +1491,11 @@ NetMapInsertTail (
 **/\r
 BOOLEAN\r
 NetItemInMap (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_ITEM           *Item\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item\r
   )\r
 {\r
-  LIST_ENTRY            *ListEntry;\r
+  LIST_ENTRY  *ListEntry;\r
 \r
   ASSERT (Map != NULL && Item != NULL);\r
 \r
@@ -1523,7 +1508,6 @@ NetItemInMap (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   Find the key in the netmap and returns the point to the item contains the Key.\r
 \r
@@ -1542,12 +1526,12 @@ NetItemInMap (
 NET_MAP_ITEM *\r
 EFIAPI\r
 NetMapFindKey (\r
-  IN  NET_MAP               *Map,\r
-  IN  VOID                  *Key\r
+  IN  NET_MAP  *Map,\r
+  IN  VOID     *Key\r
   )\r
 {\r
-  LIST_ENTRY              *Entry;\r
-  NET_MAP_ITEM            *Item;\r
+  LIST_ENTRY    *Entry;\r
+  NET_MAP_ITEM  *Item;\r
 \r
   ASSERT (Map != NULL && Key != NULL);\r
 \r
@@ -1562,7 +1546,6 @@ NetMapFindKey (
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Remove the node entry of the item from the netmap and return the key of the removed item.\r
 \r
@@ -1585,9 +1568,9 @@ NetMapFindKey (
 VOID *\r
 EFIAPI\r
 NetMapRemoveItem (\r
-  IN  OUT NET_MAP             *Map,\r
-  IN  OUT NET_MAP_ITEM        *Item,\r
-  OUT VOID                    **Value           OPTIONAL\r
+  IN  OUT NET_MAP       *Map,\r
+  IN  OUT NET_MAP_ITEM  *Item,\r
+  OUT VOID              **Value           OPTIONAL\r
   )\r
 {\r
   ASSERT ((Map != NULL) && (Item != NULL));\r
@@ -1604,7 +1587,6 @@ NetMapRemoveItem (
   return Item->Key;\r
 }\r
 \r
-\r
 /**\r
   Remove the first node entry on the netmap and return the key of the removed item.\r
 \r
@@ -1625,8 +1607,8 @@ NetMapRemoveItem (
 VOID *\r
 EFIAPI\r
 NetMapRemoveHead (\r
-  IN OUT NET_MAP            *Map,\r
-  OUT VOID                  **Value         OPTIONAL\r
+  IN OUT NET_MAP  *Map,\r
+  OUT VOID        **Value         OPTIONAL\r
   )\r
 {\r
   NET_MAP_ITEM  *Item;\r
@@ -1649,7 +1631,6 @@ NetMapRemoveHead (
   return Item->Key;\r
 }\r
 \r
-\r
 /**\r
   Remove the last node entry on the netmap and return the key of the removed item.\r
 \r
@@ -1670,11 +1651,11 @@ NetMapRemoveHead (
 VOID *\r
 EFIAPI\r
 NetMapRemoveTail (\r
-  IN OUT NET_MAP            *Map,\r
-  OUT VOID                  **Value       OPTIONAL\r
+  IN OUT NET_MAP  *Map,\r
+  OUT VOID        **Value       OPTIONAL\r
   )\r
 {\r
-  NET_MAP_ITEM              *Item;\r
+  NET_MAP_ITEM  *Item;\r
 \r
   //\r
   // Often, it indicates a programming error to remove\r
@@ -1694,7 +1675,6 @@ NetMapRemoveTail (
   return Item->Key;\r
 }\r
 \r
-\r
 /**\r
   Iterate through the netmap and call CallBack for each item.\r
 \r
@@ -1717,17 +1697,16 @@ NetMapRemoveTail (
 EFI_STATUS\r
 EFIAPI\r
 NetMapIterate (\r
-  IN NET_MAP                *Map,\r
-  IN NET_MAP_CALLBACK       CallBack,\r
-  IN VOID                   *Arg      OPTIONAL\r
+  IN NET_MAP           *Map,\r
+  IN NET_MAP_CALLBACK  CallBack,\r
+  IN VOID              *Arg      OPTIONAL\r
   )\r
 {\r
-\r
-  LIST_ENTRY            *Entry;\r
-  LIST_ENTRY            *Next;\r
-  LIST_ENTRY            *Head;\r
-  NET_MAP_ITEM          *Item;\r
-  EFI_STATUS            Result;\r
+  LIST_ENTRY    *Entry;\r
+  LIST_ENTRY    *Next;\r
+  LIST_ENTRY    *Head;\r
+  NET_MAP_ITEM  *Item;\r
+  EFI_STATUS    Result;\r
 \r
   ASSERT ((Map != NULL) && (CallBack != NULL));\r
 \r
@@ -1749,7 +1728,6 @@ NetMapIterate (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This is the default unload handle for all the network drivers.\r
 \r
@@ -1765,17 +1743,17 @@ NetMapIterate (
 EFI_STATUS\r
 EFIAPI\r
 NetLibDefaultUnload (\r
-  IN EFI_HANDLE             ImageHandle\r
+  IN EFI_HANDLE  ImageHandle\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  EFI_HANDLE                        *DeviceHandleBuffer;\r
-  UINTN                             DeviceHandleCount;\r
-  UINTN                             Index;\r
-  UINTN                             Index2;\r
-  EFI_DRIVER_BINDING_PROTOCOL       *DriverBinding;\r
-  EFI_COMPONENT_NAME_PROTOCOL       *ComponentName;\r
-  EFI_COMPONENT_NAME2_PROTOCOL      *ComponentName2;\r
+  EFI_STATUS                    Status;\r
+  EFI_HANDLE                    *DeviceHandleBuffer;\r
+  UINTN                         DeviceHandleCount;\r
+  UINTN                         Index;\r
+  UINTN                         Index2;\r
+  EFI_DRIVER_BINDING_PROTOCOL   *DriverBinding;\r
+  EFI_COMPONENT_NAME_PROTOCOL   *ComponentName;\r
+  EFI_COMPONENT_NAME2_PROTOCOL  *ComponentName2;\r
 \r
   //\r
   // Get the list of all the handles in the handle database.\r
@@ -1798,7 +1776,7 @@ NetLibDefaultUnload (
     Status = gBS->HandleProtocol (\r
                     DeviceHandleBuffer[Index],\r
                     &gEfiDriverBindingProtocolGuid,\r
-                    (VOID **) &DriverBinding\r
+                    (VOID **)&DriverBinding\r
                     );\r
     if (EFI_ERROR (Status)) {\r
       continue;\r
@@ -1824,15 +1802,15 @@ NetLibDefaultUnload (
     // Uninstall all the protocols installed in the driver entry point\r
     //\r
     gBS->UninstallProtocolInterface (\r
-          DriverBinding->DriverBindingHandle,\r
-          &gEfiDriverBindingProtocolGuid,\r
-          DriverBinding\r
-          );\r
+           DriverBinding->DriverBindingHandle,\r
+           &gEfiDriverBindingProtocolGuid,\r
+           DriverBinding\r
+           );\r
 \r
     Status = gBS->HandleProtocol (\r
                     DeviceHandleBuffer[Index],\r
                     &gEfiComponentNameProtocolGuid,\r
-                    (VOID **) &ComponentName\r
+                    (VOID **)&ComponentName\r
                     );\r
     if (!EFI_ERROR (Status)) {\r
       gBS->UninstallProtocolInterface (\r
@@ -1845,7 +1823,7 @@ NetLibDefaultUnload (
     Status = gBS->HandleProtocol (\r
                     DeviceHandleBuffer[Index],\r
                     &gEfiComponentName2ProtocolGuid,\r
-                    (VOID **) &ComponentName2\r
+                    (VOID **)&ComponentName2\r
                     );\r
     if (!EFI_ERROR (Status)) {\r
       gBS->UninstallProtocolInterface (\r
@@ -1866,8 +1844,6 @@ NetLibDefaultUnload (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
-\r
 /**\r
   Create a child of the service that is identified by ServiceBindingGuid.\r
 \r
@@ -1888,16 +1864,15 @@ NetLibDefaultUnload (
 EFI_STATUS\r
 EFIAPI\r
 NetLibCreateServiceChild (\r
-  IN  EFI_HANDLE            Controller,\r
-  IN  EFI_HANDLE            Image,\r
-  IN  EFI_GUID              *ServiceBindingGuid,\r
-  IN  OUT EFI_HANDLE        *ChildHandle\r
+  IN  EFI_HANDLE      Controller,\r
+  IN  EFI_HANDLE      Image,\r
+  IN  EFI_GUID        *ServiceBindingGuid,\r
+  IN  OUT EFI_HANDLE  *ChildHandle\r
   )\r
 {\r
   EFI_STATUS                    Status;\r
   EFI_SERVICE_BINDING_PROTOCOL  *Service;\r
 \r
-\r
   ASSERT ((ServiceBindingGuid != NULL) && (ChildHandle != NULL));\r
 \r
   //\r
@@ -1906,7 +1881,7 @@ NetLibCreateServiceChild (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   ServiceBindingGuid,\r
-                  (VOID **) &Service,\r
+                  (VOID **)&Service,\r
                   Image,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1923,7 +1898,6 @@ NetLibCreateServiceChild (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Destroy a child of the service that is identified by ServiceBindingGuid.\r
 \r
@@ -1943,10 +1917,10 @@ NetLibCreateServiceChild (
 EFI_STATUS\r
 EFIAPI\r
 NetLibDestroyServiceChild (\r
-  IN  EFI_HANDLE            Controller,\r
-  IN  EFI_HANDLE            Image,\r
-  IN  EFI_GUID              *ServiceBindingGuid,\r
-  IN  EFI_HANDLE            ChildHandle\r
+  IN  EFI_HANDLE  Controller,\r
+  IN  EFI_HANDLE  Image,\r
+  IN  EFI_GUID    *ServiceBindingGuid,\r
+  IN  EFI_HANDLE  ChildHandle\r
   )\r
 {\r
   EFI_STATUS                    Status;\r
@@ -1960,7 +1934,7 @@ NetLibDestroyServiceChild (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   ServiceBindingGuid,\r
-                  (VOID **) &Service,\r
+                  (VOID **)&Service,\r
                   Image,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1996,8 +1970,8 @@ NetLibDestroyServiceChild (
 EFI_HANDLE\r
 EFIAPI\r
 NetLibGetSnpHandle (\r
-  IN   EFI_HANDLE                  ServiceHandle,\r
-  OUT  EFI_SIMPLE_NETWORK_PROTOCOL **Snp  OPTIONAL\r
+  IN   EFI_HANDLE                   ServiceHandle,\r
+  OUT  EFI_SIMPLE_NETWORK_PROTOCOL  **Snp  OPTIONAL\r
   )\r
 {\r
   EFI_STATUS                   Status;\r
@@ -2009,11 +1983,12 @@ NetLibGetSnpHandle (
   // Try to open SNP from ServiceHandle\r
   //\r
   SnpInstance = NULL;\r
-  Status = gBS->HandleProtocol (ServiceHandle, &gEfiSimpleNetworkProtocolGuid, (VOID **) &SnpInstance);\r
+  Status      = gBS->HandleProtocol (ServiceHandle, &gEfiSimpleNetworkProtocolGuid, (VOID **)&SnpInstance);\r
   if (!EFI_ERROR (Status)) {\r
     if (Snp != NULL) {\r
       *Snp = SnpInstance;\r
     }\r
+\r
     return ServiceHandle;\r
   }\r
 \r
@@ -2026,7 +2001,7 @@ NetLibGetSnpHandle (
   }\r
 \r
   SnpHandle = NULL;\r
-  Status = gBS->LocateDevicePath (&gEfiSimpleNetworkProtocolGuid, &DevicePath, &SnpHandle);\r
+  Status    = gBS->LocateDevicePath (&gEfiSimpleNetworkProtocolGuid, &DevicePath, &SnpHandle);\r
   if (EFI_ERROR (Status)) {\r
     //\r
     // Failed to find SNP handle\r
@@ -2034,11 +2009,12 @@ NetLibGetSnpHandle (
     return NULL;\r
   }\r
 \r
-  Status = gBS->HandleProtocol (SnpHandle, &gEfiSimpleNetworkProtocolGuid, (VOID **) &SnpInstance);\r
+  Status = gBS->HandleProtocol (SnpHandle, &gEfiSimpleNetworkProtocolGuid, (VOID **)&SnpInstance);\r
   if (!EFI_ERROR (Status)) {\r
     if (Snp != NULL) {\r
       *Snp = SnpInstance;\r
     }\r
+\r
     return SnpHandle;\r
   }\r
 \r
@@ -2061,7 +2037,7 @@ NetLibGetSnpHandle (
 UINT16\r
 EFIAPI\r
 NetLibGetVlanId (\r
-  IN EFI_HANDLE             ServiceHandle\r
+  IN EFI_HANDLE  ServiceHandle\r
   )\r
 {\r
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
@@ -2074,9 +2050,10 @@ NetLibGetVlanId (
 \r
   Node = DevicePath;\r
   while (!IsDevicePathEnd (Node)) {\r
-    if (Node->Type == MESSAGING_DEVICE_PATH && Node->SubType == MSG_VLAN_DP) {\r
-      return ((VLAN_DEVICE_PATH *) Node)->VlanId;\r
+    if ((Node->Type == MESSAGING_DEVICE_PATH) && (Node->SubType == MSG_VLAN_DP)) {\r
+      return ((VLAN_DEVICE_PATH *)Node)->VlanId;\r
     }\r
+\r
     Node = NextDevicePathNode (Node);\r
   }\r
 \r
@@ -2100,8 +2077,8 @@ NetLibGetVlanId (
 EFI_HANDLE\r
 EFIAPI\r
 NetLibGetVlanHandle (\r
-  IN EFI_HANDLE             ControllerHandle,\r
-  IN UINT16                 VlanId\r
+  IN EFI_HANDLE  ControllerHandle,\r
+  IN UINT16      VlanId\r
   )\r
 {\r
   EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath;\r
@@ -2120,10 +2097,10 @@ NetLibGetVlanHandle (
   //\r
   CopyMem (&VlanNode, &mNetVlanDevicePathTemplate, sizeof (VLAN_DEVICE_PATH));\r
   VlanNode.VlanId = VlanId;\r
-  VlanDevicePath = AppendDevicePathNode (\r
-                     ParentDevicePath,\r
-                     (EFI_DEVICE_PATH_PROTOCOL *) &VlanNode\r
-                     );\r
+  VlanDevicePath  = AppendDevicePathNode (\r
+                      ParentDevicePath,\r
+                      (EFI_DEVICE_PATH_PROTOCOL *)&VlanNode\r
+                      );\r
   if (VlanDevicePath == NULL) {\r
     return NULL;\r
   }\r
@@ -2131,7 +2108,7 @@ NetLibGetVlanHandle (
   //\r
   // Find VLAN device handle\r
   //\r
-  Handle = NULL;\r
+  Handle     = NULL;\r
   DevicePath = VlanDevicePath;\r
   gBS->LocateDevicePath (\r
          &gEfiDevicePathProtocolGuid,\r
@@ -2171,19 +2148,19 @@ NetLibGetVlanHandle (
 EFI_STATUS\r
 EFIAPI\r
 NetLibGetMacAddress (\r
-  IN  EFI_HANDLE            ServiceHandle,\r
-  OUT EFI_MAC_ADDRESS       *MacAddress,\r
-  OUT UINTN                 *AddressSize\r
+  IN  EFI_HANDLE       ServiceHandle,\r
+  OUT EFI_MAC_ADDRESS  *MacAddress,\r
+  OUT UINTN            *AddressSize\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL  *Snp;\r
-  EFI_SIMPLE_NETWORK_MODE      *SnpMode;\r
-  EFI_SIMPLE_NETWORK_MODE      SnpModeData;\r
-  EFI_MANAGED_NETWORK_PROTOCOL *Mnp;\r
-  EFI_SERVICE_BINDING_PROTOCOL *MnpSb;\r
-  EFI_HANDLE                   SnpHandle;\r
-  EFI_HANDLE                   MnpChildHandle;\r
+  EFI_STATUS                    Status;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL   *Snp;\r
+  EFI_SIMPLE_NETWORK_MODE       *SnpMode;\r
+  EFI_SIMPLE_NETWORK_MODE       SnpModeData;\r
+  EFI_MANAGED_NETWORK_PROTOCOL  *Mnp;\r
+  EFI_SERVICE_BINDING_PROTOCOL  *MnpSb;\r
+  EFI_HANDLE                    SnpHandle;\r
+  EFI_HANDLE                    MnpChildHandle;\r
 \r
   ASSERT (MacAddress != NULL);\r
   ASSERT (AddressSize != NULL);\r
@@ -2191,7 +2168,7 @@ NetLibGetMacAddress (
   //\r
   // Try to get SNP handle\r
   //\r
-  Snp = NULL;\r
+  Snp       = NULL;\r
   SnpHandle = NetLibGetSnpHandle (ServiceHandle, &Snp);\r
   if (SnpHandle != NULL) {\r
     //\r
@@ -2203,11 +2180,11 @@ NetLibGetMacAddress (
     // Failed to get SNP handle, try to get MAC address from MNP\r
     //\r
     MnpChildHandle = NULL;\r
-    Status = gBS->HandleProtocol (\r
-                    ServiceHandle,\r
-                    &gEfiManagedNetworkServiceBindingProtocolGuid,\r
-                    (VOID **) &MnpSb\r
-                    );\r
+    Status         = gBS->HandleProtocol (\r
+                            ServiceHandle,\r
+                            &gEfiManagedNetworkServiceBindingProtocolGuid,\r
+                            (VOID **)&MnpSb\r
+                            );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -2226,7 +2203,7 @@ NetLibGetMacAddress (
     Status = gBS->HandleProtocol (\r
                     MnpChildHandle,\r
                     &gEfiManagedNetworkProtocolGuid,\r
-                    (VOID **) &Mnp\r
+                    (VOID **)&Mnp\r
                     );\r
     if (EFI_ERROR (Status)) {\r
       MnpSb->DestroyChild (MnpSb, MnpChildHandle);\r
@@ -2241,6 +2218,7 @@ NetLibGetMacAddress (
       MnpSb->DestroyChild (MnpSb, MnpChildHandle);\r
       return Status;\r
     }\r
+\r
     SnpMode = &SnpModeData;\r
 \r
     //\r
@@ -2282,19 +2260,19 @@ NetLibGetMacAddress (
 EFI_STATUS\r
 EFIAPI\r
 NetLibGetMacString (\r
-  IN  EFI_HANDLE            ServiceHandle,\r
-  IN  EFI_HANDLE            ImageHandle  OPTIONAL,\r
-  OUT CHAR16                **MacString\r
+  IN  EFI_HANDLE  ServiceHandle,\r
+  IN  EFI_HANDLE  ImageHandle  OPTIONAL,\r
+  OUT CHAR16      **MacString\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_MAC_ADDRESS              MacAddress;\r
-  UINT8                        *HwAddress;\r
-  UINTN                        HwAddressSize;\r
-  UINT16                       VlanId;\r
-  CHAR16                       *String;\r
-  UINTN                        Index;\r
-  UINTN                        BufferSize;\r
+  EFI_STATUS       Status;\r
+  EFI_MAC_ADDRESS  MacAddress;\r
+  UINT8            *HwAddress;\r
+  UINTN            HwAddressSize;\r
+  UINT16           VlanId;\r
+  CHAR16           *String;\r
+  UINTN            Index;\r
+  UINTN            BufferSize;\r
 \r
   ASSERT (MacString != NULL);\r
 \r
@@ -2312,10 +2290,11 @@ NetLibGetMacString (
   // Plus one unicode character for the null-terminator.\r
   //\r
   BufferSize = (2 * HwAddressSize + 5 + 1) * sizeof (CHAR16);\r
-  String = AllocateZeroPool (BufferSize);\r
+  String     = AllocateZeroPool (BufferSize);\r
   if (String == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   *MacString = String;\r
 \r
   //\r
@@ -2390,8 +2369,8 @@ NetLibGetMacString (
 EFI_STATUS\r
 EFIAPI\r
 NetLibDetectMedia (\r
-  IN  EFI_HANDLE            ServiceHandle,\r
-  OUT BOOLEAN               *MediaPresent\r
+  IN  EFI_HANDLE  ServiceHandle,\r
+  OUT BOOLEAN     *MediaPresent\r
   )\r
 {\r
   EFI_STATUS                   Status;\r
@@ -2410,7 +2389,7 @@ NetLibDetectMedia (
   //\r
   // Get SNP handle\r
   //\r
-  Snp = NULL;\r
+  Snp       = NULL;\r
   SnpHandle = NetLibGetSnpHandle (ServiceHandle, &Snp);\r
   if (SnpHandle == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -2485,6 +2464,7 @@ NetLibDetectMedia (
     if (!EFI_ERROR (Status)) {\r
       Status = Snp->Stop (Snp);\r
     }\r
+\r
     if (EFI_ERROR (Status)) {\r
       goto Exit;\r
     }\r
@@ -2496,6 +2476,7 @@ NetLibDetectMedia (
     if (!EFI_ERROR (Status)) {\r
       Status = Snp->Initialize (Snp, 0, 0);\r
     }\r
+\r
     if (EFI_ERROR (Status)) {\r
       goto Exit;\r
     }\r
@@ -2599,9 +2580,9 @@ Exit:
 EFI_STATUS\r
 EFIAPI\r
 NetLibDetectMediaWaitTimeout (\r
-  IN  EFI_HANDLE            ServiceHandle,\r
-  IN  UINT64                Timeout,\r
-  OUT EFI_STATUS            *MediaState\r
+  IN  EFI_HANDLE  ServiceHandle,\r
+  IN  UINT64      Timeout,\r
+  OUT EFI_STATUS  *MediaState\r
   )\r
 {\r
   EFI_STATUS                        Status;\r
@@ -2618,13 +2599,14 @@ NetLibDetectMediaWaitTimeout (
   if (MediaState == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   *MediaState = EFI_SUCCESS;\r
   MediaInfo   = NULL;\r
 \r
   //\r
   // Get SNP handle\r
   //\r
-  Snp = NULL;\r
+  Snp       = NULL;\r
   SnpHandle = NetLibGetSnpHandle (ServiceHandle, &Snp);\r
   if (SnpHandle == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -2633,12 +2615,11 @@ NetLibDetectMediaWaitTimeout (
   Status = gBS->HandleProtocol (\r
                   SnpHandle,\r
                   &gEfiAdapterInformationProtocolGuid,\r
-                  (VOID *) &Aip\r
+                  (VOID *)&Aip\r
                   );\r
   if (EFI_ERROR (Status)) {\r
-\r
     MediaPresent = TRUE;\r
-    Status = NetLibDetectMedia (ServiceHandle, &MediaPresent);\r
+    Status       = NetLibDetectMedia (ServiceHandle, &MediaPresent);\r
     if (!EFI_ERROR (Status)) {\r
       if (MediaPresent) {\r
         *MediaState = EFI_SUCCESS;\r
@@ -2656,30 +2637,26 @@ NetLibDetectMediaWaitTimeout (
   Status = Aip->GetInformation (\r
                   Aip,\r
                   &gEfiAdapterInfoMediaStateGuid,\r
-                  (VOID **) &MediaInfo,\r
+                  (VOID **)&MediaInfo,\r
                   &DataSize\r
                   );\r
   if (!EFI_ERROR (Status)) {\r
-\r
     *MediaState = MediaInfo->MediaState;\r
     FreePool (MediaInfo);\r
-    if (*MediaState != EFI_NOT_READY || Timeout < MEDIA_STATE_DETECT_TIME_INTERVAL) {\r
-\r
+    if ((*MediaState != EFI_NOT_READY) || (Timeout < MEDIA_STATE_DETECT_TIME_INTERVAL)) {\r
       return EFI_SUCCESS;\r
     }\r
   } else {\r
-\r
     if (MediaInfo != NULL) {\r
       FreePool (MediaInfo);\r
     }\r
 \r
     if (Status == EFI_UNSUPPORTED) {\r
-\r
       //\r
       // If gEfiAdapterInfoMediaStateGuid is not supported, call NetLibDetectMedia to get media state!\r
       //\r
       MediaPresent = TRUE;\r
-      Status = NetLibDetectMedia (ServiceHandle, &MediaPresent);\r
+      Status       = NetLibDetectMedia (ServiceHandle, &MediaPresent);\r
       if (!EFI_ERROR (Status)) {\r
         if (MediaPresent) {\r
           *MediaState = EFI_SUCCESS;\r
@@ -2687,6 +2664,7 @@ NetLibDetectMediaWaitTimeout (
           *MediaState = EFI_NO_MEDIA;\r
         }\r
       }\r
+\r
       return Status;\r
     }\r
 \r
@@ -2699,7 +2677,7 @@ NetLibDetectMediaWaitTimeout (
 \r
   Timer        = NULL;\r
   TimeRemained = Timeout;\r
-  Status = gBS->CreateEvent (EVT_TIMER, TPL_CALLBACK, NULL, NULL, &Timer);\r
+  Status       = gBS->CreateEvent (EVT_TIMER, TPL_CALLBACK, NULL, NULL, &Timer);\r
   if (EFI_ERROR (Status)) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
@@ -2711,39 +2689,37 @@ NetLibDetectMediaWaitTimeout (
                     MEDIA_STATE_DETECT_TIME_INTERVAL\r
                     );\r
     if (EFI_ERROR (Status)) {\r
-      gBS->CloseEvent(Timer);\r
+      gBS->CloseEvent (Timer);\r
       return EFI_DEVICE_ERROR;\r
     }\r
 \r
     do {\r
       TimerStatus = gBS->CheckEvent (Timer);\r
       if (!EFI_ERROR (TimerStatus)) {\r
-\r
         TimeRemained -= MEDIA_STATE_DETECT_TIME_INTERVAL;\r
-        Status = Aip->GetInformation (\r
-                        Aip,\r
-                        &gEfiAdapterInfoMediaStateGuid,\r
-                        (VOID **) &MediaInfo,\r
-                        &DataSize\r
-                        );\r
+        Status        = Aip->GetInformation (\r
+                               Aip,\r
+                               &gEfiAdapterInfoMediaStateGuid,\r
+                               (VOID **)&MediaInfo,\r
+                               &DataSize\r
+                               );\r
         if (!EFI_ERROR (Status)) {\r
-\r
           *MediaState = MediaInfo->MediaState;\r
           FreePool (MediaInfo);\r
         } else {\r
-\r
           if (MediaInfo != NULL) {\r
             FreePool (MediaInfo);\r
           }\r
-          gBS->CloseEvent(Timer);\r
+\r
+          gBS->CloseEvent (Timer);\r
           return Status;\r
         }\r
       }\r
     } while (TimerStatus == EFI_NOT_READY);\r
   } while (*MediaState == EFI_NOT_READY && TimeRemained >= MEDIA_STATE_DETECT_TIME_INTERVAL);\r
 \r
-  gBS->CloseEvent(Timer);\r
-  if (*MediaState == EFI_NOT_READY && TimeRemained < MEDIA_STATE_DETECT_TIME_INTERVAL) {\r
+  gBS->CloseEvent (Timer);\r
+  if ((*MediaState == EFI_NOT_READY) && (TimeRemained < MEDIA_STATE_DETECT_TIME_INTERVAL)) {\r
     return EFI_TIMEOUT;\r
   } else {\r
     return EFI_SUCCESS;\r
@@ -2770,22 +2746,22 @@ NetLibDefaultAddressIsStatic (
   IN EFI_HANDLE  Controller\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  EFI_IP4_CONFIG2_PROTOCOL         *Ip4Config2;\r
-  UINTN                            DataSize;\r
-  EFI_IP4_CONFIG2_POLICY           Policy;\r
-  BOOLEAN                          IsStatic;\r
+  EFI_STATUS                Status;\r
+  EFI_IP4_CONFIG2_PROTOCOL  *Ip4Config2;\r
+  UINTN                     DataSize;\r
+  EFI_IP4_CONFIG2_POLICY    Policy;\r
+  BOOLEAN                   IsStatic;\r
 \r
   Ip4Config2 = NULL;\r
 \r
   DataSize = sizeof (EFI_IP4_CONFIG2_POLICY);\r
 \r
-  IsStatic   = TRUE;\r
+  IsStatic = TRUE;\r
 \r
   //\r
   // Get Ip4Config2 policy.\r
   //\r
-  Status = gBS->HandleProtocol (Controller, &gEfiIp4Config2ProtocolGuid, (VOID **) &Ip4Config2);\r
+  Status = gBS->HandleProtocol (Controller, &gEfiIp4Config2ProtocolGuid, (VOID **)&Ip4Config2);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
@@ -2795,7 +2771,7 @@ NetLibDefaultAddressIsStatic (
     goto ON_EXIT;\r
   }\r
 \r
-  IsStatic = (BOOLEAN) (Policy == Ip4Config2PolicyStatic);\r
+  IsStatic = (BOOLEAN)(Policy == Ip4Config2PolicyStatic);\r
 \r
 ON_EXIT:\r
 \r
@@ -2907,7 +2883,7 @@ NetLibCreateIPv6DPathNode (
   Node->LocalPort  = LocalPort;\r
   Node->RemotePort = RemotePort;\r
 \r
-  Node->Protocol        = Protocol;\r
+  Node->Protocol = Protocol;\r
 \r
   //\r
   // Set default value to IPAddressOrigin, PrefixLength.\r
@@ -2940,15 +2916,15 @@ NetLibCreateIPv6DPathNode (
 EFI_HANDLE\r
 EFIAPI\r
 NetLibGetNicHandle (\r
-  IN EFI_HANDLE             Controller,\r
-  IN EFI_GUID               *ProtocolGuid\r
+  IN EFI_HANDLE  Controller,\r
+  IN EFI_GUID    *ProtocolGuid\r
   )\r
 {\r
-  EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *OpenBuffer;\r
-  EFI_HANDLE                          Handle;\r
-  EFI_STATUS                          Status;\r
-  UINTN                               OpenCount;\r
-  UINTN                               Index;\r
+  EFI_OPEN_PROTOCOL_INFORMATION_ENTRY  *OpenBuffer;\r
+  EFI_HANDLE                           Handle;\r
+  EFI_STATUS                           Status;\r
+  UINTN                                OpenCount;\r
+  UINTN                                Index;\r
 \r
   ASSERT (ProtocolGuid != NULL);\r
 \r
@@ -2989,12 +2965,12 @@ NetLibGetNicHandle (
 EFI_STATUS\r
 EFIAPI\r
 NetLibAsciiStrToIp4 (\r
-  IN CONST CHAR8                 *String,\r
-  OUT      EFI_IPv4_ADDRESS      *Ip4Address\r
+  IN CONST CHAR8             *String,\r
+  OUT      EFI_IPv4_ADDRESS  *Ip4Address\r
   )\r
 {\r
-  RETURN_STATUS                  Status;\r
-  CHAR8                          *EndPointer;\r
+  RETURN_STATUS  Status;\r
+  CHAR8          *EndPointer;\r
 \r
   Status = AsciiStrToIpv4Address (String, &EndPointer, Ip4Address, NULL);\r
   if (RETURN_ERROR (Status) || (*EndPointer != '\0')) {\r
@@ -3004,7 +2980,6 @@ NetLibAsciiStrToIp4 (
   }\r
 }\r
 \r
-\r
 /**\r
   Convert one Null-terminated ASCII string to EFI_IPv6_ADDRESS. The format of the\r
   string is defined in RFC 4291 - Text Representation of Addresses.\r
@@ -3019,12 +2994,12 @@ NetLibAsciiStrToIp4 (
 EFI_STATUS\r
 EFIAPI\r
 NetLibAsciiStrToIp6 (\r
-  IN CONST CHAR8                 *String,\r
-  OUT      EFI_IPv6_ADDRESS      *Ip6Address\r
+  IN CONST CHAR8             *String,\r
+  OUT      EFI_IPv6_ADDRESS  *Ip6Address\r
   )\r
 {\r
-  RETURN_STATUS                  Status;\r
-  CHAR8                          *EndPointer;\r
+  RETURN_STATUS  Status;\r
+  CHAR8          *EndPointer;\r
 \r
   Status = AsciiStrToIpv6Address (String, &EndPointer, Ip6Address, NULL);\r
   if (RETURN_ERROR (Status) || (*EndPointer != '\0')) {\r
@@ -3034,7 +3009,6 @@ NetLibAsciiStrToIp6 (
   }\r
 }\r
 \r
-\r
 /**\r
   Convert one Null-terminated Unicode string (decimal dotted) to EFI_IPv4_ADDRESS.\r
 \r
@@ -3048,12 +3022,12 @@ NetLibAsciiStrToIp6 (
 EFI_STATUS\r
 EFIAPI\r
 NetLibStrToIp4 (\r
-  IN CONST CHAR16                *String,\r
-  OUT      EFI_IPv4_ADDRESS      *Ip4Address\r
+  IN CONST CHAR16            *String,\r
+  OUT      EFI_IPv4_ADDRESS  *Ip4Address\r
   )\r
 {\r
-  RETURN_STATUS                  Status;\r
-  CHAR16                         *EndPointer;\r
+  RETURN_STATUS  Status;\r
+  CHAR16         *EndPointer;\r
 \r
   Status = StrToIpv4Address (String, &EndPointer, Ip4Address, NULL);\r
   if (RETURN_ERROR (Status) || (*EndPointer != L'\0')) {\r
@@ -3063,7 +3037,6 @@ NetLibStrToIp4 (
   }\r
 }\r
 \r
-\r
 /**\r
   Convert one Null-terminated Unicode string to EFI_IPv6_ADDRESS.  The format of\r
   the string is defined in RFC 4291 - Text Representation of Addresses.\r
@@ -3078,12 +3051,12 @@ NetLibStrToIp4 (
 EFI_STATUS\r
 EFIAPI\r
 NetLibStrToIp6 (\r
-  IN CONST CHAR16                *String,\r
-  OUT      EFI_IPv6_ADDRESS      *Ip6Address\r
+  IN CONST CHAR16            *String,\r
+  OUT      EFI_IPv6_ADDRESS  *Ip6Address\r
   )\r
 {\r
-  RETURN_STATUS                  Status;\r
-  CHAR16                         *EndPointer;\r
+  RETURN_STATUS  Status;\r
+  CHAR16         *EndPointer;\r
 \r
   Status = StrToIpv6Address (String, &EndPointer, Ip6Address, NULL);\r
   if (RETURN_ERROR (Status) || (*EndPointer != L'\0')) {\r
@@ -3109,13 +3082,13 @@ NetLibStrToIp6 (
 EFI_STATUS\r
 EFIAPI\r
 NetLibStrToIp6andPrefix (\r
-  IN CONST CHAR16                *String,\r
-  OUT      EFI_IPv6_ADDRESS      *Ip6Address,\r
-  OUT      UINT8                 *PrefixLength\r
+  IN CONST CHAR16            *String,\r
+  OUT      EFI_IPv6_ADDRESS  *Ip6Address,\r
+  OUT      UINT8             *PrefixLength\r
   )\r
 {\r
-  RETURN_STATUS                  Status;\r
-  CHAR16                         *EndPointer;\r
+  RETURN_STATUS  Status;\r
+  CHAR16         *EndPointer;\r
 \r
   Status = StrToIpv6Address (String, &EndPointer, Ip6Address, PrefixLength);\r
   if (RETURN_ERROR (Status) || (*EndPointer != L'\0')) {\r
@@ -3142,21 +3115,21 @@ NetLibStrToIp6andPrefix (
 EFI_STATUS\r
 EFIAPI\r
 NetLibIp6ToStr (\r
-  IN         EFI_IPv6_ADDRESS      *Ip6Address,\r
-  OUT        CHAR16                *String,\r
-  IN         UINTN                 StringSize\r
+  IN         EFI_IPv6_ADDRESS  *Ip6Address,\r
+  OUT        CHAR16            *String,\r
+  IN         UINTN             StringSize\r
   )\r
 {\r
-  UINT16     Ip6Addr[8];\r
-  UINTN      Index;\r
-  UINTN      LongestZerosStart;\r
-  UINTN      LongestZerosLength;\r
-  UINTN      CurrentZerosStart;\r
-  UINTN      CurrentZerosLength;\r
-  CHAR16     Buffer[sizeof"ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"];\r
-  CHAR16     *Ptr;\r
-\r
-  if (Ip6Address == NULL || String == NULL || StringSize == 0) {\r
+  UINT16  Ip6Addr[8];\r
+  UINTN   Index;\r
+  UINTN   LongestZerosStart;\r
+  UINTN   LongestZerosLength;\r
+  UINTN   CurrentZerosStart;\r
+  UINTN   CurrentZerosLength;\r
+  CHAR16  Buffer[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"];\r
+  CHAR16  *Ptr;\r
+\r
+  if ((Ip6Address == NULL) || (String == NULL) || (StringSize == 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -3178,25 +3151,26 @@ NetLibIp6ToStr (
   for (Index = 0; Index < 8; Index++) {\r
     if (Ip6Addr[Index] == 0) {\r
       if (CurrentZerosStart == DEFAULT_ZERO_START) {\r
-        CurrentZerosStart = Index;\r
+        CurrentZerosStart  = Index;\r
         CurrentZerosLength = 1;\r
       } else {\r
         CurrentZerosLength++;\r
       }\r
     } else {\r
       if (CurrentZerosStart != DEFAULT_ZERO_START) {\r
-        if (CurrentZerosLength > 2 && (LongestZerosStart == (DEFAULT_ZERO_START) || CurrentZerosLength > LongestZerosLength)) {\r
+        if ((CurrentZerosLength > 2) && ((LongestZerosStart == (DEFAULT_ZERO_START)) || (CurrentZerosLength > LongestZerosLength))) {\r
           LongestZerosStart  = CurrentZerosStart;\r
           LongestZerosLength = CurrentZerosLength;\r
         }\r
+\r
         CurrentZerosStart  = DEFAULT_ZERO_START;\r
         CurrentZerosLength = 0;\r
       }\r
     }\r
   }\r
 \r
-  if (CurrentZerosStart != DEFAULT_ZERO_START && CurrentZerosLength > 2) {\r
-    if (LongestZerosStart == DEFAULT_ZERO_START || LongestZerosLength < CurrentZerosLength) {\r
+  if ((CurrentZerosStart != DEFAULT_ZERO_START) && (CurrentZerosLength > 2)) {\r
+    if ((LongestZerosStart == DEFAULT_ZERO_START) || (LongestZerosLength < CurrentZerosLength)) {\r
       LongestZerosStart  = CurrentZerosStart;\r
       LongestZerosLength = CurrentZerosLength;\r
     }\r
@@ -3204,21 +3178,25 @@ NetLibIp6ToStr (
 \r
   Ptr = Buffer;\r
   for (Index = 0; Index < 8; Index++) {\r
-    if (LongestZerosStart != DEFAULT_ZERO_START && Index >= LongestZerosStart && Index < LongestZerosStart + LongestZerosLength) {\r
+    if ((LongestZerosStart != DEFAULT_ZERO_START) && (Index >= LongestZerosStart) && (Index < LongestZerosStart + LongestZerosLength)) {\r
       if (Index == LongestZerosStart) {\r
         *Ptr++ = L':';\r
       }\r
+\r
       continue;\r
     }\r
+\r
     if (Index != 0) {\r
       *Ptr++ = L':';\r
     }\r
-    Ptr += UnicodeSPrint(Ptr, 10, L"%x", Ip6Addr[Index]);\r
+\r
+    Ptr += UnicodeSPrint (Ptr, 10, L"%x", Ip6Addr[Index]);\r
   }\r
 \r
-  if (LongestZerosStart != DEFAULT_ZERO_START && LongestZerosStart + LongestZerosLength == 8) {\r
+  if ((LongestZerosStart != DEFAULT_ZERO_START) && (LongestZerosStart + LongestZerosLength == 8)) {\r
     *Ptr++ = L':';\r
   }\r
+\r
   *Ptr = L'\0';\r
 \r
   if ((UINTN)Ptr - (UINTN)Buffer > StringSize) {\r
@@ -3244,7 +3222,7 @@ NetLibIp6ToStr (
 EFI_STATUS\r
 EFIAPI\r
 NetLibGetSystemGuid (\r
-  OUT EFI_GUID              *SystemGuid\r
+  OUT EFI_GUID  *SystemGuid\r
   )\r
 {\r
   EFI_STATUS                    Status;\r
@@ -3257,17 +3235,18 @@ NetLibGetSystemGuid (
   ASSERT (SystemGuid != NULL);\r
 \r
   SmbiosTable = NULL;\r
-  Status = EfiGetSystemConfigurationTable (&gEfiSmbios3TableGuid, (VOID **) &Smbios30Table);\r
-  if (!(EFI_ERROR (Status) || Smbios30Table == NULL)) {\r
-    Smbios.Hdr = (SMBIOS_STRUCTURE *) (UINTN) Smbios30Table->TableAddress;\r
-    SmbiosEnd.Raw = (UINT8 *) (UINTN) (Smbios30Table->TableAddress + Smbios30Table->TableMaximumSize);\r
+  Status      = EfiGetSystemConfigurationTable (&gEfiSmbios3TableGuid, (VOID **)&Smbios30Table);\r
+  if (!(EFI_ERROR (Status) || (Smbios30Table == NULL))) {\r
+    Smbios.Hdr    = (SMBIOS_STRUCTURE *)(UINTN)Smbios30Table->TableAddress;\r
+    SmbiosEnd.Raw = (UINT8 *)(UINTN)(Smbios30Table->TableAddress + Smbios30Table->TableMaximumSize);\r
   } else {\r
-    Status = EfiGetSystemConfigurationTable (&gEfiSmbiosTableGuid, (VOID **) &SmbiosTable);\r
-    if (EFI_ERROR (Status) || SmbiosTable == NULL) {\r
+    Status = EfiGetSystemConfigurationTable (&gEfiSmbiosTableGuid, (VOID **)&SmbiosTable);\r
+    if (EFI_ERROR (Status) || (SmbiosTable == NULL)) {\r
       return EFI_NOT_FOUND;\r
     }\r
-    Smbios.Hdr    = (SMBIOS_STRUCTURE *) (UINTN) SmbiosTable->TableAddress;\r
-    SmbiosEnd.Raw = (UINT8 *) ((UINTN) SmbiosTable->TableAddress + SmbiosTable->TableLength);\r
+\r
+    Smbios.Hdr    = (SMBIOS_STRUCTURE *)(UINTN)SmbiosTable->TableAddress;\r
+    SmbiosEnd.Raw = (UINT8 *)((UINTN)SmbiosTable->TableAddress + SmbiosTable->TableLength);\r
   }\r
 \r
   do {\r
@@ -3296,7 +3275,7 @@ NetLibGetSystemGuid (
     //\r
     // Step 1: Skip over formatted section.\r
     //\r
-    String = (CHAR8 *) (Smbios.Raw + Smbios.Hdr->Length);\r
+    String = (CHAR8 *)(Smbios.Raw + Smbios.Hdr->Length);\r
 \r
     //\r
     // Step 2: Skip over unformatted string section.\r
@@ -3309,7 +3288,7 @@ NetLibGetSystemGuid (
       for ( ; *String != 0; String++) {\r
       }\r
 \r
-      if (*(UINT8*)++String == 0) {\r
+      if (*(UINT8 *)++String == 0) {\r
         //\r
         // Pointer to the next SMBIOS structure.\r
         //\r
@@ -3318,6 +3297,7 @@ NetLibGetSystemGuid (
       }\r
     } while (TRUE);\r
   } while (Smbios.Raw < SmbiosEnd.Raw);\r
+\r
   return EFI_NOT_FOUND;\r
 }\r
 \r
@@ -3341,15 +3321,15 @@ NetLibGetSystemGuid (
 CHAR8 *\r
 EFIAPI\r
 NetLibCreateDnsQName (\r
-  IN  CHAR16              *DomainName\r
+  IN  CHAR16  *DomainName\r
   )\r
 {\r
-  CHAR8                 *QueryName;\r
-  UINTN                 QueryNameSize;\r
-  CHAR8                 *Header;\r
-  CHAR8                 *Tail;\r
-  UINTN                 Len;\r
-  UINTN                 Index;\r
+  CHAR8  *QueryName;\r
+  UINTN  QueryNameSize;\r
+  CHAR8  *Header;\r
+  CHAR8  *Tail;\r
+  UINTN  Len;\r
+  UINTN  Index;\r
 \r
   ASSERT (DomainName != NULL);\r
 \r
@@ -3373,22 +3353,23 @@ NetLibCreateDnsQName (
   }\r
 \r
   Header = QueryName;\r
-  Tail = Header + 1;\r
-  Len = 0;\r
+  Tail   = Header + 1;\r
+  Len    = 0;\r
   for (Index = 0; DomainName[Index] != 0; Index++) {\r
-    *Tail = (CHAR8) DomainName[Index];\r
+    *Tail = (CHAR8)DomainName[Index];\r
     if (*Tail == '.') {\r
-      *Header = (CHAR8) Len;\r
-      Header = Tail;\r
-      Tail ++;\r
+      *Header = (CHAR8)Len;\r
+      Header  = Tail;\r
+      Tail++;\r
       Len = 0;\r
     } else {\r
       Tail++;\r
       Len++;\r
     }\r
   }\r
-  *Header = (CHAR8) Len;\r
-  *Tail = 0;\r
+\r
+  *Header = (CHAR8)Len;\r
+  *Tail   = 0;\r
 \r
   return QueryName;\r
 }\r
index 329a17623d9411ebf491bc87f0ec9658127e37f4..4721fbd2708c43b3b3f687c1a5dcb8293a3a636f 100644 (file)
@@ -14,7 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 \r
-\r
 /**\r
   Allocate and build up the sketch for a NET_BUF.\r
 \r
@@ -31,12 +30,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 NET_BUF *\r
 NetbufAllocStruct (\r
-  IN UINT32                 BlockNum,\r
-  IN UINT32                 BlockOpNum\r
+  IN UINT32  BlockNum,\r
+  IN UINT32  BlockOpNum\r
   )\r
 {\r
-  NET_BUF                   *Nbuf;\r
-  NET_VECTOR                *Vector;\r
+  NET_BUF     *Nbuf;\r
+  NET_VECTOR  *Vector;\r
 \r
   ASSERT (BlockOpNum >= 1);\r
 \r
@@ -49,9 +48,9 @@ NetbufAllocStruct (
     return NULL;\r
   }\r
 \r
-  Nbuf->Signature           = NET_BUF_SIGNATURE;\r
-  Nbuf->RefCnt              = 1;\r
-  Nbuf->BlockOpNum          = BlockOpNum;\r
+  Nbuf->Signature  = NET_BUF_SIGNATURE;\r
+  Nbuf->RefCnt     = 1;\r
+  Nbuf->BlockOpNum = BlockOpNum;\r
   InitializeListHead (&Nbuf->List);\r
 \r
   if (BlockNum != 0) {\r
@@ -75,7 +74,6 @@ FreeNbuf:
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Allocate a single block NET_BUF. Upon allocation, all the\r
   free space is in the tail room.\r
@@ -89,12 +87,12 @@ FreeNbuf:
 NET_BUF  *\r
 EFIAPI\r
 NetbufAlloc (\r
-  IN UINT32                 Len\r
+  IN UINT32  Len\r
   )\r
 {\r
-  NET_BUF                   *Nbuf;\r
-  NET_VECTOR                *Vector;\r
-  UINT8                     *Bulk;\r
+  NET_BUF     *Nbuf;\r
+  NET_VECTOR  *Vector;\r
+  UINT8       *Bulk;\r
 \r
   ASSERT (Len > 0);\r
 \r
@@ -110,18 +108,18 @@ NetbufAlloc (
     goto FreeNBuf;\r
   }\r
 \r
-  Vector = Nbuf->Vector;\r
-  Vector->Len                 = Len;\r
+  Vector      = Nbuf->Vector;\r
+  Vector->Len = Len;\r
 \r
-  Vector->Block[0].Bulk       = Bulk;\r
-  Vector->Block[0].Len        = Len;\r
+  Vector->Block[0].Bulk = Bulk;\r
+  Vector->Block[0].Len  = Len;\r
 \r
-  Nbuf->BlockOp[0].BlockHead  = Bulk;\r
-  Nbuf->BlockOp[0].BlockTail  = Bulk + Len;\r
+  Nbuf->BlockOp[0].BlockHead = Bulk;\r
+  Nbuf->BlockOp[0].BlockTail = Bulk + Len;\r
 \r
-  Nbuf->BlockOp[0].Head       = Bulk;\r
-  Nbuf->BlockOp[0].Tail       = Bulk;\r
-  Nbuf->BlockOp[0].Size       = 0;\r
+  Nbuf->BlockOp[0].Head = Bulk;\r
+  Nbuf->BlockOp[0].Tail = Bulk;\r
+  Nbuf->BlockOp[0].Size = 0;\r
 \r
   return Nbuf;\r
 \r
@@ -142,10 +140,10 @@ FreeNBuf:
 **/\r
 VOID\r
 NetbufFreeVector (\r
-  IN NET_VECTOR             *Vector\r
+  IN NET_VECTOR  *Vector\r
   )\r
 {\r
-  UINT32                    Index;\r
+  UINT32  Index;\r
 \r
   ASSERT (Vector != NULL);\r
   NET_CHECK_SIGNATURE (Vector, NET_VECTOR_SIGNATURE);\r
@@ -168,7 +166,6 @@ NetbufFreeVector (
     }\r
 \r
     Vector->Free (Vector->Arg);\r
-\r
   } else {\r
     //\r
     // Free each memory block associated with the Vector\r
@@ -181,7 +178,6 @@ NetbufFreeVector (
   FreePool (Vector);\r
 }\r
 \r
-\r
 /**\r
   Free the net buffer and its associated NET_VECTOR.\r
 \r
@@ -197,7 +193,7 @@ NetbufFreeVector (
 VOID\r
 EFIAPI\r
 NetbufFree (\r
-  IN NET_BUF                *Nbuf\r
+  IN NET_BUF  *Nbuf\r
   )\r
 {\r
   ASSERT (Nbuf != NULL);\r
@@ -216,7 +212,6 @@ NetbufFree (
   }\r
 }\r
 \r
-\r
 /**\r
   Create a copy of the net buffer that shares the associated net vector.\r
 \r
@@ -232,10 +227,10 @@ NetbufFree (
 NET_BUF *\r
 EFIAPI\r
 NetbufClone (\r
-  IN NET_BUF                *Nbuf\r
+  IN NET_BUF  *Nbuf\r
   )\r
 {\r
-  NET_BUF                   *Clone;\r
+  NET_BUF  *Clone;\r
 \r
   NET_CHECK_SIGNATURE (Nbuf, NET_BUF_SIGNATURE);\r
 \r
@@ -245,12 +240,12 @@ NetbufClone (
     return NULL;\r
   }\r
 \r
-  Clone->Signature  = NET_BUF_SIGNATURE;\r
-  Clone->RefCnt     = 1;\r
+  Clone->Signature = NET_BUF_SIGNATURE;\r
+  Clone->RefCnt    = 1;\r
   InitializeListHead (&Clone->List);\r
 \r
-  Clone->Ip   = Nbuf->Ip;\r
-  Clone->Tcp  = Nbuf->Tcp;\r
+  Clone->Ip  = Nbuf->Ip;\r
+  Clone->Tcp = Nbuf->Tcp;\r
 \r
   CopyMem (Clone->ProtoData, Nbuf->ProtoData, NET_PROTO_DATA);\r
 \r
@@ -264,7 +259,6 @@ NetbufClone (
   return Clone;\r
 }\r
 \r
-\r
 /**\r
   Create a duplicated copy of the net buffer with data copied and HeadSpace\r
   bytes of head space reserved.\r
@@ -284,12 +278,12 @@ NetbufClone (
 NET_BUF  *\r
 EFIAPI\r
 NetbufDuplicate (\r
-  IN NET_BUF                *Nbuf,\r
-  IN OUT NET_BUF            *Duplicate        OPTIONAL,\r
-  IN UINT32                 HeadSpace\r
+  IN NET_BUF      *Nbuf,\r
+  IN OUT NET_BUF  *Duplicate        OPTIONAL,\r
+  IN UINT32       HeadSpace\r
   )\r
 {\r
-  UINT8                     *Dst;\r
+  UINT8  *Dst;\r
 \r
   NET_CHECK_SIGNATURE (Nbuf, NET_BUF_SIGNATURE);\r
 \r
@@ -314,7 +308,6 @@ NetbufDuplicate (
   return Duplicate;\r
 }\r
 \r
-\r
 /**\r
   Free a list of net buffers.\r
 \r
@@ -324,12 +317,12 @@ NetbufDuplicate (
 VOID\r
 EFIAPI\r
 NetbufFreeList (\r
-  IN OUT LIST_ENTRY         *Head\r
+  IN OUT LIST_ENTRY  *Head\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  NET_BUF                   *Nbuf;\r
+  LIST_ENTRY  *Entry;\r
+  LIST_ENTRY  *Next;\r
+  NET_BUF     *Nbuf;\r
 \r
   Entry = Head->ForwardLink;\r
 \r
@@ -344,7 +337,6 @@ NetbufFreeList (
   ASSERT (IsListEmpty (Head));\r
 }\r
 \r
-\r
 /**\r
   Get the index of NET_BLOCK_OP that contains the byte at Offset in the net\r
   buffer.\r
@@ -365,14 +357,14 @@ NetbufFreeList (
 UINT8  *\r
 EFIAPI\r
 NetbufGetByte (\r
-  IN  NET_BUF               *Nbuf,\r
-  IN  UINT32                Offset,\r
-  OUT UINT32                *Index  OPTIONAL\r
+  IN  NET_BUF  *Nbuf,\r
+  IN  UINT32   Offset,\r
+  OUT UINT32   *Index  OPTIONAL\r
   )\r
 {\r
-  NET_BLOCK_OP              *BlockOp;\r
-  UINT32                    Loop;\r
-  UINT32                    Len;\r
+  NET_BLOCK_OP  *BlockOp;\r
+  UINT32        Loop;\r
+  UINT32        Len;\r
 \r
   NET_CHECK_SIGNATURE (Nbuf, NET_BUF_SIGNATURE);\r
 \r
@@ -384,7 +376,6 @@ NetbufGetByte (
   Len     = 0;\r
 \r
   for (Loop = 0; Loop < Nbuf->BlockOpNum; Loop++) {\r
-\r
     if (Len + BlockOp[Loop].Size <= Offset) {\r
       Len += BlockOp[Loop].Size;\r
       continue;\r
@@ -400,8 +391,6 @@ NetbufGetByte (
   return NULL;\r
 }\r
 \r
-\r
-\r
 /**\r
   Set the NET_BLOCK and corresponding NET_BLOCK_OP in the net buffer and\r
   corresponding net vector according to the bulk pointer and bulk length.\r
@@ -419,32 +408,30 @@ NetbufGetByte (
 **/\r
 VOID\r
 NetbufSetBlock (\r
-  IN OUT NET_BUF            *Nbuf,\r
-  IN UINT8                  *Bulk,\r
-  IN UINT32                 Len,\r
-  IN UINT32                 Index\r
+  IN OUT NET_BUF  *Nbuf,\r
+  IN UINT8        *Bulk,\r
+  IN UINT32       Len,\r
+  IN UINT32       Index\r
   )\r
 {\r
-  NET_BLOCK_OP              *BlockOp;\r
-  NET_BLOCK                 *Block;\r
+  NET_BLOCK_OP  *BlockOp;\r
+  NET_BLOCK     *Block;\r
 \r
   NET_CHECK_SIGNATURE (Nbuf, NET_BUF_SIGNATURE);\r
   NET_CHECK_SIGNATURE (Nbuf->Vector, NET_VECTOR_SIGNATURE);\r
   ASSERT (Index < Nbuf->BlockOpNum);\r
 \r
-  Block               = &(Nbuf->Vector->Block[Index]);\r
-  BlockOp             = &(Nbuf->BlockOp[Index]);\r
-  Block->Len          = Len;\r
-  Block->Bulk         = Bulk;\r
-  BlockOp->BlockHead  = Bulk;\r
-  BlockOp->BlockTail  = Bulk + Len;\r
-  BlockOp->Head       = Bulk;\r
-  BlockOp->Tail       = Bulk + Len;\r
-  BlockOp->Size       = Len;\r
+  Block              = &(Nbuf->Vector->Block[Index]);\r
+  BlockOp            = &(Nbuf->BlockOp[Index]);\r
+  Block->Len         = Len;\r
+  Block->Bulk        = Bulk;\r
+  BlockOp->BlockHead = Bulk;\r
+  BlockOp->BlockTail = Bulk + Len;\r
+  BlockOp->Head      = Bulk;\r
+  BlockOp->Tail      = Bulk + Len;\r
+  BlockOp->Size      = Len;\r
 }\r
 \r
-\r
-\r
 /**\r
   Set the NET_BLOCK_OP in the net buffer. The corresponding NET_BLOCK\r
   structure is left untouched.\r
@@ -461,26 +448,25 @@ NetbufSetBlock (
 **/\r
 VOID\r
 NetbufSetBlockOp (\r
-  IN OUT NET_BUF            *Nbuf,\r
-  IN UINT8                  *Bulk,\r
-  IN UINT32                 Len,\r
-  IN UINT32                 Index\r
+  IN OUT NET_BUF  *Nbuf,\r
+  IN UINT8        *Bulk,\r
+  IN UINT32       Len,\r
+  IN UINT32       Index\r
   )\r
 {\r
-  NET_BLOCK_OP              *BlockOp;\r
+  NET_BLOCK_OP  *BlockOp;\r
 \r
   NET_CHECK_SIGNATURE (Nbuf, NET_BUF_SIGNATURE);\r
   ASSERT (Index < Nbuf->BlockOpNum);\r
 \r
-  BlockOp             = &(Nbuf->BlockOp[Index]);\r
-  BlockOp->BlockHead  = Bulk;\r
-  BlockOp->BlockTail  = Bulk + Len;\r
-  BlockOp->Head       = Bulk;\r
-  BlockOp->Tail       = Bulk + Len;\r
-  BlockOp->Size       = Len;\r
+  BlockOp            = &(Nbuf->BlockOp[Index]);\r
+  BlockOp->BlockHead = Bulk;\r
+  BlockOp->BlockTail = Bulk + Len;\r
+  BlockOp->Head      = Bulk;\r
+  BlockOp->Tail      = Bulk + Len;\r
+  BlockOp->Size      = Len;\r
 }\r
 \r
-\r
 /**\r
   Helper function for NetbufGetFragment. NetbufGetFragment may allocate the\r
   first block to reserve HeadSpace bytes header space. So it needs to create a\r
@@ -493,16 +479,15 @@ NetbufSetBlockOp (
 VOID\r
 EFIAPI\r
 NetbufGetFragmentFree (\r
-  IN VOID                   *Arg\r
+  IN VOID  *Arg\r
   )\r
 {\r
-  NET_VECTOR                *Vector;\r
+  NET_VECTOR  *Vector;\r
 \r
   Vector = (NET_VECTOR *)Arg;\r
   NetbufFreeVector (Vector);\r
 }\r
 \r
-\r
 /**\r
   Create a NET_BUF structure which contains Len byte data of Nbuf starting from\r
   Offset.\r
@@ -523,25 +508,25 @@ NetbufGetFragmentFree (
 NET_BUF  *\r
 EFIAPI\r
 NetbufGetFragment (\r
-  IN NET_BUF                *Nbuf,\r
-  IN UINT32                 Offset,\r
-  IN UINT32                 Len,\r
-  IN UINT32                 HeadSpace\r
+  IN NET_BUF  *Nbuf,\r
+  IN UINT32   Offset,\r
+  IN UINT32   Len,\r
+  IN UINT32   HeadSpace\r
   )\r
 {\r
-  NET_BUF                   *Child;\r
-  NET_VECTOR                *Vector;\r
-  NET_BLOCK_OP              *BlockOp;\r
-  UINT32                    CurBlockOp;\r
-  UINT32                    BlockOpNum;\r
-  UINT8                     *FirstBulk;\r
-  UINT32                    Index;\r
-  UINT32                    First;\r
-  UINT32                    Last;\r
-  UINT32                    FirstSkip;\r
-  UINT32                    FirstLen;\r
-  UINT32                    LastLen;\r
-  UINT32                    Cur;\r
+  NET_BUF       *Child;\r
+  NET_VECTOR    *Vector;\r
+  NET_BLOCK_OP  *BlockOp;\r
+  UINT32        CurBlockOp;\r
+  UINT32        BlockOpNum;\r
+  UINT8         *FirstBulk;\r
+  UINT32        Index;\r
+  UINT32        First;\r
+  UINT32        Last;\r
+  UINT32        FirstSkip;\r
+  UINT32        FirstLen;\r
+  UINT32        LastLen;\r
+  UINT32        Cur;\r
 \r
   NET_CHECK_SIGNATURE (Nbuf, NET_BUF_SIGNATURE);\r
 \r
@@ -573,14 +558,14 @@ NetbufGetFragment (
   FirstSkip = Offset - Cur;\r
   FirstLen  = BlockOp[Index].Size - FirstSkip;\r
 \r
-  Last      = 0;\r
-  LastLen   = 0;\r
+  Last    = 0;\r
+  LastLen = 0;\r
 \r
   if (Len > FirstLen) {\r
     Cur += BlockOp[Index].Size;\r
     Index++;\r
 \r
-    for (; Index < Nbuf->BlockOpNum; Index++) {\r
+    for ( ; Index < Nbuf->BlockOpNum; Index++) {\r
       if (Offset + Len <= Cur + BlockOp[Index].Size) {\r
         Last    = Index;\r
         LastLen = Offset + Len - Cur;\r
@@ -589,7 +574,6 @@ NetbufGetFragment (
 \r
       Cur += BlockOp[Index].Size;\r
     }\r
-\r
   } else {\r
     Last     = First;\r
     LastLen  = Len;\r
@@ -618,20 +602,19 @@ NetbufGetFragment (
       goto FreeChild;\r
     }\r
 \r
-    Vector        = Child->Vector;\r
-    Vector->Free  = NetbufGetFragmentFree;\r
-    Vector->Arg   = Nbuf->Vector;\r
-    Vector->Flag  = NET_VECTOR_OWN_FIRST;\r
-    Vector->Len   = HeadSpace;\r
+    Vector       = Child->Vector;\r
+    Vector->Free = NetbufGetFragmentFree;\r
+    Vector->Arg  = Nbuf->Vector;\r
+    Vector->Flag = NET_VECTOR_OWN_FIRST;\r
+    Vector->Len  = HeadSpace;\r
 \r
     //\r
     // Reserve the head space in the first block\r
     //\r
     NetbufSetBlock (Child, FirstBulk, HeadSpace, 0);\r
     Child->BlockOp[0].Head += HeadSpace;\r
-    Child->BlockOp[0].Size =  0;\r
+    Child->BlockOp[0].Size  =  0;\r
     CurBlockOp++;\r
-\r
   } else {\r
     Child = NetbufAllocStruct (0, BlockOpNum);\r
 \r
@@ -683,8 +666,6 @@ FreeChild:
   return NULL;\r
 }\r
 \r
-\r
-\r
 /**\r
   Build a NET_BUF from external blocks.\r
 \r
@@ -710,41 +691,41 @@ FreeChild:
 NET_BUF  *\r
 EFIAPI\r
 NetbufFromExt (\r
-  IN NET_FRAGMENT           *ExtFragment,\r
-  IN UINT32                 ExtNum,\r
-  IN UINT32                 HeadSpace,\r
-  IN UINT32                 HeadLen,\r
-  IN NET_VECTOR_EXT_FREE    ExtFree,\r
-  IN VOID                   *Arg          OPTIONAL\r
+  IN NET_FRAGMENT         *ExtFragment,\r
+  IN UINT32               ExtNum,\r
+  IN UINT32               HeadSpace,\r
+  IN UINT32               HeadLen,\r
+  IN NET_VECTOR_EXT_FREE  ExtFree,\r
+  IN VOID                 *Arg          OPTIONAL\r
   )\r
 {\r
-  NET_BUF                   *Nbuf;\r
-  NET_VECTOR                *Vector;\r
-  NET_FRAGMENT              SavedFragment;\r
-  UINT32                    SavedIndex;\r
-  UINT32                    TotalLen;\r
-  UINT32                    BlockNum;\r
-  UINT8                     *FirstBlock;\r
-  UINT32                    FirstBlockLen;\r
-  UINT8                     *Header;\r
-  UINT32                    CurBlock;\r
-  UINT32                    Index;\r
-  UINT32                    Len;\r
-  UINT32                    Copied;\r
+  NET_BUF       *Nbuf;\r
+  NET_VECTOR    *Vector;\r
+  NET_FRAGMENT  SavedFragment;\r
+  UINT32        SavedIndex;\r
+  UINT32        TotalLen;\r
+  UINT32        BlockNum;\r
+  UINT8         *FirstBlock;\r
+  UINT32        FirstBlockLen;\r
+  UINT8         *Header;\r
+  UINT32        CurBlock;\r
+  UINT32        Index;\r
+  UINT32        Len;\r
+  UINT32        Copied;\r
 \r
   ASSERT ((ExtFragment != NULL) && (ExtNum > 0) && (ExtFree != NULL));\r
 \r
   SavedFragment.Bulk = NULL;\r
   SavedFragment.Len  = 0;\r
 \r
-  FirstBlockLen  = 0;\r
-  FirstBlock     = NULL;\r
-  BlockNum       = ExtNum;\r
-  Index          = 0;\r
-  TotalLen       = 0;\r
-  SavedIndex     = 0;\r
-  Len            = 0;\r
-  Copied         = 0;\r
+  FirstBlockLen = 0;\r
+  FirstBlock    = NULL;\r
+  BlockNum      = ExtNum;\r
+  Index         = 0;\r
+  TotalLen      = 0;\r
+  SavedIndex    = 0;\r
+  Len           = 0;\r
+  Copied        = 0;\r
 \r
   //\r
   // No need to consolidate the header if the first block is\r
@@ -783,10 +764,10 @@ NetbufFromExt (
       if (Len >= ExtFragment[Index].Len) {\r
         CopyMem (Header, ExtFragment[Index].Bulk, ExtFragment[Index].Len);\r
 \r
-        Copied    += ExtFragment[Index].Len;\r
-        Len       -= ExtFragment[Index].Len;\r
-        Header    += ExtFragment[Index].Len;\r
-        TotalLen  += ExtFragment[Index].Len;\r
+        Copied   += ExtFragment[Index].Len;\r
+        Len      -= ExtFragment[Index].Len;\r
+        Header   += ExtFragment[Index].Len;\r
+        TotalLen += ExtFragment[Index].Len;\r
         BlockNum--;\r
 \r
         if (Len == 0) {\r
@@ -797,12 +778,11 @@ NetbufFromExt (
           Index++;\r
           break;\r
         }\r
-\r
       } else {\r
         CopyMem (Header, ExtFragment[Index].Bulk, Len);\r
 \r
-        Copied    += Len;\r
-        TotalLen  += Len;\r
+        Copied   += Len;\r
+        TotalLen += Len;\r
 \r
         //\r
         // Adjust the block structure to exclude the data copied,\r
@@ -811,8 +791,8 @@ NetbufFromExt (
         // holds since we don't aggreate the header if the first block\r
         // is bigger enough that the header is continuous\r
         //\r
-        SavedIndex    = Index;\r
-        SavedFragment = ExtFragment[Index];\r
+        SavedIndex               = Index;\r
+        SavedFragment            = ExtFragment[Index];\r
         ExtFragment[Index].Bulk += Len;\r
         ExtFragment[Index].Len  -= Len;\r
         break;\r
@@ -840,12 +820,12 @@ NetbufFromExt (
   if (FirstBlockLen != 0) {\r
     NetbufSetBlock (Nbuf, FirstBlock, HeadSpace + Copied, 0);\r
     Nbuf->BlockOp[0].Head += HeadSpace;\r
-    Nbuf->BlockOp[0].Size =  Copied;\r
+    Nbuf->BlockOp[0].Size  =  Copied;\r
 \r
     CurBlock++;\r
   }\r
 \r
-  for (; Index < ExtNum; Index++) {\r
+  for ( ; Index < ExtNum; Index++) {\r
     NetbufSetBlock (Nbuf, ExtFragment[Index].Bulk, ExtFragment[Index].Len, CurBlock);\r
     TotalLen += ExtFragment[Index].Len;\r
     CurBlock++;\r
@@ -864,10 +844,10 @@ FreeFirstBlock:
   if (FirstBlock != NULL) {\r
     FreePool (FirstBlock);\r
   }\r
+\r
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Build a fragment table to contain the fragments in the net buffer. This is the\r
   opposite operation of the NetbufFromExt.\r
@@ -884,13 +864,13 @@ FreeFirstBlock:
 EFI_STATUS\r
 EFIAPI\r
 NetbufBuildExt (\r
-  IN NET_BUF                *Nbuf,\r
-  IN OUT NET_FRAGMENT       *ExtFragment,\r
-  IN OUT UINT32             *ExtNum\r
+  IN NET_BUF           *Nbuf,\r
+  IN OUT NET_FRAGMENT  *ExtFragment,\r
+  IN OUT UINT32        *ExtNum\r
   )\r
 {\r
-  UINT32                    Index;\r
-  UINT32                    Current;\r
+  UINT32  Index;\r
+  UINT32  Current;\r
 \r
   Current = 0;\r
 \r
@@ -912,7 +892,6 @@ NetbufBuildExt (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Build a net buffer from a list of net buffers.\r
 \r
@@ -933,22 +912,22 @@ NetbufBuildExt (
 NET_BUF  *\r
 EFIAPI\r
 NetbufFromBufList (\r
-  IN LIST_ENTRY             *BufList,\r
-  IN UINT32                 HeadSpace,\r
-  IN UINT32                 HeaderLen,\r
-  IN NET_VECTOR_EXT_FREE    ExtFree,\r
-  IN VOID                   *Arg              OPTIONAL\r
+  IN LIST_ENTRY           *BufList,\r
+  IN UINT32               HeadSpace,\r
+  IN UINT32               HeaderLen,\r
+  IN NET_VECTOR_EXT_FREE  ExtFree,\r
+  IN VOID                 *Arg              OPTIONAL\r
   )\r
 {\r
-  NET_FRAGMENT              *Fragment;\r
-  UINT32                    FragmentNum;\r
-  LIST_ENTRY                *Entry;\r
-  NET_BUF                   *Nbuf;\r
-  UINT32                    Index;\r
-  UINT32                    Current;\r
+  NET_FRAGMENT  *Fragment;\r
+  UINT32        FragmentNum;\r
+  LIST_ENTRY    *Entry;\r
+  NET_BUF       *Nbuf;\r
+  UINT32        Index;\r
+  UINT32        Current;\r
 \r
   //\r
-  //Compute how many blocks are there\r
+  // Compute how many blocks are there\r
   //\r
   FragmentNum = 0;\r
 \r
@@ -959,7 +938,7 @@ NetbufFromBufList (
   }\r
 \r
   //\r
-  //Allocate and copy block points\r
+  // Allocate and copy block points\r
   //\r
   Fragment = AllocatePool (sizeof (NET_FRAGMENT) * FragmentNum);\r
 \r
@@ -988,7 +967,6 @@ NetbufFromBufList (
   return Nbuf;\r
 }\r
 \r
-\r
 /**\r
   Reserve some space in the header room of the net buffer.\r
 \r
@@ -1004,8 +982,8 @@ NetbufFromBufList (
 VOID\r
 EFIAPI\r
 NetbufReserve (\r
-  IN OUT NET_BUF            *Nbuf,\r
-  IN UINT32                 Len\r
+  IN OUT NET_BUF  *Nbuf,\r
+  IN UINT32       Len\r
   )\r
 {\r
   NET_CHECK_SIGNATURE (Nbuf, NET_BUF_SIGNATURE);\r
@@ -1020,7 +998,6 @@ NetbufReserve (
   ASSERT (Nbuf->BlockOp[0].Tail <= Nbuf->BlockOp[0].BlockTail);\r
 }\r
 \r
-\r
 /**\r
   Allocate Len bytes of space from the header or tail of the buffer.\r
 \r
@@ -1033,17 +1010,17 @@ NetbufReserve (
                               or NULL if there is no sufficient space.\r
 \r
 **/\r
-UINT8*\r
+UINT8 *\r
 EFIAPI\r
 NetbufAllocSpace (\r
-  IN OUT NET_BUF            *Nbuf,\r
-  IN UINT32                 Len,\r
-  IN BOOLEAN                FromHead\r
+  IN OUT NET_BUF  *Nbuf,\r
+  IN UINT32       Len,\r
+  IN BOOLEAN      FromHead\r
   )\r
 {\r
-  NET_BLOCK_OP              *BlockOp;\r
-  UINT32                    Index;\r
-  UINT8                     *SavedTail;\r
+  NET_BLOCK_OP  *BlockOp;\r
+  UINT32        Index;\r
+  UINT8         *SavedTail;\r
 \r
   Index = 0;\r
 \r
@@ -1063,7 +1040,7 @@ NetbufAllocSpace (
     } else {\r
       NetbufGetByte (Nbuf, 0, &Index);\r
 \r
-      if ((Index != 0) && (NET_HEADSPACE(&(Nbuf->BlockOp[Index])) < Len)) {\r
+      if ((Index != 0) && (NET_HEADSPACE (&(Nbuf->BlockOp[Index])) < Len)) {\r
         Index--;\r
       }\r
     }\r
@@ -1079,7 +1056,6 @@ NetbufAllocSpace (
     Nbuf->TotalSize += Len;\r
 \r
     return BlockOp->Head;\r
-\r
   } else {\r
     //\r
     // Allocate some space from the tail. If the buffer is empty,\r
@@ -1091,9 +1067,9 @@ NetbufAllocSpace (
     } else {\r
       NetbufGetByte (Nbuf, Nbuf->TotalSize - 1, &Index);\r
 \r
-      if ((NET_TAILSPACE(&(Nbuf->BlockOp[Index])) < Len) &&\r
-          (Index < Nbuf->BlockOpNum - 1)) {\r
-\r
+      if ((NET_TAILSPACE (&(Nbuf->BlockOp[Index])) < Len) &&\r
+          (Index < Nbuf->BlockOpNum - 1))\r
+      {\r
         Index++;\r
       }\r
     }\r
@@ -1104,7 +1080,7 @@ NetbufAllocSpace (
       return NULL;\r
     }\r
 \r
-    SavedTail       = BlockOp->Tail;\r
+    SavedTail = BlockOp->Tail;\r
 \r
     BlockOp->Tail   += Len;\r
     BlockOp->Size   += Len;\r
@@ -1114,7 +1090,6 @@ NetbufAllocSpace (
   }\r
 }\r
 \r
-\r
 /**\r
   Trim a single NET_BLOCK by Len bytes from the header or tail.\r
 \r
@@ -1126,9 +1101,9 @@ NetbufAllocSpace (
 **/\r
 VOID\r
 NetblockTrim (\r
-  IN OUT NET_BLOCK_OP       *BlockOp,\r
-  IN UINT32                 Len,\r
-  IN BOOLEAN                FromHead\r
+  IN OUT NET_BLOCK_OP  *BlockOp,\r
+  IN UINT32            Len,\r
+  IN BOOLEAN           FromHead\r
   )\r
 {\r
   ASSERT ((BlockOp != NULL) && (BlockOp->Size >= Len));\r
@@ -1142,7 +1117,6 @@ NetblockTrim (
   }\r
 }\r
 \r
-\r
 /**\r
   Trim Len bytes from the header or tail of the net buffer.\r
 \r
@@ -1158,18 +1132,18 @@ NetblockTrim (
 UINT32\r
 EFIAPI\r
 NetbufTrim (\r
-  IN OUT NET_BUF            *Nbuf,\r
-  IN UINT32                 Len,\r
-  IN BOOLEAN                FromHead\r
+  IN OUT NET_BUF  *Nbuf,\r
+  IN UINT32       Len,\r
+  IN BOOLEAN      FromHead\r
   )\r
 {\r
-  NET_BLOCK_OP              *BlockOp;\r
-  UINT32                    Index;\r
-  UINT32                    Trimmed;\r
+  NET_BLOCK_OP  *BlockOp;\r
+  UINT32        Index;\r
+  UINT32        Trimmed;\r
 \r
   NET_CHECK_SIGNATURE (Nbuf, NET_BUF_SIGNATURE);\r
 \r
-  if (Len == 0 || Nbuf->TotalSize == 0) {\r
+  if ((Len == 0) || (Nbuf->TotalSize == 0)) {\r
     return 0;\r
   }\r
 \r
@@ -1190,7 +1164,7 @@ NetbufTrim (
   Index   = (FromHead ? 0 : Nbuf->BlockOpNum - 1);\r
   BlockOp = Nbuf->BlockOp;\r
 \r
-  for (;;) {\r
+  for ( ; ;) {\r
     if (BlockOp[Index].Size == 0) {\r
       Index += (FromHead ? 1 : -1);\r
       continue;\r
@@ -1212,7 +1186,6 @@ NetbufTrim (
   return Trimmed;\r
 }\r
 \r
-\r
 /**\r
   Copy Len bytes of data from the specific offset of the net buffer to the\r
   destination memory.\r
@@ -1231,18 +1204,18 @@ NetbufTrim (
 UINT32\r
 EFIAPI\r
 NetbufCopy (\r
-  IN NET_BUF                *Nbuf,\r
-  IN UINT32                 Offset,\r
-  IN UINT32                 Len,\r
-  IN UINT8                  *Dest\r
+  IN NET_BUF  *Nbuf,\r
+  IN UINT32   Offset,\r
+  IN UINT32   Len,\r
+  IN UINT8    *Dest\r
   )\r
 {\r
-  NET_BLOCK_OP              *BlockOp;\r
-  UINT32                    Skip;\r
-  UINT32                    Left;\r
-  UINT32                    Copied;\r
-  UINT32                    Index;\r
-  UINT32                    Cur;\r
+  NET_BLOCK_OP  *BlockOp;\r
+  UINT32        Skip;\r
+  UINT32        Left;\r
+  UINT32        Copied;\r
+  UINT32        Index;\r
+  UINT32        Cur;\r
 \r
   NET_CHECK_SIGNATURE (Nbuf, NET_BUF_SIGNATURE);\r
   ASSERT (Dest);\r
@@ -1283,8 +1256,8 @@ NetbufCopy (
   // Offset - Cur is the number of bytes before first byte to\r
   // to copy in the current block.\r
   //\r
-  Skip  = Offset - Cur;\r
-  Left  = BlockOp[Index].Size - Skip;\r
+  Skip = Offset - Cur;\r
+  Left = BlockOp[Index].Size - Skip;\r
 \r
   if (Len <= Left) {\r
     CopyMem (Dest, BlockOp[Index].Head + Skip, Len);\r
@@ -1299,13 +1272,13 @@ NetbufCopy (
 \r
   Index++;\r
 \r
-  for (; Index < Nbuf->BlockOpNum; Index++) {\r
+  for ( ; Index < Nbuf->BlockOpNum; Index++) {\r
     if (Len > BlockOp[Index].Size) {\r
       Len    -= BlockOp[Index].Size;\r
       Copied += BlockOp[Index].Size;\r
 \r
       CopyMem (Dest, BlockOp[Index].Head, BlockOp[Index].Size);\r
-      Dest   += BlockOp[Index].Size;\r
+      Dest += BlockOp[Index].Size;\r
     } else {\r
       Copied += Len;\r
       CopyMem (Dest, BlockOp[Index].Head, Len);\r
@@ -1316,7 +1289,6 @@ NetbufCopy (
   return Copied;\r
 }\r
 \r
-\r
 /**\r
   Initiate the net buffer queue.\r
 \r
@@ -1326,19 +1298,18 @@ NetbufCopy (
 VOID\r
 EFIAPI\r
 NetbufQueInit (\r
-  IN OUT NET_BUF_QUEUE          *NbufQue\r
+  IN OUT NET_BUF_QUEUE  *NbufQue\r
   )\r
 {\r
-  NbufQue->Signature  = NET_QUE_SIGNATURE;\r
-  NbufQue->RefCnt     = 1;\r
+  NbufQue->Signature = NET_QUE_SIGNATURE;\r
+  NbufQue->RefCnt    = 1;\r
   InitializeListHead (&NbufQue->List);\r
 \r
   InitializeListHead (&NbufQue->BufList);\r
-  NbufQue->BufSize  = 0;\r
-  NbufQue->BufNum   = 0;\r
+  NbufQue->BufSize = 0;\r
+  NbufQue->BufNum  = 0;\r
 }\r
 \r
-\r
 /**\r
   Allocate and initialize a net buffer queue.\r
 \r
@@ -1352,7 +1323,7 @@ NetbufQueAlloc (
   VOID\r
   )\r
 {\r
-  NET_BUF_QUEUE             *NbufQue;\r
+  NET_BUF_QUEUE  *NbufQue;\r
 \r
   NbufQue = AllocatePool (sizeof (NET_BUF_QUEUE));\r
   if (NbufQue == NULL) {\r
@@ -1364,7 +1335,6 @@ NetbufQueAlloc (
   return NbufQue;\r
 }\r
 \r
-\r
 /**\r
   Free a net buffer queue.\r
 \r
@@ -1378,7 +1348,7 @@ NetbufQueAlloc (
 VOID\r
 EFIAPI\r
 NetbufQueFree (\r
-  IN NET_BUF_QUEUE          *NbufQue\r
+  IN NET_BUF_QUEUE  *NbufQue\r
   )\r
 {\r
   ASSERT (NbufQue != NULL);\r
@@ -1392,7 +1362,6 @@ NetbufQueFree (
   }\r
 }\r
 \r
-\r
 /**\r
   Append a net buffer to the net buffer queue.\r
 \r
@@ -1403,8 +1372,8 @@ NetbufQueFree (
 VOID\r
 EFIAPI\r
 NetbufQueAppend (\r
-  IN OUT NET_BUF_QUEUE          *NbufQue,\r
-  IN OUT NET_BUF                *Nbuf\r
+  IN OUT NET_BUF_QUEUE  *NbufQue,\r
+  IN OUT NET_BUF        *Nbuf\r
   )\r
 {\r
   NET_CHECK_SIGNATURE (NbufQue, NET_QUE_SIGNATURE);\r
@@ -1416,7 +1385,6 @@ NetbufQueAppend (
   NbufQue->BufNum++;\r
 }\r
 \r
-\r
 /**\r
   Remove a net buffer from the head in the specific queue and return it.\r
 \r
@@ -1429,10 +1397,10 @@ NetbufQueAppend (
 NET_BUF  *\r
 EFIAPI\r
 NetbufQueRemove (\r
-  IN OUT NET_BUF_QUEUE          *NbufQue\r
+  IN OUT NET_BUF_QUEUE  *NbufQue\r
   )\r
 {\r
-  NET_BUF                   *First;\r
+  NET_BUF  *First;\r
 \r
   NET_CHECK_SIGNATURE (NbufQue, NET_QUE_SIGNATURE);\r
 \r
@@ -1449,7 +1417,6 @@ NetbufQueRemove (
   return First;\r
 }\r
 \r
-\r
 /**\r
   Copy Len bytes of data from the net buffer queue at the specific offset to the\r
   destination memory.\r
@@ -1469,18 +1436,18 @@ NetbufQueRemove (
 UINT32\r
 EFIAPI\r
 NetbufQueCopy (\r
-  IN NET_BUF_QUEUE          *NbufQue,\r
-  IN UINT32                 Offset,\r
-  IN UINT32                 Len,\r
-  OUT UINT8                 *Dest\r
+  IN NET_BUF_QUEUE  *NbufQue,\r
+  IN UINT32         Offset,\r
+  IN UINT32         Len,\r
+  OUT UINT8         *Dest\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  NET_BUF                   *Nbuf;\r
-  UINT32                    Skip;\r
-  UINT32                    Left;\r
-  UINT32                    Cur;\r
-  UINT32                    Copied;\r
+  LIST_ENTRY  *Entry;\r
+  NET_BUF     *Nbuf;\r
+  UINT32      Skip;\r
+  UINT32      Left;\r
+  UINT32      Cur;\r
+  UINT32      Copied;\r
 \r
   NET_CHECK_SIGNATURE (NbufQue, NET_QUE_SIGNATURE);\r
   ASSERT (Dest != NULL);\r
@@ -1496,8 +1463,8 @@ NetbufQueCopy (
   //\r
   // skip to the Offset\r
   //\r
-  Cur   = 0;\r
-  Nbuf  = NULL;\r
+  Cur  = 0;\r
+  Nbuf = NULL;\r
 \r
   NET_LIST_FOR_EACH (Entry, &NbufQue->BufList) {\r
     Nbuf = NET_LIST_USER_STRUCT (Entry, NET_BUF, List);\r
@@ -1514,8 +1481,8 @@ NetbufQueCopy (
   //\r
   // Copy the data in the first buffer.\r
   //\r
-  Skip  = Offset - Cur;\r
-  Left  = Nbuf->TotalSize - Skip;\r
+  Skip = Offset - Cur;\r
+  Left = Nbuf->TotalSize - Skip;\r
 \r
   if (Len < Left) {\r
     return NetbufCopy (Nbuf, Skip, Len, Dest);\r
@@ -1535,12 +1502,11 @@ NetbufQueCopy (
     Nbuf = NET_LIST_USER_STRUCT (Entry, NET_BUF, List);\r
 \r
     if (Len > Nbuf->TotalSize) {\r
-      Len -= Nbuf->TotalSize;\r
+      Len    -= Nbuf->TotalSize;\r
       Copied += Nbuf->TotalSize;\r
 \r
       NetbufCopy (Nbuf, 0, Nbuf->TotalSize, Dest);\r
       Dest += Nbuf->TotalSize;\r
-\r
     } else {\r
       NetbufCopy (Nbuf, 0, Len, Dest);\r
       Copied += Len;\r
@@ -1553,7 +1519,6 @@ NetbufQueCopy (
   return Copied;\r
 }\r
 \r
-\r
 /**\r
   Trim Len bytes of data from the buffer queue and free any net buffer\r
   that is completely trimmed.\r
@@ -1570,14 +1535,14 @@ NetbufQueCopy (
 UINT32\r
 EFIAPI\r
 NetbufQueTrim (\r
-  IN OUT NET_BUF_QUEUE      *NbufQue,\r
-  IN UINT32                 Len\r
+  IN OUT NET_BUF_QUEUE  *NbufQue,\r
+  IN UINT32             Len\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  NET_BUF                   *Nbuf;\r
-  UINT32                    Trimmed;\r
+  LIST_ENTRY  *Entry;\r
+  LIST_ENTRY  *Next;\r
+  NET_BUF     *Nbuf;\r
+  UINT32      Trimmed;\r
 \r
   NET_CHECK_SIGNATURE (NbufQue, NET_QUE_SIGNATURE);\r
 \r
@@ -1590,14 +1555,14 @@ NetbufQueTrim (
   }\r
 \r
   NbufQue->BufSize -= Len;\r
-  Trimmed = 0;\r
+  Trimmed           = 0;\r
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &NbufQue->BufList) {\r
     Nbuf = NET_LIST_USER_STRUCT (Entry, NET_BUF, List);\r
 \r
     if (Len >= Nbuf->TotalSize) {\r
       Trimmed += Nbuf->TotalSize;\r
-      Len -= Nbuf->TotalSize;\r
+      Len     -= Nbuf->TotalSize;\r
 \r
       RemoveEntryList (Entry);\r
       NetbufFree (Nbuf);\r
@@ -1607,7 +1572,6 @@ NetbufQueTrim (
       if (Len == 0) {\r
         break;\r
       }\r
-\r
     } else {\r
       Trimmed += NetbufTrim (Nbuf, Len, NET_BUF_HEAD);\r
       break;\r
@@ -1617,7 +1581,6 @@ NetbufQueTrim (
   return Trimmed;\r
 }\r
 \r
-\r
 /**\r
   Flush the net buffer queue.\r
 \r
@@ -1627,18 +1590,17 @@ NetbufQueTrim (
 VOID\r
 EFIAPI\r
 NetbufQueFlush (\r
-  IN OUT NET_BUF_QUEUE          *NbufQue\r
+  IN OUT NET_BUF_QUEUE  *NbufQue\r
   )\r
 {\r
   NET_CHECK_SIGNATURE (NbufQue, NET_QUE_SIGNATURE);\r
 \r
   NetbufFreeList (&NbufQue->BufList);\r
 \r
-  NbufQue->BufNum   = 0;\r
-  NbufQue->BufSize  = 0;\r
+  NbufQue->BufNum  = 0;\r
+  NbufQue->BufSize = 0;\r
 }\r
 \r
-\r
 /**\r
   Compute the checksum for a bulk of data.\r
 \r
@@ -1651,11 +1613,11 @@ NetbufQueFlush (
 UINT16\r
 EFIAPI\r
 NetblockChecksum (\r
-  IN UINT8                  *Bulk,\r
-  IN UINT32                 Len\r
+  IN UINT8   *Bulk,\r
+  IN UINT32  Len\r
   )\r
 {\r
-  register UINT32           Sum;\r
+  register UINT32  Sum;\r
 \r
   Sum = 0;\r
 \r
@@ -1667,9 +1629,9 @@ NetblockChecksum (
   }\r
 \r
   while (Len > 1) {\r
-    Sum += *(UINT16 *) Bulk;\r
+    Sum  += *(UINT16 *)Bulk;\r
     Bulk += 2;\r
-    Len -= 2;\r
+    Len  -= 2;\r
   }\r
 \r
   //\r
@@ -1677,13 +1639,11 @@ NetblockChecksum (
   //\r
   while ((Sum >> 16) != 0) {\r
     Sum = (Sum & 0xffff) + (Sum >> 16);\r
-\r
   }\r
 \r
-  return (UINT16) Sum;\r
+  return (UINT16)Sum;\r
 }\r
 \r
-\r
 /**\r
   Add two checksums.\r
 \r
@@ -1696,11 +1656,11 @@ NetblockChecksum (
 UINT16\r
 EFIAPI\r
 NetAddChecksum (\r
-  IN UINT16                 Checksum1,\r
-  IN UINT16                 Checksum2\r
+  IN UINT16  Checksum1,\r
+  IN UINT16  Checksum2\r
   )\r
 {\r
-  UINT32                    Sum;\r
+  UINT32  Sum;\r
 \r
   Sum = Checksum1 + Checksum2;\r
 \r
@@ -1709,13 +1669,11 @@ NetAddChecksum (
   //\r
   if ((Sum >> 16) != 0) {\r
     Sum = (Sum & 0xffff) + 1;\r
-\r
   }\r
 \r
-  return (UINT16) Sum;\r
+  return (UINT16)Sum;\r
 }\r
 \r
-\r
 /**\r
   Compute the checksum for a NET_BUF.\r
 \r
@@ -1727,20 +1685,20 @@ NetAddChecksum (
 UINT16\r
 EFIAPI\r
 NetbufChecksum (\r
-  IN NET_BUF                *Nbuf\r
+  IN NET_BUF  *Nbuf\r
   )\r
 {\r
-  NET_BLOCK_OP              *BlockOp;\r
-  UINT32                    Offset;\r
-  UINT16                    TotalSum;\r
-  UINT16                    BlockSum;\r
-  UINT32                    Index;\r
+  NET_BLOCK_OP  *BlockOp;\r
+  UINT32        Offset;\r
+  UINT16        TotalSum;\r
+  UINT16        BlockSum;\r
+  UINT32        Index;\r
 \r
   NET_CHECK_SIGNATURE (Nbuf, NET_BUF_SIGNATURE);\r
 \r
-  TotalSum  = 0;\r
-  Offset    = 0;\r
-  BlockOp   = Nbuf->BlockOp;\r
+  TotalSum = 0;\r
+  Offset   = 0;\r
+  BlockOp  = Nbuf->BlockOp;\r
 \r
   for (Index = 0; Index < Nbuf->BlockOpNum; Index++) {\r
     if (BlockOp[Index].Size == 0) {\r
@@ -1764,7 +1722,6 @@ NetbufChecksum (
   return TotalSum;\r
 }\r
 \r
-\r
 /**\r
   Compute the checksum for TCP/UDP pseudo header.\r
 \r
@@ -1781,25 +1738,25 @@ NetbufChecksum (
 UINT16\r
 EFIAPI\r
 NetPseudoHeadChecksum (\r
-  IN IP4_ADDR               Src,\r
-  IN IP4_ADDR               Dst,\r
-  IN UINT8                  Proto,\r
-  IN UINT16                 Len\r
+  IN IP4_ADDR  Src,\r
+  IN IP4_ADDR  Dst,\r
+  IN UINT8     Proto,\r
+  IN UINT16    Len\r
   )\r
 {\r
-  NET_PSEUDO_HDR            Hdr;\r
+  NET_PSEUDO_HDR  Hdr;\r
 \r
   //\r
   // Zero the memory to relieve align problems\r
   //\r
   ZeroMem (&Hdr, sizeof (Hdr));\r
 \r
-  Hdr.SrcIp     = Src;\r
-  Hdr.DstIp     = Dst;\r
-  Hdr.Protocol  = Proto;\r
-  Hdr.Len       = HTONS (Len);\r
+  Hdr.SrcIp    = Src;\r
+  Hdr.DstIp    = Dst;\r
+  Hdr.Protocol = Proto;\r
+  Hdr.Len      = HTONS (Len);\r
 \r
-  return NetblockChecksum ((UINT8 *) &Hdr, sizeof (Hdr));\r
+  return NetblockChecksum ((UINT8 *)&Hdr, sizeof (Hdr));\r
 }\r
 \r
 /**\r
@@ -1818,13 +1775,13 @@ NetPseudoHeadChecksum (
 UINT16\r
 EFIAPI\r
 NetIp6PseudoHeadChecksum (\r
-  IN EFI_IPv6_ADDRESS       *Src,\r
-  IN EFI_IPv6_ADDRESS       *Dst,\r
-  IN UINT8                  NextHeader,\r
-  IN UINT32                 Len\r
+  IN EFI_IPv6_ADDRESS  *Src,\r
+  IN EFI_IPv6_ADDRESS  *Dst,\r
+  IN UINT8             NextHeader,\r
+  IN UINT32            Len\r
   )\r
 {\r
-  NET_IP6_PSEUDO_HDR        Hdr;\r
+  NET_IP6_PSEUDO_HDR  Hdr;\r
 \r
   //\r
   // Zero the memory to relieve align problems\r
@@ -1837,7 +1794,7 @@ NetIp6PseudoHeadChecksum (
   Hdr.NextHeader = NextHeader;\r
   Hdr.Len        = HTONL (Len);\r
 \r
-  return NetblockChecksum ((UINT8 *) &Hdr, sizeof (Hdr));\r
+  return NetblockChecksum ((UINT8 *)&Hdr, sizeof (Hdr));\r
 }\r
 \r
 /**\r
@@ -1853,7 +1810,7 @@ NetIp6PseudoHeadChecksum (
 **/\r
 VOID\r
 NetIpSecNetbufFree (\r
-  NET_BUF   *Nbuf\r
+  NET_BUF  *Nbuf\r
   )\r
 {\r
   NET_CHECK_SIGNATURE (Nbuf, NET_BUF_SIGNATURE);\r
@@ -1862,7 +1819,6 @@ NetIpSecNetbufFree (
   Nbuf->RefCnt--;\r
 \r
   if (Nbuf->RefCnt == 0) {\r
-\r
     //\r
     // Update Vector only when NBuf is to be released. That is,\r
     // all the sharing of Nbuf increse Vector's RefCnt by one\r
@@ -1883,8 +1839,8 @@ NetIpSecNetbufFree (
     if ((Nbuf->Vector->Flag & NET_VECTOR_OWN_FIRST) != 0) {\r
       FreePool (Nbuf->Vector->Block[0].Bulk);\r
     }\r
+\r
     FreePool (Nbuf->Vector);\r
     FreePool (Nbuf);\r
   }\r
 }\r
-\r
index 6f87a0eada98eba6c60d220eef7013dcf64730aa..f378c00f496952064b4bc668c10777e7664ff1ac 100644 (file)
@@ -31,10 +31,10 @@ TcpIoCommonNotify (
   )\r
 {\r
   if ((Event == NULL) || (Context == NULL)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
-  *((BOOLEAN *) Context) = TRUE;\r
+  *((BOOLEAN *)Context) = TRUE;\r
 }\r
 \r
 /**\r
@@ -51,12 +51,12 @@ TcpIoCommonNotify (
 **/\r
 EFI_STATUS\r
 TcpIoGetMapping (\r
-  IN EFI_TCP6_PROTOCOL    *Tcp6,\r
-  IN EFI_TCP6_CONFIG_DATA *Tcp6ConfigData\r
+  IN EFI_TCP6_PROTOCOL     *Tcp6,\r
+  IN EFI_TCP6_CONFIG_DATA  *Tcp6ConfigData\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
-  EFI_EVENT               Event;\r
+  EFI_STATUS  Status;\r
+  EFI_EVENT   Event;\r
 \r
   if ((Tcp6 == NULL) || (Tcp6ConfigData == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -85,7 +85,6 @@ TcpIoGetMapping (
   }\r
 \r
   while (EFI_ERROR (gBS->CheckEvent (Event))) {\r
-\r
     Tcp6->Poll (Tcp6);\r
 \r
     Status = Tcp6->Configure (Tcp6, Tcp6ConfigData);\r
@@ -124,26 +123,26 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 TcpIoCreateSocket (\r
-  IN EFI_HANDLE             Image,\r
-  IN EFI_HANDLE             Controller,\r
-  IN UINT8                  TcpVersion,\r
-  IN TCP_IO_CONFIG_DATA     *ConfigData,\r
-  OUT TCP_IO                *TcpIo\r
+  IN EFI_HANDLE          Image,\r
+  IN EFI_HANDLE          Controller,\r
+  IN UINT8               TcpVersion,\r
+  IN TCP_IO_CONFIG_DATA  *ConfigData,\r
+  OUT TCP_IO             *TcpIo\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_EVENT                 Event;\r
-  EFI_GUID                  *ServiceBindingGuid;\r
-  EFI_GUID                  *ProtocolGuid;\r
-  VOID                      **Interface;\r
-  EFI_TCP4_OPTION           ControlOption;\r
-  EFI_TCP4_CONFIG_DATA      Tcp4ConfigData;\r
-  EFI_TCP4_ACCESS_POINT     *AccessPoint4;\r
-  EFI_TCP4_PROTOCOL         *Tcp4;\r
-  EFI_TCP6_CONFIG_DATA      Tcp6ConfigData;\r
-  EFI_TCP6_ACCESS_POINT     *AccessPoint6;\r
-  EFI_TCP6_PROTOCOL         *Tcp6;\r
-  EFI_TCP4_RECEIVE_DATA     *RxData;\r
+  EFI_STATUS             Status;\r
+  EFI_EVENT              Event;\r
+  EFI_GUID               *ServiceBindingGuid;\r
+  EFI_GUID               *ProtocolGuid;\r
+  VOID                   **Interface;\r
+  EFI_TCP4_OPTION        ControlOption;\r
+  EFI_TCP4_CONFIG_DATA   Tcp4ConfigData;\r
+  EFI_TCP4_ACCESS_POINT  *AccessPoint4;\r
+  EFI_TCP4_PROTOCOL      *Tcp4;\r
+  EFI_TCP6_CONFIG_DATA   Tcp6ConfigData;\r
+  EFI_TCP6_ACCESS_POINT  *AccessPoint6;\r
+  EFI_TCP6_PROTOCOL      *Tcp6;\r
+  EFI_TCP4_RECEIVE_DATA  *RxData;\r
 \r
   if ((Image == NULL) || (Controller == NULL) || (ConfigData == NULL) || (TcpIo == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -157,11 +156,11 @@ TcpIoCreateSocket (
   if (TcpVersion == TCP_VERSION_4) {\r
     ServiceBindingGuid = &gEfiTcp4ServiceBindingProtocolGuid;\r
     ProtocolGuid       = &gEfiTcp4ProtocolGuid;\r
-    Interface          = (VOID **) (&TcpIo->Tcp.Tcp4);\r
+    Interface          = (VOID **)(&TcpIo->Tcp.Tcp4);\r
   } else if (TcpVersion == TCP_VERSION_6) {\r
     ServiceBindingGuid = &gEfiTcp6ServiceBindingProtocolGuid;\r
     ProtocolGuid       = &gEfiTcp6ProtocolGuid;\r
-    Interface          = (VOID **) (&TcpIo->Tcp.Tcp6);\r
+    Interface          = (VOID **)(&TcpIo->Tcp.Tcp6);\r
   } else {\r
     return EFI_UNSUPPORTED;\r
   }\r
@@ -194,44 +193,44 @@ TcpIoCreateSocket (
   }\r
 \r
   if (TcpVersion == TCP_VERSION_4) {\r
-    Tcp4             = TcpIo->Tcp.Tcp4;\r
+    Tcp4 = TcpIo->Tcp.Tcp4;\r
   } else {\r
-    Tcp6             = TcpIo->Tcp.Tcp6;\r
+    Tcp6 = TcpIo->Tcp.Tcp6;\r
   }\r
 \r
-  TcpIo->Image       = Image;\r
-  TcpIo->Controller  = Controller;\r
+  TcpIo->Image      = Image;\r
+  TcpIo->Controller = Controller;\r
 \r
   //\r
   // Set the configuration parameters.\r
   //\r
-  ControlOption.ReceiveBufferSize       = 0x200000;\r
-  ControlOption.SendBufferSize          = 0x200000;\r
-  ControlOption.MaxSynBackLog           = 0;\r
-  ControlOption.ConnectionTimeout       = 0;\r
-  ControlOption.DataRetries             = 6;\r
-  ControlOption.FinTimeout              = 0;\r
-  ControlOption.TimeWaitTimeout         = 0;\r
-  ControlOption.KeepAliveProbes         = 4;\r
-  ControlOption.KeepAliveTime           = 0;\r
-  ControlOption.KeepAliveInterval       = 0;\r
-  ControlOption.EnableNagle             = FALSE;\r
-  ControlOption.EnableTimeStamp         = FALSE;\r
-  ControlOption.EnableWindowScaling     = TRUE;\r
-  ControlOption.EnableSelectiveAck      = FALSE;\r
-  ControlOption.EnablePathMtuDiscovery  = FALSE;\r
+  ControlOption.ReceiveBufferSize      = 0x200000;\r
+  ControlOption.SendBufferSize         = 0x200000;\r
+  ControlOption.MaxSynBackLog          = 0;\r
+  ControlOption.ConnectionTimeout      = 0;\r
+  ControlOption.DataRetries            = 6;\r
+  ControlOption.FinTimeout             = 0;\r
+  ControlOption.TimeWaitTimeout        = 0;\r
+  ControlOption.KeepAliveProbes        = 4;\r
+  ControlOption.KeepAliveTime          = 0;\r
+  ControlOption.KeepAliveInterval      = 0;\r
+  ControlOption.EnableNagle            = FALSE;\r
+  ControlOption.EnableTimeStamp        = FALSE;\r
+  ControlOption.EnableWindowScaling    = TRUE;\r
+  ControlOption.EnableSelectiveAck     = FALSE;\r
+  ControlOption.EnablePathMtuDiscovery = FALSE;\r
 \r
   if (TcpVersion == TCP_VERSION_4) {\r
-    Tcp4ConfigData.TypeOfService        = 8;\r
-    Tcp4ConfigData.TimeToLive           = 255;\r
-    Tcp4ConfigData.ControlOption        = &ControlOption;\r
+    Tcp4ConfigData.TypeOfService = 8;\r
+    Tcp4ConfigData.TimeToLive    = 255;\r
+    Tcp4ConfigData.ControlOption = &ControlOption;\r
 \r
-    AccessPoint4                        = &Tcp4ConfigData.AccessPoint;\r
+    AccessPoint4 = &Tcp4ConfigData.AccessPoint;\r
 \r
     ZeroMem (AccessPoint4, sizeof (EFI_TCP4_ACCESS_POINT));\r
-    AccessPoint4->StationPort           = ConfigData->Tcp4IoConfigData.StationPort;\r
-    AccessPoint4->RemotePort            = ConfigData->Tcp4IoConfigData.RemotePort;\r
-    AccessPoint4->ActiveFlag            = ConfigData->Tcp4IoConfigData.ActiveFlag;\r
+    AccessPoint4->StationPort = ConfigData->Tcp4IoConfigData.StationPort;\r
+    AccessPoint4->RemotePort  = ConfigData->Tcp4IoConfigData.RemotePort;\r
+    AccessPoint4->ActiveFlag  = ConfigData->Tcp4IoConfigData.ActiveFlag;\r
 \r
     CopyMem (\r
       &AccessPoint4->StationAddress,\r
@@ -275,20 +274,19 @@ TcpIoCreateSocket (
       }\r
     }\r
   } else {\r
-    Tcp6ConfigData.TrafficClass         = 0;\r
-    Tcp6ConfigData.HopLimit             = 255;\r
-    Tcp6ConfigData.ControlOption        = (EFI_TCP6_OPTION *) &ControlOption;\r
+    Tcp6ConfigData.TrafficClass  = 0;\r
+    Tcp6ConfigData.HopLimit      = 255;\r
+    Tcp6ConfigData.ControlOption = (EFI_TCP6_OPTION *)&ControlOption;\r
 \r
-    AccessPoint6                        = &Tcp6ConfigData.AccessPoint;\r
+    AccessPoint6 = &Tcp6ConfigData.AccessPoint;\r
 \r
     ZeroMem (AccessPoint6, sizeof (EFI_TCP6_ACCESS_POINT));\r
-    AccessPoint6->StationPort           = ConfigData->Tcp6IoConfigData.StationPort;\r
-    AccessPoint6->RemotePort            = ConfigData->Tcp6IoConfigData.RemotePort;\r
-    AccessPoint6->ActiveFlag            = ConfigData->Tcp6IoConfigData.ActiveFlag;\r
+    AccessPoint6->StationPort = ConfigData->Tcp6IoConfigData.StationPort;\r
+    AccessPoint6->RemotePort  = ConfigData->Tcp6IoConfigData.RemotePort;\r
+    AccessPoint6->ActiveFlag  = ConfigData->Tcp6IoConfigData.ActiveFlag;\r
 \r
     IP6_COPY_ADDRESS (&AccessPoint6->RemoteAddress, &ConfigData->Tcp6IoConfigData.RemoteIp);\r
 \r
-\r
     ASSERT (Tcp6 != NULL);\r
     //\r
     // Configure the TCP6 protocol.\r
@@ -345,7 +343,6 @@ TcpIoCreateSocket (
 \r
   TcpIo->TxToken.Tcp4Token.CompletionToken.Event = Event;\r
 \r
-\r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
                   TPL_NOTIFY,\r
@@ -359,7 +356,7 @@ TcpIoCreateSocket (
 \r
   TcpIo->RxToken.Tcp4Token.CompletionToken.Event = Event;\r
 \r
-  RxData = (EFI_TCP4_RECEIVE_DATA *) AllocateZeroPool (sizeof (EFI_TCP4_RECEIVE_DATA));\r
+  RxData = (EFI_TCP4_RECEIVE_DATA *)AllocateZeroPool (sizeof (EFI_TCP4_RECEIVE_DATA));\r
   if (RxData == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_ERROR;\r
@@ -380,7 +377,6 @@ TcpIoCreateSocket (
 \r
   TcpIo->CloseToken.Tcp4Token.CompletionToken.Event = Event;\r
 \r
-\r
   return EFI_SUCCESS;\r
 \r
 ON_ERROR:\r
@@ -399,25 +395,25 @@ ON_ERROR:
 VOID\r
 EFIAPI\r
 TcpIoDestroySocket (\r
-  IN TCP_IO                 *TcpIo\r
+  IN TCP_IO  *TcpIo\r
   )\r
 {\r
-  EFI_EVENT                 Event;\r
-  EFI_TCP4_PROTOCOL         *Tcp4;\r
-  EFI_TCP6_PROTOCOL         *Tcp6;\r
-  UINT8                     TcpVersion;\r
-  EFI_GUID                  *ServiceBindingGuid;\r
-  EFI_GUID                  *ProtocolGuid;\r
-  EFI_HANDLE                ChildHandle;\r
+  EFI_EVENT          Event;\r
+  EFI_TCP4_PROTOCOL  *Tcp4;\r
+  EFI_TCP6_PROTOCOL  *Tcp6;\r
+  UINT8              TcpVersion;\r
+  EFI_GUID           *ServiceBindingGuid;\r
+  EFI_GUID           *ProtocolGuid;\r
+  EFI_HANDLE         ChildHandle;\r
 \r
   if (TcpIo == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   TcpVersion = TcpIo->TcpVersion;\r
 \r
   if ((TcpVersion != TCP_VERSION_4) && (TcpVersion != TCP_VERSION_6)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   Event = TcpIo->ConnToken.Tcp4Token.CompletionToken.Event;\r
@@ -457,25 +453,23 @@ TcpIoDestroySocket (
   Tcp4 = NULL;\r
   Tcp6 = NULL;\r
 \r
-\r
   if (TcpVersion == TCP_VERSION_4) {\r
     ServiceBindingGuid = &gEfiTcp4ServiceBindingProtocolGuid;\r
     ProtocolGuid       = &gEfiTcp4ProtocolGuid;\r
-    Tcp4 = TcpIo->Tcp.Tcp4;\r
+    Tcp4               = TcpIo->Tcp.Tcp4;\r
     if (Tcp4 != NULL) {\r
       Tcp4->Configure (Tcp4, NULL);\r
     }\r
   } else {\r
     ServiceBindingGuid = &gEfiTcp6ServiceBindingProtocolGuid;\r
     ProtocolGuid       = &gEfiTcp6ProtocolGuid;\r
-    Tcp6 = TcpIo->Tcp.Tcp6;\r
+    Tcp6               = TcpIo->Tcp.Tcp6;\r
     if (Tcp6 != NULL) {\r
       Tcp6->Configure (Tcp6, NULL);\r
     }\r
   }\r
 \r
   if ((Tcp4 != NULL) || (Tcp6 != NULL)) {\r
-\r
     gBS->CloseProtocol (\r
            TcpIo->Handle,\r
            ProtocolGuid,\r
@@ -502,7 +496,6 @@ TcpIoDestroySocket (
     }\r
 \r
     if (ChildHandle != NULL) {\r
-\r
       gBS->CloseProtocol (\r
              ChildHandle,\r
              ProtocolGuid,\r
@@ -539,13 +532,13 @@ TcpIoDestroySocket (
 EFI_STATUS\r
 EFIAPI\r
 TcpIoConnect (\r
-  IN OUT TCP_IO             *TcpIo,\r
-  IN     EFI_EVENT          Timeout        OPTIONAL\r
+  IN OUT TCP_IO     *TcpIo,\r
+  IN     EFI_EVENT  Timeout        OPTIONAL\r
   )\r
 {\r
-  EFI_TCP4_PROTOCOL         *Tcp4;\r
-  EFI_TCP6_PROTOCOL         *Tcp6;\r
-  EFI_STATUS                Status;\r
+  EFI_TCP4_PROTOCOL  *Tcp4;\r
+  EFI_TCP6_PROTOCOL  *Tcp6;\r
+  EFI_STATUS         Status;\r
 \r
   if ((TcpIo == NULL) || (TcpIo->Tcp.Tcp4 == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -584,6 +577,7 @@ TcpIoConnect (
     } else {\r
       Tcp6->Cancel (Tcp6, &TcpIo->ConnToken.Tcp6Token.CompletionToken);\r
     }\r
+\r
     Status = EFI_TIMEOUT;\r
   } else {\r
     Status = TcpIo->ConnToken.Tcp4Token.CompletionToken.Status;\r
@@ -613,14 +607,14 @@ TcpIoConnect (
 EFI_STATUS\r
 EFIAPI\r
 TcpIoAccept (\r
-  IN OUT TCP_IO             *TcpIo,\r
-  IN     EFI_EVENT          Timeout        OPTIONAL\r
+  IN OUT TCP_IO     *TcpIo,\r
+  IN     EFI_EVENT  Timeout        OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_GUID                  *ProtocolGuid;\r
-  EFI_TCP4_PROTOCOL         *Tcp4;\r
-  EFI_TCP6_PROTOCOL         *Tcp6;\r
+  EFI_STATUS         Status;\r
+  EFI_GUID           *ProtocolGuid;\r
+  EFI_TCP4_PROTOCOL  *Tcp4;\r
+  EFI_TCP6_PROTOCOL  *Tcp6;\r
 \r
   if ((TcpIo == NULL) || (TcpIo->Tcp.Tcp4 == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -659,6 +653,7 @@ TcpIoAccept (
     } else {\r
       Tcp6->Cancel (Tcp6, &TcpIo->ListenToken.Tcp6Token.CompletionToken);\r
     }\r
+\r
     Status = EFI_TIMEOUT;\r
   } else {\r
     Status = TcpIo->ListenToken.Tcp4Token.CompletionToken.Status;\r
@@ -678,12 +673,11 @@ TcpIoAccept (
     Status = gBS->OpenProtocol (\r
                     TcpIo->ListenToken.Tcp4Token.NewChildHandle,\r
                     ProtocolGuid,\r
-                    (VOID **) (&TcpIo->NewTcp.Tcp4),\r
+                    (VOID **)(&TcpIo->NewTcp.Tcp4),\r
                     TcpIo->Image,\r
                     TcpIo->Controller,\r
                     EFI_OPEN_PROTOCOL_BY_DRIVER\r
                     );\r
-\r
   }\r
 \r
   return Status;\r
@@ -698,15 +692,15 @@ TcpIoAccept (
 VOID\r
 EFIAPI\r
 TcpIoReset (\r
-  IN OUT TCP_IO             *TcpIo\r
+  IN OUT TCP_IO  *TcpIo\r
   )\r
 {\r
-  EFI_TCP4_PROTOCOL         *Tcp4;\r
-  EFI_TCP6_PROTOCOL         *Tcp6;\r
-  EFI_STATUS                Status;\r
+  EFI_TCP4_PROTOCOL  *Tcp4;\r
+  EFI_TCP6_PROTOCOL  *Tcp6;\r
+  EFI_STATUS         Status;\r
 \r
   if ((TcpIo == NULL) || (TcpIo->Tcp.Tcp4 == NULL)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   TcpIo->IsCloseDone = FALSE;\r
@@ -715,18 +709,18 @@ TcpIoReset (
 \r
   if (TcpIo->TcpVersion == TCP_VERSION_4) {\r
     TcpIo->CloseToken.Tcp4Token.AbortOnClose = TRUE;\r
-    Tcp4 = TcpIo->Tcp.Tcp4;\r
-    Status = Tcp4->Close (Tcp4, &TcpIo->CloseToken.Tcp4Token);\r
+    Tcp4                                     = TcpIo->Tcp.Tcp4;\r
+    Status                                   = Tcp4->Close (Tcp4, &TcpIo->CloseToken.Tcp4Token);\r
   } else if (TcpIo->TcpVersion == TCP_VERSION_6) {\r
     TcpIo->CloseToken.Tcp6Token.AbortOnClose = TRUE;\r
-    Tcp6 = TcpIo->Tcp.Tcp6;\r
-    Status = Tcp6->Close (Tcp6, &TcpIo->CloseToken.Tcp6Token);\r
+    Tcp6                                     = TcpIo->Tcp.Tcp6;\r
+    Status                                   = Tcp6->Close (Tcp6, &TcpIo->CloseToken.Tcp6Token);\r
   } else {\r
-    return ;\r
+    return;\r
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   while (!TcpIo->IsCloseDone) {\r
@@ -738,7 +732,6 @@ TcpIoReset (
   }\r
 }\r
 \r
-\r
 /**\r
   Transmit the Packet to the other endpoint of the socket.\r
 \r
@@ -757,22 +750,21 @@ TcpIoReset (
 EFI_STATUS\r
 EFIAPI\r
 TcpIoTransmit (\r
-  IN TCP_IO                 *TcpIo,\r
-  IN NET_BUF                *Packet\r
+  IN TCP_IO   *TcpIo,\r
+  IN NET_BUF  *Packet\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  VOID                      *Data;\r
-  EFI_TCP4_PROTOCOL         *Tcp4;\r
-  EFI_TCP6_PROTOCOL         *Tcp6;\r
-  UINTN                     Size;\r
+  EFI_STATUS         Status;\r
+  VOID               *Data;\r
+  EFI_TCP4_PROTOCOL  *Tcp4;\r
+  EFI_TCP6_PROTOCOL  *Tcp6;\r
+  UINTN              Size;\r
 \r
-  if ((TcpIo == NULL) || (TcpIo->Tcp.Tcp4 == NULL)|| (Packet == NULL)) {\r
+  if ((TcpIo == NULL) || (TcpIo->Tcp.Tcp4 == NULL) || (Packet == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   if (TcpIo->TcpVersion == TCP_VERSION_4) {\r
-\r
     Size = sizeof (EFI_TCP4_TRANSMIT_DATA) +\r
            (Packet->BlockOpNum - 1) * sizeof (EFI_TCP4_FRAGMENT_DATA);\r
   } else if (TcpIo->TcpVersion == TCP_VERSION_6) {\r
@@ -787,19 +779,19 @@ TcpIoTransmit (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  ((EFI_TCP4_TRANSMIT_DATA *) Data)->Push        = TRUE;\r
-  ((EFI_TCP4_TRANSMIT_DATA *) Data)->Urgent      = FALSE;\r
-  ((EFI_TCP4_TRANSMIT_DATA *) Data)->DataLength  = Packet->TotalSize;\r
+  ((EFI_TCP4_TRANSMIT_DATA *)Data)->Push       = TRUE;\r
+  ((EFI_TCP4_TRANSMIT_DATA *)Data)->Urgent     = FALSE;\r
+  ((EFI_TCP4_TRANSMIT_DATA *)Data)->DataLength = Packet->TotalSize;\r
 \r
   //\r
   // Build the fragment table.\r
   //\r
-  ((EFI_TCP4_TRANSMIT_DATA *) Data)->FragmentCount = Packet->BlockOpNum;\r
+  ((EFI_TCP4_TRANSMIT_DATA *)Data)->FragmentCount = Packet->BlockOpNum;\r
 \r
   NetbufBuildExt (\r
     Packet,\r
-    (NET_FRAGMENT *) &((EFI_TCP4_TRANSMIT_DATA *) Data)->FragmentTable[0],\r
-    &((EFI_TCP4_TRANSMIT_DATA *) Data)->FragmentCount\r
+    (NET_FRAGMENT *)&((EFI_TCP4_TRANSMIT_DATA *)Data)->FragmentTable[0],\r
+    &((EFI_TCP4_TRANSMIT_DATA *)Data)->FragmentCount\r
     );\r
 \r
   Tcp4   = NULL;\r
@@ -810,8 +802,8 @@ TcpIoTransmit (
   // Transmit the packet.\r
   //\r
   if (TcpIo->TcpVersion == TCP_VERSION_4) {\r
-    TcpIo->TxToken.Tcp4Token.Packet.TxData = (EFI_TCP4_TRANSMIT_DATA *) Data;\r
-    Tcp4    = TcpIo->Tcp.Tcp4;\r
+    TcpIo->TxToken.Tcp4Token.Packet.TxData = (EFI_TCP4_TRANSMIT_DATA *)Data;\r
+    Tcp4                                   = TcpIo->Tcp.Tcp4;\r
     if (TcpIo->IsListenDone) {\r
       Tcp4 = TcpIo->NewTcp.Tcp4;\r
     }\r
@@ -820,10 +812,10 @@ TcpIoTransmit (
       goto ON_EXIT;\r
     }\r
 \r
-    Status  = Tcp4->Transmit (Tcp4, &TcpIo->TxToken.Tcp4Token);\r
+    Status = Tcp4->Transmit (Tcp4, &TcpIo->TxToken.Tcp4Token);\r
   } else {\r
-    TcpIo->TxToken.Tcp6Token.Packet.TxData = (EFI_TCP6_TRANSMIT_DATA *) Data;\r
-    Tcp6    = TcpIo->Tcp.Tcp6;\r
+    TcpIo->TxToken.Tcp6Token.Packet.TxData = (EFI_TCP6_TRANSMIT_DATA *)Data;\r
+    Tcp6                                   = TcpIo->Tcp.Tcp6;\r
     if (TcpIo->IsListenDone) {\r
       Tcp6 = TcpIo->NewTcp.Tcp6;\r
     }\r
@@ -832,7 +824,7 @@ TcpIoTransmit (
       goto ON_EXIT;\r
     }\r
 \r
-    Status  = Tcp6->Transmit (Tcp6, &TcpIo->TxToken.Tcp6Token);\r
+    Status = Tcp6->Transmit (Tcp6, &TcpIo->TxToken.Tcp6Token);\r
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -847,8 +839,8 @@ TcpIoTransmit (
     }\r
   }\r
 \r
-  TcpIo->IsTxDone  = FALSE;\r
-  Status           = TcpIo->TxToken.Tcp4Token.CompletionToken.Status;\r
+  TcpIo->IsTxDone = FALSE;\r
+  Status          = TcpIo->TxToken.Tcp4Token.CompletionToken.Status;\r
 \r
 ON_EXIT:\r
 \r
@@ -878,21 +870,21 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 TcpIoReceive (\r
-  IN OUT TCP_IO             *TcpIo,\r
-  IN     NET_BUF            *Packet,\r
-  IN     BOOLEAN            AsyncMode,\r
-  IN     EFI_EVENT          Timeout       OPTIONAL\r
+  IN OUT TCP_IO     *TcpIo,\r
+  IN     NET_BUF    *Packet,\r
+  IN     BOOLEAN    AsyncMode,\r
+  IN     EFI_EVENT  Timeout       OPTIONAL\r
   )\r
 {\r
-  EFI_TCP4_PROTOCOL         *Tcp4;\r
-  EFI_TCP6_PROTOCOL         *Tcp6;\r
-  EFI_TCP4_RECEIVE_DATA     *RxData;\r
-  EFI_STATUS                Status;\r
-  NET_FRAGMENT              *Fragment;\r
-  UINT32                    FragmentCount;\r
-  UINT32                    CurrentFragment;\r
-\r
-  if ((TcpIo == NULL) || (TcpIo->Tcp.Tcp4 == NULL)|| (Packet == NULL)) {\r
+  EFI_TCP4_PROTOCOL      *Tcp4;\r
+  EFI_TCP6_PROTOCOL      *Tcp6;\r
+  EFI_TCP4_RECEIVE_DATA  *RxData;\r
+  EFI_STATUS             Status;\r
+  NET_FRAGMENT           *Fragment;\r
+  UINT32                 FragmentCount;\r
+  UINT32                 CurrentFragment;\r
+\r
+  if ((TcpIo == NULL) || (TcpIo->Tcp.Tcp4 == NULL) || (Packet == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -914,7 +906,6 @@ TcpIoReceive (
     if (Tcp4 == NULL) {\r
       return EFI_DEVICE_ERROR;\r
     }\r
-\r
   } else if (TcpIo->TcpVersion == TCP_VERSION_6) {\r
     Tcp6 = TcpIo->Tcp.Tcp6;\r
 \r
@@ -925,7 +916,6 @@ TcpIoReceive (
     if (Tcp6 == NULL) {\r
       return EFI_DEVICE_ERROR;\r
     }\r
-\r
   } else {\r
     return EFI_UNSUPPORTED;\r
   }\r
@@ -936,19 +926,20 @@ TcpIoReceive (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
   }\r
+\r
   //\r
   // Build the fragment table.\r
   //\r
   NetbufBuildExt (Packet, Fragment, &FragmentCount);\r
 \r
-  RxData->FragmentCount         = 1;\r
-  CurrentFragment               = 0;\r
-  Status                        = EFI_SUCCESS;\r
+  RxData->FragmentCount = 1;\r
+  CurrentFragment       = 0;\r
+  Status                = EFI_SUCCESS;\r
 \r
   while (CurrentFragment < FragmentCount) {\r
-    RxData->DataLength                       = Fragment[CurrentFragment].Len;\r
-    RxData->FragmentTable[0].FragmentLength  = Fragment[CurrentFragment].Len;\r
-    RxData->FragmentTable[0].FragmentBuffer  = Fragment[CurrentFragment].Bulk;\r
+    RxData->DataLength                      = Fragment[CurrentFragment].Len;\r
+    RxData->FragmentTable[0].FragmentLength = Fragment[CurrentFragment].Len;\r
+    RxData->FragmentTable[0].FragmentBuffer = Fragment[CurrentFragment].Bulk;\r
 \r
     if (TcpIo->TcpVersion == TCP_VERSION_4) {\r
       Status = Tcp4->Receive (Tcp4, &TcpIo->RxToken.Tcp4Token);\r
index 6777fd79a5cba6f7fb23d6461212e0b07dc83bbe..610ea786eb8d50c6113e79affa97545e7706d510 100644 (file)
@@ -18,7 +18,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/DpcLib.h>\r
 \r
-\r
 /**\r
   Free a UDP_TX_TOKEN. The TX event is closed.\r
 \r
@@ -27,10 +26,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 VOID\r
 UdpIoFreeTxToken (\r
-  IN UDP_TX_TOKEN           *TxToken\r
+  IN UDP_TX_TOKEN  *TxToken\r
   )\r
 {\r
-\r
   if (TxToken->UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) {\r
     gBS->CloseEvent (TxToken->Token.Udp4.Event);\r
   } else if (TxToken->UdpIo->UdpVersion == UDP_IO_UDP6_VERSION) {\r
@@ -50,7 +48,7 @@ UdpIoFreeTxToken (
 **/\r
 VOID\r
 UdpIoFreeRxToken (\r
-  IN UDP_RX_TOKEN           *RxToken\r
+  IN UDP_RX_TOKEN  *RxToken\r
   )\r
 {\r
   if (RxToken->UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) {\r
@@ -76,15 +74,17 @@ UdpIoFreeRxToken (
 VOID\r
 EFIAPI\r
 UdpIoOnDgramSentDpc (\r
-  IN VOID                   *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  UDP_TX_TOKEN              *TxToken;\r
+  UDP_TX_TOKEN  *TxToken;\r
 \r
-  TxToken = (UDP_TX_TOKEN *) Context;\r
+  TxToken = (UDP_TX_TOKEN *)Context;\r
   ASSERT (TxToken->Signature == UDP_IO_TX_SIGNATURE);\r
-  ASSERT ((TxToken->UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) ||\r
-          (TxToken->UdpIo->UdpVersion == UDP_IO_UDP6_VERSION));\r
+  ASSERT (\r
+    (TxToken->UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) ||\r
+    (TxToken->UdpIo->UdpVersion == UDP_IO_UDP6_VERSION)\r
+    );\r
 \r
   RemoveEntryList (&TxToken->Link);\r
 \r
@@ -107,8 +107,8 @@ UdpIoOnDgramSentDpc (
 VOID\r
 EFIAPI\r
 UdpIoOnDgramSent (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   //\r
@@ -126,12 +126,12 @@ UdpIoOnDgramSent (
 VOID\r
 EFIAPI\r
 UdpIoRecycleDgram (\r
-  IN VOID                   *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  UDP_RX_TOKEN              *RxToken;\r
+  UDP_RX_TOKEN  *RxToken;\r
 \r
-  RxToken = (UDP_RX_TOKEN *) Context;\r
+  RxToken = (UDP_RX_TOKEN *)Context;\r
 \r
   if (RxToken->UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) {\r
     gBS->SignalEvent (RxToken->Token.Udp4.Packet.RxData->RecycleSignal);\r
@@ -156,26 +156,30 @@ UdpIoRecycleDgram (
 VOID\r
 EFIAPI\r
 UdpIoOnDgramRcvdDpc (\r
-  IN VOID                   *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  VOID                      *Token;\r
-  VOID                      *RxData;\r
-  VOID                      *Session;\r
-  UDP_RX_TOKEN              *RxToken;\r
-  UDP_END_POINT             EndPoint;\r
-  NET_BUF                   *Netbuf;\r
+  EFI_STATUS     Status;\r
+  VOID           *Token;\r
+  VOID           *RxData;\r
+  VOID           *Session;\r
+  UDP_RX_TOKEN   *RxToken;\r
+  UDP_END_POINT  EndPoint;\r
+  NET_BUF        *Netbuf;\r
 \r
-  RxToken = (UDP_RX_TOKEN *) Context;\r
+  RxToken = (UDP_RX_TOKEN *)Context;\r
 \r
-  ZeroMem (&EndPoint, sizeof(UDP_END_POINT));\r
+  ZeroMem (&EndPoint, sizeof (UDP_END_POINT));\r
 \r
-  ASSERT ((RxToken->Signature == UDP_IO_RX_SIGNATURE) &&\r
-          (RxToken == RxToken->UdpIo->RecvRequest));\r
+  ASSERT (\r
+    (RxToken->Signature == UDP_IO_RX_SIGNATURE) &&\r
+    (RxToken == RxToken->UdpIo->RecvRequest)\r
+    );\r
 \r
-  ASSERT ((RxToken->UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) ||\r
-          (RxToken->UdpIo->UdpVersion == UDP_IO_UDP6_VERSION));\r
+  ASSERT (\r
+    (RxToken->UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) ||\r
+    (RxToken->UdpIo->UdpVersion == UDP_IO_UDP6_VERSION)\r
+    );\r
 \r
   //\r
   // Clear the receive request first in case that the caller\r
@@ -185,15 +189,15 @@ UdpIoOnDgramRcvdDpc (
 \r
   if (RxToken->UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) {\r
     Token  = &RxToken->Token.Udp4;\r
-    RxData = ((EFI_UDP4_COMPLETION_TOKEN *) Token)->Packet.RxData;\r
-    Status = ((EFI_UDP4_COMPLETION_TOKEN *) Token)->Status;\r
+    RxData = ((EFI_UDP4_COMPLETION_TOKEN *)Token)->Packet.RxData;\r
+    Status = ((EFI_UDP4_COMPLETION_TOKEN *)Token)->Status;\r
   } else {\r
     Token  = &RxToken->Token.Udp6;\r
-    RxData = ((EFI_UDP6_COMPLETION_TOKEN *) Token)->Packet.RxData;\r
-    Status = ((EFI_UDP6_COMPLETION_TOKEN *) Token)->Status;\r
+    RxData = ((EFI_UDP6_COMPLETION_TOKEN *)Token)->Packet.RxData;\r
+    Status = ((EFI_UDP6_COMPLETION_TOKEN *)Token)->Status;\r
   }\r
 \r
-  if (EFI_ERROR (Status) || RxData == NULL) {\r
+  if (EFI_ERROR (Status) || (RxData == NULL)) {\r
     if (Status != EFI_ABORTED) {\r
       //\r
       // Invoke the CallBack only if the reception is not actively aborted.\r
@@ -209,7 +213,7 @@ UdpIoOnDgramRcvdDpc (
   // Build a NET_BUF from the UDP receive data, then deliver it up.\r
   //\r
   if (RxToken->UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) {\r
-    if (((EFI_UDP4_RECEIVE_DATA *) RxData)->DataLength == 0) {\r
+    if (((EFI_UDP4_RECEIVE_DATA *)RxData)->DataLength == 0) {\r
       //\r
       // Discard zero length data payload packet.\r
       //\r
@@ -217,42 +221,42 @@ UdpIoOnDgramRcvdDpc (
     }\r
 \r
     Netbuf = NetbufFromExt (\r
-               (NET_FRAGMENT *)((EFI_UDP4_RECEIVE_DATA *) RxData)->FragmentTable,\r
-               ((EFI_UDP4_RECEIVE_DATA *) RxData)->FragmentCount,\r
+               (NET_FRAGMENT *)((EFI_UDP4_RECEIVE_DATA *)RxData)->FragmentTable,\r
+               ((EFI_UDP4_RECEIVE_DATA *)RxData)->FragmentCount,\r
                0,\r
-               (UINT32) RxToken->HeadLen,\r
+               (UINT32)RxToken->HeadLen,\r
                UdpIoRecycleDgram,\r
                RxToken\r
                );\r
 \r
     if (Netbuf == NULL) {\r
-      gBS->SignalEvent (((EFI_UDP4_RECEIVE_DATA *) RxData)->RecycleSignal);\r
+      gBS->SignalEvent (((EFI_UDP4_RECEIVE_DATA *)RxData)->RecycleSignal);\r
       RxToken->CallBack (NULL, NULL, EFI_OUT_OF_RESOURCES, RxToken->Context);\r
 \r
       UdpIoFreeRxToken (RxToken);\r
       return;\r
     }\r
 \r
-    Session             = &((EFI_UDP4_RECEIVE_DATA *) RxData)->UdpSession;\r
-    EndPoint.LocalPort  = ((EFI_UDP4_SESSION_DATA *) Session)->DestinationPort;\r
-    EndPoint.RemotePort = ((EFI_UDP4_SESSION_DATA *) Session)->SourcePort;\r
+    Session             = &((EFI_UDP4_RECEIVE_DATA *)RxData)->UdpSession;\r
+    EndPoint.LocalPort  = ((EFI_UDP4_SESSION_DATA *)Session)->DestinationPort;\r
+    EndPoint.RemotePort = ((EFI_UDP4_SESSION_DATA *)Session)->SourcePort;\r
 \r
     CopyMem (\r
       &EndPoint.LocalAddr,\r
-      &((EFI_UDP4_SESSION_DATA *) Session)->DestinationAddress,\r
+      &((EFI_UDP4_SESSION_DATA *)Session)->DestinationAddress,\r
       sizeof (EFI_IPv4_ADDRESS)\r
       );\r
 \r
     CopyMem (\r
       &EndPoint.RemoteAddr,\r
-      &((EFI_UDP4_SESSION_DATA *) Session)->SourceAddress,\r
+      &((EFI_UDP4_SESSION_DATA *)Session)->SourceAddress,\r
       sizeof (EFI_IPv4_ADDRESS)\r
       );\r
 \r
     EndPoint.LocalAddr.Addr[0]  = NTOHL (EndPoint.LocalAddr.Addr[0]);\r
     EndPoint.RemoteAddr.Addr[0] = NTOHL (EndPoint.RemoteAddr.Addr[0]);\r
   } else {\r
-    if (((EFI_UDP6_RECEIVE_DATA *) RxData)->DataLength == 0) {\r
+    if (((EFI_UDP6_RECEIVE_DATA *)RxData)->DataLength == 0) {\r
       //\r
       // Discard zero length data payload packet.\r
       //\r
@@ -260,35 +264,35 @@ UdpIoOnDgramRcvdDpc (
     }\r
 \r
     Netbuf = NetbufFromExt (\r
-               (NET_FRAGMENT *)((EFI_UDP6_RECEIVE_DATA *) RxData)->FragmentTable,\r
-               ((EFI_UDP6_RECEIVE_DATA *) RxData)->FragmentCount,\r
+               (NET_FRAGMENT *)((EFI_UDP6_RECEIVE_DATA *)RxData)->FragmentTable,\r
+               ((EFI_UDP6_RECEIVE_DATA *)RxData)->FragmentCount,\r
                0,\r
-               (UINT32) RxToken->HeadLen,\r
+               (UINT32)RxToken->HeadLen,\r
                UdpIoRecycleDgram,\r
                RxToken\r
                );\r
 \r
     if (Netbuf == NULL) {\r
-      gBS->SignalEvent (((EFI_UDP6_RECEIVE_DATA *) RxData)->RecycleSignal);\r
+      gBS->SignalEvent (((EFI_UDP6_RECEIVE_DATA *)RxData)->RecycleSignal);\r
       RxToken->CallBack (NULL, NULL, EFI_OUT_OF_RESOURCES, RxToken->Context);\r
 \r
       UdpIoFreeRxToken (RxToken);\r
       return;\r
     }\r
 \r
-    Session             = &((EFI_UDP6_RECEIVE_DATA *) RxData)->UdpSession;\r
-    EndPoint.LocalPort  = ((EFI_UDP6_SESSION_DATA *) Session)->DestinationPort;\r
-    EndPoint.RemotePort = ((EFI_UDP6_SESSION_DATA *) Session)->SourcePort;\r
+    Session             = &((EFI_UDP6_RECEIVE_DATA *)RxData)->UdpSession;\r
+    EndPoint.LocalPort  = ((EFI_UDP6_SESSION_DATA *)Session)->DestinationPort;\r
+    EndPoint.RemotePort = ((EFI_UDP6_SESSION_DATA *)Session)->SourcePort;\r
 \r
     CopyMem (\r
       &EndPoint.LocalAddr,\r
-      &((EFI_UDP6_SESSION_DATA *) Session)->DestinationAddress,\r
+      &((EFI_UDP6_SESSION_DATA *)Session)->DestinationAddress,\r
       sizeof (EFI_IPv6_ADDRESS)\r
       );\r
 \r
     CopyMem (\r
       &EndPoint.RemoteAddr,\r
-      &((EFI_UDP6_SESSION_DATA *) Session)->SourceAddress,\r
+      &((EFI_UDP6_SESSION_DATA *)Session)->SourceAddress,\r
       sizeof (EFI_IPv6_ADDRESS)\r
       );\r
 \r
@@ -301,10 +305,10 @@ UdpIoOnDgramRcvdDpc (
 \r
 Resume:\r
   if (RxToken->UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) {\r
-    gBS->SignalEvent (((EFI_UDP4_RECEIVE_DATA *) RxData)->RecycleSignal);\r
+    gBS->SignalEvent (((EFI_UDP4_RECEIVE_DATA *)RxData)->RecycleSignal);\r
     RxToken->UdpIo->Protocol.Udp4->Receive (RxToken->UdpIo->Protocol.Udp4, &RxToken->Token.Udp4);\r
   } else {\r
-    gBS->SignalEvent (((EFI_UDP6_RECEIVE_DATA *) RxData)->RecycleSignal);\r
+    gBS->SignalEvent (((EFI_UDP6_RECEIVE_DATA *)RxData)->RecycleSignal);\r
     RxToken->UdpIo->Protocol.Udp6->Receive (RxToken->UdpIo->Protocol.Udp6, &RxToken->Token.Udp6);\r
   }\r
 }\r
@@ -319,8 +323,8 @@ Resume:
 VOID\r
 EFIAPI\r
 UdpIoOnDgramRcvd (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   //\r
@@ -342,17 +346,19 @@ UdpIoOnDgramRcvd (
 **/\r
 UDP_RX_TOKEN *\r
 UdpIoCreateRxToken (\r
-  IN UDP_IO                 *UdpIo,\r
-  IN UDP_IO_CALLBACK        CallBack,\r
-  IN VOID                   *Context,\r
-  IN UINT32                 HeadLen\r
+  IN UDP_IO           *UdpIo,\r
+  IN UDP_IO_CALLBACK  CallBack,\r
+  IN VOID             *Context,\r
+  IN UINT32           HeadLen\r
   )\r
 {\r
-  UDP_RX_TOKEN              *Token;\r
-  EFI_STATUS                Status;\r
+  UDP_RX_TOKEN  *Token;\r
+  EFI_STATUS    Status;\r
 \r
-  ASSERT ((UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) ||\r
-          (UdpIo->UdpVersion == UDP_IO_UDP6_VERSION));\r
+  ASSERT (\r
+    (UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) ||\r
+    (UdpIo->UdpVersion == UDP_IO_UDP6_VERSION)\r
+    );\r
 \r
   Token = AllocatePool (sizeof (UDP_RX_TOKEN));\r
 \r
@@ -360,14 +366,13 @@ UdpIoCreateRxToken (
     return NULL;\r
   }\r
 \r
-  Token->Signature              = UDP_IO_RX_SIGNATURE;\r
-  Token->UdpIo                  = UdpIo;\r
-  Token->CallBack               = CallBack;\r
-  Token->Context                = Context;\r
-  Token->HeadLen                = HeadLen;\r
+  Token->Signature = UDP_IO_RX_SIGNATURE;\r
+  Token->UdpIo     = UdpIo;\r
+  Token->CallBack  = CallBack;\r
+  Token->Context   = Context;\r
+  Token->HeadLen   = HeadLen;\r
 \r
   if (UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) {\r
-\r
     Token->Token.Udp4.Status        = EFI_NOT_READY;\r
     Token->Token.Udp4.Packet.RxData = NULL;\r
 \r
@@ -378,8 +383,7 @@ UdpIoCreateRxToken (
                     Token,\r
                     &Token->Token.Udp4.Event\r
                     );\r
-    } else {\r
-\r
+  } else {\r
     Token->Token.Udp6.Status        = EFI_NOT_READY;\r
     Token->Token.Udp6.Packet.RxData = NULL;\r
 \r
@@ -392,7 +396,6 @@ UdpIoCreateRxToken (
                     );\r
   }\r
 \r
-\r
   if (EFI_ERROR (Status)) {\r
     FreePool (Token);\r
     return NULL;\r
@@ -420,25 +423,27 @@ UdpIoCreateRxToken (
 **/\r
 UDP_TX_TOKEN *\r
 UdpIoCreateTxToken (\r
-  IN UDP_IO                 *UdpIo,\r
-  IN NET_BUF                *Packet,\r
-  IN UDP_END_POINT          *EndPoint OPTIONAL,\r
-  IN EFI_IP_ADDRESS         *Gateway  OPTIONAL,\r
-  IN UDP_IO_CALLBACK        CallBack,\r
-  IN VOID                   *Context\r
+  IN UDP_IO           *UdpIo,\r
+  IN NET_BUF          *Packet,\r
+  IN UDP_END_POINT    *EndPoint OPTIONAL,\r
+  IN EFI_IP_ADDRESS   *Gateway  OPTIONAL,\r
+  IN UDP_IO_CALLBACK  CallBack,\r
+  IN VOID             *Context\r
   )\r
 {\r
-  UDP_TX_TOKEN              *TxToken;\r
-  VOID                      *Token;\r
-  VOID                      *Data;\r
-  EFI_STATUS                Status;\r
-  UINT32                    Count;\r
-  UINTN                     Size;\r
-  IP4_ADDR                  Ip;\r
+  UDP_TX_TOKEN  *TxToken;\r
+  VOID          *Token;\r
+  VOID          *Data;\r
+  EFI_STATUS    Status;\r
+  UINT32        Count;\r
+  UINTN         Size;\r
+  IP4_ADDR      Ip;\r
 \r
   ASSERT (Packet != NULL);\r
-  ASSERT ((UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) ||\r
-          (UdpIo->UdpVersion == UDP_IO_UDP6_VERSION));\r
+  ASSERT (\r
+    (UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) ||\r
+    (UdpIo->UdpVersion == UDP_IO_UDP6_VERSION)\r
+    );\r
 \r
   if (UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) {\r
     Size = sizeof (UDP_TX_TOKEN) + sizeof (EFI_UDP4_FRAGMENT_DATA) * (Packet->BlockOpNum - 1);\r
@@ -455,24 +460,23 @@ UdpIoCreateTxToken (
   TxToken->Signature = UDP_IO_TX_SIGNATURE;\r
   InitializeListHead (&TxToken->Link);\r
 \r
-  TxToken->UdpIo     = UdpIo;\r
-  TxToken->CallBack  = CallBack;\r
-  TxToken->Packet    = Packet;\r
-  TxToken->Context   = Context;\r
+  TxToken->UdpIo    = UdpIo;\r
+  TxToken->CallBack = CallBack;\r
+  TxToken->Packet   = Packet;\r
+  TxToken->Context  = Context;\r
 \r
-  Token              = &(TxToken->Token);\r
-  Count              = Packet->BlockOpNum;\r
+  Token = &(TxToken->Token);\r
+  Count = Packet->BlockOpNum;\r
 \r
   if (UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) {\r
-\r
-    ((EFI_UDP4_COMPLETION_TOKEN *) Token)->Status = EFI_NOT_READY;\r
+    ((EFI_UDP4_COMPLETION_TOKEN *)Token)->Status = EFI_NOT_READY;\r
 \r
     Status = gBS->CreateEvent (\r
                     EVT_NOTIFY_SIGNAL,\r
                     TPL_NOTIFY,\r
                     UdpIoOnDgramSent,\r
                     TxToken,\r
-                    &((EFI_UDP4_COMPLETION_TOKEN *) Token)->Event\r
+                    &((EFI_UDP4_COMPLETION_TOKEN *)Token)->Event\r
                     );\r
 \r
     if (EFI_ERROR (Status)) {\r
@@ -480,20 +484,20 @@ UdpIoCreateTxToken (
       return NULL;\r
     }\r
 \r
-    Data = &(TxToken->Data.Udp4);\r
-    ((EFI_UDP4_COMPLETION_TOKEN *) Token)->Packet.TxData = Data;\r
+    Data                                                = &(TxToken->Data.Udp4);\r
+    ((EFI_UDP4_COMPLETION_TOKEN *)Token)->Packet.TxData = Data;\r
 \r
-    ((EFI_UDP4_TRANSMIT_DATA *) Data)->UdpSessionData    = NULL;\r
-    ((EFI_UDP4_TRANSMIT_DATA *) Data)->GatewayAddress    = NULL;\r
-    ((EFI_UDP4_TRANSMIT_DATA *) Data)->DataLength        = Packet->TotalSize;\r
+    ((EFI_UDP4_TRANSMIT_DATA *)Data)->UdpSessionData = NULL;\r
+    ((EFI_UDP4_TRANSMIT_DATA *)Data)->GatewayAddress = NULL;\r
+    ((EFI_UDP4_TRANSMIT_DATA *)Data)->DataLength     = Packet->TotalSize;\r
 \r
     NetbufBuildExt (\r
       Packet,\r
-      (NET_FRAGMENT *)((EFI_UDP4_TRANSMIT_DATA *) Data)->FragmentTable,\r
+      (NET_FRAGMENT *)((EFI_UDP4_TRANSMIT_DATA *)Data)->FragmentTable,\r
       &Count\r
       );\r
 \r
-    ((EFI_UDP4_TRANSMIT_DATA *) Data)->FragmentCount     = Count;\r
+    ((EFI_UDP4_TRANSMIT_DATA *)Data)->FragmentCount = Count;\r
 \r
     if (EndPoint != NULL) {\r
       Ip = HTONL (EndPoint->LocalAddr.Addr[0]);\r
@@ -510,27 +514,25 @@ UdpIoCreateTxToken (
         sizeof (EFI_IPv4_ADDRESS)\r
         );\r
 \r
-      TxToken->Session.Udp4.SourcePort                   = EndPoint->LocalPort;\r
-      TxToken->Session.Udp4.DestinationPort              = EndPoint->RemotePort;\r
-      ((EFI_UDP4_TRANSMIT_DATA *) Data)->UdpSessionData  = &(TxToken->Session.Udp4);\r
+      TxToken->Session.Udp4.SourcePort                 = EndPoint->LocalPort;\r
+      TxToken->Session.Udp4.DestinationPort            = EndPoint->RemotePort;\r
+      ((EFI_UDP4_TRANSMIT_DATA *)Data)->UdpSessionData = &(TxToken->Session.Udp4);\r
     }\r
 \r
-    if (Gateway != NULL && (Gateway->Addr[0] != 0)) {\r
+    if ((Gateway != NULL) && (Gateway->Addr[0] != 0)) {\r
       Ip = HTONL (Gateway->Addr[0]);\r
       CopyMem (&TxToken->Gateway, &Ip, sizeof (EFI_IPv4_ADDRESS));\r
-      ((EFI_UDP4_TRANSMIT_DATA *) Data)->GatewayAddress = &TxToken->Gateway;\r
+      ((EFI_UDP4_TRANSMIT_DATA *)Data)->GatewayAddress = &TxToken->Gateway;\r
     }\r
-\r
   } else {\r
-\r
-    ((EFI_UDP6_COMPLETION_TOKEN *) Token)->Status = EFI_NOT_READY;\r
+    ((EFI_UDP6_COMPLETION_TOKEN *)Token)->Status = EFI_NOT_READY;\r
 \r
     Status = gBS->CreateEvent (\r
                     EVT_NOTIFY_SIGNAL,\r
                     TPL_NOTIFY,\r
                     UdpIoOnDgramSent,\r
                     TxToken,\r
-                    &((EFI_UDP6_COMPLETION_TOKEN *) Token)->Event\r
+                    &((EFI_UDP6_COMPLETION_TOKEN *)Token)->Event\r
                     );\r
 \r
     if (EFI_ERROR (Status)) {\r
@@ -538,35 +540,35 @@ UdpIoCreateTxToken (
       return NULL;\r
     }\r
 \r
-    Data = &(TxToken->Data.Udp6);\r
-    ((EFI_UDP6_COMPLETION_TOKEN *) Token)->Packet.TxData  = Data;\r
-    ((EFI_UDP6_TRANSMIT_DATA *) Data)->UdpSessionData     = NULL;\r
-    ((EFI_UDP6_TRANSMIT_DATA *) Data)->DataLength         = Packet->TotalSize;\r
+    Data                                                = &(TxToken->Data.Udp6);\r
+    ((EFI_UDP6_COMPLETION_TOKEN *)Token)->Packet.TxData = Data;\r
+    ((EFI_UDP6_TRANSMIT_DATA *)Data)->UdpSessionData    = NULL;\r
+    ((EFI_UDP6_TRANSMIT_DATA *)Data)->DataLength        = Packet->TotalSize;\r
 \r
     NetbufBuildExt (\r
       Packet,\r
-      (NET_FRAGMENT *)((EFI_UDP6_TRANSMIT_DATA *) Data)->FragmentTable,\r
+      (NET_FRAGMENT *)((EFI_UDP6_TRANSMIT_DATA *)Data)->FragmentTable,\r
       &Count\r
       );\r
 \r
-    ((EFI_UDP6_TRANSMIT_DATA *) Data)->FragmentCount      = Count;\r
+    ((EFI_UDP6_TRANSMIT_DATA *)Data)->FragmentCount = Count;\r
 \r
     if (EndPoint != NULL) {\r
       CopyMem (\r
         &TxToken->Session.Udp6.SourceAddress,\r
         &EndPoint->LocalAddr.v6,\r
-        sizeof(EFI_IPv6_ADDRESS)\r
+        sizeof (EFI_IPv6_ADDRESS)\r
         );\r
 \r
       CopyMem (\r
         &TxToken->Session.Udp6.DestinationAddress,\r
         &EndPoint->RemoteAddr.v6,\r
-        sizeof(EFI_IPv6_ADDRESS)\r
+        sizeof (EFI_IPv6_ADDRESS)\r
         );\r
 \r
-      TxToken->Session.Udp6.SourcePort                   = EndPoint->LocalPort;\r
-      TxToken->Session.Udp6.DestinationPort              = EndPoint->RemotePort;\r
-      ((EFI_UDP6_TRANSMIT_DATA *) Data)->UdpSessionData  = &(TxToken->Session.Udp6);\r
+      TxToken->Session.Udp6.SourcePort                 = EndPoint->LocalPort;\r
+      TxToken->Session.Udp6.DestinationPort            = EndPoint->RemotePort;\r
+      ((EFI_UDP6_TRANSMIT_DATA *)Data)->UdpSessionData = &(TxToken->Session.Udp6);\r
     }\r
   }\r
 \r
@@ -598,15 +600,15 @@ UdpIoCreateTxToken (
 UDP_IO *\r
 EFIAPI\r
 UdpIoCreateIo (\r
-  IN  EFI_HANDLE            Controller,\r
-  IN  EFI_HANDLE            ImageHandle,\r
-  IN  UDP_IO_CONFIG         Configure,\r
-  IN  UINT8                 UdpVersion,\r
-  IN  VOID                  *Context\r
+  IN  EFI_HANDLE     Controller,\r
+  IN  EFI_HANDLE     ImageHandle,\r
+  IN  UDP_IO_CONFIG  Configure,\r
+  IN  UINT8          UdpVersion,\r
+  IN  VOID           *Context\r
   )\r
 {\r
-  UDP_IO                    *UdpIo;\r
-  EFI_STATUS                Status;\r
+  UDP_IO      *UdpIo;\r
+  EFI_STATUS  Status;\r
 \r
   ASSERT (Configure != NULL);\r
   ASSERT ((UdpVersion == UDP_IO_UDP4_VERSION) || (UdpVersion == UDP_IO_UDP6_VERSION));\r
@@ -617,17 +619,17 @@ UdpIoCreateIo (
     return NULL;\r
   }\r
 \r
-  UdpIo->UdpVersion   = UdpVersion;\r
-  UdpIo->Signature    = UDP_IO_SIGNATURE;\r
+  UdpIo->UdpVersion = UdpVersion;\r
+  UdpIo->Signature  = UDP_IO_SIGNATURE;\r
   InitializeListHead (&UdpIo->Link);\r
-  UdpIo->RefCnt       = 1;\r
+  UdpIo->RefCnt = 1;\r
 \r
-  UdpIo->Controller   = Controller;\r
-  UdpIo->Image        = ImageHandle;\r
+  UdpIo->Controller = Controller;\r
+  UdpIo->Image      = ImageHandle;\r
 \r
   InitializeListHead (&UdpIo->SentDatagram);\r
-  UdpIo->RecvRequest  = NULL;\r
-  UdpIo->UdpHandle    = NULL;\r
+  UdpIo->RecvRequest = NULL;\r
+  UdpIo->UdpHandle   = NULL;\r
 \r
   if (UdpVersion == UDP_IO_UDP4_VERSION) {\r
     //\r
@@ -647,7 +649,7 @@ UdpIoCreateIo (
     Status = gBS->OpenProtocol (\r
                     UdpIo->UdpHandle,\r
                     &gEfiUdp4ProtocolGuid,\r
-                    (VOID **) &UdpIo->Protocol.Udp4,\r
+                    (VOID **)&UdpIo->Protocol.Udp4,\r
                     ImageHandle,\r
                     Controller,\r
                     EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -672,9 +674,7 @@ UdpIoCreateIo (
     if (EFI_ERROR (Status)) {\r
       goto CLOSE_PROTOCOL;\r
     }\r
-\r
   } else {\r
-\r
     Status = NetLibCreateServiceChild (\r
                Controller,\r
                ImageHandle,\r
@@ -689,7 +689,7 @@ UdpIoCreateIo (
     Status = gBS->OpenProtocol (\r
                     UdpIo->UdpHandle,\r
                     &gEfiUdp6ProtocolGuid,\r
-                    (VOID **) &UdpIo->Protocol.Udp6,\r
+                    (VOID **)&UdpIo->Protocol.Udp6,\r
                     ImageHandle,\r
                     Controller,\r
                     EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -763,24 +763,25 @@ FREE_MEM:
 VOID\r
 EFIAPI\r
 UdpIoCancelDgrams (\r
-  IN UDP_IO                 *UdpIo,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN UDP_IO_TO_CANCEL       ToCancel         OPTIONAL,\r
-  IN VOID                   *Context         OPTIONAL\r
+  IN UDP_IO            *UdpIo,\r
+  IN EFI_STATUS        IoStatus,\r
+  IN UDP_IO_TO_CANCEL  ToCancel         OPTIONAL,\r
+  IN VOID              *Context         OPTIONAL\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  UDP_TX_TOKEN              *TxToken;\r
+  LIST_ENTRY    *Entry;\r
+  LIST_ENTRY    *Next;\r
+  UDP_TX_TOKEN  *TxToken;\r
 \r
-  ASSERT ((UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) ||\r
-          (UdpIo->UdpVersion == UDP_IO_UDP6_VERSION));\r
+  ASSERT (\r
+    (UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) ||\r
+    (UdpIo->UdpVersion == UDP_IO_UDP6_VERSION)\r
+    );\r
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &UdpIo->SentDatagram) {\r
     TxToken = NET_LIST_USER_STRUCT (Entry, UDP_TX_TOKEN, Link);\r
 \r
     if ((ToCancel == NULL) || (ToCancel (TxToken, Context))) {\r
-\r
       if (UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) {\r
         UdpIo->Protocol.Udp4->Cancel (UdpIo->Protocol.Udp4, &TxToken->Token.Udp4);\r
       } else {\r
@@ -806,14 +807,16 @@ UdpIoCancelDgrams (
 EFI_STATUS\r
 EFIAPI\r
 UdpIoFreeIo (\r
-  IN  UDP_IO           *UdpIo\r
+  IN  UDP_IO  *UdpIo\r
   )\r
 {\r
-  EFI_STATUS           Status;\r
-  UDP_RX_TOKEN         *RxToken;\r
+  EFI_STATUS    Status;\r
+  UDP_RX_TOKEN  *RxToken;\r
 \r
-  ASSERT ((UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) ||\r
-          (UdpIo->UdpVersion == UDP_IO_UDP6_VERSION));\r
+  ASSERT (\r
+    (UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) ||\r
+    (UdpIo->UdpVersion == UDP_IO_UDP6_VERSION)\r
+    );\r
 \r
   //\r
   // Cancel all the sent datagram and receive requests. The\r
@@ -826,7 +829,6 @@ UdpIoFreeIo (
   UdpIoCancelDgrams (UdpIo, EFI_ABORTED, NULL, NULL);\r
 \r
   if (UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) {\r
-\r
     if ((RxToken = UdpIo->RecvRequest) != NULL) {\r
       Status = UdpIo->Protocol.Udp4->Cancel (UdpIo->Protocol.Udp4, &RxToken->Token.Udp4);\r
       if (EFI_ERROR (Status)) {\r
@@ -856,9 +858,7 @@ UdpIoFreeIo (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
-\r
   } else {\r
-\r
     if ((RxToken = UdpIo->RecvRequest) != NULL) {\r
       Status = UdpIo->Protocol.Udp6->Cancel (UdpIo->Protocol.Udp6, &RxToken->Token.Udp6);\r
       if (EFI_ERROR (Status)) {\r
@@ -870,11 +870,11 @@ UdpIoFreeIo (
     // Close then destroy the Udp6 child\r
     //\r
     Status = gBS->CloseProtocol (\r
-               UdpIo->UdpHandle,\r
-               &gEfiUdp6ProtocolGuid,\r
-               UdpIo->Image,\r
-               UdpIo->Controller\r
-               );\r
+                    UdpIo->UdpHandle,\r
+                    &gEfiUdp6ProtocolGuid,\r
+                    UdpIo->Image,\r
+                    UdpIo->Controller\r
+                    );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -890,7 +890,7 @@ UdpIoFreeIo (
     }\r
   }\r
 \r
-  if (!IsListEmpty(&UdpIo->Link)) {\r
+  if (!IsListEmpty (&UdpIo->Link)) {\r
     RemoveEntryList (&UdpIo->Link);\r
   }\r
 \r
@@ -898,7 +898,6 @@ UdpIoFreeIo (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Clean up the UDP_IO without freeing it. The function is called when\r
   user wants to re-use the UDP_IO later.\r
@@ -914,13 +913,15 @@ UdpIoFreeIo (
 VOID\r
 EFIAPI\r
 UdpIoCleanIo (\r
-  IN  UDP_IO                *UdpIo\r
+  IN  UDP_IO  *UdpIo\r
   )\r
 {\r
-  UDP_RX_TOKEN              *RxToken;\r
+  UDP_RX_TOKEN  *RxToken;\r
 \r
-  ASSERT ((UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) ||\r
-          (UdpIo->UdpVersion == UDP_IO_UDP6_VERSION));\r
+  ASSERT (\r
+    (UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) ||\r
+    (UdpIo->UdpVersion == UDP_IO_UDP6_VERSION)\r
+    );\r
 \r
   //\r
   // Cancel all the sent datagram and receive requests.\r
@@ -933,7 +934,6 @@ UdpIoCleanIo (
     }\r
 \r
     UdpIo->Protocol.Udp4->Configure (UdpIo->Protocol.Udp4, NULL);\r
-\r
   } else {\r
     if ((RxToken = UdpIo->RecvRequest) != NULL) {\r
       UdpIo->Protocol.Udp6->Cancel (UdpIo->Protocol.Udp6, &RxToken->Token.Udp6);\r
@@ -969,19 +969,21 @@ UdpIoCleanIo (
 EFI_STATUS\r
 EFIAPI\r
 UdpIoSendDatagram (\r
-  IN  UDP_IO                *UdpIo,\r
-  IN  NET_BUF               *Packet,\r
-  IN  UDP_END_POINT         *EndPoint OPTIONAL,\r
-  IN  EFI_IP_ADDRESS        *Gateway  OPTIONAL,\r
-  IN  UDP_IO_CALLBACK       CallBack,\r
-  IN  VOID                  *Context\r
+  IN  UDP_IO           *UdpIo,\r
+  IN  NET_BUF          *Packet,\r
+  IN  UDP_END_POINT    *EndPoint OPTIONAL,\r
+  IN  EFI_IP_ADDRESS   *Gateway  OPTIONAL,\r
+  IN  UDP_IO_CALLBACK  CallBack,\r
+  IN  VOID             *Context\r
   )\r
 {\r
-  UDP_TX_TOKEN              *TxToken;\r
-  EFI_STATUS                Status;\r
+  UDP_TX_TOKEN  *TxToken;\r
+  EFI_STATUS    Status;\r
 \r
-  ASSERT ((UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) ||\r
-          (UdpIo->UdpVersion == UDP_IO_UDP6_VERSION));\r
+  ASSERT (\r
+    (UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) ||\r
+    (UdpIo->UdpVersion == UDP_IO_UDP6_VERSION)\r
+    );\r
 \r
   TxToken = UdpIoCreateTxToken (UdpIo, Packet, EndPoint, Gateway, CallBack, Context);\r
 \r
@@ -1010,7 +1012,6 @@ UdpIoSendDatagram (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   The select function to cancel a single sent datagram.\r
 \r
@@ -1023,13 +1024,13 @@ UdpIoSendDatagram (
 BOOLEAN\r
 EFIAPI\r
 UdpIoCancelSingleDgram (\r
-  IN UDP_TX_TOKEN           *Token,\r
-  IN VOID                   *Context\r
+  IN UDP_TX_TOKEN  *Token,\r
+  IN VOID          *Context\r
   )\r
 {\r
-  NET_BUF                   *Packet;\r
+  NET_BUF  *Packet;\r
 \r
-  Packet = (NET_BUF *) Context;\r
+  Packet = (NET_BUF *)Context;\r
 \r
   if (Token->Packet == Packet) {\r
     return TRUE;\r
@@ -1048,8 +1049,8 @@ UdpIoCancelSingleDgram (
 VOID\r
 EFIAPI\r
 UdpIoCancelSentDatagram (\r
-  IN  UDP_IO                *UdpIo,\r
-  IN  NET_BUF               *Packet\r
+  IN  UDP_IO   *UdpIo,\r
+  IN  NET_BUF  *Packet\r
   )\r
 {\r
   UdpIoCancelDgrams (UdpIo, EFI_ABORTED, UdpIoCancelSingleDgram, Packet);\r
@@ -1081,17 +1082,19 @@ UdpIoCancelSentDatagram (
 EFI_STATUS\r
 EFIAPI\r
 UdpIoRecvDatagram (\r
-  IN  UDP_IO                *UdpIo,\r
-  IN  UDP_IO_CALLBACK       CallBack,\r
-  IN  VOID                  *Context,\r
-  IN  UINT32                HeadLen\r
+  IN  UDP_IO           *UdpIo,\r
+  IN  UDP_IO_CALLBACK  CallBack,\r
+  IN  VOID             *Context,\r
+  IN  UINT32           HeadLen\r
   )\r
 {\r
-  UDP_RX_TOKEN              *RxToken;\r
-  EFI_STATUS                Status;\r
+  UDP_RX_TOKEN  *RxToken;\r
+  EFI_STATUS    Status;\r
 \r
-  ASSERT ((UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) ||\r
-          (UdpIo->UdpVersion == UDP_IO_UDP6_VERSION));\r
+  ASSERT (\r
+    (UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) ||\r
+    (UdpIo->UdpVersion == UDP_IO_UDP6_VERSION)\r
+    );\r
 \r
   if (UdpIo->RecvRequest != NULL) {\r
     return EFI_ALREADY_STARTED;\r
index fe85c3bc239b1d075a90b945470f97b9cefcb613..190d5b5c65f1afda3273d5f99238f81cb8fce41d 100644 (file)
@@ -11,7 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // EFI Component Name Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL   gMnpComponentName = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gMnpComponentName = {\r
   MnpComponentNameGetDriverName,\r
   MnpComponentNameGetControllerName,\r
   "eng"\r
@@ -21,12 +21,12 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL   gMnpComponentName =
 // EFI Component Name 2 Protocol\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gMnpComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) MnpComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) MnpComponentNameGetControllerName,\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)MnpComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)MnpComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE      mMnpDriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mMnpDriverNameTable[] = {\r
   {\r
     "eng;en",\r
     L"MNP Network Service Driver"\r
@@ -37,7 +37,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE      mMnpDriverNameTable[
   }\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE    *gMnpControllerNameTable = NULL;\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  *gMnpControllerNameTable = NULL;\r
 \r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
@@ -81,9 +81,9 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE    *gMnpControllerNameTab
 EFI_STATUS\r
 EFIAPI\r
 MnpComponentNameGetDriverName (\r
-  IN     EFI_COMPONENT_NAME_PROTOCOL   *This,\r
-  IN     CHAR8                         *Language,\r
-     OUT CHAR16                        **DriverName\r
+  IN     EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN     CHAR8                        *Language,\r
+  OUT CHAR16                          **DriverName\r
   )\r
 {\r
   return LookupUnicodeString2 (\r
@@ -91,7 +91,7 @@ MnpComponentNameGetDriverName (
            This->SupportedLanguages,\r
            mMnpDriverNameTable,\r
            DriverName,\r
-           (BOOLEAN) (This == &gMnpComponentName)\r
+           (BOOLEAN)(This == &gMnpComponentName)\r
            );\r
 }\r
 \r
@@ -107,7 +107,7 @@ MnpComponentNameGetDriverName (
 **/\r
 EFI_STATUS\r
 UpdateName (\r
-  IN   EFI_MANAGED_NETWORK_PROTOCOL     *Mnp\r
+  IN   EFI_MANAGED_NETWORK_PROTOCOL  *Mnp\r
   )\r
 {\r
   EFI_STATUS                       Status;\r
@@ -146,6 +146,7 @@ UpdateName (
                   SnpModeData.CurrentAddress.Addr[Index]\r
                   );\r
     }\r
+\r
     ASSERT (OffSet > 0);\r
     //\r
     // Remove the last '-'\r
@@ -267,11 +268,11 @@ UpdateName (
 EFI_STATUS\r
 EFIAPI\r
 MnpComponentNameGetControllerName (\r
-  IN     EFI_COMPONENT_NAME_PROTOCOL   *This,\r
-  IN     EFI_HANDLE                    ControllerHandle,\r
-  IN     EFI_HANDLE                    ChildHandle        OPTIONAL,\r
-  IN     CHAR8                         *Language,\r
-     OUT CHAR16                        **ControllerName\r
+  IN     EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN     EFI_HANDLE                   ControllerHandle,\r
+  IN     EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN     CHAR8                        *Language,\r
+  OUT CHAR16                          **ControllerName\r
   )\r
 {\r
   EFI_STATUS                    Status;\r
index 201c6da11a5e7c88310550c09dd05b38321b166f..9718b60a8f9e3e3683fa5615f3996a0ecd283850 100644 (file)
@@ -12,9 +12,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Protocol/ComponentName.h>\r
 #include <Protocol/ComponentName2.h>\r
 \r
-extern EFI_COMPONENT_NAME2_PROTOCOL gMnpComponentName2;\r
-extern EFI_COMPONENT_NAME_PROTOCOL  gMnpComponentName;\r
-extern EFI_UNICODE_STRING_TABLE     *gMnpControllerNameTable;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gMnpComponentName2;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gMnpComponentName;\r
+extern EFI_UNICODE_STRING_TABLE      *gMnpControllerNameTable;\r
 \r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
@@ -58,9 +58,9 @@ extern EFI_UNICODE_STRING_TABLE     *gMnpControllerNameTable;
 EFI_STATUS\r
 EFIAPI\r
 MnpComponentNameGetDriverName (\r
-  IN     EFI_COMPONENT_NAME_PROTOCOL   *This,\r
-  IN     CHAR8                         *Language,\r
-     OUT CHAR16                        **DriverName\r
+  IN     EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN     CHAR8                        *Language,\r
+  OUT CHAR16                          **DriverName\r
   );\r
 \r
 /**\r
@@ -134,11 +134,11 @@ MnpComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 MnpComponentNameGetControllerName (\r
-  IN     EFI_COMPONENT_NAME_PROTOCOL   *This,\r
-  IN     EFI_HANDLE                    ControllerHandle,\r
-  IN     EFI_HANDLE                    ChildHandle        OPTIONAL,\r
-  IN     CHAR8                         *Language,\r
-     OUT CHAR16                        **ControllerName\r
+  IN     EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN     EFI_HANDLE                   ControllerHandle,\r
+  IN     EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN     CHAR8                        *Language,\r
+  OUT CHAR16                          **ControllerName\r
   );\r
 \r
 #endif\r
index 1e9b3905860eb14c659155707e6feefb3ecb3be1..93587d53aa75a918bf39e908353fe0172ab56c4b 100644 (file)
@@ -9,12 +9,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include "MnpImpl.h"\r
 #include "MnpVlan.h"\r
 \r
-EFI_SERVICE_BINDING_PROTOCOL    mMnpServiceBindingProtocol = {\r
+EFI_SERVICE_BINDING_PROTOCOL  mMnpServiceBindingProtocol = {\r
   MnpServiceBindingCreateChild,\r
   MnpServiceBindingDestroyChild\r
 };\r
 \r
-EFI_MANAGED_NETWORK_PROTOCOL    mMnpProtocolTemplate = {\r
+EFI_MANAGED_NETWORK_PROTOCOL  mMnpProtocolTemplate = {\r
   MnpGetModeData,\r
   MnpConfigure,\r
   MnpMcastIpToMac,\r
@@ -25,7 +25,7 @@ EFI_MANAGED_NETWORK_PROTOCOL    mMnpProtocolTemplate = {
   MnpPoll\r
 };\r
 \r
-EFI_MANAGED_NETWORK_CONFIG_DATA mMnpDefaultConfigData = {\r
+EFI_MANAGED_NETWORK_CONFIG_DATA  mMnpDefaultConfigData = {\r
   10000000,\r
   10000000,\r
   0,\r
@@ -52,8 +52,8 @@ EFI_MANAGED_NETWORK_CONFIG_DATA mMnpDefaultConfigData = {
 **/\r
 EFI_STATUS\r
 MnpAddFreeNbuf (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData,\r
-  IN     UINTN             Count\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData,\r
+  IN     UINTN            Count\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -88,7 +88,6 @@ MnpAddFreeNbuf (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Allocate a free NET_BUF from MnpDeviceData->FreeNbufQue. If there is none\r
   in the queue, first try to allocate some and add them into the queue, then\r
@@ -102,13 +101,13 @@ MnpAddFreeNbuf (
 **/\r
 NET_BUF *\r
 MnpAllocNbuf (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
-  NET_BUF_QUEUE *FreeNbufQue;\r
-  NET_BUF       *Nbuf;\r
-  EFI_TPL       OldTpl;\r
+  EFI_STATUS     Status;\r
+  NET_BUF_QUEUE  *FreeNbufQue;\r
+  NET_BUF        *Nbuf;\r
+  EFI_TPL        OldTpl;\r
 \r
   NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE);\r
 \r
@@ -122,8 +121,8 @@ MnpAllocNbuf (
     if ((MnpDeviceData->NbufCnt + MNP_NET_BUFFER_INCREASEMENT) > MNP_MAX_NET_BUFFER_NUM) {\r
       DEBUG (\r
         (DEBUG_ERROR,\r
-        "MnpAllocNbuf: The maximum NET_BUF size is reached for MNP driver instance %p.\n",\r
-        MnpDeviceData)\r
+         "MnpAllocNbuf: The maximum NET_BUF size is reached for MNP driver instance %p.\n",\r
+         MnpDeviceData)\r
         );\r
 \r
       Nbuf = NULL;\r
@@ -134,8 +133,8 @@ MnpAllocNbuf (
     if (EFI_ERROR (Status)) {\r
       DEBUG (\r
         (DEBUG_ERROR,\r
-        "MnpAllocNbuf: Failed to add NET_BUFs into the FreeNbufQue, %r.\n",\r
-        Status)\r
+         "MnpAllocNbuf: Failed to add NET_BUFs into the FreeNbufQue, %r.\n",\r
+         Status)\r
         );\r
 \r
       //\r
@@ -160,7 +159,6 @@ ON_EXIT:
   return Nbuf;\r
 }\r
 \r
-\r
 /**\r
   Try to reclaim the Nbuf into the buffer pool.\r
 \r
@@ -170,8 +168,8 @@ ON_EXIT:
 **/\r
 VOID\r
 MnpFreeNbuf (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData,\r
-  IN OUT NET_BUF           *Nbuf\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData,\r
+  IN OUT NET_BUF          *Nbuf\r
   )\r
 {\r
   EFI_TPL  OldTpl;\r
@@ -215,26 +213,27 @@ MnpFreeNbuf (
 **/\r
 EFI_STATUS\r
 MnpAddFreeTxBuf (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData,\r
-  IN     UINTN             Count\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData,\r
+  IN     UINTN            Count\r
   )\r
 {\r
-  EFI_STATUS        Status;\r
-  UINT32            Index;\r
-  MNP_TX_BUF_WRAP   *TxBufWrap;\r
+  EFI_STATUS       Status;\r
+  UINT32           Index;\r
+  MNP_TX_BUF_WRAP  *TxBufWrap;\r
 \r
   NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE);\r
   ASSERT ((Count > 0) && (MnpDeviceData->BufferLength > 0));\r
 \r
   Status = EFI_SUCCESS;\r
   for (Index = 0; Index < Count; Index++) {\r
-    TxBufWrap = (MNP_TX_BUF_WRAP*) AllocatePool (OFFSET_OF (MNP_TX_BUF_WRAP, TxBuf) + MnpDeviceData->BufferLength );\r
+    TxBufWrap = (MNP_TX_BUF_WRAP *)AllocatePool (OFFSET_OF (MNP_TX_BUF_WRAP, TxBuf) + MnpDeviceData->BufferLength);\r
     if (TxBufWrap == NULL) {\r
       DEBUG ((DEBUG_ERROR, "MnpAddFreeTxBuf: TxBuf Alloc failed.\n"));\r
 \r
       Status = EFI_OUT_OF_RESOURCES;\r
       break;\r
     }\r
+\r
     DEBUG ((DEBUG_INFO, "MnpAddFreeTxBuf: Add TxBufWrap %p, TxBuf %p\n", TxBufWrap, TxBufWrap->TxBuf));\r
     TxBufWrap->Signature = MNP_TX_BUF_WRAP_SIGNATURE;\r
     TxBufWrap->InUse     = FALSE;\r
@@ -259,14 +258,14 @@ MnpAddFreeTxBuf (
 **/\r
 UINT8 *\r
 MnpAllocTxBuf (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData\r
   )\r
 {\r
-  EFI_TPL           OldTpl;\r
-  UINT8             *TxBuf;\r
-  EFI_STATUS        Status;\r
-  LIST_ENTRY        *Entry;\r
-  MNP_TX_BUF_WRAP   *TxBufWrap;\r
+  EFI_TPL          OldTpl;\r
+  UINT8            *TxBuf;\r
+  EFI_STATUS       Status;\r
+  LIST_ENTRY       *Entry;\r
+  MNP_TX_BUF_WRAP  *TxBufWrap;\r
 \r
   NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE);\r
 \r
@@ -289,8 +288,8 @@ MnpAllocTxBuf (
       if ((MnpDeviceData->TxBufCount + MNP_TX_BUFFER_INCREASEMENT) > MNP_MAX_TX_BUFFER_NUM) {\r
         DEBUG (\r
           (DEBUG_ERROR,\r
-          "MnpAllocTxBuf: The maximum TxBuf size is reached for MNP driver instance %p.\n",\r
-          MnpDeviceData)\r
+           "MnpAllocTxBuf: The maximum TxBuf size is reached for MNP driver instance %p.\n",\r
+           MnpDeviceData)\r
           );\r
 \r
         TxBuf = NULL;\r
@@ -301,8 +300,8 @@ MnpAllocTxBuf (
       if (IsListEmpty (&MnpDeviceData->FreeTxBufList)) {\r
         DEBUG (\r
           (DEBUG_ERROR,\r
-          "MnpAllocNbuf: Failed to add TxBuf into the FreeTxBufList, %r.\n",\r
-          Status)\r
+           "MnpAllocNbuf: Failed to add TxBuf into the FreeTxBufList, %r.\n",\r
+           Status)\r
           );\r
 \r
         TxBuf = NULL;\r
@@ -314,9 +313,9 @@ MnpAllocTxBuf (
   ASSERT (!IsListEmpty (&MnpDeviceData->FreeTxBufList));\r
   Entry = MnpDeviceData->FreeTxBufList.ForwardLink;\r
   RemoveEntryList (MnpDeviceData->FreeTxBufList.ForwardLink);\r
-  TxBufWrap = NET_LIST_USER_STRUCT_S (Entry, MNP_TX_BUF_WRAP, WrapEntry, MNP_TX_BUF_WRAP_SIGNATURE);\r
+  TxBufWrap        = NET_LIST_USER_STRUCT_S (Entry, MNP_TX_BUF_WRAP, WrapEntry, MNP_TX_BUF_WRAP_SIGNATURE);\r
   TxBufWrap->InUse = TRUE;\r
-  TxBuf = TxBufWrap->TxBuf;\r
+  TxBuf            = TxBufWrap->TxBuf;\r
 \r
 ON_EXIT:\r
   gBS->RestoreTPL (OldTpl);\r
@@ -333,12 +332,12 @@ ON_EXIT:
 **/\r
 VOID\r
 MnpFreeTxBuf (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData,\r
-  IN OUT UINT8             *TxBuf\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData,\r
+  IN OUT UINT8            *TxBuf\r
   )\r
 {\r
-  MNP_TX_BUF_WRAP   *TxBufWrap;\r
-  EFI_TPL           OldTpl;\r
+  MNP_TX_BUF_WRAP  *TxBufWrap;\r
+  EFI_TPL          OldTpl;\r
 \r
   NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE);\r
 \r
@@ -350,7 +349,7 @@ MnpFreeTxBuf (
   if (TxBufWrap->Signature != MNP_TX_BUF_WRAP_SIGNATURE) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "MnpFreeTxBuf: Signature check failed in MnpFreeTxBuf.\n")\r
+       "MnpFreeTxBuf: Signature check failed in MnpFreeTxBuf.\n")\r
       );\r
     return;\r
   }\r
@@ -358,7 +357,7 @@ MnpFreeTxBuf (
   if (!TxBufWrap->InUse) {\r
     DEBUG (\r
       (DEBUG_WARN,\r
-      "MnpFreeTxBuf: Duplicated recycle report from SNP.\n")\r
+       "MnpFreeTxBuf: Duplicated recycle report from SNP.\n")\r
       );\r
     return;\r
   }\r
@@ -380,19 +379,19 @@ MnpFreeTxBuf (
 **/\r
 EFI_STATUS\r
 MnpRecycleTxBuf (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData\r
   )\r
 {\r
-  UINT8                         *TxBuf;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL   *Snp;\r
-  EFI_STATUS                    Status;\r
+  UINT8                        *TxBuf;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL  *Snp;\r
+  EFI_STATUS                   Status;\r
 \r
   Snp = MnpDeviceData->Snp;\r
   ASSERT (Snp != NULL);\r
 \r
   do {\r
-    TxBuf = NULL;\r
-    Status = Snp->GetStatus (Snp, NULL, (VOID **) &TxBuf);\r
+    TxBuf  = NULL;\r
+    Status = Snp->GetStatus (Snp, NULL, (VOID **)&TxBuf);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -419,14 +418,14 @@ MnpRecycleTxBuf (
 **/\r
 EFI_STATUS\r
 MnpInitializeDeviceData (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData,\r
-  IN     EFI_HANDLE        ImageHandle,\r
-  IN     EFI_HANDLE        ControllerHandle\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData,\r
+  IN     EFI_HANDLE       ImageHandle,\r
+  IN     EFI_HANDLE       ControllerHandle\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL *Snp;\r
-  EFI_SIMPLE_NETWORK_MODE     *SnpMode;\r
+  EFI_STATUS                   Status;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL  *Snp;\r
+  EFI_SIMPLE_NETWORK_MODE      *SnpMode;\r
 \r
   MnpDeviceData->Signature        = MNP_DEVICE_DATA_SIGNATURE;\r
   MnpDeviceData->ImageHandle      = ImageHandle;\r
@@ -443,7 +442,7 @@ MnpInitializeDeviceData (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiSimpleNetworkProtocolGuid,\r
-                  (VOID **) &Snp,\r
+                  (VOID **)&Snp,\r
                   ImageHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -594,17 +593,16 @@ ERROR:
     // Close the Simple Network Protocol.\r
     //\r
     gBS->CloseProtocol (\r
-          ControllerHandle,\r
-          &gEfiSimpleNetworkProtocolGuid,\r
-          ImageHandle,\r
-          ControllerHandle\r
-          );\r
+           ControllerHandle,\r
+           &gEfiSimpleNetworkProtocolGuid,\r
+           ImageHandle,\r
+           ControllerHandle\r
+           );\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Destroy the MNP device context data.\r
 \r
@@ -614,13 +612,13 @@ ERROR:
 **/\r
 VOID\r
 MnpDestroyDeviceData (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData,\r
-  IN     EFI_HANDLE        ImageHandle\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData,\r
+  IN     EFI_HANDLE       ImageHandle\r
   )\r
 {\r
-  LIST_ENTRY         *Entry;\r
-  LIST_ENTRY         *NextEntry;\r
-  MNP_TX_BUF_WRAP    *TxBufWrap;\r
+  LIST_ENTRY       *Entry;\r
+  LIST_ENTRY       *NextEntry;\r
+  MNP_TX_BUF_WRAP  *TxBufWrap;\r
 \r
   NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE);\r
 \r
@@ -646,7 +644,7 @@ MnpDestroyDeviceData (
   //\r
   // Free the Tx buffer pool.\r
   //\r
-  NET_LIST_FOR_EACH_SAFE(Entry, NextEntry, &MnpDeviceData->AllTxBufList) {\r
+  NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, &MnpDeviceData->AllTxBufList) {\r
     TxBufWrap = NET_LIST_USER_STRUCT (Entry, MNP_TX_BUF_WRAP, AllEntry);\r
     RemoveEntryList (Entry);\r
     FreePool (TxBufWrap);\r
@@ -677,7 +675,6 @@ MnpDestroyDeviceData (
          );\r
 }\r
 \r
-\r
 /**\r
   Create mnp service context data.\r
 \r
@@ -691,9 +688,9 @@ MnpDestroyDeviceData (
 **/\r
 MNP_SERVICE_DATA *\r
 MnpCreateServiceData (\r
-  IN MNP_DEVICE_DATA     *MnpDeviceData,\r
-  IN UINT16              VlanId,\r
-  IN UINT8                Priority OPTIONAL\r
+  IN MNP_DEVICE_DATA  *MnpDeviceData,\r
+  IN UINT16           VlanId,\r
+  IN UINT8            Priority OPTIONAL\r
   )\r
 {\r
   EFI_HANDLE                MnpServiceHandle;\r
@@ -753,7 +750,7 @@ MnpCreateServiceData (
     Status = gBS->OpenProtocol (\r
                     MnpDeviceData->ControllerHandle,\r
                     &gEfiVlanConfigProtocolGuid,\r
-                    (VOID **) &VlanConfig,\r
+                    (VOID **)&VlanConfig,\r
                     MnpDeviceData->ImageHandle,\r
                     MnpServiceHandle,\r
                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -808,7 +805,7 @@ Exit:
 **/\r
 EFI_STATUS\r
 MnpDestroyServiceData (\r
-  IN OUT MNP_SERVICE_DATA    *MnpServiceData\r
+  IN OUT MNP_SERVICE_DATA  *MnpServiceData\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -881,15 +878,15 @@ MnpDestroyServiceData (
 EFI_STATUS\r
 EFIAPI\r
 MnpDestoryChildEntry (\r
-  IN LIST_ENTRY         *Entry,\r
-  IN VOID               *Context\r
+  IN LIST_ENTRY  *Entry,\r
+  IN VOID        *Context\r
   )\r
 {\r
   MNP_INSTANCE_DATA             *Instance;\r
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
 \r
-  ServiceBinding = (EFI_SERVICE_BINDING_PROTOCOL *) Context;\r
-  Instance = CR (Entry, MNP_INSTANCE_DATA, InstEntry, MNP_INSTANCE_DATA_SIGNATURE);\r
+  ServiceBinding = (EFI_SERVICE_BINDING_PROTOCOL *)Context;\r
+  Instance       = CR (Entry, MNP_INSTANCE_DATA, InstEntry, MNP_INSTANCE_DATA_SIGNATURE);\r
   return ServiceBinding->DestroyChild (ServiceBinding, Instance->Handle);\r
 }\r
 \r
@@ -904,12 +901,12 @@ MnpDestoryChildEntry (
 **/\r
 EFI_STATUS\r
 MnpDestroyServiceChild (\r
-  IN OUT MNP_SERVICE_DATA    *MnpServiceData\r
+  IN OUT MNP_SERVICE_DATA  *MnpServiceData\r
   )\r
 {\r
-  LIST_ENTRY                         *List;\r
-  EFI_STATUS                         Status;\r
-  UINTN                              ListLength;\r
+  LIST_ENTRY  *List;\r
+  EFI_STATUS  Status;\r
+  UINTN       ListLength;\r
 \r
   List = &MnpServiceData->ChildrenList;\r
 \r
@@ -919,7 +916,7 @@ MnpDestroyServiceChild (
              &MnpServiceData->ServiceBinding,\r
              &ListLength\r
              );\r
-  if (EFI_ERROR (Status) || ListLength != 0) {\r
+  if (EFI_ERROR (Status) || (ListLength != 0)) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
@@ -937,8 +934,8 @@ MnpDestroyServiceChild (
 **/\r
 MNP_SERVICE_DATA *\r
 MnpFindServiceData (\r
-  IN MNP_DEVICE_DATA     *MnpDeviceData,\r
-  IN UINT16              VlanId\r
+  IN MNP_DEVICE_DATA  *MnpDeviceData,\r
+  IN UINT16           VlanId\r
   )\r
 {\r
   LIST_ENTRY        *Entry;\r
@@ -967,8 +964,8 @@ MnpFindServiceData (
 **/\r
 VOID\r
 MnpInitializeInstanceData (\r
-  IN     MNP_SERVICE_DATA    *MnpServiceData,\r
-  IN OUT MNP_INSTANCE_DATA   *Instance\r
+  IN     MNP_SERVICE_DATA   *MnpServiceData,\r
+  IN OUT MNP_INSTANCE_DATA  *Instance\r
   )\r
 {\r
   NET_CHECK_SIGNATURE (MnpServiceData, MNP_SERVICE_DATA_SIGNATURE);\r
@@ -1007,7 +1004,6 @@ MnpInitializeInstanceData (
   Instance->MnpServiceData = MnpServiceData;\r
 }\r
 \r
-\r
 /**\r
   Check whether the token specified by Arg matches the token in Item.\r
 \r
@@ -1025,16 +1021,16 @@ MnpInitializeInstanceData (
 EFI_STATUS\r
 EFIAPI\r
 MnpTokenExist (\r
-  IN NET_MAP         *Map,\r
-  IN NET_MAP_ITEM    *Item,\r
-  IN VOID            *Arg\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Arg\r
   )\r
 {\r
   EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token;\r
   EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *TokenInItem;\r
 \r
-  Token       = (EFI_MANAGED_NETWORK_COMPLETION_TOKEN *) Arg;\r
-  TokenInItem = (EFI_MANAGED_NETWORK_COMPLETION_TOKEN *) Item->Key;\r
+  Token       = (EFI_MANAGED_NETWORK_COMPLETION_TOKEN *)Arg;\r
+  TokenInItem = (EFI_MANAGED_NETWORK_COMPLETION_TOKEN *)Item->Key;\r
 \r
   if ((Token == TokenInItem) || (Token->Event == TokenInItem->Event)) {\r
     //\r
@@ -1065,9 +1061,9 @@ MnpTokenExist (
 EFI_STATUS\r
 EFIAPI\r
 MnpCancelTokens (\r
-  IN OUT NET_MAP         *Map,\r
-  IN OUT NET_MAP_ITEM    *Item,\r
-  IN     VOID            *Arg\r
+  IN OUT NET_MAP       *Map,\r
+  IN OUT NET_MAP_ITEM  *Item,\r
+  IN     VOID          *Arg\r
   )\r
 {\r
   EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *TokenToCancel;\r
@@ -1079,7 +1075,7 @@ MnpCancelTokens (
     return EFI_SUCCESS;\r
   }\r
 \r
-  TokenToCancel = (EFI_MANAGED_NETWORK_COMPLETION_TOKEN *) Item->Key;\r
+  TokenToCancel = (EFI_MANAGED_NETWORK_COMPLETION_TOKEN *)Item->Key;\r
 \r
   //\r
   // Remove the item from the map.\r
@@ -1102,7 +1098,6 @@ MnpCancelTokens (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Start and initialize the simple network.\r
 \r
@@ -1114,7 +1109,7 @@ MnpCancelTokens (
 **/\r
 EFI_STATUS\r
 MnpStartSnp (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL     *Snp\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *Snp\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -1136,7 +1131,6 @@ MnpStartSnp (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Stop the simple network.\r
 \r
@@ -1148,11 +1142,11 @@ MnpStartSnp (
 **/\r
 EFI_STATUS\r
 MnpStopSnp (\r
-  IN  MNP_DEVICE_DATA   *MnpDeviceData\r
+  IN  MNP_DEVICE_DATA  *MnpDeviceData\r
   )\r
 {\r
-  EFI_STATUS  Status;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL     *Snp;\r
+  EFI_STATUS                   Status;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL  *Snp;\r
 \r
   Snp = MnpDeviceData->Snp;\r
   ASSERT (Snp != NULL);\r
@@ -1168,7 +1162,7 @@ MnpStopSnp (
   //\r
   // Shut down the simple network.\r
   //\r
-  Status  = Snp->Shutdown (Snp);\r
+  Status = Snp->Shutdown (Snp);\r
   if (!EFI_ERROR (Status)) {\r
     //\r
     // Stop the simple network.\r
@@ -1179,7 +1173,6 @@ MnpStopSnp (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Start the managed network, this function is called when one instance is configured\r
   or reconfigured.\r
@@ -1196,14 +1189,14 @@ MnpStopSnp (
 **/\r
 EFI_STATUS\r
 MnpStart (\r
-  IN OUT MNP_SERVICE_DATA    *MnpServiceData,\r
-  IN     BOOLEAN             IsConfigUpdate,\r
-  IN     BOOLEAN             EnableSystemPoll\r
+  IN OUT MNP_SERVICE_DATA  *MnpServiceData,\r
+  IN     BOOLEAN           IsConfigUpdate,\r
+  IN     BOOLEAN           EnableSystemPoll\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
-  EFI_TIMER_DELAY TimerOpType;\r
-  MNP_DEVICE_DATA *MnpDeviceData;\r
+  EFI_STATUS       Status;\r
+  EFI_TIMER_DELAY  TimerOpType;\r
+  MNP_DEVICE_DATA  *MnpDeviceData;\r
 \r
   NET_CHECK_SIGNATURE (MnpServiceData, MNP_SERVICE_DATA_SIGNATURE);\r
 \r
@@ -1238,8 +1231,8 @@ MnpStart (
       if (EFI_ERROR (Status)) {\r
         DEBUG (\r
           (DEBUG_ERROR,\r
-          "MnpStart, gBS->SetTimer for TimeoutCheckTimer %r.\n",\r
-          Status)\r
+           "MnpStart, gBS->SetTimer for TimeoutCheckTimer %r.\n",\r
+           Status)\r
           );\r
 \r
         goto ErrorExit;\r
@@ -1256,8 +1249,8 @@ MnpStart (
       if (EFI_ERROR (Status)) {\r
         DEBUG (\r
           (DEBUG_ERROR,\r
-          "MnpStart, gBS->SetTimer for MediaDetectTimer %r.\n",\r
-          Status)\r
+           "MnpStart, gBS->SetTimer for MediaDetectTimer %r.\n",\r
+           Status)\r
           );\r
 \r
         goto ErrorExit;\r
@@ -1272,7 +1265,7 @@ MnpStart (
     //\r
     TimerOpType = EnableSystemPoll ? TimerPeriodic : TimerCancel;\r
 \r
-    Status      = gBS->SetTimer (MnpDeviceData->PollTimer, TimerOpType, MNP_SYS_POLL_INTERVAL);\r
+    Status = gBS->SetTimer (MnpDeviceData->PollTimer, TimerOpType, MNP_SYS_POLL_INTERVAL);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "MnpStart: gBS->SetTimer for PollTimer failed, %r.\n", Status));\r
 \r
@@ -1291,7 +1284,6 @@ ErrorExit:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Stop the managed network.\r
 \r
@@ -1303,11 +1295,11 @@ ErrorExit:
 **/\r
 EFI_STATUS\r
 MnpStop (\r
-  IN OUT MNP_SERVICE_DATA    *MnpServiceData\r
+  IN OUT MNP_SERVICE_DATA  *MnpServiceData\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
-  MNP_DEVICE_DATA *MnpDeviceData;\r
+  EFI_STATUS       Status;\r
+  MNP_DEVICE_DATA  *MnpDeviceData;\r
 \r
   NET_CHECK_SIGNATURE (MnpServiceData, MNP_SERVICE_DATA_SIGNATURE);\r
   MnpDeviceData = MnpServiceData->MnpDeviceData;\r
@@ -1338,7 +1330,7 @@ MnpStop (
     //\r
     //  The system poll in on, cancel the poll timer.\r
     //\r
-    Status  = gBS->SetTimer (MnpDeviceData->PollTimer, TimerCancel, 0);\r
+    Status                          = gBS->SetTimer (MnpDeviceData->PollTimer, TimerCancel, 0);\r
     MnpDeviceData->EnableSystemPoll = FALSE;\r
   }\r
 \r
@@ -1359,7 +1351,6 @@ MnpStop (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Flush the instance's received data.\r
 \r
@@ -1368,11 +1359,11 @@ MnpStop (
 **/\r
 VOID\r
 MnpFlushRcvdDataQueue (\r
-  IN OUT MNP_INSTANCE_DATA   *Instance\r
+  IN OUT MNP_INSTANCE_DATA  *Instance\r
   )\r
 {\r
-  EFI_TPL         OldTpl;\r
-  MNP_RXDATA_WRAP *RxDataWrap;\r
+  EFI_TPL          OldTpl;\r
+  MNP_RXDATA_WRAP  *RxDataWrap;\r
 \r
   NET_CHECK_SIGNATURE (Instance, MNP_INSTANCE_DATA_SIGNATURE);\r
 \r
@@ -1387,7 +1378,7 @@ MnpFlushRcvdDataQueue (
     //\r
     // Recycle the RxDataWrap.\r
     //\r
-    MnpRecycleRxData (NULL, (VOID *) RxDataWrap);\r
+    MnpRecycleRxData (NULL, (VOID *)RxDataWrap);\r
     Instance->RcvdPacketQueueSize--;\r
   }\r
 \r
@@ -1396,7 +1387,6 @@ MnpFlushRcvdDataQueue (
   gBS->RestoreTPL (OldTpl);\r
 }\r
 \r
-\r
 /**\r
   Configure the Instance using ConfigData.\r
 \r
@@ -1412,16 +1402,16 @@ MnpFlushRcvdDataQueue (
 **/\r
 EFI_STATUS\r
 MnpConfigureInstance (\r
-  IN OUT MNP_INSTANCE_DATA                 *Instance,\r
-  IN     EFI_MANAGED_NETWORK_CONFIG_DATA   *ConfigData OPTIONAL\r
+  IN OUT MNP_INSTANCE_DATA                *Instance,\r
+  IN     EFI_MANAGED_NETWORK_CONFIG_DATA  *ConfigData OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  MNP_SERVICE_DATA                *MnpServiceData;\r
-  MNP_DEVICE_DATA                 *MnpDeviceData;\r
-  EFI_MANAGED_NETWORK_CONFIG_DATA *OldConfigData;\r
-  EFI_MANAGED_NETWORK_CONFIG_DATA *NewConfigData;\r
-  BOOLEAN                         IsConfigUpdate;\r
+  EFI_STATUS                       Status;\r
+  MNP_SERVICE_DATA                 *MnpServiceData;\r
+  MNP_DEVICE_DATA                  *MnpDeviceData;\r
+  EFI_MANAGED_NETWORK_CONFIG_DATA  *OldConfigData;\r
+  EFI_MANAGED_NETWORK_CONFIG_DATA  *NewConfigData;\r
+  BOOLEAN                          IsConfigUpdate;\r
 \r
   NET_CHECK_SIGNATURE (Instance, MNP_INSTANCE_DATA_SIGNATURE);\r
 \r
@@ -1432,16 +1422,16 @@ MnpConfigureInstance (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  Status          = EFI_SUCCESS;\r
+  Status = EFI_SUCCESS;\r
 \r
-  MnpServiceData  = Instance->MnpServiceData;\r
-  MnpDeviceData   = MnpServiceData->MnpDeviceData;\r
+  MnpServiceData = Instance->MnpServiceData;\r
+  MnpDeviceData  = MnpServiceData->MnpDeviceData;\r
   NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE);\r
 \r
-  IsConfigUpdate  = (BOOLEAN) ((Instance->Configured) && (ConfigData != NULL));\r
+  IsConfigUpdate = (BOOLEAN)((Instance->Configured) && (ConfigData != NULL));\r
 \r
-  OldConfigData   = &Instance->ConfigData;\r
-  NewConfigData   = ConfigData;\r
+  OldConfigData = &Instance->ConfigData;\r
+  NewConfigData = ConfigData;\r
   if (NewConfigData == NULL) {\r
     //\r
     // Restore back the default config data if a reset of this instance\r
@@ -1513,16 +1503,16 @@ MnpConfigureInstance (
   //\r
   CopyMem (OldConfigData, NewConfigData, sizeof (*OldConfigData));\r
 \r
-  Instance->Configured = (BOOLEAN) (ConfigData != NULL);\r
+  Instance->Configured = (BOOLEAN)(ConfigData != NULL);\r
   if (Instance->Configured) {\r
     //\r
     // The instance is configured, start the Mnp.\r
     //\r
     Status = MnpStart (\r
-              MnpServiceData,\r
-              IsConfigUpdate,\r
-              (BOOLEAN) !NewConfigData->DisableBackgroundPolling\r
-              );\r
+               MnpServiceData,\r
+               IsConfigUpdate,\r
+               (BOOLEAN) !NewConfigData->DisableBackgroundPolling\r
+               );\r
   } else {\r
     //\r
     // The instance is changed to the unconfigured state, stop the Mnp.\r
@@ -1546,19 +1536,19 @@ MnpConfigureInstance (
 **/\r
 EFI_STATUS\r
 MnpConfigReceiveFilters (\r
-  IN MNP_DEVICE_DATA     *MnpDeviceData\r
+  IN MNP_DEVICE_DATA  *MnpDeviceData\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL *Snp;\r
-  EFI_MAC_ADDRESS             *MCastFilter;\r
-  UINT32                      MCastFilterCnt;\r
-  UINT32                      EnableFilterBits;\r
-  UINT32                      DisableFilterBits;\r
-  BOOLEAN                     ResetMCastFilters;\r
-  LIST_ENTRY                  *Entry;\r
-  UINT32                      Index;\r
-  MNP_GROUP_ADDRESS           *GroupAddress;\r
+  EFI_STATUS                   Status;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL  *Snp;\r
+  EFI_MAC_ADDRESS              *MCastFilter;\r
+  UINT32                       MCastFilterCnt;\r
+  UINT32                       EnableFilterBits;\r
+  UINT32                       DisableFilterBits;\r
+  BOOLEAN                      ResetMCastFilters;\r
+  LIST_ENTRY                   *Entry;\r
+  UINT32                       Index;\r
+  MNP_GROUP_ADDRESS            *GroupAddress;\r
 \r
   NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE);\r
 \r
@@ -1607,8 +1597,8 @@ MnpConfigReceiveFilters (
       //\r
       // Allocate pool for the multicast addresses.\r
       //\r
-      MCastFilterCnt  = MnpDeviceData->GroupAddressCount;\r
-      MCastFilter     = AllocatePool (sizeof (EFI_MAC_ADDRESS) * MCastFilterCnt);\r
+      MCastFilterCnt = MnpDeviceData->GroupAddressCount;\r
+      MCastFilter    = AllocatePool (sizeof (EFI_MAC_ADDRESS) * MCastFilterCnt);\r
       if (MCastFilter == NULL) {\r
         DEBUG ((DEBUG_ERROR, "MnpConfigReceiveFilters: Failed to allocate memory resource for MCastFilter.\n"));\r
 \r
@@ -1620,7 +1610,6 @@ MnpConfigReceiveFilters (
       //\r
       Index = 0;\r
       NET_LIST_FOR_EACH (Entry, &MnpDeviceData->GroupAddressList) {\r
-\r
         GroupAddress = NET_LIST_USER_STRUCT (Entry, MNP_GROUP_ADDRESS, AddrEntry);\r
         CopyMem (MCastFilter + Index, &GroupAddress->Address, sizeof (*(MCastFilter + Index)));\r
         Index++;\r
@@ -1670,13 +1659,14 @@ MnpConfigReceiveFilters (
                   MCastFilter\r
                   );\r
   DEBUG_CODE_BEGIN ();\r
-    if (EFI_ERROR (Status)) {\r
-      DEBUG (\r
-        (DEBUG_ERROR,\r
-        "MnpConfigReceiveFilters: Snp->ReceiveFilters failed, %r.\n",\r
-        Status)\r
-        );\r
-    }\r
+  if (EFI_ERROR (Status)) {\r
+    DEBUG (\r
+      (DEBUG_ERROR,\r
+       "MnpConfigReceiveFilters: Snp->ReceiveFilters failed, %r.\n",\r
+       Status)\r
+      );\r
+  }\r
+\r
   DEBUG_CODE_END ();\r
 \r
   if (MCastFilter != NULL) {\r
@@ -1689,7 +1679,6 @@ MnpConfigReceiveFilters (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Add a group address control block which controls the MacAddress for\r
   this instance.\r
@@ -1706,11 +1695,11 @@ MnpConfigReceiveFilters (
 **/\r
 EFI_STATUS\r
 MnpGroupOpAddCtrlBlk (\r
-  IN OUT MNP_INSTANCE_DATA         *Instance,\r
-  IN OUT MNP_GROUP_CONTROL_BLOCK   *CtrlBlk,\r
-  IN OUT MNP_GROUP_ADDRESS         *GroupAddress OPTIONAL,\r
-  IN     EFI_MAC_ADDRESS           *MacAddress,\r
-  IN     UINT32                    HwAddressSize\r
+  IN OUT MNP_INSTANCE_DATA        *Instance,\r
+  IN OUT MNP_GROUP_CONTROL_BLOCK  *CtrlBlk,\r
+  IN OUT MNP_GROUP_ADDRESS        *GroupAddress OPTIONAL,\r
+  IN     EFI_MAC_ADDRESS          *MacAddress,\r
+  IN     UINT32                   HwAddressSize\r
   )\r
 {\r
   MNP_DEVICE_DATA  *MnpDeviceData;\r
@@ -1728,7 +1717,6 @@ MnpGroupOpAddCtrlBlk (
     //\r
     GroupAddress = AllocatePool (sizeof (MNP_GROUP_ADDRESS));\r
     if (GroupAddress == NULL) {\r
-\r
       DEBUG ((DEBUG_ERROR, "MnpGroupOpFormCtrlBlk: Failed to allocate memory resource.\n"));\r
 \r
       return EFI_OUT_OF_RESOURCES;\r
@@ -1757,7 +1745,6 @@ MnpGroupOpAddCtrlBlk (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Delete a group control block from the instance. If the controlled group address's\r
   reference count reaches zero, the group address is removed too.\r
@@ -1770,12 +1757,12 @@ MnpGroupOpAddCtrlBlk (
 **/\r
 BOOLEAN\r
 MnpGroupOpDelCtrlBlk (\r
-  IN MNP_INSTANCE_DATA           *Instance,\r
-  IN MNP_GROUP_CONTROL_BLOCK     *CtrlBlk\r
+  IN MNP_INSTANCE_DATA        *Instance,\r
+  IN MNP_GROUP_CONTROL_BLOCK  *CtrlBlk\r
   )\r
 {\r
-  MNP_DEVICE_DATA   *MnpDeviceData;\r
-  MNP_GROUP_ADDRESS *GroupAddress;\r
+  MNP_DEVICE_DATA    *MnpDeviceData;\r
+  MNP_GROUP_ADDRESS  *GroupAddress;\r
 \r
   NET_CHECK_SIGNATURE (Instance, MNP_INSTANCE_DATA_SIGNATURE);\r
 \r
@@ -1810,7 +1797,6 @@ MnpGroupOpDelCtrlBlk (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   Do the group operations for this instance.\r
 \r
@@ -1828,21 +1814,21 @@ MnpGroupOpDelCtrlBlk (
 **/\r
 EFI_STATUS\r
 MnpGroupOp (\r
-  IN OUT MNP_INSTANCE_DATA         *Instance,\r
-  IN     BOOLEAN                   JoinFlag,\r
-  IN     EFI_MAC_ADDRESS           *MacAddress OPTIONAL,\r
-  IN     MNP_GROUP_CONTROL_BLOCK   *CtrlBlk OPTIONAL\r
+  IN OUT MNP_INSTANCE_DATA        *Instance,\r
+  IN     BOOLEAN                  JoinFlag,\r
+  IN     EFI_MAC_ADDRESS          *MacAddress OPTIONAL,\r
+  IN     MNP_GROUP_CONTROL_BLOCK  *CtrlBlk OPTIONAL\r
   )\r
 {\r
-  MNP_DEVICE_DATA         *MnpDeviceData;\r
-  LIST_ENTRY              *Entry;\r
-  LIST_ENTRY              *NextEntry;\r
-  MNP_GROUP_ADDRESS       *GroupAddress;\r
-  EFI_SIMPLE_NETWORK_MODE *SnpMode;\r
-  MNP_GROUP_CONTROL_BLOCK *NewCtrlBlk;\r
-  EFI_STATUS              Status;\r
-  BOOLEAN                 AddressExist;\r
-  BOOLEAN                 NeedUpdate;\r
+  MNP_DEVICE_DATA          *MnpDeviceData;\r
+  LIST_ENTRY               *Entry;\r
+  LIST_ENTRY               *NextEntry;\r
+  MNP_GROUP_ADDRESS        *GroupAddress;\r
+  EFI_SIMPLE_NETWORK_MODE  *SnpMode;\r
+  MNP_GROUP_CONTROL_BLOCK  *NewCtrlBlk;\r
+  EFI_STATUS               Status;\r
+  BOOLEAN                  AddressExist;\r
+  BOOLEAN                  NeedUpdate;\r
 \r
   NET_CHECK_SIGNATURE (Instance, MNP_INSTANCE_DATA_SIGNATURE);\r
 \r
@@ -1853,8 +1839,8 @@ MnpGroupOp (
     //\r
     // A new group address is to be added.\r
     //\r
-    GroupAddress  = NULL;\r
-    AddressExist  = FALSE;\r
+    GroupAddress = NULL;\r
+    AddressExist = FALSE;\r
 \r
     //\r
     // Allocate memory for the control block.\r
@@ -1885,12 +1871,12 @@ MnpGroupOp (
     // Add the GroupAddress for this instance.\r
     //\r
     Status = MnpGroupOpAddCtrlBlk (\r
-              Instance,\r
-              NewCtrlBlk,\r
-              GroupAddress,\r
-              MacAddress,\r
-              SnpMode->HwAddressSize\r
-              );\r
+               Instance,\r
+               NewCtrlBlk,\r
+               GroupAddress,\r
+               MacAddress,\r
+               SnpMode->HwAddressSize\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -1911,12 +1897,11 @@ MnpGroupOp (
       NeedUpdate = FALSE;\r
 \r
       NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, &Instance->GroupCtrlBlkList) {\r
-\r
         NewCtrlBlk = NET_LIST_USER_STRUCT (\r
-                      Entry,\r
-                      MNP_GROUP_CONTROL_BLOCK,\r
-                      CtrlBlkEntry\r
-                      );\r
+                       Entry,\r
+                       MNP_GROUP_CONTROL_BLOCK,\r
+                       CtrlBlkEntry\r
+                       );\r
         //\r
         // Update is required if the group address left is no longer used\r
         // by other instances.\r
index 4c906eae3953f0a5576340abc0fc944716da10bd..a3bac07d637eb43ca56b56a114dee6c29e6ca5b6 100644 (file)
@@ -10,7 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include "MnpImpl.h"\r
 #include "MnpVlan.h"\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gMnpDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gMnpDriverBinding = {\r
   MnpDriverBindingSupported,\r
   MnpDriverBindingStart,\r
   MnpDriverBindingStop,\r
@@ -32,11 +32,11 @@ EFI_DRIVER_BINDING_PROTOCOL gMnpDriverBinding = {
 EFI_STATUS\r
 EFIAPI\r
 MnpDestroyServiceDataEntry (\r
-  IN LIST_ENTRY         *Entry,\r
-  IN VOID               *Context\r
+  IN LIST_ENTRY  *Entry,\r
+  IN VOID        *Context\r
   )\r
 {\r
-  MNP_SERVICE_DATA              *MnpServiceData;\r
+  MNP_SERVICE_DATA  *MnpServiceData;\r
 \r
   MnpServiceData = MNP_SERVICE_DATA_FROM_LINK (Entry);\r
   return MnpDestroyServiceData (MnpServiceData);\r
@@ -55,11 +55,11 @@ MnpDestroyServiceDataEntry (
 EFI_STATUS\r
 EFIAPI\r
 MnpDestroyServiceChildEntry (\r
-  IN LIST_ENTRY         *Entry,\r
-  IN VOID               *Context\r
+  IN LIST_ENTRY  *Entry,\r
+  IN VOID        *Context\r
   )\r
 {\r
-  MNP_SERVICE_DATA              *MnpServiceData;\r
+  MNP_SERVICE_DATA  *MnpServiceData;\r
 \r
   MnpServiceData = MNP_SERVICE_DATA_FROM_LINK (Entry);\r
   return MnpDestroyServiceChild (MnpServiceData);\r
@@ -86,9 +86,9 @@ MnpDestroyServiceChildEntry (
 EFI_STATUS\r
 EFIAPI\r
 MnpDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
   EFI_STATUS                   Status;\r
@@ -100,7 +100,7 @@ MnpDriverBindingSupported (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiSimpleNetworkProtocolGuid,\r
-                  (VOID **) &Snp,\r
+                  (VOID **)&Snp,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -122,7 +122,6 @@ MnpDriverBindingSupported (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Start this driver on ControllerHandle. This service is called by the\r
   EFI boot service ConnectController(). In order to make drivers as small\r
@@ -144,9 +143,9 @@ MnpDriverBindingSupported (
 EFI_STATUS\r
 EFIAPI\r
 MnpDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
   EFI_STATUS        Status;\r
@@ -196,7 +195,7 @@ MnpDriverBindingStart (
     MnpDeviceData->NumberOfVlan = 0;\r
     ZeroMem (&MnpDeviceData->VlanConfig, sizeof (EFI_VLAN_CONFIG_PROTOCOL));\r
     MnpServiceData = MnpCreateServiceData (MnpDeviceData, 0, 0);\r
-    Status = (MnpServiceData != NULL) ? EFI_SUCCESS : EFI_OUT_OF_RESOURCES;\r
+    Status         = (MnpServiceData != NULL) ? EFI_SUCCESS : EFI_OUT_OF_RESOURCES;\r
     goto Exit;\r
   }\r
 \r
@@ -217,14 +216,14 @@ MnpDriverBindingStart (
   // Get current VLAN configuration from EFI Variable\r
   //\r
   NumberOfVlan = 0;\r
-  Status = MnpGetVlanVariable (MnpDeviceData, &NumberOfVlan, &VlanVariable);\r
+  Status       = MnpGetVlanVariable (MnpDeviceData, &NumberOfVlan, &VlanVariable);\r
   if (EFI_ERROR (Status)) {\r
     //\r
     // No VLAN is set, create a default MNP service data for untagged frame\r
     //\r
     MnpDeviceData->NumberOfVlan = 0;\r
-    MnpServiceData = MnpCreateServiceData (MnpDeviceData, 0, 0);\r
-    Status = (MnpServiceData != NULL) ? EFI_SUCCESS : EFI_OUT_OF_RESOURCES;\r
+    MnpServiceData              = MnpCreateServiceData (MnpDeviceData, 0, 0);\r
+    Status                      = (MnpServiceData != NULL) ? EFI_SUCCESS : EFI_OUT_OF_RESOURCES;\r
     goto Exit;\r
   }\r
 \r
@@ -236,7 +235,7 @@ MnpDriverBindingStart (
     MnpServiceData = MnpCreateServiceData (\r
                        MnpDeviceData,\r
                        VlanVariable[Index].Bits.Vid,\r
-                       (UINT8) VlanVariable[Index].Bits.Priority\r
+                       (UINT8)VlanVariable[Index].Bits.Priority\r
                        );\r
 \r
     if (MnpServiceData == NULL) {\r
@@ -256,7 +255,7 @@ Exit:
     // Destroy all MNP service data\r
     //\r
     while (!IsListEmpty (&MnpDeviceData->ServiceList)) {\r
-      Entry = GetFirstNode (&MnpDeviceData->ServiceList);\r
+      Entry          = GetFirstNode (&MnpDeviceData->ServiceList);\r
       MnpServiceData = MNP_SERVICE_DATA_FROM_LINK (Entry);\r
       MnpDestroyServiceData (MnpServiceData);\r
     }\r
@@ -304,10 +303,10 @@ Exit:
 EFI_STATUS\r
 EFIAPI\r
 MnpDriverBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      ControllerHandle,\r
-  IN UINTN                           NumberOfChildren,\r
-  IN EFI_HANDLE                      *ChildHandleBuffer OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer OPTIONAL\r
   )\r
 {\r
   EFI_STATUS                    Status;\r
@@ -324,7 +323,7 @@ MnpDriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiManagedNetworkServiceBindingProtocolGuid,\r
-                  (VOID **) &ServiceBinding,\r
+                  (VOID **)&ServiceBinding,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -336,7 +335,7 @@ MnpDriverBindingStop (
     Status = gBS->OpenProtocol (\r
                     ControllerHandle,\r
                     &gEfiVlanConfigProtocolGuid,\r
-                    (VOID **) &VlanConfig,\r
+                    (VOID **)&VlanConfig,\r
                     This->DriverBindingHandle,\r
                     ControllerHandle,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -349,21 +348,21 @@ MnpDriverBindingStop (
     MnpDeviceData = MNP_DEVICE_DATA_FROM_THIS (VlanConfig);\r
   } else {\r
     MnpServiceData = MNP_SERVICE_DATA_FROM_THIS (ServiceBinding);\r
-    MnpDeviceData = MnpServiceData->MnpDeviceData;\r
+    MnpDeviceData  = MnpServiceData->MnpDeviceData;\r
   }\r
 \r
   if (NumberOfChildren == 0) {\r
     //\r
     // Destroy all MNP service data\r
     //\r
-    List = &MnpDeviceData->ServiceList;\r
+    List   = &MnpDeviceData->ServiceList;\r
     Status = NetDestroyLinkList (\r
                List,\r
                MnpDestroyServiceDataEntry,\r
                NULL,\r
                &ListLength\r
                );\r
-    if (EFI_ERROR (Status) || ListLength !=0) {\r
+    if (EFI_ERROR (Status) || (ListLength != 0)) {\r
       return EFI_DEVICE_ERROR;\r
     }\r
 \r
@@ -389,13 +388,14 @@ MnpDriverBindingStop (
       FreeUnicodeStringTable (gMnpControllerNameTable);\r
       gMnpControllerNameTable = NULL;\r
     }\r
+\r
     return EFI_SUCCESS;\r
   }\r
 \r
   //\r
   // Stop all MNP child\r
   //\r
-  List = &MnpDeviceData->ServiceList;\r
+  List   = &MnpDeviceData->ServiceList;\r
   Status = NetDestroyLinkList (\r
              List,\r
              MnpDestroyServiceChildEntry,\r
@@ -409,7 +409,6 @@ MnpDriverBindingStop (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Creates a child handle with a set of I/O services.\r
 \r
@@ -429,8 +428,8 @@ MnpDriverBindingStop (
 EFI_STATUS\r
 EFIAPI\r
 MnpServiceBindingCreateChild (\r
-  IN     EFI_SERVICE_BINDING_PROTOCOL    *This,\r
-  IN OUT EFI_HANDLE                      *ChildHandle\r
+  IN     EFI_SERVICE_BINDING_PROTOCOL  *This,\r
+  IN OUT EFI_HANDLE                    *ChildHandle\r
   )\r
 {\r
   EFI_STATUS         Status;\r
@@ -469,8 +468,8 @@ MnpServiceBindingCreateChild (
   if (EFI_ERROR (Status)) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "MnpServiceBindingCreateChild: Failed to install the MNP protocol, %r.\n",\r
-      Status)\r
+       "MnpServiceBindingCreateChild: Failed to install the MNP protocol, %r.\n",\r
+       Status)\r
       );\r
 \r
     goto ErrorExit;\r
@@ -484,7 +483,7 @@ MnpServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   MnpServiceData->ServiceHandle,\r
                   &gEfiManagedNetworkServiceBindingProtocolGuid,\r
-                  (VOID **) &MnpSb,\r
+                  (VOID **)&MnpSb,\r
                   gMnpDriverBinding.DriverBindingHandle,\r
                   Instance->Handle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -506,15 +505,13 @@ MnpServiceBindingCreateChild (
 ErrorExit:\r
 \r
   if (EFI_ERROR (Status)) {\r
-\r
     if (Instance->Handle != NULL) {\r
-\r
       gBS->UninstallMultipleProtocolInterfaces (\r
-            Instance->Handle,\r
-            &gEfiManagedNetworkProtocolGuid,\r
-            &Instance->ManagedNetwork,\r
-            NULL\r
-            );\r
+             Instance->Handle,\r
+             &gEfiManagedNetworkProtocolGuid,\r
+             &Instance->ManagedNetwork,\r
+             NULL\r
+             );\r
     }\r
 \r
     FreePool (Instance);\r
@@ -523,7 +520,6 @@ ErrorExit:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Destroys a child handle with a set of I/O services.\r
 \r
@@ -548,8 +544,8 @@ ErrorExit:
 EFI_STATUS\r
 EFIAPI\r
 MnpServiceBindingDestroyChild (\r
-  IN EFI_SERVICE_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                      ChildHandle\r
+  IN EFI_SERVICE_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                    ChildHandle\r
   )\r
 {\r
   EFI_STATUS                    Status;\r
@@ -570,7 +566,7 @@ MnpServiceBindingDestroyChild (
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiManagedNetworkProtocolGuid,\r
-                  (VOID **) &ManagedNetwork,\r
+                  (VOID **)&ManagedNetwork,\r
                   gMnpDriverBinding.DriverBindingHandle,\r
                   ChildHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -615,8 +611,8 @@ MnpServiceBindingDestroyChild (
   if (EFI_ERROR (Status)) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "MnpServiceBindingDestroyChild: Failed to uninstall the ManagedNetwork protocol, %r.\n",\r
-      Status)\r
+       "MnpServiceBindingDestroyChild: Failed to uninstall the ManagedNetwork protocol, %r.\n",\r
+       Status)\r
       );\r
 \r
     Instance->Destroyed = FALSE;\r
@@ -668,8 +664,8 @@ MnpServiceBindingDestroyChild (
 EFI_STATUS\r
 EFIAPI\r
 MnpDriverEntryPoint (\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
   return EfiLibInstallDriverBindingComponentName2 (\r
index 4837cd0534b239228da8fb7c20c6be3f2a6edb9a..3115c94dffa4bf981f142c5d155e5a0ce7977196 100644 (file)
@@ -35,56 +35,56 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // Global Variables\r
 //\r
-extern  EFI_DRIVER_BINDING_PROTOCOL gMnpDriverBinding;\r
+extern  EFI_DRIVER_BINDING_PROTOCOL  gMnpDriverBinding;\r
 \r
 typedef struct {\r
-  UINT32                        Signature;\r
+  UINT32                         Signature;\r
 \r
-  EFI_HANDLE                    ControllerHandle;\r
-  EFI_HANDLE                    ImageHandle;\r
+  EFI_HANDLE                     ControllerHandle;\r
+  EFI_HANDLE                     ImageHandle;\r
 \r
-  EFI_VLAN_CONFIG_PROTOCOL      VlanConfig;\r
-  UINTN                         NumberOfVlan;\r
-  CHAR16                        *MacString;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL   *Snp;\r
+  EFI_VLAN_CONFIG_PROTOCOL       VlanConfig;\r
+  UINTN                          NumberOfVlan;\r
+  CHAR16                         *MacString;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL    *Snp;\r
 \r
   //\r
   // List of MNP_SERVICE_DATA\r
   //\r
-  LIST_ENTRY                    ServiceList;\r
+  LIST_ENTRY                     ServiceList;\r
   //\r
   // Number of configured MNP Service Binding child\r
   //\r
-  UINTN                         ConfiguredChildrenNumber;\r
+  UINTN                          ConfiguredChildrenNumber;\r
 \r
-  LIST_ENTRY                    GroupAddressList;\r
-  UINT32                        GroupAddressCount;\r
+  LIST_ENTRY                     GroupAddressList;\r
+  UINT32                         GroupAddressCount;\r
 \r
-  LIST_ENTRY                    FreeTxBufList;\r
-  LIST_ENTRY                    AllTxBufList;\r
-  UINT32                        TxBufCount;\r
+  LIST_ENTRY                     FreeTxBufList;\r
+  LIST_ENTRY                     AllTxBufList;\r
+  UINT32                         TxBufCount;\r
 \r
-  NET_BUF_QUEUE                 FreeNbufQue;\r
-  INTN                          NbufCnt;\r
+  NET_BUF_QUEUE                  FreeNbufQue;\r
+  INTN                           NbufCnt;\r
 \r
-  EFI_EVENT                     PollTimer;\r
-  BOOLEAN                       EnableSystemPoll;\r
+  EFI_EVENT                      PollTimer;\r
+  BOOLEAN                        EnableSystemPoll;\r
 \r
-  EFI_EVENT                     TimeoutCheckTimer;\r
-  EFI_EVENT                     MediaDetectTimer;\r
+  EFI_EVENT                      TimeoutCheckTimer;\r
+  EFI_EVENT                      MediaDetectTimer;\r
 \r
-  UINT32                        UnicastCount;\r
-  UINT32                        BroadcastCount;\r
-  UINT32                        MulticastCount;\r
-  UINT32                        PromiscuousCount;\r
+  UINT32                         UnicastCount;\r
+  UINT32                         BroadcastCount;\r
+  UINT32                         MulticastCount;\r
+  UINT32                         PromiscuousCount;\r
 \r
   //\r
   // The size of the data buffer in the MNP_PACKET_BUFFER used to\r
   // store a packet.\r
   //\r
-  UINT32                        BufferLength;\r
-  UINT32                        PaddingSize;\r
-  NET_BUF                       *RxNbufCache;\r
+  UINT32                         BufferLength;\r
+  UINT32                         PaddingSize;\r
+  NET_BUF                        *RxNbufCache;\r
 } MNP_DEVICE_DATA;\r
 \r
 #define MNP_DEVICE_DATA_FROM_THIS(a) \\r
@@ -98,25 +98,24 @@ typedef struct {
 #define MNP_SERVICE_DATA_SIGNATURE  SIGNATURE_32 ('M', 'n', 'p', 'S')\r
 \r
 typedef struct {\r
-  UINT32                        Signature;\r
+  UINT32                          Signature;\r
 \r
-  LIST_ENTRY                    Link;\r
+  LIST_ENTRY                      Link;\r
 \r
-  MNP_DEVICE_DATA               *MnpDeviceData;\r
-  EFI_HANDLE                    ServiceHandle;\r
-  EFI_SERVICE_BINDING_PROTOCOL  ServiceBinding;\r
-  EFI_DEVICE_PATH_PROTOCOL      *DevicePath;\r
+  MNP_DEVICE_DATA                 *MnpDeviceData;\r
+  EFI_HANDLE                      ServiceHandle;\r
+  EFI_SERVICE_BINDING_PROTOCOL    ServiceBinding;\r
+  EFI_DEVICE_PATH_PROTOCOL        *DevicePath;\r
 \r
-  LIST_ENTRY                    ChildrenList;\r
-  UINTN                         ChildrenNumber;\r
+  LIST_ENTRY                      ChildrenList;\r
+  UINTN                           ChildrenNumber;\r
 \r
-  UINT32                        Mtu;\r
+  UINT32                          Mtu;\r
 \r
-  UINT16                        VlanId;\r
-  UINT8                         Priority;\r
+  UINT16                          VlanId;\r
+  UINT8                           Priority;\r
 } MNP_SERVICE_DATA;\r
 \r
-\r
 #define MNP_SERVICE_DATA_FROM_THIS(a) \\r
   CR ( \\r
   (a), \\r
@@ -133,7 +132,6 @@ typedef struct {
   MNP_SERVICE_DATA_SIGNATURE \\r
   )\r
 \r
-\r
 /**\r
   Test to see if this driver supports ControllerHandle. This service\r
   is called by the EFI boot service ConnectController(). In\r
@@ -155,9 +153,9 @@ typedef struct {
 EFI_STATUS\r
 EFIAPI\r
 MnpDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   );\r
 \r
 /**\r
@@ -181,12 +179,11 @@ MnpDriverBindingSupported (
 EFI_STATUS\r
 EFIAPI\r
 MnpDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   );\r
 \r
-\r
 /**\r
   Stop this driver on ControllerHandle. This service is called by the\r
   EFI boot service DisconnectController(). In order to make drivers as\r
@@ -208,10 +205,10 @@ MnpDriverBindingStart (
 EFI_STATUS\r
 EFIAPI\r
 MnpDriverBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      ControllerHandle,\r
-  IN UINTN                           NumberOfChildren,\r
-  IN EFI_HANDLE                      *ChildHandleBuffer OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer OPTIONAL\r
   );\r
 \r
 /**\r
@@ -233,8 +230,8 @@ MnpDriverBindingStop (
 EFI_STATUS\r
 EFIAPI\r
 MnpServiceBindingCreateChild (\r
-  IN     EFI_SERVICE_BINDING_PROTOCOL    *This,\r
-  IN OUT EFI_HANDLE                      *ChildHandle\r
+  IN     EFI_SERVICE_BINDING_PROTOCOL  *This,\r
+  IN OUT EFI_HANDLE                    *ChildHandle\r
   );\r
 \r
 /**\r
@@ -261,8 +258,8 @@ MnpServiceBindingCreateChild (
 EFI_STATUS\r
 EFIAPI\r
 MnpServiceBindingDestroyChild (\r
-  IN EFI_SERVICE_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                      ChildHandle\r
+  IN EFI_SERVICE_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                    ChildHandle\r
   );\r
 \r
 #endif\r
index e91408c6c9bd673ed8f85a251f30b7b946f5498b..9d3816b42c2c5f551bb076cf781193fb188c567d 100644 (file)
@@ -11,27 +11,27 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "MnpDriver.h"\r
 \r
-#define NET_ETHER_FCS_SIZE            4\r
-\r
-#define MNP_SYS_POLL_INTERVAL         (10 * TICKS_PER_MS)   // 10 milliseconds\r
-#define MNP_TIMEOUT_CHECK_INTERVAL    (50 * TICKS_PER_MS)   // 50 milliseconds\r
-#define MNP_MEDIA_DETECT_INTERVAL     (500 * TICKS_PER_MS)  // 500 milliseconds\r
-#define MNP_TX_TIMEOUT_TIME           (500 * TICKS_PER_MS)  // 500 milliseconds\r
-#define MNP_INIT_NET_BUFFER_NUM       512\r
-#define MNP_NET_BUFFER_INCREASEMENT   64\r
-#define MNP_MAX_NET_BUFFER_NUM        65536\r
-#define MNP_TX_BUFFER_INCREASEMENT    32    // Same as the recycling Q length for xmit_done in UNDI command.\r
-#define MNP_MAX_TX_BUFFER_NUM         65536\r
+#define NET_ETHER_FCS_SIZE  4\r
+\r
+#define MNP_SYS_POLL_INTERVAL        (10 * TICKS_PER_MS)    // 10 milliseconds\r
+#define MNP_TIMEOUT_CHECK_INTERVAL   (50 * TICKS_PER_MS)    // 50 milliseconds\r
+#define MNP_MEDIA_DETECT_INTERVAL    (500 * TICKS_PER_MS)   // 500 milliseconds\r
+#define MNP_TX_TIMEOUT_TIME          (500 * TICKS_PER_MS)   // 500 milliseconds\r
+#define MNP_INIT_NET_BUFFER_NUM      512\r
+#define MNP_NET_BUFFER_INCREASEMENT  64\r
+#define MNP_MAX_NET_BUFFER_NUM       65536\r
+#define MNP_TX_BUFFER_INCREASEMENT   32     // Same as the recycling Q length for xmit_done in UNDI command.\r
+#define MNP_MAX_TX_BUFFER_NUM        65536\r
 \r
 #define MNP_MAX_RCVD_PACKET_QUE_SIZE  256\r
 \r
-#define MNP_RECEIVE_UNICAST           0x01\r
-#define MNP_RECEIVE_BROADCAST         0x02\r
+#define MNP_RECEIVE_UNICAST    0x01\r
+#define MNP_RECEIVE_BROADCAST  0x02\r
 \r
-#define UNICAST_PACKET                MNP_RECEIVE_UNICAST\r
-#define BROADCAST_PACKET              MNP_RECEIVE_BROADCAST\r
+#define UNICAST_PACKET    MNP_RECEIVE_UNICAST\r
+#define BROADCAST_PACKET  MNP_RECEIVE_BROADCAST\r
 \r
-#define MNP_INSTANCE_DATA_SIGNATURE   SIGNATURE_32 ('M', 'n', 'p', 'I')\r
+#define MNP_INSTANCE_DATA_SIGNATURE  SIGNATURE_32 ('M', 'n', 'p', 'I')\r
 \r
 #define MNP_INSTANCE_DATA_FROM_THIS(a) \\r
   CR ( \\r
@@ -42,59 +42,59 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
   )\r
 \r
 typedef struct {\r
-  UINT32                          Signature;\r
+  UINT32                             Signature;\r
 \r
-  MNP_SERVICE_DATA                *MnpServiceData;\r
+  MNP_SERVICE_DATA                   *MnpServiceData;\r
 \r
-  EFI_HANDLE                      Handle;\r
+  EFI_HANDLE                         Handle;\r
 \r
-  LIST_ENTRY                      InstEntry;\r
+  LIST_ENTRY                         InstEntry;\r
 \r
-  EFI_MANAGED_NETWORK_PROTOCOL    ManagedNetwork;\r
+  EFI_MANAGED_NETWORK_PROTOCOL       ManagedNetwork;\r
 \r
-  BOOLEAN                         Configured;\r
-  BOOLEAN                         Destroyed;\r
+  BOOLEAN                            Configured;\r
+  BOOLEAN                            Destroyed;\r
 \r
-  LIST_ENTRY                      GroupCtrlBlkList;\r
+  LIST_ENTRY                         GroupCtrlBlkList;\r
 \r
-  NET_MAP                         RxTokenMap;\r
+  NET_MAP                            RxTokenMap;\r
 \r
-  LIST_ENTRY                      RxDeliveredPacketQueue;\r
-  LIST_ENTRY                      RcvdPacketQueue;\r
-  UINTN                           RcvdPacketQueueSize;\r
+  LIST_ENTRY                         RxDeliveredPacketQueue;\r
+  LIST_ENTRY                         RcvdPacketQueue;\r
+  UINTN                              RcvdPacketQueueSize;\r
 \r
-  EFI_MANAGED_NETWORK_CONFIG_DATA ConfigData;\r
+  EFI_MANAGED_NETWORK_CONFIG_DATA    ConfigData;\r
 \r
-  UINT8                           ReceiveFilter;\r
+  UINT8                              ReceiveFilter;\r
 } MNP_INSTANCE_DATA;\r
 \r
 typedef struct {\r
-  LIST_ENTRY      AddrEntry;\r
-  EFI_MAC_ADDRESS Address;\r
-  INTN            RefCnt;\r
+  LIST_ENTRY         AddrEntry;\r
+  EFI_MAC_ADDRESS    Address;\r
+  INTN               RefCnt;\r
 } MNP_GROUP_ADDRESS;\r
 \r
 typedef struct {\r
-  LIST_ENTRY        CtrlBlkEntry;\r
-  MNP_GROUP_ADDRESS *GroupAddress;\r
+  LIST_ENTRY           CtrlBlkEntry;\r
+  MNP_GROUP_ADDRESS    *GroupAddress;\r
 } MNP_GROUP_CONTROL_BLOCK;\r
 \r
 typedef struct {\r
-  LIST_ENTRY                        WrapEntry;\r
-  MNP_INSTANCE_DATA                 *Instance;\r
-  EFI_MANAGED_NETWORK_RECEIVE_DATA  RxData;\r
-  NET_BUF                           *Nbuf;\r
-  UINT64                            TimeoutTick;\r
+  LIST_ENTRY                          WrapEntry;\r
+  MNP_INSTANCE_DATA                   *Instance;\r
+  EFI_MANAGED_NETWORK_RECEIVE_DATA    RxData;\r
+  NET_BUF                             *Nbuf;\r
+  UINT64                              TimeoutTick;\r
 } MNP_RXDATA_WRAP;\r
 \r
-#define MNP_TX_BUF_WRAP_SIGNATURE   SIGNATURE_32 ('M', 'T', 'B', 'W')\r
+#define MNP_TX_BUF_WRAP_SIGNATURE  SIGNATURE_32 ('M', 'T', 'B', 'W')\r
 \r
 typedef struct {\r
-  UINT32                  Signature;\r
-  LIST_ENTRY              WrapEntry;  // Link to FreeTxBufList\r
-  LIST_ENTRY              AllEntry;   // Link to AllTxBufList\r
-  BOOLEAN                 InUse;\r
-  UINT8                   TxBuf[1];\r
+  UINT32        Signature;\r
+  LIST_ENTRY    WrapEntry;            // Link to FreeTxBufList\r
+  LIST_ENTRY    AllEntry;             // Link to AllTxBufList\r
+  BOOLEAN       InUse;\r
+  UINT8         TxBuf[1];\r
 } MNP_TX_BUF_WRAP;\r
 \r
 /**\r
@@ -111,9 +111,9 @@ typedef struct {
 **/\r
 EFI_STATUS\r
 MnpInitializeDeviceData (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData,\r
-  IN     EFI_HANDLE        ImageHandle,\r
-  IN     EFI_HANDLE        ControllerHandle\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData,\r
+  IN     EFI_HANDLE       ImageHandle,\r
+  IN     EFI_HANDLE       ControllerHandle\r
   );\r
 \r
 /**\r
@@ -125,8 +125,8 @@ MnpInitializeDeviceData (
 **/\r
 VOID\r
 MnpDestroyDeviceData (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData,\r
-  IN     EFI_HANDLE        ImageHandle\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData,\r
+  IN     EFI_HANDLE       ImageHandle\r
   );\r
 \r
 /**\r
@@ -142,9 +142,9 @@ MnpDestroyDeviceData (
 **/\r
 MNP_SERVICE_DATA *\r
 MnpCreateServiceData (\r
-  IN MNP_DEVICE_DATA     *MnpDeviceData,\r
-  IN UINT16              VlanId,\r
-  IN UINT8                Priority OPTIONAL\r
+  IN MNP_DEVICE_DATA  *MnpDeviceData,\r
+  IN UINT16           VlanId,\r
+  IN UINT8            Priority OPTIONAL\r
   );\r
 \r
 /**\r
@@ -161,9 +161,9 @@ MnpCreateServiceData (
 **/\r
 EFI_STATUS\r
 MnpInitializeServiceData (\r
-  IN OUT MNP_SERVICE_DATA    *MnpServiceData,\r
-  IN     EFI_HANDLE          ImageHandle,\r
-  IN     EFI_HANDLE          ControllerHandle\r
+  IN OUT MNP_SERVICE_DATA  *MnpServiceData,\r
+  IN     EFI_HANDLE        ImageHandle,\r
+  IN     EFI_HANDLE        ControllerHandle\r
   );\r
 \r
 /**\r
@@ -177,7 +177,7 @@ MnpInitializeServiceData (
 **/\r
 EFI_STATUS\r
 MnpDestroyServiceData (\r
-  IN OUT MNP_SERVICE_DATA    *MnpServiceData\r
+  IN OUT MNP_SERVICE_DATA  *MnpServiceData\r
   );\r
 \r
 /**\r
@@ -191,7 +191,7 @@ MnpDestroyServiceData (
 **/\r
 EFI_STATUS\r
 MnpDestroyServiceChild (\r
-  IN OUT MNP_SERVICE_DATA    *MnpServiceData\r
+  IN OUT MNP_SERVICE_DATA  *MnpServiceData\r
   );\r
 \r
 /**\r
@@ -205,8 +205,8 @@ MnpDestroyServiceChild (
 **/\r
 MNP_SERVICE_DATA *\r
 MnpFindServiceData (\r
-  IN MNP_DEVICE_DATA     *MnpDeviceData,\r
-  IN UINT16              VlanId\r
+  IN MNP_DEVICE_DATA  *MnpDeviceData,\r
+  IN UINT16           VlanId\r
   );\r
 \r
 /**\r
@@ -219,8 +219,8 @@ MnpFindServiceData (
 **/\r
 VOID\r
 MnpInitializeInstanceData (\r
-  IN     MNP_SERVICE_DATA    *MnpServiceData,\r
-  IN OUT MNP_INSTANCE_DATA   *Instance\r
+  IN     MNP_SERVICE_DATA   *MnpServiceData,\r
+  IN OUT MNP_INSTANCE_DATA  *Instance\r
   );\r
 \r
 /**\r
@@ -240,9 +240,9 @@ MnpInitializeInstanceData (
 EFI_STATUS\r
 EFIAPI\r
 MnpTokenExist (\r
-  IN NET_MAP         *Map,\r
-  IN NET_MAP_ITEM    *Item,\r
-  IN VOID            *Arg\r
+  IN NET_MAP       *Map,\r
+  IN NET_MAP_ITEM  *Item,\r
+  IN VOID          *Arg\r
   );\r
 \r
 /**\r
@@ -263,9 +263,9 @@ MnpTokenExist (
 EFI_STATUS\r
 EFIAPI\r
 MnpCancelTokens (\r
-  IN OUT NET_MAP         *Map,\r
-  IN OUT NET_MAP_ITEM    *Item,\r
-  IN     VOID            *Arg\r
+  IN OUT NET_MAP       *Map,\r
+  IN OUT NET_MAP_ITEM  *Item,\r
+  IN     VOID          *Arg\r
   );\r
 \r
 /**\r
@@ -276,7 +276,7 @@ MnpCancelTokens (
 **/\r
 VOID\r
 MnpFlushRcvdDataQueue (\r
-  IN OUT MNP_INSTANCE_DATA   *Instance\r
+  IN OUT MNP_INSTANCE_DATA  *Instance\r
   );\r
 \r
 /**\r
@@ -294,8 +294,8 @@ MnpFlushRcvdDataQueue (
 **/\r
 EFI_STATUS\r
 MnpConfigureInstance (\r
-  IN OUT MNP_INSTANCE_DATA                 *Instance,\r
-  IN     EFI_MANAGED_NETWORK_CONFIG_DATA   *ConfigData OPTIONAL\r
+  IN OUT MNP_INSTANCE_DATA                *Instance,\r
+  IN     EFI_MANAGED_NETWORK_CONFIG_DATA  *ConfigData OPTIONAL\r
   );\r
 \r
 /**\r
@@ -315,10 +315,10 @@ MnpConfigureInstance (
 **/\r
 EFI_STATUS\r
 MnpGroupOp (\r
-  IN OUT MNP_INSTANCE_DATA         *Instance,\r
-  IN     BOOLEAN                   JoinFlag,\r
-  IN     EFI_MAC_ADDRESS           *MacAddress OPTIONAL,\r
-  IN     MNP_GROUP_CONTROL_BLOCK   *CtrlBlk OPTIONAL\r
+  IN OUT MNP_INSTANCE_DATA        *Instance,\r
+  IN     BOOLEAN                  JoinFlag,\r
+  IN     EFI_MAC_ADDRESS          *MacAddress OPTIONAL,\r
+  IN     MNP_GROUP_CONTROL_BLOCK  *CtrlBlk OPTIONAL\r
   );\r
 \r
 /**\r
@@ -332,8 +332,8 @@ MnpGroupOp (
 **/\r
 BOOLEAN\r
 MnpIsValidTxToken (\r
-  IN MNP_INSTANCE_DATA                       *Instance,\r
-  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN    *Token\r
+  IN MNP_INSTANCE_DATA                     *Instance,\r
+  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token\r
   );\r
 \r
 /**\r
@@ -352,10 +352,10 @@ MnpIsValidTxToken (
 **/\r
 EFI_STATUS\r
 MnpBuildTxPacket (\r
-  IN     MNP_SERVICE_DATA                    *MnpServiceData,\r
-  IN     EFI_MANAGED_NETWORK_TRANSMIT_DATA   *TxData,\r
-     OUT UINT8                               **PktBuf,\r
-     OUT UINT32                              *PktLen\r
+  IN     MNP_SERVICE_DATA                   *MnpServiceData,\r
+  IN     EFI_MANAGED_NETWORK_TRANSMIT_DATA  *TxData,\r
+  OUT UINT8                                 **PktBuf,\r
+  OUT UINT32                                *PktLen\r
   );\r
 \r
 /**\r
@@ -377,10 +377,10 @@ MnpBuildTxPacket (
 **/\r
 EFI_STATUS\r
 MnpSyncSendPacket (\r
-  IN     MNP_SERVICE_DATA                        *MnpServiceData,\r
-  IN     UINT8                                   *Packet,\r
-  IN     UINT32                                  Length,\r
-  IN OUT EFI_MANAGED_NETWORK_COMPLETION_TOKEN    *Token\r
+  IN     MNP_SERVICE_DATA                      *MnpServiceData,\r
+  IN     UINT8                                 *Packet,\r
+  IN     UINT32                                Length,\r
+  IN OUT EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token\r
   );\r
 \r
 /**\r
@@ -396,7 +396,7 @@ MnpSyncSendPacket (
 **/\r
 EFI_STATUS\r
 MnpInstanceDeliverPacket (\r
-  IN OUT MNP_INSTANCE_DATA   *Instance\r
+  IN OUT MNP_INSTANCE_DATA  *Instance\r
   );\r
 \r
 /**\r
@@ -410,8 +410,8 @@ MnpInstanceDeliverPacket (
 VOID\r
 EFIAPI\r
 MnpRecycleRxData (\r
-  IN EFI_EVENT     Event,\r
-  IN VOID          *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -427,7 +427,7 @@ MnpRecycleRxData (
 **/\r
 EFI_STATUS\r
 MnpReceivePacket (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData\r
   );\r
 \r
 /**\r
@@ -443,7 +443,7 @@ MnpReceivePacket (
 **/\r
 NET_BUF *\r
 MnpAllocNbuf (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData\r
   );\r
 \r
 /**\r
@@ -455,8 +455,8 @@ MnpAllocNbuf (
 **/\r
 VOID\r
 MnpFreeNbuf (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData,\r
-  IN OUT NET_BUF           *Nbuf\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData,\r
+  IN OUT NET_BUF          *Nbuf\r
   );\r
 \r
 /**\r
@@ -472,7 +472,7 @@ MnpFreeNbuf (
 **/\r
 UINT8 *\r
 MnpAllocTxBuf (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData\r
   );\r
 \r
 /**\r
@@ -486,7 +486,7 @@ MnpAllocTxBuf (
 **/\r
 EFI_STATUS\r
 MnpRecycleTxBuf (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData\r
   );\r
 \r
 /**\r
@@ -499,8 +499,8 @@ MnpRecycleTxBuf (
 VOID\r
 EFIAPI\r
 MnpCheckPacketTimeout (\r
-  IN EFI_EVENT     Event,\r
-  IN VOID          *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -513,8 +513,8 @@ MnpCheckPacketTimeout (
 VOID\r
 EFIAPI\r
 MnpCheckMediaStatus (\r
-  IN EFI_EVENT     Event,\r
-  IN VOID          *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -528,8 +528,8 @@ MnpCheckMediaStatus (
 VOID\r
 EFIAPI\r
 MnpSystemPoll (\r
-  IN EFI_EVENT     Event,\r
-  IN VOID          *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -560,9 +560,9 @@ MnpSystemPoll (
 EFI_STATUS\r
 EFIAPI\r
 MnpGetModeData (\r
-  IN     EFI_MANAGED_NETWORK_PROTOCOL      *This,\r
-     OUT EFI_MANAGED_NETWORK_CONFIG_DATA   *MnpConfigData OPTIONAL,\r
-     OUT EFI_SIMPLE_NETWORK_MODE           *SnpModeData OPTIONAL\r
+  IN     EFI_MANAGED_NETWORK_PROTOCOL  *This,\r
+  OUT EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData OPTIONAL,\r
+  OUT EFI_SIMPLE_NETWORK_MODE          *SnpModeData OPTIONAL\r
   );\r
 \r
 /**\r
@@ -620,8 +620,8 @@ MnpGetModeData (
 EFI_STATUS\r
 EFIAPI\r
 MnpConfigure (\r
-  IN EFI_MANAGED_NETWORK_PROTOCOL        *This,\r
-  IN EFI_MANAGED_NETWORK_CONFIG_DATA     *MnpConfigData OPTIONAL\r
+  IN EFI_MANAGED_NETWORK_PROTOCOL     *This,\r
+  IN EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData OPTIONAL\r
   );\r
 \r
 /**\r
@@ -657,10 +657,10 @@ MnpConfigure (
 EFI_STATUS\r
 EFIAPI\r
 MnpMcastIpToMac (\r
-  IN     EFI_MANAGED_NETWORK_PROTOCOL    *This,\r
-  IN     BOOLEAN                         Ipv6Flag,\r
-  IN     EFI_IP_ADDRESS                  *IpAddress,\r
-     OUT EFI_MAC_ADDRESS                 *MacAddress\r
+  IN     EFI_MANAGED_NETWORK_PROTOCOL  *This,\r
+  IN     BOOLEAN                       Ipv6Flag,\r
+  IN     EFI_IP_ADDRESS                *IpAddress,\r
+  OUT EFI_MAC_ADDRESS                  *MacAddress\r
   );\r
 \r
 /**\r
@@ -702,9 +702,9 @@ MnpMcastIpToMac (
 EFI_STATUS\r
 EFIAPI\r
 MnpGroups (\r
-  IN EFI_MANAGED_NETWORK_PROTOCOL    *This,\r
-  IN BOOLEAN                         JoinFlag,\r
-  IN EFI_MAC_ADDRESS                 *MacAddress OPTIONAL\r
+  IN EFI_MANAGED_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                       JoinFlag,\r
+  IN EFI_MAC_ADDRESS               *MacAddress OPTIONAL\r
   );\r
 \r
 /**\r
@@ -765,8 +765,8 @@ MnpGroups (
 EFI_STATUS\r
 EFIAPI\r
 MnpTransmit (\r
-  IN EFI_MANAGED_NETWORK_PROTOCOL            *This,\r
-  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN    *Token\r
+  IN EFI_MANAGED_NETWORK_PROTOCOL          *This,\r
+  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token\r
   );\r
 \r
 /**\r
@@ -801,8 +801,8 @@ MnpTransmit (
 EFI_STATUS\r
 EFIAPI\r
 MnpCancel (\r
-  IN EFI_MANAGED_NETWORK_PROTOCOL            *This,\r
-  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN    *Token OPTIONAL\r
+  IN EFI_MANAGED_NETWORK_PROTOCOL          *This,\r
+  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token OPTIONAL\r
   );\r
 \r
 /**\r
@@ -843,8 +843,8 @@ MnpCancel (
 EFI_STATUS\r
 EFIAPI\r
 MnpReceive (\r
-  IN EFI_MANAGED_NETWORK_PROTOCOL            *This,\r
-  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN    *Token\r
+  IN EFI_MANAGED_NETWORK_PROTOCOL          *This,\r
+  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token\r
   );\r
 \r
 /**\r
@@ -876,7 +876,7 @@ MnpReceive (
 EFI_STATUS\r
 EFIAPI\r
 MnpPoll (\r
-  IN EFI_MANAGED_NETWORK_PROTOCOL    *This\r
+  IN EFI_MANAGED_NETWORK_PROTOCOL  *This\r
   );\r
 \r
 /**\r
@@ -892,7 +892,7 @@ MnpPoll (
 **/\r
 EFI_STATUS\r
 MnpConfigReceiveFilters (\r
-  IN MNP_DEVICE_DATA     *MnpDeviceData\r
+  IN MNP_DEVICE_DATA  *MnpDeviceData\r
   );\r
 \r
 #endif\r
index d5707ae26a3ab96bb9f2738fd58c9496e94c012b..087c879c46a3d59e1d7de45937832e2e68dbc53f 100644 (file)
@@ -20,15 +20,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 BOOLEAN\r
 MnpIsValidTxToken (\r
-  IN MNP_INSTANCE_DATA                       *Instance,\r
-  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN    *Token\r
+  IN MNP_INSTANCE_DATA                     *Instance,\r
+  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token\r
   )\r
 {\r
-  MNP_SERVICE_DATA                  *MnpServiceData;\r
-  EFI_MANAGED_NETWORK_TRANSMIT_DATA *TxData;\r
-  UINT32                            Index;\r
-  UINT32                            TotalLength;\r
-  EFI_MANAGED_NETWORK_FRAGMENT_DATA *FragmentTable;\r
+  MNP_SERVICE_DATA                   *MnpServiceData;\r
+  EFI_MANAGED_NETWORK_TRANSMIT_DATA  *TxData;\r
+  UINT32                             Index;\r
+  UINT32                             TotalLength;\r
+  EFI_MANAGED_NETWORK_FRAGMENT_DATA  *FragmentTable;\r
 \r
   MnpServiceData = Instance->MnpServiceData;\r
   NET_CHECK_SIGNATURE (MnpServiceData, MNP_SERVICE_DATA_SIGNATURE);\r
@@ -56,7 +56,6 @@ MnpIsValidTxToken (
   TotalLength   = 0;\r
   FragmentTable = TxData->FragmentTable;\r
   for (Index = 0; Index < TxData->FragmentCount; Index++) {\r
-\r
     if ((FragmentTable[Index].FragmentLength == 0) || (FragmentTable[Index].FragmentBuffer == NULL)) {\r
       //\r
       // The token is invalid if any FragmentLength is zero or any FragmentBuffer is NULL.\r
@@ -111,17 +110,17 @@ MnpIsValidTxToken (
 **/\r
 EFI_STATUS\r
 MnpBuildTxPacket (\r
-  IN     MNP_SERVICE_DATA                    *MnpServiceData,\r
-  IN     EFI_MANAGED_NETWORK_TRANSMIT_DATA   *TxData,\r
-     OUT UINT8                               **PktBuf,\r
-     OUT UINT32                              *PktLen\r
+  IN     MNP_SERVICE_DATA                   *MnpServiceData,\r
+  IN     EFI_MANAGED_NETWORK_TRANSMIT_DATA  *TxData,\r
+  OUT UINT8                                 **PktBuf,\r
+  OUT UINT32                                *PktLen\r
   )\r
 {\r
-  EFI_SIMPLE_NETWORK_MODE *SnpMode;\r
-  UINT8                   *DstPos;\r
-  UINT16                  Index;\r
-  MNP_DEVICE_DATA         *MnpDeviceData;\r
-  UINT8                   *TxBuf;\r
+  EFI_SIMPLE_NETWORK_MODE  *SnpMode;\r
+  UINT8                    *DstPos;\r
+  UINT16                   Index;\r
+  MNP_DEVICE_DATA          *MnpDeviceData;\r
+  UINT8                    *TxBuf;\r
 \r
   MnpDeviceData = MnpServiceData->MnpDeviceData;\r
 \r
@@ -141,10 +140,10 @@ MnpBuildTxPacket (
 \r
   if ((TxData->DestinationAddress == NULL) && (TxData->FragmentCount == 1)) {\r
     CopyMem (\r
-        *PktBuf,\r
-        TxData->FragmentTable[0].FragmentBuffer,\r
-        TxData->FragmentTable[0].FragmentLength\r
-        );\r
+      *PktBuf,\r
+      TxData->FragmentTable[0].FragmentBuffer,\r
+      TxData->FragmentTable[0].FragmentLength\r
+      );\r
 \r
     *PktLen = TxData->FragmentTable[0].FragmentLength;\r
   } else {\r
@@ -161,7 +160,7 @@ MnpBuildTxPacket (
       // If dest address is not NULL, move DstPos to reserve space for the\r
       // media header. Add the media header length to buflen.\r
       //\r
-      DstPos += SnpMode->MediaHeaderSize;\r
+      DstPos  += SnpMode->MediaHeaderSize;\r
       *PktLen += SnpMode->MediaHeaderSize;\r
     }\r
 \r
@@ -186,7 +185,6 @@ MnpBuildTxPacket (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Synchronously send out the packet.\r
 \r
@@ -206,18 +204,18 @@ MnpBuildTxPacket (
 **/\r
 EFI_STATUS\r
 MnpSyncSendPacket (\r
-  IN     MNP_SERVICE_DATA                        *MnpServiceData,\r
-  IN     UINT8                                   *Packet,\r
-  IN     UINT32                                  Length,\r
-  IN OUT EFI_MANAGED_NETWORK_COMPLETION_TOKEN    *Token\r
+  IN     MNP_SERVICE_DATA                      *MnpServiceData,\r
+  IN     UINT8                                 *Packet,\r
+  IN     UINT32                                Length,\r
+  IN OUT EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL       *Snp;\r
-  EFI_MANAGED_NETWORK_TRANSMIT_DATA *TxData;\r
-  UINT32                            HeaderSize;\r
-  MNP_DEVICE_DATA                   *MnpDeviceData;\r
-  UINT16                            ProtocolType;\r
+  EFI_STATUS                         Status;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL        *Snp;\r
+  EFI_MANAGED_NETWORK_TRANSMIT_DATA  *TxData;\r
+  UINT32                             HeaderSize;\r
+  MNP_DEVICE_DATA                    *MnpDeviceData;\r
+  UINT16                             ProtocolType;\r
 \r
   MnpDeviceData = MnpServiceData->MnpDeviceData;\r
   Snp           = MnpDeviceData->Snp;\r
@@ -238,7 +236,6 @@ MnpSyncSendPacket (
     goto SIGNAL_TOKEN;\r
   }\r
 \r
-\r
   if (MnpServiceData->VlanId != 0) {\r
     //\r
     // Insert VLAN tag\r
@@ -294,7 +291,6 @@ SIGNAL_TOKEN:
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Try to deliver the received packet to the instance.\r
 \r
@@ -308,7 +304,7 @@ SIGNAL_TOKEN:
 **/\r
 EFI_STATUS\r
 MnpInstanceDeliverPacket (\r
-  IN OUT MNP_INSTANCE_DATA   *Instance\r
+  IN OUT MNP_INSTANCE_DATA  *Instance\r
   )\r
 {\r
   MNP_DEVICE_DATA                       *MnpDeviceData;\r
@@ -363,10 +359,10 @@ MnpInstanceDeliverPacket (
   //\r
   // Set all the buffer pointers.\r
   //\r
-  RxData->MediaHeader         = NetbufGetByte (RxDataWrap->Nbuf, 0, NULL);\r
-  RxData->DestinationAddress  = RxData->MediaHeader;\r
-  RxData->SourceAddress       = (UINT8 *) RxData->MediaHeader + SnpMode->HwAddressSize;\r
-  RxData->PacketData          = (UINT8 *) RxData->MediaHeader + SnpMode->MediaHeaderSize;\r
+  RxData->MediaHeader        = NetbufGetByte (RxDataWrap->Nbuf, 0, NULL);\r
+  RxData->DestinationAddress = RxData->MediaHeader;\r
+  RxData->SourceAddress      = (UINT8 *)RxData->MediaHeader + SnpMode->HwAddressSize;\r
+  RxData->PacketData         = (UINT8 *)RxData->MediaHeader + SnpMode->MediaHeaderSize;\r
 \r
   //\r
   // Insert this RxDataWrap into the delivered queue.\r
@@ -381,14 +377,13 @@ MnpInstanceDeliverPacket (
   //\r
   // Signal this token's event.\r
   //\r
-  RxToken->Packet.RxData  = &RxDataWrap->RxData;\r
-  RxToken->Status         = EFI_SUCCESS;\r
+  RxToken->Packet.RxData = &RxDataWrap->RxData;\r
+  RxToken->Status        = EFI_SUCCESS;\r
   gBS->SignalEvent (RxToken->Event);\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Deliver the received packet for the instances belonging to the MnpServiceData.\r
 \r
@@ -397,11 +392,11 @@ MnpInstanceDeliverPacket (
 **/\r
 VOID\r
 MnpDeliverPacket (\r
-  IN MNP_SERVICE_DATA    *MnpServiceData\r
+  IN MNP_SERVICE_DATA  *MnpServiceData\r
   )\r
 {\r
-  LIST_ENTRY        *Entry;\r
-  MNP_INSTANCE_DATA *Instance;\r
+  LIST_ENTRY         *Entry;\r
+  MNP_INSTANCE_DATA  *Instance;\r
 \r
   NET_CHECK_SIGNATURE (MnpServiceData, MNP_SERVICE_DATA_SIGNATURE);\r
 \r
@@ -416,7 +411,6 @@ MnpDeliverPacket (
   }\r
 }\r
 \r
-\r
 /**\r
   Recycle the RxData and other resources used to hold and deliver the received\r
   packet.\r
@@ -428,16 +422,16 @@ MnpDeliverPacket (
 VOID\r
 EFIAPI\r
 MnpRecycleRxData (\r
-  IN EFI_EVENT     Event,\r
-  IN VOID          *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  MNP_RXDATA_WRAP *RxDataWrap;\r
-  MNP_DEVICE_DATA *MnpDeviceData;\r
+  MNP_RXDATA_WRAP  *RxDataWrap;\r
+  MNP_DEVICE_DATA  *MnpDeviceData;\r
 \r
   ASSERT (Context != NULL);\r
 \r
-  RxDataWrap = (MNP_RXDATA_WRAP *) Context;\r
+  RxDataWrap = (MNP_RXDATA_WRAP *)Context;\r
   NET_CHECK_SIGNATURE (RxDataWrap->Instance, MNP_INSTANCE_DATA_SIGNATURE);\r
 \r
   ASSERT (RxDataWrap->Nbuf != NULL);\r
@@ -464,7 +458,6 @@ MnpRecycleRxData (
   FreePool (RxDataWrap);\r
 }\r
 \r
-\r
 /**\r
   Queue the received packet into instance's receive queue.\r
 \r
@@ -474,11 +467,11 @@ MnpRecycleRxData (
 **/\r
 VOID\r
 MnpQueueRcvdPacket (\r
-  IN OUT MNP_INSTANCE_DATA   *Instance,\r
-  IN OUT MNP_RXDATA_WRAP     *RxDataWrap\r
+  IN OUT MNP_INSTANCE_DATA  *Instance,\r
+  IN OUT MNP_RXDATA_WRAP    *RxDataWrap\r
   )\r
 {\r
-  MNP_RXDATA_WRAP *OldRxDataWrap;\r
+  MNP_RXDATA_WRAP  *OldRxDataWrap;\r
 \r
   NET_CHECK_SIGNATURE (Instance, MNP_INSTANCE_DATA_SIGNATURE);\r
 \r
@@ -487,7 +480,6 @@ MnpQueueRcvdPacket (
   // from the head.\r
   //\r
   if (Instance->RcvdPacketQueueSize == MNP_MAX_RCVD_PACKET_QUE_SIZE) {\r
-\r
     DEBUG ((DEBUG_WARN, "MnpQueueRcvdPacket: Drop one packet bcz queue size limit reached.\n"));\r
 \r
     //\r
@@ -502,7 +494,7 @@ MnpQueueRcvdPacket (
     //\r
     // Recycle this OldRxDataWrap, this entry will be removed by the callee.\r
     //\r
-    MnpRecycleRxData (NULL, (VOID *) OldRxDataWrap);\r
+    MnpRecycleRxData (NULL, (VOID *)OldRxDataWrap);\r
     Instance->RcvdPacketQueueSize--;\r
   }\r
 \r
@@ -518,7 +510,6 @@ MnpQueueRcvdPacket (
   Instance->RcvdPacketQueueSize++;\r
 }\r
 \r
-\r
 /**\r
   Match the received packet with the instance receive filters.\r
 \r
@@ -535,15 +526,15 @@ MnpQueueRcvdPacket (
 **/\r
 BOOLEAN\r
 MnpMatchPacket (\r
-  IN MNP_INSTANCE_DATA                   *Instance,\r
-  IN EFI_MANAGED_NETWORK_RECEIVE_DATA    *RxData,\r
-  IN MNP_GROUP_ADDRESS                   *GroupAddress OPTIONAL,\r
-  IN UINT8                               PktAttr\r
+  IN MNP_INSTANCE_DATA                 *Instance,\r
+  IN EFI_MANAGED_NETWORK_RECEIVE_DATA  *RxData,\r
+  IN MNP_GROUP_ADDRESS                 *GroupAddress OPTIONAL,\r
+  IN UINT8                             PktAttr\r
   )\r
 {\r
-  EFI_MANAGED_NETWORK_CONFIG_DATA *ConfigData;\r
-  LIST_ENTRY                      *Entry;\r
-  MNP_GROUP_CONTROL_BLOCK         *GroupCtrlBlk;\r
+  EFI_MANAGED_NETWORK_CONFIG_DATA  *ConfigData;\r
+  LIST_ENTRY                       *Entry;\r
+  MNP_GROUP_CONTROL_BLOCK          *GroupCtrlBlk;\r
 \r
   NET_CHECK_SIGNATURE (Instance, MNP_INSTANCE_DATA_SIGNATURE);\r
 \r
@@ -574,11 +565,9 @@ MnpMatchPacket (
   // Check multicast addresses.\r
   //\r
   if (ConfigData->EnableMulticastReceive && RxData->MulticastFlag) {\r
-\r
     ASSERT (GroupAddress != NULL);\r
 \r
     NET_LIST_FOR_EACH (Entry, &Instance->GroupCtrlBlkList) {\r
-\r
       GroupCtrlBlk = NET_LIST_USER_STRUCT (Entry, MNP_GROUP_CONTROL_BLOCK, CtrlBlkEntry);\r
       if (GroupCtrlBlk->GroupAddress == GroupAddress) {\r
         //\r
@@ -596,7 +585,6 @@ MnpMatchPacket (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   Analyse the received packets.\r
 \r
@@ -614,17 +602,17 @@ MnpMatchPacket (
 **/\r
 VOID\r
 MnpAnalysePacket (\r
-  IN     MNP_SERVICE_DATA                    *MnpServiceData,\r
-  IN     NET_BUF                             *Nbuf,\r
-  IN OUT EFI_MANAGED_NETWORK_RECEIVE_DATA    *RxData,\r
-     OUT MNP_GROUP_ADDRESS                   **GroupAddress,\r
-     OUT UINT8                               *PktAttr\r
+  IN     MNP_SERVICE_DATA                  *MnpServiceData,\r
+  IN     NET_BUF                           *Nbuf,\r
+  IN OUT EFI_MANAGED_NETWORK_RECEIVE_DATA  *RxData,\r
+  OUT MNP_GROUP_ADDRESS                    **GroupAddress,\r
+  OUT UINT8                                *PktAttr\r
   )\r
 {\r
-  EFI_SIMPLE_NETWORK_MODE *SnpMode;\r
-  MNP_DEVICE_DATA         *MnpDeviceData;\r
-  UINT8                   *BufPtr;\r
-  LIST_ENTRY              *Entry;\r
+  EFI_SIMPLE_NETWORK_MODE  *SnpMode;\r
+  MNP_DEVICE_DATA          *MnpDeviceData;\r
+  UINT8                    *BufPtr;\r
+  LIST_ENTRY               *Entry;\r
 \r
   MnpDeviceData = MnpServiceData->MnpDeviceData;\r
   SnpMode       = MnpDeviceData->Snp->Mode;\r
@@ -660,7 +648,6 @@ MnpAnalysePacket (
       // It's multicast, try to match the multicast filters.\r
       //\r
       NET_LIST_FOR_EACH (Entry, &MnpDeviceData->GroupAddressList) {\r
-\r
         *GroupAddress = NET_LIST_USER_STRUCT (Entry, MNP_GROUP_ADDRESS, AddrEntry);\r
         if (NET_MAC_EQUAL (BufPtr, &((*GroupAddress)->Address), SnpMode->HwAddressSize)) {\r
           RxData->MulticastFlag = TRUE;\r
@@ -680,7 +667,7 @@ MnpAnalysePacket (
           //\r
           // Skip the below code, there is no receiver of this packet.\r
           //\r
-          return ;\r
+          return;\r
         }\r
       }\r
     } else {\r
@@ -697,10 +684,9 @@ MnpAnalysePacket (
   RxData->HeaderLength  = SnpMode->MediaHeaderSize;\r
   RxData->AddressLength = SnpMode->HwAddressSize;\r
   RxData->DataLength    = RxData->PacketLength - RxData->HeaderLength;\r
-  RxData->ProtocolType  = NTOHS (*(UINT16 *) (BufPtr + 2 * SnpMode->HwAddressSize));\r
+  RxData->ProtocolType  = NTOHS (*(UINT16 *)(BufPtr + 2 * SnpMode->HwAddressSize));\r
 }\r
 \r
-\r
 /**\r
   Wrap the RxData.\r
 \r
@@ -712,12 +698,12 @@ MnpAnalysePacket (
 **/\r
 MNP_RXDATA_WRAP *\r
 MnpWrapRxData (\r
-  IN MNP_INSTANCE_DATA                   *Instance,\r
-  IN EFI_MANAGED_NETWORK_RECEIVE_DATA    *RxData\r
+  IN MNP_INSTANCE_DATA                 *Instance,\r
+  IN EFI_MANAGED_NETWORK_RECEIVE_DATA  *RxData\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
-  MNP_RXDATA_WRAP *RxDataWrap;\r
+  EFI_STATUS       Status;\r
+  MNP_RXDATA_WRAP  *RxDataWrap;\r
 \r
   //\r
   // Allocate memory.\r
@@ -755,7 +741,6 @@ MnpWrapRxData (
   return RxDataWrap;\r
 }\r
 \r
-\r
 /**\r
   Enqueue the received the packets to the instances belonging to the\r
   MnpServiceData.\r
@@ -767,8 +752,8 @@ MnpWrapRxData (
 **/\r
 VOID\r
 MnpEnqueuePacket (\r
-  IN MNP_SERVICE_DATA    *MnpServiceData,\r
-  IN NET_BUF             *Nbuf\r
+  IN MNP_SERVICE_DATA  *MnpServiceData,\r
+  IN NET_BUF           *Nbuf\r
   )\r
 {\r
   LIST_ENTRY                        *Entry;\r
@@ -778,7 +763,6 @@ MnpEnqueuePacket (
   MNP_GROUP_ADDRESS                 *GroupAddress;\r
   MNP_RXDATA_WRAP                   *RxDataWrap;\r
 \r
-\r
   GroupAddress = NULL;\r
   //\r
   // First, analyse the packet header.\r
@@ -789,14 +773,13 @@ MnpEnqueuePacket (
     //\r
     // No receivers, no more action need.\r
     //\r
-    return ;\r
+    return;\r
   }\r
 \r
   //\r
   // Iterate the children to find match.\r
   //\r
   NET_LIST_FOR_EACH (Entry, &MnpServiceData->ChildrenList) {\r
-\r
     Instance = NET_LIST_USER_STRUCT (Entry, MNP_INSTANCE_DATA, InstEntry);\r
     NET_CHECK_SIGNATURE (Instance, MNP_INSTANCE_DATA_SIGNATURE);\r
 \r
@@ -830,7 +813,6 @@ MnpEnqueuePacket (
   }\r
 }\r
 \r
-\r
 /**\r
   Try to receive a packet and deliver it.\r
 \r
@@ -844,19 +826,19 @@ MnpEnqueuePacket (
 **/\r
 EFI_STATUS\r
 MnpReceivePacket (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL *Snp;\r
-  NET_BUF                     *Nbuf;\r
-  UINT8                       *BufPtr;\r
-  UINTN                       BufLen;\r
-  UINTN                       HeaderSize;\r
-  UINT32                      Trimmed;\r
-  MNP_SERVICE_DATA            *MnpServiceData;\r
-  UINT16                      VlanId;\r
-  BOOLEAN                     IsVlanPacket;\r
+  EFI_STATUS                   Status;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL  *Snp;\r
+  NET_BUF                      *Nbuf;\r
+  UINT8                        *BufPtr;\r
+  UINTN                        BufLen;\r
+  UINTN                        HeaderSize;\r
+  UINT32                       Trimmed;\r
+  MNP_SERVICE_DATA             *MnpServiceData;\r
+  UINT16                       VlanId;\r
+  BOOLEAN                      IsVlanPacket;\r
 \r
   NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE);\r
 \r
@@ -888,9 +870,9 @@ MnpReceivePacket (
       );\r
   }\r
 \r
-  Nbuf    = MnpDeviceData->RxNbufCache;\r
-  BufLen  = Nbuf->TotalSize;\r
-  BufPtr  = NetbufGetByte (Nbuf, 0, NULL);\r
+  Nbuf   = MnpDeviceData->RxNbufCache;\r
+  BufLen = Nbuf->TotalSize;\r
+  BufPtr = NetbufGetByte (Nbuf, 0, NULL);\r
   ASSERT (BufPtr != NULL);\r
 \r
   //\r
@@ -899,9 +881,10 @@ MnpReceivePacket (
   Status = Snp->Receive (Snp, &HeaderSize, &BufLen, BufPtr, NULL, NULL, NULL);\r
   if (EFI_ERROR (Status)) {\r
     DEBUG_CODE_BEGIN ();\r
-      if (Status != EFI_NOT_READY) {\r
-        DEBUG ((DEBUG_WARN, "MnpReceivePacket: Snp->Receive() = %r.\n", Status));\r
-      }\r
+    if (Status != EFI_NOT_READY) {\r
+      DEBUG ((DEBUG_WARN, "MnpReceivePacket: Snp->Receive() = %r.\n", Status));\r
+    }\r
+\r
     DEBUG_CODE_END ();\r
 \r
     return Status;\r
@@ -913,9 +896,9 @@ MnpReceivePacket (
   if ((HeaderSize != Snp->Mode->MediaHeaderSize) || (BufLen < HeaderSize)) {\r
     DEBUG (\r
       (DEBUG_WARN,\r
-      "MnpReceivePacket: Size error, HL:TL = %d:%d.\n",\r
-      HeaderSize,\r
-      BufLen)\r
+       "MnpReceivePacket: Size error, HL:TL = %d:%d.\n",\r
+       HeaderSize,\r
+       BufLen)\r
       );\r
     return EFI_DEVICE_ERROR;\r
   }\r
@@ -925,7 +908,7 @@ MnpReceivePacket (
     //\r
     // Trim the packet from tail.\r
     //\r
-    Trimmed = NetbufTrim (Nbuf, Nbuf->TotalSize - (UINT32) BufLen, NET_BUF_TAIL);\r
+    Trimmed = NetbufTrim (Nbuf, Nbuf->TotalSize - (UINT32)BufLen, NET_BUF_TAIL);\r
     ASSERT (Nbuf->TotalSize == BufLen);\r
   }\r
 \r
@@ -982,12 +965,14 @@ MnpReceivePacket (
     if (Trimmed > 0) {\r
       NetbufAllocSpace (Nbuf, Trimmed, NET_BUF_TAIL);\r
     }\r
+\r
     if (IsVlanPacket) {\r
       NetbufAllocSpace (Nbuf, NET_VLAN_TAG_LEN, NET_BUF_HEAD);\r
     }\r
 \r
     goto EXIT;\r
   }\r
+\r
   //\r
   // Deliver the queued packets.\r
   //\r
@@ -1000,7 +985,6 @@ EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Remove the received packets if timeout occurs.\r
 \r
@@ -1011,28 +995,27 @@ EXIT:
 VOID\r
 EFIAPI\r
 MnpCheckPacketTimeout (\r
-  IN EFI_EVENT     Event,\r
-  IN VOID          *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  MNP_DEVICE_DATA   *MnpDeviceData;\r
-  MNP_SERVICE_DATA  *MnpServiceData;\r
-  LIST_ENTRY        *Entry;\r
-  LIST_ENTRY        *ServiceEntry;\r
-  LIST_ENTRY        *RxEntry;\r
-  LIST_ENTRY        *NextEntry;\r
-  MNP_INSTANCE_DATA *Instance;\r
-  MNP_RXDATA_WRAP   *RxDataWrap;\r
-  EFI_TPL           OldTpl;\r
-\r
-  MnpDeviceData = (MNP_DEVICE_DATA *) Context;\r
+  MNP_DEVICE_DATA    *MnpDeviceData;\r
+  MNP_SERVICE_DATA   *MnpServiceData;\r
+  LIST_ENTRY         *Entry;\r
+  LIST_ENTRY         *ServiceEntry;\r
+  LIST_ENTRY         *RxEntry;\r
+  LIST_ENTRY         *NextEntry;\r
+  MNP_INSTANCE_DATA  *Instance;\r
+  MNP_RXDATA_WRAP    *RxDataWrap;\r
+  EFI_TPL            OldTpl;\r
+\r
+  MnpDeviceData = (MNP_DEVICE_DATA *)Context;\r
   NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE);\r
 \r
   NET_LIST_FOR_EACH (ServiceEntry, &MnpDeviceData->ServiceList) {\r
     MnpServiceData = MNP_SERVICE_DATA_FROM_LINK (ServiceEntry);\r
 \r
     NET_LIST_FOR_EACH (Entry, &MnpServiceData->ChildrenList) {\r
-\r
       Instance = NET_LIST_USER_STRUCT (Entry, MNP_INSTANCE_DATA, InstEntry);\r
       NET_CHECK_SIGNATURE (Instance, MNP_INSTANCE_DATA_SIGNATURE);\r
 \r
@@ -1047,7 +1030,6 @@ MnpCheckPacketTimeout (
       OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
 \r
       NET_LIST_FOR_EACH_SAFE (RxEntry, NextEntry, &Instance->RcvdPacketQueue) {\r
-\r
         RxDataWrap = NET_LIST_USER_STRUCT (RxEntry, MNP_RXDATA_WRAP, WrapEntry);\r
 \r
         //\r
@@ -1080,15 +1062,15 @@ MnpCheckPacketTimeout (
 VOID\r
 EFIAPI\r
 MnpCheckMediaStatus (\r
-  IN EFI_EVENT     Event,\r
-  IN VOID          *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  MNP_DEVICE_DATA             *MnpDeviceData;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL *Snp;\r
-  UINT32                      InterruptStatus;\r
+  MNP_DEVICE_DATA              *MnpDeviceData;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL  *Snp;\r
+  UINT32                       InterruptStatus;\r
 \r
-  MnpDeviceData = (MNP_DEVICE_DATA *) Context;\r
+  MnpDeviceData = (MNP_DEVICE_DATA *)Context;\r
   NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE);\r
 \r
   Snp = MnpDeviceData->Snp;\r
@@ -1112,13 +1094,13 @@ MnpCheckMediaStatus (
 VOID\r
 EFIAPI\r
 MnpSystemPoll (\r
-  IN EFI_EVENT     Event,\r
-  IN VOID          *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   MNP_DEVICE_DATA  *MnpDeviceData;\r
 \r
-  MnpDeviceData = (MNP_DEVICE_DATA *) Context;\r
+  MnpDeviceData = (MNP_DEVICE_DATA *)Context;\r
   NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE);\r
 \r
   //\r
index ff7e89de103ebbc2e50aad7182dd0dbf27b512d2..a1f82a930766fdceb2f60d01d0b717ac2094979a 100644 (file)
@@ -36,16 +36,16 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 EFI_STATUS\r
 EFIAPI\r
 MnpGetModeData (\r
-  IN     EFI_MANAGED_NETWORK_PROTOCOL      *This,\r
-     OUT EFI_MANAGED_NETWORK_CONFIG_DATA   *MnpConfigData OPTIONAL,\r
-     OUT EFI_SIMPLE_NETWORK_MODE           *SnpModeData OPTIONAL\r
+  IN     EFI_MANAGED_NETWORK_PROTOCOL  *This,\r
+  OUT EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData OPTIONAL,\r
+  OUT EFI_SIMPLE_NETWORK_MODE          *SnpModeData OPTIONAL\r
   )\r
 {\r
-  MNP_INSTANCE_DATA           *Instance;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL *Snp;\r
-  EFI_TPL                     OldTpl;\r
-  EFI_STATUS                  Status;\r
-  UINT32                      InterruptStatus;\r
+  MNP_INSTANCE_DATA            *Instance;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL  *Snp;\r
+  EFI_TPL                      OldTpl;\r
+  EFI_STATUS                   Status;\r
+  UINT32                       InterruptStatus;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -87,7 +87,6 @@ MnpGetModeData (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Sets or clears the operational parameters for the MNP child driver.\r
 \r
@@ -143,8 +142,8 @@ MnpGetModeData (
 EFI_STATUS\r
 EFIAPI\r
 MnpConfigure (\r
-  IN EFI_MANAGED_NETWORK_PROTOCOL        *This,\r
-  IN EFI_MANAGED_NETWORK_CONFIG_DATA     *MnpConfigData OPTIONAL\r
+  IN EFI_MANAGED_NETWORK_PROTOCOL     *This,\r
+  IN EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData OPTIONAL\r
   )\r
 {\r
   MNP_INSTANCE_DATA  *Instance;\r
@@ -155,7 +154,8 @@ MnpConfigure (
       ((MnpConfigData != NULL) &&\r
        (MnpConfigData->ProtocolTypeFilter > 0) &&\r
        (MnpConfigData->ProtocolTypeFilter <= 1500))\r
-     ) {\r
+      )\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -182,7 +182,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Translates an IP multicast address to a hardware (MAC) multicast address. This\r
   function may be unsupported in some MNP implementations.\r
@@ -216,17 +215,17 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 MnpMcastIpToMac (\r
-  IN     EFI_MANAGED_NETWORK_PROTOCOL    *This,\r
-  IN     BOOLEAN                         Ipv6Flag,\r
-  IN     EFI_IP_ADDRESS                  *IpAddress,\r
-     OUT EFI_MAC_ADDRESS                 *MacAddress\r
+  IN     EFI_MANAGED_NETWORK_PROTOCOL  *This,\r
+  IN     BOOLEAN                       Ipv6Flag,\r
+  IN     EFI_IP_ADDRESS                *IpAddress,\r
+  OUT EFI_MAC_ADDRESS                  *MacAddress\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  MNP_INSTANCE_DATA           *Instance;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL *Snp;\r
-  EFI_TPL                     OldTpl;\r
-  EFI_IPv6_ADDRESS            *Ip6Address;\r
+  EFI_STATUS                   Status;\r
+  MNP_INSTANCE_DATA            *Instance;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL  *Snp;\r
+  EFI_TPL                      OldTpl;\r
+  EFI_IPv6_ADDRESS             *Ip6Address;\r
 \r
   if ((This == NULL) || (IpAddress == NULL) || (MacAddress == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -236,7 +235,8 @@ MnpMcastIpToMac (
 \r
   if ((Ipv6Flag && !IP6_IS_MULTICAST (Ip6Address)) ||\r
       (!Ipv6Flag && !IP4_IS_MULTICAST (EFI_NTOHL (*IpAddress)))\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // The IP address passed in is not a multicast address.\r
     //\r
@@ -248,7 +248,6 @@ MnpMcastIpToMac (
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   if (!Instance->Configured) {\r
-\r
     Status = EFI_NOT_STARTED;\r
     goto ON_EXIT;\r
   }\r
@@ -267,7 +266,7 @@ MnpMcastIpToMac (
       MacAddress->Addr[0] = 0x01;\r
       MacAddress->Addr[1] = 0x00;\r
       MacAddress->Addr[2] = 0x5E;\r
-      MacAddress->Addr[3] = (UINT8) (IpAddress->v4.Addr[1] & 0x7F);\r
+      MacAddress->Addr[3] = (UINT8)(IpAddress->v4.Addr[1] & 0x7F);\r
       MacAddress->Addr[4] = IpAddress->v4.Addr[2];\r
       MacAddress->Addr[5] = IpAddress->v4.Addr[3];\r
     } else {\r
@@ -342,29 +341,29 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 MnpGroups (\r
-  IN EFI_MANAGED_NETWORK_PROTOCOL    *This,\r
-  IN BOOLEAN                         JoinFlag,\r
-  IN EFI_MAC_ADDRESS                 *MacAddress OPTIONAL\r
+  IN EFI_MANAGED_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                       JoinFlag,\r
+  IN EFI_MAC_ADDRESS               *MacAddress OPTIONAL\r
   )\r
 {\r
-  MNP_INSTANCE_DATA       *Instance;\r
-  EFI_SIMPLE_NETWORK_MODE *SnpMode;\r
-  MNP_GROUP_CONTROL_BLOCK *GroupCtrlBlk;\r
-  MNP_GROUP_ADDRESS       *GroupAddress;\r
-  LIST_ENTRY              *ListEntry;\r
-  BOOLEAN                 AddressExist;\r
-  EFI_TPL                 OldTpl;\r
-  EFI_STATUS              Status;\r
-\r
-  if (This == NULL || (JoinFlag && (MacAddress == NULL))) {\r
+  MNP_INSTANCE_DATA        *Instance;\r
+  EFI_SIMPLE_NETWORK_MODE  *SnpMode;\r
+  MNP_GROUP_CONTROL_BLOCK  *GroupCtrlBlk;\r
+  MNP_GROUP_ADDRESS        *GroupAddress;\r
+  LIST_ENTRY               *ListEntry;\r
+  BOOLEAN                  AddressExist;\r
+  EFI_TPL                  OldTpl;\r
+  EFI_STATUS               Status;\r
+\r
+  if ((This == NULL) || (JoinFlag && (MacAddress == NULL))) {\r
     //\r
     // This is NULL, or it's a join operation but MacAddress is NULL.\r
     //\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Instance  = MNP_INSTANCE_DATA_FROM_THIS (This);\r
-  SnpMode   = Instance->MnpServiceData->MnpDeviceData->Snp->Mode;\r
+  Instance = MNP_INSTANCE_DATA_FROM_THIS (This);\r
+  SnpMode  = Instance->MnpServiceData->MnpDeviceData->Snp->Mode;\r
 \r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
@@ -374,7 +373,8 @@ MnpGroups (
   }\r
 \r
   if ((!Instance->ConfigData.EnableMulticastReceive) ||\r
-    ((MacAddress != NULL) && !NET_MAC_IS_MULTICAST (MacAddress, &SnpMode->BroadcastAddress, SnpMode->HwAddressSize))) {\r
+      ((MacAddress != NULL) && !NET_MAC_IS_MULTICAST (MacAddress, &SnpMode->BroadcastAddress, SnpMode->HwAddressSize)))\r
+  {\r
     //\r
     // The instance isn't configured to do multicast receive. OR\r
     // the passed in MacAddress is not a multicast mac address.\r
@@ -392,18 +392,18 @@ MnpGroups (
     // Search the instance's GroupCtrlBlkList to find the specific address.\r
     //\r
     NET_LIST_FOR_EACH (ListEntry, &Instance->GroupCtrlBlkList) {\r
-\r
       GroupCtrlBlk = NET_LIST_USER_STRUCT (\r
-                      ListEntry,\r
-                      MNP_GROUP_CONTROL_BLOCK,\r
-                      CtrlBlkEntry\r
-                      );\r
+                       ListEntry,\r
+                       MNP_GROUP_CONTROL_BLOCK,\r
+                       CtrlBlkEntry\r
+                       );\r
       GroupAddress = GroupCtrlBlk->GroupAddress;\r
       if (0 == CompareMem (\r
-                MacAddress,\r
-                &GroupAddress->Address,\r
-                SnpMode->HwAddressSize\r
-                )) {\r
+                 MacAddress,\r
+                 &GroupAddress->Address,\r
+                 SnpMode->HwAddressSize\r
+                 ))\r
+      {\r
         //\r
         // There is already the same multicast mac address configured.\r
         //\r
@@ -506,16 +506,16 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 MnpTransmit (\r
-  IN EFI_MANAGED_NETWORK_PROTOCOL            *This,\r
-  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN    *Token\r
+  IN EFI_MANAGED_NETWORK_PROTOCOL          *This,\r
+  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token\r
   )\r
 {\r
-  EFI_STATUS        Status;\r
-  MNP_INSTANCE_DATA *Instance;\r
-  MNP_SERVICE_DATA  *MnpServiceData;\r
-  UINT8             *PktBuf;\r
-  UINT32            PktLen;\r
-  EFI_TPL           OldTpl;\r
+  EFI_STATUS         Status;\r
+  MNP_INSTANCE_DATA  *Instance;\r
+  MNP_SERVICE_DATA   *MnpServiceData;\r
+  UINT8              *PktBuf;\r
+  UINT32             PktLen;\r
+  EFI_TPL            OldTpl;\r
 \r
   if ((This == NULL) || (Token == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -526,7 +526,6 @@ MnpTransmit (
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   if (!Instance->Configured) {\r
-\r
     Status = EFI_NOT_STARTED;\r
     goto ON_EXIT;\r
   }\r
@@ -561,7 +560,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Places an asynchronous receiving request into the receiving queue.\r
 \r
@@ -600,8 +598,8 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 MnpReceive (\r
-  IN EFI_MANAGED_NETWORK_PROTOCOL            *This,\r
-  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN    *Token\r
+  IN EFI_MANAGED_NETWORK_PROTOCOL          *This,\r
+  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token\r
   )\r
 {\r
   EFI_STATUS         Status;\r
@@ -624,7 +622,7 @@ MnpReceive (
   //\r
   // Check whether this token(event) is already in the rx token queue.\r
   //\r
-  Status = NetMapIterate (&Instance->RxTokenMap, MnpTokenExist, (VOID *) Token);\r
+  Status = NetMapIterate (&Instance->RxTokenMap, MnpTokenExist, (VOID *)Token);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
@@ -632,7 +630,7 @@ MnpReceive (
   //\r
   // Insert the Token into the RxTokenMap.\r
   //\r
-  Status = NetMapInsertTail (&Instance->RxTokenMap, (VOID *) Token, NULL);\r
+  Status = NetMapInsertTail (&Instance->RxTokenMap, (VOID *)Token, NULL);\r
   if (!EFI_ERROR (Status)) {\r
     //\r
     // Try to deliver any buffered packets.\r
@@ -683,8 +681,8 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 MnpCancel (\r
-  IN EFI_MANAGED_NETWORK_PROTOCOL            *This,\r
-  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN    *Token OPTIONAL\r
+  IN EFI_MANAGED_NETWORK_PROTOCOL          *This,\r
+  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token OPTIONAL\r
   )\r
 {\r
   EFI_STATUS         Status;\r
@@ -707,7 +705,7 @@ MnpCancel (
   //\r
   // Iterate the RxTokenMap to cancel the specified Token.\r
   //\r
-  Status = NetMapIterate (&Instance->RxTokenMap, MnpCancelTokens, (VOID *) Token);\r
+  Status = NetMapIterate (&Instance->RxTokenMap, MnpCancelTokens, (VOID *)Token);\r
   if (Token != NULL) {\r
     Status = (Status == EFI_ABORTED) ? EFI_SUCCESS : EFI_NOT_FOUND;\r
   }\r
@@ -752,7 +750,7 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 MnpPoll (\r
-  IN EFI_MANAGED_NETWORK_PROTOCOL    *This\r
+  IN EFI_MANAGED_NETWORK_PROTOCOL  *This\r
   )\r
 {\r
   EFI_STATUS         Status;\r
index 54fb1895024ca0534f7183d377a03705e906cd9c..cc3637a6ed4101aa13c095c71702044327d83848 100644 (file)
@@ -9,13 +9,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include "MnpImpl.h"\r
 #include "MnpVlan.h"\r
 \r
-VLAN_DEVICE_PATH          mVlanDevicePathTemplate = {\r
+VLAN_DEVICE_PATH  mVlanDevicePathTemplate = {\r
   {\r
     MESSAGING_DEVICE_PATH,\r
     MSG_VLAN_DP,\r
     {\r
-      (UINT8) (sizeof (VLAN_DEVICE_PATH)),\r
-      (UINT8) ((sizeof (VLAN_DEVICE_PATH)) >> 8)\r
+      (UINT8)(sizeof (VLAN_DEVICE_PATH)),\r
+      (UINT8)((sizeof (VLAN_DEVICE_PATH)) >> 8)\r
     }\r
   },\r
   0\r
@@ -27,7 +27,6 @@ EFI_VLAN_CONFIG_PROTOCOL  mVlanConfigProtocolTemplate = {
   VlanConfigRemove\r
 };\r
 \r
-\r
 /**\r
   Create a child handle for the VLAN ID.\r
 \r
@@ -41,10 +40,10 @@ EFI_VLAN_CONFIG_PROTOCOL  mVlanConfigProtocolTemplate = {
 **/\r
 EFI_HANDLE\r
 MnpCreateVlanChild (\r
-  IN     EFI_HANDLE                  ImageHandle,\r
-  IN     EFI_HANDLE                  ControllerHandle,\r
-  IN     UINT16                      VlanId,\r
-     OUT EFI_DEVICE_PATH_PROTOCOL    **Devicepath OPTIONAL\r
+  IN     EFI_HANDLE             ImageHandle,\r
+  IN     EFI_HANDLE             ControllerHandle,\r
+  IN     UINT16                 VlanId,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **Devicepath OPTIONAL\r
   )\r
 {\r
   EFI_HANDLE                ChildHandle;\r
@@ -59,7 +58,7 @@ MnpCreateVlanChild (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &ParentDevicePath,\r
+                  (VOID **)&ParentDevicePath,\r
                   ImageHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -73,10 +72,10 @@ MnpCreateVlanChild (
   //\r
   CopyMem (&VlanNode, &mVlanDevicePathTemplate, sizeof (VLAN_DEVICE_PATH));\r
   VlanNode.VlanId = VlanId;\r
-  VlanDevicePath = AppendDevicePathNode (\r
-                     ParentDevicePath,\r
-                     (EFI_DEVICE_PATH_PROTOCOL *) &VlanNode\r
-                     );\r
+  VlanDevicePath  = AppendDevicePathNode (\r
+                      ParentDevicePath,\r
+                      (EFI_DEVICE_PATH_PROTOCOL *)&VlanNode\r
+                      );\r
   if (VlanDevicePath == NULL) {\r
     return NULL;\r
   }\r
@@ -85,12 +84,12 @@ MnpCreateVlanChild (
   // Create child VLAN handle by installing DevicePath protocol\r
   //\r
   ChildHandle = NULL;\r
-  Status = gBS->InstallMultipleProtocolInterfaces (\r
-                  &ChildHandle,\r
-                  &gEfiDevicePathProtocolGuid,\r
-                  VlanDevicePath,\r
-                  NULL\r
-                  );\r
+  Status      = gBS->InstallMultipleProtocolInterfaces (\r
+                       &ChildHandle,\r
+                       &gEfiDevicePathProtocolGuid,\r
+                       VlanDevicePath,\r
+                       NULL\r
+                       );\r
   if (EFI_ERROR (Status)) {\r
     FreePool (VlanDevicePath);\r
     return NULL;\r
@@ -116,9 +115,9 @@ MnpCreateVlanChild (
 **/\r
 BOOLEAN\r
 MnpRemoveVlanTag (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData,\r
-  IN OUT NET_BUF           *Nbuf,\r
-     OUT UINT16            *VlanId\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData,\r
+  IN OUT NET_BUF          *Nbuf,\r
+  OUT UINT16              *VlanId\r
   )\r
 {\r
   UINT8     *Packet;\r
@@ -138,7 +137,7 @@ MnpRemoveVlanTag (
   // Check whether this is VLAN tagged frame by Ether Type\r
   //\r
   *VlanId      = 0;\r
-  ProtocolType = NTOHS (*(UINT16 *) (Packet + ProtocolOffset));\r
+  ProtocolType = NTOHS (*(UINT16 *)(Packet + ProtocolOffset));\r
   if (ProtocolType != ETHER_TYPE_VLAN) {\r
     //\r
     // Not a VLAN tagged frame\r
@@ -146,8 +145,8 @@ MnpRemoveVlanTag (
     return FALSE;\r
   }\r
 \r
-  VlanTag.Uint16 = NTOHS (*(UINT16 *) (Packet + ProtocolOffset + sizeof (ProtocolType)));\r
-  *VlanId = VlanTag.Bits.Vid;\r
+  VlanTag.Uint16 = NTOHS (*(UINT16 *)(Packet + ProtocolOffset + sizeof (ProtocolType)));\r
+  *VlanId        = VlanTag.Bits.Vid;\r
 \r
   //\r
   // Move hardware address (DA + SA) 4 bytes right to override VLAN tag\r
@@ -162,7 +161,6 @@ MnpRemoveVlanTag (
   return TRUE;\r
 }\r
 \r
-\r
 /**\r
   Build the vlan packet to transmit from the TxData passed in.\r
 \r
@@ -177,28 +175,28 @@ MnpRemoveVlanTag (
 **/\r
 VOID\r
 MnpInsertVlanTag (\r
-  IN     MNP_SERVICE_DATA                    *MnpServiceData,\r
-  IN     EFI_MANAGED_NETWORK_TRANSMIT_DATA   *TxData,\r
-     OUT UINT16                              *ProtocolType,\r
-  IN OUT UINT8                               **Packet,\r
-  IN OUT UINT32                              *Length\r
+  IN     MNP_SERVICE_DATA                   *MnpServiceData,\r
+  IN     EFI_MANAGED_NETWORK_TRANSMIT_DATA  *TxData,\r
+  OUT UINT16                                *ProtocolType,\r
+  IN OUT UINT8                              **Packet,\r
+  IN OUT UINT32                             *Length\r
   )\r
 {\r
-  VLAN_TCI                *VlanTci;\r
-  UINT16                  *Tpid;\r
-  UINT16                  *EtherType;\r
-  MNP_DEVICE_DATA         *MnpDeviceData;\r
-  EFI_SIMPLE_NETWORK_MODE *SnpMode;\r
+  VLAN_TCI                 *VlanTci;\r
+  UINT16                   *Tpid;\r
+  UINT16                   *EtherType;\r
+  MNP_DEVICE_DATA          *MnpDeviceData;\r
+  EFI_SIMPLE_NETWORK_MODE  *SnpMode;\r
 \r
   MnpDeviceData = MnpServiceData->MnpDeviceData;\r
   SnpMode       = MnpDeviceData->Snp->Mode;\r
 \r
   *ProtocolType = ETHER_TYPE_VLAN;\r
-  *Length = *Length + NET_VLAN_TAG_LEN;\r
-  *Packet = *Packet - NET_VLAN_TAG_LEN;\r
+  *Length       = *Length + NET_VLAN_TAG_LEN;\r
+  *Packet       = *Packet - NET_VLAN_TAG_LEN;\r
 \r
-  Tpid    = (UINT16 *) (*Packet + SnpMode->MediaHeaderSize - sizeof (*ProtocolType));\r
-  VlanTci = (VLAN_TCI *) (UINTN) (Tpid + 1);\r
+  Tpid    = (UINT16 *)(*Packet + SnpMode->MediaHeaderSize - sizeof (*ProtocolType));\r
+  VlanTci = (VLAN_TCI *)(UINTN)(Tpid + 1);\r
   if (TxData->HeaderLength != 0) {\r
     //\r
     // Media header is in packet, move DA+SA 4 bytes left\r
@@ -213,7 +211,7 @@ MnpInsertVlanTag (
     //\r
     // Media header not in packet, VLAN TCI and original protocol type becomes payload\r
     //\r
-    EtherType  = (UINT16 *) (UINTN) (VlanTci + 1);\r
+    EtherType  = (UINT16 *)(UINTN)(VlanTci + 1);\r
     *EtherType = HTONS (TxData->ProtocolType);\r
   }\r
 \r
@@ -237,36 +235,38 @@ MnpInsertVlanTag (
 **/\r
 EFI_STATUS\r
 MnpCheckVlanVariable (\r
-  IN     MNP_DEVICE_DATA   *MnpDeviceData,\r
-  IN     VLAN_TCI          *Buffer,\r
-  IN     UINTN             NumberOfVlan,\r
-     OUT UINTN             *NewNumberOfVlan\r
+  IN     MNP_DEVICE_DATA  *MnpDeviceData,\r
+  IN     VLAN_TCI         *Buffer,\r
+  IN     UINTN            NumberOfVlan,\r
+  OUT UINTN               *NewNumberOfVlan\r
   )\r
 {\r
-  UINTN             Index;\r
-  UINTN             Index2;\r
-  UINTN             Count;\r
-  BOOLEAN           FoundDuplicateItem;\r
-  EFI_STATUS        Status;\r
+  UINTN       Index;\r
+  UINTN       Index2;\r
+  UINTN       Count;\r
+  BOOLEAN     FoundDuplicateItem;\r
+  EFI_STATUS  Status;\r
 \r
-  Count = 0;\r
-  FoundDuplicateItem  = FALSE;\r
-  Status = EFI_SUCCESS;\r
+  Count              = 0;\r
+  FoundDuplicateItem = FALSE;\r
+  Status             = EFI_SUCCESS;\r
 \r
   for (Index = 0; Index < NumberOfVlan; Index++) {\r
-   for (Index2 = Index + 1; Index2 < NumberOfVlan; Index2++) {\r
-     if (Buffer[Index].Bits.Vid == Buffer[Index2].Bits.Vid) {\r
-       FoundDuplicateItem = TRUE;\r
-       Count++;\r
-       break;\r
-     }\r
-   }\r
-   if (FoundDuplicateItem) {\r
-    for (Index2 = Index +1; Index2 < NumberOfVlan; Index++, Index2++) {\r
-      CopyMem (Buffer + Index, Buffer + Index2, sizeof (VLAN_TCI));\r
+    for (Index2 = Index + 1; Index2 < NumberOfVlan; Index2++) {\r
+      if (Buffer[Index].Bits.Vid == Buffer[Index2].Bits.Vid) {\r
+        FoundDuplicateItem = TRUE;\r
+        Count++;\r
+        break;\r
+      }\r
+    }\r
+\r
+    if (FoundDuplicateItem) {\r
+      for (Index2 = Index +1; Index2 < NumberOfVlan; Index++, Index2++) {\r
+        CopyMem (Buffer + Index, Buffer + Index2, sizeof (VLAN_TCI));\r
+      }\r
     }\r
-   }\r
-   FoundDuplicateItem = FALSE;\r
+\r
+    FoundDuplicateItem = FALSE;\r
   }\r
 \r
   *NewNumberOfVlan = NumberOfVlan - Count;\r
@@ -293,9 +293,9 @@ MnpCheckVlanVariable (
 **/\r
 EFI_STATUS\r
 MnpGetVlanVariable (\r
-  IN     MNP_DEVICE_DATA   *MnpDeviceData,\r
-     OUT UINTN             *NumberOfVlan,\r
-     OUT VLAN_TCI          **VlanVariable\r
+  IN     MNP_DEVICE_DATA  *MnpDeviceData,\r
+  OUT UINTN               *NumberOfVlan,\r
+  OUT VLAN_TCI            **VlanVariable\r
   )\r
 {\r
   UINTN       BufferSize;\r
@@ -306,15 +306,15 @@ MnpGetVlanVariable (
   //\r
   // Get VLAN configuration from EFI Variable\r
   //\r
-  Buffer = NULL;\r
+  Buffer     = NULL;\r
   BufferSize = 0;\r
-  Status = gRT->GetVariable (\r
-                  MnpDeviceData->MacString,\r
-                  &gEfiVlanConfigProtocolGuid,\r
-                  NULL,\r
-                  &BufferSize,\r
-                  NULL\r
-                  );\r
+  Status     = gRT->GetVariable (\r
+                      MnpDeviceData->MacString,\r
+                      &gEfiVlanConfigProtocolGuid,\r
+                      NULL,\r
+                      &BufferSize,\r
+                      NULL\r
+                      );\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     return EFI_NOT_FOUND;\r
   }\r
@@ -361,9 +361,9 @@ MnpGetVlanVariable (
 **/\r
 EFI_STATUS\r
 MnpSetVlanVariable (\r
-  IN MNP_DEVICE_DATA             *MnpDeviceData,\r
-  IN UINTN                       NumberOfVlan,\r
-  IN VLAN_TCI                    *VlanVariable\r
+  IN MNP_DEVICE_DATA  *MnpDeviceData,\r
+  IN UINTN            NumberOfVlan,\r
+  IN VLAN_TCI         *VlanVariable\r
   )\r
 {\r
   return gRT->SetVariable (\r
@@ -375,7 +375,6 @@ MnpSetVlanVariable (
                 );\r
 }\r
 \r
-\r
 /**\r
   Create a VLAN device or modify the configuration parameter of an\r
   already-configured VLAN.\r
@@ -410,9 +409,9 @@ MnpSetVlanVariable (
 EFI_STATUS\r
 EFIAPI\r
 VlanConfigSet (\r
-  IN EFI_VLAN_CONFIG_PROTOCOL    *This,\r
-  IN UINT16                      VlanId,\r
-  IN UINT8                       Priority\r
+  IN EFI_VLAN_CONFIG_PROTOCOL  *This,\r
+  IN UINT16                    VlanId,\r
+  IN UINT8                     Priority\r
   )\r
 {\r
   EFI_STATUS        Status;\r
@@ -429,14 +428,14 @@ VlanConfigSet (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  IsAdd = FALSE;\r
+  IsAdd         = FALSE;\r
   MnpDeviceData = MNP_DEVICE_DATA_FROM_THIS (This);\r
   if (MnpDeviceData->NumberOfVlan == 0) {\r
     //\r
     // No existing VLAN, this is the first VLAN to add\r
     //\r
-    IsAdd = TRUE;\r
-    Entry = GetFirstNode (&MnpDeviceData->ServiceList);\r
+    IsAdd          = TRUE;\r
+    Entry          = GetFirstNode (&MnpDeviceData->ServiceList);\r
     MnpServiceData = MNP_SERVICE_DATA_FROM_LINK (Entry);\r
 \r
     if (VlanId != 0) {\r
@@ -470,7 +469,7 @@ VlanConfigSet (
       //\r
       // VlanId not found, create a new MNP service data\r
       //\r
-      IsAdd = TRUE;\r
+      IsAdd          = TRUE;\r
       MnpServiceData = MnpCreateServiceData (MnpDeviceData, VlanId, Priority);\r
       if (MnpServiceData == NULL) {\r
         return EFI_OUT_OF_RESOURCES;\r
@@ -478,7 +477,7 @@ VlanConfigSet (
     }\r
   }\r
 \r
-  MnpServiceData->VlanId = VlanId;\r
+  MnpServiceData->VlanId   = VlanId;\r
   MnpServiceData->Priority = Priority;\r
   if (IsAdd) {\r
     MnpDeviceData->NumberOfVlan++;\r
@@ -516,6 +515,7 @@ VlanConfigSet (
         break;\r
       }\r
     }\r
+\r
     ASSERT (Index < NumberOfVlan);\r
 \r
     NewVariable = OldVariable;\r
@@ -536,7 +536,6 @@ Exit:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Find configuration information for specified VLAN or all configured VLANs.\r
 \r
@@ -559,10 +558,10 @@ Exit:
 EFI_STATUS\r
 EFIAPI\r
 VlanConfigFind (\r
-  IN     EFI_VLAN_CONFIG_PROTOCOL    *This,\r
-  IN     UINT16                      *VlanId OPTIONAL,\r
-     OUT UINT16                      *NumberOfVlan,\r
-     OUT EFI_VLAN_FIND_DATA          **Entries\r
+  IN     EFI_VLAN_CONFIG_PROTOCOL  *This,\r
+  IN     UINT16                    *VlanId OPTIONAL,\r
+  OUT UINT16                       *NumberOfVlan,\r
+  OUT EFI_VLAN_FIND_DATA           **Entries\r
   )\r
 {\r
   MNP_DEVICE_DATA     *MnpDeviceData;\r
@@ -570,7 +569,7 @@ VlanConfigFind (
   LIST_ENTRY          *Entry;\r
   EFI_VLAN_FIND_DATA  *VlanData;\r
 \r
-  if ((This == NULL) || (VlanId != NULL && *VlanId > 4094) || (NumberOfVlan == NULL) || (Entries == NULL)) {\r
+  if ((This == NULL) || ((VlanId != NULL) && (*VlanId > 4094)) || (NumberOfVlan == NULL) || (Entries == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -586,8 +585,8 @@ VlanConfigFind (
     //\r
     // Return all current VLAN configuration\r
     //\r
-    *NumberOfVlan = (UINT16) MnpDeviceData->NumberOfVlan;\r
-    VlanData = AllocateZeroPool (*NumberOfVlan * sizeof (EFI_VLAN_FIND_DATA));\r
+    *NumberOfVlan = (UINT16)MnpDeviceData->NumberOfVlan;\r
+    VlanData      = AllocateZeroPool (*NumberOfVlan * sizeof (EFI_VLAN_FIND_DATA));\r
     if (VlanData == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
@@ -596,7 +595,7 @@ VlanConfigFind (
     NET_LIST_FOR_EACH (Entry, &MnpDeviceData->ServiceList) {\r
       MnpServiceData = MNP_SERVICE_DATA_FROM_LINK (Entry);\r
 \r
-      VlanData->VlanId = MnpServiceData->VlanId;\r
+      VlanData->VlanId   = MnpServiceData->VlanId;\r
       VlanData->Priority = MnpServiceData->Priority;\r
       VlanData++;\r
     }\r
@@ -616,16 +615,16 @@ VlanConfigFind (
   if (VlanData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
-  VlanData->VlanId = MnpServiceData->VlanId;\r
+\r
+  VlanData->VlanId   = MnpServiceData->VlanId;\r
   VlanData->Priority = MnpServiceData->Priority;\r
 \r
   *NumberOfVlan = 1;\r
-  *Entries = VlanData;\r
+  *Entries      = VlanData;\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Remove the configured VLAN device.\r
 \r
@@ -646,8 +645,8 @@ VlanConfigFind (
 EFI_STATUS\r
 EFIAPI\r
 VlanConfigRemove (\r
-  IN EFI_VLAN_CONFIG_PROTOCOL    *This,\r
-  IN UINT16                      VlanId\r
+  IN EFI_VLAN_CONFIG_PROTOCOL  *This,\r
+  IN UINT16                    VlanId\r
   )\r
 {\r
   EFI_STATUS        Status;\r
index 4e0ddef2df11a243f177a5a09499cc1f4530665d..03dc1cac387511ed8ea91d0e257273a3fd1d2faa 100644 (file)
@@ -11,8 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "MnpDriver.h"\r
 \r
-extern EFI_VLAN_CONFIG_PROTOCOL mVlanConfigProtocolTemplate;\r
-\r
+extern EFI_VLAN_CONFIG_PROTOCOL  mVlanConfigProtocolTemplate;\r
 \r
 /**\r
   Create a child handle for the VLAN ID.\r
@@ -27,10 +26,10 @@ extern EFI_VLAN_CONFIG_PROTOCOL mVlanConfigProtocolTemplate;
 **/\r
 EFI_HANDLE\r
 MnpCreateVlanChild (\r
-  IN     EFI_HANDLE                  ImageHandle,\r
-  IN     EFI_HANDLE                  ControllerHandle,\r
-  IN     UINT16                      VlanId,\r
-     OUT EFI_DEVICE_PATH_PROTOCOL    **Devicepath OPTIONAL\r
+  IN     EFI_HANDLE             ImageHandle,\r
+  IN     EFI_HANDLE             ControllerHandle,\r
+  IN     UINT16                 VlanId,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **Devicepath OPTIONAL\r
   );\r
 \r
 /**\r
@@ -46,9 +45,9 @@ MnpCreateVlanChild (
 **/\r
 BOOLEAN\r
 MnpRemoveVlanTag (\r
-  IN OUT MNP_DEVICE_DATA   *MnpDeviceData,\r
-  IN OUT NET_BUF           *Nbuf,\r
-     OUT UINT16            *VlanId\r
+  IN OUT MNP_DEVICE_DATA  *MnpDeviceData,\r
+  IN OUT NET_BUF          *Nbuf,\r
+  OUT UINT16              *VlanId\r
   );\r
 \r
 /**\r
@@ -65,11 +64,11 @@ MnpRemoveVlanTag (
 **/\r
 VOID\r
 MnpInsertVlanTag (\r
-  IN     MNP_SERVICE_DATA                    *MnpServiceData,\r
-  IN     EFI_MANAGED_NETWORK_TRANSMIT_DATA   *TxData,\r
-     OUT UINT16                              *ProtocolType,\r
-  IN OUT UINT8                               **Packet,\r
-  IN OUT UINT32                              *Length\r
+  IN     MNP_SERVICE_DATA                   *MnpServiceData,\r
+  IN     EFI_MANAGED_NETWORK_TRANSMIT_DATA  *TxData,\r
+  OUT UINT16                                *ProtocolType,\r
+  IN OUT UINT8                              **Packet,\r
+  IN OUT UINT32                             *Length\r
   );\r
 \r
 /**\r
@@ -88,9 +87,9 @@ MnpInsertVlanTag (
 **/\r
 EFI_STATUS\r
 MnpGetVlanVariable (\r
-  IN     MNP_DEVICE_DATA   *MnpDeviceData,\r
-     OUT UINTN             *NumberOfVlan,\r
-     OUT VLAN_TCI          **VlanVariable\r
+  IN     MNP_DEVICE_DATA  *MnpDeviceData,\r
+  OUT UINTN               *NumberOfVlan,\r
+  OUT VLAN_TCI            **VlanVariable\r
   );\r
 \r
 /**\r
@@ -106,9 +105,9 @@ MnpGetVlanVariable (
 **/\r
 EFI_STATUS\r
 MnpSetVlanVariable (\r
-  IN MNP_DEVICE_DATA             *MnpDeviceData,\r
-  IN UINTN                       NumberOfVlan,\r
-  IN VLAN_TCI                    *VlanVariable\r
+  IN MNP_DEVICE_DATA  *MnpDeviceData,\r
+  IN UINTN            NumberOfVlan,\r
+  IN VLAN_TCI         *VlanVariable\r
   );\r
 \r
 /**\r
@@ -145,9 +144,9 @@ MnpSetVlanVariable (
 EFI_STATUS\r
 EFIAPI\r
 VlanConfigSet (\r
-  IN EFI_VLAN_CONFIG_PROTOCOL    *This,\r
-  IN UINT16                      VlanId,\r
-  IN UINT8                       Priority\r
+  IN EFI_VLAN_CONFIG_PROTOCOL  *This,\r
+  IN UINT16                    VlanId,\r
+  IN UINT8                     Priority\r
   );\r
 \r
 /**\r
@@ -172,10 +171,10 @@ VlanConfigSet (
 EFI_STATUS\r
 EFIAPI\r
 VlanConfigFind (\r
-  IN     EFI_VLAN_CONFIG_PROTOCOL    *This,\r
-  IN     UINT16                      *VlanId OPTIONAL,\r
-     OUT UINT16                      *NumberOfVlan,\r
-     OUT EFI_VLAN_FIND_DATA          **Entries\r
+  IN     EFI_VLAN_CONFIG_PROTOCOL  *This,\r
+  IN     UINT16                    *VlanId OPTIONAL,\r
+  OUT UINT16                       *NumberOfVlan,\r
+  OUT EFI_VLAN_FIND_DATA           **Entries\r
   );\r
 \r
 /**\r
@@ -198,8 +197,8 @@ VlanConfigFind (
 EFI_STATUS\r
 EFIAPI\r
 VlanConfigRemove (\r
-  IN EFI_VLAN_CONFIG_PROTOCOL    *This,\r
-  IN UINT16                      VlanId\r
+  IN EFI_VLAN_CONFIG_PROTOCOL  *This,\r
+  IN UINT16                    VlanId\r
   );\r
 \r
 #endif\r
index 8b84caf1139d9e1b947997be18a87435ad5a1380..2455a28d278cf5786b7c32b2fcf60e7510784e38 100644 (file)
@@ -11,6 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // EFI Component Name Functions\r
 //\r
+\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
 \r
@@ -55,10 +56,9 @@ EFIAPI
 Mtftp4ComponentNameGetDriverName (\r
   IN     EFI_COMPONENT_NAME_PROTOCOL  *This,\r
   IN     CHAR8                        *Language,\r
-     OUT CHAR16                       **DriverName\r
+  OUT CHAR16                          **DriverName\r
   );\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r
   that is being managed by a driver.\r
@@ -130,14 +130,13 @@ Mtftp4ComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp4ComponentNameGetControllerName (\r
-  IN     EFI_COMPONENT_NAME_PROTOCOL               *This,\r
-  IN     EFI_HANDLE                                ControllerHandle,\r
-  IN     EFI_HANDLE                                ChildHandle        OPTIONAL,\r
-  IN     CHAR8                                     *Language,\r
-     OUT CHAR16                                    **ControllerName\r
+  IN     EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN     EFI_HANDLE                   ControllerHandle,\r
+  IN     EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN     CHAR8                        *Language,\r
+  OUT CHAR16                          **ControllerName\r
   );\r
 \r
-\r
 ///\r
 /// EFI Component Name Protocol\r
 ///\r
@@ -150,14 +149,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gMtftp4ComponentName
 ///\r
 /// EFI Component Name 2 Protocol\r
 ///\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gMtftp4ComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) Mtftp4ComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) Mtftp4ComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gMtftp4ComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)Mtftp4ComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)Mtftp4ComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mMtftp4DriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mMtftp4DriverNameTable[] = {\r
   {\r
     "eng;en",\r
     L"MTFTP4 Network Service"\r
@@ -168,7 +166,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mMtftp4DriverNameTable[]
   }\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE *gMtftp4ControllerNameTable = NULL;\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  *gMtftp4ControllerNameTable = NULL;\r
 \r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
@@ -214,7 +212,7 @@ EFIAPI
 Mtftp4ComponentNameGetDriverName (\r
   IN     EFI_COMPONENT_NAME_PROTOCOL  *This,\r
   IN     CHAR8                        *Language,\r
-     OUT CHAR16                       **DriverName\r
+  OUT CHAR16                          **DriverName\r
   )\r
 {\r
   return LookupUnicodeString2 (\r
@@ -238,12 +236,12 @@ Mtftp4ComponentNameGetDriverName (
 **/\r
 EFI_STATUS\r
 UpdateName (\r
-  IN   EFI_MTFTP4_PROTOCOL             *Mtftp4\r
+  IN   EFI_MTFTP4_PROTOCOL  *Mtftp4\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  CHAR16                           HandleName[80];\r
-  EFI_MTFTP4_MODE_DATA             ModeData;\r
+  EFI_STATUS            Status;\r
+  CHAR16                HandleName[80];\r
+  EFI_MTFTP4_MODE_DATA  ModeData;\r
 \r
   if (Mtftp4 == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -258,7 +256,9 @@ UpdateName (
     return Status;\r
   }\r
 \r
-  UnicodeSPrint (HandleName, sizeof (HandleName),\r
+  UnicodeSPrint (\r
+    HandleName,\r
+    sizeof (HandleName),\r
     L"MTFTPv4 (ServerIp=%d.%d.%d.%d, ServerPort=%d)",\r
     ModeData.ConfigData.ServerIp.Addr[0],\r
     ModeData.ConfigData.ServerIp.Addr[1],\r
@@ -363,15 +363,15 @@ UpdateName (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp4ComponentNameGetControllerName (\r
-  IN     EFI_COMPONENT_NAME_PROTOCOL               *This,\r
-  IN     EFI_HANDLE                                ControllerHandle,\r
-  IN     EFI_HANDLE                                ChildHandle        OPTIONAL,\r
-  IN     CHAR8                                     *Language,\r
-     OUT CHAR16                                    **ControllerName\r
+  IN     EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN     EFI_HANDLE                   ControllerHandle,\r
+  IN     EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN     CHAR8                        *Language,\r
+  OUT CHAR16                          **ControllerName\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_MTFTP4_PROTOCOL           *Mtftp4;\r
+  EFI_STATUS           Status;\r
+  EFI_MTFTP4_PROTOCOL  *Mtftp4;\r
 \r
   //\r
   // Only provide names for child handles.\r
index a795d262473e7c300c4af27eaea6ba974d3df4a5..b19192bfc2b5de8918129067eafda021718de580 100644 (file)
@@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Mtftp4Impl.h"\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL   gMtftp4DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gMtftp4DriverBinding = {\r
   Mtftp4DriverBindingSupported,\r
   Mtftp4DriverBindingStart,\r
   Mtftp4DriverBindingStop,\r
@@ -22,7 +22,6 @@ EFI_SERVICE_BINDING_PROTOCOL  gMtftp4ServiceBindingTemplete = {
   Mtftp4ServiceBindingDestroyChild\r
 };\r
 \r
-\r
 /**\r
   The driver entry point which installs multiple protocols to the ImageHandle.\r
 \r
@@ -36,8 +35,8 @@ EFI_SERVICE_BINDING_PROTOCOL  gMtftp4ServiceBindingTemplete = {
 EFI_STATUS\r
 EFIAPI\r
 Mtftp4DriverEntryPoint (\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
   return EfiLibInstallDriverBindingComponentName2 (\r
@@ -50,7 +49,6 @@ Mtftp4DriverEntryPoint (
            );\r
 }\r
 \r
-\r
 /**\r
   Test whether MTFTP driver support this controller.\r
 \r
@@ -75,9 +73,9 @@ Mtftp4DriverEntryPoint (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp4DriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -94,7 +92,6 @@ Mtftp4DriverBindingSupported (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Config a NULL UDP that is used to keep the connection between UDP and MTFTP.\r
 \r
@@ -110,14 +107,13 @@ Mtftp4DriverBindingSupported (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp4ConfigNullUdp (\r
-  IN UDP_IO                 *UdpIo,\r
-  IN VOID                   *Context\r
+  IN UDP_IO  *UdpIo,\r
+  IN VOID    *Context\r
   )\r
 {\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Create then initialize a MTFTP service binding instance.\r
 \r
@@ -136,16 +132,16 @@ Mtftp4ConfigNullUdp (
 **/\r
 EFI_STATUS\r
 Mtftp4CreateService (\r
-  IN     EFI_HANDLE            Controller,\r
-  IN     EFI_HANDLE            Image,\r
-     OUT MTFTP4_SERVICE        **Service\r
+  IN     EFI_HANDLE   Controller,\r
+  IN     EFI_HANDLE   Image,\r
+  OUT MTFTP4_SERVICE  **Service\r
   )\r
 {\r
-  MTFTP4_SERVICE            *MtftpSb;\r
-  EFI_STATUS                Status;\r
+  MTFTP4_SERVICE  *MtftpSb;\r
+  EFI_STATUS      Status;\r
 \r
-  *Service  = NULL;\r
-  MtftpSb   = AllocatePool (sizeof (MTFTP4_SERVICE));\r
+  *Service = NULL;\r
+  MtftpSb  = AllocatePool (sizeof (MTFTP4_SERVICE));\r
 \r
   if (MtftpSb == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
@@ -229,7 +225,6 @@ Mtftp4CreateService (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Release all the resource used the MTFTP service binding instance.\r
 \r
@@ -238,7 +233,7 @@ Mtftp4CreateService (
 **/\r
 VOID\r
 Mtftp4CleanService (\r
-  IN MTFTP4_SERVICE     *MtftpSb\r
+  IN MTFTP4_SERVICE  *MtftpSb\r
   )\r
 {\r
   UdpIoFreeIo (MtftpSb->ConnectUdp);\r
@@ -247,7 +242,6 @@ Mtftp4CleanService (
   gBS->CloseEvent (MtftpSb->Timer);\r
 }\r
 \r
-\r
 /**\r
   Start the MTFTP driver on this controller.\r
 \r
@@ -272,8 +266,8 @@ Mtftp4DriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  MTFTP4_SERVICE            *MtftpSb;\r
-  EFI_STATUS                Status;\r
+  MTFTP4_SERVICE  *MtftpSb;\r
+  EFI_STATUS      Status;\r
 \r
   //\r
   // Directly return if driver is already running.\r
@@ -296,6 +290,7 @@ Mtftp4DriverBindingStart (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   ASSERT (MtftpSb != NULL);\r
 \r
   Status = gBS->SetTimer (MtftpSb->Timer, TimerPeriodic, TICKS_PER_SECOND);\r
@@ -346,8 +341,8 @@ ON_ERROR:
 EFI_STATUS\r
 EFIAPI\r
 Mtftp4DestroyChildEntryInHandleBuffer (\r
-  IN LIST_ENTRY         *Entry,\r
-  IN VOID               *Context\r
+  IN LIST_ENTRY  *Entry,\r
+  IN VOID        *Context\r
   )\r
 {\r
   MTFTP4_PROTOCOL               *Instance;\r
@@ -355,14 +350,14 @@ Mtftp4DestroyChildEntryInHandleBuffer (
   UINTN                         NumberOfChildren;\r
   EFI_HANDLE                    *ChildHandleBuffer;\r
 \r
-  if (Entry == NULL || Context == NULL) {\r
+  if ((Entry == NULL) || (Context == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Instance = NET_LIST_USER_STRUCT_S (Entry, MTFTP4_PROTOCOL, Link, MTFTP4_PROTOCOL_SIGNATURE);\r
-  ServiceBinding    = ((MTFTP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ServiceBinding;\r
-  NumberOfChildren  = ((MTFTP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->NumberOfChildren;\r
-  ChildHandleBuffer = ((MTFTP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ChildHandleBuffer;\r
+  Instance          = NET_LIST_USER_STRUCT_S (Entry, MTFTP4_PROTOCOL, Link, MTFTP4_PROTOCOL_SIGNATURE);\r
+  ServiceBinding    = ((MTFTP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ServiceBinding;\r
+  NumberOfChildren  = ((MTFTP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->NumberOfChildren;\r
+  ChildHandleBuffer = ((MTFTP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ChildHandleBuffer;\r
 \r
   if (!NetIsInHandleBuffer (Instance->Handle, NumberOfChildren, ChildHandleBuffer)) {\r
     return EFI_SUCCESS;\r
@@ -387,18 +382,18 @@ Mtftp4DestroyChildEntryInHandleBuffer (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp4DriverBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  Controller,\r
-  IN UINTN                       NumberOfChildren,\r
-  IN EFI_HANDLE                  *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_SERVICE_BINDING_PROTOCOL               *ServiceBinding;\r
-  MTFTP4_SERVICE                             *MtftpSb;\r
-  EFI_HANDLE                                 NicHandle;\r
-  EFI_STATUS                                 Status;\r
-  LIST_ENTRY                                 *List;\r
-  MTFTP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT Context;\r
+  EFI_SERVICE_BINDING_PROTOCOL                *ServiceBinding;\r
+  MTFTP4_SERVICE                              *MtftpSb;\r
+  EFI_HANDLE                                  NicHandle;\r
+  EFI_STATUS                                  Status;\r
+  LIST_ENTRY                                  *List;\r
+  MTFTP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT  Context;\r
 \r
   //\r
   // MTFTP driver opens UDP child, So, Controller is a UDP\r
@@ -414,7 +409,7 @@ Mtftp4DriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   NicHandle,\r
                   &gEfiMtftp4ServiceBindingProtocolGuid,\r
-                  (VOID **) &ServiceBinding,\r
+                  (VOID **)&ServiceBinding,\r
                   This->DriverBindingHandle,\r
                   NicHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -430,19 +425,19 @@ Mtftp4DriverBindingStop (
     //\r
     // Destroy the Mtftp4 child instance in ChildHandleBuffer.\r
     //\r
-    List = &MtftpSb->Children;\r
+    List                      = &MtftpSb->Children;\r
     Context.ServiceBinding    = ServiceBinding;\r
     Context.NumberOfChildren  = NumberOfChildren;\r
     Context.ChildHandleBuffer = ChildHandleBuffer;\r
-    Status = NetDestroyLinkList (\r
-               List,\r
-               Mtftp4DestroyChildEntryInHandleBuffer,\r
-               &Context,\r
-               NULL\r
-               );\r
+    Status                    = NetDestroyLinkList (\r
+                                  List,\r
+                                  Mtftp4DestroyChildEntryInHandleBuffer,\r
+                                  &Context,\r
+                                  NULL\r
+                                  );\r
   }\r
 \r
-  if (NumberOfChildren == 0 && IsListEmpty (&MtftpSb->Children)) {\r
+  if ((NumberOfChildren == 0) && IsListEmpty (&MtftpSb->Children)) {\r
     gBS->UninstallProtocolInterface (\r
            NicHandle,\r
            &gEfiMtftp4ServiceBindingProtocolGuid,\r
@@ -454,6 +449,7 @@ Mtftp4DriverBindingStop (
       FreeUnicodeStringTable (gMtftp4ControllerNameTable);\r
       gMtftp4ControllerNameTable = NULL;\r
     }\r
+\r
     FreePool (MtftpSb);\r
 \r
     Status = EFI_SUCCESS;\r
@@ -462,7 +458,6 @@ Mtftp4DriverBindingStop (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Initialize a MTFTP protocol instance which is the child of MtftpSb.\r
 \r
@@ -472,8 +467,8 @@ Mtftp4DriverBindingStop (
 **/\r
 VOID\r
 Mtftp4InitProtocol (\r
-  IN     MTFTP4_SERVICE         *MtftpSb,\r
-     OUT MTFTP4_PROTOCOL        *Instance\r
+  IN     MTFTP4_SERVICE  *MtftpSb,\r
+  OUT MTFTP4_PROTOCOL    *Instance\r
   )\r
 {\r
   ZeroMem (Instance, sizeof (MTFTP4_PROTOCOL));\r
@@ -481,13 +476,12 @@ Mtftp4InitProtocol (
   Instance->Signature = MTFTP4_PROTOCOL_SIGNATURE;\r
   InitializeListHead (&Instance->Link);\r
   CopyMem (&Instance->Mtftp4, &gMtftp4ProtocolTemplate, sizeof (Instance->Mtftp4));\r
-  Instance->State     = MTFTP4_STATE_UNCONFIGED;\r
-  Instance->Service   = MtftpSb;\r
+  Instance->State   = MTFTP4_STATE_UNCONFIGED;\r
+  Instance->Service = MtftpSb;\r
 \r
   InitializeListHead (&Instance->Blocks);\r
 }\r
 \r
-\r
 /**\r
   Create a MTFTP child for the service binding instance, then\r
   install the MTFTP protocol to the ChildHandle.\r
@@ -504,14 +498,14 @@ EFI_STATUS
 EFIAPI\r
 Mtftp4ServiceBindingCreateChild (\r
   IN EFI_SERVICE_BINDING_PROTOCOL  *This,\r
-  IN EFI_HANDLE                *ChildHandle\r
+  IN EFI_HANDLE                    *ChildHandle\r
   )\r
 {\r
-  MTFTP4_SERVICE            *MtftpSb;\r
-  MTFTP4_PROTOCOL           *Instance;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
-  VOID                      *Udp4;\r
+  MTFTP4_SERVICE   *MtftpSb;\r
+  MTFTP4_PROTOCOL  *Instance;\r
+  EFI_STATUS       Status;\r
+  EFI_TPL          OldTpl;\r
+  VOID             *Udp4;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -556,7 +550,7 @@ Mtftp4ServiceBindingCreateChild (
     return Status;\r
   }\r
 \r
-  Instance->Handle  = *ChildHandle;\r
+  Instance->Handle = *ChildHandle;\r
 \r
   //\r
   // Open the Udp4 protocol BY_CHILD.\r
@@ -564,7 +558,7 @@ Mtftp4ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   MtftpSb->ConnectUdp->UdpHandle,\r
                   &gEfiUdp4ProtocolGuid,\r
-                  (VOID **) &Udp4,\r
+                  (VOID **)&Udp4,\r
                   gMtftp4DriverBinding.DriverBindingHandle,\r
                   Instance->Handle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -579,7 +573,7 @@ Mtftp4ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   Instance->UnicastPort->UdpHandle,\r
                   &gEfiUdp4ProtocolGuid,\r
-                  (VOID **) &Udp4,\r
+                  (VOID **)&Udp4,\r
                   gMtftp4DriverBinding.DriverBindingHandle,\r
                   Instance->Handle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -625,7 +619,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Destroy one of the service binding's child.\r
 \r
@@ -641,15 +634,15 @@ ON_ERROR:
 EFI_STATUS\r
 EFIAPI\r
 Mtftp4ServiceBindingDestroyChild (\r
-  IN EFI_SERVICE_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                   ChildHandle\r
+  IN EFI_SERVICE_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                    ChildHandle\r
   )\r
 {\r
-  MTFTP4_SERVICE            *MtftpSb;\r
-  MTFTP4_PROTOCOL           *Instance;\r
-  EFI_MTFTP4_PROTOCOL       *Mtftp4;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
+  MTFTP4_SERVICE       *MtftpSb;\r
+  MTFTP4_PROTOCOL      *Instance;\r
+  EFI_MTFTP4_PROTOCOL  *Mtftp4;\r
+  EFI_STATUS           Status;\r
+  EFI_TPL              OldTpl;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -661,7 +654,7 @@ Mtftp4ServiceBindingDestroyChild (
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiMtftp4ProtocolGuid,\r
-                  (VOID **) &Mtftp4,\r
+                  (VOID **)&Mtftp4,\r
                   gMtftp4DriverBinding.DriverBindingHandle,\r
                   ChildHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -671,8 +664,8 @@ Mtftp4ServiceBindingDestroyChild (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  Instance  = MTFTP4_PROTOCOL_FROM_THIS (Mtftp4);\r
-  MtftpSb   = MTFTP4_SERVICE_FROM_THIS (This);\r
+  Instance = MTFTP4_PROTOCOL_FROM_THIS (Mtftp4);\r
+  MtftpSb  = MTFTP4_SERVICE_FROM_THIS (This);\r
 \r
   if (Instance->Service != MtftpSb) {\r
     return EFI_INVALID_PARAMETER;\r
index 6637c5a93ee5fba1be1d488688373d190a447bb9..82761876d1d79f59c02bc489a0cf3824f228280f 100644 (file)
@@ -37,9 +37,9 @@ extern EFI_UNICODE_STRING_TABLE      *gMtftp4ControllerNameTable;
 EFI_STATUS\r
 EFIAPI\r
 Mtftp4DriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   );\r
 \r
 /**\r
@@ -82,10 +82,10 @@ Mtftp4DriverBindingStart (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp4DriverBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  Controller,\r
-  IN UINTN                       NumberOfChildren,\r
-  IN EFI_HANDLE                  *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   );\r
 \r
 /**\r
@@ -104,7 +104,7 @@ EFI_STATUS
 EFIAPI\r
 Mtftp4ServiceBindingCreateChild (\r
   IN EFI_SERVICE_BINDING_PROTOCOL  *This,\r
-  IN EFI_HANDLE                *ChildHandle\r
+  IN EFI_HANDLE                    *ChildHandle\r
   );\r
 \r
 /**\r
@@ -122,10 +122,8 @@ Mtftp4ServiceBindingCreateChild (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp4ServiceBindingDestroyChild (\r
-  IN EFI_SERVICE_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                   ChildHandle\r
+  IN EFI_SERVICE_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                    ChildHandle\r
   );\r
 \r
-\r
-\r
 #endif\r
index 4bb37224cddd5334efa392e0ee542c0e36981742..211ddbcdcc09de912b6daebc98138c410908374d 100644 (file)
@@ -7,10 +7,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #include "Mtftp4Impl.h"\r
 \r
-\r
 /**\r
   Clean up the MTFTP session to get ready for new operation.\r
 \r
@@ -20,14 +18,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 VOID\r
 Mtftp4CleanOperation (\r
-  IN OUT MTFTP4_PROTOCOL        *Instance,\r
-  IN     EFI_STATUS             Result\r
+  IN OUT MTFTP4_PROTOCOL  *Instance,\r
+  IN     EFI_STATUS       Result\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  MTFTP4_BLOCK_RANGE        *Block;\r
-  EFI_MTFTP4_TOKEN          *Token;\r
+  LIST_ENTRY          *Entry;\r
+  LIST_ENTRY          *Next;\r
+  MTFTP4_BLOCK_RANGE  *Block;\r
+  EFI_MTFTP4_TOKEN    *Token;\r
 \r
   //\r
   // Free various resources.\r
@@ -71,7 +69,7 @@ Mtftp4CleanOperation (
 \r
   ZeroMem (&Instance->RequestOption, sizeof (MTFTP4_OPTION));\r
 \r
-  Instance->Operation     = 0;\r
+  Instance->Operation = 0;\r
 \r
   Instance->BlkSize       = MTFTP4_DEFAULT_BLKSIZE;\r
   Instance->WindowSize    = 1;\r
@@ -91,7 +89,6 @@ Mtftp4CleanOperation (
   Instance->Master        = TRUE;\r
 }\r
 \r
-\r
 /**\r
   Check packet for GetInfo.\r
 \r
@@ -109,47 +106,48 @@ Mtftp4CleanOperation (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp4GetInfoCheckPacket (\r
-  IN EFI_MTFTP4_PROTOCOL    *This,\r
-  IN EFI_MTFTP4_TOKEN       *Token,\r
-  IN UINT16                 PacketLen,\r
-  IN EFI_MTFTP4_PACKET      *Packet\r
+  IN EFI_MTFTP4_PROTOCOL  *This,\r
+  IN EFI_MTFTP4_TOKEN     *Token,\r
+  IN UINT16               PacketLen,\r
+  IN EFI_MTFTP4_PACKET    *Packet\r
   )\r
 {\r
-  MTFTP4_GETINFO_STATE      *State;\r
-  EFI_STATUS                Status;\r
-  UINT16                    OpCode;\r
+  MTFTP4_GETINFO_STATE     *State;\r
+  EFI_STATUS               Status;\r
+  UINT16                   OpCode;\r
   EFI_MTFTP4_ERROR_HEADER  *ErrorHeader;\r
 \r
-  State   = (MTFTP4_GETINFO_STATE *) Token->Context;\r
-  OpCode   = NTOHS (Packet->OpCode);\r
+  State  = (MTFTP4_GETINFO_STATE *)Token->Context;\r
+  OpCode = NTOHS (Packet->OpCode);\r
 \r
   //\r
   // Set the GetInfo's return status according to the OpCode.\r
   //\r
   switch (OpCode) {\r
-  case EFI_MTFTP4_OPCODE_ERROR:\r
-    ErrorHeader = (EFI_MTFTP4_ERROR_HEADER *) Packet;\r
-    if (ErrorHeader->ErrorCode == EFI_MTFTP4_ERRORCODE_FILE_NOT_FOUND) {\r
-      DEBUG ((DEBUG_ERROR, "TFTP error code 1 (File Not Found)\n"));\r
-    } else {\r
-      DEBUG ((DEBUG_ERROR, "TFTP error code %d\n", ErrorHeader->ErrorCode));\r
-    }\r
-    State->Status = EFI_TFTP_ERROR;\r
-    break;\r
-\r
-  case EFI_MTFTP4_OPCODE_OACK:\r
-    State->Status = EFI_SUCCESS;\r
-    break;\r
-\r
-  default:\r
-    State->Status = EFI_PROTOCOL_ERROR;\r
+    case EFI_MTFTP4_OPCODE_ERROR:\r
+      ErrorHeader = (EFI_MTFTP4_ERROR_HEADER *)Packet;\r
+      if (ErrorHeader->ErrorCode == EFI_MTFTP4_ERRORCODE_FILE_NOT_FOUND) {\r
+        DEBUG ((DEBUG_ERROR, "TFTP error code 1 (File Not Found)\n"));\r
+      } else {\r
+        DEBUG ((DEBUG_ERROR, "TFTP error code %d\n", ErrorHeader->ErrorCode));\r
+      }\r
+\r
+      State->Status = EFI_TFTP_ERROR;\r
+      break;\r
+\r
+    case EFI_MTFTP4_OPCODE_OACK:\r
+      State->Status = EFI_SUCCESS;\r
+      break;\r
+\r
+    default:\r
+      State->Status = EFI_PROTOCOL_ERROR;\r
   }\r
 \r
   //\r
   // Allocate buffer then copy the packet over. Use gBS->AllocatePool\r
   // in case AllocatePool will implements something tricky.\r
   //\r
-  Status = gBS->AllocatePool (EfiBootServicesData, PacketLen, (VOID **) State->Packet);\r
+  Status = gBS->AllocatePool (EfiBootServicesData, PacketLen, (VOID **)State->Packet);\r
 \r
   if (EFI_ERROR (Status)) {\r
     State->Status = EFI_OUT_OF_RESOURCES;\r
@@ -162,7 +160,6 @@ Mtftp4GetInfoCheckPacket (
   return EFI_ABORTED;\r
 }\r
 \r
-\r
 /**\r
   Check whether the override data is valid.\r
 \r
@@ -179,14 +176,14 @@ Mtftp4GetInfoCheckPacket (
 **/\r
 BOOLEAN\r
 Mtftp4OverrideValid (\r
-  IN MTFTP4_PROTOCOL          *Instance,\r
-  IN EFI_MTFTP4_OVERRIDE_DATA *Override\r
+  IN MTFTP4_PROTOCOL           *Instance,\r
+  IN EFI_MTFTP4_OVERRIDE_DATA  *Override\r
   )\r
 {\r
-  EFI_MTFTP4_CONFIG_DATA    *Config;\r
-  IP4_ADDR                  Ip;\r
-  IP4_ADDR                  Netmask;\r
-  IP4_ADDR                  Gateway;\r
+  EFI_MTFTP4_CONFIG_DATA  *Config;\r
+  IP4_ADDR                Ip;\r
+  IP4_ADDR                Netmask;\r
+  IP4_ADDR                Gateway;\r
 \r
   CopyMem (&Ip, &Override->ServerIp, sizeof (IP4_ADDR));\r
   if (IP4_IS_UNSPECIFIED (NTOHL (Ip)) || IP4_IS_LOCAL_BROADCAST (NTOHL (Ip))) {\r
@@ -205,7 +202,7 @@ Mtftp4OverrideValid (
     Netmask = NTOHL (Netmask);\r
     Ip      = NTOHL (Ip);\r
 \r
-    if ((Netmask != 0 && !NetIp4IsUnicast (Gateway, Netmask)) || !IP4_NET_EQUAL (Gateway, Ip, Netmask)) {\r
+    if (((Netmask != 0) && !NetIp4IsUnicast (Gateway, Netmask)) || !IP4_NET_EQUAL (Gateway, Ip, Netmask)) {\r
       return FALSE;\r
     }\r
   }\r
@@ -213,7 +210,6 @@ Mtftp4OverrideValid (
   return TRUE;\r
 }\r
 \r
-\r
 /**\r
   Poll the UDP to get the IP4 default address, which may be retrieved\r
   by DHCP.\r
@@ -231,15 +227,15 @@ Mtftp4OverrideValid (
 **/\r
 BOOLEAN\r
 Mtftp4GetMapping (\r
-  IN MTFTP4_PROTOCOL        *Instance,\r
-  IN UDP_IO                 *UdpIo,\r
-  IN EFI_UDP4_CONFIG_DATA   *UdpCfgData\r
+  IN MTFTP4_PROTOCOL       *Instance,\r
+  IN UDP_IO                *UdpIo,\r
+  IN EFI_UDP4_CONFIG_DATA  *UdpCfgData\r
   )\r
 {\r
-  MTFTP4_SERVICE            *Service;\r
-  EFI_IP4_MODE_DATA         Ip4Mode;\r
-  EFI_UDP4_PROTOCOL         *Udp;\r
-  EFI_STATUS                Status;\r
+  MTFTP4_SERVICE     *Service;\r
+  EFI_IP4_MODE_DATA  Ip4Mode;\r
+  EFI_UDP4_PROTOCOL  *Udp;\r
+  EFI_STATUS         Status;\r
 \r
   ASSERT (Instance->Config.UseDefaultSetting);\r
 \r
@@ -259,17 +255,16 @@ Mtftp4GetMapping (
     Udp->Poll (Udp);\r
 \r
     if (!EFI_ERROR (Udp->GetModeData (Udp, NULL, &Ip4Mode, NULL, NULL)) &&\r
-        Ip4Mode.IsConfigured) {\r
-\r
+        Ip4Mode.IsConfigured)\r
+    {\r
       Udp->Configure (Udp, NULL);\r
-      return (BOOLEAN) (Udp->Configure (Udp, UdpCfgData) == EFI_SUCCESS);\r
+      return (BOOLEAN)(Udp->Configure (Udp, UdpCfgData) == EFI_SUCCESS);\r
     }\r
   }\r
 \r
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   Configure the UDP port for unicast receiving.\r
 \r
@@ -282,14 +277,14 @@ Mtftp4GetMapping (
 **/\r
 EFI_STATUS\r
 Mtftp4ConfigUnicastPort (\r
-  IN UDP_IO                 *UdpIo,\r
-  IN MTFTP4_PROTOCOL        *Instance\r
+  IN UDP_IO           *UdpIo,\r
+  IN MTFTP4_PROTOCOL  *Instance\r
   )\r
 {\r
-  EFI_MTFTP4_CONFIG_DATA    *Config;\r
-  EFI_UDP4_CONFIG_DATA      UdpConfig;\r
-  EFI_STATUS                Status;\r
-  IP4_ADDR                  Ip;\r
+  EFI_MTFTP4_CONFIG_DATA  *Config;\r
+  EFI_UDP4_CONFIG_DATA    UdpConfig;\r
+  EFI_STATUS              Status;\r
+  IP4_ADDR                Ip;\r
 \r
   Config = &Instance->Config;\r
 \r
@@ -305,8 +300,8 @@ Mtftp4ConfigUnicastPort (
   UdpConfig.UseDefaultAddress  = Config->UseDefaultSetting;\r
   IP4_COPY_ADDRESS (&UdpConfig.StationAddress, &Config->StationIp);\r
   IP4_COPY_ADDRESS (&UdpConfig.SubnetMask, &Config->SubnetMask);\r
-  UdpConfig.StationPort        = Config->LocalPort;\r
-  UdpConfig.RemotePort         = 0;\r
+  UdpConfig.StationPort = Config->LocalPort;\r
+  UdpConfig.RemotePort  = 0;\r
 \r
   Ip = HTONL (Instance->ServerIp);\r
   IP4_COPY_ADDRESS (&UdpConfig.RemoteAddress, &Ip);\r
@@ -333,10 +328,10 @@ Mtftp4ConfigUnicastPort (
       UdpIo->Protocol.Udp4->Configure (UdpIo->Protocol.Udp4, NULL);\r
     }\r
   }\r
+\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Start the MTFTP session to do the operation, such as read file,\r
   write file, and read directory.\r
@@ -353,9 +348,9 @@ Mtftp4ConfigUnicastPort (
 **/\r
 EFI_STATUS\r
 Mtftp4Start (\r
-  IN EFI_MTFTP4_PROTOCOL    *This,\r
-  IN EFI_MTFTP4_TOKEN       *Token,\r
-  IN UINT16                 Operation\r
+  IN EFI_MTFTP4_PROTOCOL  *This,\r
+  IN EFI_MTFTP4_TOKEN     *Token,\r
+  IN UINT16               Operation\r
   )\r
 {\r
   MTFTP4_PROTOCOL           *Instance;\r
@@ -369,7 +364,8 @@ Mtftp4Start (
   // Validate the parameters\r
   //\r
   if ((This == NULL) || (Token == NULL) || (Token->Filename == NULL) ||\r
-      ((Token->OptionCount != 0) && (Token->OptionList == NULL))) {\r
+      ((Token->OptionCount != 0) && (Token->OptionList == NULL)))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -377,7 +373,8 @@ Mtftp4Start (
   // User must provide at least one method to collect the data for download.\r
   //\r
   if (((Operation == EFI_MTFTP4_OPCODE_RRQ) || (Operation == EFI_MTFTP4_OPCODE_DIR)) &&\r
-      ((Token->Buffer == NULL) && (Token->CheckPacket == NULL))) {\r
+      ((Token->Buffer == NULL) && (Token->CheckPacket == NULL)))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -385,7 +382,8 @@ Mtftp4Start (
   // User must provide at least one method to provide the data for upload.\r
   //\r
   if ((Operation == EFI_MTFTP4_OPCODE_WRQ) &&\r
-     ((Token->Buffer == NULL) && (Token->PacketNeeded == NULL))) {\r
+      ((Token->Buffer == NULL) && (Token->PacketNeeded == NULL)))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -438,30 +436,30 @@ Mtftp4Start (
   //\r
   // Set the operation parameters from the configuration or override data.\r
   //\r
-  Config                  = &Instance->Config;\r
-  Instance->Token         = Token;\r
-  Instance->BlkSize       = MTFTP4_DEFAULT_BLKSIZE;\r
-  Instance->WindowSize    = MTFTP4_DEFAULT_WINDOWSIZE;\r
+  Config               = &Instance->Config;\r
+  Instance->Token      = Token;\r
+  Instance->BlkSize    = MTFTP4_DEFAULT_BLKSIZE;\r
+  Instance->WindowSize = MTFTP4_DEFAULT_WINDOWSIZE;\r
 \r
   CopyMem (&Instance->ServerIp, &Config->ServerIp, sizeof (IP4_ADDR));\r
-  Instance->ServerIp      = NTOHL (Instance->ServerIp);\r
+  Instance->ServerIp = NTOHL (Instance->ServerIp);\r
 \r
   Instance->ListeningPort = Config->InitialServerPort;\r
   Instance->ConnectedPort = 0;\r
 \r
   CopyMem (&Instance->Gateway, &Config->GatewayIp, sizeof (IP4_ADDR));\r
-  Instance->Gateway       = NTOHL (Instance->Gateway);\r
+  Instance->Gateway = NTOHL (Instance->Gateway);\r
 \r
-  Instance->MaxRetry      = Config->TryCount;\r
-  Instance->Timeout       = Config->TimeoutValue;\r
-  Instance->Master        = TRUE;\r
+  Instance->MaxRetry = Config->TryCount;\r
+  Instance->Timeout  = Config->TimeoutValue;\r
+  Instance->Master   = TRUE;\r
 \r
   if (Override != NULL) {\r
     CopyMem (&Instance->ServerIp, &Override->ServerIp, sizeof (IP4_ADDR));\r
     CopyMem (&Instance->Gateway, &Override->GatewayIp, sizeof (IP4_ADDR));\r
 \r
-    Instance->ServerIp      = NTOHL (Instance->ServerIp);\r
-    Instance->Gateway       = NTOHL (Instance->Gateway);\r
+    Instance->ServerIp = NTOHL (Instance->ServerIp);\r
+    Instance->Gateway  = NTOHL (Instance->Gateway);\r
 \r
     Instance->ListeningPort = Override->ServerPort;\r
     Instance->MaxRetry      = Override->TryCount;\r
@@ -508,7 +506,7 @@ Mtftp4Start (
     goto ON_ERROR;\r
   }\r
 \r
-  gBS->RestoreTPL(OldTpl);\r
+  gBS->RestoreTPL (OldTpl);\r
 \r
   if (Token->Event != NULL) {\r
     return EFI_SUCCESS;\r
@@ -531,7 +529,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Reads the current operational settings.\r
 \r
@@ -550,8 +547,8 @@ ON_ERROR:
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp4GetModeData (\r
-  IN     EFI_MTFTP4_PROTOCOL    *This,\r
-     OUT EFI_MTFTP4_MODE_DATA  *ModeData\r
+  IN     EFI_MTFTP4_PROTOCOL  *This,\r
+  OUT EFI_MTFTP4_MODE_DATA    *ModeData\r
   )\r
 {\r
   MTFTP4_PROTOCOL  *Instance;\r
@@ -563,10 +560,10 @@ EfiMtftp4GetModeData (
 \r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
-  Instance                         = MTFTP4_PROTOCOL_FROM_THIS (This);\r
-  CopyMem(&ModeData->ConfigData, &Instance->Config, sizeof (Instance->Config));\r
+  Instance = MTFTP4_PROTOCOL_FROM_THIS (This);\r
+  CopyMem (&ModeData->ConfigData, &Instance->Config, sizeof (Instance->Config));\r
   ModeData->SupportedOptionCount   = MTFTP4_SUPPORTED_OPTIONS;\r
-  ModeData->SupportedOptoins       = (UINT8 **) mMtftp4SupportedOptions;\r
+  ModeData->SupportedOptoins       = (UINT8 **)mMtftp4SupportedOptions;\r
   ModeData->UnsupportedOptionCount = 0;\r
   ModeData->UnsupportedOptoins     = NULL;\r
 \r
@@ -575,8 +572,6 @@ EfiMtftp4GetModeData (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
-\r
 /**\r
   Initializes, changes, or resets the default operational setting for this\r
   EFI MTFTPv4 Protocol driver instance.\r
@@ -627,16 +622,16 @@ EfiMtftp4GetModeData (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp4Configure (\r
-  IN EFI_MTFTP4_PROTOCOL    *This,\r
-  IN EFI_MTFTP4_CONFIG_DATA *ConfigData\r
+  IN EFI_MTFTP4_PROTOCOL     *This,\r
+  IN EFI_MTFTP4_CONFIG_DATA  *ConfigData\r
   )\r
 {\r
-  MTFTP4_PROTOCOL           *Instance;\r
-  EFI_TPL                   OldTpl;\r
-  IP4_ADDR                  Ip;\r
-  IP4_ADDR                  Netmask;\r
-  IP4_ADDR                  Gateway;\r
-  IP4_ADDR                  ServerIp;\r
+  MTFTP4_PROTOCOL  *Instance;\r
+  EFI_TPL          OldTpl;\r
+  IP4_ADDR         Ip;\r
+  IP4_ADDR         Netmask;\r
+  IP4_ADDR         Gateway;\r
+  IP4_ADDR         ServerIp;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -655,7 +650,6 @@ EfiMtftp4Configure (
     Instance->State = MTFTP4_STATE_UNCONFIGED;\r
 \r
     gBS->RestoreTPL (OldTpl);\r
-\r
   } else {\r
     //\r
     // Configure the parameters for new operation.\r
@@ -670,19 +664,19 @@ EfiMtftp4Configure (
     Gateway  = NTOHL (Gateway);\r
     ServerIp = NTOHL (ServerIp);\r
 \r
-    if (ServerIp == 0 || IP4_IS_LOCAL_BROADCAST (ServerIp)) {\r
+    if ((ServerIp == 0) || IP4_IS_LOCAL_BROADCAST (ServerIp)) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
     if (!ConfigData->UseDefaultSetting &&\r
-        ((!IP4_IS_VALID_NETMASK (Netmask) || (Netmask != 0 && !NetIp4IsUnicast (Ip, Netmask))))) {\r
-\r
+        ((!IP4_IS_VALID_NETMASK (Netmask) || ((Netmask != 0) && !NetIp4IsUnicast (Ip, Netmask)))))\r
+    {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
     if ((Gateway != 0) &&\r
-        ((Netmask != 0xFFFFFFFF && !IP4_NET_EQUAL (Gateway, Ip, Netmask)) || (Netmask != 0 && !NetIp4IsUnicast (Gateway, Netmask)))) {\r
-\r
+        (((Netmask != 0xFFFFFFFF) && !IP4_NET_EQUAL (Gateway, Ip, Netmask)) || ((Netmask != 0) && !NetIp4IsUnicast (Gateway, Netmask))))\r
+    {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
@@ -693,7 +687,7 @@ EfiMtftp4Configure (
       return EFI_ACCESS_DENIED;\r
     }\r
 \r
-    CopyMem(&Instance->Config, ConfigData, sizeof (*ConfigData));;\r
+    CopyMem (&Instance->Config, ConfigData, sizeof (*ConfigData));\r
     Instance->State = MTFTP4_STATE_CONFIGED;\r
 \r
     gBS->RestoreTPL (OldTpl);\r
@@ -702,8 +696,6 @@ EfiMtftp4Configure (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
-\r
 /**\r
   Parses the options in an MTFTPv4 OACK packet.\r
 \r
@@ -737,18 +729,18 @@ EfiMtftp4Configure (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp4ParseOptions (\r
-  IN     EFI_MTFTP4_PROTOCOL    *This,\r
-  IN     UINT32                 PacketLen,\r
-  IN     EFI_MTFTP4_PACKET      *Packet,\r
-     OUT UINT32                 *OptionCount,\r
-     OUT EFI_MTFTP4_OPTION      **OptionList          OPTIONAL\r
+  IN     EFI_MTFTP4_PROTOCOL  *This,\r
+  IN     UINT32               PacketLen,\r
+  IN     EFI_MTFTP4_PACKET    *Packet,\r
+  OUT UINT32                  *OptionCount,\r
+  OUT EFI_MTFTP4_OPTION       **OptionList          OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   if ((This == NULL) || (PacketLen < MTFTP4_OPCODE_LEN) ||\r
-      (Packet == NULL) || (OptionCount == NULL)) {\r
-\r
+      (Packet == NULL) || (OptionCount == NULL))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -765,7 +757,6 @@ EfiMtftp4ParseOptions (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Downloads a file from an MTFTPv4 server.\r
 \r
@@ -799,14 +790,13 @@ EfiMtftp4ParseOptions (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp4ReadFile (\r
-  IN EFI_MTFTP4_PROTOCOL    *This,\r
-  IN EFI_MTFTP4_TOKEN       *Token\r
+  IN EFI_MTFTP4_PROTOCOL  *This,\r
+  IN EFI_MTFTP4_TOKEN     *Token\r
   )\r
 {\r
   return Mtftp4Start (This, Token, EFI_MTFTP4_OPCODE_RRQ);\r
 }\r
 \r
-\r
 /**\r
   Sends a data file to an MTFTPv4 server. May be unsupported in some EFI implementations\r
 \r
@@ -860,14 +850,13 @@ EfiMtftp4ReadFile (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp4WriteFile (\r
-  IN EFI_MTFTP4_PROTOCOL    *This,\r
-  IN EFI_MTFTP4_TOKEN       *Token\r
+  IN EFI_MTFTP4_PROTOCOL  *This,\r
+  IN EFI_MTFTP4_TOKEN     *Token\r
   )\r
 {\r
   return Mtftp4Start (This, Token, EFI_MTFTP4_OPCODE_WRQ);\r
 }\r
 \r
-\r
 /**\r
   Downloads a data file "directory" from an MTFTPv4 server.\r
   May be unsupported in some EFI implementations\r
@@ -930,14 +919,13 @@ EfiMtftp4WriteFile (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp4ReadDirectory (\r
-  IN EFI_MTFTP4_PROTOCOL        *This,\r
-  IN EFI_MTFTP4_TOKEN           *Token\r
+  IN EFI_MTFTP4_PROTOCOL  *This,\r
+  IN EFI_MTFTP4_TOKEN     *Token\r
   )\r
 {\r
   return Mtftp4Start (This, Token, EFI_MTFTP4_OPCODE_DIR);\r
 }\r
 \r
-\r
 /**\r
   Gets information about a file from an MTFTPv4 server.\r
 \r
@@ -995,22 +983,23 @@ EfiMtftp4ReadDirectory (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp4GetInfo (\r
-  IN     EFI_MTFTP4_PROTOCOL      *This,\r
-  IN     EFI_MTFTP4_OVERRIDE_DATA *OverrideData        OPTIONAL,\r
-  IN     UINT8                    *Filename,\r
-  IN     UINT8                    *ModeStr             OPTIONAL,\r
-  IN     UINT8                    OptionCount,\r
-  IN     EFI_MTFTP4_OPTION        *OptionList          OPTIONAL,\r
-     OUT UINT32                   *PacketLength,\r
-     OUT EFI_MTFTP4_PACKET        **Packet             OPTIONAL\r
+  IN     EFI_MTFTP4_PROTOCOL       *This,\r
+  IN     EFI_MTFTP4_OVERRIDE_DATA  *OverrideData        OPTIONAL,\r
+  IN     UINT8                     *Filename,\r
+  IN     UINT8                     *ModeStr             OPTIONAL,\r
+  IN     UINT8                     OptionCount,\r
+  IN     EFI_MTFTP4_OPTION         *OptionList          OPTIONAL,\r
+  OUT UINT32                       *PacketLength,\r
+  OUT EFI_MTFTP4_PACKET            **Packet             OPTIONAL\r
   )\r
 {\r
-  EFI_MTFTP4_TOKEN          Token;\r
-  MTFTP4_GETINFO_STATE      State;\r
-  EFI_STATUS                Status;\r
+  EFI_MTFTP4_TOKEN      Token;\r
+  MTFTP4_GETINFO_STATE  State;\r
+  EFI_STATUS            Status;\r
 \r
   if ((This == NULL) || (Filename == NULL) || (PacketLength == NULL) ||\r
-      ((OptionCount != 0) && (OptionList == NULL))) {\r
+      ((OptionCount != 0) && (OptionList == NULL)))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1018,10 +1007,10 @@ EfiMtftp4GetInfo (
     *Packet = NULL;\r
   }\r
 \r
-  *PacketLength         = 0;\r
-  State.Packet          = Packet;\r
-  State.PacketLen       = PacketLength;\r
-  State.Status          = EFI_SUCCESS;\r
+  *PacketLength   = 0;\r
+  State.Packet    = Packet;\r
+  State.PacketLen = PacketLength;\r
+  State.Status    = EFI_SUCCESS;\r
 \r
   //\r
   // Fill in the Token to issue an synchronous ReadFile operation\r
@@ -1040,7 +1029,7 @@ EfiMtftp4GetInfo (
   Token.TimeoutCallback = NULL;\r
   Token.PacketNeeded    = NULL;\r
 \r
-  Status                = EfiMtftp4ReadFile (This, &Token);\r
+  Status = EfiMtftp4ReadFile (This, &Token);\r
 \r
   if (EFI_ABORTED == Status) {\r
     return State.Status;\r
@@ -1076,12 +1065,12 @@ EfiMtftp4GetInfo (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp4Poll (\r
-  IN EFI_MTFTP4_PROTOCOL    *This\r
+  IN EFI_MTFTP4_PROTOCOL  *This\r
   )\r
 {\r
-  MTFTP4_PROTOCOL           *Instance;\r
-  EFI_UDP4_PROTOCOL         *Udp;\r
-  EFI_STATUS                Status;\r
+  MTFTP4_PROTOCOL    *Instance;\r
+  EFI_UDP4_PROTOCOL  *Udp;\r
+  EFI_STATUS         Status;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1095,13 +1084,13 @@ EfiMtftp4Poll (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  Udp = Instance->UnicastPort->Protocol.Udp4;\r
+  Udp    = Instance->UnicastPort->Protocol.Udp4;\r
   Status = Udp->Poll (Udp);\r
   Mtftp4OnTimerTick (NULL, Instance->Service);\r
   return Status;\r
 }\r
 \r
-EFI_MTFTP4_PROTOCOL gMtftp4ProtocolTemplate = {\r
+EFI_MTFTP4_PROTOCOL  gMtftp4ProtocolTemplate = {\r
   EfiMtftp4GetModeData,\r
   EfiMtftp4Configure,\r
   EfiMtftp4GetInfo,\r
index b16ac0a4a4836ed5f6bdc6b67e4583362f90c580..7789755fe8d061710e750a3307bc4ff3e792eb77 100644 (file)
@@ -15,7 +15,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #ifndef __EFI_MTFTP4_IMPL_H__\r
 #define __EFI_MTFTP4_IMPL_H__\r
 \r
@@ -33,19 +32,18 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 extern EFI_MTFTP4_PROTOCOL  gMtftp4ProtocolTemplate;\r
 \r
-typedef struct _MTFTP4_SERVICE  MTFTP4_SERVICE;\r
-typedef struct _MTFTP4_PROTOCOL MTFTP4_PROTOCOL;\r
+typedef struct _MTFTP4_SERVICE   MTFTP4_SERVICE;\r
+typedef struct _MTFTP4_PROTOCOL  MTFTP4_PROTOCOL;\r
 \r
 #include "Mtftp4Driver.h"\r
 #include "Mtftp4Option.h"\r
 #include "Mtftp4Support.h"\r
 \r
-\r
 ///\r
 /// Some constant value of Mtftp service.\r
 ///\r
-#define MTFTP4_SERVICE_SIGNATURE    SIGNATURE_32 ('T', 'F', 'T', 'P')\r
-#define MTFTP4_PROTOCOL_SIGNATURE   SIGNATURE_32 ('t', 'f', 't', 'p')\r
+#define MTFTP4_SERVICE_SIGNATURE   SIGNATURE_32 ('T', 'F', 'T', 'P')\r
+#define MTFTP4_PROTOCOL_SIGNATURE  SIGNATURE_32 ('t', 'f', 't', 'p')\r
 \r
 #define MTFTP4_DEFAULT_SERVER_PORT  69\r
 #define MTFTP4_DEFAULT_TIMEOUT      3\r
@@ -54,114 +52,113 @@ typedef struct _MTFTP4_PROTOCOL MTFTP4_PROTOCOL;
 #define MTFTP4_DEFAULT_WINDOWSIZE   1\r
 #define MTFTP4_TIME_TO_GETMAP       5\r
 \r
-#define MTFTP4_STATE_UNCONFIGED     0\r
-#define MTFTP4_STATE_CONFIGED       1\r
-#define MTFTP4_STATE_DESTROY        2\r
+#define MTFTP4_STATE_UNCONFIGED  0\r
+#define MTFTP4_STATE_CONFIGED    1\r
+#define MTFTP4_STATE_DESTROY     2\r
 \r
 ///\r
 /// Mtftp service block\r
 ///\r
 struct _MTFTP4_SERVICE {\r
-  UINT32                        Signature;\r
-  EFI_SERVICE_BINDING_PROTOCOL  ServiceBinding;\r
+  UINT32                          Signature;\r
+  EFI_SERVICE_BINDING_PROTOCOL    ServiceBinding;\r
 \r
-  UINT16                        ChildrenNum;\r
-  LIST_ENTRY                    Children;\r
+  UINT16                          ChildrenNum;\r
+  LIST_ENTRY                      Children;\r
 \r
-  EFI_EVENT                     Timer;  ///< Ticking timer for all the MTFTP clients to handle the packet timeout case.\r
-  EFI_EVENT                     TimerNotifyLevel; ///< Ticking timer for all the MTFTP clients to calculate the packet live time.\r
-  EFI_EVENT                     TimerToGetMap;\r
+  EFI_EVENT                       Timer;            ///< Ticking timer for all the MTFTP clients to handle the packet timeout case.\r
+  EFI_EVENT                       TimerNotifyLevel; ///< Ticking timer for all the MTFTP clients to calculate the packet live time.\r
+  EFI_EVENT                       TimerToGetMap;\r
 \r
-  EFI_HANDLE                    Controller;\r
-  EFI_HANDLE                    Image;\r
+  EFI_HANDLE                      Controller;\r
+  EFI_HANDLE                      Image;\r
 \r
   //\r
   // This UDP child is used to keep the connection between the UDP\r
   // and MTFTP, so MTFTP will be notified when UDP is uninstalled.\r
   //\r
-  UDP_IO                        *ConnectUdp;\r
+  UDP_IO                          *ConnectUdp;\r
 };\r
 \r
-\r
 typedef struct {\r
-  EFI_MTFTP4_PACKET             **Packet;\r
-  UINT32                        *PacketLen;\r
-  EFI_STATUS                    Status;\r
+  EFI_MTFTP4_PACKET    **Packet;\r
+  UINT32               *PacketLen;\r
+  EFI_STATUS           Status;\r
 } MTFTP4_GETINFO_STATE;\r
 \r
 struct _MTFTP4_PROTOCOL {\r
-  UINT32                        Signature;\r
-  LIST_ENTRY                    Link;\r
-  EFI_MTFTP4_PROTOCOL           Mtftp4;\r
+  UINT32                    Signature;\r
+  LIST_ENTRY                Link;\r
+  EFI_MTFTP4_PROTOCOL       Mtftp4;\r
 \r
-  INTN                          State;\r
-  BOOLEAN                       InDestroy;\r
+  INTN                      State;\r
+  BOOLEAN                   InDestroy;\r
 \r
-  MTFTP4_SERVICE                *Service;\r
-  EFI_HANDLE                    Handle;\r
+  MTFTP4_SERVICE            *Service;\r
+  EFI_HANDLE                Handle;\r
 \r
-  EFI_MTFTP4_CONFIG_DATA        Config;\r
+  EFI_MTFTP4_CONFIG_DATA    Config;\r
 \r
   //\r
   // Operation parameters: token and requested options.\r
   //\r
-  EFI_MTFTP4_TOKEN              *Token;\r
-  MTFTP4_OPTION                 RequestOption;\r
-  UINT16                        Operation;\r
+  EFI_MTFTP4_TOKEN          *Token;\r
+  MTFTP4_OPTION             RequestOption;\r
+  UINT16                    Operation;\r
 \r
   //\r
   // Blocks is a list of MTFTP4_BLOCK_RANGE which contains\r
   // holes in the file\r
   //\r
-  UINT16                        BlkSize;\r
-  UINT16                        LastBlock;\r
-  LIST_ENTRY                    Blocks;\r
+  UINT16                    BlkSize;\r
+  UINT16                    LastBlock;\r
+  LIST_ENTRY                Blocks;\r
 \r
-  UINT16                        WindowSize;\r
+  UINT16                    WindowSize;\r
 \r
   //\r
   // Record the total received and saved block number.\r
   //\r
-  UINT64                        TotalBlock;\r
+  UINT64                    TotalBlock;\r
 \r
   //\r
   // Record the acked block number.\r
   //\r
-  UINT64                        AckedBlock;\r
+  UINT64                    AckedBlock;\r
 \r
   //\r
   // The server's communication end point: IP and two ports. one for\r
   // initial request, one for its selected port.\r
   //\r
-  IP4_ADDR                      ServerIp;\r
-  UINT16                        ListeningPort;\r
-  UINT16                        ConnectedPort;\r
-  IP4_ADDR                      Gateway;\r
-  UDP_IO                        *UnicastPort;\r
+  IP4_ADDR                  ServerIp;\r
+  UINT16                    ListeningPort;\r
+  UINT16                    ConnectedPort;\r
+  IP4_ADDR                  Gateway;\r
+  UDP_IO                    *UnicastPort;\r
 \r
   //\r
   // Timeout and retransmit status\r
   //\r
-  NET_BUF                       *LastPacket;\r
-  UINT32                        PacketToLive;\r
-  BOOLEAN                       HasTimeout;\r
-  UINT32                        CurRetry;\r
-  UINT32                        MaxRetry;\r
-  UINT32                        Timeout;\r
+  NET_BUF                   *LastPacket;\r
+  UINT32                    PacketToLive;\r
+  BOOLEAN                   HasTimeout;\r
+  UINT32                    CurRetry;\r
+  UINT32                    MaxRetry;\r
+  UINT32                    Timeout;\r
 \r
   //\r
   // Parameter used by RRQ's multicast download.\r
   //\r
-  IP4_ADDR                      McastIp;\r
-  UINT16                        McastPort;\r
-  BOOLEAN                       Master;\r
-  UDP_IO                        *McastUdpPort;\r
+  IP4_ADDR                  McastIp;\r
+  UINT16                    McastPort;\r
+  BOOLEAN                   Master;\r
+  UDP_IO                    *McastUdpPort;\r
 };\r
 \r
 typedef struct {\r
-  EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
-  UINTN                         NumberOfChildren;\r
-  EFI_HANDLE                    *ChildHandleBuffer;\r
+  EFI_SERVICE_BINDING_PROTOCOL    *ServiceBinding;\r
+  UINTN                           NumberOfChildren;\r
+  EFI_HANDLE                      *ChildHandleBuffer;\r
 } MTFTP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT;\r
 \r
 /**\r
@@ -173,8 +170,8 @@ typedef struct {
 **/\r
 VOID\r
 Mtftp4CleanOperation (\r
-  IN OUT MTFTP4_PROTOCOL        *Instance,\r
-  IN     EFI_STATUS             Result\r
+  IN OUT MTFTP4_PROTOCOL  *Instance,\r
+  IN     EFI_STATUS       Result\r
   );\r
 \r
 /**\r
@@ -193,8 +190,8 @@ Mtftp4CleanOperation (
 **/\r
 EFI_STATUS\r
 Mtftp4WrqStart (\r
-  IN MTFTP4_PROTOCOL        *Instance,\r
-  IN UINT16                 Operation\r
+  IN MTFTP4_PROTOCOL  *Instance,\r
+  IN UINT16           Operation\r
   );\r
 \r
 /**\r
@@ -213,8 +210,8 @@ Mtftp4WrqStart (
 **/\r
 EFI_STATUS\r
 Mtftp4RrqStart (\r
-  IN MTFTP4_PROTOCOL        *Instance,\r
-  IN UINT16                 Operation\r
+  IN MTFTP4_PROTOCOL  *Instance,\r
+  IN UINT16           Operation\r
   );\r
 \r
 #define MTFTP4_SERVICE_FROM_THIS(a)   \\r
index 21c1e421392b4695d150f2c811dbbf350073ad2e..feb8b82fbcfc8f8807710a14fa3d344f27256ac6 100644 (file)
@@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Mtftp4Impl.h"\r
 \r
-CHAR8 *mMtftp4SupportedOptions[MTFTP4_SUPPORTED_OPTIONS] = {\r
+CHAR8  *mMtftp4SupportedOptions[MTFTP4_SUPPORTED_OPTIONS] = {\r
   "blksize",\r
   "windowsize",\r
   "timeout",\r
@@ -16,7 +16,6 @@ CHAR8 *mMtftp4SupportedOptions[MTFTP4_SUPPORTED_OPTIONS] = {
   "multicast"\r
 };\r
 \r
-\r
 /**\r
   Check whether two ascii strings are equal, ignore the case.\r
 \r
@@ -29,16 +28,16 @@ CHAR8 *mMtftp4SupportedOptions[MTFTP4_SUPPORTED_OPTIONS] = {
 **/\r
 BOOLEAN\r
 NetStringEqualNoCase (\r
-  IN UINT8                 *Str1,\r
-  IN UINT8                 *Str2\r
+  IN UINT8  *Str1,\r
+  IN UINT8  *Str2\r
   )\r
 {\r
-  UINT8                     Ch1;\r
-  UINT8                     Ch2;\r
+  UINT8  Ch1;\r
+  UINT8  Ch2;\r
 \r
   ASSERT ((Str1 != NULL) && (Str2 != NULL));\r
 \r
-  for (; (*Str1 != '\0') && (*Str2 != '\0'); Str1++, Str2++) {\r
+  for ( ; (*Str1 != '\0') && (*Str2 != '\0'); Str1++, Str2++) {\r
     Ch1 = *Str1;\r
     Ch2 = *Str2;\r
 \r
@@ -58,10 +57,9 @@ NetStringEqualNoCase (
     }\r
   }\r
 \r
-  return (BOOLEAN) (*Str1 == *Str2);\r
+  return (BOOLEAN)(*Str1 == *Str2);\r
 }\r
 \r
-\r
 /**\r
   Convert a string to a UINT32 number.\r
 \r
@@ -72,23 +70,22 @@ NetStringEqualNoCase (
 **/\r
 UINT32\r
 NetStringToU32 (\r
-  IN UINT8                 *Str\r
+  IN UINT8  *Str\r
   )\r
 {\r
-  UINT32                    Num;\r
+  UINT32  Num;\r
 \r
   ASSERT (Str != NULL);\r
 \r
   Num = 0;\r
 \r
-  for (; NET_IS_DIGIT (*Str); Str++) {\r
+  for ( ; NET_IS_DIGIT (*Str); Str++) {\r
     Num = Num * 10 + (*Str - '0');\r
   }\r
 \r
   return Num;\r
 }\r
 \r
-\r
 /**\r
   Convert a string of the format "192.168.0.1" to an IP address.\r
 \r
@@ -101,13 +98,13 @@ NetStringToU32 (
 **/\r
 EFI_STATUS\r
 NetStringToIp (\r
-  IN     UINT8                 *Str,\r
-     OUT IP4_ADDR              *Ip\r
+  IN     UINT8  *Str,\r
+  OUT IP4_ADDR  *Ip\r
   )\r
 {\r
-  UINT32                    Byte;\r
-  UINT32                    Addr;\r
-  UINTN                     Index;\r
+  UINT32  Byte;\r
+  UINT32  Addr;\r
+  UINTN   Index;\r
 \r
   *Ip  = 0;\r
   Addr = 0;\r
@@ -144,7 +141,6 @@ NetStringToIp (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Go through the packet to fill the Options array with the start\r
   addresses of each MTFTP option name/value pair.\r
@@ -162,21 +158,21 @@ NetStringToIp (
 **/\r
 EFI_STATUS\r
 Mtftp4FillOptions (\r
-  IN     EFI_MTFTP4_PACKET     *Packet,\r
-  IN     UINT32                PacketLen,\r
-  IN OUT UINT32                *Count,\r
-     OUT EFI_MTFTP4_OPTION     *Options          OPTIONAL\r
+  IN     EFI_MTFTP4_PACKET  *Packet,\r
+  IN     UINT32             PacketLen,\r
+  IN OUT UINT32             *Count,\r
+  OUT EFI_MTFTP4_OPTION     *Options          OPTIONAL\r
   )\r
 {\r
-  UINT8                     *Cur;\r
-  UINT8                     *Last;\r
-  UINT8                     Num;\r
-  UINT8                     *Name;\r
-  UINT8                     *Value;\r
+  UINT8  *Cur;\r
+  UINT8  *Last;\r
+  UINT8  Num;\r
+  UINT8  *Name;\r
+  UINT8  *Value;\r
 \r
-  Num   = 0;\r
-  Cur   = (UINT8 *) Packet + MTFTP4_OPCODE_LEN;\r
-  Last  = (UINT8 *) Packet + PacketLen - 1;\r
+  Num  = 0;\r
+  Cur  = (UINT8 *)Packet + MTFTP4_OPCODE_LEN;\r
+  Last = (UINT8 *)Packet + PacketLen - 1;\r
 \r
   //\r
   // process option name and value pairs. The last byte is always zero\r
@@ -201,8 +197,8 @@ Mtftp4FillOptions (
     Num++;\r
 \r
     if ((Options != NULL) && (Num <= *Count)) {\r
-      Options[Num - 1].OptionStr  = Name;\r
-      Options[Num - 1].ValueStr   = Value;\r
+      Options[Num - 1].OptionStr = Name;\r
+      Options[Num - 1].ValueStr  = Value;\r
     }\r
 \r
     Cur++;\r
@@ -217,7 +213,6 @@ Mtftp4FillOptions (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Allocate and fill in a array of Mtftp options from the Packet.\r
 \r
@@ -237,13 +232,13 @@ Mtftp4FillOptions (
 **/\r
 EFI_STATUS\r
 Mtftp4ExtractOptions (\r
-  IN     EFI_MTFTP4_PACKET     *Packet,\r
-  IN     UINT32                PacketLen,\r
-     OUT UINT32                *OptionCount,\r
-     OUT EFI_MTFTP4_OPTION     **OptionList        OPTIONAL\r
+  IN     EFI_MTFTP4_PACKET  *Packet,\r
+  IN     UINT32             PacketLen,\r
+  OUT UINT32                *OptionCount,\r
+  OUT EFI_MTFTP4_OPTION     **OptionList        OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   *OptionCount = 0;\r
 \r
@@ -262,7 +257,7 @@ Mtftp4ExtractOptions (
   //\r
   // The last byte must be zero to terminate the options\r
   //\r
-  if (*((UINT8 *) Packet + PacketLen - 1) != 0) {\r
+  if (*((UINT8 *)Packet + PacketLen - 1) != 0) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -293,7 +288,6 @@ Mtftp4ExtractOptions (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Parse the MTFTP multicast option.\r
 \r
@@ -306,19 +300,19 @@ Mtftp4ExtractOptions (
 **/\r
 EFI_STATUS\r
 Mtftp4ExtractMcast (\r
-  IN     UINT8                  *Value,\r
-  IN OUT MTFTP4_OPTION          *Option\r
+  IN     UINT8          *Value,\r
+  IN OUT MTFTP4_OPTION  *Option\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  UINT32                    Num;\r
+  EFI_STATUS  Status;\r
+  UINT32      Num;\r
 \r
   //\r
   // The multicast option is formatted like "204.0.0.1,1857,1"\r
   // The server can also omit the ip and port, use ",,1"\r
   //\r
   if (*Value == ',') {\r
-    Option->McastIp   = 0;\r
+    Option->McastIp = 0;\r
   } else {\r
     Status = NetStringToIp (Value, &Option->McastIp);\r
 \r
@@ -350,7 +344,7 @@ Mtftp4ExtractMcast (
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
-    Option->McastPort = (UINT16) Num;\r
+    Option->McastPort = (UINT16)Num;\r
 \r
     while (NET_IS_DIGIT (*Value)) {\r
       Value++;\r
@@ -372,7 +366,7 @@ Mtftp4ExtractMcast (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Option->Master = (BOOLEAN) (Num == 1);\r
+  Option->Master = (BOOLEAN)(Num == 1);\r
 \r
   while (NET_IS_DIGIT (*Value)) {\r
     Value++;\r
@@ -385,7 +379,6 @@ Mtftp4ExtractMcast (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Parse the option in Options array to MTFTP4_OPTION which program\r
   can access directly.\r
@@ -405,17 +398,17 @@ Mtftp4ExtractMcast (
 **/\r
 EFI_STATUS\r
 Mtftp4ParseOption (\r
-  IN     EFI_MTFTP4_OPTION     *Options,\r
-  IN     UINT32                Count,\r
-  IN     BOOLEAN               Request,\r
-  IN     UINT16                Operation,\r
-     OUT MTFTP4_OPTION         *MtftpOption\r
+  IN     EFI_MTFTP4_OPTION  *Options,\r
+  IN     UINT32             Count,\r
+  IN     BOOLEAN            Request,\r
+  IN     UINT16             Operation,\r
+  OUT MTFTP4_OPTION         *MtftpOption\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  UINT32                    Index;\r
-  UINT32                    Value;\r
-  EFI_MTFTP4_OPTION         *This;\r
+  EFI_STATUS         Status;\r
+  UINT32             Index;\r
+  UINT32             Value;\r
+  EFI_MTFTP4_OPTION  *This;\r
 \r
   MtftpOption->Exist = 0;\r
 \r
@@ -426,7 +419,7 @@ Mtftp4ParseOption (
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
-    if (NetStringEqualNoCase (This->OptionStr, (UINT8 *) "blksize")) {\r
+    if (NetStringEqualNoCase (This->OptionStr, (UINT8 *)"blksize")) {\r
       //\r
       // block size option, valid value is between [8, 65464]\r
       //\r
@@ -436,10 +429,9 @@ Mtftp4ParseOption (
         return EFI_INVALID_PARAMETER;\r
       }\r
 \r
-      MtftpOption->BlkSize = (UINT16) Value;\r
-      MtftpOption->Exist |= MTFTP4_BLKSIZE_EXIST;\r
-\r
-    } else if (NetStringEqualNoCase (This->OptionStr, (UINT8 *) "timeout")) {\r
+      MtftpOption->BlkSize = (UINT16)Value;\r
+      MtftpOption->Exist  |= MTFTP4_BLKSIZE_EXIST;\r
+    } else if (NetStringEqualNoCase (This->OptionStr, (UINT8 *)"timeout")) {\r
       //\r
       // timeout option, valid value is between [1, 255]\r
       //\r
@@ -449,16 +441,14 @@ Mtftp4ParseOption (
         return EFI_INVALID_PARAMETER;\r
       }\r
 \r
-      MtftpOption->Timeout = (UINT8) Value;\r
-\r
-    } else if (NetStringEqualNoCase (This->OptionStr, (UINT8 *) "tsize")) {\r
+      MtftpOption->Timeout = (UINT8)Value;\r
+    } else if (NetStringEqualNoCase (This->OptionStr, (UINT8 *)"tsize")) {\r
       //\r
       // tsize option, the biggest transfer supported is 4GB with block size option\r
       //\r
-      MtftpOption->Tsize = NetStringToU32 (This->ValueStr);\r
+      MtftpOption->Tsize  = NetStringToU32 (This->ValueStr);\r
       MtftpOption->Exist |= MTFTP4_TSIZE_EXIST;\r
-\r
-    } else if (NetStringEqualNoCase (This->OptionStr, (UINT8 *) "multicast")) {\r
+    } else if (NetStringEqualNoCase (This->OptionStr, (UINT8 *)"multicast")) {\r
       //\r
       // Multicast option, if it is a request, the value must be a zero\r
       // length string, otherwise, it is formatted like "204.0.0.1,1857,1\0"\r
@@ -467,7 +457,6 @@ Mtftp4ParseOption (
         if (*(This->ValueStr) != '\0') {\r
           return EFI_INVALID_PARAMETER;\r
         }\r
-\r
       } else {\r
         Status = Mtftp4ExtractMcast (This->ValueStr, MtftpOption);\r
 \r
@@ -477,8 +466,7 @@ Mtftp4ParseOption (
       }\r
 \r
       MtftpOption->Exist |= MTFTP4_MCAST_EXIST;\r
-\r
-    } else if (NetStringEqualNoCase (This->OptionStr, (UINT8 *) "windowsize")) {\r
+    } else if (NetStringEqualNoCase (This->OptionStr, (UINT8 *)"windowsize")) {\r
       if (Operation == EFI_MTFTP4_OPCODE_WRQ) {\r
         //\r
         // Currently, windowsize is not supported in the write operation.\r
@@ -492,8 +480,8 @@ Mtftp4ParseOption (
         return EFI_INVALID_PARAMETER;\r
       }\r
 \r
-      MtftpOption->WindowSize = (UINT16) Value;\r
-      MtftpOption->Exist |= MTFTP4_WINDOWSIZE_EXIST;\r
+      MtftpOption->WindowSize = (UINT16)Value;\r
+      MtftpOption->Exist     |= MTFTP4_WINDOWSIZE_EXIST;\r
     } else if (Request) {\r
       //\r
       // Ignore the unsupported option if it is a reply, and return\r
@@ -506,7 +494,6 @@ Mtftp4ParseOption (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Parse the options in the OACK packet to MTFTP4_OPTION which program\r
   can access directly.\r
@@ -523,15 +510,15 @@ Mtftp4ParseOption (
 **/\r
 EFI_STATUS\r
 Mtftp4ParseOptionOack (\r
-  IN     EFI_MTFTP4_PACKET     *Packet,\r
-  IN     UINT32                PacketLen,\r
-  IN     UINT16                Operation,\r
-     OUT MTFTP4_OPTION         *MtftpOption\r
+  IN     EFI_MTFTP4_PACKET  *Packet,\r
+  IN     UINT32             PacketLen,\r
+  IN     UINT16             Operation,\r
+  OUT MTFTP4_OPTION         *MtftpOption\r
   )\r
 {\r
-  EFI_MTFTP4_OPTION *OptionList;\r
-  EFI_STATUS        Status;\r
-  UINT32            Count;\r
+  EFI_MTFTP4_OPTION  *OptionList;\r
+  EFI_STATUS         Status;\r
+  UINT32             Count;\r
 \r
   MtftpOption->Exist = 0;\r
 \r
@@ -540,6 +527,7 @@ Mtftp4ParseOptionOack (
   if (EFI_ERROR (Status) || (Count == 0)) {\r
     return Status;\r
   }\r
+\r
   ASSERT (OptionList != NULL);\r
 \r
   Status = Mtftp4ParseOption (OptionList, Count, FALSE, Operation, MtftpOption);\r
index 5f37b0f7b9e6aa74466c3b54c8c3d1ed7a901c21..9ef6fff1b66bf584014c5ce1bc6d4262dfabba81 100644 (file)
@@ -6,7 +6,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #ifndef __EFI_MTFTP4_OPTION_H__\r
 #define __EFI_MTFTP4_OPTION_H__\r
 \r
@@ -16,21 +15,21 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define MTFTP4_BLKNO_LEN          2\r
 #define MTFTP4_DATA_HEAD_LEN      4\r
 \r
-#define MTFTP4_BLKSIZE_EXIST      0x01\r
-#define MTFTP4_TIMEOUT_EXIST      0x02\r
-#define MTFTP4_TSIZE_EXIST        0x04\r
-#define MTFTP4_MCAST_EXIST        0x08\r
-#define MTFTP4_WINDOWSIZE_EXIST   0x10\r
+#define MTFTP4_BLKSIZE_EXIST     0x01\r
+#define MTFTP4_TIMEOUT_EXIST     0x02\r
+#define MTFTP4_TSIZE_EXIST       0x04\r
+#define MTFTP4_MCAST_EXIST       0x08\r
+#define MTFTP4_WINDOWSIZE_EXIST  0x10\r
 \r
 typedef struct {\r
-  UINT16                    BlkSize;\r
-  UINT16                    WindowSize;\r
-  UINT8                     Timeout;\r
-  UINT32                    Tsize;\r
-  IP4_ADDR                  McastIp;\r
-  UINT16                    McastPort;\r
-  BOOLEAN                   Master;\r
-  UINT32                    Exist;\r
+  UINT16      BlkSize;\r
+  UINT16      WindowSize;\r
+  UINT8       Timeout;\r
+  UINT32      Tsize;\r
+  IP4_ADDR    McastIp;\r
+  UINT16      McastPort;\r
+  BOOLEAN     Master;\r
+  UINT32      Exist;\r
 } MTFTP4_OPTION;\r
 \r
 /**\r
@@ -52,10 +51,10 @@ typedef struct {
 **/\r
 EFI_STATUS\r
 Mtftp4ExtractOptions (\r
-  IN     EFI_MTFTP4_PACKET     *Packet,\r
-  IN     UINT32                PacketLen,\r
-     OUT UINT32                *OptionCount,\r
-     OUT EFI_MTFTP4_OPTION     **OptionList        OPTIONAL\r
+  IN     EFI_MTFTP4_PACKET  *Packet,\r
+  IN     UINT32             PacketLen,\r
+  OUT UINT32                *OptionCount,\r
+  OUT EFI_MTFTP4_OPTION     **OptionList        OPTIONAL\r
   );\r
 \r
 /**\r
@@ -77,11 +76,11 @@ Mtftp4ExtractOptions (
 **/\r
 EFI_STATUS\r
 Mtftp4ParseOption (\r
-  IN     EFI_MTFTP4_OPTION     *Options,\r
-  IN     UINT32                Count,\r
-  IN     BOOLEAN               Request,\r
-  IN     UINT16                Operation,\r
-     OUT MTFTP4_OPTION         *MtftpOption\r
+  IN     EFI_MTFTP4_OPTION  *Options,\r
+  IN     UINT32             Count,\r
+  IN     BOOLEAN            Request,\r
+  IN     UINT16             Operation,\r
+  OUT MTFTP4_OPTION         *MtftpOption\r
   );\r
 \r
 /**\r
@@ -100,10 +99,10 @@ Mtftp4ParseOption (
 **/\r
 EFI_STATUS\r
 Mtftp4ParseOptionOack (\r
-  IN     EFI_MTFTP4_PACKET     *Packet,\r
-  IN     UINT32                PacketLen,\r
-  IN     UINT16                Operation,\r
-     OUT MTFTP4_OPTION         *MtftpOption\r
+  IN     EFI_MTFTP4_PACKET  *Packet,\r
+  IN     UINT32             PacketLen,\r
+  IN     UINT16             Operation,\r
+  OUT MTFTP4_OPTION         *MtftpOption\r
   );\r
 \r
 extern CHAR8  *mMtftp4SupportedOptions[MTFTP4_SUPPORTED_OPTIONS];\r
index f1d456a6122dcc78a7e5c2737fba84366b8e98ad..75aaa806175fdc700fdf0c471111601330ef22fd 100644 (file)
@@ -7,10 +7,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #include "Mtftp4Impl.h"\r
 \r
-\r
 /**\r
   The packet process callback for MTFTP download.\r
 \r
@@ -23,13 +21,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 VOID\r
 EFIAPI\r
 Mtftp4RrqInput (\r
-  IN NET_BUF                *UdpPacket,\r
-  IN UDP_END_POINT          *EndPoint,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN VOID                   *Context\r
+  IN NET_BUF        *UdpPacket,\r
+  IN UDP_END_POINT  *EndPoint,\r
+  IN EFI_STATUS     IoStatus,\r
+  IN VOID           *Context\r
   );\r
 \r
-\r
 /**\r
   Start the MTFTP session to download.\r
 \r
@@ -46,11 +43,11 @@ Mtftp4RrqInput (
 **/\r
 EFI_STATUS\r
 Mtftp4RrqStart (\r
-  IN MTFTP4_PROTOCOL        *Instance,\r
-  IN UINT16                 Operation\r
+  IN MTFTP4_PROTOCOL  *Instance,\r
+  IN UINT16           Operation\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // The valid block number range are [1, 0xffff]. For example:\r
@@ -73,7 +70,6 @@ Mtftp4RrqStart (
   return UdpIoRecvDatagram (Instance->UnicastPort, Mtftp4RrqInput, Instance, 0);\r
 }\r
 \r
-\r
 /**\r
   Build and send a ACK packet for the download session.\r
 \r
@@ -87,13 +83,13 @@ Mtftp4RrqStart (
 **/\r
 EFI_STATUS\r
 Mtftp4RrqSendAck (\r
-  IN MTFTP4_PROTOCOL        *Instance,\r
-  IN UINT16                 BlkNo\r
+  IN MTFTP4_PROTOCOL  *Instance,\r
+  IN UINT16           BlkNo\r
   )\r
 {\r
-  EFI_MTFTP4_PACKET         *Ack;\r
-  NET_BUF                   *Packet;\r
-  EFI_STATUS                Status;\r
+  EFI_MTFTP4_PACKET  *Ack;\r
+  NET_BUF            *Packet;\r
+  EFI_STATUS         Status;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
@@ -102,11 +98,11 @@ Mtftp4RrqSendAck (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Ack = (EFI_MTFTP4_PACKET *) NetbufAllocSpace (\r
-                                Packet,\r
-                                sizeof (EFI_MTFTP4_ACK_HEADER),\r
-                                FALSE\r
-                                );\r
+  Ack = (EFI_MTFTP4_PACKET *)NetbufAllocSpace (\r
+                               Packet,\r
+                               sizeof (EFI_MTFTP4_ACK_HEADER),\r
+                               FALSE\r
+                               );\r
   ASSERT (Ack != NULL);\r
 \r
   Ack->Ack.OpCode   = HTONS (EFI_MTFTP4_OPCODE_ACK);\r
@@ -120,7 +116,6 @@ Mtftp4RrqSendAck (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Deliver the received data block to the user, which can be saved\r
   in the user provide buffer or through the CheckPacket callback.\r
@@ -138,18 +133,18 @@ Mtftp4RrqSendAck (
 **/\r
 EFI_STATUS\r
 Mtftp4RrqSaveBlock (\r
-  IN OUT MTFTP4_PROTOCOL        *Instance,\r
-  IN     EFI_MTFTP4_PACKET      *Packet,\r
-  IN     UINT32                 Len\r
+  IN OUT MTFTP4_PROTOCOL    *Instance,\r
+  IN     EFI_MTFTP4_PACKET  *Packet,\r
+  IN     UINT32             Len\r
   )\r
 {\r
-  EFI_MTFTP4_TOKEN          *Token;\r
-  EFI_STATUS                Status;\r
-  UINT16                    Block;\r
-  UINT64                    Start;\r
-  UINT32                    DataLen;\r
-  UINT64                    BlockCounter;\r
-  BOOLEAN                   Completed;\r
+  EFI_MTFTP4_TOKEN  *Token;\r
+  EFI_STATUS        Status;\r
+  UINT16            Block;\r
+  UINT64            Start;\r
+  UINT32            DataLen;\r
+  UINT64            BlockCounter;\r
+  BOOLEAN           Completed;\r
 \r
   Completed = FALSE;\r
   Token     = Instance->Token;\r
@@ -160,7 +155,7 @@ Mtftp4RrqSaveBlock (
   // This is the last block, save the block no\r
   //\r
   if (DataLen < Instance->BlkSize) {\r
-    Completed = TRUE;\r
+    Completed           = TRUE;\r
     Instance->LastBlock = Block;\r
     Mtftp4SetLastBlockNum (&Instance->Blocks, Block);\r
   }\r
@@ -181,13 +176,13 @@ Mtftp4RrqSaveBlock (
   }\r
 \r
   if (Token->CheckPacket != NULL) {\r
-    Status = Token->CheckPacket (&Instance->Mtftp4, Token, (UINT16) Len, Packet);\r
+    Status = Token->CheckPacket (&Instance->Mtftp4, Token, (UINT16)Len, Packet);\r
 \r
     if (EFI_ERROR (Status)) {\r
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_ILLEGAL_OPERATION,\r
-        (UINT8 *) "User aborted download"\r
+        (UINT8 *)"User aborted download"\r
         );\r
 \r
       return EFI_ABORTED;\r
@@ -195,10 +190,10 @@ Mtftp4RrqSaveBlock (
   }\r
 \r
   if (Token->Buffer != NULL) {\r
-     Start = MultU64x32 (BlockCounter - 1, Instance->BlkSize);\r
+    Start = MultU64x32 (BlockCounter - 1, Instance->BlkSize);\r
 \r
     if (Start + DataLen <= Token->BufferSize) {\r
-      CopyMem ((UINT8 *) Token->Buffer + Start, Packet->Data.Data, DataLen);\r
+      CopyMem ((UINT8 *)Token->Buffer + Start, Packet->Data.Data, DataLen);\r
 \r
       //\r
       // Update the file size when received the last block\r
@@ -206,7 +201,6 @@ Mtftp4RrqSaveBlock (
       if ((Instance->LastBlock == Block) && Completed) {\r
         Token->BufferSize = Start + DataLen;\r
       }\r
-\r
     } else if (Instance->LastBlock != 0) {\r
       //\r
       // Don't save the data if the buffer is too small, return\r
@@ -218,7 +212,7 @@ Mtftp4RrqSaveBlock (
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_DISK_FULL,\r
-        (UINT8 *) "User provided memory block is too small"\r
+        (UINT8 *)"User provided memory block is too small"\r
         );\r
 \r
       return EFI_BUFFER_TOO_SMALL;\r
@@ -228,7 +222,6 @@ Mtftp4RrqSaveBlock (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Function to process the received data packets.\r
 \r
@@ -247,21 +240,21 @@ Mtftp4RrqSaveBlock (
 **/\r
 EFI_STATUS\r
 Mtftp4RrqHandleData (\r
-  IN     MTFTP4_PROTOCOL       *Instance,\r
-  IN     EFI_MTFTP4_PACKET     *Packet,\r
-  IN     UINT32                Len,\r
-  IN     BOOLEAN               Multicast,\r
-     OUT BOOLEAN               *Completed\r
+  IN     MTFTP4_PROTOCOL    *Instance,\r
+  IN     EFI_MTFTP4_PACKET  *Packet,\r
+  IN     UINT32             Len,\r
+  IN     BOOLEAN            Multicast,\r
+  OUT BOOLEAN               *Completed\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  UINT16                    BlockNum;\r
-  INTN                      Expected;\r
+  EFI_STATUS  Status;\r
+  UINT16      BlockNum;\r
+  INTN        Expected;\r
 \r
-  *Completed  = FALSE;\r
-  Status      = EFI_SUCCESS;\r
-  BlockNum    = NTOHS (Packet->Data.Block);\r
-  Expected    = Mtftp4GetNextBlockNum (&Instance->Blocks);\r
+  *Completed = FALSE;\r
+  Status     = EFI_SUCCESS;\r
+  BlockNum   = NTOHS (Packet->Data.Block);\r
+  Expected   = Mtftp4GetNextBlockNum (&Instance->Blocks);\r
 \r
   ASSERT (Expected >= 0);\r
 \r
@@ -274,7 +267,7 @@ Mtftp4RrqHandleData (
     //\r
     // If Expected is 0, (UINT16) (Expected - 1) is also the expected Ack number (65535).\r
     //\r
-    return Mtftp4RrqSendAck (Instance,  (UINT16) (Expected - 1));\r
+    return Mtftp4RrqSendAck (Instance, (UINT16)(Expected - 1));\r
   }\r
 \r
   Status = Mtftp4RrqSaveBlock (Instance, Packet, Len);\r
@@ -286,7 +279,7 @@ Mtftp4RrqHandleData (
   //\r
   // Record the total received and saved block number.\r
   //\r
-  Instance->TotalBlock ++;\r
+  Instance->TotalBlock++;\r
 \r
   //\r
   // Reset the passive client's timer whenever it received a\r
@@ -314,21 +307,18 @@ Mtftp4RrqHandleData (
       //\r
       BlockNum   = Instance->LastBlock;\r
       *Completed = TRUE;\r
-\r
     } else {\r
-      BlockNum = (UINT16) (Expected - 1);\r
+      BlockNum = (UINT16)(Expected - 1);\r
     }\r
 \r
-    if (Instance->WindowSize == (Instance->TotalBlock - Instance->AckedBlock) || Expected < 0) {\r
+    if ((Instance->WindowSize == (Instance->TotalBlock - Instance->AckedBlock)) || (Expected < 0)) {\r
       Status = Mtftp4RrqSendAck (Instance, BlockNum);\r
     }\r
-\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Validate whether the options received in the server's OACK packet is valid.\r
 \r
@@ -348,12 +338,11 @@ Mtftp4RrqHandleData (
 **/\r
 BOOLEAN\r
 Mtftp4RrqOackValid (\r
-  IN MTFTP4_PROTOCOL        *This,\r
-  IN MTFTP4_OPTION          *Reply,\r
-  IN MTFTP4_OPTION          *Request\r
+  IN MTFTP4_PROTOCOL  *This,\r
+  IN MTFTP4_OPTION    *Reply,\r
+  IN MTFTP4_OPTION    *Request\r
   )\r
 {\r
-\r
   //\r
   // It is invalid for server to return options we don't request\r
   //\r
@@ -365,10 +354,11 @@ Mtftp4RrqOackValid (
   // Server can only specify a smaller block size and window size to be used and\r
   // return the timeout matches that requested.\r
   //\r
-  if ((((Reply->Exist & MTFTP4_BLKSIZE_EXIST) != 0)&& (Reply->BlkSize > Request->BlkSize)) ||\r
-      (((Reply->Exist & MTFTP4_WINDOWSIZE_EXIST) != 0)&& (Reply->WindowSize > Request->WindowSize)) ||\r
+  if ((((Reply->Exist & MTFTP4_BLKSIZE_EXIST) != 0) && (Reply->BlkSize > Request->BlkSize)) ||\r
+      (((Reply->Exist & MTFTP4_WINDOWSIZE_EXIST) != 0) && (Reply->WindowSize > Request->WindowSize)) ||\r
       (((Reply->Exist & MTFTP4_TIMEOUT_EXIST) != 0) && (Reply->Timeout != Request->Timeout))\r
-     ) {\r
+      )\r
+  {\r
     return FALSE;\r
   }\r
 \r
@@ -390,7 +380,6 @@ Mtftp4RrqOackValid (
   return TRUE;\r
 }\r
 \r
-\r
 /**\r
   Configure a UDP IO port to receive the multicast.\r
 \r
@@ -405,19 +394,19 @@ Mtftp4RrqOackValid (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp4RrqConfigMcastPort (\r
-  IN UDP_IO                 *McastIo,\r
-  IN VOID                   *Context\r
+  IN UDP_IO  *McastIo,\r
+  IN VOID    *Context\r
   )\r
 {\r
-  MTFTP4_PROTOCOL           *Instance;\r
-  EFI_MTFTP4_CONFIG_DATA    *Config;\r
-  EFI_UDP4_CONFIG_DATA      UdpConfig;\r
-  EFI_IPv4_ADDRESS          Group;\r
-  EFI_STATUS                Status;\r
-  IP4_ADDR                  Ip;\r
+  MTFTP4_PROTOCOL         *Instance;\r
+  EFI_MTFTP4_CONFIG_DATA  *Config;\r
+  EFI_UDP4_CONFIG_DATA    UdpConfig;\r
+  EFI_IPv4_ADDRESS        Group;\r
+  EFI_STATUS              Status;\r
+  IP4_ADDR                Ip;\r
 \r
-  Instance                     = (MTFTP4_PROTOCOL *) Context;\r
-  Config                       = &Instance->Config;\r
+  Instance = (MTFTP4_PROTOCOL *)Context;\r
+  Config   = &Instance->Config;\r
 \r
   UdpConfig.AcceptBroadcast    = FALSE;\r
   UdpConfig.AcceptPromiscuous  = FALSE;\r
@@ -431,8 +420,8 @@ Mtftp4RrqConfigMcastPort (
   UdpConfig.UseDefaultAddress  = Config->UseDefaultSetting;\r
   IP4_COPY_ADDRESS (&UdpConfig.StationAddress, &Config->StationIp);\r
   IP4_COPY_ADDRESS (&UdpConfig.SubnetMask, &Config->SubnetMask);\r
-  UdpConfig.StationPort        = Instance->McastPort;\r
-  UdpConfig.RemotePort         = 0;\r
+  UdpConfig.StationPort = Instance->McastPort;\r
+  UdpConfig.RemotePort  = 0;\r
 \r
   Ip = HTONL (Instance->ServerIp);\r
   IP4_COPY_ADDRESS (&UdpConfig.RemoteAddress, &Ip);\r
@@ -444,7 +433,8 @@ Mtftp4RrqConfigMcastPort (
   }\r
 \r
   if (!Config->UseDefaultSetting &&\r
-      !EFI_IP4_EQUAL (&mZeroIp4Addr, &Config->GatewayIp)) {\r
+      !EFI_IP4_EQUAL (&mZeroIp4Addr, &Config->GatewayIp))\r
+  {\r
     //\r
     // The station IP address is manually configured and the Gateway IP is not 0.\r
     // Add the default route for this UDP instance.\r
@@ -472,7 +462,6 @@ Mtftp4RrqConfigMcastPort (
   return McastIo->Protocol.Udp4->Groups (McastIo->Protocol.Udp4, TRUE, &Group);\r
 }\r
 \r
-\r
 /**\r
   Function to process the OACK.\r
 \r
@@ -492,17 +481,17 @@ Mtftp4RrqConfigMcastPort (
 **/\r
 EFI_STATUS\r
 Mtftp4RrqHandleOack (\r
-  IN OUT MTFTP4_PROTOCOL       *Instance,\r
-  IN     EFI_MTFTP4_PACKET     *Packet,\r
-  IN     UINT32                Len,\r
-  IN     BOOLEAN               Multicast,\r
-     OUT BOOLEAN               *Completed\r
+  IN OUT MTFTP4_PROTOCOL    *Instance,\r
+  IN     EFI_MTFTP4_PACKET  *Packet,\r
+  IN     UINT32             Len,\r
+  IN     BOOLEAN            Multicast,\r
+  OUT BOOLEAN               *Completed\r
   )\r
 {\r
-  MTFTP4_OPTION             Reply;\r
-  EFI_STATUS                Status;\r
-  INTN                      Expected;\r
-  EFI_UDP4_PROTOCOL         *Udp4;\r
+  MTFTP4_OPTION      Reply;\r
+  EFI_STATUS         Status;\r
+  INTN               Expected;\r
+  EFI_UDP4_PROTOCOL  *Udp4;\r
 \r
   *Completed = FALSE;\r
 \r
@@ -525,7 +514,8 @@ Mtftp4RrqHandleOack (
   Status = Mtftp4ParseOptionOack (Packet, Len, Instance->Operation, &Reply);\r
 \r
   if (EFI_ERROR (Status) ||\r
-      !Mtftp4RrqOackValid (Instance, &Reply, &Instance->RequestOption)) {\r
+      !Mtftp4RrqOackValid (Instance, &Reply, &Instance->RequestOption))\r
+  {\r
     //\r
     // Don't send an ERROR packet if the error is EFI_OUT_OF_RESOURCES.\r
     //\r
@@ -533,7 +523,7 @@ Mtftp4RrqHandleOack (
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_ILLEGAL_OPERATION,\r
-        (UINT8 *) "Malformatted OACK packet"\r
+        (UINT8 *)"Malformatted OACK packet"\r
         );\r
     }\r
 \r
@@ -541,7 +531,6 @@ Mtftp4RrqHandleOack (
   }\r
 \r
   if ((Reply.Exist & MTFTP4_MCAST_EXIST) != 0) {\r
-\r
     //\r
     // Save the multicast info. Always update the Master, only update the\r
     // multicast IP address, block size, window size, timeout at the first time.\r
@@ -554,7 +543,7 @@ Mtftp4RrqHandleOack (
         Mtftp4SendError (\r
           Instance,\r
           EFI_MTFTP4_ERRORCODE_ILLEGAL_OPERATION,\r
-          (UINT8 *) "Illegal multicast setting"\r
+          (UINT8 *)"Illegal multicast setting"\r
           );\r
 \r
         return EFI_TFTP_ERROR;\r
@@ -563,8 +552,8 @@ Mtftp4RrqHandleOack (
       //\r
       // Create a UDP child then start receive the multicast from it.\r
       //\r
-      Instance->McastIp      = Reply.McastIp;\r
-      Instance->McastPort    = Reply.McastPort;\r
+      Instance->McastIp   = Reply.McastIp;\r
+      Instance->McastPort = Reply.McastPort;\r
       if (Instance->McastUdpPort == NULL) {\r
         Instance->McastUdpPort = UdpIoCreateIo (\r
                                    Instance->Service->Controller,\r
@@ -577,7 +566,7 @@ Mtftp4RrqHandleOack (
           Status = gBS->OpenProtocol (\r
                           Instance->McastUdpPort->UdpHandle,\r
                           &gEfiUdp4ProtocolGuid,\r
-                          (VOID **) &Udp4,\r
+                          (VOID **)&Udp4,\r
                           Instance->Service->Image,\r
                           Instance->Handle,\r
                           EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -590,7 +579,6 @@ Mtftp4RrqHandleOack (
         }\r
       }\r
 \r
-\r
       if (Instance->McastUdpPort == NULL) {\r
         return EFI_DEVICE_ERROR;\r
       }\r
@@ -601,7 +589,7 @@ Mtftp4RrqHandleOack (
         Mtftp4SendError (\r
           Instance,\r
           EFI_MTFTP4_ERRORCODE_ACCESS_VIOLATION,\r
-          (UINT8 *) "Failed to create socket to receive multicast packet"\r
+          (UINT8 *)"Failed to create socket to receive multicast packet"\r
           );\r
 \r
         return Status;\r
@@ -622,7 +610,6 @@ Mtftp4RrqHandleOack (
         Instance->Timeout = Reply.Timeout;\r
       }\r
     }\r
-\r
   } else {\r
     Instance->Master = TRUE;\r
 \r
@@ -643,10 +630,9 @@ Mtftp4RrqHandleOack (
   // Send an ACK to (Expected - 1) which is 0 for unicast download,\r
   // or tell the server we want to receive the Expected block.\r
   //\r
-  return Mtftp4RrqSendAck (Instance, (UINT16) (Expected - 1));\r
+  return Mtftp4RrqSendAck (Instance, (UINT16)(Expected - 1));\r
 }\r
 \r
-\r
 /**\r
   The packet process callback for MTFTP download.\r
 \r
@@ -659,21 +645,21 @@ Mtftp4RrqHandleOack (
 VOID\r
 EFIAPI\r
 Mtftp4RrqInput (\r
-  IN NET_BUF                *UdpPacket,\r
-  IN UDP_END_POINT          *EndPoint,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN VOID                   *Context\r
+  IN NET_BUF        *UdpPacket,\r
+  IN UDP_END_POINT  *EndPoint,\r
+  IN EFI_STATUS     IoStatus,\r
+  IN VOID           *Context\r
   )\r
 {\r
-  MTFTP4_PROTOCOL           *Instance;\r
-  EFI_MTFTP4_PACKET         *Packet;\r
-  BOOLEAN                   Completed;\r
-  BOOLEAN                   Multicast;\r
-  EFI_STATUS                Status;\r
-  UINT16                    Opcode;\r
-  UINT32                    Len;\r
-\r
-  Instance  = (MTFTP4_PROTOCOL *) Context;\r
+  MTFTP4_PROTOCOL    *Instance;\r
+  EFI_MTFTP4_PACKET  *Packet;\r
+  BOOLEAN            Completed;\r
+  BOOLEAN            Multicast;\r
+  EFI_STATUS         Status;\r
+  UINT16             Opcode;\r
+  UINT32             Len;\r
+\r
+  Instance = (MTFTP4_PROTOCOL *)Context;\r
   NET_CHECK_SIGNATURE (Instance, MTFTP4_PROTOCOL_SIGNATURE);\r
 \r
   Status    = EFI_SUCCESS;\r
@@ -691,7 +677,7 @@ Mtftp4RrqInput (
   //\r
   // Find the port this packet is from to restart receive correctly.\r
   //\r
-  Multicast = (BOOLEAN) (EndPoint->LocalAddr.Addr[0] == Instance->McastIp);\r
+  Multicast = (BOOLEAN)(EndPoint->LocalAddr.Addr[0] == Instance->McastIp);\r
 \r
   if (UdpPacket->TotalSize < MTFTP4_OPCODE_LEN) {\r
     goto ON_EXIT;\r
@@ -724,10 +710,9 @@ Mtftp4RrqInput (
       goto ON_EXIT;\r
     }\r
 \r
-    NetbufCopy (UdpPacket, 0, Len, (UINT8 *) Packet);\r
-\r
+    NetbufCopy (UdpPacket, 0, Len, (UINT8 *)Packet);\r
   } else {\r
-    Packet = (EFI_MTFTP4_PACKET *) NetbufGetByte (UdpPacket, 0, NULL);\r
+    Packet = (EFI_MTFTP4_PACKET *)NetbufGetByte (UdpPacket, 0, NULL);\r
     ASSERT (Packet != NULL);\r
   }\r
 \r
@@ -738,12 +723,12 @@ Mtftp4RrqInput (
   // if CheckPacket returns an EFI_ERROR code.\r
   //\r
   if ((Instance->Token->CheckPacket != NULL) &&\r
-      ((Opcode == EFI_MTFTP4_OPCODE_OACK) || (Opcode == EFI_MTFTP4_OPCODE_ERROR))) {\r
-\r
+      ((Opcode == EFI_MTFTP4_OPCODE_OACK) || (Opcode == EFI_MTFTP4_OPCODE_ERROR)))\r
+  {\r
     Status = Instance->Token->CheckPacket (\r
                                 &Instance->Mtftp4,\r
                                 Instance->Token,\r
-                                (UINT16) Len,\r
+                                (UINT16)Len,\r
                                 Packet\r
                                 );\r
 \r
@@ -755,7 +740,7 @@ Mtftp4RrqInput (
         Mtftp4SendError (\r
           Instance,\r
           EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,\r
-          (UINT8 *) "User aborted the transfer"\r
+          (UINT8 *)"User aborted the transfer"\r
           );\r
       }\r
 \r
@@ -765,29 +750,30 @@ Mtftp4RrqInput (
   }\r
 \r
   switch (Opcode) {\r
-  case EFI_MTFTP4_OPCODE_DATA:\r
-    if ((Len > (UINT32) (MTFTP4_DATA_HEAD_LEN + Instance->BlkSize)) ||\r
-        (Len < (UINT32) MTFTP4_DATA_HEAD_LEN)) {\r
-      goto ON_EXIT;\r
-    }\r
+    case EFI_MTFTP4_OPCODE_DATA:\r
+      if ((Len > (UINT32)(MTFTP4_DATA_HEAD_LEN + Instance->BlkSize)) ||\r
+          (Len < (UINT32)MTFTP4_DATA_HEAD_LEN))\r
+      {\r
+        goto ON_EXIT;\r
+      }\r
 \r
-    Status = Mtftp4RrqHandleData (Instance, Packet, Len, Multicast, &Completed);\r
-    break;\r
+      Status = Mtftp4RrqHandleData (Instance, Packet, Len, Multicast, &Completed);\r
+      break;\r
 \r
-  case EFI_MTFTP4_OPCODE_OACK:\r
-    if (Multicast || (Len <= MTFTP4_OPCODE_LEN)) {\r
-      goto ON_EXIT;\r
-    }\r
+    case EFI_MTFTP4_OPCODE_OACK:\r
+      if (Multicast || (Len <= MTFTP4_OPCODE_LEN)) {\r
+        goto ON_EXIT;\r
+      }\r
 \r
-    Status = Mtftp4RrqHandleOack (Instance, Packet, Len, Multicast, &Completed);\r
-    break;\r
+      Status = Mtftp4RrqHandleOack (Instance, Packet, Len, Multicast, &Completed);\r
+      break;\r
 \r
-  case EFI_MTFTP4_OPCODE_ERROR:\r
-    Status = EFI_TFTP_ERROR;\r
-    break;\r
+    case EFI_MTFTP4_OPCODE_ERROR:\r
+      Status = EFI_TFTP_ERROR;\r
+      break;\r
 \r
-  default:\r
-    break;\r
+    default:\r
+      break;\r
   }\r
 \r
 ON_EXIT:\r
index 6ca4842107df9ad87321cadf61c34f0e7a5d0b80..d3030839771c4b878f3ad4532971372e9edd84e3 100644 (file)
@@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Mtftp4Impl.h"\r
 \r
-\r
 /**\r
   Allocate a MTFTP4 block range, then init it to the range of [Start, End]\r
 \r
@@ -20,11 +19,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 MTFTP4_BLOCK_RANGE *\r
 Mtftp4AllocateRange (\r
-  IN UINT16                 Start,\r
-  IN UINT16                 End\r
+  IN UINT16  Start,\r
+  IN UINT16  End\r
   )\r
 {\r
-  MTFTP4_BLOCK_RANGE        *Range;\r
+  MTFTP4_BLOCK_RANGE  *Range;\r
 \r
   Range = AllocateZeroPool (sizeof (MTFTP4_BLOCK_RANGE));\r
 \r
@@ -33,14 +32,13 @@ Mtftp4AllocateRange (
   }\r
 \r
   InitializeListHead (&Range->Link);\r
-  Range->Start  = Start;\r
-  Range->End    = End;\r
-  Range->Bound  = End;\r
+  Range->Start = Start;\r
+  Range->End   = End;\r
+  Range->Bound = End;\r
 \r
   return Range;\r
 }\r
 \r
-\r
 /**\r
   Initialize the block range for either RRQ or WRQ.\r
 \r
@@ -64,12 +62,12 @@ Mtftp4AllocateRange (
 **/\r
 EFI_STATUS\r
 Mtftp4InitBlockRange (\r
-  IN LIST_ENTRY             *Head,\r
-  IN UINT16                 Start,\r
-  IN UINT16                 End\r
+  IN LIST_ENTRY  *Head,\r
+  IN UINT16      Start,\r
+  IN UINT16      End\r
   )\r
 {\r
-  MTFTP4_BLOCK_RANGE        *Range;\r
+  MTFTP4_BLOCK_RANGE  *Range;\r
 \r
   Range = Mtftp4AllocateRange (Start, End);\r
 \r
@@ -81,7 +79,6 @@ Mtftp4InitBlockRange (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Get the first valid block number on the range list.\r
 \r
@@ -92,7 +89,7 @@ Mtftp4InitBlockRange (
 **/\r
 INTN\r
 Mtftp4GetNextBlockNum (\r
-  IN LIST_ENTRY             *Head\r
+  IN LIST_ENTRY  *Head\r
   )\r
 {\r
   MTFTP4_BLOCK_RANGE  *Range;\r
@@ -105,7 +102,6 @@ Mtftp4GetNextBlockNum (
   return Range->Start;\r
 }\r
 \r
-\r
 /**\r
   Set the last block number of the block range list.\r
 \r
@@ -119,11 +115,11 @@ Mtftp4GetNextBlockNum (
 **/\r
 VOID\r
 Mtftp4SetLastBlockNum (\r
-  IN LIST_ENTRY             *Head,\r
-  IN UINT16                 Last\r
+  IN LIST_ENTRY  *Head,\r
+  IN UINT16      Last\r
   )\r
 {\r
-  MTFTP4_BLOCK_RANGE        *Range;\r
+  MTFTP4_BLOCK_RANGE  *Range;\r
 \r
   //\r
   // Iterate from the tail to head to remove the block number\r
@@ -142,11 +138,10 @@ Mtftp4SetLastBlockNum (
       Range->End = Last;\r
     }\r
 \r
-    return ;\r
+    return;\r
   }\r
 }\r
 \r
-\r
 /**\r
   Remove the block number from the block range list.\r
 \r
@@ -162,18 +157,17 @@ Mtftp4SetLastBlockNum (
 **/\r
 EFI_STATUS\r
 Mtftp4RemoveBlockNum (\r
-  IN LIST_ENTRY             *Head,\r
-  IN UINT16                 Num,\r
-  IN BOOLEAN                Completed,\r
-  OUT UINT64                *BlockCounter\r
+  IN LIST_ENTRY  *Head,\r
+  IN UINT16      Num,\r
+  IN BOOLEAN     Completed,\r
+  OUT UINT64     *BlockCounter\r
   )\r
 {\r
-  MTFTP4_BLOCK_RANGE        *Range;\r
-  MTFTP4_BLOCK_RANGE        *NewRange;\r
-  LIST_ENTRY                *Entry;\r
+  MTFTP4_BLOCK_RANGE  *Range;\r
+  MTFTP4_BLOCK_RANGE  *NewRange;\r
+  LIST_ENTRY          *Entry;\r
 \r
   NET_LIST_FOR_EACH (Entry, Head) {\r
-\r
     //\r
     // Each block represents a hole [Start, End] in the file,\r
     // skip to the first range with End >= Num\r
@@ -202,7 +196,6 @@ Mtftp4RemoveBlockNum (
     //\r
     if (Range->Start > Num) {\r
       return EFI_NOT_FOUND;\r
-\r
     } else if (Range->Start == Num) {\r
       Range->Start++;\r
 \r
@@ -214,15 +207,15 @@ Mtftp4RemoveBlockNum (
       // wrap to zero, because this is the simplest to implement. Here we choose\r
       // this solution.\r
       //\r
-      *BlockCounter  = Num;\r
+      *BlockCounter = Num;\r
 \r
       if (Range->Round > 0) {\r
-        *BlockCounter += Range->Bound +  MultU64x32 ((UINTN) (Range->Round -1), (UINT32) (Range->Bound + 1)) + 1;\r
+        *BlockCounter += Range->Bound +  MultU64x32 ((UINTN)(Range->Round -1), (UINT32)(Range->Bound + 1)) + 1;\r
       }\r
 \r
       if (Range->Start > Range->Bound) {\r
         Range->Start = 0;\r
-        Range->Round ++;\r
+        Range->Round++;\r
       }\r
 \r
       if ((Range->Start > Range->End) || Completed) {\r
@@ -231,12 +224,11 @@ Mtftp4RemoveBlockNum (
       }\r
 \r
       return EFI_SUCCESS;\r
-\r
     } else {\r
       if (Range->End == Num) {\r
         Range->End--;\r
       } else {\r
-        NewRange = Mtftp4AllocateRange ((UINT16) (Num + 1), (UINT16) Range->End);\r
+        NewRange = Mtftp4AllocateRange ((UINT16)(Num + 1), (UINT16)Range->End);\r
 \r
         if (NewRange == NULL) {\r
           return EFI_OUT_OF_RESOURCES;\r
@@ -253,7 +245,6 @@ Mtftp4RemoveBlockNum (
   return EFI_NOT_FOUND;\r
 }\r
 \r
-\r
 /**\r
   Build then transmit the request packet for the MTFTP session.\r
 \r
@@ -266,43 +257,44 @@ Mtftp4RemoveBlockNum (
 **/\r
 EFI_STATUS\r
 Mtftp4SendRequest (\r
-  IN MTFTP4_PROTOCOL        *Instance\r
+  IN MTFTP4_PROTOCOL  *Instance\r
   )\r
 {\r
-  EFI_MTFTP4_PACKET         *Packet;\r
-  EFI_MTFTP4_OPTION         *Options;\r
-  EFI_MTFTP4_TOKEN          *Token;\r
-  RETURN_STATUS             Status;\r
-  NET_BUF                   *Nbuf;\r
-  UINT8                     *Mode;\r
-  UINT8                     *Cur;\r
-  UINTN                     Index;\r
-  UINT32                    BufferLength;\r
-  UINTN                     FileNameLength;\r
-  UINTN                     ModeLength;\r
-  UINTN                     OptionStrLength;\r
-  UINTN                     ValueStrLength;\r
+  EFI_MTFTP4_PACKET  *Packet;\r
+  EFI_MTFTP4_OPTION  *Options;\r
+  EFI_MTFTP4_TOKEN   *Token;\r
+  RETURN_STATUS      Status;\r
+  NET_BUF            *Nbuf;\r
+  UINT8              *Mode;\r
+  UINT8              *Cur;\r
+  UINTN              Index;\r
+  UINT32             BufferLength;\r
+  UINTN              FileNameLength;\r
+  UINTN              ModeLength;\r
+  UINTN              OptionStrLength;\r
+  UINTN              ValueStrLength;\r
 \r
   Token   = Instance->Token;\r
   Options = Token->OptionList;\r
   Mode    = Instance->Token->ModeStr;\r
 \r
   if (Mode == NULL) {\r
-    Mode = (UINT8 *) "octet";\r
+    Mode = (UINT8 *)"octet";\r
   }\r
 \r
   //\r
   // Compute the packet length\r
   //\r
-  FileNameLength = AsciiStrLen ((CHAR8 *) Token->Filename);\r
-  ModeLength     = AsciiStrLen ((CHAR8 *) Mode);\r
-  BufferLength   = (UINT32) FileNameLength + (UINT32) ModeLength + 4;\r
+  FileNameLength = AsciiStrLen ((CHAR8 *)Token->Filename);\r
+  ModeLength     = AsciiStrLen ((CHAR8 *)Mode);\r
+  BufferLength   = (UINT32)FileNameLength + (UINT32)ModeLength + 4;\r
 \r
   for (Index = 0; Index < Token->OptionCount; Index++) {\r
-    OptionStrLength = AsciiStrLen ((CHAR8 *) Options[Index].OptionStr);\r
-    ValueStrLength  = AsciiStrLen ((CHAR8 *) Options[Index].ValueStr);\r
-    BufferLength   += (UINT32) OptionStrLength + (UINT32) ValueStrLength + 2;\r
+    OptionStrLength = AsciiStrLen ((CHAR8 *)Options[Index].OptionStr);\r
+    ValueStrLength  = AsciiStrLen ((CHAR8 *)Options[Index].ValueStr);\r
+    BufferLength   += (UINT32)OptionStrLength + (UINT32)ValueStrLength + 2;\r
   }\r
+\r
   //\r
   // Allocate a packet then copy the data over\r
   //\r
@@ -310,42 +302,40 @@ Mtftp4SendRequest (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Packet         = (EFI_MTFTP4_PACKET *) NetbufAllocSpace (Nbuf, BufferLength, FALSE);\r
+  Packet = (EFI_MTFTP4_PACKET *)NetbufAllocSpace (Nbuf, BufferLength, FALSE);\r
   ASSERT (Packet != NULL);\r
 \r
   Packet->OpCode = HTONS (Instance->Operation);\r
   BufferLength  -= sizeof (Packet->OpCode);\r
 \r
-  Cur            = Packet->Rrq.Filename;\r
-  Status         = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Token->Filename);\r
+  Cur    = Packet->Rrq.Filename;\r
+  Status = AsciiStrCpyS ((CHAR8 *)Cur, BufferLength, (CHAR8 *)Token->Filename);\r
   ASSERT_EFI_ERROR (Status);\r
-  BufferLength  -= (UINT32) (FileNameLength + 1);\r
-  Cur           += FileNameLength + 1;\r
-  Status         = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Mode);\r
+  BufferLength -= (UINT32)(FileNameLength + 1);\r
+  Cur          += FileNameLength + 1;\r
+  Status        = AsciiStrCpyS ((CHAR8 *)Cur, BufferLength, (CHAR8 *)Mode);\r
   ASSERT_EFI_ERROR (Status);\r
-  BufferLength  -= (UINT32) (ModeLength + 1);\r
-  Cur           += ModeLength + 1;\r
+  BufferLength -= (UINT32)(ModeLength + 1);\r
+  Cur          += ModeLength + 1;\r
 \r
   for (Index = 0; Index < Token->OptionCount; ++Index) {\r
-    OptionStrLength = AsciiStrLen ((CHAR8 *) Options[Index].OptionStr);\r
-    ValueStrLength  = AsciiStrLen ((CHAR8 *) Options[Index].ValueStr);\r
+    OptionStrLength = AsciiStrLen ((CHAR8 *)Options[Index].OptionStr);\r
+    ValueStrLength  = AsciiStrLen ((CHAR8 *)Options[Index].ValueStr);\r
 \r
-    Status          = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Options[Index].OptionStr);\r
+    Status = AsciiStrCpyS ((CHAR8 *)Cur, BufferLength, (CHAR8 *)Options[Index].OptionStr);\r
     ASSERT_EFI_ERROR (Status);\r
-    BufferLength   -= (UINT32) (OptionStrLength + 1);\r
-    Cur            += OptionStrLength + 1;\r
+    BufferLength -= (UINT32)(OptionStrLength + 1);\r
+    Cur          += OptionStrLength + 1;\r
 \r
-    Status          = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Options[Index].ValueStr);\r
+    Status = AsciiStrCpyS ((CHAR8 *)Cur, BufferLength, (CHAR8 *)Options[Index].ValueStr);\r
     ASSERT_EFI_ERROR (Status);\r
-    BufferLength   -= (UINT32) (ValueStrLength + 1);\r
-    Cur            += ValueStrLength + 1;\r
-\r
+    BufferLength -= (UINT32)(ValueStrLength + 1);\r
+    Cur          += ValueStrLength + 1;\r
   }\r
 \r
   return Mtftp4SendPacket (Instance, Nbuf);\r
 }\r
 \r
-\r
 /**\r
   Build then send an error message.\r
 \r
@@ -360,33 +350,32 @@ Mtftp4SendRequest (
 **/\r
 EFI_STATUS\r
 Mtftp4SendError (\r
-  IN MTFTP4_PROTOCOL        *Instance,\r
-  IN UINT16                 ErrCode,\r
-  IN UINT8                  *ErrInfo\r
+  IN MTFTP4_PROTOCOL  *Instance,\r
+  IN UINT16           ErrCode,\r
+  IN UINT8            *ErrInfo\r
   )\r
 {\r
-  NET_BUF                   *Packet;\r
-  EFI_MTFTP4_PACKET         *TftpError;\r
-  UINT32                    Len;\r
+  NET_BUF            *Packet;\r
+  EFI_MTFTP4_PACKET  *TftpError;\r
+  UINT32             Len;\r
 \r
-  Len     = (UINT32) (AsciiStrLen ((CHAR8 *) ErrInfo) + sizeof (EFI_MTFTP4_ERROR_HEADER));\r
-  Packet  = NetbufAlloc (Len);\r
+  Len    = (UINT32)(AsciiStrLen ((CHAR8 *)ErrInfo) + sizeof (EFI_MTFTP4_ERROR_HEADER));\r
+  Packet = NetbufAlloc (Len);\r
   if (Packet == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  TftpError         = (EFI_MTFTP4_PACKET *) NetbufAllocSpace (Packet, Len, FALSE);\r
+  TftpError = (EFI_MTFTP4_PACKET *)NetbufAllocSpace (Packet, Len, FALSE);\r
   ASSERT (TftpError != NULL);\r
 \r
-  TftpError->OpCode = HTONS (EFI_MTFTP4_OPCODE_ERROR);\r
+  TftpError->OpCode          = HTONS (EFI_MTFTP4_OPCODE_ERROR);\r
   TftpError->Error.ErrorCode = HTONS (ErrCode);\r
 \r
-  AsciiStrCpyS ((CHAR8 *) TftpError->Error.ErrorMessage, Len, (CHAR8 *) ErrInfo);\r
+  AsciiStrCpyS ((CHAR8 *)TftpError->Error.ErrorMessage, Len, (CHAR8 *)ErrInfo);\r
 \r
   return Mtftp4SendPacket (Instance, Packet);\r
 }\r
 \r
-\r
 /**\r
   The callback function called when the packet is transmitted.\r
 \r
@@ -401,16 +390,15 @@ Mtftp4SendError (
 VOID\r
 EFIAPI\r
 Mtftp4OnPacketSent (\r
-  IN NET_BUF                   *Packet,\r
-  IN UDP_END_POINT             *EndPoint,\r
-  IN EFI_STATUS                IoStatus,\r
-  IN VOID                      *Context\r
+  IN NET_BUF        *Packet,\r
+  IN UDP_END_POINT  *EndPoint,\r
+  IN EFI_STATUS     IoStatus,\r
+  IN VOID           *Context\r
   )\r
 {\r
   NetbufFree (Packet);\r
 }\r
 \r
-\r
 /**\r
   Set the timeout for the instance. User a longer time for passive instances.\r
 \r
@@ -419,7 +407,7 @@ Mtftp4OnPacketSent (
 **/\r
 VOID\r
 Mtftp4SetTimeout (\r
-  IN OUT MTFTP4_PROTOCOL        *Instance\r
+  IN OUT MTFTP4_PROTOCOL  *Instance\r
   )\r
 {\r
   if (Instance->Master) {\r
@@ -429,7 +417,6 @@ Mtftp4SetTimeout (
   }\r
 }\r
 \r
-\r
 /**\r
   Send the packet for the instance.\r
 \r
@@ -446,14 +433,14 @@ Mtftp4SetTimeout (
 **/\r
 EFI_STATUS\r
 Mtftp4SendPacket (\r
-  IN OUT MTFTP4_PROTOCOL        *Instance,\r
-  IN OUT NET_BUF                *Packet\r
+  IN OUT MTFTP4_PROTOCOL  *Instance,\r
+  IN OUT NET_BUF          *Packet\r
   )\r
 {\r
-  UDP_END_POINT             UdpPoint;\r
-  EFI_STATUS                Status;\r
-  UINT16                    OpCode;\r
-  UINT8                     *Buffer;\r
+  UDP_END_POINT  UdpPoint;\r
+  EFI_STATUS     Status;\r
+  UINT16         OpCode;\r
+  UINT8          *Buffer;\r
 \r
   //\r
   // Save the packet for retransmission\r
@@ -462,9 +449,9 @@ Mtftp4SendPacket (
     NetbufFree (Instance->LastPacket);\r
   }\r
 \r
-  Instance->LastPacket        = Packet;\r
+  Instance->LastPacket = Packet;\r
 \r
-  Instance->CurRetry          = 0;\r
+  Instance->CurRetry = 0;\r
   Mtftp4SetTimeout (Instance);\r
 \r
   ZeroMem (&UdpPoint, sizeof (UdpPoint));\r
@@ -480,7 +467,8 @@ Mtftp4SendPacket (
 \r
   if ((OpCode == EFI_MTFTP4_OPCODE_RRQ) ||\r
       (OpCode == EFI_MTFTP4_OPCODE_DIR) ||\r
-      (OpCode == EFI_MTFTP4_OPCODE_WRQ)) {\r
+      (OpCode == EFI_MTFTP4_OPCODE_WRQ))\r
+  {\r
     UdpPoint.RemotePort = Instance->ListeningPort;\r
   } else {\r
     UdpPoint.RemotePort = Instance->ConnectedPort;\r
@@ -504,7 +492,6 @@ Mtftp4SendPacket (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Retransmit the last packet for the instance.\r
 \r
@@ -516,13 +503,13 @@ Mtftp4SendPacket (
 **/\r
 EFI_STATUS\r
 Mtftp4Retransmit (\r
-  IN MTFTP4_PROTOCOL        *Instance\r
+  IN MTFTP4_PROTOCOL  *Instance\r
   )\r
 {\r
-  UDP_END_POINT             UdpPoint;\r
-  EFI_STATUS                Status;\r
-  UINT16                    OpCode;\r
-  UINT8                     *Buffer;\r
+  UDP_END_POINT  UdpPoint;\r
+  EFI_STATUS     Status;\r
+  UINT16         OpCode;\r
+  UINT8          *Buffer;\r
 \r
   ASSERT (Instance->LastPacket != NULL);\r
 \r
@@ -534,10 +521,11 @@ Mtftp4Retransmit (
   //\r
   Buffer = NetbufGetByte (Instance->LastPacket, 0, NULL);\r
   ASSERT (Buffer != NULL);\r
-  OpCode = NTOHS (*(UINT16 *) Buffer);\r
+  OpCode = NTOHS (*(UINT16 *)Buffer);\r
 \r
   if ((OpCode == EFI_MTFTP4_OPCODE_RRQ) || (OpCode == EFI_MTFTP4_OPCODE_DIR) ||\r
-      (OpCode == EFI_MTFTP4_OPCODE_WRQ)) {\r
+      (OpCode == EFI_MTFTP4_OPCODE_WRQ))\r
+  {\r
     UdpPoint.RemotePort = Instance->ListeningPort;\r
   } else {\r
     UdpPoint.RemotePort = Instance->ConnectedPort;\r
@@ -561,7 +549,6 @@ Mtftp4Retransmit (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   The timer ticking function in TPL_NOTIFY level for the Mtftp service instance.\r
 \r
@@ -572,16 +559,16 @@ Mtftp4Retransmit (
 VOID\r
 EFIAPI\r
 Mtftp4OnTimerTickNotifyLevel (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  MTFTP4_SERVICE            *MtftpSb;\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  MTFTP4_PROTOCOL           *Instance;\r
+  MTFTP4_SERVICE   *MtftpSb;\r
+  LIST_ENTRY       *Entry;\r
+  LIST_ENTRY       *Next;\r
+  MTFTP4_PROTOCOL  *Instance;\r
 \r
-  MtftpSb = (MTFTP4_SERVICE *) Context;\r
+  MtftpSb = (MTFTP4_SERVICE *)Context;\r
 \r
   //\r
   // Iterate through all the children of the Mtftp service instance. Time\r
@@ -597,7 +584,6 @@ Mtftp4OnTimerTickNotifyLevel (
   }\r
 }\r
 \r
-\r
 /**\r
   The timer ticking function for the Mtftp service instance.\r
 \r
@@ -608,17 +594,17 @@ Mtftp4OnTimerTickNotifyLevel (
 VOID\r
 EFIAPI\r
 Mtftp4OnTimerTick (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  MTFTP4_SERVICE            *MtftpSb;\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  MTFTP4_PROTOCOL           *Instance;\r
-  EFI_MTFTP4_TOKEN          *Token;\r
+  MTFTP4_SERVICE    *MtftpSb;\r
+  LIST_ENTRY        *Entry;\r
+  LIST_ENTRY        *Next;\r
+  MTFTP4_PROTOCOL   *Instance;\r
+  EFI_MTFTP4_TOKEN  *Token;\r
 \r
-  MtftpSb = (MTFTP4_SERVICE *) Context;\r
+  MtftpSb = (MTFTP4_SERVICE *)Context;\r
 \r
   //\r
   // Iterate through all the children of the Mtftp service instance.\r
@@ -636,12 +622,13 @@ Mtftp4OnTimerTick (
     //\r
     Token = Instance->Token;\r
 \r
-    if (Token != NULL && Token->TimeoutCallback != NULL &&\r
-        EFI_ERROR (Token->TimeoutCallback (&Instance->Mtftp4, Token))) {\r
+    if ((Token != NULL) && (Token->TimeoutCallback != NULL) &&\r
+        EFI_ERROR (Token->TimeoutCallback (&Instance->Mtftp4, Token)))\r
+    {\r
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,\r
-        (UINT8 *) "User aborted the transfer in time out"\r
+        (UINT8 *)"User aborted the transfer in time out"\r
         );\r
 \r
       Mtftp4CleanOperation (Instance, EFI_ABORTED);\r
index 95e9bad43ef151288099fdf84bfb40dba25d1280..626701778208bcadf629bd46b35637072050d289 100644 (file)
@@ -15,14 +15,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // the holes are filled in, then the download or upload has completed.\r
 //\r
 typedef struct {\r
-  LIST_ENTRY                Link;\r
-  INTN                      Start;\r
-  INTN                      End;\r
-  INTN                      Round;\r
-  INTN                      Bound;\r
+  LIST_ENTRY    Link;\r
+  INTN          Start;\r
+  INTN          End;\r
+  INTN          Round;\r
+  INTN          Bound;\r
 } MTFTP4_BLOCK_RANGE;\r
 \r
-\r
 /**\r
   Initialize the block range for either RRQ or WRQ.\r
 \r
@@ -46,9 +45,9 @@ typedef struct {
 **/\r
 EFI_STATUS\r
 Mtftp4InitBlockRange (\r
-  IN LIST_ENTRY             *Head,\r
-  IN UINT16                 Start,\r
-  IN UINT16                 End\r
+  IN LIST_ENTRY  *Head,\r
+  IN UINT16      Start,\r
+  IN UINT16      End\r
   );\r
 \r
 /**\r
@@ -61,7 +60,7 @@ Mtftp4InitBlockRange (
 **/\r
 INTN\r
 Mtftp4GetNextBlockNum (\r
-  IN LIST_ENTRY             *Head\r
+  IN LIST_ENTRY  *Head\r
   );\r
 \r
 /**\r
@@ -77,8 +76,8 @@ Mtftp4GetNextBlockNum (
 **/\r
 VOID\r
 Mtftp4SetLastBlockNum (\r
-  IN LIST_ENTRY             *Head,\r
-  IN UINT16                 Last\r
+  IN LIST_ENTRY  *Head,\r
+  IN UINT16      Last\r
   );\r
 \r
 /**\r
@@ -96,10 +95,10 @@ Mtftp4SetLastBlockNum (
 **/\r
 EFI_STATUS\r
 Mtftp4RemoveBlockNum (\r
-  IN LIST_ENTRY             *Head,\r
-  IN UINT16                 Num,\r
-  IN BOOLEAN                Completed,\r
-  OUT UINT64                *BlockCounter\r
+  IN LIST_ENTRY  *Head,\r
+  IN UINT16      Num,\r
+  IN BOOLEAN     Completed,\r
+  OUT UINT64     *BlockCounter\r
   );\r
 \r
 /**\r
@@ -110,7 +109,7 @@ Mtftp4RemoveBlockNum (
 **/\r
 VOID\r
 Mtftp4SetTimeout (\r
-  IN OUT MTFTP4_PROTOCOL        *Instance\r
+  IN OUT MTFTP4_PROTOCOL  *Instance\r
   );\r
 \r
 /**\r
@@ -129,8 +128,8 @@ Mtftp4SetTimeout (
 **/\r
 EFI_STATUS\r
 Mtftp4SendPacket (\r
-  IN OUT MTFTP4_PROTOCOL        *Instance,\r
-  IN OUT NET_BUF                *Packet\r
+  IN OUT MTFTP4_PROTOCOL  *Instance,\r
+  IN OUT NET_BUF          *Packet\r
   );\r
 \r
 /**\r
@@ -145,7 +144,7 @@ Mtftp4SendPacket (
 **/\r
 EFI_STATUS\r
 Mtftp4SendRequest (\r
-  IN MTFTP4_PROTOCOL        *Instance\r
+  IN MTFTP4_PROTOCOL  *Instance\r
   );\r
 \r
 /**\r
@@ -162,12 +161,11 @@ Mtftp4SendRequest (
 **/\r
 EFI_STATUS\r
 Mtftp4SendError (\r
-  IN MTFTP4_PROTOCOL        *Instance,\r
-  IN UINT16                 ErrCode,\r
-  IN UINT8                  *ErrInfo\r
+  IN MTFTP4_PROTOCOL  *Instance,\r
+  IN UINT16           ErrCode,\r
+  IN UINT8            *ErrInfo\r
   );\r
 \r
-\r
 /**\r
   The timer ticking function in TPL_NOTIFY level for the Mtftp service instance.\r
 \r
@@ -178,8 +176,8 @@ Mtftp4SendError (
 VOID\r
 EFIAPI\r
 Mtftp4OnTimerTickNotifyLevel (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -192,7 +190,8 @@ Mtftp4OnTimerTickNotifyLevel (
 VOID\r
 EFIAPI\r
 Mtftp4OnTimerTick (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
+\r
 #endif\r
index 5d479fad4e7cdc4758c5b1ad7bf564961cdd037d..9ebefc74ec4629e6681d097a9358fbd13ef938e0 100644 (file)
@@ -8,8 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Mtftp4Impl.h"\r
 \r
-\r
-\r
 /**\r
   Build then send a MTFTP data packet for the MTFTP upload session.\r
 \r
@@ -24,17 +22,17 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 Mtftp4WrqSendBlock (\r
-  IN OUT MTFTP4_PROTOCOL        *Instance,\r
-  IN     UINT16                 BlockNum\r
+  IN OUT MTFTP4_PROTOCOL  *Instance,\r
+  IN     UINT16           BlockNum\r
   )\r
 {\r
-  EFI_MTFTP4_PACKET         *Packet;\r
-  EFI_MTFTP4_TOKEN          *Token;\r
-  NET_BUF                   *UdpPacket;\r
-  EFI_STATUS                Status;\r
-  UINT16                    DataLen;\r
-  UINT8                     *DataBuf;\r
-  UINT64                    Start;\r
+  EFI_MTFTP4_PACKET  *Packet;\r
+  EFI_MTFTP4_TOKEN   *Token;\r
+  NET_BUF            *UdpPacket;\r
+  EFI_STATUS         Status;\r
+  UINT16             DataLen;\r
+  UINT8              *DataBuf;\r
+  UINT64             Start;\r
 \r
   //\r
   // Allocate a buffer to hold the user data\r
@@ -45,7 +43,7 @@ Mtftp4WrqSendBlock (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Packet = (EFI_MTFTP4_PACKET *) NetbufAllocSpace (UdpPacket, MTFTP4_DATA_HEAD_LEN, FALSE);\r
+  Packet = (EFI_MTFTP4_PACKET *)NetbufAllocSpace (UdpPacket, MTFTP4_DATA_HEAD_LEN, FALSE);\r
   ASSERT (Packet != NULL);\r
 \r
   Packet->Data.OpCode = HTONS (EFI_MTFTP4_OPCODE_DATA);\r
@@ -61,16 +59,15 @@ Mtftp4WrqSendBlock (
     Start = MultU64x32 (BlockNum - 1, Instance->BlkSize);\r
 \r
     if (Token->BufferSize < Start + Instance->BlkSize) {\r
-      DataLen             = (UINT16) (Token->BufferSize - Start);\r
+      DataLen             = (UINT16)(Token->BufferSize - Start);\r
       Instance->LastBlock = BlockNum;\r
       Mtftp4SetLastBlockNum (&Instance->Blocks, BlockNum);\r
     }\r
 \r
     if (DataLen > 0) {\r
       NetbufAllocSpace (UdpPacket, DataLen, FALSE);\r
-      CopyMem (Packet->Data.Data, (UINT8 *) Token->Buffer + Start, DataLen);\r
+      CopyMem (Packet->Data.Data, (UINT8 *)Token->Buffer + Start, DataLen);\r
     }\r
-\r
   } else {\r
     //\r
     // Get data from PacketNeeded\r
@@ -80,7 +77,7 @@ Mtftp4WrqSendBlock (
                        &Instance->Mtftp4,\r
                        Token,\r
                        &DataLen,\r
-                       (VOID **) &DataBuf\r
+                       (VOID **)&DataBuf\r
                        );\r
 \r
     if (EFI_ERROR (Status) || (DataLen > Instance->BlkSize)) {\r
@@ -95,7 +92,7 @@ Mtftp4WrqSendBlock (
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,\r
-        (UINT8 *) "User aborted the transfer"\r
+        (UINT8 *)"User aborted the transfer"\r
         );\r
 \r
       return EFI_ABORTED;\r
@@ -116,7 +113,6 @@ Mtftp4WrqSendBlock (
   return Mtftp4SendPacket (Instance, UdpPacket);\r
 }\r
 \r
-\r
 /**\r
   Function to handle received ACK packet.\r
 \r
@@ -135,19 +131,19 @@ Mtftp4WrqSendBlock (
 **/\r
 EFI_STATUS\r
 Mtftp4WrqHandleAck (\r
-  IN     MTFTP4_PROTOCOL       *Instance,\r
-  IN     EFI_MTFTP4_PACKET     *Packet,\r
-  IN     UINT32                Len,\r
-     OUT BOOLEAN               *Completed\r
+  IN     MTFTP4_PROTOCOL    *Instance,\r
+  IN     EFI_MTFTP4_PACKET  *Packet,\r
+  IN     UINT32             Len,\r
+  OUT BOOLEAN               *Completed\r
   )\r
 {\r
-  UINT16                    AckNum;\r
-  INTN                      Expected;\r
-  UINT64                    BlockCounter;\r
+  UINT16  AckNum;\r
+  INTN    Expected;\r
+  UINT64  BlockCounter;\r
 \r
-  *Completed  = FALSE;\r
-  AckNum      = NTOHS (Packet->Ack.Block[0]);\r
-  Expected    = Mtftp4GetNextBlockNum (&Instance->Blocks);\r
+  *Completed = FALSE;\r
+  AckNum     = NTOHS (Packet->Ack.Block[0]);\r
+  Expected   = Mtftp4GetNextBlockNum (&Instance->Blocks);\r
 \r
   ASSERT (Expected >= 0);\r
 \r
@@ -169,7 +165,6 @@ Mtftp4WrqHandleAck (
   Expected = Mtftp4GetNextBlockNum (&Instance->Blocks);\r
 \r
   if (Expected < 0) {\r
-\r
     //\r
     // The block range is empty. It may either because the last\r
     // block has been ACKed, or the sequence number just looped back,\r
@@ -179,22 +174,20 @@ Mtftp4WrqHandleAck (
       ASSERT (Instance->LastBlock >= 1);\r
       *Completed = TRUE;\r
       return EFI_SUCCESS;\r
-\r
     } else {\r
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,\r
-        (UINT8 *) "Block number rolls back, not supported, try blksize option"\r
+        (UINT8 *)"Block number rolls back, not supported, try blksize option"\r
         );\r
 \r
       return EFI_TFTP_ERROR;\r
     }\r
   }\r
 \r
-  return Mtftp4WrqSendBlock (Instance, (UINT16) Expected);\r
+  return Mtftp4WrqSendBlock (Instance, (UINT16)Expected);\r
 }\r
 \r
-\r
 /**\r
   Check whether the received OACK is valid.\r
 \r
@@ -213,8 +206,8 @@ Mtftp4WrqHandleAck (
 **/\r
 BOOLEAN\r
 Mtftp4WrqOackValid (\r
-  IN MTFTP4_OPTION              *Reply,\r
-  IN MTFTP4_OPTION              *Request\r
+  IN MTFTP4_OPTION  *Reply,\r
+  IN MTFTP4_OPTION  *Request\r
   )\r
 {\r
   //\r
@@ -229,14 +222,14 @@ Mtftp4WrqOackValid (
   // return the timeout matches that requested.\r
   //\r
   if ((((Reply->Exist & MTFTP4_BLKSIZE_EXIST) != 0) && (Reply->BlkSize > Request->BlkSize)) ||\r
-      (((Reply->Exist & MTFTP4_TIMEOUT_EXIST) != 0) && (Reply->Timeout != Request->Timeout))) {\r
+      (((Reply->Exist & MTFTP4_TIMEOUT_EXIST) != 0) && (Reply->Timeout != Request->Timeout)))\r
+  {\r
     return FALSE;\r
   }\r
 \r
   return TRUE;\r
 }\r
 \r
-\r
 /**\r
   Function to handle the MTFTP OACK packet.\r
 \r
@@ -254,16 +247,16 @@ Mtftp4WrqOackValid (
 **/\r
 EFI_STATUS\r
 Mtftp4WrqHandleOack (\r
-  IN OUT MTFTP4_PROTOCOL       *Instance,\r
-  IN     EFI_MTFTP4_PACKET     *Packet,\r
-  IN     UINT32                Len,\r
-     OUT BOOLEAN               *Completed\r
+  IN OUT MTFTP4_PROTOCOL    *Instance,\r
+  IN     EFI_MTFTP4_PACKET  *Packet,\r
+  IN     UINT32             Len,\r
+  OUT BOOLEAN               *Completed\r
   )\r
 {\r
-  MTFTP4_OPTION             Reply;\r
-  EFI_MTFTP4_PACKET         Bogus;\r
-  EFI_STATUS                Status;\r
-  INTN                      Expected;\r
+  MTFTP4_OPTION      Reply;\r
+  EFI_MTFTP4_PACKET  Bogus;\r
+  EFI_STATUS         Status;\r
+  INTN               Expected;\r
 \r
   *Completed = FALSE;\r
 \r
@@ -291,7 +284,7 @@ Mtftp4WrqHandleOack (
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_ILLEGAL_OPERATION,\r
-        (UINT8 *) "Malformatted OACK packet"\r
+        (UINT8 *)"Malformatted OACK packet"\r
         );\r
     }\r
 \r
@@ -310,8 +303,8 @@ Mtftp4WrqHandleOack (
   // Build a bogus ACK0 packet then pass it to the Mtftp4WrqHandleAck,\r
   // which will start the transmission of the first data block.\r
   //\r
-  Bogus.Ack.OpCode    = HTONS (EFI_MTFTP4_OPCODE_ACK);\r
-  Bogus.Ack.Block[0]  = 0;\r
+  Bogus.Ack.OpCode   = HTONS (EFI_MTFTP4_OPCODE_ACK);\r
+  Bogus.Ack.Block[0] = 0;\r
 \r
   Status = Mtftp4WrqHandleAck (\r
              Instance,\r
@@ -323,7 +316,6 @@ Mtftp4WrqHandleOack (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   The input process routine for MTFTP upload.\r
 \r
@@ -336,20 +328,20 @@ Mtftp4WrqHandleOack (
 VOID\r
 EFIAPI\r
 Mtftp4WrqInput (\r
-  IN NET_BUF                *UdpPacket,\r
-  IN UDP_END_POINT          *EndPoint,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN VOID                   *Context\r
+  IN NET_BUF        *UdpPacket,\r
+  IN UDP_END_POINT  *EndPoint,\r
+  IN EFI_STATUS     IoStatus,\r
+  IN VOID           *Context\r
   )\r
 {\r
-  MTFTP4_PROTOCOL           *Instance;\r
-  EFI_MTFTP4_PACKET         *Packet;\r
-  BOOLEAN                   Completed;\r
-  EFI_STATUS                Status;\r
-  UINT32                    Len;\r
-  UINT16                    Opcode;\r
-\r
-  Instance = (MTFTP4_PROTOCOL *) Context;\r
+  MTFTP4_PROTOCOL    *Instance;\r
+  EFI_MTFTP4_PACKET  *Packet;\r
+  BOOLEAN            Completed;\r
+  EFI_STATUS         Status;\r
+  UINT32             Len;\r
+  UINT16             Opcode;\r
+\r
+  Instance = (MTFTP4_PROTOCOL *)Context;\r
   NET_CHECK_SIGNATURE (Instance, MTFTP4_PROTOCOL_SIGNATURE);\r
 \r
   Completed = FALSE;\r
@@ -392,10 +384,9 @@ Mtftp4WrqInput (
       goto ON_EXIT;\r
     }\r
 \r
-    NetbufCopy (UdpPacket, 0, Len, (UINT8 *) Packet);\r
-\r
+    NetbufCopy (UdpPacket, 0, Len, (UINT8 *)Packet);\r
   } else {\r
-    Packet = (EFI_MTFTP4_PACKET *) NetbufGetByte (UdpPacket, 0, NULL);\r
+    Packet = (EFI_MTFTP4_PACKET *)NetbufGetByte (UdpPacket, 0, NULL);\r
     ASSERT (Packet != NULL);\r
   }\r
 \r
@@ -406,12 +397,12 @@ Mtftp4WrqInput (
   // if CheckPacket returns an EFI_ERROR code.\r
   //\r
   if ((Instance->Token->CheckPacket != NULL) &&\r
-      ((Opcode == EFI_MTFTP4_OPCODE_OACK) || (Opcode == EFI_MTFTP4_OPCODE_ERROR))) {\r
-\r
+      ((Opcode == EFI_MTFTP4_OPCODE_OACK) || (Opcode == EFI_MTFTP4_OPCODE_ERROR)))\r
+  {\r
     Status = Instance->Token->CheckPacket (\r
                                 &Instance->Mtftp4,\r
                                 Instance->Token,\r
-                                (UINT16) Len,\r
+                                (UINT16)Len,\r
                                 Packet\r
                                 );\r
 \r
@@ -423,7 +414,7 @@ Mtftp4WrqInput (
         Mtftp4SendError (\r
           Instance,\r
           EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,\r
-          (UINT8 *) "User aborted the transfer"\r
+          (UINT8 *)"User aborted the transfer"\r
           );\r
       }\r
 \r
@@ -433,28 +424,28 @@ Mtftp4WrqInput (
   }\r
 \r
   switch (Opcode) {\r
-  case EFI_MTFTP4_OPCODE_ACK:\r
-    if (Len != MTFTP4_OPCODE_LEN + MTFTP4_BLKNO_LEN) {\r
-      goto ON_EXIT;\r
-    }\r
+    case EFI_MTFTP4_OPCODE_ACK:\r
+      if (Len != MTFTP4_OPCODE_LEN + MTFTP4_BLKNO_LEN) {\r
+        goto ON_EXIT;\r
+      }\r
 \r
-    Status = Mtftp4WrqHandleAck (Instance, Packet, Len, &Completed);\r
-    break;\r
+      Status = Mtftp4WrqHandleAck (Instance, Packet, Len, &Completed);\r
+      break;\r
 \r
-  case EFI_MTFTP4_OPCODE_OACK:\r
-    if (Len <= MTFTP4_OPCODE_LEN) {\r
-      goto ON_EXIT;\r
-    }\r
+    case EFI_MTFTP4_OPCODE_OACK:\r
+      if (Len <= MTFTP4_OPCODE_LEN) {\r
+        goto ON_EXIT;\r
+      }\r
 \r
-    Status = Mtftp4WrqHandleOack (Instance, Packet, Len, &Completed);\r
-    break;\r
+      Status = Mtftp4WrqHandleOack (Instance, Packet, Len, &Completed);\r
+      break;\r
 \r
-  case EFI_MTFTP4_OPCODE_ERROR:\r
-    Status = EFI_TFTP_ERROR;\r
-    break;\r
+    case EFI_MTFTP4_OPCODE_ERROR:\r
+      Status = EFI_TFTP_ERROR;\r
+      break;\r
 \r
-  default:\r
-    break;\r
+    default:\r
+      break;\r
   }\r
 \r
 ON_EXIT:\r
@@ -482,8 +473,6 @@ ON_EXIT:
   }\r
 }\r
 \r
-\r
-\r
 /**\r
   Start the MTFTP session for upload.\r
 \r
@@ -500,11 +489,11 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 Mtftp4WrqStart (\r
-  IN MTFTP4_PROTOCOL        *Instance,\r
-  IN UINT16                 Operation\r
+  IN MTFTP4_PROTOCOL  *Instance,\r
+  IN UINT16           Operation\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // The valid block number range are [0, 0xffff]. For example:\r
@@ -526,4 +515,3 @@ Mtftp4WrqStart (
 \r
   return UdpIoRecvDatagram (Instance->UnicastPort, Mtftp4WrqInput, Instance, 0);\r
 }\r
-\r
index 296be48ec630e0781e27724b448f52ba9c4ff12b..48e85e6ff7c1398c72ee9307c4f8bc27aa28d5c1 100644 (file)
@@ -9,7 +9,6 @@
 \r
 #include "Mtftp6Impl.h"\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user-readable name of the driver.\r
 \r
@@ -128,17 +127,17 @@ Mtftp6ComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp6ComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   );\r
 \r
 //\r
 // EFI Component Name Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL     gMtftp6ComponentName = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gMtftp6ComponentName = {\r
   Mtftp6ComponentNameGetDriverName,\r
   Mtftp6ComponentNameGetControllerName,\r
   "eng"\r
@@ -147,13 +146,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL     gMtftp6ComponentNa
 //\r
 // EFI Component Name 2 Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL    gMtftp6ComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) Mtftp6ComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) Mtftp6ComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gMtftp6ComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)Mtftp6ComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)Mtftp6ComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE        mMtftp6DriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mMtftp6DriverNameTable[] = {\r
   {\r
     "eng;en",\r
     L"MTFTP6 Network Service Driver"\r
@@ -164,7 +163,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE        mMtftp6DriverNameT
   }\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE   *gMtftp6ControllerNameTable = NULL;\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  *gMtftp6ControllerNameTable = NULL;\r
 \r
 /**\r
   Retrieves a Unicode string that is the user-readable name of the driver.\r
@@ -214,12 +213,12 @@ Mtftp6ComponentNameGetDriverName (
   )\r
 {\r
   return LookupUnicodeString2 (\r
-          Language,\r
-          This->SupportedLanguages,\r
-          mMtftp6DriverNameTable,\r
-          DriverName,\r
-          (BOOLEAN)(This == &gMtftp6ComponentName)\r
-          );\r
+           Language,\r
+           This->SupportedLanguages,\r
+           mMtftp6DriverNameTable,\r
+           DriverName,\r
+           (BOOLEAN)(This == &gMtftp6ComponentName)\r
+           );\r
 }\r
 \r
 /**\r
@@ -234,13 +233,13 @@ Mtftp6ComponentNameGetDriverName (
 **/\r
 EFI_STATUS\r
 UpdateName (\r
-  IN    EFI_MTFTP6_PROTOCOL             *Mtftp6\r
+  IN    EFI_MTFTP6_PROTOCOL  *Mtftp6\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  CHAR16                           HandleName[128];\r
-  EFI_MTFTP6_MODE_DATA             Mtftp6ModeData;\r
-  CHAR16                           Address[sizeof"ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"];\r
+  EFI_STATUS            Status;\r
+  CHAR16                HandleName[128];\r
+  EFI_MTFTP6_MODE_DATA  Mtftp6ModeData;\r
+  CHAR16                Address[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"];\r
 \r
   if (Mtftp6 == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -251,11 +250,14 @@ UpdateName (
   //\r
   Status = Mtftp6->GetModeData (Mtftp6, &Mtftp6ModeData);\r
   if (!EFI_ERROR (Status)) {\r
-    Status = NetLibIp6ToStr (&Mtftp6ModeData.ConfigData.ServerIp, Address, sizeof(Address));\r
+    Status = NetLibIp6ToStr (&Mtftp6ModeData.ConfigData.ServerIp, Address, sizeof (Address));\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
-    UnicodeSPrint (HandleName, sizeof (HandleName),\r
+\r
+    UnicodeSPrint (\r
+      HandleName,\r
+      sizeof (HandleName),\r
       L"MTFTPv6(ServerIp=%s, InitialServerPort=%d)",\r
       Address,\r
       Mtftp6ModeData.ConfigData.InitialServerPort\r
@@ -289,7 +291,6 @@ UpdateName (
            );\r
 }\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user-readable name of the controller\r
   that is being managed by a driver.\r
@@ -361,15 +362,15 @@ UpdateName (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp6ComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_MTFTP6_PROTOCOL           *Mtftp6;\r
+  EFI_STATUS           Status;\r
+  EFI_MTFTP6_PROTOCOL  *Mtftp6;\r
 \r
   //\r
   // Only provide names for child handles.\r
@@ -421,4 +422,3 @@ Mtftp6ComponentNameGetControllerName (
            (BOOLEAN)(This == &gMtftp6ComponentName)\r
            );\r
 }\r
-\r
index a19a67a1ce7e4b80d172cc74ca9365d307f9523b..236b8c21557ee456660f2956c45f364a171463fd 100644 (file)
@@ -10,8 +10,7 @@
 \r
 #include "Mtftp6Impl.h"\r
 \r
-\r
-EFI_DRIVER_BINDING_PROTOCOL   gMtftp6DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gMtftp6DriverBinding = {\r
   Mtftp6DriverBindingSupported,\r
   Mtftp6DriverBindingStart,\r
   Mtftp6DriverBindingStop,\r
@@ -25,7 +24,6 @@ EFI_SERVICE_BINDING_PROTOCOL  gMtftp6ServiceBindingTemplate = {
   Mtftp6ServiceBindingDestroyChild\r
 };\r
 \r
-\r
 /**\r
   Destroy the MTFTP6 service. The MTFTP6 service may be partly initialized,\r
   or partly destroyed. If a resource is destroyed, it is marked as such in\r
@@ -36,7 +34,7 @@ EFI_SERVICE_BINDING_PROTOCOL  gMtftp6ServiceBindingTemplate = {
 **/\r
 VOID\r
 Mtftp6DestroyService (\r
-  IN MTFTP6_SERVICE     *Service\r
+  IN MTFTP6_SERVICE  *Service\r
   )\r
 {\r
   //\r
@@ -55,7 +53,6 @@ Mtftp6DestroyService (
   FreePool (Service);\r
 }\r
 \r
-\r
 /**\r
   Create then initialize a MTFTP6 service binding instance.\r
 \r
@@ -72,13 +69,13 @@ Mtftp6DestroyService (
 **/\r
 EFI_STATUS\r
 Mtftp6CreateService (\r
-  IN  EFI_HANDLE            Controller,\r
-  IN  EFI_HANDLE            Image,\r
-  OUT MTFTP6_SERVICE        **Service\r
+  IN  EFI_HANDLE      Controller,\r
+  IN  EFI_HANDLE      Image,\r
+  OUT MTFTP6_SERVICE  **Service\r
   )\r
 {\r
-  MTFTP6_SERVICE            *Mtftp6Srv;\r
-  EFI_STATUS                Status;\r
+  MTFTP6_SERVICE  *Mtftp6Srv;\r
+  EFI_STATUS      Status;\r
 \r
   ASSERT (Service != NULL);\r
 \r
@@ -89,10 +86,10 @@ Mtftp6CreateService (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Mtftp6Srv->Signature      = MTFTP6_SERVICE_SIGNATURE;\r
-  Mtftp6Srv->Controller     = Controller;\r
-  Mtftp6Srv->Image          = Image;\r
-  Mtftp6Srv->ChildrenNum    = 0;\r
+  Mtftp6Srv->Signature   = MTFTP6_SERVICE_SIGNATURE;\r
+  Mtftp6Srv->Controller  = Controller;\r
+  Mtftp6Srv->Image       = Image;\r
+  Mtftp6Srv->ChildrenNum = 0;\r
 \r
   CopyMem (\r
     &Mtftp6Srv->ServiceBinding,\r
@@ -140,7 +137,6 @@ Mtftp6CreateService (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Destroy the MTFTP6 instance and recycle the resources.\r
 \r
@@ -149,18 +145,18 @@ Mtftp6CreateService (
 **/\r
 VOID\r
 Mtftp6DestroyInstance (\r
-  IN MTFTP6_INSTANCE         *Instance\r
+  IN MTFTP6_INSTANCE  *Instance\r
   )\r
 {\r
-  LIST_ENTRY                 *Entry;\r
-  LIST_ENTRY                 *Next;\r
-  MTFTP6_BLOCK_RANGE         *Block;\r
+  LIST_ENTRY          *Entry;\r
+  LIST_ENTRY          *Next;\r
+  MTFTP6_BLOCK_RANGE  *Block;\r
 \r
   if (Instance->Config != NULL) {\r
     FreePool (Instance->Config);\r
   }\r
 \r
-  if (Instance->Token != NULL && Instance->Token->Event != NULL) {\r
+  if ((Instance->Token != NULL) && (Instance->Token->Event != NULL)) {\r
     gBS->SignalEvent (Instance->Token->Event);\r
   }\r
 \r
@@ -168,7 +164,7 @@ Mtftp6DestroyInstance (
     NetbufFree (Instance->LastPacket);\r
   }\r
 \r
-  if (Instance->UdpIo!= NULL) {\r
+  if (Instance->UdpIo != NULL) {\r
     UdpIoFreeIo (Instance->UdpIo);\r
   }\r
 \r
@@ -185,7 +181,6 @@ Mtftp6DestroyInstance (
   FreePool (Instance);\r
 }\r
 \r
-\r
 /**\r
   Create the MTFTP6 instance and initialize it.\r
 \r
@@ -198,11 +193,11 @@ Mtftp6DestroyInstance (
 **/\r
 EFI_STATUS\r
 Mtftp6CreateInstance (\r
-  IN  MTFTP6_SERVICE         *Service,\r
-  OUT MTFTP6_INSTANCE        **Instance\r
+  IN  MTFTP6_SERVICE   *Service,\r
+  OUT MTFTP6_INSTANCE  **Instance\r
   )\r
 {\r
-  MTFTP6_INSTANCE            *Mtftp6Ins;\r
+  MTFTP6_INSTANCE  *Mtftp6Ins;\r
 \r
   *Instance = NULL;\r
   Mtftp6Ins = AllocateZeroPool (sizeof (MTFTP6_INSTANCE));\r
@@ -229,7 +224,6 @@ Mtftp6CreateInstance (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r
 \r
@@ -243,8 +237,8 @@ Mtftp6CreateInstance (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp6DestroyChildEntryInHandleBuffer (\r
-  IN LIST_ENTRY         *Entry,\r
-  IN VOID               *Context\r
+  IN LIST_ENTRY  *Entry,\r
+  IN VOID        *Context\r
   )\r
 {\r
   MTFTP6_INSTANCE               *Instance;\r
@@ -252,14 +246,14 @@ Mtftp6DestroyChildEntryInHandleBuffer (
   UINTN                         NumberOfChildren;\r
   EFI_HANDLE                    *ChildHandleBuffer;\r
 \r
-  if (Entry == NULL || Context == NULL) {\r
+  if ((Entry == NULL) || (Context == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Instance = NET_LIST_USER_STRUCT_S (Entry, MTFTP6_INSTANCE, Link, MTFTP6_INSTANCE_SIGNATURE);\r
-  ServiceBinding    = ((MTFTP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ServiceBinding;\r
-  NumberOfChildren  = ((MTFTP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->NumberOfChildren;\r
-  ChildHandleBuffer = ((MTFTP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ChildHandleBuffer;\r
+  Instance          = NET_LIST_USER_STRUCT_S (Entry, MTFTP6_INSTANCE, Link, MTFTP6_INSTANCE_SIGNATURE);\r
+  ServiceBinding    = ((MTFTP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ServiceBinding;\r
+  NumberOfChildren  = ((MTFTP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->NumberOfChildren;\r
+  ChildHandleBuffer = ((MTFTP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ChildHandleBuffer;\r
 \r
   if (!NetIsInHandleBuffer (Instance->Handle, NumberOfChildren, ChildHandleBuffer)) {\r
     return EFI_SUCCESS;\r
@@ -268,7 +262,6 @@ Mtftp6DestroyChildEntryInHandleBuffer (
   return ServiceBinding->DestroyChild (ServiceBinding, Instance->Handle);\r
 }\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
@@ -286,8 +279,8 @@ Mtftp6DestroyChildEntryInHandleBuffer (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp6DriverEntryPoint (\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
   return EfiLibInstallDriverBindingComponentName2 (\r
@@ -300,7 +293,6 @@ Mtftp6DriverEntryPoint (
            );\r
 }\r
 \r
-\r
 /**\r
   Test to see if this driver supports Controller. This service\r
   is called by the EFI boot service ConnectController(). In\r
@@ -321,9 +313,9 @@ Mtftp6DriverEntryPoint (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp6DriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
   return gBS->OpenProtocol (\r
@@ -336,7 +328,6 @@ Mtftp6DriverBindingSupported (
                 );\r
 }\r
 \r
-\r
 /**\r
   Start this driver on Controller. This service is called by the\r
   EFI boot service ConnectController(). In order to make\r
@@ -363,8 +354,8 @@ Mtftp6DriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  MTFTP6_SERVICE            *Service;\r
-  EFI_STATUS                Status;\r
+  MTFTP6_SERVICE  *Service;\r
+  EFI_STATUS      Status;\r
 \r
   //\r
   // Directly return if driver is already running on this Nic handle.\r
@@ -432,7 +423,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Stop this driver on Controller. This service is called by the\r
   EFI boot service DisconnectController(). In order to\r
@@ -455,18 +445,18 @@ ON_ERROR:
 EFI_STATUS\r
 EFIAPI\r
 Mtftp6DriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN  EFI_HANDLE                  Controller,\r
-  IN  UINTN                       NumberOfChildren,\r
-  IN  EFI_HANDLE                  *ChildHandleBuffer\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   Controller,\r
+  IN  UINTN                        NumberOfChildren,\r
+  IN  EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_SERVICE_BINDING_PROTOCOL               *ServiceBinding;\r
-  MTFTP6_SERVICE                             *Service;\r
-  EFI_HANDLE                                 NicHandle;\r
-  EFI_STATUS                                 Status;\r
-  LIST_ENTRY                                 *List;\r
-  MTFTP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT Context;\r
+  EFI_SERVICE_BINDING_PROTOCOL                *ServiceBinding;\r
+  MTFTP6_SERVICE                              *Service;\r
+  EFI_HANDLE                                  NicHandle;\r
+  EFI_STATUS                                  Status;\r
+  LIST_ENTRY                                  *List;\r
+  MTFTP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT  Context;\r
 \r
   //\r
   // Locate the Nic handle to retrieve the Mtftp6 private data.\r
@@ -480,7 +470,7 @@ Mtftp6DriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   NicHandle,\r
                   &gEfiMtftp6ServiceBindingProtocolGuid,\r
-                  (VOID **) &ServiceBinding,\r
+                  (VOID **)&ServiceBinding,\r
                   This->DriverBindingHandle,\r
                   NicHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -496,19 +486,19 @@ Mtftp6DriverBindingStop (
     //\r
     // Destroy the Mtftp6 child instance in ChildHandleBuffer.\r
     //\r
-    List = &Service->Children;\r
+    List                      = &Service->Children;\r
     Context.ServiceBinding    = ServiceBinding;\r
     Context.NumberOfChildren  = NumberOfChildren;\r
     Context.ChildHandleBuffer = ChildHandleBuffer;\r
-    Status = NetDestroyLinkList (\r
-               List,\r
-               Mtftp6DestroyChildEntryInHandleBuffer,\r
-               &Context,\r
-               NULL\r
-               );\r
+    Status                    = NetDestroyLinkList (\r
+                                  List,\r
+                                  Mtftp6DestroyChildEntryInHandleBuffer,\r
+                                  &Context,\r
+                                  NULL\r
+                                  );\r
   }\r
 \r
-  if (NumberOfChildren == 0 && IsListEmpty (&Service->Children)) {\r
+  if ((NumberOfChildren == 0) && IsListEmpty (&Service->Children)) {\r
     //\r
     // Destroy the Mtftp6 service if there is no Mtftp6 child instance left.\r
     //\r
@@ -525,7 +515,6 @@ Mtftp6DriverBindingStop (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Creates a child handle and installs a protocol.\r
 \r
@@ -550,13 +539,13 @@ Mtftp6ServiceBindingCreateChild (
   IN OUT EFI_HANDLE                    *ChildHandle\r
   )\r
 {\r
-  MTFTP6_SERVICE            *Service;\r
-  MTFTP6_INSTANCE           *Instance;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
-  VOID                      *Udp6;\r
+  MTFTP6_SERVICE   *Service;\r
+  MTFTP6_INSTANCE  *Instance;\r
+  EFI_STATUS       Status;\r
+  EFI_TPL          OldTpl;\r
+  VOID             *Udp6;\r
 \r
-  if (This == NULL || ChildHandle == NULL) {\r
+  if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -592,7 +581,7 @@ Mtftp6ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   Service->DummyUdpIo->UdpHandle,\r
                   &gEfiUdp6ProtocolGuid,\r
-                  (VOID **) &Udp6,\r
+                  (VOID **)&Udp6,\r
                   gMtftp6DriverBinding.DriverBindingHandle,\r
                   Instance->Handle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -626,7 +615,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Destroys a child handle with a protocol installed on it.\r
 \r
@@ -646,17 +634,17 @@ ON_ERROR:
 EFI_STATUS\r
 EFIAPI\r
 Mtftp6ServiceBindingDestroyChild (\r
-  IN EFI_SERVICE_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                   ChildHandle\r
+  IN EFI_SERVICE_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                    ChildHandle\r
   )\r
 {\r
-  MTFTP6_SERVICE            *Service;\r
-  MTFTP6_INSTANCE           *Instance;\r
-  EFI_MTFTP6_PROTOCOL       *Mtftp6;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
+  MTFTP6_SERVICE       *Service;\r
+  MTFTP6_INSTANCE      *Instance;\r
+  EFI_MTFTP6_PROTOCOL  *Mtftp6;\r
+  EFI_STATUS           Status;\r
+  EFI_TPL              OldTpl;\r
 \r
-  if (This == NULL || ChildHandle == NULL) {\r
+  if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -666,7 +654,7 @@ Mtftp6ServiceBindingDestroyChild (
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiMtftp6ProtocolGuid,\r
-                  (VOID **) &Mtftp6,\r
+                  (VOID **)&Mtftp6,\r
                   gMtftp6DriverBinding.DriverBindingHandle,\r
                   ChildHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -703,11 +691,11 @@ Mtftp6ServiceBindingDestroyChild (
 \r
   if (Instance->UdpIo != NULL) {\r
     gBS->CloseProtocol (\r
-         Instance->UdpIo->UdpHandle,\r
-         &gEfiUdp6ProtocolGuid,\r
-         gMtftp6DriverBinding.DriverBindingHandle,\r
-         Instance->Handle\r
-         );\r
+           Instance->UdpIo->UdpHandle,\r
+           &gEfiUdp6ProtocolGuid,\r
+           gMtftp6DriverBinding.DriverBindingHandle,\r
+           Instance->Handle\r
+           );\r
   }\r
 \r
   if (Instance->McastUdpIo != NULL) {\r
@@ -739,7 +727,7 @@ Mtftp6ServiceBindingDestroyChild (
   // Remove the Mtftp6 instance from the children list of Mtftp6 service.\r
   //\r
   RemoveEntryList (&Instance->Link);\r
-  Service->ChildrenNum --;\r
+  Service->ChildrenNum--;\r
 \r
   gBS->RestoreTPL (OldTpl);\r
 \r
index 86e8c6a771518fe773ded3cd614c54c3863377d2..fba48eecc5bff4ee171735240fd6cb22a85c60fb 100644 (file)
@@ -13,9 +13,9 @@
 \r
 #include <Protocol/ServiceBinding.h>\r
 \r
-extern EFI_COMPONENT_NAME_PROTOCOL  gMtftp6ComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL gMtftp6ComponentName2;\r
-extern EFI_UNICODE_STRING_TABLE     *gMtftp6ControllerNameTable;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gMtftp6ComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gMtftp6ComponentName2;\r
+extern EFI_UNICODE_STRING_TABLE      *gMtftp6ControllerNameTable;\r
 \r
 /**\r
   Test to see if this driver supports Controller. This service\r
@@ -90,10 +90,10 @@ Mtftp6DriverBindingStart (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp6DriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN  EFI_HANDLE                  Controller,\r
-  IN  UINTN                       NumberOfChildren,\r
-  IN  EFI_HANDLE                  *ChildHandleBuffer\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   Controller,\r
+  IN  UINTN                        NumberOfChildren,\r
+  IN  EFI_HANDLE                   *ChildHandleBuffer\r
   );\r
 \r
 /**\r
@@ -116,8 +116,8 @@ Mtftp6DriverBindingStop (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp6ServiceBindingCreateChild (\r
-  IN     EFI_SERVICE_BINDING_PROTOCOL *This,\r
-  IN OUT EFI_HANDLE                   *ChildHandle\r
+  IN     EFI_SERVICE_BINDING_PROTOCOL  *This,\r
+  IN OUT EFI_HANDLE                    *ChildHandle\r
   );\r
 \r
 /**\r
@@ -139,8 +139,8 @@ Mtftp6ServiceBindingCreateChild (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp6ServiceBindingDestroyChild (\r
-  IN EFI_SERVICE_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                   ChildHandle\r
+  IN EFI_SERVICE_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                    ChildHandle\r
   );\r
 \r
 #endif\r
index 067b1f53ba0612daf530c3db0383c3a6818c29de..387ae3d8af3e810dece52275195d039e9771e277 100644 (file)
@@ -16,7 +16,7 @@
 \r
 #include "Mtftp6Impl.h"\r
 \r
-EFI_MTFTP6_PROTOCOL gMtftp6ProtocolTemplate = {\r
+EFI_MTFTP6_PROTOCOL  gMtftp6ProtocolTemplate = {\r
   EfiMtftp6GetModeData,\r
   EfiMtftp6Configure,\r
   EfiMtftp6GetInfo,\r
@@ -25,7 +25,7 @@ EFI_MTFTP6_PROTOCOL gMtftp6ProtocolTemplate = {
   EfiMtftp6WriteFile,\r
   EfiMtftp6ReadDirectory,\r
   EfiMtftp6Poll\r
-  };\r
+};\r
 \r
 /**\r
   Returns the current operating mode data for the MTFTP6 instance.\r
@@ -45,14 +45,14 @@ EFI_MTFTP6_PROTOCOL gMtftp6ProtocolTemplate = {
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp6GetModeData (\r
-  IN  EFI_MTFTP6_PROTOCOL    *This,\r
-  OUT EFI_MTFTP6_MODE_DATA   *ModeData\r
+  IN  EFI_MTFTP6_PROTOCOL   *This,\r
+  OUT EFI_MTFTP6_MODE_DATA  *ModeData\r
   )\r
 {\r
   MTFTP6_INSTANCE  *Instance;\r
   EFI_TPL          OldTpl;\r
 \r
-  if (This == NULL || ModeData == NULL) {\r
+  if ((This == NULL) || (ModeData == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -79,14 +79,13 @@ EfiMtftp6GetModeData (
   // Set the current support options in mode data.\r
   //\r
   ModeData->SupportedOptionCount = MTFTP6_SUPPORTED_OPTIONS_NUM;\r
-  ModeData->SupportedOptions     = (UINT8 **) mMtftp6SupportedOptions;\r
+  ModeData->SupportedOptions     = (UINT8 **)mMtftp6SupportedOptions;\r
 \r
   gBS->RestoreTPL (OldTpl);\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Initializes, changes, or resets the default operational setting for\r
   this EFI MTFTPv6 Protocol driver instance.\r
@@ -128,22 +127,22 @@ EfiMtftp6GetModeData (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp6Configure (\r
-  IN EFI_MTFTP6_PROTOCOL    *This,\r
-  IN EFI_MTFTP6_CONFIG_DATA *MtftpConfigData     OPTIONAL\r
+  IN EFI_MTFTP6_PROTOCOL     *This,\r
+  IN EFI_MTFTP6_CONFIG_DATA  *MtftpConfigData     OPTIONAL\r
   )\r
 {\r
-  MTFTP6_SERVICE            *Service;\r
-  MTFTP6_INSTANCE           *Instance;\r
-  EFI_UDP6_PROTOCOL         *Udp6;\r
-  EFI_UDP6_CONFIG_DATA      Udp6Cfg;\r
-  EFI_STATUS                Status;\r
-  EFI_TPL                   OldTpl;\r
+  MTFTP6_SERVICE        *Service;\r
+  MTFTP6_INSTANCE       *Instance;\r
+  EFI_UDP6_PROTOCOL     *Udp6;\r
+  EFI_UDP6_CONFIG_DATA  Udp6Cfg;\r
+  EFI_STATUS            Status;\r
+  EFI_TPL               OldTpl;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (MtftpConfigData != NULL && !NetIp6IsValidUnicast (&MtftpConfigData->ServerIp)) {\r
+  if ((MtftpConfigData != NULL) && !NetIp6IsValidUnicast (&MtftpConfigData->ServerIp)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -167,6 +166,7 @@ EfiMtftp6Configure (
       Status = EFI_ACCESS_DENIED;\r
       goto ON_EXIT;\r
     }\r
+\r
     //\r
     // Allocate the configure buffer of the instance and store the user's data.\r
     //\r
@@ -195,7 +195,7 @@ EfiMtftp6Configure (
         Status = gBS->OpenProtocol (\r
                         Instance->UdpIo->UdpHandle,\r
                         &gEfiUdp6ProtocolGuid,\r
-                        (VOID **) &Udp6,\r
+                        (VOID **)&Udp6,\r
                         Service->Image,\r
                         Instance->Handle,\r
                         EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -229,7 +229,7 @@ EfiMtftp6Configure (
     CopyMem (\r
       &Udp6Cfg.StationAddress,\r
       &Instance->Config->StationIp,\r
-      sizeof(EFI_IPv6_ADDRESS)\r
+      sizeof (EFI_IPv6_ADDRESS)\r
       );\r
 \r
     CopyMem (\r
@@ -252,16 +252,17 @@ ON_EXIT:
       FreePool (Instance->Config);\r
       Instance->Config = NULL;\r
     }\r
+\r
     if (Instance->UdpIo != NULL) {\r
       UdpIoFreeIo (Instance->UdpIo);\r
       Instance->UdpIo = NULL;\r
     }\r
   }\r
+\r
   gBS->RestoreTPL (OldTpl);\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Get the information of the download from the server.\r
 \r
@@ -319,26 +320,27 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp6GetInfo (\r
-  IN  EFI_MTFTP6_PROTOCOL      *This,\r
-  IN  EFI_MTFTP6_OVERRIDE_DATA *OverrideData         OPTIONAL,\r
-  IN  UINT8                    *Filename,\r
-  IN  UINT8                    *ModeStr              OPTIONAL,\r
-  IN  UINT8                    OptionCount,\r
-  IN  EFI_MTFTP6_OPTION        *OptionList           OPTIONAL,\r
-  OUT UINT32                   *PacketLength,\r
-  OUT EFI_MTFTP6_PACKET        **Packet              OPTIONAL\r
+  IN  EFI_MTFTP6_PROTOCOL       *This,\r
+  IN  EFI_MTFTP6_OVERRIDE_DATA  *OverrideData         OPTIONAL,\r
+  IN  UINT8                     *Filename,\r
+  IN  UINT8                     *ModeStr              OPTIONAL,\r
+  IN  UINT8                     OptionCount,\r
+  IN  EFI_MTFTP6_OPTION         *OptionList           OPTIONAL,\r
+  OUT UINT32                    *PacketLength,\r
+  OUT EFI_MTFTP6_PACKET         **Packet              OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_MTFTP6_TOKEN          Token;\r
-  MTFTP6_GETINFO_CONTEXT    Context;\r
-\r
-  if (This == NULL ||\r
-      Filename == NULL ||\r
-      PacketLength == NULL ||\r
-      (OptionCount != 0 && OptionList == NULL) ||\r
-      (OverrideData != NULL && !NetIp6IsValidUnicast (&OverrideData->ServerIp))\r
-      ) {\r
+  EFI_STATUS              Status;\r
+  EFI_MTFTP6_TOKEN        Token;\r
+  MTFTP6_GETINFO_CONTEXT  Context;\r
+\r
+  if ((This == NULL) ||\r
+      (Filename == NULL) ||\r
+      (PacketLength == NULL) ||\r
+      ((OptionCount != 0) && (OptionList == NULL)) ||\r
+      ((OverrideData != NULL) && !NetIp6IsValidUnicast (&OverrideData->ServerIp))\r
+      )\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -346,11 +348,11 @@ EfiMtftp6GetInfo (
     *Packet = NULL;\r
   }\r
 \r
-  *PacketLength         = 0;\r
+  *PacketLength = 0;\r
 \r
-  Context.Packet        = Packet;\r
-  Context.PacketLen     = PacketLength;\r
-  Context.Status        = EFI_SUCCESS;\r
+  Context.Packet    = Packet;\r
+  Context.PacketLen = PacketLength;\r
+  Context.Status    = EFI_SUCCESS;\r
 \r
   //\r
   // Fill fields of the Token for GetInfo operation.\r
@@ -384,7 +386,6 @@ EfiMtftp6GetInfo (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Parse the options in an MTFTPv6 OACK packet.\r
 \r
@@ -418,11 +419,11 @@ EfiMtftp6GetInfo (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp6ParseOptions (\r
-  IN     EFI_MTFTP6_PROTOCOL    *This,\r
-  IN     UINT32                 PacketLen,\r
-  IN     EFI_MTFTP6_PACKET      *Packet,\r
-  OUT    UINT32                 *OptionCount,\r
-  OUT    EFI_MTFTP6_OPTION      **OptionList          OPTIONAL\r
+  IN     EFI_MTFTP6_PROTOCOL  *This,\r
+  IN     UINT32               PacketLen,\r
+  IN     EFI_MTFTP6_PACKET    *Packet,\r
+  OUT    UINT32               *OptionCount,\r
+  OUT    EFI_MTFTP6_OPTION    **OptionList          OPTIONAL\r
   )\r
 {\r
   if (This == NULL) {\r
@@ -432,7 +433,6 @@ EfiMtftp6ParseOptions (
   return Mtftp6ParseStart (Packet, PacketLen, OptionCount, OptionList);\r
 }\r
 \r
-\r
 /**\r
   Download a file from an MTFTPv6 server.\r
 \r
@@ -477,14 +477,13 @@ EfiMtftp6ParseOptions (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp6ReadFile (\r
-  IN EFI_MTFTP6_PROTOCOL    *This,\r
-  IN EFI_MTFTP6_TOKEN       *Token\r
+  IN EFI_MTFTP6_PROTOCOL  *This,\r
+  IN EFI_MTFTP6_TOKEN     *Token\r
   )\r
 {\r
   return Mtftp6OperationStart (This, Token, EFI_MTFTP6_OPCODE_RRQ);\r
 }\r
 \r
-\r
 /**\r
   Send a file to an MTFTPv6 server.\r
 \r
@@ -530,14 +529,13 @@ EfiMtftp6ReadFile (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp6WriteFile (\r
-  IN EFI_MTFTP6_PROTOCOL    *This,\r
-  IN EFI_MTFTP6_TOKEN       *Token\r
+  IN EFI_MTFTP6_PROTOCOL  *This,\r
+  IN EFI_MTFTP6_TOKEN     *Token\r
   )\r
 {\r
   return Mtftp6OperationStart (This, Token, EFI_MTFTP6_OPCODE_WRQ);\r
 }\r
 \r
-\r
 /**\r
   Download a data file directory from an MTFTPv6 server.\r
 \r
@@ -581,14 +579,13 @@ EfiMtftp6WriteFile (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp6ReadDirectory (\r
-  IN EFI_MTFTP6_PROTOCOL        *This,\r
-  IN EFI_MTFTP6_TOKEN           *Token\r
+  IN EFI_MTFTP6_PROTOCOL  *This,\r
+  IN EFI_MTFTP6_TOKEN     *Token\r
   )\r
 {\r
   return Mtftp6OperationStart (This, Token, EFI_MTFTP6_OPCODE_DIR);\r
 }\r
 \r
-\r
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r
 \r
@@ -616,11 +613,11 @@ EfiMtftp6ReadDirectory (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp6Poll (\r
-  IN EFI_MTFTP6_PROTOCOL    *This\r
+  IN EFI_MTFTP6_PROTOCOL  *This\r
   )\r
 {\r
-  MTFTP6_INSTANCE           *Instance;\r
-  EFI_UDP6_PROTOCOL         *Udp6;\r
+  MTFTP6_INSTANCE    *Instance;\r
+  EFI_UDP6_PROTOCOL  *Udp6;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
index 321fbc1d52029c13d3a10a58170a34d76f069a77..792160ea37e853327b42539645d18c6c3366bcc1 100644 (file)
 #include <Library/NetLib.h>\r
 #include <Library/PrintLib.h>\r
 \r
-typedef struct _MTFTP6_SERVICE  MTFTP6_SERVICE;\r
-typedef struct _MTFTP6_INSTANCE MTFTP6_INSTANCE;\r
+typedef struct _MTFTP6_SERVICE   MTFTP6_SERVICE;\r
+typedef struct _MTFTP6_INSTANCE  MTFTP6_INSTANCE;\r
 \r
 #include "Mtftp6Driver.h"\r
 #include "Mtftp6Option.h"\r
 #include "Mtftp6Support.h"\r
 \r
-#define MTFTP6_SERVICE_SIGNATURE       SIGNATURE_32 ('M', 'F', '6', 'S')\r
-#define MTFTP6_INSTANCE_SIGNATURE      SIGNATURE_32 ('M', 'F', '6', 'I')\r
+#define MTFTP6_SERVICE_SIGNATURE   SIGNATURE_32 ('M', 'F', '6', 'S')\r
+#define MTFTP6_INSTANCE_SIGNATURE  SIGNATURE_32 ('M', 'F', '6', 'I')\r
 \r
-#define MTFTP6_DEFAULT_SERVER_CMD_PORT 69\r
-#define MTFTP6_DEFAULT_TIMEOUT         3\r
-#define MTFTP6_GET_MAPPING_TIMEOUT     3\r
-#define MTFTP6_DEFAULT_MAX_RETRY       5\r
-#define MTFTP6_DEFAULT_BLK_SIZE        512\r
-#define MTFTP6_DEFAULT_WINDOWSIZE      1\r
-#define MTFTP6_TICK_PER_SECOND         10000000U\r
+#define MTFTP6_DEFAULT_SERVER_CMD_PORT  69\r
+#define MTFTP6_DEFAULT_TIMEOUT          3\r
+#define MTFTP6_GET_MAPPING_TIMEOUT      3\r
+#define MTFTP6_DEFAULT_MAX_RETRY        5\r
+#define MTFTP6_DEFAULT_BLK_SIZE         512\r
+#define MTFTP6_DEFAULT_WINDOWSIZE       1\r
+#define MTFTP6_TICK_PER_SECOND          10000000U\r
 \r
-#define MTFTP6_SERVICE_FROM_THIS(a)    CR (a, MTFTP6_SERVICE, ServiceBinding, MTFTP6_SERVICE_SIGNATURE)\r
-#define MTFTP6_INSTANCE_FROM_THIS(a)   CR (a, MTFTP6_INSTANCE, Mtftp6, MTFTP6_INSTANCE_SIGNATURE)\r
+#define MTFTP6_SERVICE_FROM_THIS(a)   CR (a, MTFTP6_SERVICE, ServiceBinding, MTFTP6_SERVICE_SIGNATURE)\r
+#define MTFTP6_INSTANCE_FROM_THIS(a)  CR (a, MTFTP6_INSTANCE, Mtftp6, MTFTP6_INSTANCE_SIGNATURE)\r
 \r
-extern EFI_MTFTP6_PROTOCOL             gMtftp6ProtocolTemplate;\r
+extern EFI_MTFTP6_PROTOCOL  gMtftp6ProtocolTemplate;\r
 \r
-typedef struct _MTFTP6_GETINFO_CONTEXT{\r
-  EFI_MTFTP6_PACKET             **Packet;\r
-  UINT32                        *PacketLen;\r
-  EFI_STATUS                    Status;\r
+typedef struct _MTFTP6_GETINFO_CONTEXT {\r
+  EFI_MTFTP6_PACKET    **Packet;\r
+  UINT32               *PacketLen;\r
+  EFI_STATUS           Status;\r
 } MTFTP6_GETINFO_CONTEXT;\r
 \r
 //\r
 // Control block for MTFTP6 instance, it's per configuration data.\r
 //\r
 struct _MTFTP6_INSTANCE {\r
-  UINT32                        Signature;\r
-  EFI_HANDLE                    Handle;\r
-  LIST_ENTRY                    Link;\r
-  EFI_MTFTP6_PROTOCOL           Mtftp6;\r
-  MTFTP6_SERVICE                *Service;\r
-  EFI_MTFTP6_CONFIG_DATA        *Config;\r
+  UINT32                    Signature;\r
+  EFI_HANDLE                Handle;\r
+  LIST_ENTRY                Link;\r
+  EFI_MTFTP6_PROTOCOL       Mtftp6;\r
+  MTFTP6_SERVICE            *Service;\r
+  EFI_MTFTP6_CONFIG_DATA    *Config;\r
 \r
-  EFI_MTFTP6_TOKEN              *Token;\r
-  MTFTP6_EXT_OPTION_INFO        ExtInfo;\r
+  EFI_MTFTP6_TOKEN          *Token;\r
+  MTFTP6_EXT_OPTION_INFO    ExtInfo;\r
 \r
-  UINT16                        BlkSize;\r
-  UINT16                        LastBlk;\r
-  LIST_ENTRY                    BlkList;\r
+  UINT16                    BlkSize;\r
+  UINT16                    LastBlk;\r
+  LIST_ENTRY                BlkList;\r
 \r
-  UINT16                        Operation;\r
+  UINT16                    Operation;\r
 \r
-  UINT16                        WindowSize;\r
+  UINT16                    WindowSize;\r
 \r
   //\r
   // Record the total received and saved block number.\r
   //\r
-  UINT64                        TotalBlock;\r
+  UINT64                    TotalBlock;\r
 \r
   //\r
   // Record the acked block number.\r
   //\r
-  UINT64                        AckedBlock;\r
-\r
-  EFI_IPv6_ADDRESS              ServerIp;\r
-  UINT16                        ServerCmdPort;\r
-  UINT16                        ServerDataPort;\r
-  UDP_IO                        *UdpIo;\r
-\r
-  EFI_IPv6_ADDRESS              McastIp;\r
-  UINT16                        McastPort;\r
-  UDP_IO                        *McastUdpIo;\r
-\r
-  NET_BUF                       *LastPacket;\r
-  UINT32                        CurRetry;\r
-  UINT32                        MaxRetry;\r
-  UINT32                        PacketToLive;\r
-  UINT32                        Timeout;\r
-\r
-  EFI_TPL                       OldTpl;\r
-  BOOLEAN                       IsTransmitted;\r
-  BOOLEAN                       IsMaster;\r
-  BOOLEAN                       InDestroy;\r
+  UINT64                    AckedBlock;\r
+\r
+  EFI_IPv6_ADDRESS          ServerIp;\r
+  UINT16                    ServerCmdPort;\r
+  UINT16                    ServerDataPort;\r
+  UDP_IO                    *UdpIo;\r
+\r
+  EFI_IPv6_ADDRESS          McastIp;\r
+  UINT16                    McastPort;\r
+  UDP_IO                    *McastUdpIo;\r
+\r
+  NET_BUF                   *LastPacket;\r
+  UINT32                    CurRetry;\r
+  UINT32                    MaxRetry;\r
+  UINT32                    PacketToLive;\r
+  UINT32                    Timeout;\r
+\r
+  EFI_TPL                   OldTpl;\r
+  BOOLEAN                   IsTransmitted;\r
+  BOOLEAN                   IsMaster;\r
+  BOOLEAN                   InDestroy;\r
 };\r
 \r
 //\r
 // Control block for MTFTP6 service, it's per Nic handle.\r
 //\r
 struct _MTFTP6_SERVICE {\r
-  UINT32                        Signature;\r
-  EFI_SERVICE_BINDING_PROTOCOL  ServiceBinding;\r
-  EFI_HANDLE                    Controller;\r
-  EFI_HANDLE                    Image;\r
+  UINT32                          Signature;\r
+  EFI_SERVICE_BINDING_PROTOCOL    ServiceBinding;\r
+  EFI_HANDLE                      Controller;\r
+  EFI_HANDLE                      Image;\r
 \r
-  UINT16                        ChildrenNum;\r
-  LIST_ENTRY                    Children;\r
+  UINT16                          ChildrenNum;\r
+  LIST_ENTRY                      Children;\r
   //\r
   // It is used to be as internal calculagraph for all instances.\r
   //\r
-  EFI_EVENT                     Timer;\r
+  EFI_EVENT                       Timer;\r
   //\r
   // It is used to maintain the parent-child relationship between\r
   // mtftp driver and udp driver.\r
   //\r
-  UDP_IO                        *DummyUdpIo;\r
+  UDP_IO                          *DummyUdpIo;\r
 };\r
 \r
 typedef struct {\r
-  EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
-  UINTN                         NumberOfChildren;\r
-  EFI_HANDLE                    *ChildHandleBuffer;\r
+  EFI_SERVICE_BINDING_PROTOCOL    *ServiceBinding;\r
+  UINTN                           NumberOfChildren;\r
+  EFI_HANDLE                      *ChildHandleBuffer;\r
 } MTFTP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT;\r
 \r
 /**\r
@@ -153,8 +153,8 @@ typedef struct {
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp6GetModeData (\r
-  IN  EFI_MTFTP6_PROTOCOL    *This,\r
-  OUT EFI_MTFTP6_MODE_DATA   *ModeData\r
+  IN  EFI_MTFTP6_PROTOCOL   *This,\r
+  OUT EFI_MTFTP6_MODE_DATA  *ModeData\r
   );\r
 \r
 /**\r
@@ -198,8 +198,8 @@ EfiMtftp6GetModeData (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp6Configure (\r
-  IN EFI_MTFTP6_PROTOCOL    *This,\r
-  IN EFI_MTFTP6_CONFIG_DATA *MtftpConfigData     OPTIONAL\r
+  IN EFI_MTFTP6_PROTOCOL     *This,\r
+  IN EFI_MTFTP6_CONFIG_DATA  *MtftpConfigData     OPTIONAL\r
   );\r
 \r
 /**\r
@@ -258,14 +258,14 @@ EfiMtftp6Configure (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp6GetInfo (\r
-  IN  EFI_MTFTP6_PROTOCOL      *This,\r
-  IN  EFI_MTFTP6_OVERRIDE_DATA *OverrideData         OPTIONAL,\r
-  IN  UINT8                    *Filename,\r
-  IN  UINT8                    *ModeStr              OPTIONAL,\r
-  IN  UINT8                    OptionCount,\r
-  IN  EFI_MTFTP6_OPTION        *OptionList           OPTIONAL,\r
-  OUT UINT32                   *PacketLength,\r
-  OUT EFI_MTFTP6_PACKET        **Packet              OPTIONAL\r
+  IN  EFI_MTFTP6_PROTOCOL       *This,\r
+  IN  EFI_MTFTP6_OVERRIDE_DATA  *OverrideData         OPTIONAL,\r
+  IN  UINT8                     *Filename,\r
+  IN  UINT8                     *ModeStr              OPTIONAL,\r
+  IN  UINT8                     OptionCount,\r
+  IN  EFI_MTFTP6_OPTION         *OptionList           OPTIONAL,\r
+  OUT UINT32                    *PacketLength,\r
+  OUT EFI_MTFTP6_PACKET         **Packet              OPTIONAL\r
   );\r
 \r
 /**\r
@@ -301,11 +301,11 @@ EfiMtftp6GetInfo (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp6ParseOptions (\r
-  IN     EFI_MTFTP6_PROTOCOL    *This,\r
-  IN     UINT32                 PacketLen,\r
-  IN     EFI_MTFTP6_PACKET      *Packet,\r
-  OUT    UINT32                 *OptionCount,\r
-  OUT    EFI_MTFTP6_OPTION      **OptionList          OPTIONAL\r
+  IN     EFI_MTFTP6_PROTOCOL  *This,\r
+  IN     UINT32               PacketLen,\r
+  IN     EFI_MTFTP6_PACKET    *Packet,\r
+  OUT    UINT32               *OptionCount,\r
+  OUT    EFI_MTFTP6_OPTION    **OptionList          OPTIONAL\r
   );\r
 \r
 /**\r
@@ -351,8 +351,8 @@ EfiMtftp6ParseOptions (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp6ReadFile (\r
-  IN EFI_MTFTP6_PROTOCOL    *This,\r
-  IN EFI_MTFTP6_TOKEN       *Token\r
+  IN EFI_MTFTP6_PROTOCOL  *This,\r
+  IN EFI_MTFTP6_TOKEN     *Token\r
   );\r
 \r
 /**\r
@@ -400,8 +400,8 @@ EfiMtftp6ReadFile (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp6WriteFile (\r
-  IN EFI_MTFTP6_PROTOCOL    *This,\r
-  IN EFI_MTFTP6_TOKEN       *Token\r
+  IN EFI_MTFTP6_PROTOCOL  *This,\r
+  IN EFI_MTFTP6_TOKEN     *Token\r
   );\r
 \r
 /**\r
@@ -447,8 +447,8 @@ EfiMtftp6WriteFile (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp6ReadDirectory (\r
-  IN EFI_MTFTP6_PROTOCOL        *This,\r
-  IN EFI_MTFTP6_TOKEN           *Token\r
+  IN EFI_MTFTP6_PROTOCOL  *This,\r
+  IN EFI_MTFTP6_TOKEN     *Token\r
   );\r
 \r
 /**\r
@@ -478,7 +478,7 @@ EfiMtftp6ReadDirectory (
 EFI_STATUS\r
 EFIAPI\r
 EfiMtftp6Poll (\r
-  IN EFI_MTFTP6_PROTOCOL    *This\r
+  IN EFI_MTFTP6_PROTOCOL  *This\r
   );\r
 \r
 #endif\r
index 16e622c65a7ef5944006513b2b359a108693eaa9..398514dd66591933c9e030b107946431fdb0e478 100644 (file)
@@ -9,7 +9,7 @@
 \r
 #include "Mtftp6Impl.h"\r
 \r
-CHAR8 *mMtftp6SupportedOptions[MTFTP6_SUPPORTED_OPTIONS_NUM] = {\r
+CHAR8  *mMtftp6SupportedOptions[MTFTP6_SUPPORTED_OPTIONS_NUM] = {\r
   "blksize",\r
   "windowsize",\r
   "timeout",\r
@@ -17,7 +17,6 @@ CHAR8 *mMtftp6SupportedOptions[MTFTP6_SUPPORTED_OPTIONS_NUM] = {
   "multicast"\r
 };\r
 \r
-\r
 /**\r
   Parse the NULL terminated ASCII string of multicast option.\r
 \r
@@ -32,25 +31,23 @@ CHAR8 *mMtftp6SupportedOptions[MTFTP6_SUPPORTED_OPTIONS_NUM] = {
 **/\r
 EFI_STATUS\r
 Mtftp6ParseMcastOption (\r
-  IN UINT8                  *Str,\r
-  IN MTFTP6_EXT_OPTION_INFO *ExtInfo\r
+  IN UINT8                   *Str,\r
+  IN MTFTP6_EXT_OPTION_INFO  *ExtInfo\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  UINT32                    Num;\r
-  CHAR8                     *Ip6Str;\r
-  CHAR8                     *TempStr;\r
+  EFI_STATUS  Status;\r
+  UINT32      Num;\r
+  CHAR8       *Ip6Str;\r
+  CHAR8       *TempStr;\r
 \r
   //\r
   // The multicast option is formatted like "addr,port,mc"\r
   // The server can also omit the ip and port, use ",,1"\r
   //\r
   if (*Str == ',') {\r
-\r
     ZeroMem (&ExtInfo->McastIp, sizeof (EFI_IPv6_ADDRESS));\r
   } else {\r
-\r
-    Ip6Str = (CHAR8 *) AllocateCopyPool (AsciiStrSize ((CHAR8 *) Str), Str);\r
+    Ip6Str = (CHAR8 *)AllocateCopyPool (AsciiStrSize ((CHAR8 *)Str), Str);\r
     if (Ip6Str == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
@@ -88,17 +85,15 @@ Mtftp6ParseMcastOption (
   // empty string. such as the port in ",,1"\r
   //\r
   if (*Str == ',') {\r
-\r
     ExtInfo->McastPort = 0;\r
   } else {\r
-\r
-    Num = (UINT32) AsciiStrDecimalToUintn ((CHAR8 *) Str);\r
+    Num = (UINT32)AsciiStrDecimalToUintn ((CHAR8 *)Str);\r
 \r
     if (Num > 65535) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
-    ExtInfo->McastPort = (UINT16) Num;\r
+    ExtInfo->McastPort = (UINT16)Num;\r
 \r
     while (NET_IS_DIGIT (*Str)) {\r
       Str++;\r
@@ -114,13 +109,13 @@ Mtftp6ParseMcastOption (
   //\r
   // Check the master/slave setting, 1 for master, 0 for slave.\r
   //\r
-  Num = (UINT32) AsciiStrDecimalToUintn ((CHAR8 *) Str);\r
+  Num = (UINT32)AsciiStrDecimalToUintn ((CHAR8 *)Str);\r
 \r
-  if (Num != 0 && Num != 1) {\r
+  if ((Num != 0) && (Num != 1)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  ExtInfo->IsMaster = (BOOLEAN) (Num == 1);\r
+  ExtInfo->IsMaster = (BOOLEAN)(Num == 1);\r
 \r
   while (NET_IS_DIGIT (*Str)) {\r
     Str++;\r
@@ -133,7 +128,6 @@ Mtftp6ParseMcastOption (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Parse the MTFTP6 extension options.\r
 \r
@@ -151,81 +145,74 @@ Mtftp6ParseMcastOption (
 **/\r
 EFI_STATUS\r
 Mtftp6ParseExtensionOption (\r
-  IN EFI_MTFTP6_OPTION        *Options,\r
-  IN UINT32                   Count,\r
-  IN BOOLEAN                  IsRequest,\r
-  IN UINT16                   Operation,\r
-  IN MTFTP6_EXT_OPTION_INFO   *ExtInfo\r
+  IN EFI_MTFTP6_OPTION       *Options,\r
+  IN UINT32                  Count,\r
+  IN BOOLEAN                 IsRequest,\r
+  IN UINT16                  Operation,\r
+  IN MTFTP6_EXT_OPTION_INFO  *ExtInfo\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_MTFTP6_OPTION           *Opt;\r
-  UINT32                      Index;\r
-  UINT32                      Value;\r
+  EFI_STATUS         Status;\r
+  EFI_MTFTP6_OPTION  *Opt;\r
+  UINT32             Index;\r
+  UINT32             Value;\r
 \r
   ExtInfo->BitMap = 0;\r
 \r
   for (Index = 0; Index < Count; Index++) {\r
-\r
     Opt = Options + Index;\r
 \r
-    if (Opt->OptionStr == NULL || Opt->ValueStr == NULL) {\r
+    if ((Opt->OptionStr == NULL) || (Opt->ValueStr == NULL)) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
-    if (AsciiStriCmp ((CHAR8 *) Opt->OptionStr, "blksize") == 0) {\r
+    if (AsciiStriCmp ((CHAR8 *)Opt->OptionStr, "blksize") == 0) {\r
       //\r
       // block size option, valid value is between [8, 65464]\r
       //\r
-      Value = (UINT32) AsciiStrDecimalToUintn ((CHAR8 *) Opt->ValueStr);\r
+      Value = (UINT32)AsciiStrDecimalToUintn ((CHAR8 *)Opt->ValueStr);\r
 \r
       if ((Value < 8) || (Value > 65464)) {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
 \r
-      ExtInfo->BlkSize = (UINT16) Value;\r
+      ExtInfo->BlkSize = (UINT16)Value;\r
       ExtInfo->BitMap |= MTFTP6_OPT_BLKSIZE_BIT;\r
-\r
-    } else if (AsciiStriCmp ((CHAR8 *) Opt->OptionStr, "timeout") == 0) {\r
+    } else if (AsciiStriCmp ((CHAR8 *)Opt->OptionStr, "timeout") == 0) {\r
       //\r
       // timeout option, valid value is between [1, 255]\r
       //\r
-      Value = (UINT32) AsciiStrDecimalToUintn ((CHAR8 *) Opt->ValueStr);\r
+      Value = (UINT32)AsciiStrDecimalToUintn ((CHAR8 *)Opt->ValueStr);\r
 \r
-      if (Value < 1 || Value > 255) {\r
+      if ((Value < 1) || (Value > 255)) {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
 \r
-      ExtInfo->Timeout = (UINT8) Value;\r
+      ExtInfo->Timeout = (UINT8)Value;\r
       ExtInfo->BitMap |= MTFTP6_OPT_TIMEOUT_BIT;\r
-\r
-    } else if (AsciiStriCmp ((CHAR8 *) Opt->OptionStr, "tsize") == 0) {\r
+    } else if (AsciiStriCmp ((CHAR8 *)Opt->OptionStr, "tsize") == 0) {\r
       //\r
       // tsize option, the biggest transfer supported is 4GB with block size option\r
       //\r
-      ExtInfo->Tsize   = (UINT32) AsciiStrDecimalToUintn ((CHAR8 *) Opt->ValueStr);\r
+      ExtInfo->Tsize   = (UINT32)AsciiStrDecimalToUintn ((CHAR8 *)Opt->ValueStr);\r
       ExtInfo->BitMap |= MTFTP6_OPT_TSIZE_BIT;\r
-\r
-    } else if (AsciiStriCmp ((CHAR8 *) Opt->OptionStr, "multicast") == 0) {\r
+    } else if (AsciiStriCmp ((CHAR8 *)Opt->OptionStr, "multicast") == 0) {\r
       //\r
       // Multicast option, if it is a request, the value must be a zero string,\r
       // otherwise, it must be like "addr,port,mc" string, mc indicates master.\r
       //\r
       if (!IsRequest) {\r
-\r
         Status = Mtftp6ParseMcastOption (Opt->ValueStr, ExtInfo);\r
 \r
         if (EFI_ERROR (Status)) {\r
           return Status;\r
         }\r
       } else if (*(Opt->ValueStr) != '\0') {\r
-\r
         return EFI_INVALID_PARAMETER;\r
       }\r
 \r
       ExtInfo->BitMap |= MTFTP6_OPT_MCAST_BIT;\r
-\r
-    } else if (AsciiStriCmp ((CHAR8 *) Opt->OptionStr, "windowsize") == 0) {\r
+    } else if (AsciiStriCmp ((CHAR8 *)Opt->OptionStr, "windowsize") == 0) {\r
       if (Operation == EFI_MTFTP6_OPCODE_WRQ) {\r
         //\r
         // Currently, windowsize is not supported in the write operation.\r
@@ -233,15 +220,14 @@ Mtftp6ParseExtensionOption (
         return EFI_UNSUPPORTED;\r
       }\r
 \r
-      Value = (UINT32) AsciiStrDecimalToUintn ((CHAR8 *) Opt->ValueStr);\r
+      Value = (UINT32)AsciiStrDecimalToUintn ((CHAR8 *)Opt->ValueStr);\r
 \r
       if ((Value < 1)) {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
 \r
-      ExtInfo->WindowSize = (UINT16) Value;\r
-      ExtInfo->BitMap |= MTFTP6_OPT_WINDOWSIZE_BIT;\r
-\r
+      ExtInfo->WindowSize = (UINT16)Value;\r
+      ExtInfo->BitMap    |= MTFTP6_OPT_WINDOWSIZE_BIT;\r
     } else if (IsRequest) {\r
       //\r
       // If it's a request, unsupported; else if it's a reply, ignore.\r
@@ -253,7 +239,6 @@ Mtftp6ParseExtensionOption (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Go through the packet to fill the options array with the start\r
   addresses of each MTFTP option name/value pair.\r
@@ -273,21 +258,21 @@ Mtftp6ParseExtensionOption (
 **/\r
 EFI_STATUS\r
 Mtftp6ParsePacketOption (\r
-  IN     EFI_MTFTP6_PACKET     *Packet,\r
-  IN     UINT32                PacketLen,\r
-  IN OUT UINT32                *Count,\r
-  IN     EFI_MTFTP6_OPTION     *Options          OPTIONAL\r
+  IN     EFI_MTFTP6_PACKET  *Packet,\r
+  IN     UINT32             PacketLen,\r
+  IN OUT UINT32             *Count,\r
+  IN     EFI_MTFTP6_OPTION  *Options          OPTIONAL\r
   )\r
 {\r
-  UINT8                        *Cur;\r
-  UINT8                        *Last;\r
-  UINT8                        Num;\r
-  UINT8                        *Name;\r
-  UINT8                        *Value;\r
+  UINT8  *Cur;\r
+  UINT8  *Last;\r
+  UINT8  Num;\r
+  UINT8  *Name;\r
+  UINT8  *Value;\r
 \r
-  Num   = 0;\r
-  Cur   = (UINT8 *) Packet + MTFTP6_OPCODE_LEN;\r
-  Last  = (UINT8 *) Packet + PacketLen - 1;\r
+  Num  = 0;\r
+  Cur  = (UINT8 *)Packet + MTFTP6_OPCODE_LEN;\r
+  Last = (UINT8 *)Packet + PacketLen - 1;\r
 \r
   //\r
   // process option name and value pairs.\r
@@ -312,9 +297,9 @@ Mtftp6ParsePacketOption (
 \r
     Num++;\r
 \r
-    if (Options != NULL && Num <= *Count) {\r
-      Options[Num - 1].OptionStr  = Name;\r
-      Options[Num - 1].ValueStr   = Value;\r
+    if ((Options != NULL) && (Num <= *Count)) {\r
+      Options[Num - 1].OptionStr = Name;\r
+      Options[Num - 1].ValueStr  = Value;\r
     }\r
 \r
     Cur++;\r
@@ -323,7 +308,7 @@ Mtftp6ParsePacketOption (
   //\r
   // Return buffer too small if the buffer passed-in isn't enough.\r
   //\r
-  if (*Count < Num || Options == NULL) {\r
+  if ((*Count < Num) || (Options == NULL)) {\r
     *Count = Num;\r
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
@@ -332,7 +317,6 @@ Mtftp6ParsePacketOption (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Go through the packet, generate option list array and fill it\r
   by the result of parse options.\r
@@ -354,15 +338,15 @@ Mtftp6ParsePacketOption (
 **/\r
 EFI_STATUS\r
 Mtftp6ParseStart (\r
-  IN     EFI_MTFTP6_PACKET      *Packet,\r
-  IN     UINT32                 PacketLen,\r
-  IN OUT UINT32                 *OptionCount,\r
-     OUT EFI_MTFTP6_OPTION      **OptionList          OPTIONAL\r
+  IN     EFI_MTFTP6_PACKET  *Packet,\r
+  IN     UINT32             PacketLen,\r
+  IN OUT UINT32             *OptionCount,\r
+  OUT EFI_MTFTP6_OPTION     **OptionList          OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
+  EFI_STATUS  Status;\r
 \r
-  if (PacketLen == 0 || Packet == NULL || OptionCount == NULL) {\r
+  if ((PacketLen == 0) || (Packet == NULL) || (OptionCount == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -379,7 +363,7 @@ Mtftp6ParseStart (
   //\r
   // The last byte must be zero to terminate the options.\r
   //\r
-  if (*((UINT8 *) Packet + PacketLen - 1) != 0) {\r
+  if (*((UINT8 *)Packet + PacketLen - 1) != 0) {\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
index ad12a7e4d0e265f323260688eea56b26083b2aff..fda9554dcd0a04cc28948a11d61fbdda5b733e24 100644 (file)
 //\r
 // The bit map definition for Mtftp6 extension options.\r
 //\r
-#define MTFTP6_OPT_BLKSIZE_BIT        0x01\r
-#define MTFTP6_OPT_TIMEOUT_BIT        0x02\r
-#define MTFTP6_OPT_TSIZE_BIT          0x04\r
-#define MTFTP6_OPT_MCAST_BIT          0x08\r
-#define MTFTP6_OPT_WINDOWSIZE_BIT     0X10\r
+#define MTFTP6_OPT_BLKSIZE_BIT     0x01\r
+#define MTFTP6_OPT_TIMEOUT_BIT     0x02\r
+#define MTFTP6_OPT_TSIZE_BIT       0x04\r
+#define MTFTP6_OPT_MCAST_BIT       0x08\r
+#define MTFTP6_OPT_WINDOWSIZE_BIT  0X10\r
 \r
-extern CHAR8 *mMtftp6SupportedOptions[MTFTP6_SUPPORTED_OPTIONS_NUM];\r
+extern CHAR8  *mMtftp6SupportedOptions[MTFTP6_SUPPORTED_OPTIONS_NUM];\r
 \r
 typedef struct {\r
-  UINT16                    BlkSize;\r
-  UINT16                    WindowSize;\r
-  UINT8                     Timeout;\r
-  UINT32                    Tsize;\r
-  EFI_IPv6_ADDRESS          McastIp;\r
-  UINT16                    McastPort;\r
-  BOOLEAN                   IsMaster;\r
-  UINT32                    BitMap;\r
+  UINT16              BlkSize;\r
+  UINT16              WindowSize;\r
+  UINT8               Timeout;\r
+  UINT32              Tsize;\r
+  EFI_IPv6_ADDRESS    McastIp;\r
+  UINT16              McastPort;\r
+  BOOLEAN             IsMaster;\r
+  UINT32              BitMap;\r
 } MTFTP6_EXT_OPTION_INFO;\r
 \r
 /**\r
@@ -60,11 +60,10 @@ typedef struct {
 **/\r
 EFI_STATUS\r
 Mtftp6ParseMcastOption (\r
-  IN UINT8                  *Str,\r
-  IN MTFTP6_EXT_OPTION_INFO *ExtInfo\r
+  IN UINT8                   *Str,\r
+  IN MTFTP6_EXT_OPTION_INFO  *ExtInfo\r
   );\r
 \r
-\r
 /**\r
   Parse the MTFTP6 extension options.\r
 \r
@@ -82,14 +81,13 @@ Mtftp6ParseMcastOption (
 **/\r
 EFI_STATUS\r
 Mtftp6ParseExtensionOption (\r
-  IN EFI_MTFTP6_OPTION        *Options,\r
-  IN UINT32                   Count,\r
-  IN BOOLEAN                  IsRequest,\r
-  IN UINT16                   Operation,\r
-  IN MTFTP6_EXT_OPTION_INFO   *ExtInfo\r
+  IN EFI_MTFTP6_OPTION       *Options,\r
+  IN UINT32                  Count,\r
+  IN BOOLEAN                 IsRequest,\r
+  IN UINT16                  Operation,\r
+  IN MTFTP6_EXT_OPTION_INFO  *ExtInfo\r
   );\r
 \r
-\r
 /**\r
   Go through the packet to fill the options array with the start\r
   addresses of each MTFTP option name/value pair.\r
@@ -109,13 +107,12 @@ Mtftp6ParseExtensionOption (
 **/\r
 EFI_STATUS\r
 Mtftp6ParsePacketOption (\r
-  IN     EFI_MTFTP6_PACKET     *Packet,\r
-  IN     UINT32                PacketLen,\r
-  IN OUT UINT32                *Count,\r
-  IN     EFI_MTFTP6_OPTION     *Options          OPTIONAL\r
+  IN     EFI_MTFTP6_PACKET  *Packet,\r
+  IN     UINT32             PacketLen,\r
+  IN OUT UINT32             *Count,\r
+  IN     EFI_MTFTP6_OPTION  *Options          OPTIONAL\r
   );\r
 \r
-\r
 /**\r
   Go through the packet, generate option list array and fill it\r
   by the result of parse options.\r
@@ -137,10 +134,10 @@ Mtftp6ParsePacketOption (
 **/\r
 EFI_STATUS\r
 Mtftp6ParseStart (\r
-  IN     EFI_MTFTP6_PACKET      *Packet,\r
-  IN     UINT32                 PacketLen,\r
-  IN OUT UINT32                 *OptionCount,\r
-     OUT EFI_MTFTP6_OPTION      **OptionList          OPTIONAL\r
+  IN     EFI_MTFTP6_PACKET  *Packet,\r
+  IN     UINT32             PacketLen,\r
+  IN OUT UINT32             *OptionCount,\r
+  OUT EFI_MTFTP6_OPTION     **OptionList          OPTIONAL\r
   );\r
 \r
 #endif\r
index 4935933f23125339a648e9b2d952efd43871d1f4..32327de69ec89b3a51b911109116a56c44dc88ef 100644 (file)
@@ -9,7 +9,6 @@
 \r
 #include "Mtftp6Impl.h"\r
 \r
-\r
 /**\r
   Build and send a ACK packet for download.\r
 \r
 **/\r
 EFI_STATUS\r
 Mtftp6RrqSendAck (\r
-  IN MTFTP6_INSTANCE        *Instance,\r
-  IN UINT16                 BlockNum\r
+  IN MTFTP6_INSTANCE  *Instance,\r
+  IN UINT16           BlockNum\r
   )\r
 {\r
-  EFI_MTFTP6_PACKET         *Ack;\r
-  NET_BUF                   *Packet;\r
-  EFI_STATUS                Status;\r
+  EFI_MTFTP6_PACKET  *Ack;\r
+  NET_BUF            *Packet;\r
+  EFI_STATUS         Status;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
@@ -42,20 +41,20 @@ Mtftp6RrqSendAck (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Ack = (EFI_MTFTP6_PACKET *) NetbufAllocSpace (\r
-                                Packet,\r
-                                sizeof (EFI_MTFTP6_ACK_HEADER),\r
-                                FALSE\r
-                                );\r
+  Ack = (EFI_MTFTP6_PACKET *)NetbufAllocSpace (\r
+                               Packet,\r
+                               sizeof (EFI_MTFTP6_ACK_HEADER),\r
+                               FALSE\r
+                               );\r
   ASSERT (Ack != NULL);\r
 \r
-  Ack->Ack.OpCode    = HTONS (EFI_MTFTP6_OPCODE_ACK);\r
-  Ack->Ack.Block[0]  = HTONS (BlockNum);\r
+  Ack->Ack.OpCode   = HTONS (EFI_MTFTP6_OPCODE_ACK);\r
+  Ack->Ack.Block[0] = HTONS (BlockNum);\r
 \r
   //\r
   // Reset current retry count of the instance.\r
   //\r
-  Instance->CurRetry = 0;\r
+  Instance->CurRetry   = 0;\r
   Instance->LastPacket = Packet;\r
 \r
   Status = Mtftp6TransmitPacket (Instance, Packet);\r
@@ -66,7 +65,6 @@ Mtftp6RrqSendAck (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Deliver the received data block to the user, which can be saved\r
   in the user provide buffer or through the CheckPacket callback.\r
@@ -85,19 +83,19 @@ Mtftp6RrqSendAck (
 **/\r
 EFI_STATUS\r
 Mtftp6RrqSaveBlock (\r
-  IN  MTFTP6_INSTANCE       *Instance,\r
-  IN  EFI_MTFTP6_PACKET     *Packet,\r
-  IN  UINT32                Len,\r
-  OUT NET_BUF               **UdpPacket\r
+  IN  MTFTP6_INSTANCE    *Instance,\r
+  IN  EFI_MTFTP6_PACKET  *Packet,\r
+  IN  UINT32             Len,\r
+  OUT NET_BUF            **UdpPacket\r
   )\r
 {\r
-  EFI_MTFTP6_TOKEN          *Token;\r
-  EFI_STATUS                Status;\r
-  UINT16                    Block;\r
-  UINT64                    Start;\r
-  UINT32                    DataLen;\r
-  UINT64                    BlockCounter;\r
-  BOOLEAN                   Completed;\r
+  EFI_MTFTP6_TOKEN  *Token;\r
+  EFI_STATUS        Status;\r
+  UINT16            Block;\r
+  UINT64            Start;\r
+  UINT32            DataLen;\r
+  UINT64            BlockCounter;\r
+  BOOLEAN           Completed;\r
 \r
   Completed = FALSE;\r
   Token     = Instance->Token;\r
@@ -108,7 +106,7 @@ Mtftp6RrqSaveBlock (
   // This is the last block, save the block num\r
   //\r
   if (DataLen < Instance->BlkSize) {\r
-    Completed = TRUE;\r
+    Completed         = TRUE;\r
     Instance->LastBlk = Block;\r
     Mtftp6SetLastBlockNum (&Instance->BlkList, Block);\r
   }\r
@@ -132,7 +130,7 @@ Mtftp6RrqSaveBlock (
     //\r
     // Callback to the check packet routine with the received packet.\r
     //\r
-    Status = Token->CheckPacket (&Instance->Mtftp6, Token, (UINT16) Len, Packet);\r
+    Status = Token->CheckPacket (&Instance->Mtftp6, Token, (UINT16)Len, Packet);\r
 \r
     if (EFI_ERROR (Status)) {\r
       //\r
@@ -147,7 +145,7 @@ Mtftp6RrqSaveBlock (
       Mtftp6SendError (\r
         Instance,\r
         EFI_MTFTP6_ERRORCODE_ILLEGAL_OPERATION,\r
-        (UINT8 *) "User aborted download"\r
+        (UINT8 *)"User aborted download"\r
         );\r
 \r
       return EFI_ABORTED;\r
@@ -155,10 +153,9 @@ Mtftp6RrqSaveBlock (
   }\r
 \r
   if (Token->Buffer != NULL) {\r
-\r
     Start = MultU64x32 (BlockCounter - 1, Instance->BlkSize);\r
     if (Start + DataLen <= Token->BufferSize) {\r
-      CopyMem ((UINT8 *) Token->Buffer + Start, Packet->Data.Data, DataLen);\r
+      CopyMem ((UINT8 *)Token->Buffer + Start, Packet->Data.Data, DataLen);\r
       //\r
       // Update the file size when received the last block\r
       //\r
@@ -185,7 +182,7 @@ Mtftp6RrqSaveBlock (
       Mtftp6SendError (\r
         Instance,\r
         EFI_MTFTP6_ERRORCODE_DISK_FULL,\r
-        (UINT8 *) "User provided memory block is too small"\r
+        (UINT8 *)"User provided memory block is too small"\r
         );\r
 \r
       return EFI_BUFFER_TOO_SMALL;\r
@@ -195,7 +192,6 @@ Mtftp6RrqSaveBlock (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Process the received data packets. It will save the block\r
   then send back an ACK if it is active.\r
@@ -214,16 +210,16 @@ Mtftp6RrqSaveBlock (
 **/\r
 EFI_STATUS\r
 Mtftp6RrqHandleData (\r
-  IN  MTFTP6_INSTANCE       *Instance,\r
-  IN  EFI_MTFTP6_PACKET     *Packet,\r
-  IN  UINT32                Len,\r
-  OUT NET_BUF               **UdpPacket,\r
-  OUT BOOLEAN               *IsCompleted\r
+  IN  MTFTP6_INSTANCE    *Instance,\r
+  IN  EFI_MTFTP6_PACKET  *Packet,\r
+  IN  UINT32             Len,\r
+  OUT NET_BUF            **UdpPacket,\r
+  OUT BOOLEAN            *IsCompleted\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  UINT16                    BlockNum;\r
-  INTN                      Expected;\r
+  EFI_STATUS  Status;\r
+  UINT16      BlockNum;\r
+  INTN        Expected;\r
 \r
   *IsCompleted = FALSE;\r
   Status       = EFI_SUCCESS;\r
@@ -248,7 +244,7 @@ Mtftp6RrqHandleData (
     //\r
     // If Expected is 0, (UINT16) (Expected - 1) is also the expected Ack number (65535).\r
     //\r
-    return Mtftp6RrqSendAck (Instance,  (UINT16) (Expected - 1));\r
+    return Mtftp6RrqSendAck (Instance, (UINT16)(Expected - 1));\r
   }\r
 \r
   Status = Mtftp6RrqSaveBlock (Instance, Packet, Len, UdpPacket);\r
@@ -260,7 +256,7 @@ Mtftp6RrqHandleData (
   //\r
   // Record the total received and saved block number.\r
   //\r
-  Instance->TotalBlock ++;\r
+  Instance->TotalBlock++;\r
 \r
   //\r
   // Reset the passive client's timer whenever it received a valid data packet.\r
@@ -277,7 +273,7 @@ Mtftp6RrqHandleData (
   //\r
   Expected = Mtftp6GetNextBlockNum (&Instance->BlkList);\r
 \r
-  if (Instance->IsMaster || Expected < 0) {\r
+  if (Instance->IsMaster || (Expected < 0)) {\r
     if (Expected < 0) {\r
       //\r
       // If we are passive client, then the just received Block maybe\r
@@ -287,10 +283,10 @@ Mtftp6RrqHandleData (
       //\r
       BlockNum     = Instance->LastBlk;\r
       *IsCompleted = TRUE;\r
-\r
     } else {\r
-      BlockNum     = (UINT16) (Expected - 1);\r
+      BlockNum = (UINT16)(Expected - 1);\r
     }\r
+\r
     //\r
     // Free the received packet before send new packet in ReceiveNotify,\r
     // since the udpio might need to be reconfigured.\r
@@ -298,7 +294,7 @@ Mtftp6RrqHandleData (
     NetbufFree (*UdpPacket);\r
     *UdpPacket = NULL;\r
 \r
-    if (Instance->WindowSize == (Instance->TotalBlock - Instance->AckedBlock) || Expected < 0) {\r
+    if ((Instance->WindowSize == (Instance->TotalBlock - Instance->AckedBlock)) || (Expected < 0)) {\r
       Status = Mtftp6RrqSendAck (Instance, BlockNum);\r
     }\r
   }\r
@@ -306,7 +302,6 @@ Mtftp6RrqHandleData (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Validate whether the options received in the server's OACK packet is valid.\r
   The options are valid only if:\r
@@ -325,9 +320,9 @@ Mtftp6RrqHandleData (
 **/\r
 BOOLEAN\r
 Mtftp6RrqOackValid (\r
-  IN MTFTP6_INSTANCE           *Instance,\r
-  IN MTFTP6_EXT_OPTION_INFO    *ReplyInfo,\r
-  IN MTFTP6_EXT_OPTION_INFO    *RequestInfo\r
+  IN MTFTP6_INSTANCE         *Instance,\r
+  IN MTFTP6_EXT_OPTION_INFO  *ReplyInfo,\r
+  IN MTFTP6_EXT_OPTION_INFO  *RequestInfo\r
   )\r
 {\r
   //\r
@@ -344,7 +339,8 @@ Mtftp6RrqOackValid (
   if ((((ReplyInfo->BitMap & MTFTP6_OPT_BLKSIZE_BIT) != 0) && (ReplyInfo->BlkSize > RequestInfo->BlkSize)) ||\r
       (((ReplyInfo->BitMap & MTFTP6_OPT_WINDOWSIZE_BIT) != 0) && (ReplyInfo->BlkSize > RequestInfo->BlkSize)) ||\r
       (((ReplyInfo->BitMap & MTFTP6_OPT_TIMEOUT_BIT) != 0) && (ReplyInfo->Timeout != RequestInfo->Timeout))\r
-     ) {\r
+      )\r
+  {\r
     return FALSE;\r
   }\r
 \r
@@ -354,12 +350,12 @@ Mtftp6RrqOackValid (
   // change the setting.\r
   //\r
   if (((ReplyInfo->BitMap & MTFTP6_OPT_MCAST_BIT) != 0) && !NetIp6IsUnspecifiedAddr (&Instance->McastIp)) {\r
-\r
-    if (!NetIp6IsUnspecifiedAddr (&ReplyInfo->McastIp) && CompareMem (\r
-                                                            &ReplyInfo->McastIp,\r
-                                                            &Instance->McastIp,\r
-                                                            sizeof (EFI_IPv6_ADDRESS)\r
-                                                            ) != 0) {\r
+    if (!NetIp6IsUnspecifiedAddr (&ReplyInfo->McastIp) && (CompareMem (\r
+                                                             &ReplyInfo->McastIp,\r
+                                                             &Instance->McastIp,\r
+                                                             sizeof (EFI_IPv6_ADDRESS)\r
+                                                             ) != 0))\r
+    {\r
       return FALSE;\r
     }\r
 \r
@@ -371,7 +367,6 @@ Mtftp6RrqOackValid (
   return TRUE;\r
 }\r
 \r
-\r
 /**\r
   Configure Udp6Io to receive a packet from a multicast address.\r
 \r
@@ -385,19 +380,19 @@ Mtftp6RrqOackValid (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp6RrqConfigMcastUdpIo (\r
-  IN UDP_IO                 *McastIo,\r
-  IN VOID                   *Context\r
+  IN UDP_IO  *McastIo,\r
+  IN VOID    *Context\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_UDP6_PROTOCOL         *Udp6;\r
-  EFI_UDP6_CONFIG_DATA      *Udp6Cfg;\r
-  EFI_IPv6_ADDRESS          Group;\r
-  MTFTP6_INSTANCE           *Instance;\r
+  EFI_STATUS            Status;\r
+  EFI_UDP6_PROTOCOL     *Udp6;\r
+  EFI_UDP6_CONFIG_DATA  *Udp6Cfg;\r
+  EFI_IPv6_ADDRESS      Group;\r
+  MTFTP6_INSTANCE       *Instance;\r
 \r
   Udp6     = McastIo->Protocol.Udp6;\r
   Udp6Cfg  = &(McastIo->Config.Udp6);\r
-  Instance = (MTFTP6_INSTANCE *) Context;\r
+  Instance = (MTFTP6_INSTANCE *)Context;\r
 \r
   //\r
   // Set the configure data for the mcast Udp6Io.\r
@@ -437,7 +432,6 @@ Mtftp6RrqConfigMcastUdpIo (
   return Udp6->Groups (Udp6, TRUE, &Group);\r
 }\r
 \r
-\r
 /**\r
   Process the OACK packet for Rrq.\r
 \r
@@ -455,22 +449,22 @@ Mtftp6RrqConfigMcastUdpIo (
 **/\r
 EFI_STATUS\r
 Mtftp6RrqHandleOack (\r
-  IN  MTFTP6_INSTANCE       *Instance,\r
-  IN  EFI_MTFTP6_PACKET     *Packet,\r
-  IN  UINT32                Len,\r
-  OUT NET_BUF               **UdpPacket,\r
-  OUT BOOLEAN               *IsCompleted\r
+  IN  MTFTP6_INSTANCE    *Instance,\r
+  IN  EFI_MTFTP6_PACKET  *Packet,\r
+  IN  UINT32             Len,\r
+  OUT NET_BUF            **UdpPacket,\r
+  OUT BOOLEAN            *IsCompleted\r
   )\r
 {\r
-  EFI_MTFTP6_OPTION         *Options;\r
-  UINT32                    Count;\r
-  MTFTP6_EXT_OPTION_INFO    ExtInfo;\r
-  EFI_STATUS                Status;\r
-  INTN                      Expected;\r
-  EFI_UDP6_PROTOCOL         *Udp6;\r
+  EFI_MTFTP6_OPTION       *Options;\r
+  UINT32                  Count;\r
+  MTFTP6_EXT_OPTION_INFO  ExtInfo;\r
+  EFI_STATUS              Status;\r
+  INTN                    Expected;\r
+  EFI_UDP6_PROTOCOL       *Udp6;\r
 \r
   *IsCompleted = FALSE;\r
-  Options = NULL;\r
+  Options      = NULL;\r
 \r
   //\r
   // If already started the master download, don't change the\r
@@ -479,7 +473,7 @@ Mtftp6RrqHandleOack (
   Expected = Mtftp6GetNextBlockNum (&Instance->BlkList);\r
   ASSERT (Expected != -1);\r
 \r
-  if (Instance->IsMaster && Expected != 1) {\r
+  if (Instance->IsMaster && (Expected != 1)) {\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -493,6 +487,7 @@ Mtftp6RrqHandleOack (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   ASSERT (Options != NULL);\r
 \r
   //\r
@@ -517,7 +512,7 @@ Mtftp6RrqHandleOack (
       Mtftp6SendError (\r
         Instance,\r
         EFI_MTFTP6_ERRORCODE_ILLEGAL_OPERATION,\r
-        (UINT8 *) "Malformatted OACK packet"\r
+        (UINT8 *)"Malformatted OACK packet"\r
         );\r
     }\r
 \r
@@ -525,7 +520,6 @@ Mtftp6RrqHandleOack (
   }\r
 \r
   if ((ExtInfo.BitMap & MTFTP6_OPT_MCAST_BIT) != 0) {\r
-\r
     //\r
     // Save the multicast info. Always update the Master, only update the\r
     // multicast IP address, block size, window size, timeoute at the first time. If IP\r
@@ -534,7 +528,7 @@ Mtftp6RrqHandleOack (
     Instance->IsMaster = ExtInfo.IsMaster;\r
 \r
     if (NetIp6IsUnspecifiedAddr (&Instance->McastIp)) {\r
-      if (NetIp6IsUnspecifiedAddr (&ExtInfo.McastIp) || ExtInfo.McastPort == 0) {\r
+      if (NetIp6IsUnspecifiedAddr (&ExtInfo.McastIp) || (ExtInfo.McastPort == 0)) {\r
         //\r
         // Free the received packet before send new packet in ReceiveNotify,\r
         // since the udpio might need to be reconfigured.\r
@@ -547,7 +541,7 @@ Mtftp6RrqHandleOack (
         Mtftp6SendError (\r
           Instance,\r
           EFI_MTFTP6_ERRORCODE_ILLEGAL_OPERATION,\r
-          (UINT8 *) "Illegal multicast setting"\r
+          (UINT8 *)"Illegal multicast setting"\r
           );\r
 \r
         return EFI_TFTP_ERROR;\r
@@ -562,7 +556,7 @@ Mtftp6RrqHandleOack (
         sizeof (EFI_IP_ADDRESS)\r
         );\r
 \r
-      Instance->McastPort  = ExtInfo.McastPort;\r
+      Instance->McastPort = ExtInfo.McastPort;\r
       if (Instance->McastUdpIo == NULL) {\r
         Instance->McastUdpIo = UdpIoCreateIo (\r
                                  Instance->Service->Controller,\r
@@ -575,7 +569,7 @@ Mtftp6RrqHandleOack (
           Status = gBS->OpenProtocol (\r
                           Instance->McastUdpIo->UdpHandle,\r
                           &gEfiUdp6ProtocolGuid,\r
-                          (VOID **) &Udp6,\r
+                          (VOID **)&Udp6,\r
                           Instance->Service->Image,\r
                           Instance->Handle,\r
                           EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -612,7 +606,7 @@ Mtftp6RrqHandleOack (
         Mtftp6SendError (\r
           Instance,\r
           EFI_MTFTP6_ERRORCODE_ACCESS_VIOLATION,\r
-          (UINT8 *) "Failed to create socket to receive multicast packet"\r
+          (UINT8 *)"Failed to create socket to receive multicast packet"\r
           );\r
 \r
         return Status;\r
@@ -633,9 +627,7 @@ Mtftp6RrqHandleOack (
         Instance->Timeout = ExtInfo.Timeout;\r
       }\r
     }\r
-\r
   } else {\r
-\r
     Instance->IsMaster = TRUE;\r
 \r
     if (ExtInfo.BlkSize != 0) {\r
@@ -661,10 +653,9 @@ Mtftp6RrqHandleOack (
   // Send an ACK to (Expected - 1) which is 0 for unicast download,\r
   // or tell the server we want to receive the Expected block.\r
   //\r
-  return Mtftp6RrqSendAck (Instance, (UINT16) (Expected - 1));\r
+  return Mtftp6RrqSendAck (Instance, (UINT16)(Expected - 1));\r
 }\r
 \r
-\r
 /**\r
   The packet process callback for Mtftp6 download.\r
 \r
@@ -677,22 +668,22 @@ Mtftp6RrqHandleOack (
 VOID\r
 EFIAPI\r
 Mtftp6RrqInput (\r
-  IN NET_BUF                *UdpPacket,\r
-  IN UDP_END_POINT          *UdpEpt,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN VOID                   *Context\r
+  IN NET_BUF        *UdpPacket,\r
+  IN UDP_END_POINT  *UdpEpt,\r
+  IN EFI_STATUS     IoStatus,\r
+  IN VOID           *Context\r
   )\r
 {\r
-  MTFTP6_INSTANCE           *Instance;\r
-  EFI_MTFTP6_PACKET         *Packet;\r
-  BOOLEAN                   IsCompleted;\r
-  BOOLEAN                   IsMcast;\r
-  EFI_STATUS                Status;\r
-  UINT16                    Opcode;\r
-  UINT32                    TotalNum;\r
-  UINT32                    Len;\r
+  MTFTP6_INSTANCE    *Instance;\r
+  EFI_MTFTP6_PACKET  *Packet;\r
+  BOOLEAN            IsCompleted;\r
+  BOOLEAN            IsMcast;\r
+  EFI_STATUS         Status;\r
+  UINT16             Opcode;\r
+  UINT32             TotalNum;\r
+  UINT32             Len;\r
 \r
-  Instance = (MTFTP6_INSTANCE *) Context;\r
+  Instance = (MTFTP6_INSTANCE *)Context;\r
 \r
   NET_CHECK_SIGNATURE (Instance, MTFTP6_INSTANCE_SIGNATURE);\r
 \r
@@ -723,7 +714,8 @@ Mtftp6RrqInput (
         Ip6Swap128 (&UdpEpt->LocalAddr.v6),\r
         &Instance->McastIp,\r
         sizeof (EFI_IPv6_ADDRESS)\r
-        ) == 0) {\r
+        ) == 0)\r
+  {\r
     IsMcast = TRUE;\r
   } else {\r
     IsMcast = FALSE;\r
@@ -763,10 +755,9 @@ Mtftp6RrqInput (
       goto ON_EXIT;\r
     }\r
 \r
-    NetbufCopy (UdpPacket, 0, Len, (UINT8 *) Packet);\r
-\r
+    NetbufCopy (UdpPacket, 0, Len, (UINT8 *)Packet);\r
   } else {\r
-    Packet = (EFI_MTFTP6_PACKET *) NetbufGetByte (UdpPacket, 0, NULL);\r
+    Packet = (EFI_MTFTP6_PACKET *)NetbufGetByte (UdpPacket, 0, NULL);\r
     ASSERT (Packet != NULL);\r
   }\r
 \r
@@ -777,13 +768,13 @@ Mtftp6RrqInput (
   // if CheckPacket returns an EFI_ERROR code.\r
   //\r
   if ((Instance->Token->CheckPacket != NULL) &&\r
-      (Opcode == EFI_MTFTP6_OPCODE_OACK || Opcode == EFI_MTFTP6_OPCODE_ERROR)\r
-      ) {\r
-\r
+      ((Opcode == EFI_MTFTP6_OPCODE_OACK) || (Opcode == EFI_MTFTP6_OPCODE_ERROR))\r
+      )\r
+  {\r
     Status = Instance->Token->CheckPacket (\r
                                 &Instance->Mtftp6,\r
                                 Instance->Token,\r
-                                (UINT16) Len,\r
+                                (UINT16)Len,\r
                                 Packet\r
                                 );\r
 \r
@@ -804,7 +795,7 @@ Mtftp6RrqInput (
         Mtftp6SendError (\r
           Instance,\r
           EFI_MTFTP6_ERRORCODE_REQUEST_DENIED,\r
-          (UINT8 *) "User aborted the transfer"\r
+          (UINT8 *)"User aborted the transfer"\r
           );\r
       }\r
 \r
@@ -817,44 +808,46 @@ Mtftp6RrqInput (
   // Switch the process routines by the operation code.\r
   //\r
   switch (Opcode) {\r
-  case EFI_MTFTP6_OPCODE_DATA:\r
-    if ((Len > (UINT32) (MTFTP6_DATA_HEAD_LEN + Instance->BlkSize)) || (Len < (UINT32) MTFTP6_DATA_HEAD_LEN)) {\r
-      goto ON_EXIT;\r
-    }\r
-    //\r
-    // Handle the data packet of Rrq.\r
-    //\r
-    Status = Mtftp6RrqHandleData (\r
-               Instance,\r
-               Packet,\r
-               Len,\r
-               &UdpPacket,\r
-               &IsCompleted\r
-               );\r
-    break;\r
-\r
-  case EFI_MTFTP6_OPCODE_OACK:\r
-    if (IsMcast || Len <= MTFTP6_OPCODE_LEN) {\r
-      goto ON_EXIT;\r
-    }\r
-    //\r
-    // Handle the Oack packet of Rrq.\r
-    //\r
-    Status = Mtftp6RrqHandleOack (\r
-               Instance,\r
-               Packet,\r
-               Len,\r
-               &UdpPacket,\r
-               &IsCompleted\r
-               );\r
-    break;\r
-\r
-  default:\r
-    //\r
-    // Drop and return error if received error message.\r
-    //\r
-    Status = EFI_TFTP_ERROR;\r
-    break;\r
+    case EFI_MTFTP6_OPCODE_DATA:\r
+      if ((Len > (UINT32)(MTFTP6_DATA_HEAD_LEN + Instance->BlkSize)) || (Len < (UINT32)MTFTP6_DATA_HEAD_LEN)) {\r
+        goto ON_EXIT;\r
+      }\r
+\r
+      //\r
+      // Handle the data packet of Rrq.\r
+      //\r
+      Status = Mtftp6RrqHandleData (\r
+                 Instance,\r
+                 Packet,\r
+                 Len,\r
+                 &UdpPacket,\r
+                 &IsCompleted\r
+                 );\r
+      break;\r
+\r
+    case EFI_MTFTP6_OPCODE_OACK:\r
+      if (IsMcast || (Len <= MTFTP6_OPCODE_LEN)) {\r
+        goto ON_EXIT;\r
+      }\r
+\r
+      //\r
+      // Handle the Oack packet of Rrq.\r
+      //\r
+      Status = Mtftp6RrqHandleOack (\r
+                 Instance,\r
+                 Packet,\r
+                 Len,\r
+                 &UdpPacket,\r
+                 &IsCompleted\r
+                 );\r
+      break;\r
+\r
+    default:\r
+      //\r
+      // Drop and return error if received error message.\r
+      //\r
+      Status = EFI_TFTP_ERROR;\r
+      break;\r
   }\r
 \r
 ON_EXIT:\r
@@ -862,12 +855,14 @@ ON_EXIT:
   // Free the resources, then if !EFI_ERROR (Status), restart the\r
   // receive, otherwise end the session.\r
   //\r
-  if (Packet != NULL && TotalNum > 1) {\r
+  if ((Packet != NULL) && (TotalNum > 1)) {\r
     FreePool (Packet);\r
   }\r
+\r
   if (UdpPacket != NULL) {\r
     NetbufFree (UdpPacket);\r
   }\r
+\r
   if (!EFI_ERROR (Status) && !IsCompleted) {\r
     if (IsMcast) {\r
       Status = UdpIoRecvDatagram (\r
@@ -885,6 +880,7 @@ ON_EXIT:
                  );\r
     }\r
   }\r
+\r
   //\r
   // Clean up the current session if failed to continue.\r
   //\r
@@ -893,7 +889,6 @@ ON_EXIT:
   }\r
 }\r
 \r
-\r
 /**\r
   Start the Mtftp6 instance to download. It first initializes some\r
   of the internal states, then builds and sends an RRQ request packet.\r
@@ -908,11 +903,11 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 Mtftp6RrqStart (\r
-  IN MTFTP6_INSTANCE        *Instance,\r
-  IN UINT16                 Operation\r
+  IN MTFTP6_INSTANCE  *Instance,\r
+  IN UINT16           Operation\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // The valid block number range are [1, 0xffff]. For example:\r
@@ -939,4 +934,3 @@ Mtftp6RrqStart (
            0\r
            );\r
 }\r
-\r
index 1157a6065cac7f3c9a31316702bfb84740b846ca..582634fb2ddddd96378f98bb5213031a61e74717 100644 (file)
@@ -9,7 +9,6 @@
 \r
 #include "Mtftp6Impl.h"\r
 \r
-\r
 /**\r
   Allocate a MTFTP block range, then init it to the range of [Start, End].\r
 \r
 **/\r
 MTFTP6_BLOCK_RANGE *\r
 Mtftp6AllocateRange (\r
-  IN UINT16                 Start,\r
-  IN UINT16                 End\r
+  IN UINT16  Start,\r
+  IN UINT16  End\r
   )\r
 {\r
-  MTFTP6_BLOCK_RANGE        *Range;\r
+  MTFTP6_BLOCK_RANGE  *Range;\r
 \r
   Range = AllocateZeroPool (sizeof (MTFTP6_BLOCK_RANGE));\r
 \r
@@ -34,14 +33,13 @@ Mtftp6AllocateRange (
   }\r
 \r
   InitializeListHead (&Range->Link);\r
-  Range->Start  = Start;\r
-  Range->End    = End;\r
-  Range->Bound  = End;\r
+  Range->Start = Start;\r
+  Range->End   = End;\r
+  Range->Bound = End;\r
 \r
   return Range;\r
 }\r
 \r
-\r
 /**\r
   Initialize the block range for either RRQ or WRQ. RRQ and WRQ have\r
   different requirements for Start and End. For example, during startup,\r
@@ -64,12 +62,12 @@ Mtftp6AllocateRange (
 **/\r
 EFI_STATUS\r
 Mtftp6InitBlockRange (\r
-  IN LIST_ENTRY             *Head,\r
-  IN UINT16                 Start,\r
-  IN UINT16                 End\r
+  IN LIST_ENTRY  *Head,\r
+  IN UINT16      Start,\r
+  IN UINT16      End\r
   )\r
 {\r
-  MTFTP6_BLOCK_RANGE        *Range;\r
+  MTFTP6_BLOCK_RANGE  *Range;\r
 \r
   Range = Mtftp6AllocateRange (Start, End);\r
 \r
@@ -81,7 +79,6 @@ Mtftp6InitBlockRange (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Get the first valid block number on the range list.\r
 \r
@@ -93,7 +90,7 @@ Mtftp6InitBlockRange (
 **/\r
 INTN\r
 Mtftp6GetNextBlockNum (\r
-  IN LIST_ENTRY              *Head\r
+  IN LIST_ENTRY  *Head\r
   )\r
 {\r
   MTFTP6_BLOCK_RANGE  *Range;\r
@@ -106,7 +103,6 @@ Mtftp6GetNextBlockNum (
   return Range->Start;\r
 }\r
 \r
-\r
 /**\r
   Set the last block number of the block range list. It\r
   removes all the blocks after the Last. MTFTP initialize the\r
@@ -120,11 +116,11 @@ Mtftp6GetNextBlockNum (
 **/\r
 VOID\r
 Mtftp6SetLastBlockNum (\r
-  IN LIST_ENTRY             *Head,\r
-  IN UINT16                 Last\r
+  IN LIST_ENTRY  *Head,\r
+  IN UINT16      Last\r
   )\r
 {\r
-  MTFTP6_BLOCK_RANGE        *Range;\r
+  MTFTP6_BLOCK_RANGE  *Range;\r
 \r
   //\r
   // Iterate from the tail to head to remove the block number\r
@@ -142,11 +138,11 @@ Mtftp6SetLastBlockNum (
     if (Range->End > Last) {\r
       Range->End = Last;\r
     }\r
-    return ;\r
+\r
+    return;\r
   }\r
 }\r
 \r
-\r
 /**\r
   Remove the block number from the block range list.\r
 \r
@@ -162,18 +158,17 @@ Mtftp6SetLastBlockNum (
 **/\r
 EFI_STATUS\r
 Mtftp6RemoveBlockNum (\r
-  IN LIST_ENTRY             *Head,\r
-  IN UINT16                 Num,\r
-  IN BOOLEAN                Completed,\r
-  OUT UINT64                *BlockCounter\r
+  IN LIST_ENTRY  *Head,\r
+  IN UINT16      Num,\r
+  IN BOOLEAN     Completed,\r
+  OUT UINT64     *BlockCounter\r
   )\r
 {\r
-  MTFTP6_BLOCK_RANGE        *Range;\r
-  MTFTP6_BLOCK_RANGE        *NewRange;\r
-  LIST_ENTRY                *Entry;\r
+  MTFTP6_BLOCK_RANGE  *Range;\r
+  MTFTP6_BLOCK_RANGE  *NewRange;\r
+  LIST_ENTRY          *Entry;\r
 \r
   NET_LIST_FOR_EACH (Entry, Head) {\r
-\r
     //\r
     // Each block represents a hole [Start, End] in the file,\r
     // skip to the first range with End >= Num\r
@@ -202,7 +197,6 @@ Mtftp6RemoveBlockNum (
     //\r
     if (Range->Start > Num) {\r
       return EFI_NOT_FOUND;\r
-\r
     } else if (Range->Start == Num) {\r
       Range->Start++;\r
 \r
@@ -214,7 +208,7 @@ Mtftp6RemoveBlockNum (
       // wrap to zero, because this is the simplest to implement. Here we choose\r
       // this solution.\r
       //\r
-      *BlockCounter  = Num;\r
+      *BlockCounter = Num;\r
 \r
       if (Range->Round > 0) {\r
         *BlockCounter += Range->Bound +  MultU64x32 (Range->Round - 1, (UINT32)(Range->Bound + 1)) + 1;\r
@@ -222,7 +216,7 @@ Mtftp6RemoveBlockNum (
 \r
       if (Range->Start > Range->Bound) {\r
         Range->Start = 0;\r
-        Range->Round ++;\r
+        Range->Round++;\r
       }\r
 \r
       if ((Range->Start > Range->End) || Completed) {\r
@@ -231,12 +225,11 @@ Mtftp6RemoveBlockNum (
       }\r
 \r
       return EFI_SUCCESS;\r
-\r
     } else {\r
       if (Range->End == Num) {\r
         Range->End--;\r
       } else {\r
-        NewRange = Mtftp6AllocateRange ((UINT16) (Num + 1), (UINT16) Range->End);\r
+        NewRange = Mtftp6AllocateRange ((UINT16)(Num + 1), (UINT16)Range->End);\r
 \r
         if (NewRange == NULL) {\r
           return EFI_OUT_OF_RESOURCES;\r
@@ -253,7 +246,6 @@ Mtftp6RemoveBlockNum (
   return EFI_NOT_FOUND;\r
 }\r
 \r
-\r
 /**\r
   Configure the opened Udp6 instance until the corresponding Ip6 instance\r
   has been configured.\r
@@ -268,17 +260,17 @@ Mtftp6RemoveBlockNum (
 **/\r
 EFI_STATUS\r
 Mtftp6GetMapping (\r
-  IN UDP_IO                 *UdpIo,\r
-  IN EFI_UDP6_CONFIG_DATA   *UdpCfgData\r
+  IN UDP_IO                *UdpIo,\r
+  IN EFI_UDP6_CONFIG_DATA  *UdpCfgData\r
   )\r
 {\r
-  EFI_IP6_MODE_DATA         Ip6Mode;\r
-  EFI_UDP6_PROTOCOL         *Udp6;\r
-  EFI_STATUS                Status;\r
-  EFI_EVENT                 Event;\r
+  EFI_IP6_MODE_DATA  Ip6Mode;\r
+  EFI_UDP6_PROTOCOL  *Udp6;\r
+  EFI_STATUS         Status;\r
+  EFI_EVENT          Event;\r
 \r
-  Event  = NULL;\r
-  Udp6   = UdpIo->Protocol.Udp6;\r
+  Event = NULL;\r
+  Udp6  = UdpIo->Protocol.Udp6;\r
 \r
   //\r
   // Create a timer to check whether the Ip6 instance configured or not.\r
@@ -307,7 +299,6 @@ Mtftp6GetMapping (
   // Check the Ip6 mode data till timeout.\r
   //\r
   while (EFI_ERROR (gBS->CheckEvent (Event))) {\r
-\r
     Udp6->Poll (Udp6);\r
 \r
     Status = Udp6->GetModeData (Udp6, NULL, &Ip6Mode, NULL, NULL);\r
@@ -337,7 +328,7 @@ Mtftp6GetMapping (
         FreePool (Ip6Mode.IcmpTypeList);\r
       }\r
 \r
-      if  (Ip6Mode.IsConfigured) {\r
+      if (Ip6Mode.IsConfigured) {\r
         //\r
         // Continue to configure the Udp6 instance.\r
         //\r
@@ -357,7 +348,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   The dummy configure routine for create a new Udp6 Io.\r
 \r
@@ -370,14 +360,13 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 Mtftp6ConfigDummyUdpIo (\r
-  IN UDP_IO                 *UdpIo,\r
-  IN VOID                   *Context\r
+  IN UDP_IO  *UdpIo,\r
+  IN VOID    *Context\r
   )\r
 {\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   The configure routine for Mtftp6 instance to transmit/receive.\r
 \r
@@ -394,16 +383,16 @@ Mtftp6ConfigDummyUdpIo (
 **/\r
 EFI_STATUS\r
 Mtftp6ConfigUdpIo (\r
-  IN UDP_IO                 *UdpIo,\r
-  IN EFI_IPv6_ADDRESS       *ServerIp,\r
-  IN UINT16                 ServerPort,\r
-  IN EFI_IPv6_ADDRESS       *LocalIp,\r
-  IN UINT16                 LocalPort\r
+  IN UDP_IO            *UdpIo,\r
+  IN EFI_IPv6_ADDRESS  *ServerIp,\r
+  IN UINT16            ServerPort,\r
+  IN EFI_IPv6_ADDRESS  *LocalIp,\r
+  IN UINT16            LocalPort\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_UDP6_PROTOCOL         *Udp6;\r
-  EFI_UDP6_CONFIG_DATA      *Udp6Cfg;\r
+  EFI_STATUS            Status;\r
+  EFI_UDP6_PROTOCOL     *Udp6;\r
+  EFI_UDP6_CONFIG_DATA  *Udp6Cfg;\r
 \r
   Udp6    = UdpIo->Protocol.Udp6;\r
   Udp6Cfg = &(UdpIo->Config.Udp6);\r
@@ -441,14 +430,12 @@ Mtftp6ConfigUdpIo (
   Status = Udp6->Configure (Udp6, Udp6Cfg);\r
 \r
   if (Status == EFI_NO_MAPPING) {\r
-\r
     return Mtftp6GetMapping (UdpIo, Udp6Cfg);\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Build and transmit the request packet for the Mtftp6 instance.\r
 \r
@@ -462,30 +449,30 @@ Mtftp6ConfigUdpIo (
 **/\r
 EFI_STATUS\r
 Mtftp6SendRequest (\r
-  IN MTFTP6_INSTANCE        *Instance,\r
-  IN UINT16                 Operation\r
+  IN MTFTP6_INSTANCE  *Instance,\r
+  IN UINT16           Operation\r
   )\r
 {\r
-  EFI_MTFTP6_PACKET         *Packet;\r
-  EFI_MTFTP6_OPTION         *Options;\r
-  EFI_MTFTP6_TOKEN          *Token;\r
-  RETURN_STATUS             Status;\r
-  NET_BUF                   *Nbuf;\r
-  UINT8                     *Mode;\r
-  UINT8                     *Cur;\r
-  UINTN                     Index;\r
-  UINT32                    BufferLength;\r
-  UINTN                     FileNameLength;\r
-  UINTN                     ModeLength;\r
-  UINTN                     OptionStrLength;\r
-  UINTN                     ValueStrLength;\r
+  EFI_MTFTP6_PACKET  *Packet;\r
+  EFI_MTFTP6_OPTION  *Options;\r
+  EFI_MTFTP6_TOKEN   *Token;\r
+  RETURN_STATUS      Status;\r
+  NET_BUF            *Nbuf;\r
+  UINT8              *Mode;\r
+  UINT8              *Cur;\r
+  UINTN              Index;\r
+  UINT32             BufferLength;\r
+  UINTN              FileNameLength;\r
+  UINTN              ModeLength;\r
+  UINTN              OptionStrLength;\r
+  UINTN              ValueStrLength;\r
 \r
   Token   = Instance->Token;\r
   Options = Token->OptionList;\r
   Mode    = Token->ModeStr;\r
 \r
   if (Mode == NULL) {\r
-    Mode = (UINT8 *) "octet";\r
+    Mode = (UINT8 *)"octet";\r
   }\r
 \r
   //\r
@@ -507,14 +494,14 @@ Mtftp6SendRequest (
   //\r
   // Compute the size of new Mtftp6 packet.\r
   //\r
-  FileNameLength = AsciiStrLen ((CHAR8 *) Token->Filename);\r
-  ModeLength     = AsciiStrLen ((CHAR8 *) Mode);\r
-  BufferLength   = (UINT32) FileNameLength + (UINT32) ModeLength + 4;\r
+  FileNameLength = AsciiStrLen ((CHAR8 *)Token->Filename);\r
+  ModeLength     = AsciiStrLen ((CHAR8 *)Mode);\r
+  BufferLength   = (UINT32)FileNameLength + (UINT32)ModeLength + 4;\r
 \r
   for (Index = 0; Index < Token->OptionCount; Index++) {\r
-    OptionStrLength = AsciiStrLen ((CHAR8 *) Options[Index].OptionStr);\r
-    ValueStrLength  = AsciiStrLen ((CHAR8 *) Options[Index].ValueStr);\r
-    BufferLength   += (UINT32) OptionStrLength + (UINT32) ValueStrLength + 2;\r
+    OptionStrLength = AsciiStrLen ((CHAR8 *)Options[Index].OptionStr);\r
+    ValueStrLength  = AsciiStrLen ((CHAR8 *)Options[Index].ValueStr);\r
+    BufferLength   += (UINT32)OptionStrLength + (UINT32)ValueStrLength + 2;\r
   }\r
 \r
   //\r
@@ -527,39 +514,38 @@ Mtftp6SendRequest (
   //\r
   // Copy the opcode, filename and mode into packet.\r
   //\r
-  Packet         = (EFI_MTFTP6_PACKET *) NetbufAllocSpace (Nbuf, BufferLength, FALSE);\r
+  Packet = (EFI_MTFTP6_PACKET *)NetbufAllocSpace (Nbuf, BufferLength, FALSE);\r
   ASSERT (Packet != NULL);\r
 \r
   Packet->OpCode = HTONS (Operation);\r
   BufferLength  -= sizeof (Packet->OpCode);\r
 \r
-  Cur            = Packet->Rrq.Filename;\r
-  Status         = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Token->Filename);\r
+  Cur    = Packet->Rrq.Filename;\r
+  Status = AsciiStrCpyS ((CHAR8 *)Cur, BufferLength, (CHAR8 *)Token->Filename);\r
   ASSERT_EFI_ERROR (Status);\r
-  BufferLength  -= (UINT32) (FileNameLength + 1);\r
-  Cur           += FileNameLength + 1;\r
-  Status         = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Mode);\r
+  BufferLength -= (UINT32)(FileNameLength + 1);\r
+  Cur          += FileNameLength + 1;\r
+  Status        = AsciiStrCpyS ((CHAR8 *)Cur, BufferLength, (CHAR8 *)Mode);\r
   ASSERT_EFI_ERROR (Status);\r
-  BufferLength  -= (UINT32) (ModeLength + 1);\r
-  Cur           += ModeLength + 1;\r
+  BufferLength -= (UINT32)(ModeLength + 1);\r
+  Cur          += ModeLength + 1;\r
 \r
   //\r
   // Copy all the extension options into the packet.\r
   //\r
   for (Index = 0; Index < Token->OptionCount; ++Index) {\r
-    OptionStrLength = AsciiStrLen ((CHAR8 *) Options[Index].OptionStr);\r
-    ValueStrLength  = AsciiStrLen ((CHAR8 *) Options[Index].ValueStr);\r
+    OptionStrLength = AsciiStrLen ((CHAR8 *)Options[Index].OptionStr);\r
+    ValueStrLength  = AsciiStrLen ((CHAR8 *)Options[Index].ValueStr);\r
 \r
-    Status          = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Options[Index].OptionStr);\r
+    Status = AsciiStrCpyS ((CHAR8 *)Cur, BufferLength, (CHAR8 *)Options[Index].OptionStr);\r
     ASSERT_EFI_ERROR (Status);\r
-    BufferLength   -= (UINT32) (OptionStrLength + 1);\r
-    Cur            += OptionStrLength + 1;\r
+    BufferLength -= (UINT32)(OptionStrLength + 1);\r
+    Cur          += OptionStrLength + 1;\r
 \r
-    Status          = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Options[Index].ValueStr);\r
+    Status = AsciiStrCpyS ((CHAR8 *)Cur, BufferLength, (CHAR8 *)Options[Index].ValueStr);\r
     ASSERT_EFI_ERROR (Status);\r
-    BufferLength   -= (UINT32) (ValueStrLength + 1);\r
-    Cur            += ValueStrLength + 1;\r
-\r
+    BufferLength -= (UINT32)(ValueStrLength + 1);\r
+    Cur          += ValueStrLength + 1;\r
   }\r
 \r
   //\r
@@ -575,7 +561,6 @@ Mtftp6SendRequest (
   return Mtftp6TransmitPacket (Instance, Nbuf);\r
 }\r
 \r
-\r
 /**\r
   Build and send an error packet.\r
 \r
@@ -590,26 +575,26 @@ Mtftp6SendRequest (
 **/\r
 EFI_STATUS\r
 Mtftp6SendError (\r
-  IN MTFTP6_INSTANCE        *Instance,\r
-  IN UINT16                 ErrCode,\r
-  IN UINT8*                 ErrInfo\r
+  IN MTFTP6_INSTANCE  *Instance,\r
+  IN UINT16           ErrCode,\r
+  IN UINT8            *ErrInfo\r
   )\r
 {\r
-  NET_BUF                   *Nbuf;\r
-  EFI_MTFTP6_PACKET         *TftpError;\r
-  UINT32                    Len;\r
+  NET_BUF            *Nbuf;\r
+  EFI_MTFTP6_PACKET  *TftpError;\r
+  UINT32             Len;\r
 \r
   //\r
   // Allocate a packet then copy the data.\r
   //\r
-  Len  = (UINT32) (AsciiStrLen ((CHAR8 *) ErrInfo) + sizeof (EFI_MTFTP6_ERROR_HEADER));\r
+  Len  = (UINT32)(AsciiStrLen ((CHAR8 *)ErrInfo) + sizeof (EFI_MTFTP6_ERROR_HEADER));\r
   Nbuf = NetbufAlloc (Len);\r
 \r
   if (Nbuf == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  TftpError = (EFI_MTFTP6_PACKET *) NetbufAllocSpace (Nbuf, Len, FALSE);\r
+  TftpError = (EFI_MTFTP6_PACKET *)NetbufAllocSpace (Nbuf, Len, FALSE);\r
 \r
   if (TftpError == NULL) {\r
     NetbufFree (Nbuf);\r
@@ -619,7 +604,7 @@ Mtftp6SendError (
   TftpError->OpCode          = HTONS (EFI_MTFTP6_OPCODE_ERROR);\r
   TftpError->Error.ErrorCode = HTONS (ErrCode);\r
 \r
-  AsciiStrCpyS ((CHAR8 *) TftpError->Error.ErrorMessage, AsciiStrLen ((CHAR8 *) ErrInfo) + 1 , (CHAR8 *) ErrInfo);\r
+  AsciiStrCpyS ((CHAR8 *)TftpError->Error.ErrorMessage, AsciiStrLen ((CHAR8 *)ErrInfo) + 1, (CHAR8 *)ErrInfo);\r
 \r
   //\r
   // Save the packet buf for retransmit\r
@@ -634,7 +619,6 @@ Mtftp6SendError (
   return Mtftp6TransmitPacket (Instance, Nbuf);\r
 }\r
 \r
-\r
 /**\r
   The callback function called when the packet is transmitted.\r
 \r
@@ -647,17 +631,16 @@ Mtftp6SendError (
 VOID\r
 EFIAPI\r
 Mtftp6OnPacketSent (\r
-  IN NET_BUF                   *Packet,\r
-  IN UDP_END_POINT             *UdpEpt,\r
-  IN EFI_STATUS                IoStatus,\r
-  IN VOID                      *Context\r
+  IN NET_BUF        *Packet,\r
+  IN UDP_END_POINT  *UdpEpt,\r
+  IN EFI_STATUS     IoStatus,\r
+  IN VOID           *Context\r
   )\r
 {\r
   NetbufFree (Packet);\r
-  *(BOOLEAN *) Context = TRUE;\r
+  *(BOOLEAN *)Context = TRUE;\r
 }\r
 \r
-\r
 /**\r
   Send the packet for the Mtftp6 instance.\r
 \r
@@ -670,18 +653,18 @@ Mtftp6OnPacketSent (
 **/\r
 EFI_STATUS\r
 Mtftp6TransmitPacket (\r
-  IN MTFTP6_INSTANCE        *Instance,\r
-  IN NET_BUF                *Packet\r
+  IN MTFTP6_INSTANCE  *Instance,\r
+  IN NET_BUF          *Packet\r
   )\r
 {\r
-  EFI_UDP6_PROTOCOL         *Udp6;\r
-  EFI_UDP6_CONFIG_DATA      Udp6CfgData;\r
-  EFI_STATUS                Status;\r
-  UINT16                    *Temp;\r
-  UINT16                    Value;\r
-  UINT16                    OpCode;\r
-\r
-  ZeroMem (&Udp6CfgData, sizeof(EFI_UDP6_CONFIG_DATA));\r
+  EFI_UDP6_PROTOCOL     *Udp6;\r
+  EFI_UDP6_CONFIG_DATA  Udp6CfgData;\r
+  EFI_STATUS            Status;\r
+  UINT16                *Temp;\r
+  UINT16                Value;\r
+  UINT16                OpCode;\r
+\r
+  ZeroMem (&Udp6CfgData, sizeof (EFI_UDP6_CONFIG_DATA));\r
   Udp6 = Instance->UdpIo->Protocol.Udp6;\r
 \r
   //\r
@@ -689,13 +672,13 @@ Mtftp6TransmitPacket (
   //\r
   Instance->PacketToLive = Instance->IsMaster ? Instance->Timeout : (Instance->Timeout * 2);\r
 \r
-  Temp   = (UINT16 *) NetbufGetByte (Packet, 0, NULL);\r
+  Temp = (UINT16 *)NetbufGetByte (Packet, 0, NULL);\r
   ASSERT (Temp != NULL);\r
 \r
   Value  = *Temp;\r
   OpCode = NTOHS (Value);\r
 \r
-  if (OpCode == EFI_MTFTP6_OPCODE_RRQ || OpCode == EFI_MTFTP6_OPCODE_DIR || OpCode == EFI_MTFTP6_OPCODE_WRQ) {\r
+  if ((OpCode == EFI_MTFTP6_OPCODE_RRQ) || (OpCode == EFI_MTFTP6_OPCODE_DIR) || (OpCode == EFI_MTFTP6_OPCODE_WRQ)) {\r
     //\r
     // For the Rrq, Dir, Wrq requests of the operation, configure the Udp6Io as\r
     // (serverip, 69, localip, localport) to send.\r
@@ -786,7 +769,6 @@ Mtftp6TransmitPacket (
     }\r
 \r
     if (Udp6CfgData.RemotePort != Instance->ServerDataPort) {\r
-\r
       Status = Udp6->Configure (Udp6, NULL);\r
 \r
       if (EFI_ERROR (Status)) {\r
@@ -838,7 +820,6 @@ Mtftp6TransmitPacket (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Check packet for GetInfo callback routine.\r
 \r
@@ -856,32 +837,32 @@ Mtftp6TransmitPacket (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp6CheckPacket (\r
-  IN EFI_MTFTP6_PROTOCOL    *This,\r
-  IN EFI_MTFTP6_TOKEN       *Token,\r
-  IN UINT16                 PacketLen,\r
-  IN EFI_MTFTP6_PACKET      *Packet\r
+  IN EFI_MTFTP6_PROTOCOL  *This,\r
+  IN EFI_MTFTP6_TOKEN     *Token,\r
+  IN UINT16               PacketLen,\r
+  IN EFI_MTFTP6_PACKET    *Packet\r
   )\r
 {\r
-  MTFTP6_GETINFO_CONTEXT    *Context;\r
-  UINT16                    OpCode;\r
+  MTFTP6_GETINFO_CONTEXT  *Context;\r
+  UINT16                  OpCode;\r
 \r
-  Context = (MTFTP6_GETINFO_CONTEXT *) Token->Context;\r
+  Context = (MTFTP6_GETINFO_CONTEXT *)Token->Context;\r
   OpCode  = NTOHS (Packet->OpCode);\r
 \r
   //\r
   // Set the GetInfo's return status according to the OpCode.\r
   //\r
   switch (OpCode) {\r
-  case EFI_MTFTP6_OPCODE_ERROR:\r
-    Context->Status = EFI_TFTP_ERROR;\r
-    break;\r
+    case EFI_MTFTP6_OPCODE_ERROR:\r
+      Context->Status = EFI_TFTP_ERROR;\r
+      break;\r
 \r
-  case EFI_MTFTP6_OPCODE_OACK:\r
-    Context->Status = EFI_SUCCESS;\r
-    break;\r
+    case EFI_MTFTP6_OPCODE_OACK:\r
+      Context->Status = EFI_SUCCESS;\r
+      break;\r
 \r
-  default:\r
-    Context->Status = EFI_PROTOCOL_ERROR;\r
+    default:\r
+      Context->Status = EFI_PROTOCOL_ERROR;\r
   }\r
 \r
   //\r
@@ -901,7 +882,6 @@ Mtftp6CheckPacket (
   return EFI_ABORTED;\r
 }\r
 \r
-\r
 /**\r
   Clean up the current Mtftp6 operation.\r
 \r
@@ -911,13 +891,13 @@ Mtftp6CheckPacket (
 **/\r
 VOID\r
 Mtftp6OperationClean (\r
-  IN MTFTP6_INSTANCE        *Instance,\r
-  IN EFI_STATUS             Result\r
+  IN MTFTP6_INSTANCE  *Instance,\r
+  IN EFI_STATUS       Result\r
   )\r
 {\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  MTFTP6_BLOCK_RANGE        *Block;\r
+  LIST_ENTRY          *Entry;\r
+  LIST_ENTRY          *Next;\r
+  MTFTP6_BLOCK_RANGE  *Block;\r
 \r
   //\r
   // Clean up the current token and event.\r
@@ -927,6 +907,7 @@ Mtftp6OperationClean (
     if (Instance->Token->Event != NULL) {\r
       gBS->SignalEvent (Instance->Token->Event);\r
     }\r
+\r
     Instance->Token = NULL;\r
   }\r
 \r
@@ -985,7 +966,6 @@ Mtftp6OperationClean (
   Instance->IsMaster       = TRUE;\r
 }\r
 \r
-\r
 /**\r
   Start the Mtftp6 instance to perform the operation, such as read file,\r
   write file, and read directory.\r
@@ -1002,37 +982,39 @@ Mtftp6OperationClean (
 **/\r
 EFI_STATUS\r
 Mtftp6OperationStart (\r
-  IN EFI_MTFTP6_PROTOCOL    *This,\r
-  IN EFI_MTFTP6_TOKEN       *Token,\r
-  IN UINT16                 OpCode\r
+  IN EFI_MTFTP6_PROTOCOL  *This,\r
+  IN EFI_MTFTP6_TOKEN     *Token,\r
+  IN UINT16               OpCode\r
   )\r
 {\r
-  MTFTP6_INSTANCE           *Instance;\r
-  EFI_STATUS                Status;\r
-\r
-  if (This == NULL ||\r
-      Token == NULL ||\r
-      Token->Filename == NULL ||\r
-      (Token->OptionCount != 0 && Token->OptionList == NULL) ||\r
-      (Token->OverrideData != NULL && !NetIp6IsValidUnicast (&Token->OverrideData->ServerIp))\r
-      ) {\r
+  MTFTP6_INSTANCE  *Instance;\r
+  EFI_STATUS       Status;\r
+\r
+  if ((This == NULL) ||\r
+      (Token == NULL) ||\r
+      (Token->Filename == NULL) ||\r
+      ((Token->OptionCount != 0) && (Token->OptionList == NULL)) ||\r
+      ((Token->OverrideData != NULL) && !NetIp6IsValidUnicast (&Token->OverrideData->ServerIp))\r
+      )\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   //\r
   // At least define one method to collect the data for download.\r
   //\r
-  if ((OpCode == EFI_MTFTP6_OPCODE_RRQ || OpCode == EFI_MTFTP6_OPCODE_DIR) &&\r
-      Token->Buffer == NULL &&\r
-      Token->CheckPacket == NULL\r
-      ) {\r
+  if (((OpCode == EFI_MTFTP6_OPCODE_RRQ) || (OpCode == EFI_MTFTP6_OPCODE_DIR)) &&\r
+      (Token->Buffer == NULL) &&\r
+      (Token->CheckPacket == NULL)\r
+      )\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   //\r
   // At least define one method to provide the data for upload.\r
   //\r
-  if (OpCode == EFI_MTFTP6_OPCODE_WRQ && Token->Buffer == NULL && Token->PacketNeeded == NULL) {\r
+  if ((OpCode == EFI_MTFTP6_OPCODE_WRQ) && (Token->Buffer == NULL) && (Token->PacketNeeded == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1055,7 +1037,6 @@ Mtftp6OperationStart (
   // Parse the extension options in the request packet.\r
   //\r
   if (Token->OptionCount != 0) {\r
-\r
     Status = Mtftp6ParseExtensionOption (\r
                Token->OptionList,\r
                Token->OptionCount,\r
@@ -1072,12 +1053,12 @@ Mtftp6OperationStart (
   //\r
   // Initialize runtime data from config data or override data.\r
   //\r
-  Instance->Token           = Token;\r
-  Instance->ServerCmdPort   = Instance->Config->InitialServerPort;\r
-  Instance->ServerDataPort  = 0;\r
-  Instance->MaxRetry        = Instance->Config->TryCount;\r
-  Instance->Timeout         = Instance->Config->TimeoutValue;\r
-  Instance->IsMaster        = TRUE;\r
+  Instance->Token          = Token;\r
+  Instance->ServerCmdPort  = Instance->Config->InitialServerPort;\r
+  Instance->ServerDataPort = 0;\r
+  Instance->MaxRetry       = Instance->Config->TryCount;\r
+  Instance->Timeout        = Instance->Config->TimeoutValue;\r
+  Instance->IsMaster       = TRUE;\r
 \r
   CopyMem (\r
     &Instance->ServerIp,\r
@@ -1103,15 +1084,19 @@ Mtftp6OperationStart (
   if (Instance->ServerCmdPort == 0) {\r
     Instance->ServerCmdPort = MTFTP6_DEFAULT_SERVER_CMD_PORT;\r
   }\r
+\r
   if (Instance->BlkSize == 0) {\r
     Instance->BlkSize = MTFTP6_DEFAULT_BLK_SIZE;\r
   }\r
+\r
   if (Instance->WindowSize == 0) {\r
     Instance->WindowSize = MTFTP6_DEFAULT_WINDOWSIZE;\r
   }\r
+\r
   if (Instance->MaxRetry == 0) {\r
     Instance->MaxRetry = MTFTP6_DEFAULT_MAX_RETRY;\r
   }\r
+\r
   if (Instance->Timeout == 0) {\r
     Instance->Timeout = MTFTP6_DEFAULT_TIMEOUT;\r
   }\r
@@ -1122,21 +1107,21 @@ Mtftp6OperationStart (
   // Switch the routines by the operation code.\r
   //\r
   switch (OpCode) {\r
-  case EFI_MTFTP6_OPCODE_RRQ:\r
-    Status = Mtftp6RrqStart (Instance, OpCode);\r
-    break;\r
+    case EFI_MTFTP6_OPCODE_RRQ:\r
+      Status = Mtftp6RrqStart (Instance, OpCode);\r
+      break;\r
 \r
-  case EFI_MTFTP6_OPCODE_DIR:\r
-    Status = Mtftp6RrqStart (Instance, OpCode);\r
-    break;\r
+    case EFI_MTFTP6_OPCODE_DIR:\r
+      Status = Mtftp6RrqStart (Instance, OpCode);\r
+      break;\r
 \r
-  case EFI_MTFTP6_OPCODE_WRQ:\r
-    Status = Mtftp6WrqStart (Instance, OpCode);\r
-    break;\r
+    case EFI_MTFTP6_OPCODE_WRQ:\r
+      Status = Mtftp6WrqStart (Instance, OpCode);\r
+      break;\r
 \r
-  default:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto ON_ERROR;\r
+    default:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto ON_ERROR;\r
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -1152,6 +1137,7 @@ Mtftp6OperationStart (
     while (Token->Status == EFI_NOT_READY) {\r
       This->Poll (This);\r
     }\r
+\r
     return Token->Status;\r
   }\r
 \r
@@ -1165,7 +1151,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   The timer ticking routine for the Mtftp6 instance.\r
 \r
@@ -1176,25 +1161,24 @@ ON_ERROR:
 VOID\r
 EFIAPI\r
 Mtftp6OnTimerTick (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  MTFTP6_SERVICE            *Service;\r
-  MTFTP6_INSTANCE           *Instance;\r
-  LIST_ENTRY                *Entry;\r
-  LIST_ENTRY                *Next;\r
-  EFI_MTFTP6_TOKEN          *Token;\r
-  EFI_STATUS                Status;\r
+  MTFTP6_SERVICE    *Service;\r
+  MTFTP6_INSTANCE   *Instance;\r
+  LIST_ENTRY        *Entry;\r
+  LIST_ENTRY        *Next;\r
+  EFI_MTFTP6_TOKEN  *Token;\r
+  EFI_STATUS        Status;\r
 \r
-  Service = (MTFTP6_SERVICE *) Context;\r
+  Service = (MTFTP6_SERVICE *)Context;\r
 \r
   //\r
   // Iterate through all the children of the Mtftp service instance. Time\r
   // out the packet. If maximum retries reached, clean the session up.\r
   //\r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &Service->Children) {\r
-\r
     Instance = NET_LIST_USER_STRUCT (Entry, MTFTP6_INSTANCE, Link);\r
 \r
     if (Instance->Token == NULL) {\r
@@ -1217,10 +1201,10 @@ Mtftp6OnTimerTick (
 \r
       if (EFI_ERROR (Status)) {\r
         Mtftp6SendError (\r
-           Instance,\r
-           EFI_MTFTP6_ERRORCODE_REQUEST_DENIED,\r
-           (UINT8 *) "User aborted the transfer in time out"\r
-           );\r
+          Instance,\r
+          EFI_MTFTP6_ERRORCODE_REQUEST_DENIED,\r
+          (UINT8 *)"User aborted the transfer in time out"\r
+          );\r
         Mtftp6OperationClean (Instance, EFI_ABORTED);\r
         continue;\r
       }\r
index 2b8a58f9de50d8bb7e121fe0f71982a0faeda358..33ab51a2666953f14dc3bea5d93894d08cc9f37d 100644 (file)
 // the holes are filled in, then the download or upload has completed.\r
 //\r
 typedef struct {\r
-  LIST_ENTRY                Link;\r
-  INTN                      Start;\r
-  INTN                      End;\r
-  INTN                      Round;\r
-  INTN                      Bound;\r
+  LIST_ENTRY    Link;\r
+  INTN          Start;\r
+  INTN          End;\r
+  INTN          Round;\r
+  INTN          Bound;\r
 } MTFTP6_BLOCK_RANGE;\r
 \r
-\r
 /**\r
   Initialize the block range for either RRQ or WRQ. RRQ and WRQ have\r
   different requirements for Start and End. For example, during startup,\r
@@ -46,12 +45,11 @@ typedef struct {
 **/\r
 EFI_STATUS\r
 Mtftp6InitBlockRange (\r
-  IN LIST_ENTRY             *Head,\r
-  IN UINT16                 Start,\r
-  IN UINT16                 End\r
+  IN LIST_ENTRY  *Head,\r
+  IN UINT16      Start,\r
+  IN UINT16      End\r
   );\r
 \r
-\r
 /**\r
   Get the first valid block number on the range list.\r
 \r
@@ -63,10 +61,9 @@ Mtftp6InitBlockRange (
 **/\r
 INTN\r
 Mtftp6GetNextBlockNum (\r
-  IN LIST_ENTRY             *Head\r
+  IN LIST_ENTRY  *Head\r
   );\r
 \r
-\r
 /**\r
   Set the last block number of the block range list. It\r
   removes all the blocks after the Last. MTFTP initialize the\r
@@ -80,11 +77,10 @@ Mtftp6GetNextBlockNum (
 **/\r
 VOID\r
 Mtftp6SetLastBlockNum (\r
-  IN LIST_ENTRY             *Head,\r
-  IN UINT16                 Last\r
+  IN LIST_ENTRY  *Head,\r
+  IN UINT16      Last\r
   );\r
 \r
-\r
 /**\r
   Remove the block number from the block range list.\r
 \r
@@ -100,13 +96,12 @@ Mtftp6SetLastBlockNum (
 **/\r
 EFI_STATUS\r
 Mtftp6RemoveBlockNum (\r
-  IN LIST_ENTRY             *Head,\r
-  IN UINT16                 Num,\r
-  IN BOOLEAN                Completed,\r
-  OUT UINT64                *BlockCounter\r
+  IN LIST_ENTRY  *Head,\r
+  IN UINT16      Num,\r
+  IN BOOLEAN     Completed,\r
+  OUT UINT64     *BlockCounter\r
   );\r
 \r
-\r
 /**\r
   Build and transmit the request packet for the Mtftp6 instance.\r
 \r
@@ -120,11 +115,10 @@ Mtftp6RemoveBlockNum (
 **/\r
 EFI_STATUS\r
 Mtftp6SendRequest (\r
-  IN MTFTP6_INSTANCE        *Instance,\r
-  IN UINT16                 Operation\r
+  IN MTFTP6_INSTANCE  *Instance,\r
+  IN UINT16           Operation\r
   );\r
 \r
-\r
 /**\r
   Build and send an error packet.\r
 \r
@@ -139,12 +133,11 @@ Mtftp6SendRequest (
 **/\r
 EFI_STATUS\r
 Mtftp6SendError (\r
-  IN MTFTP6_INSTANCE        *Instance,\r
-  IN UINT16                 ErrCode,\r
-  IN UINT8*                 ErrInfo\r
+  IN MTFTP6_INSTANCE  *Instance,\r
+  IN UINT16           ErrCode,\r
+  IN UINT8            *ErrInfo\r
   );\r
 \r
-\r
 /**\r
   Send the packet for the Mtftp6 instance.\r
 \r
@@ -157,11 +150,10 @@ Mtftp6SendError (
 **/\r
 EFI_STATUS\r
 Mtftp6TransmitPacket (\r
-  IN MTFTP6_INSTANCE        *Instance,\r
-  IN NET_BUF                *Packet\r
+  IN MTFTP6_INSTANCE  *Instance,\r
+  IN NET_BUF          *Packet\r
   );\r
 \r
-\r
 /**\r
   Check packet for GetInfo callback routine.\r
 \r
@@ -177,13 +169,12 @@ Mtftp6TransmitPacket (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp6CheckPacket (\r
-  IN EFI_MTFTP6_PROTOCOL    *This,\r
-  IN EFI_MTFTP6_TOKEN       *Token,\r
-  IN UINT16                 PacketLen,\r
-  IN EFI_MTFTP6_PACKET      *Packet\r
+  IN EFI_MTFTP6_PROTOCOL  *This,\r
+  IN EFI_MTFTP6_TOKEN     *Token,\r
+  IN UINT16               PacketLen,\r
+  IN EFI_MTFTP6_PACKET    *Packet\r
   );\r
 \r
-\r
 /**\r
   The dummy configure routine for create a new Udp6 Io.\r
 \r
@@ -196,11 +187,10 @@ Mtftp6CheckPacket (
 EFI_STATUS\r
 EFIAPI\r
 Mtftp6ConfigDummyUdpIo (\r
-  IN UDP_IO                 *UdpIo,\r
-  IN VOID                   *Context\r
+  IN UDP_IO  *UdpIo,\r
+  IN VOID    *Context\r
   );\r
 \r
-\r
 /**\r
   The configure routine for the Mtftp6 instance to transmit/receive.\r
 \r
@@ -217,14 +207,13 @@ Mtftp6ConfigDummyUdpIo (
 **/\r
 EFI_STATUS\r
 Mtftp6ConfigUdpIo (\r
-  IN UDP_IO                 *UdpIo,\r
-  IN EFI_IPv6_ADDRESS       *ServerIp,\r
-  IN UINT16                 ServerPort,\r
-  IN EFI_IPv6_ADDRESS       *LocalIp,\r
-  IN UINT16                 LocalPort\r
+  IN UDP_IO            *UdpIo,\r
+  IN EFI_IPv6_ADDRESS  *ServerIp,\r
+  IN UINT16            ServerPort,\r
+  IN EFI_IPv6_ADDRESS  *LocalIp,\r
+  IN UINT16            LocalPort\r
   );\r
 \r
-\r
 /**\r
   Clean up the current Mtftp6 operation.\r
 \r
@@ -234,11 +223,10 @@ Mtftp6ConfigUdpIo (
 **/\r
 VOID\r
 Mtftp6OperationClean (\r
-  IN MTFTP6_INSTANCE        *Instance,\r
-  IN EFI_STATUS             Result\r
+  IN MTFTP6_INSTANCE  *Instance,\r
+  IN EFI_STATUS       Result\r
   );\r
 \r
-\r
 /**\r
   Start the Mtftp6 instance to perform the operation, such as read file,\r
   write file, and read directory.\r
@@ -255,12 +243,11 @@ Mtftp6OperationClean (
 **/\r
 EFI_STATUS\r
 Mtftp6OperationStart (\r
-  IN EFI_MTFTP6_PROTOCOL    *This,\r
-  IN EFI_MTFTP6_TOKEN       *Token,\r
-  IN UINT16                 OpCode\r
+  IN EFI_MTFTP6_PROTOCOL  *This,\r
+  IN EFI_MTFTP6_TOKEN     *Token,\r
+  IN UINT16               OpCode\r
   );\r
 \r
-\r
 /**\r
   The timer ticking routine for the Mtftp6 instance.\r
 \r
@@ -271,11 +258,10 @@ Mtftp6OperationStart (
 VOID\r
 EFIAPI\r
 Mtftp6OnTimerTick (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
-\r
 /**\r
   The packet process callback for Mtftp6 upload.\r
 \r
@@ -288,13 +274,12 @@ Mtftp6OnTimerTick (
 VOID\r
 EFIAPI\r
 Mtftp6WrqInput (\r
-  IN NET_BUF                *UdpPacket,\r
-  IN UDP_END_POINT          *UdpEpt,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN VOID                   *Context\r
+  IN NET_BUF        *UdpPacket,\r
+  IN UDP_END_POINT  *UdpEpt,\r
+  IN EFI_STATUS     IoStatus,\r
+  IN VOID           *Context\r
   );\r
 \r
-\r
 /**\r
   Start the Mtftp6 instance to upload. It will first init some states,\r
   then send the WRQ request packet, and start to receive the packet.\r
@@ -308,11 +293,10 @@ Mtftp6WrqInput (
 **/\r
 EFI_STATUS\r
 Mtftp6WrqStart (\r
-  IN MTFTP6_INSTANCE        *Instance,\r
-  IN UINT16                 Operation\r
+  IN MTFTP6_INSTANCE  *Instance,\r
+  IN UINT16           Operation\r
   );\r
 \r
-\r
 /**\r
   The packet process callback for Mtftp6 download.\r
 \r
@@ -325,13 +309,12 @@ Mtftp6WrqStart (
 VOID\r
 EFIAPI\r
 Mtftp6RrqInput (\r
-  IN NET_BUF                *UdpPacket,\r
-  IN UDP_END_POINT          *UdpEpt,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN VOID                   *Context\r
+  IN NET_BUF        *UdpPacket,\r
+  IN UDP_END_POINT  *UdpEpt,\r
+  IN EFI_STATUS     IoStatus,\r
+  IN VOID           *Context\r
   );\r
 \r
-\r
 /**\r
   Start the Mtftp6 instance to download. It first initializes some\r
   of the internal states then builds and sends an RRQ request packet.\r
@@ -346,8 +329,8 @@ Mtftp6RrqInput (
 **/\r
 EFI_STATUS\r
 Mtftp6RrqStart (\r
-  IN MTFTP6_INSTANCE        *Instance,\r
-  IN UINT16                 Operation\r
+  IN MTFTP6_INSTANCE  *Instance,\r
+  IN UINT16           Operation\r
   );\r
 \r
 #endif\r
index 1ccdc6e32b62d03c519592ddc64154d456192cb4..cf1e909d3ff4ddd70316f5b5925e904fde9ed31d 100644 (file)
@@ -9,8 +9,6 @@
 \r
 #include "Mtftp6Impl.h"\r
 \r
-\r
-\r
 /**\r
   Build and send a Mtftp6 data packet for upload.\r
 \r
 **/\r
 EFI_STATUS\r
 Mtftp6WrqSendBlock (\r
-  IN MTFTP6_INSTANCE        *Instance,\r
-  IN UINT16                 BlockNum\r
+  IN MTFTP6_INSTANCE  *Instance,\r
+  IN UINT16           BlockNum\r
   )\r
 {\r
-  EFI_MTFTP6_PACKET         *Packet;\r
-  EFI_MTFTP6_TOKEN          *Token;\r
-  NET_BUF                   *UdpPacket;\r
-  EFI_STATUS                Status;\r
-  UINT16                    DataLen;\r
-  UINT8                     *DataBuf;\r
-  UINT64                    Start;\r
+  EFI_MTFTP6_PACKET  *Packet;\r
+  EFI_MTFTP6_TOKEN   *Token;\r
+  NET_BUF            *UdpPacket;\r
+  EFI_STATUS         Status;\r
+  UINT16             DataLen;\r
+  UINT8              *DataBuf;\r
+  UINT64             Start;\r
 \r
   //\r
   // Allocate net buffer to create data packet.\r
@@ -45,11 +43,11 @@ Mtftp6WrqSendBlock (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Packet = (EFI_MTFTP6_PACKET *) NetbufAllocSpace (\r
-                                   UdpPacket,\r
-                                   MTFTP6_DATA_HEAD_LEN,\r
-                                   FALSE\r
-                                   );\r
+  Packet = (EFI_MTFTP6_PACKET *)NetbufAllocSpace (\r
+                                  UdpPacket,\r
+                                  MTFTP6_DATA_HEAD_LEN,\r
+                                  FALSE\r
+                                  );\r
   ASSERT (Packet != NULL);\r
 \r
   Packet->Data.OpCode = HTONS (EFI_MTFTP6_OPCODE_DATA);\r
@@ -65,34 +63,34 @@ Mtftp6WrqSendBlock (
     Start = MultU64x32 (BlockNum - 1, Instance->BlkSize);\r
 \r
     if (Token->BufferSize < Start + Instance->BlkSize) {\r
-      DataLen           = (UINT16) (Token->BufferSize - Start);\r
+      DataLen           = (UINT16)(Token->BufferSize - Start);\r
       Instance->LastBlk = BlockNum;\r
       Mtftp6SetLastBlockNum (&Instance->BlkList, BlockNum);\r
     }\r
 \r
     if (DataLen > 0) {\r
       NetbufAllocSpace (UdpPacket, DataLen, FALSE);\r
-      CopyMem (Packet->Data.Data, (UINT8 *) Token->Buffer + Start, DataLen);\r
+      CopyMem (Packet->Data.Data, (UINT8 *)Token->Buffer + Start, DataLen);\r
     }\r
-\r
   } else {\r
     //\r
     // Get data from PacketNeeded\r
     //\r
     DataBuf = NULL;\r
-    Status  = Token->PacketNeeded (&Instance->Mtftp6, Token, &DataLen, (VOID*) &DataBuf);\r
+    Status  = Token->PacketNeeded (&Instance->Mtftp6, Token, &DataLen, (VOID *)&DataBuf);\r
 \r
     if (EFI_ERROR (Status) || (DataLen > Instance->BlkSize)) {\r
       if (DataBuf != NULL) {\r
         gBS->FreePool (DataBuf);\r
       }\r
+\r
       //\r
       // The received packet has already been freed.\r
       //\r
       Mtftp6SendError (\r
         Instance,\r
         EFI_MTFTP6_ERRORCODE_REQUEST_DENIED,\r
-        (UINT8 *) "User aborted the transfer"\r
+        (UINT8 *)"User aborted the transfer"\r
         );\r
 \r
       return EFI_ABORTED;\r
@@ -118,7 +116,6 @@ Mtftp6WrqSendBlock (
   return Mtftp6TransmitPacket (Instance, UdpPacket);\r
 }\r
 \r
-\r
 /**\r
   Function to handle received ACK packet. If the ACK number matches the\r
   expected block number, with more data pending, send the next\r
@@ -138,16 +135,16 @@ Mtftp6WrqSendBlock (
 **/\r
 EFI_STATUS\r
 Mtftp6WrqHandleAck (\r
-  IN  MTFTP6_INSTANCE       *Instance,\r
-  IN  EFI_MTFTP6_PACKET     *Packet,\r
-  IN  UINT32                Len,\r
-  OUT NET_BUF               **UdpPacket,\r
-  OUT BOOLEAN               *IsCompleted\r
+  IN  MTFTP6_INSTANCE    *Instance,\r
+  IN  EFI_MTFTP6_PACKET  *Packet,\r
+  IN  UINT32             Len,\r
+  OUT NET_BUF            **UdpPacket,\r
+  OUT BOOLEAN            *IsCompleted\r
   )\r
 {\r
-  UINT16                    AckNum;\r
-  INTN                      Expected;\r
-  UINT64                    BlockCounter;\r
+  UINT16  AckNum;\r
+  INTN    Expected;\r
+  UINT64  BlockCounter;\r
 \r
   *IsCompleted = FALSE;\r
   AckNum       = NTOHS (Packet->Ack.Block[0]);\r
@@ -182,7 +179,6 @@ Mtftp6WrqHandleAck (
       ASSERT (Instance->LastBlk >= 1);\r
       *IsCompleted = TRUE;\r
       return EFI_SUCCESS;\r
-\r
     } else {\r
       //\r
       // Free the received packet before send new packet in ReceiveNotify,\r
@@ -196,7 +192,7 @@ Mtftp6WrqHandleAck (
       Mtftp6SendError (\r
         Instance,\r
         EFI_MTFTP6_ERRORCODE_REQUEST_DENIED,\r
-        (UINT8 *) "Block number rolls back, not supported, try blksize option"\r
+        (UINT8 *)"Block number rolls back, not supported, try blksize option"\r
         );\r
 \r
       return EFI_TFTP_ERROR;\r
@@ -210,10 +206,9 @@ Mtftp6WrqHandleAck (
   NetbufFree (*UdpPacket);\r
   *UdpPacket = NULL;\r
 \r
-  return Mtftp6WrqSendBlock (Instance, (UINT16) Expected);\r
+  return Mtftp6WrqSendBlock (Instance, (UINT16)Expected);\r
 }\r
 \r
-\r
 /**\r
   Check whether the received OACK is valid. The OACK is valid\r
   only if:\r
@@ -231,8 +226,8 @@ Mtftp6WrqHandleAck (
 **/\r
 BOOLEAN\r
 Mtftp6WrqOackValid (\r
-  IN MTFTP6_EXT_OPTION_INFO     *ReplyInfo,\r
-  IN MTFTP6_EXT_OPTION_INFO     *RequestInfo\r
+  IN MTFTP6_EXT_OPTION_INFO  *ReplyInfo,\r
+  IN MTFTP6_EXT_OPTION_INFO  *RequestInfo\r
   )\r
 {\r
   //\r
@@ -248,15 +243,14 @@ Mtftp6WrqOackValid (
   //\r
   if ((((ReplyInfo->BitMap & MTFTP6_OPT_BLKSIZE_BIT) != 0) && (ReplyInfo->BlkSize > RequestInfo->BlkSize)) ||\r
       (((ReplyInfo->BitMap & MTFTP6_OPT_TIMEOUT_BIT) != 0) && (ReplyInfo->Timeout != RequestInfo->Timeout))\r
-      ) {\r
-\r
+      )\r
+  {\r
     return FALSE;\r
   }\r
 \r
   return TRUE;\r
 }\r
 \r
-\r
 /**\r
   Process the OACK packet for Wrq.\r
 \r
@@ -274,22 +268,22 @@ Mtftp6WrqOackValid (
 **/\r
 EFI_STATUS\r
 Mtftp6WrqHandleOack (\r
-  IN  MTFTP6_INSTANCE       *Instance,\r
-  IN  EFI_MTFTP6_PACKET     *Packet,\r
-  IN  UINT32                Len,\r
-  OUT NET_BUF               **UdpPacket,\r
-  OUT BOOLEAN               *IsCompleted\r
+  IN  MTFTP6_INSTANCE    *Instance,\r
+  IN  EFI_MTFTP6_PACKET  *Packet,\r
+  IN  UINT32             Len,\r
+  OUT NET_BUF            **UdpPacket,\r
+  OUT BOOLEAN            *IsCompleted\r
   )\r
 {\r
-  EFI_MTFTP6_OPTION         *Options;\r
-  UINT32                    Count;\r
-  MTFTP6_EXT_OPTION_INFO    ExtInfo;\r
-  EFI_MTFTP6_PACKET         Dummy;\r
-  EFI_STATUS                Status;\r
-  INTN                      Expected;\r
+  EFI_MTFTP6_OPTION       *Options;\r
+  UINT32                  Count;\r
+  MTFTP6_EXT_OPTION_INFO  ExtInfo;\r
+  EFI_MTFTP6_PACKET       Dummy;\r
+  EFI_STATUS              Status;\r
+  INTN                    Expected;\r
 \r
   *IsCompleted = FALSE;\r
-  Options = NULL;\r
+  Options      = NULL;\r
 \r
   //\r
   // Ignore the OACK if already started the upload\r
@@ -310,11 +304,12 @@ Mtftp6WrqHandleOack (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   ASSERT (Options != NULL);\r
 \r
   Status = Mtftp6ParseExtensionOption (Options, Count, FALSE, Instance->Operation, &ExtInfo);\r
 \r
-  if (EFI_ERROR(Status) || !Mtftp6WrqOackValid (&ExtInfo, &Instance->ExtInfo)) {\r
+  if (EFI_ERROR (Status) || !Mtftp6WrqOackValid (&ExtInfo, &Instance->ExtInfo)) {\r
     //\r
     // Don't send a MTFTP error packet when out of resource, it can\r
     // only make it worse.\r
@@ -332,7 +327,7 @@ Mtftp6WrqHandleOack (
       Mtftp6SendError (\r
         Instance,\r
         EFI_MTFTP6_ERRORCODE_ILLEGAL_OPERATION,\r
-        (UINT8 *) "Malformatted OACK packet"\r
+        (UINT8 *)"Malformatted OACK packet"\r
         );\r
     }\r
 \r
@@ -363,7 +358,6 @@ Mtftp6WrqHandleOack (
            );\r
 }\r
 \r
-\r
 /**\r
   The packet process callback for Mtftp6 upload.\r
 \r
@@ -376,21 +370,21 @@ Mtftp6WrqHandleOack (
 VOID\r
 EFIAPI\r
 Mtftp6WrqInput (\r
-  IN NET_BUF                *UdpPacket,\r
-  IN UDP_END_POINT          *UdpEpt,\r
-  IN EFI_STATUS             IoStatus,\r
-  IN VOID                   *Context\r
+  IN NET_BUF        *UdpPacket,\r
+  IN UDP_END_POINT  *UdpEpt,\r
+  IN EFI_STATUS     IoStatus,\r
+  IN VOID           *Context\r
   )\r
 {\r
-  MTFTP6_INSTANCE           *Instance;\r
-  EFI_MTFTP6_PACKET         *Packet;\r
-  BOOLEAN                   IsCompleted;\r
-  EFI_STATUS                Status;\r
-  UINT32                    TotalNum;\r
-  UINT32                    Len;\r
-  UINT16                    Opcode;\r
+  MTFTP6_INSTANCE    *Instance;\r
+  EFI_MTFTP6_PACKET  *Packet;\r
+  BOOLEAN            IsCompleted;\r
+  EFI_STATUS         Status;\r
+  UINT32             TotalNum;\r
+  UINT32             Len;\r
+  UINT16             Opcode;\r
 \r
-  Instance = (MTFTP6_INSTANCE *) Context;\r
+  Instance = (MTFTP6_INSTANCE *)Context;\r
 \r
   NET_CHECK_SIGNATURE (Instance, MTFTP6_INSTANCE_SIGNATURE);\r
 \r
@@ -439,10 +433,9 @@ Mtftp6WrqInput (
       goto ON_EXIT;\r
     }\r
 \r
-    NetbufCopy (UdpPacket, 0, Len, (UINT8 *) Packet);\r
-\r
+    NetbufCopy (UdpPacket, 0, Len, (UINT8 *)Packet);\r
   } else {\r
-    Packet = (EFI_MTFTP6_PACKET *) NetbufGetByte (UdpPacket, 0, NULL);\r
+    Packet = (EFI_MTFTP6_PACKET *)NetbufGetByte (UdpPacket, 0, NULL);\r
     ASSERT (Packet != NULL);\r
   }\r
 \r
@@ -452,14 +445,14 @@ Mtftp6WrqInput (
   // Callback to the user's CheckPacket if provided. Abort the transmission\r
   // if CheckPacket returns an EFI_ERROR code.\r
   //\r
-  if (Instance->Token->CheckPacket != NULL &&\r
-      (Opcode == EFI_MTFTP6_OPCODE_OACK || Opcode == EFI_MTFTP6_OPCODE_ERROR)\r
-      ) {\r
-\r
+  if ((Instance->Token->CheckPacket != NULL) &&\r
+      ((Opcode == EFI_MTFTP6_OPCODE_OACK) || (Opcode == EFI_MTFTP6_OPCODE_ERROR))\r
+      )\r
+  {\r
     Status = Instance->Token->CheckPacket (\r
                                 &Instance->Mtftp6,\r
                                 Instance->Token,\r
-                                (UINT16) Len,\r
+                                (UINT16)Len,\r
                                 Packet\r
                                 );\r
 \r
@@ -480,7 +473,7 @@ Mtftp6WrqInput (
         Mtftp6SendError (\r
           Instance,\r
           EFI_MTFTP6_ERRORCODE_REQUEST_DENIED,\r
-          (UINT8 *) "User aborted the transfer"\r
+          (UINT8 *)"User aborted the transfer"\r
           );\r
       }\r
 \r
@@ -493,32 +486,34 @@ Mtftp6WrqInput (
   // Switch the process routines by the operation code.\r
   //\r
   switch (Opcode) {\r
-  case EFI_MTFTP6_OPCODE_ACK:\r
-    if (Len != MTFTP6_OPCODE_LEN + MTFTP6_BLKNO_LEN) {\r
-      goto ON_EXIT;\r
-    }\r
-    //\r
-    // Handle the Ack packet of Wrq.\r
-    //\r
-    Status = Mtftp6WrqHandleAck (Instance, Packet, Len, &UdpPacket, &IsCompleted);\r
-    break;\r
+    case EFI_MTFTP6_OPCODE_ACK:\r
+      if (Len != MTFTP6_OPCODE_LEN + MTFTP6_BLKNO_LEN) {\r
+        goto ON_EXIT;\r
+      }\r
 \r
-  case EFI_MTFTP6_OPCODE_OACK:\r
-    if (Len <= MTFTP6_OPCODE_LEN) {\r
-      goto ON_EXIT;\r
-    }\r
-    //\r
-    // Handle the Oack packet of Wrq.\r
-    //\r
-    Status = Mtftp6WrqHandleOack (Instance, Packet, Len, &UdpPacket, &IsCompleted);\r
-    break;\r
+      //\r
+      // Handle the Ack packet of Wrq.\r
+      //\r
+      Status = Mtftp6WrqHandleAck (Instance, Packet, Len, &UdpPacket, &IsCompleted);\r
+      break;\r
 \r
-  default:\r
-    //\r
-    // Drop and return eror if received error message.\r
-    //\r
-    Status = EFI_TFTP_ERROR;\r
-    break;\r
+    case EFI_MTFTP6_OPCODE_OACK:\r
+      if (Len <= MTFTP6_OPCODE_LEN) {\r
+        goto ON_EXIT;\r
+      }\r
+\r
+      //\r
+      // Handle the Oack packet of Wrq.\r
+      //\r
+      Status = Mtftp6WrqHandleOack (Instance, Packet, Len, &UdpPacket, &IsCompleted);\r
+      break;\r
+\r
+    default:\r
+      //\r
+      // Drop and return eror if received error message.\r
+      //\r
+      Status = EFI_TFTP_ERROR;\r
+      break;\r
   }\r
 \r
 ON_EXIT:\r
@@ -526,7 +521,7 @@ ON_EXIT:
   // Free the resources, then if !EFI_ERROR (Status) and not completed,\r
   // restart the receive, otherwise end the session.\r
   //\r
-  if (Packet != NULL && TotalNum > 1) {\r
+  if ((Packet != NULL) && (TotalNum > 1)) {\r
     FreePool (Packet);\r
   }\r
 \r
@@ -542,6 +537,7 @@ ON_EXIT:
                0\r
                );\r
   }\r
+\r
   //\r
   // Clean up the current session if failed to continue.\r
   //\r
@@ -550,7 +546,6 @@ ON_EXIT:
   }\r
 }\r
 \r
-\r
 /**\r
   Start the Mtftp6 instance to upload. It will first init some states,\r
   then send the WRQ request packet, and start to receive the packet.\r
@@ -564,11 +559,11 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 Mtftp6WrqStart (\r
-  IN MTFTP6_INSTANCE        *Instance,\r
-  IN UINT16                 Operation\r
+  IN MTFTP6_INSTANCE  *Instance,\r
+  IN UINT16           Operation\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // The valid block number range are [0, 0xffff]. For example:\r
@@ -595,4 +590,3 @@ Mtftp6WrqStart (
            0\r
            );\r
 }\r
-\r
index 1b70b935d017fe9397af613b7d2241fcabadcb49..4b1f85cdee125b20c228c9ff333884c1bc705dfe 100644 (file)
@@ -28,13 +28,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 VOID\r
 EFIAPI\r
 SnpUndi32CallbackBlock (\r
-  IN UINT64 UniqueId,\r
-  IN UINT32 Enable\r
+  IN UINT64  UniqueId,\r
+  IN UINT32  Enable\r
   )\r
 {\r
   SNP_DRIVER  *Snp;\r
 \r
-  Snp = (SNP_DRIVER *) (UINTN) UniqueId;\r
+  Snp = (SNP_DRIVER *)(UINTN)UniqueId;\r
   //\r
   // tcpip was calling snp at tpl_notify and when we acquire a lock that was\r
   // created at a lower level (TPL_CALLBACK) it gives an assert!\r
@@ -60,12 +60,12 @@ SnpUndi32CallbackBlock (
 VOID\r
 EFIAPI\r
 SnpUndi32CallbackDelay (\r
-  IN UINT64 UniqueId,\r
-  IN UINT64 MicroSeconds\r
+  IN UINT64  UniqueId,\r
+  IN UINT64  MicroSeconds\r
   )\r
 {\r
   if (MicroSeconds != 0) {\r
-    gBS->Stall ((UINTN) MicroSeconds);\r
+    gBS->Stall ((UINTN)MicroSeconds);\r
   }\r
 }\r
 \r
@@ -87,92 +87,96 @@ SnpUndi32CallbackDelay (
 VOID\r
 EFIAPI\r
 SnpUndi32CallbackMemio (\r
-  IN UINT64     UniqueId,\r
-  IN UINT8      ReadOrWrite,\r
-  IN UINT8      NumBytes,\r
-  IN UINT64     MemOrPortAddr,\r
-  IN OUT UINT64 BufferPtr\r
+  IN UINT64      UniqueId,\r
+  IN UINT8       ReadOrWrite,\r
+  IN UINT8       NumBytes,\r
+  IN UINT64      MemOrPortAddr,\r
+  IN OUT UINT64  BufferPtr\r
   )\r
 {\r
-  SNP_DRIVER                *Snp;\r
-  EFI_PCI_IO_PROTOCOL_WIDTH Width;\r
+  SNP_DRIVER                 *Snp;\r
+  EFI_PCI_IO_PROTOCOL_WIDTH  Width;\r
 \r
-  Snp   = (SNP_DRIVER *) (UINTN) UniqueId;\r
+  Snp = (SNP_DRIVER *)(UINTN)UniqueId;\r
 \r
-  Width = (EFI_PCI_IO_PROTOCOL_WIDTH) 0;\r
+  Width = (EFI_PCI_IO_PROTOCOL_WIDTH)0;\r
   switch (NumBytes) {\r
-  case 2:\r
-    Width = (EFI_PCI_IO_PROTOCOL_WIDTH) 1;\r
-    break;\r
+    case 2:\r
+      Width = (EFI_PCI_IO_PROTOCOL_WIDTH)1;\r
+      break;\r
 \r
-  case 4:\r
-    Width = (EFI_PCI_IO_PROTOCOL_WIDTH) 2;\r
-    break;\r
+    case 4:\r
+      Width = (EFI_PCI_IO_PROTOCOL_WIDTH)2;\r
+      break;\r
 \r
-  case 8:\r
-    Width = (EFI_PCI_IO_PROTOCOL_WIDTH) 3;\r
-    break;\r
+    case 8:\r
+      Width = (EFI_PCI_IO_PROTOCOL_WIDTH)3;\r
+      break;\r
   }\r
 \r
   switch (ReadOrWrite) {\r
-  case PXE_IO_READ:\r
-    ASSERT (Snp->IoBarIndex < PCI_MAX_BAR);\r
-    if (Snp->IoBarIndex < PCI_MAX_BAR) {\r
-      Snp->PciIo->Io.Read (\r
-                       Snp->PciIo,\r
-                       Width,\r
-                       Snp->IoBarIndex,      // BAR 1 (for 32bit regs), IO base address\r
-                       MemOrPortAddr,\r
-                       1,                    // count\r
-                       (VOID *) (UINTN) BufferPtr\r
-                       );\r
-    }\r
-    break;\r
-\r
-  case PXE_IO_WRITE:\r
-    ASSERT (Snp->IoBarIndex < PCI_MAX_BAR);\r
-    if (Snp->IoBarIndex < PCI_MAX_BAR) {\r
-      Snp->PciIo->Io.Write (\r
-                       Snp->PciIo,\r
-                       Width,\r
-                       Snp->IoBarIndex,      // BAR 1 (for 32bit regs), IO base address\r
-                       MemOrPortAddr,\r
-                       1,                    // count\r
-                       (VOID *) (UINTN) BufferPtr\r
-                       );\r
-    }\r
-    break;\r
-\r
-  case PXE_MEM_READ:\r
-    ASSERT (Snp->MemoryBarIndex < PCI_MAX_BAR);\r
-    if (Snp->MemoryBarIndex < PCI_MAX_BAR) {\r
-      Snp->PciIo->Mem.Read (\r
-                        Snp->PciIo,\r
-                        Width,\r
-                        Snp->MemoryBarIndex,  // BAR 0, Memory base address\r
-                        MemOrPortAddr,\r
-                        1,                    // count\r
-                        (VOID *) (UINTN) BufferPtr\r
-                        );\r
-    }\r
-    break;\r
-\r
-  case PXE_MEM_WRITE:\r
-    ASSERT (Snp->MemoryBarIndex < PCI_MAX_BAR);\r
-    if (Snp->MemoryBarIndex < PCI_MAX_BAR) {\r
-      Snp->PciIo->Mem.Write (\r
-                        Snp->PciIo,\r
-                        Width,\r
-                        Snp->MemoryBarIndex,  // BAR 0, Memory base address\r
-                        MemOrPortAddr,\r
-                        1,                    // count\r
-                        (VOID *) (UINTN) BufferPtr\r
-                        );\r
-    }\r
-    break;\r
+    case PXE_IO_READ:\r
+      ASSERT (Snp->IoBarIndex < PCI_MAX_BAR);\r
+      if (Snp->IoBarIndex < PCI_MAX_BAR) {\r
+        Snp->PciIo->Io.Read (\r
+                         Snp->PciIo,\r
+                         Width,\r
+                         Snp->IoBarIndex,    // BAR 1 (for 32bit regs), IO base address\r
+                         MemOrPortAddr,\r
+                         1,                  // count\r
+                         (VOID *)(UINTN)BufferPtr\r
+                         );\r
+      }\r
+\r
+      break;\r
+\r
+    case PXE_IO_WRITE:\r
+      ASSERT (Snp->IoBarIndex < PCI_MAX_BAR);\r
+      if (Snp->IoBarIndex < PCI_MAX_BAR) {\r
+        Snp->PciIo->Io.Write (\r
+                         Snp->PciIo,\r
+                         Width,\r
+                         Snp->IoBarIndex,    // BAR 1 (for 32bit regs), IO base address\r
+                         MemOrPortAddr,\r
+                         1,                  // count\r
+                         (VOID *)(UINTN)BufferPtr\r
+                         );\r
+      }\r
+\r
+      break;\r
+\r
+    case PXE_MEM_READ:\r
+      ASSERT (Snp->MemoryBarIndex < PCI_MAX_BAR);\r
+      if (Snp->MemoryBarIndex < PCI_MAX_BAR) {\r
+        Snp->PciIo->Mem.Read (\r
+                          Snp->PciIo,\r
+                          Width,\r
+                          Snp->MemoryBarIndex, // BAR 0, Memory base address\r
+                          MemOrPortAddr,\r
+                          1,                  // count\r
+                          (VOID *)(UINTN)BufferPtr\r
+                          );\r
+      }\r
+\r
+      break;\r
+\r
+    case PXE_MEM_WRITE:\r
+      ASSERT (Snp->MemoryBarIndex < PCI_MAX_BAR);\r
+      if (Snp->MemoryBarIndex < PCI_MAX_BAR) {\r
+        Snp->PciIo->Mem.Write (\r
+                          Snp->PciIo,\r
+                          Width,\r
+                          Snp->MemoryBarIndex, // BAR 0, Memory base address\r
+                          MemOrPortAddr,\r
+                          1,                  // count\r
+                          (VOID *)(UINTN)BufferPtr\r
+                          );\r
+      }\r
+\r
+      break;\r
   }\r
 \r
-  return ;\r
+  return;\r
 }\r
 \r
 /**\r
@@ -193,49 +197,50 @@ SnpUndi32CallbackMemio (
 VOID\r
 EFIAPI\r
 SnpUndi32CallbackMap (\r
-  IN UINT64     UniqueId,\r
-  IN UINT64     CpuAddr,\r
-  IN UINT32     NumBytes,\r
-  IN UINT32     Direction,\r
-  IN OUT UINT64 DeviceAddrPtr\r
+  IN UINT64      UniqueId,\r
+  IN UINT64      CpuAddr,\r
+  IN UINT32      NumBytes,\r
+  IN UINT32      Direction,\r
+  IN OUT UINT64  DeviceAddrPtr\r
   )\r
 {\r
-  EFI_PHYSICAL_ADDRESS          *DevAddrPtr;\r
-  EFI_PCI_IO_PROTOCOL_OPERATION DirectionFlag;\r
-  UINTN                         BuffSize;\r
-  SNP_DRIVER                    *Snp;\r
-  UINTN                         Index;\r
-  EFI_STATUS                    Status;\r
+  EFI_PHYSICAL_ADDRESS           *DevAddrPtr;\r
+  EFI_PCI_IO_PROTOCOL_OPERATION  DirectionFlag;\r
+  UINTN                          BuffSize;\r
+  SNP_DRIVER                     *Snp;\r
+  UINTN                          Index;\r
+  EFI_STATUS                     Status;\r
 \r
-  BuffSize    = (UINTN) NumBytes;\r
-  Snp         = (SNP_DRIVER *) (UINTN) UniqueId;\r
-  DevAddrPtr  = (EFI_PHYSICAL_ADDRESS *) (UINTN) DeviceAddrPtr;\r
+  BuffSize   = (UINTN)NumBytes;\r
+  Snp        = (SNP_DRIVER *)(UINTN)UniqueId;\r
+  DevAddrPtr = (EFI_PHYSICAL_ADDRESS *)(UINTN)DeviceAddrPtr;\r
 \r
   if (CpuAddr == 0) {\r
     *DevAddrPtr = 0;\r
-    return ;\r
+    return;\r
   }\r
 \r
   switch (Direction) {\r
-  case TO_AND_FROM_DEVICE:\r
-    DirectionFlag = EfiPciIoOperationBusMasterCommonBuffer;\r
-    break;\r
+    case TO_AND_FROM_DEVICE:\r
+      DirectionFlag = EfiPciIoOperationBusMasterCommonBuffer;\r
+      break;\r
 \r
-  case FROM_DEVICE:\r
-    DirectionFlag = EfiPciIoOperationBusMasterWrite;\r
-    break;\r
+    case FROM_DEVICE:\r
+      DirectionFlag = EfiPciIoOperationBusMasterWrite;\r
+      break;\r
 \r
-  case TO_DEVICE:\r
-    DirectionFlag = EfiPciIoOperationBusMasterRead;\r
-    break;\r
+    case TO_DEVICE:\r
+      DirectionFlag = EfiPciIoOperationBusMasterRead;\r
+      break;\r
 \r
-  default:\r
-    *DevAddrPtr = 0;\r
-    //\r
-    // any non zero indicates error!\r
-    //\r
-    return ;\r
+    default:\r
+      *DevAddrPtr = 0;\r
+      //\r
+      // any non zero indicates error!\r
+      //\r
+      return;\r
   }\r
+\r
   //\r
   // find an unused map_list entry\r
   //\r
@@ -248,15 +253,15 @@ SnpUndi32CallbackMap (
   if (Index >= MAX_MAP_LENGTH) {\r
     DEBUG ((DEBUG_INFO, "SNP maplist is FULL\n"));\r
     *DevAddrPtr = 0;\r
-    return ;\r
+    return;\r
   }\r
 \r
-  Snp->MapList[Index].VirtualAddress = (EFI_PHYSICAL_ADDRESS) CpuAddr;\r
+  Snp->MapList[Index].VirtualAddress = (EFI_PHYSICAL_ADDRESS)CpuAddr;\r
 \r
   Status = Snp->PciIo->Map (\r
                          Snp->PciIo,\r
                          DirectionFlag,\r
-                         (VOID *) (UINTN) CpuAddr,\r
+                         (VOID *)(UINTN)CpuAddr,\r
                          &BuffSize,\r
                          DevAddrPtr,\r
                          &(Snp->MapList[Index].MapCookie)\r
@@ -266,7 +271,7 @@ SnpUndi32CallbackMap (
     Snp->MapList[Index].VirtualAddress = 0;\r
   }\r
 \r
-  return ;\r
+  return;\r
 }\r
 \r
 /**\r
@@ -287,17 +292,17 @@ SnpUndi32CallbackMap (
 VOID\r
 EFIAPI\r
 SnpUndi32CallbackUnmap (\r
-  IN UINT64 UniqueId,\r
-  IN UINT64 CpuAddr,\r
-  IN UINT32 NumBytes,\r
-  IN UINT32 Direction,\r
-  IN UINT64 DeviceAddr\r
+  IN UINT64  UniqueId,\r
+  IN UINT64  CpuAddr,\r
+  IN UINT32  NumBytes,\r
+  IN UINT32  Direction,\r
+  IN UINT64  DeviceAddr\r
   )\r
 {\r
   SNP_DRIVER  *Snp;\r
   UINT16      Index;\r
 \r
-  Snp = (SNP_DRIVER *) (UINTN) UniqueId;\r
+  Snp = (SNP_DRIVER *)(UINTN)UniqueId;\r
 \r
   for (Index = 0; Index < MAX_MAP_LENGTH; Index++) {\r
     if (Snp->MapList[Index].VirtualAddress == CpuAddr) {\r
@@ -307,13 +312,13 @@ SnpUndi32CallbackUnmap (
 \r
   if (Index >= MAX_MAP_LENGTH) {\r
     DEBUG ((DEBUG_ERROR, "SNP could not find a mapping, failed to unmap.\n"));\r
-    return ;\r
+    return;\r
   }\r
 \r
   Snp->PciIo->Unmap (Snp->PciIo, Snp->MapList[Index].MapCookie);\r
   Snp->MapList[Index].VirtualAddress = 0;\r
   Snp->MapList[Index].MapCookie      = NULL;\r
-  return ;\r
+  return;\r
 }\r
 \r
 /**\r
@@ -341,27 +346,26 @@ SnpUndi32CallbackUnmap (
 VOID\r
 EFIAPI\r
 SnpUndi32CallbackSync (\r
-  IN UINT64             UniqueId,\r
-  IN UINT64             CpuAddr,\r
-  IN UINT32             NumBytes,\r
-  IN UINT32             Direction,\r
-  IN UINT64             DeviceAddr\r
+  IN UINT64  UniqueId,\r
+  IN UINT64  CpuAddr,\r
+  IN UINT32  NumBytes,\r
+  IN UINT32  Direction,\r
+  IN UINT64  DeviceAddr\r
   )\r
 {\r
   if ((CpuAddr == 0) || (DeviceAddr == 0) || (NumBytes == 0)) {\r
-    return ;\r
-\r
+    return;\r
   }\r
 \r
   switch (Direction) {\r
-  case FROM_DEVICE:\r
-    CopyMem ((UINT8 *) (UINTN) CpuAddr, (UINT8 *) (UINTN) DeviceAddr, NumBytes);\r
-    break;\r
+    case FROM_DEVICE:\r
+      CopyMem ((UINT8 *)(UINTN)CpuAddr, (UINT8 *)(UINTN)DeviceAddr, NumBytes);\r
+      break;\r
 \r
-  case TO_DEVICE:\r
-    CopyMem ((UINT8 *) (UINTN) DeviceAddr, (UINT8 *) (UINTN) CpuAddr, NumBytes);\r
-    break;\r
+    case TO_DEVICE:\r
+      CopyMem ((UINT8 *)(UINTN)DeviceAddr, (UINT8 *)(UINTN)CpuAddr, NumBytes);\r
+      break;\r
   }\r
 \r
-  return ;\r
+  return;\r
 }\r
index 2139e2a47f534c83f16269e0cfd6f5db1d5746ce..cc4cc5bddbc1e0cf535d3b5362f72da8253a54bf 100644 (file)
@@ -6,12 +6,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #include "Snp.h"\r
 \r
 //\r
 // EFI Component Name Functions\r
 //\r
+\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
 \r
@@ -59,7 +59,6 @@ SimpleNetworkComponentNameGetDriverName (
   OUT CHAR16                       **DriverName\r
   );\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r
   that is being managed by a driver.\r
@@ -131,14 +130,13 @@ SimpleNetworkComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 SimpleNetworkComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   );\r
 \r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
@@ -151,14 +149,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gSimpleNetworkCompone
 //\r
 // EFI Component Name 2 Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gSimpleNetworkComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) SimpleNetworkComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) SimpleNetworkComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gSimpleNetworkComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)SimpleNetworkComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)SimpleNetworkComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mSimpleNetworkDriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mSimpleNetworkDriverNameTable[] = {\r
   {\r
     "eng;en",\r
     L"Simple Network Protocol Driver"\r
@@ -169,7 +166,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mSimpleNetworkDriverNameT
   }\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE *gSimpleNetworkControllerNameTable = NULL;\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  *gSimpleNetworkControllerNameTable = NULL;\r
 \r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
@@ -239,19 +236,19 @@ SimpleNetworkComponentNameGetDriverName (
 **/\r
 EFI_STATUS\r
 UpdateName (\r
-  IN  EFI_SIMPLE_NETWORK_PROTOCOL   *Snp\r
+  IN  EFI_SIMPLE_NETWORK_PROTOCOL  *Snp\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  CHAR16                           HandleName[80];\r
-  UINTN                            OffSet;\r
-  UINTN                            Index;\r
+  EFI_STATUS  Status;\r
+  CHAR16      HandleName[80];\r
+  UINTN       OffSet;\r
+  UINTN       Index;\r
 \r
   if (Snp == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  OffSet = 0;\r
+  OffSet  = 0;\r
   OffSet += UnicodeSPrint (\r
               HandleName,\r
               sizeof (HandleName),\r
@@ -265,6 +262,7 @@ UpdateName (
                 Snp->Mode->CurrentAddress.Addr[Index]\r
                 );\r
   }\r
+\r
   ASSERT (OffSet > 0);\r
   //\r
   // Remove the last '-'\r
@@ -372,15 +370,15 @@ UpdateName (
 EFI_STATUS\r
 EFIAPI\r
 SimpleNetworkComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL   *Snp;\r
+  EFI_STATUS                   Status;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL  *Snp;\r
 \r
   if (ChildHandle != NULL) {\r
     return EFI_UNSUPPORTED;\r
@@ -412,6 +410,7 @@ SimpleNetworkComponentNameGetControllerName (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Update the component name for this child handle.\r
   //\r
index 616eb4aa6adaadb2d414ac7bd4c9e31ed5eae8c5..14b678fd364c9e93a6353c287b9b83ecd73d99ae 100644 (file)
@@ -28,21 +28,21 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 PxeGetStatus (\r
-  IN     SNP_DRIVER *Snp,\r
-     OUT UINT32     *InterruptStatusPtr,\r
-  IN     BOOLEAN    GetTransmittedBuf\r
+  IN     SNP_DRIVER  *Snp,\r
+  OUT UINT32         *InterruptStatusPtr,\r
+  IN     BOOLEAN     GetTransmittedBuf\r
   )\r
 {\r
-  PXE_DB_GET_STATUS *Db;\r
-  UINT16            InterruptFlags;\r
-  UINT32            Index;\r
-  UINT64            *Tmp;\r
+  PXE_DB_GET_STATUS  *Db;\r
+  UINT16             InterruptFlags;\r
+  UINT32             Index;\r
+  UINT64             *Tmp;\r
 \r
-  Tmp               = NULL;\r
-  Db                = Snp->Db;\r
-  Snp->Cdb.OpCode   = PXE_OPCODE_GET_STATUS;\r
+  Tmp             = NULL;\r
+  Db              = Snp->Db;\r
+  Snp->Cdb.OpCode = PXE_OPCODE_GET_STATUS;\r
 \r
-  Snp->Cdb.OpFlags  = 0;\r
+  Snp->Cdb.OpFlags = 0;\r
 \r
   if (GetTransmittedBuf) {\r
     Snp->Cdb.OpFlags |= PXE_OPFLAGS_GET_TRANSMITTED_BUFFERS;\r
@@ -57,39 +57,40 @@ PxeGetStatus (
     Snp->Cdb.OpFlags |= PXE_OPFLAGS_GET_MEDIA_STATUS;\r
   }\r
 \r
-  Snp->Cdb.CPBsize  = PXE_CPBSIZE_NOT_USED;\r
-  Snp->Cdb.CPBaddr  = PXE_CPBADDR_NOT_USED;\r
+  Snp->Cdb.CPBsize = PXE_CPBSIZE_NOT_USED;\r
+  Snp->Cdb.CPBaddr = PXE_CPBADDR_NOT_USED;\r
 \r
-  Snp->Cdb.DBsize     = (UINT16) sizeof (PXE_DB_GET_STATUS);\r
-  Snp->Cdb.DBaddr     = (UINT64)(UINTN) Db;\r
+  Snp->Cdb.DBsize = (UINT16)sizeof (PXE_DB_GET_STATUS);\r
+  Snp->Cdb.DBaddr = (UINT64)(UINTN)Db;\r
 \r
-  Snp->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  Snp->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
-  Snp->Cdb.IFnum      = Snp->IfNum;\r
-  Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+  Snp->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  Snp->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
+  Snp->Cdb.IFnum     = Snp->IfNum;\r
+  Snp->Cdb.Control   = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   //\r
   // Issue UNDI command and check result.\r
   //\r
   DEBUG ((DEBUG_NET, "\nSnp->undi.get_status()  "));\r
 \r
-  (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
+  (*Snp->IssueUndi32Command)((UINT64)(UINTN)&Snp->Cdb);\r
 \r
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r
     DEBUG (\r
       (DEBUG_NET,\r
-      "\nSnp->undi.get_status()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
+       "\nSnp->undi.get_status()  %xh:%xh\n",\r
+       Snp->Cdb.StatFlags,\r
+       Snp->Cdb.StatCode)\r
       );\r
 \r
     return EFI_DEVICE_ERROR;\r
   }\r
+\r
   //\r
   // report the values back..\r
   //\r
   if (InterruptStatusPtr != NULL) {\r
-    InterruptFlags      = (UINT16) (Snp->Cdb.StatFlags & PXE_STATFLAGS_GET_STATUS_INTERRUPT_MASK);\r
+    InterruptFlags = (UINT16)(Snp->Cdb.StatFlags & PXE_STATFLAGS_GET_STATUS_INTERRUPT_MASK);\r
 \r
     *InterruptStatusPtr = 0;\r
 \r
@@ -108,7 +109,6 @@ PxeGetStatus (
     if ((InterruptFlags & PXE_STATFLAGS_GET_STATUS_SOFTWARE) == PXE_STATFLAGS_GET_STATUS_SOFTWARE) {\r
       *InterruptStatusPtr |= EFI_SIMPLE_NETWORK_COMMAND_INTERRUPT;\r
     }\r
-\r
   }\r
 \r
   if (GetTransmittedBuf) {\r
@@ -125,15 +125,18 @@ PxeGetStatus (
             if ((Snp->MaxRecycledTxBuf + SNP_TX_BUFFER_INCREASEMENT) >= SNP_MAX_TX_BUFFER_NUM) {\r
               return EFI_DEVICE_ERROR;\r
             }\r
+\r
             Tmp = AllocatePool (sizeof (UINT64) * (Snp->MaxRecycledTxBuf + SNP_TX_BUFFER_INCREASEMENT));\r
             if (Tmp == NULL) {\r
               return EFI_DEVICE_ERROR;\r
             }\r
+\r
             CopyMem (Tmp, Snp->RecycledTxBuf, sizeof (UINT64) * Snp->RecycledTxBufCount);\r
             FreePool (Snp->RecycledTxBuf);\r
-            Snp->RecycledTxBuf    =  Tmp;\r
+            Snp->RecycledTxBuf     =  Tmp;\r
             Snp->MaxRecycledTxBuf += SNP_TX_BUFFER_INCREASEMENT;\r
           }\r
+\r
           Snp->RecycledTxBuf[Snp->RecycledTxBufCount] = Db->TxBuffer[Index];\r
           Snp->RecycledTxBufCount++;\r
         }\r
@@ -147,7 +150,7 @@ PxeGetStatus (
   //\r
   if (Snp->MediaStatusSupported) {\r
     Snp->Snp.Mode->MediaPresent =\r
-      (BOOLEAN) (((Snp->Cdb.StatFlags & PXE_STATFLAGS_GET_STATUS_NO_MEDIA) != 0) ? FALSE : TRUE);\r
+      (BOOLEAN)(((Snp->Cdb.StatFlags & PXE_STATFLAGS_GET_STATUS_NO_MEDIA) != 0) ? FALSE : TRUE);\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -194,9 +197,9 @@ PxeGetStatus (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32GetStatus (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  OUT UINT32                     *InterruptStatus  OPTIONAL,\r
-  OUT VOID                       **TxBuf           OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  OUT UINT32                      *InterruptStatus  OPTIONAL,\r
+  OUT VOID                        **TxBuf           OPTIONAL\r
   )\r
 {\r
   SNP_DRIVER  *Snp;\r
@@ -207,7 +210,7 @@ SnpUndi32GetStatus (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (InterruptStatus == NULL && TxBuf == NULL) {\r
+  if ((InterruptStatus == NULL) && (TxBuf == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -220,19 +223,19 @@ SnpUndi32GetStatus (
   }\r
 \r
   switch (Snp->Mode.State) {\r
-  case EfiSimpleNetworkInitialized:\r
-    break;\r
+    case EfiSimpleNetworkInitialized:\r
+      break;\r
 \r
-  case EfiSimpleNetworkStopped:\r
-    Status = EFI_NOT_STARTED;\r
-    goto ON_EXIT;\r
+    case EfiSimpleNetworkStopped:\r
+      Status = EFI_NOT_STARTED;\r
+      goto ON_EXIT;\r
 \r
-  default:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto ON_EXIT;\r
+    default:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto ON_EXIT;\r
   }\r
 \r
-  if (Snp->RecycledTxBufCount == 0 && TxBuf != NULL) {\r
+  if ((Snp->RecycledTxBufCount == 0) && (TxBuf != NULL)) {\r
     Status = PxeGetStatus (Snp, InterruptStatus, TRUE);\r
   } else {\r
     Status = PxeGetStatus (Snp, InterruptStatus, FALSE);\r
@@ -246,7 +249,7 @@ SnpUndi32GetStatus (
       *TxBuf = NULL;\r
     } else {\r
       Snp->RecycledTxBufCount--;\r
-      *TxBuf = (VOID *) (UINTN) Snp->RecycledTxBuf[Snp->RecycledTxBufCount];\r
+      *TxBuf = (VOID *)(UINTN)Snp->RecycledTxBuf[Snp->RecycledTxBufCount];\r
     }\r
   }\r
 \r
index 5ff9d72f1d7c99401351d9854fd2107929a8764f..c219a1cb20bc0774ccd44ec7848803f4e4e61e4d 100644 (file)
@@ -6,7 +6,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #include "Snp.h"\r
 \r
 /**\r
@@ -23,8 +22,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 PxeInit (\r
-  SNP_DRIVER *Snp,\r
-  UINT16     CableDetectFlag\r
+  SNP_DRIVER  *Snp,\r
+  UINT16      CableDetectFlag\r
   )\r
 {\r
   PXE_CPB_INITIALIZE  *Cpb;\r
@@ -47,9 +46,9 @@ PxeInit (
     if (Status != EFI_SUCCESS) {\r
       DEBUG (\r
         (DEBUG_ERROR,\r
-        "\nSnp->PxeInit()  AllocateBuffer  %xh (%r)\n",\r
-        Status,\r
-        Status)\r
+         "\nSnp->PxeInit()  AllocateBuffer  %xh (%r)\n",\r
+         Status,\r
+         Status)\r
         );\r
 \r
       return Status;\r
@@ -60,40 +59,40 @@ PxeInit (
     Snp->TxRxBuffer = Addr;\r
   }\r
 \r
-  Cpb->MemoryAddr   = (UINT64)(UINTN) Snp->TxRxBuffer;\r
+  Cpb->MemoryAddr = (UINT64)(UINTN)Snp->TxRxBuffer;\r
 \r
   Cpb->MemoryLength = Snp->TxRxBufferSize;\r
 \r
   //\r
   // let UNDI decide/detect these values\r
   //\r
-  Cpb->LinkSpeed      = 0;\r
-  Cpb->TxBufCnt       = 0;\r
-  Cpb->TxBufSize      = 0;\r
-  Cpb->RxBufCnt       = 0;\r
-  Cpb->RxBufSize      = 0;\r
+  Cpb->LinkSpeed = 0;\r
+  Cpb->TxBufCnt  = 0;\r
+  Cpb->TxBufSize = 0;\r
+  Cpb->RxBufCnt  = 0;\r
+  Cpb->RxBufSize = 0;\r
 \r
-  Cpb->DuplexMode         = PXE_DUPLEX_DEFAULT;\r
+  Cpb->DuplexMode = PXE_DUPLEX_DEFAULT;\r
 \r
-  Cpb->LoopBackMode       = LOOPBACK_NORMAL;\r
+  Cpb->LoopBackMode = LOOPBACK_NORMAL;\r
 \r
-  Snp->Cdb.OpCode     = PXE_OPCODE_INITIALIZE;\r
-  Snp->Cdb.OpFlags    = CableDetectFlag;\r
+  Snp->Cdb.OpCode  = PXE_OPCODE_INITIALIZE;\r
+  Snp->Cdb.OpFlags = CableDetectFlag;\r
 \r
-  Snp->Cdb.CPBsize    = (UINT16) sizeof (PXE_CPB_INITIALIZE);\r
-  Snp->Cdb.DBsize     = (UINT16) sizeof (PXE_DB_INITIALIZE);\r
+  Snp->Cdb.CPBsize = (UINT16)sizeof (PXE_CPB_INITIALIZE);\r
+  Snp->Cdb.DBsize  = (UINT16)sizeof (PXE_DB_INITIALIZE);\r
 \r
-  Snp->Cdb.CPBaddr    = (UINT64)(UINTN) Snp->Cpb;\r
-  Snp->Cdb.DBaddr     = (UINT64)(UINTN) Snp->Db;\r
+  Snp->Cdb.CPBaddr = (UINT64)(UINTN)Snp->Cpb;\r
+  Snp->Cdb.DBaddr  = (UINT64)(UINTN)Snp->Db;\r
 \r
-  Snp->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  Snp->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
-  Snp->Cdb.IFnum      = Snp->IfNum;\r
-  Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+  Snp->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  Snp->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
+  Snp->Cdb.IFnum     = Snp->IfNum;\r
+  Snp->Cdb.Control   = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   DEBUG ((DEBUG_NET, "\nSnp->undi.initialize()  "));\r
 \r
-  (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
+  (*Snp->IssueUndi32Command)((UINT64)(UINTN)&Snp->Cdb);\r
 \r
   //\r
   // There are two fields need to be checked here:\r
@@ -103,47 +102,47 @@ PxeInit (
   // the CDB.StatCode field contains the result of the command execution.\r
   //\r
   if ((((Snp->Cdb.StatFlags) & PXE_STATFLAGS_STATUS_MASK) == PXE_STATFLAGS_COMMAND_COMPLETE) &&\r
-      (Snp->Cdb.StatCode == PXE_STATCODE_SUCCESS)) {\r
+      (Snp->Cdb.StatCode == PXE_STATCODE_SUCCESS))\r
+  {\r
     //\r
     // If cable detect feature is enabled in CDB.OpFlags, check the CDB.StatFlags to see if there is an\r
     // active connection to this network device. If the no media StatFlag is set, the UNDI and network\r
     // device are still initialized.\r
     //\r
     if (CableDetectFlag == PXE_OPFLAGS_INITIALIZE_DETECT_CABLE) {\r
-      if(((Snp->Cdb.StatFlags) & PXE_STATFLAGS_INITIALIZED_NO_MEDIA) != PXE_STATFLAGS_INITIALIZED_NO_MEDIA) {\r
+      if (((Snp->Cdb.StatFlags) & PXE_STATFLAGS_INITIALIZED_NO_MEDIA) != PXE_STATFLAGS_INITIALIZED_NO_MEDIA) {\r
         Snp->Mode.MediaPresent = TRUE;\r
       } else {\r
         Snp->Mode.MediaPresent = FALSE;\r
       }\r
     }\r
 \r
-    Snp->Mode.State   = EfiSimpleNetworkInitialized;\r
-    Status            = EFI_SUCCESS;\r
+    Snp->Mode.State = EfiSimpleNetworkInitialized;\r
+    Status          = EFI_SUCCESS;\r
   } else {\r
     DEBUG (\r
       (DEBUG_WARN,\r
-      "\nSnp->undi.initialize()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
+       "\nSnp->undi.initialize()  %xh:%xh\n",\r
+       Snp->Cdb.StatFlags,\r
+       Snp->Cdb.StatCode)\r
       );\r
 \r
     if (Snp->TxRxBuffer != NULL) {\r
       Snp->PciIo->FreeBuffer (\r
                     Snp->PciIo,\r
                     SNP_MEM_PAGES (Snp->TxRxBufferSize),\r
-                    (VOID *) Snp->TxRxBuffer\r
+                    (VOID *)Snp->TxRxBuffer\r
                     );\r
     }\r
 \r
     Snp->TxRxBuffer = NULL;\r
 \r
-    Status          = EFI_DEVICE_ERROR;\r
+    Status = EFI_DEVICE_ERROR;\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Resets a network adapter and allocates the transmit and receive buffers\r
   required by the network interface; optionally, also requests allocation of\r
@@ -180,9 +179,9 @@ PxeInit (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32Initialize (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN UINTN                       ExtraRxBufferSize OPTIONAL,\r
-  IN UINTN                       ExtraTxBufferSize OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN UINTN                        ExtraRxBufferSize OPTIONAL,\r
+  IN UINTN                        ExtraTxBufferSize OPTIONAL\r
   )\r
 {\r
   EFI_STATUS  EfiStatus;\r
@@ -203,36 +202,37 @@ SnpUndi32Initialize (
   }\r
 \r
   switch (Snp->Mode.State) {\r
-  case EfiSimpleNetworkStarted:\r
-    break;\r
+    case EfiSimpleNetworkStarted:\r
+      break;\r
 \r
-  case EfiSimpleNetworkStopped:\r
-    EfiStatus = EFI_NOT_STARTED;\r
-    goto ON_EXIT;\r
+    case EfiSimpleNetworkStopped:\r
+      EfiStatus = EFI_NOT_STARTED;\r
+      goto ON_EXIT;\r
 \r
-  default:\r
-    EfiStatus = EFI_DEVICE_ERROR;\r
-    goto ON_EXIT;\r
+    default:\r
+      EfiStatus = EFI_DEVICE_ERROR;\r
+      goto ON_EXIT;\r
   }\r
 \r
   EfiStatus = gBS->CreateEvent (\r
-                    EVT_NOTIFY_WAIT,\r
-                    TPL_NOTIFY,\r
-                    &SnpWaitForPacketNotify,\r
-                    Snp,\r
-                    &Snp->Snp.WaitForPacket\r
-                    );\r
+                     EVT_NOTIFY_WAIT,\r
+                     TPL_NOTIFY,\r
+                     &SnpWaitForPacketNotify,\r
+                     Snp,\r
+                     &Snp->Snp.WaitForPacket\r
+                     );\r
 \r
   if (EFI_ERROR (EfiStatus)) {\r
     Snp->Snp.WaitForPacket = NULL;\r
-    EfiStatus = EFI_DEVICE_ERROR;\r
+    EfiStatus              = EFI_DEVICE_ERROR;\r
     goto ON_EXIT;\r
   }\r
+\r
   //\r
   //\r
   //\r
-  Snp->Mode.MCastFilterCount      = 0;\r
-  Snp->Mode.ReceiveFilterSetting  = 0;\r
+  Snp->Mode.MCastFilterCount     = 0;\r
+  Snp->Mode.ReceiveFilterSetting = 0;\r
   ZeroMem (Snp->Mode.MCastFilter, sizeof Snp->Mode.MCastFilter);\r
   CopyMem (\r
     &Snp->Mode.CurrentAddress,\r
@@ -243,7 +243,7 @@ SnpUndi32Initialize (
   //\r
   // Compute tx/rx buffer sizes based on UNDI init info and parameters.\r
   //\r
-  Snp->TxRxBufferSize = (UINT32) (Snp->InitInfo.MemoryRequired + ExtraRxBufferSize + ExtraTxBufferSize);\r
+  Snp->TxRxBufferSize = (UINT32)(Snp->InitInfo.MemoryRequired + ExtraRxBufferSize + ExtraTxBufferSize);\r
 \r
   //\r
   // If UNDI support cable detect for INITIALIZE command, try it first.\r
@@ -254,9 +254,9 @@ SnpUndi32Initialize (
     }\r
   }\r
 \r
-  Snp->Mode.MediaPresent  = FALSE;\r
+  Snp->Mode.MediaPresent = FALSE;\r
 \r
-  EfiStatus               = PxeInit (Snp, PXE_OPFLAGS_INITIALIZE_DO_NOT_DETECT_CABLE);\r
+  EfiStatus = PxeInit (Snp, PXE_OPFLAGS_INITIALIZE_DO_NOT_DETECT_CABLE);\r
 \r
   if (EFI_ERROR (EfiStatus)) {\r
     gBS->CloseEvent (Snp->Snp.WaitForPacket);\r
index e8fa077ee9fe3e49e26eae5a250fe158e421c89e..2b42e20aaf150f52c5dc71a26274dacd7b1bec36 100644 (file)
@@ -26,29 +26,29 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 PxeIp2Mac (\r
-  IN SNP_DRIVER          *Snp,\r
-  IN BOOLEAN             IPv6,\r
-  IN EFI_IP_ADDRESS      *IP,\r
-  IN OUT EFI_MAC_ADDRESS *MAC\r
+  IN SNP_DRIVER           *Snp,\r
+  IN BOOLEAN              IPv6,\r
+  IN EFI_IP_ADDRESS       *IP,\r
+  IN OUT EFI_MAC_ADDRESS  *MAC\r
   )\r
 {\r
-  PXE_CPB_MCAST_IP_TO_MAC *Cpb;\r
-  PXE_DB_MCAST_IP_TO_MAC  *Db;\r
+  PXE_CPB_MCAST_IP_TO_MAC  *Cpb;\r
+  PXE_DB_MCAST_IP_TO_MAC   *Db;\r
 \r
-  Cpb                 = Snp->Cpb;\r
-  Db                  = Snp->Db;\r
-  Snp->Cdb.OpCode     = PXE_OPCODE_MCAST_IP_TO_MAC;\r
-  Snp->Cdb.OpFlags    = (UINT16) (IPv6 ? PXE_OPFLAGS_MCAST_IPV6_TO_MAC : PXE_OPFLAGS_MCAST_IPV4_TO_MAC);\r
-  Snp->Cdb.CPBsize    = (UINT16) sizeof (PXE_CPB_MCAST_IP_TO_MAC);\r
-  Snp->Cdb.DBsize     = (UINT16) sizeof (PXE_DB_MCAST_IP_TO_MAC);\r
+  Cpb              = Snp->Cpb;\r
+  Db               = Snp->Db;\r
+  Snp->Cdb.OpCode  = PXE_OPCODE_MCAST_IP_TO_MAC;\r
+  Snp->Cdb.OpFlags = (UINT16)(IPv6 ? PXE_OPFLAGS_MCAST_IPV6_TO_MAC : PXE_OPFLAGS_MCAST_IPV4_TO_MAC);\r
+  Snp->Cdb.CPBsize = (UINT16)sizeof (PXE_CPB_MCAST_IP_TO_MAC);\r
+  Snp->Cdb.DBsize  = (UINT16)sizeof (PXE_DB_MCAST_IP_TO_MAC);\r
 \r
-  Snp->Cdb.CPBaddr    = (UINT64)(UINTN) Cpb;\r
-  Snp->Cdb.DBaddr     = (UINT64)(UINTN) Db;\r
+  Snp->Cdb.CPBaddr = (UINT64)(UINTN)Cpb;\r
+  Snp->Cdb.DBaddr  = (UINT64)(UINTN)Db;\r
 \r
-  Snp->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  Snp->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
-  Snp->Cdb.IFnum      = Snp->IfNum;\r
-  Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+  Snp->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  Snp->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
+  Snp->Cdb.IFnum     = Snp->IfNum;\r
+  Snp->Cdb.Control   = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   CopyMem (&Cpb->IP, IP, sizeof (PXE_IP_ADDR));\r
 \r
@@ -57,44 +57,43 @@ PxeIp2Mac (
   //\r
   DEBUG ((DEBUG_NET, "\nSnp->undi.mcast_ip_to_mac()  "));\r
 \r
-  (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
+  (*Snp->IssueUndi32Command)((UINT64)(UINTN)&Snp->Cdb);\r
 \r
   switch (Snp->Cdb.StatCode) {\r
-  case PXE_STATCODE_SUCCESS:\r
-    break;\r
-\r
-  case PXE_STATCODE_INVALID_CPB:\r
-    return EFI_INVALID_PARAMETER;\r
-\r
-  case PXE_STATCODE_UNSUPPORTED:\r
-    DEBUG (\r
-      (DEBUG_NET,\r
-      "\nSnp->undi.mcast_ip_to_mac()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
-      );\r
-    return EFI_UNSUPPORTED;\r
-\r
-  default:\r
-    //\r
-    // UNDI command failed.  Return EFI_DEVICE_ERROR\r
-    // to caller.\r
-    //\r
-    DEBUG (\r
-      (DEBUG_NET,\r
-      "\nSnp->undi.mcast_ip_to_mac()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
-      );\r
-\r
-    return EFI_DEVICE_ERROR;\r
+    case PXE_STATCODE_SUCCESS:\r
+      break;\r
+\r
+    case PXE_STATCODE_INVALID_CPB:\r
+      return EFI_INVALID_PARAMETER;\r
+\r
+    case PXE_STATCODE_UNSUPPORTED:\r
+      DEBUG (\r
+        (DEBUG_NET,\r
+         "\nSnp->undi.mcast_ip_to_mac()  %xh:%xh\n",\r
+         Snp->Cdb.StatFlags,\r
+         Snp->Cdb.StatCode)\r
+        );\r
+      return EFI_UNSUPPORTED;\r
+\r
+    default:\r
+      //\r
+      // UNDI command failed.  Return EFI_DEVICE_ERROR\r
+      // to caller.\r
+      //\r
+      DEBUG (\r
+        (DEBUG_NET,\r
+         "\nSnp->undi.mcast_ip_to_mac()  %xh:%xh\n",\r
+         Snp->Cdb.StatFlags,\r
+         Snp->Cdb.StatCode)\r
+        );\r
+\r
+      return EFI_DEVICE_ERROR;\r
   }\r
 \r
   CopyMem (MAC, &Db->MAC, sizeof (PXE_MAC_ADDR));\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Converts a multicast IP address to a multicast HW MAC address.\r
 \r
@@ -126,10 +125,10 @@ PxeIp2Mac (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32McastIpToMac (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     IPv6,\r
-  IN EFI_IP_ADDRESS              *IP,\r
-  OUT EFI_MAC_ADDRESS            *MAC\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      IPv6,\r
+  IN EFI_IP_ADDRESS               *IP,\r
+  OUT EFI_MAC_ADDRESS             *MAC\r
   )\r
 {\r
   SNP_DRIVER  *Snp;\r
@@ -143,7 +142,7 @@ SnpUndi32McastIpToMac (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (IP == NULL || MAC == NULL) {\r
+  if ((IP == NULL) || (MAC == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -152,16 +151,16 @@ SnpUndi32McastIpToMac (
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   switch (Snp->Mode.State) {\r
-  case EfiSimpleNetworkInitialized:\r
-    break;\r
+    case EfiSimpleNetworkInitialized:\r
+      break;\r
 \r
-  case EfiSimpleNetworkStopped:\r
-    Status = EFI_NOT_STARTED;\r
-    goto ON_EXIT;\r
+    case EfiSimpleNetworkStopped:\r
+      Status = EFI_NOT_STARTED;\r
+      goto ON_EXIT;\r
 \r
-  default:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto ON_EXIT;\r
+    default:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto ON_EXIT;\r
   }\r
 \r
   Status = PxeIp2Mac (Snp, IPv6, IP, MAC);\r
index 2ffe1c75a268847017278eeb6bc7c4bc7fd796bf..54bcec125b7785dcff43e5ce50b3ca261f574864 100644 (file)
@@ -9,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Snp.h"\r
 \r
-\r
 /**\r
   This routine calls Undi to read the desired number of eeprom bytes.\r
 \r
@@ -26,60 +25,60 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 PxeNvDataRead (\r
-  IN SNP_DRIVER *Snp,\r
-  IN UINTN      Offset,\r
-  IN UINTN      BufferSize,\r
-  IN OUT VOID   *Buffer\r
+  IN SNP_DRIVER  *Snp,\r
+  IN UINTN       Offset,\r
+  IN UINTN       BufferSize,\r
+  IN OUT VOID    *Buffer\r
   )\r
 {\r
-  PXE_DB_NVDATA *Db;\r
+  PXE_DB_NVDATA  *Db;\r
 \r
-  Db                  = Snp->Db;\r
-  Snp->Cdb.OpCode     = PXE_OPCODE_NVDATA;\r
+  Db              = Snp->Db;\r
+  Snp->Cdb.OpCode = PXE_OPCODE_NVDATA;\r
 \r
-  Snp->Cdb.OpFlags    = PXE_OPFLAGS_NVDATA_READ;\r
+  Snp->Cdb.OpFlags = PXE_OPFLAGS_NVDATA_READ;\r
 \r
-  Snp->Cdb.CPBsize    = PXE_CPBSIZE_NOT_USED;\r
-  Snp->Cdb.CPBaddr    = PXE_CPBADDR_NOT_USED;\r
+  Snp->Cdb.CPBsize = PXE_CPBSIZE_NOT_USED;\r
+  Snp->Cdb.CPBaddr = PXE_CPBADDR_NOT_USED;\r
 \r
-  Snp->Cdb.DBsize     = (UINT16) sizeof (PXE_DB_NVDATA);\r
-  Snp->Cdb.DBaddr     = (UINT64)(UINTN) Db;\r
+  Snp->Cdb.DBsize = (UINT16)sizeof (PXE_DB_NVDATA);\r
+  Snp->Cdb.DBaddr = (UINT64)(UINTN)Db;\r
 \r
-  Snp->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  Snp->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
-  Snp->Cdb.IFnum      = Snp->IfNum;\r
-  Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+  Snp->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  Snp->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
+  Snp->Cdb.IFnum     = Snp->IfNum;\r
+  Snp->Cdb.Control   = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   //\r
   // Issue UNDI command and check result.\r
   //\r
   DEBUG ((DEBUG_NET, "\nsnp->undi.nvdata ()  "));\r
 \r
-  (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
+  (*Snp->IssueUndi32Command)((UINT64)(UINTN)&Snp->Cdb);\r
 \r
   switch (Snp->Cdb.StatCode) {\r
-  case PXE_STATCODE_SUCCESS:\r
-    break;\r
-\r
-  case PXE_STATCODE_UNSUPPORTED:\r
-    DEBUG (\r
-      (DEBUG_NET,\r
-      "\nsnp->undi.nvdata()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
-      );\r
-\r
-    return EFI_UNSUPPORTED;\r
-\r
-  default:\r
-    DEBUG (\r
-      (DEBUG_NET,\r
-      "\nsnp->undi.nvdata()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
-      );\r
-\r
-    return EFI_DEVICE_ERROR;\r
+    case PXE_STATCODE_SUCCESS:\r
+      break;\r
+\r
+    case PXE_STATCODE_UNSUPPORTED:\r
+      DEBUG (\r
+        (DEBUG_NET,\r
+         "\nsnp->undi.nvdata()  %xh:%xh\n",\r
+         Snp->Cdb.StatFlags,\r
+         Snp->Cdb.StatCode)\r
+        );\r
+\r
+      return EFI_UNSUPPORTED;\r
+\r
+    default:\r
+      DEBUG (\r
+        (DEBUG_NET,\r
+         "\nsnp->undi.nvdata()  %xh:%xh\n",\r
+         Snp->Cdb.StatFlags,\r
+         Snp->Cdb.StatCode)\r
+        );\r
+\r
+      return EFI_DEVICE_ERROR;\r
   }\r
 \r
   ASSERT (Offset < sizeof (Db->Data));\r
@@ -89,7 +88,6 @@ PxeNvDataRead (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Performs read and write operations on the NVRAM device attached to a network\r
   interface.\r
@@ -144,11 +142,11 @@ PxeNvDataRead (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32NvData (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     ReadWrite,\r
-  IN UINTN                       Offset,\r
-  IN UINTN                       BufferSize,\r
-  IN OUT VOID                    *Buffer\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      ReadWrite,\r
+  IN UINTN                        Offset,\r
+  IN UINTN                        BufferSize,\r
+  IN OUT VOID                     *Buffer\r
   )\r
 {\r
   SNP_DRIVER  *Snp;\r
@@ -170,24 +168,26 @@ SnpUndi32NvData (
   // Return error if the SNP is not initialized.\r
   //\r
   switch (Snp->Mode.State) {\r
-  case EfiSimpleNetworkInitialized:\r
-    break;\r
+    case EfiSimpleNetworkInitialized:\r
+      break;\r
 \r
-  case EfiSimpleNetworkStopped:\r
-    Status = EFI_NOT_STARTED;\r
-    goto ON_EXIT;\r
+    case EfiSimpleNetworkStopped:\r
+      Status = EFI_NOT_STARTED;\r
+      goto ON_EXIT;\r
 \r
-  default:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto ON_EXIT;\r
+    default:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto ON_EXIT;\r
   }\r
+\r
   //\r
   // Return error if non-volatile memory variables are not valid.\r
   //\r
-  if (Snp->Mode.NvRamSize == 0 || Snp->Mode.NvRamAccessSize == 0) {\r
+  if ((Snp->Mode.NvRamSize == 0) || (Snp->Mode.NvRamAccessSize == 0)) {\r
     Status = EFI_UNSUPPORTED;\r
     goto ON_EXIT;\r
   }\r
+\r
   //\r
   // Check for invalid parameter combinations.\r
   //\r
@@ -197,10 +197,12 @@ SnpUndi32NvData (
       (Offset + BufferSize > Snp->Mode.NvRamSize) ||\r
       (BufferSize % Snp->Mode.NvRamAccessSize != 0) ||\r
       (Offset % Snp->Mode.NvRamAccessSize != 0)\r
-      ) {\r
+      )\r
+  {\r
     Status = EFI_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
   }\r
+\r
   //\r
   // check the implementation flags of undi if we can write the nvdata!\r
   //\r
index 1efb2ad8dbd64d33c3a6ab6a8f1a187eda5db2e5..41601980f25fd9d45db99aef240ffbe2f85fe2e1 100644 (file)
@@ -6,7 +6,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #include "Snp.h"\r
 \r
 /**\r
@@ -37,72 +36,72 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 PxeReceive (\r
-  SNP_DRIVER      *Snp,\r
-  VOID            *Buffer,\r
-  UINTN           *BufferSize,\r
-  UINTN           *HeaderSize,\r
-  EFI_MAC_ADDRESS *SrcAddr,\r
-  EFI_MAC_ADDRESS *DestAddr,\r
-  UINT16          *Protocol\r
+  SNP_DRIVER       *Snp,\r
+  VOID             *Buffer,\r
+  UINTN            *BufferSize,\r
+  UINTN            *HeaderSize,\r
+  EFI_MAC_ADDRESS  *SrcAddr,\r
+  EFI_MAC_ADDRESS  *DestAddr,\r
+  UINT16           *Protocol\r
   )\r
 {\r
-  PXE_CPB_RECEIVE *Cpb;\r
-  PXE_DB_RECEIVE  *Db;\r
-  UINTN           BuffSize;\r
+  PXE_CPB_RECEIVE  *Cpb;\r
+  PXE_DB_RECEIVE   *Db;\r
+  UINTN            BuffSize;\r
 \r
-  Cpb       = Snp->Cpb;\r
-  Db        = Snp->Db;\r
-  BuffSize  = *BufferSize;\r
+  Cpb      = Snp->Cpb;\r
+  Db       = Snp->Db;\r
+  BuffSize = *BufferSize;\r
 \r
-  Cpb->BufferAddr = (UINT64)(UINTN) Buffer;\r
-  Cpb->BufferLen  = (UINT32) *BufferSize;\r
+  Cpb->BufferAddr = (UINT64)(UINTN)Buffer;\r
+  Cpb->BufferLen  = (UINT32)*BufferSize;\r
 \r
-  Cpb->reserved       = 0;\r
+  Cpb->reserved = 0;\r
 \r
-  Snp->Cdb.OpCode     = PXE_OPCODE_RECEIVE;\r
-  Snp->Cdb.OpFlags    = PXE_OPFLAGS_NOT_USED;\r
+  Snp->Cdb.OpCode  = PXE_OPCODE_RECEIVE;\r
+  Snp->Cdb.OpFlags = PXE_OPFLAGS_NOT_USED;\r
 \r
-  Snp->Cdb.CPBsize    = (UINT16) sizeof (PXE_CPB_RECEIVE);\r
-  Snp->Cdb.CPBaddr    = (UINT64)(UINTN) Cpb;\r
+  Snp->Cdb.CPBsize = (UINT16)sizeof (PXE_CPB_RECEIVE);\r
+  Snp->Cdb.CPBaddr = (UINT64)(UINTN)Cpb;\r
 \r
-  Snp->Cdb.DBsize     = (UINT16) sizeof (PXE_DB_RECEIVE);\r
-  Snp->Cdb.DBaddr     = (UINT64)(UINTN) Db;\r
+  Snp->Cdb.DBsize = (UINT16)sizeof (PXE_DB_RECEIVE);\r
+  Snp->Cdb.DBaddr = (UINT64)(UINTN)Db;\r
 \r
-  Snp->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  Snp->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
-  Snp->Cdb.IFnum      = Snp->IfNum;\r
-  Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+  Snp->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  Snp->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
+  Snp->Cdb.IFnum     = Snp->IfNum;\r
+  Snp->Cdb.Control   = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   //\r
   // Issue UNDI command and check result.\r
   //\r
   DEBUG ((DEBUG_NET, "\nsnp->undi.receive ()  "));\r
 \r
-  (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
+  (*Snp->IssueUndi32Command)((UINT64)(UINTN)&Snp->Cdb);\r
 \r
   switch (Snp->Cdb.StatCode) {\r
-  case PXE_STATCODE_SUCCESS:\r
-    break;\r
-\r
-  case PXE_STATCODE_NO_DATA:\r
-    DEBUG (\r
-      (DEBUG_NET,\r
-      "\nsnp->undi.receive ()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
-      );\r
-\r
-    return EFI_NOT_READY;\r
-\r
-  default:\r
-    DEBUG (\r
-      (DEBUG_ERROR,\r
-      "\nsnp->undi.receive()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
-      );\r
-\r
-    return EFI_DEVICE_ERROR;\r
+    case PXE_STATCODE_SUCCESS:\r
+      break;\r
+\r
+    case PXE_STATCODE_NO_DATA:\r
+      DEBUG (\r
+        (DEBUG_NET,\r
+         "\nsnp->undi.receive ()  %xh:%xh\n",\r
+         Snp->Cdb.StatFlags,\r
+         Snp->Cdb.StatCode)\r
+        );\r
+\r
+      return EFI_NOT_READY;\r
+\r
+    default:\r
+      DEBUG (\r
+        (DEBUG_ERROR,\r
+         "\nsnp->undi.receive()  %xh:%xh\n",\r
+         Snp->Cdb.StatFlags,\r
+         Snp->Cdb.StatCode)\r
+        );\r
+\r
+      return EFI_DEVICE_ERROR;\r
   }\r
 \r
   *BufferSize = Db->FrameLen;\r
@@ -123,7 +122,7 @@ PxeReceive (
     //\r
     // We need to do the byte swapping\r
     //\r
-    *Protocol = (UINT16) PXE_SWAP_UINT16 (Db->Protocol);\r
+    *Protocol = (UINT16)PXE_SWAP_UINT16 (Db->Protocol);\r
   }\r
 \r
   //\r
@@ -190,13 +189,13 @@ PxeReceive (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32Receive (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  OUT UINTN                      *HeaderSize OPTIONAL,\r
-  IN OUT UINTN                   *BufferSize,\r
-  OUT VOID                       *Buffer,\r
-  OUT EFI_MAC_ADDRESS            *SrcAddr OPTIONAL,\r
-  OUT EFI_MAC_ADDRESS            *DestAddr OPTIONAL,\r
-  OUT UINT16                     *Protocol OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  OUT UINTN                       *HeaderSize OPTIONAL,\r
+  IN OUT UINTN                    *BufferSize,\r
+  OUT VOID                        *Buffer,\r
+  OUT EFI_MAC_ADDRESS             *SrcAddr OPTIONAL,\r
+  OUT EFI_MAC_ADDRESS             *DestAddr OPTIONAL,\r
+  OUT UINT16                      *Protocol OPTIONAL\r
   )\r
 {\r
   SNP_DRIVER  *Snp;\r
@@ -212,16 +211,16 @@ SnpUndi32Receive (
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   switch (Snp->Mode.State) {\r
-  case EfiSimpleNetworkInitialized:\r
-    break;\r
+    case EfiSimpleNetworkInitialized:\r
+      break;\r
 \r
-  case EfiSimpleNetworkStopped:\r
-    Status = EFI_NOT_STARTED;\r
-    goto ON_EXIT;\r
+    case EfiSimpleNetworkStopped:\r
+      Status = EFI_NOT_STARTED;\r
+      goto ON_EXIT;\r
 \r
-  default:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto ON_EXIT;\r
+    default:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto ON_EXIT;\r
   }\r
 \r
   if ((BufferSize == NULL) || (Buffer == NULL)) {\r
index 4666772a2d1bec254ee3ad2398c9e180e3c75528..4a21165567161869b9c61307a38a4615ba82e6ab 100644 (file)
@@ -7,8 +7,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
-\r
 #include "Snp.h"\r
 \r
 /**\r
@@ -28,22 +26,22 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 PxeRecvFilterEnable (\r
-  SNP_DRIVER      *Snp,\r
-  UINT32          EnableFlags,\r
-  UINTN           MCastAddressCount,\r
-  EFI_MAC_ADDRESS *MCastAddressList\r
+  SNP_DRIVER       *Snp,\r
+  UINT32           EnableFlags,\r
+  UINTN            MCastAddressCount,\r
+  EFI_MAC_ADDRESS  *MCastAddressList\r
   )\r
 {\r
-  Snp->Cdb.OpCode     = PXE_OPCODE_RECEIVE_FILTERS;\r
-  Snp->Cdb.OpFlags    = PXE_OPFLAGS_RECEIVE_FILTER_ENABLE;\r
-  Snp->Cdb.CPBsize    = PXE_CPBSIZE_NOT_USED;\r
-  Snp->Cdb.DBsize     = PXE_DBSIZE_NOT_USED;\r
-  Snp->Cdb.CPBaddr    = PXE_CPBADDR_NOT_USED;\r
-  Snp->Cdb.DBaddr     = PXE_DBADDR_NOT_USED;\r
-  Snp->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  Snp->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
-  Snp->Cdb.IFnum      = Snp->IfNum;\r
-  Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+  Snp->Cdb.OpCode    = PXE_OPCODE_RECEIVE_FILTERS;\r
+  Snp->Cdb.OpFlags   = PXE_OPFLAGS_RECEIVE_FILTER_ENABLE;\r
+  Snp->Cdb.CPBsize   = PXE_CPBSIZE_NOT_USED;\r
+  Snp->Cdb.DBsize    = PXE_DBSIZE_NOT_USED;\r
+  Snp->Cdb.CPBaddr   = PXE_CPBADDR_NOT_USED;\r
+  Snp->Cdb.DBaddr    = PXE_DBADDR_NOT_USED;\r
+  Snp->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  Snp->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
+  Snp->Cdb.IFnum     = Snp->IfNum;\r
+  Snp->Cdb.Control   = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   if ((EnableFlags & EFI_SIMPLE_NETWORK_RECEIVE_UNICAST) != 0) {\r
     Snp->Cdb.OpFlags |= PXE_OPFLAGS_RECEIVE_FILTER_UNICAST;\r
@@ -66,16 +64,17 @@ PxeRecvFilterEnable (
   }\r
 \r
   if (MCastAddressCount != 0) {\r
-    Snp->Cdb.CPBsize  = (UINT16) (MCastAddressCount * sizeof (EFI_MAC_ADDRESS));\r
-    Snp->Cdb.CPBaddr  = (UINT64)(UINTN)Snp->Cpb;\r
+    Snp->Cdb.CPBsize = (UINT16)(MCastAddressCount * sizeof (EFI_MAC_ADDRESS));\r
+    Snp->Cdb.CPBaddr = (UINT64)(UINTN)Snp->Cpb;\r
     CopyMem (Snp->Cpb, MCastAddressList, Snp->Cdb.CPBsize);\r
   }\r
+\r
   //\r
   // Issue UNDI command and check result.\r
   //\r
   DEBUG ((DEBUG_NET, "\nsnp->undi.receive_filters()  "));\r
 \r
-  (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
+  (*Snp->IssueUndi32Command)((UINT64)(UINTN)&Snp->Cdb);\r
 \r
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r
     //\r
@@ -83,19 +82,19 @@ PxeRecvFilterEnable (
     //\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "\nsnp->undi.receive_filters()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
+       "\nsnp->undi.receive_filters()  %xh:%xh\n",\r
+       Snp->Cdb.StatFlags,\r
+       Snp->Cdb.StatCode)\r
       );\r
 \r
     switch (Snp->Cdb.StatCode) {\r
-    case PXE_STATCODE_INVALID_CDB:\r
-    case PXE_STATCODE_INVALID_CPB:\r
-    case PXE_STATCODE_INVALID_PARAMETER:\r
-      return EFI_INVALID_PARAMETER;\r
+      case PXE_STATCODE_INVALID_CDB:\r
+      case PXE_STATCODE_INVALID_CPB:\r
+      case PXE_STATCODE_INVALID_PARAMETER:\r
+        return EFI_INVALID_PARAMETER;\r
 \r
-    case PXE_STATCODE_UNSUPPORTED:\r
-      return EFI_UNSUPPORTED;\r
+      case PXE_STATCODE_UNSUPPORTED:\r
+        return EFI_UNSUPPORTED;\r
     }\r
 \r
     return EFI_DEVICE_ERROR;\r
@@ -118,22 +117,22 @@ PxeRecvFilterEnable (
 **/\r
 EFI_STATUS\r
 PxeRecvFilterDisable (\r
-  SNP_DRIVER *Snp,\r
-  UINT32     DisableFlags,\r
-  BOOLEAN    ResetMCastList\r
+  SNP_DRIVER  *Snp,\r
+  UINT32      DisableFlags,\r
+  BOOLEAN     ResetMCastList\r
   )\r
 {\r
-  Snp->Cdb.OpCode     = PXE_OPCODE_RECEIVE_FILTERS;\r
-  Snp->Cdb.CPBsize    = PXE_CPBSIZE_NOT_USED;\r
-  Snp->Cdb.DBsize     = PXE_DBSIZE_NOT_USED;\r
-  Snp->Cdb.CPBaddr    = PXE_CPBADDR_NOT_USED;\r
-  Snp->Cdb.DBaddr     = PXE_DBADDR_NOT_USED;\r
-  Snp->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  Snp->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
-  Snp->Cdb.IFnum      = Snp->IfNum;\r
-  Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
-\r
-  Snp->Cdb.OpFlags    = (UINT16) ((DisableFlags != 0) ? PXE_OPFLAGS_RECEIVE_FILTER_DISABLE : PXE_OPFLAGS_NOT_USED);\r
+  Snp->Cdb.OpCode    = PXE_OPCODE_RECEIVE_FILTERS;\r
+  Snp->Cdb.CPBsize   = PXE_CPBSIZE_NOT_USED;\r
+  Snp->Cdb.DBsize    = PXE_DBSIZE_NOT_USED;\r
+  Snp->Cdb.CPBaddr   = PXE_CPBADDR_NOT_USED;\r
+  Snp->Cdb.DBaddr    = PXE_DBADDR_NOT_USED;\r
+  Snp->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  Snp->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
+  Snp->Cdb.IFnum     = Snp->IfNum;\r
+  Snp->Cdb.Control   = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+\r
+  Snp->Cdb.OpFlags = (UINT16)((DisableFlags != 0) ? PXE_OPFLAGS_RECEIVE_FILTER_DISABLE : PXE_OPFLAGS_NOT_USED);\r
 \r
   if (ResetMCastList) {\r
     Snp->Cdb.OpFlags |= PXE_OPFLAGS_RECEIVE_FILTER_RESET_MCAST_LIST;\r
@@ -158,12 +157,13 @@ PxeRecvFilterDisable (
   if ((DisableFlags & EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST) != 0) {\r
     Snp->Cdb.OpFlags |= PXE_OPFLAGS_RECEIVE_FILTER_FILTERED_MULTICAST;\r
   }\r
+\r
   //\r
   // Issue UNDI command and check result.\r
   //\r
   DEBUG ((DEBUG_NET, "\nsnp->undi.receive_filters()  "));\r
 \r
-  (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
+  (*Snp->IssueUndi32Command)((UINT64)(UINTN)&Snp->Cdb);\r
 \r
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r
     //\r
@@ -171,9 +171,9 @@ PxeRecvFilterDisable (
     //\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "\nsnp->undi.receive_filters()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
+       "\nsnp->undi.receive_filters()  %xh:%xh\n",\r
+       Snp->Cdb.StatFlags,\r
+       Snp->Cdb.StatCode)\r
       );\r
 \r
     return EFI_DEVICE_ERROR;\r
@@ -193,29 +193,29 @@ PxeRecvFilterDisable (
 **/\r
 EFI_STATUS\r
 PxeRecvFilterRead (\r
-  SNP_DRIVER *Snp\r
+  SNP_DRIVER  *Snp\r
   )\r
 {\r
-  Snp->Cdb.OpCode   = PXE_OPCODE_RECEIVE_FILTERS;\r
-  Snp->Cdb.OpFlags  = PXE_OPFLAGS_RECEIVE_FILTER_READ;\r
-  Snp->Cdb.CPBsize  = PXE_CPBSIZE_NOT_USED;\r
-  Snp->Cdb.DBsize   = (UINT16) (Snp->Mode.MaxMCastFilterCount * sizeof (EFI_MAC_ADDRESS));\r
-  Snp->Cdb.CPBaddr  = PXE_CPBADDR_NOT_USED;\r
+  Snp->Cdb.OpCode  = PXE_OPCODE_RECEIVE_FILTERS;\r
+  Snp->Cdb.OpFlags = PXE_OPFLAGS_RECEIVE_FILTER_READ;\r
+  Snp->Cdb.CPBsize = PXE_CPBSIZE_NOT_USED;\r
+  Snp->Cdb.DBsize  = (UINT16)(Snp->Mode.MaxMCastFilterCount * sizeof (EFI_MAC_ADDRESS));\r
+  Snp->Cdb.CPBaddr = PXE_CPBADDR_NOT_USED;\r
   if (Snp->Cdb.DBsize == 0) {\r
-    Snp->Cdb.DBaddr = (UINT64)(UINTN) NULL;\r
+    Snp->Cdb.DBaddr = (UINT64)(UINTN)NULL;\r
   } else {\r
-    Snp->Cdb.DBaddr = (UINT64)(UINTN) Snp->Db;\r
+    Snp->Cdb.DBaddr = (UINT64)(UINTN)Snp->Db;\r
     ZeroMem (Snp->Db, Snp->Cdb.DBsize);\r
   }\r
 \r
-  Snp->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  Snp->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
-  Snp->Cdb.IFnum      = Snp->IfNum;\r
-  Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+  Snp->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  Snp->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
+  Snp->Cdb.IFnum     = Snp->IfNum;\r
+  Snp->Cdb.Control   = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   DEBUG ((DEBUG_NET, "\nsnp->undi.receive_filters()  "));\r
 \r
-  (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
+  (*Snp->IssueUndi32Command)((UINT64)(UINTN)&Snp->Cdb);\r
 \r
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r
     //\r
@@ -223,13 +223,14 @@ PxeRecvFilterRead (
     //\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "\nsnp->undi.receive_filters()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
+       "\nsnp->undi.receive_filters()  %xh:%xh\n",\r
+       Snp->Cdb.StatFlags,\r
+       Snp->Cdb.StatCode)\r
       );\r
 \r
     return EFI_DEVICE_ERROR;\r
   }\r
+\r
   //\r
   // Convert UNDI32 StatFlags to EFI SNP filter flags.\r
   //\r
@@ -261,19 +262,21 @@ PxeRecvFilterRead (
   // Count number of active entries in multicast filter list.\r
   //\r
   {\r
-    EFI_MAC_ADDRESS ZeroMacAddr;\r
+    EFI_MAC_ADDRESS  ZeroMacAddr;\r
 \r
     SetMem (&ZeroMacAddr, sizeof ZeroMacAddr, 0);\r
 \r
     for (Snp->Mode.MCastFilterCount = 0;\r
          Snp->Mode.MCastFilterCount < Snp->Mode.MaxMCastFilterCount;\r
          Snp->Mode.MCastFilterCount++\r
-        ) {\r
+         )\r
+    {\r
       if (CompareMem (\r
             &Snp->Mode.MCastFilter[Snp->Mode.MCastFilterCount],\r
             &ZeroMacAddr,\r
             sizeof ZeroMacAddr\r
-            ) == 0) {\r
+            ) == 0)\r
+      {\r
         break;\r
       }\r
     }\r
@@ -282,7 +285,6 @@ PxeRecvFilterRead (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Manages the multicast receive filters of a network interface.\r
 \r
@@ -380,12 +382,12 @@ PxeRecvFilterRead (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32ReceiveFilters (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN UINT32                      Enable,\r
-  IN UINT32                      Disable,\r
-  IN BOOLEAN                     ResetMCastFilter,\r
-  IN UINTN                       MCastFilterCnt   OPTIONAL,\r
-  IN EFI_MAC_ADDRESS             *MCastFilter     OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN UINT32                       Enable,\r
+  IN UINT32                       Disable,\r
+  IN BOOLEAN                      ResetMCastFilter,\r
+  IN UINTN                        MCastFilterCnt   OPTIONAL,\r
+  IN EFI_MAC_ADDRESS              *MCastFilter     OPTIONAL\r
   )\r
 {\r
   SNP_DRIVER  *Snp;\r
@@ -401,49 +403,50 @@ SnpUndi32ReceiveFilters (
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   switch (Snp->Mode.State) {\r
-  case EfiSimpleNetworkInitialized:\r
-    break;\r
+    case EfiSimpleNetworkInitialized:\r
+      break;\r
 \r
-  case EfiSimpleNetworkStopped:\r
-    Status = EFI_NOT_STARTED;\r
-    goto ON_EXIT;\r
+    case EfiSimpleNetworkStopped:\r
+      Status = EFI_NOT_STARTED;\r
+      goto ON_EXIT;\r
 \r
-  default:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto ON_EXIT;\r
+    default:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto ON_EXIT;\r
   }\r
+\r
   //\r
   // check if we are asked to enable or disable something that the UNDI\r
   // does not even support!\r
   //\r
   if (((Enable &~Snp->Mode.ReceiveFilterMask) != 0) ||\r
-    ((Disable &~Snp->Mode.ReceiveFilterMask) != 0)) {\r
+      ((Disable &~Snp->Mode.ReceiveFilterMask) != 0))\r
+  {\r
     Status = EFI_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
   }\r
 \r
   if (ResetMCastFilter) {\r
-\r
-    Disable |= EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST & Snp->Mode.ReceiveFilterMask;\r
+    Disable       |= EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST & Snp->Mode.ReceiveFilterMask;\r
     MCastFilterCnt = 0;\r
     MCastFilter    = NULL;\r
   } else {\r
     if (MCastFilterCnt != 0) {\r
       if ((MCastFilterCnt > Snp->Mode.MaxMCastFilterCount) ||\r
-          (MCastFilter == NULL)) {\r
-\r
+          (MCastFilter == NULL))\r
+      {\r
         Status = EFI_INVALID_PARAMETER;\r
         goto ON_EXIT;\r
       }\r
     }\r
   }\r
 \r
-  if (Enable == 0 && Disable == 0 && !ResetMCastFilter && MCastFilterCnt == 0) {\r
+  if ((Enable == 0) && (Disable == 0) && !ResetMCastFilter && (MCastFilterCnt == 0)) {\r
     Status = EFI_SUCCESS;\r
     goto ON_EXIT;\r
   }\r
 \r
-  if ((Enable & EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST) != 0 && MCastFilterCnt == 0) {\r
+  if (((Enable & EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST) != 0) && (MCastFilterCnt == 0)) {\r
     Status = EFI_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
   }\r
index 40069c8722195eded8b84c379ecc4b5184ca9b6c..2ff685376db8c9caa95be1485d176b3d17243c4f 100644 (file)
@@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Snp.h"\r
 \r
-\r
 /**\r
   Call UNDI to reset the NIC.\r
 \r
@@ -20,33 +19,33 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 PxeReset (\r
-  SNP_DRIVER *Snp\r
+  SNP_DRIVER  *Snp\r
   )\r
 {\r
-  Snp->Cdb.OpCode     = PXE_OPCODE_RESET;\r
-  Snp->Cdb.OpFlags    = PXE_OPFLAGS_NOT_USED;\r
-  Snp->Cdb.CPBsize    = PXE_CPBSIZE_NOT_USED;\r
-  Snp->Cdb.DBsize     = PXE_DBSIZE_NOT_USED;\r
-  Snp->Cdb.CPBaddr    = PXE_CPBADDR_NOT_USED;\r
-  Snp->Cdb.DBaddr     = PXE_DBADDR_NOT_USED;\r
-  Snp->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  Snp->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
-  Snp->Cdb.IFnum      = Snp->IfNum;\r
-  Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+  Snp->Cdb.OpCode    = PXE_OPCODE_RESET;\r
+  Snp->Cdb.OpFlags   = PXE_OPFLAGS_NOT_USED;\r
+  Snp->Cdb.CPBsize   = PXE_CPBSIZE_NOT_USED;\r
+  Snp->Cdb.DBsize    = PXE_DBSIZE_NOT_USED;\r
+  Snp->Cdb.CPBaddr   = PXE_CPBADDR_NOT_USED;\r
+  Snp->Cdb.DBaddr    = PXE_DBADDR_NOT_USED;\r
+  Snp->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  Snp->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
+  Snp->Cdb.IFnum     = Snp->IfNum;\r
+  Snp->Cdb.Control   = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   //\r
   // Issue UNDI command and check result.\r
   //\r
   DEBUG ((DEBUG_NET, "\nsnp->undi.reset()  "));\r
 \r
-  (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
+  (*Snp->IssueUndi32Command)((UINT64)(UINTN)&Snp->Cdb);\r
 \r
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r
     DEBUG (\r
       (DEBUG_WARN,\r
-      "\nsnp->undi32.reset()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
+       "\nsnp->undi32.reset()  %xh:%xh\n",\r
+       Snp->Cdb.StatFlags,\r
+       Snp->Cdb.StatCode)\r
       );\r
 \r
     //\r
@@ -58,7 +57,6 @@ PxeReset (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Resets a network adapter and reinitializes it with the parameters that were\r
   provided in the previous call to Initialize().\r
@@ -86,8 +84,8 @@ PxeReset (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32Reset (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     ExtendedVerification\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      ExtendedVerification\r
   )\r
 {\r
   SNP_DRIVER  *Snp;\r
@@ -109,16 +107,16 @@ SnpUndi32Reset (
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   switch (Snp->Mode.State) {\r
-  case EfiSimpleNetworkInitialized:\r
-    break;\r
+    case EfiSimpleNetworkInitialized:\r
+      break;\r
 \r
-  case EfiSimpleNetworkStopped:\r
-    Status = EFI_NOT_STARTED;\r
-    goto ON_EXIT;\r
+    case EfiSimpleNetworkStopped:\r
+      Status = EFI_NOT_STARTED;\r
+      goto ON_EXIT;\r
 \r
-  default:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto ON_EXIT;\r
+    default:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto ON_EXIT;\r
   }\r
 \r
   Status = PxeReset (Snp);\r
index ae6c93a00b6df3826e599ba589d3e4dd30245e85..33fa7cb03322bdb41fd1b71b3e86664305085a61 100644 (file)
@@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Snp.h"\r
 \r
-\r
 /**\r
   Call UNDI to shut down the interface.\r
 \r
@@ -20,26 +19,26 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 PxeShutdown (\r
-  IN SNP_DRIVER *Snp\r
+  IN SNP_DRIVER  *Snp\r
   )\r
 {\r
-  Snp->Cdb.OpCode     = PXE_OPCODE_SHUTDOWN;\r
-  Snp->Cdb.OpFlags    = PXE_OPFLAGS_NOT_USED;\r
-  Snp->Cdb.CPBsize    = PXE_CPBSIZE_NOT_USED;\r
-  Snp->Cdb.DBsize     = PXE_DBSIZE_NOT_USED;\r
-  Snp->Cdb.CPBaddr    = PXE_CPBADDR_NOT_USED;\r
-  Snp->Cdb.DBaddr     = PXE_DBADDR_NOT_USED;\r
-  Snp->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  Snp->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
-  Snp->Cdb.IFnum      = Snp->IfNum;\r
-  Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+  Snp->Cdb.OpCode    = PXE_OPCODE_SHUTDOWN;\r
+  Snp->Cdb.OpFlags   = PXE_OPFLAGS_NOT_USED;\r
+  Snp->Cdb.CPBsize   = PXE_CPBSIZE_NOT_USED;\r
+  Snp->Cdb.DBsize    = PXE_DBSIZE_NOT_USED;\r
+  Snp->Cdb.CPBaddr   = PXE_CPBADDR_NOT_USED;\r
+  Snp->Cdb.DBaddr    = PXE_DBADDR_NOT_USED;\r
+  Snp->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  Snp->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
+  Snp->Cdb.IFnum     = Snp->IfNum;\r
+  Snp->Cdb.Control   = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   //\r
   // Issue UNDI command and check result.\r
   //\r
   DEBUG ((DEBUG_NET, "\nsnp->undi.shutdown()  "));\r
 \r
-  (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
+  (*Snp->IssueUndi32Command)((UINT64)(UINTN)&Snp->Cdb);\r
 \r
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r
     //\r
@@ -49,6 +48,7 @@ PxeShutdown (
 \r
     return EFI_DEVICE_ERROR;\r
   }\r
+\r
   //\r
   // Free allocated memory.\r
   //\r
@@ -56,17 +56,16 @@ PxeShutdown (
     Snp->PciIo->FreeBuffer (\r
                   Snp->PciIo,\r
                   SNP_MEM_PAGES (Snp->TxRxBufferSize),\r
-                  (VOID *) Snp->TxRxBuffer\r
+                  (VOID *)Snp->TxRxBuffer\r
                   );\r
   }\r
 \r
-  Snp->TxRxBuffer      = NULL;\r
-  Snp->TxRxBufferSize  = 0;\r
+  Snp->TxRxBuffer     = NULL;\r
+  Snp->TxRxBufferSize = 0;\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Resets a network adapter and leaves it in a state that is safe for another\r
   driver to initialize.\r
@@ -89,7 +88,7 @@ PxeShutdown (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32Shutdown (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This\r
   )\r
 {\r
   SNP_DRIVER  *Snp;\r
@@ -111,25 +110,25 @@ SnpUndi32Shutdown (
   // Return error if the SNP is not initialized.\r
   //\r
   switch (Snp->Mode.State) {\r
-  case EfiSimpleNetworkInitialized:\r
-    break;\r
+    case EfiSimpleNetworkInitialized:\r
+      break;\r
 \r
-  case EfiSimpleNetworkStopped:\r
-    Status = EFI_NOT_STARTED;\r
-    goto ON_EXIT;\r
+    case EfiSimpleNetworkStopped:\r
+      Status = EFI_NOT_STARTED;\r
+      goto ON_EXIT;\r
 \r
-  default:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto ON_EXIT;\r
+    default:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto ON_EXIT;\r
   }\r
 \r
-  Status                          = PxeShutdown (Snp);\r
+  Status = PxeShutdown (Snp);\r
 \r
-  Snp->Mode.State                 = EfiSimpleNetworkStarted;\r
-  Snp->Mode.ReceiveFilterSetting  = 0;\r
+  Snp->Mode.State                = EfiSimpleNetworkStarted;\r
+  Snp->Mode.ReceiveFilterSetting = 0;\r
 \r
-  Snp->Mode.MCastFilterCount      = 0;\r
-  Snp->Mode.ReceiveFilterSetting  = 0;\r
+  Snp->Mode.MCastFilterCount     = 0;\r
+  Snp->Mode.ReceiveFilterSetting = 0;\r
   ZeroMem (Snp->Mode.MCastFilter, sizeof Snp->Mode.MCastFilter);\r
   CopyMem (\r
     &Snp->Mode.CurrentAddress,\r
index d0d086e5780a35579cb3e950f83bfb0d1ae3b906..95361c3cd3436c0b63c0ae2ea6c28961693e3b95 100644 (file)
@@ -19,13 +19,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 VOID\r
 EFIAPI\r
 SnpNotifyExitBootServices (\r
-  EFI_EVENT Event,\r
-  VOID      *Context\r
+  EFI_EVENT  Event,\r
+  VOID       *Context\r
   )\r
 {\r
-  SNP_DRIVER             *Snp;\r
+  SNP_DRIVER  *Snp;\r
 \r
-  Snp  = (SNP_DRIVER *)Context;\r
+  Snp = (SNP_DRIVER *)Context;\r
 \r
   //\r
   // Shutdown and stop UNDI driver\r
@@ -47,22 +47,21 @@ SnpNotifyExitBootServices (
 EFI_STATUS\r
 EFIAPI\r
 IssueHwUndiCommand (\r
-  UINT64 Cdb\r
+  UINT64  Cdb\r
   )\r
 {\r
   DEBUG ((DEBUG_ERROR, "\nIssueHwUndiCommand() - This should not be called!"));\r
 \r
   if (Cdb == 0) {\r
     return EFI_INVALID_PARAMETER;\r
-\r
   }\r
+\r
   //\r
   //  %%TBD - For now, nothing is done.\r
   //\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-\r
 /**\r
   Compute 8-bit checksum of a buffer.\r
 \r
@@ -75,22 +74,22 @@ IssueHwUndiCommand (
 **/\r
 UINT8\r
 Calc8BitCksum (\r
-  VOID  *Buffer,\r
-  UINTN Length\r
+  VOID   *Buffer,\r
+  UINTN  Length\r
   )\r
 {\r
-  UINT8 *Ptr;\r
-  UINT8 Cksum;\r
+  UINT8  *Ptr;\r
+  UINT8  Cksum;\r
 \r
   Ptr   = Buffer;\r
   Cksum = 0;\r
 \r
-  if (Ptr == NULL || Length == 0) {\r
+  if ((Ptr == NULL) || (Length == 0)) {\r
     return 0;\r
   }\r
 \r
   while (Length-- != 0) {\r
-    Cksum = (UINT8) (Cksum + *Ptr++);\r
+    Cksum = (UINT8)(Cksum + *Ptr++);\r
   }\r
 \r
   return Cksum;\r
@@ -117,14 +116,14 @@ Calc8BitCksum (
 EFI_STATUS\r
 EFIAPI\r
 SimpleNetworkDriverSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS                                Status;\r
-  EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL *NiiProtocol;\r
-  PXE_UNDI                                  *Pxe;\r
+  EFI_STATUS                                 Status;\r
+  EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL  *NiiProtocol;\r
+  PXE_UNDI                                   *Pxe;\r
 \r
   Status = gBS->OpenProtocol (\r
                   Controller,\r
@@ -141,7 +140,7 @@ SimpleNetworkDriverSupported (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiNetworkInterfaceIdentifierProtocolGuid_31,\r
-                  (VOID **) &NiiProtocol,\r
+                  (VOID **)&NiiProtocol,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -151,6 +150,7 @@ SimpleNetworkDriverSupported (
     if (Status == EFI_ALREADY_STARTED) {\r
       DEBUG ((DEBUG_INFO, "Support(): Already Started. on handle %p\n", Controller));\r
     }\r
+\r
     return Status;\r
   }\r
 \r
@@ -163,6 +163,7 @@ SimpleNetworkDriverSupported (
     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
   }\r
+\r
   //\r
   // Check to see if !PXE structure is valid. Paragraph alignment of !PXE structure is required.\r
   //\r
@@ -172,7 +173,7 @@ SimpleNetworkDriverSupported (
     goto Done;\r
   }\r
 \r
-  Pxe = (PXE_UNDI *) (UINTN) (NiiProtocol->Id);\r
+  Pxe = (PXE_UNDI *)(UINTN)(NiiProtocol->Id);\r
 \r
   //\r
   //  Verify !PXE revisions.\r
@@ -190,16 +191,15 @@ SimpleNetworkDriverSupported (
   }\r
 \r
   if (Pxe->hw.MajorVer < PXE_ROMID_MAJORVER) {\r
-\r
     DEBUG ((DEBUG_NET, "\n!PXE.MajorVer is not supported.\n"));\r
     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
-\r
-  } else if (Pxe->hw.MajorVer == PXE_ROMID_MAJORVER && Pxe->hw.MinorVer < PXE_ROMID_MINORVER) {\r
+  } else if ((Pxe->hw.MajorVer == PXE_ROMID_MAJORVER) && (Pxe->hw.MinorVer < PXE_ROMID_MINORVER)) {\r
     DEBUG ((DEBUG_NET, "\n!PXE.MinorVer is not supported."));\r
     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
   }\r
+\r
   //\r
   // Do S/W UNDI specific checks.\r
   //\r
@@ -222,11 +222,11 @@ SimpleNetworkDriverSupported (
 \r
 Done:\r
   gBS->CloseProtocol (\r
-        Controller,\r
-        &gEfiNetworkInterfaceIdentifierProtocolGuid_31,\r
-        This->DriverBindingHandle,\r
-        Controller\r
-        );\r
+         Controller,\r
+         &gEfiNetworkInterfaceIdentifierProtocolGuid_31,\r
+         This->DriverBindingHandle,\r
+         Controller\r
+         );\r
 \r
   return Status;\r
 }\r
@@ -252,31 +252,31 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 SimpleNetworkDriverStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL *Nii;\r
-  EFI_DEVICE_PATH_PROTOCOL                  *NiiDevicePath;\r
-  EFI_STATUS                                Status;\r
-  PXE_UNDI                                  *Pxe;\r
-  SNP_DRIVER                                *Snp;\r
-  VOID                                      *Address;\r
-  EFI_HANDLE                                Handle;\r
-  UINT8                                     BarIndex;\r
-  PXE_STATFLAGS                             InitStatFlags;\r
-  EFI_PCI_IO_PROTOCOL                       *PciIo;\r
-  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR         *BarDesc;\r
-  BOOLEAN                                   FoundIoBar;\r
-  BOOLEAN                                   FoundMemoryBar;\r
+  EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL  *Nii;\r
+  EFI_DEVICE_PATH_PROTOCOL                   *NiiDevicePath;\r
+  EFI_STATUS                                 Status;\r
+  PXE_UNDI                                   *Pxe;\r
+  SNP_DRIVER                                 *Snp;\r
+  VOID                                       *Address;\r
+  EFI_HANDLE                                 Handle;\r
+  UINT8                                      BarIndex;\r
+  PXE_STATFLAGS                              InitStatFlags;\r
+  EFI_PCI_IO_PROTOCOL                        *PciIo;\r
+  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR          *BarDesc;\r
+  BOOLEAN                                    FoundIoBar;\r
+  BOOLEAN                                    FoundMemoryBar;\r
 \r
   DEBUG ((DEBUG_NET, "\nSnpNotifyNetworkInterfaceIdentifier()  "));\r
 \r
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &NiiDevicePath,\r
+                  (VOID **)&NiiDevicePath,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -299,7 +299,7 @@ SimpleNetworkDriverStart (
   Status = gBS->OpenProtocol (\r
                   Handle,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &PciIo,\r
+                  (VOID **)&PciIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -307,30 +307,31 @@ SimpleNetworkDriverStart (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Get the NII interface.\r
   //\r
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiNetworkInterfaceIdentifierProtocolGuid_31,\r
-                  (VOID **) &Nii,\r
+                  (VOID **)&Nii,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     gBS->CloseProtocol (\r
-          Controller,\r
-          &gEfiDevicePathProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          Controller\r
-          );\r
+           Controller,\r
+           &gEfiDevicePathProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           Controller\r
+           );\r
     return Status;\r
   }\r
 \r
   DEBUG ((DEBUG_INFO, "Start(): UNDI3.1 found\n"));\r
 \r
-  Pxe = (PXE_UNDI *) (UINTN) (Nii->Id);\r
+  Pxe = (PXE_UNDI *)(UINTN)(Nii->Id);\r
 \r
   if (Calc8BitCksum (Pxe, Pxe->hw.Len) != 0) {\r
     DEBUG ((DEBUG_NET, "\n!PXE checksum is not correct.\n"));\r
@@ -351,6 +352,7 @@ SimpleNetworkDriverStart (
     DEBUG ((DEBUG_NET, "\nUNDI does not have promiscuous or broadcast support."));\r
     goto NiiError;\r
   }\r
+\r
   //\r
   // OK, we like this UNDI, and we know snp is not already there on this handle\r
   // Allocate and initialize a new simple network protocol structure.\r
@@ -369,12 +371,12 @@ SimpleNetworkDriverStart (
     goto NiiError;\r
   }\r
 \r
-  Snp = (SNP_DRIVER *) (UINTN) Address;\r
+  Snp = (SNP_DRIVER *)(UINTN)Address;\r
 \r
   ZeroMem (Snp, sizeof (SNP_DRIVER));\r
 \r
-  Snp->PciIo      = PciIo;\r
-  Snp->Signature  = SNP_DRIVER_SIGNATURE;\r
+  Snp->PciIo     = PciIo;\r
+  Snp->Signature = SNP_DRIVER_SIGNATURE;\r
 \r
   EfiInitializeLock (&Snp->Lock, TPL_NOTIFY);\r
 \r
@@ -394,38 +396,39 @@ SimpleNetworkDriverStart (
   Snp->Snp.Receive        = SnpUndi32Receive;\r
   Snp->Snp.WaitForPacket  = NULL;\r
 \r
-  Snp->Snp.Mode           = &Snp->Mode;\r
+  Snp->Snp.Mode = &Snp->Mode;\r
 \r
-  Snp->TxRxBufferSize     = 0;\r
-  Snp->TxRxBuffer         = NULL;\r
+  Snp->TxRxBufferSize = 0;\r
+  Snp->TxRxBuffer     = NULL;\r
 \r
   Snp->RecycledTxBuf = AllocatePool (sizeof (UINT64) * SNP_TX_BUFFER_INCREASEMENT);\r
   if (Snp->RecycledTxBuf == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Error_DeleteSNP;\r
   }\r
-  Snp->MaxRecycledTxBuf    = SNP_TX_BUFFER_INCREASEMENT;\r
-  Snp->RecycledTxBufCount  = 0;\r
+\r
+  Snp->MaxRecycledTxBuf   = SNP_TX_BUFFER_INCREASEMENT;\r
+  Snp->RecycledTxBufCount = 0;\r
 \r
   if (Nii->Revision >= EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION) {\r
     Snp->IfNum = Nii->IfNum;\r
-\r
   } else {\r
-    Snp->IfNum = (UINT8) (Nii->IfNum & 0xFF);\r
+    Snp->IfNum = (UINT8)(Nii->IfNum & 0xFF);\r
   }\r
 \r
   if ((Pxe->hw.Implementation & PXE_ROMID_IMP_HW_UNDI) != 0) {\r
-    Snp->IsSwUndi             = FALSE;\r
-    Snp->IssueUndi32Command   = &IssueHwUndiCommand;\r
+    Snp->IsSwUndi           = FALSE;\r
+    Snp->IssueUndi32Command = &IssueHwUndiCommand;\r
   } else {\r
     Snp->IsSwUndi = TRUE;\r
 \r
     if ((Pxe->sw.Implementation & PXE_ROMID_IMP_SW_VIRT_ADDR) != 0) {\r
-      Snp->IssueUndi32Command = (ISSUE_UNDI32_COMMAND) (UINTN) Pxe->sw.EntryPoint;\r
+      Snp->IssueUndi32Command = (ISSUE_UNDI32_COMMAND)(UINTN)Pxe->sw.EntryPoint;\r
     } else {\r
-      Snp->IssueUndi32Command = (ISSUE_UNDI32_COMMAND) (UINTN) ((UINT8) (UINTN) Pxe + Pxe->sw.EntryPoint);\r
+      Snp->IssueUndi32Command = (ISSUE_UNDI32_COMMAND)(UINTN)((UINT8)(UINTN)Pxe + Pxe->sw.EntryPoint);\r
     }\r
   }\r
+\r
   //\r
   // Allocate a global CPB and DB buffer for this UNDI interface.\r
   // we do this because:\r
@@ -456,8 +459,8 @@ SimpleNetworkDriverStart (
     goto Error_DeleteSNP;\r
   }\r
 \r
-  Snp->Cpb  = (VOID *) (UINTN) Address;\r
-  Snp->Db   = (VOID *) ((UINTN) Address + 2048);\r
+  Snp->Cpb = (VOID *)(UINTN)Address;\r
+  Snp->Db  = (VOID *)((UINTN)Address + 2048);\r
 \r
   //\r
   // Find the correct BAR to do IO.\r
@@ -475,7 +478,7 @@ SimpleNetworkDriverStart (
                       PciIo,\r
                       BarIndex,\r
                       NULL,\r
-                      (VOID**) &BarDesc\r
+                      (VOID **)&BarDesc\r
                       );\r
     if (Status == EFI_UNSUPPORTED) {\r
       continue;\r
@@ -504,24 +507,24 @@ SimpleNetworkDriverStart (
     goto Error_DeleteSNP;\r
   }\r
 \r
-  Snp->Cdb.OpCode     = PXE_OPCODE_GET_INIT_INFO;\r
-  Snp->Cdb.OpFlags    = PXE_OPFLAGS_NOT_USED;\r
+  Snp->Cdb.OpCode  = PXE_OPCODE_GET_INIT_INFO;\r
+  Snp->Cdb.OpFlags = PXE_OPFLAGS_NOT_USED;\r
 \r
-  Snp->Cdb.CPBsize    = PXE_CPBSIZE_NOT_USED;\r
-  Snp->Cdb.CPBaddr    = PXE_DBADDR_NOT_USED;\r
+  Snp->Cdb.CPBsize = PXE_CPBSIZE_NOT_USED;\r
+  Snp->Cdb.CPBaddr = PXE_DBADDR_NOT_USED;\r
 \r
-  Snp->Cdb.DBsize     = (UINT16) sizeof (Snp->InitInfo);\r
-  Snp->Cdb.DBaddr     = (UINT64)(UINTN) (&Snp->InitInfo);\r
+  Snp->Cdb.DBsize = (UINT16)sizeof (Snp->InitInfo);\r
+  Snp->Cdb.DBaddr = (UINT64)(UINTN)(&Snp->InitInfo);\r
 \r
-  Snp->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  Snp->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
+  Snp->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  Snp->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
 \r
-  Snp->Cdb.IFnum      = Snp->IfNum;\r
-  Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+  Snp->Cdb.IFnum   = Snp->IfNum;\r
+  Snp->Cdb.Control = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   DEBUG ((DEBUG_NET, "\nSnp->undi.get_init_info()  "));\r
 \r
-  (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
+  (*Snp->IssueUndi32Command)((UINT64)(UINTN)&Snp->Cdb);\r
 \r
   //\r
   // Save the INIT Stat Code...\r
@@ -548,23 +551,23 @@ SimpleNetworkDriverStart (
   Snp->Mode.MCastFilterCount    = 0;\r
 \r
   switch (InitStatFlags & PXE_STATFLAGS_CABLE_DETECT_MASK) {\r
-  case PXE_STATFLAGS_CABLE_DETECT_SUPPORTED:\r
-    Snp->CableDetectSupported = TRUE;\r
-    break;\r
+    case PXE_STATFLAGS_CABLE_DETECT_SUPPORTED:\r
+      Snp->CableDetectSupported = TRUE;\r
+      break;\r
 \r
-  case PXE_STATFLAGS_CABLE_DETECT_NOT_SUPPORTED:\r
-  default:\r
-    Snp->CableDetectSupported = FALSE;\r
+    case PXE_STATFLAGS_CABLE_DETECT_NOT_SUPPORTED:\r
+    default:\r
+      Snp->CableDetectSupported = FALSE;\r
   }\r
 \r
   switch (InitStatFlags & PXE_STATFLAGS_GET_STATUS_NO_MEDIA_MASK) {\r
-  case PXE_STATFLAGS_GET_STATUS_NO_MEDIA_SUPPORTED:\r
-    Snp->MediaStatusSupported = TRUE;\r
-    break;\r
+    case PXE_STATFLAGS_GET_STATUS_NO_MEDIA_SUPPORTED:\r
+      Snp->MediaStatusSupported = TRUE;\r
+      break;\r
 \r
-  case PXE_STATFLAGS_GET_STATUS_NO_MEDIA_NOT_SUPPORTED:\r
-  default:\r
-    Snp->MediaStatusSupported = FALSE;\r
+    case PXE_STATFLAGS_GET_STATUS_NO_MEDIA_NOT_SUPPORTED:\r
+    default:\r
+      Snp->MediaStatusSupported = FALSE;\r
   }\r
 \r
   if (Snp->CableDetectSupported || Snp->MediaStatusSupported) {\r
@@ -587,27 +590,22 @@ SimpleNetworkDriverStart (
 \r
   if ((Pxe->hw.Implementation & PXE_ROMID_IMP_PROMISCUOUS_MULTICAST_RX_SUPPORTED) != 0) {\r
     Snp->Mode.ReceiveFilterMask |= EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS_MULTICAST;\r
-\r
   }\r
 \r
   if ((Pxe->hw.Implementation & PXE_ROMID_IMP_PROMISCUOUS_RX_SUPPORTED) != 0) {\r
     Snp->Mode.ReceiveFilterMask |= EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS;\r
-\r
   }\r
 \r
   if ((Pxe->hw.Implementation & PXE_ROMID_IMP_BROADCAST_RX_SUPPORTED) != 0) {\r
     Snp->Mode.ReceiveFilterMask |= EFI_SIMPLE_NETWORK_RECEIVE_BROADCAST;\r
-\r
   }\r
 \r
   if ((Pxe->hw.Implementation & PXE_ROMID_IMP_FILTERED_MULTICAST_RX_SUPPORTED) != 0) {\r
     Snp->Mode.ReceiveFilterMask |= EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST;\r
-\r
   }\r
 \r
   if ((Pxe->hw.Implementation & PXE_ROMID_IMP_PROMISCUOUS_MULTICAST_RX_SUPPORTED) != 0) {\r
     Snp->Mode.ReceiveFilterMask |= EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS_MULTICAST;\r
-\r
   }\r
 \r
   Snp->Mode.ReceiveFilterSetting = 0;\r
@@ -698,18 +696,18 @@ Error_DeleteSNP:
            );\r
 NiiError:\r
   gBS->CloseProtocol (\r
-        Controller,\r
-        &gEfiNetworkInterfaceIdentifierProtocolGuid_31,\r
-        This->DriverBindingHandle,\r
-        Controller\r
-        );\r
+         Controller,\r
+         &gEfiNetworkInterfaceIdentifierProtocolGuid_31,\r
+         This->DriverBindingHandle,\r
+         Controller\r
+         );\r
 \r
   gBS->CloseProtocol (\r
-        Controller,\r
-        &gEfiDevicePathProtocolGuid,\r
-        This->DriverBindingHandle,\r
-        Controller\r
-        );\r
+         Controller,\r
+         &gEfiDevicePathProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         Controller\r
+         );\r
 \r
   //\r
   // If we got here that means we are in error state.\r
@@ -742,16 +740,16 @@ NiiError:
 EFI_STATUS\r
 EFIAPI\r
 SimpleNetworkDriverStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN  EFI_HANDLE                     Controller,\r
-  IN  UINTN                          NumberOfChildren,\r
-  IN  EFI_HANDLE                     *ChildHandleBuffer\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   Controller,\r
+  IN  UINTN                        NumberOfChildren,\r
+  IN  EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL *SnpProtocol;\r
-  SNP_DRIVER                  *Snp;\r
-  EFI_PCI_IO_PROTOCOL         *PciIo;\r
+  EFI_STATUS                   Status;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL  *SnpProtocol;\r
+  SNP_DRIVER                   *Snp;\r
+  EFI_PCI_IO_PROTOCOL          *PciIo;\r
 \r
   //\r
   // Get our context back.\r
@@ -759,7 +757,7 @@ SimpleNetworkDriverStop (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiSimpleNetworkProtocolGuid,\r
-                  (VOID **) &SnpProtocol,\r
+                  (VOID **)&SnpProtocol,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -826,7 +824,7 @@ SimpleNetworkDriverStop (
 //\r
 // Simple Network Protocol Driver Global Variables\r
 //\r
-EFI_DRIVER_BINDING_PROTOCOL gSimpleNetworkDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gSimpleNetworkDriverBinding = {\r
   SimpleNetworkDriverSupported,\r
   SimpleNetworkDriverStart,\r
   SimpleNetworkDriverStop,\r
@@ -852,8 +850,8 @@ EFI_DRIVER_BINDING_PROTOCOL gSimpleNetworkDriverBinding = {
 EFI_STATUS\r
 EFIAPI\r
 InitializeSnpNiiDriver (\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
   return EfiLibInstallDriverBindingComponentName2 (\r
index 30dd8d5f261d41d203192850792b344aeace30ef..d57804ca28736073858ab706b47ee03f99c5ce8d 100644 (file)
@@ -5,10 +5,10 @@ Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
+\r
 #ifndef _SNP_H_\r
 #define _SNP_H_\r
 \r
-\r
 #include <Uefi.h>\r
 \r
 #include <Protocol/SimpleNetwork.h>\r
@@ -33,35 +33,34 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #define FOUR_GIGABYTES  (UINT64) 0x100000000ULL\r
 \r
-\r
 #define SNP_DRIVER_SIGNATURE  SIGNATURE_32 ('s', 'n', 'd', 's')\r
 #define MAX_MAP_LENGTH        100\r
 \r
-#define PCI_BAR_IO_MASK       0x00000003\r
-#define PCI_BAR_IO_MODE       0x00000001\r
+#define PCI_BAR_IO_MASK  0x00000003\r
+#define PCI_BAR_IO_MODE  0x00000001\r
 \r
-#define PCI_BAR_MEM_MASK      0x0000000F\r
-#define PCI_BAR_MEM_MODE      0x00000000\r
-#define PCI_BAR_MEM_64BIT     0x00000004\r
+#define PCI_BAR_MEM_MASK   0x0000000F\r
+#define PCI_BAR_MEM_MODE   0x00000000\r
+#define PCI_BAR_MEM_64BIT  0x00000004\r
 \r
-#define SNP_TX_BUFFER_INCREASEMENT    MAX_XMIT_BUFFERS\r
-#define SNP_MAX_TX_BUFFER_NUM         65536\r
+#define SNP_TX_BUFFER_INCREASEMENT  MAX_XMIT_BUFFERS\r
+#define SNP_MAX_TX_BUFFER_NUM       65536\r
 \r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *ISSUE_UNDI32_COMMAND) (\r
+(EFIAPI *ISSUE_UNDI32_COMMAND)(\r
   UINT64         Cdb\r
   );\r
 \r
 typedef struct {\r
-  UINT32                      Signature;\r
-  EFI_LOCK                    Lock;\r
+  UINT32                         Signature;\r
+  EFI_LOCK                       Lock;\r
 \r
-  EFI_SIMPLE_NETWORK_PROTOCOL Snp;\r
-  EFI_SIMPLE_NETWORK_MODE     Mode;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL    Snp;\r
+  EFI_SIMPLE_NETWORK_MODE        Mode;\r
 \r
-  EFI_HANDLE                  DeviceHandle;\r
-  EFI_DEVICE_PATH_PROTOCOL    *DevicePath;\r
+  EFI_HANDLE                     DeviceHandle;\r
+  EFI_DEVICE_PATH_PROTOCOL       *DevicePath;\r
 \r
   //\r
   //  Local instance data needed by SNP driver\r
@@ -69,96 +68,96 @@ typedef struct {
   //  Pointer to S/W UNDI API entry point\r
   //  This will be NULL for H/W UNDI\r
   //\r
-  ISSUE_UNDI32_COMMAND  IssueUndi32Command;\r
+  ISSUE_UNDI32_COMMAND           IssueUndi32Command;\r
 \r
-  BOOLEAN               IsSwUndi;\r
+  BOOLEAN                        IsSwUndi;\r
 \r
   //\r
   // undi interface number, if one undi manages more nics\r
   //\r
-  PXE_IFNUM             IfNum;\r
+  PXE_IFNUM                      IfNum;\r
 \r
   //\r
   //  Allocated tx/rx buffer that was passed to UNDI Initialize.\r
   //\r
-  UINT32                TxRxBufferSize;\r
-  VOID                  *TxRxBuffer;\r
+  UINT32                         TxRxBufferSize;\r
+  VOID                           *TxRxBuffer;\r
   //\r
   // mappable buffers for receive and fill header for undi3.0\r
   // these will be used if the user buffers are above 4GB limit (instead of\r
   // mapping the user buffers)\r
   //\r
-  UINT8                 *ReceiveBufffer;\r
-  VOID                  *ReceiveBufferUnmap;\r
-  UINT8                 *FillHeaderBuffer;\r
-  VOID                  *FillHeaderBufferUnmap;\r
+  UINT8                          *ReceiveBufffer;\r
+  VOID                           *ReceiveBufferUnmap;\r
+  UINT8                          *FillHeaderBuffer;\r
+  VOID                           *FillHeaderBufferUnmap;\r
 \r
-  EFI_PCI_IO_PROTOCOL   *PciIo;\r
-  UINT8                 IoBarIndex;\r
-  UINT8                 MemoryBarIndex;\r
+  EFI_PCI_IO_PROTOCOL            *PciIo;\r
+  UINT8                          IoBarIndex;\r
+  UINT8                          MemoryBarIndex;\r
 \r
   //\r
   // Buffers for command descriptor block, command parameter block\r
   // and data block.\r
   //\r
-  PXE_CDB               Cdb;\r
-  VOID                  *Cpb;\r
-  VOID                  *CpbUnmap;\r
-  VOID                  *Db;\r
+  PXE_CDB                        Cdb;\r
+  VOID                           *Cpb;\r
+  VOID                           *CpbUnmap;\r
+  VOID                           *Db;\r
 \r
   //\r
   // UNDI structure, we need to remember the init info for a long time!\r
   //\r
-  PXE_DB_GET_INIT_INFO  InitInfo;\r
+  PXE_DB_GET_INIT_INFO           InitInfo;\r
 \r
-  VOID                  *SnpDriverUnmap;\r
+  VOID                           *SnpDriverUnmap;\r
   //\r
   // when ever we map an address, we must remember it's address and the un-map\r
   // cookie so that we can unmap later\r
   //\r
   struct MAP_LIST {\r
-    EFI_PHYSICAL_ADDRESS  VirtualAddress;\r
-    VOID                  *MapCookie;\r
+    EFI_PHYSICAL_ADDRESS    VirtualAddress;\r
+    VOID                    *MapCookie;\r
   } MapList[MAX_MAP_LENGTH];\r
 \r
-  EFI_EVENT              ExitBootServicesEvent;\r
+  EFI_EVENT    ExitBootServicesEvent;\r
 \r
   //\r
   // Whether UNDI support reporting media status from GET_STATUS command,\r
   // i.e. PXE_STATFLAGS_GET_STATUS_NO_MEDIA_SUPPORTED or\r
   //      PXE_STATFLAGS_GET_STATUS_NO_MEDIA_NOT_SUPPORTED\r
   //\r
-  BOOLEAN                MediaStatusSupported;\r
+  BOOLEAN      MediaStatusSupported;\r
 \r
   //\r
   // Whether UNDI support cable detect for INITIALIZE command,\r
   // i.e. PXE_STATFLAGS_CABLE_DETECT_SUPPORTED or\r
   //      PXE_STATFLAGS_CABLE_DETECT_NOT_SUPPORTED\r
   //\r
-  BOOLEAN                CableDetectSupported;\r
+  BOOLEAN      CableDetectSupported;\r
 \r
   //\r
   // Array of the recycled transmit buffer address from UNDI.\r
   //\r
-  UINT64                 *RecycledTxBuf;\r
+  UINT64       *RecycledTxBuf;\r
   //\r
   // The maximum number of recycled buffer pointers in RecycledTxBuf.\r
   //\r
-  UINT32                 MaxRecycledTxBuf;\r
+  UINT32       MaxRecycledTxBuf;\r
   //\r
   // Current number of recycled buffer pointers in RecycledTxBuf.\r
   //\r
-  UINT32                 RecycledTxBufCount;\r
+  UINT32       RecycledTxBufCount;\r
 } SNP_DRIVER;\r
 \r
-#define EFI_SIMPLE_NETWORK_DEV_FROM_THIS(a) CR (a, SNP_DRIVER, Snp, SNP_DRIVER_SIGNATURE)\r
+#define EFI_SIMPLE_NETWORK_DEV_FROM_THIS(a)  CR (a, SNP_DRIVER, Snp, SNP_DRIVER_SIGNATURE)\r
 \r
 //\r
 // Global Variables\r
 //\r
-extern EFI_DRIVER_BINDING_PROTOCOL    gSimpleNetworkDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL    gSimpleNetworkComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL   gSimpleNetworkComponentName2;\r
+extern EFI_DRIVER_BINDING_PROTOCOL   gSimpleNetworkDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gSimpleNetworkComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gSimpleNetworkComponentName2;\r
 \r
 /**\r
   this routine calls undi to start the interface and changes the snp state.\r
@@ -171,7 +170,7 @@ extern EFI_COMPONENT_NAME2_PROTOCOL   gSimpleNetworkComponentName2;
 **/\r
 EFI_STATUS\r
 PxeStart (\r
-  IN SNP_DRIVER *Snp\r
+  IN SNP_DRIVER  *Snp\r
   );\r
 \r
 /**\r
@@ -187,7 +186,7 @@ PxeStart (
 **/\r
 EFI_STATUS\r
 PxeStop (\r
-  SNP_DRIVER *Snp\r
+  SNP_DRIVER  *Snp\r
   );\r
 \r
 /**\r
@@ -203,8 +202,8 @@ PxeStop (
 **/\r
 EFI_STATUS\r
 PxeInit (\r
-  SNP_DRIVER *Snp,\r
-  UINT16     CableDetectFlag\r
+  SNP_DRIVER  *Snp,\r
+  UINT16      CableDetectFlag\r
   );\r
 \r
 /**\r
@@ -218,7 +217,7 @@ PxeInit (
 **/\r
 EFI_STATUS\r
 PxeShutdown (\r
-  IN SNP_DRIVER *Snp\r
+  IN SNP_DRIVER  *Snp\r
   );\r
 \r
 /**\r
@@ -233,7 +232,7 @@ PxeShutdown (
 **/\r
 EFI_STATUS\r
 PxeGetStnAddr (\r
-  SNP_DRIVER *Snp\r
+  SNP_DRIVER  *Snp\r
   );\r
 \r
 /**\r
@@ -255,9 +254,9 @@ PxeGetStnAddr (
 **/\r
 EFI_STATUS\r
 PxeGetStatus (\r
-  IN     SNP_DRIVER *Snp,\r
-     OUT UINT32     *InterruptStatusPtr,\r
-  IN     BOOLEAN    GetTransmittedBuf\r
+  IN     SNP_DRIVER  *Snp,\r
+  OUT UINT32         *InterruptStatusPtr,\r
+  IN     BOOLEAN     GetTransmittedBuf\r
   );\r
 \r
 /**\r
@@ -277,8 +276,8 @@ PxeGetStatus (
 VOID\r
 EFIAPI\r
 SnpUndi32CallbackBlock (\r
-  IN UINT64 UniqueId,\r
-  IN UINT32 Enable\r
+  IN UINT64  UniqueId,\r
+  IN UINT32  Enable\r
   );\r
 \r
 /**\r
@@ -294,8 +293,8 @@ SnpUndi32CallbackBlock (
 VOID\r
 EFIAPI\r
 SnpUndi32CallbackDelay (\r
-  IN UINT64 UniqueId,\r
-  IN UINT64 MicroSeconds\r
+  IN UINT64  UniqueId,\r
+  IN UINT64  MicroSeconds\r
   );\r
 \r
 /**\r
@@ -314,11 +313,11 @@ SnpUndi32CallbackDelay (
 VOID\r
 EFIAPI\r
 SnpUndi32CallbackMemio (\r
-  IN UINT64     UniqueId,\r
-  IN UINT8      ReadOrWrite,\r
-  IN UINT8      NumBytes,\r
-  IN UINT64     MemOrPortAddr,\r
-  IN OUT UINT64 BufferPtr\r
+  IN UINT64      UniqueId,\r
+  IN UINT8       ReadOrWrite,\r
+  IN UINT8       NumBytes,\r
+  IN UINT64      MemOrPortAddr,\r
+  IN OUT UINT64  BufferPtr\r
   );\r
 \r
 /**\r
@@ -338,11 +337,11 @@ SnpUndi32CallbackMemio (
 VOID\r
 EFIAPI\r
 SnpUndi32CallbackMap (\r
-  IN UINT64     UniqueId,\r
-  IN UINT64     CpuAddr,\r
-  IN UINT32     NumBytes,\r
-  IN UINT32     Direction,\r
-  IN OUT UINT64 DeviceAddrPtr\r
+  IN UINT64      UniqueId,\r
+  IN UINT64      CpuAddr,\r
+  IN UINT32      NumBytes,\r
+  IN UINT32      Direction,\r
+  IN OUT UINT64  DeviceAddrPtr\r
   );\r
 \r
 /**\r
@@ -362,11 +361,11 @@ SnpUndi32CallbackMap (
 VOID\r
 EFIAPI\r
 SnpUndi32CallbackUnmap (\r
-  IN UINT64             UniqueId,\r
-  IN UINT64             CpuAddr,\r
-  IN UINT32             NumBytes,\r
-  IN UINT32             Direction,\r
-  IN UINT64             DeviceAddr\r
+  IN UINT64  UniqueId,\r
+  IN UINT64  CpuAddr,\r
+  IN UINT32  NumBytes,\r
+  IN UINT32  Direction,\r
+  IN UINT64  DeviceAddr\r
   );\r
 \r
 /**\r
@@ -393,11 +392,11 @@ SnpUndi32CallbackUnmap (
 VOID\r
 EFIAPI\r
 SnpUndi32CallbackSync (\r
-  IN UINT64             UniqueId,\r
-  IN UINT64             CpuAddr,\r
-  IN UINT32             NumBytes,\r
-  IN UINT32             Direction,\r
-  IN UINT64             DeviceAddr\r
+  IN UINT64  UniqueId,\r
+  IN UINT64  CpuAddr,\r
+  IN UINT32  NumBytes,\r
+  IN UINT32  Direction,\r
+  IN UINT64  DeviceAddr\r
   );\r
 \r
 /**\r
@@ -419,7 +418,7 @@ SnpUndi32CallbackSync (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32Start (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This\r
   );\r
 \r
 /**\r
@@ -443,7 +442,7 @@ SnpUndi32Start (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32Stop (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This\r
   );\r
 \r
 /**\r
@@ -482,9 +481,9 @@ SnpUndi32Stop (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32Initialize (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN UINTN                       ExtraRxBufferSize OPTIONAL,\r
-  IN UINTN                       ExtraTxBufferSize OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN UINTN                        ExtraRxBufferSize OPTIONAL,\r
+  IN UINTN                        ExtraTxBufferSize OPTIONAL\r
   );\r
 \r
 /**\r
@@ -540,7 +539,7 @@ SnpUndi32Reset (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32Shutdown (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This\r
   );\r
 \r
 /**\r
@@ -640,12 +639,12 @@ SnpUndi32Shutdown (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32ReceiveFilters (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN UINT32                      Enable,\r
-  IN UINT32                      Disable,\r
-  IN BOOLEAN                     ResetMCastFilter,\r
-  IN UINTN                       MCastFilterCnt   OPTIONAL,\r
-  IN EFI_MAC_ADDRESS             *MCastFilter     OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN UINT32                       Enable,\r
+  IN UINT32                       Disable,\r
+  IN BOOLEAN                      ResetMCastFilter,\r
+  IN UINTN                        MCastFilterCnt   OPTIONAL,\r
+  IN EFI_MAC_ADDRESS              *MCastFilter     OPTIONAL\r
   );\r
 \r
 /**\r
@@ -683,9 +682,9 @@ SnpUndi32ReceiveFilters (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32StationAddress (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     Reset,\r
-  IN EFI_MAC_ADDRESS             *New  OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      Reset,\r
+  IN EFI_MAC_ADDRESS              *New  OPTIONAL\r
   );\r
 \r
 /**\r
@@ -738,10 +737,10 @@ SnpUndi32StationAddress (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32Statistics (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     Reset,\r
-  IN OUT UINTN                   *StatisticsSize   OPTIONAL,\r
-  IN OUT EFI_NETWORK_STATISTICS  *StatisticsTable  OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      Reset,\r
+  IN OUT UINTN                    *StatisticsSize   OPTIONAL,\r
+  IN OUT EFI_NETWORK_STATISTICS   *StatisticsTable  OPTIONAL\r
   );\r
 \r
 /**\r
@@ -775,10 +774,10 @@ SnpUndi32Statistics (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32McastIpToMac (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     IPv6,\r
-  IN EFI_IP_ADDRESS              *IP,\r
-  OUT EFI_MAC_ADDRESS            *MAC\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      IPv6,\r
+  IN EFI_IP_ADDRESS               *IP,\r
+  OUT EFI_MAC_ADDRESS             *MAC\r
   );\r
 \r
 /**\r
@@ -835,11 +834,11 @@ SnpUndi32McastIpToMac (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32NvData (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     ReadWrite,\r
-  IN UINTN                       Offset,\r
-  IN UINTN                       BufferSize,\r
-  IN OUT VOID                    *Buffer\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      ReadWrite,\r
+  IN UINTN                        Offset,\r
+  IN UINTN                        BufferSize,\r
+  IN OUT VOID                     *Buffer\r
   );\r
 \r
 /**\r
@@ -883,9 +882,9 @@ SnpUndi32NvData (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32GetStatus (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  OUT UINT32                     *InterruptStatus  OPTIONAL,\r
-  OUT VOID                       **TxBuf           OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  OUT UINT32                      *InterruptStatus  OPTIONAL,\r
+  OUT VOID                        **TxBuf           OPTIONAL\r
   );\r
 \r
 /**\r
@@ -945,13 +944,13 @@ SnpUndi32GetStatus (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32Transmit (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN UINTN                       HeaderSize,\r
-  IN UINTN                       BufferSize,\r
-  IN VOID                        *Buffer,\r
-  IN EFI_MAC_ADDRESS             *SrcAddr   OPTIONAL,\r
-  IN EFI_MAC_ADDRESS             *DestAddr  OPTIONAL,\r
-  IN UINT16                      *Protocol  OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN UINTN                        HeaderSize,\r
+  IN UINTN                        BufferSize,\r
+  IN VOID                         *Buffer,\r
+  IN EFI_MAC_ADDRESS              *SrcAddr   OPTIONAL,\r
+  IN EFI_MAC_ADDRESS              *DestAddr  OPTIONAL,\r
+  IN UINT16                       *Protocol  OPTIONAL\r
   );\r
 \r
 /**\r
@@ -1005,13 +1004,13 @@ SnpUndi32Transmit (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32Receive (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  OUT UINTN                      *HeaderSize OPTIONAL,\r
-  IN OUT UINTN                   *BufferSize,\r
-  OUT VOID                       *Buffer,\r
-  OUT EFI_MAC_ADDRESS            *SrcAddr OPTIONAL,\r
-  OUT EFI_MAC_ADDRESS            *DestAddr OPTIONAL,\r
-  OUT UINT16                     *Protocol OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  OUT UINTN                       *HeaderSize OPTIONAL,\r
+  IN OUT UINTN                    *BufferSize,\r
+  OUT VOID                        *Buffer,\r
+  OUT EFI_MAC_ADDRESS             *SrcAddr OPTIONAL,\r
+  OUT EFI_MAC_ADDRESS             *DestAddr OPTIONAL,\r
+  OUT UINT16                      *Protocol OPTIONAL\r
   );\r
 \r
 /**\r
@@ -1024,11 +1023,10 @@ SnpUndi32Receive (
 VOID\r
 EFIAPI\r
 SnpWaitForPacketNotify (\r
-  EFI_EVENT Event,\r
-  VOID      *SnpPtr\r
+  EFI_EVENT  Event,\r
+  VOID       *SnpPtr\r
   );\r
 \r
 #define SNP_MEM_PAGES(x)  (((x) - 1) / 4096 + 1)\r
 \r
-\r
 #endif /*  _SNP_H_  */\r
index 596610d1a913823059e057065f538aa916b6a9a4..514582b9b9714c00fe10f96e38f0a04d86474c1f 100644 (file)
@@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Snp.h"\r
 \r
-\r
 /**\r
   Call UNDI to start the interface and changes the snp state.\r
 \r
@@ -20,55 +19,56 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 PxeStart (\r
-  IN SNP_DRIVER *Snp\r
+  IN SNP_DRIVER  *Snp\r
   )\r
 {\r
   PXE_CPB_START_31  *Cpb31;\r
 \r
-  Cpb31  = Snp->Cpb;\r
+  Cpb31 = Snp->Cpb;\r
   //\r
   // Initialize UNDI Start CDB for H/W UNDI\r
   //\r
-  Snp->Cdb.OpCode     = PXE_OPCODE_START;\r
-  Snp->Cdb.OpFlags    = PXE_OPFLAGS_NOT_USED;\r
-  Snp->Cdb.CPBsize    = PXE_CPBSIZE_NOT_USED;\r
-  Snp->Cdb.DBsize     = PXE_DBSIZE_NOT_USED;\r
-  Snp->Cdb.CPBaddr    = PXE_CPBADDR_NOT_USED;\r
-  Snp->Cdb.DBaddr     = PXE_DBADDR_NOT_USED;\r
-  Snp->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  Snp->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
-  Snp->Cdb.IFnum      = Snp->IfNum;\r
-  Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+  Snp->Cdb.OpCode    = PXE_OPCODE_START;\r
+  Snp->Cdb.OpFlags   = PXE_OPFLAGS_NOT_USED;\r
+  Snp->Cdb.CPBsize   = PXE_CPBSIZE_NOT_USED;\r
+  Snp->Cdb.DBsize    = PXE_DBSIZE_NOT_USED;\r
+  Snp->Cdb.CPBaddr   = PXE_CPBADDR_NOT_USED;\r
+  Snp->Cdb.DBaddr    = PXE_DBADDR_NOT_USED;\r
+  Snp->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  Snp->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
+  Snp->Cdb.IFnum     = Snp->IfNum;\r
+  Snp->Cdb.Control   = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   //\r
   // Make changes to H/W UNDI Start CDB if this is\r
   // a S/W UNDI.\r
   //\r
   if (Snp->IsSwUndi) {\r
-    Snp->Cdb.CPBsize  = (UINT16) sizeof (PXE_CPB_START_31);\r
-    Snp->Cdb.CPBaddr  = (UINT64)(UINTN) Cpb31;\r
+    Snp->Cdb.CPBsize = (UINT16)sizeof (PXE_CPB_START_31);\r
+    Snp->Cdb.CPBaddr = (UINT64)(UINTN)Cpb31;\r
 \r
-    Cpb31->Delay     = (UINT64)(UINTN) &SnpUndi32CallbackDelay;\r
-    Cpb31->Block     = (UINT64)(UINTN) &SnpUndi32CallbackBlock;\r
+    Cpb31->Delay = (UINT64)(UINTN)&SnpUndi32CallbackDelay;\r
+    Cpb31->Block = (UINT64)(UINTN)&SnpUndi32CallbackBlock;\r
 \r
     //\r
     // Virtual == Physical.  This can be set to zero.\r
     //\r
-    Cpb31->Virt2Phys = (UINT64)(UINTN) 0;\r
-    Cpb31->Mem_IO    = (UINT64)(UINTN) &SnpUndi32CallbackMemio;\r
+    Cpb31->Virt2Phys = (UINT64)(UINTN)0;\r
+    Cpb31->Mem_IO    = (UINT64)(UINTN)&SnpUndi32CallbackMemio;\r
 \r
-    Cpb31->Map_Mem   = (UINT64)(UINTN) &SnpUndi32CallbackMap;\r
-    Cpb31->UnMap_Mem = (UINT64)(UINTN) &SnpUndi32CallbackUnmap;\r
-    Cpb31->Sync_Mem  = (UINT64)(UINTN) &SnpUndi32CallbackSync;\r
+    Cpb31->Map_Mem   = (UINT64)(UINTN)&SnpUndi32CallbackMap;\r
+    Cpb31->UnMap_Mem = (UINT64)(UINTN)&SnpUndi32CallbackUnmap;\r
+    Cpb31->Sync_Mem  = (UINT64)(UINTN)&SnpUndi32CallbackSync;\r
 \r
-    Cpb31->Unique_ID = (UINT64)(UINTN) Snp;\r
+    Cpb31->Unique_ID = (UINT64)(UINTN)Snp;\r
   }\r
+\r
   //\r
   // Issue UNDI command and check result.\r
   //\r
   DEBUG ((DEBUG_NET, "\nsnp->undi.start()  "));\r
 \r
-  (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
+  (*Snp->IssueUndi32Command)((UINT64)(UINTN)&Snp->Cdb);\r
 \r
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r
     //\r
@@ -76,13 +76,14 @@ PxeStart (
     //\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "\nsnp->undi.start()  %xh:%xh\n",\r
-      Snp->Cdb.StatCode,\r
-      Snp->Cdb.StatFlags)\r
+       "\nsnp->undi.start()  %xh:%xh\n",\r
+       Snp->Cdb.StatCode,\r
+       Snp->Cdb.StatFlags)\r
       );\r
 \r
     return EFI_DEVICE_ERROR;\r
   }\r
+\r
   //\r
   // Set simple network state to Started and return success.\r
   //\r
@@ -91,7 +92,6 @@ PxeStart (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Change the state of a network interface from "stopped" to "started."\r
 \r
@@ -111,7 +111,7 @@ PxeStart (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32Start (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This\r
   )\r
 {\r
   SNP_DRIVER  *Snp;\r
@@ -128,23 +128,24 @@ SnpUndi32Start (
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   switch (Snp->Mode.State) {\r
-  case EfiSimpleNetworkStopped:\r
-    break;\r
+    case EfiSimpleNetworkStopped:\r
+      break;\r
 \r
-  case EfiSimpleNetworkStarted:\r
-  case EfiSimpleNetworkInitialized:\r
-    Status = EFI_ALREADY_STARTED;\r
-    goto ON_EXIT;\r
+    case EfiSimpleNetworkStarted:\r
+    case EfiSimpleNetworkInitialized:\r
+      Status = EFI_ALREADY_STARTED;\r
+      goto ON_EXIT;\r
 \r
-  default:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto ON_EXIT;\r
+    default:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto ON_EXIT;\r
   }\r
 \r
   Status = PxeStart (Snp);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
+\r
   //\r
   // clear the map_list in SNP structure\r
   //\r
index c88601e456f0a20a1af42e8f1d0f33b33a0d7f9d..66ddbf6831148c21c9647f98b9d8a3d67ae6141e 100644 (file)
@@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Snp.h"\r
 \r
-\r
 /**\r
   Call UNDI to read the MAC address of the NIC and update the mode structure\r
   with the address.\r
@@ -21,43 +20,44 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 PxeGetStnAddr (\r
-  SNP_DRIVER *Snp\r
+  SNP_DRIVER  *Snp\r
   )\r
 {\r
   PXE_DB_STATION_ADDRESS  *Db;\r
 \r
-  Db                  = Snp->Db;\r
-  Snp->Cdb.OpCode     = PXE_OPCODE_STATION_ADDRESS;\r
-  Snp->Cdb.OpFlags    = PXE_OPFLAGS_STATION_ADDRESS_READ;\r
+  Db               = Snp->Db;\r
+  Snp->Cdb.OpCode  = PXE_OPCODE_STATION_ADDRESS;\r
+  Snp->Cdb.OpFlags = PXE_OPFLAGS_STATION_ADDRESS_READ;\r
 \r
-  Snp->Cdb.CPBaddr    = PXE_CPBADDR_NOT_USED;\r
-  Snp->Cdb.CPBsize    = PXE_CPBSIZE_NOT_USED;\r
+  Snp->Cdb.CPBaddr = PXE_CPBADDR_NOT_USED;\r
+  Snp->Cdb.CPBsize = PXE_CPBSIZE_NOT_USED;\r
 \r
-  Snp->Cdb.DBsize     = (UINT16) sizeof (PXE_DB_STATION_ADDRESS);\r
-  Snp->Cdb.DBaddr     = (UINT64)(UINTN) Db;\r
+  Snp->Cdb.DBsize = (UINT16)sizeof (PXE_DB_STATION_ADDRESS);\r
+  Snp->Cdb.DBaddr = (UINT64)(UINTN)Db;\r
 \r
-  Snp->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  Snp->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
-  Snp->Cdb.IFnum      = Snp->IfNum;\r
-  Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+  Snp->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  Snp->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
+  Snp->Cdb.IFnum     = Snp->IfNum;\r
+  Snp->Cdb.Control   = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   //\r
   // Issue UNDI command and check result.\r
   //\r
   DEBUG ((DEBUG_NET, "\nsnp->undi.station_addr()  "));\r
 \r
-  (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
+  (*Snp->IssueUndi32Command)((UINT64)(UINTN)&Snp->Cdb);\r
 \r
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "\nsnp->undi.station_addr()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
+       "\nsnp->undi.station_addr()  %xh:%xh\n",\r
+       Snp->Cdb.StatFlags,\r
+       Snp->Cdb.StatCode)\r
       );\r
 \r
     return EFI_DEVICE_ERROR;\r
   }\r
+\r
   //\r
   // Set new station address in SNP->Mode structure and return success.\r
   //\r
@@ -82,7 +82,6 @@ PxeGetStnAddr (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Call UNDI to set a new MAC address for the NIC.\r
 \r
@@ -95,21 +94,21 @@ PxeGetStnAddr (
 **/\r
 EFI_STATUS\r
 PxeSetStnAddr (\r
-  SNP_DRIVER      *Snp,\r
-  EFI_MAC_ADDRESS *NewMacAddr\r
+  SNP_DRIVER       *Snp,\r
+  EFI_MAC_ADDRESS  *NewMacAddr\r
   )\r
 {\r
-  PXE_CPB_STATION_ADDRESS *Cpb;\r
-  PXE_DB_STATION_ADDRESS  *Db;\r
+  PXE_CPB_STATION_ADDRESS  *Cpb;\r
+  PXE_DB_STATION_ADDRESS   *Db;\r
 \r
   Cpb             = Snp->Cpb;\r
   Db              = Snp->Db;\r
   Snp->Cdb.OpCode = PXE_OPCODE_STATION_ADDRESS;\r
 \r
   if (NewMacAddr == NULL) {\r
-    Snp->Cdb.OpFlags  = PXE_OPFLAGS_STATION_ADDRESS_RESET;\r
-    Snp->Cdb.CPBsize  = PXE_CPBSIZE_NOT_USED;\r
-    Snp->Cdb.CPBaddr  = PXE_CPBADDR_NOT_USED;\r
+    Snp->Cdb.OpFlags = PXE_OPFLAGS_STATION_ADDRESS_RESET;\r
+    Snp->Cdb.CPBsize = PXE_CPBSIZE_NOT_USED;\r
+    Snp->Cdb.CPBaddr = PXE_CPBADDR_NOT_USED;\r
   } else {\r
     Snp->Cdb.OpFlags = PXE_OPFLAGS_STATION_ADDRESS_WRITE;\r
     //\r
@@ -117,31 +116,31 @@ PxeSetStnAddr (
     //\r
     CopyMem (&Cpb->StationAddr, NewMacAddr, Snp->Mode.HwAddressSize);\r
 \r
-    Snp->Cdb.CPBsize  = (UINT16) sizeof (PXE_CPB_STATION_ADDRESS);\r
-    Snp->Cdb.CPBaddr  = (UINT64)(UINTN) Cpb;\r
+    Snp->Cdb.CPBsize = (UINT16)sizeof (PXE_CPB_STATION_ADDRESS);\r
+    Snp->Cdb.CPBaddr = (UINT64)(UINTN)Cpb;\r
   }\r
 \r
-  Snp->Cdb.DBsize     = (UINT16) sizeof (PXE_DB_STATION_ADDRESS);\r
-  Snp->Cdb.DBaddr     = (UINT64)(UINTN) Db;\r
+  Snp->Cdb.DBsize = (UINT16)sizeof (PXE_DB_STATION_ADDRESS);\r
+  Snp->Cdb.DBaddr = (UINT64)(UINTN)Db;\r
 \r
-  Snp->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  Snp->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
-  Snp->Cdb.IFnum      = Snp->IfNum;\r
-  Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+  Snp->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  Snp->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
+  Snp->Cdb.IFnum     = Snp->IfNum;\r
+  Snp->Cdb.Control   = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   //\r
   // Issue UNDI command and check result.\r
   //\r
   DEBUG ((DEBUG_NET, "\nsnp->undi.station_addr()  "));\r
 \r
-  (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
+  (*Snp->IssueUndi32Command)((UINT64)(UINTN)&Snp->Cdb);\r
 \r
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "\nsnp->undi.station_addr()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
+       "\nsnp->undi.station_addr()  %xh:%xh\n",\r
+       Snp->Cdb.StatFlags,\r
+       Snp->Cdb.StatCode)\r
       );\r
 \r
     //\r
@@ -149,6 +148,7 @@ PxeSetStnAddr (
     //\r
     return EFI_DEVICE_ERROR;\r
   }\r
+\r
   //\r
   // read the changed address and save it in SNP->Mode structure\r
   //\r
@@ -157,7 +157,6 @@ PxeSetStnAddr (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Modifies or resets the current station address, if supported.\r
 \r
@@ -193,9 +192,9 @@ PxeSetStnAddr (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32StationAddress (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     Reset,\r
-  IN EFI_MAC_ADDRESS             *New OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      Reset,\r
+  IN EFI_MAC_ADDRESS              *New OPTIONAL\r
   )\r
 {\r
   SNP_DRIVER  *Snp;\r
@@ -206,7 +205,8 @@ SnpUndi32StationAddress (
   // Check for invalid parameter combinations.\r
   //\r
   if ((This == NULL) ||\r
-    (!Reset && (New == NULL))) {\r
+      (!Reset && (New == NULL)))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -218,16 +218,16 @@ SnpUndi32StationAddress (
   // Return error if the SNP is not initialized.\r
   //\r
   switch (Snp->Mode.State) {\r
-  case EfiSimpleNetworkInitialized:\r
-    break;\r
+    case EfiSimpleNetworkInitialized:\r
+      break;\r
 \r
-  case EfiSimpleNetworkStopped:\r
-    Status = EFI_NOT_STARTED;\r
-    goto ON_EXIT;\r
+    case EfiSimpleNetworkStopped:\r
+      Status = EFI_NOT_STARTED;\r
+      goto ON_EXIT;\r
 \r
-  default:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto ON_EXIT;\r
+    default:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto ON_EXIT;\r
   }\r
 \r
   if (Reset) {\r
index faeec536fcf7ef6a4a99758fc7cce53b0b201a0a..34d1332523006a0ce06fa4c40ba2707b1dd5590e 100644 (file)
@@ -6,10 +6,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #include "Snp.h"\r
 \r
-\r
 /**\r
   Resets or collects the statistics on a network interface.\r
 \r
@@ -60,20 +58,20 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32Statistics (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     Reset,\r
-  IN OUT UINTN                   *StatisticsSize  OPTIONAL,\r
-  IN OUT EFI_NETWORK_STATISTICS  *StatisticsTable OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      Reset,\r
+  IN OUT UINTN                    *StatisticsSize  OPTIONAL,\r
+  IN OUT EFI_NETWORK_STATISTICS   *StatisticsTable OPTIONAL\r
   )\r
 {\r
-  SNP_DRIVER        *Snp;\r
-  PXE_DB_STATISTICS *Db;\r
-  UINT64            *Stp;\r
-  UINT64            Mask;\r
-  UINTN             Size;\r
-  UINTN             Index;\r
-  EFI_TPL           OldTpl;\r
-  EFI_STATUS        Status;\r
+  SNP_DRIVER         *Snp;\r
+  PXE_DB_STATISTICS  *Db;\r
+  UINT64             *Stp;\r
+  UINT64             Mask;\r
+  UINTN              Size;\r
+  UINTN              Index;\r
+  EFI_TPL            OldTpl;\r
+  EFI_STATUS         Status;\r
 \r
   //\r
   // Get pointer to SNP driver instance for *This.\r
@@ -90,78 +88,81 @@ SnpUndi32Statistics (
   // Return error if the SNP is not initialized.\r
   //\r
   switch (Snp->Mode.State) {\r
-  case EfiSimpleNetworkInitialized:\r
-    break;\r
+    case EfiSimpleNetworkInitialized:\r
+      break;\r
 \r
-  case EfiSimpleNetworkStopped:\r
-    Status = EFI_NOT_STARTED;\r
-    goto ON_EXIT;\r
+    case EfiSimpleNetworkStopped:\r
+      Status = EFI_NOT_STARTED;\r
+      goto ON_EXIT;\r
 \r
-  default:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto ON_EXIT;\r
+    default:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto ON_EXIT;\r
   }\r
+\r
   //\r
   // if we are not resetting the counters, we have to have a valid stat table\r
   // with >0 size. if no reset, no table and no size, return success.\r
   //\r
-  if (!Reset && StatisticsSize == NULL) {\r
+  if (!Reset && (StatisticsSize == NULL)) {\r
     Status = (StatisticsTable != NULL) ? EFI_INVALID_PARAMETER : EFI_SUCCESS;\r
     goto ON_EXIT;\r
   }\r
+\r
   //\r
   // Initialize UNDI Statistics CDB\r
   //\r
-  Snp->Cdb.OpCode     = PXE_OPCODE_STATISTICS;\r
-  Snp->Cdb.CPBsize    = PXE_CPBSIZE_NOT_USED;\r
-  Snp->Cdb.CPBaddr    = PXE_CPBADDR_NOT_USED;\r
-  Snp->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  Snp->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
-  Snp->Cdb.IFnum      = Snp->IfNum;\r
-  Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+  Snp->Cdb.OpCode    = PXE_OPCODE_STATISTICS;\r
+  Snp->Cdb.CPBsize   = PXE_CPBSIZE_NOT_USED;\r
+  Snp->Cdb.CPBaddr   = PXE_CPBADDR_NOT_USED;\r
+  Snp->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  Snp->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
+  Snp->Cdb.IFnum     = Snp->IfNum;\r
+  Snp->Cdb.Control   = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   if (Reset) {\r
-    Snp->Cdb.OpFlags  = PXE_OPFLAGS_STATISTICS_RESET;\r
-    Snp->Cdb.DBsize   = PXE_DBSIZE_NOT_USED;\r
-    Snp->Cdb.DBaddr   = PXE_DBADDR_NOT_USED;\r
-    Db                = Snp->Db;\r
+    Snp->Cdb.OpFlags = PXE_OPFLAGS_STATISTICS_RESET;\r
+    Snp->Cdb.DBsize  = PXE_DBSIZE_NOT_USED;\r
+    Snp->Cdb.DBaddr  = PXE_DBADDR_NOT_USED;\r
+    Db               = Snp->Db;\r
   } else {\r
-    Snp->Cdb.OpFlags                = PXE_OPFLAGS_STATISTICS_READ;\r
-    Snp->Cdb.DBsize                 = (UINT16) sizeof (PXE_DB_STATISTICS);\r
-    Snp->Cdb.DBaddr                 = (UINT64)(UINTN) (Db = Snp->Db);\r
+    Snp->Cdb.OpFlags = PXE_OPFLAGS_STATISTICS_READ;\r
+    Snp->Cdb.DBsize  = (UINT16)sizeof (PXE_DB_STATISTICS);\r
+    Snp->Cdb.DBaddr  = (UINT64)(UINTN)(Db = Snp->Db);\r
   }\r
+\r
   //\r
   // Issue UNDI command and check result.\r
   //\r
   DEBUG ((DEBUG_NET, "\nsnp->undi.statistics()  "));\r
 \r
-  (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
+  (*Snp->IssueUndi32Command)((UINT64)(UINTN)&Snp->Cdb);\r
 \r
   switch (Snp->Cdb.StatCode) {\r
-  case PXE_STATCODE_SUCCESS:\r
-    break;\r
-\r
-  case PXE_STATCODE_UNSUPPORTED:\r
-    DEBUG (\r
-      (DEBUG_ERROR,\r
-      "\nsnp->undi.statistics()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
-      );\r
-\r
-    Status = EFI_UNSUPPORTED;\r
-    goto ON_EXIT;\r
-\r
-  default:\r
-    DEBUG (\r
-      (DEBUG_ERROR,\r
-      "\nsnp->undi.statistics()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
-      );\r
+    case PXE_STATCODE_SUCCESS:\r
+      break;\r
 \r
-    Status = EFI_DEVICE_ERROR;\r
-    goto ON_EXIT;\r
+    case PXE_STATCODE_UNSUPPORTED:\r
+      DEBUG (\r
+        (DEBUG_ERROR,\r
+         "\nsnp->undi.statistics()  %xh:%xh\n",\r
+         Snp->Cdb.StatFlags,\r
+         Snp->Cdb.StatCode)\r
+        );\r
+\r
+      Status = EFI_UNSUPPORTED;\r
+      goto ON_EXIT;\r
+\r
+    default:\r
+      DEBUG (\r
+        (DEBUG_ERROR,\r
+         "\nsnp->undi.statistics()  %xh:%xh\n",\r
+         Snp->Cdb.StatFlags,\r
+         Snp->Cdb.StatCode)\r
+        );\r
+\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto ON_EXIT;\r
   }\r
 \r
   if (Reset) {\r
@@ -171,16 +172,17 @@ SnpUndi32Statistics (
 \r
   if (StatisticsTable == NULL) {\r
     *StatisticsSize = sizeof (EFI_NETWORK_STATISTICS);\r
-    Status = EFI_BUFFER_TOO_SMALL;\r
+    Status          = EFI_BUFFER_TOO_SMALL;\r
     goto ON_EXIT;\r
   }\r
+\r
   //\r
   // Convert the UNDI statistics information to SNP statistics\r
   // information.\r
   //\r
   ZeroMem (StatisticsTable, *StatisticsSize);\r
-  Stp   = (UINT64 *) StatisticsTable;\r
-  Size  = 0;\r
+  Stp  = (UINT64 *)StatisticsTable;\r
+  Size = 0;\r
 \r
   for (Index = 0, Mask = 1; Index < 64; Index++, Mask = LShiftU64 (Mask, 1), Stp++) {\r
     //\r
@@ -192,12 +194,13 @@ SnpUndi32Statistics (
     }\r
 \r
     if ((Db->Supported & Mask) != 0) {\r
-      *Stp  = Db->Data[Index];\r
-      Size  = Index + 1;\r
+      *Stp = Db->Data[Index];\r
+      Size = Index + 1;\r
     } else {\r
       SetMem (Stp, sizeof (UINT64), 0xFF);\r
     }\r
   }\r
+\r
   //\r
   // Compute size up to last supported statistic.\r
   //\r
@@ -211,10 +214,10 @@ SnpUndi32Statistics (
 \r
   if (*StatisticsSize >= Size) {\r
     *StatisticsSize = Size;\r
-    Status = EFI_SUCCESS;\r
+    Status          = EFI_SUCCESS;\r
   } else {\r
     *StatisticsSize = Size;\r
-    Status = EFI_BUFFER_TOO_SMALL;\r
+    Status          = EFI_BUFFER_TOO_SMALL;\r
   }\r
 \r
 ON_EXIT:\r
index b45b87cf9ce2fc8103446f682253b1039ab61bfd..a3ce530feafd41459814a2786036fb34e14eb2aa 100644 (file)
@@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Snp.h"\r
 \r
-\r
 /**\r
   Call UNDI to stop the interface and changes the snp state.\r
 \r
@@ -20,37 +19,38 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 PxeStop (\r
-  SNP_DRIVER *Snp\r
+  SNP_DRIVER  *Snp\r
   )\r
 {\r
-  Snp->Cdb.OpCode     = PXE_OPCODE_STOP;\r
-  Snp->Cdb.OpFlags    = PXE_OPFLAGS_NOT_USED;\r
-  Snp->Cdb.CPBsize    = PXE_CPBSIZE_NOT_USED;\r
-  Snp->Cdb.DBsize     = PXE_DBSIZE_NOT_USED;\r
-  Snp->Cdb.CPBaddr    = PXE_CPBADDR_NOT_USED;\r
-  Snp->Cdb.DBaddr     = PXE_DBADDR_NOT_USED;\r
-  Snp->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  Snp->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
-  Snp->Cdb.IFnum      = Snp->IfNum;\r
-  Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+  Snp->Cdb.OpCode    = PXE_OPCODE_STOP;\r
+  Snp->Cdb.OpFlags   = PXE_OPFLAGS_NOT_USED;\r
+  Snp->Cdb.CPBsize   = PXE_CPBSIZE_NOT_USED;\r
+  Snp->Cdb.DBsize    = PXE_DBSIZE_NOT_USED;\r
+  Snp->Cdb.CPBaddr   = PXE_CPBADDR_NOT_USED;\r
+  Snp->Cdb.DBaddr    = PXE_DBADDR_NOT_USED;\r
+  Snp->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  Snp->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
+  Snp->Cdb.IFnum     = Snp->IfNum;\r
+  Snp->Cdb.Control   = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   //\r
   // Issue UNDI command\r
   //\r
   DEBUG ((DEBUG_NET, "\nsnp->undi.stop()  "));\r
 \r
-  (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
+  (*Snp->IssueUndi32Command)((UINT64)(UINTN)&Snp->Cdb);\r
 \r
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r
     DEBUG (\r
       (DEBUG_WARN,\r
-      "\nsnp->undi.stop()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
+       "\nsnp->undi.stop()  %xh:%xh\n",\r
+       Snp->Cdb.StatFlags,\r
+       Snp->Cdb.StatCode)\r
       );\r
 \r
     return EFI_DEVICE_ERROR;\r
   }\r
+\r
   //\r
   // Set simple network state to Started and return success.\r
   //\r
@@ -58,7 +58,6 @@ PxeStop (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Changes the state of a network interface from "started" to "stopped."\r
 \r
@@ -83,7 +82,7 @@ PxeStop (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32Stop (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This\r
   )\r
 {\r
   SNP_DRIVER  *Snp;\r
@@ -99,16 +98,16 @@ SnpUndi32Stop (
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   switch (Snp->Mode.State) {\r
-  case EfiSimpleNetworkStarted:\r
-    break;\r
+    case EfiSimpleNetworkStarted:\r
+      break;\r
 \r
-  case EfiSimpleNetworkStopped:\r
-    Status = EFI_NOT_STARTED;\r
-    goto ON_EXIT;\r
+    case EfiSimpleNetworkStopped:\r
+      Status = EFI_NOT_STARTED;\r
+      goto ON_EXIT;\r
 \r
-  default:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto ON_EXIT;\r
+    default:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto ON_EXIT;\r
   }\r
 \r
   Status = PxeStop (Snp);\r
index 3ff6b9d16749a2ae58202de9ee222c216b7d76b7..e2c7467b867009b9806f2a7410108e210b641d22 100644 (file)
@@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Snp.h"\r
 \r
-\r
 /**\r
   Call UNDI to create the meadia header for the given data buffer.\r
 \r
@@ -27,14 +26,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 PxeFillHeader (\r
-  SNP_DRIVER      *Snp,\r
-  VOID            *MacHeaderPtr,\r
-  UINTN           HeaderSize,\r
-  VOID            *Buffer,\r
-  UINTN           BufferSize,\r
-  EFI_MAC_ADDRESS *DestAddr,\r
-  EFI_MAC_ADDRESS *SrcAddr,\r
-  UINT16          *ProtocolPtr\r
+  SNP_DRIVER       *Snp,\r
+  VOID             *MacHeaderPtr,\r
+  UINTN            HeaderSize,\r
+  VOID             *Buffer,\r
+  UINTN            BufferSize,\r
+  EFI_MAC_ADDRESS  *DestAddr,\r
+  EFI_MAC_ADDRESS  *SrcAddr,\r
+  UINT16           *ProtocolPtr\r
   )\r
 {\r
   PXE_CPB_FILL_HEADER_FRAGMENTED  *Cpb;\r
@@ -42,90 +41,89 @@ PxeFillHeader (
   Cpb = Snp->Cpb;\r
   if (SrcAddr != NULL) {\r
     CopyMem (\r
-      (VOID *) Cpb->SrcAddr,\r
-      (VOID *) SrcAddr,\r
+      (VOID *)Cpb->SrcAddr,\r
+      (VOID *)SrcAddr,\r
       Snp->Mode.HwAddressSize\r
       );\r
   } else {\r
     CopyMem (\r
-      (VOID *) Cpb->SrcAddr,\r
-      (VOID *) &(Snp->Mode.CurrentAddress),\r
+      (VOID *)Cpb->SrcAddr,\r
+      (VOID *)&(Snp->Mode.CurrentAddress),\r
       Snp->Mode.HwAddressSize\r
       );\r
   }\r
 \r
   CopyMem (\r
-    (VOID *) Cpb->DestAddr,\r
-    (VOID *) DestAddr,\r
+    (VOID *)Cpb->DestAddr,\r
+    (VOID *)DestAddr,\r
     Snp->Mode.HwAddressSize\r
     );\r
 \r
   //\r
   // we need to do the byte swapping\r
   //\r
-  Cpb->Protocol             = (UINT16) PXE_SWAP_UINT16 (*ProtocolPtr);\r
+  Cpb->Protocol = (UINT16)PXE_SWAP_UINT16 (*ProtocolPtr);\r
 \r
-  Cpb->PacketLen            = (UINT32) (BufferSize);\r
-  Cpb->MediaHeaderLen       = (UINT16) HeaderSize;\r
+  Cpb->PacketLen      = (UINT32)(BufferSize);\r
+  Cpb->MediaHeaderLen = (UINT16)HeaderSize;\r
 \r
-  Cpb->FragCnt              = 2;\r
-  Cpb->reserved             = 0;\r
+  Cpb->FragCnt  = 2;\r
+  Cpb->reserved = 0;\r
 \r
-  Cpb->FragDesc[0].FragAddr = (UINT64)(UINTN) MacHeaderPtr;\r
-  Cpb->FragDesc[0].FragLen  = (UINT32) HeaderSize;\r
-  Cpb->FragDesc[1].FragAddr = (UINT64)(UINTN) Buffer;\r
-  Cpb->FragDesc[1].FragLen  = (UINT32) BufferSize;\r
+  Cpb->FragDesc[0].FragAddr = (UINT64)(UINTN)MacHeaderPtr;\r
+  Cpb->FragDesc[0].FragLen  = (UINT32)HeaderSize;\r
+  Cpb->FragDesc[1].FragAddr = (UINT64)(UINTN)Buffer;\r
+  Cpb->FragDesc[1].FragLen  = (UINT32)BufferSize;\r
 \r
   Cpb->FragDesc[0].reserved = Cpb->FragDesc[1].reserved = 0;\r
 \r
-  Snp->Cdb.OpCode     = PXE_OPCODE_FILL_HEADER;\r
-  Snp->Cdb.OpFlags    = PXE_OPFLAGS_FILL_HEADER_FRAGMENTED;\r
+  Snp->Cdb.OpCode  = PXE_OPCODE_FILL_HEADER;\r
+  Snp->Cdb.OpFlags = PXE_OPFLAGS_FILL_HEADER_FRAGMENTED;\r
 \r
-  Snp->Cdb.DBsize     = PXE_DBSIZE_NOT_USED;\r
-  Snp->Cdb.DBaddr     = PXE_DBADDR_NOT_USED;\r
+  Snp->Cdb.DBsize = PXE_DBSIZE_NOT_USED;\r
+  Snp->Cdb.DBaddr = PXE_DBADDR_NOT_USED;\r
 \r
-  Snp->Cdb.CPBsize    = (UINT16) sizeof (PXE_CPB_FILL_HEADER_FRAGMENTED);\r
-  Snp->Cdb.CPBaddr    = (UINT64)(UINTN) Cpb;\r
+  Snp->Cdb.CPBsize = (UINT16)sizeof (PXE_CPB_FILL_HEADER_FRAGMENTED);\r
+  Snp->Cdb.CPBaddr = (UINT64)(UINTN)Cpb;\r
 \r
-  Snp->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  Snp->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
-  Snp->Cdb.IFnum      = Snp->IfNum;\r
-  Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+  Snp->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  Snp->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
+  Snp->Cdb.IFnum     = Snp->IfNum;\r
+  Snp->Cdb.Control   = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   //\r
   // Issue UNDI command and check result.\r
   //\r
   DEBUG ((DEBUG_NET, "\nSnp->undi.fill_header()  "));\r
 \r
-  (*Snp->IssueUndi32Command) ((UINT64) (UINTN) &Snp->Cdb);\r
+  (*Snp->IssueUndi32Command)((UINT64)(UINTN)&Snp->Cdb);\r
 \r
   switch (Snp->Cdb.StatCode) {\r
-  case PXE_STATCODE_SUCCESS:\r
-    return EFI_SUCCESS;\r
-\r
-  case PXE_STATCODE_INVALID_PARAMETER:\r
-    DEBUG (\r
-      (DEBUG_ERROR,\r
-      "\nSnp->undi.fill_header()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
-      );\r
-\r
-    return EFI_INVALID_PARAMETER;\r
-\r
-  default:\r
-    DEBUG (\r
-      (DEBUG_ERROR,\r
-      "\nSnp->undi.fill_header()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
-      );\r
-\r
-    return EFI_DEVICE_ERROR;\r
+    case PXE_STATCODE_SUCCESS:\r
+      return EFI_SUCCESS;\r
+\r
+    case PXE_STATCODE_INVALID_PARAMETER:\r
+      DEBUG (\r
+        (DEBUG_ERROR,\r
+         "\nSnp->undi.fill_header()  %xh:%xh\n",\r
+         Snp->Cdb.StatFlags,\r
+         Snp->Cdb.StatCode)\r
+        );\r
+\r
+      return EFI_INVALID_PARAMETER;\r
+\r
+    default:\r
+      DEBUG (\r
+        (DEBUG_ERROR,\r
+         "\nSnp->undi.fill_header()  %xh:%xh\n",\r
+         Snp->Cdb.StatFlags,\r
+         Snp->Cdb.StatCode)\r
+        );\r
+\r
+      return EFI_DEVICE_ERROR;\r
   }\r
 }\r
 \r
-\r
 /**\r
   This routine calls undi to transmit the given data buffer\r
 \r
@@ -139,34 +137,34 @@ PxeFillHeader (
 **/\r
 EFI_STATUS\r
 PxeTransmit (\r
-  SNP_DRIVER *Snp,\r
-  VOID       *Buffer,\r
-  UINTN      BufferSize\r
+  SNP_DRIVER  *Snp,\r
+  VOID        *Buffer,\r
+  UINTN       BufferSize\r
   )\r
 {\r
   PXE_CPB_TRANSMIT  *Cpb;\r
   EFI_STATUS        Status;\r
 \r
-  Cpb             = Snp->Cpb;\r
-  Cpb->FrameAddr  = (UINT64) (UINTN) Buffer;\r
-  Cpb->DataLen    = (UINT32) BufferSize;\r
+  Cpb            = Snp->Cpb;\r
+  Cpb->FrameAddr = (UINT64)(UINTN)Buffer;\r
+  Cpb->DataLen   = (UINT32)BufferSize;\r
 \r
   Cpb->MediaheaderLen = 0;\r
   Cpb->reserved       = 0;\r
 \r
-  Snp->Cdb.OpFlags    = PXE_OPFLAGS_TRANSMIT_WHOLE;\r
+  Snp->Cdb.OpFlags = PXE_OPFLAGS_TRANSMIT_WHOLE;\r
 \r
-  Snp->Cdb.CPBsize    = (UINT16) sizeof (PXE_CPB_TRANSMIT);\r
-  Snp->Cdb.CPBaddr    = (UINT64)(UINTN) Cpb;\r
+  Snp->Cdb.CPBsize = (UINT16)sizeof (PXE_CPB_TRANSMIT);\r
+  Snp->Cdb.CPBaddr = (UINT64)(UINTN)Cpb;\r
 \r
-  Snp->Cdb.OpCode     = PXE_OPCODE_TRANSMIT;\r
-  Snp->Cdb.DBsize     = PXE_DBSIZE_NOT_USED;\r
-  Snp->Cdb.DBaddr     = PXE_DBADDR_NOT_USED;\r
+  Snp->Cdb.OpCode = PXE_OPCODE_TRANSMIT;\r
+  Snp->Cdb.DBsize = PXE_DBSIZE_NOT_USED;\r
+  Snp->Cdb.DBaddr = PXE_DBADDR_NOT_USED;\r
 \r
-  Snp->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  Snp->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
-  Snp->Cdb.IFnum      = Snp->IfNum;\r
-  Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+  Snp->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  Snp->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
+  Snp->Cdb.IFnum     = Snp->IfNum;\r
+  Snp->Cdb.Control   = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   //\r
   // Issue UNDI command and check result.\r
@@ -177,7 +175,7 @@ PxeTransmit (
   DEBUG ((DEBUG_NET, "\nSnp->Cdb.DBaddr  == %LX", Snp->Cdb.DBaddr));\r
   DEBUG ((DEBUG_NET, "\nCpb->FrameAddr   == %LX\n", Cpb->FrameAddr));\r
 \r
-  (*Snp->IssueUndi32Command) ((UINT64) (UINTN) &Snp->Cdb);\r
+  (*Snp->IssueUndi32Command)((UINT64)(UINTN)&Snp->Cdb);\r
 \r
   DEBUG ((DEBUG_NET, "\nexit Snp->undi.transmit()  "));\r
 \r
@@ -185,29 +183,29 @@ PxeTransmit (
   // we will unmap the buffers in get_status call, not here\r
   //\r
   switch (Snp->Cdb.StatCode) {\r
-  case PXE_STATCODE_SUCCESS:\r
-    return EFI_SUCCESS;\r
-\r
-  case PXE_STATCODE_BUFFER_FULL:\r
-  case PXE_STATCODE_QUEUE_FULL:\r
-  case PXE_STATCODE_BUSY:\r
-    Status = EFI_NOT_READY;\r
-    DEBUG (\r
-      (DEBUG_NET,\r
-      "\nSnp->undi.transmit()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
-      );\r
-    break;\r
-\r
-  default:\r
-    DEBUG (\r
-      (DEBUG_ERROR,\r
-      "\nSnp->undi.transmit()  %xh:%xh\n",\r
-      Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatCode)\r
-      );\r
-    Status = EFI_DEVICE_ERROR;\r
+    case PXE_STATCODE_SUCCESS:\r
+      return EFI_SUCCESS;\r
+\r
+    case PXE_STATCODE_BUFFER_FULL:\r
+    case PXE_STATCODE_QUEUE_FULL:\r
+    case PXE_STATCODE_BUSY:\r
+      Status = EFI_NOT_READY;\r
+      DEBUG (\r
+        (DEBUG_NET,\r
+         "\nSnp->undi.transmit()  %xh:%xh\n",\r
+         Snp->Cdb.StatFlags,\r
+         Snp->Cdb.StatCode)\r
+        );\r
+      break;\r
+\r
+    default:\r
+      DEBUG (\r
+        (DEBUG_ERROR,\r
+         "\nSnp->undi.transmit()  %xh:%xh\n",\r
+         Snp->Cdb.StatFlags,\r
+         Snp->Cdb.StatCode)\r
+        );\r
+      Status = EFI_DEVICE_ERROR;\r
   }\r
 \r
   return Status;\r
@@ -270,13 +268,13 @@ PxeTransmit (
 EFI_STATUS\r
 EFIAPI\r
 SnpUndi32Transmit (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN UINTN                       HeaderSize,\r
-  IN UINTN                       BufferSize,\r
-  IN VOID                        *Buffer,\r
-  IN EFI_MAC_ADDRESS             *SrcAddr   OPTIONAL,\r
-  IN EFI_MAC_ADDRESS             *DestAddr  OPTIONAL,\r
-  IN UINT16                      *Protocol  OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN UINTN                        HeaderSize,\r
+  IN UINTN                        BufferSize,\r
+  IN VOID                         *Buffer,\r
+  IN EFI_MAC_ADDRESS              *SrcAddr   OPTIONAL,\r
+  IN EFI_MAC_ADDRESS              *DestAddr  OPTIONAL,\r
+  IN UINT16                       *Protocol  OPTIONAL\r
   )\r
 {\r
   SNP_DRIVER  *Snp;\r
@@ -296,16 +294,16 @@ SnpUndi32Transmit (
   }\r
 \r
   switch (Snp->Mode.State) {\r
-  case EfiSimpleNetworkInitialized:\r
-    break;\r
+    case EfiSimpleNetworkInitialized:\r
+      break;\r
 \r
-  case EfiSimpleNetworkStopped:\r
-    Status = EFI_NOT_STARTED;\r
-    goto ON_EXIT;\r
+    case EfiSimpleNetworkStopped:\r
+      Status = EFI_NOT_STARTED;\r
+      goto ON_EXIT;\r
 \r
-  default:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto ON_EXIT;\r
+    default:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto ON_EXIT;\r
   }\r
 \r
   if (Buffer == NULL) {\r
@@ -323,21 +321,21 @@ SnpUndi32Transmit (
   // we need the destination address and the protocol\r
   //\r
   if (HeaderSize != 0) {\r
-    if (HeaderSize != Snp->Mode.MediaHeaderSize || DestAddr == 0 || Protocol == 0) {\r
+    if ((HeaderSize != Snp->Mode.MediaHeaderSize) || (DestAddr == 0) || (Protocol == 0)) {\r
       Status = EFI_INVALID_PARAMETER;\r
       goto ON_EXIT;\r
     }\r
 \r
     Status = PxeFillHeader (\r
-              Snp,\r
-              Buffer,\r
-              HeaderSize,\r
-              (UINT8 *) Buffer + HeaderSize,\r
-              BufferSize - HeaderSize,\r
-              DestAddr,\r
-              SrcAddr,\r
-              Protocol\r
-              );\r
+               Snp,\r
+               Buffer,\r
+               HeaderSize,\r
+               (UINT8 *)Buffer + HeaderSize,\r
+               BufferSize - HeaderSize,\r
+               DestAddr,\r
+               SrcAddr,\r
+               Protocol\r
+               );\r
 \r
     if (EFI_ERROR (Status)) {\r
       goto ON_EXIT;\r
index c337e69290f90fbf22303bda9b96c4da947638e7..f0e904123876d671edbb0b591acdfc2cc8873ffb 100644 (file)
@@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Snp.h"\r
 \r
-\r
 /**\r
   Notification call back function for WaitForPacket event.\r
 \r
@@ -19,64 +18,67 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 VOID\r
 EFIAPI\r
 SnpWaitForPacketNotify (\r
-  EFI_EVENT     Event,\r
-  VOID          *SnpPtr\r
+  EFI_EVENT  Event,\r
+  VOID       *SnpPtr\r
   )\r
 {\r
-  PXE_DB_GET_STATUS PxeDbGetStatus;\r
+  PXE_DB_GET_STATUS  PxeDbGetStatus;\r
 \r
   //\r
   // Do nothing if either parameter is a NULL pointer.\r
   //\r
-  if (Event == NULL || SnpPtr == NULL) {\r
-    return ;\r
+  if ((Event == NULL) || (SnpPtr == NULL)) {\r
+    return;\r
   }\r
+\r
   //\r
   // Do nothing if the SNP interface is not initialized.\r
   //\r
-  switch (((SNP_DRIVER *) SnpPtr)->Mode.State) {\r
-  case EfiSimpleNetworkInitialized:\r
-    break;\r
+  switch (((SNP_DRIVER *)SnpPtr)->Mode.State) {\r
+    case EfiSimpleNetworkInitialized:\r
+      break;\r
 \r
-  case EfiSimpleNetworkStopped:\r
-  case EfiSimpleNetworkStarted:\r
-  default:\r
-    return ;\r
+    case EfiSimpleNetworkStopped:\r
+    case EfiSimpleNetworkStarted:\r
+    default:\r
+      return;\r
   }\r
+\r
   //\r
   // Fill in CDB for UNDI GetStatus().\r
   //\r
-  ((SNP_DRIVER *) SnpPtr)->Cdb.OpCode     = PXE_OPCODE_GET_STATUS;\r
-  ((SNP_DRIVER *) SnpPtr)->Cdb.OpFlags    = 0;\r
-  ((SNP_DRIVER *) SnpPtr)->Cdb.CPBsize    = PXE_CPBSIZE_NOT_USED;\r
-  ((SNP_DRIVER *) SnpPtr)->Cdb.CPBaddr    = PXE_CPBADDR_NOT_USED;\r
-  ((SNP_DRIVER *) SnpPtr)->Cdb.DBsize     = (UINT16) (sizeof (UINT32) * 2);\r
-  ((SNP_DRIVER *) SnpPtr)->Cdb.DBaddr     = (UINT64)(UINTN) (((SNP_DRIVER *) SnpPtr)->Db);\r
-  ((SNP_DRIVER *) SnpPtr)->Cdb.StatCode   = PXE_STATCODE_INITIALIZE;\r
-  ((SNP_DRIVER *) SnpPtr)->Cdb.StatFlags  = PXE_STATFLAGS_INITIALIZE;\r
-  ((SNP_DRIVER *) SnpPtr)->Cdb.IFnum      = ((SNP_DRIVER *) SnpPtr)->IfNum;\r
-  ((SNP_DRIVER *) SnpPtr)->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
+  ((SNP_DRIVER *)SnpPtr)->Cdb.OpCode    = PXE_OPCODE_GET_STATUS;\r
+  ((SNP_DRIVER *)SnpPtr)->Cdb.OpFlags   = 0;\r
+  ((SNP_DRIVER *)SnpPtr)->Cdb.CPBsize   = PXE_CPBSIZE_NOT_USED;\r
+  ((SNP_DRIVER *)SnpPtr)->Cdb.CPBaddr   = PXE_CPBADDR_NOT_USED;\r
+  ((SNP_DRIVER *)SnpPtr)->Cdb.DBsize    = (UINT16)(sizeof (UINT32) * 2);\r
+  ((SNP_DRIVER *)SnpPtr)->Cdb.DBaddr    = (UINT64)(UINTN)(((SNP_DRIVER *)SnpPtr)->Db);\r
+  ((SNP_DRIVER *)SnpPtr)->Cdb.StatCode  = PXE_STATCODE_INITIALIZE;\r
+  ((SNP_DRIVER *)SnpPtr)->Cdb.StatFlags = PXE_STATFLAGS_INITIALIZE;\r
+  ((SNP_DRIVER *)SnpPtr)->Cdb.IFnum     = ((SNP_DRIVER *)SnpPtr)->IfNum;\r
+  ((SNP_DRIVER *)SnpPtr)->Cdb.Control   = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   //\r
   // Clear contents of DB buffer.\r
   //\r
-  ZeroMem (((SNP_DRIVER *) SnpPtr)->Db, sizeof (UINT32) * 2);\r
+  ZeroMem (((SNP_DRIVER *)SnpPtr)->Db, sizeof (UINT32) * 2);\r
 \r
   //\r
   // Issue UNDI command and check result.\r
   //\r
-  (*((SNP_DRIVER *) SnpPtr)->IssueUndi32Command) ((UINT64)(UINTN) &((SNP_DRIVER *) SnpPtr)->Cdb);\r
+  (*((SNP_DRIVER *)SnpPtr)->IssueUndi32Command)((UINT64)(UINTN)&((SNP_DRIVER *)SnpPtr)->Cdb);\r
 \r
-  if (((SNP_DRIVER *) SnpPtr)->Cdb.StatCode != EFI_SUCCESS) {\r
-    return ;\r
+  if (((SNP_DRIVER *)SnpPtr)->Cdb.StatCode != EFI_SUCCESS) {\r
+    return;\r
   }\r
+\r
   //\r
   // We might have a packet.  Check the receive length and signal\r
   // the event if the length is not zero.\r
   //\r
   CopyMem (\r
     &PxeDbGetStatus,\r
-    ((SNP_DRIVER *) SnpPtr)->Db,\r
+    ((SNP_DRIVER *)SnpPtr)->Db,\r
     sizeof (UINT32) * 2\r
     );\r
 \r
index ddc7116e553c7ede8d3383d3ab41c355561ae0db..7c4575eda57e57a50ca44261df115e54cd9690d0 100644 (file)
@@ -138,7 +138,7 @@ TcpComponentNameGetControllerName (
 ///\r
 /// EFI Component Name Protocol\r
 ///\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL     gTcpComponentName = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gTcpComponentName = {\r
   TcpComponentNameGetDriverName,\r
   TcpComponentNameGetControllerName,\r
   "eng"\r
@@ -147,13 +147,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL     gTcpComponentName
 ///\r
 /// EFI Component Name 2 Protocol\r
 ///\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL    gTcpComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) TcpComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) TcpComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gTcpComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)TcpComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)TcpComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE        mTcpDriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mTcpDriverNameTable[] = {\r
   {\r
     "eng;en",\r
     L"TCP Network Service Driver"\r
@@ -164,7 +164,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE        mTcpDriverNameTabl
   }\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE        *gTcpControllerNameTable = NULL;\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  *gTcpControllerNameTable = NULL;\r
 \r
 /**\r
   Retrieves a Unicode string that is the user-readable name of the driver.\r
@@ -216,7 +216,7 @@ TcpComponentNameGetDriverName (
            This->SupportedLanguages,\r
            mTcpDriverNameTable,\r
            DriverName,\r
-           (BOOLEAN) (This == &gTcpComponentName)\r
+           (BOOLEAN)(This == &gTcpComponentName)\r
            );\r
 }\r
 \r
@@ -232,12 +232,12 @@ TcpComponentNameGetDriverName (
 **/\r
 EFI_STATUS\r
 UpdateTcp4Name (\r
-  IN    EFI_TCP4_PROTOCOL             *Tcp4\r
+  IN    EFI_TCP4_PROTOCOL  *Tcp4\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  CHAR16                           HandleName[80];\r
-  EFI_TCP4_CONFIG_DATA             Tcp4ConfigData;\r
+  EFI_STATUS            Status;\r
+  CHAR16                HandleName[80];\r
+  EFI_TCP4_CONFIG_DATA  Tcp4ConfigData;\r
 \r
   if (Tcp4 == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -250,7 +250,9 @@ UpdateTcp4Name (
   ZeroMem (&Tcp4ConfigData, sizeof (Tcp4ConfigData));\r
   Status = Tcp4->GetModeData (Tcp4, NULL, &Tcp4ConfigData, NULL, NULL, NULL);\r
   if (!EFI_ERROR (Status)) {\r
-    UnicodeSPrint (HandleName, sizeof (HandleName),\r
+    UnicodeSPrint (\r
+      HandleName,\r
+      sizeof (HandleName),\r
       L"TCPv4 (SrcPort=%d, DestPort=%d, ActiveFlag=%s)",\r
       Tcp4ConfigData.AccessPoint.StationPort,\r
       Tcp4ConfigData.AccessPoint.RemotePort,\r
@@ -303,12 +305,12 @@ UpdateTcp4Name (
 **/\r
 EFI_STATUS\r
 UpdateTcp6Name (\r
-  IN    EFI_TCP6_PROTOCOL             *Tcp6\r
+  IN    EFI_TCP6_PROTOCOL  *Tcp6\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  CHAR16                           HandleName[80];\r
-  EFI_TCP6_CONFIG_DATA             Tcp6ConfigData;\r
+  EFI_STATUS            Status;\r
+  CHAR16                HandleName[80];\r
+  EFI_TCP6_CONFIG_DATA  Tcp6ConfigData;\r
 \r
   if (Tcp6 == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -320,7 +322,9 @@ UpdateTcp6Name (
   ZeroMem (&Tcp6ConfigData, sizeof (Tcp6ConfigData));\r
   Status = Tcp6->GetModeData (Tcp6, NULL, &Tcp6ConfigData, NULL, NULL, NULL);\r
   if (!EFI_ERROR (Status)) {\r
-    UnicodeSPrint (HandleName, sizeof (HandleName),\r
+    UnicodeSPrint (\r
+      HandleName,\r
+      sizeof (HandleName),\r
       L"TCPv6(SrcPort=%d, DestPort=%d, ActiveFlag=%d)",\r
       Tcp6ConfigData.AccessPoint.StationPort,\r
       Tcp6ConfigData.AccessPoint.RemotePort,\r
@@ -332,7 +336,6 @@ UpdateTcp6Name (
     return Status;\r
   }\r
 \r
-\r
   if (gTcpControllerNameTable != NULL) {\r
     FreeUnicodeStringTable (gTcpControllerNameTable);\r
     gTcpControllerNameTable = NULL;\r
@@ -434,9 +437,9 @@ TcpComponentNameGetControllerName (
   OUT CHAR16                       **ControllerName\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_TCP4_PROTOCOL             *Tcp4;\r
-  EFI_TCP6_PROTOCOL             *Tcp6;\r
+  EFI_STATUS         Status;\r
+  EFI_TCP4_PROTOCOL  *Tcp4;\r
+  EFI_TCP6_PROTOCOL  *Tcp6;\r
 \r
   //\r
   // Only provide names for child handles.\r
@@ -460,7 +463,7 @@ TcpComponentNameGetControllerName (
     Status = gBS->OpenProtocol (\r
                     ChildHandle,\r
                     &gEfiTcp6ProtocolGuid,\r
-                   (VOID **)&Tcp6,\r
+                    (VOID **)&Tcp6,\r
                     NULL,\r
                     NULL,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -491,13 +494,13 @@ TcpComponentNameGetControllerName (
     // Retrieve an instance of a produced protocol from ChildHandle\r
     //\r
     Status = gBS->OpenProtocol (\r
-               ChildHandle,\r
-               &gEfiTcp4ProtocolGuid,\r
-              (VOID **)&Tcp4,\r
-               NULL,\r
-               NULL,\r
-               EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
-               );\r
+                    ChildHandle,\r
+                    &gEfiTcp4ProtocolGuid,\r
+                    (VOID **)&Tcp4,\r
+                    NULL,\r
+                    NULL,\r
+                    EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                    );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -519,4 +522,3 @@ TcpComponentNameGetControllerName (
            (BOOLEAN)(This == &gTcpComponentName)\r
            );\r
 }\r
-\r
index 2ab0b691402601a478af68c402a305fcaeac2519..145495223bf329b1267faa99e7cc7026c7da3380 100644 (file)
@@ -19,7 +19,7 @@
 **/\r
 NET_BUF *\r
 SockBufFirst (\r
-  IN SOCK_BUFFER *Sockbuf\r
+  IN SOCK_BUFFER  *Sockbuf\r
   )\r
 {\r
   LIST_ENTRY  *NetbufList;\r
@@ -45,8 +45,8 @@ SockBufFirst (
 **/\r
 NET_BUF *\r
 SockBufNext (\r
-  IN SOCK_BUFFER *Sockbuf,\r
-  IN NET_BUF     *SockEntry\r
+  IN SOCK_BUFFER  *Sockbuf,\r
+  IN NET_BUF      *SockEntry\r
   )\r
 {\r
   LIST_ENTRY  *NetbufList;\r
@@ -56,8 +56,8 @@ SockBufNext (
   if ((SockEntry->List.ForwardLink == NetbufList) ||\r
       (SockEntry->List.BackLink == &SockEntry->List) ||\r
       (SockEntry->List.ForwardLink == &SockEntry->List)\r
-      ) {\r
-\r
+      )\r
+  {\r
     return NULL;\r
   }\r
 \r
@@ -73,7 +73,7 @@ SockBufNext (
 VOID\r
 EFIAPI\r
 SockFreeFoo (\r
-  IN VOID      *Arg\r
+  IN VOID  *Arg\r
   )\r
 {\r
   return;\r
@@ -94,9 +94,9 @@ SockFreeFoo (
 **/\r
 UINT32\r
 SockTcpDataToRcv (\r
-  IN  SOCK_BUFFER   *SockBuffer,\r
-  OUT BOOLEAN       *IsUrg,\r
-  IN  UINT32        BufLen\r
+  IN  SOCK_BUFFER  *SockBuffer,\r
+  OUT BOOLEAN      *IsUrg,\r
+  IN  UINT32       BufLen\r
   )\r
 {\r
   NET_BUF       *RcvBufEntry;\r
@@ -112,16 +112,15 @@ SockTcpDataToRcv (
   RcvBufEntry = SockBufFirst (SockBuffer);\r
   ASSERT (RcvBufEntry != NULL);\r
 \r
-  TcpRsvData  = (TCP_RSV_DATA *) RcvBufEntry->ProtoData;\r
+  TcpRsvData = (TCP_RSV_DATA *)RcvBufEntry->ProtoData;\r
 \r
   //\r
   // Check whether the receive data is out of bound. If yes, calculate the maximum\r
   // allowed length of the urgent data and output it.\r
   //\r
-  *IsUrg      = (BOOLEAN) ((TcpRsvData->UrgLen > 0) ? TRUE : FALSE);\r
+  *IsUrg = (BOOLEAN)((TcpRsvData->UrgLen > 0) ? TRUE : FALSE);\r
 \r
   if (*IsUrg && (TcpRsvData->UrgLen < RcvBufEntry->TotalSize)) {\r
-\r
     DataLen = MIN (TcpRsvData->UrgLen, BufLen);\r
 \r
     if (DataLen < TcpRsvData->UrgLen) {\r
@@ -131,29 +130,26 @@ SockTcpDataToRcv (
     }\r
 \r
     return DataLen;\r
-\r
   }\r
 \r
   //\r
   // Process the next socket receive buffer to get the maximum allowed length\r
   // of the received data.\r
   //\r
-  DataLen     = RcvBufEntry->TotalSize;\r
+  DataLen = RcvBufEntry->TotalSize;\r
 \r
   RcvBufEntry = SockBufNext (SockBuffer, RcvBufEntry);\r
 \r
   while ((BufLen > DataLen) && (RcvBufEntry != NULL)) {\r
+    TcpRsvData = (TCP_RSV_DATA *)RcvBufEntry->ProtoData;\r
 \r
-    TcpRsvData  = (TCP_RSV_DATA *) RcvBufEntry->ProtoData;\r
-\r
-    Urg         = (BOOLEAN) ((TcpRsvData->UrgLen > 0) ? TRUE : FALSE);\r
+    Urg = (BOOLEAN)((TcpRsvData->UrgLen > 0) ? TRUE : FALSE);\r
 \r
     if (*IsUrg != Urg) {\r
       break;\r
     }\r
 \r
-    if (*IsUrg && TcpRsvData->UrgLen < RcvBufEntry->TotalSize) {\r
-\r
+    if (*IsUrg && (TcpRsvData->UrgLen < RcvBufEntry->TotalSize)) {\r
       if (TcpRsvData->UrgLen + DataLen < BufLen) {\r
         TcpRsvData->UrgLen = 0;\r
       } else {\r
@@ -161,7 +157,6 @@ SockTcpDataToRcv (
       }\r
 \r
       return MIN (TcpRsvData->UrgLen + DataLen, BufLen);\r
-\r
     }\r
 \r
     DataLen += RcvBufEntry->TotalSize;\r
@@ -184,10 +179,10 @@ SockTcpDataToRcv (
 **/\r
 VOID\r
 SockSetTcpRxData (\r
-  IN SOCKET     *Sock,\r
-  IN VOID       *TcpRxData,\r
-  IN UINT32     RcvdBytes,\r
-  IN BOOLEAN    IsUrg\r
+  IN SOCKET   *Sock,\r
+  IN VOID     *TcpRxData,\r
+  IN UINT32   RcvdBytes,\r
+  IN BOOLEAN  IsUrg\r
   )\r
 {\r
   UINT32                  Index;\r
@@ -196,22 +191,21 @@ SockSetTcpRxData (
   EFI_TCP4_RECEIVE_DATA   *RxData;\r
   EFI_TCP4_FRAGMENT_DATA  *Fragment;\r
 \r
-  RxData  = (EFI_TCP4_RECEIVE_DATA *) TcpRxData;\r
+  RxData = (EFI_TCP4_RECEIVE_DATA *)TcpRxData;\r
 \r
-  OffSet  = 0;\r
+  OffSet = 0;\r
 \r
   ASSERT (RxData->DataLength >= RcvdBytes);\r
 \r
-  RxData->DataLength  = RcvdBytes;\r
-  RxData->UrgentFlag  = IsUrg;\r
+  RxData->DataLength = RcvdBytes;\r
+  RxData->UrgentFlag = IsUrg;\r
 \r
   //\r
   // Copy the CopyBytes data from socket receive buffer to RxData.\r
   //\r
   for (Index = 0; (Index < RxData->FragmentCount) && (RcvdBytes > 0); Index++) {\r
-\r
     Fragment  = &RxData->FragmentTable[Index];\r
-    CopyBytes = MIN ((UINT32) (Fragment->FragmentLength), RcvdBytes);\r
+    CopyBytes = MIN ((UINT32)(Fragment->FragmentLength), RcvdBytes);\r
 \r
     NetbufQueCopy (\r
       Sock->RcvBuffer.DataQueue,\r
@@ -221,8 +215,8 @@ SockSetTcpRxData (
       );\r
 \r
     Fragment->FragmentLength = CopyBytes;\r
-    RcvdBytes -= CopyBytes;\r
-    OffSet += CopyBytes;\r
+    RcvdBytes               -= CopyBytes;\r
+    OffSet                  += CopyBytes;\r
   }\r
 }\r
 \r
@@ -234,7 +228,7 @@ SockSetTcpRxData (
 **/\r
 VOID\r
 SockProcessSndToken (\r
-  IN OUT SOCKET *Sock\r
+  IN OUT SOCKET  *Sock\r
   )\r
 {\r
   UINT32                  FreeSpace;\r
@@ -253,7 +247,6 @@ SockProcessSndToken (
   // socket layer flow control policy\r
   //\r
   while ((FreeSpace >= Sock->SndBuffer.LowWater) && !IsListEmpty (&Sock->SndTokenList)) {\r
-\r
     SockToken = NET_LIST_HEAD (\r
                   &(Sock->SndTokenList),\r
                   SOCK_TOKEN,\r
@@ -272,11 +265,11 @@ SockProcessSndToken (
     //\r
     // Process it in the light of SockType\r
     //\r
-    SndToken  = (SOCK_IO_TOKEN *) SockToken->Token;\r
-    TxData    = SndToken->Packet.TxData;\r
+    SndToken = (SOCK_IO_TOKEN *)SockToken->Token;\r
+    TxData   = SndToken->Packet.TxData;\r
 \r
-    DataLen   = TxData->DataLength;\r
-    Status    = SockProcessTcpSndData (Sock, TxData);\r
+    DataLen = TxData->DataLength;\r
+    Status  = SockProcessTcpSndData (Sock, TxData);\r
 \r
     if (EFI_ERROR (Status)) {\r
       goto OnError;\r
@@ -284,10 +277,8 @@ SockProcessSndToken (
 \r
     if (DataLen >= FreeSpace) {\r
       FreeSpace = 0;\r
-\r
     } else {\r
       FreeSpace -= DataLen;\r
-\r
     }\r
   }\r
 \r
@@ -311,13 +302,13 @@ OnError:
 **/\r
 UINT32\r
 SockProcessRcvToken (\r
-  IN OUT SOCKET        *Sock,\r
-  IN OUT SOCK_IO_TOKEN *RcvToken\r
+  IN OUT SOCKET         *Sock,\r
+  IN OUT SOCK_IO_TOKEN  *RcvToken\r
   )\r
 {\r
-  UINT32                TokenRcvdBytes;\r
-  EFI_TCP4_RECEIVE_DATA *RxData;\r
-  BOOLEAN               IsUrg;\r
+  UINT32                 TokenRcvdBytes;\r
+  EFI_TCP4_RECEIVE_DATA  *RxData;\r
+  BOOLEAN                IsUrg;\r
 \r
   ASSERT (Sock != NULL);\r
 \r
@@ -356,22 +347,22 @@ SockProcessRcvToken (
 **/\r
 EFI_STATUS\r
 SockProcessTcpSndData (\r
-  IN SOCKET   *Sock,\r
-  IN VOID     *TcpTxData\r
+  IN SOCKET  *Sock,\r
+  IN VOID    *TcpTxData\r
   )\r
 {\r
   NET_BUF                 *SndData;\r
   EFI_STATUS              Status;\r
   EFI_TCP4_TRANSMIT_DATA  *TxData;\r
 \r
-  TxData = (EFI_TCP4_TRANSMIT_DATA *) TcpTxData;\r
+  TxData = (EFI_TCP4_TRANSMIT_DATA *)TcpTxData;\r
 \r
   //\r
   // transform this TxData into a NET_BUFFER\r
   // and insert it into Sock->SndBuffer\r
   //\r
   SndData = NetbufFromExt (\r
-              (NET_FRAGMENT *) TxData->FragmentTable,\r
+              (NET_FRAGMENT *)TxData->FragmentTable,\r
               TxData->FragmentCount,\r
               0,\r
               0,\r
@@ -382,7 +373,7 @@ SockProcessTcpSndData (
   if (NULL == SndData) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockKProcessSndData: Failed to call NetBufferFromExt\n")\r
+       "SockKProcessSndData: Failed to call NetBufferFromExt\n")\r
       );\r
 \r
     return EFI_OUT_OF_RESOURCES;\r
@@ -431,12 +422,12 @@ SockProcessTcpSndData (
 **/\r
 VOID\r
 SockFlushPendingToken (\r
-  IN     SOCKET         *Sock,\r
-  IN OUT LIST_ENTRY     *PendingTokenList\r
+  IN     SOCKET      *Sock,\r
+  IN OUT LIST_ENTRY  *PendingTokenList\r
   )\r
 {\r
-  SOCK_TOKEN            *SockToken;\r
-  SOCK_COMPLETION_TOKEN *Token;\r
+  SOCK_TOKEN             *SockToken;\r
+  SOCK_COMPLETION_TOKEN  *Token;\r
 \r
   ASSERT ((Sock != NULL) && (PendingTokenList != NULL));\r
 \r
@@ -464,7 +455,7 @@ SockFlushPendingToken (
 **/\r
 VOID\r
 SockWakeConnToken (\r
-  IN OUT SOCKET *Sock\r
+  IN OUT SOCKET  *Sock\r
   )\r
 {\r
   ASSERT (Sock->ConnectionToken != NULL);\r
@@ -486,12 +477,12 @@ SockWakeConnToken (
 **/\r
 VOID\r
 SockWakeListenToken (\r
-  IN OUT SOCKET *Sock\r
+  IN OUT SOCKET  *Sock\r
   )\r
 {\r
-  SOCKET                *Parent;\r
-  SOCK_TOKEN            *SockToken;\r
-  EFI_TCP4_LISTEN_TOKEN *ListenToken;\r
+  SOCKET                 *Parent;\r
+  SOCK_TOKEN             *SockToken;\r
+  EFI_TCP4_LISTEN_TOKEN  *ListenToken;\r
 \r
   Parent = Sock->Parent;\r
 \r
@@ -504,7 +495,7 @@ SockWakeListenToken (
                   TokenList\r
                   );\r
 \r
-    ListenToken                 = (EFI_TCP4_LISTEN_TOKEN *) SockToken->Token;\r
+    ListenToken                 = (EFI_TCP4_LISTEN_TOKEN *)SockToken->Token;\r
     ListenToken->NewChildHandle = Sock->SockHandle;\r
 \r
     SIGNAL_TOKEN (&(ListenToken->CompletionToken), EFI_SUCCESS);\r
@@ -517,8 +508,8 @@ SockWakeListenToken (
     Parent->ConnCnt--;\r
     DEBUG (\r
       (DEBUG_NET,\r
-      "SockWakeListenToken: accept a socket, now conncnt is %d",\r
-      Parent->ConnCnt)\r
+       "SockWakeListenToken: accept a socket, now conncnt is %d",\r
+       Parent->ConnCnt)\r
       );\r
 \r
     Sock->Parent = NULL;\r
@@ -533,13 +524,13 @@ SockWakeListenToken (
 **/\r
 VOID\r
 SockWakeRcvToken (\r
-  IN OUT SOCKET *Sock\r
+  IN OUT SOCKET  *Sock\r
   )\r
 {\r
-  UINT32        RcvdBytes;\r
-  UINT32        TokenRcvdBytes;\r
-  SOCK_TOKEN    *SockToken;\r
-  SOCK_IO_TOKEN *RcvToken;\r
+  UINT32         RcvdBytes;\r
+  UINT32         TokenRcvdBytes;\r
+  SOCK_TOKEN     *SockToken;\r
+  SOCK_IO_TOKEN  *RcvToken;\r
 \r
   ASSERT (Sock->RcvBuffer.DataQueue != NULL);\r
 \r
@@ -548,18 +539,17 @@ SockWakeRcvToken (
   ASSERT (RcvdBytes > 0);\r
 \r
   while (RcvdBytes > 0 && !IsListEmpty (&Sock->RcvTokenList)) {\r
-\r
     SockToken = NET_LIST_HEAD (\r
                   &Sock->RcvTokenList,\r
                   SOCK_TOKEN,\r
                   TokenList\r
                   );\r
 \r
-    RcvToken        = (SOCK_IO_TOKEN *) SockToken->Token;\r
-    TokenRcvdBytes  = SockProcessRcvToken (Sock, RcvToken);\r
+    RcvToken       = (SOCK_IO_TOKEN *)SockToken->Token;\r
+    TokenRcvdBytes = SockProcessRcvToken (Sock, RcvToken);\r
 \r
     if (0 == TokenRcvdBytes) {\r
-      return ;\r
+      return;\r
     }\r
 \r
     RemoveEntryList (&(SockToken->TokenList));\r
@@ -585,15 +575,15 @@ SockCancelToken (
   IN OUT LIST_ENTRY             *SpecifiedTokenList\r
   )\r
 {\r
-  EFI_STATUS     Status;\r
-  LIST_ENTRY     *Entry;\r
-  SOCK_TOKEN     *SockToken;\r
+  EFI_STATUS  Status;\r
+  LIST_ENTRY  *Entry;\r
+  SOCK_TOKEN  *SockToken;\r
 \r
   Status    = EFI_SUCCESS;\r
   Entry     = NULL;\r
   SockToken = NULL;\r
 \r
-  if (IsListEmpty (SpecifiedTokenList) && Token != NULL) {\r
+  if (IsListEmpty (SpecifiedTokenList) && (Token != NULL)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -609,10 +599,10 @@ SockCancelToken (
       RemoveEntryList (&SockToken->TokenList);\r
       FreePool (SockToken);\r
 \r
-      Entry = SpecifiedTokenList->ForwardLink;\r
+      Entry  = SpecifiedTokenList->ForwardLink;\r
       Status = EFI_SUCCESS;\r
     } else {\r
-      if (Token == (VOID *) SockToken->Token) {\r
+      if (Token == (VOID *)SockToken->Token) {\r
         SIGNAL_TOKEN (Token, EFI_ABORTED);\r
         RemoveEntryList (&(SockToken->TokenList));\r
         FreePool (SockToken);\r
@@ -641,7 +631,7 @@ SockCancelToken (
 **/\r
 SOCKET *\r
 SockCreate (\r
-  IN SOCK_INIT_DATA *SockInitData\r
+  IN SOCK_INIT_DATA  *SockInitData\r
   )\r
 {\r
   SOCKET      *Sock;\r
@@ -662,15 +652,14 @@ SockCreate (
     ProtocolLength  = sizeof (EFI_TCP6_PROTOCOL);\r
   }\r
 \r
-\r
   Parent = SockInitData->Parent;\r
 \r
   if ((Parent != NULL) && (Parent->ConnCnt == Parent->BackLog)) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockCreate: Socket parent has reached its connection limit with %d ConnCnt and %d BackLog\n",\r
-      Parent->ConnCnt,\r
-      Parent->BackLog)\r
+       "SockCreate: Socket parent has reached its connection limit with %d ConnCnt and %d BackLog\n",\r
+       Parent->ConnCnt,\r
+       Parent->BackLog)\r
       );\r
 \r
     return NULL;\r
@@ -678,7 +667,6 @@ SockCreate (
 \r
   Sock = AllocateZeroPool (sizeof (SOCKET));\r
   if (NULL == Sock) {\r
-\r
     DEBUG ((DEBUG_ERROR, "SockCreate: No resource to create a new socket\n"));\r
     return NULL;\r
   }\r
@@ -696,7 +684,7 @@ SockCreate (
   if (NULL == Sock->SndBuffer.DataQueue) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockCreate: No resource to allocate SndBuffer for new socket\n")\r
+       "SockCreate: No resource to allocate SndBuffer for new socket\n")\r
       );\r
 \r
     goto OnError;\r
@@ -706,13 +694,13 @@ SockCreate (
   if (NULL == Sock->RcvBuffer.DataQueue) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockCreate: No resource to allocate RcvBuffer for new socket\n")\r
+       "SockCreate: No resource to allocate RcvBuffer for new socket\n")\r
       );\r
 \r
     goto OnError;\r
   }\r
 \r
-  Sock->Signature           = SOCK_SIGNATURE;\r
+  Sock->Signature = SOCK_SIGNATURE;\r
 \r
   Sock->Parent              = Parent;\r
   Sock->BackLog             = SockInitData->BackLog;\r
@@ -726,11 +714,11 @@ SockCreate (
   Sock->DestroyCallback     = SockInitData->DestroyCallback;\r
   Sock->Context             = SockInitData->Context;\r
 \r
-  Sock->SockError           = EFI_ABORTED;\r
-  Sock->SndBuffer.LowWater  = SOCK_BUFF_LOW_WATER;\r
-  Sock->RcvBuffer.LowWater  = SOCK_BUFF_LOW_WATER;\r
+  Sock->SockError          = EFI_ABORTED;\r
+  Sock->SndBuffer.LowWater = SOCK_BUFF_LOW_WATER;\r
+  Sock->RcvBuffer.LowWater = SOCK_BUFF_LOW_WATER;\r
 \r
-  Sock->IpVersion           = SockInitData->IpVersion;\r
+  Sock->IpVersion = SockInitData->IpVersion;\r
 \r
   //\r
   // Install protocol on Sock->SockHandle\r
@@ -752,8 +740,8 @@ SockCreate (
   if (EFI_ERROR (Status)) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockCreate: Install TCP protocol in socket failed with %r\n",\r
-      Status)\r
+       "SockCreate: Install TCP protocol in socket failed with %r\n",\r
+       Status)\r
       );\r
 \r
     goto OnError;\r
@@ -771,8 +759,8 @@ SockCreate (
 \r
     DEBUG (\r
       (DEBUG_NET,\r
-      "SockCreate: Create a new socket and add to parent, now conncnt is %d\n",\r
-      Parent->ConnCnt)\r
+       "SockCreate: Create a new socket and add to parent, now conncnt is %d\n",\r
+       Parent->ConnCnt)\r
       );\r
 \r
     InsertTailList (&Parent->ConnectionList, &Sock->ConnectionList);\r
@@ -819,7 +807,7 @@ OnError:
 **/\r
 VOID\r
 SockDestroy (\r
-  IN OUT SOCKET *Sock\r
+  IN OUT SOCKET  *Sock\r
   )\r
 {\r
   ASSERT (SockStream == Sock->Type);\r
@@ -829,12 +817,11 @@ SockDestroy (
   // by sock and rcv, snd buffer\r
   //\r
   if (!SOCK_IS_UNCONFIGURED (Sock)) {\r
-\r
     SockConnFlush (Sock);\r
     SockSetState (Sock, SO_CLOSED);\r
     Sock->ConfigureState = SO_UNCONFIGURED;\r
-\r
   }\r
+\r
   //\r
   // Destroy the RcvBuffer Queue and SendBuffer Queue\r
   //\r
@@ -845,14 +832,13 @@ SockDestroy (
   // Remove it from parent connection list if needed\r
   //\r
   if (Sock->Parent != NULL) {\r
-\r
     RemoveEntryList (&(Sock->ConnectionList));\r
     (Sock->Parent->ConnCnt)--;\r
 \r
     DEBUG (\r
       (DEBUG_WARN,\r
-      "SockDestroy: Delete a unaccepted socket from parent now conncnt is %d\n",\r
-      Sock->Parent->ConnCnt)\r
+       "SockDestroy: Delete a unaccepted socket from parent now conncnt is %d\n",\r
+       Sock->Parent->ConnCnt)\r
       );\r
 \r
     Sock->Parent = NULL;\r
@@ -869,7 +855,7 @@ SockDestroy (
 **/\r
 VOID\r
 SockConnFlush (\r
-  IN OUT SOCKET *Sock\r
+  IN OUT SOCKET  *Sock\r
   )\r
 {\r
   SOCKET  *Child;\r
@@ -921,7 +907,6 @@ SockConnFlush (
 \r
     Sock->ConnCnt = 0;\r
   }\r
-\r
 }\r
 \r
 /**\r
@@ -933,8 +918,8 @@ SockConnFlush (
 **/\r
 VOID\r
 SockSetState (\r
-  IN OUT SOCKET     *Sock,\r
-  IN     UINT8      State\r
+  IN OUT SOCKET  *Sock,\r
+  IN     UINT8   State\r
   )\r
 {\r
   Sock->State = State;\r
@@ -950,7 +935,7 @@ SockSetState (
 **/\r
 SOCKET *\r
 SockClone (\r
-  IN SOCKET *Sock\r
+  IN SOCKET  *Sock\r
   )\r
 {\r
   SOCKET          *ClonedSock;\r
@@ -972,7 +957,7 @@ SockClone (
   InitData.ProtoData       = Sock->ProtoReserved;\r
   InitData.DataSize        = sizeof (Sock->ProtoReserved);\r
 \r
-  ClonedSock               = SockCreate (&InitData);\r
+  ClonedSock = SockCreate (&InitData);\r
 \r
   if (NULL == ClonedSock) {\r
     DEBUG ((DEBUG_ERROR, "SockClone: no resource to create a cloned sock\n"));\r
@@ -998,10 +983,9 @@ SockClone (
 **/\r
 VOID\r
 SockConnEstablished (\r
-  IN OUT SOCKET *Sock\r
+  IN OUT SOCKET  *Sock\r
   )\r
 {\r
-\r
   ASSERT (SO_CONNECTING == Sock->State);\r
 \r
   SockSetState (Sock, SO_CONNECTED);\r
@@ -1011,7 +995,6 @@ SockConnEstablished (
   } else {\r
     SockWakeListenToken (Sock);\r
   }\r
-\r
 }\r
 \r
 /**\r
@@ -1026,7 +1009,7 @@ SockConnEstablished (
 **/\r
 VOID\r
 SockConnClosed (\r
-  IN OUT SOCKET *Sock\r
+  IN OUT SOCKET  *Sock\r
   )\r
 {\r
   if (Sock->CloseToken != NULL) {\r
@@ -1040,7 +1023,6 @@ SockConnClosed (
   if (Sock->Parent != NULL) {\r
     SockDestroyChild (Sock);\r
   }\r
-\r
 }\r
 \r
 /**\r
@@ -1055,12 +1037,12 @@ SockConnClosed (
 **/\r
 VOID\r
 SockDataSent (\r
-  IN OUT SOCKET     *Sock,\r
-  IN     UINT32     Count\r
+  IN OUT SOCKET  *Sock,\r
+  IN     UINT32  Count\r
   )\r
 {\r
-  SOCK_TOKEN            *SockToken;\r
-  SOCK_COMPLETION_TOKEN *SndToken;\r
+  SOCK_TOKEN             *SockToken;\r
+  SOCK_COMPLETION_TOKEN  *SndToken;\r
 \r
   ASSERT (!IsListEmpty (&Sock->ProcessingSndTokenList));\r
   ASSERT (Count <= (Sock->SndBuffer.DataQueue)->BufSize);\r
@@ -1080,15 +1062,13 @@ SockDataSent (
     SndToken = SockToken->Token;\r
 \r
     if (SockToken->RemainDataLen <= Count) {\r
-\r
       RemoveEntryList (&(SockToken->TokenList));\r
       SIGNAL_TOKEN (SndToken, EFI_SUCCESS);\r
       Count -= SockToken->RemainDataLen;\r
       FreePool (SockToken);\r
     } else {\r
-\r
       SockToken->RemainDataLen -= Count;\r
-      Count = 0;\r
+      Count                     = 0;\r
     }\r
   }\r
 \r
@@ -1114,20 +1094,20 @@ SockDataSent (
 **/\r
 UINT32\r
 SockGetDataToSend (\r
-  IN  SOCKET      *Sock,\r
-  IN  UINT32      Offset,\r
-  IN  UINT32      Len,\r
-  OUT UINT8       *Dest\r
+  IN  SOCKET  *Sock,\r
+  IN  UINT32  Offset,\r
+  IN  UINT32  Len,\r
+  OUT UINT8   *Dest\r
   )\r
 {\r
   ASSERT ((Sock != NULL) && SockStream == Sock->Type);\r
 \r
   return NetbufQueCopy (\r
-          Sock->SndBuffer.DataQueue,\r
-          Offset,\r
-          Len,\r
-          Dest\r
-          );\r
+           Sock->SndBuffer.DataQueue,\r
+           Offset,\r
+           Len,\r
+           Dest\r
+           );\r
 }\r
 \r
 /**\r
@@ -1143,17 +1123,19 @@ SockGetDataToSend (
 **/\r
 VOID\r
 SockDataRcvd (\r
-  IN OUT SOCKET    *Sock,\r
-  IN OUT NET_BUF   *NetBuffer,\r
-  IN     UINT32    UrgLen\r
+  IN OUT SOCKET   *Sock,\r
+  IN OUT NET_BUF  *NetBuffer,\r
+  IN     UINT32   UrgLen\r
   )\r
 {\r
-  ASSERT ((Sock != NULL) && (Sock->RcvBuffer.DataQueue != NULL) &&\r
-    UrgLen <= NetBuffer->TotalSize);\r
+  ASSERT (\r
+    (Sock != NULL) && (Sock->RcvBuffer.DataQueue != NULL) &&\r
+    UrgLen <= NetBuffer->TotalSize\r
+    );\r
 \r
   NET_GET_REF (NetBuffer);\r
 \r
-  ((TCP_RSV_DATA *) (NetBuffer->ProtoData))->UrgLen = UrgLen;\r
+  ((TCP_RSV_DATA *)(NetBuffer->ProtoData))->UrgLen = UrgLen;\r
 \r
   NetbufQueAppend (Sock->RcvBuffer.DataQueue, NetBuffer);\r
 \r
@@ -1176,8 +1158,8 @@ SockGetFreeSpace (
   IN UINT32  Which\r
   )\r
 {\r
-  UINT32      BufferCC;\r
-  SOCK_BUFFER *SockBuffer;\r
+  UINT32       BufferCC;\r
+  SOCK_BUFFER  *SockBuffer;\r
 \r
   ASSERT (Sock != NULL && ((SOCK_SND_BUF == Which) || (SOCK_RCV_BUF == Which)));\r
 \r
@@ -1190,7 +1172,6 @@ SockGetFreeSpace (
   BufferCC = (SockBuffer->DataQueue)->BufSize;\r
 \r
   if (BufferCC >= SockBuffer->HighWater) {\r
-\r
     return 0;\r
   }\r
 \r
@@ -1209,7 +1190,7 @@ SockGetFreeSpace (
 **/\r
 VOID\r
 SockNoMoreData (\r
-  IN OUT SOCKET *Sock\r
+  IN OUT SOCKET  *Sock\r
   )\r
 {\r
   EFI_STATUS  Err;\r
@@ -1217,7 +1198,6 @@ SockNoMoreData (
   SOCK_NO_MORE_DATA (Sock);\r
 \r
   if (!IsListEmpty (&Sock->RcvTokenList)) {\r
-\r
     ASSERT (0 == GET_RCV_DATASIZE (Sock));\r
 \r
     Err = Sock->SockError;\r
@@ -1227,6 +1207,5 @@ SockNoMoreData (
     SockFlushPendingToken (Sock, &Sock->RcvTokenList);\r
 \r
     SOCK_ERROR (Sock, Err);\r
-\r
   }\r
 }\r
index 5ec0435592d734368feda1d4f2bcc4b97d2f22a1..b063b023ab12eaebb8297bd7ac21e710a603f6bb 100644 (file)
@@ -26,7 +26,7 @@
     gBS->SignalEvent ((Token)->Event); \\r
   } while (0)\r
 \r
-#define SOCK_HEADER_SPACE (60 + 60 + 72)\r
+#define SOCK_HEADER_SPACE  (60 + 60 + 72)\r
 \r
 /**\r
   Process the TCP send data, buffer the tcp txdata and append\r
@@ -41,8 +41,8 @@
 **/\r
 EFI_STATUS\r
 SockProcessTcpSndData (\r
-  IN SOCKET   *Sock,\r
-  IN VOID     *TcpTxData\r
+  IN SOCKET  *Sock,\r
+  IN VOID    *TcpTxData\r
   );\r
 \r
 /**\r
@@ -56,8 +56,8 @@ SockProcessTcpSndData (
 **/\r
 UINT32\r
 SockProcessRcvToken (\r
-  IN OUT SOCKET        *Sock,\r
-  IN OUT SOCK_IO_TOKEN *RcvToken\r
+  IN OUT SOCKET         *Sock,\r
+  IN OUT SOCK_IO_TOKEN  *RcvToken\r
   );\r
 \r
 /**\r
@@ -68,7 +68,7 @@ SockProcessRcvToken (
 **/\r
 VOID\r
 SockConnFlush (\r
-  IN OUT SOCKET *Sock\r
+  IN OUT SOCKET  *Sock\r
   );\r
 \r
 /**\r
@@ -98,7 +98,7 @@ SockCancelToken (
 **/\r
 SOCKET *\r
 SockCreate (\r
-  IN SOCK_INIT_DATA *SockInitData\r
+  IN SOCK_INIT_DATA  *SockInitData\r
   );\r
 \r
 /**\r
@@ -109,7 +109,7 @@ SockCreate (
 **/\r
 VOID\r
 SockDestroy (\r
-  IN OUT SOCKET *Sock\r
+  IN OUT SOCKET  *Sock\r
   );\r
 \r
 #endif\r
index 6cf31e0a0a999eb035757db114f05ecf08f5eb54..413d6e1373f31d93810c4d49b3bb2271349cd1e9 100644 (file)
 **/\r
 BOOLEAN\r
 SockTokenExistedInList (\r
-  IN LIST_ENTRY     *List,\r
-  IN EFI_EVENT      Event\r
+  IN LIST_ENTRY  *List,\r
+  IN EFI_EVENT   Event\r
   )\r
 {\r
-  LIST_ENTRY      *ListEntry;\r
-  SOCK_TOKEN      *SockToken;\r
+  LIST_ENTRY  *ListEntry;\r
+  SOCK_TOKEN  *SockToken;\r
 \r
   NET_LIST_FOR_EACH (ListEntry, List) {\r
     SockToken = NET_LIST_USER_STRUCT (\r
@@ -56,22 +56,20 @@ SockTokenExistedInList (
 **/\r
 BOOLEAN\r
 SockTokenExisted (\r
-  IN SOCKET    *Sock,\r
-  IN EFI_EVENT Event\r
+  IN SOCKET     *Sock,\r
+  IN EFI_EVENT  Event\r
   )\r
 {\r
-\r
   if (SockTokenExistedInList (&Sock->SndTokenList, Event) ||\r
       SockTokenExistedInList (&Sock->ProcessingSndTokenList, Event) ||\r
       SockTokenExistedInList (&Sock->RcvTokenList, Event) ||\r
       SockTokenExistedInList (&Sock->ListenTokenList, Event)\r
-        ) {\r
-\r
+      )\r
+  {\r
     return TRUE;\r
   }\r
 \r
   if ((Sock->ConnectionToken != NULL) && (Sock->ConnectionToken->Event == Event)) {\r
-\r
     return TRUE;\r
   }\r
 \r
@@ -95,28 +93,27 @@ SockTokenExisted (
 **/\r
 SOCK_TOKEN *\r
 SockBufferToken (\r
-  IN SOCKET         *Sock,\r
-  IN LIST_ENTRY     *List,\r
-  IN VOID           *Token,\r
-  IN UINT32         DataLen\r
+  IN SOCKET      *Sock,\r
+  IN LIST_ENTRY  *List,\r
+  IN VOID        *Token,\r
+  IN UINT32      DataLen\r
   )\r
 {\r
   SOCK_TOKEN  *SockToken;\r
 \r
   SockToken = AllocateZeroPool (sizeof (SOCK_TOKEN));\r
   if (NULL == SockToken) {\r
-\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockBufferIOToken: No Memory to allocate SockToken\n")\r
+       "SockBufferIOToken: No Memory to allocate SockToken\n")\r
       );\r
 \r
     return NULL;\r
   }\r
 \r
-  SockToken->Sock           = Sock;\r
-  SockToken->Token          = (SOCK_COMPLETION_TOKEN *) Token;\r
-  SockToken->RemainDataLen  = DataLen;\r
+  SockToken->Sock          = Sock;\r
+  SockToken->Token         = (SOCK_COMPLETION_TOKEN *)Token;\r
+  SockToken->RemainDataLen = DataLen;\r
   InsertTailList (List, &SockToken->TokenList);\r
 \r
   return SockToken;\r
@@ -133,15 +130,15 @@ SockBufferToken (
 **/\r
 EFI_STATUS\r
 SockDestroyChild (\r
-  IN OUT SOCKET *Sock\r
+  IN OUT SOCKET  *Sock\r
   )\r
 {\r
-  EFI_STATUS       Status;\r
-  TCP_PROTO_DATA   *ProtoData;\r
-  TCP_CB           *Tcb;\r
-  EFI_GUID         *IpProtocolGuid;\r
-  EFI_GUID         *TcpProtocolGuid;\r
-  VOID             *SockProtocol;\r
+  EFI_STATUS      Status;\r
+  TCP_PROTO_DATA  *ProtoData;\r
+  TCP_CB          *Tcb;\r
+  EFI_GUID        *IpProtocolGuid;\r
+  EFI_GUID        *TcpProtocolGuid;\r
+  VOID            *SockProtocol;\r
 \r
   ASSERT ((Sock != NULL) && (Sock->ProtoHandler != NULL));\r
 \r
@@ -152,13 +149,14 @@ SockDestroyChild (
   Sock->InDestroy = TRUE;\r
 \r
   if (Sock->IpVersion == IP_VERSION_4) {\r
-    IpProtocolGuid = &gEfiIp4ProtocolGuid;\r
+    IpProtocolGuid  = &gEfiIp4ProtocolGuid;\r
     TcpProtocolGuid = &gEfiTcp4ProtocolGuid;\r
   } else {\r
-    IpProtocolGuid = &gEfiIp6ProtocolGuid;\r
+    IpProtocolGuid  = &gEfiIp6ProtocolGuid;\r
     TcpProtocolGuid = &gEfiTcp6ProtocolGuid;\r
   }\r
-  ProtoData = (TCP_PROTO_DATA *) Sock->ProtoReserved;\r
+\r
+  ProtoData = (TCP_PROTO_DATA *)Sock->ProtoReserved;\r
   Tcb       = ProtoData->TcpPcb;\r
 \r
   ASSERT (Tcb != NULL);\r
@@ -190,11 +188,10 @@ SockDestroyChild (
                   );\r
 \r
   if (EFI_ERROR (Status)) {\r
-\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockDestroyChild: Open protocol installed on socket failed with %r\n",\r
-      Status)\r
+       "SockDestroyChild: Open protocol installed on socket failed with %r\n",\r
+       Status)\r
       );\r
   }\r
 \r
@@ -202,20 +199,18 @@ SockDestroyChild (
   // Uninstall the protocol installed on this sock\r
   //\r
   gBS->UninstallMultipleProtocolInterfaces (\r
-        Sock->SockHandle,\r
-        TcpProtocolGuid,\r
-        SockProtocol,\r
-        NULL\r
-        );\r
-\r
+         Sock->SockHandle,\r
+         TcpProtocolGuid,\r
+         SockProtocol,\r
+         NULL\r
+         );\r
 \r
-  Status            = EfiAcquireLockOrFail (&(Sock->Lock));\r
+  Status = EfiAcquireLockOrFail (&(Sock->Lock));\r
   if (EFI_ERROR (Status)) {\r
-\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockDestroyChild: Get the lock to access socket failed with %r\n",\r
-      Status)\r
+       "SockDestroyChild: Get the lock to access socket failed with %r\n",\r
+       Status)\r
       );\r
 \r
     return EFI_ACCESS_DENIED;\r
@@ -227,16 +222,14 @@ SockDestroyChild (
   Status = Sock->ProtoHandler (Sock, SOCK_DETACH, NULL);\r
 \r
   if (EFI_ERROR (Status)) {\r
-\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockDestroyChild: Protocol detach socket failed with %r\n",\r
-      Status)\r
+       "SockDestroyChild: Protocol detach socket failed with %r\n",\r
+       Status)\r
       );\r
 \r
     Sock->InDestroy = FALSE;\r
   } else if (SOCK_IS_CONFIGURED (Sock)) {\r
-\r
     SockConnFlush (Sock);\r
     SockSetState (Sock, SO_CLOSED);\r
 \r
@@ -265,7 +258,7 @@ SockDestroyChild (
 **/\r
 SOCKET *\r
 SockCreateChild (\r
-  IN SOCK_INIT_DATA *SockInitData\r
+  IN SOCK_INIT_DATA  *SockInitData\r
   )\r
 {\r
   SOCKET      *Sock;\r
@@ -278,10 +271,9 @@ SockCreateChild (
   //\r
   Sock = SockCreate (SockInitData);\r
   if (NULL == Sock) {\r
-\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockCreateChild: No resource to create a new socket\n")\r
+       "SockCreateChild: No resource to create a new socket\n")\r
       );\r
 \r
     return NULL;\r
@@ -289,14 +281,14 @@ SockCreateChild (
 \r
   Status = EfiAcquireLockOrFail (&(Sock->Lock));\r
   if (EFI_ERROR (Status)) {\r
-\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockCreateChild: Get the lock to access socket failed with %r\n",\r
-      Status)\r
+       "SockCreateChild: Get the lock to access socket failed with %r\n",\r
+       Status)\r
       );\r
     goto ERROR;\r
   }\r
+\r
   //\r
   // inform the protocol layer to attach the socket\r
   // with a new protocol control block\r
@@ -304,11 +296,10 @@ SockCreateChild (
   Status = Sock->ProtoHandler (Sock, SOCK_ATTACH, NULL);\r
   EfiReleaseLock (&(Sock->Lock));\r
   if (EFI_ERROR (Status)) {\r
-\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockCreateChild: Protocol failed to attach a socket with %r\n",\r
-      Status)\r
+       "SockCreateChild: Protocol failed to attach a socket with %r\n",\r
+       Status)\r
       );\r
     goto ERROR;\r
   }\r
@@ -339,13 +330,13 @@ ERROR:
   // Uninstall the protocol installed on this sock\r
   //\r
   gBS->UninstallMultipleProtocolInterfaces (\r
-        Sock->SockHandle,\r
-        TcpProtocolGuid,\r
-        SockProtocol,\r
-        NULL\r
-        );\r
-   SockDestroy (Sock);\r
-   return NULL;\r
+         Sock->SockHandle,\r
+         TcpProtocolGuid,\r
+         SockProtocol,\r
+         NULL\r
+         );\r
+  SockDestroy (Sock);\r
+  return NULL;\r
 }\r
 \r
 /**\r
@@ -361,19 +352,18 @@ ERROR:
 **/\r
 EFI_STATUS\r
 SockConfigure (\r
-  IN SOCKET *Sock,\r
-  IN VOID   *ConfigData\r
+  IN SOCKET  *Sock,\r
+  IN VOID    *ConfigData\r
   )\r
 {\r
   EFI_STATUS  Status;\r
 \r
   Status = EfiAcquireLockOrFail (&(Sock->Lock));\r
   if (EFI_ERROR (Status)) {\r
-\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockConfigure: Get the access for socket failed with %r",\r
-      Status)\r
+       "SockConfigure: Get the access for socket failed with %r",\r
+       Status)\r
       );\r
 \r
     return EFI_ACCESS_DENIED;\r
@@ -414,8 +404,8 @@ OnExit:
 **/\r
 EFI_STATUS\r
 SockConnect (\r
-  IN SOCKET *Sock,\r
-  IN VOID   *Token\r
+  IN SOCKET  *Sock,\r
+  IN VOID    *Token\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -423,11 +413,10 @@ SockConnect (
 \r
   Status = EfiAcquireLockOrFail (&(Sock->Lock));\r
   if (EFI_ERROR (Status)) {\r
-\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockConnect: Get the access for socket failed with %r",\r
-      Status)\r
+       "SockConnect: Get the access for socket failed with %r",\r
+       Status)\r
       );\r
 \r
     return EFI_ACCESS_DENIED;\r
@@ -439,26 +428,23 @@ SockConnect (
   }\r
 \r
   if (SOCK_IS_UNCONFIGURED (Sock)) {\r
-\r
     Status = EFI_NOT_STARTED;\r
     goto OnExit;\r
   }\r
 \r
   if (!SOCK_IS_CLOSED (Sock) || !SOCK_IS_CONFIGURED_ACTIVE (Sock)) {\r
-\r
     Status = EFI_ACCESS_DENIED;\r
     goto OnExit;\r
   }\r
 \r
-  Event = ((SOCK_COMPLETION_TOKEN *) Token)->Event;\r
+  Event = ((SOCK_COMPLETION_TOKEN *)Token)->Event;\r
 \r
   if (SockTokenExisted (Sock, Event)) {\r
-\r
     Status = EFI_ACCESS_DENIED;\r
     goto OnExit;\r
   }\r
 \r
-  Sock->ConnectionToken = (SOCK_COMPLETION_TOKEN *) Token;\r
+  Sock->ConnectionToken = (SOCK_COMPLETION_TOKEN *)Token;\r
   SockSetState (Sock, SO_CONNECTING);\r
   Status = Sock->ProtoHandler (Sock, SOCK_CONNECT, NULL);\r
 \r
@@ -488,25 +474,24 @@ OnExit:
 **/\r
 EFI_STATUS\r
 SockAccept (\r
-  IN SOCKET *Sock,\r
-  IN VOID   *Token\r
+  IN SOCKET  *Sock,\r
+  IN VOID    *Token\r
   )\r
 {\r
-  EFI_TCP4_LISTEN_TOKEN *ListenToken;\r
-  LIST_ENTRY            *ListEntry;\r
-  EFI_STATUS            Status;\r
-  SOCKET                *Socket;\r
-  EFI_EVENT             Event;\r
+  EFI_TCP4_LISTEN_TOKEN  *ListenToken;\r
+  LIST_ENTRY             *ListEntry;\r
+  EFI_STATUS             Status;\r
+  SOCKET                 *Socket;\r
+  EFI_EVENT              Event;\r
 \r
   ASSERT (SockStream == Sock->Type);\r
 \r
   Status = EfiAcquireLockOrFail (&(Sock->Lock));\r
   if (EFI_ERROR (Status)) {\r
-\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockAccept: Get the access for socket failed with %r",\r
-      Status)\r
+       "SockAccept: Get the access for socket failed with %r",\r
+       Status)\r
       );\r
 \r
     return EFI_ACCESS_DENIED;\r
@@ -518,32 +503,28 @@ SockAccept (
   }\r
 \r
   if (SOCK_IS_UNCONFIGURED (Sock)) {\r
-\r
     Status = EFI_NOT_STARTED;\r
     goto Exit;\r
   }\r
 \r
   if (!SOCK_IS_LISTENING (Sock)) {\r
-\r
     Status = EFI_ACCESS_DENIED;\r
     goto Exit;\r
   }\r
 \r
-  Event = ((SOCK_COMPLETION_TOKEN *) Token)->Event;\r
+  Event = ((SOCK_COMPLETION_TOKEN *)Token)->Event;\r
 \r
   if (SockTokenExisted (Sock, Event)) {\r
-\r
     Status = EFI_ACCESS_DENIED;\r
     goto Exit;\r
   }\r
 \r
-  ListenToken = (EFI_TCP4_LISTEN_TOKEN *) Token;\r
+  ListenToken = (EFI_TCP4_LISTEN_TOKEN *)Token;\r
 \r
   //\r
   // Check if a connection has already in this Sock->ConnectionList\r
   //\r
   NET_LIST_FOR_EACH (ListEntry, &Sock->ConnectionList) {\r
-\r
     Socket = NET_LIST_USER_STRUCT (ListEntry, SOCKET, ConnectionList);\r
 \r
     if (SOCK_IS_CONNECTED (Socket)) {\r
@@ -558,8 +539,8 @@ SockAccept (
 \r
       DEBUG (\r
         (DEBUG_NET,\r
-        "SockAccept: Accept a socket, now conncount is %d",\r
-        Socket->Parent->ConnCnt)\r
+         "SockAccept: Accept a socket, now conncount is %d",\r
+         Socket->Parent->ConnCnt)\r
         );\r
       Socket->Parent = NULL;\r
 \r
@@ -571,7 +552,6 @@ SockAccept (
   // Buffer this token for latter incoming connection request\r
   //\r
   if (NULL == SockBufferToken (Sock, &(Sock->ListenTokenList), Token, 0)) {\r
-\r
     Status = EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
@@ -601,8 +581,8 @@ Exit:
 **/\r
 EFI_STATUS\r
 SockSend (\r
-  IN SOCKET *Sock,\r
-  IN VOID   *Token\r
+  IN SOCKET  *Sock,\r
+  IN VOID    *Token\r
   )\r
 {\r
   SOCK_IO_TOKEN           *SndToken;\r
@@ -617,11 +597,10 @@ SockSend (
 \r
   Status = EfiAcquireLockOrFail (&(Sock->Lock));\r
   if (EFI_ERROR (Status)) {\r
-\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockSend: Get the access for socket failed with %r",\r
-      Status)\r
+       "SockSend: Get the access for socket failed with %r",\r
+       Status)\r
       );\r
 \r
     return EFI_ACCESS_DENIED;\r
@@ -632,8 +611,8 @@ SockSend (
     goto Exit;\r
   }\r
 \r
-  SndToken  = (SOCK_IO_TOKEN *) Token;\r
-  TxData    = (EFI_TCP4_TRANSMIT_DATA *) SndToken->Packet.TxData;\r
+  SndToken = (SOCK_IO_TOKEN *)Token;\r
+  TxData   = (EFI_TCP4_TRANSMIT_DATA *)SndToken->Packet.TxData;\r
 \r
   if (SOCK_IS_UNCONFIGURED (Sock)) {\r
     Status = EFI_NOT_STARTED;\r
@@ -641,7 +620,6 @@ SockSend (
   }\r
 \r
   if (!(SOCK_IS_CONNECTING (Sock) || SOCK_IS_CONNECTED (Sock))) {\r
-\r
     Status = EFI_ACCESS_DENIED;\r
     goto Exit;\r
   }\r
@@ -664,7 +642,6 @@ SockSend (
   FreeSpace = SockGetFreeSpace (Sock, SOCK_SND_BUF);\r
 \r
   if ((FreeSpace < Sock->SndBuffer.LowWater) || !SOCK_IS_CONNECTED (Sock)) {\r
-\r
     SockToken = SockBufferToken (\r
                   Sock,\r
                   &Sock->SndTokenList,\r
@@ -676,7 +653,6 @@ SockSend (
       Status = EFI_OUT_OF_RESOURCES;\r
     }\r
   } else {\r
-\r
     SockToken = SockBufferToken (\r
                   Sock,\r
                   &Sock->ProcessingSndTokenList,\r
@@ -687,8 +663,8 @@ SockSend (
     if (NULL == SockToken) {\r
       DEBUG (\r
         (DEBUG_ERROR,\r
-        "SockSend: Failed to buffer IO token into socket processing SndToken List\n",\r
-        Status)\r
+         "SockSend: Failed to buffer IO token into socket processing SndToken List\n",\r
+         Status)\r
         );\r
 \r
       Status = EFI_OUT_OF_RESOURCES;\r
@@ -700,8 +676,8 @@ SockSend (
     if (EFI_ERROR (Status)) {\r
       DEBUG (\r
         (DEBUG_ERROR,\r
-        "SockSend: Failed to process Snd Data\n",\r
-        Status)\r
+         "SockSend: Failed to process Snd Data\n",\r
+         Status)\r
         );\r
 \r
       RemoveEntryList (&(SockToken->TokenList));\r
@@ -735,48 +711,44 @@ Exit:
 **/\r
 EFI_STATUS\r
 SockRcv (\r
-  IN SOCKET *Sock,\r
-  IN VOID   *Token\r
+  IN SOCKET  *Sock,\r
+  IN VOID    *Token\r
   )\r
 {\r
-  SOCK_IO_TOKEN *RcvToken;\r
-  UINT32        RcvdBytes;\r
-  EFI_STATUS    Status;\r
-  EFI_EVENT     Event;\r
+  SOCK_IO_TOKEN  *RcvToken;\r
+  UINT32         RcvdBytes;\r
+  EFI_STATUS     Status;\r
+  EFI_EVENT      Event;\r
 \r
   ASSERT (SockStream == Sock->Type);\r
 \r
   Status = EfiAcquireLockOrFail (&(Sock->Lock));\r
   if (EFI_ERROR (Status)) {\r
-\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockRcv: Get the access for socket failed with %r",\r
-      Status)\r
+       "SockRcv: Get the access for socket failed with %r",\r
+       Status)\r
       );\r
 \r
     return EFI_ACCESS_DENIED;\r
   }\r
 \r
   if (SOCK_IS_NO_MAPPING (Sock)) {\r
-\r
     Status = EFI_NO_MAPPING;\r
     goto Exit;\r
   }\r
 \r
   if (SOCK_IS_UNCONFIGURED (Sock)) {\r
-\r
     Status = EFI_NOT_STARTED;\r
     goto Exit;\r
   }\r
 \r
   if (!(SOCK_IS_CONNECTED (Sock) || SOCK_IS_CONNECTING (Sock))) {\r
-\r
     Status = EFI_ACCESS_DENIED;\r
     goto Exit;\r
   }\r
 \r
-  RcvToken = (SOCK_IO_TOKEN *) Token;\r
+  RcvToken = (SOCK_IO_TOKEN *)Token;\r
 \r
   //\r
   // check if a token is already in the token buffer of this socket\r
@@ -787,14 +759,13 @@ SockRcv (
     goto Exit;\r
   }\r
 \r
-  RcvToken  = (SOCK_IO_TOKEN *) Token;\r
+  RcvToken  = (SOCK_IO_TOKEN *)Token;\r
   RcvdBytes = GET_RCV_DATASIZE (Sock);\r
 \r
   //\r
   // check whether an error has happened before\r
   //\r
   if (EFI_ABORTED != Sock->SockError) {\r
-\r
     SIGNAL_TOKEN (&(RcvToken->Token), Sock->SockError);\r
     Sock->SockError = EFI_ABORTED;\r
     goto Exit;\r
@@ -805,7 +776,6 @@ SockRcv (
   // data buffered in Sock->RcvBuffer\r
   //\r
   if (SOCK_IS_NO_MORE_DATA (Sock) && (0 == RcvdBytes)) {\r
-\r
     Status = EFI_CONNECTION_FIN;\r
     goto Exit;\r
   }\r
@@ -815,7 +785,6 @@ SockRcv (
 \r
     Status = Sock->ProtoHandler (Sock, SOCK_CONSUMED, NULL);\r
   } else {\r
-\r
     if (NULL == SockBufferToken (Sock, &Sock->RcvTokenList, RcvToken, 0)) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
     }\r
@@ -837,7 +806,7 @@ Exit:
 **/\r
 EFI_STATUS\r
 SockFlush (\r
-  IN OUT SOCKET *Sock\r
+  IN OUT SOCKET  *Sock\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -846,29 +815,26 @@ SockFlush (
 \r
   Status = EfiAcquireLockOrFail (&(Sock->Lock));\r
   if (EFI_ERROR (Status)) {\r
-\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockFlush: Get the access for socket failed with %r",\r
-      Status)\r
+       "SockFlush: Get the access for socket failed with %r",\r
+       Status)\r
       );\r
 \r
     return EFI_ACCESS_DENIED;\r
   }\r
 \r
   if (!SOCK_IS_CONFIGURED (Sock)) {\r
-\r
     Status = EFI_ACCESS_DENIED;\r
     goto Exit;\r
   }\r
 \r
   Status = Sock->ProtoHandler (Sock, SOCK_FLUSH, NULL);\r
   if (EFI_ERROR (Status)) {\r
-\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockFlush: Protocol failed handling SOCK_FLUSH with %r",\r
-      Status)\r
+       "SockFlush: Protocol failed handling SOCK_FLUSH with %r",\r
+       Status)\r
       );\r
 \r
     goto Exit;\r
@@ -906,9 +872,9 @@ Exit:
 **/\r
 EFI_STATUS\r
 SockClose (\r
-  IN OUT SOCKET  *Sock,\r
-  IN     VOID    *Token,\r
-  IN     BOOLEAN OnAbort\r
+  IN OUT SOCKET   *Sock,\r
+  IN     VOID     *Token,\r
+  IN     BOOLEAN  OnAbort\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -920,8 +886,8 @@ SockClose (
   if (EFI_ERROR (Status)) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockClose: Get the access for socket failed with %r",\r
-      Status)\r
+       "SockClose: Get the access for socket failed with %r",\r
+       Status)\r
       );\r
 \r
     return EFI_ACCESS_DENIED;\r
@@ -942,7 +908,7 @@ SockClose (
     goto Exit;\r
   }\r
 \r
-  Event = ((SOCK_COMPLETION_TOKEN *) Token)->Event;\r
+  Event = ((SOCK_COMPLETION_TOKEN *)Token)->Event;\r
 \r
   if (SockTokenExisted (Sock, Event)) {\r
     Status = EFI_ACCESS_DENIED;\r
@@ -981,9 +947,9 @@ SockCancel (
   IN     VOID    *Token\r
   )\r
 {\r
-  EFI_STATUS     Status;\r
+  EFI_STATUS  Status;\r
 \r
-  Status    = EFI_SUCCESS;\r
+  Status = EFI_SUCCESS;\r
 \r
   ASSERT (SockStream == Sock->Type);\r
 \r
@@ -991,8 +957,8 @@ SockCancel (
   if (EFI_ERROR (Status)) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockCancel: Get the access for socket failed with %r",\r
-      Status)\r
+       "SockCancel: Get the access for socket failed with %r",\r
+       Status)\r
       );\r
 \r
     return EFI_ACCESS_DENIED;\r
@@ -1006,7 +972,7 @@ SockCancel (
   //\r
   // 1. Check ConnectionToken.\r
   //\r
-  if (Token == NULL || (SOCK_COMPLETION_TOKEN *) Token == Sock->ConnectionToken) {\r
+  if ((Token == NULL) || ((SOCK_COMPLETION_TOKEN *)Token == Sock->ConnectionToken)) {\r
     if (Sock->ConnectionToken != NULL) {\r
       SIGNAL_TOKEN (Sock->ConnectionToken, EFI_ABORTED);\r
       Sock->ConnectionToken = NULL;\r
@@ -1022,7 +988,7 @@ SockCancel (
   // 2. Check ListenTokenList.\r
   //\r
   Status = SockCancelToken (Token, &Sock->ListenTokenList);\r
-  if (Token != NULL && !EFI_ERROR (Status)) {\r
+  if ((Token != NULL) && !EFI_ERROR (Status)) {\r
     goto Exit;\r
   }\r
 \r
@@ -1030,7 +996,7 @@ SockCancel (
   // 3. Check RcvTokenList.\r
   //\r
   Status = SockCancelToken (Token, &Sock->RcvTokenList);\r
-  if (Token != NULL && !EFI_ERROR (Status)) {\r
+  if ((Token != NULL) && !EFI_ERROR (Status)) {\r
     goto Exit;\r
   }\r
 \r
@@ -1038,7 +1004,7 @@ SockCancel (
   // 4. Check SndTokenList.\r
   //\r
   Status = SockCancelToken (Token, &Sock->SndTokenList);\r
-  if (Token != NULL && !EFI_ERROR (Status)) {\r
+  if ((Token != NULL) && !EFI_ERROR (Status)) {\r
     goto Exit;\r
   }\r
 \r
@@ -1052,7 +1018,6 @@ Exit:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Get the mode data of the low layer protocol.\r
 \r
@@ -1066,8 +1031,8 @@ Exit:
 **/\r
 EFI_STATUS\r
 SockGetMode (\r
-  IN     SOCKET *Sock,\r
-  IN OUT VOID   *Mode\r
+  IN     SOCKET  *Sock,\r
+  IN OUT VOID    *Mode\r
   )\r
 {\r
   return Sock->ProtoHandler (Sock, SOCK_MODE, Mode);\r
@@ -1090,8 +1055,8 @@ SockGetMode (
 **/\r
 EFI_STATUS\r
 SockRoute (\r
-  IN SOCKET    *Sock,\r
-  IN VOID      *RouteInfo\r
+  IN SOCKET  *Sock,\r
+  IN VOID    *RouteInfo\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -1100,8 +1065,8 @@ SockRoute (
   if (EFI_ERROR (Status)) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "SockRoute: Get the access for socket failed with %r",\r
-      Status)\r
+       "SockRoute: Get the access for socket failed with %r",\r
+       Status)\r
       );\r
 \r
     return EFI_ACCESS_DENIED;\r
index 9448710a916a9010281978735cf40e462b6a76cf..22dfb76a6f3483c8628ec07196a4da1ba1889787 100644 (file)
 #include <Library/UefiLib.h>\r
 #include <Library/DpcLib.h>\r
 \r
-#define SOCK_SND_BUF        0\r
-#define SOCK_RCV_BUF        1\r
+#define SOCK_SND_BUF  0\r
+#define SOCK_RCV_BUF  1\r
 \r
-#define SOCK_BUFF_LOW_WATER (2 * 1024)\r
-#define SOCK_RCV_BUFF_SIZE  (8 * 1024)\r
-#define SOCK_SND_BUFF_SIZE  (8 * 1024)\r
-#define SOCK_BACKLOG        5\r
+#define SOCK_BUFF_LOW_WATER  (2 * 1024)\r
+#define SOCK_RCV_BUFF_SIZE   (8 * 1024)\r
+#define SOCK_SND_BUFF_SIZE   (8 * 1024)\r
+#define SOCK_BACKLOG         5\r
 \r
 #define PROTO_RESERVED_LEN  20\r
 \r
-#define SO_NO_MORE_DATA     0x0001\r
+#define SO_NO_MORE_DATA  0x0001\r
 \r
 //\r
 //\r
 ///\r
 /// Socket state\r
 ///\r
-#define SO_CLOSED        0\r
-#define SO_LISTENING     1\r
-#define SO_CONNECTING    2\r
-#define SO_CONNECTED     3\r
-#define SO_DISCONNECTING 4\r
+#define SO_CLOSED         0\r
+#define SO_LISTENING      1\r
+#define SO_CONNECTING     2\r
+#define SO_CONNECTED      3\r
+#define SO_DISCONNECTING  4\r
 \r
 ///\r
 /// Socket configure state\r
   @param[in] Sock            Pointer to the socket\r
 \r
 **/\r
-#define SOCK_NO_MORE_DATA(Sock)     ((Sock)->Flag |= SO_NO_MORE_DATA)\r
+#define SOCK_NO_MORE_DATA(Sock)  ((Sock)->Flag |= SO_NO_MORE_DATA)\r
 \r
 /**\r
   Check whether the socket is unconfigured.\r
   @retval FALSE              The socket is not configured to active mode.\r
 \r
 **/\r
-#define SOCK_IS_CONFIGURED_ACTIVE(Sock) ((Sock)->ConfigureState == SO_CONFIGURED_ACTIVE)\r
+#define SOCK_IS_CONFIGURED_ACTIVE(Sock)  ((Sock)->ConfigureState == SO_CONFIGURED_ACTIVE)\r
 \r
 /**\r
   Check whether the socket is configured to passive mode.\r
   @retval FALSE              The socket is not configured to passive mode.\r
 \r
 **/\r
-#define SOCK_IS_CONNECTED_PASSIVE(Sock) ((Sock)->ConfigureState == SO_CONFIGURED_PASSIVE)\r
+#define SOCK_IS_CONNECTED_PASSIVE(Sock)  ((Sock)->ConfigureState == SO_CONFIGURED_PASSIVE)\r
 \r
 /**\r
   Check whether the socket is mapped.\r
   @retval FALSE              The socket is not closed.\r
 \r
 **/\r
-#define SOCK_IS_CLOSED(Sock)          ((Sock)->State == SO_CLOSED)\r
+#define SOCK_IS_CLOSED(Sock)  ((Sock)->State == SO_CLOSED)\r
 \r
 /**\r
   Check whether the socket is listening.\r
   @retval FALSE              The socket is not listening.\r
 \r
 **/\r
-#define SOCK_IS_LISTENING(Sock)       ((Sock)->State == SO_LISTENING)\r
+#define SOCK_IS_LISTENING(Sock)  ((Sock)->State == SO_LISTENING)\r
 \r
 /**\r
   Check whether the socket is connecting.\r
   @retval FALSE              The socket is not connecting.\r
 \r
 **/\r
-#define SOCK_IS_CONNECTING(Sock)      ((Sock)->State == SO_CONNECTING)\r
+#define SOCK_IS_CONNECTING(Sock)  ((Sock)->State == SO_CONNECTING)\r
 \r
 /**\r
   Check whether the socket has connected.\r
   @retval FALSE              The socket has not connected.\r
 \r
 **/\r
-#define SOCK_IS_CONNECTED(Sock)       ((Sock)->State == SO_CONNECTED)\r
+#define SOCK_IS_CONNECTED(Sock)  ((Sock)->State == SO_CONNECTED)\r
 \r
 /**\r
   Check whether the socket is disconnecting.\r
   @retval FALSE              The socket is not disconnecting.\r
 \r
 **/\r
-#define SOCK_IS_DISCONNECTING(Sock)   ((Sock)->State == SO_DISCONNECTING)\r
+#define SOCK_IS_DISCONNECTING(Sock)  ((Sock)->State == SO_DISCONNECTING)\r
 \r
 /**\r
   Check whether the socket is no more data.\r
   @retval FALSE              The socket still has data.\r
 \r
 **/\r
-#define SOCK_IS_NO_MORE_DATA(Sock)    (0 != ((Sock)->Flag & SO_NO_MORE_DATA))\r
+#define SOCK_IS_NO_MORE_DATA(Sock)  (0 != ((Sock)->Flag & SO_NO_MORE_DATA))\r
 \r
 /**\r
   Set the size of the receive buffer.\r
   @return The receive buffer size.\r
 \r
 **/\r
-#define GET_RCV_BUFFSIZE(Sock)        ((Sock)->RcvBuffer.HighWater)\r
+#define GET_RCV_BUFFSIZE(Sock)  ((Sock)->RcvBuffer.HighWater)\r
 \r
 /**\r
   Get the size of the receive data.\r
   @return The received data size.\r
 \r
 **/\r
-#define GET_RCV_DATASIZE(Sock)        (((Sock)->RcvBuffer.DataQueue)->BufSize)\r
+#define GET_RCV_DATASIZE(Sock)  (((Sock)->RcvBuffer.DataQueue)->BufSize)\r
 \r
 /**\r
   Set the size of the send buffer.\r
   @return The send buffer size.\r
 \r
 **/\r
-#define GET_SND_BUFFSIZE(Sock)        ((Sock)->SndBuffer.HighWater)\r
+#define GET_SND_BUFFSIZE(Sock)  ((Sock)->SndBuffer.HighWater)\r
 \r
 /**\r
   Get the size of the send data.\r
   @return The send data size.\r
 \r
 **/\r
-#define GET_SND_DATASIZE(Sock)        (((Sock)->SndBuffer.DataQueue)->BufSize)\r
+#define GET_SND_DATASIZE(Sock)  (((Sock)->SndBuffer.DataQueue)->BufSize)\r
 \r
 /**\r
   Set the backlog value of the socket.\r
   @param[in] Value           The value to set.\r
 \r
 **/\r
-#define SET_BACKLOG(Sock, Value)      ((Sock)->BackLog = (Value))\r
+#define SET_BACKLOG(Sock, Value)  ((Sock)->BackLog = (Value))\r
 \r
 /**\r
   Get the backlog value of the socket.\r
   @return The backlog value.\r
 \r
 **/\r
-#define GET_BACKLOG(Sock)             ((Sock)->BackLog)\r
+#define GET_BACKLOG(Sock)  ((Sock)->BackLog)\r
 \r
 /**\r
   Set the socket with error state.\r
   @param[in] Error           The error state.\r
 \r
 **/\r
-#define SOCK_ERROR(Sock, Error)       ((Sock)->SockError = (Error))\r
+#define SOCK_ERROR(Sock, Error)  ((Sock)->SockError = (Error))\r
 \r
-#define SOCK_SIGNATURE                SIGNATURE_32 ('S', 'O', 'C', 'K')\r
+#define SOCK_SIGNATURE  SIGNATURE_32 ('S', 'O', 'C', 'K')\r
 \r
-#define SOCK_FROM_THIS(a)             CR ((a), SOCKET, NetProtocol, SOCK_SIGNATURE)\r
+#define SOCK_FROM_THIS(a)  CR ((a), SOCKET, NetProtocol, SOCK_SIGNATURE)\r
 \r
-#define SOCK_FROM_TOKEN(Token)        (((SOCK_TOKEN *) (Token))->Sock)\r
+#define SOCK_FROM_TOKEN(Token)  (((SOCK_TOKEN *) (Token))->Sock)\r
 \r
 #define PROTO_TOKEN_FORM_SOCK(SockToken, Type)  ((Type *) (((SOCK_TOKEN *) (SockToken))->Token))\r
 \r
@@ -325,21 +325,21 @@ typedef struct _TCP_SOCKET SOCKET;
 /// Socket completion token\r
 ///\r
 typedef struct _SOCK_COMPLETION_TOKEN {\r
-  EFI_EVENT   Event;            ///< The event to be issued\r
-  EFI_STATUS  Status;           ///< The status to be issued\r
+  EFI_EVENT     Event;          ///< The event to be issued\r
+  EFI_STATUS    Status;         ///< The status to be issued\r
 } SOCK_COMPLETION_TOKEN;\r
 \r
 typedef union {\r
-  VOID  *RxData;\r
-  VOID  *TxData;\r
+  VOID    *RxData;\r
+  VOID    *TxData;\r
 } SOCK_IO_DATA;\r
 \r
 ///\r
 /// The application token with data packet\r
 ///\r
 typedef struct _SOCK_IO_TOKEN {\r
-  SOCK_COMPLETION_TOKEN Token;\r
-  SOCK_IO_DATA          Packet;\r
+  SOCK_COMPLETION_TOKEN    Token;\r
+  SOCK_IO_DATA             Packet;\r
 } SOCK_IO_TOKEN;\r
 \r
 ///\r
@@ -354,9 +354,9 @@ typedef enum {
 ///  The buffer structure of rcvd data and send data used by socket.\r
 ///\r
 typedef struct _SOCK_BUFFER {\r
-  UINT32        HighWater;  ///< The buffersize upper limit of sock_buffer\r
-  UINT32        LowWater;   ///< The low water mark of sock_buffer\r
-  NET_BUF_QUEUE *DataQueue; ///< The queue to buffer data\r
+  UINT32           HighWater;  ///< The buffersize upper limit of sock_buffer\r
+  UINT32           LowWater;   ///< The low water mark of sock_buffer\r
+  NET_BUF_QUEUE    *DataQueue; ///< The queue to buffer data\r
 } SOCK_BUFFER;\r
 \r
 /**\r
@@ -374,9 +374,9 @@ typedef struct _SOCK_BUFFER {
 typedef\r
 EFI_STATUS\r
 (*SOCK_PROTO_HANDLER) (\r
-  IN SOCKET       *Socket,\r
-  IN UINT8        Request,\r
-  IN VOID         *RequestData\r
+  IN SOCKET  *Socket,\r
+  IN UINT8   Request,\r
+  IN VOID    *RequestData\r
   );\r
 \r
 /**\r
@@ -414,41 +414,41 @@ VOID
 ///  The initialize data for create a new socket.\r
 ///\r
 typedef struct _SOCK_INIT_DATA {\r
-  SOCK_TYPE              Type;\r
-  UINT8                  State;\r
-\r
-  SOCKET                 *Parent;        ///< The parent of this socket\r
-  UINT32                 BackLog;        ///< The connection limit for listening socket\r
-  UINT32                 SndBufferSize;  ///< The high water mark of send buffer\r
-  UINT32                 RcvBufferSize;  ///< The high water mark of receive buffer\r
-  UINT8                  IpVersion;\r
-  VOID                   *Protocol;      ///< The pointer to protocol function template\r
+  SOCK_TYPE                Type;\r
+  UINT8                    State;\r
+\r
+  SOCKET                   *Parent;       ///< The parent of this socket\r
+  UINT32                   BackLog;       ///< The connection limit for listening socket\r
+  UINT32                   SndBufferSize; ///< The high water mark of send buffer\r
+  UINT32                   RcvBufferSize; ///< The high water mark of receive buffer\r
+  UINT8                    IpVersion;\r
+  VOID                     *Protocol;    ///< The pointer to protocol function template\r
                                          ///< wanted to install on socket\r
 \r
   //\r
   // Callbacks after socket is created and before socket is to be destroyed.\r
   //\r
-  SOCK_CREATE_CALLBACK   CreateCallback;  ///< Callback after created\r
-  SOCK_DESTROY_CALLBACK  DestroyCallback; ///< Callback before destroyed\r
-  VOID                   *Context;        ///< The context of the callback\r
+  SOCK_CREATE_CALLBACK     CreateCallback;  ///< Callback after created\r
+  SOCK_DESTROY_CALLBACK    DestroyCallback; ///< Callback before destroyed\r
+  VOID                     *Context;        ///< The context of the callback\r
 \r
   //\r
   // Opaque protocol data.\r
   //\r
-  VOID                   *ProtoData;\r
-  UINT32                 DataSize;\r
+  VOID                     *ProtoData;\r
+  UINT32                   DataSize;\r
 \r
-  SOCK_PROTO_HANDLER     ProtoHandler;    ///< The handler of protocol for socket request\r
+  SOCK_PROTO_HANDLER       ProtoHandler;  ///< The handler of protocol for socket request\r
 \r
-  EFI_HANDLE             DriverBinding;   ///< The driver binding handle\r
+  EFI_HANDLE               DriverBinding; ///< The driver binding handle\r
 } SOCK_INIT_DATA;\r
 \r
 ///\r
 ///  The union type of TCP4 and TCP6 protocol.\r
 ///\r
 typedef union _NET_PROTOCOL {\r
-  EFI_TCP4_PROTOCOL      Tcp4Protocol;    ///< Tcp4 protocol\r
-  EFI_TCP6_PROTOCOL      Tcp6Protocol;    ///< Tcp6 protocol\r
+  EFI_TCP4_PROTOCOL    Tcp4Protocol;      ///< Tcp4 protocol\r
+  EFI_TCP6_PROTOCOL    Tcp6Protocol;      ///< Tcp6 protocol\r
 } NET_PROTOCOL;\r
 ///\r
 /// The socket structure representing a network service access point.\r
@@ -457,70 +457,70 @@ struct _TCP_SOCKET {
   //\r
   // Socket description information\r
   //\r
-  UINT32                    Signature;      ///< Signature of the socket\r
-  EFI_HANDLE                SockHandle;     ///< The virtual handle of the socket\r
-  EFI_HANDLE                DriverBinding;  ///< Socket's driver binding protocol\r
-  EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
-  LIST_ENTRY                Link;\r
-  UINT8                     ConfigureState;\r
-  SOCK_TYPE                 Type;\r
-  UINT8                     State;\r
-  UINT16                    Flag;\r
-  EFI_LOCK                  Lock;           ///< The lock of socket\r
-  SOCK_BUFFER               SndBuffer;      ///< Send buffer of application's data\r
-  SOCK_BUFFER               RcvBuffer;      ///< Receive buffer of received data\r
-  EFI_STATUS                SockError;      ///< The error returned by low layer protocol\r
-  BOOLEAN                   InDestroy;\r
+  UINT32                      Signature;     ///< Signature of the socket\r
+  EFI_HANDLE                  SockHandle;    ///< The virtual handle of the socket\r
+  EFI_HANDLE                  DriverBinding; ///< Socket's driver binding protocol\r
+  EFI_DEVICE_PATH_PROTOCOL    *ParentDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL    *DevicePath;\r
+  LIST_ENTRY                  Link;\r
+  UINT8                       ConfigureState;\r
+  SOCK_TYPE                   Type;\r
+  UINT8                       State;\r
+  UINT16                      Flag;\r
+  EFI_LOCK                    Lock;         ///< The lock of socket\r
+  SOCK_BUFFER                 SndBuffer;    ///< Send buffer of application's data\r
+  SOCK_BUFFER                 RcvBuffer;    ///< Receive buffer of received data\r
+  EFI_STATUS                  SockError;    ///< The error returned by low layer protocol\r
+  BOOLEAN                     InDestroy;\r
 \r
   //\r
   // Fields used to manage the connection request\r
   //\r
-  UINT32                    BackLog;        ///< the limit of connection to this socket\r
-  UINT32                    ConnCnt;        ///< the current count of connections to it\r
-  SOCKET                    *Parent;        ///< listening parent that accept the connection\r
-  LIST_ENTRY                ConnectionList; ///< the connections maintained by this socket\r
+  UINT32                      BackLog;        ///< the limit of connection to this socket\r
+  UINT32                      ConnCnt;        ///< the current count of connections to it\r
+  SOCKET                      *Parent;        ///< listening parent that accept the connection\r
+  LIST_ENTRY                  ConnectionList; ///< the connections maintained by this socket\r
   //\r
   // The queue to buffer application's asynchronous token\r
   //\r
-  LIST_ENTRY                ListenTokenList;\r
-  LIST_ENTRY                RcvTokenList;\r
-  LIST_ENTRY                SndTokenList;\r
-  LIST_ENTRY                ProcessingSndTokenList;\r
+  LIST_ENTRY                  ListenTokenList;\r
+  LIST_ENTRY                  RcvTokenList;\r
+  LIST_ENTRY                  SndTokenList;\r
+  LIST_ENTRY                  ProcessingSndTokenList;\r
 \r
-  SOCK_COMPLETION_TOKEN     *ConnectionToken; ///< app's token to signal if connected\r
-  SOCK_COMPLETION_TOKEN     *CloseToken;      ///< app's token to signal if closed\r
+  SOCK_COMPLETION_TOKEN       *ConnectionToken; ///< app's token to signal if connected\r
+  SOCK_COMPLETION_TOKEN       *CloseToken;      ///< app's token to signal if closed\r
   //\r
   // Interface for low level protocol\r
   //\r
-  SOCK_PROTO_HANDLER        ProtoHandler;     ///< The request handler of protocol\r
-  UINT8                     ProtoReserved[PROTO_RESERVED_LEN];  ///< Data fields reserved for protocol\r
-  UINT8                     IpVersion;\r
-  NET_PROTOCOL              NetProtocol;                        ///< TCP4 or TCP6 protocol socket used\r
+  SOCK_PROTO_HANDLER          ProtoHandler;                      ///< The request handler of protocol\r
+  UINT8                       ProtoReserved[PROTO_RESERVED_LEN]; ///< Data fields reserved for protocol\r
+  UINT8                       IpVersion;\r
+  NET_PROTOCOL                NetProtocol;                      ///< TCP4 or TCP6 protocol socket used\r
   //\r
   // Callbacks after socket is created and before socket is to be destroyed.\r
   //\r
-  SOCK_CREATE_CALLBACK      CreateCallback;   ///< Callback after created\r
-  SOCK_DESTROY_CALLBACK     DestroyCallback;  ///< Callback before destroyed\r
-  VOID                      *Context;         ///< The context of the callback\r
+  SOCK_CREATE_CALLBACK        CreateCallback;  ///< Callback after created\r
+  SOCK_DESTROY_CALLBACK       DestroyCallback; ///< Callback before destroyed\r
+  VOID                        *Context;        ///< The context of the callback\r
 };\r
 \r
 ///\r
 ///  The token structure buffered in socket layer.\r
 ///\r
 typedef struct _SOCK_TOKEN {\r
-  LIST_ENTRY            TokenList;      ///< The entry to add in the token list\r
-  SOCK_COMPLETION_TOKEN *Token;         ///< The application's token\r
-  UINT32                RemainDataLen;  ///< Unprocessed data length\r
-  SOCKET                *Sock;          ///< The pointer to the socket this token\r
-                                        ///< belongs to\r
+  LIST_ENTRY               TokenList;     ///< The entry to add in the token list\r
+  SOCK_COMPLETION_TOKEN    *Token;        ///< The application's token\r
+  UINT32                   RemainDataLen; ///< Unprocessed data length\r
+  SOCKET                   *Sock;         ///< The pointer to the socket this token\r
+                                          ///< belongs to\r
 } SOCK_TOKEN;\r
 \r
 ///\r
 /// Reserved data to access the NET_BUF delivered by TCP driver.\r
 ///\r
 typedef struct _TCP_RSV_DATA {\r
-  UINT32 UrgLen;\r
+  UINT32    UrgLen;\r
 } TCP_RSV_DATA;\r
 \r
 //\r
@@ -536,8 +536,8 @@ typedef struct _TCP_RSV_DATA {
 **/\r
 VOID\r
 SockSetState (\r
-  IN OUT SOCKET     *Sock,\r
-  IN     UINT8      State\r
+  IN OUT SOCKET  *Sock,\r
+  IN     UINT8   State\r
   );\r
 \r
 /**\r
@@ -550,7 +550,7 @@ SockSetState (
 **/\r
 SOCKET *\r
 SockClone (\r
-  IN SOCKET *Sock\r
+  IN SOCKET  *Sock\r
   );\r
 \r
 /**\r
@@ -566,7 +566,7 @@ SockClone (
 **/\r
 VOID\r
 SockConnEstablished (\r
-  IN OUT SOCKET *Sock\r
+  IN OUT SOCKET  *Sock\r
   );\r
 \r
 /**\r
@@ -581,7 +581,7 @@ SockConnEstablished (
 **/\r
 VOID\r
 SockConnClosed (\r
-  IN OUT SOCKET *Sock\r
+  IN OUT SOCKET  *Sock\r
   );\r
 \r
 /**\r
@@ -596,8 +596,8 @@ SockConnClosed (
 **/\r
 VOID\r
 SockDataSent (\r
-  IN OUT SOCKET     *Sock,\r
-  IN     UINT32     Count\r
+  IN OUT SOCKET  *Sock,\r
+  IN     UINT32  Count\r
   );\r
 \r
 /**\r
@@ -615,10 +615,10 @@ SockDataSent (
 **/\r
 UINT32\r
 SockGetDataToSend (\r
-  IN  SOCKET      *Sock,\r
-  IN  UINT32      Offset,\r
-  IN  UINT32      Len,\r
-  OUT UINT8       *Dest\r
+  IN  SOCKET  *Sock,\r
+  IN  UINT32  Offset,\r
+  IN  UINT32  Len,\r
+  OUT UINT8   *Dest\r
   );\r
 \r
 /**\r
@@ -634,9 +634,9 @@ SockGetDataToSend (
 **/\r
 VOID\r
 SockDataRcvd (\r
-  IN OUT SOCKET    *Sock,\r
-  IN OUT NET_BUF   *NetBuffer,\r
-  IN     UINT32    UrgLen\r
+  IN OUT SOCKET   *Sock,\r
+  IN OUT NET_BUF  *NetBuffer,\r
+  IN     UINT32   UrgLen\r
   );\r
 \r
 /**\r
@@ -667,7 +667,7 @@ SockGetFreeSpace (
 **/\r
 VOID\r
 SockNoMoreData (\r
-  IN OUT SOCKET *Sock\r
+  IN OUT SOCKET  *Sock\r
   );\r
 \r
 //\r
@@ -686,7 +686,7 @@ SockNoMoreData (
 **/\r
 SOCKET *\r
 SockCreateChild (\r
-  IN SOCK_INIT_DATA *SockInitData\r
+  IN SOCK_INIT_DATA  *SockInitData\r
   );\r
 \r
 /**\r
@@ -700,7 +700,7 @@ SockCreateChild (
 **/\r
 EFI_STATUS\r
 SockDestroyChild (\r
-  IN OUT SOCKET *Sock\r
+  IN OUT SOCKET  *Sock\r
   );\r
 \r
 /**\r
@@ -716,8 +716,8 @@ SockDestroyChild (
 **/\r
 EFI_STATUS\r
 SockConfigure (\r
-  IN SOCKET *Sock,\r
-  IN VOID   *ConfigData\r
+  IN SOCKET  *Sock,\r
+  IN VOID    *ConfigData\r
   );\r
 \r
 /**\r
@@ -740,8 +740,8 @@ SockConfigure (
 **/\r
 EFI_STATUS\r
 SockConnect (\r
-  IN SOCKET *Sock,\r
-  IN VOID   *Token\r
+  IN SOCKET  *Sock,\r
+  IN VOID    *Token\r
   );\r
 \r
 /**\r
@@ -765,8 +765,8 @@ SockConnect (
 **/\r
 EFI_STATUS\r
 SockAccept (\r
-  IN SOCKET *Sock,\r
-  IN VOID   *Token\r
+  IN SOCKET  *Sock,\r
+  IN VOID    *Token\r
   );\r
 \r
 /**\r
@@ -789,8 +789,8 @@ SockAccept (
 **/\r
 EFI_STATUS\r
 SockSend (\r
-  IN SOCKET *Sock,\r
-  IN VOID   *Token\r
+  IN SOCKET  *Sock,\r
+  IN VOID    *Token\r
   );\r
 \r
 /**\r
@@ -814,8 +814,8 @@ SockSend (
 **/\r
 EFI_STATUS\r
 SockRcv (\r
-  IN SOCKET *Sock,\r
-  IN VOID   *Token\r
+  IN SOCKET  *Sock,\r
+  IN VOID    *Token\r
   );\r
 \r
 /**\r
@@ -829,7 +829,7 @@ SockRcv (
 **/\r
 EFI_STATUS\r
 SockFlush (\r
-  IN OUT SOCKET *Sock\r
+  IN OUT SOCKET  *Sock\r
   );\r
 \r
 /**\r
@@ -853,9 +853,9 @@ SockFlush (
 **/\r
 EFI_STATUS\r
 SockClose (\r
-  IN OUT SOCKET  *Sock,\r
-  IN     VOID    *Token,\r
-  IN     BOOLEAN OnAbort\r
+  IN OUT SOCKET   *Sock,\r
+  IN     VOID     *Token,\r
+  IN     BOOLEAN  OnAbort\r
   );\r
 \r
 /**\r
@@ -889,8 +889,8 @@ SockCancel (
 **/\r
 EFI_STATUS\r
 SockGetMode (\r
-  IN     SOCKET *Sock,\r
-  IN OUT VOID   *Mode\r
+  IN     SOCKET  *Sock,\r
+  IN OUT VOID    *Mode\r
   );\r
 \r
 /**\r
@@ -910,8 +910,8 @@ SockGetMode (
 **/\r
 EFI_STATUS\r
 SockRoute (\r
-  IN SOCKET    *Sock,\r
-  IN VOID      *RouteInfo\r
+  IN SOCKET  *Sock,\r
+  IN VOID    *RouteInfo\r
   );\r
 \r
 #endif\r
index a04646ce49ead7f297ed481acd2d1e7c6da79707..d5e5276ac9e70708a428032543ed7c8923042b2f 100644 (file)
@@ -32,11 +32,11 @@ Tcp4Route (
   IN TCP4_ROUTE_INFO  *RouteInfo\r
   )\r
 {\r
-  IP_IO_IP_PROTOCOL   Ip;\r
+  IP_IO_IP_PROTOCOL  Ip;\r
 \r
   Ip = Tcb->IpInfo->Ip;\r
 \r
-  ASSERT (Ip.Ip4!= NULL);\r
+  ASSERT (Ip.Ip4 != NULL);\r
 \r
   return Ip.Ip4->Routes (\r
                    Ip.Ip4,\r
@@ -45,7 +45,6 @@ Tcp4Route (
                    RouteInfo->SubnetMask,\r
                    RouteInfo->GatewayAddress\r
                    );\r
-\r
 }\r
 \r
 /**\r
@@ -62,15 +61,15 @@ Tcp4Route (
 **/\r
 EFI_STATUS\r
 Tcp4GetMode (\r
-  IN     TCP_CB         *Tcb,\r
-  IN OUT TCP4_MODE_DATA *Mode\r
+  IN     TCP_CB          *Tcb,\r
+  IN OUT TCP4_MODE_DATA  *Mode\r
   )\r
 {\r
-  SOCKET                *Sock;\r
-  EFI_TCP4_CONFIG_DATA  *ConfigData;\r
-  EFI_TCP4_ACCESS_POINT *AccessPoint;\r
-  EFI_TCP4_OPTION       *Option;\r
-  EFI_IP4_PROTOCOL      *Ip;\r
+  SOCKET                 *Sock;\r
+  EFI_TCP4_CONFIG_DATA   *ConfigData;\r
+  EFI_TCP4_ACCESS_POINT  *AccessPoint;\r
+  EFI_TCP4_OPTION        *Option;\r
+  EFI_IP4_PROTOCOL       *Ip;\r
 \r
   Sock = Tcb->Sk;\r
 \r
@@ -79,46 +78,45 @@ Tcp4GetMode (
   }\r
 \r
   if (Mode->Tcp4State != NULL) {\r
-    *(Mode->Tcp4State) = (EFI_TCP4_CONNECTION_STATE) Tcb->State;\r
+    *(Mode->Tcp4State) = (EFI_TCP4_CONNECTION_STATE)Tcb->State;\r
   }\r
 \r
   if (Mode->Tcp4ConfigData != NULL) {\r
+    ConfigData  = Mode->Tcp4ConfigData;\r
+    AccessPoint = &(ConfigData->AccessPoint);\r
+    Option      = ConfigData->ControlOption;\r
 \r
-    ConfigData                       = Mode->Tcp4ConfigData;\r
-    AccessPoint                      = &(ConfigData->AccessPoint);\r
-    Option                           = ConfigData->ControlOption;\r
+    ConfigData->TypeOfService = Tcb->Tos;\r
+    ConfigData->TimeToLive    = Tcb->Ttl;\r
 \r
-    ConfigData->TypeOfService        = Tcb->Tos;\r
-    ConfigData->TimeToLive           = Tcb->Ttl;\r
-\r
-    AccessPoint->UseDefaultAddress   = Tcb->UseDefaultAddr;\r
+    AccessPoint->UseDefaultAddress = Tcb->UseDefaultAddr;\r
 \r
     IP4_COPY_ADDRESS (&AccessPoint->StationAddress, &Tcb->LocalEnd.Ip);\r
 \r
     IP4_COPY_ADDRESS (&AccessPoint->SubnetMask, &Tcb->SubnetMask);\r
-    AccessPoint->StationPort         = NTOHS (Tcb->LocalEnd.Port);\r
+    AccessPoint->StationPort = NTOHS (Tcb->LocalEnd.Port);\r
 \r
     IP4_COPY_ADDRESS (&AccessPoint->RemoteAddress, &Tcb->RemoteEnd.Ip);\r
 \r
-    AccessPoint->RemotePort          = NTOHS (Tcb->RemoteEnd.Port);\r
-    AccessPoint->ActiveFlag          = (BOOLEAN) (Tcb->State != TCP_LISTEN);\r
+    AccessPoint->RemotePort = NTOHS (Tcb->RemoteEnd.Port);\r
+    AccessPoint->ActiveFlag = (BOOLEAN)(Tcb->State != TCP_LISTEN);\r
 \r
     if (Option != NULL) {\r
-      Option->ReceiveBufferSize      = GET_RCV_BUFFSIZE (Tcb->Sk);\r
-      Option->SendBufferSize         = GET_SND_BUFFSIZE (Tcb->Sk);\r
-      Option->MaxSynBackLog          = GET_BACKLOG (Tcb->Sk);\r
-\r
-      Option->ConnectionTimeout      = Tcb->ConnectTimeout / TCP_TICK_HZ;\r
-      Option->DataRetries            = Tcb->MaxRexmit;\r
-      Option->FinTimeout             = Tcb->FinWait2Timeout / TCP_TICK_HZ;\r
-      Option->TimeWaitTimeout        = Tcb->TimeWaitTimeout / TCP_TICK_HZ;\r
-      Option->KeepAliveProbes        = Tcb->MaxKeepAlive;\r
-      Option->KeepAliveTime          = Tcb->KeepAliveIdle / TCP_TICK_HZ;\r
-      Option->KeepAliveInterval      = Tcb->KeepAlivePeriod / TCP_TICK_HZ;\r
-\r
-      Option->EnableNagle            = (BOOLEAN) (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_NAGLE));\r
-      Option->EnableTimeStamp        = (BOOLEAN) (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_TS));\r
-      Option->EnableWindowScaling    = (BOOLEAN) (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_WS));\r
+      Option->ReceiveBufferSize = GET_RCV_BUFFSIZE (Tcb->Sk);\r
+      Option->SendBufferSize    = GET_SND_BUFFSIZE (Tcb->Sk);\r
+      Option->MaxSynBackLog     = GET_BACKLOG (Tcb->Sk);\r
+\r
+      Option->ConnectionTimeout = Tcb->ConnectTimeout / TCP_TICK_HZ;\r
+      Option->DataRetries       = Tcb->MaxRexmit;\r
+      Option->FinTimeout        = Tcb->FinWait2Timeout / TCP_TICK_HZ;\r
+      Option->TimeWaitTimeout   = Tcb->TimeWaitTimeout / TCP_TICK_HZ;\r
+      Option->KeepAliveProbes   = Tcb->MaxKeepAlive;\r
+      Option->KeepAliveTime     = Tcb->KeepAliveIdle / TCP_TICK_HZ;\r
+      Option->KeepAliveInterval = Tcb->KeepAlivePeriod / TCP_TICK_HZ;\r
+\r
+      Option->EnableNagle         = (BOOLEAN)(!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_NAGLE));\r
+      Option->EnableTimeStamp     = (BOOLEAN)(!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_TS));\r
+      Option->EnableWindowScaling = (BOOLEAN)(!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_WS));\r
 \r
       Option->EnableSelectiveAck     = FALSE;\r
       Option->EnablePathMtuDiscovery = FALSE;\r
@@ -145,15 +143,15 @@ Tcp4GetMode (
 **/\r
 EFI_STATUS\r
 Tcp6GetMode (\r
-  IN     TCP_CB         *Tcb,\r
-  IN OUT TCP6_MODE_DATA *Mode\r
+  IN     TCP_CB          *Tcb,\r
+  IN OUT TCP6_MODE_DATA  *Mode\r
   )\r
 {\r
-  SOCKET                *Sock;\r
-  EFI_TCP6_CONFIG_DATA  *ConfigData;\r
-  EFI_TCP6_ACCESS_POINT *AccessPoint;\r
-  EFI_TCP6_OPTION       *Option;\r
-  EFI_IP6_PROTOCOL      *Ip;\r
+  SOCKET                 *Sock;\r
+  EFI_TCP6_CONFIG_DATA   *ConfigData;\r
+  EFI_TCP6_ACCESS_POINT  *AccessPoint;\r
+  EFI_TCP6_OPTION        *Option;\r
+  EFI_IP6_PROTOCOL       *Ip;\r
 \r
   Sock = Tcb->Sk;\r
 \r
@@ -162,41 +160,40 @@ Tcp6GetMode (
   }\r
 \r
   if (Mode->Tcp6State != NULL) {\r
-    *(Mode->Tcp6State) = (EFI_TCP6_CONNECTION_STATE) (Tcb->State);\r
+    *(Mode->Tcp6State) = (EFI_TCP6_CONNECTION_STATE)(Tcb->State);\r
   }\r
 \r
   if (Mode->Tcp6ConfigData != NULL) {\r
+    ConfigData  = Mode->Tcp6ConfigData;\r
+    AccessPoint = &(ConfigData->AccessPoint);\r
+    Option      = ConfigData->ControlOption;\r
 \r
-    ConfigData                       = Mode->Tcp6ConfigData;\r
-    AccessPoint                      = &(ConfigData->AccessPoint);\r
-    Option                           = ConfigData->ControlOption;\r
-\r
-    ConfigData->TrafficClass         = Tcb->Tos;\r
-    ConfigData->HopLimit             = Tcb->Ttl;\r
+    ConfigData->TrafficClass = Tcb->Tos;\r
+    ConfigData->HopLimit     = Tcb->Ttl;\r
 \r
-    AccessPoint->StationPort         = NTOHS (Tcb->LocalEnd.Port);\r
-    AccessPoint->RemotePort          = NTOHS (Tcb->RemoteEnd.Port);\r
-    AccessPoint->ActiveFlag          = (BOOLEAN) (Tcb->State != TCP_LISTEN);\r
+    AccessPoint->StationPort = NTOHS (Tcb->LocalEnd.Port);\r
+    AccessPoint->RemotePort  = NTOHS (Tcb->RemoteEnd.Port);\r
+    AccessPoint->ActiveFlag  = (BOOLEAN)(Tcb->State != TCP_LISTEN);\r
 \r
     IP6_COPY_ADDRESS (&AccessPoint->StationAddress, &Tcb->LocalEnd.Ip);\r
     IP6_COPY_ADDRESS (&AccessPoint->RemoteAddress, &Tcb->RemoteEnd.Ip);\r
 \r
     if (Option != NULL) {\r
-      Option->ReceiveBufferSize      = GET_RCV_BUFFSIZE (Tcb->Sk);\r
-      Option->SendBufferSize         = GET_SND_BUFFSIZE (Tcb->Sk);\r
-      Option->MaxSynBackLog          = GET_BACKLOG (Tcb->Sk);\r
-\r
-      Option->ConnectionTimeout      = Tcb->ConnectTimeout / TCP_TICK_HZ;\r
-      Option->DataRetries            = Tcb->MaxRexmit;\r
-      Option->FinTimeout             = Tcb->FinWait2Timeout / TCP_TICK_HZ;\r
-      Option->TimeWaitTimeout        = Tcb->TimeWaitTimeout / TCP_TICK_HZ;\r
-      Option->KeepAliveProbes        = Tcb->MaxKeepAlive;\r
-      Option->KeepAliveTime          = Tcb->KeepAliveIdle / TCP_TICK_HZ;\r
-      Option->KeepAliveInterval      = Tcb->KeepAlivePeriod / TCP_TICK_HZ;\r
-\r
-      Option->EnableNagle            = (BOOLEAN) (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_NAGLE));\r
-      Option->EnableTimeStamp        = (BOOLEAN) (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_TS));\r
-      Option->EnableWindowScaling    = (BOOLEAN) (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_WS));\r
+      Option->ReceiveBufferSize = GET_RCV_BUFFSIZE (Tcb->Sk);\r
+      Option->SendBufferSize    = GET_SND_BUFFSIZE (Tcb->Sk);\r
+      Option->MaxSynBackLog     = GET_BACKLOG (Tcb->Sk);\r
+\r
+      Option->ConnectionTimeout = Tcb->ConnectTimeout / TCP_TICK_HZ;\r
+      Option->DataRetries       = Tcb->MaxRexmit;\r
+      Option->FinTimeout        = Tcb->FinWait2Timeout / TCP_TICK_HZ;\r
+      Option->TimeWaitTimeout   = Tcb->TimeWaitTimeout / TCP_TICK_HZ;\r
+      Option->KeepAliveProbes   = Tcb->MaxKeepAlive;\r
+      Option->KeepAliveTime     = Tcb->KeepAliveIdle / TCP_TICK_HZ;\r
+      Option->KeepAliveInterval = Tcb->KeepAlivePeriod / TCP_TICK_HZ;\r
+\r
+      Option->EnableNagle         = (BOOLEAN)(!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_NAGLE));\r
+      Option->EnableTimeStamp     = (BOOLEAN)(!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_TS));\r
+      Option->EnableWindowScaling = (BOOLEAN)(!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_WS));\r
 \r
       Option->EnableSelectiveAck     = FALSE;\r
       Option->EnablePathMtuDiscovery = FALSE;\r
@@ -248,7 +245,6 @@ TcpBind (
     // Check if a same endpoing is bound.\r
     //\r
     if (TcpFindTcbByPeer (&Local, *Port, IpVersion)) {\r
-\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   } else {\r
@@ -270,14 +266,14 @@ TcpBind (
         if (Cycle) {\r
           DEBUG (\r
             (DEBUG_ERROR,\r
-            "TcpBind: no port can be allocated for this pcb\n")\r
+             "TcpBind: no port can be allocated for this pcb\n")\r
             );\r
           return EFI_OUT_OF_RESOURCES;\r
         }\r
 \r
         *RandomPort = TCP_PORT_KNOWN + 1;\r
 \r
-        Cycle       = TRUE;\r
+        Cycle = TRUE;\r
       }\r
     }\r
 \r
@@ -295,14 +291,14 @@ TcpBind (
 **/\r
 VOID\r
 TcpFlushPcb (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
-  SOCKET                    *Sock;\r
+  SOCKET  *Sock;\r
 \r
   IpIoConfigIp (Tcb->IpInfo, NULL);\r
 \r
-  Sock     = Tcb->Sk;\r
+  Sock = Tcb->Sk;\r
 \r
   if (SOCK_IS_CONFIGURED (Sock)) {\r
     RemoveEntryList (&Tcb->List);\r
@@ -324,7 +320,7 @@ TcpFlushPcb (
 \r
   NetbufFreeList (&Tcb->SndQue);\r
   NetbufFreeList (&Tcb->RcvQue);\r
-  Tcb->State = TCP_CLOSED;\r
+  Tcb->State        = TCP_CLOSED;\r
   Tcb->RemoteIpZero = FALSE;\r
 }\r
 \r
@@ -358,13 +354,12 @@ TcpAttachPcb (
   Tcb = AllocateZeroPool (sizeof (TCP_CB));\r
 \r
   if (Tcb == NULL) {\r
-\r
     DEBUG ((DEBUG_ERROR, "TcpConfigurePcb: failed to allocate a TCB\n"));\r
 \r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  ProtoData = (TCP_PROTO_DATA *) Sk->ProtoReserved;\r
+  ProtoData = (TCP_PROTO_DATA *)Sk->ProtoReserved;\r
   IpIo      = ProtoData->TcpService->IpIo;\r
 \r
   //\r
@@ -372,7 +367,6 @@ TcpAttachPcb (
   //\r
   Tcb->IpInfo = IpIoAddIp (IpIo);\r
   if (Tcb->IpInfo == NULL) {\r
-\r
     FreePool (Tcb);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -413,13 +407,13 @@ TcpAttachPcb (
 **/\r
 VOID\r
 TcpDetachPcb (\r
-  IN OUT SOCKET    *Sk\r
+  IN OUT SOCKET  *Sk\r
   )\r
 {\r
-  TCP_PROTO_DATA   *ProtoData;\r
-  TCP_CB           *Tcb;\r
+  TCP_PROTO_DATA  *ProtoData;\r
+  TCP_CB          *Tcb;\r
 \r
-  ProtoData = (TCP_PROTO_DATA *) Sk->ProtoReserved;\r
+  ProtoData = (TCP_PROTO_DATA *)Sk->ProtoReserved;\r
   Tcb       = ProtoData->TcpPcb;\r
 \r
   ASSERT (Tcb != NULL);\r
@@ -451,16 +445,16 @@ TcpConfigurePcb (
   IN TCP_CONFIG_DATA  *CfgData\r
   )\r
 {\r
-  IP_IO_IP_CONFIG_DATA IpCfgData;\r
-  EFI_STATUS           Status;\r
-  EFI_TCP4_OPTION      *Option;\r
-  TCP_PROTO_DATA       *TcpProto;\r
-  TCP_CB               *Tcb;\r
-  TCP_ACCESS_POINT     *TcpAp;\r
+  IP_IO_IP_CONFIG_DATA  IpCfgData;\r
+  EFI_STATUS            Status;\r
+  EFI_TCP4_OPTION       *Option;\r
+  TCP_PROTO_DATA        *TcpProto;\r
+  TCP_CB                *Tcb;\r
+  TCP_ACCESS_POINT      *TcpAp;\r
 \r
   ASSERT ((CfgData != NULL) && (Sk != NULL) && (Sk->SockHandle != NULL));\r
 \r
-  TcpProto = (TCP_PROTO_DATA *) Sk->ProtoReserved;\r
+  TcpProto = (TCP_PROTO_DATA *)Sk->ProtoReserved;\r
   Tcb      = TcpProto->TcpPcb;\r
 \r
   ASSERT (Tcb != NULL);\r
@@ -470,28 +464,27 @@ TcpConfigurePcb (
     // Add Ip for send pkt to the peer\r
     //\r
     CopyMem (&IpCfgData.Ip4CfgData, &mIp4IoDefaultIpConfigData, sizeof (EFI_IP4_CONFIG_DATA));\r
-    IpCfgData.Ip4CfgData.DefaultProtocol    = EFI_IP_PROTO_TCP;\r
-    IpCfgData.Ip4CfgData.TypeOfService      = CfgData->Tcp4CfgData.TypeOfService;\r
-    IpCfgData.Ip4CfgData.TimeToLive         = CfgData->Tcp4CfgData.TimeToLive;\r
-    IpCfgData.Ip4CfgData.UseDefaultAddress  = CfgData->Tcp4CfgData.AccessPoint.UseDefaultAddress;\r
+    IpCfgData.Ip4CfgData.DefaultProtocol   = EFI_IP_PROTO_TCP;\r
+    IpCfgData.Ip4CfgData.TypeOfService     = CfgData->Tcp4CfgData.TypeOfService;\r
+    IpCfgData.Ip4CfgData.TimeToLive        = CfgData->Tcp4CfgData.TimeToLive;\r
+    IpCfgData.Ip4CfgData.UseDefaultAddress = CfgData->Tcp4CfgData.AccessPoint.UseDefaultAddress;\r
     IP4_COPY_ADDRESS (\r
       &IpCfgData.Ip4CfgData.SubnetMask,\r
       &CfgData->Tcp4CfgData.AccessPoint.SubnetMask\r
       );\r
-    IpCfgData.Ip4CfgData.ReceiveTimeout     = (UINT32) (-1);\r
+    IpCfgData.Ip4CfgData.ReceiveTimeout = (UINT32)(-1);\r
     IP4_COPY_ADDRESS (\r
       &IpCfgData.Ip4CfgData.StationAddress,\r
       &CfgData->Tcp4CfgData.AccessPoint.StationAddress\r
       );\r
-\r
   } else {\r
     ASSERT (Sk->IpVersion == IP_VERSION_6);\r
 \r
     CopyMem (&IpCfgData.Ip6CfgData, &mIp6IoDefaultIpConfigData, sizeof (EFI_IP6_CONFIG_DATA));\r
-    IpCfgData.Ip6CfgData.DefaultProtocol    = EFI_IP_PROTO_TCP;\r
-    IpCfgData.Ip6CfgData.TrafficClass       = CfgData->Tcp6CfgData.TrafficClass;\r
-    IpCfgData.Ip6CfgData.HopLimit           = CfgData->Tcp6CfgData.HopLimit;\r
-    IpCfgData.Ip6CfgData.ReceiveTimeout     = (UINT32) (-1);\r
+    IpCfgData.Ip6CfgData.DefaultProtocol = EFI_IP_PROTO_TCP;\r
+    IpCfgData.Ip6CfgData.TrafficClass    = CfgData->Tcp6CfgData.TrafficClass;\r
+    IpCfgData.Ip6CfgData.HopLimit        = CfgData->Tcp6CfgData.HopLimit;\r
+    IpCfgData.Ip6CfgData.ReceiveTimeout  = (UINT32)(-1);\r
     IP6_COPY_ADDRESS (\r
       &IpCfgData.Ip6CfgData.StationAddress,\r
       &CfgData->Tcp6CfgData.AccessPoint.StationAddress\r
@@ -523,14 +516,14 @@ TcpConfigurePcb (
       &IpCfgData.Ip4CfgData.SubnetMask\r
       );\r
 \r
-    TcpAp = (TCP_ACCESS_POINT *) &CfgData->Tcp4CfgData.AccessPoint;\r
+    TcpAp = (TCP_ACCESS_POINT *)&CfgData->Tcp4CfgData.AccessPoint;\r
   } else {\r
     IP6_COPY_ADDRESS (\r
       &CfgData->Tcp6CfgData.AccessPoint.StationAddress,\r
       &IpCfgData.Ip6CfgData.StationAddress\r
       );\r
 \r
-    TcpAp = (TCP_ACCESS_POINT *) &CfgData->Tcp6CfgData.AccessPoint;\r
+    TcpAp = (TCP_ACCESS_POINT *)&CfgData->Tcp6CfgData.AccessPoint;\r
   }\r
 \r
   //\r
@@ -541,8 +534,8 @@ TcpConfigurePcb (
   if (EFI_ERROR (Status)) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "TcpConfigurePcb: Bind endpoint failed with %r\n",\r
-      Status)\r
+       "TcpConfigurePcb: Bind endpoint failed with %r\n",\r
+       Status)\r
       );\r
 \r
     goto OnExit;\r
@@ -551,55 +544,57 @@ TcpConfigurePcb (
   //\r
   // Initialize the operating information in this Tcb\r
   //\r
-  ASSERT (Tcb->State == TCP_CLOSED &&\r
+  ASSERT (\r
+    Tcb->State == TCP_CLOSED &&\r
     IsListEmpty (&Tcb->SndQue) &&\r
-    IsListEmpty (&Tcb->RcvQue));\r
+    IsListEmpty (&Tcb->RcvQue)\r
+    );\r
 \r
   TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_NO_KEEPALIVE);\r
-  Tcb->State            = TCP_CLOSED;\r
+  Tcb->State = TCP_CLOSED;\r
 \r
-  Tcb->SndMss           = 536;\r
-  Tcb->RcvMss           = TcpGetRcvMss (Sk);\r
+  Tcb->SndMss = 536;\r
+  Tcb->RcvMss = TcpGetRcvMss (Sk);\r
 \r
-  Tcb->SRtt             = 0;\r
-  Tcb->Rto              = 3 * TCP_TICK_HZ;\r
+  Tcb->SRtt = 0;\r
+  Tcb->Rto  = 3 * TCP_TICK_HZ;\r
 \r
-  Tcb->CWnd             = Tcb->SndMss;\r
-  Tcb->Ssthresh         = 0xffffffff;\r
+  Tcb->CWnd     = Tcb->SndMss;\r
+  Tcb->Ssthresh = 0xffffffff;\r
 \r
-  Tcb->CongestState     = TCP_CONGEST_OPEN;\r
+  Tcb->CongestState = TCP_CONGEST_OPEN;\r
 \r
-  Tcb->KeepAliveIdle    = TCP_KEEPALIVE_IDLE_MIN;\r
-  Tcb->KeepAlivePeriod  = TCP_KEEPALIVE_PERIOD;\r
-  Tcb->MaxKeepAlive     = TCP_MAX_KEEPALIVE;\r
-  Tcb->MaxRexmit        = TCP_MAX_LOSS;\r
-  Tcb->FinWait2Timeout  = TCP_FIN_WAIT2_TIME;\r
-  Tcb->TimeWaitTimeout  = TCP_TIME_WAIT_TIME;\r
-  Tcb->ConnectTimeout   = TCP_CONNECT_TIME;\r
+  Tcb->KeepAliveIdle   = TCP_KEEPALIVE_IDLE_MIN;\r
+  Tcb->KeepAlivePeriod = TCP_KEEPALIVE_PERIOD;\r
+  Tcb->MaxKeepAlive    = TCP_MAX_KEEPALIVE;\r
+  Tcb->MaxRexmit       = TCP_MAX_LOSS;\r
+  Tcb->FinWait2Timeout = TCP_FIN_WAIT2_TIME;\r
+  Tcb->TimeWaitTimeout = TCP_TIME_WAIT_TIME;\r
+  Tcb->ConnectTimeout  = TCP_CONNECT_TIME;\r
 \r
   if (Sk->IpVersion == IP_VERSION_4) {\r
     //\r
     // initialize Tcb in the light of CfgData\r
     //\r
-    Tcb->Ttl            = CfgData->Tcp4CfgData.TimeToLive;\r
-    Tcb->Tos            = CfgData->Tcp4CfgData.TypeOfService;\r
+    Tcb->Ttl = CfgData->Tcp4CfgData.TimeToLive;\r
+    Tcb->Tos = CfgData->Tcp4CfgData.TypeOfService;\r
 \r
     Tcb->UseDefaultAddr = CfgData->Tcp4CfgData.AccessPoint.UseDefaultAddress;\r
 \r
     CopyMem (&Tcb->LocalEnd.Ip, &CfgData->Tcp4CfgData.AccessPoint.StationAddress, sizeof (IP4_ADDR));\r
-    Tcb->LocalEnd.Port  = HTONS (CfgData->Tcp4CfgData.AccessPoint.StationPort);\r
+    Tcb->LocalEnd.Port = HTONS (CfgData->Tcp4CfgData.AccessPoint.StationPort);\r
     IP4_COPY_ADDRESS (&Tcb->SubnetMask, &CfgData->Tcp4CfgData.AccessPoint.SubnetMask);\r
 \r
     CopyMem (&Tcb->RemoteEnd.Ip, &CfgData->Tcp4CfgData.AccessPoint.RemoteAddress, sizeof (IP4_ADDR));\r
     Tcb->RemoteEnd.Port = HTONS (CfgData->Tcp4CfgData.AccessPoint.RemotePort);\r
 \r
-    Option              = CfgData->Tcp4CfgData.ControlOption;\r
+    Option = CfgData->Tcp4CfgData.ControlOption;\r
   } else {\r
-    Tcb->Ttl            = CfgData->Tcp6CfgData.HopLimit;\r
-    Tcb->Tos            = CfgData->Tcp6CfgData.TrafficClass;\r
+    Tcb->Ttl = CfgData->Tcp6CfgData.HopLimit;\r
+    Tcb->Tos = CfgData->Tcp6CfgData.TrafficClass;\r
 \r
     IP6_COPY_ADDRESS (&Tcb->LocalEnd.Ip, &CfgData->Tcp6CfgData.AccessPoint.StationAddress);\r
-    Tcb->LocalEnd.Port  = HTONS (CfgData->Tcp6CfgData.AccessPoint.StationPort);\r
+    Tcb->LocalEnd.Port = HTONS (CfgData->Tcp6CfgData.AccessPoint.StationPort);\r
 \r
     IP6_COPY_ADDRESS (&Tcb->RemoteEnd.Ip, &CfgData->Tcp6CfgData.AccessPoint.RemoteAddress);\r
     Tcb->RemoteEnd.Port = HTONS (CfgData->Tcp6CfgData.AccessPoint.RemotePort);\r
@@ -607,61 +602,61 @@ TcpConfigurePcb (
     //\r
     // Type EFI_TCP4_OPTION and EFI_TCP6_OPTION are the same.\r
     //\r
-    Option              = (EFI_TCP4_OPTION *) CfgData->Tcp6CfgData.ControlOption;\r
+    Option = (EFI_TCP4_OPTION *)CfgData->Tcp6CfgData.ControlOption;\r
   }\r
 \r
   if (Option != NULL) {\r
     SET_RCV_BUFFSIZE (\r
       Sk,\r
-      (UINT32) (TCP_COMP_VAL (\r
-                  TCP_RCV_BUF_SIZE_MIN,\r
-                  TCP_RCV_BUF_SIZE,\r
-                  TCP_RCV_BUF_SIZE,\r
-                  Option->ReceiveBufferSize\r
-                  )\r
+      (UINT32)(TCP_COMP_VAL (\r
+                 TCP_RCV_BUF_SIZE_MIN,\r
+                 TCP_RCV_BUF_SIZE,\r
+                 TCP_RCV_BUF_SIZE,\r
+                 Option->ReceiveBufferSize\r
+                 )\r
                )\r
       );\r
     SET_SND_BUFFSIZE (\r
       Sk,\r
-      (UINT32) (TCP_COMP_VAL (\r
-                  TCP_SND_BUF_SIZE_MIN,\r
-                  TCP_SND_BUF_SIZE,\r
-                  TCP_SND_BUF_SIZE,\r
-                  Option->SendBufferSize\r
-                  )\r
+      (UINT32)(TCP_COMP_VAL (\r
+                 TCP_SND_BUF_SIZE_MIN,\r
+                 TCP_SND_BUF_SIZE,\r
+                 TCP_SND_BUF_SIZE,\r
+                 Option->SendBufferSize\r
+                 )\r
                )\r
       );\r
 \r
     SET_BACKLOG (\r
       Sk,\r
-      (UINT32) (TCP_COMP_VAL (\r
-                  TCP_BACKLOG_MIN,\r
-                  TCP_BACKLOG,\r
-                  TCP_BACKLOG,\r
-                  Option->MaxSynBackLog\r
-                  )\r
+      (UINT32)(TCP_COMP_VAL (\r
+                 TCP_BACKLOG_MIN,\r
+                 TCP_BACKLOG,\r
+                 TCP_BACKLOG,\r
+                 Option->MaxSynBackLog\r
+                 )\r
                )\r
       );\r
 \r
-    Tcb->MaxRexmit = (UINT16) TCP_COMP_VAL (\r
-                                TCP_MAX_LOSS_MIN,\r
-                                TCP_MAX_LOSS,\r
-                                TCP_MAX_LOSS,\r
-                                Option->DataRetries\r
-                                );\r
+    Tcb->MaxRexmit = (UINT16)TCP_COMP_VAL (\r
+                               TCP_MAX_LOSS_MIN,\r
+                               TCP_MAX_LOSS,\r
+                               TCP_MAX_LOSS,\r
+                               Option->DataRetries\r
+                               );\r
     Tcb->FinWait2Timeout = TCP_COMP_VAL (\r
-                              TCP_FIN_WAIT2_TIME,\r
-                              TCP_FIN_WAIT2_TIME_MAX,\r
-                              TCP_FIN_WAIT2_TIME,\r
-                              (UINT32) (Option->FinTimeout * TCP_TICK_HZ)\r
-                              );\r
+                             TCP_FIN_WAIT2_TIME,\r
+                             TCP_FIN_WAIT2_TIME_MAX,\r
+                             TCP_FIN_WAIT2_TIME,\r
+                             (UINT32)(Option->FinTimeout * TCP_TICK_HZ)\r
+                             );\r
 \r
     if (Option->TimeWaitTimeout != 0) {\r
       Tcb->TimeWaitTimeout = TCP_COMP_VAL (\r
                                TCP_TIME_WAIT_TIME,\r
                                TCP_TIME_WAIT_TIME_MAX,\r
                                TCP_TIME_WAIT_TIME,\r
-                               (UINT32) (Option->TimeWaitTimeout * TCP_TICK_HZ)\r
+                               (UINT32)(Option->TimeWaitTimeout * TCP_TICK_HZ)\r
                                );\r
     } else {\r
       Tcb->TimeWaitTimeout = 0;\r
@@ -670,23 +665,23 @@ TcpConfigurePcb (
     if (Option->KeepAliveProbes != 0) {\r
       TCP_CLEAR_FLG (Tcb->CtrlFlag, TCP_CTRL_NO_KEEPALIVE);\r
 \r
-      Tcb->MaxKeepAlive = (UINT8) TCP_COMP_VAL (\r
-                                    TCP_MAX_KEEPALIVE_MIN,\r
-                                    TCP_MAX_KEEPALIVE,\r
-                                    TCP_MAX_KEEPALIVE,\r
-                                    Option->KeepAliveProbes\r
-                                    );\r
+      Tcb->MaxKeepAlive = (UINT8)TCP_COMP_VAL (\r
+                                   TCP_MAX_KEEPALIVE_MIN,\r
+                                   TCP_MAX_KEEPALIVE,\r
+                                   TCP_MAX_KEEPALIVE,\r
+                                   Option->KeepAliveProbes\r
+                                   );\r
       Tcb->KeepAliveIdle = TCP_COMP_VAL (\r
                              TCP_KEEPALIVE_IDLE_MIN,\r
                              TCP_KEEPALIVE_IDLE_MAX,\r
                              TCP_KEEPALIVE_IDLE_MIN,\r
-                             (UINT32) (Option->KeepAliveTime * TCP_TICK_HZ)\r
+                             (UINT32)(Option->KeepAliveTime * TCP_TICK_HZ)\r
                              );\r
       Tcb->KeepAlivePeriod = TCP_COMP_VAL (\r
                                TCP_KEEPALIVE_PERIOD_MIN,\r
                                TCP_KEEPALIVE_PERIOD,\r
                                TCP_KEEPALIVE_PERIOD,\r
-                               (UINT32) (Option->KeepAliveInterval * TCP_TICK_HZ)\r
+                               (UINT32)(Option->KeepAliveInterval * TCP_TICK_HZ)\r
                                );\r
     }\r
 \r
@@ -694,7 +689,7 @@ TcpConfigurePcb (
                             TCP_CONNECT_TIME_MIN,\r
                             TCP_CONNECT_TIME,\r
                             TCP_CONNECT_TIME,\r
-                            (UINT32) (Option->ConnectionTimeout * TCP_TICK_HZ)\r
+                            (UINT32)(Option->ConnectionTimeout * TCP_TICK_HZ)\r
                             );\r
 \r
     if (!Option->EnableNagle) {\r
@@ -724,19 +719,18 @@ TcpConfigurePcb (
   //\r
   if (((Sk->IpVersion == IP_VERSION_4) && !CfgData->Tcp4CfgData.AccessPoint.ActiveFlag) ||\r
       ((Sk->IpVersion == IP_VERSION_6) && !CfgData->Tcp6CfgData.AccessPoint.ActiveFlag)\r
-      ) {\r
-\r
+      )\r
+  {\r
     TcpSetState (Tcb, TCP_LISTEN);\r
     SockSetState (Sk, SO_LISTENING);\r
 \r
     Sk->ConfigureState = SO_CONFIGURED_PASSIVE;\r
   } else {\r
-\r
     Sk->ConfigureState = SO_CONFIGURED_ACTIVE;\r
   }\r
 \r
   if (Sk->IpVersion == IP_VERSION_6) {\r
-    Tcb->Tick          = TCP6_REFRESH_NEIGHBOR_TICK;\r
+    Tcb->Tick = TCP6_REFRESH_NEIGHBOR_TICK;\r
 \r
     if (NetIp6IsUnspecifiedAddr (&Tcb->RemoteEnd.Ip.v6)) {\r
       Tcb->RemoteIpZero = TRUE;\r
@@ -768,123 +762,121 @@ OnExit:
 **/\r
 EFI_STATUS\r
 TcpDispatcher (\r
-  IN SOCKET                  *Sock,\r
-  IN UINT8                   Request,\r
-  IN VOID                    *Data    OPTIONAL\r
+  IN SOCKET  *Sock,\r
+  IN UINT8   Request,\r
+  IN VOID    *Data    OPTIONAL\r
   )\r
 {\r
   TCP_CB          *Tcb;\r
   TCP_PROTO_DATA  *ProtoData;\r
 \r
-  ProtoData = (TCP_PROTO_DATA *) Sock->ProtoReserved;\r
+  ProtoData = (TCP_PROTO_DATA *)Sock->ProtoReserved;\r
   Tcb       = ProtoData->TcpPcb;\r
 \r
   switch (Request) {\r
-  case SOCK_POLL:\r
-    if (Tcb->Sk->IpVersion == IP_VERSION_4) {\r
-      ProtoData->TcpService->IpIo->Ip.Ip4->Poll (ProtoData->TcpService->IpIo->Ip.Ip4);\r
-    } else {\r
-      ProtoData->TcpService->IpIo->Ip.Ip6->Poll (ProtoData->TcpService->IpIo->Ip.Ip6);\r
-    }\r
-\r
-    break;\r
-\r
-  case SOCK_CONSUMED:\r
-    //\r
-    // After user received data from socket buffer, socket will\r
-    // notify TCP using this message to give it a chance to send out\r
-    // window update information\r
-    //\r
-    ASSERT (Tcb != NULL);\r
-    TcpOnAppConsume (Tcb);\r
-    break;\r
+    case SOCK_POLL:\r
+      if (Tcb->Sk->IpVersion == IP_VERSION_4) {\r
+        ProtoData->TcpService->IpIo->Ip.Ip4->Poll (ProtoData->TcpService->IpIo->Ip.Ip4);\r
+      } else {\r
+        ProtoData->TcpService->IpIo->Ip.Ip6->Poll (ProtoData->TcpService->IpIo->Ip.Ip6);\r
+      }\r
 \r
-  case SOCK_SND:\r
+      break;\r
 \r
-    ASSERT (Tcb != NULL);\r
-    TcpOnAppSend (Tcb);\r
-    break;\r
+    case SOCK_CONSUMED:\r
+      //\r
+      // After user received data from socket buffer, socket will\r
+      // notify TCP using this message to give it a chance to send out\r
+      // window update information\r
+      //\r
+      ASSERT (Tcb != NULL);\r
+      TcpOnAppConsume (Tcb);\r
+      break;\r
 \r
-  case SOCK_CLOSE:\r
+    case SOCK_SND:\r
 \r
-    TcpOnAppClose (Tcb);\r
+      ASSERT (Tcb != NULL);\r
+      TcpOnAppSend (Tcb);\r
+      break;\r
 \r
-    break;\r
+    case SOCK_CLOSE:\r
 \r
-  case SOCK_ABORT:\r
+      TcpOnAppClose (Tcb);\r
 \r
-    TcpOnAppAbort (Tcb);\r
+      break;\r
 \r
-    break;\r
+    case SOCK_ABORT:\r
 \r
-  case SOCK_SNDPUSH:\r
-    Tcb->SndPsh = TcpGetMaxSndNxt (Tcb) + GET_SND_DATASIZE (Tcb->Sk);\r
-    TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_SND_PSH);\r
+      TcpOnAppAbort (Tcb);\r
 \r
-    break;\r
+      break;\r
 \r
-  case SOCK_SNDURG:\r
-    Tcb->SndUp = TcpGetMaxSndNxt (Tcb) + GET_SND_DATASIZE (Tcb->Sk) - 1;\r
-    TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_SND_URG);\r
+    case SOCK_SNDPUSH:\r
+      Tcb->SndPsh = TcpGetMaxSndNxt (Tcb) + GET_SND_DATASIZE (Tcb->Sk);\r
+      TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_SND_PSH);\r
 \r
-    break;\r
+      break;\r
 \r
-  case SOCK_CONNECT:\r
+    case SOCK_SNDURG:\r
+      Tcb->SndUp = TcpGetMaxSndNxt (Tcb) + GET_SND_DATASIZE (Tcb->Sk) - 1;\r
+      TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_SND_URG);\r
 \r
-    TcpOnAppConnect (Tcb);\r
+      break;\r
 \r
-    break;\r
+    case SOCK_CONNECT:\r
 \r
-  case SOCK_ATTACH:\r
+      TcpOnAppConnect (Tcb);\r
 \r
-    return TcpAttachPcb (Sock);\r
+      break;\r
 \r
-    break;\r
+    case SOCK_ATTACH:\r
 \r
-  case SOCK_FLUSH:\r
+      return TcpAttachPcb (Sock);\r
 \r
-    TcpFlushPcb (Tcb);\r
+      break;\r
 \r
-    break;\r
+    case SOCK_FLUSH:\r
 \r
-  case SOCK_DETACH:\r
+      TcpFlushPcb (Tcb);\r
 \r
-    TcpDetachPcb (Sock);\r
+      break;\r
 \r
-    break;\r
+    case SOCK_DETACH:\r
 \r
-  case SOCK_CONFIGURE:\r
+      TcpDetachPcb (Sock);\r
 \r
-    return TcpConfigurePcb (\r
-            Sock,\r
-            (TCP_CONFIG_DATA *) Data\r
-            );\r
+      break;\r
 \r
-    break;\r
+    case SOCK_CONFIGURE:\r
 \r
-  case SOCK_MODE:\r
+      return TcpConfigurePcb (\r
+               Sock,\r
+               (TCP_CONFIG_DATA *)Data\r
+               );\r
 \r
-    ASSERT ((Data != NULL) && (Tcb != NULL));\r
+      break;\r
 \r
-    if (Tcb->Sk->IpVersion == IP_VERSION_4) {\r
+    case SOCK_MODE:\r
 \r
-      return Tcp4GetMode (Tcb, (TCP4_MODE_DATA *) Data);\r
-    } else {\r
+      ASSERT ((Data != NULL) && (Tcb != NULL));\r
 \r
-      return Tcp6GetMode (Tcb, (TCP6_MODE_DATA *) Data);\r
-    }\r
+      if (Tcb->Sk->IpVersion == IP_VERSION_4) {\r
+        return Tcp4GetMode (Tcb, (TCP4_MODE_DATA *)Data);\r
+      } else {\r
+        return Tcp6GetMode (Tcb, (TCP6_MODE_DATA *)Data);\r
+      }\r
 \r
-    break;\r
+      break;\r
 \r
-  case SOCK_ROUTE:\r
+    case SOCK_ROUTE:\r
 \r
-    ASSERT ((Data != NULL) && (Tcb != NULL) && (Tcb->Sk->IpVersion == IP_VERSION_4));\r
+      ASSERT ((Data != NULL) && (Tcb != NULL) && (Tcb->Sk->IpVersion == IP_VERSION_4));\r
 \r
-    return Tcp4Route (Tcb, (TCP4_ROUTE_INFO *) Data);\r
+      return Tcp4Route (Tcb, (TCP4_ROUTE_INFO *)Data);\r
 \r
-  default:\r
+    default:\r
 \r
-    return EFI_UNSUPPORTED;\r
+      return EFI_UNSUPPORTED;\r
   }\r
 \r
   return EFI_SUCCESS;\r
index ef8cd42694390cc3429e0ee20f07244b21c5f504..98a90e02109b2b021c2c6e2e7f978c22b2d92d5d 100644 (file)
@@ -9,15 +9,15 @@
 \r
 #include "TcpMain.h"\r
 \r
-UINT16                        mTcp4RandomPort;\r
-UINT16                        mTcp6RandomPort;\r
+UINT16  mTcp4RandomPort;\r
+UINT16  mTcp6RandomPort;\r
 \r
-TCP_HEARTBEAT_TIMER           mTcpTimer = {\r
+TCP_HEARTBEAT_TIMER  mTcpTimer = {\r
   NULL,\r
   0\r
 };\r
 \r
-EFI_TCP4_PROTOCOL             gTcp4ProtocolTemplate = {\r
+EFI_TCP4_PROTOCOL  gTcp4ProtocolTemplate = {\r
   Tcp4GetModeData,\r
   Tcp4Configure,\r
   Tcp4Routes,\r
@@ -30,7 +30,7 @@ EFI_TCP4_PROTOCOL             gTcp4ProtocolTemplate = {
   Tcp4Poll\r
 };\r
 \r
-EFI_TCP6_PROTOCOL             gTcp6ProtocolTemplate = {\r
+EFI_TCP6_PROTOCOL  gTcp6ProtocolTemplate = {\r
   Tcp6GetModeData,\r
   Tcp6Configure,\r
   Tcp6Connect,\r
@@ -42,7 +42,7 @@ EFI_TCP6_PROTOCOL             gTcp6ProtocolTemplate = {
   Tcp6Poll\r
 };\r
 \r
-SOCK_INIT_DATA                mTcpDefaultSockData = {\r
+SOCK_INIT_DATA  mTcpDefaultSockData = {\r
   SockStream,\r
   SO_CLOSED,\r
   NULL,\r
@@ -60,7 +60,7 @@ SOCK_INIT_DATA                mTcpDefaultSockData = {
   NULL,\r
 };\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL   gTcp4DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gTcp4DriverBinding = {\r
   Tcp4DriverBindingSupported,\r
   Tcp4DriverBindingStart,\r
   Tcp4DriverBindingStop,\r
@@ -69,7 +69,7 @@ EFI_DRIVER_BINDING_PROTOCOL   gTcp4DriverBinding = {
   NULL\r
 };\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL   gTcp6DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gTcp6DriverBinding = {\r
   Tcp6DriverBindingSupported,\r
   Tcp6DriverBindingStart,\r
   Tcp6DriverBindingStop,\r
@@ -83,7 +83,6 @@ EFI_SERVICE_BINDING_PROTOCOL  gTcpServiceBinding = {
   TcpServiceBindingDestroyChild\r
 };\r
 \r
-\r
 /**\r
   Create and start the heartbeat timer for the TCP driver.\r
 \r
@@ -101,7 +100,6 @@ TcpCreateTimer (
   Status = EFI_SUCCESS;\r
 \r
   if (mTcpTimer.RefCnt == 0) {\r
-\r
     Status = gBS->CreateEvent (\r
                     EVT_TIMER | EVT_NOTIFY_SIGNAL,\r
                     TPL_NOTIFY,\r
@@ -110,17 +108,15 @@ TcpCreateTimer (
                     &mTcpTimer.TimerEvent\r
                     );\r
     if (!EFI_ERROR (Status)) {\r
-\r
       Status = gBS->SetTimer (\r
                       mTcpTimer.TimerEvent,\r
                       TimerPeriodic,\r
-                      (UINT64) (TICKS_PER_SECOND / TCP_TICK_HZ)\r
+                      (UINT64)(TICKS_PER_SECOND / TCP_TICK_HZ)\r
                       );\r
     }\r
   }\r
 \r
   if (!EFI_ERROR (Status)) {\r
-\r
     mTcpTimer.RefCnt++;\r
   }\r
 \r
@@ -209,7 +205,7 @@ TcpDriverEntryPoint (
   //\r
   Seed            = NetRandomInitSeed ();\r
   mTcpGlobalIss   = NET_RANDOM (Seed) % mTcpGlobalIss;\r
-  mTcp4RandomPort = (UINT16) (TCP_PORT_KNOWN + (NET_RANDOM (Seed) % TCP_PORT_KNOWN));\r
+  mTcp4RandomPort = (UINT16)(TCP_PORT_KNOWN + (NET_RANDOM (Seed) % TCP_PORT_KNOWN));\r
   mTcp6RandomPort = mTcp4RandomPort;\r
 \r
   return EFI_SUCCESS;\r
@@ -233,11 +229,11 @@ TcpCreateService (
   IN UINT8       IpVersion\r
   )\r
 {\r
-  EFI_STATUS         Status;\r
-  EFI_GUID           *IpServiceBindingGuid;\r
-  EFI_GUID           *TcpServiceBindingGuid;\r
-  TCP_SERVICE_DATA   *TcpServiceData;\r
-  IP_IO_OPEN_DATA    OpenData;\r
+  EFI_STATUS        Status;\r
+  EFI_GUID          *IpServiceBindingGuid;\r
+  EFI_GUID          *TcpServiceBindingGuid;\r
+  TCP_SERVICE_DATA  *TcpServiceData;\r
+  IP_IO_OPEN_DATA   OpenData;\r
 \r
   if (IpVersion == IP_VERSION_4) {\r
     IpServiceBindingGuid  = &gEfiIp4ServiceBindingProtocolGuid;\r
@@ -279,10 +275,10 @@ TcpCreateService (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  TcpServiceData->Signature            = TCP_DRIVER_SIGNATURE;\r
-  TcpServiceData->ControllerHandle     = Controller;\r
-  TcpServiceData->DriverBindingHandle  = Image;\r
-  TcpServiceData->IpVersion            = IpVersion;\r
+  TcpServiceData->Signature           = TCP_DRIVER_SIGNATURE;\r
+  TcpServiceData->ControllerHandle    = Controller;\r
+  TcpServiceData->DriverBindingHandle = Image;\r
+  TcpServiceData->IpVersion           = IpVersion;\r
   CopyMem (\r
     &TcpServiceData->ServiceBinding,\r
     &gTcpServiceBinding,\r
@@ -295,7 +291,6 @@ TcpCreateService (
     goto ON_ERROR;\r
   }\r
 \r
-\r
   InitializeListHead (&TcpServiceData->SocketList);\r
   ZeroMem (&OpenData, sizeof (IP_IO_OPEN_DATA));\r
 \r
@@ -315,8 +310,8 @@ TcpCreateService (
     OpenData.IpConfigData.Ip6CfgData.DefaultProtocol = EFI_IP_PROTO_TCP;\r
   }\r
 \r
-  OpenData.PktRcvdNotify  = TcpRxCallback;\r
-  Status                  = IpIoOpen (TcpServiceData->IpIo, &OpenData);\r
+  OpenData.PktRcvdNotify = TcpRxCallback;\r
+  Status                 = IpIoOpen (TcpServiceData->IpIo, &OpenData);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
   }\r
@@ -365,8 +360,8 @@ ON_ERROR:
 EFI_STATUS\r
 EFIAPI\r
 TcpDestroyChildEntryInHandleBuffer (\r
-  IN LIST_ENTRY         *Entry,\r
-  IN VOID               *Context\r
+  IN LIST_ENTRY  *Entry,\r
+  IN VOID        *Context\r
   )\r
 {\r
   SOCKET                        *Sock;\r
@@ -374,14 +369,14 @@ TcpDestroyChildEntryInHandleBuffer (
   UINTN                         NumberOfChildren;\r
   EFI_HANDLE                    *ChildHandleBuffer;\r
 \r
-  if (Entry == NULL || Context == NULL) {\r
+  if ((Entry == NULL) || (Context == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Sock = NET_LIST_USER_STRUCT_S (Entry, SOCKET, Link, SOCK_SIGNATURE);\r
-  ServiceBinding    = ((TCP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ServiceBinding;\r
-  NumberOfChildren  = ((TCP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->NumberOfChildren;\r
-  ChildHandleBuffer = ((TCP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ChildHandleBuffer;\r
+  Sock              = NET_LIST_USER_STRUCT_S (Entry, SOCKET, Link, SOCK_SIGNATURE);\r
+  ServiceBinding    = ((TCP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ServiceBinding;\r
+  NumberOfChildren  = ((TCP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->NumberOfChildren;\r
+  ChildHandleBuffer = ((TCP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ChildHandleBuffer;\r
 \r
   if (!NetIsInHandleBuffer (Sock->SockHandle, NumberOfChildren, ChildHandleBuffer)) {\r
     return EFI_SUCCESS;\r
@@ -415,13 +410,13 @@ TcpDestroyService (
   IN UINT8       IpVersion\r
   )\r
 {\r
-  EFI_HANDLE                    NicHandle;\r
-  EFI_GUID                      *IpProtocolGuid;\r
-  EFI_GUID                      *ServiceBindingGuid;\r
-  EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
-  TCP_SERVICE_DATA              *TcpServiceData;\r
-  EFI_STATUS                    Status;\r
-  LIST_ENTRY                    *List;\r
+  EFI_HANDLE                               NicHandle;\r
+  EFI_GUID                                 *IpProtocolGuid;\r
+  EFI_GUID                                 *ServiceBindingGuid;\r
+  EFI_SERVICE_BINDING_PROTOCOL             *ServiceBinding;\r
+  TCP_SERVICE_DATA                         *TcpServiceData;\r
+  EFI_STATUS                               Status;\r
+  LIST_ENTRY                               *List;\r
   TCP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT  Context;\r
 \r
   ASSERT ((IpVersion == IP_VERSION_4) || (IpVersion == IP_VERSION_6));\r
@@ -442,7 +437,7 @@ TcpDestroyService (
   Status = gBS->OpenProtocol (\r
                   NicHandle,\r
                   ServiceBindingGuid,\r
-                  (VOID **) &ServiceBinding,\r
+                  (VOID **)&ServiceBinding,\r
                   ImageHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -454,16 +449,16 @@ TcpDestroyService (
   TcpServiceData = TCP_SERVICE_FROM_THIS (ServiceBinding);\r
 \r
   if (NumberOfChildren != 0) {\r
-    List = &TcpServiceData->SocketList;\r
-    Context.ServiceBinding = ServiceBinding;\r
-    Context.NumberOfChildren = NumberOfChildren;\r
+    List                      = &TcpServiceData->SocketList;\r
+    Context.ServiceBinding    = ServiceBinding;\r
+    Context.NumberOfChildren  = NumberOfChildren;\r
     Context.ChildHandleBuffer = ChildHandleBuffer;\r
-    Status = NetDestroyLinkList (\r
-               List,\r
-               TcpDestroyChildEntryInHandleBuffer,\r
-               &Context,\r
-               NULL\r
-               );\r
+    Status                    = NetDestroyLinkList (\r
+                                  List,\r
+                                  TcpDestroyChildEntryInHandleBuffer,\r
+                                  &Context,\r
+                                  NULL\r
+                                  );\r
   } else if (IsListEmpty (&TcpServiceData->SocketList)) {\r
     //\r
     // Uninstall TCP servicebinding protocol\r
@@ -758,7 +753,7 @@ TcpCreateSocketCallback (
     IpProtocolGuid = &gEfiIp6ProtocolGuid;\r
   }\r
 \r
-  TcpServiceData = ((TCP_PROTO_DATA *) This->ProtoReserved)->TcpService;\r
+  TcpServiceData = ((TCP_PROTO_DATA *)This->ProtoReserved)->TcpService;\r
 \r
   //\r
   // Open the default IP protocol of IP_IO BY_DRIVER.\r
@@ -781,7 +776,7 @@ TcpCreateSocketCallback (
   Status = gBS->OpenProtocol (\r
                   TcpServiceData->ControllerHandle,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &This->ParentDevicePath,\r
+                  (VOID **)&This->ParentDevicePath,\r
                   TcpServiceData->DriverBindingHandle,\r
                   This->SockHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -825,7 +820,7 @@ TcpDestroySocketCallback (
     IpProtocolGuid = &gEfiIp6ProtocolGuid;\r
   }\r
 \r
-  TcpServiceData = ((TCP_PROTO_DATA *) This->ProtoReserved)->TcpService;\r
+  TcpServiceData = ((TCP_PROTO_DATA *)This->ProtoReserved)->TcpService;\r
 \r
   //\r
   // Remove this node from the list.\r
@@ -876,7 +871,7 @@ TcpServiceBindingCreateChild (
   EFI_STATUS        Status;\r
   EFI_TPL           OldTpl;\r
 \r
-  if (NULL == This || NULL == ChildHandle) {\r
+  if ((NULL == This) || (NULL == ChildHandle)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -906,7 +901,7 @@ TcpServiceBindingCreateChild (
   if (NULL == Sock) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "TcpDriverBindingCreateChild: No resource to create a Tcp Child\n")\r
+       "TcpDriverBindingCreateChild: No resource to create a Tcp Child\n")\r
       );\r
 \r
     Status = EFI_OUT_OF_RESOURCES;\r
@@ -914,7 +909,7 @@ TcpServiceBindingCreateChild (
     *ChildHandle = Sock->SockHandle;\r
   }\r
 \r
-  mTcpDefaultSockData.ProtoData  = NULL;\r
+  mTcpDefaultSockData.ProtoData = NULL;\r
 \r
   gBS->RestoreTPL (OldTpl);\r
   return Status;\r
@@ -949,7 +944,7 @@ TcpServiceBindingDestroyChild (
   VOID        *Tcp;\r
   SOCKET      *Sock;\r
 \r
-  if (NULL == This || NULL == ChildHandle) {\r
+  if ((NULL == This) || (NULL == ChildHandle)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
index b90eed9f60a9a0ed043d1d4f7e5ad018cde26c37..a824f3b1d27b6ff3b55ce6737896b669a63734e4 100644 (file)
 #ifndef _TCP_DRIVER_H_\r
 #define _TCP_DRIVER_H_\r
 \r
-#define TCP_DRIVER_SIGNATURE   SIGNATURE_32 ('T', 'C', 'P', 'D')\r
+#define TCP_DRIVER_SIGNATURE  SIGNATURE_32 ('T', 'C', 'P', 'D')\r
 \r
-#define TCP_PORT_KNOWN         1024\r
-#define TCP_PORT_USER_RESERVED 65535\r
+#define TCP_PORT_KNOWN          1024\r
+#define TCP_PORT_USER_RESERVED  65535\r
 \r
 typedef struct _TCP_HEARTBEAT_TIMER {\r
-  EFI_EVENT  TimerEvent;\r
-  INTN       RefCnt;\r
+  EFI_EVENT    TimerEvent;\r
+  INTN         RefCnt;\r
 } TCP_HEARTBEAT_TIMER;\r
 \r
 typedef struct _TCP_SERVICE_DATA {\r
-  UINT32                        Signature;\r
-  EFI_HANDLE                    ControllerHandle;\r
-  EFI_HANDLE                    DriverBindingHandle;\r
-  UINT8                         IpVersion;\r
-  IP_IO                         *IpIo;\r
-  EFI_SERVICE_BINDING_PROTOCOL  ServiceBinding;\r
-  LIST_ENTRY                    SocketList;\r
+  UINT32                          Signature;\r
+  EFI_HANDLE                      ControllerHandle;\r
+  EFI_HANDLE                      DriverBindingHandle;\r
+  UINT8                           IpVersion;\r
+  IP_IO                           *IpIo;\r
+  EFI_SERVICE_BINDING_PROTOCOL    ServiceBinding;\r
+  LIST_ENTRY                      SocketList;\r
 } TCP_SERVICE_DATA;\r
 \r
 typedef struct _TCP_PROTO_DATA {\r
-  TCP_SERVICE_DATA  *TcpService;\r
-  TCP_CB            *TcpPcb;\r
+  TCP_SERVICE_DATA    *TcpService;\r
+  TCP_CB              *TcpPcb;\r
 } TCP_PROTO_DATA;\r
 \r
 #define TCP_SERVICE_FROM_THIS(a) \\r
index 05cd3c75dc5126f637f42bbf056d6f9aa332f645..a7af01fff246476244c15e2f13279754f5566a15 100644 (file)
@@ -24,7 +24,7 @@
 typedef\r
 VOID\r
 (*TCP_TIMER_HANDLER) (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   );\r
 \r
 //\r
@@ -39,7 +39,7 @@ VOID
 **/\r
 VOID\r
 TcpInitTcbLocal (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -52,9 +52,9 @@ TcpInitTcbLocal (
 **/\r
 VOID\r
 TcpInitTcbPeer (\r
-  IN OUT TCP_CB     *Tcb,\r
-  IN     TCP_SEG    *Seg,\r
-  IN     TCP_OPTION *Opt\r
+  IN OUT TCP_CB      *Tcb,\r
+  IN     TCP_SEG     *Seg,\r
+  IN     TCP_OPTION  *Opt\r
   );\r
 \r
 /**\r
@@ -112,7 +112,7 @@ TcpLocateTcb (
 **/\r
 INTN\r
 TcpInsertTcb (\r
-  IN TCP_CB *Tcb\r
+  IN TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -125,7 +125,7 @@ TcpInsertTcb (
 **/\r
 TCP_CB *\r
 TcpCloneTcb (\r
-  IN TCP_CB *Tcb\r
+  IN TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -161,8 +161,8 @@ TcpGetRcvMss (
 **/\r
 VOID\r
 TcpSetState (\r
-  IN TCP_CB *Tcb,\r
-  IN UINT8  State\r
+  IN TCP_CB  *Tcb,\r
+  IN UINT8   State\r
   );\r
 \r
 /**\r
@@ -176,8 +176,8 @@ TcpSetState (
 **/\r
 UINT16\r
 TcpChecksum (\r
-  IN NET_BUF *Nbuf,\r
-  IN UINT16  HeadSum\r
+  IN NET_BUF  *Nbuf,\r
+  IN UINT16   HeadSum\r
   );\r
 \r
 /**\r
@@ -192,8 +192,8 @@ TcpChecksum (
 **/\r
 TCP_SEG *\r
 TcpFormatNetbuf (\r
-  IN     TCP_CB  *Tcb,\r
-  IN OUT NET_BUF *Nbuf\r
+  IN     TCP_CB   *Tcb,\r
+  IN OUT NET_BUF  *Nbuf\r
   );\r
 \r
 /**\r
@@ -217,7 +217,7 @@ TcpOnAppConnect (
 **/\r
 VOID\r
 TcpOnAppConsume (\r
-  IN TCP_CB *Tcb\r
+  IN TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -229,7 +229,7 @@ TcpOnAppConsume (
 **/\r
 VOID\r
 TcpOnAppClose (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -244,7 +244,7 @@ TcpOnAppClose (
 **/\r
 INTN\r
 TcpOnAppSend (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -256,7 +256,7 @@ TcpOnAppSend (
 **/\r
 VOID\r
 TcpOnAppAbort (\r
-  IN TCP_CB *Tcb\r
+  IN TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -267,7 +267,7 @@ TcpOnAppAbort (
 **/\r
 VOID\r
 TcpResetConnection (\r
-  IN TCP_CB *Tcb\r
+  IN TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -281,10 +281,9 @@ TcpResetConnection (
 **/\r
 EFI_STATUS\r
 TcpInstallDevicePath (\r
-  IN SOCKET *Sock\r
+  IN SOCKET  *Sock\r
   );\r
 \r
-\r
 //\r
 // Functions in TcpOutput.c\r
 //\r
@@ -299,7 +298,7 @@ TcpInstallDevicePath (
 **/\r
 UINT32\r
 TcpRcvWinOld (\r
-  IN TCP_CB *Tcb\r
+  IN TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -312,7 +311,7 @@ TcpRcvWinOld (
 **/\r
 UINT32\r
 TcpRcvWinNow (\r
-  IN TCP_CB *Tcb\r
+  IN TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -325,7 +324,7 @@ TcpRcvWinNow (
 **/\r
 TCP_SEQNO\r
 TcpGetMaxSndNxt (\r
-  IN TCP_CB *Tcb\r
+  IN TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -340,8 +339,8 @@ TcpGetMaxSndNxt (
 **/\r
 UINT32\r
 TcpDataToSend (\r
-  IN TCP_CB *Tcb,\r
-  IN INTN   Force\r
+  IN TCP_CB  *Tcb,\r
+  IN INTN    Force\r
   );\r
 \r
 /**\r
@@ -356,8 +355,8 @@ TcpDataToSend (
 **/\r
 INTN\r
 TcpRetransmit (\r
-  IN TCP_CB    *Tcb,\r
-  IN TCP_SEQNO Seq\r
+  IN TCP_CB     *Tcb,\r
+  IN TCP_SEQNO  Seq\r
   );\r
 \r
 /**\r
@@ -372,8 +371,8 @@ TcpRetransmit (
 **/\r
 INTN\r
 TcpToSendData (\r
-  IN OUT TCP_CB *Tcb,\r
-  IN     INTN   Force\r
+  IN OUT TCP_CB  *Tcb,\r
+  IN     INTN    Force\r
   );\r
 \r
 /**\r
@@ -384,7 +383,7 @@ TcpToSendData (
 **/\r
 VOID\r
 TcpToSendAck (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -395,7 +394,7 @@ TcpToSendAck (
 **/\r
 VOID\r
 TcpSendAck (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -409,7 +408,7 @@ TcpSendAck (
 **/\r
 INTN\r
 TcpSendZeroProbe (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -448,7 +447,7 @@ TcpSendReset (
 **/\r
 INTN\r
 TcpVerifySegment (\r
-  IN NET_BUF *Nbuf\r
+  IN NET_BUF  *Nbuf\r
   );\r
 \r
 //\r
@@ -511,7 +510,7 @@ TcpInput (
 **/\r
 VOID\r
 TcpClose (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -524,8 +523,8 @@ TcpClose (
 VOID\r
 EFIAPI\r
 TcpTicking (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -538,9 +537,9 @@ TcpTicking (
 **/\r
 VOID\r
 TcpSetTimer (\r
-  IN OUT TCP_CB *Tcb,\r
-  IN     UINT16 Timer,\r
-  IN     UINT32 TimeOut\r
+  IN OUT TCP_CB  *Tcb,\r
+  IN     UINT16  Timer,\r
+  IN     UINT32  TimeOut\r
   );\r
 \r
 /**\r
@@ -552,8 +551,8 @@ TcpSetTimer (
 **/\r
 VOID\r
 TcpClearTimer (\r
-  IN OUT TCP_CB *Tcb,\r
-  IN     UINT16 Timer\r
+  IN OUT TCP_CB  *Tcb,\r
+  IN     UINT16  Timer\r
   );\r
 \r
 /**\r
@@ -564,7 +563,7 @@ TcpClearTimer (
 **/\r
 VOID\r
 TcpClearAllTimer (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -575,7 +574,7 @@ TcpClearAllTimer (
 **/\r
 VOID\r
 TcpSetProbeTimer (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -586,7 +585,7 @@ TcpSetProbeTimer (
 **/\r
 VOID\r
 TcpSetKeepaliveTimer (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   );\r
 \r
 //\r
@@ -609,11 +608,11 @@ TcpSetKeepaliveTimer (
 VOID\r
 EFIAPI\r
 TcpRxCallback (\r
-  IN EFI_STATUS                       Status,\r
-  IN UINT8                            IcmpErr,\r
-  IN EFI_NET_SESSION_DATA             *NetSession,\r
-  IN NET_BUF                          *Pkt,\r
-  IN VOID                             *Context    OPTIONAL\r
+  IN EFI_STATUS            Status,\r
+  IN UINT8                 IcmpErr,\r
+  IN EFI_NET_SESSION_DATA  *NetSession,\r
+  IN NET_BUF               *Pkt,\r
+  IN VOID                  *Context    OPTIONAL\r
   );\r
 \r
 /**\r
@@ -685,9 +684,9 @@ Tcp6RefreshNeighbor (
 **/\r
 EFI_STATUS\r
 TcpDispatcher (\r
-  IN SOCKET                  *Sock,\r
-  IN UINT8                   Request,\r
-  IN VOID                    *Data    OPTIONAL\r
+  IN SOCKET  *Sock,\r
+  IN UINT8   Request,\r
+  IN VOID    *Data    OPTIONAL\r
   );\r
 \r
 #endif\r
index efa41d637eebd074c66f09e40c044e409346d314..fb1aa827f8bab855a7df1c8ab77b471d34e22e79 100644 (file)
@@ -21,8 +21,8 @@
 **/\r
 INTN\r
 TcpSeqAcceptable (\r
-  IN TCP_CB  *Tcb,\r
-  IN TCP_SEG *Seg\r
+  IN TCP_CB   *Tcb,\r
+  IN TCP_SEG  *Seg\r
   )\r
 {\r
   return (TCP_SEQ_LEQ (Tcb->RcvNxt, Seg->End) &&\r
@@ -38,8 +38,8 @@ TcpSeqAcceptable (
 **/\r
 VOID\r
 TcpFastRecover (\r
-  IN OUT TCP_CB  *Tcb,\r
-  IN     TCP_SEG *Seg\r
+  IN OUT TCP_CB   *Tcb,\r
+  IN     TCP_SEG  *Seg\r
   )\r
 {\r
   UINT32  FlightSize;\r
@@ -49,14 +49,13 @@ TcpFastRecover (
   // Step 1: Three duplicate ACKs and not in fast recovery\r
   //\r
   if (Tcb->CongestState != TCP_CONGEST_RECOVER) {\r
-\r
     //\r
     // Step 1A: Invoking fast retransmission.\r
     //\r
-    FlightSize        = TCP_SUB_SEQ (Tcb->SndNxt, Tcb->SndUna);\r
+    FlightSize = TCP_SUB_SEQ (Tcb->SndNxt, Tcb->SndUna);\r
 \r
-    Tcb->Ssthresh     = MAX (FlightSize >> 1, (UINT32) (2 * Tcb->SndMss));\r
-    Tcb->Recover      = Tcb->SndNxt;\r
+    Tcb->Ssthresh = MAX (FlightSize >> 1, (UINT32)(2 * Tcb->SndMss));\r
+    Tcb->Recover  = Tcb->SndNxt;\r
 \r
     Tcb->CongestState = TCP_CONGEST_RECOVER;\r
     TCP_CLEAR_FLG (Tcb->CtrlFlag, TCP_CTRL_RTT_ON);\r
@@ -69,9 +68,9 @@ TcpFastRecover (
 \r
     DEBUG (\r
       (DEBUG_NET,\r
-      "TcpFastRecover: enter fast retransmission for TCB %p, recover point is %d\n",\r
-      Tcb,\r
-      Tcb->Recover)\r
+       "TcpFastRecover: enter fast retransmission for TCB %p, recover point is %d\n",\r
+       Tcb,\r
+       Tcb->Recover)\r
       );\r
     return;\r
   }\r
@@ -80,7 +79,6 @@ TcpFastRecover (
   // During fast recovery, execute Step 3, 4, 5 of RFC3782\r
   //\r
   if (Seg->Ack == Tcb->SndUna) {\r
-\r
     //\r
     // Step 3: Fast Recovery,\r
     // If this is a duplicated ACK, increse Cwnd by SMSS.\r
@@ -92,37 +90,32 @@ TcpFastRecover (
     Tcb->CWnd += Tcb->SndMss;\r
     DEBUG (\r
       (DEBUG_NET,\r
-      "TcpFastRecover: received another duplicated ACK (%d) for TCB %p\n",\r
-      Seg->Ack,\r
-      Tcb)\r
+       "TcpFastRecover: received another duplicated ACK (%d) for TCB %p\n",\r
+       Seg->Ack,\r
+       Tcb)\r
       );\r
-\r
   } else {\r
-\r
     //\r
     // New data is ACKed, check whether it is a\r
     // full ACK or partial ACK\r
     //\r
     if (TCP_SEQ_GEQ (Seg->Ack, Tcb->Recover)) {\r
-\r
       //\r
       // Step 5 - Full ACK:\r
       // deflate the congestion window, and exit fast recovery\r
       //\r
-      FlightSize        = TCP_SUB_SEQ (Tcb->SndNxt, Tcb->SndUna);\r
+      FlightSize = TCP_SUB_SEQ (Tcb->SndNxt, Tcb->SndUna);\r
 \r
-      Tcb->CWnd         = MIN (Tcb->Ssthresh, FlightSize + Tcb->SndMss);\r
+      Tcb->CWnd = MIN (Tcb->Ssthresh, FlightSize + Tcb->SndMss);\r
 \r
       Tcb->CongestState = TCP_CONGEST_OPEN;\r
       DEBUG (\r
         (DEBUG_NET,\r
-        "TcpFastRecover: received a full ACK(%d) for TCB %p, exit fast recovery\n",\r
-        Seg->Ack,\r
-        Tcb)\r
+         "TcpFastRecover: received a full ACK(%d) for TCB %p, exit fast recovery\n",\r
+         Seg->Ack,\r
+         Tcb)\r
         );\r
-\r
     } else {\r
-\r
       //\r
       // Step 5 - Partial ACK:\r
       // fast retransmit the first unacknowledge field\r
@@ -138,18 +131,16 @@ TcpFastRecover (
       //\r
       if (Acked >= Tcb->SndMss) {\r
         Acked -= Tcb->SndMss;\r
-\r
       }\r
 \r
       Tcb->CWnd -= Acked;\r
 \r
       DEBUG (\r
         (DEBUG_NET,\r
-        "TcpFastRecover: received a partial ACK(%d) for TCB %p\n",\r
-        Seg->Ack,\r
-        Tcb)\r
+         "TcpFastRecover: received a partial ACK(%d) for TCB %p\n",\r
+         Seg->Ack,\r
+         Tcb)\r
         );\r
-\r
     }\r
   }\r
 }\r
@@ -163,18 +154,16 @@ TcpFastRecover (
 **/\r
 VOID\r
 TcpFastLossRecover (\r
-  IN OUT TCP_CB  *Tcb,\r
-  IN     TCP_SEG *Seg\r
+  IN OUT TCP_CB   *Tcb,\r
+  IN     TCP_SEG  *Seg\r
   )\r
 {\r
   if (TCP_SEQ_GT (Seg->Ack, Tcb->SndUna)) {\r
-\r
     //\r
     // New data is ACKed, check whether it is a\r
     // full ACK or partial ACK\r
     //\r
     if (TCP_SEQ_GEQ (Seg->Ack, Tcb->LossRecover)) {\r
-\r
       //\r
       // Full ACK: exit the loss recovery.\r
       //\r
@@ -183,13 +172,11 @@ TcpFastLossRecover (
 \r
       DEBUG (\r
         (DEBUG_NET,\r
-        "TcpFastLossRecover: received a full ACK(%d) for TCB %p\n",\r
-        Seg->Ack,\r
-        Tcb)\r
+         "TcpFastLossRecover: received a full ACK(%d) for TCB %p\n",\r
+         Seg->Ack,\r
+         Tcb)\r
         );\r
-\r
     } else {\r
-\r
       //\r
       // Partial ACK:\r
       // fast retransmit the first unacknowledge field.\r
@@ -197,9 +184,9 @@ TcpFastLossRecover (
       TcpRetransmit (Tcb, Seg->Ack);\r
       DEBUG (\r
         (DEBUG_NET,\r
-        "TcpFastLossRecover: received a partial ACK(%d) for TCB %p\n",\r
-        Seg->Ack,\r
-        Tcb)\r
+         "TcpFastLossRecover: received a partial ACK(%d) for TCB %p\n",\r
+         Seg->Ack,\r
+         Tcb)\r
         );\r
     }\r
   }\r
@@ -214,17 +201,16 @@ TcpFastLossRecover (
 **/\r
 VOID\r
 TcpComputeRtt (\r
-  IN OUT TCP_CB *Tcb,\r
-  IN     UINT32 Measure\r
+  IN OUT TCP_CB  *Tcb,\r
+  IN     UINT32  Measure\r
   )\r
 {\r
-  INT32 Var;\r
+  INT32  Var;\r
 \r
   //\r
   // Step 2.3: Compute the RTO for subsequent RTT measurement.\r
   //\r
   if (Tcb->SRtt != 0) {\r
-\r
     Var = Tcb->SRtt - (Measure << TCP_RTT_SHIFT);\r
 \r
     if (Var < 0) {\r
@@ -233,7 +219,6 @@ TcpComputeRtt (
 \r
     Tcb->RttVar = (3 * Tcb->RttVar + Var) >> 2;\r
     Tcb->SRtt   = 7 * (Tcb->SRtt >> 3) + Measure;\r
-\r
   } else {\r
     //\r
     // Step 2.2: compute the first RTT measure\r
@@ -251,21 +236,18 @@ TcpComputeRtt (
   //\r
   if (Tcb->Rto < TCP_RTO_MIN) {\r
     Tcb->Rto = TCP_RTO_MIN;\r
-\r
   } else if (Tcb->Rto > TCP_RTO_MAX) {\r
     Tcb->Rto = TCP_RTO_MAX;\r
-\r
   }\r
 \r
   DEBUG (\r
     (DEBUG_NET,\r
-    "TcpComputeRtt: new RTT for TCB %p computed SRTT: %d RTTVAR: %d RTO: %d\n",\r
-    Tcb,\r
-    Tcb->SRtt,\r
-    Tcb->RttVar,\r
-    Tcb->Rto)\r
+     "TcpComputeRtt: new RTT for TCB %p computed SRTT: %d RTTVAR: %d RTO: %d\n",\r
+     Tcb,\r
+     Tcb->SRtt,\r
+     Tcb->RttVar,\r
+     Tcb->Rto)\r
     );\r
-\r
 }\r
 \r
 /**\r
@@ -281,14 +263,14 @@ TcpComputeRtt (
 **/\r
 INTN\r
 TcpTrimSegment (\r
-  IN NET_BUF   *Nbuf,\r
-  IN TCP_SEQNO Left,\r
-  IN TCP_SEQNO Right\r
+  IN NET_BUF    *Nbuf,\r
+  IN TCP_SEQNO  Left,\r
+  IN TCP_SEQNO  Right\r
   )\r
 {\r
-  TCP_SEG   *Seg;\r
-  TCP_SEQNO Urg;\r
-  UINT32    Drop;\r
+  TCP_SEG    *Seg;\r
+  TCP_SEQNO  Urg;\r
+  UINT32     Drop;\r
 \r
   Seg = TCPSEG_NETBUF (Nbuf);\r
 \r
@@ -297,7 +279,6 @@ TcpTrimSegment (
   // truncate every thing, include SYN and FIN.\r
   //\r
   if (TCP_SEQ_LEQ (Seg->End, Left) || TCP_SEQ_LEQ (Right, Seg->Seq)) {\r
-\r
     TCP_CLEAR_FLG (Seg->Flag, TCP_FLG_SYN);\r
     TCP_CLEAR_FLG (Seg->Flag, TCP_FLG_FIN);\r
 \r
@@ -310,10 +291,9 @@ TcpTrimSegment (
   // Adjust the buffer header\r
   //\r
   if (TCP_SEQ_LT (Seg->Seq, Left)) {\r
-\r
-    Drop      = TCP_SUB_SEQ (Left, Seg->Seq);\r
-    Urg       = Seg->Seq + Seg->Urg;\r
-    Seg->Seq  = Left;\r
+    Drop     = TCP_SUB_SEQ (Left, Seg->Seq);\r
+    Urg      = Seg->Seq + Seg->Urg;\r
+    Seg->Seq = Left;\r
 \r
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_SYN)) {\r
       TCP_CLEAR_FLG (Seg->Flag, TCP_FLG_SYN);\r
@@ -324,12 +304,10 @@ TcpTrimSegment (
     // Adjust the urgent point\r
     //\r
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_URG)) {\r
-\r
       if (TCP_SEQ_LT (Urg, Seg->Seq)) {\r
-\r
         TCP_CLEAR_FLG (Seg->Flag, TCP_FLG_URG);\r
       } else {\r
-        Seg->Urg = (UINT16) TCP_SUB_SEQ (Urg, Seg->Seq);\r
+        Seg->Urg = (UINT16)TCP_SUB_SEQ (Urg, Seg->Seq);\r
       }\r
     }\r
 \r
@@ -342,9 +320,8 @@ TcpTrimSegment (
   // Adjust the buffer tail\r
   //\r
   if (TCP_SEQ_GT (Seg->End, Right)) {\r
-\r
-    Drop      = TCP_SUB_SEQ (Seg->End, Right);\r
-    Seg->End  = Right;\r
+    Drop     = TCP_SUB_SEQ (Seg->End, Right);\r
+    Seg->End = Right;\r
 \r
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_FIN)) {\r
       TCP_CLEAR_FLG (Seg->Flag, TCP_FLG_FIN);\r
@@ -371,8 +348,8 @@ TcpTrimSegment (
 **/\r
 INTN\r
 TcpTrimInWnd (\r
-  IN TCP_CB  *Tcb,\r
-  IN NET_BUF *Nbuf\r
+  IN TCP_CB   *Tcb,\r
+  IN NET_BUF  *Nbuf\r
   )\r
 {\r
   return TcpTrimSegment (Nbuf, Tcb->RcvNxt, Tcb->RcvWl2 + Tcb->RcvWnd);\r
@@ -391,14 +368,14 @@ TcpTrimInWnd (
 **/\r
 INTN\r
 TcpDeliverData (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
-  LIST_ENTRY      *Entry;\r
-  NET_BUF         *Nbuf;\r
-  TCP_SEQNO       Seq;\r
-  TCP_SEG         *Seg;\r
-  UINT32          Urgent;\r
+  LIST_ENTRY  *Entry;\r
+  NET_BUF     *Nbuf;\r
+  TCP_SEQNO   Seq;\r
+  TCP_SEG     *Seg;\r
+  UINT32      Urgent;\r
 \r
   ASSERT ((Tcb != NULL) && (Tcb->Sk != NULL));\r
 \r
@@ -407,7 +384,6 @@ TcpDeliverData (
   // and TCP is in a proper state\r
   //\r
   if (IsListEmpty (&Tcb->RcvQue) || !TCP_CONNECTED (Tcb->State)) {\r
-\r
     return 0;\r
   }\r
 \r
@@ -418,14 +394,14 @@ TcpDeliverData (
   Seq   = Tcb->RcvNxt;\r
 \r
   while (Entry != &Tcb->RcvQue) {\r
-    Nbuf  = NET_LIST_USER_STRUCT (Entry, NET_BUF, List);\r
-    Seg   = TCPSEG_NETBUF (Nbuf);\r
+    Nbuf = NET_LIST_USER_STRUCT (Entry, NET_BUF, List);\r
+    Seg  = TCPSEG_NETBUF (Nbuf);\r
 \r
     if (TcpVerifySegment (Nbuf) == 0) {\r
       DEBUG (\r
         (DEBUG_ERROR,\r
-        "TcpToSendData: discard a broken segment for TCB %p\n",\r
-        Tcb)\r
+         "TcpToSendData: discard a broken segment for TCB %p\n",\r
+         Tcb)\r
         );\r
       NetbufFree (Nbuf);\r
       return -1;\r
@@ -447,7 +423,6 @@ TcpDeliverData (
     // RFC793 Eighth step: process FIN in sequence\r
     //\r
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_FIN)) {\r
-\r
       //\r
       // The peer sends to us junky data after FIN,\r
       // reset the connection.\r
@@ -455,8 +430,8 @@ TcpDeliverData (
       if (!IsListEmpty (&Tcb->RcvQue)) {\r
         DEBUG (\r
           (DEBUG_ERROR,\r
-          "TcpDeliverData: data received after FIN from peer of TCB %p, reset connection\n",\r
-          Tcb)\r
+           "TcpDeliverData: data received after FIN from peer of TCB %p, reset connection\n",\r
+           Tcb)\r
           );\r
 \r
         NetbufFree (Nbuf);\r
@@ -465,62 +440,60 @@ TcpDeliverData (
 \r
       DEBUG (\r
         (DEBUG_NET,\r
-        "TcpDeliverData: processing FIN from peer of TCB %p\n",\r
-        Tcb)\r
+         "TcpDeliverData: processing FIN from peer of TCB %p\n",\r
+         Tcb)\r
         );\r
 \r
       switch (Tcb->State) {\r
-      case TCP_SYN_RCVD:\r
-      case TCP_ESTABLISHED:\r
+        case TCP_SYN_RCVD:\r
+        case TCP_ESTABLISHED:\r
 \r
-        TcpSetState (Tcb, TCP_CLOSE_WAIT);\r
-        break;\r
-\r
-      case TCP_FIN_WAIT_1:\r
-\r
-        if (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_FIN_ACKED)) {\r
-\r
-          TcpSetState (Tcb, TCP_CLOSING);\r
+          TcpSetState (Tcb, TCP_CLOSE_WAIT);\r
           break;\r
-        }\r
 \r
-      //\r
-      // fall through\r
-      //\r
-      case TCP_FIN_WAIT_2:\r
+        case TCP_FIN_WAIT_1:\r
 \r
-        TcpSetState (Tcb, TCP_TIME_WAIT);\r
-        TcpClearAllTimer (Tcb);\r
+          if (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_FIN_ACKED)) {\r
+            TcpSetState (Tcb, TCP_CLOSING);\r
+            break;\r
+          }\r
 \r
-        if (Tcb->TimeWaitTimeout != 0) {\r
+        //\r
+        // fall through\r
+        //\r
+        case TCP_FIN_WAIT_2:\r
 \r
-          TcpSetTimer (Tcb, TCP_TIMER_2MSL, Tcb->TimeWaitTimeout);\r
-        } else {\r
+          TcpSetState (Tcb, TCP_TIME_WAIT);\r
+          TcpClearAllTimer (Tcb);\r
 \r
-          DEBUG (\r
-            (DEBUG_WARN,\r
-            "Connection closed immediately because app disables TIME_WAIT timer for %p\n",\r
-            Tcb)\r
-            );\r
+          if (Tcb->TimeWaitTimeout != 0) {\r
+            TcpSetTimer (Tcb, TCP_TIMER_2MSL, Tcb->TimeWaitTimeout);\r
+          } else {\r
+            DEBUG (\r
+              (DEBUG_WARN,\r
+               "Connection closed immediately because app disables TIME_WAIT timer for %p\n",\r
+               Tcb)\r
+              );\r
 \r
-          TcpSendAck (Tcb);\r
-          TcpClose (Tcb);\r
-        }\r
-        break;\r
+            TcpSendAck (Tcb);\r
+            TcpClose (Tcb);\r
+          }\r
 \r
-      case TCP_CLOSE_WAIT:\r
-      case TCP_CLOSING:\r
-      case TCP_LAST_ACK:\r
-      case TCP_TIME_WAIT:\r
-        //\r
-        // The peer sends to us junk FIN byte. Discard\r
-        // the buffer then reset the connection\r
-        //\r
-        NetbufFree (Nbuf);\r
-        return -1;\r
-        break;\r
-      default:\r
-        break;\r
+          break;\r
+\r
+        case TCP_CLOSE_WAIT:\r
+        case TCP_CLOSING:\r
+        case TCP_LAST_ACK:\r
+        case TCP_TIME_WAIT:\r
+          //\r
+          // The peer sends to us junk FIN byte. Discard\r
+          // the buffer then reset the connection\r
+          //\r
+          NetbufFree (Nbuf);\r
+          return -1;\r
+          break;\r
+        default:\r
+          break;\r
       }\r
 \r
       TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW);\r
@@ -532,7 +505,6 @@ TcpDeliverData (
     // Don't delay the ack if PUSH flag is on.\r
     //\r
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_PSH)) {\r
-\r
       TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW);\r
     }\r
 \r
@@ -542,7 +514,6 @@ TcpDeliverData (
       if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RCVD_URG) &&\r
           TCP_SEQ_LEQ (Seg->Seq, Tcb->RcvUp))\r
       {\r
-\r
         if (TCP_SEQ_LEQ (Seg->End, Tcb->RcvUp)) {\r
           Urgent = Nbuf->TotalSize;\r
         } else {\r
@@ -554,7 +525,6 @@ TcpDeliverData (
     }\r
 \r
     if (TCP_FIN_RCVD (Tcb->State)) {\r
-\r
       SockNoMoreData (Tcb->Sk);\r
     }\r
 \r
@@ -576,29 +546,28 @@ TcpDeliverData (
 **/\r
 INTN\r
 TcpQueueData (\r
-  IN OUT TCP_CB  *Tcb,\r
-  IN     NET_BUF *Nbuf\r
+  IN OUT TCP_CB   *Tcb,\r
+  IN     NET_BUF  *Nbuf\r
   )\r
 {\r
-  TCP_SEG         *Seg;\r
-  LIST_ENTRY      *Head;\r
-  LIST_ENTRY      *Prev;\r
-  LIST_ENTRY      *Cur;\r
-  NET_BUF         *Node;\r
+  TCP_SEG     *Seg;\r
+  LIST_ENTRY  *Head;\r
+  LIST_ENTRY  *Prev;\r
+  LIST_ENTRY  *Cur;\r
+  NET_BUF     *Node;\r
 \r
   ASSERT ((Tcb != NULL) && (Nbuf != NULL) && (Nbuf->Tcp == NULL));\r
 \r
   NET_GET_REF (Nbuf);\r
 \r
-  Seg   = TCPSEG_NETBUF (Nbuf);\r
-  Head  = &Tcb->RcvQue;\r
+  Seg  = TCPSEG_NETBUF (Nbuf);\r
+  Head = &Tcb->RcvQue;\r
 \r
   //\r
   // Fast path to process normal case. That is,\r
   // no out-of-order segments are received.\r
   //\r
   if (IsListEmpty (Head)) {\r
-\r
     InsertTailList (Head, &Nbuf->List);\r
     return 1;\r
   }\r
@@ -608,8 +577,8 @@ TcpQueueData (
   //\r
   for (Prev = Head, Cur = Head->ForwardLink;\r
        Cur != Head;\r
-       Prev = Cur, Cur = Cur->ForwardLink) {\r
-\r
+       Prev = Cur, Cur = Cur->ForwardLink)\r
+  {\r
     Node = NET_LIST_USER_STRUCT (Cur, NET_BUF, List);\r
 \r
     if (TCP_SEQ_LT (Seg->Seq, TCPSEG_NETBUF (Node)->Seq)) {\r
@@ -625,7 +594,6 @@ TcpQueueData (
     Node = NET_LIST_USER_STRUCT (Prev, NET_BUF, List);\r
 \r
     if (TCP_SEQ_LT (Seg->Seq, TCPSEG_NETBUF (Node)->End)) {\r
-\r
       if (TCP_SEQ_LEQ (Seg->End, TCPSEG_NETBUF (Node)->End)) {\r
         return 1;\r
       }\r
@@ -647,7 +615,6 @@ TcpQueueData (
     Node = NET_LIST_USER_STRUCT (Cur, NET_BUF, List);\r
 \r
     if (TCP_SEQ_LEQ (TCPSEG_NETBUF (Node)->End, Seg->End)) {\r
-\r
       Cur = Cur->ForwardLink;\r
 \r
       RemoveEntryList (&Node->List);\r
@@ -656,9 +623,7 @@ TcpQueueData (
     }\r
 \r
     if (TCP_SEQ_LT (TCPSEG_NETBUF (Node)->Seq, Seg->End)) {\r
-\r
       if (TCP_SEQ_LEQ (TCPSEG_NETBUF (Node)->Seq, Seg->Seq)) {\r
-\r
         RemoveEntryList (&Nbuf->List);\r
         return 1;\r
       }\r
@@ -667,6 +632,7 @@ TcpQueueData (
         RemoveEntryList (&Nbuf->List);\r
         return 0;\r
       }\r
+\r
       break;\r
     }\r
 \r
@@ -676,7 +642,6 @@ TcpQueueData (
   return 1;\r
 }\r
 \r
-\r
 /**\r
   Adjust the send queue or the retransmit queue.\r
 \r
@@ -689,21 +654,21 @@ TcpQueueData (
 **/\r
 INTN\r
 TcpAdjustSndQue (\r
-  IN TCP_CB    *Tcb,\r
-  IN TCP_SEQNO Ack\r
+  IN TCP_CB     *Tcb,\r
+  IN TCP_SEQNO  Ack\r
   )\r
 {\r
-  LIST_ENTRY      *Head;\r
-  LIST_ENTRY      *Cur;\r
-  NET_BUF         *Node;\r
-  TCP_SEG         *Seg;\r
+  LIST_ENTRY  *Head;\r
+  LIST_ENTRY  *Cur;\r
+  NET_BUF     *Node;\r
+  TCP_SEG     *Seg;\r
 \r
-  Head  = &Tcb->SndQue;\r
-  Cur   = Head->ForwardLink;\r
+  Head = &Tcb->SndQue;\r
+  Cur  = Head->ForwardLink;\r
 \r
   while (Cur != Head) {\r
-    Node  = NET_LIST_USER_STRUCT (Cur, NET_BUF, List);\r
-    Seg   = TCPSEG_NETBUF (Node);\r
+    Node = NET_LIST_USER_STRUCT (Cur, NET_BUF, List);\r
+    Seg  = TCPSEG_NETBUF (Node);\r
 \r
     if (TCP_SEQ_GEQ (Seg->Seq, Ack)) {\r
       break;\r
@@ -764,10 +729,10 @@ TcpInput (
 \r
   NET_CHECK_SIGNATURE (Nbuf, NET_BUF_SIGNATURE);\r
 \r
-  Parent  = NULL;\r
-  Tcb     = NULL;\r
+  Parent = NULL;\r
+  Tcb    = NULL;\r
 \r
-  Head    = (TCP_HEAD *) NetbufGetByte (Nbuf, 0, NULL);\r
+  Head = (TCP_HEAD *)NetbufGetByte (Nbuf, 0, NULL);\r
   ASSERT (Head != NULL);\r
 \r
   if (Nbuf->TotalSize < sizeof (TCP_HEAD)) {\r
@@ -775,10 +740,9 @@ TcpInput (
     goto DISCARD;\r
   }\r
 \r
-  Len     = Nbuf->TotalSize - (Head->HeadLen << 2);\r
+  Len = Nbuf->TotalSize - (Head->HeadLen << 2);\r
 \r
   if ((Head->HeadLen < 5) || (Len < 0)) {\r
-\r
     DEBUG ((DEBUG_NET, "TcpInput: received a malformed packet\n"));\r
 \r
     goto DISCARD;\r
@@ -811,7 +775,7 @@ TcpInput (
           Head->SrcPort,\r
           Src,\r
           Version,\r
-          (BOOLEAN) TCP_FLG_ON (Head->Flag, TCP_FLG_SYN)\r
+          (BOOLEAN)TCP_FLG_ON (Head->Flag, TCP_FLG_SYN)\r
           );\r
 \r
   if ((Tcb == NULL) || (Tcb->State == TCP_CLOSED)) {\r
@@ -830,8 +794,8 @@ TcpInput (
   if (TcpParseOption (Nbuf->Tcp, &Option) == -1) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "TcpInput: reset the peer because of malformed option for TCB %p\n",\r
-      Tcb)\r
+       "TcpInput: reset the peer because of malformed option for TCB %p\n",\r
+       Tcb)\r
       );\r
 \r
     goto SEND_RESET;\r
@@ -853,8 +817,8 @@ TcpInput (
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {\r
       DEBUG (\r
         (DEBUG_WARN,\r
-        "TcpInput: discard a reset segment for TCB %p in listening\n",\r
-        Tcb)\r
+         "TcpInput: discard a reset segment for TCB %p in listening\n",\r
+         Tcb)\r
         );\r
 \r
       goto DISCARD;\r
@@ -867,8 +831,8 @@ TcpInput (
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {\r
       DEBUG (\r
         (DEBUG_WARN,\r
-        "TcpInput: send reset because of segment with ACK for TCB %p in listening\n",\r
-        Tcb)\r
+         "TcpInput: send reset because of segment with ACK for TCB %p in listening\n",\r
+         Tcb)\r
         );\r
 \r
       goto SEND_RESET;\r
@@ -881,14 +845,14 @@ TcpInput (
       //\r
       // create a child TCB to handle the data\r
       //\r
-      Parent  = Tcb;\r
+      Parent = Tcb;\r
 \r
-      Tcb     = TcpCloneTcb (Parent);\r
+      Tcb = TcpCloneTcb (Parent);\r
       if (Tcb == NULL) {\r
         DEBUG (\r
           (DEBUG_ERROR,\r
-          "TcpInput: discard a segment because failed to clone a child for TCB %p\n",\r
-          Tcb)\r
+           "TcpInput: discard a segment because failed to clone a child for TCB %p\n",\r
+           Tcb)\r
           );\r
 \r
         goto DISCARD;\r
@@ -896,8 +860,8 @@ TcpInput (
 \r
       DEBUG (\r
         (DEBUG_NET,\r
-        "TcpInput: create a child for TCB %p in listening\n",\r
-        Tcb)\r
+         "TcpInput: create a child for TCB %p in listening\n",\r
+         Tcb)\r
         );\r
 \r
       //\r
@@ -916,8 +880,8 @@ TcpInput (
       if (TcpTrimInWnd (Tcb, Nbuf) == 0) {\r
         DEBUG (\r
           (DEBUG_ERROR,\r
-          "TcpInput: discard a broken segment for TCB %p\n",\r
-          Tcb)\r
+           "TcpInput: discard a broken segment for TCB %p\n",\r
+           Tcb)\r
           );\r
 \r
         goto DISCARD;\r
@@ -927,17 +891,15 @@ TcpInput (
     }\r
 \r
     goto DISCARD;\r
-\r
   } else if (Tcb->State == TCP_SYN_SENT) {\r
     //\r
     // First step: Check ACK bit\r
     //\r
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK) && (Seg->Ack != Tcb->Iss + 1)) {\r
-\r
       DEBUG (\r
         (DEBUG_WARN,\r
-        "TcpInput: send reset because of wrong ACK received for TCB %p in SYN_SENT\n",\r
-        Tcb)\r
+         "TcpInput: send reset because of wrong ACK received for TCB %p in SYN_SENT\n",\r
+         Tcb)\r
         );\r
 \r
       goto SEND_RESET;\r
@@ -947,23 +909,20 @@ TcpInput (
     // Second step: Check RST bit\r
     //\r
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {\r
-\r
       if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {\r
-\r
         DEBUG (\r
           (DEBUG_WARN,\r
-          "TcpInput: connection reset by peer for TCB %p in SYN_SENT\n",\r
-          Tcb)\r
+           "TcpInput: connection reset by peer for TCB %p in SYN_SENT\n",\r
+           Tcb)\r
           );\r
 \r
         SOCK_ERROR (Tcb->Sk, EFI_CONNECTION_RESET);\r
         goto DROP_CONNECTION;\r
       } else {\r
-\r
         DEBUG (\r
           (DEBUG_WARN,\r
-          "TcpInput: discard a reset segment because of no ACK for TCB %p in SYN_SENT\n",\r
-          Tcb)\r
+           "TcpInput: discard a reset segment because of no ACK for TCB %p in SYN_SENT\n",\r
+           Tcb)\r
           );\r
 \r
         goto DISCARD;\r
@@ -978,18 +937,15 @@ TcpInput (
     // Fourth step: Check SYN. Pay attention to simultaneous open\r
     //\r
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_SYN)) {\r
-\r
       TcpInitTcbPeer (Tcb, Seg, &Option);\r
 \r
       if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {\r
-\r
         Tcb->SndUna = Seg->Ack;\r
       }\r
 \r
       TcpClearTimer (Tcb, TCP_TIMER_REXMIT);\r
 \r
       if (TCP_SEQ_GT (Tcb->SndUna, Tcb->Iss)) {\r
-\r
         TcpSetState (Tcb, TCP_ESTABLISHED);\r
 \r
         TcpClearTimer (Tcb, TCP_TIMER_CONNECT);\r
@@ -998,7 +954,6 @@ TcpInput (
         if ((Tcb->CongestState == TCP_CONGEST_OPEN) &&\r
             TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RTT_ON))\r
         {\r
-\r
           TcpComputeRtt (Tcb, Tcb->RttMeasure);\r
           TCP_CLEAR_FLG (Tcb->CtrlFlag, TCP_CTRL_RTT_ON);\r
         }\r
@@ -1006,8 +961,8 @@ TcpInput (
         if (TcpTrimInWnd (Tcb, Nbuf) == 0) {\r
           DEBUG (\r
             (DEBUG_ERROR,\r
-            "TcpInput: discard a broken segment for TCB %p\n",\r
-            Tcb)\r
+             "TcpInput: discard a broken segment for TCB %p\n",\r
+             Tcb)\r
             );\r
 \r
           goto DISCARD;\r
@@ -1017,8 +972,8 @@ TcpInput (
 \r
         DEBUG (\r
           (DEBUG_NET,\r
-          "TcpInput: connection established for TCB %p in SYN_SENT\n",\r
-          Tcb)\r
+           "TcpInput: connection established for TCB %p in SYN_SENT\n",\r
+           Tcb)\r
           );\r
 \r
         goto StepSix;\r
@@ -1030,11 +985,11 @@ TcpInput (
 \r
         ASSERT (Tcb->SndNxt == Tcb->Iss + 1);\r
 \r
-        if (TcpAdjustSndQue (Tcb, Tcb->SndNxt) == 0 || TcpTrimInWnd (Tcb, Nbuf) == 0) {\r
+        if ((TcpAdjustSndQue (Tcb, Tcb->SndNxt) == 0) || (TcpTrimInWnd (Tcb, Nbuf) == 0)) {\r
           DEBUG (\r
             (DEBUG_ERROR,\r
-            "TcpInput: discard a broken segment for TCB %p\n",\r
-            Tcb)\r
+             "TcpInput: discard a broken segment for TCB %p\n",\r
+             Tcb)\r
             );\r
 \r
           goto DISCARD;\r
@@ -1042,8 +997,8 @@ TcpInput (
 \r
         DEBUG (\r
           (DEBUG_WARN,\r
-          "TcpInput: simultaneous open for TCB %p in SYN_SENT\n",\r
-          Tcb)\r
+           "TcpInput: simultaneous open for TCB %p in SYN_SENT\n",\r
+           Tcb)\r
           );\r
 \r
         goto StepSix;\r
@@ -1071,8 +1026,8 @@ TcpInput (
   if (TcpSeqAcceptable (Tcb, Seg) == 0) {\r
     DEBUG (\r
       (DEBUG_WARN,\r
-      "TcpInput: sequence acceptance test failed for segment of TCB %p\n",\r
-      Tcb)\r
+       "TcpInput: sequence acceptance test failed for segment of TCB %p\n",\r
+       Tcb)\r
       );\r
 \r
     if (!TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {\r
@@ -1086,7 +1041,6 @@ TcpInput (
       (Tcb->RcvWl2 == Seg->End) &&\r
       !TCP_FLG_ON (Seg->Flag, TCP_FLG_SYN | TCP_FLG_FIN))\r
   {\r
-\r
     TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW);\r
   }\r
 \r
@@ -1094,11 +1048,9 @@ TcpInput (
   // Second step: Check the RST\r
   //\r
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {\r
-\r
     DEBUG ((DEBUG_WARN, "TcpInput: connection reset for TCB %p\n", Tcb));\r
 \r
     if (Tcb->State == TCP_SYN_RCVD) {\r
-\r
       SOCK_ERROR (Tcb->Sk, EFI_CONNECTION_REFUSED);\r
 \r
       //\r
@@ -1112,9 +1064,7 @@ TcpInput (
                (Tcb->State == TCP_FIN_WAIT_2) ||\r
                (Tcb->State == TCP_CLOSE_WAIT))\r
     {\r
-\r
       SOCK_ERROR (Tcb->Sk, EFI_CONNECTION_RESET);\r
-\r
     } else {\r
     }\r
 \r
@@ -1127,8 +1077,8 @@ TcpInput (
   if (TcpTrimInWnd (Tcb, Nbuf) == 0) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "TcpInput: discard a broken segment for TCB %p\n",\r
-      Tcb)\r
+       "TcpInput: discard a broken segment for TCB %p\n",\r
+       Tcb)\r
       );\r
 \r
     goto DISCARD;\r
@@ -1142,44 +1092,42 @@ TcpInput (
   // Fourth step: Check the SYN bit.\r
   //\r
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_SYN)) {\r
-\r
     DEBUG (\r
       (DEBUG_WARN,\r
-      "TcpInput: connection reset because received extra SYN for TCB %p\n",\r
-      Tcb)\r
+       "TcpInput: connection reset because received extra SYN for TCB %p\n",\r
+       Tcb)\r
       );\r
 \r
     SOCK_ERROR (Tcb->Sk, EFI_CONNECTION_RESET);\r
     goto RESET_THEN_DROP;\r
   }\r
+\r
   //\r
   // Fifth step: Check the ACK\r
   //\r
   if (!TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {\r
     DEBUG (\r
       (DEBUG_WARN,\r
-      "TcpInput: segment discard because of no ACK for connected TCB %p\n",\r
-      Tcb)\r
+       "TcpInput: segment discard because of no ACK for connected TCB %p\n",\r
+       Tcb)\r
       );\r
 \r
     goto DISCARD;\r
   } else {\r
-    if (Tcb->IpInfo->IpVersion == IP_VERSION_6 && Tcb->Tick == 0) {\r
+    if ((Tcb->IpInfo->IpVersion == IP_VERSION_6) && (Tcb->Tick == 0)) {\r
       Tcp6RefreshNeighbor (Tcb, Src, TCP6_KEEP_NEIGHBOR_TIME * TICKS_PER_SECOND);\r
       Tcb->Tick = TCP6_REFRESH_NEIGHBOR_TICK;\r
     }\r
   }\r
 \r
   if (Tcb->State == TCP_SYN_RCVD) {\r
-\r
     if (TCP_SEQ_LT (Tcb->SndUna, Seg->Ack) &&\r
         TCP_SEQ_LEQ (Seg->Ack, Tcb->SndNxt))\r
     {\r
-\r
-      Tcb->SndWnd     = Seg->Wnd;\r
-      Tcb->SndWndMax  = MAX (Tcb->SndWnd, Tcb->SndWndMax);\r
-      Tcb->SndWl1     = Seg->Seq;\r
-      Tcb->SndWl2     = Seg->Ack;\r
+      Tcb->SndWnd    = Seg->Wnd;\r
+      Tcb->SndWndMax = MAX (Tcb->SndWnd, Tcb->SndWndMax);\r
+      Tcb->SndWl1    = Seg->Seq;\r
+      Tcb->SndWl2    = Seg->Ack;\r
       TcpSetState (Tcb, TCP_ESTABLISHED);\r
 \r
       TcpClearTimer (Tcb, TCP_TIMER_CONNECT);\r
@@ -1187,8 +1135,8 @@ TcpInput (
 \r
       DEBUG (\r
         (DEBUG_NET,\r
-        "TcpInput: connection established for TCB %p in SYN_RCVD\n",\r
-        Tcb)\r
+         "TcpInput: connection established for TCB %p in SYN_RCVD\n",\r
+         Tcb)\r
         );\r
 \r
       //\r
@@ -1197,8 +1145,8 @@ TcpInput (
     } else {\r
       DEBUG (\r
         (DEBUG_WARN,\r
-        "TcpInput: send reset because of wrong ACK for TCB %p in SYN_RCVD\n",\r
-        Tcb)\r
+         "TcpInput: send reset because of wrong ACK for TCB %p in SYN_RCVD\n",\r
+         Tcb)\r
         );\r
 \r
       goto SEND_RESET;\r
@@ -1206,21 +1154,18 @@ TcpInput (
   }\r
 \r
   if (TCP_SEQ_LT (Seg->Ack, Tcb->SndUna)) {\r
-\r
     DEBUG (\r
       (DEBUG_WARN,\r
-      "TcpInput: ignore the out-of-data ACK for connected TCB %p\n",\r
-      Tcb)\r
+       "TcpInput: ignore the out-of-data ACK for connected TCB %p\n",\r
+       Tcb)\r
       );\r
 \r
     goto StepSix;\r
-\r
   } else if (TCP_SEQ_GT (Seg->Ack, Tcb->SndNxt)) {\r
-\r
     DEBUG (\r
       (DEBUG_WARN,\r
-      "TcpInput: discard segment for future ACK for connected TCB %p\n",\r
-      Tcb)\r
+       "TcpInput: discard segment for future ACK for connected TCB %p\n",\r
+       Tcb)\r
       );\r
 \r
     TcpSendAck (Tcb);\r
@@ -1239,15 +1184,12 @@ TcpInput (
     if (TCP_SEQ_LEQ (Seg->Seq, Tcb->RcvWl2) &&\r
         TCP_SEQ_LT (Tcb->RcvWl2, Seg->End))\r
     {\r
-\r
-      Tcb->TsRecent     = Option.TSVal;\r
-      Tcb->TsRecentAge  = mTcpTick;\r
+      Tcb->TsRecent    = Option.TSVal;\r
+      Tcb->TsRecentAge = mTcpTick;\r
     }\r
 \r
     TcpComputeRtt (Tcb, TCP_SUB_TIME (mTcpTick, Option.TSEcr));\r
-\r
   } else if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RTT_ON)) {\r
-\r
     ASSERT (Tcb->CongestState == TCP_CONGEST_OPEN);\r
 \r
     TcpComputeRtt (Tcb, Tcb->RttMeasure);\r
@@ -1255,10 +1197,8 @@ TcpInput (
   }\r
 \r
   if (Seg->Ack == Tcb->SndNxt) {\r
-\r
     TcpClearTimer (Tcb, TCP_TIMER_REXMIT);\r
   } else {\r
-\r
     TcpSetTimer (Tcb, TCP_TIMER_REXMIT, Tcb->Rto);\r
   }\r
 \r
@@ -1270,10 +1210,8 @@ TcpInput (
       (Seg->Wnd == Tcb->SndWnd) &&\r
       (0 == Len))\r
   {\r
-\r
     Tcb->DupAck++;\r
   } else {\r
-\r
     Tcb->DupAck = 0;\r
   }\r
 \r
@@ -1283,14 +1221,10 @@ TcpInput (
   if (((Tcb->CongestState == TCP_CONGEST_OPEN) && (Tcb->DupAck < 3)) ||\r
       (Tcb->CongestState == TCP_CONGEST_LOSS))\r
   {\r
-\r
     if (TCP_SEQ_GT (Seg->Ack, Tcb->SndUna)) {\r
-\r
       if (Tcb->CWnd < Tcb->Ssthresh) {\r
-\r
         Tcb->CWnd += Tcb->SndMss;\r
       } else {\r
-\r
         Tcb->CWnd += MAX (Tcb->SndMss * Tcb->SndMss / Tcb->CWnd, 1);\r
       }\r
 \r
@@ -1301,17 +1235,15 @@ TcpInput (
       TcpFastLossRecover (Tcb, Seg);\r
     }\r
   } else {\r
-\r
     TcpFastRecover (Tcb, Seg);\r
   }\r
 \r
   if (TCP_SEQ_GT (Seg->Ack, Tcb->SndUna)) {\r
-\r
     if (TcpAdjustSndQue (Tcb, Seg->Ack) == 0) {\r
       DEBUG (\r
         (DEBUG_ERROR,\r
-        "TcpInput: discard a broken segment for TCB %p\n",\r
-        Tcb)\r
+         "TcpInput: discard a broken segment for TCB %p\n",\r
+         Tcb)\r
         );\r
 \r
       goto DISCARD;\r
@@ -1322,7 +1254,6 @@ TcpInput (
     if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_SND_URG) &&\r
         TCP_SEQ_LT (Tcb->SndUp, Seg->Ack))\r
     {\r
-\r
       TCP_CLEAR_FLG (Tcb->CtrlFlag, TCP_CTRL_SND_URG);\r
     }\r
   }\r
@@ -1333,36 +1264,31 @@ TcpInput (
   if (TCP_SEQ_LT (Tcb->SndWl1, Seg->Seq) ||\r
       ((Tcb->SndWl1 == Seg->Seq) && TCP_SEQ_LEQ (Tcb->SndWl2, Seg->Ack)))\r
   {\r
-\r
     Right = Seg->Ack + Seg->Wnd;\r
 \r
     if (TCP_SEQ_LT (Right, Tcb->SndWl2 + Tcb->SndWnd)) {\r
-\r
       if ((Tcb->SndWl1 == Seg->Seq) &&\r
           (Tcb->SndWl2 == Seg->Ack) &&\r
           (Len == 0))\r
       {\r
-\r
         goto NO_UPDATE;\r
       }\r
 \r
       DEBUG (\r
         (DEBUG_WARN,\r
-        "TcpInput: peer shrinks the window for connected TCB %p\n",\r
-        Tcb)\r
+         "TcpInput: peer shrinks the window for connected TCB %p\n",\r
+         Tcb)\r
         );\r
 \r
       if ((Tcb->CongestState == TCP_CONGEST_RECOVER) &&\r
           (TCP_SEQ_LT (Right, Tcb->Recover)))\r
       {\r
-\r
         Tcb->Recover = Right;\r
       }\r
 \r
       if ((Tcb->CongestState == TCP_CONGEST_LOSS) &&\r
           (TCP_SEQ_LT (Right, Tcb->LossRecover)))\r
       {\r
-\r
         Tcb->LossRecover = Right;\r
       }\r
 \r
@@ -1376,30 +1302,30 @@ TcpInput (
         //\r
         DEBUG (\r
           (DEBUG_WARN,\r
-          "TcpInput: peer advise negative useable window for connected TCB %p\n",\r
-          Tcb)\r
+           "TcpInput: peer advise negative useable window for connected TCB %p\n",\r
+           Tcb)\r
           );\r
         Usable = TCP_SUB_SEQ (Tcb->SndNxt, Right);\r
         if ((Usable >> Tcb->SndWndScale) > 0) {\r
           DEBUG (\r
             (DEBUG_WARN,\r
-            "TcpInput: SndNxt is out of window by more than window scale for TCB %p\n",\r
-            Tcb)\r
+             "TcpInput: SndNxt is out of window by more than window scale for TCB %p\n",\r
+             Tcb)\r
             );\r
           Tcb->SndNxt = Right;\r
         }\r
-        if (Right == Tcb->SndUna) {\r
 \r
+        if (Right == Tcb->SndUna) {\r
           TcpClearTimer (Tcb, TCP_TIMER_REXMIT);\r
           TcpSetProbeTimer (Tcb);\r
         }\r
       }\r
     }\r
 \r
-    Tcb->SndWnd     = Seg->Wnd;\r
-    Tcb->SndWndMax  = MAX (Tcb->SndWnd, Tcb->SndWndMax);\r
-    Tcb->SndWl1     = Seg->Seq;\r
-    Tcb->SndWl2     = Seg->Ack;\r
+    Tcb->SndWnd    = Seg->Wnd;\r
+    Tcb->SndWndMax = MAX (Tcb->SndWnd, Tcb->SndWndMax);\r
+    Tcb->SndWl1    = Seg->Seq;\r
+    Tcb->SndWl2    = Seg->Ack;\r
   }\r
 \r
 NO_UPDATE:\r
@@ -1407,11 +1333,10 @@ NO_UPDATE:
   if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_FIN_SENT) &&\r
       (Tcb->SndUna == Tcb->SndNxt))\r
   {\r
-\r
     DEBUG (\r
       (DEBUG_NET,\r
-      "TcpInput: local FIN is ACKed by peer for connected TCB %p\n",\r
-      Tcb)\r
+       "TcpInput: local FIN is ACKed by peer for connected TCB %p\n",\r
+       Tcb)\r
       );\r
 \r
     TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_FIN_ACKED);\r
@@ -1421,78 +1346,74 @@ NO_UPDATE:
   // Transit the state if proper.\r
   //\r
   switch (Tcb->State) {\r
-  case TCP_FIN_WAIT_1:\r
+    case TCP_FIN_WAIT_1:\r
 \r
-    if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_FIN_ACKED)) {\r
+      if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_FIN_ACKED)) {\r
+        TcpSetState (Tcb, TCP_FIN_WAIT_2);\r
 \r
-      TcpSetState (Tcb, TCP_FIN_WAIT_2);\r
+        TcpClearAllTimer (Tcb);\r
+        TcpSetTimer (Tcb, TCP_TIMER_FINWAIT2, Tcb->FinWait2Timeout);\r
+      }\r
 \r
-      TcpClearAllTimer (Tcb);\r
-      TcpSetTimer (Tcb, TCP_TIMER_FINWAIT2, Tcb->FinWait2Timeout);\r
-    }\r
+    case TCP_FIN_WAIT_2:\r
 \r
-  case TCP_FIN_WAIT_2:\r
+      break;\r
 \r
-    break;\r
+    case TCP_CLOSE_WAIT:\r
+      break;\r
 \r
-  case TCP_CLOSE_WAIT:\r
-    break;\r
+    case TCP_CLOSING:\r
 \r
-  case TCP_CLOSING:\r
+      if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_FIN_ACKED)) {\r
+        TcpSetState (Tcb, TCP_TIME_WAIT);\r
+\r
+        TcpClearAllTimer (Tcb);\r
 \r
-    if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_FIN_ACKED)) {\r
+        if (Tcb->TimeWaitTimeout != 0) {\r
+          TcpSetTimer (Tcb, TCP_TIMER_2MSL, Tcb->TimeWaitTimeout);\r
+        } else {\r
+          DEBUG (\r
+            (DEBUG_WARN,\r
+             "Connection closed immediately because app disables TIME_WAIT timer for %p\n",\r
+             Tcb)\r
+            );\r
 \r
-      TcpSetState (Tcb, TCP_TIME_WAIT);\r
+          TcpClose (Tcb);\r
+        }\r
+      }\r
 \r
-      TcpClearAllTimer (Tcb);\r
+      break;\r
 \r
-      if (Tcb->TimeWaitTimeout != 0) {\r
+    case TCP_LAST_ACK:\r
 \r
+      if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_FIN_ACKED)) {\r
+        TcpSetState (Tcb, TCP_CLOSED);\r
+      }\r
+\r
+      break;\r
+\r
+    case TCP_TIME_WAIT:\r
+\r
+      TcpSendAck (Tcb);\r
+\r
+      if (Tcb->TimeWaitTimeout != 0) {\r
         TcpSetTimer (Tcb, TCP_TIMER_2MSL, Tcb->TimeWaitTimeout);\r
       } else {\r
-\r
         DEBUG (\r
           (DEBUG_WARN,\r
-          "Connection closed immediately because app disables TIME_WAIT timer for %p\n",\r
-          Tcb)\r
+           "Connection closed immediately because app disables TIME_WAIT timer for %p\n",\r
+           Tcb)\r
           );\r
 \r
         TcpClose (Tcb);\r
       }\r
-    }\r
-    break;\r
-\r
-  case TCP_LAST_ACK:\r
-\r
-    if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_FIN_ACKED)) {\r
-\r
-      TcpSetState (Tcb, TCP_CLOSED);\r
-    }\r
-\r
-    break;\r
-\r
-  case TCP_TIME_WAIT:\r
-\r
-    TcpSendAck (Tcb);\r
-\r
-    if (Tcb->TimeWaitTimeout != 0) {\r
-\r
-      TcpSetTimer (Tcb, TCP_TIMER_2MSL, Tcb->TimeWaitTimeout);\r
-    } else {\r
-\r
-      DEBUG (\r
-        (DEBUG_WARN,\r
-        "Connection closed immediately because app disables TIME_WAIT timer for %p\n",\r
-        Tcb)\r
-        );\r
 \r
-      TcpClose (Tcb);\r
-    }\r
-    break;\r
+      break;\r
 \r
-  default:\r
-    break;\r
+    default:\r
+      break;\r
   }\r
+\r
   //\r
   // Sixth step: Check the URG bit.update the Urg point\r
   // if in TCP_CAN_RECV, otherwise, leave the RcvUp intact.\r
@@ -1503,11 +1424,10 @@ StepSix:
   TcpSetKeepaliveTimer (Tcb);\r
 \r
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_URG) && !TCP_FIN_RCVD (Tcb->State)) {\r
-\r
     DEBUG (\r
       (DEBUG_NET,\r
-      "TcpInput: received urgent data from peer for connected TCB %p\n",\r
-      Tcb)\r
+       "TcpInput: received urgent data from peer for connected TCB %p\n",\r
+       Tcb)\r
       );\r
 \r
     Urg = Seg->Seq + Seg->Urg;\r
@@ -1515,25 +1435,22 @@ StepSix:
     if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RCVD_URG) &&\r
         TCP_SEQ_GT (Urg, Tcb->RcvUp))\r
     {\r
-\r
       Tcb->RcvUp = Urg;\r
     } else {\r
-\r
       Tcb->RcvUp = Urg;\r
       TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_RCVD_URG);\r
     }\r
   }\r
+\r
   //\r
   // Seventh step: Process the segment data\r
   //\r
   if (Seg->End != Seg->Seq) {\r
-\r
     if (TCP_FIN_RCVD (Tcb->State)) {\r
-\r
       DEBUG (\r
         (DEBUG_WARN,\r
-        "TcpInput: connection reset because data is lost for connected TCB %p\n",\r
-        Tcb)\r
+         "TcpInput: connection reset because data is lost for connected TCB %p\n",\r
+         Tcb)\r
         );\r
 \r
       goto RESET_THEN_DROP;\r
@@ -1542,8 +1459,8 @@ StepSix:
     if (TCP_LOCAL_CLOSED (Tcb->State) && (Nbuf->TotalSize != 0)) {\r
       DEBUG (\r
         (DEBUG_WARN,\r
-        "TcpInput: connection reset because data is lost for connected TCB %p\n",\r
-        Tcb)\r
+         "TcpInput: connection reset because data is lost for connected TCB %p\n",\r
+         Tcb)\r
         );\r
 \r
       goto RESET_THEN_DROP;\r
@@ -1552,8 +1469,8 @@ StepSix:
     if (TcpQueueData (Tcb, Nbuf) == 0) {\r
       DEBUG (\r
         (DEBUG_ERROR,\r
-        "TcpInput: discard a broken segment for TCB %p\n",\r
-        Tcb)\r
+         "TcpInput: discard a broken segment for TCB %p\n",\r
+         Tcb)\r
         );\r
 \r
       goto DISCARD;\r
@@ -1588,7 +1505,6 @@ StepSix:
       (TcpToSendData (Tcb, 0) == 0) &&\r
       (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW) || (Nbuf->TotalSize != 0)))\r
   {\r
-\r
     TcpToSendAck (Tcb);\r
   }\r
 \r
@@ -1619,7 +1535,6 @@ DISCARD:
   NetbufFree (Nbuf);\r
 \r
   if ((Parent != NULL) && (Tcb != NULL)) {\r
-\r
     ASSERT (Tcb->Sk != NULL);\r
     TcpClose (Tcb);\r
   }\r
@@ -1648,18 +1563,18 @@ TcpIcmpInput (
   IN UINT8           Version\r
   )\r
 {\r
-  TCP_HEAD         *Head;\r
-  TCP_CB           *Tcb;\r
-  TCP_SEQNO        Seq;\r
-  EFI_STATUS       IcmpErrStatus;\r
-  BOOLEAN          IcmpErrIsHard;\r
-  BOOLEAN          IcmpErrNotify;\r
+  TCP_HEAD    *Head;\r
+  TCP_CB      *Tcb;\r
+  TCP_SEQNO   Seq;\r
+  EFI_STATUS  IcmpErrStatus;\r
+  BOOLEAN     IcmpErrIsHard;\r
+  BOOLEAN     IcmpErrNotify;\r
 \r
   if (Nbuf->TotalSize < sizeof (TCP_HEAD)) {\r
     goto CLEAN_EXIT;\r
   }\r
 \r
-  Head = (TCP_HEAD *) NetbufGetByte (Nbuf, 0, NULL);\r
+  Head = (TCP_HEAD *)NetbufGetByte (Nbuf, 0, NULL);\r
   ASSERT (Head != NULL);\r
 \r
   Tcb = TcpLocateTcb (\r
@@ -1670,8 +1585,7 @@ TcpIcmpInput (
           Version,\r
           FALSE\r
           );\r
-  if (Tcb == NULL || Tcb->State == TCP_CLOSED) {\r
-\r
+  if ((Tcb == NULL) || (Tcb->State == TCP_CLOSED)) {\r
     goto CLEAN_EXIT;\r
   }\r
 \r
@@ -1680,7 +1594,6 @@ TcpIcmpInput (
   //\r
   Seq = NTOHL (Head->Seq);\r
   if (!(TCP_SEQ_LEQ (Tcb->SndUna, Seq) && TCP_SEQ_LT (Seq, Tcb->SndNxt))) {\r
-\r
     goto CLEAN_EXIT;\r
   }\r
 \r
@@ -1692,12 +1605,10 @@ TcpIcmpInput (
                     );\r
 \r
   if (IcmpErrNotify) {\r
-\r
     SOCK_ERROR (Tcb->Sk, IcmpErrStatus);\r
   }\r
 \r
   if (IcmpErrIsHard) {\r
-\r
     TcpClose (Tcb);\r
   }\r
 \r
index 5504c30cee838852d4b4e6d2f07b0526082b86a1..b207477462d97a74de6a07a90789b165ed5d41e6 100644 (file)
 VOID\r
 EFIAPI\r
 TcpRxCallback (\r
-  IN EFI_STATUS                       Status,\r
-  IN UINT8                            IcmpErr,\r
-  IN EFI_NET_SESSION_DATA             *NetSession,\r
-  IN NET_BUF                          *Pkt,\r
-  IN VOID                             *Context    OPTIONAL\r
+  IN EFI_STATUS            Status,\r
+  IN UINT8                 IcmpErr,\r
+  IN EFI_NET_SESSION_DATA  *NetSession,\r
+  IN NET_BUF               *Pkt,\r
+  IN VOID                  *Context    OPTIONAL\r
   )\r
 {\r
   if (EFI_SUCCESS == Status) {\r
@@ -67,15 +67,14 @@ TcpSendIpPacket (
   IN UINT8           Version\r
   )\r
 {\r
-  EFI_STATUS       Status;\r
-  IP_IO            *IpIo;\r
-  IP_IO_OVERRIDE   Override;\r
-  SOCKET           *Sock;\r
-  VOID             *IpSender;\r
+  EFI_STATUS      Status;\r
+  IP_IO           *IpIo;\r
+  IP_IO_OVERRIDE  Override;\r
+  SOCKET          *Sock;\r
+  VOID            *IpSender;\r
   TCP_PROTO_DATA  *TcpProto;\r
 \r
   if (NULL == Tcb) {\r
-\r
     IpIo     = NULL;\r
     IpSender = IpIoFindSender (&IpIo, Version, Src);\r
 \r
@@ -95,9 +94,8 @@ TcpSendIpPacket (
       IpSender = NULL;\r
     }\r
   } else {\r
-\r
     Sock     = Tcb->Sk;\r
-    TcpProto = (TCP_PROTO_DATA *) Sock->ProtoReserved;\r
+    TcpProto = (TCP_PROTO_DATA *)Sock->ProtoReserved;\r
     IpIo     = TcpProto->TcpService->IpIo;\r
     IpSender = Tcb->IpInfo;\r
 \r
@@ -162,8 +160,8 @@ Tcp6RefreshNeighbor (
   IN UINT32          Timeout\r
   )\r
 {\r
-  IP_IO            *IpIo;\r
-  SOCKET           *Sock;\r
+  IP_IO           *IpIo;\r
+  SOCKET          *Sock;\r
   TCP_PROTO_DATA  *TcpProto;\r
 \r
   if (NULL == Tcb) {\r
@@ -174,10 +172,9 @@ Tcp6RefreshNeighbor (
       DEBUG ((DEBUG_WARN, "Tcp6AddNeighbor: No appropriate IpIo.\n"));\r
       return EFI_NOT_STARTED;\r
     }\r
-\r
   } else {\r
     Sock     = Tcb->Sk;\r
-    TcpProto = (TCP_PROTO_DATA *) Sock->ProtoReserved;\r
+    TcpProto = (TCP_PROTO_DATA *)Sock->ProtoReserved;\r
     IpIo     = TcpProto->TcpService->IpIo;\r
   }\r
 \r
index 75de71eb6ea300c95fabc8fa509f45560164aa7b..c6cf3e0c2abf7aeb6eaa10b7aae4d2151f3db8e0 100644 (file)
 **/\r
 EFI_STATUS\r
 TcpChkDataBuf (\r
-  IN UINT32                 DataLen,\r
-  IN UINT32                 FragmentCount,\r
-  IN EFI_TCP4_FRAGMENT_DATA *FragmentTable\r
+  IN UINT32                  DataLen,\r
+  IN UINT32                  FragmentCount,\r
+  IN EFI_TCP4_FRAGMENT_DATA  *FragmentTable\r
   )\r
 {\r
-  UINT32 Index;\r
+  UINT32  Index;\r
 \r
-  UINT32 Len;\r
+  UINT32  Len;\r
 \r
   for (Index = 0, Len = 0; Index < FragmentCount; Index++) {\r
     if (FragmentTable[Index].FragmentBuffer == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     Len = Len + FragmentTable[Index].FragmentLength;\r
   }\r
 \r
@@ -73,12 +74,12 @@ TcpChkDataBuf (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4GetModeData (\r
-  IN   EFI_TCP4_PROTOCOL                  *This,\r
-  OUT  EFI_TCP4_CONNECTION_STATE          *Tcp4State      OPTIONAL,\r
-  OUT  EFI_TCP4_CONFIG_DATA               *Tcp4ConfigData OPTIONAL,\r
-  OUT  EFI_IP4_MODE_DATA                  *Ip4ModeData    OPTIONAL,\r
-  OUT  EFI_MANAGED_NETWORK_CONFIG_DATA    *MnpConfigData  OPTIONAL,\r
-  OUT  EFI_SIMPLE_NETWORK_MODE            *SnpModeData    OPTIONAL\r
+  IN   EFI_TCP4_PROTOCOL                *This,\r
+  OUT  EFI_TCP4_CONNECTION_STATE        *Tcp4State      OPTIONAL,\r
+  OUT  EFI_TCP4_CONFIG_DATA             *Tcp4ConfigData OPTIONAL,\r
+  OUT  EFI_IP4_MODE_DATA                *Ip4ModeData    OPTIONAL,\r
+  OUT  EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData  OPTIONAL,\r
+  OUT  EFI_SIMPLE_NETWORK_MODE          *SnpModeData    OPTIONAL\r
   )\r
 {\r
   TCP4_MODE_DATA  TcpMode;\r
@@ -88,13 +89,13 @@ Tcp4GetModeData (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Sock                    = SOCK_FROM_THIS (This);\r
+  Sock = SOCK_FROM_THIS (This);\r
 \r
-  TcpMode.Tcp4State       = Tcp4State;\r
-  TcpMode.Tcp4ConfigData  = Tcp4ConfigData;\r
-  TcpMode.Ip4ModeData     = Ip4ModeData;\r
-  TcpMode.MnpConfigData   = MnpConfigData;\r
-  TcpMode.SnpModeData     = SnpModeData;\r
+  TcpMode.Tcp4State      = Tcp4State;\r
+  TcpMode.Tcp4ConfigData = Tcp4ConfigData;\r
+  TcpMode.Ip4ModeData    = Ip4ModeData;\r
+  TcpMode.MnpConfigData  = MnpConfigData;\r
+  TcpMode.SnpModeData    = SnpModeData;\r
 \r
   return SockGetMode (Sock, &TcpMode);\r
 }\r
@@ -124,8 +125,8 @@ Tcp4GetModeData (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4Configure (\r
-  IN EFI_TCP4_PROTOCOL        * This,\r
-  IN EFI_TCP4_CONFIG_DATA     * TcpConfigData OPTIONAL\r
+  IN EFI_TCP4_PROTOCOL     *This,\r
+  IN EFI_TCP4_CONFIG_DATA  *TcpConfigData OPTIONAL\r
   )\r
 {\r
   EFI_TCP4_OPTION  *Option;\r
@@ -142,22 +143,21 @@ Tcp4Configure (
   // Tcp protocol related parameter check will be conducted here\r
   //\r
   if (NULL != TcpConfigData) {\r
-\r
     CopyMem (&Ip, &TcpConfigData->AccessPoint.RemoteAddress, sizeof (IP4_ADDR));\r
     if (IP4_IS_LOCAL_BROADCAST (NTOHL (Ip))) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
-    if (TcpConfigData->AccessPoint.ActiveFlag && (0 == TcpConfigData->AccessPoint.RemotePort || (Ip == 0))) {\r
+    if (TcpConfigData->AccessPoint.ActiveFlag && ((0 == TcpConfigData->AccessPoint.RemotePort) || (Ip == 0))) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
     if (!TcpConfigData->AccessPoint.UseDefaultAddress) {\r
-\r
       CopyMem (&Ip, &TcpConfigData->AccessPoint.StationAddress, sizeof (IP4_ADDR));\r
       CopyMem (&SubnetMask, &TcpConfigData->AccessPoint.SubnetMask, sizeof (IP4_ADDR));\r
       if (!IP4_IS_VALID_NETMASK (NTOHL (SubnetMask)) ||\r
-          (SubnetMask != 0 && !NetIp4IsUnicast (NTOHL (Ip), NTOHL (SubnetMask)))) {\r
+          ((SubnetMask != 0) && !NetIp4IsUnicast (NTOHL (Ip), NTOHL (SubnetMask))))\r
+      {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
     }\r
@@ -211,26 +211,26 @@ Tcp4Configure (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4Routes (\r
-  IN EFI_TCP4_PROTOCOL           *This,\r
-  IN BOOLEAN                     DeleteRoute,\r
-  IN EFI_IPv4_ADDRESS            *SubnetAddress,\r
-  IN EFI_IPv4_ADDRESS            *SubnetMask,\r
-  IN EFI_IPv4_ADDRESS            *GatewayAddress\r
+  IN EFI_TCP4_PROTOCOL  *This,\r
+  IN BOOLEAN            DeleteRoute,\r
+  IN EFI_IPv4_ADDRESS   *SubnetAddress,\r
+  IN EFI_IPv4_ADDRESS   *SubnetMask,\r
+  IN EFI_IPv4_ADDRESS   *GatewayAddress\r
   )\r
 {\r
-  SOCKET          *Sock;\r
-  TCP4_ROUTE_INFO RouteInfo;\r
+  SOCKET           *Sock;\r
+  TCP4_ROUTE_INFO  RouteInfo;\r
 \r
   if (NULL == This) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Sock                      = SOCK_FROM_THIS (This);\r
+  Sock = SOCK_FROM_THIS (This);\r
 \r
-  RouteInfo.DeleteRoute     = DeleteRoute;\r
-  RouteInfo.SubnetAddress   = SubnetAddress;\r
-  RouteInfo.SubnetMask      = SubnetMask;\r
-  RouteInfo.GatewayAddress  = GatewayAddress;\r
+  RouteInfo.DeleteRoute    = DeleteRoute;\r
+  RouteInfo.SubnetAddress  = SubnetAddress;\r
+  RouteInfo.SubnetMask     = SubnetMask;\r
+  RouteInfo.GatewayAddress = GatewayAddress;\r
 \r
   return SockRoute (Sock, &RouteInfo);\r
 }\r
@@ -257,13 +257,13 @@ Tcp4Routes (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4Connect (\r
-  IN EFI_TCP4_PROTOCOL           *This,\r
-  IN EFI_TCP4_CONNECTION_TOKEN   *ConnectionToken\r
+  IN EFI_TCP4_PROTOCOL          *This,\r
+  IN EFI_TCP4_CONNECTION_TOKEN  *ConnectionToken\r
   )\r
 {\r
   SOCKET  *Sock;\r
 \r
-  if (NULL == This || NULL == ConnectionToken || NULL == ConnectionToken->CompletionToken.Event) {\r
+  if ((NULL == This) || (NULL == ConnectionToken) || (NULL == ConnectionToken->CompletionToken.Event)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -295,13 +295,13 @@ Tcp4Connect (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4Accept (\r
-  IN EFI_TCP4_PROTOCOL             *This,\r
-  IN EFI_TCP4_LISTEN_TOKEN         *ListenToken\r
+  IN EFI_TCP4_PROTOCOL      *This,\r
+  IN EFI_TCP4_LISTEN_TOKEN  *ListenToken\r
   )\r
 {\r
   SOCKET  *Sock;\r
 \r
-  if (NULL == This || NULL == ListenToken || NULL == ListenToken->CompletionToken.Event) {\r
+  if ((NULL == This) || (NULL == ListenToken) || (NULL == ListenToken->CompletionToken.Event)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -342,28 +342,29 @@ Tcp4Accept (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4Transmit (\r
-  IN EFI_TCP4_PROTOCOL            *This,\r
-  IN EFI_TCP4_IO_TOKEN            *Token\r
+  IN EFI_TCP4_PROTOCOL  *This,\r
+  IN EFI_TCP4_IO_TOKEN  *Token\r
   )\r
 {\r
   SOCKET      *Sock;\r
   EFI_STATUS  Status;\r
 \r
-  if (NULL == This ||\r
-      NULL == Token ||\r
-      NULL == Token->CompletionToken.Event ||\r
-      NULL == Token->Packet.TxData ||\r
-      0 == Token->Packet.TxData->FragmentCount ||\r
-      0 == Token->Packet.TxData->DataLength\r
-      ) {\r
+  if ((NULL == This) ||\r
+      (NULL == Token) ||\r
+      (NULL == Token->CompletionToken.Event) ||\r
+      (NULL == Token->Packet.TxData) ||\r
+      (0 == Token->Packet.TxData->FragmentCount) ||\r
+      (0 == Token->Packet.TxData->DataLength)\r
+      )\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   Status = TcpChkDataBuf (\r
-            Token->Packet.TxData->DataLength,\r
-            Token->Packet.TxData->FragmentCount,\r
-            Token->Packet.TxData->FragmentTable\r
-            );\r
+             Token->Packet.TxData->DataLength,\r
+             Token->Packet.TxData->FragmentCount,\r
+             Token->Packet.TxData->FragmentTable\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -407,28 +408,29 @@ Tcp4Transmit (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4Receive (\r
-  IN EFI_TCP4_PROTOCOL           *This,\r
-  IN EFI_TCP4_IO_TOKEN           *Token\r
+  IN EFI_TCP4_PROTOCOL  *This,\r
+  IN EFI_TCP4_IO_TOKEN  *Token\r
   )\r
 {\r
   SOCKET      *Sock;\r
   EFI_STATUS  Status;\r
 \r
-  if (NULL == This ||\r
-      NULL == Token ||\r
-      NULL == Token->CompletionToken.Event ||\r
-      NULL == Token->Packet.RxData ||\r
-      0 == Token->Packet.RxData->FragmentCount ||\r
-      0 == Token->Packet.RxData->DataLength\r
-      ) {\r
+  if ((NULL == This) ||\r
+      (NULL == Token) ||\r
+      (NULL == Token->CompletionToken.Event) ||\r
+      (NULL == Token->Packet.RxData) ||\r
+      (0 == Token->Packet.RxData->FragmentCount) ||\r
+      (0 == Token->Packet.RxData->DataLength)\r
+      )\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   Status = TcpChkDataBuf (\r
-            Token->Packet.RxData->DataLength,\r
-            Token->Packet.RxData->FragmentCount,\r
-            Token->Packet.RxData->FragmentTable\r
-            );\r
+             Token->Packet.RxData->DataLength,\r
+             Token->Packet.RxData->FragmentCount,\r
+             Token->Packet.RxData->FragmentTable\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -436,7 +438,6 @@ Tcp4Receive (
   Sock = SOCK_FROM_THIS (This);\r
 \r
   return SockRcv (Sock, Token);\r
-\r
 }\r
 \r
 /**\r
@@ -464,13 +465,13 @@ Tcp4Receive (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4Close (\r
-  IN EFI_TCP4_PROTOCOL           *This,\r
-  IN EFI_TCP4_CLOSE_TOKEN        *CloseToken\r
+  IN EFI_TCP4_PROTOCOL     *This,\r
+  IN EFI_TCP4_CLOSE_TOKEN  *CloseToken\r
   )\r
 {\r
   SOCKET  *Sock;\r
 \r
-  if (NULL == This || NULL == CloseToken || NULL == CloseToken->CompletionToken.Event) {\r
+  if ((NULL == This) || (NULL == CloseToken) || (NULL == CloseToken->CompletionToken.Event)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -506,8 +507,8 @@ Tcp4Close (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4Cancel (\r
-  IN EFI_TCP4_PROTOCOL             *This,\r
-  IN EFI_TCP4_COMPLETION_TOKEN     *Token OPTIONAL\r
+  IN EFI_TCP4_PROTOCOL          *This,\r
+  IN EFI_TCP4_COMPLETION_TOKEN  *Token OPTIONAL\r
   )\r
 {\r
   SOCKET  *Sock;\r
@@ -538,7 +539,7 @@ Tcp4Cancel (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4Poll (\r
-  IN EFI_TCP4_PROTOCOL        *This\r
+  IN EFI_TCP4_PROTOCOL  *This\r
   )\r
 {\r
   SOCKET      *Sock;\r
@@ -548,7 +549,7 @@ Tcp4Poll (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Sock   = SOCK_FROM_THIS (This);\r
+  Sock = SOCK_FROM_THIS (This);\r
 \r
   Status = Sock->ProtoHandler (Sock, SOCK_POLL, NULL);\r
 \r
@@ -586,12 +587,12 @@ Tcp4Poll (
 EFI_STATUS\r
 EFIAPI\r
 Tcp6GetModeData (\r
-  IN  EFI_TCP6_PROTOCOL                  *This,\r
-  OUT EFI_TCP6_CONNECTION_STATE          *Tcp6State      OPTIONAL,\r
-  OUT EFI_TCP6_CONFIG_DATA               *Tcp6ConfigData OPTIONAL,\r
-  OUT EFI_IP6_MODE_DATA                  *Ip6ModeData    OPTIONAL,\r
-  OUT EFI_MANAGED_NETWORK_CONFIG_DATA    *MnpConfigData  OPTIONAL,\r
-  OUT EFI_SIMPLE_NETWORK_MODE            *SnpModeData    OPTIONAL\r
+  IN  EFI_TCP6_PROTOCOL                *This,\r
+  OUT EFI_TCP6_CONNECTION_STATE        *Tcp6State      OPTIONAL,\r
+  OUT EFI_TCP6_CONFIG_DATA             *Tcp6ConfigData OPTIONAL,\r
+  OUT EFI_IP6_MODE_DATA                *Ip6ModeData    OPTIONAL,\r
+  OUT EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData  OPTIONAL,\r
+  OUT EFI_SIMPLE_NETWORK_MODE          *SnpModeData    OPTIONAL\r
   )\r
 {\r
   TCP6_MODE_DATA  TcpMode;\r
@@ -601,7 +602,7 @@ Tcp6GetModeData (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Sock                   = SOCK_FROM_THIS (This);\r
+  Sock = SOCK_FROM_THIS (This);\r
 \r
   TcpMode.Tcp6State      = Tcp6State;\r
   TcpMode.Tcp6ConfigData = Tcp6ConfigData;\r
@@ -662,8 +663,8 @@ Tcp6GetModeData (
 EFI_STATUS\r
 EFIAPI\r
 Tcp6Configure (\r
-  IN EFI_TCP6_PROTOCOL        *This,\r
-  IN EFI_TCP6_CONFIG_DATA     *Tcp6ConfigData OPTIONAL\r
+  IN EFI_TCP6_PROTOCOL     *This,\r
+  IN EFI_TCP6_CONFIG_DATA  *Tcp6ConfigData OPTIONAL\r
   )\r
 {\r
   EFI_TCP6_OPTION   *Option;\r
@@ -679,15 +680,15 @@ Tcp6Configure (
   // Tcp protocol related parameter check will be conducted here\r
   //\r
   if (NULL != Tcp6ConfigData) {\r
-\r
     Ip = &Tcp6ConfigData->AccessPoint.RemoteAddress;\r
     if (!NetIp6IsUnspecifiedAddr (Ip) && !NetIp6IsValidUnicast (Ip)) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
     if (Tcp6ConfigData->AccessPoint.ActiveFlag &&\r
-        (0 == Tcp6ConfigData->AccessPoint.RemotePort || NetIp6IsUnspecifiedAddr (Ip))\r
-        ) {\r
+        ((0 == Tcp6ConfigData->AccessPoint.RemotePort) || NetIp6IsUnspecifiedAddr (Ip))\r
+        )\r
+    {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
@@ -750,13 +751,13 @@ Tcp6Configure (
 EFI_STATUS\r
 EFIAPI\r
 Tcp6Connect (\r
-  IN EFI_TCP6_PROTOCOL           *This,\r
-  IN EFI_TCP6_CONNECTION_TOKEN   *ConnectionToken\r
+  IN EFI_TCP6_PROTOCOL          *This,\r
+  IN EFI_TCP6_CONNECTION_TOKEN  *ConnectionToken\r
   )\r
 {\r
   SOCKET  *Sock;\r
 \r
-  if (NULL == This || NULL == ConnectionToken || NULL == ConnectionToken->CompletionToken.Event) {\r
+  if ((NULL == This) || (NULL == ConnectionToken) || (NULL == ConnectionToken->CompletionToken.Event)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -803,13 +804,13 @@ Tcp6Connect (
 EFI_STATUS\r
 EFIAPI\r
 Tcp6Accept (\r
-  IN EFI_TCP6_PROTOCOL             *This,\r
-  IN EFI_TCP6_LISTEN_TOKEN         *ListenToken\r
+  IN EFI_TCP6_PROTOCOL      *This,\r
+  IN EFI_TCP6_LISTEN_TOKEN  *ListenToken\r
   )\r
 {\r
   SOCKET  *Sock;\r
 \r
-  if (NULL == This || NULL == ListenToken || NULL == ListenToken->CompletionToken.Event) {\r
+  if ((NULL == This) || (NULL == ListenToken) || (NULL == ListenToken->CompletionToken.Event)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -858,28 +859,29 @@ Tcp6Accept (
 EFI_STATUS\r
 EFIAPI\r
 Tcp6Transmit (\r
-  IN EFI_TCP6_PROTOCOL            *This,\r
-  IN EFI_TCP6_IO_TOKEN            *Token\r
+  IN EFI_TCP6_PROTOCOL  *This,\r
+  IN EFI_TCP6_IO_TOKEN  *Token\r
   )\r
 {\r
   SOCKET      *Sock;\r
   EFI_STATUS  Status;\r
 \r
-  if (NULL == This ||\r
-      NULL == Token ||\r
-      NULL == Token->CompletionToken.Event ||\r
-      NULL == Token->Packet.TxData ||\r
-      0 == Token->Packet.TxData->FragmentCount ||\r
-      0 == Token->Packet.TxData->DataLength\r
-      ) {\r
+  if ((NULL == This) ||\r
+      (NULL == Token) ||\r
+      (NULL == Token->CompletionToken.Event) ||\r
+      (NULL == Token->Packet.TxData) ||\r
+      (0 == Token->Packet.TxData->FragmentCount) ||\r
+      (0 == Token->Packet.TxData->DataLength)\r
+      )\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   Status = TcpChkDataBuf (\r
-            Token->Packet.TxData->DataLength,\r
-            Token->Packet.TxData->FragmentCount,\r
-            (EFI_TCP4_FRAGMENT_DATA *) Token->Packet.TxData->FragmentTable\r
-            );\r
+             Token->Packet.TxData->DataLength,\r
+             Token->Packet.TxData->FragmentCount,\r
+             (EFI_TCP4_FRAGMENT_DATA *)Token->Packet.TxData->FragmentTable\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -938,28 +940,29 @@ Tcp6Transmit (
 EFI_STATUS\r
 EFIAPI\r
 Tcp6Receive (\r
-  IN EFI_TCP6_PROTOCOL           *This,\r
-  IN EFI_TCP6_IO_TOKEN           *Token\r
+  IN EFI_TCP6_PROTOCOL  *This,\r
+  IN EFI_TCP6_IO_TOKEN  *Token\r
   )\r
 {\r
   SOCKET      *Sock;\r
   EFI_STATUS  Status;\r
 \r
-  if (NULL == This ||\r
-      NULL == Token ||\r
-      NULL == Token->CompletionToken.Event ||\r
-      NULL == Token->Packet.RxData ||\r
-      0 == Token->Packet.RxData->FragmentCount ||\r
-      0 == Token->Packet.RxData->DataLength\r
-      ) {\r
+  if ((NULL == This) ||\r
+      (NULL == Token) ||\r
+      (NULL == Token->CompletionToken.Event) ||\r
+      (NULL == Token->Packet.RxData) ||\r
+      (0 == Token->Packet.RxData->FragmentCount) ||\r
+      (0 == Token->Packet.RxData->DataLength)\r
+      )\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   Status = TcpChkDataBuf (\r
-            Token->Packet.RxData->DataLength,\r
-            Token->Packet.RxData->FragmentCount,\r
-            (EFI_TCP4_FRAGMENT_DATA *) Token->Packet.RxData->FragmentTable\r
-            );\r
+             Token->Packet.RxData->DataLength,\r
+             Token->Packet.RxData->FragmentCount,\r
+             (EFI_TCP4_FRAGMENT_DATA *)Token->Packet.RxData->FragmentTable\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -999,13 +1002,13 @@ Tcp6Receive (
 EFI_STATUS\r
 EFIAPI\r
 Tcp6Close (\r
-  IN EFI_TCP6_PROTOCOL           *This,\r
-  IN EFI_TCP6_CLOSE_TOKEN        *CloseToken\r
+  IN EFI_TCP6_PROTOCOL     *This,\r
+  IN EFI_TCP6_CLOSE_TOKEN  *CloseToken\r
   )\r
 {\r
   SOCKET  *Sock;\r
 \r
-  if (NULL == This || NULL == CloseToken || NULL == CloseToken->CompletionToken.Event) {\r
+  if ((NULL == This) || (NULL == CloseToken) || (NULL == CloseToken->CompletionToken.Event)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1052,8 +1055,8 @@ Tcp6Close (
 EFI_STATUS\r
 EFIAPI\r
 Tcp6Cancel (\r
-  IN EFI_TCP6_PROTOCOL           *This,\r
-  IN EFI_TCP6_COMPLETION_TOKEN   *Token OPTIONAL\r
+  IN EFI_TCP6_PROTOCOL          *This,\r
+  IN EFI_TCP6_COMPLETION_TOKEN  *Token OPTIONAL\r
   )\r
 {\r
   SOCKET  *Sock;\r
@@ -1087,7 +1090,7 @@ Tcp6Cancel (
 EFI_STATUS\r
 EFIAPI\r
 Tcp6Poll (\r
-  IN EFI_TCP6_PROTOCOL        *This\r
+  IN EFI_TCP6_PROTOCOL  *This\r
   )\r
 {\r
   SOCKET      *Sock;\r
@@ -1097,10 +1100,9 @@ Tcp6Poll (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Sock   = SOCK_FROM_THIS (This);\r
+  Sock = SOCK_FROM_THIS (This);\r
 \r
   Status = Sock->ProtoHandler (Sock, SOCK_POLL, NULL);\r
 \r
   return Status;\r
 }\r
-\r
index 35f12a16a87c8dcdd83ff2217e404d1de8099ab2..c0c9b7f46ebeff002143d7c31a48cd984a97b9aa 100644 (file)
@@ -29,67 +29,67 @@ extern EFI_COMPONENT_NAME_PROTOCOL   gTcpComponentName;
 extern EFI_COMPONENT_NAME2_PROTOCOL  gTcpComponentName2;\r
 extern EFI_UNICODE_STRING_TABLE      *gTcpControllerNameTable;\r
 \r
-extern LIST_ENTRY                    mTcpRunQue;\r
-extern LIST_ENTRY                    mTcpListenQue;\r
-extern TCP_SEQNO                     mTcpGlobalIss;\r
-extern UINT32                        mTcpTick;\r
+extern LIST_ENTRY  mTcpRunQue;\r
+extern LIST_ENTRY  mTcpListenQue;\r
+extern TCP_SEQNO   mTcpGlobalIss;\r
+extern UINT32      mTcpTick;\r
 \r
 ///\r
 /// 30 seconds.\r
 ///\r
-#define TCP6_KEEP_NEIGHBOR_TIME    30\r
+#define TCP6_KEEP_NEIGHBOR_TIME  30\r
 ///\r
 /// 5 seconds, since 1 tick equals 200ms.\r
 ///\r
-#define TCP6_REFRESH_NEIGHBOR_TICK 25\r
+#define TCP6_REFRESH_NEIGHBOR_TICK  25\r
 \r
-#define TCP_EXPIRE_TIME            65535\r
+#define TCP_EXPIRE_TIME  65535\r
 \r
 ///\r
 /// The implementation selects the initial send sequence number and the unit to\r
 /// be added when it is increased.\r
 ///\r
-#define TCP_BASE_ISS               0x4d7e980b\r
-#define TCP_ISS_INCREMENT_1        2048\r
-#define TCP_ISS_INCREMENT_2        100\r
+#define TCP_BASE_ISS         0x4d7e980b\r
+#define TCP_ISS_INCREMENT_1  2048\r
+#define TCP_ISS_INCREMENT_2  100\r
 \r
 typedef union {\r
-  EFI_TCP4_CONFIG_DATA  Tcp4CfgData;\r
-  EFI_TCP6_CONFIG_DATA  Tcp6CfgData;\r
+  EFI_TCP4_CONFIG_DATA    Tcp4CfgData;\r
+  EFI_TCP6_CONFIG_DATA    Tcp6CfgData;\r
 } TCP_CONFIG_DATA;\r
 \r
 typedef union {\r
-  EFI_TCP4_ACCESS_POINT  Tcp4Ap;\r
-  EFI_TCP6_ACCESS_POINT  Tcp6Ap;\r
+  EFI_TCP4_ACCESS_POINT    Tcp4Ap;\r
+  EFI_TCP6_ACCESS_POINT    Tcp6Ap;\r
 } TCP_ACCESS_POINT;\r
 \r
 typedef struct _TCP4_MODE_DATA {\r
-  EFI_TCP4_CONNECTION_STATE       *Tcp4State;\r
-  EFI_TCP4_CONFIG_DATA            *Tcp4ConfigData;\r
-  EFI_IP4_MODE_DATA               *Ip4ModeData;\r
-  EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData;\r
-  EFI_SIMPLE_NETWORK_MODE         *SnpModeData;\r
+  EFI_TCP4_CONNECTION_STATE          *Tcp4State;\r
+  EFI_TCP4_CONFIG_DATA               *Tcp4ConfigData;\r
+  EFI_IP4_MODE_DATA                  *Ip4ModeData;\r
+  EFI_MANAGED_NETWORK_CONFIG_DATA    *MnpConfigData;\r
+  EFI_SIMPLE_NETWORK_MODE            *SnpModeData;\r
 } TCP4_MODE_DATA;\r
 \r
 typedef struct _TCP6_MODE_DATA {\r
-  EFI_TCP6_CONNECTION_STATE       *Tcp6State;\r
-  EFI_TCP6_CONFIG_DATA            *Tcp6ConfigData;\r
-  EFI_IP6_MODE_DATA               *Ip6ModeData;\r
-  EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData;\r
-  EFI_SIMPLE_NETWORK_MODE         *SnpModeData;\r
+  EFI_TCP6_CONNECTION_STATE          *Tcp6State;\r
+  EFI_TCP6_CONFIG_DATA               *Tcp6ConfigData;\r
+  EFI_IP6_MODE_DATA                  *Ip6ModeData;\r
+  EFI_MANAGED_NETWORK_CONFIG_DATA    *MnpConfigData;\r
+  EFI_SIMPLE_NETWORK_MODE            *SnpModeData;\r
 } TCP6_MODE_DATA;\r
 \r
 typedef struct _TCP4_ROUTE_INFO {\r
-  BOOLEAN           DeleteRoute;\r
-  EFI_IPv4_ADDRESS  *SubnetAddress;\r
-  EFI_IPv4_ADDRESS  *SubnetMask;\r
-  EFI_IPv4_ADDRESS  *GatewayAddress;\r
+  BOOLEAN             DeleteRoute;\r
+  EFI_IPv4_ADDRESS    *SubnetAddress;\r
+  EFI_IPv4_ADDRESS    *SubnetMask;\r
+  EFI_IPv4_ADDRESS    *GatewayAddress;\r
 } TCP4_ROUTE_INFO;\r
 \r
 typedef struct {\r
-  EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
-  UINTN                         NumberOfChildren;\r
-  EFI_HANDLE                    *ChildHandleBuffer;\r
+  EFI_SERVICE_BINDING_PROTOCOL    *ServiceBinding;\r
+  UINTN                           NumberOfChildren;\r
+  EFI_HANDLE                      *ChildHandleBuffer;\r
 } TCP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT;\r
 \r
 //\r
@@ -122,12 +122,12 @@ typedef struct {
 EFI_STATUS\r
 EFIAPI\r
 Tcp4GetModeData (\r
-  IN   EFI_TCP4_PROTOCOL                  *This,\r
-  OUT  EFI_TCP4_CONNECTION_STATE          *Tcp4State      OPTIONAL,\r
-  OUT  EFI_TCP4_CONFIG_DATA               *Tcp4ConfigData OPTIONAL,\r
-  OUT  EFI_IP4_MODE_DATA                  *Ip4ModeData    OPTIONAL,\r
-  OUT  EFI_MANAGED_NETWORK_CONFIG_DATA    *MnpConfigData  OPTIONAL,\r
-  OUT  EFI_SIMPLE_NETWORK_MODE            *SnpModeData    OPTIONAL\r
+  IN   EFI_TCP4_PROTOCOL                *This,\r
+  OUT  EFI_TCP4_CONNECTION_STATE        *Tcp4State      OPTIONAL,\r
+  OUT  EFI_TCP4_CONFIG_DATA             *Tcp4ConfigData OPTIONAL,\r
+  OUT  EFI_IP4_MODE_DATA                *Ip4ModeData    OPTIONAL,\r
+  OUT  EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData  OPTIONAL,\r
+  OUT  EFI_SIMPLE_NETWORK_MODE          *SnpModeData    OPTIONAL\r
   );\r
 \r
 /**\r
@@ -155,8 +155,8 @@ Tcp4GetModeData (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4Configure (\r
-  IN EFI_TCP4_PROTOCOL        * This,\r
-  IN EFI_TCP4_CONFIG_DATA     * TcpConfigData OPTIONAL\r
+  IN EFI_TCP4_PROTOCOL     *This,\r
+  IN EFI_TCP4_CONFIG_DATA  *TcpConfigData OPTIONAL\r
   );\r
 \r
 /**\r
@@ -187,11 +187,11 @@ Tcp4Configure (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4Routes (\r
-  IN EFI_TCP4_PROTOCOL           *This,\r
-  IN BOOLEAN                     DeleteRoute,\r
-  IN EFI_IPv4_ADDRESS            *SubnetAddress,\r
-  IN EFI_IPv4_ADDRESS            *SubnetMask,\r
-  IN EFI_IPv4_ADDRESS            *GatewayAddress\r
+  IN EFI_TCP4_PROTOCOL  *This,\r
+  IN BOOLEAN            DeleteRoute,\r
+  IN EFI_IPv4_ADDRESS   *SubnetAddress,\r
+  IN EFI_IPv4_ADDRESS   *SubnetMask,\r
+  IN EFI_IPv4_ADDRESS   *GatewayAddress\r
   );\r
 \r
 /**\r
@@ -216,8 +216,8 @@ Tcp4Routes (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4Connect (\r
-  IN EFI_TCP4_PROTOCOL           *This,\r
-  IN EFI_TCP4_CONNECTION_TOKEN   *ConnectionToken\r
+  IN EFI_TCP4_PROTOCOL          *This,\r
+  IN EFI_TCP4_CONNECTION_TOKEN  *ConnectionToken\r
   );\r
 \r
 /**\r
@@ -243,8 +243,8 @@ Tcp4Connect (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4Accept (\r
-  IN EFI_TCP4_PROTOCOL             *This,\r
-  IN EFI_TCP4_LISTEN_TOKEN         *ListenToken\r
+  IN EFI_TCP4_PROTOCOL      *This,\r
+  IN EFI_TCP4_LISTEN_TOKEN  *ListenToken\r
   );\r
 \r
 /**\r
@@ -279,8 +279,8 @@ Tcp4Accept (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4Transmit (\r
-  IN EFI_TCP4_PROTOCOL            *This,\r
-  IN EFI_TCP4_IO_TOKEN            *Token\r
+  IN EFI_TCP4_PROTOCOL  *This,\r
+  IN EFI_TCP4_IO_TOKEN  *Token\r
   );\r
 \r
 /**\r
@@ -317,8 +317,8 @@ Tcp4Transmit (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4Receive (\r
-  IN EFI_TCP4_PROTOCOL           *This,\r
-  IN EFI_TCP4_IO_TOKEN           *Token\r
+  IN EFI_TCP4_PROTOCOL  *This,\r
+  IN EFI_TCP4_IO_TOKEN  *Token\r
   );\r
 \r
 /**\r
@@ -346,8 +346,8 @@ Tcp4Receive (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4Close (\r
-  IN EFI_TCP4_PROTOCOL           *This,\r
-  IN EFI_TCP4_CLOSE_TOKEN        *CloseToken\r
+  IN EFI_TCP4_PROTOCOL     *This,\r
+  IN EFI_TCP4_CLOSE_TOKEN  *CloseToken\r
   );\r
 \r
 /**\r
@@ -377,8 +377,8 @@ Tcp4Close (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4Cancel (\r
-  IN EFI_TCP4_PROTOCOL             *This,\r
-  IN EFI_TCP4_COMPLETION_TOKEN     *Token OPTIONAL\r
+  IN EFI_TCP4_PROTOCOL          *This,\r
+  IN EFI_TCP4_COMPLETION_TOKEN  *Token OPTIONAL\r
   );\r
 \r
 /**\r
@@ -398,7 +398,7 @@ Tcp4Cancel (
 EFI_STATUS\r
 EFIAPI\r
 Tcp4Poll (\r
-  IN EFI_TCP4_PROTOCOL        *This\r
+  IN EFI_TCP4_PROTOCOL  *This\r
   );\r
 \r
 //\r
@@ -436,12 +436,12 @@ Tcp4Poll (
 EFI_STATUS\r
 EFIAPI\r
 Tcp6GetModeData (\r
-  IN  EFI_TCP6_PROTOCOL                  *This,\r
-  OUT EFI_TCP6_CONNECTION_STATE          *Tcp6State      OPTIONAL,\r
-  OUT EFI_TCP6_CONFIG_DATA               *Tcp6ConfigData OPTIONAL,\r
-  OUT EFI_IP6_MODE_DATA                  *Ip6ModeData    OPTIONAL,\r
-  OUT EFI_MANAGED_NETWORK_CONFIG_DATA    *MnpConfigData  OPTIONAL,\r
-  OUT EFI_SIMPLE_NETWORK_MODE            *SnpModeData    OPTIONAL\r
+  IN  EFI_TCP6_PROTOCOL                *This,\r
+  OUT EFI_TCP6_CONNECTION_STATE        *Tcp6State      OPTIONAL,\r
+  OUT EFI_TCP6_CONFIG_DATA             *Tcp6ConfigData OPTIONAL,\r
+  OUT EFI_IP6_MODE_DATA                *Ip6ModeData    OPTIONAL,\r
+  OUT EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData  OPTIONAL,\r
+  OUT EFI_SIMPLE_NETWORK_MODE          *SnpModeData    OPTIONAL\r
   );\r
 \r
 /**\r
@@ -494,8 +494,8 @@ Tcp6GetModeData (
 EFI_STATUS\r
 EFIAPI\r
 Tcp6Configure (\r
-  IN EFI_TCP6_PROTOCOL        *This,\r
-  IN EFI_TCP6_CONFIG_DATA     *Tcp6ConfigData OPTIONAL\r
+  IN EFI_TCP6_PROTOCOL     *This,\r
+  IN EFI_TCP6_CONFIG_DATA  *Tcp6ConfigData OPTIONAL\r
   );\r
 \r
 /**\r
@@ -531,8 +531,8 @@ Tcp6Configure (
 EFI_STATUS\r
 EFIAPI\r
 Tcp6Connect (\r
-  IN EFI_TCP6_PROTOCOL           *This,\r
-  IN EFI_TCP6_CONNECTION_TOKEN   *ConnectionToken\r
+  IN EFI_TCP6_PROTOCOL          *This,\r
+  IN EFI_TCP6_CONNECTION_TOKEN  *ConnectionToken\r
   );\r
 \r
 /**\r
@@ -574,8 +574,8 @@ Tcp6Connect (
 EFI_STATUS\r
 EFIAPI\r
 Tcp6Accept (\r
-  IN EFI_TCP6_PROTOCOL             *This,\r
-  IN EFI_TCP6_LISTEN_TOKEN         *ListenToken\r
+  IN EFI_TCP6_PROTOCOL      *This,\r
+  IN EFI_TCP6_LISTEN_TOKEN  *ListenToken\r
   );\r
 \r
 /**\r
@@ -618,8 +618,8 @@ Tcp6Accept (
 EFI_STATUS\r
 EFIAPI\r
 Tcp6Transmit (\r
-  IN EFI_TCP6_PROTOCOL            *This,\r
-  IN EFI_TCP6_IO_TOKEN            *Token\r
+  IN EFI_TCP6_PROTOCOL  *This,\r
+  IN EFI_TCP6_IO_TOKEN  *Token\r
   );\r
 \r
 /**\r
@@ -671,8 +671,8 @@ Tcp6Transmit (
 EFI_STATUS\r
 EFIAPI\r
 Tcp6Receive (\r
-  IN EFI_TCP6_PROTOCOL           *This,\r
-  IN EFI_TCP6_IO_TOKEN           *Token\r
+  IN EFI_TCP6_PROTOCOL  *This,\r
+  IN EFI_TCP6_IO_TOKEN  *Token\r
   );\r
 \r
 /**\r
@@ -705,8 +705,8 @@ Tcp6Receive (
 EFI_STATUS\r
 EFIAPI\r
 Tcp6Close (\r
-  IN EFI_TCP6_PROTOCOL           *This,\r
-  IN EFI_TCP6_CLOSE_TOKEN        *CloseToken\r
+  IN EFI_TCP6_PROTOCOL     *This,\r
+  IN EFI_TCP6_CLOSE_TOKEN  *CloseToken\r
   );\r
 \r
 /**\r
@@ -747,8 +747,8 @@ Tcp6Close (
 EFI_STATUS\r
 EFIAPI\r
 Tcp6Cancel (\r
-  IN EFI_TCP6_PROTOCOL           *This,\r
-  IN EFI_TCP6_COMPLETION_TOKEN   *Token OPTIONAL\r
+  IN EFI_TCP6_PROTOCOL          *This,\r
+  IN EFI_TCP6_COMPLETION_TOKEN  *Token OPTIONAL\r
   );\r
 \r
 /**\r
@@ -771,7 +771,7 @@ Tcp6Cancel (
 EFI_STATUS\r
 EFIAPI\r
 Tcp6Poll (\r
-  IN EFI_TCP6_PROTOCOL        *This\r
+  IN EFI_TCP6_PROTOCOL  *This\r
   );\r
 \r
 #endif\r
index c454efefe3c78f7f4cc3b65e58bbe2c73db322a3..c93212d47dedff948bde71f9d0d826a125e8b8f8 100644 (file)
 \r
 #include "TcpMain.h"\r
 \r
-LIST_ENTRY      mTcpRunQue = {\r
+LIST_ENTRY  mTcpRunQue = {\r
   &mTcpRunQue,\r
   &mTcpRunQue\r
 };\r
 \r
-LIST_ENTRY      mTcpListenQue = {\r
+LIST_ENTRY  mTcpListenQue = {\r
   &mTcpListenQue,\r
   &mTcpListenQue\r
 };\r
 \r
-TCP_SEQNO       mTcpGlobalIss = TCP_BASE_ISS;\r
+TCP_SEQNO  mTcpGlobalIss = TCP_BASE_ISS;\r
 \r
-CHAR16          *mTcpStateName[] = {\r
+CHAR16  *mTcpStateName[] = {\r
   L"TCP_CLOSED",\r
   L"TCP_LISTEN",\r
   L"TCP_SYN_SENT",\r
@@ -36,7 +36,6 @@ CHAR16          *mTcpStateName[] = {
   L"TCP_LAST_ACK"\r
 };\r
 \r
-\r
 /**\r
   Initialize the Tcb local related members.\r
 \r
@@ -45,7 +44,7 @@ CHAR16          *mTcpStateName[] = {
 **/\r
 VOID\r
 TcpInitTcbLocal (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
   //\r
@@ -53,18 +52,18 @@ TcpInitTcbLocal (
   //\r
   if (Tcb->Sk->IpVersion == IP_VERSION_4) {\r
     Tcb->HeadSum = NetPseudoHeadChecksum (\r
-                    Tcb->LocalEnd.Ip.Addr[0],\r
-                    Tcb->RemoteEnd.Ip.Addr[0],\r
-                    0x06,\r
-                    0\r
-                    );\r
+                     Tcb->LocalEnd.Ip.Addr[0],\r
+                     Tcb->RemoteEnd.Ip.Addr[0],\r
+                     0x06,\r
+                     0\r
+                     );\r
   } else {\r
     Tcb->HeadSum = NetIp6PseudoHeadChecksum (\r
-                    &Tcb->LocalEnd.Ip.v6,\r
-                    &Tcb->RemoteEnd.Ip.v6,\r
-                    0x06,\r
-                    0\r
-                    );\r
+                     &Tcb->LocalEnd.Ip.v6,\r
+                     &Tcb->RemoteEnd.Ip.v6,\r
+                     0x06,\r
+                     0\r
+                     );\r
   }\r
 \r
   Tcb->Iss    = TcpGetIss ();\r
@@ -79,7 +78,7 @@ TcpInitTcbLocal (
   //\r
   // First window size is never scaled\r
   //\r
-  Tcb->RcvWndScale  = 0;\r
+  Tcb->RcvWndScale   = 0;\r
   Tcb->RetxmitSeqMax = 0;\r
 \r
   Tcb->ProbeTimerOn = FALSE;\r
@@ -95,9 +94,9 @@ TcpInitTcbLocal (
 **/\r
 VOID\r
 TcpInitTcbPeer (\r
-  IN OUT TCP_CB     *Tcb,\r
-  IN     TCP_SEG    *Seg,\r
-  IN     TCP_OPTION *Opt\r
+  IN OUT TCP_CB      *Tcb,\r
+  IN     TCP_SEG     *Seg,\r
+  IN     TCP_OPTION  *Opt\r
   )\r
 {\r
   UINT16  RcvMss;\r
@@ -105,9 +104,9 @@ TcpInitTcbPeer (
   ASSERT ((Tcb != NULL) && (Seg != NULL) && (Opt != NULL));\r
   ASSERT (TCP_FLG_ON (Seg->Flag, TCP_FLG_SYN));\r
 \r
-  Tcb->SndWnd     = Seg->Wnd;\r
-  Tcb->SndWndMax  = Tcb->SndWnd;\r
-  Tcb->SndWl1     = Seg->Seq;\r
+  Tcb->SndWnd    = Seg->Wnd;\r
+  Tcb->SndWndMax = Tcb->SndWnd;\r
+  Tcb->SndWl1    = Seg->Seq;\r
 \r
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {\r
     Tcb->SndWl2 = Seg->Ack;\r
@@ -116,13 +115,12 @@ TcpInitTcbPeer (
   }\r
 \r
   if (TCP_FLG_ON (Opt->Flag, TCP_OPTION_RCVD_MSS)) {\r
-    Tcb->SndMss = (UINT16) MAX (64, Opt->Mss);\r
+    Tcb->SndMss = (UINT16)MAX (64, Opt->Mss);\r
 \r
-    RcvMss      = TcpGetRcvMss (Tcb->Sk);\r
+    RcvMss = TcpGetRcvMss (Tcb->Sk);\r
     if (Tcb->SndMss > RcvMss) {\r
       Tcb->SndMss = RcvMss;\r
     }\r
-\r
   } else {\r
     //\r
     // One end doesn't support MSS option, use default.\r
@@ -130,7 +128,7 @@ TcpInitTcbPeer (
     Tcb->RcvMss = 536;\r
   }\r
 \r
-  Tcb->CWnd   = Tcb->SndMss;\r
+  Tcb->CWnd = Tcb->SndMss;\r
 \r
   Tcb->Irs    = Seg->Seq;\r
   Tcb->RcvNxt = Tcb->Irs + 1;\r
@@ -138,12 +136,10 @@ TcpInitTcbPeer (
   Tcb->RcvWl2 = Tcb->RcvNxt;\r
 \r
   if (TCP_FLG_ON (Opt->Flag, TCP_OPTION_RCVD_WS) && !TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_WS)) {\r
+    Tcb->SndWndScale = Opt->WndScale;\r
 \r
-    Tcb->SndWndScale  = Opt->WndScale;\r
-\r
-    Tcb->RcvWndScale  = TcpComputeScale (Tcb);\r
+    Tcb->RcvWndScale = TcpComputeScale (Tcb);\r
     TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_RCVD_WS);\r
-\r
   } else {\r
     //\r
     // One end doesn't support window scale option. use zero.\r
@@ -152,7 +148,6 @@ TcpInitTcbPeer (
   }\r
 \r
   if (TCP_FLG_ON (Opt->Flag, TCP_OPTION_RCVD_TS) && !TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_TS)) {\r
-\r
     TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_SND_TS);\r
     TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_RCVD_TS);\r
 \r
@@ -189,9 +184,9 @@ TcpIsIpEqual (
   ASSERT ((Version == IP_VERSION_4) || (Version == IP_VERSION_6));\r
 \r
   if (Version == IP_VERSION_4) {\r
-    return (BOOLEAN) (Ip1->Addr[0] == Ip2->Addr[0]);\r
+    return (BOOLEAN)(Ip1->Addr[0] == Ip2->Addr[0]);\r
   } else {\r
-    return (BOOLEAN) EFI_IP6_EQUAL (&Ip1->v6, &Ip2->v6);\r
+    return (BOOLEAN)EFI_IP6_EQUAL (&Ip1->v6, &Ip2->v6);\r
   }\r
 }\r
 \r
@@ -208,17 +203,17 @@ TcpIsIpEqual (
 **/\r
 BOOLEAN\r
 TcpIsIpZero (\r
-  IN EFI_IP_ADDRESS *Ip,\r
-  IN UINT8          Version\r
+  IN EFI_IP_ADDRESS  *Ip,\r
+  IN UINT8           Version\r
   )\r
 {\r
   ASSERT ((Version == IP_VERSION_4) || (Version == IP_VERSION_6));\r
 \r
   if (Version == IP_VERSION_4) {\r
-    return (BOOLEAN) (Ip->Addr[0] == 0);\r
+    return (BOOLEAN)(Ip->Addr[0] == 0);\r
   } else {\r
-    return (BOOLEAN) ((Ip->Addr[0] == 0) && (Ip->Addr[1] == 0) &&\r
-      (Ip->Addr[2] == 0) && (Ip->Addr[3] == 0));\r
+    return (BOOLEAN)((Ip->Addr[0] == 0) && (Ip->Addr[1] == 0) &&\r
+                     (Ip->Addr[2] == 0) && (Ip->Addr[3] == 0));\r
   }\r
 }\r
 \r
@@ -236,16 +231,16 @@ TcpIsIpZero (
 **/\r
 TCP_CB *\r
 TcpLocateListenTcb (\r
-  IN TCP_PEER    *Local,\r
-  IN TCP_PEER    *Remote,\r
-  IN UINT8       Version\r
+  IN TCP_PEER  *Local,\r
+  IN TCP_PEER  *Remote,\r
+  IN UINT8     Version\r
   )\r
 {\r
-  LIST_ENTRY      *Entry;\r
-  TCP_CB          *Node;\r
-  TCP_CB          *Match;\r
-  INTN            Last;\r
-  INTN            Cur;\r
+  LIST_ENTRY  *Entry;\r
+  TCP_CB      *Node;\r
+  TCP_CB      *Match;\r
+  INTN        Last;\r
+  INTN        Cur;\r
 \r
   Last  = 4;\r
   Match = NULL;\r
@@ -257,8 +252,8 @@ TcpLocateListenTcb (
         (Local->Port != Node->LocalEnd.Port) ||\r
         !TCP_PEER_MATCH (Remote, &Node->RemoteEnd, Version) ||\r
         !TCP_PEER_MATCH (Local, &Node->LocalEnd, Version)\r
-          ) {\r
-\r
+        )\r
+    {\r
       continue;\r
     }\r
 \r
@@ -311,9 +306,9 @@ TcpFindTcbByPeer (
   IN UINT8           Version\r
   )\r
 {\r
-  TCP_PORTNO      LocalPort;\r
-  LIST_ENTRY      *Entry;\r
-  TCP_CB          *Tcb;\r
+  TCP_PORTNO  LocalPort;\r
+  LIST_ENTRY  *Entry;\r
+  TCP_CB      *Tcb;\r
 \r
   ASSERT ((Addr != NULL) && (Port != 0));\r
 \r
@@ -323,10 +318,10 @@ TcpFindTcbByPeer (
     Tcb = NET_LIST_USER_STRUCT (Entry, TCP_CB, List);\r
 \r
     if ((Version == Tcb->Sk->IpVersion) &&\r
-      TcpIsIpEqual (Addr, &Tcb->LocalEnd.Ip, Version) &&\r
+        TcpIsIpEqual (Addr, &Tcb->LocalEnd.Ip, Version) &&\r
         (LocalPort == Tcb->LocalEnd.Port)\r
-        ) {\r
-\r
+        )\r
+    {\r
       return TRUE;\r
     }\r
   }\r
@@ -335,10 +330,10 @@ TcpFindTcbByPeer (
     Tcb = NET_LIST_USER_STRUCT (Entry, TCP_CB, List);\r
 \r
     if ((Version == Tcb->Sk->IpVersion) &&\r
-      TcpIsIpEqual (Addr, &Tcb->LocalEnd.Ip, Version) &&\r
+        TcpIsIpEqual (Addr, &Tcb->LocalEnd.Ip, Version) &&\r
         (LocalPort == Tcb->LocalEnd.Port)\r
-        ) {\r
-\r
+        )\r
+    {\r
       return TRUE;\r
     }\r
   }\r
@@ -370,10 +365,10 @@ TcpLocateTcb (
   IN BOOLEAN         Syn\r
   )\r
 {\r
-  TCP_PEER        Local;\r
-  TCP_PEER        Remote;\r
-  LIST_ENTRY      *Entry;\r
-  TCP_CB          *Tcb;\r
+  TCP_PEER    Local;\r
+  TCP_PEER    Remote;\r
+  LIST_ENTRY  *Entry;\r
+  TCP_CB      *Tcb;\r
 \r
   Local.Port  = LocalPort;\r
   Remote.Port = RemotePort;\r
@@ -390,8 +385,8 @@ TcpLocateTcb (
     if ((Version == Tcb->Sk->IpVersion) &&\r
         TCP_PEER_EQUAL (&Remote, &Tcb->RemoteEnd, Version) &&\r
         TCP_PEER_EQUAL (&Local, &Tcb->LocalEnd, Version)\r
-          ) {\r
-\r
+        )\r
+    {\r
       RemoveEntryList (&Tcb->List);\r
       InsertHeadList (&mTcpRunQue, &Tcb->List);\r
 \r
@@ -420,20 +415,20 @@ TcpLocateTcb (
 **/\r
 INTN\r
 TcpInsertTcb (\r
-  IN TCP_CB *Tcb\r
+  IN TCP_CB  *Tcb\r
   )\r
 {\r
-  LIST_ENTRY       *Entry;\r
-  LIST_ENTRY       *Head;\r
-  TCP_CB           *Node;\r
+  LIST_ENTRY  *Entry;\r
+  LIST_ENTRY  *Head;\r
+  TCP_CB      *Node;\r
 \r
   ASSERT (\r
     (Tcb != NULL) &&\r
     (\r
-    (Tcb->State == TCP_LISTEN) ||\r
-    (Tcb->State == TCP_SYN_SENT) ||\r
-    (Tcb->State == TCP_SYN_RCVD) ||\r
-    (Tcb->State == TCP_CLOSED)\r
+     (Tcb->State == TCP_LISTEN) ||\r
+     (Tcb->State == TCP_SYN_SENT) ||\r
+     (Tcb->State == TCP_SYN_RCVD) ||\r
+     (Tcb->State == TCP_CLOSED)\r
     )\r
     );\r
 \r
@@ -455,15 +450,14 @@ TcpInsertTcb (
 \r
     if (TCP_PEER_EQUAL (&Tcb->LocalEnd, &Node->LocalEnd, Tcb->Sk->IpVersion) &&\r
         TCP_PEER_EQUAL (&Tcb->RemoteEnd, &Node->RemoteEnd, Tcb->Sk->IpVersion)\r
-          ) {\r
-\r
+        )\r
+    {\r
       return -1;\r
     }\r
   }\r
 \r
   InsertHeadList (Head, &Tcb->List);\r
 \r
-\r
   return 0;\r
 }\r
 \r
@@ -477,10 +471,10 @@ TcpInsertTcb (
 **/\r
 TCP_CB *\r
 TcpCloneTcb (\r
-  IN TCP_CB *Tcb\r
+  IN TCP_CB  *Tcb\r
   )\r
 {\r
-  TCP_CB             *Clone;\r
+  TCP_CB  *Clone;\r
 \r
   Clone = AllocateZeroPool (sizeof (TCP_CB));\r
 \r
@@ -506,7 +500,7 @@ TcpCloneTcb (
     return NULL;\r
   }\r
 \r
-  ((TCP_PROTO_DATA *) (Clone->Sk->ProtoReserved))->TcpPcb = Clone;\r
+  ((TCP_PROTO_DATA *)(Clone->Sk->ProtoReserved))->TcpPcb = Clone;\r
 \r
   return Clone;\r
 }\r
@@ -539,25 +533,25 @@ TcpGetRcvMss (
   IN SOCKET  *Sock\r
   )\r
 {\r
-  EFI_IP4_MODE_DATA      Ip4Mode;\r
-  EFI_IP6_MODE_DATA      Ip6Mode;\r
-  EFI_IP4_PROTOCOL       *Ip4;\r
-  EFI_IP6_PROTOCOL       *Ip6;\r
-  TCP_PROTO_DATA         *TcpProto;\r
+  EFI_IP4_MODE_DATA  Ip4Mode;\r
+  EFI_IP6_MODE_DATA  Ip6Mode;\r
+  EFI_IP4_PROTOCOL   *Ip4;\r
+  EFI_IP6_PROTOCOL   *Ip6;\r
+  TCP_PROTO_DATA     *TcpProto;\r
 \r
   ASSERT (Sock != NULL);\r
 \r
   ZeroMem (&Ip4Mode, sizeof (EFI_IP4_MODE_DATA));\r
   ZeroMem (&Ip6Mode, sizeof (EFI_IP6_MODE_DATA));\r
 \r
-  TcpProto = (TCP_PROTO_DATA *) Sock->ProtoReserved;\r
+  TcpProto = (TCP_PROTO_DATA *)Sock->ProtoReserved;\r
 \r
   if (Sock->IpVersion == IP_VERSION_4) {\r
     Ip4 = TcpProto->TcpService->IpIo->Ip.Ip4;\r
     ASSERT (Ip4 != NULL);\r
     Ip4->GetModeData (Ip4, &Ip4Mode, NULL, NULL);\r
 \r
-    return (UINT16) (Ip4Mode.MaxPacketSize - sizeof (TCP_HEAD));\r
+    return (UINT16)(Ip4Mode.MaxPacketSize - sizeof (TCP_HEAD));\r
   } else {\r
     Ip6 = TcpProto->TcpService->IpIo->Ip.Ip6;\r
     ASSERT (Ip6 != NULL);\r
@@ -587,7 +581,7 @@ TcpGetRcvMss (
       }\r
     }\r
 \r
-    return (UINT16) (Ip6Mode.MaxPacketSize - sizeof (TCP_HEAD));\r
+    return (UINT16)(Ip6Mode.MaxPacketSize - sizeof (TCP_HEAD));\r
   }\r
 }\r
 \r
@@ -600,8 +594,8 @@ TcpGetRcvMss (
 **/\r
 VOID\r
 TcpSetState (\r
-  IN TCP_CB *Tcb,\r
-  IN UINT8  State\r
+  IN TCP_CB  *Tcb,\r
+  IN UINT8   State\r
   )\r
 {\r
   ASSERT (Tcb->State < (sizeof (mTcpStateName) / sizeof (CHAR16 *)));\r
@@ -609,36 +603,36 @@ TcpSetState (
 \r
   DEBUG (\r
     (DEBUG_NET,\r
-    "Tcb (%p) state %s --> %s\n",\r
-    Tcb,\r
-    mTcpStateName[Tcb->State],\r
-    mTcpStateName[State])\r
+     "Tcb (%p) state %s --> %s\n",\r
+     Tcb,\r
+     mTcpStateName[Tcb->State],\r
+     mTcpStateName[State])\r
     );\r
 \r
   Tcb->State = State;\r
 \r
   switch (State) {\r
-  case TCP_ESTABLISHED:\r
+    case TCP_ESTABLISHED:\r
 \r
-    SockConnEstablished (Tcb->Sk);\r
+      SockConnEstablished (Tcb->Sk);\r
 \r
-    if (Tcb->Parent != NULL) {\r
-      //\r
-      // A new connection is accepted by a listening socket. Install\r
-      // the device path.\r
-      //\r
-      TcpInstallDevicePath (Tcb->Sk);\r
-    }\r
+      if (Tcb->Parent != NULL) {\r
+        //\r
+        // A new connection is accepted by a listening socket. Install\r
+        // the device path.\r
+        //\r
+        TcpInstallDevicePath (Tcb->Sk);\r
+      }\r
 \r
-    break;\r
+      break;\r
 \r
-  case TCP_CLOSED:\r
+    case TCP_CLOSED:\r
 \r
-    SockConnClosed (Tcb->Sk);\r
+      SockConnClosed (Tcb->Sk);\r
 \r
-    break;\r
-  default:\r
-    break;\r
+      break;\r
+    default:\r
+      break;\r
   }\r
 }\r
 \r
@@ -653,21 +647,21 @@ TcpSetState (
 **/\r
 UINT16\r
 TcpChecksum (\r
-  IN NET_BUF *Nbuf,\r
-  IN UINT16  HeadSum\r
+  IN NET_BUF  *Nbuf,\r
+  IN UINT16   HeadSum\r
   )\r
 {\r
   UINT16  Checksum;\r
 \r
-  Checksum  = NetbufChecksum (Nbuf);\r
-  Checksum  = NetAddChecksum (Checksum, HeadSum);\r
+  Checksum = NetbufChecksum (Nbuf);\r
+  Checksum = NetAddChecksum (Checksum, HeadSum);\r
 \r
   Checksum = NetAddChecksum (\r
-              Checksum,\r
-              HTONS ((UINT16) Nbuf->TotalSize)\r
-              );\r
+               Checksum,\r
+               HTONS ((UINT16)Nbuf->TotalSize)\r
+               );\r
 \r
-  return (UINT16) (~Checksum);\r
+  return (UINT16)(~Checksum);\r
 }\r
 \r
 /**\r
@@ -682,22 +676,22 @@ TcpChecksum (
 **/\r
 TCP_SEG *\r
 TcpFormatNetbuf (\r
-  IN     TCP_CB  *Tcb,\r
-  IN OUT NET_BUF *Nbuf\r
+  IN     TCP_CB   *Tcb,\r
+  IN OUT NET_BUF  *Nbuf\r
   )\r
 {\r
   TCP_SEG   *Seg;\r
   TCP_HEAD  *Head;\r
 \r
-  Seg       = TCPSEG_NETBUF (Nbuf);\r
-  Head      = (TCP_HEAD *) NetbufGetByte (Nbuf, 0, NULL);\r
+  Seg  = TCPSEG_NETBUF (Nbuf);\r
+  Head = (TCP_HEAD *)NetbufGetByte (Nbuf, 0, NULL);\r
   ASSERT (Head != NULL);\r
 \r
   Nbuf->Tcp = Head;\r
 \r
-  Seg->Seq  = NTOHL (Head->Seq);\r
-  Seg->Ack  = NTOHL (Head->Ack);\r
-  Seg->End  = Seg->Seq + (Nbuf->TotalSize - (Head->HeadLen << 2));\r
+  Seg->Seq = NTOHL (Head->Seq);\r
+  Seg->Ack = NTOHL (Head->Ack);\r
+  Seg->End = Seg->Seq + (Nbuf->TotalSize - (Head->HeadLen << 2));\r
 \r
   Seg->Urg  = NTOHS (Head->Urg);\r
   Seg->Wnd  = (NTOHS (Head->Wnd) << Tcb->SndWndScale);\r
@@ -749,17 +743,16 @@ TcpOnAppConnect (
 **/\r
 VOID\r
 TcpOnAppClose (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
   ASSERT (Tcb != NULL);\r
 \r
-  if (!IsListEmpty (&Tcb->RcvQue) || GET_RCV_DATASIZE (Tcb->Sk) != 0) {\r
-\r
+  if (!IsListEmpty (&Tcb->RcvQue) || (GET_RCV_DATASIZE (Tcb->Sk) != 0)) {\r
     DEBUG (\r
       (DEBUG_WARN,\r
-      "TcpOnAppClose: connection reset because data is lost for TCB %p\n",\r
-      Tcb)\r
+       "TcpOnAppClose: connection reset because data is lost for TCB %p\n",\r
+       Tcb)\r
       );\r
 \r
     TcpResetConnection (Tcb);\r
@@ -768,22 +761,22 @@ TcpOnAppClose (
   }\r
 \r
   switch (Tcb->State) {\r
-  case TCP_CLOSED:\r
-  case TCP_LISTEN:\r
-  case TCP_SYN_SENT:\r
-    TcpSetState (Tcb, TCP_CLOSED);\r
-    break;\r
-\r
-  case TCP_SYN_RCVD:\r
-  case TCP_ESTABLISHED:\r
-    TcpSetState (Tcb, TCP_FIN_WAIT_1);\r
-    break;\r
-\r
-  case TCP_CLOSE_WAIT:\r
-    TcpSetState (Tcb, TCP_LAST_ACK);\r
-    break;\r
-  default:\r
-    break;\r
+    case TCP_CLOSED:\r
+    case TCP_LISTEN:\r
+    case TCP_SYN_SENT:\r
+      TcpSetState (Tcb, TCP_CLOSED);\r
+      break;\r
+\r
+    case TCP_SYN_RCVD:\r
+    case TCP_ESTABLISHED:\r
+      TcpSetState (Tcb, TCP_FIN_WAIT_1);\r
+      break;\r
+\r
+    case TCP_CLOSE_WAIT:\r
+      TcpSetState (Tcb, TCP_LAST_ACK);\r
+      break;\r
+    default:\r
+      break;\r
   }\r
 \r
   TcpToSendData (Tcb, 1);\r
@@ -801,35 +794,34 @@ TcpOnAppClose (
 **/\r
 INTN\r
 TcpOnAppSend (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
-\r
   switch (Tcb->State) {\r
-  case TCP_CLOSED:\r
-    return -1;\r
+    case TCP_CLOSED:\r
+      return -1;\r
 \r
-  case TCP_LISTEN:\r
-    return -1;\r
+    case TCP_LISTEN:\r
+      return -1;\r
 \r
-  case TCP_SYN_SENT:\r
-  case TCP_SYN_RCVD:\r
-    return 0;\r
+    case TCP_SYN_SENT:\r
+    case TCP_SYN_RCVD:\r
+      return 0;\r
 \r
-  case TCP_ESTABLISHED:\r
-  case TCP_CLOSE_WAIT:\r
-    TcpToSendData (Tcb, 0);\r
-    return 0;\r
+    case TCP_ESTABLISHED:\r
+    case TCP_CLOSE_WAIT:\r
+      TcpToSendData (Tcb, 0);\r
+      return 0;\r
 \r
-  case TCP_FIN_WAIT_1:\r
-  case TCP_FIN_WAIT_2:\r
-  case TCP_CLOSING:\r
-  case TCP_LAST_ACK:\r
-  case TCP_TIME_WAIT:\r
-    return -1;\r
+    case TCP_FIN_WAIT_1:\r
+    case TCP_FIN_WAIT_2:\r
+    case TCP_CLOSING:\r
+    case TCP_LAST_ACK:\r
+    case TCP_TIME_WAIT:\r
+      return -1;\r
 \r
-  default:\r
-    break;\r
+    default:\r
+      break;\r
   }\r
 \r
   return 0;\r
@@ -844,41 +836,38 @@ TcpOnAppSend (
 **/\r
 VOID\r
 TcpOnAppConsume (\r
-  IN TCP_CB *Tcb\r
+  IN TCP_CB  *Tcb\r
   )\r
 {\r
-  UINT32 TcpOld;\r
+  UINT32  TcpOld;\r
 \r
   switch (Tcb->State) {\r
-  case TCP_ESTABLISHED:\r
-    TcpOld = TcpRcvWinOld (Tcb);\r
-    if (TcpRcvWinNow (Tcb) > TcpOld) {\r
-\r
-      if (TcpOld < Tcb->RcvMss) {\r
-\r
-        DEBUG (\r
-          (DEBUG_NET,\r
-          "TcpOnAppConsume: send a window update for a window closed Tcb %p\n",\r
-          Tcb)\r
-          );\r
-\r
-        TcpSendAck (Tcb);\r
-      } else if (Tcb->DelayedAck == 0) {\r
-\r
-        DEBUG (\r
-          (DEBUG_NET,\r
-          "TcpOnAppConsume: scheduled a delayed ACK to update window for Tcb %p\n",\r
-          Tcb)\r
-          );\r
-\r
-        Tcb->DelayedAck = 1;\r
+    case TCP_ESTABLISHED:\r
+      TcpOld = TcpRcvWinOld (Tcb);\r
+      if (TcpRcvWinNow (Tcb) > TcpOld) {\r
+        if (TcpOld < Tcb->RcvMss) {\r
+          DEBUG (\r
+            (DEBUG_NET,\r
+             "TcpOnAppConsume: send a window update for a window closed Tcb %p\n",\r
+             Tcb)\r
+            );\r
+\r
+          TcpSendAck (Tcb);\r
+        } else if (Tcb->DelayedAck == 0) {\r
+          DEBUG (\r
+            (DEBUG_NET,\r
+             "TcpOnAppConsume: scheduled a delayed ACK to update window for Tcb %p\n",\r
+             Tcb)\r
+            );\r
+\r
+          Tcb->DelayedAck = 1;\r
+        }\r
       }\r
-    }\r
 \r
-    break;\r
+      break;\r
 \r
-  default:\r
-    break;\r
+    default:\r
+      break;\r
   }\r
 }\r
 \r
@@ -891,25 +880,25 @@ TcpOnAppConsume (
 **/\r
 VOID\r
 TcpOnAppAbort (\r
-  IN TCP_CB *Tcb\r
+  IN TCP_CB  *Tcb\r
   )\r
 {\r
   DEBUG (\r
     (DEBUG_WARN,\r
-    "TcpOnAppAbort: connection reset issued by application for TCB %p\n",\r
-    Tcb)\r
+     "TcpOnAppAbort: connection reset issued by application for TCB %p\n",\r
+     Tcb)\r
     );\r
 \r
   switch (Tcb->State) {\r
-  case TCP_SYN_RCVD:\r
-  case TCP_ESTABLISHED:\r
-  case TCP_FIN_WAIT_1:\r
-  case TCP_FIN_WAIT_2:\r
-  case TCP_CLOSE_WAIT:\r
-    TcpResetConnection (Tcb);\r
-    break;\r
-  default:\r
-    break;\r
+    case TCP_SYN_RCVD:\r
+    case TCP_ESTABLISHED:\r
+    case TCP_FIN_WAIT_1:\r
+    case TCP_FIN_WAIT_2:\r
+    case TCP_CLOSE_WAIT:\r
+      TcpResetConnection (Tcb);\r
+      break;\r
+    default:\r
+      break;\r
   }\r
 \r
   TcpSetState (Tcb, TCP_CLOSED);\r
@@ -923,7 +912,7 @@ TcpOnAppAbort (
 **/\r
 VOID\r
 TcpResetConnection (\r
-  IN TCP_CB *Tcb\r
+  IN TCP_CB  *Tcb\r
   )\r
 {\r
   NET_BUF   *Nbuf;\r
@@ -932,10 +921,10 @@ TcpResetConnection (
   Nbuf = NetbufAlloc (TCP_MAX_HEAD);\r
 \r
   if (Nbuf == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
-  Nhead = (TCP_HEAD *) NetbufAllocSpace (\r
+  Nhead = (TCP_HEAD *)NetbufAllocSpace (\r
                         Nbuf,\r
                         sizeof (TCP_HEAD),\r
                         NET_BUF_TAIL\r
@@ -943,14 +932,14 @@ TcpResetConnection (
 \r
   ASSERT (Nhead != NULL);\r
 \r
-  Nbuf->Tcp       = Nhead;\r
+  Nbuf->Tcp = Nhead;\r
 \r
   Nhead->Flag     = TCP_FLG_RST;\r
   Nhead->Seq      = HTONL (Tcb->SndNxt);\r
   Nhead->Ack      = HTONL (Tcb->RcvNxt);\r
   Nhead->SrcPort  = Tcb->LocalEnd.Port;\r
   Nhead->DstPort  = Tcb->RemoteEnd.Port;\r
-  Nhead->HeadLen  = (UINT8) (sizeof (TCP_HEAD) >> 2);\r
+  Nhead->HeadLen  = (UINT8)(sizeof (TCP_HEAD) >> 2);\r
   Nhead->Res      = 0;\r
   Nhead->Wnd      = HTONS (0xFFFF);\r
   Nhead->Checksum = 0;\r
@@ -973,24 +962,24 @@ TcpResetConnection (
 **/\r
 EFI_STATUS\r
 TcpInstallDevicePath (\r
-  IN SOCKET *Sock\r
+  IN SOCKET  *Sock\r
   )\r
 {\r
-  TCP_PROTO_DATA           *TcpProto;\r
-  TCP_SERVICE_DATA         *TcpService;\r
-  TCP_CB                   *Tcb;\r
-  IPv4_DEVICE_PATH         Ip4DPathNode;\r
-  IPv6_DEVICE_PATH         Ip6DPathNode;\r
-  EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
-  EFI_STATUS               Status;\r
-  TCP_PORTNO               LocalPort;\r
-  TCP_PORTNO               RemotePort;\r
-\r
-  TcpProto   = (TCP_PROTO_DATA *) Sock->ProtoReserved;\r
+  TCP_PROTO_DATA            *TcpProto;\r
+  TCP_SERVICE_DATA          *TcpService;\r
+  TCP_CB                    *Tcb;\r
+  IPv4_DEVICE_PATH          Ip4DPathNode;\r
+  IPv6_DEVICE_PATH          Ip6DPathNode;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
+  EFI_STATUS                Status;\r
+  TCP_PORTNO                LocalPort;\r
+  TCP_PORTNO                RemotePort;\r
+\r
+  TcpProto   = (TCP_PROTO_DATA *)Sock->ProtoReserved;\r
   TcpService = TcpProto->TcpService;\r
   Tcb        = TcpProto->TcpPcb;\r
 \r
-  LocalPort = NTOHS (Tcb->LocalEnd.Port);\r
+  LocalPort  = NTOHS (Tcb->LocalEnd.Port);\r
   RemotePort = NTOHS (Tcb->RemoteEnd.Port);\r
   if (Sock->IpVersion == IP_VERSION_4) {\r
     NetLibCreateIPv4DPathNode (\r
@@ -1006,7 +995,7 @@ TcpInstallDevicePath (
 \r
     IP4_COPY_ADDRESS (&Ip4DPathNode.SubnetMask, &Tcb->SubnetMask);\r
 \r
-    DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) &Ip4DPathNode;\r
+    DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)&Ip4DPathNode;\r
   } else {\r
     NetLibCreateIPv6DPathNode (\r
       &Ip6DPathNode,\r
@@ -1018,7 +1007,7 @@ TcpInstallDevicePath (
       EFI_IP_PROTO_TCP\r
       );\r
 \r
-    DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) &Ip6DPathNode;\r
+    DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)&Ip6DPathNode;\r
   }\r
 \r
   Sock->DevicePath = AppendDevicePathNode (Sock->ParentDevicePath, DevicePath);\r
index c5dbd620e8a0a8b55b95d670ab9c149d445ccf26..f0bb5a6b5172ee6d48851e8477c9f5d72724b7cc 100644 (file)
 **/\r
 UINT16\r
 TcpGetUint16 (\r
-  IN UINT8 *Buf\r
+  IN UINT8  *Buf\r
   )\r
 {\r
   UINT16  Value;\r
+\r
   CopyMem (&Value, Buf, sizeof (UINT16));\r
   return NTOHS (Value);\r
 }\r
@@ -37,10 +38,11 @@ TcpGetUint16 (
 **/\r
 UINT32\r
 TcpGetUint32 (\r
-  IN UINT8 *Buf\r
+  IN UINT8  *Buf\r
   )\r
 {\r
   UINT32  Value;\r
+\r
   CopyMem (&Value, Buf, sizeof (UINT32));\r
   return NTOHL (Value);\r
 }\r
@@ -54,8 +56,8 @@ TcpGetUint32 (
 **/\r
 VOID\r
 TcpPutUint32 (\r
-     OUT UINT8  *Buf,\r
-  IN     UINT32 Data\r
+  OUT UINT8      *Buf,\r
+  IN     UINT32  Data\r
   )\r
 {\r
   Data = HTONL (Data);\r
@@ -72,7 +74,7 @@ TcpPutUint32 (
 **/\r
 UINT8\r
 TcpComputeScale (\r
-  IN TCP_CB *Tcb\r
+  IN TCP_CB  *Tcb\r
   )\r
 {\r
   UINT8   Scale;\r
@@ -82,9 +84,8 @@ TcpComputeScale (
 \r
   BufSize = GET_RCV_BUFFSIZE (Tcb->Sk);\r
 \r
-  Scale   = 0;\r
-  while ((Scale < TCP_OPTION_MAX_WS) && ((UINT32) (TCP_OPTION_MAX_WIN << Scale) < BufSize)) {\r
-\r
+  Scale = 0;\r
+  while ((Scale < TCP_OPTION_MAX_WS) && ((UINT32)(TCP_OPTION_MAX_WIN << Scale) < BufSize)) {\r
     Scale++;\r
   }\r
 \r
@@ -102,8 +103,8 @@ TcpComputeScale (
 **/\r
 UINT16\r
 TcpSynBuildOption (\r
-  IN TCP_CB  *Tcb,\r
-  IN NET_BUF *Nbuf\r
+  IN TCP_CB   *Tcb,\r
+  IN NET_BUF  *Nbuf\r
   )\r
 {\r
   UINT8   *Data;\r
@@ -120,9 +121,9 @@ TcpSynBuildOption (
   //\r
   if (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_TS) &&\r
       (!TCP_FLG_ON (TCPSEG_NETBUF (Nbuf)->Flag, TCP_FLG_ACK) ||\r
-        TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RCVD_TS))\r
-      ) {\r
-\r
+       TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RCVD_TS))\r
+      )\r
+  {\r
     Data = NetbufAllocSpace (\r
              Nbuf,\r
              TCP_OPTION_TS_ALIGNED_LEN,\r
@@ -144,9 +145,9 @@ TcpSynBuildOption (
   //\r
   if (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_WS) &&\r
       (!TCP_FLG_ON (TCPSEG_NETBUF (Nbuf)->Flag, TCP_FLG_ACK) ||\r
-        TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RCVD_WS))\r
-      ) {\r
-\r
+       TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RCVD_WS))\r
+      )\r
+  {\r
     Data = NetbufAllocSpace (\r
              Nbuf,\r
              TCP_OPTION_WS_ALIGNED_LEN,\r
@@ -182,8 +183,8 @@ TcpSynBuildOption (
 **/\r
 UINT16\r
 TcpBuildOption (\r
-  IN TCP_CB  *Tcb,\r
-  IN NET_BUF *Nbuf\r
+  IN TCP_CB   *Tcb,\r
+  IN NET_BUF  *Nbuf\r
   )\r
 {\r
   UINT8   *Data;\r
@@ -197,13 +198,13 @@ TcpBuildOption (
   //\r
   if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_SND_TS) &&\r
       !TCP_FLG_ON (TCPSEG_NETBUF (Nbuf)->Flag, TCP_FLG_RST)\r
-      ) {\r
-\r
+      )\r
+  {\r
     Data = NetbufAllocSpace (\r
-            Nbuf,\r
-            TCP_OPTION_TS_ALIGNED_LEN,\r
-            NET_BUF_HEAD\r
-            );\r
+             Nbuf,\r
+             TCP_OPTION_TS_ALIGNED_LEN,\r
+             NET_BUF_HEAD\r
+             );\r
 \r
     ASSERT (Data != NULL);\r
     Len += TCP_OPTION_TS_ALIGNED_LEN;\r
@@ -229,38 +230,38 @@ TcpBuildOption (
 **/\r
 INTN\r
 TcpParseOption (\r
-  IN     TCP_HEAD   *Tcp,\r
-  IN OUT TCP_OPTION *Option\r
+  IN     TCP_HEAD    *Tcp,\r
+  IN OUT TCP_OPTION  *Option\r
   )\r
 {\r
-  UINT8 *Head;\r
-  UINT8 TotalLen;\r
-  UINT8 Cur;\r
-  UINT8 Type;\r
-  UINT8 Len;\r
+  UINT8  *Head;\r
+  UINT8  TotalLen;\r
+  UINT8  Cur;\r
+  UINT8  Type;\r
+  UINT8  Len;\r
 \r
   ASSERT ((Tcp != NULL) && (Option != NULL));\r
 \r
-  Option->Flag  = 0;\r
+  Option->Flag = 0;\r
 \r
-  TotalLen      = (UINT8) ((Tcp->HeadLen << 2) - sizeof (TCP_HEAD));\r
+  TotalLen = (UINT8)((Tcp->HeadLen << 2) - sizeof (TCP_HEAD));\r
   if (TotalLen <= 0) {\r
     return 0;\r
   }\r
 \r
-  Head = (UINT8 *) (Tcp + 1);\r
+  Head = (UINT8 *)(Tcp + 1);\r
 \r
   //\r
   // Fast process of the timestamp option.\r
   //\r
   if ((TotalLen == TCP_OPTION_TS_ALIGNED_LEN) && (TcpGetUint32 (Head) == TCP_OPTION_TS_FAST)) {\r
-\r
     Option->TSVal = TcpGetUint32 (Head + 4);\r
     Option->TSEcr = TcpGetUint32 (Head + 8);\r
     Option->Flag  = TCP_OPTION_RCVD_TS;\r
 \r
     return 0;\r
   }\r
+\r
   //\r
   // Slow path to process the options.\r
   //\r
@@ -270,68 +271,64 @@ TcpParseOption (
     Type = Head[Cur];\r
 \r
     switch (Type) {\r
-    case TCP_OPTION_MSS:\r
-      Len = Head[Cur + 1];\r
+      case TCP_OPTION_MSS:\r
+        Len = Head[Cur + 1];\r
 \r
-      if ((Len != TCP_OPTION_MSS_LEN) || (TotalLen - Cur < TCP_OPTION_MSS_LEN)) {\r
+        if ((Len != TCP_OPTION_MSS_LEN) || (TotalLen - Cur < TCP_OPTION_MSS_LEN)) {\r
+          return -1;\r
+        }\r
 \r
-        return -1;\r
-      }\r
+        Option->Mss = TcpGetUint16 (&Head[Cur + 2]);\r
+        TCP_SET_FLG (Option->Flag, TCP_OPTION_RCVD_MSS);\r
 \r
-      Option->Mss = TcpGetUint16 (&Head[Cur + 2]);\r
-      TCP_SET_FLG (Option->Flag, TCP_OPTION_RCVD_MSS);\r
+        Cur += TCP_OPTION_MSS_LEN;\r
+        break;\r
 \r
-      Cur += TCP_OPTION_MSS_LEN;\r
-      break;\r
+      case TCP_OPTION_WS:\r
+        Len = Head[Cur + 1];\r
 \r
-    case TCP_OPTION_WS:\r
-      Len = Head[Cur + 1];\r
+        if ((Len != TCP_OPTION_WS_LEN) || (TotalLen - Cur < TCP_OPTION_WS_LEN)) {\r
+          return -1;\r
+        }\r
 \r
-      if ((Len != TCP_OPTION_WS_LEN) || (TotalLen - Cur < TCP_OPTION_WS_LEN)) {\r
+        Option->WndScale = (UINT8)MIN (14, Head[Cur + 2]);\r
+        TCP_SET_FLG (Option->Flag, TCP_OPTION_RCVD_WS);\r
 \r
-        return -1;\r
-      }\r
+        Cur += TCP_OPTION_WS_LEN;\r
+        break;\r
 \r
-      Option->WndScale = (UINT8) MIN (14, Head[Cur + 2]);\r
-      TCP_SET_FLG (Option->Flag, TCP_OPTION_RCVD_WS);\r
+      case TCP_OPTION_TS:\r
+        Len = Head[Cur + 1];\r
 \r
-      Cur += TCP_OPTION_WS_LEN;\r
-      break;\r
+        if ((Len != TCP_OPTION_TS_LEN) || (TotalLen - Cur < TCP_OPTION_TS_LEN)) {\r
+          return -1;\r
+        }\r
 \r
-    case TCP_OPTION_TS:\r
-      Len = Head[Cur + 1];\r
+        Option->TSVal = TcpGetUint32 (&Head[Cur + 2]);\r
+        Option->TSEcr = TcpGetUint32 (&Head[Cur + 6]);\r
+        TCP_SET_FLG (Option->Flag, TCP_OPTION_RCVD_TS);\r
 \r
-      if ((Len != TCP_OPTION_TS_LEN) || (TotalLen - Cur < TCP_OPTION_TS_LEN)) {\r
+        Cur += TCP_OPTION_TS_LEN;\r
+        break;\r
 \r
-        return -1;\r
-      }\r
+      case TCP_OPTION_NOP:\r
+        Cur++;\r
+        break;\r
 \r
-      Option->TSVal = TcpGetUint32 (&Head[Cur + 2]);\r
-      Option->TSEcr = TcpGetUint32 (&Head[Cur + 6]);\r
-      TCP_SET_FLG (Option->Flag, TCP_OPTION_RCVD_TS);\r
+      case TCP_OPTION_EOP:\r
+        Cur = TotalLen;\r
+        break;\r
 \r
-      Cur += TCP_OPTION_TS_LEN;\r
-      break;\r
+      default:\r
+        Len = Head[Cur + 1];\r
 \r
-    case TCP_OPTION_NOP:\r
-      Cur++;\r
-      break;\r
+        if (((TotalLen - Cur) < Len) || (Len < 2)) {\r
+          return -1;\r
+        }\r
 \r
-    case TCP_OPTION_EOP:\r
-      Cur = TotalLen;\r
-      break;\r
-\r
-    default:\r
-      Len = Head[Cur + 1];\r
-\r
-      if ((TotalLen - Cur) < Len || Len < 2) {\r
-        return -1;\r
-      }\r
-\r
-      Cur = (UINT8) (Cur + Len);\r
-      break;\r
+        Cur = (UINT8)(Cur + Len);\r
+        break;\r
     }\r
-\r
   }\r
 \r
   return 0;\r
index 20a476ecebd66d5911d5d8f31d89f6b753daac57..bd7347a71f5009ca2a8e6d659d9fce21d797711e 100644 (file)
 // recommend format of timestamp window scale\r
 // option for fast process.\r
 //\r
-#define TCP_OPTION_TS_FAST ((TCP_OPTION_NOP << 24) | \\r
+#define TCP_OPTION_TS_FAST  ((TCP_OPTION_NOP << 24) |\\r
                             (TCP_OPTION_NOP << 16) | \\r
                             (TCP_OPTION_TS << 8)   | \\r
                             (TCP_OPTION_TS_LEN))\r
 \r
-#define TCP_OPTION_WS_FAST   ((TCP_OPTION_NOP << 24) | \\r
+#define TCP_OPTION_WS_FAST  ((TCP_OPTION_NOP << 24) |  \\r
                               (TCP_OPTION_WS << 16)  | \\r
                               (TCP_OPTION_WS_LEN << 8))\r
 \r
 //\r
 // Other misc definitions\r
 //\r
-#define TCP_OPTION_RCVD_MSS        0x01\r
-#define TCP_OPTION_RCVD_WS         0x02\r
-#define TCP_OPTION_RCVD_TS         0x04\r
-#define TCP_OPTION_MAX_WS          14      ///< Maximum window scale value\r
-#define TCP_OPTION_MAX_WIN         0xffff  ///< Max window size in TCP header\r
+#define TCP_OPTION_RCVD_MSS  0x01\r
+#define TCP_OPTION_RCVD_WS   0x02\r
+#define TCP_OPTION_RCVD_TS   0x04\r
+#define TCP_OPTION_MAX_WS    14            ///< Maximum window scale value\r
+#define TCP_OPTION_MAX_WIN   0xffff        ///< Max window size in TCP header\r
 \r
 ///\r
 /// The structure to store the parse option value.\r
 /// ParseOption only parses the options, doesn't process them.\r
 ///\r
 typedef struct _TCP_OPTION {\r
-  UINT8   Flag;     ///< Flag such as TCP_OPTION_RCVD_MSS\r
-  UINT8   WndScale; ///< The WndScale received\r
-  UINT16  Mss;      ///< The Mss received\r
-  UINT32  TSVal;    ///< The TSVal field in a timestamp option\r
-  UINT32  TSEcr;    ///< The TSEcr field in a timestamp option\r
+  UINT8     Flag;     ///< Flag such as TCP_OPTION_RCVD_MSS\r
+  UINT8     WndScale; ///< The WndScale received\r
+  UINT16    Mss;      ///< The Mss received\r
+  UINT32    TSVal;    ///< The TSVal field in a timestamp option\r
+  UINT32    TSEcr;    ///< The TSEcr field in a timestamp option\r
 } TCP_OPTION;\r
 \r
 /**\r
@@ -70,7 +70,7 @@ typedef struct _TCP_OPTION {
 **/\r
 UINT8\r
 TcpComputeScale (\r
-  IN TCP_CB *Tcb\r
+  IN TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -84,8 +84,8 @@ TcpComputeScale (
 **/\r
 UINT16\r
 TcpSynBuildOption (\r
-  IN TCP_CB  *Tcb,\r
-  IN NET_BUF *Nbuf\r
+  IN TCP_CB   *Tcb,\r
+  IN NET_BUF  *Nbuf\r
   );\r
 \r
 /**\r
@@ -99,8 +99,8 @@ TcpSynBuildOption (
 **/\r
 UINT16\r
 TcpBuildOption (\r
-  IN TCP_CB  *Tcb,\r
-  IN NET_BUF *Nbuf\r
+  IN TCP_CB   *Tcb,\r
+  IN NET_BUF  *Nbuf\r
   );\r
 \r
 /**\r
@@ -116,8 +116,8 @@ TcpBuildOption (
 **/\r
 INTN\r
 TcpParseOption (\r
-  IN     TCP_HEAD   *Tcp,\r
-  IN OUT TCP_OPTION *Option\r
+  IN     TCP_HEAD    *Tcp,\r
+  IN OUT TCP_OPTION  *Option\r
   );\r
 \r
 #endif\r
index 50ea9460adac6e5a19a312d465869b9022dbbabb..294c8956fe1b1696275597314728cdfc780771dc 100644 (file)
@@ -33,7 +33,7 @@ UINT8  mTcpOutFlag[] = {
 **/\r
 UINT32\r
 TcpRcvWinOld (\r
-  IN TCP_CB *Tcb\r
+  IN TCP_CB  *Tcb\r
   )\r
 {\r
   UINT32  OldWin;\r
@@ -41,11 +41,10 @@ TcpRcvWinOld (
   OldWin = 0;\r
 \r
   if (TCP_SEQ_GT (Tcb->RcvWl2 + Tcb->RcvWnd, Tcb->RcvNxt)) {\r
-\r
     OldWin = TCP_SUB_SEQ (\r
-              Tcb->RcvWl2 + Tcb->RcvWnd,\r
-              Tcb->RcvNxt\r
-              );\r
+               Tcb->RcvWl2 + Tcb->RcvWnd,\r
+               Tcb->RcvNxt\r
+               );\r
   }\r
 \r
   return OldWin;\r
@@ -61,7 +60,7 @@ TcpRcvWinOld (
 **/\r
 UINT32\r
 TcpRcvWinNow (\r
-  IN TCP_CB *Tcb\r
+  IN TCP_CB  *Tcb\r
   )\r
 {\r
   SOCKET  *Sk;\r
@@ -72,11 +71,11 @@ TcpRcvWinNow (
   Sk = Tcb->Sk;\r
   ASSERT (Sk != NULL);\r
 \r
-  OldWin    = TcpRcvWinOld (Tcb);\r
+  OldWin = TcpRcvWinOld (Tcb);\r
 \r
-  Win       = SockGetFreeSpace (Sk, SOCK_RCV_BUF);\r
+  Win = SockGetFreeSpace (Sk, SOCK_RCV_BUF);\r
 \r
-  Increase  = 0;\r
+  Increase = 0;\r
   if (Win > OldWin) {\r
     Increase = Win - OldWin;\r
   }\r
@@ -87,7 +86,6 @@ TcpRcvWinNow (
   // half of the receive buffer.\r
   //\r
   if ((Increase > Tcb->SndMss) || (2 * Increase >= GET_RCV_BUFFSIZE (Sk))) {\r
-\r
     return Win;\r
   }\r
 \r
@@ -106,8 +104,8 @@ TcpRcvWinNow (
 **/\r
 UINT16\r
 TcpComputeWnd (\r
-  IN OUT TCP_CB  *Tcb,\r
-  IN     BOOLEAN Syn\r
+  IN OUT TCP_CB   *Tcb,\r
+  IN     BOOLEAN  Syn\r
   )\r
 {\r
   UINT32  Wnd;\r
@@ -116,17 +114,15 @@ TcpComputeWnd (
   // RFC requires that initial window not be scaled\r
   //\r
   if (Syn) {\r
-\r
     Wnd = GET_RCV_BUFFSIZE (Tcb->Sk);\r
   } else {\r
-\r
-    Wnd         = TcpRcvWinNow (Tcb);\r
+    Wnd = TcpRcvWinNow (Tcb);\r
 \r
     Tcb->RcvWnd = Wnd;\r
   }\r
 \r
   Wnd = MIN (Wnd >> Tcb->RcvWndScale, 0xffff);\r
-  return NTOHS ((UINT16) Wnd);\r
+  return NTOHS ((UINT16)Wnd);\r
 }\r
 \r
 /**\r
@@ -139,11 +135,11 @@ TcpComputeWnd (
 **/\r
 TCP_SEQNO\r
 TcpGetMaxSndNxt (\r
-  IN TCP_CB *Tcb\r
+  IN TCP_CB  *Tcb\r
   )\r
 {\r
-  LIST_ENTRY      *Entry;\r
-  NET_BUF         *Nbuf;\r
+  LIST_ENTRY  *Entry;\r
+  NET_BUF     *Nbuf;\r
 \r
   if (IsListEmpty (&Tcb->SndQue)) {\r
     return Tcb->SndNxt;\r
@@ -168,8 +164,8 @@ TcpGetMaxSndNxt (
 **/\r
 UINT32\r
 TcpDataToSend (\r
-  IN TCP_CB *Tcb,\r
-  IN INTN   Force\r
+  IN TCP_CB  *Tcb,\r
+  IN INTN    Force\r
   )\r
 {\r
   SOCKET  *Sk;\r
@@ -192,7 +188,6 @@ TcpDataToSend (
   Limit = Tcb->SndWl2 + Tcb->SndWnd;\r
 \r
   if (TCP_SEQ_GT (Limit, Tcb->SndUna + Tcb->CWnd)) {\r
-\r
     Limit = Tcb->SndUna + Tcb->CWnd;\r
   }\r
 \r
@@ -206,19 +201,19 @@ TcpDataToSend (
   // buffer. The later can be non-zero if the peer shrinks\r
   // its advertised window.\r
   //\r
-  Left  = GET_SND_DATASIZE (Sk) + TCP_SUB_SEQ (TcpGetMaxSndNxt (Tcb), Tcb->SndNxt);\r
+  Left = GET_SND_DATASIZE (Sk) + TCP_SUB_SEQ (TcpGetMaxSndNxt (Tcb), Tcb->SndNxt);\r
 \r
-  Len   = MIN (Win, Left);\r
+  Len = MIN (Win, Left);\r
 \r
   if (Len > Tcb->SndMss) {\r
     Len = Tcb->SndMss;\r
   }\r
 \r
-  if ((Force != 0)|| (Len == 0 && Left == 0)) {\r
+  if ((Force != 0) || ((Len == 0) && (Left == 0))) {\r
     return Len;\r
   }\r
 \r
-  if (Len == 0 && Left != 0) {\r
+  if ((Len == 0) && (Left != 0)) {\r
     goto SetPersistTimer;\r
   }\r
 \r
@@ -231,14 +226,13 @@ TcpDataToSend (
   // expecting an ACK, or the Nagle algorithm is disabled.\r
   //\r
   if ((Len == Tcb->SndMss) || (2 * Len >= Tcb->SndWndMax)) {\r
-\r
     return Len;\r
   }\r
 \r
   if ((Len == Left) &&\r
       ((Tcb->SndNxt == Tcb->SndUna) || TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_NAGLE))\r
-      ) {\r
-\r
+      )\r
+  {\r
     return Len;\r
   }\r
 \r
@@ -248,11 +242,10 @@ TcpDataToSend (
   //\r
 SetPersistTimer:\r
   if (!TCP_TIMER_ON (Tcb->EnabledTimer, TCP_TIMER_REXMIT)) {\r
-\r
     DEBUG (\r
       (DEBUG_WARN,\r
-      "TcpDataToSend: enter persistent state for TCB %p\n",\r
-      Tcb)\r
+       "TcpDataToSend: enter persistent state for TCB %p\n",\r
+       Tcb)\r
       );\r
 \r
     if (!Tcb->ProbeTimerOn) {\r
@@ -276,8 +269,8 @@ SetPersistTimer:
 **/\r
 INTN\r
 TcpTransmitSegment (\r
-  IN OUT TCP_CB  *Tcb,\r
-  IN     NET_BUF *Nbuf\r
+  IN OUT TCP_CB   *Tcb,\r
+  IN     NET_BUF  *Nbuf\r
   )\r
 {\r
   UINT16    Len;\r
@@ -294,14 +287,12 @@ TcpTransmitSegment (
 \r
   DataLen = Nbuf->TotalSize;\r
 \r
-  Seg     = TCPSEG_NETBUF (Nbuf);\r
-  Syn     = TCP_FLG_ON (Seg->Flag, TCP_FLG_SYN);\r
+  Seg = TCPSEG_NETBUF (Nbuf);\r
+  Syn = TCP_FLG_ON (Seg->Flag, TCP_FLG_SYN);\r
 \r
   if (Syn) {\r
-\r
     Len = TcpSynBuildOption (Tcb, Nbuf);\r
   } else {\r
-\r
     Len = TcpBuildOption (Tcb, Nbuf);\r
   }\r
 \r
@@ -309,24 +300,24 @@ TcpTransmitSegment (
 \r
   Len += sizeof (TCP_HEAD);\r
 \r
-  Head = (TCP_HEAD *) NetbufAllocSpace (\r
-                        Nbuf,\r
-                        sizeof (TCP_HEAD),\r
-                        NET_BUF_HEAD\r
-                        );\r
+  Head = (TCP_HEAD *)NetbufAllocSpace (\r
+                       Nbuf,\r
+                       sizeof (TCP_HEAD),\r
+                       NET_BUF_HEAD\r
+                       );\r
 \r
   ASSERT (Head != NULL);\r
 \r
-  Nbuf->Tcp       = Head;\r
+  Nbuf->Tcp = Head;\r
 \r
-  Head->SrcPort   = Tcb->LocalEnd.Port;\r
-  Head->DstPort   = Tcb->RemoteEnd.Port;\r
-  Head->Seq       = NTOHL (Seg->Seq);\r
-  Head->Ack       = NTOHL (Tcb->RcvNxt);\r
-  Head->HeadLen   = (UINT8) (Len >> 2);\r
-  Head->Res       = 0;\r
-  Head->Wnd       = TcpComputeWnd (Tcb, Syn);\r
-  Head->Checksum  = 0;\r
+  Head->SrcPort  = Tcb->LocalEnd.Port;\r
+  Head->DstPort  = Tcb->RemoteEnd.Port;\r
+  Head->Seq      = NTOHL (Seg->Seq);\r
+  Head->Ack      = NTOHL (Tcb->RcvNxt);\r
+  Head->HeadLen  = (UINT8)(Len >> 2);\r
+  Head->Res      = 0;\r
+  Head->Wnd      = TcpComputeWnd (Tcb, Syn);\r
+  Head->Checksum = 0;\r
 \r
   //\r
   // Check whether to set the PSH flag.\r
@@ -336,13 +327,11 @@ TcpTransmitSegment (
   if (DataLen != 0) {\r
     if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_SND_PSH) &&\r
         TCP_SEQ_BETWEEN (Seg->Seq, Tcb->SndPsh, Seg->End)\r
-        ) {\r
-\r
+        )\r
+    {\r
       TCP_SET_FLG (Seg->Flag, TCP_FLG_PSH);\r
       TCP_CLEAR_FLG (Tcb->CtrlFlag, TCP_CTRL_SND_PSH);\r
-\r
     } else if ((Seg->End == Tcb->SndNxt) && (GET_SND_DATASIZE (Tcb->Sk) == 0)) {\r
-\r
       TCP_SET_FLG (Seg->Flag, TCP_FLG_PSH);\r
     }\r
   }\r
@@ -353,25 +342,24 @@ TcpTransmitSegment (
   TCP_CLEAR_FLG (Seg->Flag, TCP_FLG_URG);\r
 \r
   if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_SND_URG) && TCP_SEQ_LEQ (Seg->Seq, Tcb->SndUp)) {\r
-\r
     TCP_SET_FLG (Seg->Flag, TCP_FLG_URG);\r
 \r
     if (TCP_SEQ_LT (Tcb->SndUp, Seg->End)) {\r
-\r
-      Seg->Urg = (UINT16) TCP_SUB_SEQ (Tcb->SndUp, Seg->Seq);\r
+      Seg->Urg = (UINT16)TCP_SUB_SEQ (Tcb->SndUp, Seg->Seq);\r
     } else {\r
-\r
-      Seg->Urg = (UINT16) MIN (\r
-                            TCP_SUB_SEQ (Tcb->SndUp,\r
-                            Seg->Seq),\r
-                            0xffff\r
-                            );\r
+      Seg->Urg = (UINT16)MIN (\r
+                           TCP_SUB_SEQ (\r
+                             Tcb->SndUp,\r
+                             Seg->Seq\r
+                             ),\r
+                           0xffff\r
+                           );\r
     }\r
   }\r
 \r
-  Head->Flag      = Seg->Flag;\r
-  Head->Urg       = NTOHS (Seg->Urg);\r
-  Head->Checksum  = TcpChecksum (Nbuf, Tcb->HeadSum);\r
+  Head->Flag     = Seg->Flag;\r
+  Head->Urg      = NTOHS (Seg->Urg);\r
+  Head->Checksum = TcpChecksum (Nbuf, Tcb->HeadSum);\r
 \r
   //\r
   // Update the TCP session's control information.\r
@@ -401,38 +389,37 @@ TcpTransmitSegment (
 **/\r
 NET_BUF *\r
 TcpGetSegmentSndQue (\r
-  IN TCP_CB    *Tcb,\r
-  IN TCP_SEQNO Seq,\r
-  IN UINT32    Len\r
+  IN TCP_CB     *Tcb,\r
+  IN TCP_SEQNO  Seq,\r
+  IN UINT32     Len\r
   )\r
 {\r
-  LIST_ENTRY      *Head;\r
-  LIST_ENTRY      *Cur;\r
-  NET_BUF         *Node;\r
-  TCP_SEG         *Seg;\r
-  NET_BUF         *Nbuf;\r
-  TCP_SEQNO       End;\r
-  UINT8           *Data;\r
-  UINT8           Flag;\r
-  INT32           Offset;\r
-  INT32           CopyLen;\r
+  LIST_ENTRY  *Head;\r
+  LIST_ENTRY  *Cur;\r
+  NET_BUF     *Node;\r
+  TCP_SEG     *Seg;\r
+  NET_BUF     *Nbuf;\r
+  TCP_SEQNO   End;\r
+  UINT8       *Data;\r
+  UINT8       Flag;\r
+  INT32       Offset;\r
+  INT32       CopyLen;\r
 \r
   ASSERT ((Tcb != NULL) && TCP_SEQ_LEQ (Seq, Tcb->SndNxt) && (Len > 0));\r
 \r
   //\r
   // Find the segment that contains the Seq.\r
   //\r
-  Head  = &Tcb->SndQue;\r
+  Head = &Tcb->SndQue;\r
 \r
-  Node  = NULL;\r
-  Seg   = NULL;\r
+  Node = NULL;\r
+  Seg  = NULL;\r
 \r
   NET_LIST_FOR_EACH (Cur, Head) {\r
-    Node  = NET_LIST_USER_STRUCT (Cur, NET_BUF, List);\r
-    Seg   = TCPSEG_NETBUF (Node);\r
+    Node = NET_LIST_USER_STRUCT (Cur, NET_BUF, List);\r
+    Seg  = TCPSEG_NETBUF (Node);\r
 \r
     if (TCP_SEQ_LT (Seq, Seg->End) && TCP_SEQ_LEQ (Seg->Seq, Seq)) {\r
-\r
       break;\r
     }\r
   }\r
@@ -448,8 +435,8 @@ TcpGetSegmentSndQue (
   if ((Seg->Seq == Seq) &&\r
       TCP_SEQ_LEQ (Seg->End, Seg->Seq + Len) &&\r
       !NET_BUF_SHARED (Node)\r
-      ) {\r
-\r
+      )\r
+  {\r
     NET_GET_REF (Node);\r
     return Node;\r
   }\r
@@ -465,8 +452,8 @@ TcpGetSegmentSndQue (
 \r
   NetbufReserve (Nbuf, TCP_MAX_HEAD);\r
 \r
-  Flag  = Seg->Flag;\r
-  End   = Seg->End;\r
+  Flag = Seg->Flag;\r
+  End  = Seg->End;\r
 \r
   if (TCP_SEQ_LT (Seq + Len, Seg->End)) {\r
     End = Seq + Len;\r
@@ -482,13 +469,10 @@ TcpGetSegmentSndQue (
   // one byte less.\r
   //\r
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_SYN)) {\r
-\r
     if (TCP_SEQ_LT (Seg->Seq, Seq)) {\r
-\r
       TCP_CLEAR_FLG (Flag, TCP_FLG_SYN);\r
       Offset--;\r
     } else {\r
-\r
       CopyLen--;\r
     }\r
   }\r
@@ -498,12 +482,9 @@ TcpGetSegmentSndQue (
   // and if it is out of the range, clear the flag.\r
   //\r
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_FIN)) {\r
-\r
     if (Seg->End == End) {\r
-\r
       CopyLen--;\r
     } else {\r
-\r
       TCP_CLEAR_FLG (Flag, TCP_FLG_FIN);\r
     }\r
   }\r
@@ -517,16 +498,16 @@ TcpGetSegmentSndQue (
     Data = NetbufAllocSpace (Nbuf, CopyLen, NET_BUF_TAIL);\r
     ASSERT (Data != NULL);\r
 \r
-    if ((INT32) NetbufCopy (Node, Offset, CopyLen, Data) != CopyLen) {\r
+    if ((INT32)NetbufCopy (Node, Offset, CopyLen, Data) != CopyLen) {\r
       goto OnError;\r
     }\r
   }\r
 \r
   CopyMem (TCPSEG_NETBUF (Nbuf), Seg, sizeof (TCP_SEG));\r
 \r
-  TCPSEG_NETBUF (Nbuf)->Seq   = Seq;\r
-  TCPSEG_NETBUF (Nbuf)->End   = End;\r
-  TCPSEG_NETBUF (Nbuf)->Flag  = Flag;\r
+  TCPSEG_NETBUF (Nbuf)->Seq  = Seq;\r
+  TCPSEG_NETBUF (Nbuf)->End  = End;\r
+  TCPSEG_NETBUF (Nbuf)->Flag = Flag;\r
 \r
   return Nbuf;\r
 \r
@@ -547,14 +528,14 @@ OnError:
 **/\r
 NET_BUF *\r
 TcpGetSegmentSock (\r
-  IN TCP_CB    *Tcb,\r
-  IN TCP_SEQNO Seq,\r
-  IN UINT32    Len\r
+  IN TCP_CB     *Tcb,\r
+  IN TCP_SEQNO  Seq,\r
+  IN UINT32     Len\r
   )\r
 {\r
-  NET_BUF *Nbuf;\r
-  UINT8   *Data;\r
-  UINT32  DataGet;\r
+  NET_BUF  *Nbuf;\r
+  UINT8    *Data;\r
+  UINT32   DataGet;\r
 \r
   ASSERT ((Tcb != NULL) && (Tcb->Sk != NULL));\r
 \r
@@ -563,8 +544,8 @@ TcpGetSegmentSock (
   if (Nbuf == NULL) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "TcpGetSegmentSock: failed to allocate a netbuf for TCB %p\n",\r
-      Tcb)\r
+       "TcpGetSegmentSock: failed to allocate a netbuf for TCB %p\n",\r
+       Tcb)\r
       );\r
 \r
     return NULL;\r
@@ -592,7 +573,6 @@ TcpGetSegmentSock (
   InsertTailList (&(Tcb->SndQue), &(Nbuf->List));\r
 \r
   if (DataGet != 0) {\r
-\r
     SockDataSent (Tcb->Sk, DataGet);\r
   }\r
 \r
@@ -612,12 +592,12 @@ TcpGetSegmentSock (
 **/\r
 NET_BUF *\r
 TcpGetSegment (\r
-  IN TCP_CB    *Tcb,\r
-  IN TCP_SEQNO Seq,\r
-  IN UINT32    Len\r
+  IN TCP_CB     *Tcb,\r
+  IN TCP_SEQNO  Seq,\r
+  IN UINT32     Len\r
   )\r
 {\r
-  NET_BUF *Nbuf;\r
+  NET_BUF  *Nbuf;\r
 \r
   ASSERT (Tcb != NULL);\r
 \r
@@ -625,10 +605,8 @@ TcpGetSegment (
   // Compare the SndNxt with the max sequence number sent.\r
   //\r
   if ((Len != 0) && TCP_SEQ_LT (Seq, TcpGetMaxSndNxt (Tcb))) {\r
-\r
     Nbuf = TcpGetSegmentSndQue (Tcb, Seq, Len);\r
   } else {\r
-\r
     Nbuf = TcpGetSegmentSock (Tcb, Seq, Len);\r
   }\r
 \r
@@ -652,12 +630,12 @@ TcpGetSegment (
 **/\r
 INTN\r
 TcpRetransmit (\r
-  IN TCP_CB    *Tcb,\r
-  IN TCP_SEQNO Seq\r
+  IN TCP_CB     *Tcb,\r
+  IN TCP_SEQNO  Seq\r
   )\r
 {\r
-  NET_BUF *Nbuf;\r
-  UINT32  Len;\r
+  NET_BUF  *Nbuf;\r
+  UINT32   Len;\r
 \r
   //\r
   // Compute the maximum length of retransmission. It is\r
@@ -675,22 +653,21 @@ TcpRetransmit (
   //   as the original segment was in window when it was sent.\r
   //\r
   if ((Tcb->SndWndScale != 0) &&\r
-      (TCP_SEQ_GT (Seq, Tcb->RetxmitSeqMax) || TCP_SEQ_BETWEEN (Tcb->SndWl2 + Tcb->SndWnd, Seq, Tcb->SndWl2 + Tcb->SndWnd + (1 << Tcb->SndWndScale)))) {\r
+      (TCP_SEQ_GT (Seq, Tcb->RetxmitSeqMax) || TCP_SEQ_BETWEEN (Tcb->SndWl2 + Tcb->SndWnd, Seq, Tcb->SndWl2 + Tcb->SndWnd + (1 << Tcb->SndWndScale))))\r
+  {\r
     Len = TCP_SUB_SEQ (Tcb->SndNxt, Seq);\r
     DEBUG (\r
       (DEBUG_WARN,\r
-      "TcpRetransmit: retransmission without regard to the receiver window for TCB %p\n",\r
-      Tcb)\r
+       "TcpRetransmit: retransmission without regard to the receiver window for TCB %p\n",\r
+       Tcb)\r
       );\r
-\r
   } else if (TCP_SEQ_GEQ (Tcb->SndWl2 + Tcb->SndWnd, Seq)) {\r
     Len = TCP_SUB_SEQ (Tcb->SndWl2 + Tcb->SndWnd, Seq);\r
-\r
   } else {\r
     DEBUG (\r
       (DEBUG_WARN,\r
-      "TcpRetransmit: retransmission cancelled because send window too small for TCB %p\n",\r
-      Tcb)\r
+       "TcpRetransmit: retransmission cancelled because send window too small for TCB %p\n",\r
+       Tcb)\r
       );\r
 \r
     return 0;\r
@@ -746,16 +723,17 @@ OnError:
 **/\r
 INTN\r
 TcpCheckSndQue (\r
-  IN LIST_ENTRY     *Head\r
+  IN LIST_ENTRY  *Head\r
   )\r
 {\r
-  LIST_ENTRY      *Entry;\r
-  NET_BUF         *Nbuf;\r
-  TCP_SEQNO       Seq;\r
+  LIST_ENTRY  *Entry;\r
+  NET_BUF     *Nbuf;\r
+  TCP_SEQNO   Seq;\r
 \r
   if (IsListEmpty (Head)) {\r
     return 1;\r
   }\r
+\r
   //\r
   // Initialize the Seq.\r
   //\r
@@ -796,24 +774,23 @@ TcpCheckSndQue (
 **/\r
 INTN\r
 TcpToSendData (\r
-  IN OUT TCP_CB *Tcb,\r
-  IN     INTN   Force\r
+  IN OUT TCP_CB  *Tcb,\r
+  IN     INTN    Force\r
   )\r
 {\r
-  UINT32    Len;\r
-  INTN      Sent;\r
-  UINT8     Flag;\r
-  NET_BUF   *Nbuf;\r
-  TCP_SEG   *Seg;\r
-  TCP_SEQNO Seq;\r
-  TCP_SEQNO End;\r
+  UINT32     Len;\r
+  INTN       Sent;\r
+  UINT8      Flag;\r
+  NET_BUF    *Nbuf;\r
+  TCP_SEG    *Seg;\r
+  TCP_SEQNO  Seq;\r
+  TCP_SEQNO  End;\r
 \r
   ASSERT ((Tcb != NULL) && (Tcb->Sk != NULL) && (Tcb->State != TCP_LISTEN));\r
 \r
   Sent = 0;\r
 \r
   if ((Tcb->State == TCP_CLOSED) || TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_FIN_SENT)) {\r
-\r
     return 0;\r
   }\r
 \r
@@ -821,14 +798,13 @@ TcpToSendData (
     //\r
     // Compute how much data can be sent\r
     //\r
-    Len   = TcpDataToSend (Tcb, Force);\r
-    Seq   = Tcb->SndNxt;\r
+    Len = TcpDataToSend (Tcb, Force);\r
+    Seq = Tcb->SndNxt;\r
 \r
     ASSERT ((Tcb->State) < (ARRAY_SIZE (mTcpOutFlag)));\r
-    Flag  = mTcpOutFlag[Tcb->State];\r
+    Flag = mTcpOutFlag[Tcb->State];\r
 \r
     if ((Flag & TCP_FLG_SYN) != 0) {\r
-\r
       Seq = Tcb->Iss;\r
       Len = 0;\r
     }\r
@@ -846,8 +822,8 @@ TcpToSendData (
     if (Nbuf == NULL) {\r
       DEBUG (\r
         (DEBUG_ERROR,\r
-        "TcpToSendData: failed to get a segment for TCB %p\n",\r
-        Tcb)\r
+         "TcpToSendData: failed to get a segment for TCB %p\n",\r
+         Tcb)\r
         );\r
 \r
       goto OnError;\r
@@ -872,12 +848,13 @@ TcpToSendData (
       if ((TcpGetMaxSndNxt (Tcb) == Tcb->SndNxt) &&\r
           (GET_SND_DATASIZE (Tcb->Sk) == 0) &&\r
           TCP_SEQ_LT (End + 1, Tcb->SndWnd + Tcb->SndWl2)\r
-            ) {\r
+          )\r
+      {\r
         DEBUG (\r
           (DEBUG_NET,\r
-          "TcpToSendData: send FIN to peer for TCB %p in state %s\n",\r
-          Tcb,\r
-          mTcpStateName[Tcb->State])\r
+           "TcpToSendData: send FIN to peer for TCB %p in state %s\n",\r
+           Tcb,\r
+           mTcpStateName[Tcb->State])\r
           );\r
 \r
         End++;\r
@@ -890,11 +867,11 @@ TcpToSendData (
     Seg->End  = End;\r
     Seg->Flag = Flag;\r
 \r
-    if (TcpVerifySegment (Nbuf) == 0 || TcpCheckSndQue (&Tcb->SndQue) == 0) {\r
+    if ((TcpVerifySegment (Nbuf) == 0) || (TcpCheckSndQue (&Tcb->SndQue) == 0)) {\r
       DEBUG (\r
         (DEBUG_ERROR,\r
-        "TcpToSendData: discard a broken segment for TCB %p\n",\r
-        Tcb)\r
+         "TcpToSendData: discard a broken segment for TCB %p\n",\r
+         Tcb)\r
         );\r
       goto OnError;\r
     }\r
@@ -905,8 +882,8 @@ TcpToSendData (
     if (Seg->End == Seg->Seq) {\r
       DEBUG (\r
         (DEBUG_WARN,\r
-        "TcpToSendData: created a empty segment for TCB %p, free it now\n",\r
-        Tcb)\r
+         "TcpToSendData: created a empty segment for TCB %p, free it now\n",\r
+         Tcb)\r
         );\r
 \r
       goto OnError;\r
@@ -916,7 +893,7 @@ TcpToSendData (
       NetbufTrim (Nbuf, (Nbuf->Tcp->HeadLen << 2), NET_BUF_HEAD);\r
       Nbuf->Tcp = NULL;\r
 \r
-      if ((Flag & TCP_FLG_FIN) != 0)  {\r
+      if ((Flag & TCP_FLG_FIN) != 0) {\r
         TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_FIN_SENT);\r
       }\r
 \r
@@ -957,19 +934,17 @@ TcpToSendData (
     // Karn's algorithm requires not to update RTT when in loss.\r
     //\r
     if ((Tcb->CongestState == TCP_CONGEST_OPEN) && !TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RTT_ON)) {\r
-\r
       DEBUG (\r
         (DEBUG_NET,\r
-        "TcpToSendData: set RTT measure sequence %d for TCB %p\n",\r
-        Seq,\r
-        Tcb)\r
+         "TcpToSendData: set RTT measure sequence %d for TCB %p\n",\r
+         Seq,\r
+         Tcb)\r
         );\r
 \r
       TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_RTT_ON);\r
       Tcb->RttSeq     = Seq;\r
       Tcb->RttMeasure = 0;\r
     }\r
-\r
   } while (Len == Tcb->SndMss);\r
 \r
   return Sent;\r
@@ -990,11 +965,11 @@ OnError:
 **/\r
 VOID\r
 TcpSendAck (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
-  NET_BUF *Nbuf;\r
-  TCP_SEG *Seg;\r
+  NET_BUF  *Nbuf;\r
+  TCP_SEG  *Seg;\r
 \r
   Nbuf = NetbufAlloc (TCP_MAX_HEAD);\r
 \r
@@ -1028,11 +1003,11 @@ TcpSendAck (
 **/\r
 INTN\r
 TcpSendZeroProbe (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
-  NET_BUF *Nbuf;\r
-  TCP_SEG *Seg;\r
+  NET_BUF  *Nbuf;\r
+  TCP_SEG  *Seg;\r
   INTN     Result;\r
 \r
   Nbuf = NetbufAlloc (TCP_MAX_HEAD);\r
@@ -1052,7 +1027,7 @@ TcpSendZeroProbe (
   Seg->End  = Tcb->SndNxt - 1;\r
   Seg->Flag = TCP_FLG_ACK;\r
 \r
-  Result    = TcpTransmitSegment (Tcb, Nbuf);\r
+  Result = TcpTransmitSegment (Tcb, Nbuf);\r
   NetbufFree (Nbuf);\r
 \r
   return Result;\r
@@ -1066,10 +1041,10 @@ TcpSendZeroProbe (
 **/\r
 VOID\r
 TcpToSendAck (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
-  UINT32 TcpNow;\r
+  UINT32  TcpNow;\r
 \r
   //\r
   // Generally, TCP should send a delayed ACK unless:\r
@@ -1091,8 +1066,8 @@ TcpToSendAck (
 \r
   DEBUG (\r
     (DEBUG_NET,\r
-    "TcpToSendAck: scheduled a delayed ACK for TCB %p\n",\r
-    Tcb)\r
+     "TcpToSendAck: scheduled a delayed ACK for TCB %p\n",\r
+     Tcb)\r
     );\r
 \r
   //\r
@@ -1143,7 +1118,7 @@ TcpSendReset (
     return -1;\r
   }\r
 \r
-  Nhead = (TCP_HEAD *) NetbufAllocSpace (\r
+  Nhead = (TCP_HEAD *)NetbufAllocSpace (\r
                         Nbuf,\r
                         sizeof (TCP_HEAD),\r
                         NET_BUF_TAIL\r
@@ -1159,25 +1134,23 @@ TcpSendReset (
   // is associated with it, otherwise derive from the Tcb.\r
   //\r
   if (Tcb == NULL) {\r
-\r
     if (TCP_FLG_ON (Head->Flag, TCP_FLG_ACK)) {\r
-      Nhead->Seq  = Head->Ack;\r
-      Nhead->Ack  = 0;\r
+      Nhead->Seq = Head->Ack;\r
+      Nhead->Ack = 0;\r
     } else {\r
       Nhead->Seq = 0;\r
       TCP_SET_FLG (Nhead->Flag, TCP_FLG_ACK);\r
       Nhead->Ack = HTONL (NTOHL (Head->Seq) + Len);\r
     }\r
   } else {\r
-\r
-    Nhead->Seq  = HTONL (Tcb->SndNxt);\r
-    Nhead->Ack  = HTONL (Tcb->RcvNxt);\r
+    Nhead->Seq = HTONL (Tcb->SndNxt);\r
+    Nhead->Ack = HTONL (Tcb->RcvNxt);\r
     TCP_SET_FLG (Nhead->Flag, TCP_FLG_ACK);\r
   }\r
 \r
   Nhead->SrcPort  = Head->DstPort;\r
   Nhead->DstPort  = Head->SrcPort;\r
-  Nhead->HeadLen  = (UINT8) (sizeof (TCP_HEAD) >> 2);\r
+  Nhead->HeadLen  = (UINT8)(sizeof (TCP_HEAD) >> 2);\r
   Nhead->Res      = 0;\r
   Nhead->Wnd      = HTONS (0xFFFF);\r
   Nhead->Checksum = 0;\r
@@ -1209,7 +1182,7 @@ TcpSendReset (
 **/\r
 INTN\r
 TcpVerifySegment (\r
-  IN NET_BUF *Nbuf\r
+  IN NET_BUF  *Nbuf\r
   )\r
 {\r
   TCP_HEAD  *Head;\r
@@ -1222,9 +1195,9 @@ TcpVerifySegment (
 \r
   NET_CHECK_SIGNATURE (Nbuf, NET_BUF_SIGNATURE);\r
 \r
-  Seg   = TCPSEG_NETBUF (Nbuf);\r
-  Len   = Nbuf->TotalSize;\r
-  Head  = Nbuf->Tcp;\r
+  Seg  = TCPSEG_NETBUF (Nbuf);\r
+  Len  = Nbuf->TotalSize;\r
+  Head = Nbuf->Tcp;\r
 \r
   if (Head != NULL) {\r
     if (Head->Flag != Seg->Flag) {\r
index 53cfd48026c5cb8d0bac2370ff664615bee84068..81f6a875351f0c94165c2e066b62fe1ed03e0221 100644 (file)
 #define TCP_CLOSE_WAIT   9\r
 #define TCP_LAST_ACK     10\r
 \r
-\r
 ///\r
 /// Flags in the TCP header\r
 ///\r
-#define TCP_FLG_FIN      0x01\r
-#define TCP_FLG_SYN      0x02\r
-#define TCP_FLG_RST      0x04\r
-#define TCP_FLG_PSH      0x08\r
-#define TCP_FLG_ACK      0x10\r
-#define TCP_FLG_URG      0x20\r
-\r
- //\r
- // mask for all the flags\r
- //\r
-#define TCP_FLG_FLAG     0x3F\r
+#define TCP_FLG_FIN  0x01\r
+#define TCP_FLG_SYN  0x02\r
+#define TCP_FLG_RST  0x04\r
+#define TCP_FLG_PSH  0x08\r
+#define TCP_FLG_ACK  0x10\r
+#define TCP_FLG_URG  0x20\r
 \r
+//\r
+// mask for all the flags\r
+//\r
+#define TCP_FLG_FLAG  0x3F\r
 \r
-#define TCP_CONNECT_REFUSED      (-1) ///< TCP error status\r
-#define TCP_CONNECT_RESET        (-2) ///< TCP error status\r
-#define TCP_CONNECT_CLOSED       (-3) ///< TCP error status\r
+#define TCP_CONNECT_REFUSED  (-1)     ///< TCP error status\r
+#define TCP_CONNECT_RESET    (-2)     ///< TCP error status\r
+#define TCP_CONNECT_CLOSED   (-3)     ///< TCP error status\r
 \r
 //\r
 // Current congestion status as suggested by RFC3782.\r
 //\r
-#define TCP_CONGEST_RECOVER      1  ///< During the NewReno fast recovery.\r
-#define TCP_CONGEST_LOSS         2  ///< Retxmit because of retxmit time out.\r
-#define TCP_CONGEST_OPEN         3  ///< TCP is opening its congestion window.\r
+#define TCP_CONGEST_RECOVER  1      ///< During the NewReno fast recovery.\r
+#define TCP_CONGEST_LOSS     2      ///< Retxmit because of retxmit time out.\r
+#define TCP_CONGEST_OPEN     3      ///< TCP is opening its congestion window.\r
 \r
 //\r
 // TCP control flags\r
 //\r
-#define TCP_CTRL_NO_NAGLE        0x0001 ///< Disable Nagle algorithm\r
-#define TCP_CTRL_NO_KEEPALIVE    0x0002 ///< Disable keepalive timer.\r
-#define TCP_CTRL_NO_WS           0x0004 ///< Disable window scale option.\r
-#define TCP_CTRL_RCVD_WS         0x0008 ///< Received a wnd scale option in syn.\r
-#define TCP_CTRL_NO_TS           0x0010 ///< Disable Timestamp option.\r
-#define TCP_CTRL_RCVD_TS         0x0020 ///< Received a Timestamp option in syn.\r
-#define TCP_CTRL_SND_TS          0x0040 ///< Send Timestamp option to remote.\r
-#define TCP_CTRL_SND_URG         0x0080 ///< In urgent send mode.\r
-#define TCP_CTRL_RCVD_URG        0x0100 ///< In urgent receive mode.\r
-#define TCP_CTRL_SND_PSH         0x0200 ///< In PUSH send mode.\r
-#define TCP_CTRL_FIN_SENT        0x0400 ///< FIN is sent.\r
-#define TCP_CTRL_FIN_ACKED       0x0800 ///< FIN is ACKed.\r
-#define TCP_CTRL_TIMER_ON        0x1000 ///< At least one of the timer is on.\r
-#define TCP_CTRL_RTT_ON          0x2000 ///< The RTT measurement is on.\r
-#define TCP_CTRL_ACK_NOW         0x4000 ///< Send the ACK now, don't delay.\r
+#define TCP_CTRL_NO_NAGLE      0x0001   ///< Disable Nagle algorithm\r
+#define TCP_CTRL_NO_KEEPALIVE  0x0002   ///< Disable keepalive timer.\r
+#define TCP_CTRL_NO_WS         0x0004   ///< Disable window scale option.\r
+#define TCP_CTRL_RCVD_WS       0x0008   ///< Received a wnd scale option in syn.\r
+#define TCP_CTRL_NO_TS         0x0010   ///< Disable Timestamp option.\r
+#define TCP_CTRL_RCVD_TS       0x0020   ///< Received a Timestamp option in syn.\r
+#define TCP_CTRL_SND_TS        0x0040   ///< Send Timestamp option to remote.\r
+#define TCP_CTRL_SND_URG       0x0080   ///< In urgent send mode.\r
+#define TCP_CTRL_RCVD_URG      0x0100   ///< In urgent receive mode.\r
+#define TCP_CTRL_SND_PSH       0x0200   ///< In PUSH send mode.\r
+#define TCP_CTRL_FIN_SENT      0x0400   ///< FIN is sent.\r
+#define TCP_CTRL_FIN_ACKED     0x0800   ///< FIN is ACKed.\r
+#define TCP_CTRL_TIMER_ON      0x1000   ///< At least one of the timer is on.\r
+#define TCP_CTRL_RTT_ON        0x2000   ///< The RTT measurement is on.\r
+#define TCP_CTRL_ACK_NOW       0x4000   ///< Send the ACK now, don't delay.\r
 \r
 //\r
 // Timer related values\r
 //\r
-#define TCP_TIMER_CONNECT        0                  ///< Connection establishment timer.\r
-#define TCP_TIMER_REXMIT         1                  ///< Retransmit timer.\r
-#define TCP_TIMER_PROBE          2                  ///< Window probe timer.\r
-#define TCP_TIMER_KEEPALIVE      3                  ///< Keepalive timer.\r
-#define TCP_TIMER_FINWAIT2       4                  ///< FIN_WAIT_2 timer.\r
-#define TCP_TIMER_2MSL           5                  ///< TIME_WAIT timer.\r
-#define TCP_TIMER_NUMBER         6                  ///< The total number of the TCP timer.\r
-#define TCP_TICK                 200                ///< Every TCP tick is 200ms.\r
-#define TCP_TICK_HZ              5                  ///< The frequence of TCP tick.\r
-#define TCP_RTT_SHIFT            3                  ///< SRTT & RTTVAR scaled by 8.\r
-#define TCP_RTO_MIN              TCP_TICK_HZ        ///< The minimum value of RTO.\r
-#define TCP_RTO_MAX              (TCP_TICK_HZ * 60) ///< The maximum value of RTO.\r
-#define TCP_FOLD_RTT             4                  ///< Timeout threshold to fold RTT.\r
+#define TCP_TIMER_CONNECT    0                      ///< Connection establishment timer.\r
+#define TCP_TIMER_REXMIT     1                      ///< Retransmit timer.\r
+#define TCP_TIMER_PROBE      2                      ///< Window probe timer.\r
+#define TCP_TIMER_KEEPALIVE  3                      ///< Keepalive timer.\r
+#define TCP_TIMER_FINWAIT2   4                      ///< FIN_WAIT_2 timer.\r
+#define TCP_TIMER_2MSL       5                      ///< TIME_WAIT timer.\r
+#define TCP_TIMER_NUMBER     6                      ///< The total number of the TCP timer.\r
+#define TCP_TICK             200                    ///< Every TCP tick is 200ms.\r
+#define TCP_TICK_HZ          5                      ///< The frequence of TCP tick.\r
+#define TCP_RTT_SHIFT        3                      ///< SRTT & RTTVAR scaled by 8.\r
+#define TCP_RTO_MIN          TCP_TICK_HZ            ///< The minimum value of RTO.\r
+#define TCP_RTO_MAX          (TCP_TICK_HZ * 60)     ///< The maximum value of RTO.\r
+#define TCP_FOLD_RTT         4                      ///< Timeout threshold to fold RTT.\r
 \r
 //\r
 // Default values for some timers\r
 //\r
-#define TCP_MAX_LOSS             12                          ///< Default max times to retxmit.\r
-#define TCP_KEEPALIVE_IDLE_MIN   (TCP_TICK_HZ * 60 * 60 * 2) ///< First keepalive.\r
-#define TCP_KEEPALIVE_PERIOD     (TCP_TICK_HZ * 60)\r
-#define TCP_MAX_KEEPALIVE        8\r
-#define TCP_FIN_WAIT2_TIME       (2 * TCP_TICK_HZ)\r
-#define TCP_TIME_WAIT_TIME       (2 * TCP_TICK_HZ)\r
-#define TCP_PAWS_24DAY           (24 * 24 * 60 * 60 * TCP_TICK_HZ)\r
-#define TCP_CONNECT_TIME         (75 * TCP_TICK_HZ)\r
+#define TCP_MAX_LOSS            12                           ///< Default max times to retxmit.\r
+#define TCP_KEEPALIVE_IDLE_MIN  (TCP_TICK_HZ * 60 * 60 * 2)  ///< First keepalive.\r
+#define TCP_KEEPALIVE_PERIOD    (TCP_TICK_HZ * 60)\r
+#define TCP_MAX_KEEPALIVE       8\r
+#define TCP_FIN_WAIT2_TIME      (2 * TCP_TICK_HZ)\r
+#define TCP_TIME_WAIT_TIME      (2 * TCP_TICK_HZ)\r
+#define TCP_PAWS_24DAY          (24 * 24 * 60 * 60 * TCP_TICK_HZ)\r
+#define TCP_CONNECT_TIME        (75 * TCP_TICK_HZ)\r
 \r
 //\r
 // The header space to be reserved before TCP data to accommodate:\r
 // 60byte IP head + 60byte TCP head + link layer head\r
 //\r
-#define TCP_MAX_HEAD             192\r
+#define TCP_MAX_HEAD  192\r
 \r
 //\r
 // Value ranges for some control option\r
 //\r
-#define TCP_RCV_BUF_SIZE         (2 * 1024 * 1024)\r
-#define TCP_RCV_BUF_SIZE_MIN     (8 * 1024)\r
-#define TCP_SND_BUF_SIZE         (2 * 1024 * 1024)\r
-#define TCP_SND_BUF_SIZE_MIN     (8 * 1024)\r
-#define TCP_BACKLOG              10\r
-#define TCP_BACKLOG_MIN          5\r
-#define TCP_MAX_LOSS_MIN         6\r
-#define TCP_CONNECT_TIME_MIN     (60 * TCP_TICK_HZ)\r
-#define TCP_MAX_KEEPALIVE_MIN    4\r
-#define TCP_KEEPALIVE_IDLE_MAX   (TCP_TICK_HZ * 60 * 60 * 4)\r
-#define TCP_KEEPALIVE_PERIOD_MIN (TCP_TICK_HZ * 30)\r
-#define TCP_FIN_WAIT2_TIME_MAX   (4 * TCP_TICK_HZ)\r
-#define TCP_TIME_WAIT_TIME_MAX   (60 * TCP_TICK_HZ)\r
+#define TCP_RCV_BUF_SIZE          (2 * 1024 * 1024)\r
+#define TCP_RCV_BUF_SIZE_MIN      (8 * 1024)\r
+#define TCP_SND_BUF_SIZE          (2 * 1024 * 1024)\r
+#define TCP_SND_BUF_SIZE_MIN      (8 * 1024)\r
+#define TCP_BACKLOG               10\r
+#define TCP_BACKLOG_MIN           5\r
+#define TCP_MAX_LOSS_MIN          6\r
+#define TCP_CONNECT_TIME_MIN      (60 * TCP_TICK_HZ)\r
+#define TCP_MAX_KEEPALIVE_MIN     4\r
+#define TCP_KEEPALIVE_IDLE_MAX    (TCP_TICK_HZ * 60 * 60 * 4)\r
+#define TCP_KEEPALIVE_PERIOD_MIN  (TCP_TICK_HZ * 30)\r
+#define TCP_FIN_WAIT2_TIME_MAX    (4 * TCP_TICK_HZ)\r
+#define TCP_TIME_WAIT_TIME_MAX    (60 * TCP_TICK_HZ)\r
 \r
 ///\r
 /// TCP_CONNECTED: both ends have synchronized their ISN.\r
 ///\r
-#define TCP_CONNECTED(state)     ((state) > TCP_SYN_RCVD)\r
+#define TCP_CONNECTED(state)  ((state) > TCP_SYN_RCVD)\r
 \r
 #define TCP_FIN_RCVD(State) \\r
   ( \\r
 //\r
 // Get the TCP_SEG point from a net buffer's ProtoData.\r
 //\r
-#define TCPSEG_NETBUF(NBuf)     ((TCP_SEG *) ((NBuf)->ProtoData))\r
+#define TCPSEG_NETBUF(NBuf)  ((TCP_SEG *) ((NBuf)->ProtoData))\r
 \r
 //\r
 // Macros to compare sequence no\r
 //\r
-#define TCP_SEQ_LT(SeqA, SeqB)  ((INT32) ((SeqA) - (SeqB)) < 0)\r
-#define TCP_SEQ_LEQ(SeqA, SeqB) ((INT32) ((SeqA) - (SeqB)) <= 0)\r
-#define TCP_SEQ_GT(SeqA, SeqB)  ((INT32) ((SeqB) - (SeqA)) < 0)\r
-#define TCP_SEQ_GEQ(SeqA, SeqB) ((INT32) ((SeqB) - (SeqA)) <= 0)\r
+#define TCP_SEQ_LT(SeqA, SeqB)   ((INT32) ((SeqA) - (SeqB)) < 0)\r
+#define TCP_SEQ_LEQ(SeqA, SeqB)  ((INT32) ((SeqA) - (SeqB)) <= 0)\r
+#define TCP_SEQ_GT(SeqA, SeqB)   ((INT32) ((SeqB) - (SeqA)) < 0)\r
+#define TCP_SEQ_GEQ(SeqA, SeqB)  ((INT32) ((SeqB) - (SeqA)) <= 0)\r
 \r
 //\r
 // TCP_SEQ_BETWEEN return whether b <= m <= e\r
 //\r
-#define TCP_SEQ_BETWEEN(b, m, e)    ((e) - (b) >= (m) - (b))\r
+#define TCP_SEQ_BETWEEN(b, m, e)  ((e) - (b) >= (m) - (b))\r
 \r
 //\r
 // TCP_SUB_SEQ returns Seq1 - Seq2. Make sure Seq1 >= Seq2\r
 //\r
-#define TCP_SUB_SEQ(Seq1, Seq2)     ((UINT32) ((Seq1) - (Seq2)))\r
+#define TCP_SUB_SEQ(Seq1, Seq2)  ((UINT32) ((Seq1) - (Seq2)))\r
 \r
 //\r
 // Check whether Flag is on\r
 //\r
-#define TCP_FLG_ON(Value, Flag)     ((BOOLEAN) (((Value) & (Flag)) != 0))\r
+#define TCP_FLG_ON(Value, Flag)  ((BOOLEAN) (((Value) & (Flag)) != 0))\r
 //\r
 // Set and Clear operation on a Flag\r
 //\r
 #define TCP_SET_TIMER(Flag, Timer)    ((Flag) = (UINT16) ((Flag) | (1 << (Timer))))\r
 #define TCP_CLEAR_TIMER(Flag, Timer)  ((Flag) = (UINT16) ((Flag) & (~(1 << (Timer)))))\r
 \r
+#define TCP_TIME_LT(Ta, Tb)   ((INT32) ((Ta) - (Tb)) < 0)\r
+#define TCP_TIME_LEQ(Ta, Tb)  ((INT32) ((Ta) - (Tb)) <= 0)\r
+#define TCP_SUB_TIME(Ta, Tb)  ((UINT32) ((Ta) - (Tb)))\r
 \r
-#define TCP_TIME_LT(Ta, Tb)           ((INT32) ((Ta) - (Tb)) < 0)\r
-#define TCP_TIME_LEQ(Ta, Tb)          ((INT32) ((Ta) - (Tb)) <= 0)\r
-#define TCP_SUB_TIME(Ta, Tb)          ((UINT32) ((Ta) - (Tb)))\r
-\r
-#define TCP_MAX_WIN                   0xFFFFU\r
+#define TCP_MAX_WIN  0xFFFFU\r
 \r
 ///\r
 /// TCP segmentation data.\r
 ///\r
 typedef struct _TCP_SEG {\r
-  TCP_SEQNO Seq;  ///< Starting sequence number.\r
-  TCP_SEQNO End;  ///< The sequence of the last byte + 1, include SYN/FIN. End-Seq = SEG.LEN.\r
-  TCP_SEQNO Ack;  ///< ACK field in the segment.\r
-  UINT8     Flag; ///< TCP header flags.\r
-  UINT16    Urg;  ///< Valid if URG flag is set.\r
-  UINT32    Wnd;  ///< TCP window size field.\r
+  TCP_SEQNO    Seq;  ///< Starting sequence number.\r
+  TCP_SEQNO    End;  ///< The sequence of the last byte + 1, include SYN/FIN. End-Seq = SEG.LEN.\r
+  TCP_SEQNO    Ack;  ///< ACK field in the segment.\r
+  UINT8        Flag; ///< TCP header flags.\r
+  UINT16       Urg;  ///< Valid if URG flag is set.\r
+  UINT32       Wnd;  ///< TCP window size field.\r
 } TCP_SEG;\r
 \r
 ///\r
 /// Network endpoint, IP plus Port structure.\r
 ///\r
 typedef struct _TCP_PEER {\r
-  EFI_IP_ADDRESS  Ip;     ///< IP address, in network byte order.\r
-  TCP_PORTNO      Port;   ///< Port number, in network byte order.\r
+  EFI_IP_ADDRESS    Ip;   ///< IP address, in network byte order.\r
+  TCP_PORTNO        Port; ///< Port number, in network byte order.\r
 } TCP_PEER;\r
 \r
-typedef struct _TCP_CONTROL_BLOCK  TCP_CB;\r
+typedef struct _TCP_CONTROL_BLOCK TCP_CB;\r
 \r
 ///\r
 /// TCP control block: it includes various states.\r
 ///\r
 struct _TCP_CONTROL_BLOCK {\r
-  LIST_ENTRY        List;     ///< Back and forward link entry\r
-  TCP_CB            *Parent;  ///< The parent TCP_CB structure\r
+  LIST_ENTRY          List;    ///< Back and forward link entry\r
+  TCP_CB              *Parent; ///< The parent TCP_CB structure\r
 \r
-  SOCKET            *Sk;      ///< The socket it controlled.\r
-  TCP_PEER          LocalEnd; ///< Local endpoint.\r
-  TCP_PEER          RemoteEnd;///< Remote endpoint.\r
+  SOCKET              *Sk;       ///< The socket it controlled.\r
+  TCP_PEER            LocalEnd;  ///< Local endpoint.\r
+  TCP_PEER            RemoteEnd; ///< Remote endpoint.\r
 \r
-  LIST_ENTRY        SndQue;   ///< Retxmission queue.\r
-  LIST_ENTRY        RcvQue;   ///< Reassemble queue.\r
-  UINT32            CtrlFlag; ///< Control flags, such as NO_NAGLE.\r
-  INT32             Error;    ///< Soft error status, such as TCP_CONNECT_RESET.\r
+  LIST_ENTRY          SndQue;   ///< Retxmission queue.\r
+  LIST_ENTRY          RcvQue;   ///< Reassemble queue.\r
+  UINT32              CtrlFlag; ///< Control flags, such as NO_NAGLE.\r
+  INT32               Error;    ///< Soft error status, such as TCP_CONNECT_RESET.\r
 \r
   //\r
   // RFC793 and RFC1122 defined variables\r
   //\r
-  UINT8             State;      ///< TCP state, such as SYN_SENT, LISTEN.\r
-  UINT8             DelayedAck; ///< Number of delayed ACKs.\r
-  UINT16            HeadSum;    ///< Checksum of the fixed parts of pesudo\r
-                                ///< header: Src IP, Dst IP, 0, Protocol,\r
-                                ///< do not include the TCP length.\r
-\r
-  TCP_SEQNO         Iss;        ///< Initial Sending Sequence.\r
-  TCP_SEQNO         SndUna;     ///< First unacknowledged data.\r
-  TCP_SEQNO         SndNxt;     ///< Next data sequence to send.\r
-  TCP_SEQNO         SndPsh;     ///< Send PUSH point.\r
-  TCP_SEQNO         SndUp;      ///< Send urgent point.\r
-  UINT32            SndWnd;     ///< Window advertised by the remote peer.\r
-  UINT32            SndWndMax;  ///< Max send window advertised by the peer.\r
-  TCP_SEQNO         SndWl1;     ///< Seq number used for last window update.\r
-  TCP_SEQNO         SndWl2;     ///< Ack no of last window update.\r
-  UINT16            SndMss;     ///< Max send segment size.\r
-  TCP_SEQNO         RcvNxt;     ///< Next sequence no to receive.\r
-  UINT32            RcvWnd;     ///< Window advertised by the local peer.\r
-  TCP_SEQNO         RcvWl2;     ///< The RcvNxt (or ACK) of last window update.\r
-                                ///< It is necessary because of delayed ACK.\r
-\r
-  TCP_SEQNO         RcvUp;                   ///< Urgent point;\r
-  TCP_SEQNO         Irs;                     ///< Initial Receiving Sequence.\r
-  UINT16            RcvMss;                  ///< Max receive segment size.\r
-  UINT16            EnabledTimer;            ///< Which timer is currently enabled.\r
-  UINT32            Timer[TCP_TIMER_NUMBER]; ///< When the timer will expire.\r
-  INT32             NextExpire;  ///< Countdown offset for the nearest timer.\r
-  UINT32            Idle;        ///< How long the connection is in idle.\r
-  UINT32            ProbeTime;   ///< The time out value for current window prober.\r
-  BOOLEAN           ProbeTimerOn;///< If TRUE, the probe time is on.\r
+  UINT8               State;      ///< TCP state, such as SYN_SENT, LISTEN.\r
+  UINT8               DelayedAck; ///< Number of delayed ACKs.\r
+  UINT16              HeadSum;    ///< Checksum of the fixed parts of pesudo\r
+                                  ///< header: Src IP, Dst IP, 0, Protocol,\r
+                                  ///< do not include the TCP length.\r
+\r
+  TCP_SEQNO           Iss;       ///< Initial Sending Sequence.\r
+  TCP_SEQNO           SndUna;    ///< First unacknowledged data.\r
+  TCP_SEQNO           SndNxt;    ///< Next data sequence to send.\r
+  TCP_SEQNO           SndPsh;    ///< Send PUSH point.\r
+  TCP_SEQNO           SndUp;     ///< Send urgent point.\r
+  UINT32              SndWnd;    ///< Window advertised by the remote peer.\r
+  UINT32              SndWndMax; ///< Max send window advertised by the peer.\r
+  TCP_SEQNO           SndWl1;    ///< Seq number used for last window update.\r
+  TCP_SEQNO           SndWl2;    ///< Ack no of last window update.\r
+  UINT16              SndMss;    ///< Max send segment size.\r
+  TCP_SEQNO           RcvNxt;    ///< Next sequence no to receive.\r
+  UINT32              RcvWnd;    ///< Window advertised by the local peer.\r
+  TCP_SEQNO           RcvWl2;    ///< The RcvNxt (or ACK) of last window update.\r
+                                 ///< It is necessary because of delayed ACK.\r
+\r
+  TCP_SEQNO           RcvUp;                   ///< Urgent point;\r
+  TCP_SEQNO           Irs;                     ///< Initial Receiving Sequence.\r
+  UINT16              RcvMss;                  ///< Max receive segment size.\r
+  UINT16              EnabledTimer;            ///< Which timer is currently enabled.\r
+  UINT32              Timer[TCP_TIMER_NUMBER]; ///< When the timer will expire.\r
+  INT32               NextExpire;              ///< Countdown offset for the nearest timer.\r
+  UINT32              Idle;                    ///< How long the connection is in idle.\r
+  UINT32              ProbeTime;               ///< The time out value for current window prober.\r
+  BOOLEAN             ProbeTimerOn;            ///< If TRUE, the probe time is on.\r
 \r
   //\r
   // RFC1323 defined variables, about window scale,\r
   // timestamp and PAWS\r
   //\r
-  UINT8             SndWndScale;  ///< Wndscale received from the peer.\r
-  UINT8             RcvWndScale;  ///< Wndscale used to scale local buffer.\r
-  UINT32            TsRecent;     ///< TsRecent to echo to the remote peer.\r
-  UINT32            TsRecentAge;  ///< When this TsRecent is updated.\r
+  UINT8               SndWndScale; ///< Wndscale received from the peer.\r
+  UINT8               RcvWndScale; ///< Wndscale used to scale local buffer.\r
+  UINT32              TsRecent;    ///< TsRecent to echo to the remote peer.\r
+  UINT32              TsRecentAge; ///< When this TsRecent is updated.\r
 \r
   //\r
   // RFC2988 defined variables. about RTT measurement\r
   //\r
-  TCP_SEQNO         RttSeq;     ///< The seq of measured segment now.\r
-  UINT32            RttMeasure; ///< Currently measured RTT in heartbeats.\r
-  UINT32            SRtt;       ///< Smoothed RTT, scaled by 8.\r
-  UINT32            RttVar;     ///< RTT variance, scaled by 8.\r
-  UINT32            Rto;        ///< Current RTO, not scaled.\r
+  TCP_SEQNO           RttSeq;     ///< The seq of measured segment now.\r
+  UINT32              RttMeasure; ///< Currently measured RTT in heartbeats.\r
+  UINT32              SRtt;       ///< Smoothed RTT, scaled by 8.\r
+  UINT32              RttVar;     ///< RTT variance, scaled by 8.\r
+  UINT32              Rto;        ///< Current RTO, not scaled.\r
 \r
   //\r
   // RFC2581, and 3782 variables.\r
   // Congestion control + NewReno fast recovery.\r
   //\r
-  UINT32            CWnd;         ///< Sender's congestion window.\r
-  UINT32            Ssthresh;     ///< Slow start threshold.\r
-  TCP_SEQNO         Recover;      ///< Recover point for NewReno.\r
-  UINT16            DupAck;       ///< Number of duplicate ACKs.\r
-  UINT8             CongestState; ///< The current congestion state(RFC3782).\r
-  UINT8             LossTimes;    ///< Number of retxmit timeouts in a row.\r
-  TCP_SEQNO         LossRecover;  ///< Recover point for retxmit.\r
+  UINT32              CWnd;         ///< Sender's congestion window.\r
+  UINT32              Ssthresh;     ///< Slow start threshold.\r
+  TCP_SEQNO           Recover;      ///< Recover point for NewReno.\r
+  UINT16              DupAck;       ///< Number of duplicate ACKs.\r
+  UINT8               CongestState; ///< The current congestion state(RFC3782).\r
+  UINT8               LossTimes;    ///< Number of retxmit timeouts in a row.\r
+  TCP_SEQNO           LossRecover;  ///< Recover point for retxmit.\r
 \r
   //\r
   // RFC7323\r
   // Addressing Window Retraction for TCP Window Scale Option.\r
   //\r
-  TCP_SEQNO         RetxmitSeqMax;       ///< Max Seq number in previous retransmission.\r
+  TCP_SEQNO           RetxmitSeqMax;     ///< Max Seq number in previous retransmission.\r
 \r
   //\r
   // configuration parameters, for EFI_TCP4_PROTOCOL specification\r
   //\r
-  UINT32            KeepAliveIdle;   ///< Idle time before sending first probe.\r
-  UINT32            KeepAlivePeriod; ///< Interval for subsequent keep alive probe.\r
-  UINT8             MaxKeepAlive;    ///< Maximum keep alive probe times.\r
-  UINT8             KeepAliveProbes; ///< The number of keep alive probe.\r
-  UINT16            MaxRexmit;       ///< The maximum number of retxmit before abort.\r
-  UINT32            FinWait2Timeout; ///< The FIN_WAIT_2 timeout.\r
-  UINT32            TimeWaitTimeout; ///< The TIME_WAIT timeout.\r
-  UINT32            ConnectTimeout;  ///< The connect establishment timeout.\r
+  UINT32              KeepAliveIdle;   ///< Idle time before sending first probe.\r
+  UINT32              KeepAlivePeriod; ///< Interval for subsequent keep alive probe.\r
+  UINT8               MaxKeepAlive;    ///< Maximum keep alive probe times.\r
+  UINT8               KeepAliveProbes; ///< The number of keep alive probe.\r
+  UINT16              MaxRexmit;       ///< The maximum number of retxmit before abort.\r
+  UINT32              FinWait2Timeout; ///< The FIN_WAIT_2 timeout.\r
+  UINT32              TimeWaitTimeout; ///< The TIME_WAIT timeout.\r
+  UINT32              ConnectTimeout;  ///< The connect establishment timeout.\r
 \r
   //\r
   // configuration for tcp provided by user\r
   //\r
-  BOOLEAN           UseDefaultAddr;\r
-  UINT8             Tos;\r
-  UINT8             Ttl;\r
-  EFI_IPv4_ADDRESS  SubnetMask;\r
-\r
-\r
-  BOOLEAN           RemoteIpZero;   ///< RemoteEnd.Ip is ZERO when configured.\r
-  IP_IO_IP_INFO     *IpInfo;        ///< Pointer reference to Ip used to send pkt\r
-  UINT32            Tick;           ///< 1 tick = 200ms\r
+  BOOLEAN             UseDefaultAddr;\r
+  UINT8               Tos;\r
+  UINT8               Ttl;\r
+  EFI_IPv4_ADDRESS    SubnetMask;\r
+\r
+  BOOLEAN             RemoteIpZero; ///< RemoteEnd.Ip is ZERO when configured.\r
+  IP_IO_IP_INFO       *IpInfo;      ///< Pointer reference to Ip used to send pkt\r
+  UINT32              Tick;         ///< 1 tick = 200ms\r
 };\r
 \r
 #endif\r
index 04caf8e509f14a6818abf68a6ba00af18c23ff1a..5d2e124977d9251d569bc6d8c9b821de6ce9bdf5 100644 (file)
@@ -9,7 +9,7 @@
 \r
 #include "TcpMain.h"\r
 \r
-UINT32    mTcpTick = 1000;\r
+UINT32  mTcpTick = 1000;\r
 \r
 /**\r
   Connect timeout handler.\r
@@ -19,7 +19,7 @@ UINT32    mTcpTick = 1000;
 **/\r
 VOID\r
 TcpConnectTimeout (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -30,7 +30,7 @@ TcpConnectTimeout (
 **/\r
 VOID\r
 TcpRexmitTimeout (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -41,7 +41,7 @@ TcpRexmitTimeout (
 **/\r
 VOID\r
 TcpProbeTimeout (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -52,7 +52,7 @@ TcpProbeTimeout (
 **/\r
 VOID\r
 TcpKeepaliveTimeout (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -63,7 +63,7 @@ TcpKeepaliveTimeout (
 **/\r
 VOID\r
 TcpFinwait2Timeout (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   );\r
 \r
 /**\r
@@ -74,10 +74,10 @@ TcpFinwait2Timeout (
 **/\r
 VOID\r
 Tcp2MSLTimeout (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   );\r
 \r
-TCP_TIMER_HANDLER mTcpTimerHandler[TCP_TIMER_NUMBER] = {\r
+TCP_TIMER_HANDLER  mTcpTimerHandler[TCP_TIMER_NUMBER] = {\r
   TcpConnectTimeout,\r
   TcpRexmitTimeout,\r
   TcpProbeTimeout,\r
@@ -94,7 +94,7 @@ TCP_TIMER_HANDLER mTcpTimerHandler[TCP_TIMER_NUMBER] = {
 **/\r
 VOID\r
 TcpClose (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
   NetbufFreeList (&Tcb->SndQue);\r
@@ -111,7 +111,7 @@ TcpClose (
 **/\r
 VOID\r
 TcpBackoffRto (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
   //\r
@@ -121,16 +121,14 @@ TcpBackoffRto (
   //\r
   if ((Tcb->LossTimes >= TCP_FOLD_RTT) && (Tcb->SRtt != 0)) {\r
     Tcb->RttVar += Tcb->SRtt >> 2;\r
-    Tcb->SRtt = 0;\r
+    Tcb->SRtt    = 0;\r
   }\r
 \r
   Tcb->Rto <<= 1;\r
 \r
   if (Tcb->Rto < TCP_RTO_MIN) {\r
-\r
     Tcb->Rto = TCP_RTO_MIN;\r
   } else if (Tcb->Rto > TCP_RTO_MAX) {\r
-\r
     Tcb->Rto = TCP_RTO_MAX;\r
   }\r
 }\r
@@ -143,14 +141,14 @@ TcpBackoffRto (
 **/\r
 VOID\r
 TcpConnectTimeout (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
   if (!TCP_CONNECTED (Tcb->State)) {\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "TcpConnectTimeout: connection closed because connection timer timeout for TCB %p\n",\r
-      Tcb)\r
+       "TcpConnectTimeout: connection closed because connection timer timeout for TCB %p\n",\r
+       Tcb)\r
       );\r
 \r
     if (EFI_ABORTED == Tcb->Sk->SockError) {\r
@@ -160,19 +158,17 @@ TcpConnectTimeout (
     if (TCP_SYN_RCVD == Tcb->State) {\r
       DEBUG (\r
         (DEBUG_WARN,\r
-        "TcpConnectTimeout: send reset because connection timer timeout for TCB %p\n",\r
-        Tcb)\r
+         "TcpConnectTimeout: send reset because connection timer timeout for TCB %p\n",\r
+         Tcb)\r
         );\r
 \r
       TcpResetConnection (Tcb);\r
-\r
     }\r
 \r
     TcpClose (Tcb);\r
   }\r
 }\r
 \r
-\r
 /**\r
   Timeout handler for TCP retransmission timer.\r
 \r
@@ -181,15 +177,15 @@ TcpConnectTimeout (
 **/\r
 VOID\r
 TcpRexmitTimeout (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
   UINT32  FlightSize;\r
 \r
   DEBUG (\r
     (DEBUG_WARN,\r
-    "TcpRexmitTimeout: transmission timeout for TCB %p\n",\r
-    Tcb)\r
+     "TcpRexmitTimeout: transmission timeout for TCB %p\n",\r
+     Tcb)\r
     );\r
 \r
   //\r
@@ -197,19 +193,18 @@ TcpRexmitTimeout (
   // amount of data that has been sent but not\r
   // yet ACKed.\r
   //\r
-  FlightSize        = TCP_SUB_SEQ (Tcb->SndNxt, Tcb->SndUna);\r
-  Tcb->Ssthresh     = MAX ((UINT32) (2 * Tcb->SndMss), FlightSize / 2);\r
+  FlightSize    = TCP_SUB_SEQ (Tcb->SndNxt, Tcb->SndUna);\r
+  Tcb->Ssthresh = MAX ((UINT32)(2 * Tcb->SndMss), FlightSize / 2);\r
 \r
-  Tcb->CWnd         = Tcb->SndMss;\r
-  Tcb->LossRecover  = Tcb->SndNxt;\r
+  Tcb->CWnd        = Tcb->SndMss;\r
+  Tcb->LossRecover = Tcb->SndNxt;\r
 \r
   Tcb->LossTimes++;\r
   if ((Tcb->LossTimes > Tcb->MaxRexmit) && !TCP_TIMER_ON (Tcb->EnabledTimer, TCP_TIMER_CONNECT)) {\r
-\r
     DEBUG (\r
       (DEBUG_ERROR,\r
-      "TcpRexmitTimeout: connection closed because too many timeouts for TCB %p\n",\r
-      Tcb)\r
+       "TcpRexmitTimeout: connection closed because too many timeouts for TCB %p\n",\r
+       Tcb)\r
       );\r
 \r
     if (EFI_ABORTED == Tcb->Sk->SockError) {\r
@@ -217,7 +212,7 @@ TcpRexmitTimeout (
     }\r
 \r
     TcpClose (Tcb);\r
-    return ;\r
+    return;\r
   }\r
 \r
   TcpBackoffRto (Tcb);\r
@@ -237,7 +232,7 @@ TcpRexmitTimeout (
 **/\r
 VOID\r
 TcpProbeTimeout (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
   //\r
@@ -247,10 +242,9 @@ TcpProbeTimeout (
   // the probe timer, since retransmit timer is on.\r
   //\r
   if ((TcpDataToSend (Tcb, 1) != 0) && (TcpToSendData (Tcb, 1) > 0)) {\r
-\r
     ASSERT (TCP_TIMER_ON (Tcb->EnabledTimer, TCP_TIMER_REXMIT) != 0);\r
     Tcb->ProbeTimerOn = FALSE;\r
-    return ;\r
+    return;\r
   }\r
 \r
   TcpSendZeroProbe (Tcb);\r
@@ -265,7 +259,7 @@ TcpProbeTimeout (
 **/\r
 VOID\r
 TcpKeepaliveTimeout (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
   Tcb->KeepAliveProbes++;\r
@@ -274,13 +268,12 @@ TcpKeepaliveTimeout (
   // Too many Keep-alive probes, drop the connection\r
   //\r
   if (Tcb->KeepAliveProbes > Tcb->MaxKeepAlive) {\r
-\r
     if (EFI_ABORTED == Tcb->Sk->SockError) {\r
       SOCK_ERROR (Tcb->Sk, EFI_TIMEOUT);\r
     }\r
 \r
     TcpClose (Tcb);\r
-    return ;\r
+    return;\r
   }\r
 \r
   TcpSendZeroProbe (Tcb);\r
@@ -295,13 +288,13 @@ TcpKeepaliveTimeout (
 **/\r
 VOID\r
 TcpFinwait2Timeout (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
   DEBUG (\r
     (DEBUG_WARN,\r
-    "TcpFinwait2Timeout: connection closed because FIN_WAIT2 timer timeouts for TCB %p\n",\r
-    Tcb)\r
+     "TcpFinwait2Timeout: connection closed because FIN_WAIT2 timer timeouts for TCB %p\n",\r
+     Tcb)\r
     );\r
 \r
   TcpClose (Tcb);\r
@@ -315,13 +308,13 @@ TcpFinwait2Timeout (
 **/\r
 VOID\r
 Tcp2MSLTimeout (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
   DEBUG (\r
     (DEBUG_WARN,\r
-    "Tcp2MSLTimeout: connection closed because TIME_WAIT timer timeouts for TCB %p\n",\r
-    Tcb)\r
+     "Tcp2MSLTimeout: connection closed because TIME_WAIT timer timeouts for TCB %p\n",\r
+     Tcb)\r
     );\r
 \r
   TcpClose (Tcb);\r
@@ -336,7 +329,7 @@ Tcp2MSLTimeout (
 **/\r
 VOID\r
 TcpUpdateTimer (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
   UINT16  Index;\r
@@ -349,11 +342,10 @@ TcpUpdateTimer (
   TCP_CLEAR_FLG (Tcb->CtrlFlag, TCP_CTRL_TIMER_ON);\r
 \r
   for (Index = 0; Index < TCP_TIMER_NUMBER; Index++) {\r
-\r
     if (TCP_TIMER_ON (Tcb->EnabledTimer, Index) &&\r
         TCP_TIME_LT (Tcb->Timer[Index], mTcpTick + Tcb->NextExpire)\r
-        ) {\r
-\r
+        )\r
+    {\r
       Tcb->NextExpire = TCP_SUB_TIME (Tcb->Timer[Index], mTcpTick);\r
       TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_TIMER_ON);\r
     }\r
@@ -370,9 +362,9 @@ TcpUpdateTimer (
 **/\r
 VOID\r
 TcpSetTimer (\r
-  IN OUT TCP_CB *Tcb,\r
-  IN     UINT16 Timer,\r
-  IN     UINT32 TimeOut\r
+  IN OUT TCP_CB  *Tcb,\r
+  IN     UINT16  Timer,\r
+  IN     UINT32  TimeOut\r
   )\r
 {\r
   TCP_SET_TIMER (Tcb->EnabledTimer, Timer);\r
@@ -390,8 +382,8 @@ TcpSetTimer (
 **/\r
 VOID\r
 TcpClearTimer (\r
-  IN OUT TCP_CB *Tcb,\r
-  IN     UINT16 Timer\r
+  IN OUT TCP_CB  *Tcb,\r
+  IN     UINT16  Timer\r
   )\r
 {\r
   TCP_CLEAR_TIMER (Tcb->EnabledTimer, Timer);\r
@@ -406,7 +398,7 @@ TcpClearTimer (
 **/\r
 VOID\r
 TcpClearAllTimer (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
   Tcb->EnabledTimer = 0;\r
@@ -421,22 +413,19 @@ TcpClearAllTimer (
 **/\r
 VOID\r
 TcpSetProbeTimer (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
   if (!Tcb->ProbeTimerOn) {\r
     Tcb->ProbeTime    = Tcb->Rto;\r
     Tcb->ProbeTimerOn = TRUE;\r
-\r
   } else {\r
     Tcb->ProbeTime <<= 1;\r
   }\r
 \r
   if (Tcb->ProbeTime < TCP_RTO_MIN) {\r
-\r
     Tcb->ProbeTime = TCP_RTO_MIN;\r
   } else if (Tcb->ProbeTime > TCP_RTO_MAX) {\r
-\r
     Tcb->ProbeTime = TCP_RTO_MAX;\r
   }\r
 \r
@@ -451,12 +440,11 @@ TcpSetProbeTimer (
 **/\r
 VOID\r
 TcpSetKeepaliveTimer (\r
-  IN OUT TCP_CB *Tcb\r
+  IN OUT TCP_CB  *Tcb\r
   )\r
 {\r
   if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_KEEPALIVE)) {\r
-    return ;\r
-\r
+    return;\r
   }\r
 \r
   //\r
@@ -468,13 +456,11 @@ TcpSetKeepaliveTimer (
   //\r
   if (!TCP_TIMER_ON (Tcb->EnabledTimer, TCP_TIMER_KEEPALIVE) ||\r
       (Tcb->Idle < Tcb->KeepAliveIdle)\r
-      ) {\r
-\r
+      )\r
+  {\r
     TcpSetTimer (Tcb, TCP_TIMER_KEEPALIVE, Tcb->KeepAliveIdle);\r
     Tcb->KeepAliveProbes = 0;\r
-\r
   } else {\r
-\r
     TcpSetTimer (Tcb, TCP_TIMER_KEEPALIVE, Tcb->KeepAlivePeriod);\r
   }\r
 }\r
@@ -488,13 +474,13 @@ TcpSetKeepaliveTimer (
 VOID\r
 EFIAPI\r
 TcpTickingDpc (\r
-  IN VOID       *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  LIST_ENTRY      *Entry;\r
-  LIST_ENTRY      *Next;\r
-  TCP_CB          *Tcb;\r
-  INT16           Index;\r
+  LIST_ENTRY  *Entry;\r
+  LIST_ENTRY  *Next;\r
+  TCP_CB      *Tcb;\r
+  INT16       Index;\r
 \r
   mTcpTick++;\r
   mTcpGlobalIss += TCP_ISS_INCREMENT_2;\r
@@ -503,14 +489,14 @@ TcpTickingDpc (
   // Don't use LIST_FOR_EACH, which isn't delete safe.\r
   //\r
   for (Entry = mTcpRunQue.ForwardLink; Entry != &mTcpRunQue; Entry = Next) {\r
+    Next = Entry->ForwardLink;\r
 \r
-    Next  = Entry->ForwardLink;\r
-\r
-    Tcb   = NET_LIST_USER_STRUCT (Entry, TCP_CB, List);\r
+    Tcb = NET_LIST_USER_STRUCT (Entry, TCP_CB, List);\r
 \r
     if (Tcb->State == TCP_CLOSED) {\r
       continue;\r
     }\r
+\r
     //\r
     // The connection is doing RTT measurement.\r
     //\r
@@ -524,7 +510,7 @@ TcpTickingDpc (
       TcpSendAck (Tcb);\r
     }\r
 \r
-    if (Tcb->IpInfo->IpVersion == IP_VERSION_6 && Tcb->Tick > 0) {\r
+    if ((Tcb->IpInfo->IpVersion == IP_VERSION_6) && (Tcb->Tick > 0)) {\r
       Tcb->Tick--;\r
     }\r
 \r
@@ -532,7 +518,6 @@ TcpTickingDpc (
     // No timer is active or no timer expired\r
     //\r
     if (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_TIMER_ON) || ((--Tcb->NextExpire) > 0)) {\r
-\r
       continue;\r
     }\r
 \r
@@ -540,7 +525,6 @@ TcpTickingDpc (
     // Call the timeout handler for each expired timer.\r
     //\r
     for (Index = 0; Index < TCP_TIMER_NUMBER; Index++) {\r
-\r
       if (TCP_TIMER_ON (Tcb->EnabledTimer, Index) && TCP_TIME_LEQ (Tcb->Timer[Index], mTcpTick)) {\r
         //\r
         // disable the timer before calling the handler\r
@@ -578,8 +562,8 @@ TcpTickingDpc (
 VOID\r
 EFIAPI\r
 TcpTicking (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   QueueDpc (TPL_CALLBACK, TcpTickingDpc, Context);\r
index c0870ab9979c46e2a31c875a8f3a19db1b14c3d8..5cf8b0d838455faba358c7224230c8a31f7784cc 100644 (file)
@@ -24,13 +24,13 @@ TlsAuthConfigDxeUnload (
   IN EFI_HANDLE  ImageHandle\r
   )\r
 {\r
-  EFI_STATUS                     Status;\r
-  TLS_AUTH_CONFIG_PRIVATE_DATA   *PrivateData;\r
+  EFI_STATUS                    Status;\r
+  TLS_AUTH_CONFIG_PRIVATE_DATA  *PrivateData;\r
 \r
   Status = gBS->HandleProtocol (\r
                   ImageHandle,\r
                   &gEfiCallerIdGuid,\r
-                  (VOID **) &PrivateData\r
+                  (VOID **)&PrivateData\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -70,7 +70,7 @@ TlsAuthConfigDxeDriverEntryPoint (
 {\r
   EFI_STATUS  Status;\r
 \r
-  TLS_AUTH_CONFIG_PRIVATE_DATA   *PrivateData;\r
+  TLS_AUTH_CONFIG_PRIVATE_DATA  *PrivateData;\r
 \r
   PrivateData = NULL;\r
 \r
@@ -125,4 +125,3 @@ ON_ERROR:
 \r
   return Status;\r
 }\r
-\r
index 110fe871450825fbc601b65361b347ebbf0365a5..745155e6d758ea68651c30fc16c1fc120c8fcb1f 100644 (file)
@@ -9,15 +9,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "TlsAuthConfigImpl.h"\r
 \r
-VOID                    *mStartOpCodeHandle = NULL;\r
-VOID                    *mEndOpCodeHandle   = NULL;\r
-EFI_IFR_GUID_LABEL      *mStartLabel        = NULL;\r
-EFI_IFR_GUID_LABEL      *mEndLabel          = NULL;\r
+VOID                *mStartOpCodeHandle = NULL;\r
+VOID                *mEndOpCodeHandle   = NULL;\r
+EFI_IFR_GUID_LABEL  *mStartLabel        = NULL;\r
+EFI_IFR_GUID_LABEL  *mEndLabel          = NULL;\r
 \r
+CHAR16  mTlsAuthConfigStorageName[] = L"TLS_AUTH_CONFIG_IFR_NVDATA";\r
 \r
-CHAR16                  mTlsAuthConfigStorageName[] = L"TLS_AUTH_CONFIG_IFR_NVDATA";\r
-\r
-TLS_AUTH_CONFIG_PRIVATE_DATA      *mTlsAuthPrivateData = NULL;\r
+TLS_AUTH_CONFIG_PRIVATE_DATA  *mTlsAuthPrivateData = NULL;\r
 \r
 HII_VENDOR_DEVICE_PATH  mTlsAuthConfigHiiVendorDevicePath = {\r
   {\r
@@ -25,8 +24,8 @@ HII_VENDOR_DEVICE_PATH  mTlsAuthConfigHiiVendorDevicePath = {
       HARDWARE_DEVICE_PATH,\r
       HW_VENDOR_DP,\r
       {\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     TLS_AUTH_CONFIG_GUID\r
@@ -35,8 +34,8 @@ HII_VENDOR_DEVICE_PATH  mTlsAuthConfigHiiVendorDevicePath = {
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
     {\r
-      (UINT8) (END_DEVICE_PATH_LENGTH),\r
-      (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
+      (UINT8)(END_DEVICE_PATH_LENGTH),\r
+      (UINT8)((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r
   }\r
 };\r
@@ -44,7 +43,7 @@ HII_VENDOR_DEVICE_PATH  mTlsAuthConfigHiiVendorDevicePath = {
 //\r
 // Possible DER-encoded certificate file suffixes, end with NULL pointer.\r
 //\r
-CHAR16mDerPemEncodedSuffix[] = {\r
+CHAR16  *mDerPemEncodedSuffix[] = {\r
   L".cer",\r
   L".der",\r
   L".crt",\r
@@ -63,15 +62,17 @@ CHAR16* mDerPemEncodedSuffix[] = {
 **/\r
 BOOLEAN\r
 IsDerPemEncodeCertificate (\r
-  IN CONST CHAR16         *FileSuffix\r
-)\r
+  IN CONST CHAR16  *FileSuffix\r
+  )\r
 {\r
-  UINTN     Index;\r
+  UINTN  Index;\r
+\r
   for (Index = 0; mDerPemEncodedSuffix[Index] != NULL; Index++) {\r
     if (StrCmp (FileSuffix, mDerPemEncodedSuffix[Index]) == 0) {\r
       return TRUE;\r
     }\r
   }\r
+\r
   return FALSE;\r
 }\r
 \r
@@ -117,35 +118,35 @@ GuidToString (
 **/\r
 EFI_STATUS\r
 UpdateDeletePage (\r
-  IN TLS_AUTH_CONFIG_PRIVATE_DATA     *Private,\r
-  IN CHAR16                           *VariableName,\r
-  IN EFI_GUID                         *VendorGuid,\r
-  IN UINT16                           LabelNumber,\r
-  IN EFI_FORM_ID                      FormId,\r
-  IN EFI_QUESTION_ID                  QuestionIdBase\r
+  IN TLS_AUTH_CONFIG_PRIVATE_DATA  *Private,\r
+  IN CHAR16                        *VariableName,\r
+  IN EFI_GUID                      *VendorGuid,\r
+  IN UINT16                        LabelNumber,\r
+  IN EFI_FORM_ID                   FormId,\r
+  IN EFI_QUESTION_ID               QuestionIdBase\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  UINT32                      Index;\r
-  UINTN                       CertCount;\r
-  UINTN                       GuidIndex;\r
-  VOID                        *StartOpCodeHandle;\r
-  VOID                        *EndOpCodeHandle;\r
-  EFI_IFR_GUID_LABEL          *StartLabel;\r
-  EFI_IFR_GUID_LABEL          *EndLabel;\r
-  UINTN                       DataSize;\r
-  UINT8                       *Data;\r
-  EFI_SIGNATURE_LIST          *CertList;\r
-  EFI_SIGNATURE_DATA          *Cert;\r
-  UINT32                      ItemDataSize;\r
-  CHAR16                      *GuidStr;\r
-  EFI_STRING_ID               GuidID;\r
-  EFI_STRING_ID               Help;\r
-\r
-  Data     = NULL;\r
-  CertList = NULL;\r
-  Cert     = NULL;\r
-  GuidStr  = NULL;\r
+  EFI_STATUS          Status;\r
+  UINT32              Index;\r
+  UINTN               CertCount;\r
+  UINTN               GuidIndex;\r
+  VOID                *StartOpCodeHandle;\r
+  VOID                *EndOpCodeHandle;\r
+  EFI_IFR_GUID_LABEL  *StartLabel;\r
+  EFI_IFR_GUID_LABEL  *EndLabel;\r
+  UINTN               DataSize;\r
+  UINT8               *Data;\r
+  EFI_SIGNATURE_LIST  *CertList;\r
+  EFI_SIGNATURE_DATA  *Cert;\r
+  UINT32              ItemDataSize;\r
+  CHAR16              *GuidStr;\r
+  EFI_STRING_ID       GuidID;\r
+  EFI_STRING_ID       Help;\r
+\r
+  Data              = NULL;\r
+  CertList          = NULL;\r
+  Cert              = NULL;\r
+  GuidStr           = NULL;\r
   StartOpCodeHandle = NULL;\r
   EndOpCodeHandle   = NULL;\r
 \r
@@ -167,34 +168,34 @@ UpdateDeletePage (
   //\r
   // Create Hii Extend Label OpCode.\r
   //\r
-  StartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                        StartOpCodeHandle,\r
-                                        &gEfiIfrTianoGuid,\r
-                                        NULL,\r
-                                        sizeof (EFI_IFR_GUID_LABEL)\r
-                                        );\r
-  StartLabel->ExtendOpCode  = EFI_IFR_EXTEND_OP_LABEL;\r
-  StartLabel->Number        = LabelNumber;\r
-\r
-  EndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                      EndOpCodeHandle,\r
-                                      &gEfiIfrTianoGuid,\r
-                                      NULL,\r
-                                      sizeof (EFI_IFR_GUID_LABEL)\r
-                                      );\r
-  EndLabel->ExtendOpCode  = EFI_IFR_EXTEND_OP_LABEL;\r
-  EndLabel->Number        = LABEL_END;\r
+  StartLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                       StartOpCodeHandle,\r
+                                       &gEfiIfrTianoGuid,\r
+                                       NULL,\r
+                                       sizeof (EFI_IFR_GUID_LABEL)\r
+                                       );\r
+  StartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
+  StartLabel->Number       = LabelNumber;\r
+\r
+  EndLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                     EndOpCodeHandle,\r
+                                     &gEfiIfrTianoGuid,\r
+                                     NULL,\r
+                                     sizeof (EFI_IFR_GUID_LABEL)\r
+                                     );\r
+  EndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
+  EndLabel->Number       = LABEL_END;\r
 \r
   //\r
   // Read Variable.\r
   //\r
   DataSize = 0;\r
-  Status = gRT->GetVariable (VariableName, VendorGuid, NULL, &DataSize, Data);\r
-  if (EFI_ERROR (Status) && Status != EFI_BUFFER_TOO_SMALL) {\r
+  Status   = gRT->GetVariable (VariableName, VendorGuid, NULL, &DataSize, Data);\r
+  if (EFI_ERROR (Status) && (Status != EFI_BUFFER_TOO_SMALL)) {\r
     goto ON_EXIT;\r
   }\r
 \r
-  Data = (UINT8 *) AllocateZeroPool (DataSize);\r
+  Data = (UINT8 *)AllocateZeroPool (DataSize);\r
   if (Data == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
@@ -214,12 +215,11 @@ UpdateDeletePage (
   //\r
   // Enumerate all data.\r
   //\r
-  ItemDataSize = (UINT32) DataSize;\r
-  CertList = (EFI_SIGNATURE_LIST *) Data;\r
-  GuidIndex = 0;\r
+  ItemDataSize = (UINT32)DataSize;\r
+  CertList     = (EFI_SIGNATURE_LIST *)Data;\r
+  GuidIndex    = 0;\r
 \r
   while ((ItemDataSize > 0) && (ItemDataSize >= CertList->SignatureListSize)) {\r
-\r
     if (CompareGuid (&CertList->SignatureType, &gEfiCertX509Guid)) {\r
       Help = STRING_TOKEN (STR_CERT_TYPE_PCKS_GUID);\r
     } else {\r
@@ -227,24 +227,24 @@ UpdateDeletePage (
       // The signature type is not supported in current implementation.\r
       //\r
       ItemDataSize -= CertList->SignatureListSize;\r
-      CertList = (EFI_SIGNATURE_LIST *) ((UINT8 *) CertList + CertList->SignatureListSize);\r
+      CertList      = (EFI_SIGNATURE_LIST *)((UINT8 *)CertList + CertList->SignatureListSize);\r
       continue;\r
     }\r
 \r
-    CertCount  = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) - CertList->SignatureHeaderSize) / CertList->SignatureSize;\r
+    CertCount = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) - CertList->SignatureHeaderSize) / CertList->SignatureSize;\r
     for (Index = 0; Index < CertCount; Index++) {\r
-      Cert = (EFI_SIGNATURE_DATA *) ((UINT8 *) CertList\r
-                                              + sizeof (EFI_SIGNATURE_LIST)\r
-                                              + CertList->SignatureHeaderSize\r
-                                              + Index * CertList->SignatureSize);\r
+      Cert = (EFI_SIGNATURE_DATA *)((UINT8 *)CertList\r
+                                    + sizeof (EFI_SIGNATURE_LIST)\r
+                                    + CertList->SignatureHeaderSize\r
+                                    + Index * CertList->SignatureSize);\r
       //\r
       // Display GUID and help\r
       //\r
       GuidToString (&Cert->SignatureOwner, GuidStr, 100);\r
-      GuidID  = HiiSetString (Private->RegisteredHandle, 0, GuidStr, NULL);\r
+      GuidID = HiiSetString (Private->RegisteredHandle, 0, GuidStr, NULL);\r
       HiiCreateCheckBoxOpCode (\r
         StartOpCodeHandle,\r
-        (EFI_QUESTION_ID) (QuestionIdBase + GuidIndex++),\r
+        (EFI_QUESTION_ID)(QuestionIdBase + GuidIndex++),\r
         0,\r
         0,\r
         GuidID,\r
@@ -256,7 +256,7 @@ UpdateDeletePage (
     }\r
 \r
     ItemDataSize -= CertList->SignatureListSize;\r
-    CertList = (EFI_SIGNATURE_LIST *) ((UINT8 *) CertList + CertList->SignatureListSize);\r
+    CertList      = (EFI_SIGNATURE_LIST *)((UINT8 *)CertList + CertList->SignatureListSize);\r
   }\r
 \r
 ON_EXIT:\r
@@ -304,110 +304,111 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 DeleteCert (\r
-  IN TLS_AUTH_CONFIG_PRIVATE_DATA     *Private,\r
-  IN CHAR16                           *VariableName,\r
-  IN EFI_GUID                         *VendorGuid,\r
-  IN UINT16                           LabelNumber,\r
-  IN EFI_FORM_ID                      FormId,\r
-  IN EFI_QUESTION_ID                  QuestionIdBase,\r
-  IN UINTN                            DeleteIndex\r
+  IN TLS_AUTH_CONFIG_PRIVATE_DATA  *Private,\r
+  IN CHAR16                        *VariableName,\r
+  IN EFI_GUID                      *VendorGuid,\r
+  IN UINT16                        LabelNumber,\r
+  IN EFI_FORM_ID                   FormId,\r
+  IN EFI_QUESTION_ID               QuestionIdBase,\r
+  IN UINTN                         DeleteIndex\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  UINTN                       DataSize;\r
-  UINT8                       *Data;\r
-  UINT8                       *OldData;\r
-  UINT32                      Attr;\r
-  UINT32                      Index;\r
-  EFI_SIGNATURE_LIST          *CertList;\r
-  EFI_SIGNATURE_LIST          *NewCertList;\r
-  EFI_SIGNATURE_DATA          *Cert;\r
-  UINTN                       CertCount;\r
-  UINT32                      Offset;\r
-  BOOLEAN                     IsItemFound;\r
-  UINT32                      ItemDataSize;\r
-  UINTN                       GuidIndex;\r
-\r
-  Data            = NULL;\r
-  OldData         = NULL;\r
-  CertList        = NULL;\r
-  Cert            = NULL;\r
-  Attr            = 0;\r
+  EFI_STATUS          Status;\r
+  UINTN               DataSize;\r
+  UINT8               *Data;\r
+  UINT8               *OldData;\r
+  UINT32              Attr;\r
+  UINT32              Index;\r
+  EFI_SIGNATURE_LIST  *CertList;\r
+  EFI_SIGNATURE_LIST  *NewCertList;\r
+  EFI_SIGNATURE_DATA  *Cert;\r
+  UINTN               CertCount;\r
+  UINT32              Offset;\r
+  BOOLEAN             IsItemFound;\r
+  UINT32              ItemDataSize;\r
+  UINTN               GuidIndex;\r
+\r
+  Data     = NULL;\r
+  OldData  = NULL;\r
+  CertList = NULL;\r
+  Cert     = NULL;\r
+  Attr     = 0;\r
 \r
   //\r
   // Get original signature list data.\r
   //\r
   DataSize = 0;\r
-  Status = gRT->GetVariable (VariableName, VendorGuid, NULL, &DataSize, NULL);\r
-  if (EFI_ERROR (Status) && Status != EFI_BUFFER_TOO_SMALL) {\r
+  Status   = gRT->GetVariable (VariableName, VendorGuid, NULL, &DataSize, NULL);\r
+  if (EFI_ERROR (Status) && (Status != EFI_BUFFER_TOO_SMALL)) {\r
     goto ON_EXIT;\r
   }\r
 \r
-  OldData = (UINT8 *) AllocateZeroPool (DataSize);\r
+  OldData = (UINT8 *)AllocateZeroPool (DataSize);\r
   if (OldData == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
   }\r
 \r
   Status = gRT->GetVariable (VariableName, VendorGuid, &Attr, &DataSize, OldData);\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
 \r
   //\r
   // Allocate space for new variable.\r
   //\r
-  Data = (UINT8*) AllocateZeroPool (DataSize);\r
+  Data = (UINT8 *)AllocateZeroPool (DataSize);\r
   if (Data == NULL) {\r
-    Status  =  EFI_OUT_OF_RESOURCES;\r
+    Status =  EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
   }\r
 \r
   //\r
   // Enumerate all data and erasing the target item.\r
   //\r
-  IsItemFound = FALSE;\r
-  ItemDataSize = (UINT32) DataSize;\r
-  CertList = (EFI_SIGNATURE_LIST *) OldData;\r
-  Offset = 0;\r
-  GuidIndex = 0;\r
+  IsItemFound  = FALSE;\r
+  ItemDataSize = (UINT32)DataSize;\r
+  CertList     = (EFI_SIGNATURE_LIST *)OldData;\r
+  Offset       = 0;\r
+  GuidIndex    = 0;\r
   while ((ItemDataSize > 0) && (ItemDataSize >= CertList->SignatureListSize)) {\r
     if (CompareGuid (&CertList->SignatureType, &gEfiCertX509Guid)) {\r
       //\r
       // Copy EFI_SIGNATURE_LIST header then calculate the signature count in this list.\r
       //\r
-      CopyMem (Data + Offset, CertList, (sizeof(EFI_SIGNATURE_LIST) + CertList->SignatureHeaderSize));\r
-      NewCertList = (EFI_SIGNATURE_LIST*) (Data + Offset);\r
-      Offset += (sizeof(EFI_SIGNATURE_LIST) + CertList->SignatureHeaderSize);\r
-      Cert      = (EFI_SIGNATURE_DATA *) ((UINT8 *) CertList + sizeof (EFI_SIGNATURE_LIST) + CertList->SignatureHeaderSize);\r
-      CertCount  = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) - CertList->SignatureHeaderSize) / CertList->SignatureSize;\r
+      CopyMem (Data + Offset, CertList, (sizeof (EFI_SIGNATURE_LIST) + CertList->SignatureHeaderSize));\r
+      NewCertList = (EFI_SIGNATURE_LIST *)(Data + Offset);\r
+      Offset     += (sizeof (EFI_SIGNATURE_LIST) + CertList->SignatureHeaderSize);\r
+      Cert        = (EFI_SIGNATURE_DATA *)((UINT8 *)CertList + sizeof (EFI_SIGNATURE_LIST) + CertList->SignatureHeaderSize);\r
+      CertCount   = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) - CertList->SignatureHeaderSize) / CertList->SignatureSize;\r
       for (Index = 0; Index < CertCount; Index++) {\r
         if (GuidIndex == DeleteIndex) {\r
           //\r
           // Find it! Skip it!\r
           //\r
           NewCertList->SignatureListSize -= CertList->SignatureSize;\r
-          IsItemFound = TRUE;\r
+          IsItemFound                     = TRUE;\r
         } else {\r
           //\r
           // This item doesn't match. Copy it to the Data buffer.\r
           //\r
-          CopyMem (Data + Offset, (UINT8*)(Cert), CertList->SignatureSize);\r
+          CopyMem (Data + Offset, (UINT8 *)(Cert), CertList->SignatureSize);\r
           Offset += CertList->SignatureSize;\r
         }\r
+\r
         GuidIndex++;\r
-        Cert = (EFI_SIGNATURE_DATA *) ((UINT8 *) Cert + CertList->SignatureSize);\r
+        Cert = (EFI_SIGNATURE_DATA *)((UINT8 *)Cert + CertList->SignatureSize);\r
       }\r
     } else {\r
       //\r
       // This List doesn't match. Just copy it to the Data buffer.\r
       //\r
-      CopyMem (Data + Offset, (UINT8*)(CertList), CertList->SignatureListSize);\r
+      CopyMem (Data + Offset, (UINT8 *)(CertList), CertList->SignatureListSize);\r
       Offset += CertList->SignatureListSize;\r
     }\r
 \r
     ItemDataSize -= CertList->SignatureListSize;\r
-    CertList = (EFI_SIGNATURE_LIST *) ((UINT8 *) CertList + CertList->SignatureListSize);\r
+    CertList      = (EFI_SIGNATURE_LIST *)((UINT8 *)CertList + CertList->SignatureListSize);\r
   }\r
 \r
   if (!IsItemFound) {\r
@@ -422,23 +423,24 @@ DeleteCert (
   // Delete the EFI_SIGNATURE_LIST header if there is no signature in the list.\r
   //\r
   ItemDataSize = Offset;\r
-  CertList = (EFI_SIGNATURE_LIST *) Data;\r
-  Offset = 0;\r
+  CertList     = (EFI_SIGNATURE_LIST *)Data;\r
+  Offset       = 0;\r
   ZeroMem (OldData, ItemDataSize);\r
   while ((ItemDataSize > 0) && (ItemDataSize >= CertList->SignatureListSize)) {\r
-    CertCount  = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) - CertList->SignatureHeaderSize) / CertList->SignatureSize;\r
+    CertCount = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) - CertList->SignatureHeaderSize) / CertList->SignatureSize;\r
     DEBUG ((DEBUG_INFO, "       CertCount = %x\n", CertCount));\r
     if (CertCount != 0) {\r
-      CopyMem (OldData + Offset, (UINT8*)(CertList), CertList->SignatureListSize);\r
+      CopyMem (OldData + Offset, (UINT8 *)(CertList), CertList->SignatureListSize);\r
       Offset += CertList->SignatureListSize;\r
     }\r
+\r
     ItemDataSize -= CertList->SignatureListSize;\r
-    CertList = (EFI_SIGNATURE_LIST *) ((UINT8 *) CertList + CertList->SignatureListSize);\r
+    CertList      = (EFI_SIGNATURE_LIST *)((UINT8 *)CertList + CertList->SignatureListSize);\r
   }\r
 \r
   DataSize = Offset;\r
 \r
-  Status = gRT->SetVariable(\r
+  Status = gRT->SetVariable (\r
                   VariableName,\r
                   VendorGuid,\r
                   Attr,\r
@@ -452,11 +454,11 @@ DeleteCert (
 \r
 ON_EXIT:\r
   if (Data != NULL) {\r
-    FreePool(Data);\r
+    FreePool (Data);\r
   }\r
 \r
   if (OldData != NULL) {\r
-    FreePool(OldData);\r
+    FreePool (OldData);\r
   }\r
 \r
   return UpdateDeletePage (\r
@@ -469,7 +471,6 @@ ON_EXIT:
            );\r
 }\r
 \r
-\r
 /**\r
   Clean the file related resource.\r
 \r
@@ -478,14 +479,14 @@ ON_EXIT:
 **/\r
 VOID\r
 CleanFileContext (\r
-  IN TLS_AUTH_CONFIG_PRIVATE_DATA     *Private\r
+  IN TLS_AUTH_CONFIG_PRIVATE_DATA  *Private\r
   )\r
 {\r
   if (Private->FileContext->FHandle != NULL) {\r
     Private->FileContext->FHandle->Close (Private->FileContext->FHandle);\r
     Private->FileContext->FHandle = NULL;\r
-    if (Private->FileContext->FileName!= NULL){\r
-      FreePool(Private->FileContext->FileName);\r
+    if (Private->FileContext->FileName != NULL) {\r
+      FreePool (Private->FileContext->FileName);\r
       Private->FileContext->FileName = NULL;\r
     }\r
   }\r
@@ -509,17 +510,17 @@ CleanFileContext (
 **/\r
 EFI_STATUS\r
 ReadFileContent (\r
-  IN      EFI_FILE_HANDLE           FileHandle,\r
-  IN OUT  VOID                      **BufferPtr,\r
-     OUT  UINTN                     *FileSize,\r
-  IN      UINTN                     AddtionAllocateSize\r
+  IN      EFI_FILE_HANDLE  FileHandle,\r
+  IN OUT  VOID             **BufferPtr,\r
+  OUT  UINTN               *FileSize,\r
+  IN      UINTN            AddtionAllocateSize\r
   )\r
 \r
 {\r
-  UINTN      BufferSize;\r
-  UINT64     SourceFileSize;\r
-  VOID       *Buffer;\r
-  EFI_STATUS Status;\r
+  UINTN       BufferSize;\r
+  UINT64      SourceFileSize;\r
+  VOID        *Buffer;\r
+  EFI_STATUS  Status;\r
 \r
   if ((FileHandle == NULL) || (FileSize == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -530,7 +531,7 @@ ReadFileContent (
   //\r
   // Get the file size\r
   //\r
-  Status = FileHandle->SetPosition (FileHandle, (UINT64) -1);\r
+  Status = FileHandle->SetPosition (FileHandle, (UINT64)-1);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
@@ -545,20 +546,20 @@ ReadFileContent (
     goto ON_EXIT;\r
   }\r
 \r
-  BufferSize = (UINTN) SourceFileSize + AddtionAllocateSize;\r
-  Buffer =  AllocateZeroPool(BufferSize);\r
+  BufferSize = (UINTN)SourceFileSize + AddtionAllocateSize;\r
+  Buffer     =  AllocateZeroPool (BufferSize);\r
   if (Buffer == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  BufferSize = (UINTN) SourceFileSize;\r
+  BufferSize = (UINTN)SourceFileSize;\r
   *FileSize  = BufferSize;\r
 \r
   Status = FileHandle->Read (FileHandle, &BufferSize, Buffer);\r
-  if (EFI_ERROR (Status) || BufferSize != *FileSize) {\r
+  if (EFI_ERROR (Status) || (BufferSize != *FileSize)) {\r
     FreePool (Buffer);\r
     Buffer = NULL;\r
-    Status  = EFI_BAD_BUFFER_SIZE;\r
+    Status = EFI_BAD_BUFFER_SIZE;\r
     goto ON_EXIT;\r
   }\r
 \r
@@ -579,7 +580,7 @@ ON_EXIT:
 CHAR16 *\r
 EFIAPI\r
 DevicePathToStr (\r
-  IN EFI_DEVICE_PATH_PROTOCOL     *DevPath\r
+  IN EFI_DEVICE_PATH_PROTOCOL  *DevPath\r
   )\r
 {\r
   return ConvertDevicePathToText (\r
@@ -589,7 +590,6 @@ DevicePathToStr (
            );\r
 }\r
 \r
-\r
 /**\r
   Extract filename from device path. The returned buffer is allocated using AllocateCopyPool.\r
   The caller is responsible for freeing the allocated buffer using FreePool(). If return NULL\r
@@ -603,34 +603,34 @@ DevicePathToStr (
 **/\r
 CHAR16 *\r
 ExtractFileNameFromDevicePath (\r
-  IN   EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
+  IN   EFI_DEVICE_PATH_PROTOCOL  *DevicePath\r
   )\r
 {\r
-  CHAR16          *String;\r
-  CHAR16          *MatchString;\r
-  CHAR16          *LastMatch;\r
-  CHAR16          *FileName;\r
-  UINTN           Length;\r
+  CHAR16  *String;\r
+  CHAR16  *MatchString;\r
+  CHAR16  *LastMatch;\r
+  CHAR16  *FileName;\r
+  UINTN   Length;\r
 \r
-  ASSERT(DevicePath != NULL);\r
+  ASSERT (DevicePath != NULL);\r
 \r
-  String = DevicePathToStr(DevicePath);\r
+  String      = DevicePathToStr (DevicePath);\r
   MatchString = String;\r
   LastMatch   = String;\r
   FileName    = NULL;\r
 \r
-  while(MatchString != NULL){\r
+  while (MatchString != NULL) {\r
     LastMatch   = MatchString + 1;\r
-    MatchString = StrStr(LastMatch,L"\\");\r
+    MatchString = StrStr (LastMatch, L"\\");\r
   }\r
 \r
-  Length = StrLen(LastMatch);\r
-  FileName = AllocateCopyPool ((Length + 1) * sizeof(CHAR16), LastMatch);\r
+  Length   = StrLen (LastMatch);\r
+  FileName = AllocateCopyPool ((Length + 1) * sizeof (CHAR16), LastMatch);\r
   if (FileName != NULL) {\r
     *(FileName + Length) = 0;\r
   }\r
 \r
-  FreePool(String);\r
+  FreePool (String);\r
 \r
   return FileName;\r
 }\r
@@ -647,28 +647,28 @@ ExtractFileNameFromDevicePath (
 **/\r
 EFI_STATUS\r
 EnrollX509toVariable (\r
-  IN TLS_AUTH_CONFIG_PRIVATE_DATA   *Private,\r
-  IN CHAR16                         *VariableName\r
+  IN TLS_AUTH_CONFIG_PRIVATE_DATA  *Private,\r
+  IN CHAR16                        *VariableName\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  UINTN                             X509DataSize;\r
-  VOID                              *X509Data;\r
-  EFI_SIGNATURE_LIST                *CACert;\r
-  EFI_SIGNATURE_DATA                *CACertData;\r
-  VOID                              *Data;\r
-  UINTN                             DataSize;\r
-  UINTN                             SigDataSize;\r
-  UINT32                            Attr;\r
-\r
-  X509DataSize  = 0;\r
-  SigDataSize   = 0;\r
-  DataSize      = 0;\r
-  X509Data      = NULL;\r
-  CACert        = NULL;\r
-  CACertData    = NULL;\r
-  Data          = NULL;\r
-  Attr          = 0;\r
+  EFI_STATUS          Status;\r
+  UINTN               X509DataSize;\r
+  VOID                *X509Data;\r
+  EFI_SIGNATURE_LIST  *CACert;\r
+  EFI_SIGNATURE_DATA  *CACertData;\r
+  VOID                *Data;\r
+  UINTN               DataSize;\r
+  UINTN               SigDataSize;\r
+  UINT32              Attr;\r
+\r
+  X509DataSize = 0;\r
+  SigDataSize  = 0;\r
+  DataSize     = 0;\r
+  X509Data     = NULL;\r
+  CACert       = NULL;\r
+  CACertData   = NULL;\r
+  Data         = NULL;\r
+  Attr         = 0;\r
 \r
   Status = ReadFileContent (\r
              Private->FileContext->FHandle,\r
@@ -679,9 +679,10 @@ EnrollX509toVariable (
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
+\r
   ASSERT (X509Data != NULL);\r
 \r
-  SigDataSize = sizeof(EFI_SIGNATURE_LIST) + sizeof(EFI_SIGNATURE_DATA) - 1 + X509DataSize;\r
+  SigDataSize = sizeof (EFI_SIGNATURE_LIST) + sizeof (EFI_SIGNATURE_DATA) - 1 + X509DataSize;\r
 \r
   Data = AllocateZeroPool (SigDataSize);\r
   if (Data == NULL) {\r
@@ -692,22 +693,22 @@ EnrollX509toVariable (
   //\r
   // Fill Certificate Database parameters.\r
   //\r
-  CACert = (EFI_SIGNATURE_LIST*) Data;\r
-  CACert->SignatureListSize   = (UINT32) SigDataSize;\r
+  CACert                      = (EFI_SIGNATURE_LIST *)Data;\r
+  CACert->SignatureListSize   = (UINT32)SigDataSize;\r
   CACert->SignatureHeaderSize = 0;\r
-  CACert->SignatureSize = (UINT32) (sizeof(EFI_SIGNATURE_DATA) - 1 + X509DataSize);\r
+  CACert->SignatureSize       = (UINT32)(sizeof (EFI_SIGNATURE_DATA) - 1 + X509DataSize);\r
   CopyGuid (&CACert->SignatureType, &gEfiCertX509Guid);\r
 \r
-  CACertData = (EFI_SIGNATURE_DATA*) ((UINT8* ) CACert + sizeof (EFI_SIGNATURE_LIST));\r
+  CACertData = (EFI_SIGNATURE_DATA *)((UINT8 *)CACert + sizeof (EFI_SIGNATURE_LIST));\r
   CopyGuid (&CACertData->SignatureOwner, Private->CertGuid);\r
-  CopyMem ((UINT8* ) (CACertData->SignatureData), X509Data, X509DataSize);\r
+  CopyMem ((UINT8 *)(CACertData->SignatureData), X509Data, X509DataSize);\r
 \r
   //\r
   // Check if the signature database entry already exists. If it does, use the\r
   // EFI_VARIABLE_APPEND_WRITE attribute to append the new signature data to\r
   // the original variable, plus preserve the original variable attributes.\r
   //\r
-  Status = gRT->GetVariable(\r
+  Status = gRT->GetVariable (\r
                   VariableName,\r
                   &gEfiTlsCaCertificateGuid,\r
                   &Attr,\r
@@ -722,7 +723,7 @@ EnrollX509toVariable (
     goto ON_EXIT;\r
   }\r
 \r
-  Status = gRT->SetVariable(\r
+  Status = gRT->SetVariable (\r
                   VariableName,\r
                   &gEfiTlsCaCertificateGuid,\r
                   Attr,\r
@@ -770,8 +771,8 @@ EnrollCertDatabase (
   IN CHAR16                        *VariableName\r
   )\r
 {\r
-  UINT16*      FilePostFix;\r
-  UINTN        NameLength;\r
+  UINT16  *FilePostFix;\r
+  UINTN   NameLength;\r
 \r
   if ((Private->FileContext->FileName == NULL) || (Private->FileContext->FHandle == NULL) || (Private->CertGuid == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -784,6 +785,7 @@ EnrollCertDatabase (
   if (NameLength <= 4) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   FilePostFix = Private->FileContext->FileName + NameLength - 4;\r
 \r
   if (IsDerPemEncodeCertificate (FilePostFix)) {\r
@@ -820,12 +822,12 @@ RefreshUpdateData (
   //\r
   // Create Hii Extend Label OpCode as the start opcode\r
   //\r
-  mStartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                         mStartOpCodeHandle,\r
-                                         &gEfiIfrTianoGuid,\r
-                                         NULL,\r
-                                         sizeof (EFI_IFR_GUID_LABEL)\r
-                                         );\r
+  mStartLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                        mStartOpCodeHandle,\r
+                                        &gEfiIfrTianoGuid,\r
+                                        NULL,\r
+                                        sizeof (EFI_IFR_GUID_LABEL)\r
+                                        );\r
   mStartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
 }\r
 \r
@@ -838,8 +840,8 @@ RefreshUpdateData (
 **/\r
 VOID\r
 CleanUpPage (\r
-  IN UINT16                           LabelId,\r
-  IN TLS_AUTH_CONFIG_PRIVATE_DATA     *PrivateData\r
+  IN UINT16                        LabelId,\r
+  IN TLS_AUTH_CONFIG_PRIVATE_DATA  *PrivateData\r
   )\r
 {\r
   RefreshUpdateData ();\r
@@ -868,19 +870,20 @@ CleanUpPage (
 \r
 **/\r
 BOOLEAN\r
-UpdatePage(\r
+UpdatePage (\r
   IN  EFI_DEVICE_PATH_PROTOCOL  *FilePath,\r
   IN  EFI_FORM_ID               FormId\r
   )\r
 {\r
-  CHAR16                *FileName;\r
-  EFI_STRING_ID         StringToken;\r
+  CHAR16         *FileName;\r
+  EFI_STRING_ID  StringToken;\r
 \r
   FileName = NULL;\r
 \r
   if (FilePath != NULL) {\r
-    FileName = ExtractFileNameFromDevicePath(FilePath);\r
+    FileName = ExtractFileNameFromDevicePath (FilePath);\r
   }\r
+\r
   if (FileName == NULL) {\r
     //\r
     // FileName = NULL has two case:\r
@@ -890,6 +893,7 @@ UpdatePage(
     //\r
     return TRUE;\r
   }\r
+\r
   StringToken =  HiiSetString (mTlsAuthPrivateData->RegisteredHandle, 0, FileName, NULL);\r
 \r
   mTlsAuthPrivateData->FileContext->FileName = FileName;\r
@@ -912,7 +916,7 @@ UpdatePage(
     0,\r
     0,\r
     0\r
-   );\r
+    );\r
 \r
   HiiUpdateForm (\r
     mTlsAuthPrivateData->RegisteredHandle,\r
@@ -936,10 +940,10 @@ UpdatePage(
 BOOLEAN\r
 EFIAPI\r
 UpdateCAFromFile (\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *FilePath\r
+  IN EFI_DEVICE_PATH_PROTOCOL  *FilePath\r
   )\r
 {\r
-  return UpdatePage(FilePath, TLS_AUTH_CONFIG_FORMID4_FORM);\r
+  return UpdatePage (FilePath, TLS_AUTH_CONFIG_FORMID4_FORM);\r
 }\r
 \r
 /**\r
@@ -954,7 +958,7 @@ UpdateCAFromFile (
 **/\r
 EFI_STATUS\r
 TlsAuthConfigFormUnload (\r
-  IN TLS_AUTH_CONFIG_PRIVATE_DATA     *Private\r
+  IN TLS_AUTH_CONFIG_PRIVATE_DATA  *Private\r
   )\r
 {\r
   if (Private->DriverHandle != NULL) {\r
@@ -1001,7 +1005,6 @@ TlsAuthConfigFormUnload (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Initialize the configuration form.\r
 \r
@@ -1013,10 +1016,10 @@ TlsAuthConfigFormUnload (
 **/\r
 EFI_STATUS\r
 TlsAuthConfigFormInit (\r
-  IN TLS_AUTH_CONFIG_PRIVATE_DATA     *Private\r
+  IN TLS_AUTH_CONFIG_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
+  EFI_STATUS  Status;\r
 \r
   Private->Signature = TLS_AUTH_CONFIG_PRIVATE_DATA_SIGNATURE;\r
 \r
@@ -1078,23 +1081,23 @@ TlsAuthConfigFormInit (
   //\r
   // Create Hii Extend Label OpCode as the start opcode\r
   //\r
-  mStartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                         mStartOpCodeHandle,\r
-                                         &gEfiIfrTianoGuid,\r
-                                         NULL,\r
-                                         sizeof (EFI_IFR_GUID_LABEL)\r
-                                         );\r
+  mStartLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                        mStartOpCodeHandle,\r
+                                        &gEfiIfrTianoGuid,\r
+                                        NULL,\r
+                                        sizeof (EFI_IFR_GUID_LABEL)\r
+                                        );\r
   mStartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
 \r
   //\r
   // Create Hii Extend Label OpCode as the end opcode\r
   //\r
-  mEndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                       mEndOpCodeHandle,\r
-                                       &gEfiIfrTianoGuid,\r
-                                       NULL,\r
-                                       sizeof (EFI_IFR_GUID_LABEL)\r
-                                       );\r
+  mEndLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                      mEndOpCodeHandle,\r
+                                      &gEfiIfrTianoGuid,\r
+                                      NULL,\r
+                                      sizeof (EFI_IFR_GUID_LABEL)\r
+                                      );\r
   mEndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
   mEndLabel->Number       = LABEL_END;\r
 \r
@@ -1185,15 +1188,15 @@ TlsAuthConfigAccessExtractConfig (
   OUT       EFI_STRING                      *Results\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  UINTN                             BufferSize;\r
-  UINTN                             Size;\r
-  EFI_STRING                        ConfigRequest;\r
-  EFI_STRING                        ConfigRequestHdr;\r
-  TLS_AUTH_CONFIG_PRIVATE_DATA      *Private;\r
-  BOOLEAN                           AllocatedRequest;\r
-\r
-  if (Progress == NULL || Results == NULL) {\r
+  EFI_STATUS                    Status;\r
+  UINTN                         BufferSize;\r
+  UINTN                         Size;\r
+  EFI_STRING                    ConfigRequest;\r
+  EFI_STRING                    ConfigRequestHdr;\r
+  TLS_AUTH_CONFIG_PRIVATE_DATA  *Private;\r
+  BOOLEAN                       AllocatedRequest;\r
+\r
+  if ((Progress == NULL) || (Results == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1202,12 +1205,12 @@ TlsAuthConfigAccessExtractConfig (
   ConfigRequest    = NULL;\r
   Size             = 0;\r
 \r
-  Private          = TLS_AUTH_CONFIG_PRIVATE_FROM_THIS (This);\r
+  Private = TLS_AUTH_CONFIG_PRIVATE_FROM_THIS (This);\r
 \r
-  BufferSize       = sizeof (TLS_AUTH_CONFIG_IFR_NVDATA);\r
+  BufferSize = sizeof (TLS_AUTH_CONFIG_IFR_NVDATA);\r
   ZeroMem (&Private->TlsAuthConfigNvData, BufferSize);\r
 \r
-  *Progress        = Request;\r
+  *Progress = Request;\r
 \r
   if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gTlsAuthConfigGuid, mTlsAuthConfigStorageName)) {\r
     return EFI_NOT_FOUND;\r
@@ -1222,8 +1225,8 @@ TlsAuthConfigAccessExtractConfig (
     // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
     //\r
     ConfigRequestHdr = HiiConstructConfigHdr (&gTlsAuthConfigGuid, mTlsAuthConfigStorageName, Private->DriverHandle);\r
-    Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
-    ConfigRequest = AllocateZeroPool (Size);\r
+    Size             = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
+    ConfigRequest    = AllocateZeroPool (Size);\r
     ASSERT (ConfigRequest != NULL);\r
     AllocatedRequest = TRUE;\r
     UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);\r
@@ -1234,7 +1237,7 @@ TlsAuthConfigAccessExtractConfig (
   Status = gHiiConfigRouting->BlockToConfig (\r
                                 gHiiConfigRouting,\r
                                 ConfigRequest,\r
-                                (UINT8 *) &Private->TlsAuthConfigNvData,\r
+                                (UINT8 *)&Private->TlsAuthConfigNvData,\r
                                 BufferSize,\r
                                 Results,\r
                                 Progress\r
@@ -1307,13 +1310,14 @@ TlsAuthConfigAccessRouteConfig (
   OUT       EFI_STRING                      *Progress\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  UINTN                            BufferSize;\r
-  TLS_AUTH_CONFIG_PRIVATE_DATA     *Private;\r
+  EFI_STATUS                    Status;\r
+  UINTN                         BufferSize;\r
+  TLS_AUTH_CONFIG_PRIVATE_DATA  *Private;\r
 \r
   if (Progress == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   *Progress = Configuration;\r
 \r
   if (Configuration == NULL) {\r
@@ -1336,7 +1340,7 @@ TlsAuthConfigAccessRouteConfig (
   Status = gHiiConfigRouting->ConfigToBlock (\r
                                 gHiiConfigRouting,\r
                                 Configuration,\r
-                                (UINT8 *) &Private->TlsAuthConfigNvData,\r
+                                (UINT8 *)&Private->TlsAuthConfigNvData,\r
                                 &BufferSize,\r
                                 Progress\r
                                 );\r
@@ -1375,26 +1379,26 @@ TlsAuthConfigAccessRouteConfig (
 EFI_STATUS\r
 EFIAPI\r
 TlsAuthConfigAccessCallback (\r
-  IN     CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN     EFI_BROWSER_ACTION                     Action,\r
-  IN     EFI_QUESTION_ID                        QuestionId,\r
-  IN     UINT8                                  Type,\r
-  IN OUT EFI_IFR_TYPE_VALUE                     *Value,\r
-  OUT    EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
+  IN     CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN     EFI_BROWSER_ACTION                    Action,\r
+  IN     EFI_QUESTION_ID                       QuestionId,\r
+  IN     UINT8                                 Type,\r
+  IN OUT EFI_IFR_TYPE_VALUE                    *Value,\r
+  OUT    EFI_BROWSER_ACTION_REQUEST            *ActionRequest\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  RETURN_STATUS                   RStatus;\r
-  TLS_AUTH_CONFIG_PRIVATE_DATA    *Private;\r
-  UINTN                           BufferSize;\r
-  TLS_AUTH_CONFIG_IFR_NVDATA      *IfrNvData;\r
-  UINT16                          LabelId;\r
-  EFI_DEVICE_PATH_PROTOCOL        *File;\r
-  EFI_HII_POPUP_PROTOCOL          *HiiPopUp;\r
-  EFI_HII_POPUP_SELECTION         PopUpSelect;\r
-\r
-  Status           = EFI_SUCCESS;\r
-  File             = NULL;\r
+  EFI_STATUS                    Status;\r
+  RETURN_STATUS                 RStatus;\r
+  TLS_AUTH_CONFIG_PRIVATE_DATA  *Private;\r
+  UINTN                         BufferSize;\r
+  TLS_AUTH_CONFIG_IFR_NVDATA    *IfrNvData;\r
+  UINT16                        LabelId;\r
+  EFI_DEVICE_PATH_PROTOCOL      *File;\r
+  EFI_HII_POPUP_PROTOCOL        *HiiPopUp;\r
+  EFI_HII_POPUP_SELECTION       PopUpSelect;\r
+\r
+  Status = EFI_SUCCESS;\r
+  File   = NULL;\r
 \r
   if ((This == NULL) || (Value == NULL) || (ActionRequest == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1403,7 +1407,7 @@ TlsAuthConfigAccessCallback (
   Private = TLS_AUTH_CONFIG_PRIVATE_FROM_THIS (This);\r
 \r
   mTlsAuthPrivateData = Private;\r
-  Status = gBS->LocateProtocol (&gEfiHiiPopupProtocolGuid, NULL, (VOID**) &HiiPopUp);\r
+  Status              = gBS->LocateProtocol (&gEfiHiiPopupProtocolGuid, NULL, (VOID **)&HiiPopUp);\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "Can't find Form PopUp protocol. Exit (%r)\n", Status));\r
     return Status;\r
@@ -1413,122 +1417,128 @@ TlsAuthConfigAccessCallback (
   // Retrieve uncommitted data from Browser\r
   //\r
   BufferSize = sizeof (TLS_AUTH_CONFIG_IFR_NVDATA);\r
-  IfrNvData = AllocateZeroPool (BufferSize);\r
+  IfrNvData  = AllocateZeroPool (BufferSize);\r
   if (IfrNvData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  HiiGetBrowserData (&gTlsAuthConfigGuid, mTlsAuthConfigStorageName, BufferSize, (UINT8 *) IfrNvData);\r
+  HiiGetBrowserData (&gTlsAuthConfigGuid, mTlsAuthConfigStorageName, BufferSize, (UINT8 *)IfrNvData);\r
 \r
   if ((Action != EFI_BROWSER_ACTION_CHANGED) &&\r
       (Action != EFI_BROWSER_ACTION_CHANGING) &&\r
-      (Action != EFI_BROWSER_ACTION_FORM_CLOSE)) {\r
+      (Action != EFI_BROWSER_ACTION_FORM_CLOSE))\r
+  {\r
     Status = EFI_UNSUPPORTED;\r
     goto EXIT;\r
   }\r
 \r
   if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
     switch (QuestionId) {\r
-    case KEY_TLS_AUTH_CONFIG_CLIENT_CERT:\r
-    case KEY_TLS_AUTH_CONFIG_SERVER_CA:\r
-      //\r
-      // Clear Cert GUID.\r
-      //\r
-      ZeroMem (IfrNvData->CertGuid, sizeof (IfrNvData->CertGuid));\r
-      if (Private->CertGuid == NULL) {\r
-        Private->CertGuid = (EFI_GUID *) AllocateZeroPool (sizeof (EFI_GUID));\r
+      case KEY_TLS_AUTH_CONFIG_CLIENT_CERT:\r
+      case KEY_TLS_AUTH_CONFIG_SERVER_CA:\r
+        //\r
+        // Clear Cert GUID.\r
+        //\r
+        ZeroMem (IfrNvData->CertGuid, sizeof (IfrNvData->CertGuid));\r
         if (Private->CertGuid == NULL) {\r
-          return EFI_OUT_OF_RESOURCES;\r
+          Private->CertGuid = (EFI_GUID *)AllocateZeroPool (sizeof (EFI_GUID));\r
+          if (Private->CertGuid == NULL) {\r
+            return EFI_OUT_OF_RESOURCES;\r
+          }\r
         }\r
-      }\r
-      if (QuestionId == KEY_TLS_AUTH_CONFIG_CLIENT_CERT) {\r
-        LabelId = TLS_AUTH_CONFIG_FORMID3_FORM;\r
-      } else {\r
-        LabelId = TLS_AUTH_CONFIG_FORMID4_FORM;\r
-      }\r
 \r
-      //\r
-      // Refresh selected file.\r
-      //\r
-      CleanUpPage (LabelId, Private);\r
-      break;\r
-    case KEY_TLS_AUTH_CONFIG_ENROLL_CERT_FROM_FILE:\r
-      //\r
-      // If the file is already opened, clean the file related resource first.\r
-      //\r
-      CleanFileContext (Private);\r
-\r
-      ChooseFile( NULL, NULL, UpdateCAFromFile, &File);\r
-      break;\r
+        if (QuestionId == KEY_TLS_AUTH_CONFIG_CLIENT_CERT) {\r
+          LabelId = TLS_AUTH_CONFIG_FORMID3_FORM;\r
+        } else {\r
+          LabelId = TLS_AUTH_CONFIG_FORMID4_FORM;\r
+        }\r
 \r
-    case KEY_TLS_AUTH_CONFIG_VALUE_SAVE_AND_EXIT:\r
-      Status = EnrollCertDatabase (Private, EFI_TLS_CA_CERTIFICATE_VARIABLE);\r
-      if (EFI_ERROR (Status)) {\r
+        //\r
+        // Refresh selected file.\r
+        //\r
+        CleanUpPage (LabelId, Private);\r
+        break;\r
+      case KEY_TLS_AUTH_CONFIG_ENROLL_CERT_FROM_FILE:\r
+        //\r
+        // If the file is already opened, clean the file related resource first.\r
+        //\r
         CleanFileContext (Private);\r
 \r
-        HiiPopUp->CreatePopup (\r
-          HiiPopUp,\r
-          EfiHiiPopupStyleError,\r
-          EfiHiiPopupTypeOk,\r
-          Private->RegisteredHandle,\r
-          STRING_TOKEN (STR_TLS_AUTH_ENROLL_CERT_FAILURE),\r
-          &PopUpSelect\r
-          );\r
-      }\r
-      break;\r
+        ChooseFile (NULL, NULL, UpdateCAFromFile, &File);\r
+        break;\r
 \r
-    case KEY_TLS_AUTH_CONFIG_VALUE_NO_SAVE_AND_EXIT:\r
-      CleanFileContext (Private);\r
+      case KEY_TLS_AUTH_CONFIG_VALUE_SAVE_AND_EXIT:\r
+        Status = EnrollCertDatabase (Private, EFI_TLS_CA_CERTIFICATE_VARIABLE);\r
+        if (EFI_ERROR (Status)) {\r
+          CleanFileContext (Private);\r
+\r
+          HiiPopUp->CreatePopup (\r
+                      HiiPopUp,\r
+                      EfiHiiPopupStyleError,\r
+                      EfiHiiPopupTypeOk,\r
+                      Private->RegisteredHandle,\r
+                      STRING_TOKEN (STR_TLS_AUTH_ENROLL_CERT_FAILURE),\r
+                      &PopUpSelect\r
+                      );\r
+        }\r
 \r
-      if (Private->CertGuid!= NULL) {\r
-        FreePool (Private->CertGuid);\r
-        Private->CertGuid = NULL;\r
-      }\r
-      break;\r
-\r
-    case KEY_TLS_AUTH_CONFIG_DELETE_CERT:\r
-      UpdateDeletePage (\r
-        Private,\r
-        EFI_TLS_CA_CERTIFICATE_VARIABLE,\r
-        &gEfiTlsCaCertificateGuid,\r
-        LABEL_CA_DELETE,\r
-        TLS_AUTH_CONFIG_FORMID5_FORM,\r
-        OPTION_DEL_CA_ESTION_ID\r
-        );\r
-       break;\r
+        break;\r
+\r
+      case KEY_TLS_AUTH_CONFIG_VALUE_NO_SAVE_AND_EXIT:\r
+        CleanFileContext (Private);\r
 \r
-    default:\r
-      if ((QuestionId >= OPTION_DEL_CA_ESTION_ID) &&\r
-                 (QuestionId < (OPTION_DEL_CA_ESTION_ID + OPTION_CONFIG_RANGE)))  {\r
-        DeleteCert (\r
+        if (Private->CertGuid != NULL) {\r
+          FreePool (Private->CertGuid);\r
+          Private->CertGuid = NULL;\r
+        }\r
+\r
+        break;\r
+\r
+      case KEY_TLS_AUTH_CONFIG_DELETE_CERT:\r
+        UpdateDeletePage (\r
           Private,\r
           EFI_TLS_CA_CERTIFICATE_VARIABLE,\r
           &gEfiTlsCaCertificateGuid,\r
           LABEL_CA_DELETE,\r
           TLS_AUTH_CONFIG_FORMID5_FORM,\r
-          OPTION_DEL_CA_ESTION_ID,\r
-          QuestionId - OPTION_DEL_CA_ESTION_ID\r
+          OPTION_DEL_CA_ESTION_ID\r
           );\r
-      }\r
-      break;\r
+        break;\r
+\r
+      default:\r
+        if ((QuestionId >= OPTION_DEL_CA_ESTION_ID) &&\r
+            (QuestionId < (OPTION_DEL_CA_ESTION_ID + OPTION_CONFIG_RANGE)))\r
+        {\r
+          DeleteCert (\r
+            Private,\r
+            EFI_TLS_CA_CERTIFICATE_VARIABLE,\r
+            &gEfiTlsCaCertificateGuid,\r
+            LABEL_CA_DELETE,\r
+            TLS_AUTH_CONFIG_FORMID5_FORM,\r
+            OPTION_DEL_CA_ESTION_ID,\r
+            QuestionId - OPTION_DEL_CA_ESTION_ID\r
+            );\r
+        }\r
+\r
+        break;\r
     }\r
   } else if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
     switch (QuestionId) {\r
-    case KEY_TLS_AUTH_CONFIG_CERT_GUID:\r
-      ASSERT (Private->CertGuid != NULL);\r
-      RStatus = StrToGuid (\r
-                  IfrNvData->CertGuid,\r
-                  Private->CertGuid\r
-                  );\r
-      if (RETURN_ERROR (RStatus) || (IfrNvData->CertGuid[GUID_STRING_LENGTH] != L'\0')) {\r
-        Status = EFI_INVALID_PARAMETER;\r
-        break;\r
-      }\r
+      case KEY_TLS_AUTH_CONFIG_CERT_GUID:\r
+        ASSERT (Private->CertGuid != NULL);\r
+        RStatus = StrToGuid (\r
+                    IfrNvData->CertGuid,\r
+                    Private->CertGuid\r
+                    );\r
+        if (RETURN_ERROR (RStatus) || (IfrNvData->CertGuid[GUID_STRING_LENGTH] != L'\0')) {\r
+          Status = EFI_INVALID_PARAMETER;\r
+          break;\r
+        }\r
 \r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
-      break;\r
-    default:\r
-      break;\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
+        break;\r
+      default:\r
+        break;\r
     }\r
   } else if (Action == EFI_BROWSER_ACTION_FORM_CLOSE) {\r
     CleanFileContext (Private);\r
@@ -1538,17 +1548,15 @@ EXIT:
 \r
   if (!EFI_ERROR (Status)) {\r
     BufferSize = sizeof (TLS_AUTH_CONFIG_IFR_NVDATA);\r
-    HiiSetBrowserData (&gTlsAuthConfigGuid, mTlsAuthConfigStorageName, BufferSize, (UINT8*) IfrNvData, NULL);\r
+    HiiSetBrowserData (&gTlsAuthConfigGuid, mTlsAuthConfigStorageName, BufferSize, (UINT8 *)IfrNvData, NULL);\r
   }\r
 \r
   FreePool (IfrNvData);\r
 \r
-  if (File != NULL){\r
-    FreePool(File);\r
+  if (File != NULL) {\r
+    FreePool (File);\r
     File = NULL;\r
   }\r
 \r
   return EFI_SUCCESS;\r
-\r
 }\r
-\r
index 68c16845b36f0be9b63f9bb7d1497e9115039395..1552f47a9d1b617226627b1484ed059456752879 100644 (file)
@@ -36,34 +36,33 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Guid/ImageAuthentication.h>\r
 #include <Guid/TlsAuthentication.h>\r
 \r
-\r
 //\r
 // Include files with function prototypes\r
 //\r
 #include "TlsAuthConfigNvData.h"\r
 \r
-extern   UINT8       TlsAuthConfigDxeStrings[];\r
-extern   UINT8       TlsAuthConfigVfrBin[];\r
+extern   UINT8  TlsAuthConfigDxeStrings[];\r
+extern   UINT8  TlsAuthConfigVfrBin[];\r
 \r
-#define TLS_AUTH_CONFIG_PRIVATE_DATA_SIGNATURE    SIGNATURE_32 ('T', 'A', 'C', 'D')\r
-#define TLS_AUTH_CONFIG_PRIVATE_FROM_THIS(a)      CR (a, TLS_AUTH_CONFIG_PRIVATE_DATA, ConfigAccess, TLS_AUTH_CONFIG_PRIVATE_DATA_SIGNATURE)\r
+#define TLS_AUTH_CONFIG_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('T', 'A', 'C', 'D')\r
+#define TLS_AUTH_CONFIG_PRIVATE_FROM_THIS(a)  CR (a, TLS_AUTH_CONFIG_PRIVATE_DATA, ConfigAccess, TLS_AUTH_CONFIG_PRIVATE_DATA_SIGNATURE)\r
 \r
 #define TLS_AUTH_CONFIG_VAR_BASE_ATTR  (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS)\r
 \r
-typedef struct _TLS_AUTH_CONFIG_PRIVATE_DATA      TLS_AUTH_CONFIG_PRIVATE_DATA;\r
-typedef struct _TLS_AUTH_CONFIG_FILE_CONTEXT      TLS_AUTH_CONFIG_FILE_CONTEXT;\r
+typedef struct _TLS_AUTH_CONFIG_PRIVATE_DATA  TLS_AUTH_CONFIG_PRIVATE_DATA;\r
+typedef struct _TLS_AUTH_CONFIG_FILE_CONTEXT  TLS_AUTH_CONFIG_FILE_CONTEXT;\r
 \r
 ///\r
 /// HII specific Vendor Device Path definition.\r
 ///\r
 typedef struct {\r
-  VENDOR_DEVICE_PATH                VendorDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL          End;\r
+  VENDOR_DEVICE_PATH          VendorDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL    End;\r
 } HII_VENDOR_DEVICE_PATH;\r
 \r
 struct _TLS_AUTH_CONFIG_FILE_CONTEXT {\r
-  EFI_FILE_HANDLE                   FHandle;\r
-  UINT16                            *FileName;\r
+  EFI_FILE_HANDLE    FHandle;\r
+  UINT16             *FileName;\r
 };\r
 \r
 struct _TLS_AUTH_CONFIG_PRIVATE_DATA {\r
@@ -92,7 +91,7 @@ struct _TLS_AUTH_CONFIG_PRIVATE_DATA {
 **/\r
 EFI_STATUS\r
 TlsAuthConfigFormUnload (\r
-  IN TLS_AUTH_CONFIG_PRIVATE_DATA     *Private\r
+  IN TLS_AUTH_CONFIG_PRIVATE_DATA  *Private\r
   );\r
 \r
 /**\r
@@ -106,7 +105,7 @@ TlsAuthConfigFormUnload (
 **/\r
 EFI_STATUS\r
 TlsAuthConfigFormInit (\r
-  IN TLS_AUTH_CONFIG_PRIVATE_DATA     *Private\r
+  IN TLS_AUTH_CONFIG_PRIVATE_DATA  *Private\r
   );\r
 \r
 /**\r
@@ -265,13 +264,12 @@ TlsAuthConfigAccessRouteConfig (
 EFI_STATUS\r
 EFIAPI\r
 TlsAuthConfigAccessCallback (\r
-  IN     CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN     EFI_BROWSER_ACTION                     Action,\r
-  IN     EFI_QUESTION_ID                        QuestionId,\r
-  IN     UINT8                                  Type,\r
-  IN OUT EFI_IFR_TYPE_VALUE                     *Value,\r
-  OUT    EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
+  IN     CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN     EFI_BROWSER_ACTION                    Action,\r
+  IN     EFI_QUESTION_ID                       QuestionId,\r
+  IN     UINT8                                 Type,\r
+  IN OUT EFI_IFR_TYPE_VALUE                    *Value,\r
+  OUT    EFI_BROWSER_ACTION_REQUEST            *ActionRequest\r
   );\r
 \r
 #endif\r
-\r
index 13813873e0af0a3f61a51f271112239a43599a89..9b7855092a8d42f4aa7a2aba334cf7327e7620da 100644 (file)
@@ -11,34 +11,32 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include <Guid/TlsAuthConfigHii.h>\r
 \r
-#define TLS_AUTH_CONFIG_GUID_SIZE                 36\r
-#define TLS_AUTH_CONFIG_GUID_STORAGE_SIZE         37\r
-\r
-#define TLS_AUTH_CONFIG_FORMID1_FORM              1\r
-#define TLS_AUTH_CONFIG_FORMID2_FORM              2\r
-#define TLS_AUTH_CONFIG_FORMID3_FORM              3\r
-#define TLS_AUTH_CONFIG_FORMID4_FORM              4\r
-#define TLS_AUTH_CONFIG_FORMID5_FORM              5\r
-\r
-\r
-#define KEY_TLS_AUTH_CONFIG_SERVER_CA                  0x1000\r
-#define KEY_TLS_AUTH_CONFIG_CLIENT_CERT                0x1001\r
-#define KEY_TLS_AUTH_CONFIG_ENROLL_CERT                0x1002\r
-#define KEY_TLS_AUTH_CONFIG_DELETE_CERT                0x1003\r
-#define KEY_TLS_AUTH_CONFIG_ENROLL_CERT_FROM_FILE      0x1004\r
-#define KEY_TLS_AUTH_CONFIG_CERT_GUID                  0x1005\r
-#define KEY_TLS_AUTH_CONFIG_VALUE_SAVE_AND_EXIT        0x1006\r
-#define KEY_TLS_AUTH_CONFIG_VALUE_NO_SAVE_AND_EXIT     0x1007\r
-\r
-#define OPTION_DEL_CA_ESTION_ID                        0x2000\r
-#define OPTION_CONFIG_RANGE                            0x1000\r
-\r
-#define LABEL_CA_DELETE                                0x1101\r
-#define LABEL_END                                      0xffff\r
+#define TLS_AUTH_CONFIG_GUID_SIZE          36\r
+#define TLS_AUTH_CONFIG_GUID_STORAGE_SIZE  37\r
+\r
+#define TLS_AUTH_CONFIG_FORMID1_FORM  1\r
+#define TLS_AUTH_CONFIG_FORMID2_FORM  2\r
+#define TLS_AUTH_CONFIG_FORMID3_FORM  3\r
+#define TLS_AUTH_CONFIG_FORMID4_FORM  4\r
+#define TLS_AUTH_CONFIG_FORMID5_FORM  5\r
+\r
+#define KEY_TLS_AUTH_CONFIG_SERVER_CA               0x1000\r
+#define KEY_TLS_AUTH_CONFIG_CLIENT_CERT             0x1001\r
+#define KEY_TLS_AUTH_CONFIG_ENROLL_CERT             0x1002\r
+#define KEY_TLS_AUTH_CONFIG_DELETE_CERT             0x1003\r
+#define KEY_TLS_AUTH_CONFIG_ENROLL_CERT_FROM_FILE   0x1004\r
+#define KEY_TLS_AUTH_CONFIG_CERT_GUID               0x1005\r
+#define KEY_TLS_AUTH_CONFIG_VALUE_SAVE_AND_EXIT     0x1006\r
+#define KEY_TLS_AUTH_CONFIG_VALUE_NO_SAVE_AND_EXIT  0x1007\r
+\r
+#define OPTION_DEL_CA_ESTION_ID  0x2000\r
+#define OPTION_CONFIG_RANGE      0x1000\r
+\r
+#define LABEL_CA_DELETE  0x1101\r
+#define LABEL_END        0xffff\r
 \r
 typedef struct {\r
   CHAR16    CertGuid[TLS_AUTH_CONFIG_GUID_STORAGE_SIZE];\r
 } TLS_AUTH_CONFIG_IFR_NVDATA;\r
 \r
 #endif\r
-\r
index 344d8de2173a99caefd9e5c00ae8d498f7d75d3c..33729fdf6c314634594b9dce29b519aa1cfc8f6b 100644 (file)
@@ -43,13 +43,13 @@ TlsConfigurationSetData (
   IN     UINTN                           DataSize\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  TLS_INSTANCE              *Instance;\r
-  EFI_TPL                   OldTpl;\r
+  EFI_STATUS    Status;\r
+  TLS_INSTANCE  *Instance;\r
+  EFI_TPL       OldTpl;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
-  if (This == NULL ||  Data == NULL || DataSize == 0) {\r
+  if ((This == NULL) ||  (Data == NULL) || (DataSize == 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -58,20 +58,20 @@ TlsConfigurationSetData (
   Instance = TLS_INSTANCE_FROM_CONFIGURATION (This);\r
 \r
   switch (DataType) {\r
-  case EfiTlsConfigDataTypeCACertificate:\r
-    Status = TlsSetCaCertificate (Instance->TlsConn, Data, DataSize);\r
-    break;\r
-  case EfiTlsConfigDataTypeHostPublicCert:\r
-    Status = TlsSetHostPublicCert (Instance->TlsConn, Data, DataSize);\r
-    break;\r
-  case EfiTlsConfigDataTypeHostPrivateKey:\r
-    Status = TlsSetHostPrivateKey (Instance->TlsConn, Data, DataSize);\r
-    break;\r
-  case EfiTlsConfigDataTypeCertRevocationList:\r
-    Status = TlsSetCertRevocationList (Data, DataSize);\r
-    break;\r
-  default:\r
-     Status = EFI_UNSUPPORTED;\r
+    case EfiTlsConfigDataTypeCACertificate:\r
+      Status = TlsSetCaCertificate (Instance->TlsConn, Data, DataSize);\r
+      break;\r
+    case EfiTlsConfigDataTypeHostPublicCert:\r
+      Status = TlsSetHostPublicCert (Instance->TlsConn, Data, DataSize);\r
+      break;\r
+    case EfiTlsConfigDataTypeHostPrivateKey:\r
+      Status = TlsSetHostPrivateKey (Instance->TlsConn, Data, DataSize);\r
+      break;\r
+    case EfiTlsConfigDataTypeCertRevocationList:\r
+      Status = TlsSetCertRevocationList (Data, DataSize);\r
+      break;\r
+    default:\r
+      Status = EFI_UNSUPPORTED;\r
   }\r
 \r
   gBS->RestoreTPL (OldTpl);\r
@@ -109,14 +109,14 @@ TlsConfigurationGetData (
   IN OUT UINTN                           *DataSize\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  TLS_INSTANCE              *Instance;\r
+  EFI_STATUS    Status;\r
+  TLS_INSTANCE  *Instance;\r
 \r
-  EFI_TPL                   OldTpl;\r
+  EFI_TPL  OldTpl;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
-  if (This == NULL || DataSize == NULL || (Data == NULL && *DataSize != 0)) {\r
+  if ((This == NULL) || (DataSize == NULL) || ((Data == NULL) && (*DataSize != 0))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -125,20 +125,20 @@ TlsConfigurationGetData (
   Instance = TLS_INSTANCE_FROM_CONFIGURATION (This);\r
 \r
   switch (DataType) {\r
-  case EfiTlsConfigDataTypeCACertificate:\r
-    Status = TlsGetCaCertificate (Instance->TlsConn, Data, DataSize);\r
-    break;\r
-  case EfiTlsConfigDataTypeHostPublicCert:\r
-    Status = TlsGetHostPublicCert (Instance->TlsConn, Data, DataSize);\r
-    break;\r
-  case EfiTlsConfigDataTypeHostPrivateKey:\r
-    Status = TlsGetHostPrivateKey (Instance->TlsConn, Data, DataSize);\r
-    break;\r
-  case EfiTlsConfigDataTypeCertRevocationList:\r
-    Status = TlsGetCertRevocationList (Data, DataSize);\r
-    break;\r
-  default:\r
-    Status = EFI_UNSUPPORTED;\r
+    case EfiTlsConfigDataTypeCACertificate:\r
+      Status = TlsGetCaCertificate (Instance->TlsConn, Data, DataSize);\r
+      break;\r
+    case EfiTlsConfigDataTypeHostPublicCert:\r
+      Status = TlsGetHostPublicCert (Instance->TlsConn, Data, DataSize);\r
+      break;\r
+    case EfiTlsConfigDataTypeHostPrivateKey:\r
+      Status = TlsGetHostPrivateKey (Instance->TlsConn, Data, DataSize);\r
+      break;\r
+    case EfiTlsConfigDataTypeCertRevocationList:\r
+      Status = TlsGetCertRevocationList (Data, DataSize);\r
+      break;\r
+    default:\r
+      Status = EFI_UNSUPPORTED;\r
   }\r
 \r
   gBS->RestoreTPL (OldTpl);\r
index e42ac60764ff7f460770d57db41630a12c7e8f94..713d417ddee96711a9ef096833702299817900ee 100644 (file)
@@ -9,7 +9,7 @@
 \r
 #include "TlsImpl.h"\r
 \r
-EFI_SERVICE_BINDING_PROTOCOL mTlsServiceBinding = {\r
+EFI_SERVICE_BINDING_PROTOCOL  mTlsServiceBinding = {\r
   TlsServiceBindingCreateChild,\r
   TlsServiceBindingDestroyChild\r
 };\r
@@ -22,7 +22,7 @@ EFI_SERVICE_BINDING_PROTOCOL mTlsServiceBinding = {
 **/\r
 VOID\r
 TlsCleanInstance (\r
-  IN TLS_INSTANCE           *Instance\r
+  IN TLS_INSTANCE  *Instance\r
   )\r
 {\r
   if (Instance != NULL) {\r
@@ -46,11 +46,11 @@ TlsCleanInstance (
 **/\r
 EFI_STATUS\r
 TlsCreateInstance (\r
-  IN  TLS_SERVICE         *Service,\r
-  OUT TLS_INSTANCE        **Instance\r
+  IN  TLS_SERVICE   *Service,\r
+  OUT TLS_INSTANCE  **Instance\r
   )\r
 {\r
-  TLS_INSTANCE            *TlsInstance;\r
+  TLS_INSTANCE  *TlsInstance;\r
 \r
   *Instance = NULL;\r
 \r
@@ -82,7 +82,7 @@ TlsCreateInstance (
 **/\r
 VOID\r
 TlsCleanService (\r
-  IN TLS_SERVICE     *Service\r
+  IN TLS_SERVICE  *Service\r
   )\r
 {\r
   if (Service != NULL) {\r
@@ -106,11 +106,11 @@ TlsCleanService (
 **/\r
 EFI_STATUS\r
 TlsCreateService (\r
-  IN  EFI_HANDLE            Image,\r
-  OUT TLS_SERVICE           **Service\r
+  IN  EFI_HANDLE   Image,\r
+  OUT TLS_SERVICE  **Service\r
   )\r
 {\r
-  TLS_SERVICE            *TlsService;\r
+  TLS_SERVICE  *TlsService;\r
 \r
   ASSERT (Service != NULL);\r
 \r
@@ -127,11 +127,11 @@ TlsCreateService (
   //\r
   // Initialize TLS Service Data\r
   //\r
-  TlsService->Signature        = TLS_SERVICE_SIGNATURE;\r
+  TlsService->Signature = TLS_SERVICE_SIGNATURE;\r
   CopyMem (&TlsService->ServiceBinding, &mTlsServiceBinding, sizeof (TlsService->ServiceBinding));\r
-  TlsService->TlsChildrenNum   = 0;\r
+  TlsService->TlsChildrenNum = 0;\r
   InitializeListHead (&TlsService->TlsChildrenList);\r
-  TlsService->ImageHandle      = Image;\r
+  TlsService->ImageHandle = Image;\r
 \r
   *Service = TlsService;\r
 \r
@@ -153,12 +153,12 @@ TlsUnload (
   IN EFI_HANDLE  ImageHandle\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  UINTN                           HandleNum;\r
-  EFI_HANDLE                      *HandleBuffer;\r
-  UINT32                          Index;\r
-  EFI_SERVICE_BINDING_PROTOCOL    *ServiceBinding;\r
-  TLS_SERVICE                     *TlsService;\r
+  EFI_STATUS                    Status;\r
+  UINTN                         HandleNum;\r
+  EFI_HANDLE                    *HandleBuffer;\r
+  UINT32                        Index;\r
+  EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
+  TLS_SERVICE                   *TlsService;\r
 \r
   HandleBuffer   = NULL;\r
   ServiceBinding = NULL;\r
@@ -185,7 +185,7 @@ TlsUnload (
     Status = gBS->OpenProtocol (\r
                     HandleBuffer[Index],\r
                     &gEfiTlsServiceBindingProtocolGuid,\r
-                    (VOID **) &ServiceBinding,\r
+                    (VOID **)&ServiceBinding,\r
                     ImageHandle,\r
                     NULL,\r
                     EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL\r
@@ -201,7 +201,8 @@ TlsUnload (
     //\r
     Status = gBS->UninstallMultipleProtocolInterfaces (\r
                     HandleBuffer[Index],\r
-                    &gEfiTlsServiceBindingProtocolGuid, ServiceBinding,\r
+                    &gEfiTlsServiceBindingProtocolGuid,\r
+                    ServiceBinding,\r
                     NULL\r
                     );\r
     if (EFI_ERROR (Status)) {\r
@@ -236,9 +237,9 @@ TlsDriverEntryPoint (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
+  EFI_STATUS  Status;\r
 \r
-  TLS_SERVICE            *TlsService;\r
+  TLS_SERVICE  *TlsService;\r
 \r
   //\r
   // Create TLS Service\r
@@ -312,10 +313,10 @@ TlsServiceBindingCreateChild (
   IN EFI_HANDLE                    *ChildHandle\r
   )\r
 {\r
-  TLS_SERVICE         *TlsService;\r
-  TLS_INSTANCE        *TlsInstance;\r
-  EFI_STATUS           Status;\r
-  EFI_TPL              OldTpl;\r
+  TLS_SERVICE   *TlsService;\r
+  TLS_INSTANCE  *TlsInstance;\r
+  EFI_STATUS    Status;\r
+  EFI_TPL       OldTpl;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -406,13 +407,13 @@ TlsServiceBindingDestroyChild (
   IN EFI_HANDLE                    ChildHandle\r
   )\r
 {\r
-  TLS_SERVICE                    *TlsService;\r
-  TLS_INSTANCE                   *TlsInstance;\r
+  TLS_SERVICE   *TlsService;\r
+  TLS_INSTANCE  *TlsInstance;\r
 \r
-  EFI_TLS_PROTOCOL               *Tls;\r
-  EFI_TLS_CONFIGURATION_PROTOCOL *TlsConfig;\r
-  EFI_STATUS                     Status;\r
-  EFI_TPL                        OldTpl;\r
+  EFI_TLS_PROTOCOL                *Tls;\r
+  EFI_TLS_CONFIGURATION_PROTOCOL  *TlsConfig;\r
+  EFI_STATUS                      Status;\r
+  EFI_TPL                         OldTpl;\r
 \r
   if ((This == NULL) || (ChildHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -426,7 +427,7 @@ TlsServiceBindingDestroyChild (
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiTlsProtocolGuid,\r
-                  (VOID **) &Tls,\r
+                  (VOID **)&Tls,\r
                   TlsService->ImageHandle,\r
                   NULL,\r
                   EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL\r
@@ -441,7 +442,7 @@ TlsServiceBindingDestroyChild (
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiTlsConfigurationProtocolGuid,\r
-                  (VOID **) &TlsConfig,\r
+                  (VOID **)&TlsConfig,\r
                   TlsService->ImageHandle,\r
                   NULL,\r
                   EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL\r
@@ -450,7 +451,7 @@ TlsServiceBindingDestroyChild (
     return Status;\r
   }\r
 \r
-  TlsInstance  = TLS_INSTANCE_FROM_PROTOCOL (Tls);\r
+  TlsInstance = TLS_INSTANCE_FROM_PROTOCOL (Tls);\r
 \r
   if (TlsInstance->Service != TlsService) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -488,4 +489,3 @@ TlsServiceBindingDestroyChild (
 \r
   return EFI_SUCCESS;\r
 }\r
-\r
index 64a81bd49063356f3b356378f847dc7183237123..d3fe2b18fa7386f00b578a647d970ca59f0dda23 100644 (file)
 //\r
 #define TLS_VERSION  0x00000000\r
 \r
-#define TLS_SERVICE_SIGNATURE    SIGNATURE_32 ('T', 'L', 'S', 'S')\r
+#define TLS_SERVICE_SIGNATURE  SIGNATURE_32 ('T', 'L', 'S', 'S')\r
 \r
-#define TLS_INSTANCE_SIGNATURE   SIGNATURE_32 ('T', 'L', 'S', 'I')\r
+#define TLS_INSTANCE_SIGNATURE  SIGNATURE_32 ('T', 'L', 'S', 'I')\r
 \r
 ///\r
 /// TLS Service Data\r
 ///\r
-typedef struct _TLS_SERVICE  TLS_SERVICE;\r
+typedef struct _TLS_SERVICE TLS_SERVICE;\r
 \r
 ///\r
 /// TLS Instance Data\r
 ///\r
 typedef struct _TLS_INSTANCE TLS_INSTANCE;\r
 \r
-\r
 struct _TLS_SERVICE {\r
   UINT32                          Signature;\r
   EFI_SERVICE_BINDING_PROTOCOL    ServiceBinding;\r
@@ -59,27 +58,26 @@ struct _TLS_SERVICE {
 };\r
 \r
 struct _TLS_INSTANCE {\r
-  UINT32                          Signature;\r
-  LIST_ENTRY                      Link;\r
+  UINT32                            Signature;\r
+  LIST_ENTRY                        Link;\r
 \r
-  BOOLEAN                         InDestroy;\r
+  BOOLEAN                           InDestroy;\r
 \r
-  TLS_SERVICE                     *Service;\r
-  EFI_HANDLE                      ChildHandle;\r
+  TLS_SERVICE                       *Service;\r
+  EFI_HANDLE                        ChildHandle;\r
 \r
-  EFI_TLS_PROTOCOL                Tls;\r
-  EFI_TLS_CONFIGURATION_PROTOCOL  TlsConfig;\r
+  EFI_TLS_PROTOCOL                  Tls;\r
+  EFI_TLS_CONFIGURATION_PROTOCOL    TlsConfig;\r
 \r
-  EFI_TLS_SESSION_STATE           TlsSessionState;\r
+  EFI_TLS_SESSION_STATE             TlsSessionState;\r
 \r
   //\r
   // Main SSL Connection which is created by a server or a client\r
   // per established connection.\r
   //\r
-  VOID                            *TlsConn;\r
+  VOID                              *TlsConn;\r
 };\r
 \r
-\r
 #define TLS_SERVICE_FROM_THIS(a)   \\r
   CR (a, TLS_SERVICE, ServiceBinding, TLS_SERVICE_SIGNATURE)\r
 \r
@@ -89,7 +87,6 @@ struct _TLS_INSTANCE {
 #define TLS_INSTANCE_FROM_CONFIGURATION(a)  \\r
   CR (a, TLS_INSTANCE, TlsConfig, TLS_INSTANCE_SIGNATURE)\r
 \r
-\r
 /**\r
   Release all the resources used by the TLS instance.\r
 \r
@@ -98,7 +95,7 @@ struct _TLS_INSTANCE {
 **/\r
 VOID\r
 TlsCleanInstance (\r
-  IN TLS_INSTANCE           *Instance\r
+  IN TLS_INSTANCE  *Instance\r
   );\r
 \r
 /**\r
@@ -113,8 +110,8 @@ TlsCleanInstance (
 **/\r
 EFI_STATUS\r
 TlsCreateInstance (\r
-  IN  TLS_SERVICE         *Service,\r
-  OUT TLS_INSTANCE        **Instance\r
+  IN  TLS_SERVICE   *Service,\r
+  OUT TLS_INSTANCE  **Instance\r
   );\r
 \r
 /**\r
@@ -125,7 +122,7 @@ TlsCreateInstance (
 **/\r
 VOID\r
 TlsCleanService (\r
-  IN TLS_SERVICE     *Service\r
+  IN TLS_SERVICE  *Service\r
   );\r
 \r
 /**\r
@@ -140,8 +137,8 @@ TlsCleanService (
 **/\r
 EFI_STATUS\r
 TlsCreateService (\r
-  IN  EFI_HANDLE            Image,\r
-  OUT TLS_SERVICE           **Service\r
+  IN  EFI_HANDLE   Image,\r
+  OUT TLS_SERVICE  **Service\r
   );\r
 \r
 /**\r
@@ -229,4 +226,3 @@ TlsServiceBindingDestroyChild (
   );\r
 \r
 #endif\r
-\r
index 352465b7e8e03950987a234f8fccd910c62bdd65..781bda813e4b3a59c154d93861d62d2f188ce5ab 100644 (file)
@@ -27,25 +27,25 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 TlsEncryptPacket (\r
-  IN     TLS_INSTANCE                  *TlsInstance,\r
-  IN OUT EFI_TLS_FRAGMENT_DATA         **FragmentTable,\r
-  IN     UINT32                        *FragmentCount\r
+  IN     TLS_INSTANCE           *TlsInstance,\r
+  IN OUT EFI_TLS_FRAGMENT_DATA  **FragmentTable,\r
+  IN     UINT32                 *FragmentCount\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  UINTN               Index;\r
-  UINT32              BytesCopied;\r
-  UINT32              BufferInSize;\r
-  UINT8               *BufferIn;\r
-  UINT8               *BufferInPtr;\r
-  TLS_RECORD_HEADER   *RecordHeaderIn;\r
-  UINT16              ThisPlainMessageSize;\r
-  TLS_RECORD_HEADER   *TempRecordHeader;\r
-  UINT16              ThisMessageSize;\r
-  UINT32              BufferOutSize;\r
-  UINT8               *BufferOut;\r
-  UINT32              RecordCount;\r
-  INTN                Ret;\r
+  EFI_STATUS         Status;\r
+  UINTN              Index;\r
+  UINT32             BytesCopied;\r
+  UINT32             BufferInSize;\r
+  UINT8              *BufferIn;\r
+  UINT8              *BufferInPtr;\r
+  TLS_RECORD_HEADER  *RecordHeaderIn;\r
+  UINT16             ThisPlainMessageSize;\r
+  TLS_RECORD_HEADER  *TempRecordHeader;\r
+  UINT16             ThisMessageSize;\r
+  UINT32             BufferOutSize;\r
+  UINT8              *BufferOut;\r
+  UINT32             RecordCount;\r
+  INTN               Ret;\r
 \r
   Status           = EFI_SUCCESS;\r
   BytesCopied      = 0;\r
@@ -91,14 +91,15 @@ TlsEncryptPacket (
   // Count TLS record number.\r
   //\r
   BufferInPtr = BufferIn;\r
-  while ((UINTN) BufferInPtr < (UINTN) BufferIn + BufferInSize) {\r
-    RecordHeaderIn = (TLS_RECORD_HEADER *) BufferInPtr;\r
-    if (RecordHeaderIn->ContentType != TlsContentTypeApplicationData || RecordHeaderIn->Length > TLS_PLAINTEXT_RECORD_MAX_PAYLOAD_LENGTH) {\r
+  while ((UINTN)BufferInPtr < (UINTN)BufferIn + BufferInSize) {\r
+    RecordHeaderIn = (TLS_RECORD_HEADER *)BufferInPtr;\r
+    if ((RecordHeaderIn->ContentType != TlsContentTypeApplicationData) || (RecordHeaderIn->Length > TLS_PLAINTEXT_RECORD_MAX_PAYLOAD_LENGTH)) {\r
       Status = EFI_INVALID_PARAMETER;\r
       goto ERROR;\r
     }\r
+\r
     BufferInPtr += TLS_RECORD_HEADER_LENGTH + RecordHeaderIn->Length;\r
-    RecordCount ++;\r
+    RecordCount++;\r
   }\r
 \r
   //\r
@@ -113,19 +114,19 @@ TlsEncryptPacket (
   //\r
   // Parsing buffer. Received packet may have multiple TLS record messages.\r
   //\r
-  BufferInPtr = BufferIn;\r
-  TempRecordHeader = (TLS_RECORD_HEADER *) BufferOut;\r
-  while ((UINTN) BufferInPtr < (UINTN) BufferIn + BufferInSize) {\r
-    RecordHeaderIn = (TLS_RECORD_HEADER *) BufferInPtr;\r
+  BufferInPtr      = BufferIn;\r
+  TempRecordHeader = (TLS_RECORD_HEADER *)BufferOut;\r
+  while ((UINTN)BufferInPtr < (UINTN)BufferIn + BufferInSize) {\r
+    RecordHeaderIn = (TLS_RECORD_HEADER *)BufferInPtr;\r
 \r
     ThisPlainMessageSize = RecordHeaderIn->Length;\r
 \r
-    TlsWrite (TlsInstance->TlsConn, (UINT8 *) (RecordHeaderIn + 1), ThisPlainMessageSize);\r
+    TlsWrite (TlsInstance->TlsConn, (UINT8 *)(RecordHeaderIn + 1), ThisPlainMessageSize);\r
 \r
     Ret = TlsCtrlTrafficOut (TlsInstance->TlsConn, (UINT8 *)(TempRecordHeader), TLS_RECORD_HEADER_LENGTH + TLS_CIPHERTEXT_RECORD_MAX_PAYLOAD_LENGTH);\r
 \r
     if (Ret > 0) {\r
-      ThisMessageSize = (UINT16) Ret;\r
+      ThisMessageSize = (UINT16)Ret;\r
     } else {\r
       //\r
       // No data was successfully encrypted, continue to encrypt other messages.\r
@@ -137,7 +138,7 @@ TlsEncryptPacket (
 \r
     BufferOutSize += ThisMessageSize;\r
 \r
-    BufferInPtr += TLS_RECORD_HEADER_LENGTH + ThisPlainMessageSize;\r
+    BufferInPtr     += TLS_RECORD_HEADER_LENGTH + ThisPlainMessageSize;\r
     TempRecordHeader = (TLS_RECORD_HEADER *)((UINT8 *)TempRecordHeader + ThisMessageSize);\r
   }\r
 \r
@@ -153,9 +154,9 @@ TlsEncryptPacket (
     goto ERROR;\r
   }\r
 \r
-  (*FragmentTable)[0].FragmentBuffer  = BufferOut;\r
-  (*FragmentTable)[0].FragmentLength  = BufferOutSize;\r
-  *FragmentCount                      = 1;\r
+  (*FragmentTable)[0].FragmentBuffer = BufferOut;\r
+  (*FragmentTable)[0].FragmentLength = BufferOutSize;\r
+  *FragmentCount                     = 1;\r
 \r
   return Status;\r
 \r
@@ -192,25 +193,25 @@ ERROR:
 **/\r
 EFI_STATUS\r
 TlsDecryptPacket (\r
-  IN     TLS_INSTANCE                  *TlsInstance,\r
-  IN OUT EFI_TLS_FRAGMENT_DATA         **FragmentTable,\r
-  IN     UINT32                        *FragmentCount\r
+  IN     TLS_INSTANCE           *TlsInstance,\r
+  IN OUT EFI_TLS_FRAGMENT_DATA  **FragmentTable,\r
+  IN     UINT32                 *FragmentCount\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  UINTN               Index;\r
-  UINT32              BytesCopied;\r
-  UINT8               *BufferIn;\r
-  UINT32              BufferInSize;\r
-  UINT8               *BufferInPtr;\r
-  TLS_RECORD_HEADER   *RecordHeaderIn;\r
-  UINT16              ThisCipherMessageSize;\r
-  TLS_RECORD_HEADER   *TempRecordHeader;\r
-  UINT16              ThisPlainMessageSize;\r
-  UINT8               *BufferOut;\r
-  UINT32              BufferOutSize;\r
-  UINT32              RecordCount;\r
-  INTN                Ret;\r
+  EFI_STATUS         Status;\r
+  UINTN              Index;\r
+  UINT32             BytesCopied;\r
+  UINT8              *BufferIn;\r
+  UINT32             BufferInSize;\r
+  UINT8              *BufferInPtr;\r
+  TLS_RECORD_HEADER  *RecordHeaderIn;\r
+  UINT16             ThisCipherMessageSize;\r
+  TLS_RECORD_HEADER  *TempRecordHeader;\r
+  UINT16             ThisPlainMessageSize;\r
+  UINT8              *BufferOut;\r
+  UINT32             BufferOutSize;\r
+  UINT32             RecordCount;\r
+  INTN               Ret;\r
 \r
   Status           = EFI_SUCCESS;\r
   BytesCopied      = 0;\r
@@ -256,14 +257,15 @@ TlsDecryptPacket (
   // Count TLS record number.\r
   //\r
   BufferInPtr = BufferIn;\r
-  while ((UINTN) BufferInPtr < (UINTN) BufferIn + BufferInSize) {\r
-    RecordHeaderIn = (TLS_RECORD_HEADER *) BufferInPtr;\r
-    if (RecordHeaderIn->ContentType != TlsContentTypeApplicationData || NTOHS (RecordHeaderIn->Length) > TLS_CIPHERTEXT_RECORD_MAX_PAYLOAD_LENGTH) {\r
+  while ((UINTN)BufferInPtr < (UINTN)BufferIn + BufferInSize) {\r
+    RecordHeaderIn = (TLS_RECORD_HEADER *)BufferInPtr;\r
+    if ((RecordHeaderIn->ContentType != TlsContentTypeApplicationData) || (NTOHS (RecordHeaderIn->Length) > TLS_CIPHERTEXT_RECORD_MAX_PAYLOAD_LENGTH)) {\r
       Status = EFI_INVALID_PARAMETER;\r
       goto ERROR;\r
     }\r
+\r
     BufferInPtr += TLS_RECORD_HEADER_LENGTH + NTOHS (RecordHeaderIn->Length);\r
-    RecordCount ++;\r
+    RecordCount++;\r
   }\r
 \r
   //\r
@@ -278,25 +280,25 @@ TlsDecryptPacket (
   //\r
   // Parsing buffer. Received packet may have multiple TLS record messages.\r
   //\r
-  BufferInPtr = BufferIn;\r
-  TempRecordHeader = (TLS_RECORD_HEADER *) BufferOut;\r
-  while ((UINTN) BufferInPtr < (UINTN) BufferIn + BufferInSize) {\r
-    RecordHeaderIn = (TLS_RECORD_HEADER *) BufferInPtr;\r
+  BufferInPtr      = BufferIn;\r
+  TempRecordHeader = (TLS_RECORD_HEADER *)BufferOut;\r
+  while ((UINTN)BufferInPtr < (UINTN)BufferIn + BufferInSize) {\r
+    RecordHeaderIn = (TLS_RECORD_HEADER *)BufferInPtr;\r
 \r
     ThisCipherMessageSize = NTOHS (RecordHeaderIn->Length);\r
 \r
-    Ret = TlsCtrlTrafficIn (TlsInstance->TlsConn, (UINT8 *) (RecordHeaderIn), TLS_RECORD_HEADER_LENGTH + ThisCipherMessageSize);\r
+    Ret = TlsCtrlTrafficIn (TlsInstance->TlsConn, (UINT8 *)(RecordHeaderIn), TLS_RECORD_HEADER_LENGTH + ThisCipherMessageSize);\r
     if (Ret != TLS_RECORD_HEADER_LENGTH + ThisCipherMessageSize) {\r
       TlsInstance->TlsSessionState = EfiTlsSessionError;\r
-      Status = EFI_ABORTED;\r
+      Status                       = EFI_ABORTED;\r
       goto ERROR;\r
     }\r
 \r
     Ret = 0;\r
-    Ret = TlsRead (TlsInstance->TlsConn, (UINT8 *) (TempRecordHeader + 1), TLS_PLAINTEXT_RECORD_MAX_PAYLOAD_LENGTH);\r
+    Ret = TlsRead (TlsInstance->TlsConn, (UINT8 *)(TempRecordHeader + 1), TLS_PLAINTEXT_RECORD_MAX_PAYLOAD_LENGTH);\r
 \r
     if (Ret > 0) {\r
-      ThisPlainMessageSize = (UINT16) Ret;\r
+      ThisPlainMessageSize = (UINT16)Ret;\r
     } else {\r
       //\r
       // No data was successfully decrypted, continue to decrypt other messages.\r
@@ -308,9 +310,9 @@ TlsDecryptPacket (
 \r
     CopyMem (TempRecordHeader, RecordHeaderIn, TLS_RECORD_HEADER_LENGTH);\r
     TempRecordHeader->Length = ThisPlainMessageSize;\r
-    BufferOutSize += TLS_RECORD_HEADER_LENGTH + ThisPlainMessageSize;\r
+    BufferOutSize           += TLS_RECORD_HEADER_LENGTH + ThisPlainMessageSize;\r
 \r
-    BufferInPtr += TLS_RECORD_HEADER_LENGTH + ThisCipherMessageSize;\r
+    BufferInPtr     += TLS_RECORD_HEADER_LENGTH + ThisCipherMessageSize;\r
     TempRecordHeader = (TLS_RECORD_HEADER *)((UINT8 *)TempRecordHeader + TLS_RECORD_HEADER_LENGTH + ThisPlainMessageSize);\r
   }\r
 \r
@@ -326,9 +328,9 @@ TlsDecryptPacket (
     goto ERROR;\r
   }\r
 \r
-  (*FragmentTable)[0].FragmentBuffer  = BufferOut;\r
-  (*FragmentTable)[0].FragmentLength  = BufferOutSize;\r
-  *FragmentCount                      = 1;\r
+  (*FragmentTable)[0].FragmentBuffer = BufferOut;\r
+  (*FragmentTable)[0].FragmentLength = BufferOutSize;\r
+  *FragmentCount                     = 1;\r
 \r
   return Status;\r
 \r
index 391f86ef60a791d2c8c683053ad872a6bccb6df2..b087c9df280715fd421f5f4e21648fcd35f055f8 100644 (file)
@@ -58,9 +58,9 @@ extern EFI_TLS_CONFIGURATION_PROTOCOL  mTlsConfigurationProtocol;
 **/\r
 EFI_STATUS\r
 TlsEncryptPacket (\r
-  IN     TLS_INSTANCE                  *TlsInstance,\r
-  IN OUT EFI_TLS_FRAGMENT_DATA         **FragmentTable,\r
-  IN     UINT32                        *FragmentCount\r
+  IN     TLS_INSTANCE           *TlsInstance,\r
+  IN OUT EFI_TLS_FRAGMENT_DATA  **FragmentTable,\r
+  IN     UINT32                 *FragmentCount\r
   );\r
 \r
 /**\r
@@ -81,9 +81,9 @@ TlsEncryptPacket (
 **/\r
 EFI_STATUS\r
 TlsDecryptPacket (\r
-  IN     TLS_INSTANCE                  *TlsInstance,\r
-  IN OUT EFI_TLS_FRAGMENT_DATA         **FragmentTable,\r
-  IN     UINT32                        *FragmentCount\r
+  IN     TLS_INSTANCE           *TlsInstance,\r
+  IN OUT EFI_TLS_FRAGMENT_DATA  **FragmentTable,\r
+  IN     UINT32                 *FragmentCount\r
   );\r
 \r
 /**\r
@@ -114,10 +114,10 @@ TlsDecryptPacket (
 EFI_STATUS\r
 EFIAPI\r
 TlsSetSessionData (\r
-  IN     EFI_TLS_PROTOCOL              *This,\r
-  IN     EFI_TLS_SESSION_DATA_TYPE     DataType,\r
-  IN     VOID                          *Data,\r
-  IN     UINTN                         DataSize\r
+  IN     EFI_TLS_PROTOCOL           *This,\r
+  IN     EFI_TLS_SESSION_DATA_TYPE  DataType,\r
+  IN     VOID                       *Data,\r
+  IN     UINTN                      DataSize\r
   );\r
 \r
 /**\r
@@ -146,10 +146,10 @@ TlsSetSessionData (
 EFI_STATUS\r
 EFIAPI\r
 TlsGetSessionData (\r
-  IN     EFI_TLS_PROTOCOL              *This,\r
-  IN     EFI_TLS_SESSION_DATA_TYPE     DataType,\r
-  IN OUT VOID                          *Data   OPTIONAL,\r
-  IN OUT UINTN                         *DataSize\r
+  IN     EFI_TLS_PROTOCOL           *This,\r
+  IN     EFI_TLS_SESSION_DATA_TYPE  DataType,\r
+  IN OUT VOID                       *Data   OPTIONAL,\r
+  IN OUT UINTN                      *DataSize\r
   );\r
 \r
 /**\r
@@ -193,11 +193,11 @@ TlsGetSessionData (
 EFI_STATUS\r
 EFIAPI\r
 TlsBuildResponsePacket (\r
-  IN     EFI_TLS_PROTOCOL              *This,\r
-  IN     UINT8                         *RequestBuffer  OPTIONAL,\r
-  IN     UINTN                         RequestSize  OPTIONAL,\r
-     OUT UINT8                         *Buffer  OPTIONAL,\r
-  IN OUT UINTN                         *BufferSize\r
+  IN     EFI_TLS_PROTOCOL  *This,\r
+  IN     UINT8             *RequestBuffer  OPTIONAL,\r
+  IN     UINTN             RequestSize  OPTIONAL,\r
+  OUT UINT8                *Buffer  OPTIONAL,\r
+  IN OUT UINTN             *BufferSize\r
   );\r
 \r
 /**\r
@@ -237,10 +237,10 @@ TlsBuildResponsePacket (
 EFI_STATUS\r
 EFIAPI\r
 TlsProcessPacket (\r
-  IN     EFI_TLS_PROTOCOL              *This,\r
-  IN OUT EFI_TLS_FRAGMENT_DATA         **FragmentTable,\r
-  IN     UINT32                        *FragmentCount,\r
-  IN     EFI_TLS_CRYPT_MODE            CryptMode\r
+  IN     EFI_TLS_PROTOCOL       *This,\r
+  IN OUT EFI_TLS_FRAGMENT_DATA  **FragmentTable,\r
+  IN     UINT32                 *FragmentCount,\r
+  IN     EFI_TLS_CRYPT_MODE     CryptMode\r
   );\r
 \r
 /**\r
index b814de5b352ff0d201bcdf6e4a3d98f7b08fd1d1..b22ed900ba4c312330b38bdee77966e319c5f0f9 100644 (file)
@@ -45,29 +45,29 @@ EFI_TLS_PROTOCOL  mTlsProtocol = {
 EFI_STATUS\r
 EFIAPI\r
 TlsSetSessionData (\r
-  IN     EFI_TLS_PROTOCOL              *This,\r
-  IN     EFI_TLS_SESSION_DATA_TYPE     DataType,\r
-  IN     VOID                          *Data,\r
-  IN     UINTN                         DataSize\r
+  IN     EFI_TLS_PROTOCOL           *This,\r
+  IN     EFI_TLS_SESSION_DATA_TYPE  DataType,\r
+  IN     VOID                       *Data,\r
+  IN     UINTN                      DataSize\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  TLS_INSTANCE              *Instance;\r
-  UINT16                    *CipherId;\r
-  CONST EFI_TLS_CIPHER      *TlsCipherList;\r
-  UINTN                     CipherCount;\r
-  CONST EFI_TLS_VERIFY_HOST *TlsVerifyHost;\r
-  EFI_TLS_VERIFY            VerifyMethod;\r
-  UINTN                     VerifyMethodSize;\r
-  UINTN                     Index;\r
-\r
-  EFI_TPL                   OldTpl;\r
+  EFI_STATUS                 Status;\r
+  TLS_INSTANCE               *Instance;\r
+  UINT16                     *CipherId;\r
+  CONST EFI_TLS_CIPHER       *TlsCipherList;\r
+  UINTN                      CipherCount;\r
+  CONST EFI_TLS_VERIFY_HOST  *TlsVerifyHost;\r
+  EFI_TLS_VERIFY             VerifyMethod;\r
+  UINTN                      VerifyMethodSize;\r
+  UINTN                      Index;\r
+\r
+  EFI_TPL  OldTpl;\r
 \r
   Status           = EFI_SUCCESS;\r
   CipherId         = NULL;\r
   VerifyMethodSize = sizeof (EFI_TLS_VERIFY);\r
 \r
-  if (This == NULL || Data == NULL || DataSize == 0) {\r
+  if ((This == NULL) || (Data == NULL) || (DataSize == 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -75,155 +75,157 @@ TlsSetSessionData (
 \r
   Instance = TLS_INSTANCE_FROM_PROTOCOL (This);\r
 \r
-  if (DataType != EfiTlsSessionState  && Instance->TlsSessionState != EfiTlsSessionNotStarted){\r
+  if ((DataType != EfiTlsSessionState) && (Instance->TlsSessionState != EfiTlsSessionNotStarted)) {\r
     Status = EFI_NOT_READY;\r
     goto ON_EXIT;\r
   }\r
 \r
   switch (DataType) {\r
-  //\r
-  // Session Configuration\r
-  //\r
-  case EfiTlsVersion:\r
-    if (DataSize != sizeof (EFI_TLS_VERSION)) {\r
-      Status = EFI_INVALID_PARAMETER;\r
-      goto ON_EXIT;\r
-    }\r
+    //\r
+    // Session Configuration\r
+    //\r
+    case EfiTlsVersion:\r
+      if (DataSize != sizeof (EFI_TLS_VERSION)) {\r
+        Status = EFI_INVALID_PARAMETER;\r
+        goto ON_EXIT;\r
+      }\r
 \r
-    Status = TlsSetVersion (Instance->TlsConn, ((EFI_TLS_VERSION *) Data)->Major, ((EFI_TLS_VERSION *) Data)->Minor);\r
-    break;\r
-  case EfiTlsConnectionEnd:\r
-    if (DataSize != sizeof (EFI_TLS_CONNECTION_END)) {\r
-      Status = EFI_INVALID_PARAMETER;\r
-      goto ON_EXIT;\r
-    }\r
+      Status = TlsSetVersion (Instance->TlsConn, ((EFI_TLS_VERSION *)Data)->Major, ((EFI_TLS_VERSION *)Data)->Minor);\r
+      break;\r
+    case EfiTlsConnectionEnd:\r
+      if (DataSize != sizeof (EFI_TLS_CONNECTION_END)) {\r
+        Status = EFI_INVALID_PARAMETER;\r
+        goto ON_EXIT;\r
+      }\r
 \r
-    Status = TlsSetConnectionEnd (Instance->TlsConn, *((EFI_TLS_CONNECTION_END *) Data));\r
-    break;\r
-  case EfiTlsCipherList:\r
-    if (DataSize % sizeof (EFI_TLS_CIPHER) != 0) {\r
-      Status = EFI_INVALID_PARAMETER;\r
-      goto ON_EXIT;\r
-    }\r
+      Status = TlsSetConnectionEnd (Instance->TlsConn, *((EFI_TLS_CONNECTION_END *)Data));\r
+      break;\r
+    case EfiTlsCipherList:\r
+      if (DataSize % sizeof (EFI_TLS_CIPHER) != 0) {\r
+        Status = EFI_INVALID_PARAMETER;\r
+        goto ON_EXIT;\r
+      }\r
 \r
-    CipherId = AllocatePool (DataSize);\r
-    if (CipherId == NULL) {\r
-      Status = EFI_OUT_OF_RESOURCES;\r
-      goto ON_EXIT;\r
-    }\r
+      CipherId = AllocatePool (DataSize);\r
+      if (CipherId == NULL) {\r
+        Status = EFI_OUT_OF_RESOURCES;\r
+        goto ON_EXIT;\r
+      }\r
 \r
-    TlsCipherList = (CONST EFI_TLS_CIPHER *) Data;\r
-    CipherCount = DataSize / sizeof (EFI_TLS_CIPHER);\r
-    for (Index = 0; Index < CipherCount; Index++) {\r
-      CipherId[Index] = ((TlsCipherList[Index].Data1 << 8) |\r
-                         TlsCipherList[Index].Data2);\r
-    }\r
+      TlsCipherList = (CONST EFI_TLS_CIPHER *)Data;\r
+      CipherCount   = DataSize / sizeof (EFI_TLS_CIPHER);\r
+      for (Index = 0; Index < CipherCount; Index++) {\r
+        CipherId[Index] = ((TlsCipherList[Index].Data1 << 8) |\r
+                           TlsCipherList[Index].Data2);\r
+      }\r
 \r
-    Status = TlsSetCipherList (Instance->TlsConn, CipherId, CipherCount);\r
+      Status = TlsSetCipherList (Instance->TlsConn, CipherId, CipherCount);\r
 \r
-    FreePool (CipherId);\r
-    break;\r
-  case EfiTlsCompressionMethod:\r
-    //\r
-    // TLS seems only define one CompressionMethod.null, which specifies that data exchanged via the\r
-    // record protocol will not be compressed.\r
-    // More information from OpenSSL: http://www.openssl.org/docs/manmaster/ssl/SSL_COMP_add_compression_method.html\r
-    // The TLS RFC does however not specify compression methods or their corresponding identifiers,\r
-    // so there is currently no compatible way to integrate compression with unknown peers.\r
-    // It is therefore currently not recommended to integrate compression into applications.\r
-    // Applications for non-public use may agree on certain compression methods.\r
-    // Using different compression methods with the same identifier will lead to connection failure.\r
-    //\r
-    for (Index = 0; Index < DataSize / sizeof (EFI_TLS_COMPRESSION); Index++) {\r
-      Status = TlsSetCompressionMethod (*((UINT8 *) Data + Index));\r
-      if (EFI_ERROR (Status)) {\r
-        break;\r
+      FreePool (CipherId);\r
+      break;\r
+    case EfiTlsCompressionMethod:\r
+      //\r
+      // TLS seems only define one CompressionMethod.null, which specifies that data exchanged via the\r
+      // record protocol will not be compressed.\r
+      // More information from OpenSSL: http://www.openssl.org/docs/manmaster/ssl/SSL_COMP_add_compression_method.html\r
+      // The TLS RFC does however not specify compression methods or their corresponding identifiers,\r
+      // so there is currently no compatible way to integrate compression with unknown peers.\r
+      // It is therefore currently not recommended to integrate compression into applications.\r
+      // Applications for non-public use may agree on certain compression methods.\r
+      // Using different compression methods with the same identifier will lead to connection failure.\r
+      //\r
+      for (Index = 0; Index < DataSize / sizeof (EFI_TLS_COMPRESSION); Index++) {\r
+        Status = TlsSetCompressionMethod (*((UINT8 *)Data + Index));\r
+        if (EFI_ERROR (Status)) {\r
+          break;\r
+        }\r
       }\r
-    }\r
 \r
-    break;\r
-  case EfiTlsExtensionData:\r
-    Status = EFI_UNSUPPORTED;\r
-    goto ON_EXIT;\r
-  case EfiTlsVerifyMethod:\r
-    if (DataSize != sizeof (EFI_TLS_VERIFY)) {\r
-      Status = EFI_INVALID_PARAMETER;\r
+      break;\r
+    case EfiTlsExtensionData:\r
+      Status = EFI_UNSUPPORTED;\r
       goto ON_EXIT;\r
-    }\r
+    case EfiTlsVerifyMethod:\r
+      if (DataSize != sizeof (EFI_TLS_VERIFY)) {\r
+        Status = EFI_INVALID_PARAMETER;\r
+        goto ON_EXIT;\r
+      }\r
 \r
-    TlsSetVerify (Instance->TlsConn, *((UINT32 *) Data));\r
-    break;\r
-  case EfiTlsVerifyHost:\r
-    if (DataSize != sizeof (EFI_TLS_VERIFY_HOST)) {\r
-      Status = EFI_INVALID_PARAMETER;\r
-      goto ON_EXIT;\r
-    }\r
+      TlsSetVerify (Instance->TlsConn, *((UINT32 *)Data));\r
+      break;\r
+    case EfiTlsVerifyHost:\r
+      if (DataSize != sizeof (EFI_TLS_VERIFY_HOST)) {\r
+        Status = EFI_INVALID_PARAMETER;\r
+        goto ON_EXIT;\r
+      }\r
 \r
-    TlsVerifyHost = (CONST EFI_TLS_VERIFY_HOST *) Data;\r
+      TlsVerifyHost = (CONST EFI_TLS_VERIFY_HOST *)Data;\r
 \r
-    if ((TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_ALWAYS_CHECK_SUBJECT) != 0 &&\r
-        (TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_NEVER_CHECK_SUBJECT) != 0) {\r
-      Status = EFI_INVALID_PARAMETER;\r
-      goto ON_EXIT;\r
-    }\r
+      if (((TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_ALWAYS_CHECK_SUBJECT) != 0) &&\r
+          ((TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_NEVER_CHECK_SUBJECT) != 0))\r
+      {\r
+        Status = EFI_INVALID_PARAMETER;\r
+        goto ON_EXIT;\r
+      }\r
 \r
-    if ((TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_NO_WILDCARDS) != 0 &&\r
-        ((TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_NO_PARTIAL_WILDCARDS) != 0 ||\r
-         (TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_MULTI_LABEL_WILDCARDS) != 0)) {\r
-      Status = EFI_INVALID_PARAMETER;\r
-      goto ON_EXIT;\r
-    }\r
+      if (((TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_NO_WILDCARDS) != 0) &&\r
+          (((TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_NO_PARTIAL_WILDCARDS) != 0) ||\r
+           ((TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_MULTI_LABEL_WILDCARDS) != 0)))\r
+      {\r
+        Status = EFI_INVALID_PARAMETER;\r
+        goto ON_EXIT;\r
+      }\r
 \r
-    Status = This->GetSessionData (This, EfiTlsVerifyMethod, &VerifyMethod, &VerifyMethodSize);\r
-    if (EFI_ERROR (Status)) {\r
-      goto ON_EXIT;\r
-    }\r
+      Status = This->GetSessionData (This, EfiTlsVerifyMethod, &VerifyMethod, &VerifyMethodSize);\r
+      if (EFI_ERROR (Status)) {\r
+        goto ON_EXIT;\r
+      }\r
 \r
-    if ((VerifyMethod & EFI_TLS_VERIFY_PEER) == 0) {\r
-      Status = EFI_INVALID_PARAMETER;\r
-      goto ON_EXIT;\r
-    }\r
+      if ((VerifyMethod & EFI_TLS_VERIFY_PEER) == 0) {\r
+        Status = EFI_INVALID_PARAMETER;\r
+        goto ON_EXIT;\r
+      }\r
 \r
-    Status = TlsSetVerifyHost (Instance->TlsConn, TlsVerifyHost->Flags, TlsVerifyHost->HostName);\r
+      Status = TlsSetVerifyHost (Instance->TlsConn, TlsVerifyHost->Flags, TlsVerifyHost->HostName);\r
 \r
-    break;\r
-  case EfiTlsSessionID:\r
-    if (DataSize != sizeof (EFI_TLS_SESSION_ID)) {\r
-      Status = EFI_INVALID_PARAMETER;\r
-      goto ON_EXIT;\r
-    }\r
+      break;\r
+    case EfiTlsSessionID:\r
+      if (DataSize != sizeof (EFI_TLS_SESSION_ID)) {\r
+        Status = EFI_INVALID_PARAMETER;\r
+        goto ON_EXIT;\r
+      }\r
 \r
-    Status = TlsSetSessionId (\r
-               Instance->TlsConn,\r
-               ((EFI_TLS_SESSION_ID *) Data)->Data,\r
-               ((EFI_TLS_SESSION_ID *) Data)->Length\r
-               );\r
-    break;\r
-  case EfiTlsSessionState:\r
-    if (DataSize != sizeof (EFI_TLS_SESSION_STATE)) {\r
-      Status = EFI_INVALID_PARAMETER;\r
-      goto ON_EXIT;\r
-    }\r
+      Status = TlsSetSessionId (\r
+                 Instance->TlsConn,\r
+                 ((EFI_TLS_SESSION_ID *)Data)->Data,\r
+                 ((EFI_TLS_SESSION_ID *)Data)->Length\r
+                 );\r
+      break;\r
+    case EfiTlsSessionState:\r
+      if (DataSize != sizeof (EFI_TLS_SESSION_STATE)) {\r
+        Status = EFI_INVALID_PARAMETER;\r
+        goto ON_EXIT;\r
+      }\r
 \r
-    Instance->TlsSessionState = *(EFI_TLS_SESSION_STATE *) Data;\r
-    break;\r
-  //\r
-  // Session information\r
-  //\r
-  case EfiTlsClientRandom:\r
-    Status = EFI_ACCESS_DENIED;\r
-    break;\r
-  case EfiTlsServerRandom:\r
-    Status = EFI_ACCESS_DENIED;\r
-    break;\r
-  case EfiTlsKeyMaterial:\r
-    Status = EFI_ACCESS_DENIED;\r
-    break;\r
-  //\r
-  // Unsupported type.\r
-  //\r
-  default:\r
-    Status = EFI_UNSUPPORTED;\r
+      Instance->TlsSessionState = *(EFI_TLS_SESSION_STATE *)Data;\r
+      break;\r
+    //\r
+    // Session information\r
+    //\r
+    case EfiTlsClientRandom:\r
+      Status = EFI_ACCESS_DENIED;\r
+      break;\r
+    case EfiTlsServerRandom:\r
+      Status = EFI_ACCESS_DENIED;\r
+      break;\r
+    case EfiTlsKeyMaterial:\r
+      Status = EFI_ACCESS_DENIED;\r
+      break;\r
+    //\r
+    // Unsupported type.\r
+    //\r
+    default:\r
+      Status = EFI_UNSUPPORTED;\r
   }\r
 \r
 ON_EXIT:\r
@@ -257,20 +259,20 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 TlsGetSessionData (\r
-  IN     EFI_TLS_PROTOCOL              *This,\r
-  IN     EFI_TLS_SESSION_DATA_TYPE     DataType,\r
-  IN OUT VOID                          *Data   OPTIONAL,\r
-  IN OUT UINTN                         *DataSize\r
+  IN     EFI_TLS_PROTOCOL           *This,\r
+  IN     EFI_TLS_SESSION_DATA_TYPE  DataType,\r
+  IN OUT VOID                       *Data   OPTIONAL,\r
+  IN OUT UINTN                      *DataSize\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  TLS_INSTANCE              *Instance;\r
+  EFI_STATUS    Status;\r
+  TLS_INSTANCE  *Instance;\r
 \r
-  EFI_TPL                   OldTpl;\r
+  EFI_TPL  OldTpl;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
-  if (This == NULL || DataSize == NULL || (Data == NULL && *DataSize != 0)) {\r
+  if ((This == NULL) || (DataSize == NULL) || ((Data == NULL) && (*DataSize != 0))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -278,123 +280,134 @@ TlsGetSessionData (
 \r
   Instance = TLS_INSTANCE_FROM_PROTOCOL (This);\r
 \r
-  if (Instance->TlsSessionState == EfiTlsSessionNotStarted &&\r
-    (DataType == EfiTlsSessionID || DataType == EfiTlsClientRandom ||\r
-    DataType == EfiTlsServerRandom || DataType == EfiTlsKeyMaterial)) {\r
+  if ((Instance->TlsSessionState == EfiTlsSessionNotStarted) &&\r
+      ((DataType == EfiTlsSessionID) || (DataType == EfiTlsClientRandom) ||\r
+       (DataType == EfiTlsServerRandom) || (DataType == EfiTlsKeyMaterial)))\r
+  {\r
     Status = EFI_NOT_READY;\r
     goto ON_EXIT;\r
   }\r
 \r
   switch (DataType) {\r
-  case EfiTlsVersion:\r
-    if (*DataSize < sizeof (EFI_TLS_VERSION)) {\r
-      *DataSize = sizeof (EFI_TLS_VERSION);\r
-      Status = EFI_BUFFER_TOO_SMALL;\r
-      goto ON_EXIT;\r
-    }\r
-    *DataSize = sizeof (EFI_TLS_VERSION);\r
-    *((UINT16 *) Data) = HTONS (TlsGetVersion (Instance->TlsConn));\r
-    break;\r
-  case EfiTlsConnectionEnd:\r
-    if (*DataSize < sizeof (EFI_TLS_CONNECTION_END)) {\r
-      *DataSize = sizeof (EFI_TLS_CONNECTION_END);\r
-      Status = EFI_BUFFER_TOO_SMALL;\r
-      goto ON_EXIT;\r
-    }\r
-    *DataSize = sizeof (EFI_TLS_CONNECTION_END);\r
-    *((UINT8 *) Data) = TlsGetConnectionEnd (Instance->TlsConn);\r
-    break;\r
-  case EfiTlsCipherList:\r
-    //\r
-    // Get the current session cipher suite.\r
-    //\r
-    if (*DataSize < sizeof (EFI_TLS_CIPHER)) {\r
-      *DataSize = sizeof (EFI_TLS_CIPHER);\r
-      Status = EFI_BUFFER_TOO_SMALL;\r
-      goto ON_EXIT;\r
-    }\r
-    *DataSize = sizeof(EFI_TLS_CIPHER);\r
-    Status = TlsGetCurrentCipher (Instance->TlsConn, (UINT16 *) Data);\r
-    *((UINT16 *) Data) = HTONS (*((UINT16 *) Data));\r
-    break;\r
-  case EfiTlsCompressionMethod:\r
-    //\r
-    // Get the current session compression method.\r
-    //\r
-    if (*DataSize < sizeof (EFI_TLS_COMPRESSION)) {\r
+    case EfiTlsVersion:\r
+      if (*DataSize < sizeof (EFI_TLS_VERSION)) {\r
+        *DataSize = sizeof (EFI_TLS_VERSION);\r
+        Status    = EFI_BUFFER_TOO_SMALL;\r
+        goto ON_EXIT;\r
+      }\r
+\r
+      *DataSize         = sizeof (EFI_TLS_VERSION);\r
+      *((UINT16 *)Data) = HTONS (TlsGetVersion (Instance->TlsConn));\r
+      break;\r
+    case EfiTlsConnectionEnd:\r
+      if (*DataSize < sizeof (EFI_TLS_CONNECTION_END)) {\r
+        *DataSize = sizeof (EFI_TLS_CONNECTION_END);\r
+        Status    = EFI_BUFFER_TOO_SMALL;\r
+        goto ON_EXIT;\r
+      }\r
+\r
+      *DataSize        = sizeof (EFI_TLS_CONNECTION_END);\r
+      *((UINT8 *)Data) = TlsGetConnectionEnd (Instance->TlsConn);\r
+      break;\r
+    case EfiTlsCipherList:\r
+      //\r
+      // Get the current session cipher suite.\r
+      //\r
+      if (*DataSize < sizeof (EFI_TLS_CIPHER)) {\r
+        *DataSize = sizeof (EFI_TLS_CIPHER);\r
+        Status    = EFI_BUFFER_TOO_SMALL;\r
+        goto ON_EXIT;\r
+      }\r
+\r
+      *DataSize         = sizeof (EFI_TLS_CIPHER);\r
+      Status            = TlsGetCurrentCipher (Instance->TlsConn, (UINT16 *)Data);\r
+      *((UINT16 *)Data) = HTONS (*((UINT16 *)Data));\r
+      break;\r
+    case EfiTlsCompressionMethod:\r
+      //\r
+      // Get the current session compression method.\r
+      //\r
+      if (*DataSize < sizeof (EFI_TLS_COMPRESSION)) {\r
+        *DataSize = sizeof (EFI_TLS_COMPRESSION);\r
+        Status    = EFI_BUFFER_TOO_SMALL;\r
+        goto ON_EXIT;\r
+      }\r
+\r
       *DataSize = sizeof (EFI_TLS_COMPRESSION);\r
-      Status = EFI_BUFFER_TOO_SMALL;\r
-      goto ON_EXIT;\r
-    }\r
-    *DataSize = sizeof (EFI_TLS_COMPRESSION);\r
-    Status = TlsGetCurrentCompressionId (Instance->TlsConn, (UINT8 *) Data);\r
-    break;\r
-  case EfiTlsExtensionData:\r
-    Status = EFI_UNSUPPORTED;\r
-    goto ON_EXIT;\r
-  case EfiTlsVerifyMethod:\r
-    if (*DataSize < sizeof (EFI_TLS_VERIFY)) {\r
-      *DataSize = sizeof (EFI_TLS_VERIFY);\r
-      Status = EFI_BUFFER_TOO_SMALL;\r
+      Status    = TlsGetCurrentCompressionId (Instance->TlsConn, (UINT8 *)Data);\r
+      break;\r
+    case EfiTlsExtensionData:\r
+      Status = EFI_UNSUPPORTED;\r
       goto ON_EXIT;\r
-    }\r
-    *DataSize = sizeof (EFI_TLS_VERIFY);\r
-    *((UINT32 *) Data) = TlsGetVerify (Instance->TlsConn);\r
-    break;\r
-  case EfiTlsSessionID:\r
-    if (*DataSize < sizeof (EFI_TLS_SESSION_ID)) {\r
+    case EfiTlsVerifyMethod:\r
+      if (*DataSize < sizeof (EFI_TLS_VERIFY)) {\r
+        *DataSize = sizeof (EFI_TLS_VERIFY);\r
+        Status    = EFI_BUFFER_TOO_SMALL;\r
+        goto ON_EXIT;\r
+      }\r
+\r
+      *DataSize         = sizeof (EFI_TLS_VERIFY);\r
+      *((UINT32 *)Data) = TlsGetVerify (Instance->TlsConn);\r
+      break;\r
+    case EfiTlsSessionID:\r
+      if (*DataSize < sizeof (EFI_TLS_SESSION_ID)) {\r
+        *DataSize = sizeof (EFI_TLS_SESSION_ID);\r
+        Status    = EFI_BUFFER_TOO_SMALL;\r
+        goto ON_EXIT;\r
+      }\r
+\r
       *DataSize = sizeof (EFI_TLS_SESSION_ID);\r
-      Status = EFI_BUFFER_TOO_SMALL;\r
-      goto ON_EXIT;\r
-    }\r
-    *DataSize = sizeof (EFI_TLS_SESSION_ID);\r
-    Status = TlsGetSessionId (\r
-               Instance->TlsConn,\r
-               ((EFI_TLS_SESSION_ID *) Data)->Data,\r
-               &(((EFI_TLS_SESSION_ID *) Data)->Length)\r
-               );\r
-    break;\r
-  case EfiTlsSessionState:\r
-    if (*DataSize < sizeof (EFI_TLS_SESSION_STATE)) {\r
+      Status    = TlsGetSessionId (\r
+                    Instance->TlsConn,\r
+                    ((EFI_TLS_SESSION_ID *)Data)->Data,\r
+                    &(((EFI_TLS_SESSION_ID *)Data)->Length)\r
+                    );\r
+      break;\r
+    case EfiTlsSessionState:\r
+      if (*DataSize < sizeof (EFI_TLS_SESSION_STATE)) {\r
+        *DataSize = sizeof (EFI_TLS_SESSION_STATE);\r
+        Status    = EFI_BUFFER_TOO_SMALL;\r
+        goto ON_EXIT;\r
+      }\r
+\r
       *DataSize = sizeof (EFI_TLS_SESSION_STATE);\r
-      Status = EFI_BUFFER_TOO_SMALL;\r
-      goto ON_EXIT;\r
-    }\r
-    *DataSize = sizeof (EFI_TLS_SESSION_STATE);\r
-    CopyMem (Data, &Instance->TlsSessionState, *DataSize);\r
-    break;\r
-  case EfiTlsClientRandom:\r
-    if (*DataSize < sizeof (EFI_TLS_RANDOM)) {\r
+      CopyMem (Data, &Instance->TlsSessionState, *DataSize);\r
+      break;\r
+    case EfiTlsClientRandom:\r
+      if (*DataSize < sizeof (EFI_TLS_RANDOM)) {\r
+        *DataSize = sizeof (EFI_TLS_RANDOM);\r
+        Status    = EFI_BUFFER_TOO_SMALL;\r
+        goto ON_EXIT;\r
+      }\r
+\r
       *DataSize = sizeof (EFI_TLS_RANDOM);\r
-      Status = EFI_BUFFER_TOO_SMALL;\r
-      goto ON_EXIT;\r
-    }\r
-    *DataSize = sizeof (EFI_TLS_RANDOM);\r
-    TlsGetClientRandom (Instance->TlsConn, (UINT8 *) Data);\r
-    break;\r
-  case EfiTlsServerRandom:\r
-    if (*DataSize < sizeof (EFI_TLS_RANDOM)) {\r
+      TlsGetClientRandom (Instance->TlsConn, (UINT8 *)Data);\r
+      break;\r
+    case EfiTlsServerRandom:\r
+      if (*DataSize < sizeof (EFI_TLS_RANDOM)) {\r
+        *DataSize = sizeof (EFI_TLS_RANDOM);\r
+        Status    = EFI_BUFFER_TOO_SMALL;\r
+        goto ON_EXIT;\r
+      }\r
+\r
       *DataSize = sizeof (EFI_TLS_RANDOM);\r
-      Status = EFI_BUFFER_TOO_SMALL;\r
-      goto ON_EXIT;\r
-    }\r
-    *DataSize = sizeof (EFI_TLS_RANDOM);\r
-    TlsGetServerRandom (Instance->TlsConn, (UINT8 *) Data);\r
-    break;\r
-  case EfiTlsKeyMaterial:\r
-    if (*DataSize < sizeof (EFI_TLS_MASTER_SECRET)) {\r
+      TlsGetServerRandom (Instance->TlsConn, (UINT8 *)Data);\r
+      break;\r
+    case EfiTlsKeyMaterial:\r
+      if (*DataSize < sizeof (EFI_TLS_MASTER_SECRET)) {\r
+        *DataSize = sizeof (EFI_TLS_MASTER_SECRET);\r
+        Status    = EFI_BUFFER_TOO_SMALL;\r
+        goto ON_EXIT;\r
+      }\r
+\r
       *DataSize = sizeof (EFI_TLS_MASTER_SECRET);\r
-      Status = EFI_BUFFER_TOO_SMALL;\r
-      goto ON_EXIT;\r
-    }\r
-    *DataSize = sizeof (EFI_TLS_MASTER_SECRET);\r
-    Status = TlsGetKeyMaterial (Instance->TlsConn, (UINT8 *) Data);\r
-    break;\r
-  //\r
-  // Unsupported type.\r
-  //\r
-  default:\r
-    Status = EFI_UNSUPPORTED;\r
+      Status    = TlsGetKeyMaterial (Instance->TlsConn, (UINT8 *)Data);\r
+      break;\r
+    //\r
+    // Unsupported type.\r
+    //\r
+    default:\r
+      Status = EFI_UNSUPPORTED;\r
   }\r
 \r
 ON_EXIT:\r
@@ -443,23 +456,24 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 TlsBuildResponsePacket (\r
-  IN     EFI_TLS_PROTOCOL              *This,\r
-  IN     UINT8                         *RequestBuffer  OPTIONAL,\r
-  IN     UINTN                         RequestSize  OPTIONAL,\r
-     OUT UINT8                         *Buffer  OPTIONAL,\r
-  IN OUT UINTN                         *BufferSize\r
+  IN     EFI_TLS_PROTOCOL  *This,\r
+  IN     UINT8             *RequestBuffer  OPTIONAL,\r
+  IN     UINTN             RequestSize  OPTIONAL,\r
+  OUT UINT8                *Buffer  OPTIONAL,\r
+  IN OUT UINTN             *BufferSize\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  TLS_INSTANCE              *Instance;\r
-  EFI_TPL                   OldTpl;\r
+  EFI_STATUS    Status;\r
+  TLS_INSTANCE  *Instance;\r
+  EFI_TPL       OldTpl;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
   if ((This == NULL) || (BufferSize == NULL) ||\r
-      (RequestBuffer == NULL && RequestSize != 0) ||\r
-      (RequestBuffer != NULL && RequestSize == 0) ||\r
-      (Buffer == NULL && *BufferSize !=0)) {\r
+      ((RequestBuffer == NULL) && (RequestSize != 0)) ||\r
+      ((RequestBuffer != NULL) && (RequestSize == 0)) ||\r
+      ((Buffer == NULL) && (*BufferSize != 0)))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -467,78 +481,78 @@ TlsBuildResponsePacket (
 \r
   Instance = TLS_INSTANCE_FROM_PROTOCOL (This);\r
 \r
-  if(RequestBuffer == NULL && RequestSize == 0) {\r
+  if ((RequestBuffer == NULL) && (RequestSize == 0)) {\r
     switch (Instance->TlsSessionState) {\r
-    case EfiTlsSessionNotStarted:\r
-      //\r
-      // ClientHello.\r
-      //\r
-      Status = TlsDoHandshake (\r
-                 Instance->TlsConn,\r
-                 NULL,\r
-                 0,\r
-                 Buffer,\r
-                 BufferSize\r
-                 );\r
-      if (EFI_ERROR (Status)) {\r
-        goto ON_EXIT;\r
-      }\r
+      case EfiTlsSessionNotStarted:\r
+        //\r
+        // ClientHello.\r
+        //\r
+        Status = TlsDoHandshake (\r
+                   Instance->TlsConn,\r
+                   NULL,\r
+                   0,\r
+                   Buffer,\r
+                   BufferSize\r
+                   );\r
+        if (EFI_ERROR (Status)) {\r
+          goto ON_EXIT;\r
+        }\r
 \r
-      //\r
-      // *BufferSize should not be zero when ClientHello.\r
-      //\r
-      if (*BufferSize == 0) {\r
-        Status = EFI_ABORTED;\r
-        goto ON_EXIT;\r
-      }\r
+        //\r
+        // *BufferSize should not be zero when ClientHello.\r
+        //\r
+        if (*BufferSize == 0) {\r
+          Status = EFI_ABORTED;\r
+          goto ON_EXIT;\r
+        }\r
 \r
-      Instance->TlsSessionState = EfiTlsSessionHandShaking;\r
+        Instance->TlsSessionState = EfiTlsSessionHandShaking;\r
 \r
-      break;\r
-    case EfiTlsSessionClosing:\r
-      //\r
-      // TLS session will be closed and response packet needs to be CloseNotify.\r
-      //\r
-      Status = TlsCloseNotify (\r
-                 Instance->TlsConn,\r
-                 Buffer,\r
-                 BufferSize\r
-                 );\r
-      if (EFI_ERROR (Status)) {\r
-        goto ON_EXIT;\r
-      }\r
+        break;\r
+      case EfiTlsSessionClosing:\r
+        //\r
+        // TLS session will be closed and response packet needs to be CloseNotify.\r
+        //\r
+        Status = TlsCloseNotify (\r
+                   Instance->TlsConn,\r
+                   Buffer,\r
+                   BufferSize\r
+                   );\r
+        if (EFI_ERROR (Status)) {\r
+          goto ON_EXIT;\r
+        }\r
 \r
-      //\r
-      // *BufferSize should not be zero when build CloseNotify message.\r
-      //\r
-      if (*BufferSize == 0) {\r
-        Status = EFI_ABORTED;\r
-        goto ON_EXIT;\r
-      }\r
+        //\r
+        // *BufferSize should not be zero when build CloseNotify message.\r
+        //\r
+        if (*BufferSize == 0) {\r
+          Status = EFI_ABORTED;\r
+          goto ON_EXIT;\r
+        }\r
 \r
-      break;\r
-    case EfiTlsSessionError:\r
-      //\r
-      // TLS session has errors and the response packet needs to be Alert\r
-      // message based on error type.\r
-      //\r
-      Status = TlsHandleAlert (\r
-                 Instance->TlsConn,\r
-                 NULL,\r
-                 0,\r
-                 Buffer,\r
-                 BufferSize\r
-                 );\r
-      if (EFI_ERROR (Status)) {\r
-        goto ON_EXIT;\r
-      }\r
+        break;\r
+      case EfiTlsSessionError:\r
+        //\r
+        // TLS session has errors and the response packet needs to be Alert\r
+        // message based on error type.\r
+        //\r
+        Status = TlsHandleAlert (\r
+                   Instance->TlsConn,\r
+                   NULL,\r
+                   0,\r
+                   Buffer,\r
+                   BufferSize\r
+                   );\r
+        if (EFI_ERROR (Status)) {\r
+          goto ON_EXIT;\r
+        }\r
 \r
-      break;\r
-    default:\r
-      //\r
-      // Current TLS session state is NOT ready to build ResponsePacket.\r
-      //\r
-      Status = EFI_NOT_READY;\r
+        break;\r
+      default:\r
+        //\r
+        // Current TLS session state is NOT ready to build ResponsePacket.\r
+        //\r
+        Status = EFI_NOT_READY;\r
     }\r
   } else {\r
     //\r
@@ -566,7 +580,7 @@ TlsBuildResponsePacket (
       //\r
       // Must be alert message, Decrypt it and build the ResponsePacket.\r
       //\r
-      ASSERT (((TLS_RECORD_HEADER *) RequestBuffer)->ContentType == TlsContentTypeAlert);\r
+      ASSERT (((TLS_RECORD_HEADER *)RequestBuffer)->ContentType == TlsContentTypeAlert);\r
 \r
       Status = TlsHandleAlert (\r
                  Instance->TlsConn,\r
@@ -627,20 +641,20 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 TlsProcessPacket (\r
-  IN     EFI_TLS_PROTOCOL              *This,\r
-  IN OUT EFI_TLS_FRAGMENT_DATA         **FragmentTable,\r
-  IN     UINT32                        *FragmentCount,\r
-  IN     EFI_TLS_CRYPT_MODE            CryptMode\r
+  IN     EFI_TLS_PROTOCOL       *This,\r
+  IN OUT EFI_TLS_FRAGMENT_DATA  **FragmentTable,\r
+  IN     UINT32                 *FragmentCount,\r
+  IN     EFI_TLS_CRYPT_MODE     CryptMode\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  TLS_INSTANCE              *Instance;\r
+  EFI_STATUS    Status;\r
+  TLS_INSTANCE  *Instance;\r
 \r
-  EFI_TPL                   OldTpl;\r
+  EFI_TPL  OldTpl;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
-  if (This == NULL || FragmentTable == NULL || FragmentCount == NULL) {\r
+  if ((This == NULL) || (FragmentTable == NULL) || (FragmentCount == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -659,14 +673,14 @@ TlsProcessPacket (
   // on output these fragments also contain the TLS header and TLS APP payload.\r
   //\r
   switch (CryptMode) {\r
-  case EfiTlsEncrypt:\r
-    Status = TlsEncryptPacket (Instance, FragmentTable, FragmentCount);\r
-    break;\r
-  case EfiTlsDecrypt:\r
-    Status = TlsDecryptPacket (Instance, FragmentTable, FragmentCount);\r
-    break;\r
-  default:\r
-    return EFI_INVALID_PARAMETER;\r
+    case EfiTlsEncrypt:\r
+      Status = TlsEncryptPacket (Instance, FragmentTable, FragmentCount);\r
+      break;\r
+    case EfiTlsDecrypt:\r
+      Status = TlsDecryptPacket (Instance, FragmentTable, FragmentCount);\r
+      break;\r
+    default:\r
+      return EFI_INVALID_PARAMETER;\r
   }\r
 \r
 ON_EXIT:\r
index 41bd834c6db48955e9168f7c2e33a1493f412100..29e66e72c62c037bbec553bef51bacc2f8c19511 100644 (file)
@@ -5,12 +5,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #include "Udp4Impl.h"\r
 \r
 //\r
 // EFI Component Name Functions\r
 //\r
+\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
 \r
@@ -58,7 +58,6 @@ UdpComponentNameGetDriverName (
   OUT CHAR16                       **DriverName\r
   );\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r
   that is being managed by a driver.\r
@@ -130,14 +129,13 @@ UdpComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 UdpComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   );\r
 \r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
@@ -150,14 +148,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gUdp4ComponentName =
 //\r
 // EFI Component Name 2 Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gUdp4ComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) UdpComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) UdpComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gUdp4ComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)UdpComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)UdpComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mUdpDriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mUdpDriverNameTable[] = {\r
   {\r
     "eng;en",\r
     L"UDP Network Service Driver"\r
@@ -168,7 +165,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mUdpDriverNameTable[] = {
   }\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE *gUdpControllerNameTable = NULL;\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  *gUdpControllerNameTable = NULL;\r
 \r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
@@ -238,12 +235,12 @@ UdpComponentNameGetDriverName (
 **/\r
 EFI_STATUS\r
 UpdateName (\r
-  EFI_UDP4_PROTOCOL             *Udp4\r
+  EFI_UDP4_PROTOCOL  *Udp4\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  CHAR16                           HandleName[64];\r
-  EFI_UDP4_CONFIG_DATA             Udp4ConfigData;\r
+  EFI_STATUS            Status;\r
+  CHAR16                HandleName[64];\r
+  EFI_UDP4_CONFIG_DATA  Udp4ConfigData;\r
 \r
   if (Udp4 == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -255,7 +252,9 @@ UpdateName (
   //\r
   Status = Udp4->GetModeData (Udp4, &Udp4ConfigData, NULL, NULL, NULL);\r
   if (!EFI_ERROR (Status)) {\r
-    UnicodeSPrint (HandleName, sizeof (HandleName),\r
+    UnicodeSPrint (\r
+      HandleName,\r
+      sizeof (HandleName),\r
       L"UDPv4 (SrcPort=%d, DestPort=%d)",\r
       Udp4ConfigData.StationPort,\r
       Udp4ConfigData.RemotePort\r
@@ -366,15 +365,15 @@ UpdateName (
 EFI_STATUS\r
 EFIAPI\r
 UdpComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_UDP4_PROTOCOL             *Udp4;\r
+  EFI_STATUS         Status;\r
+  EFI_UDP4_PROTOCOL  *Udp4;\r
 \r
   //\r
   // Only provide names for child handles.\r
@@ -426,4 +425,3 @@ UdpComponentNameGetControllerName (
            (BOOLEAN)(This == &gUdp4ComponentName)\r
            );\r
 }\r
-\r
index 44032682e2b87d88b6993152d20300a6fb4b361f..cb917fcfc90f1429414066a7b2d3b1721b976562 100644 (file)
@@ -5,10 +5,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #include "Udp4Impl.h"\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gUdp4DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gUdp4DriverBinding = {\r
   Udp4DriverBindingSupported,\r
   Udp4DriverBindingStart,\r
   Udp4DriverBindingStop,\r
@@ -17,7 +16,7 @@ EFI_DRIVER_BINDING_PROTOCOL gUdp4DriverBinding = {
   NULL\r
 };\r
 \r
-EFI_SERVICE_BINDING_PROTOCOL mUdp4ServiceBinding = {\r
+EFI_SERVICE_BINDING_PROTOCOL  mUdp4ServiceBinding = {\r
   Udp4ServiceBindingCreateChild,\r
   Udp4ServiceBindingDestroyChild\r
 };\r
@@ -35,8 +34,8 @@ EFI_SERVICE_BINDING_PROTOCOL mUdp4ServiceBinding = {
 EFI_STATUS\r
 EFIAPI\r
 Udp4DestroyChildEntryInHandleBuffer (\r
-  IN LIST_ENTRY         *Entry,\r
-  IN VOID               *Context\r
+  IN LIST_ENTRY  *Entry,\r
+  IN VOID        *Context\r
   )\r
 {\r
   UDP4_INSTANCE_DATA            *Instance;\r
@@ -44,14 +43,14 @@ Udp4DestroyChildEntryInHandleBuffer (
   UINTN                         NumberOfChildren;\r
   EFI_HANDLE                    *ChildHandleBuffer;\r
 \r
-  if (Entry == NULL || Context == NULL) {\r
+  if ((Entry == NULL) || (Context == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Instance = NET_LIST_USER_STRUCT_S (Entry, UDP4_INSTANCE_DATA, Link, UDP4_INSTANCE_DATA_SIGNATURE);\r
-  ServiceBinding    = ((UDP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ServiceBinding;\r
-  NumberOfChildren  = ((UDP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->NumberOfChildren;\r
-  ChildHandleBuffer = ((UDP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ChildHandleBuffer;\r
+  Instance          = NET_LIST_USER_STRUCT_S (Entry, UDP4_INSTANCE_DATA, Link, UDP4_INSTANCE_DATA_SIGNATURE);\r
+  ServiceBinding    = ((UDP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ServiceBinding;\r
+  NumberOfChildren  = ((UDP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->NumberOfChildren;\r
+  ChildHandleBuffer = ((UDP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ChildHandleBuffer;\r
 \r
   if (!NetIsInHandleBuffer (Instance->ChildHandle, NumberOfChildren, ChildHandleBuffer)) {\r
     return EFI_SUCCESS;\r
@@ -60,7 +59,6 @@ Udp4DestroyChildEntryInHandleBuffer (
   return ServiceBinding->DestroyChild (ServiceBinding, Instance->ChildHandle);\r
 }\r
 \r
-\r
 /**\r
   Test to see if this driver supports ControllerHandle. This service\r
   is called by the EFI boot service ConnectController(). In\r
@@ -119,7 +117,6 @@ Udp4DriverBindingSupported (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Start this driver on ControllerHandle. This service is called by the\r
   EFI boot service ConnectController(). In order to make\r
@@ -180,7 +177,6 @@ Udp4DriverBindingStart (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Stop this driver on ControllerHandle. This service is called by the\r
   EFI boot service DisconnectController(). In order to\r
@@ -229,7 +225,7 @@ Udp4DriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   NicHandle,\r
                   &gEfiUdp4ServiceBindingProtocolGuid,\r
-                  (VOID **) &ServiceBinding,\r
+                  (VOID **)&ServiceBinding,\r
                   This->DriverBindingHandle,\r
                   NicHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -243,16 +239,16 @@ Udp4DriverBindingStop (
     //\r
     // NumberOfChildren is not zero, destroy the children instances in ChildHandleBuffer.\r
     //\r
-    List = &Udp4Service->ChildrenList;\r
+    List                      = &Udp4Service->ChildrenList;\r
     Context.ServiceBinding    = ServiceBinding;\r
     Context.NumberOfChildren  = NumberOfChildren;\r
     Context.ChildHandleBuffer = ChildHandleBuffer;\r
-    Status = NetDestroyLinkList (\r
-               List,\r
-               Udp4DestroyChildEntryInHandleBuffer,\r
-               &Context,\r
-               NULL\r
-               );\r
+    Status                    = NetDestroyLinkList (\r
+                                  List,\r
+                                  Udp4DestroyChildEntryInHandleBuffer,\r
+                                  &Context,\r
+                                  NULL\r
+                                  );\r
   } else {\r
     gBS->UninstallMultipleProtocolInterfaces (\r
            NicHandle,\r
@@ -267,13 +263,13 @@ Udp4DriverBindingStop (
       FreeUnicodeStringTable (gUdpControllerNameTable);\r
       gUdpControllerNameTable = NULL;\r
     }\r
+\r
     FreePool (Udp4Service);\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Creates a child handle and installs a protocol.\r
 \r
@@ -352,7 +348,7 @@ Udp4ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   Udp4Service->IpIo->ChildHandle,\r
                   &gEfiIp4ProtocolGuid,\r
-                  (VOID **) &Ip4,\r
+                  (VOID **)&Ip4,\r
                   gUdp4DriverBinding.DriverBindingHandle,\r
                   Instance->ChildHandle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -367,7 +363,7 @@ Udp4ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   Instance->IpInfo->ChildHandle,\r
                   &gEfiIp4ProtocolGuid,\r
-                  (VOID **) &Ip4,\r
+                  (VOID **)&Ip4,\r
                   gUdp4DriverBinding.DriverBindingHandle,\r
                   Instance->ChildHandle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -410,7 +406,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Destroys a child handle with a protocol installed on it.\r
 \r
@@ -454,7 +449,7 @@ Udp4ServiceBindingDestroyChild (
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiUdp4ProtocolGuid,\r
-                  (VOID **) &Udp4Proto,\r
+                  (VOID **)&Udp4Proto,\r
                   gUdp4DriverBinding.DriverBindingHandle,\r
                   ChildHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -499,7 +494,7 @@ Udp4ServiceBindingDestroyChild (
   Status = gBS->UninstallMultipleProtocolInterfaces (\r
                   ChildHandle,\r
                   &gEfiUdp4ProtocolGuid,\r
-                  (VOID *) &Instance->Udp4Proto,\r
+                  (VOID *)&Instance->Udp4Proto,\r
                   NULL\r
                   );\r
   if (EFI_ERROR (Status)) {\r
@@ -576,9 +571,8 @@ Udp4DriverEntryPoint (
     //\r
     // Initialize the UDP random port.\r
     //\r
-    mUdp4RandomPort = (UINT16) (((UINT16) NetRandomInitSeed ()) % UDP4_PORT_KNOWN + UDP4_PORT_KNOWN);\r
+    mUdp4RandomPort = (UINT16)(((UINT16)NetRandomInitSeed ()) % UDP4_PORT_KNOWN + UDP4_PORT_KNOWN);\r
   }\r
 \r
   return Status;\r
 }\r
-\r
index 741c839d57df0094105a4d8668349fe2dd034e83..a8cf3670ab06b2da9ef978a413b5b55ef6333f9b 100644 (file)
@@ -145,4 +145,3 @@ Udp4ServiceBindingDestroyChild (
   );\r
 \r
 #endif\r
-\r
index dc2a324c1181c8a6ba2e174bd19c1ebb39df8007..28b064ff8e1867c9af173c82b7af450daaa29570 100644 (file)
@@ -6,7 +6,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #include "Udp4Impl.h"\r
 \r
 UINT16  mUdp4RandomPort;\r
@@ -60,10 +59,10 @@ Udp4FindInstanceByPort (
 VOID\r
 EFIAPI\r
 Udp4DgramSent (\r
-  IN EFI_STATUS        Status,\r
-  IN VOID              *Context,\r
-  IN IP_IO_IP_PROTOCOL Sender,\r
-  IN VOID              *NotifyData\r
+  IN EFI_STATUS         Status,\r
+  IN VOID               *Context,\r
+  IN IP_IO_IP_PROTOCOL  Sender,\r
+  IN VOID               *NotifyData\r
   );\r
 \r
 /**\r
@@ -246,7 +245,6 @@ Udp4SendPortUnreach (
   IN VOID                  *Udp4Header\r
   );\r
 \r
-\r
 /**\r
   Create the Udp service context data.\r
 \r
@@ -267,9 +265,9 @@ Udp4CreateService (
   IN     EFI_HANDLE         ControllerHandle\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  IP_IO_OPEN_DATA     OpenData;\r
-  EFI_IP4_CONFIG_DATA *Ip4ConfigData;\r
+  EFI_STATUS           Status;\r
+  IP_IO_OPEN_DATA      OpenData;\r
+  EFI_IP4_CONFIG_DATA  *Ip4ConfigData;\r
 \r
   ZeroMem (Udp4Service, sizeof (UDP4_SERVICE_DATA));\r
 \r
@@ -295,7 +293,7 @@ Udp4CreateService (
   Ip4ConfigData = &OpenData.IpConfigData.Ip4CfgData;\r
   CopyMem (Ip4ConfigData, &mIp4IoDefaultIpConfigData, sizeof (EFI_IP4_CONFIG_DATA));\r
   Ip4ConfigData->AcceptBroadcast = TRUE;\r
-  OpenData.RcvdContext           = (VOID *) Udp4Service;\r
+  OpenData.RcvdContext           = (VOID *)Udp4Service;\r
   OpenData.SndContext            = NULL;\r
   OpenData.PktRcvdNotify         = Udp4DgramRcvd;\r
   OpenData.PktSentNotify         = Udp4DgramSent;\r
@@ -347,7 +345,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Clean the Udp service context data.\r
 \r
@@ -375,7 +372,6 @@ Udp4CleanService (
   IpIoDestroy (Udp4Service->IpIo);\r
 }\r
 \r
-\r
 /**\r
   This function checks and timeouts the I/O datagrams holding by the corresponding\r
   service context.\r
@@ -399,7 +395,7 @@ Udp4CheckTimeout (
   LIST_ENTRY          *NextEntry;\r
   UDP4_RXDATA_WRAP    *Wrap;\r
 \r
-  Udp4Service = (UDP4_SERVICE_DATA *) Context;\r
+  Udp4Service = (UDP4_SERVICE_DATA *)Context;\r
   NET_CHECK_SIGNATURE (Udp4Service, UDP4_SERVICE_DATA_SIGNATURE);\r
 \r
   NET_LIST_FOR_EACH (Entry, &Udp4Service->ChildrenList) {\r
@@ -429,7 +425,7 @@ Udp4CheckTimeout (
         //\r
         // Remove this RxData if it timeouts.\r
         //\r
-        Udp4RecycleRxDataWrap (NULL, (VOID *) Wrap);\r
+        Udp4RecycleRxDataWrap (NULL, (VOID *)Wrap);\r
       } else {\r
         Wrap->TimeoutTick -= (UDP4_TIMEOUT_INTERVAL / 10);\r
       }\r
@@ -437,7 +433,6 @@ Udp4CheckTimeout (
   }\r
 }\r
 \r
-\r
 /**\r
   This function initializes the new created udp instance.\r
 \r
@@ -481,7 +476,6 @@ Udp4InitInstance (
   Instance->InDestroy   = FALSE;\r
 }\r
 \r
-\r
 /**\r
   This function cleans the udp instance.\r
 \r
@@ -498,7 +492,6 @@ Udp4CleanInstance (
   NetMapClean (&Instance->TxTokens);\r
 }\r
 \r
-\r
 /**\r
   This function finds the udp instance by the specified <Address, Port> pair.\r
 \r
@@ -538,7 +531,8 @@ Udp4FindInstanceByPort (
     }\r
 \r
     if (EFI_IP4_EQUAL (&ConfigData->StationAddress, Address) &&\r
-      (ConfigData->StationPort == Port)) {\r
+        (ConfigData->StationPort == Port))\r
+    {\r
       //\r
       // if both the address and the port are the same, return TRUE.\r
       //\r
@@ -552,7 +546,6 @@ Udp4FindInstanceByPort (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   This function tries to bind the udp instance according to the configured port\r
   allocation strategy.\r
@@ -585,9 +578,9 @@ Udp4Bind (
   StationAddress = &ConfigData->StationAddress;\r
 \r
   if (ConfigData->StationPort != 0) {\r
-\r
     if (!ConfigData->AllowDuplicatePort &&\r
-      Udp4FindInstanceByPort (InstanceList, StationAddress, ConfigData->StationPort)) {\r
+        Udp4FindInstanceByPort (InstanceList, StationAddress, ConfigData->StationPort))\r
+    {\r
       //\r
       // Do not allow duplicate port and the port is already used by other instance.\r
       //\r
@@ -604,11 +597,9 @@ Udp4Bind (
       //\r
       ConfigData->StationPort = mUdp4RandomPort;\r
     } else {\r
-\r
       StartPort = mUdp4RandomPort;\r
 \r
-      while (Udp4FindInstanceByPort(InstanceList, StationAddress, mUdp4RandomPort)) {\r
-\r
+      while (Udp4FindInstanceByPort (InstanceList, StationAddress, mUdp4RandomPort)) {\r
         mUdp4RandomPort++;\r
         if (mUdp4RandomPort == 0) {\r
           mUdp4RandomPort = UDP4_PORT_KNOWN;\r
@@ -634,7 +625,6 @@ Udp4Bind (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function is used to check whether the NewConfigData has any un-reconfigurable\r
   parameters changed compared to the OldConfigData.\r
@@ -657,7 +647,8 @@ Udp4IsReconfigurable (
       (NewConfigData->AcceptBroadcast    != OldConfigData->AcceptBroadcast)   ||\r
       (NewConfigData->AcceptPromiscuous  != OldConfigData->AcceptPromiscuous) ||\r
       (NewConfigData->AllowDuplicatePort != OldConfigData->AllowDuplicatePort)\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // The receiving filter parameters cannot be changed.\r
     //\r
@@ -666,7 +657,8 @@ Udp4IsReconfigurable (
 \r
   if ((!NewConfigData->AcceptAnyPort) &&\r
       (NewConfigData->StationPort != OldConfigData->StationPort)\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // The port is not changeable.\r
     //\r
@@ -674,7 +666,6 @@ Udp4IsReconfigurable (
   }\r
 \r
   if (!NewConfigData->AcceptPromiscuous) {\r
-\r
     if (NewConfigData->UseDefaultAddress != OldConfigData->UseDefaultAddress) {\r
       //\r
       // The NewConfigData differs to the old one on the UseDefaultAddress.\r
@@ -685,7 +676,8 @@ Udp4IsReconfigurable (
     if (!NewConfigData->UseDefaultAddress &&\r
         (!EFI_IP4_EQUAL (&NewConfigData->StationAddress, &OldConfigData->StationAddress) ||\r
          !EFI_IP4_EQUAL (&NewConfigData->SubnetMask, &OldConfigData->SubnetMask))\r
-        ) {\r
+        )\r
+    {\r
       //\r
       // If the instance doesn't use the default address, and the new address or\r
       // new subnet mask is different from the old values.\r
@@ -702,8 +694,9 @@ Udp4IsReconfigurable (
   }\r
 \r
   if (!EFI_IP4_EQUAL (&NewConfigData->RemoteAddress, &mZeroIp4Addr) &&\r
-      NewConfigData->RemotePort != OldConfigData->RemotePort\r
-      ) {\r
+      (NewConfigData->RemotePort != OldConfigData->RemotePort)\r
+      )\r
+  {\r
     //\r
     // The RemotePort differs if it's designated in the configdata.\r
     //\r
@@ -716,7 +709,6 @@ Udp4IsReconfigurable (
   return TRUE;\r
 }\r
 \r
-\r
 /**\r
   This function builds the Ip4 configdata from the Udp4ConfigData.\r
 \r
@@ -742,10 +734,9 @@ Udp4BuildIp4ConfigData (
   //\r
   // use the -1 magic number to disable the receiving process of the ip instance.\r
   //\r
-  Ip4ConfigData->ReceiveTimeout    = (UINT32) (-1);\r
+  Ip4ConfigData->ReceiveTimeout = (UINT32)(-1);\r
 }\r
 \r
-\r
 /**\r
   This function validates the TxToken, it returns the error code according to the spec.\r
 \r
@@ -798,9 +789,9 @@ Udp4ValidateTxToken (
 \r
   TotalLen = 0;\r
   for (Index = 0; Index < TxData->FragmentCount; Index++) {\r
-\r
     if ((TxData->FragmentTable[Index].FragmentBuffer == NULL) ||\r
-      (TxData->FragmentTable[Index].FragmentLength == 0)) {\r
+        (TxData->FragmentTable[Index].FragmentLength == 0))\r
+    {\r
       //\r
       // if the FragmentBuffer is NULL or the FragmentLeng is zero.\r
       //\r
@@ -822,8 +813,9 @@ Udp4ValidateTxToken (
     CopyMem (&GatewayAddress, TxData->GatewayAddress, sizeof (IP4_ADDR));\r
 \r
     if (!Instance->ConfigData.UseDefaultAddress &&\r
-        (EFI_NTOHL(Instance->ConfigData.SubnetMask) != 0) &&\r
-        !NetIp4IsUnicast (NTOHL (GatewayAddress), EFI_NTOHL(Instance->ConfigData.SubnetMask))) {\r
+        (EFI_NTOHL (Instance->ConfigData.SubnetMask) != 0) &&\r
+        !NetIp4IsUnicast (NTOHL (GatewayAddress), EFI_NTOHL (Instance->ConfigData.SubnetMask)))\r
+    {\r
       //\r
       // The specified GatewayAddress is not a unicast IPv4 address while it's not 0.\r
       //\r
@@ -835,13 +827,13 @@ Udp4ValidateTxToken (
   UdpSessionData = TxData->UdpSessionData;\r
 \r
   if (UdpSessionData != NULL) {\r
-\r
     CopyMem (&SourceAddress, &UdpSessionData->SourceAddress, sizeof (IP4_ADDR));\r
 \r
     if ((SourceAddress != 0) &&\r
         !Instance->ConfigData.UseDefaultAddress &&\r
-        (EFI_NTOHL(Instance->ConfigData.SubnetMask) != 0) &&\r
-        !NetIp4IsUnicast (HTONL (SourceAddress), EFI_NTOHL(Instance->ConfigData.SubnetMask))) {\r
+        (EFI_NTOHL (Instance->ConfigData.SubnetMask) != 0) &&\r
+        !NetIp4IsUnicast (HTONL (SourceAddress), EFI_NTOHL (Instance->ConfigData.SubnetMask)))\r
+    {\r
       //\r
       // Check whether SourceAddress is a valid IPv4 address in case it's not zero.\r
       // The configured station address is used if SourceAddress is zero.\r
@@ -877,7 +869,6 @@ Udp4ValidateTxToken (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function checks whether the specified Token duplicates with the one in the Map.\r
 \r
@@ -902,8 +893,8 @@ Udp4TokenExist (
   EFI_UDP4_COMPLETION_TOKEN  *Token;\r
   EFI_UDP4_COMPLETION_TOKEN  *TokenInItem;\r
 \r
-  Token       = (EFI_UDP4_COMPLETION_TOKEN*) Context;\r
-  TokenInItem = (EFI_UDP4_COMPLETION_TOKEN*) Item->Key;\r
+  Token       = (EFI_UDP4_COMPLETION_TOKEN *)Context;\r
+  TokenInItem = (EFI_UDP4_COMPLETION_TOKEN *)Item->Key;\r
 \r
   if ((Token == TokenInItem) || (Token->Event == TokenInItem->Event)) {\r
     //\r
@@ -916,7 +907,6 @@ Udp4TokenExist (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function calculates the checksum for the Packet, utilizing the pre-calculated\r
   pseudo HeadSum to reduce some overhead.\r
@@ -930,21 +920,20 @@ Udp4TokenExist (
 **/\r
 UINT16\r
 Udp4Checksum (\r
-  IN NET_BUF *Packet,\r
-  IN UINT16  HeadSum\r
+  IN NET_BUF  *Packet,\r
+  IN UINT16   HeadSum\r
   )\r
 {\r
   UINT16  Checksum;\r
 \r
-  Checksum  = NetbufChecksum (Packet);\r
-  Checksum  = NetAddChecksum (Checksum, HeadSum);\r
+  Checksum = NetbufChecksum (Packet);\r
+  Checksum = NetAddChecksum (Checksum, HeadSum);\r
 \r
-  Checksum  = NetAddChecksum (Checksum, HTONS ((UINT16) Packet->TotalSize));\r
+  Checksum = NetAddChecksum (Checksum, HTONS ((UINT16)Packet->TotalSize));\r
 \r
   return (UINT16) ~Checksum;\r
 }\r
 \r
-\r
 /**\r
   This function removes the specified Token from the TokenMap.\r
 \r
@@ -966,7 +955,7 @@ Udp4RemoveToken (
   //\r
   // Find the Token first.\r
   //\r
-  Item = NetMapFindKey (TokenMap, (VOID *) Token);\r
+  Item = NetMapFindKey (TokenMap, (VOID *)Token);\r
 \r
   if (Item != NULL) {\r
     //\r
@@ -980,7 +969,6 @@ Udp4RemoveToken (
   return EFI_NOT_FOUND;\r
 }\r
 \r
-\r
 /**\r
   This function is the packet transmitting notify function registered to the IpIo\r
   interface. It's called to signal the udp TxToken when IpIo layer completes the\r
@@ -995,17 +983,17 @@ Udp4RemoveToken (
 VOID\r
 EFIAPI\r
 Udp4DgramSent (\r
-  IN EFI_STATUS        Status,\r
-  IN VOID              *Context,\r
-  IN IP_IO_IP_PROTOCOL Sender,\r
-  IN VOID              *NotifyData\r
+  IN EFI_STATUS         Status,\r
+  IN VOID               *Context,\r
+  IN IP_IO_IP_PROTOCOL  Sender,\r
+  IN VOID               *NotifyData\r
   )\r
 {\r
   UDP4_INSTANCE_DATA         *Instance;\r
   EFI_UDP4_COMPLETION_TOKEN  *Token;\r
 \r
-  Instance = (UDP4_INSTANCE_DATA *) Context;\r
-  Token    = (EFI_UDP4_COMPLETION_TOKEN *) NotifyData;\r
+  Instance = (UDP4_INSTANCE_DATA *)Context;\r
+  Token    = (EFI_UDP4_COMPLETION_TOKEN *)NotifyData;\r
 \r
   if (Udp4RemoveToken (&Instance->TxTokens, Token) == EFI_SUCCESS) {\r
     //\r
@@ -1017,7 +1005,6 @@ Udp4DgramSent (
   }\r
 }\r
 \r
-\r
 /**\r
   This function processes the received datagram passed up by the IpIo layer.\r
 \r
@@ -1049,12 +1036,12 @@ Udp4DgramRcvd (
     //\r
     // Demultiplex the received datagram.\r
     //\r
-    Udp4Demultiplex ((UDP4_SERVICE_DATA *) Context, NetSession, Packet);\r
+    Udp4Demultiplex ((UDP4_SERVICE_DATA *)Context, NetSession, Packet);\r
   } else {\r
     //\r
     // Handle the ICMP_ERROR packet.\r
     //\r
-    Udp4IcmpHandler ((UDP4_SERVICE_DATA *) Context, IcmpError, NetSession, Packet);\r
+    Udp4IcmpHandler ((UDP4_SERVICE_DATA *)Context, IcmpError, NetSession, Packet);\r
   }\r
 \r
   //\r
@@ -1064,7 +1051,6 @@ Udp4DgramRcvd (
   DispatchDpc ();\r
 }\r
 \r
-\r
 /**\r
   This function removes the multicast group specified by Arg from the Map.\r
 \r
@@ -1113,7 +1099,6 @@ Udp4LeaveGroup (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function cancels the token specified by Arg in the Map. This is a callback\r
   used by Udp4InstanceCancelToken().\r
@@ -1153,15 +1138,15 @@ Udp4CancelTokens (
     // will invoke Udp4DgramSent, the token will be signaled and this Item will\r
     // be removed from the Map there.\r
     //\r
-    Packet = (NET_BUF *) (Item->Value);\r
-    IpIo   = (IP_IO *) (*((UINTN *) &Packet->ProtoData[0]));\r
+    Packet = (NET_BUF *)(Item->Value);\r
+    IpIo   = (IP_IO *)(*((UINTN *)&Packet->ProtoData[0]));\r
 \r
     IpIoCancelTxToken (IpIo, Packet);\r
   } else {\r
     //\r
     // The token is a receive token. Abort it and remove it from the Map.\r
     //\r
-    TokenToCancel = (EFI_UDP4_COMPLETION_TOKEN *) Item->Key;\r
+    TokenToCancel = (EFI_UDP4_COMPLETION_TOKEN *)Item->Key;\r
     NetMapRemoveItem (Map, Item, NULL);\r
 \r
     TokenToCancel->Status = EFI_ABORTED;\r
@@ -1175,7 +1160,6 @@ Udp4CancelTokens (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function removes all the Wrap datas in the RcvdDgramQue.\r
 \r
@@ -1198,12 +1182,10 @@ Udp4FlushRcvdDgram (
     //\r
     // The Wrap will be removed from the RcvdDgramQue by this function call.\r
     //\r
-    Udp4RecycleRxDataWrap (NULL, (VOID *) Wrap);\r
+    Udp4RecycleRxDataWrap (NULL, (VOID *)Wrap);\r
   }\r
 }\r
 \r
-\r
-\r
 /**\r
   Cancel Udp4 tokens from the Udp4 instance.\r
 \r
@@ -1250,13 +1232,14 @@ Udp4InstanceCancelToken (
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  ASSERT ((Token != NULL) || ((0 == NetMapGetCount (&Instance->TxTokens))\r
-    && (0 == NetMapGetCount (&Instance->RxTokens))));\r
+  ASSERT (\r
+    (Token != NULL) || (  (0 == NetMapGetCount (&Instance->TxTokens))\r
+                       && (0 == NetMapGetCount (&Instance->RxTokens)))\r
+    );\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function matches the received udp datagram with the Instance.\r
 \r
@@ -1289,7 +1272,8 @@ Udp4MatchDgram (
 \r
   if ((!ConfigData->AcceptAnyPort && (Udp4Session->DestinationPort != ConfigData->StationPort)) ||\r
       ((ConfigData->RemotePort != 0) && (Udp4Session->SourcePort != ConfigData->RemotePort))\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // The local port or the remote port doesn't match.\r
     //\r
@@ -1298,7 +1282,8 @@ Udp4MatchDgram (
 \r
   if (!EFI_IP4_EQUAL (&ConfigData->RemoteAddress, &mZeroIp4Addr) &&\r
       !EFI_IP4_EQUAL (&ConfigData->RemoteAddress, &Udp4Session->SourceAddress)\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // This datagram doesn't come from the instance's specified sender.\r
     //\r
@@ -1307,7 +1292,8 @@ Udp4MatchDgram (
 \r
   if (EFI_IP4_EQUAL (&ConfigData->StationAddress, &mZeroIp4Addr) ||\r
       EFI_IP4_EQUAL (&Udp4Session->DestinationAddress, &ConfigData->StationAddress)\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // The instance is configured to receive datagrams destined to any station IP or\r
     // the destination address of this datagram matches the configured station IP.\r
@@ -1325,8 +1311,9 @@ Udp4MatchDgram (
   }\r
 \r
   if (IP4_IS_MULTICAST (NTOHL (Destination)) &&\r
-      NetMapFindKey (&Instance->McastIps, (VOID *) (UINTN) Destination) != NULL\r
-      ) {\r
+      (NetMapFindKey (&Instance->McastIps, (VOID *)(UINTN)Destination) != NULL)\r
+      )\r
+  {\r
     //\r
     // It's a multicast packet and the multicast address is accepted by this instance.\r
     //\r
@@ -1336,7 +1323,6 @@ Udp4MatchDgram (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   This function removes the Wrap specified by Context and release relevant resources.\r
 \r
@@ -1353,7 +1339,7 @@ Udp4RecycleRxDataWrap (
 {\r
   UDP4_RXDATA_WRAP  *Wrap;\r
 \r
-  Wrap = (UDP4_RXDATA_WRAP *) Context;\r
+  Wrap = (UDP4_RXDATA_WRAP *)Context;\r
 \r
   //\r
   // Remove the Wrap from the list it belongs to.\r
@@ -1373,7 +1359,6 @@ Udp4RecycleRxDataWrap (
   FreePool (Wrap);\r
 }\r
 \r
-\r
 /**\r
   This function wraps the Packet and the RxData.\r
 \r
@@ -1393,14 +1378,16 @@ Udp4WrapRxData (
   IN EFI_UDP4_RECEIVE_DATA  *RxData\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
-  UDP4_RXDATA_WRAP      *Wrap;\r
+  EFI_STATUS        Status;\r
+  UDP4_RXDATA_WRAP  *Wrap;\r
 \r
   //\r
   // Allocate buffer for the Wrap.\r
   //\r
-  Wrap = AllocatePool (sizeof (UDP4_RXDATA_WRAP) +\r
-         (Packet->BlockOpNum - 1) * sizeof (EFI_UDP4_FRAGMENT_DATA));\r
+  Wrap = AllocatePool (\r
+           sizeof (UDP4_RXDATA_WRAP) +\r
+           (Packet->BlockOpNum - 1) * sizeof (EFI_UDP4_FRAGMENT_DATA)\r
+           );\r
   if (Wrap == NULL) {\r
     return NULL;\r
   }\r
@@ -1430,7 +1417,6 @@ Udp4WrapRxData (
   return Wrap;\r
 }\r
 \r
-\r
 /**\r
   This function enqueues the received datagram into the instances' receiving queues.\r
 \r
@@ -1487,7 +1473,6 @@ Udp4EnqueueDgram (
   return Enqueued;\r
 }\r
 \r
-\r
 /**\r
   This function delivers the received datagrams for the specified instance.\r
 \r
@@ -1506,8 +1491,8 @@ Udp4InstanceDeliverDgram (
   EFI_TPL                    OldTpl;\r
 \r
   if (!IsListEmpty (&Instance->RcvdDgramQue) &&\r
-      !NetMapIsEmpty (&Instance->RxTokens)) {\r
-\r
+      !NetMapIsEmpty (&Instance->RxTokens))\r
+  {\r
     Wrap = NET_LIST_HEAD (&Instance->RcvdDgramQue, UDP4_RXDATA_WRAP, Link);\r
 \r
     if (NET_BUF_SHARED (Wrap->Packet)) {\r
@@ -1526,7 +1511,7 @@ Udp4InstanceDeliverDgram (
 \r
     NetListRemoveHead (&Instance->RcvdDgramQue);\r
 \r
-    Token = (EFI_UDP4_COMPLETION_TOKEN *) NetMapRemoveHead (&Instance->RxTokens, NULL);\r
+    Token = (EFI_UDP4_COMPLETION_TOKEN *)NetMapRemoveHead (&Instance->RxTokens, NULL);\r
 \r
     //\r
     // Build the FragmentTable and set the FragmentCount in RxData.\r
@@ -1536,7 +1521,7 @@ Udp4InstanceDeliverDgram (
 \r
     NetbufBuildExt (\r
       Wrap->Packet,\r
-      (NET_FRAGMENT *) RxData->FragmentTable,\r
+      (NET_FRAGMENT *)RxData->FragmentTable,\r
       &RxData->FragmentCount\r
       );\r
 \r
@@ -1551,7 +1536,6 @@ Udp4InstanceDeliverDgram (
   }\r
 }\r
 \r
-\r
 /**\r
   This function delivers the datagrams enqueued in the instances.\r
 \r
@@ -1583,7 +1567,6 @@ Udp4DeliverDgram (
   }\r
 }\r
 \r
-\r
 /**\r
   This function demultiplexes the received udp datagram to the appropriate instances.\r
 \r
@@ -1601,7 +1584,7 @@ Udp4Demultiplex (
   IN NET_BUF               *Packet\r
   )\r
 {\r
-  EFI_UDP_HEADER        *Udp4Header;\r
+  EFI_UDP_HEADER         *Udp4Header;\r
   UINT16                 HeadSum;\r
   EFI_UDP4_RECEIVE_DATA  RxData;\r
   EFI_UDP4_SESSION_DATA  *Udp4Session;\r
@@ -1615,7 +1598,7 @@ Udp4Demultiplex (
   //\r
   // Get the datagram header from the packet buffer.\r
   //\r
-  Udp4Header = (EFI_UDP_HEADER *) NetbufGetByte (Packet, 0, NULL);\r
+  Udp4Header = (EFI_UDP_HEADER *)NetbufGetByte (Packet, 0, NULL);\r
   ASSERT (Udp4Header != NULL);\r
 \r
   if (Udp4Header->Checksum != 0) {\r
@@ -1650,7 +1633,7 @@ Udp4Demultiplex (
   //\r
   NetbufTrim (Packet, UDP4_HEADER_SIZE, TRUE);\r
 \r
-  RxData.DataLength = (UINT32) Packet->TotalSize;\r
+  RxData.DataLength = (UINT32)Packet->TotalSize;\r
 \r
   //\r
   // Try to enqueue this datagram into the instances.\r
@@ -1677,7 +1660,6 @@ Udp4Demultiplex (
   }\r
 }\r
 \r
-\r
 /**\r
   This function builds and sends out a icmp port unreachable message.\r
 \r
@@ -1718,7 +1700,7 @@ Udp4SendPortUnreach (
   // Calculate the required length of the icmp error message.\r
   //\r
   Len = sizeof (IP4_ICMP_ERROR_HEAD) + (EFI_IP4_HEADER_LEN (IpHdr) -\r
-        sizeof (IP4_HEAD)) + ICMP_ERROR_PACKET_LENGTH;\r
+                                        sizeof (IP4_HEAD)) + ICMP_ERROR_PACKET_LENGTH;\r
 \r
   //\r
   // Allocate buffer for the icmp error message.\r
@@ -1731,7 +1713,7 @@ Udp4SendPortUnreach (
   //\r
   // Allocate space for the IP4_ICMP_ERROR_HEAD.\r
   //\r
-  IcmpErrHdr = (IP4_ICMP_ERROR_HEAD *) NetbufAllocSpace (Packet, Len, FALSE);\r
+  IcmpErrHdr = (IP4_ICMP_ERROR_HEAD *)NetbufAllocSpace (Packet, Len, FALSE);\r
   ASSERT (IcmpErrHdr != NULL);\r
 \r
   //\r
@@ -1750,7 +1732,7 @@ Udp4SendPortUnreach (
   //\r
   // Copy the UDP header.\r
   //\r
-  Ptr = (UINT8 *) &IcmpErrHdr->IpHead + EFI_IP4_HEADER_LEN (IpHdr);\r
+  Ptr = (UINT8 *)&IcmpErrHdr->IpHead + EFI_IP4_HEADER_LEN (IpHdr);\r
   CopyMem (Ptr, Udp4Header, ICMP_ERROR_PACKET_LENGTH);\r
 \r
   //\r
@@ -1777,7 +1759,6 @@ Udp4SendPortUnreach (
   NetbufFree (Packet);\r
 }\r
 \r
-\r
 /**\r
   This function handles the received Icmp Error message and demultiplexes it to the\r
   instance.\r
@@ -1797,7 +1778,7 @@ Udp4IcmpHandler (
   IN NET_BUF               *Packet\r
   )\r
 {\r
-  EFI_UDP_HEADER        *Udp4Header;\r
+  EFI_UDP_HEADER         *Udp4Header;\r
   EFI_UDP4_SESSION_DATA  Udp4Session;\r
   LIST_ENTRY             *Entry;\r
   UDP4_INSTANCE_DATA     *Instance;\r
@@ -1807,7 +1788,7 @@ Udp4IcmpHandler (
     return;\r
   }\r
 \r
-  Udp4Header = (EFI_UDP_HEADER *) NetbufGetByte (Packet, 0, NULL);\r
+  Udp4Header = (EFI_UDP_HEADER *)NetbufGetByte (Packet, 0, NULL);\r
   ASSERT (Udp4Header != NULL);\r
 \r
   CopyMem (&Udp4Session.SourceAddress, &NetSession->Source, sizeof (EFI_IPv4_ADDRESS));\r
@@ -1848,7 +1829,6 @@ Udp4IcmpHandler (
   NetbufFree (Packet);\r
 }\r
 \r
-\r
 /**\r
   This function reports the received ICMP error.\r
 \r
@@ -1873,7 +1853,7 @@ Udp4ReportIcmpError (
     //\r
     // Try to get a RxToken from the RxTokens map.\r
     //\r
-    Token = (EFI_UDP4_COMPLETION_TOKEN *) NetMapRemoveHead (&Instance->RxTokens, NULL);\r
+    Token = (EFI_UDP4_COMPLETION_TOKEN *)NetMapRemoveHead (&Instance->RxTokens, NULL);\r
 \r
     if (Token != NULL) {\r
       //\r
@@ -1890,7 +1870,6 @@ Udp4ReportIcmpError (
   }\r
 }\r
 \r
-\r
 /**\r
   This function is a dummy ext-free function for the NET_BUF created for the output\r
   udp datagram.\r
@@ -1905,4 +1884,3 @@ Udp4NetVectorExtFree (
   )\r
 {\r
 }\r
-\r
index 115f9ed878acefbaaabdcd4e5713ff62883ed7d3..246a91de5e40ef848e681347d8cd52dd0fc5b99a 100644 (file)
@@ -29,22 +29,21 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Udp4Driver.h"\r
 \r
-\r
-extern EFI_COMPONENT_NAME_PROTOCOL     gUdp4ComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL    gUdp4ComponentName2;\r
-extern EFI_UNICODE_STRING_TABLE        *gUdpControllerNameTable;\r
-extern EFI_SERVICE_BINDING_PROTOCOL    mUdp4ServiceBinding;\r
-extern EFI_UDP4_PROTOCOL               mUdp4Protocol;\r
-extern UINT16                          mUdp4RandomPort;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gUdp4ComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gUdp4ComponentName2;\r
+extern EFI_UNICODE_STRING_TABLE      *gUdpControllerNameTable;\r
+extern EFI_SERVICE_BINDING_PROTOCOL  mUdp4ServiceBinding;\r
+extern EFI_UDP4_PROTOCOL             mUdp4Protocol;\r
+extern UINT16                        mUdp4RandomPort;\r
 \r
 #define ICMP_ERROR_PACKET_LENGTH  8\r
 \r
-#define UDP4_TIMEOUT_INTERVAL (50 * TICKS_PER_MS)  // 50 milliseconds\r
+#define UDP4_TIMEOUT_INTERVAL  (50 * TICKS_PER_MS) // 50 milliseconds\r
 \r
-#define UDP4_HEADER_SIZE      sizeof (EFI_UDP_HEADER)\r
-#define UDP4_MAX_DATA_SIZE    65507\r
+#define UDP4_HEADER_SIZE    sizeof (EFI_UDP_HEADER)\r
+#define UDP4_MAX_DATA_SIZE  65507\r
 \r
-#define UDP4_PORT_KNOWN       1024\r
+#define UDP4_PORT_KNOWN  1024\r
 \r
 #define UDP4_SERVICE_DATA_SIGNATURE  SIGNATURE_32('U', 'd', 'p', '4')\r
 \r
@@ -57,15 +56,15 @@ extern UINT16                          mUdp4RandomPort;
   )\r
 \r
 typedef struct _UDP4_SERVICE_DATA_ {\r
-  UINT32                        Signature;\r
-  EFI_SERVICE_BINDING_PROTOCOL  ServiceBinding;\r
-  EFI_HANDLE                    ImageHandle;\r
-  EFI_HANDLE                    ControllerHandle;\r
-  LIST_ENTRY                    ChildrenList;\r
-  UINTN                         ChildrenNumber;\r
-  IP_IO                         *IpIo;\r
-\r
-  EFI_EVENT                     TimeoutEvent;\r
+  UINT32                          Signature;\r
+  EFI_SERVICE_BINDING_PROTOCOL    ServiceBinding;\r
+  EFI_HANDLE                      ImageHandle;\r
+  EFI_HANDLE                      ControllerHandle;\r
+  LIST_ENTRY                      ChildrenList;\r
+  UINTN                           ChildrenNumber;\r
+  IP_IO                           *IpIo;\r
+\r
+  EFI_EVENT                       TimeoutEvent;\r
 } UDP4_SERVICE_DATA;\r
 \r
 #define UDP4_INSTANCE_DATA_SIGNATURE  SIGNATURE_32('U', 'd', 'p', 'I')\r
@@ -79,44 +78,44 @@ typedef struct _UDP4_SERVICE_DATA_ {
   )\r
 \r
 typedef struct _UDP4_INSTANCE_DATA_ {\r
-  UINT32                Signature;\r
-  LIST_ENTRY            Link;\r
+  UINT32                  Signature;\r
+  LIST_ENTRY              Link;\r
 \r
-  UDP4_SERVICE_DATA     *Udp4Service;\r
-  EFI_UDP4_PROTOCOL     Udp4Proto;\r
-  EFI_UDP4_CONFIG_DATA  ConfigData;\r
-  EFI_HANDLE            ChildHandle;\r
-  BOOLEAN               Configured;\r
-  BOOLEAN               IsNoMapping;\r
+  UDP4_SERVICE_DATA       *Udp4Service;\r
+  EFI_UDP4_PROTOCOL       Udp4Proto;\r
+  EFI_UDP4_CONFIG_DATA    ConfigData;\r
+  EFI_HANDLE              ChildHandle;\r
+  BOOLEAN                 Configured;\r
+  BOOLEAN                 IsNoMapping;\r
 \r
-  NET_MAP               TxTokens;\r
-  NET_MAP               RxTokens;\r
+  NET_MAP                 TxTokens;\r
+  NET_MAP                 RxTokens;\r
 \r
-  NET_MAP               McastIps;\r
+  NET_MAP                 McastIps;\r
 \r
-  LIST_ENTRY            RcvdDgramQue;\r
-  LIST_ENTRY            DeliveredDgramQue;\r
+  LIST_ENTRY              RcvdDgramQue;\r
+  LIST_ENTRY              DeliveredDgramQue;\r
 \r
-  UINT16                HeadSum;\r
+  UINT16                  HeadSum;\r
 \r
-  EFI_STATUS            IcmpError;\r
+  EFI_STATUS              IcmpError;\r
 \r
-  IP_IO_IP_INFO         *IpInfo;\r
+  IP_IO_IP_INFO           *IpInfo;\r
 \r
-  BOOLEAN               InDestroy;\r
+  BOOLEAN                 InDestroy;\r
 } UDP4_INSTANCE_DATA;\r
 \r
 typedef struct _UDP4_RXDATA_WRAP_ {\r
-  LIST_ENTRY             Link;\r
-  NET_BUF                *Packet;\r
-  UINT32                 TimeoutTick;\r
-  EFI_UDP4_RECEIVE_DATA  RxData;\r
+  LIST_ENTRY               Link;\r
+  NET_BUF                  *Packet;\r
+  UINT32                   TimeoutTick;\r
+  EFI_UDP4_RECEIVE_DATA    RxData;\r
 } UDP4_RXDATA_WRAP;\r
 \r
 typedef struct {\r
-  EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
-  UINTN                         NumberOfChildren;\r
-  EFI_HANDLE                    *ChildHandleBuffer;\r
+  EFI_SERVICE_BINDING_PROTOCOL    *ServiceBinding;\r
+  UINTN                           NumberOfChildren;\r
+  EFI_HANDLE                      *ChildHandleBuffer;\r
 } UDP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT;\r
 \r
 /**\r
@@ -582,8 +581,8 @@ Udp4TokenExist (
 **/\r
 UINT16\r
 Udp4Checksum (\r
-  IN NET_BUF *Packet,\r
-  IN UINT16  HeadSum\r
+  IN NET_BUF  *Packet,\r
+  IN UINT16   HeadSum\r
   );\r
 \r
 /**\r
index 2a639f954726a33dbb3e7131c1a75e2c924f6731..b1e04f441fc5aba1882a9bd8554bd91311ea06db 100644 (file)
@@ -19,7 +19,6 @@ EFI_UDP4_PROTOCOL  mUdp4Protocol = {
   Udp4Poll\r
 };\r
 \r
-\r
 /**\r
   Reads the current operational settings.\r
 \r
@@ -86,7 +85,6 @@ Udp4GetModeData (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Initializes, changes, or resets the operational parameters for this instance of the EFI UDPv4\r
   Protocol.\r
@@ -154,7 +152,6 @@ Udp4Configure (
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   if (UdpConfigData != NULL) {\r
-\r
     CopyMem (&StationAddress, &UdpConfigData->StationAddress, sizeof (IP4_ADDR));\r
     CopyMem (&SubnetMask, &UdpConfigData->SubnetMask, sizeof (IP4_ADDR));\r
     CopyMem (&RemoteAddress, &UdpConfigData->RemoteAddress, sizeof (IP4_ADDR));\r
@@ -163,11 +160,11 @@ Udp4Configure (
     SubnetMask     = NTOHL (SubnetMask);\r
     RemoteAddress  = NTOHL (RemoteAddress);\r
 \r
-\r
     if (!UdpConfigData->UseDefaultAddress &&\r
         (!IP4_IS_VALID_NETMASK (SubnetMask) ||\r
-         !((StationAddress == 0) || (SubnetMask != 0 && NetIp4IsUnicast (StationAddress, SubnetMask))) ||\r
-         IP4_IS_LOCAL_BROADCAST (RemoteAddress))) {\r
+         !((StationAddress == 0) || ((SubnetMask != 0) && NetIp4IsUnicast (StationAddress, SubnetMask))) ||\r
+         IP4_IS_LOCAL_BROADCAST (RemoteAddress)))\r
+    {\r
       //\r
       // Don't use default address, and subnet mask is invalid or StationAddress is not\r
       // a valid unicast IPv4 address or RemoteAddress is not a valid unicast IPv4 address\r
@@ -283,7 +280,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Joins and leaves multicast groups.\r
 \r
@@ -370,10 +366,8 @@ Udp4Groups (
   // the multicast datagrams destined to multicast IPs the other instances configured.\r
   //\r
   if (JoinFlag) {\r
-\r
-    NetMapInsertTail (&Instance->McastIps, (VOID *) (UINTN) McastIp, NULL);\r
+    NetMapInsertTail (&Instance->McastIps, (VOID *)(UINTN)McastIp, NULL);\r
   } else {\r
-\r
     NetMapIterate (&Instance->McastIps, Udp4LeaveGroup, MulticastAddress);\r
   }\r
 \r
@@ -384,7 +378,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Adds and deletes routing table entries.\r
 \r
@@ -458,7 +451,6 @@ Udp4Routes (
   return Ip->Routes (Ip, DeleteRoute, SubnetAddress, SubnetMask, GatewayAddress);\r
 }\r
 \r
-\r
 /**\r
   Queues outgoing data packets into the transmit queue.\r
 \r
@@ -500,7 +492,7 @@ Udp4Transmit (
   UDP4_INSTANCE_DATA      *Instance;\r
   EFI_TPL                 OldTpl;\r
   NET_BUF                 *Packet;\r
-  EFI_UDP_HEADER         *Udp4Header;\r
+  EFI_UDP_HEADER          *Udp4Header;\r
   EFI_UDP4_CONFIG_DATA    *ConfigData;\r
   IP4_ADDR                Source;\r
   IP4_ADDR                Destination;\r
@@ -536,7 +528,8 @@ Udp4Transmit (
   }\r
 \r
   if (EFI_ERROR (NetMapIterate (&Instance->TxTokens, Udp4TokenExist, Token)) ||\r
-    EFI_ERROR (NetMapIterate (&Instance->RxTokens, Udp4TokenExist, Token))) {\r
+      EFI_ERROR (NetMapIterate (&Instance->RxTokens, Udp4TokenExist, Token)))\r
+  {\r
     //\r
     // Try to find a duplicate token in the two token maps, if found, return\r
     // EFI_ACCESS_DENIED.\r
@@ -566,10 +559,10 @@ Udp4Transmit (
   //\r
   // Store the IpIo in ProtoData.\r
   //\r
-  Udp4Service = Instance->Udp4Service;\r
-  *((UINTN *) &Packet->ProtoData[0]) = (UINTN) (Udp4Service->IpIo);\r
+  Udp4Service                       = Instance->Udp4Service;\r
+  *((UINTN *)&Packet->ProtoData[0]) = (UINTN)(Udp4Service->IpIo);\r
 \r
-  Udp4Header = (EFI_UDP_HEADER *) NetbufAllocSpace (Packet, UDP4_HEADER_SIZE, TRUE);\r
+  Udp4Header = (EFI_UDP_HEADER *)NetbufAllocSpace (Packet, UDP4_HEADER_SIZE, TRUE);\r
   ASSERT (Udp4Header != NULL);\r
 \r
   ConfigData = &Instance->ConfigData;\r
@@ -577,10 +570,10 @@ Udp4Transmit (
   //\r
   // Fill the udp header.\r
   //\r
-  Udp4Header->SrcPort      = HTONS (ConfigData->StationPort);\r
-  Udp4Header->DstPort      = HTONS (ConfigData->RemotePort);\r
-  Udp4Header->Length       = HTONS ((UINT16) Packet->TotalSize);\r
-  Udp4Header->Checksum     = 0;\r
+  Udp4Header->SrcPort  = HTONS (ConfigData->StationPort);\r
+  Udp4Header->DstPort  = HTONS (ConfigData->RemotePort);\r
+  Udp4Header->Length   = HTONS ((UINT16)Packet->TotalSize);\r
+  Udp4Header->Checksum = 0;\r
 \r
   UdpSessionData = TxData->UdpSessionData;\r
   IP4_COPY_ADDRESS (&Override.Ip4OverrideData.SourceAddress, &ConfigData->StationAddress);\r
@@ -643,10 +636,10 @@ Udp4Transmit (
     ZeroMem (&Override.Ip4OverrideData.GatewayAddress, sizeof (EFI_IPv4_ADDRESS));\r
   }\r
 \r
-  Override.Ip4OverrideData.Protocol                 = EFI_IP_PROTO_UDP;\r
-  Override.Ip4OverrideData.TypeOfService            = ConfigData->TypeOfService;\r
-  Override.Ip4OverrideData.TimeToLive               = ConfigData->TimeToLive;\r
-  Override.Ip4OverrideData.DoNotFragment            = ConfigData->DoNotFragment;\r
+  Override.Ip4OverrideData.Protocol      = EFI_IP_PROTO_UDP;\r
+  Override.Ip4OverrideData.TypeOfService = ConfigData->TypeOfService;\r
+  Override.Ip4OverrideData.TimeToLive    = ConfigData->TimeToLive;\r
+  Override.Ip4OverrideData.DoNotFragment = ConfigData->DoNotFragment;\r
 \r
   //\r
   // Save the token into the TxToken map.\r
@@ -660,15 +653,15 @@ Udp4Transmit (
   // Send out this datagram through IpIo.\r
   //\r
   IpDestAddr.Addr[0] = Destination;\r
-  Status = IpIoSend (\r
-             Udp4Service->IpIo,\r
-             Packet,\r
-             Instance->IpInfo,\r
-             Instance,\r
-             Token,\r
-             &IpDestAddr,\r
-             &Override\r
-             );\r
+  Status             = IpIoSend (\r
+                         Udp4Service->IpIo,\r
+                         Packet,\r
+                         Instance->IpInfo,\r
+                         Instance,\r
+                         Token,\r
+                         &IpDestAddr,\r
+                         &Override\r
+                         );\r
   if (EFI_ERROR (Status)) {\r
     //\r
     // Remove this token from the TxTokens.\r
@@ -687,7 +680,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Places an asynchronous receive request into the receiving queue.\r
 \r
@@ -744,8 +736,9 @@ Udp4Receive (
 \r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
-  if (EFI_ERROR (NetMapIterate (&Instance->RxTokens, Udp4TokenExist, Token))||\r
-    EFI_ERROR (NetMapIterate (&Instance->TxTokens, Udp4TokenExist, Token))) {\r
+  if (EFI_ERROR (NetMapIterate (&Instance->RxTokens, Udp4TokenExist, Token)) ||\r
+      EFI_ERROR (NetMapIterate (&Instance->TxTokens, Udp4TokenExist, Token)))\r
+  {\r
     //\r
     // Return EFI_ACCESS_DENIED if the specified token is already in the TxTokens or\r
     // RxTokens map.\r
@@ -787,7 +780,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Aborts an asynchronous transmit or receive request.\r
 \r
@@ -858,7 +850,6 @@ Udp4Cancel (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r
 \r
index 49d8d53095eaba1a560341e744774960785ba71b..45fb6b4adbd23192571ea1b6989facd5ac6b7131 100644 (file)
@@ -12,6 +12,7 @@
 //\r
 // EFI Component Name Functions\r
 //\r
+\r
 /**\r
   Retrieves a Unicode string that is the user-readable name of the driver.\r
 \r
@@ -59,7 +60,6 @@ Udp6ComponentNameGetDriverName (
   OUT CHAR16                       **DriverName\r
   );\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user-readable name of the controller\r
   that is being managed by a driver.\r
@@ -150,14 +150,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gUdp6ComponentName =
 //\r
 // EFI Component Name 2 Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gUdp6ComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) Udp6ComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) Udp6ComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gUdp6ComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)Udp6ComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)Udp6ComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mUdp6DriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mUdp6DriverNameTable[] = {\r
   {\r
     "eng;en",\r
     L"UDP6 Network Service Driver"\r
@@ -222,7 +221,7 @@ Udp6ComponentNameGetDriverName (
            This->SupportedLanguages,\r
            mUdp6DriverNameTable,\r
            DriverName,\r
-           (BOOLEAN) (This == &gUdp6ComponentName)\r
+           (BOOLEAN)(This == &gUdp6ComponentName)\r
            );\r
 }\r
 \r
@@ -238,12 +237,12 @@ Udp6ComponentNameGetDriverName (
 **/\r
 EFI_STATUS\r
 UpdateName (\r
-  IN    EFI_UDP6_PROTOCOL             *Udp6\r
+  IN    EFI_UDP6_PROTOCOL  *Udp6\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  CHAR16                           HandleName[64];\r
-  EFI_UDP6_CONFIG_DATA             Udp6ConfigData;\r
+  EFI_STATUS            Status;\r
+  CHAR16                HandleName[64];\r
+  EFI_UDP6_CONFIG_DATA  Udp6ConfigData;\r
 \r
   if (Udp6 == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -254,7 +253,9 @@ UpdateName (
   //\r
   Status = Udp6->GetModeData (Udp6, &Udp6ConfigData, NULL, NULL, NULL);\r
   if (!EFI_ERROR (Status)) {\r
-    UnicodeSPrint (HandleName, sizeof (HandleName),\r
+    UnicodeSPrint (\r
+      HandleName,\r
+      sizeof (HandleName),\r
       L"UDPv6 (SrcPort=%d, DestPort=%d)",\r
       Udp6ConfigData.StationPort,\r
       Udp6ConfigData.RemotePort\r
@@ -368,8 +369,8 @@ Udp6ComponentNameGetControllerName (
   OUT CHAR16                       **ControllerName\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_UDP6_PROTOCOL             *Udp6;\r
+  EFI_STATUS         Status;\r
+  EFI_UDP6_PROTOCOL  *Udp6;\r
 \r
   //\r
   // Only provide names for child handles.\r
index 6021bb36993ab0df91f1d4460b1416dc0d36e3bf..ae96fb9966274dde66c23c6f2a15b5871ac67e62 100644 (file)
@@ -9,7 +9,7 @@
 \r
 #include "Udp6Impl.h"\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gUdp6DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gUdp6DriverBinding = {\r
   Udp6DriverBindingSupported,\r
   Udp6DriverBindingStart,\r
   Udp6DriverBindingStop,\r
@@ -18,7 +18,7 @@ EFI_DRIVER_BINDING_PROTOCOL gUdp6DriverBinding = {
   NULL\r
 };\r
 \r
-EFI_SERVICE_BINDING_PROTOCOL mUdp6ServiceBinding = {\r
+EFI_SERVICE_BINDING_PROTOCOL  mUdp6ServiceBinding = {\r
   Udp6ServiceBindingCreateChild,\r
   Udp6ServiceBindingDestroyChild\r
 };\r
@@ -74,6 +74,7 @@ Udp6DriverBindingSupported (
   )\r
 {\r
   EFI_STATUS  Status;\r
+\r
   //\r
   // Test for the Udp6ServiceBinding Protocol\r
   //\r
@@ -88,6 +89,7 @@ Udp6DriverBindingSupported (
   if (!EFI_ERROR (Status)) {\r
     return EFI_ALREADY_STARTED;\r
   }\r
+\r
   //\r
   // Test for the Ip6ServiceBinding Protocol\r
   //\r
@@ -166,6 +168,7 @@ EXIT:
       FreePool (Udp6Service);\r
     }\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -183,8 +186,8 @@ EXIT:
 EFI_STATUS\r
 EFIAPI\r
 Udp6DestroyChildEntryInHandleBuffer (\r
-  IN LIST_ENTRY         *Entry,\r
-  IN VOID               *Context\r
+  IN LIST_ENTRY  *Entry,\r
+  IN VOID        *Context\r
   )\r
 {\r
   UDP6_INSTANCE_DATA            *Instance;\r
@@ -192,14 +195,14 @@ Udp6DestroyChildEntryInHandleBuffer (
   UINTN                         NumberOfChildren;\r
   EFI_HANDLE                    *ChildHandleBuffer;\r
 \r
-  if (Entry == NULL || Context == NULL) {\r
+  if ((Entry == NULL) || (Context == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Instance = NET_LIST_USER_STRUCT_S (Entry, UDP6_INSTANCE_DATA, Link, UDP6_INSTANCE_DATA_SIGNATURE);\r
-  ServiceBinding    = ((UDP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ServiceBinding;\r
-  NumberOfChildren  = ((UDP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->NumberOfChildren;\r
-  ChildHandleBuffer = ((UDP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ChildHandleBuffer;\r
+  Instance          = NET_LIST_USER_STRUCT_S (Entry, UDP6_INSTANCE_DATA, Link, UDP6_INSTANCE_DATA_SIGNATURE);\r
+  ServiceBinding    = ((UDP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ServiceBinding;\r
+  NumberOfChildren  = ((UDP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->NumberOfChildren;\r
+  ChildHandleBuffer = ((UDP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ChildHandleBuffer;\r
 \r
   if (!NetIsInHandleBuffer (Instance->ChildHandle, NumberOfChildren, ChildHandleBuffer)) {\r
     return EFI_SUCCESS;\r
@@ -258,7 +261,7 @@ Udp6DriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   NicHandle,\r
                   &gEfiUdp6ServiceBindingProtocolGuid,\r
-                  (VOID **) &ServiceBinding,\r
+                  (VOID **)&ServiceBinding,\r
                   This->DriverBindingHandle,\r
                   NicHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -273,23 +276,23 @@ Udp6DriverBindingStop (
     //\r
     // NumberOfChildren is not zero, destroy the children instances in ChildHandleBuffer.\r
     //\r
-    List = &Udp6Service->ChildrenList;\r
+    List                      = &Udp6Service->ChildrenList;\r
     Context.ServiceBinding    = ServiceBinding;\r
     Context.NumberOfChildren  = NumberOfChildren;\r
     Context.ChildHandleBuffer = ChildHandleBuffer;\r
-    Status = NetDestroyLinkList (\r
-               List,\r
-               Udp6DestroyChildEntryInHandleBuffer,\r
-               &Context,\r
-               NULL\r
-               );\r
+    Status                    = NetDestroyLinkList (\r
+                                  List,\r
+                                  Udp6DestroyChildEntryInHandleBuffer,\r
+                                  &Context,\r
+                                  NULL\r
+                                  );\r
   } else if (IsListEmpty (&Udp6Service->ChildrenList)) {\r
     Status = gBS->UninstallMultipleProtocolInterfaces (\r
-               NicHandle,\r
-               &gEfiUdp6ServiceBindingProtocolGuid,\r
-               &Udp6Service->ServiceBinding,\r
-               NULL\r
-               );\r
+                    NicHandle,\r
+                    &gEfiUdp6ServiceBindingProtocolGuid,\r
+                    &Udp6Service->ServiceBinding,\r
+                    NULL\r
+                    );\r
 \r
     Udp6CleanService (Udp6Service);\r
     FreePool (Udp6Service);\r
@@ -376,7 +379,7 @@ Udp6ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   Udp6Service->IpIo->ChildHandle,\r
                   &gEfiIp6ProtocolGuid,\r
-                  (VOID **) &Ip6,\r
+                  (VOID **)&Ip6,\r
                   gUdp6DriverBinding.DriverBindingHandle,\r
                   Instance->ChildHandle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -391,7 +394,7 @@ Udp6ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (\r
                   Instance->IpInfo->ChildHandle,\r
                   &gEfiIp6ProtocolGuid,\r
-                  (VOID **) &Ip6,\r
+                  (VOID **)&Ip6,\r
                   gUdp6DriverBinding.DriverBindingHandle,\r
                   Instance->ChildHandle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -478,7 +481,7 @@ Udp6ServiceBindingDestroyChild (
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiUdp6ProtocolGuid,\r
-                  (VOID **) &Udp6Proto,\r
+                  (VOID **)&Udp6Proto,\r
                   gUdp6DriverBinding.DriverBindingHandle,\r
                   ChildHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -502,11 +505,11 @@ Udp6ServiceBindingDestroyChild (
   // Close the Ip6 protocol on the default IpIo.\r
   //\r
   Status = gBS->CloseProtocol (\r
-             Udp6Service->IpIo->ChildHandle,\r
-             &gEfiIp6ProtocolGuid,\r
-             gUdp6DriverBinding.DriverBindingHandle,\r
-             Instance->ChildHandle\r
-             );\r
+                  Udp6Service->IpIo->ChildHandle,\r
+                  &gEfiIp6ProtocolGuid,\r
+                  gUdp6DriverBinding.DriverBindingHandle,\r
+                  Instance->ChildHandle\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     Instance->InDestroy = FALSE;\r
     return Status;\r
@@ -516,11 +519,11 @@ Udp6ServiceBindingDestroyChild (
   // Close the Ip6 protocol on this instance's IpInfo.\r
   //\r
   Status = gBS->CloseProtocol (\r
-             Instance->IpInfo->ChildHandle,\r
-             &gEfiIp6ProtocolGuid,\r
-             gUdp6DriverBinding.DriverBindingHandle,\r
-             Instance->ChildHandle\r
-             );\r
+                  Instance->IpInfo->ChildHandle,\r
+                  &gEfiIp6ProtocolGuid,\r
+                  gUdp6DriverBinding.DriverBindingHandle,\r
+                  Instance->ChildHandle\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     Instance->InDestroy = FALSE;\r
     return Status;\r
@@ -532,7 +535,7 @@ Udp6ServiceBindingDestroyChild (
   Status = gBS->UninstallMultipleProtocolInterfaces (\r
                   ChildHandle,\r
                   &gEfiUdp6ProtocolGuid,\r
-                  (VOID *) &Instance->Udp6Proto,\r
+                  (VOID *)&Instance->Udp6Proto,\r
                   NULL\r
                   );\r
   if (EFI_ERROR (Status)) {\r
@@ -611,13 +614,11 @@ Udp6DriverEntryPoint (
     // Initialize the UDP random port.\r
     //\r
     mUdp6RandomPort = (UINT16)(\r
-                        ((UINT16) NetRandomInitSeed ()) %\r
-                         UDP6_PORT_KNOWN +\r
-                         UDP6_PORT_KNOWN\r
-                         );\r
+                               ((UINT16)NetRandomInitSeed ()) %\r
+                               UDP6_PORT_KNOWN +\r
+                               UDP6_PORT_KNOWN\r
+                               );\r
   }\r
 \r
   return Status;\r
 }\r
-\r
-\r
index 577cebd5b1fd0c67f44b2c8ae94e6ee810c87e11..7d3c5dabc1bb9dd2ef7db450d9726ae119e357f9 100644 (file)
@@ -173,4 +173,3 @@ Udp6ServiceBindingDestroyChild (
   );\r
 \r
 #endif\r
-\r
index ba939fdbfc3136c8b5e2b08a8c3fd3346fa781fc..d0966ab06090a890551717a1e3a33b9eeb6ed7cc 100644 (file)
@@ -63,10 +63,10 @@ Udp6FindInstanceByPort (
 VOID\r
 EFIAPI\r
 Udp6DgramSent (\r
-  IN EFI_STATUS        Status,\r
-  IN VOID              *Context,\r
-  IN IP_IO_IP_PROTOCOL Sender,\r
-  IN VOID              *NotifyData\r
+  IN EFI_STATUS         Status,\r
+  IN VOID               *Context,\r
+  IN IP_IO_IP_PROTOCOL  Sender,\r
+  IN VOID               *NotifyData\r
   );\r
 \r
 /**\r
@@ -264,8 +264,8 @@ Udp6SendPortUnreach (
 **/\r
 NET_MAP_ITEM *\r
 Udp6MapMultiCastAddr (\r
-  IN  NET_MAP               *Map,\r
-  IN  VOID                  *Key\r
+  IN  NET_MAP  *Map,\r
+  IN  VOID     *Key\r
   );\r
 \r
 /**\r
@@ -317,10 +317,10 @@ Udp6CreateService (
     &mIp6IoDefaultIpConfigData,\r
     sizeof (EFI_IP6_CONFIG_DATA)\r
     );\r
-  OpenData.RcvdContext           = (VOID *) Udp6Service;\r
-  OpenData.SndContext            = NULL;\r
-  OpenData.PktRcvdNotify         = Udp6DgramRcvd;\r
-  OpenData.PktSentNotify         = Udp6DgramSent;\r
+  OpenData.RcvdContext   = (VOID *)Udp6Service;\r
+  OpenData.SndContext    = NULL;\r
+  OpenData.PktRcvdNotify = Udp6DgramRcvd;\r
+  OpenData.PktSentNotify = Udp6DgramSent;\r
 \r
   //\r
   // Configure and start the IpIo.\r
@@ -370,7 +370,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Clean the Udp service context data.\r
 \r
@@ -396,7 +395,6 @@ Udp6CleanService (
   ZeroMem (Udp6Service, sizeof (UDP6_SERVICE_DATA));\r
 }\r
 \r
-\r
 /**\r
   This function checks and times out the I/O datagrams listed in the\r
   UDP6_SERVICE_DATA which is specified by the input parameter Context.\r
@@ -421,7 +419,7 @@ Udp6CheckTimeout (
   LIST_ENTRY          *NextEntry;\r
   UDP6_RXDATA_WRAP    *Wrap;\r
 \r
-  Udp6Service = (UDP6_SERVICE_DATA *) Context;\r
+  Udp6Service = (UDP6_SERVICE_DATA *)Context;\r
   NET_CHECK_SIGNATURE (Udp6Service, UDP6_SERVICE_DATA_SIGNATURE);\r
 \r
   NET_LIST_FOR_EACH (Entry, &Udp6Service->ChildrenList) {\r
@@ -448,7 +446,7 @@ Udp6CheckTimeout (
         //\r
         // Remove this RxData if it timeouts.\r
         //\r
-        Udp6RecycleRxDataWrap (NULL, (VOID *) Wrap);\r
+        Udp6RecycleRxDataWrap (NULL, (VOID *)Wrap);\r
       } else {\r
         Wrap->TimeoutTick -= UDP6_TIMEOUT_INTERVAL / 10;\r
       }\r
@@ -456,7 +454,6 @@ Udp6CheckTimeout (
   }\r
 }\r
 \r
-\r
 /**\r
   This function initializes the new created udp instance.\r
 \r
@@ -500,7 +497,6 @@ Udp6InitInstance (
   Instance->InDestroy   = FALSE;\r
 }\r
 \r
-\r
 /**\r
   This function cleans the udp instance.\r
 \r
@@ -517,7 +513,6 @@ Udp6CleanInstance (
   NetMapClean (&Instance->TxTokens);\r
 }\r
 \r
-\r
 /**\r
   This function finds the udp instance by the specified <Address, Port> pair.\r
 \r
@@ -558,7 +553,8 @@ Udp6FindInstanceByPort (
 \r
     if (EFI_IP6_EQUAL (&ConfigData->StationAddress, Address) &&\r
         (ConfigData->StationPort == Port)\r
-        ) {\r
+        )\r
+    {\r
       //\r
       // If both the address and the port are the same, return TRUE.\r
       //\r
@@ -572,7 +568,6 @@ Udp6FindInstanceByPort (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   This function tries to bind the udp instance according to the configured port\r
   allocation strategy.\r
@@ -604,10 +599,10 @@ Udp6Bind (
   StationAddress = &ConfigData->StationAddress;\r
 \r
   if (ConfigData->StationPort != 0) {\r
-\r
     if (!ConfigData->AllowDuplicatePort &&\r
         Udp6FindInstanceByPort (InstanceList, StationAddress, ConfigData->StationPort)\r
-        ) {\r
+        )\r
+    {\r
       //\r
       // Do not allow duplicate ports and the port is already used by other instance.\r
       //\r
@@ -623,11 +618,9 @@ Udp6Bind (
       //\r
       ConfigData->StationPort = mUdp6RandomPort;\r
     } else {\r
-\r
       StartPort = mUdp6RandomPort;\r
 \r
       while (Udp6FindInstanceByPort (InstanceList, StationAddress, mUdp6RandomPort)) {\r
-\r
         mUdp6RandomPort++;\r
         if (mUdp6RandomPort == 0) {\r
           mUdp6RandomPort = UDP6_PORT_KNOWN;\r
@@ -649,10 +642,10 @@ Udp6Bind (
       mUdp6RandomPort = UDP6_PORT_KNOWN;\r
     }\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function is used to check whether the NewConfigData has any un-reconfigurable\r
   parameters changed compared to the OldConfigData.\r
@@ -674,7 +667,8 @@ Udp6IsReconfigurable (
   if ((NewConfigData->AcceptAnyPort != OldConfigData->AcceptAnyPort) ||\r
       (NewConfigData->AcceptPromiscuous != OldConfigData->AcceptPromiscuous) ||\r
       (NewConfigData->AllowDuplicatePort != OldConfigData->AllowDuplicatePort)\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // The receiving filter parameters cannot be changed.\r
     //\r
@@ -683,7 +677,8 @@ Udp6IsReconfigurable (
 \r
   if ((!NewConfigData->AcceptAnyPort) &&\r
       (NewConfigData->StationPort != OldConfigData->StationPort)\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // The port is not changeable.\r
     //\r
@@ -697,7 +692,6 @@ Udp6IsReconfigurable (
     return FALSE;\r
   }\r
 \r
-\r
   if (!EFI_IP6_EQUAL (&NewConfigData->RemoteAddress, &OldConfigData->RemoteAddress)) {\r
     //\r
     // The remoteaddress is not the same.\r
@@ -707,7 +701,8 @@ Udp6IsReconfigurable (
 \r
   if (!NetIp6IsUnspecifiedAddr (&NewConfigData->RemoteAddress) &&\r
       (NewConfigData->RemotePort != OldConfigData->RemotePort)\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // The RemotePort differs if it's designated in the configdata.\r
     //\r
@@ -720,7 +715,6 @@ Udp6IsReconfigurable (
   return TRUE;\r
 }\r
 \r
-\r
 /**\r
   This function builds the Ip6 configdata from the Udp6ConfigData.\r
 \r
@@ -730,8 +724,8 @@ Udp6IsReconfigurable (
 **/\r
 VOID\r
 Udp6BuildIp6ConfigData (\r
-  IN EFI_UDP6_CONFIG_DATA      *Udp6ConfigData,\r
-  IN OUT EFI_IP6_CONFIG_DATA   *Ip6ConfigData\r
+  IN EFI_UDP6_CONFIG_DATA     *Udp6ConfigData,\r
+  IN OUT EFI_IP6_CONFIG_DATA  *Ip6ConfigData\r
   )\r
 {\r
   CopyMem (\r
@@ -739,17 +733,16 @@ Udp6BuildIp6ConfigData (
     &mIp6IoDefaultIpConfigData,\r
     sizeof (EFI_IP6_CONFIG_DATA)\r
     );\r
-  Ip6ConfigData->DefaultProtocol      = EFI_IP_PROTO_UDP;\r
-  Ip6ConfigData->AcceptPromiscuous    = Udp6ConfigData->AcceptPromiscuous;\r
+  Ip6ConfigData->DefaultProtocol   = EFI_IP_PROTO_UDP;\r
+  Ip6ConfigData->AcceptPromiscuous = Udp6ConfigData->AcceptPromiscuous;\r
   IP6_COPY_ADDRESS (&Ip6ConfigData->StationAddress, &Udp6ConfigData->StationAddress);\r
   IP6_COPY_ADDRESS (&Ip6ConfigData->DestinationAddress, &Udp6ConfigData->RemoteAddress);\r
   //\r
   // Use the -1 magic number to disable the receiving process of the ip instance.\r
   //\r
-  Ip6ConfigData->ReceiveTimeout    = (UINT32) (-1);\r
+  Ip6ConfigData->ReceiveTimeout = (UINT32)(-1);\r
 }\r
 \r
-\r
 /**\r
   This function validates the TxToken. It returns the error code according to the spec.\r
 \r
@@ -791,7 +784,6 @@ Udp6ValidateTxToken (
   EFI_UDP6_CONFIG_DATA    *ConfigData;\r
   EFI_UDP6_SESSION_DATA   *UdpSessionData;\r
 \r
-\r
   if (TxToken->Event == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
@@ -804,10 +796,10 @@ Udp6ValidateTxToken (
 \r
   TotalLen = 0;\r
   for (Index = 0; Index < TxData->FragmentCount; Index++) {\r
-\r
     if ((TxData->FragmentTable[Index].FragmentBuffer == NULL) ||\r
         (TxData->FragmentTable[Index].FragmentLength == 0)\r
-        ) {\r
+        )\r
+    {\r
       //\r
       // If the FragmentBuffer is NULL, or the FragmentLeng is zero.\r
       //\r
@@ -829,7 +821,6 @@ Udp6ValidateTxToken (
   UdpSessionData = TxData->UdpSessionData;\r
 \r
   if (UdpSessionData != NULL) {\r
-\r
     if ((UdpSessionData->DestinationPort == 0) && (ConfigData->RemotePort == 0)) {\r
       //\r
       // Ambiguous; no available DestinationPort for this token.\r
@@ -839,7 +830,8 @@ Udp6ValidateTxToken (
 \r
     if (NetIp6IsUnspecifiedAddr (&UdpSessionData->DestinationAddress) &&\r
         NetIp6IsUnspecifiedAddr (&ConfigData->RemoteAddress)\r
-        ) {\r
+        )\r
+    {\r
       //\r
       // The DestinationAddress is not specified.\r
       //\r
@@ -848,7 +840,8 @@ Udp6ValidateTxToken (
 \r
     if (!NetIp6IsUnspecifiedAddr (&UdpSessionData->DestinationAddress) &&\r
         !NetIp6IsUnspecifiedAddr (&ConfigData->RemoteAddress)\r
-        ) {\r
+        )\r
+    {\r
       //\r
       // The ConfigData.RemoteAddress is not zero and the UdpSessionData.DestinationAddress\r
       // is not zero too.\r
@@ -870,7 +863,6 @@ Udp6ValidateTxToken (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function checks whether the specified Token duplicates the one in the Map.\r
 \r
@@ -895,8 +887,8 @@ Udp6TokenExist (
   EFI_UDP6_COMPLETION_TOKEN  *Token;\r
   EFI_UDP6_COMPLETION_TOKEN  *TokenInItem;\r
 \r
-  Token       = (EFI_UDP6_COMPLETION_TOKEN *) Context;\r
-  TokenInItem = (EFI_UDP6_COMPLETION_TOKEN *) Item->Key;\r
+  Token       = (EFI_UDP6_COMPLETION_TOKEN *)Context;\r
+  TokenInItem = (EFI_UDP6_COMPLETION_TOKEN *)Item->Key;\r
 \r
   if ((Token == TokenInItem) || (Token->Event == TokenInItem->Event)) {\r
     //\r
@@ -909,7 +901,6 @@ Udp6TokenExist (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function calculates the checksum for the Packet, utilizing the pre-calculated\r
   pseudo HeadSum to reduce some overhead.\r
@@ -923,21 +914,20 @@ Udp6TokenExist (
 **/\r
 UINT16\r
 Udp6Checksum (\r
-  IN NET_BUF *Packet,\r
-  IN UINT16  HeadSum\r
+  IN NET_BUF  *Packet,\r
+  IN UINT16   HeadSum\r
   )\r
 {\r
   UINT16  Checksum;\r
 \r
-  Checksum  = NetbufChecksum (Packet);\r
-  Checksum  = NetAddChecksum (Checksum, HeadSum);\r
+  Checksum = NetbufChecksum (Packet);\r
+  Checksum = NetAddChecksum (Checksum, HeadSum);\r
 \r
-  Checksum  = NetAddChecksum (Checksum, HTONS ((UINT16) Packet->TotalSize));\r
-  Checksum  = (UINT16) (~Checksum);\r
+  Checksum = NetAddChecksum (Checksum, HTONS ((UINT16)Packet->TotalSize));\r
+  Checksum = (UINT16)(~Checksum);\r
   return Checksum;\r
 }\r
 \r
-\r
 /**\r
   This function removes the specified Token from the TokenMap.\r
 \r
@@ -959,7 +949,7 @@ Udp6RemoveToken (
   //\r
   // Find the Token first.\r
   //\r
-  Item = NetMapFindKey (TokenMap, (VOID *) Token);\r
+  Item = NetMapFindKey (TokenMap, (VOID *)Token);\r
 \r
   if (Item != NULL) {\r
     //\r
@@ -969,10 +959,10 @@ Udp6RemoveToken (
 \r
     return EFI_SUCCESS;\r
   }\r
+\r
   return EFI_NOT_FOUND;\r
 }\r
 \r
-\r
 /**\r
   This function is the packet transmitting notify function registered to the IpIo\r
   interface. It's called to signal the udp TxToken when IpIo layer completes the\r
@@ -990,10 +980,10 @@ Udp6RemoveToken (
 VOID\r
 EFIAPI\r
 Udp6DgramSent (\r
-  IN EFI_STATUS        Status,\r
-  IN VOID              *Context,\r
-  IN IP_IO_IP_PROTOCOL Sender,\r
-  IN VOID              *NotifyData\r
+  IN EFI_STATUS         Status,\r
+  IN VOID               *Context,\r
+  IN IP_IO_IP_PROTOCOL  Sender,\r
+  IN VOID               *NotifyData\r
   )\r
 {\r
   UDP6_INSTANCE_DATA         *Instance;\r
@@ -1001,8 +991,8 @@ Udp6DgramSent (
 \r
   ASSERT (Context != NULL && NotifyData != NULL);\r
 \r
-  Instance = (UDP6_INSTANCE_DATA *) Context;\r
-  Token    = (EFI_UDP6_COMPLETION_TOKEN *) NotifyData;\r
+  Instance = (UDP6_INSTANCE_DATA *)Context;\r
+  Token    = (EFI_UDP6_COMPLETION_TOKEN *)NotifyData;\r
 \r
   if (Udp6RemoveToken (&Instance->TxTokens, Token) == EFI_SUCCESS) {\r
     //\r
@@ -1014,7 +1004,6 @@ Udp6DgramSent (
   }\r
 }\r
 \r
-\r
 /**\r
   This function processes the received datagram passed up by the IpIo layer.\r
 \r
@@ -1048,16 +1037,15 @@ Udp6DgramRcvd (
   // IpIo only passes received packets with Status EFI_SUCCESS or EFI_ICMP_ERROR.\r
   //\r
   if (Status == EFI_SUCCESS) {\r
-\r
     //\r
     // Demultiplex the received datagram.\r
     //\r
-    Udp6Demultiplex ((UDP6_SERVICE_DATA *) Context, NetSession, Packet);\r
+    Udp6Demultiplex ((UDP6_SERVICE_DATA *)Context, NetSession, Packet);\r
   } else {\r
     //\r
     // Handle the ICMP6 Error packet.\r
     //\r
-    Udp6IcmpHandler ((UDP6_SERVICE_DATA *) Context, IcmpError, NetSession, Packet);\r
+    Udp6IcmpHandler ((UDP6_SERVICE_DATA *)Context, IcmpError, NetSession, Packet);\r
   }\r
 \r
   //\r
@@ -1067,7 +1055,6 @@ Udp6DgramRcvd (
   DispatchDpc ();\r
 }\r
 \r
-\r
 /**\r
   This function removes the multicast group specified by Arg from the Map.\r
 \r
@@ -1096,7 +1083,8 @@ Udp6LeaveGroup (
 \r
   if ((McastIp != NULL) &&\r
       !EFI_IP6_EQUAL (McastIp, ((EFI_IPv6_ADDRESS *)Item->Key))\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // McastIp is not NULL and the multicast address contained in the Item\r
     // is not the same as McastIp.\r
@@ -1121,7 +1109,6 @@ Udp6LeaveGroup (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function cancel the token specified by Arg in the Map.\r
 \r
@@ -1161,15 +1148,15 @@ Udp6CancelTokens (
     // will invoke Udp6DgramSent, the token will be signaled and this Item will\r
     // be removed from the Map there.\r
     //\r
-    Packet  = (NET_BUF *) (Item->Value);\r
-    IpIo    = (IP_IO *) (*((UINTN *) &Packet->ProtoData[0]));\r
+    Packet = (NET_BUF *)(Item->Value);\r
+    IpIo   = (IP_IO *)(*((UINTN *)&Packet->ProtoData[0]));\r
 \r
     IpIoCancelTxToken (IpIo, Packet);\r
   } else {\r
     //\r
     // The token is a receive token. Abort it and remove it from the Map.\r
     //\r
-    TokenToCancel = (EFI_UDP6_COMPLETION_TOKEN *) Item->Key;\r
+    TokenToCancel = (EFI_UDP6_COMPLETION_TOKEN *)Item->Key;\r
     NetMapRemoveItem (Map, Item, NULL);\r
 \r
     TokenToCancel->Status = EFI_ABORTED;\r
@@ -1183,7 +1170,6 @@ Udp6CancelTokens (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function removes all the Wrap datas in the RcvdDgramQue.\r
 \r
@@ -1206,12 +1192,10 @@ Udp6FlushRcvdDgram (
     //\r
     // The Wrap will be removed from the RcvdDgramQue by this function call.\r
     //\r
-    Udp6RecycleRxDataWrap (NULL, (VOID *) Wrap);\r
+    Udp6RecycleRxDataWrap (NULL, (VOID *)Wrap);\r
   }\r
 }\r
 \r
-\r
-\r
 /**\r
   Cancel Udp6 tokens from the Udp6 instance.\r
 \r
@@ -1259,15 +1243,15 @@ Udp6InstanceCancelToken (
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  ASSERT ((Token != NULL) ||\r
-          ((0 == NetMapGetCount (&Instance->TxTokens)) &&\r
-          (0 == NetMapGetCount (&Instance->RxTokens)))\r
-          );\r
+  ASSERT (\r
+    (Token != NULL) ||\r
+    ((0 == NetMapGetCount (&Instance->TxTokens)) &&\r
+     (0 == NetMapGetCount (&Instance->RxTokens)))\r
+    );\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function checks if the received udp datagram matches with the Instance.\r
 \r
@@ -1299,7 +1283,8 @@ Udp6MatchDgram (
 \r
   if ((!ConfigData->AcceptAnyPort && (Udp6Session->DestinationPort != ConfigData->StationPort)) ||\r
       ((ConfigData->RemotePort != 0) && (Udp6Session->SourcePort != ConfigData->RemotePort))\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // The local port or the remote port doesn't match.\r
     //\r
@@ -1308,7 +1293,8 @@ Udp6MatchDgram (
 \r
   if (!NetIp6IsUnspecifiedAddr (&ConfigData->RemoteAddress) &&\r
       !EFI_IP6_EQUAL (&ConfigData->RemoteAddress, &Udp6Session->SourceAddress)\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // This datagram doesn't come from the instance's specified sender.\r
     //\r
@@ -1317,7 +1303,8 @@ Udp6MatchDgram (
 \r
   if (NetIp6IsUnspecifiedAddr (&ConfigData->StationAddress) ||\r
       EFI_IP6_EQUAL (&Udp6Session->DestinationAddress, &ConfigData->StationAddress)\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // The instance is configured to receive datagrams destinated to any station IP or\r
     // the destination address of this datagram matches the configured station IP.\r
@@ -1329,7 +1316,8 @@ Udp6MatchDgram (
 \r
   if (IP6_IS_MULTICAST (&Destination) &&\r
       (NULL != Udp6MapMultiCastAddr (&Instance->McastIps, &Destination))\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // It's a multicast packet and the multicast address is accepted by this instance.\r
     //\r
@@ -1339,7 +1327,6 @@ Udp6MatchDgram (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   This function removes the Wrap specified by Context and release relevant resources.\r
 \r
@@ -1356,7 +1343,7 @@ Udp6RecycleRxDataWrap (
 {\r
   UDP6_RXDATA_WRAP  *Wrap;\r
 \r
-  Wrap = (UDP6_RXDATA_WRAP *) Context;\r
+  Wrap = (UDP6_RXDATA_WRAP *)Context;\r
 \r
   //\r
   // Remove the Wrap from the list it belongs to.\r
@@ -1376,7 +1363,6 @@ Udp6RecycleRxDataWrap (
   FreePool (Wrap);\r
 }\r
 \r
-\r
 /**\r
   This function wraps the Packet into RxData.\r
 \r
@@ -1397,21 +1383,23 @@ Udp6WrapRxData (
   IN EFI_UDP6_RECEIVE_DATA  *RxData\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
-  UDP6_RXDATA_WRAP      *Wrap;\r
+  EFI_STATUS        Status;\r
+  UDP6_RXDATA_WRAP  *Wrap;\r
 \r
   //\r
   // Allocate buffer for the Wrap.\r
   //\r
-  Wrap = AllocateZeroPool (sizeof (UDP6_RXDATA_WRAP) +\r
-         (Packet->BlockOpNum - 1) * sizeof (EFI_UDP6_FRAGMENT_DATA));\r
+  Wrap = AllocateZeroPool (\r
+           sizeof (UDP6_RXDATA_WRAP) +\r
+           (Packet->BlockOpNum - 1) * sizeof (EFI_UDP6_FRAGMENT_DATA)\r
+           );\r
   if (Wrap == NULL) {\r
     return NULL;\r
   }\r
 \r
   InitializeListHead (&Wrap->Link);\r
 \r
-  CopyMem (&Wrap->RxData, RxData, sizeof(EFI_UDP6_RECEIVE_DATA));\r
+  CopyMem (&Wrap->RxData, RxData, sizeof (EFI_UDP6_RECEIVE_DATA));\r
   //\r
   // Create the Recycle event.\r
   //\r
@@ -1433,7 +1421,6 @@ Udp6WrapRxData (
   return Wrap;\r
 }\r
 \r
-\r
 /**\r
   This function enqueues the received datagram into the instances' receiving queues.\r
 \r
@@ -1490,7 +1477,6 @@ Udp6EnqueueDgram (
   return Enqueued;\r
 }\r
 \r
-\r
 /**\r
   This function delivers the received datagrams to the specified instance.\r
 \r
@@ -1510,8 +1496,8 @@ Udp6InstanceDeliverDgram (
 \r
   if (!IsListEmpty (&Instance->RcvdDgramQue) &&\r
       !NetMapIsEmpty (&Instance->RxTokens)\r
-      ) {\r
-\r
+      )\r
+  {\r
     Wrap = NET_LIST_HEAD (&Instance->RcvdDgramQue, UDP6_RXDATA_WRAP, Link);\r
 \r
     if (NET_BUF_SHARED (Wrap->Packet)) {\r
@@ -1530,7 +1516,7 @@ Udp6InstanceDeliverDgram (
 \r
     NetListRemoveHead (&Instance->RcvdDgramQue);\r
 \r
-    Token = (EFI_UDP6_COMPLETION_TOKEN *) NetMapRemoveHead (&Instance->RxTokens, NULL);\r
+    Token = (EFI_UDP6_COMPLETION_TOKEN *)NetMapRemoveHead (&Instance->RxTokens, NULL);\r
 \r
     //\r
     // Build the FragmentTable and set the FragmentCount in RxData.\r
@@ -1540,7 +1526,7 @@ Udp6InstanceDeliverDgram (
 \r
     NetbufBuildExt (\r
       Wrap->Packet,\r
-      (NET_FRAGMENT *) RxData->FragmentTable,\r
+      (NET_FRAGMENT *)RxData->FragmentTable,\r
       &RxData->FragmentCount\r
       );\r
 \r
@@ -1555,7 +1541,6 @@ Udp6InstanceDeliverDgram (
   }\r
 }\r
 \r
-\r
 /**\r
   This function delivers the datagrams enqueued in the instances.\r
 \r
@@ -1587,7 +1572,6 @@ Udp6DeliverDgram (
   }\r
 }\r
 \r
-\r
 /**\r
   This function demultiplexes the received udp datagram to the appropriate instances.\r
 \r
@@ -1605,7 +1589,7 @@ Udp6Demultiplex (
   IN NET_BUF               *Packet\r
   )\r
 {\r
-  EFI_UDP_HEADER        *Udp6Header;\r
+  EFI_UDP_HEADER         *Udp6Header;\r
   UINT16                 HeadSum;\r
   EFI_UDP6_RECEIVE_DATA  RxData;\r
   EFI_UDP6_SESSION_DATA  *Udp6Session;\r
@@ -1619,7 +1603,7 @@ Udp6Demultiplex (
   //\r
   // Get the datagram header from the packet buffer.\r
   //\r
-  Udp6Header = (EFI_UDP_HEADER *) NetbufGetByte (Packet, 0, NULL);\r
+  Udp6Header = (EFI_UDP_HEADER *)NetbufGetByte (Packet, 0, NULL);\r
   ASSERT (Udp6Header != NULL);\r
   if (Udp6Header == NULL) {\r
     NetbufFree (Packet);\r
@@ -1658,7 +1642,7 @@ Udp6Demultiplex (
   //\r
   NetbufTrim (Packet, UDP6_HEADER_SIZE, TRUE);\r
 \r
-  RxData.DataLength = (UINT32) Packet->TotalSize;\r
+  RxData.DataLength = (UINT32)Packet->TotalSize;\r
 \r
   //\r
   // Try to enqueue this datagram into the instances.\r
@@ -1685,7 +1669,6 @@ Udp6Demultiplex (
   }\r
 }\r
 \r
-\r
 /**\r
   This function builds and sends out a icmp port unreachable message.\r
 \r
@@ -1721,14 +1704,14 @@ Udp6SendPortUnreach (
   //\r
   if (NetSession->IpVersion == IP_VERSION_6) {\r
     if (NetIp6IsUnspecifiedAddr (&NetSession->Dest.v6) ||\r
-      IP6_IS_MULTICAST (&NetSession->Dest.v6)\r
-      ) {\r
+        IP6_IS_MULTICAST (&NetSession->Dest.v6)\r
+        )\r
+    {\r
       goto EXIT;\r
     }\r
   }\r
 \r
-\r
-  IpSender    = IpIoFindSender (&IpIo, NetSession->IpVersion, &NetSession->Dest);\r
+  IpSender = IpIoFindSender (&IpIo, NetSession->IpVersion, &NetSession->Dest);\r
 \r
   //\r
   // Get the Ipv6 Mode Data.\r
@@ -1759,11 +1742,12 @@ Udp6SendPortUnreach (
   if (EFI_ERROR (Status)) {\r
     goto EXIT;\r
   }\r
+\r
   //\r
   // The ICMP6 packet length, includes whole invoking packet and ICMP6 error header.\r
   //\r
   Len = NetSession->IpHdrLen +\r
-        NTOHS(((EFI_UDP_HEADER *) Udp6Header)->Length) +\r
+        NTOHS (((EFI_UDP_HEADER *)Udp6Header)->Length) +\r
         sizeof (IP6_ICMP_ERROR_HEAD);\r
 \r
   //\r
@@ -1784,7 +1768,7 @@ Udp6SendPortUnreach (
   //\r
   // Allocate space for the IP6_ICMP_ERROR_HEAD.\r
   //\r
-  IcmpErrHdr = (IP6_ICMP_ERROR_HEAD *) NetbufAllocSpace (Packet, Len, FALSE);\r
+  IcmpErrHdr = (IP6_ICMP_ERROR_HEAD *)NetbufAllocSpace (Packet, Len, FALSE);\r
   ASSERT (IcmpErrHdr != NULL);\r
   if (IcmpErrHdr == NULL) {\r
     goto EXIT;\r
@@ -1804,8 +1788,8 @@ Udp6SendPortUnreach (
   // the length of EFI_IP6_HEADER, so when using the length of IP6_ICMP_ERROR_HEAD\r
   // for pointer movement that fact should be considered.\r
   //\r
-  Ptr = (VOID *) &IcmpErrHdr->Head;\r
-  Ptr = (UINT8 *) (UINTN) ((UINTN) Ptr + sizeof (IP6_ICMP_ERROR_HEAD) - sizeof (EFI_IP6_HEADER));\r
+  Ptr = (VOID *)&IcmpErrHdr->Head;\r
+  Ptr = (UINT8 *)(UINTN)((UINTN)Ptr + sizeof (IP6_ICMP_ERROR_HEAD) - sizeof (EFI_IP6_HEADER));\r
   CopyMem (Ptr, NetSession->IpHdr.Ip6Hdr, NetSession->IpHdrLen);\r
   CopyMem (\r
     Ptr + NetSession->IpHdrLen,\r
@@ -1821,9 +1805,9 @@ Udp6SendPortUnreach (
   //\r
   // Fill the override data.\r
   //\r
-  Override.Ip6OverrideData.FlowLabel     = 0;\r
-  Override.Ip6OverrideData.HopLimit      = 255;\r
-  Override.Ip6OverrideData.Protocol      = IP6_ICMP;\r
+  Override.Ip6OverrideData.FlowLabel = 0;\r
+  Override.Ip6OverrideData.HopLimit  = 255;\r
+  Override.Ip6OverrideData.Protocol  = IP6_ICMP;\r
 \r
   //\r
   // Send out this icmp packet.\r
@@ -1838,7 +1822,6 @@ EXIT:
   }\r
 }\r
 \r
-\r
 /**\r
   This function handles the received Icmp Error message and de-multiplexes it to the\r
   instance.\r
@@ -1868,7 +1851,7 @@ Udp6IcmpHandler (
     return;\r
   }\r
 \r
-  Udp6Header = (EFI_UDP_HEADER *) NetbufGetByte (Packet, 0, NULL);\r
+  Udp6Header = (EFI_UDP_HEADER *)NetbufGetByte (Packet, 0, NULL);\r
   ASSERT (Udp6Header != NULL);\r
   if (Udp6Header == NULL) {\r
     NetbufFree (Packet);\r
@@ -1913,7 +1896,6 @@ Udp6IcmpHandler (
   NetbufFree (Packet);\r
 }\r
 \r
-\r
 /**\r
   This function reports the received ICMP error.\r
 \r
@@ -1938,7 +1920,7 @@ Udp6ReportIcmpError (
     //\r
     // Try to get a RxToken from the RxTokens map.\r
     //\r
-    Token = (EFI_UDP6_COMPLETION_TOKEN *) NetMapRemoveHead (&Instance->RxTokens, NULL);\r
+    Token = (EFI_UDP6_COMPLETION_TOKEN *)NetMapRemoveHead (&Instance->RxTokens, NULL);\r
 \r
     if (Token != NULL) {\r
       //\r
@@ -1955,7 +1937,6 @@ Udp6ReportIcmpError (
   }\r
 }\r
 \r
-\r
 /**\r
   This function is a dummy ext-free function for the NET_BUF created for the output\r
   udp datagram.\r
@@ -1982,8 +1963,8 @@ Udp6NetVectorExtFree (
 **/\r
 NET_MAP_ITEM *\r
 Udp6MapMultiCastAddr (\r
-  IN  NET_MAP               *Map,\r
-  IN  VOID                  *Key\r
+  IN  NET_MAP  *Map,\r
+  IN  VOID     *Key\r
   )\r
 {\r
   LIST_ENTRY        *Entry;\r
@@ -1992,12 +1973,11 @@ Udp6MapMultiCastAddr (
 \r
   ASSERT (Map != NULL);\r
   NET_LIST_FOR_EACH (Entry, &Map->Used) {\r
-    Item  = NET_LIST_USER_STRUCT (Entry, NET_MAP_ITEM, Link);\r
-    Addr  = (EFI_IPv6_ADDRESS *) Item->Key;\r
+    Item = NET_LIST_USER_STRUCT (Entry, NET_MAP_ITEM, Link);\r
+    Addr = (EFI_IPv6_ADDRESS *)Item->Key;\r
     if (EFI_IP6_EQUAL (Addr, Key)) {\r
       return Item;\r
     }\r
   }\r
   return NULL;\r
 }\r
-\r
index 55a4b8a909bec281228779d567ef0e55441d9bda..7ea299a5e9ee0f51c9673783da5dc3dd0a7e9733 100644 (file)
 \r
 #include "Udp6Driver.h"\r
 \r
-extern EFI_COMPONENT_NAME2_PROTOCOL   gUdp6ComponentName2;\r
-extern EFI_COMPONENT_NAME_PROTOCOL    gUdp6ComponentName;\r
-extern EFI_UNICODE_STRING_TABLE       *gUdp6ControllerNameTable;\r
-extern EFI_SERVICE_BINDING_PROTOCOL   mUdp6ServiceBinding;\r
-extern EFI_UDP6_PROTOCOL              mUdp6Protocol;\r
-extern UINT16                         mUdp6RandomPort;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gUdp6ComponentName2;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gUdp6ComponentName;\r
+extern EFI_UNICODE_STRING_TABLE      *gUdp6ControllerNameTable;\r
+extern EFI_SERVICE_BINDING_PROTOCOL  mUdp6ServiceBinding;\r
+extern EFI_UDP6_PROTOCOL             mUdp6Protocol;\r
+extern UINT16                        mUdp6RandomPort;\r
 \r
 //\r
 // Define time out 50 milliseconds\r
 //\r
-#define UDP6_TIMEOUT_INTERVAL (50 * TICKS_PER_MS)\r
-#define UDP6_HEADER_SIZE      sizeof (EFI_UDP_HEADER)\r
-#define UDP6_MAX_DATA_SIZE    65507\r
-#define UDP6_PORT_KNOWN       1024\r
+#define UDP6_TIMEOUT_INTERVAL  (50 * TICKS_PER_MS)\r
+#define UDP6_HEADER_SIZE       sizeof (EFI_UDP_HEADER)\r
+#define UDP6_MAX_DATA_SIZE     65507\r
+#define UDP6_PORT_KNOWN        1024\r
 \r
-#define UDP6_SERVICE_DATA_SIGNATURE SIGNATURE_32 ('U', 'd', 'p', '6')\r
+#define UDP6_SERVICE_DATA_SIGNATURE   SIGNATURE_32 ('U', 'd', 'p', '6')\r
 #define UDP6_INSTANCE_DATA_SIGNATURE  SIGNATURE_32 ('U', 'd', 'p', 'S')\r
 \r
 #define UDP6_SERVICE_DATA_FROM_THIS(a) \\r
@@ -65,47 +65,47 @@ extern UINT16                         mUdp6RandomPort;
 // Udp6 service contest data\r
 //\r
 typedef struct _UDP6_SERVICE_DATA {\r
-  UINT32                        Signature;\r
-  EFI_SERVICE_BINDING_PROTOCOL  ServiceBinding;\r
-  EFI_HANDLE                    ImageHandle;\r
-  EFI_HANDLE                    ControllerHandle;\r
-  LIST_ENTRY                    ChildrenList;\r
-  UINTN                         ChildrenNumber;\r
-  IP_IO                         *IpIo;\r
-  EFI_EVENT                     TimeoutEvent;\r
- } UDP6_SERVICE_DATA;\r
+  UINT32                          Signature;\r
+  EFI_SERVICE_BINDING_PROTOCOL    ServiceBinding;\r
+  EFI_HANDLE                      ImageHandle;\r
+  EFI_HANDLE                      ControllerHandle;\r
+  LIST_ENTRY                      ChildrenList;\r
+  UINTN                           ChildrenNumber;\r
+  IP_IO                           *IpIo;\r
+  EFI_EVENT                       TimeoutEvent;\r
+} UDP6_SERVICE_DATA;\r
 \r
 typedef struct _UDP6_INSTANCE_DATA {\r
-  UINT32                Signature;\r
-  LIST_ENTRY            Link;\r
-  UDP6_SERVICE_DATA     *Udp6Service;\r
-  EFI_UDP6_PROTOCOL     Udp6Proto;\r
-  EFI_UDP6_CONFIG_DATA  ConfigData;\r
-  EFI_HANDLE            ChildHandle;\r
-  BOOLEAN               Configured;\r
-  BOOLEAN               IsNoMapping;\r
-  NET_MAP               TxTokens;\r
-  NET_MAP               RxTokens;\r
-  NET_MAP               McastIps;\r
-  LIST_ENTRY            RcvdDgramQue;\r
-  LIST_ENTRY            DeliveredDgramQue;\r
-  UINT16                HeadSum;\r
-  EFI_STATUS            IcmpError;\r
-  IP_IO_IP_INFO         *IpInfo;\r
-  BOOLEAN               InDestroy;\r
+  UINT32                  Signature;\r
+  LIST_ENTRY              Link;\r
+  UDP6_SERVICE_DATA       *Udp6Service;\r
+  EFI_UDP6_PROTOCOL       Udp6Proto;\r
+  EFI_UDP6_CONFIG_DATA    ConfigData;\r
+  EFI_HANDLE              ChildHandle;\r
+  BOOLEAN                 Configured;\r
+  BOOLEAN                 IsNoMapping;\r
+  NET_MAP                 TxTokens;\r
+  NET_MAP                 RxTokens;\r
+  NET_MAP                 McastIps;\r
+  LIST_ENTRY              RcvdDgramQue;\r
+  LIST_ENTRY              DeliveredDgramQue;\r
+  UINT16                  HeadSum;\r
+  EFI_STATUS              IcmpError;\r
+  IP_IO_IP_INFO           *IpInfo;\r
+  BOOLEAN                 InDestroy;\r
 } UDP6_INSTANCE_DATA;\r
 \r
 typedef struct _UDP6_RXDATA_WRAP {\r
-  LIST_ENTRY             Link;\r
-  NET_BUF                *Packet;\r
-  UINT32                 TimeoutTick;\r
-  EFI_UDP6_RECEIVE_DATA  RxData;\r
+  LIST_ENTRY               Link;\r
+  NET_BUF                  *Packet;\r
+  UINT32                   TimeoutTick;\r
+  EFI_UDP6_RECEIVE_DATA    RxData;\r
 } UDP6_RXDATA_WRAP;\r
 \r
 typedef struct {\r
-  EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
-  UINTN                         NumberOfChildren;\r
-  EFI_HANDLE                    *ChildHandleBuffer;\r
+  EFI_SERVICE_BINDING_PROTOCOL    *ServiceBinding;\r
+  UINTN                           NumberOfChildren;\r
+  EFI_HANDLE                      *ChildHandleBuffer;\r
 } UDP6_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT;\r
 \r
 /**\r
@@ -458,8 +458,8 @@ Udp6Bind (
 **/\r
 VOID\r
 Udp6BuildIp6ConfigData (\r
-  IN EFI_UDP6_CONFIG_DATA      *Udp6ConfigData,\r
-  IN OUT EFI_IP6_CONFIG_DATA   *Ip6ConfigData\r
+  IN EFI_UDP6_CONFIG_DATA     *Udp6ConfigData,\r
+  IN OUT EFI_IP6_CONFIG_DATA  *Ip6ConfigData\r
   );\r
 \r
 /**\r
@@ -600,8 +600,8 @@ Udp6NetVectorExtFree (
 **/\r
 UINT16\r
 Udp6Checksum (\r
-  IN NET_BUF *Packet,\r
-  IN UINT16  HeadSum\r
+  IN NET_BUF  *Packet,\r
+  IN UINT16   HeadSum\r
   );\r
 \r
 /**\r
@@ -645,4 +645,3 @@ Udp6FlushRcvdDgram (
   );\r
 \r
 #endif\r
-\r
index a33eb3c8cfdec52df6cc5b66b0477181402c9170..e64319fafbfde1b580b88d02963de3c08fde4be1 100644 (file)
@@ -19,7 +19,6 @@ EFI_UDP6_PROTOCOL  mUdp6Protocol = {
   Udp6Poll\r
 };\r
 \r
-\r
 /**\r
   This function copies the current operational settings of this EFI UDPv6 Protocol\r
   instance into user-supplied buffers. This function is used optionally to retrieve\r
@@ -91,7 +90,6 @@ Udp6GetModeData (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is used to do the following:\r
   Initialize and start this instance of the EFI UDPv6 Protocol.\r
@@ -159,16 +157,16 @@ Udp6Configure (
   Status      = EFI_SUCCESS;\r
   ASSERT (Udp6Service != NULL);\r
 \r
-  OldTpl      = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   if (UdpConfigData != NULL) {\r
-\r
     IP6_COPY_ADDRESS (&StationAddress, &UdpConfigData->StationAddress);\r
     IP6_COPY_ADDRESS (&RemoteAddress, &UdpConfigData->RemoteAddress);\r
 \r
     if ((!NetIp6IsUnspecifiedAddr (&StationAddress) && !NetIp6IsValidUnicast (&StationAddress)) ||\r
         (!NetIp6IsUnspecifiedAddr (&RemoteAddress) && !NetIp6IsValidUnicast (&RemoteAddress))\r
-        ){\r
+        )\r
+    {\r
       //\r
       // If not use default address, and StationAddress is not a valid unicast\r
       // if it is not IPv6 address or RemoteAddress is not a valid unicast IPv6\r
@@ -286,7 +284,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is used to enable and disable the multicast group filtering.\r
 \r
@@ -348,12 +345,13 @@ Udp6Groups (
     if (McastIp != NULL) {\r
       FreePool (McastIp);\r
     }\r
+\r
     return EFI_NOT_STARTED;\r
   }\r
 \r
-  Ip      = Instance->IpInfo->Ip.Ip6;\r
+  Ip = Instance->IpInfo->Ip.Ip6;\r
 \r
-  OldTpl  = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   //\r
   // Invoke the Ip instance the Udp6 instance consumes to do the group operation.\r
@@ -371,10 +369,8 @@ Udp6Groups (
   // the multicast datagrams destinated to multicast IPs the other instances configured.\r
   //\r
   if (JoinFlag) {\r
-\r
-    Status = NetMapInsertTail (&Instance->McastIps, (VOID *) McastIp, NULL);\r
+    Status = NetMapInsertTail (&Instance->McastIps, (VOID *)McastIp, NULL);\r
   } else {\r
-\r
     Status = NetMapIterate (&Instance->McastIps, Udp6LeaveGroup, MulticastAddress);\r
     if ((MulticastAddress != NULL) && (Status == EFI_ABORTED)) {\r
       Status = EFI_SUCCESS;\r
@@ -394,8 +390,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
-\r
 /**\r
   This function places a sending request to this instance of the EFI UDPv6 Protocol,\r
   alongside the transmit data that was filled by the user.\r
@@ -490,7 +484,8 @@ Udp6Transmit (
 \r
   if (EFI_ERROR (NetMapIterate (&Instance->TxTokens, Udp6TokenExist, Token)) ||\r
       EFI_ERROR (NetMapIterate (&Instance->RxTokens, Udp6TokenExist, Token))\r
-      ){\r
+      )\r
+  {\r
     //\r
     // Try to find a duplicate token in the two token maps, if found, return\r
     // EFI_ACCESS_DENIED.\r
@@ -505,7 +500,7 @@ Udp6Transmit (
   // Create a net buffer to hold the user buffer and the udp header.\r
   //\r
   Packet = NetbufFromExt (\r
-             (NET_FRAGMENT *) TxData->FragmentTable,\r
+             (NET_FRAGMENT *)TxData->FragmentTable,\r
              TxData->FragmentCount,\r
              UDP6_HEADER_SIZE,\r
              0,\r
@@ -520,10 +515,10 @@ Udp6Transmit (
   //\r
   // Store the IpIo in ProtoData.\r
   //\r
-  Udp6Service                        = Instance->Udp6Service;\r
-  *((UINTN *) &Packet->ProtoData[0]) = (UINTN) (Udp6Service->IpIo);\r
+  Udp6Service                       = Instance->Udp6Service;\r
+  *((UINTN *)&Packet->ProtoData[0]) = (UINTN)(Udp6Service->IpIo);\r
 \r
-  Udp6Header = (EFI_UDP_HEADER *) NetbufAllocSpace (Packet, UDP6_HEADER_SIZE, TRUE);\r
+  Udp6Header = (EFI_UDP_HEADER *)NetbufAllocSpace (Packet, UDP6_HEADER_SIZE, TRUE);\r
   ASSERT (Udp6Header != NULL);\r
   if (Udp6Header == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
@@ -535,10 +530,10 @@ Udp6Transmit (
   //\r
   // Fill the udp header.\r
   //\r
-  Udp6Header->SrcPort      = HTONS (ConfigData->StationPort);\r
-  Udp6Header->DstPort      = HTONS (ConfigData->RemotePort);\r
-  Udp6Header->Length       = HTONS ((UINT16) Packet->TotalSize);\r
-  Udp6Header->Checksum     = 0;\r
+  Udp6Header->SrcPort  = HTONS (ConfigData->StationPort);\r
+  Udp6Header->DstPort  = HTONS (ConfigData->RemotePort);\r
+  Udp6Header->Length   = HTONS ((UINT16)Packet->TotalSize);\r
+  Udp6Header->Checksum = 0;\r
   //\r
   // Set the UDP Header in NET_BUF, this UDP header is for IP6 can fast get the\r
   // Udp header for pseudoHeadCheckSum.\r
@@ -564,7 +559,7 @@ Udp6Transmit (
     }\r
 \r
     //\r
-    //Calculate the pseudo head checksum using the overridden parameters.\r
+    // Calculate the pseudo head checksum using the overridden parameters.\r
     //\r
     if (!NetIp6IsUnspecifiedAddr (&ConfigData->StationAddress)) {\r
       HeadSum = NetIp6PseudoHeadChecksum (\r
@@ -590,7 +585,6 @@ Udp6Transmit (
       // and the Ipv6 will fill the correct value of this checksum.\r
       //\r
       Udp6Header->Checksum = 0;\r
-\r
     }\r
   } else {\r
     //\r
@@ -611,8 +605,6 @@ Udp6Transmit (
     }\r
   }\r
 \r
-\r
-\r
   //\r
   // Fill the IpIo Override data.\r
   //\r
@@ -631,7 +623,7 @@ Udp6Transmit (
   //\r
   // Send out this datagram through IpIo.\r
   //\r
-  if (UdpSessionData != NULL){\r
+  if (UdpSessionData != NULL) {\r
     IP6_COPY_ADDRESS (&(IpDestAddr.v6), &Destination);\r
   } else {\r
     ZeroMem (&IpDestAddr.v6, sizeof (EFI_IPv6_ADDRESS));\r
@@ -664,7 +656,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function places a completion token into the receive packet queue. This function\r
   is always asynchronous.\r
@@ -717,7 +708,8 @@ Udp6Receive (
 \r
   if (EFI_ERROR (NetMapIterate (&Instance->RxTokens, Udp6TokenExist, Token)) ||\r
       EFI_ERROR (NetMapIterate (&Instance->TxTokens, Udp6TokenExist, Token))\r
-      ){\r
+      )\r
+  {\r
     //\r
     // Return EFI_ACCESS_DENIED if the specified token is already in the TxTokens or\r
     // RxTokens map.\r
@@ -759,7 +751,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is used to abort a pending transmit or receive request.\r
 \r
@@ -821,7 +812,6 @@ Udp6Cancel (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function can be used by network drivers and applications to increase the rate that\r
   data packets are moved between the communications device and the transmit/receive queues.\r
index 75d46b368d9356ec9c04df6721b17df7236558d6..07b8f7d42fff648787439508748c3a5357b16b3b 100644 (file)
@@ -56,7 +56,6 @@ PxeBcComponentNameGetDriverName (
   OUT CHAR16                       **DriverName\r
   );\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user-readable name of the controller\r
   that is being managed by a driver.\r
@@ -135,11 +134,10 @@ PxeBcComponentNameGetControllerName (
   OUT CHAR16                       **ControllerName\r
   );\r
 \r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL    gPxeBcComponentName  = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gPxeBcComponentName = {\r
   PxeBcComponentNameGetDriverName,\r
   PxeBcComponentNameGetControllerName,\r
   "eng"\r
@@ -148,13 +146,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL    gPxeBcComponentName
 //\r
 // EFI Component Name 2 Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL   gPxeBcComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) PxeBcComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) PxeBcComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gPxeBcComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)PxeBcComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)PxeBcComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE       mPxeBcDriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mPxeBcDriverNameTable[] = {\r
   {\r
     "eng;en",\r
     L"UEFI PXE Base Code Driver"\r
@@ -165,7 +163,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE       mPxeBcDriverNameTab
   }\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE       mPxeBcControllerNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mPxeBcControllerNameTable[] = {\r
   {\r
     "eng;en",\r
     L"PXE Controller"\r
@@ -223,7 +221,7 @@ PxeBcComponentNameGetDriverName (
   OUT CHAR16                       **DriverName\r
   )\r
 {\r
-  return LookupUnicodeString2(\r
+  return LookupUnicodeString2 (\r
            Language,\r
            This->SupportedLanguages,\r
            mPxeBcDriverNameTable,\r
@@ -232,7 +230,6 @@ PxeBcComponentNameGetDriverName (
            );\r
 }\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user-readable name of the controller\r
   that is being managed by a driver.\r
@@ -311,11 +308,11 @@ PxeBcComponentNameGetControllerName (
   OUT CHAR16                       **ControllerName\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_HANDLE                      NicHandle;\r
-  PXEBC_PRIVATE_PROTOCOL          *Id;\r
+  EFI_STATUS              Status;\r
+  EFI_HANDLE              NicHandle;\r
+  PXEBC_PRIVATE_PROTOCOL  *Id;\r
 \r
-  if (ControllerHandle == NULL || ChildHandle != NULL) {\r
+  if ((ControllerHandle == NULL) || (ChildHandle != NULL)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -333,7 +330,7 @@ PxeBcComponentNameGetControllerName (
   Status = gBS->OpenProtocol (\r
                   NicHandle,\r
                   &gEfiCallerIdGuid,\r
-                  (VOID **) &Id,\r
+                  (VOID **)&Id,\r
                   NULL,\r
                   NULL,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
index d062a526077b270d35867d22012578e58445bd29..f22a151e256dd7efd235d7d8ed78cd50137bc9e1 100644 (file)
@@ -10,7 +10,6 @@
 \r
 #include "PxeBcImpl.h"\r
 \r
-\r
 /**\r
   Display the string of the boot item.\r
 \r
 **/\r
 VOID\r
 PxeBcDisplayBootItem (\r
-  IN UINT8                 *Str,\r
-  IN UINT8                 Len\r
+  IN UINT8  *Str,\r
+  IN UINT8  Len\r
   )\r
 {\r
-  UINT8                    Tmp;\r
+  UINT8  Tmp;\r
 \r
   //\r
   // Cut off the chars behind 70th.\r
   //\r
-  Len       = (UINT8) MIN (PXEBC_DISPLAY_MAX_LINE, Len);\r
-  Tmp       = Str[Len];\r
-  Str[Len]  = 0;\r
+  Len      = (UINT8)MIN (PXEBC_DISPLAY_MAX_LINE, Len);\r
+  Tmp      = Str[Len];\r
+  Str[Len] = 0;\r
   AsciiPrint ("%a \n", Str);\r
 \r
   //\r
   // Restore the original 70th char.\r
   //\r
-  Str[Len]  = Tmp;\r
+  Str[Len] = Tmp;\r
 }\r
 \r
-\r
 /**\r
   Select and maintain the boot prompt if needed.\r
 \r
@@ -57,22 +55,22 @@ PxeBcDisplayBootItem (
 **/\r
 EFI_STATUS\r
 PxeBcSelectBootPrompt (\r
-  IN PXEBC_PRIVATE_DATA      *Private\r
+  IN PXEBC_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  PXEBC_DHCP_PACKET_CACHE    *Cache;\r
-  PXEBC_VENDOR_OPTION        *VendorOpt;\r
-  EFI_PXE_BASE_CODE_MODE     *Mode;\r
-  EFI_EVENT                  TimeoutEvent;\r
-  EFI_EVENT                  DescendEvent;\r
-  EFI_INPUT_KEY              InputKey;\r
-  EFI_STATUS                 Status;\r
-  UINT32                     OfferType;\r
-  UINT8                      Timeout;\r
-  UINT8                      *Prompt;\r
-  UINT8                      PromptLen;\r
-  INT32                      SecCol;\r
-  INT32                      SecRow;\r
+  PXEBC_DHCP_PACKET_CACHE  *Cache;\r
+  PXEBC_VENDOR_OPTION      *VendorOpt;\r
+  EFI_PXE_BASE_CODE_MODE   *Mode;\r
+  EFI_EVENT                TimeoutEvent;\r
+  EFI_EVENT                DescendEvent;\r
+  EFI_INPUT_KEY            InputKey;\r
+  EFI_STATUS               Status;\r
+  UINT32                   OfferType;\r
+  UINT8                    Timeout;\r
+  UINT8                    *Prompt;\r
+  UINT8                    PromptLen;\r
+  INT32                    SecCol;\r
+  INT32                    SecRow;\r
 \r
   TimeoutEvent = NULL;\r
   DescendEvent = NULL;\r
@@ -83,7 +81,7 @@ PxeBcSelectBootPrompt (
   //\r
   // Only DhcpPxe10 and ProxyPxe10 offer needs boot prompt.\r
   //\r
-  if (OfferType != PxeOfferTypeProxyPxe10 && OfferType != PxeOfferTypeDhcpPxe10) {\r
+  if ((OfferType != PxeOfferTypeProxyPxe10) && (OfferType != PxeOfferTypeDhcpPxe10)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -100,7 +98,8 @@ PxeBcSelectBootPrompt (
   //   - a boot file name has been presented in the initial DHCP or ProxyDHCP offer packet.\r
   //\r
   if (IS_DISABLE_PROMPT_MENU (VendorOpt->DiscoverCtrl) &&\r
-      Cache->Dhcp4.OptList[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] != NULL) {\r
+      (Cache->Dhcp4.OptList[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] != NULL))\r
+  {\r
     return EFI_ABORTED;\r
   }\r
 \r
@@ -110,7 +109,7 @@ PxeBcSelectBootPrompt (
 \r
   Timeout   = VendorOpt->MenuPrompt->Timeout;\r
   Prompt    = VendorOpt->MenuPrompt->Prompt;\r
-  PromptLen = (UINT8) (VendorOpt->MenuPromptLen - 1);\r
+  PromptLen = (UINT8)(VendorOpt->MenuPromptLen - 1);\r
 \r
   //\r
   // The valid scope of Timeout refers to PXE2.1 spec.\r
@@ -118,6 +117,7 @@ PxeBcSelectBootPrompt (
   if (Timeout == 0) {\r
     return EFI_TIMEOUT;\r
   }\r
+\r
   if (Timeout == 255) {\r
     return EFI_SUCCESS;\r
   }\r
@@ -185,46 +185,43 @@ PxeBcSelectBootPrompt (
       gST->ConOut->SetCursorPosition (gST->ConOut, SecCol + PromptLen, SecRow);\r
       AsciiPrint ("(%d) ", Timeout--);\r
     }\r
+\r
     if (gST->ConIn->ReadKeyStroke (gST->ConIn, &InputKey) == EFI_NOT_READY) {\r
       gBS->Stall (10 * TICKS_PER_MS);\r
       continue;\r
     }\r
+\r
     //\r
     // Parse the input key by user.\r
     // If <F8> or <Ctrl> + <M> is pressed, return success to display the boot menu.\r
     //\r
     if (InputKey.ScanCode == 0) {\r
-\r
       switch (InputKey.UnicodeChar) {\r
+        case CTRL ('c'):\r
+          Status = EFI_ABORTED;\r
+          break;\r
 \r
-      case CTRL ('c'):\r
-        Status = EFI_ABORTED;\r
-        break;\r
-\r
-      case CTRL ('m'):\r
-      case 'm':\r
-      case 'M':\r
-        Status = EFI_SUCCESS;\r
-        break;\r
+        case CTRL ('m'):\r
+        case 'm':\r
+        case 'M':\r
+          Status = EFI_SUCCESS;\r
+          break;\r
 \r
-      default:\r
-        continue;\r
+        default:\r
+          continue;\r
       }\r
-\r
     } else {\r
-\r
       switch (InputKey.ScanCode) {\r
+        case SCAN_F8:\r
+          Status = EFI_SUCCESS;\r
+          break;\r
 \r
-      case SCAN_F8:\r
-        Status = EFI_SUCCESS;\r
-        break;\r
-\r
-      case SCAN_ESC:\r
-        Status = EFI_ABORTED;\r
-        break;\r
+        case SCAN_ESC:\r
+          Status = EFI_ABORTED;\r
+          break;\r
 \r
-      default:\r
-        continue;\r
+        default:\r
+          continue;\r
       }\r
     }\r
 \r
@@ -234,12 +231,13 @@ PxeBcSelectBootPrompt (
   //\r
   // Reset the cursor on the screen.\r
   //\r
-  gST->ConOut->SetCursorPosition (gST->ConOut, 0 , SecRow + 1);\r
+  gST->ConOut->SetCursorPosition (gST->ConOut, 0, SecRow + 1);\r
 \r
 ON_EXIT:\r
   if (DescendEvent != NULL) {\r
     gBS->CloseEvent (DescendEvent);\r
   }\r
+\r
   if (TimeoutEvent != NULL) {\r
     gBS->CloseEvent (TimeoutEvent);\r
   }\r
@@ -247,7 +245,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Select the boot menu by user's input.\r
 \r
@@ -262,26 +259,26 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 PxeBcSelectBootMenu (\r
-  IN  PXEBC_PRIVATE_DATA              *Private,\r
-  OUT UINT16                          *Type,\r
-  IN  BOOLEAN                         UseDefaultItem\r
+  IN  PXEBC_PRIVATE_DATA  *Private,\r
+  OUT UINT16              *Type,\r
+  IN  BOOLEAN             UseDefaultItem\r
   )\r
 {\r
-  EFI_PXE_BASE_CODE_MODE     *Mode;\r
-  PXEBC_DHCP_PACKET_CACHE    *Cache;\r
-  PXEBC_VENDOR_OPTION        *VendorOpt;\r
-  EFI_INPUT_KEY              InputKey;\r
-  UINT32                     OfferType;\r
-  UINT8                      MenuSize;\r
-  UINT8                      MenuNum;\r
-  INT32                      TopRow;\r
-  UINT16                     Select;\r
-  UINT16                     LastSelect;\r
-  UINT8                      Index;\r
-  BOOLEAN                    Finish;\r
-  CHAR8                      Blank[PXEBC_DISPLAY_MAX_LINE];\r
-  PXEBC_BOOT_MENU_ENTRY      *MenuItem;\r
-  PXEBC_BOOT_MENU_ENTRY      *MenuArray[PXEBC_MENU_MAX_NUM];\r
+  EFI_PXE_BASE_CODE_MODE   *Mode;\r
+  PXEBC_DHCP_PACKET_CACHE  *Cache;\r
+  PXEBC_VENDOR_OPTION      *VendorOpt;\r
+  EFI_INPUT_KEY            InputKey;\r
+  UINT32                   OfferType;\r
+  UINT8                    MenuSize;\r
+  UINT8                    MenuNum;\r
+  INT32                    TopRow;\r
+  UINT16                   Select;\r
+  UINT16                   LastSelect;\r
+  UINT8                    Index;\r
+  BOOLEAN                  Finish;\r
+  CHAR8                    Blank[PXEBC_DISPLAY_MAX_LINE];\r
+  PXEBC_BOOT_MENU_ENTRY    *MenuItem;\r
+  PXEBC_BOOT_MENU_ENTRY    *MenuArray[PXEBC_MENU_MAX_NUM];\r
 \r
   Finish    = FALSE;\r
   Select    = 0;\r
@@ -305,10 +302,10 @@ PxeBcSelectBootMenu (
   //\r
   // Display the boot menu on the screen.\r
   //\r
-  SetMem (Blank, sizeof(Blank), ' ');\r
+  SetMem (Blank, sizeof (Blank), ' ');\r
 \r
-  MenuSize  = VendorOpt->BootMenuLen;\r
-  MenuItem  = VendorOpt->BootMenu;\r
+  MenuSize = VendorOpt->BootMenuLen;\r
+  MenuItem = VendorOpt->BootMenu;\r
 \r
   if (MenuSize == 0) {\r
     return EFI_DEVICE_ERROR;\r
@@ -316,9 +313,9 @@ PxeBcSelectBootMenu (
 \r
   while (MenuSize > 0 && Index < PXEBC_MENU_MAX_NUM) {\r
     ASSERT (MenuItem != NULL);\r
-    MenuArray[Index]  = MenuItem;\r
-    MenuSize          = (UINT8) (MenuSize - (MenuItem->DescLen + 3));\r
-    MenuItem          = (PXEBC_BOOT_MENU_ENTRY *) ((UINT8 *) MenuItem + MenuItem->DescLen + 3);\r
+    MenuArray[Index] = MenuItem;\r
+    MenuSize         = (UINT8)(MenuSize - (MenuItem->DescLen + 3));\r
+    MenuItem         = (PXEBC_BOOT_MENU_ENTRY *)((UINT8 *)MenuItem + MenuItem->DescLen + 3);\r
     Index++;\r
   }\r
 \r
@@ -361,60 +358,62 @@ PxeBcSelectBootMenu (
 \r
     if (InputKey.ScanCode == 0) {\r
       switch (InputKey.UnicodeChar) {\r
-      case CTRL ('c'):\r
-        InputKey.ScanCode = SCAN_ESC;\r
-        break;\r
+        case CTRL ('c'):\r
+          InputKey.ScanCode = SCAN_ESC;\r
+          break;\r
 \r
-      case CTRL ('j'):  /* linefeed */\r
-      case CTRL ('m'):  /* return */\r
-        Finish = TRUE;\r
-        break;\r
+        case CTRL ('j'): /* linefeed */\r
+        case CTRL ('m'): /* return */\r
+          Finish = TRUE;\r
+          break;\r
 \r
-      case CTRL ('i'):  /* tab */\r
-      case ' ':\r
-      case 'd':\r
-      case 'D':\r
-        InputKey.ScanCode = SCAN_DOWN;\r
-        break;\r
+        case CTRL ('i'): /* tab */\r
+        case ' ':\r
+        case 'd':\r
+        case 'D':\r
+          InputKey.ScanCode = SCAN_DOWN;\r
+          break;\r
 \r
-      case CTRL ('h'):  /* backspace */\r
-      case 'u':\r
-      case 'U':\r
-        InputKey.ScanCode = SCAN_UP;\r
-        break;\r
+        case CTRL ('h'): /* backspace */\r
+        case 'u':\r
+        case 'U':\r
+          InputKey.ScanCode = SCAN_UP;\r
+          break;\r
 \r
-      default:\r
-        InputKey.ScanCode = 0;\r
+        default:\r
+          InputKey.ScanCode = 0;\r
       }\r
     }\r
 \r
     switch (InputKey.ScanCode) {\r
-    case SCAN_LEFT:\r
-    case SCAN_UP:\r
-      if (Select != 0) {\r
-        Select--;\r
-      }\r
-      break;\r
+      case SCAN_LEFT:\r
+      case SCAN_UP:\r
+        if (Select != 0) {\r
+          Select--;\r
+        }\r
 \r
-    case SCAN_DOWN:\r
-    case SCAN_RIGHT:\r
-      if (++Select == MenuNum) {\r
-        Select--;\r
-      }\r
-      break;\r
+        break;\r
 \r
-    case SCAN_PAGE_UP:\r
-    case SCAN_HOME:\r
-      Select = 0;\r
-      break;\r
+      case SCAN_DOWN:\r
+      case SCAN_RIGHT:\r
+        if (++Select == MenuNum) {\r
+          Select--;\r
+        }\r
 \r
-    case SCAN_PAGE_DOWN:\r
-    case SCAN_END:\r
-      Select = (UINT16) (MenuNum - 1);\r
-      break;\r
+        break;\r
 \r
-    case SCAN_ESC:\r
-      return EFI_ABORTED;\r
+      case SCAN_PAGE_UP:\r
+      case SCAN_HOME:\r
+        Select = 0;\r
+        break;\r
+\r
+      case SCAN_PAGE_DOWN:\r
+      case SCAN_END:\r
+        Select = (UINT16)(MenuNum - 1);\r
+        break;\r
+\r
+      case SCAN_ESC:\r
+        return EFI_ABORTED;\r
     }\r
 \r
     //\r
@@ -441,7 +440,6 @@ PxeBcSelectBootMenu (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Parse out the boot information from the last Dhcp4 reply packet.\r
 \r
@@ -454,8 +452,8 @@ PxeBcSelectBootMenu (
 **/\r
 EFI_STATUS\r
 PxeBcDhcp4BootInfo (\r
-  IN OUT PXEBC_PRIVATE_DATA   *Private,\r
-     OUT UINT64               *BufferSize\r
+  IN OUT PXEBC_PRIVATE_DATA  *Private,\r
+  OUT UINT64                 *BufferSize\r
   )\r
 {\r
   EFI_PXE_BASE_CODE_PROTOCOL  *PxeBc;\r
@@ -506,7 +504,7 @@ PxeBcDhcp4BootInfo (
   VendorOpt = &Cache4->VendorOpt;\r
   if (IS_DISABLE_PROMPT_MENU (VendorOpt->DiscoverCtrl) && IS_VALID_BOOT_SERVERS (VendorOpt->BitMap)) {\r
     Entry = VendorOpt->BootSvr;\r
-    if (VendorOpt->BootSvrLen >= sizeof (PXEBC_BOOT_SVR_ENTRY) && Entry->IpCnt > 0) {\r
+    if ((VendorOpt->BootSvrLen >= sizeof (PXEBC_BOOT_SVR_ENTRY)) && (Entry->IpCnt > 0)) {\r
       CopyMem (\r
         &Private->ServerIp,\r
         &Entry->IpAddr[0],\r
@@ -514,6 +512,7 @@ PxeBcDhcp4BootInfo (
         );\r
     }\r
   }\r
+\r
   if (Private->ServerIp.Addr[0] == 0) {\r
     //\r
     // ServerIp.Addr[0] equals zero means we failed to get IP address from boot server list.\r
@@ -525,6 +524,7 @@ PxeBcDhcp4BootInfo (
       sizeof (EFI_IPv4_ADDRESS)\r
       );\r
   }\r
+\r
   if (Private->ServerIp.Addr[0] == 0) {\r
     //\r
     // Still failed , use the IP address from option 54.\r
@@ -546,7 +546,7 @@ PxeBcDhcp4BootInfo (
     // Parse the boot file size by option.\r
     //\r
     CopyMem (&Value, Cache4->OptList[PXEBC_DHCP4_TAG_INDEX_BOOTFILE_LEN]->Data, sizeof (Value));\r
-    Value       = NTOHS (Value);\r
+    Value = NTOHS (Value);\r
     //\r
     // The field of boot file size is 512 bytes in unit.\r
     //\r
@@ -572,7 +572,7 @@ PxeBcDhcp4BootInfo (
   //\r
   // Save the value of boot file size.\r
   //\r
-  Private->BootFileSize = (UINTN) *BufferSize;\r
+  Private->BootFileSize = (UINTN)*BufferSize;\r
 \r
   //\r
   // Display all the information: boot server address, boot file name and boot file size.\r
@@ -585,7 +585,6 @@ PxeBcDhcp4BootInfo (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Parse out the boot information from the last Dhcp6 reply packet.\r
 \r
@@ -599,8 +598,8 @@ PxeBcDhcp4BootInfo (
 **/\r
 EFI_STATUS\r
 PxeBcDhcp6BootInfo (\r
-  IN OUT PXEBC_PRIVATE_DATA   *Private,\r
-     OUT UINT64               *BufferSize\r
+  IN OUT PXEBC_PRIVATE_DATA  *Private,\r
+  OUT UINT64                 *BufferSize\r
   )\r
 {\r
   EFI_PXE_BASE_CODE_PROTOCOL  *PxeBc;\r
@@ -648,7 +647,6 @@ PxeBcDhcp6BootInfo (
     return Status;\r
   }\r
 \r
-\r
   //\r
   // Parse (m)tftp server ip address and bootfile name.\r
   //\r
@@ -656,7 +654,7 @@ PxeBcDhcp6BootInfo (
              Private,\r
              &Private->BootFileName,\r
              &Private->ServerIp.v6,\r
-             (CHAR8 *) (Cache6->OptList[PXEBC_DHCP6_IDX_BOOT_FILE_URL]->Data),\r
+             (CHAR8 *)(Cache6->OptList[PXEBC_DHCP6_IDX_BOOT_FILE_URL]->Data),\r
              NTOHS (Cache6->OptList[PXEBC_DHCP6_IDX_BOOT_FILE_URL]->OpLen)\r
              );\r
   if (EFI_ERROR (Status)) {\r
@@ -670,10 +668,11 @@ PxeBcDhcp6BootInfo (
     //\r
     // Parse it out if have the boot file parameter option.\r
     //\r
-    Status = PxeBcExtractBootFileParam ((CHAR8 *) Cache6->OptList[PXEBC_DHCP6_IDX_BOOT_FILE_PARAM]->Data, &Value);\r
+    Status = PxeBcExtractBootFileParam ((CHAR8 *)Cache6->OptList[PXEBC_DHCP6_IDX_BOOT_FILE_PARAM]->Data, &Value);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     //\r
     // The field of boot file size is 512 bytes in unit.\r
     //\r
@@ -699,7 +698,7 @@ PxeBcDhcp6BootInfo (
   //\r
   // Save the value of boot file size.\r
   //\r
-  Private->BootFileSize = (UINTN) *BufferSize;\r
+  Private->BootFileSize = (UINTN)*BufferSize;\r
 \r
   //\r
   // Display all the information: boot server address, boot file name and boot file size.\r
@@ -712,7 +711,6 @@ PxeBcDhcp6BootInfo (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Extract the discover information and boot server entry from the\r
   cached packets if unspecified.\r
@@ -732,17 +730,17 @@ PxeBcExtractDiscoverInfo (
   IN     PXEBC_PRIVATE_DATA               *Private,\r
   IN     UINT16                           Type,\r
   IN OUT EFI_PXE_BASE_CODE_DISCOVER_INFO  **DiscoverInfo,\r
-     OUT PXEBC_BOOT_SVR_ENTRY             **BootEntry,\r
-     OUT EFI_PXE_BASE_CODE_SRVLIST        **SrvList\r
+  OUT PXEBC_BOOT_SVR_ENTRY                **BootEntry,\r
+  OUT EFI_PXE_BASE_CODE_SRVLIST           **SrvList\r
   )\r
 {\r
-  EFI_PXE_BASE_CODE_MODE          *Mode;\r
-  PXEBC_DHCP4_PACKET_CACHE        *Cache4;\r
-  PXEBC_VENDOR_OPTION             *VendorOpt;\r
-  PXEBC_BOOT_SVR_ENTRY            *Entry;\r
-  BOOLEAN                         IsFound;\r
-  EFI_PXE_BASE_CODE_DISCOVER_INFO *Info;\r
-  UINT16                          Index;\r
+  EFI_PXE_BASE_CODE_MODE           *Mode;\r
+  PXEBC_DHCP4_PACKET_CACHE         *Cache4;\r
+  PXEBC_VENDOR_OPTION              *VendorOpt;\r
+  PXEBC_BOOT_SVR_ENTRY             *Entry;\r
+  BOOLEAN                          IsFound;\r
+  EFI_PXE_BASE_CODE_DISCOVER_INFO  *Info;\r
+  UINT16                           Index;\r
 \r
   Mode = Private->PxeBc.Mode;\r
   Info = *DiscoverInfo;\r
@@ -759,7 +757,7 @@ PxeBcExtractDiscoverInfo (
     //\r
     CopyMem (&Info->SrvList[0].IpAddr, &Private->ServerIp, sizeof (EFI_IP_ADDRESS));\r
 \r
-    *SrvList  = Info->SrvList;\r
+    *SrvList = Info->SrvList;\r
   } else {\r
     Entry     = NULL;\r
     IsFound   = FALSE;\r
@@ -778,8 +776,8 @@ PxeBcExtractDiscoverInfo (
     //\r
     Info->UseMCast    = (BOOLEAN) !IS_DISABLE_MCAST_DISCOVER (VendorOpt->DiscoverCtrl);\r
     Info->UseBCast    = (BOOLEAN) !IS_DISABLE_BCAST_DISCOVER (VendorOpt->DiscoverCtrl);\r
-    Info->MustUseList = (BOOLEAN) IS_ENABLE_USE_SERVER_LIST (VendorOpt->DiscoverCtrl);\r
-    Info->UseUCast    = (BOOLEAN) IS_VALID_BOOT_SERVERS (VendorOpt->BitMap);\r
+    Info->MustUseList = (BOOLEAN)IS_ENABLE_USE_SERVER_LIST (VendorOpt->DiscoverCtrl);\r
+    Info->UseUCast    = (BOOLEAN)IS_VALID_BOOT_SERVERS (VendorOpt->BitMap);\r
 \r
     if (Info->UseMCast) {\r
       //\r
@@ -793,11 +791,12 @@ PxeBcExtractDiscoverInfo (
     if (Info->UseUCast) {\r
       Entry = VendorOpt->BootSvr;\r
 \r
-      while (((UINT8) (Entry - VendorOpt->BootSvr)) < VendorOpt->BootSvrLen) {\r
+      while (((UINT8)(Entry - VendorOpt->BootSvr)) < VendorOpt->BootSvrLen) {\r
         if (Entry->Type == HTONS (Type)) {\r
           IsFound = TRUE;\r
           break;\r
         }\r
+\r
         Entry = GET_NEXT_BOOT_SVR_ENTRY (Entry);\r
       }\r
 \r
@@ -811,6 +810,7 @@ PxeBcExtractDiscoverInfo (
         if (*DiscoverInfo == NULL) {\r
           return EFI_OUT_OF_RESOURCES;\r
         }\r
+\r
         CopyMem (*DiscoverInfo, Info, sizeof (*Info));\r
         Info = *DiscoverInfo;\r
       }\r
@@ -818,7 +818,7 @@ PxeBcExtractDiscoverInfo (
       for (Index = 0; Index < Info->IpCnt; Index++) {\r
         CopyMem (&Info->SrvList[Index].IpAddr, &Entry->IpAddr[Index], sizeof (EFI_IPv4_ADDRESS));\r
         Info->SrvList[Index].AcceptAnyResponse = !Info->MustUseList;\r
-        Info->SrvList[Index].Type = NTOHS (Entry->Type);\r
+        Info->SrvList[Index].Type              = NTOHS (Entry->Type);\r
       }\r
     }\r
 \r
@@ -829,7 +829,6 @@ PxeBcExtractDiscoverInfo (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Build the discover packet and send out for boot server.\r
 \r
@@ -849,13 +848,13 @@ PxeBcExtractDiscoverInfo (
 **/\r
 EFI_STATUS\r
 PxeBcDiscoverBootServer (\r
-  IN  PXEBC_PRIVATE_DATA                *Private,\r
-  IN  UINT16                            Type,\r
-  IN  UINT16                            *Layer,\r
-  IN  BOOLEAN                           UseBis,\r
-  IN  EFI_IP_ADDRESS                    *DestIp,\r
-  IN  UINT16                            IpCount,\r
-  IN  EFI_PXE_BASE_CODE_SRVLIST         *SrvList\r
+  IN  PXEBC_PRIVATE_DATA         *Private,\r
+  IN  UINT16                     Type,\r
+  IN  UINT16                     *Layer,\r
+  IN  BOOLEAN                    UseBis,\r
+  IN  EFI_IP_ADDRESS             *DestIp,\r
+  IN  UINT16                     IpCount,\r
+  IN  EFI_PXE_BASE_CODE_SRVLIST  *SrvList\r
   )\r
 {\r
   if (Private->PxeBc.Mode->UsingIpv6) {\r
@@ -879,7 +878,6 @@ PxeBcDiscoverBootServer (
   }\r
 }\r
 \r
-\r
 /**\r
   Discover all the boot information for boot file.\r
 \r
@@ -894,8 +892,8 @@ PxeBcDiscoverBootServer (
 **/\r
 EFI_STATUS\r
 PxeBcDiscoverBootFile (\r
-  IN OUT PXEBC_PRIVATE_DATA   *Private,\r
-     OUT UINT64               *BufferSize\r
+  IN OUT PXEBC_PRIVATE_DATA  *Private,\r
+  OUT UINT64                 *BufferSize\r
   )\r
 {\r
   EFI_PXE_BASE_CODE_PROTOCOL  *PxeBc;\r
@@ -937,7 +935,6 @@ PxeBcDiscoverBootFile (
   }\r
 \r
   if (!EFI_ERROR (Status)) {\r
-\r
     if (Type == EFI_PXE_BASE_CODE_BOOT_TYPE_BOOTSTRAP) {\r
       //\r
       // Local boot(PXE bootstrap server) need abort\r
@@ -949,7 +946,7 @@ PxeBcDiscoverBootFile (
     // Start to discover the boot server to get (m)tftp server ip address, bootfile\r
     // name and bootfile size.\r
     //\r
-    UseBis = (BOOLEAN) (Mode->BisSupported && Mode->BisDetected);\r
+    UseBis = (BOOLEAN)(Mode->BisSupported && Mode->BisDetected);\r
     Status = PxeBc->Discover (PxeBc, Type, &Layer, UseBis, NULL);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
@@ -973,6 +970,7 @@ PxeBcDiscoverBootFile (
           Private->PxeReply.Dhcp4.Packet.Ack.Length\r
           );\r
       }\r
+\r
       Mode->ProxyOfferReceived = TRUE;\r
     }\r
   }\r
@@ -989,7 +987,6 @@ PxeBcDiscoverBootFile (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Install PxeBaseCodeCallbackProtocol if not installed before.\r
 \r
@@ -1002,8 +999,8 @@ PxeBcDiscoverBootFile (
 **/\r
 EFI_STATUS\r
 PxeBcInstallCallback (\r
-  IN OUT PXEBC_PRIVATE_DATA   *Private,\r
-     OUT BOOLEAN              *NewMakeCallback\r
+  IN OUT PXEBC_PRIVATE_DATA  *Private,\r
+  OUT BOOLEAN                *NewMakeCallback\r
   )\r
 {\r
   EFI_PXE_BASE_CODE_PROTOCOL  *PxeBc;\r
@@ -1016,10 +1013,9 @@ PxeBcInstallCallback (
   Status = gBS->HandleProtocol (\r
                   Private->Mode.UsingIpv6 ? Private->Ip6Nic->Controller : Private->Ip4Nic->Controller,\r
                   &gEfiPxeBaseCodeCallbackProtocolGuid,\r
-                  (VOID **) &Private->PxeBcCallback\r
+                  (VOID **)&Private->PxeBcCallback\r
                   );\r
   if (Status == EFI_UNSUPPORTED) {\r
-\r
     CopyMem (\r
       &Private->LoadFileCallback,\r
       &gPxeBcCallBackTemplate,\r
@@ -1036,7 +1032,7 @@ PxeBcInstallCallback (
                     &Private->LoadFileCallback\r
                     );\r
 \r
-    (*NewMakeCallback) = (BOOLEAN) (Status == EFI_SUCCESS);\r
+    (*NewMakeCallback) = (BOOLEAN)(Status == EFI_SUCCESS);\r
 \r
     Status = PxeBc->SetParameters (PxeBc, NULL, NULL, NULL, NULL, NewMakeCallback);\r
     if (EFI_ERROR (Status)) {\r
@@ -1048,7 +1044,6 @@ PxeBcInstallCallback (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Uninstall PxeBaseCodeCallbackProtocol.\r
 \r
@@ -1059,29 +1054,27 @@ PxeBcInstallCallback (
 **/\r
 VOID\r
 PxeBcUninstallCallback (\r
-  IN PXEBC_PRIVATE_DATA        *Private,\r
-  IN BOOLEAN                   NewMakeCallback\r
+  IN PXEBC_PRIVATE_DATA  *Private,\r
+  IN BOOLEAN             NewMakeCallback\r
   )\r
 {\r
-  EFI_PXE_BASE_CODE_PROTOCOL   *PxeBc;\r
+  EFI_PXE_BASE_CODE_PROTOCOL  *PxeBc;\r
 \r
   PxeBc = &Private->PxeBc;\r
 \r
   if (NewMakeCallback) {\r
-\r
     NewMakeCallback = FALSE;\r
 \r
     PxeBc->SetParameters (PxeBc, NULL, NULL, NULL, NULL, &NewMakeCallback);\r
 \r
     gBS->UninstallProtocolInterface (\r
-          Private->Mode.UsingIpv6 ? Private->Ip6Nic->Controller : Private->Ip4Nic->Controller,\r
-          &gEfiPxeBaseCodeCallbackProtocolGuid,\r
-          &Private->LoadFileCallback\r
-          );\r
+           Private->Mode.UsingIpv6 ? Private->Ip6Nic->Controller : Private->Ip4Nic->Controller,\r
+           &gEfiPxeBaseCodeCallbackProtocolGuid,\r
+           &Private->LoadFileCallback\r
+           );\r
   }\r
 }\r
 \r
-\r
 /**\r
   Download one of boot file in the list, and it's special for IPv6.\r
 \r
@@ -1098,15 +1091,15 @@ PxeBcUninstallCallback (
 **/\r
 EFI_STATUS\r
 PxeBcReadBootFileList (\r
-  IN     PXEBC_PRIVATE_DATA           *Private,\r
-  IN OUT UINT64                       *BufferSize,\r
-  IN     VOID                         *Buffer           OPTIONAL\r
+  IN     PXEBC_PRIVATE_DATA  *Private,\r
+  IN OUT UINT64              *BufferSize,\r
+  IN     VOID                *Buffer           OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                          Status;\r
-  EFI_PXE_BASE_CODE_PROTOCOL          *PxeBc;\r
+  EFI_STATUS                  Status;\r
+  EFI_PXE_BASE_CODE_PROTOCOL  *PxeBc;\r
 \r
-  PxeBc        = &Private->PxeBc;\r
+  PxeBc = &Private->PxeBc;\r
 \r
   //\r
   // Try to download the boot file if everything is ready.\r
@@ -1124,16 +1117,13 @@ PxeBcReadBootFileList (
                       NULL,\r
                       FALSE\r
                       );\r
-\r
-\r
   } else {\r
-    Status      = EFI_BUFFER_TOO_SMALL;\r
+    Status = EFI_BUFFER_TOO_SMALL;\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Load boot file into user buffer.\r
 \r
@@ -1150,17 +1140,17 @@ PxeBcReadBootFileList (
 **/\r
 EFI_STATUS\r
 PxeBcLoadBootFile (\r
-  IN     PXEBC_PRIVATE_DATA           *Private,\r
-  IN OUT UINTN                        *BufferSize,\r
-  IN     VOID                         *Buffer         OPTIONAL\r
+  IN     PXEBC_PRIVATE_DATA  *Private,\r
+  IN OUT UINTN               *BufferSize,\r
+  IN     VOID                *Buffer         OPTIONAL\r
   )\r
 {\r
-  BOOLEAN                             NewMakeCallback;\r
-  UINT64                              RequiredSize;\r
-  UINT64                              CurrentSize;\r
-  EFI_STATUS                          Status;\r
-  EFI_PXE_BASE_CODE_PROTOCOL          *PxeBc;\r
-  EFI_PXE_BASE_CODE_MODE              *PxeBcMode;\r
+  BOOLEAN                     NewMakeCallback;\r
+  UINT64                      RequiredSize;\r
+  UINT64                      CurrentSize;\r
+  EFI_STATUS                  Status;\r
+  EFI_PXE_BASE_CODE_PROTOCOL  *PxeBc;\r
+  EFI_PXE_BASE_CODE_MODE      *PxeBcMode;\r
 \r
   NewMakeCallback = FALSE;\r
   PxeBc           = &Private->PxeBc;\r
@@ -1172,7 +1162,7 @@ PxeBcLoadBootFile (
   // Install pxebc callback protocol if hasn't been installed yet.\r
   //\r
   Status = PxeBcInstallCallback (Private, &NewMakeCallback);\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
@@ -1195,7 +1185,7 @@ PxeBcLoadBootFile (
       //\r
       // Get the right buffer size of the bootfile required.\r
       //\r
-      if (CurrentSize < RequiredSize || Buffer == NULL) {\r
+      if ((CurrentSize < RequiredSize) || (Buffer == NULL)) {\r
         //\r
         // It's buffer too small if the size of user buffer is smaller than the required.\r
         //\r
@@ -1203,8 +1193,9 @@ PxeBcLoadBootFile (
         Status      = EFI_BUFFER_TOO_SMALL;\r
         goto ON_EXIT;\r
       }\r
+\r
       CurrentSize = RequiredSize;\r
-    } else if (RequiredSize == 0 && PxeBcMode->UsingIpv6) {\r
+    } else if ((RequiredSize == 0) && PxeBcMode->UsingIpv6) {\r
       //\r
       // Try to download another bootfile in list if failed to get the filesize of the last one.\r
       // It's special for the case of IPv6.\r
@@ -1212,7 +1203,7 @@ PxeBcLoadBootFile (
       Status = PxeBcReadBootFileList (Private, &CurrentSize, Buffer);\r
       goto ON_EXIT;\r
     }\r
-  } else if (CurrentSize < Private->BootFileSize || Buffer == NULL ) {\r
+  } else if ((CurrentSize < Private->BootFileSize) || (Buffer == NULL)) {\r
     //\r
     // It's buffer too small if the size of user buffer is smaller than the required.\r
     //\r
@@ -1247,13 +1238,13 @@ PxeBcLoadBootFile (
   }\r
 \r
 ON_EXIT:\r
-  *BufferSize = (UINTN) CurrentSize;\r
-  PxeBcUninstallCallback(Private, NewMakeCallback);\r
+  *BufferSize = (UINTN)CurrentSize;\r
+  PxeBcUninstallCallback (Private, NewMakeCallback);\r
 \r
   if (Status == EFI_SUCCESS) {\r
     AsciiPrint ("\n  NBP file downloaded successfully.\n");\r
     return EFI_SUCCESS;\r
-  } else if (Status == EFI_BUFFER_TOO_SMALL && Buffer != NULL) {\r
+  } else if ((Status == EFI_BUFFER_TOO_SMALL) && (Buffer != NULL)) {\r
     AsciiPrint ("\n  PXE-E05: Buffer size is smaller than the requested file.\n");\r
   } else if (Status == EFI_DEVICE_ERROR) {\r
     AsciiPrint ("\n  PXE-E07: Network device error.\n");\r
@@ -1279,4 +1270,3 @@ ON_EXIT:
 \r
   return Status;\r
 }\r
-\r
index 3c73740b968404c320ef2f94d4d9f415c009bfba..ed42a6c3855e3197008b1b908f973111f4d9227e 100644 (file)
 #ifndef __EFI_PXEBC_BOOT_H__\r
 #define __EFI_PXEBC_BOOT_H__\r
 \r
-#define PXEBC_DISPLAY_MAX_LINE             70\r
-#define PXEBC_DEFAULT_UDP_OVERHEAD_SIZE    8\r
-#define PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE   4\r
-\r
-#define PXEBC_IS_SIZE_OVERFLOWED(x)   ((sizeof (UINTN) < sizeof (UINT64)) && ((x) > 0xFFFFFFFF))\r
+#define PXEBC_DISPLAY_MAX_LINE            70\r
+#define PXEBC_DEFAULT_UDP_OVERHEAD_SIZE   8\r
+#define PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE  4\r
 \r
+#define PXEBC_IS_SIZE_OVERFLOWED(x)  ((sizeof (UINTN) < sizeof (UINT64)) && ((x) > 0xFFFFFFFF))\r
 \r
 /**\r
   Extract the discover information and boot server entry from the\r
@@ -36,11 +35,10 @@ PxeBcExtractDiscoverInfo (
   IN     PXEBC_PRIVATE_DATA               *Private,\r
   IN     UINT16                           Type,\r
   IN OUT EFI_PXE_BASE_CODE_DISCOVER_INFO  **DiscoverInfo,\r
-     OUT PXEBC_BOOT_SVR_ENTRY             **BootEntry,\r
-     OUT EFI_PXE_BASE_CODE_SRVLIST        **SrvList\r
+  OUT PXEBC_BOOT_SVR_ENTRY                **BootEntry,\r
+  OUT EFI_PXE_BASE_CODE_SRVLIST           **SrvList\r
   );\r
 \r
-\r
 /**\r
   Build the discover packet and send out for boot.\r
 \r
@@ -60,16 +58,15 @@ PxeBcExtractDiscoverInfo (
 **/\r
 EFI_STATUS\r
 PxeBcDiscoverBootServer (\r
-  IN  PXEBC_PRIVATE_DATA                *Private,\r
-  IN  UINT16                            Type,\r
-  IN  UINT16                            *Layer,\r
-  IN  BOOLEAN                           UseBis,\r
-  IN  EFI_IP_ADDRESS                    *DestIp,\r
-  IN  UINT16                            IpCount,\r
-  IN  EFI_PXE_BASE_CODE_SRVLIST         *SrvList\r
+  IN  PXEBC_PRIVATE_DATA         *Private,\r
+  IN  UINT16                     Type,\r
+  IN  UINT16                     *Layer,\r
+  IN  BOOLEAN                    UseBis,\r
+  IN  EFI_IP_ADDRESS             *DestIp,\r
+  IN  UINT16                     IpCount,\r
+  IN  EFI_PXE_BASE_CODE_SRVLIST  *SrvList\r
   );\r
 \r
-\r
 /**\r
   Load boot file into user buffer.\r
 \r
@@ -86,9 +83,9 @@ PxeBcDiscoverBootServer (
 **/\r
 EFI_STATUS\r
 PxeBcLoadBootFile (\r
-  IN     PXEBC_PRIVATE_DATA           *Private,\r
-  IN OUT UINTN                        *BufferSize,\r
-  IN     VOID                         *Buffer         OPTIONAL\r
+  IN     PXEBC_PRIVATE_DATA  *Private,\r
+  IN OUT UINTN               *BufferSize,\r
+  IN     VOID                *Buffer         OPTIONAL\r
   );\r
 \r
 #endif\r
index 0edf7cc7999079c4bcdfe6d4922158454cfebeda..91146b78cb1e4931b137b8d060ac5f6f043512cb 100644 (file)
@@ -12,7 +12,7 @@
 //\r
 // This is a map from the interested DHCP4 option tags' index to the tag value.\r
 //\r
-UINT8 mInterestedDhcp4Tags[PXEBC_DHCP4_TAG_INDEX_MAX] = {\r
+UINT8  mInterestedDhcp4Tags[PXEBC_DHCP4_TAG_INDEX_MAX] = {\r
   DHCP4_TAG_BOOTFILE_LEN,\r
   DHCP4_TAG_VENDOR,\r
   DHCP4_TAG_OVERLOAD,\r
@@ -25,8 +25,7 @@ UINT8 mInterestedDhcp4Tags[PXEBC_DHCP4_TAG_INDEX_MAX] = {
 //\r
 // There are 4 times retries with the value of 4, 8, 16 and 32, refers to PXE2.1 spec.\r
 //\r
-UINT32 mPxeDhcpTimeout[4] = {4, 8, 16, 32};\r
-\r
+UINT32  mPxeDhcpTimeout[4] = { 4, 8, 16, 32 };\r
 \r
 /**\r
   Parse a certain dhcp4 option by OptTag in Buffer, and return with start pointer.\r
@@ -41,19 +40,18 @@ UINT32 mPxeDhcpTimeout[4] = {4, 8, 16, 32};
 **/\r
 EFI_DHCP4_PACKET_OPTION *\r
 PxeBcParseDhcp4Options (\r
-  IN UINT8                      *Buffer,\r
-  IN UINT32                     Length,\r
-  IN UINT8                      OptTag\r
+  IN UINT8   *Buffer,\r
+  IN UINT32  Length,\r
+  IN UINT8   OptTag\r
   )\r
 {\r
-  EFI_DHCP4_PACKET_OPTION       *Option;\r
-  UINT32                        Offset;\r
+  EFI_DHCP4_PACKET_OPTION  *Option;\r
+  UINT32                   Offset;\r
 \r
-  Option  = (EFI_DHCP4_PACKET_OPTION *) Buffer;\r
-  Offset  = 0;\r
+  Option = (EFI_DHCP4_PACKET_OPTION *)Buffer;\r
+  Offset = 0;\r
 \r
   while (Offset < Length && Option->OpCode != DHCP4_TAG_EOP) {\r
-\r
     if (Option->OpCode == OptTag) {\r
       //\r
       // Found the required option.\r
@@ -70,13 +68,12 @@ PxeBcParseDhcp4Options (
       Offset += Option->Length + 2;\r
     }\r
 \r
-    Option = (EFI_DHCP4_PACKET_OPTION *) (Buffer + Offset);\r
+    Option = (EFI_DHCP4_PACKET_OPTION *)(Buffer + Offset);\r
   }\r
 \r
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Parse the PXE vendor options and extract the information from them.\r
 \r
@@ -86,18 +83,18 @@ PxeBcParseDhcp4Options (
 **/\r
 VOID\r
 PxeBcParseVendorOptions (\r
-  IN EFI_DHCP4_PACKET_OPTION    *Dhcp4Option,\r
-  IN PXEBC_VENDOR_OPTION        *VendorOption\r
+  IN EFI_DHCP4_PACKET_OPTION  *Dhcp4Option,\r
+  IN PXEBC_VENDOR_OPTION      *VendorOption\r
   )\r
 {\r
-  UINT32                        *BitMap;\r
-  UINT8                         VendorOptionLen;\r
-  EFI_DHCP4_PACKET_OPTION       *PxeOption;\r
-  UINT8                         Offset;\r
+  UINT32                   *BitMap;\r
+  UINT8                    VendorOptionLen;\r
+  EFI_DHCP4_PACKET_OPTION  *PxeOption;\r
+  UINT8                    Offset;\r
 \r
   BitMap          = VendorOption->BitMap;\r
   VendorOptionLen = Dhcp4Option->Length;\r
-  PxeOption       = (EFI_DHCP4_PACKET_OPTION *) &Dhcp4Option->Data[0];\r
+  PxeOption       = (EFI_DHCP4_PACKET_OPTION *)&Dhcp4Option->Data[0];\r
   Offset          = 0;\r
 \r
   ASSERT (PxeOption != NULL);\r
@@ -107,84 +104,83 @@ PxeBcParseVendorOptions (
     // Parse all the interesting PXE vendor options one by one.\r
     //\r
     switch (PxeOption->OpCode) {\r
+      case PXEBC_VENDOR_TAG_MTFTP_IP:\r
 \r
-    case PXEBC_VENDOR_TAG_MTFTP_IP:\r
-\r
-      CopyMem (&VendorOption->MtftpIp, PxeOption->Data, sizeof (EFI_IPv4_ADDRESS));\r
-      break;\r
+        CopyMem (&VendorOption->MtftpIp, PxeOption->Data, sizeof (EFI_IPv4_ADDRESS));\r
+        break;\r
 \r
-    case PXEBC_VENDOR_TAG_MTFTP_CPORT:\r
+      case PXEBC_VENDOR_TAG_MTFTP_CPORT:\r
 \r
-      CopyMem (&VendorOption->MtftpCPort, PxeOption->Data, sizeof (VendorOption->MtftpCPort));\r
-      break;\r
+        CopyMem (&VendorOption->MtftpCPort, PxeOption->Data, sizeof (VendorOption->MtftpCPort));\r
+        break;\r
 \r
-    case PXEBC_VENDOR_TAG_MTFTP_SPORT:\r
+      case PXEBC_VENDOR_TAG_MTFTP_SPORT:\r
 \r
-      CopyMem (&VendorOption->MtftpSPort, PxeOption->Data, sizeof (VendorOption->MtftpSPort));\r
-      break;\r
+        CopyMem (&VendorOption->MtftpSPort, PxeOption->Data, sizeof (VendorOption->MtftpSPort));\r
+        break;\r
 \r
-    case PXEBC_VENDOR_TAG_MTFTP_TIMEOUT:\r
+      case PXEBC_VENDOR_TAG_MTFTP_TIMEOUT:\r
 \r
-      VendorOption->MtftpTimeout = *PxeOption->Data;\r
-      break;\r
+        VendorOption->MtftpTimeout = *PxeOption->Data;\r
+        break;\r
 \r
-    case PXEBC_VENDOR_TAG_MTFTP_DELAY:\r
+      case PXEBC_VENDOR_TAG_MTFTP_DELAY:\r
 \r
-      VendorOption->MtftpDelay = *PxeOption->Data;\r
-      break;\r
+        VendorOption->MtftpDelay = *PxeOption->Data;\r
+        break;\r
 \r
-    case PXEBC_VENDOR_TAG_DISCOVER_CTRL:\r
+      case PXEBC_VENDOR_TAG_DISCOVER_CTRL:\r
 \r
-      VendorOption->DiscoverCtrl = *PxeOption->Data;\r
-      break;\r
+        VendorOption->DiscoverCtrl = *PxeOption->Data;\r
+        break;\r
 \r
-    case PXEBC_VENDOR_TAG_DISCOVER_MCAST:\r
+      case PXEBC_VENDOR_TAG_DISCOVER_MCAST:\r
 \r
-      CopyMem (&VendorOption->DiscoverMcastIp, PxeOption->Data, sizeof (EFI_IPv4_ADDRESS));\r
-      break;\r
+        CopyMem (&VendorOption->DiscoverMcastIp, PxeOption->Data, sizeof (EFI_IPv4_ADDRESS));\r
+        break;\r
 \r
-    case PXEBC_VENDOR_TAG_BOOT_SERVERS:\r
+      case PXEBC_VENDOR_TAG_BOOT_SERVERS:\r
 \r
-      VendorOption->BootSvrLen  = PxeOption->Length;\r
-      VendorOption->BootSvr     = (PXEBC_BOOT_SVR_ENTRY *) PxeOption->Data;\r
-      break;\r
+        VendorOption->BootSvrLen = PxeOption->Length;\r
+        VendorOption->BootSvr    = (PXEBC_BOOT_SVR_ENTRY *)PxeOption->Data;\r
+        break;\r
 \r
-    case PXEBC_VENDOR_TAG_BOOT_MENU:\r
+      case PXEBC_VENDOR_TAG_BOOT_MENU:\r
 \r
-      VendorOption->BootMenuLen = PxeOption->Length;\r
-      VendorOption->BootMenu    = (PXEBC_BOOT_MENU_ENTRY *) PxeOption->Data;\r
-      break;\r
+        VendorOption->BootMenuLen = PxeOption->Length;\r
+        VendorOption->BootMenu    = (PXEBC_BOOT_MENU_ENTRY *)PxeOption->Data;\r
+        break;\r
 \r
-    case PXEBC_VENDOR_TAG_MENU_PROMPT:\r
+      case PXEBC_VENDOR_TAG_MENU_PROMPT:\r
 \r
-      VendorOption->MenuPromptLen = PxeOption->Length;\r
-      VendorOption->MenuPrompt    = (PXEBC_MENU_PROMPT *) PxeOption->Data;\r
-      break;\r
+        VendorOption->MenuPromptLen = PxeOption->Length;\r
+        VendorOption->MenuPrompt    = (PXEBC_MENU_PROMPT *)PxeOption->Data;\r
+        break;\r
 \r
-    case PXEBC_VENDOR_TAG_MCAST_ALLOC:\r
+      case PXEBC_VENDOR_TAG_MCAST_ALLOC:\r
 \r
-      CopyMem (&VendorOption->McastIpBase, PxeOption->Data, sizeof (EFI_IPv4_ADDRESS));\r
-      CopyMem (&VendorOption->McastIpBlock, PxeOption->Data + 4, sizeof (VendorOption->McastIpBlock));\r
-      CopyMem (&VendorOption->McastIpRange, PxeOption->Data + 6, sizeof (VendorOption->McastIpRange));\r
-      break;\r
+        CopyMem (&VendorOption->McastIpBase, PxeOption->Data, sizeof (EFI_IPv4_ADDRESS));\r
+        CopyMem (&VendorOption->McastIpBlock, PxeOption->Data + 4, sizeof (VendorOption->McastIpBlock));\r
+        CopyMem (&VendorOption->McastIpRange, PxeOption->Data + 6, sizeof (VendorOption->McastIpRange));\r
+        break;\r
 \r
-    case PXEBC_VENDOR_TAG_CREDENTIAL_TYPES:\r
+      case PXEBC_VENDOR_TAG_CREDENTIAL_TYPES:\r
 \r
-      VendorOption->CredTypeLen = PxeOption->Length;\r
-      VendorOption->CredType    = (UINT32 *) PxeOption->Data;\r
-      break;\r
+        VendorOption->CredTypeLen = PxeOption->Length;\r
+        VendorOption->CredType    = (UINT32 *)PxeOption->Data;\r
+        break;\r
 \r
-    case PXEBC_VENDOR_TAG_BOOT_ITEM:\r
+      case PXEBC_VENDOR_TAG_BOOT_ITEM:\r
 \r
-      CopyMem (&VendorOption->BootSrvType, PxeOption->Data, sizeof (VendorOption->BootSrvType));\r
-      CopyMem (&VendorOption->BootSrvLayer, PxeOption->Data + 2, sizeof (VendorOption->BootSrvLayer));\r
-      break;\r
+        CopyMem (&VendorOption->BootSrvType, PxeOption->Data, sizeof (VendorOption->BootSrvType));\r
+        CopyMem (&VendorOption->BootSrvLayer, PxeOption->Data + 2, sizeof (VendorOption->BootSrvLayer));\r
+        break;\r
 \r
-    default:\r
-      //\r
-      // Not interesting PXE vendor options.\r
-      //\r
-      break;\r
+      default:\r
+        //\r
+        // Not interesting PXE vendor options.\r
+        //\r
+        break;\r
     }\r
 \r
     //\r
@@ -198,14 +194,13 @@ PxeBcParseVendorOptions (
     if (PxeOption->OpCode == DHCP4_TAG_PAD) {\r
       Offset++;\r
     } else {\r
-      Offset = (UINT8) (Offset + PxeOption->Length + 2);\r
+      Offset = (UINT8)(Offset + PxeOption->Length + 2);\r
     }\r
 \r
-    PxeOption = (EFI_DHCP4_PACKET_OPTION *) (Dhcp4Option->Data + Offset);\r
+    PxeOption = (EFI_DHCP4_PACKET_OPTION *)(Dhcp4Option->Data + Offset);\r
   }\r
 }\r
 \r
-\r
 /**\r
   Build the options buffer for the DHCPv4 request packet.\r
 \r
@@ -226,34 +221,34 @@ PxeBcBuildDhcp4Options (
   IN  BOOLEAN                  NeedMsgType\r
   )\r
 {\r
-  UINT32                       Index;\r
-  PXEBC_DHCP4_OPTION_ENTRY     OptEnt;\r
-  UINT16                       Value;\r
+  UINT32                    Index;\r
+  PXEBC_DHCP4_OPTION_ENTRY  OptEnt;\r
+  UINT16                    Value;\r
 \r
   Index      = 0;\r
-  OptList[0] = (EFI_DHCP4_PACKET_OPTION *) Buffer;\r
+  OptList[0] = (EFI_DHCP4_PACKET_OPTION *)Buffer;\r
 \r
   if (NeedMsgType) {\r
     //\r
     // Append message type.\r
     //\r
-    OptList[Index]->OpCode  = DHCP4_TAG_MSG_TYPE;\r
-    OptList[Index]->Length  = 1;\r
-    OptEnt.Mesg             = (PXEBC_DHCP4_OPTION_MESG *) OptList[Index]->Data;\r
-    OptEnt.Mesg->Type       = PXEBC_DHCP4_MSG_TYPE_REQUEST;\r
+    OptList[Index]->OpCode = DHCP4_TAG_MSG_TYPE;\r
+    OptList[Index]->Length = 1;\r
+    OptEnt.Mesg            = (PXEBC_DHCP4_OPTION_MESG *)OptList[Index]->Data;\r
+    OptEnt.Mesg->Type      = PXEBC_DHCP4_MSG_TYPE_REQUEST;\r
     Index++;\r
-    OptList[Index]          = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
+    OptList[Index] = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
 \r
     //\r
     // Append max message size.\r
     //\r
-    OptList[Index]->OpCode  = DHCP4_TAG_MAXMSG;\r
-    OptList[Index]->Length  = (UINT8) sizeof (PXEBC_DHCP4_OPTION_MAX_MESG_SIZE);\r
-    OptEnt.MaxMesgSize      = (PXEBC_DHCP4_OPTION_MAX_MESG_SIZE *) OptList[Index]->Data;\r
-    Value                   = NTOHS (PXEBC_DHCP4_PACKET_MAX_SIZE);\r
+    OptList[Index]->OpCode = DHCP4_TAG_MAXMSG;\r
+    OptList[Index]->Length = (UINT8)sizeof (PXEBC_DHCP4_OPTION_MAX_MESG_SIZE);\r
+    OptEnt.MaxMesgSize     = (PXEBC_DHCP4_OPTION_MAX_MESG_SIZE *)OptList[Index]->Data;\r
+    Value                  = NTOHS (PXEBC_DHCP4_PACKET_MAX_SIZE);\r
     CopyMem (&OptEnt.MaxMesgSize->Size, &Value, sizeof (UINT16));\r
     Index++;\r
-    OptList[Index]          = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
+    OptList[Index] = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
   }\r
 \r
   //\r
@@ -261,7 +256,7 @@ PxeBcBuildDhcp4Options (
   //\r
   OptList[Index]->OpCode    = DHCP4_TAG_PARA_LIST;\r
   OptList[Index]->Length    = 35;\r
-  OptEnt.Para               = (PXEBC_DHCP4_OPTION_PARA *) OptList[Index]->Data;\r
+  OptEnt.Para               = (PXEBC_DHCP4_OPTION_PARA *)OptList[Index]->Data;\r
   OptEnt.Para->ParaList[0]  = DHCP4_TAG_NETMASK;\r
   OptEnt.Para->ParaList[1]  = DHCP4_TAG_TIME_OFFSET;\r
   OptEnt.Para->ParaList[2]  = DHCP4_TAG_ROUTER;\r
@@ -298,19 +293,19 @@ PxeBcBuildDhcp4Options (
   OptEnt.Para->ParaList[33] = 0x86;\r
   OptEnt.Para->ParaList[34] = 0x87;\r
   Index++;\r
-  OptList[Index]            = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
+  OptList[Index] = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
 \r
   //\r
   // Append UUID/Guid-based client identifier option\r
   //\r
-  OptList[Index]->OpCode  = DHCP4_TAG_UUID;\r
-  OptList[Index]->Length  = (UINT8) sizeof (PXEBC_DHCP4_OPTION_UUID);\r
-  OptEnt.Uuid             = (PXEBC_DHCP4_OPTION_UUID *) OptList[Index]->Data;\r
-  OptEnt.Uuid->Type       = 0;\r
+  OptList[Index]->OpCode = DHCP4_TAG_UUID;\r
+  OptList[Index]->Length = (UINT8)sizeof (PXEBC_DHCP4_OPTION_UUID);\r
+  OptEnt.Uuid            = (PXEBC_DHCP4_OPTION_UUID *)OptList[Index]->Data;\r
+  OptEnt.Uuid->Type      = 0;\r
   Index++;\r
-  OptList[Index]          = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
+  OptList[Index] = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
 \r
-  if (EFI_ERROR (NetLibGetSystemGuid ((EFI_GUID *) OptEnt.Uuid->Guid))) {\r
+  if (EFI_ERROR (NetLibGetSystemGuid ((EFI_GUID *)OptEnt.Uuid->Guid))) {\r
     //\r
     // Zero the Guid to indicate NOT programmable if failed to get system Guid.\r
     //\r
@@ -321,9 +316,9 @@ PxeBcBuildDhcp4Options (
   //\r
   // Append client network device interface option\r
   //\r
-  OptList[Index]->OpCode  = DHCP4_TAG_UNDI;\r
-  OptList[Index]->Length  = (UINT8) sizeof (PXEBC_DHCP4_OPTION_UNDI);\r
-  OptEnt.Undi             = (PXEBC_DHCP4_OPTION_UNDI *) OptList[Index]->Data;\r
+  OptList[Index]->OpCode = DHCP4_TAG_UNDI;\r
+  OptList[Index]->Length = (UINT8)sizeof (PXEBC_DHCP4_OPTION_UNDI);\r
+  OptEnt.Undi            = (PXEBC_DHCP4_OPTION_UNDI *)OptList[Index]->Data;\r
 \r
   if (Private->Nii != NULL) {\r
     OptEnt.Undi->Type     = Private->Nii->Type;\r
@@ -341,20 +336,20 @@ PxeBcBuildDhcp4Options (
   //\r
   // Append client system architecture option\r
   //\r
-  OptList[Index]->OpCode  = DHCP4_TAG_ARCH;\r
-  OptList[Index]->Length  = (UINT8) sizeof (PXEBC_DHCP4_OPTION_ARCH);\r
-  OptEnt.Arch             = (PXEBC_DHCP4_OPTION_ARCH *) OptList[Index]->Data;\r
-  Value                   = HTONS (EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE);\r
+  OptList[Index]->OpCode = DHCP4_TAG_ARCH;\r
+  OptList[Index]->Length = (UINT8)sizeof (PXEBC_DHCP4_OPTION_ARCH);\r
+  OptEnt.Arch            = (PXEBC_DHCP4_OPTION_ARCH *)OptList[Index]->Data;\r
+  Value                  = HTONS (EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE);\r
   CopyMem (&OptEnt.Arch->Type, &Value, sizeof (UINT16));\r
   Index++;\r
-  OptList[Index]          = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
+  OptList[Index] = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
 \r
   //\r
   // Append vendor class identify option\r
   //\r
-  OptList[Index]->OpCode  = DHCP4_TAG_VENDOR_CLASS_ID;\r
-  OptList[Index]->Length  = (UINT8) sizeof (PXEBC_DHCP4_OPTION_CLID);\r
-  OptEnt.Clid             = (PXEBC_DHCP4_OPTION_CLID *) OptList[Index]->Data;\r
+  OptList[Index]->OpCode = DHCP4_TAG_VENDOR_CLASS_ID;\r
+  OptList[Index]->Length = (UINT8)sizeof (PXEBC_DHCP4_OPTION_CLID);\r
+  OptEnt.Clid            = (PXEBC_DHCP4_OPTION_CLID *)OptList[Index]->Data;\r
   CopyMem (\r
     OptEnt.Clid,\r
     DEFAULT_CLASS_ID_DATA,\r
@@ -377,7 +372,6 @@ PxeBcBuildDhcp4Options (
   return Index;\r
 }\r
 \r
-\r
 /**\r
   Create a template DHCPv4 packet as a seed.\r
 \r
@@ -387,32 +381,31 @@ PxeBcBuildDhcp4Options (
 **/\r
 VOID\r
 PxeBcSeedDhcp4Packet (\r
-  OUT EFI_DHCP4_PACKET       *Seed,\r
-  IN  EFI_UDP4_PROTOCOL      *Udp4\r
+  OUT EFI_DHCP4_PACKET   *Seed,\r
+  IN  EFI_UDP4_PROTOCOL  *Udp4\r
   )\r
 {\r
-  EFI_SIMPLE_NETWORK_MODE    Mode;\r
-  EFI_DHCP4_HEADER           *Header;\r
+  EFI_SIMPLE_NETWORK_MODE  Mode;\r
+  EFI_DHCP4_HEADER         *Header;\r
 \r
   //\r
   // Get IfType and HwAddressSize from SNP mode data.\r
   //\r
   Udp4->GetModeData (Udp4, NULL, NULL, NULL, &Mode);\r
 \r
-  Seed->Size            = sizeof (EFI_DHCP4_PACKET);\r
-  Seed->Length          = sizeof (Seed->Dhcp4);\r
-  Header                = &Seed->Dhcp4.Header;\r
+  Seed->Size   = sizeof (EFI_DHCP4_PACKET);\r
+  Seed->Length = sizeof (Seed->Dhcp4);\r
+  Header       = &Seed->Dhcp4.Header;\r
   ZeroMem (Header, sizeof (EFI_DHCP4_HEADER));\r
-  Header->OpCode        = PXEBC_DHCP4_OPCODE_REQUEST;\r
-  Header->HwType        = Mode.IfType;\r
-  Header->HwAddrLen     = (UINT8) Mode.HwAddressSize;\r
+  Header->OpCode    = PXEBC_DHCP4_OPCODE_REQUEST;\r
+  Header->HwType    = Mode.IfType;\r
+  Header->HwAddrLen = (UINT8)Mode.HwAddressSize;\r
   CopyMem (Header->ClientHwAddr, &Mode.CurrentAddress, Header->HwAddrLen);\r
 \r
   Seed->Dhcp4.Magik     = PXEBC_DHCP4_MAGIC;\r
   Seed->Dhcp4.Option[0] = DHCP4_TAG_EOP;\r
 }\r
 \r
-\r
 /**\r
   Cache the DHCPv4 packet.\r
 \r
@@ -425,8 +418,8 @@ PxeBcSeedDhcp4Packet (
 **/\r
 EFI_STATUS\r
 PxeBcCacheDhcp4Packet (\r
-  IN EFI_DHCP4_PACKET     *Dst,\r
-  IN EFI_DHCP4_PACKET     *Src\r
+  IN EFI_DHCP4_PACKET  *Dst,\r
+  IN EFI_DHCP4_PACKET  *Src\r
   )\r
 {\r
   if (Dst->Size < Src->Length) {\r
@@ -439,7 +432,6 @@ PxeBcCacheDhcp4Packet (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Parse the cached DHCPv4 packet, including all the options.\r
 \r
@@ -451,21 +443,21 @@ PxeBcCacheDhcp4Packet (
 **/\r
 EFI_STATUS\r
 PxeBcParseDhcp4Packet (\r
-  IN PXEBC_DHCP4_PACKET_CACHE    *Cache4\r
+  IN PXEBC_DHCP4_PACKET_CACHE  *Cache4\r
   )\r
 {\r
-  EFI_DHCP4_PACKET               *Offer;\r
-  EFI_DHCP4_PACKET_OPTION        **Options;\r
-  EFI_DHCP4_PACKET_OPTION        *Option;\r
-  PXEBC_OFFER_TYPE               OfferType;\r
-  UINTN                          Index;\r
-  BOOLEAN                        IsProxyOffer;\r
-  BOOLEAN                        IsPxeOffer;\r
-  UINT8                          *Ptr8;\r
-  BOOLEAN                        FileFieldOverloaded;\r
-\r
-  IsProxyOffer = FALSE;\r
-  IsPxeOffer   = FALSE;\r
+  EFI_DHCP4_PACKET         *Offer;\r
+  EFI_DHCP4_PACKET_OPTION  **Options;\r
+  EFI_DHCP4_PACKET_OPTION  *Option;\r
+  PXEBC_OFFER_TYPE         OfferType;\r
+  UINTN                    Index;\r
+  BOOLEAN                  IsProxyOffer;\r
+  BOOLEAN                  IsPxeOffer;\r
+  UINT8                    *Ptr8;\r
+  BOOLEAN                  FileFieldOverloaded;\r
+\r
+  IsProxyOffer        = FALSE;\r
+  IsPxeOffer          = FALSE;\r
   FileFieldOverloaded = FALSE;\r
 \r
   ZeroMem (Cache4->OptList, sizeof (Cache4->OptList));\r
@@ -485,6 +477,7 @@ PxeBcParseDhcp4Packet (
                        mInterestedDhcp4Tags[Index]\r
                        );\r
   }\r
+\r
   //\r
   // Second, Check if bootfilename and serverhostname is overloaded to carry DHCP options refers to rfc-2132.\r
   // If yes, try to parse options from the BootFileName field, then ServerName field.\r
@@ -496,18 +489,19 @@ PxeBcParseDhcp4Packet (
       for (Index = 0; Index < PXEBC_DHCP4_TAG_INDEX_MAX; Index++) {\r
         if (Options[Index] == NULL) {\r
           Options[Index] = PxeBcParseDhcp4Options (\r
-                             (UINT8 *) Offer->Dhcp4.Header.BootFileName,\r
+                             (UINT8 *)Offer->Dhcp4.Header.BootFileName,\r
                              sizeof (Offer->Dhcp4.Header.BootFileName),\r
                              mInterestedDhcp4Tags[Index]\r
                              );\r
         }\r
       }\r
     }\r
+\r
     if ((Option->Data[0] & PXEBC_DHCP4_OVERLOAD_SERVER_NAME) != 0) {\r
       for (Index = 0; Index < PXEBC_DHCP4_TAG_INDEX_MAX; Index++) {\r
         if (Options[Index] == NULL) {\r
           Options[Index] = PxeBcParseDhcp4Options (\r
-                             (UINT8 *) Offer->Dhcp4.Header.ServerName,\r
+                             (UINT8 *)Offer->Dhcp4.Header.ServerName,\r
                              sizeof (Offer->Dhcp4.Header.ServerName),\r
                              mInterestedDhcp4Tags[Index]\r
                              );\r
@@ -528,7 +522,8 @@ PxeBcParseDhcp4Packet (
   //\r
   Option = Options[PXEBC_DHCP4_TAG_INDEX_CLASS_ID];\r
   if ((Option != NULL) && (Option->Length >= 9) &&\r
-      (CompareMem (Option->Data, DEFAULT_CLASS_ID_DATA, 9) == 0)) {\r
+      (CompareMem (Option->Data, DEFAULT_CLASS_ID_DATA, 9) == 0))\r
+  {\r
     IsPxeOffer = TRUE;\r
   }\r
 \r
@@ -536,7 +531,7 @@ PxeBcParseDhcp4Packet (
   // Parse PXE vendor options in this offer, and store the contents/pointers.\r
   //\r
   Option = Options[PXEBC_DHCP4_TAG_INDEX_VENDOR];\r
-  if (IsPxeOffer && Option != NULL) {\r
+  if (IsPxeOffer && (Option != NULL)) {\r
     PxeBcParseVendorOptions (Option, &Cache4->VendorOpt);\r
   }\r
 \r
@@ -550,33 +545,32 @@ PxeBcParseDhcp4Packet (
     // RFC 2132, Section 9.5 does not strictly state Bootfile name (option 67) is null\r
     // terminated string. So force to append null terminated character at the end of string.\r
     //\r
-    Ptr8 =  (UINT8*)&Options[PXEBC_DHCP4_TAG_INDEX_BOOTFILE]->Data[0];\r
+    Ptr8  =  (UINT8 *)&Options[PXEBC_DHCP4_TAG_INDEX_BOOTFILE]->Data[0];\r
     Ptr8 += Options[PXEBC_DHCP4_TAG_INDEX_BOOTFILE]->Length;\r
     if (*(Ptr8 - 1) != '\0') {\r
       *Ptr8 = '\0';\r
     }\r
-  } else if (!FileFieldOverloaded && Offer->Dhcp4.Header.BootFileName[0] != 0) {\r
+  } else if (!FileFieldOverloaded && (Offer->Dhcp4.Header.BootFileName[0] != 0)) {\r
     //\r
     // If the bootfile is not present and bootfilename is present in DHCPv4 packet, just parse it.\r
     // Do not count dhcp option header here, or else will destroy the serverhostname.\r
     //\r
     Options[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] = (EFI_DHCP4_PACKET_OPTION *)\r
-                                                (&Offer->Dhcp4.Header.BootFileName[0] -\r
-                                                OFFSET_OF (EFI_DHCP4_PACKET_OPTION, Data[0]));\r
-\r
+                                              (&Offer->Dhcp4.Header.BootFileName[0] -\r
+                                               OFFSET_OF (EFI_DHCP4_PACKET_OPTION, Data[0]));\r
   }\r
 \r
   //\r
   // Determine offer type of the DHCPv4 packet.\r
   //\r
   Option = Options[PXEBC_DHCP4_TAG_INDEX_MSG_TYPE];\r
-  if (Option == NULL || Option->Data[0] == 0) {\r
+  if ((Option == NULL) || (Option->Data[0] == 0)) {\r
     //\r
     // It's a Bootp offer.\r
     //\r
     OfferType = PxeOfferTypeBootp;\r
 \r
-    Option    = Cache4->OptList[PXEBC_DHCP4_TAG_INDEX_BOOTFILE];\r
+    Option = Cache4->OptList[PXEBC_DHCP4_TAG_INDEX_BOOTFILE];\r
     if (Option == NULL) {\r
       //\r
       // If the Bootp offer without bootfilename, discard it.\r
@@ -584,7 +578,6 @@ PxeBcParseDhcp4Packet (
       return EFI_DEVICE_ERROR;\r
     }\r
   } else {\r
-\r
     if (IS_VALID_DISCOVER_VENDOR_OPTION (Cache4->VendorOpt.BitMap)) {\r
       //\r
       // It's a PXE10 offer with PXEClient and discover vendor option.\r
@@ -614,7 +607,6 @@ PxeBcParseDhcp4Packet (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Cache the DHCPv4 ack packet, and parse it on demand.\r
 \r
@@ -628,9 +620,9 @@ PxeBcParseDhcp4Packet (
 **/\r
 EFI_STATUS\r
 PxeBcCopyDhcp4Ack (\r
-  IN PXEBC_PRIVATE_DATA   *Private,\r
-  IN EFI_DHCP4_PACKET     *Ack,\r
-  IN BOOLEAN              Verified\r
+  IN PXEBC_PRIVATE_DATA  *Private,\r
+  IN EFI_DHCP4_PACKET    *Ack,\r
+  IN BOOLEAN             Verified\r
   )\r
 {\r
   EFI_PXE_BASE_CODE_MODE  *Mode;\r
@@ -655,7 +647,6 @@ PxeBcCopyDhcp4Ack (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Cache the DHCPv4 proxy offer packet according to the received order.\r
 \r
@@ -668,8 +659,8 @@ PxeBcCopyDhcp4Ack (
 **/\r
 EFI_STATUS\r
 PxeBcCopyProxyOffer (\r
-  IN PXEBC_PRIVATE_DATA   *Private,\r
-  IN UINT32               OfferIndex\r
+  IN PXEBC_PRIVATE_DATA  *Private,\r
+  IN UINT32              OfferIndex\r
   )\r
 {\r
   EFI_PXE_BASE_CODE_MODE  *Mode;\r
@@ -686,7 +677,7 @@ PxeBcCopyProxyOffer (
   // Cache the proxy offer packet and parse it.\r
   //\r
   Status = PxeBcCacheDhcp4Packet (&Private->ProxyOffer.Dhcp4.Packet.Offer, Offer);\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
@@ -701,7 +692,6 @@ PxeBcCopyProxyOffer (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Retry to request bootfile name by the BINL offer.\r
 \r
@@ -714,8 +704,8 @@ PxeBcCopyProxyOffer (
 **/\r
 EFI_STATUS\r
 PxeBcRetryBinlOffer (\r
-  IN PXEBC_PRIVATE_DATA     *Private,\r
-  IN UINT32                 Index\r
+  IN PXEBC_PRIVATE_DATA  *Private,\r
+  IN UINT32              Index\r
   )\r
 {\r
   EFI_DHCP4_PACKET          *Offer;\r
@@ -725,8 +715,10 @@ PxeBcRetryBinlOffer (
   EFI_DHCP4_PACKET          *Reply;\r
 \r
   ASSERT (Index < PXEBC_OFFER_MAX_NUM);\r
-  ASSERT (Private->OfferBuffer[Index].Dhcp4.OfferType == PxeOfferTypeDhcpBinl ||\r
-          Private->OfferBuffer[Index].Dhcp4.OfferType == PxeOfferTypeProxyBinl);\r
+  ASSERT (\r
+    Private->OfferBuffer[Index].Dhcp4.OfferType == PxeOfferTypeDhcpBinl ||\r
+    Private->OfferBuffer[Index].Dhcp4.OfferType == PxeOfferTypeProxyBinl\r
+    );\r
 \r
   Offer = &Private->OfferBuffer[Index].Dhcp4.Packet.Offer;\r
 \r
@@ -775,9 +767,10 @@ PxeBcRetryBinlOffer (
     return Status;\r
   }\r
 \r
-  if (Cache4->OfferType != PxeOfferTypeProxyPxe10 &&\r
-      Cache4->OfferType != PxeOfferTypeProxyWfm11a &&\r
-      Cache4->OptList[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] == NULL) {\r
+  if ((Cache4->OfferType != PxeOfferTypeProxyPxe10) &&\r
+      (Cache4->OfferType != PxeOfferTypeProxyWfm11a) &&\r
+      (Cache4->OptList[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] == NULL))\r
+  {\r
     //\r
     // This BINL ack doesn't have discovery option set or multicast option set\r
     // or bootfile name specified.\r
@@ -794,7 +787,6 @@ PxeBcRetryBinlOffer (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Cache all the received DHCPv4 offers, and set OfferIndex and OfferCount.\r
 \r
@@ -807,8 +799,8 @@ PxeBcRetryBinlOffer (
 **/\r
 EFI_STATUS\r
 PxeBcCacheDhcp4Offer (\r
-  IN PXEBC_PRIVATE_DATA     *Private,\r
-  IN EFI_DHCP4_PACKET       *RcvdOffer\r
+  IN PXEBC_PRIVATE_DATA  *Private,\r
+  IN EFI_DHCP4_PACKET    *RcvdOffer\r
   )\r
 {\r
   PXEBC_DHCP4_PACKET_CACHE  *Cache4;\r
@@ -824,7 +816,7 @@ PxeBcCacheDhcp4Offer (
   // Cache the content of DHCPv4 packet firstly.\r
   //\r
   Status = PxeBcCacheDhcp4Packet (Offer, RcvdOffer);\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
@@ -865,8 +857,9 @@ PxeBcCacheDhcp4Offer (
         //\r
         Private->OfferIndex[OfferType][Private->OfferCount[OfferType]] = Private->OfferNum;\r
         Private->OfferCount[OfferType]++;\r
-      } else if ((OfferType == PxeOfferTypeProxyPxe10 || OfferType == PxeOfferTypeProxyWfm11a) &&\r
-                 Private->OfferCount[OfferType] < 1) {\r
+      } else if (((OfferType == PxeOfferTypeProxyPxe10) || (OfferType == PxeOfferTypeProxyWfm11a)) &&\r
+                 (Private->OfferCount[OfferType] < 1))\r
+      {\r
         //\r
         // Only cache the first PXE10/WFM11a offer, and discard the others.\r
         //\r
@@ -889,7 +882,6 @@ PxeBcCacheDhcp4Offer (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Select an DHCPv4 offer, and record SelectIndex and SelectProxyType.\r
 \r
@@ -898,12 +890,12 @@ PxeBcCacheDhcp4Offer (
 **/\r
 VOID\r
 PxeBcSelectDhcp4Offer (\r
-  IN PXEBC_PRIVATE_DATA       *Private\r
+  IN PXEBC_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  UINT32                      Index;\r
-  UINT32                      OfferIndex;\r
-  EFI_DHCP4_PACKET            *Offer;\r
+  UINT32            Index;\r
+  UINT32            OfferIndex;\r
+  EFI_DHCP4_PACKET  *Offer;\r
 \r
   Private->SelectIndex = 0;\r
 \r
@@ -916,43 +908,40 @@ PxeBcSelectDhcp4Offer (
       // 1. DhcpPxe10 offer\r
       //\r
       Private->SelectIndex = Private->OfferIndex[PxeOfferTypeDhcpPxe10][0] + 1;\r
-\r
     } else if (Private->OfferCount[PxeOfferTypeDhcpWfm11a] > 0) {\r
       //\r
       // 2. DhcpWfm11a offer\r
       //\r
       Private->SelectIndex = Private->OfferIndex[PxeOfferTypeDhcpWfm11a][0] + 1;\r
-\r
-    } else if (Private->OfferCount[PxeOfferTypeDhcpOnly] > 0 &&\r
-               Private->OfferCount[PxeOfferTypeProxyPxe10] > 0) {\r
+    } else if ((Private->OfferCount[PxeOfferTypeDhcpOnly] > 0) &&\r
+               (Private->OfferCount[PxeOfferTypeProxyPxe10] > 0))\r
+    {\r
       //\r
       // 3. DhcpOnly offer and ProxyPxe10 offer.\r
       //\r
       Private->SelectIndex     = Private->OfferIndex[PxeOfferTypeDhcpOnly][0] + 1;\r
       Private->SelectProxyType = PxeOfferTypeProxyPxe10;\r
-\r
-    } else if (Private->OfferCount[PxeOfferTypeDhcpOnly] > 0 &&\r
-               Private->OfferCount[PxeOfferTypeProxyWfm11a] > 0) {\r
+    } else if ((Private->OfferCount[PxeOfferTypeDhcpOnly] > 0) &&\r
+               (Private->OfferCount[PxeOfferTypeProxyWfm11a] > 0))\r
+    {\r
       //\r
       // 4. DhcpOnly offer and ProxyWfm11a offer.\r
       //\r
       Private->SelectIndex     = Private->OfferIndex[PxeOfferTypeDhcpOnly][0] + 1;\r
       Private->SelectProxyType = PxeOfferTypeProxyWfm11a;\r
-\r
     } else if (Private->OfferCount[PxeOfferTypeDhcpBinl] > 0) {\r
       //\r
       // 5. DhcpBinl offer.\r
       //\r
       Private->SelectIndex = Private->OfferIndex[PxeOfferTypeDhcpBinl][0] + 1;\r
-\r
-    } else if (Private->OfferCount[PxeOfferTypeDhcpOnly] > 0 &&\r
-               Private->OfferCount[PxeOfferTypeProxyBinl] > 0) {\r
+    } else if ((Private->OfferCount[PxeOfferTypeDhcpOnly] > 0) &&\r
+               (Private->OfferCount[PxeOfferTypeProxyBinl] > 0))\r
+    {\r
       //\r
       // 6. DhcpOnly offer and ProxyBinl offer.\r
       //\r
       Private->SelectIndex     = Private->OfferIndex[PxeOfferTypeDhcpOnly][0] + 1;\r
       Private->SelectProxyType = PxeOfferTypeProxyBinl;\r
-\r
     } else {\r
       //\r
       // 7. DhcpOnly offer with bootfilename.\r
@@ -964,13 +953,15 @@ PxeBcSelectDhcp4Offer (
           break;\r
         }\r
       }\r
+\r
       //\r
       // 8. Bootp offer with bootfilename.\r
       //\r
       OfferIndex = Private->OfferIndex[PxeOfferTypeBootp][0];\r
-      if (Private->SelectIndex == 0 &&\r
-          Private->OfferCount[PxeOfferTypeBootp] > 0 &&\r
-          Private->OfferBuffer[OfferIndex].Dhcp4.OptList[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] != NULL) {\r
+      if ((Private->SelectIndex == 0) &&\r
+          (Private->OfferCount[PxeOfferTypeBootp] > 0) &&\r
+          (Private->OfferBuffer[OfferIndex].Dhcp4.OptList[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] != NULL))\r
+      {\r
         Private->SelectIndex = OfferIndex + 1;\r
       }\r
     }\r
@@ -979,7 +970,6 @@ PxeBcSelectDhcp4Offer (
     // Select offer by received order.\r
     //\r
     for (Index = 0; Index < Private->OfferNum; Index++) {\r
-\r
       Offer = &Private->OfferBuffer[Index].Dhcp4.Packet.Offer;\r
 \r
       if (IS_PROXY_DHCP_OFFER (Offer)) {\r
@@ -990,8 +980,9 @@ PxeBcSelectDhcp4Offer (
       }\r
 \r
       if (!Private->IsProxyRecved &&\r
-          Private->OfferBuffer[Index].Dhcp4.OfferType == PxeOfferTypeDhcpOnly &&\r
-          Private->OfferBuffer[Index].Dhcp4.OptList[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] == NULL) {\r
+          (Private->OfferBuffer[Index].Dhcp4.OfferType == PxeOfferTypeDhcpOnly) &&\r
+          (Private->OfferBuffer[Index].Dhcp4.OptList[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] == NULL))\r
+      {\r
         //\r
         // Skip if DhcpOnly offer without any other proxy offers or bootfilename.\r
         //\r
@@ -1007,7 +998,6 @@ PxeBcSelectDhcp4Offer (
   }\r
 }\r
 \r
-\r
 /**\r
   Handle the DHCPv4 offer packet.\r
 \r
@@ -1021,7 +1011,7 @@ PxeBcSelectDhcp4Offer (
 **/\r
 EFI_STATUS\r
 PxeBcHandleDhcp4Offer (\r
-  IN PXEBC_PRIVATE_DATA     *Private\r
+  IN PXEBC_PRIVATE_DATA  *Private\r
   )\r
 {\r
   PXEBC_DHCP4_PACKET_CACHE  *Cache4;\r
@@ -1036,11 +1026,11 @@ PxeBcHandleDhcp4Offer (
   EFI_DHCP4_PACKET          *Ack;\r
 \r
   ASSERT (Private->SelectIndex > 0);\r
-  SelectIndex = (UINT32) (Private->SelectIndex - 1);\r
+  SelectIndex = (UINT32)(Private->SelectIndex - 1);\r
   ASSERT (SelectIndex < PXEBC_OFFER_MAX_NUM);\r
-  Cache4      = &Private->OfferBuffer[SelectIndex].Dhcp4;\r
-  Options     = Cache4->OptList;\r
-  Status      = EFI_SUCCESS;\r
+  Cache4  = &Private->OfferBuffer[SelectIndex].Dhcp4;\r
+  Options = Cache4->OptList;\r
+  Status  = EFI_SUCCESS;\r
 \r
   if (Cache4->OfferType == PxeOfferTypeDhcpBinl) {\r
     //\r
@@ -1050,7 +1040,6 @@ PxeBcHandleDhcp4Offer (
       Status = EFI_NO_RESPONSE;\r
     }\r
   } else if (Cache4->OfferType == PxeOfferTypeDhcpOnly) {\r
-\r
     if (Private->IsProxyRecved) {\r
       //\r
       // DhcpOnly offer is selected, so need try to request bootfile name.\r
@@ -1075,6 +1064,7 @@ PxeBcHandleDhcp4Offer (
               break;\r
             }\r
           }\r
+\r
           if (Index == Private->OfferCount[Private->SelectProxyType]) {\r
             Status = EFI_NO_RESPONSE;\r
           }\r
@@ -1117,7 +1107,7 @@ PxeBcHandleDhcp4Offer (
         }\r
       }\r
 \r
-      if (!EFI_ERROR (Status) && Private->SelectProxyType != PxeOfferTypeProxyBinl) {\r
+      if (!EFI_ERROR (Status) && (Private->SelectProxyType != PxeOfferTypeProxyBinl)) {\r
         //\r
         // Success to try to request by a ProxyPxe10 or ProxyWfm11a offer, copy and parse it.\r
         //\r
@@ -1152,13 +1142,13 @@ PxeBcHandleDhcp4Offer (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     Mode->DhcpDiscoverValid = TRUE;\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   EFI_DHCP4_CALLBACK is provided by the consumer of the EFI DHCPv4 Protocol driver\r
   to intercept events that occurred in the configuration process.\r
@@ -1182,12 +1172,12 @@ PxeBcHandleDhcp4Offer (
 EFI_STATUS\r
 EFIAPI\r
 PxeBcDhcp4CallBack (\r
-  IN  EFI_DHCP4_PROTOCOL               *This,\r
-  IN  VOID                             *Context,\r
-  IN  EFI_DHCP4_STATE                  CurrentState,\r
-  IN  EFI_DHCP4_EVENT                  Dhcp4Event,\r
-  IN  EFI_DHCP4_PACKET                 *Packet            OPTIONAL,\r
-  OUT EFI_DHCP4_PACKET                 **NewPacket        OPTIONAL\r
+  IN  EFI_DHCP4_PROTOCOL  *This,\r
+  IN  VOID                *Context,\r
+  IN  EFI_DHCP4_STATE     CurrentState,\r
+  IN  EFI_DHCP4_EVENT     Dhcp4Event,\r
+  IN  EFI_DHCP4_PACKET    *Packet            OPTIONAL,\r
+  OUT EFI_DHCP4_PACKET    **NewPacket        OPTIONAL\r
   )\r
 {\r
   PXEBC_PRIVATE_DATA                   *Private;\r
@@ -1201,15 +1191,16 @@ PxeBcDhcp4CallBack (
   if ((Dhcp4Event != Dhcp4RcvdOffer) &&\r
       (Dhcp4Event != Dhcp4SelectOffer) &&\r
       (Dhcp4Event != Dhcp4SendDiscover) &&\r
-      (Dhcp4Event != Dhcp4RcvdAck)) {\r
+      (Dhcp4Event != Dhcp4RcvdAck))\r
+  {\r
     return EFI_SUCCESS;\r
   }\r
 \r
   ASSERT (Packet != NULL);\r
 \r
-  Private   = (PXEBC_PRIVATE_DATA *) Context;\r
-  Mode      = Private->PxeBc.Mode;\r
-  Callback  = Private->PxeBcCallback;\r
+  Private  = (PXEBC_PRIVATE_DATA *)Context;\r
+  Mode     = Private->PxeBc.Mode;\r
+  Callback = Private->PxeBcCallback;\r
 \r
   //\r
   // Override the Maximum DHCP Message Size.\r
@@ -1227,15 +1218,15 @@ PxeBcDhcp4CallBack (
   //\r
   // Callback to user if any packets sent or received.\r
   //\r
-  if (Dhcp4Event != Dhcp4SelectOffer && Callback != NULL) {\r
-    Received = (BOOLEAN) (Dhcp4Event == Dhcp4RcvdOffer || Dhcp4Event == Dhcp4RcvdAck);\r
-    Status = Callback->Callback (\r
-                         Callback,\r
-                         Private->Function,\r
-                         Received,\r
-                         Packet->Length,\r
-                         (EFI_PXE_BASE_CODE_PACKET *) &Packet->Dhcp4\r
-                         );\r
+  if ((Dhcp4Event != Dhcp4SelectOffer) && (Callback != NULL)) {\r
+    Received = (BOOLEAN)(Dhcp4Event == Dhcp4RcvdOffer || Dhcp4Event == Dhcp4RcvdAck);\r
+    Status   = Callback->Callback (\r
+                           Callback,\r
+                           Private->Function,\r
+                           Received,\r
+                           Packet->Length,\r
+                           (EFI_PXE_BASE_CODE_PACKET *)&Packet->Dhcp4\r
+                           );\r
     if (Status != EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE) {\r
       return EFI_ABORTED;\r
     }\r
@@ -1244,101 +1235,105 @@ PxeBcDhcp4CallBack (
   Status = EFI_SUCCESS;\r
 \r
   switch (Dhcp4Event) {\r
+    case Dhcp4SendDiscover:\r
+      if (Packet->Length > PXEBC_DHCP4_PACKET_MAX_SIZE) {\r
+        //\r
+        // If the to be sent packet exceeds the maximum length, abort the DHCP process.\r
+        //\r
+        Status = EFI_ABORTED;\r
+        break;\r
+      }\r
 \r
-  case Dhcp4SendDiscover:\r
-    if (Packet->Length > PXEBC_DHCP4_PACKET_MAX_SIZE) {\r
       //\r
-      // If the to be sent packet exceeds the maximum length, abort the DHCP process.\r
+      // Cache the DHCPv4 discover packet to mode data directly.\r
+      // It need to check SendGuid as well as Dhcp4SendRequest.\r
       //\r
-      Status = EFI_ABORTED;\r
-      break;\r
-    }\r
+      CopyMem (&Mode->DhcpDiscover.Dhcpv4, &Packet->Dhcp4, Packet->Length);\r
 \r
-    //\r
-    // Cache the DHCPv4 discover packet to mode data directly.\r
-    // It need to check SendGuid as well as Dhcp4SendRequest.\r
-    //\r
-    CopyMem (&Mode->DhcpDiscover.Dhcpv4, &Packet->Dhcp4, Packet->Length);\r
+    case Dhcp4SendRequest:\r
+      if (Packet->Length > PXEBC_DHCP4_PACKET_MAX_SIZE) {\r
+        //\r
+        // If the to be sent packet exceeds the maximum length, abort the DHCP process.\r
+        //\r
+        Status = EFI_ABORTED;\r
+        break;\r
+      }\r
+\r
+      if (Mode->SendGUID) {\r
+        //\r
+        // Send the system Guid instead of the MAC address as the hardware address if required.\r
+        //\r
+        if (EFI_ERROR (NetLibGetSystemGuid ((EFI_GUID *)Packet->Dhcp4.Header.ClientHwAddr))) {\r
+          //\r
+          // Zero the Guid to indicate NOT programmable if failed to get system Guid.\r
+          //\r
+          DEBUG ((DEBUG_WARN, "PXE: Failed to read system GUID from the smbios table!\n"));\r
+          ZeroMem (Packet->Dhcp4.Header.ClientHwAddr, sizeof (EFI_GUID));\r
+        }\r
+\r
+        Packet->Dhcp4.Header.HwAddrLen = (UINT8)sizeof (EFI_GUID);\r
+      }\r
 \r
-  case Dhcp4SendRequest:\r
-    if (Packet->Length > PXEBC_DHCP4_PACKET_MAX_SIZE) {\r
-      //\r
-      // If the to be sent packet exceeds the maximum length, abort the DHCP process.\r
-      //\r
-      Status = EFI_ABORTED;\r
       break;\r
-    }\r
 \r
-    if (Mode->SendGUID) {\r
-      //\r
-      // Send the system Guid instead of the MAC address as the hardware address if required.\r
-      //\r
-      if (EFI_ERROR (NetLibGetSystemGuid ((EFI_GUID *) Packet->Dhcp4.Header.ClientHwAddr))) {\r
+    case Dhcp4RcvdOffer:\r
+      Status = EFI_NOT_READY;\r
+      if (Packet->Length > PXEBC_DHCP4_PACKET_MAX_SIZE) {\r
         //\r
-        // Zero the Guid to indicate NOT programmable if failed to get system Guid.\r
+        // Ignore the incoming packets which exceed the maximum length.\r
         //\r
-        DEBUG ((DEBUG_WARN, "PXE: Failed to read system GUID from the smbios table!\n"));\r
-        ZeroMem (Packet->Dhcp4.Header.ClientHwAddr, sizeof (EFI_GUID));\r
+        break;\r
+      }\r
+\r
+      if (Private->OfferNum < PXEBC_OFFER_MAX_NUM) {\r
+        //\r
+        // Cache the DHCPv4 offers to OfferBuffer[] for select later, and record\r
+        // the OfferIndex and OfferCount.\r
+        // If error happens, just ignore this packet and continue to wait more offer.\r
+        //\r
+        PxeBcCacheDhcp4Offer (Private, Packet);\r
       }\r
-      Packet->Dhcp4.Header.HwAddrLen = (UINT8) sizeof (EFI_GUID);\r
-    }\r
-    break;\r
 \r
-  case Dhcp4RcvdOffer:\r
-    Status = EFI_NOT_READY;\r
-    if (Packet->Length > PXEBC_DHCP4_PACKET_MAX_SIZE) {\r
-      //\r
-      // Ignore the incoming packets which exceed the maximum length.\r
-      //\r
       break;\r
-    }\r
-    if (Private->OfferNum < PXEBC_OFFER_MAX_NUM) {\r
+\r
+    case Dhcp4SelectOffer:\r
+      ASSERT (NewPacket != NULL);\r
+\r
       //\r
-      // Cache the DHCPv4 offers to OfferBuffer[] for select later, and record\r
-      // the OfferIndex and OfferCount.\r
-      // If error happens, just ignore this packet and continue to wait more offer.\r
+      // Select offer by the default policy or by order, and record the SelectIndex\r
+      // and SelectProxyType.\r
       //\r
-      PxeBcCacheDhcp4Offer (Private, Packet);\r
-    }\r
-    break;\r
+      PxeBcSelectDhcp4Offer (Private);\r
 \r
-  case Dhcp4SelectOffer:\r
-    ASSERT (NewPacket != NULL);\r
+      if (Private->SelectIndex == 0) {\r
+        Status = EFI_ABORTED;\r
+      } else {\r
+        *NewPacket = &Private->OfferBuffer[Private->SelectIndex - 1].Dhcp4.Packet.Offer;\r
+      }\r
 \r
-    //\r
-    // Select offer by the default policy or by order, and record the SelectIndex\r
-    // and SelectProxyType.\r
-    //\r
-    PxeBcSelectDhcp4Offer (Private);\r
+      break;\r
 \r
-    if (Private->SelectIndex == 0) {\r
-      Status = EFI_ABORTED;\r
-    } else {\r
-      *NewPacket = &Private->OfferBuffer[Private->SelectIndex - 1].Dhcp4.Packet.Offer;\r
-    }\r
-    break;\r
+    case Dhcp4RcvdAck:\r
+      //\r
+      // Cache the DHCPv4 ack to Private->Dhcp4Ack, but it's not the final ack in mode data\r
+      // without verification.\r
+      //\r
+      ASSERT (Private->SelectIndex != 0);\r
 \r
-  case Dhcp4RcvdAck:\r
-    //\r
-    // Cache the DHCPv4 ack to Private->Dhcp4Ack, but it's not the final ack in mode data\r
-    // without verification.\r
-    //\r
-    ASSERT (Private->SelectIndex != 0);\r
+      Status = PxeBcCopyDhcp4Ack (Private, Packet, FALSE);\r
+      if (EFI_ERROR (Status)) {\r
+        Status = EFI_ABORTED;\r
+      }\r
 \r
-    Status = PxeBcCopyDhcp4Ack (Private, Packet, FALSE);\r
-    if (EFI_ERROR (Status)) {\r
-      Status = EFI_ABORTED;\r
-    }\r
-    break;\r
+      break;\r
 \r
-  default:\r
-    break;\r
+    default:\r
+      break;\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Build and send out the request packet for the bootfile, and parse the reply.\r
 \r
@@ -1358,37 +1353,37 @@ PxeBcDhcp4CallBack (
 **/\r
 EFI_STATUS\r
 PxeBcDhcp4Discover (\r
-  IN  PXEBC_PRIVATE_DATA              *Private,\r
-  IN  UINT16                          Type,\r
-  IN  UINT16                          *Layer,\r
-  IN  BOOLEAN                         UseBis,\r
-  IN  EFI_IP_ADDRESS                  *DestIp,\r
-  IN  UINT16                          IpCount,\r
-  IN  EFI_PXE_BASE_CODE_SRVLIST       *SrvList\r
+  IN  PXEBC_PRIVATE_DATA         *Private,\r
+  IN  UINT16                     Type,\r
+  IN  UINT16                     *Layer,\r
+  IN  BOOLEAN                    UseBis,\r
+  IN  EFI_IP_ADDRESS             *DestIp,\r
+  IN  UINT16                     IpCount,\r
+  IN  EFI_PXE_BASE_CODE_SRVLIST  *SrvList\r
   )\r
 {\r
-  EFI_PXE_BASE_CODE_UDP_PORT          Sport;\r
-  EFI_PXE_BASE_CODE_MODE              *Mode;\r
-  EFI_DHCP4_PROTOCOL                  *Dhcp4;\r
-  EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN    Token;\r
-  BOOLEAN                             IsBCast;\r
-  EFI_STATUS                          Status;\r
-  UINT16                              RepIndex;\r
-  UINT16                              SrvIndex;\r
-  UINT16                              TryIndex;\r
-  EFI_DHCP4_LISTEN_POINT              ListenPoint;\r
-  EFI_DHCP4_PACKET                    *Response;\r
-  UINT8                               Buffer[PXEBC_DHCP4_OPTION_MAX_SIZE];\r
-  EFI_DHCP4_PACKET_OPTION             *OptList[PXEBC_DHCP4_OPTION_MAX_NUM];\r
-  UINT32                              OptCount;\r
-  EFI_DHCP4_PACKET_OPTION             *PxeOpt;\r
-  PXEBC_OPTION_BOOT_ITEM              *PxeBootItem;\r
-  UINT8                               VendorOptLen;\r
-  UINT32                              Xid;\r
-\r
-  Mode      = Private->PxeBc.Mode;\r
-  Dhcp4     = Private->Dhcp4;\r
-  Status    = EFI_SUCCESS;\r
+  EFI_PXE_BASE_CODE_UDP_PORT        Sport;\r
+  EFI_PXE_BASE_CODE_MODE            *Mode;\r
+  EFI_DHCP4_PROTOCOL                *Dhcp4;\r
+  EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN  Token;\r
+  BOOLEAN                           IsBCast;\r
+  EFI_STATUS                        Status;\r
+  UINT16                            RepIndex;\r
+  UINT16                            SrvIndex;\r
+  UINT16                            TryIndex;\r
+  EFI_DHCP4_LISTEN_POINT            ListenPoint;\r
+  EFI_DHCP4_PACKET                  *Response;\r
+  UINT8                             Buffer[PXEBC_DHCP4_OPTION_MAX_SIZE];\r
+  EFI_DHCP4_PACKET_OPTION           *OptList[PXEBC_DHCP4_OPTION_MAX_NUM];\r
+  UINT32                            OptCount;\r
+  EFI_DHCP4_PACKET_OPTION           *PxeOpt;\r
+  PXEBC_OPTION_BOOT_ITEM            *PxeBootItem;\r
+  UINT8                             VendorOptLen;\r
+  UINT32                            Xid;\r
+\r
+  Mode   = Private->PxeBc.Mode;\r
+  Dhcp4  = Private->Dhcp4;\r
+  Status = EFI_SUCCESS;\r
 \r
   ZeroMem (&Token, sizeof (EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN));\r
 \r
@@ -1403,7 +1398,7 @@ PxeBcDhcp4Discover (
     IsBCast = FALSE;\r
   }\r
 \r
-  if (!UseBis && Layer != NULL) {\r
+  if (!UseBis && (Layer != NULL)) {\r
     *Layer &= EFI_PXE_BASE_CODE_BOOT_LAYER_MASK;\r
   }\r
 \r
@@ -1416,23 +1411,23 @@ PxeBcDhcp4Discover (
     //\r
     // Add vendor option of PXE_BOOT_ITEM\r
     //\r
-    VendorOptLen      = (UINT8) ((sizeof (EFI_DHCP4_PACKET_OPTION) - 1) * 2 + sizeof (PXEBC_OPTION_BOOT_ITEM) + 1);\r
+    VendorOptLen      = (UINT8)((sizeof (EFI_DHCP4_PACKET_OPTION) - 1) * 2 + sizeof (PXEBC_OPTION_BOOT_ITEM) + 1);\r
     OptList[OptCount] = AllocateZeroPool (VendorOptLen);\r
     if (OptList[OptCount] == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
-    OptList[OptCount]->OpCode     = DHCP4_TAG_VENDOR;\r
-    OptList[OptCount]->Length     = (UINT8) (VendorOptLen - 2);\r
-    PxeOpt                        = (EFI_DHCP4_PACKET_OPTION *) OptList[OptCount]->Data;\r
-    PxeOpt->OpCode                = PXEBC_VENDOR_TAG_BOOT_ITEM;\r
-    PxeOpt->Length                = (UINT8) sizeof (PXEBC_OPTION_BOOT_ITEM);\r
-    PxeBootItem                   = (PXEBC_OPTION_BOOT_ITEM *) PxeOpt->Data;\r
-    PxeBootItem->Type             = HTONS (Type);\r
-    PxeOpt->Data[PxeOpt->Length]  = DHCP4_TAG_EOP;\r
+    OptList[OptCount]->OpCode    = DHCP4_TAG_VENDOR;\r
+    OptList[OptCount]->Length    = (UINT8)(VendorOptLen - 2);\r
+    PxeOpt                       = (EFI_DHCP4_PACKET_OPTION *)OptList[OptCount]->Data;\r
+    PxeOpt->OpCode               = PXEBC_VENDOR_TAG_BOOT_ITEM;\r
+    PxeOpt->Length               = (UINT8)sizeof (PXEBC_OPTION_BOOT_ITEM);\r
+    PxeBootItem                  = (PXEBC_OPTION_BOOT_ITEM *)PxeOpt->Data;\r
+    PxeBootItem->Type            = HTONS (Type);\r
+    PxeOpt->Data[PxeOpt->Length] = DHCP4_TAG_EOP;\r
 \r
     if (Layer != NULL) {\r
-      PxeBootItem->Layer          = HTONS (*Layer);\r
+      PxeBootItem->Layer = HTONS (*Layer);\r
     }\r
 \r
     OptCount++;\r
@@ -1462,14 +1457,15 @@ PxeBcDhcp4Discover (
   }\r
 \r
   if (Mode->SendGUID) {\r
-    if (EFI_ERROR (NetLibGetSystemGuid ((EFI_GUID *) Token.Packet->Dhcp4.Header.ClientHwAddr))) {\r
+    if (EFI_ERROR (NetLibGetSystemGuid ((EFI_GUID *)Token.Packet->Dhcp4.Header.ClientHwAddr))) {\r
       //\r
       // Zero the Guid to indicate NOT programmable if failed to get system Guid.\r
       //\r
       DEBUG ((DEBUG_WARN, "PXE: Failed to read system GUID from the smbios table!\n"));\r
       ZeroMem (Token.Packet->Dhcp4.Header.ClientHwAddr, sizeof (EFI_GUID));\r
     }\r
-    Token.Packet->Dhcp4.Header.HwAddrLen = (UINT8)  sizeof (EFI_GUID);\r
+\r
+    Token.Packet->Dhcp4.Header.HwAddrLen = (UINT8)sizeof (EFI_GUID);\r
   }\r
 \r
   //\r
@@ -1477,7 +1473,7 @@ PxeBcDhcp4Discover (
   //\r
   Xid                                 = NET_RANDOM (NetRandomInitSeed ());\r
   Token.Packet->Dhcp4.Header.Xid      = HTONL (Xid);\r
-  Token.Packet->Dhcp4.Header.Reserved = HTONS ((UINT16) ((IsBCast) ? 0x8000 : 0x0));\r
+  Token.Packet->Dhcp4.Header.Reserved = HTONS ((UINT16)((IsBCast) ? 0x8000 : 0x0));\r
   CopyMem (&Token.Packet->Dhcp4.Header.ClientAddr, &Private->StationIp, sizeof (EFI_IPv4_ADDRESS));\r
 \r
   Token.RemotePort = Sport;\r
@@ -1491,20 +1487,19 @@ PxeBcDhcp4Discover (
   CopyMem (&Token.GatewayAddress, &Private->GatewayIp, sizeof (EFI_IPv4_ADDRESS));\r
 \r
   if (!IsBCast) {\r
-    Token.ListenPointCount            = 1;\r
-    Token.ListenPoints                = &ListenPoint;\r
-    Token.ListenPoints[0].ListenPort  = PXEBC_BS_DISCOVER_PORT;\r
-    CopyMem (&Token.ListenPoints[0].ListenAddress, &Private->StationIp, sizeof(EFI_IPv4_ADDRESS));\r
-    CopyMem (&Token.ListenPoints[0].SubnetMask, &Private->SubnetMask, sizeof(EFI_IPv4_ADDRESS));\r
+    Token.ListenPointCount           = 1;\r
+    Token.ListenPoints               = &ListenPoint;\r
+    Token.ListenPoints[0].ListenPort = PXEBC_BS_DISCOVER_PORT;\r
+    CopyMem (&Token.ListenPoints[0].ListenAddress, &Private->StationIp, sizeof (EFI_IPv4_ADDRESS));\r
+    CopyMem (&Token.ListenPoints[0].SubnetMask, &Private->SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
   }\r
 \r
   //\r
   // Send out the request packet to discover the bootfile.\r
   //\r
   for (TryIndex = 1; TryIndex <= PXEBC_BOOT_REQUEST_RETRIES; TryIndex++) {\r
-\r
-    Token.TimeoutValue                  = (UINT16) (PXEBC_BOOT_REQUEST_TIMEOUT * TryIndex);\r
-    Token.Packet->Dhcp4.Header.Seconds  = (UINT16) (PXEBC_BOOT_REQUEST_TIMEOUT * (TryIndex - 1));\r
+    Token.TimeoutValue                 = (UINT16)(PXEBC_BOOT_REQUEST_TIMEOUT * TryIndex);\r
+    Token.Packet->Dhcp4.Header.Seconds = (UINT16)(PXEBC_BOOT_REQUEST_TIMEOUT * (TryIndex - 1));\r
 \r
     Status = Dhcp4->TransmitReceive (Dhcp4, &Token);\r
     if (Token.Status != EFI_TIMEOUT) {\r
@@ -1520,10 +1515,9 @@ PxeBcDhcp4Discover (
   }\r
 \r
   if (!EFI_ERROR (Status)) {\r
-\r
-    RepIndex  = 0;\r
-    SrvIndex  = 0;\r
-    Response  = Token.ResponseList;\r
+    RepIndex = 0;\r
+    SrvIndex = 0;\r
+    Response = Token.ResponseList;\r
     //\r
     // Find the right PXE Reply according to server address.\r
     //\r
@@ -1531,7 +1525,7 @@ PxeBcDhcp4Discover (
       if (Response->Length > PXEBC_DHCP4_PACKET_MAX_SIZE) {\r
         SrvIndex = 0;\r
         RepIndex++;\r
-        Response = (EFI_DHCP4_PACKET *) ((UINT8 *) Response + Response->Size);\r
+        Response = (EFI_DHCP4_PACKET *)((UINT8 *)Response + Response->Size);\r
         continue;\r
       }\r
 \r
@@ -1539,10 +1533,13 @@ PxeBcDhcp4Discover (
         if (SrvList[SrvIndex].AcceptAnyResponse) {\r
           break;\r
         }\r
+\r
         if ((SrvList[SrvIndex].Type == Type) &&\r
-            EFI_IP4_EQUAL (&Response->Dhcp4.Header.ServerAddr, &SrvList[SrvIndex].IpAddr)) {\r
+            EFI_IP4_EQUAL (&Response->Dhcp4.Header.ServerAddr, &SrvList[SrvIndex].IpAddr))\r
+        {\r
           break;\r
         }\r
+\r
         SrvIndex++;\r
       }\r
 \r
@@ -1552,7 +1549,7 @@ PxeBcDhcp4Discover (
 \r
       SrvIndex = 0;\r
       RepIndex++;\r
-      Response = (EFI_DHCP4_PACKET *) ((UINT8 *) Response + Response->Size);\r
+      Response = (EFI_DHCP4_PACKET *)((UINT8 *)Response + Response->Size);\r
     }\r
 \r
     if (RepIndex < Token.ResponseCount) {\r
@@ -1562,13 +1559,14 @@ PxeBcDhcp4Discover (
       //\r
       if (Private->IsDoDiscover) {\r
         Status = PxeBcCacheDhcp4Packet (&Private->PxeReply.Dhcp4.Packet.Ack, Response);\r
-        if (EFI_ERROR(Status)) {\r
+        if (EFI_ERROR (Status)) {\r
           goto ON_EXIT;\r
         }\r
+\r
         CopyMem (&Mode->PxeDiscover, &Token.Packet->Dhcp4, Token.Packet->Length);\r
       } else {\r
         Status = PxeBcCacheDhcp4Packet (&Private->ProxyOffer.Dhcp4.Packet.Offer, Response);\r
-        if (EFI_ERROR(Status)) {\r
+        if (EFI_ERROR (Status)) {\r
           goto ON_EXIT;\r
         }\r
       }\r
@@ -1579,14 +1577,17 @@ PxeBcDhcp4Discover (
       Status = EFI_NOT_FOUND;\r
     }\r
   }\r
+\r
 ON_EXIT:\r
 \r
   if (Token.ResponseList != NULL) {\r
     FreePool (Token.ResponseList);\r
   }\r
+\r
   if (Token.Packet != NULL) {\r
     FreePool (Token.Packet);\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -1601,40 +1602,40 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 PxeBcSetIp4Policy (\r
-  IN PXEBC_PRIVATE_DATA            *Private\r
+  IN PXEBC_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_IP4_CONFIG2_PROTOCOL     *Ip4Config2;\r
-  EFI_IP4_CONFIG2_POLICY       Policy;\r
-  UINTN                        DataSize;\r
+  EFI_STATUS                Status;\r
+  EFI_IP4_CONFIG2_PROTOCOL  *Ip4Config2;\r
+  EFI_IP4_CONFIG2_POLICY    Policy;\r
+  UINTN                     DataSize;\r
 \r
   Ip4Config2 = Private->Ip4Config2;\r
-  DataSize = sizeof (EFI_IP4_CONFIG2_POLICY);\r
-  Status = Ip4Config2->GetData (\r
-                       Ip4Config2,\r
-                       Ip4Config2DataTypePolicy,\r
-                       &DataSize,\r
-                       &Policy\r
-                       );\r
+  DataSize   = sizeof (EFI_IP4_CONFIG2_POLICY);\r
+  Status     = Ip4Config2->GetData (\r
+                             Ip4Config2,\r
+                             Ip4Config2DataTypePolicy,\r
+                             &DataSize,\r
+                             &Policy\r
+                             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   if (Policy != Ip4Config2PolicyStatic) {\r
     Policy = Ip4Config2PolicyStatic;\r
-    Status= Ip4Config2->SetData (\r
-                          Ip4Config2,\r
-                          Ip4Config2DataTypePolicy,\r
-                          sizeof (EFI_IP4_CONFIG2_POLICY),\r
-                          &Policy\r
-                          );\r
+    Status = Ip4Config2->SetData (\r
+                           Ip4Config2,\r
+                           Ip4Config2DataTypePolicy,\r
+                           sizeof (EFI_IP4_CONFIG2_POLICY),\r
+                           &Policy\r
+                           );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
   }\r
 \r
-  return  EFI_SUCCESS;\r
+  return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
@@ -1649,28 +1650,28 @@ PxeBcSetIp4Policy (
 **/\r
 EFI_STATUS\r
 PxeBcDhcp4Dora (\r
-  IN PXEBC_PRIVATE_DATA        *Private,\r
-  IN EFI_DHCP4_PROTOCOL        *Dhcp4\r
+  IN PXEBC_PRIVATE_DATA  *Private,\r
+  IN EFI_DHCP4_PROTOCOL  *Dhcp4\r
   )\r
 {\r
-  EFI_PXE_BASE_CODE_MODE       *PxeMode;\r
-  EFI_DHCP4_CONFIG_DATA        Config;\r
-  EFI_DHCP4_MODE_DATA          Mode;\r
-  EFI_DHCP4_PACKET_OPTION      *OptList[PXEBC_DHCP4_OPTION_MAX_NUM];\r
-  UINT8                        Buffer[PXEBC_DHCP4_OPTION_MAX_SIZE];\r
-  UINT32                       OptCount;\r
-  EFI_STATUS                   Status;\r
+  EFI_PXE_BASE_CODE_MODE   *PxeMode;\r
+  EFI_DHCP4_CONFIG_DATA    Config;\r
+  EFI_DHCP4_MODE_DATA      Mode;\r
+  EFI_DHCP4_PACKET_OPTION  *OptList[PXEBC_DHCP4_OPTION_MAX_NUM];\r
+  UINT8                    Buffer[PXEBC_DHCP4_OPTION_MAX_SIZE];\r
+  UINT32                   OptCount;\r
+  EFI_STATUS               Status;\r
 \r
   ASSERT (Dhcp4 != NULL);\r
 \r
-  Status   = EFI_SUCCESS;\r
-  PxeMode  = Private->PxeBc.Mode;\r
+  Status  = EFI_SUCCESS;\r
+  PxeMode = Private->PxeBc.Mode;\r
 \r
   //\r
   // Build option list for the request packet.\r
   //\r
   OptCount = PxeBcBuildDhcp4Options (Private, OptList, Buffer, FALSE);\r
-  ASSERT (OptCount> 0);\r
+  ASSERT (OptCount > 0);\r
 \r
   ZeroMem (&Mode, sizeof (EFI_DHCP4_MODE_DATA));\r
   ZeroMem (&Config, sizeof (EFI_DHCP4_CONFIG_DATA));\r
@@ -1704,7 +1705,7 @@ PxeBcDhcp4Dora (
       PxeMode->IcmpErrorReceived = TRUE;\r
     }\r
 \r
-    if (Status == EFI_TIMEOUT && Private->OfferNum > 0) {\r
+    if ((Status == EFI_TIMEOUT) && (Private->OfferNum > 0)) {\r
       Status = EFI_NO_RESPONSE;\r
     }\r
 \r
index 879da18a88e9875dec3372b63ee4b74f0a1066ca..45cef56720b8dc8b74119207dc180f73e418bb4d 100644 (file)
 #ifndef __EFI_PXEBC_DHCP4_H__\r
 #define __EFI_PXEBC_DHCP4_H__\r
 \r
-#define PXEBC_DHCP4_OPTION_MAX_NUM         16\r
-#define PXEBC_DHCP4_OPTION_MAX_SIZE        312\r
-#define PXEBC_DHCP4_PACKET_MAX_SIZE        (sizeof (EFI_PXE_BASE_CODE_PACKET))\r
-#define PXEBC_DHCP4_S_PORT                 67\r
-#define PXEBC_DHCP4_C_PORT                 68\r
-#define PXEBC_BS_DOWNLOAD_PORT             69\r
-#define PXEBC_BS_DISCOVER_PORT             4011\r
-#define PXEBC_DHCP4_OPCODE_REQUEST         1\r
-#define PXEBC_DHCP4_OPCODE_REPLY           2\r
-#define PXEBC_DHCP4_MSG_TYPE_REQUEST       3\r
-#define PXEBC_DHCP4_MAGIC                  0x63538263 // network byte order\r
+#define PXEBC_DHCP4_OPTION_MAX_NUM    16\r
+#define PXEBC_DHCP4_OPTION_MAX_SIZE   312\r
+#define PXEBC_DHCP4_PACKET_MAX_SIZE   (sizeof (EFI_PXE_BASE_CODE_PACKET))\r
+#define PXEBC_DHCP4_S_PORT            67\r
+#define PXEBC_DHCP4_C_PORT            68\r
+#define PXEBC_BS_DOWNLOAD_PORT        69\r
+#define PXEBC_BS_DISCOVER_PORT        4011\r
+#define PXEBC_DHCP4_OPCODE_REQUEST    1\r
+#define PXEBC_DHCP4_OPCODE_REPLY      2\r
+#define PXEBC_DHCP4_MSG_TYPE_REQUEST  3\r
+#define PXEBC_DHCP4_MAGIC             0x63538263      // network byte order\r
 \r
 //\r
 // Sub-Options in Dhcp Vendor Option\r
 #define PXEBC_VENDOR_TAG_CREDENTIAL_TYPES  12\r
 #define PXEBC_VENDOR_TAG_BOOT_ITEM         71\r
 \r
-#define PXEBC_BOOT_REQUEST_TIMEOUT         1\r
-#define PXEBC_BOOT_REQUEST_RETRIES         4\r
-\r
-#define PXEBC_DHCP4_OVERLOAD_FILE          1\r
-#define PXEBC_DHCP4_OVERLOAD_SERVER_NAME   2\r
+#define PXEBC_BOOT_REQUEST_TIMEOUT  1\r
+#define PXEBC_BOOT_REQUEST_RETRIES  4\r
 \r
+#define PXEBC_DHCP4_OVERLOAD_FILE         1\r
+#define PXEBC_DHCP4_OVERLOAD_SERVER_NAME  2\r
 \r
 //\r
 // The array index of the DHCP4 option tag interested\r
 //\r
-#define PXEBC_DHCP4_TAG_INDEX_BOOTFILE_LEN 0\r
-#define PXEBC_DHCP4_TAG_INDEX_VENDOR       1\r
-#define PXEBC_DHCP4_TAG_INDEX_OVERLOAD     2\r
-#define PXEBC_DHCP4_TAG_INDEX_MSG_TYPE     3\r
-#define PXEBC_DHCP4_TAG_INDEX_SERVER_ID    4\r
-#define PXEBC_DHCP4_TAG_INDEX_CLASS_ID     5\r
-#define PXEBC_DHCP4_TAG_INDEX_BOOTFILE     6\r
-#define PXEBC_DHCP4_TAG_INDEX_MAX          7\r
+#define PXEBC_DHCP4_TAG_INDEX_BOOTFILE_LEN  0\r
+#define PXEBC_DHCP4_TAG_INDEX_VENDOR        1\r
+#define PXEBC_DHCP4_TAG_INDEX_OVERLOAD      2\r
+#define PXEBC_DHCP4_TAG_INDEX_MSG_TYPE      3\r
+#define PXEBC_DHCP4_TAG_INDEX_SERVER_ID     4\r
+#define PXEBC_DHCP4_TAG_INDEX_CLASS_ID      5\r
+#define PXEBC_DHCP4_TAG_INDEX_BOOTFILE      6\r
+#define PXEBC_DHCP4_TAG_INDEX_MAX           7\r
 \r
 //\r
 // Dhcp4 and Dhcp6 share this definition, and corresponding\r
@@ -79,12 +78,12 @@ typedef enum {
   PxeOfferTypeMax\r
 } PXEBC_OFFER_TYPE;\r
 \r
-#define BIT(x)                (1 << x)\r
-#define CTRL(x)               (0x1F & (x))\r
-#define DEFAULT_CLASS_ID_DATA "PXEClient:Arch:xxxxx:UNDI:003000"\r
-#define DEFAULT_UNDI_TYPE     1\r
-#define DEFAULT_UNDI_MAJOR    3\r
-#define DEFAULT_UNDI_MINOR    0\r
+#define BIT(x)   (1 << x)\r
+#define CTRL(x)  (0x1F & (x))\r
+#define DEFAULT_CLASS_ID_DATA  "PXEClient:Arch:xxxxx:UNDI:003000"\r
+#define DEFAULT_UNDI_TYPE      1\r
+#define DEFAULT_UNDI_MAJOR     3\r
+#define DEFAULT_UNDI_MINOR     0\r
 \r
 #define MTFTP_VENDOR_OPTION_BIT_MAP \\r
   (BIT (PXEBC_VENDOR_TAG_MTFTP_IP) | \\r
@@ -157,122 +156,120 @@ typedef enum {
 #define IS_DISABLE_PROMPT_MENU(x) \\r
   (((x) & BIT (3)) == BIT (3))\r
 \r
-\r
 #pragma pack(1)\r
 typedef struct {\r
-  UINT8 ParaList[135];\r
+  UINT8    ParaList[135];\r
 } PXEBC_DHCP4_OPTION_PARA;\r
 \r
 typedef struct {\r
-  UINT16  Size;\r
+  UINT16    Size;\r
 } PXEBC_DHCP4_OPTION_MAX_MESG_SIZE;\r
 \r
 typedef struct {\r
-  UINT8 Type;\r
-  UINT8 MajorVer;\r
-  UINT8 MinorVer;\r
+  UINT8    Type;\r
+  UINT8    MajorVer;\r
+  UINT8    MinorVer;\r
 } PXEBC_DHCP4_OPTION_UNDI;\r
 \r
 typedef struct {\r
-  UINT8 Type;\r
+  UINT8    Type;\r
 } PXEBC_DHCP4_OPTION_MESG;\r
 \r
 typedef struct {\r
-  UINT16 Type;\r
+  UINT16    Type;\r
 } PXEBC_DHCP4_OPTION_ARCH;\r
 \r
 typedef struct {\r
-  UINT8 ClassIdentifier[10];\r
-  UINT8 ArchitecturePrefix[5];\r
-  UINT8 ArchitectureType[5];\r
-  UINT8 Lit3[1];\r
-  UINT8 InterfaceName[4];\r
-  UINT8 Lit4[1];\r
-  UINT8 UndiMajor[3];\r
-  UINT8 UndiMinor[3];\r
+  UINT8    ClassIdentifier[10];\r
+  UINT8    ArchitecturePrefix[5];\r
+  UINT8    ArchitectureType[5];\r
+  UINT8    Lit3[1];\r
+  UINT8    InterfaceName[4];\r
+  UINT8    Lit4[1];\r
+  UINT8    UndiMajor[3];\r
+  UINT8    UndiMinor[3];\r
 } PXEBC_DHCP4_OPTION_CLID;\r
 \r
 typedef struct {\r
-  UINT8 Type;\r
-  UINT8 Guid[16];\r
+  UINT8    Type;\r
+  UINT8    Guid[16];\r
 } PXEBC_DHCP4_OPTION_UUID;\r
 \r
 typedef struct {\r
-  UINT16 Type;\r
-  UINT16 Layer;\r
+  UINT16    Type;\r
+  UINT16    Layer;\r
 } PXEBC_OPTION_BOOT_ITEM;\r
 \r
 #pragma pack()\r
 \r
 typedef union {\r
-  PXEBC_DHCP4_OPTION_PARA           *Para;\r
-  PXEBC_DHCP4_OPTION_UNDI           *Undi;\r
-  PXEBC_DHCP4_OPTION_ARCH           *Arch;\r
-  PXEBC_DHCP4_OPTION_CLID           *Clid;\r
-  PXEBC_DHCP4_OPTION_UUID           *Uuid;\r
-  PXEBC_DHCP4_OPTION_MESG           *Mesg;\r
-  PXEBC_DHCP4_OPTION_MAX_MESG_SIZE  *MaxMesgSize;\r
+  PXEBC_DHCP4_OPTION_PARA             *Para;\r
+  PXEBC_DHCP4_OPTION_UNDI             *Undi;\r
+  PXEBC_DHCP4_OPTION_ARCH             *Arch;\r
+  PXEBC_DHCP4_OPTION_CLID             *Clid;\r
+  PXEBC_DHCP4_OPTION_UUID             *Uuid;\r
+  PXEBC_DHCP4_OPTION_MESG             *Mesg;\r
+  PXEBC_DHCP4_OPTION_MAX_MESG_SIZE    *MaxMesgSize;\r
 } PXEBC_DHCP4_OPTION_ENTRY;\r
 \r
 #pragma pack(1)\r
 typedef struct {\r
-  UINT16            Type;\r
-  UINT8             IpCnt;\r
-  EFI_IPv4_ADDRESS  IpAddr[1];\r
+  UINT16              Type;\r
+  UINT8               IpCnt;\r
+  EFI_IPv4_ADDRESS    IpAddr[1];\r
 } PXEBC_BOOT_SVR_ENTRY;\r
 \r
 typedef struct {\r
-  UINT16            Type;\r
-  UINT8             DescLen;\r
-  UINT8             DescStr[1];\r
+  UINT16    Type;\r
+  UINT8     DescLen;\r
+  UINT8     DescStr[1];\r
 } PXEBC_BOOT_MENU_ENTRY;\r
 \r
 typedef struct {\r
-  UINT8             Timeout;\r
-  UINT8             Prompt[1];\r
+  UINT8    Timeout;\r
+  UINT8    Prompt[1];\r
 } PXEBC_MENU_PROMPT;\r
 #pragma pack()\r
 \r
 typedef struct {\r
-  UINT32                BitMap[8];\r
-  EFI_IPv4_ADDRESS      MtftpIp;\r
-  UINT16                MtftpCPort;\r
-  UINT16                MtftpSPort;\r
-  UINT8                 MtftpTimeout;\r
-  UINT8                 MtftpDelay;\r
-  UINT8                 DiscoverCtrl;\r
-  EFI_IPv4_ADDRESS      DiscoverMcastIp;\r
-  EFI_IPv4_ADDRESS      McastIpBase;\r
-  UINT16                McastIpBlock;\r
-  UINT16                McastIpRange;\r
-  UINT16                BootSrvType;\r
-  UINT16                BootSrvLayer;\r
-  PXEBC_BOOT_SVR_ENTRY  *BootSvr;\r
-  UINT8                 BootSvrLen;\r
-  PXEBC_BOOT_MENU_ENTRY *BootMenu;\r
-  UINT8                 BootMenuLen;\r
-  PXEBC_MENU_PROMPT     *MenuPrompt;\r
-  UINT8                 MenuPromptLen;\r
-  UINT32                *CredType;\r
-  UINT8                 CredTypeLen;\r
+  UINT32                   BitMap[8];\r
+  EFI_IPv4_ADDRESS         MtftpIp;\r
+  UINT16                   MtftpCPort;\r
+  UINT16                   MtftpSPort;\r
+  UINT8                    MtftpTimeout;\r
+  UINT8                    MtftpDelay;\r
+  UINT8                    DiscoverCtrl;\r
+  EFI_IPv4_ADDRESS         DiscoverMcastIp;\r
+  EFI_IPv4_ADDRESS         McastIpBase;\r
+  UINT16                   McastIpBlock;\r
+  UINT16                   McastIpRange;\r
+  UINT16                   BootSrvType;\r
+  UINT16                   BootSrvLayer;\r
+  PXEBC_BOOT_SVR_ENTRY     *BootSvr;\r
+  UINT8                    BootSvrLen;\r
+  PXEBC_BOOT_MENU_ENTRY    *BootMenu;\r
+  UINT8                    BootMenuLen;\r
+  PXEBC_MENU_PROMPT        *MenuPrompt;\r
+  UINT8                    MenuPromptLen;\r
+  UINT32                   *CredType;\r
+  UINT8                    CredTypeLen;\r
 } PXEBC_VENDOR_OPTION;\r
 \r
 #define PXEBC_CACHED_DHCP4_PACKET_MAX_SIZE  (OFFSET_OF (EFI_DHCP4_PACKET, Dhcp4) + PXEBC_DHCP4_PACKET_MAX_SIZE)\r
 \r
 typedef union {\r
-  EFI_DHCP4_PACKET        Offer;\r
-  EFI_DHCP4_PACKET        Ack;\r
-  UINT8                   Buffer[PXEBC_CACHED_DHCP4_PACKET_MAX_SIZE];\r
+  EFI_DHCP4_PACKET    Offer;\r
+  EFI_DHCP4_PACKET    Ack;\r
+  UINT8               Buffer[PXEBC_CACHED_DHCP4_PACKET_MAX_SIZE];\r
 } PXEBC_DHCP4_PACKET;\r
 \r
 typedef struct {\r
-  PXEBC_DHCP4_PACKET      Packet;\r
-  PXEBC_OFFER_TYPE        OfferType;\r
-  EFI_DHCP4_PACKET_OPTION *OptList[PXEBC_DHCP4_TAG_INDEX_MAX];\r
-  PXEBC_VENDOR_OPTION     VendorOpt;\r
+  PXEBC_DHCP4_PACKET         Packet;\r
+  PXEBC_OFFER_TYPE           OfferType;\r
+  EFI_DHCP4_PACKET_OPTION    *OptList[PXEBC_DHCP4_TAG_INDEX_MAX];\r
+  PXEBC_VENDOR_OPTION        VendorOpt;\r
 } PXEBC_DHCP4_PACKET_CACHE;\r
 \r
-\r
 /**\r
   Create a template DHCPv4 packet as a seed.\r
 \r
@@ -282,11 +279,10 @@ typedef struct {
 **/\r
 VOID\r
 PxeBcSeedDhcp4Packet (\r
-  OUT EFI_DHCP4_PACKET       *Seed,\r
-  IN  EFI_UDP4_PROTOCOL      *Udp4\r
+  OUT EFI_DHCP4_PACKET   *Seed,\r
+  IN  EFI_UDP4_PROTOCOL  *Udp4\r
   );\r
 \r
-\r
 /**\r
   Parse the cached DHCPv4 packet, including all the options.\r
 \r
@@ -298,10 +294,9 @@ PxeBcSeedDhcp4Packet (
 **/\r
 EFI_STATUS\r
 PxeBcParseDhcp4Packet (\r
-  IN PXEBC_DHCP4_PACKET_CACHE    *Cache4\r
+  IN PXEBC_DHCP4_PACKET_CACHE  *Cache4\r
   );\r
 \r
-\r
 /**\r
   Build and send out the request packet for the bootfile, and parse the reply.\r
 \r
@@ -321,13 +316,13 @@ PxeBcParseDhcp4Packet (
 **/\r
 EFI_STATUS\r
 PxeBcDhcp4Discover (\r
-  IN  PXEBC_PRIVATE_DATA              *Private,\r
-  IN  UINT16                          Type,\r
-  IN  UINT16                          *Layer,\r
-  IN  BOOLEAN                         UseBis,\r
-  IN  EFI_IP_ADDRESS                  *DestIp,\r
-  IN  UINT16                          IpCount,\r
-  IN  EFI_PXE_BASE_CODE_SRVLIST       *SrvList\r
+  IN  PXEBC_PRIVATE_DATA         *Private,\r
+  IN  UINT16                     Type,\r
+  IN  UINT16                     *Layer,\r
+  IN  BOOLEAN                    UseBis,\r
+  IN  EFI_IP_ADDRESS             *DestIp,\r
+  IN  UINT16                     IpCount,\r
+  IN  EFI_PXE_BASE_CODE_SRVLIST  *SrvList\r
   );\r
 \r
 /**\r
@@ -341,10 +336,9 @@ PxeBcDhcp4Discover (
 **/\r
 EFI_STATUS\r
 PxeBcSetIp4Policy (\r
-  IN PXEBC_PRIVATE_DATA            *Private\r
+  IN PXEBC_PRIVATE_DATA  *Private\r
   );\r
 \r
-\r
 /**\r
   Start the D.O.R.A DHCPv4 process to acquire the IPv4 address and other PXE boot information.\r
 \r
@@ -357,9 +351,8 @@ PxeBcSetIp4Policy (
 **/\r
 EFI_STATUS\r
 PxeBcDhcp4Dora (\r
-  IN PXEBC_PRIVATE_DATA         *Private,\r
-  IN EFI_DHCP4_PROTOCOL         *Dhcp4\r
+  IN PXEBC_PRIVATE_DATA  *Private,\r
+  IN EFI_DHCP4_PROTOCOL  *Dhcp4\r
   );\r
 \r
 #endif\r
-\r
index 8d71143b79f3ea3d8663e93990f9ec567caa8aaf..425e0cf8061de1392178a03ef7de211d7457f913 100644 (file)
@@ -15,7 +15,9 @@
 //\r
 //   ALL_DHCP_Relay_Agents_and_Servers address: FF02::1:2\r
 //\r
-EFI_IPv6_ADDRESS   mAllDhcpRelayAndServersAddress = {{0xFF, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2}};\r
+EFI_IPv6_ADDRESS  mAllDhcpRelayAndServersAddress = {\r
+  { 0xFF, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2 }\r
+};\r
 \r
 /**\r
   Parse out a DHCPv6 option by OptTag, and find the position in buffer.\r
@@ -30,35 +32,32 @@ EFI_IPv6_ADDRESS   mAllDhcpRelayAndServersAddress = {{0xFF, 2, 0, 0, 0, 0, 0, 0,
 **/\r
 EFI_DHCP6_PACKET_OPTION *\r
 PxeBcParseDhcp6Options (\r
-  IN UINT8                       *Buffer,\r
-  IN UINT32                      Length,\r
-  IN UINT16                      OptTag\r
+  IN UINT8   *Buffer,\r
+  IN UINT32  Length,\r
+  IN UINT16  OptTag\r
   )\r
 {\r
-  EFI_DHCP6_PACKET_OPTION        *Option;\r
-  UINT32                         Offset;\r
+  EFI_DHCP6_PACKET_OPTION  *Option;\r
+  UINT32                   Offset;\r
 \r
-  Option  = (EFI_DHCP6_PACKET_OPTION *) Buffer;\r
-  Offset  = 0;\r
+  Option = (EFI_DHCP6_PACKET_OPTION *)Buffer;\r
+  Offset = 0;\r
 \r
   //\r
   // OpLen and OpCode here are both stored in network order.\r
   //\r
   while (Offset < Length) {\r
-\r
     if (NTOHS (Option->OpCode) == OptTag) {\r
-\r
       return Option;\r
     }\r
 \r
-    Offset += (NTOHS(Option->OpLen) + 4);\r
-    Option  = (EFI_DHCP6_PACKET_OPTION *) (Buffer + Offset);\r
+    Offset += (NTOHS (Option->OpLen) + 4);\r
+    Option  = (EFI_DHCP6_PACKET_OPTION *)(Buffer + Offset);\r
   }\r
 \r
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Build the options buffer for the DHCPv6 request packet.\r
 \r
@@ -71,70 +70,70 @@ PxeBcParseDhcp6Options (
 **/\r
 UINT32\r
 PxeBcBuildDhcp6Options (\r
-  IN  PXEBC_PRIVATE_DATA           *Private,\r
-  OUT EFI_DHCP6_PACKET_OPTION      **OptList,\r
-  IN  UINT8                        *Buffer\r
+  IN  PXEBC_PRIVATE_DATA       *Private,\r
+  OUT EFI_DHCP6_PACKET_OPTION  **OptList,\r
+  IN  UINT8                    *Buffer\r
   )\r
 {\r
-  PXEBC_DHCP6_OPTION_ENTRY         OptEnt;\r
-  UINT32                           Index;\r
-  UINT16                           Value;\r
+  PXEBC_DHCP6_OPTION_ENTRY  OptEnt;\r
+  UINT32                    Index;\r
+  UINT16                    Value;\r
 \r
-  Index       = 0;\r
-  OptList[0]  = (EFI_DHCP6_PACKET_OPTION *) Buffer;\r
+  Index      = 0;\r
+  OptList[0] = (EFI_DHCP6_PACKET_OPTION *)Buffer;\r
 \r
   //\r
   // Append client option request option\r
   //\r
-  OptList[Index]->OpCode     = HTONS (DHCP6_OPT_ORO);\r
-  OptList[Index]->OpLen      = HTONS (8);\r
-  OptEnt.Oro                 = (PXEBC_DHCP6_OPTION_ORO *) OptList[Index]->Data;\r
-  OptEnt.Oro->OpCode[0]      = HTONS(DHCP6_OPT_BOOT_FILE_URL);\r
-  OptEnt.Oro->OpCode[1]      = HTONS(DHCP6_OPT_BOOT_FILE_PARAM);\r
-  OptEnt.Oro->OpCode[2]      = HTONS(DHCP6_OPT_DNS_SERVERS);\r
-  OptEnt.Oro->OpCode[3]      = HTONS(DHCP6_OPT_VENDOR_CLASS);\r
+  OptList[Index]->OpCode = HTONS (DHCP6_OPT_ORO);\r
+  OptList[Index]->OpLen  = HTONS (8);\r
+  OptEnt.Oro             = (PXEBC_DHCP6_OPTION_ORO *)OptList[Index]->Data;\r
+  OptEnt.Oro->OpCode[0]  = HTONS (DHCP6_OPT_BOOT_FILE_URL);\r
+  OptEnt.Oro->OpCode[1]  = HTONS (DHCP6_OPT_BOOT_FILE_PARAM);\r
+  OptEnt.Oro->OpCode[2]  = HTONS (DHCP6_OPT_DNS_SERVERS);\r
+  OptEnt.Oro->OpCode[3]  = HTONS (DHCP6_OPT_VENDOR_CLASS);\r
   Index++;\r
-  OptList[Index]             = GET_NEXT_DHCP6_OPTION (OptList[Index - 1]);\r
+  OptList[Index] = GET_NEXT_DHCP6_OPTION (OptList[Index - 1]);\r
 \r
   //\r
   // Append client network device interface option\r
   //\r
-  OptList[Index]->OpCode     = HTONS (DHCP6_OPT_UNDI);\r
-  OptList[Index]->OpLen      = HTONS ((UINT16)3);\r
-  OptEnt.Undi                = (PXEBC_DHCP6_OPTION_UNDI *) OptList[Index]->Data;\r
+  OptList[Index]->OpCode = HTONS (DHCP6_OPT_UNDI);\r
+  OptList[Index]->OpLen  = HTONS ((UINT16)3);\r
+  OptEnt.Undi            = (PXEBC_DHCP6_OPTION_UNDI *)OptList[Index]->Data;\r
 \r
   if (Private->Nii != NULL) {\r
-    OptEnt.Undi->Type        = Private->Nii->Type;\r
-    OptEnt.Undi->MajorVer    = Private->Nii->MajorVer;\r
-    OptEnt.Undi->MinorVer    = Private->Nii->MinorVer;\r
+    OptEnt.Undi->Type     = Private->Nii->Type;\r
+    OptEnt.Undi->MajorVer = Private->Nii->MajorVer;\r
+    OptEnt.Undi->MinorVer = Private->Nii->MinorVer;\r
   } else {\r
-    OptEnt.Undi->Type        = DEFAULT_UNDI_TYPE;\r
-    OptEnt.Undi->MajorVer    = DEFAULT_UNDI_MAJOR;\r
-    OptEnt.Undi->MinorVer    = DEFAULT_UNDI_MINOR;\r
+    OptEnt.Undi->Type     = DEFAULT_UNDI_TYPE;\r
+    OptEnt.Undi->MajorVer = DEFAULT_UNDI_MAJOR;\r
+    OptEnt.Undi->MinorVer = DEFAULT_UNDI_MINOR;\r
   }\r
 \r
   Index++;\r
-  OptList[Index]             = GET_NEXT_DHCP6_OPTION (OptList[Index - 1]);\r
+  OptList[Index] = GET_NEXT_DHCP6_OPTION (OptList[Index - 1]);\r
 \r
   //\r
   // Append client system architecture option\r
   //\r
-  OptList[Index]->OpCode     = HTONS (DHCP6_OPT_ARCH);\r
-  OptList[Index]->OpLen      = HTONS ((UINT16) sizeof (PXEBC_DHCP6_OPTION_ARCH));\r
-  OptEnt.Arch                = (PXEBC_DHCP6_OPTION_ARCH *) OptList[Index]->Data;\r
-  Value                      = HTONS (EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE);\r
+  OptList[Index]->OpCode = HTONS (DHCP6_OPT_ARCH);\r
+  OptList[Index]->OpLen  = HTONS ((UINT16)sizeof (PXEBC_DHCP6_OPTION_ARCH));\r
+  OptEnt.Arch            = (PXEBC_DHCP6_OPTION_ARCH *)OptList[Index]->Data;\r
+  Value                  = HTONS (EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE);\r
   CopyMem (&OptEnt.Arch->Type, &Value, sizeof (UINT16));\r
   Index++;\r
-  OptList[Index]             = GET_NEXT_DHCP6_OPTION (OptList[Index - 1]);\r
+  OptList[Index] = GET_NEXT_DHCP6_OPTION (OptList[Index - 1]);\r
 \r
   //\r
   // Append vendor class option to store the PXE class identifier.\r
   //\r
   OptList[Index]->OpCode       = HTONS (DHCP6_OPT_VENDOR_CLASS);\r
-  OptList[Index]->OpLen        = HTONS ((UINT16) sizeof (PXEBC_DHCP6_OPTION_VENDOR_CLASS));\r
-  OptEnt.VendorClass           = (PXEBC_DHCP6_OPTION_VENDOR_CLASS *) OptList[Index]->Data;\r
+  OptList[Index]->OpLen        = HTONS ((UINT16)sizeof (PXEBC_DHCP6_OPTION_VENDOR_CLASS));\r
+  OptEnt.VendorClass           = (PXEBC_DHCP6_OPTION_VENDOR_CLASS *)OptList[Index]->Data;\r
   OptEnt.VendorClass->Vendor   = HTONL (PXEBC_DHCP6_ENTERPRISE_NUM);\r
-  OptEnt.VendorClass->ClassLen = HTONS ((UINT16) sizeof (PXEBC_CLASS_ID));\r
+  OptEnt.VendorClass->ClassLen = HTONS ((UINT16)sizeof (PXEBC_CLASS_ID));\r
   CopyMem (\r
     &OptEnt.VendorClass->ClassId,\r
     DEFAULT_CLASS_ID_DATA,\r
@@ -169,7 +168,6 @@ PxeBcBuildDhcp6Options (
   return Index;\r
 }\r
 \r
-\r
 /**\r
   Cache the DHCPv6 packet.\r
 \r
@@ -182,8 +180,8 @@ PxeBcBuildDhcp6Options (
 **/\r
 EFI_STATUS\r
 PxeBcCacheDhcp6Packet (\r
-  IN EFI_DHCP6_PACKET          *Dst,\r
-  IN EFI_DHCP6_PACKET          *Src\r
+  IN EFI_DHCP6_PACKET  *Dst,\r
+  IN EFI_DHCP6_PACKET  *Src\r
   )\r
 {\r
   if (Dst->Size < Src->Length) {\r
@@ -211,22 +209,22 @@ PxeBcCacheDhcp6Packet (
 **/\r
 EFI_STATUS\r
 PxeBcDns6 (\r
-  IN PXEBC_PRIVATE_DATA           *Private,\r
-  IN     CHAR16                   *HostName,\r
-     OUT EFI_IPv6_ADDRESS         *IpAddress\r
+  IN PXEBC_PRIVATE_DATA  *Private,\r
+  IN     CHAR16          *HostName,\r
+  OUT EFI_IPv6_ADDRESS   *IpAddress\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_DNS6_PROTOCOL               *Dns6;\r
-  EFI_DNS6_CONFIG_DATA            Dns6ConfigData;\r
-  EFI_DNS6_COMPLETION_TOKEN       Token;\r
-  EFI_HANDLE                      Dns6Handle;\r
-  EFI_IPv6_ADDRESS                *DnsServerList;\r
-  BOOLEAN                         IsDone;\r
-\r
-  Dns6                = NULL;\r
-  Dns6Handle          = NULL;\r
-  DnsServerList       = Private->DnsServer;\r
+  EFI_STATUS                 Status;\r
+  EFI_DNS6_PROTOCOL          *Dns6;\r
+  EFI_DNS6_CONFIG_DATA       Dns6ConfigData;\r
+  EFI_DNS6_COMPLETION_TOKEN  Token;\r
+  EFI_HANDLE                 Dns6Handle;\r
+  EFI_IPv6_ADDRESS           *DnsServerList;\r
+  BOOLEAN                    IsDone;\r
+\r
+  Dns6          = NULL;\r
+  Dns6Handle    = NULL;\r
+  DnsServerList = Private->DnsServer;\r
   ZeroMem (&Token, sizeof (EFI_DNS6_COMPLETION_TOKEN));\r
 \r
   //\r
@@ -245,7 +243,7 @@ PxeBcDns6 (
   Status = gBS->OpenProtocol (\r
                   Dns6Handle,\r
                   &gEfiDns6ProtocolGuid,\r
-                  (VOID **) &Dns6,\r
+                  (VOID **)&Dns6,\r
                   Private->Image,\r
                   Private->Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -308,10 +306,12 @@ PxeBcDns6 (
       Status = EFI_DEVICE_ERROR;\r
       goto Exit;\r
     }\r
-    if (Token.RspData.H2AData->IpCount == 0 || Token.RspData.H2AData->IpList == NULL) {\r
+\r
+    if ((Token.RspData.H2AData->IpCount == 0) || (Token.RspData.H2AData->IpList == NULL)) {\r
       Status = EFI_DEVICE_ERROR;\r
       goto Exit;\r
     }\r
+\r
     //\r
     // We just return the first IPv6 address from DNS protocol.\r
     //\r
@@ -325,10 +325,12 @@ Exit:
   if (Token.Event != NULL) {\r
     gBS->CloseEvent (Token.Event);\r
   }\r
+\r
   if (Token.RspData.H2AData != NULL) {\r
     if (Token.RspData.H2AData->IpList != NULL) {\r
       FreePool (Token.RspData.H2AData->IpList);\r
     }\r
+\r
     FreePool (Token.RspData.H2AData);\r
   }\r
 \r
@@ -375,26 +377,26 @@ Exit:
 **/\r
 EFI_STATUS\r
 PxeBcExtractBootFileUrl (\r
-  IN PXEBC_PRIVATE_DATA      *Private,\r
-     OUT UINT8               **FileName,\r
-  IN OUT EFI_IPv6_ADDRESS    *SrvAddr,\r
-  IN     CHAR8               *BootFile,\r
-  IN     UINT16              Length\r
+  IN PXEBC_PRIVATE_DATA    *Private,\r
+  OUT UINT8                **FileName,\r
+  IN OUT EFI_IPv6_ADDRESS  *SrvAddr,\r
+  IN     CHAR8             *BootFile,\r
+  IN     UINT16            Length\r
   )\r
 {\r
-  UINT16                     PrefixLen;\r
-  CHAR8                      *BootFileNamePtr;\r
-  CHAR8                      *BootFileName;\r
-  UINT16                     BootFileNameLen;\r
-  CHAR8                      *TmpStr;\r
-  CHAR8                      TmpChar;\r
-  CHAR8                      *ServerAddressOption;\r
-  CHAR8                      *ServerAddress;\r
-  CHAR8                      *ModeStr;\r
-  CHAR16                     *HostName;\r
-  BOOLEAN                    IpExpressedUrl;\r
-  UINTN                      Len;\r
-  EFI_STATUS                 Status;\r
+  UINT16      PrefixLen;\r
+  CHAR8       *BootFileNamePtr;\r
+  CHAR8       *BootFileName;\r
+  UINT16      BootFileNameLen;\r
+  CHAR8       *TmpStr;\r
+  CHAR8       TmpChar;\r
+  CHAR8       *ServerAddressOption;\r
+  CHAR8       *ServerAddress;\r
+  CHAR8       *ModeStr;\r
+  CHAR16      *HostName;\r
+  BOOLEAN     IpExpressedUrl;\r
+  UINTN       Len;\r
+  EFI_STATUS  Status;\r
 \r
   IpExpressedUrl = TRUE;\r
   //\r
@@ -417,17 +419,18 @@ PxeBcExtractBootFileUrl (
   // As an example where the BOOTFILE_NAME is the EFI loader and\r
   // SERVER_ADDRESS is the ASCII encoding of an IPV6 address.\r
   //\r
-  PrefixLen = (UINT16) AsciiStrLen (PXEBC_DHCP6_BOOT_FILE_URL_PREFIX);\r
+  PrefixLen = (UINT16)AsciiStrLen (PXEBC_DHCP6_BOOT_FILE_URL_PREFIX);\r
 \r
-  if (Length <= PrefixLen ||\r
-      CompareMem (BootFile, PXEBC_DHCP6_BOOT_FILE_URL_PREFIX, PrefixLen) != 0) {\r
+  if ((Length <= PrefixLen) ||\r
+      (CompareMem (BootFile, PXEBC_DHCP6_BOOT_FILE_URL_PREFIX, PrefixLen) != 0))\r
+  {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
   BootFile = BootFile + PrefixLen;\r
-  Length   = (UINT16) (Length - PrefixLen);\r
+  Length   = (UINT16)(Length - PrefixLen);\r
 \r
-  TmpStr = (CHAR8 *) AllocateZeroPool (Length + 1);\r
+  TmpStr = (CHAR8 *)AllocateZeroPool (Length + 1);\r
   if (TmpStr == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -440,7 +443,7 @@ PxeBcExtractBootFileUrl (
   //\r
   ServerAddressOption = TmpStr;\r
   if (*ServerAddressOption == PXEBC_ADDR_START_DELIMITER) {\r
-    ServerAddressOption ++;\r
+    ServerAddressOption++;\r
     ServerAddress = ServerAddressOption;\r
     while (*ServerAddress != '\0' && *ServerAddress != PXEBC_ADDR_END_DELIMITER) {\r
       ServerAddress++;\r
@@ -461,10 +464,9 @@ PxeBcExtractBootFileUrl (
       FreePool (TmpStr);\r
       return Status;\r
     }\r
-\r
   } else {\r
     IpExpressedUrl = FALSE;\r
-    ServerAddress = ServerAddressOption;\r
+    ServerAddress  = ServerAddressOption;\r
     while (*ServerAddress != '\0' && *ServerAddress != PXEBC_TFTP_URL_SEPARATOR) {\r
       ServerAddress++;\r
     }\r
@@ -473,14 +475,16 @@ PxeBcExtractBootFileUrl (
       FreePool (TmpStr);\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     *ServerAddress = '\0';\r
 \r
-    Len = AsciiStrSize (ServerAddressOption);\r
+    Len      = AsciiStrSize (ServerAddressOption);\r
     HostName = AllocateZeroPool (Len * sizeof (CHAR16));\r
     if (HostName == NULL) {\r
       FreePool (TmpStr);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     AsciiStrToUnicodeStrS (\r
       ServerAddressOption,\r
       HostName,\r
@@ -490,7 +494,7 @@ PxeBcExtractBootFileUrl (
     //\r
     // Perform DNS resolution.\r
     //\r
-    Status = PxeBcDns6 (Private,HostName, SrvAddr);\r
+    Status = PxeBcDns6 (Private, HostName, SrvAddr);\r
     if (EFI_ERROR (Status)) {\r
       FreePool (TmpStr);\r
       return Status;\r
@@ -500,23 +504,24 @@ PxeBcExtractBootFileUrl (
   //\r
   // Get the part of BOOTFILE_NAME string.\r
   //\r
-  BootFileNamePtr = (CHAR8*)((UINTN)ServerAddress + 1);\r
+  BootFileNamePtr = (CHAR8 *)((UINTN)ServerAddress + 1);\r
   if (IpExpressedUrl) {\r
     if (*BootFileNamePtr != PXEBC_TFTP_URL_SEPARATOR) {\r
       FreePool (TmpStr);\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     ++BootFileNamePtr;\r
   }\r
 \r
-  BootFileNameLen = (UINT16)(Length - (UINT16) ((UINTN)BootFileNamePtr - (UINTN)TmpStr) + 1);\r
-  if (BootFileNameLen != 0 || FileName != NULL) {\r
+  BootFileNameLen = (UINT16)(Length - (UINT16)((UINTN)BootFileNamePtr - (UINTN)TmpStr) + 1);\r
+  if ((BootFileNameLen != 0) || (FileName != NULL)) {\r
     //\r
     // Remove trailing mode=octet if present and ignore.  All other modes are\r
     // invalid for netboot6, so reject them.\r
     //\r
     ModeStr = AsciiStrStr (BootFileNamePtr, ";mode=octet");\r
-    if (ModeStr != NULL && *(ModeStr + AsciiStrLen (";mode=octet")) == '\0') {\r
+    if ((ModeStr != NULL) && (*(ModeStr + AsciiStrLen (";mode=octet")) == '\0')) {\r
       *ModeStr = '\0';\r
     } else if (AsciiStrStr (BootFileNamePtr, ";mode=") != NULL) {\r
       FreePool (TmpStr);\r
@@ -526,30 +531,32 @@ PxeBcExtractBootFileUrl (
     //\r
     // Extract boot file name from URL.\r
     //\r
-    BootFileName = (CHAR8 *) AllocateZeroPool (BootFileNameLen);\r
+    BootFileName = (CHAR8 *)AllocateZeroPool (BootFileNameLen);\r
     if (BootFileName == NULL) {\r
       FreePool (TmpStr);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-    *FileName = (UINT8*) BootFileName;\r
+\r
+    *FileName = (UINT8 *)BootFileName;\r
 \r
     //\r
     // Decode percent-encoding in boot file name.\r
     //\r
     while (*BootFileNamePtr != '\0') {\r
       if (*BootFileNamePtr == '%') {\r
-        TmpChar = *(BootFileNamePtr+ 3);\r
+        TmpChar               = *(BootFileNamePtr+ 3);\r
         *(BootFileNamePtr+ 3) = '\0';\r
-        *BootFileName = (UINT8) AsciiStrHexToUintn ((CHAR8*)(BootFileNamePtr + 1));\r
+        *BootFileName         = (UINT8)AsciiStrHexToUintn ((CHAR8 *)(BootFileNamePtr + 1));\r
         BootFileName++;\r
         *(BootFileNamePtr+ 3) = TmpChar;\r
-        BootFileNamePtr += 3;\r
+        BootFileNamePtr      += 3;\r
       } else {\r
         *BootFileName = *BootFileNamePtr;\r
         BootFileName++;\r
         BootFileNamePtr++;\r
       }\r
     }\r
+\r
     *BootFileName = '\0';\r
   }\r
 \r
@@ -558,7 +565,6 @@ PxeBcExtractBootFileUrl (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Parse the Boot File Parameter option.\r
 \r
@@ -571,14 +577,14 @@ PxeBcExtractBootFileUrl (
 **/\r
 EFI_STATUS\r
 PxeBcExtractBootFileParam (\r
-  IN  CHAR8                  *BootFilePara,\r
-  OUT UINT16                 *BootFileSize\r
+  IN  CHAR8   *BootFilePara,\r
+  OUT UINT16  *BootFileSize\r
   )\r
 {\r
-  UINT16                     Length;\r
-  UINT8                      Index;\r
-  UINT8                      Digit;\r
-  UINT32                     Size;\r
+  UINT16  Length;\r
+  UINT8   Index;\r
+  UINT8   Digit;\r
+  UINT32  Size;\r
 \r
   CopyMem (&Length, BootFilePara, sizeof (UINT16));\r
   Length = NTOHS (Length);\r
@@ -586,7 +592,7 @@ PxeBcExtractBootFileParam (
   //\r
   // The BootFile Size should be 1~5 byte ASCII strings\r
   //\r
-  if (Length < 1 || Length > 5) {\r
+  if ((Length < 1) || (Length > 5)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -608,11 +614,10 @@ PxeBcExtractBootFileParam (
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  *BootFileSize = (UINT16) Size;\r
+  *BootFileSize = (UINT16)Size;\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Parse the cached DHCPv6 packet, including all the options.\r
 \r
@@ -627,15 +632,15 @@ PxeBcParseDhcp6Packet (
   IN PXEBC_DHCP6_PACKET_CACHE  *Cache6\r
   )\r
 {\r
-  EFI_DHCP6_PACKET             *Offer;\r
-  EFI_DHCP6_PACKET_OPTION      **Options;\r
-  EFI_DHCP6_PACKET_OPTION      *Option;\r
-  PXEBC_OFFER_TYPE             OfferType;\r
-  BOOLEAN                      IsProxyOffer;\r
-  BOOLEAN                      IsPxeOffer;\r
-  UINT32                       Offset;\r
-  UINT32                       Length;\r
-  UINT32                       EnterpriseNum;\r
+  EFI_DHCP6_PACKET         *Offer;\r
+  EFI_DHCP6_PACKET_OPTION  **Options;\r
+  EFI_DHCP6_PACKET_OPTION  *Option;\r
+  PXEBC_OFFER_TYPE         OfferType;\r
+  BOOLEAN                  IsProxyOffer;\r
+  BOOLEAN                  IsPxeOffer;\r
+  UINT32                   Offset;\r
+  UINT32                   Length;\r
+  UINT32                   EnterpriseNum;\r
 \r
   IsProxyOffer = TRUE;\r
   IsPxeOffer   = FALSE;\r
@@ -644,15 +649,14 @@ PxeBcParseDhcp6Packet (
 \r
   ZeroMem (Cache6->OptList, sizeof (Cache6->OptList));\r
 \r
-  Option  = (EFI_DHCP6_PACKET_OPTION *) (Offer->Dhcp6.Option);\r
-  Offset  = 0;\r
-  Length  = GET_DHCP6_OPTION_SIZE (Offer);\r
+  Option = (EFI_DHCP6_PACKET_OPTION *)(Offer->Dhcp6.Option);\r
+  Offset = 0;\r
+  Length = GET_DHCP6_OPTION_SIZE (Offer);\r
 \r
   //\r
   // OpLen and OpCode here are both stored in network order, since they are from original packet.\r
   //\r
   while (Offset < Length) {\r
-\r
     if (NTOHS (Option->OpCode) == DHCP6_OPT_IA_NA) {\r
       Options[PXEBC_DHCP6_IDX_IA_NA] = Option;\r
     } else if (NTOHS (Option->OpCode) == DHCP6_OPT_BOOT_FILE_URL) {\r
@@ -669,7 +673,7 @@ PxeBcParseDhcp6Packet (
     }\r
 \r
     Offset += (NTOHS (Option->OpLen) + 4);\r
-    Option  = (EFI_DHCP6_PACKET_OPTION *) (Offer->Dhcp6.Option + Offset);\r
+    Option  = (EFI_DHCP6_PACKET_OPTION *)(Offer->Dhcp6.Option + Offset);\r
   }\r
 \r
   //\r
@@ -683,7 +687,7 @@ PxeBcParseDhcp6Packet (
                NTOHS (Option->OpLen),\r
                DHCP6_OPT_STATUS_CODE\r
                );\r
-    if ((Option != NULL && Option->Data[0] == 0) || (Option == NULL)) {\r
+    if (((Option != NULL) && (Option->Data[0] == 0)) || (Option == NULL)) {\r
       IsProxyOffer = FALSE;\r
     }\r
   }\r
@@ -692,12 +696,13 @@ PxeBcParseDhcp6Packet (
   // The offer with "PXEClient" is a pxe offer.\r
   //\r
   Option        = Options[PXEBC_DHCP6_IDX_VENDOR_CLASS];\r
-  EnterpriseNum = HTONL(PXEBC_DHCP6_ENTERPRISE_NUM);\r
+  EnterpriseNum = HTONL (PXEBC_DHCP6_ENTERPRISE_NUM);\r
 \r
-  if (Option != NULL &&\r
-      NTOHS(Option->OpLen) >= 13 &&\r
-      CompareMem (Option->Data, &EnterpriseNum, sizeof (UINT32)) == 0 &&\r
-      CompareMem (&Option->Data[6], DEFAULT_CLASS_ID_DATA, 9) == 0) {\r
+  if ((Option != NULL) &&\r
+      (NTOHS (Option->OpLen) >= 13) &&\r
+      (CompareMem (Option->Data, &EnterpriseNum, sizeof (UINT32)) == 0) &&\r
+      (CompareMem (&Option->Data[6], DEFAULT_CLASS_ID_DATA, 9) == 0))\r
+  {\r
     IsPxeOffer = TRUE;\r
   }\r
 \r
@@ -721,7 +726,6 @@ PxeBcParseDhcp6Packet (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Cache the DHCPv6 ack packet, and parse it on demand.\r
 \r
@@ -735,9 +739,9 @@ PxeBcParseDhcp6Packet (
 **/\r
 EFI_STATUS\r
 PxeBcCopyDhcp6Ack (\r
-  IN PXEBC_PRIVATE_DATA   *Private,\r
-  IN EFI_DHCP6_PACKET     *Ack,\r
-  IN BOOLEAN              Verified\r
+  IN PXEBC_PRIVATE_DATA  *Private,\r
+  IN EFI_DHCP6_PACKET    *Ack,\r
+  IN BOOLEAN             Verified\r
   )\r
 {\r
   EFI_PXE_BASE_CODE_MODE  *Mode;\r
@@ -762,7 +766,6 @@ PxeBcCopyDhcp6Ack (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Cache the DHCPv6 proxy offer packet according to the received order.\r
 \r
@@ -775,12 +778,12 @@ PxeBcCopyDhcp6Ack (
 **/\r
 EFI_STATUS\r
 PxeBcCopyDhcp6Proxy (\r
-  IN PXEBC_PRIVATE_DATA     *Private,\r
-  IN UINT32                 OfferIndex\r
+  IN PXEBC_PRIVATE_DATA  *Private,\r
+  IN UINT32              OfferIndex\r
   )\r
 {\r
-  EFI_PXE_BASE_CODE_MODE    *Mode;\r
-  EFI_DHCP6_PACKET          *Offer;\r
+  EFI_PXE_BASE_CODE_MODE  *Mode;\r
+  EFI_DHCP6_PACKET        *Offer;\r
   EFI_STATUS              Status;\r
 \r
   ASSERT (OfferIndex < Private->OfferNum);\r
@@ -793,9 +796,10 @@ PxeBcCopyDhcp6Proxy (
   // Cache the proxy offer packet and parse it.\r
   //\r
   Status = PxeBcCacheDhcp6Packet (&Private->ProxyOffer.Dhcp6.Packet.Offer, Offer);\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   PxeBcParseDhcp6Packet (&Private->ProxyOffer.Dhcp6);\r
 \r
   //\r
@@ -820,33 +824,33 @@ PxeBcCopyDhcp6Proxy (
 **/\r
 UINT8 *\r
 PxeBcDhcp6SeekOption (\r
-  IN UINT8           *Buf,\r
-  IN UINT32          SeekLen,\r
-  IN UINT16          OptType\r
+  IN UINT8   *Buf,\r
+  IN UINT32  SeekLen,\r
+  IN UINT16  OptType\r
   )\r
 {\r
-  UINT8              *Cursor;\r
-  UINT8              *Option;\r
-  UINT16             DataLen;\r
-  UINT16             OpCode;\r
+  UINT8   *Cursor;\r
+  UINT8   *Option;\r
+  UINT16  DataLen;\r
+  UINT16  OpCode;\r
 \r
   Option = NULL;\r
   Cursor = Buf;\r
 \r
   while (Cursor < Buf + SeekLen) {\r
-    OpCode = ReadUnaligned16 ((UINT16 *) Cursor);\r
+    OpCode = ReadUnaligned16 ((UINT16 *)Cursor);\r
     if (OpCode == HTONS (OptType)) {\r
       Option = Cursor;\r
       break;\r
     }\r
-    DataLen = NTOHS (ReadUnaligned16 ((UINT16 *) (Cursor + 2)));\r
+\r
+    DataLen = NTOHS (ReadUnaligned16 ((UINT16 *)(Cursor + 2)));\r
     Cursor += (DataLen + 4);\r
   }\r
 \r
   return Option;\r
 }\r
 \r
-\r
 /**\r
   Build and send out the request packet for the bootfile, and parse the reply.\r
 \r
@@ -861,34 +865,34 @@ PxeBcDhcp6SeekOption (
 **/\r
 EFI_STATUS\r
 PxeBcRequestBootService (\r
-  IN  PXEBC_PRIVATE_DATA              *Private,\r
-  IN  UINT32                          Index\r
+  IN  PXEBC_PRIVATE_DATA  *Private,\r
+  IN  UINT32              Index\r
   )\r
 {\r
-  EFI_PXE_BASE_CODE_UDP_PORT          SrcPort;\r
-  EFI_PXE_BASE_CODE_UDP_PORT          DestPort;\r
-  EFI_PXE_BASE_CODE_PROTOCOL          *PxeBc;\r
-  EFI_PXE_BASE_CODE_DHCPV6_PACKET     *Discover;\r
-  UINTN                               DiscoverLen;\r
-  EFI_DHCP6_PACKET                    *Request;\r
-  UINTN                               RequestLen;\r
-  EFI_DHCP6_PACKET                    *Reply;\r
-  UINT8                               *RequestOpt;\r
-  UINT8                               *DiscoverOpt;\r
-  UINTN                               ReadSize;\r
-  UINT16                              OpFlags;\r
-  UINT16                              OpCode;\r
-  UINT16                              OpLen;\r
-  EFI_STATUS                          Status;\r
-  EFI_DHCP6_PACKET                    *IndexOffer;\r
-  UINT8                               *Option;\r
-\r
-  PxeBc       = &Private->PxeBc;\r
-  Request     = Private->Dhcp6Request;\r
-  IndexOffer  = &Private->OfferBuffer[Index].Dhcp6.Packet.Offer;\r
-  SrcPort     = PXEBC_BS_DISCOVER_PORT;\r
-  DestPort    = PXEBC_BS_DISCOVER_PORT;\r
-  OpFlags     = 0;\r
+  EFI_PXE_BASE_CODE_UDP_PORT       SrcPort;\r
+  EFI_PXE_BASE_CODE_UDP_PORT       DestPort;\r
+  EFI_PXE_BASE_CODE_PROTOCOL       *PxeBc;\r
+  EFI_PXE_BASE_CODE_DHCPV6_PACKET  *Discover;\r
+  UINTN                            DiscoverLen;\r
+  EFI_DHCP6_PACKET                 *Request;\r
+  UINTN                            RequestLen;\r
+  EFI_DHCP6_PACKET                 *Reply;\r
+  UINT8                            *RequestOpt;\r
+  UINT8                            *DiscoverOpt;\r
+  UINTN                            ReadSize;\r
+  UINT16                           OpFlags;\r
+  UINT16                           OpCode;\r
+  UINT16                           OpLen;\r
+  EFI_STATUS                       Status;\r
+  EFI_DHCP6_PACKET                 *IndexOffer;\r
+  UINT8                            *Option;\r
+\r
+  PxeBc      = &Private->PxeBc;\r
+  Request    = Private->Dhcp6Request;\r
+  IndexOffer = &Private->OfferBuffer[Index].Dhcp6.Packet.Offer;\r
+  SrcPort    = PXEBC_BS_DISCOVER_PORT;\r
+  DestPort   = PXEBC_BS_DISCOVER_PORT;\r
+  OpFlags    = 0;\r
 \r
   if (Request == NULL) {\r
     return EFI_DEVICE_ERROR;\r
@@ -925,19 +929,20 @@ PxeBcRequestBootService (
     //\r
     // Add Server ID Option.\r
     //\r
-    OpLen = NTOHS (((EFI_DHCP6_PACKET_OPTION *) Option)->OpLen);\r
+    OpLen = NTOHS (((EFI_DHCP6_PACKET_OPTION *)Option)->OpLen);\r
     CopyMem (DiscoverOpt, Option, OpLen + 4);\r
     DiscoverOpt += (OpLen + 4);\r
     DiscoverLen += (OpLen + 4);\r
   }\r
 \r
   while (RequestLen < Request->Length) {\r
-    OpCode = NTOHS (((EFI_DHCP6_PACKET_OPTION *) RequestOpt)->OpCode);\r
-    OpLen  = NTOHS (((EFI_DHCP6_PACKET_OPTION *) RequestOpt)->OpLen);\r
-    if (OpCode != EFI_DHCP6_IA_TYPE_NA &&\r
-        OpCode != EFI_DHCP6_IA_TYPE_TA &&\r
-        OpCode != DHCP6_OPT_SERVER_ID\r
-        ) {\r
+    OpCode = NTOHS (((EFI_DHCP6_PACKET_OPTION *)RequestOpt)->OpCode);\r
+    OpLen  = NTOHS (((EFI_DHCP6_PACKET_OPTION *)RequestOpt)->OpLen);\r
+    if ((OpCode != EFI_DHCP6_IA_TYPE_NA) &&\r
+        (OpCode != EFI_DHCP6_IA_TYPE_TA) &&\r
+        (OpCode != DHCP6_OPT_SERVER_ID)\r
+        )\r
+    {\r
       //\r
       // Copy all the options except IA option and Server ID\r
       //\r
@@ -945,6 +950,7 @@ PxeBcRequestBootService (
       DiscoverOpt += (OpLen + 4);\r
       DiscoverLen += (OpLen + 4);\r
     }\r
+\r
     RequestOpt += (OpLen + 4);\r
     RequestLen += (OpLen + 4);\r
   }\r
@@ -959,7 +965,7 @@ PxeBcRequestBootService (
              );\r
   if (Option != NULL) {\r
     CalcElapsedTime (Private);\r
-    WriteUnaligned16 ((UINT16*)(Option + 4), HTONS((UINT16) Private->ElapsedTime));\r
+    WriteUnaligned16 ((UINT16 *)(Option + 4), HTONS ((UINT16)Private->ElapsedTime));\r
   }\r
 \r
   Status = PxeBc->UdpWrite (\r
@@ -973,7 +979,7 @@ PxeBcRequestBootService (
                     NULL,\r
                     NULL,\r
                     &DiscoverLen,\r
-                    (VOID *) Discover\r
+                    (VOID *)Discover\r
                     );\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -984,8 +990,8 @@ PxeBcRequestBootService (
   // Cache the right PXE reply packet here, set valid flag later.\r
   // Especially for PXE discover packet, store it into mode data here.\r
   //\r
-  Reply = &Private->ProxyOffer.Dhcp6.Packet.Offer;\r
-  ReadSize = (UINTN) Reply->Size;\r
+  Reply    = &Private->ProxyOffer.Dhcp6.Packet.Offer;\r
+  ReadSize = (UINTN)Reply->Size;\r
 \r
   //\r
   // Start Udp6Read instance\r
@@ -1005,7 +1011,7 @@ PxeBcRequestBootService (
                     NULL,\r
                     NULL,\r
                     &ReadSize,\r
-                    (VOID *) &Reply->Dhcp6\r
+                    (VOID *)&Reply->Dhcp6\r
                     );\r
   //\r
   // Stop Udp6Read instance\r
@@ -1019,7 +1025,7 @@ PxeBcRequestBootService (
   //\r
   // Update length\r
   //\r
-  Reply->Length = (UINT32) ReadSize;\r
+  Reply->Length = (UINT32)ReadSize;\r
 \r
   return EFI_SUCCESS;\r
 \r
@@ -1031,7 +1037,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Retry to request bootfile name by the BINL offer.\r
 \r
@@ -1054,8 +1059,10 @@ PxeBcRetryDhcp6Binl (
   EFI_STATUS                Status;\r
 \r
   ASSERT (Index < PXEBC_OFFER_MAX_NUM);\r
-  ASSERT (Private->OfferBuffer[Index].Dhcp6.OfferType == PxeOfferTypeDhcpBinl ||\r
-          Private->OfferBuffer[Index].Dhcp6.OfferType == PxeOfferTypeProxyBinl);\r
+  ASSERT (\r
+    Private->OfferBuffer[Index].Dhcp6.OfferType == PxeOfferTypeDhcpBinl ||\r
+    Private->OfferBuffer[Index].Dhcp6.OfferType == PxeOfferTypeProxyBinl\r
+    );\r
 \r
   Mode                  = Private->PxeBc.Mode;\r
   Private->IsDoDiscover = FALSE;\r
@@ -1078,7 +1085,7 @@ PxeBcRetryDhcp6Binl (
                Private,\r
                &Private->BootFileName,\r
                &Private->ServerIp.v6,\r
-               (CHAR8 *) (Offer->OptList[PXEBC_DHCP6_IDX_BOOT_FILE_URL]->Data),\r
+               (CHAR8 *)(Offer->OptList[PXEBC_DHCP6_IDX_BOOT_FILE_URL]->Data),\r
                NTOHS (Offer->OptList[PXEBC_DHCP6_IDX_BOOT_FILE_URL]->OpLen)\r
                );\r
     if (EFI_ERROR (Status)) {\r
@@ -1101,9 +1108,10 @@ PxeBcRetryDhcp6Binl (
     return Status;\r
   }\r
 \r
-  if (Cache6->OfferType != PxeOfferTypeProxyPxe10 &&\r
-      Cache6->OfferType != PxeOfferTypeProxyWfm11a &&\r
-      Cache6->OptList[PXEBC_DHCP6_IDX_BOOT_FILE_URL] == NULL) {\r
+  if ((Cache6->OfferType != PxeOfferTypeProxyPxe10) &&\r
+      (Cache6->OfferType != PxeOfferTypeProxyWfm11a) &&\r
+      (Cache6->OptList[PXEBC_DHCP6_IDX_BOOT_FILE_URL] == NULL))\r
+  {\r
     //\r
     // This BINL ack doesn't have discovery option set or multicast option set\r
     // or bootfile name specified.\r
@@ -1121,7 +1129,6 @@ PxeBcRetryDhcp6Binl (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Cache all the received DHCPv6 offers, and set OfferIndex and OfferCount.\r
 \r
@@ -1133,8 +1140,8 @@ PxeBcRetryDhcp6Binl (
 **/\r
 EFI_STATUS\r
 PxeBcCacheDhcp6Offer (\r
-  IN PXEBC_PRIVATE_DATA     *Private,\r
-  IN EFI_DHCP6_PACKET       *RcvdOffer\r
+  IN PXEBC_PRIVATE_DATA  *Private,\r
+  IN EFI_DHCP6_PACKET    *RcvdOffer\r
   )\r
 {\r
   PXEBC_DHCP6_PACKET_CACHE  *Cache6;\r
@@ -1179,8 +1186,9 @@ PxeBcCacheDhcp6Offer (
       //\r
       Private->OfferIndex[OfferType][Private->OfferCount[OfferType]] = Private->OfferNum;\r
       Private->OfferCount[OfferType]++;\r
-    } else if ((OfferType == PxeOfferTypeProxyPxe10 || OfferType == PxeOfferTypeProxyWfm11a) &&\r
-                 Private->OfferCount[OfferType] < 1) {\r
+    } else if (((OfferType == PxeOfferTypeProxyPxe10) || (OfferType == PxeOfferTypeProxyWfm11a)) &&\r
+               (Private->OfferCount[OfferType] < 1))\r
+    {\r
       //\r
       // Only cache the first PXE10/WFM11a offer, and discard the others.\r
       //\r
@@ -1202,7 +1210,6 @@ PxeBcCacheDhcp6Offer (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Select an DHCPv6 offer, and record SelectIndex and SelectProxyType.\r
 \r
@@ -1211,12 +1218,12 @@ PxeBcCacheDhcp6Offer (
 **/\r
 VOID\r
 PxeBcSelectDhcp6Offer (\r
-  IN PXEBC_PRIVATE_DATA     *Private\r
+  IN PXEBC_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  UINT32                Index;\r
-  UINT32                OfferIndex;\r
-  PXEBC_OFFER_TYPE      OfferType;\r
+  UINT32            Index;\r
+  UINT32            OfferIndex;\r
+  PXEBC_OFFER_TYPE  OfferType;\r
 \r
   Private->SelectIndex = 0;\r
 \r
@@ -1229,43 +1236,40 @@ PxeBcSelectDhcp6Offer (
       // 1. DhcpPxe10 offer\r
       //\r
       Private->SelectIndex = Private->OfferIndex[PxeOfferTypeDhcpPxe10][0] + 1;\r
-\r
     } else if (Private->OfferCount[PxeOfferTypeDhcpWfm11a] > 0) {\r
       //\r
       // 2. DhcpWfm11a offer\r
       //\r
       Private->SelectIndex = Private->OfferIndex[PxeOfferTypeDhcpWfm11a][0] + 1;\r
-\r
-    } else if (Private->OfferCount[PxeOfferTypeDhcpOnly] > 0 &&\r
-               Private->OfferCount[PxeOfferTypeProxyPxe10] > 0) {\r
+    } else if ((Private->OfferCount[PxeOfferTypeDhcpOnly] > 0) &&\r
+               (Private->OfferCount[PxeOfferTypeProxyPxe10] > 0))\r
+    {\r
       //\r
       // 3. DhcpOnly offer and ProxyPxe10 offer.\r
       //\r
       Private->SelectIndex     = Private->OfferIndex[PxeOfferTypeDhcpOnly][0] + 1;\r
       Private->SelectProxyType = PxeOfferTypeProxyPxe10;\r
-\r
-    } else if (Private->OfferCount[PxeOfferTypeDhcpOnly] > 0 &&\r
-               Private->OfferCount[PxeOfferTypeProxyWfm11a] > 0) {\r
+    } else if ((Private->OfferCount[PxeOfferTypeDhcpOnly] > 0) &&\r
+               (Private->OfferCount[PxeOfferTypeProxyWfm11a] > 0))\r
+    {\r
       //\r
       // 4. DhcpOnly offer and ProxyWfm11a offer.\r
       //\r
       Private->SelectIndex     = Private->OfferIndex[PxeOfferTypeDhcpOnly][0] + 1;\r
       Private->SelectProxyType = PxeOfferTypeProxyWfm11a;\r
-\r
     } else if (Private->OfferCount[PxeOfferTypeDhcpBinl] > 0) {\r
       //\r
       // 5. DhcpBinl offer.\r
       //\r
       Private->SelectIndex = Private->OfferIndex[PxeOfferTypeDhcpBinl][0] + 1;\r
-\r
-    } else if (Private->OfferCount[PxeOfferTypeDhcpOnly] > 0 &&\r
-               Private->OfferCount[PxeOfferTypeProxyBinl] > 0) {\r
+    } else if ((Private->OfferCount[PxeOfferTypeDhcpOnly] > 0) &&\r
+               (Private->OfferCount[PxeOfferTypeProxyBinl] > 0))\r
+    {\r
       //\r
       // 6. DhcpOnly offer and ProxyBinl offer.\r
       //\r
       Private->SelectIndex     = Private->OfferIndex[PxeOfferTypeDhcpOnly][0] + 1;\r
       Private->SelectProxyType = PxeOfferTypeProxyBinl;\r
-\r
     } else {\r
       //\r
       // 7. DhcpOnly offer with bootfilename.\r
@@ -1283,7 +1287,6 @@ PxeBcSelectDhcp6Offer (
     // Select offer by received order.\r
     //\r
     for (Index = 0; Index < Private->OfferNum; Index++) {\r
-\r
       OfferType = Private->OfferBuffer[Index].Dhcp6.OfferType;\r
 \r
       if (IS_PROXY_OFFER (OfferType)) {\r
@@ -1294,8 +1297,9 @@ PxeBcSelectDhcp6Offer (
       }\r
 \r
       if (!Private->IsProxyRecved &&\r
-          OfferType == PxeOfferTypeDhcpOnly &&\r
-          Private->OfferBuffer[Index].Dhcp6.OptList[PXEBC_DHCP6_IDX_BOOT_FILE_URL] == NULL) {\r
+          (OfferType == PxeOfferTypeDhcpOnly) &&\r
+          (Private->OfferBuffer[Index].Dhcp6.OptList[PXEBC_DHCP6_IDX_BOOT_FILE_URL] == NULL))\r
+      {\r
         //\r
         // Skip if DhcpOnly offer without any other proxy offers or bootfilename.\r
         //\r
@@ -1308,7 +1312,6 @@ PxeBcSelectDhcp6Offer (
   }\r
 }\r
 \r
-\r
 /**\r
   Handle the DHCPv6 offer packet.\r
 \r
@@ -1322,21 +1325,21 @@ PxeBcSelectDhcp6Offer (
 **/\r
 EFI_STATUS\r
 PxeBcHandleDhcp6Offer (\r
-  IN PXEBC_PRIVATE_DATA            *Private\r
+  IN PXEBC_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  PXEBC_DHCP6_PACKET_CACHE         *Cache6;\r
-  EFI_STATUS                       Status;\r
-  PXEBC_OFFER_TYPE                 OfferType;\r
-  UINT32                           ProxyIndex;\r
-  UINT32                           SelectIndex;\r
-  UINT32                           Index;\r
+  PXEBC_DHCP6_PACKET_CACHE  *Cache6;\r
+  EFI_STATUS                Status;\r
+  PXEBC_OFFER_TYPE          OfferType;\r
+  UINT32                    ProxyIndex;\r
+  UINT32                    SelectIndex;\r
+  UINT32                    Index;\r
 \r
   ASSERT (Private->SelectIndex > 0);\r
-  SelectIndex = (UINT32) (Private->SelectIndex - 1);\r
+  SelectIndex = (UINT32)(Private->SelectIndex - 1);\r
   ASSERT (SelectIndex < PXEBC_OFFER_MAX_NUM);\r
-  Cache6      = &Private->OfferBuffer[SelectIndex].Dhcp6;\r
-  Status      = EFI_SUCCESS;\r
+  Cache6 = &Private->OfferBuffer[SelectIndex].Dhcp6;\r
+  Status = EFI_SUCCESS;\r
 \r
   //\r
   // First try to cache DNS server address if DHCP6 offer provides.\r
@@ -1346,6 +1349,7 @@ PxeBcHandleDhcp6Offer (
     if (Private->DnsServer == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     CopyMem (Private->DnsServer, Cache6->OptList[PXEBC_DHCP6_IDX_DNS_SERVER]->Data, sizeof (EFI_IPv6_ADDRESS));\r
   }\r
 \r
@@ -1357,7 +1361,6 @@ PxeBcHandleDhcp6Offer (
       Status = EFI_NO_RESPONSE;\r
     }\r
   } else if (Cache6->OfferType == PxeOfferTypeDhcpOnly) {\r
-\r
     if (Private->IsProxyRecved) {\r
       //\r
       // DhcpOnly offer is selected, so need try to request bootfilename.\r
@@ -1375,12 +1378,12 @@ PxeBcHandleDhcp6Offer (
           // Try all the cached ProxyBinl offer one by one to request bootfilename.\r
           //\r
           for (Index = 0; Index < Private->OfferCount[Private->SelectProxyType]; Index++) {\r
-\r
             ProxyIndex = Private->OfferIndex[Private->SelectProxyType][Index];\r
             if (!EFI_ERROR (PxeBcRetryDhcp6Binl (Private, ProxyIndex))) {\r
               break;\r
             }\r
           }\r
+\r
           if (Index == Private->OfferCount[Private->SelectProxyType]) {\r
             Status = EFI_NO_RESPONSE;\r
           }\r
@@ -1397,7 +1400,6 @@ PxeBcHandleDhcp6Offer (
         Status = EFI_NO_RESPONSE;\r
 \r
         for (Index = 0; Index < Private->OfferNum; Index++) {\r
-\r
           OfferType = Private->OfferBuffer[Index].Dhcp6.OfferType;\r
 \r
           if (!IS_PROXY_OFFER (OfferType)) {\r
@@ -1423,7 +1425,7 @@ PxeBcHandleDhcp6Offer (
         }\r
       }\r
 \r
-      if (!EFI_ERROR (Status) && Private->SelectProxyType != PxeOfferTypeProxyBinl) {\r
+      if (!EFI_ERROR (Status) && (Private->SelectProxyType != PxeOfferTypeProxyBinl)) {\r
         //\r
         // Success to try to request by a ProxyPxe10 or ProxyWfm11a offer, copy and parse it.\r
         //\r
@@ -1441,14 +1443,13 @@ PxeBcHandleDhcp6Offer (
     //\r
     // All PXE boot information is ready by now.\r
     //\r
-    Status = PxeBcCopyDhcp6Ack (Private, &Private->DhcpAck.Dhcp6.Packet.Ack, TRUE);\r
+    Status                                 = PxeBcCopyDhcp6Ack (Private, &Private->DhcpAck.Dhcp6.Packet.Ack, TRUE);\r
     Private->PxeBc.Mode->DhcpDiscoverValid = TRUE;\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Unregister the address by Ip6Config protocol.\r
 \r
@@ -1457,7 +1458,7 @@ PxeBcHandleDhcp6Offer (
 **/\r
 VOID\r
 PxeBcUnregisterIp6Address (\r
-  IN PXEBC_PRIVATE_DATA           *Private\r
+  IN PXEBC_PRIVATE_DATA  *Private\r
   )\r
 {\r
   if (Private->Ip6Policy != PXEBC_IP6_POLICY_MAX) {\r
@@ -1485,18 +1486,18 @@ PxeBcUnregisterIp6Address (
 **/\r
 EFI_STATUS\r
 PxeBcCheckRouteTable (\r
-  IN  PXEBC_PRIVATE_DATA            *Private,\r
-  IN  UINTN                         TimeOutInSecond,\r
-  OUT EFI_IPv6_ADDRESS              *GatewayAddr\r
+  IN  PXEBC_PRIVATE_DATA  *Private,\r
+  IN  UINTN               TimeOutInSecond,\r
+  OUT EFI_IPv6_ADDRESS    *GatewayAddr\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  EFI_IP6_PROTOCOL                 *Ip6;\r
-  EFI_IP6_MODE_DATA                Ip6ModeData;\r
-  UINTN                            Index;\r
-  EFI_EVENT                        TimeOutEvt;\r
-  UINTN                            RetryCount;\r
-  BOOLEAN                          GatewayIsFound;\r
+  EFI_STATUS         Status;\r
+  EFI_IP6_PROTOCOL   *Ip6;\r
+  EFI_IP6_MODE_DATA  Ip6ModeData;\r
+  UINTN              Index;\r
+  EFI_EVENT          TimeOutEvt;\r
+  UINTN              RetryCount;\r
+  BOOLEAN            GatewayIsFound;\r
 \r
   ASSERT (GatewayAddr != NULL);\r
   ASSERT (Private != NULL);\r
@@ -1527,23 +1528,28 @@ PxeBcCheckRouteTable (
     if (Ip6ModeData.AddressList != NULL) {\r
       FreePool (Ip6ModeData.AddressList);\r
     }\r
+\r
     if (Ip6ModeData.GroupTable != NULL) {\r
       FreePool (Ip6ModeData.GroupTable);\r
     }\r
+\r
     if (Ip6ModeData.RouteTable != NULL) {\r
       FreePool (Ip6ModeData.RouteTable);\r
     }\r
+\r
     if (Ip6ModeData.NeighborCache != NULL) {\r
       FreePool (Ip6ModeData.NeighborCache);\r
     }\r
+\r
     if (Ip6ModeData.PrefixTable != NULL) {\r
       FreePool (Ip6ModeData.PrefixTable);\r
     }\r
+\r
     if (Ip6ModeData.IcmpTypeList != NULL) {\r
       FreePool (Ip6ModeData.IcmpTypeList);\r
     }\r
 \r
-    if (GatewayIsFound || RetryCount == TimeOutInSecond) {\r
+    if (GatewayIsFound || (RetryCount == TimeOutInSecond)) {\r
       break;\r
     }\r
 \r
@@ -1569,6 +1575,7 @@ PxeBcCheckRouteTable (
     if (EFI_ERROR (Status)) {\r
       goto ON_EXIT;\r
     }\r
+\r
     while (EFI_ERROR (gBS->CheckEvent (TimeOutEvt))) {\r
       Ip6->Poll (Ip6);\r
     }\r
@@ -1600,29 +1607,29 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 PxeBcRegisterIp6Address (\r
-  IN PXEBC_PRIVATE_DATA            *Private,\r
-  IN EFI_IPv6_ADDRESS              *Address\r
+  IN PXEBC_PRIVATE_DATA  *Private,\r
+  IN EFI_IPv6_ADDRESS    *Address\r
   )\r
 {\r
-  EFI_IP6_PROTOCOL                 *Ip6;\r
-  EFI_IP6_CONFIG_PROTOCOL          *Ip6Cfg;\r
-  EFI_IP6_CONFIG_POLICY            Policy;\r
-  EFI_IP6_CONFIG_MANUAL_ADDRESS    CfgAddr;\r
-  EFI_IPv6_ADDRESS                 GatewayAddr;\r
-  UINTN                            DataSize;\r
-  EFI_EVENT                        MappedEvt;\r
-  EFI_STATUS                       Status;\r
-  BOOLEAN                          NoGateway;\r
-  EFI_IPv6_ADDRESS                 *Ip6Addr;\r
-  UINTN                            Index;\r
-\r
-  Status     = EFI_SUCCESS;\r
-  MappedEvt  = NULL;\r
-  Ip6Addr    = NULL;\r
-  DataSize   = sizeof (EFI_IP6_CONFIG_POLICY);\r
-  Ip6Cfg     = Private->Ip6Cfg;\r
-  Ip6        = Private->Ip6;\r
-  NoGateway  = FALSE;\r
+  EFI_IP6_PROTOCOL               *Ip6;\r
+  EFI_IP6_CONFIG_PROTOCOL        *Ip6Cfg;\r
+  EFI_IP6_CONFIG_POLICY          Policy;\r
+  EFI_IP6_CONFIG_MANUAL_ADDRESS  CfgAddr;\r
+  EFI_IPv6_ADDRESS               GatewayAddr;\r
+  UINTN                          DataSize;\r
+  EFI_EVENT                      MappedEvt;\r
+  EFI_STATUS                     Status;\r
+  BOOLEAN                        NoGateway;\r
+  EFI_IPv6_ADDRESS               *Ip6Addr;\r
+  UINTN                          Index;\r
+\r
+  Status    = EFI_SUCCESS;\r
+  MappedEvt = NULL;\r
+  Ip6Addr   = NULL;\r
+  DataSize  = sizeof (EFI_IP6_CONFIG_POLICY);\r
+  Ip6Cfg    = Private->Ip6Cfg;\r
+  Ip6       = Private->Ip6;\r
+  NoGateway = FALSE;\r
 \r
   ZeroMem (&CfgAddr, sizeof (EFI_IP6_CONFIG_MANUAL_ADDRESS));\r
   CopyMem (&CfgAddr.Address, Address, sizeof (EFI_IPv6_ADDRESS));\r
@@ -1648,7 +1655,7 @@ PxeBcRegisterIp6Address (
   Status = Ip6Cfg->SetData (\r
                      Ip6Cfg,\r
                      Ip6ConfigDataTypePolicy,\r
-                     sizeof(EFI_IP6_CONFIG_POLICY),\r
+                     sizeof (EFI_IP6_CONFIG_POLICY),\r
                      &Policy\r
                      );\r
   if (EFI_ERROR (Status)) {\r
@@ -1674,22 +1681,22 @@ PxeBcRegisterIp6Address (
   }\r
 \r
   Private->IsAddressOk = FALSE;\r
-  Status = Ip6Cfg->RegisterDataNotify (\r
-                     Ip6Cfg,\r
-                     Ip6ConfigDataTypeManualAddress,\r
-                     MappedEvt\r
-                     );\r
-  if (EFI_ERROR(Status)) {\r
+  Status               = Ip6Cfg->RegisterDataNotify (\r
+                                   Ip6Cfg,\r
+                                   Ip6ConfigDataTypeManualAddress,\r
+                                   MappedEvt\r
+                                   );\r
+  if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
 \r
   Status = Ip6Cfg->SetData (\r
                      Ip6Cfg,\r
                      Ip6ConfigDataTypeManualAddress,\r
-                     sizeof(EFI_IP6_CONFIG_MANUAL_ADDRESS),\r
+                     sizeof (EFI_IP6_CONFIG_MANUAL_ADDRESS),\r
                      &CfgAddr\r
                      );\r
-  if (EFI_ERROR(Status) && Status != EFI_NOT_READY) {\r
+  if (EFI_ERROR (Status) && (Status != EFI_NOT_READY)) {\r
     goto ON_EXIT;\r
   } else if (Status == EFI_NOT_READY) {\r
     //\r
@@ -1698,17 +1705,18 @@ PxeBcRegisterIp6Address (
     while (!Private->IsAddressOk) {\r
       Ip6->Poll (Ip6);\r
     }\r
+\r
     //\r
     // Check whether the IP6 address setting is successed.\r
     //\r
     DataSize = 0;\r
-    Status = Ip6Cfg->GetData (\r
-                       Ip6Cfg,\r
-                       Ip6ConfigDataTypeManualAddress,\r
-                       &DataSize,\r
-                       NULL\r
-                       );\r
-    if (Status != EFI_BUFFER_TOO_SMALL || DataSize == 0) {\r
+    Status   = Ip6Cfg->GetData (\r
+                         Ip6Cfg,\r
+                         Ip6ConfigDataTypeManualAddress,\r
+                         &DataSize,\r
+                         NULL\r
+                         );\r
+    if ((Status != EFI_BUFFER_TOO_SMALL) || (DataSize == 0)) {\r
       Status = EFI_DEVICE_ERROR;\r
       goto ON_EXIT;\r
     }\r
@@ -1717,11 +1725,12 @@ PxeBcRegisterIp6Address (
     if (Ip6Addr == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     Status = Ip6Cfg->GetData (\r
                        Ip6Cfg,\r
                        Ip6ConfigDataTypeManualAddress,\r
                        &DataSize,\r
-                       (VOID*) Ip6Addr\r
+                       (VOID *)Ip6Addr\r
                        );\r
     if (EFI_ERROR (Status)) {\r
       Status = EFI_DEVICE_ERROR;\r
@@ -1733,6 +1742,7 @@ PxeBcRegisterIp6Address (
         break;\r
       }\r
     }\r
+\r
     if (Index == DataSize / sizeof (EFI_IPv6_ADDRESS)) {\r
       Status = EFI_ABORTED;\r
       goto ON_EXIT;\r
@@ -1763,9 +1773,11 @@ ON_EXIT:
               );\r
     gBS->CloseEvent (MappedEvt);\r
   }\r
+\r
   if (Ip6Addr != NULL) {\r
     FreePool (Ip6Addr);\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -1780,16 +1792,16 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 PxeBcSetIp6Policy (\r
-  IN PXEBC_PRIVATE_DATA            *Private\r
+  IN PXEBC_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_IP6_CONFIG_POLICY            Policy;\r
-  EFI_STATUS                       Status;\r
-  EFI_IP6_CONFIG_PROTOCOL          *Ip6Cfg;\r
-  UINTN                            DataSize;\r
+  EFI_IP6_CONFIG_POLICY    Policy;\r
+  EFI_STATUS               Status;\r
+  EFI_IP6_CONFIG_PROTOCOL  *Ip6Cfg;\r
+  UINTN                    DataSize;\r
 \r
-  Ip6Cfg      = Private->Ip6Cfg;\r
-  DataSize    = sizeof (EFI_IP6_CONFIG_POLICY);\r
+  Ip6Cfg   = Private->Ip6Cfg;\r
+  DataSize = sizeof (EFI_IP6_CONFIG_POLICY);\r
 \r
   //\r
   // Get and store the current policy of IP6 driver.\r
@@ -1809,7 +1821,7 @@ PxeBcSetIp6Policy (
     Status = Ip6Cfg->SetData (\r
                        Ip6Cfg,\r
                        Ip6ConfigDataTypePolicy,\r
-                       sizeof(EFI_IP6_CONFIG_POLICY),\r
+                       sizeof (EFI_IP6_CONFIG_POLICY),\r
                        &Policy\r
                        );\r
     if (EFI_ERROR (Status)) {\r
@@ -1834,11 +1846,11 @@ PxeBcSetIp6Policy (
 **/\r
 EFI_STATUS\r
 PxeBcSetIp6Address (\r
-  IN  PXEBC_PRIVATE_DATA              *Private\r
+  IN  PXEBC_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_DHCP6_PROTOCOL          *Dhcp6;\r
+  EFI_STATUS          Status;\r
+  EFI_DHCP6_PROTOCOL  *Dhcp6;\r
 \r
   Dhcp6 = Private->Dhcp6;\r
 \r
@@ -1885,47 +1897,48 @@ PxeBcSetIp6Address (
 EFI_STATUS\r
 EFIAPI\r
 PxeBcDhcp6CallBack (\r
-  IN  EFI_DHCP6_PROTOCOL           *This,\r
-  IN  VOID                         *Context,\r
-  IN  EFI_DHCP6_STATE              CurrentState,\r
-  IN  EFI_DHCP6_EVENT              Dhcp6Event,\r
-  IN  EFI_DHCP6_PACKET             *Packet,\r
-  OUT EFI_DHCP6_PACKET             **NewPacket     OPTIONAL\r
+  IN  EFI_DHCP6_PROTOCOL  *This,\r
+  IN  VOID                *Context,\r
+  IN  EFI_DHCP6_STATE     CurrentState,\r
+  IN  EFI_DHCP6_EVENT     Dhcp6Event,\r
+  IN  EFI_DHCP6_PACKET    *Packet,\r
+  OUT EFI_DHCP6_PACKET    **NewPacket     OPTIONAL\r
   )\r
 {\r
-  PXEBC_PRIVATE_DATA                  *Private;\r
-  EFI_PXE_BASE_CODE_MODE              *Mode;\r
-  EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL *Callback;\r
-  EFI_DHCP6_PACKET                    *SelectAd;\r
-  EFI_STATUS                          Status;\r
-  BOOLEAN                             Received;\r
+  PXEBC_PRIVATE_DATA                   *Private;\r
+  EFI_PXE_BASE_CODE_MODE               *Mode;\r
+  EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL  *Callback;\r
+  EFI_DHCP6_PACKET                     *SelectAd;\r
+  EFI_STATUS                           Status;\r
+  BOOLEAN                              Received;\r
 \r
   if ((Dhcp6Event != Dhcp6RcvdAdvertise) &&\r
       (Dhcp6Event != Dhcp6SelectAdvertise) &&\r
       (Dhcp6Event != Dhcp6SendSolicit) &&\r
       (Dhcp6Event != Dhcp6SendRequest) &&\r
-      (Dhcp6Event != Dhcp6RcvdReply)) {\r
+      (Dhcp6Event != Dhcp6RcvdReply))\r
+  {\r
     return EFI_SUCCESS;\r
   }\r
 \r
   ASSERT (Packet != NULL);\r
 \r
-  Private   = (PXEBC_PRIVATE_DATA *) Context;\r
-  Mode      = Private->PxeBc.Mode;\r
-  Callback  = Private->PxeBcCallback;\r
+  Private  = (PXEBC_PRIVATE_DATA *)Context;\r
+  Mode     = Private->PxeBc.Mode;\r
+  Callback = Private->PxeBcCallback;\r
 \r
   //\r
   // Callback to user when any traffic occurred if has.\r
   //\r
-  if (Dhcp6Event != Dhcp6SelectAdvertise && Callback != NULL) {\r
-    Received = (BOOLEAN) (Dhcp6Event == Dhcp6RcvdAdvertise || Dhcp6Event == Dhcp6RcvdReply);\r
-    Status = Callback->Callback (\r
-                         Callback,\r
-                         Private->Function,\r
-                         Received,\r
-                         Packet->Length,\r
-                         (EFI_PXE_BASE_CODE_PACKET *) &Packet->Dhcp6\r
-                         );\r
+  if ((Dhcp6Event != Dhcp6SelectAdvertise) && (Callback != NULL)) {\r
+    Received = (BOOLEAN)(Dhcp6Event == Dhcp6RcvdAdvertise || Dhcp6Event == Dhcp6RcvdReply);\r
+    Status   = Callback->Callback (\r
+                           Callback,\r
+                           Private->Function,\r
+                           Received,\r
+                           Packet->Length,\r
+                           (EFI_PXE_BASE_CODE_PACKET *)&Packet->Dhcp6\r
+                           );\r
     if (Status != EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE) {\r
       return EFI_ABORTED;\r
     }\r
@@ -1934,108 +1947,114 @@ PxeBcDhcp6CallBack (
   Status = EFI_SUCCESS;\r
 \r
   switch (Dhcp6Event) {\r
+    case Dhcp6SendSolicit:\r
+      if (Packet->Length > PXEBC_DHCP6_PACKET_MAX_SIZE) {\r
+        //\r
+        // If the to be sent packet exceeds the maximum length, abort the DHCP process.\r
+        //\r
+        Status = EFI_ABORTED;\r
+        break;\r
+      }\r
 \r
-  case Dhcp6SendSolicit:\r
-    if (Packet->Length > PXEBC_DHCP6_PACKET_MAX_SIZE) {\r
       //\r
-      // If the to be sent packet exceeds the maximum length, abort the DHCP process.\r
+      // Record the first Solicate msg time\r
       //\r
-      Status = EFI_ABORTED;\r
-      break;\r
-    }\r
-\r
-    //\r
-    // Record the first Solicate msg time\r
-    //\r
-    if (Private->SolicitTimes == 0) {\r
-      CalcElapsedTime (Private);\r
-      Private->SolicitTimes++;\r
-    }\r
-    //\r
-    // Cache the dhcp discover packet to mode data directly.\r
-    //\r
-    CopyMem (&Mode->DhcpDiscover.Dhcpv4, &Packet->Dhcp6, Packet->Length);\r
-    break;\r
+      if (Private->SolicitTimes == 0) {\r
+        CalcElapsedTime (Private);\r
+        Private->SolicitTimes++;\r
+      }\r
 \r
-  case Dhcp6RcvdAdvertise:\r
-    Status = EFI_NOT_READY;\r
-    if (Packet->Length > PXEBC_DHCP6_PACKET_MAX_SIZE) {\r
       //\r
-      // Ignore the incoming packets which exceed the maximum length.\r
+      // Cache the dhcp discover packet to mode data directly.\r
       //\r
+      CopyMem (&Mode->DhcpDiscover.Dhcpv4, &Packet->Dhcp6, Packet->Length);\r
       break;\r
-    }\r
-    if (Private->OfferNum < PXEBC_OFFER_MAX_NUM) {\r
+\r
+    case Dhcp6RcvdAdvertise:\r
+      Status = EFI_NOT_READY;\r
+      if (Packet->Length > PXEBC_DHCP6_PACKET_MAX_SIZE) {\r
+        //\r
+        // Ignore the incoming packets which exceed the maximum length.\r
+        //\r
+        break;\r
+      }\r
+\r
+      if (Private->OfferNum < PXEBC_OFFER_MAX_NUM) {\r
+        //\r
+        // Cache the dhcp offers to OfferBuffer[] for select later, and record\r
+        // the OfferIndex and OfferCount.\r
+        //\r
+        PxeBcCacheDhcp6Offer (Private, Packet);\r
+      }\r
+\r
+      break;\r
+\r
+    case Dhcp6SendRequest:\r
+      if (Packet->Length > PXEBC_DHCP6_PACKET_MAX_SIZE) {\r
+        //\r
+        // If the to be sent packet exceeds the maximum length, abort the DHCP process.\r
+        //\r
+        Status = EFI_ABORTED;\r
+        break;\r
+      }\r
+\r
       //\r
-      // Cache the dhcp offers to OfferBuffer[] for select later, and record\r
-      // the OfferIndex and OfferCount.\r
+      // Store the request packet as seed packet for discover.\r
       //\r
-      PxeBcCacheDhcp6Offer (Private, Packet);\r
-    }\r
-    break;\r
+      if (Private->Dhcp6Request != NULL) {\r
+        FreePool (Private->Dhcp6Request);\r
+      }\r
+\r
+      Private->Dhcp6Request = AllocateZeroPool (Packet->Size);\r
+      if (Private->Dhcp6Request != NULL) {\r
+        CopyMem (Private->Dhcp6Request, Packet, Packet->Size);\r
+      }\r
+\r
+      break;\r
 \r
-  case Dhcp6SendRequest:\r
-    if (Packet->Length > PXEBC_DHCP6_PACKET_MAX_SIZE) {\r
+    case Dhcp6SelectAdvertise:\r
       //\r
-      // If the to be sent packet exceeds the maximum length, abort the DHCP process.\r
+      // Select offer by the default policy or by order, and record the SelectIndex\r
+      // and SelectProxyType.\r
       //\r
-      Status = EFI_ABORTED;\r
-      break;\r
-    }\r
+      PxeBcSelectDhcp6Offer (Private);\r
 \r
-    //\r
-    // Store the request packet as seed packet for discover.\r
-    //\r
-    if (Private->Dhcp6Request != NULL) {\r
-      FreePool (Private->Dhcp6Request);\r
-    }\r
-    Private->Dhcp6Request = AllocateZeroPool (Packet->Size);\r
-    if (Private->Dhcp6Request != NULL) {\r
-      CopyMem (Private->Dhcp6Request, Packet, Packet->Size);\r
-    }\r
-    break;\r
+      if (Private->SelectIndex == 0) {\r
+        Status = EFI_ABORTED;\r
+      } else {\r
+        ASSERT (NewPacket != NULL);\r
+        SelectAd   = &Private->OfferBuffer[Private->SelectIndex - 1].Dhcp6.Packet.Offer;\r
+        *NewPacket = AllocateZeroPool (SelectAd->Size);\r
+        ASSERT (*NewPacket != NULL);\r
+        if (*NewPacket == NULL) {\r
+          return EFI_ABORTED;\r
+        }\r
 \r
-  case Dhcp6SelectAdvertise:\r
-    //\r
-    // Select offer by the default policy or by order, and record the SelectIndex\r
-    // and SelectProxyType.\r
-    //\r
-    PxeBcSelectDhcp6Offer (Private);\r
+        CopyMem (*NewPacket, SelectAd, SelectAd->Size);\r
+      }\r
 \r
-    if (Private->SelectIndex == 0) {\r
-      Status = EFI_ABORTED;\r
-    } else {\r
-      ASSERT (NewPacket != NULL);\r
-      SelectAd   = &Private->OfferBuffer[Private->SelectIndex - 1].Dhcp6.Packet.Offer;\r
-      *NewPacket = AllocateZeroPool (SelectAd->Size);\r
-      ASSERT (*NewPacket != NULL);\r
-      if (*NewPacket == NULL) {\r
-        return EFI_ABORTED;\r
+      break;\r
+\r
+    case Dhcp6RcvdReply:\r
+      //\r
+      // Cache the dhcp ack to Private->Dhcp6Ack, but it's not the final ack in mode data\r
+      // without verification.\r
+      //\r
+      ASSERT (Private->SelectIndex != 0);\r
+      Status = PxeBcCopyDhcp6Ack (Private, Packet, FALSE);\r
+      if (EFI_ERROR (Status)) {\r
+        Status = EFI_ABORTED;\r
       }\r
-      CopyMem (*NewPacket, SelectAd, SelectAd->Size);\r
-    }\r
-    break;\r
 \r
-  case Dhcp6RcvdReply:\r
-    //\r
-    // Cache the dhcp ack to Private->Dhcp6Ack, but it's not the final ack in mode data\r
-    // without verification.\r
-    //\r
-    ASSERT (Private->SelectIndex != 0);\r
-    Status = PxeBcCopyDhcp6Ack (Private, Packet, FALSE);\r
-    if (EFI_ERROR (Status)) {\r
-      Status = EFI_ABORTED;\r
-    }\r
-    break;\r
+      break;\r
 \r
-  default:\r
-    ASSERT (0);\r
+    default:\r
+      ASSERT (0);\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Build and send out the request packet for the bootfile, and parse the reply.\r
 \r
@@ -2053,37 +2072,37 @@ PxeBcDhcp6CallBack (
 **/\r
 EFI_STATUS\r
 PxeBcDhcp6Discover (\r
-  IN  PXEBC_PRIVATE_DATA              *Private,\r
-  IN  UINT16                          Type,\r
-  IN  UINT16                          *Layer,\r
-  IN  BOOLEAN                         UseBis,\r
-  IN  EFI_IP_ADDRESS                  *DestIp\r
+  IN  PXEBC_PRIVATE_DATA  *Private,\r
+  IN  UINT16              Type,\r
+  IN  UINT16              *Layer,\r
+  IN  BOOLEAN             UseBis,\r
+  IN  EFI_IP_ADDRESS      *DestIp\r
   )\r
 {\r
-  EFI_PXE_BASE_CODE_UDP_PORT          SrcPort;\r
-  EFI_PXE_BASE_CODE_UDP_PORT          DestPort;\r
-  EFI_PXE_BASE_CODE_MODE              *Mode;\r
-  EFI_PXE_BASE_CODE_PROTOCOL          *PxeBc;\r
-  EFI_PXE_BASE_CODE_DHCPV6_PACKET     *Discover;\r
-  UINTN                               DiscoverLen;\r
-  EFI_DHCP6_PACKET                    *Request;\r
-  UINTN                               RequestLen;\r
-  EFI_DHCP6_PACKET                    *Reply;\r
-  UINT8                               *RequestOpt;\r
-  UINT8                               *DiscoverOpt;\r
-  UINTN                               ReadSize;\r
-  UINT16                              OpCode;\r
-  UINT16                              OpLen;\r
-  UINT32                              Xid;\r
-  EFI_STATUS                          Status;\r
-\r
-  PxeBc       = &Private->PxeBc;\r
-  Mode        = PxeBc->Mode;\r
-  Request     = Private->Dhcp6Request;\r
-  SrcPort     = PXEBC_BS_DISCOVER_PORT;\r
-  DestPort    = PXEBC_BS_DISCOVER_PORT;\r
-\r
-  if (!UseBis && Layer != NULL) {\r
+  EFI_PXE_BASE_CODE_UDP_PORT       SrcPort;\r
+  EFI_PXE_BASE_CODE_UDP_PORT       DestPort;\r
+  EFI_PXE_BASE_CODE_MODE           *Mode;\r
+  EFI_PXE_BASE_CODE_PROTOCOL       *PxeBc;\r
+  EFI_PXE_BASE_CODE_DHCPV6_PACKET  *Discover;\r
+  UINTN                            DiscoverLen;\r
+  EFI_DHCP6_PACKET                 *Request;\r
+  UINTN                            RequestLen;\r
+  EFI_DHCP6_PACKET                 *Reply;\r
+  UINT8                            *RequestOpt;\r
+  UINT8                            *DiscoverOpt;\r
+  UINTN                            ReadSize;\r
+  UINT16                           OpCode;\r
+  UINT16                           OpLen;\r
+  UINT32                           Xid;\r
+  EFI_STATUS                       Status;\r
+\r
+  PxeBc    = &Private->PxeBc;\r
+  Mode     = PxeBc->Mode;\r
+  Request  = Private->Dhcp6Request;\r
+  SrcPort  = PXEBC_BS_DISCOVER_PORT;\r
+  DestPort = PXEBC_BS_DISCOVER_PORT;\r
+\r
+  if (!UseBis && (Layer != NULL)) {\r
     *Layer &= EFI_PXE_BASE_CODE_BOOT_LAYER_MASK;\r
   }\r
 \r
@@ -2108,10 +2127,11 @@ PxeBcDhcp6Discover (
   RequestLen              = DiscoverLen;\r
 \r
   while (RequestLen < Request->Length) {\r
-    OpCode = NTOHS (((EFI_DHCP6_PACKET_OPTION *) RequestOpt)->OpCode);\r
-    OpLen  = NTOHS (((EFI_DHCP6_PACKET_OPTION *) RequestOpt)->OpLen);\r
-    if (OpCode != EFI_DHCP6_IA_TYPE_NA &&\r
-        OpCode != EFI_DHCP6_IA_TYPE_TA) {\r
+    OpCode = NTOHS (((EFI_DHCP6_PACKET_OPTION *)RequestOpt)->OpCode);\r
+    OpLen  = NTOHS (((EFI_DHCP6_PACKET_OPTION *)RequestOpt)->OpLen);\r
+    if ((OpCode != EFI_DHCP6_IA_TYPE_NA) &&\r
+        (OpCode != EFI_DHCP6_IA_TYPE_TA))\r
+    {\r
       //\r
       // Copy all the options except IA option.\r
       //\r
@@ -2119,6 +2139,7 @@ PxeBcDhcp6Discover (
       DiscoverOpt += (OpLen + 4);\r
       DiscoverLen += (OpLen + 4);\r
     }\r
+\r
     RequestOpt += (OpLen + 4);\r
     RequestLen += (OpLen + 4);\r
   }\r
@@ -2134,7 +2155,7 @@ PxeBcDhcp6Discover (
                     NULL,\r
                     NULL,\r
                     &DiscoverLen,\r
-                    (VOID *) Discover\r
+                    (VOID *)Discover\r
                     );\r
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
@@ -2150,7 +2171,8 @@ PxeBcDhcp6Discover (
   } else {\r
     Reply = &Private->ProxyOffer.Dhcp6.Packet.Offer;\r
   }\r
-  ReadSize = (UINTN) Reply->Size;\r
+\r
+  ReadSize = (UINTN)Reply->Size;\r
 \r
   //\r
   // Start Udp6Read instance\r
@@ -2170,7 +2192,7 @@ PxeBcDhcp6Discover (
                     NULL,\r
                     NULL,\r
                     &ReadSize,\r
-                    (VOID *) &Reply->Dhcp6\r
+                    (VOID *)&Reply->Dhcp6\r
                     );\r
   //\r
   // Stop Udp6Read instance\r
@@ -2190,7 +2212,6 @@ ON_ERROR:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Start the DHCPv6 S.A.R.R. process to acquire the IPv6 address and other PXE boot information.\r
 \r
@@ -2203,35 +2224,35 @@ ON_ERROR:
 **/\r
 EFI_STATUS\r
 PxeBcDhcp6Sarr (\r
-  IN PXEBC_PRIVATE_DATA            *Private,\r
-  IN EFI_DHCP6_PROTOCOL            *Dhcp6\r
+  IN PXEBC_PRIVATE_DATA  *Private,\r
+  IN EFI_DHCP6_PROTOCOL  *Dhcp6\r
   )\r
 {\r
-  EFI_PXE_BASE_CODE_MODE           *PxeMode;\r
-  EFI_DHCP6_CONFIG_DATA            Config;\r
-  EFI_DHCP6_MODE_DATA              Mode;\r
-  EFI_DHCP6_RETRANSMISSION         *Retransmit;\r
-  EFI_DHCP6_PACKET_OPTION          *OptList[PXEBC_DHCP6_OPTION_MAX_NUM];\r
-  UINT8                            Buffer[PXEBC_DHCP6_OPTION_MAX_SIZE];\r
-  UINT32                           OptCount;\r
-  EFI_STATUS                       Status;\r
-  EFI_IP6_CONFIG_PROTOCOL          *Ip6Cfg;\r
-  EFI_STATUS                       TimerStatus;\r
-  EFI_EVENT                        Timer;\r
-  UINT64                           GetMappingTimeOut;\r
-  UINTN                            DataSize;\r
-  EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS    DadXmits;\r
-\r
-  Status     = EFI_SUCCESS;\r
-  PxeMode    = Private->PxeBc.Mode;\r
-  Ip6Cfg     = Private->Ip6Cfg;\r
-  Timer      = NULL;\r
+  EFI_PXE_BASE_CODE_MODE                    *PxeMode;\r
+  EFI_DHCP6_CONFIG_DATA                     Config;\r
+  EFI_DHCP6_MODE_DATA                       Mode;\r
+  EFI_DHCP6_RETRANSMISSION                  *Retransmit;\r
+  EFI_DHCP6_PACKET_OPTION                   *OptList[PXEBC_DHCP6_OPTION_MAX_NUM];\r
+  UINT8                                     Buffer[PXEBC_DHCP6_OPTION_MAX_SIZE];\r
+  UINT32                                    OptCount;\r
+  EFI_STATUS                                Status;\r
+  EFI_IP6_CONFIG_PROTOCOL                   *Ip6Cfg;\r
+  EFI_STATUS                                TimerStatus;\r
+  EFI_EVENT                                 Timer;\r
+  UINT64                                    GetMappingTimeOut;\r
+  UINTN                                     DataSize;\r
+  EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS  DadXmits;\r
+\r
+  Status  = EFI_SUCCESS;\r
+  PxeMode = Private->PxeBc.Mode;\r
+  Ip6Cfg  = Private->Ip6Cfg;\r
+  Timer   = NULL;\r
 \r
   //\r
   // Build option list for the request packet.\r
   //\r
-  OptCount   = PxeBcBuildDhcp6Options (Private, OptList, Buffer);\r
-  ASSERT (OptCount> 0);\r
+  OptCount = PxeBcBuildDhcp6Options (Private, OptList, Buffer);\r
+  ASSERT (OptCount > 0);\r
 \r
   Retransmit = AllocateZeroPool (sizeof (EFI_DHCP6_RETRANSMISSION));\r
   if (Retransmit == NULL) {\r
@@ -2274,7 +2295,6 @@ PxeBcDhcp6Sarr (
   ZeroMem (Private->OfferCount, sizeof (Private->OfferCount));\r
   ZeroMem (Private->OfferIndex, sizeof (Private->OfferIndex));\r
 \r
-\r
   //\r
   // Start DHCPv6 S.A.R.R. process to acquire IPv6 address.\r
   //\r
@@ -2290,12 +2310,12 @@ PxeBcDhcp6Sarr (
     // Get Duplicate Address Detection Transmits count.\r
     //\r
     DataSize = sizeof (EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS);\r
-    Status = Ip6Cfg->GetData (\r
-                       Ip6Cfg,\r
-                       Ip6ConfigDataTypeDupAddrDetectTransmits,\r
-                       &DataSize,\r
-                       &DadXmits\r
-                       );\r
+    Status   = Ip6Cfg->GetData (\r
+                         Ip6Cfg,\r
+                         Ip6ConfigDataTypeDupAddrDetectTransmits,\r
+                         &DataSize,\r
+                         &DadXmits\r
+                         );\r
     if (EFI_ERROR (Status)) {\r
       Dhcp6->Configure (Dhcp6, NULL);\r
       return Status;\r
@@ -2308,7 +2328,7 @@ PxeBcDhcp6Sarr (
     }\r
 \r
     GetMappingTimeOut = TICKS_PER_SECOND * DadXmits.DupAddrDetectTransmits + PXEBC_DAD_ADDITIONAL_DELAY;\r
-    Status = gBS->SetTimer (Timer, TimerRelative, GetMappingTimeOut);\r
+    Status            = gBS->SetTimer (Timer, TimerRelative, GetMappingTimeOut);\r
     if (EFI_ERROR (Status)) {\r
       gBS->CloseEvent (Timer);\r
       Dhcp6->Configure (Dhcp6, NULL);\r
@@ -2316,7 +2336,6 @@ PxeBcDhcp6Sarr (
     }\r
 \r
     do {\r
-\r
       TimerStatus = gBS->CheckEvent (Timer);\r
       if (!EFI_ERROR (TimerStatus)) {\r
         Status = Dhcp6->Start (Dhcp6);\r
@@ -2325,10 +2344,12 @@ PxeBcDhcp6Sarr (
 \r
     gBS->CloseEvent (Timer);\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     if (Status == EFI_ICMP_ERROR) {\r
       PxeMode->IcmpErrorReceived = TRUE;\r
     }\r
+\r
     Dhcp6->Configure (Dhcp6, NULL);\r
     return Status;\r
   }\r
@@ -2354,9 +2375,11 @@ PxeBcDhcp6Sarr (
   if (Mode.ClientId != NULL) {\r
     FreePool (Mode.ClientId);\r
   }\r
+\r
   if (Mode.Ia != NULL) {\r
     FreePool (Mode.Ia);\r
   }\r
+\r
   //\r
   // Check the selected offer whether BINL retry is needed.\r
   //\r
index ae4be775e85d18ad5af30b83d1530761d49c5ee9..c86f6d391b801c41a80dee9119662f2135cdd11d 100644 (file)
 #ifndef __EFI_PXEBC_DHCP6_H__\r
 #define __EFI_PXEBC_DHCP6_H__\r
 \r
-#define PXEBC_DHCP6_OPTION_MAX_NUM        16\r
-#define PXEBC_DHCP6_OPTION_MAX_SIZE       312\r
-#define PXEBC_DHCP6_PACKET_MAX_SIZE       (sizeof (EFI_PXE_BASE_CODE_PACKET))\r
-#define PXEBC_IP6_POLICY_MAX              0xff\r
-#define PXEBC_IP6_ROUTE_TABLE_TIMEOUT     10\r
+#define PXEBC_DHCP6_OPTION_MAX_NUM     16\r
+#define PXEBC_DHCP6_OPTION_MAX_SIZE    312\r
+#define PXEBC_DHCP6_PACKET_MAX_SIZE    (sizeof (EFI_PXE_BASE_CODE_PACKET))\r
+#define PXEBC_IP6_POLICY_MAX           0xff\r
+#define PXEBC_IP6_ROUTE_TABLE_TIMEOUT  10\r
 \r
-#define PXEBC_DHCP6_S_PORT                547\r
-#define PXEBC_DHCP6_C_PORT                546\r
+#define PXEBC_DHCP6_S_PORT  547\r
+#define PXEBC_DHCP6_C_PORT  546\r
 \r
-#define PXEBC_DHCP6_ENTERPRISE_NUM        343   // TODO: IANA TBD: temporarily using Intel's\r
-#define PXEBC_DHCP6_MAX_BOOT_FILE_SIZE    65535 //   It's a limitation of bit length, 65535*512 bytes.\r
+#define PXEBC_DHCP6_ENTERPRISE_NUM      343     // TODO: IANA TBD: temporarily using Intel's\r
+#define PXEBC_DHCP6_MAX_BOOT_FILE_SIZE  65535   //   It's a limitation of bit length, 65535*512 bytes.\r
 \r
-\r
-#define PXEBC_DHCP6_IDX_IA_NA             0\r
-#define PXEBC_DHCP6_IDX_BOOT_FILE_URL     1\r
-#define PXEBC_DHCP6_IDX_BOOT_FILE_PARAM   2\r
-#define PXEBC_DHCP6_IDX_VENDOR_CLASS      3\r
-#define PXEBC_DHCP6_IDX_DNS_SERVER        4\r
-#define PXEBC_DHCP6_IDX_MAX               5\r
+#define PXEBC_DHCP6_IDX_IA_NA            0\r
+#define PXEBC_DHCP6_IDX_BOOT_FILE_URL    1\r
+#define PXEBC_DHCP6_IDX_BOOT_FILE_PARAM  2\r
+#define PXEBC_DHCP6_IDX_VENDOR_CLASS     3\r
+#define PXEBC_DHCP6_IDX_DNS_SERVER       4\r
+#define PXEBC_DHCP6_IDX_MAX              5\r
 \r
 #define PXEBC_DHCP6_BOOT_FILE_URL_PREFIX  "tftp://"\r
 #define PXEBC_TFTP_URL_SEPARATOR          '/'\r
    (Type) == PxeOfferTypeProxyPxe10 || \\r
    (Type) == PxeOfferTypeProxyWfm11a)\r
 \r
-\r
 #pragma pack(1)\r
 typedef struct {\r
-  UINT16 OpCode[256];\r
+  UINT16    OpCode[256];\r
 } PXEBC_DHCP6_OPTION_ORO;\r
 \r
 typedef struct {\r
-  UINT8 Type;\r
-  UINT8 MajorVer;\r
-  UINT8 MinorVer;\r
+  UINT8    Type;\r
+  UINT8    MajorVer;\r
+  UINT8    MinorVer;\r
 } PXEBC_DHCP6_OPTION_UNDI;\r
 \r
 typedef struct {\r
-  UINT16 Type;\r
+  UINT16    Type;\r
 } PXEBC_DHCP6_OPTION_ARCH;\r
 \r
 typedef struct {\r
-  UINT8 ClassIdentifier[10];\r
-  UINT8 ArchitecturePrefix[5];\r
-  UINT8 ArchitectureType[5];\r
-  UINT8 Lit3[1];\r
-  UINT8 InterfaceName[4];\r
-  UINT8 Lit4[1];\r
-  UINT8 UndiMajor[3];\r
-  UINT8 UndiMinor[3];\r
+  UINT8    ClassIdentifier[10];\r
+  UINT8    ArchitecturePrefix[5];\r
+  UINT8    ArchitectureType[5];\r
+  UINT8    Lit3[1];\r
+  UINT8    InterfaceName[4];\r
+  UINT8    Lit4[1];\r
+  UINT8    UndiMajor[3];\r
+  UINT8    UndiMinor[3];\r
 } PXEBC_CLASS_ID;\r
 \r
 typedef struct {\r
-  UINT32         Vendor;\r
-  UINT16         ClassLen;\r
-  PXEBC_CLASS_ID ClassId;\r
+  UINT32            Vendor;\r
+  UINT16            ClassLen;\r
+  PXEBC_CLASS_ID    ClassId;\r
 } PXEBC_DHCP6_OPTION_VENDOR_CLASS;\r
 \r
 #pragma pack()\r
 \r
 typedef union {\r
-  PXEBC_DHCP6_OPTION_ORO            *Oro;\r
-  PXEBC_DHCP6_OPTION_UNDI           *Undi;\r
-  PXEBC_DHCP6_OPTION_ARCH           *Arch;\r
-  PXEBC_DHCP6_OPTION_VENDOR_CLASS   *VendorClass;\r
+  PXEBC_DHCP6_OPTION_ORO             *Oro;\r
+  PXEBC_DHCP6_OPTION_UNDI            *Undi;\r
+  PXEBC_DHCP6_OPTION_ARCH            *Arch;\r
+  PXEBC_DHCP6_OPTION_VENDOR_CLASS    *VendorClass;\r
 } PXEBC_DHCP6_OPTION_ENTRY;\r
 \r
 typedef struct {\r
-  LIST_ENTRY              Link;\r
-  EFI_DHCP6_PACKET_OPTION *Option;\r
-  UINT8                   Precedence;\r
+  LIST_ENTRY                 Link;\r
+  EFI_DHCP6_PACKET_OPTION    *Option;\r
+  UINT8                      Precedence;\r
 } PXEBC_DHCP6_OPTION_NODE;\r
 \r
 #define PXEBC_CACHED_DHCP6_PACKET_MAX_SIZE  (OFFSET_OF (EFI_DHCP6_PACKET, Dhcp6) + PXEBC_DHCP6_PACKET_MAX_SIZE)\r
 \r
 typedef union {\r
-  EFI_DHCP6_PACKET        Offer;\r
-  EFI_DHCP6_PACKET        Ack;\r
-  UINT8                   Buffer[PXEBC_CACHED_DHCP6_PACKET_MAX_SIZE];\r
+  EFI_DHCP6_PACKET    Offer;\r
+  EFI_DHCP6_PACKET    Ack;\r
+  UINT8               Buffer[PXEBC_CACHED_DHCP6_PACKET_MAX_SIZE];\r
 } PXEBC_DHCP6_PACKET;\r
 \r
 typedef struct {\r
-  PXEBC_DHCP6_PACKET      Packet;\r
-  PXEBC_OFFER_TYPE        OfferType;\r
-  EFI_DHCP6_PACKET_OPTION *OptList[PXEBC_DHCP6_IDX_MAX];\r
+  PXEBC_DHCP6_PACKET         Packet;\r
+  PXEBC_OFFER_TYPE           OfferType;\r
+  EFI_DHCP6_PACKET_OPTION    *OptList[PXEBC_DHCP6_IDX_MAX];\r
 } PXEBC_DHCP6_PACKET_CACHE;\r
 \r
-\r
-\r
-\r
 /**\r
   Parse the Boot File URL option.\r
 \r
@@ -128,14 +123,13 @@ typedef struct {
 **/\r
 EFI_STATUS\r
 PxeBcExtractBootFileUrl (\r
-  IN PXEBC_PRIVATE_DATA      *Private,\r
-     OUT UINT8               **FileName,\r
-  IN OUT EFI_IPv6_ADDRESS    *SrvAddr,\r
-  IN     CHAR8               *BootFile,\r
-  IN     UINT16              Length\r
+  IN PXEBC_PRIVATE_DATA    *Private,\r
+  OUT UINT8                **FileName,\r
+  IN OUT EFI_IPv6_ADDRESS  *SrvAddr,\r
+  IN     CHAR8             *BootFile,\r
+  IN     UINT16            Length\r
   );\r
 \r
-\r
 /**\r
   Parse the Boot File Parameter option.\r
 \r
@@ -148,11 +142,10 @@ PxeBcExtractBootFileUrl (
 **/\r
 EFI_STATUS\r
 PxeBcExtractBootFileParam (\r
-  IN  CHAR8                  *BootFilePara,\r
-  OUT UINT16                 *BootFileSize\r
+  IN  CHAR8   *BootFilePara,\r
+  OUT UINT16  *BootFileSize\r
   );\r
 \r
-\r
 /**\r
   Parse the cached DHCPv6 packet, including all the options.\r
 \r
@@ -167,7 +160,6 @@ PxeBcParseDhcp6Packet (
   IN PXEBC_DHCP6_PACKET_CACHE  *Cache6\r
   );\r
 \r
-\r
 /**\r
   Register the ready address by Ip6Config protocol.\r
 \r
@@ -180,11 +172,10 @@ PxeBcParseDhcp6Packet (
 **/\r
 EFI_STATUS\r
 PxeBcRegisterIp6Address (\r
-  IN PXEBC_PRIVATE_DATA            *Private,\r
-  IN EFI_IPv6_ADDRESS              *Address\r
+  IN PXEBC_PRIVATE_DATA  *Private,\r
+  IN EFI_IPv6_ADDRESS    *Address\r
   );\r
 \r
-\r
 /**\r
   Unregister the address by Ip6Config protocol.\r
 \r
@@ -193,10 +184,9 @@ PxeBcRegisterIp6Address (
 **/\r
 VOID\r
 PxeBcUnregisterIp6Address (\r
-  IN PXEBC_PRIVATE_DATA            *Private\r
+  IN PXEBC_PRIVATE_DATA  *Private\r
   );\r
 \r
-\r
 /**\r
   Build and send out the request packet for the bootfile, and parse the reply.\r
 \r
@@ -214,11 +204,11 @@ PxeBcUnregisterIp6Address (
 **/\r
 EFI_STATUS\r
 PxeBcDhcp6Discover (\r
-  IN  PXEBC_PRIVATE_DATA            *Private,\r
-  IN  UINT16                        Type,\r
-  IN  UINT16                        *Layer,\r
-  IN  BOOLEAN                       UseBis,\r
-  IN  EFI_IP_ADDRESS                *DestIp\r
+  IN  PXEBC_PRIVATE_DATA  *Private,\r
+  IN  UINT16              Type,\r
+  IN  UINT16              *Layer,\r
+  IN  BOOLEAN             UseBis,\r
+  IN  EFI_IP_ADDRESS      *DestIp\r
   );\r
 \r
 /**\r
@@ -232,7 +222,7 @@ PxeBcDhcp6Discover (
 **/\r
 EFI_STATUS\r
 PxeBcSetIp6Policy (\r
-  IN PXEBC_PRIVATE_DATA            *Private\r
+  IN PXEBC_PRIVATE_DATA  *Private\r
   );\r
 \r
 /**\r
@@ -246,7 +236,7 @@ PxeBcSetIp6Policy (
 **/\r
 EFI_STATUS\r
 PxeBcSetIp6Address (\r
-  IN  PXEBC_PRIVATE_DATA              *Private\r
+  IN  PXEBC_PRIVATE_DATA  *Private\r
   );\r
 \r
 /**\r
@@ -261,9 +251,8 @@ PxeBcSetIp6Address (
 **/\r
 EFI_STATUS\r
 PxeBcDhcp6Sarr (\r
-  IN PXEBC_PRIVATE_DATA            *Private,\r
-  IN EFI_DHCP6_PROTOCOL            *Dhcp6\r
+  IN PXEBC_PRIVATE_DATA  *Private,\r
+  IN EFI_DHCP6_PROTOCOL  *Dhcp6\r
   );\r
 \r
 #endif\r
-\r
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
index 6bb907732b958f7e44eba6b546a3eb00a98abc4a..a724729e1180763bf0ff599cf8e7beb1989835f8 100644 (file)
@@ -10,8 +10,8 @@
 #ifndef __EFI_PXEBC_DRIVER_H__\r
 #define __EFI_PXEBC_DRIVER_H__\r
 \r
-extern EFI_COMPONENT_NAME_PROTOCOL  gPxeBcComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL gPxeBcComponentName2;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gPxeBcComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gPxeBcComponentName2;\r
 \r
 /**\r
   Test to see if this driver supports ControllerHandle. This service\r
@@ -64,7 +64,6 @@ PxeBcIp4DriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   );\r
 \r
-\r
 /**\r
   Stop this driver on ControllerHandle. This service is called by the\r
   EFI boot service DisconnectController(). In order to\r
@@ -171,5 +170,5 @@ PxeBcIp6DriverBindingStop (
   IN UINTN                        NumberOfChildren,\r
   IN EFI_HANDLE                   *ChildHandleBuffer\r
   );\r
-#endif\r
 \r
+#endif\r
index 2e9d31547dd6f4a6933a7d124f372d17342ff980..0a4baf6f90e8583c884cd2b4484401de35cc5f21 100644 (file)
@@ -9,7 +9,6 @@
 \r
 #include "PxeBcImpl.h"\r
 \r
-\r
 /**\r
   Enables the use of the PXE Base Code Protocol functions.\r
 \r
@@ -42,8 +41,8 @@
 EFI_STATUS\r
 EFIAPI\r
 EfiPxeBcStart (\r
-  IN EFI_PXE_BASE_CODE_PROTOCOL       *This,\r
-  IN BOOLEAN                          UseIpv6\r
+  IN EFI_PXE_BASE_CODE_PROTOCOL  *This,\r
+  IN BOOLEAN                     UseIpv6\r
   )\r
 {\r
   PXEBC_PRIVATE_DATA      *Private;\r
@@ -65,9 +64,9 @@ EfiPxeBcStart (
   //\r
   // Detect whether using IPv6 or not, and set it into mode data.\r
   //\r
-  if (UseIpv6 && Mode->Ipv6Available && Mode->Ipv6Supported && Private->Ip6Nic != NULL) {\r
+  if (UseIpv6 && Mode->Ipv6Available && Mode->Ipv6Supported && (Private->Ip6Nic != NULL)) {\r
     Mode->UsingIpv6 = TRUE;\r
-  } else if (!UseIpv6 && Private->Ip4Nic != NULL) {\r
+  } else if (!UseIpv6 && (Private->Ip4Nic != NULL)) {\r
     Mode->UsingIpv6 = FALSE;\r
   } else {\r
     return EFI_UNSUPPORTED;\r
@@ -90,7 +89,7 @@ EfiPxeBcStart (
     // Configure block size for TFTP as a default value to handle all link layers.\r
     //\r
     Private->BlockSize = Private->Ip6MaxPacketSize -\r
-                           PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE;\r
+                         PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE;\r
 \r
     //\r
     // PXE over IPv6 starts here, initialize the fields and list header.\r
@@ -108,13 +107,13 @@ EfiPxeBcStart (
     // Create event and set status for token to capture ICMP6 error message.\r
     //\r
     Private->Icmp6Token.Status = EFI_NOT_READY;\r
-    Status = gBS->CreateEvent (\r
-                    EVT_NOTIFY_SIGNAL,\r
-                    TPL_NOTIFY,\r
-                    PxeBcIcmp6ErrorUpdate,\r
-                    Private,\r
-                    &Private->Icmp6Token.Event\r
-                    );\r
+    Status                     = gBS->CreateEvent (\r
+                                        EVT_NOTIFY_SIGNAL,\r
+                                        TPL_NOTIFY,\r
+                                        PxeBcIcmp6ErrorUpdate,\r
+                                        Private,\r
+                                        &Private->Icmp6Token.Event\r
+                                        );\r
     if (EFI_ERROR (Status)) {\r
       goto ON_ERROR;\r
     }\r
@@ -143,7 +142,7 @@ EfiPxeBcStart (
     // Configure block size for TFTP as a default value to handle all link layers.\r
     //\r
     Private->BlockSize = Private->Ip4MaxPacketSize -\r
-                           PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE;\r
+                         PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE;\r
 \r
     //\r
     // PXE over IPv4 starts here, initialize the fields.\r
@@ -188,23 +187,23 @@ EfiPxeBcStart (
     // Create event and set status for token to capture ICMP error message.\r
     //\r
     Private->Icmp6Token.Status = EFI_NOT_READY;\r
-    Status = gBS->CreateEvent (\r
-                    EVT_NOTIFY_SIGNAL,\r
-                    TPL_NOTIFY,\r
-                    PxeBcIcmpErrorUpdate,\r
-                    Private,\r
-                    &Private->IcmpToken.Event\r
-                    );\r
+    Status                     = gBS->CreateEvent (\r
+                                        EVT_NOTIFY_SIGNAL,\r
+                                        TPL_NOTIFY,\r
+                                        PxeBcIcmpErrorUpdate,\r
+                                        Private,\r
+                                        &Private->IcmpToken.Event\r
+                                        );\r
     if (EFI_ERROR (Status)) {\r
       goto ON_ERROR;\r
     }\r
 \r
     //\r
-    //DHCP4 service allows only one of its children to be configured in\r
-    //the active state, If the DHCP4 D.O.R.A started by IP4 auto\r
-    //configuration and has not been completed, the Dhcp4 state machine\r
-    //will not be in the right state for the PXE to start a new round D.O.R.A.\r
-    //so we need to switch its policy to static.\r
+    // DHCP4 service allows only one of its children to be configured in\r
+    // the active state, If the DHCP4 D.O.R.A started by IP4 auto\r
+    // configuration and has not been completed, the Dhcp4 state machine\r
+    // will not be in the right state for the PXE to start a new round D.O.R.A.\r
+    // so we need to switch its policy to static.\r
     //\r
     Status = PxeBcSetIp4Policy (Private);\r
     if (EFI_ERROR (Status)) {\r
@@ -216,7 +215,7 @@ EfiPxeBcStart (
   // If PcdTftpBlockSize is set to non-zero, override the default value.\r
   //\r
   if (PcdGet64 (PcdTftpBlockSize) != 0) {\r
-    Private->BlockSize   = (UINTN) PcdGet64 (PcdTftpBlockSize);\r
+    Private->BlockSize = (UINTN)PcdGet64 (PcdTftpBlockSize);\r
   }\r
 \r
   //\r
@@ -244,6 +243,7 @@ ON_ERROR:
       gBS->CloseEvent (Private->Icmp6Token.Event);\r
       Private->Icmp6Token.Event = NULL;\r
     }\r
+\r
     Private->Udp6Read->Configure (Private->Udp6Read, NULL);\r
     Private->Ip6->Configure (Private->Ip6, NULL);\r
   } else {\r
@@ -251,17 +251,19 @@ ON_ERROR:
       gBS->CloseEvent (Private->ArpUpdateEvent);\r
       Private->ArpUpdateEvent = NULL;\r
     }\r
+\r
     if (Private->IcmpToken.Event != NULL) {\r
       gBS->CloseEvent (Private->IcmpToken.Event);\r
       Private->IcmpToken.Event = NULL;\r
     }\r
+\r
     Private->Udp4Read->Configure (Private->Udp4Read, NULL);\r
     Private->Ip4->Configure (Private->Ip4, NULL);\r
   }\r
+\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Disable the use of the PXE Base Code Protocol functions.\r
 \r
@@ -282,7 +284,7 @@ ON_ERROR:
 EFI_STATUS\r
 EFIAPI\r
 EfiPxeBcStop (\r
-  IN EFI_PXE_BASE_CODE_PROTOCOL       *This\r
+  IN EFI_PXE_BASE_CODE_PROTOCOL  *This\r
   )\r
 {\r
   PXEBC_PRIVATE_DATA      *Private;\r
@@ -321,10 +323,12 @@ EfiPxeBcStop (
       gBS->CloseEvent (Private->Icmp6Token.Event);\r
       Private->Icmp6Token.Event = NULL;\r
     }\r
+\r
     if (Private->Dhcp6Request != NULL) {\r
       FreePool (Private->Dhcp6Request);\r
       Private->Dhcp6Request = NULL;\r
     }\r
+\r
     if (Private->BootFileName != NULL) {\r
       FreePool (Private->BootFileName);\r
       Private->BootFileName = NULL;\r
@@ -348,10 +352,12 @@ EfiPxeBcStop (
       gBS->CloseEvent (Private->ArpUpdateEvent);\r
       Private->ArpUpdateEvent = NULL;\r
     }\r
+\r
     if (Private->IcmpToken.Event != NULL) {\r
       gBS->CloseEvent (Private->IcmpToken.Event);\r
       Private->IcmpToken.Event = NULL;\r
     }\r
+\r
     Private->BootFileName = NULL;\r
   }\r
 \r
@@ -378,7 +384,6 @@ EfiPxeBcStop (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Attempts to complete a DHCPv4 D.O.R.A. (discover / offer / request / acknowledge) or DHCPv6\r
   S.A.R.R (solicit / advertise / request / reply) sequence.\r
@@ -410,8 +415,8 @@ EfiPxeBcStop (
 EFI_STATUS\r
 EFIAPI\r
 EfiPxeBcDhcp (\r
-  IN EFI_PXE_BASE_CODE_PROTOCOL       *This,\r
-  IN BOOLEAN                          SortOffers\r
+  IN EFI_PXE_BASE_CODE_PROTOCOL  *This,\r
+  IN BOOLEAN                     SortOffers\r
   )\r
 {\r
   PXEBC_PRIVATE_DATA           *Private;\r
@@ -437,7 +442,6 @@ EfiPxeBcDhcp (
   }\r
 \r
   if (Mode->UsingIpv6) {\r
-\r
     //\r
     // Stop Udp6Read instance\r
     //\r
@@ -448,7 +452,6 @@ EfiPxeBcDhcp (
     //\r
     Status = PxeBcDhcp6Sarr (Private, Private->Dhcp6);\r
   } else {\r
-\r
     //\r
     // Stop Udp4Read instance\r
     //\r
@@ -468,18 +471,18 @@ EfiPxeBcDhcp (
   } else {\r
     Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);\r
   }\r
+\r
   //\r
   // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP\r
   // receive filter list emptied and the filter set to EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP.\r
   //\r
-  ZeroMem(&IpFilter, sizeof (EFI_PXE_BASE_CODE_IP_FILTER));\r
+  ZeroMem (&IpFilter, sizeof (EFI_PXE_BASE_CODE_IP_FILTER));\r
   IpFilter.Filters = EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP;\r
   This->SetIpFilter (This, &IpFilter);\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Attempts to complete the PXE Boot Server and/or boot image discovery sequence.\r
 \r
@@ -534,15 +537,15 @@ EfiPxeBcDiscover (
   IN EFI_PXE_BASE_CODE_DISCOVER_INFO  *Info   OPTIONAL\r
   )\r
 {\r
-  PXEBC_PRIVATE_DATA              *Private;\r
-  EFI_PXE_BASE_CODE_MODE          *Mode;\r
-  EFI_PXE_BASE_CODE_DISCOVER_INFO DefaultInfo;\r
-  EFI_PXE_BASE_CODE_SRVLIST       *SrvList;\r
-  PXEBC_BOOT_SVR_ENTRY            *BootSvrEntry;\r
-  UINT16                          Index;\r
-  EFI_STATUS                      Status;\r
-  EFI_PXE_BASE_CODE_IP_FILTER     IpFilter;\r
-  EFI_PXE_BASE_CODE_DISCOVER_INFO *NewCreatedInfo;\r
+  PXEBC_PRIVATE_DATA               *Private;\r
+  EFI_PXE_BASE_CODE_MODE           *Mode;\r
+  EFI_PXE_BASE_CODE_DISCOVER_INFO  DefaultInfo;\r
+  EFI_PXE_BASE_CODE_SRVLIST        *SrvList;\r
+  PXEBC_BOOT_SVR_ENTRY             *BootSvrEntry;\r
+  UINT16                           Index;\r
+  EFI_STATUS                       Status;\r
+  EFI_PXE_BASE_CODE_IP_FILTER      IpFilter;\r
+  EFI_PXE_BASE_CODE_DISCOVER_INFO  *NewCreatedInfo;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -569,13 +572,11 @@ EfiPxeBcDiscover (
   }\r
 \r
   if (Mode->UsingIpv6) {\r
-\r
     //\r
     // Stop Udp6Read instance\r
     //\r
     Private->Udp6Read->Configure (Private->Udp6Read, NULL);\r
   } else {\r
-\r
     //\r
     // Stop Udp4Read instance\r
     //\r
@@ -592,7 +593,8 @@ EfiPxeBcDiscover (
     //\r
     if (!Mode->PxeDiscoverValid ||\r
         !Mode->PxeReplyReceived ||\r
-        (!Mode->PxeBisReplyReceived && UseBis)) {\r
+        (!Mode->PxeBisReplyReceived && UseBis))\r
+    {\r
       Status = EFI_INVALID_PARAMETER;\r
       goto ON_EXIT;\r
     }\r
@@ -605,16 +607,16 @@ EfiPxeBcDiscover (
     SrvList[0].AcceptAnyResponse = FALSE;\r
 \r
     CopyMem (&SrvList->IpAddr, &Private->ServerIp, sizeof (EFI_IP_ADDRESS));\r
-\r
   } else if (Info == NULL) {\r
     //\r
     // 2. Extract the discover information from the cached packets if unspecified.\r
     //\r
     NewCreatedInfo = &DefaultInfo;\r
-    Status = PxeBcExtractDiscoverInfo (Private, Type, &NewCreatedInfo, &BootSvrEntry, &SrvList);\r
+    Status         = PxeBcExtractDiscoverInfo (Private, Type, &NewCreatedInfo, &BootSvrEntry, &SrvList);\r
     if (EFI_ERROR (Status)) {\r
       goto ON_EXIT;\r
     }\r
+\r
     ASSERT (NewCreatedInfo != NULL);\r
     Info = NewCreatedInfo;\r
   } else {\r
@@ -629,6 +631,7 @@ EfiPxeBcDiscover (
           break;\r
         }\r
       }\r
+\r
       if (Index != Info->IpCnt) {\r
         //\r
         // It's invalid if the first server doesn't accept any response\r
@@ -644,7 +647,8 @@ EfiPxeBcDiscover (
   // Info and BootSvrEntry/SrvList are all ready by now, so execute discover by UniCast/BroadCast/MultiCast.\r
   //\r
   if ((!Info->UseUCast && !Info->UseBCast && !Info->UseMCast) ||\r
-      (Info->MustUseList && Info->IpCnt == 0)) {\r
+      (Info->MustUseList && (Info->IpCnt == 0)))\r
+  {\r
     Status = EFI_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
   }\r
@@ -664,7 +668,6 @@ EfiPxeBcDiscover (
                Info->IpCnt,\r
                SrvList\r
                );\r
-\r
   } else if (Info->UseBCast) {\r
     //\r
     // Do discover by broadcast, but only valid for IPv4.\r
@@ -679,7 +682,6 @@ EfiPxeBcDiscover (
                Info->IpCnt,\r
                SrvList\r
                );\r
-\r
   } else if (Info->UseUCast) {\r
     //\r
     // Do discover by unicast.\r
@@ -702,7 +704,7 @@ EfiPxeBcDiscover (
                  Info->IpCnt,\r
                  SrvList\r
                  );\r
-      }\r
+    }\r
   }\r
 \r
   if (!EFI_ERROR (Status)) {\r
@@ -736,7 +738,7 @@ EfiPxeBcDiscover (
 \r
 ON_EXIT:\r
 \r
-  if (NewCreatedInfo != NULL && NewCreatedInfo != &DefaultInfo) {\r
+  if ((NewCreatedInfo != NULL) && (NewCreatedInfo != &DefaultInfo)) {\r
     FreePool (NewCreatedInfo);\r
   }\r
 \r
@@ -750,14 +752,13 @@ ON_EXIT:
   // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP\r
   // receive filter list emptied and the filter set to EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP.\r
   //\r
-  ZeroMem(&IpFilter, sizeof (EFI_PXE_BASE_CODE_IP_FILTER));\r
+  ZeroMem (&IpFilter, sizeof (EFI_PXE_BASE_CODE_IP_FILTER));\r
   IpFilter.Filters = EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP;\r
   This->SetIpFilter (This, &IpFilter);\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Used to perform TFTP and MTFTP services.\r
 \r
@@ -824,60 +825,62 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 EfiPxeBcMtftp (\r
-  IN     EFI_PXE_BASE_CODE_PROTOCOL       *This,\r
-  IN     EFI_PXE_BASE_CODE_TFTP_OPCODE    Operation,\r
-  IN OUT VOID                             *BufferPtr    OPTIONAL,\r
-  IN     BOOLEAN                          Overwrite,\r
-  IN OUT UINT64                           *BufferSize,\r
-  IN     UINTN                            *BlockSize    OPTIONAL,\r
-  IN     EFI_IP_ADDRESS                   *ServerIp,\r
-  IN     UINT8                            *Filename,\r
-  IN     EFI_PXE_BASE_CODE_MTFTP_INFO     *Info         OPTIONAL,\r
-  IN     BOOLEAN                          DontUseBuffer\r
+  IN     EFI_PXE_BASE_CODE_PROTOCOL     *This,\r
+  IN     EFI_PXE_BASE_CODE_TFTP_OPCODE  Operation,\r
+  IN OUT VOID                           *BufferPtr    OPTIONAL,\r
+  IN     BOOLEAN                        Overwrite,\r
+  IN OUT UINT64                         *BufferSize,\r
+  IN     UINTN                          *BlockSize    OPTIONAL,\r
+  IN     EFI_IP_ADDRESS                 *ServerIp,\r
+  IN     UINT8                          *Filename,\r
+  IN     EFI_PXE_BASE_CODE_MTFTP_INFO   *Info         OPTIONAL,\r
+  IN     BOOLEAN                        DontUseBuffer\r
   )\r
 {\r
-  PXEBC_PRIVATE_DATA              *Private;\r
-  EFI_PXE_BASE_CODE_MODE          *Mode;\r
-  EFI_MTFTP4_CONFIG_DATA          Mtftp4Config;\r
-  EFI_MTFTP6_CONFIG_DATA          Mtftp6Config;\r
-  VOID                            *Config;\r
-  EFI_STATUS                      Status;\r
-  EFI_PXE_BASE_CODE_IP_FILTER     IpFilter;\r
-  UINTN                           WindowSize;\r
+  PXEBC_PRIVATE_DATA           *Private;\r
+  EFI_PXE_BASE_CODE_MODE       *Mode;\r
+  EFI_MTFTP4_CONFIG_DATA       Mtftp4Config;\r
+  EFI_MTFTP6_CONFIG_DATA       Mtftp6Config;\r
+  VOID                         *Config;\r
+  EFI_STATUS                   Status;\r
+  EFI_PXE_BASE_CODE_IP_FILTER  IpFilter;\r
+  UINTN                        WindowSize;\r
 \r
   if ((This == NULL) ||\r
       (Filename == NULL) ||\r
       (BufferSize == NULL) ||\r
       (ServerIp == NULL) ||\r
-      ((BlockSize != NULL) && (*BlockSize < PXE_MTFTP_DEFAULT_BLOCK_SIZE))) {\r
+      ((BlockSize != NULL) && (*BlockSize < PXE_MTFTP_DEFAULT_BLOCK_SIZE)))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (Operation == EFI_PXE_BASE_CODE_TFTP_READ_FILE ||\r
-      Operation == EFI_PXE_BASE_CODE_TFTP_READ_DIRECTORY ||\r
-      Operation == EFI_PXE_BASE_CODE_MTFTP_READ_FILE ||\r
-      Operation == EFI_PXE_BASE_CODE_MTFTP_READ_DIRECTORY) {\r
-    if (BufferPtr == NULL && !DontUseBuffer) {\r
+  if ((Operation == EFI_PXE_BASE_CODE_TFTP_READ_FILE) ||\r
+      (Operation == EFI_PXE_BASE_CODE_TFTP_READ_DIRECTORY) ||\r
+      (Operation == EFI_PXE_BASE_CODE_MTFTP_READ_FILE) ||\r
+      (Operation == EFI_PXE_BASE_CODE_MTFTP_READ_DIRECTORY))\r
+  {\r
+    if ((BufferPtr == NULL) && !DontUseBuffer) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
 \r
-  Config    = NULL;\r
-  Status    = EFI_DEVICE_ERROR;\r
-  Private   = PXEBC_PRIVATE_DATA_FROM_PXEBC (This);\r
-  Mode      = Private->PxeBc.Mode;\r
+  Config  = NULL;\r
+  Status  = EFI_DEVICE_ERROR;\r
+  Private = PXEBC_PRIVATE_DATA_FROM_PXEBC (This);\r
+  Mode    = Private->PxeBc.Mode;\r
 \r
   //\r
   // Get PcdPxeTftpWindowSize.\r
   //\r
-  WindowSize = (UINTN) PcdGet64 (PcdPxeTftpWindowSize);\r
+  WindowSize = (UINTN)PcdGet64 (PcdPxeTftpWindowSize);\r
 \r
   if (Mode->UsingIpv6) {\r
     if (!NetIp6IsValidUnicast (&ServerIp->v6)) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   } else {\r
-    if (IP4_IS_UNSPECIFIED (NTOHL (ServerIp->Addr[0])) || IP4_IS_LOCAL_BROADCAST (NTOHL (ServerIp->Addr[0])))   {\r
+    if (IP4_IS_UNSPECIFIED (NTOHL (ServerIp->Addr[0])) || IP4_IS_LOCAL_BROADCAST (NTOHL (ServerIp->Addr[0]))) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
@@ -887,9 +890,9 @@ EfiPxeBcMtftp (
     // Set configuration data for Mtftp6 instance.\r
     //\r
     ZeroMem (&Mtftp6Config, sizeof (EFI_MTFTP6_CONFIG_DATA));\r
-    Config                         = &Mtftp6Config;\r
-    Mtftp6Config.TimeoutValue      = PXEBC_MTFTP_TIMEOUT;\r
-    Mtftp6Config.TryCount          = PXEBC_MTFTP_RETRIES;\r
+    Config                    = &Mtftp6Config;\r
+    Mtftp6Config.TimeoutValue = PXEBC_MTFTP_TIMEOUT;\r
+    Mtftp6Config.TryCount     = PXEBC_MTFTP_RETRIES;\r
     CopyMem (&Mtftp6Config.StationIp, &Private->StationIp.v6, sizeof (EFI_IPv6_ADDRESS));\r
     CopyMem (&Mtftp6Config.ServerIp, &ServerIp->v6, sizeof (EFI_IPv6_ADDRESS));\r
     //\r
@@ -919,83 +922,82 @@ EfiPxeBcMtftp (
   Mode->IcmpErrorReceived = FALSE;\r
 \r
   switch (Operation) {\r
+    case EFI_PXE_BASE_CODE_TFTP_GET_FILE_SIZE:\r
+      //\r
+      // Send TFTP request to get file size.\r
+      //\r
+      Status = PxeBcTftpGetFileSize (\r
+                 Private,\r
+                 Config,\r
+                 Filename,\r
+                 BlockSize,\r
+                 (WindowSize > 1) ? &WindowSize : NULL,\r
+                 BufferSize\r
+                 );\r
 \r
-  case EFI_PXE_BASE_CODE_TFTP_GET_FILE_SIZE:\r
-    //\r
-    // Send TFTP request to get file size.\r
-    //\r
-    Status = PxeBcTftpGetFileSize (\r
-               Private,\r
-               Config,\r
-               Filename,\r
-               BlockSize,\r
-               (WindowSize > 1) ? &WindowSize : NULL,\r
-               BufferSize\r
-               );\r
-\r
-    break;\r
+      break;\r
 \r
-  case EFI_PXE_BASE_CODE_TFTP_READ_FILE:\r
-    //\r
-    // Send TFTP request to read file.\r
-    //\r
-    Status = PxeBcTftpReadFile (\r
-               Private,\r
-               Config,\r
-               Filename,\r
-               BlockSize,\r
-               (WindowSize > 1) ? &WindowSize : NULL,\r
-               BufferPtr,\r
-               BufferSize,\r
-               DontUseBuffer\r
-               );\r
+    case EFI_PXE_BASE_CODE_TFTP_READ_FILE:\r
+      //\r
+      // Send TFTP request to read file.\r
+      //\r
+      Status = PxeBcTftpReadFile (\r
+                 Private,\r
+                 Config,\r
+                 Filename,\r
+                 BlockSize,\r
+                 (WindowSize > 1) ? &WindowSize : NULL,\r
+                 BufferPtr,\r
+                 BufferSize,\r
+                 DontUseBuffer\r
+                 );\r
 \r
-    break;\r
+      break;\r
 \r
-  case EFI_PXE_BASE_CODE_TFTP_WRITE_FILE:\r
-    //\r
-    // Send TFTP request to write file.\r
-    //\r
-    Status = PxeBcTftpWriteFile (\r
-               Private,\r
-               Config,\r
-               Filename,\r
-               Overwrite,\r
-               BlockSize,\r
-               BufferPtr,\r
-               BufferSize\r
-               );\r
+    case EFI_PXE_BASE_CODE_TFTP_WRITE_FILE:\r
+      //\r
+      // Send TFTP request to write file.\r
+      //\r
+      Status = PxeBcTftpWriteFile (\r
+                 Private,\r
+                 Config,\r
+                 Filename,\r
+                 Overwrite,\r
+                 BlockSize,\r
+                 BufferPtr,\r
+                 BufferSize\r
+                 );\r
 \r
-    break;\r
+      break;\r
 \r
-  case EFI_PXE_BASE_CODE_TFTP_READ_DIRECTORY:\r
-    //\r
-    // Send TFTP request to read directory.\r
-    //\r
-    Status = PxeBcTftpReadDirectory (\r
-               Private,\r
-               Config,\r
-               Filename,\r
-               BlockSize,\r
-               (WindowSize > 1) ? &WindowSize : NULL,\r
-               BufferPtr,\r
-               BufferSize,\r
-               DontUseBuffer\r
-               );\r
+    case EFI_PXE_BASE_CODE_TFTP_READ_DIRECTORY:\r
+      //\r
+      // Send TFTP request to read directory.\r
+      //\r
+      Status = PxeBcTftpReadDirectory (\r
+                 Private,\r
+                 Config,\r
+                 Filename,\r
+                 BlockSize,\r
+                 (WindowSize > 1) ? &WindowSize : NULL,\r
+                 BufferPtr,\r
+                 BufferSize,\r
+                 DontUseBuffer\r
+                 );\r
 \r
-    break;\r
+      break;\r
 \r
-  case EFI_PXE_BASE_CODE_MTFTP_GET_FILE_SIZE:\r
-  case EFI_PXE_BASE_CODE_MTFTP_READ_FILE:\r
-  case EFI_PXE_BASE_CODE_MTFTP_READ_DIRECTORY:\r
-    Status = EFI_UNSUPPORTED;\r
+    case EFI_PXE_BASE_CODE_MTFTP_GET_FILE_SIZE:\r
+    case EFI_PXE_BASE_CODE_MTFTP_READ_FILE:\r
+    case EFI_PXE_BASE_CODE_MTFTP_READ_DIRECTORY:\r
+      Status = EFI_UNSUPPORTED;\r
 \r
-    break;\r
+      break;\r
 \r
-  default:\r
-    Status = EFI_INVALID_PARAMETER;\r
+    default:\r
+      Status = EFI_INVALID_PARAMETER;\r
 \r
-    break;\r
+      break;\r
   }\r
 \r
   if (Status == EFI_ICMP_ERROR) {\r
@@ -1010,18 +1012,18 @@ EfiPxeBcMtftp (
   } else {\r
     Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);\r
   }\r
+\r
   //\r
   // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP\r
   // receive filter list emptied and the filter set to EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP.\r
   //\r
-  ZeroMem(&IpFilter, sizeof (EFI_PXE_BASE_CODE_IP_FILTER));\r
+  ZeroMem (&IpFilter, sizeof (EFI_PXE_BASE_CODE_IP_FILTER));\r
   IpFilter.Filters = EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP;\r
   This->SetIpFilter (This, &IpFilter);\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Writes a UDP packet to the network interface.\r
 \r
@@ -1062,27 +1064,27 @@ EfiPxeBcMtftp (
 EFI_STATUS\r
 EFIAPI\r
 EfiPxeBcUdpWrite (\r
-  IN     EFI_PXE_BASE_CODE_PROTOCOL       *This,\r
-  IN     UINT16                           OpFlags,\r
-  IN     EFI_IP_ADDRESS                   *DestIp,\r
-  IN     EFI_PXE_BASE_CODE_UDP_PORT       *DestPort,\r
-  IN     EFI_IP_ADDRESS                   *GatewayIp  OPTIONAL,\r
-  IN     EFI_IP_ADDRESS                   *SrcIp      OPTIONAL,\r
-  IN OUT EFI_PXE_BASE_CODE_UDP_PORT       *SrcPort    OPTIONAL,\r
-  IN     UINTN                            *HeaderSize OPTIONAL,\r
-  IN     VOID                             *HeaderPtr  OPTIONAL,\r
-  IN     UINTN                            *BufferSize,\r
-  IN     VOID                             *BufferPtr\r
+  IN     EFI_PXE_BASE_CODE_PROTOCOL  *This,\r
+  IN     UINT16                      OpFlags,\r
+  IN     EFI_IP_ADDRESS              *DestIp,\r
+  IN     EFI_PXE_BASE_CODE_UDP_PORT  *DestPort,\r
+  IN     EFI_IP_ADDRESS              *GatewayIp  OPTIONAL,\r
+  IN     EFI_IP_ADDRESS              *SrcIp      OPTIONAL,\r
+  IN OUT EFI_PXE_BASE_CODE_UDP_PORT  *SrcPort    OPTIONAL,\r
+  IN     UINTN                       *HeaderSize OPTIONAL,\r
+  IN     VOID                        *HeaderPtr  OPTIONAL,\r
+  IN     UINTN                       *BufferSize,\r
+  IN     VOID                        *BufferPtr\r
   )\r
 {\r
-  PXEBC_PRIVATE_DATA        *Private;\r
-  EFI_PXE_BASE_CODE_MODE    *Mode;\r
-  EFI_UDP4_SESSION_DATA     Udp4Session;\r
-  EFI_UDP6_SESSION_DATA     Udp6Session;\r
-  EFI_STATUS                Status;\r
-  BOOLEAN                   DoNotFragment;\r
-\r
-  if (This == NULL || DestIp == NULL || DestPort == NULL) {\r
+  PXEBC_PRIVATE_DATA      *Private;\r
+  EFI_PXE_BASE_CODE_MODE  *Mode;\r
+  EFI_UDP4_SESSION_DATA   Udp4Session;\r
+  EFI_UDP6_SESSION_DATA   Udp6Session;\r
+  EFI_STATUS              Status;\r
+  BOOLEAN                 DoNotFragment;\r
+\r
+  if ((This == NULL) || (DestIp == NULL) || (DestPort == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1095,19 +1097,20 @@ EfiPxeBcUdpWrite (
     DoNotFragment = TRUE;\r
   }\r
 \r
-  if (!Mode->UsingIpv6 && GatewayIp != NULL && Mode->SubnetMask.Addr[0] != 0 &&\r
-      !NetIp4IsUnicast (NTOHL (GatewayIp->Addr[0]), EFI_NTOHL(Mode->SubnetMask))) {\r
+  if (!Mode->UsingIpv6 && (GatewayIp != NULL) && (Mode->SubnetMask.Addr[0] != 0) &&\r
+      !NetIp4IsUnicast (NTOHL (GatewayIp->Addr[0]), EFI_NTOHL (Mode->SubnetMask)))\r
+  {\r
     //\r
     // Gateway is provided but it's not a unicast IPv4 address, while it will be ignored for IPv6.\r
     //\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (HeaderSize != NULL && (*HeaderSize == 0 || HeaderPtr == NULL)) {\r
+  if ((HeaderSize != NULL) && ((*HeaderSize == 0) || (HeaderPtr == NULL))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (BufferSize == NULL || (*BufferSize != 0 && BufferPtr == NULL)) {\r
+  if ((BufferSize == NULL) || ((*BufferSize != 0) && (BufferPtr == NULL))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1115,12 +1118,13 @@ EfiPxeBcUdpWrite (
     return EFI_NOT_STARTED;\r
   }\r
 \r
-  if (!Private->IsAddressOk && SrcIp == NULL) {\r
+  if (!Private->IsAddressOk && (SrcIp == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (Private->CurSrcPort == 0 ||\r
-      (SrcPort != NULL && *SrcPort != Private->CurSrcPort)) {\r
+  if ((Private->CurSrcPort == 0) ||\r
+      ((SrcPort != NULL) && (*SrcPort != Private->CurSrcPort)))\r
+  {\r
     //\r
     // Reconfigure UDPv4/UDPv6 for UdpWrite if the source port changed.\r
     //\r
@@ -1173,6 +1177,7 @@ EfiPxeBcUdpWrite (
     if (SrcIp != NULL) {\r
       CopyMem (&Udp6Session.SourceAddress, SrcIp, sizeof (EFI_IPv6_ADDRESS));\r
     }\r
+\r
     if (SrcPort != NULL) {\r
       Udp6Session.SourcePort = *SrcPort;\r
     }\r
@@ -1196,9 +1201,11 @@ EfiPxeBcUdpWrite (
     if (SrcIp != NULL) {\r
       CopyMem (&Udp4Session.SourceAddress, SrcIp, sizeof (EFI_IPv4_ADDRESS));\r
     }\r
+\r
     if (SrcPort != NULL) {\r
       Udp4Session.SourcePort = *SrcPort;\r
     }\r
+\r
     //\r
     // Override the gateway information if user specified.\r
     //\r
@@ -1206,7 +1213,7 @@ EfiPxeBcUdpWrite (
                Private->Udp4Write,\r
                &Udp4Session,\r
                Private->UdpTimeOutEvent,\r
-               (EFI_IPv4_ADDRESS *) GatewayIp,\r
+               (EFI_IPv4_ADDRESS *)GatewayIp,\r
                HeaderSize,\r
                HeaderPtr,\r
                BufferSize,\r
@@ -1216,7 +1223,6 @@ EfiPxeBcUdpWrite (
 \r
   gBS->SetTimer (Private->UdpTimeOutEvent, TimerCancel, 0);\r
 \r
-\r
   //\r
   // Reset the UdpWrite instance.\r
   //\r
@@ -1229,7 +1235,6 @@ EfiPxeBcUdpWrite (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Reads a UDP packet from the network interface.\r
 +\r
@@ -1270,34 +1275,34 @@ EfiPxeBcUdpWrite (
 EFI_STATUS\r
 EFIAPI\r
 EfiPxeBcUdpRead (\r
-  IN     EFI_PXE_BASE_CODE_PROTOCOL   *This,\r
-  IN     UINT16                       OpFlags,\r
-  IN OUT EFI_IP_ADDRESS               *DestIp      OPTIONAL,\r
-  IN OUT EFI_PXE_BASE_CODE_UDP_PORT   *DestPort    OPTIONAL,\r
-  IN OUT EFI_IP_ADDRESS               *SrcIp       OPTIONAL,\r
-  IN OUT EFI_PXE_BASE_CODE_UDP_PORT   *SrcPort     OPTIONAL,\r
-  IN     UINTN                        *HeaderSize  OPTIONAL,\r
-  IN     VOID                         *HeaderPtr   OPTIONAL,\r
-  IN OUT UINTN                        *BufferSize,\r
-  IN     VOID                         *BufferPtr\r
+  IN     EFI_PXE_BASE_CODE_PROTOCOL  *This,\r
+  IN     UINT16                      OpFlags,\r
+  IN OUT EFI_IP_ADDRESS              *DestIp      OPTIONAL,\r
+  IN OUT EFI_PXE_BASE_CODE_UDP_PORT  *DestPort    OPTIONAL,\r
+  IN OUT EFI_IP_ADDRESS              *SrcIp       OPTIONAL,\r
+  IN OUT EFI_PXE_BASE_CODE_UDP_PORT  *SrcPort     OPTIONAL,\r
+  IN     UINTN                       *HeaderSize  OPTIONAL,\r
+  IN     VOID                        *HeaderPtr   OPTIONAL,\r
+  IN OUT UINTN                       *BufferSize,\r
+  IN     VOID                        *BufferPtr\r
   )\r
 {\r
-  PXEBC_PRIVATE_DATA          *Private;\r
-  EFI_PXE_BASE_CODE_MODE      *Mode;\r
-  EFI_UDP4_COMPLETION_TOKEN   Udp4Token;\r
-  EFI_UDP6_COMPLETION_TOKEN   Udp6Token;\r
-  EFI_UDP4_RECEIVE_DATA       *Udp4Rx;\r
-  EFI_UDP6_RECEIVE_DATA       *Udp6Rx;\r
-  EFI_STATUS                  Status;\r
-  BOOLEAN                     IsDone;\r
-  BOOLEAN                     IsMatched;\r
-  UINTN                       CopiedLen;\r
-  UINTN                       HeaderLen;\r
-  UINTN                       HeaderCopiedLen;\r
-  UINTN                       BufferCopiedLen;\r
-  UINT32                      FragmentLength;\r
-  UINTN                       FragmentIndex;\r
-  UINT8                       *FragmentBuffer;\r
+  PXEBC_PRIVATE_DATA         *Private;\r
+  EFI_PXE_BASE_CODE_MODE     *Mode;\r
+  EFI_UDP4_COMPLETION_TOKEN  Udp4Token;\r
+  EFI_UDP6_COMPLETION_TOKEN  Udp6Token;\r
+  EFI_UDP4_RECEIVE_DATA      *Udp4Rx;\r
+  EFI_UDP6_RECEIVE_DATA      *Udp6Rx;\r
+  EFI_STATUS                 Status;\r
+  BOOLEAN                    IsDone;\r
+  BOOLEAN                    IsMatched;\r
+  UINTN                      CopiedLen;\r
+  UINTN                      HeaderLen;\r
+  UINTN                      HeaderCopiedLen;\r
+  UINTN                      BufferCopiedLen;\r
+  UINT32                     FragmentLength;\r
+  UINTN                      FragmentIndex;\r
+  UINT8                      *FragmentBuffer;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1310,13 +1315,14 @@ EfiPxeBcUdpRead (
   Udp4Rx    = NULL;\r
   Udp6Rx    = NULL;\r
 \r
-  if (((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_PORT) == 0 && DestPort == NULL) ||\r
-      ((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_IP) == 0 && SrcIp == NULL) ||\r
-      ((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_PORT) == 0 && SrcPort == NULL)) {\r
+  if ((((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_PORT) == 0) && (DestPort == NULL)) ||\r
+      (((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_IP) == 0) && (SrcIp == NULL)) ||\r
+      (((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_PORT) == 0) && (SrcPort == NULL)))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if ((HeaderSize != NULL && *HeaderSize == 0) || (HeaderSize != NULL && HeaderPtr == NULL)) {\r
+  if (((HeaderSize != NULL) && (*HeaderSize == 0)) || ((HeaderSize != NULL) && (HeaderPtr == NULL))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1396,16 +1402,18 @@ EfiPxeBcUdpRead (
     }\r
   }\r
 \r
-  if (Status == EFI_ICMP_ERROR ||\r
-      Status == EFI_NETWORK_UNREACHABLE ||\r
-      Status == EFI_HOST_UNREACHABLE ||\r
-      Status == EFI_PROTOCOL_UNREACHABLE ||\r
-      Status == EFI_PORT_UNREACHABLE) {\r
+  if ((Status == EFI_ICMP_ERROR) ||\r
+      (Status == EFI_NETWORK_UNREACHABLE) ||\r
+      (Status == EFI_HOST_UNREACHABLE) ||\r
+      (Status == EFI_PROTOCOL_UNREACHABLE) ||\r
+      (Status == EFI_PORT_UNREACHABLE))\r
+  {\r
     //\r
     // Get different return status for icmp error from Udp, refers to UEFI spec.\r
     //\r
     Mode->IcmpErrorReceived = TRUE;\r
   }\r
+\r
   gBS->SetTimer (Private->UdpTimeOutEvent, TimerCancel, 0);\r
 \r
   if (IsMatched) {\r
@@ -1427,6 +1435,7 @@ EfiPxeBcUdpRead (
         if (HeaderSize != NULL) {\r
           *HeaderSize = HeaderLen;\r
         }\r
+\r
         *BufferSize = Udp6Rx->DataLength - HeaderLen;\r
 \r
         HeaderCopiedLen = 0;\r
@@ -1438,30 +1447,31 @@ EfiPxeBcUdpRead (
             //\r
             // Copy the header part of received data.\r
             //\r
-            CopyMem ((UINT8 *) HeaderPtr + HeaderCopiedLen, FragmentBuffer, FragmentLength);\r
+            CopyMem ((UINT8 *)HeaderPtr + HeaderCopiedLen, FragmentBuffer, FragmentLength);\r
             HeaderCopiedLen += FragmentLength;\r
           } else if (HeaderCopiedLen < HeaderLen) {\r
             //\r
             // Copy the header part of received data.\r
             //\r
             CopiedLen = HeaderLen - HeaderCopiedLen;\r
-            CopyMem ((UINT8 *) HeaderPtr + HeaderCopiedLen, FragmentBuffer, CopiedLen);\r
+            CopyMem ((UINT8 *)HeaderPtr + HeaderCopiedLen, FragmentBuffer, CopiedLen);\r
             HeaderCopiedLen += CopiedLen;\r
 \r
             //\r
             // Copy the other part of received data.\r
             //\r
-            CopyMem ((UINT8 *) BufferPtr + BufferCopiedLen, FragmentBuffer + CopiedLen, FragmentLength - CopiedLen);\r
+            CopyMem ((UINT8 *)BufferPtr + BufferCopiedLen, FragmentBuffer + CopiedLen, FragmentLength - CopiedLen);\r
             BufferCopiedLen += (FragmentLength - CopiedLen);\r
           } else {\r
             //\r
             // Copy the other part of received data.\r
             //\r
-            CopyMem ((UINT8 *) BufferPtr + BufferCopiedLen, FragmentBuffer, FragmentLength);\r
+            CopyMem ((UINT8 *)BufferPtr + BufferCopiedLen, FragmentBuffer, FragmentLength);\r
             BufferCopiedLen += FragmentLength;\r
           }\r
         }\r
       }\r
+\r
       //\r
       // Recycle the receiving buffer after copy to user.\r
       //\r
@@ -1481,6 +1491,7 @@ EfiPxeBcUdpRead (
         if (HeaderSize != NULL) {\r
           *HeaderSize = HeaderLen;\r
         }\r
+\r
         *BufferSize = Udp4Rx->DataLength - HeaderLen;\r
 \r
         HeaderCopiedLen = 0;\r
@@ -1492,30 +1503,31 @@ EfiPxeBcUdpRead (
             //\r
             // Copy the header part of received data.\r
             //\r
-            CopyMem ((UINT8 *) HeaderPtr + HeaderCopiedLen, FragmentBuffer, FragmentLength);\r
+            CopyMem ((UINT8 *)HeaderPtr + HeaderCopiedLen, FragmentBuffer, FragmentLength);\r
             HeaderCopiedLen += FragmentLength;\r
           } else if (HeaderCopiedLen < HeaderLen) {\r
             //\r
             // Copy the header part of received data.\r
             //\r
             CopiedLen = HeaderLen - HeaderCopiedLen;\r
-            CopyMem ((UINT8 *) HeaderPtr + HeaderCopiedLen, FragmentBuffer, CopiedLen);\r
+            CopyMem ((UINT8 *)HeaderPtr + HeaderCopiedLen, FragmentBuffer, CopiedLen);\r
             HeaderCopiedLen += CopiedLen;\r
 \r
             //\r
             // Copy the other part of received data.\r
             //\r
-            CopyMem ((UINT8 *) BufferPtr + BufferCopiedLen, FragmentBuffer + CopiedLen, FragmentLength - CopiedLen);\r
+            CopyMem ((UINT8 *)BufferPtr + BufferCopiedLen, FragmentBuffer + CopiedLen, FragmentLength - CopiedLen);\r
             BufferCopiedLen += (FragmentLength - CopiedLen);\r
           } else {\r
             //\r
             // Copy the other part of received data.\r
             //\r
-            CopyMem ((UINT8 *) BufferPtr + BufferCopiedLen, FragmentBuffer, FragmentLength);\r
+            CopyMem ((UINT8 *)BufferPtr + BufferCopiedLen, FragmentBuffer, FragmentLength);\r
             BufferCopiedLen += FragmentLength;\r
           }\r
         }\r
       }\r
+\r
       //\r
       // Recycle the receiving buffer after copy to user.\r
       //\r
@@ -1534,7 +1546,6 @@ EfiPxeBcUdpRead (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Updates the IP receive filters of a network device and enables software filtering.\r
 \r
@@ -1570,22 +1581,22 @@ EfiPxeBcUdpRead (
 EFI_STATUS\r
 EFIAPI\r
 EfiPxeBcSetIpFilter (\r
-  IN EFI_PXE_BASE_CODE_PROTOCOL       *This,\r
-  IN EFI_PXE_BASE_CODE_IP_FILTER      *NewFilter\r
+  IN EFI_PXE_BASE_CODE_PROTOCOL   *This,\r
+  IN EFI_PXE_BASE_CODE_IP_FILTER  *NewFilter\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  PXEBC_PRIVATE_DATA        *Private;\r
-  EFI_PXE_BASE_CODE_MODE    *Mode;\r
-  EFI_UDP4_CONFIG_DATA      *Udp4Cfg;\r
-  EFI_UDP6_CONFIG_DATA      *Udp6Cfg;\r
-  UINTN                     Index;\r
-  BOOLEAN                   NeedPromiscuous;\r
-  BOOLEAN                   AcceptPromiscuous;\r
-  BOOLEAN                   AcceptBroadcast;\r
-  BOOLEAN                   MultiCastUpdate;\r
-\r
-  if (This == NULL || NewFilter == NULL) {\r
+  EFI_STATUS              Status;\r
+  PXEBC_PRIVATE_DATA      *Private;\r
+  EFI_PXE_BASE_CODE_MODE  *Mode;\r
+  EFI_UDP4_CONFIG_DATA    *Udp4Cfg;\r
+  EFI_UDP6_CONFIG_DATA    *Udp6Cfg;\r
+  UINTN                   Index;\r
+  BOOLEAN                 NeedPromiscuous;\r
+  BOOLEAN                 AcceptPromiscuous;\r
+  BOOLEAN                 AcceptBroadcast;\r
+  BOOLEAN                 MultiCastUpdate;\r
+\r
+  if ((This == NULL) || (NewFilter == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1601,22 +1612,26 @@ EfiPxeBcSetIpFilter (
   for (Index = 0; Index < NewFilter->IpCnt; Index++) {\r
     ASSERT (Index < EFI_PXE_BASE_CODE_MAX_IPCNT);\r
     if (!Mode->UsingIpv6 &&\r
-        IP4_IS_LOCAL_BROADCAST (EFI_IP4 (NewFilter->IpList[Index].v4))) {\r
+        IP4_IS_LOCAL_BROADCAST (EFI_IP4 (NewFilter->IpList[Index].v4)))\r
+    {\r
       //\r
       // IPv4 broadcast address should not be in IP filter.\r
       //\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     if (Mode->UsingIpv6) {\r
-      if ((NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP) != 0 &&\r
-          NetIp6IsValidUnicast (&NewFilter->IpList[Index].v6)) {\r
+      if (((NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP) != 0) &&\r
+          NetIp6IsValidUnicast (&NewFilter->IpList[Index].v6))\r
+      {\r
         NeedPromiscuous = TRUE;\r
       }\r
-    } else if ((EFI_NTOHL(Mode->StationIp) != 0) &&\r
-               (EFI_NTOHL(Mode->SubnetMask) != 0) &&\r
-               IP4_NET_EQUAL(EFI_NTOHL(Mode->StationIp), EFI_NTOHL(NewFilter->IpList[Index].v4), EFI_NTOHL(Mode->SubnetMask.v4)) &&\r
-               NetIp4IsUnicast (EFI_IP4 (NewFilter->IpList[Index].v4), EFI_NTOHL(Mode->SubnetMask)) &&\r
-               ((NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP) != 0)) {\r
+    } else if ((EFI_NTOHL (Mode->StationIp) != 0) &&\r
+               (EFI_NTOHL (Mode->SubnetMask) != 0) &&\r
+               IP4_NET_EQUAL (EFI_NTOHL (Mode->StationIp), EFI_NTOHL (NewFilter->IpList[Index].v4), EFI_NTOHL (Mode->SubnetMask.v4)) &&\r
+               NetIp4IsUnicast (EFI_IP4 (NewFilter->IpList[Index].v4), EFI_NTOHL (Mode->SubnetMask)) &&\r
+               ((NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP) != 0))\r
+    {\r
       NeedPromiscuous = TRUE;\r
     }\r
   }\r
@@ -1626,8 +1641,9 @@ EfiPxeBcSetIpFilter (
   MultiCastUpdate   = FALSE;\r
 \r
   if (NeedPromiscuous ||\r
-      (NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS) != 0 ||\r
-      (NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS_MULTICAST) != 0) {\r
+      ((NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS) != 0) ||\r
+      ((NewFilter->Filters & EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS_MULTICAST) != 0))\r
+  {\r
     //\r
     // Configure UDPv4/UDPv6 as promiscuous mode to receive all packets.\r
     //\r
@@ -1636,7 +1652,7 @@ EfiPxeBcSetIpFilter (
     //\r
     // Configure UDPv4 to receive all broadcast packets.\r
     //\r
-    AcceptBroadcast  = TRUE;\r
+    AcceptBroadcast = TRUE;\r
   }\r
 \r
   //\r
@@ -1661,7 +1677,8 @@ EfiPxeBcSetIpFilter (
     //\r
     Udp4Cfg = &Private->Udp4CfgData;\r
     if ((AcceptPromiscuous != Udp4Cfg->AcceptPromiscuous)   ||\r
-        (AcceptBroadcast != Udp4Cfg->AcceptBroadcast)     || MultiCastUpdate) {\r
+        (AcceptBroadcast != Udp4Cfg->AcceptBroadcast)     || MultiCastUpdate)\r
+    {\r
       //\r
       // Clear the UDP4 instance configuration, all joined groups will be left\r
       // during the operation.\r
@@ -1673,7 +1690,7 @@ EfiPxeBcSetIpFilter (
       //\r
       Udp4Cfg->AcceptPromiscuous = AcceptPromiscuous;\r
       Udp4Cfg->AcceptBroadcast   = AcceptBroadcast;\r
-      Status = Private->Udp4Read->Configure (Private->Udp4Read, Udp4Cfg);\r
+      Status                     = Private->Udp4Read->Configure (Private->Udp4Read, Udp4Cfg);\r
       if (EFI_ERROR (Status)) {\r
         return Status;\r
       }\r
@@ -1711,7 +1728,7 @@ EfiPxeBcSetIpFilter (
       // Configure the UDP instance with the new configuration.\r
       //\r
       Udp6Cfg->AcceptPromiscuous = AcceptPromiscuous;\r
-      Status = Private->Udp6Read->Configure (Private->Udp6Read, Udp6Cfg);\r
+      Status                     = Private->Udp6Read->Configure (Private->Udp6Read, Udp6Cfg);\r
       if (EFI_ERROR (Status)) {\r
         return Status;\r
       }\r
@@ -1743,7 +1760,6 @@ EfiPxeBcSetIpFilter (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Uses the ARP protocol to resolve a MAC address. It is not supported for IPv6.\r
 \r
@@ -1772,9 +1788,9 @@ EfiPxeBcSetIpFilter (
 EFI_STATUS\r
 EFIAPI\r
 EfiPxeBcArp (\r
-  IN EFI_PXE_BASE_CODE_PROTOCOL       *This,\r
-  IN EFI_IP_ADDRESS                   *IpAddr,\r
-  IN EFI_MAC_ADDRESS                  *MacAddr OPTIONAL\r
+  IN EFI_PXE_BASE_CODE_PROTOCOL  *This,\r
+  IN EFI_IP_ADDRESS              *IpAddr,\r
+  IN EFI_MAC_ADDRESS             *MacAddr OPTIONAL\r
   )\r
 {\r
   PXEBC_PRIVATE_DATA      *Private;\r
@@ -1785,7 +1801,7 @@ EfiPxeBcArp (
   EFI_MAC_ADDRESS         ZeroMac;\r
   BOOLEAN                 IsResolved;\r
 \r
-  if (This == NULL || IpAddr == NULL) {\r
+  if ((This == NULL) || (IpAddr == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1839,7 +1855,7 @@ EfiPxeBcArp (
     // If AutoArp is TRUE, try to send Arp request on initiative.\r
     //\r
     Status = Private->Arp->Request (Private->Arp, &IpAddr->v4, ResolvedEvent, &TempMac);\r
-    if (EFI_ERROR (Status) && Status != EFI_NOT_READY) {\r
+    if (EFI_ERROR (Status) && (Status != EFI_NOT_READY)) {\r
       goto ON_EXIT;\r
     }\r
 \r
@@ -1848,6 +1864,7 @@ EfiPxeBcArp (
         break;\r
       }\r
     }\r
+\r
     if (CompareMem (&TempMac, &ZeroMac, sizeof (EFI_MAC_ADDRESS)) != 0) {\r
       Status = EFI_SUCCESS;\r
     } else {\r
@@ -1858,7 +1875,7 @@ EfiPxeBcArp (
   //\r
   // Copy the Mac address to user if needed.\r
   //\r
-  if (MacAddr != NULL && !EFI_ERROR (Status)) {\r
+  if ((MacAddr != NULL) && !EFI_ERROR (Status)) {\r
     CopyMem (MacAddr, &TempMac, sizeof (EFI_MAC_ADDRESS));\r
   }\r
 \r
@@ -1866,10 +1883,10 @@ ON_EXIT:
   if (ResolvedEvent != NULL) {\r
     gBS->CloseEvent (ResolvedEvent);\r
   }\r
+\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Updates the parameters that affect the operation of the PXE Base Code Protocol.\r
 \r
@@ -1905,12 +1922,12 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 EfiPxeBcSetParameters (\r
-  IN EFI_PXE_BASE_CODE_PROTOCOL       *This,\r
-  IN BOOLEAN                          *NewAutoArp         OPTIONAL,\r
-  IN BOOLEAN                          *NewSendGUID        OPTIONAL,\r
-  IN UINT8                            *NewTTL             OPTIONAL,\r
-  IN UINT8                            *NewToS             OPTIONAL,\r
-  IN BOOLEAN                          *NewMakeCallback    OPTIONAL\r
+  IN EFI_PXE_BASE_CODE_PROTOCOL  *This,\r
+  IN BOOLEAN                     *NewAutoArp         OPTIONAL,\r
+  IN BOOLEAN                     *NewSendGUID        OPTIONAL,\r
+  IN UINT8                       *NewTTL             OPTIONAL,\r
+  IN UINT8                       *NewToS             OPTIONAL,\r
+  IN BOOLEAN                     *NewMakeCallback    OPTIONAL\r
   )\r
 {\r
   PXEBC_PRIVATE_DATA      *Private;\r
@@ -1937,7 +1954,7 @@ EfiPxeBcSetParameters (
       Status = gBS->HandleProtocol (\r
                       Mode->UsingIpv6 ? Private->Ip6Nic->Controller : Private->Ip4Nic->Controller,\r
                       &gEfiPxeBaseCodeCallbackProtocolGuid,\r
-                      (VOID **) &Private->PxeBcCallback\r
+                      (VOID **)&Private->PxeBcCallback\r
                       );\r
 \r
       if (EFI_ERROR (Status) || (Private->PxeBcCallback->Callback == NULL)) {\r
@@ -1946,6 +1963,7 @@ EfiPxeBcSetParameters (
     } else {\r
       Private->PxeBcCallback = NULL;\r
     }\r
+\r
     Mode->MakeCallbacks = *NewMakeCallback;\r
   }\r
 \r
@@ -1954,6 +1972,7 @@ EfiPxeBcSetParameters (
       DEBUG ((DEBUG_WARN, "PXE: Failed to read system GUID from the smbios table!\n"));\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     Mode->SendGUID = *NewSendGUID;\r
   }\r
 \r
@@ -1972,7 +1991,6 @@ EfiPxeBcSetParameters (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Updates the station IP address and/or subnet mask values of a network device.\r
 \r
@@ -1997,9 +2015,9 @@ EfiPxeBcSetParameters (
 EFI_STATUS\r
 EFIAPI\r
 EfiPxeBcSetStationIP (\r
-  IN EFI_PXE_BASE_CODE_PROTOCOL       *This,\r
-  IN EFI_IP_ADDRESS                   *NewStationIp    OPTIONAL,\r
-  IN EFI_IP_ADDRESS                   *NewSubnetMask   OPTIONAL\r
+  IN EFI_PXE_BASE_CODE_PROTOCOL  *This,\r
+  IN EFI_IP_ADDRESS              *NewStationIp    OPTIONAL,\r
+  IN EFI_IP_ADDRESS              *NewSubnetMask   OPTIONAL\r
   )\r
 {\r
   EFI_STATUS              Status;\r
@@ -2010,7 +2028,7 @@ EfiPxeBcSetStationIP (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (NewStationIp != NULL && !NetIp6IsValidUnicast (&NewStationIp->v6)) {\r
+  if ((NewStationIp != NULL) && !NetIp6IsValidUnicast (&NewStationIp->v6)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -2019,15 +2037,17 @@ EfiPxeBcSetStationIP (
   Status  = EFI_SUCCESS;\r
 \r
   if (!Mode->UsingIpv6 &&\r
-      NewSubnetMask != NULL &&\r
-      !IP4_IS_VALID_NETMASK (NTOHL (NewSubnetMask->Addr[0]))) {\r
+      (NewSubnetMask != NULL) &&\r
+      !IP4_IS_VALID_NETMASK (NTOHL (NewSubnetMask->Addr[0])))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (!Mode->UsingIpv6 && NewStationIp != NULL) {\r
-    if (IP4_IS_UNSPECIFIED(NTOHL (NewStationIp->Addr[0])) ||\r
-        IP4_IS_LOCAL_BROADCAST(NTOHL (NewStationIp->Addr[0])) ||\r
-        (NewSubnetMask != NULL && NewSubnetMask->Addr[0] != 0 && !NetIp4IsUnicast (NTOHL (NewStationIp->Addr[0]), NTOHL (NewSubnetMask->Addr[0])))) {\r
+  if (!Mode->UsingIpv6 && (NewStationIp != NULL)) {\r
+    if (IP4_IS_UNSPECIFIED (NTOHL (NewStationIp->Addr[0])) ||\r
+        IP4_IS_LOCAL_BROADCAST (NTOHL (NewStationIp->Addr[0])) ||\r
+        ((NewSubnetMask != NULL) && (NewSubnetMask->Addr[0] != 0) && !NetIp4IsUnicast (NTOHL (NewStationIp->Addr[0]), NTOHL (NewSubnetMask->Addr[0]))))\r
+    {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
@@ -2036,7 +2056,7 @@ EfiPxeBcSetStationIP (
     return EFI_NOT_STARTED;\r
   }\r
 \r
-  if (Mode->UsingIpv6 && NewStationIp != NULL) {\r
+  if (Mode->UsingIpv6 && (NewStationIp != NULL)) {\r
     //\r
     // Set the IPv6 address by Ip6Config protocol.\r
     //\r
@@ -2051,9 +2071,9 @@ EfiPxeBcSetStationIP (
     CopyMem (&Private->StationIp, NewStationIp, sizeof (EFI_IP_ADDRESS));\r
   }\r
 \r
-  if (!Mode->UsingIpv6 && NewSubnetMask != NULL) {\r
+  if (!Mode->UsingIpv6 && (NewSubnetMask != NULL)) {\r
     CopyMem (&Mode->SubnetMask, NewSubnetMask, sizeof (EFI_IP_ADDRESS));\r
-    CopyMem (&Private->SubnetMask ,NewSubnetMask, sizeof (EFI_IP_ADDRESS));\r
+    CopyMem (&Private->SubnetMaskNewSubnetMask, sizeof (EFI_IP_ADDRESS));\r
   }\r
 \r
   Status = PxeBcFlushStationIp (Private, NewStationIp, NewSubnetMask);\r
@@ -2065,7 +2085,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Updates the contents of the cached DHCP and Discover packets.\r
 \r
@@ -2101,19 +2120,19 @@ ON_EXIT:
 EFI_STATUS\r
 EFIAPI\r
 EfiPxeBcSetPackets (\r
-  IN EFI_PXE_BASE_CODE_PROTOCOL       *This,\r
-  IN BOOLEAN                          *NewDhcpDiscoverValid      OPTIONAL,\r
-  IN BOOLEAN                          *NewDhcpAckReceived        OPTIONAL,\r
-  IN BOOLEAN                          *NewProxyOfferReceived     OPTIONAL,\r
-  IN BOOLEAN                          *NewPxeDiscoverValid       OPTIONAL,\r
-  IN BOOLEAN                          *NewPxeReplyReceived       OPTIONAL,\r
-  IN BOOLEAN                          *NewPxeBisReplyReceived    OPTIONAL,\r
-  IN EFI_PXE_BASE_CODE_PACKET         *NewDhcpDiscover           OPTIONAL,\r
-  IN EFI_PXE_BASE_CODE_PACKET         *NewDhcpAck                OPTIONAL,\r
-  IN EFI_PXE_BASE_CODE_PACKET         *NewProxyOffer             OPTIONAL,\r
-  IN EFI_PXE_BASE_CODE_PACKET         *NewPxeDiscover            OPTIONAL,\r
-  IN EFI_PXE_BASE_CODE_PACKET         *NewPxeReply               OPTIONAL,\r
-  IN EFI_PXE_BASE_CODE_PACKET         *NewPxeBisReply            OPTIONAL\r
+  IN EFI_PXE_BASE_CODE_PROTOCOL  *This,\r
+  IN BOOLEAN                     *NewDhcpDiscoverValid      OPTIONAL,\r
+  IN BOOLEAN                     *NewDhcpAckReceived        OPTIONAL,\r
+  IN BOOLEAN                     *NewProxyOfferReceived     OPTIONAL,\r
+  IN BOOLEAN                     *NewPxeDiscoverValid       OPTIONAL,\r
+  IN BOOLEAN                     *NewPxeReplyReceived       OPTIONAL,\r
+  IN BOOLEAN                     *NewPxeBisReplyReceived    OPTIONAL,\r
+  IN EFI_PXE_BASE_CODE_PACKET    *NewDhcpDiscover           OPTIONAL,\r
+  IN EFI_PXE_BASE_CODE_PACKET    *NewDhcpAck                OPTIONAL,\r
+  IN EFI_PXE_BASE_CODE_PACKET    *NewProxyOffer             OPTIONAL,\r
+  IN EFI_PXE_BASE_CODE_PACKET    *NewPxeDiscover            OPTIONAL,\r
+  IN EFI_PXE_BASE_CODE_PACKET    *NewPxeReply               OPTIONAL,\r
+  IN EFI_PXE_BASE_CODE_PACKET    *NewPxeBisReply            OPTIONAL\r
   )\r
 {\r
   PXEBC_PRIVATE_DATA      *Private;\r
@@ -2198,7 +2217,6 @@ EFI_PXE_BASE_CODE_PROTOCOL  gPxeBcProtocolTemplate = {
   NULL\r
 };\r
 \r
-\r
 /**\r
   Callback function that is invoked when the PXE Base Code Protocol is about to transmit, has\r
   received, or is waiting to receive a packet.\r
@@ -2236,8 +2254,8 @@ EfiPxeLoadFileCallback (
   IN EFI_PXE_BASE_CODE_PACKET             *PacketPtr     OPTIONAL\r
   )\r
 {\r
-  EFI_INPUT_KEY       Key;\r
-  EFI_STATUS          Status;\r
+  EFI_INPUT_KEY  Key;\r
+  EFI_STATUS     Status;\r
 \r
   //\r
   // Catch Ctrl-C or ESC to abort.\r
@@ -2245,43 +2263,43 @@ EfiPxeLoadFileCallback (
   Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
 \r
   if (!EFI_ERROR (Status)) {\r
-\r
-    if (Key.ScanCode == SCAN_ESC || Key.UnicodeChar == (0x1F & 'c')) {\r
-\r
+    if ((Key.ScanCode == SCAN_ESC) || (Key.UnicodeChar == (0x1F & 'c'))) {\r
       return EFI_PXE_BASE_CODE_CALLBACK_STATUS_ABORT;\r
     }\r
   }\r
+\r
   //\r
   // No print if receive packet\r
   //\r
   if (Received) {\r
     return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE;\r
   }\r
+\r
   //\r
   // Print only for three functions\r
   //\r
   switch (Function) {\r
-\r
-  case EFI_PXE_BASE_CODE_FUNCTION_MTFTP:\r
-    //\r
-    // Print only for open MTFTP packets, not every MTFTP packets\r
-    //\r
-    if (PacketLength != 0 && PacketPtr != NULL) {\r
-      if (PacketPtr->Raw[0x1C] != 0x00 || PacketPtr->Raw[0x1D] != 0x01) {\r
-        return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE;\r
+    case EFI_PXE_BASE_CODE_FUNCTION_MTFTP:\r
+      //\r
+      // Print only for open MTFTP packets, not every MTFTP packets\r
+      //\r
+      if ((PacketLength != 0) && (PacketPtr != NULL)) {\r
+        if ((PacketPtr->Raw[0x1C] != 0x00) || (PacketPtr->Raw[0x1D] != 0x01)) {\r
+          return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE;\r
+        }\r
       }\r
-    }\r
-    break;\r
 \r
-  case EFI_PXE_BASE_CODE_FUNCTION_DHCP:\r
-  case EFI_PXE_BASE_CODE_FUNCTION_DISCOVER:\r
-    break;\r
+      break;\r
 \r
-  default:\r
-    return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE;\r
+    case EFI_PXE_BASE_CODE_FUNCTION_DHCP:\r
+    case EFI_PXE_BASE_CODE_FUNCTION_DISCOVER:\r
+      break;\r
+\r
+    default:\r
+      return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE;\r
   }\r
 \r
-  if (PacketLength != 0 && PacketPtr != NULL) {\r
+  if ((PacketLength != 0) && (PacketPtr != NULL)) {\r
     //\r
     // Print '.' when transmit a packet\r
     //\r
@@ -2291,12 +2309,11 @@ EfiPxeLoadFileCallback (
   return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE;\r
 }\r
 \r
-EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL gPxeBcCallBackTemplate = {\r
+EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL  gPxeBcCallBackTemplate = {\r
   EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL_REVISION,\r
   EfiPxeLoadFileCallback\r
 };\r
 \r
-\r
 /**\r
   Causes the driver to load a specified file.\r
 \r
@@ -2328,11 +2345,11 @@ EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL gPxeBcCallBackTemplate = {
 EFI_STATUS\r
 EFIAPI\r
 EfiPxeLoadFile (\r
-  IN     EFI_LOAD_FILE_PROTOCOL           *This,\r
-  IN     EFI_DEVICE_PATH_PROTOCOL         *FilePath,\r
-  IN     BOOLEAN                          BootPolicy,\r
-  IN OUT UINTN                            *BufferSize,\r
-  IN     VOID                             *Buffer       OPTIONAL\r
+  IN     EFI_LOAD_FILE_PROTOCOL    *This,\r
+  IN     EFI_DEVICE_PATH_PROTOCOL  *FilePath,\r
+  IN     BOOLEAN                   BootPolicy,\r
+  IN OUT UINTN                     *BufferSize,\r
+  IN     VOID                      *Buffer       OPTIONAL\r
   )\r
 {\r
   PXEBC_PRIVATE_DATA          *Private;\r
@@ -2342,7 +2359,7 @@ EfiPxeLoadFile (
   EFI_STATUS                  Status;\r
   EFI_STATUS                  MediaStatus;\r
 \r
-  if (This == NULL || BufferSize == NULL || FilePath == NULL || !IsDevicePathEnd (FilePath)) {\r
+  if ((This == NULL) || (BufferSize == NULL) || (FilePath == NULL) || !IsDevicePathEnd (FilePath)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -2379,7 +2396,7 @@ EfiPxeLoadFile (
   // Start Pxe Base Code to initialize PXE boot.\r
   //\r
   Status = PxeBc->Start (PxeBc, UsingIpv6);\r
-  if (Status == EFI_ALREADY_STARTED && UsingIpv6 != PxeBc->Mode->UsingIpv6) {\r
+  if ((Status == EFI_ALREADY_STARTED) && (UsingIpv6 != PxeBc->Mode->UsingIpv6)) {\r
     //\r
     // PxeBc protocol has already been started but not on the required IP version, restart it.\r
     //\r
@@ -2388,13 +2405,15 @@ EfiPxeLoadFile (
       Status = PxeBc->Start (PxeBc, UsingIpv6);\r
     }\r
   }\r
-  if (Status == EFI_SUCCESS || Status == EFI_ALREADY_STARTED) {\r
+\r
+  if ((Status == EFI_SUCCESS) || (Status == EFI_ALREADY_STARTED)) {\r
     Status = PxeBcLoadBootFile (Private, BufferSize, Buffer);\r
   }\r
 \r
-  if (Status != EFI_SUCCESS &&\r
-      Status != EFI_UNSUPPORTED &&\r
-      Status != EFI_BUFFER_TOO_SMALL) {\r
+  if ((Status != EFI_SUCCESS) &&\r
+      (Status != EFI_UNSUPPORTED) &&\r
+      (Status != EFI_BUFFER_TOO_SMALL))\r
+  {\r
     //\r
     // There are three cases, which needn't stop pxebc here.\r
     //   1. success to download file.\r
index fa4950c6235c547072f268e53975527e326380e5..732889f23d16c1568f545bb33feed12b24384016 100644 (file)
@@ -49,9 +49,9 @@
 #include <Library/DevicePathLib.h>\r
 #include <Library/PcdLib.h>\r
 \r
-typedef struct _PXEBC_PRIVATE_DATA  PXEBC_PRIVATE_DATA;\r
-typedef struct _PXEBC_PRIVATE_PROTOCOL PXEBC_PRIVATE_PROTOCOL;\r
-typedef struct _PXEBC_VIRTUAL_NIC   PXEBC_VIRTUAL_NIC;\r
+typedef struct _PXEBC_PRIVATE_DATA      PXEBC_PRIVATE_DATA;\r
+typedef struct _PXEBC_PRIVATE_PROTOCOL  PXEBC_PRIVATE_PROTOCOL;\r
+typedef struct _PXEBC_VIRTUAL_NIC       PXEBC_VIRTUAL_NIC;\r
 \r
 #include "PxeBcDriver.h"\r
 #include "PxeBcDhcp4.h"\r
@@ -60,131 +60,131 @@ typedef struct _PXEBC_VIRTUAL_NIC   PXEBC_VIRTUAL_NIC;
 #include "PxeBcBoot.h"\r
 #include "PxeBcSupport.h"\r
 \r
-#define PXEBC_DEFAULT_HOPLIMIT        64\r
-#define PXEBC_DEFAULT_LIFETIME        50000    // 50 ms, unit is microsecond\r
-#define PXEBC_UDP_TIMEOUT             30000000 // 3 seconds, unit is 100nanosecond\r
-#define PXEBC_DAD_ADDITIONAL_DELAY    30000000 // 3 seconds\r
-#define PXEBC_MTFTP_TIMEOUT           4\r
-#define PXEBC_MTFTP_RETRIES           6\r
-#define PXEBC_DHCP_RETRIES            4        // refers to mPxeDhcpTimeout, also by PXE2.1 spec.\r
-#define PXEBC_MENU_MAX_NUM            24\r
-#define PXEBC_OFFER_MAX_NUM           16\r
+#define PXEBC_DEFAULT_HOPLIMIT      64\r
+#define PXEBC_DEFAULT_LIFETIME      50000      // 50 ms, unit is microsecond\r
+#define PXEBC_UDP_TIMEOUT           30000000   // 3 seconds, unit is 100nanosecond\r
+#define PXEBC_DAD_ADDITIONAL_DELAY  30000000   // 3 seconds\r
+#define PXEBC_MTFTP_TIMEOUT         4\r
+#define PXEBC_MTFTP_RETRIES         6\r
+#define PXEBC_DHCP_RETRIES          4          // refers to mPxeDhcpTimeout, also by PXE2.1 spec.\r
+#define PXEBC_MENU_MAX_NUM          24\r
+#define PXEBC_OFFER_MAX_NUM         16\r
 \r
-#define PXEBC_CHECK_MEDIA_WAITING_TIME        EFI_TIMER_PERIOD_SECONDS(20)\r
+#define PXEBC_CHECK_MEDIA_WAITING_TIME  EFI_TIMER_PERIOD_SECONDS(20)\r
 \r
-#define PXEBC_PRIVATE_DATA_SIGNATURE          SIGNATURE_32 ('P', 'X', 'E', 'P')\r
-#define PXEBC_VIRTUAL_NIC_SIGNATURE           SIGNATURE_32 ('P', 'X', 'E', 'V')\r
-#define PXEBC_PRIVATE_DATA_FROM_PXEBC(a)      CR (a, PXEBC_PRIVATE_DATA, PxeBc, PXEBC_PRIVATE_DATA_SIGNATURE)\r
-#define PXEBC_PRIVATE_DATA_FROM_ID(a)         CR (a, PXEBC_PRIVATE_DATA, Id, PXEBC_PRIVATE_DATA_SIGNATURE)\r
-#define PXEBC_VIRTUAL_NIC_FROM_LOADFILE(a)    CR (a, PXEBC_VIRTUAL_NIC, LoadFile, PXEBC_VIRTUAL_NIC_SIGNATURE)\r
+#define PXEBC_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('P', 'X', 'E', 'P')\r
+#define PXEBC_VIRTUAL_NIC_SIGNATURE   SIGNATURE_32 ('P', 'X', 'E', 'V')\r
+#define PXEBC_PRIVATE_DATA_FROM_PXEBC(a)    CR (a, PXEBC_PRIVATE_DATA, PxeBc, PXEBC_PRIVATE_DATA_SIGNATURE)\r
+#define PXEBC_PRIVATE_DATA_FROM_ID(a)       CR (a, PXEBC_PRIVATE_DATA, Id, PXEBC_PRIVATE_DATA_SIGNATURE)\r
+#define PXEBC_VIRTUAL_NIC_FROM_LOADFILE(a)  CR (a, PXEBC_VIRTUAL_NIC, LoadFile, PXEBC_VIRTUAL_NIC_SIGNATURE)\r
 \r
-#define PXE_ENABLED                           0x01\r
-#define PXE_DISABLED                          0x00\r
+#define PXE_ENABLED   0x01\r
+#define PXE_DISABLED  0x00\r
 \r
 typedef union {\r
-  PXEBC_DHCP4_PACKET_CACHE            Dhcp4;\r
-  PXEBC_DHCP6_PACKET_CACHE            Dhcp6;\r
+  PXEBC_DHCP4_PACKET_CACHE    Dhcp4;\r
+  PXEBC_DHCP6_PACKET_CACHE    Dhcp6;\r
 } PXEBC_DHCP_PACKET_CACHE;\r
 \r
 struct _PXEBC_PRIVATE_PROTOCOL {\r
-  UINT64                                    Reserved;\r
+  UINT64    Reserved;\r
 };\r
 \r
 struct _PXEBC_VIRTUAL_NIC {\r
-  UINT32                                    Signature;\r
-  EFI_HANDLE                                Controller;\r
-  EFI_LOAD_FILE_PROTOCOL                    LoadFile;\r
-  EFI_DEVICE_PATH_PROTOCOL                  *DevicePath;\r
-  PXEBC_PRIVATE_DATA                        *Private;\r
+  UINT32                      Signature;\r
+  EFI_HANDLE                  Controller;\r
+  EFI_LOAD_FILE_PROTOCOL      LoadFile;\r
+  EFI_DEVICE_PATH_PROTOCOL    *DevicePath;\r
+  PXEBC_PRIVATE_DATA          *Private;\r
 };\r
 \r
 struct _PXEBC_PRIVATE_DATA {\r
-  UINT32                                    Signature;\r
-  EFI_HANDLE                                Controller;\r
-  EFI_HANDLE                                Image;\r
-\r
-  PXEBC_PRIVATE_PROTOCOL                    Id;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL               *Snp;\r
-\r
-  PXEBC_VIRTUAL_NIC                         *Ip4Nic;\r
-  PXEBC_VIRTUAL_NIC                         *Ip6Nic;\r
-\r
-  EFI_HANDLE                                ArpChild;\r
-  EFI_HANDLE                                Ip4Child;\r
-  EFI_HANDLE                                Dhcp4Child;\r
-  EFI_HANDLE                                Mtftp4Child;\r
-  EFI_HANDLE                                Udp4ReadChild;\r
-  EFI_HANDLE                                Udp4WriteChild;\r
-\r
-  EFI_ARP_PROTOCOL                          *Arp;\r
-  EFI_IP4_PROTOCOL                          *Ip4;\r
-  EFI_IP4_CONFIG2_PROTOCOL                  *Ip4Config2;\r
-  EFI_DHCP4_PROTOCOL                        *Dhcp4;\r
-  EFI_MTFTP4_PROTOCOL                       *Mtftp4;\r
-  EFI_UDP4_PROTOCOL                         *Udp4Read;\r
-  EFI_UDP4_PROTOCOL                         *Udp4Write;\r
-\r
-  EFI_HANDLE                                Ip6Child;\r
-  EFI_HANDLE                                Dhcp6Child;\r
-  EFI_HANDLE                                Mtftp6Child;\r
-  EFI_HANDLE                                Udp6ReadChild;\r
-  EFI_HANDLE                                Udp6WriteChild;\r
-\r
-  EFI_IP6_PROTOCOL                          *Ip6;\r
-  EFI_IP6_CONFIG_PROTOCOL                   *Ip6Cfg;\r
-  EFI_DHCP6_PROTOCOL                        *Dhcp6;\r
-  EFI_MTFTP6_PROTOCOL                       *Mtftp6;\r
-  EFI_UDP6_PROTOCOL                         *Udp6Read;\r
-  EFI_UDP6_PROTOCOL                         *Udp6Write;\r
-  EFI_DNS6_PROTOCOL                         *Dns6;\r
-\r
-  EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL *Nii;\r
-  EFI_PXE_BASE_CODE_PROTOCOL                PxeBc;\r
-  EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL       LoadFileCallback;\r
-  EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL       *PxeBcCallback;\r
-  EFI_DEVICE_PATH_PROTOCOL                  *DevicePath;\r
-\r
-  EFI_PXE_BASE_CODE_MODE                    Mode;\r
-  EFI_PXE_BASE_CODE_FUNCTION                Function;\r
-  UINT32                                    Ip6Policy;\r
-  UINT32                                    SolicitTimes;\r
-  UINT64                                    ElapsedTime;\r
-\r
-  EFI_UDP4_CONFIG_DATA                      Udp4CfgData;\r
-  EFI_UDP6_CONFIG_DATA                      Udp6CfgData;\r
-  EFI_IP4_CONFIG_DATA                       Ip4CfgData;\r
-  EFI_IP6_CONFIG_DATA                       Ip6CfgData;\r
-\r
-  EFI_EVENT                                 UdpTimeOutEvent;\r
-  EFI_EVENT                                 ArpUpdateEvent;\r
-  EFI_IP4_COMPLETION_TOKEN                  IcmpToken;\r
-  EFI_IP6_COMPLETION_TOKEN                  Icmp6Token;\r
-\r
-  BOOLEAN                                   IsAddressOk;\r
-  BOOLEAN                                   IsOfferSorted;\r
-  BOOLEAN                                   IsProxyRecved;\r
-  BOOLEAN                                   IsDoDiscover;\r
-\r
-  EFI_IP_ADDRESS                            TmpStationIp;\r
-  EFI_IP_ADDRESS                            StationIp;\r
-  EFI_IP_ADDRESS                            SubnetMask;\r
-  EFI_IP_ADDRESS                            GatewayIp;\r
-  EFI_IP_ADDRESS                            ServerIp;\r
-  EFI_IPv6_ADDRESS                          *DnsServer;\r
-  UINT16                                    CurSrcPort;\r
-  UINT32                                    IaId;\r
-\r
-  UINT32                                    Ip4MaxPacketSize;\r
-  UINT32                                    Ip6MaxPacketSize;\r
-  UINT8                                     *BootFileName;\r
-  UINTN                                     BootFileSize;\r
-  UINTN                                     BlockSize;\r
-\r
-  PXEBC_DHCP_PACKET_CACHE                   ProxyOffer;\r
-  PXEBC_DHCP_PACKET_CACHE                   DhcpAck;\r
-  PXEBC_DHCP_PACKET_CACHE                   PxeReply;\r
-  EFI_DHCP6_PACKET                          *Dhcp6Request;\r
-  EFI_DHCP4_PACKET                          SeedPacket;\r
+  UINT32                                       Signature;\r
+  EFI_HANDLE                                   Controller;\r
+  EFI_HANDLE                                   Image;\r
+\r
+  PXEBC_PRIVATE_PROTOCOL                       Id;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL                  *Snp;\r
+\r
+  PXEBC_VIRTUAL_NIC                            *Ip4Nic;\r
+  PXEBC_VIRTUAL_NIC                            *Ip6Nic;\r
+\r
+  EFI_HANDLE                                   ArpChild;\r
+  EFI_HANDLE                                   Ip4Child;\r
+  EFI_HANDLE                                   Dhcp4Child;\r
+  EFI_HANDLE                                   Mtftp4Child;\r
+  EFI_HANDLE                                   Udp4ReadChild;\r
+  EFI_HANDLE                                   Udp4WriteChild;\r
+\r
+  EFI_ARP_PROTOCOL                             *Arp;\r
+  EFI_IP4_PROTOCOL                             *Ip4;\r
+  EFI_IP4_CONFIG2_PROTOCOL                     *Ip4Config2;\r
+  EFI_DHCP4_PROTOCOL                           *Dhcp4;\r
+  EFI_MTFTP4_PROTOCOL                          *Mtftp4;\r
+  EFI_UDP4_PROTOCOL                            *Udp4Read;\r
+  EFI_UDP4_PROTOCOL                            *Udp4Write;\r
+\r
+  EFI_HANDLE                                   Ip6Child;\r
+  EFI_HANDLE                                   Dhcp6Child;\r
+  EFI_HANDLE                                   Mtftp6Child;\r
+  EFI_HANDLE                                   Udp6ReadChild;\r
+  EFI_HANDLE                                   Udp6WriteChild;\r
+\r
+  EFI_IP6_PROTOCOL                             *Ip6;\r
+  EFI_IP6_CONFIG_PROTOCOL                      *Ip6Cfg;\r
+  EFI_DHCP6_PROTOCOL                           *Dhcp6;\r
+  EFI_MTFTP6_PROTOCOL                          *Mtftp6;\r
+  EFI_UDP6_PROTOCOL                            *Udp6Read;\r
+  EFI_UDP6_PROTOCOL                            *Udp6Write;\r
+  EFI_DNS6_PROTOCOL                            *Dns6;\r
+\r
+  EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL    *Nii;\r
+  EFI_PXE_BASE_CODE_PROTOCOL                   PxeBc;\r
+  EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL          LoadFileCallback;\r
+  EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL          *PxeBcCallback;\r
+  EFI_DEVICE_PATH_PROTOCOL                     *DevicePath;\r
+\r
+  EFI_PXE_BASE_CODE_MODE                       Mode;\r
+  EFI_PXE_BASE_CODE_FUNCTION                   Function;\r
+  UINT32                                       Ip6Policy;\r
+  UINT32                                       SolicitTimes;\r
+  UINT64                                       ElapsedTime;\r
+\r
+  EFI_UDP4_CONFIG_DATA                         Udp4CfgData;\r
+  EFI_UDP6_CONFIG_DATA                         Udp6CfgData;\r
+  EFI_IP4_CONFIG_DATA                          Ip4CfgData;\r
+  EFI_IP6_CONFIG_DATA                          Ip6CfgData;\r
+\r
+  EFI_EVENT                                    UdpTimeOutEvent;\r
+  EFI_EVENT                                    ArpUpdateEvent;\r
+  EFI_IP4_COMPLETION_TOKEN                     IcmpToken;\r
+  EFI_IP6_COMPLETION_TOKEN                     Icmp6Token;\r
+\r
+  BOOLEAN                                      IsAddressOk;\r
+  BOOLEAN                                      IsOfferSorted;\r
+  BOOLEAN                                      IsProxyRecved;\r
+  BOOLEAN                                      IsDoDiscover;\r
+\r
+  EFI_IP_ADDRESS                               TmpStationIp;\r
+  EFI_IP_ADDRESS                               StationIp;\r
+  EFI_IP_ADDRESS                               SubnetMask;\r
+  EFI_IP_ADDRESS                               GatewayIp;\r
+  EFI_IP_ADDRESS                               ServerIp;\r
+  EFI_IPv6_ADDRESS                             *DnsServer;\r
+  UINT16                                       CurSrcPort;\r
+  UINT32                                       IaId;\r
+\r
+  UINT32                                       Ip4MaxPacketSize;\r
+  UINT32                                       Ip6MaxPacketSize;\r
+  UINT8                                        *BootFileName;\r
+  UINTN                                        BootFileSize;\r
+  UINTN                                        BlockSize;\r
+\r
+  PXEBC_DHCP_PACKET_CACHE                      ProxyOffer;\r
+  PXEBC_DHCP_PACKET_CACHE                      DhcpAck;\r
+  PXEBC_DHCP_PACKET_CACHE                      PxeReply;\r
+  EFI_DHCP6_PACKET                             *Dhcp6Request;\r
+  EFI_DHCP4_PACKET                             SeedPacket;\r
 \r
   //\r
   // OfferIndex records the index of DhcpOffer[] buffer, and OfferCount records the num of each type of offer.\r
@@ -213,12 +213,12 @@ struct _PXEBC_PRIVATE_DATA {
   //   (OfferIndex is 0-based.)\r
   //\r
   //\r
-  UINT32                                    SelectIndex;\r
-  UINT32                                    SelectProxyType;\r
-  PXEBC_DHCP_PACKET_CACHE                   OfferBuffer[PXEBC_OFFER_MAX_NUM];\r
-  UINT32                                    OfferNum;\r
-  UINT32                                    OfferCount[PxeOfferTypeMax];\r
-  UINT32                                    OfferIndex[PxeOfferTypeMax][PXEBC_OFFER_MAX_NUM];\r
+  UINT32                     SelectIndex;\r
+  UINT32                     SelectProxyType;\r
+  PXEBC_DHCP_PACKET_CACHE    OfferBuffer[PXEBC_OFFER_MAX_NUM];\r
+  UINT32                     OfferNum;\r
+  UINT32                     OfferCount[PxeOfferTypeMax];\r
+  UINT32                     OfferIndex[PxeOfferTypeMax][PXEBC_OFFER_MAX_NUM];\r
 };\r
 \r
 extern EFI_PXE_BASE_CODE_PROTOCOL           gPxeBcProtocolTemplate;\r
index addcafc0c88cc7ffe79b630a17db758ad207deb1..3ac9c7a8aafe6c4f0b6ee67212c75cb29eb8d36e 100644 (file)
@@ -9,7 +9,7 @@
 \r
 #include "PxeBcImpl.h"\r
 \r
-CHAR8 *mMtftpOptions[PXE_MTFTP_OPTION_MAXIMUM_INDEX] = {\r
+CHAR8  *mMtftpOptions[PXE_MTFTP_OPTION_MAXIMUM_INDEX] = {\r
   "blksize",\r
   "timeout",\r
   "tsize",\r
@@ -17,7 +17,6 @@ CHAR8 *mMtftpOptions[PXE_MTFTP_OPTION_MAXIMUM_INDEX] = {
   "windowsize"\r
 };\r
 \r
-\r
 /**\r
   This is a callback function when packets are received or transmitted in Mtftp driver.\r
 \r
@@ -39,30 +38,30 @@ CHAR8 *mMtftpOptions[PXE_MTFTP_OPTION_MAXIMUM_INDEX] = {
 EFI_STATUS\r
 EFIAPI\r
 PxeBcMtftp6CheckPacket (\r
-  IN EFI_MTFTP6_PROTOCOL              *This,\r
-  IN EFI_MTFTP6_TOKEN                 *Token,\r
-  IN UINT16                           PacketLen,\r
-  IN EFI_MTFTP6_PACKET                *Packet\r
+  IN EFI_MTFTP6_PROTOCOL  *This,\r
+  IN EFI_MTFTP6_TOKEN     *Token,\r
+  IN UINT16               PacketLen,\r
+  IN EFI_MTFTP6_PACKET    *Packet\r
   )\r
 {\r
-  PXEBC_PRIVATE_DATA                  *Private;\r
-  EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL *Callback;\r
-  EFI_STATUS                          Status;\r
+  PXEBC_PRIVATE_DATA                   *Private;\r
+  EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL  *Callback;\r
+  EFI_STATUS                           Status;\r
 \r
-  Private   = (PXEBC_PRIVATE_DATA *) Token->Context;\r
-  Callback  = Private->PxeBcCallback;\r
-  Status    = EFI_SUCCESS;\r
+  Private  = (PXEBC_PRIVATE_DATA *)Token->Context;\r
+  Callback = Private->PxeBcCallback;\r
+  Status   = EFI_SUCCESS;\r
 \r
   if (Packet->OpCode == EFI_MTFTP6_OPCODE_ERROR) {\r
     //\r
     // Store the tftp error message into mode data and set the received flag.\r
     //\r
     Private->Mode.TftpErrorReceived   = TRUE;\r
-    Private->Mode.TftpError.ErrorCode = (UINT8) Packet->Error.ErrorCode;\r
+    Private->Mode.TftpError.ErrorCode = (UINT8)Packet->Error.ErrorCode;\r
     AsciiStrnCpyS (\r
       Private->Mode.TftpError.ErrorString,\r
       PXE_MTFTP_ERROR_STRING_LENGTH,\r
-      (CHAR8 *) Packet->Error.ErrorMessage,\r
+      (CHAR8 *)Packet->Error.ErrorMessage,\r
       PXE_MTFTP_ERROR_STRING_LENGTH - 1\r
       );\r
     Private->Mode.TftpError.ErrorString[PXE_MTFTP_ERROR_STRING_LENGTH - 1] = '\0';\r
@@ -73,12 +72,12 @@ PxeBcMtftp6CheckPacket (
     // Callback to user if has when received any tftp packet.\r
     //\r
     Status = Callback->Callback (\r
-                        Callback,\r
-                        Private->Function,\r
-                        TRUE,\r
-                        PacketLen,\r
-                        (EFI_PXE_BASE_CODE_PACKET *) Packet\r
-                        );\r
+                         Callback,\r
+                         Private->Function,\r
+                         TRUE,\r
+                         PacketLen,\r
+                         (EFI_PXE_BASE_CODE_PACKET *)Packet\r
+                         );\r
     if (Status != EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE) {\r
       //\r
       // User wants to abort current process if not EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE.\r
@@ -95,7 +94,6 @@ PxeBcMtftp6CheckPacket (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is to get the size of a file using Tftp.\r
 \r
@@ -114,23 +112,23 @@ PxeBcMtftp6CheckPacket (
 **/\r
 EFI_STATUS\r
 PxeBcMtftp6GetFileSize (\r
-  IN     PXEBC_PRIVATE_DATA           *Private,\r
-  IN     EFI_MTFTP6_CONFIG_DATA       *Config,\r
-  IN     UINT8                        *Filename,\r
-  IN     UINTN                        *BlockSize,\r
-  IN     UINTN                        *WindowSize,\r
-  IN OUT UINT64                       *BufferSize\r
+  IN     PXEBC_PRIVATE_DATA      *Private,\r
+  IN     EFI_MTFTP6_CONFIG_DATA  *Config,\r
+  IN     UINT8                   *Filename,\r
+  IN     UINTN                   *BlockSize,\r
+  IN     UINTN                   *WindowSize,\r
+  IN OUT UINT64                  *BufferSize\r
   )\r
 {\r
-  EFI_MTFTP6_PROTOCOL                 *Mtftp6;\r
-  EFI_MTFTP6_OPTION                   ReqOpt[3];\r
-  EFI_MTFTP6_PACKET                   *Packet;\r
-  EFI_MTFTP6_OPTION                   *Option;\r
-  UINT32                              PktLen;\r
-  UINT8                               OptBuf[PXE_MTFTP_OPTBUF_MAXNUM_INDEX];\r
-  UINTN                               OptBufSize;\r
-  UINT32                              OptCnt;\r
-  EFI_STATUS                          Status;\r
+  EFI_MTFTP6_PROTOCOL  *Mtftp6;\r
+  EFI_MTFTP6_OPTION    ReqOpt[3];\r
+  EFI_MTFTP6_PACKET    *Packet;\r
+  EFI_MTFTP6_OPTION    *Option;\r
+  UINT32               PktLen;\r
+  UINT8                OptBuf[PXE_MTFTP_OPTBUF_MAXNUM_INDEX];\r
+  UINTN                OptBufSize;\r
+  UINT32               OptCnt;\r
+  EFI_STATUS           Status;\r
 \r
   *BufferSize               = 0;\r
   Status                    = EFI_DEVICE_ERROR;\r
@@ -150,22 +148,22 @@ PxeBcMtftp6GetFileSize (
   //\r
   // Build the required options for get info.\r
   //\r
-  ReqOpt[0].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_TSIZE_INDEX];\r
+  ReqOpt[0].OptionStr = (UINT8 *)mMtftpOptions[PXE_MTFTP_OPTION_TSIZE_INDEX];\r
   PxeBcUintnToAscDec (0, OptBuf, OptBufSize);\r
-  ReqOpt[0].ValueStr  = OptBuf;\r
+  ReqOpt[0].ValueStr = OptBuf;\r
 \r
   if (BlockSize != NULL) {\r
-    ReqOpt[OptCnt].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];\r
-    ReqOpt[OptCnt].ValueStr  = (UINT8 *) (ReqOpt[OptCnt-1].ValueStr + AsciiStrLen ((CHAR8 *) ReqOpt[OptCnt-1].ValueStr) + 1);\r
-    OptBufSize -= (AsciiStrLen ((CHAR8 *) ReqOpt[OptCnt-1].ValueStr) + 1);\r
+    ReqOpt[OptCnt].OptionStr = (UINT8 *)mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];\r
+    ReqOpt[OptCnt].ValueStr  = (UINT8 *)(ReqOpt[OptCnt-1].ValueStr + AsciiStrLen ((CHAR8 *)ReqOpt[OptCnt-1].ValueStr) + 1);\r
+    OptBufSize              -= (AsciiStrLen ((CHAR8 *)ReqOpt[OptCnt-1].ValueStr) + 1);\r
     PxeBcUintnToAscDec (*BlockSize, ReqOpt[OptCnt].ValueStr, OptBufSize);\r
     OptCnt++;\r
   }\r
 \r
   if (WindowSize != NULL) {\r
-    ReqOpt[OptCnt].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_WINDOWSIZE_INDEX];\r
-    ReqOpt[OptCnt].ValueStr  = (UINT8 *) (ReqOpt[OptCnt-1].ValueStr + AsciiStrLen ((CHAR8 *) ReqOpt[OptCnt-1].ValueStr) + 1);\r
-    OptBufSize -= (AsciiStrLen ((CHAR8 *) ReqOpt[OptCnt-1].ValueStr) + 1);\r
+    ReqOpt[OptCnt].OptionStr = (UINT8 *)mMtftpOptions[PXE_MTFTP_OPTION_WINDOWSIZE_INDEX];\r
+    ReqOpt[OptCnt].ValueStr  = (UINT8 *)(ReqOpt[OptCnt-1].ValueStr + AsciiStrLen ((CHAR8 *)ReqOpt[OptCnt-1].ValueStr) + 1);\r
+    OptBufSize              -= (AsciiStrLen ((CHAR8 *)ReqOpt[OptCnt-1].ValueStr) + 1);\r
     PxeBcUintnToAscDec (*WindowSize, ReqOpt[OptCnt].ValueStr, OptBufSize);\r
     OptCnt++;\r
   }\r
@@ -175,7 +173,7 @@ PxeBcMtftp6GetFileSize (
                      NULL,\r
                      Filename,\r
                      NULL,\r
-                     (UINT8) OptCnt,\r
+                     (UINT8)OptCnt,\r
                      ReqOpt,\r
                      &PktLen,\r
                      &Packet\r
@@ -186,15 +184,16 @@ PxeBcMtftp6GetFileSize (
       // Store the tftp error message into mode data and set the received flag.\r
       //\r
       Private->Mode.TftpErrorReceived   = TRUE;\r
-      Private->Mode.TftpError.ErrorCode = (UINT8) Packet->Error.ErrorCode;\r
+      Private->Mode.TftpError.ErrorCode = (UINT8)Packet->Error.ErrorCode;\r
       AsciiStrnCpyS (\r
         Private->Mode.TftpError.ErrorString,\r
         PXE_MTFTP_ERROR_STRING_LENGTH,\r
-        (CHAR8 *) Packet->Error.ErrorMessage,\r
+        (CHAR8 *)Packet->Error.ErrorMessage,\r
         PXE_MTFTP_ERROR_STRING_LENGTH - 1\r
         );\r
       Private->Mode.TftpError.ErrorString[PXE_MTFTP_ERROR_STRING_LENGTH - 1] = '\0';\r
     }\r
+\r
     goto ON_ERROR;\r
   }\r
 \r
@@ -206,7 +205,7 @@ PxeBcMtftp6GetFileSize (
                      Mtftp6,\r
                      PktLen,\r
                      Packet,\r
-                     (UINT32 *) &OptCnt,\r
+                     (UINT32 *)&OptCnt,\r
                      &Option\r
                      );\r
   if (EFI_ERROR (Status)) {\r
@@ -218,24 +217,26 @@ PxeBcMtftp6GetFileSize (
   //\r
   Status = EFI_NOT_FOUND;\r
   while (OptCnt != 0) {\r
-    if (AsciiStrnCmp ((CHAR8 *) Option[OptCnt - 1].OptionStr, "tsize", 5) == 0) {\r
-      *BufferSize = AsciiStrDecimalToUint64 ((CHAR8 *) (Option[OptCnt - 1].ValueStr));\r
+    if (AsciiStrnCmp ((CHAR8 *)Option[OptCnt - 1].OptionStr, "tsize", 5) == 0) {\r
+      *BufferSize = AsciiStrDecimalToUint64 ((CHAR8 *)(Option[OptCnt - 1].ValueStr));\r
       Status      = EFI_SUCCESS;\r
     }\r
+\r
     OptCnt--;\r
   }\r
+\r
   FreePool (Option);\r
 \r
 ON_ERROR:\r
   if (Packet != NULL) {\r
     FreePool (Packet);\r
   }\r
+\r
   Mtftp6->Configure (Mtftp6, NULL);\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is to get data of a file using Tftp.\r
 \r
@@ -255,23 +256,23 @@ ON_ERROR:
 **/\r
 EFI_STATUS\r
 PxeBcMtftp6ReadFile (\r
-  IN    PXEBC_PRIVATE_DATA            *Private,\r
-  IN     EFI_MTFTP6_CONFIG_DATA       *Config,\r
-  IN     UINT8                        *Filename,\r
-  IN     UINTN                        *BlockSize,\r
-  IN     UINTN                        *WindowSize,\r
-  IN     UINT8                        *BufferPtr,\r
-  IN OUT UINT64                       *BufferSize,\r
-  IN     BOOLEAN                      DontUseBuffer\r
+  IN    PXEBC_PRIVATE_DATA       *Private,\r
+  IN     EFI_MTFTP6_CONFIG_DATA  *Config,\r
+  IN     UINT8                   *Filename,\r
+  IN     UINTN                   *BlockSize,\r
+  IN     UINTN                   *WindowSize,\r
+  IN     UINT8                   *BufferPtr,\r
+  IN OUT UINT64                  *BufferSize,\r
+  IN     BOOLEAN                 DontUseBuffer\r
   )\r
 {\r
-  EFI_MTFTP6_PROTOCOL                 *Mtftp6;\r
-  EFI_MTFTP6_TOKEN                    Token;\r
-  EFI_MTFTP6_OPTION                   ReqOpt[2];\r
-  UINT32                              OptCnt;\r
-  UINT8                               BlksizeBuf[10];\r
-  UINT8                               WindowsizeBuf[10];\r
-  EFI_STATUS                          Status;\r
+  EFI_MTFTP6_PROTOCOL  *Mtftp6;\r
+  EFI_MTFTP6_TOKEN     Token;\r
+  EFI_MTFTP6_OPTION    ReqOpt[2];\r
+  UINT32               OptCnt;\r
+  UINT8                BlksizeBuf[10];\r
+  UINT8                WindowsizeBuf[10];\r
+  EFI_STATUS           Status;\r
 \r
   Status                    = EFI_DEVICE_ERROR;\r
   Mtftp6                    = Private->Mtftp6;\r
@@ -284,34 +285,33 @@ PxeBcMtftp6ReadFile (
   }\r
 \r
   if (BlockSize != NULL) {\r
-    ReqOpt[OptCnt].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];\r
+    ReqOpt[OptCnt].OptionStr = (UINT8 *)mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];\r
     ReqOpt[OptCnt].ValueStr  = BlksizeBuf;\r
     PxeBcUintnToAscDec (*BlockSize, ReqOpt[OptCnt].ValueStr, sizeof (BlksizeBuf));\r
     OptCnt++;\r
   }\r
 \r
   if (WindowSize != NULL) {\r
-    ReqOpt[OptCnt].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_WINDOWSIZE_INDEX];\r
+    ReqOpt[OptCnt].OptionStr = (UINT8 *)mMtftpOptions[PXE_MTFTP_OPTION_WINDOWSIZE_INDEX];\r
     ReqOpt[OptCnt].ValueStr  = WindowsizeBuf;\r
     PxeBcUintnToAscDec (*WindowSize, ReqOpt[OptCnt].ValueStr, sizeof (WindowsizeBuf));\r
     OptCnt++;\r
   }\r
 \r
-\r
-  Token.Event         = NULL;\r
-  Token.OverrideData  = NULL;\r
-  Token.Filename      = Filename;\r
-  Token.ModeStr       = NULL;\r
-  Token.OptionCount   = OptCnt;\r
-  Token.OptionList    = ReqOpt;\r
-  Token.Context       = Private;\r
+  Token.Event        = NULL;\r
+  Token.OverrideData = NULL;\r
+  Token.Filename     = Filename;\r
+  Token.ModeStr      = NULL;\r
+  Token.OptionCount  = OptCnt;\r
+  Token.OptionList   = ReqOpt;\r
+  Token.Context      = Private;\r
 \r
   if (DontUseBuffer) {\r
-    Token.BufferSize  = 0;\r
-    Token.Buffer      = NULL;\r
+    Token.BufferSize = 0;\r
+    Token.Buffer     = NULL;\r
   } else {\r
-    Token.BufferSize  = *BufferSize;\r
-    Token.Buffer      = BufferPtr;\r
+    Token.BufferSize = *BufferSize;\r
+    Token.Buffer     = BufferPtr;\r
   }\r
 \r
   Token.CheckPacket     = PxeBcMtftp6CheckPacket;\r
@@ -329,7 +329,6 @@ PxeBcMtftp6ReadFile (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is used to write the data of a file using Tftp.\r
 \r
@@ -348,21 +347,21 @@ PxeBcMtftp6ReadFile (
 **/\r
 EFI_STATUS\r
 PxeBcMtftp6WriteFile (\r
-  IN     PXEBC_PRIVATE_DATA           *Private,\r
-  IN     EFI_MTFTP6_CONFIG_DATA       *Config,\r
-  IN     UINT8                        *Filename,\r
-  IN     BOOLEAN                      Overwrite,\r
-  IN     UINTN                        *BlockSize,\r
-  IN     UINT8                        *BufferPtr,\r
-  IN OUT UINT64                       *BufferSize\r
+  IN     PXEBC_PRIVATE_DATA      *Private,\r
+  IN     EFI_MTFTP6_CONFIG_DATA  *Config,\r
+  IN     UINT8                   *Filename,\r
+  IN     BOOLEAN                 Overwrite,\r
+  IN     UINTN                   *BlockSize,\r
+  IN     UINT8                   *BufferPtr,\r
+  IN OUT UINT64                  *BufferSize\r
   )\r
 {\r
-  EFI_MTFTP6_PROTOCOL                 *Mtftp6;\r
-  EFI_MTFTP6_TOKEN                    Token;\r
-  EFI_MTFTP6_OPTION                   ReqOpt[1];\r
-  UINT32                              OptCnt;\r
-  UINT8                               OptBuf[128];\r
-  EFI_STATUS                          Status;\r
+  EFI_MTFTP6_PROTOCOL  *Mtftp6;\r
+  EFI_MTFTP6_TOKEN     Token;\r
+  EFI_MTFTP6_OPTION    ReqOpt[1];\r
+  UINT32               OptCnt;\r
+  UINT8                OptBuf[128];\r
+  EFI_STATUS           Status;\r
 \r
   Status                    = EFI_DEVICE_ERROR;\r
   Mtftp6                    = Private->Mtftp6;\r
@@ -375,7 +374,7 @@ PxeBcMtftp6WriteFile (
   }\r
 \r
   if (BlockSize != NULL) {\r
-    ReqOpt[0].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];\r
+    ReqOpt[0].OptionStr = (UINT8 *)mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];\r
     ReqOpt[0].ValueStr  = OptBuf;\r
     PxeBcUintnToAscDec (*BlockSize, ReqOpt[0].ValueStr, PXE_MTFTP_OPTBUF_MAXNUM_INDEX);\r
     OptCnt++;\r
@@ -404,7 +403,6 @@ PxeBcMtftp6WriteFile (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is to read the data (file) from a directory using Tftp.\r
 \r
@@ -424,23 +422,23 @@ PxeBcMtftp6WriteFile (
 **/\r
 EFI_STATUS\r
 PxeBcMtftp6ReadDirectory (\r
-  IN     PXEBC_PRIVATE_DATA            *Private,\r
-  IN     EFI_MTFTP6_CONFIG_DATA        *Config,\r
-  IN     UINT8                         *Filename,\r
-  IN     UINTN                         *BlockSize,\r
-  IN     UINTN                         *WindowSize,\r
-  IN     UINT8                         *BufferPtr,\r
-  IN OUT UINT64                        *BufferSize,\r
-  IN     BOOLEAN                       DontUseBuffer\r
+  IN     PXEBC_PRIVATE_DATA      *Private,\r
+  IN     EFI_MTFTP6_CONFIG_DATA  *Config,\r
+  IN     UINT8                   *Filename,\r
+  IN     UINTN                   *BlockSize,\r
+  IN     UINTN                   *WindowSize,\r
+  IN     UINT8                   *BufferPtr,\r
+  IN OUT UINT64                  *BufferSize,\r
+  IN     BOOLEAN                 DontUseBuffer\r
   )\r
 {\r
-  EFI_MTFTP6_PROTOCOL                  *Mtftp6;\r
-  EFI_MTFTP6_TOKEN                     Token;\r
-  EFI_MTFTP6_OPTION                    ReqOpt[2];\r
-  UINT32                               OptCnt;\r
-  UINT8                                BlksizeBuf[10];\r
-  UINT8                                WindowsizeBuf[10];\r
-  EFI_STATUS                           Status;\r
+  EFI_MTFTP6_PROTOCOL  *Mtftp6;\r
+  EFI_MTFTP6_TOKEN     Token;\r
+  EFI_MTFTP6_OPTION    ReqOpt[2];\r
+  UINT32               OptCnt;\r
+  UINT8                BlksizeBuf[10];\r
+  UINT8                WindowsizeBuf[10];\r
+  EFI_STATUS           Status;\r
 \r
   Status                    = EFI_DEVICE_ERROR;\r
   Mtftp6                    = Private->Mtftp6;\r
@@ -453,33 +451,33 @@ PxeBcMtftp6ReadDirectory (
   }\r
 \r
   if (BlockSize != NULL) {\r
-    ReqOpt[OptCnt].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];\r
+    ReqOpt[OptCnt].OptionStr = (UINT8 *)mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];\r
     ReqOpt[OptCnt].ValueStr  = BlksizeBuf;\r
     PxeBcUintnToAscDec (*BlockSize, ReqOpt[OptCnt].ValueStr, sizeof (BlksizeBuf));\r
     OptCnt++;\r
   }\r
 \r
   if (WindowSize != NULL) {\r
-    ReqOpt[OptCnt].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_WINDOWSIZE_INDEX];\r
+    ReqOpt[OptCnt].OptionStr = (UINT8 *)mMtftpOptions[PXE_MTFTP_OPTION_WINDOWSIZE_INDEX];\r
     ReqOpt[OptCnt].ValueStr  = WindowsizeBuf;\r
     PxeBcUintnToAscDec (*WindowSize, ReqOpt[OptCnt].ValueStr, sizeof (WindowsizeBuf));\r
     OptCnt++;\r
   }\r
 \r
-  Token.Event         = NULL;\r
-  Token.OverrideData  = NULL;\r
-  Token.Filename      = Filename;\r
-  Token.ModeStr       = NULL;\r
-  Token.OptionCount   = OptCnt;\r
-  Token.OptionList    = ReqOpt;\r
-  Token.Context       = Private;\r
+  Token.Event        = NULL;\r
+  Token.OverrideData = NULL;\r
+  Token.Filename     = Filename;\r
+  Token.ModeStr      = NULL;\r
+  Token.OptionCount  = OptCnt;\r
+  Token.OptionList   = ReqOpt;\r
+  Token.Context      = Private;\r
 \r
   if (DontUseBuffer) {\r
-    Token.BufferSize  = 0;\r
-    Token.Buffer      = NULL;\r
+    Token.BufferSize = 0;\r
+    Token.Buffer     = NULL;\r
   } else {\r
-    Token.BufferSize  = *BufferSize;\r
-    Token.Buffer      = BufferPtr;\r
+    Token.BufferSize = *BufferSize;\r
+    Token.Buffer     = BufferPtr;\r
   }\r
 \r
   Token.CheckPacket     = PxeBcMtftp6CheckPacket;\r
@@ -497,7 +495,6 @@ PxeBcMtftp6ReadDirectory (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This is a callback function when packets are received or transmitted in Mtftp driver.\r
 \r
@@ -519,30 +516,30 @@ PxeBcMtftp6ReadDirectory (
 EFI_STATUS\r
 EFIAPI\r
 PxeBcMtftp4CheckPacket (\r
-  IN EFI_MTFTP4_PROTOCOL        *This,\r
-  IN EFI_MTFTP4_TOKEN           *Token,\r
-  IN UINT16                     PacketLen,\r
-  IN EFI_MTFTP4_PACKET          *Packet\r
+  IN EFI_MTFTP4_PROTOCOL  *This,\r
+  IN EFI_MTFTP4_TOKEN     *Token,\r
+  IN UINT16               PacketLen,\r
+  IN EFI_MTFTP4_PACKET    *Packet\r
   )\r
 {\r
-  PXEBC_PRIVATE_DATA                  *Private;\r
-  EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL *Callback;\r
-  EFI_STATUS                          Status;\r
+  PXEBC_PRIVATE_DATA                   *Private;\r
+  EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL  *Callback;\r
+  EFI_STATUS                           Status;\r
 \r
-  Private   = (PXEBC_PRIVATE_DATA *) Token->Context;\r
-  Callback  = Private->PxeBcCallback;\r
-  Status    = EFI_SUCCESS;\r
+  Private  = (PXEBC_PRIVATE_DATA *)Token->Context;\r
+  Callback = Private->PxeBcCallback;\r
+  Status   = EFI_SUCCESS;\r
 \r
   if (Packet->OpCode == EFI_MTFTP4_OPCODE_ERROR) {\r
     //\r
     // Store the tftp error message into mode data and set the received flag.\r
     //\r
     Private->Mode.TftpErrorReceived   = TRUE;\r
-    Private->Mode.TftpError.ErrorCode = (UINT8) Packet->Error.ErrorCode;\r
+    Private->Mode.TftpError.ErrorCode = (UINT8)Packet->Error.ErrorCode;\r
     AsciiStrnCpyS (\r
       Private->Mode.TftpError.ErrorString,\r
       PXE_MTFTP_ERROR_STRING_LENGTH,\r
-      (CHAR8 *) Packet->Error.ErrorMessage,\r
+      (CHAR8 *)Packet->Error.ErrorMessage,\r
       PXE_MTFTP_ERROR_STRING_LENGTH - 1\r
       );\r
     Private->Mode.TftpError.ErrorString[PXE_MTFTP_ERROR_STRING_LENGTH - 1] = '\0';\r
@@ -553,12 +550,12 @@ PxeBcMtftp4CheckPacket (
     // Callback to user if has when received any tftp packet.\r
     //\r
     Status = Callback->Callback (\r
-                        Callback,\r
-                        Private->Function,\r
-                        TRUE,\r
-                        PacketLen,\r
-                        (EFI_PXE_BASE_CODE_PACKET *) Packet\r
-                        );\r
+                         Callback,\r
+                         Private->Function,\r
+                         TRUE,\r
+                         PacketLen,\r
+                         (EFI_PXE_BASE_CODE_PACKET *)Packet\r
+                         );\r
     if (Status != EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE) {\r
       //\r
       // User wants to abort current process if not EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE.\r
@@ -575,7 +572,6 @@ PxeBcMtftp4CheckPacket (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is to get size of a file using Tftp.\r
 \r
@@ -594,23 +590,23 @@ PxeBcMtftp4CheckPacket (
 **/\r
 EFI_STATUS\r
 PxeBcMtftp4GetFileSize (\r
-  IN     PXEBC_PRIVATE_DATA         *Private,\r
-  IN     EFI_MTFTP4_CONFIG_DATA     *Config,\r
-  IN     UINT8                      *Filename,\r
-  IN     UINTN                      *BlockSize,\r
-  IN     UINTN                      *WindowSize,\r
-  IN OUT UINT64                     *BufferSize\r
+  IN     PXEBC_PRIVATE_DATA      *Private,\r
+  IN     EFI_MTFTP4_CONFIG_DATA  *Config,\r
+  IN     UINT8                   *Filename,\r
+  IN     UINTN                   *BlockSize,\r
+  IN     UINTN                   *WindowSize,\r
+  IN OUT UINT64                  *BufferSize\r
   )\r
 {\r
-  EFI_MTFTP4_PROTOCOL *Mtftp4;\r
-  EFI_MTFTP4_OPTION   ReqOpt[3];\r
-  EFI_MTFTP4_PACKET   *Packet;\r
-  EFI_MTFTP4_OPTION   *Option;\r
-  UINT32              PktLen;\r
-  UINT8               OptBuf[PXE_MTFTP_OPTBUF_MAXNUM_INDEX];\r
-  UINTN               OptBufSize;\r
-  UINT32              OptCnt;\r
-  EFI_STATUS          Status;\r
+  EFI_MTFTP4_PROTOCOL  *Mtftp4;\r
+  EFI_MTFTP4_OPTION    ReqOpt[3];\r
+  EFI_MTFTP4_PACKET    *Packet;\r
+  EFI_MTFTP4_OPTION    *Option;\r
+  UINT32               PktLen;\r
+  UINT8                OptBuf[PXE_MTFTP_OPTBUF_MAXNUM_INDEX];\r
+  UINTN                OptBufSize;\r
+  UINT32               OptCnt;\r
+  EFI_STATUS           Status;\r
 \r
   *BufferSize               = 0;\r
   Status                    = EFI_DEVICE_ERROR;\r
@@ -630,22 +626,22 @@ PxeBcMtftp4GetFileSize (
   //\r
   // Build the required options for get info.\r
   //\r
-  ReqOpt[0].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_TSIZE_INDEX];\r
+  ReqOpt[0].OptionStr = (UINT8 *)mMtftpOptions[PXE_MTFTP_OPTION_TSIZE_INDEX];\r
   PxeBcUintnToAscDec (0, OptBuf, OptBufSize);\r
-  ReqOpt[0].ValueStr  = OptBuf;\r
+  ReqOpt[0].ValueStr = OptBuf;\r
 \r
   if (BlockSize != NULL) {\r
-    ReqOpt[OptCnt].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];\r
-    ReqOpt[OptCnt].ValueStr  = (UINT8 *) (ReqOpt[OptCnt-1].ValueStr + AsciiStrLen ((CHAR8 *) ReqOpt[OptCnt-1].ValueStr) + 1);\r
-    OptBufSize -= (AsciiStrLen ((CHAR8 *) ReqOpt[OptCnt-1].ValueStr) + 1);\r
+    ReqOpt[OptCnt].OptionStr = (UINT8 *)mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];\r
+    ReqOpt[OptCnt].ValueStr  = (UINT8 *)(ReqOpt[OptCnt-1].ValueStr + AsciiStrLen ((CHAR8 *)ReqOpt[OptCnt-1].ValueStr) + 1);\r
+    OptBufSize              -= (AsciiStrLen ((CHAR8 *)ReqOpt[OptCnt-1].ValueStr) + 1);\r
     PxeBcUintnToAscDec (*BlockSize, ReqOpt[OptCnt].ValueStr, OptBufSize);\r
     OptCnt++;\r
   }\r
 \r
   if (WindowSize != NULL) {\r
-    ReqOpt[OptCnt].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_WINDOWSIZE_INDEX];\r
-    ReqOpt[OptCnt].ValueStr  = (UINT8 *) (ReqOpt[OptCnt-1].ValueStr + AsciiStrLen ((CHAR8 *) ReqOpt[OptCnt-1].ValueStr) + 1);\r
-    OptBufSize -= (AsciiStrLen ((CHAR8 *) ReqOpt[OptCnt-1].ValueStr) + 1);\r
+    ReqOpt[OptCnt].OptionStr = (UINT8 *)mMtftpOptions[PXE_MTFTP_OPTION_WINDOWSIZE_INDEX];\r
+    ReqOpt[OptCnt].ValueStr  = (UINT8 *)(ReqOpt[OptCnt-1].ValueStr + AsciiStrLen ((CHAR8 *)ReqOpt[OptCnt-1].ValueStr) + 1);\r
+    OptBufSize              -= (AsciiStrLen ((CHAR8 *)ReqOpt[OptCnt-1].ValueStr) + 1);\r
     PxeBcUintnToAscDec (*WindowSize, ReqOpt[OptCnt].ValueStr, OptBufSize);\r
     OptCnt++;\r
   }\r
@@ -655,7 +651,7 @@ PxeBcMtftp4GetFileSize (
                      NULL,\r
                      Filename,\r
                      NULL,\r
-                     (UINT8) OptCnt,\r
+                     (UINT8)OptCnt,\r
                      ReqOpt,\r
                      &PktLen,\r
                      &Packet\r
@@ -666,15 +662,16 @@ PxeBcMtftp4GetFileSize (
       // Store the tftp error message into mode data and set the received flag.\r
       //\r
       Private->Mode.TftpErrorReceived   = TRUE;\r
-      Private->Mode.TftpError.ErrorCode = (UINT8) Packet->Error.ErrorCode;\r
+      Private->Mode.TftpError.ErrorCode = (UINT8)Packet->Error.ErrorCode;\r
       AsciiStrnCpyS (\r
         Private->Mode.TftpError.ErrorString,\r
         PXE_MTFTP_ERROR_STRING_LENGTH,\r
-        (CHAR8 *) Packet->Error.ErrorMessage,\r
+        (CHAR8 *)Packet->Error.ErrorMessage,\r
         PXE_MTFTP_ERROR_STRING_LENGTH - 1\r
         );\r
       Private->Mode.TftpError.ErrorString[PXE_MTFTP_ERROR_STRING_LENGTH - 1] = '\0';\r
     }\r
+\r
     goto ON_ERROR;\r
   }\r
 \r
@@ -686,7 +683,7 @@ PxeBcMtftp4GetFileSize (
                      Mtftp4,\r
                      PktLen,\r
                      Packet,\r
-                     (UINT32 *) &OptCnt,\r
+                     (UINT32 *)&OptCnt,\r
                      &Option\r
                      );\r
   if (EFI_ERROR (Status)) {\r
@@ -698,24 +695,26 @@ PxeBcMtftp4GetFileSize (
   //\r
   Status = EFI_NOT_FOUND;\r
   while (OptCnt != 0) {\r
-    if (AsciiStrnCmp ((CHAR8 *) Option[OptCnt - 1].OptionStr, "tsize", 5) == 0) {\r
-      *BufferSize = AsciiStrDecimalToUint64 ((CHAR8 *) (Option[OptCnt - 1].ValueStr));\r
+    if (AsciiStrnCmp ((CHAR8 *)Option[OptCnt - 1].OptionStr, "tsize", 5) == 0) {\r
+      *BufferSize = AsciiStrDecimalToUint64 ((CHAR8 *)(Option[OptCnt - 1].ValueStr));\r
       Status      = EFI_SUCCESS;\r
     }\r
+\r
     OptCnt--;\r
   }\r
+\r
   FreePool (Option);\r
 \r
 ON_ERROR:\r
   if (Packet != NULL) {\r
     FreePool (Packet);\r
   }\r
+\r
   Mtftp4->Configure (Mtftp4, NULL);\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is to read the data of a file using Tftp.\r
 \r
@@ -735,23 +734,23 @@ ON_ERROR:
 **/\r
 EFI_STATUS\r
 PxeBcMtftp4ReadFile (\r
-  IN     PXEBC_PRIVATE_DATA         *Private,\r
-  IN     EFI_MTFTP4_CONFIG_DATA     *Config,\r
-  IN     UINT8                      *Filename,\r
-  IN     UINTN                      *BlockSize,\r
-  IN     UINTN                      *WindowSize,\r
-  IN     UINT8                      *BufferPtr,\r
-  IN OUT UINT64                     *BufferSize,\r
-  IN     BOOLEAN                    DontUseBuffer\r
+  IN     PXEBC_PRIVATE_DATA      *Private,\r
+  IN     EFI_MTFTP4_CONFIG_DATA  *Config,\r
+  IN     UINT8                   *Filename,\r
+  IN     UINTN                   *BlockSize,\r
+  IN     UINTN                   *WindowSize,\r
+  IN     UINT8                   *BufferPtr,\r
+  IN OUT UINT64                  *BufferSize,\r
+  IN     BOOLEAN                 DontUseBuffer\r
   )\r
 {\r
-  EFI_MTFTP4_PROTOCOL *Mtftp4;\r
-  EFI_MTFTP4_TOKEN    Token;\r
-  EFI_MTFTP4_OPTION   ReqOpt[2];\r
-  UINT32              OptCnt;\r
-  UINT8               BlksizeBuf[10];\r
-  UINT8               WindowsizeBuf[10];\r
-  EFI_STATUS          Status;\r
+  EFI_MTFTP4_PROTOCOL  *Mtftp4;\r
+  EFI_MTFTP4_TOKEN     Token;\r
+  EFI_MTFTP4_OPTION    ReqOpt[2];\r
+  UINT32               OptCnt;\r
+  UINT8                BlksizeBuf[10];\r
+  UINT8                WindowsizeBuf[10];\r
+  EFI_STATUS           Status;\r
 \r
   Status                    = EFI_DEVICE_ERROR;\r
   Mtftp4                    = Private->Mtftp4;\r
@@ -764,33 +763,33 @@ PxeBcMtftp4ReadFile (
   }\r
 \r
   if (BlockSize != NULL) {\r
-    ReqOpt[OptCnt].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];\r
+    ReqOpt[OptCnt].OptionStr = (UINT8 *)mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];\r
     ReqOpt[OptCnt].ValueStr  = BlksizeBuf;\r
     PxeBcUintnToAscDec (*BlockSize, ReqOpt[OptCnt].ValueStr, sizeof (BlksizeBuf));\r
     OptCnt++;\r
   }\r
 \r
   if (WindowSize != NULL) {\r
-    ReqOpt[OptCnt].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_WINDOWSIZE_INDEX];\r
+    ReqOpt[OptCnt].OptionStr = (UINT8 *)mMtftpOptions[PXE_MTFTP_OPTION_WINDOWSIZE_INDEX];\r
     ReqOpt[OptCnt].ValueStr  = WindowsizeBuf;\r
     PxeBcUintnToAscDec (*WindowSize, ReqOpt[OptCnt].ValueStr, sizeof (WindowsizeBuf));\r
     OptCnt++;\r
   }\r
 \r
-  Token.Event         = NULL;\r
-  Token.OverrideData  = NULL;\r
-  Token.Filename      = Filename;\r
-  Token.ModeStr       = NULL;\r
-  Token.OptionCount   = OptCnt;\r
-  Token.OptionList    = ReqOpt;\r
-  Token.Context       = Private;\r
+  Token.Event        = NULL;\r
+  Token.OverrideData = NULL;\r
+  Token.Filename     = Filename;\r
+  Token.ModeStr      = NULL;\r
+  Token.OptionCount  = OptCnt;\r
+  Token.OptionList   = ReqOpt;\r
+  Token.Context      = Private;\r
 \r
   if (DontUseBuffer) {\r
-    Token.BufferSize  = 0;\r
-    Token.Buffer      = NULL;\r
+    Token.BufferSize = 0;\r
+    Token.Buffer     = NULL;\r
   } else {\r
-    Token.BufferSize  = *BufferSize;\r
-    Token.Buffer      = BufferPtr;\r
+    Token.BufferSize = *BufferSize;\r
+    Token.Buffer     = BufferPtr;\r
   }\r
 \r
   Token.CheckPacket     = PxeBcMtftp4CheckPacket;\r
@@ -808,7 +807,6 @@ PxeBcMtftp4ReadFile (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is to write the data of a file using Tftp.\r
 \r
@@ -827,34 +825,34 @@ PxeBcMtftp4ReadFile (
 **/\r
 EFI_STATUS\r
 PxeBcMtftp4WriteFile (\r
-  IN     PXEBC_PRIVATE_DATA         *Private,\r
-  IN     EFI_MTFTP4_CONFIG_DATA     *Config,\r
-  IN     UINT8                      *Filename,\r
-  IN     BOOLEAN                    Overwrite,\r
-  IN     UINTN                      *BlockSize,\r
-  IN     UINT8                      *BufferPtr,\r
-  IN OUT UINT64                     *BufferSize\r
+  IN     PXEBC_PRIVATE_DATA      *Private,\r
+  IN     EFI_MTFTP4_CONFIG_DATA  *Config,\r
+  IN     UINT8                   *Filename,\r
+  IN     BOOLEAN                 Overwrite,\r
+  IN     UINTN                   *BlockSize,\r
+  IN     UINT8                   *BufferPtr,\r
+  IN OUT UINT64                  *BufferSize\r
   )\r
 {\r
-  EFI_MTFTP4_PROTOCOL *Mtftp4;\r
-  EFI_MTFTP4_TOKEN    Token;\r
-  EFI_MTFTP4_OPTION   ReqOpt[1];\r
-  UINT32              OptCnt;\r
-  UINT8               OptBuf[128];\r
-  EFI_STATUS          Status;\r
+  EFI_MTFTP4_PROTOCOL  *Mtftp4;\r
+  EFI_MTFTP4_TOKEN     Token;\r
+  EFI_MTFTP4_OPTION    ReqOpt[1];\r
+  UINT32               OptCnt;\r
+  UINT8                OptBuf[128];\r
+  EFI_STATUS           Status;\r
 \r
   Status                    = EFI_DEVICE_ERROR;\r
   Mtftp4                    = Private->Mtftp4;\r
   OptCnt                    = 0;\r
   Config->InitialServerPort = PXEBC_BS_DOWNLOAD_PORT;\r
 \r
-  Status  = Mtftp4->Configure (Mtftp4, Config);\r
+  Status = Mtftp4->Configure (Mtftp4, Config);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   if (BlockSize != NULL) {\r
-    ReqOpt[0].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];\r
+    ReqOpt[0].OptionStr = (UINT8 *)mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];\r
     ReqOpt[0].ValueStr  = OptBuf;\r
     PxeBcUintnToAscDec (*BlockSize, ReqOpt[0].ValueStr, PXE_MTFTP_OPTBUF_MAXNUM_INDEX);\r
     OptCnt++;\r
@@ -883,7 +881,6 @@ PxeBcMtftp4WriteFile (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is to get data (file) from a directory using Tftp.\r
 \r
@@ -903,23 +900,23 @@ PxeBcMtftp4WriteFile (
 **/\r
 EFI_STATUS\r
 PxeBcMtftp4ReadDirectory (\r
-  IN     PXEBC_PRIVATE_DATA            *Private,\r
-  IN     EFI_MTFTP4_CONFIG_DATA        *Config,\r
-  IN     UINT8                         *Filename,\r
-  IN     UINTN                         *BlockSize,\r
-  IN     UINTN                         *WindowSize,\r
-  IN     UINT8                         *BufferPtr,\r
-  IN OUT UINT64                        *BufferSize,\r
-  IN     BOOLEAN                       DontUseBuffer\r
+  IN     PXEBC_PRIVATE_DATA      *Private,\r
+  IN     EFI_MTFTP4_CONFIG_DATA  *Config,\r
+  IN     UINT8                   *Filename,\r
+  IN     UINTN                   *BlockSize,\r
+  IN     UINTN                   *WindowSize,\r
+  IN     UINT8                   *BufferPtr,\r
+  IN OUT UINT64                  *BufferSize,\r
+  IN     BOOLEAN                 DontUseBuffer\r
   )\r
 {\r
-  EFI_MTFTP4_PROTOCOL *Mtftp4;\r
-  EFI_MTFTP4_TOKEN    Token;\r
-  EFI_MTFTP4_OPTION   ReqOpt[2];\r
-  UINT32              OptCnt;\r
-  UINT8               BlksizeBuf[10];\r
-  UINT8               WindowsizeBuf[10];\r
-  EFI_STATUS          Status;\r
+  EFI_MTFTP4_PROTOCOL  *Mtftp4;\r
+  EFI_MTFTP4_TOKEN     Token;\r
+  EFI_MTFTP4_OPTION    ReqOpt[2];\r
+  UINT32               OptCnt;\r
+  UINT8                BlksizeBuf[10];\r
+  UINT8                WindowsizeBuf[10];\r
+  EFI_STATUS           Status;\r
 \r
   Status                    = EFI_DEVICE_ERROR;\r
   Mtftp4                    = Private->Mtftp4;\r
@@ -932,33 +929,33 @@ PxeBcMtftp4ReadDirectory (
   }\r
 \r
   if (BlockSize != NULL) {\r
-    ReqOpt[OptCnt].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];\r
+    ReqOpt[OptCnt].OptionStr = (UINT8 *)mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];\r
     ReqOpt[OptCnt].ValueStr  = BlksizeBuf;\r
     PxeBcUintnToAscDec (*BlockSize, ReqOpt[OptCnt].ValueStr, sizeof (BlksizeBuf));\r
     OptCnt++;\r
   }\r
 \r
   if (WindowSize != NULL) {\r
-    ReqOpt[OptCnt].OptionStr = (UINT8 *) mMtftpOptions[PXE_MTFTP_OPTION_WINDOWSIZE_INDEX];\r
+    ReqOpt[OptCnt].OptionStr = (UINT8 *)mMtftpOptions[PXE_MTFTP_OPTION_WINDOWSIZE_INDEX];\r
     ReqOpt[OptCnt].ValueStr  = WindowsizeBuf;\r
     PxeBcUintnToAscDec (*WindowSize, ReqOpt[OptCnt].ValueStr, sizeof (WindowsizeBuf));\r
     OptCnt++;\r
   }\r
 \r
-  Token.Event         = NULL;\r
-  Token.OverrideData  = NULL;\r
-  Token.Filename      = Filename;\r
-  Token.ModeStr       = NULL;\r
-  Token.OptionCount   = OptCnt;\r
-  Token.OptionList    = ReqOpt;\r
-  Token.Context       = Private;\r
+  Token.Event        = NULL;\r
+  Token.OverrideData = NULL;\r
+  Token.Filename     = Filename;\r
+  Token.ModeStr      = NULL;\r
+  Token.OptionCount  = OptCnt;\r
+  Token.OptionList   = ReqOpt;\r
+  Token.Context      = Private;\r
 \r
   if (DontUseBuffer) {\r
-    Token.BufferSize  = 0;\r
-    Token.Buffer      = NULL;\r
+    Token.BufferSize = 0;\r
+    Token.Buffer     = NULL;\r
   } else {\r
-    Token.BufferSize  = *BufferSize;\r
-    Token.Buffer      = BufferPtr;\r
+    Token.BufferSize = *BufferSize;\r
+    Token.Buffer     = BufferPtr;\r
   }\r
 \r
   Token.CheckPacket     = PxeBcMtftp4CheckPacket;\r
@@ -976,7 +973,6 @@ PxeBcMtftp4ReadDirectory (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is wrapper to get the file size using TFTP.\r
 \r
@@ -995,18 +991,18 @@ PxeBcMtftp4ReadDirectory (
 **/\r
 EFI_STATUS\r
 PxeBcTftpGetFileSize (\r
-  IN     PXEBC_PRIVATE_DATA         *Private,\r
-  IN     VOID                       *Config,\r
-  IN     UINT8                      *Filename,\r
-  IN     UINTN                      *BlockSize,\r
-  IN     UINTN                      *WindowSize,\r
-  IN OUT UINT64                     *BufferSize\r
+  IN     PXEBC_PRIVATE_DATA  *Private,\r
+  IN     VOID                *Config,\r
+  IN     UINT8               *Filename,\r
+  IN     UINTN               *BlockSize,\r
+  IN     UINTN               *WindowSize,\r
+  IN OUT UINT64              *BufferSize\r
   )\r
 {\r
   if (Private->PxeBc.Mode->UsingIpv6) {\r
     return PxeBcMtftp6GetFileSize (\r
              Private,\r
-             (EFI_MTFTP6_CONFIG_DATA *) Config,\r
+             (EFI_MTFTP6_CONFIG_DATA *)Config,\r
              Filename,\r
              BlockSize,\r
              WindowSize,\r
@@ -1015,7 +1011,7 @@ PxeBcTftpGetFileSize (
   } else {\r
     return PxeBcMtftp4GetFileSize (\r
              Private,\r
-             (EFI_MTFTP4_CONFIG_DATA *) Config,\r
+             (EFI_MTFTP4_CONFIG_DATA *)Config,\r
              Filename,\r
              BlockSize,\r
              WindowSize,\r
@@ -1024,7 +1020,6 @@ PxeBcTftpGetFileSize (
   }\r
 }\r
 \r
-\r
 /**\r
   This function is a wrapper to get file using TFTP.\r
 \r
@@ -1044,20 +1039,20 @@ PxeBcTftpGetFileSize (
 **/\r
 EFI_STATUS\r
 PxeBcTftpReadFile (\r
-  IN     PXEBC_PRIVATE_DATA         *Private,\r
-  IN     VOID                       *Config,\r
-  IN     UINT8                      *Filename,\r
-  IN     UINTN                      *BlockSize,\r
-  IN     UINTN                      *WindowSize,\r
-  IN     UINT8                      *BufferPtr,\r
-  IN OUT UINT64                     *BufferSize,\r
-  IN     BOOLEAN                    DontUseBuffer\r
+  IN     PXEBC_PRIVATE_DATA  *Private,\r
+  IN     VOID                *Config,\r
+  IN     UINT8               *Filename,\r
+  IN     UINTN               *BlockSize,\r
+  IN     UINTN               *WindowSize,\r
+  IN     UINT8               *BufferPtr,\r
+  IN OUT UINT64              *BufferSize,\r
+  IN     BOOLEAN             DontUseBuffer\r
   )\r
 {\r
   if (Private->PxeBc.Mode->UsingIpv6) {\r
     return PxeBcMtftp6ReadFile (\r
              Private,\r
-             (EFI_MTFTP6_CONFIG_DATA *) Config,\r
+             (EFI_MTFTP6_CONFIG_DATA *)Config,\r
              Filename,\r
              BlockSize,\r
              WindowSize,\r
@@ -1068,7 +1063,7 @@ PxeBcTftpReadFile (
   } else {\r
     return PxeBcMtftp4ReadFile (\r
              Private,\r
-             (EFI_MTFTP4_CONFIG_DATA *) Config,\r
+             (EFI_MTFTP4_CONFIG_DATA *)Config,\r
              Filename,\r
              BlockSize,\r
              WindowSize,\r
@@ -1079,7 +1074,6 @@ PxeBcTftpReadFile (
   }\r
 }\r
 \r
-\r
 /**\r
   This function is a wrapper to write file using TFTP.\r
 \r
@@ -1098,19 +1092,19 @@ PxeBcTftpReadFile (
 **/\r
 EFI_STATUS\r
 PxeBcTftpWriteFile (\r
-  IN     PXEBC_PRIVATE_DATA         *Private,\r
-  IN     VOID                       *Config,\r
-  IN     UINT8                      *Filename,\r
-  IN     BOOLEAN                    Overwrite,\r
-  IN     UINTN                      *BlockSize,\r
-  IN     UINT8                      *BufferPtr,\r
-  IN OUT UINT64                     *BufferSize\r
+  IN     PXEBC_PRIVATE_DATA  *Private,\r
+  IN     VOID                *Config,\r
+  IN     UINT8               *Filename,\r
+  IN     BOOLEAN             Overwrite,\r
+  IN     UINTN               *BlockSize,\r
+  IN     UINT8               *BufferPtr,\r
+  IN OUT UINT64              *BufferSize\r
   )\r
 {\r
   if (Private->PxeBc.Mode->UsingIpv6) {\r
     return PxeBcMtftp6WriteFile (\r
              Private,\r
-             (EFI_MTFTP6_CONFIG_DATA *) Config,\r
+             (EFI_MTFTP6_CONFIG_DATA *)Config,\r
              Filename,\r
              Overwrite,\r
              BlockSize,\r
@@ -1120,7 +1114,7 @@ PxeBcTftpWriteFile (
   } else {\r
     return PxeBcMtftp4WriteFile (\r
              Private,\r
-             (EFI_MTFTP4_CONFIG_DATA *) Config,\r
+             (EFI_MTFTP4_CONFIG_DATA *)Config,\r
              Filename,\r
              Overwrite,\r
              BlockSize,\r
@@ -1130,7 +1124,6 @@ PxeBcTftpWriteFile (
   }\r
 }\r
 \r
-\r
 /**\r
   This function is a wrapper to get the data (file) from a directory using TFTP.\r
 \r
@@ -1150,20 +1143,20 @@ PxeBcTftpWriteFile (
 **/\r
 EFI_STATUS\r
 PxeBcTftpReadDirectory (\r
-  IN     PXEBC_PRIVATE_DATA            *Private,\r
-  IN     VOID                          *Config,\r
-  IN     UINT8                         *Filename,\r
-  IN     UINTN                         *BlockSize,\r
-  IN     UINTN                         *WindowSize,\r
-  IN     UINT8                         *BufferPtr,\r
-  IN OUT UINT64                        *BufferSize,\r
-  IN     BOOLEAN                       DontUseBuffer\r
+  IN     PXEBC_PRIVATE_DATA  *Private,\r
+  IN     VOID                *Config,\r
+  IN     UINT8               *Filename,\r
+  IN     UINTN               *BlockSize,\r
+  IN     UINTN               *WindowSize,\r
+  IN     UINT8               *BufferPtr,\r
+  IN OUT UINT64              *BufferSize,\r
+  IN     BOOLEAN             DontUseBuffer\r
   )\r
 {\r
   if (Private->PxeBc.Mode->UsingIpv6) {\r
     return PxeBcMtftp6ReadDirectory (\r
              Private,\r
-             (EFI_MTFTP6_CONFIG_DATA *) Config,\r
+             (EFI_MTFTP6_CONFIG_DATA *)Config,\r
              Filename,\r
              BlockSize,\r
              WindowSize,\r
@@ -1174,7 +1167,7 @@ PxeBcTftpReadDirectory (
   } else {\r
     return PxeBcMtftp4ReadDirectory (\r
              Private,\r
-             (EFI_MTFTP4_CONFIG_DATA *) Config,\r
+             (EFI_MTFTP4_CONFIG_DATA *)Config,\r
              Filename,\r
              BlockSize,\r
              WindowSize,\r
@@ -1184,4 +1177,3 @@ PxeBcTftpReadDirectory (
              );\r
   }\r
 }\r
-\r
index 7356c0ae9e589b2952f0129c7e65c249bb63a961..0b0cfd195b2ac0cd17e864352556e514c318e8e3 100644 (file)
@@ -18,9 +18,8 @@
 #define PXE_MTFTP_OPTION_MAXIMUM_INDEX     5\r
 #define PXE_MTFTP_OPTBUF_MAXNUM_INDEX      128\r
 \r
-#define PXE_MTFTP_ERROR_STRING_LENGTH      127   // refer to definition of struct EFI_PXE_BASE_CODE_TFTP_ERROR.\r
-#define PXE_MTFTP_DEFAULT_BLOCK_SIZE       512   // refer to rfc-1350.\r
-\r
+#define PXE_MTFTP_ERROR_STRING_LENGTH  127       // refer to definition of struct EFI_PXE_BASE_CODE_TFTP_ERROR.\r
+#define PXE_MTFTP_DEFAULT_BLOCK_SIZE   512       // refer to rfc-1350.\r
 \r
 /**\r
   This function is wrapper to get the file size using TFTP.\r
 **/\r
 EFI_STATUS\r
 PxeBcTftpGetFileSize (\r
-  IN     PXEBC_PRIVATE_DATA         *Private,\r
-  IN     VOID                       *Config,\r
-  IN     UINT8                      *Filename,\r
-  IN     UINTN                      *BlockSize,\r
-  IN     UINTN                      *WindowSize,\r
-  IN OUT UINT64                     *BufferSize\r
+  IN     PXEBC_PRIVATE_DATA  *Private,\r
+  IN     VOID                *Config,\r
+  IN     UINT8               *Filename,\r
+  IN     UINTN               *BlockSize,\r
+  IN     UINTN               *WindowSize,\r
+  IN OUT UINT64              *BufferSize\r
   );\r
 \r
-\r
 /**\r
   This function is a wrapper to get a file using TFTP.\r
 \r
@@ -68,17 +66,16 @@ PxeBcTftpGetFileSize (
 **/\r
 EFI_STATUS\r
 PxeBcTftpReadFile (\r
-  IN     PXEBC_PRIVATE_DATA         *Private,\r
-  IN     VOID                       *Config,\r
-  IN     UINT8                      *Filename,\r
-  IN     UINTN                      *BlockSize,\r
-  IN     UINTN                      *WindowSize,\r
-  IN     UINT8                      *BufferPtr,\r
-  IN OUT UINT64                     *BufferSize,\r
-  IN     BOOLEAN                    DontUseBuffer\r
+  IN     PXEBC_PRIVATE_DATA  *Private,\r
+  IN     VOID                *Config,\r
+  IN     UINT8               *Filename,\r
+  IN     UINTN               *BlockSize,\r
+  IN     UINTN               *WindowSize,\r
+  IN     UINT8               *BufferPtr,\r
+  IN OUT UINT64              *BufferSize,\r
+  IN     BOOLEAN             DontUseBuffer\r
   );\r
 \r
-\r
 /**\r
   This function is a wrapper to put file with TFTP.\r
 \r
@@ -97,16 +94,15 @@ PxeBcTftpReadFile (
 **/\r
 EFI_STATUS\r
 PxeBcTftpWriteFile (\r
-  IN     PXEBC_PRIVATE_DATA         *Private,\r
-  IN     VOID                       *Config,\r
-  IN     UINT8                      *Filename,\r
-  IN     BOOLEAN                    Overwrite,\r
-  IN     UINTN                      *BlockSize,\r
-  IN     UINT8                      *BufferPtr,\r
-  IN OUT UINT64                     *BufferSize\r
+  IN     PXEBC_PRIVATE_DATA  *Private,\r
+  IN     VOID                *Config,\r
+  IN     UINT8               *Filename,\r
+  IN     BOOLEAN             Overwrite,\r
+  IN     UINTN               *BlockSize,\r
+  IN     UINT8               *BufferPtr,\r
+  IN OUT UINT64              *BufferSize\r
   );\r
 \r
-\r
 /**\r
   This function is a wrapper to get the data (file) from a directory using TFTP.\r
 \r
@@ -126,13 +122,14 @@ PxeBcTftpWriteFile (
 **/\r
 EFI_STATUS\r
 PxeBcTftpReadDirectory (\r
-  IN     PXEBC_PRIVATE_DATA            *Private,\r
-  IN     VOID                          *Config,\r
-  IN     UINT8                         *Filename,\r
-  IN     UINTN                         *BlockSize,\r
-  IN     UINTN                         *WindowSize,\r
-  IN     UINT8                         *BufferPtr,\r
-  IN OUT UINT64                        *BufferSize,\r
-  IN     BOOLEAN                       DontUseBuffer\r
+  IN     PXEBC_PRIVATE_DATA  *Private,\r
+  IN     VOID                *Config,\r
+  IN     UINT8               *Filename,\r
+  IN     UINTN               *BlockSize,\r
+  IN     UINTN               *WindowSize,\r
+  IN     UINT8               *BufferPtr,\r
+  IN OUT UINT64              *BufferSize,\r
+  IN     BOOLEAN             DontUseBuffer\r
   );\r
+\r
 #endif\r
index 5579494c5bfdc65ad649a2793fa6e649410a6a79..887ea3e7d7d8151ad5d81f3a7184a53456a8c3fc 100644 (file)
@@ -9,7 +9,6 @@
 \r
 #include "PxeBcImpl.h"\r
 \r
-\r
 /**\r
   Flush the previous configuration using the new station Ip address.\r
 \r
 **/\r
 EFI_STATUS\r
 PxeBcFlushStationIp (\r
-  PXEBC_PRIVATE_DATA       *Private,\r
-  EFI_IP_ADDRESS           *StationIp      OPTIONAL,\r
-  EFI_IP_ADDRESS           *SubnetMask     OPTIONAL\r
+  PXEBC_PRIVATE_DATA  *Private,\r
+  EFI_IP_ADDRESS      *StationIp      OPTIONAL,\r
+  EFI_IP_ADDRESS      *SubnetMask     OPTIONAL\r
   )\r
 {\r
-  EFI_PXE_BASE_CODE_MODE   *Mode;\r
-  EFI_STATUS               Status;\r
-  EFI_ARP_CONFIG_DATA      ArpConfigData;\r
+  EFI_PXE_BASE_CODE_MODE  *Mode;\r
+  EFI_STATUS              Status;\r
+  EFI_ARP_CONFIG_DATA     ArpConfigData;\r
 \r
   Mode   = Private->PxeBc.Mode;\r
   Status = EFI_SUCCESS;\r
   ZeroMem (&ArpConfigData, sizeof (EFI_ARP_CONFIG_DATA));\r
 \r
-  if (Mode->UsingIpv6 && StationIp != NULL) {\r
+  if (Mode->UsingIpv6 && (StationIp != NULL)) {\r
     //\r
     // Overwrite Udp6CfgData/Ip6CfgData StationAddress.\r
     //\r
@@ -61,8 +60,8 @@ PxeBcFlushStationIp (
       // Reconfigure the ARP instance with station Ip address.\r
       //\r
       ArpConfigData.SwAddressType   = 0x0800;\r
-      ArpConfigData.SwAddressLength = (UINT8) sizeof (EFI_IPv4_ADDRESS);\r
-      ArpConfigData.StationAddress = StationIp;\r
+      ArpConfigData.SwAddressLength = (UINT8)sizeof (EFI_IPv4_ADDRESS);\r
+      ArpConfigData.StationAddress  = StationIp;\r
 \r
       Private->Arp->Configure (Private->Arp, NULL);\r
       Private->Arp->Configure (Private->Arp, &ArpConfigData);\r
@@ -82,7 +81,7 @@ PxeBcFlushStationIp (
       CopyMem (&Private->Ip4CfgData.SubnetMask, SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
     }\r
 \r
-    if (StationIp != NULL && SubnetMask != NULL) {\r
+    if ((StationIp != NULL) && (SubnetMask != NULL)) {\r
       //\r
       // Updated the route table.\r
       //\r
@@ -92,7 +91,7 @@ PxeBcFlushStationIp (
       Mode->RouteTable[0].GwAddr.Addr[0]     = 0;\r
     }\r
 \r
-    if (StationIp != NULL || SubnetMask != NULL) {\r
+    if ((StationIp != NULL) || (SubnetMask != NULL)) {\r
       //\r
       // Reconfigure the Ip4 instance to capture background ICMP packets with new station Ip address.\r
       //\r
@@ -112,7 +111,6 @@ ON_EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Notify the callback function when an event is triggered.\r
 \r
@@ -123,14 +121,13 @@ ON_EXIT:
 VOID\r
 EFIAPI\r
 PxeBcCommonNotify (\r
-  IN EFI_EVENT           Event,\r
-  IN VOID                *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  *((BOOLEAN *) Context) = TRUE;\r
+  *((BOOLEAN *)Context) = TRUE;\r
 }\r
 \r
-\r
 /**\r
   Do arp resolution from arp cache in PxeBcMode.\r
 \r
@@ -145,12 +142,12 @@ PxeBcCommonNotify (
 **/\r
 BOOLEAN\r
 PxeBcCheckArpCache (\r
-  IN  EFI_PXE_BASE_CODE_MODE    *Mode,\r
-  IN  EFI_IPv4_ADDRESS          *Ip4Addr,\r
-  OUT EFI_MAC_ADDRESS           *MacAddress\r
+  IN  EFI_PXE_BASE_CODE_MODE  *Mode,\r
+  IN  EFI_IPv4_ADDRESS        *Ip4Addr,\r
+  OUT EFI_MAC_ADDRESS         *MacAddress\r
   )\r
 {\r
-  UINT32       Index;\r
+  UINT32  Index;\r
 \r
   ASSERT (!Mode->UsingIpv6);\r
 \r
@@ -171,7 +168,6 @@ PxeBcCheckArpCache (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   Update the arp cache periodically.\r
 \r
@@ -182,8 +178,8 @@ PxeBcCheckArpCache (
 VOID\r
 EFIAPI\r
 PxeBcArpCacheUpdate (\r
-  IN EFI_EVENT            Event,\r
-  IN VOID                 *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   PXEBC_PRIVATE_DATA      *Private;\r
@@ -194,7 +190,7 @@ PxeBcArpCacheUpdate (
   UINT32                  Index;\r
   EFI_STATUS              Status;\r
 \r
-  Private = (PXEBC_PRIVATE_DATA *) Context;\r
+  Private = (PXEBC_PRIVATE_DATA *)Context;\r
   Mode    = Private->PxeBc.Mode;\r
 \r
   ASSERT (!Mode->UsingIpv6);\r
@@ -228,14 +224,13 @@ PxeBcArpCacheUpdate (
       );\r
     CopyMem (\r
       &Mode->ArpCache[Index].MacAddr,\r
-      (UINT8 *) (ArpEntry + 1) + ArpEntry->SwAddressLength,\r
+      (UINT8 *)(ArpEntry + 1) + ArpEntry->SwAddressLength,\r
       ArpEntry->HwAddressLength\r
       );\r
-    ArpEntry = (EFI_ARP_FIND_DATA *) ((UINT8 *) ArpEntry + EntryLength);\r
+    ArpEntry = (EFI_ARP_FIND_DATA *)((UINT8 *)ArpEntry + EntryLength);\r
   }\r
 }\r
 \r
-\r
 /**\r
   Notify function to handle the received ICMP message in DPC.\r
 \r
@@ -245,20 +240,20 @@ PxeBcArpCacheUpdate (
 VOID\r
 EFIAPI\r
 PxeBcIcmpErrorDpcHandle (\r
-  IN VOID                      *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_IP4_RECEIVE_DATA         *RxData;\r
-  EFI_IP4_PROTOCOL             *Ip4;\r
-  PXEBC_PRIVATE_DATA           *Private;\r
-  EFI_PXE_BASE_CODE_MODE       *Mode;\r
-  UINT8                        Type;\r
-  UINTN                        Index;\r
-  UINT32                       CopiedLen;\r
-  UINT8                        *IcmpError;\r
-\r
-  Private = (PXEBC_PRIVATE_DATA *) Context;\r
+  EFI_STATUS              Status;\r
+  EFI_IP4_RECEIVE_DATA    *RxData;\r
+  EFI_IP4_PROTOCOL        *Ip4;\r
+  PXEBC_PRIVATE_DATA      *Private;\r
+  EFI_PXE_BASE_CODE_MODE  *Mode;\r
+  UINT8                   Type;\r
+  UINTN                   Index;\r
+  UINT32                  CopiedLen;\r
+  UINT8                   *IcmpError;\r
+\r
+  Private = (PXEBC_PRIVATE_DATA *)Context;\r
   Mode    = &Private->Mode;\r
   Status  = Private->IcmpToken.Status;\r
   RxData  = Private->IcmpToken.Packet.RxData;\r
@@ -284,10 +279,11 @@ PxeBcIcmpErrorDpcHandle (
     goto ON_RECYCLE;\r
   }\r
 \r
-  if (EFI_IP4 (RxData->Header->SourceAddress) != 0 &&\r
+  if ((EFI_IP4 (RxData->Header->SourceAddress) != 0) &&\r
       (NTOHL (Mode->SubnetMask.Addr[0]) != 0) &&\r
-      IP4_NET_EQUAL (NTOHL(Mode->StationIp.Addr[0]), EFI_NTOHL (RxData->Header->SourceAddress), NTOHL (Mode->SubnetMask.Addr[0])) &&\r
-      !NetIp4IsUnicast (EFI_NTOHL (RxData->Header->SourceAddress), NTOHL (Mode->SubnetMask.Addr[0]))) {\r
+      IP4_NET_EQUAL (NTOHL (Mode->StationIp.Addr[0]), EFI_NTOHL (RxData->Header->SourceAddress), NTOHL (Mode->SubnetMask.Addr[0])) &&\r
+      !NetIp4IsUnicast (EFI_NTOHL (RxData->Header->SourceAddress), NTOHL (Mode->SubnetMask.Addr[0])))\r
+  {\r
     //\r
     // The source address of the received packet should be a valid unicast address.\r
     //\r
@@ -306,13 +302,14 @@ PxeBcIcmpErrorDpcHandle (
   //\r
   ASSERT (RxData->Header->Protocol == EFI_IP_PROTO_ICMP);\r
 \r
-  Type = *((UINT8 *) RxData->FragmentTable[0].FragmentBuffer);\r
+  Type = *((UINT8 *)RxData->FragmentTable[0].FragmentBuffer);\r
 \r
-  if (Type != ICMP_DEST_UNREACHABLE &&\r
-      Type != ICMP_SOURCE_QUENCH &&\r
-      Type != ICMP_REDIRECT &&\r
-      Type != ICMP_TIME_EXCEEDED &&\r
-      Type != ICMP_PARAMETER_PROBLEM) {\r
+  if ((Type != ICMP_DEST_UNREACHABLE) &&\r
+      (Type != ICMP_SOURCE_QUENCH) &&\r
+      (Type != ICMP_REDIRECT) &&\r
+      (Type != ICMP_TIME_EXCEEDED) &&\r
+      (Type != ICMP_PARAMETER_PROBLEM))\r
+  {\r
     //\r
     // The type of the receveid ICMP message should be ICMP_ERROR_MESSAGE.\r
     //\r
@@ -323,7 +320,7 @@ PxeBcIcmpErrorDpcHandle (
   // Copy the right ICMP error message into mode data.\r
   //\r
   CopiedLen = 0;\r
-  IcmpError = (UINT8 *) &Mode->IcmpError;\r
+  IcmpError = (UINT8 *)&Mode->IcmpError;\r
 \r
   for (Index = 0; Index < RxData->FragmentCount; Index++) {\r
     CopiedLen += RxData->FragmentTable[Index].FragmentLength;\r
@@ -340,6 +337,7 @@ PxeBcIcmpErrorDpcHandle (
         CopiedLen - sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR)\r
         );\r
     }\r
+\r
     IcmpError += CopiedLen;\r
   }\r
 \r
@@ -351,7 +349,6 @@ ON_EXIT:
   Ip4->Receive (Ip4, &Private->IcmpToken);\r
 }\r
 \r
-\r
 /**\r
   Callback function to update the latest ICMP6 error message.\r
 \r
@@ -362,14 +359,13 @@ ON_EXIT:
 VOID\r
 EFIAPI\r
 PxeBcIcmpErrorUpdate (\r
-  IN EFI_EVENT            Event,\r
-  IN VOID                 *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   QueueDpc (TPL_CALLBACK, PxeBcIcmpErrorDpcHandle, Context);\r
 }\r
 \r
-\r
 /**\r
   Notify function to handle the received ICMP6 message in DPC.\r
 \r
@@ -379,7 +375,7 @@ PxeBcIcmpErrorUpdate (
 VOID\r
 EFIAPI\r
 PxeBcIcmp6ErrorDpcHandle (\r
-  IN VOID                 *Context\r
+  IN VOID  *Context\r
   )\r
 {\r
   PXEBC_PRIVATE_DATA      *Private;\r
@@ -392,7 +388,7 @@ PxeBcIcmp6ErrorDpcHandle (
   UINT32                  CopiedLen;\r
   UINT8                   *Icmp6Error;\r
 \r
-  Private = (PXEBC_PRIVATE_DATA *) Context;\r
+  Private = (PXEBC_PRIVATE_DATA *)Context;\r
   Mode    = &Private->Mode;\r
   Status  = Private->Icmp6Token.Status;\r
   RxData  = Private->Icmp6Token.Packet.RxData;\r
@@ -426,7 +422,8 @@ PxeBcIcmp6ErrorDpcHandle (
   }\r
 \r
   if (!NetIp6IsUnspecifiedAddr (&Mode->StationIp.v6) &&\r
-      !EFI_IP6_EQUAL (&RxData->Header->DestinationAddress, &Mode->StationIp.v6)) {\r
+      !EFI_IP6_EQUAL (&RxData->Header->DestinationAddress, &Mode->StationIp.v6))\r
+  {\r
     //\r
     // The destination address of the received packet should be equal to the host address.\r
     //\r
@@ -438,12 +435,13 @@ PxeBcIcmp6ErrorDpcHandle (
   //\r
   ASSERT (RxData->Header->NextHeader == IP6_ICMP);\r
 \r
-  Type = *((UINT8 *) RxData->FragmentTable[0].FragmentBuffer);\r
+  Type = *((UINT8 *)RxData->FragmentTable[0].FragmentBuffer);\r
 \r
-  if (Type != ICMP_V6_DEST_UNREACHABLE &&\r
-      Type != ICMP_V6_PACKET_TOO_BIG &&\r
-      Type != ICMP_V6_TIME_EXCEEDED &&\r
-      Type != ICMP_V6_PARAMETER_PROBLEM) {\r
+  if ((Type != ICMP_V6_DEST_UNREACHABLE) &&\r
+      (Type != ICMP_V6_PACKET_TOO_BIG) &&\r
+      (Type != ICMP_V6_TIME_EXCEEDED) &&\r
+      (Type != ICMP_V6_PARAMETER_PROBLEM))\r
+  {\r
     //\r
     // The type of the receveid packet should be an ICMP6 error message.\r
     //\r
@@ -454,7 +452,7 @@ PxeBcIcmp6ErrorDpcHandle (
   // Copy the right ICMP6 error message into mode data.\r
   //\r
   CopiedLen  = 0;\r
-  Icmp6Error = (UINT8 *) &Mode->IcmpError;\r
+  Icmp6Error = (UINT8 *)&Mode->IcmpError;\r
 \r
   for (Index = 0; Index < RxData->FragmentCount; Index++) {\r
     CopiedLen += RxData->FragmentTable[Index].FragmentLength;\r
@@ -471,6 +469,7 @@ PxeBcIcmp6ErrorDpcHandle (
         CopiedLen - sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR)\r
         );\r
     }\r
+\r
     Icmp6Error += CopiedLen;\r
   }\r
 \r
@@ -482,7 +481,6 @@ ON_EXIT:
   Ip6->Receive (Ip6, &Private->Icmp6Token);\r
 }\r
 \r
-\r
 /**\r
   Callback function to update the latest ICMP6 error message.\r
 \r
@@ -493,14 +491,13 @@ ON_EXIT:
 VOID\r
 EFIAPI\r
 PxeBcIcmp6ErrorUpdate (\r
-  IN EFI_EVENT               Event,\r
-  IN VOID                    *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   QueueDpc (TPL_CALLBACK, PxeBcIcmp6ErrorDpcHandle, Context);\r
 }\r
 \r
-\r
 /**\r
   This function is to configure a UDPv4 instance for UdpWrite.\r
 \r
@@ -563,7 +560,7 @@ PxeBcConfigUdp4Write (
     }\r
   }\r
 \r
-  if (!EFI_ERROR (Status) && *SrcPort == 0) {\r
+  if (!EFI_ERROR (Status) && (*SrcPort == 0)) {\r
     Udp4->GetModeData (Udp4, &Udp4CfgData, NULL, NULL, NULL);\r
     *SrcPort = Udp4CfgData.StationPort;\r
   }\r
@@ -571,7 +568,6 @@ PxeBcConfigUdp4Write (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is to configure a UDPv6 instance for UdpWrite.\r
 \r
@@ -613,7 +609,7 @@ PxeBcConfigUdp6Write (
     return Status;\r
   }\r
 \r
-  if (!EFI_ERROR (Status) && *SrcPort == 0) {\r
+  if (!EFI_ERROR (Status) && (*SrcPort == 0)) {\r
     Udp6->GetModeData (Udp6, &CfgData, NULL, NULL, NULL);\r
     *SrcPort = CfgData.StationPort;\r
   }\r
@@ -621,7 +617,6 @@ PxeBcConfigUdp6Write (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is to configure a UDPv4 instance for UdpWrite.\r
 \r
@@ -642,54 +637,54 @@ PxeBcConfigUdp6Write (
 **/\r
 EFI_STATUS\r
 PxeBcUdp4Write (\r
-  IN EFI_UDP4_PROTOCOL       *Udp4,\r
-  IN EFI_UDP4_SESSION_DATA   *Session,\r
-  IN EFI_EVENT               TimeoutEvent,\r
-  IN EFI_IPv4_ADDRESS        *Gateway      OPTIONAL,\r
-  IN UINTN                   *HeaderSize   OPTIONAL,\r
-  IN VOID                    *HeaderPtr    OPTIONAL,\r
-  IN UINTN                   *BufferSize,\r
-  IN VOID                    *BufferPtr\r
+  IN EFI_UDP4_PROTOCOL      *Udp4,\r
+  IN EFI_UDP4_SESSION_DATA  *Session,\r
+  IN EFI_EVENT              TimeoutEvent,\r
+  IN EFI_IPv4_ADDRESS       *Gateway      OPTIONAL,\r
+  IN UINTN                  *HeaderSize   OPTIONAL,\r
+  IN VOID                   *HeaderPtr    OPTIONAL,\r
+  IN UINTN                  *BufferSize,\r
+  IN VOID                   *BufferPtr\r
   )\r
 {\r
-  EFI_UDP4_COMPLETION_TOKEN Token;\r
-  EFI_UDP4_TRANSMIT_DATA    *TxData;\r
-  UINT32                    TxLength;\r
-  UINT32                    FragCount;\r
-  UINT32                    DataLength;\r
-  BOOLEAN                   IsDone;\r
-  EFI_STATUS                Status;\r
+  EFI_UDP4_COMPLETION_TOKEN  Token;\r
+  EFI_UDP4_TRANSMIT_DATA     *TxData;\r
+  UINT32                     TxLength;\r
+  UINT32                     FragCount;\r
+  UINT32                     DataLength;\r
+  BOOLEAN                    IsDone;\r
+  EFI_STATUS                 Status;\r
 \r
   //\r
   // Arrange one fragment buffer for data, and another fragment buffer for header if has.\r
   //\r
   FragCount = (HeaderSize != NULL) ? 2 : 1;\r
   TxLength  = sizeof (EFI_UDP4_TRANSMIT_DATA) + (FragCount - 1) * sizeof (EFI_UDP4_FRAGMENT_DATA);\r
-  TxData    = (EFI_UDP4_TRANSMIT_DATA *) AllocateZeroPool (TxLength);\r
+  TxData    = (EFI_UDP4_TRANSMIT_DATA *)AllocateZeroPool (TxLength);\r
   if (TxData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   TxData->FragmentCount                               = FragCount;\r
-  TxData->FragmentTable[FragCount - 1].FragmentLength = (UINT32) *BufferSize;\r
+  TxData->FragmentTable[FragCount - 1].FragmentLength = (UINT32)*BufferSize;\r
   TxData->FragmentTable[FragCount - 1].FragmentBuffer = BufferPtr;\r
-  DataLength                                          = (UINT32) *BufferSize;\r
+  DataLength                                          = (UINT32)*BufferSize;\r
 \r
   if (HeaderSize != NULL) {\r
-    TxData->FragmentTable[0].FragmentLength = (UINT32) *HeaderSize;\r
+    TxData->FragmentTable[0].FragmentLength = (UINT32)*HeaderSize;\r
     TxData->FragmentTable[0].FragmentBuffer = HeaderPtr;\r
-    DataLength                             += (UINT32) *HeaderSize;\r
+    DataLength                             += (UINT32)*HeaderSize;\r
   }\r
 \r
   if (Gateway != NULL) {\r
-    TxData->GatewayAddress  = Gateway;\r
+    TxData->GatewayAddress = Gateway;\r
   }\r
 \r
-  TxData->UdpSessionData  = Session;\r
-  TxData->DataLength      = DataLength;\r
-  Token.Packet.TxData     = TxData;\r
-  Token.Status            = EFI_NOT_READY;\r
-  IsDone                  = FALSE;\r
+  TxData->UdpSessionData = Session;\r
+  TxData->DataLength     = DataLength;\r
+  Token.Packet.TxData    = TxData;\r
+  Token.Status           = EFI_NOT_READY;\r
+  IsDone                 = FALSE;\r
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
@@ -712,7 +707,8 @@ PxeBcUdp4Write (
   //\r
   while (!IsDone &&\r
          Token.Status == EFI_NOT_READY &&\r
-         EFI_ERROR (gBS->CheckEvent (TimeoutEvent))) {\r
+         EFI_ERROR (gBS->CheckEvent (TimeoutEvent)))\r
+  {\r
     Udp4->Poll (Udp4);\r
   }\r
 \r
@@ -722,12 +718,12 @@ ON_EXIT:
   if (Token.Event != NULL) {\r
     gBS->CloseEvent (Token.Event);\r
   }\r
+\r
   FreePool (TxData);\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is to configure a UDPv4 instance for UdpWrite.\r
 \r
@@ -747,49 +743,49 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 PxeBcUdp6Write (\r
-  IN EFI_UDP6_PROTOCOL       *Udp6,\r
-  IN EFI_UDP6_SESSION_DATA   *Session,\r
-  IN EFI_EVENT               TimeoutEvent,\r
-  IN UINTN                   *HeaderSize   OPTIONAL,\r
-  IN VOID                    *HeaderPtr    OPTIONAL,\r
-  IN UINTN                   *BufferSize,\r
-  IN VOID                    *BufferPtr\r
+  IN EFI_UDP6_PROTOCOL      *Udp6,\r
+  IN EFI_UDP6_SESSION_DATA  *Session,\r
+  IN EFI_EVENT              TimeoutEvent,\r
+  IN UINTN                  *HeaderSize   OPTIONAL,\r
+  IN VOID                   *HeaderPtr    OPTIONAL,\r
+  IN UINTN                  *BufferSize,\r
+  IN VOID                   *BufferPtr\r
   )\r
 {\r
-  EFI_UDP6_COMPLETION_TOKEN Token;\r
-  EFI_UDP6_TRANSMIT_DATA    *TxData;\r
-  UINT32                    TxLength;\r
-  UINT32                    FragCount;\r
-  UINT32                    DataLength;\r
-  BOOLEAN                   IsDone;\r
-  EFI_STATUS                Status;\r
+  EFI_UDP6_COMPLETION_TOKEN  Token;\r
+  EFI_UDP6_TRANSMIT_DATA     *TxData;\r
+  UINT32                     TxLength;\r
+  UINT32                     FragCount;\r
+  UINT32                     DataLength;\r
+  BOOLEAN                    IsDone;\r
+  EFI_STATUS                 Status;\r
 \r
   //\r
   // Arrange one fragment buffer for data, and another fragment buffer for header if has.\r
   //\r
   FragCount = (HeaderSize != NULL) ? 2 : 1;\r
   TxLength  = sizeof (EFI_UDP6_TRANSMIT_DATA) + (FragCount - 1) * sizeof (EFI_UDP6_FRAGMENT_DATA);\r
-  TxData    = (EFI_UDP6_TRANSMIT_DATA *) AllocateZeroPool (TxLength);\r
+  TxData    = (EFI_UDP6_TRANSMIT_DATA *)AllocateZeroPool (TxLength);\r
   if (TxData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   TxData->FragmentCount                               = FragCount;\r
-  TxData->FragmentTable[FragCount - 1].FragmentLength = (UINT32) *BufferSize;\r
+  TxData->FragmentTable[FragCount - 1].FragmentLength = (UINT32)*BufferSize;\r
   TxData->FragmentTable[FragCount - 1].FragmentBuffer = BufferPtr;\r
-  DataLength                                          = (UINT32) *BufferSize;\r
+  DataLength                                          = (UINT32)*BufferSize;\r
 \r
   if (HeaderSize != NULL) {\r
-    TxData->FragmentTable[0].FragmentLength = (UINT32) *HeaderSize;\r
+    TxData->FragmentTable[0].FragmentLength = (UINT32)*HeaderSize;\r
     TxData->FragmentTable[0].FragmentBuffer = HeaderPtr;\r
-    DataLength                             += (UINT32) *HeaderSize;\r
+    DataLength                             += (UINT32)*HeaderSize;\r
   }\r
 \r
-  TxData->UdpSessionData  = Session;\r
-  TxData->DataLength      = DataLength;\r
-  Token.Packet.TxData     = TxData;\r
-  Token.Status            = EFI_NOT_READY;\r
-  IsDone                  = FALSE;\r
+  TxData->UdpSessionData = Session;\r
+  TxData->DataLength     = DataLength;\r
+  Token.Packet.TxData    = TxData;\r
+  Token.Status           = EFI_NOT_READY;\r
+  IsDone                 = FALSE;\r
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
@@ -812,7 +808,8 @@ PxeBcUdp6Write (
   //\r
   while (!IsDone &&\r
          Token.Status == EFI_NOT_READY &&\r
-         EFI_ERROR (gBS->CheckEvent (TimeoutEvent))) {\r
+         EFI_ERROR (gBS->CheckEvent (TimeoutEvent)))\r
+  {\r
     Udp6->Poll (Udp6);\r
   }\r
 \r
@@ -822,12 +819,12 @@ ON_EXIT:
   if (Token.Event != NULL) {\r
     gBS->CloseEvent (Token.Event);\r
   }\r
+\r
   FreePool (TxData);\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Check the received packet using the Ip filter.\r
 \r
@@ -841,13 +838,13 @@ ON_EXIT:
 **/\r
 BOOLEAN\r
 PxeBcCheckByIpFilter (\r
-  IN EFI_PXE_BASE_CODE_MODE    *Mode,\r
-  IN VOID                      *Session,\r
-  IN UINT16                    OpFlags\r
+  IN EFI_PXE_BASE_CODE_MODE  *Mode,\r
+  IN VOID                    *Session,\r
+  IN UINT16                  OpFlags\r
   )\r
 {\r
-  EFI_IP_ADDRESS               DestinationIp;\r
-  UINTN                        Index;\r
+  EFI_IP_ADDRESS  DestinationIp;\r
+  UINTN           Index;\r
 \r
   if ((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_USE_FILTER) == 0) {\r
     return TRUE;\r
@@ -863,7 +860,7 @@ PxeBcCheckByIpFilter (
   if (Mode->UsingIpv6) {\r
     CopyMem (\r
       &DestinationIp,\r
-      &((EFI_UDP6_SESSION_DATA *) Session)->DestinationAddress,\r
+      &((EFI_UDP6_SESSION_DATA *)Session)->DestinationAddress,\r
       sizeof (EFI_IPv6_ADDRESS)\r
       );\r
     NTOHLLL (&DestinationIp.v6);\r
@@ -871,27 +868,30 @@ PxeBcCheckByIpFilter (
     ZeroMem (&DestinationIp, sizeof (EFI_IP_ADDRESS));\r
     CopyMem (\r
       &DestinationIp,\r
-      &((EFI_UDP4_SESSION_DATA *) Session)->DestinationAddress,\r
+      &((EFI_UDP4_SESSION_DATA *)Session)->DestinationAddress,\r
       sizeof (EFI_IPv4_ADDRESS)\r
       );\r
     EFI_NTOHL (DestinationIp);\r
   }\r
 \r
-  if ((Mode->IpFilter.Filters & EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS_MULTICAST) != 0 &&\r
+  if (((Mode->IpFilter.Filters & EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS_MULTICAST) != 0) &&\r
       (IP4_IS_MULTICAST (DestinationIp.Addr[0]) ||\r
-       IP6_IS_MULTICAST (&DestinationIp))) {\r
+       IP6_IS_MULTICAST (&DestinationIp)))\r
+  {\r
     return TRUE;\r
   }\r
 \r
-  if ((Mode->IpFilter.Filters & EFI_PXE_BASE_CODE_IP_FILTER_BROADCAST) != 0 &&\r
-      IP4_IS_LOCAL_BROADCAST (DestinationIp.Addr[0])) {\r
+  if (((Mode->IpFilter.Filters & EFI_PXE_BASE_CODE_IP_FILTER_BROADCAST) != 0) &&\r
+      IP4_IS_LOCAL_BROADCAST (DestinationIp.Addr[0]))\r
+  {\r
     ASSERT (!Mode->UsingIpv6);\r
     return TRUE;\r
   }\r
 \r
-  if ((Mode->IpFilter.Filters & EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP) != 0 &&\r
+  if (((Mode->IpFilter.Filters & EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP) != 0) &&\r
       (EFI_IP4_EQUAL (&Mode->StationIp.v4, &DestinationIp) ||\r
-       EFI_IP6_EQUAL (&Mode->StationIp.v6, &DestinationIp))) {\r
+       EFI_IP6_EQUAL (&Mode->StationIp.v6, &DestinationIp)))\r
+  {\r
     //\r
     // Matched if the dest address is equal to the station address.\r
     //\r
@@ -901,7 +901,8 @@ PxeBcCheckByIpFilter (
   for (Index = 0; Index < Mode->IpFilter.IpCnt; Index++) {\r
     ASSERT (Index < EFI_PXE_BASE_CODE_MAX_IPCNT);\r
     if (EFI_IP4_EQUAL (&Mode->IpFilter.IpList[Index].v4, &DestinationIp) ||\r
-        EFI_IP6_EQUAL (&Mode->IpFilter.IpList[Index].v6, &DestinationIp)) {\r
+        EFI_IP6_EQUAL (&Mode->IpFilter.IpList[Index].v6, &DestinationIp))\r
+    {\r
       //\r
       // Matched if the dest address is equal to any of address in the filter list.\r
       //\r
@@ -912,7 +913,6 @@ PxeBcCheckByIpFilter (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   Filter the received packet using the destination Ip.\r
 \r
@@ -927,10 +927,10 @@ PxeBcCheckByIpFilter (
 **/\r
 BOOLEAN\r
 PxeBcCheckByDestIp (\r
-  IN     EFI_PXE_BASE_CODE_MODE    *Mode,\r
-  IN     VOID                      *Session,\r
-  IN OUT EFI_IP_ADDRESS            *DestIp,\r
-  IN     UINT16                    OpFlags\r
+  IN     EFI_PXE_BASE_CODE_MODE  *Mode,\r
+  IN     VOID                    *Session,\r
+  IN OUT EFI_IP_ADDRESS          *DestIp,\r
+  IN     UINT16                  OpFlags\r
   )\r
 {\r
   if ((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_IP) != 0) {\r
@@ -952,18 +952,20 @@ PxeBcCheckByDestIp (
           sizeof (EFI_IPv4_ADDRESS)\r
           );\r
       }\r
-\r
     }\r
+\r
     return TRUE;\r
-  } else if (DestIp != NULL &&\r
+  } else if ((DestIp != NULL) &&\r
              (EFI_IP4_EQUAL (DestIp, &((EFI_UDP4_SESSION_DATA *)Session)->DestinationAddress) ||\r
-              EFI_IP6_EQUAL (DestIp, &((EFI_UDP6_SESSION_DATA *)Session)->DestinationAddress))) {\r
+              EFI_IP6_EQUAL (DestIp, &((EFI_UDP6_SESSION_DATA *)Session)->DestinationAddress)))\r
+  {\r
     //\r
     // The destination address in the received packet is matched if present.\r
     //\r
     return TRUE;\r
   } else if (EFI_IP4_EQUAL (&Mode->StationIp, &((EFI_UDP4_SESSION_DATA *)Session)->DestinationAddress) ||\r
-             EFI_IP6_EQUAL (&Mode->StationIp, &((EFI_UDP6_SESSION_DATA *)Session)->DestinationAddress)) {\r
+             EFI_IP6_EQUAL (&Mode->StationIp, &((EFI_UDP6_SESSION_DATA *)Session)->DestinationAddress))\r
+  {\r
     //\r
     // The destination address in the received packet is equal to the host address.\r
     //\r
@@ -973,7 +975,6 @@ PxeBcCheckByDestIp (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   Check the received packet using the destination port.\r
 \r
@@ -988,18 +989,18 @@ PxeBcCheckByDestIp (
 **/\r
 BOOLEAN\r
 PxeBcCheckByDestPort (\r
-  IN     EFI_PXE_BASE_CODE_MODE    *Mode,\r
-  IN     VOID                      *Session,\r
-  IN OUT UINT16                    *DestPort,\r
-  IN     UINT16                    OpFlags\r
+  IN     EFI_PXE_BASE_CODE_MODE  *Mode,\r
+  IN     VOID                    *Session,\r
+  IN OUT UINT16                  *DestPort,\r
+  IN     UINT16                  OpFlags\r
   )\r
 {\r
-  UINT16       Port;\r
+  UINT16  Port;\r
 \r
   if (Mode->UsingIpv6) {\r
-    Port = ((EFI_UDP6_SESSION_DATA *) Session)->DestinationPort;\r
+    Port = ((EFI_UDP6_SESSION_DATA *)Session)->DestinationPort;\r
   } else {\r
-    Port = ((EFI_UDP4_SESSION_DATA *) Session)->DestinationPort;\r
+    Port = ((EFI_UDP4_SESSION_DATA *)Session)->DestinationPort;\r
   }\r
 \r
   if ((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_PORT) != 0) {\r
@@ -1009,8 +1010,9 @@ PxeBcCheckByDestPort (
     if (DestPort != NULL) {\r
       *DestPort = Port;\r
     }\r
+\r
     return TRUE;\r
-  } else if (DestPort != NULL && *DestPort == Port) {\r
+  } else if ((DestPort != NULL) && (*DestPort == Port)) {\r
     //\r
     // The destination port in the received packet is matched if present.\r
     //\r
@@ -1020,7 +1022,6 @@ PxeBcCheckByDestPort (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   Filter the received packet using the source Ip.\r
 \r
@@ -1035,10 +1036,10 @@ PxeBcCheckByDestPort (
 **/\r
 BOOLEAN\r
 PxeBcFilterBySrcIp (\r
-  IN     EFI_PXE_BASE_CODE_MODE    *Mode,\r
-  IN     VOID                      *Session,\r
-  IN OUT EFI_IP_ADDRESS            *SrcIp,\r
-  IN     UINT16                    OpFlags\r
+  IN     EFI_PXE_BASE_CODE_MODE  *Mode,\r
+  IN     VOID                    *Session,\r
+  IN OUT EFI_IP_ADDRESS          *SrcIp,\r
+  IN     UINT16                  OpFlags\r
   )\r
 {\r
   if ((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_IP) != 0) {\r
@@ -1060,12 +1061,13 @@ PxeBcFilterBySrcIp (
           sizeof (EFI_IPv4_ADDRESS)\r
           );\r
       }\r
-\r
     }\r
+\r
     return TRUE;\r
-  } else if (SrcIp != NULL &&\r
+  } else if ((SrcIp != NULL) &&\r
              (EFI_IP4_EQUAL (SrcIp, &((EFI_UDP4_SESSION_DATA *)Session)->SourceAddress) ||\r
-              EFI_IP6_EQUAL (SrcIp, &((EFI_UDP6_SESSION_DATA *)Session)->SourceAddress))) {\r
+              EFI_IP6_EQUAL (SrcIp, &((EFI_UDP6_SESSION_DATA *)Session)->SourceAddress)))\r
+  {\r
     //\r
     // The source address in the received packet is matched if present.\r
     //\r
@@ -1075,7 +1077,6 @@ PxeBcFilterBySrcIp (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   Filter the received packet using the source port.\r
 \r
@@ -1090,18 +1091,18 @@ PxeBcFilterBySrcIp (
 **/\r
 BOOLEAN\r
 PxeBcFilterBySrcPort (\r
-  IN     EFI_PXE_BASE_CODE_MODE    *Mode,\r
-  IN     VOID                      *Session,\r
-  IN OUT UINT16                    *SrcPort,\r
-  IN     UINT16                    OpFlags\r
+  IN     EFI_PXE_BASE_CODE_MODE  *Mode,\r
+  IN     VOID                    *Session,\r
+  IN OUT UINT16                  *SrcPort,\r
+  IN     UINT16                  OpFlags\r
   )\r
 {\r
-  UINT16       Port;\r
+  UINT16  Port;\r
 \r
   if (Mode->UsingIpv6) {\r
-    Port = ((EFI_UDP6_SESSION_DATA *) Session)->SourcePort;\r
+    Port = ((EFI_UDP6_SESSION_DATA *)Session)->SourcePort;\r
   } else {\r
-    Port = ((EFI_UDP4_SESSION_DATA *) Session)->SourcePort;\r
+    Port = ((EFI_UDP4_SESSION_DATA *)Session)->SourcePort;\r
   }\r
 \r
   if ((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_PORT) != 0) {\r
@@ -1111,8 +1112,9 @@ PxeBcFilterBySrcPort (
     if (SrcPort != NULL) {\r
       *SrcPort = Port;\r
     }\r
+\r
     return TRUE;\r
-  } else if (SrcPort != NULL && *SrcPort == Port) {\r
+  } else if ((SrcPort != NULL) && (*SrcPort == Port)) {\r
     //\r
     // The source port in the received packet is matched if present.\r
     //\r
@@ -1122,7 +1124,6 @@ PxeBcFilterBySrcPort (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   This function is to receive packet using Udp4Read.\r
 \r
@@ -1144,22 +1145,22 @@ PxeBcFilterBySrcPort (
 **/\r
 EFI_STATUS\r
 PxeBcUdp4Read (\r
-  IN     EFI_UDP4_PROTOCOL            *Udp4,\r
-  IN     EFI_UDP4_COMPLETION_TOKEN    *Token,\r
-  IN     EFI_PXE_BASE_CODE_MODE       *Mode,\r
-  IN     EFI_EVENT                    TimeoutEvent,\r
-  IN     UINT16                       OpFlags,\r
-  IN     BOOLEAN                      *IsDone,\r
-     OUT BOOLEAN                      *IsMatched,\r
-  IN OUT EFI_IP_ADDRESS               *DestIp      OPTIONAL,\r
-  IN OUT EFI_PXE_BASE_CODE_UDP_PORT   *DestPort    OPTIONAL,\r
-  IN OUT EFI_IP_ADDRESS               *SrcIp       OPTIONAL,\r
-  IN OUT EFI_PXE_BASE_CODE_UDP_PORT   *SrcPort     OPTIONAL\r
+  IN     EFI_UDP4_PROTOCOL           *Udp4,\r
+  IN     EFI_UDP4_COMPLETION_TOKEN   *Token,\r
+  IN     EFI_PXE_BASE_CODE_MODE      *Mode,\r
+  IN     EFI_EVENT                   TimeoutEvent,\r
+  IN     UINT16                      OpFlags,\r
+  IN     BOOLEAN                     *IsDone,\r
+  OUT BOOLEAN                        *IsMatched,\r
+  IN OUT EFI_IP_ADDRESS              *DestIp      OPTIONAL,\r
+  IN OUT EFI_PXE_BASE_CODE_UDP_PORT  *DestPort    OPTIONAL,\r
+  IN OUT EFI_IP_ADDRESS              *SrcIp       OPTIONAL,\r
+  IN OUT EFI_PXE_BASE_CODE_UDP_PORT  *SrcPort     OPTIONAL\r
   )\r
 {\r
-  EFI_UDP4_RECEIVE_DATA     *RxData;\r
-  EFI_UDP4_SESSION_DATA     *Session;\r
-  EFI_STATUS                Status;\r
+  EFI_UDP4_RECEIVE_DATA  *RxData;\r
+  EFI_UDP4_SESSION_DATA  *Session;\r
+  EFI_STATUS             Status;\r
 \r
   Token->Status = EFI_NOT_READY;\r
   *IsDone       = FALSE;\r
@@ -1174,16 +1175,18 @@ PxeBcUdp4Read (
   //\r
   while (!(*IsDone) &&\r
          Token->Status == EFI_NOT_READY &&\r
-         EFI_ERROR (gBS->CheckEvent (TimeoutEvent))) {\r
+         EFI_ERROR (gBS->CheckEvent (TimeoutEvent)))\r
+  {\r
     //\r
     // Poll the token until reply/ICMPv6 error message received or timeout.\r
     //\r
     Udp4->Poll (Udp4);\r
-    if (Token->Status == EFI_ICMP_ERROR ||\r
-        Token->Status == EFI_NETWORK_UNREACHABLE ||\r
-        Token->Status == EFI_HOST_UNREACHABLE ||\r
-        Token->Status == EFI_PROTOCOL_UNREACHABLE ||\r
-        Token->Status == EFI_PORT_UNREACHABLE) {\r
+    if ((Token->Status == EFI_ICMP_ERROR) ||\r
+        (Token->Status == EFI_NETWORK_UNREACHABLE) ||\r
+        (Token->Status == EFI_HOST_UNREACHABLE) ||\r
+        (Token->Status == EFI_PROTOCOL_UNREACHABLE) ||\r
+        (Token->Status == EFI_PORT_UNREACHABLE))\r
+    {\r
       break;\r
     }\r
   }\r
@@ -1194,8 +1197,8 @@ PxeBcUdp4Read (
     //\r
     // check whether this packet matches the filters\r
     //\r
-    RxData    = Token->Packet.RxData;\r
-    Session   = &RxData->UdpSession;\r
+    RxData  = Token->Packet.RxData;\r
+    Session = &RxData->UdpSession;\r
 \r
     *IsMatched = PxeBcCheckByIpFilter (Mode, Session, OpFlags);\r
 \r
@@ -1226,7 +1229,6 @@ PxeBcUdp4Read (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is to receive packets using Udp6Read.\r
 \r
@@ -1248,22 +1250,22 @@ PxeBcUdp4Read (
 **/\r
 EFI_STATUS\r
 PxeBcUdp6Read (\r
-  IN     EFI_UDP6_PROTOCOL            *Udp6,\r
-  IN     EFI_UDP6_COMPLETION_TOKEN    *Token,\r
-  IN     EFI_PXE_BASE_CODE_MODE       *Mode,\r
-  IN     EFI_EVENT                    TimeoutEvent,\r
-  IN     UINT16                       OpFlags,\r
-  IN     BOOLEAN                      *IsDone,\r
-     OUT BOOLEAN                      *IsMatched,\r
-  IN OUT EFI_IP_ADDRESS               *DestIp      OPTIONAL,\r
-  IN OUT EFI_PXE_BASE_CODE_UDP_PORT   *DestPort    OPTIONAL,\r
-  IN OUT EFI_IP_ADDRESS               *SrcIp       OPTIONAL,\r
-  IN OUT EFI_PXE_BASE_CODE_UDP_PORT   *SrcPort     OPTIONAL\r
+  IN     EFI_UDP6_PROTOCOL           *Udp6,\r
+  IN     EFI_UDP6_COMPLETION_TOKEN   *Token,\r
+  IN     EFI_PXE_BASE_CODE_MODE      *Mode,\r
+  IN     EFI_EVENT                   TimeoutEvent,\r
+  IN     UINT16                      OpFlags,\r
+  IN     BOOLEAN                     *IsDone,\r
+  OUT BOOLEAN                        *IsMatched,\r
+  IN OUT EFI_IP_ADDRESS              *DestIp      OPTIONAL,\r
+  IN OUT EFI_PXE_BASE_CODE_UDP_PORT  *DestPort    OPTIONAL,\r
+  IN OUT EFI_IP_ADDRESS              *SrcIp       OPTIONAL,\r
+  IN OUT EFI_PXE_BASE_CODE_UDP_PORT  *SrcPort     OPTIONAL\r
   )\r
 {\r
-  EFI_UDP6_RECEIVE_DATA     *RxData;\r
-  EFI_UDP6_SESSION_DATA     *Session;\r
-  EFI_STATUS                Status;\r
+  EFI_UDP6_RECEIVE_DATA  *RxData;\r
+  EFI_UDP6_SESSION_DATA  *Session;\r
+  EFI_STATUS             Status;\r
 \r
   Token->Status = EFI_NOT_READY;\r
   *IsDone       = FALSE;\r
@@ -1278,16 +1280,18 @@ PxeBcUdp6Read (
   //\r
   while (!(*IsDone) &&\r
          Token->Status == EFI_NOT_READY &&\r
-         EFI_ERROR (gBS->CheckEvent (TimeoutEvent))) {\r
+         EFI_ERROR (gBS->CheckEvent (TimeoutEvent)))\r
+  {\r
     //\r
     // Poll the token until reply/ICMPv6 error message received or timeout.\r
     //\r
     Udp6->Poll (Udp6);\r
-    if (Token->Status == EFI_ICMP_ERROR ||\r
-        Token->Status == EFI_NETWORK_UNREACHABLE ||\r
-        Token->Status == EFI_HOST_UNREACHABLE ||\r
-        Token->Status == EFI_PROTOCOL_UNREACHABLE ||\r
-        Token->Status == EFI_PORT_UNREACHABLE) {\r
+    if ((Token->Status == EFI_ICMP_ERROR) ||\r
+        (Token->Status == EFI_NETWORK_UNREACHABLE) ||\r
+        (Token->Status == EFI_HOST_UNREACHABLE) ||\r
+        (Token->Status == EFI_PROTOCOL_UNREACHABLE) ||\r
+        (Token->Status == EFI_PORT_UNREACHABLE))\r
+    {\r
       break;\r
     }\r
   }\r
@@ -1298,8 +1302,8 @@ PxeBcUdp6Read (
     //\r
     // check whether this packet matches the filters\r
     //\r
-    RxData    = Token->Packet.RxData;\r
-    Session   = &RxData->UdpSession;\r
+    RxData  = Token->Packet.RxData;\r
+    Session = &RxData->UdpSession;\r
 \r
     *IsMatched = PxeBcCheckByIpFilter (Mode, Session, OpFlags);\r
 \r
@@ -1330,7 +1334,6 @@ PxeBcUdp6Read (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is to display the IPv4 address.\r
 \r
@@ -1339,10 +1342,10 @@ PxeBcUdp6Read (
 **/\r
 VOID\r
 PxeBcShowIp4Addr (\r
-  IN EFI_IPv4_ADDRESS   *Ip\r
+  IN EFI_IPv4_ADDRESS  *Ip\r
   )\r
 {\r
-  UINTN                 Index;\r
+  UINTN  Index;\r
 \r
   for (Index = 0; Index < 4; Index++) {\r
     AsciiPrint ("%d", Ip->Addr[Index]);\r
@@ -1352,7 +1355,6 @@ PxeBcShowIp4Addr (
   }\r
 }\r
 \r
-\r
 /**\r
   This function is to display the IPv6 address.\r
 \r
@@ -1361,23 +1363,25 @@ PxeBcShowIp4Addr (
 **/\r
 VOID\r
 PxeBcShowIp6Addr (\r
-  IN EFI_IPv6_ADDRESS   *Ip\r
+  IN EFI_IPv6_ADDRESS  *Ip\r
   )\r
 {\r
-  UINTN                 Index;\r
+  UINTN  Index;\r
 \r
   for (Index = 0; Index < 16; Index++) {\r
-\r
     if (Ip->Addr[Index] != 0) {\r
       AsciiPrint ("%x", Ip->Addr[Index]);\r
     }\r
+\r
     Index++;\r
     if (Index > 15) {\r
       return;\r
     }\r
+\r
     if (((Ip->Addr[Index] & 0xf0) == 0) && (Ip->Addr[Index - 1] != 0)) {\r
       AsciiPrint ("0");\r
     }\r
+\r
     AsciiPrint ("%x", Ip->Addr[Index]);\r
     if (Index < 15) {\r
       AsciiPrint (":");\r
@@ -1385,7 +1389,6 @@ PxeBcShowIp6Addr (
   }\r
 }\r
 \r
-\r
 /**\r
   This function is to convert UINTN to ASCII string with the required formatting.\r
 \r
@@ -1396,21 +1399,20 @@ PxeBcShowIp6Addr (
 **/\r
 VOID\r
 PxeBcUintnToAscDecWithFormat (\r
-  IN UINTN                       Number,\r
-  IN UINT8                       *Buffer,\r
-  IN INTN                        Length\r
+  IN UINTN  Number,\r
+  IN UINT8  *Buffer,\r
+  IN INTN   Length\r
   )\r
 {\r
-  UINTN                          Remainder;\r
+  UINTN  Remainder;\r
 \r
-  for (; Length > 0; Length--) {\r
-    Remainder      = Number % 10;\r
-    Number        /= 10;\r
-    Buffer[Length - 1] = (UINT8) ('0' + Remainder);\r
+  for ( ; Length > 0; Length--) {\r
+    Remainder          = Number % 10;\r
+    Number            /= 10;\r
+    Buffer[Length - 1] = (UINT8)('0' + Remainder);\r
   }\r
 }\r
 \r
-\r
 /**\r
   This function is to convert a UINTN to a ASCII string, and return the\r
   actual length of the buffer.\r
@@ -1424,32 +1426,31 @@ PxeBcUintnToAscDecWithFormat (
 **/\r
 UINTN\r
 PxeBcUintnToAscDec (\r
-  IN UINTN               Number,\r
-  IN UINT8               *Buffer,\r
-  IN UINTN               BufferSize\r
+  IN UINTN  Number,\r
+  IN UINT8  *Buffer,\r
+  IN UINTN  BufferSize\r
   )\r
 {\r
-  UINTN           Index;\r
-  UINTN           Length;\r
-  CHAR8           TempStr[64];\r
+  UINTN  Index;\r
+  UINTN  Length;\r
+  CHAR8  TempStr[64];\r
 \r
-  Index           = 63;\r
-  TempStr[Index]  = 0;\r
+  Index          = 63;\r
+  TempStr[Index] = 0;\r
 \r
   do {\r
     Index--;\r
-    TempStr[Index] = (CHAR8) ('0' + (Number % 10));\r
-    Number         = (UINTN) (Number / 10);\r
+    TempStr[Index] = (CHAR8)('0' + (Number % 10));\r
+    Number         = (UINTN)(Number / 10);\r
   } while (Number != 0);\r
 \r
-  AsciiStrCpyS ((CHAR8 *) Buffer, BufferSize, &TempStr[Index]);\r
+  AsciiStrCpyS ((CHAR8 *)Buffer, BufferSize, &TempStr[Index]);\r
 \r
-  Length = AsciiStrLen ((CHAR8 *) Buffer);\r
+  Length = AsciiStrLen ((CHAR8 *)Buffer);\r
 \r
   return Length;\r
 }\r
 \r
-\r
 /**\r
   This function is to convert unicode hex number to a UINT8.\r
 \r
@@ -1462,22 +1463,22 @@ PxeBcUintnToAscDec (
 **/\r
 EFI_STATUS\r
 PxeBcUniHexToUint8 (\r
-  OUT UINT8                *Digit,\r
-  IN  CHAR16               Char\r
+  OUT UINT8   *Digit,\r
+  IN  CHAR16  Char\r
   )\r
 {\r
   if ((Char >= L'0') && (Char <= L'9')) {\r
-    *Digit = (UINT8) (Char - L'0');\r
+    *Digit = (UINT8)(Char - L'0');\r
     return EFI_SUCCESS;\r
   }\r
 \r
   if ((Char >= L'A') && (Char <= L'F')) {\r
-    *Digit = (UINT8) (Char - L'A' + 0x0A);\r
+    *Digit = (UINT8)(Char - L'A' + 0x0A);\r
     return EFI_SUCCESS;\r
   }\r
 \r
   if ((Char >= L'a') && (Char <= L'f')) {\r
-    *Digit = (UINT8) (Char - L'a' + 0x0A);\r
+    *Digit = (UINT8)(Char - L'a' + 0x0A);\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -1492,12 +1493,12 @@ PxeBcUniHexToUint8 (
 **/\r
 VOID\r
 CalcElapsedTime (\r
-  IN     PXEBC_PRIVATE_DATA     *Private\r
+  IN     PXEBC_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_TIME          Time;\r
-  UINT64            CurrentStamp;\r
-  UINT64            ElapsedTimeValue;\r
+  EFI_TIME  Time;\r
+  UINT64    CurrentStamp;\r
+  UINT64    ElapsedTimeValue;\r
 \r
   //\r
   // Generate a time stamp of the centiseconds from 1900/1/1, assume 30day/month.\r
@@ -1529,6 +1530,7 @@ CalcElapsedTime (
     if (ElapsedTimeValue > 0xffff) {\r
       ElapsedTimeValue = 0xffff;\r
     }\r
+\r
     //\r
     // Save the elapsed time\r
     //\r
index 8405f6fad3eb14ffa9ae51f4066865feedad54d3..a885b9660e5f89468a436333532a01385e5294f8 100644 (file)
 #ifndef __EFI_PXEBC_SUPPORT_H__\r
 #define __EFI_PXEBC_SUPPORT_H__\r
 \r
-\r
-#define ICMP_DEST_UNREACHABLE      3\r
-#define ICMP_SOURCE_QUENCH         4\r
-#define ICMP_REDIRECT              5\r
-#define ICMP_ECHO_REQUEST          8\r
-#define ICMP_TIME_EXCEEDED         11\r
-#define ICMP_PARAMETER_PROBLEM     12\r
-\r
-\r
+#define ICMP_DEST_UNREACHABLE   3\r
+#define ICMP_SOURCE_QUENCH      4\r
+#define ICMP_REDIRECT           5\r
+#define ICMP_ECHO_REQUEST       8\r
+#define ICMP_TIME_EXCEEDED      11\r
+#define ICMP_PARAMETER_PROBLEM  12\r
 \r
 /**\r
   Flush the previous configuration using the new station Ip address.\r
 **/\r
 EFI_STATUS\r
 PxeBcFlushStationIp (\r
-  PXEBC_PRIVATE_DATA       *Private,\r
-  EFI_IP_ADDRESS           *StationIp      OPTIONAL,\r
-  EFI_IP_ADDRESS           *SubnetMask     OPTIONAL\r
+  PXEBC_PRIVATE_DATA  *Private,\r
+  EFI_IP_ADDRESS      *StationIp      OPTIONAL,\r
+  EFI_IP_ADDRESS      *SubnetMask     OPTIONAL\r
   );\r
 \r
-\r
 /**\r
   Notify callback function when an event is triggered.\r
 \r
@@ -49,11 +45,10 @@ PxeBcFlushStationIp (
 VOID\r
 EFIAPI\r
 PxeBcCommonNotify (\r
-  IN EFI_EVENT           Event,\r
-  IN VOID                *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
-\r
 /**\r
   Perform arp resolution from the arp cache in PxeBcMode.\r
 \r
@@ -68,12 +63,11 @@ PxeBcCommonNotify (
 **/\r
 BOOLEAN\r
 PxeBcCheckArpCache (\r
-  IN  EFI_PXE_BASE_CODE_MODE    *Mode,\r
-  IN  EFI_IPv4_ADDRESS          *Ip4Addr,\r
-  OUT EFI_MAC_ADDRESS           *MacAddress\r
+  IN  EFI_PXE_BASE_CODE_MODE  *Mode,\r
+  IN  EFI_IPv4_ADDRESS        *Ip4Addr,\r
+  OUT EFI_MAC_ADDRESS         *MacAddress\r
   );\r
 \r
-\r
 /**\r
   Update arp cache periodically.\r
 \r
@@ -84,11 +78,10 @@ PxeBcCheckArpCache (
 VOID\r
 EFIAPI\r
 PxeBcArpCacheUpdate (\r
-  IN EFI_EVENT    Event,\r
-  IN VOID         *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
-\r
 /**\r
   xxx\r
 \r
@@ -99,11 +92,10 @@ PxeBcArpCacheUpdate (
 VOID\r
 EFIAPI\r
 PxeBcIcmpErrorUpdate (\r
-  IN EFI_EVENT             Event,\r
-  IN VOID                  *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
-\r
 /**\r
   xxx\r
 \r
@@ -114,11 +106,10 @@ PxeBcIcmpErrorUpdate (
 VOID\r
 EFIAPI\r
 PxeBcIcmp6ErrorUpdate (\r
-  IN EFI_EVENT             Event,\r
-  IN VOID                  *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
-\r
 /**\r
   This function is to configure a UDPv4 instance for UdpWrite.\r
 \r
@@ -148,7 +139,6 @@ PxeBcConfigUdp4Write (
   IN     UINT8              ToS\r
   );\r
 \r
-\r
 /**\r
   This function is to configure a UDPv6 instance for UdpWrite.\r
 \r
@@ -187,17 +177,16 @@ PxeBcConfigUdp6Write (
 **/\r
 EFI_STATUS\r
 PxeBcUdp4Write (\r
-  IN EFI_UDP4_PROTOCOL       *Udp4,\r
-  IN EFI_UDP4_SESSION_DATA   *Session,\r
-  IN EFI_EVENT               TimeoutEvent,\r
-  IN EFI_IPv4_ADDRESS        *Gateway      OPTIONAL,\r
-  IN UINTN                   *HeaderSize   OPTIONAL,\r
-  IN VOID                    *HeaderPtr    OPTIONAL,\r
-  IN UINTN                   *BufferSize,\r
-  IN VOID                    *BufferPtr\r
+  IN EFI_UDP4_PROTOCOL      *Udp4,\r
+  IN EFI_UDP4_SESSION_DATA  *Session,\r
+  IN EFI_EVENT              TimeoutEvent,\r
+  IN EFI_IPv4_ADDRESS       *Gateway      OPTIONAL,\r
+  IN UINTN                  *HeaderSize   OPTIONAL,\r
+  IN VOID                   *HeaderPtr    OPTIONAL,\r
+  IN UINTN                  *BufferSize,\r
+  IN VOID                   *BufferPtr\r
   );\r
 \r
-\r
 /**\r
   This function is to configure a UDPv6 instance for UdpWrite.\r
 \r
@@ -217,16 +206,15 @@ PxeBcUdp4Write (
 **/\r
 EFI_STATUS\r
 PxeBcUdp6Write (\r
-  IN EFI_UDP6_PROTOCOL       *Udp6,\r
-  IN EFI_UDP6_SESSION_DATA   *Session,\r
-  IN EFI_EVENT               TimeoutEvent,\r
-  IN UINTN                   *HeaderSize   OPTIONAL,\r
-  IN VOID                    *HeaderPtr    OPTIONAL,\r
-  IN UINTN                   *BufferSize,\r
-  IN VOID                    *BufferPtr\r
+  IN EFI_UDP6_PROTOCOL      *Udp6,\r
+  IN EFI_UDP6_SESSION_DATA  *Session,\r
+  IN EFI_EVENT              TimeoutEvent,\r
+  IN UINTN                  *HeaderSize   OPTIONAL,\r
+  IN VOID                   *HeaderPtr    OPTIONAL,\r
+  IN UINTN                  *BufferSize,\r
+  IN VOID                   *BufferPtr\r
   );\r
 \r
-\r
 /**\r
   Check the received packet with the Ip filter.\r
 \r
@@ -240,12 +228,11 @@ PxeBcUdp6Write (
 **/\r
 BOOLEAN\r
 PxeBcCheckByIpFilter (\r
-  IN EFI_PXE_BASE_CODE_MODE    *Mode,\r
-  IN VOID                      *Session,\r
-  IN UINT16                    OpFlags\r
+  IN EFI_PXE_BASE_CODE_MODE  *Mode,\r
+  IN VOID                    *Session,\r
+  IN UINT16                  OpFlags\r
   );\r
 \r
-\r
 /**\r
   Filter the received packet with the destination Ip.\r
 \r
@@ -260,13 +247,12 @@ PxeBcCheckByIpFilter (
 **/\r
 BOOLEAN\r
 PxeBcCheckByDestIp (\r
-  IN     EFI_PXE_BASE_CODE_MODE    *Mode,\r
-  IN     VOID                      *Session,\r
-  IN OUT EFI_IP_ADDRESS            *DestIp,\r
-  IN     UINT16                    OpFlags\r
+  IN     EFI_PXE_BASE_CODE_MODE  *Mode,\r
+  IN     VOID                    *Session,\r
+  IN OUT EFI_IP_ADDRESS          *DestIp,\r
+  IN     UINT16                  OpFlags\r
   );\r
 \r
-\r
 /**\r
   Check the received packet with the destination port.\r
 \r
@@ -281,13 +267,12 @@ PxeBcCheckByDestIp (
 **/\r
 BOOLEAN\r
 PxeBcCheckByDestPort (\r
-  IN     EFI_PXE_BASE_CODE_MODE    *Mode,\r
-  IN     VOID                      *Session,\r
-  IN OUT UINT16                    *DestPort,\r
-  IN     UINT16                    OpFlags\r
+  IN     EFI_PXE_BASE_CODE_MODE  *Mode,\r
+  IN     VOID                    *Session,\r
+  IN OUT UINT16                  *DestPort,\r
+  IN     UINT16                  OpFlags\r
   );\r
 \r
-\r
 /**\r
   Filter the received packet with the source Ip.\r
 \r
@@ -302,13 +287,12 @@ PxeBcCheckByDestPort (
 **/\r
 BOOLEAN\r
 PxeBcFilterBySrcIp (\r
-  IN     EFI_PXE_BASE_CODE_MODE    *Mode,\r
-  IN     VOID                      *Session,\r
-  IN OUT EFI_IP_ADDRESS            *SrcIp,\r
-  IN     UINT16                    OpFlags\r
+  IN     EFI_PXE_BASE_CODE_MODE  *Mode,\r
+  IN     VOID                    *Session,\r
+  IN OUT EFI_IP_ADDRESS          *SrcIp,\r
+  IN     UINT16                  OpFlags\r
   );\r
 \r
-\r
 /**\r
   Filter the received packet with the source port.\r
 \r
@@ -323,13 +307,12 @@ PxeBcFilterBySrcIp (
 **/\r
 BOOLEAN\r
 PxeBcFilterBySrcPort (\r
-  IN     EFI_PXE_BASE_CODE_MODE    *Mode,\r
-  IN     VOID                      *Session,\r
-  IN OUT UINT16                    *SrcPort,\r
-  IN     UINT16                    OpFlags\r
+  IN     EFI_PXE_BASE_CODE_MODE  *Mode,\r
+  IN     VOID                    *Session,\r
+  IN OUT UINT16                  *SrcPort,\r
+  IN     UINT16                  OpFlags\r
   );\r
 \r
-\r
 /**\r
   This function is to receive packet with Udp4Read.\r
 \r
@@ -351,20 +334,19 @@ PxeBcFilterBySrcPort (
 **/\r
 EFI_STATUS\r
 PxeBcUdp4Read (\r
-  IN     EFI_UDP4_PROTOCOL            *Udp4,\r
-  IN     EFI_UDP4_COMPLETION_TOKEN    *Token,\r
-  IN     EFI_PXE_BASE_CODE_MODE       *Mode,\r
-  IN     EFI_EVENT                    TimeoutEvent,\r
-  IN     UINT16                       OpFlags,\r
-  IN     BOOLEAN                      *IsDone,\r
-     OUT BOOLEAN                      *IsMatched,\r
-  IN OUT EFI_IP_ADDRESS               *DestIp      OPTIONAL,\r
-  IN OUT EFI_PXE_BASE_CODE_UDP_PORT   *DestPort    OPTIONAL,\r
-  IN OUT EFI_IP_ADDRESS               *SrcIp       OPTIONAL,\r
-  IN OUT EFI_PXE_BASE_CODE_UDP_PORT   *SrcPort     OPTIONAL\r
+  IN     EFI_UDP4_PROTOCOL           *Udp4,\r
+  IN     EFI_UDP4_COMPLETION_TOKEN   *Token,\r
+  IN     EFI_PXE_BASE_CODE_MODE      *Mode,\r
+  IN     EFI_EVENT                   TimeoutEvent,\r
+  IN     UINT16                      OpFlags,\r
+  IN     BOOLEAN                     *IsDone,\r
+  OUT BOOLEAN                        *IsMatched,\r
+  IN OUT EFI_IP_ADDRESS              *DestIp      OPTIONAL,\r
+  IN OUT EFI_PXE_BASE_CODE_UDP_PORT  *DestPort    OPTIONAL,\r
+  IN OUT EFI_IP_ADDRESS              *SrcIp       OPTIONAL,\r
+  IN OUT EFI_PXE_BASE_CODE_UDP_PORT  *SrcPort     OPTIONAL\r
   );\r
 \r
-\r
 /**\r
   This function is to receive packet with Udp6Read.\r
 \r
@@ -386,20 +368,19 @@ PxeBcUdp4Read (
 **/\r
 EFI_STATUS\r
 PxeBcUdp6Read (\r
-  IN     EFI_UDP6_PROTOCOL            *Udp6,\r
-  IN     EFI_UDP6_COMPLETION_TOKEN    *Token,\r
-  IN     EFI_PXE_BASE_CODE_MODE       *Mode,\r
-  IN     EFI_EVENT                    TimeoutEvent,\r
-  IN     UINT16                       OpFlags,\r
-  IN     BOOLEAN                      *IsDone,\r
-     OUT BOOLEAN                      *IsMatched,\r
-  IN OUT EFI_IP_ADDRESS               *DestIp      OPTIONAL,\r
-  IN OUT EFI_PXE_BASE_CODE_UDP_PORT   *DestPort    OPTIONAL,\r
-  IN OUT EFI_IP_ADDRESS               *SrcIp       OPTIONAL,\r
-  IN OUT EFI_PXE_BASE_CODE_UDP_PORT   *SrcPort     OPTIONAL\r
+  IN     EFI_UDP6_PROTOCOL           *Udp6,\r
+  IN     EFI_UDP6_COMPLETION_TOKEN   *Token,\r
+  IN     EFI_PXE_BASE_CODE_MODE      *Mode,\r
+  IN     EFI_EVENT                   TimeoutEvent,\r
+  IN     UINT16                      OpFlags,\r
+  IN     BOOLEAN                     *IsDone,\r
+  OUT BOOLEAN                        *IsMatched,\r
+  IN OUT EFI_IP_ADDRESS              *DestIp      OPTIONAL,\r
+  IN OUT EFI_PXE_BASE_CODE_UDP_PORT  *DestPort    OPTIONAL,\r
+  IN OUT EFI_IP_ADDRESS              *SrcIp       OPTIONAL,\r
+  IN OUT EFI_PXE_BASE_CODE_UDP_PORT  *SrcPort     OPTIONAL\r
   );\r
 \r
-\r
 /**\r
   This function is to display the IPv4 address.\r
 \r
@@ -408,10 +389,9 @@ PxeBcUdp6Read (
 **/\r
 VOID\r
 PxeBcShowIp4Addr (\r
-  IN EFI_IPv4_ADDRESS   *Ip\r
+  IN EFI_IPv4_ADDRESS  *Ip\r
   );\r
 \r
-\r
 /**\r
   This function is to display the IPv6 address.\r
 \r
@@ -420,10 +400,9 @@ PxeBcShowIp4Addr (
 **/\r
 VOID\r
 PxeBcShowIp6Addr (\r
-  IN EFI_IPv6_ADDRESS   *Ip\r
+  IN EFI_IPv6_ADDRESS  *Ip\r
   );\r
 \r
-\r
 /**\r
   This function is to convert UINTN to ASCII string with required format.\r
 \r
@@ -434,12 +413,11 @@ PxeBcShowIp6Addr (
 **/\r
 VOID\r
 PxeBcUintnToAscDecWithFormat (\r
-  IN UINTN                       Number,\r
-  IN UINT8                       *Buffer,\r
-  IN INTN                        Length\r
+  IN UINTN  Number,\r
+  IN UINT8  *Buffer,\r
+  IN INTN   Length\r
   );\r
 \r
-\r
 /**\r
   This function is to convert a UINTN to a ASCII string, and return the\r
   actual length of the buffer.\r
@@ -453,9 +431,9 @@ PxeBcUintnToAscDecWithFormat (
 **/\r
 UINTN\r
 PxeBcUintnToAscDec (\r
-  IN UINTN               Number,\r
-  IN UINT8               *Buffer,\r
-  IN UINTN               BufferSize\r
+  IN UINTN  Number,\r
+  IN UINT8  *Buffer,\r
+  IN UINTN  BufferSize\r
   );\r
 \r
 /**\r
@@ -470,8 +448,8 @@ PxeBcUintnToAscDec (
 **/\r
 EFI_STATUS\r
 PxeBcUniHexToUint8 (\r
-  OUT UINT8                *Digit,\r
-  IN  CHAR16               Char\r
+  OUT UINT8   *Digit,\r
+  IN  CHAR16  Char\r
   );\r
 \r
 /**\r
@@ -482,7 +460,7 @@ PxeBcUniHexToUint8 (
 **/\r
 VOID\r
 CalcElapsedTime (\r
-  IN     PXEBC_PRIVATE_DATA     *Private\r
+  IN     PXEBC_PRIVATE_DATA  *Private\r
   );\r
 \r
 /**\r
@@ -495,7 +473,7 @@ CalcElapsedTime (
 **/\r
 EFI_HANDLE\r
 PxeBcGetNicByIp4Children (\r
-  IN EFI_HANDLE                 ControllerHandle\r
+  IN EFI_HANDLE  ControllerHandle\r
   );\r
 \r
 /**\r
@@ -508,6 +486,7 @@ PxeBcGetNicByIp4Children (
 **/\r
 EFI_HANDLE\r
 PxeBcGetNicByIp6Children (\r
-  IN EFI_HANDLE                  ControllerHandle\r
+  IN EFI_HANDLE  ControllerHandle\r
   );\r
+\r
 #endif\r
index f36d29f8bddcf3e717c930c3be0141f007de628a..9bb46bb1b5682c3ba3c97f2636c26fc38c79c1ad 100644 (file)
@@ -11,7 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // EFI Component Name Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL   gVlanConfigComponentName = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gVlanConfigComponentName = {\r
   VlanConfigComponentNameGetDriverName,\r
   VlanConfigComponentNameGetControllerName,\r
   "eng"\r
@@ -21,12 +21,12 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL   gVlanConfigComponent
 // EFI Component Name 2 Protocol\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gVlanConfigComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) VlanConfigComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) VlanConfigComponentNameGetControllerName,\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)VlanConfigComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)VlanConfigComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE      mVlanConfigDriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mVlanConfigDriverNameTable[] = {\r
   {\r
     "eng;en",\r
     L"VLAN Configuration Driver"\r
@@ -78,9 +78,9 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE      mVlanConfigDriverNam
 EFI_STATUS\r
 EFIAPI\r
 VlanConfigComponentNameGetDriverName (\r
-  IN     EFI_COMPONENT_NAME_PROTOCOL   *This,\r
-  IN     CHAR8                         *Language,\r
-     OUT CHAR16                        **DriverName\r
+  IN     EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN     CHAR8                        *Language,\r
+  OUT CHAR16                          **DriverName\r
   )\r
 {\r
   return LookupUnicodeString2 (\r
@@ -153,11 +153,11 @@ VlanConfigComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 VlanConfigComponentNameGetControllerName (\r
-  IN     EFI_COMPONENT_NAME_PROTOCOL   *This,\r
-  IN     EFI_HANDLE                    ControllerHandle,\r
-  IN     EFI_HANDLE                    ChildHandle OPTIONAL,\r
-  IN     CHAR8                         *Language,\r
-     OUT CHAR16                        **ControllerName\r
+  IN     EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN     EFI_HANDLE                   ControllerHandle,\r
+  IN     EFI_HANDLE                   ChildHandle OPTIONAL,\r
+  IN     CHAR8                        *Language,\r
+  OUT CHAR16                          **ControllerName\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
index ae636b763f93a5682aab2254984c360cf1704be1..705aa31e0f1755b523cfa3bc8d5e742eb4fe978a 100644 (file)
@@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "VlanConfigImpl.h"\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gVlanConfigDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gVlanConfigDriverBinding = {\r
   VlanConfigDriverBindingSupported,\r
   VlanConfigDriverBindingStart,\r
   VlanConfigDriverBindingStop,\r
@@ -31,8 +31,8 @@ EFI_DRIVER_BINDING_PROTOCOL gVlanConfigDriverBinding = {
 EFI_STATUS\r
 EFIAPI\r
 VlanConfigDriverEntryPoint (\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
   return EfiLibInstallDriverBindingComponentName2 (\r
@@ -45,7 +45,6 @@ VlanConfigDriverEntryPoint (
            );\r
 }\r
 \r
-\r
 /**\r
   Test to see if this driver supports ControllerHandle.\r
 \r
@@ -62,9 +61,9 @@ VlanConfigDriverEntryPoint (
 EFI_STATUS\r
 EFIAPI\r
 VlanConfigDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -73,7 +72,7 @@ VlanConfigDriverBindingSupported (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiVlanConfigProtocolGuid,\r
-                  (VOID **) &VlanConfig,\r
+                  (VOID **)&VlanConfig,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -95,7 +94,6 @@ VlanConfigDriverBindingSupported (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Start this driver on ControllerHandle.\r
 \r
@@ -112,9 +110,9 @@ VlanConfigDriverBindingSupported (
 EFI_STATUS\r
 EFIAPI\r
 VlanConfigDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -128,7 +126,7 @@ VlanConfigDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiCallerIdGuid,\r
-                  (VOID **) &PrivateData,\r
+                  (VOID **)&PrivateData,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -143,7 +141,7 @@ VlanConfigDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiVlanConfigProtocolGuid,\r
-                  (VOID **) &VlanConfig,\r
+                  (VOID **)&VlanConfig,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -158,7 +156,7 @@ VlanConfigDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &DevicePath,\r
+                  (VOID **)&DevicePath,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -176,9 +174,9 @@ VlanConfigDriverBindingStart (
     goto ErrorExit;\r
   }\r
 \r
-  PrivateData->ImageHandle = This->DriverBindingHandle;\r
+  PrivateData->ImageHandle      = This->DriverBindingHandle;\r
   PrivateData->ControllerHandle = ControllerHandle;\r
-  PrivateData->VlanConfig = VlanConfig;\r
+  PrivateData->VlanConfig       = VlanConfig;\r
   PrivateData->ParentDevicePath = DevicePath;\r
 \r
   //\r
@@ -201,6 +199,7 @@ VlanConfigDriverBindingStart (
   if (EFI_ERROR (Status)) {\r
     goto ErrorExit;\r
   }\r
+\r
   return Status;\r
 \r
 ErrorExit:\r
@@ -226,7 +225,6 @@ ErrorExit:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Stop this driver on ControllerHandle.\r
 \r
@@ -243,10 +241,10 @@ ErrorExit:
 EFI_STATUS\r
 EFIAPI\r
 VlanConfigDriverBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      ControllerHandle,\r
-  IN UINTN                           NumberOfChildren,\r
-  IN EFI_HANDLE                      *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -258,7 +256,7 @@ VlanConfigDriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiCallerIdGuid,\r
-                  (VOID **) &PrivateData,\r
+                  (VOID **)&PrivateData,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -266,10 +264,11 @@ VlanConfigDriverBindingStop (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   ASSERT (PrivateData->Signature == VLAN_CONFIG_PRIVATE_DATA_SIGNATURE);\r
 \r
   if (NumberOfChildren != 0) {\r
-    if (NumberOfChildren != 1 || ChildHandleBuffer[0] != PrivateData->DriverHandle) {\r
+    if ((NumberOfChildren != 1) || (ChildHandleBuffer[0] != PrivateData->DriverHandle)) {\r
       return EFI_DEVICE_ERROR;\r
     }\r
 \r
index 24d844cbf16fd48f8c7bf647d51e71a6015b395c..13b77b2c00e7c4aa56b27608576e1fe10573b827 100644 (file)
@@ -8,10 +8,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "VlanConfigImpl.h"\r
 \r
-CHAR16                          mVlanStorageName[] = L"VlanNvData";\r
-EFI_HII_CONFIG_ROUTING_PROTOCOL *mHiiConfigRouting = NULL;\r
+CHAR16                           mVlanStorageName[] = L"VlanNvData";\r
+EFI_HII_CONFIG_ROUTING_PROTOCOL  *mHiiConfigRouting = NULL;\r
 \r
-VLAN_CONFIG_PRIVATE_DATA        mVlanConfigPrivateDateTemplate = {\r
+VLAN_CONFIG_PRIVATE_DATA  mVlanConfigPrivateDateTemplate = {\r
   VLAN_CONFIG_PRIVATE_DATA_SIGNATURE,\r
   {\r
     VlanExtractConfig,\r
@@ -20,13 +20,13 @@ VLAN_CONFIG_PRIVATE_DATA        mVlanConfigPrivateDateTemplate = {
   }\r
 };\r
 \r
-VENDOR_DEVICE_PATH              mHiiVendorDevicePathNode = {\r
+VENDOR_DEVICE_PATH  mHiiVendorDevicePathNode = {\r
   {\r
     HARDWARE_DEVICE_PATH,\r
     HW_VENDOR_DP,\r
     {\r
-      (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-      (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+      (UINT8)(sizeof (VENDOR_DEVICE_PATH)),\r
+      (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
     }\r
   },\r
   VLAN_CONFIG_FORM_SET_GUID\r
@@ -61,22 +61,22 @@ VENDOR_DEVICE_PATH              mHiiVendorDevicePathNode = {
 EFI_STATUS\r
 EFIAPI\r
 VlanExtractConfig (\r
-  IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL        *This,\r
-  IN CONST EFI_STRING                            Request,\r
-       OUT EFI_STRING                            *Progress,\r
-       OUT EFI_STRING                            *Results\r
+  IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN CONST EFI_STRING                      Request,\r
+  OUT EFI_STRING                           *Progress,\r
+  OUT EFI_STRING                           *Results\r
   )\r
 {\r
-  EFI_STATUS                 Status;\r
-  UINTN                      BufferSize;\r
-  VLAN_CONFIGURATION         Configuration;\r
+  EFI_STATUS                Status;\r
+  UINTN                     BufferSize;\r
+  VLAN_CONFIGURATION        Configuration;\r
   VLAN_CONFIG_PRIVATE_DATA  *PrivateData;\r
-  EFI_STRING                 ConfigRequestHdr;\r
-  EFI_STRING                 ConfigRequest;\r
-  BOOLEAN                    AllocatedRequest;\r
-  UINTN                      Size;\r
+  EFI_STRING                ConfigRequestHdr;\r
+  EFI_STRING                ConfigRequest;\r
+  BOOLEAN                   AllocatedRequest;\r
+  UINTN                     Size;\r
 \r
-  if (Progress == NULL || Results == NULL) {\r
+  if ((Progress == NULL) || (Results == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -94,8 +94,9 @@ VlanExtractConfig (
   // Retrieve the pointer to the UEFI HII Config Routing Protocol\r
   //\r
   if (mHiiConfigRouting == NULL) {\r
-    gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID **) &mHiiConfigRouting);\r
+    gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID **)&mHiiConfigRouting);\r
   }\r
+\r
   ASSERT (mHiiConfigRouting != NULL);\r
 \r
   //\r
@@ -103,7 +104,7 @@ VlanExtractConfig (
   //\r
   PrivateData = VLAN_CONFIG_PRIVATE_DATA_FROM_THIS (This);\r
   ZeroMem (&Configuration, sizeof (VLAN_CONFIGURATION));\r
-  BufferSize = sizeof (Configuration);\r
+  BufferSize    = sizeof (Configuration);\r
   ConfigRequest = Request;\r
   if ((Request == NULL) || (StrStr (Request, L"OFFSET") == NULL)) {\r
     //\r
@@ -112,8 +113,8 @@ VlanExtractConfig (
     // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
     //\r
     ConfigRequestHdr = HiiConstructConfigHdr (&gVlanConfigFormSetGuid, mVlanStorageName, PrivateData->DriverHandle);\r
-    Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
-    ConfigRequest = AllocateZeroPool (Size);\r
+    Size             = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
+    ConfigRequest    = AllocateZeroPool (Size);\r
     ASSERT (ConfigRequest != NULL);\r
     AllocatedRequest = TRUE;\r
     UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);\r
@@ -123,7 +124,7 @@ VlanExtractConfig (
   Status = mHiiConfigRouting->BlockToConfig (\r
                                 mHiiConfigRouting,\r
                                 ConfigRequest,\r
-                                (UINT8 *) &Configuration,\r
+                                (UINT8 *)&Configuration,\r
                                 BufferSize,\r
                                 Results,\r
                                 Progress\r
@@ -135,6 +136,7 @@ VlanExtractConfig (
     FreePool (ConfigRequest);\r
     ConfigRequest = NULL;\r
   }\r
+\r
   //\r
   // Set Progress string to the original request string.\r
   //\r
@@ -147,7 +149,6 @@ VlanExtractConfig (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function processes the results of changes in configuration.\r
 \r
@@ -169,12 +170,12 @@ VlanExtractConfig (
 EFI_STATUS\r
 EFIAPI\r
 VlanRouteConfig (\r
-  IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL      *This,\r
-  IN CONST EFI_STRING                          Configuration,\r
-       OUT EFI_STRING                          *Progress\r
+  IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN CONST EFI_STRING                      Configuration,\r
+  OUT EFI_STRING                           *Progress\r
   )\r
 {\r
-  if (Configuration == NULL || Progress == NULL) {\r
+  if ((Configuration == NULL) || (Progress == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -212,12 +213,12 @@ VlanRouteConfig (
 EFI_STATUS\r
 EFIAPI\r
 VlanCallback (\r
-  IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL      *This,\r
-  IN     EFI_BROWSER_ACTION                    Action,\r
-  IN     EFI_QUESTION_ID                       QuestionId,\r
-  IN     UINT8                                 Type,\r
-  IN     EFI_IFR_TYPE_VALUE                    *Value,\r
-     OUT EFI_BROWSER_ACTION_REQUEST            *ActionRequest\r
+  IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN     EFI_BROWSER_ACTION                Action,\r
+  IN     EFI_QUESTION_ID                   QuestionId,\r
+  IN     UINT8                             Type,\r
+  IN     EFI_IFR_TYPE_VALUE                *Value,\r
+  OUT EFI_BROWSER_ACTION_REQUEST           *ActionRequest\r
   )\r
 {\r
   VLAN_CONFIG_PRIVATE_DATA  *PrivateData;\r
@@ -244,89 +245,89 @@ VlanCallback (
   //\r
   Configuration = AllocateZeroPool (sizeof (VLAN_CONFIGURATION));\r
   ASSERT (Configuration != NULL);\r
-  HiiGetBrowserData (&gVlanConfigFormSetGuid, mVlanStorageName, sizeof (VLAN_CONFIGURATION), (UINT8 *) Configuration);\r
+  HiiGetBrowserData (&gVlanConfigFormSetGuid, mVlanStorageName, sizeof (VLAN_CONFIGURATION), (UINT8 *)Configuration);\r
 \r
   VlanConfig = PrivateData->VlanConfig;\r
 \r
   if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
     switch (QuestionId) {\r
-    case VLAN_ADD_QUESTION_ID:\r
-      //\r
-      // Add a VLAN\r
-      //\r
-      VlanConfig->Set (VlanConfig, Configuration->VlanId, Configuration->Priority);\r
-      VlanUpdateForm (PrivateData);\r
-\r
-      //\r
-      // Connect the newly created VLAN device\r
-      //\r
-      VlanHandle = NetLibGetVlanHandle (PrivateData->ControllerHandle, Configuration->VlanId);\r
-      if (VlanHandle == NULL) {\r
+      case VLAN_ADD_QUESTION_ID:\r
+        //\r
+        // Add a VLAN\r
         //\r
-        // There may be no child handle created for VLAN ID 0, connect the parent handle\r
+        VlanConfig->Set (VlanConfig, Configuration->VlanId, Configuration->Priority);\r
+        VlanUpdateForm (PrivateData);\r
+\r
+        //\r
+        // Connect the newly created VLAN device\r
         //\r
-        VlanHandle = PrivateData->ControllerHandle;\r
-      }\r
-      gBS->ConnectController (VlanHandle, NULL, NULL, TRUE);\r
-\r
-      //\r
-      // Clear UI data\r
-      //\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
-      Configuration->VlanId = 0;\r
-      Configuration->Priority = 0;\r
-      break;\r
-\r
-    case VLAN_REMOVE_QUESTION_ID:\r
-      //\r
-      // Remove VLAN\r
-      //\r
-      ASSERT (PrivateData->NumberOfVlan <= MAX_VLAN_NUMBER);\r
-      for (Index = 0; Index < PrivateData->NumberOfVlan; Index++) {\r
-        if (Configuration->VlanList[Index] != 0) {\r
+        VlanHandle = NetLibGetVlanHandle (PrivateData->ControllerHandle, Configuration->VlanId);\r
+        if (VlanHandle == NULL) {\r
           //\r
-          // Checkbox is selected, need remove this VLAN\r
+          // There may be no child handle created for VLAN ID 0, connect the parent handle\r
           //\r
-          VlanConfig->Remove (VlanConfig, PrivateData->VlanId[Index]);\r
+          VlanHandle = PrivateData->ControllerHandle;\r
         }\r
-      }\r
 \r
-      VlanUpdateForm (PrivateData);\r
-      if (PrivateData->NumberOfVlan == 0) {\r
+        gBS->ConnectController (VlanHandle, NULL, NULL, TRUE);\r
+\r
         //\r
-        // No VLAN device now, connect the physical NIC handle.\r
-        // Note: PrivateData->NumberOfVlan has been updated by VlanUpdateForm()\r
+        // Clear UI data\r
         //\r
-        gBS->ConnectController (PrivateData->ControllerHandle, NULL, NULL, TRUE);\r
-      }\r
+        *ActionRequest          = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
+        Configuration->VlanId   = 0;\r
+        Configuration->Priority = 0;\r
+        break;\r
+\r
+      case VLAN_REMOVE_QUESTION_ID:\r
+        //\r
+        // Remove VLAN\r
+        //\r
+        ASSERT (PrivateData->NumberOfVlan <= MAX_VLAN_NUMBER);\r
+        for (Index = 0; Index < PrivateData->NumberOfVlan; Index++) {\r
+          if (Configuration->VlanList[Index] != 0) {\r
+            //\r
+            // Checkbox is selected, need remove this VLAN\r
+            //\r
+            VlanConfig->Remove (VlanConfig, PrivateData->VlanId[Index]);\r
+          }\r
+        }\r
+\r
+        VlanUpdateForm (PrivateData);\r
+        if (PrivateData->NumberOfVlan == 0) {\r
+          //\r
+          // No VLAN device now, connect the physical NIC handle.\r
+          // Note: PrivateData->NumberOfVlan has been updated by VlanUpdateForm()\r
+          //\r
+          gBS->ConnectController (PrivateData->ControllerHandle, NULL, NULL, TRUE);\r
+        }\r
 \r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
-      ZeroMem (Configuration->VlanList, MAX_VLAN_NUMBER);\r
-      break;\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
+        ZeroMem (Configuration->VlanList, MAX_VLAN_NUMBER);\r
+        break;\r
 \r
-    default:\r
-      break;\r
+      default:\r
+        break;\r
     }\r
   } else if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
     switch (QuestionId) {\r
-    case VLAN_UPDATE_QUESTION_ID:\r
-      //\r
-      // Update current VLAN list into Form.\r
-      //\r
-      VlanUpdateForm (PrivateData);\r
-      break;\r
-\r
-    default:\r
-      break;\r
+      case VLAN_UPDATE_QUESTION_ID:\r
+        //\r
+        // Update current VLAN list into Form.\r
+        //\r
+        VlanUpdateForm (PrivateData);\r
+        break;\r
+\r
+      default:\r
+        break;\r
     }\r
   }\r
 \r
-  HiiSetBrowserData (&gVlanConfigFormSetGuid, mVlanStorageName, sizeof (VLAN_CONFIGURATION), (UINT8 *) Configuration, NULL);\r
+  HiiSetBrowserData (&gVlanConfigFormSetGuid, mVlanStorageName, sizeof (VLAN_CONFIGURATION), (UINT8 *)Configuration, NULL);\r
   FreePool (Configuration);\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function update VLAN list in the VLAN configuration Form.\r
 \r
@@ -335,7 +336,7 @@ VlanCallback (
 **/\r
 VOID\r
 VlanUpdateForm (\r
-  IN OUT VLAN_CONFIG_PRIVATE_DATA    *PrivateData\r
+  IN OUT VLAN_CONFIG_PRIVATE_DATA  *PrivateData\r
   )\r
 {\r
   EFI_VLAN_CONFIG_PROTOCOL  *VlanConfig;\r
@@ -355,9 +356,9 @@ VlanUpdateForm (
   //\r
   // Find current VLAN configuration\r
   //\r
-  VlanData = NULL;\r
+  VlanData     = NULL;\r
   NumberOfVlan = 0;\r
-  VlanConfig = PrivateData->VlanConfig;\r
+  VlanConfig   = PrivateData->VlanConfig;\r
   VlanConfig->Find (VlanConfig, NULL, &NumberOfVlan, &VlanData);\r
 \r
   //\r
@@ -366,6 +367,7 @@ VlanUpdateForm (
   if (NumberOfVlan > MAX_VLAN_NUMBER) {\r
     NumberOfVlan = MAX_VLAN_NUMBER;\r
   }\r
+\r
   PrivateData->NumberOfVlan = NumberOfVlan;\r
 \r
   //\r
@@ -380,24 +382,24 @@ VlanUpdateForm (
   //\r
   // Create Hii Extend Label OpCode as the start opcode\r
   //\r
-  StartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                        StartOpCodeHandle,\r
-                                        &gEfiIfrTianoGuid,\r
-                                        NULL,\r
-                                        sizeof (EFI_IFR_GUID_LABEL)\r
-                                        );\r
+  StartLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                       StartOpCodeHandle,\r
+                                       &gEfiIfrTianoGuid,\r
+                                       NULL,\r
+                                       sizeof (EFI_IFR_GUID_LABEL)\r
+                                       );\r
   StartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
   StartLabel->Number       = LABEL_VLAN_LIST;\r
 \r
   //\r
   // Create Hii Extend Label OpCode as the end opcode\r
   //\r
-  EndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                      EndOpCodeHandle,\r
-                                      &gEfiIfrTianoGuid,\r
-                                      NULL,\r
-                                      sizeof (EFI_IFR_GUID_LABEL)\r
-                                      );\r
+  EndLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                     EndOpCodeHandle,\r
+                                     &gEfiIfrTianoGuid,\r
+                                     NULL,\r
+                                     sizeof (EFI_IFR_GUID_LABEL)\r
+                                     );\r
   EndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
   EndLabel->Number       = LABEL_END;\r
 \r
@@ -416,7 +418,7 @@ VlanUpdateForm (
     StrCpyS (String + 4 - DigitalCount, (sizeof (VlanStr) /sizeof (CHAR16)) - 10 - (4 - DigitalCount), VlanIdStr);\r
     String += 4;\r
 \r
-    StrCpyS (String,  (sizeof (VlanStr) /sizeof (CHAR16)) - 10 - (4 - DigitalCount) - 4, L", Priority:");\r
+    StrCpyS (String, (sizeof (VlanStr) /sizeof (CHAR16)) - 10 - (4 - DigitalCount) - 4, L", Priority:");\r
     String += 11;\r
     UnicodeValueToStringS (\r
       String,\r
@@ -433,9 +435,9 @@ VlanUpdateForm (
 \r
     HiiCreateCheckBoxOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (VLAN_LIST_VAR_OFFSET + Index),\r
+      (EFI_QUESTION_ID)(VLAN_LIST_VAR_OFFSET + Index),\r
       VLAN_CONFIGURATION_VARSTORE_ID,\r
-      (UINT16) (VLAN_LIST_VAR_OFFSET + Index),\r
+      (UINT16)(VLAN_LIST_VAR_OFFSET + Index),\r
       StringId,\r
       STRING_TOKEN (STR_VLAN_VLAN_LIST_HELP),\r
       0,\r
@@ -465,7 +467,6 @@ VlanUpdateForm (
   }\r
 }\r
 \r
-\r
 /**\r
   This function publish the VLAN configuration Form for a network device. The\r
   HII Config Access protocol will be installed on a child handle of the network\r
@@ -480,7 +481,7 @@ VlanUpdateForm (
 **/\r
 EFI_STATUS\r
 InstallVlanConfigForm (\r
-  IN OUT VLAN_CONFIG_PRIVATE_DATA    *PrivateData\r
+  IN OUT VLAN_CONFIG_PRIVATE_DATA  *PrivateData\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
@@ -497,26 +498,28 @@ InstallVlanConfigForm (
   //\r
   ChildDevicePath = AppendDevicePathNode (\r
                       PrivateData->ParentDevicePath,\r
-                      (CONST EFI_DEVICE_PATH_PROTOCOL *) &mHiiVendorDevicePathNode\r
+                      (CONST EFI_DEVICE_PATH_PROTOCOL *)&mHiiVendorDevicePathNode\r
                       );\r
   if (ChildDevicePath == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   PrivateData->ChildDevicePath = ChildDevicePath;\r
 \r
   DriverHandle = NULL;\r
   ConfigAccess = &PrivateData->ConfigAccess;\r
-  Status = gBS->InstallMultipleProtocolInterfaces (\r
-                  &DriverHandle,\r
-                  &gEfiDevicePathProtocolGuid,\r
-                  ChildDevicePath,\r
-                  &gEfiHiiConfigAccessProtocolGuid,\r
-                  ConfigAccess,\r
-                  NULL\r
-                  );\r
+  Status       = gBS->InstallMultipleProtocolInterfaces (\r
+                        &DriverHandle,\r
+                        &gEfiDevicePathProtocolGuid,\r
+                        ChildDevicePath,\r
+                        &gEfiHiiConfigAccessProtocolGuid,\r
+                        ConfigAccess,\r
+                        NULL\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   PrivateData->DriverHandle = DriverHandle;\r
 \r
   //\r
@@ -548,16 +551,18 @@ InstallVlanConfigForm (
   if (HiiHandle == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   PrivateData->HiiHandle = HiiHandle;\r
 \r
   //\r
   // Update formset title help string.\r
   //\r
   MacString = NULL;\r
-  Status = NetLibGetMacString (PrivateData->ControllerHandle, PrivateData->ImageHandle, &MacString);\r
+  Status    = NetLibGetMacString (PrivateData->ControllerHandle, PrivateData->ImageHandle, &MacString);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   PrivateData->MacString = MacString;\r
 \r
   StrCpyS (Str, sizeof (Str) / sizeof (CHAR16), L"VLAN Configuration (MAC:");\r
@@ -595,11 +600,11 @@ InstallVlanConfigForm (
 **/\r
 EFI_STATUS\r
 UninstallVlanConfigForm (\r
-  IN OUT VLAN_CONFIG_PRIVATE_DATA    *PrivateData\r
+  IN OUT VLAN_CONFIG_PRIVATE_DATA  *PrivateData\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_VLAN_CONFIG_PROTOCOL     *VlanConfig;\r
+  EFI_STATUS                Status;\r
+  EFI_VLAN_CONFIG_PROTOCOL  *VlanConfig;\r
 \r
   //\r
   // End the parent-child relationship.\r
@@ -637,6 +642,7 @@ UninstallVlanConfigForm (
              );\r
       return Status;\r
     }\r
+\r
     PrivateData->DriverHandle = NULL;\r
 \r
     if (PrivateData->ChildDevicePath != NULL) {\r
@@ -660,5 +666,6 @@ UninstallVlanConfigForm (
     HiiRemovePackages (PrivateData->HiiHandle);\r
     PrivateData->HiiHandle = NULL;\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
index 2f1f17e6ef95b0b4219b4ef90318c18754e5e9bb..c8fe9b097cfc1674289be58388ec2f75810a497f 100644 (file)
@@ -32,40 +32,39 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "VlanConfigNvData.h"\r
 \r
-extern EFI_COMPONENT_NAME2_PROTOCOL gVlanConfigComponentName2;\r
-extern EFI_COMPONENT_NAME_PROTOCOL  gVlanConfigComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gVlanConfigComponentName2;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gVlanConfigComponentName;\r
 \r
 //\r
 // Tool generated IFR binary data and String package data\r
 //\r
-extern UINT8                        VlanConfigBin[];\r
-extern UINT8                        VlanConfigDxeStrings[];\r
+extern UINT8  VlanConfigBin[];\r
+extern UINT8  VlanConfigDxeStrings[];\r
 \r
-#define VLAN_LIST_VAR_OFFSET ((UINT16) OFFSET_OF (VLAN_CONFIGURATION, VlanList))\r
+#define VLAN_LIST_VAR_OFFSET  ((UINT16) OFFSET_OF (VLAN_CONFIGURATION, VlanList))\r
 \r
 typedef struct {\r
-  UINTN                           Signature;\r
+  UINTN                             Signature;\r
 \r
-  EFI_HII_CONFIG_ACCESS_PROTOCOL  ConfigAccess;\r
-  EFI_HII_HANDLE                  HiiHandle;\r
-  EFI_HANDLE                      DriverHandle;\r
-  EFI_DEVICE_PATH_PROTOCOL        *ChildDevicePath;\r
+  EFI_HII_CONFIG_ACCESS_PROTOCOL    ConfigAccess;\r
+  EFI_HII_HANDLE                    HiiHandle;\r
+  EFI_HANDLE                        DriverHandle;\r
+  EFI_DEVICE_PATH_PROTOCOL          *ChildDevicePath;\r
 \r
-  EFI_HANDLE                      ControllerHandle;\r
-  EFI_HANDLE                      ImageHandle;\r
-  EFI_DEVICE_PATH_PROTOCOL        *ParentDevicePath;\r
-  EFI_VLAN_CONFIG_PROTOCOL        *VlanConfig;\r
-  CHAR16                          *MacString;\r
+  EFI_HANDLE                        ControllerHandle;\r
+  EFI_HANDLE                        ImageHandle;\r
+  EFI_DEVICE_PATH_PROTOCOL          *ParentDevicePath;\r
+  EFI_VLAN_CONFIG_PROTOCOL          *VlanConfig;\r
+  CHAR16                            *MacString;\r
 \r
-  UINT16                          NumberOfVlan;\r
-  UINT16                          VlanId[MAX_VLAN_NUMBER];\r
+  UINT16                            NumberOfVlan;\r
+  UINT16                            VlanId[MAX_VLAN_NUMBER];\r
 } VLAN_CONFIG_PRIVATE_DATA;\r
 \r
-#define VLAN_CONFIG_PRIVATE_DATA_SIGNATURE     SIGNATURE_32 ('V', 'C', 'P', 'D')\r
+#define VLAN_CONFIG_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('V', 'C', 'P', 'D')\r
 #define VLAN_CONFIG_PRIVATE_DATA_FROM_THIS(a)  CR (a, VLAN_CONFIG_PRIVATE_DATA, ConfigAccess, VLAN_CONFIG_PRIVATE_DATA_SIGNATURE)\r
 \r
-extern VLAN_CONFIG_PRIVATE_DATA mVlanConfigPrivateDateTemplate;\r
-\r
+extern VLAN_CONFIG_PRIVATE_DATA  mVlanConfigPrivateDateTemplate;\r
 \r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
@@ -104,9 +103,9 @@ extern VLAN_CONFIG_PRIVATE_DATA mVlanConfigPrivateDateTemplate;
 EFI_STATUS\r
 EFIAPI\r
 VlanConfigComponentNameGetDriverName (\r
-  IN     EFI_COMPONENT_NAME_PROTOCOL   *This,\r
-  IN     CHAR8                         *Language,\r
-     OUT CHAR16                        **DriverName\r
+  IN     EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN     CHAR8                        *Language,\r
+  OUT CHAR16                          **DriverName\r
   );\r
 \r
 /**\r
@@ -170,11 +169,11 @@ VlanConfigComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 VlanConfigComponentNameGetControllerName (\r
-  IN     EFI_COMPONENT_NAME_PROTOCOL   *This,\r
-  IN     EFI_HANDLE                    ControllerHandle,\r
-  IN     EFI_HANDLE                    ChildHandle OPTIONAL,\r
-  IN     CHAR8                         *Language,\r
-     OUT CHAR16                        **ControllerName\r
+  IN     EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN     EFI_HANDLE                   ControllerHandle,\r
+  IN     EFI_HANDLE                   ChildHandle OPTIONAL,\r
+  IN     CHAR8                        *Language,\r
+  OUT CHAR16                          **ControllerName\r
   );\r
 \r
 /**\r
@@ -193,9 +192,9 @@ VlanConfigComponentNameGetControllerName (
 EFI_STATUS\r
 EFIAPI\r
 VlanConfigDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   );\r
 \r
 /**\r
@@ -214,9 +213,9 @@ VlanConfigDriverBindingSupported (
 EFI_STATUS\r
 EFIAPI\r
 VlanConfigDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   );\r
 \r
 /**\r
@@ -235,10 +234,10 @@ VlanConfigDriverBindingStart (
 EFI_STATUS\r
 EFIAPI\r
 VlanConfigDriverBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN EFI_HANDLE                      ControllerHandle,\r
-  IN UINTN                           NumberOfChildren,\r
-  IN EFI_HANDLE                      *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   );\r
 \r
 /**\r
@@ -249,7 +248,7 @@ VlanConfigDriverBindingStop (
 **/\r
 VOID\r
 VlanUpdateForm (\r
-  IN OUT VLAN_CONFIG_PRIVATE_DATA    *PrivateData\r
+  IN OUT VLAN_CONFIG_PRIVATE_DATA  *PrivateData\r
   );\r
 \r
 /**\r
@@ -266,7 +265,7 @@ VlanUpdateForm (
 **/\r
 EFI_STATUS\r
 InstallVlanConfigForm (\r
-  IN OUT VLAN_CONFIG_PRIVATE_DATA    *PrivateData\r
+  IN OUT VLAN_CONFIG_PRIVATE_DATA  *PrivateData\r
   );\r
 \r
 /**\r
@@ -281,7 +280,7 @@ InstallVlanConfigForm (
 **/\r
 EFI_STATUS\r
 UninstallVlanConfigForm (\r
-  IN OUT VLAN_CONFIG_PRIVATE_DATA    *PrivateData\r
+  IN OUT VLAN_CONFIG_PRIVATE_DATA  *PrivateData\r
   );\r
 \r
 /**\r
@@ -313,10 +312,10 @@ UninstallVlanConfigForm (
 EFI_STATUS\r
 EFIAPI\r
 VlanExtractConfig (\r
-  IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL        *This,\r
-  IN CONST EFI_STRING                            Request,\r
-       OUT EFI_STRING                            *Progress,\r
-       OUT EFI_STRING                            *Results\r
+  IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN CONST EFI_STRING                      Request,\r
+  OUT EFI_STRING                           *Progress,\r
+  OUT EFI_STRING                           *Results\r
   );\r
 \r
 /**\r
@@ -340,9 +339,9 @@ VlanExtractConfig (
 EFI_STATUS\r
 EFIAPI\r
 VlanRouteConfig (\r
-  IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL      *This,\r
-  IN CONST EFI_STRING                          Configuration,\r
-       OUT EFI_STRING                          *Progress\r
+  IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN CONST EFI_STRING                      Configuration,\r
+  OUT EFI_STRING                           *Progress\r
   );\r
 \r
 /**\r
@@ -370,12 +369,12 @@ VlanRouteConfig (
 EFI_STATUS\r
 EFIAPI\r
 VlanCallback (\r
-  IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL      *This,\r
-  IN     EFI_BROWSER_ACTION                    Action,\r
-  IN     EFI_QUESTION_ID                       QuestionId,\r
-  IN     UINT8                                 Type,\r
-  IN     EFI_IFR_TYPE_VALUE                    *Value,\r
-     OUT EFI_BROWSER_ACTION_REQUEST            *ActionRequest\r
+  IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN     EFI_BROWSER_ACTION                Action,\r
+  IN     EFI_QUESTION_ID                   QuestionId,\r
+  IN     UINT8                             Type,\r
+  IN     EFI_IFR_TYPE_VALUE                *Value,\r
+  OUT EFI_BROWSER_ACTION_REQUEST           *ActionRequest\r
   );\r
 \r
 #endif\r
index 00b5486901eb7e56574615306abe879a6cb91495..9f059c719213fb06498df300cd84874111929dee 100644 (file)
@@ -16,25 +16,25 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define VLAN_CONFIGURATION_FORM_ID      0x0001\r
 #define VLAN_HEAD_FORM_ID               0x0002\r
 \r
-#define VLAN_ADD_QUESTION_ID            0x1000\r
-#define VLAN_REMOVE_QUESTION_ID         0x2000\r
-#define VLAN_UPDATE_QUESTION_ID         0x3000\r
+#define VLAN_ADD_QUESTION_ID     0x1000\r
+#define VLAN_REMOVE_QUESTION_ID  0x2000\r
+#define VLAN_UPDATE_QUESTION_ID  0x3000\r
 \r
-#define LABEL_VLAN_LIST                 0x0001\r
-#define LABEL_END                       0xffff\r
+#define LABEL_VLAN_LIST  0x0001\r
+#define LABEL_END        0xffff\r
 \r
 //\r
 // The maximum number of VLAN that will be displayed on the menu\r
 //\r
-#define MAX_VLAN_NUMBER                 100\r
+#define MAX_VLAN_NUMBER  100\r
 \r
 //\r
 // Nv Data structure referenced by IFR\r
 //\r
 typedef struct {\r
-  UINT16  VlanId;\r
-  UINT8   Priority;\r
-  UINT8   VlanList[MAX_VLAN_NUMBER];\r
+  UINT16    VlanId;\r
+  UINT8     Priority;\r
+  UINT8     VlanList[MAX_VLAN_NUMBER];\r
 } VLAN_CONFIGURATION;\r
 \r
 #endif\r
index 9b3801926a223a56c6816fbed7da88e06c400218..8b18988f7f1c67bb449498886edc25d10c26d504 100644 (file)
 #define __EFI_WIFI_EAP_CONTEXT_H__\r
 \r
 typedef struct {\r
-\r
-  BOOLEAN                   IsEncrypted;\r
-  CHAR16                    EncryptPassword[PASSWORD_STORAGE_SIZE];\r
-  UINTN                     KeySize;\r
-  UINT8                     KeyData[1];\r
-\r
+  BOOLEAN    IsEncrypted;\r
+  CHAR16     EncryptPassword[PASSWORD_STORAGE_SIZE];\r
+  UINTN      KeySize;\r
+  UINT8      KeyData[1];\r
 } EFI_EAP_PRIVATE_KEY;\r
 \r
 #endif\r
index 1bcd3daa236763ae9ad494f6b77412f65cf65877..c72f9f7095c2d983e1e59258ccecc109c11797ed 100644 (file)
@@ -9,15 +9,15 @@
 \r
 #include "WifiConnectionMgrDxe.h"\r
 \r
-extern EFI_GUID mEfiWifiMgrPrivateGuid;\r
+extern EFI_GUID  mEfiWifiMgrPrivateGuid;\r
 \r
 ///\r
 /// Component Name Protocol instance\r
 ///\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
 EFI_COMPONENT_NAME_PROTOCOL  gWifiMgrDxeComponentName = {\r
-  (EFI_COMPONENT_NAME_GET_DRIVER_NAME)     WifiMgrDxeComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME_GET_CONTROLLER_NAME) WifiMgrDxeComponentNameGetControllerName,\r
+  (EFI_COMPONENT_NAME_GET_DRIVER_NAME)WifiMgrDxeComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME_GET_CONTROLLER_NAME)WifiMgrDxeComponentNameGetControllerName,\r
   "eng"\r
 };\r
 \r
@@ -35,7 +35,7 @@ EFI_COMPONENT_NAME2_PROTOCOL  gWifiMgrDxeComponentName2 = {
 /// Table of driver names\r
 ///\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
-EFI_UNICODE_STRING_TABLE mWifiMgrDxeDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mWifiMgrDxeDriverNameTable[] = {\r
   {\r
     "eng;en",\r
     L"UEFI WiFi Connection Manager"\r
@@ -50,7 +50,7 @@ EFI_UNICODE_STRING_TABLE mWifiMgrDxeDriverNameTable[] = {
 /// Table of controller names\r
 ///\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
-EFI_UNICODE_STRING_TABLE mWifiMgrDxeControllerNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mWifiMgrDxeControllerNameTable[] = {\r
   {\r
     "eng;en",\r
     L"UEFI WiFi Connection Manager Controller"\r
@@ -150,13 +150,13 @@ WifiMgrDxeComponentNameGetControllerName (
   OUT CHAR16                        **ControllerName\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  WIFI_MGR_PRIVATE_PROTOCOL    *WifiMgrPrivate;\r
+  EFI_STATUS                 Status;\r
+  WIFI_MGR_PRIVATE_PROTOCOL  *WifiMgrPrivate;\r
 \r
   //\r
   // ChildHandle must be NULL for a Device Driver\r
   //\r
-  if (ControllerHandle == NULL || ChildHandle != NULL) {\r
+  if ((ControllerHandle == NULL) || (ChildHandle != NULL)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -166,7 +166,7 @@ WifiMgrDxeComponentNameGetControllerName (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &mEfiWifiMgrPrivateGuid,\r
-                  (VOID **) &WifiMgrPrivate,\r
+                  (VOID **)&WifiMgrPrivate,\r
                   NULL,\r
                   NULL,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
index c0b440fd250e5a09f2f782a663e79156890641ae..a1ed09af71aaa3cede226d4f0926f25475926c99 100644 (file)
@@ -12,8 +12,8 @@
 \r
 #include "WifiConnectionMgrConfigNVDataStruct.h"\r
 \r
-extern UINT8        WifiConnectionManagerDxeBin[];\r
-extern UINT8        WifiConnectionManagerDxeStrings[];\r
+extern UINT8  WifiConnectionManagerDxeBin[];\r
+extern UINT8  WifiConnectionManagerDxeStrings[];\r
 \r
 typedef struct {\r
   UINT32               Signature;\r
@@ -40,7 +40,7 @@ typedef struct {
   CHAR16               PrivateKeyName[WIFI_FILENAME_STR_MAX_SIZE];\r
   VOID                 *PrivateKeyData;\r
   UINTN                PrivateKeyDataSize;\r
-  CHAR16               PrivateKeyPassword[PASSWORD_STORAGE_SIZE];    //Password to protect private key file\r
+  CHAR16               PrivateKeyPassword[PASSWORD_STORAGE_SIZE];    // Password to protect private key file\r
   CHAR16               EapIdentity[EAP_IDENTITY_SIZE];\r
   CHAR16               EapPassword[PASSWORD_STORAGE_SIZE];\r
   UINT8                EapSecondAuthMethod;\r
@@ -60,8 +60,8 @@ typedef struct {
 /// HII specific Vendor Device Path definition.\r
 ///\r
 typedef struct {\r
-  VENDOR_DEVICE_PATH               VendorDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL         End;\r
+  VENDOR_DEVICE_PATH          VendorDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL    End;\r
 } HII_VENDOR_DEVICE_PATH;\r
 #pragma pack()\r
 \r
index cffc51f592e38a649fbaab7ed618efdf46e0e3dc..69878bc457edb2c434d33621379485aa36acdeb3 100644 (file)
 #include <Guid/WifiConnectionManagerConfigHii.h>\r
 #include "WifiConnectionMgrConfigHii.h"\r
 \r
-#define MANAGER_VARSTORE_ID           0x0802\r
+#define MANAGER_VARSTORE_ID  0x0802\r
 \r
-#define WIFI_STR_MAX_SIZE             224\r
-#define WIFI_FILENAME_STR_MAX_SIZE    224\r
-#define WIFI_MGR_MAX_MAC_STRING_LEN   96\r
+#define WIFI_STR_MAX_SIZE            224\r
+#define WIFI_FILENAME_STR_MAX_SIZE   224\r
+#define WIFI_MGR_MAX_MAC_STRING_LEN  96\r
 \r
-#define SSID_MIN_LEN                  1\r
-#define SSID_MAX_LEN                  32\r
-#define SSID_STORAGE_SIZE             33\r
+#define SSID_MIN_LEN       1\r
+#define SSID_MAX_LEN       32\r
+#define SSID_STORAGE_SIZE  33\r
 \r
-#define PASSWORD_MIN_LEN              8\r
-#define PASSWORD_MAX_LEN              63\r
-#define PASSWORD_STORAGE_SIZE         64\r
+#define PASSWORD_MIN_LEN       8\r
+#define PASSWORD_MAX_LEN       63\r
+#define PASSWORD_STORAGE_SIZE  64\r
 \r
-#define EAP_IDENTITY_LEN              63\r
-#define EAP_IDENTITY_SIZE             64\r
+#define EAP_IDENTITY_LEN   63\r
+#define EAP_IDENTITY_SIZE  64\r
 \r
-#define FORMID_NONE_FORM              0\r
-#define FORMID_MAC_SELECTION          1\r
-#define FORMID_WIFI_MAINPAGE          2\r
-#define FORMID_NETWORK_LIST           3\r
-#define FORMID_CONNECT_NETWORK        4\r
-#define FORMID_ENROLL_CERT            5\r
-#define FORMID_CA_LIST                6\r
-#define FORMID_ENROLL_PRIVATE_KEY     7\r
-#define FORMID_PRIVATE_KEY_LIST       8\r
-#define FORMID_WIFI_SETTINGS          9\r
-#define FORMID_HIDDEN_NETWORK_LIST    10\r
+#define FORMID_NONE_FORM            0\r
+#define FORMID_MAC_SELECTION        1\r
+#define FORMID_WIFI_MAINPAGE        2\r
+#define FORMID_NETWORK_LIST         3\r
+#define FORMID_CONNECT_NETWORK      4\r
+#define FORMID_ENROLL_CERT          5\r
+#define FORMID_CA_LIST              6\r
+#define FORMID_ENROLL_PRIVATE_KEY   7\r
+#define FORMID_PRIVATE_KEY_LIST     8\r
+#define FORMID_WIFI_SETTINGS        9\r
+#define FORMID_HIDDEN_NETWORK_LIST  10\r
 \r
 //\r
 // Mac List Form Key\r
 //\r
-#define KEY_MAC_LIST                              0x100\r
+#define KEY_MAC_LIST  0x100\r
 \r
 //\r
 // Main Form Key\r
 //\r
-#define KEY_REFRESH_TITLE_CONNECTION_STATUS       0x101\r
+#define KEY_REFRESH_TITLE_CONNECTION_STATUS  0x101\r
 \r
 //\r
 // Network List Form Key\r
 //\r
-#define KEY_NETWORK_LIST                          0x102\r
-#define KEY_REFRESH_NETWORK_LIST                  0x103\r
-#define KEY_WIFI_SETTINGS                         0x104\r
+#define KEY_NETWORK_LIST          0x102\r
+#define KEY_REFRESH_NETWORK_LIST  0x103\r
+#define KEY_WIFI_SETTINGS         0x104\r
 \r
 //\r
 // Connect Network Form Key\r
 //\r
-#define KEY_PASSWORD_CONNECT_NETWORK              0x201\r
-#define KEY_CONNECT_ACTION                        0x202\r
-#define KEY_REFRESH_CONNECT_CONFIGURATION         0x203\r
-#define KEY_EAP_AUTH_METHOD_CONNECT_NETWORK       0x204\r
-#define KEY_EAP_SEAUTH_METHOD_CONNECT_NETWORK     0x205\r
-#define KEY_ENROLL_CA_CERT_CONNECT_NETWORK        0x206\r
-#define KEY_ENROLL_CLIENT_CERT_CONNECT_NETWORK    0x207\r
-#define KEY_ENROLL_PRIVATE_KEY_CONNECT_NETWORK    0x208\r
-#define KEY_EAP_IDENTITY_CONNECT_NETWORK          0x209\r
-#define KEY_EAP_PASSWORD_CONNECT_NETWORK          0x210\r
+#define KEY_PASSWORD_CONNECT_NETWORK            0x201\r
+#define KEY_CONNECT_ACTION                      0x202\r
+#define KEY_REFRESH_CONNECT_CONFIGURATION       0x203\r
+#define KEY_EAP_AUTH_METHOD_CONNECT_NETWORK     0x204\r
+#define KEY_EAP_SEAUTH_METHOD_CONNECT_NETWORK   0x205\r
+#define KEY_ENROLL_CA_CERT_CONNECT_NETWORK      0x206\r
+#define KEY_ENROLL_CLIENT_CERT_CONNECT_NETWORK  0x207\r
+#define KEY_ENROLL_PRIVATE_KEY_CONNECT_NETWORK  0x208\r
+#define KEY_EAP_IDENTITY_CONNECT_NETWORK        0x209\r
+#define KEY_EAP_PASSWORD_CONNECT_NETWORK        0x210\r
 \r
 //\r
-//Cert Form And Private Key Form\r
+// Cert Form And Private Key Form\r
 //\r
-#define KEY_EAP_ENROLL_CERT_FROM_FILE             0x301\r
-#define KEY_EAP_ENROLL_PRIVATE_KEY_FROM_FILE      0x302\r
-#define KEY_SAVE_CERT_TO_MEM                      0x303\r
-#define KEY_NO_SAVE_CERT_TO_MEM                   0x304\r
-#define KEY_SAVE_PRIVATE_KEY_TO_MEM               0x305\r
-#define KEY_NO_SAVE_PRIVATE_KEY_TO_MEM            0x306\r
-#define KEY_PRIVATE_KEY_PASSWORD                  0x307\r
-#define KEY_ENROLLED_CERT_NAME                    0x308\r
-#define KEY_ENROLLED_PRIVATE_KEY_NAME             0x309\r
+#define KEY_EAP_ENROLL_CERT_FROM_FILE         0x301\r
+#define KEY_EAP_ENROLL_PRIVATE_KEY_FROM_FILE  0x302\r
+#define KEY_SAVE_CERT_TO_MEM                  0x303\r
+#define KEY_NO_SAVE_CERT_TO_MEM               0x304\r
+#define KEY_SAVE_PRIVATE_KEY_TO_MEM           0x305\r
+#define KEY_NO_SAVE_PRIVATE_KEY_TO_MEM        0x306\r
+#define KEY_PRIVATE_KEY_PASSWORD              0x307\r
+#define KEY_ENROLLED_CERT_NAME                0x308\r
+#define KEY_ENROLLED_PRIVATE_KEY_NAME         0x309\r
 \r
 //\r
 // Hidden Network Configuration Form\r
 //\r
-#define KEY_HIDDEN_NETWORK                        0x401\r
-#define KEY_ADD_HIDDEN_NETWORK                    0x402\r
-#define KEY_REMOVE_HIDDEN_NETWORK                 0x403\r
+#define KEY_HIDDEN_NETWORK         0x401\r
+#define KEY_ADD_HIDDEN_NETWORK     0x402\r
+#define KEY_REMOVE_HIDDEN_NETWORK  0x403\r
 \r
 //\r
 // Dynamic Lists\r
 //\r
-#define MAC_LIST_COUNT_MAX                        255\r
-#define LABEL_MAC_ENTRY                           0x1000\r
-#define KEY_MAC_ENTRY_BASE                        0x1100\r
+#define MAC_LIST_COUNT_MAX  255\r
+#define LABEL_MAC_ENTRY     0x1000\r
+#define KEY_MAC_ENTRY_BASE  0x1100\r
 \r
-#define NETWORK_LIST_COUNT_MAX                    4095\r
-#define LABEL_NETWORK_LIST_ENTRY                  0x2000\r
-#define KEY_AVAILABLE_NETWORK_ENTRY_BASE          0x3000\r
+#define NETWORK_LIST_COUNT_MAX            4095\r
+#define LABEL_NETWORK_LIST_ENTRY          0x2000\r
+#define KEY_AVAILABLE_NETWORK_ENTRY_BASE  0x3000\r
 \r
-#define HIDDEN_NETWORK_LIST_COUNT_MAX             255\r
-#define LABEL_HIDDEN_NETWORK_ENTRY                0x4000\r
-#define KEY_HIDDEN_NETWORK_ENTRY_BASE             0x4100\r
+#define HIDDEN_NETWORK_LIST_COUNT_MAX  255\r
+#define LABEL_HIDDEN_NETWORK_ENTRY     0x4000\r
+#define KEY_HIDDEN_NETWORK_ENTRY_BASE  0x4100\r
 \r
-#define LABEL_END                                 0xffff\r
+#define LABEL_END  0xffff\r
 \r
 //\r
 // Network Security Type\r
 //\r
-#define SECURITY_TYPE_NONE                        0\r
-#define SECURITY_TYPE_WPA_ENTERPRISE              1\r
-#define SECURITY_TYPE_WPA2_ENTERPRISE             2\r
-#define SECURITY_TYPE_WPA_PERSONAL                3\r
-#define SECURITY_TYPE_WPA2_PERSONAL               4\r
-#define SECURITY_TYPE_WEP                         5\r
-#define SECURITY_TYPE_UNKNOWN                     6\r
-#define SECURITY_TYPE_MAX                         7\r
+#define SECURITY_TYPE_NONE             0\r
+#define SECURITY_TYPE_WPA_ENTERPRISE   1\r
+#define SECURITY_TYPE_WPA2_ENTERPRISE  2\r
+#define SECURITY_TYPE_WPA_PERSONAL     3\r
+#define SECURITY_TYPE_WPA2_PERSONAL    4\r
+#define SECURITY_TYPE_WEP              5\r
+#define SECURITY_TYPE_UNKNOWN          6\r
+#define SECURITY_TYPE_MAX              7\r
 \r
-#define EAP_AUTH_METHOD_TTLS                      0\r
-#define EAP_AUTH_METHOD_PEAP                      1\r
-#define EAP_AUTH_METHOD_TLS                       2\r
-#define EAP_AUTH_METHOD_MAX                       3\r
+#define EAP_AUTH_METHOD_TTLS  0\r
+#define EAP_AUTH_METHOD_PEAP  1\r
+#define EAP_AUTH_METHOD_TLS   2\r
+#define EAP_AUTH_METHOD_MAX   3\r
 \r
-#define EAP_SEAUTH_METHOD_MSCHAPV2                0\r
-#define EAP_SEAUTH_METHOD_MAX                     1\r
+#define EAP_SEAUTH_METHOD_MSCHAPV2  0\r
+#define EAP_SEAUTH_METHOD_MAX       1\r
 \r
-#define HIDDEN_NETWORK_LIST_VAR_OFFSET ((UINT16) OFFSET_OF (WIFI_MANAGER_IFR_NVDATA, HiddenNetworkList))\r
+#define HIDDEN_NETWORK_LIST_VAR_OFFSET  ((UINT16) OFFSET_OF (WIFI_MANAGER_IFR_NVDATA, HiddenNetworkList))\r
 \r
 #pragma pack(1)\r
 typedef struct _WIFI_MANAGER_IFR_NVDATA {\r
-\r
-  UINT32      ProfileCount;\r
-  CHAR16      SSId[SSID_STORAGE_SIZE];\r
-  CHAR16      Password[PASSWORD_STORAGE_SIZE];\r
-  CHAR16      PrivateKeyPassword[PASSWORD_STORAGE_SIZE];\r
-  CHAR16      EapIdentity[EAP_IDENTITY_SIZE];\r
-  CHAR16      EapPassword[PASSWORD_STORAGE_SIZE];\r
-  UINT8       SecurityType;\r
-  UINT8       EapAuthMethod;\r
-  UINT8       EapSecondAuthMethod;\r
-  UINT8       HiddenNetworkList[HIDDEN_NETWORK_LIST_COUNT_MAX];\r
-\r
+  UINT32    ProfileCount;\r
+  CHAR16    SSId[SSID_STORAGE_SIZE];\r
+  CHAR16    Password[PASSWORD_STORAGE_SIZE];\r
+  CHAR16    PrivateKeyPassword[PASSWORD_STORAGE_SIZE];\r
+  CHAR16    EapIdentity[EAP_IDENTITY_SIZE];\r
+  CHAR16    EapPassword[PASSWORD_STORAGE_SIZE];\r
+  UINT8     SecurityType;\r
+  UINT8     EapAuthMethod;\r
+  UINT8     EapSecondAuthMethod;\r
+  UINT8     HiddenNetworkList[HIDDEN_NETWORK_LIST_COUNT_MAX];\r
 } WIFI_MANAGER_IFR_NVDATA;\r
 #pragma pack()\r
 \r
index 841ff5258845af3357130d7cd3350f6099206d2f..67a01ca0583f9df60388bdcc90d5860da8ab90fd 100644 (file)
@@ -12,7 +12,7 @@
 ///\r
 /// Driver Binding Protocol instance\r
 ///\r
-EFI_DRIVER_BINDING_PROTOCOL gWifiMgrDxeDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gWifiMgrDxeDriverBinding = {\r
   WifiMgrDxeDriverBindingSupported,\r
   WifiMgrDxeDriverBindingStart,\r
   WifiMgrDxeDriverBindingStop,\r
@@ -22,22 +22,22 @@ EFI_DRIVER_BINDING_PROTOCOL gWifiMgrDxeDriverBinding = {
 };\r
 \r
 //\r
-//The private global data for WiFi Connection Manager\r
+// The private global data for WiFi Connection Manager\r
 //\r
-WIFI_MGR_PRIVATE_DATA    *mPrivate = NULL;\r
+WIFI_MGR_PRIVATE_DATA  *mPrivate = NULL;\r
 \r
 //\r
-//The private guid to identify WiFi Connection Manager\r
+// The private guid to identify WiFi Connection Manager\r
 //\r
-EFI_GUID mEfiWifiMgrPrivateGuid            = EFI_WIFIMGR_PRIVATE_GUID;\r
+EFI_GUID  mEfiWifiMgrPrivateGuid = EFI_WIFIMGR_PRIVATE_GUID;\r
 \r
 //\r
-//The Hii config guids\r
+// The Hii config guids\r
 //\r
-EFI_GUID gWifiConfigFormSetGuid            = WIFI_CONNECTION_MANAGER_CONFIG_GUID;\r
-EFI_GUID mWifiConfigNetworkListRefreshGuid = WIFI_CONFIG_NETWORK_LIST_REFRESH_GUID;\r
-EFI_GUID mWifiConfigConnectFormRefreshGuid = WIFI_CONFIG_CONNECT_FORM_REFRESH_GUID;\r
-EFI_GUID mWifiConfigMainFormRefreshGuid    = WIFI_CONFIG_MAIN_FORM_REFRESH_GUID;\r
+EFI_GUID  gWifiConfigFormSetGuid            = WIFI_CONNECTION_MANAGER_CONFIG_GUID;\r
+EFI_GUID  mWifiConfigNetworkListRefreshGuid = WIFI_CONFIG_NETWORK_LIST_REFRESH_GUID;\r
+EFI_GUID  mWifiConfigConnectFormRefreshGuid = WIFI_CONFIG_CONNECT_FORM_REFRESH_GUID;\r
+EFI_GUID  mWifiConfigMainFormRefreshGuid    = WIFI_CONFIG_MAIN_FORM_REFRESH_GUID;\r
 \r
 /**\r
   Tests to see if this driver supports a given controller. If a child device is provided,\r
@@ -85,12 +85,12 @@ EFI_GUID mWifiConfigMainFormRefreshGuid    = WIFI_CONFIG_MAIN_FORM_REFRESH_GUID;
 EFI_STATUS\r
 EFIAPI\r
 WifiMgrDxeDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
@@ -155,28 +155,28 @@ WifiMgrDxeDriverBindingSupported (
 EFI_STATUS\r
 EFIAPI\r
 WifiMgrDxeDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                                 Status;\r
-  EFI_TPL                                    OldTpl;\r
-  UINTN                                      AddressSize;\r
-  WIFI_MGR_DEVICE_DATA                       *Nic;\r
-  EFI_WIRELESS_MAC_CONNECTION_II_PROTOCOL    *Wmp;\r
-  EFI_SUPPLICANT_PROTOCOL                    *Supplicant;\r
-  EFI_EAP_CONFIGURATION_PROTOCOL             *EapConfig;\r
+  EFI_STATUS                               Status;\r
+  EFI_TPL                                  OldTpl;\r
+  UINTN                                    AddressSize;\r
+  WIFI_MGR_DEVICE_DATA                     *Nic;\r
+  EFI_WIRELESS_MAC_CONNECTION_II_PROTOCOL  *Wmp;\r
+  EFI_SUPPLICANT_PROTOCOL                  *Supplicant;\r
+  EFI_EAP_CONFIGURATION_PROTOCOL           *EapConfig;\r
 \r
   Nic = NULL;\r
 \r
   //\r
-  //Open Protocols\r
+  // Open Protocols\r
   //\r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiWiFi2ProtocolGuid,\r
-                  (VOID**) &Wmp,\r
+                  (VOID **)&Wmp,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -188,7 +188,7 @@ WifiMgrDxeDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiSupplicantProtocolGuid,\r
-                  (VOID**) &Supplicant,\r
+                  (VOID **)&Supplicant,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -200,7 +200,7 @@ WifiMgrDxeDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiEapConfigurationProtocolGuid,\r
-                  (VOID**) &EapConfig,\r
+                  (VOID **)&EapConfig,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -210,26 +210,27 @@ WifiMgrDxeDriverBindingStart (
   }\r
 \r
   //\r
-  //Initialize Nic device data\r
+  // Initialize Nic device data\r
   //\r
   Nic = AllocateZeroPool (sizeof (WIFI_MGR_DEVICE_DATA));\r
   if (Nic == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ERROR1;\r
   }\r
-  Nic->Signature            = WIFI_MGR_DEVICE_DATA_SIGNATURE;\r
-  Nic->DriverHandle         = This->DriverBindingHandle;\r
-  Nic->ControllerHandle     = ControllerHandle;\r
-  Nic->Private              = mPrivate;\r
-  Nic->Wmp                  = Wmp;\r
-  Nic->Supplicant           = Supplicant;\r
-  Nic->EapConfig            = EapConfig;\r
-  Nic->UserSelectedProfile  = NULL;\r
-  Nic->OneTimeScanRequest   = FALSE;\r
-  Nic->ScanTickTime         = WIFI_SCAN_FREQUENCY;  //Initialize the first scan\r
+\r
+  Nic->Signature           = WIFI_MGR_DEVICE_DATA_SIGNATURE;\r
+  Nic->DriverHandle        = This->DriverBindingHandle;\r
+  Nic->ControllerHandle    = ControllerHandle;\r
+  Nic->Private             = mPrivate;\r
+  Nic->Wmp                 = Wmp;\r
+  Nic->Supplicant          = Supplicant;\r
+  Nic->EapConfig           = EapConfig;\r
+  Nic->UserSelectedProfile = NULL;\r
+  Nic->OneTimeScanRequest  = FALSE;\r
+  Nic->ScanTickTime        = WIFI_SCAN_FREQUENCY;   // Initialize the first scan\r
 \r
   if (Nic->Supplicant != NULL) {\r
-    WifiMgrGetSupportedSuites(Nic);\r
+    WifiMgrGetSupportedSuites (Nic);\r
   }\r
 \r
   InitializeListHead (&Nic->ProfileList);\r
@@ -239,7 +240,7 @@ WifiMgrDxeDriverBindingStart (
   //\r
   Status = NetLibGetMacAddress (\r
              ControllerHandle,\r
-             (EFI_MAC_ADDRESS*) &Nic->MacAddress,\r
+             (EFI_MAC_ADDRESS *)&Nic->MacAddress,\r
              &AddressSize\r
              );\r
   if (EFI_ERROR (Status)) {\r
@@ -260,7 +261,7 @@ WifiMgrDxeDriverBindingStart (
     goto ERROR2;\r
   }\r
 \r
-  Status = gBS->SetTimer (Nic->TickTimer, TimerPeriodic, EFI_TIMER_PERIOD_MILLISECONDS(500));\r
+  Status = gBS->SetTimer (Nic->TickTimer, TimerPeriodic, EFI_TIMER_PERIOD_MILLISECONDS (500));\r
   if (EFI_ERROR (Status)) {\r
     goto ERROR3;\r
   }\r
@@ -270,10 +271,11 @@ WifiMgrDxeDriverBindingStart (
 \r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
   InsertTailList (&mPrivate->NicList, &Nic->Link);\r
-  Nic->NicIndex = mPrivate->NicCount ++;\r
+  Nic->NicIndex = mPrivate->NicCount++;\r
   if (mPrivate->CurrentNic == NULL) {\r
     mPrivate->CurrentNic = Nic;\r
   }\r
+\r
   gBS->RestoreTPL (OldTpl);\r
 \r
   Status = gBS->InstallProtocolInterface (\r
@@ -306,13 +308,16 @@ ERROR2:
     if (Nic->SupportedSuites.SupportedAKMSuites != NULL) {\r
       FreePool (Nic->SupportedSuites.SupportedAKMSuites);\r
     }\r
+\r
     if (Nic->SupportedSuites.SupportedSwCipherSuites != NULL) {\r
       FreePool (Nic->SupportedSuites.SupportedSwCipherSuites);\r
     }\r
+\r
     if (Nic->SupportedSuites.SupportedHwCipherSuites != NULL) {\r
       FreePool (Nic->SupportedSuites.SupportedHwCipherSuites);\r
     }\r
   }\r
+\r
   FreePool (Nic);\r
 \r
 ERROR1:\r
@@ -374,21 +379,21 @@ ERROR1:
 EFI_STATUS\r
 EFIAPI\r
 WifiMgrDxeDriverBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     ControllerHandle,\r
-  IN UINTN                          NumberOfChildren,\r
-  IN EFI_HANDLE                     *ChildHandleBuffer OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_TPL                      OldTpl;\r
-  WIFI_MGR_PRIVATE_PROTOCOL    *WifiMgrIdentifier;\r
-  WIFI_MGR_DEVICE_DATA         *Nic;\r
+  EFI_STATUS                 Status;\r
+  EFI_TPL                    OldTpl;\r
+  WIFI_MGR_PRIVATE_PROTOCOL  *WifiMgrIdentifier;\r
+  WIFI_MGR_DEVICE_DATA       *Nic;\r
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &mEfiWifiMgrPrivateGuid,\r
-                  (VOID **) &WifiMgrIdentifier,\r
+                  (VOID **)&WifiMgrIdentifier,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -415,9 +420,11 @@ WifiMgrDxeDriverBindingStop (
     if (Nic->SupportedSuites.SupportedAKMSuites != NULL) {\r
       FreePool (Nic->SupportedSuites.SupportedAKMSuites);\r
     }\r
+\r
     if (Nic->SupportedSuites.SupportedSwCipherSuites != NULL) {\r
       FreePool (Nic->SupportedSuites.SupportedSwCipherSuites);\r
     }\r
+\r
     if (Nic->SupportedSuites.SupportedHwCipherSuites != NULL) {\r
       FreePool (Nic->SupportedSuites.SupportedHwCipherSuites);\r
     }\r
@@ -427,31 +434,31 @@ WifiMgrDxeDriverBindingStop (
   // Close Protocols\r
   //\r
   Status = gBS->UninstallProtocolInterface (\r
-             ControllerHandle,\r
-             &mEfiWifiMgrPrivateGuid,\r
-             &Nic->WifiMgrIdentifier\r
-             );\r
+                  ControllerHandle,\r
+                  &mEfiWifiMgrPrivateGuid,\r
+                  &Nic->WifiMgrIdentifier\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   Status = gBS->CloseProtocol (\r
-             ControllerHandle,\r
-             &gEfiWiFi2ProtocolGuid,\r
-             Nic->DriverHandle,\r
-             Nic->ControllerHandle\r
-             );\r
+                  ControllerHandle,\r
+                  &gEfiWiFi2ProtocolGuid,\r
+                  Nic->DriverHandle,\r
+                  Nic->ControllerHandle\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   if (Nic->Supplicant != NULL) {\r
     Status = gBS->CloseProtocol (\r
-               ControllerHandle,\r
-               &gEfiSupplicantProtocolGuid,\r
-               Nic->DriverHandle,\r
-               Nic->ControllerHandle\r
-               );\r
+                    ControllerHandle,\r
+                    &gEfiSupplicantProtocolGuid,\r
+                    Nic->DriverHandle,\r
+                    Nic->ControllerHandle\r
+                    );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -459,11 +466,11 @@ WifiMgrDxeDriverBindingStop (
 \r
   if (Nic->EapConfig != NULL) {\r
     Status = gBS->CloseProtocol (\r
-               ControllerHandle,\r
-               &gEfiEapConfigurationProtocolGuid,\r
-               Nic->DriverHandle,\r
-               Nic->ControllerHandle\r
-               );\r
+                    ControllerHandle,\r
+                    &gEfiEapConfigurationProtocolGuid,\r
+                    Nic->DriverHandle,\r
+                    Nic->ControllerHandle\r
+                    );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -505,11 +512,11 @@ WifiMgrDxeDriverBindingStop (
 EFI_STATUS\r
 EFIAPI\r
 WifiMgrDxeDriverEntryPoint (\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
+  EFI_STATUS  Status;\r
 \r
   Status = EfiLibInstallDriverBindingComponentName2 (\r
              ImageHandle,\r
@@ -531,16 +538,17 @@ WifiMgrDxeDriverEntryPoint (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ERROR1;\r
   }\r
+\r
   mPrivate->Signature    = WIFI_MGR_PRIVATE_DATA_SIGNATURE;\r
   mPrivate->DriverHandle = ImageHandle;\r
   InitializeListHead (&mPrivate->NicList);\r
-  mPrivate->NicCount = 0;\r
+  mPrivate->NicCount   = 0;\r
   mPrivate->CurrentNic = NULL;\r
   InitializeListHead (&mPrivate->HiddenNetworkList);\r
   mPrivate->HiddenNetworkCount = 0;\r
 \r
   //\r
-  //Create events for page refresh\r
+  // Create events for page refresh\r
   //\r
   Status = gBS->CreateEventEx (\r
                   EVT_NOTIFY_SIGNAL,\r
index 170991253ed5e588b8c7bd5f327139f408378d92..c3c70b2752b67bd144bec0be5cc779650cb483db 100644 (file)
 //\r
 #define WIFI_MGR_DXE_VERSION  0xb\r
 \r
-#define OUI_IEEE_80211I 0xAC0F00\r
+#define OUI_IEEE_80211I  0xAC0F00\r
 \r
 typedef enum {\r
   Ieee80211PairwiseCipherSuiteUseGroupCipherSuite = 0,\r
-  Ieee80211PairwiseCipherSuiteWEP40  = 1,\r
-  Ieee80211PairwiseCipherSuiteTKIP   = 2,\r
-  Ieee80211PairwiseCipherSuiteCCMP   = 4,\r
-  Ieee80211PairwiseCipherSuiteWEP104 = 5,\r
-  Ieee80211PairwiseCipherSuiteBIP    = 6,\r
-  //...\r
+  Ieee80211PairwiseCipherSuiteWEP40               = 1,\r
+  Ieee80211PairwiseCipherSuiteTKIP                = 2,\r
+  Ieee80211PairwiseCipherSuiteCCMP                = 4,\r
+  Ieee80211PairwiseCipherSuiteWEP104              = 5,\r
+  Ieee80211PairwiseCipherSuiteBIP                 = 6,\r
+  // ...\r
 } IEEE_80211_PAIRWISE_CIPHER_SUITE;\r
 \r
-#define IEEE_80211_PAIRWISE_CIPHER_SUITE_USE_GROUP   (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteUseGroupCipherSuite << 24))\r
-#define IEEE_80211_PAIRWISE_CIPHER_SUITE_WEP40       (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteWEP40 << 24))\r
-#define IEEE_80211_PAIRWISE_CIPHER_SUITE_TKIP        (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteTKIP << 24))\r
-#define IEEE_80211_PAIRWISE_CIPHER_SUITE_CCMP        (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteCCMP << 24))\r
-#define IEEE_80211_PAIRWISE_CIPHER_SUITE_WEP104      (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteWEP104 << 24))\r
-#define IEEE_80211_PAIRWISE_CIPHER_SUITE_BIP         (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteBIP << 24))\r
+#define IEEE_80211_PAIRWISE_CIPHER_SUITE_USE_GROUP  (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteUseGroupCipherSuite << 24))\r
+#define IEEE_80211_PAIRWISE_CIPHER_SUITE_WEP40      (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteWEP40 << 24))\r
+#define IEEE_80211_PAIRWISE_CIPHER_SUITE_TKIP       (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteTKIP << 24))\r
+#define IEEE_80211_PAIRWISE_CIPHER_SUITE_CCMP       (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteCCMP << 24))\r
+#define IEEE_80211_PAIRWISE_CIPHER_SUITE_WEP104     (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteWEP104 << 24))\r
+#define IEEE_80211_PAIRWISE_CIPHER_SUITE_BIP        (OUI_IEEE_80211I | (Ieee80211PairwiseCipherSuiteBIP << 24))\r
 \r
 typedef enum {\r
   Ieee80211AkmSuite8021XOrPMKSA       = 1,\r
   Ieee80211AkmSuitePSK                = 2,\r
   Ieee80211AkmSuite8021XOrPMKSASHA256 = 5,\r
   Ieee80211AkmSuitePSKSHA256          = 6\r
-  //...\r
+                                        // ...\r
 } IEEE_80211_AKM_SUITE;\r
 \r
 #define IEEE_80211_AKM_SUITE_8021X_OR_PMKSA         (OUI_IEEE_80211I | (Ieee80211AkmSuite8021XOrPMKSA << 24))\r
@@ -108,10 +108,10 @@ typedef enum {
 //\r
 // Protocol instances\r
 //\r
-extern EFI_DRIVER_BINDING_PROTOCOL       gWifiMgrDxeDriverBinding;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL      gWifiMgrDxeComponentName2;\r
-extern EFI_COMPONENT_NAME_PROTOCOL       gWifiMgrDxeComponentName;\r
-extern EFI_HII_CONFIG_ACCESS_PROTOCOL    gWifiMgrDxeHiiConfigAccess;\r
+extern EFI_DRIVER_BINDING_PROTOCOL     gWifiMgrDxeDriverBinding;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL    gWifiMgrDxeComponentName2;\r
+extern EFI_COMPONENT_NAME_PROTOCOL     gWifiMgrDxeComponentName;\r
+extern EFI_HII_CONFIG_ACCESS_PROTOCOL  gWifiMgrDxeHiiConfigAccess;\r
 \r
 //\r
 // Private Context Data Structure\r
@@ -130,12 +130,12 @@ typedef enum {
   WifiMgrScanStateMaximum\r
 } WIFI_MGR_SCAN_STATE;\r
 \r
-#define  WIFI_SCAN_FREQUENCY    30\r
+#define  WIFI_SCAN_FREQUENCY  30\r
 \r
 typedef struct _WIFI_MGR_SUPPORTED_SUITES {\r
-  EFI_80211_AKM_SUITE_SELECTOR     *SupportedAKMSuites;\r
-  EFI_80211_CIPHER_SUITE_SELECTOR  *SupportedSwCipherSuites;\r
-  EFI_80211_CIPHER_SUITE_SELECTOR  *SupportedHwCipherSuites;\r
+  EFI_80211_AKM_SUITE_SELECTOR       *SupportedAKMSuites;\r
+  EFI_80211_CIPHER_SUITE_SELECTOR    *SupportedSwCipherSuites;\r
+  EFI_80211_CIPHER_SUITE_SELECTOR    *SupportedHwCipherSuites;\r
 } WIFI_MGR_SUPPORTED_SUITES;\r
 \r
 #define EFI_WIFIMGR_PRIVATE_GUID \\r
@@ -143,15 +143,15 @@ typedef struct _WIFI_MGR_SUPPORTED_SUITES {
     0x99b7c019, 0x4789, 0x4829, { 0xa7, 0xbd, 0x0d, 0x4b, 0xaa, 0x62, 0x28, 0x72 } \\r
   }\r
 \r
-typedef struct _WIFI_MGR_PRIVATE_DATA  WIFI_MGR_PRIVATE_DATA;\r
+typedef struct _WIFI_MGR_PRIVATE_DATA WIFI_MGR_PRIVATE_DATA;\r
 \r
 typedef struct _WIFI_MGR_PRIVATE_PROTOCOL {\r
-  UINT32  Reserved;\r
+  UINT32    Reserved;\r
 } WIFI_MGR_PRIVATE_PROTOCOL;\r
 \r
 typedef struct _WIFI_MGR_FILE_CONTEXT {\r
-  EFI_FILE_HANDLE                   FHandle;\r
-  UINT16                            *FileName;\r
+  EFI_FILE_HANDLE    FHandle;\r
+  UINT16             *FileName;\r
 } WIFI_MGR_FILE_CONTEXT;\r
 \r
 typedef enum {\r
@@ -177,43 +177,43 @@ typedef struct {
   //\r
   // Produced protocols\r
   //\r
-  WIFI_MGR_PRIVATE_PROTOCOL                   WifiMgrIdentifier;\r
+  WIFI_MGR_PRIVATE_PROTOCOL                  WifiMgrIdentifier;\r
 \r
   //\r
   // Private functions and data fields\r
   //\r
-  LIST_ENTRY                                  Link;  // Link to the NicList in global private data structure.\r
-  UINT32                                      NicIndex;\r
-  EFI_80211_MAC_ADDRESS                       MacAddress;\r
-  WIFI_MGR_SUPPORTED_SUITES                   SupportedSuites;\r
-  EFI_ADAPTER_INFO_MEDIA_STATE                LastLinkState;\r
+  LIST_ENTRY                                 Link;   // Link to the NicList in global private data structure.\r
+  UINT32                                     NicIndex;\r
+  EFI_80211_MAC_ADDRESS                      MacAddress;\r
+  WIFI_MGR_SUPPORTED_SUITES                  SupportedSuites;\r
+  EFI_ADAPTER_INFO_MEDIA_STATE               LastLinkState;\r
 \r
   //\r
   // The network is currently connected, connecting or disconnecting.\r
   // Only one network can be operated at one time.\r
   //\r
-  WIFI_MGR_NETWORK_PROFILE                    *CurrentOperateNetwork;\r
-  WIFI_MGR_NETWORK_PROFILE                    *ConnectPendingNetwork;\r
-  BOOLEAN                                     HasDisconnectPendingNetwork;\r
+  WIFI_MGR_NETWORK_PROFILE                   *CurrentOperateNetwork;\r
+  WIFI_MGR_NETWORK_PROFILE                   *ConnectPendingNetwork;\r
+  BOOLEAN                                    HasDisconnectPendingNetwork;\r
 \r
   //\r
-  //Profile related data fields\r
+  // Profile related data fields\r
   //\r
-  LIST_ENTRY                                  ProfileList; // List of WIFI_MGR_NETWORK_PROFILE\r
-  UINT32                                      AvailableCount;\r
-  UINT32                                      MaxProfileIndex;\r
-  WIFI_MGR_NETWORK_PROFILE                    *UserSelectedProfile;\r
+  LIST_ENTRY                                 ProfileList;  // List of WIFI_MGR_NETWORK_PROFILE\r
+  UINT32                                     AvailableCount;\r
+  UINT32                                     MaxProfileIndex;\r
+  WIFI_MGR_NETWORK_PROFILE                   *UserSelectedProfile;\r
 \r
   //\r
   // Data fields for Hii functionlity\r
   //\r
-  BOOLEAN                                     OneTimeScanRequest;\r
-  BOOLEAN                                     OneTimeConnectRequest;\r
-  BOOLEAN                                     OneTimeDisconnectRequest;\r
-  WIFI_MGR_SCAN_STATE                         ScanState;\r
-  UINTN                                       ScanTickTime;\r
-  WIFI_MGR_CONNECT_STATE                      ConnectState;\r
-  BOOLEAN                                     ConnectStateChanged;\r
+  BOOLEAN                                    OneTimeScanRequest;\r
+  BOOLEAN                                    OneTimeConnectRequest;\r
+  BOOLEAN                                    OneTimeDisconnectRequest;\r
+  WIFI_MGR_SCAN_STATE                        ScanState;\r
+  UINTN                                      ScanTickTime;\r
+  WIFI_MGR_CONNECT_STATE                     ConnectState;\r
+  BOOLEAN                                    ConnectStateChanged;\r
 } WIFI_MGR_DEVICE_DATA;\r
 \r
 #define WIFI_MGR_DEVICE_DATA_SIGNATURE  SIGNATURE_32 ('W','M','D','D')\r
@@ -227,9 +227,9 @@ typedef struct {
     )\r
 \r
 typedef struct {\r
-  UINT32                                     Signature;\r
-  LIST_ENTRY                                 Link;\r
-  CHAR16                                     SSId[SSID_STORAGE_SIZE];\r
+  UINT32        Signature;\r
+  LIST_ENTRY    Link;\r
+  CHAR16        SSId[SSID_STORAGE_SIZE];\r
 } WIFI_HIDDEN_NETWORK_DATA;\r
 \r
 #define WIFI_MGR_HIDDEN_NETWORK_SIGNATURE  SIGNATURE_32 ('W','M','H','N')\r
@@ -246,7 +246,6 @@ typedef struct {
 // Global private data struct\r
 //\r
 struct _WIFI_MGR_PRIVATE_DATA {\r
-\r
   UINT32                            Signature;\r
   EFI_HANDLE                        DriverHandle;\r
   EFI_HII_HANDLE                    RegisteredHandle;\r
@@ -264,7 +263,7 @@ struct _WIFI_MGR_PRIVATE_DATA {
   EFI_EVENT                         MainPageRefreshEvent;           // Event to refresh the main page\r
 \r
   //\r
-  //User Input Record\r
+  // User Input Record\r
   //\r
   UINT8                             SecurityType;\r
   UINT8                             EapAuthMethod;\r
@@ -287,7 +286,7 @@ struct _WIFI_MGR_PRIVATE_DATA {
     ConfigAccess, \\r
     WIFI_MGR_PRIVATE_DATA_SIGNATURE \\r
     )\r
-extern    WIFI_MGR_PRIVATE_DATA    *mPrivate;\r
+extern    WIFI_MGR_PRIVATE_DATA  *mPrivate;\r
 \r
 typedef enum {\r
   TokenTypeGetNetworksToken,\r
@@ -297,15 +296,15 @@ typedef enum {
 } WIFI_MGR_MAC_CONFIG_TOKEN_TYPE;\r
 \r
 typedef union {\r
-  EFI_80211_GET_NETWORKS_TOKEN         *GetNetworksToken;\r
-  EFI_80211_CONNECT_NETWORK_TOKEN      *ConnectNetworkToken;\r
-  EFI_80211_DISCONNECT_NETWORK_TOKEN   *DisconnectNetworkToken;\r
+  EFI_80211_GET_NETWORKS_TOKEN          *GetNetworksToken;\r
+  EFI_80211_CONNECT_NETWORK_TOKEN       *ConnectNetworkToken;\r
+  EFI_80211_DISCONNECT_NETWORK_TOKEN    *DisconnectNetworkToken;\r
 } MAC_CONNECTION2_ADAPTER_TOKEN;\r
 \r
 typedef struct {\r
-  WIFI_MGR_DEVICE_DATA            *Nic;\r
-  WIFI_MGR_MAC_CONFIG_TOKEN_TYPE  Type;\r
-  MAC_CONNECTION2_ADAPTER_TOKEN   Token;\r
+  WIFI_MGR_DEVICE_DATA              *Nic;\r
+  WIFI_MGR_MAC_CONFIG_TOKEN_TYPE    Type;\r
+  MAC_CONNECTION2_ADAPTER_TOKEN     Token;\r
 } WIFI_MGR_MAC_CONFIG_TOKEN;\r
 \r
 //\r
index c0e0de1b86c52d092b6db311ea270d5c330937f2..82ef92dd1c81620053ce230f19de0222e8fdea0e 100644 (file)
@@ -9,7 +9,7 @@
 \r
 #include "WifiConnectionMgrFileUtil.h"\r
 \r
-CHAR16*  mDerPemEncodedSuffix[] = {\r
+CHAR16  *mDerPemEncodedSuffix[] = {\r
   L".cer",\r
   L".der",\r
   L".crt",\r
@@ -28,15 +28,17 @@ CHAR16*  mDerPemEncodedSuffix[] = {
 **/\r
 BOOLEAN\r
 IsDerPemEncodeCertificate (\r
-  IN CONST CHAR16         *FileSuffix\r
-)\r
+  IN CONST CHAR16  *FileSuffix\r
+  )\r
 {\r
-  UINTN     Index;\r
+  UINTN  Index;\r
+\r
   for (Index = 0; mDerPemEncodedSuffix[Index] != NULL; Index++) {\r
     if (StrCmp (FileSuffix, mDerPemEncodedSuffix[Index]) == 0) {\r
       return TRUE;\r
     }\r
   }\r
+\r
   return FALSE;\r
 }\r
 \r
@@ -58,16 +60,16 @@ IsDerPemEncodeCertificate (
 **/\r
 EFI_STATUS\r
 ReadFileContent (\r
-  IN      EFI_FILE_HANDLE           FileHandle,\r
-  IN OUT  VOID                      **BufferPtr,\r
-     OUT  UINTN                     *FileSize,\r
-  IN      UINTN                     AddtionAllocateSize\r
+  IN      EFI_FILE_HANDLE  FileHandle,\r
+  IN OUT  VOID             **BufferPtr,\r
+  OUT  UINTN               *FileSize,\r
+  IN      UINTN            AddtionAllocateSize\r
   )\r
 {\r
-  UINTN      BufferSize;\r
-  UINT64     SourceFileSize;\r
-  VOID       *Buffer;\r
-  EFI_STATUS Status;\r
+  UINTN       BufferSize;\r
+  UINT64      SourceFileSize;\r
+  VOID        *Buffer;\r
+  EFI_STATUS  Status;\r
 \r
   if ((FileHandle == NULL) || (FileSize == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -78,7 +80,7 @@ ReadFileContent (
   //\r
   // Get the file size\r
   //\r
-  Status = FileHandle->SetPosition (FileHandle, (UINT64) -1);\r
+  Status = FileHandle->SetPosition (FileHandle, (UINT64)-1);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
@@ -93,20 +95,20 @@ ReadFileContent (
     goto ON_EXIT;\r
   }\r
 \r
-  BufferSize = (UINTN) SourceFileSize + AddtionAllocateSize;\r
-  Buffer =  AllocateZeroPool(BufferSize);\r
+  BufferSize = (UINTN)SourceFileSize + AddtionAllocateSize;\r
+  Buffer     =  AllocateZeroPool (BufferSize);\r
   if (Buffer == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  BufferSize = (UINTN) SourceFileSize;\r
+  BufferSize = (UINTN)SourceFileSize;\r
   *FileSize  = BufferSize;\r
 \r
   Status = FileHandle->Read (FileHandle, &BufferSize, Buffer);\r
-  if (EFI_ERROR (Status) || BufferSize != *FileSize) {\r
+  if (EFI_ERROR (Status) || (BufferSize != *FileSize)) {\r
     FreePool (Buffer);\r
     Buffer = NULL;\r
-    Status  = EFI_BAD_BUFFER_SIZE;\r
+    Status = EFI_BAD_BUFFER_SIZE;\r
     goto ON_EXIT;\r
   }\r
 \r
@@ -127,7 +129,7 @@ ON_EXIT:
 CHAR16 *\r
 EFIAPI\r
 DevicePathToStr (\r
-  IN EFI_DEVICE_PATH_PROTOCOL     *DevPath\r
+  IN EFI_DEVICE_PATH_PROTOCOL  *DevPath\r
   )\r
 {\r
   return ConvertDevicePathToText (\r
@@ -150,37 +152,38 @@ DevicePathToStr (
 **/\r
 CHAR16 *\r
 ExtractFileNameFromDevicePath (\r
-  IN   EFI_DEVICE_PATH_PROTOCOL    *DevicePath\r
+  IN   EFI_DEVICE_PATH_PROTOCOL  *DevicePath\r
   )\r
 {\r
-  CHAR16          *String;\r
-  CHAR16          *MatchString;\r
-  CHAR16          *LastMatch;\r
-  CHAR16          *FileName;\r
-  UINTN           Length;\r
+  CHAR16  *String;\r
+  CHAR16  *MatchString;\r
+  CHAR16  *LastMatch;\r
+  CHAR16  *FileName;\r
+  UINTN   Length;\r
 \r
-  ASSERT(DevicePath != NULL);\r
+  ASSERT (DevicePath != NULL);\r
 \r
-  String = DevicePathToStr(DevicePath);\r
+  String = DevicePathToStr (DevicePath);\r
   if (String == NULL) {\r
     return NULL;\r
   }\r
+\r
   MatchString = String;\r
   LastMatch   = String;\r
   FileName    = NULL;\r
 \r
-  while(MatchString != NULL){\r
+  while (MatchString != NULL) {\r
     LastMatch   = MatchString + 1;\r
-    MatchString = StrStr(LastMatch,L"\\");\r
+    MatchString = StrStr (LastMatch, L"\\");\r
   }\r
 \r
-  Length = StrLen(LastMatch);\r
-  FileName = AllocateCopyPool ((Length + 1) * sizeof(CHAR16), LastMatch);\r
+  Length   = StrLen (LastMatch);\r
+  FileName = AllocateCopyPool ((Length + 1) * sizeof (CHAR16), LastMatch);\r
   if (FileName != NULL) {\r
     *(FileName + Length) = 0;\r
   }\r
 \r
-  FreePool(String);\r
+  FreePool (String);\r
 \r
   return FileName;\r
 }\r
@@ -197,20 +200,21 @@ ExtractFileNameFromDevicePath (
 \r
 **/\r
 BOOLEAN\r
-UpdatePage(\r
-  IN  WIFI_MGR_PRIVATE_DATA       *Private,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL    *FilePath,\r
-  IN  EFI_FORM_ID                 FormId\r
+UpdatePage (\r
+  IN  WIFI_MGR_PRIVATE_DATA     *Private,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL  *FilePath,\r
+  IN  EFI_FORM_ID               FormId\r
   )\r
 {\r
-  CHAR16           *FileName;\r
-  EFI_STATUS       Status;\r
+  CHAR16      *FileName;\r
+  EFI_STATUS  Status;\r
 \r
   FileName = NULL;\r
 \r
   if (FilePath != NULL) {\r
-    FileName = ExtractFileNameFromDevicePath(FilePath);\r
+    FileName = ExtractFileNameFromDevicePath (FilePath);\r
   }\r
+\r
   if (FileName == NULL) {\r
     //\r
     // FileName = NULL has two cases:\r
@@ -227,6 +231,7 @@ UpdatePage(
   if (Private->FileContext->FHandle != NULL) {\r
     Private->FileContext->FHandle->Close (Private->FileContext->FHandle);\r
   }\r
+\r
   Private->FileContext->FHandle = NULL;\r
 \r
   Status = EfiOpenFileByDevicePath (\r
@@ -237,26 +242,42 @@ UpdatePage(
              );\r
   if (EFI_ERROR (Status)) {\r
     if (FormId == FORMID_ENROLL_CERT) {\r
-      HiiSetString (Private->RegisteredHandle,\r
-        STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME), L"", NULL);\r
-    } else if (FormId == FORMID_ENROLL_PRIVATE_KEY){\r
-      HiiSetString (Private->RegisteredHandle,\r
-        STRING_TOKEN (STR_EAP_ENROLLED_PRIVATE_KEY_NAME), L"", NULL);\r
+      HiiSetString (\r
+        Private->RegisteredHandle,\r
+        STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME),\r
+        L"",\r
+        NULL\r
+        );\r
+    } else if (FormId == FORMID_ENROLL_PRIVATE_KEY) {\r
+      HiiSetString (\r
+        Private->RegisteredHandle,\r
+        STRING_TOKEN (STR_EAP_ENROLLED_PRIVATE_KEY_NAME),\r
+        L"",\r
+        NULL\r
+        );\r
     }\r
   } else {\r
-\r
     if (Private->FileContext->FileName != NULL) {\r
       FreePool (Private->FileContext->FileName);\r
       Private->FileContext->FileName = NULL;\r
     }\r
+\r
     Private->FileContext->FileName = FileName;\r
 \r
     if (FormId == FORMID_ENROLL_CERT) {\r
-      HiiSetString (Private->RegisteredHandle,\r
-        STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME), FileName, NULL);\r
-    } else if (FormId == FORMID_ENROLL_PRIVATE_KEY){\r
-      HiiSetString (Private->RegisteredHandle,\r
-        STRING_TOKEN (STR_EAP_ENROLLED_PRIVATE_KEY_NAME), FileName, NULL);\r
+      HiiSetString (\r
+        Private->RegisteredHandle,\r
+        STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME),\r
+        FileName,\r
+        NULL\r
+        );\r
+    } else if (FormId == FORMID_ENROLL_PRIVATE_KEY) {\r
+      HiiSetString (\r
+        Private->RegisteredHandle,\r
+        STRING_TOKEN (STR_EAP_ENROLLED_PRIVATE_KEY_NAME),\r
+        FileName,\r
+        NULL\r
+        );\r
     }\r
   }\r
 \r
@@ -275,11 +296,11 @@ UpdatePage(
 **/\r
 BOOLEAN\r
 UpdateCAFromFile (\r
-  IN  WIFI_MGR_PRIVATE_DATA       *Private,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL    *FilePath\r
+  IN  WIFI_MGR_PRIVATE_DATA     *Private,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL  *FilePath\r
   )\r
 {\r
-  return UpdatePage(Private, FilePath, FORMID_ENROLL_CERT);\r
+  return UpdatePage (Private, FilePath, FORMID_ENROLL_CERT);\r
 }\r
 \r
 /**\r
@@ -294,10 +315,9 @@ UpdateCAFromFile (
 **/\r
 BOOLEAN\r
 UpdatePrivateKeyFromFile (\r
-  IN  WIFI_MGR_PRIVATE_DATA       *Private,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL    *FilePath\r
+  IN  WIFI_MGR_PRIVATE_DATA     *Private,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL  *FilePath\r
   )\r
 {\r
-  return UpdatePage(Private, FilePath, FORMID_ENROLL_PRIVATE_KEY);\r
+  return UpdatePage (Private, FilePath, FORMID_ENROLL_PRIVATE_KEY);\r
 }\r
-\r
index 9d9e909d68972aabb053d3db115f3efae198371e..a5ac239fdfbc23a376fb8a3ecfa099430ef40f9f 100644 (file)
 **/\r
 EFI_STATUS\r
 ReadFileContent (\r
-  IN      EFI_FILE_HANDLE           FileHandle,\r
-  IN OUT  VOID                      **BufferPtr,\r
-     OUT  UINTN                     *FileSize,\r
-  IN      UINTN                     AddtionAllocateSize\r
+  IN      EFI_FILE_HANDLE  FileHandle,\r
+  IN OUT  VOID             **BufferPtr,\r
+  OUT  UINTN               *FileSize,\r
+  IN      UINTN            AddtionAllocateSize\r
   );\r
 \r
 /**\r
@@ -48,8 +48,8 @@ ReadFileContent (
 **/\r
 BOOLEAN\r
 UpdateCAFromFile (\r
-  IN  WIFI_MGR_PRIVATE_DATA           *Private,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL        *FilePath\r
+  IN  WIFI_MGR_PRIVATE_DATA     *Private,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL  *FilePath\r
   );\r
 \r
 /**\r
@@ -64,8 +64,8 @@ UpdateCAFromFile (
 **/\r
 BOOLEAN\r
 UpdatePrivateKeyFromFile (\r
-  IN  WIFI_MGR_PRIVATE_DATA           *Private,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL        *FilePath\r
+  IN  WIFI_MGR_PRIVATE_DATA     *Private,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL  *FilePath\r
   );\r
 \r
 #endif\r
index 881592efd977bdd0ccc163f27646cc4e7904814b..b49825bcb7b11f4c799ec0cbfff36bdd5e5c1ee3 100644 (file)
@@ -17,8 +17,8 @@ HII_VENDOR_DEVICE_PATH  mWifiMgrDxeHiiVendorDevicePath = {
       HARDWARE_DEVICE_PATH,\r
       HW_VENDOR_DP,\r
       {\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     WIFI_CONNECTION_MANAGER_CONFIG_GUID\r
@@ -27,8 +27,8 @@ HII_VENDOR_DEVICE_PATH  mWifiMgrDxeHiiVendorDevicePath = {
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
     {\r
-      (UINT8) (END_DEVICE_PATH_LENGTH),\r
-      (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
+      (UINT8)(END_DEVICE_PATH_LENGTH),\r
+      (UINT8)((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r
   }\r
 };\r
@@ -37,13 +37,13 @@ HII_VENDOR_DEVICE_PATH  mWifiMgrDxeHiiVendorDevicePath = {
 // HII Config Access Protocol instance\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
-EFI_HII_CONFIG_ACCESS_PROTOCOL gWifiMgrDxeHiiConfigAccess = {\r
+EFI_HII_CONFIG_ACCESS_PROTOCOL  gWifiMgrDxeHiiConfigAccess = {\r
   WifiMgrDxeHiiConfigAccessExtractConfig,\r
   WifiMgrDxeHiiConfigAccessRouteConfig,\r
   WifiMgrDxeHiiConfigAccessCallback\r
 };\r
 \r
-CHAR16*   mSecurityType[] = {\r
+CHAR16  *mSecurityType[] = {\r
   L"OPEN           ",\r
   L"WPA-Enterprise ",\r
   L"WPA2-Enterprise",\r
@@ -53,7 +53,7 @@ CHAR16*   mSecurityType[] = {
   L"UnKnown        "\r
 };\r
 \r
-CHAR16*  mSignalStrengthBar[] = {\r
+CHAR16  *mSignalStrengthBar[] = {\r
   L"[-----]",\r
   L"[*----]",\r
   L"[**---]",\r
@@ -67,7 +67,7 @@ CHAR16*  mSignalStrengthBar[] = {
 #define  NET_LIST_FOR_EACH_FROM_NODE(Entry, Node, ListHead) \\r
   for(Entry = Node->ForwardLink; Entry != (ListHead); Entry = Entry->ForwardLink)\r
 \r
-extern EFI_GUID    gWifiConfigFormSetGuid;\r
+extern EFI_GUID  gWifiConfigFormSetGuid;\r
 \r
 /**\r
   Create Hii Extend Label OpCode as the start opcode and end opcode.\r
@@ -86,16 +86,16 @@ extern EFI_GUID    gWifiConfigFormSetGuid;
 **/\r
 EFI_STATUS\r
 WifiMgrCreateOpCode (\r
-  IN  UINT16    StartLabelNumber,\r
-  OUT VOID      **StartOpCodeHandle,\r
-  OUT VOID      **EndOpCodeHandle\r
+  IN  UINT16  StartLabelNumber,\r
+  OUT VOID    **StartOpCodeHandle,\r
+  OUT VOID    **EndOpCodeHandle\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
-  EFI_IFR_GUID_LABEL    *InternalStartLabel;\r
-  EFI_IFR_GUID_LABEL    *InternalEndLabel;\r
+  EFI_STATUS          Status;\r
+  EFI_IFR_GUID_LABEL  *InternalStartLabel;\r
+  EFI_IFR_GUID_LABEL  *InternalEndLabel;\r
 \r
-  if (StartOpCodeHandle == NULL || EndOpCodeHandle == NULL) {\r
+  if ((StartOpCodeHandle == NULL) || (EndOpCodeHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -110,6 +110,7 @@ WifiMgrCreateOpCode (
   if (*StartOpCodeHandle == NULL) {\r
     goto Exit;\r
   }\r
+\r
   *EndOpCodeHandle = HiiAllocateOpCodeHandle ();\r
   if (*EndOpCodeHandle == NULL) {\r
     goto Exit;\r
@@ -118,30 +119,32 @@ WifiMgrCreateOpCode (
   //\r
   // Create Hii Extend Label OpCode as the start opcode.\r
   //\r
-  InternalStartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                                *StartOpCodeHandle,\r
-                                                &gEfiIfrTianoGuid,\r
-                                                NULL,\r
-                                                sizeof (EFI_IFR_GUID_LABEL)\r
-                                                );\r
+  InternalStartLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                               *StartOpCodeHandle,\r
+                                               &gEfiIfrTianoGuid,\r
+                                               NULL,\r
+                                               sizeof (EFI_IFR_GUID_LABEL)\r
+                                               );\r
   if (InternalStartLabel == NULL) {\r
     goto Exit;\r
   }\r
+\r
   InternalStartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
   InternalStartLabel->Number       = StartLabelNumber;\r
 \r
   //\r
   // Create Hii Extend Label OpCode as the end opcode.\r
   //\r
-  InternalEndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                              *EndOpCodeHandle,\r
-                                              &gEfiIfrTianoGuid,\r
-                                              NULL,\r
-                                              sizeof (EFI_IFR_GUID_LABEL)\r
-                                              );\r
+  InternalEndLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                             *EndOpCodeHandle,\r
+                                             &gEfiIfrTianoGuid,\r
+                                             NULL,\r
+                                             sizeof (EFI_IFR_GUID_LABEL)\r
+                                             );\r
   if (InternalEndLabel == NULL) {\r
     goto Exit;\r
   }\r
+\r
   InternalEndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
   InternalEndLabel->Number       = LABEL_END;\r
 \r
@@ -152,9 +155,11 @@ Exit:
   if (*StartOpCodeHandle != NULL) {\r
     HiiFreeOpCodeHandle (*StartOpCodeHandle);\r
   }\r
+\r
   if (*EndOpCodeHandle != NULL) {\r
     HiiFreeOpCodeHandle (*EndOpCodeHandle);\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -169,18 +174,18 @@ Exit:
 **/\r
 EFI_STATUS\r
 WifiMgrShowNicList (\r
-  IN  WIFI_MGR_PRIVATE_DATA    *Private\r
-)\r
+  IN  WIFI_MGR_PRIVATE_DATA  *Private\r
+  )\r
 {\r
-  EFI_STATUS              Status;\r
-  CHAR16                  MacString[WIFI_MGR_MAX_MAC_STRING_LEN];\r
-  CHAR16                  PortString[WIFI_STR_MAX_SIZE];\r
-  EFI_STRING_ID           PortTitleToken;\r
-  EFI_STRING_ID           PortTitleHelpToken;\r
-  WIFI_MGR_DEVICE_DATA    *Nic;\r
-  LIST_ENTRY              *Entry;\r
-  VOID                    *StartOpCodeHandle;\r
-  VOID                    *EndOpCodeHandle;\r
+  EFI_STATUS            Status;\r
+  CHAR16                MacString[WIFI_MGR_MAX_MAC_STRING_LEN];\r
+  CHAR16                PortString[WIFI_STR_MAX_SIZE];\r
+  EFI_STRING_ID         PortTitleToken;\r
+  EFI_STRING_ID         PortTitleHelpToken;\r
+  WIFI_MGR_DEVICE_DATA  *Nic;\r
+  LIST_ENTRY            *Entry;\r
+  VOID                  *StartOpCodeHandle;\r
+  VOID                  *EndOpCodeHandle;\r
 \r
   if (Private == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -228,7 +233,7 @@ WifiMgrShowNicList (
       PortTitleToken,\r
       PortTitleHelpToken,\r
       EFI_IFR_FLAG_CALLBACK,\r
-      (UINT16) (KEY_MAC_ENTRY_BASE + Nic->NicIndex)\r
+      (UINT16)(KEY_MAC_ENTRY_BASE + Nic->NicIndex)\r
       );\r
   }\r
 \r
@@ -256,29 +261,28 @@ Exit:
   @return the unicode string of AKM suite list or "None".\r
 \r
 **/\r
-CHAR16*\r
+CHAR16 *\r
 WifiMgrGetStrAKMList (\r
-  IN  WIFI_MGR_NETWORK_PROFILE         *Profile\r
-)\r
+  IN  WIFI_MGR_NETWORK_PROFILE  *Profile\r
+  )\r
 {\r
-  UINT8     Index;\r
-  UINT16    AKMSuiteCount;\r
-  CHAR16    *AKMListDisplay;\r
+  UINT8   Index;\r
+  UINT16  AKMSuiteCount;\r
+  CHAR16  *AKMListDisplay;\r
 \r
   AKMListDisplay = NULL;\r
-  if (Profile == NULL || Profile->Network.AKMSuite == NULL) {\r
+  if ((Profile == NULL) || (Profile->Network.AKMSuite == NULL)) {\r
     goto Exit;\r
   }\r
 \r
   AKMSuiteCount = Profile->Network.AKMSuite->AKMSuiteCount;\r
   if (AKMSuiteCount != 0) {\r
-\r
     //\r
     // Current AKM Suite is between 1-9\r
     //\r
-    AKMListDisplay = (CHAR16 *) AllocateZeroPool(sizeof (CHAR16) * AKMSuiteCount * 2);\r
+    AKMListDisplay = (CHAR16 *)AllocateZeroPool (sizeof (CHAR16) * AKMSuiteCount * 2);\r
     if (AKMListDisplay != NULL) {\r
-      for (Index = 0; Index < AKMSuiteCount; Index ++) {\r
+      for (Index = 0; Index < AKMSuiteCount; Index++) {\r
         UnicodeSPrint (\r
           AKMListDisplay + (Index * 2),\r
           sizeof (CHAR16) * 2,\r
@@ -297,6 +301,7 @@ Exit:
   if (AKMListDisplay == NULL) {\r
     AKMListDisplay = AllocateCopyPool (sizeof (L"None"), L"None");\r
   }\r
+\r
   return AKMListDisplay;\r
 }\r
 \r
@@ -309,29 +314,28 @@ Exit:
   @return the unicode string of Cipher suite list or "None".\r
 \r
 **/\r
-CHAR16*\r
+CHAR16 *\r
 WifiMgrGetStrCipherList (\r
-  IN  WIFI_MGR_NETWORK_PROFILE          *Profile\r
-)\r
+  IN  WIFI_MGR_NETWORK_PROFILE  *Profile\r
+  )\r
 {\r
-  UINT8     Index;\r
-  UINT16    CipherSuiteCount;\r
-  CHAR16    *CipherListDisplay;\r
+  UINT8   Index;\r
+  UINT16  CipherSuiteCount;\r
+  CHAR16  *CipherListDisplay;\r
 \r
   CipherListDisplay = NULL;\r
-  if (Profile == NULL || Profile->Network.CipherSuite == NULL) {\r
+  if ((Profile == NULL) || (Profile->Network.CipherSuite == NULL)) {\r
     goto Exit;\r
   }\r
 \r
-  CipherSuiteCount   = Profile->Network.CipherSuite->CipherSuiteCount;\r
+  CipherSuiteCount = Profile->Network.CipherSuite->CipherSuiteCount;\r
   if (CipherSuiteCount != 0) {\r
-\r
     //\r
     // Current Cipher Suite is between 1-9\r
     //\r
-    CipherListDisplay = (CHAR16 *) AllocateZeroPool(sizeof (CHAR16) * CipherSuiteCount * 2);\r
+    CipherListDisplay = (CHAR16 *)AllocateZeroPool (sizeof (CHAR16) * CipherSuiteCount * 2);\r
     if (CipherListDisplay != NULL) {\r
-      for (Index = 0; Index < CipherSuiteCount; Index ++) {\r
+      for (Index = 0; Index < CipherSuiteCount; Index++) {\r
         UnicodeSPrint (\r
           CipherListDisplay + (Index * 2),\r
           sizeof (CHAR16) * 2,\r
@@ -350,6 +354,7 @@ Exit:
   if (CipherListDisplay == NULL) {\r
     CipherListDisplay = AllocateCopyPool (sizeof (L"None"), L"None");\r
   }\r
+\r
   return CipherListDisplay;\r
 }\r
 \r
@@ -367,25 +372,25 @@ Exit:
 **/\r
 EFI_STATUS\r
 WifiMgrRefreshNetworkList (\r
-  IN    WIFI_MGR_PRIVATE_DATA      *Private,\r
-  OUT   WIFI_MANAGER_IFR_NVDATA    *IfrNvData\r
+  IN    WIFI_MGR_PRIVATE_DATA    *Private,\r
+  OUT   WIFI_MANAGER_IFR_NVDATA  *IfrNvData\r
   )\r
 {\r
-  EFI_STATUS                         Status;\r
-  EFI_TPL                            OldTpl;\r
-  UINT32                             AvailableCount;\r
-  EFI_STRING_ID                      PortPromptToken;\r
-  EFI_STRING_ID                      PortTextToken;\r
-  EFI_STRING_ID                      PortHelpToken;\r
-  WIFI_MGR_NETWORK_PROFILE           *Profile;\r
-  LIST_ENTRY                         *Entry;\r
-  VOID                               *StartOpCodeHandle;\r
-  VOID                               *EndOpCodeHandle;\r
-  CHAR16                             *AKMListDisplay;\r
-  CHAR16                             *CipherListDisplay;\r
-  CHAR16                             PortString[WIFI_STR_MAX_SIZE];\r
-  UINTN                              PortStringSize;\r
-  WIFI_MGR_NETWORK_PROFILE           *ConnectedProfile;\r
+  EFI_STATUS                Status;\r
+  EFI_TPL                   OldTpl;\r
+  UINT32                    AvailableCount;\r
+  EFI_STRING_ID             PortPromptToken;\r
+  EFI_STRING_ID             PortTextToken;\r
+  EFI_STRING_ID             PortHelpToken;\r
+  WIFI_MGR_NETWORK_PROFILE  *Profile;\r
+  LIST_ENTRY                *Entry;\r
+  VOID                      *StartOpCodeHandle;\r
+  VOID                      *EndOpCodeHandle;\r
+  CHAR16                    *AKMListDisplay;\r
+  CHAR16                    *CipherListDisplay;\r
+  CHAR16                    PortString[WIFI_STR_MAX_SIZE];\r
+  UINTN                     PortStringSize;\r
+  WIFI_MGR_NETWORK_PROFILE  *ConnectedProfile;\r
 \r
   if (Private->CurrentNic == NULL) {\r
     return EFI_SUCCESS;\r
@@ -400,7 +405,7 @@ WifiMgrRefreshNetworkList (
     return Status;\r
   }\r
 \r
-  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
+  OldTpl            = gBS->RaiseTPL (TPL_CALLBACK);\r
   AvailableCount    = 0;\r
   PortStringSize    = sizeof (PortString);\r
   ConnectedProfile  = NULL;\r
@@ -408,23 +413,23 @@ WifiMgrRefreshNetworkList (
   CipherListDisplay = NULL;\r
 \r
   if (Private->CurrentNic->ConnectState == WifiMgrConnectedToAp) {\r
-\r
     //\r
     // Display the current connected network.\r
     // Find the current operate network under connected status.\r
     //\r
-    if (Private->CurrentNic->CurrentOperateNetwork != NULL &&\r
-      Private->CurrentNic->CurrentOperateNetwork->IsAvailable) {\r
-\r
+    if ((Private->CurrentNic->CurrentOperateNetwork != NULL) &&\r
+        Private->CurrentNic->CurrentOperateNetwork->IsAvailable)\r
+    {\r
       Profile = Private->CurrentNic->CurrentOperateNetwork;\r
-      AvailableCount ++;\r
+      AvailableCount++;\r
 \r
       AKMListDisplay = WifiMgrGetStrAKMList (Profile);\r
       if (AKMListDisplay == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
         goto Exit;\r
       }\r
-      CipherListDisplay = WifiMgrGetStrCipherList(Profile);\r
+\r
+      CipherListDisplay = WifiMgrGetStrCipherList (Profile);\r
       if (CipherListDisplay == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
         goto Exit;\r
@@ -439,6 +444,7 @@ WifiMgrRefreshNetworkList (
         UnicodeSPrint (PortString, PortStringSize, L"AKMSuite: %s CipherSuite: %s", AKMListDisplay, CipherListDisplay);\r
         PortHelpToken = HiiSetString (Private->RegisteredHandle, 0, PortString, NULL);\r
       }\r
+\r
       FreePool (AKMListDisplay);\r
       FreePool (CipherListDisplay);\r
       AKMListDisplay    = NULL;\r
@@ -450,7 +456,7 @@ WifiMgrRefreshNetworkList (
         PortPromptToken,\r
         PortHelpToken,\r
         EFI_IFR_FLAG_CALLBACK,\r
-        (UINT16) (KEY_AVAILABLE_NETWORK_ENTRY_BASE + Profile->ProfileIndex)\r
+        (UINT16)(KEY_AVAILABLE_NETWORK_ENTRY_BASE + Profile->ProfileIndex)\r
         );\r
 \r
       UnicodeSPrint (\r
@@ -459,7 +465,7 @@ WifiMgrRefreshNetworkList (
         L"%s       %s %s",\r
         (Profile->SecurityType != SECURITY_TYPE_NONE ? L"Secured" : L"Open   "),\r
         mSecurityType[Profile->SecurityType],\r
-        RSSI_TO_SIGNAL_STRENGTH_BAR(Profile->NetworkQuality)\r
+        RSSI_TO_SIGNAL_STRENGTH_BAR (Profile->NetworkQuality)\r
         );\r
       PortTextToken = HiiSetString (Private->RegisteredHandle, 0, PortString, NULL);\r
 \r
@@ -468,7 +474,7 @@ WifiMgrRefreshNetworkList (
         PortTextToken,\r
         0,\r
         0\r
-      );\r
+        );\r
 \r
       ConnectedProfile = Profile;\r
     } else {\r
@@ -480,7 +486,6 @@ WifiMgrRefreshNetworkList (
   // Display all supported available networks.\r
   //\r
   NET_LIST_FOR_EACH (Entry, &Private->CurrentNic->ProfileList) {\r
-\r
     Profile = NET_LIST_USER_STRUCT_S (\r
                 Entry,\r
                 WIFI_MGR_NETWORK_PROFILE,\r
@@ -490,16 +495,17 @@ WifiMgrRefreshNetworkList (
     if (ConnectedProfile == Profile) {\r
       continue;\r
     }\r
-    if (Profile->IsAvailable && Profile->CipherSuiteSupported) {\r
 \r
-      AvailableCount ++;\r
+    if (Profile->IsAvailable && Profile->CipherSuiteSupported) {\r
+      AvailableCount++;\r
 \r
       AKMListDisplay = WifiMgrGetStrAKMList (Profile);\r
       if (AKMListDisplay == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
         goto Exit;\r
       }\r
-      CipherListDisplay = WifiMgrGetStrCipherList(Profile);\r
+\r
+      CipherListDisplay = WifiMgrGetStrCipherList (Profile);\r
       if (CipherListDisplay == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
         goto Exit;\r
@@ -518,7 +524,8 @@ WifiMgrRefreshNetworkList (
           PortString,\r
           PortStringSize,\r
           L"AKMSuite: %s CipherSuite: %s",\r
-          AKMListDisplay, CipherListDisplay\r
+          AKMListDisplay,\r
+          CipherListDisplay\r
           );\r
         PortHelpToken = HiiSetString (Private->RegisteredHandle, 0, PortString, NULL);\r
         if (PortHelpToken == 0) {\r
@@ -526,6 +533,7 @@ WifiMgrRefreshNetworkList (
           goto Exit;\r
         }\r
       }\r
+\r
       FreePool (AKMListDisplay);\r
       FreePool (CipherListDisplay);\r
       AKMListDisplay    = NULL;\r
@@ -537,7 +545,7 @@ WifiMgrRefreshNetworkList (
         PortPromptToken,\r
         PortHelpToken,\r
         EFI_IFR_FLAG_CALLBACK,\r
-        (UINT16) (KEY_AVAILABLE_NETWORK_ENTRY_BASE + Profile->ProfileIndex)\r
+        (UINT16)(KEY_AVAILABLE_NETWORK_ENTRY_BASE + Profile->ProfileIndex)\r
         );\r
 \r
       UnicodeSPrint (\r
@@ -546,13 +554,14 @@ WifiMgrRefreshNetworkList (
         L"%s       %s %s",\r
         (Profile->SecurityType != SECURITY_TYPE_NONE ? L"Secured" : L"Open   "),\r
         mSecurityType[Profile->SecurityType],\r
-        RSSI_TO_SIGNAL_STRENGTH_BAR(Profile->NetworkQuality)\r
+        RSSI_TO_SIGNAL_STRENGTH_BAR (Profile->NetworkQuality)\r
         );\r
       PortTextToken = HiiSetString (Private->RegisteredHandle, 0, PortString, NULL);\r
       if (PortTextToken == 0) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
         goto Exit;\r
       }\r
+\r
       HiiCreateTextOpCode (\r
         StartOpCodeHandle,\r
         PortTextToken,\r
@@ -566,7 +575,6 @@ WifiMgrRefreshNetworkList (
   // Display all Unsupported available networks.\r
   //\r
   NET_LIST_FOR_EACH (Entry, &Private->CurrentNic->ProfileList) {\r
-\r
     Profile = NET_LIST_USER_STRUCT_S (\r
                 Entry,\r
                 WIFI_MGR_NETWORK_PROFILE,\r
@@ -576,16 +584,17 @@ WifiMgrRefreshNetworkList (
     if (ConnectedProfile == Profile) {\r
       continue;\r
     }\r
-    if (Profile->IsAvailable && !Profile->CipherSuiteSupported) {\r
 \r
-      AvailableCount ++;\r
+    if (Profile->IsAvailable && !Profile->CipherSuiteSupported) {\r
+      AvailableCount++;\r
 \r
       AKMListDisplay = WifiMgrGetStrAKMList (Profile);\r
       if (AKMListDisplay == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
         goto Exit;\r
       }\r
-      CipherListDisplay = WifiMgrGetStrCipherList(Profile);\r
+\r
+      CipherListDisplay = WifiMgrGetStrCipherList (Profile);\r
       if (CipherListDisplay == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
         goto Exit;\r
@@ -598,16 +607,19 @@ WifiMgrRefreshNetworkList (
           PortString,\r
           PortStringSize,\r
           L"AKMSuite: %s CipherSuite(UnSupported): %s",\r
-          AKMListDisplay, CipherListDisplay\r
+          AKMListDisplay,\r
+          CipherListDisplay\r
           );\r
       } else {\r
         UnicodeSPrint (\r
           PortString,\r
           PortStringSize,\r
           L"AKMSuite(UnSupported): %s CipherSuite(UnSupported): %s",\r
-          AKMListDisplay, CipherListDisplay\r
+          AKMListDisplay,\r
+          CipherListDisplay\r
           );\r
       }\r
+\r
       FreePool (AKMListDisplay);\r
       FreePool (CipherListDisplay);\r
       AKMListDisplay    = NULL;\r
@@ -621,7 +633,7 @@ WifiMgrRefreshNetworkList (
         PortPromptToken,\r
         PortHelpToken,\r
         EFI_IFR_FLAG_CALLBACK,\r
-        (UINT16) (KEY_AVAILABLE_NETWORK_ENTRY_BASE + Profile->ProfileIndex)\r
+        (UINT16)(KEY_AVAILABLE_NETWORK_ENTRY_BASE + Profile->ProfileIndex)\r
         );\r
 \r
       UnicodeSPrint (\r
@@ -630,7 +642,7 @@ WifiMgrRefreshNetworkList (
         L"%s       %s %s",\r
         L"UnSupported",\r
         mSecurityType[Profile->SecurityType],\r
-        RSSI_TO_SIGNAL_STRENGTH_BAR(Profile->NetworkQuality)\r
+        RSSI_TO_SIGNAL_STRENGTH_BAR (Profile->NetworkQuality)\r
         );\r
       PortTextToken = HiiSetString (Private->RegisteredHandle, 0, PortString, NULL);\r
 \r
@@ -658,6 +670,7 @@ Exit:
   if (AKMListDisplay != NULL) {\r
     FreePool (AKMListDisplay);\r
   }\r
+\r
   if (CipherListDisplay != NULL) {\r
     FreePool (CipherListDisplay);\r
   }\r
@@ -680,17 +693,17 @@ Exit:
 **/\r
 EFI_STATUS\r
 WifiMgrRefreshHiddenList (\r
-  IN    WIFI_MGR_PRIVATE_DATA      *Private\r
+  IN    WIFI_MGR_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  EFI_TPL                          OldTpl;\r
-  UINTN                            Index;\r
-  EFI_STRING_ID                    StringId;\r
-  VOID                             *StartOpCodeHandle;\r
-  VOID                             *EndOpCodeHandle;\r
-  WIFI_HIDDEN_NETWORK_DATA         *HiddenNetwork;\r
-  LIST_ENTRY                       *Entry;\r
+  EFI_STATUS                Status;\r
+  EFI_TPL                   OldTpl;\r
+  UINTN                     Index;\r
+  EFI_STRING_ID             StringId;\r
+  VOID                      *StartOpCodeHandle;\r
+  VOID                      *EndOpCodeHandle;\r
+  WIFI_HIDDEN_NETWORK_DATA  *HiddenNetwork;\r
+  LIST_ENTRY                *Entry;\r
 \r
   if (Private == NULL) {\r
     return EFI_SUCCESS;\r
@@ -709,7 +722,6 @@ WifiMgrRefreshHiddenList (
   Index  = 0;\r
 \r
   NET_LIST_FOR_EACH (Entry, &Private->HiddenNetworkList) {\r
-\r
     HiddenNetwork = NET_LIST_USER_STRUCT_S (\r
                       Entry,\r
                       WIFI_HIDDEN_NETWORK_DATA,\r
@@ -720,16 +732,16 @@ WifiMgrRefreshHiddenList (
 \r
     HiiCreateCheckBoxOpCode (\r
       StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (KEY_HIDDEN_NETWORK_ENTRY_BASE + Index),\r
+      (EFI_QUESTION_ID)(KEY_HIDDEN_NETWORK_ENTRY_BASE + Index),\r
       MANAGER_VARSTORE_ID,\r
-      (UINT16) (HIDDEN_NETWORK_LIST_VAR_OFFSET + Index),\r
+      (UINT16)(HIDDEN_NETWORK_LIST_VAR_OFFSET + Index),\r
       StringId,\r
       0,\r
       0,\r
       0,\r
       NULL\r
       );\r
-    Index ++;\r
+    Index++;\r
   }\r
 \r
   Status = HiiUpdateForm (\r
@@ -746,7 +758,6 @@ WifiMgrRefreshHiddenList (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Callback function for user to select a Nic.\r
 \r
@@ -759,23 +770,24 @@ WifiMgrRefreshHiddenList (
 **/\r
 EFI_STATUS\r
 WifiMgrSelectNic (\r
-  IN     WIFI_MGR_PRIVATE_DATA         *Private,\r
-  IN     EFI_QUESTION_ID               KeyValue\r
+  IN     WIFI_MGR_PRIVATE_DATA  *Private,\r
+  IN     EFI_QUESTION_ID        KeyValue\r
   )\r
 {\r
-  WIFI_MGR_DEVICE_DATA    *Nic;\r
-  UINT32                  NicIndex;\r
-  CHAR16                  MacString[WIFI_MGR_MAX_MAC_STRING_LEN];\r
+  WIFI_MGR_DEVICE_DATA  *Nic;\r
+  UINT32                NicIndex;\r
+  CHAR16                MacString[WIFI_MGR_MAX_MAC_STRING_LEN];\r
 \r
   NicIndex = KeyValue - KEY_MAC_ENTRY_BASE;\r
   Nic      = WifiMgrGetNicByIndex (Private, NicIndex);\r
   if (Nic == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
+\r
   Private->CurrentNic = Nic;\r
 \r
   WifiMgrMacAddrToStr (&Nic->MacAddress, sizeof (MacString), MacString);\r
-  HiiSetString (Private->RegisteredHandle, STRING_TOKEN(STR_MAC_ADDRESS), MacString, NULL);\r
+  HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_MAC_ADDRESS), MacString, NULL);\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -788,7 +800,7 @@ WifiMgrSelectNic (
 **/\r
 VOID\r
 WifiMgrCleanUserInput (\r
-  IN  WIFI_MGR_PRIVATE_DATA      *Private\r
+  IN  WIFI_MGR_PRIVATE_DATA  *Private\r
   )\r
 {\r
   Private->SecurityType        = SECURITY_TYPE_NONE;\r
@@ -809,13 +821,13 @@ WifiMgrCleanUserInput (
 \r
 **/\r
 EFI_STATUS\r
-WifiMgrUserSelectProfileToConnect(\r
-  IN     WIFI_MGR_PRIVATE_DATA         *Private,\r
-  IN     UINT32                        ProfileIndex\r
+WifiMgrUserSelectProfileToConnect (\r
+  IN     WIFI_MGR_PRIVATE_DATA  *Private,\r
+  IN     UINT32                 ProfileIndex\r
   )\r
 {\r
-  WIFI_MGR_NETWORK_PROFILE         *Profile;\r
-  WIFI_MGR_DEVICE_DATA             *Nic;\r
+  WIFI_MGR_NETWORK_PROFILE  *Profile;\r
+  WIFI_MGR_DEVICE_DATA      *Nic;\r
 \r
   Nic = Private->CurrentNic;\r
   if (Nic == NULL) {\r
@@ -823,14 +835,15 @@ WifiMgrUserSelectProfileToConnect(
   }\r
 \r
   //\r
-  //Initialize the connection page\r
+  // Initialize the connection page\r
   //\r
-  WifiMgrCleanUserInput(Private);\r
+  WifiMgrCleanUserInput (Private);\r
 \r
   Profile = WifiMgrGetProfileByProfileIndex (ProfileIndex, &Nic->ProfileList);\r
   if (Profile == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
+\r
   Private->CurrentNic->UserSelectedProfile = Profile;\r
 \r
   return EFI_SUCCESS;\r
@@ -851,15 +864,15 @@ WifiMgrUserSelectProfileToConnect(
 **/\r
 EFI_STATUS\r
 WifiMgrRecordPassword (\r
-  IN   WIFI_MGR_PRIVATE_DATA      *Private,\r
-  IN   EFI_STRING_ID              StringId,\r
-  IN   CHAR16                     *StringBuffer,\r
-  IN   UINTN                      StringBufferLen\r
+  IN   WIFI_MGR_PRIVATE_DATA  *Private,\r
+  IN   EFI_STRING_ID          StringId,\r
+  IN   CHAR16                 *StringBuffer,\r
+  IN   UINTN                  StringBufferLen\r
   )\r
 {\r
-  CHAR16                          *Password;\r
+  CHAR16  *Password;\r
 \r
-  if (StringId == 0 || StringBuffer == NULL || StringBufferLen <= 0) {\r
+  if ((StringId == 0) || (StringBuffer == NULL) || (StringBufferLen <= 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -867,10 +880,12 @@ WifiMgrRecordPassword (
   if (Password == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
+\r
   if (StrLen (Password) > StringBufferLen) {\r
     FreePool (Password);\r
     return EFI_NOT_FOUND;\r
   }\r
+\r
   StrnCpyS (StringBuffer, StringBufferLen, Password, StrLen (Password));\r
   ZeroMem (Password, (StrLen (Password) + 1) * sizeof (CHAR16));\r
   FreePool (Password);\r
@@ -896,16 +911,16 @@ WifiMgrRecordPassword (
 **/\r
 VOID\r
 WifiMgrUpdateConnectMessage (\r
-  IN  WIFI_MGR_DEVICE_DATA      *Nic,\r
-  IN  BOOLEAN                   ConnectStateChanged,\r
-  IN  EFI_STRING                ConnectStatusMessage\r
+  IN  WIFI_MGR_DEVICE_DATA  *Nic,\r
+  IN  BOOLEAN               ConnectStateChanged,\r
+  IN  EFI_STRING            ConnectStatusMessage\r
   )\r
 {\r
-  CHAR16                   ConnectStatusStr[WIFI_STR_MAX_SIZE];\r
-  WIFI_MGR_PRIVATE_DATA    *Private;\r
+  CHAR16                 ConnectStatusStr[WIFI_STR_MAX_SIZE];\r
+  WIFI_MGR_PRIVATE_DATA  *Private;\r
 \r
   Private = Nic->Private;\r
-  if (Private == NULL || Private->CurrentNic != Nic) {\r
+  if ((Private == NULL) || (Private->CurrentNic != Nic)) {\r
     return;\r
   }\r
 \r
@@ -916,22 +931,30 @@ WifiMgrUpdateConnectMessage (
     HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_CONNECT_STATUS), ConnectStatusMessage, NULL);\r
   } else {\r
     if (Nic->ConnectState == WifiMgrConnectedToAp) {\r
-\r
-      UnicodeSPrint (ConnectStatusStr, sizeof (ConnectStatusStr), L"Connected to %s",\r
-        Nic->CurrentOperateNetwork->SSId);\r
+      UnicodeSPrint (\r
+        ConnectStatusStr,\r
+        sizeof (ConnectStatusStr),\r
+        L"Connected to %s",\r
+        Nic->CurrentOperateNetwork->SSId\r
+        );\r
       HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_CONNECT_STATUS), ConnectStatusStr, NULL);\r
     } else if (Nic->ConnectState == WifiMgrDisconnected) {\r
-\r
       HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_CONNECT_STATUS), L"Disconnected", NULL);\r
     } else if (Nic->ConnectState == WifiMgrConnectingToAp) {\r
-\r
-      UnicodeSPrint (ConnectStatusStr, sizeof (ConnectStatusStr), L"Connecting to %s ...",\r
-        Nic->CurrentOperateNetwork->SSId);\r
+      UnicodeSPrint (\r
+        ConnectStatusStr,\r
+        sizeof (ConnectStatusStr),\r
+        L"Connecting to %s ...",\r
+        Nic->CurrentOperateNetwork->SSId\r
+        );\r
       HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_CONNECT_STATUS), ConnectStatusStr, NULL);\r
     } else if (Nic->ConnectState == WifiMgrDisconnectingToAp) {\r
-\r
-      UnicodeSPrint (ConnectStatusStr, sizeof (ConnectStatusStr), L"Disconnecting from %s ...",\r
-        Nic->CurrentOperateNetwork->SSId);\r
+      UnicodeSPrint (\r
+        ConnectStatusStr,\r
+        sizeof (ConnectStatusStr),\r
+        L"Disconnecting from %s ...",\r
+        Nic->CurrentOperateNetwork->SSId\r
+        );\r
       HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_CONNECT_STATUS), ConnectStatusStr, NULL);\r
     } else {\r
       return;\r
@@ -941,25 +964,31 @@ WifiMgrUpdateConnectMessage (
   //\r
   // Update Connect Button\r
   //\r
-  if (Nic->ConnectState == WifiMgrConnectedToAp && Nic->UserSelectedProfile == Nic->CurrentOperateNetwork) {\r
-\r
-    HiiSetString (Private->RegisteredHandle,\r
-      STRING_TOKEN (STR_CONNECT_NOW), L"Disconnect from this Network", NULL);\r
+  if ((Nic->ConnectState == WifiMgrConnectedToAp) && (Nic->UserSelectedProfile == Nic->CurrentOperateNetwork)) {\r
+    HiiSetString (\r
+      Private->RegisteredHandle,\r
+      STRING_TOKEN (STR_CONNECT_NOW),\r
+      L"Disconnect from this Network",\r
+      NULL\r
+      );\r
   } else {\r
     HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_CONNECT_NOW), L"Connect to this Network", NULL);\r
   }\r
+\r
   gBS->SignalEvent (Private->ConnectFormRefreshEvent);\r
 \r
   //\r
   // Update Main Page and Network List\r
   //\r
   if (ConnectStateChanged) {\r
-\r
     if (Nic->ConnectState == WifiMgrConnectedToAp) {\r
-\r
       HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_CONNECTION_INFO), L"Connected to", NULL);\r
-      HiiSetString (Private->RegisteredHandle,\r
-        STRING_TOKEN (STR_CONNECTED_SSID), Nic->CurrentOperateNetwork->SSId, NULL);\r
+      HiiSetString (\r
+        Private->RegisteredHandle,\r
+        STRING_TOKEN (STR_CONNECTED_SSID),\r
+        Nic->CurrentOperateNetwork->SSId,\r
+        NULL\r
+        );\r
     } else {\r
       HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_CONNECTION_INFO), L"Disconnected", NULL);\r
       HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_CONNECTED_SSID), L"", NULL);\r
@@ -981,8 +1010,8 @@ WifiMgrUpdateConnectMessage (
 **/\r
 EFI_STATUS\r
 WifiMgrConvertConfigDataToIfrNvData (\r
-  IN   WIFI_MGR_PRIVATE_DATA      *Private,\r
-  OUT  WIFI_MANAGER_IFR_NVDATA    *IfrNvData\r
+  IN   WIFI_MGR_PRIVATE_DATA    *Private,\r
+  OUT  WIFI_MANAGER_IFR_NVDATA  *IfrNvData\r
   )\r
 {\r
   //\r
@@ -1010,8 +1039,8 @@ WifiMgrConvertConfigDataToIfrNvData (
 **/\r
 EFI_STATUS\r
 WifiMgrConvertIfrNvDataToConfigData (\r
-  IN     WIFI_MGR_PRIVATE_DATA         *Private,\r
-  IN OUT WIFI_MANAGER_IFR_NVDATA       *IfrNvData\r
+  IN     WIFI_MGR_PRIVATE_DATA    *Private,\r
+  IN OUT WIFI_MANAGER_IFR_NVDATA  *IfrNvData\r
   )\r
 {\r
   return EFI_SUCCESS;\r
@@ -1096,22 +1125,23 @@ WifiMgrDxeHiiConfigAccessExtractConfig (
   OUT       EFI_STRING                      *Results\r
   )\r
 {\r
-  WIFI_MGR_PRIVATE_DATA             *Private;\r
-  WIFI_MANAGER_IFR_NVDATA           *IfrNvData;\r
-  EFI_STRING                        ConfigRequestHdr;\r
-  EFI_STRING                        ConfigRequest;\r
-  UINTN                             Size;\r
-  BOOLEAN                           AllocatedRequest;\r
-  UINTN                             BufferSize;\r
-  EFI_STATUS                        Status;\r
-\r
-  if (This == NULL || Progress == NULL || Results == NULL) {\r
+  WIFI_MGR_PRIVATE_DATA    *Private;\r
+  WIFI_MANAGER_IFR_NVDATA  *IfrNvData;\r
+  EFI_STRING               ConfigRequestHdr;\r
+  EFI_STRING               ConfigRequest;\r
+  UINTN                    Size;\r
+  BOOLEAN                  AllocatedRequest;\r
+  UINTN                    BufferSize;\r
+  EFI_STATUS               Status;\r
+\r
+  if ((This == NULL) || (Progress == NULL) || (Results == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   *Progress = Request;\r
   if ((Request != NULL) &&\r
-      !HiiIsConfigHdrMatch (Request, &gWifiConfigFormSetGuid, mVendorStorageName)) {\r
+      !HiiIsConfigHdrMatch (Request, &gWifiConfigFormSetGuid, mVendorStorageName))\r
+  {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -1120,10 +1150,10 @@ WifiMgrDxeHiiConfigAccessExtractConfig (
   AllocatedRequest = FALSE;\r
   Size             = 0;\r
 \r
-  Private   = WIFI_MGR_PRIVATE_DATA_FROM_CONFIG_ACCESS (This);\r
+  Private = WIFI_MGR_PRIVATE_DATA_FROM_CONFIG_ACCESS (This);\r
 \r
   BufferSize = sizeof (WIFI_MANAGER_IFR_NVDATA);\r
-  IfrNvData = AllocateZeroPool (BufferSize);\r
+  IfrNvData  = AllocateZeroPool (BufferSize);\r
   if (IfrNvData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -1140,16 +1170,16 @@ WifiMgrDxeHiiConfigAccessExtractConfig (
     ConfigRequestHdr = HiiConstructConfigHdr (\r
                          &gWifiConfigFormSetGuid,\r
                          mVendorStorageName,\r
-                         Private->DriverHandle);\r
+                         Private->DriverHandle\r
+                         );\r
     if (ConfigRequestHdr == NULL) {\r
       FreePool (IfrNvData);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
-    Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
+    Size          = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
     ConfigRequest = AllocateZeroPool (Size);\r
     if (ConfigRequest == NULL) {\r
-\r
       FreePool (IfrNvData);\r
       FreePool (ConfigRequestHdr);\r
       return EFI_OUT_OF_RESOURCES;\r
@@ -1161,7 +1191,7 @@ WifiMgrDxeHiiConfigAccessExtractConfig (
       Size,\r
       L"%s&OFFSET=0&WIDTH=%016LX",\r
       ConfigRequestHdr,\r
-      (UINT64) BufferSize\r
+      (UINT64)BufferSize\r
       );\r
     FreePool (ConfigRequestHdr);\r
   }\r
@@ -1172,7 +1202,7 @@ WifiMgrDxeHiiConfigAccessExtractConfig (
   Status = gHiiConfigRouting->BlockToConfig (\r
                                 gHiiConfigRouting,\r
                                 ConfigRequest,\r
-                                (UINT8 *) IfrNvData,\r
+                                (UINT8 *)IfrNvData,\r
                                 BufferSize,\r
                                 Results,\r
                                 Progress\r
@@ -1186,6 +1216,7 @@ WifiMgrDxeHiiConfigAccessExtractConfig (
     FreePool (ConfigRequest);\r
     ConfigRequest = NULL;\r
   }\r
+\r
   //\r
   // Set Progress string to the original request string.\r
   //\r
@@ -1245,12 +1276,12 @@ WifiMgrDxeHiiConfigAccessRouteConfig (
   OUT       EFI_STRING                      *Progress\r
   )\r
 {\r
-  EFI_STATUS                     Status;\r
-  UINTN                          BufferSize;\r
-  WIFI_MGR_PRIVATE_DATA          *Private;\r
-  WIFI_MANAGER_IFR_NVDATA        *IfrNvData;\r
+  EFI_STATUS               Status;\r
+  UINTN                    BufferSize;\r
+  WIFI_MGR_PRIVATE_DATA    *Private;\r
+  WIFI_MANAGER_IFR_NVDATA  *IfrNvData;\r
 \r
-  if (Configuration == NULL || Progress == NULL) {\r
+  if ((Configuration == NULL) || (Progress == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1273,7 +1304,7 @@ WifiMgrDxeHiiConfigAccessRouteConfig (
   Status = gHiiConfigRouting->ConfigToBlock (\r
                                 gHiiConfigRouting,\r
                                 Configuration,\r
-                                (UINT8*) IfrNvData,\r
+                                (UINT8 *)IfrNvData,\r
                                 &BufferSize,\r
                                 Progress\r
                                 );\r
@@ -1316,39 +1347,40 @@ WifiMgrDxeHiiConfigAccessRouteConfig (
 EFI_STATUS\r
 EFIAPI\r
 WifiMgrDxeHiiConfigAccessCallback (\r
-  IN     CONST EFI_HII_CONFIG_ACCESS_PROTOCOL    *This,\r
-  IN     EFI_BROWSER_ACTION                      Action,\r
-  IN     EFI_QUESTION_ID                         QuestionId,\r
-  IN     UINT8                                   Type,\r
-  IN OUT EFI_IFR_TYPE_VALUE                      *Value,\r
-  OUT    EFI_BROWSER_ACTION_REQUEST              *ActionRequest\r
+  IN     CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN     EFI_BROWSER_ACTION                    Action,\r
+  IN     EFI_QUESTION_ID                       QuestionId,\r
+  IN     UINT8                                 Type,\r
+  IN OUT EFI_IFR_TYPE_VALUE                    *Value,\r
+  OUT    EFI_BROWSER_ACTION_REQUEST            *ActionRequest\r
   )\r
 {\r
-  EFI_STATUS                         Status;\r
-  EFI_INPUT_KEY                      Key;\r
-  UINTN                              BufferSize;\r
-  WIFI_MGR_PRIVATE_DATA              *Private;\r
-  WIFI_MANAGER_IFR_NVDATA            *IfrNvData;\r
-  EFI_DEVICE_PATH_PROTOCOL           *FilePath;\r
-  WIFI_MGR_NETWORK_PROFILE           *Profile;\r
-  WIFI_MGR_NETWORK_PROFILE           *ProfileToConnect;\r
-  WIFI_HIDDEN_NETWORK_DATA           *HiddenNetwork;\r
-  UINTN                              TempDataSize;\r
-  VOID                               *TempData;\r
-  LIST_ENTRY                         *Entry;\r
-  UINT32                             Index;\r
-  UINT32                             RemoveCount;\r
-  CHAR16                             *TempPassword;\r
-  CHAR16                             *ErrorMessage;\r
-\r
-  if (Action != EFI_BROWSER_ACTION_FORM_OPEN &&\r
-      Action != EFI_BROWSER_ACTION_FORM_CLOSE &&\r
-      Action != EFI_BROWSER_ACTION_CHANGING &&\r
-      Action != EFI_BROWSER_ACTION_CHANGED &&\r
-      Action != EFI_BROWSER_ACTION_RETRIEVE) {\r
-\r
+  EFI_STATUS                Status;\r
+  EFI_INPUT_KEY             Key;\r
+  UINTN                     BufferSize;\r
+  WIFI_MGR_PRIVATE_DATA     *Private;\r
+  WIFI_MANAGER_IFR_NVDATA   *IfrNvData;\r
+  EFI_DEVICE_PATH_PROTOCOL  *FilePath;\r
+  WIFI_MGR_NETWORK_PROFILE  *Profile;\r
+  WIFI_MGR_NETWORK_PROFILE  *ProfileToConnect;\r
+  WIFI_HIDDEN_NETWORK_DATA  *HiddenNetwork;\r
+  UINTN                     TempDataSize;\r
+  VOID                      *TempData;\r
+  LIST_ENTRY                *Entry;\r
+  UINT32                    Index;\r
+  UINT32                    RemoveCount;\r
+  CHAR16                    *TempPassword;\r
+  CHAR16                    *ErrorMessage;\r
+\r
+  if ((Action != EFI_BROWSER_ACTION_FORM_OPEN) &&\r
+      (Action != EFI_BROWSER_ACTION_FORM_CLOSE) &&\r
+      (Action != EFI_BROWSER_ACTION_CHANGING) &&\r
+      (Action != EFI_BROWSER_ACTION_CHANGED) &&\r
+      (Action != EFI_BROWSER_ACTION_RETRIEVE))\r
+  {\r
     return EFI_UNSUPPORTED;\r
   }\r
+\r
   if ((Value == NULL) || (ActionRequest == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
@@ -1363,525 +1395,531 @@ WifiMgrDxeHiiConfigAccessCallback (
   // Retrieve uncommitted data from Browser\r
   //\r
   BufferSize = sizeof (WIFI_MANAGER_IFR_NVDATA);\r
-  IfrNvData = AllocateZeroPool (BufferSize);\r
+  IfrNvData  = AllocateZeroPool (BufferSize);\r
   if (IfrNvData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
-  HiiGetBrowserData (&gWifiConfigFormSetGuid, mVendorStorageName, BufferSize, (UINT8 *) IfrNvData);\r
+\r
+  HiiGetBrowserData (&gWifiConfigFormSetGuid, mVendorStorageName, BufferSize, (UINT8 *)IfrNvData);\r
 \r
   if (Action == EFI_BROWSER_ACTION_FORM_OPEN) {\r
     switch (QuestionId) {\r
+      case KEY_MAC_LIST:\r
 \r
-    case KEY_MAC_LIST:\r
+        Status = WifiMgrShowNicList (Private);\r
+        break;\r
 \r
-      Status = WifiMgrShowNicList (Private);\r
-      break;\r
+      case KEY_REFRESH_NETWORK_LIST:\r
 \r
-    case KEY_REFRESH_NETWORK_LIST:\r
+        if (Private->CurrentNic->UserSelectedProfile != NULL) {\r
+          Profile = Private->CurrentNic->UserSelectedProfile;\r
 \r
-      if (Private->CurrentNic->UserSelectedProfile != NULL) {\r
+          //\r
+          // Erase secrets since user has left Connection Page\r
+          // Connection Page may direct to Network List Page or Eap Configuration Page,\r
+          // secrets only need to be erased when head to Network List Page\r
+          //\r
+          WifiMgrCleanProfileSecrets (Profile);\r
+\r
+          Private->CurrentNic->UserSelectedProfile = NULL;\r
+        }\r
+\r
+        break;\r
+\r
+      case KEY_CONNECT_ACTION:\r
+\r
+        if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
+          break;\r
+        }\r
 \r
         Profile = Private->CurrentNic->UserSelectedProfile;\r
 \r
         //\r
-        // Erase secrets since user has left Connection Page\r
-        // Connection Page may direct to Network List Page or Eap Configuration Page,\r
-        // secrets only need to be erased when head to Network List Page\r
+        // Enter the network connection configuration page\r
+        // Recovery from restored data\r
         //\r
-        WifiMgrCleanProfileSecrets (Profile);\r
-\r
-        Private->CurrentNic->UserSelectedProfile = NULL;\r
-      }\r
+        if (HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_SSID), Profile->SSId, NULL) == 0) {\r
+          return EFI_OUT_OF_RESOURCES;\r
+        }\r
 \r
-      break;\r
+        IfrNvData->SecurityType = Profile->SecurityType;\r
+        if (HiiSetString (\r
+              Private->RegisteredHandle,\r
+              STRING_TOKEN (STR_SECURITY_TYPE),\r
+              mSecurityType[IfrNvData->SecurityType],\r
+              NULL\r
+              ) == 0)\r
+        {\r
+          return EFI_OUT_OF_RESOURCES;\r
+        }\r
 \r
-    case KEY_CONNECT_ACTION:\r
+        if (IfrNvData->SecurityType == SECURITY_TYPE_WPA2_ENTERPRISE) {\r
+          IfrNvData->EapAuthMethod       = Profile->EapAuthMethod;\r
+          IfrNvData->EapSecondAuthMethod = Profile->EapSecondAuthMethod;\r
+          StrCpyS (IfrNvData->EapIdentity, EAP_IDENTITY_SIZE, Profile->EapIdentity);\r
+        }\r
 \r
-      if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
         break;\r
-      }\r
-      Profile = Private->CurrentNic->UserSelectedProfile;\r
-\r
-      //\r
-      //Enter the network connection configuration page\r
-      //Recovery from restored data\r
-      //\r
-      if (HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_SSID), Profile->SSId, NULL) == 0) {\r
-        return EFI_OUT_OF_RESOURCES;\r
-      }\r
-      IfrNvData->SecurityType = Profile->SecurityType;\r
-      if (HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_SECURITY_TYPE),\r
-            mSecurityType[IfrNvData->SecurityType], NULL) == 0) {\r
-        return EFI_OUT_OF_RESOURCES;\r
-      }\r
 \r
-      if (IfrNvData->SecurityType == SECURITY_TYPE_WPA2_ENTERPRISE) {\r
+      case KEY_ENROLLED_CERT_NAME:\r
 \r
-        IfrNvData->EapAuthMethod        = Profile->EapAuthMethod;\r
-        IfrNvData->EapSecondAuthMethod  = Profile->EapSecondAuthMethod;\r
-        StrCpyS (IfrNvData->EapIdentity, EAP_IDENTITY_SIZE, Profile->EapIdentity);\r
-      }\r
+        if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
+          break;\r
+        }\r
 \r
-      break;\r
+        Profile = Private->CurrentNic->UserSelectedProfile;\r
 \r
-    case KEY_ENROLLED_CERT_NAME:\r
+        //\r
+        // Enter the key enrollment page\r
+        // For TTLS and PEAP, only CA cert needs to be cared\r
+        //\r
+        if (Private->FileType == FileTypeCACert) {\r
+          if (Profile->CACertData != NULL) {\r
+            HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME), Profile->CACertName, NULL);\r
+          } else {\r
+            HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME), L"", NULL);\r
+          }\r
+        } else if (Private->FileType == FileTypeClientCert) {\r
+          if (Profile->ClientCertData != NULL) {\r
+            HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME), Profile->ClientCertName, NULL);\r
+          } else {\r
+            HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME), L"", NULL);\r
+          }\r
+        }\r
 \r
-      if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
         break;\r
-      }\r
-      Profile = Private->CurrentNic->UserSelectedProfile;\r
 \r
-      //\r
-      //Enter the key enrollment page\r
-      //For TTLS and PEAP, only CA cert needs to be cared\r
-      //\r
-      if (Private->FileType == FileTypeCACert) {\r
+      case KEY_ENROLLED_PRIVATE_KEY_NAME:\r
 \r
-        if (Profile->CACertData != NULL) {\r
-          HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME), Profile->CACertName, NULL);\r
-        } else {\r
-          HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME), L"", NULL);\r
+        if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
+          break;\r
         }\r
-      } else if (Private->FileType == FileTypeClientCert) {\r
 \r
-        if (Profile->ClientCertData != NULL) {\r
-          HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME), Profile->ClientCertName, NULL);\r
+        Profile = Private->CurrentNic->UserSelectedProfile;\r
+\r
+        if (Profile->PrivateKeyData != NULL) {\r
+          HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_PRIVATE_KEY_NAME), Profile->PrivateKeyName, NULL);\r
         } else {\r
-          HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME), L"", NULL);\r
+          HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_PRIVATE_KEY_NAME), L"", NULL);\r
         }\r
-      }\r
-      break;\r
 \r
-    case KEY_ENROLLED_PRIVATE_KEY_NAME:\r
-\r
-      if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
         break;\r
-      }\r
-      Profile = Private->CurrentNic->UserSelectedProfile;\r
 \r
-      if (Profile->PrivateKeyData != NULL) {\r
-        HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_PRIVATE_KEY_NAME), Profile->PrivateKeyName, NULL);\r
-      } else {\r
-        HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_PRIVATE_KEY_NAME), L"", NULL);\r
-      }\r
-      break;\r
-\r
-    default:\r
-      break;\r
+      default:\r
+        break;\r
     }\r
   } else if (Action == EFI_BROWSER_ACTION_FORM_CLOSE) {\r
     switch (QuestionId) {\r
+      case KEY_CONNECT_ACTION:\r
 \r
-    case KEY_CONNECT_ACTION:\r
+        if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
+          break;\r
+        }\r
 \r
-      if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
-        break;\r
-      }\r
-      Profile = Private->CurrentNic->UserSelectedProfile;\r
+        Profile = Private->CurrentNic->UserSelectedProfile;\r
 \r
-      //\r
-      //Restore User Config Data for Page recovery\r
-      //\r
-      if (IfrNvData->SecurityType == SECURITY_TYPE_WPA2_ENTERPRISE) {\r
+        //\r
+        // Restore User Config Data for Page recovery\r
+        //\r
+        if (IfrNvData->SecurityType == SECURITY_TYPE_WPA2_ENTERPRISE) {\r
+          Profile->EapAuthMethod       = IfrNvData->EapAuthMethod;\r
+          Profile->EapSecondAuthMethod = IfrNvData->EapSecondAuthMethod;\r
+          StrCpyS (Profile->EapIdentity, EAP_IDENTITY_SIZE, IfrNvData->EapIdentity);\r
+        }\r
 \r
-        Profile->EapAuthMethod        = IfrNvData->EapAuthMethod;\r
-        Profile->EapSecondAuthMethod  = IfrNvData->EapSecondAuthMethod;\r
-        StrCpyS (Profile->EapIdentity, EAP_IDENTITY_SIZE, IfrNvData->EapIdentity);\r
-      }\r
-      break;\r
+        break;\r
 \r
-    default:\r
-      break;\r
+      default:\r
+        break;\r
     }\r
   } else if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
     switch (QuestionId) {\r
+      case KEY_NETWORK_LIST:\r
 \r
-    case KEY_NETWORK_LIST:\r
-\r
-      //\r
-      //User triggered a scan process.\r
-      //\r
-      Private->CurrentNic->OneTimeScanRequest = TRUE;\r
-      break;\r
-\r
-    case KEY_PASSWORD_CONNECT_NETWORK:\r
-    case KEY_EAP_PASSWORD_CONNECT_NETWORK:\r
-    case KEY_PRIVATE_KEY_PASSWORD:\r
-\r
-      if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
-        break;\r
-      }\r
-      Profile = Private->CurrentNic->UserSelectedProfile;\r
-\r
-      if (QuestionId == KEY_PASSWORD_CONNECT_NETWORK) {\r
-        TempPassword = Profile->Password;\r
-      } else if (QuestionId == KEY_EAP_PASSWORD_CONNECT_NETWORK) {\r
-        TempPassword = Profile->EapPassword;\r
-      } else {\r
-        TempPassword = Profile->PrivateKeyPassword;\r
-      }\r
-\r
-      Status = WifiMgrRecordPassword (Private, Value->string, TempPassword, PASSWORD_STORAGE_SIZE);\r
-      if (EFI_ERROR (Status)) {\r
-        DEBUG ((DEBUG_ERROR, "[WiFi Connection Manager] Error: Failed to input password!"));\r
+        //\r
+        // User triggered a scan process.\r
+        //\r
+        Private->CurrentNic->OneTimeScanRequest = TRUE;\r
         break;\r
-      }\r
 \r
-      //\r
-      // This password is not a new created password, so no need to confirm.\r
-      //\r
-      Status = EFI_NOT_FOUND;\r
-      break;\r
+      case KEY_PASSWORD_CONNECT_NETWORK:\r
+      case KEY_EAP_PASSWORD_CONNECT_NETWORK:\r
+      case KEY_PRIVATE_KEY_PASSWORD:\r
 \r
-    case KEY_CONNECT_ACTION:\r
+        if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
+          break;\r
+        }\r
 \r
-      ErrorMessage     = NULL;\r
-      ProfileToConnect = NULL;\r
+        Profile = Private->CurrentNic->UserSelectedProfile;\r
 \r
-      if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
-        break;\r
-      }\r
-      Profile = Private->CurrentNic->UserSelectedProfile;\r
+        if (QuestionId == KEY_PASSWORD_CONNECT_NETWORK) {\r
+          TempPassword = Profile->Password;\r
+        } else if (QuestionId == KEY_EAP_PASSWORD_CONNECT_NETWORK) {\r
+          TempPassword = Profile->EapPassword;\r
+        } else {\r
+          TempPassword = Profile->PrivateKeyPassword;\r
+        }\r
 \r
-      if (Private->CurrentNic->ConnectState == WifiMgrDisconnected ||\r
-        Profile != Private->CurrentNic->CurrentOperateNetwork) {\r
+        Status = WifiMgrRecordPassword (Private, Value->string, TempPassword, PASSWORD_STORAGE_SIZE);\r
+        if (EFI_ERROR (Status)) {\r
+          DEBUG ((DEBUG_ERROR, "[WiFi Connection Manager] Error: Failed to input password!"));\r
+          break;\r
+        }\r
 \r
         //\r
-        // When this network is not currently connected, pend it to connect.\r
+        // This password is not a new created password, so no need to confirm.\r
         //\r
-        if (Profile->AKMSuiteSupported && Profile->CipherSuiteSupported) {\r
-\r
-          if (Profile->SecurityType == SECURITY_TYPE_NONE || Profile->SecurityType == SECURITY_TYPE_WPA2_PERSONAL) {\r
+        Status = EFI_NOT_FOUND;\r
+        break;\r
 \r
-            //\r
-            // For Open network, connect directly.\r
-            //\r
-            ProfileToConnect = Profile;\r
+      case KEY_CONNECT_ACTION:\r
 \r
-          } else if (Profile->SecurityType == SECURITY_TYPE_WPA2_ENTERPRISE) {\r
+        ErrorMessage     = NULL;\r
+        ProfileToConnect = NULL;\r
 \r
-            //\r
-            // For WPA/WPA2-Enterprise network, conduct eap configuration first.\r
-            // Only EAP-TLS, TTLS and PEAP is supported now!\r
-            //\r
-            Profile->EapAuthMethod = IfrNvData->EapAuthMethod;\r
-            StrCpyS (Profile->EapIdentity, EAP_IDENTITY_SIZE, IfrNvData->EapIdentity);\r
+        if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
+          break;\r
+        }\r
 \r
-            if (IfrNvData->EapAuthMethod == EAP_AUTH_METHOD_TTLS || IfrNvData->EapAuthMethod == EAP_AUTH_METHOD_PEAP) {\r
+        Profile = Private->CurrentNic->UserSelectedProfile;\r
 \r
-              Profile->EapSecondAuthMethod = IfrNvData->EapSecondAuthMethod;\r
-              ProfileToConnect = Profile;\r
-            } else if (IfrNvData->EapAuthMethod == EAP_AUTH_METHOD_TLS) {\r
+        if ((Private->CurrentNic->ConnectState == WifiMgrDisconnected) ||\r
+            (Profile != Private->CurrentNic->CurrentOperateNetwork))\r
+        {\r
+          //\r
+          // When this network is not currently connected, pend it to connect.\r
+          //\r
+          if (Profile->AKMSuiteSupported && Profile->CipherSuiteSupported) {\r
+            if ((Profile->SecurityType == SECURITY_TYPE_NONE) || (Profile->SecurityType == SECURITY_TYPE_WPA2_PERSONAL)) {\r
+              //\r
+              // For Open network, connect directly.\r
+              //\r
               ProfileToConnect = Profile;\r
+            } else if (Profile->SecurityType == SECURITY_TYPE_WPA2_ENTERPRISE) {\r
+              //\r
+              // For WPA/WPA2-Enterprise network, conduct eap configuration first.\r
+              // Only EAP-TLS, TTLS and PEAP is supported now!\r
+              //\r
+              Profile->EapAuthMethod = IfrNvData->EapAuthMethod;\r
+              StrCpyS (Profile->EapIdentity, EAP_IDENTITY_SIZE, IfrNvData->EapIdentity);\r
+\r
+              if ((IfrNvData->EapAuthMethod == EAP_AUTH_METHOD_TTLS) || (IfrNvData->EapAuthMethod == EAP_AUTH_METHOD_PEAP)) {\r
+                Profile->EapSecondAuthMethod = IfrNvData->EapSecondAuthMethod;\r
+                ProfileToConnect             = Profile;\r
+              } else if (IfrNvData->EapAuthMethod == EAP_AUTH_METHOD_TLS) {\r
+                ProfileToConnect = Profile;\r
+              } else {\r
+                ErrorMessage = L"ERROR: Only EAP-TLS, TTLS or PEAP is supported now!";\r
+              }\r
             } else {\r
-              ErrorMessage = L"ERROR: Only EAP-TLS, TTLS or PEAP is supported now!";\r
+              ErrorMessage = L"ERROR: Can't connect to this network!";\r
             }\r
           } else {\r
-            ErrorMessage = L"ERROR: Can't connect to this network!";\r
+            ErrorMessage = L"ERROR: This network is not supported!";\r
           }\r
-        } else {\r
-          ErrorMessage = L"ERROR: This network is not supported!";\r
-        }\r
-\r
-        if (ErrorMessage != NULL) {\r
-          CreatePopUp (\r
-            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-            &Key,\r
-            ErrorMessage,\r
-            NULL\r
-            );\r
-        }\r
 \r
-        if (ProfileToConnect != NULL) {\r
+          if (ErrorMessage != NULL) {\r
+            CreatePopUp (\r
+              EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+              &Key,\r
+              ErrorMessage,\r
+              NULL\r
+              );\r
+          }\r
 \r
-          Private->CurrentNic->OneTimeConnectRequest = TRUE;\r
-          Private->CurrentNic->ConnectPendingNetwork = ProfileToConnect;\r
+          if (ProfileToConnect != NULL) {\r
+            Private->CurrentNic->OneTimeConnectRequest = TRUE;\r
+            Private->CurrentNic->ConnectPendingNetwork = ProfileToConnect;\r
+          }\r
+        } else if (Private->CurrentNic->ConnectState == WifiMgrConnectedToAp) {\r
+          //\r
+          // This network is currently connected, just disconnect from it.\r
+          //\r
+          Private->CurrentNic->OneTimeDisconnectRequest    = TRUE;\r
+          Private->CurrentNic->HasDisconnectPendingNetwork = TRUE;\r
         }\r
-      } else if (Private->CurrentNic->ConnectState == WifiMgrConnectedToAp) {\r
 \r
-        //\r
-        // This network is currently connected, just disconnect from it.\r
-        //\r
-        Private->CurrentNic->OneTimeDisconnectRequest    = TRUE;\r
-        Private->CurrentNic->HasDisconnectPendingNetwork = TRUE;\r
-      }\r
-      break;\r
-\r
-    case KEY_ENROLL_CA_CERT_CONNECT_NETWORK:\r
-\r
-      Private->FileType = FileTypeCACert;\r
-      break;\r
-\r
-    case KEY_ENROLL_CLIENT_CERT_CONNECT_NETWORK:\r
-\r
-      Private->FileType = FileTypeClientCert;\r
-      break;\r
-\r
-    case KEY_EAP_ENROLL_PRIVATE_KEY_FROM_FILE:\r
+        break;\r
 \r
-      FilePath = NULL;\r
-      ChooseFile (NULL, NULL, NULL, &FilePath);\r
+      case KEY_ENROLL_CA_CERT_CONNECT_NETWORK:\r
 \r
-      if (FilePath != NULL) {\r
+        Private->FileType = FileTypeCACert;\r
+        break;\r
 \r
-        UpdatePrivateKeyFromFile(Private, FilePath);\r
-        FreePool (FilePath);\r
-      }\r
-      break;\r
+      case KEY_ENROLL_CLIENT_CERT_CONNECT_NETWORK:\r
 \r
-    case KEY_EAP_ENROLL_CERT_FROM_FILE:\r
+        Private->FileType = FileTypeClientCert;\r
+        break;\r
 \r
-      //\r
-      //User will select a cert file from File Explore\r
-      //\r
-      FilePath = NULL;\r
-      ChooseFile( NULL, NULL, NULL, &FilePath);\r
+      case KEY_EAP_ENROLL_PRIVATE_KEY_FROM_FILE:\r
 \r
-      if (FilePath != NULL) {\r
+        FilePath = NULL;\r
+        ChooseFile (NULL, NULL, NULL, &FilePath);\r
 \r
-        UpdateCAFromFile(Private, FilePath);\r
-        FreePool (FilePath);\r
-      }\r
-      break;\r
+        if (FilePath != NULL) {\r
+          UpdatePrivateKeyFromFile (Private, FilePath);\r
+          FreePool (FilePath);\r
+        }\r
 \r
-    case KEY_SAVE_PRIVATE_KEY_TO_MEM:\r
+        break;\r
 \r
-      if (Private->FileContext != NULL && Private->FileContext->FHandle != NULL &&\r
-        Private->CurrentNic->UserSelectedProfile != NULL) {\r
+      case KEY_EAP_ENROLL_CERT_FROM_FILE:\r
 \r
         //\r
-        // Read Private Key file to Buffer\r
+        // User will select a cert file from File Explore\r
         //\r
-        Profile = Private->CurrentNic->UserSelectedProfile;\r
-        if (Profile->PrivateKeyData != NULL) {\r
+        FilePath = NULL;\r
+        ChooseFile (NULL, NULL, NULL, &FilePath);\r
 \r
-          ZeroMem (Profile->PrivateKeyData, Profile->PrivateKeyDataSize);\r
-          FreePool (Profile->PrivateKeyData);\r
-          Profile->PrivateKeyData = NULL;\r
+        if (FilePath != NULL) {\r
+          UpdateCAFromFile (Private, FilePath);\r
+          FreePool (FilePath);\r
         }\r
 \r
-        Status = WifiMgrReadFileToBuffer (\r
-                   Private->FileContext,\r
-                   &TempData,\r
-                   &TempDataSize\r
-                   );\r
-        if (EFI_ERROR (Status)) {\r
-          CreatePopUp (\r
-            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-            &Key,\r
-            L"ERROR: Can't read this private key file!",\r
-            NULL\r
-            );\r
-        } else {\r
-\r
-          ASSERT (Private->FileContext->FileName != NULL);\r
-\r
-          Profile->PrivateKeyData = TempData;\r
-          Profile->PrivateKeyDataSize = TempDataSize;\r
-          StrCpyS(Profile->PrivateKeyName, WIFI_FILENAME_STR_MAX_SIZE, Private->FileContext->FileName);\r
-\r
-          DEBUG ((DEBUG_INFO, "[WiFi Connection Manager] Private Key: %s has been enrolled! Size: %d\n",\r
-            Profile->PrivateKeyName, Profile->PrivateKeyDataSize));\r
-        }\r
-      }\r
-      break;\r
-\r
-    case KEY_SAVE_CERT_TO_MEM:\r
-\r
-      if (Private->FileContext != NULL && Private->FileContext->FHandle != NULL &&\r
-        Private->CurrentNic->UserSelectedProfile != NULL) {\r
-\r
-        //\r
-        // Read Cert file to Buffer\r
-        //\r
-        Profile = Private->CurrentNic->UserSelectedProfile;\r
-\r
-        if (Private->FileType == FileTypeCACert) {\r
-          if (Profile->CACertData != NULL) {\r
+        break;\r
 \r
-            ZeroMem (Profile->CACertData, Profile->CACertSize);\r
-            FreePool (Profile->CACertData);\r
-            Profile->CACertData = NULL;\r
+      case KEY_SAVE_PRIVATE_KEY_TO_MEM:\r
+\r
+        if ((Private->FileContext != NULL) && (Private->FileContext->FHandle != NULL) &&\r
+            (Private->CurrentNic->UserSelectedProfile != NULL))\r
+        {\r
+          //\r
+          // Read Private Key file to Buffer\r
+          //\r
+          Profile = Private->CurrentNic->UserSelectedProfile;\r
+          if (Profile->PrivateKeyData != NULL) {\r
+            ZeroMem (Profile->PrivateKeyData, Profile->PrivateKeyDataSize);\r
+            FreePool (Profile->PrivateKeyData);\r
+            Profile->PrivateKeyData = NULL;\r
           }\r
-        } else if (Private->FileType == FileTypeClientCert) {\r
-          if (Profile->ClientCertData != NULL) {\r
 \r
-            ZeroMem (Profile->ClientCertData, Profile->ClientCertSize);\r
-            FreePool (Profile->ClientCertData);\r
-            Profile->ClientCertData = NULL;\r
+          Status = WifiMgrReadFileToBuffer (\r
+                     Private->FileContext,\r
+                     &TempData,\r
+                     &TempDataSize\r
+                     );\r
+          if (EFI_ERROR (Status)) {\r
+            CreatePopUp (\r
+              EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+              &Key,\r
+              L"ERROR: Can't read this private key file!",\r
+              NULL\r
+              );\r
+          } else {\r
+            ASSERT (Private->FileContext->FileName != NULL);\r
+\r
+            Profile->PrivateKeyData     = TempData;\r
+            Profile->PrivateKeyDataSize = TempDataSize;\r
+            StrCpyS (Profile->PrivateKeyName, WIFI_FILENAME_STR_MAX_SIZE, Private->FileContext->FileName);\r
+\r
+            DEBUG ((\r
+              DEBUG_INFO,\r
+              "[WiFi Connection Manager] Private Key: %s has been enrolled! Size: %d\n",\r
+              Profile->PrivateKeyName,\r
+              Profile->PrivateKeyDataSize\r
+              ));\r
           }\r
-        } else {\r
-          break;\r
         }\r
 \r
-        Status = WifiMgrReadFileToBuffer (\r
-                   Private->FileContext,\r
-                   &TempData,\r
-                   &TempDataSize\r
-                   );\r
-        if (EFI_ERROR (Status)) {\r
-          CreatePopUp (\r
-            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-            &Key,\r
-            L"ERROR: Can't read this certificate file!",\r
-            NULL\r
-            );\r
-        } else {\r
+        break;\r
 \r
-          ASSERT (Private->FileContext->FileName != NULL);\r
-          if (Private->FileType == FileTypeCACert) {\r
+      case KEY_SAVE_CERT_TO_MEM:\r
+\r
+        if ((Private->FileContext != NULL) && (Private->FileContext->FHandle != NULL) &&\r
+            (Private->CurrentNic->UserSelectedProfile != NULL))\r
+        {\r
+          //\r
+          // Read Cert file to Buffer\r
+          //\r
+          Profile = Private->CurrentNic->UserSelectedProfile;\r
 \r
-            Profile->CACertData = TempData;\r
-            Profile->CACertSize = TempDataSize;\r
-            StrCpyS(Profile->CACertName, WIFI_FILENAME_STR_MAX_SIZE, Private->FileContext->FileName);\r
-            DEBUG ((DEBUG_INFO, "[WiFi Connection Manager] CA Cert: %s has been enrolled! Size: %d\n",\r
-              Profile->CACertName, Profile->CACertSize));\r
+          if (Private->FileType == FileTypeCACert) {\r
+            if (Profile->CACertData != NULL) {\r
+              ZeroMem (Profile->CACertData, Profile->CACertSize);\r
+              FreePool (Profile->CACertData);\r
+              Profile->CACertData = NULL;\r
+            }\r
+          } else if (Private->FileType == FileTypeClientCert) {\r
+            if (Profile->ClientCertData != NULL) {\r
+              ZeroMem (Profile->ClientCertData, Profile->ClientCertSize);\r
+              FreePool (Profile->ClientCertData);\r
+              Profile->ClientCertData = NULL;\r
+            }\r
           } else {\r
+            break;\r
+          }\r
 \r
-            Profile->ClientCertData = TempData;\r
-            Profile->ClientCertSize = TempDataSize;\r
-            StrCpyS(Profile->ClientCertName, WIFI_FILENAME_STR_MAX_SIZE, Private->FileContext->FileName);\r
-            DEBUG ((DEBUG_INFO, "[WiFi Connection Manager] Client Cert: %s has been enrolled! Size: %d\n",\r
-              Profile->ClientCertName, Profile->ClientCertSize));\r
+          Status = WifiMgrReadFileToBuffer (\r
+                     Private->FileContext,\r
+                     &TempData,\r
+                     &TempDataSize\r
+                     );\r
+          if (EFI_ERROR (Status)) {\r
+            CreatePopUp (\r
+              EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+              &Key,\r
+              L"ERROR: Can't read this certificate file!",\r
+              NULL\r
+              );\r
+          } else {\r
+            ASSERT (Private->FileContext->FileName != NULL);\r
+            if (Private->FileType == FileTypeCACert) {\r
+              Profile->CACertData = TempData;\r
+              Profile->CACertSize = TempDataSize;\r
+              StrCpyS (Profile->CACertName, WIFI_FILENAME_STR_MAX_SIZE, Private->FileContext->FileName);\r
+              DEBUG ((\r
+                DEBUG_INFO,\r
+                "[WiFi Connection Manager] CA Cert: %s has been enrolled! Size: %d\n",\r
+                Profile->CACertName,\r
+                Profile->CACertSize\r
+                ));\r
+            } else {\r
+              Profile->ClientCertData = TempData;\r
+              Profile->ClientCertSize = TempDataSize;\r
+              StrCpyS (Profile->ClientCertName, WIFI_FILENAME_STR_MAX_SIZE, Private->FileContext->FileName);\r
+              DEBUG ((\r
+                DEBUG_INFO,\r
+                "[WiFi Connection Manager] Client Cert: %s has been enrolled! Size: %d\n",\r
+                Profile->ClientCertName,\r
+                Profile->ClientCertSize\r
+                ));\r
+            }\r
           }\r
         }\r
-      }\r
-      break;\r
 \r
-    case KEY_ADD_HIDDEN_NETWORK:\r
-\r
-      //\r
-      // Add a Hidden Network\r
-      //\r
-      if (StrLen (IfrNvData->SSId) < SSID_MIN_LEN ||\r
-        Private->HiddenNetworkCount >= HIDDEN_NETWORK_LIST_COUNT_MAX) {\r
-\r
-        Status = EFI_ABORTED;\r
         break;\r
-      } else {\r
+\r
+      case KEY_ADD_HIDDEN_NETWORK:\r
 \r
         //\r
-        // Check if this SSId is already in Hidden Network List\r
+        // Add a Hidden Network\r
         //\r
-        NET_LIST_FOR_EACH (Entry, &Private->HiddenNetworkList) {\r
-\r
-          HiddenNetwork = NET_LIST_USER_STRUCT_S (Entry, WIFI_HIDDEN_NETWORK_DATA,\r
-                            Link, WIFI_MGR_HIDDEN_NETWORK_SIGNATURE);\r
-          if (StrCmp (HiddenNetwork->SSId, IfrNvData->SSId) == 0) {\r
-\r
-            Status = EFI_ABORTED;\r
-            break;\r
+        if ((StrLen (IfrNvData->SSId) < SSID_MIN_LEN) ||\r
+            (Private->HiddenNetworkCount >= HIDDEN_NETWORK_LIST_COUNT_MAX))\r
+        {\r
+          Status = EFI_ABORTED;\r
+          break;\r
+        } else {\r
+          //\r
+          // Check if this SSId is already in Hidden Network List\r
+          //\r
+          NET_LIST_FOR_EACH (Entry, &Private->HiddenNetworkList) {\r
+            HiddenNetwork = NET_LIST_USER_STRUCT_S (\r
+                              Entry,\r
+                              WIFI_HIDDEN_NETWORK_DATA,\r
+                              Link,\r
+                              WIFI_MGR_HIDDEN_NETWORK_SIGNATURE\r
+                              );\r
+            if (StrCmp (HiddenNetwork->SSId, IfrNvData->SSId) == 0) {\r
+              Status = EFI_ABORTED;\r
+              break;\r
+            }\r
           }\r
         }\r
-      }\r
-\r
-      HiddenNetwork = (WIFI_HIDDEN_NETWORK_DATA *) AllocateZeroPool (sizeof (WIFI_HIDDEN_NETWORK_DATA));\r
-      if (HiddenNetwork == NULL) {\r
-\r
-        Status = EFI_OUT_OF_RESOURCES;\r
-        break;\r
-      }\r
-      HiddenNetwork->Signature = WIFI_MGR_HIDDEN_NETWORK_SIGNATURE;\r
-      StrCpyS (HiddenNetwork->SSId, SSID_STORAGE_SIZE, IfrNvData->SSId);\r
-\r
-      InsertTailList (&Private->HiddenNetworkList, &HiddenNetwork->Link);\r
-      Private->HiddenNetworkCount ++;\r
 \r
-      WifiMgrRefreshHiddenList (Private);\r
-      break;\r
-\r
-    case KEY_REMOVE_HIDDEN_NETWORK:\r
-\r
-      //\r
-      // Remove Hidden Networks\r
-      //\r
-      Entry = GetFirstNode (&Private->HiddenNetworkList);\r
-      RemoveCount = 0;\r
-      for (Index = 0; Index < Private->HiddenNetworkCount; Index ++) {\r
-        if (IfrNvData->HiddenNetworkList[Index] != 0) {\r
+        HiddenNetwork = (WIFI_HIDDEN_NETWORK_DATA *)AllocateZeroPool (sizeof (WIFI_HIDDEN_NETWORK_DATA));\r
+        if (HiddenNetwork == NULL) {\r
+          Status = EFI_OUT_OF_RESOURCES;\r
+          break;\r
+        }\r
 \r
-          HiddenNetwork = NET_LIST_USER_STRUCT_S (Entry, WIFI_HIDDEN_NETWORK_DATA, Link, WIFI_MGR_HIDDEN_NETWORK_SIGNATURE);\r
-          Entry = RemoveEntryList (Entry);\r
-          RemoveCount ++;\r
+        HiddenNetwork->Signature = WIFI_MGR_HIDDEN_NETWORK_SIGNATURE;\r
+        StrCpyS (HiddenNetwork->SSId, SSID_STORAGE_SIZE, IfrNvData->SSId);\r
 \r
-          FreePool (HiddenNetwork);\r
-        } else {\r
-          Entry = GetNextNode (&Private->HiddenNetworkList, Entry);\r
-        }\r
-      }\r
+        InsertTailList (&Private->HiddenNetworkList, &HiddenNetwork->Link);\r
+        Private->HiddenNetworkCount++;\r
 \r
-      Private->HiddenNetworkCount -= RemoveCount;\r
-      WifiMgrRefreshHiddenList (Private);\r
-      break;\r
+        WifiMgrRefreshHiddenList (Private);\r
+        break;\r
 \r
-    default:\r
+      case KEY_REMOVE_HIDDEN_NETWORK:\r
 \r
-      if (QuestionId >= KEY_MAC_ENTRY_BASE && QuestionId < KEY_MAC_ENTRY_BASE + Private->NicCount) {\r
         //\r
-        // User selects a wireless NIC.\r
+        // Remove Hidden Networks\r
         //\r
-        Status = WifiMgrSelectNic (Private, QuestionId);\r
-        if (EFI_ERROR (Status)) {\r
-          CreatePopUp (\r
-            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-            &Key,\r
-            L"ERROR: Fail to operate the wireless NIC!",\r
-            NULL\r
-          );\r
+        Entry       = GetFirstNode (&Private->HiddenNetworkList);\r
+        RemoveCount = 0;\r
+        for (Index = 0; Index < Private->HiddenNetworkCount; Index++) {\r
+          if (IfrNvData->HiddenNetworkList[Index] != 0) {\r
+            HiddenNetwork = NET_LIST_USER_STRUCT_S (Entry, WIFI_HIDDEN_NETWORK_DATA, Link, WIFI_MGR_HIDDEN_NETWORK_SIGNATURE);\r
+            Entry         = RemoveEntryList (Entry);\r
+            RemoveCount++;\r
+\r
+            FreePool (HiddenNetwork);\r
+          } else {\r
+            Entry = GetNextNode (&Private->HiddenNetworkList, Entry);\r
+          }\r
         }\r
-      } else if (Private->CurrentNic != NULL) {\r
-        if (QuestionId >= KEY_AVAILABLE_NETWORK_ENTRY_BASE &&\r
-          QuestionId <= KEY_AVAILABLE_NETWORK_ENTRY_BASE + Private->CurrentNic->MaxProfileIndex) {\r
 \r
-          Status = WifiMgrUserSelectProfileToConnect (Private, QuestionId - KEY_AVAILABLE_NETWORK_ENTRY_BASE);\r
-          if (!EFI_ERROR (Status)) {\r
-            WifiMgrUpdateConnectMessage(Private->CurrentNic, FALSE, NULL);\r
+        Private->HiddenNetworkCount -= RemoveCount;\r
+        WifiMgrRefreshHiddenList (Private);\r
+        break;\r
+\r
+      default:\r
+\r
+        if ((QuestionId >= KEY_MAC_ENTRY_BASE) && (QuestionId < KEY_MAC_ENTRY_BASE + Private->NicCount)) {\r
+          //\r
+          // User selects a wireless NIC.\r
+          //\r
+          Status = WifiMgrSelectNic (Private, QuestionId);\r
+          if (EFI_ERROR (Status)) {\r
+            CreatePopUp (\r
+              EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+              &Key,\r
+              L"ERROR: Fail to operate the wireless NIC!",\r
+              NULL\r
+              );\r
+          }\r
+        } else if (Private->CurrentNic != NULL) {\r
+          if ((QuestionId >= KEY_AVAILABLE_NETWORK_ENTRY_BASE) &&\r
+              (QuestionId <= KEY_AVAILABLE_NETWORK_ENTRY_BASE + Private->CurrentNic->MaxProfileIndex))\r
+          {\r
+            Status = WifiMgrUserSelectProfileToConnect (Private, QuestionId - KEY_AVAILABLE_NETWORK_ENTRY_BASE);\r
+            if (!EFI_ERROR (Status)) {\r
+              WifiMgrUpdateConnectMessage (Private->CurrentNic, FALSE, NULL);\r
+            }\r
           }\r
-        }\r
 \r
-        if (EFI_ERROR (Status)) {\r
-          CreatePopUp (\r
-            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-            &Key,\r
-            L"ERROR: Fail to operate this profile!",\r
-            NULL\r
-          );\r
+          if (EFI_ERROR (Status)) {\r
+            CreatePopUp (\r
+              EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+              &Key,\r
+              L"ERROR: Fail to operate this profile!",\r
+              NULL\r
+              );\r
+          }\r
         }\r
-      }\r
 \r
-      break;\r
+        break;\r
     }\r
   } else if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
     switch (QuestionId) {\r
+      case KEY_SAVE_CERT_TO_MEM:\r
+      case KEY_SAVE_PRIVATE_KEY_TO_MEM:\r
 \r
-    case KEY_SAVE_CERT_TO_MEM:\r
-    case KEY_SAVE_PRIVATE_KEY_TO_MEM:\r
-\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
-      break;\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
+        break;\r
 \r
-    case KEY_NO_SAVE_CERT_TO_MEM:\r
-    case KEY_NO_SAVE_PRIVATE_KEY_TO_MEM:\r
+      case KEY_NO_SAVE_CERT_TO_MEM:\r
+      case KEY_NO_SAVE_PRIVATE_KEY_TO_MEM:\r
 \r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
-      break;\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
+        break;\r
 \r
-    default:\r
+      default:\r
 \r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
-      break;\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
+        break;\r
     }\r
   } else if (Action == EFI_BROWSER_ACTION_RETRIEVE) {\r
-\r
     switch (QuestionId) {\r
+      case KEY_REFRESH_NETWORK_LIST:\r
 \r
-    case KEY_REFRESH_NETWORK_LIST:\r
-\r
-      WifiMgrRefreshNetworkList (Private, IfrNvData);\r
-      break;\r
+        WifiMgrRefreshNetworkList (Private, IfrNvData);\r
+        break;\r
 \r
-    default:\r
-      break;\r
+      default:\r
+        break;\r
     }\r
   }\r
 \r
@@ -1890,7 +1928,7 @@ WifiMgrDxeHiiConfigAccessCallback (
     // Pass changed uncommitted data back to Form Browser.\r
     //\r
     BufferSize = sizeof (WIFI_MANAGER_IFR_NVDATA);\r
-    HiiSetBrowserData (&gWifiConfigFormSetGuid, mVendorStorageName, BufferSize, (UINT8 *) IfrNvData, NULL);\r
+    HiiSetBrowserData (&gWifiConfigFormSetGuid, mVendorStorageName, BufferSize, (UINT8 *)IfrNvData, NULL);\r
   }\r
 \r
   ZeroMem (IfrNvData, sizeof (WIFI_MANAGER_IFR_NVDATA));\r
@@ -1911,10 +1949,10 @@ WifiMgrDxeHiiConfigAccessCallback (
 **/\r
 EFI_STATUS\r
 WifiMgrDxeConfigFormInit (\r
-  WIFI_MGR_PRIVATE_DATA    *Private\r
-)\r
+  WIFI_MGR_PRIVATE_DATA  *Private\r
+  )\r
 {\r
-  EFI_STATUS                      Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (Private == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1981,17 +2019,16 @@ WifiMgrDxeConfigFormInit (
 **/\r
 EFI_STATUS\r
 WifiMgrDxeConfigFormUnload (\r
-  WIFI_MGR_PRIVATE_DATA    *Private\r
-)\r
+  WIFI_MGR_PRIVATE_DATA  *Private\r
+  )\r
 {\r
-  EFI_STATUS    Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (Private == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   if (Private->FileContext != NULL) {\r
-\r
     if (Private->FileContext->FHandle != NULL) {\r
       Private->FileContext->FHandle->Close (Private->FileContext->FHandle);\r
     }\r
@@ -1999,19 +2036,20 @@ WifiMgrDxeConfigFormUnload (
     if (Private->FileContext->FileName != NULL) {\r
       FreePool (Private->FileContext->FileName);\r
     }\r
+\r
     FreePool (Private->FileContext);\r
   }\r
 \r
-  HiiRemovePackages(Private->RegisteredHandle);\r
+  HiiRemovePackages (Private->RegisteredHandle);\r
 \r
   Status = gBS->UninstallMultipleProtocolInterfaces (\r
-             Private->DriverHandle,\r
-             &gEfiDevicePathProtocolGuid,\r
-             &mWifiMgrDxeHiiVendorDevicePath,\r
-             &gEfiHiiConfigAccessProtocolGuid,\r
-             &Private->ConfigAccess,\r
-             NULL\r
-             );\r
+                  Private->DriverHandle,\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  &mWifiMgrDxeHiiVendorDevicePath,\r
+                  &gEfiHiiConfigAccessProtocolGuid,\r
+                  &Private->ConfigAccess,\r
+                  NULL\r
+                  );\r
 \r
   return Status;\r
 }\r
index ebb18e1a98d310ffd3ba78d5b7282e3a6e82df0e..029cb55ac5926d0d2040ffd2ad4af4bb04375fb1 100644 (file)
@@ -24,9 +24,9 @@
 **/\r
 VOID\r
 WifiMgrUpdateConnectMessage (\r
-  IN  WIFI_MGR_DEVICE_DATA      *Nic,\r
-  IN  BOOLEAN                   ConnectStateChanged,\r
-  IN  EFI_STRING                ConnectStatusMessage\r
+  IN  WIFI_MGR_DEVICE_DATA  *Nic,\r
+  IN  BOOLEAN               ConnectStateChanged,\r
+  IN  EFI_STRING            ConnectStatusMessage\r
   );\r
 \r
 /**\r
@@ -183,12 +183,12 @@ WifiMgrDxeHiiConfigAccessRouteConfig (
 EFI_STATUS\r
 EFIAPI\r
 WifiMgrDxeHiiConfigAccessCallback (\r
-  IN     CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN     EFI_BROWSER_ACTION                     Action,\r
-  IN     EFI_QUESTION_ID                        QuestionId,\r
-  IN     UINT8                                  Type,\r
-  IN OUT EFI_IFR_TYPE_VALUE                     *Value,\r
-  OUT    EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
+  IN     CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN     EFI_BROWSER_ACTION                    Action,\r
+  IN     EFI_QUESTION_ID                       QuestionId,\r
+  IN     UINT8                                 Type,\r
+  IN OUT EFI_IFR_TYPE_VALUE                    *Value,\r
+  OUT    EFI_BROWSER_ACTION_REQUEST            *ActionRequest\r
   );\r
 \r
 /**\r
@@ -203,7 +203,7 @@ WifiMgrDxeHiiConfigAccessCallback (
 **/\r
 EFI_STATUS\r
 WifiMgrDxeConfigFormInit (\r
-  WIFI_MGR_PRIVATE_DATA    *Private\r
+  WIFI_MGR_PRIVATE_DATA  *Private\r
   );\r
 \r
 /**\r
@@ -217,7 +217,7 @@ WifiMgrDxeConfigFormInit (
 **/\r
 EFI_STATUS\r
 WifiMgrDxeConfigFormUnload (\r
-  WIFI_MGR_PRIVATE_DATA    *Private\r
+  WIFI_MGR_PRIVATE_DATA  *Private\r
   );\r
 \r
 /**\r
@@ -234,8 +234,8 @@ WifiMgrDxeConfigFormUnload (
 **/\r
 EFI_STATUS\r
 WifiMgrRefreshNetworkList (\r
-  IN    WIFI_MGR_PRIVATE_DATA        *Private,\r
-  OUT   WIFI_MANAGER_IFR_NVDATA      *IfrNvData\r
+  IN    WIFI_MGR_PRIVATE_DATA    *Private,\r
+  OUT   WIFI_MANAGER_IFR_NVDATA  *IfrNvData\r
   );\r
 \r
 #endif\r
index 2fbd3ebad2fe929f98d6d7710d55490e6a508104..7630c0695c39f254811c87fb3b5085e7a2cd9f02 100644 (file)
@@ -9,13 +9,13 @@
 \r
 #include "WifiConnectionMgrDxe.h"\r
 \r
-EFI_EAP_TYPE mEapAuthMethod[] = {\r
+EFI_EAP_TYPE  mEapAuthMethod[] = {\r
   EFI_EAP_TYPE_TTLS,\r
   EFI_EAP_TYPE_PEAP,\r
   EFI_EAP_TYPE_EAPTLS\r
 };\r
 \r
-EFI_EAP_TYPE mEapSecondAuthMethod[] = {\r
+EFI_EAP_TYPE  mEapSecondAuthMethod[] = {\r
   EFI_EAP_TYPE_MSCHAPV2\r
 };\r
 \r
@@ -32,28 +32,28 @@ EFI_EAP_TYPE mEapSecondAuthMethod[] = {
 VOID\r
 EFIAPI\r
 WifiMgrOnScanFinished (\r
-  IN  EFI_EVENT                     Event,\r
-  IN  VOID                          *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  WIFI_MGR_MAC_CONFIG_TOKEN         *ConfigToken;\r
-  WIFI_MGR_DEVICE_DATA              *Nic;\r
-  WIFI_MGR_NETWORK_PROFILE          *Profile;\r
-  EFI_80211_NETWORK                 *Network;\r
-  UINTN                             DataSize;\r
-  EFI_80211_NETWORK_DESCRIPTION     *NetworkDescription;\r
-  EFI_80211_GET_NETWORKS_RESULT     *Result;\r
-  LIST_ENTRY                        *Entry;\r
-  UINT8                             SecurityType;\r
-  BOOLEAN                           AKMSuiteSupported;\r
-  BOOLEAN                           CipherSuiteSupported;\r
-  CHAR8                             *AsciiSSId;\r
-  UINTN                             Index;\r
+  EFI_STATUS                     Status;\r
+  WIFI_MGR_MAC_CONFIG_TOKEN      *ConfigToken;\r
+  WIFI_MGR_DEVICE_DATA           *Nic;\r
+  WIFI_MGR_NETWORK_PROFILE       *Profile;\r
+  EFI_80211_NETWORK              *Network;\r
+  UINTN                          DataSize;\r
+  EFI_80211_NETWORK_DESCRIPTION  *NetworkDescription;\r
+  EFI_80211_GET_NETWORKS_RESULT  *Result;\r
+  LIST_ENTRY                     *Entry;\r
+  UINT8                          SecurityType;\r
+  BOOLEAN                        AKMSuiteSupported;\r
+  BOOLEAN                        CipherSuiteSupported;\r
+  CHAR8                          *AsciiSSId;\r
+  UINTN                          Index;\r
 \r
   ASSERT (Context != NULL);\r
 \r
-  ConfigToken = (WIFI_MGR_MAC_CONFIG_TOKEN *) Context;\r
+  ConfigToken = (WIFI_MGR_MAC_CONFIG_TOKEN *)Context;\r
   ASSERT (ConfigToken->Nic != NULL);\r
   ASSERT (ConfigToken->Type == TokenTypeGetNetworksToken);\r
 \r
@@ -69,29 +69,32 @@ WifiMgrOnScanFinished (
   //\r
   // Clean previous result, and update network list according to the scan result\r
   //\r
-  Nic->AvailableCount    = 0;\r
+  Nic->AvailableCount = 0;\r
 \r
   NET_LIST_FOR_EACH (Entry, &Nic->ProfileList) {\r
-    Profile = NET_LIST_USER_STRUCT_S (Entry, WIFI_MGR_NETWORK_PROFILE,\r
-                Link, WIFI_MGR_PROFILE_SIGNATURE);\r
+    Profile = NET_LIST_USER_STRUCT_S (\r
+                Entry,\r
+                WIFI_MGR_NETWORK_PROFILE,\r
+                Link,\r
+                WIFI_MGR_PROFILE_SIGNATURE\r
+                );\r
     Profile->IsAvailable = FALSE;\r
   }\r
 \r
   if (Result == NULL) {\r
     gBS->SignalEvent (Nic->Private->NetworkListRefreshEvent);\r
-    WifiMgrFreeToken(ConfigToken);\r
+    WifiMgrFreeToken (ConfigToken);\r
     return;\r
   }\r
 \r
-  for (Index = 0; Index < Result->NumOfNetworkDesc; Index ++) {\r
-\r
+  for (Index = 0; Index < Result->NumOfNetworkDesc; Index++) {\r
     NetworkDescription = Result->NetworkDesc + Index;\r
     if (NetworkDescription == NULL) {\r
       continue;\r
     }\r
 \r
     Network = &NetworkDescription->Network;\r
-    if (Network == NULL || Network->SSId.SSIdLen == 0) {\r
+    if ((Network == NULL) || (Network->SSId.SSIdLen == 0)) {\r
       continue;\r
     }\r
 \r
@@ -104,22 +107,21 @@ WifiMgrOnScanFinished (
                &CipherSuiteSupported\r
                );\r
     if (EFI_ERROR (Status)) {\r
-\r
-      SecurityType          = SECURITY_TYPE_UNKNOWN;\r
-      AKMSuiteSupported     = FALSE;\r
-      CipherSuiteSupported  = FALSE;\r
+      SecurityType         = SECURITY_TYPE_UNKNOWN;\r
+      AKMSuiteSupported    = FALSE;\r
+      CipherSuiteSupported = FALSE;\r
     }\r
 \r
-    AsciiSSId = (CHAR8*) AllocateZeroPool(sizeof (CHAR8) * (Network->SSId.SSIdLen + 1));\r
+    AsciiSSId = (CHAR8 *)AllocateZeroPool (sizeof (CHAR8) * (Network->SSId.SSIdLen + 1));\r
     if (AsciiSSId == NULL) {\r
       continue;\r
     }\r
-    CopyMem(AsciiSSId, (CHAR8 *) Network->SSId.SSId, sizeof (CHAR8) * Network->SSId.SSIdLen);\r
+\r
+    CopyMem (AsciiSSId, (CHAR8 *)Network->SSId.SSId, sizeof (CHAR8) * Network->SSId.SSIdLen);\r
     *(AsciiSSId + Network->SSId.SSIdLen) = '\0';\r
 \r
     Profile = WifiMgrGetProfileByAsciiSSId (AsciiSSId, SecurityType, &Nic->ProfileList);\r
     if (Profile == NULL) {\r
-\r
       if (Nic->MaxProfileIndex >= NETWORK_LIST_COUNT_MAX) {\r
         FreePool (AsciiSSId);\r
         continue;\r
@@ -133,66 +135,69 @@ WifiMgrOnScanFinished (
         FreePool (AsciiSSId);\r
         continue;\r
       }\r
+\r
       Profile->Signature    = WIFI_MGR_PROFILE_SIGNATURE;\r
       Profile->NicIndex     = Nic->NicIndex;\r
       Profile->ProfileIndex = Nic->MaxProfileIndex + 1;\r
       AsciiStrToUnicodeStrS (AsciiSSId, Profile->SSId, SSID_STORAGE_SIZE);\r
       InsertTailList (&Nic->ProfileList, &Profile->Link);\r
-      Nic->MaxProfileIndex ++;\r
+      Nic->MaxProfileIndex++;\r
     }\r
+\r
     FreePool (AsciiSSId);\r
 \r
     //\r
-    //May receive duplicate networks in scan results, check if it has already\r
-    //been processed.\r
+    // May receive duplicate networks in scan results, check if it has already\r
+    // been processed.\r
     //\r
     if (!Profile->IsAvailable) {\r
-\r
       Profile->IsAvailable          = TRUE;\r
       Profile->SecurityType         = SecurityType;\r
       Profile->AKMSuiteSupported    = AKMSuiteSupported;\r
       Profile->CipherSuiteSupported = CipherSuiteSupported;\r
       Profile->NetworkQuality       = NetworkDescription->NetworkQuality;\r
-      Nic->AvailableCount ++;\r
+      Nic->AvailableCount++;\r
 \r
       //\r
-      //Copy BSSType and SSId\r
+      // Copy BSSType and SSId\r
       //\r
-      CopyMem(&Profile->Network, Network, sizeof (EFI_80211_NETWORK));\r
+      CopyMem (&Profile->Network, Network, sizeof (EFI_80211_NETWORK));\r
 \r
       //\r
-      //Copy AKMSuite list\r
+      // Copy AKMSuite list\r
       //\r
       if (Network->AKMSuite != NULL) {\r
-\r
         if (Network->AKMSuite->AKMSuiteCount == 0) {\r
           DataSize = sizeof (EFI_80211_AKM_SUITE_SELECTOR);\r
         } else {\r
           DataSize = sizeof (EFI_80211_AKM_SUITE_SELECTOR) + sizeof (EFI_80211_SUITE_SELECTOR)\r
-                       * (Network->AKMSuite->AKMSuiteCount - 1);\r
+                     * (Network->AKMSuite->AKMSuiteCount - 1);\r
         }\r
-        Profile->Network.AKMSuite = (EFI_80211_AKM_SUITE_SELECTOR *) AllocateZeroPool (DataSize);\r
+\r
+        Profile->Network.AKMSuite = (EFI_80211_AKM_SUITE_SELECTOR *)AllocateZeroPool (DataSize);\r
         if (Profile->Network.AKMSuite == NULL) {\r
           continue;\r
         }\r
+\r
         CopyMem (Profile->Network.AKMSuite, Network->AKMSuite, DataSize);\r
       }\r
 \r
       //\r
-      //Copy CipherSuite list\r
+      // Copy CipherSuite list\r
       //\r
       if (Network->CipherSuite != NULL) {\r
-\r
         if (Network->CipherSuite->CipherSuiteCount == 0) {\r
           DataSize = sizeof (EFI_80211_CIPHER_SUITE_SELECTOR);\r
         } else {\r
           DataSize = sizeof (EFI_80211_CIPHER_SUITE_SELECTOR) + sizeof (EFI_80211_SUITE_SELECTOR)\r
-                       * (Network->CipherSuite->CipherSuiteCount - 1);\r
+                     * (Network->CipherSuite->CipherSuiteCount - 1);\r
         }\r
-        Profile->Network.CipherSuite = (EFI_80211_CIPHER_SUITE_SELECTOR *) AllocateZeroPool (DataSize);\r
+\r
+        Profile->Network.CipherSuite = (EFI_80211_CIPHER_SUITE_SELECTOR *)AllocateZeroPool (DataSize);\r
         if (Profile->Network.CipherSuite == NULL) {\r
           continue;\r
         }\r
+\r
         CopyMem (Profile->Network.CipherSuite, Network->CipherSuite, DataSize);\r
       }\r
     } else {\r
@@ -202,6 +207,7 @@ WifiMgrOnScanFinished (
       if (Profile->NetworkQuality < NetworkDescription->NetworkQuality) {\r
         Profile->NetworkQuality = NetworkDescription->NetworkQuality;\r
       }\r
+\r
       continue;\r
     }\r
   }\r
@@ -212,14 +218,14 @@ WifiMgrOnScanFinished (
   // The current connected network should always be available until disconnection\r
   // happens in Wifi FW layer, even when it is not in this time's scan result.\r
   //\r
-  if (Nic->ConnectState == WifiMgrConnectedToAp && Nic->CurrentOperateNetwork != NULL) {\r
+  if ((Nic->ConnectState == WifiMgrConnectedToAp) && (Nic->CurrentOperateNetwork != NULL)) {\r
     if (!Nic->CurrentOperateNetwork->IsAvailable) {\r
       Nic->CurrentOperateNetwork->IsAvailable = TRUE;\r
-      Nic->AvailableCount ++;\r
+      Nic->AvailableCount++;\r
     }\r
   }\r
 \r
-  WifiMgrFreeToken(ConfigToken);\r
+  WifiMgrFreeToken (ConfigToken);\r
 }\r
 \r
 /**\r
@@ -236,20 +242,20 @@ WifiMgrOnScanFinished (
 **/\r
 EFI_STATUS\r
 WifiMgrStartScan (\r
-  IN      WIFI_MGR_DEVICE_DATA        *Nic\r
+  IN      WIFI_MGR_DEVICE_DATA  *Nic\r
   )\r
 {\r
-  EFI_STATUS                          Status;\r
-  EFI_TPL                             OldTpl;\r
-  WIFI_MGR_MAC_CONFIG_TOKEN           *ConfigToken;\r
-  EFI_80211_GET_NETWORKS_TOKEN        *GetNetworksToken;\r
-  UINT32                              HiddenSSIdIndex;\r
-  UINT32                              HiddenSSIdCount;\r
-  EFI_80211_SSID                      *HiddenSSIdList;\r
-  WIFI_HIDDEN_NETWORK_DATA            *HiddenNetwork;\r
-  LIST_ENTRY                          *Entry;\r
-\r
-  if (Nic == NULL || Nic->Wmp == NULL) {\r
+  EFI_STATUS                    Status;\r
+  EFI_TPL                       OldTpl;\r
+  WIFI_MGR_MAC_CONFIG_TOKEN     *ConfigToken;\r
+  EFI_80211_GET_NETWORKS_TOKEN  *GetNetworksToken;\r
+  UINT32                        HiddenSSIdIndex;\r
+  UINT32                        HiddenSSIdCount;\r
+  EFI_80211_SSID                *HiddenSSIdList;\r
+  WIFI_HIDDEN_NETWORK_DATA      *HiddenNetwork;\r
+  LIST_ENTRY                    *Entry;\r
+\r
+  if ((Nic == NULL) || (Nic->Wmp == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -265,61 +271,70 @@ WifiMgrStartScan (
   HiddenSSIdIndex = 0;\r
 \r
   //\r
-  //create a new get network token\r
+  // create a new get network token\r
   //\r
-  ConfigToken     = AllocateZeroPool (sizeof (WIFI_MGR_MAC_CONFIG_TOKEN));\r
+  ConfigToken = AllocateZeroPool (sizeof (WIFI_MGR_MAC_CONFIG_TOKEN));\r
   if (ConfigToken == NULL) {\r
     gBS->RestoreTPL (OldTpl);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  ConfigToken->Type      = TokenTypeGetNetworksToken;\r
-  ConfigToken->Nic       = Nic;\r
+  ConfigToken->Type                   = TokenTypeGetNetworksToken;\r
+  ConfigToken->Nic                    = Nic;\r
   ConfigToken->Token.GetNetworksToken = AllocateZeroPool (sizeof (EFI_80211_GET_NETWORKS_TOKEN));\r
   if (ConfigToken->Token.GetNetworksToken == NULL) {\r
-    WifiMgrFreeToken(ConfigToken);\r
+    WifiMgrFreeToken (ConfigToken);\r
     gBS->RestoreTPL (OldTpl);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   GetNetworksToken = ConfigToken->Token.GetNetworksToken;\r
 \r
   //\r
   // There are some hidden networks to scan, add them into scan list\r
   //\r
   if (HiddenSSIdCount > 0) {\r
-    HiddenSSIdList = AllocateZeroPool(HiddenSSIdCount * sizeof (EFI_80211_SSID));\r
+    HiddenSSIdList = AllocateZeroPool (HiddenSSIdCount * sizeof (EFI_80211_SSID));\r
     if (HiddenSSIdList == NULL) {\r
-      WifiMgrFreeToken(ConfigToken);\r
+      WifiMgrFreeToken (ConfigToken);\r
       gBS->RestoreTPL (OldTpl);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
     HiddenSSIdIndex = 0;\r
     NET_LIST_FOR_EACH (Entry, &Nic->Private->HiddenNetworkList) {\r
-\r
-      HiddenNetwork = NET_LIST_USER_STRUCT_S (Entry, WIFI_HIDDEN_NETWORK_DATA,\r
-                        Link, WIFI_MGR_HIDDEN_NETWORK_SIGNATURE);\r
-      HiddenSSIdList[HiddenSSIdIndex].SSIdLen = (UINT8) StrLen (HiddenNetwork->SSId);\r
-      UnicodeStrToAsciiStrS(HiddenNetwork->SSId,\r
-        (CHAR8 *) HiddenSSIdList[HiddenSSIdIndex].SSId, SSID_STORAGE_SIZE);\r
-      HiddenSSIdIndex ++;\r
+      HiddenNetwork = NET_LIST_USER_STRUCT_S (\r
+                        Entry,\r
+                        WIFI_HIDDEN_NETWORK_DATA,\r
+                        Link,\r
+                        WIFI_MGR_HIDDEN_NETWORK_SIGNATURE\r
+                        );\r
+      HiddenSSIdList[HiddenSSIdIndex].SSIdLen = (UINT8)StrLen (HiddenNetwork->SSId);\r
+      UnicodeStrToAsciiStrS (\r
+        HiddenNetwork->SSId,\r
+        (CHAR8 *)HiddenSSIdList[HiddenSSIdIndex].SSId,\r
+        SSID_STORAGE_SIZE\r
+        );\r
+      HiddenSSIdIndex++;\r
     }\r
-    GetNetworksToken->Data = AllocateZeroPool (sizeof (EFI_80211_GET_NETWORKS_DATA) +\r
-                               (HiddenSSIdCount - 1) * sizeof (EFI_80211_SSID));\r
+    GetNetworksToken->Data = AllocateZeroPool (\r
+                               sizeof (EFI_80211_GET_NETWORKS_DATA) +\r
+                               (HiddenSSIdCount - 1) * sizeof (EFI_80211_SSID)\r
+                               );\r
     if (GetNetworksToken->Data == NULL) {\r
       FreePool (HiddenSSIdList);\r
-      WifiMgrFreeToken(ConfigToken);\r
+      WifiMgrFreeToken (ConfigToken);\r
       gBS->RestoreTPL (OldTpl);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     GetNetworksToken->Data->NumOfSSID = HiddenSSIdCount;\r
-    CopyMem(GetNetworksToken->Data->SSIDList, HiddenSSIdList, HiddenSSIdCount * sizeof (EFI_80211_SSID));\r
-    FreePool(HiddenSSIdList);\r
+    CopyMem (GetNetworksToken->Data->SSIDList, HiddenSSIdList, HiddenSSIdCount * sizeof (EFI_80211_SSID));\r
+    FreePool (HiddenSSIdList);\r
   } else {\r
-\r
     GetNetworksToken->Data = AllocateZeroPool (sizeof (EFI_80211_GET_NETWORKS_DATA));\r
     if (GetNetworksToken->Data == NULL) {\r
-      WifiMgrFreeToken(ConfigToken);\r
+      WifiMgrFreeToken (ConfigToken);\r
       gBS->RestoreTPL (OldTpl);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
@@ -328,7 +343,7 @@ WifiMgrStartScan (
   }\r
 \r
   //\r
-  //Create a handle when scan process ends\r
+  // Create a handle when scan process ends\r
   //\r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
@@ -338,18 +353,18 @@ WifiMgrStartScan (
                   &GetNetworksToken->Event\r
                   );\r
   if (EFI_ERROR (Status)) {\r
-    WifiMgrFreeToken(ConfigToken);\r
+    WifiMgrFreeToken (ConfigToken);\r
     gBS->RestoreTPL (OldTpl);\r
     return Status;\r
   }\r
 \r
   //\r
-  //Start scan ...\r
+  // Start scan ...\r
   //\r
   Status = Nic->Wmp->GetNetworks (Nic->Wmp, GetNetworksToken);\r
   if (EFI_ERROR (Status)) {\r
-    Nic->ScanState  = WifiMgrScanFinished;\r
-    WifiMgrFreeToken(ConfigToken);\r
+    Nic->ScanState = WifiMgrScanFinished;\r
+    WifiMgrFreeToken (ConfigToken);\r
     gBS->RestoreTPL (OldTpl);\r
     return Status;\r
   }\r
@@ -373,45 +388,56 @@ WifiMgrStartScan (
 **/\r
 EFI_STATUS\r
 WifiMgrConfigPassword (\r
-  IN    WIFI_MGR_DEVICE_DATA              *Nic,\r
-  IN    WIFI_MGR_NETWORK_PROFILE          *Profile\r
+  IN    WIFI_MGR_DEVICE_DATA      *Nic,\r
+  IN    WIFI_MGR_NETWORK_PROFILE  *Profile\r
   )\r
 {\r
-  EFI_STATUS                 Status;\r
-  EFI_SUPPLICANT_PROTOCOL    *Supplicant;\r
-  EFI_80211_SSID             SSId;\r
-  UINT8                      *AsciiPassword;\r
+  EFI_STATUS               Status;\r
+  EFI_SUPPLICANT_PROTOCOL  *Supplicant;\r
+  EFI_80211_SSID           SSId;\r
+  UINT8                    *AsciiPassword;\r
 \r
-  if (Nic == NULL || Nic->Supplicant == NULL || Profile == NULL) {\r
+  if ((Nic == NULL) || (Nic->Supplicant == NULL) || (Profile == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   Supplicant = Nic->Supplicant;\r
   //\r
-  //Set SSId to supplicant\r
+  // Set SSId to supplicant\r
   //\r
   SSId.SSIdLen = Profile->Network.SSId.SSIdLen;\r
-  CopyMem(SSId.SSId, Profile->Network.SSId.SSId, sizeof (Profile->Network.SSId.SSId));\r
-  Status = Supplicant->SetData(Supplicant,EfiSupplicant80211TargetSSIDName,\r
-                         (VOID *)&SSId, sizeof(EFI_80211_SSID));\r
-  if (EFI_ERROR(Status)) {\r
+  CopyMem (SSId.SSId, Profile->Network.SSId.SSId, sizeof (Profile->Network.SSId.SSId));\r
+  Status = Supplicant->SetData (\r
+                         Supplicant,\r
+                         EfiSupplicant80211TargetSSIDName,\r
+                         (VOID *)&SSId,\r
+                         sizeof (EFI_80211_SSID)\r
+                         );\r
+  if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   //\r
-  //Set password to supplicant\r
+  // Set password to supplicant\r
   //\r
   if (StrLen (Profile->Password) < PASSWORD_MIN_LEN) {\r
     return EFI_NOT_FOUND;\r
   }\r
-  AsciiPassword = AllocateZeroPool ((StrLen(Profile->Password) + 1) * sizeof (UINT8));\r
+\r
+  AsciiPassword = AllocateZeroPool ((StrLen (Profile->Password) + 1) * sizeof (UINT8));\r
   if (AsciiPassword == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
-  UnicodeStrToAsciiStrS (Profile->Password, (CHAR8 *) AsciiPassword, PASSWORD_STORAGE_SIZE);\r
-  Status = Supplicant->SetData (Supplicant, EfiSupplicant80211PskPassword,\r
-                         AsciiPassword, (StrLen(Profile->Password) + 1) * sizeof (UINT8));\r
-  ZeroMem (AsciiPassword, AsciiStrLen ((CHAR8 *) AsciiPassword) + 1);\r
-  FreePool(AsciiPassword);\r
+\r
+  UnicodeStrToAsciiStrS (Profile->Password, (CHAR8 *)AsciiPassword, PASSWORD_STORAGE_SIZE);\r
+  Status = Supplicant->SetData (\r
+                         Supplicant,\r
+                         EfiSupplicant80211PskPassword,\r
+                         AsciiPassword,\r
+                         (StrLen (Profile->Password) + 1) * sizeof (UINT8)\r
+                         );\r
+  ZeroMem (AsciiPassword, AsciiStrLen ((CHAR8 *)AsciiPassword) + 1);\r
+  FreePool (AsciiPassword);\r
 \r
   return Status;\r
 }\r
@@ -435,51 +461,59 @@ WifiMgrConfigPassword (
 **/\r
 EFI_STATUS\r
 WifiMgrConfigEap (\r
-  IN    WIFI_MGR_DEVICE_DATA              *Nic,\r
-  IN    WIFI_MGR_NETWORK_PROFILE          *Profile\r
+  IN    WIFI_MGR_DEVICE_DATA      *Nic,\r
+  IN    WIFI_MGR_NETWORK_PROFILE  *Profile\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  EFI_EAP_CONFIGURATION_PROTOCOL    *EapConfig;\r
-  EFI_EAP_TYPE                      EapAuthMethod;\r
-  EFI_EAP_TYPE                      EapSecondAuthMethod;\r
-  EFI_EAP_TYPE                      *AuthMethodList;\r
-  CHAR8                             *Identity;\r
-  UINTN                             IdentitySize;\r
-  CHAR16                            *Password;\r
-  UINTN                             PasswordSize;\r
-  UINTN                             EncryptPasswordLen;\r
-  CHAR8                             *AsciiEncryptPassword;\r
-  UINTN                             AuthMethodListSize;\r
-  UINTN                             Index;\r
-\r
-  if (Nic == NULL || Nic->EapConfig == NULL || Profile == NULL) {\r
+  EFI_STATUS                      Status;\r
+  EFI_EAP_CONFIGURATION_PROTOCOL  *EapConfig;\r
+  EFI_EAP_TYPE                    EapAuthMethod;\r
+  EFI_EAP_TYPE                    EapSecondAuthMethod;\r
+  EFI_EAP_TYPE                    *AuthMethodList;\r
+  CHAR8                           *Identity;\r
+  UINTN                           IdentitySize;\r
+  CHAR16                          *Password;\r
+  UINTN                           PasswordSize;\r
+  UINTN                           EncryptPasswordLen;\r
+  CHAR8                           *AsciiEncryptPassword;\r
+  UINTN                           AuthMethodListSize;\r
+  UINTN                           Index;\r
+\r
+  if ((Nic == NULL) || (Nic->EapConfig == NULL) || (Profile == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   EapConfig = Nic->EapConfig;\r
 \r
   if (Profile->EapAuthMethod >= EAP_AUTH_METHOD_MAX) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   EapAuthMethod = mEapAuthMethod[Profile->EapAuthMethod];\r
 \r
   if (EapAuthMethod != EFI_EAP_TYPE_EAPTLS) {\r
     if (Profile->EapSecondAuthMethod >= EAP_SEAUTH_METHOD_MAX) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     EapSecondAuthMethod = mEapSecondAuthMethod[Profile->EapSecondAuthMethod];\r
   }\r
 \r
   //\r
-  //The first time to get Supported Auth Method list, return the size.\r
+  // The first time to get Supported Auth Method list, return the size.\r
   //\r
-  AuthMethodListSize  = 0;\r
-  AuthMethodList      = NULL;\r
-  Status = EapConfig->GetData (EapConfig, EFI_EAP_TYPE_ATTRIBUTE, EfiEapConfigEapSupportedAuthMethod,\r
-                        (VOID *) AuthMethodList, &AuthMethodListSize);\r
+  AuthMethodListSize = 0;\r
+  AuthMethodList     = NULL;\r
+  Status             = EapConfig->GetData (\r
+                                    EapConfig,\r
+                                    EFI_EAP_TYPE_ATTRIBUTE,\r
+                                    EfiEapConfigEapSupportedAuthMethod,\r
+                                    (VOID *)AuthMethodList,\r
+                                    &AuthMethodListSize\r
+                                    );\r
   if (Status == EFI_SUCCESS) {\r
     //\r
-    //No Supported Eap Auth Method\r
+    // No Supported Eap Auth Method\r
     //\r
     return EFI_UNSUPPORTED;\r
   } else if (Status != EFI_BUFFER_TOO_SMALL) {\r
@@ -490,48 +524,62 @@ WifiMgrConfigEap (
   // The second time to get Supported Auth Method list, return the list.\r
   // In current design, only EAPTLS, TTLS and PEAP are supported\r
   //\r
-  AuthMethodList = (EFI_EAP_TYPE *) AllocateZeroPool(AuthMethodListSize);\r
+  AuthMethodList = (EFI_EAP_TYPE *)AllocateZeroPool (AuthMethodListSize);\r
   if (AuthMethodList == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
-  Status = EapConfig->GetData (EapConfig, EFI_EAP_TYPE_ATTRIBUTE, EfiEapConfigEapSupportedAuthMethod,\r
-                        (VOID *) AuthMethodList, &AuthMethodListSize);\r
+\r
+  Status = EapConfig->GetData (\r
+                        EapConfig,\r
+                        EFI_EAP_TYPE_ATTRIBUTE,\r
+                        EfiEapConfigEapSupportedAuthMethod,\r
+                        (VOID *)AuthMethodList,\r
+                        &AuthMethodListSize\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     FreePool (AuthMethodList);\r
     return Status;\r
   }\r
 \r
   //\r
-  //Check if EapAuthMethod is in supported Auth Method list, if found, skip the loop.\r
+  // Check if EapAuthMethod is in supported Auth Method list, if found, skip the loop.\r
   //\r
-  for (Index = 0; Index < AuthMethodListSize / sizeof (EFI_EAP_TYPE); Index ++) {\r
+  for (Index = 0; Index < AuthMethodListSize / sizeof (EFI_EAP_TYPE); Index++) {\r
     if (EapAuthMethod == AuthMethodList[Index]) {\r
       break;\r
     }\r
   }\r
+\r
   if (Index == AuthMethodListSize / sizeof (EFI_EAP_TYPE)) {\r
     FreePool (AuthMethodList);\r
     return EFI_UNSUPPORTED;\r
   }\r
+\r
   FreePool (AuthMethodList);\r
 \r
   //\r
   // Set Identity to Eap peer, Mandatory field for PEAP and TTLS\r
   //\r
   if (StrLen (Profile->EapIdentity) > 0) {\r
-\r
-    IdentitySize = sizeof(CHAR8) * (StrLen(Profile->EapIdentity) + 1);\r
-    Identity = AllocateZeroPool (IdentitySize);\r
+    IdentitySize = sizeof (CHAR8) * (StrLen (Profile->EapIdentity) + 1);\r
+    Identity     = AllocateZeroPool (IdentitySize);\r
     if (Identity == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-    UnicodeStrToAsciiStrS(Profile->EapIdentity, Identity, IdentitySize);\r
-    Status = EapConfig->SetData (EapConfig, EFI_EAP_TYPE_IDENTITY, EfiEapConfigIdentityString,\r
-                          (VOID *) Identity, IdentitySize - 1);\r
-    if (EFI_ERROR(Status)) {\r
+\r
+    UnicodeStrToAsciiStrS (Profile->EapIdentity, Identity, IdentitySize);\r
+    Status = EapConfig->SetData (\r
+                          EapConfig,\r
+                          EFI_EAP_TYPE_IDENTITY,\r
+                          EfiEapConfigIdentityString,\r
+                          (VOID *)Identity,\r
+                          IdentitySize - 1\r
+                          );\r
+    if (EFI_ERROR (Status)) {\r
       FreePool (Identity);\r
       return Status;\r
     }\r
+\r
     FreePool (Identity);\r
   } else {\r
     if (EapAuthMethod != EFI_EAP_TYPE_EAPTLS) {\r
@@ -540,19 +588,28 @@ WifiMgrConfigEap (
   }\r
 \r
   //\r
-  //Set Auth Method to Eap peer, Mandatory field\r
+  // Set Auth Method to Eap peer, Mandatory field\r
   //\r
-  Status = EapConfig->SetData (EapConfig, EFI_EAP_TYPE_ATTRIBUTE, EfiEapConfigEapAuthMethod,\r
-                        (VOID *) &EapAuthMethod, sizeof (EapAuthMethod));\r
-  if (EFI_ERROR(Status)) {\r
+  Status = EapConfig->SetData (\r
+                        EapConfig,\r
+                        EFI_EAP_TYPE_ATTRIBUTE,\r
+                        EfiEapConfigEapAuthMethod,\r
+                        (VOID *)&EapAuthMethod,\r
+                        sizeof (EapAuthMethod)\r
+                        );\r
+  if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  if (EapAuthMethod == EFI_EAP_TYPE_TTLS || EapAuthMethod == EFI_EAP_TYPE_PEAP) {\r
-\r
-    Status = EapConfig->SetData (EapConfig, EapAuthMethod, EfiEapConfigEap2ndAuthMethod,\r
-                          (VOID *) &EapSecondAuthMethod, sizeof (EapSecondAuthMethod));\r
-    if (EFI_ERROR(Status)) {\r
+  if ((EapAuthMethod == EFI_EAP_TYPE_TTLS) || (EapAuthMethod == EFI_EAP_TYPE_PEAP)) {\r
+    Status = EapConfig->SetData (\r
+                          EapConfig,\r
+                          EapAuthMethod,\r
+                          EfiEapConfigEap2ndAuthMethod,\r
+                          (VOID *)&EapSecondAuthMethod,\r
+                          sizeof (EapSecondAuthMethod)\r
+                          );\r
+    if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
 \r
@@ -560,19 +617,24 @@ WifiMgrConfigEap (
     // Set Password to Eap peer\r
     //\r
     if (StrLen (Profile->EapPassword) < PASSWORD_MIN_LEN) {\r
-\r
       DEBUG ((DEBUG_ERROR, "[WiFi Connection Manager] Error: No Eap Password for Network: %s.\n", Profile->SSId));\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
     PasswordSize = sizeof (CHAR16) * (StrLen (Profile->EapPassword) + 1);\r
-    Password = AllocateZeroPool (PasswordSize);\r
+    Password     = AllocateZeroPool (PasswordSize);\r
     if (Password == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-    StrCpyS (Password, PasswordSize, Profile->EapPassword);;\r
-    Status = EapConfig->SetData (EapConfig, EFI_EAP_TYPE_MSCHAPV2, EfiEapConfigEapMSChapV2Password,\r
-               (VOID *) Password, PasswordSize);\r
+\r
+    StrCpyS (Password, PasswordSize, Profile->EapPassword);\r
+    Status = EapConfig->SetData (\r
+                          EapConfig,\r
+                          EFI_EAP_TYPE_MSCHAPV2,\r
+                          EfiEapConfigEapMSChapV2Password,\r
+                          (VOID *)Password,\r
+                          PasswordSize\r
+                          );\r
     ZeroMem (Password, PasswordSize);\r
     FreePool (Password);\r
     if (EFI_ERROR (Status)) {\r
@@ -580,72 +642,94 @@ WifiMgrConfigEap (
     }\r
 \r
     //\r
-    //If CA cert is required, set it to Eap peer\r
+    // If CA cert is required, set it to Eap peer\r
     //\r
     if (Profile->CACertData != NULL) {\r
-\r
-      Status = EapConfig->SetData (EapConfig, EapAuthMethod, EfiEapConfigEapTlsCACert,\r
-                 Profile->CACertData, Profile->CACertSize);\r
-      if (EFI_ERROR(Status)) {\r
+      Status = EapConfig->SetData (\r
+                            EapConfig,\r
+                            EapAuthMethod,\r
+                            EfiEapConfigEapTlsCACert,\r
+                            Profile->CACertData,\r
+                            Profile->CACertSize\r
+                            );\r
+      if (EFI_ERROR (Status)) {\r
         return Status;\r
       }\r
     } else {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   } else if (EapAuthMethod == EFI_EAP_TYPE_EAPTLS) {\r
-\r
     //\r
-    //Set CA cert to Eap peer\r
+    // Set CA cert to Eap peer\r
     //\r
     if (Profile->CACertData == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
-    Status = EapConfig->SetData (EapConfig, EFI_EAP_TYPE_EAPTLS, EfiEapConfigEapTlsCACert,\r
-               Profile->CACertData, Profile->CACertSize);\r
-    if (EFI_ERROR(Status)) {\r
+\r
+    Status = EapConfig->SetData (\r
+                          EapConfig,\r
+                          EFI_EAP_TYPE_EAPTLS,\r
+                          EfiEapConfigEapTlsCACert,\r
+                          Profile->CACertData,\r
+                          Profile->CACertSize\r
+                          );\r
+    if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
 \r
     //\r
-    //Set Client cert to Eap peer\r
+    // Set Client cert to Eap peer\r
     //\r
     if (Profile->ClientCertData == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
-    Status = EapConfig->SetData (EapConfig, EFI_EAP_TYPE_EAPTLS, EfiEapConfigEapTlsClientCert,\r
-               Profile->ClientCertData, Profile->ClientCertSize);\r
-    if (EFI_ERROR(Status)) {\r
+\r
+    Status = EapConfig->SetData (\r
+                          EapConfig,\r
+                          EFI_EAP_TYPE_EAPTLS,\r
+                          EfiEapConfigEapTlsClientCert,\r
+                          Profile->ClientCertData,\r
+                          Profile->ClientCertSize\r
+                          );\r
+    if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
 \r
     //\r
-    //Set Private key to Eap peer\r
+    // Set Private key to Eap peer\r
     //\r
     if (Profile->PrivateKeyData == NULL) {\r
-\r
       DEBUG ((DEBUG_ERROR, "[WiFi Connection Manager]  Error: No Private Key for Network: %s.\n", Profile->SSId));\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
-    Status = EapConfig->SetData (EapConfig, EFI_EAP_TYPE_EAPTLS, EfiEapConfigEapTlsClientPrivateKeyFile,\r
-               Profile->PrivateKeyData, Profile->PrivateKeyDataSize);\r
-    if (EFI_ERROR(Status)) {\r
+    Status = EapConfig->SetData (\r
+                          EapConfig,\r
+                          EFI_EAP_TYPE_EAPTLS,\r
+                          EfiEapConfigEapTlsClientPrivateKeyFile,\r
+                          Profile->PrivateKeyData,\r
+                          Profile->PrivateKeyDataSize\r
+                          );\r
+    if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
 \r
     if (StrLen (Profile->PrivateKeyPassword) > 0) {\r
-\r
-      EncryptPasswordLen = StrLen (Profile->PrivateKeyPassword);\r
-      AsciiEncryptPassword = AllocateZeroPool(EncryptPasswordLen + 1);\r
+      EncryptPasswordLen   = StrLen (Profile->PrivateKeyPassword);\r
+      AsciiEncryptPassword = AllocateZeroPool (EncryptPasswordLen + 1);\r
       if (AsciiEncryptPassword == NULL) {\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
-      UnicodeStrToAsciiStrS(Profile->PrivateKeyPassword, AsciiEncryptPassword, EncryptPasswordLen + 1);\r
-      Status = EapConfig->SetData(EapConfig, EFI_EAP_TYPE_EAPTLS,\r
-                                    EfiEapConfigEapTlsClientPrivateKeyFilePassword,\r
-                                    (VOID *) AsciiEncryptPassword, EncryptPasswordLen + 1);\r
-      if (EFI_ERROR(Status)) {\r
 \r
+      UnicodeStrToAsciiStrS (Profile->PrivateKeyPassword, AsciiEncryptPassword, EncryptPasswordLen + 1);\r
+      Status = EapConfig->SetData (\r
+                            EapConfig,\r
+                            EFI_EAP_TYPE_EAPTLS,\r
+                            EfiEapConfigEapTlsClientPrivateKeyFilePassword,\r
+                            (VOID *)AsciiEncryptPassword,\r
+                            EncryptPasswordLen + 1\r
+                            );\r
+      if (EFI_ERROR (Status)) {\r
         ZeroMem (AsciiEncryptPassword, EncryptPasswordLen + 1);\r
         FreePool (AsciiEncryptPassword);\r
         return Status;\r
@@ -675,17 +759,17 @@ WifiMgrConfigEap (
 **/\r
 EFI_STATUS\r
 WifiMgrGetLinkState (\r
-  IN   WIFI_MGR_DEVICE_DATA            *Nic,\r
-  OUT  EFI_ADAPTER_INFO_MEDIA_STATE    *LinkState\r
+  IN   WIFI_MGR_DEVICE_DATA          *Nic,\r
+  OUT  EFI_ADAPTER_INFO_MEDIA_STATE  *LinkState\r
   )\r
 {\r
-  EFI_STATUS                           Status;\r
-  EFI_TPL                              OldTpl;\r
-  UINTN                                DataSize;\r
-  EFI_ADAPTER_INFO_MEDIA_STATE         *UndiState;\r
-  EFI_ADAPTER_INFORMATION_PROTOCOL     *Aip;\r
+  EFI_STATUS                        Status;\r
+  EFI_TPL                           OldTpl;\r
+  UINTN                             DataSize;\r
+  EFI_ADAPTER_INFO_MEDIA_STATE      *UndiState;\r
+  EFI_ADAPTER_INFORMATION_PROTOCOL  *Aip;\r
 \r
-  if (Nic == NULL || LinkState == NULL) {\r
+  if ((Nic == NULL) || (LinkState == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -693,7 +777,7 @@ WifiMgrGetLinkState (
   Status = gBS->OpenProtocol (\r
                   Nic->ControllerHandle,\r
                   &gEfiAdapterInformationProtocolGuid,\r
-                  (VOID**) &Aip,\r
+                  (VOID **)&Aip,\r
                   Nic->DriverHandle,\r
                   Nic->ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -703,16 +787,17 @@ WifiMgrGetLinkState (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  Status = Aip->GetInformation(\r
+  Status = Aip->GetInformation (\r
                   Aip,\r
                   &gEfiAdapterInfoMediaStateGuid,\r
-                  (VOID **) &UndiState,\r
+                  (VOID **)&UndiState,\r
                   &DataSize\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     gBS->RestoreTPL (OldTpl);\r
     return Status;\r
   }\r
+\r
   gBS->RestoreTPL (OldTpl);\r
 \r
   CopyMem (LinkState, UndiState, sizeof (EFI_ADAPTER_INFO_MEDIA_STATE));\r
@@ -735,21 +820,27 @@ WifiMgrGetLinkState (
 **/\r
 EFI_STATUS\r
 WifiMgrPrepareConnection (\r
-  IN    WIFI_MGR_DEVICE_DATA              *Nic,\r
-  IN    WIFI_MGR_NETWORK_PROFILE          *Profile\r
+  IN    WIFI_MGR_DEVICE_DATA      *Nic,\r
+  IN    WIFI_MGR_NETWORK_PROFILE  *Profile\r
   )\r
 {\r
-  EFI_STATUS           Status;\r
-  UINT8                SecurityType;\r
-  BOOLEAN              AKMSuiteSupported;\r
-  BOOLEAN              CipherSuiteSupported;\r
+  EFI_STATUS  Status;\r
+  UINT8       SecurityType;\r
+  BOOLEAN     AKMSuiteSupported;\r
+  BOOLEAN     CipherSuiteSupported;\r
 \r
-  if (Profile == NULL || Nic == NULL) {\r
+  if ((Profile == NULL) || (Nic == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Status = WifiMgrCheckRSN (Profile->Network.AKMSuite, Profile->Network.CipherSuite,\r
-             Nic, &SecurityType, &AKMSuiteSupported, &CipherSuiteSupported);\r
+  Status = WifiMgrCheckRSN (\r
+             Profile->Network.AKMSuite,\r
+             Profile->Network.CipherSuite,\r
+             Nic,\r
+             &SecurityType,\r
+             &AKMSuiteSupported,\r
+             &CipherSuiteSupported\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -765,8 +856,10 @@ WifiMgrPrepareConnection (
               WifiMgrUpdateConnectMessage (Nic, FALSE, L"Connect Failed: Invalid Password!");\r
             }\r
           }\r
+\r
           return Status;\r
         }\r
+\r
         break;\r
 \r
       case SECURITY_TYPE_WPA2_ENTERPRISE:\r
@@ -778,8 +871,10 @@ WifiMgrPrepareConnection (
               WifiMgrUpdateConnectMessage (Nic, FALSE, L"Connect Failed: Invalid Configuration!");\r
             }\r
           }\r
+\r
           return Status;\r
         }\r
+\r
         break;\r
 \r
       case SECURITY_TYPE_NONE:\r
@@ -807,21 +902,21 @@ WifiMgrPrepareConnection (
 VOID\r
 EFIAPI\r
 WifiMgrOnConnectFinished (\r
-  IN  EFI_EVENT              Event,\r
-  IN  VOID                   *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS                         Status;\r
-  WIFI_MGR_MAC_CONFIG_TOKEN          *ConfigToken;\r
-  WIFI_MGR_NETWORK_PROFILE           *ConnectedProfile;\r
-  UINT8                              SecurityType;\r
-  UINT8                              SSIdLen;\r
-  CHAR8                              *AsciiSSId;\r
+  EFI_STATUS                 Status;\r
+  WIFI_MGR_MAC_CONFIG_TOKEN  *ConfigToken;\r
+  WIFI_MGR_NETWORK_PROFILE   *ConnectedProfile;\r
+  UINT8                      SecurityType;\r
+  UINT8                      SSIdLen;\r
+  CHAR8                      *AsciiSSId;\r
 \r
   ASSERT (Context != NULL);\r
 \r
   ConnectedProfile = NULL;\r
-  ConfigToken = (WIFI_MGR_MAC_CONFIG_TOKEN*) Context;\r
+  ConfigToken      = (WIFI_MGR_MAC_CONFIG_TOKEN *)Context;\r
   ASSERT (ConfigToken->Nic != NULL);\r
 \r
   ConfigToken->Nic->ConnectState = WifiMgrDisconnected;\r
@@ -829,39 +924,38 @@ WifiMgrOnConnectFinished (
 \r
   ASSERT (ConfigToken->Token.ConnectNetworkToken != NULL);\r
   if (ConfigToken->Token.ConnectNetworkToken->Status != EFI_SUCCESS) {\r
-\r
     if (ConfigToken->Nic->OneTimeConnectRequest) {\r
       //\r
       // Only update message for user triggered connection\r
       //\r
       if (ConfigToken->Token.ConnectNetworkToken->Status == EFI_ACCESS_DENIED) {\r
-\r
         WifiMgrUpdateConnectMessage (ConfigToken->Nic, FALSE, L"Connect Failed: Permission Denied!");\r
       } else {\r
         WifiMgrUpdateConnectMessage (ConfigToken->Nic, FALSE, L"Connect Failed!");\r
       }\r
+\r
       ConfigToken->Nic->OneTimeConnectRequest = FALSE;\r
     }\r
+\r
     ConfigToken->Nic->CurrentOperateNetwork = NULL;\r
     return;\r
   }\r
 \r
   if (ConfigToken->Token.ConnectNetworkToken->ResultCode != ConnectSuccess) {\r
-\r
     if (ConfigToken->Nic->OneTimeConnectRequest) {\r
-\r
       if (ConfigToken->Token.ConnectNetworkToken->ResultCode == ConnectFailedReasonUnspecified) {\r
         WifiMgrUpdateConnectMessage (ConfigToken->Nic, FALSE, L"Connect Failed: Wrong Password or Unexpected Error!");\r
       } else {\r
         WifiMgrUpdateConnectMessage (ConfigToken->Nic, FALSE, L"Connect Failed!");\r
       }\r
     }\r
+\r
     goto Exit;\r
   }\r
 \r
-  if (ConfigToken->Token.ConnectNetworkToken->Data == NULL ||\r
-    ConfigToken->Token.ConnectNetworkToken->Data->Network == NULL) {\r
-\r
+  if ((ConfigToken->Token.ConnectNetworkToken->Data == NULL) ||\r
+      (ConfigToken->Token.ConnectNetworkToken->Data->Network == NULL))\r
+  {\r
     //\r
     // An unexpected error occurs, tell low layer to perform a disconnect\r
     //\r
@@ -873,26 +967,31 @@ WifiMgrOnConnectFinished (
   //\r
   // A correct connect token received, terminate the connection process\r
   //\r
-  Status = WifiMgrCheckRSN(ConfigToken->Token.ConnectNetworkToken->Data->Network->AKMSuite,\r
+  Status = WifiMgrCheckRSN (\r
+             ConfigToken->Token.ConnectNetworkToken->Data->Network->AKMSuite,\r
              ConfigToken->Token.ConnectNetworkToken->Data->Network->CipherSuite,\r
-             ConfigToken->Nic, &SecurityType, NULL, NULL);\r
-  if (EFI_ERROR(Status)) {\r
+             ConfigToken->Nic,\r
+             &SecurityType,\r
+             NULL,\r
+             NULL\r
+             );\r
+  if (EFI_ERROR (Status)) {\r
     SecurityType = SECURITY_TYPE_UNKNOWN;\r
   }\r
 \r
   SSIdLen   = ConfigToken->Token.ConnectNetworkToken->Data->Network->SSId.SSIdLen;\r
-  AsciiSSId = (CHAR8*) AllocateZeroPool(sizeof (CHAR8) * (SSIdLen + 1));\r
+  AsciiSSId = (CHAR8 *)AllocateZeroPool (sizeof (CHAR8) * (SSIdLen + 1));\r
   if (AsciiSSId == NULL) {\r
     ConfigToken->Nic->HasDisconnectPendingNetwork = TRUE;\r
     WifiMgrUpdateConnectMessage (ConfigToken->Nic, FALSE, NULL);\r
     goto Exit;\r
   }\r
 \r
-  CopyMem(AsciiSSId, ConfigToken->Token.ConnectNetworkToken->Data->Network->SSId.SSId, SSIdLen);\r
+  CopyMem (AsciiSSId, ConfigToken->Token.ConnectNetworkToken->Data->Network->SSId.SSId, SSIdLen);\r
   *(AsciiSSId + SSIdLen) = '\0';\r
 \r
-  ConnectedProfile = WifiMgrGetProfileByAsciiSSId(AsciiSSId, SecurityType, &ConfigToken->Nic->ProfileList);\r
-  FreePool(AsciiSSId);\r
+  ConnectedProfile = WifiMgrGetProfileByAsciiSSId (AsciiSSId, SecurityType, &ConfigToken->Nic->ProfileList);\r
+  FreePool (AsciiSSId);\r
   if (ConnectedProfile == NULL) {\r
     ConfigToken->Nic->HasDisconnectPendingNetwork = TRUE;\r
     WifiMgrUpdateConnectMessage (ConfigToken->Nic, FALSE, NULL);\r
@@ -907,8 +1006,9 @@ Exit:
   if (ConfigToken->Nic->ConnectState == WifiMgrDisconnected) {\r
     ConfigToken->Nic->CurrentOperateNetwork = NULL;\r
   }\r
+\r
   ConfigToken->Nic->OneTimeConnectRequest = FALSE;\r
-  WifiMgrFreeToken(ConfigToken);\r
+  WifiMgrFreeToken (ConfigToken);\r
 }\r
 \r
 /**\r
@@ -927,17 +1027,17 @@ Exit:
 **/\r
 EFI_STATUS\r
 WifiMgrConnectToNetwork (\r
-  IN    WIFI_MGR_DEVICE_DATA              *Nic,\r
-  IN    WIFI_MGR_NETWORK_PROFILE          *Profile\r
+  IN    WIFI_MGR_DEVICE_DATA      *Nic,\r
+  IN    WIFI_MGR_NETWORK_PROFILE  *Profile\r
   )\r
 {\r
-  EFI_STATUS                             Status;\r
-  EFI_TPL                                OldTpl;\r
-  EFI_ADAPTER_INFO_MEDIA_STATE           LinkState;\r
-  WIFI_MGR_MAC_CONFIG_TOKEN              *ConfigToken;\r
-  EFI_80211_CONNECT_NETWORK_TOKEN        *ConnectToken;\r
+  EFI_STATUS                       Status;\r
+  EFI_TPL                          OldTpl;\r
+  EFI_ADAPTER_INFO_MEDIA_STATE     LinkState;\r
+  WIFI_MGR_MAC_CONFIG_TOKEN        *ConfigToken;\r
+  EFI_80211_CONNECT_NETWORK_TOKEN  *ConnectToken;\r
 \r
-  if (Nic == NULL || Nic->Wmp == NULL || Profile == NULL) {\r
+  if ((Nic == NULL) || (Nic->Wmp == NULL) || (Profile == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -945,6 +1045,7 @@ WifiMgrConnectToNetwork (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   if (LinkState.MediaState == EFI_SUCCESS) {\r
     return EFI_ALREADY_STARTED;\r
   }\r
@@ -965,15 +1066,15 @@ WifiMgrConnectToNetwork (
     goto Exit;\r
   }\r
 \r
-  ConfigToken->Type      = TokenTypeConnectNetworkToken;\r
-  ConfigToken->Nic       = Nic;\r
-  ConfigToken->Token.ConnectNetworkToken  = AllocateZeroPool (sizeof (EFI_80211_CONNECT_NETWORK_TOKEN));\r
+  ConfigToken->Type                      = TokenTypeConnectNetworkToken;\r
+  ConfigToken->Nic                       = Nic;\r
+  ConfigToken->Token.ConnectNetworkToken = AllocateZeroPool (sizeof (EFI_80211_CONNECT_NETWORK_TOKEN));\r
   if (ConfigToken->Token.ConnectNetworkToken == NULL) {\r
     goto Exit;\r
   }\r
 \r
-  ConnectToken           = ConfigToken->Token.ConnectNetworkToken;\r
-  ConnectToken->Data     = AllocateZeroPool (sizeof (EFI_80211_CONNECT_NETWORK_DATA));\r
+  ConnectToken       = ConfigToken->Token.ConnectNetworkToken;\r
+  ConnectToken->Data = AllocateZeroPool (sizeof (EFI_80211_CONNECT_NETWORK_DATA));\r
   if (ConnectToken->Data == NULL) {\r
     goto Exit;\r
   }\r
@@ -982,7 +1083,8 @@ WifiMgrConnectToNetwork (
   if (ConnectToken->Data->Network == NULL) {\r
     goto Exit;\r
   }\r
-  CopyMem(ConnectToken->Data->Network, &Profile->Network, sizeof (EFI_80211_NETWORK));\r
+\r
+  CopyMem (ConnectToken->Data->Network, &Profile->Network, sizeof (EFI_80211_NETWORK));\r
 \r
   //\r
   // Add event handle and start to connect\r
@@ -998,12 +1100,12 @@ WifiMgrConnectToNetwork (
     goto Exit;\r
   }\r
 \r
-  Nic->ConnectState = WifiMgrConnectingToAp;\r
+  Nic->ConnectState          = WifiMgrConnectingToAp;\r
   Nic->CurrentOperateNetwork = Profile;\r
   WifiMgrUpdateConnectMessage (Nic, FALSE, NULL);\r
 \r
   //\r
-  //Start Connecting ...\r
+  // Start Connecting ...\r
   //\r
   Status = Nic->Wmp->ConnectNetwork (Nic->Wmp, ConnectToken);\r
 \r
@@ -1017,7 +1119,6 @@ WifiMgrConnectToNetwork (
       Nic->ConnectState = WifiMgrConnectedToAp;\r
       WifiMgrUpdateConnectMessage (Nic, TRUE, NULL);\r
     } else {\r
-\r
       Nic->ConnectState          = WifiMgrDisconnected;\r
       Nic->CurrentOperateNetwork = NULL;\r
 \r
@@ -1029,6 +1130,7 @@ WifiMgrConnectToNetwork (
         }\r
       }\r
     }\r
+\r
     goto Exit;\r
   }\r
 \r
@@ -1037,6 +1139,7 @@ Exit:
   if (EFI_ERROR (Status)) {\r
     WifiMgrFreeToken (ConfigToken);\r
   }\r
+\r
   gBS->RestoreTPL (OldTpl);\r
 \r
   DEBUG ((DEBUG_INFO, "[WiFi Connection Manager] WifiMgrConnectToNetwork: %r\n", Status));\r
@@ -1055,21 +1158,21 @@ Exit:
 VOID\r
 EFIAPI\r
 WifiMgrOnDisconnectFinished (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  WIFI_MGR_MAC_CONFIG_TOKEN         *ConfigToken;\r
+  WIFI_MGR_MAC_CONFIG_TOKEN  *ConfigToken;\r
 \r
   ASSERT (Context != NULL);\r
 \r
-  ConfigToken = (WIFI_MGR_MAC_CONFIG_TOKEN*) Context;\r
+  ConfigToken = (WIFI_MGR_MAC_CONFIG_TOKEN *)Context;\r
   ASSERT (ConfigToken->Nic != NULL);\r
   ASSERT (ConfigToken->Type == TokenTypeDisconnectNetworkToken);\r
 \r
   ASSERT (ConfigToken->Token.DisconnectNetworkToken != NULL);\r
   if (ConfigToken->Token.DisconnectNetworkToken->Status != EFI_SUCCESS) {\r
-    ConfigToken->Nic->ConnectState          = WifiMgrConnectedToAp;\r
+    ConfigToken->Nic->ConnectState = WifiMgrConnectedToAp;\r
     WifiMgrUpdateConnectMessage (ConfigToken->Nic, FALSE, NULL);\r
     ConfigToken->Nic->OneTimeDisconnectRequest = FALSE;\r
     goto Exit;\r
@@ -1083,11 +1186,11 @@ WifiMgrOnDisconnectFinished (
   //\r
   // Disconnected network may not be in network list now, trigger a scan again!\r
   //\r
-  ConfigToken->Nic->OneTimeScanRequest       = TRUE;\r
+  ConfigToken->Nic->OneTimeScanRequest = TRUE;\r
 \r
-  Exit:\r
-    WifiMgrFreeToken(ConfigToken);\r
-    return;\r
+Exit:\r
+  WifiMgrFreeToken (ConfigToken);\r
+  return;\r
 }\r
 \r
 /**\r
@@ -1104,13 +1207,13 @@ WifiMgrOnDisconnectFinished (
 **/\r
 EFI_STATUS\r
 WifiMgrDisconnectToNetwork (\r
-  IN    WIFI_MGR_DEVICE_DATA             *Nic\r
+  IN    WIFI_MGR_DEVICE_DATA  *Nic\r
   )\r
 {\r
-  EFI_STATUS                             Status;\r
-  EFI_TPL                                OldTpl;\r
-  WIFI_MGR_MAC_CONFIG_TOKEN              *ConfigToken;\r
-  EFI_80211_DISCONNECT_NETWORK_TOKEN     *DisconnectToken;\r
+  EFI_STATUS                          Status;\r
+  EFI_TPL                             OldTpl;\r
+  WIFI_MGR_MAC_CONFIG_TOKEN           *ConfigToken;\r
+  EFI_80211_DISCONNECT_NETWORK_TOKEN  *DisconnectToken;\r
 \r
   if (Nic == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1124,11 +1227,11 @@ WifiMgrDisconnectToNetwork (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  ConfigToken->Type      = TokenTypeDisconnectNetworkToken;\r
-  ConfigToken->Nic       = Nic;\r
+  ConfigToken->Type                         = TokenTypeDisconnectNetworkToken;\r
+  ConfigToken->Nic                          = Nic;\r
   ConfigToken->Token.DisconnectNetworkToken = AllocateZeroPool (sizeof (EFI_80211_DISCONNECT_NETWORK_TOKEN));\r
   if (ConfigToken->Token.DisconnectNetworkToken == NULL) {\r
-    WifiMgrFreeToken(ConfigToken);\r
+    WifiMgrFreeToken (ConfigToken);\r
     gBS->RestoreTPL (OldTpl);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -1143,7 +1246,7 @@ WifiMgrDisconnectToNetwork (
                   &DisconnectToken->Event\r
                   );\r
   if (EFI_ERROR (Status)) {\r
-    WifiMgrFreeToken(ConfigToken);\r
+    WifiMgrFreeToken (ConfigToken);\r
     gBS->RestoreTPL (OldTpl);\r
     return Status;\r
   }\r
@@ -1154,30 +1257,29 @@ WifiMgrDisconnectToNetwork (
   Status = Nic->Wmp->DisconnectNetwork (Nic->Wmp, DisconnectToken);\r
   if (EFI_ERROR (Status)) {\r
     if (Status == EFI_NOT_FOUND) {\r
-\r
       Nic->ConnectState          = WifiMgrDisconnected;\r
       Nic->CurrentOperateNetwork = NULL;\r
 \r
       //\r
       // This network is not in network list now, trigger a scan again!\r
       //\r
-      Nic->OneTimeScanRequest    = TRUE;\r
+      Nic->OneTimeScanRequest = TRUE;\r
 \r
       //\r
       // State has been changed from Connected to Disconnected\r
       //\r
       WifiMgrUpdateConnectMessage (ConfigToken->Nic, TRUE, NULL);\r
-      Status                     = EFI_SUCCESS;\r
+      Status = EFI_SUCCESS;\r
     } else {\r
       if (Nic->OneTimeDisconnectRequest) {\r
-\r
         WifiMgrUpdateConnectMessage (ConfigToken->Nic, FALSE, L"Disconnect Failed: Unexpected Error!");\r
       }\r
 \r
-      Nic->ConnectState     = WifiMgrConnectedToAp;\r
+      Nic->ConnectState = WifiMgrConnectedToAp;\r
       WifiMgrUpdateConnectMessage (ConfigToken->Nic, FALSE, NULL);\r
     }\r
-    WifiMgrFreeToken(ConfigToken);\r
+\r
+    WifiMgrFreeToken (ConfigToken);\r
   }\r
 \r
   gBS->RestoreTPL (OldTpl);\r
@@ -1195,20 +1297,20 @@ WifiMgrDisconnectToNetwork (
 VOID\r
 EFIAPI\r
 WifiMgrOnTimerTick (\r
-  IN EFI_EVENT                        Event,\r
-  IN VOID                             *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  WIFI_MGR_DEVICE_DATA                *Nic;\r
-  EFI_STATUS                          Status;\r
-  EFI_ADAPTER_INFO_MEDIA_STATE        LinkState;\r
-  WIFI_MGR_NETWORK_PROFILE            *Profile;\r
+  WIFI_MGR_DEVICE_DATA          *Nic;\r
+  EFI_STATUS                    Status;\r
+  EFI_ADAPTER_INFO_MEDIA_STATE  LinkState;\r
+  WIFI_MGR_NETWORK_PROFILE      *Profile;\r
 \r
   if (Context == NULL) {\r
     return;\r
   }\r
 \r
-  Nic = (WIFI_MGR_DEVICE_DATA*) Context;\r
+  Nic = (WIFI_MGR_DEVICE_DATA *)Context;\r
   NET_CHECK_SIGNATURE (Nic, WIFI_MGR_DEVICE_DATA_SIGNATURE);\r
 \r
   Status = WifiMgrGetLinkState (Nic, &LinkState);\r
@@ -1218,68 +1320,68 @@ WifiMgrOnTimerTick (
   }\r
 \r
   if (Nic->LastLinkState.MediaState != LinkState.MediaState) {\r
-    if (Nic->LastLinkState.MediaState == EFI_SUCCESS && LinkState.MediaState == EFI_NO_MEDIA) {\r
+    if ((Nic->LastLinkState.MediaState == EFI_SUCCESS) && (LinkState.MediaState == EFI_NO_MEDIA)) {\r
       Nic->HasDisconnectPendingNetwork = TRUE;\r
     }\r
+\r
     Nic->LastLinkState.MediaState = LinkState.MediaState;\r
   }\r
 \r
-  Nic->ScanTickTime ++;\r
-  if ((Nic->ScanTickTime > WIFI_SCAN_FREQUENCY || Nic->OneTimeScanRequest) &&\r
-    Nic->ScanState == WifiMgrScanFinished) {\r
-\r
+  Nic->ScanTickTime++;\r
+  if (((Nic->ScanTickTime > WIFI_SCAN_FREQUENCY) || Nic->OneTimeScanRequest) &&\r
+      (Nic->ScanState == WifiMgrScanFinished))\r
+  {\r
     Nic->OneTimeScanRequest = FALSE;\r
-    Nic->ScanTickTime = 0;\r
+    Nic->ScanTickTime       = 0;\r
 \r
     DEBUG ((DEBUG_INFO, "[WiFi Connection Manager] Scan is triggered.\n"));\r
     WifiMgrStartScan (Nic);\r
   }\r
 \r
-  if (Nic->AvailableCount > 0 && Nic->ScanState == WifiMgrScanFinished) {\r
-\r
+  if ((Nic->AvailableCount > 0) && (Nic->ScanState == WifiMgrScanFinished)) {\r
     switch (Nic->ConnectState) {\r
-    case WifiMgrDisconnected:\r
+      case WifiMgrDisconnected:\r
 \r
-      if (Nic->HasDisconnectPendingNetwork) {\r
-        Nic->HasDisconnectPendingNetwork = FALSE;\r
-      }\r
-\r
-      if (Nic->ConnectPendingNetwork != NULL) {\r
+        if (Nic->HasDisconnectPendingNetwork) {\r
+          Nic->HasDisconnectPendingNetwork = FALSE;\r
+        }\r
 \r
-        Profile   = Nic->ConnectPendingNetwork;\r
-        Status    = WifiMgrConnectToNetwork(Nic, Profile);\r
-        Nic->ConnectPendingNetwork = NULL;\r
-        if (EFI_ERROR (Status)) {\r
-          //\r
-          // Some error happened, don't wait for a return connect token!\r
-          //\r
-          Nic->OneTimeConnectRequest = FALSE;\r
+        if (Nic->ConnectPendingNetwork != NULL) {\r
+          Profile                    = Nic->ConnectPendingNetwork;\r
+          Status                     = WifiMgrConnectToNetwork (Nic, Profile);\r
+          Nic->ConnectPendingNetwork = NULL;\r
+          if (EFI_ERROR (Status)) {\r
+            //\r
+            // Some error happened, don't wait for a return connect token!\r
+            //\r
+            Nic->OneTimeConnectRequest = FALSE;\r
+          }\r
         }\r
-      }\r
-      break;\r
 \r
-    case WifiMgrConnectingToAp:\r
-      break;\r
+        break;\r
 \r
-    case WifiMgrDisconnectingToAp:\r
-      break;\r
+      case WifiMgrConnectingToAp:\r
+        break;\r
 \r
-    case WifiMgrConnectedToAp:\r
+      case WifiMgrDisconnectingToAp:\r
+        break;\r
 \r
-      if (Nic->ConnectPendingNetwork != NULL || Nic->HasDisconnectPendingNetwork) {\r
+      case WifiMgrConnectedToAp:\r
 \r
-        Status    = WifiMgrDisconnectToNetwork(Nic);\r
-        if (EFI_ERROR (Status)) {\r
-          //\r
-          // Some error happened, don't wait for a return disconnect token!\r
-          //\r
-          Nic->OneTimeDisconnectRequest = FALSE;\r
+        if ((Nic->ConnectPendingNetwork != NULL) || Nic->HasDisconnectPendingNetwork) {\r
+          Status = WifiMgrDisconnectToNetwork (Nic);\r
+          if (EFI_ERROR (Status)) {\r
+            //\r
+            // Some error happened, don't wait for a return disconnect token!\r
+            //\r
+            Nic->OneTimeDisconnectRequest = FALSE;\r
+          }\r
         }\r
-      }\r
-      break;\r
 \r
-    default:\r
-      break;\r
+        break;\r
+\r
+      default:\r
+        break;\r
     }\r
   }\r
 }\r
index d6b7ded8e6e427b88ea334a76a67c9f83edeac80..b29150f7e929332ee198f301dbe3dc1b7703cba9 100644 (file)
@@ -24,7 +24,7 @@
 **/\r
 EFI_STATUS\r
 WifiMgrStartScan (\r
-  IN      WIFI_MGR_DEVICE_DATA        *Nic\r
+  IN      WIFI_MGR_DEVICE_DATA  *Nic\r
   );\r
 \r
 /**\r
@@ -61,8 +61,8 @@ WifiMgrGetLinkState (
 **/\r
 EFI_STATUS\r
 WifiMgrConnectToNetwork (\r
-  IN    WIFI_MGR_DEVICE_DATA              *Nic,\r
-  IN    WIFI_MGR_NETWORK_PROFILE          *Profile\r
+  IN    WIFI_MGR_DEVICE_DATA      *Nic,\r
+  IN    WIFI_MGR_NETWORK_PROFILE  *Profile\r
   );\r
 \r
 /**\r
@@ -78,7 +78,7 @@ WifiMgrConnectToNetwork (
 **/\r
 EFI_STATUS\r
 WifiMgrDisconnectToNetwork (\r
-  IN    WIFI_MGR_DEVICE_DATA              *Nic\r
+  IN    WIFI_MGR_DEVICE_DATA  *Nic\r
   );\r
 \r
 /**\r
@@ -92,8 +92,8 @@ WifiMgrDisconnectToNetwork (
 VOID\r
 EFIAPI\r
 WifiMgrOnTimerTick (\r
-  IN EFI_EVENT              Event,\r
-  IN VOID                   *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 #endif\r
index 9295b8b33b25eb4cfd416bcf950437143a88a0eb..4e7c2417186a4e98d0f7a7cebb40811e56604695 100644 (file)
@@ -19,8 +19,8 @@
 VOID\r
 EFIAPI\r
 WifiMgrInternalEmptyFunction (\r
-  IN  EFI_EVENT    Event,\r
-  IN  VOID         *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
   return;\r
@@ -41,7 +41,7 @@ WifiMgrMacAddrToStr (
   OUT CHAR16                 *Str\r
   )\r
 {\r
-  if (Mac == NULL || Str == NULL) {\r
+  if ((Mac == NULL) || (Str == NULL)) {\r
     return;\r
   }\r
 \r
@@ -49,8 +49,12 @@ WifiMgrMacAddrToStr (
     Str,\r
     StrSize,\r
     L"%02X:%02X:%02X:%02X:%02X:%02X",\r
-    Mac->Addr[0], Mac->Addr[1], Mac->Addr[2],\r
-    Mac->Addr[3], Mac->Addr[4], Mac->Addr[5]\r
+    Mac->Addr[0],\r
+    Mac->Addr[1],\r
+    Mac->Addr[2],\r
+    Mac->Addr[3],\r
+    Mac->Addr[4],\r
+    Mac->Addr[5]\r
     );\r
 }\r
 \r
@@ -68,15 +72,14 @@ WifiMgrMacAddrToStr (
 **/\r
 EFI_STATUS\r
 WifiMgrReadFileToBuffer (\r
-  IN   WIFI_MGR_FILE_CONTEXT          *FileContext,\r
-  OUT  VOID                           **DataAddr,\r
-  OUT  UINTN                          *DataSize\r
+  IN   WIFI_MGR_FILE_CONTEXT  *FileContext,\r
+  OUT  VOID                   **DataAddr,\r
+  OUT  UINTN                  *DataSize\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
-\r
-  if (FileContext != NULL && FileContext->FHandle != NULL) {\r
+  EFI_STATUS  Status;\r
 \r
+  if ((FileContext != NULL) && (FileContext->FHandle != NULL)) {\r
     Status = ReadFileContent (\r
                FileContext->FHandle,\r
                DataAddr,\r
@@ -87,6 +90,7 @@ WifiMgrReadFileToBuffer (
     if (FileContext->FHandle != NULL) {\r
       FileContext->FHandle->Close (FileContext->FHandle);\r
     }\r
+\r
     FileContext->FHandle = NULL;\r
     return Status;\r
   }\r
@@ -105,20 +109,24 @@ WifiMgrReadFileToBuffer (
 **/\r
 WIFI_MGR_DEVICE_DATA *\r
 WifiMgrGetNicByIndex (\r
-  IN WIFI_MGR_PRIVATE_DATA   *Private,\r
-  IN UINT32                  NicIndex\r
+  IN WIFI_MGR_PRIVATE_DATA  *Private,\r
+  IN UINT32                 NicIndex\r
   )\r
 {\r
-  LIST_ENTRY             *Entry;\r
-  WIFI_MGR_DEVICE_DATA   *Nic;\r
+  LIST_ENTRY            *Entry;\r
+  WIFI_MGR_DEVICE_DATA  *Nic;\r
 \r
   if (Private == NULL) {\r
     return NULL;\r
   }\r
 \r
   NET_LIST_FOR_EACH (Entry, &Private->NicList) {\r
-    Nic = NET_LIST_USER_STRUCT_S (Entry, WIFI_MGR_DEVICE_DATA,\r
-            Link, WIFI_MGR_DEVICE_DATA_SIGNATURE);\r
+    Nic = NET_LIST_USER_STRUCT_S (\r
+            Entry,\r
+            WIFI_MGR_DEVICE_DATA,\r
+            Link,\r
+            WIFI_MGR_DEVICE_DATA_SIGNATURE\r
+            );\r
     if (Nic->NicIndex == NicIndex) {\r
       return Nic;\r
     }\r
@@ -139,22 +147,26 @@ WifiMgrGetNicByIndex (
 **/\r
 WIFI_MGR_NETWORK_PROFILE *\r
 WifiMgrGetProfileByUnicodeSSId (\r
-  IN  CHAR16                         *SSId,\r
-  IN  UINT8                          SecurityType,\r
-  IN  LIST_ENTRY                     *ProfileList\r
+  IN  CHAR16      *SSId,\r
+  IN  UINT8       SecurityType,\r
+  IN  LIST_ENTRY  *ProfileList\r
   )\r
 {\r
-  LIST_ENTRY                         *Entry;\r
-  WIFI_MGR_NETWORK_PROFILE           *Profile;\r
+  LIST_ENTRY                *Entry;\r
+  WIFI_MGR_NETWORK_PROFILE  *Profile;\r
 \r
-  if (SSId == NULL || ProfileList == NULL) {\r
+  if ((SSId == NULL) || (ProfileList == NULL)) {\r
     return NULL;\r
   }\r
 \r
   NET_LIST_FOR_EACH (Entry, ProfileList) {\r
-    Profile = NET_LIST_USER_STRUCT_S (Entry, WIFI_MGR_NETWORK_PROFILE,\r
-                Link, WIFI_MGR_PROFILE_SIGNATURE);\r
-    if (StrCmp (SSId, Profile->SSId) == 0 && SecurityType == Profile->SecurityType) {\r
+    Profile = NET_LIST_USER_STRUCT_S (\r
+                Entry,\r
+                WIFI_MGR_NETWORK_PROFILE,\r
+                Link,\r
+                WIFI_MGR_PROFILE_SIGNATURE\r
+                );\r
+    if ((StrCmp (SSId, Profile->SSId) == 0) && (SecurityType == Profile->SecurityType)) {\r
       return Profile;\r
     }\r
   }\r
@@ -174,16 +186,17 @@ WifiMgrGetProfileByUnicodeSSId (
 **/\r
 WIFI_MGR_NETWORK_PROFILE *\r
 WifiMgrGetProfileByAsciiSSId (\r
-  IN  CHAR8                      *SSId,\r
-  IN  UINT8                      SecurityType,\r
-  IN  LIST_ENTRY                 *ProfileList\r
+  IN  CHAR8       *SSId,\r
+  IN  UINT8       SecurityType,\r
+  IN  LIST_ENTRY  *ProfileList\r
   )\r
 {\r
-  CHAR16   SSIdUniCode[SSID_STORAGE_SIZE];\r
+  CHAR16  SSIdUniCode[SSID_STORAGE_SIZE];\r
 \r
   if (SSId == NULL) {\r
     return NULL;\r
   }\r
+\r
   if (AsciiStrToUnicodeStrS (SSId, SSIdUniCode, SSID_STORAGE_SIZE) != RETURN_SUCCESS) {\r
     return NULL;\r
   }\r
@@ -202,19 +215,24 @@ WifiMgrGetProfileByAsciiSSId (
 **/\r
 WIFI_MGR_NETWORK_PROFILE *\r
 WifiMgrGetProfileByProfileIndex (\r
-  IN  UINT32                         ProfileIndex,\r
-  IN  LIST_ENTRY                     *ProfileList\r
+  IN  UINT32      ProfileIndex,\r
+  IN  LIST_ENTRY  *ProfileList\r
   )\r
 {\r
-  WIFI_MGR_NETWORK_PROFILE           *Profile;\r
-  LIST_ENTRY                         *Entry;\r
+  WIFI_MGR_NETWORK_PROFILE  *Profile;\r
+  LIST_ENTRY                *Entry;\r
 \r
   if (ProfileList == NULL) {\r
     return NULL;\r
   }\r
+\r
   NET_LIST_FOR_EACH (Entry, ProfileList) {\r
-    Profile = NET_LIST_USER_STRUCT_S (Entry, WIFI_MGR_NETWORK_PROFILE,\r
-                Link, WIFI_MGR_PROFILE_SIGNATURE);\r
+    Profile = NET_LIST_USER_STRUCT_S (\r
+                Entry,\r
+                WIFI_MGR_NETWORK_PROFILE,\r
+                Link,\r
+                WIFI_MGR_PROFILE_SIGNATURE\r
+                );\r
     if (Profile->ProfileIndex == ProfileIndex) {\r
       return Profile;\r
     }\r
@@ -234,19 +252,20 @@ WifiMgrGetProfileByProfileIndex (
 **/\r
 BOOLEAN\r
 WifiMgrSupportAKMSuite (\r
-  IN  UINT16                               SupportedAKMSuiteCount,\r
-  IN  UINT32                               *SupportedAKMSuiteList,\r
-  IN  UINT32                               *AKMSuite\r
+  IN  UINT16  SupportedAKMSuiteCount,\r
+  IN  UINT32  *SupportedAKMSuiteList,\r
+  IN  UINT32  *AKMSuite\r
   )\r
 {\r
-  UINT16    Index;\r
+  UINT16  Index;\r
 \r
-  if (AKMSuite == NULL || SupportedAKMSuiteList == NULL ||\r
-    SupportedAKMSuiteCount == 0) {\r
+  if ((AKMSuite == NULL) || (SupportedAKMSuiteList == NULL) ||\r
+      (SupportedAKMSuiteCount == 0))\r
+  {\r
     return FALSE;\r
   }\r
 \r
-  for (Index = 0; Index < SupportedAKMSuiteCount; Index ++) {\r
+  for (Index = 0; Index < SupportedAKMSuiteCount; Index++) {\r
     if (SupportedAKMSuiteList[Index] == *AKMSuite) {\r
       return TRUE;\r
     }\r
@@ -267,19 +286,20 @@ WifiMgrSupportAKMSuite (
 **/\r
 BOOLEAN\r
 WifiMgrSupportCipherSuite (\r
-  IN  UINT16                                  SupportedCipherSuiteCount,\r
-  IN  UINT32                                  *SupportedCipherSuiteList,\r
-  IN  UINT32                                  *CipherSuite\r
+  IN  UINT16  SupportedCipherSuiteCount,\r
+  IN  UINT32  *SupportedCipherSuiteList,\r
+  IN  UINT32  *CipherSuite\r
   )\r
 {\r
   UINT16  Index;\r
 \r
-  if (CipherSuite == NULL || SupportedCipherSuiteCount == 0 ||\r
-    SupportedCipherSuiteList == NULL) {\r
+  if ((CipherSuite == NULL) || (SupportedCipherSuiteCount == 0) ||\r
+      (SupportedCipherSuiteList == NULL))\r
+  {\r
     return FALSE;\r
   }\r
 \r
-  for (Index = 0; Index < SupportedCipherSuiteCount; Index ++) {\r
+  for (Index = 0; Index < SupportedCipherSuiteCount; Index++) {\r
     if (SupportedCipherSuiteList[Index] == *CipherSuite) {\r
       return TRUE;\r
     }\r
@@ -309,23 +329,23 @@ WifiMgrSupportCipherSuite (
 **/\r
 EFI_STATUS\r
 WifiMgrCheckRSN (\r
-  IN    EFI_80211_AKM_SUITE_SELECTOR       *AKMList,\r
-  IN    EFI_80211_CIPHER_SUITE_SELECTOR    *CipherList,\r
-  IN    WIFI_MGR_DEVICE_DATA               *Nic,\r
-  OUT   UINT8                              *SecurityType,\r
-  OUT   BOOLEAN                            *AKMSuiteSupported,\r
-  OUT   BOOLEAN                            *CipherSuiteSupported\r
+  IN    EFI_80211_AKM_SUITE_SELECTOR     *AKMList,\r
+  IN    EFI_80211_CIPHER_SUITE_SELECTOR  *CipherList,\r
+  IN    WIFI_MGR_DEVICE_DATA             *Nic,\r
+  OUT   UINT8                            *SecurityType,\r
+  OUT   BOOLEAN                          *AKMSuiteSupported,\r
+  OUT   BOOLEAN                          *CipherSuiteSupported\r
   )\r
 {\r
-  EFI_80211_AKM_SUITE_SELECTOR             *SupportedAKMSuites;\r
-  EFI_80211_CIPHER_SUITE_SELECTOR          *SupportedSwCipherSuites;\r
-  EFI_80211_CIPHER_SUITE_SELECTOR          *SupportedHwCipherSuites;\r
-  EFI_80211_SUITE_SELECTOR                 *AKMSuite;\r
-  EFI_80211_SUITE_SELECTOR                 *CipherSuite;\r
-  UINT16                                   AKMIndex;\r
-  UINT16                                   CipherIndex;\r
-\r
-  if (Nic == NULL || AKMList == NULL || CipherList == NULL|| SecurityType == NULL) {\r
+  EFI_80211_AKM_SUITE_SELECTOR     *SupportedAKMSuites;\r
+  EFI_80211_CIPHER_SUITE_SELECTOR  *SupportedSwCipherSuites;\r
+  EFI_80211_CIPHER_SUITE_SELECTOR  *SupportedHwCipherSuites;\r
+  EFI_80211_SUITE_SELECTOR         *AKMSuite;\r
+  EFI_80211_SUITE_SELECTOR         *CipherSuite;\r
+  UINT16                           AKMIndex;\r
+  UINT16                           CipherIndex;\r
+\r
+  if ((Nic == NULL) || (AKMList == NULL) || (CipherList == NULL) || (SecurityType == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -334,7 +354,7 @@ WifiMgrCheckRSN (
   SupportedHwCipherSuites = Nic->SupportedSuites.SupportedHwCipherSuites;\r
 \r
   *SecurityType = SECURITY_TYPE_UNKNOWN;\r
-  if (AKMSuiteSupported != NULL && CipherSuiteSupported != NULL) {\r
+  if ((AKMSuiteSupported != NULL) && (CipherSuiteSupported != NULL)) {\r
     *AKMSuiteSupported    = FALSE;\r
     *CipherSuiteSupported = FALSE;\r
   }\r
@@ -342,7 +362,7 @@ WifiMgrCheckRSN (
   if (AKMList->AKMSuiteCount == 0) {\r
     if (CipherList->CipherSuiteCount == 0) {\r
       *SecurityType = SECURITY_TYPE_NONE;\r
-      if (AKMSuiteSupported != NULL && CipherSuiteSupported != NULL) {\r
+      if ((AKMSuiteSupported != NULL) && (CipherSuiteSupported != NULL)) {\r
         *AKMSuiteSupported    = TRUE;\r
         *CipherSuiteSupported = TRUE;\r
       }\r
@@ -351,48 +371,54 @@ WifiMgrCheckRSN (
     return EFI_SUCCESS;\r
   }\r
 \r
-  for (AKMIndex = 0; AKMIndex < AKMList->AKMSuiteCount; AKMIndex ++) {\r
-\r
+  for (AKMIndex = 0; AKMIndex < AKMList->AKMSuiteCount; AKMIndex++) {\r
     AKMSuite = AKMList->AKMSuiteList + AKMIndex;\r
-    if (WifiMgrSupportAKMSuite(SupportedAKMSuites->AKMSuiteCount,\r
-      (UINT32*) SupportedAKMSuites->AKMSuiteList, (UINT32*) AKMSuite)) {\r
-\r
-      if (AKMSuiteSupported != NULL && CipherSuiteSupported != NULL) {\r
+    if (WifiMgrSupportAKMSuite (\r
+          SupportedAKMSuites->AKMSuiteCount,\r
+          (UINT32 *)SupportedAKMSuites->AKMSuiteList,\r
+          (UINT32 *)AKMSuite\r
+          ))\r
+    {\r
+      if ((AKMSuiteSupported != NULL) && (CipherSuiteSupported != NULL)) {\r
         *AKMSuiteSupported = TRUE;\r
       }\r
-      for (CipherIndex = 0; CipherIndex < CipherList->CipherSuiteCount; CipherIndex ++) {\r
 \r
+      for (CipherIndex = 0; CipherIndex < CipherList->CipherSuiteCount; CipherIndex++) {\r
         CipherSuite = CipherList->CipherSuiteList + CipherIndex;\r
 \r
         if (SupportedSwCipherSuites != NULL) {\r
-\r
-          if (WifiMgrSupportCipherSuite(SupportedSwCipherSuites->CipherSuiteCount,\r
-            (UINT32*) SupportedSwCipherSuites->CipherSuiteList, (UINT32*) CipherSuite)) {\r
-\r
-            *SecurityType = WifiMgrGetSecurityType ((UINT32*) AKMSuite, (UINT32*) CipherSuite);\r
+          if (WifiMgrSupportCipherSuite (\r
+                SupportedSwCipherSuites->CipherSuiteCount,\r
+                (UINT32 *)SupportedSwCipherSuites->CipherSuiteList,\r
+                (UINT32 *)CipherSuite\r
+                ))\r
+          {\r
+            *SecurityType = WifiMgrGetSecurityType ((UINT32 *)AKMSuite, (UINT32 *)CipherSuite);\r
 \r
             if (*SecurityType != SECURITY_TYPE_UNKNOWN) {\r
-\r
-              if (AKMSuiteSupported != NULL && CipherSuiteSupported != NULL) {\r
+              if ((AKMSuiteSupported != NULL) && (CipherSuiteSupported != NULL)) {\r
                 *CipherSuiteSupported = TRUE;\r
               }\r
+\r
               return EFI_SUCCESS;\r
             }\r
           }\r
         }\r
 \r
         if (SupportedHwCipherSuites != NULL) {\r
-\r
-          if (WifiMgrSupportCipherSuite(SupportedHwCipherSuites->CipherSuiteCount,\r
-            (UINT32*) SupportedHwCipherSuites->CipherSuiteList, (UINT32*) CipherSuite)) {\r
-\r
-            *SecurityType = WifiMgrGetSecurityType ((UINT32*) AKMSuite, (UINT32*) CipherSuite);\r
+          if (WifiMgrSupportCipherSuite (\r
+                SupportedHwCipherSuites->CipherSuiteCount,\r
+                (UINT32 *)SupportedHwCipherSuites->CipherSuiteList,\r
+                (UINT32 *)CipherSuite\r
+                ))\r
+          {\r
+            *SecurityType = WifiMgrGetSecurityType ((UINT32 *)AKMSuite, (UINT32 *)CipherSuite);\r
 \r
             if (*SecurityType != SECURITY_TYPE_UNKNOWN) {\r
-\r
-              if (AKMSuiteSupported != NULL && CipherSuiteSupported != NULL) {\r
+              if ((AKMSuiteSupported != NULL) && (CipherSuiteSupported != NULL)) {\r
                 *CipherSuiteSupported = TRUE;\r
               }\r
+\r
               return EFI_SUCCESS;\r
             }\r
           }\r
@@ -401,8 +427,10 @@ WifiMgrCheckRSN (
     }\r
   }\r
 \r
-  *SecurityType = WifiMgrGetSecurityType ((UINT32*) AKMList->AKMSuiteList,\r
-                    (UINT32*) CipherList->CipherSuiteList);\r
+  *SecurityType = WifiMgrGetSecurityType (\r
+                    (UINT32 *)AKMList->AKMSuiteList,\r
+                    (UINT32 *)CipherList->CipherSuiteList\r
+                    );\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -418,60 +446,56 @@ WifiMgrCheckRSN (
 **/\r
 UINT8\r
 WifiMgrGetSecurityType (\r
-  IN  UINT32    *AKMSuite,\r
-  IN  UINT32    *CipherSuite\r
+  IN  UINT32  *AKMSuite,\r
+  IN  UINT32  *CipherSuite\r
   )\r
 {\r
   if (CipherSuite == NULL) {\r
-\r
     if (AKMSuite == NULL) {\r
       return SECURITY_TYPE_NONE;\r
     } else {\r
       return SECURITY_TYPE_UNKNOWN;\r
     }\r
   } else if (*CipherSuite == IEEE_80211_PAIRWISE_CIPHER_SUITE_USE_GROUP) {\r
-\r
     if (AKMSuite == NULL) {\r
       return SECURITY_TYPE_NONE;\r
     } else {\r
       return SECURITY_TYPE_UNKNOWN;\r
     }\r
-  } else if (*CipherSuite == IEEE_80211_PAIRWISE_CIPHER_SUITE_WEP40 ||\r
-    *CipherSuite == IEEE_80211_PAIRWISE_CIPHER_SUITE_WEP104) {\r
-\r
+  } else if ((*CipherSuite == IEEE_80211_PAIRWISE_CIPHER_SUITE_WEP40) ||\r
+             (*CipherSuite == IEEE_80211_PAIRWISE_CIPHER_SUITE_WEP104))\r
+  {\r
     return SECURITY_TYPE_WEP;\r
   } else if (*CipherSuite == IEEE_80211_PAIRWISE_CIPHER_SUITE_CCMP) {\r
-\r
     if (AKMSuite == NULL) {\r
       return SECURITY_TYPE_UNKNOWN;\r
     }\r
 \r
-    if (*AKMSuite == IEEE_80211_AKM_SUITE_8021X_OR_PMKSA ||\r
-      *AKMSuite == IEEE_80211_AKM_SUITE_8021X_OR_PMKSA_SHA256) {\r
-\r
+    if ((*AKMSuite == IEEE_80211_AKM_SUITE_8021X_OR_PMKSA) ||\r
+        (*AKMSuite == IEEE_80211_AKM_SUITE_8021X_OR_PMKSA_SHA256))\r
+    {\r
       return SECURITY_TYPE_WPA2_ENTERPRISE;\r
-    } else if (*AKMSuite == IEEE_80211_AKM_SUITE_PSK ||\r
-        *AKMSuite == IEEE_80211_AKM_SUITE_PSK_SHA256){\r
-\r
+    } else if ((*AKMSuite == IEEE_80211_AKM_SUITE_PSK) ||\r
+               (*AKMSuite == IEEE_80211_AKM_SUITE_PSK_SHA256))\r
+    {\r
       return SECURITY_TYPE_WPA2_PERSONAL;\r
-    }else {\r
+    } else {\r
       return SECURITY_TYPE_UNKNOWN;\r
     }\r
   } else if (*CipherSuite == IEEE_80211_PAIRWISE_CIPHER_SUITE_TKIP) {\r
-\r
     if (AKMSuite == NULL) {\r
       return SECURITY_TYPE_UNKNOWN;\r
     }\r
 \r
-    if (*AKMSuite == IEEE_80211_AKM_SUITE_8021X_OR_PMKSA ||\r
-      *AKMSuite == IEEE_80211_AKM_SUITE_8021X_OR_PMKSA_SHA256) {\r
-\r
+    if ((*AKMSuite == IEEE_80211_AKM_SUITE_8021X_OR_PMKSA) ||\r
+        (*AKMSuite == IEEE_80211_AKM_SUITE_8021X_OR_PMKSA_SHA256))\r
+    {\r
       return SECURITY_TYPE_WPA_ENTERPRISE;\r
-    } else if (*AKMSuite == IEEE_80211_AKM_SUITE_PSK ||\r
-        *AKMSuite == IEEE_80211_AKM_SUITE_PSK_SHA256){\r
-\r
+    } else if ((*AKMSuite == IEEE_80211_AKM_SUITE_PSK) ||\r
+               (*AKMSuite == IEEE_80211_AKM_SUITE_PSK_SHA256))\r
+    {\r
       return SECURITY_TYPE_WPA_PERSONAL;\r
-    }else {\r
+    } else {\r
       return SECURITY_TYPE_UNKNOWN;\r
     }\r
   } else {\r
@@ -490,36 +514,40 @@ WifiMgrGetSecurityType (
 **/\r
 EFI_STATUS\r
 WifiMgrGetSupportedSuites (\r
-  IN    WIFI_MGR_DEVICE_DATA            *Nic\r
+  IN    WIFI_MGR_DEVICE_DATA  *Nic\r
   )\r
 {\r
-  EFI_STATUS                            Status;\r
-  EFI_SUPPLICANT_PROTOCOL               *Supplicant;\r
-  EFI_80211_AKM_SUITE_SELECTOR          *SupportedAKMSuites;\r
-  EFI_80211_CIPHER_SUITE_SELECTOR       *SupportedSwCipherSuites;\r
-  EFI_80211_CIPHER_SUITE_SELECTOR       *SupportedHwCipherSuites;\r
-  UINTN                                 DataSize;\r
+  EFI_STATUS                       Status;\r
+  EFI_SUPPLICANT_PROTOCOL          *Supplicant;\r
+  EFI_80211_AKM_SUITE_SELECTOR     *SupportedAKMSuites;\r
+  EFI_80211_CIPHER_SUITE_SELECTOR  *SupportedSwCipherSuites;\r
+  EFI_80211_CIPHER_SUITE_SELECTOR  *SupportedHwCipherSuites;\r
+  UINTN                            DataSize;\r
 \r
   SupportedAKMSuites      = NULL;\r
   SupportedSwCipherSuites = NULL;\r
   SupportedHwCipherSuites = NULL;\r
 \r
-  if (Nic == NULL || Nic->Supplicant == NULL) {\r
+  if ((Nic == NULL) || (Nic->Supplicant == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   Supplicant = Nic->Supplicant;\r
 \r
-  DataSize  = 0;\r
-  Status = Supplicant->GetData (Supplicant, EfiSupplicant80211SupportedAKMSuites, NULL, &DataSize);\r
-  if (Status == EFI_BUFFER_TOO_SMALL && DataSize > 0) {\r
-\r
-    SupportedAKMSuites = AllocateZeroPool(DataSize);\r
+  DataSize = 0;\r
+  Status   = Supplicant->GetData (Supplicant, EfiSupplicant80211SupportedAKMSuites, NULL, &DataSize);\r
+  if ((Status == EFI_BUFFER_TOO_SMALL) && (DataSize > 0)) {\r
+    SupportedAKMSuites = AllocateZeroPool (DataSize);\r
     if (SupportedAKMSuites == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-    Status = Supplicant->GetData (Supplicant, EfiSupplicant80211SupportedAKMSuites,\r
-                           (UINT8 *) SupportedAKMSuites, &DataSize);\r
+\r
+    Status = Supplicant->GetData (\r
+                           Supplicant,\r
+                           EfiSupplicant80211SupportedAKMSuites,\r
+                           (UINT8 *)SupportedAKMSuites,\r
+                           &DataSize\r
+                           );\r
     if (!EFI_ERROR (Status)) {\r
       Nic->SupportedSuites.SupportedAKMSuites = SupportedAKMSuites;\r
     } else {\r
@@ -529,17 +557,20 @@ WifiMgrGetSupportedSuites (
     SupportedAKMSuites = NULL;\r
   }\r
 \r
-  DataSize  = 0;\r
-  Status = Supplicant->GetData (Supplicant, EfiSupplicant80211SupportedSoftwareCipherSuites, NULL, &DataSize);\r
-  if (Status == EFI_BUFFER_TOO_SMALL && DataSize > 0) {\r
-\r
-\r
-    SupportedSwCipherSuites = AllocateZeroPool(DataSize);\r
+  DataSize = 0;\r
+  Status   = Supplicant->GetData (Supplicant, EfiSupplicant80211SupportedSoftwareCipherSuites, NULL, &DataSize);\r
+  if ((Status == EFI_BUFFER_TOO_SMALL) && (DataSize > 0)) {\r
+    SupportedSwCipherSuites = AllocateZeroPool (DataSize);\r
     if (SupportedSwCipherSuites == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-    Status = Supplicant->GetData (Supplicant, EfiSupplicant80211SupportedSoftwareCipherSuites,\r
-                           (UINT8 *) SupportedSwCipherSuites, &DataSize);\r
+\r
+    Status = Supplicant->GetData (\r
+                           Supplicant,\r
+                           EfiSupplicant80211SupportedSoftwareCipherSuites,\r
+                           (UINT8 *)SupportedSwCipherSuites,\r
+                           &DataSize\r
+                           );\r
     if (!EFI_ERROR (Status)) {\r
       Nic->SupportedSuites.SupportedSwCipherSuites = SupportedSwCipherSuites;\r
     } else {\r
@@ -549,16 +580,20 @@ WifiMgrGetSupportedSuites (
     SupportedSwCipherSuites = NULL;\r
   }\r
 \r
-  DataSize  = 0;\r
-  Status = Supplicant->GetData (Supplicant, EfiSupplicant80211SupportedHardwareCipherSuites, NULL, &DataSize);\r
-  if (Status == EFI_BUFFER_TOO_SMALL && DataSize > 0) {\r
-\r
-    SupportedHwCipherSuites = AllocateZeroPool(DataSize);\r
+  DataSize = 0;\r
+  Status   = Supplicant->GetData (Supplicant, EfiSupplicant80211SupportedHardwareCipherSuites, NULL, &DataSize);\r
+  if ((Status == EFI_BUFFER_TOO_SMALL) && (DataSize > 0)) {\r
+    SupportedHwCipherSuites = AllocateZeroPool (DataSize);\r
     if (SupportedHwCipherSuites == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-    Status = Supplicant->GetData (Supplicant, EfiSupplicant80211SupportedHardwareCipherSuites,\r
-                           (UINT8 *) SupportedHwCipherSuites, &DataSize);\r
+\r
+    Status = Supplicant->GetData (\r
+                           Supplicant,\r
+                           EfiSupplicant80211SupportedHardwareCipherSuites,\r
+                           (UINT8 *)SupportedHwCipherSuites,\r
+                           &DataSize\r
+                           );\r
     if (!EFI_ERROR (Status)) {\r
       Nic->SupportedSuites.SupportedHwCipherSuites = SupportedHwCipherSuites;\r
     } else {\r
@@ -579,7 +614,7 @@ WifiMgrGetSupportedSuites (
 **/\r
 VOID\r
 WifiMgrCleanProfileSecrets (\r
-  IN  WIFI_MGR_NETWORK_PROFILE       *Profile\r
+  IN  WIFI_MGR_NETWORK_PROFILE  *Profile\r
   )\r
 {\r
   ZeroMem (Profile->Password, sizeof (CHAR16) * PASSWORD_STORAGE_SIZE);\r
@@ -587,26 +622,26 @@ WifiMgrCleanProfileSecrets (
   ZeroMem (Profile->PrivateKeyPassword, sizeof (CHAR16) * PASSWORD_STORAGE_SIZE);\r
 \r
   if (Profile->CACertData != NULL) {\r
-\r
     ZeroMem (Profile->CACertData, Profile->CACertSize);\r
     FreePool (Profile->CACertData);\r
   }\r
+\r
   Profile->CACertData = NULL;\r
   Profile->CACertSize = 0;\r
 \r
   if (Profile->ClientCertData != NULL) {\r
-\r
     ZeroMem (Profile->ClientCertData, Profile->ClientCertSize);\r
     FreePool (Profile->ClientCertData);\r
   }\r
+\r
   Profile->ClientCertData = NULL;\r
   Profile->ClientCertSize = 0;\r
 \r
   if (Profile->PrivateKeyData != NULL) {\r
-\r
     ZeroMem (Profile->PrivateKeyData, Profile->PrivateKeyDataSize);\r
     FreePool (Profile->PrivateKeyData);\r
   }\r
+\r
   Profile->PrivateKeyData     = NULL;\r
   Profile->PrivateKeyDataSize = 0;\r
 }\r
@@ -619,30 +654,33 @@ WifiMgrCleanProfileSecrets (
 **/\r
 VOID\r
 WifiMgrFreeProfileList (\r
-  IN  LIST_ENTRY                     *ProfileList\r
+  IN  LIST_ENTRY  *ProfileList\r
   )\r
 {\r
-  WIFI_MGR_NETWORK_PROFILE           *Profile;\r
-  LIST_ENTRY                         *Entry;\r
-  LIST_ENTRY                         *NextEntry;\r
+  WIFI_MGR_NETWORK_PROFILE  *Profile;\r
+  LIST_ENTRY                *Entry;\r
+  LIST_ENTRY                *NextEntry;\r
 \r
   if (ProfileList == NULL) {\r
     return;\r
   }\r
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, ProfileList) {\r
-\r
-    Profile = NET_LIST_USER_STRUCT_S (Entry, WIFI_MGR_NETWORK_PROFILE,\r
-                Link, WIFI_MGR_PROFILE_SIGNATURE);\r
+    Profile = NET_LIST_USER_STRUCT_S (\r
+                Entry,\r
+                WIFI_MGR_NETWORK_PROFILE,\r
+                Link,\r
+                WIFI_MGR_PROFILE_SIGNATURE\r
+                );\r
 \r
     WifiMgrCleanProfileSecrets (Profile);\r
 \r
     if (Profile->Network.AKMSuite != NULL) {\r
-      FreePool(Profile->Network.AKMSuite);\r
+      FreePool (Profile->Network.AKMSuite);\r
     }\r
 \r
     if (Profile->Network.CipherSuite != NULL) {\r
-      FreePool(Profile->Network.CipherSuite);\r
+      FreePool (Profile->Network.CipherSuite);\r
     }\r
 \r
     FreePool (Profile);\r
@@ -657,26 +695,28 @@ WifiMgrFreeProfileList (
 **/\r
 VOID\r
 WifiMgrFreeHiddenList (\r
-  IN  LIST_ENTRY                     *HiddenList\r
+  IN  LIST_ENTRY  *HiddenList\r
   )\r
 {\r
-  WIFI_HIDDEN_NETWORK_DATA           *HiddenNetwork;\r
-  LIST_ENTRY                         *Entry;\r
-  LIST_ENTRY                         *NextEntry;\r
+  WIFI_HIDDEN_NETWORK_DATA  *HiddenNetwork;\r
+  LIST_ENTRY                *Entry;\r
+  LIST_ENTRY                *NextEntry;\r
 \r
   if (HiddenList == NULL) {\r
     return;\r
   }\r
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, HiddenList) {\r
-\r
-    HiddenNetwork = NET_LIST_USER_STRUCT_S (Entry, WIFI_HIDDEN_NETWORK_DATA,\r
-                      Link, WIFI_MGR_HIDDEN_NETWORK_SIGNATURE);\r
+    HiddenNetwork = NET_LIST_USER_STRUCT_S (\r
+                      Entry,\r
+                      WIFI_HIDDEN_NETWORK_DATA,\r
+                      Link,\r
+                      WIFI_MGR_HIDDEN_NETWORK_SIGNATURE\r
+                      );\r
     FreePool (HiddenNetwork);\r
   }\r
 }\r
 \r
-\r
 /**\r
   Free the resources of a config token.\r
 \r
@@ -684,24 +724,22 @@ WifiMgrFreeHiddenList (
 **/\r
 VOID\r
 WifiMgrFreeToken (\r
-  IN   WIFI_MGR_MAC_CONFIG_TOKEN    *ConfigToken\r
+  IN   WIFI_MGR_MAC_CONFIG_TOKEN  *ConfigToken\r
   )\r
 {\r
-  EFI_80211_GET_NETWORKS_RESULT     *Result;\r
+  EFI_80211_GET_NETWORKS_RESULT  *Result;\r
 \r
   if (ConfigToken == NULL) {\r
     return;\r
   }\r
 \r
   switch (ConfigToken->Type) {\r
-\r
     case TokenTypeGetNetworksToken:\r
 \r
       if (ConfigToken->Token.GetNetworksToken != NULL) {\r
-\r
         gBS->CloseEvent (ConfigToken->Token.GetNetworksToken->Event);\r
         if (ConfigToken->Token.GetNetworksToken->Data != NULL) {\r
-          FreePool(ConfigToken->Token.GetNetworksToken->Data);\r
+          FreePool (ConfigToken->Token.GetNetworksToken->Data);\r
         }\r
 \r
         Result = ConfigToken->Token.GetNetworksToken->Result;\r
@@ -709,7 +747,7 @@ WifiMgrFreeToken (
           FreePool (Result);\r
         }\r
 \r
-        FreePool(ConfigToken->Token.GetNetworksToken);\r
+        FreePool (ConfigToken->Token.GetNetworksToken);\r
       }\r
 \r
       FreePool (ConfigToken);\r
@@ -718,27 +756,27 @@ WifiMgrFreeToken (
     case TokenTypeConnectNetworkToken:\r
 \r
       if (ConfigToken->Token.ConnectNetworkToken != NULL) {\r
-\r
         gBS->CloseEvent (ConfigToken->Token.ConnectNetworkToken->Event);\r
         if (ConfigToken->Token.ConnectNetworkToken->Data != NULL) {\r
-          FreePool(ConfigToken->Token.ConnectNetworkToken->Data);\r
+          FreePool (ConfigToken->Token.ConnectNetworkToken->Data);\r
         }\r
-        FreePool(ConfigToken->Token.ConnectNetworkToken);\r
+\r
+        FreePool (ConfigToken->Token.ConnectNetworkToken);\r
       }\r
+\r
       FreePool (ConfigToken);\r
       break;\r
 \r
     case TokenTypeDisconnectNetworkToken:\r
 \r
       if (ConfigToken->Token.DisconnectNetworkToken != NULL) {\r
-\r
-        FreePool(ConfigToken->Token.DisconnectNetworkToken);\r
+        FreePool (ConfigToken->Token.DisconnectNetworkToken);\r
       }\r
 \r
       FreePool (ConfigToken);\r
       break;\r
 \r
-    default :\r
+    default:\r
       break;\r
   }\r
 }\r
index ef5b9e5da6942fb9f6614b9d65e1f9a7672cf2f0..71ad007ef6f1bdc11db30921576062f1f917ff98 100644 (file)
@@ -20,8 +20,8 @@
 VOID\r
 EFIAPI\r
 WifiMgrInternalEmptyFunction (\r
-  IN  EFI_EVENT   Event,\r
-  IN  VOID        *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   );\r
 \r
 /**\r
@@ -34,9 +34,9 @@ WifiMgrInternalEmptyFunction (
 **/\r
 VOID\r
 WifiMgrMacAddrToStr (\r
-  IN  EFI_80211_MAC_ADDRESS     *Mac,\r
-  IN  UINT32                    StrSize,\r
-  OUT CHAR16                    *Str\r
+  IN  EFI_80211_MAC_ADDRESS  *Mac,\r
+  IN  UINT32                 StrSize,\r
+  OUT CHAR16                 *Str\r
   );\r
 \r
 /**\r
@@ -53,12 +53,11 @@ WifiMgrMacAddrToStr (
 **/\r
 EFI_STATUS\r
 WifiMgrReadFileToBuffer (\r
-  IN   WIFI_MGR_FILE_CONTEXT          *FileContext,\r
-  OUT  VOID                           **PrivateKeyDataAddr,\r
-  OUT  UINTN                          *PrivateKeyDataSize\r
+  IN   WIFI_MGR_FILE_CONTEXT  *FileContext,\r
+  OUT  VOID                   **PrivateKeyDataAddr,\r
+  OUT  UINTN                  *PrivateKeyDataSize\r
   );\r
 \r
-\r
 /**\r
   Get the Nic data by the NicIndex.\r
 \r
@@ -70,8 +69,8 @@ WifiMgrReadFileToBuffer (
 **/\r
 WIFI_MGR_DEVICE_DATA *\r
 WifiMgrGetNicByIndex (\r
-  IN WIFI_MGR_PRIVATE_DATA      *Private,\r
-  IN UINT32                     NicIndex\r
+  IN WIFI_MGR_PRIVATE_DATA  *Private,\r
+  IN UINT32                 NicIndex\r
   );\r
 \r
 /**\r
@@ -86,9 +85,9 @@ WifiMgrGetNicByIndex (
 **/\r
 WIFI_MGR_NETWORK_PROFILE *\r
 WifiMgrGetProfileByUnicodeSSId (\r
-  IN  CHAR16                         *SSId,\r
-  IN  UINT8                          SecurityType,\r
-  IN  LIST_ENTRY                     *ProfileList\r
+  IN  CHAR16      *SSId,\r
+  IN  UINT8       SecurityType,\r
+  IN  LIST_ENTRY  *ProfileList\r
   );\r
 \r
 /**\r
@@ -103,9 +102,9 @@ WifiMgrGetProfileByUnicodeSSId (
 **/\r
 WIFI_MGR_NETWORK_PROFILE *\r
 WifiMgrGetProfileByAsciiSSId (\r
-  IN  CHAR8                          *SSId,\r
-  IN  UINT8                          SecurityType,\r
-  IN  LIST_ENTRY                     *ProfileList\r
+  IN  CHAR8       *SSId,\r
+  IN  UINT8       SecurityType,\r
+  IN  LIST_ENTRY  *ProfileList\r
   );\r
 \r
 /**\r
@@ -119,8 +118,8 @@ WifiMgrGetProfileByAsciiSSId (
 **/\r
 WIFI_MGR_NETWORK_PROFILE *\r
 WifiMgrGetProfileByProfileIndex (\r
-  IN UINT32                     ProfileIndex,\r
-  IN LIST_ENTRY                 *ProfileList\r
+  IN UINT32      ProfileIndex,\r
+  IN LIST_ENTRY  *ProfileList\r
   );\r
 \r
 /**\r
@@ -135,9 +134,9 @@ WifiMgrGetProfileByProfileIndex (
 **/\r
 BOOLEAN\r
 WifiMgrSupportAKMSuite (\r
-  IN  UINT16                              SupportedAKMSuiteCount,\r
-  IN  UINT32                              *SupportedAKMSuiteList,\r
-  IN  UINT32                              *AKMSuite\r
+  IN  UINT16  SupportedAKMSuiteCount,\r
+  IN  UINT32  *SupportedAKMSuiteList,\r
+  IN  UINT32  *AKMSuite\r
   );\r
 \r
 /**\r
@@ -152,9 +151,9 @@ WifiMgrSupportAKMSuite (
 **/\r
 BOOLEAN\r
 WifiMgrSupportCipherSuite (\r
-  IN  UINT16                              SupportedCipherSuiteCount,\r
-  IN  UINT32                              *SupportedCipherSuiteList,\r
-  IN  UINT32                              *CipherSuite\r
+  IN  UINT16  SupportedCipherSuiteCount,\r
+  IN  UINT32  *SupportedCipherSuiteList,\r
+  IN  UINT32  *CipherSuite\r
   );\r
 \r
 /**\r
@@ -178,12 +177,12 @@ WifiMgrSupportCipherSuite (
 **/\r
 EFI_STATUS\r
 WifiMgrCheckRSN (\r
-  IN    EFI_80211_AKM_SUITE_SELECTOR      *AKMList,\r
-  IN    EFI_80211_CIPHER_SUITE_SELECTOR   *CipherList,\r
-  IN    WIFI_MGR_DEVICE_DATA              *Nic,\r
-  OUT   UINT8                             *SecurityType,\r
-  OUT   BOOLEAN                           *AKMSuiteSupported,\r
-  OUT   BOOLEAN                           *CipherSuiteSupported\r
+  IN    EFI_80211_AKM_SUITE_SELECTOR     *AKMList,\r
+  IN    EFI_80211_CIPHER_SUITE_SELECTOR  *CipherList,\r
+  IN    WIFI_MGR_DEVICE_DATA             *Nic,\r
+  OUT   UINT8                            *SecurityType,\r
+  OUT   BOOLEAN                          *AKMSuiteSupported,\r
+  OUT   BOOLEAN                          *CipherSuiteSupported\r
   );\r
 \r
 /**\r
@@ -197,8 +196,8 @@ WifiMgrCheckRSN (
 **/\r
 UINT8\r
 WifiMgrGetSecurityType (\r
-  IN    UINT32                          *AKMSuite,\r
-  IN    UINT32                          *CipherSuite\r
+  IN    UINT32  *AKMSuite,\r
+  IN    UINT32  *CipherSuite\r
   );\r
 \r
 /**\r
@@ -212,7 +211,7 @@ WifiMgrGetSecurityType (
 **/\r
 EFI_STATUS\r
 WifiMgrGetSupportedSuites (\r
-  IN    WIFI_MGR_DEVICE_DATA            *Nic\r
+  IN    WIFI_MGR_DEVICE_DATA  *Nic\r
   );\r
 \r
 /**\r
@@ -223,7 +222,7 @@ WifiMgrGetSupportedSuites (
 **/\r
 VOID\r
 WifiMgrCleanProfileSecrets (\r
-  IN  WIFI_MGR_NETWORK_PROFILE       *Profile\r
+  IN  WIFI_MGR_NETWORK_PROFILE  *Profile\r
   );\r
 \r
 /**\r
@@ -234,7 +233,7 @@ WifiMgrCleanProfileSecrets (
 **/\r
 VOID\r
 WifiMgrFreeProfileList (\r
-  IN  LIST_ENTRY               *ProfileList\r
+  IN  LIST_ENTRY  *ProfileList\r
   );\r
 \r
 /**\r
@@ -245,7 +244,7 @@ WifiMgrFreeProfileList (
 **/\r
 VOID\r
 WifiMgrFreeHiddenList (\r
-  IN  LIST_ENTRY                     *HiddenList\r
+  IN  LIST_ENTRY  *HiddenList\r
   );\r
 \r
 /**\r
@@ -256,7 +255,7 @@ WifiMgrFreeHiddenList (
 **/\r
 VOID\r
 WifiMgrFreeToken (\r
-  IN   WIFI_MGR_MAC_CONFIG_TOKEN        *ConfigToken\r
+  IN   WIFI_MGR_MAC_CONFIG_TOKEN  *ConfigToken\r
   );\r
 \r
 #endif\r