From patchwork Thu Aug 14 15:50:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 35411 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oi0-f71.google.com (mail-oi0-f71.google.com [209.85.218.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B49DD203C5 for ; Thu, 14 Aug 2014 15:50:55 +0000 (UTC) Received: by mail-oi0-f71.google.com with SMTP id e131sf6089749oig.10 for ; Thu, 14 Aug 2014 08:50:55 -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=+UdT/r32Tp8HUh89u1vOJj35jorL2SH8MozWjRbvj8Y=; b=LNJC6LUs8cWoCoQ+ZdWFcGngj2/bwWg6zhIg47bZLy9n7e+eadrKE2wTKXmK6LLBQV V4HwQ3pmiq2NjULqGGSRMmAHlCwWp7e9mG3uW9NFuAXwotuPcvzlWGV5kiYqwFTPkUWL WBl70glks2ITcfNN8R/m4wzjrkoR22yAnZ9SkhqYd87JGrly4z5CJOvFHtRqyHC/Ld5K SmD1092ZtpQ3e0IkC8oPI76uREtoYiZL1Gu4bhr9Zj6BeGCq7r7+fqZ9DdVu6ORHhGkm xVxmfEoTJ8o8U9W6TZ2jNlj3KeyS69zWr7bDPiuBI0+QQoiDJTbSKYN6AmAcIqD9OC22 3FHA== X-Gm-Message-State: ALoCoQmspWJ6mAclBvbdFN/Yywojl4gW6pfPTYwJJKVPNN6bzlU8qkZ8NCNuQwuNAjevQPQDpfoA X-Received: by 10.182.111.170 with SMTP id ij10mr5878658obb.6.1408031455348; Thu, 14 Aug 2014 08:50:55 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.35.197 with SMTP id n63ls1106357qgn.35.gmail; Thu, 14 Aug 2014 08:50:55 -0700 (PDT) X-Received: by 10.52.146.194 with SMTP id te2mr5289527vdb.4.1408031455184; Thu, 14 Aug 2014 08:50:55 -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 id4si2963803vdb.100.2014.08.14.08.50.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Aug 2014 08:50:55 -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 ij19so1574014vcb.25 for ; Thu, 14 Aug 2014 08:50:54 -0700 (PDT) X-Received: by 10.52.94.108 with SMTP id db12mr5217630vdb.8.1408031454841; Thu, 14 Aug 2014 08:50:54 -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.221.37.5 with SMTP id tc5csp45129vcb; Thu, 14 Aug 2014 08:50:54 -0700 (PDT) X-Received: by 10.52.64.140 with SMTP id o12mr1948094vds.70.1408031454184; Thu, 14 Aug 2014 08:50:54 -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 a5si7689829qce.23.2014.08.14.08.50.53 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 14 Aug 2014 08:50:54 -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 1XHxIj-0007D6-4p; Thu, 14 Aug 2014 15:50:53 +0000 Received: from mail-lb0-f178.google.com ([209.85.217.178]) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XHxIZ-0007Cl-9d for lng-odp@lists.linaro.org; Thu, 14 Aug 2014 15:50:43 +0000 Received: by mail-lb0-f178.google.com with SMTP id c11so991663lbj.23 for ; Thu, 14 Aug 2014 08:50:37 -0700 (PDT) X-Received: by 10.152.9.194 with SMTP id c2mr6129628lab.16.1408031437030; Thu, 14 Aug 2014 08:50:37 -0700 (PDT) Received: from localhost (c-853670d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.112.54.133]) by mx.google.com with ESMTPSA id a5sm8415601lbw.21.2014.08.14.08.50.35 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 14 Aug 2014 08:50:35 -0700 (PDT) From: Anders Roxell To: lng-odp@lists.linaro.org Date: Thu, 14 Aug 2014 17:50:30 +0200 Message-Id: <1408031430-4490-1-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 1.9.1 X-Topics: patch Subject: [lng-odp] [RFC PATCH] Move includes back into linux-generic 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 Tries to split out platform specific parts wasn't successful, still to much platform specific details in the top level include. Signed-off-by: Anders Roxell --- Hi, We agreed to move the includes back to linux-generic, see link [1]. Cheers, Anders [1] http://lists.linaro.org/pipermail/lng-odp/2014-July/001576.html doc/doxygen.cfg | 2 +- platform/linux-dpdk/Makefile.am | 58 +++++++++++----------- platform/linux-generic/Makefile.am | 58 +++++++++++----------- .../linux-generic/include/api}/odp.h | 0 .../linux-generic/include/api}/odp_align.h | 0 .../linux-generic/include/api}/odp_atomic.h | 0 .../linux-generic/include/api}/odp_barrier.h | 0 .../linux-generic/include/api}/odp_buffer.h | 0 .../linux-generic/include/api}/odp_buffer_pool.h | 0 .../linux-generic/include/api}/odp_byteorder.h | 0 .../linux-generic/include/api}/odp_compiler.h | 0 .../linux-generic/include/api}/odp_config.h | 0 .../linux-generic/include/api}/odp_coremask.h | 0 .../linux-generic/include/api}/odp_debug.h | 0 .../linux-generic/include/api}/odp_hints.h | 0 .../linux-generic/include/api}/odp_init.h | 0 .../linux-generic/include/api}/odp_packet.h | 0 .../linux-generic/include/api}/odp_packet_flags.h | 0 .../linux-generic/include/api}/odp_packet_io.h | 0 .../linux-generic/include/api}/odp_queue.h | 0 .../linux-generic/include/api}/odp_rwlock.h | 0 .../linux-generic/include/api}/odp_schedule.h | 0 .../linux-generic/include/api}/odp_shared_memory.h | 0 .../linux-generic/include/api}/odp_spinlock.h | 0 .../linux-generic/include/api}/odp_std_types.h | 0 .../linux-generic/include/api}/odp_sync.h | 0 .../linux-generic/include/api}/odp_system_info.h | 0 .../linux-generic/include/api}/odp_thread.h | 0 .../linux-generic/include/api}/odp_ticketlock.h | 0 .../linux-generic/include/api}/odp_time.h | 0 .../linux-generic/include/api}/odp_timer.h | 0 .../linux-generic/include/api}/odp_version.h | 0 platform/linux-keystone2/Makefile.am | 58 +++++++++++----------- 33 files changed, 88 insertions(+), 88 deletions(-) rename {include => platform/linux-generic/include/api}/odp.h (100%) rename {include => platform/linux-generic/include/api}/odp_align.h (100%) rename {include => platform/linux-generic/include/api}/odp_atomic.h (100%) rename {include => platform/linux-generic/include/api}/odp_barrier.h (100%) rename {include => platform/linux-generic/include/api}/odp_buffer.h (100%) rename {include => platform/linux-generic/include/api}/odp_buffer_pool.h (100%) rename {include => platform/linux-generic/include/api}/odp_byteorder.h (100%) rename {include => platform/linux-generic/include/api}/odp_compiler.h (100%) rename {include => platform/linux-generic/include/api}/odp_config.h (100%) rename {include => platform/linux-generic/include/api}/odp_coremask.h (100%) rename {include => platform/linux-generic/include/api}/odp_debug.h (100%) rename {include => platform/linux-generic/include/api}/odp_hints.h (100%) rename {include => platform/linux-generic/include/api}/odp_init.h (100%) rename {include => platform/linux-generic/include/api}/odp_packet.h (100%) rename {include => platform/linux-generic/include/api}/odp_packet_flags.h (100%) rename {include => platform/linux-generic/include/api}/odp_packet_io.h (100%) rename {include => platform/linux-generic/include/api}/odp_queue.h (100%) rename {include => platform/linux-generic/include/api}/odp_rwlock.h (100%) rename {include => platform/linux-generic/include/api}/odp_schedule.h (100%) rename {include => platform/linux-generic/include/api}/odp_shared_memory.h (100%) rename {include => platform/linux-generic/include/api}/odp_spinlock.h (100%) rename {include => platform/linux-generic/include/api}/odp_std_types.h (100%) rename {include => platform/linux-generic/include/api}/odp_sync.h (100%) rename {include => platform/linux-generic/include/api}/odp_system_info.h (100%) rename {include => platform/linux-generic/include/api}/odp_thread.h (100%) rename {include => platform/linux-generic/include/api}/odp_ticketlock.h (100%) rename {include => platform/linux-generic/include/api}/odp_time.h (100%) rename {include => platform/linux-generic/include/api}/odp_timer.h (100%) rename {include => platform/linux-generic/include/api}/odp_version.h (100%) diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg index b3a033d..939b237 100644 --- a/doc/doxygen.cfg +++ b/doc/doxygen.cfg @@ -9,7 +9,7 @@ TYPEDEF_HIDES_STRUCT = YES EXTRACT_STATIC = YES SORT_MEMBER_DOCS = NO WARN_NO_PARAMDOC = YES -INPUT = $(SRCDIR)/doc $(SRCDIR)/doc/users-guide $(SRCDIR)/doc/api $(SRCDIR)/include $(SRCDIR)/example +INPUT = $(SRCDIR)/doc $(SRCDIR)/doc/users-guide $(SRCDIR)/doc/api $(SRCDIR)/platform/linux-generic/include/api $(SRCDIR)/include/helper $(SRCDIR)/example FILE_PATTERNS = odp*.h odp*.c *.dox RECURSIVE = YES SOURCE_BROWSER = YES diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index fb87d41..ff49b7d 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -22,35 +22,35 @@ DPDK_LIBS="-lintel_dpdk -ldl" LIBS += $(DPDK_LIBS) include_HEADERS = \ - $(top_srcdir)/platform/linux-dpdk/include/api/odp_buffer.h \ - $(top_srcdir)/include/odp.h \ - $(top_srcdir)/include/odp_align.h \ - $(top_srcdir)/include/odp_atomic.h \ - $(top_srcdir)/include/odp_barrier.h \ - $(top_srcdir)/include/odp_buffer_pool.h \ - $(top_srcdir)/include/odp_byteorder.h \ - $(top_srcdir)/include/odp_compiler.h \ - $(top_srcdir)/include/odp_config.h \ - $(top_srcdir)/include/odp_coremask.h \ - $(top_srcdir)/include/odp_debug.h \ - $(top_srcdir)/include/odp_hints.h \ - $(top_srcdir)/include/odp_init.h \ - $(top_srcdir)/include/odp_packet_flags.h \ - $(top_srcdir)/include/odp_packet.h \ - $(top_srcdir)/include/odp_packet_io.h \ - $(top_srcdir)/include/odp_queue.h \ - $(top_srcdir)/include/odp_rwlock.h \ - $(top_srcdir)/include/odp_schedule.h \ - $(top_srcdir)/include/odp_shared_memory.h \ - $(top_srcdir)/include/odp_spinlock.h \ - $(top_srcdir)/include/odp_std_types.h \ - $(top_srcdir)/include/odp_sync.h \ - $(top_srcdir)/include/odp_system_info.h \ - $(top_srcdir)/include/odp_thread.h \ - $(top_srcdir)/include/odp_ticketlock.h \ - $(top_srcdir)/include/odp_time.h \ - $(top_srcdir)/include/odp_timer.h \ - $(top_srcdir)/include/odp_version.h + $(srcdir)/include/api/odp_buffer.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_align.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_atomic.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_barrier.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_buffer_pool.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_byteorder.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_compiler.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_config.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_coremask.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_debug.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_hints.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_init.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_packet_flags.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_packet.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_packet_io.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_queue.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_rwlock.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_schedule.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_shared_memory.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_spinlock.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_std_types.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_sync.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_system_info.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_thread.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_ticketlock.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_time.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_timer.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_version.h subdirheadersdir = $(includedir)/helper subdirheaders_HEADERS = \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 41458d8..4bcb0eb 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -6,35 +6,35 @@ AM_CFLAGS += -I$(srcdir)/include/api AM_CFLAGS += -I$(top_srcdir)/include include_HEADERS = \ - $(top_srcdir)/include/odp.h \ - $(top_srcdir)/include/odp_align.h \ - $(top_srcdir)/include/odp_atomic.h \ - $(top_srcdir)/include/odp_barrier.h \ - $(top_srcdir)/include/odp_buffer.h \ - $(top_srcdir)/include/odp_buffer_pool.h \ - $(top_srcdir)/include/odp_byteorder.h \ - $(top_srcdir)/include/odp_compiler.h \ - $(top_srcdir)/include/odp_config.h \ - $(top_srcdir)/include/odp_coremask.h \ - $(top_srcdir)/include/odp_debug.h \ - $(top_srcdir)/include/odp_hints.h \ - $(top_srcdir)/include/odp_init.h \ - $(top_srcdir)/include/odp_packet_flags.h \ - $(top_srcdir)/include/odp_packet.h \ - $(top_srcdir)/include/odp_packet_io.h \ - $(top_srcdir)/include/odp_queue.h \ - $(top_srcdir)/include/odp_rwlock.h \ - $(top_srcdir)/include/odp_schedule.h \ - $(top_srcdir)/include/odp_shared_memory.h \ - $(top_srcdir)/include/odp_spinlock.h \ - $(top_srcdir)/include/odp_std_types.h \ - $(top_srcdir)/include/odp_sync.h \ - $(top_srcdir)/include/odp_system_info.h \ - $(top_srcdir)/include/odp_thread.h \ - $(top_srcdir)/include/odp_ticketlock.h \ - $(top_srcdir)/include/odp_time.h \ - $(top_srcdir)/include/odp_timer.h \ - $(top_srcdir)/include/odp_version.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_align.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_atomic.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_barrier.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_buffer.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_buffer_pool.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_byteorder.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_compiler.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_config.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_coremask.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_debug.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_hints.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_init.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_packet_flags.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_packet.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_packet_io.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_queue.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_rwlock.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_schedule.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_shared_memory.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_spinlock.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_std_types.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_sync.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_system_info.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_thread.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_ticketlock.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_time.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_timer.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_version.h \ $(top_srcdir)/platform/linux-generic/include/api/odp_pktio_types.h \ $(top_srcdir)/platform/linux-generic/include/api/odp_pktio_netmap.h \ $(top_srcdir)/platform/linux-generic/include/api/odp_pktio_socket.h diff --git a/include/odp.h b/platform/linux-generic/include/api/odp.h similarity index 100% rename from include/odp.h rename to platform/linux-generic/include/api/odp.h diff --git a/include/odp_align.h b/platform/linux-generic/include/api/odp_align.h similarity index 100% rename from include/odp_align.h rename to platform/linux-generic/include/api/odp_align.h diff --git a/include/odp_atomic.h b/platform/linux-generic/include/api/odp_atomic.h similarity index 100% rename from include/odp_atomic.h rename to platform/linux-generic/include/api/odp_atomic.h diff --git a/include/odp_barrier.h b/platform/linux-generic/include/api/odp_barrier.h similarity index 100% rename from include/odp_barrier.h rename to platform/linux-generic/include/api/odp_barrier.h diff --git a/include/odp_buffer.h b/platform/linux-generic/include/api/odp_buffer.h similarity index 100% rename from include/odp_buffer.h rename to platform/linux-generic/include/api/odp_buffer.h diff --git a/include/odp_buffer_pool.h b/platform/linux-generic/include/api/odp_buffer_pool.h similarity index 100% rename from include/odp_buffer_pool.h rename to platform/linux-generic/include/api/odp_buffer_pool.h diff --git a/include/odp_byteorder.h b/platform/linux-generic/include/api/odp_byteorder.h similarity index 100% rename from include/odp_byteorder.h rename to platform/linux-generic/include/api/odp_byteorder.h diff --git a/include/odp_compiler.h b/platform/linux-generic/include/api/odp_compiler.h similarity index 100% rename from include/odp_compiler.h rename to platform/linux-generic/include/api/odp_compiler.h diff --git a/include/odp_config.h b/platform/linux-generic/include/api/odp_config.h similarity index 100% rename from include/odp_config.h rename to platform/linux-generic/include/api/odp_config.h diff --git a/include/odp_coremask.h b/platform/linux-generic/include/api/odp_coremask.h similarity index 100% rename from include/odp_coremask.h rename to platform/linux-generic/include/api/odp_coremask.h diff --git a/include/odp_debug.h b/platform/linux-generic/include/api/odp_debug.h similarity index 100% rename from include/odp_debug.h rename to platform/linux-generic/include/api/odp_debug.h diff --git a/include/odp_hints.h b/platform/linux-generic/include/api/odp_hints.h similarity index 100% rename from include/odp_hints.h rename to platform/linux-generic/include/api/odp_hints.h diff --git a/include/odp_init.h b/platform/linux-generic/include/api/odp_init.h similarity index 100% rename from include/odp_init.h rename to platform/linux-generic/include/api/odp_init.h diff --git a/include/odp_packet.h b/platform/linux-generic/include/api/odp_packet.h similarity index 100% rename from include/odp_packet.h rename to platform/linux-generic/include/api/odp_packet.h diff --git a/include/odp_packet_flags.h b/platform/linux-generic/include/api/odp_packet_flags.h similarity index 100% rename from include/odp_packet_flags.h rename to platform/linux-generic/include/api/odp_packet_flags.h diff --git a/include/odp_packet_io.h b/platform/linux-generic/include/api/odp_packet_io.h similarity index 100% rename from include/odp_packet_io.h rename to platform/linux-generic/include/api/odp_packet_io.h diff --git a/include/odp_queue.h b/platform/linux-generic/include/api/odp_queue.h similarity index 100% rename from include/odp_queue.h rename to platform/linux-generic/include/api/odp_queue.h diff --git a/include/odp_rwlock.h b/platform/linux-generic/include/api/odp_rwlock.h similarity index 100% rename from include/odp_rwlock.h rename to platform/linux-generic/include/api/odp_rwlock.h diff --git a/include/odp_schedule.h b/platform/linux-generic/include/api/odp_schedule.h similarity index 100% rename from include/odp_schedule.h rename to platform/linux-generic/include/api/odp_schedule.h diff --git a/include/odp_shared_memory.h b/platform/linux-generic/include/api/odp_shared_memory.h similarity index 100% rename from include/odp_shared_memory.h rename to platform/linux-generic/include/api/odp_shared_memory.h diff --git a/include/odp_spinlock.h b/platform/linux-generic/include/api/odp_spinlock.h similarity index 100% rename from include/odp_spinlock.h rename to platform/linux-generic/include/api/odp_spinlock.h diff --git a/include/odp_std_types.h b/platform/linux-generic/include/api/odp_std_types.h similarity index 100% rename from include/odp_std_types.h rename to platform/linux-generic/include/api/odp_std_types.h diff --git a/include/odp_sync.h b/platform/linux-generic/include/api/odp_sync.h similarity index 100% rename from include/odp_sync.h rename to platform/linux-generic/include/api/odp_sync.h diff --git a/include/odp_system_info.h b/platform/linux-generic/include/api/odp_system_info.h similarity index 100% rename from include/odp_system_info.h rename to platform/linux-generic/include/api/odp_system_info.h diff --git a/include/odp_thread.h b/platform/linux-generic/include/api/odp_thread.h similarity index 100% rename from include/odp_thread.h rename to platform/linux-generic/include/api/odp_thread.h diff --git a/include/odp_ticketlock.h b/platform/linux-generic/include/api/odp_ticketlock.h similarity index 100% rename from include/odp_ticketlock.h rename to platform/linux-generic/include/api/odp_ticketlock.h diff --git a/include/odp_time.h b/platform/linux-generic/include/api/odp_time.h similarity index 100% rename from include/odp_time.h rename to platform/linux-generic/include/api/odp_time.h diff --git a/include/odp_timer.h b/platform/linux-generic/include/api/odp_timer.h similarity index 100% rename from include/odp_timer.h rename to platform/linux-generic/include/api/odp_timer.h diff --git a/include/odp_version.h b/platform/linux-generic/include/api/odp_version.h similarity index 100% rename from include/odp_version.h rename to platform/linux-generic/include/api/odp_version.h diff --git a/platform/linux-keystone2/Makefile.am b/platform/linux-keystone2/Makefile.am index b32c539..8e5fbb3 100644 --- a/platform/linux-keystone2/Makefile.am +++ b/platform/linux-keystone2/Makefile.am @@ -25,35 +25,35 @@ KS2_LIBS="-lopenem_rh -lopenem_osal" LIBS += $(KS2_LIBS) include_HEADERS = \ - $(top_srcdir)/platform/linux-keystone2/include/api/odp_buffer.h \ - $(top_srcdir)/include/odp.h \ - $(top_srcdir)/include/odp_align.h \ - $(top_srcdir)/include/odp_atomic.h \ - $(top_srcdir)/include/odp_barrier.h \ - $(top_srcdir)/include/odp_buffer_pool.h \ - $(top_srcdir)/include/odp_byteorder.h \ - $(top_srcdir)/include/odp_compiler.h \ - $(top_srcdir)/include/odp_config.h \ - $(top_srcdir)/include/odp_coremask.h \ - $(top_srcdir)/include/odp_debug.h \ - $(top_srcdir)/include/odp_hints.h \ - $(top_srcdir)/include/odp_init.h \ - $(top_srcdir)/include/odp_packet_flags.h \ - $(top_srcdir)/include/odp_packet.h \ - $(top_srcdir)/include/odp_packet_io.h \ - $(top_srcdir)/include/odp_queue.h \ - $(top_srcdir)/include/odp_rwlock.h \ - $(top_srcdir)/include/odp_schedule.h \ - $(top_srcdir)/include/odp_shared_memory.h \ - $(top_srcdir)/include/odp_spinlock.h \ - $(top_srcdir)/include/odp_std_types.h \ - $(top_srcdir)/include/odp_sync.h \ - $(top_srcdir)/include/odp_system_info.h \ - $(top_srcdir)/include/odp_thread.h \ - $(top_srcdir)/include/odp_ticketlock.h \ - $(top_srcdir)/include/odp_time.h \ - $(top_srcdir)/include/odp_timer.h \ - $(top_srcdir)/include/odp_version.h + $(srcdir)/include/api/odp_buffer.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_align.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_atomic.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_barrier.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_buffer_pool.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_byteorder.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_compiler.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_config.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_coremask.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_debug.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_hints.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_init.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_packet_flags.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_packet.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_packet_io.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_queue.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_rwlock.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_schedule.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_shared_memory.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_spinlock.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_std_types.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_sync.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_system_info.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_thread.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_ticketlock.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_time.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_timer.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_version.h subdirheadersdir = $(includedir)/helper subdirheaders_HEADERS = \