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

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

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_door_lock.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_door_lock.c
index 6916897..ee2d25b 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_door_lock.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_door_lock.c
@@ -40,7 +40,7 @@ static gboolean on_door_lock_subscribe_lock_event(ZigbeeZcl_door_lock *door_lock
        gpointer user_data)
 {
        ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data;
-       ZigbeeDoorLockSubscriberLockEvent_t req;
+       ZigbeeZclDoorLockSubscriberLockEvent_t req;
        ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL;
 
        GVariantIter *iter = NULL;
@@ -48,11 +48,11 @@ static gboolean on_door_lock_subscribe_lock_event(ZigbeeZcl_door_lock *door_lock
 
        gboolean ret;
 
-       memset(&req, 0x0, sizeof(ZigbeeDoorLockSubscriberLockEvent_t));
+       memset(&req, 0x0, sizeof(ZigbeeZclDoorLockSubscriberLockEvent_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 +74,8 @@ static gboolean on_door_lock_subscribe_lock_event(ZigbeeZcl_door_lock *door_lock
 
        /* Dispatch request */
        ret = zigbee_service_dbus_interface_dispatch_request(service_interface,
-               ZBLIB_DRIVER_TYPE_DOOR_LOCK,
-               ZBLIB_DOOR_LOCK_OPS_SUBSCRIBE_LOCK_EVENT,
+               ZBLIB_DRIVER_TYPE_ZCL_DOOR_LOCK,
+               ZBLIB_ZCL_DOOR_LOCK_OPS_SUBSCRIBE_LOCK_EVENT,
                &req, sizeof(req),
                on_door_lock_subscribe_lock_event_resp, resp_cb_data);
        if (FALSE == ret) {
@@ -117,7 +117,7 @@ static gboolean on_door_lock_set_door_lock_pin(ZigbeeZcl_door_lock *door_lock_ob
        gpointer user_data)
 {
        ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data;
-       ZigbeeDoorLockSetDoorLockPin_t req;
+       ZigbeeZclDoorLockSetDoorLockPin_t req;
        ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL;
 
        GVariantIter *iter = NULL;
@@ -125,14 +125,14 @@ static gboolean on_door_lock_set_door_lock_pin(ZigbeeZcl_door_lock *door_lock_ob
 
        gboolean ret;
 
-       memset(&req, 0x0, sizeof(ZigbeeDoorLockSetDoorLockPin_t));
+       memset(&req, 0x0, sizeof(ZigbeeZclDoorLockSetDoorLockPin_t));
 
        /* Update request structure */
        req.uid = uid;
        req.ustatus = ustatus;
        req.utype = utype;
-       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;
@@ -155,8 +155,8 @@ static gboolean on_door_lock_set_door_lock_pin(ZigbeeZcl_door_lock *door_lock_ob
 
        /* Dispatch request */
        ret = zigbee_service_dbus_interface_dispatch_request(service_interface,
-               ZBLIB_DRIVER_TYPE_DOOR_LOCK,
-               ZBLIB_DOOR_LOCK_OPS_SET_DOOR_LOCK_PIN,
+               ZBLIB_DRIVER_TYPE_ZCL_DOOR_LOCK,
+               ZBLIB_ZCL_DOOR_LOCK_OPS_SET_DOOR_LOCK_PIN,
                &req, sizeof(req),
                on_door_lock_set_door_lock_pin_resp, resp_cb_data);
        if (FALSE == ret) {
@@ -196,7 +196,7 @@ static gboolean on_door_lock_set_door_lock(ZigbeeZcl_door_lock *door_lock_object
        gpointer user_data)
 {
        ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data;
-       ZigbeeDoorLockSetDoorLock_t req;
+       ZigbeeZclDoorLockSetDoorLock_t req;
        ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL;
 
        GVariantIter *iter = NULL;
@@ -204,11 +204,11 @@ static gboolean on_door_lock_set_door_lock(ZigbeeZcl_door_lock *door_lock_object
 
        gboolean ret;
 
-       memset(&req, 0x0, sizeof(ZigbeeDoorLockSetDoorLock_t));
+       memset(&req, 0x0, sizeof(ZigbeeZclDoorLockSetDoorLock_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;
@@ -232,8 +232,8 @@ static gboolean on_door_lock_set_door_lock(ZigbeeZcl_door_lock *door_lock_object
 
        /* Dispatch request */
        ret = zigbee_service_dbus_interface_dispatch_request(service_interface,
-               ZBLIB_DRIVER_TYPE_DOOR_LOCK,
-               ZBLIB_DOOR_LOCK_OPS_SET_DOOR_LOCK,
+               ZBLIB_DRIVER_TYPE_ZCL_DOOR_LOCK,
+               ZBLIB_ZCL_DOOR_LOCK_OPS_SET_DOOR_LOCK,
                &req, sizeof(req),
                on_door_lock_set_door_lock_resp, resp_cb_data);
        if (FALSE == ret) {
@@ -271,7 +271,7 @@ static gboolean on_door_lock_get_lock_state(ZigbeeZcl_door_lock *door_lock_objec
        gpointer user_data)
 {
        ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data;
-       ZigbeeDoorLockGetDoorLock_t req;
+       ZigbeeZclDoorLockGetDoorLock_t req;
        ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL;
 
        GVariantIter *iter = NULL;
@@ -279,11 +279,11 @@ static gboolean on_door_lock_get_lock_state(ZigbeeZcl_door_lock *door_lock_objec
 
        gboolean ret;
 
-       memset(&req, 0x0, sizeof(ZigbeeDoorLockGetDoorLock_t));
+       memset(&req, 0x0, sizeof(ZigbeeZclDoorLockGetDoorLock_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;
@@ -305,8 +305,8 @@ static gboolean on_door_lock_get_lock_state(ZigbeeZcl_door_lock *door_lock_objec
 
        /* Dispatch request */
        ret = zigbee_service_dbus_interface_dispatch_request(service_interface,
-               ZBLIB_DRIVER_TYPE_DOOR_LOCK,
-               ZBLIB_DOOR_LOCK_OPS_GET_LOCK_STATE,
+               ZBLIB_DRIVER_TYPE_ZCL_DOOR_LOCK,
+               ZBLIB_ZCL_DOOR_LOCK_OPS_GET_LOCK_STATE,
                &req, sizeof(req),
                on_door_lock_get_lock_state_resp, resp_cb_data);
        if (FALSE == ret) {
@@ -324,6 +324,20 @@ static gboolean on_door_lock_get_lock_state(ZigbeeZcl_door_lock *door_lock_objec
        return TRUE;
 }
 
+void zigbee_service_dbus_interface_zcl_door_lock_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");
+               return;
+       }
+
+       NOT_USED(noti_id);
+       NOT_USED(noti_data);
+       NOT_USED(noti_data_len);
+       NOT_USED(noti_cb_data);
+}
+
 gboolean zigbee_service_dbus_interface_zcl_door_lock_init(ZigBeeServiceInterface *service_interface,
        ZigbeeObjectSkeleton *zigbee_object)
 {