Changeset 48727 in vbox for trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable

Timestamp:

Sep 27, 2013 11:03:53 AM (11 years ago)

Author:

vboxsync

Message:

EFI: EFI image load events, EFI debug points, always disabled frame-pointer optimizations on MSFT. Some cleanups.

File:

• trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/InitVariable.c (modified) (10 diffs)

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/InitVariable.c

@@ -58 +58 @@
     UINT32 idxBuffer = 0;
     for (idxBuffer = 0; idxBuffer < cbBuffer; ++idxBuffer)
-        pu8Buffer[idxBuffer] = ASMInU8(EFI_VARIABLE_OP);
+        pu8Buffer[idxBuffer] = ASMInU8(EFI_PORT_VARIABLE_OP);
     return idxBuffer;
 }
@@ -64 +64 @@
 DECLINLINE(void) VBoxWriteNVRAMU32Param(UINT32 u32CodeParam, UINT32 u32Param)
 {
-    ASMOutU32(EFI_VARIABLE_OP, u32CodeParam);
-    ASMOutU32(EFI_VARIABLE_PARAM, u32Param);
+    ASMOutU32(EFI_PORT_VARIABLE_OP, u32CodeParam);
+    ASMOutU32(EFI_PORT_VARIABLE_PARAM, u32Param);
 }
 
@@ -72 +72 @@
     UINT32 idxParam = 0;
     for (idxParam = 0; idxParam < cbParam; ++idxParam)
-        ASMOutU8(EFI_VARIABLE_PARAM, pbParam[idxParam]);
+        ASMOutU8(EFI_PORT_VARIABLE_PARAM, pbParam[idxParam]);
     return idxParam;
 }
@@ -81 +81 @@
     UINTN cwcName = StrLen(pwszName);
 
-    ASMOutU32(EFI_VARIABLE_OP, EFI_VM_VARIABLE_OP_NAME_UTF16);
+    ASMOutU32(EFI_PORT_VARIABLE_OP, EFI_VM_VARIABLE_OP_NAME_UTF16);
     for (i = 0; i <= cwcName; i++)
-        ASMOutU16(EFI_VARIABLE_PARAM, pwszName[i]);
+        ASMOutU16(EFI_PORT_VARIABLE_PARAM, pwszName[i]);
 }
 
 DECLINLINE(UINT32) VBoxWriteNVRAMGuidParam(const EFI_GUID *pGuid)
 {
-    ASMOutU32(EFI_VARIABLE_OP, EFI_VM_VARIABLE_OP_GUID);
+    ASMOutU32(EFI_PORT_VARIABLE_OP, EFI_VM_VARIABLE_OP_GUID);
     return VBoxWriteNVRAMByteArrayParam((UINT8 *)pGuid, sizeof(EFI_GUID));
 }
@@ -99 +99 @@
     VBoxWriteNVRAMU32Param(EFI_VM_VARIABLE_OP_START, u32Operation);
 
-    while ((u32Rc = ASMInU32(EFI_VARIABLE_OP)) == EFI_VARIABLE_OP_STATUS_BSY)
+    while ((u32Rc = ASMInU32(EFI_PORT_VARIABLE_OP)) == EFI_VARIABLE_OP_STATUS_BSY)
     {
 #if 0
@@ -166 +166 @@
          */
         UINT32 VarLen;
-        ASMOutU32(EFI_VARIABLE_OP, EFI_VM_VARIABLE_OP_VALUE_LENGTH);
-        VarLen = ASMInU32(EFI_VARIABLE_OP);
+        ASMOutU32(EFI_PORT_VARIABLE_OP, EFI_VM_VARIABLE_OP_VALUE_LENGTH);
+        VarLen = ASMInU32(EFI_PORT_VARIABLE_OP);
         LogFlowFuncMarkVar(*DataSize, "%d");
         LogFlowFuncMarkVar(VarLen, "%d");
@@ -177 +177 @@
              */
             *DataSize = VarLen;
-            ASMOutU32(EFI_VARIABLE_OP, EFI_VM_VARIABLE_OP_VALUE);
+            ASMOutU32(EFI_PORT_VARIABLE_OP, EFI_VM_VARIABLE_OP_VALUE);
             VBoxReadNVRAM((UINT8 *)Data, VarLen);
 
             if (Attributes)
             {
-                ASMOutU32(EFI_VARIABLE_OP, EFI_VM_VARIABLE_OP_ATTRIBUTE);
-                *Attributes = ASMInU32(EFI_VARIABLE_OP);
+                ASMOutU32(EFI_PORT_VARIABLE_OP, EFI_VM_VARIABLE_OP_ATTRIBUTE);
+                *Attributes = ASMInU32(EFI_PORT_VARIABLE_OP);
                 LogFlowFuncMarkVar(Attributes, "%x");
             }
@@ -271 +271 @@
          */
         UINT32      cwcName;
-        ASMOutU32(EFI_VARIABLE_OP, EFI_VM_VARIABLE_OP_NAME_LENGTH_UTF16);
-        cwcName = ASMInU32(EFI_VARIABLE_OP);
+        ASMOutU32(EFI_PORT_VARIABLE_OP, EFI_VM_VARIABLE_OP_NAME_LENGTH_UTF16);
+        cwcName = ASMInU32(EFI_PORT_VARIABLE_OP);
         if ((cwcName + 1) * 2 <= *VariableNameSize) /* ASSUMES byte size is specified */
         {
@@ -280 +280 @@
              * Read back the result.
              */
-            ASMOutU32(EFI_VARIABLE_OP, EFI_VM_VARIABLE_OP_GUID);
+            ASMOutU32(EFI_PORT_VARIABLE_OP, EFI_VM_VARIABLE_OP_GUID);
             VBoxReadNVRAM((UINT8 *)VendorGuid, sizeof(EFI_GUID));
 
-            ASMOutU32(EFI_VARIABLE_OP, EFI_VM_VARIABLE_OP_NAME_UTF16);
+            ASMOutU32(EFI_PORT_VARIABLE_OP, EFI_VM_VARIABLE_OP_NAME_UTF16);
             for (i = 0; i < cwcName; i++)
-                VariableName[i] = ASMInU16(EFI_VARIABLE_OP);
+                VariableName[i] = ASMInU16(EFI_PORT_VARIABLE_OP);
             VariableName[i] = '\0';
 
@@ -356 +356 @@
     VBoxWriteNVRAMU32Param(EFI_VM_VARIABLE_OP_VALUE_LENGTH, (UINT32)DataSize);
     /* fill value bytes */
-    ASMOutU32(EFI_VARIABLE_OP, EFI_VM_VARIABLE_OP_VALUE);
+    ASMOutU32(EFI_PORT_VARIABLE_OP, EFI_VM_VARIABLE_OP_VALUE);
     VBoxWriteNVRAMByteArrayParam(Data, (UINT32)DataSize);
     /* start fetch operation */