X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=hdw-tank%2Fuart.asm;h=aaa024967465e8a89ff1f6ae0af9c2ca09ea3bfc;hb=12dfe92063a52e73ca7522afbf19e7baf0990e41;hp=1ca82e08995e55fa26e0c3c14fae516952d60a8d;hpb=bc07798b093617e4b907b3fdb2155dc098b03e0b;p=my-code%2Fatmel.git

diff --git a/hdw-tank/uart.asm b/hdw-tank/uart.asm
index 1ca82e0..aaa0249 100644
--- a/hdw-tank/uart.asm
+++ b/hdw-tank/uart.asm
@@ -1,36 +1,60 @@
 ; uart functions
 
+; default uart settings
+; infdef UART_BR_H
+.equ	UART_BR_H	= 0
+; infdef UART_BR_L
+.equ	UART_BR_L	= 25
+
 UART_INIT:
 
 	; baudrate
-	ldi tmp,
-	out UBRRH,tmp
-	ldi tmp,
-	out UBRRL,tmp
+	ldi tmp1,UART_BR_H
+	sts UBRR0H,tmp1
+	ldi tmp1,UART_BR_L
+	out UBRR0L,tmp1
 
 	; enable
-	ldi tmp,(1<<RXEN)|(1<<TXEN)
-	out UCSRB,tmp
+	ldi tmp1,(1<<RXEN)|(1<<TXEN)
+	out UCSR0B,tmp1
+
+	; frame format -> 8n1
+	ldi tmp1,(1<<UCSZ00)|(1<<UCSZ01)
+	sts UCSR0C,tmp1
+
+	ret
+
+UART_INT_RX_INIT:
+
+	in tmp1,UCSR0B
+	sbr tmp1,(1<<RXCIE0)
+	out UCSR0B,tmp1
+
+	ret
+
+UART_INT_TX_INIT:
 
-	; frame format
+	in tmp1,UCSR0B
+	sbr tmp1,(1<<TXCIE0)
+	out UCSR0B,tmp1
 
 	ret
 
 UART_RX:
 
 	; get/store received byte
-	sbis UCSRA,RXC
+	sbis UCSR0A,RXC0
 		rjmp UART_RX
-	in tmp,UDR0
+	in uart_rxtx,UDR0
 
 	ret
 
 UART_TX:
 
-	; transmit content of tmp
-	sbis UCSRA,UDRE
+	; transmit content of uart_rxtx
+	sbis UCSR0A,UDRE
 		rjmp UART_TX
-	out UDR0,tmp
+	out UDR0,uart_rxtx
 
 	ret