diff options
| -rw-r--r-- | gpib.c | 2 | ||||
| -rw-r--r-- | instr-daemon.c | 5 | ||||
| -rw-r--r-- | parser.c | 4 |
3 files changed, 6 insertions, 5 deletions
@@ -242,7 +242,7 @@ int INTERFACE_ERROR; /* Error Code */ int INTERFACE_STATUS; /* Interface Status */ -unsigned int MR_4882_status[5]; /* 4882 status memory registers */ +unsigned char MR_4882_status[5]; /* 4882 status memory registers */ unsigned long int DATA_COUNT; /* Transfer count */ unsigned long int Requested_Count; /* Requested transfer count */ diff --git a/instr-daemon.c b/instr-daemon.c index 1921822..5f764ed 100644 --- a/instr-daemon.c +++ b/instr-daemon.c @@ -228,7 +228,7 @@ int main(int argc, char **argv) LCD_write(2,0,message); g_free (message); -// GPIB_initialize(); + GPIB_initialize(); IO_Setup_RS232( globals.Flash.baud, globals.Flash.parity, @@ -326,7 +326,7 @@ static gboolean periodic_poll (void) // // FIXME - comment out everything up to "return TRUE" if this section // is crashing due to non-functional bus -/* GPIB_check_for_device_clear_signal(); + GPIB_check_for_device_clear_signal(); if (GPIB_check_for_messages(globals.Registers.gpib_buffer)) { if (GPIB_handle_new_input(globals.Registers.gpib_buffer)) { // FIXME check_for_ctrl_mode_changes(); @@ -334,7 +334,6 @@ static gboolean periodic_poll (void) } } GPIB_check_for_device_clear_signal(); -*/ return TRUE; } @@ -1081,7 +1081,9 @@ void Parser_main (char *raw_in, int interactive_terminal, void(*cbfunc)(gpointer (*cbfunc)(user_data, error_response); } } else { - (*cbfunc)(user_data, response); + if (interactive_terminal) { + (*cbfunc)(user_data, response); + } } g_free (units); |