Change _CR() to BASE_CR() to follow naming convention

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

6 files changed, 9 insertions, 9 deletions

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
index a3dd1f178a..5bab0acdab 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
@@ -89,7 +89,7 @@ typedef enum {
   for(Entry = (ListHead)->ForwardLink, NextEntry = Entry->ForwardLink;\

       Entry != (ListHead); Entry = NextEntry, NextEntry = Entry->ForwardLink)

 

-#define EFI_LIST_CONTAINER(Entry, Type, Field) _CR(Entry, Type, Field)

+#define EFI_LIST_CONTAINER(Entry, Type, Field) BASE_CR(Entry, Type, Field)

 

 

 #define EHC_LOW_32BIT(Addr64)     ((UINT32)(((UINTN)(Addr64)) & 0XFFFFFFFF))

diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
index 9e26e4f020..5984b3f436 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
@@ -456,7 +456,7 @@ NotifyFwVolBlock (
       //

       // Update Fv to use a new Fvb

       //

-      FvDevice = _CR (Fv, FV_DEVICE, Fv);

+      FvDevice = BASE_CR (Fv, FV_DEVICE, Fv);

       if (FvDevice->Signature == FV2_DEVICE_SIGNATURE) {

         //

         // Only write into our device structure if it's our device structure

diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.c b/MdeModulePkg/Core/RuntimeDxe/Runtime.c
index 936565e600..98134c21b7 100644
--- a/MdeModulePkg/Core/RuntimeDxe/Runtime.c
+++ b/MdeModulePkg/Core/RuntimeDxe/Runtime.c
@@ -285,7 +285,7 @@ RuntimeDriverSetVirtualAddressMap (
   // All runtime events are stored in a list in Runtime AP.

   //

   for (Link = mRuntime.EventHead.ForwardLink; Link != &mRuntime.EventHead; Link = Link->ForwardLink) {

-    RuntimeEvent = _CR (Link, EFI_RUNTIME_EVENT_ENTRY, Link);

+    RuntimeEvent = BASE_CR (Link, EFI_RUNTIME_EVENT_ENTRY, Link);

     if ((RuntimeEvent->Type & EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE) == EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE) {

       RuntimeEvent->NotifyFunction (

                       RuntimeEvent->Event,

@@ -298,7 +298,7 @@ RuntimeDriverSetVirtualAddressMap (
   // Relocate runtime images. All runtime images are stored in a list in Runtime AP.

   //

   for (Link = mRuntime.ImageHead.ForwardLink; Link != &mRuntime.ImageHead; Link = Link->ForwardLink) {

-    RuntimeImage = _CR (Link, EFI_RUNTIME_IMAGE_ENTRY, Link);

+    RuntimeImage = BASE_CR (Link, EFI_RUNTIME_IMAGE_ENTRY, Link);

     //

     // We don't want to relocate our selves, as we only run in physical mode.

     //

diff --git a/MdeModulePkg/Include/Library/NetLib.h b/MdeModulePkg/Include/Library/NetLib.h
index 29dddc956a..aa0b74e21a 100644
--- a/MdeModulePkg/Include/Library/NetLib.h
+++ b/MdeModulePkg/Include/Library/NetLib.h
@@ -277,7 +277,7 @@ NetRandomInitSeed (
 

 

 #define NET_LIST_USER_STRUCT(Entry, Type, Field)        \

-          _CR(Entry, Type, Field)

+          BASE_CR(Entry, Type, Field)

 

 #define NET_LIST_USER_STRUCT_S(Entry, Type, Field, Sig)  \

           CR(Entry, Type, Field, Sig)

@@ -877,7 +877,7 @@ typedef struct {
 

 #define NET_GET_REF(PData)      ((PData)->RefCnt++)

 #define NET_PUT_REF(PData)      ((PData)->RefCnt--)

-#define NETBUF_FROM_PROTODATA(Info) _CR((Info), NET_BUF, ProtoData)

+#define NETBUF_FROM_PROTODATA(Info) BASE_CR((Info), NET_BUF, ProtoData)

 

 #define NET_BUF_SHARED(Buf) \

   (((Buf)->RefCnt > 1) || ((Buf)->Vector->RefCnt > 1))

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
index d4ca364555..26f03c9fc4 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
@@ -1637,11 +1637,11 @@ Dhcp4ParseCheckOption (
 

   if (Parse->Index <= Parse->OptionCount) {

     //

-    // Use _CR to get the memory position of EFI_DHCP4_PACKET_OPTION for

+    // Use BASE_CR to get the memory position of EFI_DHCP4_PACKET_OPTION for

     // the EFI_DHCP4_PACKET_OPTION->Data because DhcpIterateOptions only

     // pass in the point to option data.

     //

-    Parse->Option[Parse->Index - 1] = _CR (Data, EFI_DHCP4_PACKET_OPTION, Data);

+    Parse->Option[Parse->Index - 1] = BASE_CR (Data, EFI_DHCP4_PACKET_OPTION, Data);

   }

 

   return EFI_SUCCESS;

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/MdeModulePkg/Universal/PCD/Dxe/Service.h
index 7df533b8fc..7a9113b138 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.h
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.h
@@ -746,7 +746,7 @@ typedef struct {
   PCD_PROTOCOL_CALLBACK   CallbackFn;

 } CALLBACK_FN_ENTRY;

 

-#define CR_FNENTRY_FROM_LISTNODE(Record, Type, Field) _CR(Record, Type, Field)

+#define CR_FNENTRY_FROM_LISTNODE(Record, Type, Field) BASE_CR(Record, Type, Field)

 

 //

 // Internal Functions