From b7e9d6858699f5ea9a23ecf6587e98e7b0e1bc28 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 14 10月 2015 16:49:41 +0800
Subject: [PATCH] Resolve #58: Illegal parameter value and unit test

---
 libscpi/src/ieee488.c |   58 ++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/libscpi/src/ieee488.c b/libscpi/src/ieee488.c
index e3f4629..cd527e3 100644
--- a/libscpi/src/ieee488.c
+++ b/libscpi/src/ieee488.c
@@ -98,13 +98,16 @@
  * @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;
 
     if ((name >= SCPI_REG_COUNT) || (context->registers == NULL)) {
         return;
     }
-    
+
+    /* store old register value */
+    old_val = context->registers[name];
 
     /* set register value */
     context->registers[name] = val;
@@ -116,7 +119,10 @@
             mask &= ~STB_SRQ;
             if (val & mask) {
                 val |= STB_SRQ;
-                srq = TRUE;
+                /* avoid sending SRQ if nothing has changed */
+                if (old_val != val) {
+                    srq = TRUE;
+                }
             } else {
                 val &= ~STB_SRQ;
             }
@@ -142,8 +148,8 @@
         case SCPI_REG_OPERE:
             regUpdate(context, SCPI_REG_OPER);
             break;
-            
-            
+
+
         case SCPI_REG_COUNT:
             /* nothing to do */
             break;
@@ -205,8 +211,8 @@
  */
 scpi_result_t SCPI_CoreEse(scpi_t * context) {
     int32_t new_ESE;
-    if (SCPI_ParamInt(context, &new_ESE, TRUE)) {
-        SCPI_RegSet(context, SCPI_REG_ESE, new_ESE);
+    if (SCPI_ParamInt32(context, &new_ESE, TRUE)) {
+        SCPI_RegSet(context, SCPI_REG_ESE, (scpi_reg_val_t) new_ESE);
     }
     return SCPI_RES_OK;
 }
@@ -217,7 +223,7 @@
  * @return 
  */
 scpi_result_t SCPI_CoreEseQ(scpi_t * context) {
-    SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_ESE));
+    SCPI_ResultInt32(context, SCPI_RegGet(context, SCPI_REG_ESE));
     return SCPI_RES_OK;
 }
 
@@ -227,20 +233,31 @@
  * @return 
  */
 scpi_result_t SCPI_CoreEsrQ(scpi_t * context) {
-    SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_ESR));
+    SCPI_ResultInt32(context, SCPI_RegGet(context, SCPI_REG_ESR));
     SCPI_RegSet(context, SCPI_REG_ESR, 0);
     return SCPI_RES_OK;
 }
 
 /**
  * *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_ResultMnemonic(context, context->idn[i]);
+        } else {
+            SCPI_ResultMnemonic(context, "0");
+        }
+    }
     return SCPI_RES_OK;
 }
 
@@ -261,7 +278,7 @@
  */
 scpi_result_t SCPI_CoreOpcQ(scpi_t * context) {
     /* Operation is always completed */
-    SCPI_ResultInt(context, 1);
+    SCPI_ResultInt32(context, 1);
     return SCPI_RES_OK;
 }
 
@@ -284,8 +301,8 @@
  */
 scpi_result_t SCPI_CoreSre(scpi_t * context) {
     int32_t new_SRE;
-    if (SCPI_ParamInt(context, &new_SRE, TRUE)) {
-        SCPI_RegSet(context, SCPI_REG_SRE, new_SRE);
+    if (SCPI_ParamInt32(context, &new_SRE, TRUE)) {
+        SCPI_RegSet(context, SCPI_REG_SRE, (scpi_reg_val_t) new_SRE);
     }
     return SCPI_RES_OK;
 }
@@ -296,7 +313,7 @@
  * @return 
  */
 scpi_result_t SCPI_CoreSreQ(scpi_t * context) {
-    SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_SRE));
+    SCPI_ResultInt32(context, SCPI_RegGet(context, SCPI_REG_SRE));
     return SCPI_RES_OK;
 }
 
@@ -306,7 +323,7 @@
  * @return 
  */
 scpi_result_t SCPI_CoreStbQ(scpi_t * context) {
-    SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_STB));
+    SCPI_ResultInt32(context, SCPI_RegGet(context, SCPI_REG_STB));
     return SCPI_RES_OK;
 }
 
@@ -316,11 +333,8 @@
  * @return 
  */
 scpi_result_t SCPI_CoreTstQ(scpi_t * context) {
-    int result = 0;
-    if (context && context->interface && context->interface->test) {
-        result = context->interface->test(context);
-    }
-    SCPI_ResultInt(context, result);
+    (void) context;
+    SCPI_ResultInt32(context, 0);
     return SCPI_RES_OK;
 }
 

--
Gitblit v1.9.1