From 3a0d40729383c42af1cef194abc56182955fb9c9 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 24 4月 2016 16:57:16 +0800
Subject: [PATCH] Fix test and examples to work with extended errors
---
libscpi/src/error.c | 108 ++++++++++++++++++++++++++----------------------------
1 files changed, 52 insertions(+), 56 deletions(-)
diff --git a/libscpi/src/error.c b/libscpi/src/error.c
index d69b005..8913ab8 100644
--- a/libscpi/src/error.c
+++ b/libscpi/src/error.c
@@ -81,34 +81,32 @@
* @param context - scpi context
*/
void SCPI_ErrorClear(scpi_t * context) {
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+ scpi_error_t error;
+ while (fifo_remove(&context->error_queue, &error)) {
+ SCPIDEFINE_free(&context->error_info_heap, error.device_dependent_info, false);
+ }
+#endif
fifo_clear(&context->error_queue);
SCPI_ErrorEmitEmpty(context);
}
-
-scpi_bool_t SCPI_ErrorPopEx(scpi_t * context, scpi_error_t * error) {
- if(error == NULL) return FALSE;
-
- fifo_remove(&context->error_queue, error);
-
- SCPI_ErrorEmitEmpty(context);
-
- return TRUE;
-}
/**
* Pop error from queue
* @param context - scpi context
- * @return error number
+ * @param error
+ * @return
*/
-int16_t SCPI_ErrorPop(scpi_t * context) {
- int16_t result = 0;
-
- fifo_remove(&context->error_queue, &result);
+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);
SCPI_ErrorEmitEmpty(context);
- return result;
+ return TRUE;
}
/**
@@ -125,9 +123,15 @@
}
static scpi_bool_t SCPI_ErrorAddInternal(scpi_t * context, int16_t err, char * info) {
- if (!fifo_add(&context->error_queue, err, info)) {
- fifo_remove_last(&context->error_queue, NULL);
- fifo_add(&context->error_queue, SCPI_ERROR_QUEUE_OVERFLOW, NULL);
+ scpi_error_t error_value;
+ error_value.error_code = err;
+ error_value.device_dependent_info = info;
+ if (!fifo_add(&context->error_queue, &error_value)) {
+ fifo_remove_last(&context->error_queue, &error_value);
+ // TODO free device_dependent_info
+ error_value.error_code = SCPI_ERROR_QUEUE_OVERFLOW;
+ error_value.device_dependent_info = NULL;
+ fifo_add(&context->error_queue, &error_value);
return FALSE;
}
return TRUE;
@@ -136,10 +140,10 @@
struct error_reg {
int16_t from;
int16_t to;
- scpi_reg_val_t bit;
+ scpi_reg_val_t esrBit;
};
-#define ERROR_DEFS_N 9
+#define ERROR_DEFS_N 9
static const struct error_reg errs[ERROR_DEFS_N] = {
{-100, -199, ESR_CER}, /* Command error (e.g. syntax error) ch 21.8.9 */
@@ -159,24 +163,34 @@
* @param err - error number
*/
void SCPI_ErrorPushEx(scpi_t * context, int16_t err, char * info) {
- int i;
- char * info_ptr=SCPIDEFINE_strdup(info);
- scpi_bool_t queue_overflow = !SCPI_ErrorAddInternal(context, err, info_ptr);
+ int i;
+ char * info_ptr = 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);
- }
- }
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+ if (info) {
+ info_ptr = SCPIDEFINE_strdup(&context->error_info_heap, info);
+ }
+#endif
- SCPI_ErrorEmit(context, err);
- if (queue_overflow) {
- SCPI_ErrorEmit(context, SCPI_ERROR_QUEUE_OVERFLOW);
- }
+ scpi_bool_t queue_overflow = !SCPI_ErrorAddInternal(context, err, info_ptr);
- if (context) {
- context->cmd_error = TRUE;
- }
+ 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].esrBit);
+ }
+ }
+
+ 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) {
+ context->cmd_error = TRUE;
+ }
}
/**
@@ -185,26 +199,8 @@
* @param err - error number
*/
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;
- }
+ SCPI_ErrorPushEx(context, err, NULL);
+ return;
}
/**
--
Gitblit v1.9.1