The osdep header and iavf_impl.c file contain the macros and other definitions needed to allow the base code to compile as part of DPDK. Although they are stored 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.
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/iavf/base/README | 8 -------- drivers/net/intel/iavf/{base/iavf_impl.c => iavf_osdep.c} | 0 drivers/net/intel/iavf/{base => }/iavf_osdep.h | 2 ++ drivers/net/intel/iavf/meson.build | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) rename drivers/net/intel/iavf/{base/iavf_impl.c => iavf_osdep.c} (100%) rename drivers/net/intel/iavf/{base => }/iavf_osdep.h (98%) diff --git a/drivers/net/intel/iavf/base/README b/drivers/net/intel/iavf/base/README index 61bcf0ef0e..d6a1dfbc96 100644 --- a/drivers/net/intel/iavf/base/README +++ b/drivers/net/intel/iavf/base/README @@ -7,11 +7,3 @@ Intel® IAVF driver This directory contains a snapshot of the iavf shared, or base, driver code. The snapshot was generated on 2024.09.17. - -Updating the driver -=================== - -NOTE: The source code in this directory should not be modified apart from the following files: - - iavf_osdep.h - iavf_impl.c diff --git a/drivers/net/intel/iavf/base/iavf_impl.c b/drivers/net/intel/iavf/iavf_osdep.c similarity index 100% rename from drivers/net/intel/iavf/base/iavf_impl.c rename to drivers/net/intel/iavf/iavf_osdep.c diff --git a/drivers/net/intel/iavf/base/iavf_osdep.h b/drivers/net/intel/iavf/iavf_osdep.h similarity index 98% rename from drivers/net/intel/iavf/base/iavf_osdep.h rename to drivers/net/intel/iavf/iavf_osdep.h index cb95b848b6..dc2145b8c2 100644 --- a/drivers/net/intel/iavf/base/iavf_osdep.h +++ b/drivers/net/intel/iavf/iavf_osdep.h @@ -5,6 +5,8 @@ #ifndef _IAVF_OSDEP_H_ #define _IAVF_OSDEP_H_ +/* File containing OS dependencies for base code */ + #include <string.h> #include <stdint.h> #include <stdbool.h> diff --git a/drivers/net/intel/iavf/meson.build b/drivers/net/intel/iavf/meson.build index 50630a88c8..9b071a3a4b 100644 --- a/drivers/net/intel/iavf/meson.build +++ b/drivers/net/intel/iavf/meson.build @@ -12,7 +12,6 @@ deps += ['security', 'cryptodev'] sources = files( 'base/iavf_adminq.c', 'base/iavf_common.c', - 'base/iavf_impl.c', 'iavf_base_symbols.c', 'iavf_ethdev.c', @@ -21,6 +20,7 @@ sources = files( 'iavf_generic_flow.c', 'iavf_fdir.c', 'iavf_hash.c', + 'iavf_osdep.c', 'iavf_tm.c', 'iavf_ipsec_crypto.c', 'iavf_fsub.c', -- 2.53.0
