From a4cffa5e99430532bb5bbad3385b910e25025296 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 26 12月 2012 23:32:34 +0800
Subject: [PATCH] Reimplement srq/control callback
---
libscpi/src/ieee488.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/libscpi/src/ieee488.c b/libscpi/src/ieee488.c
index e493a93..513ed90 100644
--- a/libscpi/src/ieee488.c
+++ b/libscpi/src/ieee488.c
@@ -39,6 +39,8 @@
#include "scpi/error.h"
#include "scpi/constants.h"
+#include <stdio.h>
+
/**
* Update register value
* @param name - register name
@@ -58,6 +60,12 @@
} else {
return 0;
}
+}
+
+static size_t writeControl(scpi_t * context, int ctrl, scpi_reg_val_t val) {
+ if (context && context->interface && context->interface->control) {
+ context->interface->control(context, ctrl, val);
+ }
}
/**
@@ -131,8 +139,8 @@
// set updated register value
context->registers[name] = val;
- if (srq && context->interface && context->interface->srq) {
- context->interface->srq(context);
+ if (srq) {
+ writeControl(context, SCPI_CTRL_SRQ, SCPI_RegGet(context, SCPI_REG_STB));
}
}
--
Gitblit v1.9.1