NFC: add nfc subsystem core (3e256b8f) · Commits · 戴 / test

drivers/Kconfig

+0 −2

Original line number	Diff line number	Diff line
		@@ -92,8 +92,6 @@ source "drivers/memstick/Kconfig"

		source "drivers/leds/Kconfig"

		source "drivers/nfc/Kconfig"

		source "drivers/accessibility/Kconfig"

		source "drivers/infiniband/Kconfig"

drivers/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -120,3 +120,4 @@ obj-y += ieee802154/
		obj-y += clk/

		obj-$(CONFIG_HWSPINLOCK) += hwspinlock/
		obj-$(CONFIG_NFC) += nfc/

drivers/nfc/Kconfig

+3 −13

Original line number	Diff line number	Diff line
		@@ -2,17 +2,8 @@
		# Near Field Communication (NFC) devices
		#

		menuconfig NFC_DEVICES
		bool "Near Field Communication (NFC) devices"
		default n
		---help---
		You'll have to say Y if your computer contains an NFC device that
		you want to use under Linux.

		You can say N here if you don't have any Near Field Communication
		devices connected to your computer.

		if NFC_DEVICES
		menu "Near Field Communication (NFC) devices"
		depends on NFC

		config PN544_NFC
		tristate "PN544 NFC driver"
		@@ -26,5 +17,4 @@ config PN544_NFC
		To compile this driver as a module, choose m here. The module will
		be called pn544.


		endif # NFC_DEVICES
		endmenu

drivers/nfc/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -3,3 +3,5 @@
		#

		obj-$(CONFIG_PN544_NFC) += pn544.o

		ccflags-$(CONFIG_NFC_DEBUG) := -DDEBUG

include/net/nfc.h

0 → 100644

+135 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2011 Instituto Nokia de Tecnologia
		*
		* Authors:
		* Lauro Ramos Venancio <lauro.venancio@openbossa.org>
		* Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; either version 2 of the License, or
		* (at your option) any later version.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the
		* Free Software Foundation, Inc.,
		* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
		*/

		#ifndef __NET_NFC_H
		#define __NET_NFC_H

		#include <linux/device.h>
		#include <linux/skbuff.h>

		#define nfc_dev_info(dev, fmt, arg...) dev_info((dev), "NFC: " fmt "\n", ## arg)
		#define nfc_dev_err(dev, fmt, arg...) dev_err((dev), "NFC: " fmt "\n", ## arg)
		#define nfc_dev_dbg(dev, fmt, arg...) dev_dbg((dev), fmt "\n", ## arg)

		struct nfc_dev;

		/**
		* data_exchange_cb_t - Definition of nfc_data_exchange callback
		*
		* @context: nfc_data_exchange cb_context parameter
		* @skb: response data
		* @err: If an error has occurred during data exchange, it is the
		* error number. Zero means no error.
		*
		* When a rx or tx package is lost or corrupted or the target gets out
		* of the operating field, err is -EIO.
		*/
		typedef void (data_exchange_cb_t)(void context, struct sk_buff *skb,
		int err);

		struct nfc_ops {
		int (start_poll)(struct nfc_dev dev, u32 protocols);
		void (stop_poll)(struct nfc_dev dev);
		int (activate_target)(struct nfc_dev dev, u32 target_idx,
		u32 protocol);
		void (deactivate_target)(struct nfc_dev dev, u32 target_idx);
		int (data_exchange)(struct nfc_dev dev, u32 target_idx,
		struct sk_buff *skb, data_exchange_cb_t cb,
		void *cb_context);
		};

		struct nfc_dev {
		unsigned idx;
		struct device dev;
		bool polling;
		u32 supported_protocols;

		struct nfc_ops *ops;
		};
		#define to_nfc_dev(_dev) container_of(_dev, struct nfc_dev, dev)

		extern struct class nfc_class;

		struct nfc_dev nfc_allocate_device(struct nfc_ops ops,
		u32 supported_protocols);

		/**
		* nfc_free_device - free nfc device
		*
		* @dev: The nfc device to free
		*/
		static inline void nfc_free_device(struct nfc_dev *dev)
		{
		put_device(&dev->dev);
		}

		int nfc_register_device(struct nfc_dev *dev);

		void nfc_unregister_device(struct nfc_dev *dev);

		/**
		* nfc_set_parent_dev - set the parent device
		*
		* @nfc_dev: The nfc device whose parent is being set
		* @dev: The parent device
		*/
		static inline void nfc_set_parent_dev(struct nfc_dev *nfc_dev,
		struct device *dev)
		{
		nfc_dev->dev.parent = dev;
		}

		/**
		* nfc_set_drvdata - set driver specifc data
		*
		* @dev: The nfc device
		* @data: Pointer to driver specifc data
		*/
		static inline void nfc_set_drvdata(struct nfc_dev dev, void data)
		{
		dev_set_drvdata(&dev->dev, data);
		}

		/**
		* nfc_get_drvdata - get driver specifc data
		*
		* @dev: The nfc device
		*/
		static inline void nfc_get_drvdata(struct nfc_dev dev)
		{
		return dev_get_drvdata(&dev->dev);
		}

		/**
		* nfc_device_name - get the nfc device name
		*
		* @dev: The nfc device whose name to return
		*/
		static inline const char nfc_device_name(struct nfc_dev dev)
		{
		return dev_name(&dev->dev);
		}

		struct sk_buff *nfc_alloc_skb(unsigned int size, gfp_t gfp);

		#endif /* __NET_NFC_H */

Admin message