patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

drivers/nble: Update RPC to version 0527

Browse source 
Update RPC to the newest RPC introducing some security improvements in
the firmware.

Change-Id: If031bb13927d63e029fcc6da34051257d13632a5
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
This commit is contained in:
Andrei Emeltchenko 2016-05-27 11:03:33 +03:00 committed by Johan Hedberg
parent 979e10de6f
commit a195351151
4 changed files with 49 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/bluetooth/nble/gap.c
View file

@ -31,7 +31,7 @@
#include "rpc.h"
/* Set the firmware compatible with Nordic BLE RPC */
static uint8_t compatible_firmware[4] = { '0', '5', '1', '8' };
static uint8_t compatible_firmware[4] = { '0', '5', '2', '7' };
#if !defined(CONFIG_NBLE_DEBUG_GAP)
#undef BT_DBG

40
drivers/bluetooth/nble/gap_internal.h
View file

@ -157,12 +157,12 @@ struct nble_dbg_rsp {
void on_nble_dbg_rsp(const struct nble_dbg_rsp *rsp);
typedef void (*nble_set_bda_cb_t)(int status, void *user_data);
typedef void (*nble_set_bda_cb_t)(int status, void *user_data, const bt_addr_le_t *bda);
struct nble_set_bda_req {
bt_addr_le_t bda;
nble_set_bda_cb_t cb;
void *user_data;
bt_addr_le_t bda;
};
void nble_set_bda_req(const struct nble_set_bda_req *req);
@ -171,6 +171,7 @@ struct nble_set_bda_rsp {
nble_set_bda_cb_t cb;
void *user_data;
int status;
bt_addr_le_t bda;
};
void on_nble_set_bda_rsp(const struct nble_set_bda_rsp *rsp);
@ -279,7 +280,6 @@ struct nble_sm_security_req {
void nble_sm_security_req(const struct nble_sm_security_req *req);
enum NBLE_SM_PASSKEY_TYPE {
NBLE_SM_REJECT = 0,
NBLE_SM_PK_PASSKEY,
NBLE_SM_PK_OOB,
};
@ -314,6 +314,21 @@ struct nble_sm_common_rsp {
void on_nble_sm_common_rsp(const struct nble_sm_common_rsp *rsp);
struct nble_sm_pairing_response_req {
struct bt_conn *conn;
uint16_t conn_handle;
};
void nble_sm_pairing_response_req(const struct nble_sm_pairing_response_req *req);
struct nble_sm_error_req {
struct bt_conn *conn;
uint16_t conn_handle;
uint8_t reason;
};
void nble_sm_error_req(const struct nble_sm_error_req *req);
struct nble_gap_set_rssi_report_req {
uint16_t conn_handle;
/* RSSI operation see NBLE_GAP_RSSI_OPS */
@ -487,6 +502,25 @@ struct nble_sm_status_evt {
void on_nble_sm_status_evt(const struct nble_sm_status_evt *evt);
struct nble_sec_param {
uint8_t mitm;
uint8_t remote_io;
};
struct nble_sm_pairing_request_evt {
uint16_t conn_handle;
struct nble_sec_param sec_param;
};
void on_nble_sm_pairing_request_evt(const struct nble_sm_pairing_request_evt *evt);
struct nble_sm_security_request_evt {
uint16_t conn_handle;
struct nble_sec_param sec_param;
};
void on_nble_sm_security_request_evt(const struct nble_sm_security_request_evt *evt);
struct nble_sm_bond_info;
typedef void (*ble_bond_info_cb_t)(const struct nble_sm_bond_info *info,
const bt_addr_le_t *addr, uint16_t len,

6
drivers/bluetooth/nble/rpc_functions_to_ble_core.h
View file

@ -54,7 +54,11 @@
const struct nble_gattc_read_req *) \
FN_SIG_S(nble_gap_set_tx_power_req, \
const struct nble_gap_set_tx_power_req *) \
FN_SIG_S(nble_dbg_req, const struct nble_dbg_req *)
FN_SIG_S(nble_dbg_req, const struct nble_dbg_req *) \
FN_SIG_S(nble_sm_pairing_response_req, \
const struct nble_sm_pairing_response_req *) \
FN_SIG_S(nble_sm_error_req, \
const struct nble_sm_error_req *)
#define LIST_FN_SIG_P \

7
drivers/bluetooth/nble/rpc_functions_to_quark.h
View file

@ -72,7 +72,12 @@
FN_SIG_S(on_nble_gattc_write_rsp, \
const struct nble_gattc_write_rsp *) \
FN_SIG_S(on_nble_gap_set_tx_power_rsp, \
const struct nble_common_rsp *)
const struct nble_common_rsp *) \
FN_SIG_S(on_nble_sm_pairing_request_evt, \
const struct nble_sm_pairing_request_evt *) \
FN_SIG_S(on_nble_sm_security_request_evt, \
const struct nble_sm_security_request_evt *)
#define LIST_FN_SIG_P \
FN_SIG_P(on_nble_gap_dtm_init_rsp, void *)