From be3350c620036306fb5f2db3535cb110f187d5e8 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 24 9月 2014 23:46:36 +0800
Subject: [PATCH] Refactor token_t and token_type_t to have scpi_ prefix
---
libscpi/src/fifo.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/libscpi/src/fifo.c b/libscpi/src/fifo.c
index 7c80c9f..600cf1a 100644
--- a/libscpi/src/fifo.c
+++ b/libscpi/src/fifo.c
@@ -1,5 +1,5 @@
-#include "scpi/fifo.h"
+#include "fifo_private.h"
void fifo_init(fifo_t * fifo) {
fifo->wr = 0;
@@ -12,10 +12,10 @@
fifo->rd = 0;
}
-bool_t fifo_push(fifo_t * fifo, int16_t value) {
+scpi_bool_t fifo_add(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 +24,22 @@
return TRUE;
}
-bool_t fifo_pop(fifo_t * fifo, int16_t * value) {
+scpi_bool_t fifo_remove(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) {
+scpi_bool_t fifo_count(fifo_t * fifo, int16_t * value) {
*value = fifo->wr - fifo->rd;
if (*value < 0) {
*value += (fifo->size + 1);
--
Gitblit v1.9.1