Changeset 67446 in vbox for trunk/src/VBox

Timestamp:

Jun 16, 2017 2:39:47 PM (8 years ago)

Author:

vboxsync

Message:

EFI: use the ASMOut/In for now

Location:

trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/PlatformPei

Files:

• Platform.c (modified) (2 diffs)
• PlatformPei.inf (modified) (1 diff)

trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/PlatformPei/Platform.c

@@ -41 +41 @@
 
 #ifdef VBOX
-# define IN_RING0
-# include "../../../../DevEFI.h"
+# include "VBoxPkg.h"
+# include "DevEFI.h"
+# include "iprt/asm.h"
 #endif
 
@@ -76 +77 @@
   UINT32 cbVar, offBuf;
 
-  IoWrite32(EFI_INFO_PORT, Variable);
-  cbVar = IoRead32(EFI_INFO_PORT);
+  ASMOutU32(EFI_INFO_PORT, Variable);
+  cbVar = ASMInU32(EFI_INFO_PORT);
 
   for (offBuf = 0; offBuf < cbVar && offBuf < cbBuf; offBuf++)
-    pbBuf[offBuf] = IoRead8(EFI_INFO_PORT);
+    pbBuf[offBuf] = ASMInU8(EFI_INFO_PORT);
 
   return cbVar;

trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/PlatformPei/PlatformPei.inf

@@ -42 +42 @@
   UefiCpuPkg/UefiCpuPkg.dec
   OvmfPkg/OvmfPkg.dec
+  VBoxPkg/VBoxPkg.dec                           # VBox specific so the code can find some necessary headers
 
 [Guids]