Changeset 58466 for trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network – Oracle VirtualBox

trunk/src/VBox/Devices/EFI/Firmware

Property svn:mergeinfo changed
/vendor/edk2/current merged: 103769-103776

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c

-              r58459
+              r58466
 /** @file
   ARP driver functions.
 Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
   @retval EFI_SUCCESS                The arp service context is initialized.
   @retval EFI_UNSUPPORTED            The underlayer Snp mode type is not ethernet.
                                      Failed to initialize the service context.
 …
 /**
   Callback function which provided by user to remove one node in NetDestroyLinkList process.
   @param[in]    Entry           The entry to be removed.
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
 …
   ARP_INSTANCE_DATA             *Instance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;
   if (Entry == NULL || Context == NULL) {
     return EFI_INVALID_PARAMETER;
 …
 /**
   Tests to see if this driver supports a given controller.
   If a child device is provided, it further tests to see if this driver supports
+  Tests to see if this driver supports a given controller.
+  If a child device is provided, it further tests to see if this driver supports
   creating a handle for the specified child device.
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
   @param[in]  ControllerHandle     The handle of the controller to test. This handle
                                    must support a protocol interface that supplies
+  @param[in]  ControllerHandle     The handle of the controller to test. This handle
+                                   must support a protocol interface that supplies
                                    an I/O abstraction to the driver.
   @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.
                                    This parameter is ignored by device drivers,
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.
+                                   This parameter is ignored by device drivers,
                                    and is optional for bus drivers.
   @retval EFI_SUCCESS              The device specified by ControllerHandle and
                                    RemainingDevicePath is supported by the driver
+                                   RemainingDevicePath is supported by the driver
                                    specified by This.
   @retval EFI_ALREADY_STARTED      The device specified by ControllerHandle and
                                    RemainingDevicePath is already being managed
+                                   RemainingDevicePath is already being managed
                                    by the driver specified by This.
   @retval EFI_ACCESS_DENIED        The device specified by ControllerHandle and
                                    RemainingDevicePath is already being managed by
                                    a different driver or an application that
+                                   RemainingDevicePath is already being managed by
+                                   a different driver or an application that
                                    requires exclusive acces. Currently not implemented.
   @retval EFI_UNSUPPORTED          The device specified by ControllerHandle and
                                    RemainingDevicePath is not supported by the
+                                   RemainingDevicePath is not supported by the
                                    driver specified by This.
 …
 /**
   Start this driver on ControllerHandle.
   The Start() function is designed to be invoked from the EFI boot service ConnectController().
   As a result, much of the error checking on the parameters to Start() has been
   moved into this common boot service. It is legal to call Start() from other locations,
   but the following calling restrictions must be followed or the system behavior
+  Start this driver on ControllerHandle.
+  The Start() function is designed to be invoked from the EFI boot service ConnectController().
+  As a result, much of the error checking on the parameters to Start() has been
+  moved into this common boot service. It is legal to call Start() from other locations,
+  but the following calling restrictions must be followed or the system behavior
   will not be deterministic.
 . ControllerHandle must be a valid EFI_HANDLE.
 . If RemainingDevicePath is not NULL, then it must be a pointer to a naturally
+. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally
      aligned EFI_DEVICE_PATH_PROTOCOL.
 . Prior to calling Start(), the Supported() function for the driver specified
      by This must have been called with the same calling parameters, and Supported()
      must have returned EFI_SUCCESS.
+. Prior to calling Start(), the Supported() function for the driver specified
+     by This must have been called with the same calling parameters, and Supported()
+     must have returned EFI_SUCCESS.
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
   @param[in]  ControllerHandle     The handle of the controller to start. This handle
                                    must support a protocol interface that supplies
+  @param[in]  ControllerHandle     The handle of the controller to start. This handle
+                                   must support a protocol interface that supplies
                                    an I/O abstraction to the driver.
   @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.
                                    This parameter is ignored by device drivers,
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.
+                                   This parameter is ignored by device drivers,
                                    and is optional for bus drivers.
 …
   @retval EFI_DEVICE_ERROR         The device could not be started due to a device error.
                                    Currently not implemented.
   @retval EFI_OUT_OF_RESOURCES     The request could not be completed due to a lack of
+  @retval EFI_OUT_OF_RESOURCES     The request could not be completed due to a lack of
                                    resources.
   @retval Others                   The driver failded to start the device.
 …
 /**
   Stop this driver on ControllerHandle.
+  Stop this driver on ControllerHandle.
   Release the control of this controller and remove the IScsi functions. The Stop()
   function is designed to be invoked from the EFI boot service DisconnectController().
   As a result, much of the error checking on the parameters to Stop() has been moved
   into this common boot service. It is legal to call Stop() from other locations,
   but the following calling restrictions must be followed or the system behavior
+  function is designed to be invoked from the EFI boot service DisconnectController().
+  As a result, much of the error checking on the parameters to Stop() has been moved
+  into this common boot service. It is legal to call Stop() from other locations,
+  but the following calling restrictions must be followed or the system behavior
   will not be deterministic.
 . ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this
 …
      Start() function, and the Start() function must have called OpenProtocol() on
      ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
   @param[in]  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
   @param[in]  ControllerHandle  A handle to the device being stopped. The handle must
                                 support a bus specific I/O protocol for the driver
+  @param[in]  ControllerHandle  A handle to the device being stopped. The handle must
+                                support a bus specific I/O protocol for the driver
                                 to use to stop the device.
   @param[in]  NumberOfChildren  The number of child device handles in ChildHandleBuffer.
                                 Not used.
   @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL
+  @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL
                                 if NumberOfChildren is 0.Not used.
 …
 /**
   Creates a child handle and installs a protocol.
   The CreateChild() function installs a protocol on ChildHandle.
   If ChildHandle is a pointer to NULL, then a new handle is created and returned
   in ChildHandle. If ChildHandle is not a pointer to NULL, then the protocol
+  The CreateChild() function installs a protocol on ChildHandle.
+  If ChildHandle is a pointer to NULL, then a new handle is created and returned
+  in ChildHandle. If ChildHandle is not a pointer to NULL, then the protocol
   installs on the existing ChildHandle.
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
   @param  ChildHandle Pointer to the handle of the child to create. If it is NULL,
                       then a new handle is created. If it is a pointer to an existing
+                      then a new handle is created. If it is a pointer to an existing
                       UEFI handle, then the protocol is added to the existing UEFI handle.
 …
 /**
   Destroys a child handle with a protocol installed on it.
   The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
   that was installed by CreateChild() from ChildHandle. If the removed protocol is the
+  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
+  that was installed by CreateChild() from ChildHandle. If the removed protocol is the
   last protocol on ChildHandle, then ChildHandle is destroyed.
 …
   @retval EFI_SUCCES            The protocol was removed from ChildHandle.
   @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is
+  @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is
                                 being removed.
   @retval EFI_INVALID_PARAMETER Child handle is NULL.
 …
   @param[in]  SystemTable        The system table.
   @retval EFI_SUCCESS            if the driver binding and component name protocols
+  @retval EFI_SUCCESS            if the driver binding and component name protocols
                                  are successfully
   @retval Others                 Failed to install the protocols.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h

-              r48674
+              r58466
 /** @file
   ARP driver header file.
 Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
 //
 /**
   Tests to see if this driver supports a given controller.
   If a child device is provided, it further tests to see if this driver supports
+  Tests to see if this driver supports a given controller.
+  If a child device is provided, it further tests to see if this driver supports
   creating a handle for the specified child device.
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
   @param[in]  ControllerHandle     The handle of the controller to test. This handle
                                    must support a protocol interface that supplies
+  @param[in]  ControllerHandle     The handle of the controller to test. This handle
+                                   must support a protocol interface that supplies
                                    an I/O abstraction to the driver.
   @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.
                                    This parameter is ignored by device drivers,
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.
+                                   This parameter is ignored by device drivers,
                                    and is optional for bus drivers.
   @retval EFI_SUCCESS              The device specified by ControllerHandle and
                                    RemainingDevicePath is supported by the driver
+                                   RemainingDevicePath is supported by the driver
                                    specified by This.
   @retval EFI_ALREADY_STARTED      The device specified by ControllerHandle and
                                    RemainingDevicePath is already being managed
+                                   RemainingDevicePath is already being managed
                                    by the driver specified by This.
   @retval EFI_ACCESS_DENIED        The device specified by ControllerHandle and
                                    RemainingDevicePath is already being managed by
                                    a different driver or an application that
+                                   RemainingDevicePath is already being managed by
+                                   a different driver or an application that
                                    requires exclusive acces. Currently not implemented.
   @retval EFI_UNSUPPORTED          The device specified by ControllerHandle and
                                    RemainingDevicePath is not supported by the
+                                   RemainingDevicePath is not supported by the
                                    driver specified by This.
 …
 /**
   Start this driver on ControllerHandle.
   The Start() function is designed to be invoked from the EFI boot service ConnectController().
   As a result, much of the error checking on the parameters to Start() has been
   moved into this common boot service. It is legal to call Start() from other locations,
   but the following calling restrictions must be followed or the system behavior
+  Start this driver on ControllerHandle.
+  The Start() function is designed to be invoked from the EFI boot service ConnectController().
+  As a result, much of the error checking on the parameters to Start() has been
+  moved into this common boot service. It is legal to call Start() from other locations,
+  but the following calling restrictions must be followed or the system behavior
   will not be deterministic.
 . ControllerHandle must be a valid EFI_HANDLE.
 . If RemainingDevicePath is not NULL, then it must be a pointer to a naturally
+. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally
      aligned EFI_DEVICE_PATH_PROTOCOL.
 . Prior to calling Start(), the Supported() function for the driver specified
      by This must have been called with the same calling parameters, and Supported()
      must have returned EFI_SUCCESS.
+. Prior to calling Start(), the Supported() function for the driver specified
+     by This must have been called with the same calling parameters, and Supported()
+     must have returned EFI_SUCCESS.
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
   @param[in]  ControllerHandle     The handle of the controller to start. This handle
                                    must support a protocol interface that supplies
+  @param[in]  ControllerHandle     The handle of the controller to start. This handle
+                                   must support a protocol interface that supplies
                                    an I/O abstraction to the driver.
   @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.
                                    This parameter is ignored by device drivers,
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.
+                                   This parameter is ignored by device drivers,
                                    and is optional for bus drivers.
 …
   @retval EFI_DEVICE_ERROR         The device could not be started due to a device error.
                                    Currently not implemented.
   @retval EFI_OUT_OF_RESOURCES     The request could not be completed due to a lack of
+  @retval EFI_OUT_OF_RESOURCES     The request could not be completed due to a lack of
                                    resources.
   @retval Others                   The driver failded to start the device.
 …
 /**
   Stop this driver on ControllerHandle.
+  Stop this driver on ControllerHandle.
   Release the control of this controller and remove the IScsi functions. The Stop()
   function is designed to be invoked from the EFI boot service DisconnectController().
   As a result, much of the error checking on the parameters to Stop() has been moved
   into this common boot service. It is legal to call Stop() from other locations,
   but the following calling restrictions must be followed or the system behavior
+  function is designed to be invoked from the EFI boot service DisconnectController().
+  As a result, much of the error checking on the parameters to Stop() has been moved
+  into this common boot service. It is legal to call Stop() from other locations,
+  but the following calling restrictions must be followed or the system behavior
   will not be deterministic.
 . ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this
 …
      Start() function, and the Start() function must have called OpenProtocol() on
      ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
   @param[in]  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
   @param[in]  ControllerHandle  A handle to the device being stopped. The handle must
                                 support a bus specific I/O protocol for the driver
+  @param[in]  ControllerHandle  A handle to the device being stopped. The handle must
+                                support a bus specific I/O protocol for the driver
                                 to use to stop the device.
   @param[in]  NumberOfChildren  The number of child device handles in ChildHandleBuffer.
                                 Not used.
   @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL
+  @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL
                                 if NumberOfChildren is 0.Not used.
 …
 /**
   Creates a child handle and installs a protocol.
   The CreateChild() function installs a protocol on ChildHandle.
   If ChildHandle is a pointer to NULL, then a new handle is created and returned
   in ChildHandle. If ChildHandle is not a pointer to NULL, then the protocol
+  The CreateChild() function installs a protocol on ChildHandle.
+  If ChildHandle is a pointer to NULL, then a new handle is created and returned
+  in ChildHandle. If ChildHandle is not a pointer to NULL, then the protocol
   installs on the existing ChildHandle.
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
   @param  ChildHandle Pointer to the handle of the child to create. If it is NULL,
                       then a new handle is created. If it is a pointer to an existing
+                      then a new handle is created. If it is a pointer to an existing
                       UEFI handle, then the protocol is added to the existing UEFI handle.
 …
 /**
   Destroys a child handle with a protocol installed on it.
   The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
   that was installed by CreateChild() from ChildHandle. If the removed protocol is the
+  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
+  that was installed by CreateChild() from ChildHandle. If the removed protocol is the
   last protocol on ChildHandle, then ChildHandle is destroyed.
 …
   @retval EFI_SUCCES            The protocol was removed from ChildHandle.
   @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is
+  @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is
                                 being removed.
   @retval EFI_INVALID_PARAMETER Child handle is NULL.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf

r58459	r58466
32	32	# VALID_ARCHITECTURES = IA32 X64 IPF EBC
33	33	#
34		# DRIVER_BINDING = gArpDriverBinding
	34	# DRIVER_BINDING = gArpDriverBinding
35	35	# COMPONENT_NAME = gArpComponentName
36	36	# COMPONENT_NAME2 = gArpComponentName2

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c

-              r58459
+              r58466
 /** @file
   The implementation of the ARP protocol.
 Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
 /**
   Process the already sent arp packets.
   @param[in]  Context                Pointer to the context data registerd to the
                                      Event.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h

-              r58459
+              r58466
 /**
   Returns a pointer to the ARP_INSTANCE_DATA structure from the input a.
   If the signatures matches, then a pointer to the data structure that contains
+  If the signatures matches, then a pointer to the data structure that contains
   a specified field of that data structure is returned.
   @param  a              Pointer to the field specified by ArpProto within a data
+  @param  a              Pointer to the field specified by ArpProto within a data
                          structure of type ARP_INSTANCE_DATA.
 **/
 #define ARP_INSTANCE_DATA_FROM_THIS(a) \
 …
 /**
   Returns a pointer to the ARP_SERVICE_DATA structure from the input a.
   If the signatures matches, then a pointer to the data structure that contains
+  If the signatures matches, then a pointer to the data structure that contains
   a specified field of that data structure is returned.
   @param  a              Pointer to the field specified by ServiceBinding within
+  @param  a              Pointer to the field specified by ServiceBinding within
                          a data structure of type ARP_SERVICE_DATA.
 **/
 #define ARP_SERVICE_DATA_FROM_THIS(a) \
 …
   This function is used to assign a station address to the ARP cache for this instance
   of the ARP driver.
   Each ARP instance has one station address. The EFI_ARP_PROTOCOL driver will
   respond to ARP requests that match this registered station address. A call to
+  Each ARP instance has one station address. The EFI_ARP_PROTOCOL driver will
+  respond to ARP requests that match this registered station address. A call to
   this function with the ConfigData field set to NULL will reset this ARP instance.
   Once a protocol type and station address have been assigned to this ARP instance,
   all the following ARP functions will use this information. Attempting to change
+  Once a protocol type and station address have been assigned to this ARP instance,
+  all the following ARP functions will use this information. Attempting to change
   the protocol type or station address to a configured ARP instance will result in errors.
 …
   This function is used to insert entries into the ARP cache.
   ARP cache entries are typically inserted and updated by network protocol drivers
   as network traffic is processed. Most ARP cache entries will time out and be
   deleted if the network traffic stops. ARP cache entries that were inserted
+  ARP cache entries are typically inserted and updated by network protocol drivers
+  as network traffic is processed. Most ARP cache entries will time out and be
+  deleted if the network traffic stops. ARP cache entries that were inserted
   by the Add() function may be static (will not time out) or dynamic (will time out).
   Default ARP cache timeout values are not covered in most network protocol
   specifications (although RFC 1122 comes pretty close) and will only be
   discussed in general in this specification. The timeout values that are
   used in the EFI Sample Implementation should be used only as a guideline.
   Final product implementations of the EFI network stack should be tuned for
+  Default ARP cache timeout values are not covered in most network protocol
+  specifications (although RFC 1122 comes pretty close) and will only be
+  discussed in general in this specification. The timeout values that are
+  used in the EFI Sample Implementation should be used only as a guideline.
+  Final product implementations of the EFI network stack should be tuned for
   their expected network environments.
   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.
   @param  DenyFlag               Set to TRUE if this entry is a deny entry. Set to
 …
   This function searches the ARP cache for matching entries and allocates a buffer into
   which those entries are copied.
   The first part of the allocated buffer is EFI_ARP_FIND_DATA, following which
+  The first part of the allocated buffer is EFI_ARP_FIND_DATA, following which
   are protocol address pairs and hardware address pairs.
   When finding a specific protocol address (BySwAddress is TRUE and AddressBuffer
   is not NULL), the ARP cache timeout for the found entry is reset if Refresh is
   set to TRUE. If the found ARP cache entry is a permanent entry, it is not
+  When finding a specific protocol address (BySwAddress is TRUE and AddressBuffer
+  is not NULL), the ARP cache timeout for the found entry is reset if Refresh is
+  set to TRUE. If the found ARP cache entry is a permanent entry, it is not
   affected by Refresh.
   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.
   @param  BySwAddress            Set to TRUE to look for matching software protocol
 …
   This function aborts the previous ARP request (identified by This,  TargetSwAddress
   and ResolvedEvent) that is issued by EFI_ARP_PROTOCOL.Request().
   If the request is in the internal ARP request queue, the request is aborted
   immediately and its ResolvedEvent is signaled. Only an asynchronous address
   request needs to be canceled. If TargeSwAddress and ResolveEvent are both
   NULL, all the pending asynchronous requests that have been issued by This
+  If the request is in the internal ARP request queue, the request is aborted
+  immediately and its ResolvedEvent is signaled. Only an asynchronous address
+  request needs to be canceled. If TargeSwAddress and ResolveEvent are both
+  NULL, all the pending asynchronous requests that have been issued by This
   instance will be cancelled and their corresponding events will be signaled.
   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.
   @param  TargetSwAddress        Pointer to the protocol address in previous
 …
 /**
   Process the already sent arp packets.
   @param[in]  Context                Pointer to the context data registerd to the
                                      Event.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c

-              r48674
+              r58466
 /** @file
   Implementation of EFI Address Resolution Protocol (ARP) Protocol interface functions.
 Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
   This function is used to assign a station address to the ARP cache for this instance
   of the ARP driver.
   Each ARP instance has one station address. The EFI_ARP_PROTOCOL driver will
   respond to ARP requests that match this registered station address. A call to
+  Each ARP instance has one station address. The EFI_ARP_PROTOCOL driver will
+  respond to ARP requests that match this registered station address. A call to
   this function with the ConfigData field set to NULL will reset this ARP instance.
   Once a protocol type and station address have been assigned to this ARP instance,
   all the following ARP functions will use this information. Attempting to change
+  Once a protocol type and station address have been assigned to this ARP instance,
+  all the following ARP functions will use this information. Attempting to change
   the protocol type or station address to a configured ARP instance will result in errors.
 …
   This function is used to insert entries into the ARP cache.
   ARP cache entries are typically inserted and updated by network protocol drivers
   as network traffic is processed. Most ARP cache entries will time out and be
   deleted if the network traffic stops. ARP cache entries that were inserted
+  ARP cache entries are typically inserted and updated by network protocol drivers
+  as network traffic is processed. Most ARP cache entries will time out and be
+  deleted if the network traffic stops. ARP cache entries that were inserted
   by the Add() function may be static (will not time out) or dynamic (will time out).
   Default ARP cache timeout values are not covered in most network protocol
   specifications (although RFC 1122 comes pretty close) and will only be
   discussed in general in this specification. The timeout values that are
   used in the EFI Sample Implementation should be used only as a guideline.
   Final product implementations of the EFI network stack should be tuned for
+  Default ARP cache timeout values are not covered in most network protocol
+  specifications (although RFC 1122 comes pretty close) and will only be
+  discussed in general in this specification. The timeout values that are
+  used in the EFI Sample Implementation should be used only as a guideline.
+  Final product implementations of the EFI network stack should be tuned for
   their expected network environments.
   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.
   @param  DenyFlag               Set to TRUE if this entry is a deny entry. Set to
 …
   This function searches the ARP cache for matching entries and allocates a buffer into
   which those entries are copied.
   The first part of the allocated buffer is EFI_ARP_FIND_DATA, following which
+  The first part of the allocated buffer is EFI_ARP_FIND_DATA, following which
   are protocol address pairs and hardware address pairs.
   When finding a specific protocol address (BySwAddress is TRUE and AddressBuffer
   is not NULL), the ARP cache timeout for the found entry is reset if Refresh is
   set to TRUE. If the found ARP cache entry is a permanent entry, it is not
+  When finding a specific protocol address (BySwAddress is TRUE and AddressBuffer
+  is not NULL), the ARP cache timeout for the found entry is reset if Refresh is
+  set to TRUE. If the found ARP cache entry is a permanent entry, it is not
   affected by Refresh.
   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.
   @param  BySwAddress            Set to TRUE to look for matching software protocol
 …
   This function aborts the previous ARP request (identified by This,  TargetSwAddress
   and ResolvedEvent) that is issued by EFI_ARP_PROTOCOL.Request().
   If the request is in the internal ARP request queue, the request is aborted
   immediately and its ResolvedEvent is signaled. Only an asynchronous address
   request needs to be canceled. If TargeSwAddress and ResolveEvent are both
   NULL, all the pending asynchronous requests that have been issued by This
+  If the request is in the internal ARP request queue, the request is aborted
+  immediately and its ResolvedEvent is signaled. Only an asynchronous address
+  request needs to be canceled. If TargeSwAddress and ResolveEvent are both
+  NULL, all the pending asynchronous requests that have been issued by This
   instance will be cancelled and their corresponding events will be signaled.
   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.
   @param  TargetSwAddress        Pointer to the protocol address in previous

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c

-              r58459
+              r58466
     return EFI_UNSUPPORTED;
+  }
   //
   // Make sure this driver produced ChildHandle
   //
+  //
+  // Make sure this driver produced ChildHandle
+  //
   Status = EfiTestChildHandle (
              ControllerHandle,
 …
+  }
   //
   // Retrieve an instance of a produced protocol from ChildHandle
   //
+  //
+  // Retrieve an instance of a produced protocol from ChildHandle
+  //
   Status = gBS->OpenProtocol (
                   ChildHandle,

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c

-              r58459
+              r58466
   @param  Dhcp4[in]               A pointer to the EFI_DHCP4_PROTOCOL.
   @retval EFI_SUCCESS             Update the ControllerNameTable of this instance successfully.
   @retval EFI_INVALID_PARAMETER   The input parameter is invalid.
   @retval EFI_DEVICE_ERROR        DHCP is in unknown state.
 **/
 EFI_STATUS
 …
     return Status;
+  }
   if (gDhcpControllerNameTable != NULL) {
     FreeUnicodeStringTable (gDhcpControllerNameTable);
     gDhcpControllerNameTable = NULL;
+  }
   if (Dhcp4ModeData.State > Dhcp4Rebooting) {
     return EFI_DEVICE_ERROR;
+  }
   Status = AddUnicodeString2 (
              "eng",
 …
     return Status;
+  }
   return AddUnicodeString2 (
            "en",
 …
     return EFI_UNSUPPORTED;
+  }
   //
   // Make sure this driver produced ChildHandle
   //
+  //
+  // Make sure this driver produced ChildHandle
+  //
   Status = EfiTestChildHandle (
              ControllerHandle,
 …
+  }
   //
   // Retrieve an instance of a produced protocol from ChildHandle
   //
+  //
+  // Retrieve an instance of a produced protocol from ChildHandle
+  //
   Status = gBS->OpenProtocol (
                   ChildHandle,

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c

-              r58459
+              r58466
 /**
   Callback function which provided by user to remove one node in NetDestroyLinkList process.
   @param[in]    Entry           The entry to be removed.
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
 …
     //
     // Destroy all the children instances before destory the service.
     //
+    //
     List = &DhcpSb->Children;
     Status = NetDestroyLinkList (
 …
+    }
     FreePool (DhcpSb);
     Status = EFI_SUCCESS;
+  }

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.h

-              r58459
+              r58466
 /** @file
   Header for the DHCP4 driver.
 Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
   must follow these calling restrictions. If any other agent wishes
   to call Stop() it must also follow these calling restrictions.
   @param[in]  This              Protocol instance pointer.
   @param[in]  ControllerHandle  Handle of device to stop driver on
 …
 /**
   Creates a child handle and installs a protocol.
   The CreateChild() function installs a protocol on ChildHandle.
   If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.
+  The CreateChild() function installs a protocol on ChildHandle.
+  If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.
   If ChildHandle is not a pointer to NULL, then the protocol installs on the existing ChildHandle.
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
   @param  ChildHandle Pointer to the handle of the child to create. If it is NULL,
                       then a new handle is created. If it is a pointer to an existing UEFI handle,
+                      then a new handle is created. If it is a pointer to an existing UEFI handle,
                       then the protocol is added to the existing UEFI handle.
 …
 /**
   Destroys a child handle with a protocol installed on it.
   The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
   that was installed by CreateChild() from ChildHandle. If the removed protocol is the
+  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
+  that was installed by CreateChild() from ChildHandle. If the removed protocol is the
   last protocol on ChildHandle, then ChildHandle is destroyed.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf

r58459	r58466
32	32	# VALID_ARCHITECTURES = IA32 X64 IPF EBC
33	33	#
34		# DRIVER_BINDING = gDhcp4DriverBinding
	34	# DRIVER_BINDING = gDhcp4DriverBinding
35	35	# COMPONENT_NAME = gDhcp4ComponentName
36	36	# COMPONENT_NAME2 = gDhcp4ComponentName2

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h

r58459	r58466
6	6	RFC 1534: Interoperation Between DHCP and BOOTP
7	7	RFC 3396: Encoding Long Options in DHCP.
8
	8
9	9	Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
10	10	This program and the accompanying materials

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c

-              r58459
+              r58466
 /** @file
   EFI DHCP protocol implementation.
 Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
   //
   DhcpSb->ActiveChild->ElaspedTime= 0;
   if (DhcpSb->DhcpState == Dhcp4Init) {
     DhcpSetState (DhcpSb, Dhcp4Selecting, FALSE);
 …
   ASSERT (UdpIo != NULL);
   NET_GET_REF (Wrap);
   Status = UdpIoSendDatagram (
              UdpIo,
              Wrap,
              &EndPoint,
              NULL,
              DhcpOnPacketSent,
+             UdpIo,
+             Wrap,
+             &EndPoint,
+             NULL,
+             DhcpOnPacketSent,
              DhcpSb
              );
 …
     return EFI_OUT_OF_RESOURCES;
+  }
   //
   // Broadcast the message, unless we know the server address.
 …
     Instance->ElaspedTime++;
+  }
   //
   // Check the retransmit timer
 …
+      }
+    }
     if (++DhcpSb->CurRetry < DhcpSb->MaxRetries) {
       //
 …
+    }
+  }
   //
   // If an address has been acquired, check whether need to
 …
       if (Instance != NULL) {
         Instance->ElaspedTime= 0;
+      }
+      }
       Status = DhcpSendMessage (
                  DhcpSb,
 …
       if (Instance != NULL) {
         Instance->ElaspedTime= 0;
+      }
+      }
       Status = DhcpSendMessage (

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h

r48674	r58466
1	1	/** @file
2	2	The DHCP4 protocol implementation.
3
	3
4	4	Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
5	5	This program and the accompanying materials

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c

r48674	r58466
1	1	/** @file
2	2	Function to validate, parse, process the DHCP options.
3
	3
4	4	Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
5	5	This program and the accompanying materials

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h

-              r48674
+              r58466
 /** @file
   To validate, parse and process the DHCP options.
 Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
 #define DHCP_MAX_OPTIONS          256
 //
 // DHCP option types, this is used to validate the DHCP options.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/DpcDxe/Dpc.c

r48674	r58466
338	338	Status = gBS->InstallMultipleProtocolInterfaces (
339	339	&mDpcHandle,
340		&gEfiDpcProtocolGuid,
	340	&gEfiDpcProtocolGuid,
341	341	&mDpc,
342	342	NULL

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c

-              r58459
+              r58466
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mIScsiDriverNameTable[] = {
   {"eng;en", L"iSCSI Driver"},
+  {"eng;en", L"iSCSI Driver"},
   {NULL, NULL}
 };
 …
   by This does not support the language specified by Language,
   then EFI_UNSUPPORTED is returned.
   @param[in]  This        A pointer to the EFI_COMPONENT_NAME_PROTOCOL instance.
   @param[in]  Language    A pointer to a three character ISO 639-2 language identifier.
 …
   @param[in]  IScsiExtScsiPassThru  A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.
   @retval EFI_SUCCESS               Update the ControllerNameTable of this instance successfully.
   @retval EFI_INVALID_PARAMETER     The input parameter is invalid.
   @retval EFI_UNSUPPORTED           Can't get the corresponding NIC info from the Controller handle.
 **/
 EFI_STATUS
 …
     return EFI_INVALID_PARAMETER;
+  }
   Private  = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (IScsiExtScsiPassThru);
 …
   VlanId = NetLibGetVlanId (Private->Controller);
   IScsiMacAddrToStr (&MacAddress, (UINT32) HwAddressSize, VlanId, MacString);
   UnicodeSPrint (
     HandleName,
 …
   @retval EFI_SUCCESS           The Unicode string for the user readable name in the
                                 language specified by Language for the driver
                                 specified by This was returned in DriverName.
+                                specified by This was returned in DriverName.
   @retval EFI_INVALID_PARAMETER ControllerHandle is NULL.
   @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid EFI_HANDLE.
 …
+    }
+  }
   return LookupUnicodeString2 (
            Language,

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.h

-              r48674
+              r58466
   by This does not support the language specified by Language,
   then EFI_UNSUPPORTED is returned.
   @param[in]  This        A pointer to the EFI_COMPONENT_NAME_PROTOCOL instance.
   @param[in]  Language    A pointer to a three characters ISO 639-2 language identifier.
 …
   @retval EFI_SUCCESS           The Unicode string for the user readable name in the
                                 language specified by Language for the driver
                                 specified by This was returned in DriverName.
+                                specified by This was returned in DriverName.
   @retval EFI_INVALID_PARAMETER ControllerHandle is NULL.
   @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid EFI_HANDLE.
 …
   OUT CHAR16                        **ControllerName
   );
 //
 // EFI iSCSI Initiator Name Protocol for IScsi driver.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h

