[avr-libc-commit] [2134] Submitted by Heike C.

[Joerg Wunsch]

Revision: 2134
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2134
Author:   joerg_wunsch
Date:     2010-06-08 11:19:48 +0000 (Tue, 08 Jun 2010)
Log Message:
-----------
Submitted by Heike C. Zimmerer:
patch #6897: Allow <util/setbaud.h> to be used with assembler source
* include/util/setbaud.h: Add assembler snippets (no UL suffix
added to numbers)

Ticket Links:
:-----------
    http://savannah.gnu.org/patch/?6897

Modified Paths:
--------------
    trunk/avr-libc/ChangeLog
    trunk/avr-libc/NEWS
    trunk/avr-libc/include/util/setbaud.h

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2010-06-08 11:10:43 UTC (rev 2133)
+++ trunk/avr-libc/ChangeLog    2010-06-08 11:19:48 UTC (rev 2134)
@@ -1,5 +1,12 @@
 2010-06-08  Joerg Wunsch <address@hidden>
 
+       Submitted by Heike C. Zimmerer:
+       patch #6897: Allow <util/setbaud.h> to be used with assembler source
+       * include/util/setbaud.h: Add assembler snippets (no UL suffix
+       added to numbers)
+
+2010-06-08  Joerg Wunsch <address@hidden>
+
        Add test scripts for <util/crc16.h>
        * tests/simulate/util/crc16-1.c: New file.
        * tests/simulate/util/crc16-2.c: (Ditto.)

Modified: trunk/avr-libc/NEWS
===================================================================
--- trunk/avr-libc/NEWS 2010-06-08 11:10:43 UTC (rev 2133)
+++ trunk/avr-libc/NEWS 2010-06-08 11:19:48 UTC (rev 2134)
@@ -284,7 +284,8 @@
   [#6720] FAQ update. Add EEPROM section, baud rate section. Correct spelling.
   [#6878] eewr_byte.S update for patch #6718
   [#6895] Improved malloc behaviour when expanding used area
-  
+  [#6897] Allow <util/setbaud.h> to be used with assembler source
+
 * New functions:
 
    cbrt

Modified: trunk/avr-libc/include/util/setbaud.h
===================================================================
--- trunk/avr-libc/include/util/setbaud.h       2010-06-08 11:10:43 UTC (rev 
2133)
+++ trunk/avr-libc/include/util/setbaud.h       2010-06-08 11:19:48 UTC (rev 
2134)
@@ -191,7 +191,11 @@
 #  define BAUD_TOL 2
 #endif
 
+#ifdef __ASSEMBLER__
+#define UBRR_VALUE (((F_CPU) + 8 * (BAUD)) / (16 * (BAUD)) -1)
+#else
 #define UBRR_VALUE (((F_CPU) + 8UL * (BAUD)) / (16UL * (BAUD)) -1UL)
+#endif
 
 #if 100 * (F_CPU) > \
   (16 * ((UBRR_VALUE) + 1)) * (100 * (BAUD) + (BAUD) * (BAUD_TOL))
@@ -206,7 +210,12 @@
 #if USE_2X
 /* U2X required, recalculate */
 #undef UBRR_VALUE
+
+#ifdef __ASSEMBLER__
+#define UBRR_VALUE (((F_CPU) + 4 * (BAUD)) / (8 * (BAUD)) -1)
+#else
 #define UBRR_VALUE (((F_CPU) + 4UL * (BAUD)) / (8UL * (BAUD)) -1UL)
+#endif
 
 #if 100 * (F_CPU) > \
   (8 * ((UBRR_VALUE) + 1)) * (100 * (BAUD) + (BAUD) * (BAUD_TOL))