From nobody Thu Mar 28 12:24:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101258+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1678942338038865.5677091610812; Wed, 15 Mar 2023 21:52:18 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ixKAYY1788612xdiCb74N4Oz; Wed, 15 Mar 2023 21:52:17 -0700 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.56]) by mx.groups.io with SMTP id smtpd.web11.6406.1678793960165645306 for ; Tue, 14 Mar 2023 04:39:20 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fnOdZvsDQN+74VVp7y0S9AASRPeAbd3jSDWpmcTY4ix3fBnm6aidSW4Xg4HrWZ1F58caqSdxIQnD6Kiav5vsH2EMU3v5qS9avTUMJ/wsVUc/iQtSmgWGsN6txpCiUQ/ynJB1b/i34QdEBeGJPmcGeBUpDEqt24Xup+lSWg7nvJVoTIaX8X4tr8Xc3t5+Fnk/sN3HpXBtYEekqoMGWyi69QjtDMCTMl1wchqp2CQ7/BjFdhtv3zoqfLO2uRvAKb6+b3BXxIAND5D1sk2vqqMccbbZcqNJ8ksvpNoVeYXSXBUoq+rJ6nnpd8SRSubgB8MIyE4i/Yj/4NSX9GksmxuIRA== 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=JUvQEQV2i7rLOnzxUtY3KrWckl6xpr/I8hbwJknGV0g=; b=dRRBYlHN0DpYn8sgKknXtjrB2muSEalXxwxKZWyzIBat2Z/jrxjfmj223oDrsvWkecHDuXpHtsiP9G6Bfik551pqc8icitS6aaN7gn2cYq5bSVlMKBluP94+J2FwDCD3W4irM0LXdNHVWCo6zIrNecWpAZJLs2gzIkKS+OYvXWA7UyRquyfSKKqoDvvNpBUr0TgqhXU0vxq/UAl59fLZpd1wB+DQsf46miO1AQVwZnsew1KQ0Kk0yy7OOXOEswx/Cm2babTdRPoue5UQmlwF5MCksNtkfC54VLN+npP+7Tcn7cLra40Uv+WALD96//ddDRigZnuQiD3+WPkPIuIOcA== 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 X-Received: from DM6PR03CA0021.namprd03.prod.outlook.com (2603:10b6:5:40::34) by LV2PR12MB5919.namprd12.prod.outlook.com (2603:10b6:408:173::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.26; Tue, 14 Mar 2023 11:39:17 +0000 X-Received: from DM6NAM11FT060.eop-nam11.prod.protection.outlook.com (2603:10b6:5:40:cafe::db) by DM6PR03CA0021.outlook.office365.com (2603:10b6:5:40::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.26 via Frontend Transport; Tue, 14 Mar 2023 11:39:17 +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 (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+101258+1787277+3901457@groups.io; helo=mail02.groups.io; 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 X-Received: from mail.nvidia.com (216.228.118.233) by DM6NAM11FT060.mail.protection.outlook.com (10.13.173.63) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24 via Frontend Transport; Tue, 14 Mar 2023 11:39:17 +0000 X-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; Tue, 14 Mar 2023 04:39:14 -0700 X-Received: from drhqmail201.nvidia.com (10.126.190.180) 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; Tue, 14 Mar 2023 04:39:13 -0700 X-Received: from simowang-vm.nvidia.com (10.127.8.12) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.986.37 via Frontend Transport; Tue, 14 Mar 2023 04:39:13 -0700 From: "Simon Wang via groups.io" To: CC: Nickle Wang , Abner Chang , "Igor Kulchytskyy" , Nick Ramirez Subject: [edk2-devel] [edk2-staging][PATCH] edk2-staging/RedfishClientPkg: Reduce the header file dependency. Date: Tue, 14 Mar 2023 11:39:09 +0000 Message-ID: <9a7a3b838b17c07df4c0789e106da055623dfdba.1678791905.git.simowang@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT060:EE_|LV2PR12MB5919:EE_ X-MS-Office365-Filtering-Correlation-Id: 5bedec29-d9b1-4641-7806-08db2480be72 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: 31x3yq9LpmXVQW4xM+MLFelYuL7x7ltoN/7XkoTXBy9/d0rftRdeGcTdsNJ18rSPzXLuf6K8l4yA44rS9lEWO3/SImNKswS7gy/J49TyXoInhU/xZxPCZh8l3E1Hl9ZIRo4DJYL+LHoo+GBMbOIAtQhhOMliQlBMh9RyKtZ7JERIMGIMm9IcspyglZsersCSwzRyz+zsGjwUhdq/3+a2xV/6PXuY2VCSLWv92Qfz8dVPuW4ZXFApxuY/5/+krwbs/gmiM6VwcMgmGX5rQyEOgAJvwA1ttjLJW6c147vJXFWZQmaGq/G03qWxEIBwm9WPVgMCNdSSwZfr+nwnw65TMsLPP3jhn7RgnwT2Als4p0J3b/KMCvf9DCpN5RGzENajZqiR64obXp8QSmNC13PPtiK220d6eMJ7mX0GWRPw0h9dG6MF7xTSPxNztWk96iaDEB0aLAfQHUUF6bb4CsURI8x68OupkfUf3nk6sIn/bJzRHfevQzdORnKIrsJ10eRwSycKFT5M9rJC5RJSUFiTjiW5BRMS2PGh0C0T0Eg2Z7JRUfY8sQaXEj+ga3E0sOvMfFB9PUM+1TnShers5yRLi/y72OqC/TQFOd8MT1eMNuKwrvBT/JYIs/vnHwJVtO9rw9JSCUxyXTEVZqIK40x9pmNSTEXIPJylnJQy4ceqhMXfokRAaNlQ8OJBFqFA6sIx1ayEyN5kwFmAgcsA9Cix3RED3yrC7xw+KQimG2HOgsT7hRsHmRRD/nb+jdB8Uh/iFRXtKEz5+jvdS7HdSUaNH4UU178bdEwFb+8LqF0LV4A= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2023 11:39:17.1393 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5bedec29-d9b1-4641-7806-08db2480be72 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: DM6NAM11FT060.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5919 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,simowang@nvidia.com X-Gm-Message-State: Cd169lABf20pnsEJgAxfuqetx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1678942337; bh=bLIuv3RMr/hvb6SwwdVT7eMgwj+P7IRd4KBu3pqFFCY=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=JJ6USprxWHl9VJPQSr72BVMIbzgieeNRzb/VYD4n09wo1FBSsFMMzQWowVhH9ZXkYG4 P2O4WXN3AlZZfW4G1ZKUWMAY31ba/Jm+fGYvThgSI7hHe5SGrJnQ0RZf3sggOCuTGv4kk lMpXtbTKJRLP7dHm5kuL3YvT3swRFKNt9Fs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1678942340235100014 Content-Type: text/plain; charset="utf-8" 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 Cc: Nick Ramirez Reviewed-by: Abner Chang --- .../ConverterLib/include/RedfishDataTypeDef.h | 40 +++++++++---------- .../Library/RedfishFeatureUtilityLib.h | 17 +------- .../Protocol/EdkIIRedfishInterchangeData.h | 33 ++++++++++----- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/RedfishClientPkg/ConverterLib/include/RedfishDataTypeDef.h b/R= edfishClientPkg/ConverterLib/include/RedfishDataTypeDef.h index 23d13a854c..c759428ab6 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 @@ -8,29 +9,28 @@ Copyright 2019-2021 Distributed Management Task Force, Inc. All rights r= eserved. License: BSD 3-Clause License. For full text see link: https://github.co= m/DMTF/Redfish-JSON-C-Struct-Converter/blob/master/LICENSE.md **/ + #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; -typedef unsigned char RedfishCS_uint8; -typedef int RedfishCS_int16; -typedef int RedfishCS_int; -typedef unsigned int RedfishCS_uint16; -typedef long int RedfishCS_int32; -typedef unsigned long int RedfishCS_uint32; -typedef long long RedfishCS_int64; -typedef unsigned long long RedfishCS_uint64; -typedef void RedfishCS_void; - -#define RedfishCS_boolean_false 0 -#define RedfishCS_boolean_true 1 +typedef char RedfishCS_char; +typedef int RedfishCS_bool; +typedef signed char RedfishCS_int8; +typedef unsigned char RedfishCS_uint8; +typedef int RedfishCS_int16; +typedef int RedfishCS_int; +typedef unsigned int RedfishCS_uint16; +typedef long int RedfishCS_int32; +typedef unsigned long int RedfishCS_uint32; +typedef long long RedfishCS_int64; +typedef unsigned long long RedfishCS_uint64; +typedef void RedfishCS_void; + +#define RedfishCS_boolean_false 0 +#define RedfishCS_boolean_true 1 =20 typedef RedfishCS_int64 RedfishCS_status; -#define RedfishCS_status_success 0 +#define RedfishCS_status_success 0 #define RedfishCS_status_unsupported -1 #define RedfishCS_status_invalid_parameter -2 #define RedfishCS_status_insufficient_memory -3 @@ -39,8 +39,8 @@ typedef RedfishCS_int64 RedfishCS_status; =20 typedef struct _RedfishCS_Link RedfishCS_Link; struct _RedfishCS_Link { - RedfishCS_Link *BackLink; - RedfishCS_Link *ForwardLink; + RedfishCS_Link *BackLink; + RedfishCS_Link *ForwardLink; }; =20 #endif diff --git a/RedfishClientPkg/Include/Library/RedfishFeatureUtilityLib.h b/= RedfishClientPkg/Include/Library/RedfishFeatureUtilityLib.h index 1429643272..e2f728b26a 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 e8d0462fb7..89708eb8f1 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 @@ -27,15 +42,15 @@ typedef enum { } RESOURCE_INFORMATION_EXCHANGE_TYPE; =20 typedef struct { - RESOURCE_INFORMATION_EXCHANGE_TYPE Type; - EFI_STRING ParentUri; ///< The parent URI (in configure lan= guage) of the resource to process. - EFI_STRING PropertyName; ///< The property name of the resourc= e to process. - EFI_STRING FullUri; ///< The full URI (in configure langu= age) of the resource to process. + RESOURCE_INFORMATION_EXCHANGE_TYPE Type; + EFI_STRING ParentUri; ///< The parent URI = (in configure language) of the resource to process. + EFI_STRING PropertyName; ///< The property na= me of the resource to process. + EFI_STRING FullUri; ///< The full URI (i= n configure language) of the resource to process. } RESOURCE_INFORMATION_SEND; =20 typedef struct { - RESOURCE_INFORMATION_EXCHANGE_TYPE Type; - REDFISH_FEATURE_ARRAY_TYPE_CONFIG_LANG_LIST ConfigureLanguageList; + RESOURCE_INFORMATION_EXCHANGE_TYPE Type; + REDFISH_FEATURE_ARRAY_TYPE_CONFIG_LANG_LIST ConfigureLanguageList; } RESOURCE_INFORMATION_RETURNED; =20 typedef struct { @@ -44,9 +59,9 @@ typedef struct { } RESOURCE_INFORMATION_EXCHANGE; =20 struct _EDKII_REDFISH_FEATURE_INTERCHANGE_DATA_PROTOCOL { - RESOURCE_INFORMATION_EXCHANGE *ResourceInformationExchage; + RESOURCE_INFORMATION_EXCHANGE *ResourceInformationExchage; }; =20 -extern EFI_GUID gEdkIIRedfishFeatureInterchangeDataProtocolGuid; +extern EFI_GUID gEdkIIRedfishFeatureInterchangeDataProtocolGuid; =20 #endif --=20 2.39.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#101258): https://edk2.groups.io/g/devel/message/101258 Mute This Topic: https://groups.io/mt/97644705/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-