-              r48674
+              r58466
 /// MD5_HASHSIZE
 ///
 #define ISCSI_CHAP_RSP_LEN        16
+#define ISCSI_CHAP_RSP_LEN        16
 #define ISCSI_CHAP_INITIAL        0
+#define ISCSI_CHAP_INITIAL        0
 #define ISCSI_CHAP_STEP_ONE       1
 #define ISCSI_CHAP_STEP_TWO       2
 …
   This function checks the received iSCSI Login Response during the security
   negotiation stage.
   @param[in] Conn             The iSCSI connection.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c

-              r58459
+              r58466
     END_DEVICE_PATH_TYPE,
     END_ENTIRE_DEVICE_PATH_SUBTYPE,
+    {
+    {
       (UINT8) (END_DEVICE_PATH_LENGTH),
       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)
 …
   @retval EFI_SUCCESS            The callback successfully handled the action.
   @retval Others                 Other errors as indicated.
+  @retval Others                 Other errors as indicated.
 **/
 EFI_STATUS
 …
                                   error. In this case, the
                                   Progress parameter would be
                                   set to NULL.
+                                  set to NULL.
   @retval EFI_NOT_FOUND           Routing data doesn't match any
                                   known driver. Progress set to the
 …
   @param[in]  This           Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL.
   @param[in]  Configuration  A null-terminated Unicode string in
                              <ConfigString> format.
+                             <ConfigString> format.
   @param[out] Progress       A pointer to a string filled in with the
                              offset of the most recent '&' before the
 …
   @retval EFI_SUCCESS             The results have been distributed or are
                                   awaiting distribution.
+                                  awaiting distribution.
   @retval EFI_OUT_OF_RESOURCES    Not enough memory to store the
                                   parts of the results that must be
 …
   @param[in]  QuestionId         A unique value which is sent to the original
                                  exporting driver so that it can identify the type
                                  of data to expect. The format of the data tends to
+                                 of data to expect. The format of the data tends to
                                  vary based on the opcode that enerated the callback.
   @param[in]  Type               The type of value for the question.
 …
   @retval EFI_UNSUPPORTED        The specified Action is not supported by the
                                  callback.Currently not implemented.
   @retval EFI_INVALID_PARAMETERS Passing in wrong parameter.
   @retval Others                 Other errors as indicated.
+  @retval EFI_INVALID_PARAMETERS Passing in wrong parameter.
+  @retval Others                 Other errors as indicated.
 **/
 EFI_STATUS
 …
+    }
   } else if (Action == EFI_BROWSER_ACTION_CHANGED) {
     switch (QuestionId) {
+    switch (QuestionId) {
     case KEY_INITIATOR_NAME:
       IScsiUnicodeStrToAsciiStr (IfrNvData->InitiatorName, IScsiName);
 …
     HiiSetBrowserData (&gIp4IScsiConfigGuid, mVendorStorageName, sizeof (ISCSI_CONFIG_IFR_NVDATA), (UINT8 *) IfrNvData, NULL);
+  }
   FreePool (IfrNvData);
   return Status;
+}
 …
       if (EFI_ERROR (Status)) {
         ZeroMem (&ConfigFormEntry->SessionConfigData, sizeof (ConfigFormEntry->SessionConfigData));
         //
         // Generate OUI-format ISID based on MAC address.
         //
         CopyMem (ConfigFormEntry->SessionConfigData.IsId, &MacAddress, 6);
         ConfigFormEntry->SessionConfigData.IsId[0] =
+        ConfigFormEntry->SessionConfigData.IsId[0] =
           (UINT8) (ConfigFormEntry->SessionConfigData.IsId[0] & 0x3F);
+      }
 …
                   );
   ASSERT_EFI_ERROR (Status);
   //
   // Publish our HII data
 …
   @param[in]  DriverBindingHandle The iSCSI driverbinding handle.
   @retval EFI_SUCCESS             The iSCSI configuration form is unloaded.
   @retval EFI_OUT_OF_RESOURCES    Failed to allocate memory.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h

-              r58459
+              r58466
 /**
   If the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is clear,
+  If the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is clear,
   then this macro return a pointer to a data structure ISCSI_FORM_CALLBACK_INFO.
   If the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is set,
   The Signature field of the data structure ISCSI_FORM_CALLBACK_INFO
   is compared to TestSignature.  If the signatures match, then a pointer
   to the pointer to a data structure ISCSI_FORM_CALLBACK_INFO is returned.
   If the signatures do not match, then DebugAssert() is called with a description
   of "CR has a bad signature" and Callback is returned.
+  If the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is set,
+  The Signature field of the data structure ISCSI_FORM_CALLBACK_INFO
+  is compared to TestSignature.  If the signatures match, then a pointer
+  to the pointer to a data structure ISCSI_FORM_CALLBACK_INFO is returned.
+  If the signatures do not match, then DebugAssert() is called with a description
+  of "CR has a bad signature" and Callback is returned.
   If the data type ISCSI_FORM_CALLBACK_INFO_SIGNATURE does not contain the field
   specified by Callback, then the module will not compile.
   If ISCSI_FORM_CALLBACK_INFO_SIGNATURE does not contain a field called Signature,
+  If ISCSI_FORM_CALLBACK_INFO_SIGNATURE does not contain a field called Signature,
   then the module will not compile.
   @param   Callback      Pointer to the specified field within the data
+  @param   Callback      Pointer to the specified field within the data
                          structure ISCSI_FORM_CALLBACK_INFO.
   @return  A pointer to the pointer to a data structure ISCSI_FORM_CALLBACK_INFO.
 …
   @param[in]  DriverBindingHandle The iSCSI driverbinding handle.
   @retval EFI_SUCCESS             The iSCSI configuration form is unloaded.
   @retval EFI_OUT_OF_RESOURCES    Failed to allocate memory.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr

Property svn:eol-style set to native

-              r58459
+              r58466
 /** @file
   Vfr file for iSCSI config.
 Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
 #define EFI_NETWORK_DEVICE_CLASS  0x04
 formset
+formset
   guid     = IP4_ISCSI_CONFIG_GUID,
   title    = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_TITLE),
 …
     title  = STRING_TOKEN(STR_ISCSI_MAIN_FORM_TITLE);
     string  varid   = ISCSI_CONFIG_IFR_NVDATA.InitiatorName,
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.InitiatorName,
             prompt  = STRING_TOKEN(STR_ISCSI_CONFIG_INIT_NAME),
             help    = STRING_TOKEN(STR_ISCSI_CONFIG_INIT_NAME_HELP),
 …
     endcheckbox;
     suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x01;
     string  varid   = ISCSI_CONFIG_IFR_NVDATA.LocalIp,
+    suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x01;
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.LocalIp,
             prompt  = STRING_TOKEN(STR_ISCSI_LOCAL_IP_ADDRESS),
             help    = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),
 …
     endstring;
     string  varid   = ISCSI_CONFIG_IFR_NVDATA.SubnetMask,
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.SubnetMask,
             prompt  = STRING_TOKEN(STR_ISCSI_LOCAL_MASK),
             help    = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),
 …
     endstring;
     string  varid   = ISCSI_CONFIG_IFR_NVDATA.Gateway,
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.Gateway,
             prompt  = STRING_TOKEN(STR_ISCSI_LOCAL_GATEWAY),
             help    = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),
 …
     endif;
     subtitle text = STRING_TOKEN(STR_NULL);
     suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x00;
+    subtitle text = STRING_TOKEN(STR_NULL);
+    suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x00;
     checkbox varid  = ISCSI_CONFIG_IFR_NVDATA.TargetInfoFromDhcp,
              prompt = STRING_TOKEN(STR_ISCSI_ENABLE_DHCP_ON_TARGET),
 …
     endcheckbox;
     endif;
     suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.TargetInfoFromDhcp == 0x01;
     string  varid   = ISCSI_CONFIG_IFR_NVDATA.TargetName,
+    suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.TargetInfoFromDhcp == 0x01;
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.TargetName,
             prompt  = STRING_TOKEN(STR_ISCSI_TARGET_NAME),
             help    = STRING_TOKEN(STR_ISCSI_TARGET_NAME),
 …
     endstring;
     string  varid   = ISCSI_CONFIG_IFR_NVDATA.TargetIp,
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.TargetIp,
             prompt  = STRING_TOKEN(STR_ISCSI_TARGET_IP_ADDRESS),
             help    = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),
 …
             maxsize = IP_MAX_SIZE,
     endstring;
     numeric varid   = ISCSI_CONFIG_IFR_NVDATA.TargetPort,
+    numeric varid   = ISCSI_CONFIG_IFR_NVDATA.TargetPort,
             prompt  = STRING_TOKEN(STR_ISCSI_TARGET_PORT),
             help    = STRING_TOKEN(STR_ISCSI_TARGET_PORT),
             flags   = 0,
             minimum = TARGET_PORT_MIN_NUM,
             maximum = TARGET_PORT_MAX_NUM,
+            maximum = TARGET_PORT_MAX_NUM,
             step    = 0,
     endnumeric;
     string varid    = ISCSI_CONFIG_IFR_NVDATA.BootLun,
+    string varid    = ISCSI_CONFIG_IFR_NVDATA.BootLun,
             prompt  = STRING_TOKEN(STR_ISCSI_BOOT_LUN),
             help    = STRING_TOKEN(STR_ISCSI_BOOT_LUN_HELP),
 …
     endif;
     subtitle text = STRING_TOKEN(STR_NULL);
+    subtitle text = STRING_TOKEN(STR_NULL);
     oneof varid  = ISCSI_CONFIG_IFR_NVDATA.CHAPType,
           prompt = STRING_TOKEN(STR_CHAP_TYPE_PROMPT),
           help   = STRING_TOKEN(STR_CHAP_TYPE_HELP),
+          help   = STRING_TOKEN(STR_CHAP_TYPE_HELP),
           option text = STRING_TOKEN(STR_CHAP_TYPE_NONE),   value = ISCSI_CHAP_NONE,   flags = DEFAULT;
           option text = STRING_TOKEN(STR_CHAP_TYPE_UNI),    value = ISCSI_CHAP_UNI,    flags = 0;
 …
     endoneof;
     suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.CHAPType == ISCSI_CHAP_NONE;
     string  varid   = ISCSI_CONFIG_IFR_NVDATA.CHAPName,
+    suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.CHAPType == ISCSI_CHAP_NONE;
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.CHAPName,
             prompt  = STRING_TOKEN(STR_ISCSI_CHAP_NAME),
             help    = STRING_TOKEN(STR_ISCSI_CHAP_NAME),
 …
     endstring;
     string  varid    = ISCSI_CONFIG_IFR_NVDATA.CHAPSecret,
+    string  varid    = ISCSI_CONFIG_IFR_NVDATA.CHAPSecret,
             prompt   = STRING_TOKEN(STR_ISCSI_CHAP_SECRET),
             help     = STRING_TOKEN(STR_ISCSI_CHAP_SECRET_HELP),
 …
     suppressif NOT ideqval ISCSI_CONFIG_IFR_NVDATA.CHAPType == ISCSI_CHAP_MUTUAL;
     string  varid   = ISCSI_CONFIG_IFR_NVDATA.ReverseCHAPName,
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.ReverseCHAPName,
             prompt  = STRING_TOKEN(STR_ISCSI_REVERSE_CHAP_NAME),
             help    = STRING_TOKEN(STR_ISCSI_REVERSE_CHAP_NAME),
 …
     endstring;
     string  varid    = ISCSI_CONFIG_IFR_NVDATA.ReverseCHAPSecret,
+    string  varid    = ISCSI_CONFIG_IFR_NVDATA.ReverseCHAPSecret,
             prompt   = STRING_TOKEN(STR_ISCSI_REVERSE_CHAP_SECRET),
             help     = STRING_TOKEN(STR_ISCSI_CHAP_SECRET_HELP),
 …
     endif;
     subtitle text = STRING_TOKEN(STR_NULL);
     string  varid   = ISCSI_CONFIG_IFR_NVDATA.IsId,
+    subtitle text = STRING_TOKEN(STR_NULL);
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.IsId,
             prompt  = STRING_TOKEN(STR_ISCSI_CONFIG_ISID),
             help    = STRING_TOKEN(STR_ISCSI_CONFIG_ISID_HELP),
 …
     endstring;
     subtitle text = STRING_TOKEN(STR_NULL);
+    subtitle text = STRING_TOKEN(STR_NULL);
     text
 …
       flags  = INTERACTIVE,
       key    = KEY_SAVE_CHANGES;
     goto FORMID_MAIN_FORM,
     prompt = STRING_TOKEN (STR_RETURN_MAIN_FORM),
+    goto FORMID_MAIN_FORM,
+    prompt = STRING_TOKEN (STR_RETURN_MAIN_FORM),
     help   = STRING_TOKEN (STR_RETURN_MAIN_FORM),
     flags  = 0;

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni

Property svn:mime-type changed from application/octet-stream to text/plain;encoding=UTF-16LE

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c

-              r48674
+              r58466
     goto ON_EXIT;
+  }
     if ((Fields[RP_FIELD_IDX_SERVERNAME].Str == NULL) ||
       (Fields[RP_FIELD_IDX_TARGETNAME].Str == NULL) ||
 …
   The callback function registerd to the DHCP4 instance which is used to select
   the qualified DHCP OFFER.
   @param[in]  This         The DHCP4 protocol.
   @param[in]  Context      The context set when configuring the DHCP4 protocol.
   @param[in]  CurrentState The current state of the DHCP4 protocol.
   @param[in]  Dhcp4Event   The event occurs in the current state.
   @param[in]  Packet       The DHCP packet that is to be sent or already received.
+  @param[in]  Packet       The DHCP packet that is to be sent or already received.
   @param[out] NewPacket    The packet used to replace the above Packet.
   @retval EFI_SUCCESS      Either the DHCP OFFER is qualified or we're not intereseted
                            in the Dhcp4Event.
 …
 /**
   Parse the DHCP ACK to get the address configuration and DNS information.
   @param[in]       Image            The handle of the driver image.
   @param[in]       Controller       The handle of the controller;

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h

r48674	r58466
41	41	/**
42	42	Parse the DHCP ACK to get the address configuration and DNS information.
43
	43
44	44	@param[in] Image The handle of the driver image.
45	45	@param[in] Controller The handle of the controller;

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c

-              r58459
+              r58466
 /**
   Tests to see if this driver supports the RemainingDevicePath.
   @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.  This
                                    parameter is ignored by device drivers, and is optional for bus
                                    drivers. For bus drivers, if this parameter is not NULL, then
                                    the bus driver must determine if the bus controller specified
                                    by ControllerHandle and the child controller specified
                                    by RemainingDevicePath are both supported by this
+  Tests to see if this driver supports the RemainingDevicePath.
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.  This
+                                   parameter is ignored by device drivers, and is optional for bus
+                                   drivers. For bus drivers, if this parameter is not NULL, then
+                                   the bus driver must determine if the bus controller specified
+                                   by ControllerHandle and the child controller specified
+                                   by RemainingDevicePath are both supported by this
                                    bus driver.
 …
 /**
   Tests to see if this driver supports a given controller. If a child device is provided,
+  Tests to see if this driver supports a given controller. If a child device is provided,
   it further tests to see if this driver supports creating a handle for the specified child device.
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
   @param[in]  ControllerHandle     The handle of the controller to test. This handle
                                    must support a protocol interface that supplies
+  @param[in]  ControllerHandle     The handle of the controller to test. This handle
+                                   must support a protocol interface that supplies
                                    an I/O abstraction to the driver.
   @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.
                                    This parameter is ignored by device drivers, and is optional for bus drivers.
 …
 /**
   Start this driver on ControllerHandle.
   The Start() function is designed to be invoked from the EFI boot service ConnectController().
   As a result, much of the error checking on the parameters to Start() has been moved into this
   common boot service. It is legal to call Start() from other locations, but the following calling
+  Start this driver on ControllerHandle.
+  The Start() function is designed to be invoked from the EFI boot service ConnectController().
+  As a result, much of the error checking on the parameters to Start() has been moved into this
+  common boot service. It is legal to call Start() from other locations, but the following calling
   restrictions must be followed or the system behavior will not be deterministic.
 . ControllerHandle must be a valid EFI_HANDLE.
 …
      EFI_DEVICE_PATH_PROTOCOL.
 . Prior to calling Start(), the Supported() function for the driver specified by This must
      have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.
+     have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
   @param[in]  ControllerHandle     The handle of the controller to start. This handle
                                    must support a protocol interface that supplies
+  @param[in]  ControllerHandle     The handle of the controller to start. This handle
+                                   must support a protocol interface that supplies
                                    an I/O abstraction to the driver.
   @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.
                                    This parameter is ignored by device drivers, and is optional for bus drivers.
 …
   //
   // Always install private protocol no matter what happens later. We need to
+  // Always install private protocol no matter what happens later. We need to
   // keep the relationship between ControllerHandle and ChildHandle.
   //
 …
                   Private->ExtScsiPassThruHandle,
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER
                   );
+                  );
   if (EFI_ERROR (Status)) {
     gBS->UninstallMultipleProtocolInterfaces (
 …
            NULL
            );
     goto ON_ERROR;
+  }
 …
 /**
   Stop this driver on ControllerHandle.
+  Stop this driver on ControllerHandle.
   Release the control of this controller and remove the IScsi functions. The Stop()
   function is designed to be invoked from the EFI boot service DisconnectController().
   As a result, much of the error checking on the parameters to Stop() has been moved
   into this common boot service. It is legal to call Stop() from other locations,
+  function is designed to be invoked from the EFI boot service DisconnectController().
+  As a result, much of the error checking on the parameters to Stop() has been moved
+  into this common boot service. It is legal to call Stop() from other locations,
   but the following calling restrictions must be followed or the system behavior will not be deterministic.
 . ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this
 …
      Start() function, and the Start() function must have called OpenProtocol() on
      ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
   @param[in]  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
   @param[in]  ControllerHandle  A handle to the device being stopped. The handle must
                                 support a bus specific I/O protocol for the driver
+  @param[in]  ControllerHandle  A handle to the device being stopped. The handle must
+                                support a bus specific I/O protocol for the driver
                                 to use to stop the device.
   @param[in]  NumberOfChildren  The number of child device handles in ChildHandleBuffer.Not used.
   @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL
+  @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL
                                 if NumberOfChildren is 0.Not used.
 …
            Private->ExtScsiPassThruHandle
            );
     gBS->CloseProtocol (
           Conn->Tcp4Io.Handle,
 …
       goto ON_EXIT;
+    }
+  }
+  }
   //
 …
+    }
+  }
   Status = gBS->HandleProtocol (
                   gIScsiDriverBinding.DriverBindingHandle,
 …
     FreePool (DeviceHandleBuffer);
+  }
   return Status;
+}
 …
   This is the declaration of an EFI image entry point. This entry point is
   the same for UEFI Applications, UEFI OS Loaders, and UEFI Drivers including
   both device drivers and bus drivers. It initialize the global variables and
+  both device drivers and bus drivers. It initialize the global variables and
   publish the driver binding protocol.
 …
       return Status;
+    }
     //
     // Initialize the configuration form of iSCSI.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h

-              r48674
+              r58466
 /**
   Tests to see if this driver supports a given controller. If a child device is provided,
+  Tests to see if this driver supports a given controller. If a child device is provided,
   it further tests to see if this driver supports creating a handle for the specified child device.
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
   @param[in]  ControllerHandle     The handle of the controller to test. This handle
                                    must support a protocol interface that supplies
+  @param[in]  ControllerHandle     The handle of the controller to test. This handle
+                                   must support a protocol interface that supplies
                                    an I/O abstraction to the driver.
   @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.
                                    This parameter is ignored by device drivers, and is optional for bus drivers.
 …
 /**
   Start this driver on ControllerHandle. The Start() function is designed to be
   invoked from the EFI boot service ConnectController(). As a result, much of
   the error checking on the parameters to Start() has been moved into this
   common boot service. It is legal to call Start() from other locations,
+  Start this driver on ControllerHandle. The Start() function is designed to be
+  invoked from the EFI boot service ConnectController(). As a result, much of
+  the error checking on the parameters to Start() has been moved into this
+  common boot service. It is legal to call Start() from other locations,
   but the following calling restrictions must be followed or the system behavior will not be deterministic.
 . ControllerHandle must be a valid EFI_HANDLE.
 …
      EFI_DEVICE_PATH_PROTOCOL.
 . Prior to calling Start(), the Supported() function for the driver specified by This must
      have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.
+     have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
   @param[in]  ControllerHandle     The handle of the controller to start. This handle
                                    must support a protocol interface that supplies
+  @param[in]  ControllerHandle     The handle of the controller to start. This handle
+                                   must support a protocol interface that supplies
                                    an I/O abstraction to the driver.
   @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.
                                    This parameter is ignored by device drivers, and is optional for bus drivers.
 …
 /**
   Stop this driver on ControllerHandle.
+  Stop this driver on ControllerHandle.
   Release the control of this controller and remove the IScsi functions. The Stop()
   function is designed to be invoked from the EFI boot service DisconnectController().
   As a result, much of the error checking on the parameters to Stop() has been moved
   into this common boot service. It is legal to call Stop() from other locations,
+  function is designed to be invoked from the EFI boot service DisconnectController().
+  As a result, much of the error checking on the parameters to Stop() has been moved
+  into this common boot service. It is legal to call Stop() from other locations,
   but the following calling restrictions must be followed or the system behavior will not be deterministic.
 . ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this
 …
      Start() function, and the Start() function must have called OpenProtocol() on
      ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
   @param[in]  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
   @param[in]  ControllerHandle  A handle to the device being stopped. The handle must
                                 support a bus specific I/O protocol for the driver
+  @param[in]  ControllerHandle  A handle to the device being stopped. The handle must
+                                support a bus specific I/O protocol for the driver
                                 to use to stop the device.
   @param[in]  NumberOfChildren  The number of child device handles in ChildHandleBuffer.Not used.
   @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL
+  @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL
                                 if NumberOfChildren is 0.Not used.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c

-              r58459
+              r58466
 /**
   Sends a SCSI Request Packet to a SCSI device that is attached to the SCSI channel. This function
+  Sends a SCSI Request Packet to a SCSI device that is attached to the SCSI channel. This function
   supports both blocking I/O and nonblocking I/O. The blocking I/O functionality is required, and the
   nonblocking I/O functionality is optional.
+  nonblocking I/O functionality is optional.
   @param[in]      This    A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.
 …
                                 could be transferred is returned in InTransferLength. For write
                                 and bi-directional commands, OutTransferLength bytes were
                                 transferred by OutDataBuffer. Currently not implemeted.
+                                transferred by OutDataBuffer. Currently not implemeted.
   @retval EFI_NOT_READY         The SCSI Request Packet could not be sent because there are too many
                                 SCSI Request Packets already queued. The caller may retry again later.
+                                SCSI Request Packets already queued. The caller may retry again later.
   @retval EFI_DEVICE_ERROR      A device error occurred while attempting to send the SCSI Request
                                 Packet.
+                                Packet.
   @retval EFI_INVALID_PARAMETER Target, Lun, or the contents of ScsiRequestPacket are invalid.
   @retval EFI_UNSUPPORTED       The command described by the SCSI Request Packet is not supported
 …
                                 Packet was not sent, so no additional status information is available.
                                 Currently not implemeted.
   @retval EFI_TIMEOUT           A timeout occurred while waiting for the SCSI Request Packet to execute.
+  @retval EFI_TIMEOUT           A timeout occurred while waiting for the SCSI Request Packet to execute.
 **/
 EFI_STATUS
 …
   ISCSI_DRIVER_DATA           *Private;
   ISCSI_SESSION_CONFIG_NVDATA *ConfigNvData;
   EFI_STATUS                  Status;
+  EFI_STATUS                  Status;
   Private       = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (This);
 …
 /**
   Used to retrieve the list of legal Target IDs and LUNs for SCSI devices on a SCSI channel. These
+  Used to retrieve the list of legal Target IDs and LUNs for SCSI devices on a SCSI channel. These
   can either be the list SCSI devices that are actually present on the SCSI channel, or the list of legal
   Target Ids and LUNs for the SCSI channel. Regardless, the caller of this function must probe the
   Target ID and LUN returned to see if a SCSI device is actually present at that location on the SCSI
   channel.
+  Target Ids and LUNs for the SCSI channel. Regardless, the caller of this function must probe the
+  Target ID and LUN returned to see if a SCSI device is actually present at that location on the SCSI
+  channel.
   @param[in]       This    A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.
 …
   Resets a SCSI channel. This operation resets all the SCSI devices connected to the SCSI channel.
   Currently not implemented.
   @param[in]  This A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.
 …
 /**
   Used to retrieve the list of legal Target IDs for SCSI devices on a SCSI channel. These can either
+  Used to retrieve the list of legal Target IDs for SCSI devices on a SCSI channel. These can either
   be the list SCSI devices that are actually present on the SCSI channel, or the list of legal Target IDs
   for the SCSI channel. Regardless, the caller of this function must probe the Target ID returned to
   see if a SCSI device is actually present at that location on the SCSI channel.
+  for the SCSI channel. Regardless, the caller of this function must probe the Target ID returned to
+  see if a SCSI device is actually present at that location on the SCSI channel.
   @param[in]       This    A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c

-              r58459
+              r58466
 /**
   Initialize the header of the iSCSI Boot Firmware Table.
   @param[out]  Header     The header of the iSCSI Boot Firmware Table.
   @param[in]   OemId      The OEM ID.
 …
   Header->Revision  = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_REVISION;
   Header->Checksum  = 0;
   CopyMem (Header->OemId, OemId, sizeof (Header->OemId));
   CopyMem (&Header->OemTableId, OemTableId, sizeof (UINT64));
 …
 /**
   Initialize the control section of the iSCSI Boot Firmware Table.
   @param[in]  Table       The ACPI table.
   @param[in]  HandleCount The number of the handles associated with iSCSI sessions, it's

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c

-              r58459
+              r58466
   Removes (trims) specified leading and trailing characters from a string.
   @param[in, out]  Str  Pointer to the null-terminated string to be trimmed. On return,
                         Str will hold the trimmed string.
+  @param[in, out]  Str  Pointer to the null-terminated string to be trimmed. On return,
+                        Str will hold the trimmed string.
   @param[in]      CharC Character will be trimmed from str.
 …
   CHAR16  *Pointer1;
   CHAR16  *Pointer2;
   if (*Str == 0) {
     return;
+  }
   //
   // Trim off the leading and trailing characters c
 …
+    ;
+  }
   Pointer2 = Str;
   if (Pointer2 == Pointer1) {
 …
+    }
   } else {
     while (*Pointer1 != 0) {
     *Pointer2 = *Pointer1;
+    while (*Pointer1 != 0) {
+    *Pointer2 = *Pointer1;
     Pointer1++;
     Pointer2++;
 …
     *Pointer2 = 0;
+  }
   for (Pointer1 = Str + StrLen(Str) - 1; Pointer1 >= Str && *Pointer1 == CharC; Pointer1--) {
+    ;
+  }
   if  (Pointer1 !=  Str + StrLen(Str) - 1) {
+  if  (Pointer1 !=  Str + StrLen(Str) - 1) {
     *(Pointer1 + 1) = 0;
+  }
 …
 /**
   Convert the hexadecimal encoded LUN string into the 64-bit LUN.
+  Convert the hexadecimal encoded LUN string into the 64-bit LUN.
   @param[in]   Str             The hexadecimal encoded LUN string.
 …
   UINT8   TemValue;
   UINT16  Value[4];
   ZeroMem (Lun, 8);
   ZeroMem (TemStr, 2);
   ZeroMem ((UINT8 *) Value, sizeof (Value));
   SizeStr    = AsciiStrLen (Str);
+  SizeStr    = AsciiStrLen (Str);
   IndexValue = 0;
   IndexNum   = 0;
 …
+      }
+    }
     if ((TemValue == 0) && (TemStr[0] == '-')) {
       //
 …
       continue;
+    }
     if (++IndexNum > 4) {
       //
+      //
       // Each Lun Str can't exceed size 4, because it will be as UINT16 value
       //
       return EFI_INVALID_PARAMETER;
+    }
     //
     // Combine UINT16 value
 …
     Value[IndexValue] = (UINT16) ((Value[IndexValue] << 4) + TemValue);
+  }
   for (Index = 0; Index <= IndexValue; Index ++) {
     *((UINT16 *) &Lun[Index * 2]) =  HTONS (Value[Index]);
+  }
   return EFI_SUCCESS;
+}
 …
   @param[in, out]  HexLength   The length of the string.
   @retval EFI_SUCCESS          The binary data is converted to the hexadecimal string
+  @retval EFI_SUCCESS          The binary data is converted to the hexadecimal string
                                and the length of the string is updated.
   @retval EFI_BUFFER_TOO_SMALL The string is too small.
 …
   UINT8   Digit;
   CHAR8   TemStr[2];
   ZeroMem (TemStr, sizeof (TemStr));
 …
     HexStr += 2;
+  }
   Length = AsciiStrLen (HexStr);
 …
+    }
+  }
   *BinLength = (UINT32) ((Index + 1)/2);
 …
   @param[in]  Controller           The handle of the controller.
   @retval TRUE                     The handle of the controller need the Dhcp protocol.
   @retval FALSE                    The handle of the controller does not need the Dhcp protocol.
 **/
 BOOLEAN
 …
       DPathNode->Ipv4.LocalPort       = 0;
       DPathNode->Ipv4.StaticIpAddress =
+      DPathNode->Ipv4.StaticIpAddress =
         (BOOLEAN) (!Session->ConfigData.NvData.InitiatorInfoFromDhcp);
 …
   is performed by evaluating if the the protocol specified by ProtocolGuid is
   present on ControllerHandle and is was opened by DriverBindingHandle and Nic
   Device handle with an attribute of EFI_OPEN_PROTOCOL_BY_DRIVER.
+  Device handle with an attribute of EFI_OPEN_PROTOCOL_BY_DRIVER.
   If ProtocolGuid is NULL, then ASSERT().

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h

-              r58459
+              r58466
 /**
   Convert the hexadecimal encoded LUN string into the 64-bit LUN.
+  Convert the hexadecimal encoded LUN string into the 64-bit LUN.
   @param[in]   Str             The hexadecimal encoded LUN string.
 …
   @param[in, out]  HexLength   The length of the string.
   @retval EFI_SUCCESS          The binary data is converted to the hexadecimal string
+  @retval EFI_SUCCESS          The binary data is converted to the hexadecimal string
                                and the length of the string is updated.
   @retval EFI_BUFFER_TOO_SMALL The string is too small.
 …
   @param[in]  Controller           The handle of the controller.
   @retval TRUE                     The handle of the controller need the Dhcp protocol.
   @retval FALSE                    The handle of the controller does not need the Dhcp protocol.
 **/
 BOOLEAN
 …
   is performed by evaluating if the the protocol specified by ProtocolGuid is
   present on ControllerHandle and is was opened by DriverBindingHandle and Nic
   Device handle with an attribute of EFI_OPEN_PROTOCOL_BY_DRIVER.
+  Device handle with an attribute of EFI_OPEN_PROTOCOL_BY_DRIVER.
   If ProtocolGuid is NULL, then ASSERT().

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c

-              r58459
+              r58466
 /**
   Attach the iSCSI connection to the iSCSI session.
+  Attach the iSCSI connection to the iSCSI session.
   @param[in, out]  Session The iSCSI session.
 …
 /**
   Detach the iSCSI connection from the session it belongs to.
+  Detach the iSCSI connection from the session it belongs to.
   @param[in, out]  Conn The iSCSI connection.
 …
 /**
   Check the sequence number according to RFC3720.
+  Check the sequence number according to RFC3720.
   @param[in, out]  ExpSN   The currently expected sequence number.
 …
   @retval EFI_SUCCESS        The iSCSI connection is logged into the iSCSI target.
   @retval EFI_TIMEOUT        Timeout happened during the login procedure.
   @retval Others             Other errors as indicated.
+  @retval Others             Other errors as indicated.
 **/
 EFI_STATUS
 …
   @param[in]  Conn             The connection in the iSCSI login phase.
   @retval EFI_SUCCESS          The iSCSI login response PDU is received and processed.
   @retval Others               Other errors as indicated.
 …
                                TargetAddress key-value list.
   @param[in]      Len          Length of the data.
   @retval EFI_SUCCESS          The target address is updated.
   @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
 …
     NetbufFree (PduHeader);
     return NULL;
+  }
+  }
   Header  = (ISCSI_ADDITIONAL_HEADER *) (ScsiCmd + 1);
 …
   @param[in, out]  Packet    The request packet containing IO request, SCSI command
                              buffer and buffers to read/write.
   @retval EFI_SUCCES           The SCSI command is executed and the result is updated to
+  @retval EFI_SUCCES           The SCSI command is executed and the result is updated to
                                the Packet.
   @retval EFI_DEVICE_ERROR     Session state was not as required.
 …
         goto ON_EXIT;
+      }
       TimeoutEvent = Conn->TimeoutEvent;
+      TimeoutEvent = Conn->TimeoutEvent;
+    }
     //

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h

-              r58459
+              r58466
 /**
   Attach the iSCSI connection to the iSCSI session.
+  Attach the iSCSI connection to the iSCSI session.
   @param[in, out]  Session The iSCSI session.
 …
 /**
   Detach the iSCSI connection from the session it belongs to.
+  Detach the iSCSI connection from the session it belongs to.
   @param[in, out]  Conn The iSCSI connection.
 …
   @retval EFI_SUCCESS        The iSCSI connection is logged into the iSCSI target.
   @retval EFI_TIMEOUT        Timeout happened during the login procedure.
   @retval Others             Other errors as indicated.
+  @retval Others             Other errors as indicated.
 **/
 EFI_STATUS
 …
   @param[in]  Conn             The connection in the iSCSI login phase.
   @retval EFI_SUCCESS          The iSCSI login response PDU is received and processed.
   @retval Others               Other errors as indicated.
 …
                                TargetAddress key-value list.
   @param[in]      Len          Length of the data.
   @retval EFI_SUCCESS          The target address is updated.
   @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
 …
   @param[in, out]  Packet    The request packet containing IO request, SCSI command
                              buffer and buffers to read/write.
   @retval EFI_SUCCES           The SCSI command is executed and the result is updated to
+  @retval EFI_SUCCES           The SCSI command is executed and the result is updated to
                                the Packet.
   @retval EFI_DEVICE_ERROR     Session state was not as required.
 …
   IN BOOLEAN            Recovery
   );
 /**
   Abort the iSCSI session, that is, reset all the connection and free the

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c

-              r48674
+              r58466
 /**
   The common notify function associated with various Tcp4Io events.
+  The common notify function associated with various Tcp4Io events.
   @param[in]  Event   The event signaled.
 …
 /**
   Create a TCP socket with the specified configuration data.
+  Create a TCP socket with the specified configuration data.
   @param[in]  Image      The handle of the driver image.
 …
   @param[in]  ConfigData The Tcp4 configuration data.
   @param[in]  Tcp4Io     The Tcp4Io.
   @retval EFI_SUCCESS    The TCP socket is created and configured.
   @retval Others         Failed to create the TCP socket or configure it.
 …
 /**
   Destroy the socket.
+  Destroy the socket.
   @param[in]  Tcp4Io The Tcp4Io which wraps the socket to be destroyeds.
 …
   @param[in, out]  Tcp4Io    The Tcp4Io wrapping the TCP socket.
   @param[in]       Timeout   The time to wait for connection done.
   @retval EFI_SUCCESS          Connect to the other endpoint of the TCP socket successfully.
   @retval EFI_TIMEOUT          Failed to connect to the other endpoint of the TCP socket in the                               specified time period.
 …
   @param[in]   Tcp4Io          The Tcp4Io wrapping the TCP socket.
   @param[in]   Packet          The packet to transmit.
   @retval EFI_SUCCESS          The packet is trasmitted.
   @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h

-              r48674
+              r58466
 /**
   Create a TCP socket with the specified configuration data.
+  Create a TCP socket with the specified configuration data.
   @param[in]  Image      The handle of the driver image.
 …
   @param[in]  ConfigData The Tcp4 configuration data.
   @param[in]  Tcp4Io     The Tcp4Io.
   @retval EFI_SUCCESS    The TCP socket is created and configured.
   @retval Others         Failed to create the TCP socket or configure it.
 …
 /**
   Destroy the socket.
+  Destroy the socket.
   @param[in]  Tcp4Io The Tcp4Io which wraps the socket to be destroyeds.
 …
   @param[in, out]  Tcp4Io    The Tcp4Io wrapping the TCP socket.
   @param[in]       Timeout   The time to wait for connection done.
   @retval EFI_SUCCESS          Connect to the other endpoint of the TCP socket successfully.
   @retval EFI_TIMEOUT          Failed to connect to the other endpoint of the TCP socket in the                               specified time period.
 …
   @param[in]   Tcp4Io          The Tcp4Io wrapping the TCP socket.
   @param[in]   Packet          The packet to transmit.
   @retval EFI_SUCCESS          The packet is trasmitted.
   @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c

-              r48674
+              r58466
 x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 …
 /**
   Tf1 is one basic MD5 transform function.
   @param[in]  A      A  32-bit quantity.
   @param[in]  B      A  32-bit quantity.
+  @param[in]  B      A  32-bit quantity.
   @param[in]  C      A  32-bit quantity.
   @return             Output was produced as a 32-bit quantity based on the
                       three 32-bit input quantity.
 **/
 UINT32
+                      three 32-bit input quantity.
+**/
+UINT32
 Tf1 (
   IN UINT32 A,
   IN UINT32 B,
+  IN UINT32 A,
+  IN UINT32 B,
   IN UINT32 C
+  )
 …
 /**
   Tf2 is one basic MD5 transform function.
   @param[in]  A      A  32-bit quantity.
   @param[in]  B      A  32-bit quantity.
+  @param[in]  B      A  32-bit quantity.
   @param[in]  C      A  32-bit quantity.
   @return             Output was produced as a 32-bit quantity based on the
                       three 32-bit input quantity.
 **/
 UINT32
+                      three 32-bit input quantity.
+**/
+UINT32
 Tf2 (
   IN UINT32 A,
   IN UINT32 B,
+  IN UINT32 A,
+  IN UINT32 B,
   IN UINT32 C
+  )
 …
 /**
   Tf3 is one basic MD5 transform function.
   @param[in]  A      A  32-bit quantity.
   @param[in]  B      A  32-bit quantity.
+  @param[in]  B      A  32-bit quantity.
   @param[in]  C      A  32-bit quantity.
   @return             Output was produced as a 32-bit quantity based on the
                       three 32-bit input quantity.
 **/
 UINT32
+                      three 32-bit input quantity.
+**/
+UINT32
 Tf3 (
   IN UINT32 A,
   IN UINT32 B,
+  IN UINT32 A,
+  IN UINT32 B,
   IN UINT32 C
+  )
 …
 /**
   Tf4 is one basic MD5 transform function.
   @param[in]  A      A  32-bit quantity.
   @param[in]  B      A  32-bit quantity.
+  @param[in]  B      A  32-bit quantity.
   @param[in]  C      A  32-bit quantity.
   @return             Output was produced as a 32-bit quantity based on the
                       three 32-bit input quantity.
 **/
 UINT32
+                      three 32-bit input quantity.
+**/
+UINT32
 Tf4 (
   IN UINT32 A,
   IN UINT32 B,
+  IN UINT32 A,
+  IN UINT32 B,
   IN UINT32 C
+  )
 …
   If the length of data segment is larger than 64 bytes, then does the transform
   immediately and the generated Md5 code is stored in the States field of MD5_CTX
   data struct for later accumulation.
+  data struct for later accumulation.
   All of Md5 code generated for the sequential 64-bytes data segaments are be
   accumulated in MD5Final() function.
 …
     CopyMem (Md5Ctx->M + Md5Ctx->Count, (VOID *)Data, Limit);
     MD5Transform (Md5Ctx);
     Md5Ctx->Count = 0;
     Data         += Limit;
 …
   Md5Ctx->States[1] = 0xefcdab89;
   Md5Ctx->States[2] = 0x98badcfe;
   Md5Ctx->States[3] = 0x10325476;
+  Md5Ctx->States[3] = 0x10325476;
   return EFI_SUCCESS;
 …
     CopyMem (HashVal, (UINT8 *) Md5Ctx->States, MD5_HASHSIZE);
     ZeroMem ((UINT8 *)Md5Ctx, sizeof (*Md5Ctx));
     return EFI_SUCCESS;
+  }

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h

-              r48674
+              r58466
 #include <Library/BaseMemoryLib.h>
 #include <Library/NetLib.h>
 #define MD5_HASHSIZE  16
 …
   );
 #endif
+#endif

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4ConfigDxe/ComponentName.c

-              r48674
+              r58466
 /** @file
   UEFI Component Name(2) protocol implementation for Ip4ConfigDxe driver.
 Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
                                 number of languages supported by a driver is up
                                 to the driver writer. Language is specified
                                 in RFC 4646 or ISO 639-2 language code format.
+                                in RFC 4646 or ISO 639-2 language code format.
   @param  DriverName[out]       A pointer to the Unicode string to return.
                                 This Unicode string is the name of the
 …
                                 Language from the point of view of the driver
                                 specified by This.
   @retval EFI_SUCCESS           The Unicode string for the user readable name in
                                 the language specified by Language for the

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c

-              r58459
+              r58466
   // cable swap, a new round auto configuration will be initiated. The timer
   // starts in DHCP policy only. STATIC policy stops the timer.
   //
+  //
   if (NicConfig->Source == IP4_CONFIG_SOURCE_DHCP) {
     gBS->SetTimer (Instance->Timer, TimerPeriodic, TICKS_PER_SECOND);
 …
     gBS->SetTimer (Instance->Timer, TimerCancel, 0);
+  }
   return Status;
+}
 …
 /**
   A dedicated timer is used to poll underlying media status. In case of
   cable swap, a new round auto configuration will be initiated. The timer
+  cable swap, a new round auto configuration will be initiated. The timer
   will signal the IP4 to run the auto configuration again. IP4 driver will free
   old IP address related resource, such as route table and Interface, then
 …
   EFI_STATUS                   Status;
   EFI_SIMPLE_NETWORK_MODE      SnpModeData;
   IP4_CONFIG_INSTANCE         *Instance;
+  IP4_CONFIG_INSTANCE         *Instance;
   Instance = (IP4_CONFIG_INSTANCE *) Context;
   OldMediaPresent = Instance->MediaPresent;
   //
   // Get fresh mode data from MNP, since underlying media status may change
 …
     //
     // Signal the IP4 to run the auto configuration again. IP4 driver will free
     // old IP address related resource, such as route table and Interface, then
     // initiate a DHCP round by IP4Config->Start to acquire new IP, eventually
+    // old IP address related resource, such as route table and Interface, then
+    // initiate a DHCP round by IP4Config->Start to acquire new IP, eventually
     // create route table for new IP address.
     //

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h

-              r58459
+              r58466
   //
   // Underlying media present status.
+  // Underlying media present status.
   //
   BOOLEAN                         MediaPresent;
 …
 /**
   A dedicated timer is used to poll underlying media status. In case of
   cable swap, a new round auto configuration will be initiated. The timer
+  cable swap, a new round auto configuration will be initiated. The timer
   will signal the IP4 to run the auto configuration again. IP4 driver will free
   old IP address related resource, such as route table and Interface, then

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c

r58459	r58466
498	498	Instance->Timer = NULL;
499	499	}
500
	500
501	501	Ip4ConfigCleanConfig (Instance);
502	502	FreePool (Instance);

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr

Property svn:eol-style set to native

-              r58459
+              r58466
     subtitle text = STRING_TOKEN(STR_NULL);
     text
       help   = STRING_TOKEN(STR_SAVE_CHANGES),
 …
       flags  = INTERACTIVE,
       key    = KEY_SAVE_CHANGES;
   endform;

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni

Property svn:mime-type changed from application/octet-stream to text/plain;encoding=UTF-16LE

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c

-              r58459
+              r58466
 /** @file
 Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
   @param  Ip4[in]                 A pointer to the EFI_IP4_PROTOCOL.
   @retval EFI_SUCCESS             Update the ControllerNameTable of this instance successfully.
   @retval EFI_INVALID_PARAMETER   The input parameter is invalid.
 **/
 EFI_STATUS
 …
     return Status;
+  }
   return AddUnicodeString2 (
            "en",
 …
+  )
+{
   EFI_STATUS                    Status;
+  EFI_STATUS                    Status;
   EFI_IP4_PROTOCOL              *Ip4;
   //
   // Only provide names for child handles.
 …
+  }
   //
   // Make sure this driver produced ChildHandle
   //
+  //
+  // Make sure this driver produced ChildHandle
+  //
   Status = EfiTestChildHandle (
              ControllerHandle,
 …
+  }
   //
   // Retrieve an instance of a produced protocol from ChildHandle
   //
+  //
+  // Retrieve an instance of a produced protocol from ChildHandle
+  //
   Status = gBS->OpenProtocol (
                   ChildHandle,

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h

r58459	r58466
1	1	/** @file
2	2	Common definition for IP4.
3
	3
4	4	Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved.<BR>
5	5	This program and the accompanying materials

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c

-              r58459
+              r58466
 /**
   Callback function which provided by user to remove one node in NetDestroyLinkList process.
   @param[in]    Entry           The entry to be removed.
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
 …
+{
   EFI_SERVICE_BINDING_PROTOCOL             *ServiceBinding;
   IP4_SERVICE                              *IpSb;
+  IP4_SERVICE                              *IpSb;
   EFI_HANDLE                               NicHandle;
   EFI_STATUS                               Status;
+  EFI_STATUS                               Status;
   INTN                                     State;
   LIST_ENTRY                               *List;
 …
     Ip4FreeInterface (IpSb->DefaultInterface, NULL);
     Ip4FreeRouteTable (IpSb->DefaultRouteTable);
     IpIf = Ip4CreateInterface (IpSb->Mnp, IpSb->Controller, IpSb->Image);
     if (IpIf == NULL) {
 …
       goto ON_ERROR;;
+    }
     IpSb->DefaultInterface  = IpIf;
     InsertHeadList (&IpSb->Interfaces, &IpIf->Link);
 …
            ServiceBinding
            );
     if (gIp4ControllerNameTable != NULL) {
       FreeUnicodeStringTable (gIp4ControllerNameTable);

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.h

-              r58459
+              r58466
   the same for UEFI Applications, UEFI OS Loaders, and UEFI Drivers including
   both device drivers and bus drivers.
   The entry point for IP4 driver which install the driver
   binding and component name protocol on its image.
 …
   must follow these calling restrictions. If any other agent wishes
   to call Stop() it must also follow these calling restrictions.
   @param[in]  This              Protocol instance pointer.
   @param[in]  ControllerHandle  Handle of device to stop driver on
 …
 /**
   Creates a child handle and installs a protocol.
   The CreateChild() function installs a protocol on ChildHandle.
   If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.
+  The CreateChild() function installs a protocol on ChildHandle.
+  If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.
   If ChildHandle is not a pointer to NULL, then the protocol installs on the existing ChildHandle.
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
   @param  ChildHandle Pointer to the handle of the child to create. If it is NULL,
                       then a new handle is created. If it is a pointer to an existing UEFI handle,
+                      then a new handle is created. If it is a pointer to an existing UEFI handle,
                       then the protocol is added to the existing UEFI handle.
 …
 /**
   Destroys a child handle with a protocol installed on it.
   The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
   that was installed by CreateChild() from ChildHandle. If the removed protocol is the
+  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
+  that was installed by CreateChild() from ChildHandle. If the removed protocol is the
   last protocol on ChildHandle, then ChildHandle is destroyed.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

-              r58459
+              r58466
   FILE_GUID                      = 9FB1A1F3-3B71-4324-B39A-745CBB015FFF
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
+  VERSION_STRING                 = 1.0
   ENTRY_POINT                    = Ip4DriverEntryPoint
   UNLOAD_IMAGE                   = NetLibDefaultUnload
 …
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
+#
 #  DRIVER_BINDING                =  gIp4DriverBinding
+#  DRIVER_BINDING                =  gIp4DriverBinding
 #  COMPONENT_NAME                =  gIp4ComponentName
 #  COMPONENT_NAME2               =  gIp4ComponentName2

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c

-              r58459
+              r58466
   Process the ICMP redirect. Find the instance then update
   its route cache.
   All kinds of redirect is treated as host redirect as
   specified by RFC1122 3.3.1.2:
 …
   message;"
   @param[in]  IpSb               The IP4 service binding instance that received
+  @param[in]  IpSb               The IP4 service binding instance that received
                                  the packet.
   @param[in]  Head               The IP head of the received ICMPpacket.
 …
   @retval EFI_INVALID_PARAMETER  The packet is invalid
   @retval Others                 Failed to process the packet.
 **/
 EFI_STATUS

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h

r48674	r58466
1	1	/** @file
2	2	Header file for ICMP protocol.
3
	3
4	4	Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>
5	5	This program and the accompanying materials

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c

-              r58459
+              r58466
 /** @file
   Implement IP4 pesudo interface.
 Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
   @param  Context           The context of the callback, a point to the ARP
                             queue.
 **/
 VOID
 …
   @param[in]  Context           Opaque parameter to the call back.
   @retval   Token               The wrapped token if succeed
+  @retval   Token               The wrapped token if succeed
   @retval   NULL                The wrapped token if NULL
 …
   @param  Context           The context of the callback, a point to the ARP
                             queue.
 **/
 VOID

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h

r58459	r58466
1	1	/** @file
2	2	Definition for IP4 pesudo interface structure.
3
	3
4	4	Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>
5	5	This program and the accompanying materials

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c

r48674	r58466
1	1	/** @file
2	2	This file implements the RFC2236: IGMP v2.
3
	3
4	4	Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>
5	5	This program and the accompanying materials

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c

-              r58459
+              r58466
   if (IpIf->Arp != NULL) {
     //
     // A non-NULL IpIf->Arp here means a new ARP child is created when setting default address,
+    //
+    // A non-NULL IpIf->Arp here means a new ARP child is created when setting default address,
     // but some IP children may have referenced the default interface before it is configured,
     // these IP instances also consume this ARP protocol so they need to open it BY_CHILD_CONTROLLER.
 …
     RawHdrLen = (UINT8) (RawHdrLen << 2);
     CopyMem (&Head, FirstFragment, IP4_MIN_HEADLEN);

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h

r58459	r58466
1	1	/** @file
2	2	Ip4 internal functions and type defintions.
3
	3
4	4	Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved.<BR>
5	5	This program and the accompanying materials

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c

-              r58459
+              r58466
 /** @file
   IP4 input process.
 Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
 /**
   The callback function for the net buffer which wraps the packet processed by
   IPsec. It releases the wrap packet and also signals IPsec to free the resources.
+  The callback function for the net buffer which wraps the packet processed by
+  IPsec. It releases the wrap packet and also signals IPsec to free the resources.
   @param[in]  Arg       The wrap context
 …
 /**
   The work function to locate IPsec protocol to process the inbound or
+  The work function to locate IPsec protocol to process the inbound or
   outbound IP packets. The process routine handls the packet with following
   actions: bypass the packet, discard the packet, or protect the packet.
+  actions: bypass the packet, discard the packet, or protect the packet.
   @param[in]       IpSb          The IP4 service instance.
 …
   @param[in, out]  Options       The caller supplied options.
   @param[in, out]  OptionsLen    The length of the option.
   @param[in]       Direction     The directionality in an SPD entry,
+  @param[in]       Direction     The directionality in an SPD entry,
                                  EfiIPsecInBound or EfiIPsecOutBound.
   @param[in]       Context       The token's wrap.
 …
   @retval EFI_SUCCESS            The packet was bypassed and all buffers remain the same.
   @retval EFI_SUCCESS            The packet was protected.
   @retval EFI_ACCESS_DENIED      The packet was discarded.
+  @retval EFI_ACCESS_DENIED      The packet was discarded.
   @retval EFI_OUT_OF_RESOURCES   There is no suffcient resource to complete the operation.
   @retval EFI_BUFFER_TOO_SMALL   The number of non-empty block is bigger than the
+  @retval EFI_BUFFER_TOO_SMALL   The number of non-empty block is bigger than the
                                  number of input data blocks when build a fragment table.
 …
   IpSecWrap     = NULL;
   FragmentTable = NULL;
   TxWrap        = (IP4_TXTOKEN_WRAP *) Context;
+  TxWrap        = (IP4_TXTOKEN_WRAP *) Context;
   FragmentCount = Packet->BlockOpNum;
   ZeroMem (&ZeroHead, sizeof (IP4_HEAD));
   if (mIpSec == NULL) {
     gBS->LocateProtocol (&gEfiIpSec2ProtocolGuid, NULL, (VOID **) &mIpSec);
 …
     //
     // If IPsec is disabled, restore the original MTU
     //
+    //
     IpSb->MaxPacketSize = IpSb->OldMaxPacketSize;
     goto ON_EXIT;
   } else {
     //
     // If IPsec is enabled, use the MTU which reduce the IPsec header length.
     //
     IpSb->MaxPacketSize = IpSb->OldMaxPacketSize - IP4_MAX_IPSEC_HEADLEN;
+    // If IPsec is enabled, use the MTU which reduce the IPsec header length.
+    //
+    IpSb->MaxPacketSize = IpSb->OldMaxPacketSize - IP4_MAX_IPSEC_HEADLEN;
+  }
 …
     goto ON_EXIT;
+  }
   Status = NetbufBuildExt (Packet, FragmentTable, &FragmentCount);
   //
   // Record the original FragmentTable and count.
 …
   //
   Ip4NtohHead (*Head);
   Status = mIpSec->ProcessExt (
                      mIpSec,
 …
   //
   Ip4NtohHead (*Head);
   if (EFI_ERROR (Status)) {
     FreePool (OriginalFragmentTable);
 …
   if (Direction == EfiIPsecOutBound && TxWrap != NULL) {
     TxWrap->IpSecRecycleSignal = RecycleEvent;
     TxWrap->Packet             = NetbufFromExt (
 …
     NetIpSecNetbufFree (*Netbuf);
     *Netbuf = TxWrap->Packet;
   } else {
     IpSecWrap = AllocateZeroPool (sizeof (IP4_IPSEC_WRAP));
     if (IpSecWrap == NULL) {
       Status = EFI_OUT_OF_RESOURCES;
 …
       goto ON_EXIT;
+    }
     IpSecWrap->IpSecRecycleSignal = RecycleEvent;
     IpSecWrap->Packet             = Packet;
     Packet                        = NetbufFromExt (
                                       FragmentTable,
                                       FragmentCount,
                                       IP4_MAX_HEADLEN,
 ,
                                       Ip4IpSecFree,
+                                      FragmentTable,
+                                      FragmentCount,
+                                      IP4_MAX_HEADLEN,
+,
+                                      Ip4IpSecFree,
                                       IpSecWrap
                                       );
     if (Packet == NULL) {
       Packet = IpSecWrap->Packet;
 …
   Pre-process the IPv4 packet. First validates the IPv4 packet, and
   then reassembles packet if it is necessary.
   @param[in]       IpSb            Pointer to IP4_SERVICE.
   @param[in, out]  Packet          Pointer to the Packet to be processed.
 …
   @retval     EFI_SEUCCESS               The recieved packet is in well form.
   @retval     EFI_INVAILD_PARAMETER      The recieved packet is malformed.
+  @retval     EFI_INVAILD_PARAMETER      The recieved packet is malformed.
 **/
 …
   IN     IP4_HEAD       *Head,
   IN     UINT8          *Option,
   IN     UINT32         OptionLen,
+  IN     UINT32         OptionLen,
   IN     UINT32         Flag
+  )
+  )
+{
   IP4_CLIP_INFO             *Info;
 …
     return EFI_INVALID_PARAMETER;
+  }
   HeadLen  = (Head->HeadLen << 2);
   TotalLen = NTOHS (Head->TotalLen);
 …
   // there is no option to save some CPU process.
   //
   if ((OptionLen > 0) && !Ip4OptionIsValid (Option, OptionLen, TRUE)) {
     return EFI_INVALID_PARAMETER;
 …
+    }
+  }
   return EFI_SUCCESS;
+}
 …
   UINT8                     *Option;
   UINT32                    OptionLen;
   IpSb   = (IP4_SERVICE *) Context;
   Option = NULL;
 …
   //
   Status = Ip4PreProcessPacket (
              IpSb,
              &Packet,
              Head,
+             IpSb,
+             &Packet,
+             Head,
              Option,
              OptionLen,
+             OptionLen,
              Flag
              );
 …
     goto RESTART;
+  }
   //
   // If the packet is protected by tunnel mode, parse the inner Ip Packet.
 …
+    }
+  }
   ASSERT (Packet != NULL);
   Head  = Packet->Ip.Ip4;
 …
         Head = NetbufAllocSpace (Dup, IP4_MAX_HEADLEN, NET_BUF_HEAD);
         ASSERT (Head != NULL);
         Dup->Ip.Ip4 = (IP4_HEAD *) Head;
 …
   @param[in]  Packet             The data of the received packet.
   @param[in]  Option             Point to the IP4 packet header options.
   @param[in]  OptionLen          Length of the IP4 packet header options.
+  @param[in]  OptionLen          Length of the IP4 packet header options.
   @param[in]  IpIf               The interface to enqueue the packet to.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h

-              r58459
+              r58466
 #define IP4_MAX_HEADLEN        60
 ///
 /// 8(ESP header) + 16(max IV) + 16(max padding) + 2(ESP tail) + 12(max ICV) = 54
+/// 8(ESP header) + 16(max IV) + 16(max padding) + 2(ESP tail) + 12(max ICV) = 54
 ///
 #define IP4_MAX_IPSEC_HEADLEN  54
 …
   @param[in]  Packet             The data of the received packet.
   @param[in]  Option             Point to the IP4 packet header options.
   @param[in]  OptionLen          Length of the IP4 packet header options.
