names

Author: githubgilhad

SW/libs/Serial/usart0/usart0.S

@@ -132,7 +132,7 @@ USART0_RX_ISR:
 ; count ok?
 lds r18, RX0_Count
 cpi r18, RX0_BUFFER_SIZE; is buffer full?
-breq RX0_FULL ; if yes, exit and ignore this char
+breq .L_RX0_exit ; if yes, exit and ignore this char
 
 lds r19, RX0_Head; not full, add char
 ldi ZL, lo8(RX0_Buffer)
@@ -150,8 +150,7 @@ USART0_RX_ISR:
 sts RX0_Head, r19; normal way
 
 
-RX0_EXIT:
-RX0_FULL:
+.L_RX0_exit:
 IRQ_pop_16_20_Z
 IRQ_pop_entry
 reti
@@ -162,7 +161,7 @@ RX0_Read:
 lds r18, RX0_Count
 mov r25,r18
 cpi r18, 0
-breq RX0_EMPTY_FUNC
+breq .L_RX0_empty
 lds r19, RX0_Tail
 ldi ZL, lo8(RX0_Buffer)
 ldi ZH, hi8(RX0_Buffer)
@@ -183,14 +182,14 @@ RX0_Read:
 sts RX0_Tail, r19
 ;	ldi r25, 1
 ret
-RX0_EMPTY_FUNC:
+.L_RX0_empty:
 clr r24
 ;	clr r25
 ret
 
-; === RX0_available: r24 = RX0_Count (# of waiting chars)
-.global RX0_available
-RX0_available:
+; === RX0_Available: r24 = RX0_Count (# of waiting chars)
+.global RX0_Available
+RX0_Available:
 lds r24,RX0_Count
 ret
 
@@ -202,7 +201,7 @@ USART0_UDRE_ISR:
 
 lds r18, TX0_Count
 cpi r18, 0
-breq TX0_EMPTY
+breq .L_TX0_empty
 
 lds r19, TX0_Tail
 ldi ZL, lo8(TX0_Buffer)
@@ -220,13 +219,13 @@ USART0_UDRE_ISR:
 1:
 sts TX0_Tail, r19; normal way
 
-rjmp TX0__exit
-TX0_EMPTY:
+rjmp .L_TX0_exit
+.L_TX0_empty:
 ; zakázat UDRE interrupt pokud nic k odeslání
 lds r16, UCSR0B
 andi r16, ~(1 << UDRIE0)
 sts UCSR0B, r16
-TX0__exit:
+.L_TX0_exit:
 IRQ_pop_16_20_Z
 IRQ_pop_entry
 reti
@@ -267,15 +266,15 @@ TX0_Write:
 mov r24,r18
 ret
 
-; === TX0_used: output: r24 used space in TX buffer
-.global TX0_used
-TX0_used:
+; === TX0_Used: output: r24 used space in TX buffer
+.global TX0_Used
+TX0_Used:
 lds r24, TX0_Count
 ret
 
-; === TX0_free: output: r24 available space in TX buffer
-.global TX0_free
-TX0_free:
+; === TX0_Free: output: r24 available space in TX buffer
+.global TX0_Free
+TX0_Free:
 ldi r24, TX0_BUFFER_SIZE
 lds r25, TX0_Count
 sub r24,r25

SW/libs/Serial/usart0/usart0.h

@@ -3,9 +3,9 @@
 void usart0_setup();
 uint16_t RX0_Read();// r24 = character (or 0), r25 = 0 if no char available, buf_used+1 otherwise
 uint8_t TX0_Write(char c);// c=char to write, r24=buf_used. BLOCKS if buffer full
-uint8_t RX0_available();// available chars in RX buffer
-uint8_t TX0_used();// used space in TX buffer
-uint8_t TX0_free();// available space in TX buffer
+uint8_t RX0_Available();// available chars in RX buffer
+uint8_t TX0_Used();// used space in TX buffer
+uint8_t TX0_Free();// available space in TX buffer
 void USART0_RX_ISR();
 void USART0_UDRE_ISR();
 

SW/progs/test/usart0_echo/usart0_echo.S

@@ -2,9 +2,6 @@
 ; LIBS: isr_stub vectors_table
 #include <avr/io.h>
 #include <avr/interrupt.h>
-.extern usart0_setup
-.extern RX0_Read
-.extern TX0_Write
 
 .section .text
 nop; ctors end and trampolines will be here, lets have RESET named

SW/progs/test/usart0_echo2/usart0_echo2.S

@@ -2,12 +2,7 @@
 ; LIBS: isr_stub vectors_table
 #include <avr/io.h>
 #include <avr/interrupt.h>
-.extern usart0_setup
-.extern RX0_Read
-.extern TX0_Write
-.extern RX0_available
-.extern TX0_free
-
+;
 .section .text
 nop; ctors end and trampolines will be here, lets have RESET named
 ; === RESET
@@ -35,9 +30,9 @@ setup:
 
 loop:
 
-rcall RX0_available
+rcall RX0_Available
 sts PORTK,r24
-rcall TX0_used
+rcall TX0_Used
 out _SFR_IO_ADDR(PORTF),r24
 
 rcall RX0_Read