summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--globals.c2
-rw-r--r--globals.h2
-rw-r--r--instr-daemon.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/globals.c b/globals.c
index 2b4014d..79b84d3 100644
--- a/globals.c
+++ b/globals.c
@@ -13,7 +13,7 @@ GlobalStruct globals = {
.Registers.last_relay_driver_settings[1] = -1,
.Registers.last_relay_driver_settings[2] = -1,
- .Registers.gpib_buffer[0] = 0,
+ .Registers.gpib_input_buffer[0] = 0,
.VxiLocks.locked_network_server = NO_SERVER_LOCKED
};
diff --git a/globals.h b/globals.h
index 99b05dc..5e5885b 100644
--- a/globals.h
+++ b/globals.h
@@ -275,7 +275,7 @@ typedef struct {
int ques_enable_register; /* for stat:enable command */
int avrq_reg;
int last_rise_time_relay_setting;
- char gpib_buffer[max_gpib_input_length];
+ char gpib_input_buffer[max_gpib_input_length];
} HWregStruct;
diff --git a/instr-daemon.c b/instr-daemon.c
index 73a847e..255b294 100644
--- a/instr-daemon.c
+++ b/instr-daemon.c
@@ -413,9 +413,9 @@ static gboolean periodic_poll (void)
globals.VxiLocks.command_in_progress = TRUE;
GPIB_check_for_device_clear_signal();
- if (GPIB_check_for_messages(globals.Registers.gpib_buffer)) {
- if (GPIB_handle_new_input(globals.Registers.gpib_buffer)) {
- Parser_main(globals.Registers.gpib_buffer, 0, GPIB_send_query_response, NULL);
+ if (GPIB_check_for_messages(globals.Registers.gpib_input_buffer)) {
+ if (GPIB_handle_new_input(globals.Registers.gpib_input_buffer)) {
+ Parser_main(globals.Registers.gpib_input_buffer, 0, GPIB_send_query_response, NULL);
}
}
GPIB_check_for_device_clear_signal();