Some header file macros and an enum were copied from Linux and placed in neard's include/nfc_copy.h file. That isn't the proper place as nfc_copy.h is supposed to be a pristine copy of the Linux nfc.h file. Move those header file definitions into tools/nciattach.c since that is the only file that uses them.
Signed-off-by: Mark Greer <[email protected]> --- include/nfc_copy.h | 12 ------------ tools/nciattach.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/nfc_copy.h b/include/nfc_copy.h index 9e21738..0b25f5c 100644 --- a/include/nfc_copy.h +++ b/include/nfc_copy.h @@ -287,16 +287,4 @@ struct sockaddr_nfc_llcp { #define NFC_LLCP_REMOTE_LTO 3 #define NFC_LLCP_REMOTE_RW 4 -#ifndef N_NCI -#define N_NCI 25 -#endif - -/* Ioctl */ -#define NCIUARTSETDRIVER _IOW('U', 0, char *) - -enum nci_uart_driver { - NCI_UART_DRIVER_MARVELL = 0, - NCI_UART_DRIVER_MAX -}; - #endif /*__LINUX_NFC_H */ diff --git a/tools/nciattach.c b/tools/nciattach.c index c71d9c7..370f98b 100644 --- a/tools/nciattach.c +++ b/tools/nciattach.c @@ -50,6 +50,18 @@ #define ENABLE_PM 1 #define DISABLE_PM 0 +#ifndef N_NCI +#define N_NCI 25 +#endif + +/* Ioctl */ +#define NCIUARTSETDRIVER _IOW('U', 0, char *) + +enum nci_uart_driver { + NCI_UART_DRIVER_MARVELL = 0, + NCI_UART_DRIVER_MAX +}; + struct nci_driver_info { const char *name; enum nci_uart_driver driver_id; -- 2.13.0
