From patchwork Thu Feb 9 02:18:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Thierry X-Patchwork-Id: 9563889 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BF730601EA for ; Thu, 9 Feb 2017 02:18:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08350284BA for ; Thu, 9 Feb 2017 02:18:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF46A28518; Thu, 9 Feb 2017 02:18:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 948F9284BA for ; Thu, 9 Feb 2017 02:18:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2AB486E9F6; Thu, 9 Feb 2017 02:18:30 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 83E3F6E9F4 for ; Thu, 9 Feb 2017 02:18:29 +0000 (UTC) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP; 08 Feb 2017 18:18:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,349,1484035200"; d="scan'208";a="56764871" Received: from relo-linux-11.sc.intel.com ([10.3.160.214]) by orsmga004.jf.intel.com with ESMTP; 08 Feb 2017 18:18:28 -0800 From: Michel Thierry To: intel-gfx@lists.freedesktop.org Date: Wed, 8 Feb 2017 18:18:22 -0800 Message-Id: <20170209021828.22813-3-michel.thierry@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170209021828.22813-1-michel.thierry@intel.com> References: <20170209021828.22813-1-michel.thierry@intel.com> Subject: [Intel-gfx] [PATCH i-g-t 2/8] lib/igt_draw: rename BIT macro to BIT_GET X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Keeping macros names unique. We'll soon have a bit operations header file and BIT is already taken. Signed-off-by: Michel Thierry Reviewed-by: Joonas Lahtinen --- lib/igt_draw.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/igt_draw.c b/lib/igt_draw.c index 3afb8272..2b321715 100644 --- a/lib/igt_draw.c +++ b/lib/igt_draw.c @@ -96,7 +96,7 @@ const char *igt_draw_get_method_name(enum igt_draw_method method) } } -#define BIT(num, bit) ((num >> bit) & 1) +#define BIT_GET(num, bit) ((num >> bit) & 1) static int swizzle_addr(int addr, int swizzle) { @@ -104,20 +104,20 @@ static int swizzle_addr(int addr, int swizzle) switch (swizzle) { case I915_BIT_6_SWIZZLE_NONE: - bit6 = BIT(addr, 6); + bit6 = BIT_GET(addr, 6); break; case I915_BIT_6_SWIZZLE_9: - bit6 = BIT(addr, 6) ^ BIT(addr, 9); + bit6 = BIT_GET(addr, 6) ^ BIT_GET(addr, 9); break; case I915_BIT_6_SWIZZLE_9_10: - bit6 = BIT(addr, 6) ^ BIT(addr, 9) ^ BIT(addr, 10); + bit6 = BIT_GET(addr, 6) ^ BIT_GET(addr, 9) ^ BIT_GET(addr, 10); break; case I915_BIT_6_SWIZZLE_9_11: - bit6 = BIT(addr, 6) ^ BIT(addr, 9) ^ BIT(addr, 11); + bit6 = BIT_GET(addr, 6) ^ BIT_GET(addr, 9) ^ BIT_GET(addr, 11); break; case I915_BIT_6_SWIZZLE_9_10_11: - bit6 = BIT(addr, 6) ^ BIT(addr, 9) ^ BIT(addr, 10) ^ - BIT(addr, 11); + bit6 = BIT_GET(addr, 6) ^ BIT_GET(addr, 9) ^ BIT_GET(addr, 10) ^ + BIT_GET(addr, 11); break; case I915_BIT_6_SWIZZLE_UNKNOWN: case I915_BIT_6_SWIZZLE_9_17: