From: ian <ian>
Date: Tue, 20 Dec 2005 22:47:27 +0000 (+0000)
Subject: serial_interrupts_init abolished; now part of serial_init
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=334db9a33d2d492eeeb82bf48946c967f3f6c7ba;p=trains.git

serial_interrupts_init abolished; now part of serial_init
---

diff --git a/detpic/master.asm b/detpic/master.asm
index 6d5525a..61acf46 100644
--- 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 17f0eb5..c95f479 100644
--- 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
 
 ;----------------------------------------------------------------------------