Commit cb675f5f authored by John W. Linville's avatar John W. Linville
Browse files

Merge tag 'nfc-next-3.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0 



Samuel says:

"This is the 2nd NFC pull request for 3.8.

With this one we have:

- A few HCI improvements in preparation for an upcoming HCI chipset support.
- A pn544 code cleanup after the old driver was removed.
- An LLCP improvement for notifying user space when one peer stops ACKing I
  frames."

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parents ac46ba43 be02b6b6

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -5067,6 +5067,7 @@ F: net/nfc/ 
F:	include/linux/nfc.h

F:	include/net/nfc/

F:	drivers/nfc/

F:	include/linux/platform_data/pn544.h



NFS, SUNRPC, AND LOCKD CLIENTS

M:	Trond Myklebust <Trond.Myklebust@netapp.com>

drivers/nfc/pn544/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <linux/interrupt.h>

#include <linux/delay.h>



#include <linux/nfc/pn544.h>

#include <linux/platform_data/pn544.h>



#include <net/nfc/hci.h>

#include <net/nfc/llc.h>

include/linux/nfc/pn544.h→include/linux/platform_data/pn544.h

+0 −60
Original line number Diff line number Diff line
@@ -25,65 +25,6 @@ 


#include <linux/i2c.h>



#define PN544_DRIVER_NAME	"pn544"

#define PN544_MAXWINDOW_SIZE	7

#define PN544_WINDOW_SIZE	4

#define PN544_RETRIES		10

#define PN544_MAX_I2C_TRANSFER	0x0400

#define PN544_MSG_MAX_SIZE	0x21 /* at normal HCI mode */



/* ioctl */

#define PN544_CHAR_BASE		'P'

#define PN544_IOR(num, dtype)	_IOR(PN544_CHAR_BASE, num, dtype)

#define PN544_IOW(num, dtype)	_IOW(PN544_CHAR_BASE, num, dtype)

#define PN544_GET_FW_MODE	PN544_IOW(1, unsigned int)

#define PN544_SET_FW_MODE	PN544_IOW(2, unsigned int)

#define PN544_GET_DEBUG		PN544_IOW(3, unsigned int)

#define PN544_SET_DEBUG		PN544_IOW(4, unsigned int)



/* Timing restrictions (ms) */

#define PN544_RESETVEN_TIME	30 /* 7 */

#define PN544_PVDDVEN_TIME	0

#define PN544_VBATVEN_TIME	0

#define PN544_GPIO4VEN_TIME	0

#define PN544_WAKEUP_ACK	5

#define PN544_WAKEUP_GUARD	(PN544_WAKEUP_ACK + 1)

#define PN544_INACTIVITY_TIME	1000

#define PN544_INTERFRAME_DELAY	200 /* us */

#define PN544_BAUDRATE_CHANGE	150 /* us */



/* Debug bits */

#define PN544_DEBUG_BUF		0x01

#define PN544_DEBUG_READ	0x02

#define PN544_DEBUG_WRITE	0x04

#define PN544_DEBUG_IRQ		0x08

#define PN544_DEBUG_CALLS	0x10

#define PN544_DEBUG_MODE	0x20



/* Normal (HCI) mode */

#define PN544_LLC_HCI_OVERHEAD	3 /* header + crc (to length) */

#define PN544_LLC_MIN_SIZE	(1 + PN544_LLC_HCI_OVERHEAD) /* length + */

#define PN544_LLC_MAX_DATA	(PN544_MSG_MAX_SIZE - 2)

#define PN544_LLC_MAX_HCI_SIZE	(PN544_LLC_MAX_DATA - 2)



struct pn544_llc_packet {

	unsigned char length; /* of rest of packet */

	unsigned char header;

	unsigned char data[PN544_LLC_MAX_DATA]; /* includes crc-ccitt */

};



/* Firmware upgrade mode */

#define PN544_FW_HEADER_SIZE	3

/* max fw transfer is 1024bytes, but I2C limits it to 0xC0 */

#define PN544_MAX_FW_DATA	(PN544_MAX_I2C_TRANSFER - PN544_FW_HEADER_SIZE)



struct pn544_fw_packet {

	unsigned char command; /* status in answer */

	unsigned char length[2]; /* big-endian order (msf) */

	unsigned char data[PN544_MAX_FW_DATA];

};



#ifdef __KERNEL__

enum {

	NFC_GPIO_ENABLE,

	NFC_GPIO_FW_RESET,
@@ -99,6 +40,5 @@ struct pn544_nfc_platform_data { 
	void (*disable) (void);

	int (*get_gpio)(int type);

};

#endif /* __KERNEL__ */



#endif /* _PN544_H_ */

include/net/nfc/hci.h

+3 −0
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@ void *nfc_hci_get_clientdata(struct nfc_hci_dev *hdev); 


void nfc_hci_driver_failure(struct nfc_hci_dev *hdev, int err);



int nfc_hci_result_to_errno(u8 result);



/* Host IDs */

#define NFC_HCI_HOST_CONTROLLER_ID	0x00

#define NFC_HCI_TERMINAL_HOST_ID	0x01
@@ -235,5 +237,6 @@ int nfc_hci_send_response(struct nfc_hci_dev *hdev, u8 gate, u8 response, 
int nfc_hci_send_event(struct nfc_hci_dev *hdev, u8 gate, u8 event,

		       const u8 *param, size_t param_len);

int nfc_hci_target_discovered(struct nfc_hci_dev *hdev, u8 gate);

u32 nfc_hci_sak_to_protocol(u8 sak);



#endif /* __NET_HCI_H */

net/nfc/hci/command.c

+2 −2
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ int nfc_hci_connect_gate(struct nfc_hci_dev *hdev, u8 dest_host, u8 dest_gate, 
		return -EADDRINUSE;



	if (pipe != NFC_HCI_INVALID_PIPE)

		goto pipe_is_open;

		goto open_pipe;



	switch (dest_gate) {

	case NFC_HCI_LINK_MGMT_GATE:
@@ -361,6 +361,7 @@ int nfc_hci_connect_gate(struct nfc_hci_dev *hdev, u8 dest_host, u8 dest_gate, 
		break;

	}



open_pipe:

	r = nfc_hci_open_pipe(hdev, pipe);

	if (r < 0) {

		if (pipe_created)
@@ -371,7 +372,6 @@ int nfc_hci_connect_gate(struct nfc_hci_dev *hdev, u8 dest_host, u8 dest_gate, 
		return r;

	}



pipe_is_open:

	hdev->gate2pipe[dest_gate] = pipe;



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE