From 79ca37aefec8e26a1a74b0b2b9c36e0c9af6d9c1 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 29 1月 2018 16:21:41 +0800
Subject: [PATCH] Fix ASAN unit tests for travis
---
libscpi/src/ieee488.c | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/libscpi/src/ieee488.c b/libscpi/src/ieee488.c
index f2579a0..4e1be81 100644
--- a/libscpi/src/ieee488.c
+++ b/libscpi/src/ieee488.c
@@ -51,14 +51,14 @@
}
/**
-* 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
-*/
+ * 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));
+ SCPI_RegSet(context, eventReg, ((oldCondVal ^ newCondVal) & newCondVal) | SCPI_RegGet(context, eventReg));
}
/**
@@ -153,6 +153,9 @@
case SCPI_REG_QUESE:
regUpdate(context, SCPI_REG_QUES);
break;
+ case SCPI_REG_QUESC:
+ regUpdateEvent(context, old_val, val, SCPI_REG_QUES);
+ break;
case SCPI_REG_OPER:
regUpdateSTB(context, val, SCPI_REG_OPERE, STB_OPS);
break;
@@ -160,7 +163,7 @@
regUpdate(context, SCPI_REG_OPER);
break;
case SCPI_REG_OPERC:
- regUpdateEvent(context, old_val, val, SCPI_REG_OPER);
+ regUpdateEvent(context, old_val, val, SCPI_REG_OPER);
break;
--
Gitblit v1.9.1