From 6a42b4fe28ba78e6f57416d943c96e61f540c1e4 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 18 4月 2016 00:11:03 +0800
Subject: [PATCH] Fix compilation under Microchip C32/XC32 (issue #75)
---
libscpi/src/minimal.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libscpi/src/minimal.c b/libscpi/src/minimal.c
index dd18ba1..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_ResultInt(context, 0);
+ SCPI_ResultInt32(context, 0);
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;
}
@@ -103,7 +103,7 @@
*/
scpi_result_t SCPI_StatusQuestionableEventQ(scpi_t * context) {
/* return value */
- SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_QUES));
+ SCPI_ResultInt32(context, SCPI_RegGet(context, SCPI_REG_QUES));
/* clear register */
SCPI_RegSet(context, SCPI_REG_QUES, 0);
@@ -118,7 +118,7 @@
*/
scpi_result_t SCPI_StatusQuestionableEnableQ(scpi_t * context) {
/* return value */
- SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_QUESE));
+ 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, (scpi_reg_val_t)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;
}
--
Gitblit v1.9.1