bluetooth: services: ble_lbs: change error codes to nrf_error

Change error codes to nrf_errors.

Signed-off-by: Eivind Jølsgard <eivind.jolsgard@nordicsemi.no>

Author: eivindj-nordic

doc/nrf-bm/release_notes/release_notes_changelog.rst

@@ -78,6 +78,7 @@ Libraries
   * :ref:`lib_ble_service_bas` service.
   * :ref:`lib_ble_service_dis` service.
   * :ref:`lib_ble_service_hrs` service.
+  * :ref:`lib_ble_service_lbs` service.
 
 * :ref:`lib_ble_conn_params` library:
 

include/bm/bluetooth/services/ble_lbs.h

@@ -94,9 +94,11 @@ struct ble_lbs {
  *                 be used to identify this particular service instance.
  * @param[in] cfg  Information needed to initialize the service.
  *
- * @retval 0 If the service was initialized successfully. Otherwise, an error code is returned.
+ * @retval NRF_SUCCESS If the service was initialized successfully.
+ * @retval NRF_ERROR_NULL If @p lbs or @p cfg is NULL.
+ * @retval NRF_ERROR_INVALID_PARAM If the supplied configuration is invalid.
  */
-int ble_lbs_init(struct ble_lbs *lbs, const struct ble_lbs_config *cfg);
+uint32_t ble_lbs_init(struct ble_lbs *lbs, const struct ble_lbs_config *cfg);
 
 /**
  * @brief Function for handling the application's BLE stack events.
@@ -117,9 +119,11 @@ void ble_lbs_on_ble_evt(const ble_evt_t *ble_evt, void *lbs_instance);
  * @param[in] lbs           LED Button Service structure.
  * @param[in] button_state  New button state.
  *
- * @retval 0 If the notification was sent successfully. Otherwise, an error code is returned.
+ * @retval NRF_SUCCESS If the notification was sent successfully.
+ * @retval NRF_ERROR_NULL If @p lbs is NULL.
+ * @retval NRF_ERROR_INVALID_PARAM If the parameters are invalid.
  */
-int ble_lbs_on_button_change(struct ble_lbs *lbs, uint16_t conn_handle, uint8_t button_state);
+uint32_t ble_lbs_on_button_change(struct ble_lbs *lbs, uint16_t conn_handle, uint8_t button_state);
 
 #ifdef __cplusplus
 }

samples/bluetooth/ble_lbs/src/main.c

@@ -180,9 +180,9 @@ int main(void)
 		goto idle;
 	}
 
