VirtualBox

Ignore:
Timestamp:
Oct 28, 2015 8:17:18 PM (9 years ago)
Author:
vboxsync
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:
3 edited

Legend:

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

  • trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/UefiMemoryAllocationLib/MemoryAllocationLib.c

    r48674 r58459  
    33  on boot services for Dxe phase drivers.
    44
    5   Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
     5  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
    66  This program and the accompanying materials                         
    77  are licensed and made available under the terms and conditions of the BSD License         
     
    161161  NULL is returned.
    162162  If Alignment is not a power of two and Alignment is not zero, then ASSERT().
     163  If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().
    163164
    164165  @param  MemoryType            The type of memory to allocate.
     
    247248 
    248249  If Alignment is not a power of two and Alignment is not zero, then ASSERT().
     250  If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().
    249251
    250252  @param  Pages                 The number of 4 KB pages to allocate.
     
    274276 
    275277  If Alignment is not a power of two and Alignment is not zero, then ASSERT().
     278  If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().
    276279
    277280  @param  Pages                 The number of 4 KB pages to allocate.
     
    301304 
    302305  If Alignment is not a power of two and Alignment is not zero, then ASSERT().
     306  If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().
    303307
    304308  @param  Pages                 The number of 4 KB pages to allocate.
  • trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

    r48674 r58459  
    55#  and free memory.
    66#
    7 # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
     7# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
    88#
    99#  This program and the accompanying materials
     
    2020  INF_VERSION                    = 0x00010005
    2121  BASE_NAME                      = UefiMemoryAllocationLib
     22  MODULE_UNI_FILE                = UefiMemoryAllocationLib.uni
    2223  FILE_GUID                      = 4674739d-3195-4fb2-8094-ac1d22d00194
    2324  MODULE_TYPE                    = UEFI_DRIVER
     
    3940  BaseMemoryLib
    4041  UefiBootServicesTableLib
     42
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