X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=zigbee-daemon%2Fzigbee-lib%2Fsrc%2Fdrivers%2Fzblib_driver_zdodev_control.c;h=451703a9a47b8634bcd5f26b91272cf655531ccb;hb=4bb3660ee581e83c6d5f2f19e42c7e9486f9f1dc;hp=9ad36966e61967098545467fe945fa829911561c;hpb=47b8338a27e23131e7800798eddbc4e43e6b4248;p=platform%2Fcore%2Fconnectivity%2Fzigbee-manager.git

diff --git a/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zdodev_control.c b/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zdodev_control.c
index 9ad3696..451703a 100644
--- a/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zdodev_control.c
+++ b/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zdodev_control.c
@@ -30,19 +30,23 @@ typedef struct {
 static gboolean __zblib_driver_zdodev_control_dispatcher(ZigBeeDriver *driver, guint request_id)
 {
 	ZigBeeService *service = NULL;
+	ZblibDriverZdodevControlPrivData_t *priv_data = NULL;
+	ZblibDriverZdodevControlOps_t *ops = NULL;
 	guint request_type;
 	guint ops_id;
+	gboolean ret = FALSE;
 
-	if (NULL == driver) {
-		Z_LOGE("driver is NULL");
-		return FALSE;
-	}
+	zblib_check_null_ret_error("driver", driver, FALSE);
 
 	service = zblib_driver_ref_service(driver);
-	if (NULL == service) {
-		Z_LOGE("service is NULL");
-		return FALSE;
-	}
+	zblib_check_null_ret_error("service", service, FALSE);
+
+	/* Fetch private data */
+	priv_data = zblib_driver_ref_object(driver);
+	zblib_check_null_ret_error("priv_data", priv_data, FALSE);
+
+	ops = priv_data->ops;
+	zblib_check_null_ret_error("ops", ops, FALSE);
 
 	/* Fetch request_type using request_id */
 	request_type = zblib_request_ref_request_type_by_request_id(service, request_id);
@@ -51,70 +55,138 @@ static gboolean __zblib_driver_zdodev_control_dispatcher(ZigBeeDriver *driver, g
 	ops_id = zblib_request_get_ops_id(request_type);
 	switch (ops_id) {
 	case ZBLIB_ZDODEV_CONTROL_OPS_NWK_ADDR_REQ: {
+		zblib_check_null_ret_error("ops->nwk_addr_req",
+			ops->nwk_addr_req, FALSE);
+
+		ret = ops->nwk_addr_req(driver, request_id);
 	}
 	break;
 
 	case ZBLIB_ZDODEV_CONTROL_OPS_MATCHED_DESCRIPTOR_REQ: {
+		zblib_check_null_ret_error("ops->matched_descriptor_req",
+			ops->matched_descriptor_req, FALSE);
+
+		ret = ops->matched_descriptor_req(driver, request_id);
 	}
 	break;
 
 	case ZBLIB_ZDODEV_CONTROL_OPS_IEEE_ADDR_REQ: {
+		zblib_check_null_ret_error("ops->ieee_addr_req",
+			ops->ieee_addr_req, FALSE);
+
+		ret = ops->ieee_addr_req(driver, request_id);
 	}
 	break;
 
 	case ZBLIB_ZDODEV_CONTROL_OPS_ACTIVE_EP_REQ: {
+		zblib_check_null_ret_error("ops->active_ep_req",
+			ops->active_ep_req, FALSE);
+
+		ret = ops->active_ep_req(driver, request_id);
 	}
 	break;
 
 	case ZBLIB_ZDODEV_CONTROL_OPS_NODE_DESC_REQ: {
+		zblib_check_null_ret_error("ops->node_desc_req",
+			ops->node_desc_req, FALSE);
+
+		ret = ops->node_desc_req(driver, request_id);
 	}
 	break;
 
 	case ZBLIB_ZDODEV_CONTROL_OPS_POWER_DESC_REQ: {
+		zblib_check_null_ret_error("ops->power_desc_req",
+			ops->power_desc_req, FALSE);
+
+		ret = ops->power_desc_req(driver, request_id);
 	}
 	break;
 
 	case ZBLIB_ZDODEV_CONTROL_OPS_COMPLEX_DESC_REQ: {
+		zblib_check_null_ret_error("ops->complex_desc_req",
+			ops->complex_desc_req, FALSE);
+
+		ret = ops->complex_desc_req(driver, request_id);
 	}
 	break;
 
 	case ZBLIB_ZDODEV_CONTROL_OPS_USER_DESC_REQ: {
+		zblib_check_null_ret_error("ops->user_desc_req",
+			ops->user_desc_req, FALSE);
+
+		ret = ops->user_desc_req(driver, request_id);
 	}
 	break;
 
 	case ZBLIB_ZDODEV_CONTROL_OPS_USER_DESC_SET_REQ: {
+		zblib_check_null_ret_error("ops->user_desc_set_req",
+			ops->user_desc_set_req, FALSE);
+
+		ret = ops->user_desc_set_req(driver, request_id);
 	}
 	break;
 
 	case ZBLIB_ZDODEV_CONTROL_OPS_DEVICE_ANNOUNCE: {
+		zblib_check_null_ret_error("ops->device_announce",
+			ops->device_announce, FALSE);
+
+		ret = ops->device_announce(driver, request_id);
 	}
 	break;
 
 	case ZBLIB_ZDODEV_CONTROL_OPS_SIMPLE_DESC_REQ: {
+		zblib_check_null_ret_error("ops->simple_desc_req",
+			ops->simple_desc_req, FALSE);
+
+		ret = ops->simple_desc_req(driver, request_id);
 	}
 	break;
 
 	case ZBLIB_ZDODEV_CONTROL_OPS_MGMT_LQI_REQ: {
+		zblib_check_null_ret_error("ops->mgmt_lqi_req",
+			ops->mgmt_lqi_req, FALSE);
+
+		ret = ops->mgmt_lqi_req(driver, request_id);
 	}
 	break;
 
 	case ZBLIB_ZDODEV_CONTROL_OPS_MGMT_RTG_REQ: {
+		zblib_check_null_ret_error("ops->mgmt_rtg_req",
+			ops->mgmt_rtg_req, FALSE);
+
+		ret = ops->mgmt_rtg_req(driver, request_id);
 	}
 	break;
 
 	case ZBLIB_ZDODEV_CONTROL_OPS_MGMT_BIND_REQ: {
+		zblib_check_null_ret_error("ops->mgmt_bind_req",
+			ops->mgmt_bind_req, FALSE);
+
+		ret = ops->mgmt_bind_req(driver, request_id);
 	}
 	break;
 
 	case ZBLIB_ZDODEV_CONTROL_OPS_MGMT_PERMIT_JOIN_REQ: {
+		zblib_check_null_ret_error("ops->mgmt_permit_join_req",
+			ops->mgmt_permit_join_req, FALSE);
+
+		ret = ops->mgmt_permit_join_req(driver, request_id);
 	}
 	break;
 
 	case ZBLIB_ZDODEV_CONTROL_OPS_NWK_UPDATE_REQ: {
+		zblib_check_null_ret_error("ops->nwk_update_req",
+			ops->nwk_update_req, FALSE);
+
+		ret = ops->nwk_update_req(driver, request_id);
 	}
 	break;
 
 	case ZBLIB_ZDODEV_CONTROL_OPS_NWK_DISC_REQ: {
+		zblib_check_null_ret_error("ops->nwk_disc_req",
+			ops->nwk_disc_req, FALSE);
+
+		ret = ops->nwk_disc_req(driver, request_id);
 	}
 	break;
 
@@ -122,24 +194,20 @@ static gboolean __zblib_driver_zdodev_control_dispatcher(ZigBeeDriver *driver, g
 	break;
 	}
 
-	return TRUE;
+	Z_LOGD("ret: [%d]", ret);
+
+	return ret;
 }
 
 static void __zblib_driver_zdodev_control_free_hook(ZigBeeDriver *driver)
 {
 	ZblibDriverZdodevControlPrivData_t *priv_data = NULL;
 
-	if (NULL == driver) {
-		Z_LOGE("driver is NULL");
-		return;
-	}
+	zblib_check_null_ret("driver", driver);
 
 	/* Fetch private data */
 	priv_data = zblib_driver_ref_object(driver);
-	if (NULL == priv_data) {
-		Z_LOGE("priv_data is NULL");
-		return;
-	}
+	zblib_check_null_ret("priv_data", priv_data);
 
 	/* Free resources */
 	g_free(priv_data);
@@ -153,17 +221,11 @@ ZigBeeDriver *zblib_driver_zdodev_control_new(ZigBeePlugin *plugin,
 	ZblibDriverZdodevControlPrivData_t *priv_data = NULL;
 	gboolean ret;
 
-	if (NULL == plugin) {
-		Z_LOGE("plugin is NULL");
-		return NULL;
-	}
+	zblib_check_null_ret_error("plugin", plugin, NULL);
 
 	/* Create new driver */
 	driver = zblib_driver_new(plugin, driver_name, ZBLIB_DRIVER_TYPE_ZDODEV_CONTROL);
-	if (NULL == driver) {
-		Z_LOGE("driver is NULL");
-		return NULL;
-	}
+	zblib_check_null_ret_error("driver", driver, NULL);
 
 	/* Allocate memory for private data */
 	priv_data = g_malloc0(sizeof(ZblibDriverZdodevControlPrivData_t));
@@ -212,10 +274,7 @@ ZigBeeDriver *zblib_driver_zdodev_control_new(ZigBeePlugin *plugin,
 
 void zblib_driver_zdodev_control_free(ZigBeeDriver *driver)
 {
-	if (NULL == driver) {
-		Z_LOGE("driver is NULL");
-		return;
-	}
+	zblib_check_null_ret("driver", driver);
 
 	/* Free driver */
 	zblib_driver_free(driver);