Update to make end-of-line consistent for all source files in MdePkg. There are no other updates besides that change.

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

6 files changed, 199 insertions, 199 deletions

diff --git a/MdePkg/Include/Arm/ProcessorBind.h b/MdePkg/Include/Arm/ProcessorBind.h
index 6e2697d3e8..2f24f0da70 100644
--- a/MdePkg/Include/Arm/ProcessorBind.h
+++ b/MdePkg/Include/Arm/ProcessorBind.h
@@ -1,118 +1,118 @@
-
-/** @file
-  Processor or Compiler specific defines and types for ARM.
-
-  Copyright (c) 2006 - 2009, Intel Corporation                                                         
-  Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.
-  All rights reserved. This program and the accompanying materials                          
-  are licensed and made available under the terms and conditions of the BSD License         
-  which accompanies this distribution.  The full text of the license may be found at        
-  http://opensource.org/licenses/bsd-license.php                                            
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
-
-**/
-
-#ifndef __PROCESSOR_BIND_H__
-#define __PROCESSOR_BIND_H__
-
-///
-/// Define the processor type so other code can make processor based choices
-///
-#define MDE_CPU_ARM
-
-//
-// Make sure we are useing the correct packing rules per EFI specification
-//
-#ifndef __GNUC__
-#pragma pack()
-#endif
-
-#if _MSC_EXTENSIONS 
-  //
-  // use Microsoft* C complier dependent interger width types 
-  //
-  typedef unsigned __int64    UINT64;
-  typedef __int64             INT64;
-  typedef unsigned __int32    UINT32;
-  typedef __int32             INT32;
-  typedef unsigned short      UINT16;
-  typedef unsigned short      CHAR16;
-  typedef short               INT16;
-  typedef unsigned char       BOOLEAN;
-  typedef unsigned char       UINT8;
-  typedef char                CHAR8;
-  typedef char                INT8;
-#else
-  //
-  // Assume standard ARM alignment. 
-  // Need to check portability of long long
-  //
-  typedef unsigned long long  UINT64;
-  typedef long long           INT64;
-  typedef unsigned int        UINT32;
-  typedef int                 INT32;
-  typedef unsigned short      UINT16;
-  typedef unsigned short      CHAR16;
-  typedef short               INT16;
-  typedef unsigned char       BOOLEAN;
-  typedef unsigned char       UINT8;
-  typedef char                CHAR8;
-  typedef char                INT8;
-#endif
-
+

+/** @file

+  Processor or Compiler specific defines and types for ARM.

+

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

+  Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.

+  All rights reserved. This program and the accompanying materials                          

+  are licensed and made available under the terms and conditions of the BSD License         

+  which accompanies this distribution.  The full text of the license may be found at        

+  http://opensource.org/licenses/bsd-license.php                                            

+

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+

+**/

+

+#ifndef __PROCESSOR_BIND_H__

+#define __PROCESSOR_BIND_H__

+

+///

+/// Define the processor type so other code can make processor based choices

+///

+#define MDE_CPU_ARM

+

+//

+// Make sure we are useing the correct packing rules per EFI specification

+//

+#ifndef __GNUC__

+#pragma pack()

+#endif

+

+#if _MSC_EXTENSIONS 

+  //

+  // use Microsoft* C complier dependent interger width types 

+  //

+  typedef unsigned __int64    UINT64;

+  typedef __int64             INT64;

+  typedef unsigned __int32    UINT32;

+  typedef __int32             INT32;

+  typedef unsigned short      UINT16;

+  typedef unsigned short      CHAR16;

+  typedef short               INT16;

+  typedef unsigned char       BOOLEAN;

+  typedef unsigned char       UINT8;

+  typedef char                CHAR8;

+  typedef char                INT8;

+#else

+  //

+  // Assume standard ARM alignment. 

+  // Need to check portability of long long

+  //

+  typedef unsigned long long  UINT64;

+  typedef long long           INT64;

+  typedef unsigned int        UINT32;

