X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=zigbee-daemon%2Fzigbee-lib%2Fsrc%2Fzblib_request.c;h=f7c1cbaa2bca326ede62f1e004921e3ce657d3b2;hb=2885a3f487f668d3526941da7a6b07027aba204e;hp=8f7689fdddd443d069949c0f922de3cce38e80b4;hpb=e727551b89274987ac50301e10ca5057b73a2ef6;p=platform%2Fcore%2Fconnectivity%2Fzigbee-manager.git

diff --git a/zigbee-daemon/zigbee-lib/src/zblib_request.c b/zigbee-daemon/zigbee-lib/src/zblib_request.c
index 8f7689f..f7c1cba 100644
--- 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;
 
@@ -616,7 +630,7 @@ static gpointer __zblib_request_create_zcl_level_control_request_data(guint requ
 			req->node_id = in_req->node_id;
 			req->endpoint = in_req->endpoint;
 			req->step_mode = in_req->step_mode;
-			req->move_mode = in_req->move_mode;
+			req->step_size = in_req->step_size;
 			req->transition_time = in_req->transition_time;
 		}
 
@@ -680,7 +694,7 @@ static gpointer __zblib_request_create_zcl_level_control_request_data(guint requ
 			req->node_id = in_req->node_id;
 			req->endpoint = in_req->endpoint;
 			req->step_mode = in_req->step_mode;
-			req->move_mode = in_req->move_mode;
+			req->step_size = in_req->step_size;
 			req->transition_time = in_req->transition_time;
 		}
 
@@ -1282,6 +1296,7 @@ static gpointer __zblib_request_create_service_request_data(guint request_type,
 	break;
 
 	default:
+		Z_LOGE("Unexpected operation [%x]", ops_id);
 	break;
 	}
 
@@ -2062,8 +2077,8 @@ static gpointer __zblib_request_create_zcl_color_control_request_data(guint requ
 			/* Copy data */
 			req->node_id = in_req->node_id;
 			req->dest_ep = in_req->dest_ep;
-			req->rate_x = in_req->rate_x;
-			req->rate_y = in_req->rate_y;
+			req->step_x = in_req->step_x;
+			req->step_y = in_req->step_y;
 			req->transition_time = in_req->transition_time;
 		}
 
@@ -2369,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);
 		}
 
@@ -4750,7 +4765,7 @@ gpointer zblib_request_ref_response_cb(ZigBeeServiceInterface *service_interface
 	ZigBeeService *service = NULL;
 	ZigBeeRequest *request = NULL;
 
-	zblib_check_null_ret_error("request", request, NULL);
+	zblib_check_null_ret_error("service_interface", service_interface, NULL);
 
 	/* Fetch service */
 	service = zblib_service_interface_ref_service(service_interface);