Skip to content

Commit c7ed9f3

Browse files
Juha Heiskanenrlubos
authored andcommitted
net: lwm2m: Removed LTE registration callback
Removed LTE notification from subsys and moved functionality to application for controlling LTE connection status. Signed-off-by: Juha Heiskanen <[email protected]>
1 parent aa04c37 commit c7ed9f3

File tree

3 files changed

+0
-61
lines changed

3 files changed

+0
-61
lines changed

include/net/lwm2m_client_utils.h

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -215,26 +215,6 @@ void location_assist_cell_inform_set(void);
215215
int lwm2m_init_cellular_connectivity_object(void);
216216
#endif
217217

218-
#if defined(CONFIG_LWM2M_CLIENT_UTILS_NWK_REG_NOTIFICATION)
219-
/**
220-
* @brief LTE network registration update state change event callback.
221-
*
222-
* @param[in] connected Network registration status True or False
223-
*
224-
*/
225-
typedef void (*lwm2m_lte_nwk_reg_update_state_cb_t)(bool connected);
226-
227-
/**
228-
* @brief Register a callback for receiving LTE network status notifications.
229-
*
230-
* @param[in] cb A callback function to receive LTE network status notifications
231-
*
232-
* @return Returns a negative error code (errno.h) indicating
233-
* reason of failure or 0 for success.
234-
*/
235-
int lwm2m_lte_reg_handler_register(lwm2m_lte_nwk_reg_update_state_cb_t cb);
236-
#endif
237-
238218
#ifdef __cplusplus
239219
}
240220
#endif

subsys/net/lib/lwm2m_client_utils/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,6 @@ config LWM2M_CELL_CONN_APN_PROFILE_COUNT
168168
default 3
169169

170170
endif #LWM2M_CLIENT_UTILS_CELL_CONN_OBJ_SUPPORT
171-
config LWM2M_CLIENT_UTILS_NWK_REG_NOTIFICATION
172-
bool "Enable LTE network registration status notifications"
173-
select LWM2M_LTE_EVENT_LISTENER
174171

175172
module = LWM2M_CLIENT_UTILS
176173
module-dep = LOG

subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_lte_notification.c

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -126,38 +126,6 @@ int lwm2m_ncell_handler_register(void)
126126
}
127127
#endif /* CONFIG_LWM2M_CLIENT_UTILS_NEIGHBOUR_CELL_LISTENER */
128128

129-
#if defined(CONFIG_LWM2M_CLIENT_UTILS_NWK_REG_NOTIFICATION)
130-
static lwm2m_lte_nwk_reg_update_state_cb_t lte_nwk_reg_cb;
131-
132-
int lwm2m_lte_reg_handler_register(lwm2m_lte_nwk_reg_update_state_cb_t cb)
133-
{
134-
lte_nwk_reg_cb = cb;
135-
lte_lc_register_handler(lte_notify_handler);
136-
137-
return 0;
138-
}
139-
140-
static void lwm2m_lte_reg_handler_notify(enum lte_lc_nw_reg_status nw_reg_status)
141-
{
142-
bool status;
143-
144-
if (!lte_nwk_reg_cb) {
145-
return;
146-
}
147-
148-
LOG_DBG("LTE NW status: %d", nw_reg_status);
149-
if ((nw_reg_status == LTE_LC_NW_REG_REGISTERED_HOME) ||
150-
(nw_reg_status == LTE_LC_NW_REG_REGISTERED_ROAMING)) {
151-
status = true;
152-
} else {
153-
status = false;
154-
}
155-
156-
lte_nwk_reg_cb(status);
157-
}
158-
#endif /* CONFIG_LWM2M_CLIENT_UTILS_NWK_REG_NOTIFICATION */
159-
160-
161129
void lte_notify_handler(const struct lte_lc_evt *const evt)
162130
{
163131
switch (evt->type) {
@@ -186,12 +154,6 @@ void lte_notify_handler(const struct lte_lc_evt *const evt)
186154
break;
187155
#endif /* CONFIG_LWM2M_CLIENT_UTILS_NEIGHBOUR_CELL_LISTENER */
188156

189-
#if defined(CONFIG_LWM2M_CLIENT_UTILS_NWK_REG_NOTIFICATION)
190-
case LTE_LC_EVT_NW_REG_STATUS:
191-
lwm2m_lte_reg_handler_notify(evt->nw_reg_status);
192-
break;
193-
#endif /* CONFIG_LWM2M_CLIENT_UTILS_NWK_REG_NOTIFICATION */
194-
195157
#if defined(CONFIG_LTE_LC_TAU_PRE_WARNING_NOTIFICATIONS)
196158
case LTE_LC_EVT_TAU_PRE_WARNING:
197159
if (!lwm2m_rd_client_ctx()) {

0 commit comments

Comments
 (0)