summaryrefslogtreecommitdiff
path: root/libvxi11client/client.c
diff options
context:
space:
mode:
authordaniel <danieruru@gmail.com>2013-01-09 14:45:33 +0900
committerdaniel <danieruru@gmail.com>2013-01-09 14:45:33 +0900
commit57bec4c29edc96491328c8f60fe76055ab2f4008 (patch)
tree4b4f5adf6015e3bde96975601992df44a7a574eb /libvxi11client/client.c
parent2c93550a5394c632ae6b820e38ca75ab5df5aae7 (diff)
add a waitlock parameter to all of the calls that care about it
Diffstat (limited to 'libvxi11client/client.c')
-rw-r--r--libvxi11client/client.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libvxi11client/client.c b/libvxi11client/client.c
index 799df57..2d050aa 100644
--- a/libvxi11client/client.c
+++ b/libvxi11client/client.c
@@ -52,11 +52,11 @@ int main(int argc, char *argv[]) {
printf("Error reading data\n");
// trigger
- if (vxi11_trigger() > 0)
+ if (vxi11_trigger(false) > 0)
printf("triggered\n");
// clear
- if (vxi11_clear() > 0)
+ if (vxi11_clear(false) > 0)
printf("cleared\n");
// abort
@@ -66,7 +66,7 @@ int main(int argc, char *argv[]) {
printf("abort failed; %s\n", geterrorstring(err));
// lock
- if ((err = vxi11_lock()) > 0)
+ if ((err = vxi11_lock(false)) > 0)
printf("locked\n");
// unlock
@@ -74,15 +74,15 @@ int main(int argc, char *argv[]) {
printf("unlocked\n");
// remote
- if ((err = vxi11_remote()) > 0)
+ if ((err = vxi11_remote(false)) > 0)
printf("remote'd\n");
// local
- if ((err = vxi11_local()) > 0)
+ if ((err = vxi11_local(false)) > 0)
printf("local'd\n");
// read the status byte
- int statusbyte = vxi11_readstatusbyte();
+ int statusbyte = vxi11_readstatusbyte(false);
if (statusbyte >= 0)
printf("Status byte is 0x%02x\n", statusbyte);
else
@@ -94,9 +94,9 @@ int main(int argc, char *argv[]) {
// try locking twice
printf("-- Locking twice --\n");
- if ((err = vxi11_lock()) > 0) {
+ if ((err = vxi11_lock(false)) > 0) {
printf("locked\n");
- if ((err = vxi11_lock()) > 0) {
+ if ((err = vxi11_lock(false)) > 0) {
printf("locked again!!\n");
exit(1);
}
@@ -133,7 +133,7 @@ int main(int argc, char *argv[]) {
printf("Error destroying interrupt channel; %s\n", geterrorstring(err));
// docmd
- if ((err = vxi11_docmd(0x00)) > 0)
+ if ((err = vxi11_docmd(0x00, false)) > 0)
printf("did command, should fail!\n");
else
printf("Error calling docmd; %s\n", geterrorstring(err));