Queue: Add methods that accept a memcpy routine

These versions of the queue add and remove methods support
using memcpy like routines to access regions of memory with
specific requirements.  In particular, this will allow for
transfers between queues and USB packet RAM on the STM32
which has specific access requirements.

This change also includes an update to the mem* util routines
to make their prototypes compatible with C89 and POSIX
standards.

Signed-off-by: Anton Staaf <robotboy@chromium.org>

BRANCH=None
BUG=None
TEST=make buildall -j
     Test USB Echo functionality on discovery-stm32f072 board to
     ensure that queues still function correctly.

Change-Id: I557064d99abfc3e8cfc98099a1d94334a976550c
Reviewed-on: https://chromium-review.googlesource.com/239217
Tested-by: Anton Staaf <robotboy@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Queue: Anton Staaf <robotboy@chromium.org>
Trybot-Ready: Anton Staaf <robotboy@chromium.org>

1 files changed, 26 insertions, 3 deletions

diff --git a/common/queue.c b/common/queue.c
index b301b338ea..70b4bd40d0 100644
--- a/common/queue.c
+++ b/common/queue.c
@@ -49,6 +49,16 @@ size_t queue_add_unit(struct queue const *q, void const *src)
 
 size_t queue_add_units(struct queue const *q, void const *src, size_t count)
 {
+	return queue_add_memcpy(q, src, count, memcpy);
+}
+
+size_t queue_add_memcpy(struct queue const *q,
+			void const *src,
+			size_t count,
+			void *(*memcpy)(void *dest,
+					void const *src,
+					size_t n))
+{
 	size_t transfer = MIN(count, queue_space(q));
 	size_t tail     = q->state->tail & (q->buffer_units - 1);
 	size_t first    = MIN(transfer, q->buffer_units - tail);
@@ -70,7 +80,10 @@ size_t queue_add_units(struct queue const *q, void const *src, size_t count)
 static void queue_read_safe(struct queue const *q,
 			    void *dest,
 			    size_t head,
-			    size_t transfer)
+			    size_t transfer,
+			    void *(*memcpy)(void *dest,
+					    void const *src,
+					    size_t n))
 {
 	size_t first = MIN(transfer, q->buffer_units - head);
 
@@ -103,10 +116,20 @@ size_t queue_remove_unit(struct queue const *q, void *dest)
 
 size_t queue_remove_units(struct queue const *q, void *dest, size_t count)
 {
+	return queue_remove_memcpy(q, dest, count, memcpy);
+}
+
+size_t queue_remove_memcpy(struct queue const *q,
+			   void *dest,
+			   size_t count,
+			   void *(*memcpy)(void *dest,
+					   void const *src,
+					   size_t n))
+{
 	size_t transfer = MIN(count, queue_count(q));
 	size_t head     = q->state->head & (q->buffer_units - 1);
 
-	queue_read_safe(q, dest, head, transfer);
+	queue_read_safe(q, dest, head, transfer, memcpy);
 
 	q->state->head += transfer;
 
@@ -124,7 +147,7 @@ size_t queue_peek_units(struct queue const *q,
 	if (i < available) {
 		size_t head = (q->state->head + i) & (q->buffer_units - 1);
 
-		queue_read_safe(q, dest, head, transfer);
+		queue_read_safe(q, dest, head, transfer, memcpy);
 	}
 
 	return transfer;