Implement ZCL Alarm Cluster

Problem : ZCL Alarm cluster is not implemented
Cause : ZCL Alarm cluster is not implemented
Solution : Implemented ZCL Alarm cluster in daemon

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

diff --git a/common/include/zigbee_zcl_alarm_type.h b/common/include/zigbee_zcl_alarm_type.h
index b647260..d8eb6fb 100644 (file)
--- a/common/include/zigbee_zcl_alarm_type.h
+++ b/common/include/zigbee_zcl_alarm_type.h
@@ -21,12 +21,16 @@
 
 #include <zigbee_types.h>
 
+/* --------------------------------------------------------------------------------------
+ * For Request
+ * -------------------------------------------------------------------------------------*/
+
 /**
  * @brief Definition for ZCL Alarm get alarm count structure.
  * @since_tizen 3.0
  */
 typedef struct {
-       char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */
+       unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */
        char endpoint; /**< Endpoint */
 } ZigbeeZclAlarmGetAlarmCount_t;
 
@@ -55,7 +59,7 @@ typedef struct {
  * @since_tizen 3.0
  */
 typedef struct {
-       char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */
+       unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */
        char endpoint; /**< Endpoint */
        char alarm_code; /**< Alarm code */
        short cluster_id; /**< Cluster ID */
@@ -79,4 +83,33 @@ typedef struct {
        char endpoint; /**< Endpoint */
 } ZigbeeZclAlarmGetAlarm_t;
 
+/* --------------------------------------------------------------------------------------
+ * For Responses
+ * -------------------------------------------------------------------------------------*/
+
+/**
+ * @brief Definition for ZCL Alarm get alarm count response structure.
+ * @since_tizen 3.0
+ */
+typedef struct {
+       int result; /**< Result */
+       unsigned char status; /**< Status */
+} ZigbeeZclAlarmGetAlarmCountResp_t;
+
+/* --------------------------------------------------------------------------------------
+ * For Notifications
+ * -------------------------------------------------------------------------------------*/
+/**
+ * @brief Definition for ZCL Alarm notification structure.
+ * @since_tizen 3.0
+ */
+typedef struct {
+       short node_id; /**< Node ID */
+       char endpoint; /**< Endpoint */
+       char status; /**< Status */
+       char alarm_code; /**< Alarm code */
+       short clusterid; /**< Cluster ID */
+       int timestamp; /**< Time stamp */
+} ZigbeeZclAlarmGetAlarmRsp_t;
+
 #endif /* __ZIGBEE_ZCL_ALARM_TYPE_H__ */

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_service.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_service.c
index 03406f1..0b9a477 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_service.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_service.c
@@ -83,8 +83,6 @@ static gboolean on_service_enable(ZigbeeService *service_object,
 
        gboolean ret;
 
-       Z_LOGE("KSR");
-
        /* Allocate response callback data */
        resp_cb_data =
                zigbee_service_dbus_interface_create_resp_cb_data(service_object,

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_alarm.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_alarm.c
index a2cc3cd..dffec78 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_alarm.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_alarm.c
@@ -20,17 +20,60 @@
 
 #include <zblib_driver_zcl_alarm.h>
 
+static void *_service_interface_ref_zigbee_zcl_alarm(ZigBeeServiceInterface *service_interface)
+{
+       ZigbeeObjectSkeleton *zigbee_object = NULL;
+       ZigbeeCustomData_t *custom_data = NULL;
+       ZigbeeZcl_alarm *alarm_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;
+       }
+
+       alarm_object = zigbee_object_get_zcl_alarm(ZIGBEE_OBJECT(zigbee_object));
+       return alarm_object;
+}
+
 static void on_alarm_get_alarm_count_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_alarm *zcl_alarm_object = NULL;
+       GDBusMethodInvocation *invocation = NULL;
+
+       ZigbeeZclAlarmGetAlarmCountResp_t *payload =
+               (ZigbeeZclAlarmGetAlarmCountResp_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 is null");
+               g_free(cb_data);
+               return;
+       }
+
+       zcl_alarm_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
+       zblib_check_null_free_and_ret("zcl_alarm_object", zcl_alarm_object, cb_data);
+
+       invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
+       zblib_check_null_free_and_ret("invocation", invocation, cb_data);
+
+       zigbee_zcl_alarm_complete_get_alarm_count(zcl_alarm_object, invocation,
+               payload->result, payload->status);
+
+       g_free(cb_data);
 }
 
 static gboolean on_alarm_get_alarm_count(ZigbeeZcl_alarm *alarm_object,
@@ -99,11 +142,30 @@ static void on_alarm_reset_alarm_resp(ZigBeeServiceInterface *service_interface,
        ZigbeeServiceInterfaceRespCbData_t *cb_data =
                (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data;
 
-       NOT_USED(cb_data);
+       ZigbeeZcl_alarm *zcl_alarm_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 is null");
+               g_free(cb_data);
+               return;
+       }
+
+       zcl_alarm_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
+       zblib_check_null_free_and_ret("zcl_alarm_object", zcl_alarm_object, cb_data);
+
+       invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
+       zblib_check_null_free_and_ret("invocation", invocation, cb_data);
+
+       zigbee_zcl_alarm_complete_reset_alarm(zcl_alarm_object, invocation,
+               payload->result);
+
+       g_free(cb_data);
 }
 
 static gboolean on_alarm_reset_alarm(ZigbeeZcl_alarm *alarm_object,
@@ -131,7 +193,7 @@ static gboolean on_alarm_reset_alarm(ZigbeeZcl_alarm *alarm_object,
        /* Allocate response callback data */
        resp_cb_data =
                zigbee_service_dbus_interface_create_resp_cb_data(alarm_object,
-                       invocation, NULL, 0);
+                       invocation, &req, sizeof(req));
        if (NULL == resp_cb_data) {
                Z_LOGE("zigbee_service_dbus_interface_create_resp_cb_data failed!");
 
@@ -168,11 +230,30 @@ static void on_alarm_reset_all_alarm_resp(ZigBeeServiceInterface *service_interf
        ZigbeeServiceInterfaceRespCbData_t *cb_data =
                (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data;
 
-       NOT_USED(cb_data);
+       ZigbeeZcl_alarm *zcl_alarm_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 is null");
+               g_free(cb_data);
+               return;
+       }
+
+       zcl_alarm_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
+       zblib_check_null_free_and_ret("zcl_alarm_object", zcl_alarm_object, cb_data);
+
+       invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
+       zblib_check_null_free_and_ret("invocation", invocation, cb_data);
+
+       zigbee_zcl_alarm_complete_reset_all_alarm(zcl_alarm_object, invocation,
+               payload->result);
+
+       g_free(cb_data);
 }
 
 static gboolean on_alarm_reset_all_alarm(ZigbeeZcl_alarm *alarm_object,
@@ -233,11 +314,30 @@ static void on_alarm_alarm_resp(ZigBeeServiceInterface *service_interface,
        ZigbeeServiceInterfaceRespCbData_t *cb_data =
                (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data;
 
-       NOT_USED(cb_data);
+       ZigbeeZcl_alarm *zcl_alarm_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 is null");
+               g_free(cb_data);
+               return;
+       }
+
+       zcl_alarm_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
+       zblib_check_null_free_and_ret("zcl_alarm_object", zcl_alarm_object, cb_data);
+
+       invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
+       zblib_check_null_free_and_ret("invocation", invocation, cb_data);
+
+       zigbee_zcl_alarm_complete_alarm(zcl_alarm_object, invocation,
+               payload->result);
+
+       g_free(cb_data);
 }
 
 static gboolean on_alarm_alarm(ZigbeeZcl_alarm *alarm_object,
@@ -310,11 +410,31 @@ static void on_alarm_reset_alarm_log_resp(ZigBeeServiceInterface *service_interf
        ZigbeeServiceInterfaceRespCbData_t *cb_data =
                (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data;
 
-       NOT_USED(cb_data);
+       ZigbeeZcl_alarm *zcl_alarm_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 is null");
+               g_free(cb_data);
+               return;
+       }
+
+       zcl_alarm_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
+       zblib_check_null_free_and_ret("zcl_alarm_object", zcl_alarm_object, cb_data);
+
+       invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
+       zblib_check_null_free_and_ret("invocation", invocation, cb_data);
+
+       zigbee_zcl_alarm_complete_reset_alarm_log(zcl_alarm_object, invocation,
+               payload->result);
+
+       g_free(cb_data);
 }
 
 static gboolean on_alarm_reset_alarm_log(ZigbeeZcl_alarm *alarm_object,
@@ -375,11 +495,30 @@ static void on_alarm_get_alarm_resp(ZigBeeServiceInterface *service_interface,
        ZigbeeServiceInterfaceRespCbData_t *cb_data =
                (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data;
 
-       NOT_USED(cb_data);
+       ZigbeeZcl_alarm *zcl_alarm_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 is null");
+               g_free(cb_data);
+               return;
+       }
+
+       zcl_alarm_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
+       zblib_check_null_free_and_ret("zcl_alarm_object", zcl_alarm_object, cb_data);
+
+       invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
+       zblib_check_null_free_and_ret("invocation", invocation, cb_data);
+
+       zigbee_zcl_alarm_complete_get_alarm(zcl_alarm_object, invocation,
+               payload->result);
+
+       g_free(cb_data);
 }
 
 static gboolean on_alarm_get_alarm(ZigbeeZcl_alarm *alarm_object,
@@ -437,15 +576,38 @@ static gboolean on_alarm_get_alarm(ZigbeeZcl_alarm *alarm_object,
 void zigbee_service_dbus_interface_zcl_alarm_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_alarm *alarm_object;
+
+       zblib_check_null_ret("service_interface", service_interface);
+
+       if (NULL == noti_data || 0 == noti_data_len) {
+               Z_LOGE("noti_data is NULL");
                return;
        }
 
-       NOT_USED(noti_id);
-       NOT_USED(noti_data);
-       NOT_USED(noti_data_len);
+       alarm_object = _service_interface_ref_zigbee_zcl_alarm(service_interface);
+       zblib_check_null_ret("alarm_object", alarm_object);
+
        NOT_USED(noti_cb_data);
+
+       switch(noti_id) {
+       case ZBLIB_ZCL_ALARM_NOTI_GET_ALARM_RSP: {
+               ZigbeeZclAlarmGetAlarmRsp_t *rsp =
+                       (ZigbeeZclAlarmGetAlarmRsp_t*)noti_data;
+
+               Z_LOGD("get_alarm_rsp from : [0x%X]", rsp->node_id);
+
+               zigbee_zcl_alarm_emit_get_alarm_rsp(alarm_object, rsp->node_id, rsp->endpoint,
+                       rsp->status, rsp->alarm_code, rsp->clusterid, rsp->timestamp);
+       }
+       break;
+       default:
+               Z_LOGE("Unexpected notification [%x]", noti_id);
+       break;
+       }
+
+       /* ZigbeeZcl_alarm should be dereferenced */
+       g_object_unref(alarm_object);
 }
 
 gboolean zigbee_service_dbus_interface_zcl_alarm_init(ZigBeeServiceInterface *service_interface,

diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_alarm.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_alarm.h
index 05bebcb..cbf4a68 100644 (file)
--- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_alarm.h
+++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_alarm.h
@@ -39,6 +39,11 @@ typedef enum {
        ZBLIB_ZCL_ALARM_OPS_GET_ALARM, /**< Get alarm */
 } ZblibZclAlarmOps_e;
 
+/**< ZigBee 'ZCL alarm' notification IDs */
+typedef enum {
+       ZBLIB_ZCL_ALARM_NOTI_GET_ALARM_RSP = 1, /**< Get alarm rsp */
+} ZblibZclAlarmNoti_e;
+
 /* ZigBee 'alarm' driver APIs */
 ZigBeeDriver *zblib_driver_zcl_alarm_new(ZigBeePlugin *plugin,
        const gchar *driver_name,

diff --git a/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zcl_alarm.c b/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zcl_alarm.c
index 2a62ce9..e558666 100644 (file)
--- a/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zcl_alarm.c
+++ b/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zcl_alarm.c
@@ -18,6 +18,7 @@
 
 #include <zblib.h>
 #include <zblib_driver.h>
+#include <zblib_plugin.h>
 #include <zblib_request.h>
 
 #include "zblib_driver_zcl_alarm.h"
@@ -130,6 +131,7 @@ ZigBeeDriver *zblib_driver_zcl_alarm_new(ZigBeePlugin *plugin,
        ZblibDriverZclAlarmOps_t *ops)
 {
        ZigBeeDriver *driver = NULL;
+       ZigBeeService *service = NULL;
        ZblibDriverZclAlarmPrivData_t *priv_data = NULL;
        gboolean ret;
 
@@ -145,6 +147,19 @@ ZigBeeDriver *zblib_driver_zcl_alarm_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 51ecdec..b739646 100644 (file)
--- a/zigbee-daemon/zigbee-lib/src/zblib_request.c
+++ b/zigbee-daemon/zigbee-lib/src/zblib_request.c
@@ -245,7 +245,21 @@ static gpointer __zblib_request_create_zcl_alarm_request_data(guint request_type
        break;
 
        case ZBLIB_ZCL_ALARM_OPS_GET_ALARM: {
-               alarm_request_data = NULL;
+               ZigbeeZclAlarmGetAlarm_t *in_req;
+               ZigbeeZclAlarmGetAlarm_t *req = NULL;
+
+               in_req = (ZigbeeZclAlarmGetAlarm_t *)request_data;
+               if (in_req) {
+                       /* Allocate memory */
+                       req = (ZigbeeZclAlarmGetAlarm_t *)
+                               g_malloc0(sizeof(ZigbeeZclAlarmGetAlarm_t));
+
+                       /* Copy data */
+                       req->node_id = in_req->node_id;
+                       req->endpoint = in_req->endpoint;
+               }
+
+               alarm_request_data = (gpointer)req;
        }
        break;