From 9fa36c9eb1bb294c58b4e4dd7592893f829ce282 Mon Sep 17 00:00:00 2001 From: Justin Fichtner <Justin.Fichtner@lakeshore.com> Date: 周一, 14 8月 2017 23:36:13 +0800 Subject: [PATCH] Add support for STATus:OPERation:CONDition register and general handling of condition registers --- libscpi/src/ieee488.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/libscpi/src/ieee488.c b/libscpi/src/ieee488.c index 667e9da..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 @@ -148,6 +159,9 @@ 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: -- Gitblit v1.9.1