From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.24; helo=mga09.intel.com; envelope-from=eric.dong@intel.com; receiver=edk2-devel@lists.01.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8CD71207E6353 for ; Mon, 14 May 2018 00:36:05 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 May 2018 00:36:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,399,1520924400"; d="scan'208";a="55660792" Received: from ydong10-win10.ccr.corp.intel.com ([10.239.158.44]) by orsmga001.jf.intel.com with ESMTP; 14 May 2018 00:36:04 -0700 From: Eric Dong To: edk2-devel@lists.01.org Cc: Hao Wu Date: Mon, 14 May 2018 15:36:00 +0800 Message-Id: <20180514073601.9700-2-eric.dong@intel.com> X-Mailer: git-send-email 2.15.0.windows.1 In-Reply-To: <20180514073601.9700-1-eric.dong@intel.com> References: <20180514073601.9700-1-eric.dong@intel.com> Subject: [Patch 1/2] SecurityPkg/TcgStorageOpalLib: Fix GCC build failure. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 May 2018 07:36:05 -0000 Function definition different with function implementation caused this build failure. Change code to make them consistent to pass the build. Done Unit Test: 1. Pass GCC build. Cc: Hao Wu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Eric Dong --- SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c | 4 ---- SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalLibInternal.h | 1 - 2 files changed, 5 deletions(-) diff --git a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c index d794a91aad..cf37cad004 100644 --- a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c +++ b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c @@ -334,7 +334,6 @@ OpalPsidRevert( **/ TCG_RESULT -EFIAPI OpalPyrite2PsidRevert( OPAL_SESSION *AdminSpSession, UINT32 EstimateTimeCost @@ -667,7 +666,6 @@ OpalGetMsid( **/ TCG_RESULT -EFIAPI OpalPyrite2GetActiveDataRemovalMechanism ( IN OPAL_SESSION *AdminSpSession, OUT UINT8 *ActiveDataRemovalMechanism @@ -845,7 +843,6 @@ OpalAdminRevert( **/ TCG_RESULT -EFIAPI OpalPyrite2AdminRevert( OPAL_SESSION *LockingSpSession, BOOLEAN KeepUserData, @@ -1866,7 +1863,6 @@ OpalGetLockingInfo( **/ TCG_RESULT -EFIAPI OpalGetFeatureDescriptor ( IN OPAL_SESSION *Session, IN UINT16 FeatureCode, diff --git a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalLibInternal.h b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalLibInternal.h index cd16c51c3b..9a2f60454f 100644 --- a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalLibInternal.h +++ b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalLibInternal.h @@ -27,7 +27,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ TCG_RESULT -EFIAPI OpalPyrite2GetActiveDataRemovalMechanism ( OPAL_SESSION *AdminSpSession, UINT8 *ActiveDataRemovalMechanism -- 2.15.0.windows.1