korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-15 16:24:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

mesh: Clean up naming of provisioning callbacks

Browse Source
This commit is contained in:
Michał Lowas-Rzechonek 2020-04-01 12:24:59 +02:00 committed by Brian Gix
parent 4b2d782fb6
commit 037d452415
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mesh/prov-initiator.c
View File

@ -77,10 +77,10 @@ enum int_state {
#define MAT_SECRET (MAT_REMOTE_PUBLIC | MAT_LOCAL_PRIVATE) #define MAT_SECRET (MAT_REMOTE_PUBLIC | MAT_LOCAL_PRIVATE)
struct mesh_prov_initiator { struct mesh_prov_initiator {
mesh_prov_initiator_complete_func_t cmplt; mesh_prov_initiator_complete_func_t complete_cb;
mesh_prov_initiator_data_req_func_t get_prov_data; mesh_prov_initiator_data_req_func_t data_req_cb;
prov_trans_tx_t trans_tx; prov_trans_tx_t trans_tx;
void *agent; struct mesh_agent *agent;
void *caller_data; void *caller_data;
void *trans_data; void *trans_data;
struct mesh_node *node; struct mesh_node *node;
@ -125,7 +125,7 @@ static void int_prov_close(void *user_data, uint8_t reason)
struct mesh_prov_node_info info; struct mesh_prov_node_info info;
if (reason != PROV_ERR_SUCCESS) { if (reason != PROV_ERR_SUCCESS) {
prov->cmplt(prov->caller_data, reason, NULL); prov->complete_cb(prov->caller_data, reason, NULL);
initiator_free(); initiator_free();
return; return;
} }
@ -135,7 +135,7 @@ static void int_prov_close(void *user_data, uint8_t reason)
info.unicast = prov->unicast; info.unicast = prov->unicast;
info.num_ele = prov->conf_inputs.caps.num_ele; info.num_ele = prov->conf_inputs.caps.num_ele;
prov->cmplt(prov->caller_data, PROV_ERR_SUCCESS, &info); prov->complete_cb(prov->caller_data, PROV_ERR_SUCCESS, &info);
initiator_free(); initiator_free();
} }
@ -738,7 +738,7 @@ static void int_prov_rx(void *user_data, const uint8_t *data, uint16_t len)
goto failure; goto failure;
} }
if (!prov->get_prov_data(prov->caller_data, if (!prov->data_req_cb(prov->caller_data,
prov->conf_inputs.caps.num_ele)) { prov->conf_inputs.caps.num_ele)) {
l_error("Provisioning Failed-Data Get"); l_error("Provisioning Failed-Data Get");
fail_code[1] = PROV_ERR_CANT_ASSIGN_ADDR; fail_code[1] = PROV_ERR_CANT_ASSIGN_ADDR;
@ -819,7 +819,7 @@ bool initiator_start(enum trans_type transport,
uint16_t max_ele, uint16_t max_ele,
uint32_t timeout, /* in seconds from mesh.conf */ uint32_t timeout, /* in seconds from mesh.conf */
struct mesh_agent *agent, struct mesh_agent *agent,
mesh_prov_initiator_data_req_func_t get_prov_data, mesh_prov_initiator_data_req_func_t data_req_cb,
mesh_prov_initiator_complete_func_t complete_cb, mesh_prov_initiator_complete_func_t complete_cb,
void *node, void *caller_data) void *node, void *caller_data)
{ {
@ -836,8 +836,8 @@ bool initiator_start(enum trans_type transport,
prov->to_secs = timeout; prov->to_secs = timeout;
prov->node = node; prov->node = node;
prov->agent = agent; prov->agent = agent;
prov->cmplt = complete_cb; prov->complete_cb = complete_cb;
prov->get_prov_data = get_prov_data; prov->data_req_cb = data_req_cb;
prov->caller_data = caller_data; prov->caller_data = caller_data;
prov->previous = -1; prov->previous = -1;

2
mesh/provision.h
View File

@ -120,7 +120,7 @@ bool initiator_start(enum trans_type transport,
uint16_t max_ele, uint16_t max_ele,
uint32_t timeout, /* in seconds from mesh.conf */ uint32_t timeout, /* in seconds from mesh.conf */
struct mesh_agent *agent, struct mesh_agent *agent,
mesh_prov_initiator_data_req_func_t get_prov_data, mesh_prov_initiator_data_req_func_t data_req_cb,
mesh_prov_initiator_complete_func_t complete_cb, mesh_prov_initiator_complete_func_t complete_cb,
void *node, void *caller_data); void *node, void *caller_data);
void initiator_prov_data(uint16_t net_idx, uint16_t primary, void *caller_data); void initiator_prov_data(uint16_t net_idx, uint16_t primary, void *caller_data);