+  @param[in]  OptionLen          Length of the IP4 packet header options.
   @param[in]  IpIf               The interface to enqueue the packet to.
 …
 /**
   The work function to locate IPsec protocol to process the inbound or
+  The work function to locate IPsec protocol to process the inbound or
   outbound IP packets. The process routine handls the packet with following
   actions: bypass the packet, discard the packet, or protect the packet.
+  actions: bypass the packet, discard the packet, or protect the packet.
   @param[in]       IpSb          The IP4 service instance.
 …
   @param[in, out]  Options       The caller supplied options.
   @param[in, out]  OptionsLen    The length of the option.
   @param[in]       Direction     The directionality in an SPD entry,
+  @param[in]       Direction     The directionality in an SPD entry,
                                  EfiIPsecInBound or EfiIPsecOutBound.
   @param[in]       Context       The token's wrap.
 …
   @retval EFI_SUCCESS            The packet was bypassed and all buffers remain the same.
   @retval EFI_SUCCESS            The packet was protected.
   @retval EFI_ACCESS_DENIED      The packet was discarded.
+  @retval EFI_ACCESS_DENIED      The packet was discarded.
   @retval EFI_OUT_OF_RESOURCES   There is no suffcient resource to complete the operation.
   @retval EFI_BUFFER_TOO_SMALL   The number of non-empty block is bigger than the
+  @retval EFI_BUFFER_TOO_SMALL   The number of non-empty block is bigger than the
                                  number of input data blocks when build a fragment table.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c

-              r48674
+              r58466
 /** @file
   IP4 option support functions.
 Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
   @param[in]       OptionLen         The length of the original option
   @param[in]       FirstFragment     Whether it is the first fragment
   @param[in, out]  Buf               The buffer to copy options to. NULL
+  @param[in, out]  Buf               The buffer to copy options to. NULL
   @param[in, out]  BufLen            The length of the buffer

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h

-              r48674
+              r58466
 /** @file
   IP4 option support routines.
 Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
   @param[in]       OptionLen         The length of the original option
   @param[in]       FirstFragment     Whether it is the first fragment
   @param[in, out]  Buf               The buffer to copy options to. NULL
+  @param[in, out]  Buf               The buffer to copy options to. NULL
   @param[in, out]  BufLen            The length of the buffer

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c

-              r58459
+              r58466
 /** @file
   Transmit the IP4 packet.
 Copyright (c) 2005 - 2013, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
     RawData        = FALSE;
+  }
   //
   // Call IPsec process.
   //
   Status = Ip4IpSecProcessPacket (
              IpSb,
              &Head,
              &Packet,
              &Option,
              &OptLen,
+             IpSb,
+             &Head,
+             &Packet,
+             &Option,
+             &OptLen,
              EfiIPsecOutBound,
              Context
 …
     return Status;
+  }
   Dest = Head->Dst;
   if (IP4_IS_BROADCAST (Ip4GetNetCast (Dest, IpIf)) || (Dest == IP4_ALLONE_ADDRESS)) {
 …
   // them. Tag each fragment other than the first one as spawn from it.
   //
   Mtu = IpSb->MaxPacketSize + sizeof (IP4_HEAD);
+  Mtu = IpSb->MaxPacketSize + sizeof (IP4_HEAD);
   if (Packet->TotalSize + HeadLen > Mtu) {
 …
       return EFI_BAD_BUFFER_SIZE;
+    }
     //
     // Packet is fragmented from the tail to the head, that is, the

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h

r48674	r58466
1	1	/** @file
2	2	EFI IP4 route table and route cache table defintions.
3
	3
4	4	Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>
5	5	This program and the accompanying materials

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c

-              r58459
+              r58466
   @param  Mnp[in]                 A pointer to the EFI_MANAGED_NETWORK_PROTOCOL.
   @retval EFI_SUCCESS             Update the ControllerNameTable of this instance successfully.
   @retval EFI_INVALID_PARAMETER   The input parameter is invalid.
 **/
 EFI_STATUS
 …
     // Remove the last '-'
     //
     OffSet--;
+    OffSet--;
     //
     // Print the ProtocolType and VLAN ID for this instance.
 …
     return Status;
+  }
   if (gMnpControllerNameTable != NULL) {
     FreeUnicodeStringTable (gMnpControllerNameTable);
     gMnpControllerNameTable = NULL;
+  }
   Status = AddUnicodeString2 (
              "eng",
 …
     return Status;
+  }
   return AddUnicodeString2 (
            "en",
 …
     return EFI_UNSUPPORTED;
+  }
   //
   // Make sure this driver is currently managing ControllerHandle
   //
+  //
+  // Make sure this driver is currently managing ControllerHandle
+  //
   Status = EfiTestManagedDevice (
              ControllerHandle,
 …
              &gEfiSimpleNetworkProtocolGuid
              );
   if (EFI_ERROR (Status)) {
     return Status;
+  }
   //
   // Make sure this driver produced ChildHandle
   //
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+  //
+  // Make sure this driver produced ChildHandle
+  //
   Status = EfiTestChildHandle (
              ControllerHandle,
 …
+  }
   //
   // Retrieve an instance of a produced protocol from ChildHandle
   //
+  //
+  // Retrieve an instance of a produced protocol from ChildHandle
+  //
   Status = gBS->OpenProtocol (
                   ChildHandle,

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c

-              r58459
+              r58466
 /**
   Callback function which provided by user to remove one node in NetDestroyLinkList process.
   @param[in]    Entry           The entry to be removed.
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
 …
   EFI_STATUS                         Status;
   UINTN                              ListLength;
   List = &MnpServiceData->ChildrenList;
   Status = NetDestroyLinkList (
              List,

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c

-              r58459
+              r58466
 /**
   Callback function which provided by user to remove one node in NetDestroyLinkList process.
   @param[in]    Entry           The entry to be removed.
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
 …
+{
   MNP_SERVICE_DATA              *MnpServiceData;
   MnpServiceData = MNP_SERVICE_DATA_FROM_LINK (Entry);
   return MnpDestroyServiceData (MnpServiceData);
 …
 /**
   Callback function which provided by user to remove one node in NetDestroyLinkList process.
   @param[in]    Entry           The entry to be removed.
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf

r58459	r58466
4	4	# This module produces EFI Managed Network Protocol upon EFI Simple Network Protocol,
5	5	# to provide raw asynchronous network I/O services. It also produces EFI VLAN Protocol
6		# to provide manageability interface for VLAN configuration.
	6	# to provide manageability interface for VLAN configuration.
7	7	#
8	8	# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c

-              r58459
+              r58466
   //
   *PktBuf = MnpDerviceData->TxBuf + NET_VLAN_TAG_LEN;
   if ((TxData->DestinationAddress == NULL) && (TxData->FragmentCount == 1)) {
     CopyMem (
 …
         TxData->FragmentTable[0].FragmentLength
         );
     *PktLen = TxData->FragmentTable[0].FragmentLength;
   } else {
 …
     // media header space if necessary.
     //
     SnpMode = MnpDerviceData->Snp->Mode;
+    SnpMode = MnpDerviceData->Snp->Mode;
     DstPos  = *PktBuf;
     *PktLen = 0;
 …
+  }
   if (MnpServiceData->VlanId != 0) {
     //

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c

-              r58459
+              r58466
 /** @file
   UEFI Component Name(2) protocol implementation for Mtftp4Dxe driver.
 Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
   @param  Mtftp4[in]                A pointer to the EFI_MTFTP4_PROTOCOL.
   @retval EFI_SUCCESS               Update the ControllerNameTable of this instance successfully.
   @retval EFI_INVALID_PARAMETER     The input parameter is invalid.
 **/
 EFI_STATUS
 …
     gMtftp4ControllerNameTable = NULL;
+  }
   Status = AddUnicodeString2 (
              "eng",
 …
     return Status;
+  }
   return AddUnicodeString2 (
            "en",
 …
     return EFI_UNSUPPORTED;
+  }
   //
   // Make sure this driver produced ChildHandle
   //
+  //
+  // Make sure this driver produced ChildHandle
+  //
   Status = EfiTestChildHandle (
              ControllerHandle,
 …
+  }
   //
+  //
   // Retrieve an instance of a produced protocol from ChildHandle
   //
