X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=zigbee-daemon%2Fzigbee-interface%2Fsrc%2Fzigbee_service_dbus_interface_zcl_identify.c;h=b6e2d45d9cfd5654e523d87db2cab5ba319f1f76;hb=691ff0189bb1cf9097978cf40e7459fe188f1306;hp=dc6a18b85892aac4acf4d8150d9bc7670c7c40f2;hpb=16de8e58f80af7b2335260fec1fdd7a33e2d19b9;p=platform%2Fcore%2Fconnectivity%2Fzigbee-manager.git diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_identify.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_identify.c index dc6a18b..b6e2d45 100644 --- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_identify.c +++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_identify.c @@ -20,17 +20,59 @@ #include +static void *_service_interface_ref_zigbee_zcl_identify(ZigBeeServiceInterface *service_interface) +{ + ZigbeeObjectSkeleton *zigbee_object = NULL; + ZigbeeCustomData_t *custom_data = NULL; + ZigbeeZcl_identify *id_object = NULL; + + custom_data = (ZigbeeCustomData_t *)zblib_service_interface_ref_user_data(service_interface); + if (NULL == custom_data) { + Z_LOGE("D-BUS service interface custom_data is NULL!"); + return NULL; + } + + /* Get zigbee object */ + zigbee_object = g_hash_table_lookup(custom_data->objects, ZIGBEE_SERVICE_PATH); + if (NULL == zigbee_object) { + Z_LOGW("Cannot find ZigBee D-BUS interface object!", zigbee_object); + return NULL; + } + + id_object = zigbee_object_get_zcl_identify(ZIGBEE_OBJECT(zigbee_object)); + return id_object; +} + + static void on_zclidentify_control_identify_resp(ZigBeeServiceInterface *service_interface, guint request_id, gpointer resp_data, guint resp_data_len, gpointer resp_cb_data) { ZigbeeServiceInterfaceRespCbData_t *cb_data = (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data; - NOT_USED(cb_data); + ZigbeeZcl_identify *id_object = NULL; + GDBusMethodInvocation *invocation = NULL; + + ZigbeeGeneralResp_t *payload = (ZigbeeGeneralResp_t *)resp_data; + NOT_USED(service_interface); NOT_USED(request_id); - NOT_USED(resp_data); - NOT_USED(resp_data_len); + + if (NULL == resp_data || 0 == resp_data_len) { + Z_LOGE("resp_data=%p or resp_data_len=%d is null", resp_data, resp_data_len); + g_free(cb_data); + return; + } + + id_object = zigbee_service_dbus_interface_ref_interface_object(cb_data); + zblib_check_null_free_and_ret("id_object", id_object, cb_data); + + invocation = zigbee_service_dbus_interface_ref_invocation(cb_data); + zblib_check_null_free_and_ret("invocation", invocation, cb_data); + + zigbee_zcl_identify_complete_identify(id_object, invocation, payload->result); + + g_free(cb_data); } static gboolean on_zclidentify_control_identify(ZigbeeZcl_identify *zclidentify_control_object, @@ -41,12 +83,12 @@ static gboolean on_zclidentify_control_identify(ZigbeeZcl_identify *zclidentify_ gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZclidentifyControlIdentify_t req; + ZigbeeZclIdentifyIdentify_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZclidentifyControlIdentify_t)); + memset(&req, 0x0, sizeof(ZigbeeZclIdentifyIdentify_t)); /* Update request structure */ req.node_id = node_id; @@ -68,8 +110,8 @@ static gboolean on_zclidentify_control_identify(ZigbeeZcl_identify *zclidentify_ /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZCLIDENTIFY_CONTROL, - ZBLIB_ZCLIDENTIFY_CONTROL_OPS_IDENTIFY, + ZBLIB_DRIVER_TYPE_ZCL_IDENTIFY, + ZBLIB_ZCL_IDENTIFY_OPS_IDENTIFY, &req, sizeof(req), on_zclidentify_control_identify_resp, resp_cb_data); if (FALSE == ret) { @@ -93,11 +135,29 @@ static void on_zclidentify_control_query_resp(ZigBeeServiceInterface *service_in ZigbeeServiceInterfaceRespCbData_t *cb_data = (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data; - NOT_USED(cb_data); + ZigbeeZcl_identify *id_object = NULL; + GDBusMethodInvocation *invocation = NULL; + + ZigbeeGeneralResp_t *payload = (ZigbeeGeneralResp_t *)resp_data; + NOT_USED(service_interface); NOT_USED(request_id); - NOT_USED(resp_data); - NOT_USED(resp_data_len); + + if (NULL == resp_data || 0 == resp_data_len) { + Z_LOGE("resp_data=%p or resp_data_len=%d is null", resp_data, resp_data_len); + g_free(cb_data); + return; + } + + id_object = zigbee_service_dbus_interface_ref_interface_object(cb_data); + zblib_check_null_free_and_ret("id_object", id_object, cb_data); + + invocation = zigbee_service_dbus_interface_ref_invocation(cb_data); + zblib_check_null_free_and_ret("invocation", invocation, cb_data); + + zigbee_zcl_identify_complete_query(id_object, invocation, payload->result); + + g_free(cb_data); } static gboolean on_zclidentify_control_query(ZigbeeZcl_identify *zclidentify_control_object, @@ -107,12 +167,12 @@ static gboolean on_zclidentify_control_query(ZigbeeZcl_identify *zclidentify_con gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZclidentifyControlQuery_t req; + ZigbeeZclIdentifyQuery_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZclidentifyControlQuery_t)); + memset(&req, 0x0, sizeof(ZigbeeZclIdentifyQuery_t)); /* Update request structure */ req.node_id = node_id; @@ -133,8 +193,8 @@ static gboolean on_zclidentify_control_query(ZigbeeZcl_identify *zclidentify_con /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZCLIDENTIFY_CONTROL, - ZBLIB_ZCLIDENTIFY_CONTROL_OPS_QUERY, + ZBLIB_DRIVER_TYPE_ZCL_IDENTIFY, + ZBLIB_ZCL_IDENTIFY_OPS_QUERY, &req, sizeof(req), on_zclidentify_control_query_resp, resp_cb_data); if (FALSE == ret) { @@ -152,6 +212,41 @@ static gboolean on_zclidentify_control_query(ZigbeeZcl_identify *zclidentify_con return TRUE; } +void zigbee_service_dbus_interface_zcl_identify_notification(ZigBeeServiceInterface *service_interface, + guint noti_id, gpointer noti_data, guint noti_data_len, gpointer noti_cb_data) +{ + ZigbeeZcl_identify *id_object; + + zblib_check_null_ret("service_interface", service_interface); + + if (NULL == noti_data || 0 == noti_data_len) { + Z_LOGE("noti_data=%p or noti_data_len=%d is null", noti_data, noti_data_len); + return; + } + + id_object = _service_interface_ref_zigbee_zcl_identify(service_interface); + zblib_check_null_ret("id_object", id_object); + + NOT_USED(noti_cb_data); + + switch (noti_id) { + case ZBLIB_ZCL_IDENTIFY_NOTI_QUERY_RSP: { + ZigbeeZclIdentifyQueryNoti_t *rsp = (ZigbeeZclIdentifyQueryNoti_t*)noti_data; + + Z_LOGD("query_rsp from : [0x%X]", rsp->node_id); + + zigbee_zcl_identify_emit_query_rsp(id_object, rsp->node_id, rsp->identify_time); + } + break; + default: + Z_LOGE("Unexpected notification [%x]", noti_id); + break; + } + + /* ZigbeeZcl_identify should be dereferenced */ + g_object_unref(id_object); +} + gboolean zigbee_service_dbus_interface_zcl_identify_init(ZigBeeServiceInterface *service_interface, ZigbeeObjectSkeleton *zigbee_object) {