From: ian <ian>
Date: Fri, 25 Jan 2008 22:30:59 +0000 (+0000)
Subject: fix things up so it compiles, after merge
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=d9f3330524af6829d56763b54a768a7bcf167f7f;p=trains.git

fix things up so it compiles, after merge
---

diff --git a/detpic/program.asm b/detpic/program.asm
index 7baba73..2a87efe 100644
--- a/detpic/program.asm
+++ b/detpic/program.asm
@@ -60,7 +60,6 @@ master_init
 	call	memory_erase
 	clr_f	flags
 	call	serial_init
-	call	startwait
 	call    i2cm_init
 	call	serialtxbuf_init
 	call    polarity_master_init
@@ -103,27 +102,6 @@ master_interrupt_low @
 	Dl 0x8f
 	panic	morse_IL
 
-;----------------------------------------
-startwait
-; We pause before starting up to give slaves a chance to wake up.
-;
-;  Timer 0		any		trashed, left running
-;  GIEH, GIEL		remain continuously disabled
-;
-	clr_f	T0CON
-	bc_f	INTCON,TMR0IF
-	mov_lw	startwait_master_t0inith
-	mov_wf	TMR0H
-	mov_lw	startwait_master_t0initl
-	mov_wf	TMR0L
-	mov_lw	(1<<TMR0ON) | startwait_master_t0scale
-	mov_wf	T0CON
-startwait_loop
-	bt_f_if0 INTCON,TMR0IF
-	bra	startwait_loop
-	;...done.
-	return
-
 ;----------------------------------------------------------------------
 serialrx_table_section	code	0x2000
 
diff --git a/hostside/Makefile b/hostside/Makefile
index 589bffa..48e6c5b 100644
--- a/hostside/Makefile
+++ b/hostside/Makefile
@@ -1,7 +1,7 @@
 #
 
 AUTOINCS=	auproto-pic.h layoutinfo.h selectors.h retransmit-table.h \
-		errorcodes.h stastate.h
+		errorcodes.h stastate.h record-y.h record-l.h
 TARGETS=	hostside-old gui-plan-bot realtime
 
 include ../common.make
@@ -47,6 +47,9 @@ auproto-pic.c auproto-pic.h: auproto-%: \
 			parse-proto-spec proto-expanded skelproto-%
 		./$+ $o
 
+record-y.h: record-y.c
+record-l.h: record-l.c
+
 layoutinfo.h:	../layout/ours.layout-data.c Makefile
 		sed -e '/^#include/,$$d' $< $o
 
@@ -66,5 +69,6 @@ hostside:	hostside.o serialio.o client.o obc.o commands.o utils.o \
 clean:
 		rm -f *.o *.d $(TARGETS) selectors.h
 		rm -f auproto-pic.h *~ core proto-expanded
+		rm -f record-[yl].[ch]
 
 include $(wildcard *.d)
diff --git a/hostside/cdumgr.c b/hostside/cdumgr.c
index db6f8ba..089d954 100644
--- a/hostside/cdumgr.c
+++ b/hostside/cdumgr.c
@@ -14,7 +14,3 @@ void on_pic_pointed(const PicInsnInfo *pii, const PicInsn *pi, int objnum) {
   if (sta_state <= Sta_Settling) return;
   /* fixme do something here */
 }
-
-void on_pic_nopoint(const PicInsnInfo *pii, const PicInsn *pi, int objnum) {
-  /* fixme perhaps log this if it was unexpected */
-}
diff --git a/layout/Makefile b/layout/Makefile
index 47ae957..3a317c3 100644
--- a/layout/Makefile
+++ b/layout/Makefile
@@ -155,7 +155,7 @@ ui-plan-%.ppm:	ours.dgram-%.pa.segenco.ppm Makefile
 subseg2display.o compose-segenco.o: segcmap.h
 
 clean:
-		-rm -f -- *.d4 *~ t.* *.m *.new core
+		-rm -f -- *.d4 *~ t.* *.m *.new core *.d
 		-rm -f ours.*.ps ours-*.ps parts.ps *.neato.ps ours.*.neato
 		-rm -f dualjn-*.ps
 		-rm -f *.pin-info *+pindata.asm