-	err = ble_lbs_init(&ble_lbs, &lbs_cfg);
-	if (err) {
-		LOG_ERR("Failed to setup LED Button Service, err %d", err);
+	nrf_err = ble_lbs_init(&ble_lbs, &lbs_cfg);
+	if (nrf_err) {
+		LOG_ERR("Failed to setup LED Button Service, nrf_error %#x", nrf_err);
 		goto idle;
 	}
 

subsys/bluetooth/services/ble_lbs/lbs.c

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
+#include <nrf_error.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/logging/log.h>
 #include <bm/bluetooth/services/ble_lbs.h>
@@ -52,23 +53,23 @@ void ble_lbs_on_ble_evt(const ble_evt_t *ble_evt, void *lbs_instance)
 
 int ble_lbs_init(struct ble_lbs *lbs, const struct ble_lbs_config *cfg)
 {
-	int err;
+	uint32_t nrf_err;
 	ble_uuid_t ble_uuid;
 	uint8_t initial_value = 0;
 
 	if (!lbs || !cfg) {
-		return -EFAULT;
+		return NRF_ERROR_NULL;
 	}
 
 	/* Initialize service structure. */
 	lbs->evt_handler = cfg->evt_handler;
 
 	ble_uuid128_t base_uuid = { .uuid128 = BLE_UUID_LBS_BASE };
 
-	err = sd_ble_uuid_vs_add(&base_uuid, &lbs->uuid_type);
-	if (err != NRF_SUCCESS) {
-		LOG_ERR("Failed to add vendor UUID, nrf_error %#x", err);
-		return -EINVAL;
+	nrf_err = sd_ble_uuid_vs_add(&base_uuid, &lbs->uuid_type);
+	if (nrf_err) {
+		LOG_ERR("Failed to add vendor UUID, nrf_error %#x", nrf_err);
+		return NRF_ERROR_INVALID_PARAM;
 	}
 
 	ble_uuid = (ble_uuid_t) {
@@ -77,11 +78,11 @@ int ble_lbs_init(struct ble_lbs *lbs, const struct ble_lbs_config *cfg)
 	};
 
 	/* Add service. */
-	err = sd_ble_gatts_service_add(BLE_GATTS_SRVC_TYPE_PRIMARY, &ble_uuid,
+	nrf_err = sd_ble_gatts_service_add(BLE_GATTS_SRVC_TYPE_PRIMARY, &ble_uuid,
 				       &lbs->service_handle);
-	if (err != NRF_SUCCESS) {
-		LOG_ERR("Failed to add GATT service, nrf_error %#x", err);
-		return -EINVAL;
+	if (nrf_err != NRF_SUCCESS) {
+		LOG_ERR("Failed to add GATT service, nrf_error %#x", nrf_err);
+		return NRF_ERROR_INVALID_PARAM;
 	}
 
 	/* Add Button characteristic. */
@@ -113,11 +114,11 @@ int ble_lbs_init(struct ble_lbs *lbs, const struct ble_lbs_config *cfg)
 	BLE_GAP_CONN_SEC_MODE_SET_OPEN(&cccd_md.read_perm);
 	BLE_GAP_CONN_SEC_MODE_SET_OPEN(&cccd_md.write_perm);
 
-	err = sd_ble_gatts_characteristic_add(lbs->service_handle, &char_md, &attr_char_value,
+	nrf_err = sd_ble_gatts_characteristic_add(lbs->service_handle, &char_md, &attr_char_value,
 					      &lbs->button_char_handles);
-	if (err) {
-		LOG_ERR("Failed to add button GATT characteristic, nrf_error %#x", err);
-		return -EINVAL;
+	if (nrf_err) {
+		LOG_ERR("Failed to add button GATT characteristic, nrf_error %#x", nrf_err);
+		return NRF_ERROR_INVALID_PARAM;
 	}
 
 	/* Add LED characteristic. */
@@ -145,24 +146,24 @@ int ble_lbs_init(struct ble_lbs *lbs, const struct ble_lbs_config *cfg)
 	BLE_GAP_CONN_SEC_MODE_SET_OPEN(&attr_md.read_perm);
 	BLE_GAP_CONN_SEC_MODE_SET_OPEN(&attr_md.write_perm);
 
-	err = sd_ble_gatts_characteristic_add(lbs->service_handle, &char_md, &attr_char_value,
+	nrf_err = sd_ble_gatts_characteristic_add(lbs->service_handle, &char_md, &attr_char_value,
 					      &lbs->led_char_handles);
-	if (err) {
-		LOG_ERR("Failed to add LED GATT characteristic, nrf_error %#x", err);
-		return -EINVAL;
+	if (nrf_err) {
+		LOG_ERR("Failed to add LED GATT characteristic, nrf_error %#x", nrf_err);
+		return NRF_ERROR_INVALID_PARAM;
 	}
 
-	return 0;
+	return NRF_SUCCESS;
 }
 
 int ble_lbs_on_button_change(struct ble_lbs *lbs, uint16_t conn_handle, uint8_t button_state)
 {
-	int err;
+	uint32_t nrf_err;
 
 	uint16_t len = sizeof(button_state);
 
 	if (!lbs) {
-		return -EFAULT;
+		return NRF_ERROR_NULL;
 	}
 
 	ble_gatts_hvx_params_t hvx = {
@@ -172,11 +173,11 @@ int ble_lbs_on_button_change(struct ble_lbs *lbs, uint16_t conn_handle, uint8_t
 		.p_len = &len,
 	};
 
-	err = sd_ble_gatts_hvx(conn_handle, &hvx);
-	if (err) {
-		LOG_ERR("Failed to notify button change, nrf_error %#x", err);
-		return -EINVAL;
+	nrf_err = sd_ble_gatts_hvx(conn_handle, &hvx);
+	if (nrf_err) {
+		LOG_ERR("Failed to notify button change, nrf_error %#x", nrf_err);
+		return NRF_ERROR_INVALID_PARAM;
 	}
 
-	return 0;
+	return NRF_SUCCESS;
 }