X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=firmware%2Fserial.c;h=2bf6901836064ece4517047dcb8d94f70838d99f;hb=d0af7846e05691d65d8021e46c8f81e8ca05199a;hp=b7219ae337381b724c0bcd0877185bbf2f8dda69;hpb=ed7a7139f4858fe5d0c756798538d25893bf58b2;p=r2c2.git

diff --git a/firmware/serial.c b/firmware/serial.c
index b7219ae..2bf6901 100644
--- a/firmware/serial.c
+++ b/firmware/serial.c
@@ -1,11 +1,8 @@
 #include <avr/io.h>
-#include <avr/interrupt.h>
 #include "serial.h"
 
 #define BIT(n) (1<<(n))
 
-static SerialCallback *serial_callback = 0;
-
 void serial_init(uint16_t baud)
 {
 	DDRD = (DDRD&~0x03) | 0x02;
@@ -15,13 +12,7 @@ void serial_init(uint16_t baud)
 	UBRR0H = baud>>8;
 	UBRR0L = baud;
 	UCSR0C = BIT(UCSZ00) | BIT(UCSZ01);  // 8N1
-	UCSR0B = BIT(RXEN0) | BIT(TXEN0);
-}
-
-void serial_set_callback(SerialCallback *cb)
-{
-	serial_callback = cb;
-	UCSR0B |= BIT(RXCIE0);
+	UCSR0B = BIT(RXEN0) | BIT(TXEN0) | BIT(RXCIE0);
 }
 
 void serial_write(uint8_t c)
@@ -29,8 +20,3 @@ void serial_write(uint8_t c)
 	while(!(UCSR0A&(1<<UDRE0))) ;
 	UDR0 = c;
 }
-
-ISR(USART_RX_vect)
-{
-	serial_callback(UDR0);
-}