[PATCH 1/6] bus/dpaa: fix the curly braces mismatch problem

[PATCH 1/6] bus/dpaa: fix the curly braces mismatch problem

[Weiguo Li]

Supplement the missing half of braces for the extern "C" block

Fixes: 6d6b4f49a155 ("bus/dpaa: add FMAN hardware operations")
Fixes: 919eeaccb2ba ("bus/dpaa: introduce NXP DPAA bus driver skeleton")
Cc: shreyansh.jain@nxp.com

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 drivers/bus/dpaa/include/fsl_fman.h | 5 +++++
 drivers/bus/dpaa/rte_dpaa_bus.h     | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/drivers/bus/dpaa/include/fsl_fman.h b/drivers/bus/dpaa/include/fsl_fman.h
index acb344584f..a10845f0a0 100644
--- a/drivers/bus/dpaa/include/fsl_fman.h
+++ b/drivers/bus/dpaa/include/fsl_fman.h
@@ -186,4 +186,9 @@ static inline void fman_if_disable_all_rx(void)
 	list_for_each_entry(__if, fman_if_list, node)
 		fman_if_disable_rx(__if);
 }
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __FSL_FMAN_H */
diff --git a/drivers/bus/dpaa/rte_dpaa_bus.h b/drivers/bus/dpaa/rte_dpaa_bus.h
index 31a5ea3fca..54bb1436fd 100644
--- a/drivers/bus/dpaa/rte_dpaa_bus.h
+++ b/drivers/bus/dpaa/rte_dpaa_bus.h
@@ -17,6 +17,10 @@
 #include <fsl_bman.h>
 #include <netcfg.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* This sequence number field is used to store event entry index for
  * driver specific usage. For parallel mode queues, invalid
  * index will be set and for atomic mode queues, valid value
-- 
2.25.1

Re: [PATCH 1/6] bus/dpaa: fix the curly braces mismatch problem

[Bruce Richardson]

On Sun, Feb 06, 2022 at 08:44:09AM +0800, Weiguo Li wrote:
> Supplement the missing half of braces for the extern "C" block
> 
> Fixes: 6d6b4f49a155 ("bus/dpaa: add FMAN hardware operations")
> Fixes: 919eeaccb2ba ("bus/dpaa: introduce NXP DPAA bus driver skeleton")
> Cc: shreyansh.jain@nxp.com
> 
> Signed-off-by: Weiguo Li <liwg06@foxmail.com>
> ---
>  drivers/bus/dpaa/include/fsl_fman.h | 5 +++++
>  drivers/bus/dpaa/rte_dpaa_bus.h     | 4 ++++
>  2 files changed, 9 insertions(+)
> 
> diff --git a/drivers/bus/dpaa/include/fsl_fman.h b/drivers/bus/dpaa/include/fsl_fman.h
> index acb344584f..a10845f0a0 100644
> --- a/drivers/bus/dpaa/include/fsl_fman.h
> +++ b/drivers/bus/dpaa/include/fsl_fman.h
> @@ -186,4 +186,9 @@ static inline void fman_if_disable_all_rx(void)
>  	list_for_each_entry(__if, fman_if_list, node)
>  		fman_if_disable_rx(__if);
>  }
> +
> +#ifdef __cplusplus
> +}
> +#endif
> +
>  #endif /* __FSL_FMAN_H */

Judging from the filename, this looks to be an internal-only header. Does
it really need the c++ guards?

/Bruce

[PATCH 2/6] common/mlx5: fix the curly braces mismatch problem

[Weiguo Li]

Supplement the second half of braces for the extern "C" block

Fixes: 7525ebd8ebb0 ("common/mlx5: add glue functions on Windows")
Cc: talshn@nvidia.com

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 drivers/common/mlx5/windows/mlx5_win_defs.h | 5 +++++
 drivers/common/mlx5/windows/mlx5_win_ext.h  | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/drivers/common/mlx5/windows/mlx5_win_defs.h b/drivers/common/mlx5/windows/mlx5_win_defs.h
index 9f709ff30d..14b2b5d3b3 100644
--- a/drivers/common/mlx5/windows/mlx5_win_defs.h
+++ b/drivers/common/mlx5/windows/mlx5_win_defs.h
@@ -262,4 +262,9 @@ enum {
 	MLX5_MATCH_MISC_PARAMETERS      = 1 << 1,
 	MLX5_MATCH_INNER_HEADERS        = 1 << 2,
 };
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __MLX5_WIN_DEFS_H__ */
diff --git a/drivers/common/mlx5/windows/mlx5_win_ext.h b/drivers/common/mlx5/windows/mlx5_win_ext.h
index b5d4484a13..7cb7ce5e58 100644
--- a/drivers/common/mlx5/windows/mlx5_win_ext.h
+++ b/drivers/common/mlx5/windows/mlx5_win_ext.h
@@ -44,4 +44,8 @@ struct mlx5_devx_clock {
 #define GET_DEVX_CTX(ctx) (((mlx5_context_st *)ctx)->devx_ctx)
 #define GET_OBJ_CTX(obj)  (((mlx5_devx_obj_st *)obj)->devx_ctx)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __MLX5_WIN_ETX_H__ */
-- 
2.25.1

[PATCH 3/6] net/cxgbe: fix the curly braces mismatch problem

[Weiguo Li]

Supplement the second half of braces for the extern "C" block

Fixes: 3bd122eef2cc ("cxgbe/base: add hardware API for Chelsio T5 series adapters")
Cc: rahul.lakkireddy@chelsio.com

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 drivers/net/cxgbe/base/common.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/cxgbe/base/common.h b/drivers/net/cxgbe/base/common.h
index 58d7d7a8f2..473726c673 100644
--- a/drivers/net/cxgbe/base/common.h
+++ b/drivers/net/cxgbe/base/common.h
@@ -542,4 +542,9 @@ static inline int t4_memory_rw(struct adapter *adap, int win,
 {
 	return t4_memory_rw_mtype(adap, win, mtype, maddr, len, hbuf, dir);
 }
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __CHELSIO_COMMON_H */
-- 
2.25.1

[PATCH 4/6] net/dpaa2: fix the curly braces mismatch problem

[Weiguo Li]

Supplement the second half of braces for the extern "C" block

Fixes: 72ec7a678e70 ("net/dpaa2: add soft parser driver")
Cc: sunil.kori@nxp.com

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 drivers/net/dpaa2/dpaa2_sparser.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/dpaa2/dpaa2_sparser.h b/drivers/net/dpaa2/dpaa2_sparser.h
index 365b8062a9..309a08979f 100644
--- a/drivers/net/dpaa2/dpaa2_sparser.h
+++ b/drivers/net/dpaa2/dpaa2_sparser.h
@@ -203,4 +203,9 @@ int dpaa2_eth_load_wriop_soft_parser(struct dpaa2_dev_priv *priv,
 		enum dpni_soft_sequence_dest dest);
 int dpaa2_eth_enable_wriop_soft_parser(struct dpaa2_dev_priv *priv,
 		enum dpni_soft_sequence_dest dest);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _DPAA2_SPARSER_H_ */
-- 
2.25.1

[PATCH 5/6] eal/windows: fix the curly braces mismatch problem

[Weiguo Li]

Supplement the first half of braces for the extern "C" block

Fixes: 99a2dd955fba6 ("lib: remove librte_ prefix from directory names")
Cc: bruce.richardson@intel.com

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 lib/eal/windows/include/dirent.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/eal/windows/include/dirent.h b/lib/eal/windows/include/dirent.h
index 34eb077f8c..0a399d3145 100644
--- a/lib/eal/windows/include/dirent.h
+++ b/lib/eal/windows/include/dirent.h
@@ -28,6 +28,10 @@
 #include <sys/stat.h>
 #include <errno.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Maximum length of file name */
 #if !defined(PATH_MAX)
 #   define PATH_MAX MAX_PATH
-- 
2.25.1

Re: [PATCH 5/6] eal/windows: fix the curly braces mismatch problem

[Dmitry Kozlyuk]

2022-02-06 08:44 (UTC+0800), Weiguo Li:
> Supplement the first half of braces for the extern "C" block
> 
> Fixes: 99a2dd955fba6 ("lib: remove librte_ prefix from directory names")
> Cc: bruce.richardson@intel.com
> 
> Signed-off-by: Weiguo Li <liwg06@foxmail.com>
> ---
>  lib/eal/windows/include/dirent.h | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/lib/eal/windows/include/dirent.h b/lib/eal/windows/include/dirent.h
> index 34eb077f8c..0a399d3145 100644
> --- a/lib/eal/windows/include/dirent.h
> +++ b/lib/eal/windows/include/dirent.h
> @@ -28,6 +28,10 @@
>  #include <sys/stat.h>
>  #include <errno.h>
>  
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
>  /* Maximum length of file name */
>  #if !defined(PATH_MAX)
>  #   define PATH_MAX MAX_PATH

This file is not public, used only from DPDK C code.
Rather then adding the opening part, the closing part should be removed.
The "Fixes" tag is incorrect, should be:

Fixes: 6e1ed4cbbe99 ("eal/windows: add dirent implementation")
Cc: pallavi.kadam@intel.com

Re: [PATCH 5/6] eal/windows: fix the curly braces mismatch problem

[Weiguo Li]

On Sun, 6 Feb 2022 19:23:03 +0300, Dmitry Kozlyuk wrote:

> This file is not public, used only from DPDK C code.
> Rather then adding the opening part, the closing part should be removed.
> The "Fixes" tag is incorrect, should be:

> Fixes: 6e1ed4cbbe99 ("eal/windows: add dirent implementation")
> Cc: pallavi.kadam@intel.com
> 

Hi Dmitry,

Thanks for your remind. I'll update the patch later.

-Weiguo

[PATCH 6/6] eventdev: remove C++ include guard from private header

[Weiguo Li]

The extern "C" declaration is useless in private header,
as previous patch (http://dpdk.org/patch/98948) noted.
This file contains only a half part of the include guard,
just remove it.

Fixes: d35e61322de52 ("eventdev: move inline APIs into separate structure")
Cc: pbhagavatula@marvell.com

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 lib/eventdev/eventdev_pmd.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h
index d0b0c00a60..b05ffce549 100644
--- a/lib/eventdev/eventdev_pmd.h
+++ b/lib/eventdev/eventdev_pmd.h
@@ -1366,8 +1366,4 @@ void
 event_dev_fp_ops_set(struct rte_event_fp_ops *fp_ops,
 		     const struct rte_eventdev *dev);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _RTE_EVENTDEV_PMD_H_ */
-- 
2.25.1