MdeModulePkg/RamDiskDxe: Use BaseLib linked list iteration macros

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1959

Replaces usage of the linked list iteration macros defined in RamDiskImpl.h
with the common definition in BaseLib.h.

Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Bret Barkelew <bret.barkelew@microsoft.com>

diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c
index a80ef271df9c21f7bf77e454f385234c230842d8..fcbf4f117dc633b41e25517baeed5ec52d52feef 100644 (file)
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c
+++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c
@@ -2,6 +2,7 @@
   The driver entry point for RamDiskDxe driver.\r
 \r
   Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) Microsoft Corporation.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -92,7 +93,7 @@ RamDiskAcpiCheck (
     return;\r
   }\r
 \r
-  EFI_LIST_FOR_EACH (Entry, &RegisteredRamDisks) {\r
+  BASE_LIST_FOR_EACH (Entry, &RegisteredRamDisks) {\r
     PrivateData = RAM_DISK_PRIVATE_FROM_THIS (Entry);\r
     RamDiskPublishNfit (PrivateData);\r
   }\r

diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c
index 96ea74a9a5365b8a1bd84f849a726b6824ab71f2..e35b8fa2296c4a9c1fa3d31c31e2d16556ff3874 100644 (file)
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c
+++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c
@@ -3,6 +3,7 @@
 \r
   Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
   (C) Copyright 2016-2018 Hewlett Packard Enterprise Development LP<BR>\r
+  Copyright (c) Microsoft Corporation.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -165,7 +166,7 @@ UnregisterAllRamDisks (
   RAM_DISK_PRIVATE_DATA           *PrivateData;\r
 \r
   if (!IsListEmpty(&RegisteredRamDisks)) {\r
-    EFI_LIST_FOR_EACH_SAFE (Entry, NextEntry, &RegisteredRamDisks) {\r
+    BASE_LIST_FOR_EACH_SAFE (Entry, NextEntry, &RegisteredRamDisks) {\r
       PrivateData = RAM_DISK_PRIVATE_FROM_THIS (Entry);\r
 \r
       gBS->UninstallMultipleProtocolInterfaces (\r
@@ -507,7 +508,7 @@ UpdateMainForm (
   EndLabel->Number       = MAIN_LABEL_LIST_END;\r
 \r
   Index = 0;\r
-  EFI_LIST_FOR_EACH (Entry, &RegisteredRamDisks) {\r
+  BASE_LIST_FOR_EACH (Entry, &RegisteredRamDisks) {\r
     PrivateData                  = RAM_DISK_PRIVATE_FROM_THIS (Entry);\r
     PrivateData->CheckBoxId      = (EFI_QUESTION_ID)\r
                                    (MAIN_CHECKBOX_QUESTION_ID_START + Index);\r
@@ -689,7 +690,7 @@ RamDiskCallback (
       //\r
       // Remove the selected RAM disks\r
       //\r
-      EFI_LIST_FOR_EACH_SAFE (Entry, NextEntry, &RegisteredRamDisks) {\r
+      BASE_LIST_FOR_EACH_SAFE (Entry, NextEntry, &RegisteredRamDisks) {\r
         PrivateData = RAM_DISK_PRIVATE_FROM_THIS (Entry);\r
         if (PrivateData->CheckBoxChecked) {\r
           RamDiskUnregister (\r
@@ -742,7 +743,7 @@ RamDiskCallback (
       //\r
       if ((QuestionId >= MAIN_CHECKBOX_QUESTION_ID_START) &&\r
           (QuestionId < CREATE_RAW_RAM_DISK_FORM_ID)) {\r
-        EFI_LIST_FOR_EACH (Entry, &RegisteredRamDisks) {\r
+        BASE_LIST_FOR_EACH (Entry, &RegisteredRamDisks) {\r
           PrivateData = RAM_DISK_PRIVATE_FROM_THIS (Entry);\r
           if (PrivateData->CheckBoxId == QuestionId) {\r
             PrivateData->CheckBoxChecked = (BOOLEAN) (Value->u8 != 0);\r

diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.h b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.h
index 25fec15c188214dfccd713333570a712cd76bce2..ed80b47ccc33029d0a8cc2642cbd76ad685692f7 100644 (file)
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.h
+++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.h
@@ -2,6 +2,7 @@
   The header file of RamDiskDxe driver.\r
 \r
   Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) Microsoft Corporation.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -47,20 +48,6 @@
 //\r
 #define RAM_DISK_DEFAULT_BLOCK_SIZE 512\r
 \r
-//\r
-// Iterate through the double linked list. NOT delete safe\r
-//\r
-#define EFI_LIST_FOR_EACH(Entry, ListHead)    \\r
-  for(Entry = (ListHead)->ForwardLink; Entry != (ListHead); Entry = Entry->ForwardLink)\r
-\r
-//\r
-// Iterate through the double linked list. This is delete-safe.\r
-// Do not touch NextEntry\r
-//\r
-#define EFI_LIST_FOR_EACH_SAFE(Entry, NextEntry, ListHead)            \\r
-  for(Entry = (ListHead)->ForwardLink, NextEntry = Entry->ForwardLink;\\r
-      Entry != (ListHead); Entry = NextEntry, NextEntry = Entry->ForwardLink)\r
-\r
 //\r
 // RamDiskDxe driver maintains a list of registered RAM disks.\r
 //\r

diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c
index 36d635e4bc31fc5a70a70da86c337423e8f4d830..4333e000539b8b3fd5230c500676e1fe02dd08fd 100644 (file)
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c
+++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c
@@ -3,6 +3,7 @@
 \r
   Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>\r
   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
+  Copyright (c) Microsoft Corporation.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -662,7 +663,7 @@ RamDiskRegister (
   if (!IsListEmpty(&RegisteredRamDisks)) {\r
     DevicePathSize = GetDevicePathSize (PrivateData->DevicePath);\r
 \r
-    EFI_LIST_FOR_EACH (Entry, &RegisteredRamDisks) {\r
+    BASE_LIST_FOR_EACH (Entry, &RegisteredRamDisks) {\r
       RegisteredPrivateData = RAM_DISK_PRIVATE_FROM_THIS (Entry);\r
       if (DevicePathSize == GetDevicePathSize (RegisteredPrivateData->DevicePath)) {\r
         //\r
@@ -797,7 +798,7 @@ RamDiskUnregister (
   EndingAddr     = ReadUnaligned64 ((UINT64 *) &(RamDiskDevNode->EndingAddr[0]));\r
 \r
   if (!IsListEmpty(&RegisteredRamDisks)) {\r
-    EFI_LIST_FOR_EACH_SAFE (Entry, NextEntry, &RegisteredRamDisks) {\r
+    BASE_LIST_FOR_EACH_SAFE (Entry, NextEntry, &RegisteredRamDisks) {\r
       PrivateData = RAM_DISK_PRIVATE_FROM_THIS (Entry);\r
 \r
       //\r