Use single one PcdFrameworkCompatibilitySupport PCD to support framework HII and...

Remove patchable type Flash related PCD.
Simplify single one PcdPeiFullPcdDatabaseEnable to produce full or minimal Pei PCD services.

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

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index 7cb2b8d264ad5eb57cd5d18a32f54e79e17ce4b4..cf1f8d55f2ebb9ea5c5ed06c4e2468d26a33487b 100644 (file)
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -638,7 +638,7 @@ PeiFvFindNextVolume (
   //\r
   // Handle Framework FvHob and Install FvInfo Ppi for it.\r
   //\r
-  if (FeaturePcdGet (PcdFrameworkFvHobCompatibilitySupport)) {\r
+  if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {\r
     //\r
     // Loop to search the wanted FirmwareVolume which supports FFS\r
     //\r

diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index d9c5351bf7b679824099aed03bddf8b3a57ad710..0adb7783b7fa0ae39780ea4e097e12cc94e67aae 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -94,5 +94,5 @@
 \r
 [FeaturePcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst ## CONSUMES\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkFvHobCompatibilitySupport    ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport               ## CONSUMES\r
   
\ No newline at end of file

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 6ab79ae548c6716af5fe8f773818bcb8fbb8e1f1..ca3b5721f10c40e63684a0d85f191f56e750295a 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -220,28 +220,12 @@
 [PcdsFeatureFlag.common]\r
   ## Indicate whether platform can support update capsule across a system reset\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE|BOOLEAN|0x0001001d\r
-  \r
-  ## This feature flag can be used to enable or disable the Pcd PEIM database \r
-  #  traverse capability. Disable it can reduce the size of final image generated.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseTraverseEnabled|TRUE|BOOLEAN|0x00010020\r
-  \r
-  ## This feature flag can be used to enable or disable the Pcd DXE database \r
-  #  traverse capability. Disable it can reduce the size of final image generated.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled|TRUE|BOOLEAN|0x00010021\r
-  \r
-  ## This feature flag can be used to enable or disable the SET capability of PCD service PEIM.\r
-  #  If a platform does not do PCD SET operation in PEI phase. This flag can be set to DISABLE to save size.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseSetEnabled|TRUE|BOOLEAN|0x00010030\r
-  \r
-  ## This feature flag can be used to enable or disable the GET size capability of PCD service PEIM.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseGetSizeEnabled|TRUE|BOOLEAN|0x00010031\r
-  \r
-  ## This feature flag can be used to enable or disable the Callback On SET capability of PCD service PEIM. \r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseCallbackOnSetEnabled|TRUE|BOOLEAN|0x00010032\r
-  \r
-  ## This feature flag can be used to enable or disable the PCD service PEIM to handle DynamicEX PCD. \r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseExEnabled|TRUE|BOOLEAN|0x00010033\r
  \r
+  ## This feature flag can be used to enable or disable all PCD PEIM services.\r
+  #  If TRUE, all PCD PEIM services will be provided.\r
+  ## If FALSE, the minimal PCD PEIM services (only GetService) will be provided.\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiFullPcdDatabaseEnable|TRUE|BOOLEAN|0x00010020\r
+\r
   ## If TRUE, then the Device Path To Text Protocol should be produced by the platform.\r
   #  It can be disabled to save size.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|TRUE|BOOLEAN|0x00010037\r
@@ -294,11 +278,9 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdDisableDefaultKeyboardLayoutInUsbKbDriver|FALSE|BOOLEAN|0x00010200\r
 \r
   ## If TRUE, Setup Browser supports GUID opcodes generated from Framework HII VFR file by VFR compiler. \r
-  #  This is used to provide backward compatibility support to Framework HII module built togehter EdkCompatbilityPkg.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkHiiCompatibilitySupport|TRUE|BOOLEAN|0x00012008\r
-  \r
-  ## If TRUE, the PeiCore will handle the framework FvHob and install FvInfo PPI for it.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkFvHobCompatibilitySupport|FALSE|BOOLEAN|0x00012009\r
+  #  If TRUE, the PeiCore will handle the framework FvHob and install FvInfo PPI for it.\r
+  ## This is used to provide backward compatibility support to Framework HII and Framework FvHob.\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport|FALSE|BOOLEAN|0x00012009\r
   \r
   ##\r
   #  If TRUE, HelloWorld Application will print the verbose information.\r
@@ -413,22 +395,13 @@
 [PcdsDynamic.common]\r
   ## Base address of the NV variable range in flash device \r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0x0|UINT32|0x30000001\r
-  \r
-  ## Size of the NV variable range.  \r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x0|UINT32|0x30000002\r
 \r
   ## Base address of the FTW spare block range in flash device.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x0|UINT32|0x30000013\r
 \r
-  ## Size of the FTW spare block range.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x0|UINT32|0x30000014\r
-\r
   ## Base address of the FTW working block range in flash device.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0x0|UINT32|0x30000010\r
 \r
-  ## Size of the FTW working block range.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x0|UINT32|0x30000011\r
-\r
   ## Default timeout value for displaying progressing bar in before boot OS.\r
   #  This value can be changed in BDS.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformBootTimeOutDefault|0xffff|UINT16|0x40000001\r
@@ -462,24 +435,6 @@
   ## Maximun number of performance log entries during PEI phase.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries|40|UINT8|0x0001002f\r
 \r
-  ## Base address of the NV variable range in flash device \r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0x0|UINT32|0x30000001\r
-  \r
-  ## Size of the NV variable range.  \r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x0|UINT32|0x30000002\r
-\r
-  ## Base address of the FTW spare block range in flash device.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x0|UINT32|0x30000013\r
-\r
-  ## Size of the FTW spare block range.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x0|UINT32|0x30000014\r
-\r
-  ## Base address of the FTW working block range in flash device.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0x0|UINT32|0x30000010\r
-\r
-  ## Size of the FTW working block range.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x0|UINT32|0x30000011\r
-\r
   ## Default timeout value for displaying progressing bar in before boot OS.\r
   #  This value can be changed in BDS.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformBootTimeOutDefault|0xffff|UINT16|0x40000001\r

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 3a20e034a08fc23d2d67f628598262a71f48965d..1a7acdf2f26f3ba009c44d47563b936cfbb1a581 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -151,12 +151,6 @@
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE\r
   gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE\r
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|TRUE\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled|TRUE\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseTraverseEnabled|TRUE\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseSetEnabled|TRUE\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseGetSizeEnabled|TRUE\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseCallbackOnSetEnabled|TRUE\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseExEnabled|TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable|FALSE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|FALSE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|FALSE\r

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
index 0c44a64077cf0882c5619929b683bef2b6c3259c..db9594abf82dbf67885e809321491c3465ad85f7 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -948,10 +948,6 @@ DxePcdGetNextToken (
   BOOLEAN             PeiExMapTableEmpty;\r
   BOOLEAN             DxeExMapTableEmpty;\r
 \r
-  if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) {\r
-    return EFI_UNSUPPORTED;\r
-  }\r
-\r
   Status = EFI_NOT_FOUND;\r
   PeiExMapTableEmpty = PEI_EXMAP_TABLE_EMPTY;\r
   DxeExMapTableEmpty = DXE_EXMAP_TABLE_EMPTY;\r
@@ -1065,14 +1061,11 @@ GetDistinctTokenSpace (
 /**\r
   Get next token space in PCD database according to given token space guid.\r
   \r
-  This routine is enable only when feature flag PCD PcdDxePcdDatabaseTraverseEnabled \r
-  is TRUE.\r
-  \r
   @param Guid            Given token space guid. If NULL, then Guid will be set to \r
                          the first PCD token space in PCD database, If not NULL, then\r
                          Guid will be set to next PCD token space.\r
 \r
-  @retval EFI_UNSUPPORTED If feature flag PCD PcdDxePcdDatabaseTraverseEnabled is FALSE.\r
+  @retval EFI_UNSUPPORTED \r
   @retval EFI_NOT_FOUND   If PCD database has no token space table or can not find given\r
                           token space in PCD database.\r
   @retval EFI_SUCCESS     Success to get next token space guid.\r
@@ -1094,10 +1087,6 @@ DxePcdGetNextTokenSpace (
   BOOLEAN             PeiExMapTableEmpty;\r
   BOOLEAN             DxeExMapTableEmpty;\r
 \r
-  if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) {\r
-    return EFI_UNSUPPORTED;\r
-  }\r
-\r
   ASSERT (Guid != NULL);\r
   \r
   PeiExMapTableEmpty = PEI_EXMAP_TABLE_EMPTY;\r

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
index 345e9f6fe49a388a15789ea7a8a5fce06f9025dc..93758ff3320ff845b444ff8416ae3478e80a1e0b 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@@ -57,9 +57,6 @@
 [Protocols]\r
   gPcdProtocolGuid                              ## PRODUCES\r
 \r
-[FeaturePcd.common]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled\r
-\r
 [FixedPcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress\r
 \r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
index 41b34269a09d346efae447175535d59cc13aa282..ecbdc946622eb92063117ddd2b00b9aec423d9d0 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
@@ -260,15 +260,6 @@ PeiPcdGetSize (
   UINTN               Size;\r
   UINTN               MaxSize;\r
 \r
-  //\r
-  // If DebugAssertEnabled is TRUE, we still need to provide the GET size\r
-  // function as GetWorker and SetWoker need this function to do ASSERT.\r
-  //\r
-  if ((!FeaturePcdGet(PcdPeiPcdDatabaseGetSizeEnabled)) &&\r
-      (!DebugAssertEnabled ())) {\r
-    return 0;\r
-  }\r
-\r
   PeiPcdDb = GetPcdDatabase ();\r
   //\r
   // TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.\r
@@ -458,10 +449,6 @@ PeiPcdGetSizeEx (
   IN UINTN                        ExTokenNumber\r
   )\r
 {\r
-  if ((!FeaturePcdGet (PcdPeiPcdDatabaseGetSizeEnabled)) ||  !FeaturePcdGet (PcdPeiPcdDatabaseExEnabled)) {\r
-    return 0;\r
-  }\r
-\r
   return PeiPcdGetSize (GetExPcdTokenNumber (Guid, ExTokenNumber));\r
 }\r
 \r
@@ -831,7 +818,7 @@ PeiRegisterCallBackOnSet (
   IN  PCD_PPI_CALLBACK            CallBackFunction\r
   )\r
 {\r
-  if (!FeaturePcdGet(PcdPeiPcdDatabaseCallbackOnSetEnabled)) {\r
+  if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -862,7 +849,7 @@ PcdUnRegisterCallBackOnSet (
   IN  PCD_PPI_CALLBACK            CallBackFunction\r
   )\r
 {\r
-  if (!FeaturePcdGet(PcdPeiPcdDatabaseCallbackOnSetEnabled)) {\r
+  if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -906,7 +893,7 @@ PeiPcdGetNextToken (
   BOOLEAN             Found;\r
   BOOLEAN             PeiExMapTableEmpty;\r
 \r
-  if (!FeaturePcdGet (PcdPeiPcdDatabaseTraverseEnabled)) {\r
+  if (!FeaturePcdGet (PcdPeiFullPcdDatabaseEnable)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -1023,7 +1010,7 @@ PeiPcdGetNextTokenSpace (
   BOOLEAN             Found;\r
   BOOLEAN             PeiExMapTableEmpty;\r
 \r
-  if (!FeaturePcdGet (PcdPeiPcdDatabaseTraverseEnabled)) {\r
+  if (!FeaturePcdGet (PcdPeiFullPcdDatabaseEnable)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index c00cbbeddff6f56b34ecb0d6d4eb535569d7cc1d..91c38127fd403b6af46c722087d3559b399610f1 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -55,15 +55,11 @@
   gPcdPpiGuid                                   ## PRODUCES\r
 \r
 [FeaturePcd.common]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseSetEnabled\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseExEnabled\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseCallbackOnSetEnabled\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseGetSizeEnabled\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseTraverseEnabled\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiFullPcdDatabaseEnable\r
 \r
 [FixedPcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry || PcdPeiPcdDatabaseCallbackOnSetEnabled\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry || PcdPeiFullPcdDatabaseEnable\r
 \r
 [Depex]\r
   TRUE\r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c
index 10cc2284335a20cb0b9e710eb1d955e442f3f50f..5bc1dc8205f9d7d75518504b4f13b8aed527894c 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Service.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.c
@@ -360,7 +360,7 @@ SetWorker (
   VOID                *InternalData;\r
   UINTN               MaxSize;\r
 \r
-  if (!FeaturePcdGet(PcdPeiPcdDatabaseSetEnabled)) {\r
+  if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   \r
@@ -514,7 +514,7 @@ ExSetWorker (
 {\r
   UINTN                     TokenNumber;\r
 \r
-  if (!FeaturePcdGet(PcdPeiPcdDatabaseSetEnabled)) {\r
+  if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -542,12 +542,7 @@ ExGetWorker (
   IN UINTN            ExTokenNumber,\r
   IN UINTN            GetSize\r
   )\r
-{\r
-  if (!FeaturePcdGet (PcdPeiPcdDatabaseExEnabled)) {\r
-    ASSERT (FALSE);\r
-    return 0;\r
-  }\r
-  \r
+{ \r
   return GetWorker (GetExPcdTokenNumber (Guid, ExTokenNumber), GetSize);\r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
index 094043f4eeca9e629a2194bc492fdbca1a1b14e6..90ab529ef34eaaeb478b41043d0ebb314c6cbca6 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
@@ -204,7 +204,7 @@ CreateQuestion (
   // Take a look at next OpCode to see whether it is a GUIDed opcode to support\r
   // Framework Compatibility\r
   //\r
-  if (FeaturePcdGet (PcdFrameworkHiiCompatibilitySupport)) {\r
+  if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {\r
     if ((*OpCodeData == EFI_IFR_NUMERIC_OP) && IsNextOpCodeGuidedVarEqName (OpCodeData)) {\r
       Status = UpdateCheckBoxStringToken (FormSet, Statement);\r
       if (EFI_ERROR (Status)) {\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
index 78a7a838a724eb9f88dd2acf1d873746e0a15f39..7b027a4d68abc9209682d93f56f183b6dd7bb67b 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -77,7 +77,7 @@
   gEfiConsoleControlProtocolGuid                ## CONSUMES\r
 \r
 [FeaturePcd.common]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkHiiCompatibilitySupport\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport\r
 \r
 [Depex]\r
   gEfiHiiDatabaseProtocolGuid AND gEfiHiiConfigRoutingProtocolGuid\r