VirtualBox

Ignore:
Timestamp:
Oct 28, 2015 8:17:18 PM (9 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
103761
Message:

EFI/Firmware: 'svn merge /vendor/edk2/UDK2010.SR1 /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:
trunk/src/VBox/Devices/EFI/Firmware
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/EFI/Firmware

  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Application/IfConfig6/IfConfig6.c

    r48674 r58459  
    22  The implementation for Shell application IfConfig6.
    33
    4   Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
     4  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
    55
    66  This program and the accompanying materials
    … …  
    137137  Str     = (CHAR16 *) AllocateZeroPool (StrSize (String));
    138138  ASSERT (Str != NULL);
    139   Str     = StrCpy (Str, String);
     139  Str     = StrnCpy (Str, String, StrLen (String));
    140140  ArgStr  = Str;
    141141
    … …  
    366366  UINT8                            AddrCnt;
    367367
     368  Prefix   = 0;
    368369  AddrCnt  = 0;
    369370  *BufSize = 0;
    … …  
    17201721      ASSERT (Str != NULL);
    17211722
    1722       Str             = StrCpy (Str, ValueStr);
     1723      Str             = StrnCpy (Str, ValueStr, StrLen (ValueStr));
    17231724      Private->IfName = Str;
    17241725    }
    … …  
    17341735      ASSERT (Str != NULL);
    17351736
    1736       Str             = StrCpy (Str, ValueStr);
     1737      Str             = StrnCpy (Str, ValueStr, StrLen (ValueStr));
    17371738      Private->IfName = Str;
    17381739    }

  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Application/IfConfig6/IfConfig6.inf

    r48674 r58459  
    11## @file
    2 #  Component description file for Shell application IfConfig6.
     2#  Shell application IfConfig6.
    33#
    4 #  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
     4#  It is shell application which is used to set and get configurations for the
     5#  EFI IPv6 network stack.
     6#
     7#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
    58#
    69#  This program and the accompanying materials
    … …  
    2124  VERSION_STRING                 = 1.0
    2225  ENTRY_POINT                    = IfConfig6Initialize
     26  MODULE_UNI_FILE                = IfConfig6.uni
    2327
    2428#
    … …  
    4953
    5054[Protocols]
    51   gEfiIp6ServiceBindingProtocolGuid             ## CONSUMS
    52   gEfiIp6ConfigProtocolGuid                     ## CONSUMS
     55  gEfiIp6ServiceBindingProtocolGuid             ## CONSUMES
     56  gEfiIp6ConfigProtocolGuid                     ## CONSUMES
     57
     58[UserExtensions.TianoCore."ExtraFiles"]
     59  IfConfig6Extra.uni

  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Application/IpsecConfig/Indexer.c

    r48674 r58459  
    22  The implementation of construct ENTRY_INDEXER in IpSecConfig application.
    33
    4   Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
     4  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
    55
    66  This program and the accompanying materials
    … …  
    235235
    236236      Indexer->PadId.PeerIdValid = TRUE;
     237      ZeroMem (Indexer->PadId.Id.PeerId, MAX_PEERID_LEN);
    237238      StrnCpy ((CHAR16 *) Indexer->PadId.Id.PeerId, ValueStr, ARRAY_SIZE (Indexer->PadId.Id.PeerId) - 1);
    238239    }

  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Application/IpsecConfig/IpSecConfig.inf

    r48674 r58459  
    11## @file
    2 #  Component description file for IpSecConfig6 application.
     2#  Shell application IpSecConfig.
     3# 
     4#  This application is used to set and retrieve security and policy related information
     5#  for the EFI IPsec protocol driver.
    36#
    4 #  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
     7#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
    58#
    69#  This program and the accompanying materials
    … …  
    2124  VERSION_STRING                 = 1.0
    2225  ENTRY_POINT                    = InitializeIpSecConfig
     26  MODULE_UNI_FILE                = IpSecConfig.uni
    2327
    2428[Sources]
    … …  
    5862
    5963[Protocols]
    60   gEfiIpSec2ProtocolGuid                        ##CONSUMS
    61   gEfiIpSecConfigProtocolGuid                   ##CONSUMS
     64  gEfiIpSec2ProtocolGuid                        ##CONSUMES
     65  gEfiIpSecConfigProtocolGuid                   ##CONSUMES
     66
     67[UserExtensions.TianoCore."ExtraFiles"]
     68  IpSecConfigExtra.uni

  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Application/Ping6/Ping6.c

    r48674 r58459  
    22  The implementation for Ping6 application.
    33
    4   Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
     4  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
    55
    66  This program and the accompanying materials
    … …  
    803803
    804804/**
    805   Destory the IP6 instance.
     805  Destroy the IP6 instance.
    806806
    807807  @param[in]    Private    The pointer of PING6_PRIVATE_DATA.
    … …  
    809809**/
    810810VOID
    811 Ping6DestoryIp6Instance (
     811Ping6DestroyIp6Instance (
    812812  IN PING6_PRIVATE_DATA    *Private
    813813  )
    … …  
    10201020
    10211021    if (Private->Ip6ChildHandle != NULL) {
    1022       Ping6DestoryIp6Instance (Private);
     1022      Ping6DestroyIp6Instance (Private);
    10231023    }
    10241024

  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Application/Ping6/Ping6.inf

    r48674 r58459  
    11## @file
    2 #  Component description file for Ping6 application.
     2#  Shell application Ping6.
    33#
    4 #  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
     4#  It is an shell application which is used to Ping the target host with IPv6 stack.
     5#
     6#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
    57#
    68#  This program and the accompanying materials
    … …  
    2123  VERSION_STRING                 = 1.0
    2224  ENTRY_POINT                    = InitializePing6
     25  MODULE_UNI_FILE                = Ping6.uni
    2326
    2427#
    … …  
    5962
    6063[Protocols]
    61   gEfiCpuArchProtocolGuid                       ## CONSUMS
    62   gEfiIp6ProtocolGuid                           ## CONSUMS
    63   gEfiIp6ServiceBindingProtocolGuid             ## CONSUMS
    64   gEfiIp6ConfigProtocolGuid                     ## CONSUMS
     64  gEfiCpuArchProtocolGuid                       ## CONSUMES
     65  gEfiIp6ProtocolGuid                           ## CONSUMES
     66  gEfiIp6ServiceBindingProtocolGuid             ## CONSUMES
     67  gEfiIp6ConfigProtocolGuid                     ## CONSUMES
     68
     69[UserExtensions.TianoCore."ExtraFiles"]
     70  Ping6Extra.uni

  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Application/VConfig/VConfig.c

    r48674 r58459  
    22  Shell application for VLAN configuration.
    33
    4   Copyright (C) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
     4  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
    55
    66  This program and the accompanying materials

  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Application/VConfig/VConfig.inf

    r48674 r58459  
    11## @file
    2 #  Component files for VLAN configuration shell application.
     2#  Shell application VLAN configuration.
    33#
    4 #  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
     4#  It is shell application which is used to get and set VLAN configuration.
     5#
     6#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
    57#
    68#  This program and the accompanying materials
    … …  
    2123  VERSION_STRING                 = 1.0
    2224  ENTRY_POINT                    = VlanConfigMain
     25  MODULE_UNI_FILE                = VConfig.uni
    2326
    2427#
    … …  
    4548
    4649[Protocols]
    47   gEfiVlanConfigProtocolGuid
     50  gEfiVlanConfigProtocolGuid     ## CONSUMES
     51
     52[UserExtensions.TianoCore."ExtraFiles"]
     53  VConfigExtra.uni
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