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

diff --git a/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_custom.c b/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_custom.c
index 6957e1d..1e52591 100644
--- a/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_custom.c
+++ b/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_custom.c
@@ -30,19 +30,23 @@ typedef struct {
 static gboolean __zblib_driver_custom_dispatcher(ZigBeeDriver *driver, guint request_id)
 {
 	ZigBeeService *service = NULL;
+	ZblibDriverCustomPrivData_t *priv_data = NULL;
+	ZblibDriverCustomOps_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,14 +55,26 @@ static gboolean __zblib_driver_custom_dispatcher(ZigBeeDriver *driver, guint req
 	ops_id = zblib_request_get_ops_id(request_type);
 	switch (ops_id) {
 	case ZBLIB_CUSTOM_OPS_APS_SEND: {
+		zblib_check_null_ret_error("ops->aps_send",
+			ops->aps_send, FALSE);
+
+		ret = ops->aps_send(driver, request_id);
 	}
 	break;
 
 	case ZBLIB_CUSTOM_OPS_ZCL_SEND: {
+		zblib_check_null_ret_error("ops->zcl_send",
+			ops->zcl_send, FALSE);
+
+		ret = ops->zcl_send(driver, request_id);
 	}
 	break;
 
 	case ZBLIB_CUSTOM_OPS_SEND_TO_LOCAL: {
+		zblib_check_null_ret_error("ops->send_to_local",
+			ops->send_to_local, FALSE);
+
+		ret = ops->send_to_local(driver, request_id);
 	}
 	break;
 
@@ -66,24 +82,20 @@ static gboolean __zblib_driver_custom_dispatcher(ZigBeeDriver *driver, guint req
 	break;
 	}
 
-	return TRUE;
+	Z_LOGD("ret: [%d]", ret);
+
+	return ret;
 }
 
 static void __zblib_driver_custom_free_hook(ZigBeeDriver *driver)
 {
 	ZblibDriverCustomPrivData_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);
@@ -97,17 +109,11 @@ ZigBeeDriver *zblib_driver_custom_new(ZigBeePlugin *plugin,
 	ZblibDriverCustomPrivData_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_CUSTOM);
-	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(ZblibDriverCustomPrivData_t));
@@ -156,10 +162,7 @@ ZigBeeDriver *zblib_driver_custom_new(ZigBeePlugin *plugin,
 
 void zblib_driver_custom_free(ZigBeeDriver *driver)
 {
-	if (NULL == driver) {
-		Z_LOGE("driver is NULL");
-		return;
-	}
+	zblib_check_null_ret("driver", driver);
 
 	/* Free driver */
 	zblib_driver_free(driver);