From: ian <ian>
Date: Fri, 30 Dec 2005 01:48:53 +0000 (+0000)
Subject: remove some xdebugs
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=213f901ad1d00e3ce1c07eef1f3e51b5b4883009;p=trains.git

remove some xdebugs
---

diff --git a/detpic/i2clib.asm b/detpic/i2clib.asm
index eb1bcda..b09c087 100644
--- a/detpic/i2clib.asm
+++ b/detpic/i2clib.asm
@@ -170,13 +170,20 @@ m_start
 ;	slave			any			slave_number
 ; expects to return directly to main program (caller)
 		mov_wf	slave
-		bra_z	m_improper_slave
 		bs_f	SSPCON2, SEN
 m_start_or_restart
 		and_lw	~31
 		bra_nz	m_improper_slave
 		bs_f	st, st_starting
+		tst_f_ifnz slave
 		return
+		; oops:
+;...
+
+m_improper_slave
+;	slave			slave number
+		i2cpanic morse_SN
+
 
 ;----------
 m_event_done_starting
@@ -220,11 +227,6 @@ m_event_done_stopping
 m_bad_address_ack
 		i2cpanic morse_SK
 
-;----------
-m_improper_slave
-;	slave			slave number
-		i2cpanic morse_SN
-
 ;========================================
 ; MASTER - WRITING
 
@@ -295,8 +297,9 @@ m_read_start_busy
 m_address_different
 ; Main program would like to address another slave for reading.
 		mov_wf	slave_next
-		bra_z	m_improper_slave
+		tst_f_ifnz slave_next
 		bra	i2cm_read_done
+		panic	morse_SO		
 
 ;----------
 m_event_done_addressing_read
diff --git a/detpic/program.asm b/detpic/program.asm
index 3549f40..0126bdf 100644
--- a/detpic/program.asm
+++ b/detpic/program.asm
@@ -88,12 +88,6 @@ master_init
 ;----------------------------------------
 master_interrupt_low @
 	enter_interrupt_low
- mov_ff INTCON, xdebug+0
- mov_ff INTCON2, xdebug+1
- mov_ff INTCON3, xdebug+2
- mov_ff PIR1, xdebug+3
- mov_ff PIR2, xdebug+4
- mov_ff PIR3, xdebug+5
 	call	tick_intrl
 	call	nmra_serialrx_intrl
 	call	power_fault_intrl