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/PeiIoLibCpuIo/IoHighLevel.c

    r48674 r58459  
    55  Base Library.
    66
    7   Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
     7  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
    88  This program and the accompanying materials
    99  are licensed and made available under the terms and conditions of the BSD License
     
    153153  If EndBit is greater than 7, then ASSERT().
    154154  If EndBit is less than StartBit, then ASSERT().
     155  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    155156
    156157  @param  Port      The I/O port to write.
     
    193194  If EndBit is greater than 7, then ASSERT().
    194195  If EndBit is less than StartBit, then ASSERT().
     196  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    195197
    196198  @param  Port      The I/O port to write.
     
    233235  If EndBit is greater than 7, then ASSERT().
    234236  If EndBit is less than StartBit, then ASSERT().
     237  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    235238
    236239  @param  Port      The I/O port to write.
     
    275278  If EndBit is greater than 7, then ASSERT().
    276279  If EndBit is less than StartBit, then ASSERT().
     280  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
     281  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    277282
    278283  @param  Port      The I/O port to write.
     
    438443  If EndBit is greater than 15, then ASSERT().
    439444  If EndBit is less than StartBit, then ASSERT().
     445  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    440446
    441447  @param  Port      The I/O port to write.
     
    479485  If EndBit is greater than 15, then ASSERT().
    480486  If EndBit is less than StartBit, then ASSERT().
     487  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    481488
    482489  @param  Port      The I/O port to write.
     
    520527  If EndBit is greater than 15, then ASSERT().
    521528  If EndBit is less than StartBit, then ASSERT().
     529  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    522530
    523531  @param  Port      The I/O port to write.
     
    563571  If EndBit is greater than 15, then ASSERT().
    564572  If EndBit is less than StartBit, then ASSERT().
     573  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
     574  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    565575
    566576  @param  Port      The I/O port to write.
     
    726736  If EndBit is greater than 31, then ASSERT().
    727737  If EndBit is less than StartBit, then ASSERT().
     738  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    728739
    729740  @param  Port      The I/O port to write.
     
    767778  If EndBit is greater than 31, then ASSERT().
    768779  If EndBit is less than StartBit, then ASSERT().
     780  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    769781
    770782  @param  Port      The I/O port to write.
     
    808820  If EndBit is greater than 31, then ASSERT().
    809821  If EndBit is less than StartBit, then ASSERT().
     822  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    810823
    811824  @param  Port      The I/O port to write.
     
    851864  If EndBit is greater than 31, then ASSERT().
    852865  If EndBit is less than StartBit, then ASSERT().
     866  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
     867  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    853868
    854869  @param  Port      The I/O port to write.
     
    10141029  If EndBit is greater than 63, then ASSERT().
    10151030  If EndBit is less than StartBit, then ASSERT().
     1031  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    10161032
    10171033  @param  Port      The I/O port to write.
     
    10551071  If EndBit is greater than 63, then ASSERT().
    10561072  If EndBit is less than StartBit, then ASSERT().
     1073  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    10571074
    10581075  @param  Port      The I/O port to write.
     
    10961113  If EndBit is greater than 63, then ASSERT().
    10971114  If EndBit is less than StartBit, then ASSERT().
     1115  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    10981116
    10991117  @param  Port      The I/O port to write.
     
    11391157  If EndBit is greater than 63, then ASSERT().
    11401158  If EndBit is less than StartBit, then ASSERT().
     1159  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
     1160  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    11411161
    11421162  @param  Port      The I/O port to write.
     
    12971317  If EndBit is greater than 7, then ASSERT().
    12981318  If EndBit is less than StartBit, then ASSERT().
     1319  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    12991320
    13001321  @param  Address   The MMIO register to write.
     
    13381359  If EndBit is greater than 7, then ASSERT().
    13391360  If EndBit is less than StartBit, then ASSERT().
     1361  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    13401362
    13411363  @param  Address   The MMIO register to write.
     
    13791401  If EndBit is greater than 7, then ASSERT().
    13801402  If EndBit is less than StartBit, then ASSERT().
     1403  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    13811404
    13821405  @param  Address   The MMIO register to write.
     
    14211444  If EndBit is greater than 7, then ASSERT().
    14221445  If EndBit is less than StartBit, then ASSERT().
     1446  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
     1447  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    14231448
    14241449  @param  Address   The MMIO register to write.
     
    15831608  If EndBit is greater than 15, then ASSERT().
    15841609  If EndBit is less than StartBit, then ASSERT().
     1610  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    15851611
    15861612  @param  Address   The MMIO register to write.
     
    16251651  If EndBit is greater than 15, then ASSERT().
    16261652  If EndBit is less than StartBit, then ASSERT().
     1653  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    16271654
    16281655  @param  Address   The MMIO register to write.
     
    16671694  If EndBit is greater than 15, then ASSERT().
    16681695  If EndBit is less than StartBit, then ASSERT().
     1696  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    16691697
    16701698  @param  Address   The MMIO register to write.
     
    17101738  If EndBit is greater than 15, then ASSERT().
    17111739  If EndBit is less than StartBit, then ASSERT().
     1740  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
     1741  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    17121742
    17131743  @param  Address   The MMIO register to write.
     
    18721902  If EndBit is greater than 31, then ASSERT().
    18731903  If EndBit is less than StartBit, then ASSERT().
     1904  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    18741905
    18751906  @param  Address   The MMIO register to write.
     
    19141945  If EndBit is greater than 31, then ASSERT().
    19151946  If EndBit is less than StartBit, then ASSERT().
     1947  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    19161948
    19171949  @param  Address   The MMIO register to write.
     
    19561988  If EndBit is greater than 31, then ASSERT().
    19571989  If EndBit is less than StartBit, then ASSERT().
     1990  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    19581991
    19591992  @param  Address   The MMIO register to write.
     
    19992032  If EndBit is greater than 31, then ASSERT().
    20002033  If EndBit is less than StartBit, then ASSERT().
     2034  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
     2035  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    20012036
    20022037  @param  Address   The MMIO register to write.
     
    21612196  If EndBit is greater than 63, then ASSERT().
    21622197  If EndBit is less than StartBit, then ASSERT().
     2198  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    21632199
    21642200  @param  Address   The MMIO register to write.
     
    22032239  If EndBit is greater than 63, then ASSERT().
    22042240  If EndBit is less than StartBit, then ASSERT().
     2241  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    22052242
    22062243  @param  Address   MMIO register to write.
     
    22452282  If EndBit is greater than 63, then ASSERT().
    22462283  If EndBit is less than StartBit, then ASSERT().
     2284  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    22472285
    22482286  @param  Address   MMIO register to write.
     
    22882326  If EndBit is greater than 63, then ASSERT().
    22892327  If EndBit is less than StartBit, then ASSERT().
     2328  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
     2329  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    22902330
    22912331  @param  Address   The MMIO register to write.
  • trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf

    r48674 r58459  
    55#  and MMIO operations.
    66#
    7 # Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
     7# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
    88#
    99#  This program and the accompanying materials
     
    2020  INF_VERSION                    = 0x00010005
    2121  BASE_NAME                      = PeiIoLibCpuIo
     22  MODULE_UNI_FILE                = PeiIoLibCpuIo.uni
    2223  FILE_GUID                      = b2585b69-fb63-4220-844a-8fbea8bf01af
    2324  MODULE_TYPE                    = PEIM
     
    4546[Depex.common.PEIM]
    4647  gEfiPeiCpuIoPpiInstalledGuid
     48
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