From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 59BD8A054F; Tue, 16 Mar 2021 23:22:35 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2E465242B22; Tue, 16 Mar 2021 23:20:28 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 0025B242AB4 for ; Tue, 16 Mar 2021 23:20:06 +0100 (CET) IronPort-SDR: k17eS7UEZC2TN6WGe7/iDO93G235f6nJ2ivl7o6cKOtK/f649QQwCZ+HCBn/MdvVGnV1OL6q2w rew+ur++rCzQ== X-IronPort-AV: E=McAfee;i="6000,8403,9925"; a="253359285" X-IronPort-AV: E=Sophos;i="5.81,254,1610438400"; d="scan'208";a="253359285" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Mar 2021 15:20:06 -0700 IronPort-SDR: 0NTAdie9128HDwvql2WYteK1H1/zw2GTT2aaJm0JdIUenbTriTyBtn9c0UhJc3N8YQCDKI/CqP Ho/gm6uqp/pQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,254,1610438400"; d="scan'208";a="605440362" Received: from txasoft-yocto.an.intel.com ([10.123.72.192]) by fmsmga005.fm.intel.com with ESMTP; 16 Mar 2021 15:20:05 -0700 From: Timothy McDaniel To: dev@dpdk.org Cc: jerinj@marvell.com, harry.van.haaren@intel.com, mdr@ashroe.eu, nhorman@tuxdriver.com, nikhil.rao@intel.com, erik.g.carrillo@intel.com, abhinandan.gujjar@intel.com, pbhagavatula@marvell.com, hemant.agrawal@nxp.com, mattias.ronnblom@ericsson.com, peter.mccarthy@intel.com Date: Tue, 16 Mar 2021 17:18:56 -0500 Message-Id: <20210316221857.2254-25-timothy.mcdaniel@intel.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210316221857.2254-1-timothy.mcdaniel@intel.com> References: <20210316221857.2254-1-timothy.mcdaniel@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 24/25] event/dlb2: rename dlb2_regs_new.h to dlb2_regs.h X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" All references to the old register map have been removed, so it is safe to rename the new combined file that supports both DLB v2.0 and DLB v2.5. Also fixed all places where this file is included. Signed-off-by: Timothy McDaniel --- drivers/event/dlb2/pf/base/dlb2_hw_types.h | 2 +- drivers/event/dlb2/pf/base/{dlb2_regs_new.h => dlb2_regs.h} | 6 +++--- drivers/event/dlb2/pf/base/dlb2_resource.c | 2 +- drivers/event/dlb2/pf/dlb2_main.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename drivers/event/dlb2/pf/base/{dlb2_regs_new.h => dlb2_regs.h} (99%) diff --git a/drivers/event/dlb2/pf/base/dlb2_hw_types.h b/drivers/event/dlb2/pf/base/dlb2_hw_types.h index 0f418ef5d..db9dfd240 100644 --- a/drivers/event/dlb2/pf/base/dlb2_hw_types.h +++ b/drivers/event/dlb2/pf/base/dlb2_hw_types.h @@ -10,7 +10,7 @@ #include "dlb2_osdep_list.h" #include "dlb2_osdep_types.h" -#include "dlb2_regs_new.h" +#include "dlb2_regs.h" #define DLB2_BITS_SET(x, val, mask) (x = ((x) & ~(mask)) \ | (((val) << (mask##_LOC)) & (mask))) diff --git a/drivers/event/dlb2/pf/base/dlb2_regs_new.h b/drivers/event/dlb2/pf/base/dlb2_regs.h similarity index 99% rename from drivers/event/dlb2/pf/base/dlb2_regs_new.h rename to drivers/event/dlb2/pf/base/dlb2_regs.h index 593243d63..cdff5cb1f 100644 --- a/drivers/event/dlb2/pf/base/dlb2_regs_new.h +++ b/drivers/event/dlb2/pf/base/dlb2_regs.h @@ -2,8 +2,8 @@ * Copyright(c) 2016-2020 Intel Corporation */ -#ifndef __DLB2_REGS_NEW_H -#define __DLB2_REGS_NEW_H +#ifndef __DLB2_REGS_H +#define __DLB2_REGS_H #include "dlb2_osdep_types.h" @@ -4409,4 +4409,4 @@ #define DLB2_LSP_CFG_CQ_LDB_WU_LIMIT_V_LOC 15 #define DLB2_LSP_CFG_CQ_LDB_WU_LIMIT_RSVD0_LOC 16 -#endif /* __DLB2_REGS_NEW_H */ +#endif /* __DLB2_REGS_H */ diff --git a/drivers/event/dlb2/pf/base/dlb2_resource.c b/drivers/event/dlb2/pf/base/dlb2_resource.c index e5fa0f047..d71adce16 100644 --- a/drivers/event/dlb2/pf/base/dlb2_resource.c +++ b/drivers/event/dlb2/pf/base/dlb2_resource.c @@ -9,7 +9,7 @@ #include "dlb2_osdep.h" #include "dlb2_osdep_bitmap.h" #include "dlb2_osdep_types.h" -#include "dlb2_regs_new.h" +#include "dlb2_regs.h" #include "dlb2_resource.h" #include "../../dlb2_priv.h" diff --git a/drivers/event/dlb2/pf/dlb2_main.c b/drivers/event/dlb2/pf/dlb2_main.c index 1f6ccf8e4..b6ec85b47 100644 --- a/drivers/event/dlb2/pf/dlb2_main.c +++ b/drivers/event/dlb2/pf/dlb2_main.c @@ -13,7 +13,7 @@ #include #include -#include "base/dlb2_regs_new.h" +#include "base/dlb2_regs.h" #include "base/dlb2_hw_types.h" #include "base/dlb2_resource.h" #include "base/dlb2_osdep.h" -- 2.23.0