Port d07a44c6e "linux-gen: hash: prepare for arch specific implementations"

Port original commit from linux-generic.

Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Jere Leppänen <jere.leppanen@nokia.com>

2 files changed, 21 insertions, 8 deletions

diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am
index 24fad4e39..cbfe91ea8 100644
--- a/platform/linux-dpdk/Makefile.am
+++ b/platform/linux-dpdk/Makefile.am
@@ -32,6 +32,7 @@ odpapiplatinclude_HEADERS = \
 		  include/odp/api/plat/cpu_inlines.h \
 		  include/odp/api/plat/event_inlines.h \
 		  include/odp/api/plat/event_vector_inline_types.h \
+		  include/odp/api/plat/hash_inlines.h \
 		  include/odp/api/plat/packet_flag_inlines.h \
 		  include/odp/api/plat/packet_inline_types.h \
 		  include/odp/api/plat/packet_inlines.h \
@@ -163,8 +164,6 @@ __LIB__libodp_dpdk_la_SOURCES = \
 			   odp_crypto.c \
 			   odp_errno.c \
 			   ../linux-generic/odp_event.c \
-			   ../linux-generic/odp_hash_crc32.c \
-			   ../linux-generic/odp_hash_crc32c.c \
 			   ../linux-generic/odp_hash_crc_gen.c \
 			   odp_init.c \
 			   ../linux-generic/odp_impl.c \
@@ -219,6 +218,7 @@ __LIB__libodp_dpdk_la_SOURCES += \
 			   ../linux-generic/odp_byteorder_api.c \
 			   ../linux-generic/odp_cpu_api.c \
 			   ../linux-generic/odp_event_api.c \
+			   ../linux-generic/odp_hash_api.c \
 			   ../linux-generic/odp_packet_api.c \
 			   ../linux-generic/odp_packet_flags_api.c \
 			   ../linux-generic/odp_pktio_api.c \
@@ -233,9 +233,11 @@ endif
 if ARCH_IS_ARM
 __LIB__libodp_dpdk_la_SOURCES += arch/default/odp_cpu_cycles.c \
 				 arch/default/odp_global_time.c \
+				 arch/default/odp_hash_crc32.c \
 				 arch/arm/odp_sysinfo_parse.c
 odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h \
-				arch/default/odp/api/abi/cpu_time.h
+				arch/default/odp/api/abi/cpu_time.h \
+				arch/default/odp/api/abi/hash_crc32.h
 if !ODP_ABI_COMPAT
 odpapiabiarchinclude_HEADERS += arch/arm/odp/api/abi/cpu.h
 endif
@@ -247,9 +249,11 @@ endif
 if ARCH_IS_AARCH64
 __LIB__libodp_dpdk_la_SOURCES += arch/default/odp_cpu_cycles.c \
 				 arch/aarch64/odp_global_time.c \
+				 arch/default/odp_hash_crc32.c \
 				 arch/aarch64/odp_sysinfo_parse.c
 odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h \
-				arch/default/odp/api/abi/cpu_time.h
+				arch/default/odp/api/abi/cpu_time.h \
+				arch/default/odp/api/abi/hash_crc32.h
 if !ODP_ABI_COMPAT
 odpapiabiarchinclude_HEADERS += arch/aarch64/odp/api/abi/cpu.h
 endif
@@ -261,9 +265,11 @@ endif
 if ARCH_IS_DEFAULT
 __LIB__libodp_dpdk_la_SOURCES += arch/default/odp_cpu_cycles.c \
 				 arch/default/odp_global_time.c \
+				 arch/default/odp_hash_crc32.c \
 				 arch/default/odp_sysinfo_parse.c
 odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h \
-				arch/default/odp/api/abi/cpu_time.h
+				arch/default/odp/api/abi/cpu_time.h \
+				arch/default/odp/api/abi/hash_crc32.h
 if !ODP_ABI_COMPAT
 odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu.h
 endif
@@ -273,9 +279,11 @@ endif
 if ARCH_IS_MIPS64
 __LIB__libodp_dpdk_la_SOURCES += arch/mips64/odp_cpu_cycles.c \
 				 arch/default/odp_global_time.c \
+				 arch/default/odp_hash_crc32.c \
 				 arch/mips64/odp_sysinfo_parse.c
 odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h \
-				arch/default/odp/api/abi/cpu_time.h
+				arch/default/odp/api/abi/cpu_time.h \
+				arch/default/odp/api/abi/hash_crc32.h
 if !ODP_ABI_COMPAT
 odpapiabiarchinclude_HEADERS += arch/mips64/odp/api/abi/cpu.h
 endif
@@ -285,9 +293,11 @@ endif
 if ARCH_IS_POWERPC
 __LIB__libodp_dpdk_la_SOURCES += arch/default/odp_cpu_cycles.c \
 				 arch/default/odp_global_time.c \
+				 arch/default/odp_hash_crc32.c \
 				 arch/powerpc/odp_sysinfo_parse.c
 odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h \
-				arch/default/odp/api/abi/cpu_time.h
+				arch/default/odp/api/abi/cpu_time.h \
+				arch/default/odp/api/abi/hash_crc32.h
 if !ODP_ABI_COMPAT
 odpapiabiarchinclude_HEADERS += arch/powerpc/odp/api/abi/cpu.h
 endif
@@ -298,10 +308,12 @@ if ARCH_IS_X86
 __LIB__libodp_dpdk_la_SOURCES += arch/x86/cpu_flags.c \
 				 arch/x86/odp_cpu_cycles.c \
 				 arch/x86/odp_global_time.c \
+				 arch/default/odp_hash_crc32.c \
 				 arch/x86/odp_sysinfo_parse.c
 odpapiabiarchinclude_HEADERS += arch/x86/odp/api/abi/cpu_inlines.h \
 				arch/x86/odp/api/abi/cpu_rdtsc.h \
-				arch/x86/odp/api/abi/cpu_time.h
+				arch/x86/odp/api/abi/cpu_time.h \
+				arch/default/odp/api/abi/hash_crc32.h
 if !ODP_ABI_COMPAT
 odpapiabiarchinclude_HEADERS += arch/x86/odp/api/abi/cpu.h
 endif
diff --git a/platform/linux-dpdk/include/odp/api/plat/hash_inlines.h b/platform/linux-dpdk/include/odp/api/plat/hash_inlines.h
new file mode 120000
index 000000000..fcb963c41
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/api/plat/hash_inlines.h
@@ -0,0 +1 @@
+../../../../../linux-generic/include/odp/api/plat/hash_inlines.h
\ No newline at end of file