Change prefix ntlog_ to prefix nthw_log for logging functions.
Signed-off-by: Serhii Iliushyk <sil-...@napatech.com>
---
.../net/ntnic/nthw/model/nthw_fpga_model.c | 20 +++++++++----------
drivers/net/ntnic/nthw/nthw_rac.c | 20 +++++++++----------
drivers/net/ntnic/ntlog/ntlog.c | 6 +++---
drivers/net/ntnic/ntlog/ntlog.h | 6 +++---
4 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/drivers/net/ntnic/nthw/model/nthw_fpga_model.c
b/drivers/net/ntnic/nthw/model/nthw_fpga_model.c
index b9d03b4982..1dc604fe65 100644
--- a/drivers/net/ntnic/nthw/model/nthw_fpga_model.c
+++ b/drivers/net/ntnic/nthw/model/nthw_fpga_model.c
@@ -727,17 +727,17 @@ void nthw_register_update(const nthw_register_t *p)
uint32_t i = len;
uint32_t *ptr = p_data;
(void)ptr;
- char *tmp_string =
ntlog_helper_str_alloc("Register::read");
- ntlog_helper_str_add(tmp_string,
+ char *tmp_string =
nthw_log_helper_str_alloc("Register::read");
+ nthw_log_helper_str_add(tmp_string,
"(Dev: %s, Bus: %s, Addr: 0x%08X, Cnt: %d,
Data:",
p_dev_name, p_bus_name, addr, len);
while (i--)
- ntlog_helper_str_add(tmp_string, " 0x%08X",
*ptr++);
+ nthw_log_helper_str_add(tmp_string, " 0x%08X",
*ptr++);
- ntlog_helper_str_add(tmp_string, ")");
+ nthw_log_helper_str_add(tmp_string, ")");
NT_LOG(DBG, NTHW, "%s", tmp_string);
- ntlog_helper_str_free(tmp_string);
+ nthw_log_helper_str_free(tmp_string);
}
}
}
@@ -780,18 +780,18 @@ void nthw_register_flush(const nthw_register_t *p,
uint32_t cnt)
if (p->mn_debug_mode & NTHW_REG_DEBUG_ON_WRITE) {
uint32_t i = len * cnt;
uint32_t *ptr = p_data;
- char *tmp_string =
ntlog_helper_str_alloc("Register::write");
+ char *tmp_string =
nthw_log_helper_str_alloc("Register::write");
- ntlog_helper_str_add(tmp_string,
+ nthw_log_helper_str_add(tmp_string,
"(Dev: %s, Bus: %s, Addr: 0x%08X, Cnt: %d,
Data:",
p_dev_name, p_bus_name, addr, i);
while (i--)
- ntlog_helper_str_add(tmp_string, " 0x%08X",
*ptr++);
+ nthw_log_helper_str_add(tmp_string, " 0x%08X",
*ptr++);
- ntlog_helper_str_add(tmp_string, ")");
+ nthw_log_helper_str_add(tmp_string, ")");
NT_LOG(DBG, NTHW, "%s", tmp_string);
- ntlog_helper_str_free(tmp_string);
+ nthw_log_helper_str_free(tmp_string);
}
rc = nthw_register_write_data(p, cnt);
diff --git a/drivers/net/ntnic/nthw/nthw_rac.c
b/drivers/net/ntnic/nthw/nthw_rac.c
index 4845c2b0c9..a2a96794da 100644
--- a/drivers/net/ntnic/nthw/nthw_rac.c
+++ b/drivers/net/ntnic/nthw/nthw_rac.c
@@ -654,8 +654,8 @@ int nthw_rac_rab_write32(nthw_rac_t *p, bool trc,
nthw_rab_bus_id_t bus_id, uint
char *tmp_string;
if (trc) {
- tmp_string =
ntlog_helper_str_alloc("Register::write");
- ntlog_helper_str_add(tmp_string,
+ tmp_string =
nthw_log_helper_str_alloc("Register::write");
+ nthw_log_helper_str_add(tmp_string,
"(Dev: NA, Bus: RAB%u, Addr: 0x%08X,
Cnt: %d, Data:",
bus_id, address, word_cnt);
}
@@ -669,13 +669,13 @@ int nthw_rac_rab_write32(nthw_rac_t *p, bool trc,
nthw_rab_bus_id_t bus_id, uint
}
if (trc)
- ntlog_helper_str_add(tmp_string, "
0x%08X", data);
+ nthw_log_helper_str_add(tmp_string, "
0x%08X", data);
}
if (trc) {
- ntlog_helper_str_add(tmp_string, ")");
+ nthw_log_helper_str_add(tmp_string, ")");
NT_LOG(DBG, NTHW, "%s", tmp_string);
- ntlog_helper_str_free(tmp_string);
+ nthw_log_helper_str_free(tmp_string);
}
}
@@ -840,17 +840,17 @@ int nthw_rac_rab_read32(nthw_rac_t *p, bool trc,
nthw_rab_bus_id_t bus_id, uint3
}
if (trc) {
- char *tmp_string =
ntlog_helper_str_alloc("Register::read");
- ntlog_helper_str_add(tmp_string,
+ char *tmp_string =
nthw_log_helper_str_alloc("Register::read");
+ nthw_log_helper_str_add(tmp_string,
"(Dev: NA, Bus: RAB%u, Addr: 0x%08X,
Cnt: %d, Data:",
bus_id, address, word_cnt);
for (i = 0; i < word_cnt; i++)
- ntlog_helper_str_add(tmp_string, "
0x%08X", p_data[i]);
+ nthw_log_helper_str_add(tmp_string, "
0x%08X", p_data[i]);
- ntlog_helper_str_add(tmp_string, ")");
+ nthw_log_helper_str_add(tmp_string, ")");
NT_LOG(DBG, NTHW, "%s", tmp_string);
- ntlog_helper_str_free(tmp_string);
+ nthw_log_helper_str_free(tmp_string);
}
}
diff --git a/drivers/net/ntnic/ntlog/ntlog.c b/drivers/net/ntnic/ntlog/ntlog.c
index 7b7f583364..1ee0f40286 100644
--- a/drivers/net/ntnic/ntlog/ntlog.c
+++ b/drivers/net/ntnic/ntlog/ntlog.c
@@ -16,7 +16,7 @@
#define NTLOG_HELPER_STR_SIZE_MAX (1024)
-char *ntlog_helper_str_alloc(const char *sinit)
+char *nthw_log_helper_str_alloc(const char *sinit)
{
char *s = malloc(NTLOG_HELPER_STR_SIZE_MAX);
@@ -33,7 +33,7 @@ char *ntlog_helper_str_alloc(const char *sinit)
}
__rte_format_printf(2, 0)
-void ntlog_helper_str_add(char *s, const char *format, ...)
+void nthw_log_helper_str_add(char *s, const char *format, ...)
{
if (!s)
return;
@@ -45,7 +45,7 @@ void ntlog_helper_str_add(char *s, const char *format, ...)
va_end(args);
}
-void ntlog_helper_str_free(char *s)
+void nthw_log_helper_str_free(char *s)
{
free(s);
}
diff --git a/drivers/net/ntnic/ntlog/ntlog.h b/drivers/net/ntnic/ntlog/ntlog.h
index fd839e5cff..810b07efd0 100644
--- a/drivers/net/ntnic/ntlog/ntlog.h
+++ b/drivers/net/ntnic/ntlog/ntlog.h
@@ -65,8 +65,8 @@ extern int nt_log_ntnic;
* to use when one single function call to NT_LOG is not optimal - that is
* you do not know the number of parameters at programming time or it is
variable
*/
-char *ntlog_helper_str_alloc(const char *sinit);
-void ntlog_helper_str_add(char *s, const char *format, ...);
-void ntlog_helper_str_free(char *s);
+char *nthw_log_helper_str_alloc(const char *sinit);
+void nthw_log_helper_str_add(char *s, const char *format, ...);
+void nthw_log_helper_str_free(char *s);
#endif /* NTOSS_SYSTEM_NTLOG_H */
--
2.45.0
