From 6d8402ab2dd461cba86767edcde29c2dce22b4bf Mon Sep 17 00:00:00 2001
From: lhoerl <coder@lolux.de>
Date: 周四, 06 8月 2015 18:00:04 +0800
Subject: [PATCH] Added downloadlink for National Instruments CVI evaluation version CVI 2012SP1

---
 libscpi/src/fifo.c |   44 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/libscpi/src/fifo.c b/libscpi/src/fifo.c
index 7c80c9f..341bc8e 100644
--- a/libscpi/src/fifo.c
+++ b/libscpi/src/fifo.c
@@ -1,21 +1,35 @@
 
-#include "scpi/fifo.h"
+#include "fifo_private.h"
 
-void fifo_init(fifo_t * fifo) {
+/**
+ * Initialize fifo
+ * @param fifo
+ */
+void fifo_init(scpi_fifo_t * fifo) {
     fifo->wr = 0;
     fifo->rd = 0;
     fifo->size = FIFO_SIZE;
 }
 
-void fifo_clear(fifo_t * fifo) {
+/**
+ * Empty fifo
+ * @param fifo
+ */
+void fifo_clear(scpi_fifo_t * fifo) {
     fifo->wr = 0;
     fifo->rd = 0;
 }
 
-bool_t fifo_push(fifo_t * fifo, int16_t value) {
+/**
+ * Add element to fifo. If fifo is full, remove last element.
+ * @param fifo
+ * @param value
+ * @return 
+ */
+scpi_bool_t fifo_add(scpi_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,20 +38,34 @@
     return TRUE;
 }
 
-bool_t fifo_pop(fifo_t * fifo, int16_t * value) {
+/**
+ * Remove element form fifo
+ * @param fifo
+ * @param value
+ * @return FALSE - fifo is empty
+ */
+scpi_bool_t fifo_remove(scpi_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);
 
     return TRUE;
 }
 
-bool_t fifo_count(fifo_t * fifo, int16_t * value) {
+/**
+ * Retrive number of elements in fifo
+ * @param fifo
+ * @param value
+ * @return 
+ */
+scpi_bool_t fifo_count(scpi_fifo_t * fifo, int16_t * value) {
     *value = fifo->wr - fifo->rd;
     if (*value < 0) {
         *value += (fifo->size + 1);

--
Gitblit v1.9.1