Minor coding style adjustment for DiskIo, Partition, English and Ebc modules.

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

4 files changed, 135 insertions, 148 deletions

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
index 31ff76d..e4240c9 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
@@ -67,8 +67,8 @@ UINT64
 STATIC

 INT16

 VmReadIndex16 (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT32     CodeOffset

+  IN VM_CONTEXT     *VmPtr,

+  IN UINT32         CodeOffset

   );

 

 /**

@@ -84,8 +84,8 @@ VmReadIndex16 (
 STATIC

 INT32

 VmReadIndex32 (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT32     CodeOffset

+  IN VM_CONTEXT     *VmPtr,

+  IN UINT32         CodeOffset

   );

 

 /**

@@ -101,8 +101,8 @@ VmReadIndex32 (
 STATIC

 INT64

 VmReadIndex64 (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT32     CodeOffset

+  IN VM_CONTEXT     *VmPtr,

+  IN UINT32         CodeOffset

   );

 

 /**

@@ -117,8 +117,8 @@ VmReadIndex64 (
 STATIC

 UINT8

 VmReadMem8 (

-  IN VM_CONTEXT *VmPtr,

-  IN UINTN      Addr

+  IN VM_CONTEXT   *VmPtr,

+  IN UINTN        Addr

   );

 

 /**

@@ -165,8 +165,8 @@ VmReadMem32 (
 STATIC

 UINT64

 VmReadMem64 (

-  IN VM_CONTEXT *VmPtr,

-  IN UINTN      Addr

+  IN VM_CONTEXT   *VmPtr,

+  IN UINTN        Addr

   );

 

 /**

@@ -181,8 +181,8 @@ VmReadMem64 (
 STATIC

 UINTN

 VmReadMemN (

-  IN VM_CONTEXT *VmPtr,

-  IN UINTN      Addr

+  IN VM_CONTEXT    *VmPtr,

+  IN UINTN         Addr

   );

 

 /**

@@ -211,9 +211,9 @@ VmReadMemN (
 STATIC

 EFI_STATUS

 VmWriteMem8 (

-  IN VM_CONTEXT *VmPtr,

-  IN UINTN      Addr,

-  IN UINT8      Data

+  IN VM_CONTEXT    *VmPtr,

+  IN UINTN         Addr,

+  IN UINT8         Data

   );

 

 /**

@@ -242,9 +242,9 @@ VmWriteMem8 (
 STATIC

 EFI_STATUS

 VmWriteMem16 (

-  IN VM_CONTEXT *VmPtr,

-  IN UINTN      Addr,

-  IN UINT16     Data

+  IN VM_CONTEXT   *VmPtr,

+  IN UINTN        Addr,

+  IN UINT16       Data

   );

 

 /**

@@ -273,9 +273,9 @@ VmWriteMem16 (
 STATIC

 EFI_STATUS

 VmWriteMem32 (

-  IN VM_CONTEXT *VmPtr,

-  IN UINTN      Addr,

-  IN UINT32     Data

+  IN VM_CONTEXT   *VmPtr,

+  IN UINTN        Addr,

+  IN UINT32       Data

   );

 

 /**

@@ -441,8 +441,8 @@ VmReadImmed64 (
 STATIC

 UINTN

 ConvertStackAddr (

-  IN VM_CONTEXT   *VmPtr,

-  IN UINTN        Addr

+  IN VM_CONTEXT    *VmPtr,

+  IN UINTN         Addr

   );

 

 /**

@@ -792,7 +792,7 @@ ExecutePOP (
 STATIC

 EFI_STATUS

 ExecuteSignedDataManip (

-  IN VM_CONTEXT *VmPtr

+  IN VM_CONTEXT   *VmPtr

   );

 

 /**

@@ -815,7 +815,7 @@ ExecuteSignedDataManip (
 STATIC

 EFI_STATUS

 ExecuteUnsignedDataManip (

-  IN VM_CONTEXT *VmPtr

+  IN VM_CONTEXT   *VmPtr

   );

 

 /**

@@ -923,9 +923,9 @@ ExecuteMOVsnw (
 STATIC

 UINT64

 ExecuteNOT (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT     *VmPtr,

+  IN UINT64         Op1,

+  IN UINT64         Op2

   );

 

 /**

@@ -944,9 +944,9 @@ ExecuteNOT (
 STATIC

 UINT64

 ExecuteNEG (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT   *VmPtr,

+  IN UINT64       Op1,

+  IN UINT64       Op2

   );

 

 /**

@@ -965,9 +965,9 @@ ExecuteNEG (
 STATIC

 UINT64

 ExecuteADD (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT   *VmPtr,

+  IN UINT64       Op1,

+  IN UINT64       Op2

   );

 

 /**

@@ -986,9 +986,9 @@ ExecuteADD (
 STATIC

 UINT64

 ExecuteSUB (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT   *VmPtr,

+  IN UINT64       Op1,

+  IN UINT64       Op2

   );

 

 /**

@@ -1007,9 +1007,9 @@ ExecuteSUB (
 STATIC

 UINT64

 ExecuteMUL (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT   *VmPtr,

+  IN UINT64       Op1,

+  IN UINT64       Op2

   );

 

 /**

@@ -1028,9 +1028,9 @@ ExecuteMUL (
 STATIC

 UINT64

 ExecuteMULU (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT   *VmPtr,

+  IN UINT64       Op1,

+  IN UINT64       Op2

   );

 

 /**

@@ -1049,9 +1049,9 @@ ExecuteMULU (
 STATIC

 UINT64

 ExecuteDIV (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT   *VmPtr,

+  IN UINT64       Op1,

+  IN UINT64       Op2

   );

 

 /**

@@ -1070,9 +1070,9 @@ ExecuteDIV (
 STATIC

 UINT64

 ExecuteDIVU (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT   *VmPtr,

+  IN UINT64       Op1,

+  IN UINT64       Op2

   );

 

 /**

@@ -1091,9 +1091,9 @@ ExecuteDIVU (
 STATIC

 UINT64

 ExecuteMOD (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT   *VmPtr,

+  IN UINT64       Op1,

+  IN UINT64       Op2

   );

 

 /**

@@ -1112,9 +1112,9 @@ ExecuteMOD (
 STATIC

 UINT64

 ExecuteMODU (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT   *VmPtr,

+  IN UINT64       Op1,

+  IN UINT64       Op2

   );

 

 /**

@@ -1133,9 +1133,9 @@ ExecuteMODU (
 STATIC

 UINT64

 ExecuteAND (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT   *VmPtr,

+  IN UINT64       Op1,

+  IN UINT64       Op2

   );

 

 /**

@@ -1154,9 +1154,9 @@ ExecuteAND (
 STATIC

 UINT64

 ExecuteOR (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT   *VmPtr,

+  IN UINT64       Op1,

+  IN UINT64       Op2

   );

 

 /**

@@ -1175,9 +1175,9 @@ ExecuteOR (
 STATIC

 UINT64

 ExecuteXOR (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT   *VmPtr,

+  IN UINT64       Op1,

+  IN UINT64       Op2

   );

 

 /**

@@ -1196,9 +1196,9 @@ ExecuteXOR (
 STATIC

 UINT64

 ExecuteSHL (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT   *VmPtr,

+  IN UINT64       Op1,

+  IN UINT64       Op2

   );

 

 /**

@@ -1217,9 +1217,9 @@ ExecuteSHL (
 STATIC

 UINT64

 ExecuteSHR (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT   *VmPtr,

+  IN UINT64       Op1,

+  IN UINT64       Op2

   );

 

 /**

@@ -1238,9 +1238,9 @@ ExecuteSHR (
 STATIC

 UINT64

 ExecuteASHR (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT   *VmPtr,

+  IN UINT64       Op1,

+  IN UINT64       Op2

   );

 

 /**

@@ -1259,9 +1259,9 @@ ExecuteASHR (
 STATIC

 UINT64

 ExecuteEXTNDB (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT   *VmPtr,

+  IN UINT64       Op1,

+  IN UINT64       Op2

   );

 

 /**

@@ -1280,9 +1280,9 @@ ExecuteEXTNDB (
 STATIC

 UINT64

 ExecuteEXTNDW (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT   *VmPtr,

+  IN UINT64       Op1,

+  IN UINT64       Op2

   );

 

 /**

@@ -1301,9 +1301,9 @@ ExecuteEXTNDW (
 STATIC

 UINT64

 ExecuteEXTNDD (

-  IN VM_CONTEXT *VmPtr,

-  IN UINT64     Op1,

-  IN UINT64     Op2

+  IN VM_CONTEXT   *VmPtr,

+  IN UINT64       Op1,

+  IN UINT64       Op2

   );

 

 //

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.h b/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
index 13eea0c..551236e 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
@@ -239,8 +239,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 EFI_STATUS

 EbcExecute (

   IN VM_CONTEXT *VmPtr

-  )

-;

+  );

 

 

 

@@ -253,8 +252,7 @@ EbcExecute (
 UINT64

 GetVmVersion (

   VOID

-  )

-;

+  );

 

 /**

   Writes UINTN data to memory address.

@@ -284,8 +282,7 @@ VmWriteMemN (
   IN VM_CONTEXT   *VmPtr,

   IN UINTN        Addr,

   IN UINTN        Data

-  )

-;

+  );

 

 /**

   Writes 64-bit data to memory address.

@@ -312,11 +309,10 @@ VmWriteMemN (
 **/

 EFI_STATUS

 VmWriteMem64 (

-  IN VM_CONTEXT *VmPtr,

-  UINTN         Addr,

-  IN UINT64     Data

-  )

