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

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/VlanConfigDxe/VlanConfigDriver.c

@@ -9 +9 @@
 #include "VlanConfigImpl.h"
 
-EFI_DRIVER_BINDING_PROTOCOL gVlanConfigDriverBinding = {
+EFI_DRIVER_BINDING_PROTOCOL  gVlanConfigDriverBinding = {
   VlanConfigDriverBindingSupported,
   VlanConfigDriverBindingStart,
@@ -32 +32 @@
 EFIAPI
 VlanConfigDriverEntryPoint (
-  IN EFI_HANDLE          ImageHandle,
-  IN EFI_SYSTEM_TABLE    *SystemTable
+  IN EFI_HANDLE        ImageHandle,
+  IN EFI_SYSTEM_TABLE  *SystemTable
   )
 {
@@ -46 +46 @@
 }
 
-
 /**
   Test to see if this driver supports ControllerHandle.
@@ -63 +62 @@
 EFIAPI
 VlanConfigDriverBindingSupported (
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,
-  IN EFI_HANDLE                      ControllerHandle,
-  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath OPTIONAL
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,
+  IN EFI_HANDLE                   ControllerHandle,
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL
   )
 {
@@ -74 +73 @@
                   ControllerHandle,
                   &gEfiVlanConfigProtocolGuid,
-                  (VOID **) &VlanConfig,
+                  (VOID **)&VlanConfig,
                   This->DriverBindingHandle,
                   ControllerHandle,
@@ -96 +95 @@
 }
 
-
 /**
   Start this driver on ControllerHandle.
@@ -113 +111 @@
 EFIAPI
 VlanConfigDriverBindingStart (
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,
-  IN EFI_HANDLE                      ControllerHandle,
-  IN EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath OPTIONAL
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,
+  IN EFI_HANDLE                   ControllerHandle,
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL
   )
 {
@@ -129 +127 @@
                   ControllerHandle,
                   &gEfiCallerIdGuid,
-                  (VOID **) &PrivateData,
+                  (VOID **)&PrivateData,
                   This->DriverBindingHandle,
                   ControllerHandle,
@@ -144 +142 @@
                   ControllerHandle,
                   &gEfiVlanConfigProtocolGuid,
-                  (VOID **) &VlanConfig,
+                  (VOID **)&VlanConfig,
                   This->DriverBindingHandle,
                   ControllerHandle,
@@ -159 +157 @@
                   ControllerHandle,
                   &gEfiDevicePathProtocolGuid,
-                  (VOID **) &DevicePath,
+                  (VOID **)&DevicePath,
                   This->DriverBindingHandle,
                   ControllerHandle,
@@ -177 +175 @@
   }
 
-  PrivateData->ImageHandle = This->DriverBindingHandle;
+  PrivateData->ImageHandle      = This->DriverBindingHandle;
   PrivateData->ControllerHandle = ControllerHandle;
-  PrivateData->VlanConfig = VlanConfig;
+  PrivateData->VlanConfig       = VlanConfig;
   PrivateData->ParentDevicePath = DevicePath;
 
@@ -202 +200 @@
     goto ErrorExit;
   }
+
   return Status;
 
@@ -227 +226 @@
 }
 
-
 /**
   Stop this driver on ControllerHandle.
@@ -244 +242 @@
 EFIAPI
 VlanConfigDriverBindingStop (
-  IN EFI_DRIVER_BINDING_PROTOCOL     *This,
-  IN EFI_HANDLE                      ControllerHandle,
-  IN UINTN                           NumberOfChildren,
-  IN EFI_HANDLE                      *ChildHandleBuffer
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,
+  IN EFI_HANDLE                   ControllerHandle,
+  IN UINTN                        NumberOfChildren,
+  IN EFI_HANDLE                   *ChildHandleBuffer
   )
 {
@@ -259 +257 @@
                   ControllerHandle,
                   &gEfiCallerIdGuid,
-                  (VOID **) &PrivateData,
+                  (VOID **)&PrivateData,
                   This->DriverBindingHandle,
                   ControllerHandle,
@@ -267 +265 @@
     return Status;
   }
+
   ASSERT (PrivateData->Signature == VLAN_CONFIG_PRIVATE_DATA_SIGNATURE);
 
   if (NumberOfChildren != 0) {
-    if (NumberOfChildren != 1 || ChildHandleBuffer[0] != PrivateData->DriverHandle) {
+    if ((NumberOfChildren != 1) || (ChildHandleBuffer[0] != PrivateData->DriverHandle)) {
       return EFI_DEVICE_ERROR;
     }