From fbd16b32739a35ed3d3cf7e9aa4cfb6a75758e46 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 14 2月 2016 00:32:42 +0800
Subject: [PATCH] Fix fifo length (issue #66)
---
libscpi/src/error.c | 122 ++++++++++++++++++++++------------------
1 files changed, 68 insertions(+), 54 deletions(-)
diff --git a/libscpi/src/error.c b/libscpi/src/error.c
index d9dddeb..9d8e756 100644
--- a/libscpi/src/error.c
+++ b/libscpi/src/error.c
@@ -2,7 +2,7 @@
* Copyright (c) 2012-2013 Jan Breuer,
*
* All Rights Reserved
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
@@ -11,7 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -28,10 +28,10 @@
/**
* @file scpi_error.c
* @date Thu Nov 15 10:58:45 UTC 2012
- *
+ *
* @brief Error handling and storing routines
- *
- *
+ *
+ *
*/
#include <stdint.h>
@@ -41,20 +41,39 @@
#include "scpi/error.h"
#include "fifo_private.h"
-/* basic FIFO */
-static fifo_t local_error_queue;
+/**
+ * Initialize error queue
+ * @param context - scpi context
+ */
+void SCPI_ErrorInit(scpi_t * context, int16_t * data, int16_t size) {
+ fifo_init(&context->error_queue, data, size);
+}
+/**
+ * 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);
+ }
+ }
+}
-void SCPI_ErrorInit(scpi_t * context) {
- /*
- * // FreeRTOS
- * context->error_queue = (scpi_error_queue_t)xQueueCreate(100, sizeof(int16_t));
- */
+/**
+ * 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);
- /* basic FIFO */
- context->error_queue = (scpi_error_queue_t)&local_error_queue;
- fifo_init((fifo_t *)context->error_queue);
+ if (context->interface && context->interface->error) {
+ context->interface->error(context, err);
+ }
}
/**
@@ -62,13 +81,9 @@
* @param context - scpi context
*/
void SCPI_ErrorClear(scpi_t * context) {
- /*
- * // FreeRTOS
- * xQueueReset((xQueueHandle)context->error_queue);
- */
+ fifo_clear(&context->error_queue);
- /* basic FIFO */
- fifo_clear((fifo_t *)context->error_queue);
+ SCPI_ErrorEmitEmpty(context);
}
/**
@@ -79,15 +94,9 @@
int16_t SCPI_ErrorPop(scpi_t * context) {
int16_t result = 0;
- /*
- * // FreeRTOS
- * if (pdFALSE == xQueueReceive((xQueueHandle)context->error_queue, &result, 0)) {
- * result = 0;
- * }
- */
+ fifo_remove(&context->error_queue, &result);
- /* basic FIFO */
- fifo_remove((fifo_t *)context->error_queue, &result);
+ SCPI_ErrorEmitEmpty(context);
return result;
}
@@ -95,30 +104,23 @@
/**
* Return number of errors/events in the queue
* @param context
- * @return
+ * @return
*/
int32_t SCPI_ErrorCount(scpi_t * context) {
int16_t result = 0;
- /*
- * // FreeRTOS
- * result = uxQueueMessagesWaiting((xQueueHandle)context->error_queue);
- */
-
- /* basic FIFO */
- fifo_count((fifo_t *)context->error_queue, &result);
+ fifo_count(&context->error_queue, &result);
return result;
}
-static void SCPI_ErrorAddInternal(scpi_t * context, int16_t err) {
- /*
- * // FreeRTOS
- * xQueueSend((xQueueHandle)context->error_queue, &err, 0);
- */
-
- /* basic FIFO */
- fifo_add((fifo_t *)context->error_queue, err);
+static scpi_bool_t SCPI_ErrorAddInternal(scpi_t * context, int16_t err) {
+ if (!fifo_add(&context->error_queue, err)) {
+ fifo_remove_last(&context->error_queue, NULL);
+ fifo_add(&context->error_queue, SCPI_ERROR_QUEUE_OVERFLOW);
+ return FALSE;
+ }
+ return TRUE;
}
struct error_reg {
@@ -127,12 +129,13 @@
scpi_reg_val_t bit;
};
-#define ERROR_DEFS_N 8
+#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 */
{-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 */
{-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 */
@@ -149,19 +152,20 @@
int i;
- SCPI_ErrorAddInternal(context, err);
+ scpi_bool_t queue_overflow = !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 (queue_overflow) {
+ SCPI_ErrorEmit(context, SCPI_ERROR_QUEUE_OVERFLOW);
+ }
+ if (context) {
context->cmd_error = TRUE;
}
}
@@ -174,9 +178,19 @@
const char * SCPI_ErrorTranslate(int16_t err) {
switch (err) {
case 0: return "No error";
- #define X(def, val, str) case def: return str;
+#define X(def, val, str) case def: return str;
+#if USE_FULL_ERROR_LIST
+#define XE X
+#else
+#define XE(def, val, str)
+#endif
LIST_OF_ERRORS
- #undef X
+
+#if USE_USER_ERROR_LIST
+ LIST_OF_USER_ERRORS
+#endif
+#undef X
+#undef XE
default: return "Unknown error";
}
}
--
Gitblit v1.9.1