From 2140d423dc485e5d1f3ae2c2aa39d7e28a6069ac Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 19 2月 2016 23:01:08 +0800
Subject: [PATCH] Fix #74 bad handling of incomplete ARB data
---
libscpi/src/fifo.c | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/libscpi/src/fifo.c b/libscpi/src/fifo.c
index a64d351..e81f55e 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, int16_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,7 +38,7 @@
* @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;
}
/**
@@ -52,7 +55,7 @@
fifo->data[fifo->wr] = value;
fifo->wr = (fifo->wr + 1) % (fifo->size);
-
+ fifo->count += 1;
return TRUE;
}
@@ -73,6 +76,7 @@
}
fifo->rd = (fifo->rd + 1) % (fifo->size);
+ fifo->count -= 1;
return TRUE;
}
@@ -94,6 +98,7 @@
if (value) {
*value = fifo->data[fifo->wr];
}
+ fifo->count -= 1;
return TRUE;
}
@@ -105,9 +110,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