From 54e0b04c74a1e55ccfd3b428415eb419b975de8b Mon Sep 17 00:00:00 2001 From: jljusten Date: Thu, 23 Jun 2011 15:23:39 +0000 Subject: InOsEmuPkg/Unix: Fix build issues for GCC44 IA32 Signed-off-by: jljusten git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11880 6f19259b-4bc3-4df7-8a09-765794883524 --- InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c | 1 + InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c | 2 ++ InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.c | 3 ++- InOsEmuPkg/Unix/Sec/EmuThunk.c | 4 ++-- InOsEmuPkg/Unix/UnixX64.fdf | 10 ++-------- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c b/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c index 0f04e0a3c4..b590ed2552 100644 --- a/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c +++ b/InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.c @@ -148,6 +148,7 @@ EmuBusDriverBindingStart ( EMU_VENDOR_DEVICE_PATH_NODE *Node; BOOLEAN CreateDevice; + InstallStatus = EFI_UNSUPPORTED; Status = EFI_UNSUPPORTED; // diff --git a/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c b/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c index ba03261433..551b54332c 100644 --- a/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c +++ b/InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystem.c @@ -489,6 +489,8 @@ EmuSimpleFileSystemOpenVolume ( EMU_EFI_FILE_PRIVATE *PrivateFile; EFI_TPL OldTpl; + Status = EFI_UNSUPPORTED; + if (This == NULL || Root == NULL) { return EFI_INVALID_PARAMETER; } diff --git a/InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.c b/InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.c index 59d8e98b79..4432218b51 100644 --- a/InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.c +++ b/InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.c @@ -667,10 +667,11 @@ EmuSnpDriverBindingStart ( MAC_ADDR_DEVICE_PATH Node; EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath; + Private = NULL; + // // Grab the protocols we need // - Status = gBS->OpenProtocol( ControllerHandle, &gEfiDevicePathProtocolGuid, diff --git a/InOsEmuPkg/Unix/Sec/EmuThunk.c b/InOsEmuPkg/Unix/Sec/EmuThunk.c index 194cf137f9..97c339d241 100644 --- a/InOsEmuPkg/Unix/Sec/EmuThunk.c +++ b/InOsEmuPkg/Unix/Sec/EmuThunk.c @@ -257,8 +257,8 @@ SecSleep ( struct timeval start, end; unsigned long MicroSec; - rq.tv_sec = Nanoseconds / 1000000000; - rq.tv_nsec = Nanoseconds % 1000000000; + rq.tv_sec = DivU64x32 (Nanoseconds, 1000000000); + rq.tv_nsec = ModU64x32 (Nanoseconds, 1000000000); // // nanosleep gets interrupted by our timer tic. diff --git a/InOsEmuPkg/Unix/UnixX64.fdf b/InOsEmuPkg/Unix/UnixX64.fdf index b6d80a22ea..b0b64d4ec3 100644 --- a/InOsEmuPkg/Unix/UnixX64.fdf +++ b/InOsEmuPkg/Unix/UnixX64.fdf @@ -254,19 +254,13 @@ INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf !if $(BUILD_FAT) INF FatPkg/EnhancedFatDxe/Fat.inf !else -# Used checked in Visual Studio binaries -FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F { - SECTION PE32 = FatBinPkg/EnhancedFatDxe/X64/Fat.efi - } +INF RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf !endif !if $(BUILD_NEW_SHELL) INF ShellPkg/Application/Shell/Shell.inf !else -# Used checked in Visual Studio binaries -FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) { - SECTION PE32 = EdkShellBinPkg/FullShell/X64/Shell_Full.efi - } +INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf !endif FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { -- cgit v1.2.3