VirtualBox

Ignore:
Timestamp:
Aug 12, 2020 4:09:12 PM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
139865
Message:

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

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

Legend:

Unmodified
Added
Removed

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

  • trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Dhcp4Dxe/Dhcp4Driver.c

    r80721 r85718  
    327327
    328328  //
    329   // Install the Dhcp4ServiceBinding Protocol onto ControlerHandle
     329  // Install the Dhcp4ServiceBinding Protocol onto ControllerHandle
    330330  //
    331331  Status = gBS->InstallMultipleProtocolInterfaces (
    … …  
    439439  if (!IsListEmpty (&DhcpSb->Children)) {
    440440    //
    441     // Destroy all the children instances before destory the service.
     441    // Destroy all the children instances before destroy the service.
    442442    //
    443443    List = &DhcpSb->Children;
    … …  
    524524                      then the protocol is added to the existing UEFI handle.
    525525
    526   @retval EFI_SUCCES            The protocol was added to ChildHandle.
     526  @retval EFI_SUCCESS           The protocol was added to ChildHandle.
    527527  @retval EFI_INVALID_PARAMETER ChildHandle is NULL.
    528528  @retval EFI_OUT_OF_RESOURCES  There are not enough resources available to create
    … …  
    618618  @param  ChildHandle Handle of the child to destroy
    619619
    620   @retval EFI_SUCCES            The protocol was removed from ChildHandle.
     620  @retval EFI_SUCCESS           The protocol was removed from ChildHandle.
    621621  @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is being removed.
    622622  @retval EFI_INVALID_PARAMETER Child handle is NULL.

  • trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Dhcp4Dxe/Dhcp4Driver.h

    r80721 r85718  
    105105                      then the protocol is added to the existing UEFI handle.
    106106
    107   @retval EFI_SUCCES            The protocol was added to ChildHandle.
     107  @retval EFI_SUCCESS           The protocol was added to ChildHandle.
    108108  @retval EFI_INVALID_PARAMETER ChildHandle is NULL.
    109109  @retval EFI_OUT_OF_RESOURCES  There are not enough resources available to create
    … …  
    129129  @param  ChildHandle Handle of the child to destroy
    130130
    131   @retval EFI_SUCCES            The protocol was removed from ChildHandle.
     131  @retval EFI_SUCCESS           The protocol was removed from ChildHandle.
    132132  @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is being removed.
    133133  @retval EFI_INVALID_PARAMETER Child handle is NULL.

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

    r80721 r85718  
    4444[Packages]
    4545  MdePkg/MdePkg.dec
    46   MdeModulePkg/MdeModulePkg.dec
    4746  NetworkPkg/NetworkPkg.dec
    4847

  • trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Dhcp4Dxe/Dhcp4Impl.c

    r80721 r85718  
    6565  @retval EFI_ACCESS_DENIED     This instance of the EFI DHCPv4 Protocol driver was not in the
    6666                                Dhcp4Stopped, Dhcp4Init, Dhcp4InitReboot, or Dhcp4Bound state;
    67                                 Or onother instance of this EFI DHCPv4 Protocol driver is already
     67                                Or another instance of this EFI DHCPv4 Protocol driver is already
    6868                                in a valid configured state.
    6969  @retval EFI_INVALID_PARAMETER Some parameter is NULL.
    … …  
    612612  @retval EFI_ACCESS_DENIED     This instance of the EFI DHCPv4 Protocol driver was not in the
    613613                                Dhcp4Stopped, Dhcp4Init, Dhcp4InitReboot, or Dhcp4Bound state;
    614                                 Or onother instance of this EFI DHCPv4 Protocol driver is already
     614                                Or another instance of this EFI DHCPv4 Protocol driver is already
    615615                                in a valid configured state.
    616616  @retval EFI_INVALID_PARAMETER Some parameter is NULL.
    … …  
    806806
    807807  //
    808   // Check Media Satus.
     808  // Check Media Status.
    809809  //
    810810  MediaStatus = EFI_SUCCESS;

  • trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Dhcp4Dxe/Dhcp4Io.c

    r80721 r85718  
    605605
    606606  @retval EFI_SUCCESS           The packet is successfully processed.
    607   @retval Others                Some error occured.
     607  @retval Others                Some error occurred.
    608608
    609609**/
    … …  
    633633  //
    634634  // Call the user's callback. The action according to the return is as:
    635   // 1. EFI_SUCESS: stop waiting for more offers, select the offer now
     635  // 1. EFI_SUCCESS: stop waiting for more offers, select the offer now
    636636  // 2. EFI_NOT_READY: wait for more offers
    637637  // 3. EFI_ABORTED: abort the address acquiring.
    … …  
    680680
    681681  @retval EFI_SUCCESS           The packet is successfully processed.
    682   @retval Others                Some error occured.
     682  @retval Others                Some error occurred.
    683683
    684684**/
    … …  
    773773
    774774  @retval EFI_SUCCESS           The packet is successfully processed.
    775   @retval Others                Some error occured.
     775  @retval Others                Some error occurred.
    776776
    777777**/
    … …  
    857857
    858858  @retval EFI_SUCCESS           The packet is successfully processed.
    859   @retval Others                Some error occured.
     859  @retval Others                Some error occurred.
    860860
    861861**/
    … …  
    14741474  Each DHCP service has three timer. Two of them are count down timer.
    14751475  One for the packet retransmission. The other is to collect the offers.
    1476   The third timer increaments the lease life which is compared to T1, T2,
     1476  The third timer increments the lease life which is compared to T1, T2,
    14771477  and lease to determine the time to renew and rebind the lease.
    14781478  DhcpOnTimerTick will be called once every second.

  • trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Dhcp4Dxe/Dhcp4Io.h

    r80721 r85718  
    109109  Each DHCP service has three timer. Two of them are count down timer.
    110110  One for the packet retransmission. The other is to collect the offers.
    111   The third timer increaments the lease life which is compared to T1, T2,
     111  The third timer increments the lease life which is compared to T1, T2,
    112112  and lease to determine the time to renew and rebind the lease.
    113113  DhcpOnTimerTick will be called once every second.

  • trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Dhcp4Dxe/Dhcp4Option.c

    r80721 r85718  
    196196
    197197  //
    198   // Validate the occurance of the option unit is with in [MinOccur, MaxOccur]
     198  // Validate the occurrence of the option unit is with in [MinOccur, MaxOccur]
    199199  //
    200200  Occur = Len / Unit;
    … …  
    231231
    232232  @retval EFI_SUCCESS            The DHCP option is successfully extracted.
    233   @retval EFI_INVALID_PARAMETER  The DHCP option is mal-formated
     233  @retval EFI_INVALID_PARAMETER  The DHCP option is mal-formatted
    234234
    235235**/
    … …  
    304304
    305305  @retval EFI_SUCCESS            All the options are valid
    306   @retval EFI_INVALID_PARAMETER  The options are mal-formated.
     306  @retval EFI_INVALID_PARAMETER  The options are mal-formatted.
    307307
    308308**/
    … …  
    377377  @param[in]  Context                The opaque parameter for Check
    378378
    379   @retval EFI_SUCCESS            The DHCP packet's options are well formated
    380   @retval EFI_INVALID_PARAMETER  The DHCP packet's options are not well formated
     379  @retval EFI_SUCCESS            The DHCP packet's options are well formatted
     380  @retval EFI_INVALID_PARAMETER  The DHCP packet's options are not well formatted
    381381
    382382**/
    … …  
    439439/**
    440440  Call back function to DhcpIterateOptions to compute each option's
    441   length. It just adds the data length of all the occurances of this
     441  length. It just adds the data length of all the occurrences of this
    442442  Tag. Context is an array of 256 DHCP_OPTION_COUNT.
    443443
    … …  
    474474  @param[in]  Tag                    The option to consolidate its data
    475475  @param[in]  Len                    The length of option data
    476   @param[in]  Data                   The data of the option's current occurance
     476  @param[in]  Data                   The data of the option's current occurrence
    477477  @param[in]  Context                The context, which is DHCP_OPTION_CONTEXT. This
    478478                                     array is  just a wrap to pass THREE parameters.
    … …  
    518518  Parse the options of a DHCP packet. It supports RFC 3396: Encoding
    519519  Long Options in DHCP. That is, it will combine all the option value
    520   of all the occurances of each option.
    521   A little bit of implemenation:
     520  of all the occurrences of each option.
     521  A little bit of implementation:
    522522  It adopts the "Key indexed counting" algorithm. First, it allocates
    523523  an array of 256 DHCP_OPTION_COUNTs because DHCP option tag is encoded
    … …  
    539539  @retval EFI_NOT_FOUND          Cannot find any option.
    540540  @retval EFI_OUT_OF_RESOURCES   Failed to allocate memory to parse the packet.
    541   @retval EFI_INVALID_PARAMETER  The options are mal-formated
     541  @retval EFI_INVALID_PARAMETER  The options are mal-formatted
    542542  @retval EFI_SUCCESS            The options are parsed into OptionPoint
    543543
    … …  
    640640
    641641  @retval EFI_OUT_OF_RESOURCES   Failed to allocate memory to validate the packet.
    642   @retval EFI_INVALID_PARAMETER  The options are mal-formated
     642  @retval EFI_INVALID_PARAMETER  The options are mal-formatted
    643643  @retval EFI_SUCCESS            The options are parsed into OptionPoint
    644644
    … …  
    771771
    772772  @retval EFI_OUT_OF_RESOURCES   Failed to allocate memory
    773   @retval EFI_INVALID_PARAMETER  The options in SeekPacket are mal-formated
     773  @retval EFI_INVALID_PARAMETER  The options in SeekPacket are mal-formatted
    774774  @retval EFI_SUCCESS            The packet is build.
    775775
    … …  
    795795
    796796  //
    797   // Use an array of DHCP_OPTION to mark the existance
     797  // Use an array of DHCP_OPTION to mark the existence
    798798  // and position of each valid options.
    799799  //

  • trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Dhcp4Dxe/Dhcp4Option.h

    r80721 r85718  
    8282/// Structure used to describe and validate the format of DHCP options.
    8383/// Type is the options' data type, such as DHCP_OPTION_INT8. MinOccur
    84 /// is the minium occurance of this data type. MaxOccur is defined
     84/// is the minimum occurrence of this data type. MaxOccur is defined
    8585/// similarly. If MaxOccur is -1, it means that there is no limit on the
    86 /// maximum occurance. Alert tells whether DHCP client should further
     86/// maximum occurrence. Alert tells whether DHCP client should further
    8787/// inspect the option to parse DHCP_PARAMETER.
    8888///
    … …  
    115115  @param[in]  Context                The opaque parameter for Check
    116116
    117   @retval EFI_SUCCESS            The DHCP packet's options are well formated
    118   @retval EFI_INVALID_PARAMETER  The DHCP packet's options are not well formated
     117  @retval EFI_SUCCESS            The DHCP packet's options are well formatted
     118  @retval EFI_INVALID_PARAMETER  The DHCP packet's options are not well formatted
    119119
    120120**/
    … …  
    134134
    135135  @retval EFI_OUT_OF_RESOURCES   Failed to allocate memory to validate the packet.
    136   @retval EFI_INVALID_PARAMETER  The options are mal-formated
     136  @retval EFI_INVALID_PARAMETER  The options are mal-formatted
    137137  @retval EFI_SUCCESS            The options are parsed into OptionPoint
    138138
    … …  
    147147  Parse the options of a DHCP packet. It supports RFC 3396: Encoding
    148148  Long Options in DHCP. That is, it will combine all the option value
    149   of all the occurances of each option.
    150   A little bit of implemenation:
     149  of all the occurrences of each option.
     150  A little bit of implementation:
    151151  It adopts the "Key indexed counting" algorithm. First, it allocates
    152152  an array of 256 DHCP_OPTION_COUNTs because DHCP option tag is encoded
    … …  
    168168  @retval EFI_NOT_FOUND          Cannot find any option.
    169169  @retval EFI_OUT_OF_RESOURCES   Failed to allocate memory to parse the packet.
    170   @retval EFI_INVALID_PARAMETER  The options are mal-formated
     170  @retval EFI_INVALID_PARAMETER  The options are mal-formatted
    171171  @retval EFI_SUCCESS            The options are parsed into OptionPoint
    172172
    … …  
    212212
    213213  @retval EFI_OUT_OF_RESOURCES   Failed to allocate memory
    214   @retval EFI_INVALID_PARAMETER  The options in SeekPacket are mal-formated
     214  @retval EFI_INVALID_PARAMETER  The options in SeekPacket are mal-formatted
    215215  @retval EFI_SUCCESS            The packet is build.
    216216
Note: See TracChangeset for help on using the changeset viewer.

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