Add neard active/deactive operation

Change-Id: I2f4045e90163795522896e5d8aebf83d794785f4

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index e402577..685fa59 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(NFC_CLIENT "nfc")
 
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} CLIENT_SRCS)
 
-pkg_check_modules(client_pkgs REQUIRED security-server dlog ecore-x vconf libtzplatform-config)
+pkg_check_modules(client_pkgs REQUIRED security-server dlog ecore-x vconf libtzplatform-config neardal)
 
 FOREACH(flag ${client_pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/client/include/net_nfc_neard.h b/client/include/net_nfc_neard.h
new file mode 100644 (file)
index 0000000..c122223
--- /dev/null
+++ b/client/include/net_nfc_neard.h
@@ -0,0 +1,13 @@
+#ifndef NET_NFC_NEARD_H
+#define NET_NFC_NEARD_H
+
+#include "net_nfc.h"
+#include "net_nfc_typedef.h"
+
+net_nfc_error_e net_nfc_neard_set_active(int state,
+               net_nfc_client_manager_set_active_completed callback,
+               void *user_data);
+net_nfc_error_e net_nfc_neard_initialize(void);
+void net_nfc_neard_deinitialize(void);
+
+#endif

diff --git a/client/net_nfc_client_context.c b/client/net_nfc_client_context.c
index 1b2246e..422bb19 100644 (file)
--- a/client/net_nfc_client_context.c
+++ b/client/net_nfc_client_context.c
@@ -18,15 +18,12 @@
 #include "net_nfc_debug_internal.h"
 #include "net_nfc_typedef.h"
 #include "net_nfc_client.h"
+#include "net_nfc_neard.h"
 
 
 API net_nfc_error_e net_nfc_client_initialize()
 {
-       net_nfc_error_e result = NET_NFC_OK;
-
-       net_nfc_client_gdbus_init();
-
-       return result;
+       return net_nfc_neard_initialize();
 }
 
 
@@ -34,7 +31,7 @@ API net_nfc_error_e net_nfc_client_deinitialize()
 {
        net_nfc_error_e result = NET_NFC_OK;
 
-       net_nfc_client_gdbus_deinit();
+       net_nfc_neard_deinitialize();
 
        return result;
 }

diff --git a/client/net_nfc_client_manager.c b/client/net_nfc_client_manager.c
index 49ac7a7..db6b2fa 100644 (file)
--- a/client/net_nfc_client_manager.c
+++ b/client/net_nfc_client_manager.c
@@ -20,6 +20,7 @@
 #include "net_nfc_client.h"
 #include "net_nfc_client_context.h"
 #include "net_nfc_client_manager.h"
+#include "net_nfc_neard.h"
 
 #define DEACTIVATE_DELAY       500 /* ms */
 
@@ -185,34 +186,7 @@ API void net_nfc_client_manager_unset_activated(void)
 API net_nfc_error_e net_nfc_client_manager_set_active(int state,
                net_nfc_client_manager_set_active_completed callback, void *user_data)
 {
-       gboolean active = FALSE;
-       ManagerFuncData *func_data;
-
-       RETV_IF(NULL == manager_proxy, NET_NFC_NOT_INITIALIZED);
-
-       /* allow this function even nfc is off */
-       RETV_IF(TRUE == activation_is_running, NET_NFC_BUSY);
-
-       activation_is_running = TRUE;
-
-       func_data = g_try_new0(ManagerFuncData, 1);
-       if (func_data == NULL)
-               return NET_NFC_ALLOC_FAIL;
-
-       func_data->callback = (gpointer)callback;
-       func_data->user_data = user_data;
-
-       if (state == true)
-               active = TRUE;
-
-       net_nfc_gdbus_manager_call_set_active(manager_proxy,
-                       active,
-                       net_nfc_client_gdbus_get_privilege(),
-                       NULL,
-                       manager_call_set_active_callback,
-                       func_data);
-
-       return NET_NFC_OK;
+       return net_nfc_neard_set_active(state, callback, user_data);
 }
 
 API net_nfc_error_e net_nfc_client_manager_set_active_sync(int state)

diff --git a/client/net_nfc_neard.c b/client/net_nfc_neard.c
new file mode 100644 (file)
index 0000000..1df119a
--- /dev/null
+++ b/client/net_nfc_neard.c
@@ -0,0 +1,273 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <glib.h>
+
+#include "vconf.h"
+
+#include "net_nfc.h"
+#include "net_nfc_typedef.h"
+#include "net_nfc_debug_internal.h"
+
+#include "neardal.h"
+
+typedef struct _net_nfc_client_cb
+{
+       net_nfc_client_manager_set_active_completed active_cb;
+       void *active_ud;
+} net_nfc_client_cb;
+
+static net_nfc_client_cb client_cb;
+
+static char *nfc_adapter_path;
+static bool nfc_adapter_powered;
+static bool nfc_adapter_polling;
+static char *nfc_adapter_mode;
+static neardal_tag *tag;
+static neardal_dev *dev;
+
+static net_nfc_error_e _convert_error_code(errorCode_t error_code)
+{
+       switch (error_code) {
+       case NEARDAL_SUCCESS:
+               return NET_NFC_OK;
+       case NEARDAL_ERROR_GENERAL_ERROR:
+               return NET_NFC_UNKNOWN_ERROR;
+       case NEARDAL_ERROR_INVALID_PARAMETER:
+               return NET_NFC_INVALID_PARAM;
+       case NEARDAL_ERROR_NO_MEMORY:
+               return NET_NFC_ALLOC_FAIL;
+       case NEARDAL_ERROR_DBUS:
+       case NEARDAL_ERROR_DBUS_CANNOT_CREATE_PROXY:
+       case NEARDAL_ERROR_DBUS_CANNOT_INVOKE_METHOD:
+       case NEARDAL_ERROR_DBUS_INVOKE_METHOD_ERROR:
+               return NET_NFC_OPERATION_FAIL;
+       case NEARDAL_ERROR_NO_ADAPTER:
+               return NET_NFC_NOT_SUPPORTED;
+       case NEARDAL_ERROR_POLLING_ALREADY_ACTIVE:
+               return NET_NFC_ALREADY_REGISTERED;
+       case NEARDAL_ERROR_NO_TAG:
+       case NEARDAL_ERROR_INVALID_RECORD:
+               return NET_NFC_TAG_READ_FAILED;
+       case NEARDAL_ERROR_NO_RECORD:
+               return NET_NFC_NO_DATA_FOUND;
+       case NEARDAL_ERROR_NO_DEV:
+               return NET_NFC_TARGET_IS_MOVED_AWAY;
+       default:
+               return NET_NFC_UNKNOWN_ERROR;
+       }
+}
+
+static void _adapter_added_cb(const char *name, void *user_data)
+{
+       NFC_DBG("adapter added %s", name);
+
+       if (nfc_adapter_path) {
+               g_free(nfc_adapter_path);
+               nfc_adapter_path = NULL;
+       }
+
+       if (name != NULL)
+               nfc_adapter_path = g_strdup(name);
+}
+
+static void _adapter_removed_cb(const char *name, void *user_data)
+{
+       NFC_DBG("adapter removed %s", name);
+
+       if (nfc_adapter_path) {
+               g_free(nfc_adapter_path);
+               nfc_adapter_path = NULL;
+       }
+}
+
+static void _adapter_property_changed_cb(char *name, char *property,
+                                       void *value, void *user_data)
+{
+       NFC_DBG("adapter name %s, property %s", name, property);
+
+       if (!g_strcmp0(property, "Polling")) {
+               if ((int *) value == 0)
+                       nfc_adapter_polling = false;
+               else
+                       nfc_adapter_polling = true;
+       } else if (!g_strcmp0(property, "Mode")) {
+               if (nfc_adapter_mode) {
+                       g_free(nfc_adapter_mode);
+                       nfc_adapter_mode = NULL;
+               }
+
+               nfc_adapter_mode = g_strdup((char *)value);
+       } else if (!g_strcmp0(property, "Powered")) {
+               if ((int *) value == 0)
+                       nfc_adapter_powered = false;
+               else
+                       nfc_adapter_powered = true;
+       }
+}
+
+static void _power_completed_cb(errorCode_t error_code, void *user_data)
+{
+       errorCode_t err;
+       neardal_adapter *neard_adapter = NULL;
+       bool powered;
+       net_nfc_error_e result;
+
+       NFC_DBG("power completed adapter path %s", nfc_adapter_path);
+       if (nfc_adapter_path == NULL)
+               goto exit;
+
+       err = neardal_get_adapter_properties(nfc_adapter_path, &neard_adapter);
+       if (err != NEARDAL_SUCCESS)
+               goto exit;
+
+       NFC_DBG("power completed %d", neard_adapter->powered);
+       powered = (neard_adapter->powered) ? true : false;
+       if (vconf_set_bool(VCONFKEY_NFC_STATE, powered) != 0)
+               NFC_DBG("vconf_set_bool failed ");
+
+       if (powered == true) {
+               if (nfc_adapter_polling == false) {
+                       err = neardal_start_poll_loop(nfc_adapter_path,
+                                               NEARD_ADP_MODE_DUAL);
+
+                       if (err == NEARDAL_SUCCESS)
+                               nfc_adapter_polling = true;
+               }
+       }
+
+exit:
+       if (client_cb.active_cb != NULL && client_cb.active_ud != NULL) {
+               result = _convert_error_code(error_code);
+
+               client_cb.active_cb(result, client_cb.active_ud);
+
+               client_cb.active_cb = NULL;
+               client_cb.active_ud = NULL;
+       }
+}
+
+net_nfc_error_e net_nfc_neard_set_active(int state,
+               net_nfc_client_manager_set_active_completed callback,
+               void *user_data)
+{
+       errorCode_t err;
+
+       NFC_DBG("set active: %d", state);
+
+       if (state == nfc_adapter_powered)
+               return NET_NFC_OK;
+
+       RETV_IF(NULL == nfc_adapter_path, NET_NFC_NOT_INITIALIZED);
+
+       client_cb.active_cb = callback;
+       client_cb.active_ud = user_data;
+
+       if (nfc_adapter_polling == true)
+               neardal_stop_poll(nfc_adapter_path);
+
+       err = neardal_set_adapter_property(nfc_adapter_path,
+                       NEARD_ADP_PROP_POWERED, (void *) state);
+       if (err != NEARDAL_SUCCESS)
+               return NET_NFC_OPERATION_FAIL;
+
+       return NET_NFC_OK;
+}
+
+net_nfc_error_e net_nfc_neard_cb_init(void)
+{
+       if (neardal_set_cb_adapter_added(
+               _adapter_added_cb, NULL) != NEARDAL_SUCCESS ||
+               neardal_set_cb_adapter_removed(
+                       _adapter_removed_cb, NULL) != NEARDAL_SUCCESS ||
+               neardal_set_cb_adapter_property_changed(
+                       _adapter_property_changed_cb, NULL) != NEARDAL_SUCCESS ||
+               neardal_set_cb_power_completed(_power_completed_cb, NULL)
+                                                       != NEARDAL_SUCCESS) {
+
+               NFC_DBG("failed to register the callback");
+
+               return NET_NFC_NOT_REGISTERED;
+       }
+
+       return NET_NFC_OK;
+}
+
+net_nfc_error_e net_nfc_neard_initialize(void)
+{
+       errorCode_t err;
+       int len;
+       neardal_adapter *neard_adapter = NULL;
+       char **adapters = NULL;
+
+       NFC_DBG("neard init");
+
+       if (nfc_adapter_path != NULL)
+               return NET_NFC_OK;
+
+       net_nfc_neard_cb_init();
+
+       err = neardal_get_adapters(&adapters, &len);
+       NFC_DBG("failed to get adapter error: %d", err);
+       if (err != NEARDAL_SUCCESS)
+               goto out_err;
+
+       if (!(len > 0 && adapters != NULL))
+               goto out_err;
+
+       nfc_adapter_path = g_strdup(adapters[0]);
+       NFC_DBG("adapter_path: %s", nfc_adapter_path);
+
+       neardal_free_array(&adapters);
+       adapters = NULL;
+
+       err = neardal_get_adapter_properties(nfc_adapter_path, &neard_adapter);
+       if (err != NEARDAL_SUCCESS)
+               goto out_err;
+
+       if (neard_adapter == NULL)
+               goto out_err;
+
+       nfc_adapter_powered = (neard_adapter->powered) ? true : false;
+       nfc_adapter_polling = (neard_adapter->polling) ? true : false;
+       neardal_free_adapter(neard_adapter);
+       neard_adapter = NULL;
+
+       NFC_DBG("adapter powered %d, polling %d", nfc_adapter_powered,
+                                                       nfc_adapter_polling);
+
+       if (vconf_set_bool(VCONFKEY_NFC_STATE, nfc_adapter_powered) != 0)
+               NFC_DBG("vconf NFC state set failed ");
+       if (nfc_adapter_powered == TRUE && nfc_adapter_polling == false)
+               neardal_start_poll_loop(nfc_adapter_path, NEARD_ADP_MODE_DUAL);
+
+       return NET_NFC_OK;
+
+out_err:
+       if (adapters)
+               neardal_free_array(&adapters);
+
+       if (neard_adapter)
+               neardal_free_adapter(neard_adapter);
+
+       return NET_NFC_OPERATION_FAIL;
+}
+
+void net_nfc_neard_deinitialize(void)
+{
+       NFC_DBG("neard deinitialize");
+
+       if (nfc_adapter_mode) {
+               g_free(nfc_adapter_mode);
+               nfc_adapter_mode = NULL;
+       }
+
+       if (tag != NULL) {
+               neardal_free_tag(tag);
+               tag = NULL;
+       }
+
+       if (dev != NULL) {
+               neardal_free_device(dev);
+               dev = NULL;
+       }
+}