michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: Rename timer object instance create function

Browse source 
Rename timer object instance create funciton `timer_create` to fix a
name collision regression with a POSIX function in `timer.h`. The issue
was introduced with commit 73a637eda0 when
first including`timer.h` into `lwm2ms.h`.

Signed-off-by: Marc Lasch <mlasch@mailbox.org>
This commit is contained in:
Marc Lasch 2022-10-13 14:25:41 +02:00 • committed by Carles Cufí
commit df68307121
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsys/net/lib/lwm2m/ipso_timer.c
View file

@ -275,7 +275,7 @@ static int timer_trigger_cb(uint16_t obj_inst_id,
return start_timer(&timer_data[i]); return start_timer(&timer_data[i]);
} }
static struct lwm2m_engine_obj_inst *timer_create(uint16_t obj_inst_id) static struct lwm2m_engine_obj_inst *timer_inst_create(uint16_t obj_inst_id)
{ {
int index, avail = -1, i = 0, j = 0; int index, avail = -1, i = 0, j = 0;
@ -362,7 +362,7 @@ static int ipso_timer_init(const struct device *dev)
timer.fields = fields; timer.fields = fields;
timer.field_count = ARRAY_SIZE(fields); timer.field_count = ARRAY_SIZE(fields);
timer.max_instance_count = MAX_INSTANCE_COUNT; timer.max_instance_count = MAX_INSTANCE_COUNT;
timer.create_cb = timer_create; timer.create_cb = timer_inst_create;
lwm2m_register_obj(&timer); lwm2m_register_obj(&timer);
return 0; return 0;