mifare: Add MIFARE read support to type2 plugin

diff --git a/Makefile.plugins b/Makefile.plugins
index 1625bf3..c80f4d4 100644 (file)
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -18,10 +18,11 @@ endif
 if NFCTYPE2
 if NFCTYPE2_BUILTIN
 builtin_modules += nfctype2
-builtin_sources += plugins/nfctype2.c
+builtin_sources += plugins/nfctype2.c plugins/mifare.c
 else
 plugin_LTLIBRARIES += plugins/nfctype2.la
 plugin_objects += $(plugins_nfctype2_la_OBJECTS)
+plugins_nfctype2_la_SOURCES = plugins/nfctype2.c plugins/mifare.c
 plugins_nfctype2_la_CFLAGS = $(plugin_cflags)
 plugins_nfctype2_la_LDFLAGS = $(plugin_ldflags)
 endif

diff --git a/plugins/nfctype2.c b/plugins/nfctype2.c
index 817731d..3fda5b6 100644 (file)
--- a/plugins/nfctype2.c
+++ b/plugins/nfctype2.c
@@ -40,6 +40,9 @@
 #include <near/ndef.h>
 #include <near/tlv.h>
 
+extern int mifare_read_tag(uint32_t adapter_idx, uint32_t target_idx,
+               near_tag_io_cb cb, enum near_target_sub_type tgt_subtype);
+
 #define CMD_READ         0x30
 #define CMD_WRITE        0xA2
 
@@ -267,11 +270,22 @@ static int nfctype2_read_tag(uint32_t adapter_idx,
 
        tgt_subtype = near_target_get_subtype(adapter_idx, target_idx);
 
-       if (tgt_subtype == NEAR_TAG_NFC_T2_MIFARE_ULTRALIGHT)
+       switch (tgt_subtype) {
+       case NEAR_TAG_NFC_T2_MIFARE_ULTRALIGHT:
                err = nfctype2_read_meta(adapter_idx, target_idx, cb);
-       else {
+               break;
+
+       /* Specific Mifare read access */
+       case NEAR_TAG_NFC_T2_MIFARE_CLASSIC_1K:
+       case NEAR_TAG_NFC_T2_MIFARE_CLASSIC_4K:
+               err= mifare_read_tag( adapter_idx, target_idx,
+                       cb, tgt_subtype);
+               break;
+
+       default:
                DBG("Unknown TAG Type 2 subtype (%d)", tgt_subtype);
                err = -1;
+               break;
        }
 
        return err;