X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.c;h=11e34c8ff027c7237676036a912e8d1c93673871;hb=5b9ba07bc069e4403dd5713b6be6c5f98f8a86a7;hp=598ea8853ab6ce3bd1985f5484166a80f2a509b6;hpb=23d4877db88a9a6ba9a59a2335410cfd38867d76;p=bertos.git

diff --git a/drv/ser.c b/drv/ser.c
old mode 100755
new mode 100644
index 598ea885..11e34c8f
--- a/drv/ser.c
+++ b/drv/ser.c
@@ -1,9 +1,34 @@
 /**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \brief Buffered serial I/O driver
@@ -26,107 +51,8 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.33  2006/11/17 18:15:55  batt
- *#* Avoid race conditions.
- *#*
- *#* Revision 1.32  2006/11/17 17:03:58  batt
- *#* Implement ser_setstatus and ser_getstatus as functions to avoid race conditions.
- *#*
- *#* Revision 1.31  2006/07/21 10:58:00  batt
- *#* Use timer_clock() instead of obsolete timer_ticks().
- *#*
- *#* Revision 1.30  2006/07/19 12:56:26  bernie
- *#* Convert to new Doxygen style.
- *#*
- *#* Revision 1.29  2006/05/18 00:39:30  bernie
- *#* ser_open(): Document a bit more.
- *#*
- *#* Revision 1.28  2006/02/17 22:23:06  bernie
- *#* Update POSIX serial emulator.
- *#*
- *#* Revision 1.27  2005/11/27 23:33:40  bernie
- *#* Use appconfig.h instead of cfg/config.h.
- *#*
- *#* 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.
- *#*
- *#* Revision 1.22  2004/12/08 08:56:14  bernie
- *#* Rename time_t to mtime_t.
- *#*
- *#* Revision 1.21  2004/11/16 18:10:13  bernie
- *#* Add sanity checks for missing configuration parameters.
- *#*
- *#* Revision 1.20  2004/10/19 11:48:00  bernie
- *#* Remove unused variable.
- *#*
- *#* Revision 1.19  2004/10/19 08:14:13  bernie
- *#* Fix a few longstanding bugs wrt status handling (made by rasky on scfirm).
- *#*
- *#* Revision 1.18  2004/09/20 03:31:15  bernie
- *#* Sanitize for C++.
- *#*
- *#* Revision 1.17  2004/09/14 21:06:07  bernie
- *#* Use debug.h instead of kdebug.h; Spelling fixes.
- *#*
- *#* Revision 1.16  2004/09/06 21:40:50  bernie
- *#* Move buffer handling in chip-specific driver.
- *#*
- *#* Revision 1.15  2004/08/25 14:12:08  rasky
- *#* Aggiornato il comment block dei log RCS
- *#*
- *#* Revision 1.14  2004/08/24 16:22:57  bernie
- *#* Thinkos; Doxygen fixes
- *#*
- *#* Revision 1.13  2004/08/24 16:20:48  bernie
- *#* ser_read(): Make buffer argument void *#* for consistency with ANSI C and ser_write()
- *#*
- *#* Revision 1.12  2004/08/24 13:49:39  bernie
- *#* Fix thinko.
- *#*
- *#* Revision 1.11  2004/08/15 05:32:22  bernie
- *#* ser_resync(): New function.
- *#*
- *#* Revision 1.10  2004/08/10 06:29:50  bernie
- *#* Rename timer_gettick() to timer_ticks().
- *#*
- *#* Revision 1.9  2004/08/08 06:06:20  bernie
- *#* Use new-style CONFIG_ idiom; Fix module-wide documentation.
- *#*
- *#* Revision 1.8  2004/07/29 22:57:09  bernie
- *#* ser_drain(): New function; Make Serial::is_open a debug-only feature; Switch to new-style CONFIG_* macros.
- *#*
- *#* Revision 1.7  2004/07/18 21:49:03  bernie
- *#* Make CONFIG_SER_DEFBAUDRATE optional.
- *#*
- *#* Revision 1.6  2004/06/07 15:56:28  aleph
- *#* Remove cast-as-lvalue extension abuse
- *#*
- *#* Revision 1.5  2004/06/06 16:41:44  bernie
- *#* ser_putchar(): Use fifo_push_locked() to fix potential race on 8bit processors.
- *#*
- *#* Revision 1.4  2004/06/03 11:27:09  bernie
- *#* Add dual-license information.
- *#*
- *#* Revision 1.3  2004/06/02 21:35:24  aleph
- *#* Serial enhancements: interruptible receive handler and 8 bit serial status for AVR; remove volatile attribute to FIFOBuffer, useless for new fifobuf routens
- *#*
- *#* Revision 1.2  2004/05/23 18:21:53  bernie
- *#* Trim CVS logs and cleanup header info.
- *#*
- *#*/
-
 #include "ser.h"
+#include "wdt.h"
 #include "ser_p.h"
 #include <mware/formatwr.h>
 #include <cfg/debug.h>
@@ -192,6 +118,7 @@ int ser_putchar(int c, struct Serial *port)
 		/* Attende finche' il buffer e' pieno... */
 		do
 		{
+			wdt_reset();
 #if CONFIG_KERNEL && CONFIG_KERN_SCHED
 			/* Give up timeslice to other processes. */
 			proc_switch();
@@ -236,6 +163,7 @@ int ser_getchar(struct Serial *port)
 		/* Wait while buffer is empty */
 		do
 		{
+			wdt_reset();
 #if CONFIG_KERNEL && CONFIG_KERN_SCHED
 			/* Give up timeslice to other processes. */
 			proc_switch();
@@ -460,26 +388,6 @@ void ser_purge(struct Serial *port)
 	fifo_flush_locked(&port->txfifo);
 }
 
-/**
- * Get status of port \c port.
- */
-serstatus_t ser_getstatus(struct Serial *port)
-{
-	serstatus_t status;
-	ATOMIC(status = port->status);
-
-	return status;
-}
-
-
-/**
- * Set new \c port status.
- */
-void ser_setstatus(struct Serial *port, serstatus_t status)
-{
-	ATOMIC(port->status = status);
-}
-
 
 /**
  * Wait until all pending output is completely
@@ -502,6 +410,7 @@ void ser_drain(struct Serial *ser)
 			/* Give up timeslice to other processes. */
 			proc_switch();
 		#endif
+			wdt_reset();
 	}
 }