From 9185712f1bf768269c19193fc72f8cda9654e122 Mon Sep 17 00:00:00 2001 From: Jan Breuer <jan.breuer@jaybee.cz> Date: 周三, 06 3月 2013 21:25:08 +0800 Subject: [PATCH] Modified FIFO --- libscpi/src/fifo.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libscpi/src/fifo.c b/libscpi/src/fifo.c index 7c80c9f..cb9d385 100644 --- a/libscpi/src/fifo.c +++ b/libscpi/src/fifo.c @@ -12,10 +12,10 @@ fifo->rd = 0; } -bool_t fifo_push(fifo_t * fifo, int16_t value) { +bool_t fifo_add(fifo_t * fifo, int16_t value) { /* FIFO full? */ if (fifo->wr == ((fifo->rd + fifo->size) % (fifo->size + 1))) { - return FALSE; + fifo_remove(fifo, NULL); } fifo->data[fifo->wr] = value; @@ -24,13 +24,15 @@ return TRUE; } -bool_t fifo_pop(fifo_t * fifo, int16_t * value) { +bool_t fifo_remove(fifo_t * fifo, int16_t * value) { /* FIFO empty? */ if (fifo->wr == fifo->rd) { return FALSE; } - *value = fifo->data[fifo->rd]; + if(value) { + *value = fifo->data[fifo->rd]; + } fifo->rd = (fifo->rd + 1) % (fifo->size + 1); -- Gitblit v1.9.1