mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-07 15:39:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

hfp: fix type in event name HFP_SUBEVENT_STOP_RINGING and HFP_SUBEVENT_START_RINGING

Browse Source
This commit is contained in:
Milanka Ringwald 2021-07-14 16:22:03 +02:00
parent 0d38e7e193
commit 688428b6a1
7 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/hfp_ag_demo.c
View File

@ -550,13 +550,13 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t * even
sco_handle = HCI_CON_HANDLE_INVALID;
sco_demo_close();
break;
case HFP_SUBEVENT_START_RINGINIG:
case HFP_SUBEVENT_START_RINGING:
printf("** START Ringing **\n");
break;
case HFP_SUBEVENT_RING:
printf("** Ring **\n");
break;
case HFP_SUBEVENT_STOP_RINGINIG:
case HFP_SUBEVENT_STOP_RINGING:
printf("** STOP Ringing **\n");
break;
case HFP_SUBEVENT_PLACE_CALL_WITH_NUMBER:

6
example/hfp_hf_demo.c
View File

@ -554,9 +554,15 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t * even
printf("EXTENDED_AUDIO_GATEWAY_ERROR_REPORT, status : 0x%02x\n",
hfp_subevent_extended_audio_gateway_error_get_error(event));
break;
case HFP_SUBEVENT_START_RINGING:
printf("** START Ringing **\n");
break;
case HFP_SUBEVENT_RING:
printf("** Ring **\n");
break;
case HFP_SUBEVENT_STOP_RINGING:
printf("** STOP Ringing **\n");
break;
case HFP_SUBEVENT_NUMBER_FOR_VOICE_TAG:
printf("Phone number for voice tag: %s\n",
(const char *) hfp_subevent_number_for_voice_tag_get_number(event));

4
src/btstack_defines.h
View File

@ -1620,7 +1620,7 @@ typedef uint8_t sm_key_t[16];
* @param subevent_code
* @param acl_handle
*/
#define HFP_SUBEVENT_START_RINGINIG 0x0A
#define HFP_SUBEVENT_START_RINGING 0x0A
/**
* @format 1H
@ -1634,7 +1634,7 @@ typedef uint8_t sm_key_t[16];
* @param subevent_code
* @param acl_handle
*/
#define HFP_SUBEVENT_STOP_RINGINIG 0x0C
#define HFP_SUBEVENT_STOP_RINGING 0x0C
/**
* @format 1HT

8
src/btstack_event.h
View File

@ -4311,12 +4311,12 @@ static inline uint8_t hfp_subevent_extended_audio_gateway_error_get_error(const
}
/**
* @brief Get field acl_handle from event HFP_SUBEVENT_START_RINGINIG
* @brief Get field acl_handle from event HFP_SUBEVENT_START_RINGING
* @param event packet
* @return acl_handle
* @note: btstack_type H
*/
static inline hci_con_handle_t hfp_subevent_start_ringinig_get_acl_handle(const uint8_t * event){
static inline hci_con_handle_t hfp_subevent_start_ringing_get_acl_handle(const uint8_t * event){
return little_endian_read_16(event, 3);
}
@ -4331,12 +4331,12 @@ static inline hci_con_handle_t hfp_subevent_ring_get_acl_handle(const uint8_t *
}
/**
* @brief Get field acl_handle from event HFP_SUBEVENT_STOP_RINGINIG
* @brief Get field acl_handle from event HFP_SUBEVENT_STOP_RINGING
* @param event packet
* @return acl_handle
* @note: btstack_type H
*/
static inline hci_con_handle_t hfp_subevent_stop_ringinig_get_acl_handle(const uint8_t * event){
static inline hci_con_handle_t hfp_subevent_stop_ringing_get_acl_handle(const uint8_t * event){
return little_endian_read_16(event, 3);
}

6
src/classic/hfp_ag.c
View File

@ -1125,7 +1125,7 @@ static void hfp_ag_hf_start_ringing(hfp_connection_t * hfp_connection){
hfp_connection->ag_ring = 1;
hfp_connection->ag_send_clip = hfp_gsm_clip_type() && hfp_connection->clip_enabled;
hfp_connection->call_state = HFP_CALL_RINGING;
hfp_emit_simple_event(hfp_connection, HFP_SUBEVENT_START_RINGINIG);
hfp_emit_simple_event(hfp_connection, HFP_SUBEVENT_START_RINGING);
}
}
@ -1133,7 +1133,7 @@ static void hfp_ag_hf_stop_ringing(hfp_connection_t * hfp_connection){
hfp_connection->ag_ring = 0;
hfp_connection->ag_send_clip = 0;
hfp_timeout_stop(hfp_connection);
hfp_emit_simple_event(hfp_connection, HFP_SUBEVENT_STOP_RINGINIG);
hfp_emit_simple_event(hfp_connection, HFP_SUBEVENT_STOP_RINGING);
}
static void hfp_ag_trigger_incoming_call(void){
@ -1364,7 +1364,7 @@ static int call_setup_state_machine(hfp_connection_t * hfp_connection){
hfp_connection->ag_ring = 1;
hfp_connection->ag_send_clip = hfp_gsm_clip_type() && hfp_connection->clip_enabled;
hfp_connection->call_state = HFP_CALL_RINGING;
hfp_emit_simple_event(hfp_connection, HFP_SUBEVENT_START_RINGINIG);
hfp_emit_simple_event(hfp_connection, HFP_SUBEVENT_START_RINGING);
break;
case HFP_CALL_W4_AUDIO_CONNECTION_FOR_ACTIVE:
if (hfp_connection->state != HFP_AUDIO_CONNECTION_ESTABLISHED) return 0;

4
test/hfp/hfp_ag_client_test.c
View File

@ -367,10 +367,10 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t * even
case HFP_SUBEVENT_AUDIO_CONNECTION_RELEASED:
printf("\n** Audio connection released **\n");
break;
case HFP_SUBEVENT_START_RINGINIG:
case HFP_SUBEVENT_START_RINGING:
printf("\n** Start Ringing **\n");
break;
case HFP_SUBEVENT_STOP_RINGINIG:
case HFP_SUBEVENT_STOP_RINGING:
printf("\n** Stop Ringing **\n");
break;
case HFP_SUBEVENT_PLACE_CALL_WITH_NUMBER:

4
test/hfp/hfp_hf_client_test.c
View File

@ -409,11 +409,11 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t * even
printf("\n** AC released **\n\n");
audio_connection_established = 0;
break;
case HFP_SUBEVENT_START_RINGINIG:
case HFP_SUBEVENT_START_RINGING:
printf("\n** Start ringing **\n\n");
start_ringing = 1;
break;
case HFP_SUBEVENT_STOP_RINGINIG:
case HFP_SUBEVENT_STOP_RINGING:
printf("\n** Stop ringing **\n\n");
stop_ringing = 1;
start_ringing = 0;