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