Add tag discovered/detached callback

Change-Id: I0699a1566c05e4e747f02c58a3218bf4274da37e

diff --git a/client/include/net_nfc_neard.h b/client/include/net_nfc_neard.h
index 85acd5d..f204fe4 100644 (file)
--- a/client/include/net_nfc_neard.h
+++ b/client/include/net_nfc_neard.h
@@ -10,6 +10,13 @@ net_nfc_error_e net_nfc_neard_set_active(int state,
 void net_nfc_neard_set_activated(net_nfc_client_manager_activated callback,
                void *user_data);
 void net_nfc_neard_unset_activated(void);
+void net_nfc_neard_set_tag_discovered(
+               net_nfc_client_tag_tag_discovered callback, void *user_data);
+void net_nfc_neard_unset_tag_discovered(void);
+void net_nfc_neard_set_tag_detached(
+               net_nfc_client_tag_tag_detached callback, void *user_data);
+void net_nfc_neard_unset_tag_detached(void);
+bool net_nfc_neard_is_tag_connected(void);
 net_nfc_error_e net_nfc_neard_initialize(void);
 void net_nfc_neard_deinitialize(void);
 

diff --git a/client/net_nfc_client_tag.c b/client/net_nfc_client_tag.c
index 20c639a..f007368 100644 (file)
--- a/client/net_nfc_client_tag.c
+++ b/client/net_nfc_client_tag.c
@@ -23,6 +23,7 @@
 #include "net_nfc_client_manager.h"
 #include "net_nfc_client_tag.h"
 #include "net_nfc_client_tag_internal.h"
+#include "net_nfc_neard.h"
 
 
 static NetNfcGDbusTag *tag_proxy = NULL;
@@ -398,10 +399,7 @@ static void tag_tag_detached(NetNfcGDbusTag *object, guint arg_handle,
 /* internal function */
 gboolean net_nfc_client_tag_is_connected(void)
 {
-       RETV_IF(NULL == client_target_info, FALSE);
-       RETV_IF(NULL == client_target_info->handle, FALSE);
-
-       return TRUE;
+       return net_nfc_neard_is_tag_connected();
 }
 
 net_nfc_target_info_s *net_nfc_client_tag_get_client_target_info(void)
@@ -712,14 +710,12 @@ API void net_nfc_client_tag_set_tag_discovered(
 {
        RET_IF(NULL == callback);
 
-       tag_discovered_func_data.callback = (gpointer)callback;
-       tag_discovered_func_data.user_data = user_data;
+       net_nfc_neard_set_tag_discovered(callback, user_data);
 }
 
 API void net_nfc_client_tag_unset_tag_discovered(void)
 {
-       tag_discovered_func_data.callback = NULL;
-       tag_discovered_func_data.user_data = NULL;
+       net_nfc_neard_unset_tag_discovered();
 }
 
 API void net_nfc_client_tag_set_tag_detached(
@@ -727,14 +723,12 @@ API void net_nfc_client_tag_set_tag_detached(
 {
        RET_IF(NULL == callback);
 
-       tag_detached_func_data.callback = (gpointer)callback;
-       tag_detached_func_data.user_data = user_data;
+       net_nfc_neard_set_tag_detached(callback, user_data);
 }
 
 API void net_nfc_client_tag_unset_tag_detached(void)
 {
-       tag_detached_func_data.callback = NULL;
-       tag_detached_func_data.user_data = NULL;
+       net_nfc_neard_unset_tag_detached();
 }
 
 API void net_nfc_client_tag_set_filter(net_nfc_event_filter_e filter)

diff --git a/client/net_nfc_neard.c b/client/net_nfc_neard.c
index a50b4c9..6bc6f09 100644 (file)
--- a/client/net_nfc_neard.c
+++ b/client/net_nfc_neard.c
@@ -18,6 +18,11 @@ typedef struct _net_nfc_client_cb
        /* callback for power status changed */
        net_nfc_client_manager_activated activated_cb;
        void *activated_ud;
+
+       net_nfc_client_tag_tag_discovered tag_discovered_cb;
+       void *tag_discovered_ud;
+       net_nfc_client_tag_tag_detached tag_detached_cb;
+       void *tag_detached_ud;
 } net_nfc_client_cb;
 
 static net_nfc_client_cb client_cb;
@@ -153,6 +158,47 @@ exit:
        }
 }
 
+static void _tag_found_cb(const char *tagName, void *user_data)
+{
+       NFC_DBG("NFC tag found");
+
+       if (neardal_get_tag_properties(tagName, &tag) != NEARDAL_SUCCESS)
+               return;
+       if (tag == NULL && tag->records == NULL)
+               return;
+
+       if (client_cb.tag_discovered_cb != NULL)
+               client_cb.tag_discovered_cb(NULL, client_cb.tag_discovered_ud);
+}
+
+static void _tag_lost_cb(const char *tagName, void *user_data)
+{
+       NFC_DBG("NFC tag lost");
+
+       if (tag != NULL) {
+               neardal_free_tag(tag);
+               tag = NULL;
+       }
+
+       if (nfc_adapter_polling == true)
+               return;
+
+       if (neardal_start_poll_loop(nfc_adapter_path, NEARD_ADP_MODE_DUAL)
+                                                       == NEARDAL_SUCCESS)
+               nfc_adapter_polling = true;
+
+       if (client_cb.tag_detached_cb != NULL)
+               client_cb.tag_detached_cb(client_cb.tag_detached_ud);
+}
+
+bool net_nfc_neard_is_tag_connected(void)
+{
+       if (tag == NULL)
+               return false;
+
+       return true;
+}
+
 net_nfc_error_e net_nfc_neard_set_active(int state,
                net_nfc_client_manager_set_active_completed callback,
                void *user_data)
@@ -180,6 +226,32 @@ net_nfc_error_e net_nfc_neard_set_active(int state,
        return NET_NFC_OK;
 }
 
+void net_nfc_neard_set_tag_discovered(
+               net_nfc_client_tag_tag_discovered callback, void *user_data)
+{
+       client_cb.tag_discovered_cb = callback;
+       client_cb.tag_discovered_ud = user_data;
+}
+
+void net_nfc_neard_unset_tag_discovered(void)
+{
+       client_cb.tag_discovered_cb = NULL;
+       client_cb.tag_discovered_ud = NULL;
+}
+
+void net_nfc_neard_set_tag_detached(
+               net_nfc_client_tag_tag_detached callback, void *user_data)
+{
+       client_cb.tag_detached_cb = callback;
+       client_cb.tag_detached_ud = user_data;
+}
+
+void net_nfc_neard_unset_tag_detached(void)
+{
+       client_cb.tag_detached_cb = NULL;
+       client_cb.tag_detached_ud = NULL;
+}
+
 void net_nfc_neard_set_activated(net_nfc_client_manager_activated callback,
                void *user_data)
 {
@@ -202,7 +274,11 @@ net_nfc_error_e net_nfc_neard_cb_init(void)
                neardal_set_cb_adapter_property_changed(
                        _adapter_property_changed_cb, NULL) != NEARDAL_SUCCESS ||
                neardal_set_cb_power_completed(_power_completed_cb, NULL)
-                                                       != NEARDAL_SUCCESS) {
+                                                       != NEARDAL_SUCCESS ||
+               neardal_set_cb_tag_found(
+                       _tag_found_cb, NULL) != NEARDAL_SUCCESS ||
+               neardal_set_cb_tag_lost(
+                       _tag_lost_cb, NULL) != NEARDAL_SUCCESS) {
 
                NFC_DBG("failed to register the callback");