Implement ZCL Scene cluster

 - fix typo at Poll Controll cluster

Change-Id: Ibc5428c8ada49b3e69b3a7ef20f3ad8da608de3c
Signed-off-by: saerome kim <saerome.kim@samsung.com>

diff --git a/common/include/zigbee_zcl_scene_type.h b/common/include/zigbee_zcl_scene_type.h
index 37f72b9..4940d84 100644 (file)
--- a/common/include/zigbee_zcl_scene_type.h
+++ b/common/include/zigbee_zcl_scene_type.h
@@ -21,6 +21,10 @@
 
 #include <zigbee_types.h>
 
+/* -----------------------------------------------------------------------------
+ * For Requests
+ * ---------------------------------------------------------------------------*/
+
 /**
  * @brief Definition for ZCL scene add scene structure.
  * @since_tizen 3.0
@@ -33,7 +37,7 @@ typedef struct {
        short transition_time; /**< Transition time */
        char scene_name[ZIGBEE_ZCL_SCENE_NAME_MAX_LEN + 1]; /**< Scene name (NULL terminated */
        short ext_field_set_len; /**< Extended field set length */
-       short *ext_field_set; /**< Extended field set */
+       char *ext_field_set; /**< Extended field set */
 } ZigbeeZclSceneAddScene_t;
 
 /**
@@ -100,4 +104,86 @@ typedef struct {
        short group_id; /**< Group ID */
 } ZigbeeZclSceneGetSceneMembership_t;
 
+/* -----------------------------------------------------------------------------
+ * For Notification
+ * ---------------------------------------------------------------------------*/
+
+/**
+ * @brief Definition for ZCL scene add scene response structure.
+ * @since_tizen 3.0
+ */
+typedef struct {
+       short node_id; /**< Node ID */
+       char src_ep; /**< Destination endpoint */
+       char status; /**< Status */
+       short group_id; /**< Group ID */
+       char scene_id; /**< Scene ID */
+} ZigbeeZclSceneAddSceneResp_t;
+
+/**
+ * @brief Definition for ZCL scene view scene response structure.
+ * @since_tizen 3.0
+ */
+typedef struct {
+       short node_id; /**< Node ID */
+       char src_ep; /**< Source endpoint */
+       short group_id; /**< Group ID */
+       char status; /**< Status */
+       char scene_id; /**< Scene ID */
+       short transition_time; /**< Transition time */
+       char *scene_name; /**< Scene name (NULL terminated */
+       short ext_field_set_len; /**< Extended field set length */
+       char *ext_field_set; /**< Extended field set */
+} ZigbeeZclSceneViewSceneResp_t;
+
+/**
+ * @brief Definition for ZCL scene remove scene response structure.
+ * @since_tizen 3.0
+ */
+typedef struct {
+       short node_id; /**< Node ID */
+       char src_ep; /**< Source endpoint */
+       char status; /**< Status */
+       short group_id; /**< Group ID */
+       char scene_id; /**< Scene ID */
+} ZigbeeZclSceneRemoveSceneResp_t;
+
+/**
+ * @brief Definition for ZCL scene remove all scene response structure.
+ * @since_tizen 3.0
+ */
+typedef struct {
+       short node_id; /**< Node ID */
+       char src_ep; /**< Source endpoint */
+       char status; /**< Status */
+       short group_id; /**< Group ID */
+} ZigbeeZclSceneRemoveAllSceneResp_t;
+
+/**
+ * @brief Definition for ZCL scene store scene response structure.
+ * @since_tizen 3.0
+ */
+typedef struct {
+       short node_id; /**< Node ID */
+       char src_ep; /**< Source endpoint */
+       char status; /**< Status */
+       short group_id; /**< Group ID */
+       char scene_id; /**< Scene ID */
+} ZigbeeZclSceneStoreSceneResp_t;
+
+/**
+ * @brief Definition for ZCL scene get scene membership response structure.
+ * @since_tizen 3.0
+ */
+typedef struct {
+       short node_id; /**< Node ID */
+       char src_ep; /**< Source endpoint */
+       char status; /**< Status */
+       char capacity; /**< Capacity */
+       short group_id; /**< Group ID */
+       char scene_count; /**< Scene count */
+       char *scene_list; /**< Scene list */
+} ZigbeeZclSceneGetSceneMembershipResp_t;
+
+
 #endif /* __ZIGBEE_ZCL_SCENE_TYPE_H__ */

