projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make emulator display a bit larger.
[bertos.git]
/
drv
/
ser_avr.c
diff --git
a/drv/ser_avr.c
b/drv/ser_avr.c
index ac31b3fcc85f95546a56e0f1f7162370f993a86e..90d81fc429a4518bb213d897a21f52e0e819ab68 100755
(executable)
--- a/
drv/ser_avr.c
+++ b/
drv/ser_avr.c
@@
-3,7
+3,7
@@
* <!--
* Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
* Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
* <!--
* Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
* Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
- * This file is part of DevLib - See
devlib/README
for information.
+ * This file is part of DevLib - See
README.devlib
for information.
* -->
*
* \brief AVR UART and SPI I/O driver
* -->
*
* \brief AVR UART and SPI I/O driver
@@
-38,6
+38,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.29 2005/11/27 23:31:48 bernie
+ *#* Support avr-libc 1.4.
+ *#*
+ *#* Revision 1.28 2005/11/04 16:20:02 bernie
+ *#* Fix reference to README.devlib in header.
+ *#*
*#* Revision 1.27 2005/07/03 15:19:31 bernie
*#* Doxygen fix.
*#*
*#* Revision 1.27 2005/07/03 15:19:31 bernie
*#* Doxygen fix.
*#*
@@
-117,15
+123,19
@@
#include "ser.h"
#include "ser_p.h"
#include "ser.h"
#include "ser_p.h"
-#include <cfg/config.h>
#include "hw.h" /* Required for bus macros overrides */
#include "hw.h" /* Required for bus macros overrides */
+#include <appconfig.h>
#include <cfg/debug.h>
#include <drv/timer.h>
#include <mware/fifobuf.h>
#include <cfg/debug.h>
#include <drv/timer.h>
#include <mware/fifobuf.h>
-#include <avr/signal.h>
#include <avr/io.h>
#include <avr/io.h>
+#if defined(__AVR_LIBC_VERSION__) && (__AVR_LIBC_VERSION__ >= 10400UL)
+ #include <avr/interrupt.h>
+#else
+ #include <avr/signal.h>
+#endif
#if !CONFIG_SER_HWHANDSHAKE
#if !CONFIG_SER_HWHANDSHAKE