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:
10 edited

Legend:

Unmodified
Added
Removed

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

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

    r58459 r58466  
    325325    return EFI_UNSUPPORTED;
    326326  }
    327  
     327
    328328  NicHandle = PxeBcGetNicByIp4Children (ControllerHandle);
    329329  if (NicHandle == NULL) {

  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/UefiPxeBcDxe/PxeBcBoot.c

    r58459 r58466  
    102102  // According to the PXE specification 2.1, Table 2-1 PXE DHCP Options,
    103103  // we must not consider a boot prompt or boot menu if all of the following hold:
    104   //   - the PXE_DISCOVERY_CONTROL tag(6) is present inside the Vendor Options(43), and has bit 3 set 
     104  //   - the PXE_DISCOVERY_CONTROL tag(6) is present inside the Vendor Options(43), and has bit 3 set
    105105  //   - a boot file name has been presented in the initial DHCP or ProxyDHCP offer packet.
    106106  //
    … …  
    109109    return EFI_ABORTED;
    110110  }
    111  
     111
    112112  if (!IS_VALID_BOOT_PROMPT (VendorOpt->BitMap)) {
    113113    return EFI_TIMEOUT;
    … …  
    471471  PXEBC_VENDOR_OPTION         *VendorOpt;
    472472  PXEBC_BOOT_SVR_ENTRY        *Entry;
    473  
     473
    474474  PxeBc       = &Private->PxeBc;
    475475  Mode        = PxeBc->Mode;
    … …  
    779779        *DiscoverInfo = AllocatePool (sizeof (*Info) + (Info->IpCnt - 1) * sizeof (**SrvList));
    780780        if (*DiscoverInfo == NULL) {
    781           return EFI_OUT_OF_RESOURCES;       
    782         }     
     781          return EFI_OUT_OF_RESOURCES;
     782        }
    783783        CopyMem (*DiscoverInfo, Info, sizeof (*Info));
    784784        Info = *DiscoverInfo;
    … …  
    941941          &Mode->PxeReply.Dhcpv4,
    942942          Private->PxeReply.Dhcp4.Packet.Ack.Length
    943           );     
     943          );
    944944      }
    945945      Mode->ProxyOfferReceived = TRUE;

  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.c

    r58459 r58466  
    483483  }
    484484  //
    485   // Second, Check if bootfilename and serverhostname is overloaded to carry DHCP options refers to rfc-2132. 
     485  // Second, Check if bootfilename and serverhostname is overloaded to carry DHCP options refers to rfc-2132.
    486486  // If yes, try to parse options from the BootFileName field, then ServerName field.
    487487  //

  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.h

    r58459 r58466  
    149149#define IS_VALID_BOOT_SERVERS(x) \
    150150  ((((x)[0]) & BIT (PXEBC_VENDOR_TAG_BOOT_SERVERS)) \
    151    == BIT (PXEBC_VENDOR_TAG_BOOT_SERVERS)) 
     151   == BIT (PXEBC_VENDOR_TAG_BOOT_SERVERS))
    152152
    153153#define IS_VALID_BOOT_PROMPT(x) \

  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c

    r58459 r58466  
    720720    return EFI_NOT_FOUND;
    721721  }
    722  
     722
    723723  //
    724724  // Add Server ID Option.
    … …  
    748748
    749749  //
    750   // Update Elapsed option in the package 
     750  // Update Elapsed option in the package
    751751  //
    752752  Option = PxeBcDhcp6SeekOption (
    … …  
    758758    CalcElapsedTime (Private);
    759759    WriteUnaligned16 ((UINT16*)(Option + 4), HTONS((UINT16) Private->ElapsedTime));
    760   } 
     760  }
    761761
    762762  Status = PxeBc->UdpWrite (
    … …  
    792792    return Status;
    793793  }
    794    
     794
    795795  Status = PxeBc->UdpRead (
    796796                    PxeBc,
    … …  
    16671667    return Status;
    16681668  }
    1669  
     1669
    16701670  Status = PxeBc->UdpRead (
    16711671                    PxeBc,
    … …  
    18171817
    18181818    do {
    1819      
     1819
    18201820      TimerStatus = gBS->CheckEvent (Timer);
    18211821      if (!EFI_ERROR (TimerStatus)) {
    … …  
    18231823      }
    18241824    } while (TimerStatus == EFI_NOT_READY);
    1825    
     1825
    18261826    gBS->CloseEvent (Timer);
    18271827  }

  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c

    r58459 r58466  
    255255           );
    256256
    257     if (Private->Snp != NULL) { 
     257    if (Private->Snp != NULL) {
    258258      //
    259259      // Close SNP from the child virtual handle
    … …  
    265265             Private->Ip4Nic->Controller
    266266             );
    267              
     267
    268268      gBS->UninstallProtocolInterface (
    269269             Private->Ip4Nic->Controller,
    … …  
    702702
    703703    //
    704     // Open SNP on the child handle BY_DRIVER. It will prevent any additionally 
     704    // Open SNP on the child handle BY_DRIVER. It will prevent any additionally
    705705    // layering to perform the experiment.
    706706    //
    … …  
    839839    for (Index = 0; Index < Private->Snp->Mode->HwAddressSize; Index++) {
    840840      Private->IaId |= (Private->Snp->Mode->CurrentAddress.Addr[Index] << ((Index << 3) & 31));
    841     } 
     841    }
    842842  }
    843843
    … …  
    10041004    goto ON_ERROR;
    10051005  }
    1006  
     1006
    10071007  if (Private->Snp != NULL) {
    10081008    //
    … …  
    10211021
    10221022    //
    1023     // Open SNP on the child handle BY_DRIVER. It will prevent any additionally 
     1023    // Open SNP on the child handle BY_DRIVER. It will prevent any additionally
    10241024    // layering to perform the experiment.
    10251025    //
    … …  
    11461146                                  device to be started.
    11471147  @param[in]  IpVersion           IP_VERSION_4 or IP_VERSION_6.
    1148  
     1148
    11491149  @retval EFI_SUCCESS         This driver supports this device.
    11501150  @retval EFI_UNSUPPORTED     This driver does not support this device.
    … …  
    11631163  EFI_GUID                        *DhcpServiceBindingGuid;
    11641164  EFI_GUID                        *MtftpServiceBindingGuid;
    1165  
     1165
    11661166  if (IpVersion == IP_VERSION_4) {
    11671167    DhcpServiceBindingGuid  = &gEfiDhcp4ServiceBindingProtocolGuid;
    … …  
    13061306    //
    13071307    // Install PxeBaseCodePrivate protocol onto the real NIC handler.
    1308     // PxeBaseCodePrivate protocol is only used to keep the relationship between 
     1308    // PxeBaseCodePrivate protocol is only used to keep the relationship between
    13091309    // NIC handle and virtual child handles.
    13101310    // gEfiCallerIdGuid will be used as its protocol guid.
    … …  
    13231323    // Try to locate SNP protocol.
    13241324    //
    1325     NetLibGetSnpHandle(ControllerHandle, &Private->Snp);   
     1325    NetLibGetSnpHandle(ControllerHandle, &Private->Snp);
    13261326  }
    13271327

  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c

    r58459 r58466  
    9292      goto ON_ERROR;
    9393    }
    94    
     94
    9595    //
    9696    // Configure block size for TFTP as a default value to handle all link layers.
    … …  
    137137      goto ON_ERROR;
    138138    }
    139    
     139
    140140    //
    141141    // Configure block size for TFTP as a default value to handle all link layers.
    … …  
    725725    FreePool (NewCreatedInfo);
    726726  }
    727  
     727
    728728  if (Mode->UsingIpv6) {
    729729    Private->Udp6Read->Configure (Private->Udp6Read, &Private->Udp6CfgData);
    … …  
    731731    Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);
    732732  }
    733  
     733
    734734  //
    735735  // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP
    … …  
    16221622      //
    16231623      Private->Udp4Read->Configure (Private->Udp4Read, NULL);
    1624  
     1624
    16251625      //
    16261626      // Configure the UDP instance with the new configuration.
    … …  
    16321632        return Status;
    16331633      }
    1634  
     1634
    16351635      //
    16361636      // In not Promiscuous mode, need to join the new multicast group.
    … …  
    16611661      //
    16621662      Private->Udp6Read->Configure (Private->Udp6Read, NULL);
    1663  
     1663
    16641664      //
    16651665      // Configure the UDP instance with the new configuration.
    … …  
    16701670        return Status;
    16711671      }
    1672  
     1672
    16731673      //
    16741674      // In not Promiscuous mode, need to join the new multicast group.

  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.h

    r58459 r58466  
    102102
    103103  PXEBC_PRIVATE_PROTOCOL                    Id;
    104   EFI_SIMPLE_NETWORK_PROTOCOL               *Snp; 
     104  EFI_SIMPLE_NETWORK_PROTOCOL               *Snp;
    105105
    106106  PXEBC_VIRTUAL_NIC                         *Ip4Nic;

  • trunk/src/VBox/Devices/EFI/Firmware/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

    r58459 r58466  
    11## @file
    22#  Access PXE-compatible devices for network access and network booting.
    3 # 
     3#
    44#  This driver provides PXE Base Code Protocol which is used to accessing
    55#  PXE-compatible device for network access or booting. It could work together
    … …  
    7474  ## TO_START
    7575  ## SOMETIMES_CONSUMES
    76   gEfiDevicePathProtocolGuid                           
     76  gEfiDevicePathProtocolGuid
    7777  gEfiNetworkInterfaceIdentifierProtocolGuid_31        ## SOMETIMES_CONSUMES
    7878  gEfiArpServiceBindingProtocolGuid                    ## TO_START
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