aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorArron Wang <arron.wang@intel.com>2012-09-27 05:32:55 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-10-26 12:26:45 -0400
commitf7a5f6c532f33ba66a7ca19e81ed447a83dab2db (patch)
tree6ac75749971e6870a0a8fbbf059fcca2af9ee55b /drivers/nfc
parent7e2afc9d072b9f84b314b208a125c2b1ce36b685 (diff)
NFC: Pass hardware specific HCI event to driver
Signed-off-by: Arron Wang <arron.wang@intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/pn544_hci.c45
1 files changed, 45 insertions, 0 deletions
diff --git a/drivers/nfc/pn544_hci.c b/drivers/nfc/pn544_hci.c
index 8b21a8efd751..d81242f4a92b 100644
--- a/drivers/nfc/pn544_hci.c
+++ b/drivers/nfc/pn544_hci.c
@@ -112,6 +112,12 @@ enum pn544_state {
112 112
113#define PN544_NFC_WI_MGMT_GATE 0xA1 113#define PN544_NFC_WI_MGMT_GATE 0xA1
114 114
115#define PN544_HCI_EVT_SND_DATA 0x01
116#define PN544_HCI_EVT_ACTIVATED 0x02
117#define PN544_HCI_EVT_DEACTIVATED 0x03
118#define PN544_HCI_EVT_RCV_DATA 0x04
119#define PN544_HCI_EVT_CONTINUE_MI 0x05
120
115static struct nfc_hci_gate pn544_gates[] = { 121static struct nfc_hci_gate pn544_gates[] = {
116 {NFC_HCI_ADMIN_GATE, NFC_HCI_INVALID_PIPE}, 122 {NFC_HCI_ADMIN_GATE, NFC_HCI_INVALID_PIPE},
117 {NFC_HCI_LOOPBACK_GATE, NFC_HCI_INVALID_PIPE}, 123 {NFC_HCI_LOOPBACK_GATE, NFC_HCI_INVALID_PIPE},
@@ -897,6 +903,44 @@ static int pn544_hci_check_presence(struct nfc_hci_dev *hdev,
897 NULL, 0, NULL); 903 NULL, 0, NULL);
898} 904}
899 905
906void pn544_hci_event_received(struct nfc_hci_dev *hdev, u8 gate, u8 event,
907 struct sk_buff *skb)
908{
909 struct sk_buff *rgb_skb = NULL;
910 int r = 0;
911
912 pr_debug("hci event %d", event);
913 switch (event) {
914 case PN544_HCI_EVT_ACTIVATED:
915 if (gate == PN544_RF_READER_NFCIP1_INITIATOR_GATE)
916 nfc_hci_target_discovered(hdev, gate);
917 else if (gate == PN544_RF_READER_NFCIP1_TARGET_GATE) {
918 r = nfc_hci_get_param(hdev, gate, PN544_DEP_ATR_REQ,
919 &rgb_skb);
920
921 if (r < 0)
922 goto exit;
923
924 nfc_tm_activated(hdev->ndev, NFC_PROTO_NFC_DEP_MASK,
925 NFC_COMM_PASSIVE, rgb_skb->data,
926 rgb_skb->len);
927
928 kfree_skb(rgb_skb);
929 }
930
931 break;
932 case PN544_HCI_EVT_DEACTIVATED:
933 nfc_hci_send_event(hdev, gate,
934 NFC_HCI_EVT_END_OPERATION, NULL, 0);
935 break;
936 default:
937 break;
938 }
939
940exit:
941 kfree_skb(skb);
942}
943
900static struct nfc_hci_ops pn544_hci_ops = { 944static struct nfc_hci_ops pn544_hci_ops = {
901 .open = pn544_hci_open, 945 .open = pn544_hci_open,
902 .close = pn544_hci_close, 946 .close = pn544_hci_close,
@@ -907,6 +951,7 @@ static struct nfc_hci_ops pn544_hci_ops = {
907 .complete_target_discovered = pn544_hci_complete_target_discovered, 951 .complete_target_discovered = pn544_hci_complete_target_discovered,
908 .data_exchange = pn544_hci_data_exchange, 952 .data_exchange = pn544_hci_data_exchange,
909 .check_presence = pn544_hci_check_presence, 953 .check_presence = pn544_hci_check_presence,
954 .event_received = pn544_hci_event_received,
910}; 955};
911 956
912static int __devinit pn544_hci_probe(struct i2c_client *client, 957static int __devinit pn544_hci_probe(struct i2c_client *client,