change ua_initialize/ua_deinitialize as public

update ua-test to show added sensor list

Signed-off-by: saerome.kim <saerome.kim@samsung.com>

1 files changed, 33 insertions, 30 deletions

diff --git a/test/uat-devices.c b/test/uat-devices.c
index 4841dc8..c026595 100644
--- a/test/uat-devices.c
+++ b/test/uat-devices.c
@@ -47,8 +47,10 @@ static char id_mobile_id[MENU_DATA_SIZE + 1] = {0,};
 static char id_user[MENU_DATA_SIZE + 1] = {0,};
 static char id_mobile_mac_type[MENU_DATA_SIZE + 1] = {0,};
 
-GSList *dev_list = NULL; /**< Device List */
-static int dev_idx = 0; /**< Found device sequence number */
+static GSList *dev_list = NULL; /**< Device List */
+static int device_count = 0; /**< Found device count */
+
+char device_id_str[MENU_DATA_SIZE + 1];
 
 static void  ___free_dev(gpointer data)
 {
@@ -66,7 +68,7 @@ static void __clear_dev_list(void)
 
 	g_slist_free_full(dev_list, ___free_dev);
 	dev_list = NULL;
-	dev_idx = 0;
+	device_count = 0;
 }
 
 static bool __foreach_registered_dev_cb(
@@ -88,11 +90,12 @@ static bool __foreach_registered_dev_cb(
 		ret = ua_device_clone(&handle, device_handle);
 		if (UA_ERROR_NONE == ret) {
 
-			msgb("[%d]", ++dev_idx);
+			msgb("[%d]", ++device_count);
 
 			ret_temp = ua_device_get_type(device, &mac_type);
+			msgr("MAC type [%d]", mac_type);
 			if (UA_ERROR_NONE == ret) {
-				msgb("%s", uat_get_sensor_string(mac_type));
+				msgb("%s", uat_get_mac_type_str(mac_type));
 			}
 
 			ret_temp = ua_device_get_os_info(handle, &ostype);
@@ -155,7 +158,7 @@ static int run_ua_device_create(
 	ret = ua_device_create(&device);
 
 	msg(" - ua_device_create() ret: [0x%X] [%s]",
-			ret, uat_get_error_string(ret));
+			ret, uat_get_error_str(ret));
 
 	return RET_SUCCESS;
 }
@@ -173,7 +176,7 @@ static int run_ua_device_destroy(
 	snprintf(sensor_type_str, MENU_DATA_SIZE, "N/A");
 
 	msg(" - ua_device_destroy() ret: [0x%X] [%s]",
-		ret, uat_get_error_string(ret));
+		ret, uat_get_error_str(ret));
 
 	return RET_SUCCESS;
 }
@@ -189,13 +192,13 @@ static int run_ua_device_set_type(
 	if (strlen(sensor_type)) {
 		mac_type= (unsigned char)strtol(sensor_type, NULL, 10);
 		snprintf(sensor_type_str, MENU_DATA_SIZE, "%s",
-			uat_get_sensor_string(mac_type));
+			uat_get_sensor_str(mac_type));
 	}
 
 	ret = ua_device_set_type(device, mac_type);
 
 	msg(" - ua_device_set_type() ret: [0x%X] [%s]",
-			ret, uat_get_error_string(ret));
+			ret, uat_get_error_str(ret));
 
 	return RET_SUCCESS;
 }
@@ -222,7 +225,7 @@ static void update_device_info(void)
 	if (UA_ERROR_NONE == ret) {
 		memset(sensor_type_str, 0, MENU_DATA_SIZE + 1);
 		snprintf(sensor_type_str, MENU_DATA_SIZE, "%s",
-			uat_get_sensor_string(mac_type));
+			uat_get_sensor_str(mac_type));
 	}
 
 	ret = ua_device_get_os_info(device, &ostype);
@@ -289,7 +292,7 @@ static int run_ua_device_set_os_info(
 	ret = ua_device_set_os_info(device, ostype);
 
 	msg(" - ua_device_set_os_info() ret: [0x%X] [%s]",
-			ret, uat_get_error_string(ret));
+			ret, uat_get_error_str(ret));
 
 	update_device_info();
 
@@ -306,7 +309,7 @@ static int run_ua_device_set_mobile_id(
 	ret = ua_device_set_mobile_id(device, mobile_id);
 
 	msg(" - ua_device_set_mobile_id() ret: [0x%X] [%s]",
-			ret, uat_get_error_string(ret));
+			ret, uat_get_error_str(ret));
 
 	update_device_info();
 
@@ -323,7 +326,7 @@ static int run_ua_device_set_mac_address(
 	ret = ua_device_set_mac_address(device, mac_address);
 
 	msg(" - ua_device_set_mac_address() ret: [0x%X] [%s]",
-			ret, uat_get_error_string(ret));
+			ret, uat_get_error_str(ret));
 
 	update_device_info();
 
@@ -346,7 +349,7 @@ static int run_ua_device_set_mac_address(
 	}
 
 	msg(" - ua_device_get_wifi_bssid() ret: [0x%X] [%s]",
-			ret, uat_get_error_string(ret));
+			ret, uat_get_error_str(ret));
 
 	update_device_info();
 
