adapter: Bypass the target layer

[platform/upstream/neard.git] / plugins / nfctype1.c

diff --git a/plugins/nfctype1.c b/plugins/nfctype1.c
index 7b5c733..3fa1193 100644 (file)
--- a/plugins/nfctype1.c
+++ b/plugins/nfctype1.c
@@ -237,9 +237,13 @@ static int meta_recv(uint8_t *resp, int length, void *data)
                goto out_err;
        }
 
-       /* Associate the DATA length to the tag */
-       tag = near_target_add_tag(cookie->adapter_idx, cookie->target_idx,
+       /* Add data to the tag */
+       err = near_tag_add_data(cookie->adapter_idx, cookie->target_idx,
                                        NULL, TAG_T1_DATA_LENGTH(cc));
+       if (err < 0)
+               goto out_err;
+
+       tag = near_tag_get_tag(cookie->adapter_idx, cookie->target_idx);
        if (tag == NULL) {
                err = -ENOMEM;
                goto out_err;
@@ -251,6 +255,8 @@ static int meta_recv(uint8_t *resp, int length, void *data)
                goto out_err;
        }
 
+       DBG("2");
+
        t1_tag->adapter_idx = cookie->adapter_idx;
        t1_tag->cb = cookie->cb;
        t1_tag->tag = tag;
@@ -288,11 +294,15 @@ static int meta_recv(uint8_t *resp, int length, void *data)
        }
 
 out_err:
+       DBG("err %d", err);
+
        if (err < 0 && cookie->cb)
                cookie->cb(cookie->adapter_idx, cookie->target_idx, err);
 
        t1_cookie_release(cookie);
 
+
+
        return err;
 }
 
@@ -467,7 +477,7 @@ static int nfctype1_write_tag(uint32_t adapter_idx, uint32_t target_idx,
        if (ndef == NULL || cb == NULL)
                return -EINVAL;
 
-       tag = near_target_get_tag(adapter_idx, target_idx);
+       tag = near_tag_get_tag(adapter_idx, target_idx);
        if (tag == NULL)
                return -EINVAL;