From 3c5ca89152f962e0887bd5cf607c69a52c3dd575 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周二, 31 5月 2016 21:50:42 +0800
Subject: [PATCH] Rework compiler detection, fix SCPI_dtostre length limitation
---
libscpi/src/minimal.c | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/libscpi/src/minimal.c b/libscpi/src/minimal.c
index 7641311..83ecec7 100644
--- a/libscpi/src/minimal.c
+++ b/libscpi/src/minimal.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_minimal.c
* @date Thu Nov 15 10:58:45 UTC 2012
- *
+ *
* @brief SCPI minimal implementation
- *
- *
+ *
+ *
*/
@@ -40,11 +40,12 @@
#include "scpi/constants.h"
#include "scpi/error.h"
#include "scpi/ieee488.h"
+#include "utils_private.h"
/**
* Command stub function
* @param context
- * @return
+ * @return
*/
scpi_result_t SCPI_Stub(scpi_t * context) {
(void) context;
@@ -54,7 +55,7 @@
/**
* Query command stub function
* @param context
- * @return
+ * @return
*/
scpi_result_t SCPI_StubQ(scpi_t * context) {
SCPI_ResultInt32(context, 0);
@@ -64,7 +65,7 @@
/**
* SYSTem:VERSion?
* @param context
- * @return
+ * @return
*/
scpi_result_t SCPI_SystemVersionQ(scpi_t * context) {
SCPI_ResultMnemonic(context, SCPI_STD_VERSION_REVISION);
@@ -74,21 +75,22 @@
/**
* SYSTem:ERRor[:NEXT]?
* @param context
- * @return
+ * @return
*/
scpi_result_t SCPI_SystemErrorNextQ(scpi_t * context) {
- int16_t err = SCPI_ErrorPop(context);
-
- SCPI_ResultInt32(context, err);
- SCPI_ResultText(context, SCPI_ErrorTranslate(err));
-
+ scpi_error_t error;
+ SCPI_ErrorPop(context, &error);
+ SCPI_ResultError(context, &error);
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+ SCPIDEFINE_free(&context->error_info_heap, error.device_dependent_info, false);
+#endif
return SCPI_RES_OK;
}
/**
* SYSTem:ERRor:COUNt?
* @param context
- * @return
+ * @return
*/
scpi_result_t SCPI_SystemErrorCountQ(scpi_t * context) {
SCPI_ResultInt32(context, SCPI_ErrorCount(context));
@@ -99,7 +101,7 @@
/**
* STATus:QUEStionable[:EVENt]?
* @param context
- * @return
+ * @return
*/
scpi_result_t SCPI_StatusQuestionableEventQ(scpi_t * context) {
/* return value */
@@ -114,7 +116,7 @@
/**
* STATus:QUEStionable:ENABle?
* @param context
- * @return
+ * @return
*/
scpi_result_t SCPI_StatusQuestionableEnableQ(scpi_t * context) {
/* return value */
@@ -126,7 +128,7 @@
/**
* STATus:QUEStionable:ENABle
* @param context
- * @return
+ * @return
*/
scpi_result_t SCPI_StatusQuestionableEnable(scpi_t * context) {
int32_t new_QUESE;
@@ -139,7 +141,7 @@
/**
* STATus:PRESet
* @param context
- * @return
+ * @return
*/
scpi_result_t SCPI_StatusPreset(scpi_t * context) {
/* clear STATUS:... */
--
Gitblit v1.9.1