Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/StdLib/EfiSocketLib/Service.c

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• StdLib/EfiSocketLib/Service.c (modified) (6 diffs)

trunk/src/VBox/Devices/EFI/Firmware/StdLib/EfiSocketLib/Service.c

@@ -30 +30 @@
 
   @retval EFI_SUCCESS          This driver is added to Controller.
-  @retval other                This driver does not support this device.
+  @retval EFI_OUT_OF_RESOURCES No more memory available.
+  @retval EFI_UNSUPPORTED      This driver does not support this device.
 
 **/
@@ -41 +42 @@
 {
   BOOLEAN bInUse;
+  EFI_STATUS ExitStatus;
   UINTN LengthInBytes;
   UINT8 * pBuffer;
@@ -57 +59 @@
   //  Assume the list is empty
   //
-  Status = EFI_UNSUPPORTED;
+  ExitStatus = EFI_UNSUPPORTED;
   bInUse = FALSE;
 
@@ -172 +174 @@
 
               //
-              //  Determine if the initialization was successful
-              //
-              if ( EFI_ERROR ( Status )) {
-                DEBUG (( DEBUG_ERROR | DEBUG_POOL | DEBUG_INIT,
-                          "ERROR - Failed to initialize service %s on 0x%08x, Status: %r\r\n",
-                          pSocketBinding->pName,
-                          Controller,
-                          Status ));
-
-                //
-                //  Free the network service binding if necessary
-                //
-                gBS->UninstallMultipleProtocolInterfaces (
-                          Controller,
-                          pSocketBinding->pTagGuid,
-                          pService,
-                          NULL );
-                DEBUG (( DEBUG_POOL | DEBUG_INIT | DEBUG_INFO,
-                            "Removed:   %s TagGuid from 0x%08x\r\n",
-                            pSocketBinding->pName,
-                            Controller ));
-              }
+              //  At least one service was made available
+              //
+              ExitStatus = EFI_SUCCESS;
             }
             else {
@@ -242 +225 @@
                     "ERROR - Failed service allocation, Status: %r\r\n",
                     Status ));
+          ExitStatus = EFI_OUT_OF_RESOURCES;
+          break;
         }
       }
@@ -255 +240 @@
   //  Display the driver start status
   //
-  DBG_EXIT_STATUS ( Status );
-  return Status;
+  DBG_EXIT_STATUS ( ExitStatus );
+  return ExitStatus;
 }