X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=drv%2Fser_avr.c;h=2d0ae6d0ddf3dc5287932433ff7ece93d3f926e2;hb=6ca5e6259460b1541d1b6e6d3f1ac9734901f573;hp=646f3fe8d7c48c8a37e52fbe5fd38399704e6c39;hpb=af9c555446161016fdd76c1cdff96ce76bb6cba2;p=bertos.git

diff --git a/drv/ser_avr.c b/drv/ser_avr.c
index 646f3fe8..2d0ae6d0 100755
--- 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>
- * 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
@@ -38,6 +38,21 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.31  2006/05/18 00:37:29  bernie
+ *#* Use hw_ser.h instead of ubiquitous hw.h.
+ *#*
+ *#* 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.27  2005/07/03 15:19:31  bernie
+ *#* Doxygen fix.
+ *#*
  *#* Revision 1.26  2005/04/11 19:10:27  bernie
  *#* Include top-level headers from cfg/ subdir.
  *#*
@@ -114,15 +129,19 @@
 
 #include "ser.h"
 #include "ser_p.h"
-#include <cfg/config.h>
-#include "hw.h"  /* Required for bus macros overrides */
+#include "hw_ser.h"  /* Required for bus macros overrides */
+#include <appconfig.h>
 
 #include <cfg/debug.h>
 #include <drv/timer.h>
 #include <mware/fifobuf.h>
 
-#include <avr/signal.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
@@ -264,8 +283,6 @@
  */
 #ifndef SER_SPI_BUS_TXINIT
 	/*!
-	 * \def SER_SPI_BUS_TXINIT
-	 *
 	 * Default TXINIT macro - invoked in spi_init()
 	 * The default is no action.
 	 */
@@ -274,8 +291,6 @@
 
 #ifndef SER_SPI_BUS_TXCLOSE
 	/*!
-	 * \def SER_SPI_BUS_TXCLOSE
-	 *
 	 * Invoked after the last character has been transmitted.
 	 * The default is no action.
 	 */
@@ -655,7 +670,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;