From b5bc30701960f67b6e921c085d9cd41d7c817d25 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Mon, 10 Mar 2025 11:50:02 -0400 Subject: [PATCH] net: lwm2m: encapsulate ring buffer internals Use struct ring_buf_index as a whole, don't access its constituants. Signed-off-by: Nicolas Pitre --- subsys/net/lib/lwm2m/lwm2m_message_handling.c | 12 +++--------- subsys/net/lib/lwm2m/lwm2m_registry.h | 4 +--- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/subsys/net/lib/lwm2m/lwm2m_message_handling.c b/subsys/net/lib/lwm2m/lwm2m_message_handling.c index 4a42c865ed7..faf11a14f96 100644 --- a/subsys/net/lib/lwm2m/lwm2m_message_handling.c +++ b/subsys/net/lib/lwm2m/lwm2m_message_handling.c @@ -1403,9 +1403,7 @@ static int lwm2m_read_cached_data(struct lwm2m_message *msg, read_info = &msg->cache_info->read_info[msg->cache_info->entry_size]; /* Store original timeseries ring buffer get states for failure handling */ read_info->cache_data = cached_data; - read_info->original_get_base = cached_data->rb.get.base; - read_info->original_get_head = cached_data->rb.get.head; - read_info->original_get_tail = cached_data->rb.get.tail; + read_info->original_rb_get = cached_data->rb.get; msg->cache_info->entry_size++; if (msg->cache_info->entry_limit) { length = MIN(length, msg->cache_info->entry_limit); @@ -3079,12 +3077,8 @@ static bool lwm2m_timeseries_data_rebuild(struct lwm2m_message *msg, int error_c /* Put Ring buffer back to original */ for (int i = 0; i < cache_temp->entry_size; i++) { - cache_temp->read_info[i].cache_data->rb.get.head = - cache_temp->read_info[i].original_get_head; - cache_temp->read_info[i].cache_data->rb.get.tail = - cache_temp->read_info[i].original_get_tail; - cache_temp->read_info[i].cache_data->rb.get.base = - cache_temp->read_info[i].original_get_base; + cache_temp->read_info[i].cache_data->rb.get = + cache_temp->read_info[i].original_rb_get; } if (cache_temp->entry_limit) { diff --git a/subsys/net/lib/lwm2m/lwm2m_registry.h b/subsys/net/lib/lwm2m/lwm2m_registry.h index 3489c0c3fc8..6c876551bf5 100644 --- a/subsys/net/lib/lwm2m/lwm2m_registry.h +++ b/subsys/net/lib/lwm2m/lwm2m_registry.h @@ -219,9 +219,7 @@ struct lwm2m_time_series_resource { struct lwm2m_cache_read_entry { struct lwm2m_time_series_resource *cache_data; - int32_t original_get_head; - int32_t original_get_tail; - int32_t original_get_base; + struct ring_buf_index original_rb_get; }; struct lwm2m_cache_read_info {