net: lwm2m: observations: add attr type to str

Allows strings used to be exposed outside of file.

Signed-off-by: Nick Ward <[email protected]>

Author: nixward

subsys/net/lib/lwm2m/lwm2m_observation.c

@@ -83,7 +83,6 @@ struct notification_attrs {
 };
 
 /* write-attribute related definitions */
-static const char *const LWM2M_ATTR_STR[] = {"pmin", "pmax", "gt", "lt", "st"};
 static const uint8_t LWM2M_ATTR_LEN[] = {4, 4, 2, 2, 2};
 
 static struct lwm2m_attr write_attr_pool[CONFIG_LWM2M_NUM_ATTR];
@@ -94,6 +93,24 @@ void lwm2m_engine_free_list(sys_slist_t *path_list, sys_slist_t *free_list);
 
 struct lwm2m_obj_path_list *lwm2m_engine_get_from_list(sys_slist_t *path_list);
 
+const char *const lwm2m_attr_to_str(uint8_t type)
+{
+	switch (type) {
+	case LWM2M_ATTR_PMIN:
+		return "pmin";
+	case LWM2M_ATTR_PMAX:
+		return "pmax";
+	case LWM2M_ATTR_GT:
+		return "gt";
+	case LWM2M_ATTR_LT:
+		return "lt";
+	case LWM2M_ATTR_STEP:
+		return "st";
+	default:
+		return "unknown";
+	}
+}
+
 static int update_attrs(void *ref, struct notification_attrs *out)
 {
 	int i;
@@ -873,10 +890,10 @@ static int lwm2m_update_or_allocate_attribute(void *ref, uint8_t type, void *dat
 
 		if (type <= LWM2M_ATTR_PMAX) {
 			attr->int_val = *(int32_t *)data;
-			LOG_DBG("Update %s to %d", LWM2M_ATTR_STR[type], attr->int_val);
+			LOG_DBG("Update %s to %d", lwm2m_attr_to_str(type), attr->int_val);
 		} else {
 			attr->float_val = *(double *)data;
-			LOG_DBG("Update %s to %f", LWM2M_ATTR_STR[type], attr->float_val);
+			LOG_DBG("Update %s to %f", lwm2m_attr_to_str(type), attr->float_val);
 		}
 		return 0;
 	}
@@ -899,10 +916,10 @@ static int lwm2m_update_or_allocate_attribute(void *ref, uint8_t type, void *dat
 
 	if (type <= LWM2M_ATTR_PMAX) {
 		attr->int_val = *(int32_t *)data;
-		LOG_DBG("Add %s to %d", LWM2M_ATTR_STR[type], attr->int_val);
+		LOG_DBG("Add %s to %d", lwm2m_attr_to_str(type), attr->int_val);
 	} else {
 		attr->float_val = *(double *)data;
-		LOG_DBG("Add %s to %f", LWM2M_ATTR_STR[type], attr->float_val);
+		LOG_DBG("Add %s to %f", lwm2m_attr_to_str(type), attr->float_val);
 	}
 	return 0;
 }
@@ -913,7 +930,7 @@ const char *lwm2m_engine_get_attr_name(const struct lwm2m_attr *attr)
 		return NULL;
 	}
 
-	return LWM2M_ATTR_STR[attr->type];
+	return lwm2m_attr_to_str(attr->type);
 }
 
 static int lwm2m_engine_observer_timestamp_update(sys_slist_t *observer,
@@ -1175,7 +1192,8 @@ int lwm2m_write_attr_handler(struct lwm2m_engine_obj *obj, struct lwm2m_message
 		/* matching attribute name */
 		for (type = 0U; type < NR_LWM2M_ATTR; type++) {
 			if (LWM2M_ATTR_LEN[type] == plen &&
-			    !memcmp(options[i].value, LWM2M_ATTR_STR[type], LWM2M_ATTR_LEN[type])) {
+			    !memcmp(options[i].value, lwm2m_attr_to_str(type),
+				    LWM2M_ATTR_LEN[type])) {
 				break;
 			}
 		}
@@ -1224,7 +1242,7 @@ int lwm2m_write_attr_handler(struct lwm2m_engine_obj *obj, struct lwm2m_message
 		}
 
 		if (ret < 0) {
-			LOG_ERR("invalid attr[%s] value", LWM2M_ATTR_STR[type]);
+			LOG_ERR("invalid attr[%s] value", lwm2m_attr_to_str(type));
 			/* bad request */
 			return -EEXIST;
 		}
@@ -1270,7 +1288,7 @@ int lwm2m_write_attr_handler(struct lwm2m_engine_obj *obj, struct lwm2m_message
 		type = attr->type;
 
 		if (!(BIT(type) & nattrs.flags)) {
-			LOG_DBG("Unset attr %s", LWM2M_ATTR_STR[type]);
+			LOG_DBG("Unset attr %s", lwm2m_attr_to_str(type));
 			(void)memset(attr, 0, sizeof(*attr));
 
 			if (type <= LWM2M_ATTR_PMAX) {
@@ -1290,15 +1308,15 @@ int lwm2m_write_attr_handler(struct lwm2m_engine_obj *obj, struct lwm2m_message
 			attr->int_val = *(int32_t *)nattr_ptrs[type];
 			update_observe_node = true;
 
-			LOG_DBG("Update %s to %d", LWM2M_ATTR_STR[type], attr->int_val);
+			LOG_DBG("Update %s to %d", lwm2m_attr_to_str(type), attr->int_val);
 		} else {
 			if (attr->float_val == *(double *)nattr_ptrs[type]) {
 				continue;
 			}
 
 			attr->float_val = *(double *)nattr_ptrs[type];
 
-			LOG_DBG("Update %s to %f", LWM2M_ATTR_STR[type], attr->float_val);
+			LOG_DBG("Update %s to %f", lwm2m_attr_to_str(type), attr->float_val);
 		}
 	}
 
@@ -1327,11 +1345,11 @@ int lwm2m_write_attr_handler(struct lwm2m_engine_obj *obj, struct lwm2m_message
 			attr->int_val = *(int32_t *)nattr_ptrs[type];
 			update_observe_node = true;
 
-			LOG_DBG("Add %s to %d", LWM2M_ATTR_STR[type], attr->int_val);
+			LOG_DBG("Add %s to %d", lwm2m_attr_to_str(type), attr->int_val);
 		} else {
 			attr->float_val = *(double *)nattr_ptrs[type];
 
-			LOG_DBG("Add %s to %f", LWM2M_ATTR_STR[type], attr->float_val);
+			LOG_DBG("Add %s to %f", lwm2m_attr_to_str(type), attr->float_val);
 		}
 
 		nattrs.flags &= ~BIT(type);

subsys/net/lib/lwm2m/lwm2m_observation.h

@@ -30,6 +30,8 @@ struct observe_node {
 struct lwm2m_attr *lwm2m_engine_get_next_attr(const void *ref, struct lwm2m_attr *prev);
 const char *lwm2m_engine_get_attr_name(const struct lwm2m_attr *attr);
 
+const char *const lwm2m_attr_to_str(uint8_t type);
+
 void clear_attrs(void *ref);
 
 int64_t engine_observe_shedule_next_event(struct observe_node *obs, uint16_t srv_obj_inst,