From f275a91132d30c7f558079017c97d33a01758059 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周六, 18 4月 2015 17:02:13 +0800
Subject: [PATCH] Export matchCommand by SCPI_Match - resolve #30
---
libscpi/src/ieee488.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/libscpi/src/ieee488.c b/libscpi/src/ieee488.c
index 789613b..7ed8bc8 100644
--- a/libscpi/src/ieee488.c
+++ b/libscpi/src/ieee488.c
@@ -98,7 +98,7 @@
* @param val - new value
*/
void SCPI_RegSet(scpi_t * context, scpi_reg_name_t name, scpi_reg_val_t val) {
- bool_t srq = FALSE;
+ scpi_bool_t srq = FALSE;
scpi_reg_val_t mask;
scpi_reg_val_t old_val;
@@ -250,10 +250,14 @@
* @return
*/
scpi_result_t SCPI_CoreIdnQ(scpi_t * context) {
- SCPI_ResultString(context, context->idn[0]);
- SCPI_ResultString(context, context->idn[1]);
- SCPI_ResultString(context, context->idn[2]);
- SCPI_ResultString(context, context->idn[3]);
+ int i;
+ for (i = 0; i<4; i++) {
+ if (context->idn[i]) {
+ SCPI_ResultString(context, context->idn[i]);
+ } else {
+ SCPI_ResultString(context, "0");
+ }
+ }
return SCPI_RES_OK;
}
@@ -331,7 +335,7 @@
scpi_result_t SCPI_CoreTstQ(scpi_t * context) {
int result = 0;
if (context && context->interface && context->interface->test) {
- result = context->interface->test(context);
+ result = context->interface->test(context) == SCPI_RES_OK ? 0 : 1;
}
SCPI_ResultInt(context, result);
return SCPI_RES_OK;
--
Gitblit v1.9.1