use movlw_movwf_spbrg because it has error handling

diff --git a/cebpic/nmra-stream.asm b/cebpic/nmra-stream.asm
index e56fe9ff8fa5d459ee7aae3f74bbbd62dc1997f5..5ede3c847787695c5a9c1910094d279878297877 100644 (file)
--- a/cebpic/nmra-stream.asm
+++ b/cebpic/nmra-stream.asm
@@ -113,9 +113,7 @@ initialise
 
 ; set SPBRG to get correct baud rate according to table top right p186
 ; (Tosc = 20MHz, desired baud rate = 9600)
-       movlw   serial_spbrg
-       movwf   SPBRG,0
-
+       movlw_movwf_spbrg
 
        debug   0x0A    ; LF to terminak
        debug   'a'     ; write 'a' to serial port

diff --git a/detpic/nmra-stream.asm b/detpic/nmra-stream.asm
index e56fe9ff8fa5d459ee7aae3f74bbbd62dc1997f5..5ede3c847787695c5a9c1910094d279878297877 100644 (file)
--- a/detpic/nmra-stream.asm
+++ b/detpic/nmra-stream.asm
@@ -113,9 +113,7 @@ initialise
 
 ; set SPBRG to get correct baud rate according to table top right p186
 ; (Tosc = 20MHz, desired baud rate = 9600)
-       movlw   serial_spbrg
-       movwf   SPBRG,0
-
+       movlw_movwf_spbrg
 
        debug   0x0A    ; LF to terminak
        debug   'a'     ; write 'a' to serial port

diff --git a/iwjpictest/harness.asm b/iwjpictest/harness.asm
index e7744d0b6ef29639ebbcd44a94e79425ea2465a9..e807c75e0298261629ed48a99fb5f1d9cfba4c2e 100644 (file)
--- a/iwjpictest/harness.asm
+++ b/iwjpictest/harness.asm
@@ -423,8 +423,7 @@ serial_setup
 ; W            undefined       undefined
        mov_lw          (1<<TXEN) | serial_brgh | (1<<TRMT)
        mov_wf          TXSTA   ; asynch xmit enabled, high baud rate, 8-bit,
-       mov_lw          serial_spbrg
-       mov_wf          SPBRG   ; 9600bps (with BRGH)
+       movlw_movwf_spbrg
 serial_receive_reset ;from serial_read_if_error
        mov_lw          (1<<SPEN) | (1<<CREN)
        mov_wf          RCSTA   ; enable serial port, continuous rx, 8-bit