From: ian <ian>
Date: Sun, 15 May 2005 23:52:56 +0000 (+0000)
Subject: move serial_read_char out of serial_write_... stuff; command_portaddr passes value... 
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=e3cefa44c68357e098acdbdbe03cb6f38013a30f;p=trains.git

move serial_read_char out of serial_write_... stuff; command_portaddr passes value in range
---

diff --git a/iwjpictest/harness.asm b/iwjpictest/harness.asm
index 1fdd816..6d6c785 100644
--- a/iwjpictest/harness.asm
+++ b/iwjpictest/harness.asm
@@ -237,7 +237,7 @@ command_address_confirm
 	bra		command_endswitch
 
 command_portaddr
-	add_lw		PORTA
+	add_lw		PORTA & 0x0ff
 	mov_wf		s
 	set_f		sh
 	mov_fw		original_op
@@ -421,15 +421,6 @@ serial_receive_reset ;from serial_read_if_error
 	mov_wf		RCSTA	; enable serial port, continuous rx, 8-bit
 	return
 
-;----------------------------------------
-serial_write_char
-; W		character	undefined
-serial_write_char_loop
-	bt_f_if0	PIR1, TXIF
-	bra		serial_write_char_loop
-	mov_wf		TXREG
-	return
-
 ;----------------------------------------
 serial_read_char
 ; on errors, sets LED red and transmits *
@@ -450,6 +441,15 @@ serial_read_if_error
 	rcall		serial_receive_reset
 	bra		serial_read_char_loop
 
+;----------------------------------------
+serial_write_char
+; W		character	undefined
+serial_write_char_loop
+	bt_f_if0	PIR1, TXIF
+	bra		serial_write_char_loop
+	mov_wf		TXREG
+	return
+
 ;----------------------------------------
 serial_write_hex
 ;	transmits W in hex through serial port