From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.92.23.70]) by mx.groups.io with SMTP id smtpd.web10.4843.1586548977028536229 for ; Fri, 10 Apr 2020 13:02:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@outlook.com header.s=selector1 header.b=QBOzVvB9; spf=pass (domain: outlook.com, ip: 40.92.23.70, mailfrom: michael.kubacki@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PjwpvYbCFJXV9If0uAJiLm/rsj04JrXaPTOSkU14qOI/lqkjmowVyRsTwP3jMbEgBa8HdK76ojih2QgcGQFuyBTNZMsP16LrcFCsAmq0P39FuIx+fTZyecv5yMmx2TItZDs70jieW1/ORRLBnSs0XsqvfZTYsUHVSEgJi+lDyjxPm84pFBaT9ifjhcP0GIP8JJlroUC70x2I4pmOKpU0m3oANBkV65y/aZdxIT566i2ztYQjCjytqmOlSm+RBXaNQ2dDm2lR3wJ9oD2ebSbnhQiAPXxNcpfHG+Euc+JFMwc66JC9DGJCJ7iYdggA1oHmjUVexhN1esOh+xS7EVJ+WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vuI0mVaWf8fMLr3HbAK4nQ/e8SHIbRqLOfSSkSNglJ4=; b=EXXEKauCzj0yPlSjWs+vJQMwMBpkSRzyBMnOTpgKoE3qMW7scEF/AGD6r39VLp6dlnp/L7TbDi2/xVTVt5HtvpS/wyYYE30goK97lExjvIXRqCCrYXOfNb3iuKNisUj+5pBXPEWwepKTFF8hRJyl67h+FZFPDHPHCyHVh8CJUSpykYOoUWMkjy4KUyU+SnvhuzmZmgL4iRu+WyMJczN58f7lIsWX9bwCHdZiG0H1K1FaCH1n95ITw0VqY2hJWBY3dGoMrjdNIcWZq4pf+xx+wz/ggPni3DvjMF/MOGi1H0ITpTYwSB4v9pus+jh5YVY0oYO/VpNMODVIDMOyaL2qQg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=outlook.com; dmarc=pass action=none header.from=outlook.com; dkim=pass header.d=outlook.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vuI0mVaWf8fMLr3HbAK4nQ/e8SHIbRqLOfSSkSNglJ4=; b=QBOzVvB9jS+KAIRGVkSNsWnq0snCiNOTLk/yZRiGMqcrNU1cwGaxl708pQ+XL9wtqka5CWkmqNLA6Zi4qAb2LWM+AbuJxVikgequ3kwfi4YayGaaqml89D6OTqjiqiIFh7cGfDmtv42DOFBnC2P6Y9MsQqCZchGx75dmk+ZXYGe9Ao/gVJWwVo2Ecxp/pldJK0CBqwYrZIFqKRSeJ8AJ+f4szQSQYjZohLv+WUx9YVH9Tp6pmkeyA7kKVw7unmcu8C87INMSH0D5GsHmb8mdqk2sNEJDg5riSs1GTvJPg6ii302+sf6Zki5PodijbGzZJcI2flxzUNibpyjDBWux4w== Received: from MW2NAM12FT048.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc65::41) by MW2NAM12HT008.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc65::317) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.12; Fri, 10 Apr 2020 20:02:56 +0000 Received: from MWHPR07MB3440.namprd07.prod.outlook.com (2a01:111:e400:fc65::48) by MW2NAM12FT048.mail.protection.outlook.com (2a01:111:e400:fc65::215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.12 via Frontend Transport; Fri, 10 Apr 2020 20:02:56 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:672D5FD5FA6C100B09E0574BE8CFD7F922F403302A8AC2F2EB2DD58A74971831;UpperCasedChecksum:7F48D92B4F8A96CD92963B076B7ED4615CFA7C0427F6DFE0CFD26D2DC84D9B70;SizeAsReceived:7895;Count:49 Received: from MWHPR07MB3440.namprd07.prod.outlook.com ([fe80::bcc9:271b:20db:52e3]) by MWHPR07MB3440.namprd07.prod.outlook.com ([fe80::bcc9:271b:20db:52e3%6]) with mapi id 15.20.2900.015; Fri, 10 Apr 2020 20:02:56 +0000 From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Dandan Bi , Hao A Wu , Jian J Wang , Liming Gao , Ray Ni , Sean Brogan Subject: [PATCH v2 6/7] MdeModulePkg/RamDiskDxe: Use BaseLib linked list iteration macros Date: Fri, 10 Apr 2020 13:02:17 -0700 Message-ID: X-Mailer: git-send-email 2.16.3.windows.1 In-Reply-To: <20200410200218.24992-1-michael.kubacki@outlook.com> References: <20200410200218.24992-1-michael.kubacki@outlook.com> X-ClientProxiedBy: MWHPR01CA0033.prod.exchangelabs.com (2603:10b6:300:101::19) To MWHPR07MB3440.namprd07.prod.outlook.com (2603:10b6:301:69::28) Return-Path: michael.kubacki@outlook.com X-Microsoft-Original-Message-ID: <20200410200218.24992-7-michael.kubacki@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2001:4898:80e8:1:71cb:63a2:e2d4:2255) by MWHPR01CA0033.prod.exchangelabs.com (2603:10b6:300:101::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2900.15 via Frontend Transport; Fri, 10 Apr 2020 20:02:55 +0000 X-Mailer: git-send-email 2.16.3.windows.1 X-Microsoft-Original-Message-ID: <20200410200218.24992-7-michael.kubacki@outlook.com> X-TMN: [NBGLbeNi3gFH5hLrPiauXubt99SobkwrQhxyh2/o4u4+ORLVhmu5Y8BvAHwsH0Ym] X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 49 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: ffce29bb-e1c2-43d7-5638-08d7dd8a28e8 X-MS-TrafficTypeDiagnostic: MW2NAM12HT008: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6mjGbU69tvG9yz6ZeSNe46cMTGhNGKGo9C2JkA6qiFVsYcywt97qRuvO/+Pm5Zy6hmSs82KhYbnApaGcr8MD03dtmzdaM95kg5+S+KTwVWlZfR2GIg2EkaMfCthvGATrfrSwuvtkJ8jmIbrmDkA6UOTaY77aXehbasJVW3tWS8kqDE3/YsbQE9JM/8ys2qx7PE2CDnyePS8uPKqu8jrY1VScY0wR9n6YSeYM5bdiTMY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:0;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR07MB3440.namprd07.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:;DIR:OUT;SFP:1901; X-MS-Exchange-AntiSpam-MessageData: mjpKNyrmMujuEbSdq2QcHlCgar3MHgzjcGTxSDnAC+SMEfmZyFy0iUu/N9/m7ldA+kP9p02BCEO2Bolwbb7Wbv27v6GoOEajE+RNzQysxiO591dyv/hobY2CYRhvTYmzhiY8n648iJVxg4iUDW4vLT4as+7tqae0h698Dz5i34JKcC4ESxZ3VWI1iD6xYb8tbmoOncjJu+094Ubbl7I9gw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ffce29bb-e1c2-43d7-5638-08d7dd8a28e8 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2020 20:02:55.9613 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2NAM12HT008 Content-Type: text/plain From: Michael Kubacki 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 Cc: Hao A Wu Cc: Jian J Wang Cc: Liming Gao Cc: Ray Ni Cc: Sean Brogan Signed-off-by: Michael Kubacki Reviewed-by: Hao A Wu --- MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c | 3 ++- MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c | 9 +++++---- MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c | 5 +++-- MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.h | 15 +-------------- 4 files changed, 11 insertions(+), 21 deletions(-) diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c index a80ef271df9c..fcbf4f117dc6 100644 --- 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. Copyright (c) 2016, Intel Corporation. All rights reserved.
+ Copyright (c) Microsoft Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -92,7 +93,7 @@ RamDiskAcpiCheck ( return; } - EFI_LIST_FOR_EACH (Entry, &RegisteredRamDisks) { + BASE_LIST_FOR_EACH (Entry, &RegisteredRamDisks) { PrivateData = RAM_DISK_PRIVATE_FROM_THIS (Entry); RamDiskPublishNfit (PrivateData); } diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c index 96ea74a9a536..e35b8fa2296c 100644 --- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c +++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c @@ -3,6 +3,7 @@ Copyright (c) 2016, Intel Corporation. All rights reserved.
(C) Copyright 2016-2018 Hewlett Packard Enterprise Development LP
+ Copyright (c) Microsoft Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -165,7 +166,7 @@ UnregisterAllRamDisks ( RAM_DISK_PRIVATE_DATA *PrivateData; if (!IsListEmpty(&RegisteredRamDisks)) { - EFI_LIST_FOR_EACH_SAFE (Entry, NextEntry, &RegisteredRamDisks) { + BASE_LIST_FOR_EACH_SAFE (Entry, NextEntry, &RegisteredRamDisks) { PrivateData = RAM_DISK_PRIVATE_FROM_THIS (Entry); gBS->UninstallMultipleProtocolInterfaces ( @@ -507,7 +508,7 @@ UpdateMainForm ( EndLabel->Number = MAIN_LABEL_LIST_END; Index = 0; - EFI_LIST_FOR_EACH (Entry, &RegisteredRamDisks) { + BASE_LIST_FOR_EACH (Entry, &RegisteredRamDisks) { PrivateData = RAM_DISK_PRIVATE_FROM_THIS (Entry); PrivateData->CheckBoxId = (EFI_QUESTION_ID) (MAIN_CHECKBOX_QUESTION_ID_START + Index); @@ -689,7 +690,7 @@ RamDiskCallback ( // // Remove the selected RAM disks // - EFI_LIST_FOR_EACH_SAFE (Entry, NextEntry, &RegisteredRamDisks) { + BASE_LIST_FOR_EACH_SAFE (Entry, NextEntry, &RegisteredRamDisks) { PrivateData = RAM_DISK_PRIVATE_FROM_THIS (Entry); if (PrivateData->CheckBoxChecked) { RamDiskUnregister ( @@ -742,7 +743,7 @@ RamDiskCallback ( // if ((QuestionId >= MAIN_CHECKBOX_QUESTION_ID_START) && (QuestionId < CREATE_RAW_RAM_DISK_FORM_ID)) { - EFI_LIST_FOR_EACH (Entry, &RegisteredRamDisks) { + BASE_LIST_FOR_EACH (Entry, &RegisteredRamDisks) { PrivateData = RAM_DISK_PRIVATE_FROM_THIS (Entry); if (PrivateData->CheckBoxId == QuestionId) { PrivateData->CheckBoxChecked = (BOOLEAN) (Value->u8 != 0); diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c index 36d635e4bc31..4333e000539b 100644 --- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c +++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c @@ -3,6 +3,7 @@ Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.
(C) Copyright 2016 Hewlett Packard Enterprise Development LP
+ Copyright (c) Microsoft Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -662,7 +663,7 @@ RamDiskRegister ( if (!IsListEmpty(&RegisteredRamDisks)) { DevicePathSize = GetDevicePathSize (PrivateData->DevicePath); - EFI_LIST_FOR_EACH (Entry, &RegisteredRamDisks) { + BASE_LIST_FOR_EACH (Entry, &RegisteredRamDisks) { RegisteredPrivateData = RAM_DISK_PRIVATE_FROM_THIS (Entry); if (DevicePathSize == GetDevicePathSize (RegisteredPrivateData->DevicePath)) { // @@ -797,7 +798,7 @@ RamDiskUnregister ( EndingAddr = ReadUnaligned64 ((UINT64 *) &(RamDiskDevNode->EndingAddr[0])); if (!IsListEmpty(&RegisteredRamDisks)) { - EFI_LIST_FOR_EACH_SAFE (Entry, NextEntry, &RegisteredRamDisks) { + BASE_LIST_FOR_EACH_SAFE (Entry, NextEntry, &RegisteredRamDisks) { PrivateData = RAM_DISK_PRIVATE_FROM_THIS (Entry); // diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.h b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.h index 25fec15c1882..ed80b47ccc33 100644 --- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.h +++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.h @@ -2,6 +2,7 @@ The header file of RamDiskDxe driver. Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.
+ Copyright (c) Microsoft Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -47,20 +48,6 @@ // #define RAM_DISK_DEFAULT_BLOCK_SIZE 512 -// -// Iterate through the double linked list. NOT delete safe -// -#define EFI_LIST_FOR_EACH(Entry, ListHead) \ - for(Entry = (ListHead)->ForwardLink; Entry != (ListHead); Entry = Entry->ForwardLink) - -// -// Iterate through the double linked list. This is delete-safe. -// Do not touch NextEntry -// -#define EFI_LIST_FOR_EACH_SAFE(Entry, NextEntry, ListHead) \ - for(Entry = (ListHead)->ForwardLink, NextEntry = Entry->ForwardLink;\ - Entry != (ListHead); Entry = NextEntry, NextEntry = Entry->ForwardLink) - // // RamDiskDxe driver maintains a list of registered RAM disks. // -- 2.16.3.windows.1