diff --git a/zigbee-daemon/zigbee-interface/introspection/zcl-scene.xml b/zigbee-daemon/zigbee-interface/introspection/zcl-scene.xml
index 2ecbf98..6763172 100644 (file)
--- a/zigbee-daemon/zigbee-interface/introspection/zcl-scene.xml
+++ b/zigbee-daemon/zigbee-interface/introspection/zcl-scene.xml
@@ -7,8 +7,8 @@
                        <arg type='y' name='scene_id' direction='in'/>
                        <arg type='q' name='transition_time' direction='in'/>
                        <arg type='q' name='extLen' direction='in'/>
-                       <arg type='ay' name='sceneName' direction='in'/>
-                       <arg type='ay' name='extFieldSet' direction='in'/>
+                       <arg type='a(y)' name='sceneName' direction='in'/>
+                       <arg type='a(y)' name='extFieldSet' direction='in'/>
                        <arg type='i' name='result' direction='out'/>
                </method>
                <method name='view_scene'>
@@ -66,9 +66,9 @@
                        <arg type='q' name='groupId'/>
                        <arg type='y' name='sceneId'/>
                        <arg type='q' name='transitionTime'/>
-                       <arg type='ay' name='name'/>
+                       <arg type='a(y)' name='name'/>
                        <arg type='y' name='extLen'/>
-                       <arg type='ay' name='extLenSet'/>
+                       <arg type='a(y)' name='extLenSet'/>
                </signal>
                <signal name='remove_scene_rsp'>
                        <arg type='q' name='nodeId'/>
@@ -89,7 +89,6 @@
                        <arg type='y' name='src_ep'/>
                        <arg type='y' name='status'/>
                        <arg type='q' name='groupId'/>
-                       <arg type='y' name='sceneId'/>
                </signal>
                <signal name='get_scene_membership_rsp'>
                        <arg type='q' name='nodeId'/>
@@ -98,7 +97,7 @@
                        <arg type='y' name='capacity'/>
                        <arg type='q' name='groupId'/>
                        <arg type='y' name='scenecount'/>
-                       <arg type='ay' name='sceneList'/>
+                       <arg type='a(y)' name='sceneList'/>
                </signal>
        </interface>
 </node>

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_scene.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_scene.c
index 946d549..dc57f00 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_scene.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_scene.c
@@ -20,17 +20,59 @@
 
 #include <zblib_driver_zcl_scene.h>
 
+static void *_service_interface_ref_zigbee_zcl_scene(
+       ZigBeeServiceInterface *service_interface)
+{
+       ZigbeeObjectSkeleton *zigbee_object = NULL;
+       ZigbeeCustomData_t *custom_data = NULL;
+       ZigbeeZcl_scene *scene_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;
+       }
+
+       scene_object = zigbee_object_get_zcl_scene(ZIGBEE_OBJECT(zigbee_object));
+       return scene_object;
+}
+
 static void on_zcl_scene_add_scene_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_scene *scene_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;
