From 148070985fd49efeebfb3a93865a6503d8b1dd4c Mon Sep 17 00:00:00 2001
From: Chernov Dmitriy <cd_work@mail.ru>
Date: 周一, 29 2月 2016 16:01:24 +0800
Subject: [PATCH] strdup(malloc)/free ready.
---
libscpi/src/fifo.c | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/libscpi/src/fifo.c b/libscpi/src/fifo.c
index a64d351..6c125ff 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,26 @@
* @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, int16_t err, char * info) {
/* FIFO full? */
if (fifo_is_full(fifo)) {
return FALSE;
}
- fifo->data[fifo->wr] = value;
+ fifo->data[fifo->wr].error_code = err;
+ fifo->data[fifo->wr].device_dependent_info = info;
fifo->wr = (fifo->wr + 1) % (fifo->size);
-
+ fifo->count += 1;
return TRUE;
}
@@ -62,7 +67,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 +78,7 @@
}
fifo->rd = (fifo->rd + 1) % (fifo->size);
+ fifo->count -= 1;
return TRUE;
}
@@ -83,7 +89,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 +100,7 @@
if (value) {
*value = fifo->data[fifo->wr];
}
+ fifo->count -= 1;
return TRUE;
}
@@ -105,9 +112,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