From: ian <ian>
Date: Sun, 20 Nov 2005 00:34:43 +0000 (+0000)
Subject: try to inclue morse but it does not build!
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=0c788e91d4b06e3f9781a66989789ef717e57380;p=trains.git

try to inclue morse but it does not build!
---

diff --git a/cebpic/morse-auto.asm-gen b/cebpic/morse-auto.asm-gen
index d401f88..07ae2d7 100755
--- a/cebpic/morse-auto.asm-gen
+++ b/cebpic/morse-auto.asm-gen
@@ -25,8 +25,9 @@
 #
 # morse_messages_start and morse_messages_end should be defined in
 # morse-defs.inc, and should also be 4-byte aligned.  morse-defs.inc
-# should also arrange to define any symbolic addresse referred to
-# in morse-auto.messages, eg by including the pXXXX.inc.
+# and morse-defs.fin should arrange to define any symbolic addresses
+# referred to in morse-auto.messages, by saying `extern' (in .fin) or
+# including the pXXXX.inc (in .inc).
 #
 # morse-auto.asm contains the actual source and morse-auto.inc
 # contains `extern' references for the labels morse_XY.
@@ -96,7 +97,7 @@ while (<>) {
     unshift @data, sprintf "0x%x%x", scalar(@addrs), $morse_bytes;
 #    push @data, @addrs;
     push @data, map {
-	"$_ - (0xf00 * !(($_ & 0xf00)^0xf00))";
+	"$_";
 #	$_.'&0xff';
     } @addrs;
 
@@ -118,6 +119,7 @@ print <<'END' or die $!
 	 error "too much morse - extends beyond morse_messages_end"
 	endif
 
+	include morse-auto.fin
 	end
 END
     if $which eq 'asm';
diff --git a/cebpic/morse-auto.fin b/cebpic/morse-auto.fin
new file mode 100644
index 0000000..9bbe3c4
--- /dev/null
+++ b/cebpic/morse-auto.fin
@@ -0,0 +1 @@
+; stub file
diff --git a/detpic/Makefile b/detpic/Makefile
index 278baca..4ea37a7 100644
--- a/detpic/Makefile
+++ b/detpic/Makefile
@@ -2,7 +2,7 @@ PROGRAMS=	test-sofar
 INCLUDES=	common.inc final.inc morse-auto.inc \
 		../iwjpictest/insn-aliases.inc
 LIBS=		vectors.o panic.o routines-led.o variables.o \
-		 i2clib.o
+		 i2clib.o morse-auto.o
 PICNOS=		0 1 2
 CEBPIC=		../cebpic/
 TARGETS=	$(foreach i, $(PICNOS), perpic$i.hex)
diff --git a/detpic/i2clib.inc b/detpic/i2clib.inc
index 9e4b5e4..a8d2b1d 100644
--- a/detpic/i2clib.inc
+++ b/detpic/i2clib.inc
@@ -331,3 +331,4 @@
  extern i2c_sspcon1
  extern i2c_sspcon2
  extern i2c_slave
+ extern i2c_st
diff --git a/detpic/morse-auto.fin b/detpic/morse-auto.fin
new file mode 100644
index 0000000..d15603a
--- /dev/null
+++ b/detpic/morse-auto.fin
@@ -0,0 +1 @@
+ include final.inc
diff --git a/detpic/morse-auto.messages b/detpic/morse-auto.messages
index c11f492..f8fd2aa 100644
--- a/detpic/morse-auto.messages
+++ b/detpic/morse-auto.messages
@@ -23,8 +23,6 @@ IP	INTCON			; Interrupt of priority supposedly disabled
 # Messages starting with T are temporary entries for testing and development
 TM	PIE1,SSPSTAT,SSPCON1,SSPCON2 ; Master got I2C interrupt
 TS	PIE1,SSPSTAT,SSPCON1,SSPCON2 ; Slave got I2C interrupt
-TF	TESTFLASH		     ; test flash message
-TG	TESTFLASH,WREG4		     ; test flash message
 TI1				; for iwj
 TI2				; for iwj
 TI3				; for iwj
diff --git a/detpic/morse-defs.inc b/detpic/morse-defs.inc
new file mode 100644
index 0000000..00a54bd
--- /dev/null
+++ b/detpic/morse-defs.inc
@@ -0,0 +1 @@
+ include common.inc