X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=led_plex%2Fuart.asm;h=fbfbf3d9342ff655be3bf5dfbac3461ca1a5ef80;hb=87ef21d9eacec01abdbf3306dd2493aecf0b4afb;hp=e7a58309df67af977e0e268effea2b293577fa12;hpb=76492de1fddc432eb4bf67df8cec93e00641eb78;p=my-code%2Fatmel.git

diff --git a/led_plex/uart.asm b/led_plex/uart.asm
index e7a5830..fbfbf3d 100644
--- a/led_plex/uart.asm
+++ b/led_plex/uart.asm
@@ -10,51 +10,51 @@ UART_INIT:
 
 	; baudrate
 	ldi tmp1,UART_BR_H
-	sts UBRR0H,tmp1
+	out UBRRH,tmp1
 	ldi tmp1,UART_BR_L
-	out UBRR0L,tmp1
+	out UBRRL,tmp1
 
 	; enable
 	ldi tmp1,(1<<RXEN)|(1<<TXEN)
-	out UCSR0B,tmp1
+	out UCSRB,tmp1
 
 	; frame format -> 8n1
-	ldi tmp1,(1<<UCSZ00)|(1<<UCSZ01)
-	sts UCSR0C,tmp1
+	ldi tmp1,(1<<UCSZ0)|(1<<UCSZ1)
+	out UCSRC,tmp1
 
 	ret
 
 UART_INT_RX_INIT:
 
-	in tmp1,UCSR0B
-	sbr tmp1,(1<<RXCIE0)
-	out UCSR0B,tmp1
+	in tmp1,UCSRB
+	sbr tmp1,(1<<RXCIE)
+	out UCSRB,tmp1
 
 	ret
 
 UART_INT_TX_INIT:
 
-	in tmp1,UCSR0B
-	sbr tmp1,(1<<TXCIE0)
-	out UCSR0B,tmp1
+	in tmp1,UCSRB
+	sbr tmp1,(1<<TXCIE)
+	out UCSRB,tmp1
 
 	ret
 
 UART_RX:
 
 	; get/store received byte
-	sbis UCSR0A,RXC0
+	sbis UCSRA,RXC
 		rjmp UART_RX
-	in uart_rxtx,UDR0
+	in uart_rxtx,UDR
 
 	ret
 
 UART_TX:
 
 	; transmit content of uart_rxtx
-	sbis UCSR0A,UDRE
+	sbis UCSRA,UDRE
 		rjmp UART_TX
-	out UDR0,uart_rxtx
+	out UDR,uart_rxtx
 
 	ret