nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

NFC: Move LLCP code to the NFC top level diirectory

Browse source 
And stop making it optional. LLCP is a fundamental part of the NFC
specifications and making it optional does not make much sense.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2013-04-26 11:49:40 +02:00
parent b006ed545c
commit 30cc458765
9 changed files with 8 additions and 79 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
net/nfc/Kconfig
View file

@ -15,6 +15,5 @@ menuconfig NFC
source "net/nfc/nci/Kconfig" source "net/nfc/nci/Kconfig"
source "net/nfc/hci/Kconfig" source "net/nfc/hci/Kconfig"
source "net/nfc/llcp/Kconfig"
source "drivers/nfc/Kconfig" source "drivers/nfc/Kconfig"

6
net/nfc/Makefile
View file

@ -5,6 +5,8 @@
obj-$(CONFIG_NFC) += nfc.o obj-$(CONFIG_NFC) += nfc.o
obj-$(CONFIG_NFC_NCI) += nci/ obj-$(CONFIG_NFC_NCI) += nci/
obj-$(CONFIG_NFC_HCI) += hci/ obj-$(CONFIG_NFC_HCI) += hci/
#obj-$(CONFIG_NFC_LLCP) += llcp/
nfc-objs := core.o netlink.o af_nfc.o rawsock.o llcp_core.o llcp_commands.o \
llcp_sock.o
nfc-objs := core.o netlink.o af_nfc.o rawsock.o
nfc-$(CONFIG_NFC_LLCP) += llcp/llcp.o llcp/commands.o llcp/sock.o

0
net/nfc/llcp/llcp.h → net/nfc/llcp.h
View file

7
net/nfc/llcp/Kconfig
View file

@ -1,7 +0,0 @@
config NFC_LLCP
depends on NFC
bool "NFC LLCP support"
default n
help
Say Y here if you want to build support for a kernel NFC LLCP
implementation.

2
net/nfc/llcp/commands.c → net/nfc/llcp_commands.c
View file

@ -26,7 +26,7 @@
#include <net/nfc/nfc.h> #include <net/nfc/nfc.h>
#include "../nfc.h" #include "nfc.h"
#include "llcp.h" #include "llcp.h"
static u8 llcp_tlv_length[LLCP_TLV_MAX] = { static u8 llcp_tlv_length[LLCP_TLV_MAX] = {

2
net/nfc/llcp/llcp.c → net/nfc/llcp_core.c
View file

@ -24,7 +24,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/nfc.h> #include <linux/nfc.h>
#include "../nfc.h" #include "nfc.h"
#include "llcp.h" #include "llcp.h"
static u8 llcp_magic[3] = {0x46, 0x66, 0x6d}; static u8 llcp_magic[3] = {0x46, 0x66, 0x6d};

2
net/nfc/llcp/sock.c → net/nfc/llcp_sock.c
View file

@ -24,7 +24,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/nfc.h> #include <linux/nfc.h>
#include "../nfc.h" #include "nfc.h"
#include "llcp.h" #include "llcp.h"
static int sock_wait_state(struct sock *sk, int state, unsigned long timeo) static int sock_wait_state(struct sock *sk, int state, unsigned long timeo)

3
net/nfc/netlink.c
View file

@ -28,8 +28,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include "nfc.h" #include "nfc.h"
#include "llcp.h"
#include "llcp/llcp.h"
static struct genl_multicast_group nfc_genl_event_mcgrp = { static struct genl_multicast_group nfc_genl_event_mcgrp = {
.name = NFC_GENL_MCAST_EVENT_NAME, .name = NFC_GENL_MCAST_EVENT_NAME,

64
net/nfc/nfc.h
View file

@ -48,8 +48,6 @@ struct nfc_rawsock {
struct nfc_llcp_sdp_tlv; struct nfc_llcp_sdp_tlv;
#ifdef CONFIG_NFC_LLCP
void nfc_llcp_mac_is_down(struct nfc_dev *dev); void nfc_llcp_mac_is_down(struct nfc_dev *dev);
void nfc_llcp_mac_is_up(struct nfc_dev *dev, u32 target_idx, void nfc_llcp_mac_is_up(struct nfc_dev *dev, u32 target_idx,
u8 comm_mode, u8 rf_mode); u8 comm_mode, u8 rf_mode);
@ -64,68 +62,6 @@ void nfc_llcp_exit(void);
void nfc_llcp_free_sdp_tlv(struct nfc_llcp_sdp_tlv *sdp); void nfc_llcp_free_sdp_tlv(struct nfc_llcp_sdp_tlv *sdp);
void nfc_llcp_free_sdp_tlv_list(struct hlist_head *head); void nfc_llcp_free_sdp_tlv_list(struct hlist_head *head);
#else
static inline void nfc_llcp_mac_is_down(struct nfc_dev *dev)
{
}
static inline void nfc_llcp_mac_is_up(struct nfc_dev *dev, u32 target_idx,
u8 comm_mode, u8 rf_mode)
{
}
static inline int nfc_llcp_register_device(struct nfc_dev *dev)
{
return 0;
}
static inline void nfc_llcp_unregister_device(struct nfc_dev *dev)
{
}
static inline int nfc_llcp_set_remote_gb(struct nfc_dev *dev,
u8 *gb, u8 gb_len)
{
return 0;
}
static inline u8 *nfc_llcp_general_bytes(struct nfc_dev *dev, size_t *gb_len)
{
*gb_len = 0;
return NULL;
}
static inline int nfc_llcp_data_received(struct nfc_dev *dev,
struct sk_buff *skb)
{
return 0;
}
static inline struct nfc_llcp_local *nfc_llcp_find_local(struct nfc_dev *dev)
{
return NULL;
}
static inline int nfc_llcp_init(void)
{
return 0;
}
static inline void nfc_llcp_exit(void)
{
}
static inline void nfc_llcp_free_sdp_tlv(struct nfc_llcp_sdp_tlv *sdp)
{
}
static inline void nfc_llcp_free_sdp_tlv_list(struct hlist_head *sdp_head)
{
}
#endif
int __init rawsock_init(void); int __init rawsock_init(void);
void rawsock_exit(void); void rawsock_exit(void);