api: pool: split pool types into a separate header

Split pool types into a separate header file to enable easier function
inlining. No API changes.

Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Tuomas Taipale <tuomas.taipale@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>

26 files changed, 124 insertions, 33 deletions

diff --git a/include/odp/api/abi-default/pool.h b/include/odp/api/abi-default/pool.h
index ec25b05de..a61706e19 100644
--- a/include/odp/api/abi-default/pool.h
+++ b/include/odp/api/abi-default/pool.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2018, Linaro Limited
+/* Copyright (c) 2022, Nokia
  * All rights reserved.
  *
  * SPDX-License-Identifier:     BSD-3-Clause
@@ -11,24 +11,7 @@
 extern "C" {
 #endif
 
-#include <odp/api/abi/event.h>
-
-/** @internal Dummy type for strong typing */
-typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_pool_t;
-
-/** @ingroup odp_pool
- *  @{
- */
-
-typedef _odp_abi_pool_t *odp_pool_t;
-
-#define ODP_POOL_INVALID   ((odp_pool_t)0)
-
-#define ODP_POOL_NAME_LEN  32
-
-/**
- * @}
- */
+/* Empty header required due to the packet inline functions */
 
 #ifdef __cplusplus
 }
diff --git a/include/odp/api/abi-default/pool_types.h b/include/odp/api/abi-default/pool_types.h
new file mode 100644
index 000000000..1c27b78fa
--- /dev/null
+++ b/include/odp/api/abi-default/pool_types.h
@@ -0,0 +1,36 @@
+/* Copyright (c) 2017-2018, Linaro Limited
+ * Copyright (c) 2022, Nokia
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#ifndef ODP_ABI_POOL_TYPES_H_
+#define ODP_ABI_POOL_TYPES_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @internal Dummy type for strong typing */
+typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_pool_t;
+
+/** @ingroup odp_pool
+ *  @{
+ */
+
+typedef _odp_abi_pool_t *odp_pool_t;
+
+#define ODP_POOL_INVALID   ((odp_pool_t)0)
+
+#define ODP_POOL_NAME_LEN  32
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/include/odp/api/buffer.h b/include/odp/api/buffer.h
index a7ee933e7..27622c2a3 100644
--- a/include/odp/api/buffer.h
+++ b/include/odp/api/buffer.h
@@ -20,7 +20,6 @@ extern "C" {
 #include <odp/api/std_types.h>
 #include <odp/api/abi/event.h>
 #include <odp/api/abi/buffer.h>
-#include <odp/api/abi/pool.h>
 
 #include <odp/api/spec/buffer.h>
 
diff --git a/include/odp/api/classification.h b/include/odp/api/classification.h
index e96e9c906..7347fa363 100644
--- a/include/odp/api/classification.h
+++ b/include/odp/api/classification.h
@@ -18,7 +18,6 @@ extern "C" {
 #endif
 
 #include <odp/api/std_types.h>
-#include <odp/api/abi/pool.h>
 #include <odp/api/abi/classification.h>
 #include <odp/api/abi/packet_types.h>
 #include <odp/api/abi/packet_io.h>
diff --git a/include/odp/api/crypto.h b/include/odp/api/crypto.h
index 1986d1b2e..ec7c8370b 100644
--- a/include/odp/api/crypto.h
+++ b/include/odp/api/crypto.h
@@ -21,7 +21,6 @@ extern "C" {
 #include <odp/api/abi/packet_types.h>
 #include <odp/api/abi/crypto.h>
 #include <odp/api/abi/buffer.h>
-#include <odp/api/abi/pool.h>
 #include <odp/api/abi/queue_types.h>
 
 /** @ingroup odp_crypto
diff --git a/include/odp/api/dma_types.h b/include/odp/api/dma_types.h
index 4a51371b4..5a726a319 100644
--- a/include/odp/api/dma_types.h
+++ b/include/odp/api/dma_types.h
@@ -17,6 +17,7 @@
 extern "C" {
 #endif
 
+#include <odp/api/abi/event.h>
 #include <odp/api/abi/dma_types.h>
 
 #include <odp/api/spec/dma_types.h>
diff --git a/include/odp/api/packet.h b/include/odp/api/packet.h
index 231a5aecd..76dec55bf 100644
--- a/include/odp/api/packet.h
+++ b/include/odp/api/packet.h
@@ -23,7 +23,6 @@ extern "C" {
 #include <odp/api/abi/packet_types.h>
 #include <odp/api/abi/packet.h>
 #include <odp/api/abi/buffer.h>
-#include <odp/api/abi/pool.h>
 
 #include <odp/api/spec/packet.h>
 
diff --git a/include/odp/api/packet_io.h b/include/odp/api/packet_io.h
index 9de59f51e..77f67e6f8 100644
--- a/include/odp/api/packet_io.h
+++ b/include/odp/api/packet_io.h
@@ -18,7 +18,6 @@ extern "C" {
 #endif
 
 #include <odp/api/std_types.h>
-#include <odp/api/abi/pool.h>
 #include <odp/api/abi/classification.h>
 #include <odp/api/abi/packet_types.h>
 #include <odp/api/abi/packet_io.h>
diff --git a/include/odp/api/packet_types.h b/include/odp/api/packet_types.h
index 02ffe956b..ffd19c5c8 100644
--- a/include/odp/api/packet_types.h
+++ b/include/odp/api/packet_types.h
@@ -17,6 +17,7 @@
 extern "C" {
 #endif
 
+#include <odp/api/abi/packet_io.h>
 #include <odp/api/abi/packet_types.h>
 
 #include <odp/api/spec/packet_types.h>
diff --git a/include/odp/api/pool.h b/include/odp/api/pool.h
index 0790b43aa..9e2fe2b05 100644
--- a/include/odp/api/pool.h
+++ b/include/odp/api/pool.h
@@ -18,8 +18,6 @@ extern "C" {
 #endif
 
 #include <odp/api/abi/pool.h>
-#include <odp/api/abi/shared_memory.h>
-#include <odp/api/abi/event.h>
 
 #include <odp/api/spec/pool.h>
 
diff --git a/include/odp/api/pool_types.h b/include/odp/api/pool_types.h
new file mode 100644
index 000000000..18d5dd9d5
--- /dev/null
+++ b/include/odp/api/pool_types.h
@@ -0,0 +1,28 @@
+/* Copyright (c) 2022, Nokia
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+/**
+ * @file
+ *
+ * ODP pool
+ */
+
+#ifndef ODP_API_POOL_TYPES_H_
+#define ODP_API_POOL_TYPES_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <odp/api/abi/pool_types.h>
+
+#include <odp/api/spec/pool_types.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/include/odp/api/queue.h b/include/odp/api/queue.h
index 4046d4e1b..7897fff86 100644
--- a/include/odp/api/queue.h
+++ b/include/odp/api/queue.h
@@ -22,7 +22,6 @@ extern "C" {
 #include <odp/api/abi/queue_types.h>
 #include <odp/api/abi/queue.h>
 #include <odp/api/abi/buffer.h>
-#include <odp/api/abi/pool.h>
 
 #include <odp/api/spec/queue.h>
 
diff --git a/include/odp/api/spec/buffer.h b/include/odp/api/spec/buffer.h
index 82f5e2f72..7945b59f9 100644
--- a/include/odp/api/spec/buffer.h
+++ b/include/odp/api/spec/buffer.h
@@ -18,6 +18,8 @@
 extern "C" {
 #endif
 
+#include <odp/api/pool_types.h>
+
 /** @defgroup odp_buffer ODP BUFFER
  *  Buffer event metadata and operations.
  *  @{
diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h
index 15b2183da..1f9dee3ca 100644
--- a/include/odp/api/spec/classification.h
+++ b/include/odp/api/spec/classification.h
@@ -20,8 +20,10 @@ extern "C" {
 #endif
 
 #include <odp/api/packet_io.h>
+#include <odp/api/pool_types.h>
 #include <odp/api/std_types.h>
 #include <odp/api/threshold.h>
+
 /** @defgroup odp_classification ODP CLASSIFICATION
  *  Packet input classification.
  *  @{
diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h
index 3b3372f61..c0ff3710d 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -16,6 +16,7 @@
 #include <odp/visibility_begin.h>
 
 #include <odp/api/deprecated.h>
+#include <odp/api/pool_types.h>
 #include <odp/api/std_types.h>
 
 #ifdef __cplusplus
diff --git a/include/odp/api/spec/dma.h b/include/odp/api/spec/dma.h
index 8ca506291..6e911b227 100644
--- a/include/odp/api/spec/dma.h
+++ b/include/odp/api/spec/dma.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2021, Nokia
+/* Copyright (c) 2021-2022, Nokia
  * All rights reserved.
  *
  * SPDX-License-Identifier:     BSD-3-Clause
@@ -19,6 +19,7 @@ extern "C" {
 #endif
 
 #include <odp/api/dma_types.h>
+#include <odp/api/pool_types.h>
 
 /** @addtogroup odp_dma
  *  @{
diff --git a/include/odp/api/spec/dma_types.h b/include/odp/api/spec/dma_types.h
index 563955395..d7ccc6d56 100644
--- a/include/odp/api/spec/dma_types.h
+++ b/include/odp/api/spec/dma_types.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2021, Nokia
+/* Copyright (c) 2021-2022, Nokia
  * All rights reserved.
  *
  * SPDX-License-Identifier:     BSD-3-Clause
@@ -18,6 +18,7 @@
 extern "C" {
 #endif
 
+#include <odp/api/packet_types.h>
 #include <odp/api/std_types.h>
 
 /** @defgroup odp_dma ODP DMA
@@ -100,7 +101,7 @@ typedef struct odp_dma_pool_param_t {
 } odp_dma_pool_param_t;
 
 /* Includes pool_types.h, which depends on odp_dma_pool_param_t. */
-#include <odp/api/queue.h>
+#include <odp/api/queue_types.h>
 
 /**
  * DMA transfer direction
diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h
index daf0b3133..8dc0a77bb 100644
--- a/include/odp/api/spec/packet.h
+++ b/include/odp/api/spec/packet.h
@@ -22,6 +22,7 @@ extern "C" {
 #include <odp/api/proto_stats_types.h>
 #include <odp/api/time.h>
 #include <odp/api/packet_types.h>
+#include <odp/api/pool_types.h>
 
 /** @defgroup odp_packet ODP PACKET
  *  Packet event metadata and operations.
diff --git a/include/odp/api/spec/pool.h b/include/odp/api/spec/pool.h
index 6ebfafe05..a52417eb4 100644
--- a/include/odp/api/spec/pool.h
+++ b/include/odp/api/spec/pool.h
@@ -1,5 +1,5 @@
 /* Copyright (c) 2015-2018, Linaro Limited
- * Copyright (c) 2020-2021, Nokia
+ * Copyright (c) 2020-2022, Nokia
  * All rights reserved.
  *
  * SPDX-License-Identifier:     BSD-3-Clause
@@ -20,7 +20,7 @@ extern "C" {
 #endif
 
 #include <odp/api/std_types.h>
-#include <odp/api/spec/pool_types.h>
+#include <odp/api/pool_types.h>
 
 /** @defgroup odp_pool ODP POOL
  *  Packet and buffer (event) pools.
diff --git a/include/odp/api/spec/timer.h b/include/odp/api/spec/timer.h
index 4e6005d2a..9df43d034 100644
--- a/include/odp/api/spec/timer.h
+++ b/include/odp/api/spec/timer.h
@@ -22,8 +22,8 @@ extern "C" {
 
 #include <odp/api/timer_types.h>
 #include <odp/api/event.h>
+#include <odp/api/pool_types.h>
 #include <odp/api/queue_types.h>
-#include <odp/api/pool.h>
 
 /** @addtogroup odp_timer
  *  @{
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/pool_types.h b/include/odp/arch/arm32-linux/odp/api/abi/pool_types.h
new file mode 100644
index 000000000..2c5cb121a
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/pool_types.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2022, Nokia
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/pool_types.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/pool_types.h b/include/odp/arch/arm64-linux/odp/api/abi/pool_types.h
new file mode 100644
index 000000000..2c5cb121a
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/pool_types.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2022, Nokia
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/pool_types.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/pool_types.h b/include/odp/arch/default-linux/odp/api/abi/pool_types.h
new file mode 100644
index 000000000..2c5cb121a
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/pool_types.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2022, Nokia
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/pool_types.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/pool_types.h b/include/odp/arch/power64-linux/odp/api/abi/pool_types.h
new file mode 100644
index 000000000..2c5cb121a
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/pool_types.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2022, Nokia
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/pool_types.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/pool_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/pool_types.h
new file mode 100644
index 000000000..2c5cb121a
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/pool_types.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2022, Nokia
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/pool_types.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/pool_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/pool_types.h
new file mode 100644
index 000000000..2c5cb121a
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/pool_types.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2022, Nokia
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/pool_types.h>