revert suppression of general ping since it's pointless unless we supress the timesta...

diff --git a/hostside/realtime.c b/hostside/realtime.c
index 6a6930287c9c2270795bd3886caeedb676b6037e..9a73731f49ca34211d69292f39a33b79c4d78bfd 100644 (file)
--- a/hostside/realtime.c
+++ b/hostside/realtime.c
@@ -284,10 +284,6 @@ void serial_indata_process(int buf_used) {
 /*---------- serial port output (not via liboop) ----------*/
 
 void serial_transmit(const PicInsn *pi) {
-  serial_transmit_maybenosim(pi, 0);
-}
-  
-void serial_transmit_maybenosim(const PicInsn *pi, int nosim) {
   const PicInsnInfo *pii;
   int obj, v, suppress=0;
 
@@ -316,11 +312,11 @@ void serial_transmit_maybenosim(const PicInsn *pi, int nosim) {
     else if (pii->noiselevel > picio_send_noise)
       suppress= 1;
     else
-      oupicio("out",pii,obj,v, nosim ? ouprintf_only : ouprintf);
+      oupicio("out",pii,obj,v,ouprintf);
   }
 
   if (!suppress && picio_send_noise >= 2)
-    (nosim ? ouhex_nosim : ouhex)("picioh out", pi->d, pi->l);
+    ouhex("picioh out", pi->d, pi->l);
 
   /* note that the serial port is still in nonblocking mode.  if
    * we ever buffer up far enough that the kernel wants to make us

diff --git a/hostside/realtime.h b/hostside/realtime.h
index ca8d239ef637e80d37b26fd5bf6884e46ddc5f05..6df39a7451704e2a6e314b64b59a64f243434322 100644 (file)
--- a/hostside/realtime.h
+++ b/hostside/realtime.h
@@ -150,7 +150,6 @@ void ouhex(const char *word, const Byte *command, int length);
 void ouhex_nosim(const char *word, const Byte *command, int length);
 
 void serial_transmit(const PicInsn *pi);
-void serial_transmit_maybenosim(const PicInsn *pi, int nosim);
 void command_doline(ParseState *ps, CommandInput *cmdi_arg);
 const CmdInfo *current_cmd;
 

diff --git a/hostside/startup.c b/hostside/startup.c
index 250697f9df7004698f03684e4945637b4b55599b..1e42ae82815e84abd8b90a9d80a6b41057fcb609 100644 (file)
--- a/hostside/startup.c
+++ b/hostside/startup.c
@@ -25,7 +25,7 @@ static void timedout_ping(TimeoutEvent *toev) {
 
 static void timefor_ping(TimeoutEvent *toev) {
   enco_pic_ping(&piob, pong_seq ^ PING_PONG_PATTERN);
-  serial_transmit_maybenosim(&piob, toev && toev->pclass == toev_fast_pclass);
+  serial_transmit(&piob);
   ping_toev.callback= timedout_ping;
   ping_toev.pclass= "startup";
   toev_start(&ping_toev);