clean up + uart tx fix

[my-code/atmel.git] / hdw-tank / uart.asm

diff --git a/hdw-tank/uart.asm b/hdw-tank/uart.asm
index bb189da..aaa0249 100644 (file)
--- 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