Add driver API to fetch request data

 - Request ID logic abstracted from external world
 - Moved zblib_request.h to internal headers folder

Change-Id: Iaa522dc1144beb5ac2a9fa499b92ceeb22164f3d
Signed-off-by: Suresh Kumar N <suresh.n@samsung.com>

diff --git a/zigbee-daemon/CMakeLists.txt b/zigbee-daemon/CMakeLists.txt
index 5f3f17b..67575d6 100644 (file)
--- a/zigbee-daemon/CMakeLists.txt
+++ b/zigbee-daemon/CMakeLists.txt
@@ -41,6 +41,7 @@ MESSAGE(${pkgs_LDFLAGS})
 INCLUDE_DIRECTORIES(
         ${CMAKE_CURRENT_SOURCE_DIR}/src
         ${CMAKE_CURRENT_SOURCE_DIR}/zigbee-lib/include
+        ${CMAKE_CURRENT_SOURCE_DIR}/zigbee-lib/include_internal
         ${CMAKE_SOURCE_DIR}/common/include
         ${CMAKE_CURRENT_SOURCE_DIR}/zigbee-service/include
         ${CMAKE_CURRENT_SOURCE_DIR}/zigbee-interface/include

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_interface_common.h b/zigbee-daemon/zigbee-interface/src/zigbee_service_interface_common.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/zigbee-daemon/zigbee-lib/CMakeLists.txt b/zigbee-daemon/zigbee-lib/CMakeLists.txt
index d79ee34..352d5c1 100644 (file)
--- a/zigbee-daemon/zigbee-lib/CMakeLists.txt
+++ b/zigbee-daemon/zigbee-lib/CMakeLists.txt
@@ -25,6 +25,7 @@ INCLUDE_DIRECTORIES(
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}/src
         ${CMAKE_CURRENT_SOURCE_DIR}/include
+        ${CMAKE_CURRENT_SOURCE_DIR}/include_internal
 )
 
 MESSAGE(${CMAKE_C_FLAGS})

diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver.h b/zigbee-daemon/zigbee-lib/include/zblib_driver.h
index ab73308..b906c65 100644 (file)
--- a/zigbee-daemon/zigbee-lib/include/zblib_driver.h
+++ b/zigbee-daemon/zigbee-lib/include/zblib_driver.h
@@ -42,6 +42,9 @@ gboolean zblib_driver_set_free_hook(ZigBeeDriver *driver, ZblibDriverFreeHook_t
 
 ZblibDriverType_e zblib_driver_ref_driver_type(ZigBeeDriver *driver);
 
+gpointer zblib_driver_ref_request_data(ZigBeeDriver *driver,
+       guint request_id);
+
 gboolean zblib_driver_dispatch_request(ZigBeeDriver *driver, guint request_id);
 
 void zblib_driver_send_response(ZigBeeDriver *driver,

diff --git a/zigbee-daemon/zigbee-lib/include/zblib_request.h b/zigbee-daemon/zigbee-lib/include_internal/zblib_request.h
similarity index 95%
rename from zigbee-daemon/zigbee-lib/include/zblib_request.h
rename to zigbee-daemon/zigbee-lib/include_internal/zblib_request.h
index 605f664..ec53c59 100644 (file)
--- a/zigbee-daemon/zigbee-lib/include/zblib_request.h
+++ b/zigbee-daemon/zigbee-lib/include_internal/zblib_request.h
@@ -40,6 +40,8 @@ guint zblib_request_ref_request_type(ZigBeeRequest *request);
 ZigBeeServiceInterface *zblib_request_ref_service_interface(ZigBeeService *service,
        guint request_id);
 gpointer zblib_request_ref_request_data(ZigBeeRequest *request);
+gpointer zblib_request_ref_request_data_by_id(ZigBeeService *service,
+       guint request_id);
 
 guint zblib_request_generate_request_type(ZblibDriverType_e driver_type,
        guint ops_id);

diff --git a/zigbee-daemon/zigbee-lib/src/zblib_driver.c b/zigbee-daemon/zigbee-lib/src/zblib_driver.c
index c4ccda6..d045aff 100644 (file)
--- a/zigbee-daemon/zigbee-lib/src/zblib_driver.c
+++ b/zigbee-daemon/zigbee-lib/src/zblib_driver.c
@@ -20,6 +20,7 @@
 #include <zblib_driver.h>
 #include <zblib_plugin.h>
 #include <zblib_service.h>
+#include <zblib_request.h>
 
 /**< ZigBee driver object */
 struct zblib_driver_type {
@@ -127,6 +128,21 @@ ZblibDriverType_e zblib_driver_ref_driver_type(ZigBeeDriver *driver)
        return driver->driver_type;
 }
 
+gpointer zblib_driver_ref_request_data(ZigBeeDriver *driver,
+       guint request_id)
+{
+       ZigBeeService *service = NULL;
+
+       zblib_check_null_ret_error("driver", driver, NULL);
+
+       service = driver->service;
+       zblib_check_null_ret_error("service", service, NULL);
+
+       /* Fetch request data */
+       return zblib_request_ref_request_data_by_id(service,
+               request_id);
+}
+
 gboolean zblib_driver_dispatch_request(ZigBeeDriver *driver,
        guint request_id)
 {

diff --git a/zigbee-daemon/zigbee-lib/src/zblib_request.c b/zigbee-daemon/zigbee-lib/src/zblib_request.c
index 5da7d22..43392a6 100644 (file)
--- a/zigbee-daemon/zigbee-lib/src/zblib_request.c
+++ b/zigbee-daemon/zigbee-lib/src/zblib_request.c
@@ -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)
 {