Bluetooth: A2DP: implement reconfig and optimize codes

Implement the bt_a2dp_stream_reconfig: Modify reconfig_req callback to
pass codec_cfg to application. Remove reconfig_rsp callback,
config_rsp is used. Remove reconfigured callback,
configured callback is used.

move the status to common struct bt_avdtp_req,
use same bt_avdtp_ctrl_params to process control-like avdtp
cmds (start, open etc), use the same a2dp_ctrl_ind to process
control-like cmds (start, open etc), use the same
bt_a2dp_ctrl_cb to process control-like cmds (start, open etc),
use the same bt_avdtp_ctrl to process control-like cmds
(start, open etc), optimize getting a2dp conn by index,
use sem to replace mutex and optimze the lock codes to be
based on context/instance.

Signed-off-by: Mark Wang <[email protected]>

Author: MarkWangChinese

include/zephyr/bluetooth/classic/a2dp.h

@@ -21,16 +21,16 @@
 extern "C" {
 #endif
 
-#define BT_A2DP_STREAM_BUF_RESERVE (12u + BT_L2CAP_BUF_SIZE(0))
+#define BT_A2DP_STREAM_BUF_RESERVE (12U + BT_L2CAP_BUF_SIZE(0))
 
 /** SBC IE length */
-#define BT_A2DP_SBC_IE_LENGTH      (4u)
+#define BT_A2DP_SBC_IE_LENGTH      (4U)
 /** MPEG1,2 IE length */
-#define BT_A2DP_MPEG_1_2_IE_LENGTH (4u)
+#define BT_A2DP_MPEG_1_2_IE_LENGTH (4U)
 /** MPEG2,4 IE length */
-#define BT_A2DP_MPEG_2_4_IE_LENGTH (6u)
+#define BT_A2DP_MPEG_2_4_IE_LENGTH (6U)
 /** The max IE (Codec Info Element) length */
-#define A2DP_MAX_IE_LENGTH         (8U)
+#define BT_A2DP_MAX_IE_LENGTH      (8U)
 
 /** @brief define the audio endpoint
  *  @param _role BT_AVDTP_SOURCE or BT_AVDTP_SINK.
@@ -314,7 +314,7 @@ struct bt_a2dp_codec_ie {
 	/** Length of codec_cap */
 	uint8_t len;
 	/** codec information element */
-	uint8_t codec_ie[A2DP_MAX_IE_LENGTH];
+	uint8_t codec_ie[BT_A2DP_MAX_IE_LENGTH];
 };
 
 /** @brief The endpoint configuration */
