X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FConf%2FPcd%2FPcdDatabaseCommonDefinitions.sample;h=7df1a5a6f4028f6e76e24a1383dab1fd64bea80b;hp=011d3df60342ef60f24964d81cd14c1d1eb87420;hb=7cd6b97fc7c8494911f21daa5570eda8770c2969;hpb=eaa6aeba69ef2e43937a5726070ff9b71b67a3f2

diff --git a/Tools/Conf/Pcd/PcdDatabaseCommonDefinitions.sample b/Tools/Conf/Pcd/PcdDatabaseCommonDefinitions.sample
index 011d3df603..7df1a5a6f4 100644
--- a/Tools/Conf/Pcd/PcdDatabaseCommonDefinitions.sample
+++ b/Tools/Conf/Pcd/PcdDatabaseCommonDefinitions.sample
@@ -7,21 +7,36 @@
 //
 typedef UINT8 SKU_ID;
 
-#define PCD_TYPE_SHIFT        24
+#define PCD_TYPE_SHIFT        28
 
+#define PCD_TYPE_DATA         (0x0 << PCD_TYPE_SHIFT)
+#define PCD_TYPE_HII    	    (0x8 << PCD_TYPE_SHIFT)
+#define PCD_TYPE_VPD    	    (0x4 << PCD_TYPE_SHIFT)
+#define PCD_TYPE_SKU_ENABLED 	(0x2 << PCD_TYPE_SHIFT)
+#define PCD_TYPE_STRING       (0x1 << PCD_TYPE_SHIFT)
 
-#define PCD_TYPE_DATA         (0x00 << PCD_TYPE_SHIFT)
-#define PCD_TYPE_HII    	    (0x80 << PCD_TYPE_SHIFT)
-#define PCD_TYPE_VPD    	    (0x40 << PCD_TYPE_SHIFT)
-#define PCD_TYPE_SKU_ENABLED 	(0x20 << PCD_TYPE_SHIFT)
-#define PCD_TYPE_STRING       (0x10 << PCD_TYPE_SHIFT)
+#define PCD_TYPE_ALL_SET      (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING)
 
+#define PCD_DATUM_TYPE_SHIFT  24
 
-#define PCD_DATABASE_OFFSET_MASK (~(PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING))
+#define PCD_DATUM_TYPE_POINTER        (0x0 << PCD_DATUM_TYPE_SHIFT)
+#define PCD_DATUM_TYPE_UINT8          (0x1 << PCD_DATUM_TYPE_SHIFT)
+#define PCD_DATUM_TYPE_UINT16    	    (0x2 << PCD_DATUM_TYPE_SHIFT)
+#define PCD_DATUM_TYPE_UINT32    	    (0x4 << PCD_DATUM_TYPE_SHIFT)
+#define PCD_DATUM_TYPE_UINT64        	(0x8 << PCD_DATUM_TYPE_SHIFT)
+
+#define PCD_DATUM_TYPE_ALL_SET    (PCD_DATUM_TYPE_POINTER | \
+                                    PCD_DATUM_TYPE_UINT8  | \
+                                    PCD_DATUM_TYPE_UINT16 | \
+                                    PCD_DATUM_TYPE_UINT32 | \
+                                    PCD_DATUM_TYPE_UINT64)
+
+
+#define PCD_DATABASE_OFFSET_MASK (~(PCD_TYPE_ALL_SET | PCD_DATUM_TYPE_ALL_SET))
 
 typedef struct  {
   UINT32                ExTokenNumber;
-  UINT32                LocalTokenNumber;   // PCD Number of this particular platform build
+  UINT16                LocalTokenNumber;   // PCD Number of this particular platform build
   UINT16                ExGuidIndex;        // Index of GuidTable
 } DYNAMICEX_MAPPING;
 
@@ -33,9 +48,10 @@ typedef struct {
 
 
 typedef struct {
-  UINT16  GuidTableIndex;   // Offset in Guid Table in units of GUID.
-  UINT16  StringIndex;           // Offset in String Table in units of UINT16.
-  UINT16  Offset;           // Offset in Variable
+  UINT16  GuidTableIndex;     // Offset in Guid Table in units of GUID.
+  UINT16  StringIndex;        // Offset in String Table in units of UINT16.
+  UINT16  Offset;             // Offset in Variable
+  UINT16  DefaultValueOffset; // Offset of the Default Value
 } VARIABLE_HEAD  ;
 
 
@@ -43,11 +59,9 @@ typedef  struct {
   UINT32  Offset;
 } VPD_HEAD;
 
-typedef struct {
-  UINT32 LocalTokenNumber;
-  UINT16 TokenNumber;
-  UINT16 Size;
-} SIZEINFO;
+typedef UINT16 STRING_HEAD;
+
+typedef UINT16 SIZE_INFO;
 
 #define offsetof(s,m)                 (UINT32) (UINTN) &(((s *)0)->m)