From: Jihoon Jung Date: Wed, 13 Jan 2021 05:39:57 +0000 (+0900) Subject: NFC hal : Replace HAL interface with hal-api-nfc X-Git-Tag: submit/tizen/20210208.055328^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc548aa79e6f0fc19e62590cd74232d07badb21c;p=platform%2Fcore%2Fconnectivity%2Fnfc-manager.git NFC hal : Replace HAL interface with hal-api-nfc Change-Id: I1c63ce7ebf1e3afb21ea7be4c5b06eb24dca2c74 Signed-off-by: Jihoon Jung --- diff --git a/CMakeLists.txt b/CMakeLists.txt index cea53b7..c0f48ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,8 @@ IF(BUILD_GCOV) ADD_DEFINITIONS("-DTIZEN_TEST_GCOV") ENDIF(BUILD_GCOV) +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/packaging/${PROJECT_NAME}.service.in ${CMAKE_SOURCE_DIR}/packaging/${PROJECT_NAME}.service @ONLY) + ADD_SUBDIRECTORY(src/commonlib) ADD_SUBDIRECTORY(src/manager) ADD_SUBDIRECTORY(haltests) diff --git a/packaging/nfc-manager.service b/packaging/nfc-manager.service deleted file mode 100644 index 285f76c..0000000 --- a/packaging/nfc-manager.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=NFC manager -After=system-server.service - -[Service] -Type=dbus -BusName=org.tizen.NetNfcService -ExecStart=/usr/bin/nfc-manager-daemon -KillSignal=SIGKILL -MemoryLimit=30M -Sockets=nfc-manager.socket -User=network_fw -Group=network_fw -SmackProcessLabel=System - -[Install] -WantedBy=multi-user.target diff --git a/packaging/nfc-manager.service.in b/packaging/nfc-manager.service.in new file mode 100644 index 0000000..e5d7492 --- /dev/null +++ b/packaging/nfc-manager.service.in @@ -0,0 +1,18 @@ +[Unit] +Description=NFC manager +After=system-server.service + +[Service] +Type=dbus +BusName=org.tizen.NetNfcService +ExecStart=/usr/bin/nfc-manager-daemon +KillSignal=SIGKILL +MemoryLimit=30M +Sockets=nfc-manager.socket +User=network_fw +Group=network_fw +SmackProcessLabel=System +Environment=LD_LIBRARY_PATH=@LIBDIR@/hal + +[Install] +WantedBy=multi-user.target diff --git a/packaging/nfc-manager.spec b/packaging/nfc-manager.spec index 34941a4..143226e 100644 --- a/packaging/nfc-manager.spec +++ b/packaging/nfc-manager.spec @@ -5,8 +5,7 @@ Release: 0 Group: Network & Connectivity/NFC License: Flora-1.1 Source0: %{name}-%{version}.tar.gz -Source1: nfc-manager.service -Source2: nfc-manager.socket +Source1: nfc-manager.socket BuildRequires: cmake BuildRequires: pkgconfig(aul) BuildRequires: pkgconfig(glib-2.0) @@ -37,6 +36,9 @@ BuildRequires: pkgconfig(cynara-creds-gdbus) BuildRequires: pkgconfig(cynara-session) BuildRequires: pkgconfig(capi-system-device) BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(hal-api-common) +BuildRequires: pkgconfig(hal-api-nfc) + BuildRequires: python BuildRequires: python-xml @@ -113,8 +115,8 @@ LDFLAGS="$LDFLAGS" cmake . \ %make_install mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants +cp -af %{_builddir}/%{name}-%{version}/packaging/%{name}.service %{buildroot}/usr/lib/systemd/system/ cp -af %{SOURCE1} %{buildroot}/usr/lib/systemd/system/ -cp -af %{SOURCE2} %{buildroot}/usr/lib/systemd/system/ mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants ln -s ../%{name}.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/%{name}.service diff --git a/src/commonlib/CMakeLists.txt b/src/commonlib/CMakeLists.txt index 4ae0d9b..349789f 100644 --- a/src/commonlib/CMakeLists.txt +++ b/src/commonlib/CMakeLists.txt @@ -63,7 +63,6 @@ TARGET_LINK_LIBRARIES(${NFC_COMMON_LIB} ${commonlib_pkges_LDFLAGS}) SET(COMMON_LIB_HEADER include/net_nfc_typedef.h include/net_nfc_util_internal.h - include/net_nfc_oem_controller.h include/net_nfc_typedef_internal.h include/net_nfc_util_ndef_message.h include/net_nfc_util_handover.h diff --git a/src/commonlib/include/net_nfc_oem_controller.h b/src/commonlib/include/net_nfc_oem_controller.h deleted file mode 100644 index b91abda..0000000 --- a/src/commonlib/include/net_nfc_oem_controller.h +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright (c) 2012, 2013 Samsung Electronics Co., Ltd. - * - * Licensed under the Flora License, Version 1.1 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://floralicense.org/license/ - * - * 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. - */ - -#ifndef __NET_NFC_OEM_CONTROLLER_H__ -#define __NET_NFC_OEM_CONTROLLER_H__ - -#include "net_nfc_typedef_internal.h" - -typedef bool(*net_nfc_oem_controller_init) (net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_deinit) (void); -typedef bool(*net_nfc_oem_controller_register_listener) (target_detection_listener_cb target_detection_listener, se_transaction_listener_cb se_transaction_listener, llcp_event_listener_cb llcp_event_listener, hce_apdu_listener_cb hce_apdu_listener, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_unregister_listener) (void); -typedef bool(*net_nfc_oem_controller_support_nfc) (net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_get_firmware_version) (data_s ** data, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_check_firmware_version) (net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_update_firmware) (net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_get_stack_information) (net_nfc_stack_information_s * stack_info, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_configure_discovery) (net_nfc_discovery_mode_e mode, net_nfc_event_filter_e config, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_exception_handler) (void); - -/* tag api */ -typedef bool(*net_nfc_oem_controller_connect) (net_nfc_target_handle_s * handle, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_disconnect) (net_nfc_target_handle_s * handle, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_check_target_presence) (net_nfc_target_handle_s * handle, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_check_ndef) (net_nfc_target_handle_s * handle, uint8_t * ndef_card_state, int *max_data_size, int *real_data_size, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_read_ndef) (net_nfc_target_handle_s * handle, data_s ** data, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_write_ndef) (net_nfc_target_handle_s * handle, data_s * data, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_make_read_only_ndef) (net_nfc_target_handle_s * handle, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_format_ndef) (net_nfc_target_handle_s * handle, data_s * secure_key, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_transceive) (net_nfc_target_handle_s * handle, net_nfc_transceive_info_s * info, data_s ** data, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_is_ready) (net_nfc_error_e * result); - -/* llcp api */ -typedef bool(*net_nfc_oem_controller_llcp_config) (net_nfc_llcp_config_info_s * config, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_llcp_check_llcp) (net_nfc_target_handle_s * handle, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_llcp_activate_llcp) (net_nfc_target_handle_s * handle, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_llcp_create_socket) (net_nfc_llcp_socket_t * socket, net_nfc_socket_type_e socketType, uint16_t miu, uint8_t rw, net_nfc_error_e * result, void *user_param); -typedef bool(*net_nfc_oem_controller_llcp_bind) (net_nfc_llcp_socket_t socket, uint8_t service_access_point, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_llcp_listen) (net_nfc_target_handle_s * handle, uint8_t * service_access_name, net_nfc_llcp_socket_t socket, net_nfc_error_e * result, void *user_param); -typedef bool(*net_nfc_oem_controller_llcp_accept) (net_nfc_llcp_socket_t socket, net_nfc_error_e * result, void *user_param); -typedef bool(*net_nfc_oem_controller_llcp_connect_by_url) (net_nfc_target_handle_s * handle, net_nfc_llcp_socket_t socket, uint8_t * service_access_name, net_nfc_error_e * result, void *user_param); -typedef bool(*net_nfc_oem_controller_llcp_connect) (net_nfc_target_handle_s * handle, net_nfc_llcp_socket_t socket, uint8_t service_access_point, net_nfc_error_e * result, void *user_param); -typedef bool(*net_nfc_oem_controller_llcp_disconnect) (net_nfc_target_handle_s * handle, net_nfc_llcp_socket_t socket, net_nfc_error_e * result, void *user_param); -typedef bool(*net_nfc_oem_controller_llcp_socket_close) (net_nfc_llcp_socket_t socket, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_llcp_recv) (net_nfc_target_handle_s * handle, net_nfc_llcp_socket_t socket, data_s * data, net_nfc_error_e * result, void *user_param); -typedef bool(*net_nfc_oem_controller_llcp_send) (net_nfc_target_handle_s * handle, net_nfc_llcp_socket_t socket, data_s * data, net_nfc_error_e * result, void *user_param); -typedef bool(*net_nfc_oem_controller_llcp_recv_from) (net_nfc_target_handle_s * handle, net_nfc_llcp_socket_t socket, data_s * data, net_nfc_error_e * result, void *user_param); -typedef bool(*net_nfc_oem_controller_llcp_send_to) (net_nfc_target_handle_s * handle, net_nfc_llcp_socket_t socket, data_s * data, uint8_t service_access_point, net_nfc_error_e * result, void *user_param); -typedef bool(*net_nfc_oem_controller_llcp_reject) (net_nfc_target_handle_s * handle, net_nfc_llcp_socket_t socket, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_llcp_get_remote_config) (net_nfc_target_handle_s * handle, net_nfc_llcp_config_info_s * config, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_llcp_get_remote_socket_info) (net_nfc_target_handle_s * handle, net_nfc_llcp_socket_t socket, net_nfc_llcp_socket_option_s * option, net_nfc_error_e * result); - -/* secure element api */ -typedef bool(*net_nfc_oem_controller_get_secure_element_list) (net_nfc_secure_element_info_s * list, int *count, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_set_secure_element_mode) (net_nfc_secure_element_type_e element_type, net_nfc_secure_element_mode_e mode, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_secure_element_open) (net_nfc_secure_element_type_e element_type, net_nfc_target_handle_s ** handle, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_secure_element_get_atr) (net_nfc_target_handle_s * handle, data_s ** atr, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_secure_element_send_apdu) (net_nfc_target_handle_s * handle, data_s * command, data_s ** response, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_secure_element_close) (net_nfc_target_handle_s * handle, net_nfc_error_e * result); - -/* test api */ -typedef bool(*net_nfc_oem_controller_sim_test) (net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_prbs_test) (net_nfc_error_e * result, int tech, int rate); -typedef bool(*net_nfc_oem_controller_test_mode_on) (net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_test_mode_off) (net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_eedata_register_set) (net_nfc_error_e * result, uint32_t mode, uint32_t reg_id, data_s * data); -typedef bool(*net_nfc_oem_controller_ese_test) (net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_test_set_se_tech_type) (net_nfc_error_e * result, net_nfc_se_type_e type, uint32_t tech); - -/* hce api*/ -typedef bool(*net_nfc_oem_controller_hce_response_apdu) (net_nfc_target_handle_s * handle, data_s * command, net_nfc_error_e * result); - -typedef bool(*net_nfc_oem_controller_secure_element_route_aid) (data_s * aid, net_nfc_se_type_e se_type, int power, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_secure_element_unroute_aid) (data_s * aid, net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_secure_element_commit_routing) (net_nfc_error_e * result); - -typedef bool(*net_nfc_oem_controller_secure_element_set_default_route) (net_nfc_se_type_e switch_on, net_nfc_se_type_e switch_off, net_nfc_se_type_e battery_off, net_nfc_error_e * result); - -typedef bool(*net_nfc_oem_controller_secure_element_clear_aid_table) (net_nfc_error_e * result); -typedef bool(*net_nfc_oem_controller_secure_element_get_aid_tablesize) (int *AIDTableSize, net_nfc_error_e * result); - -typedef bool(*net_nfc_oem_controller_secure_element_set_route_entry) -(net_nfc_se_entry_type_e type, net_nfc_se_tech_protocol_type_e value, net_nfc_se_type_e route, int power, net_nfc_error_e * result); - -typedef bool(*net_nfc_oem_controller_secure_element_clear_routing_entry) -(net_nfc_se_entry_type_e type, net_nfc_error_e * result); - -typedef bool(*net_nfc_oem_controller_secure_element_set_listen_tech_mask) -(net_nfc_se_tech_protocol_type_e screen_state, net_nfc_error_e * result); - -typedef bool(*net_nfc_oem_controller_set_screen_state) -(net_nfc_screen_state_type_e screen_state, net_nfc_error_e * result); - -typedef struct _net_nfc_oem_interface_s { - net_nfc_oem_controller_init init; - net_nfc_oem_controller_deinit deinit; - net_nfc_oem_controller_register_listener register_listener; - net_nfc_oem_controller_unregister_listener unregister_listener; - net_nfc_oem_controller_get_firmware_version get_firmware_version; - net_nfc_oem_controller_check_firmware_version check_firmware_version; - net_nfc_oem_controller_update_firmware update_firmeware; - net_nfc_oem_controller_get_stack_information get_stack_information; - net_nfc_oem_controller_configure_discovery configure_discovery; - net_nfc_oem_controller_get_secure_element_list get_secure_element_list; - net_nfc_oem_controller_set_secure_element_mode set_secure_element_mode; - net_nfc_oem_controller_connect connect; - net_nfc_oem_controller_connect disconnect; - net_nfc_oem_controller_check_ndef check_ndef; - net_nfc_oem_controller_check_target_presence check_presence; - net_nfc_oem_controller_read_ndef read_ndef; - net_nfc_oem_controller_write_ndef write_ndef; - net_nfc_oem_controller_make_read_only_ndef make_read_only_ndef; - net_nfc_oem_controller_transceive transceive; - net_nfc_oem_controller_format_ndef format_ndef; - net_nfc_oem_controller_exception_handler exception_handler; - net_nfc_oem_controller_is_ready is_ready; - - net_nfc_oem_controller_llcp_config config_llcp; - net_nfc_oem_controller_llcp_check_llcp check_llcp_status; - net_nfc_oem_controller_llcp_activate_llcp activate_llcp; - net_nfc_oem_controller_llcp_create_socket create_llcp_socket; - net_nfc_oem_controller_llcp_bind bind_llcp_socket; - net_nfc_oem_controller_llcp_listen listen_llcp_socket; - net_nfc_oem_controller_llcp_accept accept_llcp_socket; - net_nfc_oem_controller_llcp_connect_by_url connect_llcp_by_url; - net_nfc_oem_controller_llcp_connect connect_llcp; - net_nfc_oem_controller_llcp_disconnect disconnect_llcp; - net_nfc_oem_controller_llcp_socket_close close_llcp_socket; - net_nfc_oem_controller_llcp_recv recv_llcp; - net_nfc_oem_controller_llcp_send send_llcp; - net_nfc_oem_controller_llcp_recv_from recv_from_llcp; - net_nfc_oem_controller_llcp_send_to send_to_llcp; - net_nfc_oem_controller_llcp_reject reject_llcp; - net_nfc_oem_controller_llcp_get_remote_config get_remote_config; - net_nfc_oem_controller_llcp_get_remote_socket_info get_remote_socket_info; - - net_nfc_oem_controller_sim_test sim_test; - net_nfc_oem_controller_prbs_test prbs_test; - net_nfc_oem_controller_test_mode_on test_mode_on; - net_nfc_oem_controller_test_mode_off test_mode_off; - net_nfc_oem_controller_ese_test ese_test; - - net_nfc_oem_controller_support_nfc support_nfc; - net_nfc_oem_controller_eedata_register_set eedata_register_set; - - net_nfc_oem_controller_secure_element_open secure_element_open; - net_nfc_oem_controller_secure_element_get_atr secure_element_get_atr; - net_nfc_oem_controller_secure_element_send_apdu secure_element_send_apdu; - net_nfc_oem_controller_secure_element_close secure_element_close; - - net_nfc_oem_controller_test_set_se_tech_type test_set_se_tech_type; - - net_nfc_oem_controller_hce_response_apdu hce_response_apdu; - net_nfc_oem_controller_secure_element_route_aid route_aid; - net_nfc_oem_controller_secure_element_unroute_aid unroute_aid; - net_nfc_oem_controller_secure_element_commit_routing commit_routing; - net_nfc_oem_controller_secure_element_set_default_route set_default_route; - net_nfc_oem_controller_secure_element_clear_aid_table clear_aid_table; - net_nfc_oem_controller_secure_element_get_aid_tablesize get_aid_tablesize; - - net_nfc_oem_controller_secure_element_set_route_entry set_routing_entry; - net_nfc_oem_controller_secure_element_clear_routing_entry clear_routing_entry; - net_nfc_oem_controller_secure_element_set_listen_tech_mask set_listen_tech_mask; - - net_nfc_oem_controller_set_screen_state set_screen_state; -} net_nfc_oem_interface_s; - -#endif //__NET_NFC_OEM_CONTROLLER_H__ diff --git a/src/commonlib/net_nfc_util.c b/src/commonlib/net_nfc_util.c index d60678d..b83051d 100644 --- a/src/commonlib/net_nfc_util.c +++ b/src/commonlib/net_nfc_util.c @@ -31,7 +31,6 @@ // nfc-manager header #include "net_nfc_util_internal.h" #include "net_nfc_debug_internal.h" -#include "net_nfc_oem_controller.h" #include "net_nfc_util_defines.h" #ifndef NET_NFC_EXPORT_API diff --git a/src/manager/CMakeLists.txt b/src/manager/CMakeLists.txt index 68f1007..34e7db5 100644 --- a/src/manager/CMakeLists.txt +++ b/src/manager/CMakeLists.txt @@ -17,7 +17,7 @@ IF("${CMAKE_BUILD_TYPE}" STREQUAL "") ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "") # for package file -SET(dependents "aul glib-2.0 gio-unix-2.0 vconf dlog tapi appsvc libcurl bluetooth-api capi-network-bluetooth openssl1.1 deviced feedback capi-media-wav-player mm-keysound syspopup-caller notification capi-network-wifi-manager capi-system-info sqlite3 capi-network-wifi-direct capi-system-device cynara-client cynara-creds-gdbus cynara-session") +SET(dependents "aul glib-2.0 gio-unix-2.0 vconf dlog tapi appsvc libcurl bluetooth-api capi-network-bluetooth openssl1.1 deviced feedback capi-media-wav-player mm-keysound syspopup-caller notification capi-network-wifi-manager capi-system-info sqlite3 capi-network-wifi-direct capi-system-device cynara-client cynara-creds-gdbus cynara-session hal-api-nfc hal-api-common") IF (TIZEN_TELEPHONY_ENABLED) MESSAGE("-DENABLE_TELEPHONY") diff --git a/src/manager/include/net_nfc_controller_internal.h b/src/manager/include/net_nfc_controller_internal.h old mode 100644 new mode 100755 index c91c813..98149bc --- a/src/manager/include/net_nfc_controller_internal.h +++ b/src/manager/include/net_nfc_controller_internal.h @@ -27,8 +27,8 @@ typedef struct _socket_info_t { } socket_info_t; /* common api */ -void *net_nfc_controller_onload(void); -bool net_nfc_controller_unload(void *handle); +bool net_nfc_controller_onload(void); +bool net_nfc_controller_unload(void); bool net_nfc_controller_init(net_nfc_error_e * result); bool net_nfc_controller_deinit(void); bool net_nfc_controller_register_listener(target_detection_listener_cb target_detection_listener, se_transaction_listener_cb se_transaction_listener, llcp_event_listener_cb llcp_event_listener, hce_apdu_listener_cb hce_apdu_listener, net_nfc_error_e * result); @@ -91,7 +91,6 @@ bool net_nfc_controller_sim_test(net_nfc_error_e * result); bool net_nfc_controller_prbs_test(net_nfc_error_e * result, uint32_t tech, uint32_t rate); bool net_nfc_controller_test_mode_on(net_nfc_error_e * result); bool net_nfc_controller_test_mode_off(net_nfc_error_e * result); -bool net_nfc_test_sim(void); bool net_nfc_controller_eedata_register_set(net_nfc_error_e * result, uint32_t mode, uint32_t reg_id, data_s * data); bool net_nfc_controller_ese_test(net_nfc_error_e * result); bool net_nfc_controller_test_set_se_tech_type(net_nfc_error_e * result, net_nfc_se_type_e type, uint32_t tech); diff --git a/src/manager/net_nfc_controller.c b/src/manager/net_nfc_controller.c old mode 100644 new mode 100755 index f5ee739..40235c1 --- a/src/manager/net_nfc_controller.c +++ b/src/manager/net_nfc_controller.c @@ -26,487 +26,327 @@ #include /*for pm lock */ #include -#include "net_nfc_oem_controller.h" #include "net_nfc_controller_internal.h" #include "net_nfc_util_internal.h" #include "net_nfc_debug_internal.h" #include "net_nfc_server_tag.h" -#define NET_NFC_OEM_LIBRARY_PATH "/usr/lib/libnfc-plugin.so" -#define NET_NFC_DEFAULT_PLUGIN "libnfc-plugin.so" +#include -static net_nfc_oem_interface_s g_interface; - -static void *net_nfc_controller_load_file(const char *dir_path, const char *filename) +bool net_nfc_controller_onload() { - void *handle = NULL; - char path[PATH_MAX] = { '\0' }; - struct stat st; - - net_nfc_error_e result; - - bool(*onload) (net_nfc_oem_interface_s * interfaces); - - snprintf(path, PATH_MAX, "%s/%s", dir_path, filename); - SECURE_MSG("path : %s", path); - - if (stat(path, &st) == -1) { - DEBUG_ERR_MSG("stat failed : file not found"); // LCOV_EXCL_LINE - goto ERROR; - } - - if (S_ISREG(st.st_mode) == 0) { - DEBUG_ERR_MSG("S_ISREG(st.st_mode) == 0"); // LCOV_EXCL_LINE - goto ERROR; - } - - handle = dlopen(path, RTLD_LAZY); - if (handle == NULL) { - DEBUG_ERR_MSG("dlopen failed, [%d] : %s", errno, dlerror()); // LCOV_EXCL_LINE - goto ERROR; - } - - onload = dlsym(handle, "onload"); - if (onload == NULL) { - DEBUG_ERR_MSG("dlsym failed, [%d] : %s", errno, dlerror()); // LCOV_EXCL_LINE - goto ERROR; - } - - memset(&g_interface, 0, sizeof(g_interface)); - if (onload(&g_interface) == false) { - DEBUG_ERR_MSG("onload failed"); // LCOV_EXCL_LINE - goto ERROR; - } - - if (net_nfc_controller_support_nfc(&result) == false) { - DEBUG_ERR_MSG("net_nfc_controller_support_nfc failed, [%d]", result); // LCOV_EXCL_LINE - goto ERROR; - } - - return handle; + bool ret = false; - ERROR: - if (handle != NULL) // LCOV_EXCL_LINE - dlclose(handle); // LCOV_EXCL_LINE + int ret_val = hal_nfc_get_backend(); + if (ret_val == NET_NFC_OK) + ret = true; - return NULL; + return ret; } -void *net_nfc_controller_onload() +bool net_nfc_controller_unload() { - DIR *dirp; - struct dirent *dir; - - void *handle = NULL; - - dirp = opendir(NFC_MANAGER_MODULEDIR); - if (dirp == NULL) { - SECURE_MSG("Can not open directory %s", NFC_MANAGER_MODULEDIR); - return NULL; - } - - while ((dir = readdir(dirp))) { - if ((strcmp(dir->d_name, ".") == 0) || (strcmp(dir->d_name, "..") == 0)) - continue; - - /* check ".so" suffix */ - if (strcmp(dir->d_name + (strlen(dir->d_name) - strlen(".so")), ".so") != 0) - continue; - - /* check default plugin later */ - if (strcmp(dir->d_name, NET_NFC_DEFAULT_PLUGIN) == 0) - continue; - - handle = net_nfc_controller_load_file(NFC_MANAGER_MODULEDIR, dir->d_name); - if (handle) { - SECURE_LOGD("Successfully loaded : %s", dir->d_name); - closedir(dirp); - return handle; - } - } + bool ret = false; - closedir(dirp); // LCOV_EXCL_LINE + int ret_val = hal_nfc_put_backend(); + if (ret_val == NET_NFC_OK) + ret = true; - /* load default plugin */ - handle = net_nfc_controller_load_file(NFC_MANAGER_MODULEDIR, NET_NFC_DEFAULT_PLUGIN); // LCOV_EXCL_LINE - - if (handle) { // LCOV_EXCL_LINE - SECURE_MSG("loaded default plugin : %s", NET_NFC_DEFAULT_PLUGIN); // LCOV_EXCL_LINE - return handle; - } else { - SECURE_MSG("can not load default plugin : %s", NET_NFC_DEFAULT_PLUGIN); // LCOV_EXCL_LINE - return NULL; - } + return ret; } -bool net_nfc_controller_unload(void *handle) +bool net_nfc_controller_init(net_nfc_error_e * result) { - memset(&g_interface, 0x00, sizeof(net_nfc_oem_interface_s)); + bool ret = false; - if (handle != NULL) { - dlclose(handle); - handle = NULL; - } - return true; -} + ret = hal_nfc_start(result); -bool net_nfc_controller_init(net_nfc_error_e * result) -{ - if (g_interface.init != NULL) { - return g_interface.init(result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; // LCOV_EXCL_LINE - DEBUG_SERVER_MSG("interface is null"); // LCOV_EXCL_LINE - return false; - } + return ret; } bool net_nfc_controller_deinit(void) { - if (g_interface.deinit != NULL) { - return g_interface.deinit(); - } else { - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_stop(); + + return ret; } bool net_nfc_controller_register_listener(target_detection_listener_cb target_detection_listener, se_transaction_listener_cb se_transaction_listener, llcp_event_listener_cb llcp_event_listener, hce_apdu_listener_cb hce_apdu_listener, net_nfc_error_e * result) { - if (g_interface.register_listener != NULL) { - return g_interface.register_listener(target_detection_listener, se_transaction_listener, llcp_event_listener, hce_apdu_listener, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; // LCOV_EXCL_LINE - DEBUG_SERVER_MSG("interface is null"); // LCOV_EXCL_LINE - return false; - } + bool ret = false; + + ret = hal_nfc_register_listener(target_detection_listener, se_transaction_listener, llcp_event_listener, hce_apdu_listener, result); + + return ret; } /* LCOV_EXCL_START */ bool net_nfc_controller_unregister_listener() { - if (g_interface.unregister_listener != NULL) { - return g_interface.unregister_listener(); - } else { - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_unregister_listener(); + + return ret; } bool net_nfc_controller_get_firmware_version(data_s ** data, net_nfc_error_e * result) { - if (g_interface.get_firmware_version != NULL) { - return g_interface.get_firmware_version(data, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_get_firmware_version(data, result); + + return ret; } bool net_nfc_controller_check_firmware_version(net_nfc_error_e * result) { - if (g_interface.check_firmware_version != NULL) { - return g_interface.check_firmware_version(result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_check_firmware_version(result); + + return ret; } bool net_nfc_controller_update_firmware(net_nfc_error_e * result) { - if (g_interface.update_firmeware != NULL) { - return g_interface.update_firmeware(result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_update_firmware(result); + + return ret; } bool net_nfc_controller_get_stack_information(net_nfc_stack_information_s * stack_info, net_nfc_error_e * result) { - if (g_interface.get_stack_information != NULL) { - return g_interface.get_stack_information(stack_info, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_get_stack_information(stack_info, result); + + return ret; } /* LCOV_EXCL_STOP */ bool net_nfc_controller_configure_discovery(net_nfc_discovery_mode_e mode, net_nfc_event_filter_e config, net_nfc_error_e * result) { - if (g_interface.configure_discovery != NULL) { - return g_interface.configure_discovery(mode, config, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; // LCOV_EXCL_LINE - DEBUG_SERVER_MSG("interface is null"); // LCOV_EXCL_LINE - return false; - } + bool ret = false; + + ret = hal_nfc_configure_discovery(mode, config, result); + + return ret; } /* LCOV_EXCL_START */ bool net_nfc_controller_get_secure_element_list(net_nfc_secure_element_info_s * list, int *count, net_nfc_error_e * result) { - if (g_interface.get_secure_element_list != NULL) { - return g_interface.get_secure_element_list(list, count, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; // LCOV_EXCL_LINE - DEBUG_SERVER_MSG("interface is null"); // LCOV_EXCL_LINE - return false; - } + bool ret = false; + + ret = hal_nfc_get_secure_element_list(list, count, result); + + return ret; } /* LCOV_EXCL_STOP */ bool net_nfc_controller_set_secure_element_mode(net_nfc_secure_element_type_e element_type, net_nfc_secure_element_mode_e mode, net_nfc_error_e * result) { - if (g_interface.set_secure_element_mode != NULL) { - return g_interface.set_secure_element_mode(element_type, mode, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_set_secure_element_mode(element_type, mode, result); + + return ret; } /* LCOV_EXCL_START */ bool net_nfc_controller_secure_element_open(net_nfc_secure_element_type_e element_type, net_nfc_target_handle_s ** handle, net_nfc_error_e * result) { - if (g_interface.secure_element_open != NULL) { - bool ret; + bool ret = false; - ret = g_interface.secure_element_open(element_type, handle, result); - if (ret == true) { - int ret_val; + ret = hal_nfc_secure_element_open(element_type, handle, result); + if (ret == true) { + int ret_val; - ret_val = device_power_request_lock(POWER_LOCK_CPU, 300000); - if (ret_val < 0) - DEBUG_ERR_MSG("device_power_request_lock failed, [%d]", ret_val); - } - - return ret; - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; + ret_val = device_power_request_lock(POWER_LOCK_CPU, 300000); + if (ret_val < 0) + DEBUG_ERR_MSG("device_power_request_lock failed, [%d]", ret_val); } + + return ret; } bool net_nfc_controller_secure_element_get_atr(net_nfc_target_handle_s * handle, data_s ** atr, net_nfc_error_e * result) { - if (g_interface.secure_element_get_atr != NULL) { - return g_interface.secure_element_get_atr(handle, atr, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_secure_element_get_atr(handle, atr, result); + + return ret; } bool net_nfc_controller_secure_element_send_apdu(net_nfc_target_handle_s * handle, data_s * command, data_s ** response, net_nfc_error_e * result) { - if (g_interface.secure_element_send_apdu != NULL) { - return g_interface.secure_element_send_apdu(handle, command, response, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_secure_element_send_apdu(handle, command, response, result); + + return ret; } bool net_nfc_controller_secure_element_close(net_nfc_target_handle_s * handle, net_nfc_error_e * result) { + bool ret = false; int ret_val; ret_val = device_power_release_lock(POWER_LOCK_CPU); if (ret_val < 0) DEBUG_ERR_MSG("device_power_release_lock failed, [%d]", ret_val); - if (g_interface.secure_element_close != NULL) { - return g_interface.secure_element_close(handle, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + ret = hal_nfc_secure_element_close(handle, result); + + return ret; } bool net_nfc_controller_check_target_presence(net_nfc_target_handle_s * handle, net_nfc_error_e * result) { - if (g_interface.check_presence != NULL) { - return g_interface.check_presence(handle, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_check_target_presence(handle, result); + + return ret; } bool net_nfc_controller_connect(net_nfc_target_handle_s * handle, net_nfc_error_e * result) { - if (g_interface.connect != NULL) { - bool ret; - - ret = g_interface.connect(handle, result); - if (ret == true) { - int ret_val = 0; + bool ret = false; - ret_val = device_power_request_lock(POWER_LOCK_CPU, 20000); - if (ret_val < 0) - DEBUG_ERR_MSG("device_power_request_lock failed, [%d]", ret_val); - } + ret = hal_nfc_connect(handle, result); + if (ret == true) { + int ret_val = 0; - return ret; - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; + ret_val = device_power_request_lock(POWER_LOCK_CPU, 20000); + if (ret_val < 0) + DEBUG_ERR_MSG("device_power_request_lock failed, [%d]", ret_val); } + + return ret; } bool net_nfc_controller_disconnect(net_nfc_target_handle_s * handle, net_nfc_error_e * result) { + bool ret = false; int ret_val; ret_val = device_power_release_lock(POWER_LOCK_CPU); if (ret_val < 0) DEBUG_ERR_MSG("device_power_release_lock failed, [%d]", ret_val); - if (g_interface.disconnect != NULL) { - net_nfc_server_free_target_info(); + net_nfc_server_free_target_info(); - return g_interface.disconnect(handle, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + ret = hal_nfc_disconnect(handle, result); + + return ret; } bool net_nfc_controller_check_ndef(net_nfc_target_handle_s * handle, uint8_t * ndef_card_state, int *max_data_size, int *real_data_size, net_nfc_error_e * result) { - if (g_interface.check_ndef != NULL) { - return g_interface.check_ndef(handle, ndef_card_state, max_data_size, real_data_size, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_check_ndef(handle, ndef_card_state, max_data_size, real_data_size, result); + + return ret; } bool net_nfc_controller_read_ndef(net_nfc_target_handle_s * handle, data_s ** data, net_nfc_error_e * result) { - if (g_interface.read_ndef != NULL) { - return g_interface.read_ndef(handle, data, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_read_ndef(handle, data, result); + + return ret; } bool net_nfc_controller_write_ndef(net_nfc_target_handle_s * handle, data_s * data, net_nfc_error_e * result) { - if (g_interface.write_ndef != NULL) { - return g_interface.write_ndef(handle, data, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_write_ndef(handle, data, result); + + return ret; } bool net_nfc_controller_make_read_only_ndef(net_nfc_target_handle_s * handle, net_nfc_error_e * result) { - if (g_interface.make_read_only_ndef != NULL) { - return g_interface.make_read_only_ndef(handle, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_make_read_only_ndef(handle, result); + + return ret; } bool net_nfc_controller_format_ndef(net_nfc_target_handle_s * handle, data_s * secure_key, net_nfc_error_e * result) { - if (g_interface.format_ndef != NULL) { - return g_interface.format_ndef(handle, secure_key, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_format_ndef(handle, secure_key, result); + + return ret; } bool net_nfc_controller_transceive(net_nfc_target_handle_s * handle, net_nfc_transceive_info_s * info, data_s ** data, net_nfc_error_e * result) { - if (g_interface.transceive != NULL) { - return g_interface.transceive(handle, info, data, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_transceive(handle, info, data, result); + + return ret; } bool net_nfc_controller_exception_handler() { - if (g_interface.exception_handler != NULL) { - return g_interface.exception_handler(); - } else { - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_exception_handler(); + + return ret; } /* LCOV_EXCL_STOP */ bool net_nfc_controller_is_ready(net_nfc_error_e * result) { - if (g_interface.is_ready != NULL) { - return g_interface.is_ready(result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; // LCOV_EXCL_LINE - DEBUG_SERVER_MSG("interface is null"); // LCOV_EXCL_LINE - return false; - } + bool ret = false; + + ret = hal_nfc_is_ready(result); + + return ret; } bool net_nfc_controller_llcp_config(net_nfc_llcp_config_info_s * config, net_nfc_error_e * result) { - if (g_interface.config_llcp != NULL) { - return g_interface.config_llcp(config, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; // LCOV_EXCL_LINE - DEBUG_SERVER_MSG("interface is null"); // LCOV_EXCL_LINE - return false; - } + bool ret = false; + + ret = hal_nfc_llcp_config(config, result); + + return ret; } /* LCOV_EXCL_START */ bool net_nfc_controller_llcp_check_llcp(net_nfc_target_handle_s * handle, net_nfc_error_e * result) { - if (g_interface.check_llcp_status != NULL) { - return g_interface.check_llcp_status(handle, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_llcp_check_llcp(handle, result); + + return ret; } bool net_nfc_controller_llcp_activate_llcp(net_nfc_target_handle_s * handle, net_nfc_error_e * result) { - if (g_interface.activate_llcp != NULL) { - return g_interface.activate_llcp(handle, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_llcp_activate_llcp(handle, result); + + return ret; } static GSList *llcp_sockets; @@ -578,43 +418,35 @@ void net_nfc_controller_llcp_socket_error_cb(net_nfc_llcp_socket_t socket, net_n bool net_nfc_controller_llcp_create_socket(net_nfc_llcp_socket_t * socket, net_nfc_socket_type_e socketType, uint16_t miu, uint8_t rw, net_nfc_error_e * result, net_nfc_service_llcp_cb cb, void *user_param) { - if (g_interface.create_llcp_socket != NULL) { - bool ret; - socket_info_t *info; - - info = _add_socket_info(-1); - if (info == NULL) { - DEBUG_ERR_MSG("_net_nfc_util_alloc_mem failed"); - *result = NET_NFC_ALLOC_FAIL; - return false; - } + bool ret = false; + socket_info_t *info; - ret = g_interface.create_llcp_socket(socket, socketType, miu, rw, result, NULL); - if (ret == true) { - info->socket = *socket; - info->err_cb = cb; - info->err_param = user_param; - } else { - _remove_socket_info(-1); - } + info = _add_socket_info(-1); + if (info == NULL) { + DEBUG_ERR_MSG("_net_nfc_util_alloc_mem failed"); + *result = NET_NFC_ALLOC_FAIL; + return false; + } - return ret; + ret = hal_nfc_llcp_create_socket(socket, socketType, miu, rw, result, NULL); + if (ret == true) { + info->socket = *socket; + info->err_cb = cb; + info->err_param = user_param; } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; + _remove_socket_info(-1); } + + return ret; } bool net_nfc_controller_llcp_bind(net_nfc_llcp_socket_t socket, uint8_t service_access_point, net_nfc_error_e * result) { - if (g_interface.bind_llcp_socket != NULL) { - return g_interface.bind_llcp_socket(socket, service_access_point, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_llcp_bind(socket, service_access_point, result); + + return ret; } void net_nfc_controller_llcp_incoming_cb(net_nfc_llcp_socket_t socket, net_nfc_error_e result, void *data, void *user_param) @@ -634,65 +466,53 @@ void net_nfc_controller_llcp_incoming_cb(net_nfc_llcp_socket_t socket, net_nfc_e bool net_nfc_controller_llcp_listen(net_nfc_target_handle_s * handle, uint8_t * service_access_name, net_nfc_llcp_socket_t socket, net_nfc_error_e * result, net_nfc_service_llcp_cb cb, void *user_param) { - if (g_interface.listen_llcp_socket != NULL) { - socket_info_t *info; - - info = _get_socket_info(socket); - if (info == NULL) { - DEBUG_ERR_MSG("_get_socket_info failed"); - *result = NET_NFC_INVALID_HANDLE; - return false; - } - - info->work_cb = cb; - info->work_param = user_param; + bool ret = false; + socket_info_t *info; - return g_interface.listen_llcp_socket(handle, service_access_name, socket, result, info); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); + info = _get_socket_info(socket); + if (info == NULL) { + DEBUG_ERR_MSG("_get_socket_info failed"); + *result = NET_NFC_INVALID_HANDLE; return false; } + + info->work_cb = cb; + info->work_param = user_param; + + ret = hal_nfc_llcp_listen(handle, service_access_name, socket, result, info); + + return ret; } bool net_nfc_controller_llcp_accept(net_nfc_llcp_socket_t socket, net_nfc_error_e * result, net_nfc_service_llcp_cb cb, void *user_param) { - if (g_interface.accept_llcp_socket != NULL) { - socket_info_t *info; - - info = _get_socket_info(socket); - if (info == NULL) { - DEBUG_ERR_MSG("_get_socket_info failed"); - *result = NET_NFC_INVALID_HANDLE; - return false; - } - - info->err_cb = cb; - info->err_param = user_param; + bool ret = false; + socket_info_t *info; - return g_interface.accept_llcp_socket(socket, result, NULL); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); + info = _get_socket_info(socket); + if (info == NULL) { + DEBUG_ERR_MSG("_get_socket_info failed"); + *result = NET_NFC_INVALID_HANDLE; return false; } + + info->err_cb = cb; + info->err_param = user_param; + + ret = hal_nfc_llcp_accept(socket, result, NULL); + + return ret; } bool net_nfc_controller_llcp_reject(net_nfc_target_handle_s * handle, net_nfc_llcp_socket_t socket, net_nfc_error_e * result) { - if (g_interface.reject_llcp != NULL) { - bool ret; + bool ret = false; - ret = g_interface.reject_llcp(handle, socket, result); - if (ret == true) - _remove_socket_info(socket); + ret = hal_nfc_llcp_reject(handle, socket, result); + if (ret == true) + _remove_socket_info(socket); - return ret; - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + return ret; } void net_nfc_controller_llcp_connected_cb(net_nfc_llcp_socket_t socket, net_nfc_error_e result, void *data, void *user_param) @@ -710,73 +530,60 @@ void net_nfc_controller_llcp_connected_cb(net_nfc_llcp_socket_t socket, net_nfc_ bool net_nfc_controller_llcp_connect_by_url(net_nfc_target_handle_s * handle, net_nfc_llcp_socket_t socket, uint8_t * service_access_name, net_nfc_error_e * result, net_nfc_service_llcp_cb cb, void *user_param) { - bool ret; - - if (g_interface.connect_llcp_by_url != NULL) { - net_nfc_llcp_param_t *param = NULL; + bool ret = false; + net_nfc_llcp_param_t *param = NULL; - _net_nfc_util_alloc_mem(param, sizeof(*param)); - if (param == NULL) { - DEBUG_ERR_MSG("_net_nfc_util_alloc_mem failed"); - *result = NET_NFC_ALLOC_FAIL; - return false; - } - - param->socket = socket; - param->cb = cb; - param->user_param = user_param; + _net_nfc_util_alloc_mem(param, sizeof(*param)); + if (param == NULL) { + DEBUG_ERR_MSG("_net_nfc_util_alloc_mem failed"); + *result = NET_NFC_ALLOC_FAIL; + return false; + } - ret = g_interface.connect_llcp_by_url(handle, socket, service_access_name, result, param); - if (ret == true) { - int ret_val; + param->socket = socket; + param->cb = cb; + param->user_param = user_param; - ret_val = device_power_request_lock(POWER_LOCK_CPU, 20000); - if (ret_val < 0) - DEBUG_ERR_MSG("device_power_request_lock failed, [%d]", ret_val); - } else { - _remove_socket_info(socket); - } + ret = hal_nfc_llcp_connect_by_url(handle, socket, service_access_name, result, param); + if (ret == true) { + int ret_val; - return ret; + ret_val = device_power_request_lock(POWER_LOCK_CPU, 20000); + if (ret_val < 0) + DEBUG_ERR_MSG("device_power_request_lock failed, [%d]", ret_val); } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; + _remove_socket_info(socket); } + + return ret; } bool net_nfc_controller_llcp_connect(net_nfc_target_handle_s * handle, net_nfc_llcp_socket_t socket, uint8_t service_access_point, net_nfc_error_e * result, net_nfc_service_llcp_cb cb, void *user_param) { - if (g_interface.connect_llcp != NULL) { - bool ret; - net_nfc_llcp_param_t *param = NULL; + bool ret = false; + net_nfc_llcp_param_t *param = NULL; - _net_nfc_util_alloc_mem(param, sizeof(*param)); - if (param == NULL) { - DEBUG_ERR_MSG("_net_nfc_util_alloc_mem failed"); - *result = NET_NFC_ALLOC_FAIL; - return false; - } - - param->socket = socket; - param->cb = cb; - param->user_param = user_param; + _net_nfc_util_alloc_mem(param, sizeof(*param)); + if (param == NULL) { + DEBUG_ERR_MSG("_net_nfc_util_alloc_mem failed"); + *result = NET_NFC_ALLOC_FAIL; + return false; + } - ret = g_interface.connect_llcp(handle, socket, service_access_point, result, param); - if (ret == true) { - int ret_val; + param->socket = socket; + param->cb = cb; + param->user_param = user_param; - ret_val = device_power_request_lock(POWER_LOCK_CPU, 20000); - if (ret_val < 0) - DEBUG_ERR_MSG("device_power_request_lock failed, [%d]", ret_val); - } + ret = hal_nfc_llcp_connect(handle, socket, service_access_point, result, param); + if (ret == true) { + int ret_val; - return ret; - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; + ret_val = device_power_request_lock(POWER_LOCK_CPU, 20000); + if (ret_val < 0) + DEBUG_ERR_MSG("device_power_request_lock failed, [%d]", ret_val); } + + return ret; } void net_nfc_controller_llcp_disconnected_cb(net_nfc_llcp_socket_t socket, net_nfc_error_e result, void *data, void *user_param) @@ -791,46 +598,40 @@ void net_nfc_controller_llcp_disconnected_cb(net_nfc_llcp_socket_t socket, net_n _net_nfc_util_free_mem(param); } - bool net_nfc_controller_llcp_disconnect(net_nfc_target_handle_s * handle, net_nfc_llcp_socket_t socket, net_nfc_error_e * result, net_nfc_service_llcp_cb cb, void *user_param) { + bool ret = false; int ret_val; + net_nfc_llcp_param_t *param = NULL; ret_val = device_power_release_lock(POWER_LOCK_CPU); if (ret_val < 0) DEBUG_ERR_MSG("device_power_release_lock failed, [%d]", ret_val); - if (g_interface.disconnect_llcp != NULL) { - net_nfc_llcp_param_t *param = NULL; - - _net_nfc_util_alloc_mem(param, sizeof(*param)); - if (param == NULL) { - DEBUG_ERR_MSG("_net_nfc_util_alloc_mem failed"); - *result = NET_NFC_ALLOC_FAIL; - return false; - } - - param->socket = socket; - param->cb = cb; - param->user_param = user_param; - return g_interface.disconnect_llcp(handle, socket, result, param); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); + _net_nfc_util_alloc_mem(param, sizeof(*param)); + if (param == NULL) { + DEBUG_ERR_MSG("_net_nfc_util_alloc_mem failed"); + *result = NET_NFC_ALLOC_FAIL; return false; } + + param->socket = socket; + param->cb = cb; + param->user_param = user_param; + + ret = hal_nfc_llcp_disconnect(handle, socket, result, param); + + return ret; } bool net_nfc_controller_llcp_socket_close(net_nfc_llcp_socket_t socket, net_nfc_error_e * result) { - if (g_interface.close_llcp_socket != NULL) { - return g_interface.close_llcp_socket(socket, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_llcp_socket_close(socket, result); + + return ret; } void net_nfc_controller_llcp_received_cb(net_nfc_llcp_socket_t socket, net_nfc_error_e result, void *data, void *user_param) @@ -848,35 +649,33 @@ void net_nfc_controller_llcp_received_cb(net_nfc_llcp_socket_t socket, net_nfc_e bool net_nfc_controller_llcp_recv(net_nfc_target_handle_s * handle, net_nfc_llcp_socket_t socket, uint32_t max_len, net_nfc_error_e * result, net_nfc_service_llcp_cb cb, void *user_param) { - if (g_interface.recv_llcp != NULL) { - net_nfc_llcp_param_t *param = NULL; + bool ret = false; + net_nfc_llcp_param_t *param = NULL; - _net_nfc_util_alloc_mem(param, sizeof(*param)); - if (param == NULL) { - DEBUG_ERR_MSG("_net_nfc_util_alloc_mem failed"); + _net_nfc_util_alloc_mem(param, sizeof(*param)); + if (param == NULL) { + DEBUG_ERR_MSG("_net_nfc_util_alloc_mem failed"); + *result = NET_NFC_ALLOC_FAIL; + return false; + } + + param->socket = socket; + param->cb = cb; + if (max_len > 0) { + if (net_nfc_util_init_data(¶m->data, max_len) == false) { + DEBUG_ERR_MSG("net_nfc_util_init_data failed"); + _net_nfc_util_free_mem(param); *result = NET_NFC_ALLOC_FAIL; return false; } + param->data.length = max_len; + } - param->socket = socket; - param->cb = cb; - if (max_len > 0) { - if (net_nfc_util_init_data(¶m->data, max_len) == false) { - DEBUG_ERR_MSG("net_nfc_util_init_data failed"); - _net_nfc_util_free_mem(param); - *result = NET_NFC_ALLOC_FAIL; - return false; - } - param->data.length = max_len; - } - param->user_param = user_param; + param->user_param = user_param; - return g_interface.recv_llcp(handle, socket, ¶m->data, result, param); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + ret = hal_nfc_llcp_recv(handle, socket, ¶m->data, result, param); + + return ret; } void net_nfc_controller_llcp_sent_cb(net_nfc_llcp_socket_t socket, net_nfc_error_e result, void *data, void *user_param) @@ -894,325 +693,268 @@ void net_nfc_controller_llcp_sent_cb(net_nfc_llcp_socket_t socket, net_nfc_error bool net_nfc_controller_llcp_send(net_nfc_target_handle_s * handle, net_nfc_llcp_socket_t socket, data_s * data, net_nfc_error_e * result, net_nfc_service_llcp_cb cb, void *user_param) { - if (g_interface.send_llcp != NULL) { - net_nfc_llcp_param_t *param = NULL; - - _net_nfc_util_alloc_mem(param, sizeof(*param)); - if (param == NULL) { - DEBUG_ERR_MSG("_net_nfc_util_alloc_mem failed"); - *result = NET_NFC_ALLOC_FAIL; - return false; - } + bool ret = false; + net_nfc_llcp_param_t *param = NULL; - param->socket = socket; - param->cb = cb; - param->user_param = user_param; - - return g_interface.send_llcp(handle, socket, data, result, param); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); + _net_nfc_util_alloc_mem(param, sizeof(*param)); + if (param == NULL) { + DEBUG_ERR_MSG("_net_nfc_util_alloc_mem failed"); + *result = NET_NFC_ALLOC_FAIL; return false; } + + param->socket = socket; + param->cb = cb; + param->user_param = user_param; + + ret = hal_nfc_llcp_send(handle, socket, data, result, param); + + return ret; } bool net_nfc_controller_llcp_recv_from(net_nfc_target_handle_s * handle, net_nfc_llcp_socket_t socket, uint32_t max_len, net_nfc_error_e * result, net_nfc_service_llcp_cb cb, void *user_param) { - if (g_interface.recv_from_llcp != NULL) { - net_nfc_llcp_param_t *param = NULL; + bool ret = false; + net_nfc_llcp_param_t *param = NULL; - _net_nfc_util_alloc_mem(param, sizeof(*param)); - if (param == NULL) { - DEBUG_ERR_MSG("_net_nfc_util_alloc_mem failed"); + _net_nfc_util_alloc_mem(param, sizeof(*param)); + if (param == NULL) { + DEBUG_ERR_MSG("_net_nfc_util_alloc_mem failed"); + *result = NET_NFC_ALLOC_FAIL; + return false; + } + + param->socket = socket; + param->cb = cb; + if (max_len > 0) { + if (net_nfc_util_init_data(¶m->data, max_len) == false) { + DEBUG_ERR_MSG("net_nfc_util_init_data failed"); + _net_nfc_util_free_mem(param); *result = NET_NFC_ALLOC_FAIL; return false; } + param->data.length = max_len; + } + param->user_param = user_param; - param->socket = socket; - param->cb = cb; - if (max_len > 0) { - if (net_nfc_util_init_data(¶m->data, max_len) == false) { - DEBUG_ERR_MSG("net_nfc_util_init_data failed"); - _net_nfc_util_free_mem(param); - *result = NET_NFC_ALLOC_FAIL; - return false; - } - param->data.length = max_len; - } - param->user_param = user_param; + ret = hal_nfc_llcp_recv_from(handle, socket, ¶m->data, result, param); - return g_interface.recv_from_llcp(handle, socket, ¶m->data, result, param); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + return ret; } bool net_nfc_controller_llcp_send_to(net_nfc_target_handle_s * handle, net_nfc_llcp_socket_t socket, data_s * data, uint8_t service_access_point, net_nfc_error_e * result, net_nfc_service_llcp_cb cb, void *user_param) { - if (g_interface.send_to_llcp != NULL) { - net_nfc_llcp_param_t *param = NULL; - - _net_nfc_util_alloc_mem(param, sizeof(*param)); - if (param == NULL) { - DEBUG_ERR_MSG("_net_nfc_util_alloc_mem failed"); - *result = NET_NFC_ALLOC_FAIL; - return false; - } + bool ret = false; + net_nfc_llcp_param_t *param = NULL; - param->socket = socket; - param->cb = cb; - param->user_param = user_param; - - return g_interface.send_to_llcp(handle, socket, data, service_access_point, result, param); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); + _net_nfc_util_alloc_mem(param, sizeof(*param)); + if (param == NULL) { + DEBUG_ERR_MSG("_net_nfc_util_alloc_mem failed"); + *result = NET_NFC_ALLOC_FAIL; return false; } + + param->socket = socket; + param->cb = cb; + param->user_param = user_param; + + ret = hal_nfc_llcp_send_to(handle, socket, data, service_access_point, result, param); + + return ret; } bool net_nfc_controller_llcp_get_remote_config(net_nfc_target_handle_s * handle, net_nfc_llcp_config_info_s * config, net_nfc_error_e * result) { - if (g_interface.get_remote_config != NULL) { - return g_interface.get_remote_config(handle, config, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_llcp_get_remote_config(handle, config, result); + + return ret; } bool net_nfc_controller_llcp_get_remote_socket_info(net_nfc_target_handle_s * handle, net_nfc_llcp_socket_t socket, net_nfc_llcp_socket_option_s * option, net_nfc_error_e * result) { - if (g_interface.get_remote_socket_info != NULL) { - return g_interface.get_remote_socket_info(handle, socket, option, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_llcp_get_remote_socket_info(handle, socket, option, result); + return ret; } bool net_nfc_controller_sim_test(net_nfc_error_e * result) { - if (g_interface.sim_test != NULL) { - return g_interface.sim_test(result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_sim_test(result); + + return ret; } bool net_nfc_controller_prbs_test(net_nfc_error_e * result, uint32_t tech, uint32_t rate) { - if (g_interface.prbs_test != NULL) { - return g_interface.prbs_test(result, tech, rate); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_prbs_test(result, tech, rate); + + return ret; } bool net_nfc_controller_test_mode_on(net_nfc_error_e * result) { - if (g_interface.test_mode_on != NULL) { - return g_interface.test_mode_on(result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_test_mode_on(result); + + return ret; } bool net_nfc_controller_test_mode_off(net_nfc_error_e * result) { - if (g_interface.test_mode_off != NULL) { - return g_interface.test_mode_off(result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_test_mode_off(result); + + return ret; } /* LCOV_EXCL_STOP */ bool net_nfc_controller_support_nfc(net_nfc_error_e * result) { - if (g_interface.support_nfc != NULL) { - return g_interface.support_nfc(result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_support_nfc(result); + + return ret; } /* LCOV_EXCL_START */ bool net_nfc_controller_eedata_register_set(net_nfc_error_e * result, uint32_t mode, uint32_t reg_id, data_s * data) { - if (g_interface.eedata_register_set != NULL) { - return g_interface.eedata_register_set(result, mode, reg_id, data); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_eedata_register_set(result, mode, reg_id, data); + + return ret; } bool net_nfc_controller_ese_test(net_nfc_error_e * result) { - if (g_interface.ese_test != NULL) { - return g_interface.ese_test(result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("NFC ESE TEST interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_ese_test(result); + + return ret; } bool net_nfc_controller_test_set_se_tech_type(net_nfc_error_e * result, net_nfc_se_type_e type, uint32_t tech) { - if (g_interface.test_set_se_tech_type != NULL) { - return g_interface.test_set_se_tech_type(result, type, tech); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_ERR_MSG("interface is null"); + bool ret = false; - return false; - } -} + ret = hal_nfc_test_set_se_tech_type(result, type, tech); -#if 0 -bool net_nfc_controller_hce_listener(hce_active_listener_cb hce_active_listener, hce_deactive_listener_cb hce_deactive_listener, hce_apdu_listener_cb hce_apdu_listener, net_nfc_error_e * result) -{ - if (g_interface.register_hce_listener != NULL) { - return g_interface.register_hce_listener(hce_active_listener, hce_deactive_listener, hce_apdu_listener, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + return ret; } -#endif + bool net_nfc_controller_hce_response_apdu(net_nfc_target_handle_s * handle, data_s * response, net_nfc_error_e * result) { - if (g_interface.hce_response_apdu != NULL) { - return g_interface.hce_response_apdu(handle, response, result); - } else { - *result = NET_NFC_DEVICE_DOES_NOT_SUPPORT_NFC; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_hce_response_apdu(handle, response, result); + + return ret; } bool net_nfc_controller_secure_element_route_aid(data_s * aid, net_nfc_se_type_e se_type, int power, net_nfc_error_e * result) { - if (g_interface.route_aid != NULL) { - return g_interface.route_aid(aid, se_type, power, result); - } else { - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_secure_element_route_aid(aid, se_type, power, result); + + return ret; } bool net_nfc_controller_secure_element_unroute_aid(data_s * aid, net_nfc_error_e * result) { - if (g_interface.unroute_aid != NULL) { - return g_interface.unroute_aid(aid, result); - } else { - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_secure_element_unroute_aid(aid, result); + + return ret; } /* LCOV_EXCL_STOP */ bool net_nfc_controller_secure_element_commit_routing(net_nfc_error_e * result) { - if (g_interface.commit_routing != NULL) { - return g_interface.commit_routing(result); - } else { - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_secure_element_commit_routing(result); + + return ret; } /* LCOV_EXCL_START */ bool net_nfc_controller_secure_element_set_default_route(net_nfc_se_type_e switch_on, net_nfc_se_type_e switch_off, net_nfc_se_type_e battery_off, net_nfc_error_e * result) { - if (g_interface.set_default_route != NULL) { - return g_interface.set_default_route(switch_on, switch_off, battery_off, result); - } else { - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_secure_element_set_default_route(switch_on, switch_off, battery_off, result); + + return ret; } bool net_nfc_controller_secure_element_clear_aid_table(net_nfc_error_e * result) { - if (g_interface.clear_aid_table != NULL) { - return g_interface.clear_aid_table(result); - } else { - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_secure_element_clear_aid_table(result); + + return ret; } bool net_nfc_controller_secure_element_get_aid_table_size(int *AIDTableSize, net_nfc_error_e * result) { - if (g_interface.get_aid_tablesize != NULL) { - return g_interface.get_aid_tablesize(AIDTableSize, result); - } else { - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_secure_element_get_aid_table_size(AIDTableSize, result); + + return ret; } /* LCOV_EXCL_STOP */ bool net_nfc_controller_secure_element_set_route_entry(net_nfc_se_entry_type_e type, net_nfc_se_tech_protocol_type_e value, net_nfc_se_type_e route, int power, net_nfc_error_e * result) { - if (g_interface.set_routing_entry != NULL) { - return g_interface.set_routing_entry(type, value, route, power, result); - } else { - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_secure_element_set_route_entry(type, value, route, power, result); + + return ret; } bool net_nfc_controller_secure_element_clear_routing_entry(net_nfc_se_entry_type_e type, net_nfc_error_e * result) { - if (g_interface.clear_routing_entry != NULL) { - return g_interface.clear_routing_entry(type, result); - } else { - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_secure_element_clear_routing_entry(type, result); + + return ret; } /* LCOV_EXCL_START*/ bool net_nfc_controller_secure_element_set_listen_tech_mask(net_nfc_se_tech_protocol_type_e value, net_nfc_error_e * result) { - if (g_interface.set_listen_tech_mask != NULL) { - return g_interface.set_listen_tech_mask(value, result); - } else { - *result = NET_NFC_UNKNOWN_ERROR; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_secure_element_set_listen_tech_mask(value, result); + + return ret; } /* LCOV_EXCL_STOP */ bool net_nfc_controller_set_screen_state(net_nfc_screen_state_type_e screen_state, net_nfc_error_e * result) { - if (g_interface.set_screen_state != NULL) { - return g_interface.set_screen_state(screen_state, result); - } else { - *result = NET_NFC_UNKNOWN_ERROR; - DEBUG_SERVER_MSG("interface is null"); - return false; - } + bool ret = false; + + ret = hal_nfc_set_screen_state(screen_state, result); + + return ret; } diff --git a/src/manager/net_nfc_manager.c b/src/manager/net_nfc_manager.c old mode 100644 new mode 100755 index 7f06d9d..ae98dd9 --- a/src/manager/net_nfc_manager.c +++ b/src/manager/net_nfc_manager.c @@ -140,7 +140,7 @@ int main(int argc, char *argv[]) __gcov_flush(); #endif - void *handle = NULL; + bool ret = 0; guint id = 0; gboolean use_daemon = FALSE; GOptionContext *option_context; @@ -164,8 +164,8 @@ int main(int argc, char *argv[]) net_nfc_app_util_clean_storage(MESSAGE_STORAGE); - handle = net_nfc_controller_onload(); - if (handle == NULL) { + ret = net_nfc_controller_onload(); + if (ret == false) { DEBUG_ERR_MSG("load plugin library is failed"); // LCOV_EXCL_LINE if (vconf_set_bool(VCONFKEY_NFC_FEATURE, VCONFKEY_NFC_FEATURE_OFF) != 0) // LCOV_EXCL_LINE @@ -197,7 +197,7 @@ int main(int argc, char *argv[]) usleep(1000 * 10); // 10ms - net_nfc_controller_unload(handle); + net_nfc_controller_unload(); DEBUG_SERVER_MSG("END net_nfc_controller_unload"); net_nfc_manager_fini_log();