linux-gen: buffer: remove buffer_inlines header file

Moved odp_buffer_inlines.h content to odp_buffer_internal.h and removed the file. Other xxx_inlines.h headers do not contain internal functions but only code for API function inlining. Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
OpenDataPlane · May 10, 2018 · f49289a · f49289a
1 parent cc6d68e
commit f49289a
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 51 deletions.
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
@@ -86,7 +86,6 @@ noinst_HEADERS = \
 		  include/odp_atomic_internal.h \
 		  include/odp_bitmap_internal.h \
 		  include/odp_bitset.h \
-		  include/odp_buffer_inlines.h \
 		  include/odp_buffer_internal.h \
 		  include/odp_classification_datamodel.h \
 		  include/odp_classification_inlines.h \

diff --git a/platform/linux-generic/include/odp_buffer_inlines.h b/platform/linux-generic/include/odp_buffer_inlines.h
diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h
@@ -111,6 +111,20 @@ struct ODP_ALIGNED_CACHE odp_buffer_hdr_t {
 ODP_STATIC_ASSERT(CONFIG_PACKET_SEGS_PER_HDR < 256,
 		  "CONFIG_PACKET_SEGS_PER_HDR_TOO_LARGE");
 
+odp_event_type_t _odp_buffer_event_type(odp_buffer_t buf);
+void _odp_buffer_event_type_set(odp_buffer_t buf, int ev);
+int odp_buffer_snprint(char *str, uint32_t n, odp_buffer_t buf);
+
+static inline odp_buffer_t buf_from_buf_hdr(odp_buffer_hdr_t *hdr)
+{
+	return (odp_buffer_t)hdr;
+}
+
+static inline odp_event_t event_from_buf_hdr(odp_buffer_hdr_t *hdr)
+{
+	return (odp_event_t)hdr;
+}
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
@@ -21,7 +21,6 @@ extern "C" {
 #include <odp/api/debug.h>
 #include <odp_buffer_internal.h>
 #include <odp_pool_internal.h>
-#include <odp_buffer_inlines.h>
 #include <odp/api/packet.h>
 #include <odp/api/plat/packet_inline_types.h>
 #include <odp/api/packet_io.h>

diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c
@@ -9,7 +9,6 @@
 #include <odp/api/buffer.h>
 #include <odp_pool_internal.h>
 #include <odp_buffer_internal.h>
-#include <odp_buffer_inlines.h>
 #include <odp_debug_internal.h>
 
 #include <string.h>

diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c
@@ -14,7 +14,6 @@
 #include <odp/api/pool.h>
 #include <odp_buffer_internal.h>
 #include <odp_ipsec_internal.h>
-#include <odp_buffer_inlines.h>
 #include <odp_debug_internal.h>
 #include <odp_packet_internal.h>
 

diff --git a/platform/linux-generic/odp_ipsec_events.c b/platform/linux-generic/odp_ipsec_events.c
@@ -10,7 +10,6 @@
 #include <odp/api/shared_memory.h>
 
 #include <odp_buffer_internal.h>
-#include <odp_buffer_inlines.h>
 #include <odp_debug_internal.h>
 #include <odp_ipsec_internal.h>
 #include <odp_pool_internal.h>

diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c
@@ -14,7 +14,6 @@
 
 #include <odp_pool_internal.h>
 #include <odp_internal.h>
-#include <odp_buffer_inlines.h>
 #include <odp_packet_internal.h>
 #include <odp_config_internal.h>
 #include <odp_debug_internal.h>

diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c
@@ -14,7 +14,6 @@
 #include <odp/api/buffer.h>
 #include <odp_buffer_internal.h>
 #include <odp_pool_internal.h>
-#include <odp_buffer_inlines.h>
 #include <odp_internal.h>
 #include <odp/api/shared_memory.h>
 #include <odp/api/schedule.h>

diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c
@@ -20,7 +20,6 @@
 #include <odp_config_internal.h>
 #include <odp_debug_internal.h>
 
-#include <odp_buffer_inlines.h>
 #include <odp_packet_io_internal.h>
 #include <odp_pool_internal.h>
 #include <odp_queue_scalable_internal.h>

diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c
@@ -26,7 +26,6 @@
 #include <odp_ring_internal.h>
 #include <odp_timer_internal.h>
 #include <odp_queue_internal.h>
-#include <odp_buffer_inlines.h>
 #include <odp_libconfig_internal.h>
 
 /* Number of priority levels  */

diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c
@@ -25,7 +25,6 @@
 #include <odp_ishmpool_internal.h>
 
 #include <odp_align_internal.h>
-#include <odp_buffer_inlines.h>
 #include <odp_llqueue.h>
 #include <odp_queue_scalable_internal.h>
 #include <odp_schedule_if.h>

diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
@@ -38,7 +38,6 @@
 #include <odp/api/atomic.h>
 #include <odp_atomic_internal.h>
 #include <odp/api/buffer.h>
-#include <odp_buffer_inlines.h>
 #include <odp/api/cpu.h>
 #include <odp/api/pool.h>
 #include <odp_pool_internal.h>