| Message ID | 1453831498-46414-3-git-send-email-christophe.milard@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index 5a8cd37..128b589 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -10,7 +10,7 @@ #include <unistd.h> #include <example_debug.h> -#include <odp.h> +#include <odp/api.h> #include <odp/helper/linux.h> #include <odp/helper/eth.h> #include <odp/helper/ip.h> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 344a227..2946d64 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -17,7 +17,7 @@ #include <example_debug.h> -#include <odp.h> +#include <odp/api.h> #include <odp/helper/linux.h> #include <odp/helper/eth.h> diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index ea4e46a..a5781e6 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -21,7 +21,7 @@ #include <example_debug.h> -#include <odp.h> +#include <odp/api.h> #include <odp/helper/linux.h> #include <odp/helper/eth.h> diff --git a/example/ipsec/odp_ipsec_cache.c b/example/ipsec/odp_ipsec_cache.c index 0883d4d..f143f7c 100644 --- a/example/ipsec/odp_ipsec_cache.c +++ b/example/ipsec/odp_ipsec_cache.c @@ -9,7 +9,7 @@ #include <example_debug.h> -#include <odp.h> +#include <odp/api.h> #include <odp/helper/ipsec.h> diff --git a/example/ipsec/odp_ipsec_cache.h b/example/ipsec/odp_ipsec_cache.h index 91d9d7e..6f11078 100644 --- a/example/ipsec/odp_ipsec_cache.h +++ b/example/ipsec/odp_ipsec_cache.h @@ -11,7 +11,7 @@ extern "C" { #endif -#include <odp.h> +#include <odp/api.h> #include <odp/helper/ipsec.h> #include <odp_ipsec_misc.h> diff --git a/example/ipsec/odp_ipsec_fwd_db.c b/example/ipsec/odp_ipsec_fwd_db.c index 59cb6e4..da25990 100644 --- a/example/ipsec/odp_ipsec_fwd_db.c +++ b/example/ipsec/odp_ipsec_fwd_db.c @@ -14,7 +14,7 @@ #include <example_debug.h> -#include <odp.h> +#include <odp/api.h> #include <odp_ipsec_fwd_db.h> diff --git a/example/ipsec/odp_ipsec_fwd_db.h b/example/ipsec/odp_ipsec_fwd_db.h index 9d7aa09..ba800ae 100644 --- a/example/ipsec/odp_ipsec_fwd_db.h +++ b/example/ipsec/odp_ipsec_fwd_db.h @@ -11,7 +11,7 @@ extern "C" { #endif -#include <odp.h> +#include <odp/api.h> #include <odp/helper/eth.h> #include <odp_ipsec_misc.h> diff --git a/example/ipsec/odp_ipsec_loop_db.c b/example/ipsec/odp_ipsec_loop_db.c index ab0129b..5bba519 100644 --- a/example/ipsec/odp_ipsec_loop_db.c +++ b/example/ipsec/odp_ipsec_loop_db.c @@ -9,7 +9,7 @@ #include <example_debug.h> -#include <odp.h> +#include <odp/api.h> #include <odp_ipsec_loop_db.h> diff --git a/example/ipsec/odp_ipsec_loop_db.h b/example/ipsec/odp_ipsec_loop_db.h index 677f488..fad684d 100644 --- a/example/ipsec/odp_ipsec_loop_db.h +++ b/example/ipsec/odp_ipsec_loop_db.h @@ -11,7 +11,7 @@ extern "C" { #endif -#include <odp.h> +#include <odp/api.h> #include <odp/helper/eth.h> #include <odp_ipsec_misc.h> diff --git a/example/ipsec/odp_ipsec_misc.h b/example/ipsec/odp_ipsec_misc.h index e583c01..01d8c01 100644 --- a/example/ipsec/odp_ipsec_misc.h +++ b/example/ipsec/odp_ipsec_misc.h @@ -11,7 +11,7 @@ extern "C" { #endif -#include <odp.h> +#include <odp/api.h> #include <odp/helper/eth.h> #include <odp/helper/ip.h> #include <odp/helper/ipsec.h> diff --git a/example/ipsec/odp_ipsec_sa_db.c b/example/ipsec/odp_ipsec_sa_db.c index 8b2d212..99aebc5 100644 --- a/example/ipsec/odp_ipsec_sa_db.c +++ b/example/ipsec/odp_ipsec_sa_db.c @@ -14,7 +14,7 @@ #include <example_debug.h> -#include <odp.h> +#include <odp/api.h> #include <odp_ipsec_sa_db.h> diff --git a/example/ipsec/odp_ipsec_sp_db.c b/example/ipsec/odp_ipsec_sp_db.c index 48874eb..cc521e8 100644 --- a/example/ipsec/odp_ipsec_sp_db.c +++ b/example/ipsec/odp_ipsec_sp_db.c @@ -14,7 +14,7 @@ #include <example_debug.h> -#include <odp.h> +#include <odp/api.h> #include <odp_ipsec_sp_db.h> diff --git a/example/ipsec/odp_ipsec_stream.c b/example/ipsec/odp_ipsec_stream.c index 9c2722e..35bdd78 100644 --- a/example/ipsec/odp_ipsec_stream.c +++ b/example/ipsec/odp_ipsec_stream.c @@ -19,7 +19,7 @@ #include <example_debug.h> -#include <odp.h> +#include <odp/api.h> #include <odp/helper/eth.h> #include <odp/helper/ip.h> diff --git a/example/ipsec/odp_ipsec_stream.h b/example/ipsec/odp_ipsec_stream.h index 12e368c..a5b6f8c 100644 --- a/example/ipsec/odp_ipsec_stream.h +++ b/example/ipsec/odp_ipsec_stream.h @@ -11,7 +11,7 @@ extern "C" { #endif -#include <odp.h> +#include <odp/api.h> #include <odp_ipsec_misc.h> #include <odp_ipsec_cache.h> diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c index 75e92ac..c948cce 100644 --- a/example/packet/odp_pktio.c +++ b/example/packet/odp_pktio.c @@ -11,7 +11,7 @@ #include <example_debug.h> -#include <odp.h> +#include <odp/api.h> #include <odp/helper/linux.h> #include <odp/helper/eth.h> #include <odp/helper/ip.h> diff --git a/example/time/time_global_test.c b/example/time/time_global_test.c index df0826c..21c7bfe 100644 --- a/example/time/time_global_test.c +++ b/example/time/time_global_test.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include <example_debug.h> #include <odp/helper/linux.h> diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c index d2d54df..968a6db 100644 --- a/example/timer/odp_timer_test.c +++ b/example/timer/odp_timer_test.c @@ -10,7 +10,7 @@ #include <example_debug.h> /* ODP main header */ -#include <odp.h> +#include <odp/api.h> /* ODP helper for Linux apps */ #include <odp/helper/linux.h> diff --git a/example/traffic_mgmt/odp_traffic_mgmt.c b/example/traffic_mgmt/odp_traffic_mgmt.c index b4f0101..dad6229 100644 --- a/example/traffic_mgmt/odp_traffic_mgmt.c +++ b/example/traffic_mgmt/odp_traffic_mgmt.c @@ -15,7 +15,7 @@ #include <signal.h> #include <sys/resource.h> #include <execinfo.h> -#include <odp.h> +#include <odp/api.h> #include <odp/api/plat/packet_types.h> #include <example_debug.h> diff --git a/helper/hashtable.c b/helper/hashtable.c index e0f562e..f6d29fc 100644 --- a/helper/hashtable.c +++ b/helper/hashtable.c @@ -10,7 +10,7 @@ #include "odph_hashtable.h" #include "odph_list_internal.h" #include "odph_debug.h" -#include <odp.h> +#include <odp/api.h> #define ODPH_SUCCESS 0 #define ODPH_FAIL -1 diff --git a/helper/include/odp/helper/linux.h b/helper/include/odp/helper/linux.h index c48b3ed..0bc5a2a 100644 --- a/helper/include/odp/helper/linux.h +++ b/helper/include/odp/helper/linux.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include <odp.h> +#include <odp/api.h> #include <pthread.h> #include <sys/types.h> diff --git a/helper/lineartable.c b/helper/lineartable.c index 68d9350..8866dd9 100644 --- a/helper/lineartable.c +++ b/helper/lineartable.c @@ -10,7 +10,7 @@ #include "odph_lineartable.h" #include "odph_debug.h" -#include <odp.h> +#include <odp/api.h> #define ODPH_SUCCESS 0 #define ODPH_FAIL -1 diff --git a/helper/ring.c b/helper/ring.c index 6699186..0b2a93a 100644 --- a/helper/ring.c +++ b/helper/ring.c @@ -69,7 +69,7 @@ * ***************************************************************************/ -#include <odp.h> +#include <odp/api.h> #include <fcntl.h> #include <stdio.h> #include <string.h> diff --git a/helper/test/odp_chksum.c b/helper/test/odp_chksum.c index b71fabc..b358da7 100644 --- a/helper/test/odp_chksum.c +++ b/helper/test/odp_chksum.c @@ -5,7 +5,7 @@ */ #include <test_debug.h> -#include <odp.h> +#include <odp/api.h> #include <odp/helper/eth.h> #include <odp/helper/ip.h> #include <odp/helper/udp.h> diff --git a/helper/test/odp_process.c b/helper/test/odp_process.c index cb9b328..c1f0f2b 100644 --- a/helper/test/odp_process.c +++ b/helper/test/odp_process.c @@ -5,7 +5,7 @@ */ #include <test_debug.h> -#include <odp.h> +#include <odp/api.h> #include <odp/helper/linux.h> #define NUMBER_WORKERS 16 /* 0 = max */ diff --git a/helper/test/odp_table.c b/helper/test/odp_table.c index 16de165..10e8ab4 100644 --- a/helper/test/odp_table.c +++ b/helper/test/odp_table.c @@ -7,7 +7,7 @@ #include <test_debug.h> #include <../odph_hashtable.h> #include <../odph_lineartable.h> -#include <odp.h> +#include <odp/api.h> /** * Address Resolution Protocol (ARP) diff --git a/helper/test/odp_thread.c b/helper/test/odp_thread.c index f2f7904..e5ad86d 100644 --- a/helper/test/odp_thread.c +++ b/helper/test/odp_thread.c @@ -5,7 +5,7 @@ */ #include <test_debug.h> -#include <odp.h> +#include <odp/api.h> #include <odp/helper/linux.h> #define NUMBER_WORKERS 16 diff --git a/include/odp.h b/include/odp/api.h similarity index 100% rename from include/odp.h rename to include/odp/api.h diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 83483ae..7fe954f 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -8,8 +8,9 @@ AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_srcdir)/helper/include -include_HEADERS = \ - $(top_srcdir)/include/odp.h +odpincludedir = $(includedir)/odp +odpinclude_HEADERS = \ + $(top_srcdir)/include/odp/api.h odpapiincludedir= $(includedir)/odp/api odpapiinclude_HEADERS = \ diff --git a/platform/linux-generic/include/odp_name_table_internal.h b/platform/linux-generic/include/odp_name_table_internal.h index d810128..d18d002 100644 --- a/platform/linux-generic/include/odp_name_table_internal.h +++ b/platform/linux-generic/include/odp_name_table_internal.h @@ -14,7 +14,7 @@ extern "C" { #endif #include <stdint.h> -#include <odp.h> +#include <odp/api.h> typedef enum { ODP_COS_HANDLE, diff --git a/platform/linux-generic/include/odp_pkt_queue_internal.h b/platform/linux-generic/include/odp_pkt_queue_internal.h index 85cdada..8898c56 100644 --- a/platform/linux-generic/include/odp_pkt_queue_internal.h +++ b/platform/linux-generic/include/odp_pkt_queue_internal.h @@ -14,7 +14,7 @@ extern "C" { #endif #include <stdint.h> -#include <odp.h> +#include <odp/api.h> typedef uint64_t _odp_int_queue_pool_t; typedef uint32_t _odp_int_pkt_queue_t; diff --git a/platform/linux-generic/include/odp_timer_wheel_internal.h b/platform/linux-generic/include/odp_timer_wheel_internal.h index ac0aac5..ec716cf 100644 --- a/platform/linux-generic/include/odp_timer_wheel_internal.h +++ b/platform/linux-generic/include/odp_timer_wheel_internal.h @@ -14,7 +14,7 @@ extern "C" { #endif #include <stdint.h> -#include <odp.h> +#include <odp/api.h> /* Note that ALL times in this API are in units of processor/cpu clock * cycles! diff --git a/platform/linux-generic/odp_pkt_queue.c b/platform/linux-generic/odp_pkt_queue.c index 88520b1..46e626f 100644 --- a/platform/linux-generic/odp_pkt_queue.c +++ b/platform/linux-generic/odp_pkt_queue.c @@ -10,7 +10,7 @@ #include <string.h> #include <malloc.h> #include <stdio.h> -#include <odp.h> +#include <odp/api.h> #include <odp_pkt_queue_internal.h> #include <odp_debug_internal.h> diff --git a/platform/linux-generic/odp_sorted_list.c b/platform/linux-generic/odp_sorted_list.c index 5811266..d27ef9f 100644 --- a/platform/linux-generic/odp_sorted_list.c +++ b/platform/linux-generic/odp_sorted_list.c @@ -10,7 +10,7 @@ #include <string.h> #include <malloc.h> #include <stdio.h> -#include <odp.h> +#include <odp/api.h> #include <odp_debug_internal.h> #include <odp_sorted_list_internal.h> diff --git a/platform/linux-generic/odp_timer_wheel.c b/platform/linux-generic/odp_timer_wheel.c index 21be3ef..d3af94b 100644 --- a/platform/linux-generic/odp_timer_wheel.c +++ b/platform/linux-generic/odp_timer_wheel.c @@ -10,7 +10,7 @@ #include <string.h> #include <malloc.h> #include <stdio.h> -#include <odp.h> +#include <odp/api.h> #include <odp_timer_wheel_internal.h> #include <odp_debug_internal.h> diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index f677d3c..ac40580 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> #include <odp_classification_internal.h> diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index 7da36aa..f82fb53 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -36,7 +36,7 @@ #include <odp_posix_extensions.h> -#include <odp.h> +#include <odp/api.h> #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 527a62f..f466cc6 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -32,7 +32,7 @@ #include <linux/ethtool.h> #include <linux/sockios.h> -#include <odp.h> +#include <odp/api.h> #include <odp_packet_socket.h> #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index df181d2..c01abd7 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -22,7 +22,7 @@ #include <sys/ioctl.h> #include <errno.h> -#include <odp.h> +#include <odp/api.h> #include <odp_packet_socket.h> #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index 1eb4f56..4cc62e2 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -38,7 +38,7 @@ #include <sys/types.h> #include <linux/if_tun.h> -#include <odp.h> +#include <odp/api.h> #include <odp_packet_socket.h> #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> diff --git a/test/api_test/odp_common.c b/test/api_test/odp_common.c index 70aee96..1c6c4d3 100644 --- a/test/api_test/odp_common.c +++ b/test/api_test/odp_common.c @@ -11,7 +11,7 @@ */ #include <string.h> -#include <odp.h> +#include <odp/api.h> #include <odp/helper/linux.h> #include <odp_common.h> #include <test_debug.h> diff --git a/test/api_test/odp_ring_test.c b/test/api_test/odp_ring_test.c index e8a962a..e948605 100644 --- a/test/api_test/odp_ring_test.c +++ b/test/api_test/odp_ring_test.c @@ -47,7 +47,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <odp.h> +#include <odp/api.h> #include <odp_common.h> #include <odp/helper/ring.h> #include <test_debug.h> diff --git a/test/miscellaneous/odp_api_from_cpp.cpp b/test/miscellaneous/odp_api_from_cpp.cpp index c9733ee..1569f70 100644 --- a/test/miscellaneous/odp_api_from_cpp.cpp +++ b/test/miscellaneous/odp_api_from_cpp.cpp @@ -1,5 +1,5 @@ #include <cstdio> -#include <odp.h> +#include <odp/api.h> #include <odp/helper/linux.h> int main(int argc ODP_UNUSED, const char *argv[] ODP_UNUSED) diff --git a/test/performance/odp_atomic.c b/test/performance/odp_atomic.c index 067329b..f3a4da5 100644 --- a/test/performance/odp_atomic.c +++ b/test/performance/odp_atomic.c @@ -8,7 +8,7 @@ #include <sys/time.h> #include <test_debug.h> -#include <odp.h> +#include <odp/api.h> #include <odp/helper/linux.h> static void test_atomic_inc_dec_u32(void); diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 3c2d296..a94d95a 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -22,7 +22,7 @@ #include <test_debug.h> -#include <odp.h> +#include <odp/api.h> #include <odp/helper/linux.h> #include <odp/helper/eth.h> #include <odp/helper/ip.h> diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c index 9fdc4cb..1cea0da 100644 --- a/test/performance/odp_pktio_perf.c +++ b/test/performance/odp_pktio_perf.c @@ -20,7 +20,7 @@ * a single packet rate can be specified on the command line. * */ -#include <odp.h> +#include <odp/api.h> #include <odp/helper/eth.h> #include <odp/helper/ip.h> diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c index 68fca94..5f28c37 100644 --- a/test/performance/odp_scheduling.c +++ b/test/performance/odp_scheduling.c @@ -16,7 +16,7 @@ #include <test_debug.h> /* ODP main header */ -#include <odp.h> +#include <odp/api.h> /* ODP helper for Linux apps */ #include <odp/helper/linux.h> diff --git a/test/validation/atomic/atomic.c b/test/validation/atomic/atomic.c index 633b465..a4ef823 100644 --- a/test/validation/atomic/atomic.c +++ b/test/validation/atomic/atomic.c @@ -5,7 +5,7 @@ */ #include <malloc.h> -#include <odp.h> +#include <odp/api.h> #include <CUnit/Basic.h> #include <odp_cunit_common.h> #include <unistd.h> diff --git a/test/validation/barrier/barrier.c b/test/validation/barrier/barrier.c index 8f15cdf..e9ffe4f 100644 --- a/test/validation/barrier/barrier.c +++ b/test/validation/barrier/barrier.c @@ -5,7 +5,7 @@ */ #include <malloc.h> -#include <odp.h> +#include <odp/api.h> #include <CUnit/Basic.h> #include <odp_cunit_common.h> #include <unistd.h> diff --git a/test/validation/buffer/buffer.c b/test/validation/buffer/buffer.c index 9c8da81..5a89487 100644 --- a/test/validation/buffer/buffer.c +++ b/test/validation/buffer/buffer.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include "odp_cunit_common.h" #include "buffer.h" diff --git a/test/validation/classification/classification.c b/test/validation/classification/classification.c index 9c3dbbb..4f3dee4 100644 --- a/test/validation/classification/classification.c +++ b/test/validation/classification/classification.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include <odp_cunit_common.h> #include "odp_classification_testsuites.h" #include "classification.h" diff --git a/test/validation/classification/odp_classification_testsuites.h b/test/validation/classification/odp_classification_testsuites.h index 19d5ae2..c4b0406 100644 --- a/test/validation/classification/odp_classification_testsuites.h +++ b/test/validation/classification/odp_classification_testsuites.h @@ -7,7 +7,7 @@ #ifndef ODP_CLASSIFICATION_TESTSUITES_H_ #define ODP_CLASSIFICATION_TESTSUITES_H_ -#include <odp.h> +#include <odp/api.h> #include <odp_cunit_common.h> extern odp_testinfo_t classification_suite[]; diff --git a/test/validation/common/mask_common.c b/test/validation/common/mask_common.c index 9b1a23f..04db29c 100644 --- a/test/validation/common/mask_common.c +++ b/test/validation/common/mask_common.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include "odp_cunit_common.h" #include "mask_common.h" diff --git a/test/validation/common/odp_cunit_common.c b/test/validation/common/odp_cunit_common.c index a886f10..9fdd442 100644 --- a/test/validation/common/odp_cunit_common.c +++ b/test/validation/common/odp_cunit_common.c @@ -5,7 +5,7 @@ */ #include <string.h> -#include <odp.h> +#include <odp/api.h> #include <odp_cunit_common.h> #include <odp/helper/linux.h> /* Globals */ diff --git a/test/validation/config/config.c b/test/validation/config/config.c index f957150..60eef24 100644 --- a/test/validation/config/config.c +++ b/test/validation/config/config.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include "odp_cunit_common.h" #include "config.h" diff --git a/test/validation/cpumask/cpumask.c b/test/validation/cpumask/cpumask.c index 2419f47..77872c6 100644 --- a/test/validation/cpumask/cpumask.c +++ b/test/validation/cpumask/cpumask.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include "odp_cunit_common.h" #include "cpumask.h" diff --git a/test/validation/cpumask/cpumask.h b/test/validation/cpumask/cpumask.h index c6f9cde..55d27aa 100644 --- a/test/validation/cpumask/cpumask.h +++ b/test/validation/cpumask/cpumask.h @@ -7,7 +7,7 @@ #ifndef _ODP_TEST_CPUMASK_H_ #define _ODP_TEST_CPUMASK_H_ -#include <odp.h> +#include <odp/api.h> #include <odp_cunit_common.h> /* test functions: */ diff --git a/test/validation/crypto/crypto.c b/test/validation/crypto/crypto.c index 1234f78..7920c9d 100644 --- a/test/validation/crypto/crypto.c +++ b/test/validation/crypto/crypto.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include <odp_cunit_common.h> #include "odp_crypto_test_inp.h" #include "crypto.h" diff --git a/test/validation/crypto/odp_crypto_test_inp.c b/test/validation/crypto/odp_crypto_test_inp.c index b6fcb12..d99da99 100644 --- a/test/validation/crypto/odp_crypto_test_inp.c +++ b/test/validation/crypto/odp_crypto_test_inp.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include <CUnit/Basic.h> #include <odp_cunit_common.h> #include "test_vectors.h" diff --git a/test/validation/errno/errno.c b/test/validation/errno/errno.c index d0e2128..a24ee89 100644 --- a/test/validation/errno/errno.c +++ b/test/validation/errno/errno.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include "odp_cunit_common.h" #include "errno.h" diff --git a/test/validation/hash/hash.c b/test/validation/hash/hash.c index 11b331e..90ef5dd 100644 --- a/test/validation/hash/hash.c +++ b/test/validation/hash/hash.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include <odp_cunit_common.h> #include "hash.h" diff --git a/test/validation/init/init.c b/test/validation/init/init.c index 62bd75c..0af9410 100644 --- a/test/validation/init/init.c +++ b/test/validation/init/init.c @@ -6,7 +6,7 @@ #include <stdarg.h> #include <stdlib.h> -#include <odp.h> +#include <odp/api.h> #include <CUnit/Basic.h> #include "init.h" diff --git a/test/validation/lock/lock.c b/test/validation/lock/lock.c index 0f4415d..e5bda25 100644 --- a/test/validation/lock/lock.c +++ b/test/validation/lock/lock.c @@ -5,7 +5,7 @@ */ #include <malloc.h> -#include <odp.h> +#include <odp/api.h> #include <CUnit/Basic.h> #include <odp_cunit_common.h> #include <unistd.h> diff --git a/test/validation/packet/packet.c b/test/validation/packet/packet.c index 2467dec..8049bde 100644 --- a/test/validation/packet/packet.c +++ b/test/validation/packet/packet.c @@ -6,7 +6,7 @@ #include <stdlib.h> -#include <odp.h> +#include <odp/api.h> #include <odp_cunit_common.h> #include "packet.h" diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c index eda7993..52cd142 100644 --- a/test/validation/pktio/pktio.c +++ b/test/validation/pktio/pktio.c @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include <odp_cunit_common.h> #include <odp/helper/eth.h> diff --git a/test/validation/pool/pool.c b/test/validation/pool/pool.c index bca210a..47ba6f4 100644 --- a/test/validation/pool/pool.c +++ b/test/validation/pool/pool.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include "odp_cunit_common.h" #include "pool.h" diff --git a/test/validation/queue/queue.c b/test/validation/queue/queue.c index 3c1c64a..f52b8d6 100644 --- a/test/validation/queue/queue.c +++ b/test/validation/queue/queue.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include <odp_cunit_common.h> #include "queue.h" diff --git a/test/validation/random/random.c b/test/validation/random/random.c index 8ed5944..0442cf2 100644 --- a/test/validation/random/random.c +++ b/test/validation/random/random.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include <odp_cunit_common.h> #include "random.h" diff --git a/test/validation/scheduler/scheduler.c b/test/validation/scheduler/scheduler.c index ff95b4b..df138d4 100644 --- a/test/validation/scheduler/scheduler.c +++ b/test/validation/scheduler/scheduler.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include "odp_cunit_common.h" #include "scheduler.h" diff --git a/test/validation/shmem/shmem.c b/test/validation/shmem/shmem.c index 08425e6..2b59930 100644 --- a/test/validation/shmem/shmem.c +++ b/test/validation/shmem/shmem.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include <odp_cunit_common.h> #include "shmem.h" diff --git a/test/validation/std_clib/std_clib.c b/test/validation/std_clib/std_clib.c index e53ad39..44e0386 100644 --- a/test/validation/std_clib/std_clib.c +++ b/test/validation/std_clib/std_clib.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include <odp_cunit_common.h> #include "std_clib.h" diff --git a/test/validation/system/system.c b/test/validation/system/system.c index 521f9fc..6437f09 100644 --- a/test/validation/system/system.c +++ b/test/validation/system/system.c @@ -5,7 +5,7 @@ */ #include <ctype.h> -#include <odp.h> +#include <odp/api.h> #include <odp/api/cpumask.h> #include "odp_cunit_common.h" #include "test_debug.h" diff --git a/test/validation/thread/thread.c b/test/validation/thread/thread.c index 03bf3cd..8e46770 100644 --- a/test/validation/thread/thread.c +++ b/test/validation/thread/thread.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include <odp_cunit_common.h> #include <mask_common.h> #include <test_debug.h> diff --git a/test/validation/thread/thread.h b/test/validation/thread/thread.h index 6cbc694..ed1bc6e 100644 --- a/test/validation/thread/thread.h +++ b/test/validation/thread/thread.h @@ -7,7 +7,7 @@ #ifndef _ODP_TEST_THREAD_H_ #define _ODP_TEST_THREAD_H_ -#include <odp.h> +#include <odp/api.h> #include <odp_cunit_common.h> /* test functions: */ diff --git a/test/validation/time/time.c b/test/validation/time/time.c index 4eb6dd5..1c8f8e8 100644 --- a/test/validation/time/time.c +++ b/test/validation/time/time.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp.h> +#include <odp/api.h> #include "odp_cunit_common.h" #include "time.h" diff --git a/test/validation/timer/timer.c b/test/validation/timer/timer.c index 5d89700..a59125a 100644 --- a/test/validation/timer/timer.c +++ b/test/validation/timer/timer.c @@ -14,7 +14,7 @@ #endif #include <time.h> -#include <odp.h> +#include <odp/api.h> #include "odp_cunit_common.h" #include "test_debug.h" #include "timer.h"
odp.h actually describes the applicatiion interface of ODP and is logicaly moved in the ODP include space to api.h. Applications now includes <odp/api.h>. This simplify the addition of other ODP interfaces (e.g. drivers may include odp/drv.h in the future.) This patch has been done by a script which is given in the cover letter of this patch serie Signed-off-by: Christophe Milard <christophe.milard@linaro.org> --- example/classifier/odp_classifier.c | 2 +- example/generator/odp_generator.c | 2 +- example/ipsec/odp_ipsec.c | 2 +- example/ipsec/odp_ipsec_cache.c | 2 +- example/ipsec/odp_ipsec_cache.h | 2 +- example/ipsec/odp_ipsec_fwd_db.c | 2 +- example/ipsec/odp_ipsec_fwd_db.h | 2 +- example/ipsec/odp_ipsec_loop_db.c | 2 +- example/ipsec/odp_ipsec_loop_db.h | 2 +- example/ipsec/odp_ipsec_misc.h | 2 +- example/ipsec/odp_ipsec_sa_db.c | 2 +- example/ipsec/odp_ipsec_sp_db.c | 2 +- example/ipsec/odp_ipsec_stream.c | 2 +- example/ipsec/odp_ipsec_stream.h | 2 +- example/packet/odp_pktio.c | 2 +- example/time/time_global_test.c | 2 +- example/timer/odp_timer_test.c | 2 +- example/traffic_mgmt/odp_traffic_mgmt.c | 2 +- helper/hashtable.c | 2 +- helper/include/odp/helper/linux.h | 2 +- helper/lineartable.c | 2 +- helper/ring.c | 2 +- helper/test/odp_chksum.c | 2 +- helper/test/odp_process.c | 2 +- helper/test/odp_table.c | 2 +- helper/test/odp_thread.c | 2 +- include/{odp.h => odp/api.h} | 0 platform/linux-generic/Makefile.am | 5 +++-- platform/linux-generic/include/odp_name_table_internal.h | 2 +- platform/linux-generic/include/odp_pkt_queue_internal.h | 2 +- platform/linux-generic/include/odp_timer_wheel_internal.h | 2 +- platform/linux-generic/odp_pkt_queue.c | 2 +- platform/linux-generic/odp_sorted_list.c | 2 +- platform/linux-generic/odp_timer_wheel.c | 2 +- platform/linux-generic/pktio/loop.c | 2 +- platform/linux-generic/pktio/pcap.c | 2 +- platform/linux-generic/pktio/socket.c | 2 +- platform/linux-generic/pktio/socket_mmap.c | 2 +- platform/linux-generic/pktio/tap.c | 2 +- test/api_test/odp_common.c | 2 +- test/api_test/odp_ring_test.c | 2 +- test/miscellaneous/odp_api_from_cpp.cpp | 2 +- test/performance/odp_atomic.c | 2 +- test/performance/odp_l2fwd.c | 2 +- test/performance/odp_pktio_perf.c | 2 +- test/performance/odp_scheduling.c | 2 +- test/validation/atomic/atomic.c | 2 +- test/validation/barrier/barrier.c | 2 +- test/validation/buffer/buffer.c | 2 +- test/validation/classification/classification.c | 2 +- test/validation/classification/odp_classification_testsuites.h | 2 +- test/validation/common/mask_common.c | 2 +- test/validation/common/odp_cunit_common.c | 2 +- test/validation/config/config.c | 2 +- test/validation/cpumask/cpumask.c | 2 +- test/validation/cpumask/cpumask.h | 2 +- test/validation/crypto/crypto.c | 2 +- test/validation/crypto/odp_crypto_test_inp.c | 2 +- test/validation/errno/errno.c | 2 +- test/validation/hash/hash.c | 2 +- test/validation/init/init.c | 2 +- test/validation/lock/lock.c | 2 +- test/validation/packet/packet.c | 2 +- test/validation/pktio/pktio.c | 2 +- test/validation/pool/pool.c | 2 +- test/validation/queue/queue.c | 2 +- test/validation/random/random.c | 2 +- test/validation/scheduler/scheduler.c | 2 +- test/validation/shmem/shmem.c | 2 +- test/validation/std_clib/std_clib.c | 2 +- test/validation/system/system.c | 2 +- test/validation/thread/thread.c | 2 +- test/validation/thread/thread.h | 2 +- test/validation/time/time.c | 2 +- test/validation/timer/timer.c | 2 +- 75 files changed, 76 insertions(+), 75 deletions(-) rename include/{odp.h => odp/api.h} (100%)