From b5e8e4dc2bdeca39195a78d8d7f01bd7f099923c Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 13 11月 2015 18:54:29 +0800
Subject: [PATCH] Resolve #65: Cast char to unsigned in isctype functions
---
libscpi/src/error.c | 60 ++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/libscpi/src/error.c b/libscpi/src/error.c
index d856db3..df3db2c 100644
--- a/libscpi/src/error.c
+++ b/libscpi/src/error.c
@@ -44,7 +44,6 @@
/* basic FIFO */
static scpi_fifo_t local_error_queue;
-
/**
* Initialize error queue
* @param context - scpi context
@@ -56,8 +55,35 @@
*/
/* basic FIFO */
- context->error_queue = (scpi_error_queue_t)&local_error_queue;
- fifo_init((scpi_fifo_t *)context->error_queue);
+ context->error_queue = (scpi_error_queue_t) & local_error_queue;
+ fifo_init((scpi_fifo_t *) context->error_queue);
+}
+
+/**
+ * Emit no error
+ * @param context scpi context
+ */
+static void SCPI_ErrorEmitEmpty(scpi_t * context) {
+ if ((SCPI_ErrorCount(context) == 0) && (SCPI_RegGet(context, SCPI_REG_STB) & STB_QMA)) {
+ SCPI_RegClearBits(context, SCPI_REG_STB, STB_QMA);
+
+ if (context->interface && context->interface->error) {
+ context->interface->error(context, 0);
+ }
+ }
+}
+
+/**
+ * Emit error
+ * @param context scpi context
+ * @param err Error to emit
+ */
+static void SCPI_ErrorEmit(scpi_t * context, int16_t err) {
+ SCPI_RegSetBits(context, SCPI_REG_STB, STB_QMA);
+
+ if (context->interface && context->interface->error) {
+ context->interface->error(context, err);
+ }
}
/**
@@ -71,7 +97,9 @@
*/
/* basic FIFO */
- fifo_clear((scpi_fifo_t *)context->error_queue);
+ fifo_clear((scpi_fifo_t *) context->error_queue);
+
+ SCPI_ErrorEmitEmpty(context);
}
/**
@@ -90,7 +118,9 @@
*/
/* basic FIFO */
- fifo_remove((scpi_fifo_t *)context->error_queue, &result);
+ fifo_remove((scpi_fifo_t *) context->error_queue, &result);
+
+ SCPI_ErrorEmitEmpty(context);
return result;
}
@@ -109,7 +139,7 @@
*/
/* basic FIFO */
- fifo_count((scpi_fifo_t *)context->error_queue, &result);
+ fifo_count((scpi_fifo_t *) context->error_queue, &result);
return result;
}
@@ -121,7 +151,7 @@
*/
/* basic FIFO */
- fifo_add((scpi_fifo_t *)context->error_queue, err);
+ fifo_add((scpi_fifo_t *) context->error_queue, err);
}
struct error_reg {
@@ -136,7 +166,7 @@
{-100, -199, ESR_CER}, /* Command error (e.g. syntax error) ch 21.8.9 */
{-200, -299, ESR_EER}, /* Execution Error (e.g. range error) ch 21.8.10 */
{-300, -399, ESR_DER}, /* Device specific error -300, -399 ch 21.8.11 */
- { 1,32767, ESR_DER}, /* Device designer provided specific error 1, 32767 ch 21.8.11 */
+ { 1, 32767, ESR_DER}, /* Device designer provided specific error 1, 32767 ch 21.8.11 */
{-400, -499, ESR_QER}, /* Query error -400, -499 ch 21.8.12 */
{-500, -599, ESR_PON}, /* Power on event -500, -599 ch 21.8.13 */
{-600, -699, ESR_URQ}, /* User Request Event -600, -699 ch 21.8.14 */
@@ -155,17 +185,15 @@
SCPI_ErrorAddInternal(context, err);
- for(i = 0; i < ERROR_DEFS_N; i++) {
+ 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 (context) {
- if (context->interface && context->interface->error) {
- context->interface->error(context, err);
- }
+ SCPI_ErrorEmit(context, err);
+ if (context) {
context->cmd_error = TRUE;
}
}
@@ -184,14 +212,14 @@
#else
#define XE(def, val, str)
#endif
-LIST_OF_ERRORS
+ LIST_OF_ERRORS
#if USE_USER_ERROR_LIST
-LIST_OF_USER_ERRORS
+ LIST_OF_USER_ERRORS
#endif
#undef X
#undef XE
- default: return "Unknown error";
+ default: return "Unknown error";
}
}
--
Gitblit v1.9.1