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

Commit c40d1740 authored by Arron Wang's avatar Arron Wang Committed by Samuel Ortiz
Browse files

NFC: Implement HCI DEP link up and down 



And implement the corresponding hooks for pn544.

Signed-off-by: default avatarArron Wang <arron.wang@intel.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 928326f2

drivers/nfc/pn544_hci.c

+39 −0
Original line number Diff line number Diff line
@@ -746,6 +746,43 @@ static int pn544_hci_start_poll(struct nfc_hci_dev *hdev, 
	return r;

}



static int pn544_hci_dep_link_up(struct nfc_hci_dev *hdev,

				struct nfc_target *target, u8 comm_mode,

				u8 *gb, size_t gb_len)

{

	struct sk_buff *rgb_skb = NULL;

	int r;



	r = nfc_hci_get_param(hdev, target->hci_reader_gate,

				PN544_DEP_ATR_RES, &rgb_skb);

	if (r < 0)

		return r;



	if (rgb_skb->len == 0 || rgb_skb->len > NFC_GB_MAXSIZE) {

		r = -EPROTO;

		goto exit;

	}

	print_hex_dump(KERN_DEBUG, "remote gb: ", DUMP_PREFIX_OFFSET,

			16, 1, rgb_skb->data, rgb_skb->len, true);



	r = nfc_set_remote_general_bytes(hdev->ndev, rgb_skb->data,

						rgb_skb->len);



	if (r == 0)

		r = nfc_dep_link_is_up(hdev->ndev, target->idx, comm_mode,

					NFC_RF_INITIATOR);

exit:

	kfree_skb(rgb_skb);

	return r;

}



static int pn544_hci_dep_link_down(struct nfc_hci_dev *hdev)

{



	return nfc_hci_send_event(hdev, PN544_RF_READER_NFCIP1_INITIATOR_GATE,

					NFC_HCI_EVT_END_OPERATION, NULL, 0);

}



static int pn544_hci_target_from_gate(struct nfc_hci_dev *hdev, u8 gate,

				      struct nfc_target *target)

{
@@ -973,6 +1010,8 @@ static struct nfc_hci_ops pn544_hci_ops = { 
	.hci_ready = pn544_hci_ready,

	.xmit = pn544_hci_xmit,

	.start_poll = pn544_hci_start_poll,

	.dep_link_up = pn544_hci_dep_link_up,

	.dep_link_down = pn544_hci_dep_link_down,

	.target_from_gate = pn544_hci_target_from_gate,

	.complete_target_discovered = pn544_hci_complete_target_discovered,

	.data_exchange = pn544_hci_data_exchange,

include/net/nfc/hci.h

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ struct nfc_hci_ops { 
	int (*xmit) (struct nfc_hci_dev *hdev, struct sk_buff *skb);

	int (*start_poll) (struct nfc_hci_dev *hdev,

			   u32 im_protocols, u32 tm_protocols);

	int (*dep_link_up)(struct nfc_hci_dev *hdev, struct nfc_target *target,

			   u8 comm_mode, u8 *gb, size_t gb_len);

	int (*dep_link_down)(struct nfc_hci_dev *hdev);

	int (*target_from_gate) (struct nfc_hci_dev *hdev, u8 gate,

				 struct nfc_target *target);

	int (*complete_target_discovered) (struct nfc_hci_dev *hdev, u8 gate,

net/nfc/hci/core.c

+24 −0
Original line number Diff line number Diff line
@@ -546,6 +546,28 @@ static void hci_stop_poll(struct nfc_dev *nfc_dev) 
			   NFC_HCI_EVT_END_OPERATION, NULL, 0);

}



static int hci_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target,

				__u8 comm_mode, __u8 *gb, size_t gb_len)

{

	struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);



	if (hdev->ops->dep_link_up)

		return hdev->ops->dep_link_up(hdev, target, comm_mode,

						gb, gb_len);



	return 0;

}



static int hci_dep_link_down(struct nfc_dev *nfc_dev)

{

	struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);



	if (hdev->ops->dep_link_down)

		return hdev->ops->dep_link_down(hdev);



	return 0;

}



static int hci_activate_target(struct nfc_dev *nfc_dev,

			       struct nfc_target *target, u32 protocol)

{
@@ -731,6 +753,8 @@ static struct nfc_ops hci_nfc_ops = { 
	.dev_down = hci_dev_down,

	.start_poll = hci_start_poll,

	.stop_poll = hci_stop_poll,

	.dep_link_up = hci_dep_link_up,

	.dep_link_down = hci_dep_link_down,

	.activate_target = hci_activate_target,

	.deactivate_target = hci_deactivate_target,

	.im_transceive = hci_transceive,