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/minimal.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/libscpi/src/minimal.c b/libscpi/src/minimal.c
index c133fe6..7641311 100644
--- a/libscpi/src/minimal.c
+++ b/libscpi/src/minimal.c
@@ -57,7 +57,7 @@
* @return
*/
scpi_result_t SCPI_StubQ(scpi_t * context) {
- SCPI_ResultString(context, "");
+ SCPI_ResultInt32(context, 0);
return SCPI_RES_OK;
}
@@ -67,7 +67,7 @@
* @return
*/
scpi_result_t SCPI_SystemVersionQ(scpi_t * context) {
- SCPI_ResultString(context, SCPI_DEV_VERSION);
+ SCPI_ResultMnemonic(context, SCPI_STD_VERSION_REVISION);
return SCPI_RES_OK;
}
@@ -79,7 +79,7 @@
scpi_result_t SCPI_SystemErrorNextQ(scpi_t * context) {
int16_t err = SCPI_ErrorPop(context);
- SCPI_ResultInt(context, err);
+ SCPI_ResultInt32(context, err);
SCPI_ResultText(context, SCPI_ErrorTranslate(err));
return SCPI_RES_OK;
@@ -91,7 +91,7 @@
* @return
*/
scpi_result_t SCPI_SystemErrorCountQ(scpi_t * context) {
- SCPI_ResultInt(context, SCPI_ErrorCount(context));
+ SCPI_ResultInt32(context, SCPI_ErrorCount(context));
return SCPI_RES_OK;
}
@@ -102,10 +102,10 @@
* @return
*/
scpi_result_t SCPI_StatusQuestionableEventQ(scpi_t * context) {
- // return value
- SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_QUES));
+ /* return value */
+ SCPI_ResultInt32(context, SCPI_RegGet(context, SCPI_REG_QUES));
- // clear register
+ /* clear register */
SCPI_RegSet(context, SCPI_REG_QUES, 0);
return SCPI_RES_OK;
@@ -117,8 +117,8 @@
* @return
*/
scpi_result_t SCPI_StatusQuestionableEnableQ(scpi_t * context) {
- // return value
- SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_QUESE));
+ /* return value */
+ SCPI_ResultInt32(context, SCPI_RegGet(context, SCPI_REG_QUESE));
return SCPI_RES_OK;
}
@@ -130,8 +130,8 @@
*/
scpi_result_t SCPI_StatusQuestionableEnable(scpi_t * context) {
int32_t new_QUESE;
- if (SCPI_ParamInt(context, &new_QUESE, TRUE)) {
- SCPI_RegSet(context, SCPI_REG_QUESE, new_QUESE);
+ if (SCPI_ParamInt32(context, &new_QUESE, TRUE)) {
+ SCPI_RegSet(context, SCPI_REG_QUESE, (scpi_reg_val_t) new_QUESE);
}
return SCPI_RES_OK;
}
@@ -142,7 +142,7 @@
* @return
*/
scpi_result_t SCPI_StatusPreset(scpi_t * context) {
- // clear STATUS:...
+ /* clear STATUS:... */
SCPI_RegSet(context, SCPI_REG_QUES, 0);
return SCPI_RES_OK;
}
--
Gitblit v1.9.1