diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2011-12-14 10:43:10 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-12-14 14:50:13 -0500 |
commit | 541d920b05b538ec0d9ae8ce619ee4fc6fb19e32 (patch) | |
tree | e83cbcc06cf2e9a3c34e4fceb222730469117a77 /drivers/nfc | |
parent | 1ed28f610653e9b18433c6d87e9d333b7e3e886e (diff) |
NFC: Set and get DEP general bytes
Without an API for setting and getting the local and remote general bytes,
drivers won't be able to properly establish a DEP link.
This API also allows them to propagate the remote general bytes they get
from the DEP link establishment up to the LLCP layer.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r-- | drivers/nfc/pn533.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c index ea1caaeed13c..dccd96552f5d 100644 --- a/drivers/nfc/pn533.c +++ b/drivers/nfc/pn533.c | |||
@@ -1121,6 +1121,7 @@ static int pn533_activate_target_nfcdep(struct pn533 *dev) | |||
1121 | { | 1121 | { |
1122 | struct pn533_cmd_activate_param param; | 1122 | struct pn533_cmd_activate_param param; |
1123 | struct pn533_cmd_activate_response *resp; | 1123 | struct pn533_cmd_activate_response *resp; |
1124 | u16 gt_len; | ||
1124 | int rc; | 1125 | int rc; |
1125 | 1126 | ||
1126 | nfc_dev_dbg(&dev->interface->dev, "%s", __func__); | 1127 | nfc_dev_dbg(&dev->interface->dev, "%s", __func__); |
@@ -1146,7 +1147,11 @@ static int pn533_activate_target_nfcdep(struct pn533 *dev) | |||
1146 | if (rc != PN533_CMD_RET_SUCCESS) | 1147 | if (rc != PN533_CMD_RET_SUCCESS) |
1147 | return -EIO; | 1148 | return -EIO; |
1148 | 1149 | ||
1149 | return 0; | 1150 | /* ATR_RES general bytes are located at offset 16 */ |
1151 | gt_len = PN533_FRAME_CMD_PARAMS_LEN(dev->in_frame) - 16; | ||
1152 | rc = nfc_set_remote_general_bytes(dev->nfc_dev, resp->gt, gt_len); | ||
1153 | |||
1154 | return rc; | ||
1150 | } | 1155 | } |
1151 | 1156 | ||
1152 | static int pn533_activate_target(struct nfc_dev *nfc_dev, u32 target_idx, | 1157 | static int pn533_activate_target(struct nfc_dev *nfc_dev, u32 target_idx, |