From b9972c6b63937373ea9db39249b3f23985758425 Mon Sep 17 00:00:00 2001
From: Iztok Jeras <iztok.jeras@redpitaya.com>
Date: ćšć, 08 10æ 2015 03:00:34 +0800
Subject: [PATCH] integer parser: added 64 bit Param* functions
---
libscpi/src/error.c | 221 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 129 insertions(+), 92 deletions(-)
diff --git a/libscpi/src/error.c b/libscpi/src/error.c
index 493b623..34735d2 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>
@@ -39,20 +39,52 @@
#include "scpi/parser.h"
#include "scpi/ieee488.h"
#include "scpi/error.h"
-#include "scpi/fifo.h"
+#include "fifo_private.h"
-// basic FIFO
-static fifo_t local_error_queue;
+/* 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
+ /*
+ * // 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((fifo_t *)context->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);
+ }
}
/**
@@ -60,11 +92,15 @@
* @param context - scpi context
*/
void SCPI_ErrorClear(scpi_t * context) {
- //// FreeRTOS
- //xQueueReset((xQueueHandle)context->error_queue);
-
- // basic FIFO
- fifo_clear((fifo_t *)context->error_queue);
+ /*
+ * // FreeRTOS
+ * xQueueReset((xQueueHandle)context->error_queue);
+ */
+
+ /* basic FIFO */
+ fifo_clear((scpi_fifo_t *)context->error_queue);
+
+ SCPI_ErrorEmitEmpty(context);
}
/**
@@ -74,14 +110,18 @@
*/
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((fifo_t *)context->error_queue, &result);
+
+ /*
+ * // FreeRTOS
+ * if (pdFALSE == xQueueReceive((xQueueHandle)context->error_queue, &result, 0)) {
+ * result = 0;
+ * }
+ */
+
+ /* basic FIFO */
+ fifo_remove((scpi_fifo_t *)context->error_queue, &result);
+
+ SCPI_ErrorEmitEmpty(context);
return result;
}
@@ -89,81 +129,72 @@
/**
* 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);
-
-
+
+ /*
+ * // FreeRTOS
+ * result = uxQueueMessagesWaiting((xQueueHandle)context->error_queue);
+ */
+
+ /* basic FIFO */
+ fifo_count((scpi_fifo_t *)context->error_queue, &result);
+
return result;
}
-static void SCPI_ErrorPushInternal(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 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);
}
+
+struct error_reg {
+ int16_t from;
+ int16_t to;
+ scpi_reg_val_t bit;
+};
+
+#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 */
+ {-700, -799, ESR_REQ}, /* Request Control Event -700, -799 ch 21.8.15 */
+ {-800, -899, ESR_OPC}, /* Operation Complete Event -800, -899 ch 21.8.16 */
+};
+
/**
* Push error to queue
* @param context - scpi context
* @param err - error number
*/
void SCPI_ErrorPush(scpi_t * context, int16_t err) {
- SCPI_ErrorPushInternal(context, err);
-
- // Command error (e.g. syntax error) ch 21.8.9
- if ((err < -100) && (err > -199)) {
- SCPI_RegSetBits(context, SCPI_REG_ESR, ESR_CER);
+
+ int i;
+
+ SCPI_ErrorAddInternal(context, err);
+
+ 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);
+ }
}
- // Execution Error (e.g. range error) ch 21.8.10
- if ((err < -200) && (err > -299)) {
- SCPI_RegSetBits(context, SCPI_REG_ESR, ESR_EER);
- }
-
- // Device specific error -300, -399 ch 21.8.11
- if ((err < -300) && (err > -399)) {
- SCPI_RegSetBits(context, SCPI_REG_ESR, ESR_DER);
- }
-
- // Query error -400, -499 ch 21.8.12
- if ((err < -400) && (err > -499)) {
- SCPI_RegSetBits(context, SCPI_REG_ESR, ESR_QER);
- }
-
- // Power on event -500, -599 ch 21.8.13
- if ((err < -500) && (err > -599)) {
- SCPI_RegSetBits(context, SCPI_REG_ESR, ESR_PON);
- }
-
- // User Request Event -600, -699 ch 21.8.14
- if ((err < -600) && (err > -699)) {
- SCPI_RegSetBits(context, SCPI_REG_ESR, ESR_URQ);
- }
-
- // Request Control Event -700, -799 ch 21.8.15
- if ((err < -700) && (err > -799)) {
- SCPI_RegSetBits(context, SCPI_REG_ESR, ESR_REQ);
- }
-
- // Operation Complete Event -800, -899 ch 21.8.16
- if ((err < -800) && (err > -899)) {
- SCPI_RegSetBits(context, SCPI_REG_ESR, ESR_OPC);
- }
+ SCPI_ErrorEmit(context, err);
if (context) {
- if (context->interface && context->interface->error) {
- context->interface->error(context, err);
- }
-
context->cmd_error = TRUE;
}
}
@@ -176,13 +207,19 @@
const char * SCPI_ErrorTranslate(int16_t err) {
switch (err) {
case 0: return "No error";
- case SCPI_ERROR_SYNTAX: return "Syntax error";
- case SCPI_ERROR_INVALID_SEPARATOR: return "Invalid separator";
- case SCPI_ERROR_UNDEFINED_HEADER: return "Undefined header";
- case SCPI_ERROR_PARAMETER_NOT_ALLOWED: return "Parameter not allowed";
- case SCPI_ERROR_MISSING_PARAMETER: return "Missing parameter";
- case SCPI_ERROR_INVALID_SUFFIX: return "Invalid suffix";
- case SCPI_ERROR_SUFFIX_NOT_ALLOWED: return "Suffix not allowed";
+#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
+
+#if USE_USER_ERROR_LIST
+LIST_OF_USER_ERRORS
+#endif
+#undef X
+#undef XE
default: return "Unknown error";
}
}
--
Gitblit v1.9.1