aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Holmes <mike.holmes@linaro.org>2015-01-20 18:37:56 -0500
committerMaxim Uvarov <maxim.uvarov@linaro.org>2015-01-22 12:11:56 +0300
commit6c0c7f722db94503c067c8641523265a9a8cb32b (patch)
tree1e7b2f6057ba8bccae25607f17778ace2fe4d3fa
parentb776ca47c0d88758aac0dd6a1f0e591b045852ec (diff)
linux-generic: allow init_global to replace log fn
Add the ability to pass in a new logging function as a pointer to init_global Signed-off-by: Mike Holmes <mike.holmes@linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen@linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
-rw-r--r--platform/linux-generic/include/api/odp_init.h3
-rw-r--r--platform/linux-generic/odp_init.c6
2 files changed, 8 insertions, 1 deletions
diff --git a/platform/linux-generic/include/api/odp_init.h b/platform/linux-generic/include/api/odp_init.h
index 22ed88d..73c4a3b 100644
--- a/platform/linux-generic/include/api/odp_init.h
+++ b/platform/linux-generic/include/api/odp_init.h
@@ -29,7 +29,7 @@ extern "C" {
#include <odp_std_types.h>
-
+#include <odp_debug.h>
/** @defgroup odp_initialization ODP INITIALIZATION
* Initialisation operations.
@@ -42,6 +42,7 @@ extern "C" {
* level etc.
*/
typedef struct odp_init_t {
+ odp_log_func_t log_fn;
} odp_init_t;
/** ODP platform initialization data.
diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c
index 4f152ac..9815ecf 100644
--- a/platform/linux-generic/odp_init.c
+++ b/platform/linux-generic/odp_init.c
@@ -15,6 +15,12 @@ int odp_init_global(odp_init_t *params ODP_UNUSED,
{
odp_global_data.log_fn = odp_override_log;
+ if (params != NULL) {
+ if (params->log_fn != NULL)
+ odp_global_data.log_fn = params->log_fn;
+ }
+
+
odp_system_info_init();
if (odp_shm_init_global()) {