Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/ArpDxe/ArpMain.c

Timestamp:

Apr 14, 2023 3:17:44 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156854

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/ArpMain.c (modified) (18 diffs)

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

@@ -8 +8 @@
 
 #include "ArpImpl.h"
-
 
 /**
@@ -54 +53 @@
 
   if ((ConfigData != NULL) &&
-    ((ConfigData->SwAddressLength == 0) ||
-    (ConfigData->StationAddress == NULL) ||
-    (ConfigData->SwAddressType <= 1500))) {
+      ((ConfigData->SwAddressLength == 0) ||
+       (ConfigData->StationAddress == NULL) ||
+       (ConfigData->SwAddressType <= 1500)))
+  {
     return EFI_INVALID_PARAMETER;
   }
@@ -73 +73 @@
   return Status;
 }
-
 
 /**
@@ -144 +143 @@
 
   if (((!DenyFlag) && ((TargetHwAddress == NULL) || (TargetSwAddress == NULL))) ||
-    (DenyFlag && (TargetHwAddress != NULL) && (TargetSwAddress != NULL)) ||
-    ((TargetHwAddress == NULL) && (TargetSwAddress == NULL))) {
+      (DenyFlag && (TargetHwAddress != NULL) && (TargetSwAddress != NULL)) ||
+      ((TargetHwAddress == NULL) && (TargetSwAddress == NULL)))
+  {
     return EFI_INVALID_PARAMETER;
   }
@@ -163 +163 @@
   //
   MatchAddress[Hardware].Type       = SnpMode->IfType;
-  MatchAddress[Hardware].Length     = (UINT8) SnpMode->HwAddressSize;
+  MatchAddress[Hardware].Length     = (UINT8)SnpMode->HwAddressSize;
   MatchAddress[Hardware].AddressPtr = TargetHwAddress;
 
@@ -230 +230 @@
 
     if (CacheEntry == NULL) {
-      DEBUG ((EFI_D_ERROR, "ArpAdd: Failed to allocate pool for CacheEntry.\n"));
+      DEBUG ((DEBUG_ERROR, "ArpAdd: Failed to allocate pool for CacheEntry.\n"));
       Status = EFI_OUT_OF_RESOURCES;
       goto UNLOCK_EXIT;
@@ -271 +271 @@
   return Status;
 }
-
 
 /**
@@ -324 +323 @@
 
   if ((This == NULL) ||
-    (!Refresh && (EntryCount == NULL) && (EntryLength == NULL)) ||
-    ((Entries != NULL) && ((EntryLength == NULL) || (EntryCount == NULL)))) {
-    return EFI_INVALID_PARAMETER;
-  }
-
-  Instance   = ARP_INSTANCE_DATA_FROM_THIS (This);
+      (!Refresh && (EntryCount == NULL) && (EntryLength == NULL)) ||
+      ((Entries != NULL) && ((EntryLength == NULL) || (EntryCount == NULL))))
+  {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  Instance = ARP_INSTANCE_DATA_FROM_THIS (This);
 
   if (!Instance->Configured) {
@@ -354 +354 @@
   return Status;
 }
-
 
 /**
@@ -407 +406 @@
 }
 
-
 /**
   This function delete all dynamic entries from the ARP cache that match the specified
@@ -451 +449 @@
   return (Count == 0) ? EFI_NOT_FOUND : EFI_SUCCESS;
 }
-
 
 /**
@@ -509 +506 @@
 
   if ((TargetSwAddress == NULL) ||
-    ((Instance->ConfigData.SwAddressType == IPV4_ETHER_PROTO_TYPE) &&
-    IP4_IS_LOCAL_BROADCAST (*((UINT32 *)TargetSwAddress)))) {
+      ((Instance->ConfigData.SwAddressType == IPV4_ETHER_PROTO_TYPE) &&
+       IP4_IS_LOCAL_BROADCAST (*((UINT32 *)TargetSwAddress))))
+  {
     //
     // Return the hardware broadcast address.
@@ -520 +518 @@
 
   if ((Instance->ConfigData.SwAddressType == IPV4_ETHER_PROTO_TYPE) &&
-    IP4_IS_MULTICAST (NTOHL (*((UINT32 *)TargetSwAddress)))) {
+      IP4_IS_MULTICAST (NTOHL (*((UINT32 *)TargetSwAddress))))
+  {
     //
     // If the software address is an IPv4 multicast address, invoke Mnp to
@@ -589 +588 @@
   // Create a request context for this arp request.
   //
-  RequestContext = AllocatePool (sizeof(USER_REQUEST_CONTEXT));
+  RequestContext = AllocatePool (sizeof (USER_REQUEST_CONTEXT));
   if (RequestContext == NULL) {
-    DEBUG ((EFI_D_ERROR, "ArpRequest: Allocate memory for RequestContext failed.\n"));
+    DEBUG ((DEBUG_ERROR, "ArpRequest: Allocate memory for RequestContext failed.\n"));
 
     Status = EFI_OUT_OF_RESOURCES;
@@ -613 +612 @@
                  );
   if (CacheEntry != NULL) {
-
     CacheEntry->NextRetryTime = Instance->ConfigData.RetryTimeOut;
     CacheEntry->RetryCount    = Instance->ConfigData.RetryCount;
@@ -622 +620 @@
     CacheEntry = ArpAllocCacheEntry (Instance);
     if (CacheEntry == NULL) {
-      DEBUG ((EFI_D_ERROR, "ArpRequest: Allocate memory for CacheEntry failed.\n"));
+      DEBUG ((DEBUG_ERROR, "ArpRequest: Allocate memory for CacheEntry failed.\n"));
       FreePool (RequestContext);
 
@@ -668 +666 @@
   return Status;
 }
-
 
 /**
@@ -710 +707 @@
 
   if ((This == NULL) ||
-    ((TargetSwAddress != NULL) && (ResolvedEvent == NULL)) ||
-    ((TargetSwAddress == NULL) && (ResolvedEvent != NULL))) {
+      ((TargetSwAddress != NULL) && (ResolvedEvent == NULL)) ||
+      ((TargetSwAddress == NULL) && (ResolvedEvent != NULL)))
+  {
     return EFI_INVALID_PARAMETER;
   }