diff options
| author | andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-07-29 03:24:13 +0000 |
|---|---|---|
| committer | andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-07-29 03:24:13 +0000 |
| commit | a4902cccdf477e93a55d6211fcb7a071bb48b71c (patch) | |
| tree | dc61a7914f89038be9cfd4c1465b4bab91ffc7be /UnixPkg/Include | |
| parent | 712a5698a6edd14d8247132cbbbe63da1ea69bf0 (diff) | |
Complete coding to support X64 EFI ABI in UnixPkg. Code is not currently hooked in or tested, but it is code complete. Only missing step from testing is figuring out how to build with two different ABIs for the same platform. Sec needs a different ABI. May need to add a 2nd build step.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10710 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'UnixPkg/Include')
| -rw-r--r-- | UnixPkg/Include/Protocol/UnixThunk.h | 6 | ||||
| -rw-r--r-- | UnixPkg/Include/Protocol/UnixUgaIo.h | 19 |
2 files changed, 15 insertions, 10 deletions
diff --git a/UnixPkg/Include/Protocol/UnixThunk.h b/UnixPkg/Include/Protocol/UnixThunk.h index 5346c1c32..689e32fd7 100644 --- a/UnixPkg/Include/Protocol/UnixThunk.h +++ b/UnixPkg/Include/Protocol/UnixThunk.h @@ -308,14 +308,14 @@ void typedef int #if __CYGWIN__ -(*UnixIoCtl) (int fd, int __request, ...); +(*UnixIoCtl) (int fd, int __request, UINTN Arg); #else -(*UnixIoCtl) (int fd, unsigned long int __request, ...); +(*UnixIoCtl) (int fd, unsigned long int __request, void *Arg); #endif typedef int -(*UnixFcntl) (int __fd, int __cmd, ...); +(*UnixFcntl) (int __fd, int __cmd, void *Arg); typedef int diff --git a/UnixPkg/Include/Protocol/UnixUgaIo.h b/UnixPkg/Include/Protocol/UnixUgaIo.h index 75923f34b..3b3279521 100644 --- a/UnixPkg/Include/Protocol/UnixUgaIo.h +++ b/UnixPkg/Include/Protocol/UnixUgaIo.h @@ -51,19 +51,24 @@ EFI_STATUS EFI_INPUT_KEY *key ); + +typedef struct { + UINTN SourceX; + UINTN SourceY; + UINTN DestinationX; + UINTN DestinationY; + UINTN Width; + UINTN Height; + UINTN Delta; +} UGA_BLT_ARGS; + typedef EFI_STATUS (*UGABlt)( IN EFI_UNIX_UGA_IO_PROTOCOL *Uga, IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, IN EFI_UGA_BLT_OPERATION BltOperation, - IN UINTN SourceX, - IN UINTN SourceY, - IN UINTN DestinationX, - IN UINTN DestinationY, - IN UINTN Width, - IN UINTN Height, - IN UINTN Delta OPTIONAL + IN UGA_BLT_ARGS *Args ); struct _EFI_UNIX_UGA_IO_PROTOCOL { |