From ed07df16da675c4c123e02a996822daf13d69c63 Mon Sep 17 00:00:00 2001 From: lhoerl <coder@lolux.de> Date: 周一, 03 8月 2015 22:42:07 +0800 Subject: [PATCH] added full SCPI error messages added list for device dependent error messages some minor changes to get rid of compiler warnings added support for Keil ARM compiler added support for National Instruments CVI compiler removed bug if(c = '\0')... --- libscpi/src/fifo_private.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libscpi/src/fifo_private.h b/libscpi/src/fifo_private.h index 2e43335..20dff74 100644 --- a/libscpi/src/fifo_private.h +++ b/libscpi/src/fifo_private.h @@ -47,19 +47,19 @@ #define FIFO_SIZE 16 - struct _fifo_t { + struct _scpi_fifo_t { int16_t wr; int16_t rd; int16_t size; int16_t data[FIFO_SIZE]; }; - typedef struct _fifo_t fifo_t; + typedef struct _scpi_fifo_t scpi_fifo_t; - void fifo_init(fifo_t * fifo) LOCAL; - void fifo_clear(fifo_t * fifo) LOCAL; - scpi_bool_t fifo_add(fifo_t * fifo, int16_t value) LOCAL; - scpi_bool_t fifo_remove(fifo_t * fifo, int16_t * value) LOCAL; - scpi_bool_t fifo_count(fifo_t * fifo, int16_t * value) LOCAL; + void fifo_init(scpi_fifo_t * fifo) LOCAL; + void fifo_clear(scpi_fifo_t * fifo) LOCAL; + scpi_bool_t fifo_add(scpi_fifo_t * fifo, int16_t value) LOCAL; + scpi_bool_t fifo_remove(scpi_fifo_t * fifo, int16_t * value) LOCAL; + scpi_bool_t fifo_count(scpi_fifo_t * fifo, int16_t * value) LOCAL; #ifdef __cplusplus } -- Gitblit v1.9.1