From: ian <ian>
Date: Sun, 7 May 2006 15:11:45 +0000 (+0000)
Subject: properly continue with ping protocol when leaving Ping for Settling
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=d1d573ae59ea2f146292128a2f1b97cf8c5a0cb2;p=trains.git

properly continue with ping protocol when leaving Ping for Settling
---

diff --git a/hostside/startup.c b/hostside/startup.c
index 6733506..d9235bd 100644
--- a/hostside/startup.c
+++ b/hostside/startup.c
@@ -151,13 +151,12 @@ void on_pic_pong(const PicInsnInfo *pii, const PicInsn *pi, int objnum) {
   if (objnum != ping_seq)
     die("PIC sent wrong ping response (0x%x, wanted 0x%x)", objnum, ping_seq);
 
-  if (sta_state == Sta_Ping) {
+  ping_toev.duration= 1000;
+  ping_toev.callback= timefor_ping;
+  toev_start(&ping_toev);
+
+  if (sta_state == Sta_Ping)
     sta_goto(Sta_Settling);
-  } else {
-    ping_toev.duration= 1000;
-    ping_toev.callback= timefor_ping;
-    toev_start(&ping_toev);
-  }
 }
 
 void on_pic_fixed(const PicInsnInfo *pii, const PicInsn *pi, int objnum) {