@@ -432,7 +432,21 @@ struct bt_a2dp_cb {
 	int (*config_req)(struct bt_a2dp *a2dp, struct bt_a2dp_ep *ep,
 			  struct bt_a2dp_codec_cfg *codec_cfg, struct bt_a2dp_stream **stream,
 			  uint8_t *rsp_err_code);
-	/** @brief Callback function for bt_a2dp_stream_config()
+	/**
+	 * @brief Endpoint config request callback
+	 *
+	 * The callback is called whenever an endpoint is requested to be
+	 * reconfigured.
+	 *
+	 *  @param[in] stream    Pointer to stream object.
+	 *  @param[out] rsp_err_code  give the error code if response error.
+	 *                          bt_a2dp_err_code or bt_avdtp_err_code
+	 *
+	 * @return 0 in case of success or negative value in case of error.
+	 */
+	int (*reconfig_req)(struct bt_a2dp_stream *stream, struct bt_a2dp_codec_cfg *codec_cfg,
+			    uint8_t *rsp_err_code);
+	/** @brief Callback function for bt_a2dp_stream_config() and bt_a2dp_stream_reconfig()
 	 *
 	 *  Called when the codec configure operation is completed.
 	 *
@@ -442,7 +456,7 @@ struct bt_a2dp_cb {
 	 */
 	void (*config_rsp)(struct bt_a2dp_stream *stream, uint8_t rsp_err_code);
 	/**
-	 * @brief stream establishment request callback
+	 * @brief Stream establishment request callback
 	 *
 	 * The callback is called whenever an stream is requested to be
 	 * established (open cmd and create the stream l2cap channel).
@@ -465,7 +479,7 @@ struct bt_a2dp_cb {
 	 */
 	void (*establish_rsp)(struct bt_a2dp_stream *stream, uint8_t rsp_err_code);
 	/**
-	 * @brief stream release request callback
+	 * @brief Stream release request callback
 	 *
 	 * The callback is called whenever an stream is requested to be
 	 * released (release cmd and release the l2cap channel)
@@ -488,7 +502,7 @@ struct bt_a2dp_cb {
 	 */
 	void (*release_rsp)(struct bt_a2dp_stream *stream, uint8_t rsp_err_code);
 	/**
-	 * @brief stream start request callback
+	 * @brief Stream start request callback
 	 *
 	 * The callback is called whenever an stream is requested to be
 	 * started.
@@ -510,7 +524,7 @@ struct bt_a2dp_cb {
 	 */
 	void (*start_rsp)(struct bt_a2dp_stream *stream, uint8_t rsp_err_code);
 	/**
-	 * @brief Endpoint suspend request callback
+	 * @brief Stream suspend request callback
 	 *
 	 * The callback is called whenever an stream is requested to be
 	 * suspended.
@@ -531,28 +545,6 @@ struct bt_a2dp_cb {
 	 *                          bt_a2dp_err_code or bt_avdtp_err_code
 	 */
 	void (*suspend_rsp)(struct bt_a2dp_stream *stream, uint8_t rsp_err_code);
-	/**
-	 * @brief Endpoint config request callback
-	 *
-	 * The callback is called whenever an endpoint is requested to be
-	 * reconfigured.
-	 *
-	 *  @param[in] stream    Pointer to stream object.
-	 *  @param[out] rsp_err_code  give the error code if response error.
-	 *                          bt_a2dp_err_code or bt_avdtp_err_code
-	 *
-	 * @return 0 in case of success or negative value in case of error.
-	 */
-	int (*reconfig_req)(struct bt_a2dp_stream *stream, uint8_t *rsp_err_code);
-	/** @brief Callback function for bt_a2dp_stream_reconfig()
-	 *
-	 *  Called when the reconfig operation is completed.
-	 *
-	 *  @param[in] stream    Pointer to stream object.
-	 *  @param[in] rsp_err_code the remote responded error code
-	 *                          bt_a2dp_err_code or bt_avdtp_err_code
-	 */
-	void (*reconfig_rsp)(struct bt_a2dp_stream *stream, uint8_t rsp_err_code);
 };
 
 /** @brief A2DP Connect.
@@ -585,12 +577,12 @@ int bt_a2dp_disconnect(struct bt_a2dp *a2dp);
 /** @brief Endpoint Registration.
  *
  *  @param ep Pointer to bt_a2dp_ep structure.
- *  @param media_type Media type that the Endpoint is.
- *  @param role Role of Endpoint.
+ *  @param media_type Media type that the Endpoint is, #bt_avdtp_media_type.
+ *  @param sep_type Stream endpoint type, #bt_avdtp_sep_type.
  *
  *  @return 0 in case of success and error code in case of error.
  */
-int bt_a2dp_register_ep(struct bt_a2dp_ep *ep, uint8_t media_type, uint8_t role);
+int bt_a2dp_register_ep(struct bt_a2dp_ep *ep, uint8_t media_type, uint8_t sep_type);
 
 /** @brief register callback.
  *
@@ -632,7 +624,7 @@ struct bt_a2dp_stream_ops {
 	/**
 	 * @brief Stream configured callback
 	 *
-	 * The callback is called whenever an Audio Stream has been configured.
+	 * The callback is called whenever an Audio Stream has been configured or reconfigured.
 	 *
 	 * @param stream Stream object that has been configured.
 	 */
@@ -649,6 +641,7 @@ struct bt_a2dp_stream_ops {
 	 * @brief Stream release callback
 	 *
 	 * The callback is called whenever an Audio Stream has been released.
+	 * After released, the stream becomes invalid.
 	 *
 	 * @param stream Stream object that has been released.
 	 */
@@ -669,14 +662,6 @@ struct bt_a2dp_stream_ops {
 	 * @param stream Stream object that has been suspended.
 	 */
 	void (*suspended)(struct bt_a2dp_stream *stream);
-	/**
-	 * @brief Stream reconfigured callback
-	 *
-	 * The callback is called whenever an Audio Stream has been reconfigured.
-	 *
-	 * @param stream Stream object that has been reconfigured.
-	 */
-	void (*reconfigured)(struct bt_a2dp_stream *stream);
 #if defined(CONFIG_BT_A2DP_SINK)
 	/** @brief the media streaming data, only for sink
 	 *
@@ -746,6 +731,7 @@ int bt_a2dp_stream_establish(struct bt_a2dp_stream *stream);
 /** @brief release a2dp streamer.
  *
  * This function sends the AVDTP_CLOSE command and release the l2cap channel.
+ * After release, the stream becomes invalid.
  *
  *  @param stream The stream object.
  *

include/zephyr/bluetooth/classic/avdtp.h

@@ -128,6 +128,8 @@ struct bt_avdtp_sep {
 	struct bt_l2cap_br_chan chan;
 	/** the endpoint media data */
 	void (*media_data_cb)(struct bt_avdtp_sep *sep, struct net_buf *buf);
+	/* semaphore for lock/unlock */
+	struct k_sem sem_lock;
 	/** avdtp session */
 	struct bt_avdtp *session;
 	/** SEP state */