Changeset cd3a9ac in avrstuff

Timestamp:

Jul 29, 2014, 10:37:15 PM (10 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

6d8c366

Parents:

efe25a8

Message:

Make libusart aware of attiny2313.

git-svn-id: ​svn://pulkomandy.tk/avrstuff@109 c6672c3c-f6b6-47f9-9001-1fd6b12fecbe

Location:

libs/usart

Files:

• usart.c (modified) (1 diff)
• usart.h (modified) (1 diff)

libs/usart/usart.c

@@ -4 +4 @@
 #include <inttypes.h>
 
+#ifndef BAUD
+        #error You must define BAUD to use libuart.
+#endif
 
 //This function is used to initialize the USART
-//at a given UBRR value
-void USARTInit(uint16_t ubrr_value)
+void USARTInit()
 {
+        //Set Baud rate
+        #include <util/setbaud.h>
+        UBRRH = UBRRH_VALUE;
+        UBRRL = UBRRL_VALUE;
+        #if USE_2X
+                UCSRA |= (1 << U2X);
+        #else
+                UCSRA &= ~(1 << U2X);
+        #endif
 
-   //Set Baud rate
-   UBRRL = ubrr_value;
-   UBRRH = (ubrr_value>>8);
+        /*Set Frame Format
+          >> Asynchronous mode
+          >> No Parity
+          >> 1 StopBit
+          >> char size 8
+          */
+#ifdef __AVR_ATtiny2313__
+        UCSRC = (1 << UCSZ1) | (1 << UCSZ0);
+#else
+        UCSRC = (1 << URSEL) | (3 << UCSZ0);
+#endif
 
-   /*Set Frame Format
-
-
-   >> Asynchronous mode
-   >> No Parity
-   >> 1 StopBit
-   >> char size 8
-
-   */
-
-   UCSRC=(1<<URSEL)|(3<<UCSZ0);
-
-   //Enable The receiver and transmitter
-   UCSRB=(1<<RXEN)|(1<<TXEN);
+        //Enable The receiver and transmitter
+        UCSRB = (1 << RXEN) | (1 << TXEN);
 }
 

libs/usart/usart.h

@@ -1 +1 @@
 /* USART i/o library
- * Copyright 2010, Adrien Destugues <pulkomandy@pulkomandy.ath.cx>
+ * Copyright 2010-2014, Adrien Destugues <pulkomandy@pulkomandy.tk>
  * Distributed under the terms of the MIT Licence */
 
 #include <stdint.h>
 
-void USARTInit(uint16_t ubrr_value);
+void USARTInit();
 void USARTWriteChar(char data);
 void USARTWriteHex(unsigned char i);