lib: bluetooth: ble_db_discovery: fixes for rebase

To be squashed.

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

Author: eivindj-nordic

include/bm/bluetooth/ble_db_discovery.h

@@ -28,8 +28,7 @@
 #define BLE_DB_DISCOVERY_DEF(_name)                                                                \
 	static struct ble_db_discovery _name = {.discovery_in_progress = 0,                        \
 						.conn_handle = BLE_CONN_HANDLE_INVALID};           \
-	NRF_SDH_BLE_OBSERVER(_name##_obs, ble_db_discovery_on_ble_evt, &_name,                     \
-			     BLE_DB_DISC_BLE_OBSERVER_PRIO)
+	NRF_SDH_BLE_OBSERVER(_name##_obs, ble_db_discovery_on_ble_evt, &_name, HIGH);
 
 /**
  * @brief BLE database discovery event type.

lib/bluetooth/ble_db_discovery/ble_db_discovery.c

@@ -98,6 +98,15 @@ static void discovery_error_handler(uint16_t conn_handle, uint32_t nrf_error, vo
 	discovery_available_evt_trigger(db_discovery, conn_handle);
 }
 
+static void discovery_event_handler(const struct ble_gq_req *req, struct ble_gq_evt *evt)
+{
+	if (evt->evt_type != BLE_GQ_EVT_ERROR) {
+		return;
+	}
+
+	discovery_error_handler(evt->conn_handle, evt->error.reason, req->ctx);
+}
+
 static void discovery_complete_evt_trigger(struct ble_db_discovery *db_discovery, bool is_srv_found,
 					   uint16_t conn_handle)
 {
@@ -179,8 +188,8 @@ static void on_srv_disc_completion(struct ble_db_discovery *db_discovery, uint16
 		db_srv_disc_req.type = BLE_GQ_REQ_SRV_DISCOVERY;
 		db_srv_disc_req.gattc_srv_disc.start_handle = CONFIG_SRV_DISC_START_HANDLE;
 		db_srv_disc_req.gattc_srv_disc.srvc_uuid = srv_being_discovered->srv_uuid;
-		db_srv_disc_req.error_handler.ctx = db_discovery;
-		db_srv_disc_req.error_handler.cb = discovery_error_handler;
+		db_srv_disc_req.ctx = db_discovery;
+		db_srv_disc_req.evt_handler = discovery_event_handler;
 
 		err_code = ble_gq_item_add(db_discovery->gatt_queue, &db_srv_disc_req, conn_handle);
 
@@ -285,8 +294,8 @@ static uint32_t characteristics_discover(struct ble_db_discovery *db_discovery,
 
 	db_char_disc_req.type = BLE_GQ_REQ_CHAR_DISCOVERY;
 	db_char_disc_req.gattc_char_disc = handle_range;
-	db_char_disc_req.error_handler.ctx = db_discovery;
-	db_char_disc_req.error_handler.cb = discovery_error_handler;
+	db_char_disc_req.ctx = db_discovery;
+	db_char_disc_req.evt_handler = discovery_event_handler;
 
 	return ble_gq_item_add(db_discovery->gatt_queue, &db_char_disc_req, conn_handle);
 }
@@ -350,8 +359,8 @@ static uint32_t descriptors_discover(struct ble_db_discovery *db_discovery,
 
 	db_desc_disc_req.type = BLE_GQ_REQ_DESC_DISCOVERY;
 	db_desc_disc_req.gattc_desc_disc = handle_range;
-	db_desc_disc_req.error_handler.ctx = db_discovery;
-	db_desc_disc_req.error_handler.cb = discovery_error_handler;
+	db_desc_disc_req.ctx = db_discovery;
+	db_desc_disc_req.evt_handler = discovery_error_handler;
 
 	return ble_gq_item_add(db_discovery->gatt_queue, &db_desc_disc_req, conn_handle);
 }
@@ -644,8 +653,8 @@ static uint32_t discovery_start(struct ble_db_discovery *const db_discovery, uin
 	db_srv_disc_req.type = BLE_GQ_REQ_SRV_DISCOVERY;
 	db_srv_disc_req.gattc_srv_disc.start_handle = CONFIG_SRV_DISC_START_HANDLE;
 	db_srv_disc_req.gattc_srv_disc.srvc_uuid = srv_being_discovered->srv_uuid;
-	db_srv_disc_req.error_handler.ctx = db_discovery;
-	db_srv_disc_req.error_handler.cb = discovery_error_handler;
+	db_srv_disc_req.ctx = db_discovery;
+	db_srv_disc_req.evt_handler = discovery_event_handler;
 
 	err_code = ble_gq_item_add(db_discovery->gatt_queue, &db_srv_disc_req, conn_handle);