X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=firmware%2Flib%2Fatmega168.c;h=a5e8cb742ef21a4b7cc662990ed87b4b06240941;hb=06d93d3f05cbb24e09513714fcdbc72f6f379da9;hp=1ed8840fed53e3cf99d88f024b95c4ed8f46e4a7;hpb=5ac4c1769e9976b39e919bb5f5ac9e97f62e7d0f;p=goodfet

diff --git a/firmware/lib/atmega168.c b/firmware/lib/atmega168.c
index 1ed8840..a5e8cb7 100644
--- a/firmware/lib/atmega168.c
+++ b/firmware/lib/atmega168.c
@@ -51,15 +51,14 @@ void setbaud0(unsigned char rate){
     break;
   }
   
-  uint16_t bittimer=( F_CPU / SPEED / 16 ) - 1;
-  UBRR0H = (unsigned char) (bittimer >> 8);
-  UBRR0L = (unsigned char) bittimer;
+#define F_CPU 8000000L
+#define BAUD 115200L
+#include <util/setbaud.h>
+  UBRR0H = UBRRH_VALUE;
+  UBRR0L = UBRRL_VALUE;
   
-  
-  /* set the framing to 8N1 */
-  UCSR0C = (3 << UCSZ00);
-  /* Engage! */
-  UCSR0B = (1 << RXEN0) | (1 << TXEN0);
+  UCSR0C = _BV(UCSZ01) | _BV(UCSZ00);
+  UCSR0B = _BV(RXEN0) | _BV(TXEN0);
   return;
   
 }
@@ -88,22 +87,13 @@ void setbaud1(unsigned char rate){
 }
 
 
-void msp430_init_uart0(){
-}
-
-
-void msp430_init_uart1(){
+void avr_init_uart0(){
+  setbaud0(0);
 }
 
 
-
-//! Initialization is correct.
-void msp430_init_dco_done(){
-  //Nothing to do for the AVR w/ xtal.
+void avr_init_uart1(){
 }
 
 
-void msp430_init_dco() {
-  //
-}