Changeset 85718 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Library

Timestamp:

Aug 12, 2020 4:09:12 PM (5 years ago)

Author:

vboxsync

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

139865

Message:

Devices/EFI: Merge edk-stable202005 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• NetworkPkg/Library/DxeHttpLib/DxeHttpLib.c (modified) (2 diffs)
• NetworkPkg/Library/DxeHttpLib/DxeHttpLib.inf (modified) (1 diff)
• NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.c (modified) (8 diffs)
• NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.inf (modified) (1 diff)
• NetworkPkg/Library/DxeNetLib/DxeNetLib.c (modified) (14 diffs)
• NetworkPkg/Library/DxeNetLib/DxeNetLib.inf (modified) (1 diff)
• NetworkPkg/Library/DxeNetLib/NetBuffer.c (modified) (3 diffs)
• NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.c (modified) (5 diffs)
• NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf (modified) (1 diff)
• NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.c (modified) (5 diffs)
• NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf (modified) (1 diff)

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Library/DxeHttpLib/DxeHttpLib.c

@@ -1678 +1678 @@
   Free existing HeaderFields.
 
-  @param[in]  HeaderFields       Pointer to array of key/value header pairs waitting for free.
+  @param[in]  HeaderFields       Pointer to array of key/value header pairs waiting for free.
   @param[in]  FieldCount         The number of header pairs in HeaderFields.
 
@@ -1718 +1718 @@
   @param[in]   Url                The URL of a remote host.
   @param[out]  RequestMsg         Pointer to the created HTTP request message.
-                                  NULL if any error occured.
+                                  NULL if any error occurred.
   @param[out]  RequestMsgSize     Size of the RequestMsg (in bytes).
 

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Library/DxeHttpLib/DxeHttpLib.inf

@@ -30 +30 @@
 [Packages]
   MdePkg/MdePkg.dec
-  MdeModulePkg/MdeModulePkg.dec
   NetworkPkg/NetworkPkg.dec
 

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.c

@@ -124 +124 @@
   @retval       EFI_SUCCESS        The IP child is created and the IP protocol
                                    interface is retrieved.
-  @retval       EFI_UNSUPPORTED    Upsupported IpVersion.
+  @retval       EFI_UNSUPPORTED    Unsupported IpVersion.
   @retval       Others             The required operation failed.
 
@@ -192 +192 @@
 
 /**
-  This function close the previously openned IP protocol and destroy the IP child.
+  This function close the previously opened IP protocol and destroy the IP child.
 
   @param[in]  ControllerHandle    The controller handle.
@@ -202 +202 @@
   @retval     EFI_SUCCESS         The IP protocol is closed and the relevant IP child
                                   is destroyed.
-  @retval     EFI_UNSUPPORTED     Upsupported IpVersion.
+  @retval     EFI_UNSUPPORTED     Unsupported IpVersion.
   @retval     Others              The required operation failed.
 
@@ -229 +229 @@
 
   //
-  // Close the previously openned IP protocol.
+  // Close the previously opened IP protocol.
   //
   Status = gBS->CloseProtocol (
@@ -627 +627 @@
   @param[in]       NotifyData           Pointer to the notify data.
   @param[in]       Dest                 Pointer to the destination IP address.
-  @param[in]       Override             Pointer to the overriden IP_IO data.
+  @param[in]       Override             Pointer to the overridden IP_IO data.
 
   @return Pointer to the data structure created to wrap the packet. If any error occurs,
@@ -1498 +1498 @@
 
   //
-  // Detroy the Ip List used by IpIo
+  // Destroy the Ip List used by IpIo
   //
 
@@ -1578 +1578 @@
   This function is called after IpIoOpen(). The data to be sent is wrapped in
   Pkt. The IP instance wrapped in IpIo is used for sending by default but can be
-  overriden by Sender. Other sending configs, like source address and gateway
+  overridden by Sender. Other sending configs, like source address and gateway
   address etc., are specified in OverrideData.
 
@@ -1992 +1992 @@
   This function pairs with IpIoAddIp(). The IpInfo is previously created by
   IpIoAddIp(). The IP_IO_IP_INFO::RefCnt is decremented and the IP instance
-  will be dstroyed if the RefCnt is zero.
+  will be destroyed if the RefCnt is zero.
 
   @param[in]  IpIo                  Pointer to the IP_IO instance.

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.inf

@@ -28 +28 @@
 [Packages]
   MdePkg/MdePkg.dec
-  MdeModulePkg/MdeModulePkg.dec
   NetworkPkg/NetworkPkg.dec
 

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Library/DxeNetLib/DxeNetLib.c

@@ -37 +37 @@
 
 //
-// All the supported IP4 maskes in host byte order.
+// All the supported IP4 masks in host byte order.
 //
 GLOBAL_REMOVE_IF_UNREFERENCED IP4_ADDR  gIp4AllMasks[IP4_MASK_NUM] = {
@@ -131 +131 @@
   the SNP after use because the SNP is opened by HandleProtocol.
 
-  @return The point to SNP if one is properly openned. Otherwise NULL
+  @return The point to SNP if one is properly opened. Otherwise NULL
 
 **/
