From: ian <ian>
Date: Mon, 26 Dec 2005 12:57:56 +0000 (+0000)
Subject: various variable initialisations
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=5c7462ce6bc57e9bf2cf905902baa922c0dd89c0;p=trains.git

various variable initialisations
---

diff --git a/detpic/detect.asm b/detpic/detect.asm
index 318b45d..ca6aca8 100644
--- a/detpic/detect.asm
+++ b/detpic/detect.asm
@@ -130,6 +130,8 @@ detect_local_init
 	set_f	scanc
 	set_f	scand
 	set_f	scane
+	set_f	last1
+	set_f	last2
 	mov_ff	buf0_startval, buf0
 
 	return
diff --git a/detpic/i2clib.asm b/detpic/i2clib.asm
index e594532..2fb1cb0 100644
--- a/detpic/i2clib.asm
+++ b/detpic/i2clib.asm
@@ -57,8 +57,8 @@
 
 		udata_acs
 
-sspstat		res	1
-sspcon1		res	1
+sspstat		res	1	; master only
+sspcon1		res	1	; master only
 sspcon2		res	1	; master only
 slave		res	1	; master only
 slave_next	res	1	; master only
diff --git a/detpic/mascan.asm b/detpic/mascan.asm
index df64cc2..32ea43d 100644
--- a/detpic/mascan.asm
+++ b/detpic/mascan.asm
@@ -282,6 +282,7 @@ mascan_init
 	mov_lw	slavetable & 0xff
 	mov_wf	cslot
 	clr_f	cbyte
+	bs_f	cbyte, cbyte_halted ; serial output of `hello' will start us up
 	clr_f	wslave
 
 	mov_lw	2
diff --git a/detpic/morse.messages b/detpic/morse.messages
index e4a33f4..63e9681 100644
--- a/detpic/morse.messages
+++ b/detpic/morse.messages
@@ -65,6 +65,7 @@ UEC
 URM
 UCI
 UCP
+UPC
 USP
 
 # Messages for i2clib, S*
diff --git a/detpic/nmra-stream.asm b/detpic/nmra-stream.asm
index 4bd54b5..1a35fdb 100644
--- a/detpic/nmra-stream.asm
+++ b/detpic/nmra-stream.asm
@@ -159,7 +159,7 @@ nmra_init
 	clr_fa	fromserial  	; for loc'n of write-from-usart ptr in buffers
 	clr_fa	totrack  	; for loc'n of send-to-track ptr in buffers
 				; all in access bank
-
+	clr_f	acknmra
 
 	debug 	'c'	; write 'c' to serial port
 ;----------------------------------------------------------------------------
diff --git a/detpic/points.asm b/detpic/points.asm
index b7199bf..77f3544 100644
--- a/detpic/points.asm
+++ b/detpic/points.asm
@@ -234,6 +234,13 @@ point_timer_init_endif_masterslave
 	return
 
 ;======================================================================
+; MASTER
+
+;----------------------------------------------------------------------
+points_master_init
+	clr_f	pointslave
+	clr_f	pointmsg
+	return
 
 ;----------------------------------------------------------------------
 command_point
@@ -259,6 +266,7 @@ command_point
 	and_lw	0x06			; W =		0000 0ss0
 	ior_wff	pointslave		; pointslave =	00SS Sss0
 
+	panic	morse_UPC ; should check that this slave exists
 	rr_fw	pointslave		; W =		000S SSss
 	bra_nz	point_needwrite_yes
 
diff --git a/detpic/program.asm b/detpic/program.asm
index 3a862fa..ee3ec3a 100644
--- a/detpic/program.asm
+++ b/detpic/program.asm
@@ -26,6 +26,7 @@ vector_reset
 	bs_f	RCON, IPEN	; interrupt priorities
 
 	call	idlocs_init
+	clr_f	flags
 
 	bt_f_if0 idloc1,idloc1_master
 	call	slave_init
@@ -70,6 +71,7 @@ master_init
 	call    i2cm_init
 	call	serialtxbuf_init
 	call    polarity_master_init
+	call    points_master_init
 	call	common_local_init
 	call	serial_init
 	call	nmra_init
diff --git a/detpic/variables.asm b/detpic/variables.asm
index 38071ed..090d479 100644
--- a/detpic/variables.asm
+++ b/detpic/variables.asm
@@ -28,6 +28,7 @@ isr_high_save_fsr0	res	2 ; for isrh_fsr0_{save,restore}
 xdebug			res	8
 
 cwslave			res	1 ; slave we're currently actually writing to
+				  ; undefined except in <something>_needwrite
 
 qqtrislat_start equ 0x50
 qqtrislat_section udata qqtrislat_start