Fix dbus parameter 'ay' to 'a(y)'

[platform/core/connectivity/zigbee-manager.git] / zigbee-daemon / zigbee-interface / src / zigbee_service_dbus_interface_zcl_thermostat.c

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_thermostat.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_thermostat.c
index 9ceee5d..b3ad201 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_thermostat.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_thermostat.c
@@ -20,17 +20,60 @@
 
 #include <zblib_driver_zcl_thermostat.h>
 
+static void *_service_interface_ref_zigbee_zcl_thermostat(
+       ZigBeeServiceInterface *service_interface)
+{
+       ZigbeeObjectSkeleton *zigbee_object = NULL;
+       ZigbeeCustomData_t *custom_data = NULL;
+       ZigbeeZcl_thermostat *thermo_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;
+       }
+
+       thermo_object = zigbee_object_get_zcl_thermostat(ZIGBEE_OBJECT(zigbee_object));
+       return thermo_object;
+}
+
 static void on_thermostat_get_local_temp_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_thermostat *thermo_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;
+       }
+
+       thermo_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
+       zblib_check_null_free_and_ret("thermo_object", thermo_object, cb_data);
+
+       invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
+       zblib_check_null_free_and_ret("invocation", invocation, cb_data);
+
+       zigbee_zcl_thermostat_complete_get_local_temp(thermo_object, invocation,
+               payload->result);
+
+       g_free(cb_data);
 }
 
 static gboolean on_thermostat_get_local_temp(ZigbeeZcl_thermostat *thermostat_object,
@@ -40,7 +83,7 @@ static gboolean on_thermostat_get_local_temp(ZigbeeZcl_thermostat *thermostat_ob
        gpointer user_data)
 {
        ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data;
-       ZigbeeThermostatGetLocalTemp_t req;
+       ZigbeeZclThermostatGetLocalTemp_t req;
        ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL;
 
        GVariantIter *iter = NULL;
@@ -48,11 +91,11 @@ static gboolean on_thermostat_get_local_temp(ZigbeeZcl_thermostat *thermostat_ob
 
        gboolean ret;
 
-       memset(&req, 0x0, sizeof(ZigbeeThermostatGetLocalTemp_t));
+       memset(&req, 0x0, sizeof(ZigbeeZclThermostatGetLocalTemp_t));
 
        /* Update request structure */
-       g_variant_get(eui64, "ay", &iter);
-       while (g_variant_iter_loop(iter, "y", req.eui64[i])) {
+       g_variant_get(eui64, "a(y)", &iter);
+       while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) {
                i++;
                if (i >= ZIGBEE_EUI64_SIZE)
                        break;
@@ -74,8 +117,8 @@ static gboolean on_thermostat_get_local_temp(ZigbeeZcl_thermostat *thermostat_ob
 
        /* Dispatch request */
        ret = zigbee_service_dbus_interface_dispatch_request(service_interface,
-               ZBLIB_DRIVER_TYPE_THERMOSTAT,
-               ZBLIB_THERMOSTAT_OPS_GET_LOCAL_TEMP,
+               ZBLIB_DRIVER_TYPE_ZCL_THERMOSTAT,
+               ZBLIB_ZCL_THERMOSTAT_OPS_GET_LOCAL_TEMP,
                &req, sizeof(req),
                on_thermostat_get_local_temp_resp, resp_cb_data);
        if (FALSE == ret) {
@@ -99,11 +142,30 @@ static void on_thermostat_get_weekly_schedule_resp(ZigBeeServiceInterface *servi
        ZigbeeServiceInterfaceRespCbData_t *cb_data =
                (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data;
 
-       NOT_USED(cb_data);
+       ZigbeeZcl_thermostat *thermo_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;
+       }
+
+       thermo_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
+       zblib_check_null_free_and_ret("thermo_object", thermo_object, cb_data);
+
+       invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
+       zblib_check_null_free_and_ret("invocation", invocation, cb_data);
+
+       zigbee_zcl_thermostat_complete_get_weekly_schedule(thermo_object, invocation,
+               payload->result);
+
+       g_free(cb_data);
 }
 
 static gboolean on_thermostat_get_weekly_schedule(ZigbeeZcl_thermostat *thermostat_object,
@@ -115,7 +177,7 @@ static gboolean on_thermostat_get_weekly_schedule(ZigbeeZcl_thermostat *thermost
        gpointer user_data)
 {
        ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data;
-       ZigbeeThermostatGetWeeklySchedule_t req;
+       ZigbeeZclThermostatGetWeeklySchedule_t req;
        ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL;
 
        GVariantIter *iter = NULL;
@@ -123,11 +185,11 @@ static gboolean on_thermostat_get_weekly_schedule(ZigbeeZcl_thermostat *thermost
 
        gboolean ret;
 
-       memset(&req, 0x0, sizeof(ZigbeeThermostatGetWeeklySchedule_t));
+       memset(&req, 0x0, sizeof(ZigbeeZclThermostatGetWeeklySchedule_t));
 
        /* Update request structure */
-       g_variant_get(eui64, "ay", &iter);
-       while (g_variant_iter_loop(iter, "y", req.eui64[i])) {
+       g_variant_get(eui64, "a(y)", &iter);
+       while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) {
                i++;
                if (i >= ZIGBEE_EUI64_SIZE)
                        break;
@@ -151,8 +213,8 @@ static gboolean on_thermostat_get_weekly_schedule(ZigbeeZcl_thermostat *thermost
 
        /* Dispatch request */
        ret = zigbee_service_dbus_interface_dispatch_request(service_interface,
-               ZBLIB_DRIVER_TYPE_THERMOSTAT,
-               ZBLIB_THERMOSTAT_OPS_GET_WEEKLY_SCHEDULE,
+               ZBLIB_DRIVER_TYPE_ZCL_THERMOSTAT,
+               ZBLIB_ZCL_THERMOSTAT_OPS_GET_WEEKLY_SCHEDULE,
                &req, sizeof(req),
                on_thermostat_get_weekly_schedule_resp, resp_cb_data);
        if (FALSE == ret) {
@@ -176,11 +238,30 @@ static void on_thermostat_set_weekly_schedule_resp(ZigBeeServiceInterface *servi
        ZigbeeServiceInterfaceRespCbData_t *cb_data =
                (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data;
 
-       NOT_USED(cb_data);
+       ZigbeeZcl_thermostat *thermo_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;
+       }
+
+       thermo_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
+       zblib_check_null_free_and_ret("thermo_object", thermo_object, cb_data);
+
+       invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
+       zblib_check_null_free_and_ret("invocation", invocation, cb_data);
+
+       zigbee_zcl_thermostat_complete_set_weekly_schedule(thermo_object, invocation,
+               payload->result);
+
+       g_free(cb_data);
 }
 
 static gboolean on_thermostat_set_weekly_schedule(ZigbeeZcl_thermostat *thermostat_object,
@@ -195,7 +276,7 @@ static gboolean on_thermostat_set_weekly_schedule(ZigbeeZcl_thermostat *thermost
        gpointer user_data)
 {
        ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data;
-       ZigbeeThermostatSetWeeklySchedule_t req;
+       ZigbeeZclThermostatSetWeeklySchedule_t req;
        ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL;
 
        GVariantIter *iter = NULL;
@@ -203,11 +284,11 @@ static gboolean on_thermostat_set_weekly_schedule(ZigbeeZcl_thermostat *thermost
 
        gboolean ret;
 
-       memset(&req, 0x0, sizeof(ZigbeeThermostatSetWeeklySchedule_t));
+       memset(&req, 0x0, sizeof(ZigbeeZclThermostatSetWeeklySchedule_t));
 
        /* Update request structure */
-       g_variant_get(eui64, "ay", &iter);
-       while (g_variant_iter_loop(iter, "y", req.eui64[i])) {
+       g_variant_get(eui64, "a(y)", &iter);
+       while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) {
                i++;
                if (i >= ZIGBEE_EUI64_SIZE)
                        break;
@@ -218,8 +299,8 @@ static gboolean on_thermostat_set_weekly_schedule(ZigbeeZcl_thermostat *thermost
        req.mode = mode;
 
        i = 0;
-       g_variant_get(payload, "ay", &iter);
-       while (g_variant_iter_loop(iter, "y", req.payload[i])) {
+       g_variant_get(payload, "a(y)", &iter);
+       while (g_variant_iter_loop(iter, "(y)", &(req.payload[i]))) {
                i++;
                if (i >= (guint)payload_len)
                        break;
@@ -241,8 +322,8 @@ static gboolean on_thermostat_set_weekly_schedule(ZigbeeZcl_thermostat *thermost
 
        /* Dispatch request */
        ret = zigbee_service_dbus_interface_dispatch_request(service_interface,
-               ZBLIB_DRIVER_TYPE_THERMOSTAT,
-               ZBLIB_THERMOSTAT_OPS_SET_WEEKLY_SCHEDULE,
+               ZBLIB_DRIVER_TYPE_ZCL_THERMOSTAT,
+               ZBLIB_ZCL_THERMOSTAT_OPS_SET_WEEKLY_SCHEDULE,
                &req, sizeof(req),
                on_thermostat_set_weekly_schedule_resp, resp_cb_data);
        if (FALSE == ret) {
@@ -266,11 +347,30 @@ static void on_thermostat_clear_weekly_schedule_resp(ZigBeeServiceInterface *ser
        ZigbeeServiceInterfaceRespCbData_t *cb_data =
                (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data;
 
-       NOT_USED(cb_data);
+       ZigbeeZcl_thermostat *thermo_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;
+       }
+
+       thermo_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
+       zblib_check_null_free_and_ret("thermo_object", thermo_object, cb_data);
+
+       invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
+       zblib_check_null_free_and_ret("invocation", invocation, cb_data);
+
+       zigbee_zcl_thermostat_complete_clear_weekly_schedule(thermo_object, invocation,
+               payload->result);
+
+       g_free(cb_data);
 }
 
 static gboolean on_thermostat_clear_weekly_schedule(ZigbeeZcl_thermostat *thermostat_object,
@@ -280,7 +380,7 @@ static gboolean on_thermostat_clear_weekly_schedule(ZigbeeZcl_thermostat *thermo
        gpointer user_data)
 {
        ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data;
-       ZigbeeThermostatClearWeeklySchedule_t req;
+       ZigbeeZclThermostatClearWeeklySchedule_t req;
        ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL;
 
        GVariantIter *iter = NULL;
@@ -288,11 +388,11 @@ static gboolean on_thermostat_clear_weekly_schedule(ZigbeeZcl_thermostat *thermo
 
        gboolean ret;
 
-       memset(&req, 0x0, sizeof(ZigbeeThermostatClearWeeklySchedule_t));
+       memset(&req, 0x0, sizeof(ZigbeeZclThermostatClearWeeklySchedule_t));
 
        /* Update request structure */
-       g_variant_get(eui64, "ay", &iter);
-       while (g_variant_iter_loop(iter, "y", req.eui64[i])) {
+       g_variant_get(eui64, "a(y)", &iter);
+       while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) {
                i++;
                if (i >= ZIGBEE_EUI64_SIZE)
                        break;
@@ -314,8 +414,8 @@ static gboolean on_thermostat_clear_weekly_schedule(ZigbeeZcl_thermostat *thermo
 
        /* Dispatch request */
        ret = zigbee_service_dbus_interface_dispatch_request(service_interface,
-               ZBLIB_DRIVER_TYPE_THERMOSTAT,
-               ZBLIB_THERMOSTAT_OPS_CLEAR_WEEKLY_SCHEDULE,
+               ZBLIB_DRIVER_TYPE_ZCL_THERMOSTAT,
+               ZBLIB_ZCL_THERMOSTAT_OPS_CLEAR_WEEKLY_SCHEDULE,
                &req, sizeof(req),
                on_thermostat_clear_weekly_schedule_resp, resp_cb_data);
        if (FALSE == ret) {
@@ -339,11 +439,30 @@ static void on_thermostat_setpoint_raise_lower_resp(ZigBeeServiceInterface *serv
        ZigbeeServiceInterfaceRespCbData_t *cb_data =
                (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data;
 
-       NOT_USED(cb_data);
+       ZigbeeZcl_thermostat *thermo_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;
+       }
+
+       thermo_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
+       zblib_check_null_free_and_ret("thermo_object", thermo_object, cb_data);
+
+       invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
+       zblib_check_null_free_and_ret("invocation", invocation, cb_data);
+
+       zigbee_zcl_thermostat_complete_setpoint_raise_lower(thermo_object, invocation,
+               payload->result);
+
+       g_free(cb_data);
 }
 
 static gboolean on_thermostat_setpoint_raise_lower(ZigbeeZcl_thermostat *thermostat_object,
@@ -355,12 +474,12 @@ static gboolean on_thermostat_setpoint_raise_lower(ZigbeeZcl_thermostat *thermos
        gpointer user_data)
 {
        ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data;
-       ZigbeeThermostatSetpointRaiseLower_t req;
+       ZigbeeZclThermostatSetpointRaiseLower_t req;
        ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL;
 
        gboolean ret;
 
-       memset(&req, 0x0, sizeof(ZigbeeThermostatSetpointRaiseLower_t));
+       memset(&req, 0x0, sizeof(ZigbeeZclThermostatSetpointRaiseLower_t));
 
        /* Update request structure */
        req.node_id = node_id;
@@ -383,8 +502,8 @@ static gboolean on_thermostat_setpoint_raise_lower(ZigbeeZcl_thermostat *thermos
 
        /* Dispatch request */
        ret = zigbee_service_dbus_interface_dispatch_request(service_interface,
-               ZBLIB_DRIVER_TYPE_THERMOSTAT,
-               ZBLIB_THERMOSTAT_OPS_SETPOINT_RAISE_LOWER,
+               ZBLIB_DRIVER_TYPE_ZCL_THERMOSTAT,
+               ZBLIB_ZCL_THERMOSTAT_OPS_SETPOINT_RAISE_LOWER,
                &req, sizeof(req),
                on_thermostat_setpoint_raise_lower_resp, resp_cb_data);
        if (FALSE == ret) {
@@ -402,6 +521,34 @@ static gboolean on_thermostat_setpoint_raise_lower(ZigbeeZcl_thermostat *thermos
        return TRUE;
 }
 
+void zigbee_service_dbus_interface_zcl_thermostat_notification(ZigBeeServiceInterface *service_interface,
+       guint noti_id, gpointer noti_data, guint noti_data_len, gpointer noti_cb_data)
+{
+       ZigbeeZcl_thermostat *thermo_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;
+       }
+
+       thermo_object = _service_interface_ref_zigbee_zcl_thermostat(service_interface);
+       zblib_check_null_ret("thermo_object", thermo_object);
+
+       NOT_USED(noti_cb_data);
+
+       switch(noti_id) {
+       default:
+               Z_LOGE("Unexpected notification [%x]", noti_id);
+       break;
+       }
+
+       /* ZigbeeZcl_thermostat should be dereferenced */
+       g_object_unref(thermo_object);
+
+}
+
 gboolean zigbee_service_dbus_interface_zcl_thermostat_init(ZigBeeServiceInterface *service_interface,
        ZigbeeObjectSkeleton *zigbee_object)
 {