+  //
   Status = gBS->OpenProtocol (
                   ChildHandle,

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c

-              r58459
+              r58466
 /**
   Callback function which provided by user to remove one node in NetDestroyLinkList process.
   @param[in]    Entry           The entry to be removed.
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
 …
            gMtftp4DriverBinding.DriverBindingHandle,
            ChildHandle
            );
+           );
+  }

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h

-              r58459
+              r58466
 /** @file
   Mtftp drivers function header.
 Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
 /**
   Start the MTFTP driver on this controller.
+  Start the MTFTP driver on this controller.
   MTFTP driver will install a MTFTP SERVICE BINDING protocol on the supported
   controller, which can be used to create/destroy MTFTP children.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

r58459	r58466
31	31	# VALID_ARCHITECTURES = IA32 X64 IPF EBC
32	32	#
33		# DRIVER_BINDING = gMtftp4DriverBinding
	33	# DRIVER_BINDING = gMtftp4DriverBinding
34	34	# COMPONENT_NAME = gMtftp4ComponentName
35	35	# COMPONENT_NAME2 = gMtftp4ComponentName2

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c

-              r58459
+              r58466
 /** @file
   Interface routine for Mtftp4.
 Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
 /**
   Check packet for GetInfo.
   GetInfo is implemented with EfiMtftp4ReadFile. It use Mtftp4GetInfoCheckPacket
+  Check packet for GetInfo.
+  GetInfo is implemented with EfiMtftp4ReadFile. It use Mtftp4GetInfoCheckPacket
   to inspect the first packet from server, then abort the session.
 …
 /**
   Check whether the override data is valid.
+  Check whether the override data is valid.
   It will first validate whether the server is a valid unicast. If a gateway
   is provided in the Override, it also check that it is a unicast on the
+  is provided in the Override, it also check that it is a unicast on the
   connected network.
 …
   @retval TRUE                   The override data is valid
   @retval FALSE                  The override data is invalid
 **/
 BOOLEAN
 …
 /**
   Poll the UDP to get the IP4 default address, which may be retrieved
   by DHCP.
   The default time out value is 5 seconds. If IP has retrieved the default address,
+  by DHCP.
+  The default time out value is 5 seconds. If IP has retrieved the default address,
   the UDP is reconfigured.
 …
   Reads the current operational settings.
   The GetModeData()function reads the current operational settings of this
+  The GetModeData()function reads the current operational settings of this
   EFI MTFTPv4 Protocol driver instance.
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance.
   @param  ModeData               Pointer to storage for the EFI MTFTPv4 Protocol
                                  driver mode data.
+                                 driver mode data.
   @retval EFI_SUCCESS            The configuration data was successfully returned.
   @retval EFI_OUT_OF_RESOURCES   The required mode data could not be allocated.
   @retval EFI_INVALID_PARAMETER  This is NULL or ModeData is NULL.
 **/
 EFI_STATUS
 …
 /**
   Initializes, changes, or resets the default operational setting for this
+  Initializes, changes, or resets the default operational setting for this
   EFI MTFTPv4 Protocol driver instance.
   The Configure() function is used to set and change the configuration data for
   this EFI MTFTPv4 Protocol driver instance. The configuration data can be reset
   to startup defaults by calling Configure() with MtftpConfigData set to NULL.
   Whenever the instance is reset, any pending operation is aborted. By changing
   the EFI MTFTPv4 Protocol driver instance configuration data, the client can
   connect to different MTFTPv4 servers. The configuration parameters in
   MtftpConfigData are used as the default parameters in later MTFTPv4 operations
+  The Configure() function is used to set and change the configuration data for
+  this EFI MTFTPv4 Protocol driver instance. The configuration data can be reset
+  to startup defaults by calling Configure() with MtftpConfigData set to NULL.
+  Whenever the instance is reset, any pending operation is aborted. By changing
+  the EFI MTFTPv4 Protocol driver instance configuration data, the client can
+  connect to different MTFTPv4 servers. The configuration parameters in
+  MtftpConfigData are used as the default parameters in later MTFTPv4 operations
   and can be overridden in later operations.
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance
   @param  ConfigData             MtftpConfigDataPointer to the configuration data
+  @param  ConfigData             MtftpConfigDataPointer to the configuration data
                                  structure
   @retval EFI_SUCCESS            The EFI MTFTPv4 Protocol driver was configured
+  @retval EFI_SUCCESS            The EFI MTFTPv4 Protocol driver was configured
                                  successfully.
   @retval EFI_INVALID_PARAMETER  One or more following conditions are TRUE:
 .This is NULL.
 .MtftpConfigData.UseDefaultSetting is FALSE and
                                    MtftpConfigData.StationIp is not a valid IPv4
+.MtftpConfigData.UseDefaultSetting is FALSE and
+                                   MtftpConfigData.StationIp is not a valid IPv4
                                    unicast address.
 .MtftpCofigData.UseDefaultSetting is FALSE and
+.MtftpCofigData.UseDefaultSetting is FALSE and
                                    MtftpConfigData.SubnetMask is invalid.
 .MtftpCofigData.ServerIp is not a valid IPv4
+.MtftpCofigData.ServerIp is not a valid IPv4
                                    unicast address.
 .MtftpConfigData.UseDefaultSetting is FALSE and
                                    MtftpConfigData.GatewayIp is not a valid IPv4
                                    unicast address or is not in the same subnet
+.MtftpConfigData.UseDefaultSetting is FALSE and
+                                   MtftpConfigData.GatewayIp is not a valid IPv4
+                                   unicast address or is not in the same subnet
                                    with station address.
   @retval EFI_ACCESS_DENIED      The EFI configuration could not be changed at this
                                  time because there is one MTFTP background operation
+  @retval EFI_ACCESS_DENIED      The EFI configuration could not be changed at this
+                                 time because there is one MTFTP background operation
                                  in progress.
   @retval EFI_NO_MAPPING         When using a default address, configuration
+  @retval EFI_NO_MAPPING         When using a default address, configuration
                                  (DHCP, BOOTP, RARP, etc.) has not finished yet.
   @retval EFI_UNSUPPORTED        A configuration protocol (DHCP, BOOTP, RARP, etc.)
                                  could not be located when clients choose to use
+  @retval EFI_UNSUPPORTED        A configuration protocol (DHCP, BOOTP, RARP, etc.)
+                                 could not be located when clients choose to use
                                  the default address settings.
   @retval EFI_OUT_OF_RESOURCES   The EFI MTFTPv4 Protocol driver instance data could
+  @retval EFI_OUT_OF_RESOURCES   The EFI MTFTPv4 Protocol driver instance data could
                                  not be allocated.
   @retval EFI_DEVICE_ERROR       An unexpected system or network error occurred.
                                  The EFI MTFTPv4 Protocol driver instance is not
+  @retval EFI_DEVICE_ERROR       An unexpected system or network error occurred.
+                                 The EFI MTFTPv4 Protocol driver instance is not
                                  configured.
 …
 /**
   Parses the options in an MTFTPv4 OACK packet.
   The ParseOptions() function parses the option fields in an MTFTPv4 OACK packet
   and returns the number of options that were found and optionally a list of
+  The ParseOptions() function parses the option fields in an MTFTPv4 OACK packet
+  and returns the number of options that were found and optionally a list of
   pointers to the options in the packet.
   If one or more of the option fields are not valid, then EFI_PROTOCOL_ERROR is
+  If one or more of the option fields are not valid, then EFI_PROTOCOL_ERROR is
   returned and *OptionCount and *OptionList stop at the last valid option.
   The OptionList is allocated by this function, and caller should free it when used.
 …
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance.
   @param  PacketLen              Length of the OACK packet to be parsed.
   @param  Packet                 Pointer to the OACK packet to be parsed.
+  @param  Packet                 Pointer to the OACK packet to be parsed.
   @param  OptionCount            Pointer to the number of options in following OptionList.
   @param  OptionList             Pointer to EFI_MTFTP4_OPTION storage. Call the
+  @param  OptionList             Pointer to EFI_MTFTP4_OPTION storage. Call the
                                  EFI Boot Service FreePool() to release theOptionList
                                  if the options in this OptionList are not needed
+                                 if the options in this OptionList are not needed
                                  any more
 …
 /**
   Downloads a file from an MTFTPv4 server.
   The ReadFile() function is used to initialize and start an MTFTPv4 download
   process and optionally wait for completion. When the download operation completes,
   whether successfully or not, the Token.Status field is updated by the EFI MTFTPv4
+  The ReadFile() function is used to initialize and start an MTFTPv4 download
+  process and optionally wait for completion. When the download operation completes,
+  whether successfully or not, the Token.Status field is updated by the EFI MTFTPv4
   Protocol driver and then Token.Event is signaled (if it is not NULL).
   Data can be downloaded from the MTFTPv4 server into either of the following locations:
 .A fixed buffer that is pointed to by Token.Buffer
 .A download service function that is pointed to by Token.CheckPacket
   If both Token.Buffer and Token.CheckPacket are used, then Token.CheckPacket
   will be called first. If the call is successful, the packet will be stored in
+  If both Token.Buffer and Token.CheckPacket are used, then Token.CheckPacket
+  will be called first. If the call is successful, the packet will be stored in
   Token.Buffer.
   @param  This                  Pointer to the EFI_MTFTP4_PROTOCOL instance
   @param  Token                 Pointer to the token structure to provide the
+  @param  Token                 Pointer to the token structure to provide the
                                 parameters that are used in this operation.
   @retval EFI_SUCCESS           The data file has been transferred successfully.
   @retval EFI_OUT_OF_RESOURCES  Required system resources could not be allocated.
   @retval EFI_BUFFER_TOO_SMALL  BufferSize is not large enough to hold the downloaded
+  @retval EFI_BUFFER_TOO_SMALL  BufferSize is not large enough to hold the downloaded
                                 data in downloading process.
   @retval EFI_ABORTED           Current operation is aborted by user.
 …
   Sends a data file to an MTFTPv4 server. May be unsupported in some EFI implementations
   The WriteFile() function is used to initialize an uploading operation with the
   given option list and optionally wait for completion. If one or more of the
   options is not supported by the server, the unsupported options are ignored and
   a standard TFTP process starts instead. When the upload process completes,
   whether successfully or not, Token.Event is signaled, and the EFI MTFTPv4 Protocol
+  The WriteFile() function is used to initialize an uploading operation with the
+  given option list and optionally wait for completion. If one or more of the
+  options is not supported by the server, the unsupported options are ignored and
+  a standard TFTP process starts instead. When the upload process completes,
+  whether successfully or not, Token.Event is signaled, and the EFI MTFTPv4 Protocol
   driver updates Token.Status.
   The caller can supply the data to be uploaded in the following two modes:
 …
 .Through a callback function
   With the user-provided buffer, the Token.BufferSize field indicates the length
   of the buffer, and the driver will upload the data in the buffer. With an
   EFI_MTFTP4_PACKET_NEEDED callback function, the driver will call this callback
   function to get more data from the user to upload. See the definition of
   EFI_MTFTP4_PACKET_NEEDED for more information. These two modes cannot be used at
+  of the buffer, and the driver will upload the data in the buffer. With an
+  EFI_MTFTP4_PACKET_NEEDED callback function, the driver will call this callback
+  function to get more data from the user to upload. See the definition of
+  EFI_MTFTP4_PACKET_NEEDED for more information. These two modes cannot be used at
   the same time. The callback function will be ignored if the user provides the buffer.
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance.
   @param  Token                  Pointer to the token structure to provide the
+  @param  Token                  Pointer to the token structure to provide the
                                  parameters that are used in this function
 …
 . Token.Buffer and Token.PacketNeeded are both
                                     NULL.
 . One or more IPv4 addresses in Token.OverrideData
                                     are not valid unicast IPv4 addresses if
+. One or more IPv4 addresses in Token.OverrideData
+                                    are not valid unicast IPv4 addresses if
                                     Token.OverrideData is not NULL.
   @retval EFI_UNSUPPORTED        One or more options in the Token.OptionList are in the
                                  unsupported list of structure EFI_MTFTP4_MODE_DATA.
   @retval EFI_NOT_STARTED        The EFI MTFTPv4 Protocol driver has not been started.
   @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP,
+  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP,
                                  BOOTP, RARP, etc.) is not finished yet.
   @retval EFI_ALREADY_STARTED    This Token is already being used in another MTFTPv4
+  @retval EFI_ALREADY_STARTED    This Token is already being used in another MTFTPv4
                                  session.
   @retval EFI_OUT_OF_RESOURCES   Required system resources could not be allocated.
 …
 /**
   Downloads a data file "directory" from an MTFTPv4 server.
+  Downloads a data file "directory" from an MTFTPv4 server.
   May be unsupported in some EFI implementations
   The ReadDirectory() function is used to return a list of files on the MTFTPv4
   server that are logically (or operationally) related to Token.Filename. The
   directory request packet that is sent to the server is built with the option
+  The ReadDirectory() function is used to return a list of files on the MTFTPv4
+  server that are logically (or operationally) related to Token.Filename. The
+  directory request packet that is sent to the server is built with the option
   list that was provided by caller, if present.
   The file information that the server returns is put into either of the following
+  The file information that the server returns is put into either of the following
   locations:
 .A fixed buffer that is pointed to by Token.Buffer
 .A download service function that is pointed to by Token.CheckPacket
   If both Token.Buffer and Token.CheckPacket are used, then Token.CheckPacket will
+  If both Token.Buffer and Token.CheckPacket are used, then Token.CheckPacket will
   be called first. If the call is successful, the packet will be stored in Token.Buffer.
   The returned directory listing in the Token.Buffer or EFI_MTFTP4_PACKET consists
   of a list of two or three variable-length ASCII strings, each terminated by a
   null character, for each file in the directory. If the multicast option is involved,
   the first field of each directory entry is the static multicast IP address and
   UDP port number that is associated with the file name. The format of the field
   is ip:ip:ip:ip:port. If the multicast option is not involved, this field and its
+  The returned directory listing in the Token.Buffer or EFI_MTFTP4_PACKET consists
+  of a list of two or three variable-length ASCII strings, each terminated by a
+  null character, for each file in the directory. If the multicast option is involved,
+  the first field of each directory entry is the static multicast IP address and
+  UDP port number that is associated with the file name. The format of the field
+  is ip:ip:ip:ip:port. If the multicast option is not involved, this field and its
   terminating null character are not present.
   The next field of each directory entry is the file name and the last field is
   the file information string. The information string contains the file size and
   the create/modify timestamp. The format of the information string is filesize
   yyyy-mm-dd hh:mm:ss:ffff. The timestamp is Coordinated Universal Time
+  The next field of each directory entry is the file name and the last field is
+  the file information string. The information string contains the file size and
+  the create/modify timestamp. The format of the information string is filesize
+  yyyy-mm-dd hh:mm:ss:ffff. The timestamp is Coordinated Universal Time
   (UTC; also known as Greenwich Mean Time [GMT]).
   The only difference between ReadFile and ReadDirectory is the opcode used.
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance
   @param  Token                  Pointer to the token structure to provide the
+  @param  Token                  Pointer to the token structure to provide the
                                  parameters that are used in this function
 …
 . Token.Buffer and Token.PacketNeeded are both
                                     NULL.
 . One or more IPv4 addresses in Token.OverrideData
                                     are not valid unicast IPv4 addresses if
+. One or more IPv4 addresses in Token.OverrideData
+                                    are not valid unicast IPv4 addresses if
                                     Token.OverrideData is not NULL.
   @retval EFI_UNSUPPORTED        One or more options in the Token.OptionList are in the
                                  unsupported list of structure EFI_MTFTP4_MODE_DATA.
   @retval EFI_NOT_STARTED        The EFI MTFTPv4 Protocol driver has not been started.
   @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP,
+  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP,
                                  BOOTP, RARP, etc.) is not finished yet.
   @retval EFI_ALREADY_STARTED    This Token is already being used in another MTFTPv4
+  @retval EFI_ALREADY_STARTED    This Token is already being used in another MTFTPv4
                                  session.
   @retval EFI_OUT_OF_RESOURCES   Required system resources could not be allocated.
 …
 /**
   Gets information about a file from an MTFTPv4 server.
   The GetInfo() function assembles an MTFTPv4 request packet with options;
   sends it to the MTFTPv4 server; and may return an MTFTPv4 OACK, MTFTPv4 ERROR,
   or ICMP ERROR packet. Retries occur only if no response packets are received
+  Gets information about a file from an MTFTPv4 server.
+  The GetInfo() function assembles an MTFTPv4 request packet with options;
+  sends it to the MTFTPv4 server; and may return an MTFTPv4 OACK, MTFTPv4 ERROR,
+  or ICMP ERROR packet. Retries occur only if no response packets are received
   from the MTFTPv4 server before the timeout expires.
   It is implemented with EfiMtftp4ReadFile: build a token, then pass it to
+  It is implemented with EfiMtftp4ReadFile: build a token, then pass it to
   EfiMtftp4ReadFile. In its check packet callback abort the opertions.
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance
   @param  OverrideData           Data that is used to override the existing
                                  parameters. If NULL, the default parameters that
                                  were set in the EFI_MTFTP4_PROTOCOL.Configure()
+  @param  OverrideData           Data that is used to override the existing
+                                 parameters. If NULL, the default parameters that
+                                 were set in the EFI_MTFTP4_PROTOCOL.Configure()
                                  function are used
   @param  Filename               Pointer to null-terminated ASCII file name string
   @param  ModeStr                Pointer to null-terminated ASCII mode string. If NULL, "octet"
+  @param  ModeStr                Pointer to null-terminated ASCII mode string. If NULL, "octet"
                                  will be used
   @param  OptionCount            Number of option/value string pairs in OptionList
   @param  OptionList             Pointer to array of option/value string pairs.
+  @param  OptionList             Pointer to array of option/value string pairs.
                                  Ignored if OptionCount is zero
   @param  PacketLength           The number of bytes in the returned packet
   @param  Packet                 PacketThe pointer to the received packet. This
+  @param  Packet                 PacketThe pointer to the received packet. This
                                  buffer must be freed by the caller.
   @retval EFI_SUCCESS            An MTFTPv4 OACK packet was received and is in
+  @retval EFI_SUCCESS            An MTFTPv4 OACK packet was received and is in
                                  the Buffer.
   @retval EFI_INVALID_PARAMETER  One or more of the following conditions is TRUE:
 …
 .One or more options in OptionList have wrong format.
 .PacketLength is NULL.
 .One or more IPv4 addresses in OverrideData are
                                    not valid unicast IPv4 addresses if OverrideData
+.One or more IPv4 addresses in OverrideData are
+                                   not valid unicast IPv4 addresses if OverrideData
                                    is not NULL.
   @retval EFI_UNSUPPORTED        One or more options in the OptionList are in the
                                  unsupported list of structure EFI_MTFTP4_MODE_DATA
   @retval EFI_NOT_STARTED        The EFI MTFTPv4 Protocol driver has not been started.
   @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP,
+  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP,
                                  BOOTP, RARP, etc.) has not finished yet.
   @retval EFI_ACCESS_DENIED      The previous operation has not completed yet.
   @retval EFI_OUT_OF_RESOURCES   Required system resources could not be allocated.
   @retval EFI_TFTP_ERROR         An MTFTPv4 ERROR packet was received and is in
+  @retval EFI_TFTP_ERROR         An MTFTPv4 ERROR packet was received and is in
                                  the Buffer.
   @retval EFI_ICMP_ERROR         An ICMP ERROR packet was received and the Packet
+  @retval EFI_ICMP_ERROR         An ICMP ERROR packet was received and the Packet
                                  is set to NULL.
   @retval EFI_PROTOCOL_ERROR     An unexpected MTFTPv4 packet was received and is
+  @retval EFI_PROTOCOL_ERROR     An unexpected MTFTPv4 packet was received and is
                                  in the Buffer.
   @retval EFI_TIMEOUT            No responses were received from the MTFTPv4 server.
 …
   Polls for incoming data packets and processes outgoing data packets.
   The Poll() function can be used by network drivers and applications to increase
   the rate that data packets are moved between the communications device and the
+  The Poll() function can be used by network drivers and applications to increase
+  the rate that data packets are moved between the communications device and the
   transmit and receive queues.
   In some systems, the periodic timer event in the managed network driver may not
   poll the underlying communications device fast enough to transmit and/or receive
   all data packets without missing incoming packets or dropping outgoing packets.
   Drivers and applications that are experiencing packet loss should try calling
+  In some systems, the periodic timer event in the managed network driver may not
+  poll the underlying communications device fast enough to transmit and/or receive
+  all data packets without missing incoming packets or dropping outgoing packets.
+  Drivers and applications that are experiencing packet loss should try calling
   the Poll() function more often.
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance
 …
   @retval EFI_INVALID_PARAMETER  This is NULL.
   @retval EFI_DEVICE_ERROR       An unexpected system or network error occurred.
   @retval EFI_TIMEOUT            Data was dropped out of the transmit and/or receive
+  @retval EFI_TIMEOUT            Data was dropped out of the transmit and/or receive
                                  queue. Consider increasing the polling rate.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h

-              r58459
+              r58466
 /** @file
   Mtftp4 Implementation.
   Mtftp4 Implementation, it supports the following RFCs:
   RFC1350 - THE TFTP PROTOCOL (REVISION 2)
 …
   RFC2348 - TFTP Blocksize Option
   RFC2349 - TFTP Timeout Interval and Transfer Size Options
 Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
 /**
   Start the MTFTP session for upload.
   It will first init some states, then send the WRQ request packet,
+  It will first init some states, then send the WRQ request packet,
   and start receiving the packet.
 …
 /**
   Start the MTFTP session to download.
   It will first initialize some of the internal states then build and send a RRQ
+  Start the MTFTP session to download.
+  It will first initialize some of the internal states then build and send a RRQ
   reqeuest packet, at last, it will start receive for the downloading.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h

-              r48674
+              r58466
 /** @file
   Routines to process MTFTP4 options.
 Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
 /**
   Allocate and fill in a array of Mtftp options from the Packet.
+  Allocate and fill in a array of Mtftp options from the Packet.
   It first calls Mtftp4FillOption to get the option number, then allocate
   the array, at last, call Mtftp4FillOption again to save the options.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c

-              r58459
+              r58466
 /** @file
   Routines to process Rrq (download).
 Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
 /**
   Start the MTFTP session to download.
   It will first initialize some of the internal states then build and send a RRQ
+  Start the MTFTP session to download.
+  It will first initialize some of the internal states then build and send a RRQ
   reqeuest packet, at last, it will start receive for the downloading.
 …
   // returns EFI_NOT_FOUND, the block has been saved, don't save it again.
   // Note that : For bigger files, allowing the block counter to roll over
   // to accept transfers of unlimited size. So TotalBlock is memorised as
+  // to accept transfers of unlimited size. So TotalBlock is memorised as
   // continuous block counter.
   //
 …
 /**
   Function to process the received data packets.
+  Function to process the received data packets.
   It will save the block then send back an ACK if it is active.
 …
 /**
   Validate whether the options received in the server's OACK packet is valid.
   The options are valid only if:
 . The server doesn't include options not requested by us
 …
+  }
   if (!Config->UseDefaultSetting &&
+  if (!Config->UseDefaultSetting &&
       !EFI_IP4_EQUAL (&mZeroIp4Addr, &Config->GatewayIp)) {
     //
 …
     //
     Status = McastIo->Protocol.Udp4->Routes (
                                        McastIo->Protocol.Udp4,
+                                       McastIo->Protocol.Udp4,
                                        FALSE,
                                        &mZeroIp4Addr,
 …
                                        &Config->GatewayIp
                                        );
     if (EFI_ERROR (Status)) {
       McastIo->Protocol.Udp4->Configure (McastIo->Protocol.Udp4, NULL);
 …
 /**
   Function to process the OACK.
+  Function to process the OACK.
   It will first validate the OACK packet, then update the various negotiated parameters.
 …
         return Status;
+      }
       //
       // Update the parameters used.
 …
         Instance->BlkSize = Reply.BlkSize;
+      }
       if (Reply.Timeout != 0) {
         Instance->Timeout = Reply.Timeout;
+      }
+    }
+      }
+    }
   } else {
     Instance->Master = TRUE;
     if (Reply.BlkSize != 0) {
       Instance->BlkSize = Reply.BlkSize;
 …
+    }
+  }
   //
   // Send an ACK to (Expected - 1) which is 0 for unicast download,
 …
     Status = EFI_TFTP_ERROR;
     break;
   default:
     break;

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c

-              r58459
+              r58466
 /** @file
   Support routines for Mtftp.
 Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
 /**
   Initialize the block range for either RRQ or WRQ.
   RRQ and WRQ have different requirements for Start and End.
   For example, during start up, WRQ initializes its whole valid block range
   to [0, 0xffff]. This is bacause the server will send us a ACK0 to inform us
   to start the upload. When the client received ACK0, it will remove 0 from the
+  Initialize the block range for either RRQ or WRQ.
+  RRQ and WRQ have different requirements for Start and End.
+  For example, during start up, WRQ initializes its whole valid block range
+  to [0, 0xffff]. This is bacause the server will send us a ACK0 to inform us
+  to start the upload. When the client received ACK0, it will remove 0 from the
   range, get the next block number, which is 1, then upload the BLOCK1. For RRQ
   without option negotiation, the server will directly send us the BLOCK1 in
   response to the client's RRQ. When received BLOCK1, the client will remove
   it from the block range and send an ACK. It also works if there is option
+  without option negotiation, the server will directly send us the BLOCK1 in
+  response to the client's RRQ. When received BLOCK1, the client will remove
+  it from the block range and send an ACK. It also works if there is option
   negotiation.
 …
   @param  Head                  The block range head
   @return The first valid block number, -1 if the block range is empty.
+  @return The first valid block number, -1 if the block range is empty.
 **/
 …
 /**
   Set the last block number of the block range list.
+  Set the last block number of the block range list.
   It will remove all the blocks after the Last. MTFTP initialize the block range
   to the maximum possible range, such as [0, 0xffff] for WRQ. When it gets the
+  to the maximum possible range, such as [0, 0xffff] for WRQ. When it gets the
   last block number, it will call this function to set the last block number.
 …
   @param  Num                   The block number to remove
   @param  Completed             Whether Num is the last block number
   @param  TotalBlock            The continuous block number in all
+  @param  TotalBlock            The continuous block number in all
   @retval EFI_NOT_FOUND         The block number isn't in the block range list
 …
       //
       // Note that: RFC 1350 does not mention block counter roll-over,
       // but several TFTP hosts implement the roll-over be able to accept
       // transfers of unlimited size. There is no consensus, however, whether
       // the counter should wrap around to zero or to one. Many implementations
       // wrap to zero, because this is the simplest to implement. Here we choose
+      // Note that: RFC 1350 does not mention block counter roll-over,
+      // but several TFTP hosts implement the roll-over be able to accept
+      // transfers of unlimited size. There is no consensus, however, whether
+      // the counter should wrap around to zero or to one. Many implementations
+      // wrap to zero, because this is the simplest to implement. Here we choose
       // this solution.
       //
           *TotalBlock  = Num;
       if (Range->Round > 0) {
             *TotalBlock += Range->Bound +  MultU64x32 ((UINTN) (Range->Round -1), (UINT32) (Range->Bound + 1)) + 1;
 …
   @param  Instance              The MTFTP session
   @param  ErrCode               The error code
+  @param  ErrCode               The error code
   @param  ErrInfo               The error message
 …
 /**
   The callback function called when the packet is transmitted.
   It simply frees the packet.
 …
 /**
   Send the packet for the instance.
   It will first save a reference to the packet for later retransmission.
   Then determine the destination port, listen port for requests, and connected
+  Send the packet for the instance.
+  It will first save a reference to the packet for later retransmission.
+  Then determine the destination port, listen port for requests, and connected
   port for others. At last, send the packet out.
 …
   OpCode = NTOHS (*(UINT16 *)Buffer);
   if ((OpCode == EFI_MTFTP4_OPCODE_RRQ) ||
+  if ((OpCode == EFI_MTFTP4_OPCODE_RRQ) ||
       (OpCode == EFI_MTFTP4_OPCODE_DIR) ||
       (OpCode == EFI_MTFTP4_OPCODE_WRQ)) {

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.h

-              r48674
+              r58466
 /** @file
   Support routines for MTFTP.
 Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
 /**
   Initialize the block range for either RRQ or WRQ.
   RRQ and WRQ have different requirements for Start and End.
   For example, during start up, WRQ initializes its whole valid block range
   to [0, 0xffff]. This is bacause the server will send us a ACK0 to inform us
   to start the upload. When the client received ACK0, it will remove 0 from the
+  Initialize the block range for either RRQ or WRQ.
+  RRQ and WRQ have different requirements for Start and End.
+  For example, during start up, WRQ initializes its whole valid block range
+  to [0, 0xffff]. This is bacause the server will send us a ACK0 to inform us
+  to start the upload. When the client received ACK0, it will remove 0 from the
   range, get the next block number, which is 1, then upload the BLOCK1. For RRQ
   without option negotiation, the server will directly send us the BLOCK1 in
   response to the client's RRQ. When received BLOCK1, the client will remove
   it from the block range and send an ACK. It also works if there is option
+  without option negotiation, the server will directly send us the BLOCK1 in
+  response to the client's RRQ. When received BLOCK1, the client will remove
+  it from the block range and send an ACK. It also works if there is option
   negotiation.
 …
   @param  Head                  The block range head
   @return The first valid block number, -1 if the block range is empty.
+  @return The first valid block number, -1 if the block range is empty.
 **/
 …
 /**
   Set the last block number of the block range list.
+  Set the last block number of the block range list.
   It will remove all the blocks after the Last. MTFTP initialize the block range
   to the maximum possible range, such as [0, 0xffff] for WRQ. When it gets the
+  to the maximum possible range, such as [0, 0xffff] for WRQ. When it gets the
   last block number, it will call this function to set the last block number.
 …
   @param  Num                   The block number to remove
   @param  Completed             Wether Num is the last block number
   @param  TotalBlock            The continuous block number in all
+  @param  TotalBlock            The continuous block number in all
   @retval EFI_NOT_FOUND         The block number isn't in the block range list
 …
 /**
   Send the packet for the instance.
   It will first save a reference to the packet for later retransmission.
   Then determine the destination port, listen port for requests, and connected
+  Send the packet for the instance.
+  It will first save a reference to the packet for later retransmission.
+  Then determine the destination port, listen port for requests, and connected
   port for others. At last, send the packet out.
 …
   @param  Instance              The MTFTP session
   @param  ErrCode               The error code
+  @param  ErrCode               The error code
   @param  ErrInfo               The error message

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c

-              r58459
+              r58466
 /** @file
   Routines to process Wrq (upload).
 Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
 /**
   Function to handle received ACK packet.
   If the ACK number matches the expected block number, and there are more
+  Function to handle received ACK packet.
+  If the ACK number matches the expected block number, and there are more
   data pending, send the next block. Otherwise tell the caller that we are done.
 …
   INTN                      Expected;
   UINT64                    TotalBlock;
   *Completed  = FALSE;
   AckNum      = NTOHS (Packet->Ack.Block[0]);
 …
   if (Expected < 0) {
     //
     // The block range is empty. It may either because the the last
 …
 /**
   Check whether the received OACK is valid.
+  Check whether the received OACK is valid.
   The OACK is valid only if:
 . It only include options requested by us
 …
 /**
   Function to handle the MTFTP OACK packet.
+  Function to handle the MTFTP OACK packet.
   It parses the packet's options, and update the internal states of the session.
 …
     Status = EFI_TFTP_ERROR;
     break;
   default:
     break;
 …
 /**
   Start the MTFTP session for upload.
   It will first init some states, then send the WRQ request packet,
+  It will first init some states, then send the WRQ request packet,
   and start receiving the packet.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c

-              r58459
+              r58466
 Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed
 and made available under the terms and conditions of the BSD License which
 accompanies this distribution. The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
+This program and the accompanying materials are licensed
+and made available under the terms and conditions of the BSD License which
+accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 …
   @param  Snp[in]                   A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL.
   @retval EFI_SUCCESS               Update the ControllerNameTable of this instance successfully.
   @retval EFI_INVALID_PARAMETER     The input parameter is invalid.
 **/
 EFI_STATUS
 …
     gSimpleNetworkControllerNameTable = NULL;
+  }
   Status = AddUnicodeString2 (
              "eng",
 …
     return Status;
+  }
   return AddUnicodeString2 (
            "en",
 …
   managing the controller specified by ControllerHandle and ChildHandle,
   then EFI_UNSUPPORTED is returned.  If the driver specified by This does not
   support the language specified by Language, then EFI_UNSUPPORTED is returned.
   Currently not implemented.
+  support the language specified by Language, then EFI_UNSUPPORTED is returned.
+  Currently not implemented.
   @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or
 …
   EFI_STATUS                    Status;
   EFI_SIMPLE_NETWORK_PROTOCOL   *Snp;
   if (ChildHandle != NULL) {
     return EFI_UNSUPPORTED;
 …
+  }
   //
+  //
   // Retrieve an instance of a produced protocol from ControllerHandle
   //
+  //
   Status = gBS->OpenProtocol (
                   ControllerHandle,

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c

-              r48674
+              r58466
 Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed
 and made available under the terms and conditions of the BSD License which
 accompanies this distribution. The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
+This program and the accompanying materials are licensed
+and made available under the terms and conditions of the BSD License which
+accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 …
   @param  Snp                   Pointer to snp driver structure.
   @param  CableDetectFlag       Do/don't detect the cable (depending on what
+  @param  CableDetectFlag       Do/don't detect the cable (depending on what
                                 undi supports).
   @retval EFI_SUCCESS           UNDI is initialized successfully.
   @retval EFI_DEVICE_ERROR      UNDI could not be initialized.
 …
 /**
   Resets a network adapter and allocates the transmit and receive buffers
   required by the network interface; optionally, also requests allocation of
+  Resets a network adapter and allocates the transmit and receive buffers
+  required by the network interface; optionally, also requests allocation of
   additional transmit and receive buffers.
 …
   @param ExtraRxBufferSize  The size, in bytes, of the extra receive buffer space
                             that the driver should allocate for the network interface.
                             Some network interfaces will not be able to use the
                             extra buffer, and the caller will not know if it is
+                            Some network interfaces will not be able to use the
+                            extra buffer, and the caller will not know if it is
                             actually being used.
   @param ExtraTxBufferSize  The size, in bytes, of the extra transmit buffer space

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c

-              r48674
+              r58466
                 Implementation of converting an multicast IP address to multicast HW MAC
                 address.
 Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed
 and made available under the terms and conditions of the BSD License which
 accompanies this distribution. The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
+This program and the accompanying materials are licensed
+and made available under the terms and conditions of the BSD License which
+accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 …
   @param  MAC   Pointer to hold the return MAC address.
   @retval EFI_SUCCESS           The multicast IP address was mapped to the
+  @retval EFI_SUCCESS           The multicast IP address was mapped to the
                                 multicast HW MAC address.
   @retval EFI_INVALID_PARAMETER Invalid UNDI command.
   @retval EFI_UNSUPPORTED       Command is not supported by UNDI.
   @retval EFI_DEVICE_ERROR      Fail to execute UNDI command.
+  @retval EFI_INVALID_PARAMETER Invalid UNDI command.
+  @retval EFI_UNSUPPORTED       Command is not supported by UNDI.
+  @retval EFI_DEVICE_ERROR      Fail to execute UNDI command.
 **/
 …
 /**
   Converts a multicast IP address to a multicast HW MAC address.
   This function converts a multicast IP address to a multicast HW MAC address
+  This function converts a multicast IP address to a multicast HW MAC address
   for all packet transactions. If the mapping is accepted, then EFI_SUCCESS will
   be returned.
 …
   @param This A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.
   @param IPv6 Set to TRUE if the multicast IP address is IPv6 [RFC 2460].
               Set to FALSE if the multicast IP address is IPv4 [RFC 791].
   @param IP   The multicast IP address that is to be converted to a multicast
+              Set to FALSE if the multicast IP address is IPv4 [RFC 791].
+  @param IP   The multicast IP address that is to be converted to a multicast
               HW MAC address.
   @param MAC  The multicast HW MAC address that is to be generated from IP.
 …
   @retval EFI_SUCCESS           The multicast IP address was mapped to the
                                 multicast HW MAC address.
   @retval EFI_NOT_STARTED       The Simple Network Protocol interface has not
+  @retval EFI_NOT_STARTED       The Simple Network Protocol interface has not
                                 been started by calling Start().
   @retval EFI_INVALID_PARAMETER IP is NULL.
   @retval EFI_INVALID_PARAMETER MAC is NULL.
   @retval EFI_INVALID_PARAMETER IP does not point to a valid IPv4 or IPv6
+  @retval EFI_INVALID_PARAMETER IP does not point to a valid IPv4 or IPv6
                                 multicast address.
   @retval EFI_DEVICE_ERROR      The Simple Network Protocol interface has not
+  @retval EFI_DEVICE_ERROR      The Simple Network Protocol interface has not
                                 been initialized by calling Initialize().
   @retval EFI_UNSUPPORTED       IPv6 is TRUE and the implementation does not
+  @retval EFI_UNSUPPORTED       IPv6 is TRUE and the implementation does not
                                 support IPv6 multicast to MAC address conversion.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c

-              r48674
+              r58466
         Implementation of reading and writing operations on the NVRAM device
         attached to a network interface.
 Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed
 and made available under the terms and conditions of the BSD License which
 accompanies this distribution. The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
+This program and the accompanying materials are licensed
+and made available under the terms and conditions of the BSD License which
+accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 …
 /**
   Performs read and write operations on the NVRAM device attached to a network
+  Performs read and write operations on the NVRAM device attached to a network
   interface.
   This function performs read and write operations on the NVRAM device attached
+  This function performs read and write operations on the NVRAM device attached
   to a network interface. If ReadWrite is TRUE, a read operation is performed.
   If ReadWrite is FALSE, a write operation is performed. Offset specifies the
   byte offset at which to start either operation. Offset must be a multiple of
   NvRamAccessSize , and it must have a value between zero and NvRamSize.
+  If ReadWrite is FALSE, a write operation is performed. Offset specifies the
+  byte offset at which to start either operation. Offset must be a multiple of
+  NvRamAccessSize , and it must have a value between zero and NvRamSize.
   BufferSize specifies the length of the read or write operation. BufferSize must
   also be a multiple of NvRamAccessSize, and Offset + BufferSize must not exceed
   NvRamSize.
   If any of the above conditions is not met, then EFI_INVALID_PARAMETER will be
   returned.
   If all the conditions are met and the operation is "read," the NVRAM device
   attached to the network interface will be read into Buffer and EFI_SUCCESS
+  NvRamSize.
+  If any of the above conditions is not met, then EFI_INVALID_PARAMETER will be
+  returned.
+  If all the conditions are met and the operation is "read," the NVRAM device
+  attached to the network interface will be read into Buffer and EFI_SUCCESS
   will be returned. If this is a write operation, the contents of Buffer will be
   used to update the contents of the NVRAM device attached to the network
+  used to update the contents of the NVRAM device attached to the network
   interface and EFI_SUCCESS will be returned.
   It does the basic checking on the input parameters and retrieves snp structure
   and then calls the read_nvdata() call which does the actual reading
 …
   @param This       A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.
   @param ReadWrite  TRUE for read operations, FALSE for write operations.
   @param Offset     Byte offset in the NVRAM device at which to start the read or
                     write operation. This must be a multiple of NvRamAccessSize
                     and less than NvRamSize. (See EFI_SIMPLE_NETWORK_MODE)
   @param BufferSize The number of bytes to read or write from the NVRAM device.
+  @param Offset     Byte offset in the NVRAM device at which to start the read or
+                    write operation. This must be a multiple of NvRamAccessSize
+                    and less than NvRamSize. (See EFI_SIMPLE_NETWORK_MODE)
+  @param BufferSize The number of bytes to read or write from the NVRAM device.
                     This must also be a multiple of NvramAccessSize.
   @param Buffer     A pointer to the data buffer.
 …
   @retval EFI_NOT_STARTED       The network interface has not been started.
   @retval EFI_INVALID_PARAMETER One or more of the following conditions is TRUE:
                                 * The This parameter is NULL
                                 * The This parameter does not point to a valid
+                                * The This parameter is NULL
+                                * The This parameter does not point to a valid
                                   EFI_SIMPLE_NETWORK_PROTOCOL  structure
                                 * The Offset parameter is not a multiple of
+                                * The Offset parameter is not a multiple of
                                   EFI_SIMPLE_NETWORK_MODE.NvRamAccessSize
                                 * The Offset parameter is not less than
+                                * The Offset parameter is not less than
                                   EFI_SIMPLE_NETWORK_MODE.NvRamSize
                                 * The BufferSize parameter is not a multiple of
+                                * The BufferSize parameter is not a multiple of
                                   EFI_SIMPLE_NETWORK_MODE.NvRamAccessSize
                                 * The Buffer parameter is NULL
   @retval EFI_DEVICE_ERROR      The command could not be sent to the network
+  @retval EFI_DEVICE_ERROR      The command could not be sent to the network
                                 interface.
   @retval EFI_UNSUPPORTED       This function is not supported by the network

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c

-              r48674
+              r58466
 Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed and made available under the
 terms and conditions of the BSD License which accompanies this distribution. The
 full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
+This program and the accompanying materials are licensed and made available under the
+terms and conditions of the BSD License which accompanies this distribution. The
+full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 …
   @param  MCastAddressCount  Multicast address count for a new multicast address
                              list.
   @param  MCastAddressList   List of new multicast addresses.
+  @param  MCastAddressList   List of new multicast addresses.
   @retval EFI_SUCCESS           The multicast receive filter list was updated.
   @retval EFI_INVALID_PARAMETER Invalid UNDI command.
 …
   @param  Snp             Pointer to snp driver structure
   @param  DisableFlags    Bit mask for disabling the receive filters
   @param  ResetMCastList  Boolean flag to reset/delete the multicast filter
+  @param  ResetMCastList  Boolean flag to reset/delete the multicast filter
                           list.
   @retval EFI_SUCCESS           The multicast receive filter list was updated.
   @retval EFI_DEVICE_ERROR      Fail to execute UNDI command.
 **/
+**/
 EFI_STATUS
 PxeRecvFilterDisable (
 …
   @retval EFI_SUCCESS           The receive filter was read.
   @retval EFI_DEVICE_ERROR      Fail to execute UNDI command.
+  @retval EFI_DEVICE_ERROR      Fail to execute UNDI command.
 **/
 EFI_STATUS
 …
 /**
   Manages the multicast receive filters of a network interface.
   This function is used enable and disable the hardware and software receive
+  This function is used enable and disable the hardware and software receive
   filters for the underlying network device.
   The receive filter change is broken down into three steps:
   * The filter mask bits that are set (ON) in the Enable parameter are added to
     the current receive filter settings.
+  The receive filter change is broken down into three steps:
+  * The filter mask bits that are set (ON) in the Enable parameter are added to
+    the current receive filter settings.
   * The filter mask bits that are set (ON) in the Disable parameter are subtracted
     from the updated receive filter settings.
   * If the resulting receive filter setting is not supported by the hardware a
     more liberal setting is selected.
   If the same bits are set in the Enable and Disable parameters, then the bits
+  If the same bits are set in the Enable and Disable parameters, then the bits
   in the Disable parameter takes precedence.
   If the ResetMCastFilter parameter is TRUE, then the multicast address list
   filter is disabled (irregardless of what other multicast bits are set in the
   Enable and Disable parameters). The SNP->Mode->MCastFilterCount field is set
+  If the ResetMCastFilter parameter is TRUE, then the multicast address list
+  filter is disabled (irregardless of what other multicast bits are set in the
+  Enable and Disable parameters). The SNP->Mode->MCastFilterCount field is set
   to zero. The Snp->Mode->MCastFilter contents are undefined.
   After enabling or disabling receive filter settings, software should verify
   the new settings by checking the Snp->Mode->ReceiveFilterSettings,
+  After enabling or disabling receive filter settings, software should verify
+  the new settings by checking the Snp->Mode->ReceiveFilterSettings,
   Snp->Mode->MCastFilterCount and Snp->Mode->MCastFilter fields.
   Note: Some network drivers and/or devices will automatically promote receive
+  Note: Some network drivers and/or devices will automatically promote receive
     filter settings if the requested setting can not be honored. For example, if
     a request for four multicast addresses is made and the underlying hardware
     only supports two multicast addresses the driver might set the promiscuous
+    a request for four multicast addresses is made and the underlying hardware
+    only supports two multicast addresses the driver might set the promiscuous
     or promiscuous multicast receive filters instead. The receiving software is
     responsible for discarding any extra packets that get through the hardware
+    responsible for discarding any extra packets that get through the hardware
     receive filters.
     Note: Note: To disable all receive filter hardware, the network driver must
+    Note: Note: To disable all receive filter hardware, the network driver must
       be Shutdown() and Stopped(). Calling ReceiveFilters() with Disable set to
       Snp->Mode->ReceiveFilterSettings will make it so no more packets are
       returned by the Receive() function, but the receive hardware may still be
+      Snp->Mode->ReceiveFilterSettings will make it so no more packets are
+      returned by the Receive() function, but the receive hardware may still be
       moving packets into system memory before inspecting and discarding them.
       Unexpected system errors, reboots and hangs can occur if an OS is loaded
+      Unexpected system errors, reboots and hangs can occur if an OS is loaded
       and the network devices are not Shutdown() and Stopped().
   If ResetMCastFilter is TRUE, then the multicast receive filter list on the
+  If ResetMCastFilter is TRUE, then the multicast receive filter list on the
   network interface will be reset to the default multicast receive filter list.
   If ResetMCastFilter is FALSE, and this network interface allows the multicast
   receive filter list to be modified, then the MCastFilterCnt and MCastFilter
   are used to update the current multicast receive filter list. The modified
   receive filter list settings can be found in the MCastFilter field of
+  If ResetMCastFilter is FALSE, and this network interface allows the multicast
+  receive filter list to be modified, then the MCastFilterCnt and MCastFilter
+  are used to update the current multicast receive filter list. The modified
+  receive filter list settings can be found in the MCastFilter field of
   EFI_SIMPLE_NETWORK_MODE. If the network interface does not allow the multicast
   receive filter list to be modified, then EFI_INVALID_PARAMETER will be returned.
   If the driver has not been initialized, EFI_DEVICE_ERROR will be returned.
   If the receive filter mask and multicast receive filter list have been
+  If the receive filter mask and multicast receive filter list have been
   successfully updated on the network interface, EFI_SUCCESS will be returned.
 …
                           interface.
   @param Disable          A bit mask of receive filters to disable on the network
                           interface. For backward compatibility with EFI 1.1
+                          interface. For backward compatibility with EFI 1.1
                           platforms, the EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST bit
                           must be set when the ResetMCastFilter parameter is TRUE.
   @param ResetMCastFilter Set to TRUE to reset the contents of the multicast
                           receive filters on the network interface to their
                           default values.
+  @param ResetMCastFilter Set to TRUE to reset the contents of the multicast
+                          receive filters on the network interface to their
+                          default values.
   @param MCastFilterCnt   Number of multicast HW MAC addresses in the new MCastFilter
                           list. This value must be less than or equal to the
                           MCastFilterCnt field of EFI_SIMPLE_NETWORK_MODE.
+                          list. This value must be less than or equal to the
+                          MCastFilterCnt field of EFI_SIMPLE_NETWORK_MODE.
                           This field is optional if ResetMCastFilter is TRUE.
   @param MCastFilter      A pointer to a list of new multicast receive filter HW
                           MAC addresses. This list will replace any existing
                           multicast HW MAC address list. This field is optional
+                          MAC addresses. This list will replace any existing
+                          multicast HW MAC address list. This field is optional
                           if ResetMCastFilter is TRUE.
   @retval EFI_SUCCESS            The multicast receive filter list was updated.
   @retval EFI_NOT_STARTED        The network interface has not been started.
 …
                                  * There are bits set in Disable that are not set
                                    in Snp->Mode->ReceiveFilterMask
                                  * Multicast is being enabled (the
                                    EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST bit is
                                    set in Enable, it is not set in Disable, and
+                                 * Multicast is being enabled (the
+                                   EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST bit is
+                                   set in Enable, it is not set in Disable, and
                                    ResetMCastFilter is FALSE) and MCastFilterCount
                                    is zero
 …
                                  * The network interface has been started but has
                                    not been initialized
                                  * An unexpected error was returned by the
+                                 * An unexpected error was returned by the
                                    underlying network driver or device
   @retval EFI_UNSUPPORTED        This function is not supported by the network

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/SnpDxe/Reset.c

-              r48674
+              r58466
 /** @file
     Implementation of resetting a network adapter.
 Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed and made available under the
 terms and conditions of the BSD License which accompanies this distribution. The
 full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
+This program and the accompanying materials are licensed and made available under the
+terms and conditions of the BSD License which accompanies this distribution. The
+full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 …
   This function resets a network adapter and reinitializes it with the parameters
   that were provided in the previous call to Initialize(). The transmit and
+  that were provided in the previous call to Initialize(). The transmit and
   receive queues are emptied and all pending interrupts are cleared.
   Receive filters, the station address, the statistics, and the multicast-IP-to-HW
   MAC addresses are not reset by this call. If the network interface was
   successfully reset, then EFI_SUCCESS will be returned. If the driver has not
+  Receive filters, the station address, the statistics, and the multicast-IP-to-HW
+  MAC addresses are not reset by this call. If the network interface was
+  successfully reset, then EFI_SUCCESS will be returned. If the driver has not
   been initialized, EFI_DEVICE_ERROR will be returned.
   @param This                 A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.
   @param ExtendedVerification Indicates that the driver may perform a more
                               exhaustive verification operation of the device
+  @param ExtendedVerification Indicates that the driver may perform a more
+                              exhaustive verification operation of the device
                               during reset.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c

-              r48674
+              r58466
 /** @file
     Implementation of shuting down a network adapter.
 Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed
 and made available under the terms and conditions of the BSD License which
 accompanies this distribution. The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
+This program and the accompanying materials are licensed
+and made available under the terms and conditions of the BSD License which
+accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 …
 /**
   Resets a network adapter and leaves it in a state that is safe for another
   driver to initialize.
+  Resets a network adapter and leaves it in a state that is safe for another
+  driver to initialize.
   This function releases the memory buffers assigned in the Initialize() call.
   Pending transmits and receives are lost, and interrupts are cleared and disabled.
   After this call, only the Initialize() and Stop() calls may be used. If the
+  After this call, only the Initialize() and Stop() calls may be used. If the
   network interface was successfully shutdown, then EFI_SUCCESS will be returned.
   If the driver has not been initialized, EFI_DEVICE_ERROR will be returned.
 …
   @retval EFI_SUCCESS           The network interface was shutdown.
   @retval EFI_NOT_STARTED       The network interface has not been started.
   @retval EFI_INVALID_PARAMETER This parameter was NULL or did not point to a valid
+  @retval EFI_INVALID_PARAMETER This parameter was NULL or did not point to a valid
                                 EFI_SIMPLE_NETWORK_PROTOCOL structure.
   @retval EFI_DEVICE_ERROR      The command could not be sent to the network interface.
 …
     goto ON_EXIT;
+  }
   Status                          = PxeShutdown (Snp);

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/SnpDxe/Snp.c

-              r58459
+              r58466
   EFI_PCI_IO_PROTOCOL                       *PciIo;
   EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR         *BarDesc;
   DEBUG ((EFI_D_NET, "\nSnpNotifyNetworkInterfaceIdentifier()  "));
 …
   Snp->TxRxBufferSize     = 0;
   Snp->TxRxBuffer         = NULL;
   if (Nii->Revision >= EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION) {
         Snp->IfNum = Nii->IfNum;

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf

-              r58459
+              r58466
 #  This module produces EFI SNP Protocol.
+#
 #  This module produces Simple Network Protocol upon EFI Network Interface
+#  This module produces Simple Network Protocol upon EFI Network Interface
 #  Identifier Protocol, to provide a packet level interface to a network adapter.
+#
 #  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #  This program and the accompanying materials are licensed
 #  and made available under the terms and conditions of the BSD License which
 #  accompanies this distribution. The full text of the license may be found at
 #  http://opensource.org/licenses/bsd-license.php
+#  This program and the accompanying materials are licensed
+#  and made available under the terms and conditions of the BSD License which
+#  accompanies this distribution. The full text of the license may be found at
+#  http://opensource.org/licenses/bsd-license.php
+#
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 …
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
+#
 #  DRIVER_BINDING                =  mSimpleNetworkDriverBinding
+#  DRIVER_BINDING                =  mSimpleNetworkDriverBinding
 #  COMPONENT_NAME                =  gSimpleNetworkComponentName
 #  COMPONENT_NAME2               =  gSimpleNetworkComponentName2

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/SnpDxe/Start.c

-              r48674
+              r58466
 /** @file
     Implementation of starting a network adapter.
 Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed
 and made available under the terms and conditions of the BSD License which
 accompanies this distribution. The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
+This program and the accompanying materials are licensed
+and made available under the terms and conditions of the BSD License which
+accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 …
   @retval EFI_SUCCESS            UNDI is started successfully.
   @retval EFI_DEVICE_ERROR       UNDI could not be started.
 **/
 EFI_STATUS
 …
 /**
   Change the state of a network interface from "stopped" to "started."
   This function starts a network interface. If the network interface successfully
   starts, then EFI_SUCCESS will be returned.
 …
   @retval EFI_SUCCESS            The network interface was started.
   @retval EFI_ALREADY_STARTED    The network interface is already in the started state.
   @retval EFI_INVALID_PARAMETER  This parameter was NULL or did not point to a valid
+  @retval EFI_INVALID_PARAMETER  This parameter was NULL or did not point to a valid
                                  EFI_SIMPLE_NETWORK_PROTOCOL structure.
   @retval EFI_DEVICE_ERROR       The command could not be sent to the network interface.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c

-              r58459
+              r58466
 /** @file
     Implementation of reading the MAC address of a network adapter.
 Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed
 and made available under the terms and conditions of the BSD License which
 accompanies this distribution. The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
+This program and the accompanying materials are licensed
+and made available under the terms and conditions of the BSD License which
+accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 …
 /**
   Call UNDI to read the MAC address of the NIC and update the mode structure
   with the address.
+  Call UNDI to read the MAC address of the NIC and update the mode structure
+  with the address.
   @param  Snp         Pointer to snp driver structure.
   @retval EFI_SUCCESS       The MAC address of the NIC is read successfully.
   @retval EFI_DEVICE_ERROR  Failed to read the MAC address of the NIC.
 …
 /**
   Modifies or resets the current station address, if supported.
   This function modifies or resets the current station address of a network
+  This function modifies or resets the current station address of a network
   interface, if supported. If Reset is TRUE, then the current station address is
   set to the network interface's permanent address. If Reset is FALSE, and the
   network interface allows its station address to be modified, then the current
   station address is changed to the address specified by New. If the network
   interface does not allow its station address to be modified, then
+  set to the network interface's permanent address. If Reset is FALSE, and the
+  network interface allows its station address to be modified, then the current
+  station address is changed to the address specified by New. If the network
+  interface does not allow its station address to be modified, then
   EFI_INVALID_PARAMETER will be returned. If the station address is successfully
   updated on the network interface, EFI_SUCCESS will be returned. If the driver
 …
   @param This  A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.
   @param Reset Flag used to reset the station address to the network interface's
+  @param Reset Flag used to reset the station address to the network interface's
                permanent address.
   @param New   New station address to be used for the network interface.
 …
   @retval EFI_SUCCESS           The network interface's station address was updated.
   @retval EFI_NOT_STARTED       The Simple Network Protocol interface has not been
+  @retval EFI_NOT_STARTED       The Simple Network Protocol interface has not been
                                 started by calling Start().
   @retval EFI_INVALID_PARAMETER The New station address was not accepted by the NIC.
   @retval EFI_INVALID_PARAMETER Reset is FALSE and New is NULL.
   @retval EFI_DEVICE_ERROR      The Simple Network Protocol interface has not
+  @retval EFI_DEVICE_ERROR      The Simple Network Protocol interface has not
                                 been initialized by calling Initialize().
   @retval EFI_DEVICE_ERROR      An error occurred attempting to set the new
+  @retval EFI_DEVICE_ERROR      An error occurred attempting to set the new
                                 station address.
   @retval EFI_UNSUPPORTED       The NIC does not support changing the network
+  @retval EFI_UNSUPPORTED       The NIC does not support changing the network
                                 interface's station address.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/SnpDxe/Stop.c

-              r48674
+              r58466
 /** @file
     Implementation of stopping a network interface.
 Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed
 and made available under the terms and conditions of the BSD License which
 accompanies this distribution. The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
+This program and the accompanying materials are licensed
+and made available under the terms and conditions of the BSD License which
+accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 …
   @param  Snp   Pointer to snp driver structure
   @retval EFI_SUCCESS            The network interface was stopped.
   @retval EFI_DEVICE_ERROR       SNP is not initialized.
 …
 /**
   Changes the state of a network interface from "started" to "stopped."
   This function stops a network interface. This call is only valid if the network
   interface is in the started state. If the network interface was successfully
   stopped, then EFI_SUCCESS will be returned.
   @param  This                    A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL
+  @param  This                    A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL
                                   instance.
   @retval EFI_SUCCESS             The network interface was stopped.
   @retval EFI_NOT_STARTED         The network interface has not been started.
   @retval EFI_INVALID_PARAMETER   This parameter was NULL or did not point to a
+  @retval EFI_INVALID_PARAMETER   This parameter was NULL or did not point to a
                                   valid EFI_SIMPLE_NETWORK_PROTOCOL structure.
   @retval EFI_DEVICE_ERROR        The command could not be sent to the network
+  @retval EFI_DEVICE_ERROR        The command could not be sent to the network
                                   interface.
   @retval EFI_UNSUPPORTED         This function is not supported by the network
+  @retval EFI_UNSUPPORTED         This function is not supported by the network
                                   interface.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c

-              r48674
+              r58466
 /** @file
     Implementation of transmitting a packet.
 Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed
 and made available under the terms and conditions of the BSD License which
 accompanies this distribution. The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
+This program and the accompanying materials are licensed
+and made available under the terms and conditions of the BSD License which
+accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 …
 /**
   Places a packet in the transmit queue of a network interface.
   This function places the packet specified by Header and Buffer on the transmit
   queue. If HeaderSize is nonzero and HeaderSize is not equal to
   This->Mode->MediaHeaderSize, then EFI_INVALID_PARAMETER will be returned. If
+  queue. If HeaderSize is nonzero and HeaderSize is not equal to
+  This->Mode->MediaHeaderSize, then EFI_INVALID_PARAMETER will be returned. If
   BufferSize is less than This->Mode->MediaHeaderSize, then EFI_BUFFER_TOO_SMALL
   will be returned. If Buffer is NULL, then EFI_INVALID_PARAMETER will be
+  will be returned. If Buffer is NULL, then EFI_INVALID_PARAMETER will be
   returned. If HeaderSize is nonzero and DestAddr or Protocol is NULL, then
   EFI_INVALID_PARAMETER will be returned. If the transmit engine of the network
   interface is busy, then EFI_NOT_READY will be returned. If this packet can be
   accepted by the transmit engine of the network interface, the packet contents
   specified by Buffer will be placed on the transmit queue of the network
   interface, and EFI_SUCCESS will be returned. GetStatus() can be used to
   determine when the packet has actually been transmitted. The contents of the
   Buffer must not be modified until the packet has actually been transmitted.
+  interface is busy, then EFI_NOT_READY will be returned. If this packet can be
+  accepted by the transmit engine of the network interface, the packet contents
+  specified by Buffer will be placed on the transmit queue of the network
+  interface, and EFI_SUCCESS will be returned. GetStatus() can be used to
+  determine when the packet has actually been transmitted. The contents of the
+  Buffer must not be modified until the packet has actually been transmitted.
   The Transmit() function performs nonblocking I/O. A caller who wants to perform
   blocking I/O, should call Transmit(), and then GetStatus() until the
+  blocking I/O, should call Transmit(), and then GetStatus() until the
   transmitted buffer shows up in the recycled transmit buffer.
   If the driver has not been initialized, EFI_DEVICE_ERROR will be returned.
   @param This       A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.
   @param HeaderSize The size, in bytes, of the media header to be filled in by the
+  @param HeaderSize The size, in bytes, of the media header to be filled in by the
                     Transmit() function. If HeaderSize is nonzero, then it must
                     be equal to This->Mode->MediaHeaderSize and the DestAddr and
 …
   @param BufferSize The size, in bytes, of the entire packet (media header and
                     data) to be transmitted through the network interface.
   @param Buffer     A pointer to the packet (media header followed by data) to be
                     transmitted. This parameter cannot be NULL. If HeaderSize is
+  @param Buffer     A pointer to the packet (media header followed by data) to be
+                    transmitted. This parameter cannot be NULL. If HeaderSize is
                     zero, then the media header in Buffer must already be filled
                     in by the caller. If HeaderSize is nonzero, then the media
+                    in by the caller. If HeaderSize is nonzero, then the media
                     header will be filled in by the Transmit() function.
   @param SrcAddr    The source HW MAC address. If HeaderSize is zero, then this
                     parameter is ignored. If HeaderSize is nonzero and SrcAddr
                     is NULL, then This->Mode->CurrentAddress is used for the
+  @param SrcAddr    The source HW MAC address. If HeaderSize is zero, then this
+                    parameter is ignored. If HeaderSize is nonzero and SrcAddr
+                    is NULL, then This->Mode->CurrentAddress is used for the
                     source HW MAC address.
   @param DestAddr   The destination HW MAC address. If HeaderSize is zero, then
+  @param DestAddr   The destination HW MAC address. If HeaderSize is zero, then
                     this parameter is ignored.
   @param Protocol   The type of header to build. If HeaderSize is zero, then this
                     parameter is ignored. See RFC 1700, section "Ether Types,"
+  @param Protocol   The type of header to build. If HeaderSize is zero, then this
+                    parameter is ignored. See RFC 1700, section "Ether Types,"
                     for examples.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/SnpDxe/WaitForPacket.c

-              r48674
+              r58466
 Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed
 and made available under the terms and conditions of the BSD License which
 accompanies this distribution. The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
+This program and the accompanying materials are licensed
+and made available under the terms and conditions of the BSD License which
+accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c

-              r58459
+              r58466
   @param  Tcp4[in]                   A pointer to the EFI_TCP4_PROTOCOL.
   @retval EFI_SUCCESS                Update the ControllerNameTable of this instance successfully.
   @retval EFI_INVALID_PARAMETER      The input parameter is invalid.
 **/
 EFI_STATUS
 …
     gTcpControllerNameTable = NULL;
+  }
   Status = AddUnicodeString2 (
              "eng",
 …
     return Status;
+  }
   return AddUnicodeString2 (
            "en",
 …
     return EFI_UNSUPPORTED;
+  }
   //
   // Make sure this driver produced ChildHandle
   //
+  //
+  // Make sure this driver produced ChildHandle
+  //
   Status = EfiTestChildHandle (
              ControllerHandle,
 …
+  }
   //
+  //
   // Retrieve an instance of a produced protocol from ChildHandle
   //
+  //
   Status = gBS->OpenProtocol (
                   ChildHandle,

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c

-              r58459
+              r58466
   IN     UINT32         BufLen
   );
 /**
   Process the send token.
 …
   @param Event             The Event this notify function registered to, ignored.
 **/
 VOID
 …
   @param  Sock                  Pointer to the socket.
   @param  PendingTokenList      Pointer to the token list to be flushed.
 **/
 VOID
 …
 /**
   Wake up the connection token while the connection is successfully established,
+  Wake up the connection token while the connection is successfully established,
   then try to process any pending send token.
 …
 /**
   Called by the low layer protocol to indicate the socket a connection is
   established.
   This function just changes the socket's state to SO_CONNECTED
+  Called by the low layer protocol to indicate the socket a connection is
+  established.
+  This function just changes the socket's state to SO_CONNECTED
   and signals the token used for connection establishment.
 …
 /**
   Called by the low layer protocol to indicate the connection is closed.
   This function flushes the socket, sets the state to SO_CLOSED and signals
+  This function flushes the socket, sets the state to SO_CLOSED and signals
   the close token.
   @param  Sock                  Pointer to the socket associated with the closed
                                 connection.
 **/
 VOID
 …
 /**
   Called by low layer protocol to indicate that some data is sent or processed.
   This function trims the sent data in the socket send buffer, signals the data
+  This function trims the sent data in the socket send buffer, signals the data
   token if proper.
 …
 /**
   Called by the low layer protocol to deliver received data to socket layer.
   This function will append the data to the socket receive buffer, set ther
+  This function will append the data to the socket receive buffer, set ther
   urgent data length and then check if any receive token can be signaled.
 …
 /**
   Called by the low layer protocol to indicate that there will be no more data
+  Called by the low layer protocol to indicate that there will be no more data
   from the communication peer.
   This function set the socket's state to SO_NO_MORE_DATA and signal all queued
+  This function set the socket's state to SO_NO_MORE_DATA and signal all queued
   IO tokens with the error status EFI_CONNECTION_FIN.
 …
                                 one.
   @return Pointer to the buffer block next to SockEntry. NULL if SockEntry is
+  @return Pointer to the buffer block next to SockEntry. NULL if SockEntry is
           the tail or head entry.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.h

-              r48674
+              r58466
 /**
   Signal a event with the given status.
   @param Token        The token's event is to be signaled.
   @param TokenStatus  The status to be sent with the event.
 **/
 #define SIGNAL_TOKEN(Token, TokenStatus) \
 …
   @param Event  The Event this notify function registered to, ignored.
 **/
 VOID

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c

-              r58459
+              r58466
   @param  Event                The event to be checked.
   @retval  TRUE                The specific Event exists in the List.
+  @retval  TRUE                The specific Event exists in the List.
   @retval  FALSE               The specific Event is not in the List.
 …
   @param  Event                The event to be checked.
   @retval  TRUE                The Event exists in related socket's lists.
+  @retval  TRUE                The Event exists in related socket's lists.
   @retval  FALSE               The Event is not in related socket's lists.
 …
   @param  SockInitData         Inital data to setting the socket.
   @return Pointer to the newly created socket. If NULL, error condition occured.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h

-              r58459
+              r58466
 /**
   Set socket SO_NO_MORE_DATA flag.
   @param Sock               Pointer to the socket
 **/
 #define SOCK_NO_MORE_DATA(Sock)     ((Sock)->Flag |= SO_NO_MORE_DATA)
 …
 /**
   Check whether the socket is unconfigured.
   @param  Sock               Pointer to the socket
+  @param  Sock               Pointer to the socket
   @retval True               The socket is unconfigued
   @retval False              The socket is not unconfigued
 **/
 #define SOCK_IS_UNCONFIGURED(Sock)  ((Sock)->ConfigureState == SO_UNCONFIGURED)
 …
 /**
   Check whether the socket is configured.
   @param  Sock               Pointer to the socket
+  @param  Sock               Pointer to the socket
   @retval True               The socket is configued
   @retval False              The socket is not configued
 **/
 #define SOCK_IS_CONFIGURED(Sock) \
 …
 /**
   Check whether the socket is configured to active mode.
   @param  Sock               Pointer to the socket
+  @param  Sock               Pointer to the socket
   @retval True               The socket is configued to active mode
   @retval False              The socket is not configued to active mode
 **/
 #define SOCK_IS_CONFIGURED_ACTIVE(Sock) \
 …
 /**
   Check whether the socket is configured to passive mode.
   @param  Sock               Pointer to the socket
+  @param  Sock               Pointer to the socket
   @retval True               The socket is configued to passive mode
   @retval False              The socket is not configued to passive mode
 **/
 #define SOCK_IS_CONNECTED_PASSIVE(Sock) \
 …
 /**
   Check whether the socket is mapped.
   @param  Sock               Pointer to the socket
+  @param  Sock               Pointer to the socket
   @retval True               The socket is no mapping
   @retval False              The socket is mapped
 **/
 #define SOCK_IS_NO_MAPPING(Sock) \
 …
 /**
   Check whether the socket is closed.
   @param  Sock               Pointer to the socket
+  @param  Sock               Pointer to the socket
   @retval True               The socket is closed
   @retval False              The socket is not closed
 **/
 #define SOCK_IS_CLOSED(Sock)          ((Sock)->State == SO_CLOSED)
 …
 /**
   Check whether the socket is listening.
   @param  Sock               Pointer to the socket
+  @param  Sock               Pointer to the socket
   @retval True               The socket is listening
   @retval False              The socket is not listening
 **/
 #define SOCK_IS_LISTENING(Sock)       ((Sock)->State == SO_LISTENING)
 …
 /**
   Check whether the socket is connecting.
   @param  Sock               Pointer to the socket
+  @param  Sock               Pointer to the socket
   @retval True               The socket is connecting
   @retval False              The socket is not connecting
 **/
 #define SOCK_IS_CONNECTING(Sock)      ((Sock)->State == SO_CONNECTING)
 …
 /**
   Check whether the socket has connected.
   @param  Sock               Pointer to the socket
+  @param  Sock               Pointer to the socket
   @retval True               The socket has connected
   @retval False              The socket has not connected
 **/
 #define SOCK_IS_CONNECTED(Sock)       ((Sock)->State == SO_CONNECTED)
 …
 /**
   Check whether the socket is disconnecting.
   @param  Sock               Pointer to the socket
+  @param  Sock               Pointer to the socket
   @retval True               The socket is disconnecting
   @retval False              The socket is not disconnecting
 **/
 #define SOCK_IS_DISCONNECTING(Sock)   ((Sock)->State == SO_DISCONNECTING)
 …
 /**
   Check whether the socket is no more data.
   @param  Sock               Pointer to the socket
+  @param  Sock               Pointer to the socket
   @retval True               The socket is no more data
   @retval False              The socket still has data
 **/
 #define SOCK_IS_NO_MORE_DATA(Sock)    (0 != ((Sock)->Flag & SO_NO_MORE_DATA))
 …
 /**
   Set the size of the receive buffer.
   @param  Sock               Pointer to the socket
   @param  Size               The size to set
 …
 /**
   Get the size of the receive buffer.
   @param  Sock               Pointer to the socket
+  @param  Sock               Pointer to the socket
   @return The receive buffer size
 …
 /**
   Get the size of the receive data.
   @param  Sock               Pointer to the socket
+  @param  Sock               Pointer to the socket
   @return The received data size
 …
 /**
   Set the size of the send buffer.
   @param  Sock               Pointer to the socket
   @param  Size               The size to set
 …
 /**
   Get the size of the send buffer.
   @param  Sock               Pointer to the socket
+  @param  Sock               Pointer to the socket
   @return The send buffer size
 …
 /**
   Get the size of the send data.
   @param  Sock               Pointer to the socket
+  @param  Sock               Pointer to the socket
   @return The send data size
 …
 /**
   Set the backlog value of the socket.
   @param  Sock               Pointer to the socket
   @param  Value              The value to set
 …
 /**
   Get the backlog value of the socket.
   @param  Sock               Pointer to the socket
+  @param  Sock               Pointer to the socket
   @return The backlog value
 …
 /**
   Set the socket with error state.
   @param  Sock               Pointer to the socket
   @param  Error              The error state
 …
 ///
 ///  The request issued from socket layer to protocol layer.
+///  The request issued from socket layer to protocol layer.
 ///
 #define SOCK_ATTACH     0    ///< Attach current socket to a new PCB
 …
 /**
   The handler of protocol for request from socket.
   @param Socket              The socket issuing the request to protocol
   @param Request             The request issued by socket
   @param RequestData         The request related data
   @retval EFI_SUCCESS        The socket request is completed successfully.
   @retval other              The error status returned by the corresponding TCP
                              layer function.
 **/
 typedef
 …
   IN VOID         *RequestData
   );
 //
 // Socket provided oprerations for low layer protocol
 …
 /**
   Called by the low layer protocol to indicate the socket a connection is
   established.
   This function just changes the socket's state to SO_CONNECTED
+  Called by the low layer protocol to indicate the socket a connection is
+  established.
+  This function just changes the socket's state to SO_CONNECTED
   and signals the token used for connection establishment.
   @param  Sock                  Pointer to the socket associated with the
                                 established connection.
 **/
 VOID
 …
 /**
   Called by the low layer protocol to indicate the connection is closed.
   This function flushes the socket, sets the state to SO_CLOSED and signals
+  This function flushes the socket, sets the state to SO_CLOSED and signals
   the close token.
   @param  Sock                  Pointer to the socket associated with the closed
                                 connection.
 **/
 VOID
 …
 /**
   Called by low layer protocol to indicate that some data is sent or processed.
   This function trims the sent data in the socket send buffer, signals the data
+  This function trims the sent data in the socket send buffer, signals the data
   token if proper.
 …
   Called by the low layer protocol to indicate that there
   will be no more data from the communication peer.
   This function set the socket's state to SO_NO_MORE_DATA and
   signal all queued IO tokens with the error status EFI_CONNECTION_FIN.
 …
 /**
   Called by the low layer protocol to deliver received data to socket layer.
   This function will append the data to the socket receive buffer, set ther
+  This function will append the data to the socket receive buffer, set ther
   urgent data length and then check if any receive token can be signaled.
 …
   IN VOID    *Context
   );
 ///
 /// Proto type of the destroy callback
+///
+/// Proto type of the destroy callback
 ///
 typedef
 …
 ///
 ///  The union type of TCP and UDP protocol.
 ///
+///
 typedef union _NET_PROTOCOL {
   EFI_TCP4_PROTOCOL TcpProtocol;   ///< Tcp protocol
 …
   EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath;
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;
   LIST_ENTRY                Link;
+  LIST_ENTRY                Link;
   UINT8                 ConfigureState;
   SOCK_TYPE             Type;
 …
   SOCKET          *Parent;        ///< listening parent that accept the connection
   LIST_ENTRY      ConnectionList; ///< the connections maintained by this socket
   //
   // The queue to buffer application's asynchronous token
 …
   @param  SockInitData         Inital data to setting the socket.
   @return Pointer to the newly created socket. If NULL, error condition occured.
 …
                                 one.
   @return Pointer to the buffer block next to SockEntry. NULL if SockEntry is
+  @return Pointer to the buffer block next to SockEntry. NULL if SockEntry is
           the tail or head entry.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c

r58459	r58466
342	342	Sk->SockHandle
343	343	);
344
	344
345	345	IpIoRemoveIp (ProtoData->TcpService->IpIo, Tcb->IpInfo);
346	346

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c

-              r58459
+              r58466
 /**
   Stop and destroy the heartbeat timer for TCP driver.
 **/
 VOID
 …
 /**
   Callback function which provided by user to remove one node in NetDestroyLinkList process.
   @param[in]    Entry           The entry to be removed.
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
 …
 /**
   Tests to see if this driver supports a given controller.
   If a child device is provided, it further tests to see if this driver supports
+  If a child device is provided, it further tests to see if this driver supports
   creating a handle for the specified child device.
   @param  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
   @param  ControllerHandle     The handle of the controller to test. This handle
                                must support a protocol interface that supplies
+  @param  ControllerHandle     The handle of the controller to test. This handle
+                               must support a protocol interface that supplies
                                an I/O abstraction to the driver.
   @param  RemainingDevicePath  A pointer to the remaining portion of a device path.
+  @param  RemainingDevicePath  A pointer to the remaining portion of a device path.
                                This parameter is ignored by device drivers, and is optional for bus drivers.
   @retval EFI_SUCCESS          The device specified by ControllerHandle and
                                RemainingDevicePath is supported by the driver
+                               RemainingDevicePath is supported by the driver
                                specified by This.
   @retval EFI_ALREADY_STARTED  The device specified by ControllerHandle and
                                RemainingDevicePath is already being managed by
+                               RemainingDevicePath is already being managed by
                                the driver specified by This.
   @retval EFI_ACCESS_DENIED    The device specified by ControllerHandle and
                                RemainingDevicePath is already being managed by a
                                different driver or an application that requires
+                               RemainingDevicePath is already being managed by a
+                               different driver or an application that requires
                                exclusive access.
   @retval EFI_UNSUPPORTED      The device specified by ControllerHandle and
                                RemainingDevicePath is not supported by the driver
+                               RemainingDevicePath is not supported by the driver
                                specified by This.
 **/
 EFI_STATUS
 …
 /**
   Start this driver on ControllerHandle.
   The Start() function is designed to be invoked from the EFI boot service
   ConnectController(). As a result, much of the error checking on the parameters
   to Start() has been moved into this common boot service. It is legal to call
   Start() from other locations, but the following calling restrictions must be
+  Start this driver on ControllerHandle.
+  The Start() function is designed to be invoked from the EFI boot service
+  ConnectController(). As a result, much of the error checking on the parameters
+  to Start() has been moved into this common boot service. It is legal to call
+  Start() from other locations, but the following calling restrictions must be
   followed or the system behavior will not be deterministic.
 . ControllerHandle must be a valid EFI_HANDLE.
 . If RemainingDevicePath is not NULL, then it must be a pointer to a naturally
+. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally
      aligned EFI_DEVICE_PATH_PROTOCOL.
 . Prior to calling Start(), the Supported() function for the driver specified
      by This must have been called with the same calling parameters, and Supported()
+. Prior to calling Start(), the Supported() function for the driver specified
+     by This must have been called with the same calling parameters, and Supported()
      must have returned EFI_SUCCESS.
   @param  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
   @param  ControllerHandle     The handle of the controller to start. This handle
                                must support a protocol interface that supplies
+  @param  ControllerHandle     The handle of the controller to start. This handle
+                               must support a protocol interface that supplies
                                an I/O abstraction to the driver.
   @param  RemainingDevicePath  A pointer to the remaining portion of a device path.
                                This parameter is ignored by device drivers, and is
+  @param  RemainingDevicePath  A pointer to the remaining portion of a device path.
+                               This parameter is ignored by device drivers, and is
                                optional for bus drivers.
   @retval EFI_SUCCESS          The device was started.
   @retval EFI_ALREADY_STARTED  The device could not be started due to a device error.
   @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack
+  @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack
                                of resources.
 …
 /**
   Stop this driver on ControllerHandle.
   The Stop() function is designed to be invoked from the EFI boot service
   DisconnectController(). As a result, much of the error checking on the parameters
   to Stop() has been moved into this common boot service. It is legal to call Stop()
   from other locations, but the following calling restrictions must be followed
+  The Stop() function is designed to be invoked from the EFI boot service
+  DisconnectController(). As a result, much of the error checking on the parameters
+  to Stop() has been moved into this common boot service. It is legal to call Stop()
+  from other locations, but the following calling restrictions must be followed
   or the system behavior will not be deterministic.
 . ControllerHandle must be a valid EFI_HANDLE that was used on a previous call
+. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call
      to this same driver's Start() function.
 . The first NumberOfChildren handles of ChildHandleBuffer must all be a valid
      EFI_HANDLE. In addition, all of these handles must have been created in this
      driver's Start() function, and the Start() function must have called OpenProtocol()
+     EFI_HANDLE. In addition, all of these handles must have been created in this
+     driver's Start() function, and the Start() function must have called OpenProtocol()
      on ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
   @param  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
   @param  ControllerHandle  A handle to the device being stopped. The handle must
                             support a bus specific I/O protocol for the driver
+  @param  ControllerHandle  A handle to the device being stopped. The handle must
+                            support a bus specific I/O protocol for the driver
                             to use to stop the device.
   @param  NumberOfChildren  The number of child device handles in ChildHandleBuffer.
   @param  ChildHandleBuffer An array of child handles to be freed. May be NULL if
+  @param  ChildHandleBuffer An array of child handles to be freed. May be NULL if
                             NumberOfChildren is 0.
 …
   if (NumberOfChildren != 0) {
     List = &TcpServiceData->SocketList;
+    List = &TcpServiceData->SocketList;
     Context.ServiceBinding = ServiceBinding;
     Context.NumberOfChildren = NumberOfChildren;
 …
       gTcpControllerNameTable = NULL;
+    }
     //
     // Release the TCP service data
 …
 /**
   Open Ip4 and device path protocols for a created socket, and insert it in
+  Open Ip4 and device path protocols for a created socket, and insert it in
   socket list.
   @param  This                Pointer to the socket just created
   @param  Context             Context of the socket
   @retval EFI_SUCCESS         This protocol is installed successfully.
   @retval other               Some error occured.
 **/
 EFI_STATUS
 …
 /**
   Close Ip4 and device path protocols for a socket, and remove it from socket list.
+  Close Ip4 and device path protocols for a socket, and remove it from socket list.
   @param  This                Pointer to the socket to be removed
   @param  Context             Context of the socket
 **/
 VOID
 …
 /**
   Creates a child handle and installs a protocol.
   The CreateChild() function installs a protocol on ChildHandle. If ChildHandle
   is a pointer to NULL, then a new handle is created and returned in ChildHandle.
   If ChildHandle is not a pointer to NULL, then the protocol installs on the existing
+  The CreateChild() function installs a protocol on ChildHandle. If ChildHandle
+  is a pointer to NULL, then a new handle is created and returned in ChildHandle.
+  If ChildHandle is not a pointer to NULL, then the protocol installs on the existing
   ChildHandle.
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
   @param  ChildHandle Pointer to the handle of the child to create. If it is NULL, then
                       a new handle is created. If it is a pointer to an existing UEFI
+  @param  ChildHandle Pointer to the handle of the child to create. If it is NULL, then
+                      a new handle is created. If it is a pointer to an existing UEFI
                       handle, then the protocol is added to the existing UEFI handle.
 …
 /**
   Destroys a child handle with a protocol installed on it.
   The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
   that was installed by CreateChild() from ChildHandle. If the removed protocol is the
+  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
+  that was installed by CreateChild() from ChildHandle. If the removed protocol is the
   last protocol on ChildHandle, then ChildHandle is destroyed.
 …
   @retval EFI_SUCCES            The protocol was removed from ChildHandle.
   @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is
+  @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is
                                 being removed.
   @retval EFI_INVALID_PARAMETER Child handle is NULL.
 …
                                 because its services are being used.
   @retval other                 The child handle was not destroyed.
 **/
 EFI_STATUS

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h