-;

+  IN VM_CONTEXT   *VmPtr,

+  IN UINTN        Addr,

+  IN UINT64       Data

+  );

 

 //

 // Define a protocol for an EBC VM test interface.

@@ -385,7 +381,6 @@ EbcExecuteInstructions (
   IN EFI_EBC_VM_TEST_PROTOCOL *This,

   IN VM_CONTEXT               *VmPtr,

   IN OUT UINTN                *InstructionCount

-  )

-;

+  );

 

 #endif // ifndef _EBC_EXECUTE_H_

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcInt.c b/MdeModulePkg/Universal/EbcDxe/EbcInt.c
index f48176e..bb3dddc 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcInt.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcInt.c
@@ -52,8 +52,8 @@ STATIC
 EFI_STATUS

 EFIAPI

 EbcUnloadImage (

-  IN EFI_EBC_PROTOCOL     *This,

-  IN EFI_HANDLE           ImageHandle

+  IN EFI_EBC_PROTOCOL   *This,

+  IN EFI_HANDLE         ImageHandle

   );

 

 /**

@@ -79,10 +79,10 @@ STATIC
 EFI_STATUS

 EFIAPI

 EbcCreateThunk (

-  IN EFI_EBC_PROTOCOL     *This,

-  IN EFI_HANDLE           ImageHandle,

-  IN VOID                 *EbcEntryPoint,

-  OUT VOID                **Thunk

+  IN EFI_EBC_PROTOCOL   *This,

+  IN EFI_HANDLE         ImageHandle,

+  IN VOID               *EbcEntryPoint,

+  OUT VOID              **Thunk

   );

 

 /**

@@ -100,8 +100,8 @@ STATIC
 EFI_STATUS

 EFIAPI

 EbcGetVersion (

-  IN EFI_EBC_PROTOCOL     *This,

-  IN OUT UINT64           *Version

+  IN EFI_EBC_PROTOCOL   *This,

+  IN OUT UINT64         *Version

   );

 

 /**

@@ -187,7 +187,7 @@ EbcDebugPeriodic (
 STATIC

 EFI_STATUS

 InitEbcVmTestProtocol (

-  IN EFI_HANDLE     *Handle

+  IN EFI_HANDLE     *IHandle

   );

 

 /**

@@ -216,8 +216,8 @@ STATIC
 EFI_STATUS

 EFIAPI

 EbcRegisterICacheFlush (

-  IN EFI_EBC_PROTOCOL               *This,

-  IN EBC_ICACHE_FLUSH               Flush

+  IN EFI_EBC_PROTOCOL   *This,

+  IN EBC_ICACHE_FLUSH   Flush

   );

 

 /**

@@ -235,8 +235,8 @@ STATIC
 EFI_STATUS

 EFIAPI

 EbcDebugGetMaximumProcessorIndex (

-  IN EFI_DEBUG_SUPPORT_PROTOCOL     *This,

-  OUT UINTN                         *MaxProcessorIndex

+  IN EFI_DEBUG_SUPPORT_PROTOCOL          *This,

+  OUT UINTN                              *MaxProcessorIndex

   );

 

 /**

@@ -264,9 +264,9 @@ STATIC
 EFI_STATUS

 EFIAPI

 EbcDebugRegisterPeriodicCallback (

-  IN EFI_DEBUG_SUPPORT_PROTOCOL     *This,

-  IN UINTN                          ProcessorIndex,

-  IN EFI_PERIODIC_CALLBACK          PeriodicCallback

+  IN EFI_DEBUG_SUPPORT_PROTOCOL  *This,

+  IN UINTN                       ProcessorIndex,

+  IN EFI_PERIODIC_CALLBACK       PeriodicCallback

   );

 

 /**

@@ -298,10 +298,10 @@ STATIC
 EFI_STATUS

 EFIAPI

 EbcDebugRegisterExceptionCallback (

-  IN EFI_DEBUG_SUPPORT_PROTOCOL     *This,

-  IN UINTN                          ProcessorIndex,

-  IN EFI_EXCEPTION_CALLBACK         ExceptionCallback,

-  IN EFI_EXCEPTION_TYPE             ExceptionType

+  IN EFI_DEBUG_SUPPORT_PROTOCOL  *This,

+  IN UINTN                       ProcessorIndex,

+  IN EFI_EXCEPTION_CALLBACK      ExceptionCallback,

+  IN EFI_EXCEPTION_TYPE          ExceptionType

   );

 

 /**

@@ -324,10 +324,10 @@ STATIC
 EFI_STATUS

 EFIAPI

 EbcDebugInvalidateInstructionCache (

-  IN EFI_DEBUG_SUPPORT_PROTOCOL     *This,

-  IN UINTN                          ProcessorIndex,

-  IN VOID                           *Start,

-  IN UINT64                         Length

+  IN EFI_DEBUG_SUPPORT_PROTOCOL          *This,

+  IN UINTN                               ProcessorIndex,

+  IN VOID                                *Start,

+  IN UINT64                              Length

   );

 

 //

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcInt.h b/MdeModulePkg/Universal/EbcDxe/EbcInt.h
index 720ee26..c08ae92 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcInt.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcInt.h
@@ -101,9 +101,8 @@ EbcCreateThunks (
   IN EFI_HANDLE           ImageHandle,

   IN VOID                 *EbcEntryPoint,

   OUT VOID                **Thunk,

-  IN UINT32               Flags

-  )

-;

+  IN  UINT32              Flags

+  );

 

 /**

   Add a thunk to our list of thunks for a given image handle.

@@ -120,11 +119,10 @@ EbcCreateThunks (
 **/

 EFI_STATUS

 EbcAddImageThunk (

-  IN EFI_HANDLE     ImageHandle,

-  IN VOID           *ThunkBuffer,

-  IN UINT32         ThunkSize

-  )

