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

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/TcpDxe/TcpDriver.c

@@ -10 +10 @@
 #include "TcpMain.h"
 
-UINT16                        mTcp4RandomPort;
-UINT16                        mTcp6RandomPort;
-
-TCP_HEARTBEAT_TIMER           mTcpTimer = {
+UINT16  mTcp4RandomPort;
+UINT16  mTcp6RandomPort;
+
+TCP_HEARTBEAT_TIMER  mTcpTimer = {
   NULL,
   0
 };
 
-EFI_TCP4_PROTOCOL             gTcp4ProtocolTemplate = {
+EFI_TCP4_PROTOCOL  gTcp4ProtocolTemplate = {
   Tcp4GetModeData,
   Tcp4Configure,
@@ -31 +31 @@
 };
 
-EFI_TCP6_PROTOCOL             gTcp6ProtocolTemplate = {
+EFI_TCP6_PROTOCOL  gTcp6ProtocolTemplate = {
   Tcp6GetModeData,
   Tcp6Configure,
@@ -43 +43 @@
 };
 
-SOCK_INIT_DATA                mTcpDefaultSockData = {
+SOCK_INIT_DATA  mTcpDefaultSockData = {
   SockStream,
   SO_CLOSED,
@@ -61 +61 @@
 };
 
-EFI_DRIVER_BINDING_PROTOCOL   gTcp4DriverBinding = {
+EFI_DRIVER_BINDING_PROTOCOL  gTcp4DriverBinding = {
   Tcp4DriverBindingSupported,
   Tcp4DriverBindingStart,
@@ -70 +70 @@
 };
 
-EFI_DRIVER_BINDING_PROTOCOL   gTcp6DriverBinding = {
+EFI_DRIVER_BINDING_PROTOCOL  gTcp6DriverBinding = {
   Tcp6DriverBindingSupported,
   Tcp6DriverBindingStart,
@@ -84 +84 @@
 };
 
-
 /**
   Create and start the heartbeat timer for the TCP driver.
@@ -102 +101 @@
 
   if (mTcpTimer.RefCnt == 0) {
-
     Status = gBS->CreateEvent (
                     EVT_TIMER | EVT_NOTIFY_SIGNAL,
@@ -111 +109 @@
                     );
     if (!EFI_ERROR (Status)) {
-
       Status = gBS->SetTimer (
                       mTcpTimer.TimerEvent,
                       TimerPeriodic,
-                      (UINT64) (TICKS_PER_SECOND / TCP_TICK_HZ)
+                      (UINT64)(TICKS_PER_SECOND / TCP_TICK_HZ)
                       );
     }
@@ -121 +118 @@
 
   if (!EFI_ERROR (Status)) {
-
     mTcpTimer.RefCnt++;
   }
@@ -210 +206 @@
   Seed            = NetRandomInitSeed ();
   mTcpGlobalIss   = NET_RANDOM (Seed) % mTcpGlobalIss;
-  mTcp4RandomPort = (UINT16) (TCP_PORT_KNOWN + (NET_RANDOM (Seed) % TCP_PORT_KNOWN));
+  mTcp4RandomPort = (UINT16)(TCP_PORT_KNOWN + (NET_RANDOM (Seed) % TCP_PORT_KNOWN));
   mTcp6RandomPort = mTcp4RandomPort;
 
@@ -234 +230 @@
   )
 {
-  EFI_STATUS         Status;
-  EFI_GUID           *IpServiceBindingGuid;
-  EFI_GUID           *TcpServiceBindingGuid;
-  TCP_SERVICE_DATA   *TcpServiceData;
-  IP_IO_OPEN_DATA    OpenData;
+  EFI_STATUS        Status;
+  EFI_GUID          *IpServiceBindingGuid;
+  EFI_GUID          *TcpServiceBindingGuid;
+  TCP_SERVICE_DATA  *TcpServiceData;
+  IP_IO_OPEN_DATA   OpenData;
 
   if (IpVersion == IP_VERSION_4) {
@@ -280 +276 @@
   }
 
-  TcpServiceData->Signature            = TCP_DRIVER_SIGNATURE;
-  TcpServiceData->ControllerHandle     = Controller;
-  TcpServiceData->DriverBindingHandle  = Image;
-  TcpServiceData->IpVersion            = IpVersion;
+  TcpServiceData->Signature           = TCP_DRIVER_SIGNATURE;
+  TcpServiceData->ControllerHandle    = Controller;
+  TcpServiceData->DriverBindingHandle = Image;
+  TcpServiceData->IpVersion           = IpVersion;
   CopyMem (
     &TcpServiceData->ServiceBinding,
@@ -295 +291 @@
     goto ON_ERROR;
   }
-
 
   InitializeListHead (&TcpServiceData->SocketList);
@@ -316 +311 @@
   }
 
-  OpenData.PktRcvdNotify  = TcpRxCallback;
-  Status                  = IpIoOpen (TcpServiceData->IpIo, &OpenData);
+  OpenData.PktRcvdNotify = TcpRxCallback;
+  Status                 = IpIoOpen (TcpServiceData->IpIo, &OpenData);
   if (EFI_ERROR (Status)) {
     goto ON_ERROR;
@@ -366 +361 @@
 EFIAPI
 TcpDestroyChildEntryInHandleBuffer (
-  IN LIST_ENTRY         *Entry,
-  IN VOID               *Context
+  IN LIST_ENTRY  *Entry,
+  IN VOID        *Context
   )
 {
@@ -375 +370 @@
   EFI_HANDLE                    *ChildHandleBuffer;
 
-  if (Entry == NULL || Context == NULL) {
+  if ((Entry == NULL) || (Context == NULL)) {
     return EFI_INVALID_PARAMETER;
   }
 
-  Sock = NET_LIST_USER_STRUCT_S (Entry, SOCKET, Link, SOCK_SIGNATURE);
-  ServiceBinding    = ((TCP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ServiceBinding;
-  NumberOfChildren  = ((TCP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->NumberOfChildren;
-  ChildHandleBuffer = ((TCP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ChildHandleBuffer;
+  Sock              = NET_LIST_USER_STRUCT_S (Entry, SOCKET, Link, SOCK_SIGNATURE);
+  ServiceBinding    = ((TCP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ServiceBinding;
+  NumberOfChildren  = ((TCP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->NumberOfChildren;
+  ChildHandleBuffer = ((TCP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ChildHandleBuffer;
 
   if (!NetIsInHandleBuffer (Sock->SockHandle, NumberOfChildren, ChildHandleBuffer)) {
@@ -412 +407 @@
   IN EFI_HANDLE  ImageHandle,
   IN UINTN       NumberOfChildren,
-  IN EFI_HANDLE  *ChildHandleBuffer, OPTIONAL
+  IN EFI_HANDLE  *ChildHandleBuffer  OPTIONAL,
   IN UINT8       IpVersion
   )
 {
-  EFI_HANDLE                    NicHandle;
-  EFI_GUID                      *IpProtocolGuid;
-  EFI_GUID                      *ServiceBindingGuid;
-  EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;
-  TCP_SERVICE_DATA              *TcpServiceData;
-  EFI_STATUS                    Status;
-  LIST_ENTRY                    *List;
+  EFI_HANDLE                               NicHandle;
+  EFI_GUID                                 *IpProtocolGuid;
+  EFI_GUID                                 *ServiceBindingGuid;
+  EFI_SERVICE_BINDING_PROTOCOL             *ServiceBinding;
+  TCP_SERVICE_DATA                         *TcpServiceData;
+  EFI_STATUS                               Status;
+  LIST_ENTRY                               *List;
   TCP_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT  Context;
 
@@ -443 +438 @@
                   NicHandle,
                   ServiceBindingGuid,
-                  (VOID **) &ServiceBinding,
+                  (VOID **)&ServiceBinding,
                   ImageHandle,
                   Controller,
@@ -455 +450 @@
 
   if (NumberOfChildren != 0) {
-    List = &TcpServiceData->SocketList;
-    Context.ServiceBinding = ServiceBinding;
-    Context.NumberOfChildren = NumberOfChildren;
+    List                      = &TcpServiceData->SocketList;
+    Context.ServiceBinding    = ServiceBinding;
+    Context.NumberOfChildren  = NumberOfChildren;
     Context.ChildHandleBuffer = ChildHandleBuffer;
-    Status = NetDestroyLinkList (
-               List,
-               TcpDestroyChildEntryInHandleBuffer,
-               &Context,
-               NULL
-               );
+    Status                    = NetDestroyLinkList (
+                                  List,
+                                  TcpDestroyChildEntryInHandleBuffer,
+                                  &Context,
+                                  NULL
+                                  );
   } else if (IsListEmpty (&TcpServiceData->SocketList)) {
     //
@@ -759 +754 @@
   }
 
-  TcpServiceData = ((TCP_PROTO_DATA *) This->ProtoReserved)->TcpService;
+  TcpServiceData = ((TCP_PROTO_DATA *)This->ProtoReserved)->TcpService;
 
   //
@@ -782 +777 @@
                   TcpServiceData->ControllerHandle,
                   &gEfiDevicePathProtocolGuid,
-                  (VOID **) &This->ParentDevicePath,
+                  (VOID **)&This->ParentDevicePath,
                   TcpServiceData->DriverBindingHandle,
                   This->SockHandle,
@@ -826 +821 @@
   }
 
-  TcpServiceData = ((TCP_PROTO_DATA *) This->ProtoReserved)->TcpService;
+  TcpServiceData = ((TCP_PROTO_DATA *)This->ProtoReserved)->TcpService;
 
   //
@@ -877 +872 @@
   EFI_TPL           OldTpl;
 
-  if (NULL == This || NULL == ChildHandle) {
+  if ((NULL == This) || (NULL == ChildHandle)) {
     return EFI_INVALID_PARAMETER;
   }
@@ -906 +901 @@
   if (NULL == Sock) {
     DEBUG (
-      (EFI_D_ERROR,
-      "TcpDriverBindingCreateChild: No resource to create a Tcp Child\n")
+      (DEBUG_ERROR,
+       "TcpDriverBindingCreateChild: No resource to create a Tcp Child\n")
       );
 
@@ -915 +910 @@
   }
 
-  mTcpDefaultSockData.ProtoData  = NULL;
+  mTcpDefaultSockData.ProtoData = NULL;
 
   gBS->RestoreTPL (OldTpl);
@@ -950 +945 @@
   SOCKET      *Sock;
 
-  if (NULL == This || NULL == ChildHandle) {
+  if ((NULL == This) || (NULL == ChildHandle)) {
     return EFI_INVALID_PARAMETER;
   }