X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=zigbee-daemon%2Fzigbee-interface%2Fsrc%2Fzigbee_service_dbus_interface_zdo_dev_control.c;h=b54d3944e1291251c0d26694d4d6f761906dca9c;hb=a991c099b7f05eaecc8005515d8cb1e58fe8aa8b;hp=45a55ccd10993f3f31aeea6194982ea65ce4d335;hpb=16de8e58f80af7b2335260fec1fdd7a33e2d19b9;p=platform%2Fcore%2Fconnectivity%2Fzigbee-manager.git diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zdo_dev_control.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zdo_dev_control.c index 45a55cc..b54d394 100644 --- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zdo_dev_control.c +++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zdo_dev_control.c @@ -41,7 +41,7 @@ static gboolean on_zdodev_control_nwk_addr_req(ZigbeeZdo_dev_control *zdodev_con gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZdodevControlNwkAddrReq_t req; + ZigbeeZdoDevControlNwkAddrReq_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; GVariantIter *iter = NULL; @@ -49,7 +49,7 @@ static gboolean on_zdodev_control_nwk_addr_req(ZigbeeZdo_dev_control *zdodev_con gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZdodevControlNwkAddrReq_t)); + memset(&req, 0x0, sizeof(ZigbeeZdoDevControlNwkAddrReq_t)); /* Update request structure */ g_variant_get(eui64, "ay", &iter); @@ -76,8 +76,8 @@ static gboolean on_zdodev_control_nwk_addr_req(ZigbeeZdo_dev_control *zdodev_con /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZDODEV_CONTROL, - ZBLIB_ZDODEV_CONTROL_OPS_NWK_ADDR_REQ, + ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL, + ZBLIB_ZDO_DEV_CONTROL_OPS_NWK_ADDR_REQ, &req, sizeof(req), on_zdodev_control_nwk_addr_req_resp, resp_cb_data); if (FALSE == ret) { @@ -119,7 +119,7 @@ static gboolean on_zdodev_control_matched_descriptor_req(ZigbeeZdo_dev_control * gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZdodevControlMatchedDescriptorReq_t req; + ZigbeeZdoDevControlMatchedDescriptorReq_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; GVariantIter *iter = NULL; @@ -127,7 +127,7 @@ static gboolean on_zdodev_control_matched_descriptor_req(ZigbeeZdo_dev_control * gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZdodevControlMatchedDescriptorReq_t)); + memset(&req, 0x0, sizeof(ZigbeeZdoDevControlMatchedDescriptorReq_t)); /* Update request structure */ req.node_id = node_id; @@ -166,8 +166,8 @@ static gboolean on_zdodev_control_matched_descriptor_req(ZigbeeZdo_dev_control * /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZDODEV_CONTROL, - ZBLIB_ZDODEV_CONTROL_OPS_MATCHED_DESCRIPTOR_REQ, + ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL, + ZBLIB_ZDO_DEV_CONTROL_OPS_MATCHED_DESCRIPTOR_REQ, &req, sizeof(req), on_zdodev_control_matched_descriptor_req_resp, resp_cb_data); @@ -209,12 +209,12 @@ static gboolean on_zdodev_control_ieee_addr_req(ZigbeeZdo_dev_control *zdodev_co gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZdodevControlIeeeAddrReq_t req; + ZigbeeZdoDevControlIeeeAddrReq_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZdodevControlIeeeAddrReq_t)); + memset(&req, 0x0, sizeof(ZigbeeZdoDevControlIeeeAddrReq_t)); /* Update request structure */ req.node_id = node_id; @@ -234,8 +234,8 @@ static gboolean on_zdodev_control_ieee_addr_req(ZigbeeZdo_dev_control *zdodev_co /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZDODEV_CONTROL, - ZBLIB_ZDODEV_CONTROL_OPS_IEEE_ADDR_REQ, + ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL, + ZBLIB_ZDO_DEV_CONTROL_OPS_IEEE_ADDR_REQ, &req, sizeof(req), on_zdodev_control_ieee_addr_req_resp, resp_cb_data); if (FALSE == ret) { @@ -272,12 +272,12 @@ static gboolean on_zdodev_control_active_ep_req(ZigbeeZdo_dev_control *zdodev_co gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZdodevControlActiveEpReq_t req; + ZigbeeZdoDevControlActiveEpReq_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZdodevControlActiveEpReq_t)); + memset(&req, 0x0, sizeof(ZigbeeZdoDevControlActiveEpReq_t)); /* Update request structure */ req.node_id = node_id; @@ -297,8 +297,8 @@ static gboolean on_zdodev_control_active_ep_req(ZigbeeZdo_dev_control *zdodev_co /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZDODEV_CONTROL, - ZBLIB_ZDODEV_CONTROL_OPS_ACTIVE_EP_REQ, + ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL, + ZBLIB_ZDO_DEV_CONTROL_OPS_ACTIVE_EP_REQ, &req, sizeof(req), on_zdodev_control_active_ep_req_resp, resp_cb_data); if (FALSE == ret) { @@ -335,12 +335,12 @@ static gboolean on_zdodev_control_node_desc_req(ZigbeeZdo_dev_control *zdodev_co gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZdodevControlNodeDescriptorReq_t req; + ZigbeeZdoDevControlNodeDescriptorReq_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZdodevControlNodeDescriptorReq_t)); + memset(&req, 0x0, sizeof(ZigbeeZdoDevControlNodeDescriptorReq_t)); /* Update request structure */ req.node_id = node_id; @@ -360,8 +360,8 @@ static gboolean on_zdodev_control_node_desc_req(ZigbeeZdo_dev_control *zdodev_co /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZDODEV_CONTROL, - ZBLIB_ZDODEV_CONTROL_OPS_NODE_DESC_REQ, + ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL, + ZBLIB_ZDO_DEV_CONTROL_OPS_NODE_DESC_REQ, &req, sizeof(req), on_zdodev_control_node_desc_req_resp, resp_cb_data); if (FALSE == ret) { @@ -398,12 +398,12 @@ static gboolean on_zdodev_control_power_desc_req(ZigbeeZdo_dev_control *zdodev_c gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZdodevControlPowerDescriptorReq_t req; + ZigbeeZdoDevControlPowerDescriptorReq_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZdodevControlPowerDescriptorReq_t)); + memset(&req, 0x0, sizeof(ZigbeeZdoDevControlPowerDescriptorReq_t)); /* Update request structure */ req.node_id = node_id; @@ -423,8 +423,8 @@ static gboolean on_zdodev_control_power_desc_req(ZigbeeZdo_dev_control *zdodev_c /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZDODEV_CONTROL, - ZBLIB_ZDODEV_CONTROL_OPS_POWER_DESC_REQ, + ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL, + ZBLIB_ZDO_DEV_CONTROL_OPS_POWER_DESC_REQ, &req, sizeof(req), on_zdodev_control_power_desc_req_resp, resp_cb_data); if (FALSE == ret) { @@ -461,12 +461,12 @@ static gboolean on_zdodev_control_complex_desc_req(ZigbeeZdo_dev_control *zdodev gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZdodevControlComplexDescriptorReq_t req; + ZigbeeZdoDevControlComplexDescriptorReq_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZdodevControlComplexDescriptorReq_t)); + memset(&req, 0x0, sizeof(ZigbeeZdoDevControlComplexDescriptorReq_t)); /* Update request structure */ req.node_id = node_id; @@ -486,8 +486,8 @@ static gboolean on_zdodev_control_complex_desc_req(ZigbeeZdo_dev_control *zdodev /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZDODEV_CONTROL, - ZBLIB_ZDODEV_CONTROL_OPS_COMPLEX_DESC_REQ, + ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL, + ZBLIB_ZDO_DEV_CONTROL_OPS_COMPLEX_DESC_REQ, &req, sizeof(req), on_zdodev_control_complex_desc_req_resp, resp_cb_data); if (FALSE == ret) { @@ -524,12 +524,12 @@ static gboolean on_zdodev_control_user_desc_req(ZigbeeZdo_dev_control *zdodev_co gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZdodevControlUserDescriptorReq_t req; + ZigbeeZdoDevControlUserDescriptorReq_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZdodevControlUserDescriptorReq_t)); + memset(&req, 0x0, sizeof(ZigbeeZdoDevControlUserDescriptorReq_t)); /* Update request structure */ req.node_id = node_id; @@ -549,8 +549,8 @@ static gboolean on_zdodev_control_user_desc_req(ZigbeeZdo_dev_control *zdodev_co /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZDODEV_CONTROL, - ZBLIB_ZDODEV_CONTROL_OPS_USER_DESC_REQ, + ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL, + ZBLIB_ZDO_DEV_CONTROL_OPS_USER_DESC_REQ, &req, sizeof(req), on_zdodev_control_user_desc_req_resp, resp_cb_data); if (FALSE == ret) { @@ -589,7 +589,7 @@ static gboolean on_zdodev_control_user_desc_set_req(ZigbeeZdo_dev_control *zdode gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZdodevControlUserDescriptorSetReq_t req; + ZigbeeZdoDevControlUserDescriptorSetReq_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; GVariantIter *iter = NULL; @@ -597,7 +597,7 @@ static gboolean on_zdodev_control_user_desc_set_req(ZigbeeZdo_dev_control *zdode gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZdodevControlUserDescriptorSetReq_t)); + memset(&req, 0x0, sizeof(ZigbeeZdoDevControlUserDescriptorSetReq_t)); /* Update request structure */ req.node_id = node_id; @@ -624,8 +624,8 @@ static gboolean on_zdodev_control_user_desc_set_req(ZigbeeZdo_dev_control *zdode /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZDODEV_CONTROL, - ZBLIB_ZDODEV_CONTROL_OPS_USER_DESC_SET_REQ, + ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL, + ZBLIB_ZDO_DEV_CONTROL_OPS_USER_DESC_SET_REQ, &req, sizeof(req), on_zdodev_control_user_desc_set_req_resp, resp_cb_data); if (FALSE == ret) { @@ -664,7 +664,7 @@ static gboolean on_zdodev_control_device_announce(ZigbeeZdo_dev_control *zdodev_ gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZdodevControlDeviceAnnounce_t req; + ZigbeeZdoDevControlDeviceAnnounce_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; GVariantIter *iter = NULL; @@ -672,7 +672,7 @@ static gboolean on_zdodev_control_device_announce(ZigbeeZdo_dev_control *zdodev_ gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZdodevControlDeviceAnnounce_t)); + memset(&req, 0x0, sizeof(ZigbeeZdoDevControlDeviceAnnounce_t)); /* Update request structure */ req.node_id = node_id; @@ -699,8 +699,8 @@ static gboolean on_zdodev_control_device_announce(ZigbeeZdo_dev_control *zdodev_ /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZDODEV_CONTROL, - ZBLIB_ZDODEV_CONTROL_OPS_DEVICE_ANNOUNCE, + ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL, + ZBLIB_ZDO_DEV_CONTROL_OPS_DEVICE_ANNOUNCE, &req, sizeof(req), on_zdodev_control_device_announce_resp, resp_cb_data); if (FALSE == ret) { @@ -738,12 +738,12 @@ static gboolean on_zdodev_control_simple_desc_req(ZigbeeZdo_dev_control *zdodev_ gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZdodevControlSimpleDescriptorReq_t req; + ZigbeeZdoDevControlSimpleDescriptorReq_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZdodevControlSimpleDescriptorReq_t)); + memset(&req, 0x0, sizeof(ZigbeeZdoDevControlSimpleDescriptorReq_t)); /* Update request structure */ req.node_id = node_id; @@ -764,8 +764,8 @@ static gboolean on_zdodev_control_simple_desc_req(ZigbeeZdo_dev_control *zdodev_ /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZDODEV_CONTROL, - ZBLIB_ZDODEV_CONTROL_OPS_SIMPLE_DESC_REQ, + ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL, + ZBLIB_ZDO_DEV_CONTROL_OPS_SIMPLE_DESC_REQ, &req, sizeof(req), on_zdodev_control_simple_desc_req_resp, resp_cb_data); if (FALSE == ret) { @@ -803,12 +803,12 @@ static gboolean on_zdodev_control_mgmt_lqi_req(ZigbeeZdo_dev_control *zdodev_con gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZdodevControlMgmtLqiReq_t req; + ZigbeeZdoDevControlMgmtLqiReq_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZdodevControlMgmtLqiReq_t)); + memset(&req, 0x0, sizeof(ZigbeeZdoDevControlMgmtLqiReq_t)); /* Update request structure */ req.node_id = node_id; @@ -829,8 +829,8 @@ static gboolean on_zdodev_control_mgmt_lqi_req(ZigbeeZdo_dev_control *zdodev_con /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZDODEV_CONTROL, - ZBLIB_ZDODEV_CONTROL_OPS_MGMT_LQI_REQ, + ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL, + ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_LQI_REQ, &req, sizeof(req), on_zdodev_control_mgmt_lqi_req_resp, resp_cb_data); if (FALSE == ret) { @@ -868,12 +868,12 @@ static gboolean on_zdodev_control_mgmt_rtg_req(ZigbeeZdo_dev_control *zdodev_con gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZdodevControlMgmtRtgReq_t req; + ZigbeeZdoDevControlMgmtRtgReq_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZdodevControlMgmtRtgReq_t)); + memset(&req, 0x0, sizeof(ZigbeeZdoDevControlMgmtRtgReq_t)); /* Update request structure */ req.node_id = node_id; @@ -894,8 +894,8 @@ static gboolean on_zdodev_control_mgmt_rtg_req(ZigbeeZdo_dev_control *zdodev_con /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZDODEV_CONTROL, - ZBLIB_ZDODEV_CONTROL_OPS_MGMT_RTG_REQ, + ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL, + ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_RTG_REQ, &req, sizeof(req), on_zdodev_control_mgmt_rtg_req_resp, resp_cb_data); if (FALSE == ret) { @@ -933,12 +933,12 @@ static gboolean on_zdodev_control_mgmt_bind_req(ZigbeeZdo_dev_control *zdodev_co gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZdodevControlMgmtBindReq_t req; + ZigbeeZdoDevControlMgmtBindReq_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZdodevControlMgmtBindReq_t)); + memset(&req, 0x0, sizeof(ZigbeeZdoDevControlMgmtBindReq_t)); /* Update request structure */ req.node_id = node_id; @@ -959,8 +959,8 @@ static gboolean on_zdodev_control_mgmt_bind_req(ZigbeeZdo_dev_control *zdodev_co /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZDODEV_CONTROL, - ZBLIB_ZDODEV_CONTROL_OPS_MGMT_BIND_REQ, + ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL, + ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_BIND_REQ, &req, sizeof(req), on_zdodev_control_mgmt_bind_req_resp, resp_cb_data); if (FALSE == ret) { @@ -999,12 +999,12 @@ static gboolean on_zdodev_control_mgmt_permit_join_req(ZigbeeZdo_dev_control *zd gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZdodevControlMgmtPermitJoinReq_t req; + ZigbeeZdoDevControlMgmtPermitJoinReq_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZdodevControlMgmtPermitJoinReq_t)); + memset(&req, 0x0, sizeof(ZigbeeZdoDevControlMgmtPermitJoinReq_t)); /* Update request structure */ req.addr = addr16; @@ -1026,8 +1026,8 @@ static gboolean on_zdodev_control_mgmt_permit_join_req(ZigbeeZdo_dev_control *zd /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZDODEV_CONTROL, - ZBLIB_ZDODEV_CONTROL_OPS_MGMT_PERMIT_JOIN_REQ, + ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL, + ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_PERMIT_JOIN_REQ, &req, sizeof(req), on_zdodev_control_mgmt_permit_join_req_resp, resp_cb_data); if (FALSE == ret) { @@ -1068,12 +1068,12 @@ static gboolean on_zdodev_control_nwk_update_req(ZigbeeZdo_dev_control *zdodev_c gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZdodevControlNwkUpdateReq_t req; + ZigbeeZdoDevControlNwkUpdateReq_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZdodevControlNwkUpdateReq_t)); + memset(&req, 0x0, sizeof(ZigbeeZdoDevControlNwkUpdateReq_t)); /* Update request structure */ req.node_id = node_id; @@ -1097,8 +1097,8 @@ static gboolean on_zdodev_control_nwk_update_req(ZigbeeZdo_dev_control *zdodev_c /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZDODEV_CONTROL, - ZBLIB_ZDODEV_CONTROL_OPS_NWK_UPDATE_REQ, + ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL, + ZBLIB_ZDO_DEV_CONTROL_OPS_NWK_UPDATE_REQ, &req, sizeof(req), on_zdodev_control_nwk_update_req_resp, resp_cb_data); if (FALSE == ret) { @@ -1139,12 +1139,12 @@ static gboolean on_zdodev_control_nwk_disc_req(ZigbeeZdo_dev_control *zdodev_con gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - ZigbeeZdodevControlNwkDescriptorReq_t req; + ZigbeeZdoDevControlNwkDescriptorReq_t req; ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL; gboolean ret; - memset(&req, 0x0, sizeof(ZigbeeZdodevControlNwkDescriptorReq_t)); + memset(&req, 0x0, sizeof(ZigbeeZdoDevControlNwkDescriptorReq_t)); /* Update request structure */ req.node_id = node_id; @@ -1168,8 +1168,8 @@ static gboolean on_zdodev_control_nwk_disc_req(ZigbeeZdo_dev_control *zdodev_con /* Dispatch request */ ret = zigbee_service_dbus_interface_dispatch_request(service_interface, - ZBLIB_DRIVER_TYPE_ZDODEV_CONTROL, - ZBLIB_ZDODEV_CONTROL_OPS_NWK_DISC_REQ, + ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL, + ZBLIB_ZDO_DEV_CONTROL_OPS_NWK_DISC_REQ, &req, sizeof(req), on_zdodev_control_nwk_disc_req_resp, resp_cb_data); if (FALSE == ret) {