Changeset 24798 in vbox for trunk/src/VBox

Timestamp:

Nov 19, 2009 3:34:31 PM (15 years ago)

Author:

vboxsync

Message:

EFI: flags suffix X64->AMD64.

Location:

trunk/src/VBox/Devices/EFI

Files:

• Firmware2/VBoxPkg/Include/DevEFI.h (modified) (1 diff)
• Firmware2/VBoxPkg/Include/DevEFI.mac (modified) (1 diff)
• Thunk/EfiThunk.asm (modified) (1 diff)

trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.h

@@ -135 +135 @@
 /** The physical address where DEVEFIINFO can be found. */
 #define DEVEFI_INFO_PHYS_ADDR   (0xfffff000)
-#define DEVEFI_INFO_FLAGS_X64   RT_BIT(0)
+#define DEVEFI_INFO_FLAGS_AMD64   RT_BIT(0)
 
 /** @} */

trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.mac

@@ -55 +55 @@
 
 %define DEVEFI_INFO_PHYS_ADDR   (0xfffff000)
-%define DEVEFI_INFO_FLAGS_X64   RT_BIT(0)
+%define DEVEFI_INFO_FLAGS_AMD64   RT_BIT(0)
 
 %endif

trunk/src/VBox/Devices/EFI/Thunk/EfiThunk.asm

@@ -210 +210 @@
         ;
         mov     eax,[0xfffff000 + DEVEFIINFO.fFlags]
-        and      eax, DEVEFI_INFO_FLAGS_X64
+        and      eax, DEVEFI_INFO_FLAGS_AMD64
         jnz trampoline_64
         mov     ebp, [0xfffff000 + DEVEFIINFO.PhysFwVol]