Skip to content

Commit b5bc307

Browse files
Nicolas Pitrekartben
authored andcommitted
net: lwm2m: encapsulate ring buffer internals
Use struct ring_buf_index as a whole, don't access its constituants. Signed-off-by: Nicolas Pitre <[email protected]>
1 parent 8678367 commit b5bc307

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

subsys/net/lib/lwm2m/lwm2m_message_handling.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1403,9 +1403,7 @@ static int lwm2m_read_cached_data(struct lwm2m_message *msg,
14031403
read_info = &msg->cache_info->read_info[msg->cache_info->entry_size];
14041404
/* Store original timeseries ring buffer get states for failure handling */
14051405
read_info->cache_data = cached_data;
1406-
read_info->original_get_base = cached_data->rb.get.base;
1407-
read_info->original_get_head = cached_data->rb.get.head;
1408-
read_info->original_get_tail = cached_data->rb.get.tail;
1406+
read_info->original_rb_get = cached_data->rb.get;
14091407
msg->cache_info->entry_size++;
14101408
if (msg->cache_info->entry_limit) {
14111409
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
30793077

30803078
/* Put Ring buffer back to original */
30813079
for (int i = 0; i < cache_temp->entry_size; i++) {
3082-
cache_temp->read_info[i].cache_data->rb.get.head =
3083-
cache_temp->read_info[i].original_get_head;
3084-
cache_temp->read_info[i].cache_data->rb.get.tail =
3085-
cache_temp->read_info[i].original_get_tail;
3086-
cache_temp->read_info[i].cache_data->rb.get.base =
3087-
cache_temp->read_info[i].original_get_base;
3080+
cache_temp->read_info[i].cache_data->rb.get =
3081+
cache_temp->read_info[i].original_rb_get;
30883082
}
30893083

30903084
if (cache_temp->entry_limit) {

subsys/net/lib/lwm2m/lwm2m_registry.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,7 @@ struct lwm2m_time_series_resource {
219219

220220
struct lwm2m_cache_read_entry {
221221
struct lwm2m_time_series_resource *cache_data;
222-
int32_t original_get_head;
223-
int32_t original_get_tail;
224-
int32_t original_get_base;
222+
struct ring_buf_index original_rb_get;
225223
};
226224

227225
struct lwm2m_cache_read_info {

0 commit comments

Comments
 (0)