From 1f3aae322221514a8df3e06c0adf6844a597b025 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 10 4月 2017 19:03:01 +0800
Subject: [PATCH] Merge pull request #85 from richardbarlow/master

---
 libscpi/src/fifo.c |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/libscpi/src/fifo.c b/libscpi/src/fifo.c
index a64d351..a97ab7a 100644
--- a/libscpi/src/fifo.c
+++ b/libscpi/src/fifo.c
@@ -5,10 +5,12 @@
  * Initialize fifo
  * @param fifo
  */
-void fifo_init(scpi_fifo_t * fifo) {
+void fifo_init(scpi_fifo_t * fifo, scpi_error_t * data, int16_t size) {
     fifo->wr = 0;
     fifo->rd = 0;
-    fifo->size = FIFO_SIZE;
+    fifo->count = 0;
+    fifo->data = data;
+    fifo->size = size;
 }
 
 /**
@@ -18,6 +20,7 @@
 void fifo_clear(scpi_fifo_t * fifo) {
     fifo->wr = 0;
     fifo->rd = 0;
+    fifo->count = 0;
 }
 
 /**
@@ -26,7 +29,7 @@
  * @return
  */
 scpi_bool_t fifo_is_empty(scpi_fifo_t * fifo) {
-    return fifo->wr == fifo->rd;
+    return fifo->count == 0;
 }
 
 /**
@@ -35,24 +38,28 @@
  * @return
  */
 scpi_bool_t fifo_is_full(scpi_fifo_t * fifo) {
-    return fifo->wr == ((fifo->rd + fifo->size - 1) % (fifo->size));
+    return fifo->count == fifo->size;
 }
 
 /**
  * Add element to fifo. If fifo is full, return FALSE.
  * @param fifo
- * @param value
+ * @param err
+ * @param info
  * @return
  */
-scpi_bool_t fifo_add(scpi_fifo_t * fifo, int16_t value) {
+scpi_bool_t fifo_add(scpi_fifo_t * fifo, const scpi_error_t * value) {
     /* FIFO full? */
     if (fifo_is_full(fifo)) {
         return FALSE;
     }
+    if (!value) {
+        return FALSE;
+    }
 
-    fifo->data[fifo->wr] = value;
+    fifo->data[fifo->wr] = *value;
     fifo->wr = (fifo->wr + 1) % (fifo->size);
-
+    fifo->count += 1;
     return TRUE;
 }
 
@@ -62,7 +69,7 @@
  * @param value
  * @return FALSE - fifo is empty
  */
-scpi_bool_t fifo_remove(scpi_fifo_t * fifo, int16_t * value) {
+scpi_bool_t fifo_remove(scpi_fifo_t * fifo, scpi_error_t * value) {
     /* FIFO empty? */
     if (fifo_is_empty(fifo)) {
         return FALSE;
@@ -73,6 +80,7 @@
     }
 
     fifo->rd = (fifo->rd + 1) % (fifo->size);
+    fifo->count -= 1;
 
     return TRUE;
 }
@@ -83,7 +91,7 @@
  * @param value
  * @return FALSE - fifo is empty
  */
-scpi_bool_t fifo_remove_last(scpi_fifo_t * fifo, int16_t * value) {
+scpi_bool_t fifo_remove_last(scpi_fifo_t * fifo, scpi_error_t * value) {
     /* FIFO empty? */
     if (fifo_is_empty(fifo)) {
         return FALSE;
@@ -94,6 +102,7 @@
     if (value) {
         *value = fifo->data[fifo->wr];
     }
+    fifo->count -= 1;
 
     return TRUE;
 }
@@ -105,9 +114,6 @@
  * @return
  */
 scpi_bool_t fifo_count(scpi_fifo_t * fifo, int16_t * value) {
-    *value = fifo->wr - fifo->rd;
-    if (*value < 0) {
-        *value += (fifo->size);
-    }
+    *value = fifo->count;
     return TRUE;
 }

--
Gitblit v1.9.1