From db09095fb8348d99917f2a0dcdb08b60f59cd9ae Mon Sep 17 00:00:00 2001 From: root Date: Fri, 31 Dec 1999 19:15:34 -0500 Subject: bus timing fixed with wide CS, 160 ns RD/WR --- instr-daemon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'instr-daemon.c') diff --git a/instr-daemon.c b/instr-daemon.c index d3fcf5e..c6b5fa8 100644 --- a/instr-daemon.c +++ b/instr-daemon.c @@ -324,7 +324,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(); @@ -332,7 +332,7 @@ static gboolean periodic_poll (void) } } GPIB_check_for_device_clear_signal(); -*/ + return TRUE; } -- cgit From b79cf089944f6e6f78f34c37f44c632efa780e6e Mon Sep 17 00:00:00 2001 From: root Date: Fri, 31 Dec 1999 19:19:17 -0500 Subject: re-disable gpib for now --- instr-daemon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'instr-daemon.c') diff --git a/instr-daemon.c b/instr-daemon.c index c6b5fa8..d3fcf5e 100644 --- a/instr-daemon.c +++ b/instr-daemon.c @@ -324,7 +324,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(); @@ -332,7 +332,7 @@ static gboolean periodic_poll (void) } } GPIB_check_for_device_clear_signal(); - +*/ return TRUE; } -- cgit From 58b03f6b9bd96fb6de58e9a75b9af5fab7e3fab0 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 31 Dec 1999 19:32:23 -0500 Subject: gpib works now --- instr-daemon.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'instr-daemon.c') diff --git a/instr-daemon.c b/instr-daemon.c index d3fcf5e..24c6132 100644 --- a/instr-daemon.c +++ b/instr-daemon.c @@ -227,7 +227,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, @@ -324,7 +324,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(); @@ -332,7 +332,6 @@ static gboolean periodic_poll (void) } } GPIB_check_for_device_clear_signal(); -*/ return TRUE; } -- cgit