+  typedef int                 INT32;

+  typedef unsigned short      UINT16;

+  typedef unsigned short      CHAR16;

+  typedef short               INT16;

+  typedef unsigned char       BOOLEAN;

+  typedef unsigned char       UINT8;

+  typedef char                CHAR8;

+  typedef char                INT8;

+#endif

+

 ///

 /// Unsigned value of native width.  (4 bytes on supported 32-bit processor instructions,

 /// 8 bytes on supported 64-bit processor instructions)

 ///

-typedef UINT32  UINTN;
-
+typedef UINT32  UINTN;

+

 ///

 /// Signed value of native width.  (4 bytes on supported 32-bit processor instructions,

 /// 8 bytes on supported 64-bit processor instructions)

 ///

-typedef INT32   INTN;
-
-//
-// Processor specific defines
-//
+typedef INT32   INTN;

+

+//

+// Processor specific defines

+//

 

 ///

 /// A value of native width with the highest bit set.

 ///

-#define MAX_BIT      0x80000000
-
+#define MAX_BIT      0x80000000

+

 ///

 /// A value of native width with the two highest bits set.

 ///

-#define MAX_2_BITS   0xC0000000
-
-///
-/// Maximum legal ARM address
-///
-#define MAX_ADDRESS  0xFFFFFFFF
-
-///
-/// The stack alignment required for ARM
-///
-#define CPU_STACK_ALIGNMENT  sizeof(UINT64)
-
-//
-// Modifier to ensure that all protocol member functions and EFI intrinsics
-// use the correct C calling convention. All protocol member functions and
-// EFI intrinsics are required to modify thier member functions with EFIAPI.
-//
-#define EFIAPI    
-
-#if defined(__GNUC__)
-  ///
-  /// For GNU assembly code, .global or .globl can declare global symbols.
-  /// Define this macro to unify the usage.
-  ///
-  #define ASM_GLOBAL .globl
-#endif
-
+#define MAX_2_BITS   0xC0000000

+

+///

+/// Maximum legal ARM address

+///

+#define MAX_ADDRESS  0xFFFFFFFF

+

+///

+/// The stack alignment required for ARM

+///

+#define CPU_STACK_ALIGNMENT  sizeof(UINT64)

+

+//

+// Modifier to ensure that all protocol member functions and EFI intrinsics

+// use the correct C calling convention. All protocol member functions and

+// EFI intrinsics are required to modify thier member functions with EFIAPI.

+//

+#define EFIAPI    

+

+#if defined(__GNUC__)

+  ///

+  /// For GNU assembly code, .global or .globl can declare global symbols.

+  /// Define this macro to unify the usage.

+  ///

+  #define ASM_GLOBAL .globl

+#endif

+

 /**

   Return the pointer to the first instruction of a function given a function pointer.

   On ARM CPU architectures, these two pointer values are the same, 

@@ -123,6 +123,6 @@ typedef INT32   INTN;
   @return The pointer to the first instruction of a function given a function pointer.

   

 **/

-#define FUNCTION_ENTRY_POINT(FunctionPointer) (FunctionPointer)
-
-#endif
+#define FUNCTION_ENTRY_POINT(FunctionPointer) (FunctionPointer)

+

+#endif

diff --git a/MdePkg/Include/Library/BaseLib.h b/MdePkg/Include/Library/BaseLib.h
index 77efbfaef7..d08a2f0aac 100644
--- a/MdePkg/Include/Library/BaseLib.h
+++ b/MdePkg/Include/Library/BaseLib.h
@@ -3,7 +3,7 @@
   functions, and CPU architecture-specific functions.

 

 Copyright (c) 2006 - 2008, Intel Corporation<BR>

