Browse Source

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 <pbatard@users.sf.net>
Signed-off-by: Nigel Croxon <nigel.croxon@hpe.com>

Nigel Croxon 9 years ago
parent
commit
b5b6a81af0
1 changed files with 4 additions and 4 deletions
  1. 4 4
      lib/event.c

+ 4 - 4
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));
 }