-;

+  IN EFI_HANDLE      ImageHandle,

+  IN VOID            *ThunkBuffer,

+  IN UINT32          ThunkSize

+  );

 

 //

 // The interpreter calls these when an exception is detected,

@@ -143,11 +141,10 @@ EbcAddImageThunk (
 **/

 EFI_STATUS

 EbcDebugSignalException (

-  IN EFI_EXCEPTION_TYPE ExceptionType,

-  IN EXCEPTION_FLAGS    ExceptionFlags,

-  IN VM_CONTEXT         *VmPtr

-  )

-;

+  IN EFI_EXCEPTION_TYPE                   ExceptionType,

+  IN EXCEPTION_FLAGS                      ExceptionFlags,

+  IN VM_CONTEXT                           *VmPtr

+  );

 

 //

 // Define a constant of how often to call the debugger periodic callback

@@ -161,21 +158,20 @@ EbcDebugSignalException (
 //

 // External low level functions that are native-processor dependent

 // 

-/** 

+/**

   The VM thunk code stuffs an EBC entry point into a processor 

   register. Since we can't use inline assembly to get it from

   the interpreter C code, stuff it into the return value

   register and return.

  

   @return  The contents of the register in which the entry point is passed.

- 

-**/ 

+

+**/

 UINTN

 EFIAPI

 EbcLLGetEbcEntryPoint (

   VOID

-  )

-;

+  );

 

 /**

   Returns the caller's value of the stack pointer.

@@ -183,15 +179,14 @@ EbcLLGetEbcEntryPoint (
   We adjust it by 4 here because when they called us, the return address

   is put on the stack, thereby lowering it by 4 bytes.

 

-  @return The current value of the stack pointer for the caller. 

+  @return The current value of the stack pointer for the caller.

 

 **/

 UINTN

 EFIAPI

 EbcLLGetStackPointer (

   VOID

-  )

