From 219ca4fc80ef6491555b403c6884566c8e1deefd Mon Sep 17 00:00:00 2001
From: Rich Barlow <rich@bennellick.com>
Date: 周一, 10 4月 2017 18:38:40 +0800
Subject: [PATCH] Don't reference malloc if not using alloc/free
---
libscpi/src/fifo_private.h | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/libscpi/src/fifo_private.h b/libscpi/src/fifo_private.h
index 4d37fd6..0bc70fd 100644
--- a/libscpi/src/fifo_private.h
+++ b/libscpi/src/fifo_private.h
@@ -44,22 +44,14 @@
extern "C" {
#endif
-
-#define FIFO_SIZE 16
-
- struct _fifo_t {
- int16_t wr;
- int16_t rd;
- int16_t size;
- int16_t data[FIFO_SIZE];
- };
- typedef struct _fifo_t fifo_t;
-
- void fifo_init(fifo_t * fifo) LOCAL;
- void fifo_clear(fifo_t * fifo) LOCAL;
- bool_t fifo_add(fifo_t * fifo, int16_t value) LOCAL;
- bool_t fifo_remove(fifo_t * fifo, int16_t * value) LOCAL;
- bool_t fifo_count(fifo_t * fifo, int16_t * value) LOCAL;
+ void fifo_init(scpi_fifo_t * fifo, scpi_error_t * data, int16_t size) LOCAL;
+ void fifo_clear(scpi_fifo_t * fifo) LOCAL;
+ scpi_bool_t fifo_is_empty(scpi_fifo_t * fifo) LOCAL;
+ scpi_bool_t fifo_is_full(scpi_fifo_t * fifo) LOCAL;
+ scpi_bool_t fifo_add(scpi_fifo_t * fifo, const scpi_error_t * value) LOCAL;
+ scpi_bool_t fifo_remove(scpi_fifo_t * fifo, scpi_error_t * value) LOCAL;
+ scpi_bool_t fifo_remove_last(scpi_fifo_t * fifo, scpi_error_t * value) LOCAL;
+ scpi_bool_t fifo_count(scpi_fifo_t * fifo, int16_t * value) LOCAL;
#ifdef __cplusplus
}
--
Gitblit v1.9.1