Add in OFFSET_OF macro as defined in MDE Library spec

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

1 files changed, 43 insertions, 38 deletions

diff --git a/MdePkg/Include/Common/BaseTypes.h b/MdePkg/Include/Common/BaseTypes.h
index 2849ae903a..f20217bf7e 100644
--- a/MdePkg/Include/Common/BaseTypes.h
+++ b/MdePkg/Include/Common/BaseTypes.h
@@ -3,7 +3,7 @@
 

   This file is stand alone self consistent set of definitions. 

 

-  Copyright (c) 2006 - 2007, Intel Corporation                                                         

+  Copyright (c) 2006 - 2007, Intel Corporation

   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        

@@ -77,37 +77,37 @@ typedef struct {
 #endif

 

 #define  BIT0     0x00000001

-#define  BIT1     0x00000002
-#define  BIT2     0x00000004
-#define  BIT3     0x00000008
-#define  BIT4     0x00000010
-#define  BIT5     0x00000020
-#define  BIT6     0x00000040
-#define  BIT7     0x00000080
-#define  BIT8     0x00000100
-#define  BIT9     0x00000200
-#define  BIT10    0x00000400
-#define  BIT11    0x00000800
-#define  BIT12    0x00001000
-#define  BIT13    0x00002000
-#define  BIT14    0x00004000
-#define  BIT15    0x00008000
-#define  BIT16    0x00010000
-#define  BIT17    0x00020000
-#define  BIT18    0x00040000
-#define  BIT19    0x00080000
-#define  BIT20    0x00100000
-#define  BIT21    0x00200000
-#define  BIT22    0x00400000
-#define  BIT23    0x00800000
-#define  BIT24    0x01000000
-#define  BIT25    0x02000000
-#define  BIT26    0x04000000
-#define  BIT27    0x08000000
-#define  BIT28    0x10000000
-#define  BIT29    0x20000000
-#define  BIT30    0x40000000
-#define  BIT31    0x80000000
+#define  BIT1     0x00000002

+#define  BIT2     0x00000004

+#define  BIT3     0x00000008

+#define  BIT4     0x00000010

+#define  BIT5     0x00000020

+#define  BIT6     0x00000040

+#define  BIT7     0x00000080

+#define  BIT8     0x00000100

+#define  BIT9     0x00000200

+#define  BIT10    0x00000400

+#define  BIT11    0x00000800

+#define  BIT12    0x00001000

+#define  BIT13    0x00002000

+#define  BIT14    0x00004000

+#define  BIT15    0x00008000

+#define  BIT16    0x00010000

+#define  BIT17    0x00020000

+#define  BIT18    0x00040000

+#define  BIT19    0x00080000

+#define  BIT20    0x00100000

+#define  BIT21    0x00200000

+#define  BIT22    0x00400000

+#define  BIT23    0x00800000

+#define  BIT24    0x01000000

+#define  BIT25    0x02000000

+#define  BIT26    0x04000000

+#define  BIT27    0x08000000

+#define  BIT28    0x10000000

+#define  BIT29    0x20000000

+#define  BIT30    0x40000000

+#define  BIT31    0x80000000

 #define  BIT32    0x0000000100000000UL

 #define  BIT33    0x0000000200000000UL

 #define  BIT34    0x0000000400000000UL

@@ -140,7 +140,7 @@ typedef struct {
 #define  BIT61    0x2000000000000000UL

 #define  BIT62    0x4000000000000000UL

 #define  BIT63    0x8000000000000000UL

-
+

 //

 //  Support for variable length argument lists using the ANSI standard.

 //  

@@ -195,6 +195,11 @@ typedef CHAR8 *VA_LIST;
 

 #endif

 

+//

+// Macro that returns the byte offset of a field in a data structure. 

+//

+#define OFFSET_OF(TYPE, Field) ((UINTN) &(((TYPE *)0)->Field))

+

 ///

 ///  CONTAINING_RECORD - returns a pointer to the structure

 ///      from one of it's elements.

@@ -221,17 +226,17 @@ typedef CHAR8 *VA_LIST;
 // This macro returns the maximum of two operand specified by a and b.  

 // Both a and b must be the same numerical types, signed or unsigned.

 //

-#define MAX(a, b)                       \
-  (((a) > (b)) ? (a) : (b))
-
+#define MAX(a, b)                       \

+  (((a) > (b)) ? (a) : (b))

+

 

 //

 // Return the minimum of two operands. 

 // This macro returns the minimal of two operand specified by a and b.  

 // Both a and b must be the same numerical types, signed or unsigned.

 //

-#define MIN(a, b)                       \
-  (((a) < (b)) ? (a) : (b))
+#define MIN(a, b)                       \

+  (((a) < (b)) ? (a) : (b))

 

 

 //