Merged, thanks!
Maxim.
On 08/21/2014 04:03 AM, Anders Roxell wrote:
Hi all,
In this patch set we have, one patch that moves the include
files back to linux-generic, and some cleanup patches.
Cheers,
Anders
Anders Roxell (3):
Move includes back into linux-generic
doxygen: fix doxygen-run generated warnings
linux-generic: odp_pktio_netmap: add cpluspus ifdef
doc/doxygen.cfg | 2 +-
platform/linux-dpdk/Makefile.am | 58 ++++++++++-----------
platform/linux-generic/Makefile.am | 60 +++++++++++-----------
.../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_crypto.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_pktio_netmap.h | 27 ++++++++--
.../linux-generic/include/api/odp_pktio_socket.h | 13 ++++-
.../linux-generic/include/api/odp_pktio_types.h | 16 +++++-
.../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 ++++++++++-----------
37 files changed, 136 insertions(+), 98 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_crypto.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%)
_______________________________________________
lng-odp mailing list
[email protected]
http://lists.linaro.org/mailman/listinfo/lng-odp
