Removed all references to config.h which is now empty.
Signed-off-by: Petri Savolainen <[email protected]>
---
include/odp/api/spec/config.h | 44 ----------------------
include/odp/api/spec/cpumask.h | 2 -
include/odp/api/spec/packet.h | 5 +--
include/odp_api.h | 2 -
platform/Makefile.inc | 1 -
platform/linux-generic/Makefile.am | 1 -
platform/linux-generic/include/odp/api/config.h | 35 -----------------
.../linux-generic/include/odp_packet_io_internal.h | 2 +-
platform/linux-generic/odp_packet_io.c | 2 +-
platform/linux-generic/odp_pool.c | 2 +-
platform/linux-generic/odp_queue.c | 2 +-
11 files changed, 6 insertions(+), 92 deletions(-)
delete mode 100644 include/odp/api/spec/config.h
delete mode 100644 platform/linux-generic/include/odp/api/config.h
diff --git a/include/odp/api/spec/config.h b/include/odp/api/spec/config.h
deleted file mode 100644
index 4c1df41..0000000
--- a/include/odp/api/spec/config.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright (c) 2013, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-
-/**
- * @file
- *
- * ODP configuration
- */
-
-#ifndef ODP_API_CONFIG_H_
-#define ODP_API_CONFIG_H_
-#include <odp/api/visibility_begin.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @defgroup odp_config ODP CONFIG
- * Platform-specific configuration limits.
- *
- * @note The API calls defined for ODP configuration limits are the
- * normative means of accessing platform-specific configuration limits.
- * Platforms MAY in addition include \#defines for these limits for
- * internal use in dimensioning arrays, however there is no guarantee
- * that applications using such \#defines will be portable across all
- * ODP implementations. Applications SHOULD expect that over time such
- * \#defines will be deprecated and removed.
- * @{
- */
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#include <odp/api/visibility_end.h>
-#endif
diff --git a/include/odp/api/spec/cpumask.h b/include/odp/api/spec/cpumask.h
index 129b3c1..6e16fd0 100644
--- a/include/odp/api/spec/cpumask.h
+++ b/include/odp/api/spec/cpumask.h
@@ -19,8 +19,6 @@
extern "C" {
#endif
-#include <odp/api/config.h>
-
/** @defgroup odp_cpumask ODP CPUMASK
* CPU mask operations.
* @{
diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h
index de128df..481eee3 100644
--- a/include/odp/api/spec/packet.h
+++ b/include/odp/api/spec/packet.h
@@ -93,9 +93,8 @@ extern "C" {
* @return Handle of allocated packet
* @retval ODP_PACKET_INVALID Packet could not be allocated
*
- * @note The default headroom and tailroom used for packets is specified by
- * the ODP_CONFIG_PACKET_HEADROOM and ODP_CONFIG_PACKET_TAILROOM defines in
- * odp_config.h.
+ * @note The minimum headroom and tailroom used for packets is specified by
+ * pool capabilities min_headroom and min_tailroom.
*/
odp_packet_t odp_packet_alloc(odp_pool_t pool, uint32_t len);
diff --git a/include/odp_api.h b/include/odp_api.h
index 44b67ee..ec7fcd2 100644
--- a/include/odp_api.h
+++ b/include/odp_api.h
@@ -18,8 +18,6 @@
extern "C" {
#endif
-#include <odp/api/config.h>
-
#include <odp/api/version.h>
#include <odp/api/std_types.h>
#include <odp/api/compiler.h>
diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 863da93..85bc2e8 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -27,7 +27,6 @@ odpapispecinclude_HEADERS = \
$(top_srcdir)/include/odp/api/spec/byteorder.h \
$(top_srcdir)/include/odp/api/spec/classification.h \
$(top_srcdir)/include/odp/api/spec/compiler.h \
- $(top_srcdir)/include/odp/api/spec/config.h \
$(top_srcdir)/include/odp/api/spec/cpu.h \
$(top_srcdir)/include/odp/api/spec/cpumask.h \
$(top_srcdir)/include/odp/api/spec/crypto.h \
diff --git a/platform/linux-generic/Makefile.am
b/platform/linux-generic/Makefile.am
index cbcb59e..b3e0d28 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -22,7 +22,6 @@ odpapiinclude_HEADERS = \
$(srcdir)/include/odp/api/byteorder.h \
$(srcdir)/include/odp/api/classification.h \
$(srcdir)/include/odp/api/compiler.h \
- $(srcdir)/include/odp/api/config.h \
$(srcdir)/include/odp/api/cpu.h \
$(srcdir)/include/odp/api/cpumask.h \
$(srcdir)/include/odp/api/crypto.h \
diff --git a/platform/linux-generic/include/odp/api/config.h
b/platform/linux-generic/include/odp/api/config.h
deleted file mode 100644
index 1f16438..0000000
--- a/platform/linux-generic/include/odp/api/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright (c) 2015, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-/**
- * @file
- *
- * ODP configuration
- */
-
-#ifndef ODP_PLAT_CONFIG_H_
-#define ODP_PLAT_CONFIG_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @ingroup odp_config ODP CONFIG
- * Platform-specific configuration limits
- * @{
- */
-
-#include <odp/api/spec/config.h>
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/platform/linux-generic/include/odp_packet_io_internal.h
b/platform/linux-generic/include/odp_packet_io_internal.h
index 9fc13a9..512ab0d 100644
--- a/platform/linux-generic/include/odp_packet_io_internal.h
+++ b/platform/linux-generic/include/odp_packet_io_internal.h
@@ -25,7 +25,7 @@ extern "C" {
#include <odp_debug_internal.h>
#include <odp_packet_io_ring_internal.h>
-#include <odp/api/config.h>
+#include <odp_config_internal.h>
#include <odp/api/hints.h>
#include <net/if.h>
diff --git a/platform/linux-generic/odp_packet_io.c
b/platform/linux-generic/odp_packet_io.c
index 59ce6e9..5b032cc 100644
--- a/platform/linux-generic/odp_packet_io.c
+++ b/platform/linux-generic/odp_packet_io.c
@@ -15,7 +15,7 @@
#include <odp/api/ticketlock.h>
#include <odp/api/shared_memory.h>
#include <odp_packet_socket.h>
-#include <odp/api/config.h>
+#include <odp_config_internal.h>
#include <odp_queue_internal.h>
#include <odp_schedule_internal.h>
#include <odp_classification_internal.h>
diff --git a/platform/linux-generic/odp_pool.c
b/platform/linux-generic/odp_pool.c
index cb43f53..4fb3db7 100644
--- a/platform/linux-generic/odp_pool.c
+++ b/platform/linux-generic/odp_pool.c
@@ -15,7 +15,7 @@
#include <odp/api/shared_memory.h>
#include <odp/api/align.h>
#include <odp_internal.h>
-#include <odp/api/config.h>
+#include <odp_config_internal.h>
#include <odp/api/hints.h>
#include <odp/api/thread.h>
#include <odp_debug_internal.h>
diff --git a/platform/linux-generic/odp_queue.c
b/platform/linux-generic/odp_queue.c
index d4043f0..16ec179 100644
--- a/platform/linux-generic/odp_queue.c
+++ b/platform/linux-generic/odp_queue.c
@@ -16,7 +16,7 @@
#include <odp/api/shared_memory.h>
#include <odp/api/schedule.h>
#include <odp_schedule_internal.h>
-#include <odp/api/config.h>
+#include <odp_config_internal.h>
#include <odp_packet_io_internal.h>
#include <odp_packet_io_queue.h>
#include <odp_debug_internal.h>
--
2.8.1
_______________________________________________
lng-odp mailing list
[email protected]
https://lists.linaro.org/mailman/listinfo/lng-odp
