Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Dhcp6Dxe/ComponentName.c

Timestamp:

Apr 14, 2023 3:17:44 PM (22 months ago)

Author:

vboxsync

Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• NetworkPkg/Dhcp6Dxe/ComponentName.c (modified) (10 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Dhcp6Dxe/ComponentName.c

@@ -9 +9 @@
 
 #include "Dhcp6Impl.h"
-
 
 /**
@@ -58 +57 @@
   );
 
-
 /**
   Retrieves a Unicode string that is the user-readable name of the controller
@@ -130 +128 @@
 EFIAPI
 Dhcp6ComponentNameGetControllerName (
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,
-  IN  EFI_HANDLE                                      ControllerHandle,
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,
-  IN  CHAR8                                           *Language,
-  OUT CHAR16                                          **ControllerName
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,
+  IN  EFI_HANDLE                   ControllerHandle,
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,
+  IN  CHAR8                        *Language,
+  OUT CHAR16                       **ControllerName
   );
-
 
 //
 // EFI Component Name Protocol
 //
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL    gDhcp6ComponentName = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gDhcp6ComponentName = {
   Dhcp6ComponentNameGetDriverName,
   Dhcp6ComponentNameGetControllerName,
@@ -150 +147 @@
 // EFI Component Name 2 Protocol
 //
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL   gDhcp6ComponentName2 = {
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) Dhcp6ComponentNameGetDriverName,
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) Dhcp6ComponentNameGetControllerName,
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gDhcp6ComponentName2 = {
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)Dhcp6ComponentNameGetDriverName,
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)Dhcp6ComponentNameGetControllerName,
   "en"
 };
 
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE       mDhcp6DriverNameTable[] = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mDhcp6DriverNameTable[] = {
   {
     "eng;en",
@@ -167 +164 @@
 };
 
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE   *gDhcp6ControllerNameTable = NULL;
-
-CHAR16 *mDhcp6ControllerName[] = {
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  *gDhcp6ControllerNameTable = NULL;
+
+CHAR16  *mDhcp6ControllerName[] = {
   L"DHCPv6 (State=0, Init)",
   L"DHCPv6 (State=1, Selecting)",
@@ -249 +246 @@
 EFI_STATUS
 UpdateName (
-  IN   EFI_DHCP6_PROTOCOL             *Dhcp6
+  IN   EFI_DHCP6_PROTOCOL  *Dhcp6
   )
 {
-  EFI_STATUS                       Status;
-  EFI_DHCP6_MODE_DATA              Dhcp6ModeData;
-  CHAR16                           *HandleName;
+  EFI_STATUS           Status;
+  EFI_DHCP6_MODE_DATA  Dhcp6ModeData;
+  CHAR16               *HandleName;
 
   if (Dhcp6 == NULL) {
@@ -279 +276 @@
       return EFI_DEVICE_ERROR;
     }
+
     HandleName = mDhcp6ControllerName[Dhcp6ModeData.Ia->State];
   }
@@ -285 +283 @@
     FreePool (Dhcp6ModeData.Ia);
   }
+
   if (Dhcp6ModeData.ClientId != NULL) {
     FreePool (Dhcp6ModeData.ClientId);
@@ -380 +379 @@
 EFIAPI
 Dhcp6ComponentNameGetControllerName (
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,
-  IN  EFI_HANDLE                                      ControllerHandle,
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,
-  IN  CHAR8                                           *Language,
-  OUT CHAR16                                          **ControllerName
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,
+  IN  EFI_HANDLE                   ControllerHandle,
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,
+  IN  CHAR8                        *Language,
+  OUT CHAR16                       **ControllerName
   )
 {
-  EFI_STATUS                    Status;
-  EFI_DHCP6_PROTOCOL            *Dhcp6;
+  EFI_STATUS          Status;
+  EFI_DHCP6_PROTOCOL  *Dhcp6;
 
   //
@@ -440 +439 @@
            );
 }
-