From e098c2b8d02db042d701480760ee664eae5c0ce1 Mon Sep 17 00:00:00 2001 From: Jan Breuer <jan.breuer@jaybee.cz> Date: 周二, 22 10月 2013 18:04:54 +0800 Subject: [PATCH] Merge strncasecmp detection from 'master' --- libscpi/src/minimal.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/libscpi/src/minimal.c b/libscpi/src/minimal.c index c133fe6..eab2624 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_ResultInt(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_ResultText(context, SCPI_DEV_VERSION); return SCPI_RES_OK; } @@ -102,10 +102,10 @@ * @return */ scpi_result_t SCPI_StatusQuestionableEventQ(scpi_t * context) { - // return value + /* return value */ SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_QUES)); - // clear register + /* clear register */ SCPI_RegSet(context, SCPI_REG_QUES, 0); return SCPI_RES_OK; @@ -117,7 +117,7 @@ * @return */ scpi_result_t SCPI_StatusQuestionableEnableQ(scpi_t * context) { - // return value + /* return value */ SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_QUESE)); return SCPI_RES_OK; @@ -129,10 +129,11 @@ * @return */ 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); + scpi_parameter_t parameter; + if (SCPI_Parameter(context, ¶meter, TRUE)) { + SCPI_RegSet(context, SCPI_REG_QUESE, SCPI_ParamGetIntVal(context, ¶meter)); } + return SCPI_RES_OK; } @@ -142,7 +143,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