From 72c3df75abc2cf9e8ced26ca624eac392ef134b8 Mon Sep 17 00:00:00 2001 From: Jiwan Kim Date: Wed, 8 Feb 2017 16:02:40 +0900 Subject: [PATCH] Remove warning related signedness - Member variable in structure was not matched with XML introspection file. - Change signedness with XML introspection. Change-Id: I245cd6cc795dcd52bdbccf3fc478b121db9f17fe Signed-off-by: Jiwan Kim --- common/include/zigbee_custom_type.h | 78 +++++++-------- common/include/zigbee_service_type.h | 66 ++++++------- common/include/zigbee_zcl_alarm_type.h | 40 ++++---- common/include/zigbee_zcl_basic_type.h | 4 +- common/include/zigbee_zcl_color_control_type.h | 100 ++++++++++---------- common/include/zigbee_zcl_door_lock_type.h | 22 ++--- common/include/zigbee_zcl_fan_control_type.h | 16 ++-- common/include/zigbee_zcl_group_type.h | 70 +++++++------- common/include/zigbee_zcl_ias_zone_type.h | 28 +++--- common/include/zigbee_zcl_identify_type.h | 14 +-- common/include/zigbee_zcl_level_control_type.h | 56 +++++------ common/include/zigbee_zcl_on_off_type.h | 12 +-- common/include/zigbee_zcl_poll_control_type.h | 24 ++--- common/include/zigbee_zcl_scene_type.h | 126 ++++++++++++------------- common/include/zigbee_zcl_thermostat_type.h | 38 ++++---- common/include/zigbee_zdo_bind_type.h | 34 +++---- zigbee-daemon/zigbee-lib/src/zblib_request.c | 16 ++-- 17 files changed, 370 insertions(+), 374 deletions(-) diff --git a/common/include/zigbee_custom_type.h b/common/include/zigbee_custom_type.h index 4fd8832..692738e 100644 --- a/common/include/zigbee_custom_type.h +++ b/common/include/zigbee_custom_type.h @@ -30,17 +30,17 @@ * @since_tizen 3.0 */ typedef struct { - short node_id; - char aps_frame_ctrl; - char src_ep; - char dest_ep; - short cluster_id; - short profile_id; - char zcl_frame_ctrl; - short mfg_code; - char cmd_id; - short payload_len; - char payload[ZIGBEE_CUSTOM_SEND_PAYLOAD_LEN]; + unsigned short node_id; + unsigned char aps_frame_ctrl; + unsigned char src_ep; + unsigned char dest_ep; + unsigned short cluster_id; + unsigned short profile_id; + unsigned char zcl_frame_ctrl; + unsigned short mfg_code; + unsigned char cmd_id; + unsigned short payload_len; + unsigned char payload[ZIGBEE_CUSTOM_SEND_PAYLOAD_LEN]; } ZigbeeCustomApsSend_t; /** @@ -48,14 +48,14 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; - char src_ep; - char dest_ep; - short cluster_id; - char zcl_frame_ctrl; - char cmd_id; - short payload_len; - char payload[ZIGBEE_CUSTOM_SEND_PAYLOAD_LEN]; + unsigned short node_id; + unsigned char src_ep; + unsigned char dest_ep; + unsigned short cluster_id; + unsigned char zcl_frame_ctrl; + unsigned char cmd_id; + unsigned short payload_len; + unsigned char payload[ZIGBEE_CUSTOM_SEND_PAYLOAD_LEN]; } ZigbeeCustomZclSend_t; /** @@ -63,8 +63,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short length; - char data[ZIGBEE_CUSTOM_SEND_PAYLOAD_LEN]; + unsigned short length; + unsigned char data[ZIGBEE_CUSTOM_SEND_PAYLOAD_LEN]; } ZigbeeCustomSendToLocal_t; /* -------------------------------------------------------------------------------------- @@ -76,14 +76,14 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; - char src_ep; - char dest_ep; - short cluster_id; - short profile_id; - char cmd_id; - short payload_len; - char payload[ZIGBEE_CUSTOM_SEND_PAYLOAD_LEN]; + unsigned short node_id; + unsigned char src_ep; + unsigned char dest_ep; + unsigned short cluster_id; + unsigned short profile_id; + unsigned char cmd_id; + unsigned short payload_len; + unsigned char payload[ZIGBEE_CUSTOM_SEND_PAYLOAD_LEN]; } ZigbeeCustomApsSendNoti_t; /** @@ -91,14 +91,14 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; - char src_ep; - char dest_ep; - short cluster_id; - short profile_id; - char cmd_id; - short payload_len; - char payload[ZIGBEE_CUSTOM_SEND_PAYLOAD_LEN]; + unsigned short node_id; + unsigned char src_ep; + unsigned char dest_ep; + unsigned short cluster_id; + unsigned short profile_id; + unsigned char cmd_id; + unsigned short payload_len; + unsigned char payload[ZIGBEE_CUSTOM_SEND_PAYLOAD_LEN]; } ZigbeeCustomZclSendNoti_t; /** @@ -106,8 +106,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short length; - char data[ZIGBEE_CUSTOM_SEND_PAYLOAD_LEN]; + unsigned short length; + unsigned char data[ZIGBEE_CUSTOM_SEND_PAYLOAD_LEN]; } ZigbeeCustomSendToLocalNoti_t; #endif /* __ZIGBEE_CUSTOM_TYPE_H__ */ diff --git a/common/include/zigbee_service_type.h b/common/include/zigbee_service_type.h index 9b01eb8..29f0a13 100644 --- a/common/include/zigbee_service_type.h +++ b/common/include/zigbee_service_type.h @@ -29,7 +29,7 @@ * @since_tizen 3.0 */ typedef struct { - char channel; /**< Channel */ + unsigned char channel; /**< Channel */ } ZigbeeServiceCoexStart_t; /** @@ -37,7 +37,7 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - char permit_join; /* 1 - Allow, 0 - Disallow */ + unsigned char permit_join; /* 1 - Allow, 0 - Disallow */ int duration; /**< Duration */ } ZigbeeServicePermitJoin_t; @@ -46,9 +46,9 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - char remove_child; /* Remove child */ - char rejoin; /**< Re-join */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char remove_child; /* Remove child */ + unsigned char rejoin; /**< Re-join */ } ZigbeeServiceLeaveRequest_t; /** @@ -56,7 +56,7 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ } ZigbeeServiceGetEndpointList_t; /** @@ -64,8 +64,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - char endpoint; /**< Endpoint */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char endpoint; /**< Endpoint */ } ZigbeeServiceGetClusterList_t; /** @@ -73,7 +73,7 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ } ZigbeeServiceGetNodeType_t; /* -------------------------------------------------------------------------------------- @@ -86,7 +86,7 @@ typedef struct { */ typedef struct { int result; /**< Result */ - char enabled; /**< Enabled / Disabled result */ + unsigned char enabled; /**< Enabled / Disabled result */ } ZigbeeServiceServiceStateResp_t; /** @@ -95,11 +95,11 @@ typedef struct { */ typedef struct { int result; /**< Result */ - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - short node_id; /**< Node ID (an Network address) */ - short pan_id; /**< PAN ID (an Network address) */ - char channel; /**< Channel number */ - char radio_tx_power; /**< Power (dBm) */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned short node_id; /**< Node ID (an Network address) */ + unsigned short pan_id; /**< PAN ID (an Network address) */ + unsigned char channel; /**< Channel number */ + unsigned char radio_tx_power; /**< Power (dBm) */ } ZigbeeServiceGetNetworkInfoResp_t; /** @@ -108,7 +108,7 @@ typedef struct { */ typedef struct { int result; /**< Result */ - char node_type; /**< Node Type */ + unsigned char node_type; /**< Node Type */ } ZigbeeServiceServiceNodeTypeResp_t; /** @@ -117,7 +117,7 @@ typedef struct { */ typedef struct { int result; /**< Result */ - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ } ZigbeeServiceGetMacResp_t; /** @@ -125,11 +125,11 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID (an Network address) */ - char node_type; /**< Node Type (an Network address) */ - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - char endpoint_count; /**< The number of endpoints */ - char endpoints[ZIGBEE_MAX_ENDPOINTS]; /**< Endpoints */ + unsigned short node_id; /**< Node ID (an Network address) */ + unsigned char node_type; /**< Node Type (an Network address) */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char endpoint_count; /**< The number of endpoints */ + unsigned char endpoints[ZIGBEE_MAX_ENDPOINTS]; /**< Endpoints */ } ZigbeeServiceGetDeviceInfoDetailResp_t; /** @@ -149,7 +149,7 @@ typedef struct { typedef struct { int result; /**< Result */ int endpoint_count; /**< The number of endpoints */ - char endpoints[ZIGBEE_MAX_ENDPOINTS]; /**< Endpoints */ + unsigned char endpoints[ZIGBEE_MAX_ENDPOINTS]; /**< Endpoints */ } ZigbeeServiceGetEndpointListResp_t; /** @@ -159,7 +159,7 @@ typedef struct { typedef struct { int result; /**< Result */ int cluster_count; /**< The number of clusters */ - char clusters[ZIGBEE_MAX_CLUSTERS]; /**< Clusters */ + unsigned char clusters[ZIGBEE_MAX_CLUSTERS]; /**< Clusters */ } ZigbeeServiceGetClusterListResp_t; /** @@ -168,7 +168,7 @@ typedef struct { */ typedef struct { int result; /**< Result */ - char node_type; /**< Node Type (an Network address) */ + unsigned char node_type; /**< Node Type (an Network address) */ } ZigbeeServiceGetNodeTypeResp_t; /* -------------------------------------------------------------------------------------- @@ -180,7 +180,7 @@ typedef struct { * @since_tizen 4.0 */ typedef struct { - short pan_id; /**< PAN ID */ + unsigned short pan_id; /**< PAN ID */ } ZigbeeServiceServiceFormNetworkDone_t; /** @@ -188,10 +188,10 @@ typedef struct { * @since_tizen 4.0 */ typedef struct { - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ int endpoint_count; /**< The number of endpoints */ - char endpoints[ZIGBEE_MAX_ENDPOINTS]; /**< Endpoints */ - short node_id; /**< Node ID (an Network address) */ + unsigned char endpoints[ZIGBEE_MAX_ENDPOINTS]; /**< Endpoints */ + unsigned short node_id; /**< Node ID (an Network address) */ } ZigbeeServiceServiceChildJoined_t; /** @@ -199,7 +199,7 @@ typedef struct { * @since_tizen 4.0 */ typedef struct { - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ } ZigbeeServiceServiceChildRejoined_t; /** @@ -207,8 +207,8 @@ typedef struct { * @since_tizen 4.0 */ typedef struct { - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - char status; /**< status */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char status; /**< status */ } ZigbeeServiceServiceChildLeft_t; /** @@ -216,7 +216,7 @@ typedef struct { * @since_tizen 4.0 */ typedef struct { - short pan_id; /**< PAN ID */ + unsigned short pan_id; /**< PAN ID */ } ZigbeeServiceServiceLeaveNetworkDone_t; diff --git a/common/include/zigbee_zcl_alarm_type.h b/common/include/zigbee_zcl_alarm_type.h index d8eb6fb..8631aff 100644 --- a/common/include/zigbee_zcl_alarm_type.h +++ b/common/include/zigbee_zcl_alarm_type.h @@ -31,7 +31,7 @@ */ typedef struct { unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - char endpoint; /**< Endpoint */ + unsigned char endpoint; /**< Endpoint */ } ZigbeeZclAlarmGetAlarmCount_t; /** @@ -39,10 +39,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char endpoint; /**< Endpoint */ - char alarm_code; /**< Alarm code */ - short cluster_id; /**< Cluster ID */ + unsigned short node_id; /**< Node ID */ + unsigned char endpoint; /**< Endpoint */ + unsigned char alarm_code; /**< Alarm code */ + unsigned short cluster_id; /**< Cluster ID */ } ZigbeeZclAlarmResetAlarm_t; /** @@ -50,8 +50,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char endpoint; /**< Endpoint */ + unsigned short node_id; /**< Node ID */ + unsigned char endpoint; /**< Endpoint */ } ZigbeeZclAlarmResetAllAlarm_t; /** @@ -60,9 +60,9 @@ typedef struct { */ typedef struct { unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - char endpoint; /**< Endpoint */ - char alarm_code; /**< Alarm code */ - short cluster_id; /**< Cluster ID */ + unsigned char endpoint; /**< Endpoint */ + unsigned char alarm_code; /**< Alarm code */ + unsigned short cluster_id; /**< Cluster ID */ } ZigbeeZclAlarmAlarm_t; /** @@ -70,8 +70,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char endpoint; /**< Endpoint */ + unsigned short node_id; /**< Node ID */ + unsigned char endpoint; /**< Endpoint */ } ZigbeeZclAlarmResetAlarmLogs_t; /** @@ -79,8 +79,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char endpoint; /**< Endpoint */ + unsigned short node_id; /**< Node ID */ + unsigned char endpoint; /**< Endpoint */ } ZigbeeZclAlarmGetAlarm_t; /* -------------------------------------------------------------------------------------- @@ -104,12 +104,12 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char endpoint; /**< Endpoint */ - char status; /**< Status */ - char alarm_code; /**< Alarm code */ - short clusterid; /**< Cluster ID */ - int timestamp; /**< Time stamp */ + unsigned short node_id; /**< Node ID */ + unsigned char endpoint; /**< Endpoint */ + unsigned char status; /**< Status */ + unsigned char alarm_code; /**< Alarm code */ + unsigned short clusterid; /**< Cluster ID */ + unsigned int timestamp; /**< Time stamp */ } ZigbeeZclAlarmGetAlarmRsp_t; #endif /* __ZIGBEE_ZCL_ALARM_TYPE_H__ */ diff --git a/common/include/zigbee_zcl_basic_type.h b/common/include/zigbee_zcl_basic_type.h index f2cdf07..dd4d2eb 100644 --- a/common/include/zigbee_zcl_basic_type.h +++ b/common/include/zigbee_zcl_basic_type.h @@ -30,8 +30,8 @@ * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ } ZigbeeZclBasicResetFactoryDefault_t; #endif /* __ZIGBEE_ZCL_BASIC_TYPE_H__ */ diff --git a/common/include/zigbee_zcl_color_control_type.h b/common/include/zigbee_zcl_color_control_type.h index b896cb8..3ddcfeb 100644 --- a/common/include/zigbee_zcl_color_control_type.h +++ b/common/include/zigbee_zcl_color_control_type.h @@ -30,11 +30,11 @@ * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - char hue; /**< Hue */ - char direction; /**< Direction */ - short transition_time; /**< Transition time */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned char hue; /**< Hue */ + unsigned char direction; /**< Direction */ + unsigned short transition_time; /**< Transition time */ } ZigbeeZclColorControlMoveToHue_t; /** @@ -42,10 +42,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - char move_mode; /**< Move mode */ - char rate; /**< Rate */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned char move_mode; /**< Move mode */ + unsigned char rate; /**< Rate */ } ZigbeeZclColorControlMoveHue_t; /** @@ -53,11 +53,11 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - char step_mode; /**< Step mode */ - char step_size; /**< Step size */ - short transition_time; /**< Transition time */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned char step_mode; /**< Step mode */ + unsigned char step_size; /**< Step size */ + unsigned char transition_time; /**< Transition time */ } ZigbeeZclColorControlStepHue_t; /** @@ -65,10 +65,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - char saturation; /**< Saturation */ - short transition_time; /**< Transition time */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned char saturation; /**< Saturation */ + unsigned short transition_time; /**< Transition time */ } ZigbeeZclColorControlMoveToSaturation_t; /** @@ -76,10 +76,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - char move_mode; /**< Move mode */ - char rate; /**< Rate */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned char move_mode; /**< Move mode */ + unsigned char rate; /**< Rate */ } ZigbeeZclColorControlMoveSaturation_t; /** @@ -87,11 +87,11 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - char step_mode; /**< Step mode */ - char step_size; /**< Step size */ - short transition_time; /**< Transition time */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned char step_mode; /**< Step mode */ + unsigned char step_size; /**< Step size */ + unsigned char transition_time; /**< Transition time */ } ZigbeeZclColorControlStepSaturation_t; /** @@ -99,11 +99,11 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - char hue; /**< Hue */ - char saturation; /**< Saturation */ - short transition_time; /**< Transition time */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned char hue; /**< Hue */ + unsigned char saturation; /**< Saturation */ + unsigned short transition_time; /**< Transition time */ } ZigbeeZclColorControlMoveToHueAndSaturation_t; /** @@ -111,11 +111,11 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - short color_x; /**< Color X */ - short color_y; /**< Color Y */ - short transition_time; /**< Transition time */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned short color_x; /**< Color X */ + unsigned short color_y; /**< Color Y */ + unsigned short transition_time; /**< Transition time */ } ZigbeeZclColorControlMoveToColor_t; /** @@ -123,10 +123,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - short rate_x; /**< Rate X */ - short rate_y; /**< Rate Y */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned short rate_x; /**< Rate X */ + unsigned short rate_y; /**< Rate Y */ } ZigbeeZclColorControlMoveColor_t; /** @@ -134,11 +134,11 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - short step_x; /**< Step X */ - short step_y; /**< Step Y */ - short transition_time; /**< Transition time */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned short step_x; /**< Step X */ + unsigned short step_y; /**< Step Y */ + unsigned short transition_time; /**< Transition time */ } ZigbeeZclColorControlStepColor_t; /** @@ -146,10 +146,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - short color_temperature; /**< Color temperature*/ - short transition_time; /**< Transition time */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned short color_temperature; /**< Color temperature*/ + unsigned short transition_time; /**< Transition time */ } ZigbeeZclColorControlMoveColorTemperature_t; #endif /* __ZIGBEE_ZCL_COLOR_CONTROL_TYPE_H__ */ diff --git a/common/include/zigbee_zcl_door_lock_type.h b/common/include/zigbee_zcl_door_lock_type.h index a24040f..3a5aacb 100644 --- a/common/include/zigbee_zcl_door_lock_type.h +++ b/common/include/zigbee_zcl_door_lock_type.h @@ -26,8 +26,8 @@ * @since_tizen 3.0 */ typedef struct { - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - char endpoint; /**< Endpoint */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char endpoint; /**< Endpoint */ } ZigbeeZclDoorLockSubscriberLockEvent_t; /** @@ -35,11 +35,11 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short uid; - char ustatus; - char utype; - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - char endpoint; /**< Endpoint */ + unsigned short uid; + unsigned char ustatus; + unsigned char utype; + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char endpoint; /**< Endpoint */ char pin[ZIGBEE_DOOR_LOCK_MAX_PIN_LEN + 1]; } ZigbeeZclDoorLockSetDoorLockPin_t; @@ -48,8 +48,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - char endpoint; /**< Endpoint */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char endpoint; /**< Endpoint */ char pin[ZIGBEE_DOOR_LOCK_MAX_PIN_LEN + 1]; int lock_unlock_type; } ZigbeeZclDoorLockSetDoorLock_t; @@ -59,8 +59,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - char endpoint; /**< Endpoint */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char endpoint; /**< Endpoint */ } ZigbeeZclDoorLockGetDoorLock_t; diff --git a/common/include/zigbee_zcl_fan_control_type.h b/common/include/zigbee_zcl_fan_control_type.h index cd96f21..ad1e873 100644 --- a/common/include/zigbee_zcl_fan_control_type.h +++ b/common/include/zigbee_zcl_fan_control_type.h @@ -26,8 +26,8 @@ * @since_tizen 3.0 */ typedef struct { - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - char endpoint; /**< Endpoint */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char endpoint; /**< Endpoint */ } ZigbeeZclFanControlSetFanMode_t; /** @@ -35,8 +35,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - char endpoint; /**< Endpoint */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char endpoint; /**< Endpoint */ } ZigbeeZclFanControlGetFanMode_t; /** @@ -44,8 +44,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - char endpoint; /**< Endpoint */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char endpoint; /**< Endpoint */ } ZigbeeZclFanControlSetFanModeSequence_t; /** @@ -53,8 +53,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - char endpoint; /**< Endpoint */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char endpoint; /**< Endpoint */ } ZigbeeZclFanControlGetFanModeSequence_t; #endif /* __ZIGBEE_ZCL_FAN_CONTROL_TYPE_H__ */ diff --git a/common/include/zigbee_zcl_group_type.h b/common/include/zigbee_zcl_group_type.h index e89df85..dfd3733 100644 --- a/common/include/zigbee_zcl_group_type.h +++ b/common/include/zigbee_zcl_group_type.h @@ -30,9 +30,9 @@ * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - short group_id; /**< Group ID */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned short group_id; /**< Group ID */ char group_name[ZIGBEE_ZCL_GROUP_NAME_MAX_LEN + 1]; /**< Group name (NULL terminated) */ } ZigbeeZclGroupAddGroup_t; @@ -41,9 +41,9 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - short group_id; /**< Group ID */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned short group_id; /**< Group ID */ } ZigbeeZclGroupViewGroup_t; /** @@ -51,10 +51,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - char group_count; /**< Group count */ - short *group_list; /**< Group list */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned char group_count; /**< Group count */ + unsigned short *group_list; /**< Group list */ } ZigbeeZclGroupGetGroupMembership_t; /** @@ -62,9 +62,9 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - short group_id; /**< Group ID */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned short group_id; /**< Group ID */ } ZigbeeZclGroupRemoveGroup_t; /** @@ -72,8 +72,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ } ZigbeeZclGroupRemoveAllGroup_t; /** @@ -81,9 +81,9 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - short group_id; /**< Group ID */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned short group_id; /**< Group ID */ char group_name[ZIGBEE_ZCL_GROUP_NAME_MAX_LEN + 1]; /**< Group name (NULL terminated) */ } ZigbeeZclGroupAddGroupIfIdentifying_t; @@ -96,10 +96,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char src_ep; /**< Source endpoint */ - char status; /**< Status code */ - short group_id; /**< Group ID */ + unsigned short node_id; /**< Node ID */ + unsigned char src_ep; /**< Source endpoint */ + unsigned char status; /**< Status code */ + unsigned short group_id; /**< Group ID */ } ZigbeeZclGroupAddGroupNoti_t; /** @@ -107,10 +107,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char src_ep; /**< Source endpoint */ - char status; /**< Status code */ - short group_id; /**< Group ID */ + unsigned short node_id; /**< Node ID */ + unsigned char src_ep; /**< Source endpoint */ + unsigned char status; /**< Status code */ + unsigned short group_id; /**< Group ID */ char group_name[ZIGBEE_ZCL_GROUP_NAME_MAX_LEN + 1]; /**< Group name (NULL terminated) */ } ZigbeeZclGroupViewGroupNoti_t; @@ -119,11 +119,11 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char src_ep; /**< Source endpoint */ - char capacity; /**< Capacity of group */ - char group_count; /**< Group ID */ - short *group_list; /**< Group list */ + unsigned short node_id; /**< Node ID */ + unsigned char src_ep; /**< Source endpoint */ + unsigned char capacity; /**< Capacity of group */ + unsigned char group_count; /**< Group ID */ + unsigned short *group_list; /**< Group list */ } ZigbeeZclGroupGetGroupMembershipNoti_t; /** @@ -131,10 +131,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char src_ep; /**< Source endpoint */ - char status; /**< Status code */ - short group_id; /**< Group ID */ + unsigned short node_id; /**< Node ID */ + unsigned char src_ep; /**< Source endpoint */ + unsigned char status; /**< Status code */ + unsigned short group_id; /**< Group ID */ } ZigbeeZclGroupRemoveGroupNoti_t; diff --git a/common/include/zigbee_zcl_ias_zone_type.h b/common/include/zigbee_zcl_ias_zone_type.h index c8c2dab..6083f75 100644 --- a/common/include/zigbee_zcl_ias_zone_type.h +++ b/common/include/zigbee_zcl_ias_zone_type.h @@ -30,10 +30,10 @@ * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - char enroll_code; /**< Enroll code */ - char zone_id; /**< Zone ID */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned char enroll_code; /**< Enroll code */ + unsigned char zone_id; /**< Zone ID */ } ZigbeeZclIasZoneEnrollResponse_t; /* -------------------------------------------------------------------------------------- @@ -45,12 +45,12 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char src_ep; /**< Source endpoint */ - short zone_status; /**< Zone status */ - char extended_status; /**< Extended status */ - char zone_id; /**< Zone ID */ - short delay; /**< Delay */ + unsigned short node_id; /**< Node ID */ + unsigned char src_ep; /**< Source endpoint */ + unsigned short zone_status; /**< Zone status */ + unsigned char extended_status; /**< Extended status */ + unsigned char zone_id; /**< Zone ID */ + unsigned short delay; /**< Delay */ } ZigbeeZclIasZoneStatusChangeNoti_t; /** @@ -58,10 +58,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char src_ep; /**< Source endpoint */ - short zone_type; /**< Zone type */ - char mfg_code; /**< Manufacturer code */ + unsigned short node_id; /**< Node ID */ + unsigned char src_ep; /**< Source endpoint */ + unsigned short zone_type; /**< Zone type */ + unsigned char mfg_code; /**< Manufacturer code */ } ZigbeeZclIasEnrollRequestNoti_t; #endif /* __ZIGBEE_ZCL_IAS_ZONE_TYPE_H__ */ diff --git a/common/include/zigbee_zcl_identify_type.h b/common/include/zigbee_zcl_identify_type.h index 8ce55c8..18bfe2b 100644 --- a/common/include/zigbee_zcl_identify_type.h +++ b/common/include/zigbee_zcl_identify_type.h @@ -30,9 +30,9 @@ * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - short identify_time; /**< Identify time */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned short identify_time; /**< Identify time */ } ZigbeeZclIdentifyIdentify_t; /** @@ -40,8 +40,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ } ZigbeeZclIdentifyQuery_t; /* -------------------------------------------------------------------------------------- @@ -53,8 +53,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - short identify_time; /**< Identify time */ + unsigned short node_id; /**< Node ID */ + unsigned short identify_time; /**< Identify time */ } ZigbeeZclIdentifyQueryNoti_t; #endif /* __ZIGBEE_ZCL_IDENTIFY_TYPE_H__ */ diff --git a/common/include/zigbee_zcl_level_control_type.h b/common/include/zigbee_zcl_level_control_type.h index 3d6c1ac..6f8aae3 100644 --- a/common/include/zigbee_zcl_level_control_type.h +++ b/common/include/zigbee_zcl_level_control_type.h @@ -26,10 +26,10 @@ * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char endpoint; /**< Endpoint */ - char level; /**< Level */ - short transition; /**< Transition time */ + unsigned short node_id; /**< Node ID */ + unsigned char endpoint; /**< Endpoint */ + unsigned char level; /**< Level */ + unsigned short transition; /**< Transition time */ } ZigbeeZclLevelControlMoveToLevel_t; /** @@ -37,10 +37,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char endpoint; /**< Endpoint */ - char move_mode; /**< Move mode */ - char rate; /**< Rate of movement */ + unsigned short node_id; /**< Node ID */ + unsigned char endpoint; /**< Endpoint */ + unsigned char move_mode; /**< Move mode */ + unsigned char rate; /**< Rate of movement */ } ZigbeeZclLevelControlMove_t; /** @@ -48,11 +48,11 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char endpoint; /**< Endpoint */ - char step_mode; /**< Step mode */ - char step_size; /**< Step size */ - short transition_time; /**< Transition time */ + unsigned short node_id; /**< Node ID */ + unsigned char endpoint; /**< Endpoint */ + unsigned char step_mode; /**< Step mode */ + unsigned char step_size; /**< Step size */ + unsigned short transition_time; /**< Transition time */ } ZigbeeZclLevelControlStep_t; /** @@ -60,10 +60,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char endpoint; /**< Endpoint */ - char level; /**< Level */ - short transition; /**< Transition time */ + unsigned short node_id; /**< Node ID */ + unsigned char endpoint; /**< Endpoint */ + unsigned char level; /**< Level */ + unsigned short transition; /**< Transition time */ } ZigbeeZclLevelControlMoveToLevelWithOnOff_t; /** @@ -71,10 +71,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char endpoint; /**< Endpoint */ - char move_mode; /**< Move mode */ - char rate; /**< Rate of movement */ + unsigned short node_id; /**< Node ID */ + unsigned char endpoint; /**< Endpoint */ + unsigned char move_mode; /**< Move mode */ + unsigned char rate; /**< Rate of movement */ } ZigbeeZclLevelControlMoveWithOnOff_t; /** @@ -82,11 +82,11 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char endpoint; /**< Endpoint */ - char step_mode; /**< Step mode */ - char step_size; /**< Step size */ - short transition_time; /**< Transition time */ + unsigned short node_id; /**< Node ID */ + unsigned char endpoint; /**< Endpoint */ + unsigned char step_mode; /**< Step mode */ + unsigned char step_size; /**< Step size */ + unsigned short transition_time; /**< Transition time */ } ZigbeeZclLevelControlStepWithOnOff_t; /** @@ -94,8 +94,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char endpoint; /**< Endpoint */ + unsigned short node_id; /**< Node ID */ + unsigned char endpoint; /**< Endpoint */ } ZigbeeZclLevelControlStop_t; #endif /* __ZIGBEE_ZCL_LEVEL_CONTROL_TYPE_H__ */ diff --git a/common/include/zigbee_zcl_on_off_type.h b/common/include/zigbee_zcl_on_off_type.h index 99bf544..479f677 100644 --- a/common/include/zigbee_zcl_on_off_type.h +++ b/common/include/zigbee_zcl_on_off_type.h @@ -30,9 +30,9 @@ * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char endpoint; /**< Endpoint */ - char on_off_type; /**< ON/OFF type */ + unsigned short node_id; /**< Node ID */ + unsigned char endpoint; /**< Endpoint */ + unsigned char on_off_type; /**< ON/OFF type */ } ZigbeeZclOnOffSetOnOff_t; /** @@ -40,8 +40,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char endpoint; /**< Endpoint */ + unsigned short node_id; /**< Node ID */ + unsigned char endpoint; /**< Endpoint */ } ZigbeeZclOnOffGetOnOffState_t; /* ----------------------------------------------------------------------------- @@ -53,7 +53,7 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - char state; /**< ON/OFF state */ + unsigned char state; /**< ON/OFF state */ } ZigbeeZclOnOffOnOffState_t; #endif /* __ZIGBEE_ZCL_ON_OFF_TYPE_H__ */ diff --git a/common/include/zigbee_zcl_poll_control_type.h b/common/include/zigbee_zcl_poll_control_type.h index 02cabf1..b335d0b 100644 --- a/common/include/zigbee_zcl_poll_control_type.h +++ b/common/include/zigbee_zcl_poll_control_type.h @@ -30,10 +30,10 @@ * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - char start_fast_polling; /**< Start fast polling */ - short fast_poll_timeout; /**< Fast poll timeout */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned char start_fast_polling; /**< Start fast polling */ + unsigned short fast_poll_timeout; /**< Fast poll timeout */ } ZigbeeZclPollControlCheckInResponse_t; /** @@ -41,8 +41,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ } ZigbeeZclPollControlFastPollStop_t; /** @@ -50,8 +50,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ unsigned int new_long_poll_interval; /**< New long poll interval */ } ZigbeeZclPollControlSetLongPollInterval_t; @@ -60,8 +60,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ unsigned int new_short_poll_interval; /**< New short poll interval */ } ZigbeeZclPollControlSetShortPollInterval_t; @@ -74,8 +74,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char src_ep; /**< Source endpoint */ + unsigned short node_id; /**< Node ID */ + unsigned char src_ep; /**< Source endpoint */ } ZigbeeZclPollControlCheckinResponseNoti_t; diff --git a/common/include/zigbee_zcl_scene_type.h b/common/include/zigbee_zcl_scene_type.h index 4940d84..98c2c23 100644 --- a/common/include/zigbee_zcl_scene_type.h +++ b/common/include/zigbee_zcl_scene_type.h @@ -30,14 +30,14 @@ * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - short group_id; /**< Group ID */ - char scene_id; /**< Scene ID */ - short transition_time; /**< Transition time */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned short group_id; /**< Group ID */ + unsigned char scene_id; /**< Scene ID */ + unsigned short transition_time; /**< Transition time */ char scene_name[ZIGBEE_ZCL_SCENE_NAME_MAX_LEN + 1]; /**< Scene name (NULL terminated */ - short ext_field_set_len; /**< Extended field set length */ - char *ext_field_set; /**< Extended field set */ + unsigned short ext_field_set_len; /**< Extended field set length */ + unsigned char *ext_field_set; /**< Extended field set */ } ZigbeeZclSceneAddScene_t; /** @@ -45,10 +45,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - short group_id; /**< Group ID */ - char scene_id; /**< Scene ID */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned short group_id; /**< Group ID */ + unsigned char scene_id; /**< Scene ID */ } ZigbeeZclSceneViewScene_t; /** @@ -56,10 +56,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - short group_id; /**< Group ID */ - char scene_id; /**< Scene ID */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned short group_id; /**< Group ID */ + unsigned char scene_id; /**< Scene ID */ } ZigbeeZclSceneRemoveScene_t; /** @@ -67,10 +67,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - short group_id; /**< Group ID */ - char scene_id; /**< Scene ID */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned short group_id; /**< Group ID */ + unsigned char scene_id; /**< Scene ID */ } ZigbeeZclSceneStoreScene_t; /** @@ -78,10 +78,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - short group_id; /**< Group ID */ - char scene_id; /**< Scene ID */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned short group_id; /**< Group ID */ + unsigned char scene_id; /**< Scene ID */ } ZigbeeZclSceneRecallScene_t; /** @@ -89,9 +89,9 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - short group_id; /**< Group ID */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned short group_id; /**< Group ID */ } ZigbeeZclSceneRemoveAllScene_t; /** @@ -99,9 +99,9 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char dest_ep; /**< Destination endpoint */ - short group_id; /**< Group ID */ + unsigned short node_id; /**< Node ID */ + unsigned char dest_ep; /**< Destination endpoint */ + unsigned short group_id; /**< Group ID */ } ZigbeeZclSceneGetSceneMembership_t; /* ----------------------------------------------------------------------------- @@ -113,11 +113,11 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char src_ep; /**< Destination endpoint */ - char status; /**< Status */ - short group_id; /**< Group ID */ - char scene_id; /**< Scene ID */ + unsigned short node_id; /**< Node ID */ + unsigned char src_ep; /**< Destination endpoint */ + unsigned char status; /**< Status */ + unsigned short group_id; /**< Group ID */ + unsigned char scene_id; /**< Scene ID */ } ZigbeeZclSceneAddSceneResp_t; /** @@ -125,15 +125,15 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char src_ep; /**< Source endpoint */ - short group_id; /**< Group ID */ - char status; /**< Status */ - char scene_id; /**< Scene ID */ - short transition_time; /**< Transition time */ + unsigned short node_id; /**< Node ID */ + unsigned char src_ep; /**< Source endpoint */ + unsigned short group_id; /**< Group ID */ + unsigned char status; /**< Status */ + unsigned char scene_id; /**< Scene ID */ + unsigned short transition_time; /**< Transition time */ char *scene_name; /**< Scene name (NULL terminated */ - short ext_field_set_len; /**< Extended field set length */ - char *ext_field_set; /**< Extended field set */ + unsigned short ext_field_set_len; /**< Extended field set length */ + unsigned char *ext_field_set; /**< Extended field set */ } ZigbeeZclSceneViewSceneResp_t; /** @@ -141,11 +141,11 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char src_ep; /**< Source endpoint */ - char status; /**< Status */ - short group_id; /**< Group ID */ - char scene_id; /**< Scene ID */ + unsigned short node_id; /**< Node ID */ + unsigned char src_ep; /**< Source endpoint */ + unsigned char status; /**< Status */ + unsigned short group_id; /**< Group ID */ + unsigned char scene_id; /**< Scene ID */ } ZigbeeZclSceneRemoveSceneResp_t; /** @@ -153,10 +153,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char src_ep; /**< Source endpoint */ - char status; /**< Status */ - short group_id; /**< Group ID */ + unsigned short node_id; /**< Node ID */ + unsigned char src_ep; /**< Source endpoint */ + unsigned char status; /**< Status */ + unsigned short group_id; /**< Group ID */ } ZigbeeZclSceneRemoveAllSceneResp_t; /** @@ -164,11 +164,11 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char src_ep; /**< Source endpoint */ - char status; /**< Status */ - short group_id; /**< Group ID */ - char scene_id; /**< Scene ID */ + unsigned short node_id; /**< Node ID */ + unsigned char src_ep; /**< Source endpoint */ + unsigned char status; /**< Status */ + unsigned short group_id; /**< Group ID */ + unsigned char scene_id; /**< Scene ID */ } ZigbeeZclSceneStoreSceneResp_t; /** @@ -176,13 +176,13 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char src_ep; /**< Source endpoint */ - char status; /**< Status */ - char capacity; /**< Capacity */ - short group_id; /**< Group ID */ - char scene_count; /**< Scene count */ - char *scene_list; /**< Scene list */ + unsigned short node_id; /**< Node ID */ + unsigned char src_ep; /**< Source endpoint */ + unsigned char status; /**< Status */ + unsigned char capacity; /**< Capacity */ + unsigned short group_id; /**< Group ID */ + unsigned char scene_count; /**< Scene count */ + unsigned char *scene_list; /**< Scene list */ } ZigbeeZclSceneGetSceneMembershipResp_t; diff --git a/common/include/zigbee_zcl_thermostat_type.h b/common/include/zigbee_zcl_thermostat_type.h index 8f61d77..b8b5ece 100644 --- a/common/include/zigbee_zcl_thermostat_type.h +++ b/common/include/zigbee_zcl_thermostat_type.h @@ -26,8 +26,8 @@ * @since_tizen 3.0 */ typedef struct { - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - char endpoint; /**< Endpoint */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char endpoint; /**< Endpoint */ } ZigbeeZclThermostatGetLocalTemp_t; /** @@ -35,10 +35,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - char endpoint; /**< Endpoint */ - char num_of_days; /**< Number of days */ - char mode; /**< Mode */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char endpoint; /**< Endpoint */ + unsigned char num_of_days; /**< Number of days */ + unsigned char mode; /**< Mode */ } ZigbeeZclThermostatGetWeeklySchedule_t; /** @@ -46,13 +46,13 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - char endpoint; /**< Endpoint */ - char no_of_transitions; /**< Number of transitions */ - char num_of_days; /**< Number of days */ - char mode; /**< Mode */ - char payload[ZIGBEE_THERMSTAT_PAYLOAD_MAX_LEN]; /**< Payload */ - char payload_len; /**< Payload length */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char endpoint; /**< Endpoint */ + unsigned char no_of_transitions; /**< Number of transitions */ + unsigned char num_of_days; /**< Number of days */ + unsigned char mode; /**< Mode */ + unsigned char payload[ZIGBEE_THERMSTAT_PAYLOAD_MAX_LEN]; /**< Payload */ + unsigned char payload_len; /**< Payload length */ } ZigbeeZclThermostatSetWeeklySchedule_t; /** @@ -60,8 +60,8 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ - char endpoint; /**< Endpoint */ + unsigned char eui64[ZIGBEE_EUI64_SIZE]; /**< EUI64 (an IEEE address) */ + unsigned char endpoint; /**< Endpoint */ } ZigbeeZclThermostatClearWeeklySchedule_t; /** @@ -69,10 +69,10 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char endpoint; /**< Endpoint */ - char mode; /**< Mode */ - char amount; /**< Amount */ + unsigned short node_id; /**< Node ID */ + unsigned char endpoint; /**< Endpoint */ + unsigned char mode; /**< Mode */ + unsigned char amount; /**< Amount */ } ZigbeeZclThermostatSetpointRaiseLower_t; #endif /* __ZIGBEE_ZCL_THERMOSTAT_TYPE_H__ */ diff --git a/common/include/zigbee_zdo_bind_type.h b/common/include/zigbee_zdo_bind_type.h index dddc126..3857476 100644 --- a/common/include/zigbee_zdo_bind_type.h +++ b/common/include/zigbee_zdo_bind_type.h @@ -30,14 +30,14 @@ * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char src_addr[ZIGBEE_ZDO_BIND_ADDRESS_MAX_LEN + 1]; /**< Source address */ - char src_ep; /**< Source endpoint */ - short cluster_id; /**< Cluster ID */ - char dst_addr[ZIGBEE_ZDO_BIND_ADDRESS_MAX_LEN + 1]; /**< Destination address */ - char bind_type; /**< Bind type */ - short group_addr; /**< Group address */ - char dst_ep; /**< Destination endpoint */ + unsigned short node_id; /**< Node ID */ + unsigned char src_addr[ZIGBEE_EUI64_SIZE]; /**< Source address */ + unsigned char src_ep; /**< Source endpoint */ + unsigned short cluster_id; /**< Cluster ID */ + unsigned char dst_addr[ZIGBEE_EUI64_SIZE]; /**< Destination address */ + unsigned char bind_type; /**< Bind type */ + unsigned short group_addr; /**< Group address */ + unsigned char dst_ep; /**< Destination endpoint */ } ZigbeeZdoBindBindReq_t; /** @@ -45,14 +45,14 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - short node_id; /**< Node ID */ - char src_addr[ZIGBEE_ZDO_BIND_ADDRESS_MAX_LEN + 1]; /**< Source address */ - char src_ep; /**< Source endpoint */ - short cluster_id; /**< Cluster ID */ - char dst_addr[ZIGBEE_ZDO_BIND_ADDRESS_MAX_LEN + 1]; /**< Destination address */ - char bind_type; /**< Bind type */ - short group_addr; /**< Group address */ - char dst_ep; /**< Destination endpoint */ + unsigned short node_id; /**< Node ID */ + unsigned char src_addr[ZIGBEE_EUI64_SIZE]; /**< Source address */ + unsigned char src_ep; /**< Source endpoint */ + unsigned short cluster_id; /**< Cluster ID */ + unsigned char dst_addr[ZIGBEE_EUI64_SIZE]; /**< Destination address */ + unsigned char bind_type; /**< Bind type */ + unsigned short group_addr; /**< Group address */ + unsigned char dst_ep; /**< Destination endpoint */ } ZigbeeZdoBindUnbindReq_t; /* ----------------------------------------------------------------------------- @@ -64,7 +64,7 @@ typedef struct { * @since_tizen 3.0 */ typedef struct { - char status; /**< Status */ + unsigned char status; /**< Status */ } ZigbeeZdoBindUnbindNoti_t; diff --git a/zigbee-daemon/zigbee-lib/src/zblib_request.c b/zigbee-daemon/zigbee-lib/src/zblib_request.c index 9dd8e7d..23f2c6d 100644 --- a/zigbee-daemon/zigbee-lib/src/zblib_request.c +++ b/zigbee-daemon/zigbee-lib/src/zblib_request.c @@ -2184,7 +2184,7 @@ static gpointer __zblib_request_create_zcl_group_request_data(guint request_type req->node_id = in_req->node_id; req->dest_ep = in_req->dest_ep; req->group_count = in_req->group_count; - req->group_list = (gshort *)g_memdup(in_req->group_list, + req->group_list = (gushort *)g_memdup(in_req->group_list, in_req->group_count); } @@ -2388,7 +2388,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 = (char *)g_memdup(in_req->ext_field_set, + req->ext_field_set = (guchar *)g_memdup(in_req->ext_field_set, in_req->ext_field_set_len); } @@ -2908,12 +2908,10 @@ static gpointer __zblib_request_create_zdo_bind_request_data(guint request_type, /* Copy data */ req->node_id = in_req->node_id; - g_strlcpy(req->src_addr, - in_req->src_addr, ZIGBEE_ZDO_BIND_ADDRESS_MAX_LEN + 1); + memcpy(req->src_addr, in_req->src_addr, ZIGBEE_EUI64_SIZE); req->src_ep = in_req->src_ep; req->cluster_id = in_req->cluster_id; - g_strlcpy(req->dst_addr, - in_req->dst_addr, ZIGBEE_ZDO_BIND_ADDRESS_MAX_LEN + 1); + memcpy(req->dst_addr, in_req->dst_addr, ZIGBEE_EUI64_SIZE); req->bind_type = in_req->bind_type; req->group_addr = in_req->group_addr; req->dst_ep = in_req->dst_ep; @@ -2935,12 +2933,10 @@ static gpointer __zblib_request_create_zdo_bind_request_data(guint request_type, /* Copy data */ req->node_id = in_req->node_id; - g_strlcpy(req->src_addr, - in_req->src_addr, ZIGBEE_ZDO_BIND_ADDRESS_MAX_LEN + 1); + memcpy(req->src_addr, in_req->src_addr, ZIGBEE_EUI64_SIZE); req->src_ep = in_req->src_ep; req->cluster_id = in_req->cluster_id; - g_strlcpy(req->dst_addr, - in_req->dst_addr, ZIGBEE_ZDO_BIND_ADDRESS_MAX_LEN + 1); + memcpy(req->dst_addr, in_req->dst_addr, ZIGBEE_EUI64_SIZE); req->bind_type = in_req->bind_type; req->group_addr = in_req->group_addr; req->dst_ep = in_req->dst_ep; -- 2.7.4