UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / NetworkPkg / Ip6Dxe / ComponentName.c

diff --git a/NetworkPkg/Ip6Dxe/ComponentName.c b/NetworkPkg/Ip6Dxe/ComponentName.c
index e314f152070352c73e1dc208850042504ef1a2b8..b59c6d2a22feec77f2598c2008d0b1c185b5b69b 100644 (file)
--- a/NetworkPkg/Ip6Dxe/ComponentName.c
+++ b/NetworkPkg/Ip6Dxe/ComponentName.c
@@ -4,13 +4,7 @@
 \r
   Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
 \r
-  This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php.\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -138,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
@@ -158,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
@@ -174,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
@@ -224,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
@@ -245,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
@@ -290,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
@@ -412,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