serial_interrupts_init abolished; now part of serial_init

diff --git a/detpic/master.asm b/detpic/master.asm
index 6d5525a54fe4e54f0a8515369648e99b99495b14..61acf46adad4005c485915fa2214fe179aad0bf8 100644 (file)
--- a/detpic/master.asm
+++ b/detpic/master.asm
@@ -15,9 +15,7 @@ master
        call    points_local_init
        call    polarity_local_init
        call    detect_local_init
-
        call    serial_init
-       call    serial_interrupts_init
        call    nmra_init
 
  panic morse_TI4

diff --git a/detpic/nmra-stream.asm b/detpic/nmra-stream.asm
index 17f0eb5b84105940699b73a5a99e3ac53e194d64..c95f479c73578665ee61ff978a25f3e5bf53a575 100644 (file)
--- a/detpic/nmra-stream.asm
+++ b/detpic/nmra-stream.asm
@@ -81,13 +81,12 @@ serial_init
 ; set SPBRG to get correct baud rate according to table top right p186
 ; (Tosc = 20MHz, desired baud rate = 9600)
        movlw_movwf_spbrg
-       return
 
-serial_interrupts_init
        mov_lw  ~((1<<RCIP) | (1<<TXIP))
        and_wf  IPR1            ; serial interrupts: low priority
        mov_lw  (1<<RCIE) | (1<<TXIE)
        ior_wf  PIE1            ; serial interrupt: interrupt enable
+
        return
 
 ;----------------------------------------------------------------------------