Bluetooth: Improve hfp hf and ag

samples/bluetooth/handsfree/src/main.c

@@ -19,67 +19,103 @@
 #include <zephyr/bluetooth/classic/hfp_hf.h>
 #include <zephyr/settings/settings.h>
 
-static void connected(struct bt_conn *conn)
+static void hf_connected(struct bt_conn *conn, struct bt_hfp_hf *hf)
 {
 	printk("HFP HF Connected!\n");
 }
 
-static void disconnected(struct bt_conn *conn)
+static void hf_disconnected(struct bt_hfp_hf *hf)
 {
 	printk("HFP HF Disconnected!\n");
 }
 
-static void service(struct bt_conn *conn, uint32_t value)
+static void hf_sco_connected(struct bt_hfp_hf *hf, struct bt_conn *sco_conn)
+{
+	printk("HF SCO connected\n");
+}
+
+static void hf_sco_disconnected(struct bt_conn *sco_conn, uint8_t reason)
+{
+	printk("HF SCO disconnected\n");
+}
+
+static void hf_service(struct bt_hfp_hf *hf, uint32_t value)
 {
 	printk("Service indicator value: %u\n", value);
 }
 
-static void call(struct bt_conn *conn, uint32_t value)
+static void hf_outgoing(struct bt_hfp_hf *hf, struct bt_hfp_hf_call *call)
+{
+	printk("HF call %p outgoing\n", call);
+}
+
+static void hf_remote_ringing(struct bt_hfp_hf_call *call)
+{
+	printk("HF remote call %p start ringing\n", call);
+}
+
+static void hf_incoming(struct bt_hfp_hf *hf, struct bt_hfp_hf_call *call)
+{
+	printk("HF call %p incoming\n", call);
+}
+
+static void hf_incoming_held(struct bt_hfp_hf_call *call)
+{
+	printk("HF call %p is held\n", call);
+}
+
+static void hf_accept(struct bt_hfp_hf_call *call)
 {
-	printk("Call indicator value: %u\n", value);
+	printk("HF call %p accepted\n", call);
 }
 
-static void call_setup(struct bt_conn *conn, uint32_t value)
+static void hf_reject(struct bt_hfp_hf_call *call)
 {
-	printk("Call Setup indicator value: %u\n", value);
+	printk("HF call %p rejected\n", call);
 }
 
-static void call_held(struct bt_conn *conn, uint32_t value)
+static void hf_terminate(struct bt_hfp_hf_call *call)
 {
-	printk("Call Held indicator value: %u\n", value);
+	printk("HF call %p terminated\n", call);
 }
 
-static void signal(struct bt_conn *conn, uint32_t value)
+static void hf_signal(struct bt_hfp_hf *hf, uint32_t value)
 {
 	printk("Signal indicator value: %u\n", value);
 }
 
-static void roam(struct bt_conn *conn, uint32_t value)
+static void hf_roam(struct bt_hfp_hf *hf, uint32_t value)
 {
 	printk("Roaming indicator value: %u\n", value);
 }
 
-static void battery(struct bt_conn *conn, uint32_t value)
+static void hf_battery(struct bt_hfp_hf *hf, uint32_t value)
 {
 	printk("Battery indicator value: %u\n", value);
 }
 
-static void ring_cb(struct bt_conn *conn)
+static void hf_ring_indication(struct bt_hfp_hf_call *call)
 {
-	printk("Incoming Call...\n");
+	printk("HF call %p ring\n", call);
 }
 
 static struct bt_hfp_hf_cb hf_cb = {
-	.connected = connected,
-	.disconnected = disconnected,
-	.service = service,
-	.call = call,
-	.call_setup = call_setup,
-	.call_held = call_held,
-	.signal = signal,
-	.roam = roam,
-	.battery = battery,
-	.ring_indication = ring_cb,
+	.connected = hf_connected,
+	.disconnected = hf_disconnected,
+	.sco_connected = hf_sco_connected,
+	.sco_disconnected = hf_sco_disconnected,
+	.service = hf_service,
+	.outgoing = hf_outgoing,
+	.remote_ringing = hf_remote_ringing,
+	.incoming = hf_incoming,
+	.incoming_held = hf_incoming_held,
+	.accept = hf_accept,
+	.reject = hf_reject,
+	.terminate = hf_terminate,
+	.signal = hf_signal,
+	.roam = hf_roam,
+	.battery = hf_battery,
+	.ring_indication = hf_ring_indication,
 };
 
 static void bt_ready(int err)

