From 6092bdc4b163977bb5f31df50e6b2a6def28aac5 Mon Sep 17 00:00:00 2001 From: Chernov Dmitriy <cd_work@mail.ru> Date: ćšć, 25 2æ 2016 21:53:34 +0800 Subject: [PATCH] start #73 --- 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 e81f55e..6c125ff 100644 --- a/libscpi/src/fifo.c +++ b/libscpi/src/fifo.c @@ -5,7 +5,7 @@ * Initialize fifo * @param fifo */ -void fifo_init(scpi_fifo_t * fifo, int16_t * data, int16_t size) { +void fifo_init(scpi_fifo_t * fifo, scpi_error_t * data, int16_t size) { fifo->wr = 0; fifo->rd = 0; fifo->count = 0; @@ -44,16 +44,18 @@ /** * 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; @@ -65,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; @@ -87,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; -- Gitblit v1.9.1