diff options
| -rw-r--r-- | globals.c | 2 | ||||
| -rw-r--r-- | globals.h | 2 | ||||
| -rw-r--r-- | instr-daemon.c | 8 |
3 files changed, 6 insertions, 6 deletions
@@ -15,7 +15,7 @@ GlobalStruct globals = { .Registers.gpib_buffer[0] = 0, - .4882Locks.locked_network_server = NO_SERVER_LOCKED + .VxiLocks.locked_network_server = NO_SERVER_LOCKED }; @@ -799,7 +799,7 @@ typedef struct { MenuStatusStruct MenuStatus; RemoteStruct Remote; HWDetectStruct HWDetect; - LockStruct 4882Locks; + LockStruct VxiLocks; } GlobalStruct; diff --git a/instr-daemon.c b/instr-daemon.c index 2097a6c..73a847e 100644 --- a/instr-daemon.c +++ b/instr-daemon.c @@ -406,11 +406,11 @@ static gboolean periodic_poll (void) // don't check GPIB interface if a VXI interface is locked, // or is currently handling a command - if ((globals.4882Locks.locked_network_server == NO_SERVER_LOCKED) && - (globals.4882Locks.command_in_progress == FALSE)) { + if ((globals.VxiLocks.locked_network_server == NO_SERVER_LOCKED) && + (globals.VxiLocks.command_in_progress == FALSE)) { // tell VXI servers that the 4882 subsystem is busy - globals.4882Locks.command_in_progress = TRUE; + globals.VxiLocks.command_in_progress = TRUE; GPIB_check_for_device_clear_signal(); if (GPIB_check_for_messages(globals.Registers.gpib_buffer)) { @@ -421,7 +421,7 @@ static gboolean periodic_poll (void) GPIB_check_for_device_clear_signal(); // tell VXI servers that the 4882 subsystem is avilable again - globals.4882Locks.command_in_progress = FALSE; + globals.VxiLocks.command_in_progress = FALSE; } Update_Main_Menu_If_Visible(); |