From 15671f57ea852bc1df5c0d2a358b714eeb097074 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 17 10月 2016 14:27:19 +0800
Subject: [PATCH] Merge pull request #83 from ardovm/master
---
libscpi/src/fifo.c | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/libscpi/src/fifo.c b/libscpi/src/fifo.c
index c7caccc..a97ab7a 100644
--- a/libscpi/src/fifo.c
+++ b/libscpi/src/fifo.c
@@ -5,9 +5,10 @@
* Initialize fifo
* @param fifo
*/
-void fifo_init(scpi_fifo_t * fifo, int16_t * data, int16_t size) {
+void fifo_init(scpi_fifo_t * fifo, scpi_error_t * data, int16_t size) {
fifo->wr = 0;
fifo->rd = 0;
+ fifo->count = 0;
fifo->data = data;
fifo->size = size;
}
@@ -19,6 +20,7 @@
void fifo_clear(scpi_fifo_t * fifo) {
fifo->wr = 0;
fifo->rd = 0;
+ fifo->count = 0;
}
/**
@@ -27,7 +29,7 @@
* @return
*/
scpi_bool_t fifo_is_empty(scpi_fifo_t * fifo) {
- return fifo->wr == fifo->rd;
+ return fifo->count == 0;
}
/**
@@ -36,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;
}
@@ -63,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;
@@ -74,6 +80,7 @@
}
fifo->rd = (fifo->rd + 1) % (fifo->size);
+ fifo->count -= 1;
return TRUE;
}
@@ -84,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;
@@ -95,6 +102,7 @@
if (value) {
*value = fifo->data[fifo->wr];
}
+ fifo->count -= 1;
return TRUE;
}
@@ -106,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