X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=zigbee-daemon%2Fzigbee-lib%2Fsrc%2Fdrivers%2Fzblib_driver_zcl_global_control.c;h=20d7fbd321915477dbf2167d5959f8842d645a29;hb=a991c099b7f05eaecc8005515d8cb1e58fe8aa8b;hp=27bdd70a49a6227d63bbac1a5efb378909dc68c2;hpb=16de8e58f80af7b2335260fec1fdd7a33e2d19b9;p=platform%2Fcore%2Fconnectivity%2Fzigbee-manager.git

diff --git a/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zcl_global_control.c b/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zcl_global_control.c
index 27bdd70..20d7fbd 100644
--- a/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zcl_global_control.c
+++ b/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zcl_global_control.c
@@ -24,14 +24,14 @@
 
 /**< Private data */
 typedef struct {
-	ZblibDriverZclglobalControlOps_t *ops; /**< Operations */
+	ZblibDriverZclGlobalControlOps_t *ops; /**< Operations */
 } ZblibDriverZclglobalControlPrivData_t;
 
 static gboolean __zblib_driver_zcl_global_control_dispatcher(ZigBeeDriver *driver, guint request_id)
 {
 	ZigBeeService *service = NULL;
 	ZblibDriverZclglobalControlPrivData_t *priv_data = NULL;
-	ZblibDriverZclglobalControlOps_t *ops = NULL;
+	ZblibDriverZclGlobalControlOps_t *ops = NULL;
 	guint request_type;
 	guint ops_id;
 	gboolean ret = FALSE;
@@ -54,7 +54,7 @@ static gboolean __zblib_driver_zcl_global_control_dispatcher(ZigBeeDriver *drive
 	/* Fetch ops ID */
 	ops_id = zblib_request_get_ops_id(request_type);
 	switch (ops_id) {
-	case ZBLIB_ZCLGLOBAL_CONTROL_OPS_READ_ATTRIBUTES_REQ: {
+	case ZBLIB_ZCL_GLOBAL_CONTROL_OPS_READ_ATTRIBUTES_REQ: {
 		zblib_check_null_ret_error("ops->read_attributes_req",
 			ops->read_attributes_req, FALSE);
 
@@ -62,7 +62,7 @@ static gboolean __zblib_driver_zcl_global_control_dispatcher(ZigBeeDriver *drive
 	}
 	break;
 
-	case ZBLIB_ZCLGLOBAL_CONTROL_OPS_WRITE_ATTRIBUTES_REQ: {
+	case ZBLIB_ZCL_GLOBAL_CONTROL_OPS_WRITE_ATTRIBUTES_REQ: {
 		zblib_check_null_ret_error("ops->write_attributes_req",
 			ops->write_attributes_req, FALSE);
 
@@ -70,7 +70,7 @@ static gboolean __zblib_driver_zcl_global_control_dispatcher(ZigBeeDriver *drive
 	}
 	break;
 
-	case ZBLIB_ZCLGLOBAL_CONTROL_OPS_WRITE_ATTRIBUTES_UNDIVIDED_REQ: {
+	case ZBLIB_ZCL_GLOBAL_CONTROL_OPS_WRITE_ATTRIBUTES_UNDIVIDED_REQ: {
 		zblib_check_null_ret_error("ops->write_attributes_undivided_req",
 			ops->write_attributes_undivided_req, FALSE);
 
@@ -78,7 +78,7 @@ static gboolean __zblib_driver_zcl_global_control_dispatcher(ZigBeeDriver *drive
 	}
 	break;
 
-	case ZBLIB_ZCLGLOBAL_CONTROL_OPS_WRITE_ATTRIBUTES_NO_RESP: {
+	case ZBLIB_ZCL_GLOBAL_CONTROL_OPS_WRITE_ATTRIBUTES_NO_RESP: {
 		zblib_check_null_ret_error("ops->write_attributes_no_resp",
 			ops->write_attributes_no_resp, FALSE);
 
@@ -86,7 +86,7 @@ static gboolean __zblib_driver_zcl_global_control_dispatcher(ZigBeeDriver *drive
 	}
 	break;
 
-	case ZBLIB_ZCLGLOBAL_CONTROL_OPS_WRITE_ATTRIBUTES_STRUCTURED: {
+	case ZBLIB_ZCL_GLOBAL_CONTROL_OPS_WRITE_ATTRIBUTES_STRUCTURED: {
 		zblib_check_null_ret_error("ops->write_attributes_structured",
 			ops->write_attributes_structured, FALSE);
 
@@ -94,7 +94,7 @@ static gboolean __zblib_driver_zcl_global_control_dispatcher(ZigBeeDriver *drive
 	}
 	break;
 
-	case ZBLIB_ZCLGLOBAL_CONTROL_OPS_READ_ATTRIBUTES_STRUCTURED: {
+	case ZBLIB_ZCL_GLOBAL_CONTROL_OPS_READ_ATTRIBUTES_STRUCTURED: {
 		zblib_check_null_ret_error("ops->read_attributes_structured",
 			ops->read_attributes_structured, FALSE);
 
@@ -102,7 +102,7 @@ static gboolean __zblib_driver_zcl_global_control_dispatcher(ZigBeeDriver *drive
 	}
 	break;
 
-	case ZBLIB_ZCLGLOBAL_CONTROL_OPS_CONFIGURE_REPORTING_REQ: {
+	case ZBLIB_ZCL_GLOBAL_CONTROL_OPS_CONFIGURE_REPORTING_REQ: {
 		zblib_check_null_ret_error("ops->configure_reporting_req",
 			ops->configure_reporting_req, FALSE);
 
@@ -110,7 +110,7 @@ static gboolean __zblib_driver_zcl_global_control_dispatcher(ZigBeeDriver *drive
 	}
 	break;
 
-	case ZBLIB_ZCLGLOBAL_CONTROL_OPS_READ_CONFIGURE_REPORTING: {
+	case ZBLIB_ZCL_GLOBAL_CONTROL_OPS_READ_CONFIGURE_REPORTING: {
 		zblib_check_null_ret_error("ops->read_configure_reporting",
 			ops->read_configure_reporting, FALSE);
 
@@ -118,7 +118,7 @@ static gboolean __zblib_driver_zcl_global_control_dispatcher(ZigBeeDriver *drive
 	}
 	break;
 
-	case ZBLIB_ZCLGLOBAL_CONTROL_OPS_DISCOVER_ATTRIBUTES: {
+	case ZBLIB_ZCL_GLOBAL_CONTROL_OPS_DISCOVER_ATTRIBUTES: {
 		zblib_check_null_ret_error("ops->discover_attributes",
 			ops->discover_attributes, FALSE);
 
@@ -126,7 +126,7 @@ static gboolean __zblib_driver_zcl_global_control_dispatcher(ZigBeeDriver *drive
 	}
 	break;
 
-	case ZBLIB_ZCLGLOBAL_CONTROL_OPS_DISCOVER_ATTRIBUTES_EXTENDED: {
+	case ZBLIB_ZCL_GLOBAL_CONTROL_OPS_DISCOVER_ATTRIBUTES_EXTENDED: {
 		zblib_check_null_ret_error("ops->discover_attributes_extended",
 			ops->discover_attributes_extended, FALSE);
 
@@ -134,7 +134,7 @@ static gboolean __zblib_driver_zcl_global_control_dispatcher(ZigBeeDriver *drive
 	}
 	break;
 
-	case ZBLIB_ZCLGLOBAL_CONTROL_OPS_DISCOVER_COMMANDS_RECEIVED: {
+	case ZBLIB_ZCL_GLOBAL_CONTROL_OPS_DISCOVER_COMMANDS_RECEIVED: {
 		zblib_check_null_ret_error("ops->discover_commands_received",
 			ops->discover_commands_received, FALSE);
 
@@ -142,7 +142,7 @@ static gboolean __zblib_driver_zcl_global_control_dispatcher(ZigBeeDriver *drive
 	}
 	break;
 
-	case ZBLIB_ZCLGLOBAL_CONTROL_OPS_DISCOVER_COMMANDS_GENERATED: {
+	case ZBLIB_ZCL_GLOBAL_CONTROL_OPS_DISCOVER_COMMANDS_GENERATED: {
 		zblib_check_null_ret_error("ops->discover_commands_generated",
 			ops->discover_commands_generated, FALSE);
 
@@ -175,7 +175,7 @@ static void __zblib_driver_zcl_global_control_free_hook(ZigBeeDriver *driver)
 
 ZigBeeDriver *zblib_driver_zcl_global_control_new(ZigBeePlugin *plugin,
 	const gchar *driver_name,
-	ZblibDriverZclglobalControlOps_t *ops)
+	ZblibDriverZclGlobalControlOps_t *ops)
 {
 	ZigBeeDriver *driver = NULL;
 	ZblibDriverZclglobalControlPrivData_t *priv_data = NULL;
@@ -184,7 +184,7 @@ ZigBeeDriver *zblib_driver_zcl_global_control_new(ZigBeePlugin *plugin,
 	zblib_check_null_ret_error("plugin", plugin, NULL);
 
 	/* Create new driver */
-	driver = zblib_driver_new(plugin, driver_name, ZBLIB_DRIVER_TYPE_ZCLGLOBAL_CONTROL);
+	driver = zblib_driver_new(plugin, driver_name, ZBLIB_DRIVER_TYPE_ZCL_GLOBAL_CONTROL);
 	zblib_check_null_ret_error("driver", driver, NULL);
 
 	/* Allocate memory for private data */