tag: Add tag creating/deleting API

diff --git a/Makefile.am b/Makefile.am
index db80a0b..95c37e5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,8 @@ AM_MAKEFLAGS = --no-print-directory
 includedir = @includedir@/near
 
 include_HEADERS = include/types.h include/log.h include/plugin.h \
-                       include/tag.h include/adapter.h include/ndef.h
+                       include/tag.h include/adapter.h include/ndef.h \
+                       include/target.h
 
 nodist_include_HEADERS = include/version.h
 

diff --git a/include/tag.h b/include/tag.h
index ea7ef89..d508a57 100644 (file)
--- a/include/tag.h
+++ b/include/tag.h
@@ -43,6 +43,8 @@ struct near_tag_driver {
        int (*read_tag)(uint32_t adapter_idx, uint32_t target_idx);
 };
 
+struct near_tag;
+
 int near_tag_driver_register(struct near_tag_driver *driver);
 void near_tag_driver_unregister(struct near_tag_driver *driver);
 

diff --git a/src/near.h b/src/near.h
index 5d8e656..df491a5 100644 (file)
--- a/src/near.h
+++ b/src/near.h
@@ -83,6 +83,8 @@ void __near_adapter_list(DBusMessageIter *iter, void *user_data);
 int __near_adapter_init(void);
 void __near_adapter_cleanup(void);
 
+#include <near/target.h>
+
 enum near_target_type {
        NEAR_TARGET_TYPE_TAG = 0,
        NEAR_TARGET_TYPE_DEVICE = 1,
@@ -102,6 +104,8 @@ void __near_target_cleanup(void);
 
 #include <near/tag.h>
 
+struct near_tag *__near_tag_new(uint32_t adapter_idx, uint32_t target_idx);
+void __near_tag_free(struct near_tag *tag);
 int __near_tag_read(struct near_target *target);
 
 int __near_netlink_get_adapters(void);

diff --git a/src/tag.c b/src/tag.c
index 2b89120..3508999 100644 (file)
--- a/src/tag.c
+++ b/src/tag.c
@@ -33,8 +33,47 @@
 
 #include "near.h"
 
+struct near_tag {
+       uint32_t adapter_idx;
+       uint32_t target_idx;
+       uint16_t uid;
+
+       uint16_t data_length;
+       uint8_t *data;
+
+       GList *ndef_list;
+};
+
 static GList *driver_list = NULL;
 
+static void tag_initialize(struct near_tag *tag,
+                       uint32_t adapter_idx, uint32_t target_idx)
+{
+       tag->adapter_idx = adapter_idx;
+       tag->target_idx = target_idx;
+
+       return;
+}
+
+struct near_tag *__near_tag_new(uint32_t adapter_idx, uint32_t target_idx)
+{
+       struct near_tag *tag;
+
+       tag = g_try_malloc0(sizeof(struct near_tag));
+       if (tag == NULL)
+               return NULL;
+
+       tag_initialize(tag, adapter_idx, target_idx);
+
+       return tag;
+}
+
+void __near_tag_free(struct near_tag *tag)
+{
+       g_free(tag->data);
+       g_free(tag);
+}
+
 int near_tag_driver_register(struct near_tag_driver *driver)
 {
        DBG("");

diff --git a/src/target.c b/src/target.c
index ed82dd6..7e974aa 100644 (file)
--- a/src/target.c
+++ b/src/target.c
@@ -40,7 +40,9 @@ struct near_target {
        uint32_t adapter_idx;
        uint32_t protocols;
        enum near_target_type type;
+
        uint16_t tag_type;
+       struct near_tag *tag;
 };
 
 static DBusConnection *connection = NULL;
@@ -51,6 +53,8 @@ static void free_target(gpointer data)
 {
        struct near_target *target = data;
 
+       if (target->tag != NULL)
+               __near_tag_free(target->tag);
        g_free(target->path);
        g_free(target);
 }
@@ -344,6 +348,25 @@ void __near_target_remove(uint32_t target_idx)
        g_hash_table_remove(target_hash, GINT_TO_POINTER(target_idx));
 }
 
+struct near_tag *near_target_get_tag(uint32_t target_idx)
+{
+       struct near_target *target;
+
+       target = g_hash_table_lookup(target_hash, GINT_TO_POINTER(target_idx));
+       if (target == NULL)
+               return NULL;
+
+       if (target->tag != NULL)
+               return target->tag;
+
+       target->tag = __near_tag_new(target->adapter_idx, target_idx);
+       if (target->tag == NULL)
+               return NULL;
+
+       /* TODO reference the tag, or add tag reference count API */
+       return target->tag;
+}
+
 int __near_target_init(void)
 {
        DBG("");