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/fm10k/base/meson.build | 11 ----------- drivers/net/intel/fm10k/{base => }/fm10k_osdep.h | 4 +++- drivers/net/intel/fm10k/meson.build | 9 ++++++++- 3 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 drivers/net/intel/fm10k/base/meson.build rename drivers/net/intel/fm10k/{base => }/fm10k_osdep.h (98%) diff --git a/drivers/net/intel/fm10k/base/meson.build b/drivers/net/intel/fm10k/base/meson.build deleted file mode 100644 index c45b31d6b2..0000000000 --- a/drivers/net/intel/fm10k/base/meson.build +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -base_sources = files( - 'fm10k_api.c', - 'fm10k_common.c', - 'fm10k_mbx.c', - 'fm10k_pf.c', - 'fm10k_tlv.c', - 'fm10k_vf.c', -) diff --git a/drivers/net/intel/fm10k/base/fm10k_osdep.h b/drivers/net/intel/fm10k/fm10k_osdep.h similarity index 98% rename from drivers/net/intel/fm10k/base/fm10k_osdep.h rename to drivers/net/intel/fm10k/fm10k_osdep.h index 5f8ff10474..69c542a6d0 100644 --- a/drivers/net/intel/fm10k/base/fm10k_osdep.h +++ b/drivers/net/intel/fm10k/fm10k_osdep.h @@ -5,6 +5,8 @@ #ifndef _FM10K_OSDEP_H_ #define _FM10K_OSDEP_H_ +/* File containing OS dependencies for base code */ + #include <stdint.h> #include <stdbool.h> #include <string.h> @@ -13,7 +15,7 @@ #include <rte_cycles.h> #include <rte_io.h> -#include "../fm10k_logs.h" +#include "fm10k_logs.h" /* TODO: this does not look like it should be used... */ #define ERROR_REPORT2(v1, v2, v3) do { } while (0) diff --git a/drivers/net/intel/fm10k/meson.build b/drivers/net/intel/fm10k/meson.build index fac4750f8d..a532b35818 100644 --- a/drivers/net/intel/fm10k/meson.build +++ b/drivers/net/intel/fm10k/meson.build @@ -7,7 +7,14 @@ if is_windows subdir_done() endif -subdir('base') +base_sources = files( + 'base/fm10k_api.c', + 'base/fm10k_common.c', + 'base/fm10k_mbx.c', + 'base/fm10k_pf.c', + 'base/fm10k_tlv.c', + 'base/fm10k_vf.c', +) sources += files( 'fm10k_ethdev.c', -- 2.53.0
