From 56e240e528ca90a9fd2bf00a6cbd1c40ec8036da Mon Sep 17 00:00:00 2001 From: Michael Scott Date: Thu, 12 Jul 2018 10:00:00 -0700 Subject: [PATCH] net: lwm2m: make lwm2m_engine_exec_cb_t more generic Let's rename lwm2m_engine_exec_cb_t to lwm2m_engine_user_cb_t so that future user-code callbacks can make use of the same definition. Signed-off-by: Michael Scott --- include/net/lwm2m.h | 8 ++++---- subsys/net/lib/lwm2m/lwm2m_engine.c | 2 +- subsys/net/lib/lwm2m/lwm2m_obj_firmware.c | 8 ++++---- subsys/net/lib/lwm2m/lwm2m_object.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/net/lwm2m.h b/include/net/lwm2m.h index 047cca1a852..19cb5ff4797 100644 --- a/include/net/lwm2m.h +++ b/include/net/lwm2m.h @@ -81,7 +81,7 @@ typedef void *(*lwm2m_engine_get_data_cb_t)(u16_t obj_inst_id, typedef int (*lwm2m_engine_set_data_cb_t)(u16_t obj_inst_id, u8_t *data, u16_t data_len, bool last_block, size_t total_size); -typedef int (*lwm2m_engine_exec_cb_t)(u16_t obj_inst_id); +typedef int (*lwm2m_engine_user_cb_t)(u16_t obj_inst_id); /* LWM2M Device Object */ @@ -144,8 +144,8 @@ void lwm2m_firmware_set_write_cb(lwm2m_engine_set_data_cb_t cb); lwm2m_engine_set_data_cb_t lwm2m_firmware_get_write_cb(void); #if defined(CONFIG_LWM2M_FIRMWARE_UPDATE_PULL_SUPPORT) -void lwm2m_firmware_set_update_cb(lwm2m_engine_exec_cb_t cb); -lwm2m_engine_exec_cb_t lwm2m_firmware_get_update_cb(void); +void lwm2m_firmware_set_update_cb(lwm2m_engine_user_cb_t cb); +lwm2m_engine_user_cb_t lwm2m_firmware_get_update_cb(void); #endif #endif @@ -205,7 +205,7 @@ int lwm2m_engine_register_pre_write_callback(char *path, int lwm2m_engine_register_post_write_callback(char *path, lwm2m_engine_set_data_cb_t cb); int lwm2m_engine_register_exec_callback(char *path, - lwm2m_engine_exec_cb_t cb); + lwm2m_engine_user_cb_t cb); /* resource data bit values */ #define LWM2M_RES_DATA_READ_ONLY 0 diff --git a/subsys/net/lib/lwm2m/lwm2m_engine.c b/subsys/net/lib/lwm2m/lwm2m_engine.c index 01de7a28885..5f3a735cd69 100644 --- a/subsys/net/lib/lwm2m/lwm2m_engine.c +++ b/subsys/net/lib/lwm2m/lwm2m_engine.c @@ -1883,7 +1883,7 @@ int lwm2m_engine_register_post_write_callback(char *pathstr, } int lwm2m_engine_register_exec_callback(char *pathstr, - lwm2m_engine_exec_cb_t cb) + lwm2m_engine_user_cb_t cb) { int ret; struct lwm2m_engine_res_inst *res = NULL; diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c b/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c index 6e288725bfa..0f5338a5b53 100644 --- a/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c +++ b/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c @@ -57,7 +57,7 @@ static struct lwm2m_engine_obj_inst inst; static struct lwm2m_engine_res_inst res[FIRMWARE_MAX_ID]; static lwm2m_engine_set_data_cb_t write_cb; -static lwm2m_engine_exec_cb_t update_cb; +static lwm2m_engine_user_cb_t update_cb; #ifdef CONFIG_LWM2M_FIRMWARE_UPDATE_PULL_SUPPORT extern int lwm2m_firmware_start_transfer(char *package_uri); @@ -256,19 +256,19 @@ lwm2m_engine_set_data_cb_t lwm2m_firmware_get_write_cb(void) return write_cb; } -void lwm2m_firmware_set_update_cb(lwm2m_engine_exec_cb_t cb) +void lwm2m_firmware_set_update_cb(lwm2m_engine_user_cb_t cb) { update_cb = cb; } -lwm2m_engine_exec_cb_t lwm2m_firmware_get_update_cb(void) +lwm2m_engine_user_cb_t lwm2m_firmware_get_update_cb(void) { return update_cb; } static int firmware_update_cb(u16_t obj_inst_id) { - lwm2m_engine_exec_cb_t callback; + lwm2m_engine_user_cb_t callback; u8_t state; int ret; diff --git a/subsys/net/lib/lwm2m/lwm2m_object.h b/subsys/net/lib/lwm2m/lwm2m_object.h index 22798d76c79..af2976cbb8f 100644 --- a/subsys/net/lib/lwm2m/lwm2m_object.h +++ b/subsys/net/lib/lwm2m/lwm2m_object.h @@ -230,7 +230,7 @@ struct lwm2m_engine_res_inst { lwm2m_engine_get_data_cb_t read_cb; lwm2m_engine_get_data_cb_t pre_write_cb; lwm2m_engine_set_data_cb_t post_write_cb; - lwm2m_engine_exec_cb_t execute_cb; + lwm2m_engine_user_cb_t execute_cb; u8_t *multi_count_var; void *data_ptr;