From: ian <ian>
Date: Wed, 21 Dec 2005 13:23:32 +0000 (+0000)
Subject: glue into ISR High - wip
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=9f44e66374e095689422ee9e8b99646b1f8509a3;p=trains.git

glue into ISR High - wip
---

diff --git a/detpic/master.asm b/detpic/master.asm
index ec52b36..ddd844e 100644
--- a/detpic/master.asm
+++ b/detpic/master.asm
@@ -41,6 +41,10 @@ master_interrupt_low
 	call	i2cm_intrl
 	panic	morse_IL
 
+;----------
+master_interrupt_high_notnmra
+	fixme
+
 serialrx_table_section	code	0x2000
 ;--------------------
 serialrx_generalmsg
diff --git a/detpic/nmra-stream.asm b/detpic/nmra-stream.asm
index dedc299..101ec8d 100644
--- a/detpic/nmra-stream.asm
+++ b/detpic/nmra-stream.asm
@@ -273,9 +273,9 @@ not_nmra_message
 ;****************************************************************************
  fixme reviewed up to here for inclusion in bigger program
 
-nmra_interrupt_timer
+master_interrupt_high
 	bt_f_if0 INTCON,2,0	; check whether timer0 interrupt set
-	return
+	bra	master_interrupt_high_notnmra
 	; timer0 interrupt
 	
 	debug 	','	; write 'j' to serial port