Change default for predit to PREDF_NEWPLAN -

part 2, remove PREDF_NEWPLAN entirely

diff --git a/hostside/safety.c b/hostside/safety.c
index 2de2e73333bafb16943dac27b942137ba8c5fb10..bfa6c23503ab69627493219bcfedcacfe9b7f3aa 100644 (file)
--- a/hostside/safety.c
+++ b/hostside/safety.c
@@ -1135,7 +1135,7 @@ ErrorCode safety_setdirection(Train *tra, int backwards,
   tra->backwards ^= 1;
   newfdet.seg->tr_backwards ^= 1;
   
-  ec= predict(tra,tnow, PREDF_NEWPLAN,0,0, ppc,ppcu);
+  ec= predict(tra,tnow, 0, 0,0, ppc,ppcu);
   if (!ec) {
     /* yay! */
     report_train_position(tra);
@@ -1240,7 +1240,7 @@ ErrorCode safety_movposchange(Segment *seg, MovPosComb comb,
     return predict_problem(&u,seg, "route set for approaching train");
 
   mgettimeofday(&tnow);
-  ec= predict(seg->owner,tnow, PREDF_NEWPLAN,seg,comb, ppc,ppcu);
+  ec= predict(seg->owner,tnow, 0, seg,comb, ppc,ppcu);
   if (!ec) return 0;
 
   ec2= predict(seg->owner,tnow, PREDF_OLDPLAN, 0,0,

diff --git a/hostside/safety.h b/hostside/safety.h
index df63cf04255bc8d391fbb8d0af0ac7135fc9bc00..ebde0aeb9fb358d0808e9d40dd06ff18bb4be69d 100644 (file)
--- a/hostside/safety.h
+++ b/hostside/safety.h
@@ -129,7 +129,6 @@ ErrorCode safety_setdirection(Train *tra, int backwards,
 #define PREDF_OLDPLAN 002u
    /* the old plan is necessarily sufficient as we are not intending
     * to accelerate, change a movpos, etc. */
-#define PREDF_NEWPLAN 000u /* now the default */
 
 ErrorCode predict(Train *tra, struct timeval tnow, unsigned flags,
                  Segment *desire_move, int desire_movposcomb,

diff --git a/hostside/speed.c b/hostside/speed.c
index fe55d3237190cb4d8ef805003b34d600165a69bf..e8ad203beae6b3331a2da3dc8f8aa311d20d78da 100644 (file)
--- a/hostside/speed.c
+++ b/hostside/speed.c
@@ -136,7 +136,7 @@ static ErrorCode request_core(Train *tra, int step, struct timeval tnow,
   }
 
   tra->speed.try_speed= vtarg;
-  ec= predict(tra,tnow, PREDF_NEWPLAN,0,0, ppc,ppcu);
+  ec= predict(tra,tnow, 0, 0,0, ppc,ppcu);
 
   if (ec) {
     tra->speed.try_speed= -1;