From 360db066bd49b2514669dac7f401932c018db073 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 19 4月 2015 05:22:04 +0800
Subject: [PATCH] Next try to correct avr-libc detection
---
libscpi/src/ieee488.c | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/libscpi/src/ieee488.c b/libscpi/src/ieee488.c
index 2dc0662..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;
@@ -240,13 +240,24 @@
/**
* *IDN?
+ *
+ * field1: MANUFACTURE
+ * field2: MODEL
+ * field4: SUBSYSTEMS REVISIONS
+ *
+ * example: MANUFACTURE,MODEL,0,01-02-01
* @param context
* @return
*/
scpi_result_t SCPI_CoreIdnQ(scpi_t * context) {
- SCPI_ResultString(context, SCPI_MANUFACTURE);
- SCPI_ResultString(context, SCPI_DEV_NAME);
- SCPI_ResultString(context, SCPI_DEV_VERSION);
+ 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;
}
@@ -324,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