projects
/
my-code
/
atmel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uart changes for tiny2313, hc595 set routine, touch timer.asm, mods to main in order...
[my-code/atmel.git]
/
led_plex
/
uart.asm
diff --git
a/led_plex/uart.asm
b/led_plex/uart.asm
index
e7a5830
..
fbfbf3d
100644
(file)
--- a/
led_plex/uart.asm
+++ b/
led_plex/uart.asm
@@
-10,51
+10,51
@@
UART_INIT:
; baudrate
ldi tmp1,UART_BR_H
; baudrate
ldi tmp1,UART_BR_H
-
sts UBRR0
H,tmp1
+
out UBRR
H,tmp1
ldi tmp1,UART_BR_L
ldi tmp1,UART_BR_L
- out UBRR
0
L,tmp1
+ out UBRRL,tmp1
; enable
ldi tmp1,(1<<RXEN)|(1<<TXEN)
; enable
ldi tmp1,(1<<RXEN)|(1<<TXEN)
- out UCSR
0
B,tmp1
+ out UCSRB,tmp1
; frame format -> 8n1
; frame format -> 8n1
- ldi tmp1,(1<<UCSZ0
0)|(1<<UCSZ0
1)
-
sts UCSR0
C,tmp1
+ ldi tmp1,(1<<UCSZ0
)|(1<<UCSZ
1)
+
out UCSR
C,tmp1
ret
UART_INT_RX_INIT:
ret
UART_INT_RX_INIT:
- in tmp1,UCSR
0
B
- sbr tmp1,(1<<RXCIE
0
)
- out UCSR
0
B,tmp1
+ in tmp1,UCSRB
+ sbr tmp1,(1<<RXCIE)
+ out UCSRB,tmp1
ret
UART_INT_TX_INIT:
ret
UART_INT_TX_INIT:
- in tmp1,UCSR
0
B
- sbr tmp1,(1<<TXCIE
0
)
- out UCSR
0
B,tmp1
+ in tmp1,UCSRB
+ sbr tmp1,(1<<TXCIE)
+ out UCSRB,tmp1
ret
UART_RX:
; get/store received byte
ret
UART_RX:
; get/store received byte
- sbis UCSR
0A,RXC0
+ sbis UCSR
A,RXC
rjmp UART_RX
rjmp UART_RX
- in uart_rxtx,UDR
0
+ in uart_rxtx,UDR
ret
UART_TX:
; transmit content of uart_rxtx
ret
UART_TX:
; transmit content of uart_rxtx
- sbis UCSR
0
A,UDRE
+ sbis UCSRA,UDRE
rjmp UART_TX
rjmp UART_TX
- out UDR
0
,uart_rxtx
+ out UDR,uart_rxtx
ret
ret