From: jh8801.jung Date: Mon, 11 Sep 2017 23:27:35 +0000 (+0900) Subject: Apply coding rule (BRC_M_EUS, SPC_M_OPR, SPC_M_KWD) X-Git-Tag: accepted/tizen/unified/20170914.065506^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7cf5bbfcd00b7691535c4361a89c7d074fc5d4fd;hp=a97323cf2c2b52e0612002dfdf2ca8412c825e62;p=platform%2Fcore%2Fconnectivity%2Fzigbee-manager.git Apply coding rule (BRC_M_EUS, SPC_M_OPR, SPC_M_KWD) Signed-off-by: jh8801.jung Change-Id: I73373a0ec510f5bf2b98c6c636e5019879f21624 --- diff --git a/zigbee-client/include_private/zigbee_log.h b/zigbee-client/include_private/zigbee_log.h index bc77f41..238b786 100644 --- a/zigbee-client/include_private/zigbee_log.h +++ b/zigbee-client/include_private/zigbee_log.h @@ -51,11 +51,11 @@ enum zigbee_log_priority { void zigbee_log(enum zigbee_log_type type, enum zigbee_log_priority priority, const char *tag, const char *fmt, ...); /* Logs would be available in system logs */ -#define Z_LOGI(fmt,args...) do { zigbee_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_INFO, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) -#define Z_LOGM(fmt,args...) do { zigbee_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_INFO, ZIGBEE_LOG_TAG, fmt "\n", ##args); } while (0) -#define Z_LOGD(fmt,args...) do { zigbee_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_DEBUG, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) -#define Z_LOGW(fmt,args...) do { zigbee_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_WARN, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) -#define Z_LOGE(fmt,args...) do { zigbee_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_ERROR, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) -#define Z_LOGF(fmt,args...) do { zigbee_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_FATAL, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) +#define Z_LOGI(fmt, args...) do { zigbee_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_INFO, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) +#define Z_LOGM(fmt, args...) do { zigbee_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_INFO, ZIGBEE_LOG_TAG, fmt "\n", ##args); } while (0) +#define Z_LOGD(fmt, args...) do { zigbee_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_DEBUG, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) +#define Z_LOGW(fmt, args...) do { zigbee_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_WARN, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) +#define Z_LOGE(fmt, args...) do { zigbee_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_ERROR, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) +#define Z_LOGF(fmt, args...) do { zigbee_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_FATAL, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) #endif /* __ZIGBEE_LOG_H__ */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_custom.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_custom.h index 79585cc..b21d1d5 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_custom.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_custom.h @@ -21,9 +21,9 @@ /**< ZigBee 'custom' driver operations */ typedef struct { - gboolean (*aps_send)(ZigBeeDriver *driver, guint request_id); - gboolean (*zcl_send)(ZigBeeDriver *driver, guint request_id); - gboolean (*send_to_local)(ZigBeeDriver *driver, guint request_id); + gboolean(*aps_send) (ZigBeeDriver *driver, guint request_id); + gboolean(*zcl_send) (ZigBeeDriver *driver, guint request_id); + gboolean(*send_to_local) (ZigBeeDriver *driver, guint request_id); } ZblibDriverCustomOps_t; /**< ZigBee 'custom' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_mfglib_control.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_mfglib_control.h index 251bfe4..b972eb3 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_mfglib_control.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_mfglib_control.h @@ -21,23 +21,23 @@ /**< ZigBee 'mfglib control' driver operations */ typedef struct { - gboolean (*start)(ZigBeeDriver *driver, guint request_id); - gboolean (*end)(ZigBeeDriver *driver, guint request_id); - gboolean (*start_tone)(ZigBeeDriver *driver, guint request_id); - gboolean (*stop_tone)(ZigBeeDriver *driver, guint request_id); - gboolean (*start_stream)(ZigBeeDriver *driver, guint request_id); - gboolean (*stop_stream)(ZigBeeDriver *driver, guint request_id); - gboolean (*send_packet)(ZigBeeDriver *driver, guint request_id); - gboolean (*set_channel)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_channel)(ZigBeeDriver *driver, guint request_id); - gboolean (*set_power)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_power)(ZigBeeDriver *driver, guint request_id); - gboolean (*set_synoffset)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_synoffset)(ZigBeeDriver *driver, guint request_id); - gboolean (*rx_start)(ZigBeeDriver *driver, guint request_id); - gboolean (*rx_stop)(ZigBeeDriver *driver, guint request_id); - gboolean (*rx_verify)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_rssi)(ZigBeeDriver *driver, guint request_id); + gboolean(*start) (ZigBeeDriver *driver, guint request_id); + gboolean(*end) (ZigBeeDriver *driver, guint request_id); + gboolean(*start_tone) (ZigBeeDriver *driver, guint request_id); + gboolean(*stop_tone) (ZigBeeDriver *driver, guint request_id); + gboolean(*start_stream) (ZigBeeDriver *driver, guint request_id); + gboolean(*stop_stream) (ZigBeeDriver *driver, guint request_id); + gboolean(*send_packet) (ZigBeeDriver *driver, guint request_id); + gboolean(*set_channel) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_channel) (ZigBeeDriver *driver, guint request_id); + gboolean(*set_power) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_power) (ZigBeeDriver *driver, guint request_id); + gboolean(*set_synoffset) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_synoffset) (ZigBeeDriver *driver, guint request_id); + gboolean(*rx_start) (ZigBeeDriver *driver, guint request_id); + gboolean(*rx_stop) (ZigBeeDriver *driver, guint request_id); + gboolean(*rx_verify) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_rssi) (ZigBeeDriver *driver, guint request_id); } ZblibDriverMfglibControlOps_t; /**< ZigBee 'mfglib control' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_service.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_service.h index 21f31c6..d5c278b 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_service.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_service.h @@ -21,20 +21,20 @@ /**< ZigBee 'service' driver operations */ typedef struct { - gboolean (*zb_hw_reset)(ZigBeeDriver *driver, guint request_id); - gboolean (*form_network)(ZigBeeDriver *driver, guint request_id); - gboolean (*coex_start)(ZigBeeDriver *driver, guint request_id); - gboolean (*coex_stop)(ZigBeeDriver *driver, guint request_id); - gboolean (*leave_network)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_network_info)(ZigBeeDriver *driver, guint request_id); - gboolean (*permit_join)(ZigBeeDriver *driver, guint request_id); - gboolean (*leave_request)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_device_list)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_mac)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_device_info)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_endpoint_list)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_cluster_list)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_node_type)(ZigBeeDriver *driver, guint request_id); + gboolean(*zb_hw_reset) (ZigBeeDriver *driver, guint request_id); + gboolean(*form_network) (ZigBeeDriver *driver, guint request_id); + gboolean(*coex_start) (ZigBeeDriver *driver, guint request_id); + gboolean(*coex_stop) (ZigBeeDriver *driver, guint request_id); + gboolean(*leave_network) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_network_info) (ZigBeeDriver *driver, guint request_id); + gboolean(*permit_join) (ZigBeeDriver *driver, guint request_id); + gboolean(*leave_request) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_device_list) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_mac) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_device_info) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_endpoint_list) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_cluster_list) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_node_type) (ZigBeeDriver *driver, guint request_id); } ZblibDriverServiceOps_t; /**< ZigBee 'service' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_alarm.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_alarm.h index cbf4a68..f284422 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_alarm.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_alarm.h @@ -21,12 +21,12 @@ /**< ZigBee 'ZCL alarm' driver operations */ typedef struct { - gboolean (*get_alarm_count)(ZigBeeDriver *driver, guint request_id); - gboolean (*reset_alarm)(ZigBeeDriver *driver, guint request_id); - gboolean (*reset_all_alarm)(ZigBeeDriver *driver, guint request_id); - gboolean (*alarm)(ZigBeeDriver *driver, guint request_id); - gboolean (*reset_alarm_log)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_alarm)(ZigBeeDriver *driver, guint request_id); + gboolean(*get_alarm_count) (ZigBeeDriver *driver, guint request_id); + gboolean(*reset_alarm) (ZigBeeDriver *driver, guint request_id); + gboolean(*reset_all_alarm) (ZigBeeDriver *driver, guint request_id); + gboolean(*alarm) (ZigBeeDriver *driver, guint request_id); + gboolean(*reset_alarm_log) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_alarm) (ZigBeeDriver *driver, guint request_id); } ZblibDriverZclAlarmOps_t; /**< ZigBee 'ZCL alarm' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_basic.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_basic.h index 6faeceb..ec05d6b 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_basic.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_basic.h @@ -21,7 +21,7 @@ /**< ZigBee 'ZCL Basic' driver operations */ typedef struct { - gboolean (*reset_factory_default)(ZigBeeDriver *driver, guint request_id); + gboolean(*reset_factory_default) (ZigBeeDriver *driver, guint request_id); } ZblibDriverZclBasicOps_t; /**< ZigBee 'ZCL Basic' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_color_control.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_color_control.h index 2a01524..2863c5e 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_color_control.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_color_control.h @@ -21,17 +21,17 @@ /**< ZigBee 'ZCL color control' driver operations */ typedef struct { - gboolean (*move_to_hue)(ZigBeeDriver *driver, guint request_id); - gboolean (*move_hue)(ZigBeeDriver *driver, guint request_id); - gboolean (*step_hue)(ZigBeeDriver *driver, guint request_id); - gboolean (*move_to_saturation)(ZigBeeDriver *driver, guint request_id); - gboolean (*move_saturation)(ZigBeeDriver *driver, guint request_id); - gboolean (*step_saturation)(ZigBeeDriver *driver, guint request_id); - gboolean (*move_to_hue_and_saturation)(ZigBeeDriver *driver, guint request_id); - gboolean (*move_to_color)(ZigBeeDriver *driver, guint request_id); - gboolean (*move_color)(ZigBeeDriver *driver, guint request_id); - gboolean (*step_color)(ZigBeeDriver *driver, guint request_id); - gboolean (*move_color_temperature)(ZigBeeDriver *driver, guint request_id); + gboolean(*move_to_hue) (ZigBeeDriver *driver, guint request_id); + gboolean(*move_hue) (ZigBeeDriver *driver, guint request_id); + gboolean(*step_hue) (ZigBeeDriver *driver, guint request_id); + gboolean(*move_to_saturation) (ZigBeeDriver *driver, guint request_id); + gboolean(*move_saturation) (ZigBeeDriver *driver, guint request_id); + gboolean(*step_saturation) (ZigBeeDriver *driver, guint request_id); + gboolean(*move_to_hue_and_saturation) (ZigBeeDriver *driver, guint request_id); + gboolean(*move_to_color) (ZigBeeDriver *driver, guint request_id); + gboolean(*move_color) (ZigBeeDriver *driver, guint request_id); + gboolean(*step_color) (ZigBeeDriver *driver, guint request_id); + gboolean(*move_color_temperature) (ZigBeeDriver *driver, guint request_id); } ZblibDriverZclColorControlOps_t; /**< ZigBee 'ZCL color control' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_door_lock.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_door_lock.h index 08d0ef6..56b0395 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_door_lock.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_door_lock.h @@ -21,10 +21,10 @@ /**< ZigBee 'ZCL door lock' driver operations */ typedef struct { - gboolean (*subscribe_lock_event)(ZigBeeDriver *driver, guint request_id); - gboolean (*set_door_lock_pin)(ZigBeeDriver *driver, guint request_id); - gboolean (*set_door_lock)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_lock_state)(ZigBeeDriver *driver, guint request_id); + gboolean(*subscribe_lock_event) (ZigBeeDriver *driver, guint request_id); + gboolean(*set_door_lock_pin) (ZigBeeDriver *driver, guint request_id); + gboolean(*set_door_lock) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_lock_state) (ZigBeeDriver *driver, guint request_id); } ZblibDriverZclDoorLockOps_t; /**< ZigBee 'ZCL door lock' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_fan_control.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_fan_control.h index 8408032..4542a01 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_fan_control.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_fan_control.h @@ -21,10 +21,10 @@ /**< ZigBee 'ZCL fan control' driver operations */ typedef struct { - gboolean (*set_fan_mode)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_fan_mode)(ZigBeeDriver *driver, guint request_id); - gboolean (*set_fan_mode_sequence)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_fan_mode_sequence)(ZigBeeDriver *driver, guint request_id); + gboolean(*set_fan_mode) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_fan_mode) (ZigBeeDriver *driver, guint request_id); + gboolean(*set_fan_mode_sequence) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_fan_mode_sequence) (ZigBeeDriver *driver, guint request_id); } ZblibDriverZclFanControlOps_t; /**< ZigBee 'ZCL fan control' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_global_control.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_global_control.h index 470157d..148ce58 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_global_control.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_global_control.h @@ -21,18 +21,18 @@ /**< ZigBee 'ZCL global control' driver operations */ typedef struct { - gboolean (*read_attributes_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*write_attributes_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*write_attributes_undivided_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*write_attributes_no_resp)(ZigBeeDriver *driver, guint request_id); - gboolean (*write_attributes_structured)(ZigBeeDriver *driver, guint request_id); - gboolean (*read_attributes_structured)(ZigBeeDriver *driver, guint request_id); - gboolean (*configure_reporting_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*read_configure_reporting)(ZigBeeDriver *driver, guint request_id); - gboolean (*discover_attributes)(ZigBeeDriver *driver, guint request_id); - gboolean (*discover_attributes_extended)(ZigBeeDriver *driver, guint request_id); - gboolean (*discover_commands_received)(ZigBeeDriver *driver, guint request_id); - gboolean (*discover_commands_generated)(ZigBeeDriver *driver, guint request_id); + gboolean(*read_attributes_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*write_attributes_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*write_attributes_undivided_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*write_attributes_no_resp) (ZigBeeDriver *driver, guint request_id); + gboolean(*write_attributes_structured) (ZigBeeDriver *driver, guint request_id); + gboolean(*read_attributes_structured) (ZigBeeDriver *driver, guint request_id); + gboolean(*configure_reporting_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*read_configure_reporting) (ZigBeeDriver *driver, guint request_id); + gboolean(*discover_attributes) (ZigBeeDriver *driver, guint request_id); + gboolean(*discover_attributes_extended) (ZigBeeDriver *driver, guint request_id); + gboolean(*discover_commands_received) (ZigBeeDriver *driver, guint request_id); + gboolean(*discover_commands_generated) (ZigBeeDriver *driver, guint request_id); } ZblibDriverZclGlobalControlOps_t; /**< ZigBee 'ZCL global control' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_group.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_group.h index 24987a0..5172a48 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_group.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_group.h @@ -21,12 +21,12 @@ /**< ZigBee 'ZCL Group' driver operations */ typedef struct { - gboolean (*add_group)(ZigBeeDriver *driver, guint request_id); - gboolean (*view_group)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_group_membership)(ZigBeeDriver *driver, guint request_id); - gboolean (*remove_group)(ZigBeeDriver *driver, guint request_id); - gboolean (*remove_all_group)(ZigBeeDriver *driver, guint request_id); - gboolean (*add_group_if_identifying)(ZigBeeDriver *driver, guint request_id); + gboolean(*add_group) (ZigBeeDriver *driver, guint request_id); + gboolean(*view_group) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_group_membership) (ZigBeeDriver *driver, guint request_id); + gboolean(*remove_group) (ZigBeeDriver *driver, guint request_id); + gboolean(*remove_all_group) (ZigBeeDriver *driver, guint request_id); + gboolean(*add_group_if_identifying) (ZigBeeDriver *driver, guint request_id); } ZblibDriverZclGroupOps_t; /**< ZigBee 'ZCL Group' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_ias_zone.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_ias_zone.h index db8aaa6..13b9420 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_ias_zone.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_ias_zone.h @@ -21,7 +21,7 @@ /**< ZigBee 'ZCL IAS zone' driver operations */ typedef struct { - gboolean (*enroll_response)(ZigBeeDriver *driver, guint request_id); + gboolean(*enroll_response) (ZigBeeDriver *driver, guint request_id); } ZblibDriverZclIasZoneOps_t; /**< ZigBee 'ZCL IAS zone' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_identify.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_identify.h index 44eb123..b3d3dea 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_identify.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_identify.h @@ -21,8 +21,8 @@ /**< ZigBee 'ZCL Identify' driver operations */ typedef struct { - gboolean (*identify)(ZigBeeDriver *driver, guint request_id); - gboolean (*query)(ZigBeeDriver *driver, guint request_id); + gboolean(*identify) (ZigBeeDriver *driver, guint request_id); + gboolean(*query) (ZigBeeDriver *driver, guint request_id); } ZblibDriverZclIdentifyOps_t; /**< ZigBee 'ZCL Identify' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_level_control.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_level_control.h index c603b0e..7b90f07 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_level_control.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_level_control.h @@ -21,13 +21,13 @@ /**< ZigBee 'ZCL level control' driver operations */ typedef struct { - gboolean (*move_to_level)(ZigBeeDriver *driver, guint request_id); - gboolean (*move)(ZigBeeDriver *driver, guint request_id); - gboolean (*step)(ZigBeeDriver *driver, guint request_id); - gboolean (*move_to_level_with_on_off)(ZigBeeDriver *driver, guint request_id); - gboolean (*move_with_on_off)(ZigBeeDriver *driver, guint request_id); - gboolean (*step_with_on_off)(ZigBeeDriver *driver, guint request_id); - gboolean (*stop)(ZigBeeDriver *driver, guint request_id); + gboolean(*move_to_level) (ZigBeeDriver *driver, guint request_id); + gboolean(*move) (ZigBeeDriver *driver, guint request_id); + gboolean(*step) (ZigBeeDriver *driver, guint request_id); + gboolean(*move_to_level_with_on_off) (ZigBeeDriver *driver, guint request_id); + gboolean(*move_with_on_off) (ZigBeeDriver *driver, guint request_id); + gboolean(*step_with_on_off) (ZigBeeDriver *driver, guint request_id); + gboolean(*stop) (ZigBeeDriver *driver, guint request_id); } ZblibDriverZclLevelControlOps_t; /**< ZigBee 'ZCL level control' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_on_off.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_on_off.h index d06ef3b..22f8348 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_on_off.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_on_off.h @@ -21,8 +21,8 @@ /**< ZigBee 'ZCL on off' driver operations */ typedef struct { - gboolean (*set_on_off)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_on_off_state)(ZigBeeDriver *driver, guint request_id); + gboolean(*set_on_off) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_on_off_state) (ZigBeeDriver *driver, guint request_id); } ZblibDriverZclOnOffOps_t; /**< ZigBee 'ZCL on off' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_poll_control.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_poll_control.h index eb21717..9a50887 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_poll_control.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_poll_control.h @@ -21,10 +21,10 @@ /**< ZigBee 'ZCL poll control' driver operations */ typedef struct { - gboolean (*check_in_response)(ZigBeeDriver *driver, guint request_id); - gboolean (*fast_poll_stop)(ZigBeeDriver *driver, guint request_id); - gboolean (*set_long_poll_interval)(ZigBeeDriver *driver, guint request_id); - gboolean (*set_short_poll_interval)(ZigBeeDriver *driver, guint request_id); + gboolean(*check_in_response) (ZigBeeDriver *driver, guint request_id); + gboolean(*fast_poll_stop) (ZigBeeDriver *driver, guint request_id); + gboolean(*set_long_poll_interval) (ZigBeeDriver *driver, guint request_id); + gboolean(*set_short_poll_interval) (ZigBeeDriver *driver, guint request_id); } ZblibDriverZclPollControlOps_t; /**< ZigBee 'ZCL poll control' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_scene.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_scene.h index e56304e..ee7a4b9 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_scene.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_scene.h @@ -21,13 +21,13 @@ /**< ZigBee 'ZCL scene' driver operations */ typedef struct { - gboolean (*add_scene)(ZigBeeDriver *driver, guint request_id); - gboolean (*view_scene)(ZigBeeDriver *driver, guint request_id); - gboolean (*remove_scene)(ZigBeeDriver *driver, guint request_id); - gboolean (*store_scene)(ZigBeeDriver *driver, guint request_id); - gboolean (*recall_scene)(ZigBeeDriver *driver, guint request_id); - gboolean (*remove_all_scene)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_scene_membership)(ZigBeeDriver *driver, guint request_id); + gboolean(*add_scene) (ZigBeeDriver *driver, guint request_id); + gboolean(*view_scene) (ZigBeeDriver *driver, guint request_id); + gboolean(*remove_scene) (ZigBeeDriver *driver, guint request_id); + gboolean(*store_scene) (ZigBeeDriver *driver, guint request_id); + gboolean(*recall_scene) (ZigBeeDriver *driver, guint request_id); + gboolean(*remove_all_scene) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_scene_membership) (ZigBeeDriver *driver, guint request_id); } ZblibDriverZclSceneOps_t; /**< ZigBee 'ZCL scene' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_thermostat.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_thermostat.h index dd73122..a230d49 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_thermostat.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zcl_thermostat.h @@ -21,11 +21,11 @@ /**< ZigBee 'ZCL thermostat' driver operations */ typedef struct { - gboolean (*get_local_temp)(ZigBeeDriver *driver, guint request_id); - gboolean (*get_weekly_schedule)(ZigBeeDriver *driver, guint request_id); - gboolean (*set_weekly_schedule)(ZigBeeDriver *driver, guint request_id); - gboolean (*clear_weekly_schedule)(ZigBeeDriver *driver, guint request_id); - gboolean (*setpoint_raise_lower)(ZigBeeDriver *driver, guint request_id); + gboolean(*get_local_temp) (ZigBeeDriver *driver, guint request_id); + gboolean(*get_weekly_schedule) (ZigBeeDriver *driver, guint request_id); + gboolean(*set_weekly_schedule) (ZigBeeDriver *driver, guint request_id); + gboolean(*clear_weekly_schedule) (ZigBeeDriver *driver, guint request_id); + gboolean(*setpoint_raise_lower) (ZigBeeDriver *driver, guint request_id); } ZblibDriverZclThermostatOps_t; /**< ZigBee 'ZCL thermostat' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zdo_bind.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zdo_bind.h index 95d7f8c..27f0680 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zdo_bind.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zdo_bind.h @@ -21,8 +21,8 @@ /**< ZigBee 'ZDO bind' driver operations */ typedef struct { - gboolean (*bind_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*unbind_req)(ZigBeeDriver *driver, guint request_id); + gboolean(*bind_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*unbind_req) (ZigBeeDriver *driver, guint request_id); } ZblibDriverZdoBindOps_t; /**< ZigBee 'ZDO bind' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zdo_dev_control.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zdo_dev_control.h index ddd656b..09cb305 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zdo_dev_control.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zdo_dev_control.h @@ -21,23 +21,23 @@ /**< ZigBee 'ZDO Dev control' driver operations */ typedef struct { - gboolean (*nwk_addr_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*matched_descriptor_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*ieee_addr_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*active_ep_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*node_desc_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*power_desc_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*complex_desc_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*user_desc_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*user_desc_set_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*device_announce)(ZigBeeDriver *driver, guint request_id); - gboolean (*simple_desc_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*mgmt_lqi_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*mgmt_rtg_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*mgmt_bind_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*mgmt_permit_join_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*mgmt_nwk_update_req)(ZigBeeDriver *driver, guint request_id); - gboolean (*mgmt_nwk_disc_req)(ZigBeeDriver *driver, guint request_id); + gboolean(*nwk_addr_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*matched_descriptor_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*ieee_addr_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*active_ep_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*node_desc_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*power_desc_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*complex_desc_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*user_desc_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*user_desc_set_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*device_announce) (ZigBeeDriver *driver, guint request_id); + gboolean(*simple_desc_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*mgmt_lqi_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*mgmt_rtg_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*mgmt_bind_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*mgmt_permit_join_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*mgmt_nwk_update_req) (ZigBeeDriver *driver, guint request_id); + gboolean(*mgmt_nwk_disc_req) (ZigBeeDriver *driver, guint request_id); } ZblibDriverZdoDevControlOps_t; /**< ZigBee 'ZDO Dev control' ops IDs */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_log.h b/zigbee-daemon/zigbee-lib/include/zblib_log.h index ff3aa79..7d3a767 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_log.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_log.h @@ -54,13 +54,13 @@ enum zblib_log_priority { void zblib_log(enum zblib_log_type type, enum zblib_log_priority priority, const char *tag, const char *fmt, ...); /* Logs would be available in system logs */ -#define Z_LOGI(fmt,args...) do { if(zblib_debug) zblib_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_INFO, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) -#define Z_LOGM(fmt,args...) do { if(zblib_debug) zblib_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_INFO, ZIGBEE_LOG_TAG, fmt "\n", ##args); } while (0) -#define Z_LOGD(fmt,args...) do { if(zblib_debug) zblib_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_DEBUG, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) -#define Z_LOGW(fmt,args...) do { zblib_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_WARN, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) -#define Z_LOGE(fmt,args...) do { zblib_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_ERROR, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) -#define Z_LOGF(fmt,args...) do { zblib_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_FATAL, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) +#define Z_LOGI(fmt, args...) do { if (zblib_debug) zblib_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_INFO, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) +#define Z_LOGM(fmt, args...) do { if (zblib_debug) zblib_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_INFO, ZIGBEE_LOG_TAG, fmt "\n", ##args); } while (0) +#define Z_LOGD(fmt, args...) do { if (zblib_debug) zblib_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_DEBUG, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) +#define Z_LOGW(fmt, args...) do { zblib_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_WARN, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) +#define Z_LOGE(fmt, args...) do { zblib_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_ERROR, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) +#define Z_LOGF(fmt, args...) do { zblib_log(ZIGBEE_LOG_TYPE_SYSTEM, ZIGBEE_LOG_FATAL, ZIGBEE_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); } while (0) -#define Z_TIME_CHECK(fmt,args...) do { zblib_log(ZIGBEE_LOG_TYPE_TIME_CHECK, ZIGBEE_LOG_INFO, "TIME_CHECK", fmt "\n", ##args); } while (0) +#define Z_TIME_CHECK(fmt, args...) do { zblib_log(ZIGBEE_LOG_TYPE_TIME_CHECK, ZIGBEE_LOG_INFO, "TIME_CHECK", fmt "\n", ##args); } while (0) #endif /* __ZIGBEE_LIB_LOG_H__ */ diff --git a/zigbee-daemon/zigbee-lib/include/zblib_types.h b/zigbee-daemon/zigbee-lib/include/zblib_types.h index 8ffd77e..16c26a8 100644 --- a/zigbee-daemon/zigbee-lib/include/zblib_types.h +++ b/zigbee-daemon/zigbee-lib/include/zblib_types.h @@ -24,8 +24,7 @@ * -------------------------------------------------------------------------------------*/ /* Enumeration for zigbee library error code. */ -typedef enum -{ +typedef enum { ZBLIB_ERROR_NONE = 0, /**< Successful */ ZBLIB_ERROR_INVALID_PARAMETER, /**< parameter error */ ZBLIB_ERROR_PARAMETER_OUT_OF_RANGE, /**< out of range error */