projects
/
platform
/
core
/
connectivity
/
zigbee-manager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change 'enable' method to async operation
[platform/core/connectivity/zigbee-manager.git]
/
zigbee-daemon
/
zigbee-lib
/
src
/
zblib_request.c
diff --git
a/zigbee-daemon/zigbee-lib/src/zblib_request.c
b/zigbee-daemon/zigbee-lib/src/zblib_request.c
index
3bf18fc
..
b3c314f
100644
(file)
--- a/
zigbee-daemon/zigbee-lib/src/zblib_request.c
+++ b/
zigbee-daemon/zigbee-lib/src/zblib_request.c
@@
-126,7
+126,7
@@
static ZigBeeRequest *__zblib_request_ref_request_by_request_id(ZigBeeService *s
/* Look-up requets_id in request hash table */
request = (ZigBeeRequest *)g_hash_table_lookup(request_table, (gconstpointer)request_id);
/* Look-up requets_id in request hash table */
request = (ZigBeeRequest *)g_hash_table_lookup(request_table, (gconstpointer)request_id);
- if (NULL == request
_table
) {
+ if (NULL == request) {
Z_LOGE("No request available for request_id: [%d]", request_id);
return NULL;
}
Z_LOGE("No request available for request_id: [%d]", request_id);
return NULL;
}
@@
-1137,16
+1137,6
@@
static gpointer __zblib_request_create_service_request_data(guint request_type,
/* Fetch ops ID */
ops_id = __zblib_request_get_ops_id(request_type);
switch (ops_id) {
/* Fetch ops ID */
ops_id = __zblib_request_get_ops_id(request_type);
switch (ops_id) {
- case ZBLIB_SERVICE_OPS_ENABLE: {
- service_request_data = NULL;
- }
- break;
-
- case ZBLIB_SERVICE_OPS_DISABLE: {
- service_request_data = NULL;
- }
- break;
-
case ZBLIB_SERVICE_OPS_ZB_HW_RESET: {
service_request_data = NULL;
}
case ZBLIB_SERVICE_OPS_ZB_HW_RESET: {
service_request_data = NULL;
}
@@
-2168,6
+2158,7
@@
static gpointer __zblib_request_create_zcl_group_request_data(guint request_type
/* Copy data */
req->node_id = in_req->node_id;
req->dest_ep = in_req->dest_ep;
/* Copy data */
req->node_id = in_req->node_id;
req->dest_ep = in_req->dest_ep;
+ req->group_id = in_req->group_id;
}
zcl_group_request_data = (gpointer)req;
}
zcl_group_request_data = (gpointer)req;
@@
-2189,7
+2180,7
@@
static gpointer __zblib_request_create_zcl_group_request_data(guint request_type
req->dest_ep = in_req->dest_ep;
req->group_count = in_req->group_count;
req->group_list = (gushort *)g_memdup(in_req->group_list,
req->dest_ep = in_req->dest_ep;
req->group_count = in_req->group_count;
req->group_list = (gushort *)g_memdup(in_req->group_list,
- in_req->group_count);
+
sizeof(gushort) *
in_req->group_count);
}
zcl_group_request_data = (gpointer)req;
}
zcl_group_request_data = (gpointer)req;
@@
-2838,15
+2829,15
@@
static gpointer __zblib_request_create_zdo_dev_control_request_data(guint reques
}
break;
}
break;
- case ZBLIB_ZDO_DEV_CONTROL_OPS_NWK_UPDATE_REQ: {
- ZigbeeZdoDevControlNwkUpdateReq_t *in_req;
- ZigbeeZdoDevControlNwkUpdateReq_t *req = NULL;
+ case ZBLIB_ZDO_DEV_CONTROL_OPS_
MGMT_
NWK_UPDATE_REQ: {
+ ZigbeeZdoDevControl
Mgmt
NwkUpdateReq_t *in_req;
+ ZigbeeZdoDevControl
Mgmt
NwkUpdateReq_t *req = NULL;
- in_req = (ZigbeeZdoDevControlNwkUpdateReq_t *)request_data;
+ in_req = (ZigbeeZdoDevControl
Mgmt
NwkUpdateReq_t *)request_data;
if (NULL != in_req) {
/* Allocate memory */
if (NULL != in_req) {
/* Allocate memory */
- req = (ZigbeeZdoDevControlNwkUpdateReq_t *)
- g_malloc0(sizeof(ZigbeeZdoDevControlNwkUpdateReq_t));
+ req = (ZigbeeZdoDevControl
Mgmt
NwkUpdateReq_t *)
+ g_malloc0(sizeof(ZigbeeZdoDevControl
Mgmt
NwkUpdateReq_t));
/* Copy data */
req->node_id = in_req->node_id;
/* Copy data */
req->node_id = in_req->node_id;
@@
-2860,15
+2851,15
@@
static gpointer __zblib_request_create_zdo_dev_control_request_data(guint reques
}
break;
}
break;
- case ZBLIB_ZDO_DEV_CONTROL_OPS_NWK_DISC_REQ: {
- ZigbeeZdoDevControlNwkDiscoveryReq_t *in_req;
- ZigbeeZdoDevControlNwkDiscoveryReq_t *req = NULL;
+ case ZBLIB_ZDO_DEV_CONTROL_OPS_
MGMT_
NWK_DISC_REQ: {
+ ZigbeeZdoDevControl
Mgmt
NwkDiscoveryReq_t *in_req;
+ ZigbeeZdoDevControl
Mgmt
NwkDiscoveryReq_t *req = NULL;
- in_req = (ZigbeeZdoDevControlNwkDiscoveryReq_t *)request_data;
+ in_req = (ZigbeeZdoDevControl
Mgmt
NwkDiscoveryReq_t *)request_data;
if (NULL != in_req) {
/* Allocate memory */
if (NULL != in_req) {
/* Allocate memory */
- req = (ZigbeeZdoDevControlNwkDiscoveryReq_t *)
- g_malloc0(sizeof(ZigbeeZdoDevControlNwkDiscoveryReq_t));
+ req = (ZigbeeZdoDevControl
Mgmt
NwkDiscoveryReq_t *)
+ g_malloc0(sizeof(ZigbeeZdoDevControl
Mgmt
NwkDiscoveryReq_t));
/* Copy data */
req->node_id = in_req->node_id;
/* Copy data */
req->node_id = in_req->node_id;
@@
-3614,14
+3605,6
@@
static void __zblib_request_free_service_request_data(ZigBeeRequest *request,
/* Fetch ops ID */
ops_id = __zblib_request_get_ops_id(request_type);
switch (ops_id) {
/* Fetch ops ID */
ops_id = __zblib_request_get_ops_id(request_type);
switch (ops_id) {
- case ZBLIB_SERVICE_OPS_ENABLE: {
- }
- break;
-
- case ZBLIB_SERVICE_OPS_DISABLE: {
- }
- break;
-
case ZBLIB_SERVICE_OPS_ZB_HW_RESET: {
}
break;
case ZBLIB_SERVICE_OPS_ZB_HW_RESET: {
}
break;
@@
-4496,20
+4479,20
@@
static void __zblib_request_free_zdo_dev_control_request_data(ZigBeeRequest *req
}
break;
}
break;
- case ZBLIB_ZDO_DEV_CONTROL_OPS_NWK_UPDATE_REQ: {
- ZigbeeZdoDevControlNwkUpdateReq_t *req = NULL;
+ case ZBLIB_ZDO_DEV_CONTROL_OPS_
MGMT_
NWK_UPDATE_REQ: {
+ ZigbeeZdoDevControl
Mgmt
NwkUpdateReq_t *req = NULL;
- req = (ZigbeeZdoDevControlNwkUpdateReq_t *)request->request_data;
+ req = (ZigbeeZdoDevControl
Mgmt
NwkUpdateReq_t *)request->request_data;
if (NULL != req) {
g_free(req);
}
}
break;
if (NULL != req) {
g_free(req);
}
}
break;
- case ZBLIB_ZDO_DEV_CONTROL_OPS_NWK_DISC_REQ: {
- ZigbeeZdoDevControlNwkDiscoveryReq_t *req = NULL;
+ case ZBLIB_ZDO_DEV_CONTROL_OPS_
MGMT_
NWK_DISC_REQ: {
+ ZigbeeZdoDevControl
Mgmt
NwkDiscoveryReq_t *req = NULL;
- req = (ZigbeeZdoDevControlNwkDiscoveryReq_t *)request->request_data;
+ req = (ZigbeeZdoDevControl
Mgmt
NwkDiscoveryReq_t *)request->request_data;
if (NULL != req) {
g_free(req);
}
if (NULL != req) {
g_free(req);
}