Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01d719a2 authored by Samuel Ortiz's avatar Samuel Ortiz Committed by John W. Linville
Browse files

NFC: Add ISO 14443 type B protocol 



Some devices (e.g. Sony's PaSoRi) can not do type B polling, so we have
to make a distinction between ISO14443 type A and B poll modes.

Cc: Eric Lapuyade <eric.lapuyade@intel.com>
Cc: Ilan Elias <ilane@ti.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent a1fbbf18

drivers/nfc/nfcwilink.c

+4 −3
Original line number Diff line number Diff line
@@ -537,6 +537,7 @@ static int nfcwilink_probe(struct platform_device *pdev) 
	protocols = NFC_PROTO_JEWEL_MASK

		| NFC_PROTO_MIFARE_MASK | NFC_PROTO_FELICA_MASK

		| NFC_PROTO_ISO14443_MASK

		| NFC_PROTO_ISO14443_B_MASK

		| NFC_PROTO_NFC_DEP_MASK;



	drv->ndev = nci_allocate_device(&nfcwilink_ops,

drivers/nfc/pn533.c

+7 −5
Original line number Diff line number Diff line
@@ -49,13 +49,15 @@ 
#define PN533_DEVICE_STD    0x1

#define PN533_DEVICE_PASORI 0x2



#define PN533_ALL_PROTOCOLS (NFC_PROTO_JEWEL_MASK | NFC_PROTO_MIFARE_MASK \

			     | NFC_PROTO_FELICA_MASK | NFC_PROTO_ISO14443_MASK \

			     | NFC_PROTO_NFC_DEP_MASK)

#define PN533_ALL_PROTOCOLS (NFC_PROTO_JEWEL_MASK | NFC_PROTO_MIFARE_MASK |\

			     NFC_PROTO_FELICA_MASK | NFC_PROTO_ISO14443_MASK |\

			     NFC_PROTO_NFC_DEP_MASK |\

			     NFC_PROTO_ISO14443_B_MASK)



#define PN533_NO_TYPE_B_PROTOCOLS (NFC_PROTO_JEWEL_MASK | \

				   NFC_PROTO_MIFARE_MASK | \

				   NFC_PROTO_FELICA_MASK | \

				   NFC_PROTO_ISO14443_MASK | \

				   NFC_PROTO_NFC_DEP_MASK)



static const struct usb_device_id pn533_table[] = {
@@ -987,7 +989,7 @@ static int pn533_target_found_type_b(struct nfc_target *nfc_tgt, u8 *tgt_data, 
	if (!pn533_target_type_b_is_valid(tgt_type_b, tgt_data_len))

		return -EPROTO;



	nfc_tgt->supported_protocols = NFC_PROTO_ISO14443_MASK;

	nfc_tgt->supported_protocols = NFC_PROTO_ISO14443_B_MASK;



	return 0;

}
@@ -1094,7 +1096,7 @@ static void pn533_poll_create_mod_list(struct pn533 *dev, 
	if (im_protocols & NFC_PROTO_JEWEL_MASK)

		pn533_poll_add_mod(dev, PN533_POLL_MOD_106KBPS_JEWEL);



	if (im_protocols & NFC_PROTO_ISO14443_MASK)

	if (im_protocols & NFC_PROTO_ISO14443_B_MASK)

		pn533_poll_add_mod(dev, PN533_POLL_MOD_847KBPS_B);



	if (tm_protocols)

drivers/nfc/pn544_hci.c

+1 −0
Original line number Diff line number Diff line
@@ -869,6 +869,7 @@ static int __devinit pn544_hci_probe(struct i2c_client *client, 
		    NFC_PROTO_MIFARE_MASK |

		    NFC_PROTO_FELICA_MASK |

		    NFC_PROTO_ISO14443_MASK |

		    NFC_PROTO_ISO14443_B_MASK |

		    NFC_PROTO_NFC_DEP_MASK;



	info->shdlc = nfc_shdlc_allocate(&pn544_shdlc_ops,

include/linux/nfc.h

+8 −6
Original line number Diff line number Diff line
@@ -136,8 +136,9 @@ enum nfc_attrs { 
#define NFC_PROTO_FELICA	3

#define NFC_PROTO_ISO14443	4

#define NFC_PROTO_NFC_DEP	5

#define NFC_PROTO_ISO14443_B	6



#define NFC_PROTO_MAX		6

#define NFC_PROTO_MAX		7



/* NFC communication modes */

#define NFC_COMM_ACTIVE  0
@@ -154,6 +155,7 @@ enum nfc_attrs { 
#define NFC_PROTO_FELICA_MASK	  (1 << NFC_PROTO_FELICA)

#define NFC_PROTO_ISO14443_MASK	  (1 << NFC_PROTO_ISO14443)

#define NFC_PROTO_NFC_DEP_MASK	  (1 << NFC_PROTO_NFC_DEP)

#define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B)



struct sockaddr_nfc {

	sa_family_t sa_family;

net/nfc/hci/core.c

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static int nfc_hci_target_discovered(struct nfc_hci_dev *hdev, u8 gate) 
		}

		break;

	case NFC_HCI_RF_READER_B_GATE:

		targets->supported_protocols = NFC_PROTO_ISO14443_MASK;

		targets->supported_protocols = NFC_PROTO_ISO14443_B_MASK;

		break;

	default:

		if (hdev->ops->target_from_gate)