Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 930bfcf3 authored by Chris Manton's avatar Chris Manton
Browse files

Move callback definitions to stack/include/security_client_callbacks 

Toward readable code

Bug: 163134718
Test: gd/cert/run
Tag: #refactor

Change-Id: Ia1f70c108d89132a1d993d4add703828c088f60c
parent 9d0676f1

system/stack/include/btm_api_types.h

+0 −46
Original line number Diff line number Diff line
@@ -564,52 +564,6 @@ typedef uint8_t tBTM_LINK_KEY_TYPE; 
 * trusted services

 ******************************************************************************/



/****************************************

 *  Security Manager Callback Functions

 ****************************************/

/* Authorize device for service.  Parameters are

 *              Service Id (NULL - unknown service or unused

 *                                 [BTM_SEC_SERVICE_NAME_LEN set to 0])

*/

typedef uint8_t(tBTM_AUTHORIZE_CALLBACK)(uint8_t service_id);



/* Get PIN for the connection.  Parameters are

 *              BD Address of remote

 *              Device Class of remote

 *              BD Name of remote

 *              Flag indicating the minimum pin code length to be 16 digits

*/

typedef uint8_t(tBTM_PIN_CALLBACK)(const RawAddress& bd_addr,

                                   DEV_CLASS dev_class, tBTM_BD_NAME bd_name,

                                   bool min_16_digit);



/* New Link Key for the connection.  Parameters are

 *              BD Address of remote

 *              Link Key

 *              Key Type: Combination, Local Unit, or Remote Unit

*/

typedef uint8_t(tBTM_LINK_KEY_CALLBACK)(const RawAddress& bd_addr,

                                        DEV_CLASS dev_class,

                                        tBTM_BD_NAME bd_name,

                                        const LinkKey& key, uint8_t key_type);



/* Remote Name Resolved.  Parameters are

 *              BD Address of remote

 *              BD Name of remote

*/

typedef void(tBTM_RMT_NAME_CALLBACK)(const RawAddress& bd_addr, DEV_CLASS dc,

                                     tBTM_BD_NAME bd_name);



/* Authentication complete for the connection.  Parameters are

 *              BD Address of remote

 *              Device Class of remote

 *              BD Name of remote

 *

*/

typedef void(tBTM_AUTH_COMPLETE_CALLBACK)(const RawAddress& bd_addr,

                                          DEV_CLASS dev_class,

                                          tBTM_BD_NAME bd_name, int result);



enum {

  BTM_SP_IO_REQ_EVT,    /* received IO_CAPABILITY_REQUEST event */

  BTM_SP_IO_RSP_EVT,    /* received IO_CAPABILITY_RESPONSE event */

system/stack/include/security_client_callbacks.h

+46 −0
Original line number Diff line number Diff line
@@ -19,6 +19,52 @@ 
#include "stack/include/btm_api_types.h"

#include "stack/include/btm_ble_api_types.h"



/****************************************

 *  Security Manager Callback Functions

 ****************************************/

/* Authorize device for service.  Parameters are

 *              Service Id (NULL - unknown service or unused

 *                                 [BTM_SEC_SERVICE_NAME_LEN set to 0])

 */

typedef uint8_t(tBTM_AUTHORIZE_CALLBACK)(uint8_t service_id);



/* Get PIN for the connection.  Parameters are

 *              BD Address of remote

 *              Device Class of remote

 *              BD Name of remote

 *              Flag indicating the minimum pin code length to be 16 digits

 */

typedef uint8_t(tBTM_PIN_CALLBACK)(const RawAddress& bd_addr,

                                   DEV_CLASS dev_class, tBTM_BD_NAME bd_name,

                                   bool min_16_digit);



/* New Link Key for the connection.  Parameters are

 *              BD Address of remote

 *              Link Key

 *              Key Type: Combination, Local Unit, or Remote Unit

 */

typedef uint8_t(tBTM_LINK_KEY_CALLBACK)(const RawAddress& bd_addr,

                                        DEV_CLASS dev_class,

                                        tBTM_BD_NAME bd_name,

                                        const LinkKey& key, uint8_t key_type);



/* Remote Name Resolved.  Parameters are

 *              BD Address of remote

 *              BD Name of remote

 */

typedef void(tBTM_RMT_NAME_CALLBACK)(const RawAddress& bd_addr, DEV_CLASS dc,

                                     tBTM_BD_NAME bd_name);



/* Authentication complete for the connection.  Parameters are

 *              BD Address of remote

 *              Device Class of remote

 *              BD Name of remote

 *

 */

typedef void(tBTM_AUTH_COMPLETE_CALLBACK)(const RawAddress& bd_addr,

                                          DEV_CLASS dev_class,

                                          tBTM_BD_NAME bd_name, int result);



struct tBTM_APPL_INFO {

  tBTM_PIN_CALLBACK* p_pin_callback{nullptr};

  tBTM_LINK_KEY_CALLBACK* p_link_key_callback{nullptr};