The osdep headers contain the macros and other definitions needed to allow the base code to compile as part of DPDK. They traditionally tend to reside in the base code folder, but are an exception in that they can be modified by regular DPDK patches, and not just as part of a base code snapshot update. Similarly the meson.build file in the base folder is not part of the snapshots and is an editable file in the base folder.
Therefore, we can simplify the rules around base code by moving these files into the main driver folder, leaving the base code C files all as uneditable except via snapshot update. Signed-off-by: Bruce Richardson <[email protected]> --- drivers/net/intel/cpfl/cpfl_actions.h | 2 +- drivers/net/intel/cpfl/cpfl_controlq.h | 2 +- drivers/net/intel/idpf/base/README | 8 -------- drivers/net/intel/idpf/base/meson.build | 7 ------- drivers/net/intel/idpf/{base => }/idpf_osdep.h | 4 +++- drivers/net/intel/idpf/idpf_ptp.h | 2 +- drivers/net/intel/idpf/meson.build | 5 ++++- 7 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 drivers/net/intel/idpf/base/meson.build rename drivers/net/intel/idpf/{base => }/idpf_osdep.h (99%) diff --git a/drivers/net/intel/cpfl/cpfl_actions.h b/drivers/net/intel/cpfl/cpfl_actions.h index 7b82119e39..772b3ff999 100644 --- a/drivers/net/intel/cpfl/cpfl_actions.h +++ b/drivers/net/intel/cpfl/cpfl_actions.h @@ -5,7 +5,7 @@ #ifndef _CPFL_ACTIONS_H_ #define _CPFL_ACTIONS_H_ -#include "base/idpf_osdep.h" +#include "idpf_osdep.h" #pragma pack(1) diff --git a/drivers/net/intel/cpfl/cpfl_controlq.h b/drivers/net/intel/cpfl/cpfl_controlq.h index 740ae6522c..812b1b14a6 100644 --- a/drivers/net/intel/cpfl/cpfl_controlq.h +++ b/drivers/net/intel/cpfl/cpfl_controlq.h @@ -5,7 +5,7 @@ #ifndef _CPFL_CONTROLQ_H_ #define _CPFL_CONTROLQ_H_ -#include "base/idpf_osdep.h" +#include "idpf_osdep.h" #include "base/idpf_controlq_api.h" #define CPFL_CTLQ_DESCRIPTOR_SIZE 32 diff --git a/drivers/net/intel/idpf/base/README b/drivers/net/intel/idpf/base/README index 457b5a81f3..aa617f1819 100644 --- a/drivers/net/intel/idpf/base/README +++ b/drivers/net/intel/idpf/base/README @@ -11,11 +11,3 @@ The directory of base/ contains the original source package. This driver is valid for the product(s) listed below * Intel® IPU E2100 - -Updating the driver -=================== - -NOTE: The source code in this directory should not be modified apart from -the following file(s): - - idpf_osdep.h diff --git a/drivers/net/intel/idpf/base/meson.build b/drivers/net/intel/idpf/base/meson.build deleted file mode 100644 index 78782e463e..0000000000 --- a/drivers/net/intel/idpf/base/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2023 Intel Corporation - -base_sources = files( - 'idpf_controlq.c', - 'idpf_controlq_setup.c', -) diff --git a/drivers/net/intel/idpf/base/idpf_osdep.h b/drivers/net/intel/idpf/idpf_osdep.h similarity index 99% rename from drivers/net/intel/idpf/base/idpf_osdep.h rename to drivers/net/intel/idpf/idpf_osdep.h index 67bc33f2e6..9c758fb3c0 100644 --- a/drivers/net/intel/idpf/base/idpf_osdep.h +++ b/drivers/net/intel/idpf/idpf_osdep.h @@ -5,6 +5,8 @@ #ifndef _IDPF_OSDEP_H_ #define _IDPF_OSDEP_H_ +/* File containing OS dependencies for base code */ + #include <string.h> #include <stdint.h> #include <stdio.h> @@ -24,7 +26,7 @@ #include <rte_io.h> #include <rte_compat.h> -#include "../idpf_common_logs.h" +#include "idpf_common_logs.h" #define INLINE inline #define STATIC static diff --git a/drivers/net/intel/idpf/idpf_ptp.h b/drivers/net/intel/idpf/idpf_ptp.h index 0c901440fb..ecb59200bd 100644 --- a/drivers/net/intel/idpf/idpf_ptp.h +++ b/drivers/net/intel/idpf/idpf_ptp.h @@ -5,7 +5,7 @@ #ifndef _IDPF_PTP_H_ #define _IDPF_PTP_H_ -#include "base/idpf_osdep.h" +#include "idpf_osdep.h" #include <rte_time.h> #include "idpf_common_device.h" diff --git a/drivers/net/intel/idpf/meson.build b/drivers/net/intel/idpf/meson.build index 740c1a5985..311f300ccb 100644 --- a/drivers/net/intel/idpf/meson.build +++ b/drivers/net/intel/idpf/meson.build @@ -7,7 +7,10 @@ if is_windows subdir_done() endif -subdir('base') +base_sources = files( + 'base/idpf_controlq.c', + 'base/idpf_controlq_setup.c', +) includes += include_directories('../iavf/base') -- 2.53.0
