summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>2012-11-26 14:18:35 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2013-01-10 00:44:28 +0100
commit15461aeb53ae2d3bbde6b374de913e3df81d1ad0 (patch)
treec2f4beba3698359ec9f095e3660fb58fa8b55ca2
parentaada17ac70e33b127c8f8dd425fc735cc0d30e25 (diff)
downloadblackbird-op-linux-15461aeb53ae2d3bbde6b374de913e3df81d1ad0.tar.gz
blackbird-op-linux-15461aeb53ae2d3bbde6b374de913e3df81d1ad0.zip
NFC: pn533: Add a new pn533_send_data_async iface
This iface is intended to be used with DEP transfers. It differs from pn533_send_cmd_async() in the way the response skb is allocated. Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/nfc/pn533.c31
1 files changed, 31 insertions, 0 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index 89f747479a4f..0e9bf9dfbbb5 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -86,6 +86,12 @@ MODULE_DEVICE_TABLE(usb, pn533_table);
+ 2) /* data[0] TFI, data[1] CC */
#define PN533_FRAME_TAIL_LEN 2 /* data[len] DCS, data[len + 1] postamble*/
+/*
+ * Max extended frame payload len, excluding TFI and CC
+ * which are already in PN533_FRAME_HEADER_LEN.
+ */
+#define PN533_FRAME_MAX_PAYLOAD_LEN 263
+
#define PN533_FRAME_SIZE(f) (sizeof(struct pn533_frame) + f->datalen + \
PN533_FRAME_TAIL_LEN)
#define PN533_FRAME_ACK_SIZE (sizeof(struct pn533_frame) + 1)
@@ -807,6 +813,31 @@ unlock:
return rc;
}
+static int pn533_send_data_async(struct pn533 *dev, u8 cmd_code,
+ struct sk_buff *req,
+ pn533_send_async_complete_t complete_cb,
+ void *complete_cb_context)
+{
+ struct sk_buff *resp;
+ int rc;
+ int resp_len = PN533_FRAME_HEADER_LEN +
+ PN533_FRAME_MAX_PAYLOAD_LEN +
+ PN533_FRAME_TAIL_LEN;
+
+ nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
+
+ resp = nfc_alloc_recv_skb(resp_len, GFP_KERNEL);
+ if (!resp)
+ return -ENOMEM;
+
+ rc = __pn533_send_async(dev, cmd_code, req, resp, resp_len, complete_cb,
+ complete_cb_context);
+ if (rc)
+ dev_kfree_skb(resp);
+
+ return rc;
+}
+
static int pn533_send_cmd_async(struct pn533 *dev, u8 cmd_code,
struct sk_buff *req,
pn533_send_async_complete_t complete_cb,
OpenPOWER on IntegriCloud