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/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf

    r48674 r58459  
    11## @file
    2 # Component description file for Cpu Io Dxe Io Library.
     2# I/O Library implementation that uses the CPU I/O Protocol for I/O and MMIO operations.
    33#
    4 # I/O Library implementation that uses the CPU I/O Protocol for I/O
    5 #  and MMIO operations.
    6 # Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
     4# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
    75#
    86#  This program and the accompanying materials
     
    1917  INF_VERSION                    = 0x00010005
    2018  BASE_NAME                      = DxeIoLibCpuIo
     19  MODULE_UNI_FILE                = DxeIoLibCpuIo.uni
    2120  FILE_GUID                      = e94cd42a-3aad-4ea0-9b09-945891c60ccd
    2221  MODULE_TYPE                    = DXE_DRIVER
     
    4746
    4847[Protocols]
    49   gEfiCpuIoProtocolGuid                         # PROTOCOL ALWAYS_CONSUMED
     48  gEfiCpuIoProtocolGuid                         ## CONSUMES
    5049
    5150[Depex.common.DXE_DRIVER, Depex.common.DXE_RUNTIME_DRIVER, Depex.common.DXE_SAL_DRIVER, Depex.common.DXE_SMM_DRIVER]
    5251  gEfiCpuIoProtocolGuid
     52
  • trunk/src/VBox/Devices/EFI/Firmware/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoHighLevel.c

    r48674 r58459  
    55  Base Library.
    66
    7   Copyright (c) 2006, 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
     
    157157  If EndBit is greater than 7, then ASSERT().
    158158  If EndBit is less than StartBit, then ASSERT().
     159  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    159160
    160161  @param  Port      The I/O port to write.
     
    197198  If EndBit is greater than 7, then ASSERT().
    198199  If EndBit is less than StartBit, then ASSERT().
     200  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    199201
    200202  @param  Port      The I/O port to write.
     
    237239  If EndBit is greater than 7, then ASSERT().
    238240  If EndBit is less than StartBit, then ASSERT().
     241  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    239242
    240243  @param  Port      The I/O port to write.
     
    279282  If EndBit is greater than 7, then ASSERT().
    280283  If EndBit is less than StartBit, then ASSERT().
     284  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
     285  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    281286
    282287  @param  Port      The I/O port to write.
     
    437442  If EndBit is greater than 15, then ASSERT().
    438443  If EndBit is less than StartBit, then ASSERT().
     444  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    439445
    440446  @param  Port      The I/O port to write.
     
    477483  If EndBit is greater than 15, then ASSERT().
    478484  If EndBit is less than StartBit, then ASSERT().
     485  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    479486
    480487  @param  Port      The I/O port to write.
     
    517524  If EndBit is greater than 15, then ASSERT().
    518525  If EndBit is less than StartBit, then ASSERT().
     526  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    519527
    520528  @param  Port      The I/O port to write.
     
    559567  If EndBit is greater than 15, then ASSERT().
    560568  If EndBit is less than StartBit, then ASSERT().
     569  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
     570  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    561571
    562572  @param  Port      The I/O port to write.
     
    717727  If EndBit is greater than 31, then ASSERT().
    718728  If EndBit is less than StartBit, then ASSERT().
     729  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    719730
    720731  @param  Port      The I/O port to write.
     
    757768  If EndBit is greater than 31, then ASSERT().
    758769  If EndBit is less than StartBit, then ASSERT().
     770  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    759771
    760772  @param  Port      The I/O port to write.
     
    797809  If EndBit is greater than 31, then ASSERT().
    798810  If EndBit is less than StartBit, then ASSERT().
     811  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    799812
    800813  @param  Port      The I/O port to write.
     
    839852  If EndBit is greater than 31, then ASSERT().
    840853  If EndBit is less than StartBit, then ASSERT().
     854  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
     855  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    841856
    842857  @param  Port      The I/O port to write.
     
    9971012  If EndBit is greater than 63, then ASSERT().
    9981013  If EndBit is less than StartBit, then ASSERT().
     1014  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    9991015
    10001016  @param  Port      The I/O port to write.
     
    10371053  If EndBit is greater than 63, then ASSERT().
    10381054  If EndBit is less than StartBit, then ASSERT().
     1055  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    10391056
    10401057  @param  Port      The I/O port to write.
     
    10771094  If EndBit is greater than 63, then ASSERT().
    10781095  If EndBit is less than StartBit, then ASSERT().
     1096  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    10791097
    10801098  @param  Port      The I/O port to write.
     
    11191137  If EndBit is greater than 63, then ASSERT().
    11201138  If EndBit is less than StartBit, then ASSERT().
     1139  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
     1140  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    11211141
    11221142  @param  Port      The I/O port to write.
     
    12771297  If EndBit is greater than 7, then ASSERT().
    12781298  If EndBit is less than StartBit, then ASSERT().
     1299  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    12791300
    12801301  @param  Address   MMIO register to write.
     
    13181339  If EndBit is greater than 7, then ASSERT().
    13191340  If EndBit is less than StartBit, then ASSERT().
     1341  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    13201342
    13211343  @param  Address   MMIO register to write.
     
    13591381  If EndBit is greater than 7, then ASSERT().
    13601382  If EndBit is less than StartBit, then ASSERT().
     1383  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    13611384
    13621385  @param  Address   MMIO register to write.
     
    14011424  If EndBit is greater than 7, then ASSERT().
    14021425  If EndBit is less than StartBit, then ASSERT().
     1426  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
     1427  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    14031428
    14041429  @param  Address   MMIO register to write.
     
    15591584  If EndBit is greater than 15, then ASSERT().
    15601585  If EndBit is less than StartBit, then ASSERT().
     1586  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    15611587
    15621588  @param  Address   MMIO register to write.
     
    16001626  If EndBit is greater than 15, then ASSERT().
    16011627  If EndBit is less than StartBit, then ASSERT().
     1628  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    16021629
    16031630  @param  Address   MMIO register to write.
     
    16411668  If EndBit is greater than 15, then ASSERT().
    16421669  If EndBit is less than StartBit, then ASSERT().
     1670  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    16431671
    16441672  @param  Address   MMIO register to write.
     
    16831711  If EndBit is greater than 15, then ASSERT().
    16841712  If EndBit is less than StartBit, then ASSERT().
     1713  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
     1714  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    16851715
    16861716  @param  Address   MMIO register to write.
     
    18411871  If EndBit is greater than 31, then ASSERT().
    18421872  If EndBit is less than StartBit, then ASSERT().
     1873  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    18431874
    18441875  @param  Address   MMIO register to write.
     
    18821913  If EndBit is greater than 31, then ASSERT().
    18831914  If EndBit is less than StartBit, then ASSERT().
     1915  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    18841916
    18851917  @param  Address   MMIO register to write.
     
    19231955  If EndBit is greater than 31, then ASSERT().
    19241956  If EndBit is less than StartBit, then ASSERT().
     1957  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    19251958
    19261959  @param  Address   MMIO register to write.
     
    19651998  If EndBit is greater than 31, then ASSERT().
    19661999  If EndBit is less than StartBit, then ASSERT().
     2000  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
     2001  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    19672002
    19682003  @param  Address   MMIO register to write.
     
    21232158  If EndBit is greater than 63, then ASSERT().
    21242159  If EndBit is less than StartBit, then ASSERT().
     2160  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    21252161
    21262162  @param  Address   MMIO register to write.
     
    21642200  If EndBit is greater than 63, then ASSERT().
    21652201  If EndBit is less than StartBit, then ASSERT().
     2202  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    21662203
    21672204  @param  Address   MMIO register to write.
     
    22052242  If EndBit is greater than 63, then ASSERT().
    22062243  If EndBit is less than StartBit, then ASSERT().
     2244  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    22072245
    22082246  @param  Address   MMIO register to write.
     
    22472285  If EndBit is greater than 63, then ASSERT().
    22482286  If EndBit is less than StartBit, then ASSERT().
     2287  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
     2288  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().
    22492289
    22502290  @param  Address   MMIO register to write.
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