From b5b6a81af07a3dfded64bd9a806fcdec46a8203c Mon Sep 17 00:00:00 2001 From: Nigel Croxon Date: Mon, 4 Apr 2016 10:09:51 -0400 Subject: [PATCH] When copying structs, some compilers (e.g. MSVC for ARM) will use an implicit call to memcpy(), which can result in an undefined reference. Use CopyMem() to duplicate struct data instead. NB: This patch also removes trailing whitespaces in event.c Signed-off-by: Pete Batard Signed-off-by: Nigel Croxon --- lib/event.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/event.c b/lib/event.c index e35513e..0babc92 100644 --- a/lib/event.c +++ b/lib/event.c @@ -53,8 +53,8 @@ LibCreateProtocolNotifyEvent ( Status = uefi_call_wrapper( BS->RegisterProtocolNotify, 3, - ProtocolGuid, - Event, + ProtocolGuid, + Event, Registration ); if ( EFI_ERROR( Status ) ) return NULL ; @@ -94,7 +94,7 @@ WaitForSingleEvent ( // uefi_call_wrapper(BS->SetTimer, 3, TimerEvent, TimerRelative, Timeout); - + // // Wait for the original event or the timer // @@ -149,6 +149,6 @@ WaitForEventWithTimeout ( } } } while (Timeout > 0); - *Key = TimeoutKey; + CopyMem(Key, &TimeoutKey, sizeof(EFI_INPUT_KEY)); }