From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Mon, 3 Jan 2011 18:41:39 +0000 (+0000)
Subject: hostside: rename hostside-old to adhoc-test
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=72e2f39e22511b75eb7519597a9236937b6c7c39;p=trains.git

hostside: rename hostside-old to adhoc-test
---

diff --git a/hostside/.gitignore b/hostside/.gitignore
index 0cdbc7b..06256ff 100644
--- a/hostside/.gitignore
+++ b/hostside/.gitignore
@@ -1,5 +1,5 @@
 realtime
-hostside-old
+adhoc-test
 hostside
 topology-dump
 t
diff --git a/hostside/Makefile b/hostside/Makefile
index e077d93..118230a 100644
--- a/hostside/Makefile
+++ b/hostside/Makefile
@@ -8,7 +8,7 @@ AUTOINCS=	auproto-pic.h layoutinfo.h retransmit-table.h		\
 
 CLIENT_TARGETS=	gui-plan-bot topology-dump evdev-manip
 
-TARGETS=	hostside-old realtime					\
+TARGETS=	adhoc-test realtime					\
 		$(CLIENT_TARGETS)					\
 		$(addsuffix .speeds.ps, $(TRAINS))			\
 		$(addsuffix .speeds.record, $(TRAINS))
@@ -29,7 +29,7 @@ client:		$(CLIENT_TARGETS)
 
 #---------- executables ----------
 
-hostside-old:	serialio.o nmra.o main.o encode.o utils.o
+adhoc-test:	serialio.o nmra.o adhoc-test.o encode.o utils.o
 		$(LINK)
 
 topology-dump:	topology-dump.o utils.o $(LAYOUT_DATA).o
diff --git a/hostside/README b/hostside/README.adhoc-test
similarity index 72%
rename from hostside/README
rename to hostside/README.adhoc-test
index 0ff3535..ae2016a 100644
--- a/hostside/README
+++ b/hostside/README.adhoc-test
@@ -1,7 +1,7 @@
-./hostside-old [<options>] <nmra-command> <nmra-args...>    see nmra-packets.h
-./hostside-old [<options>] nmra_bytes <nmra-command-hex-no-csum>
-./hostside-old [<options>] nmra_raw <nmra-command-hex-with-csum>
-./hostside-old [<options>] command <literal-data-for-pic>
+./adhoc-test [<options>] <nmra-command> <nmra-args...>    see nmra-packets.h
+./adhoc-test [<options>] nmra_bytes <nmra-command-hex-no-csum>
+./adhoc-test [<options>] nmra_raw <nmra-command-hex-with-csum>
+./adhoc-test [<options>] command <literal-data-for-pic>
  options
   -s<serialport>   eg -s/dev/ttyS0  normally necessary
   -w<repeatdelay>  usleep; 0 = no usleep; default is -1 = don't repeat at all
@@ -11,7 +11,7 @@
   -f<fudgedelay>   usleep; each character; default is 0 = no usleep
 
 Eg,
- ./hostside-old -s/dev/ttyS0 -w10000 -i1000 nmra_bytes 0348
+ ./adhoc-test -s/dev/ttyS0 -w10000 -i1000 nmra_bytes 0348
 to tell decoder 3 to go speed 13 backwards every 10ms for 1000 times, ie 10s
  (on norway this means it actually happens every 20ms, ie for 20s,
    which makes it a bit of a fudge really)
@@ -25,4 +25,4 @@ to tell decoder 3 to go speed 13 backwards every 10ms for 1000 times, ie 10s
                     03    (+)  48       = 4b ok
 
 To test:
- ./hostside-old -st nmra_bytes 0348 && binview t
+ ./adhoc-test -st nmra_bytes 0348 && binview t
diff --git a/hostside/main.c b/hostside/adhoc-test.c
similarity index 97%
rename from hostside/main.c
rename to hostside/adhoc-test.c
index 08292ce..d429169 100644
--- a/hostside/main.c
+++ b/hostside/adhoc-test.c
@@ -1,7 +1,7 @@
 /*
  * simple test harness for now
  * asserts on usage errors
- * see README for usage info
+ * see README.adhoc-test for usage info
  */
 
 #include <stdio.h>
@@ -14,7 +14,7 @@
 
 #include "common.h"
 
-const char *progname= "hostside-old";
+const char *progname= "adhoc-test";
 static FILE *dump_stream= 0;
 
 static int repeat_delay= -1, iterations= -1;
diff --git a/hostside/factory-reset-svc b/hostside/factory-reset-svc
index ccb34f3..2087e45 100755
--- a/hostside/factory-reset-svc
+++ b/hostside/factory-reset-svc
@@ -9,7 +9,7 @@ END
 
 port="$1"; shift
 
-ho () { ./hostside-old -s"$port" -w20000 -i0 -d "$@"; }
+ho () { ./adhoc-test -s"$port" -w20000 -i0 -d "$@"; }
 
 # Packet Sequence for Command Stations/Programmers using
 #  Physical Register Addressing
