From c27023641680161cd31e7dfe9c7420e7a7abeb83 Mon Sep 17 00:00:00 2001 From: asterix Date: Thu, 10 Jun 2010 15:37:04 +0000 Subject: [PATCH] Update the interrupt signal to new style. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3914 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cpu/avr/drv/ser_avr.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/bertos/cpu/avr/drv/ser_avr.c b/bertos/cpu/avr/drv/ser_avr.c index edbd217c..2d25fbeb 100644 --- a/bertos/cpu/avr/drv/ser_avr.c +++ b/bertos/cpu/avr/drv/ser_avr.c @@ -33,8 +33,6 @@ * * \brief AVR UART and SPI I/O driver (Implementation) * - * \version $Id$ - * * \author Bernie Innocenti * \author Stefano Fedrigo * \author Luca Ottaviano @@ -286,7 +284,7 @@ #define AVR_HAS_UART1 0 #define USART0_UDRE_vect USART_UDRE_vect #define USART0_RX_vect USART_RX_vect - #define SIG_UART0_TRANS SIG_UART_TRANS + #define USART0_TX_vect USART_TX_vect #elif CPU_AVR_ATMEGA8 #define AVR_HAS_UART1 0 #define UCSR0A UCSRA @@ -295,20 +293,18 @@ #define UDR0 UDR #define UBRR0L UBRRL #define UBRR0H UBRRH -/* TODO: The following SIGs are old style interrupts, must be refactored */ - #define SIG_UART0_DATA SIG_UART_DATA - #define SIG_UART0_RECV SIG_UART_RECV - #define SIG_UART0_TRANS SIG_UART_TRANS + #define USART0_UDRE_vect USART_UDRE_vect + #define USART0_RX_vect USART_RX_vect + #define USART0_TX_vect USART_TX_vect #elif CPU_AVR_ATMEGA103 #define AVR_HAS_UART1 0 #define UCSR0B UCR #define UDR0 UDR #define UCSR0A USR #define UBRR0L UBRR -/* TODO: The following SIGs are old style interrupts, must be refactored */ - #define SIG_UART0_DATA SIG_UART_DATA - #define SIG_UART0_RECV SIG_UART_RECV - #define SIG_UART0_TRANS SIG_UART_TRANS + #define USART0_UDRE_vect USART_UDRE_vect + #define USART0_RX_vect USART_RX_vect + #define USART0_TX_vect USART_TX_vect #else #error Unknown architecture #endif @@ -733,7 +729,7 @@ DECLARE_ISR(USART0_UDRE_vect) * otherwise we'd stop the serial port with some data * still pending in the buffer. */ -DECLARE_ISR(SIG_UART0_TRANS) +DECLARE_ISR(USART0_TX_vect) { SER_STROBE_ON; -- 2.25.1