VirtualBox

Ignore:
Timestamp:
Oct 29, 2015 4:30:44 AM (9 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
103777
Message:

EFI/Firmware: Merged in the svn:eol-style, svn:mime-type and trailing whitespace cleanup that was done after the initial UDK2014.SP1 import: svn merge /vendor/edk2/UDK2014.SP1 /vendor/edk2/current .

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

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/EFI/Firmware

  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Ip6Dxe/ComponentName.c

    r58459 r58466  
    239239  @param  Ip6[in]                   A pointer to the EFI_IP6_PROTOCOL.
    240240
    241  
     241
    242242  @retval EFI_SUCCESS               Update the ControllerNameTable of this instance successfully.
    243243  @retval EFI_INVALID_PARAMETER     The input parameter is invalid.
    244  
     244
    245245**/
    246246EFI_STATUS
     
    295295      gIp6ControllerNameTable = NULL;
    296296  }
    297  
     297
    298298  Status = AddUnicodeString2 (
    299299             "eng",
     
    306306    return Status;
    307307  }
    308  
     308
    309309  return AddUnicodeString2 (
    310310           "en",
     
    396396  EFI_STATUS                    Status;
    397397  EFI_IP6_PROTOCOL              *Ip6;
    398  
     398
    399399  //
    400400  // Only provide names for child handles.
     
    405405
    406406  //
    407   // Make sure this driver produced ChildHandle 
     407  // Make sure this driver produced ChildHandle
    408408  //
    409409  Status = EfiTestChildHandle (
  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Ip6Dxe/Ip6Common.c

    r58459 r58466  
    331331/**
    332332  Callback function which provided by user to remove one node in NetDestroyLinkList process.
    333  
     333
    334334  @param[in]    Entry           The entry to be removed.
    335335  @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
     
    349349  EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;
    350350  EFI_IPv6_ADDRESS              *Address;
    351  
     351
    352352  Instance = NET_LIST_USER_STRUCT_S (Entry, IP6_PROTOCOL, Link, IP6_PROTOCOL_SIGNATURE);
    353353  ServiceBinding = ((IP6_DESTROY_CHILD_BY_ADDR_CALLBACK_CONTEXT*) Context)->ServiceBinding;
     
    357357    return ServiceBinding->DestroyChild (ServiceBinding, Instance->Handle);
    358358  }
    359  
     359
    360360  return EFI_SUCCESS;
    361361}
  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Ip6Dxe/Ip6Config.vfr

    • Property svn:eol-style set to native
  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Ip6Dxe/Ip6ConfigImpl.h

    r58459 r58466  
    7373  @retval EFI_SUCCESS          The specified configuration data for the EFI IPv6
    7474                               network stack was set successfully.
    75  
     75
    7676**/
    7777typedef
     
    9090                           bytes, the size of buffer required to store the specified
    9191                           configuration data.
    92   @param[in]      Data     The data buffer in which the configuration data is returned. 
     92  @param[in]      Data     The data buffer in which the configuration data is returned.
    9393                           Ignored if DataSize is ZERO.
    9494
    9595  @retval EFI_BUFFER_TOO_SMALL The size of Data is too small for the specified
    96                                configuration data, and the required size is 
     96                               configuration data, and the required size is
    9797                               returned in DataSize.
    98   @retval EFI_SUCCESS          The specified configuration data was obtained successfully.                               
    99  
     98  @retval EFI_SUCCESS          The specified configuration data was obtained successfully.
     99
    100100**/
    101101typedef
     
    165165
    166166typedef struct {
    167   EFI_IP6_CONFIG_POLICY                    Policy;              ///< manual or automatic 
     167  EFI_IP6_CONFIG_POLICY                    Policy;              ///< manual or automatic
    168168  EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS DadTransmitCount;    ///< dad transmits count
    169   EFI_IP6_CONFIG_INTERFACE_ID              InterfaceId;         ///< alternative interface id 
     169  EFI_IP6_CONFIG_INTERFACE_ID              InterfaceId;         ///< alternative interface id
    170170  LIST_ENTRY                               ManualAddress;       ///< IP addresses
    171171  UINT32                                   ManualAddressCount;  ///< IP addresses count
     
    219219  The event process routine when the DHCPv6 server is answered with a reply packet
    220220  for an information request.
    221  
     221
    222222  @param[in]     This          Points to the EFI_DHCP6_PROTOCOL.
    223223  @param[in]     Context       The pointer to the IP6 configuration instance data.
     
    225225
    226226  @retval EFI_SUCCESS      The DNS server address was retrieved from the reply packet.
    227   @retval EFI_NOT_READY    The reply packet does not contain the DNS server option, or 
     227  @retval EFI_NOT_READY    The reply packet does not contain the DNS server option, or
    228228                           the DNS server address is not valid.
    229229
     
    239239/**
    240240  The work function to trigger the DHCPv6 process to perform a stateful autoconfiguration.
    241  
     241
    242242  @param[in]     Instance      Pointer to the IP6 config instance data.
    243243  @param[in]     OtherInfoOnly If FALSE, get stateful address and other information
     
    258258
    259259  @param[out]    Instance       The buffer of IP6_CONFIG_INSTANCE to be initialized.
    260  
     260
    261261  @retval EFI_OUT_OF_RESOURCES  Failed to allocate resources to complete the operation.
    262262  @retval EFI_SUCCESS           The IP6_CONFIG_INSTANCE initialized successfully.
    263  
     263
    264264**/
    265265EFI_STATUS
     
    272272
    273273  @param[in, out] Instance    The buffer of IP6_CONFIG_INSTANCE to be freed.
    274  
     274
    275275**/
    276276VOID
     
    286286  @retval EFI_SUCCESS         The child was successfully destroyed.
    287287  @retval Others              Failed to destroy the child.
    288  
     288
    289289**/
    290290EFI_STATUS
  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c

    r58459 r58466  
    995995/**
    996996  Convert IFR data into IP6 configuration data. The policy, alternative interface
    997   ID, and DAD transmit counts, and will be saved. 
     997  ID, and DAD transmit counts, and will be saved.
    998998
    999999  @param[in]       IfrNvData       The IFR NV data.
     
    15421542  CHAR16                        PortString[ADDRESS_STR_MAX_SIZE];
    15431543  EFI_IP6_CONFIG_INTERFACE_INFO *IfInfo;
    1544  
     1544
    15451545
    15461546  Ip6Config = &Instance->Ip6Config;
     
    17951795      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
    17961796      break;
    1797    
     1797
    17981798    case KEY_INTERFACE_ID:
    17991799      Status = Ip6ParseInterfaceIdFromString (IfrNvData->InterfaceId, &Ip6NvData->InterfaceId);
     
    18061806          );
    18071807      }
    1808    
     1808
    18091809      break;
    1810    
     1810
    18111811    case KEY_MANUAL_ADDRESS:
    18121812      Status = Ip6ParseAddressListFromString (
     
    18231823          );
    18241824      }
    1825    
     1825
    18261826      break;
    1827    
     1827
    18281828    case KEY_GATEWAY_ADDRESS:
    18291829      Status = Ip6ParseAddressListFromString (
     
    18401840          );
    18411841      }
    1842    
     1842
    18431843      break;
    1844    
     1844
    18451845    case KEY_DNS_ADDRESS:
    18461846      Status = Ip6ParseAddressListFromString (
     
    18571857          );
    18581858      }
    1859    
     1859
    18601860      break;
    18611861
  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Ip6Dxe/Ip6Driver.c

    r58459 r58466  
    124124    if (EFI_ERROR (Status)) {
    125125      return Status;
    126     } 
     126    }
    127127  }
    128128
     
    567567    if (EFI_ERROR (Status)) {
    568568      goto ON_ERROR;
    569     }   
     569    }
    570570
    571571    //
     
    585585/**
    586586  Callback function which provided by user to remove one node in NetDestroyLinkList process.
    587  
     587
    588588  @param[in]    Entry           The entry to be removed.
    589589  @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
     
    718718    Status = EFI_SUCCESS;
    719719  }
    720  
     720
    721721Exit:
    722722  return Status;
  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Ip6Dxe/Ip6Dxe.inf

    r58459 r58466  
    11## @file
    22#  Basic IPv6 packet I/O Service.
    3 #   
    4 #  This module provides basic network IPv6 packet I/O services which includes support for 
    5 #  Neighbor Discovery Protocol (ND), Multicast Listener Discovery Protocol (MLD), 
    6 #  and a subset of the Internet Control Message Protocol (ICMPv6). This driver 
     3#
     4#  This module provides basic network IPv6 packet I/O services which includes support for
     5#  Neighbor Discovery Protocol (ND), Multicast Listener Discovery Protocol (MLD),
     6#  and a subset of the Internet Control Message Protocol (ICMPv6). This driver
    77#  also provides the mechanism to set and get various types of configurations for
    88#  the EFI IPv6 network stack.
  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Ip6Dxe/Ip6DxeStrings.uni

    • Property svn:mime-type changed from application/octet-stream to text/plain;encoding=UTF-16LE
  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Ip6Dxe/Ip6If.c

    r58459 r58466  
    566566  EFI_STATUS                Status;
    567567  IP6_LINK_RX_TOKEN         *Token;
    568  
     568
    569569  NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE);
    570570
  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Ip6Dxe/Ip6Input.c

    r58459 r58466  
    652652      sizeof (IP6_CLIP_INFO)
    653653      );
    654    
     654
    655655    NetIpSecNetbufFree(Packet);
    656656    *Netbuf = TxWrap->Packet;
     
    729729  @param[in]      Flag          The link layer flag for the packet received, such
    730730                                as multicast.
    731   @param[out]     Payload       The pointer to the payload of the recieved packet. 
    732                                 it starts from the first byte of the extension header.                                 
     731  @param[out]     Payload       The pointer to the payload of the recieved packet.
     732                                it starts from the first byte of the extension header.
    733733  @param[out]     LastHead      The pointer of NextHeader of the last extension
    734734                                header processed by IP6.
    735735  @param[out]     ExtHdrsLen    The length of the whole option.
    736736  @param[out]     UnFragmentLen The length of unfragmented length of extension headers.
    737   @param[out]     Fragmented    Indicate whether the packet is fragmented. 
     737  @param[out]     Fragmented    Indicate whether the packet is fragmented.
    738738  @param[out]     Head          The pointer to the EFI_IP6_Header.
    739739
     
    751751     OUT UINT32          *ExtHdrsLen,
    752752     OUT UINT32          *UnFragmentLen,
    753      OUT BOOLEAN         *Fragmented, 
     753     OUT BOOLEAN         *Fragmented,
    754754     OUT EFI_IP6_HEADER  **Head
    755755  )
     
    969969  //
    970970  NetbufTrim (*Packet, sizeof (EFI_IP6_HEADER) + *ExtHdrsLen, TRUE);
    971  
     971
    972972  return EFI_SUCCESS;
    973973}
     
    10141014    goto Drop;
    10151015  }
    1016  
     1016
    10171017  //
    10181018  // Pre-Process the Ipv6 Packet and then reassemble if it is necessary.
    10191019  //
    10201020  Status = Ip6PreProcessPacket (
    1021              IpSb, 
    1022              &Packet, 
    1023              Flag, 
    1024              &Payload, 
    1025              &LastHead, 
    1026              &ExtHdrsLen, 
    1027              &UnFragmentLen, 
     1021             IpSb,
     1022             &Packet,
     1023             Flag,
     1024             &Payload,
     1025             &LastHead,
     1026             &ExtHdrsLen,
     1027             &UnFragmentLen,
    10281028             &Fragmented,
    10291029             &Head
     
    10571057  if (0 == CompareMem (Head, &ZeroHead, sizeof (EFI_IP6_HEADER))) {
    10581058    Status = Ip6PreProcessPacket (
    1059                IpSb, 
    1060                &Packet, 
    1061                Flag, 
    1062                &Payload, 
    1063                &LastHead, 
    1064                &ExtHdrsLen, 
    1065                &UnFragmentLen, 
    1066                &Fragmented, 
     1059               IpSb,
     1060               &Packet,
     1061               Flag,
     1062               &Payload,
     1063               &LastHead,
     1064               &ExtHdrsLen,
     1065               &UnFragmentLen,
     1066               &Fragmented,
    10671067               &Head
    10681068               );
     
    10781078    goto Restart;
    10791079  }
    1080  
     1080
    10811081  //
    10821082  // Packet may have been changed. The ownership of the packet
  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/Ip6Dxe/Ip6Nd.c

    r58459 r58466  
    823823  EFI_DHCP6_RETRANSMISSION  InfoReqReXmit;
    824824  EFI_IPv6_ADDRESS          AllNodes;
    825  
     825
    826826  IpSb     = IpIf->Service;
    827827  AddrInfo = DadEntry->AddressInfo;
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