Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/ArpDxe/ArpDriver.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/ArpDxe/ArpDriver.c (modified) (18 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/ArpDxe/ArpDriver.c

@@ -10 +10 @@
 #include "ArpImpl.h"
 
-EFI_DRIVER_BINDING_PROTOCOL gArpDriverBinding = {
+EFI_DRIVER_BINDING_PROTOCOL  gArpDriverBinding = {
   ArpDriverBindingSupported,
   ArpDriverBindingStart,
@@ -19 +19 @@
 };
 
-
 /**
   Create and initialize the arp service context data.
@@ -38 +37 @@
 EFI_STATUS
 ArpCreateService (
-  IN EFI_HANDLE        ImageHandle,
-  IN EFI_HANDLE        ControllerHandle,
+  IN EFI_HANDLE            ImageHandle,
+  IN EFI_HANDLE            ControllerHandle,
   IN OUT ARP_SERVICE_DATA  *ArpService
   )
@@ -177 +176 @@
 }
 
-
 /**
   Clean the arp service context data.
@@ -227 +225 @@
     // Destroy the mnp child.
     //
-    NetLibDestroyServiceChild(
+    NetLibDestroyServiceChild (
       ArpService->ControllerHandle,
       ArpService->ImageHandle,
@@ -249 +247 @@
 EFIAPI
 ArpDestroyChildEntryInHandleBuffer (
-  IN LIST_ENTRY         *Entry,
-  IN VOID               *Context
+  IN LIST_ENTRY  *Entry,
+  IN VOID        *Context
   )
 {
@@ -256 +254 @@
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;
 
-  if (Entry == NULL || Context == NULL) {
+  if ((Entry == NULL) || (Context == NULL)) {
     return EFI_INVALID_PARAMETER;
   }
 
-  Instance = NET_LIST_USER_STRUCT_S (Entry, ARP_INSTANCE_DATA, List, ARP_INSTANCE_DATA_SIGNATURE);
-  ServiceBinding    = (EFI_SERVICE_BINDING_PROTOCOL *) Context;
+  Instance       = NET_LIST_USER_STRUCT_S (Entry, ARP_INSTANCE_DATA, List, ARP_INSTANCE_DATA_SIGNATURE);
+  ServiceBinding = (EFI_SERVICE_BINDING_PROTOCOL *)Context;
 
   return ServiceBinding->DestroyChild (ServiceBinding, Instance->Handle);
@@ -335 +333 @@
 }
 
-
 /**
   Start this driver on ControllerHandle.
@@ -381 +378 @@
   // Allocate a zero pool for ArpService.
   //
-  ArpService = AllocateZeroPool (sizeof(ARP_SERVICE_DATA));
+  ArpService = AllocateZeroPool (sizeof (ARP_SERVICE_DATA));
   if (ArpService == NULL) {
     return EFI_OUT_OF_RESOURCES;
@@ -427 +424 @@
   return Status;
 }
-
 
 /**
@@ -493 +489 @@
                   );
   if (EFI_ERROR (Status)) {
-    DEBUG ((EFI_D_ERROR, "ArpDriverBindingStop: Open ArpSb failed, %r.\n", Status));
+    DEBUG ((DEBUG_ERROR, "ArpDriverBindingStop: Open ArpSb failed, %r.\n", Status));
     return EFI_DEVICE_ERROR;
   }
@@ -503 +499 @@
     // NumberOfChildren is not zero, destroy all the ARP children instances.
     //
-    List = &ArpService->ChildrenList;
+    List   = &ArpService->ChildrenList;
     Status = NetDestroyLinkList (
                List,
@@ -577 +573 @@
   // Allocate memory for the instance context data.
   //
-  Instance = AllocateZeroPool (sizeof(ARP_INSTANCE_DATA));
+  Instance = AllocateZeroPool (sizeof (ARP_INSTANCE_DATA));
   if (Instance == NULL) {
-    DEBUG ((EFI_D_ERROR, "ArpSBCreateChild: Failed to allocate memory for Instance.\n"));
+    DEBUG ((DEBUG_ERROR, "ArpSBCreateChild: Failed to allocate memory for Instance.\n"));
 
     return EFI_OUT_OF_RESOURCES;
@@ -616 +612 @@
                   ArpService->MnpChildHandle,
                   &gEfiManagedNetworkProtocolGuid,
-                  (VOID **) &Mnp,
+                  (VOID **)&Mnp,
                   gArpDriverBinding.DriverBindingHandle,
                   Instance->Handle,
@@ -638 +634 @@
 
   if (EFI_ERROR (Status)) {
-
     gBS->CloseProtocol (
            ArpService->MnpChildHandle,
@@ -661 +656 @@
   return Status;
 }
-
 
 /**
@@ -747 +741 @@
                   );
   if (EFI_ERROR (Status)) {
-    DEBUG ((EFI_D_ERROR, "ArpSBDestroyChild: Failed to uninstall the arp protocol, %r.\n",
-      Status));
+    DEBUG ((
+      DEBUG_ERROR,
+      "ArpSBDestroyChild: Failed to uninstall the arp protocol, %r.\n",
+      Status
+      ));
 
     Instance->InDestroy = FALSE;
@@ -809 +806 @@
            );
 }
-