From d1152b855f7a21ec2664739a3cd3c6c321d70835 Mon Sep 17 00:00:00 2001
From: ian <ian>
Date: Wed, 21 Dec 2005 15:21:50 +0000
Subject: [PATCH] make it build, so far

---
 detpic/.cvsignore     |  1 +
 detpic/Makefile       |  5 +++--
 detpic/mascan.asm     | 12 ++++++++++--
 detpic/morse.messages |  1 -
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/detpic/.cvsignore b/detpic/.cvsignore
index f9c4ae6..2f0b042 100644
--- a/detpic/.cvsignore
+++ b/detpic/.cvsignore
@@ -15,3 +15,4 @@ ours+pindata.asm
 syncwrite.asm
 t.*
 t
+*.new
diff --git a/detpic/Makefile b/detpic/Makefile
index 4fe35b4..04dc7d5 100644
--- a/detpic/Makefile
+++ b/detpic/Makefile
@@ -5,9 +5,9 @@ PICNOS=		0 1 2
 PROGRAMS=		program
 OBJS_program=		vectors.o panic.o routines-led.o i2clib.o	\
 			misc.o detect.o variables.o points.o		\
-			syncwrite.o reverse.o nmra-stream.o
+			syncwrite.o reverse.o nmra-stream.o mascan.o
 XCODEN_program= 	morse
-XCODE1_program= 	blank2 ours+pindata
+XCODE1_program= 	ours+pindata
 
 INCLUDES=					\
 		../iwjpictest/clockvaries.inc	\
@@ -17,6 +17,7 @@ INCLUDES=					\
 		i2clib.inc			\
 		i2clib.incm			\
 		misc.fin			\
+		mascan.fin			\
 		nmra-stream.fin			\
 		panic.fin			\
 		panic.inc			\
diff --git a/detpic/mascan.asm b/detpic/mascan.asm
index 21388ae..b80e107 100644
--- a/detpic/mascan.asm
+++ b/detpic/mascan.asm
@@ -1,7 +1,12 @@
 ;======================================================================
 ; MASTER - SCANNING ETC.
 
-;----------
+ include common.inc
+ code
+
+;======================================================================
+
+;----------------------------------------
 i2cm_intrl
 ; handles i2c interrupt using i2cm_interrupt[_definite],
 ; according to the rules for <something>_intrl.
@@ -10,8 +15,11 @@ i2cm_intrl
 	call	i2cm_interrupt_definite
 	intrl_handled_nostack
 
-;--------------------
+;----------------------------------------
 i2cmu_done
 i2cmu_read_got_byte
 i2cmu_write_next_byte
 	panic	morse_UI
+
+;======================================================================
+ include final.inc
diff --git a/detpic/morse.messages b/detpic/morse.messages
index 56db090..82083a3 100644
--- a/detpic/morse.messages
+++ b/detpic/morse.messages
@@ -41,7 +41,6 @@ TI3				; for iwj
 TI4				; for iwj
 TI5				; for iwj
 ZM	i2clib:st,:sspstat,:sspcon1,:sspcon2 ; for testing
-X	test-sofar:ch		; bad character received from host
 
 # Unimplemented things
 UL
-- 
2.30.2