From fbd16b32739a35ed3d3cf7e9aa4cfb6a75758e46 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 14 2月 2016 00:32:42 +0800
Subject: [PATCH] Fix fifo length (issue #66)
---
libscpi/inc/scpi/types.h | 1 +
libscpi/src/fifo.c | 15 ++++++++-------
libscpi/test/test_parser.c | 2 +-
libscpi/test/test_fifo.c | 4 ++--
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index 19efbd5..0147c03 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -204,6 +204,7 @@
struct _scpi_fifo_t {
int16_t wr;
int16_t rd;
+ int16_t count;
int16_t size;
int16_t * data;
};
diff --git a/libscpi/src/fifo.c b/libscpi/src/fifo.c
index c7caccc..e81f55e 100644
--- a/libscpi/src/fifo.c
+++ b/libscpi/src/fifo.c
@@ -8,6 +8,7 @@
void fifo_init(scpi_fifo_t * fifo, int16_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,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;
}
/**
@@ -53,7 +55,7 @@
fifo->data[fifo->wr] = value;
fifo->wr = (fifo->wr + 1) % (fifo->size);
-
+ fifo->count += 1;
return TRUE;
}
@@ -74,6 +76,7 @@
}
fifo->rd = (fifo->rd + 1) % (fifo->size);
+ fifo->count -= 1;
return TRUE;
}
@@ -95,6 +98,7 @@
if (value) {
*value = fifo->data[fifo->wr];
}
+ fifo->count -= 1;
return TRUE;
}
@@ -106,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;
}
diff --git a/libscpi/test/test_fifo.c b/libscpi/test/test_fifo.c
index 25e1b07..40c65c5 100644
--- a/libscpi/test/test_fifo.c
+++ b/libscpi/test/test_fifo.c
@@ -25,8 +25,8 @@
static void testFifo() {
scpi_fifo_t fifo;
- int16_t fifo_data[5];
- fifo_init(&fifo, fifo_data, 5);
+ int16_t fifo_data[4];
+ fifo_init(&fifo, fifo_data, 4);
int16_t value;
#define TEST_FIFO_COUNT(n) \
diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c
index 6e27e20..9ed0f27 100644
--- a/libscpi/test/test_parser.c
+++ b/libscpi/test/test_parser.c
@@ -171,7 +171,7 @@
#define SCPI_INPUT_BUFFER_LENGTH 256
static char scpi_input_buffer[SCPI_INPUT_BUFFER_LENGTH];
-#define SCPI_ERROR_QUEUE_SIZE 5
+#define SCPI_ERROR_QUEUE_SIZE 4
static int16_t scpi_error_queue_data[SCPI_ERROR_QUEUE_SIZE];
static int init_suite(void) {
--
Gitblit v1.9.1