On Thu, Aug 28, 2014 at 11:02:08PM +0100, Anders Roxell wrote: > Signed-off-by: Anders Roxell <[email protected]> > --- > .gitignore | 6 +- > configure.ac | 4 +- > doc/doxygen.cfg | 2 +- > example/Makefile.inc | 2 +- > example/generator/odp_generator.c | 142 ++++++++++---------- > example/l2fwd/odp_l2fwd.c | 18 +-- > example/odp_example/odp_example.c | 10 +- > example/packet/odp_pktio.c | 28 ++-- > example/packet_netmap/odp_pktio_netmap.c | 32 ++--- > example/timer/odp_timer_test.c | 10 +- > .../odp_chksum.h => helper/include/odph_chksum.h | 0 > helper/include/odph_eth.h | 87 ++++++++++++ > .../odp_icmp.h => helper/include/odph_icmp.h | 12 +- > .../helper/odp_ip.h => helper/include/odph_ip.h | 70 +++++----- > .../odp_linux.h => helper/include/odph_linux.h | 6 +- > .../include/odph_packet_helper.h | 12 +- > .../odp_ring.h => helper/include/odph_ring.h | 98 +++++++------- > .../helper/odp_udp.h => helper/include/odph_udp.h | 32 ++--- > include/helper/odp_eth.h | 87 ------------ > platform/linux-dpdk/Makefile.am | 16 +-- > platform/linux-dpdk/include/odp_packet_dpdk.h | 4 +- > platform/linux-dpdk/odp_linux.c | 6 +- > platform/linux-dpdk/odp_packet.c | 86 ++++++------ > platform/linux-generic/Makefile.am | 16 +-- > platform/linux-generic/include/api/odp_align.h | 2 +- > platform/linux-generic/odp_crypto.c | 4 +- > platform/linux-generic/odp_linux.c | 8 +- > platform/linux-generic/odp_packet.c | 86 ++++++------ > platform/linux-generic/odp_packet_netmap.c | 20 +-- > platform/linux-generic/odp_packet_socket.c | 42 +++--- > platform/linux-generic/odp_ring.c | 146 > +++++++++++----------
odp_ring.c should probably in future move out of here into helpers/, to make it easier to build the helpers into a different library.. but I think it's right for that not do be done in this patch. > platform/linux-keystone2/Makefile.am | 16 +-- > platform/linux-keystone2/odp_packet.c | 86 ++++++------ > test/Makefile.inc | 2 +- > test/api_test/odp_atomic_test.h | 2 +- > test/api_test/odp_common.c | 10 +- > test/api_test/odp_ring_test.c | 76 +++++------ > test/api_test/odp_timer_ping.c | 12 +- > 38 files changed, 653 insertions(+), 645 deletions(-) > rename include/helper/odp_chksum.h => helper/include/odph_chksum.h (100%) > create mode 100644 helper/include/odph_eth.h > rename include/helper/odp_icmp.h => helper/include/odph_icmp.h (93%) > rename include/helper/odp_ip.h => helper/include/odph_ip.h (57%) > rename include/helper/odp_linux.h => helper/include/odph_linux.h (88%) > rename include/helper/odp_packet_helper.h => > helper/include/odph_packet_helper.h (83%) You could now lose the _helper suffix as the prefix now makes the filename unique. > rename include/helper/odp_ring.h => helper/include/odph_ring.h (87%) > rename include/helper/odp_udp.h => helper/include/odph_udp.h (74%) > delete mode 100644 include/helper/odp_eth.h > > diff --git a/.gitignore b/.gitignore > index 39c8d77..6a97f17 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -14,15 +14,15 @@ config.guess > config.sub > configure > depcomp > -include/config.h.in > install-sh > ltmain.sh > m4/*.m4 > missing > config.log > config.status > -include/config.h > -include/stamp-h1 > +helper/config.h.in > +helper/config.h > +helper/stamp-h1 > libtool > pkgconfig/libodp.pc > .deps/ > diff --git a/configure.ac b/configure.ac > index c9aac14..5574f82 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1,8 +1,8 @@ > AC_PREREQ([2.5]) > AC_INIT([OpenDataPlane], [0.2], [[email protected]]) > AM_INIT_AUTOMAKE([subdir-objects]) > -AC_CONFIG_SRCDIR([include/config.h.in]) > -AM_CONFIG_HEADER([include/config.h]) > +AC_CONFIG_SRCDIR([helper/config.h.in]) > +AM_CONFIG_HEADER([helper/config.h]) > > AC_USE_SYSTEM_EXTENSIONS > AC_SYS_LARGEFILE > diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg > index 939b237..5d1e191 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)/platform/linux-generic/include/api $(SRCDIR)/include/helper > $(SRCDIR)/example > +INPUT = $(SRCDIR)/doc $(SRCDIR)/doc/users-guide $(SRCDIR)/doc/api > $(SRCDIR)/platform/linux-generic/include/api $(SRCDIR)/helper/include > $(SRCDIR)/example The helpers shouldn't be documented in the API reference manual. -- Stuart. _______________________________________________ lng-odp mailing list [email protected] http://lists.linaro.org/mailman/listinfo/lng-odp
