From: Jiwan Kim Date: Wed, 8 Feb 2017 08:12:01 +0000 (+0900) Subject: Fix dbus parameter 'ay' to 'a(y)' X-Git-Tag: submit/tizen/20170512.045637~23 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fconnectivity%2Fzigbee-manager.git;a=commitdiff_plain;h=61bf1218e321d7d8f9a888d7b10555b8b03ef7aa Fix dbus parameter 'ay' to 'a(y)' - These parameters are not used currently. - But change those use cases for future use Change-Id: If364601c957ef418f6d23960334db800b906221a Signed-off-by: Jiwan Kim --- diff --git a/zigbee-daemon/zigbee-interface/introspection/mfglib-control.xml b/zigbee-daemon/zigbee-interface/introspection/mfglib-control.xml index ace61fd..5bd6660 100644 --- a/zigbee-daemon/zigbee-interface/introspection/mfglib-control.xml +++ b/zigbee-daemon/zigbee-interface/introspection/mfglib-control.xml @@ -1,81 +1,81 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/zigbee-daemon/zigbee-interface/introspection/zcl-alarm.xml b/zigbee-daemon/zigbee-interface/introspection/zcl-alarm.xml index 49be1bd..b89e1b4 100644 --- a/zigbee-daemon/zigbee-interface/introspection/zcl-alarm.xml +++ b/zigbee-daemon/zigbee-interface/introspection/zcl-alarm.xml @@ -1,7 +1,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/zigbee-daemon/zigbee-interface/introspection/zcl-door-lock.xml b/zigbee-daemon/zigbee-interface/introspection/zcl-door-lock.xml index 7e0b71a..0f07460 100644 --- a/zigbee-daemon/zigbee-interface/introspection/zcl-door-lock.xml +++ b/zigbee-daemon/zigbee-interface/introspection/zcl-door-lock.xml @@ -1,7 +1,7 @@ - + @@ -9,20 +9,20 @@ - + - + - + diff --git a/zigbee-daemon/zigbee-interface/introspection/zcl-fan-control.xml b/zigbee-daemon/zigbee-interface/introspection/zcl-fan-control.xml index e03a66c..b91bc32 100644 --- a/zigbee-daemon/zigbee-interface/introspection/zcl-fan-control.xml +++ b/zigbee-daemon/zigbee-interface/introspection/zcl-fan-control.xml @@ -1,22 +1,22 @@ - + - + - + - + diff --git a/zigbee-daemon/zigbee-interface/introspection/zcl-thermostat.xml b/zigbee-daemon/zigbee-interface/introspection/zcl-thermostat.xml index 2fe6f12..bdc773e 100644 --- a/zigbee-daemon/zigbee-interface/introspection/zcl-thermostat.xml +++ b/zigbee-daemon/zigbee-interface/introspection/zcl-thermostat.xml @@ -1,29 +1,29 @@ - + - + - + - + - + diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_mfglib_control.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_mfglib_control.c index be74db7..bf5becf 100644 --- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_mfglib_control.c +++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_mfglib_control.c @@ -51,8 +51,8 @@ static gboolean on_mfglib_control_start(ZigbeeMfglib_control *mfglib_control_obj memset(&req, 0x0, sizeof(ZigbeeMfglibControlStart_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -123,8 +123,8 @@ static gboolean on_mfglib_control_end(ZigbeeMfglib_control *mfglib_control_objec memset(&req, 0x0, sizeof(ZigbeeMfglibControlEnd_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -194,8 +194,8 @@ static gboolean on_mfglib_control_start_tone(ZigbeeMfglib_control *mfglib_contro memset(&req, 0x0, sizeof(ZigbeeMfglibControlStartTone_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -265,8 +265,8 @@ static gboolean on_mfglib_control_stop_tone(ZigbeeMfglib_control *mfglib_control memset(&req, 0x0, sizeof(ZigbeeMfglibControlStopTone_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -336,8 +336,8 @@ static gboolean on_mfglib_control_start_stream(ZigbeeMfglib_control *mfglib_cont memset(&req, 0x0, sizeof(ZigbeeMfglibControlStartStream_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -407,8 +407,8 @@ static gboolean on_mfglib_control_stop_stream(ZigbeeMfglib_control *mfglib_contr memset(&req, 0x0, sizeof(ZigbeeMfglibControlStopStream_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -479,8 +479,8 @@ static gboolean on_mfglib_control_send_packet(ZigbeeMfglib_control *mfglib_contr memset(&req, 0x0, sizeof(ZigbeeMfglibControlSendPacket_t)); /* Update request structure */ - g_variant_get(packet_content, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.packet_content[i])) { + g_variant_get(packet_content, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.packet_content[i]))) { i++; if (i >= (guint)packet_length) break; @@ -552,8 +552,8 @@ static gboolean on_mfglib_control_set_channel(ZigbeeMfglib_control *mfglib_contr memset(&req, 0x0, sizeof(ZigbeeMfglibControlSetChannel_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -624,8 +624,8 @@ static gboolean on_mfglib_control_get_channel(ZigbeeMfglib_control *mfglib_contr memset(&req, 0x0, sizeof(ZigbeeMfglibControlGetChannel_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -697,8 +697,8 @@ static gboolean on_mfglib_control_set_power(ZigbeeMfglib_control *mfglib_control memset(&req, 0x0, sizeof(ZigbeeMfglibControlSetPower_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -770,8 +770,8 @@ static gboolean on_mfglib_control_get_power(ZigbeeMfglib_control *mfglib_control memset(&req, 0x0, sizeof(ZigbeeMfglibControlGetPower_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -842,8 +842,8 @@ static gboolean on_mfglib_control_set_synoffset(ZigbeeMfglib_control *mfglib_con memset(&req, 0x0, sizeof(ZigbeeMfglibControlSetSynOffset_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -917,8 +917,8 @@ static gboolean on_mfglib_control_get_synoffset(ZigbeeMfglib_control *mfglib_con memset(&req, 0x0, sizeof(ZigbeeMfglibControlGetSynOffset_t)); /* Update request structure */ - g_variant_get(packet, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.packet[i])) { + g_variant_get(packet, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.packet[i]))) { i++; if (i >= (guint)packet_length) break; @@ -991,8 +991,8 @@ static gboolean on_mfglib_control_rx_start(ZigbeeMfglib_control *mfglib_control_ memset(&req, 0x0, sizeof(ZigbeeMfglibControlRxStart_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -1062,8 +1062,8 @@ static gboolean on_mfglib_control_rx_stop(ZigbeeMfglib_control *mfglib_control_o memset(&req, 0x0, sizeof(ZigbeeMfglibControlRxStop_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -1133,8 +1133,8 @@ static gboolean on_mfglib_control_rx_verify(ZigbeeMfglib_control *mfglib_control memset(&req, 0x0, sizeof(ZigbeeMfglibControlRxVerify_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -1204,8 +1204,8 @@ static gboolean on_mfglib_control_get_rssi(ZigbeeMfglib_control *mfglib_control_ memset(&req, 0x0, sizeof(ZigbeeMfglibControlGetRssi_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_alarm.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_alarm.c index dffec78..20b8e36 100644 --- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_alarm.c +++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_alarm.c @@ -94,8 +94,8 @@ static gboolean on_alarm_get_alarm_count(ZigbeeZcl_alarm *alarm_object, memset(&req, 0x0, sizeof(ZigbeeZclAlarmGetAlarmCount_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -360,8 +360,8 @@ static gboolean on_alarm_alarm(ZigbeeZcl_alarm *alarm_object, memset(&req, 0x0, sizeof(ZigbeeZclAlarmAlarm_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_door_lock.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_door_lock.c index e920d74..ee2d25b 100644 --- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_door_lock.c +++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_door_lock.c @@ -51,8 +51,8 @@ static gboolean on_door_lock_subscribe_lock_event(ZigbeeZcl_door_lock *door_lock memset(&req, 0x0, sizeof(ZigbeeZclDoorLockSubscriberLockEvent_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -131,8 +131,8 @@ static gboolean on_door_lock_set_door_lock_pin(ZigbeeZcl_door_lock *door_lock_ob req.uid = uid; req.ustatus = ustatus; req.utype = utype; - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -207,8 +207,8 @@ static gboolean on_door_lock_set_door_lock(ZigbeeZcl_door_lock *door_lock_object memset(&req, 0x0, sizeof(ZigbeeZclDoorLockSetDoorLock_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -282,8 +282,8 @@ static gboolean on_door_lock_get_lock_state(ZigbeeZcl_door_lock *door_lock_objec memset(&req, 0x0, sizeof(ZigbeeZclDoorLockGetDoorLock_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_fan_control.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_fan_control.c index 693d479..3aea00a 100644 --- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_fan_control.c +++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_fan_control.c @@ -51,8 +51,8 @@ static gboolean on_fan_control_set_fan_mode(ZigbeeZcl_fan_control *fan_control_o memset(&req, 0x0, sizeof(ZigbeeZclFanControlSetFanMode_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -124,8 +124,8 @@ static gboolean on_fan_control_get_fan_mode(ZigbeeZcl_fan_control *fan_control_o memset(&req, 0x0, sizeof(ZigbeeZclFanControlGetFanMode_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -198,8 +198,8 @@ static gboolean on_fan_control_set_fan_mode_sequence( memset(&req, 0x0, sizeof(ZigbeeZclFanControlSetFanModeSequence_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -272,8 +272,8 @@ static gboolean on_fan_control_get_fan_mode_sequence( memset(&req, 0x0, sizeof(ZigbeeZclFanControlGetFanModeSequence_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_thermostat.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_thermostat.c index 93baf04..b3ad201 100644 --- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_thermostat.c +++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_thermostat.c @@ -94,8 +94,8 @@ static gboolean on_thermostat_get_local_temp(ZigbeeZcl_thermostat *thermostat_ob memset(&req, 0x0, sizeof(ZigbeeZclThermostatGetLocalTemp_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -188,8 +188,8 @@ static gboolean on_thermostat_get_weekly_schedule(ZigbeeZcl_thermostat *thermost memset(&req, 0x0, sizeof(ZigbeeZclThermostatGetWeeklySchedule_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -287,8 +287,8 @@ static gboolean on_thermostat_set_weekly_schedule(ZigbeeZcl_thermostat *thermost memset(&req, 0x0, sizeof(ZigbeeZclThermostatSetWeeklySchedule_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break; @@ -299,8 +299,8 @@ static gboolean on_thermostat_set_weekly_schedule(ZigbeeZcl_thermostat *thermost req.mode = mode; i = 0; - g_variant_get(payload, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.payload[i])) { + g_variant_get(payload, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.payload[i]))) { i++; if (i >= (guint)payload_len) break; @@ -391,8 +391,8 @@ static gboolean on_thermostat_clear_weekly_schedule(ZigbeeZcl_thermostat *thermo memset(&req, 0x0, sizeof(ZigbeeZclThermostatClearWeeklySchedule_t)); /* Update request structure */ - g_variant_get(eui64, "ay", &iter); - while (g_variant_iter_loop(iter, "y", req.eui64[i])) { + g_variant_get(eui64, "a(y)", &iter); + while (g_variant_iter_loop(iter, "(y)", &(req.eui64[i]))) { i++; if (i >= ZIGBEE_EUI64_SIZE) break;