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

Commit 41a8ec49 authored by Samuel Ortiz's avatar Samuel Ortiz
Browse files

NFC: Set the proper baud rate when trying to activate pn533 targets 



We get the right baud rate from the last polled modulation.

Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 07922bb1

drivers/nfc/pn533.c

+23 −2
Original line number Diff line number Diff line
@@ -1629,6 +1629,20 @@ static int pn533_in_dep_link_up_complete(struct pn533 *dev, void *arg, 
	return 0;

}



static int pn533_mod_to_baud(struct pn533 *dev)

{

	switch (dev->poll_mod_curr) {

	case PN533_POLL_MOD_106KBPS_A:

		return 0;

	case PN533_POLL_MOD_212KBPS_FELICA:

		return 1;

	case PN533_POLL_MOD_424KBPS_FELICA:

		return 2;

	default:

		return -EINVAL;

	}

}



#define PASSIVE_DATA_LEN 5

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

			     u8 comm_mode, u8* gb, size_t gb_len)
@@ -1637,7 +1651,7 @@ static int pn533_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target, 
	struct pn533_cmd_jump_dep *cmd;

	u8 cmd_len, *data_ptr;

	u8 passive_data[PASSIVE_DATA_LEN] = {0x00, 0xff, 0xff, 0x00, 0x3};

	int rc;

	int rc, baud;



	nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
@@ -1653,6 +1667,13 @@ static int pn533_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target, 
		return -EBUSY;

	}



	baud = pn533_mod_to_baud(dev);

	if (baud < 0) {

		nfc_dev_err(&dev->interface->dev,

			    "Invalid curr modulation %d", dev->poll_mod_curr);

		return baud;

	}



	cmd_len = sizeof(struct pn533_cmd_jump_dep) + gb_len;

	if (comm_mode == NFC_COMM_PASSIVE)

		cmd_len += PASSIVE_DATA_LEN;
@@ -1665,7 +1686,7 @@ static int pn533_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target, 


	cmd->active = !comm_mode;

	cmd->next = 0;

	cmd->baud = 2;

	cmd->baud = baud;

	data_ptr = cmd->data;

	if (comm_mode == NFC_COMM_PASSIVE && cmd->baud > 0) {

		memcpy(data_ptr, passive_data, PASSIVE_DATA_LEN);