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 92095A034F; Tue, 30 Mar 2021 21:39:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EA46D140E97; Tue, 30 Mar 2021 21:37:19 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 0DB72140EE2 for ; Tue, 30 Mar 2021 21:36:51 +0200 (CEST) IronPort-SDR: Mk4oO9g1iRnFvYW0QCQYksonkyhzzBBY3KTmwHVAC/NV0+iRDODMko+DfXu1qzVcAyzUqFERfd BDURNEo3UUFA== X-IronPort-AV: E=McAfee;i="6000,8403,9939"; a="189601183" X-IronPort-AV: E=Sophos;i="5.81,291,1610438400"; d="scan'208";a="189601183" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2021 12:36:51 -0700 IronPort-SDR: iwyv66OnOwOpi7g1qLMaCogJAloH2sGg38FPSxS/doxnEB4nfIY5jYs2Yc4PXA5aUuSI5lxkeP 2TcxFEdNYk+Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,291,1610438400"; d="scan'208";a="418309793" Received: from txasoft-yocto.an.intel.com ([10.123.72.192]) by orsmga008.jf.intel.com with ESMTP; 30 Mar 2021 12:36:50 -0700 From: Timothy McDaniel To: Cc: dev@dpdk.org, erik.g.carrillo@intel.com, gage.eads@intel.com, harry.van.haaren@intel.com, jerinj@marvell.com, thomas@monjalon.net Date: Tue, 30 Mar 2021 14:35:37 -0500 Message-Id: <1617132940-24800-25-git-send-email-timothy.mcdaniel@intel.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1617132940-24800-1-git-send-email-timothy.mcdaniel@intel.com> References: <20210316221857.2254-2-timothy.mcdaniel@intel.com> <1617132940-24800-1-git-send-email-timothy.mcdaniel@intel.com> Subject: [dpdk-dev] [PATCH v2 24/27] 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 54b0207db..3661b940c 100644 --- a/drivers/event/dlb2/pf/base/dlb2_resource.c +++ b/drivers/event/dlb2/pf/base/dlb2_resource.c @@ -8,7 +8,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