From 6c1a7d9a424bb27e2ade9cade4c756702e0f03e3 Mon Sep 17 00:00:00 2001 From: "saerome.kim" Date: Wed, 22 Aug 2018 20:40:28 +0900 Subject: [PATCH] Change API name The APIs below have a name that does not match the purpose, so changes their name to suit the purpose. - zb_end_dev_info_get_list -> zb_end_dev_get_end_dev_info_list - zb_end_dev_get_endpoint_list -> zb_end_dev_get_ep_list - zb_end_dev_info_get_cluster_list -> zb_end_dev_get_cluster_list Change-Id: Ia0b4a30894f84dcf2c0295534b08eb1bece18b77 Signed-off-by: saerome.kim --- include/zigbee.h | 32 ++++++++++++++++++-------------- src/zbl-zdo.c | 6 +++--- test/main.c | 24 ++++++++++++------------ 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/include/zigbee.h b/include/zigbee.h index d2ff957..2892e9a 100644 --- a/include/zigbee.h +++ b/include/zigbee.h @@ -925,7 +925,7 @@ int zb_get_network_info(zb_zigbee_h handle, zb_ieee_addr addr64, zb_nwk_addr *no * @see zb_end_dev_info_list_free() * */ -int zb_end_dev_info_get_list(zb_zigbee_h handle, int *count, +int zb_end_dev_get_end_dev_info_list(zb_zigbee_h handle, int *count, zb_end_dev_info_h **list); /** @@ -949,8 +949,10 @@ int zb_end_dev_info_get_list(zb_zigbee_h handle, int *count, * @retval #ZIGBEE_ERROR_IO_ERROR Unexpected d-bus error * @retval #ZIGBEE_ERROR_PERMISSION_DENIED Permission denied * @retval #ZIGBEE_ERROR_NOT_SUPPORTED Not supported + * + * @see zb_end_dev_get_cluster_list() */ -int zb_end_dev_get_endpoint_list(zb_zigbee_h handle, zb_ieee_addr addr64, +int zb_end_dev_get_ep_list(zb_zigbee_h handle, zb_ieee_addr addr64, unsigned char *count, zb_end_point **ep_list); /** @@ -978,8 +980,10 @@ int zb_end_dev_get_endpoint_list(zb_zigbee_h handle, zb_ieee_addr addr64, * @retval #ZIGBEE_ERROR_IO_ERROR Unexpected d-bus error * @retval #ZIGBEE_ERROR_PERMISSION_DENIED Permission denied * @retval #ZIGBEE_ERROR_NOT_SUPPORTED Not supported + * + * @see zb_end_dev_get_ep_list() */ -int zb_end_dev_info_get_cluster_list(zb_zigbee_h handle, zb_ieee_addr addr64, zb_end_point ep, +int zb_end_dev_get_cluster_list(zb_zigbee_h handle, zb_ieee_addr addr64, zb_end_point ep, unsigned char *in_cluster_count, zb_cluster_id **in_cluster_list, unsigned char *out_cluster_count, zb_cluster_id **out_cluster_list); @@ -997,7 +1001,7 @@ int zb_end_dev_info_get_cluster_list(zb_zigbee_h handle, zb_ieee_addr addr64, zb * @retval #ZIGBEE_ERROR_INVALID_PARAMETER Invalid parameter * @retval #ZIGBEE_ERROR_NOT_SUPPORTED Not supported * - * @see zb_end_dev_info_get_list() + * @see zb_get_end_dev_info_list() */ int zb_end_dev_info_list_free(zb_end_dev_info_h *list); @@ -1076,7 +1080,7 @@ int zb_end_dev_info_destroy(zb_end_dev_info_h handle); * @retval #ZIGBEE_ERROR_NOT_SUPPORTED Not supported * * @see zb_foreach_end_dev_info() - * @see zb_end_dev_info_get_list() + * @see zb_get_end_dev_info_list() */ int zb_end_dev_info_get_network_address(zb_end_dev_info_h handle, zb_nwk_addr *addr16); @@ -1094,7 +1098,7 @@ int zb_end_dev_info_get_network_address(zb_end_dev_info_h handle, * @retval #ZIGBEE_ERROR_INVALID_PARAMETER Invalid parameter * @retval #ZIGBEE_ERROR_NOT_SUPPORTED Not supported * - * @see zb_end_dev_info_get_list() + * @see zb_get_end_dev_info_list() */ int zb_end_dev_info_get_ieee_address(zb_end_dev_info_h handle, zb_ieee_addr addr64); @@ -1111,7 +1115,7 @@ int zb_end_dev_info_get_ieee_address(zb_end_dev_info_h handle, zb_ieee_addr addr * @retval #ZIGBEE_ERROR_INVALID_PARAMETER Invalid parameter * @retval #ZIGBEE_ERROR_NOT_SUPPORTED Not supported * - * @see zb_end_dev_info_get_list() + * @see zb_get_end_dev_info_list() */ int zb_end_dev_info_get_num_of_ep(zb_end_dev_info_h handle, unsigned char *count); @@ -1131,7 +1135,7 @@ int zb_end_dev_info_get_num_of_ep(zb_end_dev_info_h handle, unsigned char *count * @retval #ZIGBEE_ERROR_INVALID_PARAMETER Invalid parameter * @retval #ZIGBEE_ERROR_NOT_SUPPORTED Not supported * - * @see zb_end_dev_info_get_list() + * @see zb_get_end_dev_info_list() # @see zb_end_dev_info_get_num_of_ep() */ int zb_end_dev_info_get_ep_list(zb_end_dev_info_h handle, zb_end_point **ep_list); @@ -1151,7 +1155,7 @@ int zb_end_dev_info_get_ep_list(zb_end_dev_info_h handle, zb_end_point **ep_list * @retval #ZIGBEE_ERROR_IO_ERROR Unexpected d-bus error * @retval #ZIGBEE_ERROR_NOT_SUPPORTED Not supported * - * @see zb_end_dev_info_get_list() + * @see zb_get_end_dev_info_list() */ int zb_end_dev_info_get_mac_capability(zb_end_dev_info_h handle, zb_zdp_mac_capability_field_e *capability); @@ -1171,7 +1175,7 @@ int zb_end_dev_info_get_mac_capability(zb_end_dev_info_h handle, * @retval #ZIGBEE_ERROR_IO_ERROR Unexpected d-bus error * @retval #ZIGBEE_ERROR_NOT_SUPPORTED Not supported * - * @see zb_end_dev_info_get_list() + * @see zb_get_end_dev_info_list() */ int zb_end_dev_info_get_alternative_pan_coordinator( zb_end_dev_info_h handle, zb_zdp_do_pan_coordinator_e *can_do_it); @@ -1192,7 +1196,7 @@ int zb_end_dev_info_get_alternative_pan_coordinator( * @retval #ZIGBEE_ERROR_IO_ERROR Unexpected d-bus error * @retval #ZIGBEE_ERROR_NOT_SUPPORTED Not supported * - * @see zb_end_dev_info_get_list() + * @see zb_get_end_dev_info_list() */ int zb_end_dev_info_get_device_id(zb_end_dev_info_h handle, zb_end_point ep, zb_device_id *deviceid); @@ -1213,7 +1217,7 @@ int zb_end_dev_info_get_device_id(zb_end_dev_info_h handle, zb_end_point ep, * @retval #ZIGBEE_ERROR_IO_ERROR Unexpected d-bus error * @retval #ZIGBEE_ERROR_NOT_SUPPORTED Not supported * - * @see zb_end_dev_info_get_list() + * @see zb_get_end_dev_info_list() */ int zb_end_dev_info_get_profile_id(zb_end_dev_info_h handle, zb_end_point ep, zb_profile_id *profileid); @@ -1233,7 +1237,7 @@ int zb_end_dev_info_get_profile_id(zb_end_dev_info_h handle, zb_end_point ep, * @retval #ZIGBEE_ERROR_IO_ERROR Unexpected d-bus error * @retval #ZIGBEE_ERROR_NOT_SUPPORTED Not supported * - * @see zb_end_dev_info_get_list() + * @see zb_get_end_dev_info_list() */ int zb_end_dev_info_get_power_source(zb_end_dev_info_h handle, zb_zdp_power_e *power_src); @@ -1253,7 +1257,7 @@ int zb_end_dev_info_get_power_source(zb_end_dev_info_h handle, * @retval #ZIGBEE_ERROR_IO_ERROR Unexpected d-bus error * @retval #ZIGBEE_ERROR_NOT_SUPPORTED Not supported * - * @see zb_end_dev_info_get_list() + * @see zb_get_end_dev_info_list() */ int zb_end_dev_info_get_security_capabilty(zb_end_dev_info_h handle, zb_zdp_security_cap_e *sec_capability); diff --git a/src/zbl-zdo.c b/src/zbl-zdo.c index 73cb5ea..b716a8c 100644 --- a/src/zbl-zdo.c +++ b/src/zbl-zdo.c @@ -20,7 +20,7 @@ #include "zbl-dbus.h" #include "zb-common.h" -API int zb_end_dev_info_get_list(zb_zigbee_h handle, int *count, +API int zb_end_dev_get_end_dev_info_list(zb_zigbee_h handle, int *count, zb_end_dev_info_h **list) { int ret; @@ -36,7 +36,7 @@ API int zb_end_dev_info_get_list(zb_zigbee_h handle, int *count, return ret; } -API int zb_end_dev_get_endpoint_list(zb_zigbee_h handle, zb_ieee_addr addr64, +API int zb_end_dev_get_ep_list(zb_zigbee_h handle, zb_ieee_addr addr64, unsigned char *count, unsigned char **ep_list) { int ret; @@ -59,7 +59,7 @@ API int zb_end_dev_get_endpoint_list(zb_zigbee_h handle, zb_ieee_addr addr64, return ret; } -API int zb_end_dev_info_get_cluster_list(zb_zigbee_h handle, zb_ieee_addr addr64, +API int zb_end_dev_get_cluster_list(zb_zigbee_h handle, zb_ieee_addr addr64, unsigned char ep, unsigned char *in_cluster_count, unsigned short **in_cluster_list, unsigned char *out_cluster_count, unsigned short **out_cluster_list) { diff --git a/test/main.c b/test/main.c index 5620512..b721676 100644 --- a/test/main.c +++ b/test/main.c @@ -801,7 +801,7 @@ static int run_get_end_dev_info_list(MManager *mm, struct menu_data *menu) zb_end_dev_info_h *list = NULL; msg(""); - ret = zb_end_dev_info_get_list( + ret = zb_end_dev_get_end_dev_info_list( handle, &count, &list @@ -855,7 +855,7 @@ static int run_get_end_dev_info_list(MManager *mm, struct menu_data *menu) list ); - msg(" - zb_end_dev_info_get_list() ret: [0x%X] [%s]", + msg(" - zb_end_dev_get_end_dev_info_list() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret)); return RET_SUCCESS; @@ -868,18 +868,18 @@ static int run_get_endpoint_list(MManager *mm, struct menu_data *menu) unsigned char count = 0; zb_end_point *ep_list = NULL; - ret = zb_end_dev_get_endpoint_list( + ret = zb_end_dev_get_ep_list( handle, dest_addr64, &count, &ep_list); if (ZIGBEE_ERROR_NONE != ret) { - msg("zb_end_dev_get_endpoint_list(%d) - FAILED!!! [%s]", + msg("zb_end_dev_get_ep_list(%d) - FAILED!!! [%s]", ret, zigbee_error_to_string(ret)); return RET_FAILURE; } - msg(" - zb_end_dev_get_endpoint_list() ret: [0x%X] [%s]", + msg(" - zb_end_dev_get_ep_list() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret)); msgb("Endpoints count [%d] : ", count); for (i = 0; i < count; i++) @@ -907,7 +907,7 @@ static int run_get_cluster_list(MManager *mm, struct menu_data *menu) if (strlen(data_endpoint) > 0) ep = (unsigned char)strtol(data_endpoint, NULL, 10); - ret = zb_end_dev_info_get_cluster_list( + ret = zb_end_dev_get_cluster_list( handle, dest_addr64, ep, @@ -916,12 +916,12 @@ static int run_get_cluster_list(MManager *mm, struct menu_data *menu) &out_count, &out_cluster_list); if (ZIGBEE_ERROR_NONE != ret) { - msg("zb_end_dev_info_get_cluster_list (%d) - FAILED!!! [%s]", + msg("zb_end_dev_get_cluster_list (%d) - FAILED!!! [%s]", ret, zigbee_error_to_string(ret)); return RET_FAILURE; } - msg(" - zb_end_dev_info_get_cluster_list() ret: [0x%X] [%s]", + msg(" - zb_end_dev_get_cluster_list() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret)); msgb("In Clusters count [%d] : ", in_count); for (i = 0; i < in_count; i++) @@ -959,13 +959,13 @@ static int run_choose_end_device_list(MManager *mm, struct menu_data *menu) if (NULL != target_list) zb_end_dev_info_list_free(target_list); - ret = zb_end_dev_info_get_list( + ret = zb_end_dev_get_end_dev_info_list( handle, &target_list_count, &target_list ); - msg(" - zb_end_dev_info_get_list() ret: [0x%X] [%s]", + msg(" - zb_end_dev_get_end_dev_info_list() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret)); msg(""); @@ -1187,9 +1187,9 @@ static struct menu_data menu_device[] = { { "5", "zb_hw_reset", NULL, run_hw_reset, NULL }, { "6", "zb_coex_start", NULL, run_coex_start, NULL }, { "7", "zb_coex_stop", NULL, run_coex_stop, NULL }, - { "8", "zb_end_dev_info_get_list", NULL, run_get_end_dev_info_list, NULL }, + { "8", "zb_end_dev_get_end_dev_info_list", NULL, run_get_end_dev_info_list, NULL }, { "9", "zb_get_endpoint_list", NULL, run_get_endpoint_list, NULL }, - { "10", "zb_end_dev_info_get_cluster_list ", _menu_get_cluster_list, NULL, NULL }, + { "10", "zb_end_dev_get_cluster_list ", _menu_get_cluster_list, NULL, NULL }, { NULL, NULL, }, }; -- 2.34.1