Port bdc44eae "linux-gen: init: split odp_internal.h"

Signed-off-by: Matias Elo <matias.elo@nokia.com>

12 files changed, 14 insertions, 18 deletions

diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am
index dd0cb22f3..841bdaf1d 100644
--- a/platform/linux-dpdk/Makefile.am
+++ b/platform/linux-dpdk/Makefile.am
@@ -88,7 +88,8 @@ noinst_HEADERS = \
 		  ${top_srcdir}/platform/linux-generic/include/odp_classification_inlines.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_classification_internal.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_forward_typedefs_internal.h \
-		  ${top_srcdir}/platform/linux-generic/include/odp_internal.h \
+		  ${top_srcdir}/platform/linux-generic/include/odp_global_data.h \
+		  ${top_srcdir}/platform/linux-generic/include/odp_init_internal.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_ipsec_internal.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_libconfig_internal.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_llqueue.h \
@@ -112,6 +113,7 @@ noinst_HEADERS = \
 		  include/odp_ring_st_internal.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_schedule_if.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_sorted_list_internal.h \
+		  ${top_srcdir}/platform/linux-generic/include/odp_sysinfo_internal.h \
 		  include/odp_shm_internal.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_timer_internal.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_timer_wheel_internal.h \
diff --git a/platform/linux-dpdk/odp_crypto.c b/platform/linux-dpdk/odp_crypto.c
index 57c99e9cb..20761bac1 100644
--- a/platform/linux-dpdk/odp_crypto.c
+++ b/platform/linux-dpdk/odp_crypto.c
@@ -8,7 +8,7 @@
 
 #include <odp_posix_extensions.h>
 #include <odp/api/crypto.h>
-#include <odp_internal.h>
+#include <odp_init_internal.h>
 #include <odp/api/spinlock.h>
 #include <odp/api/debug.h>
 #include <odp/api/align.h>
diff --git a/platform/linux-dpdk/odp_errno.c b/platform/linux-dpdk/odp_errno.c
index eab3fa1ee..4bb8b87d9 100644
--- a/platform/linux-dpdk/odp_errno.c
+++ b/platform/linux-dpdk/odp_errno.c
@@ -5,7 +5,6 @@
  */
 
 #include <odp/api/errno.h>
-#include <odp_internal.h>
 #include <string.h>
 #include <stdio.h>
 #include <odp_debug_internal.h>
diff --git a/platform/linux-dpdk/odp_init.c b/platform/linux-dpdk/odp_init.c
index dac146208..e52db20f6 100644
--- a/platform/linux-dpdk/odp_init.c
+++ b/platform/linux-dpdk/odp_init.c
@@ -7,23 +7,16 @@
 #include "config.h"
 
 #include <odp_posix_extensions.h>
+
 #include <odp/api/init.h>
 #include <odp_debug_internal.h>
-#include <odp/api/debug.h>
-#include <unistd.h>
-#include <odp_internal.h>
+#include <odp_init_internal.h>
 #include <odp_schedule_if.h>
 #include <odp_libconfig_internal.h>
 #include <odp_shm_internal.h>
 #include <string.h>
 #include <stdio.h>
-#include <linux/limits.h>
-#include <dirent.h>
 #include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <pwd.h>
 #include <ctype.h>
 
 #include <rte_config.h>
diff --git a/platform/linux-dpdk/odp_packet_dpdk.c b/platform/linux-dpdk/odp_packet_dpdk.c
index 5a1cf5c4b..6ee0b50d9 100644
--- a/platform/linux-dpdk/odp_packet_dpdk.c
+++ b/platform/linux-dpdk/odp_packet_dpdk.c
@@ -28,6 +28,7 @@
 
 #include <odp/api/system_info.h>
 #include <odp_debug_internal.h>
+#include <odp_errno_define.h>
 #include <odp_classification_internal.h>
 #include <odp_packet_io_internal.h>
 #include <odp_libconfig_internal.h>
