]> git.proxmox.com Git - mirror_edk2.git/blobdiff - NetworkPkg/Ip6Dxe/Ip6ConfigNv.c
NetworkPkg: Apply uncrustify changes
[mirror_edk2.git] / NetworkPkg / Ip6Dxe / Ip6ConfigNv.c
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