From patchwork Thu May 15 20:18:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 30302 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f71.google.com (mail-pb0-f71.google.com [209.85.160.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 70D4C20068 for ; Thu, 15 May 2014 20:18:33 +0000 (UTC) Received: by mail-pb0-f71.google.com with SMTP id jt11sf7907736pbb.6 for ; Thu, 15 May 2014 13:18:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=iMCnwaBk/PQp8Vi+WPMf6Ps1fx/AbZvi4pP86mDIN6U=; b=A9aUCSUxtzi2kB5d5zmWX2Bc+neXMb97d59mJDDoaf525eh6DEXgA5vPJXBcNBpF6u Bi3RA+AerbOtArjgkhCEW5yMTZSE8xxrM8gUNDQATbcFCH1xVWG1dlGhOjdEqOUnAk80 iWDi/p2NkYr5cBE/L+7isVOCg6hthbRKB8a2rfW0IfyFr+TC8lvv6datcwyQHlx4b31a NZZ8FfokEJh2NPS6d0vB4R5M7ztEneLYISNQClHGWAS6L2DdZTzKJVKYaLlFmANwnAAR kw8BjiysG/HH4jKRA3zRkX4owMfhd0WisIUnbqErmGlotFeTiN7yW8CdB+ReTNT/Dqhi 6wOA== X-Gm-Message-State: ALoCoQmN+hhUTpvvmBgDN+DrP7p/ZZQJbkNRiB8XSasajbGpB7e25nxgMxWTSIcR10nHZvCVirNU X-Received: by 10.66.65.142 with SMTP id x14mr6123198pas.14.1400185112610; Thu, 15 May 2014 13:18:32 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.86.100 with SMTP id o91ls370536qgd.30.gmail; Thu, 15 May 2014 13:18:32 -0700 (PDT) X-Received: by 10.220.167.2 with SMTP id o2mr10167313vcy.8.1400185112468; Thu, 15 May 2014 13:18:32 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id pw8si1122291vcb.146.2014.05.15.13.18.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 May 2014 13:18:32 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id hy4so4984751vcb.25 for ; Thu, 15 May 2014 13:18:32 -0700 (PDT) X-Received: by 10.52.134.202 with SMTP id pm10mr1520099vdb.55.1400185112363; Thu, 15 May 2014 13:18:32 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp351283vcb; Thu, 15 May 2014 13:18:31 -0700 (PDT) X-Received: by 10.140.19.68 with SMTP id 62mr18306535qgg.55.1400185111799; Thu, 15 May 2014 13:18:31 -0700 (PDT) Received: from ip-10-141-164-156.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id 67si3150003qgl.191.2014.05.15.13.18.30 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 15 May 2014 13:18:31 -0700 (PDT) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-141-164-156.ec2.internal) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Wl25x-0002oB-1x; Thu, 15 May 2014 20:17:37 +0000 Received: from mail-lb0-f175.google.com ([209.85.217.175]) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Wl25q-0002nO-JU for lng-odp@lists.linaro.org; Thu, 15 May 2014 20:17:30 +0000 Received: by mail-lb0-f175.google.com with SMTP id l4so1212560lbv.34 for ; Thu, 15 May 2014 13:18:18 -0700 (PDT) X-Received: by 10.152.121.39 with SMTP id lh7mr8716202lab.7.1400185097912; Thu, 15 May 2014 13:18:17 -0700 (PDT) Received: from localhost (c-853670d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.112.54.133]) by mx.google.com with ESMTPSA id to10sm6417496lbb.11.2014.05.15.13.18.17 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 15 May 2014 13:18:17 -0700 (PDT) From: Anders Roxell To: lng-odp@lists.linaro.org Date: Thu, 15 May 2014 22:18:14 +0200 Message-Id: <1400185094-3259-1-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 1.9.1 X-Topics: patch Subject: [lng-odp] [PATCH] platform/linux-generic/include/*: tidy up the include dir X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: anders.roxell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Signed-off-by: Anders Roxell --- platform/linux-generic/include/odp_buffer_internal.h | 7 ------- platform/linux-generic/include/odp_internal.h | 7 ------- platform/linux-generic/include/odp_packet_internal.h | 1 - platform/linux-generic/include/odp_packet_io_internal.h | 1 - platform/linux-generic/include/odp_packet_io_queue.h | 1 - platform/linux-generic/include/odp_packet_netmap.h | 6 +++--- platform/linux-generic/include/odp_packet_socket.h | 14 +++++++------- platform/linux-generic/include/odp_spin_internal.h | 10 +++++----- 8 files changed, 15 insertions(+), 32 deletions(-) diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index f8ebc7c..a1a6b4e 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -115,10 +115,3 @@ void odp_buffer_copy_scatter(odp_buffer_t buf_dst, odp_buffer_t buf_src); #endif #endif - - - - - - - diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index fb3be79..22d90ef 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -44,10 +44,3 @@ int odp_timer_init_global(void); #endif #endif - - - - - - - diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 792fc7c..eb978a3 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -142,4 +142,3 @@ void odp_packet_parse(odp_packet_t pkt, size_t len, size_t l2_offset); #endif #endif - diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 3ab7fa0..881cc5f 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -47,4 +47,3 @@ typedef union { #endif #endif - diff --git a/platform/linux-generic/include/odp_packet_io_queue.h b/platform/linux-generic/include/odp_packet_io_queue.h index 18e55f6..d5f9850 100644 --- a/platform/linux-generic/include/odp_packet_io_queue.h +++ b/platform/linux-generic/include/odp_packet_io_queue.h @@ -47,4 +47,3 @@ int pktout_deq_multi(queue_entry_t *queue, odp_buffer_hdr_t *buf_hdr[], #endif #endif - diff --git a/platform/linux-generic/include/odp_packet_netmap.h b/platform/linux-generic/include/odp_packet_netmap.h index 0c75c7f..57d9f2c 100644 --- a/platform/linux-generic/include/odp_packet_netmap.h +++ b/platform/linux-generic/include/odp_packet_netmap.h @@ -46,7 +46,7 @@ typedef struct { * Configure an interface to work in netmap mode */ int setup_pkt_netmap(pkt_netmap_t * const pkt_nm, char *netdev, - odp_buffer_pool_t pool, netmap_params_t *nm_params); + odp_buffer_pool_t pool, netmap_params_t *nm_params); /** * Switch interface from netmap mode to normal mode @@ -57,11 +57,11 @@ int close_pkt_netmap(pkt_netmap_t * const pkt_nm); * Receive packets using netmap */ int recv_pkt_netmap(pkt_netmap_t * const pkt_nm, odp_packet_t pkt_table[], - unsigned len); + unsigned len); /** * Send packets using netmap */ int send_pkt_netmap(pkt_netmap_t * const pkt_nm, odp_packet_t pkt_table[], - unsigned len); + unsigned len); #endif diff --git a/platform/linux-generic/include/odp_packet_socket.h b/platform/linux-generic/include/odp_packet_socket.h index 0dccd95..f6248b2 100644 --- a/platform/linux-generic/include/odp_packet_socket.h +++ b/platform/linux-generic/include/odp_packet_socket.h @@ -80,7 +80,7 @@ int setup_pkt_sock(pkt_sock_t * const pkt_sock, const char *netdev, odp_buffer_pool_t pool); int setup_pkt_sock_mmap(pkt_sock_mmap_t * const pkt_sock, const char *netdev, - odp_buffer_pool_t pool, int fanout); + odp_buffer_pool_t pool, int fanout); /** * Close a packet socket @@ -93,22 +93,22 @@ int close_pkt_sock_mmap(pkt_sock_mmap_t * const pkt_sock); * Receive packets from the packet socket */ int recv_pkt_sock_basic(pkt_sock_t * const pkt_sock, odp_packet_t pkt_table[], - unsigned len); + unsigned len); int recv_pkt_sock_mmsg(pkt_sock_t * const pkt_sock, odp_packet_t pkt_table[], - unsigned len); + unsigned len); int recv_pkt_sock_mmap(pkt_sock_mmap_t * const pkt_sock, - odp_packet_t pkt_table[], unsigned len); + odp_packet_t pkt_table[], unsigned len); /** * Send packets through the packet socket */ int send_pkt_sock_basic(pkt_sock_t * const pkt_sock, odp_packet_t pkt_table[], - unsigned len); + unsigned len); int send_pkt_sock_mmsg(pkt_sock_t * const pkt_sock, odp_packet_t pkt_table[], - unsigned len); + unsigned len); int send_pkt_sock_mmap(pkt_sock_mmap_t * const pkt_sock, - odp_packet_t pkt_table[], unsigned len); + odp_packet_t pkt_table[], unsigned len); #endif diff --git a/platform/linux-generic/include/odp_spin_internal.h b/platform/linux-generic/include/odp_spin_internal.h index ec04e3c..b7e2071 100644 --- a/platform/linux-generic/include/odp_spin_internal.h +++ b/platform/linux-generic/include/odp_spin_internal.h @@ -30,20 +30,20 @@ static inline void odp_spin(void) { #if defined __x86_64__ || defined __i386__ - #ifdef __SSE2__ +#ifdef __SSE2__ __asm__ __volatile__ ("pause"); - #else +#else __asm__ __volatile__ ("rep; nop"); - #endif +#endif #elif defined __arm__ - #if __ARM_ARCH == 7 +#if __ARM_ARCH == 7 __asm__ __volatile__ ("nop"); __asm__ __volatile__ ("nop"); __asm__ __volatile__ ("nop"); __asm__ __volatile__ ("nop"); - #endif +#endif #elif defined __OCTEON__