Integrate patch from Andrew Fish to make it run on OS X.

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

3 files changed, 4 insertions, 3 deletions

diff --git a/UnixPkg/UnixBlockIoDxe/DriverDiagnostics.c b/UnixPkg/UnixBlockIoDxe/DriverDiagnostics.c
index 0e9a32c..e4c5df9 100644
--- a/UnixPkg/UnixBlockIoDxe/DriverDiagnostics.c
+++ b/UnixPkg/UnixBlockIoDxe/DriverDiagnostics.c
@@ -148,7 +148,7 @@ UnixBlockIoDriverDiagnosticsRunDiagnostics (
   if (DiagnosticType != EfiDriverDiagnosticTypeStandard) {

     *ErrorType  = &gEfiBlockIoProtocolGuid;

     *BufferSize = 0x60;

-    gBS->AllocatePool (EfiBootServicesData, (UINTN) (*BufferSize),
+    gBS->AllocatePool (EfiBootServicesData, (UINTN) (*BufferSize),

 		       (void *)Buffer);

     CopyMem (*Buffer, L"Unix Block I/O Driver Diagnostics Failed\n", *BufferSize);

     return EFI_DEVICE_ERROR;

diff --git a/UnixPkg/UnixBlockIoDxe/UnixBlockIo.c b/UnixPkg/UnixBlockIoDxe/UnixBlockIo.c
index a483a87..c3bd3d3 100644
--- a/UnixPkg/UnixBlockIoDxe/UnixBlockIo.c
+++ b/UnixPkg/UnixBlockIoDxe/UnixBlockIo.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2007, Intel Corporation                                                         

+Copyright (c) 2004 - 2009, Intel Corporation                                                         

 All rights reserved. This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -1276,6 +1276,7 @@ This function extends the capability of SetFilePointer to accept 64 bit paramete
   EFI_STATUS    Status;

   off_t         res;

 

+  Status = EFI_SUCCESS;

   res = Private->UnixThunk->Lseek(Private->fd, DistanceToMove, MoveMethod);

   if (res == -1) {

     Status = EFI_INVALID_PARAMETER;

diff --git a/UnixPkg/UnixBlockIoDxe/UnixBlockIo.h b/UnixPkg/UnixBlockIoDxe/UnixBlockIo.h
index 70ab77e..693f20e 100644
--- a/UnixPkg/UnixBlockIoDxe/UnixBlockIo.h
+++ b/UnixPkg/UnixBlockIoDxe/UnixBlockIo.h
@@ -56,7 +56,7 @@ typedef struct {
   UINTN                       ReadMode;

   UINTN                       Mode;

 

-  int                         fd;
+  int                         fd;

 

   UINT64                      LastBlock;

   UINTN                       BlockSize;