@@ -305 +305 @@
   @param[in]  Line      The line of code in the File that contains the current log
   @param[in]  Message   The log message
-  @param[in]  BufLen    The lenght of the Buf
+  @param[in]  BufLen    The length of the Buf
   @param[out] Buf       The buffer to put the packet data
 
@@ -481 +481 @@
 
   @param Level    The severity level of the message.
-  @param Module   The Moudle that generates the log.
+  @param Module   The Module that generates the log.
   @param File     The file that contains the log.
   @param Line     The exact line that contains the log.
@@ -519 +519 @@
 
   //
-  // Allocate a maxium of 1024 bytes, the caller should ensure
+  // Allocate a maximum of 1024 bytes, the caller should ensure
   // that the message plus the ethernet/ip/udp header is shorter
   // than this
@@ -1130 +1130 @@
   If it hasn't been removed, then continue with the next node directly.
   This function will end the iterate and return the CallBack's last return value if error happens,
-  or retrun EFI_SUCCESS if 2 complete passes are made with no changes in the number of children in the list.
+  or return EFI_SUCCESS if 2 complete passes are made with no changes in the number of children in the list.
 
   @param[in]    List             The head of the list.
@@ -1354 +1354 @@
 
   If the Recycled doubly linked list of the netmap is empty, it will try to allocate
-  a batch of items if there are enough resources and add corresponding nodes to the begining
+  a batch of items if there are enough resources and add corresponding nodes to the beginning
   of the Recycled doubly linked list of the netmap. Otherwise, it will directly remove
   the fist node entry of the Recycled doubly linked list and return the corresponding item.
@@ -2183 +2183 @@
   EFI_MANAGED_NETWORK_PROTOCOL *Mnp;
   EFI_SERVICE_BINDING_PROTOCOL *MnpSb;
-  EFI_HANDLE                   *SnpHandle;
+  EFI_HANDLE                   SnpHandle;
   EFI_HANDLE                   MnpChildHandle;
 
@@ -2984 +2984 @@
 
   @retval EFI_SUCCESS            Convert to IPv4 address successfully.
-  @retval EFI_INVALID_PARAMETER  The string is mal-formated or Ip4Address is NULL.
+  @retval EFI_INVALID_PARAMETER  The string is malformatted or Ip4Address is NULL.
 
 **/
@@ -3014 +3014 @@
 
   @retval EFI_SUCCESS            Convert to IPv6 address successfully.
-  @retval EFI_INVALID_PARAMETER  The string is mal-formated or Ip6Address is NULL.
+  @retval EFI_INVALID_PARAMETER  The string is malformatted or Ip6Address is NULL.
 
 **/
@@ -3043 +3043 @@
 
   @retval EFI_SUCCESS            Convert to IPv4 address successfully.
-  @retval EFI_INVALID_PARAMETER  The string is mal-formated or Ip4Address is NULL.
+  @retval EFI_INVALID_PARAMETER  The string is malformatted or Ip4Address is NULL.
 
 **/
@@ -3073 +3073 @@
 
   @retval EFI_SUCCESS            Convert to IPv6 address successfully.
-  @retval EFI_INVALID_PARAMETER  The string is mal-formated or Ip6Address is NULL.
+  @retval EFI_INVALID_PARAMETER  The string is malformatted or Ip6Address is NULL.
 
 **/
@@ -3104 +3104 @@
 
   @retval EFI_SUCCESS            Convert to IPv6 address successfully.
-  @retval EFI_INVALID_PARAMETER  The string is mal-formated or Ip6Address is NULL.
+  @retval EFI_INVALID_PARAMETER  The string is malformatted or Ip6Address is NULL.
 
 **/
@@ -3300 +3300 @@
 
     //
