Commit 1676f751 authored by Eric Lapuyade's avatar Eric Lapuyade Committed by John W. Linville
Browse files

NFC: Add HCI/SHDLC support to let driver check for tag presence 



Signed-off-by: default avatarEric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d4ccb132

include/net/nfc/hci.h

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ struct nfc_hci_ops { 
	int (*data_exchange) (struct nfc_hci_dev *hdev,

			      struct nfc_target *target,

			      struct sk_buff *skb, struct sk_buff **res_skb);

	int (*check_presence)(struct nfc_hci_dev *hdev,

			      struct nfc_target *target);

};



#define NFC_HCI_MAX_CUSTOM_GATES	15

include/net/nfc/shdlc.h

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ struct nfc_shdlc_ops { 
	int (*data_exchange) (struct nfc_shdlc *shdlc,

			      struct nfc_target *target,

			      struct sk_buff *skb, struct sk_buff **res_skb);

	int (*check_presence)(struct nfc_shdlc *shdlc,

			      struct nfc_target *target);

};



enum shdlc_state {

net/nfc/hci/core.c

+12 −0
Original line number Diff line number Diff line
@@ -574,6 +574,17 @@ static int hci_data_exchange(struct nfc_dev *nfc_dev, struct nfc_target *target, 
	return 0;

}



static int hci_check_presence(struct nfc_dev *nfc_dev,

			      struct nfc_target *target)

{

	struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);



	if (hdev->ops->check_presence)

		return hdev->ops->check_presence(hdev, target);



	return 0;

}



struct nfc_ops hci_nfc_ops = {

	.dev_up = hci_dev_up,

	.dev_down = hci_dev_down,
@@ -582,6 +593,7 @@ struct nfc_ops hci_nfc_ops = { 
	.activate_target = hci_activate_target,

	.deactivate_target = hci_deactivate_target,

	.data_exchange = hci_data_exchange,

	.check_presence = hci_check_presence,

};



struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops,

net/nfc/hci/shdlc.c

+12 −0
Original line number Diff line number Diff line
@@ -816,6 +816,17 @@ static int nfc_shdlc_data_exchange(struct nfc_hci_dev *hdev, 
	return -EPERM;

}



static int nfc_shdlc_check_presence(struct nfc_hci_dev *hdev,

				    struct nfc_target *target)

{

	struct nfc_shdlc *shdlc = nfc_hci_get_clientdata(hdev);



	if (shdlc->ops->check_presence)

		return shdlc->ops->check_presence(shdlc, target);



	return 0;

}



static struct nfc_hci_ops shdlc_ops = {

	.open = nfc_shdlc_open,

	.close = nfc_shdlc_close,
@@ -825,6 +836,7 @@ static struct nfc_hci_ops shdlc_ops = { 
	.target_from_gate = nfc_shdlc_target_from_gate,

	.complete_target_discovered = nfc_shdlc_complete_target_discovered,

	.data_exchange = nfc_shdlc_data_exchange,

	.check_presence = nfc_shdlc_check_presence,

};



struct nfc_shdlc *nfc_shdlc_allocate(struct nfc_shdlc_ops *ops,