From 83847012f9b0a0d479725d4741c551c88d7035c2 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周六, 25 4月 2015 22:54:36 +0800
Subject: [PATCH] Solve #16 Multiple Identical Capabilities
---
libscpi/src/error.c | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/libscpi/src/error.c b/libscpi/src/error.c
index b85fa56..da0398e 100644
--- a/libscpi/src/error.c
+++ b/libscpi/src/error.c
@@ -39,13 +39,16 @@
#include "scpi/parser.h"
#include "scpi/ieee488.h"
#include "scpi/error.h"
-#include "scpi/fifo.h"
+#include "fifo_private.h"
/* basic FIFO */
-static fifo_t local_error_queue;
+static scpi_fifo_t local_error_queue;
-
+/**
+ * Initialize error queue
+ * @param context - scpi context
+ */
void SCPI_ErrorInit(scpi_t * context) {
/*
* // FreeRTOS
@@ -54,7 +57,7 @@
/* basic FIFO */
context->error_queue = (scpi_error_queue_t)&local_error_queue;
- fifo_init((fifo_t *)context->error_queue);
+ fifo_init((scpi_fifo_t *)context->error_queue);
}
/**
@@ -68,7 +71,7 @@
*/
/* basic FIFO */
- fifo_clear((fifo_t *)context->error_queue);
+ fifo_clear((scpi_fifo_t *)context->error_queue);
}
/**
@@ -87,7 +90,7 @@
*/
/* basic FIFO */
- fifo_remove((fifo_t *)context->error_queue, &result);
+ fifo_remove((scpi_fifo_t *)context->error_queue, &result);
return result;
}
@@ -106,7 +109,7 @@
*/
/* basic FIFO */
- fifo_count((fifo_t *)context->error_queue, &result);
+ fifo_count((scpi_fifo_t *)context->error_queue, &result);
return result;
}
@@ -118,7 +121,7 @@
*/
/* basic FIFO */
- fifo_add((fifo_t *)context->error_queue, err);
+ fifo_add((scpi_fifo_t *)context->error_queue, err);
}
struct error_reg {
--
Gitblit v1.9.1