VirtualBox

Ignore:
Timestamp:
Aug 12, 2020 4:09:12 PM (5 years ago)
Author:
vboxsync
Message:

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

Location:
trunk/src/VBox/Devices/EFI/FirmwareNew
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/EFI/FirmwareNew

  • trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/MnpDxe/MnpConfig.c

    r80721 r85718  
    708708  MnpServiceData = AllocateZeroPool (sizeof (MNP_SERVICE_DATA));
    709709  if (MnpServiceData == NULL) {
    710     DEBUG ((EFI_D_ERROR, "MnpCreateServiceData: Faild to allocate memory for the new Mnp Service Data.\n"));
     710    DEBUG ((DEBUG_ERROR, "MnpCreateServiceData: Failed to allocate memory for the new Mnp Service Data.\n"));
    711711
    712712    return NULL;
    … …  
    743743                         );
    744744    if (MnpServiceHandle == NULL) {
    745       DEBUG ((EFI_D_ERROR, "MnpCreateServiceData: Faild to create child handle.\n"));
     745      DEBUG ((DEBUG_ERROR, "MnpCreateServiceData: Failed to create child handle.\n"));
    746746
    747747      return NULL;
    … …  
    13261326  if (MnpDeviceData->ConfiguredChildrenNumber > 0) {
    13271327    //
    1328     // If there are other configured chilren, return and keep the timers and
     1328    // If there are other configured children, return and keep the timers and
    13291329    // simple network unchanged.
    13301330    //
    … …  
    14031403  @param[in, out]  Instance     Pointer to the mnp instance context data.
    14041404  @param[in]       ConfigData   Pointer to the configuration data used to configure
    1405                                 the isntance.
     1405                                the instance.
    14061406
    14071407  @retval EFI_SUCCESS           The Instance is configured.
    … …  
    16061606
    16071607      //
    1608       // Allocate pool for the mulicast addresses.
     1608      // Allocate pool for the multicast addresses.
    16091609      //
    16101610      MCastFilterCnt  = MnpDeviceData->GroupAddressCount;
    … …  
    16971697  @param[in, out]  Instance        Pointer to the mnp instance context data.
    16981698  @param[in, out]  CtrlBlk         Pointer to the group address control block.
    1699   @param[in, out]  GroupAddress    Pointer to the group adress.
     1699  @param[in, out]  GroupAddress    Pointer to the group address.
    17001700  @param[in]       MacAddress      Pointer to the mac address.
    17011701  @param[in]       HwAddressSize   The hardware address size.
    … …  
    18521852  if (JoinFlag) {
    18531853    //
    1854     // A new gropu address is to be added.
     1854    // A new group address is to be added.
    18551855    //
    18561856    GroupAddress  = NULL;

  • trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/MnpDxe/MnpDriver.c

    r80721 r85718  
    111111
    112112  //
    113   // Close the openned SNP protocol.
     113  // Close the opened SNP protocol.
    114114  //
    115115  gBS->CloseProtocol (
    … …  
    420420                                     to the existing child handle.
    421421
    422   @retval EFI_SUCCES                 The protocol was added to ChildHandle.
     422  @retval EFI_SUCCESS                The protocol was added to ChildHandle.
    423423  @retval EFI_INVALID_PARAMETER      ChildHandle is NULL.
    424424  @retval EFI_OUT_OF_RESOURCES       There are not enough resources available to
    … …  
    451451  Instance = AllocateZeroPool (sizeof (MNP_INSTANCE_DATA));
    452452  if (Instance == NULL) {
    453     DEBUG ((EFI_D_ERROR, "MnpServiceBindingCreateChild: Faild to allocate memory for the new instance.\n"));
     453    DEBUG ((DEBUG_ERROR, "MnpServiceBindingCreateChild: Failed to allocate memory for the new instance.\n"));
    454454
    455455    return EFI_OUT_OF_RESOURCES;
    … …  
    536536  @param[in]  ChildHandle        Handle of the child to destroy.
    537537
    538   @retval EFI_SUCCES             The protocol was removed from ChildHandle.
     538  @retval EFI_SUCCESS            The protocol was removed from ChildHandle.
    539539  @retval EFI_UNSUPPORTED        ChildHandle does not support the protocol that
    540540                                 is being removed.
    … …  
    661661  @param[in]  SystemTable  The system table.
    662662
    663   @retval EFI_SUCCES       The driver binding and component name protocols are
     663  @retval EFI_SUCCESS      The driver binding and component name protocols are
    664664                           successfully installed.
    665665  @retval Others           Other errors as indicated.

  • trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/MnpDxe/MnpDriver.h

    r80721 r85718  
    11/** @file
    2   Declaration of strctures and functions for MnpDxe driver.
     2  Declaration of structures and functions for MnpDxe driver.
    33
    44Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>
    … …  
    224224                                     to the existing child handle.
    225225
    226   @retval EFI_SUCCES                 The protocol was added to ChildHandle.
     226  @retval EFI_SUCCESS                The protocol was added to ChildHandle.
    227227  @retval EFI_INVALID_PARAMETER      ChildHandle is NULL.
    228228  @retval EFI_OUT_OF_RESOURCES       There are not enough resources available to
    … …  
    249249  @param[in]  ChildHandle        Handle of the child to destroy.
    250250
    251   @retval EFI_SUCCES             The protocol was removed from ChildHandle.
     251  @retval EFI_SUCCESS            The protocol was removed from ChildHandle.
    252252  @retval EFI_UNSUPPORTED        ChildHandle does not support the protocol that
    253253                                 is being removed.

  • trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/MnpDxe/MnpDxe.inf

    r80721 r85718  
    11## @file
    2 #  This module produces EFI MNP Protocol, EFI MNP Servie Binding Protocol and EFI VLAN Protocol.
     2#  This module produces EFI MNP Protocol, EFI MNP Service Binding Protocol and EFI VLAN Protocol.
    33#
    44#  This module produces EFI Managed Network Protocol upon EFI Simple Network Protocol,
    … …  
    4444[Packages]
    4545  MdePkg/MdePkg.dec
    46   MdeModulePkg/MdeModulePkg.dec
    4746  NetworkPkg/NetworkPkg.dec
    4847

  • trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/MnpDxe/MnpDxe.uni

    r80721 r85718  
    11// /** @file
    2 // This module produces EFI MNP Protocol, EFI MNP Servie Binding Protocol and EFI VLAN Protocol.
     2// This module produces EFI MNP Protocol, EFI MNP Service Binding Protocol and EFI VLAN Protocol.
    33//
    44// This module produces EFI Managed Network Protocol upon EFI Simple Network Protocol,
    … …  
    1313
    1414
    15 #string STR_MODULE_ABSTRACT             #language en-US "Produces EFI MNP Protocol, EFI MNP Servie Binding Protocol and EFI VLAN Protocol"
     15#string STR_MODULE_ABSTRACT             #language en-US "Produces EFI MNP Protocol, EFI MNP Service Binding Protocol and EFI VLAN Protocol"
    1616
    1717#string STR_MODULE_DESCRIPTION          #language en-US "This module produces EFI Managed Network Protocol upon EFI Simple Network Protocol to provide raw asynchronous network I/O services. It also produces EFI VLAN Protocol to provide manageability interface for VLAN configuration."

  • trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/MnpDxe/MnpImpl.h

    r80721 r85718  
    285285  @param[in, out]  Instance     Pointer to the mnp instance context data.
    286286  @param[in]       ConfigData   Pointer to the configuration data used to configure
    287                                 the isntance.
     287                                the instance.
    288288
    289289  @retval EFI_SUCCESS           The Instance is configured.
    … …  
    362362  Synchronously send out the packet.
    363363
    364   This functon places the packet buffer to SNP driver's tansmit queue. The packet
    365   can be considered successfully sent out once SNP acccetp the packet, while the
     364  This function places the packet buffer to SNP driver's tansmit queue. The packet
     365  can be considered successfully sent out once SNP accept the packet, while the
    366366  packet buffer recycle is deferred for better performance.
    367367
    368368  @param[in]       MnpServiceData      Pointer to the mnp service context data.
    369   @param[in]       Packet              Pointer to the pakcet buffer.
     369  @param[in]       Packet              Pointer to the packet buffer.
    370370  @param[in]       Length              The length of the packet.
    371371  @param[in, out]  Token               Pointer to the token the packet generated from.
    … …  
    405405
    406406  @param[in]  Event               The event this notify function registered to.
    407   @param[in]  Context             Pointer to the context data registerd to the Event.
     407  @param[in]  Context             Pointer to the context data registered to the Event.
    408408
    409409**/
    … …  
    481481  @param[in, out]  MnpDeviceData     Pointer to the mnp device context data.
    482482
    483   @retval EFI_SUCCESS             Successed to recyclethe transmitted buffer address.
    484   @retval Others                  Failed to recyclethe transmitted buffer address.
     483  @retval EFI_SUCCESS             Successed to recycle the transmitted buffer address.
     484  @retval Others                  Failed to recycle the transmitted buffer address.
    485485
    486486**/

  • trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/MnpDxe/MnpIo.c

    r80721 r85718  
    191191  Synchronously send out the packet.
    192192
    193   This functon places the packet buffer to SNP driver's tansmit queue. The packet
    194   can be considered successfully sent out once SNP acccetp the packet, while the
     193  This function places the packet buffer to SNP driver's tansmit queue. The packet
     194  can be considered successfully sent out once SNP accept the packet, while the
    195195  packet buffer recycle is deferred for better performance.
    196196
    197197  @param[in]       MnpServiceData      Pointer to the mnp service context data.
    198   @param[in]       Packet              Pointer to the pakcet buffer.
     198  @param[in]       Packet              Pointer to the packet buffer.
    199199  @param[in]       Length              The length of the packet.
    200200  @param[in, out]  Token               Pointer to the token the packet generated from.
    … …  
    423423
    424424  @param[in]  Event               The event this notify function registered to.
    425   @param[in]  Context             Pointer to the context data registerd to the Event.
     425  @param[in]  Context             Pointer to the context data registered to the Event.
    426426
    427427**/

  • trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/MnpDxe/MnpMain.c

    r80721 r85718  
    377377    ((MacAddress != NULL) && !NET_MAC_IS_MULTICAST (MacAddress, &SnpMode->BroadcastAddress, SnpMode->HwAddressSize))) {
    378378    //
    379     // The instance isn't configured to do mulitcast receive. OR
    380     // the passed in MacAddress is not a mutlticast mac address.
     379    // The instance isn't configured to do multicast receive. OR
     380    // the passed in MacAddress is not a multicast mac address.
    381381    //
    382382    Status = EFI_INVALID_PARAMETER;
    … …  
    714714
    715715  //
    716   // Dispatch the DPC queued by the NotifyFunction of the cancled token's events.
     716  // Dispatch the DPC queued by the NotifyFunction of the canceled token's events.
    717717  //
    718718  DispatchDpc ();
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette