From 34d681a00a7fc3c8d82a5ba3082dd5524f2a8389 Mon Sep 17 00:00:00 2001
From: Chernov Dmitriy <cd_work@mail.ru>
Date: 周二, 01 3月 2016 21:26:22 +0800
Subject: [PATCH] The basic implementation completed. Tests are needed. (issue #73)
---
libscpi/src/error.c | 38 ++++----------------------------------
1 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/libscpi/src/error.c b/libscpi/src/error.c
index 7b17f4c..d1307a4 100644
--- a/libscpi/src/error.c
+++ b/libscpi/src/error.c
@@ -98,8 +98,8 @@
* @param error
* @return
*/
-scpi_bool_t SCPI_ErrorPopEx(scpi_t * context, scpi_error_t * error) {
- if(!error) return FALSE;
+scpi_bool_t SCPI_ErrorPop(scpi_t * context, scpi_error_t * error) {
+ if(!error || !context) return FALSE;
error->error_code = 0;
error->device_dependent_info = NULL;
fifo_remove(&context->error_queue, error);
@@ -107,20 +107,6 @@
SCPI_ErrorEmitEmpty(context);
return TRUE;
-}
-/**
- * Pop error from queue
- * @param context - scpi context
- * @return error number
- */
-int16_t SCPI_ErrorPop(scpi_t * context) {
- int16_t result = 0;
-
- fifo_remove(&context->error_queue, &result);
-
- SCPI_ErrorEmitEmpty(context);
-
- return result;
}
/**
@@ -191,7 +177,9 @@
SCPI_ErrorEmit(context, err);
if (queue_overflow) {
SCPI_ErrorEmit(context, SCPI_ERROR_QUEUE_OVERFLOW);
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
SCPIDEFINE_free(&context->error_info_heap, info_ptr, true);
+#endif
}
if (context) {
@@ -207,24 +195,6 @@
void SCPI_ErrorPush(scpi_t * context, int16_t err) {
SCPI_ErrorPushEx(context, err, NULL);
return;
- //int i;
-//
- //scpi_bool_t queue_overflow = !SCPI_ErrorAddInternal(context, err, NULL);
-//
- //for (i = 0; i < ERROR_DEFS_N; i++) {
- //if ((err <= errs[i].from) && (err >= errs[i].to)) {
- //SCPI_RegSetBits(context, SCPI_REG_ESR, errs[i].bit);
- //}
- //}
-//
- //SCPI_ErrorEmit(context, err);
- //if (queue_overflow) {
- //SCPI_ErrorEmit(context, SCPI_ERROR_QUEUE_OVERFLOW);
- //}
-//
- //if (context) {
- //context->cmd_error = TRUE;
- //}
}
/**
--
Gitblit v1.9.1