From 2140d423dc485e5d1f3ae2c2aa39d7e28a6069ac Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 19 2月 2016 23:01:08 +0800
Subject: [PATCH] Fix #74 bad handling of incomplete ARB data
---
libscpi/src/error.c | 69 ++++++++++------------------------
1 files changed, 20 insertions(+), 49 deletions(-)
diff --git a/libscpi/src/error.c b/libscpi/src/error.c
index 34735d2..9d8e756 100644
--- a/libscpi/src/error.c
+++ b/libscpi/src/error.c
@@ -41,23 +41,12 @@
#include "scpi/error.h"
#include "fifo_private.h"
-/* basic FIFO */
-static scpi_fifo_t local_error_queue;
-
-
/**
* Initialize error queue
* @param context - scpi context
*/
-void SCPI_ErrorInit(scpi_t * context) {
- /*
- * // FreeRTOS
- * context->error_queue = (scpi_error_queue_t)xQueueCreate(100, sizeof(int16_t));
- */
-
- /* basic FIFO */
- context->error_queue = (scpi_error_queue_t)&local_error_queue;
- fifo_init((scpi_fifo_t *)context->error_queue);
+void SCPI_ErrorInit(scpi_t * context, int16_t * data, int16_t size) {
+ fifo_init(&context->error_queue, data, size);
}
/**
@@ -92,13 +81,7 @@
* @param context - scpi context
*/
void SCPI_ErrorClear(scpi_t * context) {
- /*
- * // FreeRTOS
- * xQueueReset((xQueueHandle)context->error_queue);
- */
-
- /* basic FIFO */
- fifo_clear((scpi_fifo_t *)context->error_queue);
+ fifo_clear(&context->error_queue);
SCPI_ErrorEmitEmpty(context);
}
@@ -111,15 +94,7 @@
int16_t SCPI_ErrorPop(scpi_t * context) {
int16_t result = 0;
- /*
- * // FreeRTOS
- * if (pdFALSE == xQueueReceive((xQueueHandle)context->error_queue, &result, 0)) {
- * result = 0;
- * }
- */
-
- /* basic FIFO */
- fifo_remove((scpi_fifo_t *)context->error_queue, &result);
+ fifo_remove(&context->error_queue, &result);
SCPI_ErrorEmitEmpty(context);
@@ -134,25 +109,18 @@
int32_t SCPI_ErrorCount(scpi_t * context) {
int16_t result = 0;
- /*
- * // FreeRTOS
- * result = uxQueueMessagesWaiting((xQueueHandle)context->error_queue);
- */
-
- /* basic FIFO */
- fifo_count((scpi_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((scpi_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 {
@@ -167,7 +135,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 */
@@ -184,15 +152,18 @@
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);
}
}
SCPI_ErrorEmit(context, err);
+ if (queue_overflow) {
+ SCPI_ErrorEmit(context, SCPI_ERROR_QUEUE_OVERFLOW);
+ }
if (context) {
context->cmd_error = TRUE;
@@ -213,10 +184,10 @@
#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
--
Gitblit v1.9.1