-;

+  );

 

 /**

   This function is called to execute an EBC CALLEX instruction.

@@ -204,7 +199,7 @@ EbcLLGetStackPointer (
   @param  CallAddr     The function address.

   @param  EbcSp        The new EBC stack pointer.

   @param  FramePtr     The frame pointer.

-   

+

 **/

 VOID

 EFIAPI

@@ -212,8 +207,7 @@ EbcLLCALLEXNative (
   IN UINTN        CallAddr,

   IN UINTN        EbcSp,

   IN VOID         *FramePtr

-  )

-;

+  );

 

 /**

   This function is called to execute an EBC CALLEX instruction.

@@ -237,8 +231,7 @@ EbcLLCALLEX (
   IN UINTN        NewStackPointer,

   IN VOID         *FramePtr,

   IN UINT8        Size

-  )

-;

+  );

 

 /**

   When EBC calls native, on return the VM has to stuff the return

@@ -246,15 +239,14 @@ EbcLLCALLEX (
   in the register, so simply return and the caller should get the

   return result properly.

 

-  @return The unmodified value returned by the native code. 

+  @return The unmodified value returned by the native code.

 

 **/

 INT64

 EFIAPI

 EbcLLGetReturnValue (

   VOID

-  )

-;

+  );

 

 /**

   Returns the stack index and buffer assosicated with the Handle parameter.