projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix naming conventions.
[bertos.git]
/
drv
/
ser_avr.c
diff --git
a/drv/ser_avr.c
b/drv/ser_avr.c
index e31a77dcb30794d165f53aab6e31833cb2d704c4..5e0dc4d87fb25b0febb398f5d23e4736361f09ca 100755
(executable)
--- a/
drv/ser_avr.c
+++ b/
drv/ser_avr.c
@@
-38,6
+38,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.30 2006/02/17 22:23:06 bernie
+ *#* Update POSIX serial emulator.
+ *#*
+ *#* 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.28 2005/11/04 16:20:02 bernie
*#* Fix reference to README.devlib in header.
*#*
@@
-120,15
+126,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
@@
-657,7
+667,7
@@
static struct AvrSerial UARTDescs[SER_CNT] =
}
};
}
};
-struct SerialHardware
*
ser_hw_getdesc(int unit)
+struct SerialHardware
*
ser_hw_getdesc(int unit)
{
ASSERT(unit < SER_CNT);
return &UARTDescs[unit].hw;
{
ASSERT(unit < SER_CNT);
return &UARTDescs[unit].hw;