From b75a3a17c2bb7ce46af4815ae588e263dbab944e Mon Sep 17 00:00:00 2001
From: Justin Fichtner <Justin.Fichtner@lakeshore.com>
Date: 周二, 15 8月 2017 00:20:06 +0800
Subject: [PATCH] Fix another bug in tests

---
 libscpi/src/ieee488.c |   74 ++++++++++++++++++++++++------------
 1 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/libscpi/src/ieee488.c b/libscpi/src/ieee488.c
index 2dc0662..f2579a0 100644
--- a/libscpi/src/ieee488.c
+++ b/libscpi/src/ieee488.c
@@ -51,6 +51,17 @@
 }
 
 /**
+* Update latching event register value based on bit transitions from 0 -> 1
+* in the condition register
+* @param context
+* @param condReg - condition register name
+* @param eventReg - event register name
+*/
+static void regUpdateEvent(scpi_t * context, scpi_reg_val_t oldCondVal, scpi_reg_val_t newCondVal, scpi_reg_name_t eventReg) {
+	SCPI_RegSet(context, eventReg, ((oldCondVal ^ newCondVal) & newCondVal) | SCPI_RegGet(context, eventReg));
+}
+
+/**
  * Update STB register according to value and its mask register
  * @param context
  * @param val value of register
@@ -71,7 +82,7 @@
  * @return register value
  */
 scpi_reg_val_t SCPI_RegGet(scpi_t * context, scpi_reg_name_t name) {
-    if ((name < SCPI_REG_COUNT) && (context->registers != NULL)) {
+    if ((name < SCPI_REG_COUNT) && context) {
         return context->registers[name];
     } else {
         return 0;
@@ -98,14 +109,14 @@
  * @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)) {
+    if ((name >= SCPI_REG_COUNT) || (context == NULL)) {
         return;
     }
-    
+
     /* store old register value */
     old_val = context->registers[name];
 
@@ -148,8 +159,11 @@
         case SCPI_REG_OPERE:
             regUpdate(context, SCPI_REG_OPER);
             break;
-            
-            
+        case SCPI_REG_OPERC:
+        regUpdateEvent(context, old_val, val, SCPI_REG_OPER);
+            break;
+
+
         case SCPI_REG_COUNT:
             /* nothing to do */
             break;
@@ -211,10 +225,11 @@
  */
 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;
     }
-    return SCPI_RES_OK;
+    return SCPI_RES_ERR;
 }
 
 /**
@@ -223,7 +238,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;
 }
 
@@ -233,20 +248,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;
 }
 
@@ -267,7 +293,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;
 }
 
@@ -290,10 +316,11 @@
  */
 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;
     }
-    return SCPI_RES_OK;
+    return SCPI_RES_ERR;
 }
 
 /**
@@ -302,7 +329,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;
 }
 
@@ -312,7 +339,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;
 }
 
@@ -322,11 +349,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