VirtualBox

Ignore:
Timestamp:
Oct 29, 2015 4:30:44 AM (9 years ago)
Author:
vboxsync
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:
9 edited

Legend:

Unmodified
Added
Removed

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

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c

    r58459 r58466  
    807807        PortTfd = AhciReadReg (PciIo, (UINT32) Offset);
    808808        //
    809         // PxTFD will be updated if there is a D2H or SetupFIS received. 
     809        // PxTFD will be updated if there is a D2H or SetupFIS received.
    810810        //
    811811        if ((PortTfd & EFI_AHCI_PORT_TFD_ERR) != 0) {
    … …  
    14431443  //
    14441444  Capability = AhciReadReg (PciIo, EFI_AHCI_CAPABILITY_OFFSET);
    1445  
     1445
    14461446  //
    14471447  // Enable AE before accessing any AHCI registers if Supports AHCI Mode Only is not set
    … …  
    19981998  MaxCommandSlotNumber = (UINT8) (((Capability & 0x1F00) >> 8) + 1);
    19991999  Support64Bit         = (BOOLEAN) (((Capability & BIT31) != 0) ? TRUE : FALSE);
    2000  
     2000
    20012001  PortImplementBitMap  = AhciReadReg(PciIo, EFI_AHCI_PI_OFFSET);
    20022002  //
    … …  
    22562256  //
    22572257  Capability = AhciReadReg (PciIo, EFI_AHCI_CAPABILITY_OFFSET);
    2258  
     2258
    22592259  //
    22602260  // Enable AE before accessing any AHCI registers if Supports AHCI Mode Only is not set
    … …  
    22632263    AhciOrReg (PciIo, EFI_AHCI_GHC_OFFSET, EFI_AHCI_GHC_ENABLE);
    22642264  }
    2265  
     2265
    22662266  //
    22672267  // Get the number of command slots per port supported by this HBA.

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.h

    r58459 r58466  
    11/** @file
    22  Header file for AHCI mode of ATA host controller.
    3  
     3
    44  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
    5   This program and the accompanying materials                         
    6   are licensed and made available under the terms and conditions of the BSD License         
    7   which accompanies this distribution.  The full text of the license may be found at       
    8   http://opensource.org/licenses/bsd-license.php                                           
    9 
    10   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
    11   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
     5  This program and the accompanying materials
     6  are licensed and made available under the terms and conditions of the BSD License
     7  which accompanies this distribution.  The full text of the license may be found at
     8  http://opensource.org/licenses/bsd-license.php
     9
     10  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
     11  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
    1212
    1313**/
    … …  
    6464
    6565#define EFI_AHCI_FIS_REGISTER_H2D              0x27      //Register FIS - Host to Device
    66 #define   EFI_AHCI_FIS_REGISTER_H2D_LENGTH     20 
     66#define   EFI_AHCI_FIS_REGISTER_H2D_LENGTH     20
    6767#define EFI_AHCI_FIS_REGISTER_D2H              0x34      //Register FIS - Device to Host
    6868#define   EFI_AHCI_FIS_REGISTER_D2H_LENGTH     20
    … …  
    203203  UINT32   AhciCmdCtba;       //Command Table Descriptor Base Address
    204204  UINT32   AhciCmdCtbau;      //Command Table Descriptor Base Address Upper 32-BITs
    205   UINT32   AhciCmdRsvd1[4]; 
     205  UINT32   AhciCmdRsvd1[4];
    206206} EFI_AHCI_COMMAND_LIST;
    207207
    208208//
    209209// This is a software constructed FIS.
    210 // For data transfer operations, this is the H2D Register FIS format as 
     210// For data transfer operations, this is the H2D Register FIS format as
    211211// specified in the Serial ATA Revision 2.6 specification.
    212212//
    … …  
    247247// The entry data structure is listed at the following.
    248248// the actual entry number comes from the PRDTL field in the command
    249 // list entry for this command slot. 
     249// list entry for this command slot.
    250250//
    251251typedef struct {
    … …  
    275275  UINT8    AhciDmaSetupFisRsvd[0x04];
    276276  UINT8    AhciPioSetupFis[0x14];         // Pio Setup Fis: offset 0x20
    277   UINT8    AhciPioSetupFisRsvd[0x0C];     
     277  UINT8    AhciPioSetupFisRsvd[0x0C];
    278278  UINT8    AhciD2HRegisterFis[0x14];      // D2H Register Fis: offset 0x40
    279279  UINT8    AhciD2HRegisterFisRsvd[0x04];
    280280  UINT64   AhciSetDeviceBitsFis;          // Set Device Bits Fix: offset 0x58
    281281  UINT8    AhciUnknownFis[0x40];          // Unkonwn Fis: offset 0x60
    282   UINT8    AhciUnknownFisRsvd[0x60];     
    283 } EFI_AHCI_RECEIVED_FIS; 
     282  UINT8    AhciUnknownFisRsvd[0x60];
     283} EFI_AHCI_RECEIVED_FIS;
    284284
    285285#pragma pack()
    … …  
    301301
    302302/**
    303   This function is used to send out ATAPI commands conforms to the Packet Command 
     303  This function is used to send out ATAPI commands conforms to the Packet Command
    304304  with PIO Protocol.
    305305
    306306  @param PciIo              The PCI IO protocol instance.
    307307  @param AhciRegisters      The pointer to the EFI_AHCI_REGISTERS.
    308   @param Port               The number of port.     
     308  @param Port               The number of port.
    309309  @param PortMultiplier     The number of port multiplier.
    310310  @param Packet             A pointer to EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET structure.
    … …  
    327327/**
    328328  Start command for give slot on specific port.
    329    
     329
    330330  @param  PciIo              The PCI IO protocol instance.
    331331  @param  Port               The number of port.
    332332  @param  CommandSlot        The number of CommandSlot.
    333333  @param  Timeout            The timeout value of start, uses 100ns as a unit.
    334    
     334
    335335  @retval EFI_DEVICE_ERROR   The command start unsuccessfully.
    336336  @retval EFI_TIMEOUT        The operation is time out.
    … …  
    349349/**
    350350  Stop command running for giving port
    351    
     351
    352352  @param  PciIo              The PCI IO protocol instance.
    353353  @param  Port               The number of port.
    354354  @param  Timeout            The timeout value of stop, uses 100ns as a unit.
    355    
     355
    356356  @retval EFI_DEVICE_ERROR   The command stop unsuccessfully.
    357357  @retval EFI_TIMEOUT        The operation is time out.

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c

    r58459 r58466  
    20752075      // skip the loop.
    20762076      //
    2077       if ((PtrSenseData->Sense_Key == EFI_SCSI_SK_NO_SENSE) || 
     2077      if ((PtrSenseData->Sense_Key == EFI_SCSI_SK_NO_SENSE) ||
    20782078          (SenseDataLen + sizeof (EFI_SCSI_SENSE_DATA) > Packet->SenseDataLength)) {
    20792079        SenseReq = FALSE;

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf

    r58459 r58466  
    3030#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
    3131#
    32 #  DRIVER_BINDING                =  gAtaAtapiPassThruDriverBinding                         
     32#  DRIVER_BINDING                =  gAtaAtapiPassThruDriverBinding
    3333#  COMPONENT_NAME                =  gAtaAtapiPassThruComponentName
    34 #  COMPONENT_NAME2               =  gAtaAtapiPassThruComponentName2                         
     34#  COMPONENT_NAME2               =  gAtaAtapiPassThruComponentName2
    3535#
    3636#
    … …  
    4444  IdeMode.h
    4545  ComponentName.c
    46  
     46
    4747[Packages]
    4848  MdePkg/MdePkg.dec

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/ComponentName.c

    r48674 r58466  
    11/** @file
    22  UEFI Component Name(2) protocol implementation for AtaAtapiPassThru driver.
    3  
     3
    44  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
    5   This program and the accompanying materials                         
    6   are licensed and made available under the terms and conditions of the BSD License         
    7   which accompanies this distribution.  The full text of the license may be found at       
    8   http://opensource.org/licenses/bsd-license.php                                           
    9 
    10   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
    11   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
     5  This program and the accompanying materials
     6  are licensed and made available under the terms and conditions of the BSD License
     7  which accompanies this distribution.  The full text of the license may be found at
     8  http://opensource.org/licenses/bsd-license.php
     9
     10  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
     11  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
    1212
    1313**/
    … …  
    1616
    1717//
    18 // Driver name table 
     18// Driver name table
    1919//
    2020GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mAtaAtapiPassThruDriverNameTable[] = {

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.h

    r48674 r58466  
    11/** @file
    22  Header file for IDE mode of ATA host controller.
    3  
     3
    44  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
    5   This program and the accompanying materials                         
    6   are licensed and made available under the terms and conditions of the BSD License         
    7   which accompanies this distribution.  The full text of the license may be found at       
    8   http://opensource.org/licenses/bsd-license.php                                           
    9 
    10   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
    11   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
     5  This program and the accompanying materials
     6  are licensed and made available under the terms and conditions of the BSD License
     7  which accompanies this distribution.  The full text of the license may be found at
     8  http://opensource.org/licenses/bsd-license.php
     9
     10  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
     11  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
    1212
    1313**/
    … …  
    122122
    123123/**
    124   Get IDE i/o port registers' base addresses by mode. 
     124  Get IDE i/o port registers' base addresses by mode.
    125125
    126126  In 'Compatibility' mode, use fixed addresses.
    … …  
    145145
    146146  Table 1. Compatibility resource mappings
    147  
     147
    148148  b) In Native-PCI mode, IDE registers are mapped into IO space using the BARs
    149149  in IDE controller's PCI Configuration Space, shown in the Table 2 below.
    … …  
    162162  @param[in, out] IdeRegisters   Pointer to EFI_IDE_REGISTERS which is used to
    163163                                 store the IDE i/o port registers' base addresses
    164            
     164
    165165  @retval EFI_UNSUPPORTED        Return this value when the BARs is not IO type
    166166  @retval EFI_SUCCESS            Get the Base address successfully
    … …  
    176176
    177177/**
    178   This function is used to send out ATAPI commands conforms to the Packet Command 
     178  This function is used to send out ATAPI commands conforms to the Packet Command
    179179  with PIO Data In Protocol.
    180180

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c

    r58459 r58466  
    633633  //
    634634  // Aborting operation has been done. From now on, don't need to abort normal operation.
    635   // 
     635  //
    636636  OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
    637637  AtaDevice->Abort = FALSE;

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Ata/AtaBusDxe/ComponentName.c

    r48674 r58466  
    11/** @file
    22  UEFI Component Name(2) protocol implementation for ConPlatform driver.
    3  
     3
    44  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
    5   This program and the accompanying materials                         
    6   are licensed and made available under the terms and conditions of the BSD License         
    7   which accompanies this distribution.  The full text of the license may be found at       
    8   http://opensource.org/licenses/bsd-license.php                                           
    9 
    10   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
    11   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
     5  This program and the accompanying materials
     6  are licensed and made available under the terms and conditions of the BSD License
     7  which accompanies this distribution.  The full text of the license may be found at
     8  http://opensource.org/licenses/bsd-license.php
     9
     10  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
     11  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
    1212
    1313**/
    … …  
    1616
    1717//
    18 // Driver name table 
     18// Driver name table
    1919//
    2020GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mAtaBusDriverNameTable[] = {
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