X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.c;h=5761d688105fca9c9e1c0b01f21cd90d486ea4a5;hb=76c53bfa0136be55cf17e57b1ee098e5dfeefa70;hp=268e739b73a1ab90067e34eacf05ddc5e7e0f9a1;hpb=29b60d46e5a1c0c092fde92816a20d831f54fbfd;p=bertos.git

diff --git a/drv/ser.c b/drv/ser.c
index 268e739b..5761d688 100755
--- a/drv/ser.c
+++ b/drv/ser.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 Buffered serial I/O driver
@@ -28,6 +28,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.26  2005/11/04 16:20:02  bernie
+ *#* Fix reference to README.devlib in header.
+ *#*
+ *#* Revision 1.25  2005/04/11 19:10:27  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.24  2005/01/21 20:13:15  aleph
+ *#* Fix drain at ser_close()
+ *#*
  *#* Revision 1.23  2005/01/14 00:47:07  aleph
  *#* ser_drain(): Wait for hw transmission complete.
  *#*
@@ -99,9 +108,9 @@
 #include "ser.h"
 #include "ser_p.h"
 #include <mware/formatwr.h>
-#include <debug.h>
+#include <cfg/debug.h>
 #include <hw.h>
-#include <config.h>
+#include <cfg/config.h>
 
 /*
  * Sanity check for config parameters required by this module.
@@ -507,8 +516,13 @@ void ser_close(struct Serial *port)
 
 	// Wait until we finish sending everything
 	ser_drain(port);
-	ser_purge(port);
 
 	port->hw->table->cleanup(port->hw);
 	DB(port->hw = NULL;)
+
+	/*
+	 * We purge the FIFO buffer only after the low-level cleanup, so that
+	 * we are sure that there are no more interrupts.
+	 */
+	ser_purge(port);
 }