samples/bluetooth/handsfree_ag/src/main.c

@@ -25,8 +25,7 @@
 
 static struct bt_conn *default_conn;
 struct bt_hfp_ag *hfp_ag;
-
-static struct bt_br_discovery_param br_discover;
+struct bt_hfp_ag_call *hfp_ag_call;
 
 static struct bt_br_discovery_param br_discover;
 static struct bt_br_discovery_result scan_result[CONFIG_BT_HFP_AG_DISCOVER_RESULT_COUNT];
@@ -41,8 +40,15 @@ struct k_work_delayable call_remote_accept_work;
 NET_BUF_POOL_DEFINE(sdp_discover_pool, 10, BT_L2CAP_BUF_SIZE(CONFIG_BT_L2CAP_TX_MTU),
 		    CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
 
-static void ag_connected(struct bt_hfp_ag *ag)
+static void ag_connected(struct bt_conn *conn, struct bt_hfp_ag *ag)
 {
+	if (conn != default_conn) {
+		printk("The conn %p is not aligned with ACL conn %p", conn, default_conn);
+	}
+
+	if (!hfp_ag) {
+		hfp_ag = ag;
+	}
 	printk("HFP AG connected!\n");
 	k_work_schedule(&call_connect_work, K_MSEC(CONFIG_BT_HFP_AG_START_CALL_DELAY_TIME));
 }
@@ -62,38 +68,40 @@ static void ag_sco_disconnected(struct bt_hfp_ag *ag)
 	printk("HFP AG SCO disconnected!\n");
 }
 
-static void ag_ringing(struct bt_hfp_ag *ag, bool in_band)
+static void ag_ringing(struct bt_hfp_ag_call *call, bool in_band)
 {
 	printk("Ringing (in bond? %s)\n", in_band ? "Yes" : "No");
 }
 
-static void ag_accept(struct bt_hfp_ag *ag)
+static void ag_accept(struct bt_hfp_ag_call *call)
 {
 	printk("Call Accepted\n");
 	k_work_schedule(&call_disconnect_work, K_SECONDS(10));
 }
 
-static void ag_reject(struct bt_hfp_ag *ag)
+static void ag_reject(struct bt_hfp_ag_call *call)
 {
 	printk("Call Rejected\n");
 	k_work_schedule(&call_disconnect_work, K_SECONDS(1));
 }
 
-static void ag_terminate(struct bt_hfp_ag *ag)
+static void ag_terminate(struct bt_hfp_ag_call *call)
 {
 	printk("Call terminated\n");
 	k_work_schedule(&call_disconnect_work, K_SECONDS(1));
 }
 
-static void ag_outgoing(struct bt_hfp_ag *ag, const char *number)
+static void ag_outgoing(struct bt_hfp_ag *ag, struct bt_hfp_ag_call *call, const char *number)
 {
+	hfp_ag_call = call;
 	printk("Call outgoing, remote number %s\n", number);
 	k_work_cancel_delayable(&call_connect_work);
 	k_work_schedule(&call_remote_ringing_work, K_SECONDS(1));
 }
 
-static void ag_incoming(struct bt_hfp_ag *ag, const char *number)
+static void ag_incoming(struct bt_hfp_ag *ag, struct bt_hfp_ag_call *call, const char *number)
 {
+	hfp_ag_call = call;
 	printk("Incoming call, remote number %s\n", number);
 	k_work_cancel_delayable(&call_connect_work);
 }
@@ -329,7 +337,7 @@ static void call_remote_ringing_work_handler(struct k_work *work)
 
 	printk("Remote starts ringing\n");
 
-	err = bt_hfp_ag_remote_ringing(hfp_ag);
+	err = bt_hfp_ag_remote_ringing(hfp_ag_call);
 
 	if (err != 0) {
 		printk("Fail to notify hfp unit that the remote starts ringing (err %d)\n", err);
@@ -344,7 +352,7 @@ static void call_remote_accept_work_handler(struct k_work *work)
 
 	printk("Remote accepts the call\n");
 
-	err = bt_hfp_ag_remote_accept(hfp_ag);
+	err = bt_hfp_ag_remote_accept(hfp_ag_call);
 
 	if (err != 0) {
 		printk("Fail to notify hfp unit that the remote accepts call (err %d)\n", err);