From patchwork Thu Nov 15 02:33:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151138 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6453310ljp; Wed, 14 Nov 2018 18:34:07 -0800 (PST) X-Google-Smtp-Source: AJdET5f5LlysbJ8YhbuxiqNyYQ4ThStLz1OxCO1i/7zyTCyul+Is/LVXcHn9FJ6+2p1ryRvb7+13 X-Received: by 2002:a17:902:8648:: with SMTP id y8-v6mr4427201plt.159.1542249247052; Wed, 14 Nov 2018 18:34:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249247; cv=none; d=google.com; s=arc-20160816; b=K4/7LHOMFM/hzACNwvKZ0cZynnzSlMa1f+l+GbiXUbZKa2RaadDiisWV952rmYsULK fhNU3MusL2PB296EVS0EmAMgif/SffvrNSN34BFa3uAFv17s/tTbk4CyHte0HtE36qir R58O4Al/DfaYfqFtvF2N6USPsAO+3OJTL26Kf5O+4zDNLN2b2fK7df5ZzSyZ7R4+UPNM 4jr+JMHTXT7n5P6fiMx7ne5cCE8C2CvZCwJcWHC/X1Uo/H8oz4M+lUCgSlhe2Sh6mB4I 3K9lQo5NojdNRIqKBfMPTHH34DPoRn/0ICRntdwYPzVzOZKI5yVpVJ9R+DZugJxpvk1C q/jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=Ri12gT9FLir7vA6hnu/GbvHZFoHWJoYwBXyxW29HyyM=; b=XsLuTUk0woB4SvJo1vZpDMSD7EoEehw/2rf+CpYX5Mx4gCiRvqSPUTHonhW3SPPRvO cuRF9Tw7MHB7gVy4i8nzUgXuHNI3Nfa5LeED/gPJvXXe1YaQw7KYARRHYLr8xIgzIq3i T/tFc7kg8YU9kkEKCTm6KlMS7aY3f/yHsA7R7DzMc6+vs83RLjSkqzf8coZ0PigwKozp xyhoc95VhmPPRj0ENuXJNhLgB1QSFpyyWQaRX6Rusw6crkfgt+/KCda2w7xxbeGhkAzQ 8VCc8bIsDOJKVzdkfwu7qgrcVYlVyQxGhgYLSyrJMiXeUR761bYJbOqkYvJesCzLvmK9 NeOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=HnndQCeJ; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id r22-v6si34078736pfr.18.2018.11.14.18.34.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=HnndQCeJ; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 02F002119072E; Wed, 14 Nov 2018 18:34:05 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::444; helo=mail-pf1-x444.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8E7EE21A07A92 for ; Wed, 14 Nov 2018 18:34:03 -0800 (PST) Received: by mail-pf1-x444.google.com with SMTP id b81-v6so8399069pfe.11 for ; Wed, 14 Nov 2018 18:34:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=V/HFYwedJhL15kbdN/2Xas6CQ/6NHa+u1C1NobMXK0o=; b=HnndQCeJgX+16IpzmSlpNEP2vO3pmvkmx8cx+G9jXytSmzC70QE+8QRQOOKpps8WE4 68PGnm0KNEkUAaXoch+8GC8cIi1YJ99RoPiSDNuhBBLuxhn7dRI/kpX2fVQPpwNk/AnG f7ZBM9JVXosZhJ2fG5DGU25YSc/KAN/Og4/bo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=V/HFYwedJhL15kbdN/2Xas6CQ/6NHa+u1C1NobMXK0o=; b=R+FrF316pcH8R+mMJf2wxADef6KSC0r5IZTPN9GyAZqKP82K4c4B2eJKB04ZSJg1H4 aTx7EWWnM0AFfpsCQnaWTvygrA/yG5gC8rni6712Ii4fJXW6G2O7zWV+oZhN+XlLnvZZ NDYhJXy4iLGr6UddD8n8VSTk2aaCV/3SKvSt2vxz7QxlTikdK+Dmy1pXwyV81OnFqExv cEkZq8Eg64o8lMtRxkUB5WHNDdY1B+ielbkOeCAY/zPNFwEoAPt3oIOwqjSktiKt8u0C D48DrtcaXg+KUvFydS+YM4dwXmVdw9Ixl/X+QCQS0lT1HFAds1H4C+kcDx3sBlaLphjL uAFQ== X-Gm-Message-State: AGRZ1gJNY6P9l8tH7WPCYN2DGlNSKZlVnSqUX1j0l0742KecP7PBxxEy EG5H7sK4n5rNiQt2XOOCOsm+4JR5UASs8w== X-Received: by 2002:aa7:814f:: with SMTP id d15-v6mr4615846pfn.78.1542249242843; Wed, 14 Nov 2018 18:34:02 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:02 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:34 -0800 Message-Id: <20181115023353.20159-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 01/20] IntelUndiPkg/XGigUndiDxe: create GCC alternatives for MSFT build options X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Prefix the existing MSFT-only build option overrides with MSFT: and create the GCC: counterparts so we can build this code with GCC as well. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ryszard Knop diff --git a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf index 9e0e4aff0885..ab9c64dac7e8 100644 --- a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf +++ b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf @@ -44,19 +44,24 @@ UNLOAD_IMAGE = UnloadXGigUndiDriver [BuildOptions.common] -*_*_*_CC_FLAGS = /FAcs /D MDEPKG_NDEBUG /D UNDI_10G +MSFT:*_*_*_CC_FLAGS = /FAcs /D MDEPKG_NDEBUG /D UNDI_10G +GCC:*_*_*_CC_FLAGS = -DUNDI_10G +GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG [BuildOptions.X64] -*_*_*_CC_FLAGS = /D EFIX64 +MSFT:*_*_*_CC_FLAGS = /D EFIX64 +GCC:*_*_*_CC_FLAGS = -DEFIX64 [BuildOptions.IPF] -*_*_*_CC_FLAGS = /D EFI64 +MSFT:*_*_*_CC_FLAGS = /D EFI64 +GCC:*_*_*_CC_FLAGS = -DEFI64 [BuildOptions.IA32] -*_*_*_CC_FLAGS = /D EFI32 +MSFT:*_*_*_CC_FLAGS = /D EFI32 +GCC:*_*_*_CC_FLAGS = -DEFI32 [sources.common] InventoryStrings.uni From patchwork Thu Nov 15 02:33:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151139 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6453347ljp; Wed, 14 Nov 2018 18:34:10 -0800 (PST) X-Google-Smtp-Source: AJdET5dTYlsDjv67IBNaLgO2nZBEWvaVqNY55yfso31U9ukOGe/f2q6hfVt2QFNjVPIarQyUoZi/ X-Received: by 2002:a63:b94c:: with SMTP id v12mr4066799pgo.221.1542249250753; Wed, 14 Nov 2018 18:34:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249250; cv=none; d=google.com; s=arc-20160816; b=SQZCz8MM6x90eOckfUv8bmkS58fF6eEeM3vYZudCvq3KREyYJroN62n7jUvMciVxs9 ikdeBpBem0/pBJ/+pa0xLIZnkkQMKpQ+ZXIve3rrFYXdlV7UxKLP66cx4TYeiC0GtREq GfNtJb7HUJ8WREmafK3Sg/2KOtkEqY3tYogoyRn/n6UUWdT+ztWeroRjVmxf6SMvBcKt W32nkCsKpqsr0TxUMW/tzuFOqiJjnM5CraPRQo+eC/bTgQGlO3FcYKTNYRimp3yPWEMe rIx/sUXOc68ihb3yJlC8ryvZXqh4eV862FRtGUq1NqPYZKKgobNrqzopx9rF4tlrwcxp ymwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=Y5+inHnvP1/GXlOW2CCRyFouZeGF2CK3nbrMVv85QYc=; b=neCZYBIyVtWQd5NpuGBlUpGDY8+mWTZ7U1pKOinxBfI37SDC23JE2C/dwhXt4BvSc/ /INWw7s6mTAYX1KUMvRFspSgFBhlDoZaYXyoaX9MAyyOvjiurj7BM0F8AMmJg9BmyKAw JXLw+pvRUbW3oYb+YCIg+25hmMHulYIswQ9qRcCpwZhTXFg96MjQlGCryosVxUOfUJU3 NOPgamRQhTzic5SxaSoYXHVqJ5ehCyIoECWneoqOnAYe2ZB9X05+HZc5x44yseq6gEMr cjByxO0DnTeUvmevyoasxczYQDLV7L8+uuZqRoA88UZ/WyX4r7woq4kzFYGJHnE2IVHy bGog== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=jBUQ5AsD; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id bj11si5994571plb.21.2018.11.14.18.34.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=jBUQ5AsD; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3549921190731; Wed, 14 Nov 2018 18:34:06 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::642; helo=mail-pl1-x642.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A60DF2119072E for ; Wed, 14 Nov 2018 18:34:04 -0800 (PST) Received: by mail-pl1-x642.google.com with SMTP id x21-v6so5999019pln.9 for ; Wed, 14 Nov 2018 18:34:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=o/uUvk5YwqjuXUYCcdafYa4Qd+sp+YtBKsgBVSe1XkQ=; b=jBUQ5AsDxSAtMims9DE7QUXp+54JS1GJbuXef4ZgLxLNjyfdzvAkCF8zq8mSLxzDjq yYbbEddt/LUNJN0FAXftxb9yYxDPmNkSt3drGrnPpR8hqN8/M1HZwnQBOccxkPxSEdvO pPC7i++X6Yk0aa7xatSXOordOksNqa/e+qji0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=o/uUvk5YwqjuXUYCcdafYa4Qd+sp+YtBKsgBVSe1XkQ=; b=kpV/aUX2ealflhDjDUemVr9JDwEVCc3ieeYgracB8AttjqzQoqy3E+oE5V1dEAiQLj bmJB9MBo7LRmsJiDq0wbQZGCeUbyytxSBsK8sjWzkjsrHr2n2aJ/CiiqaS3pvKgbpx9D 8zEB5VtZdMEB1iyn7K1F+7hUCfw7WKscnoSDjzdNA5IEJHSXu5tVO1AmGHsmwhsOAUs+ iqL/8t1D/KhgUIGlrlx6pyNu4K7X2c0UdOTHdPTNH/TyJRpILmMAzbxm4xjprWjzNbc5 jartGBbGHXoo+27ZoJMZGQkRHxHtRnTQpP834bsoATXEOt04iHwqNE/OWyadSNe27Fq9 w0Yw== X-Gm-Message-State: AGRZ1gIGlcLtygj2DbRQ2W20h/IV2iZs8T3GQ82xG3PwmaRtWqqjbo5c i5A1rdpvAkcnedQ0eTyfNQzYwCi9qZuwgg== X-Received: by 2002:a17:902:9897:: with SMTP id s23-v6mr4504944plp.229.1542249244091; Wed, 14 Nov 2018 18:34:04 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:03 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:35 -0800 Message-Id: <20181115023353.20159-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 02/20] IntelUndiPkg/XGigUndiDxe: move MSFT warning overrides to INF file X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" GCC chokes on the unknown MSVC specific #pragmas used for suppressing warnings, so remove them and use the INF BuildOptions section instead. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf | 4 ++-- IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ryszard Knop diff --git a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf index ab9c64dac7e8..7ccc52bc9869 100644 --- a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf +++ b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf @@ -44,7 +44,7 @@ UNLOAD_IMAGE = UnloadXGigUndiDriver [BuildOptions.common] -MSFT:*_*_*_CC_FLAGS = /FAcs /D MDEPKG_NDEBUG /D UNDI_10G +MSFT:*_*_*_CC_FLAGS = /FAcs /D MDEPKG_NDEBUG /D UNDI_10G /wd4244 /wd4206 /wd4189 GCC:*_*_*_CC_FLAGS = -DUNDI_10G GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG @@ -60,7 +60,7 @@ GCC:*_*_*_CC_FLAGS = -DEFI64 [BuildOptions.IA32] -MSFT:*_*_*_CC_FLAGS = /D EFI32 +MSFT:*_*_*_CC_FLAGS = /D EFI32 /wd4305 GCC:*_*_*_CC_FLAGS = -DEFI32 [sources.common] diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h b/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h index 6fa0d1605c7c..368f40811904 100644 --- a/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h +++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h @@ -29,16 +29,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef IXGBE_OSDEP_H_ #define IXGBE_OSDEP_H_ -#pragma warning(disable : 4244) -#pragma warning(disable : 4206) -#pragma warning(disable : 4189) - -#ifdef EFI32 - -// Remove truncation warning in type cast when some 64 bit variables are converted to 32-bit pointers -#pragma warning(disable : 4305) -#endif /* EFI32 */ - #ifndef EFI_SPECIFICATION_VERSION #define EFI_SPECIFICATION_VERSION 0x00020000 #endif /* EFI_SPECIFICATION_VERSION */ From patchwork Thu Nov 15 02:33:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151140 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6453390ljp; Wed, 14 Nov 2018 18:34:14 -0800 (PST) X-Google-Smtp-Source: AFSGD/Udjxk1PRMQTVKt8rqJOguGohwfAcjXePbQRDRakuH2n/TLzY8AuLMNeO7cAJZ6SkI3Vu6S X-Received: by 2002:a05:660c:681:: with SMTP id n1mr4203573itk.37.1542249254387; Wed, 14 Nov 2018 18:34:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249254; cv=none; d=google.com; s=arc-20160816; b=pkr295HO2DaZh8DrD0tpAmAr2Qn07SBtICbn4xlmvNxvFmfb+R0sNc+N8g4I6k0u0x YViQXPqnSY2IMG9+Kh6GkivS5pCsZB91ZlgLDjSyX9dJv5FclI5+cOWmshFRMuAi9qFU BsgilrnIW4v7EHPPnGllUxLHWtPSl0nje/bGeQSzcYwAsu/eA8EEB5wPTEt2Z/QlJeRw IALsddG/xiBUdohFzFGGXqbqJsHTjwr+kSWrlHKRjJksbD0D+3je4m6DKMT40QAkssZx /9yeU/3/leFX2gYqnuCd/dgS1bTnpPeHmiHgXPlkiihphdyz1F5VXpjXPr08VPPPgdVI iJBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=hIWOnRXS5RUqtkbMIntjboZfsjDsXByRtvmbHeMvZ2Y=; b=bfSoojVX21RPVjjJV873ZIyBEqgNzQ0HJHsMLXTn+eSkVHS8Q+BZwNxYjEGHJwrRGI MBBXBVtsemXRw7WO5ihS4v03wGTfDdgpcSo4lwj1MynhzhW8OIUY5mV5/KaxWfCSw4WE TxCHOSkvQb9iWrNbKIhSslCiMk7XCAiM5/IcCbPHDehpkcSGxdLdgIgTrLmHMW7Qyt4F crI/zmrhStj65Dhtrq1ugRcgc/avMwFCYqJU4MLs+u3X8EynzCJCZAs5FMo+UmUh0Tkr dJIbD3dEIER1X6+tooFx+wrZcbFvFeFLPdRTMVrSebytz4yf8jU4BLKDniShAySE1cC1 krCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=j+9UBmBY; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id k2si5553601itd.70.2018.11.14.18.34.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=j+9UBmBY; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 60E4421190736; Wed, 14 Nov 2018 18:34:07 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::643; helo=mail-pl1-x643.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 08AC72194D3B3 for ; Wed, 14 Nov 2018 18:34:05 -0800 (PST) Received: by mail-pl1-x643.google.com with SMTP id b22-v6so3272421pls.7 for ; Wed, 14 Nov 2018 18:34:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=d7VemxK292p34mOt0iVCDps1jKeDKV9adpcPB2WYBrY=; b=j+9UBmBY0L5ECDWf32ufD9jbp+m+AceYKxvqxDmfaGj4QT86ZU+ByKkALCh0SbCSlV Nh37qMJ3eN11uPwio/VB4p4NJCVLqYC5BtwFeJ2B/KJ7vQ7mxgNtxwU77J6mhIuINQtu T+FeWyu9iPEKuXE6dgw3h0jg1KjclglNF9zQI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=d7VemxK292p34mOt0iVCDps1jKeDKV9adpcPB2WYBrY=; b=aToueRZLmHWPCpInQ2bWD7/TGWTCzsk7laWY+U4fUcSO9A7oPu2qpgQLzohEuzrGwF Ffozz5ZKZUkzlWQ11x5ARaavT2XlD7gQ1pmLgKftrjcNqejbm28W7Wn7QQIaVIsVtb+p ey1tHXr/xh3LgsC4tW/iaPmkB4dATF4oJRMarrWD1YbNRwA2svennmZiMErNqfDH3nuM PaF06fa/PNBeNu7KfowrszAAS7e39g3f+D0EyAIN0lCYQ77WGRzEPH8Eg/ursO2iKg7K keXgUYdbWCCqlOyGPqOqSBrvonE+kC/ZhTIG0nFw3nvRnjNVANfaTXdZnfanqPr801dy uD4g== X-Gm-Message-State: AGRZ1gI4uA3F3cCshrlkVmqkq3LHxWZ7B2Wp+pEatEfQLLgMvzyNnjy2 uKhOAanln+ABTR/sxRnQsLq5V8+w7ZKcXA== X-Received: by 2002:a17:902:6b01:: with SMTP id o1-v6mr4469165plk.333.1542249245466; Wed, 14 Nov 2018 18:34:05 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:04 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:36 -0800 Message-Id: <20181115023353.20159-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 03/20] IntelUndiPkg/XGigUndiDxe: consistently use forward slashes as path separators X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Replace backslashes in paths with forward slashes to be compatible with non-Windows OSes. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/Decode.c | 2 +- IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf | 14 +++++++------- IntelUndiPkg/XGigUndiDxe/Xgbe.h | 2 +- IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ryszard Knop diff --git a/IntelUndiPkg/XGigUndiDxe/Decode.c b/IntelUndiPkg/XGigUndiDxe/Decode.c index 70fbce64c64f..5f37ce254872 100644 --- a/IntelUndiPkg/XGigUndiDxe/Decode.c +++ b/IntelUndiPkg/XGigUndiDxe/Decode.c @@ -28,7 +28,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ #include "Xgbe.h" -#include +#include // Forward declarations for UNDI function table /** This routine determines the operational state of the UNDI. It updates the state flags in the diff --git a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf index 7ccc52bc9869..beee8aa8134e 100644 --- a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf +++ b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf @@ -110,13 +110,13 @@ GCC:*_*_*_CC_FLAGS = -DEFI32 Version.h HiiInternalLib.c HiiInternalLib.h - wol\wol.c - wol\wol.h - wol\wolfamily.c - wol\wolimpl.c - wol\wolimpl.h - wol\wolinfo.c - wol\wol_10G.c + wol/wol.c + wol/wol.h + wol/wolfamily.c + wol/wolimpl.c + wol/wolimpl.h + wol/wolinfo.c + wol/wol_10G.c [Packages] MdePkg/MdePkg.dec diff --git a/IntelUndiPkg/XGigUndiDxe/Xgbe.h b/IntelUndiPkg/XGigUndiDxe/Xgbe.h index 5ab088362f90..4472cfb4fa31 100644 --- a/IntelUndiPkg/XGigUndiDxe/Xgbe.h +++ b/IntelUndiPkg/XGigUndiDxe/Xgbe.h @@ -69,7 +69,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include +#include #include diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h b/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h index 368f40811904..e324b0539782 100644 --- a/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h +++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h @@ -39,8 +39,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include -#include +#include +#include #include #define CHAR CHAR8 From patchwork Thu Nov 15 02:33:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151141 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6453430ljp; Wed, 14 Nov 2018 18:34:18 -0800 (PST) X-Google-Smtp-Source: AJdET5cjKNV4VOnhGbTGXsSGN6rycwvrXu1TnB73bxVb5T1HTJ3ooNbcf3cIeGZuC1lz9ZdBE6rh X-Received: by 2002:a63:c141:: with SMTP id p1mr4113633pgi.424.1542249257931; Wed, 14 Nov 2018 18:34:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249257; cv=none; d=google.com; s=arc-20160816; b=G/AC+Cd831UlSK3OVdo89oTaBWnD7HAX5uV6BK9wn9ja6hlJl77f3/m1Idk3o7r4Hu jg2zhsQI2rvkfedjkZ2NgaGiLAzO7jYGaODCNyOOxxUQKjEdiHmsPttHZMUPPTQ2aTfG /e+ZpudRdtdZWr6Loi9TOB3wA7zegI1to9YxbL6cy+kK+9Gj4wt7ROYz2Od49hp9orK5 fXV4QxjDQCHwotmCGKx/rFhx0uu1F6H+AKoEDrRD+ic1ZwfvOvvtr5H4nbReeswwEYYk 31obFnWUnKThf8CndfVYbi1zMRhwxwgt6/DM5D/sw2fZ+YURWWHnYCgxoUR6spOuAOh9 Mh9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=XeMeMJ2sf0j7/+EML//Ey/Vx3ADt8afR+xZ1MfxkrBE=; b=LsSXtTsIvDTYtO1nqjdG9QlEC18cgkZSGdnFMOsWUTxphpGz8gtX/c4eqq47u59sdQ y8eVkzOJA9IaT0VjFQONlRJ6u26CNDHf6Cf+p+dzPoMZ6RGTNMbQ6P0OO/5et+MZ194Y zsIS4l1HK6c8Ey/5LOk5k4s7MnjuyNA5LxAKf4IngKlN1v+4ZwZeol6xLMznfdt8uFrB tqR3tv0RvLzZTLPs6YmuVWnsAoMaRyB7vReU6dN1KgamzHvKBnT1TjaJfqUkSEPFRzXR EKyIHfu+TVlKPimMmyWmhioZhQcPV3NOGc6e9NM41tYzrW7bgV8LkGWbDYcrcOWEYfF0 MeYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=NEc1G7Xt; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id d32-v6si27948833pla.405.2018.11.14.18.34.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=NEc1G7Xt; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 98F452119073B; Wed, 14 Nov 2018 18:34:08 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::642; helo=mail-pl1-x642.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id EC08B2119072C for ; Wed, 14 Nov 2018 18:34:06 -0800 (PST) Received: by mail-pl1-x642.google.com with SMTP id b5so2304980plr.4 for ; Wed, 14 Nov 2018 18:34:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7dBM7o6UpUKQrjVbhkgK3XyND2ELVb39psmGynYj9vA=; b=NEc1G7Xt2S49ib2FeCZIvy73KEzt7u5B2cVH7tiX+rxqFnLVDoWrs5M/lj6ayFJZSQ to6xaEFIZdl1rVrR3ew0PBUPu54r2+sXlVTXnlNGaM5BC/KMVx2QYZimo7bRpivv0tIL MhEkYwdB9PtUsg82UbrdETYwwQDISXeFiBhHU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7dBM7o6UpUKQrjVbhkgK3XyND2ELVb39psmGynYj9vA=; b=HLljkKMod6f5QsDSgcji/kX9EvKFsBZsBVlZgUWOuP/NqAACyapn7/V9+cQLkC0njt LXpRonYwiOm9qRXow9Z5ShDeziQRIK4b1c7KrtIeZa4pw272eHCPYqM2IWlpVaEplrAf yCTzvtbNfO4ojLnDmeEY3b8TR+q2qTjvxHqJMZ517m0lfsc5QK9OyG2sgiEb5akyT90v hBToL4s/ZYjwPmJ07WFjTDAE4i9xjptUQgoUmHr1vbN6+TTs8hjAhPuJ5dVvY17biQwA wV0ZkM80TqIyiHHMleeAcbc9bzqiMNJuFHm/NRJSVBSScSq5gUMjCtVqg2MFeqhVOdZQ HRRA== X-Gm-Message-State: AGRZ1gLQ+CUq9S1sxHoX+bWGp45E1sUmTeAVeH33Oi2+mxSctHOl0Apg Enub88vMN5UR9AP9Vh/vvbAuHNoS5HHIoQ== X-Received: by 2002:a17:902:bd0b:: with SMTP id p11-v6mr4410356pls.35.1542249246474; Wed, 14 Nov 2018 18:34:06 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:05 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:37 -0800 Message-Id: <20181115023353.20159-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 04/20] IntelUndiPkg/XGigUndiDxe: move BRAND_STRUCT declaration after type definition X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Move the extern declaration of mBrandingTable[] after the definition of the type. This solves a build issue with GCC. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/DeviceSupport.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ryszard Knop diff --git a/IntelUndiPkg/XGigUndiDxe/DeviceSupport.h b/IntelUndiPkg/XGigUndiDxe/DeviceSupport.h index e997983ba3e7..d501d9bb1371 100644 --- a/IntelUndiPkg/XGigUndiDxe/DeviceSupport.h +++ b/IntelUndiPkg/XGigUndiDxe/DeviceSupport.h @@ -33,9 +33,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. typedef struct BRAND_STRUCT_S BRAND_STRUCT; -extern BRAND_STRUCT mBrandingTable[]; -extern UINTN mBrandingTableSize; - /* Defines */ #define INVALID_VENDOR_ID 0xFFFF #define INVALID_SUBVENDOR_ID 0xFFFF @@ -53,6 +50,9 @@ struct BRAND_STRUCT_S { CHAR16 *BrandString; }; +extern BRAND_STRUCT mBrandingTable[]; +extern UINTN mBrandingTableSize; + /* Function declarations */ /** Returns pointer to current device's branding string (looks for best match) From patchwork Thu Nov 15 02:33:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151142 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6453487ljp; Wed, 14 Nov 2018 18:34:22 -0800 (PST) X-Google-Smtp-Source: AJdET5dHnc84breoJIudZDwtyuWxIgmIVgGA+97yFJwd/YBEvulydqZMz9cDN8AxMvnbMQ02TmmW X-Received: by 2002:a02:158d:: with SMTP id 13mr4010812jaq.97.1542249262293; Wed, 14 Nov 2018 18:34:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249262; cv=none; d=google.com; s=arc-20160816; b=kp5+3Uh5UIpV+o9tOOSIDilXusPtNtYE9zSat5vWNwiUPyTl5YbI65eP6W9y/zQyac ceCKxvOkMqBIqJXDDTlp1ArUNFtT9TQ1K0tOTaSsnSqpEQzOm2IUmFIwTrSlOccVY00M +CrWLKCUy4YGa+nHuSg4j6NbqpKFSYmIsdJUBzct8fVpJVZWlRqGdyZewQujuLADE8WU nArbXwZ/vHmCxaJo5S6fwh7dJAeMvZ6mjR+FKXk7dP1yWToYis/c/5t4pjCrxftmPzyP CZ23oGFn12laIYEHvqraOprRYhcgX8C0KN11sJx8iVvaOBsGhtAVyuVcElLbIqduWr+t V+JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=serluTba39/ARQFNkXVzNHGsyUgMwIfPCBn+h+8AQSY=; b=p6+jSmNPlnvGQmEENxJKVrX7CpmeN3GyQIoZJuXPKoMImqcDrYW/RXUlYRQeD+gAnI rd4NmCG69Ougn8C+kkptwO+AWjGhDNd9fUwZsGltdTyupX0y7z8MAe5IUIO3SdVQoli9 tZp6uAEC6hu3aL7V6AOcNRLOYvtR/+JBrsikukHSVNIAfQdkJK/5mN8esPIrqwxYvFRm c2N/xp2vMZhckclA5xjJSWL34W/Rc8MLuby5E/lyL/GexzSpF5EbgphxGh7ziaXSI7YH BsPNzY3SoZYyLFzEaneEqS+zqHZzn+gs4bZVjslWZXgj0VAePaQBthW/WdTm9f0g43wk 5O1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="LfknD/Ho"; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id m2-v6si16968621jaa.62.2018.11.14.18.34.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="LfknD/Ho"; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id CD6FD21A07A92; Wed, 14 Nov 2018 18:34:10 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::642; helo=mail-pl1-x642.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 27AC82119073A for ; Wed, 14 Nov 2018 18:34:08 -0800 (PST) Received: by mail-pl1-x642.google.com with SMTP id v1-v6so1583599plo.2 for ; Wed, 14 Nov 2018 18:34:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ezN2B30taoL3TolXSsXfDdGhsztEaiRBOzssKR7QQzY=; b=LfknD/Ho+PxU5f1pGHs8pK2QgDGCGGNu+pJAL8p6eopJyApRQPx/xJjfLRHUlpTwLw qx94GJTP5ZiobdNaGJ4rRXrqlx4705rlnFBpKHPptbhfZhn2S5XG2YxApFpXywoLP6uy HZ2XMOOkx30Qfyg9xWZ91EjIJ7J28zleilXig= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ezN2B30taoL3TolXSsXfDdGhsztEaiRBOzssKR7QQzY=; b=k2vAPTiy0j4M2tXFll8zEnbRCwZVwJZk1MMhQ6PjE7dVhotpL/abZpRWRCStCBk/Bd QiPt4PvkD0/hGJNYljtmuP9ArHMC1Gr6l/IrwsFm99dQjK/tT+iETJpNI55MVMUJFvHU H2DabmJCj3GanyXIZEmOiZTIa9XjIjNXVInGzCcoYqtXUlIrbQoEgShnIZcFugpXaZ6Z Lw0TEB3mIjLmEF7LTNpHwX6KkvZ78I4se1O9aFQtsAHQeOVyQ2QF/gJyfC/U537LDWFc uXSAvteqCq8eSS10xHgYzCrQ19MzHkUDLl1K4S2nZ+vJGkfvzehp5ieFslBiuKZCKzgF aU1w== X-Gm-Message-State: AGRZ1gJSuKlisH+LQZQ2FcSx9xdsCaYTzdxbGQ11mh40FBmgJbwAjhvc rDj7t1FDNZXKYbiQDIFvU38SYC9ZLxFSEg== X-Received: by 2002:a17:902:2849:: with SMTP id e67-v6mr4430050plb.269.1542249247573; Wed, 14 Nov 2018 18:34:07 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:06 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:38 -0800 Message-Id: <20181115023353.20159-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 05/20] IntelUndiPkg/XGigUndiDxe: add missing VOID** cast X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Unlike Visual Studio, GCC does not permit implicit conversion between a pointer-to-void-pointer and pointer to a typed pointer. So add the explicit casts where necessary. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/Hii.c | 8 ++++---- IntelUndiPkg/XGigUndiDxe/Init.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ryszard Knop diff --git a/IntelUndiPkg/XGigUndiDxe/Hii.c b/IntelUndiPkg/XGigUndiDxe/Hii.c index 857a475622f7..3ad7d61e493d 100644 --- a/IntelUndiPkg/XGigUndiDxe/Hii.c +++ b/IntelUndiPkg/XGigUndiDxe/Hii.c @@ -459,7 +459,7 @@ HiiOpenProtocol ( Status = gBS->LocateProtocol ( &gEfiHiiDatabaseProtocolGuid, NULL, - &UndiPrivateData->HiiDatabase + (VOID **)&UndiPrivateData->HiiDatabase ); if (EFI_ERROR (Status)) { DEBUGPRINT (CRITICAL, ("Error finding HII protocol: %r\n", Status)); @@ -472,7 +472,7 @@ HiiOpenProtocol ( Status = gBS->LocateProtocol ( &gEfiHiiStringProtocolGuid, NULL, - &UndiPrivateData->HiiString + (VOID **)&UndiPrivateData->HiiString ); if (EFI_ERROR (Status)) { DEBUGPRINT (CRITICAL, ("Error finding HII String protocol: %r\n", Status)); @@ -485,7 +485,7 @@ HiiOpenProtocol ( Status = gBS->LocateProtocol ( &gEfiFormBrowser2ProtocolGuid, NULL, - &UndiPrivateData->FormBrowser2 + (VOID **)&UndiPrivateData->FormBrowser2 ); if (EFI_ERROR (Status)) { DEBUGPRINT (CRITICAL, ("Error finding HII form browser protocol: %r\n", Status)); @@ -498,7 +498,7 @@ HiiOpenProtocol ( Status = gBS->LocateProtocol ( &gEfiHiiConfigRoutingProtocolGuid, NULL, - &UndiPrivateData->HiiConfigRouting + (VOID **)&UndiPrivateData->HiiConfigRouting ); if (EFI_ERROR (Status)) { DEBUGPRINT (CRITICAL, ("Error finding HII ConfigRouting protocol: %r\n", Status)); diff --git a/IntelUndiPkg/XGigUndiDxe/Init.c b/IntelUndiPkg/XGigUndiDxe/Init.c index bffe3c165866..84e06ea071c5 100644 --- a/IntelUndiPkg/XGigUndiDxe/Init.c +++ b/IntelUndiPkg/XGigUndiDxe/Init.c @@ -179,7 +179,7 @@ InitAppendMac2DevPath ( Status = gBS->AllocatePool ( EfiBootServicesData, // EfiRuntimeServicesData, TotalPathLen, - &DevicePtr + (VOID **)&DevicePtr ); if (Status != EFI_SUCCESS) { From patchwork Thu Nov 15 02:33:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151143 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6453531ljp; Wed, 14 Nov 2018 18:34:26 -0800 (PST) X-Google-Smtp-Source: AJdET5cQEjvvvMHEOekKg0wyEz8fD0W9N6BAjA4EO68Um0mx6ngAQhdIi9kGhK8l9TMoeoplQ5tc X-Received: by 2002:a24:89c6:: with SMTP id s189-v6mr4745870itd.96.1542249266275; Wed, 14 Nov 2018 18:34:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249266; cv=none; d=google.com; s=arc-20160816; b=AhYdJe6ni+uXX1LGTokDqL/x2g/3oT/qj55ekhqQEE2FdXpTRkVn6CUZ36HCh3mTix S+d7pga1gWC1+lOUOdO45cOFGpUwP1OQFXohkRm2oXZbSHh3KxwT5jolGAamwCFyf3YU k3BmFcR1c8WnG3DDFAsI8OcWIxMoNUiuPrI5E8K8itdS62RErPVIUL1rEL8+b8lqtqtV xJe913w0LFkLb8j2jwkQQ++ze55g72z5eQkt+MpZVt6Kvr6Mrg6+ZI1ETy7uLK0J537e OPlrRmXzwcddf/LxUVrCte8wW8gxKxE68G39sKpzvwGMoYZ9sv0oLgxUAgbCgv/pdAeT 2s5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=3GbMX8dV+5rpIRWajjjq/3uc/YNsTAibAHT/43aeRw0=; b=jHg8mi1OZAQAdRgk5/mKSjt2tz4ymZXzNJmvj3p/HWPviZQcIRBeYY78ogkkDL2Fm9 NYTLlViVxbVrWcXeeXkapQBxfH7ZeU/RJ8F72aO4p1y1BkdrB/Ns82jAJRo3RB8F6aAl eNo+I6fOY8lhcEJwXdughKTZKIYUBxsEhJdY6eZbI7yNNlUZ41RKS0mOLXjlD8oYIC60 dG+hPKCIEkeWcmVXkWRq96yBrKm7ecdS5D5WtLiifLTk1Ae/Yr0mjOVFgRFkK4OefBJx c+16ynNKy+AtcUq5T5Pwqgfbf399/8DEAarI22a/G9TE75iUCcmjnQy0zoY1K5vmrLnB wHDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=bAbXNtUR; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id z5-v6si14095322ite.0.2018.11.14.18.34.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=bAbXNtUR; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 0AA6521191721; Wed, 14 Nov 2018 18:34:11 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::644; helo=mail-pl1-x644.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 209322194D3B3 for ; Wed, 14 Nov 2018 18:34:09 -0800 (PST) Received: by mail-pl1-x644.google.com with SMTP id x21-v6so5999096pln.9 for ; Wed, 14 Nov 2018 18:34:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=m/0sore4yQgOyZWlHCmFdl4sf7YbaRyTikzCX+ndiBY=; b=bAbXNtURdLtv4u3IyinyNO83rEnK6hvNdx8MI/FeJbJQIgM3VbPbk+O/Gh5srVX+Wb LcxseKw2AsWOAMEBSWAZ8fQZNuHamgQPMAWizCFelUb8S99KFwduXTobstrvuAq8Gm4o 7wLiTDcP3EYgUqIHOoImOzZzx12+bMBLCV4o0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=m/0sore4yQgOyZWlHCmFdl4sf7YbaRyTikzCX+ndiBY=; b=ZkJqM/M5sbclA2Z43WIKXt8Kf6DUFLb6x2sh7ArfkQpL/ynMeE/Kq+rC4TW3ELSEGI fKd2JvETW4YkggdF0vcg4gFMMGehUPmgsXtBoI7K5NS4+OdR5iyPkbtujcWflsXZ7O9o xW/xnr1Wc86xy6JfCYry/80owox2UGH5Xq/kM4SWoATEfzsv8FlxsnYM/bhCxQfUD3rk DZJ6QwcwINLoJm3I/yjc/c8RY0LBCjhBQzHvQai98HfOexFeKOrRRkGvvCB46uGBARNU R///WU99tK2dPlANucnX9V1D75Zc2LquJKWqN/+qc1EmC+xwM5s2pXYCwoHSfiUFVGCO r+dA== X-Gm-Message-State: AGRZ1gK8cVhCopPeha6ztQQj9Gp4fREXKm/zLJZ+NCVsuZk85J0B8Cd2 LEd++5yhfaIG8x58Sis66yAXuGtkrIGviA== X-Received: by 2002:a17:902:b181:: with SMTP id s1-v6mr4525764plr.51.1542249248634; Wed, 14 Nov 2018 18:34:08 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:07 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:39 -0800 Message-Id: <20181115023353.20159-7-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 06/20] IntelUndiPkg/XGigUndiDxe: add missing UINT8* cast X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" UINT8 and CHAR8 are not the same underlying type on all architectures, so add an explicit cast where necessary. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/Hii.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ryszard Knop diff --git a/IntelUndiPkg/XGigUndiDxe/Hii.c b/IntelUndiPkg/XGigUndiDxe/Hii.c index 3ad7d61e493d..3170580487d5 100644 --- a/IntelUndiPkg/XGigUndiDxe/Hii.c +++ b/IntelUndiPkg/XGigUndiDxe/Hii.c @@ -782,7 +782,7 @@ HiiSetMenuStrings ( Status = ReadPbaString ( &UndiPrivateData->NicInfo, - PBAString8, + (UINT8 *)PBAString8, MAX_PBA_STR_LENGTH ); if (Status == EFI_SUCCESS) { From patchwork Thu Nov 15 02:33:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151144 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6453583ljp; Wed, 14 Nov 2018 18:34:30 -0800 (PST) X-Google-Smtp-Source: AJdET5fn+p4Frs+vE1OBzrv3QVUFEV0SOwUteh4tTK66zJS5vdMlveUZaX3YvH1H1Ww8zL/VFuok X-Received: by 2002:a24:c343:: with SMTP id s64-v6mr4145639itg.20.1542249270418; Wed, 14 Nov 2018 18:34:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249270; cv=none; d=google.com; s=arc-20160816; b=m73MkFqAdaucQdjjukUuEZcHCNjy+oBEkqMqf2JX3aKj4QasnKdIejxzSjPaKVIyl9 ZgtQnpzNZcZmAg48E7rMTdk4vhNUYsBt/knWNZVyzQs6nooaAlEfZgXspFcPwfL2L2jD MG4WORaoKt+nzHkhvMtN8cBdKDBsY6sqLlC06o6Wjmj8zG7mmNytLoGAZxw5bppBKymF jlnBm0GnooW7EQJxF8v+KKHihE31i/dGZ/LpJE85eK+xhzvHdUI5LCzKLfRWMjduG6Y2 WRR7+Zhv2iLDGPlX987U3Z/x6df2qeXn/LVLGYlScHBK5jngzYhcpnXEy6OiL/i6l8Wy H3Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=eSCIc2ergp+5E4z6Iz7rczBc967jcEg8EaNCmVw/eMc=; b=e9tt+YUFhR0rq+M8VF4yFPOvsQq6xPeMVQq4hp7v9w7AyAF4JDIGk8WLb4OOA7Z3jT cWBYcfYq0yLB7H355fv69UmsQ7issR0FQPW3oARg8eAMKAdJZ6inceyGax5gxOnIH9vn ojhuNulBrjqC4JGZ1vuf6KIpPAOBHLI48b6u4zw+EXA5qw90/6e9O0JG2y5xzCoXIRe6 OwW8vvuL2hgZVATpEPnrcEYa1wyTpUtXakVY7dmG8ih4OZPGKhgfZlUJSogTub28HTaK m8+dvd0Vsri32RwCyFJ1ftsZPCvDwheBPu5UinBrDsPkswmnp6oGozgt503tIlGXmg2c SwVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=bzvoXAvF; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id f64si2417945ioa.156.2018.11.14.18.34.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=bzvoXAvF; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 37D2121BADAB2; Wed, 14 Nov 2018 18:34:11 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::642; helo=mail-pl1-x642.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 84D232194D3B3 for ; Wed, 14 Nov 2018 18:34:10 -0800 (PST) Received: by mail-pl1-x642.google.com with SMTP id b22-v6so3272495pls.7 for ; Wed, 14 Nov 2018 18:34:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dUDZjb0jR3rp3YjcRmu7mv0okfpmN1d9aak9DISaOGU=; b=bzvoXAvF+HnCyJfegVAtx/QUI/nU53nYySXdUxRC3PDwv8ViAy/WsZiKzo0VVZ4dk4 qTnmV0vTXMNAGj2BKUEkMMutnh3yndscCv9yCzupIM9Swft3MOfXagyp5rdo3GSkWMbG v/kE0qs/VIPtKhMG9qUAkMopsDoGYSwR+JJdI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dUDZjb0jR3rp3YjcRmu7mv0okfpmN1d9aak9DISaOGU=; b=m7+c4D+IWANd2wlR3RrWW8KjAPxI0oqHXCsjldJQvRtWc3sSfJyNzatfUBJe4asrGb Yr5zpYPL6kj6oNPKpPFfBamQ1xALizrfExq/awXlhGaRKjy5HKjp5PHjJ11BeaxybWzc fRzLnnnrHPNYGLLHa69zx6C0LXIWW/0+RHXA5LJRIYyY/gHqlxD+uBkuVaPS5Nl+gcup HpeH2GSBBdMRbOr5iKt/uOCA1rFOiIVWN2ZeOIqNfmlsWa1hcgoQrew+uzju4dfa36tV fxiovZ2wKXhQynv0wIb9HOwBtnVr9+po30FQe3etV5tgKqsAMcZ3mayx9zfumfcHd5/M XpFA== X-Gm-Message-State: AGRZ1gIV9ypgj8O3wEeEWKXwxQdiMjRgt8SaUTD+2HRi9PprQ3NaDDio aHnBu4x0QFJRhdF6oTUTGqejijf/vcdQ0Q== X-Received: by 2002:a17:902:768b:: with SMTP id m11mr4528241pll.80.1542249250036; Wed, 14 Nov 2018 18:34:10 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:09 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:40 -0800 Message-Id: <20181115023353.20159-8-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 07/20] IntelUndiPkg/XGigUndiDxe: drop definition of gImageHandle X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Remove duplicate definition of gImageHandle, which is emitted by the build tools as well. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/Init.c | 2 -- 1 file changed, 2 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ryszard Knop diff --git a/IntelUndiPkg/XGigUndiDxe/Init.c b/IntelUndiPkg/XGigUndiDxe/Init.c index 84e06ea071c5..03e3942a1944 100644 --- a/IntelUndiPkg/XGigUndiDxe/Init.c +++ b/IntelUndiPkg/XGigUndiDxe/Init.c @@ -47,7 +47,6 @@ UINT16 mActiveChildren = 0; EFI_EVENT gEventNotifyExitBs; EFI_EVENT gEventNotifyVirtual; -EFI_HANDLE gImageHandle; EFI_SYSTEM_TABLE *gSystemTable; EFI_GUID gEfiNiiPointerGuid = EFI_NII_POINTER_PROTOCOL_GUID; @@ -502,7 +501,6 @@ InitializeXGigUndiDriver ( { EFI_STATUS Status; - gImageHandle = ImageHandle; gSystemTable = SystemTable; Status = EfiLibInstallDriverBinding (ImageHandle, SystemTable, &gUndiDriverBinding, ImageHandle); From patchwork Thu Nov 15 02:33:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151145 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6453622ljp; Wed, 14 Nov 2018 18:34:34 -0800 (PST) X-Google-Smtp-Source: AFSGD/U0pU9b3mqWQ6qntRnbdeS+40KFdG3nVqHE37GhOYkYSoIsr7Pl/KQB0B/Mx4v5eGAMIOVf X-Received: by 2002:a6b:ec18:: with SMTP id c24-v6mr3959246ioh.33.1542249274451; Wed, 14 Nov 2018 18:34:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249274; cv=none; d=google.com; s=arc-20160816; b=OAo5fyQF1FuaAmGJg9EytntL5/e9w4KFATJAvIM+E7fcyYQBfkxFo63vSfXE4lq+gv po5VBHLwQZpDBkGqetJiwfbXJ7f73zsB7P8zGWd6uYEM3uhN2qDV4MM7LFuRYKHjOVFB 9yalSlXkCJx/4I/ENIe1Fsu+7IhDGdhb4DwM+nuinxvJVAxFR325eQT8wjiVdcxP1EnC f5xl2oRhthkARmFHNqwaLf53ySClyNHlB3S+zWrledroufD0X9BpGohDxy6zK11MlcpN OnQ8KqzDZAZ+RB+fGUP41TzGIlTCwxarjSoowPLhAGF0hU2nFtmvobOZhd+rzo4Oqh1g oy2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=o2qNQaYwb0TlaXRKUH5HGfGUwDGXEBf8M/AqdFxALTw=; b=VxsXfHRvQ1qR8HLQkjUZPwRV+2OZhkweQ2Ee7SZK21pzfyOFa6fKWsoSpg4iJAd4th /4WUqc3VJG1AxIJWk1NE5XAGJC3TxK2BV/FKu0+uV+s5ATfT4/pIyqurOOwNhMkWULwT q/BaJpIIFOs5Div1y3nao1kd6GXeI20hbEVDQRPaSsFfC4XpYVxB+I5NAxckXmoYxaJr KmcrDUPgCU4nQanjblS7FNAou1FHtYpZErkPmCWeie3Tlz36raefix+Y5RKwR8FRx2Xt WDhpEdVD+oNZLq0i8LlYnPFCjAL7ZeKiTB3oD5Wjdra1NJpPSrTv3F9U06LwNtTHYq41 WP3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=dyDoh2p6; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id l79si2055782jab.122.2018.11.14.18.34.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=dyDoh2p6; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 697D621190730; Wed, 14 Nov 2018 18:34:13 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::442; helo=mail-pf1-x442.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A181921C8EFB5 for ; Wed, 14 Nov 2018 18:34:11 -0800 (PST) Received: by mail-pf1-x442.google.com with SMTP id h3so2352378pfg.1 for ; Wed, 14 Nov 2018 18:34:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+RjedPSBk1of90NHkMaEwyzm4SsNaS5JG+UauSjILiA=; b=dyDoh2p6BjSVxE4om5G0I+k6/MoFV9c1ZWKg99kKXJbCHsAtpOK90+SPn5a2Qg4t4T 2DM6FAA3WAOFRiFUcMxuwUYHrUJW7OwvAaPyJjB7TAY+3zZRJTD9BnGYsNvNBvkFrkJK enj/7QDq0IN+99af9fvA/9isxbJNdSXYoltlk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+RjedPSBk1of90NHkMaEwyzm4SsNaS5JG+UauSjILiA=; b=TWrSaqg24v4/BC8zA0kj6yCcr27I982UsQy2gf6cyu8rCY18UuJBlcU3h5mVD9hq6k ZkMQlpl2fcewC624KvCqvwSwdXVfcU+tlfK4Kqw93zplygQosTQTrLsb6XzdE3TkhPHV 0PoAICtxHCRDHzSF8vnWKE35aQ1kfvXdx3GjYVRic2I52B84nLWSGv3nL4z8TNly4z55 YWe3+gInKqJdxAK1lxhMG40jjErATWnx7iB8/sW3020r8e18zdmPIU2XeLeY+eeQ7AiZ 8oQLySVl3oqSNZffPcaaVvRUkd2Ai3Ae7LdoQngsSmBeD835tTLHseSkE/edabq5LfaS wu3g== X-Gm-Message-State: AGRZ1gJjMMFBy5nxcu3znY5VSfcIYGEaw/UZGsYXHvhLE9JYp5KHk33X +hvcW/xpif4kRmC9nQ9Uq5Dq3oakzZfOwA== X-Received: by 2002:aa7:8254:: with SMTP id e20-v6mr4606791pfn.164.1542249251091; Wed, 14 Nov 2018 18:34:11 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:10 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:41 -0800 Message-Id: <20181115023353.20159-9-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 08/20] IntelUndiPkg/XGigUndiDxe: add missing braces to GUID literals X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The Data4 member of the GUID/EFI_GUID struct type is an array of UINT8, so literals require two sets of { } braces. Add them where missing. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/NVDataStruc.h | 4 ++-- IntelUndiPkg/XGigUndiDxe/StartStop.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ryszard Knop diff --git a/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h b/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h index e5e669681b07..63dd841277ab 100644 --- a/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h +++ b/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h @@ -34,12 +34,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define XGBE_HII_FORM_GUID \ { \ - 0x25fd9f0b, 0xa3ef, 0x4788, 0xa4, 0x0c, 0x81, 0x84, 0x9d, 0x17, 0x8a, 0x6c \ + 0x25fd9f0b, 0xa3ef, 0x4788, { 0xa4, 0x0c, 0x81, 0x84, 0x9d, 0x17, 0x8a, 0x6c } \ } #define XGBE_HII_DATA_GUID \ { \ - 0xe2c85968, 0x6906, 0x4b27, 0x9d, 0x09, 0x33, 0x43, 0xaf, 0x06, 0x46, 0x76 \ + 0xe2c85968, 0x6906, 0x4b27, { 0x9d, 0x09, 0x33, 0x43, 0xaf, 0x06, 0x46, 0x76 } \ } diff --git a/IntelUndiPkg/XGigUndiDxe/StartStop.h b/IntelUndiPkg/XGigUndiDxe/StartStop.h index 03ad3dc9cecc..5dfc45c7de6a 100644 --- a/IntelUndiPkg/XGigUndiDxe/StartStop.h +++ b/IntelUndiPkg/XGigUndiDxe/StartStop.h @@ -32,8 +32,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "Xgbe.h" #define EFI_DRIVER_STOP_PROTOCOL_GUID \ - { 0x34d59603, 0x1428, 0x4429, 0xa4, 0x14, 0xe6, 0xb3, \ - 0xb5, 0xfd, 0x7d, 0xc1 } + { 0x34d59603, 0x1428, 0x4429, { 0xa4, 0x14, 0xe6, 0xb3, \ + 0xb5, 0xfd, 0x7d, 0xc1 } } typedef struct EFI_DRIVER_STOP_PROTOCOL_S EFI_DRIVER_STOP_PROTOCOL; From patchwork Thu Nov 15 02:33:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151146 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6453655ljp; Wed, 14 Nov 2018 18:34:38 -0800 (PST) X-Google-Smtp-Source: AJdET5fbcD/kq9VqMX5mUn5tGItW1+zw8UX+lK8xY+x7lefxHA9TcZNFFyy8UFr7q4fGlBDCtGiR X-Received: by 2002:a02:b697:: with SMTP id i23mr4081556jam.119.1542249278397; Wed, 14 Nov 2018 18:34:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249278; cv=none; d=google.com; s=arc-20160816; b=E4J5UG45iw2QWESEJyCpMzZ5jS2QUlR21T9YQdq1GKom9B7meLzVMkC00uchX70lx2 O24ymzXKln9D+++UkiwmAMPoTVbCFx9j5YIalRiO/gFPgs7ziuXtVoFVFfJOblvXFhIy uyFipenKKF/eIJcyjPQi1bW2x9M+slG27z08qX8xu6ZnvL8J8e9KAukcmPgK/9uG7eUN VWpJxVwykuzlYL4xtN5wS1ta55S9qumD7IsUFD9qD7WkZE71yUZWGdMxyv9nEOy7mgPv Tyb5RWtjyZsuzq8qXEm2x310cqR8dFdBZmILvNI9xL+ftX1d38q3ZmKCcm+zvh0oQBYF uwAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=n2vRkQjp63gyiTJVXR3K0bJiulqY+G9c8JYN1Fvjvss=; b=S24/w+7e4u6v8Pe+z3WzAkMS81bzkxcaz6iwtnCvdUenlhDOVt8cvH4/YcD0+6PmF1 AsGWENI9+TULRzwGcayaA8Ztt6YB9IUvgemzUcW0wEu4ut8dQ0wxvQdWsoiUWnZsnr3U vj0gFGWPiMoVaP+RjhsakKUQo9O0Es+Un+0TECNo3NWWRqpO4+dMGFmmD+JOBKPc77ea ahRUS332wjDPis1hpYLdxUVX0GPLTY2FXngAJoTbrbZXvqnVNFChZsV5s3gLtNhUAzLc NyhzcWG/3P5MrojwhvKVDitMGteXP4tENDB6ooDlDZXWku18zUXRoJe4H6RZiHHpLmvp TCDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="Kp/GH0Yt"; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id q199-v6si14777238itc.144.2018.11.14.18.34.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="Kp/GH0Yt"; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id A35B521191724; Wed, 14 Nov 2018 18:34:14 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::442; helo=mail-pf1-x442.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 031A821191722 for ; Wed, 14 Nov 2018 18:34:13 -0800 (PST) Received: by mail-pf1-x442.google.com with SMTP id 64so4423668pfr.9 for ; Wed, 14 Nov 2018 18:34:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KsEhS3ptJ5jiVnef+5MF6ImG/AsH5XIEwtJ6e65SX9c=; b=Kp/GH0Yt9fIIHjfewvnDP5tc2G1URiji79ZHtfomjZXnJcRO7yhPzHx8K9tZgI4Aq2 22F7ce9T2UCxeCq5ZMk5JuKsMnngY5hkGmEhe4vQwQedw0Me24arztHS1P9aItgFjsFe tJZ35fscgHVkG73PecGo+8Bk7QLV2TWpaBX+0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KsEhS3ptJ5jiVnef+5MF6ImG/AsH5XIEwtJ6e65SX9c=; b=htOQxs6e8bmEoPRnaEpLs4mCUrJC0u5+Tr6tTi8JURp0BbSq5yr1EjGX51F4+DbwYB n8G2YiZbCwQglzO3TWfJWcl2tvRzFsCK/OjfU8ngI137rWZl14FRciOgGxr1T2rjakSC VLarSP3wyOoAuvRLdk5IJwxfdmw6q22Ao2oLInK+GFmhfFuHjb6mtZISQFeIjjszmBQc ZTd1L4sez1B2fwMsD4AkjfTQu6vWlJgFoUY7ipKl3hqdnMkAAgeX+ioejy6mls9pOZrp hS5h1lMPmPkQz7Tr+IvctfDv42O1xx+573MMbC2FcTdPaUxVo9a1fo4DlEQPrBQIc2gz JNtQ== X-Gm-Message-State: AGRZ1gIB6fwR2DUBhUbOYwrgaON1Q8HEmuVlCtMddYzvbHyeaos1U4+4 +3G2NxP2nwBgJyO1DAHLidYyfTWBihnoTw== X-Received: by 2002:a63:2d46:: with SMTP id t67mr4215538pgt.140.1542249252448; Wed, 14 Nov 2018 18:34:12 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:11 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:42 -0800 Message-Id: <20181115023353.20159-10-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 09/20] IntelUndiPkg/XGigUndiDxe: fix incorrect use of CPP token pasting X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The ## CPP token pasting operator is used to paste *tokens*, which is not the same thing as pasting arbitrary macro arguments. Since a token cannot contain . or ) characters in the first place, using the ## operator here is wrong and unnecessary, so just remove it. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/NVDataStruc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ryszard Knop diff --git a/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h b/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h index 63dd841277ab..c78d26da7869 100644 --- a/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h +++ b/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h @@ -113,7 +113,7 @@ typedef struct { @return Width of given field is returned **/ -#define UNDI_CONFIG_WIDTH(Field) sizeof (UndiPrivateData->Configuration. ## Field ## ) +#define UNDI_CONFIG_WIDTH(Field) sizeof (UndiPrivateData->Configuration.Field) // General parameters #define QUESTION_ID_EFI_DRIVER_VER 0x1100 From patchwork Thu Nov 15 02:33:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151147 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6453708ljp; Wed, 14 Nov 2018 18:34:42 -0800 (PST) X-Google-Smtp-Source: AJdET5efkgQ7EADXC3GUEbd/+BoZw4NRTyMASFxktckU/yAKhq2Bn+/DWXnLwCAbQLkgm+dbgn03 X-Received: by 2002:a63:dc54:: with SMTP id f20mr4153317pgj.410.1542249282499; Wed, 14 Nov 2018 18:34:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249282; cv=none; d=google.com; s=arc-20160816; b=DNTGVC52EMtvKf7AMz1Xfz+SiNRupZns6y/hItK1ModSlS04EhAtjnKV6sSXaA5nCf SfS7cEBobDQqxk08gl38FCJMsotgH0jXmoDQDOQcWAyZQJRradVX+WwPkeNJyqV+VQYK yyfSSNFKr07myD4yu34oCLuQWMgHjXrr+4RNJd+8jXoVZ8dDONJeM1dWi1oiIOZG7ThG k46UZTvcjwlaDAEsAVU/snwdL1upKi2Q4Qt15h2Mh+9xwqMRfAjhpk+EIQd7rhMz5uOy u3fmnsFYEUeOfkkD1ciwFKZEILHn4QvgtuR4/U+Wj82P6MQGyz22CG7eGtqrVC8SSqAH Jl5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=rMeBNxJrKI6Bobv6qX9zgaSMVdJZKF1KXtGU3L+D4e0=; b=D4X0D+OBb+XW13xCuWJTJyOc6OHk2/Aw3AIlRXYz4uKglKd2pq7Py2RXfaCASGCSiU oChxSR91Qi0gQgFSXttgQgefJoeTpIWQY0tz8KmOjDQYAAAb15EvD6tyaKDi25NzalBx xQDft7fJbBu3DWx07JEdDr9W66qL/WQvWbWnR9c2ZNwQ1j36cHHDfLpXeH1/HWRcrIW3 Lo1KNoCyGGrZZIergVWT8eGs27F1mcz3ZarQEAKfiuTyG8Wxg6zIns145AfuNVUAcx/b 2K4Yq9FGUA8eLCHd89+4QCuB1iEB4J5YabUWKvuo18HY5YC21vKscxYUGR+tsWlIKrL2 63iA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=GgZvyhwz; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id l123-v6si27515209pfl.200.2018.11.14.18.34.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=GgZvyhwz; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D132621191728; Wed, 14 Nov 2018 18:34:15 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::444; helo=mail-pf1-x444.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0095F2119073E for ; Wed, 14 Nov 2018 18:34:13 -0800 (PST) Received: by mail-pf1-x444.google.com with SMTP id g62so5635022pfd.12 for ; Wed, 14 Nov 2018 18:34:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=om9tfJH2csC66s/9P4nOZZiCKYCbxyGHz9dNxsJbg/o=; b=GgZvyhwzi21Lt74QhsJRBhRlPkL0PJpqPUuGcq41VXr3kFO/W6MqxxWWIgtRjlCGtz 5WZuJAnyVeHN8azqppd55nuPrT7JcZsfrTPBPK2OAmS4/e4RrHLwm7tJCJiWj8dli4nd Li/7owZTzCnaGotVzosCY38h6RmS+ih/vHXyM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=om9tfJH2csC66s/9P4nOZZiCKYCbxyGHz9dNxsJbg/o=; b=dVuii6G10LpxeOnsmx03jQWvYHBiRV5T1AGPeaNhxGJqfkBnTeyGuaEdMQI5IncBLA KrvfO6qlObVPjp6tB66RvUFj6JOSADPhtlSG9bIwlNJ6c77z/6mgEmTm+HKUCSpHJfsZ NThqcCYEo2mUluIxMwBULK+h1W/tz14goeuOG/RwX28gPkVx71DQX1g7mzRCYPC9asL8 Tb8Bkc/tf8b5RBmYuN2EKv9ggwaBHH242VJTH56+3rJ0HSJKFZ88bfsQoEZgVG8cB/es lHbSB1y84/2r1Z5VXayUWR4vuAnhicrQntpoYfoW4bNCDgZTuJO2G5674Ip6lx7puicJ XA2w== X-Gm-Message-State: AGRZ1gLWZ0PIBKs15RXR2G9rTw0sCLqXK3o3tybdke/NGZzhEZ++ywxs AWjeivpOiEvtZamEOLuaANnZErpoJMG5lw== X-Received: by 2002:a62:647:: with SMTP id 68-v6mr4733332pfg.42.1542249253512; Wed, 14 Nov 2018 18:34:13 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:12 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:43 -0800 Message-Id: <20181115023353.20159-11-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 10/20] IntelUndiPkg/XGigUndiDxe: drop StdLibC library class reference X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" StdLibc should not be used in drivers (it has dependencies on Shell protocols), but in fact, we don't appear to rely on it in the first place, so just drop the reference. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf | 1 - 1 file changed, 1 deletion(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Jaben Carsey diff --git a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf index beee8aa8134e..b5747565fbea 100644 --- a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf +++ b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf @@ -132,7 +132,6 @@ GCC:*_*_*_CC_FLAGS = -DEFI32 PrintLib UefiLib HiiLib - StdLibC [LibraryClasses.X64] From patchwork Thu Nov 15 02:33:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151148 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6453785ljp; Wed, 14 Nov 2018 18:34:47 -0800 (PST) X-Google-Smtp-Source: AFSGD/Xja+7LTP5Dd83iYLYtH3p5TMEx/Xhh5pKJNgoeivqPl8kS+APepkRYGndtd2kOtFRE2/op X-Received: by 2002:a6b:7403:: with SMTP id s3-v6mr3701081iog.243.1542249287842; Wed, 14 Nov 2018 18:34:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249287; cv=none; d=google.com; s=arc-20160816; b=0TV/ml0db1Gq7SM2SxyLoLrquXk54GDWytRST7SHfd9luAAQRAOkZC3jZAIb+skcRG 9xNuih4gIxCNHUrmbhjM42Q1i8+IsbwAmZiHkU0WMhX5EqG+OCwelDTqZKWToLg9NI1p KDC1fYc67/chiIZCc53jMx5igVd7ooyM0JUJX9QWpBqYDDdFJu88Mw0JM9PhJ6CaQWu1 eh7xHORrpbjK1HyBi4AWp3QVBjk5gJYtj1viA0z/9TEqzxmyLv7/8RY7rA7IY8LpPkij 9IbwspFQdATEpW9ZuoxOamKttg6CPeKEPGTzuW90WoGnjyXm3+hvykxQQtCDQmx03aIq r8ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=hpCsDNiNrUHJ++HGVZIm0b/dIGQyEqYEWseJqG8CLp0=; b=SsMkqSjoVOE9m9edKbrpgzEB2e8Pl7tYtXbRCaxKzQotDTJIbVCJHEWlt5ajzDsnE0 JOLQLUtF73qt7uMauuD4NNc9DjxGIlPZJE/pUaAEJ1Z03GVRiDcMKD6X0CAS89YVike4 PvqwR/c+yFcDUEGXaan9q+9+bbSTZiVzWGzgdpE8GHlsbw5UTGD19HgudHG9BoRejn7K FnszDANeJNfgnTMoocuFo28dfXI4hFlhljcaaUeZ4lalCXuAO1H8iPPk9QTV8LdEpvvx siZpWC2LAvyKyqGHL1IlBoYub/rW/k7F01cEyM3ryShxvobL4Azps05bYIAPHgSOzexj UpsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=XFgBg7ex; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id j82-v6si13682714itj.114.2018.11.14.18.34.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=XFgBg7ex; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1260A2119172D; Wed, 14 Nov 2018 18:34:17 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::544; helo=mail-pg1-x544.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5F85121191728 for ; Wed, 14 Nov 2018 18:34:15 -0800 (PST) Received: by mail-pg1-x544.google.com with SMTP id n2so1102497pgm.3 for ; Wed, 14 Nov 2018 18:34:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=f2bzP2Uxb55u4HIML/SJ1K7PDcK46wBtz0pvf61o4to=; b=XFgBg7exKuJ/qHEStvwbzqEfGJkGetiJNDzM3Ngu/DFlmyG0sHktbWPSVx4f4WykPy dl1cs2VO2drs5iXlJMlAaWO+9j7c6fznksdMZkxZXB2l6gXaza0FSNZsUV9wAxZie5jK cYqUcq55s1yWrPW4On0LlsiWrPAQz2SYpMEOw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=f2bzP2Uxb55u4HIML/SJ1K7PDcK46wBtz0pvf61o4to=; b=gkPjS2Am5Gtz+48mztjwv/sUj8vG6V6hl2hFlpzaA4sb6VjluZThsYFKDDbeCAk5Mw 06x5bm5IIsi28U46FmlUK5g0TEulN4Q3/ws9hNk+lfCQ79xoHokhvao0WCnuKd+AoXL9 5664znStI/ZHhQtx6juw/fDG4wLt/Y4bowRmAAmhrKdwT484rR3Y2C39su6Y6JdNgrrC pKM4VdNXXloc99crR1xRsJCdVgUJkwS7u+9ZpIOJQL7b/y5wRYx6KWPXBeeu4uaZbhFq nRCcCvZ/qQr3kfYmZ/yJHktg/EC6GXDqK4rHiKdLECwjzy1QETq33oJBH7xhd/RHufil AMYw== X-Gm-Message-State: AGRZ1gKfOMVXoMDCd/xZEZyn7owmTU5/YyTzGcP0isZ6vkHfnyTV/mal Cn5IOLQLdu3FmJFxKLR9gd9FNtLLBq87JA== X-Received: by 2002:a63:460a:: with SMTP id t10-v6mr4161650pga.197.1542249254826; Wed, 14 Nov 2018 18:34:14 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:13 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:44 -0800 Message-Id: <20181115023353.20159-12-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 11/20] IntelUndiPkg/XGigUndiDxe: cast XgbeMemCopy () args to correct pointer type X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" XgbeMemCopy () takes UINT8 pointers not INT8 pointers, so cast the arguments to the correct type. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/Xgbe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ryszard Knop diff --git a/IntelUndiPkg/XGigUndiDxe/Xgbe.c b/IntelUndiPkg/XGigUndiDxe/Xgbe.c index 9e3ee862fb4e..0c823efe8963 100644 --- a/IntelUndiPkg/XGigUndiDxe/Xgbe.c +++ b/IntelUndiPkg/XGigUndiDxe/Xgbe.c @@ -542,8 +542,8 @@ XgbeReceive ( // Copy the packet from our list to the EFI buffer. XgbeMemCopy ( - (INT8 *) (UINTN) CpbReceive->BufferAddr, - (INT8 *) (UINTN) ReceiveDescriptor->buffer_addr, + (UINT8 *) (UINTN) CpbReceive->BufferAddr, + (UINT8 *) (UINTN) ReceiveDescriptor->buffer_addr, TempLen ); From patchwork Thu Nov 15 02:33:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151149 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6453837ljp; Wed, 14 Nov 2018 18:34:52 -0800 (PST) X-Google-Smtp-Source: AJdET5dZWfbggBc+a0Z/o4yzA9MhjQglXhLQw9KsUUyCgcItSJJwGZHw6egYa3cpI9i5VIXGEoX1 X-Received: by 2002:a02:2586:: with SMTP id g128-v6mr4188959jag.122.1542249292463; Wed, 14 Nov 2018 18:34:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249292; cv=none; d=google.com; s=arc-20160816; b=Uy1/dLlSPWPh1whoE4BpeZN7rv5S2CiM8bU5lIwf6MVMPzhFfiVZh3JmMjJCandKNg WQonqUU4NuSK8I9un7Bj1+wG2WNtdH4wFA9ohOgLHj9uGIk68V1ctSwLKPPSTKcsiv5Y cDEHjKUOC0uy2xmJ3IP3PBYA7EO/lJDYbzyzO1EGTt0XjeDuDzvIsWmJ1jtHfOhq4x3p z6t3wIdQMom3x1kMzKBRvjJqw8oIgCbrESWcKgPxk8qeasz2QWd65hDMtVnMk9fh90Jg orqC6QTsvVwHmvZKhmmJMbVEbdN3Hkov6aQ9iMr4hhS0knU9Js5JaOzOJnLZRm0ASUXX Tfag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=RgMYdB0mi1o6faJ5COUPotkMFIi3bcCldEtlAIO0pFw=; b=w7Db+ul5LLfNdo93ZzjiZ7O8LIPGFht+WbfsrEw9ANl5qgr0iG84UvknWdMaHHgWVS keQFMhPYCL1anAVNPArWEyuYPRYQGW7S6/hGvaYmD7nb3wAOMMusI88xdJtNVcqPQIao IpLH8zenKrv3nAvRWXLYB4PSq/1og/lSDH2y/AhtbyWtO/165Ie/Erd/n8uoMOqEGgM0 uwHGdlE3Rb5z1w98qP3fPT5EwEtZPd5bZTVNm5wFAD/ovI0T4wFSCES2UIlZVU4lcPee Jmg+7LSNNNXfcH50HNCW3RB/L/s9atG8xAF8Q90OUNA7tOPwaJ/ZKlV5miNVteeM/IwS h+Tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=kLDjHoGH; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id 194-v6si11737577itl.0.2018.11.14.18.34.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=kLDjHoGH; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3C7F02119172F; Wed, 14 Nov 2018 18:34:17 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::441; helo=mail-pf1-x441.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 59D812119073A for ; Wed, 14 Nov 2018 18:34:16 -0800 (PST) Received: by mail-pf1-x441.google.com with SMTP id h3so2352452pfg.1 for ; Wed, 14 Nov 2018 18:34:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WA0g9QT5X2CAPttE9SkZt34mDGB6oEyugFm2y8rhe5o=; b=kLDjHoGHrsKDD2Xe/EoBKSvNMyhjh9N9D6+Kqvi+Wm0AB3ap/jMefi1oA/G9q/L0mJ arIwayrwWWyPrblagreYTNfypFyRC45Je21781Dk4X0TFUtnsyQ1U6jGPSlI1eEEbECP 77FNYfrBwN3m+5+cUcHyzUqkkOpoix8G9l0zA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WA0g9QT5X2CAPttE9SkZt34mDGB6oEyugFm2y8rhe5o=; b=neHbAHLs4EK4DoCGlNirVtCfKtb1uKhH61cETf3mOsB+MhoAhLMZYYTXSsR/ZVqsmt IkaZQH1AfCY6sZyRiiKwDu4zyAfOkEzXjquTgV6bfdCsmN4D7oTVh/D8T/gDEDu+T/BU WT5/GdwKtmWjrZQ5lV3GvefGtNzlNa75Po6kg3LVMR3WD2L4bvOUu36zTDTlID5nPKLr urMEG7H3oow1ueykF6bryCn4965mebaau5Sx2wMlsb1LKiauU525+3LgTBBmRPn80cFQ lYOdhueCIUv5tcUfHFna2QvG6NZCMDg1tR5aImb1mCSChFo8f3BbSSGCLoeDK0U/n/yq Vs1g== X-Gm-Message-State: AGRZ1gJheEFoOOWR5tAEtgD6yXFq9ozoCFNPDUENaXeCPuVI6desUhgm YABpcHXz/CIYRQB/uQhMP6jg0y2ZE8EwYQ== X-Received: by 2002:a63:7d06:: with SMTP id y6mr4103409pgc.171.1542249255757; Wed, 14 Nov 2018 18:34:15 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:15 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:45 -0800 Message-Id: <20181115023353.20159-13-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 12/20] IntelUndiPkg/XGigUndiDxe: don't take address of cast expression X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Taking the address of a cast expression is not permitted in C. Instead, take the address of the variable, and cast the pointer to the desired pointer type. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/Xgbe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ryszard Knop diff --git a/IntelUndiPkg/XGigUndiDxe/Xgbe.c b/IntelUndiPkg/XGigUndiDxe/Xgbe.c index 0c823efe8963..003c3b9065ec 100644 --- a/IntelUndiPkg/XGigUndiDxe/Xgbe.c +++ b/IntelUndiPkg/XGigUndiDxe/Xgbe.c @@ -1264,7 +1264,7 @@ XgbeTxRxConfigure ( IXGBE_WRITE_REG (&XgbeAdapter->Hw, IXGBE_RDBAL (0), (UINT32) (UINTN) (XgbeAdapter->RxRing.PhysicalAddress)); MemAddr = (UINT64) (UINTN) XgbeAdapter->RxRing.PhysicalAddress; - MemPtr = &((UINT32) MemAddr); + MemPtr = (UINT32 *) &MemAddr; MemPtr++; IXGBE_WRITE_REG (&XgbeAdapter->Hw, IXGBE_RDBAH (0), *MemPtr); DEBUGPRINT (XGBE, ("Rdbal0 %X\n", (UINT32) IXGBE_READ_REG (&XgbeAdapter->Hw, IXGBE_RDBAL (0)))); @@ -1337,7 +1337,7 @@ XgbeTxRxConfigure ( XgbeAdapter->XmitDoneHead = 0; // the last cleaned buffer IXGBE_WRITE_REG (&XgbeAdapter->Hw, IXGBE_TDBAL (0), (UINT32) (XgbeAdapter->TxRing.PhysicalAddress)); MemAddr = (UINT64) XgbeAdapter->TxRing.PhysicalAddress; - MemPtr = &((UINT32) MemAddr); + MemPtr = (UINT32 *) &MemAddr; MemPtr++; IXGBE_WRITE_REG (&XgbeAdapter->Hw, IXGBE_TDBAH (0), *MemPtr); DEBUGPRINT (XGBE, ("TdBah0 %X\n", *MemPtr)); From patchwork Thu Nov 15 02:33:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151150 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6453883ljp; Wed, 14 Nov 2018 18:34:58 -0800 (PST) X-Google-Smtp-Source: AJdET5dzPU4OAv+rCxyU7xyBGL1dPqka1kiZrc5dcqN8fMDyYbmo2GIWjkpncwnsXauwBPm90a7/ X-Received: by 2002:a02:516:: with SMTP id e22mr4028778jad.82.1542249298118; Wed, 14 Nov 2018 18:34:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249298; cv=none; d=google.com; s=arc-20160816; b=FcMBYs1ja8x4/r4p4ttFoO1cssZ/xA8JCsD+WckyxD7sa7fzEvI/5bA4W+TlASmX7y ClEsPRyLPU6OdGKKZOkTv53UWWyQhxk8IoQFXnB7DUZAjSIk4lUXauTjB41f78PRgOJF fFdv4XMZGqdX/YHb9/8eN2TMlNbB9oyJgVU6OTzluv6iIVPnozjgLrmIe7PNNQ2gvN3H k7Q/lb47VI/8RK7UZ2xy/BVDijp/cWm2oXkb9JlCFZ7VOt6nmC7fncs0oJ5gZYxmQZyB QDoP69t60EmRS5HF1z+o0ltpZXbOPNTvkABkU/1xpAq9KlFCJPwRHlOLU0FT9mNFabTg m2ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=9XMTnVQUDQeQ7LCutlgbVTdpjK0awlbO0IXeKFZ3xHU=; b=oZeVPapk8mdPJ/08MJddI411LXa9Pc+L29EtkbnRsEVxEKO029afhtXO467xA5iTHz 0BvIPwSnF9rpljPoz4xetGTLYZx7p0/7vFFEAqLJwG5LqTG5HJvOW7fNHImSeis1HRPX iEYPjp/xREeIjGehZIoJ/FMdKsYBzYGOHvqLI1ekwZ9Y3vIX8l8zZrrb9PGz20EmA6YQ /aChP5nQgwuL2VPztMxNXe+aVCiUwprewL3TQ5f2cZst5IIVeScVwfM7uDe7pTtW65R3 C7OKMV4Ka4Dp/OPfAkY/mKvGtUV9xllaerpouKPchN5jMH5ajeSRLNuXYfsh+x/CNUmW OrOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="F/GoI5FT"; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id j194-v6si14018168ite.41.2018.11.14.18.34.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="F/GoI5FT"; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 68C7521191735; Wed, 14 Nov 2018 18:34:19 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::541; helo=mail-pg1-x541.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id AC6E121CAD998 for ; Wed, 14 Nov 2018 18:34:17 -0800 (PST) Received: by mail-pg1-x541.google.com with SMTP id w7so8261988pgp.13 for ; Wed, 14 Nov 2018 18:34:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VcMu6zXTZPV5LMiarF8ees167dAhLAOad3RC1uYRdFA=; b=F/GoI5FT4DkBdbuTpiLfeBmPvgvynMxHBwkk11j4U3qzl8dWuktTJUhQQmgV2+tGI/ zSDR37RJZuxUD5dUVjriBhfcS8ZOCQKHnpO+O9BuC55SYfqeb/oKBKXTm743FQxWHp2J c4BzeC/yZJQr7xqIIIJQuTrOdgkWBQ/HU1Xwc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VcMu6zXTZPV5LMiarF8ees167dAhLAOad3RC1uYRdFA=; b=dG+kAbj1aMIMDaoqr4MEDqUpjh2MWn4Ru6uIrZFxt2zXAigtXjWkyy11/kj+KiH6Ow 0l03GVJiGF/24c3wXKS1JBoJtMq8AHkWfxU97k0TqI4du1usJiwg6SKpy+QHSQ/Y9v9E 7oBw3GjECZ2hCFDwR9Hpvxh+ycdpBydXHu0t2W+Ct2rim7zj5cxdoP66tLUpxywEZVOt PzhGjBdN0uHsau2WWM66PyLjW+otCPCRkj2Jf4u0Iw/f9xi647dbJVaJOrrJHck+ZXmY vrbaT0XwIyDdadOMhgWQVsloVDfWal0C/D1ohxM4NIm7OsrYHj9j4vb4pNVyHwqhZIpV OCvg== X-Gm-Message-State: AGRZ1gJTcFuRAsMJCWlSMqck+5WyGeCmrLu+SVqgGSk+CWssKZbVo4SA qoP8loE8J7+rB8h6g0GmY+8C8xLjdARsLw== X-Received: by 2002:a63:8549:: with SMTP id u70mr4123076pgd.401.1542249257028; Wed, 14 Nov 2018 18:34:17 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:16 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:46 -0800 Message-Id: <20181115023353.20159-14-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 13/20] IntelUndiPkg/XGigUndiDxe: drop locally defined ASSERT() macro X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Drop the locally defined ASSERT() macro and include DebugLib instead. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h | 22 +------------------- 1 file changed, 1 insertion(+), 21 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h b/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h index e324b0539782..aa3b3543cb79 100644 --- a/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h +++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h @@ -41,6 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include +#include #include #define CHAR CHAR8 @@ -219,26 +220,6 @@ IxgbeReverseDword ( typedef BOOLEAN boolean_t; -#if 0 -#undef ASSERT -#define ASSERT(x) -#define DEBUGOUT Aprint -#define DEBUGOUT1 Aprint -#define DEBUGOUT2 Aprint -#define DEBUGOUT3 Aprint -#define DEBUGOUT6 Aprint -#define DEBUGOUT7 Aprint -#else /* 1 */ -#undef ASSERT - -/** ASSERT macro left blank - - @param[in] x Assert condition - - @return None -**/ -#define ASSERT(x) - /** Macro wrapper for shared code DEBUGOUT statement, blank here @@ -311,7 +292,6 @@ typedef BOOLEAN boolean_t; @retval None **/ #define DEBUGOUT7(s, a, b, c, d, e, f, g) -#endif /* 0 */ /** Macro wrapper for shared code EWARN macro, blank here From patchwork Thu Nov 15 02:33:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151151 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6453951ljp; Wed, 14 Nov 2018 18:35:03 -0800 (PST) X-Google-Smtp-Source: AJdET5dA1cu1B6/tLRjPhSadADfiWO39uSIo4Hlw8s4OcQCV4D0mjntUHC7v5BzN4iWg8zWQSzMe X-Received: by 2002:a63:fb46:: with SMTP id w6mr4141197pgj.321.1542249303066; Wed, 14 Nov 2018 18:35:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249303; cv=none; d=google.com; s=arc-20160816; b=Ix1GOW7DKNqKEHdDfYj2SC8cTpFL++BCnKy8ukfZfixI/EbYQ3Jy+qWGKxhKIDUXxL dGOkAbWp70BJiBH0KiiP8d1i7YPmxWnJYfQM9uVLbom4kvyFwHblVWGI/K15ySp70s2j 9yUQZpGsrqfcUxYS2hhO0iTLVJOUSE/N9bY8r54azzC7cKZ/CkxMiY6rlhoWam8qx73v 7qgMpoweS8+ztc64vA80npVgcJvZDmoOJXw2+v7qHWZX4EkbMt/E66N8v2GDQhGRACdz h5fysXmU+/UAXLT/VP6e6IN5ErjXk2WXIxnzKT3sd4+K6f5XtNwhF2ucsHhDSH6neQOk Heuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=zclBwa169wxWC+TzyYxFIzbZho74XlPhNMPXfwLbSgg=; b=zcq3xGe/tcHRRw8QIW3U0+370s08rNsApVdXjUhG57YO6t7084YB1tBCUTBgple7BC ETWaET1Ax7UvX4p96YwNq2nCovRGvzEhSIG+k1ASEST2Y34YgsqR9SDiY+fkUwX9ol+F Z+N7doWmaFbY8qc+X5rWip5bt58VsUK62HStXoUi8iYGlJH/H2msrIxxggx1/j8IMxsv yP3+Qk9l9PriADk0fQW9PHu1aVjsampobkPmkEkg7PYl3SUvBPscDN6Ga5TBZpQlO66t v05161C3DzQ+UrkOTqUNTGkw2kjJMD9j5DiVVYdyed/x9JVJ7AO3sGe5mya9LsUSJorE hUig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="S/qS0trY"; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id y5-v6si22869124pfk.172.2018.11.14.18.35.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:35:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="S/qS0trY"; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 9666B2119172C; Wed, 14 Nov 2018 18:34:20 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::643; helo=mail-pl1-x643.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9DBCA21CAD998 for ; Wed, 14 Nov 2018 18:34:18 -0800 (PST) Received: by mail-pl1-x643.google.com with SMTP id y6-v6so1152949plt.3 for ; Wed, 14 Nov 2018 18:34:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8YU++YDkDZ9tsKYEAXS4ooUFkn4YXy1Y/XZGtjjRdyI=; b=S/qS0trYIwYqRTB/HArPixjm/3/0HIp6FHt7Y8cCkkDPRPrtkM+LDhl1xYU3/C1uYX 4Bd/rUwVuninkKPDREGXQFwpW3aauf0O9bKNDlfwZv24YADeYwdqy8VSxHVdyB2Oy2t5 nSb6HKIG/eA6UuKAw0Qzx9ir1/4zV7Vxfy/ZU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8YU++YDkDZ9tsKYEAXS4ooUFkn4YXy1Y/XZGtjjRdyI=; b=T/sozSodpNURkuYcMrTQCw1KZhoUv/Z1aAyZjkhVq8/7DaLvNpdKE7R8iPzOy9kmjf PWXgiipadKdCTFKooNVbC7mGJ5h/4koIPu2gjJdp0EGz94uiWCHZAxWgGPrCHF9cJe1P 0ezweIu8u2Q2jcCvrWr1GKcQvHUoqs32NkC1XaylCx5kb4VAwcCnwiI910TALBiqUGT7 zEmBvsGbobH+ZjiUU6GZm3N8PuvYXrbw8XWEvK0Wl69N4EIbEjtz6dqajMuiVSxgaH6m sFPE612GUZLq8lU3T72BuiCa6hEU1SIwDyPvxyJqI/zBEj3mxDOKzZNHkV3zBHG2/cwH ByFg== X-Gm-Message-State: AGRZ1gLb8ON3G/108H20DSQTmGLXvaf8IzDWDuVuDpdSwsHmaUzK4Cc7 gziWtvpWxXLvro1OHKIwan3OtGq7Jr9tKg== X-Received: by 2002:a17:902:e08d:: with SMTP id cb13-v6mr1067326plb.196.1542249258160; Wed, 14 Nov 2018 18:34:18 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:17 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:47 -0800 Message-Id: <20181115023353.20159-15-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 14/20] IntelUndiPkg/XGigUndiDxe: redefine UNREFERENCED_nPARAMETER macros for GCC X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Use (VOID) casts to silence unreferenced parameter warnings on GCC. The existing macros generate 'statement with no effect' warnings instead, which does not really help. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/ixgbe_type.h | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ryszard Knop diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_type.h b/IntelUndiPkg/XGigUndiDxe/ixgbe_type.h index e3bb1a8a313e..f67bfbfc2a9f 100644 --- a/IntelUndiPkg/XGigUndiDxe/ixgbe_type.h +++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_type.h @@ -4411,11 +4411,19 @@ struct ixgbe_hw { #define IXGBE_NOT_IMPLEMENTED 0x7FFFFFFF #ifndef UNREFERENCED_XPARAMETER +#ifdef _MSC_VER #define UNREFERENCED_XPARAMETER #define UNREFERENCED_1PARAMETER(_p) (_p); #define UNREFERENCED_2PARAMETER(_p, _q) (_p); (_q); #define UNREFERENCED_3PARAMETER(_p, _q, _r) (_p); (_q); (_r); #define UNREFERENCED_4PARAMETER(_p, _q, _r, _s) (_p); (_q); (_r); (_s); +#else +#define UNREFERENCED_1PARAMETER(_p) (VOID)(_p) +#define UNREFERENCED_2PARAMETER(_p, _q) (VOID)(_p); (VOID)(_q); +#define UNREFERENCED_3PARAMETER(_p, _q, _r) (VOID)(_p); (VOID)(_q); (VOID)(_r); +#define UNREFERENCED_4PARAMETER(_p, _q, _r, _s) (VOID)(_p); (VOID)(_q); (VOID)(_r); (VOID)(_s); +#define UNREFERENCED_5PARAMETER(_p, _q, _r, _s, _t) (VOID)(_p); (VOID)(_q); (VOID)(_r); (VOID)(_s); (VOID)(_t); +#endif #endif #define IXGBE_FUSES0_GROUP(_i) (0x11158 + ((_i) * 4)) #define IXGBE_FUSES0_300MHZ (1 << 5) From patchwork Thu Nov 15 02:33:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151152 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6454014ljp; Wed, 14 Nov 2018 18:35:08 -0800 (PST) X-Google-Smtp-Source: AJdET5eivnrlpnzmJh9AutkH+xO4zSCtD2XYEdYGw1pTwvsDUgZgTY+J8IkKl4fFZ07Lm2q5jsBE X-Received: by 2002:a6b:be41:: with SMTP id o62-v6mr3424579iof.255.1542249308292; Wed, 14 Nov 2018 18:35:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249308; cv=none; d=google.com; s=arc-20160816; b=VVanZJ7ldpmG94R/VOLLbjg+7RRkry+5VYT2Ger+w/YAqNcPQHxOiL4R8O5Pmofo7l 42j0dPvRXjaW8t4p0VJoU0GJ0xYcE1iDPA0SrVNgliZJo+ePJ6A02x3GiTFIy8ykW+9x KAnQPrxHADvY1NMmHPop223AVVe78iUmEKp6S7Snm0RoqYYMh4x6vpediDz6fAFELi4t LNoCDR3/FFM+Gmo9/4Q9wI/GCTYGPWm8Ve92kClswNkVOEEC6uoSBm4OnvdRvAVZrflV b6f9R1csN7/aKdOCMc0bhvMGeMFs+joj6EjFm9QOi1BQ5uc+2umAvw50WXN4jM6zDQlU AhIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=VN3S2l049IqEIUfnfx2D6lDP3i6KSmQAbwrE+mmcGZg=; b=J/RM7Dde5aFHrXoABvzyF8nqjsWSonXHQMCT/z3UAWawiMibYgHCS4pLsZwqqX/8AD 7jV5S+dhfsuYC9prHTkvpmJg7pP8osCWetVGxavIQxTVa3n1sJCnPeOKcJ7R7GS9UhA+ NPizNUmYxvKufIdR+75ZmQl8aqDdJw//yvrFFZETW340GCvAwRvu6YhPN/xVu36EeTjk TBlHaquuqy9nbeyrWc5OFiW+ZJSpgz4JsZPCN8FyIiAikSDpo7TT52lR3Tky3KZG8HBf h7xJixwmLNmJP+bGbwi9qfoguONGTSS6jIDwND6KUKoEKE6T/UTPN9nN/MRv1XeGDgKG J4pQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=YoouDz4f; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id m17si7218366jah.76.2018.11.14.18.35.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:35:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=YoouDz4f; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id BEC4C2119173B; Wed, 14 Nov 2018 18:34:20 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::444; helo=mail-pf1-x444.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 19DD62119073A for ; Wed, 14 Nov 2018 18:34:20 -0800 (PST) Received: by mail-pf1-x444.google.com with SMTP id v68-v6so8910414pfk.0 for ; Wed, 14 Nov 2018 18:34:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aseRhwKhZyCp0AXOSzd/RejiRY1+oa9MAnJC3d4QZSU=; b=YoouDz4f4amrHv6a9NPICSkqlZ+mdoFu0Yc6px+2LXMBEx+uSJDkfXhq6NSpkJ3d5u SAAQaSZUeTVl3Aja5Ewi0IcViDaN0kyxqiUSd3wO4bnYAkVAova178FXOa4CSTjRNj6F cuv72goSOdSXosK0mdkDjL+RsSmeuspNlU6N0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aseRhwKhZyCp0AXOSzd/RejiRY1+oa9MAnJC3d4QZSU=; b=SukJGru6NivOPp4yJf6NcRwXX7aBPQzKfgAqpyQFqDTlc4rXOliXFin+LzG9JZ7oGM S/vyhT0xOtTfcjB+KZYB09M+kvIIGr/CIHq8q4TDZCyrJDj2knL83PUCiQAFmw5/K55c EIV98XF/JUvVdP4PX8BtKXl4pU2ZBXNJTtbLa9fo5X2o4JfEjh+b2l7al85hCcgUn62t 0dZeMvFkSfXxd+E5JTAdL33UFTC1F+AD5dDLvOo3ZvzAJGodDo3/2zykkfuHDfVP4mc1 07IjtodNrchzIpbHqsUaRZ5Zr0cvWoRTpFyHvxgiewC2hulrf8UkSlKMDxz7ujoUCYCS GGfg== X-Gm-Message-State: AGRZ1gJticnIcjnbPfqU0v6sDLFZqqkxgXpHY61OocHjPi2KU7SDddyZ kExfztPowBr0LtaI7B2iQyi/NaveAd9Ehg== X-Received: by 2002:a63:d441:: with SMTP id i1-v6mr4070513pgj.31.1542249259493; Wed, 14 Nov 2018 18:34:19 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:18 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:48 -0800 Message-Id: <20181115023353.20159-16-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 15/20] IntelUndiPkg/XGigUndiDxe: use intermediate UINTN casts for pointers X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Use intermediate (UINTN) casts when casting pointers to UINT64. This is needed to be able to build this code for 32-bit architectures such as ARM or IA32. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/Dma.c | 8 ++++---- IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c | 4 ++-- IntelUndiPkg/XGigUndiDxe/Init.c | 6 +++--- IntelUndiPkg/XGigUndiDxe/Xgbe.c | 8 ++++---- IntelUndiPkg/XGigUndiDxe/Xgbe.h | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ryszard Knop diff --git a/IntelUndiPkg/XGigUndiDxe/Dma.c b/IntelUndiPkg/XGigUndiDxe/Dma.c index c8588df96ef5..79a5cefe9f41 100644 --- a/IntelUndiPkg/XGigUndiDxe/Dma.c +++ b/IntelUndiPkg/XGigUndiDxe/Dma.c @@ -127,7 +127,7 @@ FREE_BUF_ON_ERROR: PciIo->FreeBuffer ( PciIo, BytesToPages (DmaMapping->Size), - (VOID *) DmaMapping->UnmappedAddress + (VOID *)(UINTN)DmaMapping->UnmappedAddress ); DmaMapping->Size = 0; DmaMapping->UnmappedAddress = 0; @@ -173,7 +173,7 @@ UndiDmaFreeCommonBuffer ( PciIo->FreeBuffer ( PciIo, BytesToPages (DmaMapping->Size), - (VOID *) DmaMapping->UnmappedAddress + (VOID *)(UINTN)DmaMapping->UnmappedAddress ); DmaMapping->UnmappedAddress = 0; @@ -209,7 +209,7 @@ UndiDmaMapCommonBuffer ( return PciIo->Map ( PciIo, EfiPciIoOperationBusMasterCommonBuffer, - (VOID *) DmaMapping->UnmappedAddress, + (VOID *)(UINTN)DmaMapping->UnmappedAddress, &DmaMapping->Size, &DmaMapping->PhysicalAddress, &DmaMapping->Mapping @@ -243,7 +243,7 @@ UndiDmaMapMemoryRead ( return PciIo->Map ( PciIo, EfiPciIoOperationBusMasterRead, - (VOID *) DmaMapping->UnmappedAddress, + (VOID *)(UINTN)DmaMapping->UnmappedAddress, &DmaMapping->Size, &DmaMapping->PhysicalAddress, &DmaMapping->Mapping diff --git a/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c b/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c index 66dc67a5400e..2f9c66771910 100644 --- a/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c +++ b/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c @@ -119,11 +119,11 @@ XgbeUndiRunPhyLoopback ( DEBUGPRINT (DIAG, ("CpbReceive.BufferAddr allocated at %x\n", (UINTN) CpbReceive.BufferAddr)); while (j < PHY_LOOPBACK_ITERATIONS) { - ZeroMem ((VOID *) CpbReceive.BufferAddr, RX_BUFFER_SIZE); + ZeroMem ((VOID *)(UINTN)CpbReceive.BufferAddr, RX_BUFFER_SIZE); Status = XgbeTransmit ( XgbeAdapter, - (UINT64) &PxeCpbTransmit, + (UINT64)(UINTN)&PxeCpbTransmit, PXE_OPFLAGS_TRANSMIT_WHOLE ); diff --git a/IntelUndiPkg/XGigUndiDxe/Init.c b/IntelUndiPkg/XGigUndiDxe/Init.c index 03e3942a1944..c112db667148 100644 --- a/IntelUndiPkg/XGigUndiDxe/Init.c +++ b/IntelUndiPkg/XGigUndiDxe/Init.c @@ -260,7 +260,7 @@ InitUndiPxeStructInit ( PXE_ROMID_IMP_TX_COMPLETE_INT_SUPPORTED | PXE_ROMID_IMP_PACKET_RX_INT_SUPPORTED; - PxePtr->EntryPoint = (UINT64) UndiApiEntry; + PxePtr->EntryPoint = (UINT64)(UINTN)UndiApiEntry; PxePtr->MinorVer = PXE_ROMID_MINORVER_31; PxePtr->reserved2[0] = 0; @@ -1099,7 +1099,7 @@ InitUndiCallbackFunctions ( NicInfo->MapMem = (VOID *) 0; NicInfo->UnMapMem = (VOID *) 0; NicInfo->SyncMem = (VOID *) 0; - NicInfo->UniqueId = (UINT64) NicInfo; + NicInfo->UniqueId = (UINT64)(UINTN)NicInfo; NicInfo->VersionFlag = 0x31; } @@ -1284,7 +1284,7 @@ InitNiiProtocol ( EFI_STATUS Status; - NiiProtocol31->Id = (UINT64) (mIxgbePxe31); + NiiProtocol31->Id = (UINT64)(UINTN)(mIxgbePxe31); // IFcnt should be equal to the total number of physical ports - 1 NiiProtocol31->IfNum = mIxgbePxe31->IFcnt; diff --git a/IntelUndiPkg/XGigUndiDxe/Xgbe.c b/IntelUndiPkg/XGigUndiDxe/Xgbe.c index 003c3b9065ec..6769f2dc72ab 100644 --- a/IntelUndiPkg/XGigUndiDxe/Xgbe.c +++ b/IntelUndiPkg/XGigUndiDxe/Xgbe.c @@ -1237,7 +1237,7 @@ XgbeTxRxConfigure ( ZeroMem (XgbeAdapter->TxBufferMappings, sizeof (XgbeAdapter->TxBufferMappings)); - RxBuffer = (LOCAL_RX_BUFFER *) XgbeAdapter->RxBufferMapping.PhysicalAddress; + RxBuffer = (LOCAL_RX_BUFFER *)(UINTN)XgbeAdapter->RxBufferMapping.PhysicalAddress; DEBUGPRINT ( XGBE, ("Local Rx Buffer %X size %X\n", @@ -1407,17 +1407,17 @@ XgbeInitialize ( TempBar = NULL; ZeroMem ( - (VOID *) XgbeAdapter->RxRing.UnmappedAddress, + (VOID *)(UINTN)XgbeAdapter->RxRing.UnmappedAddress, RX_RING_SIZE ); ZeroMem ( - (VOID *) XgbeAdapter->TxRing.UnmappedAddress, + (VOID *)(UINTN)XgbeAdapter->TxRing.UnmappedAddress, TX_RING_SIZE ); ZeroMem ( - (VOID *) XgbeAdapter->RxBufferMapping.UnmappedAddress, + (VOID *)(UINTN)XgbeAdapter->RxBufferMapping.UnmappedAddress, RX_BUFFERS_SIZE ); diff --git a/IntelUndiPkg/XGigUndiDxe/Xgbe.h b/IntelUndiPkg/XGigUndiDxe/Xgbe.h index 4472cfb4fa31..2a904de5bf2f 100644 --- a/IntelUndiPkg/XGigUndiDxe/Xgbe.h +++ b/IntelUndiPkg/XGigUndiDxe/Xgbe.h @@ -221,7 +221,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @return Descriptor retrieved **/ #define XGBE_RX_DESC(R, i) \ - (&(((struct ixgbe_legacy_rx_desc *) ((R)->UnmappedAddress))[i])) + (&(((struct ixgbe_legacy_rx_desc *)(UINTN)((R)->UnmappedAddress))[i])) /** Retrieves TX descriptor from TX ring structure @@ -231,7 +231,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @return Descriptor retrieved **/ #define XGBE_TX_DESC(R, i) \ - (&(((struct ixgbe_legacy_tx_desc *) ((R)->UnmappedAddress))[i])) + (&(((struct ixgbe_legacy_tx_desc *)(UINTN)((R)->UnmappedAddress))[i])) /** Retrieves UNDI_PRIVATE_DATA structure using NII Protocol 3.1 instance From patchwork Thu Nov 15 02:33:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151153 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6454082ljp; Wed, 14 Nov 2018 18:35:13 -0800 (PST) X-Google-Smtp-Source: AJdET5cJ3nY62TbAYbUg1r25JtDg1ey3615mx+Dz0vSPzsFvix7RtakmrLMILL6kjcy8sGxJaHby X-Received: by 2002:a6b:bfc2:: with SMTP id p185-v6mr3885854iof.38.1542249313532; Wed, 14 Nov 2018 18:35:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249313; cv=none; d=google.com; s=arc-20160816; b=PqGO0PyMN4d09ZdJPwwKWyZAQqAfLGSLqwyT3r4POwG6KemUT42IgBykD3DTW0f74V 5BF03x4WP7wIAgZnDMRyJ0FikdLn1ilaPR4EAJ2qJYGiYZW5N7BMu7CwUBdW+f91tQMH x3SZyiL1/bIfYABnC89MBVVWRu5aJ50UzTgUm/gdCut4W2ug6TgnffmRwNxqZ0Qr5upU 1Cx3hD41ucCG7/eGgplG8LsHK1788a8OryhzRURLn7cDOZZol+SuFfuIDrPH9Adhb3Ng IS0CUMW10mnUXl+8GtBTC04ntVXBh2R9913uzeq7gRV6rWbP9hAvAVcnIP6DhJ0/nsP9 ldEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=UxfET2iyTnmUbxP3LwBiTjoU07JkNmFPJqijOqYcVdQ=; b=qEcR7wAJSpVVCKpjpYxMVE9TzqYo92GgiBDPwC6gBT+kJcqQuHowGmnPTZpmJp/xu3 aaS6tIfhmlbr0CvxK2oKkK9AdRIIGkMPTN7RHcI6dVySOclBqKJihoNL/AiP8Z+MXVqO JLx5YkIaCA81ECP0mHFsaTrZvbR+6JBIeIwhTNy2aCvd0jvJgcAW1K1GWprdMCwFbz8r PGcyBxQPXH+9UjExJKfwWYQHtXkPmvW8mvn6B3zoxJOm/QnJEeqXpXDARWF9R1hO7zwv 2fmmMO58+R9hP6RP+2AzhpP4o2a0MdsjEdQHtIb013n05p1TiKwl+gV9DcJzUoI87PJF 6dNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Dau8uHz3; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id b68-v6si18927377jai.68.2018.11.14.18.35.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:35:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Dau8uHz3; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id EA0822119173F; Wed, 14 Nov 2018 18:34:21 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::541; helo=mail-pg1-x541.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1D7BC21191739 for ; Wed, 14 Nov 2018 18:34:21 -0800 (PST) Received: by mail-pg1-x541.google.com with SMTP id w3-v6so8259999pgs.11 for ; Wed, 14 Nov 2018 18:34:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XZsatKNchnoIx7N3MmvGSZf4KDV3cZ0L8e/2cbI1RLk=; b=Dau8uHz35I/3Qz+Y3LsTfO4K9sVgLC3ra+jEX5h7GvFYToUeYC5YO1dHDh2BA6atHi U1BrYgqFPUy16p/x8QV+F1AiLNxvK9mfbOqwmkxC9SJ5J0QXcW7v8PkDxoFAWd6iv8ld TXDkvHVGTEExRWVk158ZyNt0gUMEIP/vAnI5I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XZsatKNchnoIx7N3MmvGSZf4KDV3cZ0L8e/2cbI1RLk=; b=B4k4v4wcxVs+Tp/0v4Kl2nq3mRa9dXTmJnkxOBkLKYyRDX94WSdTjy1Y11eaNHmcbp bpOP/cb2g2wRsMnwfipppq1afGYPbF2ay2mB+F1sv5om5gCeJBZAwSEJivsidrnSRsDE NoP9TkM7jvJ7ZRZjznnd6XJehgMPsp9nqLti8NsABd3WImlPcqNKMTcyEKrhEbFuSyR+ vgfYfri+MqXFbALulFtNR9n1Ij0JZeicyvRM1chL9x2sOKa4C7nba72G0NPUsIy8Ermx tS1IofwJb9BnULmIAi0TGpLWWRbOoaFUypEc3Ocirx2ScO1deLPfU6sBtAVbh7bkjdw9 teDg== X-Gm-Message-State: AGRZ1gK+KA1xgb1wgwNWLn29kL+gytvVPtWkzDO1El8UMphX+Fa5ZNlO fZroPviIYB6nZT0MhU9gse2taW0YSCeA4A== X-Received: by 2002:a63:42c1:: with SMTP id p184mr4098267pga.202.1542249260596; Wed, 14 Nov 2018 18:34:20 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:19 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:49 -0800 Message-Id: <20181115023353.20159-17-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 16/20] IntelUndiPkg/XGigUndiDxe: add missing EFIAPI modifiers X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" When building for the X64 target using GCC, correct use of the EFIAPI modifiers is essential to ensure that the correct calling convention is used. So add the missing ones where appropriate. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/AdapterInformation.c | 3 +++ IntelUndiPkg/XGigUndiDxe/ComponentName.c | 2 ++ IntelUndiPkg/XGigUndiDxe/ComponentName.h | 1 + IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c | 1 + IntelUndiPkg/XGigUndiDxe/DriverHealth.c | 2 ++ IntelUndiPkg/XGigUndiDxe/StartStop.c | 2 ++ 6 files changed, 11 insertions(+) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ryszard Knop diff --git a/IntelUndiPkg/XGigUndiDxe/AdapterInformation.c b/IntelUndiPkg/XGigUndiDxe/AdapterInformation.c index 26556e284381..b25ed7c4f022 100644 --- a/IntelUndiPkg/XGigUndiDxe/AdapterInformation.c +++ b/IntelUndiPkg/XGigUndiDxe/AdapterInformation.c @@ -123,6 +123,7 @@ GetIpv6SupportInformationBlock ( **/ STATIC EFI_STATUS +EFIAPI GetInformation ( IN EFI_ADAPTER_INFORMATION_PROTOCOL *This, IN EFI_GUID * InformationType, @@ -188,6 +189,7 @@ GetInformation ( **/ STATIC EFI_STATUS +EFIAPI SetInformation ( IN EFI_ADAPTER_INFORMATION_PROTOCOL *This, IN EFI_GUID * InformationType, @@ -234,6 +236,7 @@ SetInformation ( **/ STATIC EFI_STATUS +EFIAPI GetSupportedTypes ( IN EFI_ADAPTER_INFORMATION_PROTOCOL *This, OUT EFI_GUID ** InfoTypesBuffer, diff --git a/IntelUndiPkg/XGigUndiDxe/ComponentName.c b/IntelUndiPkg/XGigUndiDxe/ComponentName.c index 2972c28bda4e..eee59d7c14f4 100644 --- a/IntelUndiPkg/XGigUndiDxe/ComponentName.c +++ b/IntelUndiPkg/XGigUndiDxe/ComponentName.c @@ -116,6 +116,7 @@ ComponentNameInitializeControllerName ( language specified by Language. **/ EFI_STATUS +EFIAPI ComponentNameGetDriverName ( IN EFI_COMPONENT_NAME_PROTOCOL *This, IN CHAR8 * Language, @@ -186,6 +187,7 @@ ComponentNameGetDriverName ( language specified by Language. **/ EFI_STATUS +EFIAPI ComponentNameGetControllerName ( IN EFI_COMPONENT_NAME_PROTOCOL * This, IN EFI_HANDLE ControllerHandle, diff --git a/IntelUndiPkg/XGigUndiDxe/ComponentName.h b/IntelUndiPkg/XGigUndiDxe/ComponentName.h index f63d58b8a18c..4f62e48379ed 100644 --- a/IntelUndiPkg/XGigUndiDxe/ComponentName.h +++ b/IntelUndiPkg/XGigUndiDxe/ComponentName.h @@ -67,6 +67,7 @@ ComponentNameInitializeControllerName ( language specified by Language. **/ EFI_STATUS +EFIAPI ComponentNameGetDriverName ( IN EFI_COMPONENT_NAME_PROTOCOL *This, IN CHAR8 * Language, diff --git a/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c b/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c index 2f9c66771910..77b7a954698b 100644 --- a/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c +++ b/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c @@ -370,6 +370,7 @@ XgbeUndiPhyLoopback ( ChildHandle did not pass the diagnostic. **/ EFI_STATUS +EFIAPI XgbeUndiDriverDiagnosticsRunDiagnostics ( IN EFI_DRIVER_DIAGNOSTICS_PROTOCOL * This, IN EFI_HANDLE ControllerHandle, diff --git a/IntelUndiPkg/XGigUndiDxe/DriverHealth.c b/IntelUndiPkg/XGigUndiDxe/DriverHealth.c index df6cfdf8a123..4b173bc8d8a9 100644 --- a/IntelUndiPkg/XGigUndiDxe/DriverHealth.c +++ b/IntelUndiPkg/XGigUndiDxe/DriverHealth.c @@ -45,6 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @retval !EFI_SUCCESS Failure to retrieve health status **/ EFI_STATUS +EFIAPI GetHealthStatus ( IN EFI_DRIVER_HEALTH_PROTOCOL * This, IN EFI_HANDLE ControllerHandle, OPTIONAL @@ -145,6 +146,7 @@ GetHealthStatus ( @retval EFI_UNSUPPORTED This function is unsupported **/ EFI_STATUS +EFIAPI Repair ( IN EFI_DRIVER_HEALTH_PROTOCOL *This, IN EFI_HANDLE ControllerHandle, diff --git a/IntelUndiPkg/XGigUndiDxe/StartStop.c b/IntelUndiPkg/XGigUndiDxe/StartStop.c index 156e927a35c6..c881c811aefb 100644 --- a/IntelUndiPkg/XGigUndiDxe/StartStop.c +++ b/IntelUndiPkg/XGigUndiDxe/StartStop.c @@ -38,6 +38,7 @@ EFI_GUID gEfiStartStopProtocolGuid = EFI_DRIVER_STOP_PROTOCOL_GUID; @retval EFI_SUCCESS Driver is stopped successfully **/ EFI_STATUS +EFIAPI StopDriver ( IN EFI_DRIVER_STOP_PROTOCOL *This ) @@ -63,6 +64,7 @@ StopDriver ( @retval EFI_DEVICE_ERROR Failed to initialize hardware **/ EFI_STATUS +EFIAPI StartDriver ( IN EFI_DRIVER_STOP_PROTOCOL *This ) From patchwork Thu Nov 15 02:33:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151154 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6454110ljp; Wed, 14 Nov 2018 18:35:18 -0800 (PST) X-Google-Smtp-Source: AJdET5cTTIpPvr9PGjoxF9jaajHlpTNAu2tTbRSish92QQ33SJ4DYjWcBq/wkUkFVA6AFdmoPE88 X-Received: by 2002:a63:2109:: with SMTP id h9mr4057582pgh.277.1542249317777; Wed, 14 Nov 2018 18:35:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249317; cv=none; d=google.com; s=arc-20160816; b=CG8Qpg9SmOwa4IxKvAW4pc6U12cNfJ7lC2BWCmgzpSuprWgYtFBKmjlQaWccvo0oxx P/Di8Y6dQDvd2TyFzDb7FQde5l2BvdG9qWZLIun13BCLtn4EGwPSwyM22rda1wAFcqoy 5hv+4q0Ke57I8jGW02GveI0Ij0DeQ0LNwgbJLiF5ttwjR9yP1BI+5OowDunKMMWjk7C3 NENo0MEymmc07lpfM9gtqvcCvgulCXq/BJeHXH+8IlDXoFAKbf5w+F0J0A96f6iS4yDI Nv4Pru9zUcquryh6aGDpv8/FRZ6DmkZIuF5IxTB2LtGxQUFiAVISAxAIIWnHU01tGdAF jyZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=W1EdcwhL+7TW6uaT2wgVJdYyMrPLMqcCFBE5Cyrd+Gc=; b=0hx/zU+U9sAtqCWMIUWfnnI47hbqw2/H00NT0VWpB3EXK0aqTMZjCYHKHL9ZjNKdSn jquIyUhRRgIcTdwAwwpQmBJTjukV1s/W6G63Ep8vTjIYL4HB6C5Wll/lakHAi07m6d4u F1Z4l6GOUhfLNwJJIR5nqIe0XT5eZVP1aIyOueCZpK3GBjEMFZTC8yPi6veFQoeooTYd CW6oVTU5TLW2NrvHz5RG6sbGxu8OJHeKCJJWeQWSSrtTc6mS6Hv+P9m4WyeJwALapOtC uwX8ewZwiY6KirIDsG2D7jZP062EYhLKAcF6de3w+nyfH8vikFOXivgvXyeltCS/mXX/ mgQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Hu6mSCxc; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id r2-v6si23531430pgj.139.2018.11.14.18.35.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:35:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Hu6mSCxc; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 22CFA2119172B; Wed, 14 Nov 2018 18:34:24 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::541; helo=mail-pg1-x541.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 39D512119172B for ; Wed, 14 Nov 2018 18:34:22 -0800 (PST) Received: by mail-pg1-x541.google.com with SMTP id n2so1102605pgm.3 for ; Wed, 14 Nov 2018 18:34:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ukBnPpiTrU3oLQ/Uygw/OyFpD1H+8j0I7sVuA4D1vHg=; b=Hu6mSCxcoNEi/pKrY6+0AYbJbNe5nF9rli+vMUqugDhFX9tj/tPL6Wdk1OweVqFeIV 0bZwnW8r307DZEGOYOBAP7PfIip26KP2dmOEc9suPyJxF299trJhkV6tWLvGS7T54aKR oMobITX2fO7N0DyBGSZN6AXaRql+7ahMr2zAs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ukBnPpiTrU3oLQ/Uygw/OyFpD1H+8j0I7sVuA4D1vHg=; b=F7oZm1Vckb3gqR0kfjJoCg0Z8F8vq0uLQZId1p8c8F62fQID0oRdt0/YobEXx8iZao 2p0b3YBV+H1cnWhwibwNs7ZgXxVlpgbmQv3CG939DecS4tkx0iZIhhL28FmoslU24OBi HeOx/CgPwavjxDh6UNMr2KdOrByVzygWbflzij3VI+nobA7CwXD+m2VAZgjnIKeZe7UF xXfr33o62/JA1mFqUR8mSVbziMSqMoRvtxnRYRopNAfUTtcWixmZ9APr3h5P1FWjy5ST x8gUxUY94wBw3q8KYAIgmBUrN50uMx4dRhpHrDwXDUmVBgFmXFLd1VgIGNFwlFf9zyD8 c/1A== X-Gm-Message-State: AGRZ1gIp2mk/wDhV77f4P2jDhSzpU4K4Eakk63Syxyp4dZ3WhqR8KVt7 4X+W932LyMuNyBppUa+XfUs6gp2cW34bfA== X-Received: by 2002:a63:4926:: with SMTP id w38mr3955996pga.353.1542249261731; Wed, 14 Nov 2018 18:34:21 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:20 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:50 -0800 Message-Id: <20181115023353.20159-18-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 17/20] IntelUndiPkg/XGigUndiDxe: drop unused variables X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Drop some variables that are defined, assigned but never referenced. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/Decode.c | 3 --- IntelUndiPkg/XGigUndiDxe/HiiInternalLib.c | 4 ---- IntelUndiPkg/XGigUndiDxe/Xgbe.c | 2 -- 3 files changed, 9 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ryszard Knop diff --git a/IntelUndiPkg/XGigUndiDxe/Decode.c b/IntelUndiPkg/XGigUndiDxe/Decode.c index 5f37ce254872..c8dc3f4eb659 100644 --- a/IntelUndiPkg/XGigUndiDxe/Decode.c +++ b/IntelUndiPkg/XGigUndiDxe/Decode.c @@ -1454,14 +1454,11 @@ UndiStatus ( ) { PXE_DB_GET_STATUS * DbPtr; - UINT16 i; UINT32 IntStatus; UINT16 NumEntries; struct ixgbe_legacy_rx_desc *RxPtr; bool LinkUp; - i = 0; - if (XgbeAdapter->DriverBusy) { //DEBUGPRINT (CRITICAL, ("ERROR: UndiStatus called when driver busy\n")); diff --git a/IntelUndiPkg/XGigUndiDxe/HiiInternalLib.c b/IntelUndiPkg/XGigUndiDxe/HiiInternalLib.c index 2aacb63ca158..df5238a3b55a 100644 --- a/IntelUndiPkg/XGigUndiDxe/HiiInternalLib.c +++ b/IntelUndiPkg/XGigUndiDxe/HiiInternalLib.c @@ -197,7 +197,6 @@ GetNextRequestElement ( ) { EFI_STRING StringPtr; - EFI_STRING TmpPtr; EFI_STATUS Status; UINTN Length; UINT8 * TmpBuffer; @@ -226,9 +225,6 @@ GetNextRequestElement ( return NULL; } - // Back up the header of one - TmpPtr = StringPtr; - StringPtr += StrLen (L"OFFSET="); // Get Offset diff --git a/IntelUndiPkg/XGigUndiDxe/Xgbe.c b/IntelUndiPkg/XGigUndiDxe/Xgbe.c index 6769f2dc72ab..b3dbbd2b1d08 100644 --- a/IntelUndiPkg/XGigUndiDxe/Xgbe.c +++ b/IntelUndiPkg/XGigUndiDxe/Xgbe.c @@ -1399,12 +1399,10 @@ XgbeInitialize ( XGBE_DRIVER_DATA *XgbeAdapter ) { - UINT32 * TempBar; PXE_STATCODE PxeStatcode; EFI_STATUS Status; PxeStatcode = PXE_STATCODE_SUCCESS; - TempBar = NULL; ZeroMem ( (VOID *)(UINTN)XgbeAdapter->RxRing.UnmappedAddress, From patchwork Thu Nov 15 02:33:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151155 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6454144ljp; Wed, 14 Nov 2018 18:35:22 -0800 (PST) X-Google-Smtp-Source: AJdET5cKSFg3U8OKJXO3bSeRo3rMwFiX00KKA32Lu99NFPbAc9kHTYu+f32PzsFrHXGJOb0cVwtx X-Received: by 2002:a17:902:f097:: with SMTP id go23mr4315178plb.328.1542249322358; Wed, 14 Nov 2018 18:35:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249322; cv=none; d=google.com; s=arc-20160816; b=hu2lDCzkzSXymgp1KXoBrMIAcCEZx0vJ8ZUoPi791d/yv82f1sEQIC0EUtYOrT+Ub+ JgWaw0DVemKvMaRM9u4lEVH10sGDTlzJW3NILRLgUDl0kpMTAGi9ybxUIhVM9LC/weF9 CCZLzjQ4Q4+Jc4Me/ntk/6c6RXPHnam1nd0mjOfGTN3xx3aQuStwfYnFbkIvM2DETnAM UFHD9f/BRzIlunfLnEit7c+0SueHWH0ROtbMMn6Dl8vo3waW73/l3l22ETPQJtueoSLu IeNkU72fTUWBRUNKo5o64m3H38uAeYuA+PDh8ygHHS+WU9kJR+Se4S9ozwL+HNDJ/t5a VWjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=Z3qc5q6X9Rt1Z4GyvLn8b1E/NCcEqDGQFuaEt1yTv/8=; b=yvtHMmiiZGg+wRAgawFIc/hK4Z5BeGypLFqvkj14yd2tTYJ5368Z1bV0sB77/N2nE9 ncEpfm5ebBErGSAH1ZjbGrNVkmK0ivcYS0qtSB64iU0I1LRPj1Xt8EUOg+vHxmQ/Nl3Y OPZ13gt1OPFaoNpqNGnbcPtbb+VQkuwSjEZTFWjmjtVfpX3REwagXtF83nTAaGn9u3yr C4HvrZJKwiEZjSZ9L27H2S9fJo/yoHlWj/AO13cVqYEcNJYyQBs7SFrTJ3O3XBLFfnpM wpc2tsWIgs/VqELL72YnUpHFvZcKiy00eg3cD/ULAREzVmCaugjTKNw0axqRhlFBvj3d 1l4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=aq7GwpI4; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id s2si25128809pgj.60.2018.11.14.18.35.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:35:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=aq7GwpI4; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 5465021191746; Wed, 14 Nov 2018 18:34:25 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::441; helo=mail-pf1-x441.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 62B432119072C for ; Wed, 14 Nov 2018 18:34:23 -0800 (PST) Received: by mail-pf1-x441.google.com with SMTP id u3-v6so6218595pfm.4 for ; Wed, 14 Nov 2018 18:34:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yUsJBnpNV0S0mHaeoizJbp5uUiwaNAyn3UY7WtKL3c0=; b=aq7GwpI4SYRCvRYVrvmFUTvgHwo57l0o9V5df0qO5Ke6eGvpMs8VVu5VjSZRrXUiEs OQpU7ovycW5f8jButXU+3QUIlSKnTE/RzjyE2rCyZNVJi5iWTuUKG0Tj0Ei9lAa0Q1jR hJ80N3QlmjetZ6l/uJZRXyApeMSJE7KmokyI0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yUsJBnpNV0S0mHaeoizJbp5uUiwaNAyn3UY7WtKL3c0=; b=rx6yjieDTENPRgNZeEQgMWY764PBmGWUqZ44iYEVhZDu67UP9T92aGHyEZh+8Y4EGz bv2nyAGAZIUz6kyyHWCOe6Bc0iqkbueTtkybYi1IcjxzGslofDC/ah/uABtLieNq2QCg c276qMnUEr1vGg/rLNxX81YbE1Y7kdIdUDuWrrfOLBvMyNL5Zl28eeTD/zW+Y/1aQ8JM O86SnAFdhnrbioZgIBXS5g2mACLUeaISK9tELYGnHHJNEZXVXmpy33BJvWDahBeRELE1 cGnpPAgEKzaKTkGhJJdOZU3QXR5oBvHrA5WteJs0Bd3ZMgVsYxa0mIRjavOS9FAuRTt1 zWRw== X-Gm-Message-State: AGRZ1gIQbjQOqTZwuT8+z+Q8b7tt3zJP9rvXNR41L1EIGrjt9nXR7gr9 fJzfYhoHgshxiNyO9/uzX0RgxknUO8hZsg== X-Received: by 2002:a63:63c3:: with SMTP id x186mr4106036pgb.330.1542249262854; Wed, 14 Nov 2018 18:34:22 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:22 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:51 -0800 Message-Id: <20181115023353.20159-19-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 18/20] IntelUndiPkg/XGigUndiDxe: set MDEPKG_NDEBUG only for RELEASE builds X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Only define the CPP macro MDEPKG_NDEBUG for the RELEASE target so that debug features are functional otherwise. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ryszard Knop diff --git a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf index b5747565fbea..e3201fb9881f 100644 --- a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf +++ b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf @@ -44,7 +44,8 @@ UNLOAD_IMAGE = UnloadXGigUndiDriver [BuildOptions.common] -MSFT:*_*_*_CC_FLAGS = /FAcs /D MDEPKG_NDEBUG /D UNDI_10G /wd4244 /wd4206 /wd4189 +MSFT:*_*_*_CC_FLAGS = /FAcs /D UNDI_10G /wd4244 /wd4206 /wd4189 +MSFT:RELEASE_*_*_CC_FLAGS = /D MDEPKG_NDEBUG GCC:*_*_*_CC_FLAGS = -DUNDI_10G GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG From patchwork Thu Nov 15 02:33:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151156 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6454201ljp; Wed, 14 Nov 2018 18:35:27 -0800 (PST) X-Google-Smtp-Source: AJdET5d2zOCCIeN4q6lsDdinmeXA4miGNK5plk8vHDf1S66tvRygBqwKJDtTPM/nlHmSrFMxP0Wn X-Received: by 2002:a63:8e43:: with SMTP id k64mr4108756pge.346.1542249327570; Wed, 14 Nov 2018 18:35:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249327; cv=none; d=google.com; s=arc-20160816; b=xhurjJSDb8dfP48YO1r+Z+rFih7xKmfP9Y0VMWJP7hpyUVkvezQ8IRjalun4Q397EE UyJMZDlj5Onf2hUr4dA3aumjGYGALfDam9JMhSBMfE1T0ocdh+2XVM4mP7YFmJuTnkEy IMn7lbcc+xKoIAa1Vqon+OcxETODx0InDJWUiB9y+6KUi/D/pd4V4ILFFbNMLsUHmubV a+koZRQdROZ7SzKP92eE3saOZ0gEfDd2giUlox0x3eqYsz+vvZ7HmY74u/RxZ0Gl66zy xilRErsyJAQWwP89k+IekoKYPvUZExlEDVPvMn1SOSnINwanXPNEBAcJ7WBcVxIiOgYn YF0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=RMkqhioMRPoM+9YjXTOch2Wzb4ZP4nqF0QKy9ZP5X/E=; b=Eo8HBqIoZMrm9Z+q2RUdXFfNC9vRRWFuIoIzFbg3sZzeUiZ8F8xTTQWTQulHnEeoII VzF3QXrY10SLsJGhCeAcCXe8vy/5s+A8O1bHFYtB73a0kF2vOohzl0F24rC9cx3iIiq8 k6BaauS8q7lWq1svPRA8fpW7GsL4CMbV+yJKc48qisKm46DJnqmr/E2dGMrjmIUJA19e Einrc/QBTL1nw4oreCEkN2Usm7tMQ9Gw6Y210DtsdstjYL3Tn6Golis/LW86Ym6FMhPw WmM9iNZpOpBhmix+3pDjnOaEtq+ZCpy97L8F0fwM8IJ1i305GOn9CDUKixJaXXz/7M7M 6wMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=dCb5GrZD; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id d25si15164013pgd.88.2018.11.14.18.35.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:35:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=dCb5GrZD; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 7DBB02119174B; Wed, 14 Nov 2018 18:34:26 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::442; helo=mail-pf1-x442.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7A2932119073A for ; Wed, 14 Nov 2018 18:34:24 -0800 (PST) Received: by mail-pf1-x442.google.com with SMTP id e22-v6so8891785pfn.8 for ; Wed, 14 Nov 2018 18:34:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tC3chdOfdMiFKKtihaUa2a86E/XH7N4CV+EBAvH2khI=; b=dCb5GrZDE3uq9gVgqS2YI2rR76pW6kyuAekyjpN2SbPL4caVyJQVP68xirJdusAFoP nt1N4sNTq9IjHGrW9dh1sDSqa+9EbWPRbnlz3HrPzqd+IXE3J6l49uQntl8KEVWakuuQ X5/XlbQ9LUbhJf1o1QbrAhUtQ9KpCFUNsvDi0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tC3chdOfdMiFKKtihaUa2a86E/XH7N4CV+EBAvH2khI=; b=prnHyMfggH+e0RY+G+4YSZ3KnJ7B8O40wuv5TcE9SSEv2FDxHu+cHMGdp+pTUs/tJN XQ+xVoiMrSar3FoI/H5few+EyZrOw5FuGwxEZPRPtG1FuCI21zda6qLRPPBdfCsMdh+e lpXIMsJr3vhqOrwQ7anfyB6c1td9suIPeVXYGbBeXNVADyaWjM2CqjYDRLs28UhDwA04 TTpQvQdzuGY4rL1oFAvR8kDUZQzsK+Bzcwi1oOkxp1q+b9LcO7DiUbAPHNk4G1AuhXRB 4+3gJqTA2cerIdViW/CkBYP0CXuq1fzrBbTbANiB4Ub2z7qLThPcfhAGB3IfHf8wvKGr M3bA== X-Gm-Message-State: AGRZ1gJiaZJIVR8ahq+H0PtM8zvsjEvpM4hJB6m9TWWHsJNzkud2pm7i ss+rzRbBdexXYZZuEHohfk8hAM/5EpC1mA== X-Received: by 2002:a63:f141:: with SMTP id o1mr4211798pgk.134.1542249264003; Wed, 14 Nov 2018 18:34:24 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:23 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:52 -0800 Message-Id: <20181115023353.20159-20-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 19/20] IntelUndiPkg/XGigUndiDxe: drop separate debug macros for DBG_LVL X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The DBG_LVL bit tests are already done at build time, so there is no point in having separate definitions, since they only result in unused variable warnings. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/Xgbe.h | 21 -------------------- 1 file changed, 21 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/IntelUndiPkg/XGigUndiDxe/Xgbe.h b/IntelUndiPkg/XGigUndiDxe/Xgbe.h index 2a904de5bf2f..ecfcc1032e8b 100644 --- a/IntelUndiPkg/XGigUndiDxe/Xgbe.h +++ b/IntelUndiPkg/XGigUndiDxe/Xgbe.h @@ -1112,7 +1112,6 @@ WaitForEnter ( ); // This is the Macro Section -#if DBG_LVL /** When specific debug level is currently set this macro prints debug message. @@ -1137,26 +1136,6 @@ WaitForEnter ( if ((DBG_LVL & Lvl) != 0) { \ WaitForEnter (); \ } -#else /* NOT DBG_LVL */ - -// Comment out the debug stuff -/** When DBG_LVL is not defined leave occurences of DEBUGPRINT blank - - @param[in] Lvl Debug level - @param[in] Msg Debug message - - @return None -**/ -#define DEBUGPRINT(Lvl, Msg) - -/** When DBG_LVL is not defined leave occurences of DEBUGWAIT blank - - @param[in] Lvl Debug level - - @return None -**/ -#define DEBUGWAIT(Lvl) -#endif /* DBG_LVL */ /** Delays code execution for specified time in milliseconds From patchwork Thu Nov 15 02:33:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151157 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6454261ljp; Wed, 14 Nov 2018 18:35:33 -0800 (PST) X-Google-Smtp-Source: AJdET5edJVy2cQk82l7CwaDvpnVRF8VQo08NxIQWBYnBCQ8BCPexy9nEFFS6LXCiKnr/pbDfJlfm X-Received: by 2002:aa7:86d3:: with SMTP id h19-v6mr4480605pfo.225.1542249333221; Wed, 14 Nov 2018 18:35:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249333; cv=none; d=google.com; s=arc-20160816; b=n5y8gKpJ//ulshyCn390bAZp2oEw+peJoNveugwKvMWKPGa6TTTCjTrDI5H/lyFfpF eJzCcLO3aJPykqly4lWVQdZLQOCYt+VGdKye/R/I7JaEbmbf/RmaGXY6skXAF7WEwheS px6lgklYNZc75hzH8hy/etnlsjbsOKP3LD2Slc2Pj6chBEBoEJu7hdyAaxY+msa87ZLz 921JoYIZvAcGxIJyu5Tg4j9t7bsUw4nVmUMg1ohJfz5HhljTvIe5ud5M4LRFx91Cf6So mxEfDQxw6hK3Y0xack4s7LqOnVBRj1t5VxlLCcTiYw9avuLHd08uhL/7nurTunxB2bs0 UuSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=KjUhe1LGNcZp9RIyciffxfJaeBUo+5XlLRNe0OCHG8g=; b=aYWDzg4x0Oo91QlzcFkHdlwFP/hE46qqiJ0urFXIOFhdid0TnwySKhPHXcx2m4PrFt FjWZiU5EuxjWWYL8wyGdxLxpUbhltJEGf5Zfk1xkgWEGQ0SCO5UtE+8hN+DD5OE+NMkG wYke34bk1QFtoAHysZRlq+ITFfpEs4qMh06At/4qEW6pfq4jCWRdtBYEtTISZhaHMoxZ kRY9nCk/hKeJVIZa+ASWgBJsc/V+y1MFSfXvuffBDdGuuwW6pmzK+rzKDlK0n70sBEEg 16cS5uh9gXnK9jJAIry1sFTpjNXZ6GTVsUqeHnXunI4LLPG1Kg+U6OKzty/3xyu7zv7W d1IA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=b2hsqn2N; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id h189-v6si8041647pfc.98.2018.11.14.18.35.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:35:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=b2hsqn2N; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id AAA3421191750; Wed, 14 Nov 2018 18:34:27 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::443; helo=mail-pf1-x443.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id AEA7C2119174B for ; Wed, 14 Nov 2018 18:34:25 -0800 (PST) Received: by mail-pf1-x443.google.com with SMTP id e22-v6so8891811pfn.8 for ; Wed, 14 Nov 2018 18:34:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0IorxIYjadZ4Li2CjTz2X7oFgFQWcxWOd0aU1nkc8ps=; b=b2hsqn2Nn3NIElASyd2jpsSz1cj2U3hDx6cDAUTg4GRsWiX38kLDM1+3u+Uvel8wM3 mffsu/NPvyo7kp7qpV+Kmn+eof6z6DInVGSEN+AUb6grh68vZ9nv6gWCeXUl3BKNIx7W oskSTraZ/nOeQmPl4SieT6+rp6zk67YEAmPWY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0IorxIYjadZ4Li2CjTz2X7oFgFQWcxWOd0aU1nkc8ps=; b=p5pLrUbGP/z3YP8+R1/vpWVO7CBpCnaFGRQXpJWTXdHLnbfwardAeR8rwpaqbbO4DX 4PDa6UxoLceCR9mIazyB83v8YpMU8scwfyDetMAtxo/UY5eP+e+8memfB9LmxQ1bvpfD n5GcyqNbZymBjgMThaZ2xeZhTTLbgK0d/QWvzB+Hc1Zk3F2L+8ez5L1Qa/t1k4XU5F0P JIICrQt9s8OgAEbB98k/UAeC11cMXkBcVLx+6reL/i9NvxTGotdAWRhG3PUv0qGdnId/ AB5gLYxI1DI+/hGP6+qRn7rxK3zX1yNbISdYh13zA+P0dgWcVMnKCJvyHR/4qARoV+qN j+wg== X-Gm-Message-State: AGRZ1gKmlGdz7vWgVNCuStWxSsxGBn2SR/yKYffE035tQObaZ5wcWaUY 0iUV1IDiMvOrANWt8R7IIoa4R8IXXnsb7Q== X-Received: by 2002:a63:920a:: with SMTP id o10mr4001965pgd.141.1542249265114; Wed, 14 Nov 2018 18:34:25 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:24 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:53 -0800 Message-Id: <20181115023353.20159-21-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 20/20] IntelUndiPkg/XGigUndiDxe: avoid unused var warnings for ERROR_REPORTn() X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" We hit unused variable warnings since the various ERROR_REPORTn() macros resolve to nothing. So instead, map them to the macros that were created to prevent these warnings. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h b/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h index aa3b3543cb79..02eb6fe7f67b 100644 --- a/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h +++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h @@ -451,7 +451,7 @@ typedef BOOLEAN boolean_t; @retval None **/ -#define ERROR_REPORT(S,A) +#define ERROR_REPORT(S,A) UNREFERENCED_1PARAMETER(A) /** ERROR_REPORT1 wrapper macro for shared code, blank here @@ -461,7 +461,7 @@ typedef BOOLEAN boolean_t; @retval None **/ -#define ERROR_REPORT1(S,A) +#define ERROR_REPORT1(S,A) UNREFERENCED_1PARAMETER(A) /** ERROR_REPORT2 wrapper macro for shared code, blank here @@ -472,7 +472,7 @@ typedef BOOLEAN boolean_t; @retval None **/ -#define ERROR_REPORT2(S,A,B) +#define ERROR_REPORT2(S,A,B) UNREFERENCED_2PARAMETER(A,B) /** ERROR_REPORT3 wrapper macro for shared code, blank here @@ -484,7 +484,7 @@ typedef BOOLEAN boolean_t; @retval None **/ -#define ERROR_REPORT3(S,A,B,C) +#define ERROR_REPORT3(S,A,B,C) UNREFERENCED_3PARAMETER(A,B,C) /** Macro for word conversion from CPU native to Big Endian