From 016a64a268856f3aa5e4a49e915012d389445b68 Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Thu, 27 Jan 2022 10:21:42 +0900 Subject: [PATCH 01/16] halapi: common: Fix wrong operation Reported-by: Seung-Woo Kim sw0312.kim@samsung.com Change-Id: I9a33513c00f772ce7f431331817199440181d83e Signed-off-by: Chanwoo Choi --- src/hal-api-conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hal-api-conf.c b/src/hal-api-conf.c index d86f03a..7bc5d55 100644 --- a/src/hal-api-conf.c +++ b/src/hal-api-conf.c @@ -72,7 +72,7 @@ static struct __hal_module_info* _get_module_info_with_library_name(enum hal_mod char *library_name_prefix = NULL; int ret; - if (!_module_hash | !library_name) + if (!_module_hash || !library_name) return NULL; tmp_info = _get_module_info(module); -- 2.7.4 From 50cafbd7a3b6e0b8c34cd998bd4e93adb56c2aac Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Wed, 26 Jan 2022 17:53:46 +0900 Subject: [PATCH 02/16] halapi: common: Fix unneeded free operation Remove the unneeded free operation because don't allocate the dynamic memory to 'info->abi_versions'. Change-Id: I2fc146b7e2ddd03be4c390a832c5a1e0de786b3a Suggested-by: Taemin Yeom Signed-off-by: Chanwoo Choi --- src/hal-api-conf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/hal-api-conf.c b/src/hal-api-conf.c index 7bc5d55..c79e7de 100644 --- a/src/hal-api-conf.c +++ b/src/hal-api-conf.c @@ -52,7 +52,6 @@ do { \ SAFE_FREE_AND_NULL(info->library_name); SAFE_FREE_AND_NULL(info->library_name_64bit); SAFE_FREE_AND_NULL(info->symbol_name); - SAFE_FREE_AND_NULL(info->abi_versions); SAFE_FREE_AND_NULL(info); } } -- 2.7.4 From d54144d59f16886671630c50426dc1d8388cf299 Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Wed, 16 Feb 2022 18:22:38 +0900 Subject: [PATCH 03/16] hal-api: common: Update current ABI verion by HAL_ABI_VERSION_TIZEN_7_0 Update current ABI verion by HAL_ABI_VERSION_TIZEN_7_0 I expect the all modules will be compatible with between HAL_ABI_VERSION_TIZEN_6_5 and HAL_ABI_VERSION_TIZEN_7_0. If not compatible between HAL_ABI_VERSION_TIZEN_6_5 and HAL_ABI_VERSION_TIZEN_7_0, it should be edited by module owner. Change-Id: I03f47ad66895f1311d60760fb1833c2dfd4b2e70 Reported-by: Taemin Yeom Signed-off-by: Chanwoo Choi --- src/hal-api-list.h | 56 +++++++++++++++++++++++----------------------- tests/unittest/test_hal.cc | 54 ++++++++++++++++++++++---------------------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/hal-api-list.h b/src/hal-api-list.h index f86b50f..967caaa 100644 --- a/src/hal-api-list.h +++ b/src/hal-api-list.h @@ -23,21 +23,21 @@ #define HAL_ABI_VERSION_MAX 10 -enum hal_abi_version g_platform_curr_abi_version = HAL_ABI_VERSION_TIZEN_6_5; +enum hal_abi_version g_platform_curr_abi_version = HAL_ABI_VERSION_TIZEN_7_0; static struct hal_abi_version_match abi_version_match_data[HAL_MODULE_END][HAL_ABI_VERSION_MAX] = { /* HAL_GROUP_GRAPHICS */ [HAL_MODULE_TBM] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_TDM] = { /* FIXME: Need to be filled from configuration file. */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, @@ -58,21 +58,21 @@ static struct hal_abi_version_match abi_version_match_data[HAL_MODULE_END][HAL_A [HAL_MODULE_AUDIO] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_CAMERA] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_RADIO] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, @@ -99,14 +99,14 @@ static struct hal_abi_version_match abi_version_match_data[HAL_MODULE_END][HAL_A [HAL_MODULE_BLUETOOTH] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_WIFI] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, @@ -115,21 +115,21 @@ static struct hal_abi_version_match abi_version_match_data[HAL_MODULE_END][HAL_A [HAL_MODULE_NFC] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_ZIGBEE] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_UWB] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, @@ -144,7 +144,7 @@ static struct hal_abi_version_match abi_version_match_data[HAL_MODULE_END][HAL_A [HAL_MODULE_TELEPHONY] = { /* FIXME: Need to be determined whehter support HAL API or not. */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, @@ -153,7 +153,7 @@ static struct hal_abi_version_match abi_version_match_data[HAL_MODULE_END][HAL_A [HAL_MODULE_LOCATION] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, @@ -164,21 +164,21 @@ static struct hal_abi_version_match abi_version_match_data[HAL_MODULE_END][HAL_A [HAL_MODULE_POWER] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_SENSOR] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_PERIPHERAL] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, @@ -186,84 +186,84 @@ static struct hal_abi_version_match abi_version_match_data[HAL_MODULE_END][HAL_A [HAL_MODULE_DEVICE_BATTERY] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_BEZEL] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_DISPLAY] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_IR] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_TOUCHSCREEN] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_LED] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_BOARD] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_EXTERNAL_CONNECTION] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_THERMAL] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_USB_GADGET] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_HAPTIC] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_MEMORY] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, diff --git a/tests/unittest/test_hal.cc b/tests/unittest/test_hal.cc index f893c09..639ced4 100644 --- a/tests/unittest/test_hal.cc +++ b/tests/unittest/test_hal.cc @@ -55,10 +55,10 @@ TEST(CommonHaltest, test_symbol_name_invalid_module) { TEST(CommonHaltest, test_check_backend_abi_version_invalid_parameter) { int ret; - ret = hal_common_check_backend_abi_version(HAL_MODULE_UNKNOWN, HAL_ABI_VERSION_TIZEN_6_5); + ret = hal_common_check_backend_abi_version(HAL_MODULE_UNKNOWN, HAL_ABI_VERSION_TIZEN_7_0); EXPECT_EQ(ret, TIZEN_ERROR_INVALID_PARAMETER); - ret = hal_common_check_backend_abi_version(HAL_MODULE_END, HAL_ABI_VERSION_TIZEN_6_5); + ret = hal_common_check_backend_abi_version(HAL_MODULE_END, HAL_ABI_VERSION_TIZEN_7_0); EXPECT_EQ(ret, TIZEN_ERROR_INVALID_PARAMETER); ret = hal_common_check_backend_abi_version(HAL_MODULE_TBM, HAL_ABI_VERSION_UNKNOWN); @@ -103,7 +103,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_TBM", "/hal/lib/libhal-backend-tbm.so", "/hal/lib64/libhal-backend-tbm.so", "hal_backend_tbm_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -112,7 +112,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_TDM", "/hal/lib/libhal-backend-tdm.so", "/hal/lib64/libhal-backend-tdm.so", "hal_backend_tdm_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -127,7 +127,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_AUDIO", "/hal/lib/libhal-backend-audio.so", "/hal/lib64/libhal-backend-audio.so", "hal_backend_audio_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -136,7 +136,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_CAMERA", "/hal/lib/libhal-backend-camera.so", "/hal/lib64/libhal-backend-camera.so", "hal_backend_camera_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -145,7 +145,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_RADIO", "/hal/lib/libhal-backend-radio.so", "/hal/lib64/libhal-backend-radio.so", "hal_backend_radio_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -163,7 +163,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_BLUETOOTH", "/hal/lib/libhal-backend-bluetooth.so", "/hal/lib64/libhal-backend-bluetooth.so", "hal_backend_bluetooth_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -172,7 +172,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_WIFI", "/hal/lib/libhal-backend-wifi.so", "/hal/lib64/libhal-backend-wifi.so", "hal_backend_wifi_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -184,7 +184,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_NFC", "/hal/lib/libhal-backend-nfc.so", "/hal/lib64/libhal-backend-nfc.so", "hal_backend_nfc_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -193,7 +193,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_ZIGBEE", "/hal/lib/libhal-backend-zigbee.so", "/hal/lib64/libhal-backend-zigbee.so", "hal_backend_zigbee_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -202,7 +202,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_UWB", "/hal/lib/libhal-backend-uwb.so", "/hal/lib64/libhal-backend-uwb.so", "hal_backend_uwb_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -217,7 +217,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_LOCATION", "/hal/lib/libhal-backend-location.so", "/hal/lib64/libhal-backend-location.so", "hal_backend_location_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -229,7 +229,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_POWER", "/hal/lib/libhal-backend-power.so", "/hal/lib64/libhal-backend-power.so", "hal_backend_power_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -238,7 +238,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_SENSOR", "/hal/lib/libhal-backend-sensor.so", "/hal/lib64/libhal-backend-sensor.so", "hal_backend_sensor_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -250,7 +250,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_DEVICE_BATTERY", "/hal/lib/libhal-backend-device-battery.so", "/hal/lib64/libhal-backend-device-battery.so", "hal_backend_device_battery_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -259,7 +259,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_DEVICE_BEZEL", "/hal/lib/libhal-backend-device-bezel.so", "/hal/lib64/libhal-backend-device-bezel.so", "hal_backend_device_bezel_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -268,7 +268,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_DEVICE_DISPLAY", "/hal/lib/libhal-backend-device-display.so", "/hal/lib64/libhal-backend-device-display.so", "hal_backend_device_display_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -277,7 +277,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_DEVICE_IR", "/hal/lib/libhal-backend-device-ir.so", "/hal/lib64/libhal-backend-device-ir.so", "hal_backend_device_ir_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -286,7 +286,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_DEVICE_TOUCHSCREEN", "/hal/lib/libhal-backend-device-touchscreen.so", "/hal/lib64/libhal-backend-device-touchscreen.so", "hal_backend_device_touchscreen_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -295,7 +295,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_DEVICE_LED", "/hal/lib/libhal-backend-device-led.so", "/hal/lib64/libhal-backend-device-led.so", "hal_backend_device_led_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -304,7 +304,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_DEVICE_BOARD", "/hal/lib/libhal-backend-device-board.so", "/hal/lib64/libhal-backend-device-board.so", "hal_backend_device_board_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -313,7 +313,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_DEVICE_EXTERNAL_CONNECTION", "/hal/lib/libhal-backend-device-external-connection.so", "/hal/lib64/libhal-backend-device-external-connection.so", "hal_backend_device_external_connection_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -322,7 +322,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_DEVICE_THERMAL", "/hal/lib/libhal-backend-device-thermal.so", "/hal/lib64/libhal-backend-device-thermal.so", "hal_backend_device_thermal_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -331,7 +331,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_DEVICE_USB_GADGET", "/hal/lib/libhal-backend-device-usb-gadget.so", "/hal/lib64/libhal-backend-device-usb-gadget.so", "hal_backend_device_usb_gadget_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -340,7 +340,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_DEVICE_HAPTIC", "/hal/lib/libhal-backend-device-haptic.so", "/hal/lib64/libhal-backend-device-haptic.so", "hal_backend_device_haptic_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -349,7 +349,7 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, "HAL_MODULE_DEVICE_MEMORY", "/hal/lib/libhal-backend-device-memory.so", "/hal/lib64/libhal-backend-device-memory.so", "hal_backend_device_memory_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ) -- 2.7.4 From 8d2c5927106bcb469028b40b50b45470e3fee352 Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Tue, 22 Mar 2022 20:02:55 +0900 Subject: [PATCH 04/16] halapi: common: Remove unused json-c dependency Change-Id: I38a9f5d183e46f2ebee8504d5b2f06f98d79f8b1 Signed-off-by: Chanwoo Choi --- CMakeLists.txt | 2 - packaging/hal-api-common.spec | 1 - packaging/hal-api.json | 484 ------------------------------------------ src/hal-api-conf.c | 4 - src/hal-api-conf.h | 2 - 5 files changed, 493 deletions(-) delete mode 100644 packaging/hal-api.json diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a318e9..5979e5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,13 +19,11 @@ SET(PKG_MODULES dlog gio-2.0 glib-2.0 - json-c ) else() SET(PKG_MODULES gio-2.0 glib-2.0 - json-c ) endif() diff --git a/packaging/hal-api-common.spec b/packaging/hal-api-common.spec index 9889717..0163bc4 100644 --- a/packaging/hal-api-common.spec +++ b/packaging/hal-api-common.spec @@ -26,7 +26,6 @@ BuildRequires: cmake BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(json-c) BuildRequires: pkgconfig(gmock) BuildRequires: pkgconfig(systemd) diff --git a/packaging/hal-api.json b/packaging/hal-api.json deleted file mode 100644 index fe30ac6..0000000 --- a/packaging/hal-api.json +++ /dev/null @@ -1,484 +0,0 @@ -{ - "PLATFORM_ABI_VERSION" :"HAL_ABI_VERSION_TIZEN_6_5", - "MODULE_INFO" : - [ - { - "group" :"HAL_GROUP_GRAPHICS", - "module" :"HAL_MODULE_TBM", - "backend_module" :"tbm", - "license" :"MIT", - "library_name" :"/hal/lib/libhal-backend-tbm.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-tbm.so", - "symbol_name" :"hal_backend_tbm_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_GRAPHICS", - "module" :"HAL_MODULE_TDM", - "backend_module" :"tdm", - "license" :"MIT", - "library_name" :"/hal/lib/libhal-backend-tdm.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-tdm.so", - "symbol_name" :"hal_backend_tdm_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_GRAPHICS", - "module" :"HAL_MODULE_COREGL", - "backend_module" :null, - "license" :"UNKNOWN", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - }, - { - "group" :"HAL_GROUP_GRAPHICS", - "module" :"HAL_MODULE_INPUT", - "backend_module" :null, - "license" :"MIT", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - - }, - { - "group" :"HAL_GROUP_MULTIMEDIA", - "module" :"HAL_MODULE_AUDIO", - "backend_module" :"audio", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-audio.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-audio.so", - "symbol_name" :"hal_backend_audio_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_MULTIMEDIA", - "module" :"HAL_MODULE_CAMERA", - "backend_module" :"camera", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-camera.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-camera.so", - "symbol_name" :"hal_backend_camera_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_MULTIMEDIA", - "module" :"HAL_MODULE_RADIO", - "backend_module" :"radio", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-radio.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-radio.so", - "symbol_name" :"hal_backend_radio_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_MULTIMEDIA", - "module" :"HAL_MODULE_CODEC", - "backend_module" :null, - "license" :"APACHE_2_0", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - }, - { - "group" :"HAL_GROUP_MULTIMEDIA", - "module" :"HAL_MODULE_USB_AUDIO", - "backend_module" :null, - "license" :"APACHE_2_0", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - }, - { - "group" :"HAL_GROUP_MULTIMEDIA", - "module" :"HAL_MODULE_ALSAUCM", - "backend_module" :null, - "license" :"APACHE_2_0", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - }, - { - "group" :"HAL_GROUP_CONNECTIVITY", - "module" :"HAL_MODULE_BLUETOOTH", - "backend_module" :"bluetooth", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-bluetooth.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-bluetooth.so", - "symbol_name" :"hal_backend_bluetooth_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_CONNECTIVITY", - "module" :"HAL_MODULE_WIFI", - "backend_module" :"wifi", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-wifi.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-wifi.so", - "symbol_name" :"hal_backend_wifi_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_CONNECTIVITY", - "module" :"HAL_MODULE_NAN", - "backend_module" :null, - "license" :"APACHE_2_0", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - }, - { - "group" :"HAL_GROUP_CONNECTIVITY", - "module" :"HAL_MODULE_NFC", - "backend_module" :"nfc", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-nfc.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-nfc.so", - "symbol_name" :"hal_backend_nfc_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_CONNECTIVITY", - "module" :"HAL_MODULE_ZIGBEE", - "backend_module" :"zigbee", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-zigbee.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-zigbee.so", - "symbol_name" :"hal_backend_zigbee_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - - }, - { - "group" :"HAL_GROUP_CONNECTIVITY", - "module" :"HAL_MODULE_UWB", - "backend_module" :"uwb", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-uwb.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-uwb.so", - "symbol_name" :"hal_backend_uwb_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_CONNECTIVITY", - "module" :"HAL_MODULE_MTP", - "backend_module" :null, - "license" :"APACHE_2_0", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - }, - - { - "group" :"HAL_GROUP_TELEPHONY", - "module" :"HAL_MODULE_TELEPHONY", - "backend_module" :null, - "license" :"APACHE_2_0", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - }, - { - "group" :"HAL_GROUP_LOCATION", - "module" :"HAL_MODULE_LOCATION", - "backend_module" :"location", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-location.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-location.so", - "symbol_name" :"hal_backend_location_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_COMMON", - "backend_module" :null, - "license" :"APACHE_2_0", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_POWER", - "backend_module" :"power", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-power.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-power.so", - "symbol_name" :"hal_backend_power_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_SENSOR", - "backend_module" :"sensor", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-sensor.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-sensor.so", - "symbol_name" :"hal_backend_sensor_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_PERIPHERAL", - "backend_module" :null, - "license" :"APACHE_2_0", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_BATTERY", - "backend_module" :"device-battery", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-battery.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-battery.so", - "symbol_name" :"hal_backend_device_battery_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_BEZEL", - "backend_module" :"device-bezel", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-bezel.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-bezel.so", - "symbol_name" :"hal_backend_device_bezel_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_DISPLAY", - "backend_module" :"device-display", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-display.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-display.so", - "symbol_name" :"hal_backend_device_display_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_IR", - "backend_module" :"device-ir", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-ir.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-ir.so", - "symbol_name" :"hal_backend_device_ir_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_TOUCHSCREEN", - "backend_module" :"device-touchscreen", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-touchscreen.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-touchscreen.so", - "symbol_name" :"hal_backend_device_touchscreen_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_LED", - "backend_module" :"device-led", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-led.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-led.so", - "symbol_name" :"hal_backend_device_led_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_BOARD", - "backend_module" :"device-board", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-board.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-board.so", - "symbol_name" :"hal_backend_device_board_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_EXTERNAL_CONNECTION", - "backend_module" :"device-external-connection", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-external-connection.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-external-connection.so", - "symbol_name" :"hal_backend_device_external_connection_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_THERMAL", - "backend_module" :"device-thermal", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-thermal.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-thermal.so", - "symbol_name" :"hal_backend_device_thermal_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_USB_GADGET", - "backend_module" :"device-usb-gadget", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-usb-gadget.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-usb-gadget.so", - "symbol_name" :"hal_backend_device_usb_gadget_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_HAPTIC", - "backend_module" :"device-haptic", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-haptic.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-haptic.so", - "symbol_name" :"hal_backend_device_haptic_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_MEMORY", - "backend_module" :"device-memory", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-memory.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-memory.so", - "symbol_name" :"hal_backend_device_memory_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - } - ] -} diff --git a/src/hal-api-conf.c b/src/hal-api-conf.c index c79e7de..a3c6c25 100644 --- a/src/hal-api-conf.c +++ b/src/hal-api-conf.c @@ -19,9 +19,6 @@ #include #include -#include -#include - #include "hal-common.h" #include "hal-common-interface.h" @@ -65,7 +62,6 @@ static struct __hal_module_info* _get_module_info_with_library_name(enum hal_mod const char *library_name) { struct __hal_module_info *info = NULL, *new_info = NULL, *tmp_info = NULL; - json_object *module_array_object = NULL; const char *group_name = NULL; const char *module_name = NULL; char *library_name_prefix = NULL; diff --git a/src/hal-api-conf.h b/src/hal-api-conf.h index a87f76a..e77edc0 100644 --- a/src/hal-api-conf.h +++ b/src/hal-api-conf.h @@ -26,8 +26,6 @@ extern "C" { #endif -#define HAL_CONFIGURATION_PATH "/etc/hal/hal-api.json" - int _hal_api_conf_init(void); void _hal_api_conf_exit(void); -- 2.7.4 From 4194c83be909f84971eed6dc5b18b7f0871563ff Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Wed, 20 Apr 2022 20:16:11 +0900 Subject: [PATCH 05/16] hal-api: common: Add support of __x86_64__ architecture If architecture type is __x86_64__, use /hal/lib64 path. Change-Id: Ifee4aebb8a86a4f3ecfe2053b027d20288008067 Reported-by: Sungguk Na Signed-off-by: Chanwoo Choi --- src/common.h | 2 +- src/hal-api-common.c | 2 +- src/hal-api-conf.c | 2 +- tests/unittest/test_hal.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common.h b/src/common.h index 4a89747..93f7090 100644 --- a/src/common.h +++ b/src/common.h @@ -118,7 +118,7 @@ static inline const char* get_backend_library_name(struct __hal_module_info *inf if (!info) return NULL; -#if defined(__aarch64__) +#if defined(__aarch64__) || defined(__x86_64__) return info->library_name_64bit; #else return info->library_name; diff --git a/src/hal-api-common.c b/src/hal-api-common.c index 22c50e8..db73891 100644 --- a/src/hal-api-common.c +++ b/src/hal-api-common.c @@ -610,7 +610,7 @@ static int __get_backend_library_data(enum hal_module module, DIR *dir; char *backend_module_name = NULL; int count, i, ret, len; -#if defined(__aarch64__) +#if defined(__aarch64__) || defined(__x86_64__) const char hal_backend_path[] = "/hal/lib64"; #else const char hal_backend_path[] = "/hal/lib"; diff --git a/src/hal-api-conf.c b/src/hal-api-conf.c index a3c6c25..9495d3b 100644 --- a/src/hal-api-conf.c +++ b/src/hal-api-conf.c @@ -118,7 +118,7 @@ static struct __hal_module_info* _get_module_info_with_library_name(enum hal_mod new_info->module = info->module; new_info->license = info->license; new_info->module_name = g_strdup(info->module_name); -#if defined(__aarch64__) +#if defined(__aarch64__) || defined(__x86_64__) new_info->library_name_64bit = g_strdup_printf("/hal/lib64/%s", library_name); #else new_info->library_name = g_strdup_printf("/hal/lib/%s", library_name); diff --git a/tests/unittest/test_hal.cc b/tests/unittest/test_hal.cc index 639ced4..7d2a583 100644 --- a/tests/unittest/test_hal.cc +++ b/tests/unittest/test_hal.cc @@ -362,7 +362,7 @@ TEST_P(HalInfoMatchedTest, get_backend_library_name) { ret = hal_common_get_backend_library_name(info.module_, ret_library_name, MAX_BUFF); EXPECT_TRUE(ret == TIZEN_ERROR_NONE); -#if defined(__aarch64__) +#if defined(__aarch64__) || defined(__x86_64__) EXPECT_STREQ(info.library_name_64bit_, ret_library_name) << "module name is " << info.module_name_; #else EXPECT_STREQ(info.library_name_, ret_library_name) << "module name is " << info.module_name_; -- 2.7.4 From 6a021caf4d70242b6430fa30262f8151e1408735 Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Thu, 21 Apr 2022 17:01:07 +0900 Subject: [PATCH 06/16] hal-api: common: Check value validation for current platform HAL ABI version Change-Id: I0b6cf1627f992acc47532553b3588342f58990b6 Signed-off-by: Chanwoo Choi --- src/hal-api-common.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/hal-api-common.c b/src/hal-api-common.c index db73891..8273b72 100644 --- a/src/hal-api-common.c +++ b/src/hal-api-common.c @@ -537,6 +537,15 @@ int hal_common_check_backend_abi_version(enum hal_module module, } g_platform_curr_abi_version = _hal_api_conf_get_platform_abi_version(); + + if (g_platform_curr_abi_version <= HAL_ABI_VERSION_UNKNOWN + || g_platform_curr_abi_version >= HAL_ABI_VERSION_END) { + _E("Invalid paramer of current HAL ABI version(%d)(%d)\n", + g_platform_curr_abi_version, module); + ret = -EINVAL; + goto out; + } + for (i = 0; i < info->num_abi_versions; i++) { struct hal_abi_version_match *data = &info->abi_versions[i]; -- 2.7.4 From 175382cccc42c2a81d4ada13f873a672199760e3 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Fri, 3 Jun 2022 14:06:04 +0900 Subject: [PATCH 07/16] hal-rpmdb-checker: Fix comment about hal info file The hal info file path is /hal/etc/hal-info.ini. Fix the file path from comment. Change-Id: I8c8eabefe666872056e1de2b9d87a1976651367e Signed-off-by: Seung-Woo Kim --- packaging/hal-rpmdb-checker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/hal-rpmdb-checker b/packaging/hal-rpmdb-checker index ed11f83..a4cd400 100755 --- a/packaging/hal-rpmdb-checker +++ b/packaging/hal-rpmdb-checker @@ -98,7 +98,7 @@ get_hal_img_version() { return fi - # Get hal_img_version from /hal/etc/info.ini + # Get hal_img_version from /hal/etc/hal-info.ini tmp=`cat $HAL_IMG_INFO_FILE_PATH | grep Build=` hal_img_version=`echo ${tmp:6}` -- 2.7.4 From 13205503e73b487a5578ff19631bd8d17eff0feb Mon Sep 17 00:00:00 2001 From: Youngjae Cho Date: Wed, 15 Jun 2022 13:25:37 +0900 Subject: [PATCH 08/16] hal-api: common: Do not treat "No such file or directory" as error log There might be an environment that naturally has no hal backend. For the environment, changed log level to info so that not to be confused as an error. Change-Id: Ia458d7ec6c5bc89cbe58a35df0f7d6343bceae66 Signed-off-by: Youngjae Cho --- src/hal-api-common.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/hal-api-common.c b/src/hal-api-common.c index 8273b72..d11226b 100644 --- a/src/hal-api-common.c +++ b/src/hal-api-common.c @@ -18,6 +18,7 @@ #include #include +#include #include #include #include @@ -146,6 +147,11 @@ static int __open_backend(struct __hal_module_info *info) info->module_name); ret = -EINVAL; goto err; + } else if (access(backend_library_name, F_OK) == -1) { + _I("%s: There is no backend library\n", + info->module_name); + ret = -ENOENT; + goto err; } if (!info->symbol_name) { @@ -292,12 +298,8 @@ static int __get_backend(enum hal_module module, void **data, } ret = __open_backend(info); - if (ret < 0) { - _E("%s: Failed to get the backend library by dlopen\n", - info->module_name); - ret = -EINVAL; + if (ret < 0) goto err; - } ret = __init_backend(info, data, NULL); if (ret < 0) { @@ -414,12 +416,8 @@ static int __get_backend_data(enum hal_module module, unsigned int *abi_version, } ret = __open_backend(info); - if (ret < 0) { - _E("%s: Failed to get the backend library by dlopen\n", - info->module_name); - ret = -EINVAL; + if (ret < 0) goto err_conf_exit; - } /* Return abi_verion of hal_backend structure */ if (!name_size && !vendor_size) { -- 2.7.4 From aea5e570480aaa3b3ab07281470c1ae33e934840 Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Thu, 16 Jun 2022 10:11:15 +0900 Subject: [PATCH 09/16] tests: unittests: Rename to test-hal-api-common.cc for using correct name test_hal.cc contains the test code of hal-api-common funcitons. In order to pass the correct meaning of file, rename from test_hal.cc to test-hal-api-common.cc. Also, rename from test_main.cc to test-main.cc by using '-' instead of '_'. Change-Id: Ibf8dd8aebb24ea231b87e4fb7ebad98c01afcd91 Signed-off-by: Chanwoo Choi --- tests/unittest/{test_hal.cc => test-hal-api-common.cc} | 0 tests/unittest/{test_main.cc => test-main.cc} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename tests/unittest/{test_hal.cc => test-hal-api-common.cc} (100%) rename tests/unittest/{test_main.cc => test-main.cc} (100%) diff --git a/tests/unittest/test_hal.cc b/tests/unittest/test-hal-api-common.cc similarity index 100% rename from tests/unittest/test_hal.cc rename to tests/unittest/test-hal-api-common.cc diff --git a/tests/unittest/test_main.cc b/tests/unittest/test-main.cc similarity index 100% rename from tests/unittest/test_main.cc rename to tests/unittest/test-main.cc -- 2.7.4 From 9bb9465cb0022aba4e5b5d524dca05143b4cd97e Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Mon, 13 Jun 2022 18:29:25 +0900 Subject: [PATCH 10/16] tests: unittest: Use tab for indentaion instead of space In order to improve the readability and keep the consistent indentation style, use tab instead of space. Change-Id: Ie8fb6167484dc6fa7e0daa5b395c8a83f9d0b7e0 Signed-off-by: Chanwoo Choi --- tests/unittest/test-hal-api-common.cc | 875 ++++++++++++++++++++-------------- tests/unittest/test-main.cc | 26 +- 2 files changed, 536 insertions(+), 365 deletions(-) diff --git a/tests/unittest/test-hal-api-common.cc b/tests/unittest/test-hal-api-common.cc index 7d2a583..acc07eb 100644 --- a/tests/unittest/test-hal-api-common.cc +++ b/tests/unittest/test-hal-api-common.cc @@ -33,406 +33,577 @@ using namespace std; class CommonHaltest : public testing::Test { - public: - CommonHaltest() {} - virtual ~CommonHaltest() {} - virtual void SetUp() {} - virtual void TearDown() {} + public: + CommonHaltest() {} + virtual ~CommonHaltest() {} + virtual void SetUp() {} + virtual void TearDown() {} }; TEST(CommonHaltest, test_symbol_name_invalid_module) { - char ret_unknown[MAX_BUFF] = {0, }; - char ret_end[MAX_BUFF] = {0, }; - int ret; + char ret_unknown[MAX_BUFF] = {0, }; + char ret_end[MAX_BUFF] = {0, }; + int ret; - ret = hal_common_get_backend_symbol_name(HAL_MODULE_UNKNOWN, ret_unknown, MAX_BUFF); - EXPECT_TRUE(ret != TIZEN_ERROR_NONE); + ret = hal_common_get_backend_symbol_name(HAL_MODULE_UNKNOWN, ret_unknown, MAX_BUFF); + EXPECT_TRUE(ret != TIZEN_ERROR_NONE); - ret = hal_common_get_backend_symbol_name(HAL_MODULE_UNKNOWN, ret_end, MAX_BUFF); - EXPECT_TRUE(ret != TIZEN_ERROR_NONE); + ret = hal_common_get_backend_symbol_name(HAL_MODULE_UNKNOWN, ret_end, MAX_BUFF); + EXPECT_TRUE(ret != TIZEN_ERROR_NONE); } TEST(CommonHaltest, test_check_backend_abi_version_invalid_parameter) { - int ret; + int ret; - ret = hal_common_check_backend_abi_version(HAL_MODULE_UNKNOWN, HAL_ABI_VERSION_TIZEN_7_0); - EXPECT_EQ(ret, TIZEN_ERROR_INVALID_PARAMETER); + ret = hal_common_check_backend_abi_version(HAL_MODULE_UNKNOWN, HAL_ABI_VERSION_TIZEN_7_0); + EXPECT_EQ(ret, TIZEN_ERROR_INVALID_PARAMETER); - ret = hal_common_check_backend_abi_version(HAL_MODULE_END, HAL_ABI_VERSION_TIZEN_7_0); - EXPECT_EQ(ret, TIZEN_ERROR_INVALID_PARAMETER); + ret = hal_common_check_backend_abi_version(HAL_MODULE_END, HAL_ABI_VERSION_TIZEN_7_0); + EXPECT_EQ(ret, TIZEN_ERROR_INVALID_PARAMETER); - ret = hal_common_check_backend_abi_version(HAL_MODULE_TBM, HAL_ABI_VERSION_UNKNOWN); - EXPECT_EQ(ret, TIZEN_ERROR_INVALID_PARAMETER); + ret = hal_common_check_backend_abi_version(HAL_MODULE_TBM, HAL_ABI_VERSION_UNKNOWN); + EXPECT_EQ(ret, TIZEN_ERROR_INVALID_PARAMETER); - ret = hal_common_check_backend_abi_version(HAL_MODULE_TBM, HAL_ABI_VERSION_END); - EXPECT_EQ(ret, TIZEN_ERROR_INVALID_PARAMETER); + ret = hal_common_check_backend_abi_version(HAL_MODULE_TBM, HAL_ABI_VERSION_END); + EXPECT_EQ(ret, TIZEN_ERROR_INVALID_PARAMETER); } TEST(CommonHaltest, get_backend_library_name_unknown) { - char ret_name[MAX_BUFF] = {0, }; - int ret = hal_common_get_backend_library_name(HAL_MODULE_UNKNOWN, ret_name, MAX_BUFF); - EXPECT_TRUE(ret != TIZEN_ERROR_NONE); + char ret_name[MAX_BUFF] = {0, }; + int ret = hal_common_get_backend_library_name(HAL_MODULE_UNKNOWN, ret_name, MAX_BUFF); + EXPECT_TRUE(ret != TIZEN_ERROR_NONE); } class HalInfo { -public: - enum hal_module module_; - enum hal_group group_; - enum hal_license license_; - const char *module_name_; - const char *library_name_; - const char *library_name_64bit_; - const char *symbol_name_; - vector versions_; - - HalInfo(enum hal_module module, enum hal_group group, enum hal_license license, - const char *module_name, const char *library_name, const char *library_name_64bit, - const char *symbol_name, vector versions) : - module_(module), group_(group), license_(license), - module_name_(module_name), library_name_(library_name), - library_name_64bit_(library_name_64bit), symbol_name_(symbol_name), - versions_(versions) {} + public: + enum hal_module module_; + enum hal_group group_; + enum hal_license license_; + const char *module_name_; + const char *library_name_; + const char *library_name_64bit_; + const char *symbol_name_; + vector versions_; + + HalInfo(enum hal_module module, + enum hal_group group, + enum hal_license license, + const char *module_name, + const char *library_name, + const char *library_name_64bit, + const char *symbol_name, + vector versions) : + module_(module), group_(group), license_(license), + module_name_(module_name), library_name_(library_name), + library_name_64bit_(library_name_64bit), symbol_name_(symbol_name), + versions_(versions) {} }; class HalInfoMatchedTest : public ::testing::TestWithParam {}; INSTANTIATE_TEST_CASE_P(CommonHaltest, - HalInfoMatchedTest, - ::testing::Values( - HalInfo(HAL_MODULE_TBM, HAL_GROUP_GRAPHICS, HAL_LICENSE_MIT, - "HAL_MODULE_TBM", "/hal/lib/libhal-backend-tbm.so", - "/hal/lib64/libhal-backend-tbm.so", "hal_backend_tbm_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_TDM, HAL_GROUP_GRAPHICS, HAL_LICENSE_MIT, - "HAL_MODULE_TDM", "/hal/lib/libhal-backend-tdm.so", - "/hal/lib64/libhal-backend-tdm.so", "hal_backend_tdm_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_COREGL, HAL_GROUP_GRAPHICS, HAL_LICENSE_UNKNOWN, - "HAL_MODULE_COREGL", "", "", "", {}), - - HalInfo(HAL_MODULE_INPUT, HAL_GROUP_GRAPHICS, HAL_LICENSE_MIT, - "HAL_MODULE_INPUT", "", "", "", {}), - - HalInfo(HAL_MODULE_AUDIO, HAL_GROUP_MULTIMEDIA, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_AUDIO", "/hal/lib/libhal-backend-audio.so", - "/hal/lib64/libhal-backend-audio.so", "hal_backend_audio_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_CAMERA, HAL_GROUP_MULTIMEDIA, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_CAMERA", "/hal/lib/libhal-backend-camera.so", - "/hal/lib64/libhal-backend-camera.so", "hal_backend_camera_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_RADIO, HAL_GROUP_MULTIMEDIA, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_RADIO", "/hal/lib/libhal-backend-radio.so", - "/hal/lib64/libhal-backend-radio.so", "hal_backend_radio_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_CODEC, HAL_GROUP_MULTIMEDIA, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_CODEC", "", "", "", {}), - - HalInfo(HAL_MODULE_USB_AUDIO, HAL_GROUP_MULTIMEDIA, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_USB_AUDIO", "", "", "", {}), - - HalInfo(HAL_MODULE_ALSAUCM, HAL_GROUP_MULTIMEDIA, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_ALSAUCM", "", "", "", {}), - - HalInfo(HAL_MODULE_BLUETOOTH, HAL_GROUP_CONNECTIVITY, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_BLUETOOTH", "/hal/lib/libhal-backend-bluetooth.so", - "/hal/lib64/libhal-backend-bluetooth.so", "hal_backend_bluetooth_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_WIFI, HAL_GROUP_CONNECTIVITY, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_WIFI", "/hal/lib/libhal-backend-wifi.so", - "/hal/lib64/libhal-backend-wifi.so", "hal_backend_wifi_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_NAN, HAL_GROUP_CONNECTIVITY, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_NAN", "", "", "", {}), - - HalInfo(HAL_MODULE_NFC, HAL_GROUP_CONNECTIVITY, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_NFC", "/hal/lib/libhal-backend-nfc.so", - "/hal/lib64/libhal-backend-nfc.so", "hal_backend_nfc_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_ZIGBEE, HAL_GROUP_CONNECTIVITY, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_ZIGBEE", "/hal/lib/libhal-backend-zigbee.so", - "/hal/lib64/libhal-backend-zigbee.so", "hal_backend_zigbee_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_UWB, HAL_GROUP_CONNECTIVITY, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_UWB", "/hal/lib/libhal-backend-uwb.so", - "/hal/lib64/libhal-backend-uwb.so", "hal_backend_uwb_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_MTP, HAL_GROUP_CONNECTIVITY, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_MTP", "", "", "", {}), - - HalInfo(HAL_MODULE_TELEPHONY, HAL_GROUP_TELEPHONY, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_TELEPHONY", "", "", "", {}), - - HalInfo(HAL_MODULE_LOCATION, HAL_GROUP_LOCATION, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_LOCATION", "/hal/lib/libhal-backend-location.so", - "/hal/lib64/libhal-backend-location.so", "hal_backend_location_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_COMMON, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_COMMON", "", "", "", {}), - - HalInfo(HAL_MODULE_POWER, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_POWER", "/hal/lib/libhal-backend-power.so", - "/hal/lib64/libhal-backend-power.so", "hal_backend_power_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_SENSOR, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_SENSOR", "/hal/lib/libhal-backend-sensor.so", - "/hal/lib64/libhal-backend-sensor.so", "hal_backend_sensor_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_PERIPHERAL, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_PERIPHERAL", "", "", "", {}), - - HalInfo(HAL_MODULE_DEVICE_BATTERY, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_DEVICE_BATTERY", "/hal/lib/libhal-backend-device-battery.so", - "/hal/lib64/libhal-backend-device-battery.so", "hal_backend_device_battery_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_DEVICE_BEZEL, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_DEVICE_BEZEL", "/hal/lib/libhal-backend-device-bezel.so", - "/hal/lib64/libhal-backend-device-bezel.so", "hal_backend_device_bezel_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_DEVICE_DISPLAY, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_DEVICE_DISPLAY", "/hal/lib/libhal-backend-device-display.so", - "/hal/lib64/libhal-backend-device-display.so", "hal_backend_device_display_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_DEVICE_IR, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_DEVICE_IR", "/hal/lib/libhal-backend-device-ir.so", - "/hal/lib64/libhal-backend-device-ir.so", "hal_backend_device_ir_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_DEVICE_TOUCHSCREEN, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_DEVICE_TOUCHSCREEN", "/hal/lib/libhal-backend-device-touchscreen.so", - "/hal/lib64/libhal-backend-device-touchscreen.so", "hal_backend_device_touchscreen_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_DEVICE_LED, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_DEVICE_LED", "/hal/lib/libhal-backend-device-led.so", - "/hal/lib64/libhal-backend-device-led.so", "hal_backend_device_led_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_DEVICE_BOARD, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_DEVICE_BOARD", "/hal/lib/libhal-backend-device-board.so", - "/hal/lib64/libhal-backend-device-board.so", "hal_backend_device_board_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_DEVICE_EXTERNAL_CONNECTION, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_DEVICE_EXTERNAL_CONNECTION", "/hal/lib/libhal-backend-device-external-connection.so", - "/hal/lib64/libhal-backend-device-external-connection.so", "hal_backend_device_external_connection_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_DEVICE_THERMAL, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_DEVICE_THERMAL", "/hal/lib/libhal-backend-device-thermal.so", - "/hal/lib64/libhal-backend-device-thermal.so", "hal_backend_device_thermal_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_DEVICE_USB_GADGET, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_DEVICE_USB_GADGET", "/hal/lib/libhal-backend-device-usb-gadget.so", - "/hal/lib64/libhal-backend-device-usb-gadget.so", "hal_backend_device_usb_gadget_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_DEVICE_HAPTIC, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_DEVICE_HAPTIC", "/hal/lib/libhal-backend-device-haptic.so", - "/hal/lib64/libhal-backend-device-haptic.so", "hal_backend_device_haptic_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ), - - HalInfo(HAL_MODULE_DEVICE_MEMORY, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, - "HAL_MODULE_DEVICE_MEMORY", "/hal/lib/libhal-backend-device-memory.so", - "/hal/lib64/libhal-backend-device-memory.so", "hal_backend_device_memory_data", - vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, - .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 - }} - ) + HalInfoMatchedTest, + ::testing::Values( + HalInfo(HAL_MODULE_TBM, + HAL_GROUP_GRAPHICS, + HAL_LICENSE_MIT, + "HAL_MODULE_TBM", + "/hal/lib/libhal-backend-tbm.so", + "/hal/lib64/libhal-backend-tbm.so", + "hal_backend_tbm_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_TDM, + HAL_GROUP_GRAPHICS, + HAL_LICENSE_MIT, + "HAL_MODULE_TDM", + "/hal/lib/libhal-backend-tdm.so", + "/hal/lib64/libhal-backend-tdm.so", + "hal_backend_tdm_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_COREGL, + HAL_GROUP_GRAPHICS, + HAL_LICENSE_UNKNOWN, + "HAL_MODULE_COREGL", + "", + "", + "", + {} + ), + + HalInfo(HAL_MODULE_INPUT, + HAL_GROUP_GRAPHICS, + HAL_LICENSE_MIT, + "HAL_MODULE_INPUT", + "", + "", + "", + {} + ), + + HalInfo(HAL_MODULE_AUDIO, + HAL_GROUP_MULTIMEDIA, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_AUDIO", + "/hal/lib/libhal-backend-audio.so", + "/hal/lib64/libhal-backend-audio.so", + "hal_backend_audio_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_CAMERA, + HAL_GROUP_MULTIMEDIA, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_CAMERA", + "/hal/lib/libhal-backend-camera.so", + "/hal/lib64/libhal-backend-camera.so", + "hal_backend_camera_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_RADIO, + HAL_GROUP_MULTIMEDIA, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_RADIO", + "/hal/lib/libhal-backend-radio.so", + "/hal/lib64/libhal-backend-radio.so", + "hal_backend_radio_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_CODEC, + HAL_GROUP_MULTIMEDIA, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_CODEC", + "", + "", + "", + {} + ), + + HalInfo(HAL_MODULE_USB_AUDIO, + HAL_GROUP_MULTIMEDIA, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_USB_AUDIO", + "", + "", + "", + {} + ), + + HalInfo(HAL_MODULE_ALSAUCM, + HAL_GROUP_MULTIMEDIA, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_ALSAUCM", + "", + "", + "", + {} + ), + + HalInfo(HAL_MODULE_BLUETOOTH, + HAL_GROUP_CONNECTIVITY, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_BLUETOOTH", + "/hal/lib/libhal-backend-bluetooth.so", + "/hal/lib64/libhal-backend-bluetooth.so", + "hal_backend_bluetooth_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_WIFI, + HAL_GROUP_CONNECTIVITY, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_WIFI", + "/hal/lib/libhal-backend-wifi.so", + "/hal/lib64/libhal-backend-wifi.so", + "hal_backend_wifi_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_NAN, + HAL_GROUP_CONNECTIVITY, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_NAN", + "", + "", + "", + {} + ), + + HalInfo(HAL_MODULE_NFC, + HAL_GROUP_CONNECTIVITY, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_NFC", + "/hal/lib/libhal-backend-nfc.so", + "/hal/lib64/libhal-backend-nfc.so", + "hal_backend_nfc_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_ZIGBEE, + HAL_GROUP_CONNECTIVITY, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_ZIGBEE", + "/hal/lib/libhal-backend-zigbee.so", + "/hal/lib64/libhal-backend-zigbee.so", + "hal_backend_zigbee_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_UWB, + HAL_GROUP_CONNECTIVITY, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_UWB", + "/hal/lib/libhal-backend-uwb.so", + "/hal/lib64/libhal-backend-uwb.so", + "hal_backend_uwb_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_MTP, + HAL_GROUP_CONNECTIVITY, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_MTP", + "", + "", + "", + {} + ), + + HalInfo(HAL_MODULE_TELEPHONY, + HAL_GROUP_TELEPHONY, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_TELEPHONY", + "", + "", + "", + {} + ), + + HalInfo(HAL_MODULE_LOCATION, + HAL_GROUP_LOCATION, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_LOCATION", + "/hal/lib/libhal-backend-location.so", + "/hal/lib64/libhal-backend-location.so", + "hal_backend_location_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_COMMON, + HAL_GROUP_SYSTEM, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_COMMON", + "", + "", + "", + {} + ), + + HalInfo(HAL_MODULE_POWER, + HAL_GROUP_SYSTEM, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_POWER", + "/hal/lib/libhal-backend-power.so", + "/hal/lib64/libhal-backend-power.so", + "hal_backend_power_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_SENSOR, + HAL_GROUP_SYSTEM, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_SENSOR", + "/hal/lib/libhal-backend-sensor.so", + "/hal/lib64/libhal-backend-sensor.so", + "hal_backend_sensor_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_PERIPHERAL, + HAL_GROUP_SYSTEM, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_PERIPHERAL", + "", + "", + "", + {}), + + HalInfo(HAL_MODULE_DEVICE_BATTERY, + HAL_GROUP_SYSTEM, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_DEVICE_BATTERY", + "/hal/lib/libhal-backend-device-battery.so", + "/hal/lib64/libhal-backend-device-battery.so", + "hal_backend_device_battery_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_DEVICE_BEZEL, + HAL_GROUP_SYSTEM, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_DEVICE_BEZEL", + "/hal/lib/libhal-backend-device-bezel.so", + "/hal/lib64/libhal-backend-device-bezel.so", + "hal_backend_device_bezel_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_DEVICE_DISPLAY, + HAL_GROUP_SYSTEM, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_DEVICE_DISPLAY", + "/hal/lib/libhal-backend-device-display.so", + "/hal/lib64/libhal-backend-device-display.so", + "hal_backend_device_display_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_DEVICE_IR, + HAL_GROUP_SYSTEM, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_DEVICE_IR", + "/hal/lib/libhal-backend-device-ir.so", + "/hal/lib64/libhal-backend-device-ir.so", + "hal_backend_device_ir_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_DEVICE_TOUCHSCREEN, + HAL_GROUP_SYSTEM, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_DEVICE_TOUCHSCREEN", + "/hal/lib/libhal-backend-device-touchscreen.so", + "/hal/lib64/libhal-backend-device-touchscreen.so", + "hal_backend_device_touchscreen_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_DEVICE_LED, + HAL_GROUP_SYSTEM, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_DEVICE_LED", + "/hal/lib/libhal-backend-device-led.so", + "/hal/lib64/libhal-backend-device-led.so", + "hal_backend_device_led_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_DEVICE_BOARD, + HAL_GROUP_SYSTEM, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_DEVICE_BOARD", + "/hal/lib/libhal-backend-device-board.so", + "/hal/lib64/libhal-backend-device-board.so", + "hal_backend_device_board_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_DEVICE_EXTERNAL_CONNECTION, + HAL_GROUP_SYSTEM, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_DEVICE_EXTERNAL_CONNECTION", + "/hal/lib/libhal-backend-device-external-connection.so", + "/hal/lib64/libhal-backend-device-external-connection.so", + "hal_backend_device_external_connection_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_DEVICE_THERMAL, + HAL_GROUP_SYSTEM, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_DEVICE_THERMAL", + "/hal/lib/libhal-backend-device-thermal.so", + "/hal/lib64/libhal-backend-device-thermal.so", + "hal_backend_device_thermal_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_DEVICE_USB_GADGET, + HAL_GROUP_SYSTEM, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_DEVICE_USB_GADGET", + "/hal/lib/libhal-backend-device-usb-gadget.so", + "/hal/lib64/libhal-backend-device-usb-gadget.so", + "hal_backend_device_usb_gadget_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_DEVICE_HAPTIC, + HAL_GROUP_SYSTEM, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_DEVICE_HAPTIC", + "/hal/lib/libhal-backend-device-haptic.so", + "/hal/lib64/libhal-backend-device-haptic.so", + "hal_backend_device_haptic_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ), + + HalInfo(HAL_MODULE_DEVICE_MEMORY, + HAL_GROUP_SYSTEM, + HAL_LICENSE_APACHE_2_0, + "HAL_MODULE_DEVICE_MEMORY", + "/hal/lib/libhal-backend-device-memory.so", + "/hal/lib64/libhal-backend-device-memory.so", + "hal_backend_device_memory_data", + vector{{ + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 + }} + ) )); TEST_P(HalInfoMatchedTest, get_backend_library_name) { - char ret_library_name[MAX_BUFF] = {0, }; - int ret; - auto info = GetParam(); + char ret_library_name[MAX_BUFF] = {0, }; + int ret; + auto info = GetParam(); - ret = hal_common_get_backend_library_name(info.module_, ret_library_name, MAX_BUFF); - EXPECT_TRUE(ret == TIZEN_ERROR_NONE); + ret = hal_common_get_backend_library_name(info.module_, ret_library_name, MAX_BUFF); + EXPECT_TRUE(ret == TIZEN_ERROR_NONE); #if defined(__aarch64__) || defined(__x86_64__) - EXPECT_STREQ(info.library_name_64bit_, ret_library_name) << "module name is " << info.module_name_; + EXPECT_STREQ(info.library_name_64bit_, ret_library_name) << "module name is " << info.module_name_; #else - EXPECT_STREQ(info.library_name_, ret_library_name) << "module name is " << info.module_name_; + EXPECT_STREQ(info.library_name_, ret_library_name) << "module name is " << info.module_name_; #endif } TEST_P(HalInfoMatchedTest, test_symbol_name_module_matching) { - char ret_symbol_name[MAX_BUFF] = {0, }; - int ret; - auto info = GetParam(); + char ret_symbol_name[MAX_BUFF] = {0, }; + int ret; + auto info = GetParam(); - ret = hal_common_get_backend_symbol_name(info.module_, ret_symbol_name, MAX_BUFF); - EXPECT_TRUE(ret == TIZEN_ERROR_NONE); - EXPECT_STREQ(ret_symbol_name, info.symbol_name_) << "module name is " << info.module_name_; + ret = hal_common_get_backend_symbol_name(info.module_, ret_symbol_name, MAX_BUFF); + EXPECT_TRUE(ret == TIZEN_ERROR_NONE); + EXPECT_STREQ(ret_symbol_name, info.symbol_name_) << "module name is " << info.module_name_; } TEST_P(HalInfoMatchedTest, test_group_module_matching) { - struct __hal_module_info *info = NULL; - - auto result_info = GetParam(); - - _hal_api_conf_init(); - info = _hal_api_conf_get_module_info(result_info.module_, NULL); - ASSERT_TRUE(info != nullptr) << "module name is " << result_info.module_name_; - EXPECT_EQ(info->group, result_info.group_) << "module name is " << result_info.module_name_; - _hal_api_conf_exit(); + struct __hal_module_info *info = NULL; + auto result_info = GetParam(); + + _hal_api_conf_init(); + info = _hal_api_conf_get_module_info(result_info.module_, NULL); + ASSERT_TRUE(info != nullptr) << "module name is " << result_info.module_name_; + EXPECT_EQ(info->group, result_info.group_) << "module name is " << result_info.module_name_; + _hal_api_conf_exit(); } TEST_P(HalInfoMatchedTest, test_license_module_matching) { - struct __hal_module_info *info = NULL; - - auto result_info = GetParam(); - - _hal_api_conf_init(); - info = _hal_api_conf_get_module_info(result_info.module_, NULL); - ASSERT_TRUE(info != nullptr) << "module name is " << result_info.module_name_; - EXPECT_EQ(info->license, result_info.license_) << "module name is " << result_info.module_name_; - _hal_api_conf_exit(); + struct __hal_module_info *info = NULL; + auto result_info = GetParam(); + + _hal_api_conf_init(); + info = _hal_api_conf_get_module_info(result_info.module_, NULL); + ASSERT_TRUE(info != nullptr) << "module name is " << result_info.module_name_; + EXPECT_EQ(info->license, result_info.license_) << "module name is " << result_info.module_name_; + _hal_api_conf_exit(); } TEST_P(HalInfoMatchedTest, test_module_name_matching) { - struct __hal_module_info *info = NULL; - - auto result_info = GetParam(); - - _hal_api_conf_init(); - info = _hal_api_conf_get_module_info(result_info.module_, NULL); - ASSERT_TRUE(info != nullptr) << "module name is " << result_info.module_name_; - EXPECT_STREQ(info->module_name, result_info.module_name_) << "module name is " << result_info.module_name_; - _hal_api_conf_exit(); + struct __hal_module_info *info = NULL; + auto result_info = GetParam(); + + _hal_api_conf_init(); + info = _hal_api_conf_get_module_info(result_info.module_, NULL); + ASSERT_TRUE(info != nullptr) << "module name is " << result_info.module_name_; + EXPECT_STREQ(info->module_name, result_info.module_name_) << "module name is " << result_info.module_name_; + _hal_api_conf_exit(); } TEST_P(HalInfoMatchedTest, test_check_backend_abi_version) { - struct __hal_module_info *info = NULL; - auto result_info = GetParam(); + struct __hal_module_info *info = NULL; + auto result_info = GetParam(); - _hal_api_conf_init(); - info = _hal_api_conf_get_module_info(result_info.module_, NULL); - ASSERT_TRUE(info != nullptr); + _hal_api_conf_init(); + info = _hal_api_conf_get_module_info(result_info.module_, NULL); + ASSERT_TRUE(info != nullptr); - vector versions = result_info.versions_; - struct hal_abi_version_match *meta_versions = info->abi_versions; + vector versions = result_info.versions_; + struct hal_abi_version_match *meta_versions = info->abi_versions; - for (unsigned int i = 0; i < versions.size(); i++) { - struct hal_abi_version_match tmp_version = versions[i]; + for (unsigned int i = 0; i < versions.size(); i++) { + struct hal_abi_version_match tmp_version = versions[i]; - int ret = hal_common_check_backend_abi_version(result_info.module_, tmp_version.platform_abi_version); - EXPECT_EQ(ret, TIZEN_ERROR_NONE) << "module name is " << result_info.module_name_; - EXPECT_EQ(meta_versions[i].platform_abi_version, tmp_version.platform_abi_version) << "module name is " << result_info.module_name_;; - EXPECT_EQ(meta_versions[i].backend_min_abi_version, tmp_version.backend_min_abi_version) << "module name is " << result_info.module_name_;; - } - _hal_api_conf_exit(); + int ret = hal_common_check_backend_abi_version(result_info.module_, tmp_version.platform_abi_version); + EXPECT_EQ(ret, TIZEN_ERROR_NONE) << "module name is " << result_info.module_name_; + EXPECT_EQ(meta_versions[i].platform_abi_version, tmp_version.platform_abi_version) << "module name is " << result_info.module_name_;; + EXPECT_EQ(meta_versions[i].backend_min_abi_version, tmp_version.backend_min_abi_version) << "module name is " << result_info.module_name_;; + } + _hal_api_conf_exit(); } diff --git a/tests/unittest/test-main.cc b/tests/unittest/test-main.cc index c2eb730..3034cd3 100644 --- a/tests/unittest/test-main.cc +++ b/tests/unittest/test-main.cc @@ -18,20 +18,20 @@ #include int main(int argc, char** argv) { - int ret = -1; + int ret = -1; - try { - testing::InitGoogleTest(&argc, argv); - } catch(...) { - std::cout << "Exception occurred" << std::endl; - } + try { + testing::InitGoogleTest(&argc, argv); + } catch(...) { + std::cout << "Exception occurred" << std::endl; + } - try { - ret = RUN_ALL_TESTS(); - } catch (const ::testing::internal::GoogleTestFailureException& e) { - ret = -1; - std::cout << "GoogleTestFailureException was thrown:" << e.what() << std::endl; - } + try { + ret = RUN_ALL_TESTS(); + } catch (const ::testing::internal::GoogleTestFailureException& e) { + ret = -1; + std::cout << "GoogleTestFailureException was thrown:" << e.what() << std::endl; + } - return ret; + return ret; } -- 2.7.4 From 00a2bed56471abebba1b419f5ed96a6970452082 Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Thu, 16 Jun 2022 12:12:51 +0900 Subject: [PATCH 11/16] tests: unittest: Rename unitttest name to hal-api-common-unittest hal-api-common is the official module name. In order to improve the readability of unittest name, rename to hal-api-common-unittest as following: - common-unittest -> hal-api-common-unittest - CommonHaltest -> HalApiCommonTest Change-Id: I9a3e1667b76b9fab361fddca3cb052389526f581 Signed-off-by: Chanwoo Choi --- tests/unittest/CMakeLists.txt | 20 ++++++++++---------- tests/unittest/test-hal-api-common.cc | 14 +++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/unittest/CMakeLists.txt b/tests/unittest/CMakeLists.txt index 2ff5c7e..90dff51 100644 --- a/tests/unittest/CMakeLists.txt +++ b/tests/unittest/CMakeLists.txt @@ -1,28 +1,28 @@ ENABLE_TESTING() -SET(HAL_COMMON_UNITTEST "common-unittest") +SET(HAL_API_COMMON_UNITTEST "hal-api-common-unittest") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -Werror") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -std=c++14 -Wall -Werror") AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/ UNITTEST_SRCS) -ADD_EXECUTABLE(${HAL_COMMON_UNITTEST} ${UNITTEST_SRCS}) +ADD_EXECUTABLE(${HAL_API_COMMON_UNITTEST} ${UNITTEST_SRCS}) -TARGET_INCLUDE_DIRECTORIES(${HAL_COMMON_UNITTEST} PUBLIC +TARGET_INCLUDE_DIRECTORIES(${HAL_API_COMMON_UNITTEST} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../../include" ) INCLUDE(FindPkgConfig) -pkg_check_modules(hal_common_unittest_pkgs REQUIRED gmock) +pkg_check_modules(hal_api_common_unittest_pkgs REQUIRED gmock) -FOREACH(flag ${hal_common_unittest_pkgs_CFLAGS}) +FOREACH(flag ${hal_api_common_unittest_pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) -TARGET_LINK_LIBRARIES(${HAL_COMMON_UNITTEST} ${hal_common_unittest_pkgs_LDFLAGS} ${PROJECT_NAME}) -SET_TARGET_PROPERTIES(${HAL_COMMON_UNITTEST} PROPERTIES COMPILE_FLAGS "-fPIE -fvisibility=default") -SET_TARGET_PROPERTIES(${HAL_COMMON_UNITTEST} PROPERTIES LINK_FLAGS "-pie") +TARGET_LINK_LIBRARIES(${HAL_API_COMMON_UNITTEST} ${hal_api_common_unittest_pkgs_LDFLAGS} ${PROJECT_NAME}) +SET_TARGET_PROPERTIES(${HAL_API_COMMON_UNITTEST} PROPERTIES COMPILE_FLAGS "-fPIE -fvisibility=default") +SET_TARGET_PROPERTIES(${HAL_API_COMMON_UNITTEST} PROPERTIES LINK_FLAGS "-pie") ADD_TEST( - NAME ${HAL_COMMON_UNITTEST} - COMMAND ${HAL_COMMON_UNITTEST} + NAME ${HAL_API_COMMON_UNITTEST} + COMMAND ${HAL_API_COMMON_UNITTEST} ) diff --git a/tests/unittest/test-hal-api-common.cc b/tests/unittest/test-hal-api-common.cc index acc07eb..8b1e08a 100644 --- a/tests/unittest/test-hal-api-common.cc +++ b/tests/unittest/test-hal-api-common.cc @@ -32,15 +32,15 @@ using namespace std; -class CommonHaltest : public testing::Test { +class HalApiCommonTest : public testing::Test { public: - CommonHaltest() {} - virtual ~CommonHaltest() {} + HalApiCommonTest() {} + virtual ~HalApiCommonTest() {} virtual void SetUp() {} virtual void TearDown() {} }; -TEST(CommonHaltest, test_symbol_name_invalid_module) { +TEST(HalApiCommonTest, test_symbol_name_invalid_module) { char ret_unknown[MAX_BUFF] = {0, }; char ret_end[MAX_BUFF] = {0, }; int ret; @@ -52,7 +52,7 @@ TEST(CommonHaltest, test_symbol_name_invalid_module) { EXPECT_TRUE(ret != TIZEN_ERROR_NONE); } -TEST(CommonHaltest, test_check_backend_abi_version_invalid_parameter) { +TEST(HalApiCommonTest, test_check_backend_abi_version_invalid_parameter) { int ret; ret = hal_common_check_backend_abi_version(HAL_MODULE_UNKNOWN, HAL_ABI_VERSION_TIZEN_7_0); @@ -68,7 +68,7 @@ TEST(CommonHaltest, test_check_backend_abi_version_invalid_parameter) { EXPECT_EQ(ret, TIZEN_ERROR_INVALID_PARAMETER); } -TEST(CommonHaltest, get_backend_library_name_unknown) { +TEST(HalApiCommonTest, get_backend_library_name_unknown) { char ret_name[MAX_BUFF] = {0, }; int ret = hal_common_get_backend_library_name(HAL_MODULE_UNKNOWN, ret_name, MAX_BUFF); EXPECT_TRUE(ret != TIZEN_ERROR_NONE); @@ -101,7 +101,7 @@ class HalInfo { class HalInfoMatchedTest : public ::testing::TestWithParam {}; -INSTANTIATE_TEST_CASE_P(CommonHaltest, +INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HalInfoMatchedTest, ::testing::Values( HalInfo(HAL_MODULE_TBM, -- 2.7.4 From 4b40ecdcf3fd62969d9ac42d2bd09224979fe61a Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Thu, 16 Jun 2022 14:36:55 +0900 Subject: [PATCH 12/16] tests: unittest: Add hook function for handle hal backend library The hal-api-common uses the dlopen/dlsym/dlclose to load/unload the shared library of hal backend and find symbol from hal backend library. For testing hal-api-common functions when building time, re-implement dlopen/dlsym/dlclose for hooking.By implementing the hooking functions, be able to verify the internal logic of hal-api-common functions. Following fucntions are re-implemented for hooking: - void *dlopen(const char *filename, int flags) - int dlclose(void *handle) - void *dlsym(void *handle, const char *symbol) - int access(const char *pathname, int mode) And hal-backend-[module] (e.g., tbm/tdm/audio/camera/devcie/power etc) have to contain the their own hal_backend structure to implement the h/w device-dependent hal backend. Instead of adding the each hal_backend structure for all hal modules, use the common 'hal_backend_module_data' regardless of hal module name. Change-Id: Icbcba49a654f9ed1a287233c9cc0e3efcca508df Signed-off-by: Chanwoo Choi --- tests/unittest/hal-api-common-hook.c | 64 ++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 tests/unittest/hal-api-common-hook.c diff --git a/tests/unittest/hal-api-common-hook.c b/tests/unittest/hal-api-common-hook.c new file mode 100644 index 0000000..c55b1cc --- /dev/null +++ b/tests/unittest/hal-api-common-hook.c @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +#include "hal-common-interface.h" + +/* + * All hal-backend-[module] (e.g., tbm/tdm/audio/camera/devcie/power etc) + * have to contain the their own hal_backend structure to implement + * the h/w device-dependent hal backend. Instead of adding the each hal_backend + * structure for all hal modules, use the common hal_backend_module_data + * regardless of hal module name. Below dlsym hooking function doesn't + * check the symbol name and then return the common hal_backend_module_data. + * */ +static int hal_backend_init(void **data) { return 0; } +static int hal_backend_exit(void *data) { return 0; } + +hal_backend hal_backend_module_data = { + .name = "hal-backend-module", + .vendor = "hal-backend-vendor", + .abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .init = hal_backend_init, + .exit = hal_backend_exit, +}; + +/* + * hal-api-common uses the dlopen/dlsym/dlclose/access to load/unload + * the shared library of hal backend and find symbol from hal backend library. + * For testing hal-api-common functions when building time, re-implement + * dlopen/dlsym/dlclose/access for hooking.By implementing the hooking functions, + * be able to verify the internal logic of hal-api-common functions. + */ +void *dlopen(const char *filename, int flags) { + return calloc(1, sizeof(void *)); +} + +int dlclose(void *handle) { + free(handle); + return 0; +} + +void *dlsym(void *handle, const char *symbol) { + return (void *)&hal_backend_module_data; +} + +int access(const char *pathname, int mode) { + return 0; +} -- 2.7.4 From 471e3222a40b1ac50d495f45e872049cb3eef52a Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Thu, 16 Jun 2022 12:48:35 +0900 Subject: [PATCH 13/16] tests: unittest: Add new test for hal_common_get_backend and put_backend function hal_common_get_backend and hal_common_put_backend functions are very important because they are in charge of loading/unloading the hal backend library for all hal backends and also verify the validation checking of the loaded hal backend library. When executing hal_common_get_backend and hal_common_put_backend, there are very complex validation sequence. It means that have to verify the internal logic of both hal_common_get_backend and hal_common_put_backend at the implementation step in order to catch the error. So that add new test for hal_common_get_backend and hal_common_put_backend functions. Change-Id: I8d42e9327248c283d8f01fc8b5f5926e0d371ba5 Signed-off-by: Chanwoo Choi --- tests/unittest/test-hal-api-common.cc | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tests/unittest/test-hal-api-common.cc b/tests/unittest/test-hal-api-common.cc index 8b1e08a..1fc6486 100644 --- a/tests/unittest/test-hal-api-common.cc +++ b/tests/unittest/test-hal-api-common.cc @@ -607,3 +607,32 @@ TEST_P(HalInfoMatchedTest, test_check_backend_abi_version) { } _hal_api_conf_exit(); } + +TEST_P(HalInfoMatchedTest, test_hal_common_get_backend_valid) { + auto info = GetParam(); + + struct _hal_backend_module_data { + void *data; + } *backend_module_data; + + int ret = hal_common_get_backend(info.module_, (void **)&backend_module_data); + if (strlen(info.library_name_) == 0) + EXPECT_NE(ret, TIZEN_ERROR_NONE); + else + EXPECT_EQ(ret, TIZEN_ERROR_NONE); + + ret = hal_common_put_backend(info.module_, backend_module_data); + EXPECT_EQ(ret, TIZEN_ERROR_NONE); +} + +TEST(HalInfoMatchedTest, test_hal_common_get_backend_invalid_module_id) { + struct _hal_backend_module_data { + void *data; + } *backend_module_data; + + int ret = hal_common_get_backend(HAL_MODULE_UNKNOWN, (void **)&backend_module_data); + EXPECT_NE(ret, TIZEN_ERROR_NONE); + + ret = hal_common_get_backend(HAL_MODULE_END, (void **)&backend_module_data); + EXPECT_NE(ret, TIZEN_ERROR_NONE); +} -- 2.7.4 From 8eb86b233dff2c718bda0cbc20a3a2a8fa3dae61 Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Wed, 22 Jun 2022 00:58:01 +0900 Subject: [PATCH 14/16] tests: unittest: Add new test for hal_common_get_backend_with_library_name Basically, the hal backend library name of each module is already decied such as 'libhal-backend-[module name].so'. But, some module requires the hal backend library loading way with their own library name like 'libhal-backend-[module name]-lidar.so'. When loading the their own library name, hal_common_get_backend_with_library_name and hal_common_put_backend_with_library_name are used. So that add new for hal_common_get/put_backend_with_library_name and add 'backend_module_name' attribute to class HalInfo because 'backend_module_name' is required to check the hal backend name as I mentioned above. Change-Id: Idbd5ae4f23714a4efdb857d2a1ed0885a927e887 Signed-off-by: Chanwoo Choi --- tests/unittest/test-hal-api-common.cc | 107 +++++++++++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 1 deletion(-) diff --git a/tests/unittest/test-hal-api-common.cc b/tests/unittest/test-hal-api-common.cc index 1fc6486..9723266 100644 --- a/tests/unittest/test-hal-api-common.cc +++ b/tests/unittest/test-hal-api-common.cc @@ -80,6 +80,7 @@ class HalInfo { enum hal_group group_; enum hal_license license_; const char *module_name_; + const char *backend_module_name_; const char *library_name_; const char *library_name_64bit_; const char *symbol_name_; @@ -89,12 +90,15 @@ class HalInfo { enum hal_group group, enum hal_license license, const char *module_name, + const char *backend_module_name, const char *library_name, const char *library_name_64bit, const char *symbol_name, vector versions) : module_(module), group_(group), license_(license), - module_name_(module_name), library_name_(library_name), + module_name_(module_name), + backend_module_name_(backend_module_name), + library_name_(library_name), library_name_64bit_(library_name_64bit), symbol_name_(symbol_name), versions_(versions) {} }; @@ -108,6 +112,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_GRAPHICS, HAL_LICENSE_MIT, "HAL_MODULE_TBM", + "tbm", "/hal/lib/libhal-backend-tbm.so", "/hal/lib64/libhal-backend-tbm.so", "hal_backend_tbm_data", @@ -121,6 +126,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_GRAPHICS, HAL_LICENSE_MIT, "HAL_MODULE_TDM", + "tdm", "/hal/lib/libhal-backend-tdm.so", "/hal/lib64/libhal-backend-tdm.so", "hal_backend_tdm_data", @@ -137,6 +143,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "", "", "", + "", {} ), @@ -147,6 +154,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "", "", "", + "", {} ), @@ -154,6 +162,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_MULTIMEDIA, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_AUDIO", + "audio", "/hal/lib/libhal-backend-audio.so", "/hal/lib64/libhal-backend-audio.so", "hal_backend_audio_data", @@ -167,6 +176,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_MULTIMEDIA, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_CAMERA", + "camera", "/hal/lib/libhal-backend-camera.so", "/hal/lib64/libhal-backend-camera.so", "hal_backend_camera_data", @@ -180,6 +190,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_MULTIMEDIA, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_RADIO", + "radio", "/hal/lib/libhal-backend-radio.so", "/hal/lib64/libhal-backend-radio.so", "hal_backend_radio_data", @@ -196,6 +207,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "", "", "", + "", {} ), @@ -206,6 +218,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "", "", "", + "", {} ), @@ -216,6 +229,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "", "", "", + "", {} ), @@ -223,6 +237,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_CONNECTIVITY, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_BLUETOOTH", + "bluetooth", "/hal/lib/libhal-backend-bluetooth.so", "/hal/lib64/libhal-backend-bluetooth.so", "hal_backend_bluetooth_data", @@ -236,6 +251,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_CONNECTIVITY, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_WIFI", + "wifi", "/hal/lib/libhal-backend-wifi.so", "/hal/lib64/libhal-backend-wifi.so", "hal_backend_wifi_data", @@ -252,6 +268,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "", "", "", + "", {} ), @@ -259,6 +276,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_CONNECTIVITY, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_NFC", + "nfc", "/hal/lib/libhal-backend-nfc.so", "/hal/lib64/libhal-backend-nfc.so", "hal_backend_nfc_data", @@ -272,6 +290,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_CONNECTIVITY, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_ZIGBEE", + "zigbee", "/hal/lib/libhal-backend-zigbee.so", "/hal/lib64/libhal-backend-zigbee.so", "hal_backend_zigbee_data", @@ -285,6 +304,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_CONNECTIVITY, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_UWB", + "uwb", "/hal/lib/libhal-backend-uwb.so", "/hal/lib64/libhal-backend-uwb.so", "hal_backend_uwb_data", @@ -301,6 +321,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "", "", "", + "", {} ), @@ -311,6 +332,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "", "", "", + "", {} ), @@ -318,6 +340,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_LOCATION, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_LOCATION", + "location", "/hal/lib/libhal-backend-location.so", "/hal/lib64/libhal-backend-location.so", "hal_backend_location_data", @@ -334,6 +357,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "", "", "", + "", {} ), @@ -341,6 +365,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_POWER", + "power", "/hal/lib/libhal-backend-power.so", "/hal/lib64/libhal-backend-power.so", "hal_backend_power_data", @@ -354,6 +379,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_SENSOR", + "sensor", "/hal/lib/libhal-backend-sensor.so", "/hal/lib64/libhal-backend-sensor.so", "hal_backend_sensor_data", @@ -370,12 +396,14 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "", "", "", + "", {}), HalInfo(HAL_MODULE_DEVICE_BATTERY, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_DEVICE_BATTERY", + "device-battery", "/hal/lib/libhal-backend-device-battery.so", "/hal/lib64/libhal-backend-device-battery.so", "hal_backend_device_battery_data", @@ -389,6 +417,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_DEVICE_BEZEL", + "device-bezel", "/hal/lib/libhal-backend-device-bezel.so", "/hal/lib64/libhal-backend-device-bezel.so", "hal_backend_device_bezel_data", @@ -402,6 +431,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_DEVICE_DISPLAY", + "device-display", "/hal/lib/libhal-backend-device-display.so", "/hal/lib64/libhal-backend-device-display.so", "hal_backend_device_display_data", @@ -415,6 +445,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_DEVICE_IR", + "device-ir", "/hal/lib/libhal-backend-device-ir.so", "/hal/lib64/libhal-backend-device-ir.so", "hal_backend_device_ir_data", @@ -428,6 +459,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_DEVICE_TOUCHSCREEN", + "device-touchscreen", "/hal/lib/libhal-backend-device-touchscreen.so", "/hal/lib64/libhal-backend-device-touchscreen.so", "hal_backend_device_touchscreen_data", @@ -441,6 +473,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_DEVICE_LED", + "device-led", "/hal/lib/libhal-backend-device-led.so", "/hal/lib64/libhal-backend-device-led.so", "hal_backend_device_led_data", @@ -454,6 +487,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_DEVICE_BOARD", + "device-board", "/hal/lib/libhal-backend-device-board.so", "/hal/lib64/libhal-backend-device-board.so", "hal_backend_device_board_data", @@ -467,6 +501,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_DEVICE_EXTERNAL_CONNECTION", + "device-external-connection", "/hal/lib/libhal-backend-device-external-connection.so", "/hal/lib64/libhal-backend-device-external-connection.so", "hal_backend_device_external_connection_data", @@ -480,6 +515,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_DEVICE_THERMAL", + "device-thermal", "/hal/lib/libhal-backend-device-thermal.so", "/hal/lib64/libhal-backend-device-thermal.so", "hal_backend_device_thermal_data", @@ -493,6 +529,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_DEVICE_USB_GADGET", + "device-usb-gadget", "/hal/lib/libhal-backend-device-usb-gadget.so", "/hal/lib64/libhal-backend-device-usb-gadget.so", "hal_backend_device_usb_gadget_data", @@ -506,6 +543,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_DEVICE_HAPTIC", + "device-haptic", "/hal/lib/libhal-backend-device-haptic.so", "/hal/lib64/libhal-backend-device-haptic.so", "hal_backend_device_haptic_data", @@ -519,6 +557,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, HAL_GROUP_SYSTEM, HAL_LICENSE_APACHE_2_0, "HAL_MODULE_DEVICE_MEMORY", + "device-memory", "/hal/lib/libhal-backend-device-memory.so", "/hal/lib64/libhal-backend-device-memory.so", "hal_backend_device_memory_data", @@ -636,3 +675,69 @@ TEST(HalInfoMatchedTest, test_hal_common_get_backend_invalid_module_id) { ret = hal_common_get_backend(HAL_MODULE_END, (void **)&backend_module_data); EXPECT_NE(ret, TIZEN_ERROR_NONE); } + +TEST_P(HalInfoMatchedTest, test_hal_common_get_backend_with_library_name_valid) { + auto info = GetParam(); + char *library_name = g_strdup_printf("libhal-backend-%s-user-specific.so", + info.backend_module_name_); + struct _hal_backend_module_data { + void *data; + } *backend_module_data; + + int ret = hal_common_get_backend_with_library_name(info.module_, + (void **)&backend_module_data, + library_name); + if (strlen(info.library_name_) == 0) + EXPECT_NE(ret, TIZEN_ERROR_NONE); + else + EXPECT_EQ(ret, TIZEN_ERROR_NONE); + + ret = hal_common_put_backend_with_library_name(info.module_, + backend_module_data, + library_name); + if (strlen(info.library_name_) == 0) + EXPECT_NE(ret, TIZEN_ERROR_NONE); + else + EXPECT_EQ(ret, TIZEN_ERROR_NONE); + + g_free(library_name); +} + +TEST_P(HalInfoMatchedTest, test_hal_common_get_backend_with_library_name_invalid_library_name) { + auto info = GetParam(); + char *library_name = g_strdup_printf("libhal-backend-unknown-module.so"); + struct _hal_backend_module_data { + void *data; + } *backend_module_data; + + int ret = hal_common_get_backend_with_library_name(info.module_, + (void **)&backend_module_data, + library_name); + EXPECT_NE(ret, TIZEN_ERROR_NONE); + + ret = hal_common_put_backend_with_library_name(info.module_, + (void **)&backend_module_data, + library_name); + EXPECT_NE(ret, TIZEN_ERROR_NONE); + + g_free(library_name); +} + +TEST(HalInfoMatchedTest, test_hal_common_get_backend_with_library_name_invalid_module_id) { + char *library_name = g_strdup_printf("libhal-backend-unknown-module.so"); + struct _hal_backend_module_data { + void *data; + } *backend_module_data; + + int ret = hal_common_get_backend_with_library_name(HAL_MODULE_UNKNOWN, + (void **)&backend_module_data, + library_name); + EXPECT_NE(ret, TIZEN_ERROR_NONE); + + ret = hal_common_put_backend_with_library_name(HAL_MODULE_END, + (void **)&backend_module_data, + library_name); + EXPECT_NE(ret, TIZEN_ERROR_NONE); + + g_free(library_name); +} -- 2.7.4 From 53bc52c5cac83368dcbf45bd676c3265237d0df7 Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Tue, 15 Nov 2022 09:43:03 +0900 Subject: [PATCH 15/16] halapi: common: Add HAL_ABI_VERSION_TIZEN_7_5 Add HAL_ABL_VERSION_TIZEN_7_5 after released Tizen-7.0. Because current Tizen Version is 7.5, It needs to add current Tizen version about HAL_ABI_VERSION. If it's not compatible between TIZEN_6.5 and TIZEN_7.5, it needs to modify by modules owner. Change-Id: Ifabd5981e7add0a9b07e08cb8fb14c603febb16f Signed-off-by: Jaehoon Chung --- include/hal-common-interface.h | 2 ++ src/hal-api-list.h | 56 +++++++++++++++++------------------ tests/unittest/hal-api-common-hook.c | 2 +- tests/unittest/test-hal-api-common.cc | 54 ++++++++++++++++----------------- 4 files changed, 58 insertions(+), 56 deletions(-) diff --git a/include/hal-common-interface.h b/include/hal-common-interface.h index 56734ce..b0abf12 100644 --- a/include/hal-common-interface.h +++ b/include/hal-common-interface.h @@ -27,6 +27,7 @@ enum hal_abi_version { HAL_ABI_VERSION_UNKNOWN = 0, HAL_ABI_VERSION_TIZEN_6_5, HAL_ABI_VERSION_TIZEN_7_0, + HAL_ABI_VERSION_TIZEN_7_5, HAL_ABI_VERSION_END, }; @@ -34,6 +35,7 @@ static const char *const hal_abi_version_str[] = { [HAL_ABI_VERSION_UNKNOWN] = "Unknown HAL ABI Version", [HAL_ABI_VERSION_TIZEN_6_5] = "HAL_ABI_VERSION_TIZEN_6_5", [HAL_ABI_VERSION_TIZEN_7_0] = "HAL_ABI_VERSION_TIZEN_7_0", + [HAL_ABI_VERSION_TIZEN_7_5] = "HAL_ABI_VERSION_TIZEN_7_5", }; typedef struct __hal_backend { diff --git a/src/hal-api-list.h b/src/hal-api-list.h index 967caaa..d2fa20e 100644 --- a/src/hal-api-list.h +++ b/src/hal-api-list.h @@ -23,21 +23,21 @@ #define HAL_ABI_VERSION_MAX 10 -enum hal_abi_version g_platform_curr_abi_version = HAL_ABI_VERSION_TIZEN_7_0; +enum hal_abi_version g_platform_curr_abi_version = HAL_ABI_VERSION_TIZEN_7_5; static struct hal_abi_version_match abi_version_match_data[HAL_MODULE_END][HAL_ABI_VERSION_MAX] = { /* HAL_GROUP_GRAPHICS */ [HAL_MODULE_TBM] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_TDM] = { /* FIXME: Need to be filled from configuration file. */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, @@ -58,21 +58,21 @@ static struct hal_abi_version_match abi_version_match_data[HAL_MODULE_END][HAL_A [HAL_MODULE_AUDIO] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_CAMERA] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_RADIO] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, @@ -99,14 +99,14 @@ static struct hal_abi_version_match abi_version_match_data[HAL_MODULE_END][HAL_A [HAL_MODULE_BLUETOOTH] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_WIFI] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, @@ -115,21 +115,21 @@ static struct hal_abi_version_match abi_version_match_data[HAL_MODULE_END][HAL_A [HAL_MODULE_NFC] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_ZIGBEE] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_UWB] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, @@ -144,7 +144,7 @@ static struct hal_abi_version_match abi_version_match_data[HAL_MODULE_END][HAL_A [HAL_MODULE_TELEPHONY] = { /* FIXME: Need to be determined whehter support HAL API or not. */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, @@ -153,7 +153,7 @@ static struct hal_abi_version_match abi_version_match_data[HAL_MODULE_END][HAL_A [HAL_MODULE_LOCATION] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, @@ -164,21 +164,21 @@ static struct hal_abi_version_match abi_version_match_data[HAL_MODULE_END][HAL_A [HAL_MODULE_POWER] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_SENSOR] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_PERIPHERAL] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, @@ -186,84 +186,84 @@ static struct hal_abi_version_match abi_version_match_data[HAL_MODULE_END][HAL_A [HAL_MODULE_DEVICE_BATTERY] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_BEZEL] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_DISPLAY] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_IR] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_TOUCHSCREEN] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_LED] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_BOARD] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_EXTERNAL_CONNECTION] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_THERMAL] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_USB_GADGET] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_HAPTIC] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, [HAL_MODULE_DEVICE_MEMORY] = { /* FIXME: Need to be initialized by configuration file like xml */ [0] = { - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, diff --git a/tests/unittest/hal-api-common-hook.c b/tests/unittest/hal-api-common-hook.c index c55b1cc..268c955 100644 --- a/tests/unittest/hal-api-common-hook.c +++ b/tests/unittest/hal-api-common-hook.c @@ -34,7 +34,7 @@ static int hal_backend_exit(void *data) { return 0; } hal_backend hal_backend_module_data = { .name = "hal-backend-module", .vendor = "hal-backend-vendor", - .abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .abi_version = HAL_ABI_VERSION_TIZEN_7_5, .init = hal_backend_init, .exit = hal_backend_exit, }; diff --git a/tests/unittest/test-hal-api-common.cc b/tests/unittest/test-hal-api-common.cc index 9723266..c544e76 100644 --- a/tests/unittest/test-hal-api-common.cc +++ b/tests/unittest/test-hal-api-common.cc @@ -55,10 +55,10 @@ TEST(HalApiCommonTest, test_symbol_name_invalid_module) { TEST(HalApiCommonTest, test_check_backend_abi_version_invalid_parameter) { int ret; - ret = hal_common_check_backend_abi_version(HAL_MODULE_UNKNOWN, HAL_ABI_VERSION_TIZEN_7_0); + ret = hal_common_check_backend_abi_version(HAL_MODULE_UNKNOWN, HAL_ABI_VERSION_TIZEN_7_5); EXPECT_EQ(ret, TIZEN_ERROR_INVALID_PARAMETER); - ret = hal_common_check_backend_abi_version(HAL_MODULE_END, HAL_ABI_VERSION_TIZEN_7_0); + ret = hal_common_check_backend_abi_version(HAL_MODULE_END, HAL_ABI_VERSION_TIZEN_7_5); EXPECT_EQ(ret, TIZEN_ERROR_INVALID_PARAMETER); ret = hal_common_check_backend_abi_version(HAL_MODULE_TBM, HAL_ABI_VERSION_UNKNOWN); @@ -117,7 +117,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-tbm.so", "hal_backend_tbm_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -131,7 +131,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-tdm.so", "hal_backend_tdm_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -167,7 +167,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-audio.so", "hal_backend_audio_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -181,7 +181,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-camera.so", "hal_backend_camera_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -195,7 +195,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-radio.so", "hal_backend_radio_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -242,7 +242,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-bluetooth.so", "hal_backend_bluetooth_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -256,7 +256,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-wifi.so", "hal_backend_wifi_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -281,7 +281,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-nfc.so", "hal_backend_nfc_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -295,7 +295,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-zigbee.so", "hal_backend_zigbee_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -309,7 +309,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-uwb.so", "hal_backend_uwb_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -345,7 +345,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-location.so", "hal_backend_location_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -370,7 +370,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-power.so", "hal_backend_power_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -384,7 +384,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-sensor.so", "hal_backend_sensor_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -408,7 +408,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-device-battery.so", "hal_backend_device_battery_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -422,7 +422,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-device-bezel.so", "hal_backend_device_bezel_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -436,7 +436,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-device-display.so", "hal_backend_device_display_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -450,7 +450,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-device-ir.so", "hal_backend_device_ir_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -464,7 +464,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-device-touchscreen.so", "hal_backend_device_touchscreen_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -478,7 +478,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-device-led.so", "hal_backend_device_led_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -492,7 +492,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-device-board.so", "hal_backend_device_board_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -506,7 +506,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-device-external-connection.so", "hal_backend_device_external_connection_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -520,7 +520,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-device-thermal.so", "hal_backend_device_thermal_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -534,7 +534,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-device-usb-gadget.so", "hal_backend_device_usb_gadget_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -548,7 +548,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-device-haptic.so", "hal_backend_device_haptic_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ), @@ -562,7 +562,7 @@ INSTANTIATE_TEST_CASE_P(HalApiCommonTest, "/hal/lib64/libhal-backend-device-memory.so", "hal_backend_device_memory_data", vector{{ - .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 }} ) -- 2.7.4 From c7bcb2226a1c0b28d503cdfbd0acc91e6a068d92 Mon Sep 17 00:00:00 2001 From: Yunhee Seo Date: Tue, 13 Dec 2022 14:41:42 +0900 Subject: [PATCH 16/16] halapi: common: add DEVICE_INPUT HAL module Add DEVICE_INPUT HAL module to control the input device. Change-Id: Iddb6457850cfe9ce36cb9f20db6dedc7e894a9a4 Signed-off-by: Yunhee Seo --- include/hal-common.h | 1 + src/hal-api-list.h | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/include/hal-common.h b/include/hal-common.h index 4c197fe..3f2826b 100644 --- a/include/hal-common.h +++ b/include/hal-common.h @@ -74,6 +74,7 @@ enum hal_module { HAL_MODULE_DEVICE_USB_GADGET, HAL_MODULE_DEVICE_HAPTIC, HAL_MODULE_DEVICE_MEMORY, + HAL_MODULE_DEVICE_INPUT, /* * TODO: If need to add new module, have to add it below diff --git a/src/hal-api-list.h b/src/hal-api-list.h index d2fa20e..b3ccf97 100644 --- a/src/hal-api-list.h +++ b/src/hal-api-list.h @@ -267,6 +267,13 @@ static struct hal_abi_version_match abi_version_match_data[HAL_MODULE_END][HAL_A .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5, }, }, + [HAL_MODULE_DEVICE_INPUT] = { + /* FIXME: Need to be initialized by configuration file like xml */ + [0] = { + .platform_abi_version = HAL_ABI_VERSION_TIZEN_7_5, + .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_7_0, + }, + }, }; static struct __hal_module_info g_hal_module_info[] = { @@ -736,6 +743,19 @@ static struct __hal_module_info g_hal_module_info[] = { .abi_versions = abi_version_match_data[HAL_MODULE_DEVICE_MEMORY], .hal_api = true, }, + [HAL_MODULE_DEVICE_INPUT] = { + .group = HAL_GROUP_SYSTEM, + .module = HAL_MODULE_DEVICE_INPUT, + .license = HAL_LICENSE_APACHE_2_0, + .module_name = "HAL_MODULE_DEVICE_INPUT", + .backend_module_name = "device-input", + .library_name = "/hal/lib/libhal-backend-device-input.so", + .library_name_64bit = "/hal/lib64/libhal-backend-device-input.so", + .symbol_name = "hal_backend_device_input_data", + .num_abi_versions = ARRAY_SIZE(abi_version_match_data[HAL_MODULE_DEVICE_INPUT]), + .abi_versions = abi_version_match_data[HAL_MODULE_DEVICE_INPUT], + .hal_api = true, + }, }; #endif /* __HAL_API_LIST_H__ */ -- 2.7.4