-              r58459
+              r58466
   TCP4_DRIVER_SIGNATURE \
+  )
 ///
 /// TCP heartbeat tick timer.
 …
 /**
   Tests to see if this driver supports a given controller.
   If a child device is provided, it further tests to see if this driver supports
+  If a child device is provided, it further tests to see if this driver supports
   creating a handle for the specified child device.
   @param  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
   @param  ControllerHandle     The handle of the controller to test. This handle
                                must support a protocol interface that supplies
+  @param  ControllerHandle     The handle of the controller to test. This handle
+                               must support a protocol interface that supplies
                                an I/O abstraction to the driver.
   @param  RemainingDevicePath  A pointer to the remaining portion of a device path.
+  @param  RemainingDevicePath  A pointer to the remaining portion of a device path.
                                This parameter is ignored by device drivers, and is optional for bus drivers.
   @retval EFI_SUCCESS          The device specified by ControllerHandle and
                                RemainingDevicePath is supported by the driver
+                               RemainingDevicePath is supported by the driver
                                specified by This.
   @retval EFI_ALREADY_STARTED  The device specified by ControllerHandle and
                                RemainingDevicePath is already being managed by
+                               RemainingDevicePath is already being managed by
                                the driver specified by This.
   @retval EFI_ACCESS_DENIED    The device specified by ControllerHandle and
                                RemainingDevicePath is already being managed by a
                                different driver or an application that requires
+                               RemainingDevicePath is already being managed by a
+                               different driver or an application that requires
                                exclusive access.
   @retval EFI_UNSUPPORTED      The device specified by ControllerHandle and
                                RemainingDevicePath is not supported by the driver
+                               RemainingDevicePath is not supported by the driver
                                specified by This.
 **/
 EFI_STATUS
 …
 /**
   Start this driver on ControllerHandle.
   The Start() function is designed to be invoked from the EFI boot service
   ConnectController(). As a result, much of the error checking on the parameters
   to Start() has been moved into this common boot service. It is legal to call
   Start() from other locations, but the following calling restrictions must be
+  Start this driver on ControllerHandle.
+  The Start() function is designed to be invoked from the EFI boot service
+  ConnectController(). As a result, much of the error checking on the parameters
+  to Start() has been moved into this common boot service. It is legal to call
+  Start() from other locations, but the following calling restrictions must be
   followed or the system behavior will not be deterministic.
 . ControllerHandle must be a valid EFI_HANDLE.
 . If RemainingDevicePath is not NULL, then it must be a pointer to a naturally
+. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally
      aligned EFI_DEVICE_PATH_PROTOCOL.
 . Prior to calling Start(), the Supported() function for the driver specified
      by This must have been called with the same calling parameters, and Supported()
+. Prior to calling Start(), the Supported() function for the driver specified
+     by This must have been called with the same calling parameters, and Supported()
      must have returned EFI_SUCCESS.
   @param  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
   @param  ControllerHandle     The handle of the controller to start. This handle
                                must support a protocol interface that supplies
+  @param  ControllerHandle     The handle of the controller to start. This handle
+                               must support a protocol interface that supplies
                                an I/O abstraction to the driver.
   @param  RemainingDevicePath  A pointer to the remaining portion of a device path.
                                This parameter is ignored by device drivers, and is
+  @param  RemainingDevicePath  A pointer to the remaining portion of a device path.
+                               This parameter is ignored by device drivers, and is
                                optional for bus drivers.
   @retval EFI_SUCCESS          The device was started.
   @retval EFI_ALREADY_STARTED  The device could not be started due to a device error.
   @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack
+  @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack
                                of resources.
 …
 /**
   Stop this driver on ControllerHandle.
   The Stop() function is designed to be invoked from the EFI boot service
   DisconnectController(). As a result, much of the error checking on the parameters
   to Stop() has been moved into this common boot service. It is legal to call Stop()
   from other locations, but the following calling restrictions must be followed
+  The Stop() function is designed to be invoked from the EFI boot service
+  DisconnectController(). As a result, much of the error checking on the parameters
+  to Stop() has been moved into this common boot service. It is legal to call Stop()
+  from other locations, but the following calling restrictions must be followed
   or the system behavior will not be deterministic.
 . ControllerHandle must be a valid EFI_HANDLE that was used on a previous call
+. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call
      to this same driver's Start() function.
 . The first NumberOfChildren handles of ChildHandleBuffer must all be a valid
      EFI_HANDLE. In addition, all of these handles must have been created in this
      driver's Start() function, and the Start() function must have called OpenProtocol()
+     EFI_HANDLE. In addition, all of these handles must have been created in this
+     driver's Start() function, and the Start() function must have called OpenProtocol()
      on ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
   @param  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
   @param  ControllerHandle  A handle to the device being stopped. The handle must
                             support a bus specific I/O protocol for the driver
+  @param  ControllerHandle  A handle to the device being stopped. The handle must
+                            support a bus specific I/O protocol for the driver
                             to use to stop the device.
   @param  NumberOfChildren  The number of child device handles in ChildHandleBuffer.
   @param  ChildHandleBuffer An array of child handles to be freed. May be NULL if
+  @param  ChildHandleBuffer An array of child handles to be freed. May be NULL if
                             NumberOfChildren is 0.
 …
 /**
   Open Ip4 and device path protocols for a created socket, and insert it in
+  Open Ip4 and device path protocols for a created socket, and insert it in
   socket list.
   @param  This                Pointer to the socket just created
   @param  Context             Context of the socket
   @retval EFI_SUCCESS         This protocol is installed successfully.
   @retval other               Some error occured.
 **/
 EFI_STATUS
 …
 /**
   Close Ip4 and device path protocols for a socket, and remove it from socket list.
+  Close Ip4 and device path protocols for a socket, and remove it from socket list.
   @param  This                Pointer to the socket to be removed
   @param  Context             Context of the socket
 **/
 VOID
 …
 /**
   Creates a child handle and installs a protocol.
   The CreateChild() function installs a protocol on ChildHandle. If ChildHandle
   is a pointer to NULL, then a new handle is created and returned in ChildHandle.
   If ChildHandle is not a pointer to NULL, then the protocol installs on the existing
+  The CreateChild() function installs a protocol on ChildHandle. If ChildHandle
+  is a pointer to NULL, then a new handle is created and returned in ChildHandle.
+  If ChildHandle is not a pointer to NULL, then the protocol installs on the existing
   ChildHandle.
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
   @param  ChildHandle Pointer to the handle of the child to create. If it is NULL, then
                       a new handle is created. If it is a pointer to an existing UEFI
+  @param  ChildHandle Pointer to the handle of the child to create. If it is NULL, then
+                      a new handle is created. If it is a pointer to an existing UEFI
                       handle, then the protocol is added to the existing UEFI handle.
 …
 /**
   Destroys a child handle with a protocol installed on it.
   The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
   that was installed by CreateChild() from ChildHandle. If the removed protocol is the
+  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
+  that was installed by CreateChild() from ChildHandle. If the removed protocol is the
   last protocol on ChildHandle, then ChildHandle is destroyed.
 …
   @retval EFI_SUCCES            The protocol was removed from ChildHandle.
   @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is
+  @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is
                                 being removed.
   @retval EFI_INVALID_PARAMETER Child handle is NULL.
 …
                                 because its services are being used.
   @retval other                 The child handle was not destroyed.
 **/
 EFI_STATUS

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