+       }
+
+       scene_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
+       zblib_check_null_free_and_ret("scene_object", scene_object, cb_data);
+
+       invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
+       zblib_check_null_free_and_ret("invocation", invocation, cb_data);
+
+       zigbee_zcl_scene_complete_add_scene(scene_object, invocation, payload->result);
+
+       g_free(cb_data);
 }
 
 static gboolean on_zcl_scene_add_scene(ZigbeeZcl_scene *zcl_scene_object,
@@ -62,8 +104,8 @@ static gboolean on_zcl_scene_add_scene(ZigbeeZcl_scene *zcl_scene_object,
        req.group_id = group_id;
        req.scene_id = scene_id;
        req.transition_time = transition_time;
-       g_variant_get(scene_name, "ay", &iter);
-       while (g_variant_iter_loop(iter, "y", req.scene_name[i])) {
+       g_variant_get(scene_name, "a(y)", &iter);
+       while (g_variant_iter_loop(iter, "(y)", req.scene_name[i])) {
                i++;
                if (i >= ZIGBEE_ZCL_GROUP_NAME_MAX_LEN + 1)
                        break;
@@ -72,8 +114,8 @@ static gboolean on_zcl_scene_add_scene(ZigbeeZcl_scene *zcl_scene_object,
        i = 0;
        req.ext_field_set_len = ext_length;
        req.ext_field_set = g_malloc0(ext_length);
-       g_variant_get(ext_field_set, "aq", &iter);
-       while (g_variant_iter_loop(iter, "q", req.ext_field_set[i])) {
+       g_variant_get(ext_field_set, "a(y)", &iter);
+       while (g_variant_iter_loop(iter, "(y)", req.ext_field_set[i])) {
                i++;
                if (i >= ext_length)
                        break;
@@ -123,11 +165,29 @@ static void on_zcl_scene_view_scene_resp(ZigBeeServiceInterface *service_interfa
        ZigbeeServiceInterfaceRespCbData_t *cb_data =
                (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data;
 
-       NOT_USED(cb_data);
+       ZigbeeZcl_scene *scene_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;
+       }
+
+       scene_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
+       zblib_check_null_free_and_ret("scene_object", scene_object, cb_data);
+
+       invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
+       zblib_check_null_free_and_ret("invocation", invocation, cb_data);
+
+       zigbee_zcl_scene_complete_view_scene(scene_object, invocation, payload->result);
+
+       g_free(cb_data);
 }
 
 static gboolean on_zcl_scene_view_scene(ZigbeeZcl_scene *zcl_scene_object,
@@ -192,11 +252,29 @@ static void on_zcl_scene_remove_scene_resp(ZigBeeServiceInterface *service_inter
        ZigbeeServiceInterfaceRespCbData_t *cb_data =
                (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data;
 
-       NOT_USED(cb_data);
+       ZigbeeZcl_scene *scene_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;
+       }
+
+       scene_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
+       zblib_check_null_free_and_ret("scene_object", scene_object, cb_data);
+
+       invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
+       zblib_check_null_free_and_ret("invocation", invocation, cb_data);
+
+       zigbee_zcl_scene_complete_remove_scene(scene_object, invocation, payload->result);
+
+       g_free(cb_data);
 }
 
 static gboolean on_zcl_scene_remove_scene(ZigbeeZcl_scene *zcl_scene_object,
@@ -261,11 +339,29 @@ static void on_zcl_scene_store_scene_resp(ZigBeeServiceInterface *service_interf
        ZigbeeServiceInterfaceRespCbData_t *cb_data =
                (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data;
 
-       NOT_USED(cb_data);
+       ZigbeeZcl_scene *scene_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;
+       }
+
+       scene_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
+       zblib_check_null_free_and_ret("scene_object", scene_object, cb_data);
+
+       invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
+       zblib_check_null_free_and_ret("invocation", invocation, cb_data);
+
+       zigbee_zcl_scene_complete_store_scene(scene_object, invocation, payload->result);
+
+       g_free(cb_data);
 }
 
 static gboolean on_zcl_scene_store_scene(ZigbeeZcl_scene *zcl_scene_object,
@@ -330,11 +426,29 @@ static void on_zcl_scene_recall_scene_resp(ZigBeeServiceInterface *service_inter
        ZigbeeServiceInterfaceRespCbData_t *cb_data =
                (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data;
 
-       NOT_USED(cb_data);
+       ZigbeeZcl_scene *scene_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;
+       }
+
+       scene_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
+       zblib_check_null_free_and_ret("scene_object", scene_object, cb_data);
+
+       invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
+       zblib_check_null_free_and_ret("invocation", invocation, cb_data);
+
+       zigbee_zcl_scene_complete_recall_scene(scene_object, invocation, payload->result);
+
+       g_free(cb_data);
 }
 
 static gboolean on_zcl_scene_recall_scene(ZigbeeZcl_scene *zcl_scene_object,
@@ -399,11 +513,29 @@ static void on_zcl_scene_remove_all_scene_resp(ZigBeeServiceInterface *service_i
        ZigbeeServiceInterfaceRespCbData_t *cb_data =
                (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data;
 
-       NOT_USED(cb_data);
+       ZigbeeZcl_scene *scene_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;
+       }
+
+       scene_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
+       zblib_check_null_free_and_ret("scene_object", scene_object, cb_data);
+
+       invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
+       zblib_check_null_free_and_ret("invocation", invocation, cb_data);
+
+       zigbee_zcl_scene_complete_remove_all_scene(scene_object, invocation, payload->result);
+
+       g_free(cb_data);
 }
 
 static gboolean on_zcl_scene_remove_all_scene(ZigbeeZcl_scene *zcl_scene_object,
@@ -466,11 +598,29 @@ static void on_zcl_scene_get_scene_membership_resp(ZigBeeServiceInterface *servi
        ZigbeeServiceInterfaceRespCbData_t *cb_data =
                (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data;
 
-       NOT_USED(cb_data);
+       ZigbeeZcl_scene *scene_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;
+       }
+
+       scene_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
+       zblib_check_null_free_and_ret("scene_object", scene_object, cb_data);
+
+       invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
+       zblib_check_null_free_and_ret("invocation", invocation, cb_data);
+
+       zigbee_zcl_scene_complete_get_scene_membership(scene_object, invocation, payload->result);
+
+       g_free(cb_data);
 }
 
 static gboolean on_zcl_scene_get_scene_membership(ZigbeeZcl_scene *zcl_scene_object,
@@ -530,15 +680,116 @@ static gboolean on_zcl_scene_get_scene_membership(ZigbeeZcl_scene *zcl_scene_obj
 void zigbee_service_dbus_interface_zcl_scene_notification(ZigBeeServiceInterface *service_interface,
        guint noti_id, gpointer noti_data, guint noti_data_len, gpointer noti_cb_data)
 {
-       if (NULL == service_interface) {
-               Z_LOGE("service_interface is NULL");
+       ZigbeeZcl_scene *scene_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;
        }
 
-       NOT_USED(noti_id);
-       NOT_USED(noti_data);
-       NOT_USED(noti_data_len);
+       scene_object = _service_interface_ref_zigbee_zcl_scene(service_interface);
+       zblib_check_null_ret("scene_object", scene_object);
+
        NOT_USED(noti_cb_data);
+
+       switch(noti_id) {
+       case ZBLIB_ZCL_SCENE_NOTI_ADD_SCENE: {
+               ZigbeeZclSceneAddSceneResp_t *rsp = (ZigbeeZclSceneAddSceneResp_t*)noti_data;
+
+               Z_LOGD("'add_scene_rsp' from : [0x%X]", rsp->node_id);
+
+               zigbee_zcl_scene_emit_add_scene_rsp(scene_object, rsp->node_id, rsp->src_ep,
+                       rsp->status, rsp->group_id, rsp->scene_id);
+       }
+       break;
+       case ZBLIB_ZCL_SCENE_NOTI_VIEW_SCENE: {
+               int i;
+
+               GVariant* scene_name = NULL;
+               GVariantBuilder *attr_builder = NULL;
+               GVariant* ext_field_set = NULL;
+               GVariantBuilder *attr_builder1 = NULL;
+
+               ZigbeeZclSceneViewSceneResp_t *rsp = (ZigbeeZclSceneViewSceneResp_t*)noti_data;
+
+               Z_LOGD("'view_scene_rsp' from : [0x%X]", rsp->node_id);
+
+               attr_builder = g_variant_builder_new(G_VARIANT_TYPE("a(y)"));
+               for (i = 0; rsp->scene_name[i] && i < ZIGBEE_ZCL_SCENE_NAME_MAX_LEN; i++)
+                       g_variant_builder_add(attr_builder, "(y)", rsp->scene_name[i]);
+               scene_name = g_variant_builder_end(attr_builder);
+               g_variant_builder_unref(attr_builder);
+
+
+               attr_builder1 = g_variant_builder_new(G_VARIANT_TYPE("a(y)"));
+               for (i = 0; i < rsp->ext_field_set_len; i++)
+                       g_variant_builder_add(attr_builder1, "(y)", rsp->ext_field_set[i]);
+               ext_field_set = g_variant_builder_end(attr_builder1);
+               g_variant_builder_unref(attr_builder1);
+
+               zigbee_zcl_scene_emit_view_scene_rsp(scene_object, rsp->node_id, rsp->src_ep,
+                       rsp->status, rsp->group_id, rsp->scene_id, rsp->transition_time,
+                       scene_name, rsp->ext_field_set_len, ext_field_set);
+       }
+       break;
+       case ZBLIB_ZCL_SCENE_NOTI_REMOVE_SCENE: {
+               ZigbeeZclSceneRemoveSceneResp_t *rsp = (ZigbeeZclSceneRemoveSceneResp_t*)noti_data;
+
+               Z_LOGD("'remove_scene_rsp' from : [0x%X]", rsp->node_id);
+
+               zigbee_zcl_scene_emit_remove_scene_rsp(scene_object, rsp->node_id, rsp->src_ep,
+                       rsp->status, rsp->group_id, rsp->scene_id);
+       }
+       break;
+       case ZBLIB_ZCL_SCENE_NOTI_REMOVE_ALL_SCENE: {
+               ZigbeeZclSceneRemoveAllSceneResp_t *rsp =
+                       (ZigbeeZclSceneRemoveAllSceneResp_t*)noti_data;
+
+               Z_LOGD("'remove_all_scene_rsp' from : [0x%X]", rsp->node_id);
+
+               zigbee_zcl_scene_emit_remove_all_scene_rsp(scene_object, rsp->node_id, rsp->src_ep,
+                       rsp->status, rsp->group_id);
+       }
+       break;
+       case ZBLIB_ZCL_SCENE_NOTI_STORE_SCENE: {
+               ZigbeeZclSceneStoreSceneResp_t *rsp =
+                       (ZigbeeZclSceneStoreSceneResp_t*)noti_data;
+
+               Z_LOGD("'store_scene_rsp' from : [0x%X]", rsp->node_id);
+
+               zigbee_zcl_scene_emit_store_scene_rsp(scene_object, rsp->node_id, rsp->src_ep,
+                       rsp->status, rsp->group_id, rsp->scene_id);
+       }
+       break;
+       case ZBLIB_ZCL_SCENE_NOTI_GET_SCENE_MEMBERSHIP: {
+               int i;
+               GVariant* scene_list = NULL;
+               GVariantBuilder *attr_builder = NULL;
+
+               ZigbeeZclSceneGetSceneMembershipResp_t *rsp =
+                       (ZigbeeZclSceneGetSceneMembershipResp_t*)noti_data;
+
+               Z_LOGD("'get_scene_rsp' from : [0x%X]", rsp->node_id);
+
+               attr_builder = g_variant_builder_new(G_VARIANT_TYPE("a(y)"));
+               for (i = 0; i < rsp->scene_count; i++)
+                       g_variant_builder_add(attr_builder, "(y)", rsp->scene_list[i]);
+               scene_list = g_variant_builder_end(attr_builder);
+               g_variant_builder_unref(attr_builder);
+
+               zigbee_zcl_scene_emit_get_scene_membership_rsp(scene_object, rsp->node_id, rsp->src_ep,
+                       rsp->status, rsp->capacity, rsp->group_id, rsp->scene_count, scene_list);
+       }
+       break;
+       default:
+               Z_LOGE("Unexpected notification [%x]", noti_id);
+       break;
+       }
+
+       /* ZigbeeZcl_scene should be dereferenced */
+       g_object_unref(scene_object);
 }
 
 gboolean zigbee_service_dbus_interface_zcl_scene_init(ZigBeeServiceInterface *service_interface,

diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_poll_control.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_poll_control.h
index c04aa9b..eb21717 100644 (file)
--- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_poll_control.h
+++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_poll_control.h
@@ -35,7 +35,7 @@ typedef enum {
        ZBLIB_ZCL_POLL_CONTROL_OPS_SET_SHORT_POLL_INTERVAL, /**< Set short poll interval */
 } ZblibZclPollControlOps_e;
 
-/**< ZigBee 'ZCL IAS zone' notification IDs */
+/**< ZigBee 'ZCL Poll Control' notification IDs */
 typedef enum {
        ZBLIB_ZCL_POLL_CONTROL_NOTI_CHECKIN_RESPONSE = 1, /**< Checkin response notification */
 } ZblibZclPollControlNoti_e;

diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_scene.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_scene.h
index a672319..e56304e 100644 (file)
--- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_scene.h
+++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_scene.h
@@ -41,6 +41,16 @@ typedef enum {
        ZBLIB_ZCL_SCENE_OPS_GET_SCENE_MEMBERSHIP, /**< Get scene membership */
 } ZblibZclSceneOps_e;
 
+/**< ZigBee 'ZCL Scene' notification IDs */
+typedef enum {
+       ZBLIB_ZCL_SCENE_NOTI_ADD_SCENE = 1, /**< Add scene notification */
+       ZBLIB_ZCL_SCENE_NOTI_VIEW_SCENE, /**< View scene notification */
+       ZBLIB_ZCL_SCENE_NOTI_REMOVE_SCENE, /**< Remove scene notification */
+       ZBLIB_ZCL_SCENE_NOTI_REMOVE_ALL_SCENE, /**< Remove all scene notification */
+       ZBLIB_ZCL_SCENE_NOTI_STORE_SCENE, /**< Store scene notification */
+       ZBLIB_ZCL_SCENE_NOTI_GET_SCENE_MEMBERSHIP, /**< remove scene notification */
+} ZblibZclSceneNoti_e;
+
 /* ZigBee 'ZCL scene' driver APIs */
 ZigBeeDriver *zblib_driver_zcl_scene_new(ZigBeePlugin *plugin,
        const gchar *driver_name,

diff --git a/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zcl_scene.c b/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zcl_scene.c
index 0663447..254cac3 100644 (file)
--- a/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zcl_scene.c
+++ b/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zcl_scene.c
@@ -18,6 +18,7 @@
 
 #include <zblib.h>
 #include <zblib_driver.h>
+#include <zblib_plugin.h>
 #include <zblib_request.h>
 
 #include "zblib_driver_zcl_scene.h"
@@ -138,6 +139,7 @@ ZigBeeDriver *zblib_driver_zcl_scene_new(ZigBeePlugin *plugin,
        ZblibDriverZclSceneOps_t *ops)
 {
        ZigBeeDriver *driver = NULL;
+       ZigBeeService *service = NULL;
        ZblibDriverZclScenePrivData_t *priv_data = NULL;
        gboolean ret;
 
@@ -153,6 +155,19 @@ ZigBeeDriver *zblib_driver_zcl_scene_new(ZigBeePlugin *plugin,
        /* Update private data */
        priv_data->ops = ops;
 
+       /* Link service to driver */
+       service = zblib_plugin_ref_service(plugin);
+       if (NULL == service) {
+               Z_LOGE("zblib_plugin_ref_service failed!");
+
+               /* Free allocated resources */
+               g_free(priv_data);
+               g_free(driver);
+
+               return NULL;
+       }
+       zblib_driver_link_service(driver, service);
+
        /* Link private data to driver */
        ret = zblib_driver_link_object(driver, priv_data);
        if (FALSE == ret) {

diff --git a/zigbee-daemon/zigbee-lib/src/zblib_request.c b/zigbee-daemon/zigbee-lib/src/zblib_request.c
index 3bbc5cf..f7c1cba 100644 (file)
--- a/zigbee-daemon/zigbee-lib/src/zblib_request.c
+++ b/zigbee-daemon/zigbee-lib/src/zblib_request.c
@@ -2384,7 +2384,7 @@ static gpointer __zblib_request_create_zcl_scene_request_data(guint request_type
                        g_strlcpy(req->scene_name,
                                in_req->scene_name, ZIGBEE_ZCL_SCENE_NAME_MAX_LEN + 1);
                        req->ext_field_set_len = in_req->ext_field_set_len;
-                       req->ext_field_set = (gshort *)g_memdup(in_req->ext_field_set,
+                       req->ext_field_set = (char *)g_memdup(in_req->ext_field_set,
                                in_req->ext_field_set_len);
                }