| Message ID | 1408031430-4490-1-git-send-email-anders.roxell@linaro.org |
|---|---|
| State | New |
| Headers | show |
I like this patch. But, if the doxygen text is also now moved out of the header files back to the top, when different platforms try to build the docs, doxygen will help enforce that they are all the same, argument changes will be new doxygen errors. On 14 August 2014 11:50, Anders Roxell <anders.roxell@linaro.org> wrote: > 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 <anders.roxell@linaro.org> > --- > > 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 = \ > -- > 1.9.1 > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp >
After the discussion in todays call, we agreed that although having doxygen validate the differences between platforms by moving the doxygen out of the header files was valuable, it was not worth the loss of keeping the documentation next to the code. A tool to compare the API between platforms might have to be created to do the cross platform documentation comparison, doxygen can probably help there too since it can export to a perl module hopefully making it easy. I think we should convert this RFC to an actual patch and apply it. Mike On 14 August 2014 15:20, Mike Holmes <mike.holmes@linaro.org> wrote: > I like this patch. > > But, if the doxygen text is also now moved out of the header files back to > the top, when different platforms try to build the docs, doxygen will help > enforce that they are all the same, argument changes will be new doxygen > errors. > > > > On 14 August 2014 11:50, Anders Roxell <anders.roxell@linaro.org> wrote: > >> 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 <anders.roxell@linaro.org> >> --- >> >> 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 = \ >> -- >> 1.9.1 >> >> >> _______________________________________________ >> lng-odp mailing list >> lng-odp@lists.linaro.org >> http://lists.linaro.org/mailman/listinfo/lng-odp >> > > > > -- > *Mike Holmes* > Linaro Technical Manager / Lead > LNG - ODP >
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 = \
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 <anders.roxell@linaro.org> --- 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%)