diff --git a/platform/linux-dpdk/odp_pool.c b/platform/linux-dpdk/odp_pool.c
index d5b3195a9..ee1877a36 100644
--- a/platform/linux-dpdk/odp_pool.c
+++ b/platform/linux-dpdk/odp_pool.c
@@ -15,7 +15,7 @@
 #include <odp_align_internal.h>
 #include <odp/api/shared_memory.h>
 #include <odp/api/align.h>
-#include <odp_internal.h>
+#include <odp_init_internal.h>
 #include <odp_config_internal.h>
 #include <odp/api/hints.h>
 #include <odp/api/debug.h>
diff --git a/platform/linux-dpdk/odp_queue_basic.c b/platform/linux-dpdk/odp_queue_basic.c
index be159f3a8..0b716e0e1 100644
--- a/platform/linux-dpdk/odp_queue_basic.c
+++ b/platform/linux-dpdk/odp_queue_basic.c
@@ -14,7 +14,7 @@
 #include <odp/api/buffer.h>
 #include <odp_buffer_internal.h>
 #include <odp_pool_internal.h>
-#include <odp_internal.h>
+#include <odp_init_internal.h>
 #include <odp/api/shared_memory.h>
 #include <odp/api/schedule.h>
 #include <odp_schedule_if.h>
diff --git a/platform/linux-dpdk/odp_queue_if.c b/platform/linux-dpdk/odp_queue_if.c
index efda17606..9acefb783 100644
--- a/platform/linux-dpdk/odp_queue_if.c
+++ b/platform/linux-dpdk/odp_queue_if.c
@@ -7,7 +7,7 @@
 #include "config.h"
 
 #include <odp_queue_if.h>
-#include <odp_internal.h>
+#include <odp_init_internal.h>
 #include <odp_debug_internal.h>
 
 #include <stdlib.h>
diff --git a/platform/linux-dpdk/odp_schedule_if.c b/platform/linux-dpdk/odp_schedule_if.c
index c35a71018..b09b84c86 100644
--- a/platform/linux-dpdk/odp_schedule_if.c
+++ b/platform/linux-dpdk/odp_schedule_if.c
@@ -7,7 +7,7 @@
 #include "config.h"
 
 #include <odp_schedule_if.h>
-#include <odp_internal.h>
+#include <odp_init_internal.h>
 #include <odp_debug_internal.h>
 
 #include <stdlib.h>
diff --git a/platform/linux-dpdk/odp_thread.c b/platform/linux-dpdk/odp_thread.c
index bf644a981..60a35cba8 100644
--- a/platform/linux-dpdk/odp_thread.c
+++ b/platform/linux-dpdk/odp_thread.c
@@ -11,8 +11,8 @@
 #include <sched.h>
 #include <odp/api/thread.h>
 #include <odp/api/thrmask.h>
-#include <odp_internal.h>
 #include <odp/api/spinlock.h>
+#include <odp_init_internal.h>
 #include <odp_config_internal.h>
 #include <odp_debug_internal.h>
 #include <odp/api/shared_memory.h>
diff --git a/platform/linux-dpdk/odp_time.c b/platform/linux-dpdk/odp_time.c
index e4c82b756..f8e94f2b7 100644
--- a/platform/linux-dpdk/odp_time.c
+++ b/platform/linux-dpdk/odp_time.c
@@ -10,6 +10,7 @@
 #include <odp/api/time.h>
 #include <odp/api/hints.h>
 #include <odp_debug_internal.h>
+#include <odp_init_internal.h>
 #include <odp_arch_time_internal.h>
 #include <string.h>
 #include <inttypes.h>
diff --git a/platform/linux-dpdk/odp_timer.c b/platform/linux-dpdk/odp_timer.c
index 74fa44e89..cd04ba201 100644
--- a/platform/linux-dpdk/odp_timer.c
+++ b/platform/linux-dpdk/odp_timer.c
@@ -12,7 +12,7 @@
 #include <odp/api/ticketlock.h>
 #include <odp/api/timer.h>
 
-#include <odp_internal.h>
+#include <odp_init_internal.h>
 #include <odp_debug_internal.h>
 #include <odp_ring_internal.h>
 #include <odp_timer_internal.h>