r58459	r58466
31	31	# VALID_ARCHITECTURES = IA32 X64 IPF EBC
32	32	#
33		# DRIVER_BINDING = mTcp4DriverBinding
	33	# DRIVER_BINDING = mTcp4DriverBinding
34	34	# COMPONENT_NAME = gTcp4ComponentName
35	35	# COMPONENT_NAME2 = gTcp4ComponentName2

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.c

-              r48674
+              r58466
 /**
   Get the current operational status.
   The GetModeData() function copies the current operational settings of this
   EFI TCPv4 Protocol instance into user-supplied buffers. This function can
   also be used to retrieve the operational setting of underlying drivers
+  The GetModeData() function copies the current operational settings of this
+  EFI TCPv4 Protocol instance into user-supplied buffers. This function can
+  also be used to retrieve the operational setting of underlying drivers
   such as IPv4, MNP, or SNP.
 …
   @param  Tcp4ConfigData           Pointer to the buffer to receive the current TCP
                                    configuration.
   @param  Ip4ModeData              Pointer to the buffer to receive the current IPv4
+  @param  Ip4ModeData              Pointer to the buffer to receive the current IPv4
                                    configuration data used by the TCPv4 instance.
   @param  MnpConfigData            Pointer to the buffer to receive the current MNP
 …
   Initialize or brutally reset the operational parameters for
   this EFI TCPv4 instance.
   The Configure() function does the following:
   * Initialize this EFI TCPv4 instance, i.e., initialize the communication end
+  * Initialize this EFI TCPv4 instance, i.e., initialize the communication end
   setting, specify active open or passive open for an instance.
   * Reset this TCPv4 instance brutally, i.e., cancel all pending asynchronous
   tokens, flush transmission and receiving buffer directly without informing
+  * Reset this TCPv4 instance brutally, i.e., cancel all pending asynchronous
+  tokens, flush transmission and receiving buffer directly without informing
   the communication peer.
   No other TCPv4 Protocol operation can be executed by this instance
   until it is configured properly. For an active TCP4 instance, after a proper
   configuration it may call Connect() to initiates the three-way handshake.
   For a passive TCP4 instance, its state will transit to Tcp4StateListen after
   configuration, and Accept() may be called to listen the incoming TCP connection
   request. If TcpConfigData is set to NULL, the instance is reset. Resetting
   process will be done brutally, the state machine will be set to Tcp4StateClosed
   directly, the receive queue and transmit queue will be flushed, and no traffic is
+  No other TCPv4 Protocol operation can be executed by this instance
+  until it is configured properly. For an active TCP4 instance, after a proper
+  configuration it may call Connect() to initiates the three-way handshake.
+  For a passive TCP4 instance, its state will transit to Tcp4StateListen after
+  configuration, and Accept() may be called to listen the incoming TCP connection
+  request. If TcpConfigData is set to NULL, the instance is reset. Resetting
+  process will be done brutally, the state machine will be set to Tcp4StateClosed
+  directly, the receive queue and transmit queue will be flushed, and no traffic is
   allowed through this instance.
 …
 /**
   Add or delete routing entries.
   The Routes() function adds or deletes a route from the instance's routing table.
   The most specific route is selected by comparing the SubnetAddress with the
+  The most specific route is selected by comparing the SubnetAddress with the
   destination IP address's arithmetical AND to the SubnetMask.
   The default route is added with both SubnetAddress and SubnetMask set to 0.0.0.0.
+  The default route is added with both SubnetAddress and SubnetMask set to 0.0.0.0.
   The default route matches all destination IP addresses if there is no more specific route.
   Direct route is added with GatewayAddress set to 0.0.0.0. Packets are sent to
   the destination host if its address can be found in the Address Resolution Protocol (ARP)
   cache or it is on the local subnet. If the instance is configured to use default
+  Direct route is added with GatewayAddress set to 0.0.0.0. Packets are sent to
+  the destination host if its address can be found in the Address Resolution Protocol (ARP)
+  cache or it is on the local subnet. If the instance is configured to use default
   address, a direct route to the local network will be added automatically.
   Each TCP instance has its own independent routing table. Instance that uses the
   default IP address will have a copy of the EFI_IP4_CONFIG_PROTOCOL's routing table.
   The copy will be updated automatically whenever the IP driver reconfigures its
   instance. As a result, the previous modification to the instance's local copy
   will be lost. The priority of checking the route table is specific with IP
+  Each TCP instance has its own independent routing table. Instance that uses the
+  default IP address will have a copy of the EFI_IP4_CONFIG_PROTOCOL's routing table.
+  The copy will be updated automatically whenever the IP driver reconfigures its
+  instance. As a result, the previous modification to the instance's local copy
+  will be lost. The priority of checking the route table is specific with IP
   implementation and every IP implementation must comply with RFC 1122.
 …
                                    table; if FALSE, add the specified route to
                                    routing table.
                                    DestinationAddress and SubnetMask are used as
+                                   DestinationAddress and SubnetMask are used as
                                    the keywords to search route entry.
   @param  SubnetAddress            The destination network.
   @param  SubnetMask               The subnet mask for the destination network.
   @param  GatewayAddress           The gateway address for this route.
                                    It must be on the same subnet with the station
+  @param  GatewayAddress           The gateway address for this route.
+                                   It must be on the same subnet with the station
                                    address unless a direct route is specified.
   @retval EFI_SUCCESS              The operation completed successfully.
   @retval EFI_NOT_STARTED          The EFI_TCP4_PROTOCOL instance has not been
 …
   Initiate a nonblocking TCP connection request for an active TCP instance.
   The Connect() function will initiate an active open to the remote peer configured
   in current TCP instance if it is configured active. If the connection succeeds
   or fails due to any error, the ConnectionToken->CompletionToken.Event will be
   signaled and ConnectionToken->CompletionToken.Status will be updated accordingly.
   This function can only be called for the TCP instance in Tcp4StateClosed state.
   The instance will transfer into Tcp4StateSynSent if the function returns EFI_SUCCESS.
   If TCP three way handshake succeeds, its state will become Tcp4StateEstablished,
+  The Connect() function will initiate an active open to the remote peer configured
+  in current TCP instance if it is configured active. If the connection succeeds
+  or fails due to any error, the ConnectionToken->CompletionToken.Event will be
+  signaled and ConnectionToken->CompletionToken.Status will be updated accordingly.
+  This function can only be called for the TCP instance in Tcp4StateClosed state.
+  The instance will transfer into Tcp4StateSynSent if the function returns EFI_SUCCESS.
+  If TCP three way handshake succeeds, its state will become Tcp4StateEstablished,
   otherwise, the state will return to Tcp4StateClosed.
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance
   @param  ConnectionToken          Pointer to the connection token to return when
                                    the TCP three way handshake finishes.
   @retval EFI_SUCCESS              The connection request is successfully initiated
                                    and the state of this TCPv4 instance has
+  @retval EFI_SUCCESS              The connection request is successfully initiated
+                                   and the state of this TCPv4 instance has
                                    been changed to Tcp4StateSynSent.
   @retval EFI_NOT_STARTED          This EFI_TCP4_PROTOCOL instance hasn't been
 …
   Listen on the passive instance to accept an incoming connection request.
   The Accept() function initiates an asynchronous accept request to wait for an
   incoming connection on the passive TCP instance. If a remote peer successfully
   establishes a connection with this instance, a new TCP instance will be created
   and its handle will be returned in ListenToken->NewChildHandle. The newly created
   instance is configured by inheriting the passive instance's configuration and is
+  The Accept() function initiates an asynchronous accept request to wait for an
+  incoming connection on the passive TCP instance. If a remote peer successfully
+  establishes a connection with this instance, a new TCP instance will be created
+  and its handle will be returned in ListenToken->NewChildHandle. The newly created
+  instance is configured by inheriting the passive instance's configuration and is
   ready for use upon return. The instance is in the Tcp4StateEstablished state.
   The ListenToken->CompletionToken.Event will be signaled when a new connection
   is accepted, user aborts the listen or connection is reset. This function only
+  The ListenToken->CompletionToken.Event will be signaled when a new connection
+  is accepted, user aborts the listen or connection is reset. This function only
   can be called when current TCP instance is in Tcp4StateListen state.
 …
   Queues outgoing data into the transmit queue.
   The Transmit() function queues a sending request to this TCPv4 instance along
   with the user data. The status of the token is updated and the event in the token
+  The Transmit() function queues a sending request to this TCPv4 instance along
+  with the user data. The status of the token is updated and the event in the token
   will be signaled once the data is sent out or some error occurs.
 …
                                    * A transmit completion token with the same
                                      Token-> CompletionToken.Event was already in the
                                      transmission queue.
                                    * The current instance is in Tcp4StateClosed state
                                    * The current instance is a passive one and
                                      it is in Tcp4StateListen state.
                                    * User has called Close() to disconnect this
+                                     transmission queue.
+                                   * The current instance is in Tcp4StateClosed state
+                                   * The current instance is a passive one and
+                                     it is in Tcp4StateListen state.
+                                   * User has called Close() to disconnect this
                                      connection.
   @retval EFI_NOT_READY            The completion token could not be queued because
 …
   Place an asynchronous receive request into the receiving queue.
   The Receive() function places a completion token into the receive packet queue.
   This function is always asynchronous. The caller must allocate the
   Token->CompletionToken.Event and the FragmentBuffer used to receive data. He also
   must fill the DataLength which represents the whole length of all FragmentBuffer.
   When the receive operation completes, the EFI TCPv4 Protocol driver updates the
   Token->CompletionToken.Status and Token->Packet.RxData fields and the
   Token->CompletionToken.Event is signaled. If got data the data and its length
   will be copy into the FragmentTable, in the same time the full length of received
   data will be recorded in the DataLength fields. Providing a proper notification
   function and context for the event will enable the user to receive the notification
+  The Receive() function places a completion token into the receive packet queue.
+  This function is always asynchronous. The caller must allocate the
+  Token->CompletionToken.Event and the FragmentBuffer used to receive data. He also
+  must fill the DataLength which represents the whole length of all FragmentBuffer.
+  When the receive operation completes, the EFI TCPv4 Protocol driver updates the
+  Token->CompletionToken.Status and Token->Packet.RxData fields and the
+  Token->CompletionToken.Event is signaled. If got data the data and its length
+  will be copy into the FragmentTable, in the same time the full length of received
+  data will be recorded in the DataLength fields. Providing a proper notification
+  function and context for the event will enable the user to receive the notification
   and receiving status. That notification function is guaranteed to not be re-entered.
 …
                                    due to a lack of system resources.
   @retval EFI_DEVICE_ERROR         An unexpected system or network error occurred.
                                    The EFI TCPv4 Protocol instance has been reset
+                                   The EFI TCPv4 Protocol instance has been reset
                                    to startup defaults.
   @retval EFI_ACCESS_DENIED        One or more of the following conditions is TRUE:
                                    * A receive completion token with the same
                                      Token->CompletionToken.Event was already in
                                      the receive queue.
                                    * The current instance is in Tcp4StateClosed state.
                                    * The current instance is a passive one and it
                                      is in Tcp4StateListen state.
                                    * User has called Close() to disconnect this
+                                     Token->CompletionToken.Event was already in
+                                     the receive queue.
+                                   * The current instance is in Tcp4StateClosed state.
+                                   * The current instance is a passive one and it
+                                     is in Tcp4StateListen state.
+                                   * User has called Close() to disconnect this
                                      connection.
   @retval EFI_CONNECTION_FIN       The communication peer has closed the connection
 …
   Disconnecting a TCP connection gracefully or reset a TCP connection.
   Initiate an asynchronous close token to TCP driver. After Close() is called,
   any buffered transmission data will be sent by TCP driver and the current
   instance will have a graceful close working flow described as RFC 793 if
   AbortOnClose is set to FALSE, otherwise, a rest packet will be sent by TCP
   driver to fast disconnect this connection. When the close operation completes
   successfully the TCP instance is in Tcp4StateClosed state, all pending
   asynchronous operation is signaled and any buffers used for TCP network traffic
+  Initiate an asynchronous close token to TCP driver. After Close() is called,
+  any buffered transmission data will be sent by TCP driver and the current
+  instance will have a graceful close working flow described as RFC 793 if
+  AbortOnClose is set to FALSE, otherwise, a rest packet will be sent by TCP
+  driver to fast disconnect this connection. When the close operation completes
+  successfully the TCP instance is in Tcp4StateClosed state, all pending
+  asynchronous operation is signaled and any buffers used for TCP network traffic
   is flushed.
 …
   @retval EFI_NOT_STARTED          The EFI_TCP4_PROTOCOL instance hasn't been
                                    configured.
   @retval EFI_ACCESS_DENIED        One or more of the following are TRUE:
+  @retval EFI_ACCESS_DENIED        One or more of the following are TRUE:
                                    * Configure() has been called with TcpConfigData
                                      set to NULL and this function has not returned.
 …
   Abort an asynchronous connection, listen, transmission or receive request.
   The Cancel() function aborts a pending connection, listen, transmit or receive
   request. If Token is not NULL and the token is in the connection, listen,
   transmission or receive queue when it is being cancelled, its Token->Status
   will be set to EFI_ABORTED and then Token->Event will be signaled. If the token
   is not in one of the queues, which usually means that the asynchronous operation
   has completed, EFI_NOT_FOUND is returned. If Token is NULL all asynchronous token
+  The Cancel() function aborts a pending connection, listen, transmit or receive
+  request. If Token is not NULL and the token is in the connection, listen,
+  transmission or receive queue when it is being cancelled, its Token->Status
+  will be set to EFI_ABORTED and then Token->Event will be signaled. If the token
+  is not in one of the queues, which usually means that the asynchronous operation
+  has completed, EFI_NOT_FOUND is returned. If Token is NULL all asynchronous token
   issued by Connect(), Accept(), Transmit() and Receive()will be aborted.
   NOTE: It has not been implemented currently.
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.
   @param  Token                    Pointer to a token that has been issued by
 …
                                    NULL, all pending tokens issued by above four
                                    functions will be aborted.
   @retval  EFI_SUCCESS             The asynchronous I/O request is aborted and Token->Event
                                    is signaled.
 …
   @retval  EFI_NO_MAPPING          When using the default address, configuration
                                    (DHCP, BOOTP,RARP, etc.) hasn's finished yet.
   @retval  EFI_NOT_FOUND           The asynchronous I/O request isn's found in the
                                    transmission or receive queue. It has either
+  @retval  EFI_NOT_FOUND           The asynchronous I/O request isn's found in the
+                                   transmission or receive queue. It has either
                                    completed or wasn's issued by Transmit() and Receive().
   @retval  EFI_UNSUPPORTED         The operation is not supported in current
                                    implementation.
 **/
 EFI_STATUS
 …
   Poll to receive incoming data and transmit outgoing segments.
   The Poll() function increases the rate that data is moved between the network
   and application and can be called when the TCP instance is created successfully.
   Its use is optional. In some implementations, the periodical timer in the MNP
   driver may not poll the underlying communications device fast enough to avoid
   drop packets. Drivers and applications that are experiencing packet loss should
+  The Poll() function increases the rate that data is moved between the network
+  and application and can be called when the TCP instance is created successfully.
+  Its use is optional. In some implementations, the periodical timer in the MNP
+  driver may not poll the underlying communications device fast enough to avoid
+  drop packets. Drivers and applications that are experiencing packet loss should
   try calling the Poll() function in a high frequency.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.h

-              r58459
+              r58466
   IN VOID                    *Data    OPTIONAL
   );
 ///
 /// TCP mode data
 …
 /**
   Get the current operational status of a TCP instance.
   The GetModeData() function copies the current operational settings of this
   EFI TCPv4 Protocol instance into user-supplied buffers. This function can
   also be used to retrieve the operational setting of underlying drivers
+  The GetModeData() function copies the current operational settings of this
+  EFI TCPv4 Protocol instance into user-supplied buffers. This function can
+  also be used to retrieve the operational setting of underlying drivers
   such as IPv4, MNP, or SNP.
 …
   @param  Tcp4ConfigData           Pointer to the buffer to receive the current TCP
                                    configuration.
   @param  Ip4ModeData              Pointer to the buffer to receive the current IPv4
+  @param  Ip4ModeData              Pointer to the buffer to receive the current IPv4
                                    configuration data used by the TCPv4 instance.
   @param  MnpConfigData            Pointer to the buffer to receive the current MNP
 …
   Initialize or brutally reset the operational parameters for
   this EFI TCPv4 instance.
   The Configure() function does the following:
   * Initialize this EFI TCPv4 instance, i.e., initialize the communication end
+  * Initialize this EFI TCPv4 instance, i.e., initialize the communication end
   setting, specify active open or passive open for an instance.
   * Reset this TCPv4 instance brutally, i.e., cancel all pending asynchronous
   tokens, flush transmission and receiving buffer directly without informing
+  * Reset this TCPv4 instance brutally, i.e., cancel all pending asynchronous
+  tokens, flush transmission and receiving buffer directly without informing
   the communication peer.
   No other TCPv4 Protocol operation can be executed by this instance
   until it is configured properly. For an active TCP4 instance, after a proper
   configuration it may call Connect() to initiates the three-way handshake.
   For a passive TCP4 instance, its state will transit to Tcp4StateListen after
   configuration, and Accept() may be called to listen the incoming TCP connection
   request. If TcpConfigData is set to NULL, the instance is reset. Resetting
   process will be done brutally, the state machine will be set to Tcp4StateClosed
   directly, the receive queue and transmit queue will be flushed, and no traffic is
+  No other TCPv4 Protocol operation can be executed by this instance
+  until it is configured properly. For an active TCP4 instance, after a proper
+  configuration it may call Connect() to initiates the three-way handshake.
+  For a passive TCP4 instance, its state will transit to Tcp4StateListen after
+  configuration, and Accept() may be called to listen the incoming TCP connection
+  request. If TcpConfigData is set to NULL, the instance is reset. Resetting
+  process will be done brutally, the state machine will be set to Tcp4StateClosed
+  directly, the receive queue and transmit queue will be flushed, and no traffic is
   allowed through this instance.
 …
 /**
   Add or delete routing entries.
   The Routes() function adds or deletes a route from the instance's routing table.
   The most specific route is selected by comparing the SubnetAddress with the
+  The most specific route is selected by comparing the SubnetAddress with the
   destination IP address's arithmetical AND to the SubnetMask.
   The default route is added with both SubnetAddress and SubnetMask set to 0.0.0.0.
+  The default route is added with both SubnetAddress and SubnetMask set to 0.0.0.0.
   The default route matches all destination IP addresses if there is no more specific route.
   Direct route is added with GatewayAddress set to 0.0.0.0. Packets are sent to
   the destination host if its address can be found in the Address Resolution Protocol (ARP)
   cache or it is on the local subnet. If the instance is configured to use default
+  Direct route is added with GatewayAddress set to 0.0.0.0. Packets are sent to
+  the destination host if its address can be found in the Address Resolution Protocol (ARP)
+  cache or it is on the local subnet. If the instance is configured to use default
   address, a direct route to the local network will be added automatically.
   Each TCP instance has its own independent routing table. Instance that uses the
   default IP address will have a copy of the EFI_IP4_CONFIG_PROTOCOL's routing table.
   The copy will be updated automatically whenever the IP driver reconfigures its
   instance. As a result, the previous modification to the instance's local copy
   will be lost. The priority of checking the route table is specific with IP
+  Each TCP instance has its own independent routing table. Instance that uses the
+  default IP address will have a copy of the EFI_IP4_CONFIG_PROTOCOL's routing table.
+  The copy will be updated automatically whenever the IP driver reconfigures its
+  instance. As a result, the previous modification to the instance's local copy
+  will be lost. The priority of checking the route table is specific with IP
   implementation and every IP implementation must comply with RFC 1122.
 …
                                    table; if FALSE, add the specified route to
                                    routing table.
                                    DestinationAddress and SubnetMask are used as
+                                   DestinationAddress and SubnetMask are used as
                                    the keywords to search route entry.
   @param  SubnetAddress            The destination network.
   @param  SubnetMask               The subnet mask for the destination network.
   @param  GatewayAddress           The gateway address for this route.
                                    It must be on the same subnet with the station
+  @param  GatewayAddress           The gateway address for this route.
+                                   It must be on the same subnet with the station
                                    address unless a direct route is specified.
   @retval EFI_SUCCESS              The operation completed successfully.
   @retval EFI_NOT_STARTED          The EFI_TCP4_PROTOCOL instance has not been
 …
   Initiate a nonblocking TCP connection request for an active TCP instance.
   The Connect() function will initiate an active open to the remote peer configured
   in current TCP instance if it is configured active. If the connection succeeds
   or fails due to any error, the ConnectionToken->CompletionToken.Event will be
   signaled and ConnectionToken->CompletionToken.Status will be updated accordingly.
   This function can only be called for the TCP instance in Tcp4StateClosed state.
   The instance will transfer into Tcp4StateSynSent if the function returns EFI_SUCCESS.
   If TCP three way handshake succeeds, its state will become Tcp4StateEstablished,
+  The Connect() function will initiate an active open to the remote peer configured
+  in current TCP instance if it is configured active. If the connection succeeds
+  or fails due to any error, the ConnectionToken->CompletionToken.Event will be
+  signaled and ConnectionToken->CompletionToken.Status will be updated accordingly.
+  This function can only be called for the TCP instance in Tcp4StateClosed state.
+  The instance will transfer into Tcp4StateSynSent if the function returns EFI_SUCCESS.
+  If TCP three way handshake succeeds, its state will become Tcp4StateEstablished,
   otherwise, the state will return to Tcp4StateClosed.
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance
   @param  ConnectionToken          Pointer to the connection token to return when
                                    the TCP three way handshake finishes.
   @retval EFI_SUCCESS              The connection request is successfully initiated
                                    and the state of this TCPv4 instance has
+  @retval EFI_SUCCESS              The connection request is successfully initiated
+                                   and the state of this TCPv4 instance has
                                    been changed to Tcp4StateSynSent.
   @retval EFI_NOT_STARTED          This EFI_TCP4_PROTOCOL instance hasn't been
 …
   Listen on the passive instance to accept an incoming connection request.
   The Accept() function initiates an asynchronous accept request to wait for an
   incoming connection on the passive TCP instance. If a remote peer successfully
   establishes a connection with this instance, a new TCP instance will be created
   and its handle will be returned in ListenToken->NewChildHandle. The newly created
   instance is configured by inheriting the passive instance's configuration and is
+  The Accept() function initiates an asynchronous accept request to wait for an
+  incoming connection on the passive TCP instance. If a remote peer successfully
+  establishes a connection with this instance, a new TCP instance will be created
+  and its handle will be returned in ListenToken->NewChildHandle. The newly created
+  instance is configured by inheriting the passive instance's configuration and is
   ready for use upon return. The instance is in the Tcp4StateEstablished state.
   The ListenToken->CompletionToken.Event will be signaled when a new connection
   is accepted, user aborts the listen or connection is reset. This function only
+  The ListenToken->CompletionToken.Event will be signaled when a new connection
+  is accepted, user aborts the listen or connection is reset. This function only
   can be called when current TCP instance is in Tcp4StateListen state.
 …
   Queues outgoing data into the transmit queue.
   The Transmit() function queues a sending request to this TCPv4 instance along
   with the user data. The status of the token is updated and the event in the token
+  The Transmit() function queues a sending request to this TCPv4 instance along
+  with the user data. The status of the token is updated and the event in the token
   will be signaled once the data is sent out or some error occurs.
 …
                                    * A transmit completion token with the same
                                      Token-> CompletionToken.Event was already in the
                                      transmission queue.
                                    * The current instance is in Tcp4StateClosed state
                                    * The current instance is a passive one and
                                      it is in Tcp4StateListen state.
                                    * User has called Close() to disconnect this
+                                     transmission queue.
+                                   * The current instance is in Tcp4StateClosed state
+                                   * The current instance is a passive one and
+                                     it is in Tcp4StateListen state.
+                                   * User has called Close() to disconnect this
                                      connection.
   @retval EFI_NOT_READY            The completion token could not be queued because
 …
   Place an asynchronous receive request into the receiving queue.
   The Receive() function places a completion token into the receive packet queue.
   This function is always asynchronous. The caller must allocate the
   Token->CompletionToken.Event and the FragmentBuffer used to receive data. He also
   must fill the DataLength which represents the whole length of all FragmentBuffer.
   When the receive operation completes, the EFI TCPv4 Protocol driver updates the
   Token->CompletionToken.Status and Token->Packet.RxData fields and the
   Token->CompletionToken.Event is signaled. If got data the data and its length
   will be copy into the FragmentTable, in the same time the full length of received
   data will be recorded in the DataLength fields. Providing a proper notification
   function and context for the event will enable the user to receive the notification
+  The Receive() function places a completion token into the receive packet queue.
+  This function is always asynchronous. The caller must allocate the
+  Token->CompletionToken.Event and the FragmentBuffer used to receive data. He also
+  must fill the DataLength which represents the whole length of all FragmentBuffer.
+  When the receive operation completes, the EFI TCPv4 Protocol driver updates the
+  Token->CompletionToken.Status and Token->Packet.RxData fields and the
+  Token->CompletionToken.Event is signaled. If got data the data and its length
+  will be copy into the FragmentTable, in the same time the full length of received
+  data will be recorded in the DataLength fields. Providing a proper notification
+  function and context for the event will enable the user to receive the notification
   and receiving status. That notification function is guaranteed to not be re-entered.
 …
                                    due to a lack of system resources.
   @retval EFI_DEVICE_ERROR         An unexpected system or network error occurred.
                                    The EFI TCPv4 Protocol instance has been reset
+                                   The EFI TCPv4 Protocol instance has been reset
                                    to startup defaults.
   @retval EFI_ACCESS_DENIED        One or more of the following conditions is TRUE:
                                    * A receive completion token with the same
                                      Token->CompletionToken.Event was already in
                                      the receive queue.
                                    * The current instance is in Tcp4StateClosed state.
                                    * The current instance is a passive one and it
                                      is in Tcp4StateListen state.
                                    * User has called Close() to disconnect this
+                                     Token->CompletionToken.Event was already in
+                                     the receive queue.
+                                   * The current instance is in Tcp4StateClosed state.
+                                   * The current instance is a passive one and it
+                                     is in Tcp4StateListen state.
+                                   * User has called Close() to disconnect this
                                      connection.
   @retval EFI_CONNECTION_FIN       The communication peer has closed the connection
 …
   Disconnecting a TCP connection gracefully or reset a TCP connection.
   Initiate an asynchronous close token to TCP driver. After Close() is called,
   any buffered transmission data will be sent by TCP driver and the current
   instance will have a graceful close working flow described as RFC 793 if
   AbortOnClose is set to FALSE, otherwise, a rest packet will be sent by TCP
   driver to fast disconnect this connection. When the close operation completes
   successfully the TCP instance is in Tcp4StateClosed state, all pending
   asynchronous operation is signaled and any buffers used for TCP network traffic
+  Initiate an asynchronous close token to TCP driver. After Close() is called,
+  any buffered transmission data will be sent by TCP driver and the current
+  instance will have a graceful close working flow described as RFC 793 if
+  AbortOnClose is set to FALSE, otherwise, a rest packet will be sent by TCP
+  driver to fast disconnect this connection. When the close operation completes
+  successfully the TCP instance is in Tcp4StateClosed state, all pending
+  asynchronous operation is signaled and any buffers used for TCP network traffic
   is flushed.
 …
   @retval EFI_NOT_STARTED          The EFI_TCP4_PROTOCOL instance hasn't been
                                    configured.
   @retval EFI_ACCESS_DENIED        One or more of the following are TRUE:
+  @retval EFI_ACCESS_DENIED        One or more of the following are TRUE:
                                    * Configure() has been called with TcpConfigData
                                      set to NULL and this function has not returned.
 …
   Abort an asynchronous connection, listen, transmission or receive request.
   The Cancel() function aborts a pending connection, listen, transmit or receive
   request. If Token is not NULL and the token is in the connection, listen,
   transmission or receive queue when it is being cancelled, its Token->Status
   will be set to EFI_ABORTED and then Token->Event will be signaled. If the token
   is not in one of the queues, which usually means that the asynchronous operation
   has completed, EFI_NOT_FOUND is returned. If Token is NULL all asynchronous token
+  The Cancel() function aborts a pending connection, listen, transmit or receive
+  request. If Token is not NULL and the token is in the connection, listen,
+  transmission or receive queue when it is being cancelled, its Token->Status
+  will be set to EFI_ABORTED and then Token->Event will be signaled. If the token
+  is not in one of the queues, which usually means that the asynchronous operation
+  has completed, EFI_NOT_FOUND is returned. If Token is NULL all asynchronous token
   issued by Connect(), Accept(), Transmit() and Receive()will be aborted.
   NOTE: It has not been implemented currently.
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.
   @param  Token                    Pointer to a token that has been issued by
 …
                                    NULL, all pending tokens issued by above four
                                    functions will be aborted.
   @retval  EFI_SUCCESS             The asynchronous I/O request is aborted and Token->Event
                                    is signaled.
 …
   @retval  EFI_NO_MAPPING          When using the default address, configuration
                                    (DHCP, BOOTP,RARP, etc.) hasn's finished yet.
   @retval  EFI_NOT_FOUND           The asynchronous I/O request isn's found in the
                                    transmission or receive queue. It has either
+  @retval  EFI_NOT_FOUND           The asynchronous I/O request isn's found in the
+                                   transmission or receive queue. It has either
                                    completed or wasn's issued by Transmit() and Receive().
   @retval  EFI_UNSUPPORTED         The operation is not supported in current
                                    implementation.
 **/
 EFI_STATUS
 …
   Poll to receive incoming data and transmit outgoing segments.
   The Poll() function increases the rate that data is moved between the network
   and application and can be called when the TCP instance is created successfully.
   Its use is optional. In some implementations, the periodical timer in the MNP
   driver may not poll the underlying communications device fast enough to avoid
   drop packets. Drivers and applications that are experiencing packet loss should
