aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>2018-11-07 16:46:50 +0300
committerMaxim Uvarov <maxim.uvarov@linaro.org>2018-12-26 16:48:54 +0300
commite721288bf73f752015162eb594e294e58fb96a07 (patch)
tree25ff28bee4a39995f9b5289816b6e5e062e21a59
parent6aeb2eed6c65cb5830200c236b98b09a9a0f9245 (diff)
linux-gen: schedule: rename config to get_config
Rename config function to get_config to avoid collisions. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org> Signed-off-by: Balasubramanian Manoharan <bala.manoharan@linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer@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/odp_schedule_if.h4
-rw-r--r--platform/linux-generic/odp_schedule_basic.c4
-rw-r--r--platform/linux-generic/odp_thread.c8
3 files changed, 8 insertions, 8 deletions
diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h
index 889612693..abc64d0d4 100644
--- a/platform/linux-generic/include/odp_schedule_if.h
+++ b/platform/linux-generic/include/odp_schedule_if.h
@@ -53,7 +53,7 @@ typedef void (*schedule_order_unlock_lock_fn_t)(void);
typedef void (*schedule_order_lock_start_fn_t)(void);
typedef void (*schedule_order_lock_wait_fn_t)(void);
typedef uint32_t (*schedule_max_ordered_locks_fn_t)(void);
-typedef void (*schedule_config_fn_t)(schedule_config_t *config);
+typedef void (*schedule_get_config_fn_t)(schedule_config_t *config);
typedef struct schedule_fn_t {
schedule_pktio_start_fn_t pktio_start;
@@ -74,7 +74,7 @@ typedef struct schedule_fn_t {
schedule_order_lock_wait_fn_t wait_order_lock;
schedule_order_unlock_lock_fn_t order_unlock_lock;
schedule_max_ordered_locks_fn_t max_ordered_locks;
- schedule_config_fn_t config;
+ schedule_get_config_fn_t get_config;
} schedule_fn_t;
diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c
index b93e5c41f..f057f4689 100644
--- a/platform/linux-generic/odp_schedule_basic.c
+++ b/platform/linux-generic/odp_schedule_basic.c
@@ -1547,7 +1547,7 @@ static int schedule_num_grps(void)
return NUM_SCHED_GRPS;
}
-static void schedule_config(schedule_config_t *config)
+static void schedule_get_config(schedule_config_t *config)
{
*config = *(&sched->config_if);
};
@@ -1582,7 +1582,7 @@ const schedule_fn_t schedule_basic_fn = {
.order_lock = order_lock,
.order_unlock = order_unlock,
.max_ordered_locks = schedule_max_ordered_locks,
- .config = schedule_config
+ .get_config = schedule_get_config
};
/* Fill in scheduler API calls */
diff --git a/platform/linux-generic/odp_thread.c b/platform/linux-generic/odp_thread.c
index 7728929bb..b30174dde 100644
--- a/platform/linux-generic/odp_thread.c
+++ b/platform/linux-generic/odp_thread.c
@@ -142,10 +142,10 @@ int odp_thread_init_local(odp_thread_type_t type)
group_worker = 1;
group_control = 1;
- if (sched_fn->config) {
+ if (sched_fn->get_config) {
schedule_config_t schedule_config;
- sched_fn->config(&schedule_config);
+ sched_fn->get_config(&schedule_config);
group_all = schedule_config.group_enable.all;
group_worker = schedule_config.group_enable.worker;
group_control = schedule_config.group_enable.control;
@@ -196,10 +196,10 @@ int odp_thread_term_local(void)
group_worker = 1;
group_control = 1;
- if (sched_fn->config) {
+ if (sched_fn->get_config) {
schedule_config_t schedule_config;
- sched_fn->config(&schedule_config);
+ sched_fn->get_config(&schedule_config);
group_all = schedule_config.group_enable.all;
group_worker = schedule_config.group_enable.worker;
group_control = schedule_config.group_enable.control;