Signed-off-by: Joyce Kong <joyce.k...@arm.com>
---
platform/linux-generic/include/odp_packet_io_internal.h | 5 +++++
platform/linux-generic/include/odp_queue_internal.h | 12 +++++++++++-
platform/linux-generic/include/odp_schedule_if.h | 15 ---------------
platform/linux-generic/odp_schedule.c | 2 +-
platform/linux-generic/odp_schedule_iquery.c | 2 +-
platform/linux-generic/odp_schedule_sp.c | 2 ++
6 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/platform/linux-generic/include/odp_packet_io_internal.h
b/platform/linux-generic/include/odp_packet_io_internal.h
index 89bb6f3..70bc44d 100644
--- a/platform/linux-generic/include/odp_packet_io_internal.h
+++ b/platform/linux-generic/include/odp_packet_io_internal.h
@@ -262,6 +262,11 @@ int single_recv_queue(pktio_entry_t *entry, int index,
odp_packet_t packets[],
int single_send_queue(pktio_entry_t *entry, int index,
const odp_packet_t packets[], int num);
+/* Interface for the scheduler */
+int sched_cb_pktin_poll(int pktio_index, int num_queue, int index[]);
+void sched_cb_pktio_stop_finalize(int pktio_index);
+int sched_cb_num_pktio(void);
+
extern const pktio_if_ops_t netmap_pktio_ops;
extern const pktio_if_ops_t dpdk_pktio_ops;
extern const pktio_if_ops_t sock_mmsg_pktio_ops;
diff --git a/platform/linux-generic/include/odp_queue_internal.h
b/platform/linux-generic/include/odp_queue_internal.h
index 560f826..452ecab 100644
--- a/platform/linux-generic/include/odp_queue_internal.h
+++ b/platform/linux-generic/include/odp_queue_internal.h
@@ -20,7 +20,6 @@ extern "C" {
#include <odp/api/queue.h>
#include <odp_forward_typedefs_internal.h>
-#include <odp_schedule_if.h>
#include <odp_buffer_internal.h>
#include <odp_align_internal.h>
#include <odp/api/packet_io.h>
@@ -94,6 +93,17 @@ int queue_deq_multi(queue_entry_t *queue, odp_buffer_hdr_t
*buf_hdr[], int num);
void queue_lock(queue_entry_t *queue);
void queue_unlock(queue_entry_t *queue);
+/* Interface for the scheduler */
+int sched_cb_num_queues(void);
+int sched_cb_queue_prio(uint32_t queue_index);
+int sched_cb_queue_grp(uint32_t queue_index);
+int sched_cb_queue_is_ordered(uint32_t queue_index);
+int sched_cb_queue_is_atomic(uint32_t queue_index);
+odp_queue_t sched_cb_queue_handle(uint32_t queue_index);
+void sched_cb_queue_destroy_finalize(uint32_t queue_index);
+int sched_cb_queue_deq_multi(uint32_t queue_index, odp_event_t ev[], int num);
+int sched_cb_queue_empty(uint32_t queue_index);
+
static inline uint32_t queue_to_id(odp_queue_t handle)
{
return _odp_typeval(handle) - 1;
diff --git a/platform/linux-generic/include/odp_schedule_if.h
b/platform/linux-generic/include/odp_schedule_if.h
index 530d157..8dae081 100644
--- a/platform/linux-generic/include/odp_schedule_if.h
+++ b/platform/linux-generic/include/odp_schedule_if.h
@@ -11,7 +11,6 @@
extern "C" {
#endif
-#include <odp/api/queue.h>
#include <odp_queue_internal.h>
#include <odp/api/schedule.h>
@@ -60,20 +59,6 @@ typedef struct schedule_fn_t {
/* Interface towards the scheduler */
extern const schedule_fn_t *sched_fn;
-/* Interface for the scheduler */
-int sched_cb_pktin_poll(int pktio_index, int num_queue, int index[]);
-void sched_cb_pktio_stop_finalize(int pktio_index);
-int sched_cb_num_pktio(void);
-int sched_cb_num_queues(void);
-int sched_cb_queue_prio(uint32_t queue_index);
-int sched_cb_queue_grp(uint32_t queue_index);
-int sched_cb_queue_is_ordered(uint32_t queue_index);
-int sched_cb_queue_is_atomic(uint32_t queue_index);
-odp_queue_t sched_cb_queue_handle(uint32_t queue_index);
-void sched_cb_queue_destroy_finalize(uint32_t queue_index);
-int sched_cb_queue_deq_multi(uint32_t queue_index, odp_event_t ev[], int num);
-int sched_cb_queue_empty(uint32_t queue_index);
-
/* API functions */
typedef struct {
uint64_t (*schedule_wait_time)(uint64_t);
diff --git a/platform/linux-generic/odp_schedule.c
b/platform/linux-generic/odp_schedule.c
index c4567d8..d33fac2 100644
--- a/platform/linux-generic/odp_schedule.c
+++ b/platform/linux-generic/odp_schedule.c
@@ -6,7 +6,6 @@
#include <string.h>
#include <odp/api/schedule.h>
-#include <odp_schedule_if.h>
#include <odp/api/align.h>
#include <odp/api/shared_memory.h>
#include <odp_internal.h>
@@ -23,6 +22,7 @@
#include <odp/api/packet_io.h>
#include <odp_ring_internal.h>
#include <odp_queue_internal.h>
+#include <odp_packet_io_internal.h>
/* Number of priority levels */
#define NUM_PRIO 8
diff --git a/platform/linux-generic/odp_schedule_iquery.c
b/platform/linux-generic/odp_schedule_iquery.c
index 75470af..7d1991f 100644
--- a/platform/linux-generic/odp_schedule_iquery.c
+++ b/platform/linux-generic/odp_schedule_iquery.c
@@ -5,7 +5,6 @@
*/
#include <odp/api/schedule.h>
-#include <odp_schedule_if.h>
#include <odp/api/align.h>
#include <odp/api/queue.h>
#include <odp/api/shared_memory.h>
@@ -13,6 +12,7 @@
#include <odp_debug_internal.h>
#include <odp_ring_internal.h>
#include <odp_queue_internal.h>
+#include <odp_packet_io_internal.h>
#include <odp_buffer_internal.h>
#include <odp_bitmap_internal.h>
#include <odp/api/thread.h>
diff --git a/platform/linux-generic/odp_schedule_sp.c
b/platform/linux-generic/odp_schedule_sp.c
index 0fd4d87..0719844 100644
--- a/platform/linux-generic/odp_schedule_sp.c
+++ b/platform/linux-generic/odp_schedule_sp.c
@@ -15,6 +15,8 @@
#include <odp_align_internal.h>
#include <odp_config_internal.h>
#include <odp_ring_internal.h>
+#include <odp_packet_io_internal.h>
+#include <odp_queue_internal.h>
#define NUM_THREAD ODP_THREAD_COUNT_MAX
#define NUM_QUEUE ODP_CONFIG_QUEUES
--
2.7.4