+  The Poll() function increases the rate that data is moved between the network
+  and application and can be called when the TCP instance is created successfully.
+  Its use is optional. In some implementations, the periodical timer in the MNP
+  driver may not poll the underlying communications device fast enough to avoid
+  drop packets. Drivers and applications that are experiencing packet loss should
   try calling the Poll() function in a high frequency.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c

-              r48674
+              r58466
 /** @file
   Routines to process TCP option.
 Copyright (c) 2005 - 2006, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
 /**
     Get a UINT16 value from buffer.
     @param Buf                  Pointer to input buffer.
     @return                     The UINT16 value get from buffer.
 …
 /**
     Get a UINT32 value from buffer.
     @param Buf                  Pointer to input buffer.
     @return                     The UINT32 value get from buffer.
 …
 /**
     Put a UINT32 value in buffer.
     @param Buf                  Pointer to the buffer.
     @param Data                 The UINT32 Date to put in buffer
+    @param Data                 The UINT32 Date to put in buffer
 **/

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.h

r48674	r58466
1	1	/** @file
2	2	Tcp option's routine header file.
3
	3
4	4	Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>
5	5	This program and the accompanying materials

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c

-              r48674
+              r58466
 /** @file
   TCP output process routines.
 Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
   // FIN is set.
   //
   if ((Len == 0) &&
+  if ((Len == 0) &&
       ((Flag & (TCP_FLG_SYN | TCP_FLG_FIN)) == 0)) {
     return Sent;
 …
       DEBUG (
                 (EFI_D_INFO,
+                (EFI_D_INFO,
                 "TcpToSendData: send FIN "
         "to peer for TCB %p in state %s\n",
         Tcb,
+        "to peer for TCB %p in state %s\n",
+        Tcb,
         mTcpStateName[Tcb->State])
       );

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h

-              r48674
+              r58466
 #define TCP_FLG_ACK      0x10
 #define TCP_FLG_URG      0x20
  //
  // mask for all the flags
  //
 #define TCP_FLG_FLAG     0x3F
+#define TCP_FLG_FLAG     0x3F

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c

-              r48674
+              r58466
 /** @file
   TCP timer related functions.
 Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
   IN OUT TCP_CB *Tcb
   );
 /**
   Timeout handler for window probe timer.
 …
 /**
   Update the timer status and the next expire time according to the timers
+  Update the timer status and the next expire time according to the timers
   to expire in a specific future time slot.
 …
+      }
+    }
     //
     // If the Tcb still exist or some timer is set, update the timer

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c

-              r58459
+              r58466
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE *gUdpControllerNameTable = NULL;
 /**
   Retrieves a Unicode string that is the user readable name of the driver.
 …
   @param  Udp4[in]                   A pointer to the EFI_UDP4_PROTOCOL.
   @retval EFI_SUCCESS                Update the ControllerNameTable of this instance successfully.
   @retval EFI_INVALID_PARAMETER      The input parameter is invalid.
 **/
 EFI_STATUS
 …
     gUdpControllerNameTable = NULL;
+  }
   Status = AddUnicodeString2 (
              "eng",
 …
     return Status;
+  }
   return AddUnicodeString2 (
            "en",
 …
     return EFI_UNSUPPORTED;
+  }
   //
   // Make sure this driver produced ChildHandle

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c

-              r58459
+              r58466
 /**
   Callback function which provided by user to remove one node in NetDestroyLinkList process.
   @param[in]    Entry           The entry to be removed.
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
 …
   must follow these calling restrictions. If any other agent wishes
   to call Stop() it must also follow these calling restrictions.
   @param[in]  This              Protocol instance pointer.
   @param[in]  ControllerHandle  Handle of device to stop driver on
 …
            NULL
            );
     Udp4CleanService (Udp4Service);
 …
 /**
   Creates a child handle and installs a protocol.
   The CreateChild() function installs a protocol on ChildHandle.
   If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.
+  The CreateChild() function installs a protocol on ChildHandle.
+  If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.
   If ChildHandle is not a pointer to NULL, then the protocol installs on the existing ChildHandle.
   @param[in] This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
   @param[in] ChildHandle Pointer to the handle of the child to create. If it is NULL,
                          then a new handle is created. If it is a pointer to an existing UEFI handle,
+                         then a new handle is created. If it is a pointer to an existing UEFI handle,
                          then the protocol is added to the existing UEFI handle.
 …
 /**
   Destroys a child handle with a protocol installed on it.
   The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
   that was installed by CreateChild() from ChildHandle. If the removed protocol is the
+  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
+  that was installed by CreateChild() from ChildHandle. If the removed protocol is the
   last protocol on ChildHandle, then ChildHandle is destroyed.
 …
          gUdp4DriverBinding.DriverBindingHandle,
          Instance->ChildHandle
          );
+         );
   //
 …
   the same for UEFI Applications, UEFI OS Loaders, and UEFI Drivers including
   both device drivers and bus drivers.
   The entry point for Udp4 driver which installs the driver binding
   and component name protocol on its ImageHandle.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.h

-              r48674
+              r58466
   must follow these calling restrictions. If any other agent wishes
   to call Stop() it must also follow these calling restrictions.
   @param[in]  This              Protocol instance pointer.
   @param[in]  ControllerHandle  Handle of device to stop driver on
 …
 /**
   Creates a child handle and installs a protocol.
   The CreateChild() function installs a protocol on ChildHandle.
   If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.
+  The CreateChild() function installs a protocol on ChildHandle.
+  If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.
   If ChildHandle is not a pointer to NULL, then the protocol installs on the existing ChildHandle.
   @param[in] This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
   @param[in] ChildHandle Pointer to the handle of the child to create. If it is NULL,
                          then a new handle is created. If it is a pointer to an existing UEFI handle,
+                         then a new handle is created. If it is a pointer to an existing UEFI handle,
                          then the protocol is added to the existing UEFI handle.
 …
 /**
   Destroys a child handle with a protocol installed on it.
   The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
   that was installed by CreateChild() from ChildHandle. If the removed protocol is the
+  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
+  that was installed by CreateChild() from ChildHandle. If the removed protocol is the
   last protocol on ChildHandle, then ChildHandle is destroyed.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

r58459	r58466
31	31	# VALID_ARCHITECTURES = IA32 X64 IPF EBC
32	32	#
33		# DRIVER_BINDING = gUdp4DriverBinding
	33	# DRIVER_BINDING = gUdp4DriverBinding
34	34	# COMPONENT_NAME = gUdp4ComponentName
35	35	# COMPONENT_NAME2 = gUdp4ComponentName2

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c

r58459	r58466
1	1	/** @file
2	2	The implementation of the Udp4 protocol.
3
	3
4	4	Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
5	5	This program and the accompanying materials

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h

-              r58459
+              r58466
 /** @file
   EFI UDPv4 protocol implementation.
 Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
   Initializes, changes, or resets the operational parameters for this instance of the EFI UDPv4
   Protocol.
   The Configure() function is used to do the following:
   * Initialize and start this instance of the EFI UDPv4 Protocol.
 …
                                 EFI UDPv4 Protocol instance.
   @retval EFI_DEVICE_ERROR      An unexpected network or system error occurred and this instance
                                  was not opened.
+                                 was not opened.
 **/
 …
 /**
   Joins and leaves multicast groups.
   The Groups() function is used to enable and disable the multicast group
   filtering. If the JoinFlag is FALSE and the MulticastAddress is NULL, then all
 …
 /**
   Adds and deletes routing table entries.
   The Routes() function adds a route to or deletes a route from the routing table.
   Routes are determined by comparing the SubnetAddress with the destination IP
 …
 /**
   Queues outgoing data packets into the transmit queue.
   The Transmit() function places a sending request to this instance of the EFI
   UDPv4 Protocol, alongside the transmit data that was filled by the user. Whenever
 …
 /**
   Places an asynchronous receive request into the receiving queue.
   The Receive() function places a completion token into the receive packet queue.
   This function is always asynchronous.
 …
 /**
   Aborts an asynchronous transmit or receive request.
   The Cancel() function is used to abort a pending transmit or receive request.
   If the token is in the transmit or receive request queues, after calling this
 …
 /**
   Polls for incoming data packets and processes outgoing data packets.
   The Poll() function can be used by network drivers and applications to increase
   the rate that data packets are moved between the communications device and the
 …
   VOID  *Context
   );
 #endif

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c

-              r58459
+              r58466
   Initializes, changes, or resets the operational parameters for this instance of the EFI UDPv4
   Protocol.
   The Configure() function is used to do the following:
   * Initialize and start this instance of the EFI UDPv4 Protocol.
 …
                                 EFI UDPv4 Protocol instance.
   @retval EFI_DEVICE_ERROR      An unexpected network or system error occurred and this instance
                                  was not opened.
+                                 was not opened.
 **/
 …
     ASSERT (IsListEmpty (&Instance->DeliveredDgramQue));
+  }
 ON_EXIT:
 …
 /**
   Joins and leaves multicast groups.
   The Groups() function is used to enable and disable the multicast group
   filtering. If the JoinFlag is FALSE and the MulticastAddress is NULL, then all
 …
 /**
   Adds and deletes routing table entries.
   The Routes() function adds a route to or deletes a route from the routing table.
   Routes are determined by comparing the SubnetAddress with the destination IP
 …
 /**
   Queues outgoing data packets into the transmit queue.
   The Transmit() function places a sending request to this instance of the EFI
   UDPv4 Protocol, alongside the transmit data that was filled by the user. Whenever
 …
 /**
   Places an asynchronous receive request into the receiving queue.
   The Receive() function places a completion token into the receive packet queue.
   This function is always asynchronous.
 …
 /**
   Aborts an asynchronous transmit or receive request.
   The Cancel() function is used to abort a pending transmit or receive request.
   If the token is in the transmit or receive request queues, after calling this
 …
 /**
   Polls for incoming data packets and processes outgoing data packets.
   The Poll() function can be used by network drivers and applications to increase
   the rate that data packets are moved between the communications device and the

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/UefiPxeBcDxe/ComponentName.c

r58459	r58466
317	317	EFI_HANDLE NicHandle;
318	318	EFI_STATUS Status;
319
	319
320	320	if (ControllerHandle == NULL \|\| ChildHandle != NULL) {
321	321	return EFI_UNSUPPORTED;

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c

-              r58459
+              r58466
+  }
   //
   // Second, Check if bootfilename and serverhostname is overloaded to carry DHCP options refers to rfc-2132.
+  // Second, Check if bootfilename and serverhostname is overloaded to carry DHCP options refers to rfc-2132.
   // If yes, try to parse options from the BootFileName field, then ServerName field.
   //
 …
   if (Options[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] != NULL) {
     //
     // RFC 2132, Section 9.5 does not strictly state Bootfile name (option 67) is null
+    // RFC 2132, Section 9.5 does not strictly state Bootfile name (option 67) is null
     // terminated string. So force to append null terminated character at the end of string.
     //
 …
   VendorOpt = &Packet->PxeVendorOption;
   //
   // According to the PXE specification 2.1, Table 2-1 PXE DHCP Options  (Full
   // List), we must not consider a boot prompt or boot menu if all of the
+  // According to the PXE specification 2.1, Table 2-1 PXE DHCP Options  (Full
+  // List), we must not consider a boot prompt or boot menu if all of the
   // following hold:
   // - the PXE_DISCOVERY_CONTROL PXE tag is present inside the Vendor Options
   //   (=43) DHCP tag, and
   // - the PXE_DISCOVERY_CONTROL PXE tag has bit 3 set, and
+  // - the PXE_DISCOVERY_CONTROL PXE tag has bit 3 set, and
   // - a boot file name has been presented with DHCP option 67.
   //

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h

-              r58459
+              r58466
   This function will pad each item of dhcp4 message packet.
   @param  Seed    Pointer to the message instance of the DHCP4 packet.
   @param  Udp4    Pointer to the EFI_UDP4_PROTOCOL instance.
 …
 /**
   Callback routine.
   EFI_DHCP4_CALLBACK is provided by the consumer of the EFI DHCPv4 Protocol driver
   to intercept events that occurred in the configuration process. This structure
 …
   @param  Layer                 PxeBc option boot item layer
   @param  UseBis                Use BIS or not
   @param  DestIp                Ip address for server
   @param  IpCount               The total count of the server ip address
+  @param  DestIp                Ip address for server
+  @param  IpCount               The total count of the server ip address
   @param  SrvList               Server list
   @param  IsDiscv               Discover the vendor or not
 …
   @retval EFI_OUT_OF_RESOURCES  Allocate memory pool failed.
   @retval EFI_NOT_FOUND         There is no vendor option exists.
   @retval EFI_TIMEOUT           Send Pxe Discover time out.
+  @retval EFI_TIMEOUT           Send Pxe Discover time out.
 **/
 EFI_STATUS
 …
   @param  Private          Pointer to PxeBc private data.
   @param  OptList          Pointer to a DHCP option list.
   @param  IsDhcpDiscover   Discover dhcp option or not.
+  @param  IsDhcpDiscover   Discover dhcp option or not.
   @return The index item number of the option list.
 …
   @param  OptList    Pointer to the list of the options
   @param  Type       the type of option
   @param  Layer      the layer of the boot options
+  @param  Layer      the layer of the boot options
   @param  OptLen     length of opotion
 …
   @param  OptTag     The option OpCode.
   @return NULL if the buffer length is 0 and OpCode is not
+  @return NULL if the buffer length is 0 and OpCode is not
           PXEBC_DHCP4_TAG_EOP, or the pointer to the buffer.
 …
   @retval EFI_SUCCESS          Select boot prompt done.
   @retval EFI_TIMEOUT          Select boot prompt time out.
+  @retval EFI_TIMEOUT          Select boot prompt time out.
   @retval EFI_NOT_FOUND        The proxy offer is not Pxe10.
   @retval EFI_ABORTED          User cancel the operation.
   @retval EFI_NOT_READY        Read the input key from the keybroad has not finish.
 **/
 EFI_STATUS
 …
   @param  Type            The type of the menu.
   @param  UseDefaultItem  Use default item or not.
   @retval EFI_ABORTED     User cancel operation.
   @retval EFI_SUCCESS     Select the boot menu success.
   @retval EFI_NOT_READY   Read the input key from the keybroad has not finish.
+  @retval EFI_NOT_READY   Read the input key from the keybroad has not finish.
 **/

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.h

-              r48674
+              r58466
   restrictions for this service. ConnectController() must
   follow these calling restrictions. If any other agent wishes to call
   Supported() it must also follow these calling restrictions.
+  Supported() it must also follow these calling restrictions.
   PxeBc requires DHCP4 and MTFTP4 protocols.
 …
   IN EFI_DEVICE_PATH_PROTOCOL     * RemainingDevicePath OPTIONAL
   );
 /**
   Start this driver on ControllerHandle. This service is called by the
 …
   IN EFI_DEVICE_PATH_PROTOCOL     * RemainingDevicePath OPTIONAL
   );
 /**
   Stop this driver on ControllerHandle. This service is called by the
 …
   must follow these calling restrictions. If any other agent wishes
   to call Stop() it must also follow these calling restrictions.
   @param  This              Protocol instance pointer.
   @param  ControllerHandle  Handle of device to stop driver on
 …
   IN EFI_HANDLE                   *ChildHandleBuffer
   );
 extern EFI_COMPONENT_NAME2_PROTOCOL gPxeBcComponentName2;
 extern EFI_COMPONENT_NAME_PROTOCOL  gPxeBcComponentName;

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c

-              r58459
+              r58466
   //
   // Configure block size for TFTP as a default value to handle all link layers.
   //
   Private->BlockSize   = (UINTN) (MIN (Private->Ip4MaxPacketSize, PXEBC_DEFAULT_PACKET_SIZE) -
+  //
+  Private->BlockSize   = (UINTN) (MIN (Private->Ip4MaxPacketSize, PXEBC_DEFAULT_PACKET_SIZE) -
                            PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE);
   //
 …
     Private->BlockSize   = (UINTN) PcdGet64 (PcdTftpBlockSize);
+  }
   Private->AddressIsOk = FALSE;
 …
       CopyMem (&Private->Ip4ConfigData.StationAddress, &Private->StationIp, sizeof (EFI_IPv4_ADDRESS));
       CopyMem (&Private->Ip4ConfigData.SubnetMask, &Private->SubnetMask, sizeof (EFI_IPv4_ADDRESS));
       //
       // Reconfigure the Ip4 instance to capture background ICMP packets with new station Ip address.
 …
       Private->Ip4->Cancel (Private->Ip4, &Private->IcmpErrorRcvToken);
       Private->Ip4->Configure (Private->Ip4, NULL);
       Status = Private->Ip4->Configure (Private->Ip4, &Private->Ip4ConfigData);
       if (EFI_ERROR (Status)) {
         goto ON_EXIT;
+      }
       Status = Private->Ip4->Receive (Private->Ip4, &Private->IcmpErrorRcvToken);
       if (EFI_ERROR (Status)) {
         goto ON_EXIT;
+      }
+      }
+    }
+  }
 …
   //
   // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP
+  // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP
   // receive filter list emptied and the filter set to EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP.
   //
 …
   IpFilter.Filters = EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP;
   This->SetIpFilter (This, &IpFilter);
   return Status;
+}
 …
       Status = EFI_INVALID_PARAMETER;
       goto ON_EXIT;
+      goto ON_EXIT;
+    }
 …
       //
       Status = EFI_INVALID_PARAMETER;
       goto ON_EXIT;
+      goto ON_EXIT;
+    }
 …
           Status = EFI_OUT_OF_RESOURCES;
           goto ON_EXIT;
+        }
+        }
         CopyMem (CreatedInfo, &DefaultInfo, sizeof (DefaultInfo));
         Info    = CreatedInfo;
 …
       if (Index != Info->IpCnt) {
         Status = EFI_INVALID_PARAMETER;
         goto ON_EXIT;
+        goto ON_EXIT;
+      }
+    }
 …
       if (!EFI_ERROR (Status)) {
         break;
+      }
+      }
+    }
 …
   Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);
   //
   // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP
+  //
+  // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP
   // receive filter list emptied and the filter set to EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP.
   //
 …
   IpFilter.Filters = EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP;
   This->SetIpFilter (This, &IpFilter);
   return Status;
+}
 …
   Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);
   //
   // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP
+  // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP
   // receive filter list emptied and the filter set to EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP.
   //
 …
     return EFI_INVALID_PARAMETER;
+  }
   ZeroMem (&Token, sizeof (EFI_UDP4_COMPLETION_TOKEN));
   ZeroMem (&Udp4Session, sizeof (EFI_UDP4_SESSION_DATA));
 …
+    }
+  }
   //
   // Check whether we need reconfigure the UDP instance.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c

-              r58459
+              r58466
 /** @file
   PxeBc MTFTP functions.
 Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
   This is a callback function when packets received/transmitted in Mtftp driver.
   A callback function that is provided by the caller to intercept
+  A callback function that is provided by the caller to intercept
   the EFI_MTFTP4_OPCODE_DATA or EFI_MTFTP4_OPCODE_DATA8 packets processed in the
   EFI_MTFTP4_PROTOCOL.ReadFile() function, and alternatively to intercept
   EFI_MTFTP4_OPCODE_OACK or EFI_MTFTP4_OPCODE_ERROR packets during a call to
+  EFI_MTFTP4_PROTOCOL.ReadFile() function, and alternatively to intercept
+  EFI_MTFTP4_OPCODE_OACK or EFI_MTFTP4_OPCODE_ERROR packets during a call to
   EFI_MTFTP4_PROTOCOL.ReadFile(), WriteFile() or ReadDirectory().
   @param  This           Pointer to Mtftp protocol instance
   @param  Token          Pointer to Mtftp token
 …
   @retval EFI_SUCCESS    Operation sucess
   @retval EFI_ABORTED    Abort transfer process
+  @retval EFI_ABORTED    Abort transfer process
 **/
 …
 /**
   This function is to get size of a file by Tftp.
   @param  Private        Pointer to PxeBc private data
   @param  Config         Pointer to Mtftp configuration data
 …
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.
   @retval Other              Has not get the size of the file.
 **/
 EFI_STATUS
 …
       Private->Mode.TftpError.ErrorCode = (UINT8) Packet->Error.ErrorCode;
       AsciiStrnCpy (
         Private->Mode.TftpError.ErrorString,
         (CHAR8 *) Packet->Error.ErrorMessage,
+        Private->Mode.TftpError.ErrorString,
+        (CHAR8 *) Packet->Error.ErrorMessage,
         PXE_MTFTP_ERROR_STRING_LENGTH
         );
 …
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.
   @retval other              Read data from file failed.
 **/
 EFI_STATUS
 …
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.
   @retval other              Write data into file failed.
 **/
 EFI_STATUS
 …
   @param  DontUseBuffer  Indicate whether with a receive buffer.
   @retval EFI_SUCCES         Get the data from the file included in directory success.
+  @retval EFI_SUCCES         Get the data from the file included in directory success.
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.
   @retval other              Operation failed.
 **/
 EFI_STATUS

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h

-              r58459
+              r58466
 /** @file
   Mtftp routines for PxeBc.
 Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 …
 /**
   This function is to get size of a file by Tftp.
   @param  Private        Pointer to PxeBc private data
   @param  Config         Pointer to Mtftp configuration data
 …
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.
   @retval Other              Has not get the size of the file.
 **/
 EFI_STATUS
 …
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.
   @retval other              Read data from file failed.
 **/
 EFI_STATUS
 …
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.
   @retval other              Write data into file failed.
 **/
 EFI_STATUS
 …
   @param  DontUseBuffer  Indicate whether with a receive buffer.
   @retval EFI_SUCCES         Get the data from the file included in directory success.
+  @retval EFI_SUCCES         Get the data from the file included in directory success.
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.
   @retval other              Operation failed.
 **/
 EFI_STATUS

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h

-              r48674
+              r58466
 /**
   The common notify function associated with various PxeBc events.
+  The common notify function associated with various PxeBc events.
   @param  Event     The event signaled.
 …
 /**
   This function initialize(or configure) the Udp4Write instance.
   @param  Udp4       Pointer to the EFI_UDP4_PROTOCOL instance.
   @param  StationIp  Pointer to the station ip address.
 …
   @param  Gateway    Pointer to the gateway ip address.
   @param  SrcPort    Pointer to the srouce port of the station.
   @retval EFI_SUCCESS           The configuration settings were set, changed, or reset successfully.
   @retval EFI_NO_MAPPING        When using a default address, configuration (DHCP, BOOTP,
 …
                                 was not opened.
   @retval Others                Please examine the function Udp4->Routes(Udp4, FALSE, &mZeroIp4Addr, &mZeroIp4Addr, Gateway) returns.
 **/
 EFI_STATUS

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

-              r58459
+              r58466
 #  VALID_ARCHITECTURES           = IA32 X64 IPF
+#
 #  DRIVER_BINDING                =  gPxeBcDriverBinding
+#  DRIVER_BINDING                =  gPxeBcDriverBinding
 #  COMPONENT_NAME                =  gPxeBcComponentName
 #  COMPONENT_NAME2               =  gPxeBcComponentName2
 …
   PxeBcMtftp.h
   PxeBcDriver.h
 [Packages]
 …
   gEfiIp4ProtocolGuid                              ## TO_START
 [Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize  ## SOMETIMES_CONSUMES
+[Pcd]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize  ## SOMETIMES_CONSUMES
 [UserExtensions.TianoCore."ExtraFiles"]

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfig.vfr

Property svn:eol-style set to native

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDriver.c

r58459	r58466
280	280	return EFI_DEVICE_ERROR;
281	281	}
282
	282
283	283	return UninstallVlanConfigForm (PrivateData);
284	284	}

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c

-              r58459
+              r58466
+    }
+  }
   HiiSetBrowserData (&gVlanConfigFormSetGuid, mVlanStorageName, sizeof (VLAN_CONFIGURATION), (UINT8 *) Configuration, NULL);
   FreePool (Configuration);
 …
   EFI_STATUS                   Status;
   EFI_VLAN_CONFIG_PROTOCOL     *VlanConfig;
   //
   // End the parent-child relationship.

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni

Property svn:mime-type changed from application/octet-stream to text/plain;encoding=UTF-16LE

Changeset 58466 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network

Legend:

Download in other formats: