From ca33590b6af032bff57d9cc70455660466a654b2 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 19 Feb 2018 11:16:57 +0000 Subject: New upstream version 18.02 Change-Id: I89ed24cb2a49b78fe5be6970b99dd46c1499fcc3 Signed-off-by: Luca Boccassi --- drivers/net/nfp/nfp_net_logs.h | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'drivers/net/nfp/nfp_net_logs.h') diff --git a/drivers/net/nfp/nfp_net_logs.h b/drivers/net/nfp/nfp_net_logs.h index 0b966e43..3fe24e96 100644 --- a/drivers/net/nfp/nfp_net_logs.h +++ b/drivers/net/nfp/nfp_net_logs.h @@ -34,16 +34,10 @@ #include -#define RTE_LIBRTE_NFP_NET_DEBUG_INIT 1 - -#ifdef RTE_LIBRTE_NFP_NET_DEBUG_INIT +extern int nfp_logtype_init; #define PMD_INIT_LOG(level, fmt, args...) \ RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") -#else -#define PMD_INIT_LOG(level, fmt, args...) do { } while (0) -#define PMD_INIT_FUNC_TRACE() do { } while (0) -#endif #ifdef RTE_LIBRTE_NFP_NET_DEBUG_RX #define PMD_RX_LOG(level, fmt, args...) \ @@ -55,21 +49,15 @@ #ifdef RTE_LIBRTE_NFP_NET_DEBUG_TX #define PMD_TX_LOG(level, fmt, args...) \ RTE_LOG(level, PMD, "%s() tx: " fmt, __func__, ## args) +#define ASSERT(x) if (!(x)) rte_panic("NFP_NET: x") #else #define PMD_TX_LOG(level, fmt, args...) do { } while (0) +#define ASSERT(x) do { } while (0) #endif -#ifdef RTE_LIBRTE_NFP_NET_DEBUG_DRIVER +extern int nfp_logtype_driver; #define PMD_DRV_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt, __func__, ## args) -#else -#define PMD_DRV_LOG(level, fmt, args...) do { } while (0) -#endif - -#ifdef RTE_LIBRTE_NFP_NET_DEBUG_INIT -#define ASSERT(x) if (!(x)) rte_panic("NFP_NET: x") -#else -#define ASSERT(x) do { } while (0) -#endif + rte_log(RTE_LOG_ ## level, nfp_logtype_driver, \ + "%s(): " fmt, __func__, ## args) #endif /* _NFP_NET_LOGS_H_ */ -- cgit 1.2.3-korg