-    // Step 2: Skip over unformated string section.
+    // Step 2: Skip over unformatted string section.
     //
     do {

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Library/DxeNetLib/DxeNetLib.inf

@@ -31 +31 @@
 [Packages]
   MdePkg/MdePkg.dec
-  MdeModulePkg/MdeModulePkg.dec
   NetworkPkg/NetworkPkg.dec
 

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Library/DxeNetLib/NetBuffer.c

@@ -603 +603 @@
   if (HeadSpace != 0) {
     //
-    // Allocate an extra block to accomdate the head space.
+    // Allocate an extra block to accommodate the head space.
     //
     BlockOpNum++;
@@ -792 +792 @@
         if (Len == 0) {
           //
-          // Increament the index number to point to the next
+          // Increment the index number to point to the next
           // non-empty fragment.
           //
@@ -1064 +1064 @@
       NetbufGetByte (Nbuf, 0, &Index);
 
-      if ((NET_HEADSPACE(&(Nbuf->BlockOp[Index])) < Len) && (Index > 0)) {
+      if ((Index != 0) && (NET_HEADSPACE(&(Nbuf->BlockOp[Index])) < Len)) {
         Index--;
       }

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.c

@@ -305 +305 @@
 
   //
-  // Create events for variuos asynchronous operations.
+  // Create events for various asynchronous operations.
   //
   Status = gBS->CreateEvent (
@@ -746 +746 @@
   @param[in]   Packet          The packet to transmit.
 
-  @retval EFI_SUCCESS            The packet is trasmitted.
+  @retval EFI_SUCCESS            The packet is transmitted.
   @retval EFI_INVALID_PARAMETER  One or more parameters are invalid.
   @retval EFI_UNSUPPORTED        One or more of the control options are not
@@ -808 +808 @@
 
   //
-  // Trasnmit the packet.
+  // Transmit the packet.
   //
   if (TcpIo->TcpVersion == TCP_VERSION_4) {
@@ -863 +863 @@
   @param[in, out]  TcpIo       The TcpIo which wraps the socket to be destroyed.
   @param[in]       Packet      The buffer to hold the data copy from the socket rx buffer.
-  @param[in]       AsyncMode   Is this receive asyncronous or not.
+  @param[in]       AsyncMode   Is this receive asynchronous or not.
   @param[in]       Timeout     The time to wait for receiving the amount of data the Packet
                                can hold. Set to NULL for infinite wait.
@@ -870 +870 @@
   @retval EFI_INVALID_PARAMETER  One or more parameters are invalid.
   @retval EFI_DEVICE_ERROR       An unexpected network or system error occurred.
-  @retval EFI_OUT_OF_RESOURCES   Failed to allocate momery.
+  @retval EFI_OUT_OF_RESOURCES   Failed to allocate memory.
   @retval EFI_TIMEOUT            Failed to receive the required amount of data in the
                                  specified time period.

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf

@@ -28 +28 @@
 [Packages]
   MdePkg/MdePkg.dec
-  MdeModulePkg/MdeModulePkg.dec
   NetworkPkg/NetworkPkg.dec
 

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.c

@@ -148 +148 @@
   The event handle for UDP receive request.
 
-  It will build a NET_BUF from the recieved UDP data, then deliver it
+  It will build a NET_BUF from the received UDP data, then deliver it
   to the receiver.
 
@@ -336 +336 @@
   @param[in]  CallBack              The function to call when receive finished.
   @param[in]  Context               The opaque parameter to the CallBack.
-  @param[in]  HeadLen               The head length to reserver for the packet.
+  @param[in]  HeadLen               The head length to reserve for the packet.
 
   @return The Wrapped request or NULL if failed to allocate resources or some errors happened.
@@ -411 +411 @@
   @param[in]  Packet                The user's packet.
   @param[in]  EndPoint              The local and remote access point.
-  @param[in]  Gateway               The overrided next hop.
+  @param[in]  Gateway               The overridden next hop.
   @param[in]  CallBack              The function to call when transmission completed.
   @param[in]  Context               The opaque parameter to the call back.
@@ -591 +591 @@
   @param[in]  Configure             The function to configure the created UDP child.
   @param[in]  UdpVersion            The UDP protocol version, UDP4 or UDP6.
-  @param[in]  Context               The opaque parameter for the Configure funtion.
+  @param[in]  Context               The opaque parameter for the Configure function.
 
   @return Newly-created UDP_IO or NULL if failed.
@@ -756 +756 @@
   @param[in]  UdpIo                 The UDP_IO to cancel packet.
   @param[in]  IoStatus              The IoStatus to return to the packet owners.
-  @param[in]  ToCancel              The select funtion to test whether to cancel this
+  @param[in]  ToCancel              The select function to test whether to cancel this
                                     packet or not.
   @param[in]  Context               The opaque parameter to the ToCancel.

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf

@@ -28 +28 @@
 [Packages]
   MdePkg/MdePkg.dec
-  MdeModulePkg/MdeModulePkg.dec
   NetworkPkg/NetworkPkg.dec