api: queue: remove deprecated scheduled queue capabilities

Remove deprecated scheduled queue capabilities from odp_queue_capability_t.

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

3 files changed, 3 insertions, 74 deletions

diff --git a/include/odp/api/spec/queue_types.h b/include/odp/api/spec/queue_types.h
index cff47ee60..384761e87 100644
--- a/include/odp/api/spec/queue_types.h
+++ b/include/odp/api/spec/queue_types.h
@@ -19,7 +19,6 @@ extern "C" {
 #endif
 
 #include <odp/api/schedule_types.h>
-#include <odp/api/deprecated.h>
 
 /** @addtogroup odp_queue
  *  @{
@@ -177,18 +176,6 @@ typedef struct odp_queue_capability_t {
 	  * types are used simultaneously. */
 	uint32_t max_queues;
 
-	/** @deprecated Use max_ordered_locks field of
-	 * odp_schedule_capability_t instead */
-	uint32_t ODP_DEPRECATE(max_ordered_locks);
-
-	/** @deprecated Use max_groups field of odp_schedule_capability_t
-	 * instead */
-	unsigned int ODP_DEPRECATE(max_sched_groups);
-
-	/** @deprecated Use max_prios field of odp_schedule_capability_t
-	 * instead */
-	unsigned int ODP_DEPRECATE(sched_prios);
-
 	/** Plain queue capabilities */
 	struct {
 		/** Maximum number of plain (ODP_BLOCKING) queues of the
@@ -231,47 +218,6 @@ typedef struct odp_queue_capability_t {
 
 	} plain;
 
-	/** @deprecated Use queue capabilities in odp_schedule_capability_t
-	 * instead */
-	struct {
-		/** Maximum number of scheduled (ODP_BLOCKING) queues of the
-		  * default size. */
-		uint32_t max_num;
-
-		/** Maximum number of events a scheduled (ODP_BLOCKING) queue
-		  * can store simultaneously. The value of zero means that
-		  * scheduled queues do not have a size limit, but a single
-		  * queue can store all available events. */
-		uint32_t max_size;
-
-		/** Lock-free (ODP_NONBLOCKING_LF) implementation capabilities.
-		  * The specification is the same as for the blocking
-		  * implementation. */
-		struct {
-			/** Maximum number of queues. Lock-free queues are not
-			  * supported when zero. */
-			uint32_t max_num;
-
-			/** Maximum queue size */
-			uint32_t max_size;
-
-		} lockfree;
-
-		/** Wait-free (ODP_NONBLOCKING_WF) implementation capabilities.
-		  * The specification is the same as for the blocking
-		  * implementation. */
-		struct {
-			/** Maximum number of queues. Wait-free queues are not
-			  * supported when zero. */
-			uint32_t max_num;
-
-			/** Maximum queue size */
-			uint32_t max_size;
-
-		} waitfree;
-
-	} ODP_DEPRECATE(sched);
-
 } odp_queue_capability_t;
 
 /**
diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c
index fe523cc62..5155bae4b 100644
--- a/platform/linux-generic/odp_queue_basic.c
+++ b/platform/linux-generic/odp_queue_basic.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2013-2018, Linaro Limited
- * Copyright (c) 2021, Nokia
+ * Copyright (c) 2021-2022, Nokia
  * All rights reserved.
  *
  * SPDX-License-Identifier:     BSD-3-Clause
@@ -56,16 +56,6 @@ static int queue_capa(odp_queue_capability_t *capa, int sched ODP_UNUSED)
 	capa->plain.max_size    = _odp_queue_glb->config.max_queue_size;
 	capa->plain.lockfree.max_num  = _odp_queue_glb->queue_lf_num;
 	capa->plain.lockfree.max_size = _odp_queue_glb->queue_lf_size;
-#if ODP_DEPRECATED_API
-	capa->sched.max_num     = CONFIG_MAX_SCHED_QUEUES;
-	capa->sched.max_size    = _odp_queue_glb->config.max_queue_size;
-
-	if (sched) {
-		capa->max_ordered_locks = _odp_sched_fn->max_ordered_locks();
-		capa->max_sched_groups  = _odp_sched_fn->num_grps();
-		capa->sched_prios       = odp_schedule_num_prio();
-	}
-#endif
 
 	return 0;
 }
diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c
index bf5489516..c92ebeddd 100644
--- a/platform/linux-generic/odp_queue_scalable.c
+++ b/platform/linux-generic/odp_queue_scalable.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2017, ARM Limited. All rights reserved.
- *
+/* Copyright (c) 2017, ARM Limited
  * Copyright (c) 2017-2018, Linaro Limited
  * All rights reserved.
  *
@@ -305,13 +304,7 @@ static int queue_capability(odp_queue_capability_t *capa)
 
 	/* Reserve some queues for internal use */
 	capa->max_queues        = CONFIG_MAX_QUEUES - CONFIG_INTERNAL_QUEUES;
-#if ODP_DEPRECATED_API
-	capa->max_ordered_locks = _odp_sched_fn->max_ordered_locks();
-	capa->max_sched_groups  = _odp_sched_fn->num_grps();
-	capa->sched_prios       = odp_schedule_num_prio();
-	capa->sched.max_num     = CONFIG_MAX_SCHED_QUEUES;
-	capa->sched.max_size    = 0;
-#endif
+
 	capa->plain.max_num     = CONFIG_MAX_PLAIN_QUEUES;
 	capa->plain.max_size    = 0;