framework/src/ble_manager: Add disconnect casue on callback

ziyik · giwon-nam · commit 18b9b9df067a · 2026-02-24T10:42:25.000+09:00
-Add disconnect cause on callback
-Modify disconnect handle to pass disconnect cause to application callback
-Modify examples to support the disconnect cause on the callback
diff --git a/apps/examples/ble_rmc/ble_rmc_main.c b/apps/examples/ble_rmc/ble_rmc_main.c
@@ -142,9 +142,9 @@ static void ble_device_scanned_cb_for_connect(ble_scanned_device *scanned_device
 	}
 }
 
-static void ble_device_disconnected_cb(ble_client_ctx *ctx)
+static void ble_device_disconnected_cb(ble_client_ctx *ctx, uint16_t cause)
 {
-	RMC_LOG(RMC_CLIENT_TAG, "'%s' is called[ID : %d]\n", __FUNCTION__, ctx->conn_handle);
+	RMC_LOG(RMC_CLIENT_TAG, "'%s' is called[ID : %d] cause: %d\n", __FUNCTION__, ctx->conn_handle, cause);
 	return;
 }
 
diff --git a/apps/examples/ble_tester/ble_tester_main.c b/apps/examples/ble_tester/ble_tester_main.c
@@ -186,7 +186,7 @@ static void ble_device_scanned_cb_without_filter(ble_scanned_device *scanned_dev
 	return;
 }
 
-static void ble_device_disconnected_cb(ble_client_ctx *ctx)
+static void ble_device_disconnected_cb(ble_client_ctx *ctx, uint16_t cause)
 {
 	RMC_LOG(RMC_CLIENT_TAG, "'%s' is called[%p]\n", __FUNCTION__, ctx);
 	g_is_conn = 0;
diff --git a/apps/examples/testcase/ta_tc/ble_manager/itc/itc_blemanager_main.c b/apps/examples/testcase/ta_tc/ble_manager/itc/itc_blemanager_main.c
@@ -79,7 +79,7 @@ static void ble_device_scanned_cb(ble_scanned_device *scanned_device)
 	);
 }
 
-static void ble_device_disconnected_cb(ble_client_ctx *ctx)
+static void ble_device_disconnected_cb(ble_client_ctx *ctx, uint16_t cause)
 {
 	printf("client disconnected callback received\n");
 	ITC_FUNC_SIGNAL;
diff --git a/apps/examples/testcase/ta_tc/ble_manager/utc/utc_blemanager_main.c b/apps/examples/testcase/ta_tc/ble_manager/utc/utc_blemanager_main.c
@@ -70,7 +70,7 @@ static void ble_device_scanned_cb(ble_scanned_device *scanned_device)
 	return;
 }
 
-static void ble_device_disconnected_cb(ble_client_ctx *ctx)
+static void ble_device_disconnected_cb(ble_client_ctx *ctx, uint16_t cause)
 {
 	printf("client disconnected callback received\n");
 	g_client_connected = BEVT_DISCONNECTED;
diff --git a/framework/include/ble_manager/ble_client.h b/framework/include/ble_manager/ble_client.h
@@ -70,7 +70,7 @@ typedef struct {
 	bool auto_connect;
 } ble_client_ctx;
 
-typedef void(*ble_client_device_disconnected_cb)(ble_client_ctx *ctx);
+typedef void(*ble_client_device_disconnected_cb)(ble_client_ctx *ctx, uint16_t cause);
 typedef void(*ble_client_device_connected_cb)(ble_client_ctx *ctx, ble_device_connected* connected_device);
 typedef void(*ble_client_operation_notification_cb)(ble_client_ctx *ctx, ble_attr_handle attr_handle, ble_data* read_result);
 typedef void (*ble_client_operation_indication_cb)(ble_client_ctx *ctx, ble_attr_handle attr_handle, ble_data* read_result);
diff --git a/framework/src/ble_manager/ble_manager_state.c b/framework/src/ble_manager/ble_manager_state.c
@@ -126,7 +126,9 @@ static void _event_caller(int evt_pri, void *data) {
 		} break;
 		case BLE_EVT_CLIENT_DISCONNECT: {
 			ble_client_device_disconnected_cb callback = msg->param[0];
-			callback(msg->param[1]);
+			trble_conn_handle conn = *(trble_conn_handle *)(msg->param[2]);
+			uint16_t error = *(uint16_t *)(msg->param[2] + sizeof(trble_conn_handle));
+			callback(msg->param[1], error);
 		} break;
 		case BLE_EVT_CLIENT_DISPLAY_PASSKEY: {
 			ble_client_passkey_display_cb callback = msg->param[0];
@@ -1283,8 +1285,6 @@ ble_result_e blemgr_handle_request(blemgr_msg_s *msg)
 				ctx_connecting = &g_client_table[i];
 			}
 		}
