EmulatorPkg: Apply uncrustify changes

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the EmulatorPkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>

7 files changed, 154 insertions, 193 deletions

diff --git a/EmulatorPkg/Include/Protocol/EmuBlockIo.h b/EmulatorPkg/Include/Protocol/EmuBlockIo.h
index a17cefa83d..494e100e74 100644
--- a/EmulatorPkg/Include/Protocol/EmuBlockIo.h
+++ b/EmulatorPkg/Include/Protocol/EmuBlockIo.h
@@ -19,9 +19,7 @@
 #define EMU_BLOCK_IO_PROTOCOL_GUID \

 { 0x6888A4AE, 0xAFCE, 0xE84B, { 0x91, 0x02, 0xF7, 0xB9, 0xDA, 0xE6, 0xA0, 0x30 } }

 

-typedef struct _EMU_BLOCK_IO_PROTOCOL   EMU_BLOCK_IO_PROTOCOL;

-

-

+typedef struct _EMU_BLOCK_IO_PROTOCOL EMU_BLOCK_IO_PROTOCOL;

 

 /**

   Reset the block device hardware.

@@ -38,7 +36,7 @@ typedef struct _EMU_BLOCK_IO_PROTOCOL   EMU_BLOCK_IO_PROTOCOL;
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EMU_BLOCK_RESET) (

+(EFIAPI *EMU_BLOCK_RESET)(

   IN EMU_BLOCK_IO_PROTOCOL   *This,

   IN BOOLEAN                 ExtendedVerification

   );

@@ -78,13 +76,13 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EMU_BLOCK_READ) (

+(EFIAPI *EMU_BLOCK_READ)(

   IN     EMU_BLOCK_IO_PROTOCOL  *This,

   IN     UINT32                 MediaId,

   IN     EFI_LBA                LBA,

   IN OUT EFI_BLOCK_IO2_TOKEN    *Token,

   IN     UINTN                  BufferSize,

-     OUT VOID                   *Buffer

+  OUT VOID                   *Buffer

   );

 

 /**

@@ -120,7 +118,7 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EMU_BLOCK_WRITE) (

+(EFIAPI *EMU_BLOCK_WRITE)(

   IN     EMU_BLOCK_IO_PROTOCOL  *This,

   IN     UINT32                 MediaId,

   IN     EFI_LBA                LBA,

@@ -153,34 +151,31 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EMU_BLOCK_FLUSH) (

+(EFIAPI *EMU_BLOCK_FLUSH)(

   IN     EMU_BLOCK_IO_PROTOCOL    *This,

   IN OUT EFI_BLOCK_IO2_TOKEN      *Token

   );

 

-

 typedef

 EFI_STATUS

-(EFIAPI *EMU_BLOCK_CREATE_MAPPING) (

+(EFIAPI *EMU_BLOCK_CREATE_MAPPING)(

   IN     EMU_BLOCK_IO_PROTOCOL    *This,

   IN     EFI_BLOCK_IO_MEDIA       *Media

   );

 

-

 ///

 ///  The Block I/O2 protocol defines an extension to the Block I/O protocol which

 ///  enables the ability to read and write data at a block level in a non-blocking

 //   manner.

 ///

 struct _EMU_BLOCK_IO_PROTOCOL  {

-  EMU_BLOCK_RESET           Reset;

-  EMU_BLOCK_READ            ReadBlocks;

-  EMU_BLOCK_WRITE           WriteBlocks;

-  EMU_BLOCK_FLUSH           FlushBlocks;

-  EMU_BLOCK_CREATE_MAPPING  CreateMapping;

+  EMU_BLOCK_RESET             Reset;

+  EMU_BLOCK_READ              ReadBlocks;

+  EMU_BLOCK_WRITE             WriteBlocks;

+  EMU_BLOCK_FLUSH             FlushBlocks;

+  EMU_BLOCK_CREATE_MAPPING    CreateMapping;

 };

 

-extern EFI_GUID gEmuBlockIoProtocolGuid;

+extern EFI_GUID  gEmuBlockIoProtocolGuid;

 

 #endif

-

diff --git a/EmulatorPkg/Include/Protocol/EmuFileSystem.h b/EmulatorPkg/Include/Protocol/EmuFileSystem.h
index 8ac9d9ba5d..15de43ac02 100644
--- a/EmulatorPkg/Include/Protocol/EmuFileSystem.h
+++ b/EmulatorPkg/Include/Protocol/EmuFileSystem.h
@@ -55,36 +55,34 @@ EFI_STATUS
 

 typedef

 EFI_STATUS

-(EFIAPI *EMU_GRAPHICS_WINDOWS_KEY_SET_STATE) (

+(EFIAPI *EMU_GRAPHICS_WINDOWS_KEY_SET_STATE)(

   IN EMU_GRAPHICS_WINDOW_PROTOCOL   *GraphicsWindows,

   IN EFI_KEY_TOGGLE_STATE           *KeyToggleState

   );

 

-

 typedef

 VOID

-(EFIAPI *EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK) (

+(EFIAPI *EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK)(

   IN VOID           *Context,

   IN EFI_KEY_DATA   *KeyData

   );

 

 typedef

 EFI_STATUS

-(EFIAPI *EMU_GRAPHICS_WINDOWS_REGISTER_KEY_NOTIFY) (

+(EFIAPI *EMU_GRAPHICS_WINDOWS_REGISTER_KEY_NOTIFY)(

   IN EMU_GRAPHICS_WINDOW_PROTOCOL                       *GraphicsWindows,

   IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK   CallBack,

   IN VOID                                               *Context

   );

 

-

 typedef struct {

-    UINTN                                   SourceX;

-    UINTN                                   SourceY;

-    UINTN                                   DestinationX;

-    UINTN                                   DestinationY;

-    UINTN                                   Width;

-    UINTN                                   Height;

-    UINTN                                   Delta;

+  UINTN    SourceX;

+  UINTN    SourceY;

+  UINTN    DestinationX;

+  UINTN    DestinationY;

+  UINTN    Width;

+  UINTN    Height;

+  UINTN    Delta;

 } EMU_GRAPHICS_WINDOWS__BLT_ARGS;

 

 typedef

@@ -98,7 +96,7 @@ EFI_STATUS
 

 typedef

 BOOLEAN

-(EFIAPI *EMU_GRAPHICS_WINDOWS_IS_KEY_PRESSED) (

+(EFIAPI *EMU_GRAPHICS_WINDOWS_IS_KEY_PRESSED)(

   IN  EMU_GRAPHICS_WINDOW_PROTOCOL  *GraphicsWindows,

   IN  EFI_KEY_DATA                  *KeyData

   );

@@ -117,18 +115,17 @@ EFI_STATUS
   );

 

 struct _EMU_GRAPHICS_WINDOW_PROTOCOL {

-  EMU_GRAPHICS_WINDOWS_SIZE                    Size;

-  EMU_GRAPHICS_WINDOWS_CHECK_KEY               CheckKey;

-  EMU_GRAPHICS_WINDOWS_KEY_SET_STATE           KeySetState;

-  EMU_GRAPHICS_WINDOWS_GET_KEY                 GetKey;

-  EMU_GRAPHICS_WINDOWS_REGISTER_KEY_NOTIFY     RegisterKeyNotify;

-  EMU_GRAPHICS_WINDOWS_BLT                     Blt;

-  EMU_GRAPHICS_WINDOWS_IS_KEY_PRESSED          IsKeyPressed;

-  EMU_GRAPHICS_WINDOWS_CHECK_POINTER           CheckPointer;

-  EMU_GRAPHICS_WINDOWS_GET_POINTER_STATE       GetPointerState;

+  EMU_GRAPHICS_WINDOWS_SIZE                   Size;

+  EMU_GRAPHICS_WINDOWS_CHECK_KEY              CheckKey;

+  EMU_GRAPHICS_WINDOWS_KEY_SET_STATE          KeySetState;

+  EMU_GRAPHICS_WINDOWS_GET_KEY                GetKey;

+  EMU_GRAPHICS_WINDOWS_REGISTER_KEY_NOTIFY    RegisterKeyNotify;

+  EMU_GRAPHICS_WINDOWS_BLT                    Blt;

+  EMU_GRAPHICS_WINDOWS_IS_KEY_PRESSED         IsKeyPressed;

+  EMU_GRAPHICS_WINDOWS_CHECK_POINTER          CheckPointer;

+  EMU_GRAPHICS_WINDOWS_GET_POINTER_STATE      GetPointerState;

 };

 

-

-extern EFI_GUID gEmuGraphicsWindowProtocolGuid;

+extern EFI_GUID  gEmuGraphicsWindowProtocolGuid;

 

 #endif

diff --git a/EmulatorPkg/Include/Protocol/EmuGraphicsWindow.h b/EmulatorPkg/Include/Protocol/EmuGraphicsWindow.h
index 07d4070b35..7c495b25eb 100644
--- a/EmulatorPkg/Include/Protocol/EmuGraphicsWindow.h
+++ b/EmulatorPkg/Include/Protocol/EmuGraphicsWindow.h
@@ -48,37 +48,35 @@ EFI_STATUS
 

 typedef

 EFI_STATUS

-(EFIAPI *EMU_GRAPHICS_WINDOWS_KEY_SET_STATE) (

+(EFIAPI *EMU_GRAPHICS_WINDOWS_KEY_SET_STATE)(

   IN EMU_GRAPHICS_WINDOW_PROTOCOL   *GraphicsWindows,

   IN EFI_KEY_TOGGLE_STATE           *KeyToggleState

   );

 

-

 typedef

 VOID

-(EFIAPI *EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK) (

+(EFIAPI *EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK)(

   IN VOID           *Context,

   IN EFI_KEY_DATA   *KeyData

   );

 

 typedef

 EFI_STATUS

-(EFIAPI *EMU_GRAPHICS_WINDOWS_REGISTER_KEY_NOTIFY) (

+(EFIAPI *EMU_GRAPHICS_WINDOWS_REGISTER_KEY_NOTIFY)(

   IN EMU_GRAPHICS_WINDOW_PROTOCOL                       *GraphicsWindows,

   IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK   MakeCallBack,

   IN EMU_GRAPHICS_WINDOW_REGISTER_KEY_NOTIFY_CALLBACK   BreakCallBack,

   IN VOID                                               *Context

   );

 

-

 typedef struct {

-    UINTN                                   SourceX;

-    UINTN                                   SourceY;

-    UINTN                                   DestinationX;

-    UINTN                                   DestinationY;

-    UINTN                                   Width;

-    UINTN                                   Height;

-    UINTN                                   Delta;

+  UINTN    SourceX;

+  UINTN    SourceY;

+  UINTN    DestinationX;

+  UINTN    DestinationY;

+  UINTN    Width;

+  UINTN    Height;

+  UINTN    Delta;

 } EMU_GRAPHICS_WINDOWS__BLT_ARGS;

 

 typedef

@@ -92,7 +90,7 @@ EFI_STATUS
 

 typedef

 BOOLEAN

-(EFIAPI *EMU_GRAPHICS_WINDOWS_IS_KEY_PRESSED) (

+(EFIAPI *EMU_GRAPHICS_WINDOWS_IS_KEY_PRESSED)(

   IN  EMU_GRAPHICS_WINDOW_PROTOCOL  *GraphicsWindows,

   IN  EFI_KEY_DATA                  *KeyData

   );

@@ -111,18 +109,17 @@ EFI_STATUS
   );

 

 struct _EMU_GRAPHICS_WINDOW_PROTOCOL {

-  EMU_GRAPHICS_WINDOWS_SIZE                    Size;

-  EMU_GRAPHICS_WINDOWS_CHECK_KEY               CheckKey;

-  EMU_GRAPHICS_WINDOWS_KEY_SET_STATE           KeySetState;

-  EMU_GRAPHICS_WINDOWS_GET_KEY                 GetKey;

-  EMU_GRAPHICS_WINDOWS_REGISTER_KEY_NOTIFY     RegisterKeyNotify;

-  EMU_GRAPHICS_WINDOWS_BLT                     Blt;

-  EMU_GRAPHICS_WINDOWS_IS_KEY_PRESSED          IsKeyPressed;

-  EMU_GRAPHICS_WINDOWS_CHECK_POINTER           CheckPointer;

-  EMU_GRAPHICS_WINDOWS_GET_POINTER_STATE       GetPointerState;

+  EMU_GRAPHICS_WINDOWS_SIZE                   Size;

+  EMU_GRAPHICS_WINDOWS_CHECK_KEY              CheckKey;

+  EMU_GRAPHICS_WINDOWS_KEY_SET_STATE          KeySetState;

+  EMU_GRAPHICS_WINDOWS_GET_KEY                GetKey;

+  EMU_GRAPHICS_WINDOWS_REGISTER_KEY_NOTIFY    RegisterKeyNotify;

+  EMU_GRAPHICS_WINDOWS_BLT                    Blt;

+  EMU_GRAPHICS_WINDOWS_IS_KEY_PRESSED         IsKeyPressed;

+  EMU_GRAPHICS_WINDOWS_CHECK_POINTER          CheckPointer;

+  EMU_GRAPHICS_WINDOWS_GET_POINTER_STATE      GetPointerState;

 };

 

-

-extern EFI_GUID gEmuGraphicsWindowProtocolGuid;

+extern EFI_GUID  gEmuGraphicsWindowProtocolGuid;

 

 #endif

diff --git a/EmulatorPkg/Include/Protocol/EmuIoThunk.h b/EmulatorPkg/Include/Protocol/EmuIoThunk.h
index 6e4c2f8efc..b6da635177 100644
--- a/EmulatorPkg/Include/Protocol/EmuIoThunk.h
+++ b/EmulatorPkg/Include/Protocol/EmuIoThunk.h
@@ -10,36 +10,33 @@
 #ifndef __EMU_IO_THUNK__

 #define __EMU_IO_THUNK__

 

-

 #define EMU_IO_THUNK_PROTOCO_GUID  \

  { 0x453368F6, 0x7C85, 0x434A, { 0xA9, 0x8A, 0x72, 0xD1, 0xB7, 0xFF, 0xA9, 0x26 } }

 

-

-typedef struct _EMU_IO_THUNK_PROTOCOL  EMU_IO_THUNK_PROTOCOL;

-

+typedef struct _EMU_IO_THUNK_PROTOCOL EMU_IO_THUNK_PROTOCOL;

 

 typedef

 EFI_STATUS

-(EFIAPI *EMU_IO_THUNK_PROTOCOL_CLOSE_OPEN) (

+(EFIAPI *EMU_IO_THUNK_PROTOCOL_CLOSE_OPEN)(

   IN  EMU_IO_THUNK_PROTOCOL   *This

   );

 

 typedef

 EFI_STATUS

-(EFIAPI *EMU_IO_THUNK_PROTOCOL_CLOSE_CLOSE) (

+(EFIAPI *EMU_IO_THUNK_PROTOCOL_CLOSE_CLOSE)(

   IN  EMU_IO_THUNK_PROTOCOL   *This

   );

 

 struct _EMU_IO_THUNK_PROTOCOL {

-  EFI_GUID                            *Protocol;

-  VOID                                *Interface;  /// Only be valid after Open() is called

-  CHAR16                              *ConfigString;

-  UINT16                              Instance;

-  EMU_IO_THUNK_PROTOCOL_CLOSE_OPEN    Open;

-  EMU_IO_THUNK_PROTOCOL_CLOSE_CLOSE   Close;

-  VOID                                *Private;    /// Used by implementation

+  EFI_GUID                             *Protocol;

+  VOID                                 *Interface; /// Only be valid after Open() is called

+  CHAR16                               *ConfigString;

+  UINT16                               Instance;

+  EMU_IO_THUNK_PROTOCOL_CLOSE_OPEN     Open;

+  EMU_IO_THUNK_PROTOCOL_CLOSE_CLOSE    Close;

+  VOID                                 *Private;   /// Used by implementation

 };

 

-extern EFI_GUID gEmuIoThunkProtocolGuid;

+extern EFI_GUID  gEmuIoThunkProtocolGuid;

 

 #endif

diff --git a/EmulatorPkg/Include/Protocol/EmuSnp.h b/EmulatorPkg/Include/Protocol/EmuSnp.h
index c58808fdd3..b461a1cb38 100644
--- a/EmulatorPkg/Include/Protocol/EmuSnp.h
+++ b/EmulatorPkg/Include/Protocol/EmuSnp.h
@@ -17,8 +17,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define EMU_SNP_PROTOCOL_GUID \

  { 0xFD5FBE54, 0x8C35, 0xB345, { 0x8A, 0x0F, 0x7A, 0xC8, 0xA5, 0xFD, 0x05, 0x21 } }

 

-typedef struct _EMU_SNP_PROTOCOL  EMU_SNP_PROTOCOL;

-

+typedef struct _EMU_SNP_PROTOCOL EMU_SNP_PROTOCOL;

 

 /**

   Register storage for SNP Mode.

@@ -37,7 +36,6 @@ EFI_STATUS
   IN EFI_SIMPLE_NETWORK_MODE  *Mode

   );

 

-

 /**

   Changes the state of a network interface from "stopped" to "started".

 

@@ -425,29 +423,29 @@ EFI_STATUS
 //

 // Revision defined in EFI1.1

 //

-#define EMU_SNP_INTERFACE_REVISION   EMU_SNP_PROTOCOL_REVISION

+#define EMU_SNP_INTERFACE_REVISION  EMU_SNP_PROTOCOL_REVISION

 

 ///

 /// The EMU_SNP_PROTOCOL protocol abstracts OS network sercices

 /// from the EFI driver that produces EFI Simple Network Protocol.

 ///

 struct _EMU_SNP_PROTOCOL {

-  EMU_SNP_CREATE_MAPPING   CreateMapping;

-  EMU_SNP_START            Start;

-  EMU_SNP_STOP             Stop;

-  EMU_SNP_INITIALIZE       Initialize;

-  EMU_SNP_RESET            Reset;

-  EMU_SNP_SHUTDOWN         Shutdown;

-  EMU_SNP_RECEIVE_FILTERS  ReceiveFilters;

-  EMU_SNP_STATION_ADDRESS  StationAddress;

-  EMU_SNP_STATISTICS       Statistics;

-  EMU_SNP_MCAST_IP_TO_MAC  MCastIpToMac;

-  EMU_SNP_NVDATA           NvData;

-  EMU_SNP_GET_STATUS       GetStatus;

-  EMU_SNP_TRANSMIT         Transmit;

-  EMU_SNP_RECEIVE          Receive;

+  EMU_SNP_CREATE_MAPPING     CreateMapping;

+  EMU_SNP_START              Start;

+  EMU_SNP_STOP               Stop;

+  EMU_SNP_INITIALIZE         Initialize;

+  EMU_SNP_RESET              Reset;

+  EMU_SNP_SHUTDOWN           Shutdown;

+  EMU_SNP_RECEIVE_FILTERS    ReceiveFilters;

+  EMU_SNP_STATION_ADDRESS    StationAddress;

+  EMU_SNP_STATISTICS         Statistics;

+  EMU_SNP_MCAST_IP_TO_MAC    MCastIpToMac;

+  EMU_SNP_NVDATA             NvData;

+  EMU_SNP_GET_STATUS         GetStatus;

+  EMU_SNP_TRANSMIT           Transmit;

+  EMU_SNP_RECEIVE            Receive;

 };

 

-extern EFI_GUID gEmuSnpProtocolGuid;

+extern EFI_GUID  gEmuSnpProtocolGuid;

 

 #endif

diff --git a/EmulatorPkg/Include/Protocol/EmuThread.h b/EmulatorPkg/Include/Protocol/EmuThread.h
index 89e562d7af..fbde40bb4c 100644
--- a/EmulatorPkg/Include/Protocol/EmuThread.h
+++ b/EmulatorPkg/Include/Protocol/EmuThread.h
@@ -11,55 +11,47 @@
 #ifndef __EMU_THREAD_THUNK__

 #define __EMU_THREAD_THUNK__

 

-

-typedef struct _EMU_THREAD_THUNK_PROTOCOL  EMU_THREAD_THUNK_PROTOCOL;

-

+typedef struct _EMU_THREAD_THUNK_PROTOCOL EMU_THREAD_THUNK_PROTOCOL;

 

 typedef

 UINTN

-(EFIAPI *THREAD_THUNK_MUTEX_LOCK) (

+(EFIAPI *THREAD_THUNK_MUTEX_LOCK)(

   IN VOID *Mutex

   );

 

-

 typedef

 UINTN

-(EFIAPI *THREAD_THUNK_MUTEX_UNLOCK) (

+(EFIAPI *THREAD_THUNK_MUTEX_UNLOCK)(

   IN VOID *Mutex

   );

 

-

 typedef

 UINTN

-(EFIAPI *THREAD_THUNK_MUTEX_TRY_LOCK) (

+(EFIAPI *THREAD_THUNK_MUTEX_TRY_LOCK)(

   IN VOID *Mutex

   );

 

-

 typedef

 VOID *

-(EFIAPI *THREAD_THUNK_MUTEX_INIT) (

+(EFIAPI *THREAD_THUNK_MUTEX_INIT)(

   IN VOID

   );

 

-

 typedef

 UINTN

-(EFIAPI *THREAD_THUNK_MUTEX_DISTROY) (

+(EFIAPI *THREAD_THUNK_MUTEX_DISTROY)(

   IN VOID *Mutex

   );

 

-

-

 typedef

 VOID *

-(EFIAPI *THREAD_THUNK_THREAD_ENTRY) (

+(EFIAPI *THREAD_THUNK_THREAD_ENTRY)(

   IN  VOID *Context

   );

 

 typedef

 UINTN

-(EFIAPI *THREAD_THUNK_CREATE_THREAD) (

+(EFIAPI *THREAD_THUNK_CREATE_THREAD)(

   IN  VOID                      *Thread,

   IN  VOID                      *Attribute,

   IN  THREAD_THUNK_THREAD_ENTRY Start,

@@ -68,30 +60,27 @@ UINTN
 

 typedef

 VOID

-(EFIAPI *THREAD_THUNK_EXIT_THREAD) (

+(EFIAPI *THREAD_THUNK_EXIT_THREAD)(

   IN VOID *ValuePtr

   );

 

-

 typedef

 UINTN

-(EFIAPI *THREAD_THUNK_SELF) (

+(EFIAPI *THREAD_THUNK_SELF)(

   VOID

   );

 

-

 struct _EMU_THREAD_THUNK_PROTOCOL {

-  THREAD_THUNK_MUTEX_LOCK       MutexLock;

-  THREAD_THUNK_MUTEX_UNLOCK     MutexUnlock;

-  THREAD_THUNK_MUTEX_TRY_LOCK   MutexTryLock;

-  THREAD_THUNK_MUTEX_INIT       MutexInit;

-  THREAD_THUNK_MUTEX_DISTROY    MutexDistroy;

-  THREAD_THUNK_CREATE_THREAD    CreateThread;

-  THREAD_THUNK_EXIT_THREAD      ExitThread;

-  THREAD_THUNK_SELF             Self;

+  THREAD_THUNK_MUTEX_LOCK        MutexLock;

+  THREAD_THUNK_MUTEX_UNLOCK      MutexUnlock;

+  THREAD_THUNK_MUTEX_TRY_LOCK    MutexTryLock;

+  THREAD_THUNK_MUTEX_INIT        MutexInit;

+  THREAD_THUNK_MUTEX_DISTROY     MutexDistroy;

+  THREAD_THUNK_CREATE_THREAD     CreateThread;

+  THREAD_THUNK_EXIT_THREAD       ExitThread;

+  THREAD_THUNK_SELF              Self;

 };

 

-extern EFI_GUID gEmuThreadThunkProtocolGuid;

+extern EFI_GUID  gEmuThreadThunkProtocolGuid;

 

 #endif

-

diff --git a/EmulatorPkg/Include/Protocol/EmuThunk.h b/EmulatorPkg/Include/Protocol/EmuThunk.h
index 0bb20651e5..b720023ac9 100644
--- a/EmulatorPkg/Include/Protocol/EmuThunk.h
+++ b/EmulatorPkg/Include/Protocol/EmuThunk.h
@@ -21,166 +21,156 @@
 #include <Protocol/EmuIoThunk.h>

 #include <Protocol/DevicePath.h>

 

-

 typedef struct {

-  VENDOR_DEVICE_PATH  VendorDevicePath;

-  UINT32              Instance;

+  VENDOR_DEVICE_PATH    VendorDevicePath;

+  UINT32                Instance;

 } EMU_VENDOR_DEVICE_PATH_NODE;

 

 typedef struct {

-  EMU_VENDOR_DEVICE_PATH_NODE Vendor;

-  EFI_DEVICE_PATH_PROTOCOL    EndDevicePath;

+  EMU_VENDOR_DEVICE_PATH_NODE    Vendor;

+  EFI_DEVICE_PATH_PROTOCOL       EndDevicePath;

 } EMU_THUNK_DEVICE_PATH;

 

-

-

-typedef struct _EMU_THUNK_PROTOCOL  EMU_THUNK_PROTOCOL;

-

-

+typedef struct _EMU_THUNK_PROTOCOL EMU_THUNK_PROTOCOL;

 

 typedef

 UINTN

-(EFIAPI *EMU_WRITE_STD_ERROR) (

+(EFIAPI *EMU_WRITE_STD_ERROR)(

   IN UINT8     *Buffer,

   IN UINTN     NumberOfBytes

   );

 

 typedef

 EFI_STATUS

-(EFIAPI *EMU_CONFIG_STD_IN) (

+(EFIAPI *EMU_CONFIG_STD_IN)(

   VOID

   );

 

 typedef

 UINTN

-(EFIAPI *EMU_WRITE_STD_OUT) (

+(EFIAPI *EMU_WRITE_STD_OUT)(

   IN UINT8     *Buffer,

   IN UINTN     NumberOfBytes

   );

 

 typedef

 UINTN

-(EFIAPI *EMU_READ_STD_IN) (

+(EFIAPI *EMU_READ_STD_IN)(

   OUT UINT8     *Buffer,

   IN  UINTN     NumberOfBytes

   );

 

 typedef

 BOOLEAN

-(EFIAPI *EMU_POLL_STD_IN) (

+(EFIAPI *EMU_POLL_STD_IN)(

   VOID

   );

 

-

 typedef

 VOID *

-(EFIAPI *EMU_OS_MALLOC) (

+(EFIAPI *EMU_OS_MALLOC)(

   IN  UINTN Size

   );

 

 typedef

 VOID *

-(EFIAPI *EMU_OS_VMALLOC) (

+(EFIAPI *EMU_OS_VMALLOC)(

   IN  UINTN Size

   );

 

 typedef

 BOOLEAN

-(EFIAPI *EMU_OS_FREE) (

+(EFIAPI *EMU_OS_FREE)(

   IN  VOID *Ptr

   );

 

-

 typedef

 EFI_STATUS

-(EFIAPI *EMU_PE_COFF_GET_ENTRY_POINT) (

+(EFIAPI *EMU_PE_COFF_GET_ENTRY_POINT)(

   IN     VOID  *Pe32Data,

   IN OUT VOID  **EntryPoint

   );

 

 typedef

 VOID

-(EFIAPI *EMU_PE_COFF_RELOCATE_EXTRA_ACTION) (

+(EFIAPI *EMU_PE_COFF_RELOCATE_EXTRA_ACTION)(

   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext

   );

 

 typedef

 VOID

-(EFIAPI *EMU_PE_COFF_UNLOAD_EXTRA_ACTION) (

+(EFIAPI *EMU_PE_COFF_UNLOAD_EXTRA_ACTION)(

   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext

   );

 

 typedef

 VOID

-(EFIAPI *EMU_ENABLE_INERRUPTS) (

+(EFIAPI *EMU_ENABLE_INERRUPTS)(

   VOID

   );

 

 typedef

 VOID

-(EFIAPI *EMU_DISABLE_INERRUPTS) (

+(EFIAPI *EMU_DISABLE_INERRUPTS)(

   VOID

   );

 

 typedef

 UINT64

-(EFIAPI *EMU_QUERY_PERFORMANCE_FREQENCY) (

+(EFIAPI *EMU_QUERY_PERFORMANCE_FREQENCY)(

   VOID

   );

 

 typedef

 UINT64

-(EFIAPI *EMU_QUERY_PERFORMANCE_COUNTER) (

+(EFIAPI *EMU_QUERY_PERFORMANCE_COUNTER)(

   VOID

   );

 

 typedef

 VOID

-(EFIAPI *EMU_SLEEP) (

+(EFIAPI *EMU_SLEEP)(

   IN  UINT64    Milliseconds

   );

 

 typedef

 VOID

-(EFIAPI *EMU_CPU_SLEEP) (

+(EFIAPI *EMU_CPU_SLEEP)(

   VOID

   );

 

 typedef

 VOID

-(EFIAPI *EMU_EXIT) (

+(EFIAPI *EMU_EXIT)(

   IN  UINTN    Status

   );

 

 typedef

 VOID

-(EFIAPI *EMU_GET_TIME) (

+(EFIAPI *EMU_GET_TIME)(

   OUT  EFI_TIME               *Time,

   OUT EFI_TIME_CAPABILITIES   *Capabilities OPTIONAL

   );

 

 typedef

 VOID

-(EFIAPI *EMU_SET_TIME) (

+(EFIAPI *EMU_SET_TIME)(

   IN   EFI_TIME               *Time

   );

 

-

 typedef

 VOID

-(EFIAPI EMU_SET_TIMER_CALLBACK) (

+(EFIAPI EMU_SET_TIMER_CALLBACK)(

   IN  UINT64  DeltaMs

   );

 

 typedef

 VOID

-(EFIAPI *EMU_SET_TIMER) (

+(EFIAPI *EMU_SET_TIMER)(

   IN  UINT64                  PeriodMs,

   IN  EMU_SET_TIMER_CALLBACK  CallBack

   );

 

-

-

 /**

   Enumerates the current set of protocol instances that abstract OS services from EFI.

 

@@ -203,56 +193,54 @@ VOID
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EMU_GET_NEXT_PROTOCOL) (

+(EFIAPI *EMU_GET_NEXT_PROTOCOL)(

   IN  BOOLEAN                 EmuBusDriver,

   OUT EMU_IO_THUNK_PROTOCOL   **Instance  OPTIONAL

   );

 

-

 struct _EMU_THUNK_PROTOCOL {

   // Used for early debug printing

-  EMU_WRITE_STD_ERROR               WriteStdErr;

-  EMU_CONFIG_STD_IN                 ConfigStdIn;

-  EMU_WRITE_STD_OUT                 WriteStdOut;

-  EMU_READ_STD_IN                   ReadStdIn;

-  EMU_POLL_STD_IN                   PollStdIn;

+  EMU_WRITE_STD_ERROR                  WriteStdErr;

+  EMU_CONFIG_STD_IN                    ConfigStdIn;

+  EMU_WRITE_STD_OUT                    WriteStdOut;

+  EMU_READ_STD_IN                      ReadStdIn;

+  EMU_POLL_STD_IN                      PollStdIn;

 

   //

   // Map OS malloc/free so we can use OS based guard malloc

   //

-  EMU_OS_MALLOC                     Malloc;

-  EMU_OS_VMALLOC                    Valloc;

-  EMU_OS_FREE                       Free;

-

+  EMU_OS_MALLOC                        Malloc;

+  EMU_OS_VMALLOC                       Valloc;

+  EMU_OS_FREE                          Free;

 

   ///

   /// PE/COFF loader hooks to get symbols loaded

   ///

-  EMU_PE_COFF_GET_ENTRY_POINT       PeCoffGetEntryPoint;

-  EMU_PE_COFF_RELOCATE_EXTRA_ACTION PeCoffRelocateImageExtraAction;

-  EMU_PE_COFF_UNLOAD_EXTRA_ACTION   PeCoffUnloadImageExtraAction;

+  EMU_PE_COFF_GET_ENTRY_POINT          PeCoffGetEntryPoint;

+  EMU_PE_COFF_RELOCATE_EXTRA_ACTION    PeCoffRelocateImageExtraAction;

+  EMU_PE_COFF_UNLOAD_EXTRA_ACTION      PeCoffUnloadImageExtraAction;

 

   ///

   /// DXE Architecture Protocol Services

   ///

-  EMU_ENABLE_INERRUPTS              EnableInterrupt;

-  EMU_DISABLE_INERRUPTS             DisableInterrupt;

-  EMU_QUERY_PERFORMANCE_FREQENCY    QueryPerformanceFrequency;

-  EMU_QUERY_PERFORMANCE_COUNTER     QueryPerformanceCounter;

-

-  EMU_SLEEP                         Sleep;

-  EMU_CPU_SLEEP                     CpuSleep;

-  EMU_EXIT                          Exit;

-  EMU_GET_TIME                      GetTime;

-  EMU_SET_TIME                      SetTime;

-  EMU_SET_TIMER                     SetTimer;

+  EMU_ENABLE_INERRUPTS                 EnableInterrupt;

+  EMU_DISABLE_INERRUPTS                DisableInterrupt;

+  EMU_QUERY_PERFORMANCE_FREQENCY       QueryPerformanceFrequency;

+  EMU_QUERY_PERFORMANCE_COUNTER        QueryPerformanceCounter;

+

+  EMU_SLEEP                            Sleep;

+  EMU_CPU_SLEEP                        CpuSleep;

+  EMU_EXIT                             Exit;

+  EMU_GET_TIME                         GetTime;

+  EMU_SET_TIME                         SetTime;

+  EMU_SET_TIMER                        SetTimer;

 

   ///

   /// Generic System Services

   ///

-  EMU_GET_NEXT_PROTOCOL             GetNextProtocol;

+  EMU_GET_NEXT_PROTOCOL                GetNextProtocol;

 };

 

-extern EFI_GUID gEmuThunkProtocolGuid;

+extern EFI_GUID  gEmuThunkProtocolGuid;

 

 #endif