mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-16 08:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

sm: move SM_INITIATOR_PH1_W2_SEND_PAIRING_REQUEST code into sm_run

Browse Source 
remove SM_INITIATOR_PH1_SEND_PAIRING_REQUEST
This commit is contained in:
Matthias Ringwald 2020-10-29 11:39:39 +01:00
parent f32b7a88e6
commit b26f445ff2
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ble/sm.c
View File

@ -2206,14 +2206,8 @@ static void sm_run_activate_connection(void){
#ifdef ENABLE_LE_CENTRAL #ifdef ENABLE_LE_CENTRAL
case SM_INITIATOR_PH0_HAS_LTK: case SM_INITIATOR_PH0_HAS_LTK:
case SM_INITIATOR_PH1_W2_SEND_PAIRING_REQUEST:
// just lock context // just lock context
break;
case SM_INITIATOR_PH1_W2_SEND_PAIRING_REQUEST:
sm_reset_setup();
sm_init_setup(sm_connection);
sm_timeout_start(sm_connection);
sm_connection->sm_engine_state = SM_INITIATOR_PH1_SEND_PAIRING_REQUEST;
break;
#endif #endif
default: default:
@ -2430,7 +2424,11 @@ static void sm_run(void){
return; return;
} }
case SM_INITIATOR_PH1_SEND_PAIRING_REQUEST: case SM_INITIATOR_PH1_W2_SEND_PAIRING_REQUEST:
sm_reset_setup();
sm_init_setup(connection);
sm_timeout_start(connection);
sm_pairing_packet_set_code(setup->sm_m_preq, SM_CODE_PAIRING_REQUEST); sm_pairing_packet_set_code(setup->sm_m_preq, SM_CODE_PAIRING_REQUEST);
connection->sm_engine_state = SM_INITIATOR_PH1_W4_PAIRING_RESPONSE; connection->sm_engine_state = SM_INITIATOR_PH1_W4_PAIRING_RESPONSE;
l2cap_send_connectionless(connection->sm_handle, L2CAP_CID_SECURITY_MANAGER_PROTOCOL, (uint8_t*) &setup->sm_m_preq, sizeof(sm_pairing_packet_t)); l2cap_send_connectionless(connection->sm_handle, L2CAP_CID_SECURITY_MANAGER_PROTOCOL, (uint8_t*) &setup->sm_m_preq, sizeof(sm_pairing_packet_t));

1
src/hci.h
View File

@ -342,7 +342,6 @@ typedef enum {
SM_INITIATOR_PH0_HAS_LTK, SM_INITIATOR_PH0_HAS_LTK,
SM_INITIATOR_PH0_W4_CONNECTION_ENCRYPTED, SM_INITIATOR_PH0_W4_CONNECTION_ENCRYPTED,
SM_INITIATOR_PH1_W2_SEND_PAIRING_REQUEST, SM_INITIATOR_PH1_W2_SEND_PAIRING_REQUEST,
SM_INITIATOR_PH1_SEND_PAIRING_REQUEST,
SM_INITIATOR_PH1_W4_PAIRING_RESPONSE, SM_INITIATOR_PH1_W4_PAIRING_RESPONSE,
SM_INITIATOR_PH2_W4_PAIRING_CONFIRM, SM_INITIATOR_PH2_W4_PAIRING_CONFIRM,
SM_INITIATOR_PH2_W4_PAIRING_RANDOM, SM_INITIATOR_PH2_W4_PAIRING_RANDOM,