Chagne DBus object name following Zigbee Specification

[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 5da7d22..b1d752e 100644 (file)
--- a/zigbee-daemon/zigbee-lib/src/zblib_request.c
+++ b/zigbee-daemon/zigbee-lib/src/zblib_request.c
@@ -22,24 +22,24 @@
 #include <zblib_service_interface.h>
 
 #include <zblib_driver.h>
-#include <zblib_driver_alarm.h>
+#include <zblib_driver_zcl_alarm.h>
 #include <zblib_driver_custom.h>
-#include <zblib_driver_door_lock.h>
-#include <zblib_driver_fan_control.h>
-#include <zblib_driver_level_control.h>
+#include <zblib_driver_zcl_door_lock.h>
+#include <zblib_driver_zcl_fan_control.h>
+#include <zblib_driver_zcl_level_control.h>
 #include <zblib_driver_mfglib_control.h>
-#include <zblib_driver_on_off.h>
+#include <zblib_driver_zcl_on_off.h>
 #include <zblib_driver_service.h>
-#include <zblib_driver_thermostat.h>
-#include <zblib_driver_zclbasic_control.h>
-#include <zblib_driver_zclglobal_control.h>
-#include <zblib_driver_zclias_control.h>
-#include <zblib_driver_zclidentify_control.h>
-#include <zblib_driver_zcl_color.h>
+#include <zblib_driver_zcl_thermostat.h>
+#include <zblib_driver_zcl_basic.h>
+#include <zblib_driver_zcl_global_control.h>
+#include <zblib_driver_zcl_ias_zone.h>
+#include <zblib_driver_zcl_identify.h>
+#include <zblib_driver_zcl_color_control.h>
 #include <zblib_driver_zcl_group.h>
 #include <zblib_driver_zcl_poll_control.h>
 #include <zblib_driver_zcl_scene.h>
-#include <zblib_driver_zdodev_control.h>
+#include <zblib_driver_zdo_dev_control.h>
 #include <zblib_driver_zdo_bind.h>
 
 /**< ZigBee Request object */
@@ -4824,6 +4824,21 @@ gpointer zblib_request_ref_request_data(ZigBeeRequest *request)
        return request->request_data;
 }
 
+gpointer zblib_request_ref_request_data_by_id(ZigBeeService *service,
+       guint request_id)
+{
+       ZigBeeRequest *request = NULL;
+
+       /* Fetch request based on request_id */
+       request = __zblib_request_ref_request_by_by_request_id(service, request_id);
+       if (NULL == request) {
+               Z_LOGE("No request available for request_id: [%d]", request_id);
+               return NULL;
+       }
+
+       return request->request_data;
+}
+
 guint zblib_request_generate_request_type(ZblibDriverType_e driver_type,
        guint ops_id)
 {