-Portions Copyright (c) 2008-2009 Apple Inc.<BR>
+Portions Copyright (c) 2008-2009 Apple Inc.<BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -126,26 +126,26 @@ typedef struct {
 

 #endif // defined (MDE_CPU_EBC)

 

-#if defined (MDE_CPU_ARM)
-
-typedef struct {
-	UINT32		R3;  ///< Copy of R13
-	UINT32		R4;
-	UINT32		R5;
-	UINT32		R6;
-	UINT32		R7;
-	UINT32		R8;
-	UINT32		R9;
-	UINT32		R10;
-	UINT32		R11;
-	UINT32		R12;
-	UINT32		R14;
-} BASE_LIBRARY_JUMP_BUFFER;
-
-#define BASE_LIBRARY_JUMP_BUFFER_ALIGNMENT 4
-
-#endif  // defined (MDE_CPU_ARM)
-
+#if defined (MDE_CPU_ARM)

+

+typedef struct {

+	UINT32		R3;  ///< Copy of R13

+	UINT32		R4;

+	UINT32		R5;

+	UINT32		R6;

+	UINT32		R7;

+	UINT32		R8;

+	UINT32		R9;

+	UINT32		R10;

+	UINT32		R11;

+	UINT32		R12;

+	UINT32		R14;

+} BASE_LIBRARY_JUMP_BUFFER;

+

+#define BASE_LIBRARY_JUMP_BUFFER_ALIGNMENT 4

+

+#endif  // defined (MDE_CPU_ARM)

+

 //

 // String Services

 //

diff --git a/MdePkg/Include/Library/PeCoffLib.h b/MdePkg/Include/Library/PeCoffLib.h
index 76b29911f2..9a7f3bd2b0 100644
--- a/MdePkg/Include/Library/PeCoffLib.h
+++ b/MdePkg/Include/Library/PeCoffLib.h
@@ -6,7 +6,7 @@
   and can be ported easily to any environment.

   

 Copyright (c) 2006 - 2008, Intel Corporation<BR>       

-Portions Copyright (c) 2008-2009 Apple Inc.<BR>
+Portions Copyright (c) 2008-2009 Apple Inc.<BR>

 All rights reserved. This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -192,10 +192,10 @@ typedef struct {
   /// otherwise, the entry remains to be 0.

   ///

   PHYSICAL_ADDRESS                  HiiResourceData;

-  ///
-  /// Private storage for implementation specific data. 
-  ///
-  UINT64                            Context;      
+  ///

+  /// Private storage for implementation specific data. 

+  ///

+  UINT64                            Context;      

 } PE_COFF_LOADER_IMAGE_CONTEXT;

 

 /**

diff --git a/MdePkg/Include/Protocol/DebugSupport.h b/MdePkg/Include/Protocol/DebugSupport.h
index fb1d589ec4..cde7a15e21 100644
--- a/MdePkg/Include/Protocol/DebugSupport.h
+++ b/MdePkg/Include/Protocol/DebugSupport.h
@@ -6,7 +6,7 @@
   processor and handle context save and restore operations.

 

   Copyright (c) 2006 - 2009, Intel Corporation<BR>       

-  Portions Copyright (c) 2008-2009 Apple Inc.<BR>
+  Portions Copyright (c) 2008-2009 Apple Inc.<BR>

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -472,61 +472,61 @@ typedef struct {
   UINT64  Ip;

 } EFI_SYSTEM_CONTEXT_EBC;

 

-
-
-///
-///  ARM processor exception types
-///
-#define EXCEPT_ARM_RESET                    0
-#define EXCEPT_ARM_UNDEFINED_INSTRUCTION    1
-#define EXCEPT_ARM_SOFTWARE_INTERRUPT       2
-#define EXCEPT_ARM_PREFETCH_ABORT           3
-#define EXCEPT_ARM_DATA_ABORT               4
-#define EXCEPT_ARM_RESERVED                 5
-#define EXCEPT_ARM_IRQ                      6
-#define EXCEPT_ARM_FIQ                      7
-
-///
-/// For coding convenience, define the maximum valid ARM exception.
-///
-#define MAX_ARM_EXCEPTION EXCEPT_ARM_FIQ
-
-///
-///  ARM processor context definition
-///
-typedef struct {
-  UINT32  R0;
-  UINT32  R1;
-  UINT32  R2;
-  UINT32  R3;
-  UINT32  R4;
-  UINT32  R5;
-  UINT32  R6;
-  UINT32  R7;
-  UINT32  R8;
-  UINT32  R9;
-  UINT32  R10;
-  UINT32  R11;
-  UINT32  R12;
-  UINT32  SP;
-  UINT32  LR;
-  UINT32  PC;
-  UINT32  CPSR;
-  UINT32  DFSR;
-  UINT32  DFAR;
-  UINT32  IFSR;
-  UINT32  IFAR;
-} EFI_SYSTEM_CONTEXT_ARM;
-
-///
-/// Universal EFI_SYSTEM_CONTEXT definition
-///
+

+

+///

+///  ARM processor exception types

+///

+#define EXCEPT_ARM_RESET                    0

+#define EXCEPT_ARM_UNDEFINED_INSTRUCTION    1

+#define EXCEPT_ARM_SOFTWARE_INTERRUPT       2

+#define EXCEPT_ARM_PREFETCH_ABORT           3

+#define EXCEPT_ARM_DATA_ABORT               4

+#define EXCEPT_ARM_RESERVED                 5

+#define EXCEPT_ARM_IRQ                      6

+#define EXCEPT_ARM_FIQ                      7

+

+///

+/// For coding convenience, define the maximum valid ARM exception.

+///

+#define MAX_ARM_EXCEPTION EXCEPT_ARM_FIQ

+

+///

+///  ARM processor context definition

+///

+typedef struct {

+  UINT32  R0;

+  UINT32  R1;

+  UINT32  R2;

+  UINT32  R3;

+  UINT32  R4;

+  UINT32  R5;

+  UINT32  R6;

+  UINT32  R7;

+  UINT32  R8;

+  UINT32  R9;

+  UINT32  R10;

+  UINT32  R11;

+  UINT32  R12;

+  UINT32  SP;

+  UINT32  LR;

+  UINT32  PC;

+  UINT32  CPSR;

+  UINT32  DFSR;

+  UINT32  DFAR;

+  UINT32  IFSR;

+  UINT32  IFAR;

+} EFI_SYSTEM_CONTEXT_ARM;

+

+///

+/// Universal EFI_SYSTEM_CONTEXT definition

+///

 typedef union {

   EFI_SYSTEM_CONTEXT_EBC  *SystemContextEbc;

   EFI_SYSTEM_CONTEXT_IA32 *SystemContextIa32;

   EFI_SYSTEM_CONTEXT_X64  *SystemContextX64;

   EFI_SYSTEM_CONTEXT_IPF  *SystemContextIpf;

-  EFI_SYSTEM_CONTEXT_ARM  *SystemContextArm;
+  EFI_SYSTEM_CONTEXT_ARM  *SystemContextArm;

 } EFI_SYSTEM_CONTEXT;

 

 //

@@ -566,8 +566,8 @@ typedef enum {
   IsaIa32 = IMAGE_FILE_MACHINE_I386,           ///< 0x014C

   IsaX64  = IMAGE_FILE_MACHINE_X64,            ///< 0x8664

   IsaIpf  = IMAGE_FILE_MACHINE_IA64,           ///< 0x0200

-  IsaEbc  = IMAGE_FILE_MACHINE_EBC,            ///< 0x0EBC
-  IsaArm  = IMAGE_FILE_MACHINE_ARMTHUMB_MIXED  ///< 0x01c2
+  IsaEbc  = IMAGE_FILE_MACHINE_EBC,            ///< 0x0EBC

+  IsaArm  = IMAGE_FILE_MACHINE_ARMTHUMB_MIXED  ///< 0x01c2

 } EFI_INSTRUCTION_SET_ARCHITECTURE;

 

 

diff --git a/MdePkg/Include/Uefi/UefiBaseType.h b/MdePkg/Include/Uefi/UefiBaseType.h
index 2a0d150485..389660dd3f 100644
--- a/MdePkg/Include/Uefi/UefiBaseType.h
+++ b/MdePkg/Include/Uefi/UefiBaseType.h
@@ -2,7 +2,7 @@
   Defines data types and constants introduced in UEFI.

 

   Copyright (c) 2006 - 2008, Intel Corporation<BR>

-  Portions Copyright (c) 2008-2009 Apple Inc.<BR>
+  Portions Copyright (c) 2008-2009 Apple Inc.<BR>

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -198,11 +198,11 @@ typedef union {
 ///

 #define EFI_IMAGE_MACHINE_X64             0x8664

 

-///
-/// PE32+ Machine type for ARM mixed ARM and Thumb/Thumb2 images
-///
-#define EFI_IMAGE_MACHINE_ARMTHUMB_MIXED  0x01C2
-
+///

+/// PE32+ Machine type for ARM mixed ARM and Thumb/Thumb2 images

+///

+#define EFI_IMAGE_MACHINE_ARMTHUMB_MIXED  0x01C2

+

 

 #if   defined (MDE_CPU_IA32)

 

@@ -225,13 +225,13 @@ typedef union {
 

 #define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_IA32) 

 

-#elif defined (MDE_CPU_ARM)
-
-#define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \
-  (((Machine) == EFI_IMAGE_MACHINE_ARMTHUMB_MIXED) || ((Machine) == EFI_IMAGE_MACHINE_EBC))
-
-#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_ARMTHUMB_MIXED) 
-
+#elif defined (MDE_CPU_ARM)

+

+#define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \

+  (((Machine) == EFI_IMAGE_MACHINE_ARMTHUMB_MIXED) || ((Machine) == EFI_IMAGE_MACHINE_EBC))

+

+#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_ARMTHUMB_MIXED) 

+

 #elif defined (MDE_CPU_EBC)

 

 ///

diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index ba263e9a2b..62e0615ade 100644
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -6,7 +6,7 @@
   by this include file.

 

   Copyright (c) 2006 - 2008, Intel Corporation<BR>

-  Portions Copyright (c) 2008-2009 Apple Inc.<BR>
+  Portions Copyright (c) 2008-2009 Apple Inc.<BR>

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -2061,7 +2061,7 @@ typedef struct {
 #define EFI_REMOVABLE_MEDIA_FILE_NAME_IA32    L"\\EFI\\BOOT\\BOOTIA32.EFI"

 #define EFI_REMOVABLE_MEDIA_FILE_NAME_IA64    L"\\EFI\\BOOT\\BOOTIA64.EFI"

 #define EFI_REMOVABLE_MEDIA_FILE_NAME_X64     L"\\EFI\\BOOT\\BOOTX64.EFI"

-#define EFI_REMOVABLE_MEDIA_FILE_NAME_ARM     L"\\EFI\\BOOT\\BOOTARM.EFI"
+#define EFI_REMOVABLE_MEDIA_FILE_NAME_ARM     L"\\EFI\\BOOT\\BOOTARM.EFI"

 

 #if   defined (MDE_CPU_IA32)

   #define EFI_REMOVABLE_MEDIA_FILE_NAME   EFI_REMOVABLE_MEDIA_FILE_NAME_IA32

@@ -2070,8 +2070,8 @@ typedef struct {
 #elif defined (MDE_CPU_X64)

   #define EFI_REMOVABLE_MEDIA_FILE_NAME   EFI_REMOVABLE_MEDIA_FILE_NAME_X64

 #elif defined (MDE_CPU_EBC)

-#elif defined (MDE_CPU_ARM)
-  #define EFI_REMOVABLE_MEDIA_FILE_NAME   EFI_REMOVABLE_MEDIA_FILE_NAME_ARM
+#elif defined (MDE_CPU_ARM)

+  #define EFI_REMOVABLE_MEDIA_FILE_NAME   EFI_REMOVABLE_MEDIA_FILE_NAME_ARM

 #else

   #error Unknown Processor Type

 #endif