From 06b8e466fd5db6f6df344764ac5832587d03c126 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 07 7月 2017 21:03:33 +0800
Subject: [PATCH] Merge pull request #86 from RedPitaya/master
---
libscpi/src/error.c | 132 ++++++++++++++++++--------------------------
1 files changed, 54 insertions(+), 78 deletions(-)
diff --git a/libscpi/src/error.c b/libscpi/src/error.c
index 7b17f4c..f5f4699 100644
--- a/libscpi/src/error.c
+++ b/libscpi/src/error.c
@@ -40,6 +40,13 @@
#include "scpi/ieee488.h"
#include "scpi/error.h"
#include "fifo_private.h"
+#include "scpi/constants.h"
+
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+#define SCPI_ERROR_SETVAL(e, c, i) do { (e)->error_code = (c); (e)->device_dependent_info = (i); } while(0)
+#else
+#define SCPI_ERROR_SETVAL(e, c, i) do { (e)->error_code = (c); (void)(i);} while(0)
+#endif
/**
* Initialize error queue
@@ -82,11 +89,11 @@
*/
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
+ 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);
@@ -96,31 +103,16 @@
* Pop error from queue
* @param context - scpi context
* @param error
- * @return
+ * @return
*/
-scpi_bool_t SCPI_ErrorPopEx(scpi_t * context, scpi_error_t * error) {
- if(!error) return FALSE;
- error->error_code = 0;
- error->device_dependent_info = NULL;
- fifo_remove(&context->error_queue, error);
-
- 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_bool_t SCPI_ErrorPop(scpi_t * context, scpi_error_t * error) {
+ if (!error || !context) return FALSE;
+ SCPI_ERROR_SETVAL(error, 0, NULL);
+ fifo_remove(&context->error_queue, error);
SCPI_ErrorEmitEmpty(context);
- return result;
+ return TRUE;
}
/**
@@ -136,10 +128,16 @@
return result;
}
-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);
+static scpi_bool_t SCPI_ErrorAddInternal(scpi_t * context, int16_t err, char * info, size_t info_len) {
+ scpi_error_t error_value;
+ char * info_ptr = info ? SCPIDEFINE_strndup(&context->error_info_heap, info, info_len) : NULL;
+ SCPI_ERROR_SETVAL(&error_value, err, info_ptr);
+ if (!fifo_add(&context->error_queue, &error_value)) {
+ SCPIDEFINE_free(&context->error_info_heap, error_value.device_dependent_info, true);
+ fifo_remove_last(&context->error_queue, &error_value);
+ SCPIDEFINE_free(&context->error_info_heap, error_value.device_dependent_info, true);
+ SCPI_ERROR_SETVAL(&error_value, SCPI_ERROR_QUEUE_OVERFLOW, NULL);
+ fifo_add(&context->error_queue, &error_value);
return FALSE;
}
return TRUE;
@@ -148,10 +146,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 */
@@ -167,36 +165,33 @@
/**
* Push error to queue
- * @param context - scpi context
+ * @param context
* @param err - error number
+ * @param info - additional text information or NULL for no text
+ * @param info_len - length of text or 0 for automatic length
*/
-void SCPI_ErrorPushEx(scpi_t * context, int16_t err, char * info) {
- int i;
- char * info_ptr = NULL;
-
-#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
- if (info){
- info_ptr = SCPIDEFINE_strdup(&context->error_info_heap, info);
- }
-#endif
+void SCPI_ErrorPushEx(scpi_t * context, int16_t err, char * info, size_t info_len) {
+ int i;
+ /* automatic calculation of length */
+ if (info && info_len == 0) {
+ info_len = SCPIDEFINE_strnlen(info, SCPI_STD_ERROR_DESC_MAX_STRING_LENGTH);
+ }
+ scpi_bool_t queue_overflow = !SCPI_ErrorAddInternal(context, err, info, info_len);
- scpi_bool_t queue_overflow = !SCPI_ErrorAddInternal(context, err, info_ptr);
+ 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);
+ }
+ }
- 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);
+ }
- SCPI_ErrorEmit(context, err);
- if (queue_overflow) {
- SCPI_ErrorEmit(context, SCPI_ERROR_QUEUE_OVERFLOW);
- SCPIDEFINE_free(&context->error_info_heap, info_ptr, true);
- }
-
- if (context) {
- context->cmd_error = TRUE;
- }
+ if (context) {
+ context->cmd_error = TRUE;
+ }
}
/**
@@ -205,26 +200,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, 0);
+ return;
}
/**
@@ -234,7 +211,6 @@
*/
const char * SCPI_ErrorTranslate(int16_t err) {
switch (err) {
- case 0: return "No error";
#define X(def, val, str) case def: return str;
#if USE_FULL_ERROR_LIST
#define XE X
--
Gitblit v1.9.1