# HG changeset patch # User greg # Date 1210080693 -7200 # Node ID a3906286b09b1ea7a2d6993eb9d011a59d8db004 # Parent ee7f0092bcb12fc8adf05cac607c42293eb75343 add Exit function to DS401SlaveGui, change StopTimerLoop's arg and add TimerCleanup function in timers_win32 diff -r ee7f0092bcb1 -r a3906286b09b drivers/timers_win32/timers_win32.cpp --- a/drivers/timers_win32/timers_win32.cpp Tue May 06 09:11:41 2008 +0200 +++ b/drivers/timers_win32/timers_win32.cpp Tue May 06 15:31:33 2008 +0200 @@ -216,6 +216,11 @@ static class_timers s_timers; +void TimerCleanup(void) +{ + /* only used in realtime apps */ +} + void StartTimerLoop(TimerCallback_t init_callback) { s_timers.start_timer_thread(); @@ -225,7 +230,7 @@ s_timers.resume_timer_thread(); } -void StopTimerLoop(void) +void StopTimerLoop(TimerCallback_t init_callback) { s_timers.stop_timer_thread(); } diff -r ee7f0092bcb1 -r a3906286b09b examples/DS401_Slave_Gui/TestSlaveGui.cpp --- a/examples/DS401_Slave_Gui/TestSlaveGui.cpp Tue May 06 09:11:41 2008 +0200 +++ b/examples/DS401_Slave_Gui/TestSlaveGui.cpp Tue May 06 15:31:33 2008 +0200 @@ -72,10 +72,13 @@ int main_can (s_BOARD SlaveBoard, char *LibraryPath) { - printf ("Bus name: %s Freq: %s Driver: %s\n", +#if !defined(WIN32) && !defined(__CYGWIN__) + TimerInit(); +#endif + + printf ("Bus name: %s Freq: %s Driver: %s\n", SlaveBoard.busname, SlaveBoard.baudrate, LibraryPath); - TimerInit(); #ifndef NOT_USE_DYNAMIC_LOADING if (LoadCanDriver (LibraryPath) == NULL) *textLog << wxT ("Unable to load library\n");