evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NFC: nci: Introduce nci_core_cmd

Browse source 
This allows sending core commands from the driver. The driver
should be able to send NCI core commands like CORE_GET_CONFIG_CMD.

Signed-off-by: Robert Dolca <robert.dolca@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Robert Dolca 2015-10-22 12:11:37 +03:00 • committed by Samuel Ortiz
parent e4dbd62528
commit 7bc4824ed5
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/net/nfc/nci_core.h
View file

@ -278,6 +278,7 @@ int nci_request(struct nci_dev *ndev,
unsigned long opt), unsigned long opt),
unsigned long opt, __u32 timeout); unsigned long opt, __u32 timeout);
int nci_prop_cmd(struct nci_dev *ndev, __u8 oid, size_t len, __u8 *payload); int nci_prop_cmd(struct nci_dev *ndev, __u8 oid, size_t len, __u8 *payload);
int nci_core_cmd(struct nci_dev *ndev, __u16 opcode, size_t len, __u8 *payload);
int nci_core_reset(struct nci_dev *ndev); int nci_core_reset(struct nci_dev *ndev);
int nci_core_init(struct nci_dev *ndev); int nci_core_init(struct nci_dev *ndev);

24
net/nfc/nci/core.c
View file

@ -325,32 +325,46 @@ static void nci_rf_deactivate_req(struct nci_dev *ndev, unsigned long opt)
sizeof(struct nci_rf_deactivate_cmd), &cmd); sizeof(struct nci_rf_deactivate_cmd), &cmd);
} }
struct nci_prop_cmd_param { struct nci_cmd_param {
__u16 opcode; __u16 opcode;
size_t len; size_t len;
__u8 *payload; __u8 *payload;
}; };
static void nci_prop_cmd_req(struct nci_dev *ndev, unsigned long opt) static void nci_generic_req(struct nci_dev *ndev, unsigned long opt)
{ {
struct nci_prop_cmd_param *param = (struct nci_prop_cmd_param *)opt; struct nci_cmd_param *param =
(struct nci_cmd_param *)opt;
nci_send_cmd(ndev, param->opcode, param->len, param->payload); nci_send_cmd(ndev, param->opcode, param->len, param->payload);
} }
int nci_prop_cmd(struct nci_dev *ndev, __u8 oid, size_t len, __u8 *payload) int nci_prop_cmd(struct nci_dev *ndev, __u8 oid, size_t len, __u8 *payload)
{ {
struct nci_prop_cmd_param param; struct nci_cmd_param param;
param.opcode = nci_opcode_pack(NCI_GID_PROPRIETARY, oid); param.opcode = nci_opcode_pack(NCI_GID_PROPRIETARY, oid);
param.len = len; param.len = len;
param.payload = payload; param.payload = payload;
return __nci_request(ndev, nci_prop_cmd_req, (unsigned long)&param, return __nci_request(ndev, nci_generic_req, (unsigned long)&param,
msecs_to_jiffies(NCI_CMD_TIMEOUT)); msecs_to_jiffies(NCI_CMD_TIMEOUT));
} }
EXPORT_SYMBOL(nci_prop_cmd); EXPORT_SYMBOL(nci_prop_cmd);
int nci_core_cmd(struct nci_dev *ndev, __u16 opcode, size_t len, __u8 *payload)
{
struct nci_cmd_param param;
param.opcode = opcode;
param.len = len;
param.payload = payload;
return __nci_request(ndev, nci_generic_req, (unsigned long)&param,
msecs_to_jiffies(NCI_CMD_TIMEOUT));
}
EXPORT_SYMBOL(nci_core_cmd);
int nci_core_reset(struct nci_dev *ndev) int nci_core_reset(struct nci_dev *ndev)
{ {
return __nci_request(ndev, nci_reset_req, 0, return __nci_request(ndev, nci_reset_req, 0,