From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (NAM10-MW2-obe.outbound.protection.outlook.com [40.107.94.60]) by mx.groups.io with SMTP id smtpd.web10.16127.1683863258575557129 for ; Thu, 11 May 2023 20:47:38 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@nvidia.com header.s=selector2 header.b=hLd0sj9e; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: nvidia.com, ip: 40.107.94.60, mailfrom: nicklew@nvidia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bMXBv3jEaKSKxlxm2GUFR6LXW+Up67GK6Ik1hcfHoGFkRCqzJsz5sAKcM6JaHFPx397QMV6bnTzIFhDoWtVnS6TtH9ClfPz8BZaEvhweQej0dZPpcLIRjSh8G6RKZQBslq3Hz4R3QMcc/NN587eZvqVE+ho/04Dsbl53ncryRf36Cl/Z4pRi+jDrGkYCbN0ye2U22ZsMfYUywEpvFnGXLLHEDpaE1305q/70S7K2OyK6sLVImioTNdXeWVnjFp2j8+znA8Fh9rybpyU6BZ71rBYux/e0r8Y7jAcwQBAxBIXGzY8Py4Lnng3JnxSshM4/WVq01r2+cellWV7C/Rxdyw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sB6DXXRszK2PyZs30GUNhDhcCFe+E7mVcchxvf+Ki84=; b=CVChOXQ6ngvW8xM+V2hFzca+DnW00+k0DN+sWY2Fy6Fa23c6gkeUPkfLZpxEMmiEcrHxETBoIY8xn/lgDmF12aG6IUuTFcRZLd4YEyUGYv70JPgwjX61Km9oHc1dC5Vbay/JD1h3dH/R7f12tFFwF/wFVQAchBNgkzjXSftiarwfMSxlNM0hINQMi2OYlenCxLasJul8eDqWNevMtRSz9WLRQuDWoJX7ncbmyUeKxZvXOFxhplmre/Ax3aGX2ZxKfq9HOf//X80mVs2RtJrAvThddnoepyPMsmz+W2n58eBerSt6opDMQ9i3aiMaCF9sVyT07Kv2txe9XZhcCMcRMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sB6DXXRszK2PyZs30GUNhDhcCFe+E7mVcchxvf+Ki84=; b=hLd0sj9e7/ot48wBYUNs3all31vDbJSuhmGkJJ61AY4vEjRS3IKanQOs0okdX5xPX31w7P9GNW63y4+ahD/pMsruMNYVDYNbwjvxmodiKmDs5hpGdrTyMcFis3/pbtjQ1AjyLJzu8TXfDJGIWpIgx4IQBDh7ZFkJHZ9xwutpVJMlkST9eNb/lYe/q1Mh+2eql3pMBrF/EKzYyrggRsCHQ9ZIXrdYt2hlXB07j/0Vhhv7OcQINnCF6CFd4zE3eLbYIQwSJY6Y/PlbgA77ele+HkXloRYiGqkVA/M4INY7ZG8zzUL7/P6AC4n4QhP0/LJgOPhyHYHTcu+PKDhWCiJerQ== Received: from BN9P222CA0013.NAMP222.PROD.OUTLOOK.COM (2603:10b6:408:10c::18) by CH3PR12MB8330.namprd12.prod.outlook.com (2603:10b6:610:12c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.22; Fri, 12 May 2023 03:47:35 +0000 Received: from BN8NAM11FT083.eop-nam11.prod.protection.outlook.com (2603:10b6:408:10c:cafe::2e) by BN9P222CA0013.outlook.office365.com (2603:10b6:408:10c::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.24 via Frontend Transport; Fri, 12 May 2023 03:47:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by BN8NAM11FT083.mail.protection.outlook.com (10.13.177.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.21 via Frontend Transport; Fri, 12 May 2023 03:47:35 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Thu, 11 May 2023 20:47:26 -0700 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Thu, 11 May 2023 20:47:25 -0700 Received: from NV-CL38DL3.nvidia.com (10.127.8.13) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server id 15.2.986.37 via Frontend Transport; Thu, 11 May 2023 20:47:25 -0700 From: "Nickle Wang" To: CC: Abner Chang , Igor Kulchytskyy Subject: [edk2-redfish-client][PATCH 4/4] RedfishClientPkg: Reduce the header file dependency. Date: Fri, 12 May 2023 11:47:24 +0800 Message-ID: <20230512034724.8714-1-nicklew@nvidia.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Return-Path: nicklew@nvidia.com X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT083:EE_|CH3PR12MB8330:EE_ X-MS-Office365-Filtering-Correlation-Id: 6998c3bb-b852-40e7-926b-08db529b9f90 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bfZovg4lZ6fOJLuhldO6cbrHl6WiXFMgurTWo4vQ9xYblc4+REubSsi5L2zZf31YaWG7zC1GqvrVJgUQAVnPxBQE0h8JhChXZjDX4DU3ddxIuo4UmwNuvQSZo7RBCqUsehDM5eW8TiRvon7X5F9XRiwv3O5ihzU3VV7HQSvs+obZTcEA4dKe0Rqum7XxlppEzviIVsYMMjWiCRiR7FEofKAtX++WIdDAMlMwtEaoi10RSevaG8HeeO0QJUhJLC0jBQp6qCIWe6BM3KKBXAujk1TqxM01vhcxdkvHr6nbo2EjvGNW/Enk8ICbiLKFnOe7OvQ16tjk/Kb8hiwC/1xCQZoqkQYSVtyUByImFreeR8EBw/mLH3xNqvXfRhtVXFp+G4j+choVJxOgftSng8i1TVw8eE/mOLocVAW9SxEF2GXldGV4qyQYB0ybYx5Ptr0Y5ZTKRRF20YYLsk3NZYp6nNXRR+ubIkyCTu+T2fBJLZ6mWIi70oNzEaV1maYEmAQkXM+s0NPFPo+aPFaDYmlZJKB4Mw8WpIcrdDN9MF7NSwAfGqY75YrwBSasV40Vcit7abboHcmHfrteNmiWOSd01i93wrBXKNU4w/1r382K9+OYKwye3+PyJFz4iHCCNyIcX01jcogQUSs7E+x7iuW7D0ejiRCoTCwCOBBTqzvVwJq4iYy9U9QYPt4bwhM4mqZPmyobBvrwnoxcwawad0wgcblp9g/KRMI/rWhU52eRP9E= X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230028)(4636009)(136003)(376002)(396003)(39860400002)(346002)(451199021)(46966006)(40470700004)(36840700001)(54906003)(41300700001)(478600001)(26005)(1076003)(316002)(40480700001)(4326008)(6916009)(70206006)(70586007)(7696005)(8676002)(5660300002)(36756003)(40460700003)(86362001)(8936002)(36860700001)(336012)(2906002)(186003)(2616005)(47076005)(82310400005)(83380400001)(426003)(82740400003)(7636003)(356005);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2023 03:47:35.1486 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6998c3bb-b852-40e7-926b-08db529b9f90 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT083.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8330 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain Move REDFISH_FEATURE_ARRAY_TYPE_CONFIG_LANG and REDFISH_FEATURE_ARRAY_TYPE_CONFIG_LANG_LIST from RedfishFeatureUtilityLib.h to EdkIIRedfishInterchangeData.h. Also, remove unnecessary jansson.h in RedfishDataTypeDef.h. Signed-off-by: Simon Wang Cc: Nickle Wang Cc: Abner Chang Cc: Igor Kulchytskyy --- .../ConverterLib/include/RedfishDataTypeDef.h | 3 +-- .../Include/Library/RedfishFeatureUtilityLib.h | 17 +---------------- .../Protocol/EdkIIRedfishInterchangeData.h | 17 ++++++++++++++++- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/RedfishClientPkg/ConverterLib/include/RedfishDataTypeDef.h b/R= edfishClientPkg/ConverterLib/include/RedfishDataTypeDef.h index 96eebc66..c759428a 100644 --- a/RedfishClientPkg/ConverterLib/include/RedfishDataTypeDef.h +++ b/RedfishClientPkg/ConverterLib/include/RedfishDataTypeDef.h @@ -1,6 +1,7 @@ /** @file =20 (C) Copyright 2018-2021 Hewlett Packard Enterprise Development LP
+ Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved= . =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -12,8 +13,6 @@ #ifndef REDFISH_CS_DATA_TYPE_H_ #define REDFISH_CS_DATA_TYPE_H_ =20 -#include - typedef char RedfishCS_char; typedef int RedfishCS_bool; typedef signed char RedfishCS_int8; diff --git a/RedfishClientPkg/Include/Library/RedfishFeatureUtilityLib.h b/= RedfishClientPkg/Include/Library/RedfishFeatureUtilityLib.h index 14296432..e2f728b2 100644 --- a/RedfishClientPkg/Include/Library/RedfishFeatureUtilityLib.h +++ b/RedfishClientPkg/Include/Library/RedfishFeatureUtilityLib.h @@ -13,26 +13,11 @@ =20 #include #include +#include #include =20 #define REDFISH_ENABLE_SYSTEM_REBOOT() PcdSetBoolS(PcdRedfishSystemReboot= Required, TRUE) =20 -// -// Definition of REDFISH_FEATURE_ARRAY_TYPE_CONFIG_LANG -// -typedef struct { - UINTN Index; - EFI_STRING ConfigureLang; -} REDFISH_FEATURE_ARRAY_TYPE_CONFIG_LANG; - -// -// Definition of REDFISH_FEATURE_ARRAY_TYPE_CONFIG_LANG_LIST -// -typedef struct { - UINTN Count; - REDFISH_FEATURE_ARRAY_TYPE_CONFIG_LANG *List; -} REDFISH_FEATURE_ARRAY_TYPE_CONFIG_LANG_LIST; - /** =20 Read redfish resource by given resource URI. diff --git a/RedfishClientPkg/Include/Protocol/EdkIIRedfishInterchangeData.= h b/RedfishClientPkg/Include/Protocol/EdkIIRedfishInterchangeData.h index b2841b66..89708eb8 100644 --- a/RedfishClientPkg/Include/Protocol/EdkIIRedfishInterchangeData.h +++ b/RedfishClientPkg/Include/Protocol/EdkIIRedfishInterchangeData.h @@ -2,6 +2,7 @@ This file defines the EDKII_REDFISH_FEATURE_INTERCHANGE_DATA_PROTOCOL in= terface. =20 (C) Copyright 2022 Hewlett Packard Enterprise Development LP
+ Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved= . =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -10,7 +11,21 @@ #ifndef EDKII_REDFISH_FEATURE_INTERCHANGE_DATA_H_ #define EDKII_REDFISH_FEATURE_INTERCHANGE_DATA_H_ =20 -#include +// +// Definition of REDFISH_FEATURE_ARRAY_TYPE_CONFIG_LANG +// +typedef struct { + UINTN Index; + EFI_STRING ConfigureLang; +} REDFISH_FEATURE_ARRAY_TYPE_CONFIG_LANG; + +// +// Definition of REDFISH_FEATURE_ARRAY_TYPE_CONFIG_LANG_LIST +// +typedef struct { + UINTN Count; + REDFISH_FEATURE_ARRAY_TYPE_CONFIG_LANG *List; +} REDFISH_FEATURE_ARRAY_TYPE_CONFIG_LANG_LIST; =20 typedef struct _EDKII_REDFISH_FEATURE_INTERCHANGE_DATA_PROTOCOL EDKII_REDF= ISH_FEATURE_INTERCHANGE_DATA_PROTOCOL; =20 --=20 2.17.1