diff --git a/hostside/fun-randmore b/hostside/fun-randmore
index 49971d8..62d3e9f 100755
--- a/hostside/fun-randmore
+++ b/hostside/fun-randmore
@@ -11,12 +11,12 @@ while true; do
 		b2=$(hexdump </dev/urandom -n1 -e '"%d"')
 		dirn=$(($b2 / 128))
 		echo which=$which b1=$b1 speed=$speed b2=$b2 dirn=$dirn
-		./hostside-old -s$s speed126 2 $speed $dirn
+		./adhoc-test -s$s speed126 2 $speed $dirn
 	fi
 	if [ $which -lt 128 ]; then
 		value=$(( $which * 16 ))
 		printf "which=%s value=%s value=0x%x\n" $which $value $value
-		./hostside-old -s$s funcs5to8 2 $value
+		./adhoc-test -s$s funcs5to8 2 $value
 	fi
 	delay=$(hexdump </dev/urandom -n1 -e '"%d"')
 	delayv=$(( $delay / 2 + 10 ))
diff --git a/hostside/fun-random b/hostside/fun-random
index f05082e..ad84aed 100755
--- a/hostside/fun-random
+++ b/hostside/fun-random
@@ -8,6 +8,6 @@ while true; do
 	b2=$(hexdump </dev/urandom -n1 -e '"%d"')
 	dirn=$(($b2 / 128))
 	echo b1=$b1 speed=$speed b2=$b2 dirn=$dirn
-	./hostside-old -s$s speed126 2 $speed $dirn
+	./adhoc-test -s$s speed126 2 $speed $dirn
 	sleep 30
 done
diff --git a/hostside/fun-updown b/hostside/fun-updown
index f33085e..e7b01fd 100755
--- a/hostside/fun-updown
+++ b/hostside/fun-updown
@@ -7,7 +7,7 @@ while true; do
 		for f in `seq $x`; do
 			sleep 20; g=$(($f*$f));
 			echo $f $g;
-			./hostside-old -s$s speed126 2 $g 0
+			./adhoc-test -s$s speed126 2 $g 0
 		done
 	done
 done
diff --git a/hostside/measure-speeds b/hostside/measure-speeds
index 70844e7..f7f55bf 100755
--- a/hostside/measure-speeds
+++ b/hostside/measure-speeds
@@ -45,7 +45,7 @@ proc startup {} {
 #    foreach f {funcs0to4 funcs5to8} {
 #    }
     foreach f {funcs5to8} {
-	set m [exec ./hostside-old -s/dev/stdout $f $loco 0x1fff]
+	set m [exec ./adhoc-test -s/dev/stdout $f $loco 0x1fff]
 	set m [hbytes raw2h $m]
 	lappend funcs_msgs ffff$m {}
     }
@@ -200,7 +200,7 @@ proc xmit-now {until_funcs} {
 }
 proc xmit {nmral} {
     global xmit_msg xmit_after detend settle_detend settle_time funcs_msgs
-    set msg [eval [list exec ./hostside-old -s/dev/stdout] $nmral]
+    set msg [eval [list exec ./adhoc-test -s/dev/stdout] $nmral]
     set xmit_msg [hbytes raw2h $msg]
     debug "> $xmit_msg $nmral (E $detend $settle_detend $settle_time) \[$funcs_msgs]"
     catch { after cancel $xmit_after }
diff --git a/hostside/program-cv b/hostside/program-cv
index a987a91..f3526f2 100755
--- a/hostside/program-cv
+++ b/hostside/program-cv
@@ -16,5 +16,5 @@ addr="$1"; shift
 cv="$1"; shift
 value="$1"; shift
 
-./hostside-old "$@" -s"$port" command 11
-./hostside-old "$@" -s"$port" -i100 -w10000 cvwrite "$addr" "$cv" "$value"
+./adhoc-test "$@" -s"$port" command 11
+./adhoc-test "$@" -s"$port" -i100 -w10000 cvwrite "$addr" "$cv" "$value"
diff --git a/hostside/program-cv-svc b/hostside/program-cv-svc
index 0e2f631..0c32f4c 100755
--- a/hostside/program-cv-svc
+++ b/hostside/program-cv-svc
@@ -12,7 +12,7 @@ port="$1"; shift
 cv="$1"; shift
 value="$1"; shift
 
-ho () { ./hostside-old -s"$port" -w20000 -i0 -d "$@"; }
+ho () { ./adhoc-test -s"$port" -w20000 -i0 -d "$@"; }
 
 # Packet Sequence for Command Stations/Programmers using Direct Mode
 # RP 9.2.3 E l.100-
diff --git a/hostside/stopgap-controller b/hostside/stopgap-controller
index 677abe2..77eb84c 100755
--- a/hostside/stopgap-controller
+++ b/hostside/stopgap-controller
@@ -436,7 +436,7 @@ proc newfuncs {} {
 
 proc nmrachange {thing argstring} {
     global $thing
-    set bin [eval exec ./hostside-old -s/dev/stdout $argstring]
+    set bin [eval exec ./adhoc-test -s/dev/stdout $argstring]
     binary scan $bin H* x
     debug "changed $thing=$x ($argstring)"
     set $thing ff$x