-		free(msg->param);
-
 		if (ctx == NULL) {
 			if (ctx_connecting == NULL) {
 				BLE_LOG_ERROR("[BLEMGR] fail to find disconnected client. (conn_handle : %u)\n", data);
@@ -1316,7 +1316,7 @@ ble_result_e blemgr_handle_request(blemgr_msg_s *msg)
 		}
 
 		if (priv_state != BLE_CLIENT_AUTOCONNECTING && ctx->callbacks.disconnected_cb) {
-			memcpy(queue_msg.param, (void*[]){ctx->callbacks.disconnected_cb, ctx, NULL}, sizeof(void*) * queue_msg.count);
+			memcpy(queue_msg.param, (void*[]){ctx->callbacks.disconnected_cb, ctx, msg->param}, sizeof(void*) * queue_msg.count);
 			ble_queue_enque(BLE_QUEUE_EVT_PRI_HIGH, &queue_msg);
 		}
 	} break;
diff --git a/os/board/rtl8720e/src/component/bluetooth/example/ble_central/central.c b/os/board/rtl8720e/src/component/bluetooth/example/ble_central/central.c
@@ -147,8 +147,8 @@ static rtk_bt_evt_cb_ret_t ble_tizenrt_central_gap_app_callback(uint8_t evt_code
 		role = disconn_ind->role ? "slave" : "master";
 		dbg("[APP] Disconnected, reason: 0x%x, handle: %d, role: %s, remote device: %s\r\n", 
 				disconn_ind->reason, disconn_ind->conn_handle, role, le_addr);
-		
-		client_init_parm->trble_device_disconnected_cb(disconn_ind->conn_handle);
+
+		client_init_parm->trble_device_disconnected_cb(disconn_ind->conn_handle, disconn_ind->reason);
 		
 		if(ble_client_connect_is_running)
 			ble_client_connect_is_running = 0;
diff --git a/os/board/rtl8720e/src/component/bluetooth/example/ble_scatternet/scatternet.c b/os/board/rtl8720e/src/component/bluetooth/example/ble_scatternet/scatternet.c
@@ -240,7 +240,7 @@ static rtk_bt_evt_cb_ret_t ble_tizenrt_scatternet_gap_app_callback(uint8_t evt_c
         role = disconn_ind->role ? "slave" : "master";
         dbg("[APP] Disconnected, reason: 0x%x, handle: %d, role: %s, remote device: %s\r\n", 
                 disconn_ind->reason, disconn_ind->conn_handle, role, le_addr);
-        client_init_parm->trble_device_disconnected_cb(disconn_ind->conn_handle);
+        client_init_parm->trble_device_disconnected_cb(disconn_ind->conn_handle, disconn_ind->reason);
 
         if(ble_client_connect_is_running)
             ble_client_connect_is_running = 0;
diff --git a/os/board/rtl8721csm/src/component/common/bluetooth/realtek/sdk/example/ble_central/ble_tizenrt_central_client_app.c b/os/board/rtl8721csm/src/component/common/bluetooth/realtek/sdk/example/ble_central/ble_tizenrt_central_client_app.c
@@ -181,8 +181,13 @@ void ble_tizenrt_central_handle_callback_msg(T_TIZENRT_APP_CALLBACK_MSG callback
             if(ble_tizenrt_write_no_rsp_sem != NULL)
                 os_mutex_give(ble_tizenrt_write_no_rsp_sem);
 
-            trble_conn_handle disconnected = (uint32_t) callback_msg.u.buf;
-            client_init_parm->trble_device_disconnected_cb(disconnected);
+            trble_device_disconnected *disconnected_dev = callback_msg.u.buf;
+            if(disconnected_dev) {
+                client_init_parm->trble_device_disconnected_cb(disconnected_dev->conn_handle, disconnected_dev->cause);
+                os_mem_free(disconnected_dev);
+            } else {
+                debug_print("Disconnected parameter is NULL \n");
+            }
         }
             break;
 
@@ -583,10 +588,15 @@ void ble_tizenrt_central_app_handle_conn_state_evt(uint8_t conn_id, T_GAP_CONN_S
                 if (g_master_link_num){
                     g_master_link_num --;
                 }
-            uint32_t connid = (uint32_t) conn_id;
-            if(ble_tizenrt_central_send_callback_msg(BLE_TIZENRT_DISCONNECTED_MSG, (void *) connid) == false)
-            {
-                debug_print("callback msg send fail \n");
+            trble_device_disconnected *disconnected_dev = os_mem_alloc(0, sizeof(trble_device_disconnected));
+            if (disconnected_dev) {
+                disconnected_dev->conn_handle = (trble_conn_handle) conn_id;
+                disconnected_dev->cause = disc_cause;
+                if (ble_tizenrt_scatternet_send_callback_msg(BLE_TIZENRT_DISCONNECTED_MSG, disconnected_dev) == false) {
+                    debug_print("callback msg send fail \n");
+                }
+            } else {
+                debug_print("Memory allocation failed \n");
             }
             memset(&ble_tizenrt_central_app_link_table[conn_id], 0, sizeof(BLE_TIZENRT_APP_LINK));
         }
diff --git a/os/board/rtl8721csm/src/component/common/bluetooth/realtek/sdk/example/ble_scatternet/ble_tizenrt_scatternet_app.c b/os/board/rtl8721csm/src/component/common/bluetooth/realtek/sdk/example/ble_scatternet/ble_tizenrt_scatternet_app.c
@@ -195,10 +195,16 @@ void ble_tizenrt_scatternet_handle_callback_msg(T_TIZENRT_APP_CALLBACK_MSG callb
                 os_mutex_give(ble_tizenrt_write_sem);
             if(ble_tizenrt_write_no_rsp_sem != NULL)
                 os_mutex_give(ble_tizenrt_write_no_rsp_sem);
-            trble_conn_handle disconnected = (uint32_t) callback_msg.u.buf;
-            client_init_parm->trble_device_disconnected_cb(disconnected);
+            trble_device_disconnected *disconnected_dev = callback_msg.u.buf;
+            if (disconnected_dev) {
+                dbg("conn_handle %d, cause %d \n", disconnected_dev->conn_handle, disconnected_dev->cause);
+                client_init_parm->trble_device_disconnected_cb(disconnected_dev->conn_handle, disconnected_dev->cause);
+                os_mem_free(disconnected_dev);
+            } else {
+                debug_print("Disconnected parameter is NULL \n");
+            }
         }
-			break;
+            break;
 
         case BLE_TIZENRT_NOTIFICATION_MSG:
         {
@@ -818,13 +824,18 @@ void ble_tizenrt_scatternet_app_handle_conn_state_evt(uint8_t conn_id, T_GAP_CON
                 }
             } else {
                 if (ble_tizenrt_scatternet_app_link_table[conn_id].role == GAP_LINK_ROLE_MASTER)
-                    if (g_master_link_num){
+                    if (g_master_link_num) {
                         g_master_link_num --;
                     }
-                uint32_t connid = (uint32_t) conn_id;
-                if(ble_tizenrt_scatternet_send_callback_msg(BLE_TIZENRT_DISCONNECTED_MSG, (void *) connid) == false)
-                {
-                    debug_print("callback msg send fail \n");
+                trble_device_disconnected *disconnected_dev = os_mem_alloc(0, sizeof(trble_device_disconnected));
+                if (disconnected_dev) {
+                    disconnected_dev->conn_handle = (trble_conn_handle) conn_id;
+                    disconnected_dev->cause = disc_cause;
+                    if (ble_tizenrt_scatternet_send_callback_msg(BLE_TIZENRT_DISCONNECTED_MSG, disconnected_dev) == false) {
+                        debug_print("callback msg send fail \n");
+                    }
+                } else {
+                    debug_print("Memory allocation failed \n");
                 }
             }
             memset(&ble_tizenrt_scatternet_app_link_table[conn_id], 0, sizeof(BLE_TIZENRT_SCATTERNET_APP_LINK));
diff --git a/os/board/rtl8730e/src/component/bluetooth/example/ble_scatternet/scatternet.c b/os/board/rtl8730e/src/component/bluetooth/example/ble_scatternet/scatternet.c
@@ -376,7 +376,7 @@ static rtk_bt_evt_cb_ret_t ble_tizenrt_scatternet_gap_app_callback(uint8_t evt_c
 				ble_client_connect_is_running = 0;
 
 			if (RTK_BT_LE_ROLE_MASTER == conn_ind->role) {
-				client_init_parm->trble_device_disconnected_cb(conn_ind->conn_handle);
+				client_init_parm->trble_device_disconnected_cb(conn_ind->conn_handle, conn_ind->err);
 			} else if (RTK_BT_LE_ROLE_SLAVE == conn_ind->role) {
 				server_init_parm.disconnected_cb(conn_ind->conn_handle, conn_ind->err);
 			}
@@ -401,7 +401,7 @@ static rtk_bt_evt_cb_ret_t ble_tizenrt_scatternet_gap_app_callback(uint8_t evt_c
         general_client_detach_conn(disconn_ind->conn_handle);
         /* gap action */
         if (RTK_BT_LE_ROLE_MASTER == disconn_ind->role) {
-            client_init_parm->trble_device_disconnected_cb(disconn_ind->conn_handle);
+            client_init_parm->trble_device_disconnected_cb(disconn_ind->conn_handle, disconn_ind->reason);
         } else if (RTK_BT_LE_ROLE_SLAVE == disconn_ind->role) {
             if (server_init_parm.disconnected_cb) {
                 server_init_parm.disconnected_cb(disconn_ind->conn_handle, disconn_ind->reason);
diff --git a/os/include/tinyara/net/if/ble.h b/os/include/tinyara/net/if/ble.h
@@ -257,6 +257,11 @@ typedef struct {
 	trble_conn_handle conn_handle;
 } trble_device_connected;
 
+typedef struct {
+	trble_conn_handle conn_handle;
+	uint16_t cause;
+} trble_device_disconnected;
+
 typedef struct {
 	trble_conn_handle conn_handle[TRBLE_MAX_CONNECTION_COUNT];
 	uint8_t connected_count;
@@ -278,7 +283,7 @@ typedef struct {
 	/* This is a set of callback function for BLE client */
 	void (*trble_scan_state_changed_cb)(trble_scan_state_e scan_state);
 	void (*trble_device_scanned_cb)(trble_scanned_device *scanned_device);
-	void (*trble_device_disconnected_cb)(trble_conn_handle conn_id);
+	void (*trble_device_disconnected_cb)(trble_conn_handle conn_id, uint16_t cause);
 	void (*trble_device_connected_cb)(trble_device_connected *connected_device);
 	void (*trble_operation_notification_cb)(trble_operation_handle *handle, trble_data *read_result);
 	void (*trble_operation_indication_cb)(trble_operation_handle *handle, trble_data *read_result);
diff --git a/os/net/blemgr/bledev_mgr_client.c b/os/net/blemgr/bledev_mgr_client.c
@@ -51,9 +51,25 @@ static void bledrv_device_scanned_cb(trble_scanned_device *scanned_device)
 	return;
 }
 
-static void bledrv_device_disconnected_cb(trble_conn_handle conn_id)
+static void bledrv_device_disconnected_cb(trble_conn_handle conn_id, uint16_t cause)
 {
-	trble_post_event(LWNL_EVT_BLE_CLIENT_DISCONNECT, (void *)&conn_id, sizeof(trble_conn_handle));
+	int32_t size = sizeof(trble_conn_handle) + sizeof(uint16_t);
+	uint8_t *data = (uint8_t *)kmm_malloc(size);
+	if (data == NULL) {
+		BLE_LOGE(BLE_DRV_TAG, "out of memroy\n");
+		return;
+	}
+	uint8_t *ptr = data;
+
+	// Copy connection handle
+	memcpy(ptr, &conn_id, sizeof(trble_conn_handle));
+	ptr += sizeof(trble_conn_handle);
+
+	// Copy cause
+	memcpy(ptr, &cause, sizeof(uint16_t));
+
+	trble_post_event(LWNL_EVT_BLE_CLIENT_DISCONNECT, data, size);
+
 	return;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -142,9 +142,9 @@ static void ble_device_scanned_cb_for_connect(ble_scanned_device *scanned_device`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`
`145`		`-static void ble_device_disconnected_cb(ble_client_ctx *ctx)`
	`145`	`+static void ble_device_disconnected_cb(ble_client_ctx *ctx, uint16_t cause)`
`146`	`146`	`{`
`147`		`- RMC_LOG(RMC_CLIENT_TAG, "'%s' is called[ID : %d]\n", __FUNCTION__, ctx->conn_handle);`
	`147`	`+ RMC_LOG(RMC_CLIENT_TAG, "'%s' is called[ID : %d] cause: %d\n", __FUNCTION__, ctx->conn_handle, cause);`
`148`	`148`	`return;`
`149`	`149`	`}`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ static void ble_device_scanned_cb_without_filter(ble_scanned_device *scanned_dev`
`186`	`186`	`return;`
`187`	`187`	`}`
`188`	`188`
`189`		`-static void ble_device_disconnected_cb(ble_client_ctx *ctx)`
	`189`	`+static void ble_device_disconnected_cb(ble_client_ctx *ctx, uint16_t cause)`
`190`	`190`	`{`
`191`	`191`	`RMC_LOG(RMC_CLIENT_TAG, "'%s' is called[%p]\n", __FUNCTION__, ctx);`
`192`	`192`	`g_is_conn = 0;`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ static void ble_device_scanned_cb(ble_scanned_device *scanned_device)`
`79`	`79`	`);`
`80`	`80`	`}`
`81`	`81`
`82`		`-static void ble_device_disconnected_cb(ble_client_ctx *ctx)`
	`82`	`+static void ble_device_disconnected_cb(ble_client_ctx *ctx, uint16_t cause)`
`83`	`83`	`{`
`84`	`84`	`printf("client disconnected callback received\n");`
`85`	`85`	`ITC_FUNC_SIGNAL;`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ static void ble_device_scanned_cb(ble_scanned_device *scanned_device)`
`70`	`70`	`return;`
`71`	`71`	`}`
`72`	`72`
`73`		`-static void ble_device_disconnected_cb(ble_client_ctx *ctx)`
	`73`	`+static void ble_device_disconnected_cb(ble_client_ctx *ctx, uint16_t cause)`
`74`	`74`	`{`
`75`	`75`	`printf("client disconnected callback received\n");`
`76`	`76`	`g_client_connected = BEVT_DISCONNECTED;`