From 99a4cac6a990b2d304f4000db86f8cd53080fc37 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Thu, 4 Feb 2016 14:35:55 +0200 Subject: [PATCH] drivers/nble: Update RPC to the Nordic BLE chip Update RPC headers to sync with NBLE firmware. Change-Id: I3231fe16372f2a6a38868edfa543689f631d8b98 Signed-off-by: Andrei Emeltchenko --- drivers/nble/gatt.c | 6 +++--- drivers/nble/gatt_internal.h | 4 ++-- drivers/nble/rpc_functions_to_ble_core.h | 5 +---- drivers/nble/rpc_functions_to_quark.h | 2 -- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/drivers/nble/gatt.c b/drivers/nble/gatt.c index 0947d60de82..90adcd57002 100644 --- a/drivers/nble/gatt.c +++ b/drivers/nble/gatt.c @@ -449,8 +449,8 @@ void on_ble_gatts_write_evt(const struct ble_gatt_wr_evt *evt, reply_data.offset = evt->offset; reply_data.write_reply = 1; - nble_gatts_rw_authorize_reply_req(&reply_data, NULL, - reply_data.status); + nble_gatts_authorize_reply_req(&reply_data, NULL, + reply_data.status); } } @@ -503,5 +503,5 @@ void on_ble_gatts_read_evt(const struct nble_gatt_rd_evt *evt) reply_data.offset = evt->offset; reply_data.write_reply = 0; - nble_gatts_rw_authorize_reply_req(&reply_data, data, reply_data.status); + nble_gatts_authorize_reply_req(&reply_data, data, reply_data.status); } diff --git a/drivers/nble/gatt_internal.h b/drivers/nble/gatt_internal.h index 285a90edba5..dd78e8b1857 100644 --- a/drivers/nble/gatt_internal.h +++ b/drivers/nble/gatt_internal.h @@ -329,8 +329,8 @@ void ble_gatt_register_req(const struct ble_gatt_register_req *par, * @param buf read value of the attribute * @param buflen length of buf */ -void nble_gatts_rw_authorize_reply_req(const struct ble_gatts_rw_reply_params *params, - uint8_t *buf, uint16_t buflen); +void nble_gatts_authorize_reply_req(const struct ble_gatts_rw_reply_params *params, + uint8_t *buf, uint16_t buflen); /** * Conversion table entry ble_core to host attr index diff --git a/drivers/nble/rpc_functions_to_ble_core.h b/drivers/nble/rpc_functions_to_ble_core.h index ce3a0d34e27..a4fd225257d 100644 --- a/drivers/nble/rpc_functions_to_ble_core.h +++ b/drivers/nble/rpc_functions_to_ble_core.h @@ -41,7 +41,7 @@ FN_SIG_S_B(ble_gatt_send_ind_req, \ const struct ble_gatt_send_notif_ind_params *, \ uint8_t *, uint8_t) \ - FN_SIG_S_B(nble_gatts_rw_authorize_reply_req, \ + FN_SIG_S_B(nble_gatts_authorize_reply_req, \ const struct ble_gatts_rw_reply_params *, \ uint8_t *, uint16_t) @@ -91,9 +91,6 @@ void *) #define LIST_FN_SIG_S_B_P \ - FN_SIG_S_B_P(ble_gatts_set_attribute_value_req, \ - const struct ble_gatts_set_attribute_params *, \ - uint8_t *, uint8_t, void *) \ FN_SIG_S_B_P(ble_gattc_write_req, \ const struct ble_gattc_write_params *, \ const uint8_t *, uint8_t, void *) diff --git a/drivers/nble/rpc_functions_to_quark.h b/drivers/nble/rpc_functions_to_quark.h index 3479a1d3c4a..bd4dd659c0c 100644 --- a/drivers/nble/rpc_functions_to_quark.h +++ b/drivers/nble/rpc_functions_to_quark.h @@ -67,8 +67,6 @@ const struct debug_response *) \ FN_SIG_S(on_ble_gatts_send_svc_changed_rsp, \ const struct ble_core_response *) \ - FN_SIG_S(on_ble_gatts_set_attribute_value_rsp, \ - const struct ble_gatts_attribute_response *) \ FN_SIG_S(on_ble_gatts_send_notif_ind_rsp, \ const struct ble_gatt_notif_ind_rsp *) \ FN_SIG_S(on_ble_get_bonded_device_list_rsp, \