NFC: digital: Add digital framing calls when in target mode

Add new "NFC_DIGITAL_FRAMING_*" calls to the digital
layer so the driver can make the necessary adjustments
when performing anticollision while in target mode.

The driver must ensure that the effect of these calls
happens after the following response has been sent but
before reception of the next request begins.

Acked-by: Thierry Escande <thierry.escande@linux.intel.com>
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/include/net/nfc/digital.h b/include/net/nfc/digital.h
index bdf55c3..2bc31d1 100644 (file)
--- a/include/net/nfc/digital.h
+++ b/include/net/nfc/digital.h
@@ -49,6 +49,7 @@ enum {
        NFC_DIGITAL_FRAMING_NFCA_SHORT = 0,
        NFC_DIGITAL_FRAMING_NFCA_STANDARD,
        NFC_DIGITAL_FRAMING_NFCA_STANDARD_WITH_CRC_A,
+       NFC_DIGITAL_FRAMING_NFCA_ANTICOL_COMPLETE,
 
        NFC_DIGITAL_FRAMING_NFCA_T1T,
        NFC_DIGITAL_FRAMING_NFCA_T2T,
@@ -66,6 +67,7 @@ enum {
        NFC_DIGITAL_FRAMING_NFCB,
        NFC_DIGITAL_FRAMING_NFCB_T4T,
 
+
        NFC_DIGITAL_FRAMING_LAST,
 };
 

diff --git a/net/nfc/digital_technology.c b/net/nfc/digital_technology.c
index d1684cb..d276518 100644 (file)
--- a/net/nfc/digital_technology.c
+++ b/net/nfc/digital_technology.c
@@ -944,6 +944,13 @@ static int digital_tg_send_sel_res(struct nfc_digital_dev *ddev)
        if (!DIGITAL_DRV_CAPS_TG_CRC(ddev))
                digital_skb_add_crc_a(skb);
 
+       rc = digital_tg_configure_hw(ddev, NFC_DIGITAL_CONFIG_FRAMING,
+                                    NFC_DIGITAL_FRAMING_NFCA_ANTICOL_COMPLETE);
+       if (rc) {
+               kfree_skb(skb);
+               return rc;
+       }
+
        rc = digital_tg_send_cmd(ddev, skb, 300, digital_tg_recv_atr_req,
                                 NULL);
        if (rc)
@@ -1002,6 +1009,13 @@ static int digital_tg_send_sdd_res(struct nfc_digital_dev *ddev)
        for (i = 0; i < 4; i++)
                sdd_res->bcc ^= sdd_res->nfcid1[i];
 
+       rc = digital_tg_configure_hw(ddev, NFC_DIGITAL_CONFIG_FRAMING,
+                               NFC_DIGITAL_FRAMING_NFCA_STANDARD_WITH_CRC_A);
+       if (rc) {
+               kfree_skb(skb);
+               return rc;
+       }
+
        rc = digital_tg_send_cmd(ddev, skb, 300, digital_tg_recv_sel_req,
                                 NULL);
        if (rc)
@@ -1054,6 +1068,13 @@ static int digital_tg_send_sens_res(struct nfc_digital_dev *ddev)
        sens_res[0] = (DIGITAL_SENS_RES_NFC_DEP >> 8) & 0xFF;
        sens_res[1] = DIGITAL_SENS_RES_NFC_DEP & 0xFF;
 
+       rc = digital_tg_configure_hw(ddev, NFC_DIGITAL_CONFIG_FRAMING,
+                                    NFC_DIGITAL_FRAMING_NFCA_STANDARD);
+       if (rc) {
+               kfree_skb(skb);
+               return rc;
+       }
+
        rc = digital_tg_send_cmd(ddev, skb, 300, digital_tg_recv_sdd_req,
                                 NULL);
        if (rc)