From d2c939c5c48b912aa41a3f0f3969857e6a0525c9 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Wed, 19 Aug 2020 12:23:05 +0200 Subject: [PATCH] avdtp: move prototypes for emit functions into avdtp_util.h --- src/classic/avdtp.h | 13 ------------- src/classic/avdtp_util.h | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/src/classic/avdtp.h b/src/classic/avdtp.h index 3e83a323e..c493367ec 100644 --- a/src/classic/avdtp.h +++ b/src/classic/avdtp.h @@ -612,19 +612,6 @@ uint8_t avdtp_choose_sbc_min_bitpool_value(avdtp_stream_endpoint_t * stream_endp uint8_t avdtp_stream_endpoint_seid(avdtp_stream_endpoint_t * stream_endpoint); -void avdtp_streaming_emit_can_send_media_packet_now(avdtp_stream_endpoint_t *stream_endpoint, uint16_t sequence_number); -void avdtp_signaling_emit_delay(uint16_t avdtp_cid, uint8_t local_seid, uint16_t delay); -void avdtp_signaling_emit_configuration(avdtp_stream_endpoint_t *stream_endpoint, uint16_t avdtp_cid, - avdtp_capabilities_t *configuration, uint16_t configured_service_categories); -void avdtp_signaling_emit_media_codec_sbc_configuration(avdtp_stream_endpoint_t *stream_endpoint, uint16_t avdtp_cid, - avdtp_media_type_t media_type, - const uint8_t *media_codec_information); -void avdtp_signaling_emit_media_codec_sbc_reconfiguration(avdtp_stream_endpoint_t *stream_endpoint, uint16_t avdtp_cid, - avdtp_media_type_t media_type, - const uint8_t *media_codec_information); -void avdtp_signaling_emit_media_codec_other_configuration(avdtp_stream_endpoint_t *stream_endpoint, uint16_t avdtp_cid, - adtvp_media_codec_capabilities_t media_codec); - uint8_t is_avdtp_remote_seid_registered(avdtp_stream_endpoint_t * stream_endpoint); #if defined __cplusplus diff --git a/src/classic/avdtp_util.h b/src/classic/avdtp_util.h index 6fb783992..7fa141196 100644 --- a/src/classic/avdtp_util.h +++ b/src/classic/avdtp_util.h @@ -74,6 +74,7 @@ void avdtp_signaling_emit_connection_established(uint16_t avdtp_cid, bd_addr_t a void avdtp_signaling_emit_connection_released(uint16_t avdtp_cid); void avdtp_signaling_emit_sep(uint16_t avdtp_cid, avdtp_sep_t sep); + void avdtp_signaling_emit_sep_done(uint16_t avdtp_cid); void avdtp_signaling_emit_accept(uint16_t avdtp_cid, uint8_t local_seid, avdtp_signal_identifier_t identifier, @@ -86,18 +87,23 @@ void avdtp_signaling_emit_reject(uint16_t avdtp_cid, uint8_t local_seid, avdtp_s void avdtp_signaling_emit_capabilities(uint16_t avdtp_cid, uint8_t local_seid, uint8_t remote_seid, avdtp_capabilities_t *capabilities, uint16_t registered_service_categories); -void avdtp_signaling_emit_media_codec_sbc(avdtp_stream_endpoint_t *stream_endpoint, uint16_t avdtp_cid, - avdtp_media_type_t media_type, const uint8_t *media_codec_information, - uint8_t reconfigure) ; -void avdtp_signaling_emit_media_codec_other_reconfiguration(avdtp_stream_endpoint_t *stream_endpoint, uint16_t avdtp_cid, - adtvp_media_codec_capabilities_t media_codec); -void avdtp_signaling_emit_media_codec_other(avdtp_stream_endpoint_t *stream_endpoint, uint16_t avdtp_cid, - adtvp_media_codec_capabilities_t media_codec, uint8_t reconfigure); +void avdtp_signaling_emit_delay(uint16_t avdtp_cid, uint8_t local_seid, uint16_t delay); + +void avdtp_signaling_emit_configuration(avdtp_stream_endpoint_t *stream_endpoint, uint16_t avdtp_cid, + avdtp_capabilities_t *configuration, uint16_t configured_service_categories); + +void avdtp_signaling_emit_media_codec_sbc_configuration(avdtp_stream_endpoint_t *stream_endpoint, uint16_t avdtp_cid, + avdtp_media_type_t media_type, + const uint8_t *media_codec_information); +void avdtp_signaling_emit_media_codec_other_configuration(avdtp_stream_endpoint_t *stream_endpoint, uint16_t avdtp_cid, + adtvp_media_codec_capabilities_t media_codec); void avdtp_streaming_emit_connection_established(avdtp_stream_endpoint_t *stream_endpoint, uint8_t status); void avdtp_streaming_emit_connection_released(avdtp_stream_endpoint_t *stream_endpoint, uint16_t avdtp_cid, uint8_t local_seid); +void avdtp_streaming_emit_can_send_media_packet_now(avdtp_stream_endpoint_t *stream_endpoint, uint16_t sequence_number); + uint8_t avdtp_request_can_send_now_acceptor(avdtp_connection_t * connection, uint16_t l2cap_cid); uint8_t avdtp_request_can_send_now_initiator(avdtp_connection_t * connection, uint16_t l2cap_cid);