move serial_read_char out of serial_write_... stuff; command_portaddr passes value...

diff --git a/iwjpictest/harness.asm b/iwjpictest/harness.asm
index 1fdd816151a137d57519ff448333e01770b58054..6d6c7857337160142a480ccfb413f85c47d348f1 100644 (file)
--- 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