Port 0cf079bb "linux-gen: queue: remove internal queue handle conversions"

Signed-off-by: Matias Elo <matias.elo@nokia.com>

1 files changed, 14 insertions, 14 deletions

diff --git a/platform/linux-dpdk/odp_queue_spsc.c b/platform/linux-dpdk/odp_queue_spsc.c
index 89915eb9a..ff217df22 100644
--- a/platform/linux-dpdk/odp_queue_spsc.c
+++ b/platform/linux-dpdk/odp_queue_spsc.c
@@ -9,13 +9,13 @@
 #include "config.h"
 #include <odp_debug_internal.h>
 
-static inline int spsc_enq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[],
-				 int num)
+static inline int spsc_enq_multi(odp_queue_t handle,
+				 odp_buffer_hdr_t *buf_hdr[], int num)
 {
 	queue_entry_t *queue;
 	ring_spsc_t ring_spsc;
 
-	queue = q_int;
+	queue = qentry_from_handle(handle);
 	ring_spsc = queue->s.ring_spsc;
 
 	if (odp_unlikely(queue->s.status < QUEUE_STATUS_READY)) {
@@ -26,13 +26,13 @@ static inline int spsc_enq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[],
 	return ring_spsc_enq_multi(ring_spsc, (void **)buf_hdr, num);
 }
 
-static inline int spsc_deq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[],
-				 int num)
+static inline int spsc_deq_multi(odp_queue_t handle,
+				 odp_buffer_hdr_t *buf_hdr[], int num)
 {
 	queue_entry_t *queue;
 	ring_spsc_t ring_spsc;
 
-	queue = q_int;
+	queue = qentry_from_handle(handle);
 	ring_spsc = queue->s.ring_spsc;
 
 	if (odp_unlikely(queue->s.status < QUEUE_STATUS_READY)) {
@@ -43,17 +43,17 @@ static inline int spsc_deq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[],
 	return ring_spsc_deq_multi(ring_spsc, (void **)buf_hdr, num);
 }
 
-static int queue_spsc_enq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[],
+static int queue_spsc_enq_multi(odp_queue_t handle, odp_buffer_hdr_t *buf_hdr[],
 				int num)
 {
-	return spsc_enq_multi(q_int, buf_hdr, num);
+	return spsc_enq_multi(handle, buf_hdr, num);
 }
 
-static int queue_spsc_enq(void *q_int, odp_buffer_hdr_t *buf_hdr)
+static int queue_spsc_enq(odp_queue_t handle, odp_buffer_hdr_t *buf_hdr)
 {
 	int ret;
 
-	ret = spsc_enq_multi(q_int, &buf_hdr, 1);
+	ret = spsc_enq_multi(handle, &buf_hdr, 1);
 
 	if (ret == 1)
 		return 0;
@@ -61,18 +61,18 @@ static int queue_spsc_enq(void *q_int, odp_buffer_hdr_t *buf_hdr)
 		return -1;
 }
 
-static int queue_spsc_deq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[],
+static int queue_spsc_deq_multi(odp_queue_t handle, odp_buffer_hdr_t *buf_hdr[],
 				int num)
 {
-	return spsc_deq_multi(q_int, buf_hdr, num);
+	return spsc_deq_multi(handle, buf_hdr, num);
 }
 
-static odp_buffer_hdr_t *queue_spsc_deq(void *q_int)
+static odp_buffer_hdr_t *queue_spsc_deq(odp_queue_t handle)
 {
 	odp_buffer_hdr_t *buf_hdr = NULL;
 	int ret;
 
-	ret = spsc_deq_multi(q_int, &buf_hdr, 1);
+	ret = spsc_deq_multi(handle, &buf_hdr, 1);
 
 	if (ret == 1)
 		return buf_hdr;