* New macros sbiw and INTERRUPT:

[avrcpm.git] / avrcpm / avr / sw-uart.asm

diff --git a/avrcpm/avr/sw-uart.asm b/avrcpm/avr/sw-uart.asm
index 36d814cf57ea62b0c303079527dd4a4325255c62..5d57485a3f6299f9fcb61105193c9e4d19cf8113 100644 (file)
--- a/avrcpm/avr/sw-uart.asm
+++ b/avrcpm/avr/sw-uart.asm
@@ -83,11 +83,10 @@ uart_init:
 ;------------------------------------------------------------------
 
        .cseg
-srxint:
-       .org    ICP1addr                ; Timer/Counter1 Input Capture
-       rjmp srxint                     ; Soft UART: RX
 
-       .org    srxint
+; Timer/Counter1 Input Capture interrupt
+       
+       INTERRUPT ICP1addr
        
        push    temp
        in      temp,sreg
@@ -316,11 +315,10 @@ srxi_end:
 ;----------------------------------------------------------------------
 
        .cseg
-stxint:
-       .org    OC1Aaddr                ; Timer/Counter1 Compare Match A
-       rjmp stxint                     ; Soft UART: TX
 
-       .org stxint
+; Timer/Counter1 Compare Match A interrupt
+       
+       INTERRUPT OC1Aaddr
        
        push    temp
        in      temp,sreg