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

diff --git a/hdw-tank/uart.asm b/hdw-tank/uart.asm
index bb189da..aaa0249 100644
--- a/hdw-tank/uart.asm
+++ b/hdw-tank/uart.asm
@@ -9,34 +9,34 @@
 UART_INIT:
 
 	; baudrate
-	ldi uart_rxtx,UART_BR_H
-	sts UBRR0H,uart_rxtx
-	ldi uart_rxtx,UART_BR_L
-	out UBRR0L,uart_rxtx
+	ldi tmp1,UART_BR_H
+	sts UBRR0H,tmp1
+	ldi tmp1,UART_BR_L
+	out UBRR0L,tmp1
 
 	; enable
-	ldi uart_rxtx,(1<<RXEN)|(1<<TXEN)
-	out UCSR0B,uart_rxtx
+	ldi tmp1,(1<<RXEN)|(1<<TXEN)
+	out UCSR0B,tmp1
 
 	; frame format -> 8n1
-	ldi uart_rxtx,(1<<UCSZ00)|(1<<UCSZ01)
-	sts UCSR0C,uart_rxtx
+	ldi tmp1,(1<<UCSZ00)|(1<<UCSZ01)
+	sts UCSR0C,tmp1
 
 	ret
 
 UART_INT_RX_INIT:
 
-	in uart_rxtx,UCSR0B
-	sbr uart_rxtx,(1<<RXCIE0)
-	out UCSR0B,uart_rxtx
+	in tmp1,UCSR0B
+	sbr tmp1,(1<<RXCIE0)
+	out UCSR0B,tmp1
 
 	ret
 
 UART_INT_TX_INIT:
 
-	in uart_rxtx,UCSR0B
-	sbr uart_rxtx,(1<<TXCIE0)
-	out UCSR0B,uart_rxtx
+	in tmp1,UCSR0B
+	sbr tmp1,(1<<TXCIE0)
+	out UCSR0B,tmp1
 
 	ret
 
@@ -52,7 +52,7 @@ UART_RX:
 UART_TX:
 
 	; transmit content of uart_rxtx
-	sbis UCSR0A,TXC0
+	sbis UCSR0A,UDRE
 		rjmp UART_TX
 	out UDR0,uart_rxtx