X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=zigbee-daemon%2Fzigbee-interface%2Fsrc%2Fzigbee_service_dbus_interface_zcl_door_lock.c;h=75c650b015661a45af6e2cdc74d01fd1b5fa2ec9;hb=a991c099b7f05eaecc8005515d8cb1e58fe8aa8b;hp=691689739df2d4f3feaf1795b1ae1ee35499fd1c;hpb=16de8e58f80af7b2335260fec1fdd7a33e2d19b9;p=platform%2Fcore%2Fconnectivity%2Fzigbee-manager.git

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..75c650b 100644
--- 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,7 +48,7 @@ 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);
@@ -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,7 +125,7 @@ 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;
@@ -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,7 +204,7 @@ 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);
@@ -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,7 +279,7 @@ 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);
@@ -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) {