@@ -364,7 +367,7 @@ static int run_ua_device_set_wifi_ipv4_address(
 	ret = ua_device_set_wifi_ipv4_address(device, ipv4_address);
 
 	msg(" - ua_device_set_wifi_ipv4_address() ret: [0x%X] [%s]",
-			ret, uat_get_error_string(ret));
+			ret, uat_get_error_str(ret));
 
 	update_device_info();
 
@@ -381,7 +384,7 @@ static int run_ua_user_add_device(
 	ret = ua_user_add_device(user, device);
 
 	msg(" - ua_user_add_device() ret: [0x%X] [%s]",
-			ret, uat_get_error_string(ret));
+			ret, uat_get_error_str(ret));
 
 	return RET_SUCCESS;
 }
@@ -396,7 +399,7 @@ static int run_ua_user_remove_device(
 	ret = ua_user_remove_device(user, device);
 
 	msg(" - ua_user_remove_device() ret: [0x%X] [%s]",
-			ret, uat_get_error_string(ret));
+			ret, uat_get_error_str(ret));
 
 	return RET_SUCCESS;
 }
@@ -419,7 +422,7 @@ static int run_ua_device_get_handle_by_mac_address(
 	}
 
 	msg(" - ua_device_get_handle_by_mac_address() ret: [0x%X] [%s]",
-			ret, uat_get_error_string(ret));
+			ret, uat_get_error_str(ret));
 
 	return RET_SUCCESS;
 }
@@ -445,7 +448,7 @@ static int run_ua_device_get_handle_by_mobile_id(
 	}
 
 	msg(" - ua_device_get_handle_by_mobile_id() ret: [0x%X] [%s]",
-			ret, uat_get_error_string(ret));
+			ret, uat_get_error_str(ret));
 
 	return RET_SUCCESS;
 }
@@ -463,7 +466,7 @@ static int run_ua_foreach_all_registered_dev_info(
 					__foreach_registered_dev_cb, NULL);
 
 	msg(" - ua_foreach_all_registered_dev_info() ret: [0x%X] [%s]",
-		ret, uat_get_error_string(ret));
+		ret, uat_get_error_str(ret));
 
 	return RET_SUCCESS;
 }
@@ -480,7 +483,7 @@ static int run_ua_foreach_registered_dev_info_by_user(MManager *mm, struct menu_
 					__foreach_registered_dev_cb, NULL);
 
 	msg(" - ua_foreach_registered_dev_info_by_user() ret: [0x%X] [%s]",
-			ret, uat_get_error_string(ret));
+			ret, uat_get_error_str(ret));
 
 	return RET_SUCCESS;
 }
@@ -557,17 +560,17 @@ struct menu_data menu_ua_devices[] = {
 	{ "2", "ua_device_destroy",
 		NULL, run_ua_device_destroy, NULL },
 	{ "3", "ua_device_set_type",
-		menu_ua_device_type, NULL, NULL },
+		menu_ua_device_type, NULL, sensor_type_str},
 	{ "4", "ua_device_set_os_info",
-		menu_ua_os_type, NULL, NULL },
+		menu_ua_os_type, NULL, os_type_str },
 	{ "5", "ua_device_set_mobile_id",
-		menu_ua_mobile_id, NULL, NULL },
+		menu_ua_mobile_id, NULL, mobile_id },
 	{ "6", "ua_device_set_mac_address",
-		menu_ua_mac_address, NULL, NULL },
+		menu_ua_mac_address, NULL, mac_address },
 	{ "7", "ua_device_get_wifi_bssid",
 		NULL, run_ua_device_get_wifi_bssid, NULL },
 	{ "8", "ua_device_set_wifi_ipv4_address",
-		menu_ua_ipv4_address, NULL, NULL },
+		menu_ua_ipv4_address, NULL, ipv4_address },
 	{ "9", "ua_user_add_device",
 		NULL, run_ua_user_add_device, NULL },
 	{ "10", "ua_user_remove_device",
@@ -583,7 +586,7 @@ struct menu_data menu_ua_devices[] = {
 	{ NULL, NULL, },
 };
 
-static char data_choose_target[MENU_DATA_SIZE + 1] = {0,};
+char selected_dev_id_str[MENU_DATA_SIZE + 1] = {0,};
 
 static int run_choose_device_list(MManager *mm, struct menu_data *menu)
 {
@@ -599,8 +602,8 @@ static int run_select_device(MManager *mm, struct menu_data *menu)
 	int id = 0;
 	int selected_id = 0;
 
-	if (strlen(data_choose_target))
-		selected_id = (unsigned char)strtol(data_choose_target, NULL, 10);
+	if (strlen(selected_dev_id_str))
+		selected_id = (unsigned char)strtol(selected_dev_id_str, NULL, 10);
 
 	if (selected_id <= 0) {
 		msg("Please select device first");
@@ -622,7 +625,7 @@ static int run_select_device(MManager *mm, struct menu_data *menu)
 }
 
 struct menu_data menu_sel_device[] = {
-	{ "1", "Device list", NULL, run_choose_device_list, data_choose_target},
+	{ "1", "Device list", NULL, run_choose_device_list, selected_dev_id_str},
 	{ "2", "Apply", NULL, run_select_device, NULL },
 	{ NULL, NULL, },
 };