InOsEmuPkg: Fix issue with EFI_LBA not being implemented as a UINT64 in the IA-32...

Also clean up some missing EFIAPI.

signed-off-by: andrewfish

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11855 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/InOsEmuPkg/Unix/Sec/Gasket.h b/InOsEmuPkg/Unix/Sec/Gasket.h
index a9ecf8dfc8d6ae13d521403642a2ce111c5b0550..e5966964c5312fc5c8e32d8dac064c15d6a02aef 100644 (file)
--- a/InOsEmuPkg/Unix/Sec/Gasket.h
+++ b/InOsEmuPkg/Unix/Sec/Gasket.h
@@ -94,11 +94,13 @@ GasketSecDisableInterrupt (
   );\r
   \r
 UINT64  \r
+EFIAPI\r
 GasketQueryPerformanceFrequency (\r
   VOID\r
   );\r
 \r
 UINT64\r
+EFIAPI\r
 GasketQueryPerformanceCounter (\r
   VOID\r
   );\r
@@ -176,7 +178,7 @@ GasketSecUnixUnixFwhAddress (
 \r
 typedef\r
 void\r
-(*CALL_BACK) (\r
+(EFIAPI *CALL_BACK) (\r
   UINT64 Delta\r
   );\r
 \r
@@ -448,6 +450,7 @@ GasketEmuBlockIoReset (
   );\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 GasketEmuBlockIoReadBlocks (\r
   IN     EMU_BLOCK_IO_PROTOCOL  *This,\r
   IN     UINT32                 MediaId,\r
@@ -469,12 +472,14 @@ GasketEmuBlockIoWriteBlocks (
   );\r
   \r
 EFI_STATUS\r
+EFIAPI\r
 GasketEmuBlockIoFlushBlocks (\r
   IN     EMU_BLOCK_IO_PROTOCOL    *This,\r
   IN OUT EFI_BLOCK_IO2_TOKEN      *Token\r
   );\r
   \r
 EFI_STATUS\r
+EFIAPI\r
 GasketEmuBlockIoCreateMapping (\r
   IN     EMU_BLOCK_IO_PROTOCOL    *This,\r
   IN     EFI_BLOCK_IO_MEDIA       *Media\r

diff --git a/InOsEmuPkg/Unix/Sec/Ia32/Gasket.S b/InOsEmuPkg/Unix/Sec/Ia32/Gasket.S
index d9ac12d7f07b8515771a32d1a63f35554ea53536..f1b974e18a942c35b809ca938b1476037f32011a 100644 (file)
--- a/InOsEmuPkg/Unix/Sec/Ia32/Gasket.S
+++ b/InOsEmuPkg/Unix/Sec/Ia32/Gasket.S
@@ -1022,15 +1022,17 @@ ASM_GLOBAL ASM_PFX(GasketEmuBlockIoReadBlocks)
 ASM_PFX(GasketEmuBlockIoReadBlocks):
        pushl   %ebp
        movl    %esp, %ebp
-  subl  $40, %esp      // sub extra 16 from the stack for alignment
+  subl  $56, %esp      // sub extra 16 from the stack for alignment
   and   $-16, %esp    // stack needs to end in 0xFFFFFFF0 before call
+       movl    32(%ebp), %eax
+       movl    %eax, 24(%esp)
        movl    28(%ebp), %eax
        movl    %eax, 20(%esp)
        movl    24(%ebp), %eax
        movl    %eax, 16(%esp)
-       movl    20(%ebp), %eax
-       movl    %eax, 12(%esp)
        movl    16(%ebp), %eax
+       movl    20(%ebp), %edx
+       movl    %edx, 12(%esp)
        movl    %eax, 8(%esp)
        movl    12(%ebp), %eax
        movl    %eax, 4(%esp)
@@ -1047,15 +1049,17 @@ ASM_GLOBAL ASM_PFX(GasketEmuBlockIoWriteBlocks)
 ASM_PFX(GasketEmuBlockIoWriteBlocks):
        pushl   %ebp
        movl    %esp, %ebp
-  subl  $40, %esp      // sub extra 16 from the stack for alignment
+  subl  $56, %esp      // sub extra 16 from the stack for alignment
   and   $-16, %esp    // stack needs to end in 0xFFFFFFF0 before call
+       movl    32(%ebp), %eax
+       movl    %eax, 24(%esp)
        movl    28(%ebp), %eax
        movl    %eax, 20(%esp)
        movl    24(%ebp), %eax
        movl    %eax, 16(%esp)
-       movl    20(%ebp), %eax
-       movl    %eax, 12(%esp)
        movl    16(%ebp), %eax
+       movl    20(%ebp), %edx
+       movl    %edx, 12(%esp)
        movl    %eax, 8(%esp)
        movl    12(%ebp), %eax
        movl    %eax, 4(%esp)