VirtualBox

Ignore:
Timestamp:
Apr 14, 2023 3:17:44 PM (2 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
156854
Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:
trunk/src/VBox/Devices/EFI/FirmwareNew
Files:
2 edited

Legend:

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

  • trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c

    r80721 r99404  
    3131VOID
    3232InternalAcpiDelay (
    33   IN      UINT32                    Delay
    34   )
    35 {
    36   UINT32                            Ticks;
    37   UINT32                            Times;
    38 
    39   Times    = Delay >> 22;
    40   Delay   &= BIT22 - 1;
     33  IN      UINT32  Delay
     34  )
     35{
     36  UINT32  Ticks;
     37  UINT32  Times;
     38
     39  Times  = Delay >> 22;
     40  Delay &= BIT22 - 1;
    4141  do {
    4242    //
    4343    // The target timer count is calculated here
    4444    //
    45     Ticks    = InternalAcpiGetTimerTick () + Delay;
    46     Delay    = BIT22;
     45    Ticks = InternalAcpiGetTimerTick () + Delay;
     46    Delay = BIT22;
    4747    //
    4848    // Wait until time out
     
    6969EFIAPI
    7070MicroSecondDelay (
    71   IN      UINTN                     MicroSeconds
     71  IN      UINTN  MicroSeconds
    7272  )
    7373{
     
    9797EFIAPI
    9898NanoSecondDelay (
    99   IN      UINTN                     NanoSeconds
     99  IN      UINTN  NanoSeconds
    100100  )
    101101{
     
    159159EFIAPI
    160160GetPerformanceCounterProperties (
    161   OUT      UINT64                    *StartValue,  OPTIONAL
    162   OUT      UINT64                    *EndValue     OPTIONAL
     161  OUT      UINT64  *StartValue   OPTIONAL,
     162  OUT      UINT64  *EndValue     OPTIONAL
    163163  )
    164164{
     
    188188EFIAPI
    189189GetTimeInNanoSecond (
    190   IN      UINT64                     Ticks
     190  IN      UINT64  Ticks
    191191  )
    192192{
     
    205205  // will not overflow 64-bit.
    206206  //
    207   NanoSeconds += DivU64x32 (MultU64x32 ((UINT64) Remainder, 1000000000u), ACPI_TIMER_FREQUENCY);
     207  NanoSeconds += DivU64x32 (MultU64x32 ((UINT64)Remainder, 1000000000u), ACPI_TIMER_FREQUENCY);
    208208
    209209  return NanoSeconds;
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