From patchwork Thu Jun 15 18:25:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Greer X-Patchwork-Id: 9789825 X-Patchwork-Delegate: sameo@linux.intel.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3917860325 for ; Thu, 15 Jun 2017 18:26:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3251B2861E for ; Thu, 15 Jun 2017 18:26:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 272BC2862C; Thu, 15 Jun 2017 18:26:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFE152861E for ; Thu, 15 Jun 2017 18:26:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751958AbdFOS0g (ORCPT ); Thu, 15 Jun 2017 14:26:36 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:33989 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752640AbdFOSZ2 (ORCPT ); Thu, 15 Jun 2017 14:25:28 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 13A6020AAE; Thu, 15 Jun 2017 14:25:20 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute3.internal (MEProxy); Thu, 15 Jun 2017 14:25:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=animalcreek.com; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=VhT EWfdkImMZxNHgf1Qzp+tajSV7pzjDa4Ir2Ss7QcQ=; b=Aiwu//Yq2fDkl6mCIAc iT8YiRdeVBtfv7IFqQXYCBanqlza5VHa+yfnTmfspoKbRqWO8Rj8cRzGsFOEeQ/H Qje8G/VOSwbJC3ioMFy8TSgVIzwJbfCnSaOe+jZzv3arQ4ICErhMMgzHnk+Kyc+K +4rEq4jxTOM0SeEHXUidYbYQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=VhTEWfdkImMZxNHgf1Qzp+tajSV7pzjDa4Ir2Ss7Q cQ=; b=aMIb1VmM3YOe7fV+RFsJIrL4Ggzvo1zZc1LM4VVNNoXiDWGxTMwylSl77 mkcomBcBelLhoc3ujY0ypYs2nFXrNYzg6w3UoQPpIfkdwmyWWPF7ilV1pAIwe6xD LdEiOZDqYvdGDDtxMSs0WvvU/YzJWiqT09OfamELwyEji1aWfNNeo4gRRY3otXfV b5nCGnl/DjK7UHh73sL1GAyOpvs3CojFgpP7s0o881ukILYskx8IEVLCSpUYasQl z2Bc7TjQYDa5Y2L7KPcU8tSX4N+LBxyuq9Ju4IVwB0WXPXq+3W52Aj2cB5qCBrIs eDVzrNHeVNuMbcOF5CN9DjZ+ZdOLQ== X-ME-Sender: X-Sasl-enc: GJkAyUPhYw0YkcM01kMCVXTrjBHToFb0Ue7zboi8IvZT 1497551119 Received: from blue.animalcreek.com (ip68-2-81-12.ph.ph.cox.net [68.2.81.12]) by mail.messagingengine.com (Postfix) with ESMTPA id CF03F7E814; Thu, 15 Jun 2017 14:25:19 -0400 (EDT) Received: from blue.animalcreek.com (localhost [127.0.0.1]) by blue.animalcreek.com (Postfix) with ESMTP id 652B7A20501; Thu, 15 Jun 2017 11:25:18 -0700 (MST) From: Mark Greer To: Samuel Ortiz Cc: linux-wireless@vger.kernel.org, linux-nfc@lists.01.org, Mark Greer Subject: [PATCH 22/23] nfctools: Move nciattach macros & enums to nciattach.c Date: Thu, 15 Jun 2017 11:25:15 -0700 Message-Id: <20170615182516.4508-23-mgreer@animalcreek.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170615182516.4508-1-mgreer@animalcreek.com> References: <20170615182516.4508-1-mgreer@animalcreek.com> Organization: Animal Creek Technologies, Inc. Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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;